diff --git a/android/app/src/main/res/values-ar/strings.xml b/android/app/src/main/res/values-ar/strings.xml
index 87ab876b98..7309c40138 100644
--- a/android/app/src/main/res/values-ar/strings.xml
+++ b/android/app/src/main/res/values-ar/strings.xml
@@ -1016,24 +1016,12 @@
 	<string name="type.barrier.wall">جدار</string>
 	<string name="type.boundary">حدود</string>
 	<string name="type.boundary.administrative">حدود إدارية</string>
-	<string name="type.boundary.administrative.10">حدود إدارية</string>
-	<string name="type.boundary.administrative.11">حدود إدارية</string>
+	<!-- Borders between countries. -->
 	<string name="type.boundary.administrative.2">حدود دولية</string>
-	<string name="type.boundary.administrative.3">حدود إدارية</string>
-	<string name="type.boundary.administrative.4">حدود إدارية</string>
-	<string name="type.boundary.administrative.5">حدود إدارية</string>
-	<string name="type.boundary.administrative.6">حدود إدارية</string>
-	<string name="type.boundary.administrative.7">حدود إدارية</string>
-	<string name="type.boundary.administrative.8">حدود إدارية</string>
-	<string name="type.boundary.administrative.9">حدود إدارية</string>
-	<string name="type.boundary.administrative.city">حدود مدينة</string>
-	<string name="type.boundary.administrative.country">حدود دولية</string>
-	<string name="type.boundary.administrative.county">حدود مقاطعة</string>
-	<string name="type.boundary.administrative.municipality">حدود بلدية</string>
-	<string name="type.boundary.administrative.nation">حدود دولية</string>
-	<string name="type.boundary.administrative.region">حدود منطقة</string>
-	<string name="type.boundary.administrative.state">حدود محافظة</string>
-	<string name="type.boundary.administrative.suburb">حدود ضاحية</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.3">حدود منطقة</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.4">حدود منطقة</string>
 	<string name="type.boundary.national_park">منتزه وطني</string>
 	<string name="type.boundary.aboriginal_lands">أراضي السكان الأصليين</string>
 	<string name="type.boundary.protected_area">منطقة محمية</string>
diff --git a/android/app/src/main/res/values-az/strings.xml b/android/app/src/main/res/values-az/strings.xml
index 33e828da95..047f46dca9 100644
--- a/android/app/src/main/res/values-az/strings.xml
+++ b/android/app/src/main/res/values-az/strings.xml
@@ -977,24 +977,12 @@
 	<string name="type.barrier.wall">Divar</string>
 	<string name="type.boundary">Sərhəd</string>
 	<string name="type.boundary.administrative">İnzibati sərhəd</string>
-	<string name="type.boundary.administrative.10">İnzibati sərhəd</string>
-	<string name="type.boundary.administrative.11">İnzibati sərhəd</string>
+	<!-- Borders between countries. -->
 	<string name="type.boundary.administrative.2">Milli sərhəd</string>
-	<string name="type.boundary.administrative.3">İnzibati sərhəd</string>
-	<string name="type.boundary.administrative.4">İnzibati sərhəd</string>
-	<string name="type.boundary.administrative.5">İnzibati sərhəd</string>
-	<string name="type.boundary.administrative.6">İnzibati sərhəd</string>
-	<string name="type.boundary.administrative.7">İnzibati sərhəd</string>
-	<string name="type.boundary.administrative.8">İnzibati sərhəd</string>
-	<string name="type.boundary.administrative.9">İnzibati sərhəd</string>
-	<string name="type.boundary.administrative.city">Şəhər limiti</string>
-	<string name="type.boundary.administrative.country">Milli sərhəd</string>
-	<string name="type.boundary.administrative.county">Rayon sərhədi</string>
-	<string name="type.boundary.administrative.municipality">Bələdiyyə sərhədi</string>
-	<string name="type.boundary.administrative.nation">Milli sərhəd</string>
-	<string name="type.boundary.administrative.region">Regional sərhəd</string>
-	<string name="type.boundary.administrative.state">Dövlət sərhədi</string>
-	<string name="type.boundary.administrative.suburb">Qonşuluq sərhədi</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.3">Regional sərhəd</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.4">Regional sərhəd</string>
 	<string name="type.boundary.national_park">Milli park</string>
 	<string name="type.boundary.aboriginal_lands">Yerli torpaqlar</string>
 	<string name="type.boundary.protected_area">Qorunan ərazi</string>
diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
index 9d195fa00d..4b3d7d01ce 100644
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -999,15 +999,6 @@
 	<string name="type.barrier.wall">Mauer</string>
 	<string name="type.boundary">Grenze</string>
 	<string name="type.boundary.administrative">Verwaltungsgrenze</string>
-	<string name="type.boundary.administrative.10">Verwaltungsgrenze</string>
-	<string name="type.boundary.administrative.11">Verwaltungsgrenze</string>
-	<string name="type.boundary.administrative.3">Verwaltungsgrenze</string>
-	<string name="type.boundary.administrative.4">Verwaltungsgrenze</string>
-	<string name="type.boundary.administrative.5">Verwaltungsgrenze</string>
-	<string name="type.boundary.administrative.6">Verwaltungsgrenze</string>
-	<string name="type.boundary.administrative.7">Verwaltungsgrenze</string>
-	<string name="type.boundary.administrative.8">Verwaltungsgrenze</string>
-	<string name="type.boundary.administrative.9">Verwaltungsgrenze</string>
 	<string name="type.boundary.national_park">Nationalpark</string>
 	<string name="type.boundary.aboriginal_lands">Indigene länder</string>
 	<string name="type.boundary.protected_area">Geschützter Bereich</string>
diff --git a/android/app/src/main/res/values-es-rMX/strings.xml b/android/app/src/main/res/values-es-rMX/strings.xml
index dc3d94cf38..028517d418 100644
--- a/android/app/src/main/res/values-es-rMX/strings.xml
+++ b/android/app/src/main/res/values-es-rMX/strings.xml
@@ -278,9 +278,8 @@
 	<string name="type.recycling.scrap_metal">Desechos de metal</string>
 	<string name="type.recycling.small_appliances">Desechos electrónicos</string>
 	<string name="type.amenity.vending_machine.public_transport_tickets">Máquina expendedora de billetes de transporte público</string>
+	<!-- Borders between countries. -->
 	<string name="type.boundary.administrative.2">Frontera de país</string>
-	<string name="type.boundary.administrative.country">Frontera de país</string>
-	<string name="type.boundary.administrative.nation">Frontera de país</string>
 	<string name="type.boundary.national_park">Parque nacional</string>
 	<!-- Duplicates [address] in strings.txt -->
 	<string name="type.building.address">Dirección</string>
diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml
index b072f0c03f..43765d9d3c 100644
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -1010,24 +1010,12 @@
 	<string name="type.barrier.wall">Muro</string>
 	<string name="type.boundary">Frontera</string>
 	<string name="type.boundary.administrative">Frontera administrativa</string>
-	<string name="type.boundary.administrative.10">Frontera administrativa</string>
-	<string name="type.boundary.administrative.11">Frontera administrativa</string>
+	<!-- Borders between countries. -->
 	<string name="type.boundary.administrative.2">Frontera de país</string>
-	<string name="type.boundary.administrative.3">Frontera administrativa</string>
-	<string name="type.boundary.administrative.4">Frontera administrativa</string>
-	<string name="type.boundary.administrative.5">Frontera administrativa</string>
-	<string name="type.boundary.administrative.6">Frontera administrativa</string>
-	<string name="type.boundary.administrative.7">Frontera administrativa</string>
-	<string name="type.boundary.administrative.8">Frontera administrativa</string>
-	<string name="type.boundary.administrative.9">Frontera administrativa</string>
-	<string name="type.boundary.administrative.city">Frontera de ciudad</string>
-	<string name="type.boundary.administrative.country">Frontera de país</string>
-	<string name="type.boundary.administrative.county">Frontera de condado</string>
-	<string name="type.boundary.administrative.municipality">Frontera de municipio</string>
-	<string name="type.boundary.administrative.nation">Frontera de nación</string>
-	<string name="type.boundary.administrative.region">Frontera de región</string>
-	<string name="type.boundary.administrative.state">Frontera de estado</string>
-	<string name="type.boundary.administrative.suburb">Frontera de suburbio</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.3">Frontera de región</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.4">Frontera de región</string>
 	<string name="type.boundary.national_park">Parque nacional</string>
 	<string name="type.boundary.aboriginal_lands">Tierras indígenas</string>
 	<string name="type.boundary.protected_area">Área protegida</string>
diff --git a/android/app/src/main/res/values-et/strings.xml b/android/app/src/main/res/values-et/strings.xml
index 2cb34f3f4d..0c69eb918b 100644
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -997,24 +997,12 @@
 	<string name="type.barrier.wall">Müür</string>
 	<string name="type.boundary">Piir</string>
 	<string name="type.boundary.administrative">Halduspiir</string>
-	<string name="type.boundary.administrative.10">Halduspiir</string>
-	<string name="type.boundary.administrative.11">Halduspiir</string>
+	<!-- Borders between countries. -->
 	<string name="type.boundary.administrative.2">Riigipiir</string>
-	<string name="type.boundary.administrative.3">Halduspiir</string>
-	<string name="type.boundary.administrative.4">Halduspiir</string>
-	<string name="type.boundary.administrative.5">Halduspiir</string>
-	<string name="type.boundary.administrative.6">Halduspiir</string>
-	<string name="type.boundary.administrative.7">Halduspiir</string>
-	<string name="type.boundary.administrative.8">Halduspiir</string>
-	<string name="type.boundary.administrative.9">Halduspiir</string>
-	<string name="type.boundary.administrative.city">Linna piir</string>
-	<string name="type.boundary.administrative.country">Riigipiir</string>
-	<string name="type.boundary.administrative.county">Maakonna piir</string>
-	<string name="type.boundary.administrative.municipality">Valla piir</string>
-	<string name="type.boundary.administrative.nation">Riigipiir</string>
-	<string name="type.boundary.administrative.region">Piirkondlik piir</string>
-	<string name="type.boundary.administrative.state">Osariigi piir</string>
-	<string name="type.boundary.administrative.suburb">Eeslinna piir</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.3">Piirkondlik piir</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.4">Piirkondlik piir</string>
 	<string name="type.boundary.national_park">Rahvuspark</string>
 	<string name="type.boundary.aboriginal_lands">Põlisrahvaste maad</string>
 	<string name="type.boundary.protected_area">Kaitseala</string>
diff --git a/android/app/src/main/res/values-eu/strings.xml b/android/app/src/main/res/values-eu/strings.xml
index b45f7e94d4..fa618c769e 100644
--- a/android/app/src/main/res/values-eu/strings.xml
+++ b/android/app/src/main/res/values-eu/strings.xml
@@ -1001,24 +1001,12 @@
 	<string name="type.barrier.wall">Horma</string>
 	<string name="type.boundary">Muga</string>
 	<string name="type.boundary.administrative">Muga administratiboa</string>
-	<string name="type.boundary.administrative.10">Muga administratiboa</string>
-	<string name="type.boundary.administrative.11">Muga administratiboa</string>
+	<!-- Borders between countries. -->
 	<string name="type.boundary.administrative.2">Herrialdeko muga</string>
-	<string name="type.boundary.administrative.3">Muga administratiboa</string>
-	<string name="type.boundary.administrative.4">Muga administratiboa</string>
-	<string name="type.boundary.administrative.5">Muga administratiboa</string>
-	<string name="type.boundary.administrative.6">Muga administratiboa</string>
-	<string name="type.boundary.administrative.7">Muga administratiboa</string>
-	<string name="type.boundary.administrative.8">Muga administratiboa</string>
-	<string name="type.boundary.administrative.9">Muga administratiboa</string>
-	<string name="type.boundary.administrative.city">Hiriko muga</string>
-	<string name="type.boundary.administrative.country">Herrialdeko muga</string>
-	<string name="type.boundary.administrative.county">Eskualdeko muga</string>
-	<string name="type.boundary.administrative.municipality">Udalerriko muga</string>
-	<string name="type.boundary.administrative.nation">Nazio muga</string>
-	<string name="type.boundary.administrative.region">Eskualdeko muga</string>
-	<string name="type.boundary.administrative.state">Estatuko muga</string>
-	<string name="type.boundary.administrative.suburb">Auzoko muga</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.3">Eskualdeko muga</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.4">Eskualdeko muga</string>
 	<string name="type.boundary.national_park">Parke Nazionala</string>
 	<string name="type.boundary.aboriginal_lands">Lurralde autoktonoak</string>
 	<string name="type.boundary.protected_area">Babestutako Eremua</string>
diff --git a/android/app/src/main/res/values-fi/strings.xml b/android/app/src/main/res/values-fi/strings.xml
index 85a8a1d66a..592d698373 100644
--- a/android/app/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
@@ -1003,23 +1003,8 @@
 	<string name="type.barrier.wall">Muuri</string>
 	<string name="type.boundary">Raja</string>
 	<string name="type.boundary.administrative">Hallinnollinen raja</string>
-	<string name="type.boundary.administrative.10">Hallinnollinen raja</string>
-	<string name="type.boundary.administrative.11">Hallinnollinen raja</string>
+	<!-- Borders between countries. -->
 	<string name="type.boundary.administrative.2">Valtakunnanraja</string>
-	<string name="type.boundary.administrative.3">Hallinnollinen raja</string>
-	<string name="type.boundary.administrative.4">Hallinnollinen raja</string>
-	<string name="type.boundary.administrative.5">Hallinnollinen raja</string>
-	<string name="type.boundary.administrative.6">Hallinnollinen raja</string>
-	<string name="type.boundary.administrative.7">Hallinnollinen raja</string>
-	<string name="type.boundary.administrative.8">Hallinnollinen raja</string>
-	<string name="type.boundary.administrative.9">Hallinnollinen raja</string>
-	<string name="type.boundary.administrative.city">Kaupunginraja</string>
-	<string name="type.boundary.administrative.country">Valtakunnanraja</string>
-	<string name="type.boundary.administrative.county">Maakunnanraja</string>
-	<string name="type.boundary.administrative.municipality">Kunnanraja</string>
-	<string name="type.boundary.administrative.nation">Valtakunnanraja</string>
-	<string name="type.boundary.administrative.state">Osavaltion raja</string>
-	<string name="type.boundary.administrative.suburb">Esikaupunki</string>
 	<string name="type.boundary.national_park">Kansallispuisto</string>
 	<string name="type.boundary.aboriginal_lands">Alkuperäiskansojen maat</string>
 	<string name="type.boundary.protected_area">Suojeltu alue</string>
diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml
index dc4486f663..fca8e0a233 100644
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -1001,23 +1001,12 @@
 	<string name="type.barrier.wall">Mur</string>
 	<string name="type.boundary">Frontière</string>
 	<string name="type.boundary.administrative">Frontière administrative</string>
-	<string name="type.boundary.administrative.10">Frontière administrative</string>
-	<string name="type.boundary.administrative.11">Frontière administrative</string>
+	<!-- Borders between countries. -->
 	<string name="type.boundary.administrative.2">Frontière nationale</string>
-	<string name="type.boundary.administrative.3">Frontière administrative</string>
-	<string name="type.boundary.administrative.4">Frontière administrative</string>
-	<string name="type.boundary.administrative.5">Frontière administrative</string>
-	<string name="type.boundary.administrative.6">Frontière administrative</string>
-	<string name="type.boundary.administrative.7">Frontière administrative</string>
-	<string name="type.boundary.administrative.8">Frontière administrative</string>
-	<string name="type.boundary.administrative.9">Frontière administrative</string>
-	<string name="type.boundary.administrative.city">Frontière de la ville</string>
-	<string name="type.boundary.administrative.country">Frontière nationale</string>
-	<string name="type.boundary.administrative.county">Frontière du comté</string>
-	<string name="type.boundary.administrative.municipality">Frontière de la municipalité</string>
-	<string name="type.boundary.administrative.nation">Frontière nationale</string>
-	<string name="type.boundary.administrative.region">Frontière régionale</string>
-	<string name="type.boundary.administrative.suburb">Frontière de quartier</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.3">Frontière régionale</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.4">Frontière régionale</string>
 	<string name="type.boundary.national_park">Parc national</string>
 	<string name="type.boundary.aboriginal_lands">Terres indigènes</string>
 	<string name="type.boundary.protected_area">Zone protégée</string>
diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml
index 5f08844354..647d1673ae 100644
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -989,22 +989,12 @@
 	<string name="type.barrier.wall">Muro</string>
 	<string name="type.boundary">Confine</string>
 	<string name="type.boundary.administrative">Confine amministrativo</string>
-	<string name="type.boundary.administrative.10">Confine amministrativo</string>
-	<string name="type.boundary.administrative.11">Confine amministrativo</string>
+	<!-- Borders between countries. -->
 	<string name="type.boundary.administrative.2">Confine nazionale</string>
-	<string name="type.boundary.administrative.3">Confine amministrativo</string>
-	<string name="type.boundary.administrative.4">Confine amministrativo</string>
-	<string name="type.boundary.administrative.5">Confine amministrativo</string>
-	<string name="type.boundary.administrative.6">Confine amministrativo</string>
-	<string name="type.boundary.administrative.7">Confine amministrativo</string>
-	<string name="type.boundary.administrative.8">Confine amministrativo</string>
-	<string name="type.boundary.administrative.9">Confine amministrativo</string>
-	<string name="type.boundary.administrative.city">Confine cittadino</string>
-	<string name="type.boundary.administrative.country">Confine nazionale</string>
-	<string name="type.boundary.administrative.municipality">Confini municipale</string>
-	<string name="type.boundary.administrative.nation">Confine nazionale</string>
-	<string name="type.boundary.administrative.region">Confine regionale</string>
-	<string name="type.boundary.administrative.state">Confine statale</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.3">Confine regionale</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.4">Confine regionale</string>
 	<string name="type.boundary.national_park">Parco nazionale</string>
 	<string name="type.boundary.aboriginal_lands">Terre indigene</string>
 	<string name="type.boundary.protected_area">Area protetta</string>
diff --git a/android/app/src/main/res/values-ja/strings.xml b/android/app/src/main/res/values-ja/strings.xml
index 72e9f1932b..c3b01b9b2a 100644
--- a/android/app/src/main/res/values-ja/strings.xml
+++ b/android/app/src/main/res/values-ja/strings.xml
@@ -989,15 +989,6 @@
 	<string name="type.barrier.wall">壁</string>
 	<string name="type.boundary">境界線</string>
 	<string name="type.boundary.administrative">行政境界</string>
-	<string name="type.boundary.administrative.10">行政境界</string>
-	<string name="type.boundary.administrative.11">行政境界</string>
-	<string name="type.boundary.administrative.3">行政境界</string>
-	<string name="type.boundary.administrative.4">行政境界</string>
-	<string name="type.boundary.administrative.5">行政境界</string>
-	<string name="type.boundary.administrative.6">行政境界</string>
-	<string name="type.boundary.administrative.7">行政境界</string>
-	<string name="type.boundary.administrative.8">行政境界</string>
-	<string name="type.boundary.administrative.9">行政境界</string>
 	<string name="type.boundary.national_park">国立公園</string>
 	<string name="type.boundary.aboriginal_lands">先住民の土地</string>
 	<string name="type.boundary.protected_area">保護区域</string>
diff --git a/android/app/src/main/res/values-mr/strings.xml b/android/app/src/main/res/values-mr/strings.xml
index 2be562e9ed..9010320f4a 100644
--- a/android/app/src/main/res/values-mr/strings.xml
+++ b/android/app/src/main/res/values-mr/strings.xml
@@ -948,24 +948,12 @@
 	<string name="type.barrier.wall">भिंत</string>
 	<string name="type.boundary">सीमा</string>
 	<string name="type.boundary.administrative">प्रशासकीय सीमा</string>
-	<string name="type.boundary.administrative.10">प्रशासकीय सीमा</string>
-	<string name="type.boundary.administrative.11">प्रशासकीय सीमा</string>
+	<!-- Borders between countries. -->
 	<string name="type.boundary.administrative.2">राष्ट्रीय सीमा</string>
-	<string name="type.boundary.administrative.3">प्रशासकीय सीमा</string>
-	<string name="type.boundary.administrative.4">प्रशासकीय सीमा</string>
-	<string name="type.boundary.administrative.5">प्रशासकीय सीमा</string>
-	<string name="type.boundary.administrative.6">प्रशासकीय सीमा</string>
-	<string name="type.boundary.administrative.7">प्रशासकीय सीमा</string>
-	<string name="type.boundary.administrative.8">प्रशासकीय सीमा</string>
-	<string name="type.boundary.administrative.9">प्रशासकीय सीमा</string>
-	<string name="type.boundary.administrative.city">शहराची सीमा</string>
-	<string name="type.boundary.administrative.country">राष्ट्रीय सीमा</string>
-	<string name="type.boundary.administrative.county">परगणा सीमा</string>
-	<string name="type.boundary.administrative.municipality">नगरपालिकेची सीमा</string>
-	<string name="type.boundary.administrative.nation">राष्ट्रीय सीमा</string>
-	<string name="type.boundary.administrative.region">प्रादेशिक सीमा</string>
-	<string name="type.boundary.administrative.state">राज्य सीमा</string>
-	<string name="type.boundary.administrative.suburb">उपनगर सीमा</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.3">प्रादेशिक सीमा</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.4">प्रादेशिक सीमा</string>
 	<string name="type.boundary.national_park">राष्ट्रीय उद्यान</string>
 	<string name="type.boundary.aboriginal_lands">स्वदेशी जमिनी</string>
 	<string name="type.boundary.protected_area">संरक्षित क्षेत्र</string>
diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml
index f4a9e9de4e..e1ba0a4ca8 100644
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -1002,24 +1002,12 @@
 	<string name="type.barrier.wall">Muur</string>
 	<string name="type.boundary">Grens</string>
 	<string name="type.boundary.administrative">Administratieve grens</string>
-	<string name="type.boundary.administrative.10">Administratieve grens</string>
-	<string name="type.boundary.administrative.11">Administratieve grens</string>
-	<string name="type.boundary.administrative.2">Landsgrens</string>
-	<string name="type.boundary.administrative.3">Administratieve grens</string>
-	<string name="type.boundary.administrative.4">Administratieve grens</string>
-	<string name="type.boundary.administrative.5">Administratieve grens</string>
-	<string name="type.boundary.administrative.6">Administratieve grens</string>
-	<string name="type.boundary.administrative.7">Administratieve grens</string>
-	<string name="type.boundary.administrative.8">Administratieve grens</string>
-	<string name="type.boundary.administrative.9">Administratieve grens</string>
-	<string name="type.boundary.administrative.city">Stadsgrens</string>
-	<string name="type.boundary.administrative.country">Landsgrens</string>
-	<string name="type.boundary.administrative.county">Provinciegrens</string>
-	<string name="type.boundary.administrative.municipality">Gemeentegrens</string>
-	<string name="type.boundary.administrative.nation">Natiegrens</string>
-	<string name="type.boundary.administrative.region">Regiogrens</string>
-	<string name="type.boundary.administrative.state">Staatsgrens</string>
-	<string name="type.boundary.administrative.suburb">Buitenwijkgrens</string>
+	<!-- Borders between countries. -->
+	<string name="type.boundary.administrative.2">Natiegrens</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.3">Regiogrens</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.4">Regiogrens</string>
 	<string name="type.boundary.national_park">Nationaal park</string>
 	<string name="type.boundary.aboriginal_lands">Inheemse landen</string>
 	<string name="type.boundary.protected_area">Beschermd gebied</string>
diff --git a/android/app/src/main/res/values-pl/strings.xml b/android/app/src/main/res/values-pl/strings.xml
index fbd5a68960..b9939c6f53 100644
--- a/android/app/src/main/res/values-pl/strings.xml
+++ b/android/app/src/main/res/values-pl/strings.xml
@@ -1007,24 +1007,12 @@
 	<string name="type.barrier.wall">Mur</string>
 	<string name="type.boundary">Granica</string>
 	<string name="type.boundary.administrative">Granica administracyjna</string>
-	<string name="type.boundary.administrative.10">Granica administracyjna</string>
-	<string name="type.boundary.administrative.11">Granica administracyjna</string>
+	<!-- Borders between countries. -->
 	<string name="type.boundary.administrative.2">Granica państwa</string>
-	<string name="type.boundary.administrative.3">Granica administracyjna</string>
-	<string name="type.boundary.administrative.4">Granica administracyjna</string>
-	<string name="type.boundary.administrative.5">Granica administracyjna</string>
-	<string name="type.boundary.administrative.6">Granica administracyjna</string>
-	<string name="type.boundary.administrative.7">Granica administracyjna</string>
-	<string name="type.boundary.administrative.8">Granica administracyjna</string>
-	<string name="type.boundary.administrative.9">Granica administracyjna</string>
-	<string name="type.boundary.administrative.city">Granica miasta</string>
-	<string name="type.boundary.administrative.country">Granica państwa</string>
-	<string name="type.boundary.administrative.county">Granica hrabstwa</string>
-	<string name="type.boundary.administrative.municipality">Granica gminy</string>
-	<string name="type.boundary.administrative.nation">Granica państwa</string>
-	<string name="type.boundary.administrative.region">Granica regionu</string>
-	<string name="type.boundary.administrative.state">Granica województwa</string>
-	<string name="type.boundary.administrative.suburb">Granica przedmieść</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.3">Granica regionu</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.4">Granica regionu</string>
 	<string name="type.boundary.national_park">Park narodowy</string>
 	<string name="type.boundary.aboriginal_lands">Rdzenne ziemie</string>
 	<string name="type.boundary.protected_area">Strefa chroniona</string>
diff --git a/android/app/src/main/res/values-pt-rBR/strings.xml b/android/app/src/main/res/values-pt-rBR/strings.xml
index b67d6d4474..173ea1964c 100644
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -935,24 +935,12 @@
 	<string name="type.barrier.wall">Muro</string>
 	<string name="type.boundary">Fronteira</string>
 	<string name="type.boundary.administrative">Fronteira administrativa</string>
-	<string name="type.boundary.administrative.10">Fronteira administrativa</string>
-	<string name="type.boundary.administrative.11">Fronteira administrativa</string>
+	<!-- Borders between countries. -->
 	<string name="type.boundary.administrative.2">Fronteira de país</string>
-	<string name="type.boundary.administrative.3">Fronteira administrativa</string>
-	<string name="type.boundary.administrative.4">Fronteira administrativa</string>
-	<string name="type.boundary.administrative.5">Fronteira administrativa</string>
-	<string name="type.boundary.administrative.6">Fronteira administrativa</string>
-	<string name="type.boundary.administrative.7">Fronteira administrativa</string>
-	<string name="type.boundary.administrative.8">Fronteira administrativa</string>
-	<string name="type.boundary.administrative.9">Fronteira administrativa</string>
-	<string name="type.boundary.administrative.city">Fronteira de cidade</string>
-	<string name="type.boundary.administrative.country">Fronteira de país</string>
-	<string name="type.boundary.administrative.county">Fronteira de condado</string>
-	<string name="type.boundary.administrative.municipality">Fronteira de município</string>
-	<string name="type.boundary.administrative.nation">Fronteira de nação</string>
-	<string name="type.boundary.administrative.region">Fronteira de região</string>
-	<string name="type.boundary.administrative.state">Fronteira de estado</string>
-	<string name="type.boundary.administrative.suburb">Fronteira de subúrbio</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.3">Fronteira de região</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.4">Fronteira de região</string>
 	<string name="type.boundary.national_park">Parque nacional</string>
 	<string name="type.boundary.protected_area">Área protegida</string>
 	<string name="type.boundary.protected_area.1">Área protegida</string>
diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml
index e13ae81bf5..de4efd6496 100644
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -957,24 +957,12 @@
 	<string name="type.barrier.wall">Muro</string>
 	<string name="type.boundary">Fronteira</string>
 	<string name="type.boundary.administrative">Fronteira administrativa</string>
-	<string name="type.boundary.administrative.10">Fronteira administrativa</string>
-	<string name="type.boundary.administrative.11">Fronteira administrativa</string>
+	<!-- Borders between countries. -->
 	<string name="type.boundary.administrative.2">Fronteira de país</string>
-	<string name="type.boundary.administrative.3">Fronteira administrativa</string>
-	<string name="type.boundary.administrative.4">Fronteira administrativa</string>
-	<string name="type.boundary.administrative.5">Fronteira administrativa</string>
-	<string name="type.boundary.administrative.6">Fronteira administrativa</string>
-	<string name="type.boundary.administrative.7">Fronteira administrativa</string>
-	<string name="type.boundary.administrative.8">Fronteira administrativa</string>
-	<string name="type.boundary.administrative.9">Fronteira administrativa</string>
-	<string name="type.boundary.administrative.city">Fronteira de cidade</string>
-	<string name="type.boundary.administrative.country">Fronteira de país</string>
-	<string name="type.boundary.administrative.county">Fronteira de condado</string>
-	<string name="type.boundary.administrative.municipality">Fronteira de município</string>
-	<string name="type.boundary.administrative.nation">Fronteira de nação</string>
-	<string name="type.boundary.administrative.region">Fronteira de região</string>
-	<string name="type.boundary.administrative.state">Fronteira de estado</string>
-	<string name="type.boundary.administrative.suburb">Fronteira de subúrbio</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.3">Fronteira de região</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.4">Fronteira de região</string>
 	<string name="type.boundary.national_park">Parque nacional</string>
 	<string name="type.boundary.aboriginal_lands">Terras indígenas</string>
 	<string name="type.boundary.protected_area">Área protegida</string>
diff --git a/android/app/src/main/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml
index 8197f361d7..92f393e8a5 100644
--- a/android/app/src/main/res/values-ru/strings.xml
+++ b/android/app/src/main/res/values-ru/strings.xml
@@ -1019,24 +1019,12 @@
 	<string name="type.barrier.wall">Стена</string>
 	<string name="type.boundary">Граница</string>
 	<string name="type.boundary.administrative">Административная граница</string>
-	<string name="type.boundary.administrative.10">Административная граница</string>
-	<string name="type.boundary.administrative.11">Административная граница</string>
+	<!-- Borders between countries. -->
 	<string name="type.boundary.administrative.2">Граница страны</string>
-	<string name="type.boundary.administrative.3">Административная граница</string>
-	<string name="type.boundary.administrative.4">Административная граница</string>
-	<string name="type.boundary.administrative.5">Административная граница</string>
-	<string name="type.boundary.administrative.6">Административная граница</string>
-	<string name="type.boundary.administrative.7">Административная граница</string>
-	<string name="type.boundary.administrative.8">Административная граница</string>
-	<string name="type.boundary.administrative.9">Административная граница</string>
-	<string name="type.boundary.administrative.city">Граница города</string>
-	<string name="type.boundary.administrative.country">Граница страны</string>
-	<string name="type.boundary.administrative.county">Граница округа</string>
-	<string name="type.boundary.administrative.municipality">Граница муниципалитета</string>
-	<string name="type.boundary.administrative.nation">Граница страны</string>
-	<string name="type.boundary.administrative.region">Граница региона</string>
-	<string name="type.boundary.administrative.state">Граница штата</string>
-	<string name="type.boundary.administrative.suburb">Граница пригорода</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.3">Граница региона</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.4">Граница региона</string>
 	<string name="type.boundary.national_park">Национальный парк</string>
 	<string name="type.boundary.aboriginal_lands">Земли коренных народов</string>
 	<string name="type.boundary.protected_area">Заповедная зона</string>
diff --git a/android/app/src/main/res/values-sk/strings.xml b/android/app/src/main/res/values-sk/strings.xml
index 3f3a51f42b..a5eff30e1c 100644
--- a/android/app/src/main/res/values-sk/strings.xml
+++ b/android/app/src/main/res/values-sk/strings.xml
@@ -992,21 +992,12 @@
 	<string name="type.barrier.wall">Múr</string>
 	<string name="type.boundary">Hranica</string>
 	<string name="type.boundary.administrative">Administratívna hranica</string>
-	<string name="type.boundary.administrative.10">Administratívna hranica</string>
-	<string name="type.boundary.administrative.11">Administratívna hranica</string>
+	<!-- Borders between countries. -->
 	<string name="type.boundary.administrative.2">Národná hranica</string>
-	<string name="type.boundary.administrative.3">Administratívna hranica</string>
-	<string name="type.boundary.administrative.4">Administratívna hranica</string>
-	<string name="type.boundary.administrative.5">Administratívna hranica</string>
-	<string name="type.boundary.administrative.6">Administratívna hranica</string>
-	<string name="type.boundary.administrative.7">Administratívna hranica</string>
-	<string name="type.boundary.administrative.8">Administratívna hranica</string>
-	<string name="type.boundary.administrative.9">Administratívna hranica</string>
-	<string name="type.boundary.administrative.city">Hranica mesta</string>
-	<string name="type.boundary.administrative.country">Národná hranica</string>
-	<string name="type.boundary.administrative.nation">Národná hranica</string>
-	<string name="type.boundary.administrative.region">Hranica regiónu</string>
-	<string name="type.boundary.administrative.state">Štátna hranica</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.3">Hranica regiónu</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.4">Hranica regiónu</string>
 	<string name="type.boundary.national_park">Národný park</string>
 	<string name="type.boundary.aboriginal_lands">Domorodé krajiny</string>
 	<string name="type.boundary.protected_area">Chránené územie</string>
diff --git a/android/app/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml
index 77ec887d8f..d0a7efa983 100644
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -1005,24 +1005,12 @@
 	<string name="type.barrier.wall">Duvar</string>
 	<string name="type.boundary">Sınır</string>
 	<string name="type.boundary.administrative">İdari Sınır</string>
-	<string name="type.boundary.administrative.10">İdari Sınır</string>
-	<string name="type.boundary.administrative.11">İdari Sınır</string>
+	<!-- Borders between countries. -->
 	<string name="type.boundary.administrative.2">Ulusal Sınır</string>
-	<string name="type.boundary.administrative.3">İdari Sınır</string>
-	<string name="type.boundary.administrative.4">İdari Sınır</string>
-	<string name="type.boundary.administrative.5">İdari Sınır</string>
-	<string name="type.boundary.administrative.6">İdari Sınır</string>
-	<string name="type.boundary.administrative.7">İdari Sınır</string>
-	<string name="type.boundary.administrative.8">İdari Sınır</string>
-	<string name="type.boundary.administrative.9">İdari Sınır</string>
-	<string name="type.boundary.administrative.city">Şehir Sınırı</string>
-	<string name="type.boundary.administrative.country">Ulusal Sınır</string>
-	<string name="type.boundary.administrative.county">İlçe Sınırı</string>
-	<string name="type.boundary.administrative.municipality">Belediye Sınırı</string>
-	<string name="type.boundary.administrative.nation">Ulusal Sınır</string>
-	<string name="type.boundary.administrative.region">Bölgesel Sınır</string>
-	<string name="type.boundary.administrative.state">Devlet Sınırı</string>
-	<string name="type.boundary.administrative.suburb">Mahalle Sınırı</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.3">Bölgesel Sınır</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.4">Bölgesel Sınır</string>
 	<string name="type.boundary.national_park">Ulusal Park</string>
 	<string name="type.boundary.aboriginal_lands">Yerli topraklar</string>
 	<string name="type.boundary.protected_area">Korunmuş bölge</string>
diff --git a/android/app/src/main/res/values-uk/strings.xml b/android/app/src/main/res/values-uk/strings.xml
index 125331ba27..e3bc5d9c9b 100644
--- a/android/app/src/main/res/values-uk/strings.xml
+++ b/android/app/src/main/res/values-uk/strings.xml
@@ -1008,22 +1008,12 @@
 	<string name="type.barrier.wall">Стіна</string>
 	<string name="type.boundary">Кордон</string>
 	<string name="type.boundary.administrative">Адміністративний поділ</string>
-	<string name="type.boundary.administrative.10">Адміністративний поділ</string>
-	<string name="type.boundary.administrative.11">Адміністративний поділ</string>
+	<!-- Borders between countries. -->
 	<string name="type.boundary.administrative.2">Кордон країни</string>
-	<string name="type.boundary.administrative.3">Адміністративний поділ</string>
-	<string name="type.boundary.administrative.4">Адміністративний поділ</string>
-	<string name="type.boundary.administrative.5">Адміністративний поділ</string>
-	<string name="type.boundary.administrative.6">Адміністративний поділ</string>
-	<string name="type.boundary.administrative.7">Адміністративний поділ</string>
-	<string name="type.boundary.administrative.8">Адміністративний поділ</string>
-	<string name="type.boundary.administrative.9">Адміністративний поділ</string>
-	<string name="type.boundary.administrative.city">Межа міста</string>
-	<string name="type.boundary.administrative.country">Кордон країни</string>
-	<string name="type.boundary.administrative.county">Поділ округа</string>
-	<string name="type.boundary.administrative.nation">Кордон країни</string>
-	<string name="type.boundary.administrative.region">Областний поділ</string>
-	<string name="type.boundary.administrative.suburb">Приміська межа</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.3">Областний поділ</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.4">Областний поділ</string>
 	<string name="type.boundary.national_park">Національний парк</string>
 	<string name="type.boundary.aboriginal_lands">Землі корінних народів</string>
 	<string name="type.boundary.protected_area">Заповідна зона</string>
diff --git a/android/app/src/main/res/values-zh/strings.xml b/android/app/src/main/res/values-zh/strings.xml
index b308c1ea03..9bf203edc2 100644
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -958,24 +958,12 @@
 	<string name="type.barrier.wall">墙</string>
 	<string name="type.boundary">边界</string>
 	<string name="type.boundary.administrative">行政区域界线</string>
-	<string name="type.boundary.administrative.10">10级行政区域界线</string>
-	<string name="type.boundary.administrative.11">11级行政区域界线</string>
+	<!-- Borders between countries. -->
 	<string name="type.boundary.administrative.2">国家行政区域界线</string>
-	<string name="type.boundary.administrative.3">3级行政区域界线</string>
-	<string name="type.boundary.administrative.4">4级行政区域界线</string>
-	<string name="type.boundary.administrative.5">5级行政区域界线</string>
-	<string name="type.boundary.administrative.6">6级行政区域界线</string>
-	<string name="type.boundary.administrative.7">7级行政区域界线</string>
-	<string name="type.boundary.administrative.8">8级行政区域界线</string>
-	<string name="type.boundary.administrative.9">9级行政区域界线</string>
-	<string name="type.boundary.administrative.city">城市行政区域界线</string>
-	<string name="type.boundary.administrative.country">国家行政区域界线</string>
-	<string name="type.boundary.administrative.county">县行政区域界线</string>
-	<string name="type.boundary.administrative.municipality">自治市行政区域界线</string>
-	<string name="type.boundary.administrative.nation">国家行政区域界线</string>
-	<string name="type.boundary.administrative.region">1区域行政区域界线</string>
-	<string name="type.boundary.administrative.state">州省行政区域界线</string>
-	<string name="type.boundary.administrative.suburb">市郊行政区域界线</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.3">1区域行政区域界线</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.4">1区域行政区域界线</string>
 	<string name="type.boundary.national_park">国家公园</string>
 	<string name="type.boundary.aboriginal_lands">原住民土地</string>
 	<string name="type.boundary.protected_area">保护区</string>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 4db8837a13..e5c8e4023b 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -1041,24 +1041,12 @@
 	<string name="type.barrier.wall">Wall</string>
 	<string name="type.boundary">Boundary</string>
 	<string name="type.boundary.administrative">Administrative Boundary</string>
-	<string name="type.boundary.administrative.10">Administrative Boundary</string>
-	<string name="type.boundary.administrative.11">Administrative Boundary</string>
+	<!-- Borders between countries. -->
 	<string name="type.boundary.administrative.2">National Border</string>
-	<string name="type.boundary.administrative.3">Administrative Boundary</string>
-	<string name="type.boundary.administrative.4">Administrative Boundary</string>
-	<string name="type.boundary.administrative.5">Administrative Boundary</string>
-	<string name="type.boundary.administrative.6">Administrative Boundary</string>
-	<string name="type.boundary.administrative.7">Administrative Boundary</string>
-	<string name="type.boundary.administrative.8">Administrative Boundary</string>
-	<string name="type.boundary.administrative.9">Administrative Boundary</string>
-	<string name="type.boundary.administrative.city">City Boundary</string>
-	<string name="type.boundary.administrative.country">National Border</string>
-	<string name="type.boundary.administrative.county">County Boundary</string>
-	<string name="type.boundary.administrative.municipality">Municipality Boundary</string>
-	<string name="type.boundary.administrative.nation">National Border</string>
-	<string name="type.boundary.administrative.region">Regional Boundary</string>
-	<string name="type.boundary.administrative.state">State Boundary</string>
-	<string name="type.boundary.administrative.suburb">Suburb Boundary</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.3">Regional Boundary</string>
+	<!-- Country's primary subdivision borders, e.g. between regions, provinces, states.. -->
+	<string name="type.boundary.administrative.4">Regional Boundary</string>
 	<string name="type.boundary.national_park">National Park</string>
 	<string name="type.boundary.aboriginal_lands">Indigenous Lands</string>
 	<string name="type.boundary.protected_area">Protected Area</string>
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
index 11dfa2ddfd..7c75ca25b0 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "حدود إدارية";
 
-"type.boundary.administrative.10" = "حدود إدارية";
-
-"type.boundary.administrative.11" = "حدود إدارية";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "حدود دولية";
 
-"type.boundary.administrative.3" = "حدود إدارية";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "حدود منطقة";
 
-"type.boundary.administrative.4" = "حدود إدارية";
-
-"type.boundary.administrative.5" = "حدود إدارية";
-
-"type.boundary.administrative.6" = "حدود إدارية";
-
-"type.boundary.administrative.7" = "حدود إدارية";
-
-"type.boundary.administrative.8" = "حدود إدارية";
-
-"type.boundary.administrative.9" = "حدود إدارية";
-
-"type.boundary.administrative.city" = "حدود مدينة";
-
-"type.boundary.administrative.country" = "حدود دولية";
-
-"type.boundary.administrative.county" = "حدود مقاطعة";
-
-"type.boundary.administrative.municipality" = "حدود بلدية";
-
-"type.boundary.administrative.nation" = "حدود دولية";
-
-"type.boundary.administrative.region" = "حدود منطقة";
-
-"type.boundary.administrative.state" = "حدود محافظة";
-
-"type.boundary.administrative.suburb" = "حدود ضاحية";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "حدود منطقة";
 
 "type.boundary.national_park" = "منتزه وطني";
 
diff --git a/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings
index c2ff599913..909f7346de 100644
--- a/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "İnzibati sərhəd";
 
-"type.boundary.administrative.10" = "İnzibati sərhəd";
-
-"type.boundary.administrative.11" = "İnzibati sərhəd";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "Milli sərhəd";
 
-"type.boundary.administrative.3" = "İnzibati sərhəd";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Regional sərhəd";
 
-"type.boundary.administrative.4" = "İnzibati sərhəd";
-
-"type.boundary.administrative.5" = "İnzibati sərhəd";
-
-"type.boundary.administrative.6" = "İnzibati sərhəd";
-
-"type.boundary.administrative.7" = "İnzibati sərhəd";
-
-"type.boundary.administrative.8" = "İnzibati sərhəd";
-
-"type.boundary.administrative.9" = "İnzibati sərhəd";
-
-"type.boundary.administrative.city" = "Şəhər limiti";
-
-"type.boundary.administrative.country" = "Milli sərhəd";
-
-"type.boundary.administrative.county" = "Rayon sərhədi";
-
-"type.boundary.administrative.municipality" = "Bələdiyyə sərhədi";
-
-"type.boundary.administrative.nation" = "Milli sərhəd";
-
-"type.boundary.administrative.region" = "Regional sərhəd";
-
-"type.boundary.administrative.state" = "Dövlət sərhədi";
-
-"type.boundary.administrative.suburb" = "Qonşuluq sərhədi";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Regional sərhəd";
 
 "type.boundary.national_park" = "Milli park";
 
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
index bd07a84eb9..ed9fec0020 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Administrative Boundary";
 
-"type.boundary.administrative.10" = "Administrative Boundary";
-
-"type.boundary.administrative.11" = "Administrative Boundary";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "National Border";
 
-"type.boundary.administrative.3" = "Administrative Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Regional Boundary";
 
-"type.boundary.administrative.4" = "Administrative Boundary";
-
-"type.boundary.administrative.5" = "Administrative Boundary";
-
-"type.boundary.administrative.6" = "Administrative Boundary";
-
-"type.boundary.administrative.7" = "Administrative Boundary";
-
-"type.boundary.administrative.8" = "Administrative Boundary";
-
-"type.boundary.administrative.9" = "Administrative Boundary";
-
-"type.boundary.administrative.city" = "City Boundary";
-
-"type.boundary.administrative.country" = "National Border";
-
-"type.boundary.administrative.county" = "County Boundary";
-
-"type.boundary.administrative.municipality" = "Municipality Boundary";
-
-"type.boundary.administrative.nation" = "National Border";
-
-"type.boundary.administrative.region" = "Regional Boundary";
-
-"type.boundary.administrative.state" = "State Boundary";
-
-"type.boundary.administrative.suburb" = "Suburb Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Regional Boundary";
 
 "type.boundary.national_park" = "National Park";
 
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
index 480724bc37..dd6a2e8f48 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Administrative Boundary";
 
-"type.boundary.administrative.10" = "Administrative Boundary";
-
-"type.boundary.administrative.11" = "Administrative Boundary";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "National Border";
 
-"type.boundary.administrative.3" = "Administrative Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Regional Boundary";
 
-"type.boundary.administrative.4" = "Administrative Boundary";
-
-"type.boundary.administrative.5" = "Administrative Boundary";
-
-"type.boundary.administrative.6" = "Administrative Boundary";
-
-"type.boundary.administrative.7" = "Administrative Boundary";
-
-"type.boundary.administrative.8" = "Administrative Boundary";
-
-"type.boundary.administrative.9" = "Administrative Boundary";
-
-"type.boundary.administrative.city" = "City Boundary";
-
-"type.boundary.administrative.country" = "National Border";
-
-"type.boundary.administrative.county" = "County Boundary";
-
-"type.boundary.administrative.municipality" = "Municipality Boundary";
-
-"type.boundary.administrative.nation" = "National Border";
-
-"type.boundary.administrative.region" = "Regional Boundary";
-
-"type.boundary.administrative.state" = "State Boundary";
-
-"type.boundary.administrative.suburb" = "Suburb Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Regional Boundary";
 
 "type.boundary.national_park" = "National Park";
 
diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
index 232fee0dbc..4261891202 100644
--- a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Administrative Boundary";
 
-"type.boundary.administrative.10" = "Administrative Boundary";
-
-"type.boundary.administrative.11" = "Administrative Boundary";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "National Border";
 
-"type.boundary.administrative.3" = "Administrative Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Regional Boundary";
 
-"type.boundary.administrative.4" = "Administrative Boundary";
-
-"type.boundary.administrative.5" = "Administrative Boundary";
-
-"type.boundary.administrative.6" = "Administrative Boundary";
-
-"type.boundary.administrative.7" = "Administrative Boundary";
-
-"type.boundary.administrative.8" = "Administrative Boundary";
-
-"type.boundary.administrative.9" = "Administrative Boundary";
-
-"type.boundary.administrative.city" = "City Boundary";
-
-"type.boundary.administrative.country" = "National Border";
-
-"type.boundary.administrative.county" = "County Boundary";
-
-"type.boundary.administrative.municipality" = "Municipality Boundary";
-
-"type.boundary.administrative.nation" = "National Border";
-
-"type.boundary.administrative.region" = "Regional Boundary";
-
-"type.boundary.administrative.state" = "State Boundary";
-
-"type.boundary.administrative.suburb" = "Suburb Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Regional Boundary";
 
 "type.boundary.national_park" = "National Park";
 
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
index 72d774c2b0..a568789882 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Administrative Boundary";
 
-"type.boundary.administrative.10" = "Administrative Boundary";
-
-"type.boundary.administrative.11" = "Administrative Boundary";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "National Border";
 
-"type.boundary.administrative.3" = "Administrative Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Regional Boundary";
 
-"type.boundary.administrative.4" = "Administrative Boundary";
-
-"type.boundary.administrative.5" = "Administrative Boundary";
-
-"type.boundary.administrative.6" = "Administrative Boundary";
-
-"type.boundary.administrative.7" = "Administrative Boundary";
-
-"type.boundary.administrative.8" = "Administrative Boundary";
-
-"type.boundary.administrative.9" = "Administrative Boundary";
-
-"type.boundary.administrative.city" = "City Boundary";
-
-"type.boundary.administrative.country" = "National Border";
-
-"type.boundary.administrative.county" = "County Boundary";
-
-"type.boundary.administrative.municipality" = "Municipality Boundary";
-
-"type.boundary.administrative.nation" = "National Border";
-
-"type.boundary.administrative.region" = "Regional Boundary";
-
-"type.boundary.administrative.state" = "State Boundary";
-
-"type.boundary.administrative.suburb" = "Suburb Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Regional Boundary";
 
 "type.boundary.national_park" = "Národní park";
 
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
index ca1e4999a3..a150209eda 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Administrative Boundary";
 
-"type.boundary.administrative.10" = "Administrative Boundary";
-
-"type.boundary.administrative.11" = "Administrative Boundary";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "National Border";
 
-"type.boundary.administrative.3" = "Administrative Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Regional Boundary";
 
-"type.boundary.administrative.4" = "Administrative Boundary";
-
-"type.boundary.administrative.5" = "Administrative Boundary";
-
-"type.boundary.administrative.6" = "Administrative Boundary";
-
-"type.boundary.administrative.7" = "Administrative Boundary";
-
-"type.boundary.administrative.8" = "Administrative Boundary";
-
-"type.boundary.administrative.9" = "Administrative Boundary";
-
-"type.boundary.administrative.city" = "City Boundary";
-
-"type.boundary.administrative.country" = "National Border";
-
-"type.boundary.administrative.county" = "County Boundary";
-
-"type.boundary.administrative.municipality" = "Municipality Boundary";
-
-"type.boundary.administrative.nation" = "National Border";
-
-"type.boundary.administrative.region" = "Regional Boundary";
-
-"type.boundary.administrative.state" = "State Boundary";
-
-"type.boundary.administrative.suburb" = "Suburb Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Regional Boundary";
 
 "type.boundary.national_park" = "National park";
 
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
index 9d94695c24..31c37915cc 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Verwaltungsgrenze";
 
-"type.boundary.administrative.10" = "Verwaltungsgrenze";
-
-"type.boundary.administrative.11" = "Verwaltungsgrenze";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "National Border";
 
-"type.boundary.administrative.3" = "Verwaltungsgrenze";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Regional Boundary";
 
-"type.boundary.administrative.4" = "Verwaltungsgrenze";
-
-"type.boundary.administrative.5" = "Verwaltungsgrenze";
-
-"type.boundary.administrative.6" = "Verwaltungsgrenze";
-
-"type.boundary.administrative.7" = "Verwaltungsgrenze";
-
-"type.boundary.administrative.8" = "Verwaltungsgrenze";
-
-"type.boundary.administrative.9" = "Verwaltungsgrenze";
-
-"type.boundary.administrative.city" = "City Boundary";
-
-"type.boundary.administrative.country" = "National Border";
-
-"type.boundary.administrative.county" = "County Boundary";
-
-"type.boundary.administrative.municipality" = "Municipality Boundary";
-
-"type.boundary.administrative.nation" = "National Border";
-
-"type.boundary.administrative.region" = "Regional Boundary";
-
-"type.boundary.administrative.state" = "State Boundary";
-
-"type.boundary.administrative.suburb" = "Suburb Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Regional Boundary";
 
 "type.boundary.national_park" = "Nationalpark";
 
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
index 5424a5cbb7..cea0eb883e 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Administrative Boundary";
 
-"type.boundary.administrative.10" = "Administrative Boundary";
-
-"type.boundary.administrative.11" = "Administrative Boundary";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "National Border";
 
-"type.boundary.administrative.3" = "Administrative Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Regional Boundary";
 
-"type.boundary.administrative.4" = "Administrative Boundary";
-
-"type.boundary.administrative.5" = "Administrative Boundary";
-
-"type.boundary.administrative.6" = "Administrative Boundary";
-
-"type.boundary.administrative.7" = "Administrative Boundary";
-
-"type.boundary.administrative.8" = "Administrative Boundary";
-
-"type.boundary.administrative.9" = "Administrative Boundary";
-
-"type.boundary.administrative.city" = "City Boundary";
-
-"type.boundary.administrative.country" = "National Border";
-
-"type.boundary.administrative.county" = "County Boundary";
-
-"type.boundary.administrative.municipality" = "Municipality Boundary";
-
-"type.boundary.administrative.nation" = "National Border";
-
-"type.boundary.administrative.region" = "Regional Boundary";
-
-"type.boundary.administrative.state" = "State Boundary";
-
-"type.boundary.administrative.suburb" = "Suburb Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Regional Boundary";
 
 "type.boundary.national_park" = "Εθνικό πάρκο";
 
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
index bd34737eb0..201b6faeea 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Administrative Boundary";
 
-"type.boundary.administrative.10" = "Administrative Boundary";
-
-"type.boundary.administrative.11" = "Administrative Boundary";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "National Border";
 
-"type.boundary.administrative.3" = "Administrative Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Regional Boundary";
 
-"type.boundary.administrative.4" = "Administrative Boundary";
-
-"type.boundary.administrative.5" = "Administrative Boundary";
-
-"type.boundary.administrative.6" = "Administrative Boundary";
-
-"type.boundary.administrative.7" = "Administrative Boundary";
-
-"type.boundary.administrative.8" = "Administrative Boundary";
-
-"type.boundary.administrative.9" = "Administrative Boundary";
-
-"type.boundary.administrative.city" = "City Boundary";
-
-"type.boundary.administrative.country" = "National Border";
-
-"type.boundary.administrative.county" = "County Boundary";
-
-"type.boundary.administrative.municipality" = "Municipality Boundary";
-
-"type.boundary.administrative.nation" = "National Border";
-
-"type.boundary.administrative.region" = "Regional Boundary";
-
-"type.boundary.administrative.state" = "State Boundary";
-
-"type.boundary.administrative.suburb" = "Suburb Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Regional Boundary";
 
 "type.boundary.national_park" = "National Park";
 
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
index 3e8adfc8d5..3ffec082b1 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Administrative Boundary";
 
-"type.boundary.administrative.10" = "Administrative Boundary";
-
-"type.boundary.administrative.11" = "Administrative Boundary";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "National Border";
 
-"type.boundary.administrative.3" = "Administrative Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Regional Boundary";
 
-"type.boundary.administrative.4" = "Administrative Boundary";
-
-"type.boundary.administrative.5" = "Administrative Boundary";
-
-"type.boundary.administrative.6" = "Administrative Boundary";
-
-"type.boundary.administrative.7" = "Administrative Boundary";
-
-"type.boundary.administrative.8" = "Administrative Boundary";
-
-"type.boundary.administrative.9" = "Administrative Boundary";
-
-"type.boundary.administrative.city" = "City Boundary";
-
-"type.boundary.administrative.country" = "National Border";
-
-"type.boundary.administrative.county" = "County Boundary";
-
-"type.boundary.administrative.municipality" = "Municipality Boundary";
-
-"type.boundary.administrative.nation" = "National Border";
-
-"type.boundary.administrative.region" = "Regional Boundary";
-
-"type.boundary.administrative.state" = "State Boundary";
-
-"type.boundary.administrative.suburb" = "Suburb Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Regional Boundary";
 
 "type.boundary.national_park" = "National Park";
 
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
index 3ae1431a8a..149937ec5c 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Frontera administrativa";
 
-"type.boundary.administrative.10" = "Frontera administrativa";
-
-"type.boundary.administrative.11" = "Frontera administrativa";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "Frontera de país";
 
-"type.boundary.administrative.3" = "Frontera administrativa";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Frontera de región";
 
-"type.boundary.administrative.4" = "Frontera administrativa";
-
-"type.boundary.administrative.5" = "Frontera administrativa";
-
-"type.boundary.administrative.6" = "Frontera administrativa";
-
-"type.boundary.administrative.7" = "Frontera administrativa";
-
-"type.boundary.administrative.8" = "Frontera administrativa";
-
-"type.boundary.administrative.9" = "Frontera administrativa";
-
-"type.boundary.administrative.city" = "Frontera de ciudad";
-
-"type.boundary.administrative.country" = "Frontera de país";
-
-"type.boundary.administrative.county" = "Frontera de condado";
-
-"type.boundary.administrative.municipality" = "Frontera de municipio";
-
-"type.boundary.administrative.nation" = "Frontera de país";
-
-"type.boundary.administrative.region" = "Frontera de región";
-
-"type.boundary.administrative.state" = "Frontera de estado";
-
-"type.boundary.administrative.suburb" = "Frontera de suburbio";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Frontera de región";
 
 "type.boundary.national_park" = "Parque nacional";
 
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index b964ab47e6..0657fc8b4c 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Frontera administrativa";
 
-"type.boundary.administrative.10" = "Frontera administrativa";
-
-"type.boundary.administrative.11" = "Frontera administrativa";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "Frontera de país";
 
-"type.boundary.administrative.3" = "Frontera administrativa";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Frontera de región";
 
-"type.boundary.administrative.4" = "Frontera administrativa";
-
-"type.boundary.administrative.5" = "Frontera administrativa";
-
-"type.boundary.administrative.6" = "Frontera administrativa";
-
-"type.boundary.administrative.7" = "Frontera administrativa";
-
-"type.boundary.administrative.8" = "Frontera administrativa";
-
-"type.boundary.administrative.9" = "Frontera administrativa";
-
-"type.boundary.administrative.city" = "Frontera de ciudad";
-
-"type.boundary.administrative.country" = "Frontera de país";
-
-"type.boundary.administrative.county" = "Frontera de condado";
-
-"type.boundary.administrative.municipality" = "Frontera de municipio";
-
-"type.boundary.administrative.nation" = "Frontera de nación";
-
-"type.boundary.administrative.region" = "Frontera de región";
-
-"type.boundary.administrative.state" = "Frontera de estado";
-
-"type.boundary.administrative.suburb" = "Frontera de suburbio";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Frontera de región";
 
 "type.boundary.national_park" = "Parque nacional";
 
diff --git a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
index 8a4559e9ba..75dbff490a 100644
--- a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Halduspiir";
 
-"type.boundary.administrative.10" = "Halduspiir";
-
-"type.boundary.administrative.11" = "Halduspiir";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "Riigipiir";
 
-"type.boundary.administrative.3" = "Halduspiir";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Piirkondlik piir";
 
-"type.boundary.administrative.4" = "Halduspiir";
-
-"type.boundary.administrative.5" = "Halduspiir";
-
-"type.boundary.administrative.6" = "Halduspiir";
-
-"type.boundary.administrative.7" = "Halduspiir";
-
-"type.boundary.administrative.8" = "Halduspiir";
-
-"type.boundary.administrative.9" = "Halduspiir";
-
-"type.boundary.administrative.city" = "Linna piir";
-
-"type.boundary.administrative.country" = "Riigipiir";
-
-"type.boundary.administrative.county" = "Maakonna piir";
-
-"type.boundary.administrative.municipality" = "Valla piir";
-
-"type.boundary.administrative.nation" = "Riigipiir";
-
-"type.boundary.administrative.region" = "Piirkondlik piir";
-
-"type.boundary.administrative.state" = "Osariigi piir";
-
-"type.boundary.administrative.suburb" = "Eeslinna piir";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Piirkondlik piir";
 
 "type.boundary.national_park" = "Rahvuspark";
 
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
index bf296457a3..6229d7cd41 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Muga administratiboa";
 
-"type.boundary.administrative.10" = "Muga administratiboa";
-
-"type.boundary.administrative.11" = "Muga administratiboa";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "Herrialdeko muga";
 
-"type.boundary.administrative.3" = "Muga administratiboa";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Eskualdeko muga";
 
-"type.boundary.administrative.4" = "Muga administratiboa";
-
-"type.boundary.administrative.5" = "Muga administratiboa";
-
-"type.boundary.administrative.6" = "Muga administratiboa";
-
-"type.boundary.administrative.7" = "Muga administratiboa";
-
-"type.boundary.administrative.8" = "Muga administratiboa";
-
-"type.boundary.administrative.9" = "Muga administratiboa";
-
-"type.boundary.administrative.city" = "Hiriko muga";
-
-"type.boundary.administrative.country" = "Herrialdeko muga";
-
-"type.boundary.administrative.county" = "Eskualdeko muga";
-
-"type.boundary.administrative.municipality" = "Udalerriko muga";
-
-"type.boundary.administrative.nation" = "Nazio muga";
-
-"type.boundary.administrative.region" = "Eskualdeko muga";
-
-"type.boundary.administrative.state" = "Estatuko muga";
-
-"type.boundary.administrative.suburb" = "Auzoko muga";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Eskualdeko muga";
 
 "type.boundary.national_park" = "Parke Nazionala";
 
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
index 8b51425749..2e3871a861 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Administrative Boundary";
 
-"type.boundary.administrative.10" = "Administrative Boundary";
-
-"type.boundary.administrative.11" = "Administrative Boundary";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "National Border";
 
-"type.boundary.administrative.3" = "Administrative Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Regional Boundary";
 
-"type.boundary.administrative.4" = "Administrative Boundary";
-
-"type.boundary.administrative.5" = "Administrative Boundary";
-
-"type.boundary.administrative.6" = "Administrative Boundary";
-
-"type.boundary.administrative.7" = "Administrative Boundary";
-
-"type.boundary.administrative.8" = "Administrative Boundary";
-
-"type.boundary.administrative.9" = "Administrative Boundary";
-
-"type.boundary.administrative.city" = "City Boundary";
-
-"type.boundary.administrative.country" = "National Border";
-
-"type.boundary.administrative.county" = "County Boundary";
-
-"type.boundary.administrative.municipality" = "Municipality Boundary";
-
-"type.boundary.administrative.nation" = "National Border";
-
-"type.boundary.administrative.region" = "Regional Boundary";
-
-"type.boundary.administrative.state" = "State Boundary";
-
-"type.boundary.administrative.suburb" = "Suburb Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Regional Boundary";
 
 "type.boundary.national_park" = "پارک ملی";
 
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index d6587a138c..fd7f988f19 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Hallinnollinen raja";
 
-"type.boundary.administrative.10" = "Hallinnollinen raja";
-
-"type.boundary.administrative.11" = "Hallinnollinen raja";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "Valtakunnanraja";
 
-"type.boundary.administrative.3" = "Hallinnollinen raja";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Regional Boundary";
 
-"type.boundary.administrative.4" = "Hallinnollinen raja";
-
-"type.boundary.administrative.5" = "Hallinnollinen raja";
-
-"type.boundary.administrative.6" = "Hallinnollinen raja";
-
-"type.boundary.administrative.7" = "Hallinnollinen raja";
-
-"type.boundary.administrative.8" = "Hallinnollinen raja";
-
-"type.boundary.administrative.9" = "Hallinnollinen raja";
-
-"type.boundary.administrative.city" = "Kaupunginraja";
-
-"type.boundary.administrative.country" = "Valtakunnanraja";
-
-"type.boundary.administrative.county" = "Maakunnanraja";
-
-"type.boundary.administrative.municipality" = "Kunnanraja";
-
-"type.boundary.administrative.nation" = "Valtakunnanraja";
-
-"type.boundary.administrative.region" = "Regional Boundary";
-
-"type.boundary.administrative.state" = "Osavaltion raja";
-
-"type.boundary.administrative.suburb" = "Esikaupunki";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Regional Boundary";
 
 "type.boundary.national_park" = "Kansallispuisto";
 
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
index 626e2a7ee0..3e9f80ad0b 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Frontière administrative";
 
-"type.boundary.administrative.10" = "Frontière administrative";
-
-"type.boundary.administrative.11" = "Frontière administrative";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "Frontière nationale";
 
-"type.boundary.administrative.3" = "Frontière administrative";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Frontière régionale";
 
-"type.boundary.administrative.4" = "Frontière administrative";
-
-"type.boundary.administrative.5" = "Frontière administrative";
-
-"type.boundary.administrative.6" = "Frontière administrative";
-
-"type.boundary.administrative.7" = "Frontière administrative";
-
-"type.boundary.administrative.8" = "Frontière administrative";
-
-"type.boundary.administrative.9" = "Frontière administrative";
-
-"type.boundary.administrative.city" = "Frontière de la ville";
-
-"type.boundary.administrative.country" = "Frontière nationale";
-
-"type.boundary.administrative.county" = "Frontière du comté";
-
-"type.boundary.administrative.municipality" = "Frontière de la municipalité";
-
-"type.boundary.administrative.nation" = "Frontière nationale";
-
-"type.boundary.administrative.region" = "Frontière régionale";
-
-"type.boundary.administrative.state" = "State Boundary";
-
-"type.boundary.administrative.suburb" = "Frontière de quartier";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Frontière régionale";
 
 "type.boundary.national_park" = "Parc national";
 
diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
index 81e4e28280..732f929bda 100644
--- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Administrative Boundary";
 
-"type.boundary.administrative.10" = "Administrative Boundary";
-
-"type.boundary.administrative.11" = "Administrative Boundary";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "National Border";
 
-"type.boundary.administrative.3" = "Administrative Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Regional Boundary";
 
-"type.boundary.administrative.4" = "Administrative Boundary";
-
-"type.boundary.administrative.5" = "Administrative Boundary";
-
-"type.boundary.administrative.6" = "Administrative Boundary";
-
-"type.boundary.administrative.7" = "Administrative Boundary";
-
-"type.boundary.administrative.8" = "Administrative Boundary";
-
-"type.boundary.administrative.9" = "Administrative Boundary";
-
-"type.boundary.administrative.city" = "City Boundary";
-
-"type.boundary.administrative.country" = "National Border";
-
-"type.boundary.administrative.county" = "County Boundary";
-
-"type.boundary.administrative.municipality" = "Municipality Boundary";
-
-"type.boundary.administrative.nation" = "National Border";
-
-"type.boundary.administrative.region" = "Regional Boundary";
-
-"type.boundary.administrative.state" = "State Boundary";
-
-"type.boundary.administrative.suburb" = "Suburb Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Regional Boundary";
 
 "type.boundary.national_park" = "National Park";
 
diff --git a/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings
index 16874bd1fc..5cc4503bde 100644
--- a/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Administrative Boundary";
 
-"type.boundary.administrative.10" = "Administrative Boundary";
-
-"type.boundary.administrative.11" = "Administrative Boundary";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "National Border";
 
-"type.boundary.administrative.3" = "Administrative Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Regional Boundary";
 
-"type.boundary.administrative.4" = "Administrative Boundary";
-
-"type.boundary.administrative.5" = "Administrative Boundary";
-
-"type.boundary.administrative.6" = "Administrative Boundary";
-
-"type.boundary.administrative.7" = "Administrative Boundary";
-
-"type.boundary.administrative.8" = "Administrative Boundary";
-
-"type.boundary.administrative.9" = "Administrative Boundary";
-
-"type.boundary.administrative.city" = "City Boundary";
-
-"type.boundary.administrative.country" = "National Border";
-
-"type.boundary.administrative.county" = "County Boundary";
-
-"type.boundary.administrative.municipality" = "Municipality Boundary";
-
-"type.boundary.administrative.nation" = "National Border";
-
-"type.boundary.administrative.region" = "Regional Boundary";
-
-"type.boundary.administrative.state" = "State Boundary";
-
-"type.boundary.administrative.suburb" = "Suburb Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Regional Boundary";
 
 "type.boundary.national_park" = "National Park";
 
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index c00f13e0ec..bd75c18945 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Administrative Boundary";
 
-"type.boundary.administrative.10" = "Administrative Boundary";
-
-"type.boundary.administrative.11" = "Administrative Boundary";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "National Border";
 
-"type.boundary.administrative.3" = "Administrative Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Regional Boundary";
 
-"type.boundary.administrative.4" = "Administrative Boundary";
-
-"type.boundary.administrative.5" = "Administrative Boundary";
-
-"type.boundary.administrative.6" = "Administrative Boundary";
-
-"type.boundary.administrative.7" = "Administrative Boundary";
-
-"type.boundary.administrative.8" = "Administrative Boundary";
-
-"type.boundary.administrative.9" = "Administrative Boundary";
-
-"type.boundary.administrative.city" = "City Boundary";
-
-"type.boundary.administrative.country" = "National Border";
-
-"type.boundary.administrative.county" = "County Boundary";
-
-"type.boundary.administrative.municipality" = "Municipality Boundary";
-
-"type.boundary.administrative.nation" = "National Border";
-
-"type.boundary.administrative.region" = "Regional Boundary";
-
-"type.boundary.administrative.state" = "State Boundary";
-
-"type.boundary.administrative.suburb" = "Suburb Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Regional Boundary";
 
 "type.boundary.national_park" = "Nemzeti park";
 
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
index 0001265061..673cc61ebe 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Administrative Boundary";
 
-"type.boundary.administrative.10" = "Administrative Boundary";
-
-"type.boundary.administrative.11" = "Administrative Boundary";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "National Border";
 
-"type.boundary.administrative.3" = "Administrative Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Regional Boundary";
 
-"type.boundary.administrative.4" = "Administrative Boundary";
-
-"type.boundary.administrative.5" = "Administrative Boundary";
-
-"type.boundary.administrative.6" = "Administrative Boundary";
-
-"type.boundary.administrative.7" = "Administrative Boundary";
-
-"type.boundary.administrative.8" = "Administrative Boundary";
-
-"type.boundary.administrative.9" = "Administrative Boundary";
-
-"type.boundary.administrative.city" = "City Boundary";
-
-"type.boundary.administrative.country" = "National Border";
-
-"type.boundary.administrative.county" = "County Boundary";
-
-"type.boundary.administrative.municipality" = "Municipality Boundary";
-
-"type.boundary.administrative.nation" = "National Border";
-
-"type.boundary.administrative.region" = "Regional Boundary";
-
-"type.boundary.administrative.state" = "State Boundary";
-
-"type.boundary.administrative.suburb" = "Suburb Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Regional Boundary";
 
 "type.boundary.national_park" = "Taman Nasional";
 
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index ba7e8830e6..e6569ba2e6 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Confine amministrativo";
 
-"type.boundary.administrative.10" = "Confine amministrativo";
-
-"type.boundary.administrative.11" = "Confine amministrativo";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "Confine nazionale";
 
-"type.boundary.administrative.3" = "Confine amministrativo";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Confine regionale";
 
-"type.boundary.administrative.4" = "Confine amministrativo";
-
-"type.boundary.administrative.5" = "Confine amministrativo";
-
-"type.boundary.administrative.6" = "Confine amministrativo";
-
-"type.boundary.administrative.7" = "Confine amministrativo";
-
-"type.boundary.administrative.8" = "Confine amministrativo";
-
-"type.boundary.administrative.9" = "Confine amministrativo";
-
-"type.boundary.administrative.city" = "Confine cittadino";
-
-"type.boundary.administrative.country" = "Confine nazionale";
-
-"type.boundary.administrative.county" = "County Boundary";
-
-"type.boundary.administrative.municipality" = "Confini municipale";
-
-"type.boundary.administrative.nation" = "Confine nazionale";
-
-"type.boundary.administrative.region" = "Confine regionale";
-
-"type.boundary.administrative.state" = "Confine statale";
-
-"type.boundary.administrative.suburb" = "Suburb Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Confine regionale";
 
 "type.boundary.national_park" = "Parco nazionale";
 
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
index 58ba462f3b..d78df24049 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "行政境界";
 
-"type.boundary.administrative.10" = "行政境界";
-
-"type.boundary.administrative.11" = "行政境界";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "National Border";
 
-"type.boundary.administrative.3" = "行政境界";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Regional Boundary";
 
-"type.boundary.administrative.4" = "行政境界";
-
-"type.boundary.administrative.5" = "行政境界";
-
-"type.boundary.administrative.6" = "行政境界";
-
-"type.boundary.administrative.7" = "行政境界";
-
-"type.boundary.administrative.8" = "行政境界";
-
-"type.boundary.administrative.9" = "行政境界";
-
-"type.boundary.administrative.city" = "City Boundary";
-
-"type.boundary.administrative.country" = "National Border";
-
-"type.boundary.administrative.county" = "County Boundary";
-
-"type.boundary.administrative.municipality" = "Municipality Boundary";
-
-"type.boundary.administrative.nation" = "National Border";
-
-"type.boundary.administrative.region" = "Regional Boundary";
-
-"type.boundary.administrative.state" = "State Boundary";
-
-"type.boundary.administrative.suburb" = "Suburb Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Regional Boundary";
 
 "type.boundary.national_park" = "国立公園";
 
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
index b06596c805..985356c61d 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Administrative Boundary";
 
-"type.boundary.administrative.10" = "Administrative Boundary";
-
-"type.boundary.administrative.11" = "Administrative Boundary";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "National Border";
 
-"type.boundary.administrative.3" = "Administrative Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Regional Boundary";
 
-"type.boundary.administrative.4" = "Administrative Boundary";
-
-"type.boundary.administrative.5" = "Administrative Boundary";
-
-"type.boundary.administrative.6" = "Administrative Boundary";
-
-"type.boundary.administrative.7" = "Administrative Boundary";
-
-"type.boundary.administrative.8" = "Administrative Boundary";
-
-"type.boundary.administrative.9" = "Administrative Boundary";
-
-"type.boundary.administrative.city" = "City Boundary";
-
-"type.boundary.administrative.country" = "National Border";
-
-"type.boundary.administrative.county" = "County Boundary";
-
-"type.boundary.administrative.municipality" = "Municipality Boundary";
-
-"type.boundary.administrative.nation" = "National Border";
-
-"type.boundary.administrative.region" = "Regional Boundary";
-
-"type.boundary.administrative.state" = "State Boundary";
-
-"type.boundary.administrative.suburb" = "Suburb Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Regional Boundary";
 
 "type.boundary.national_park" = "국립 공원";
 
diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
index 3609cae86f..9720730633 100644
--- a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "प्रशासकीय सीमा";
 
-"type.boundary.administrative.10" = "प्रशासकीय सीमा";
-
-"type.boundary.administrative.11" = "प्रशासकीय सीमा";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "राष्ट्रीय सीमा";
 
-"type.boundary.administrative.3" = "प्रशासकीय सीमा";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "प्रादेशिक सीमा";
 
-"type.boundary.administrative.4" = "प्रशासकीय सीमा";
-
-"type.boundary.administrative.5" = "प्रशासकीय सीमा";
-
-"type.boundary.administrative.6" = "प्रशासकीय सीमा";
-
-"type.boundary.administrative.7" = "प्रशासकीय सीमा";
-
-"type.boundary.administrative.8" = "प्रशासकीय सीमा";
-
-"type.boundary.administrative.9" = "प्रशासकीय सीमा";
-
-"type.boundary.administrative.city" = "शहराची सीमा";
-
-"type.boundary.administrative.country" = "राष्ट्रीय सीमा";
-
-"type.boundary.administrative.county" = "परगणा सीमा";
-
-"type.boundary.administrative.municipality" = "नगरपालिकेची सीमा";
-
-"type.boundary.administrative.nation" = "राष्ट्रीय सीमा";
-
-"type.boundary.administrative.region" = "प्रादेशिक सीमा";
-
-"type.boundary.administrative.state" = "राज्य सीमा";
-
-"type.boundary.administrative.suburb" = "उपनगर सीमा";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "प्रादेशिक सीमा";
 
 "type.boundary.national_park" = "राष्ट्रीय उद्यान";
 
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index 482a215e6e..f44193d007 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Administrative Boundary";
 
-"type.boundary.administrative.10" = "Administrative Boundary";
-
-"type.boundary.administrative.11" = "Administrative Boundary";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "National Border";
 
-"type.boundary.administrative.3" = "Administrative Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Regional Boundary";
 
-"type.boundary.administrative.4" = "Administrative Boundary";
-
-"type.boundary.administrative.5" = "Administrative Boundary";
-
-"type.boundary.administrative.6" = "Administrative Boundary";
-
-"type.boundary.administrative.7" = "Administrative Boundary";
-
-"type.boundary.administrative.8" = "Administrative Boundary";
-
-"type.boundary.administrative.9" = "Administrative Boundary";
-
-"type.boundary.administrative.city" = "City Boundary";
-
-"type.boundary.administrative.country" = "National Border";
-
-"type.boundary.administrative.county" = "County Boundary";
-
-"type.boundary.administrative.municipality" = "Municipality Boundary";
-
-"type.boundary.administrative.nation" = "National Border";
-
-"type.boundary.administrative.region" = "Regional Boundary";
-
-"type.boundary.administrative.state" = "State Boundary";
-
-"type.boundary.administrative.suburb" = "Suburb Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Regional Boundary";
 
 "type.boundary.national_park" = "Nasjonalpark";
 
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index 4421f1ee32..a5e0a55e1a 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Administratieve grens";
 
-"type.boundary.administrative.10" = "Administratieve grens";
+/* Borders between countries. */
+"type.boundary.administrative.2" = "Natiegrens";
 
-"type.boundary.administrative.11" = "Administratieve grens";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Regiogrens";
 
-"type.boundary.administrative.2" = "Landsgrens";
-
-"type.boundary.administrative.3" = "Administratieve grens";
-
-"type.boundary.administrative.4" = "Administratieve grens";
-
-"type.boundary.administrative.5" = "Administratieve grens";
-
-"type.boundary.administrative.6" = "Administratieve grens";
-
-"type.boundary.administrative.7" = "Administratieve grens";
-
-"type.boundary.administrative.8" = "Administratieve grens";
-
-"type.boundary.administrative.9" = "Administratieve grens";
-
-"type.boundary.administrative.city" = "Stadsgrens";
-
-"type.boundary.administrative.country" = "Landsgrens";
-
-"type.boundary.administrative.county" = "Provinciegrens";
-
-"type.boundary.administrative.municipality" = "Gemeentegrens";
-
-"type.boundary.administrative.nation" = "Natiegrens";
-
-"type.boundary.administrative.region" = "Regiogrens";
-
-"type.boundary.administrative.state" = "Staatsgrens";
-
-"type.boundary.administrative.suburb" = "Buitenwijkgrens";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Regiogrens";
 
 "type.boundary.national_park" = "Nationaal park";
 
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
index d84df993ee..c2b8be5f9b 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Granica administracyjna";
 
-"type.boundary.administrative.10" = "Granica administracyjna";
-
-"type.boundary.administrative.11" = "Granica administracyjna";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "Granica państwa";
 
-"type.boundary.administrative.3" = "Granica administracyjna";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Granica regionu";
 
-"type.boundary.administrative.4" = "Granica administracyjna";
-
-"type.boundary.administrative.5" = "Granica administracyjna";
-
-"type.boundary.administrative.6" = "Granica administracyjna";
-
-"type.boundary.administrative.7" = "Granica administracyjna";
-
-"type.boundary.administrative.8" = "Granica administracyjna";
-
-"type.boundary.administrative.9" = "Granica administracyjna";
-
-"type.boundary.administrative.city" = "Granica miasta";
-
-"type.boundary.administrative.country" = "Granica państwa";
-
-"type.boundary.administrative.county" = "Granica hrabstwa";
-
-"type.boundary.administrative.municipality" = "Granica gminy";
-
-"type.boundary.administrative.nation" = "Granica państwa";
-
-"type.boundary.administrative.region" = "Granica regionu";
-
-"type.boundary.administrative.state" = "Granica województwa";
-
-"type.boundary.administrative.suburb" = "Granica przedmieść";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Granica regionu";
 
 "type.boundary.national_park" = "Park narodowy";
 
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index f07fec94c6..efda9ac89e 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Fronteira administrativa";
 
-"type.boundary.administrative.10" = "Fronteira administrativa";
-
-"type.boundary.administrative.11" = "Fronteira administrativa";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "Fronteira de país";
 
-"type.boundary.administrative.3" = "Fronteira administrativa";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Fronteira de região";
 
-"type.boundary.administrative.4" = "Fronteira administrativa";
-
-"type.boundary.administrative.5" = "Fronteira administrativa";
-
-"type.boundary.administrative.6" = "Fronteira administrativa";
-
-"type.boundary.administrative.7" = "Fronteira administrativa";
-
-"type.boundary.administrative.8" = "Fronteira administrativa";
-
-"type.boundary.administrative.9" = "Fronteira administrativa";
-
-"type.boundary.administrative.city" = "Fronteira de cidade";
-
-"type.boundary.administrative.country" = "Fronteira de país";
-
-"type.boundary.administrative.county" = "Fronteira de condado";
-
-"type.boundary.administrative.municipality" = "Fronteira de município";
-
-"type.boundary.administrative.nation" = "Fronteira de nação";
-
-"type.boundary.administrative.region" = "Fronteira de região";
-
-"type.boundary.administrative.state" = "Fronteira de estado";
-
-"type.boundary.administrative.suburb" = "Fronteira de subúrbio";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Fronteira de região";
 
 "type.boundary.national_park" = "Parque nacional";
 
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
index 9c064986f3..0220aae613 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Fronteira administrativa";
 
-"type.boundary.administrative.10" = "Fronteira administrativa";
-
-"type.boundary.administrative.11" = "Fronteira administrativa";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "Fronteira de país";
 
-"type.boundary.administrative.3" = "Fronteira administrativa";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Fronteira de região";
 
-"type.boundary.administrative.4" = "Fronteira administrativa";
-
-"type.boundary.administrative.5" = "Fronteira administrativa";
-
-"type.boundary.administrative.6" = "Fronteira administrativa";
-
-"type.boundary.administrative.7" = "Fronteira administrativa";
-
-"type.boundary.administrative.8" = "Fronteira administrativa";
-
-"type.boundary.administrative.9" = "Fronteira administrativa";
-
-"type.boundary.administrative.city" = "Fronteira de cidade";
-
-"type.boundary.administrative.country" = "Fronteira de país";
-
-"type.boundary.administrative.county" = "Fronteira de condado";
-
-"type.boundary.administrative.municipality" = "Fronteira de município";
-
-"type.boundary.administrative.nation" = "Fronteira de nação";
-
-"type.boundary.administrative.region" = "Fronteira de região";
-
-"type.boundary.administrative.state" = "Fronteira de estado";
-
-"type.boundary.administrative.suburb" = "Fronteira de subúrbio";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Fronteira de região";
 
 "type.boundary.national_park" = "Parque nacional";
 
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
index e91658679d..f60e551edc 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Administrative Boundary";
 
-"type.boundary.administrative.10" = "Administrative Boundary";
-
-"type.boundary.administrative.11" = "Administrative Boundary";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "National Border";
 
-"type.boundary.administrative.3" = "Administrative Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Regional Boundary";
 
-"type.boundary.administrative.4" = "Administrative Boundary";
-
-"type.boundary.administrative.5" = "Administrative Boundary";
-
-"type.boundary.administrative.6" = "Administrative Boundary";
-
-"type.boundary.administrative.7" = "Administrative Boundary";
-
-"type.boundary.administrative.8" = "Administrative Boundary";
-
-"type.boundary.administrative.9" = "Administrative Boundary";
-
-"type.boundary.administrative.city" = "City Boundary";
-
-"type.boundary.administrative.country" = "National Border";
-
-"type.boundary.administrative.county" = "County Boundary";
-
-"type.boundary.administrative.municipality" = "Municipality Boundary";
-
-"type.boundary.administrative.nation" = "National Border";
-
-"type.boundary.administrative.region" = "Regional Boundary";
-
-"type.boundary.administrative.state" = "State Boundary";
-
-"type.boundary.administrative.suburb" = "Suburb Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Regional Boundary";
 
 "type.boundary.national_park" = "Parcul național";
 
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
index 8c8c34a675..3f4c8950f9 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Административная граница";
 
-"type.boundary.administrative.10" = "Административная граница";
-
-"type.boundary.administrative.11" = "Административная граница";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "Граница страны";
 
-"type.boundary.administrative.3" = "Административная граница";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Граница региона";
 
-"type.boundary.administrative.4" = "Административная граница";
-
-"type.boundary.administrative.5" = "Административная граница";
-
-"type.boundary.administrative.6" = "Административная граница";
-
-"type.boundary.administrative.7" = "Административная граница";
-
-"type.boundary.administrative.8" = "Административная граница";
-
-"type.boundary.administrative.9" = "Административная граница";
-
-"type.boundary.administrative.city" = "Граница города";
-
-"type.boundary.administrative.country" = "Граница страны";
-
-"type.boundary.administrative.county" = "Граница округа";
-
-"type.boundary.administrative.municipality" = "Граница муниципалитета";
-
-"type.boundary.administrative.nation" = "Граница страны";
-
-"type.boundary.administrative.region" = "Граница региона";
-
-"type.boundary.administrative.state" = "Граница штата";
-
-"type.boundary.administrative.suburb" = "Граница пригорода";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Граница региона";
 
 "type.boundary.national_park" = "Национальный парк";
 
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
index 3146443003..c6049dfdb3 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Administratívna hranica";
 
-"type.boundary.administrative.10" = "Administratívna hranica";
-
-"type.boundary.administrative.11" = "Administratívna hranica";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "Národná hranica";
 
-"type.boundary.administrative.3" = "Administratívna hranica";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Hranica regiónu";
 
-"type.boundary.administrative.4" = "Administratívna hranica";
-
-"type.boundary.administrative.5" = "Administratívna hranica";
-
-"type.boundary.administrative.6" = "Administratívna hranica";
-
-"type.boundary.administrative.7" = "Administratívna hranica";
-
-"type.boundary.administrative.8" = "Administratívna hranica";
-
-"type.boundary.administrative.9" = "Administratívna hranica";
-
-"type.boundary.administrative.city" = "Hranica mesta";
-
-"type.boundary.administrative.country" = "Národná hranica";
-
-"type.boundary.administrative.county" = "County Boundary";
-
-"type.boundary.administrative.municipality" = "Municipality Boundary";
-
-"type.boundary.administrative.nation" = "Národná hranica";
-
-"type.boundary.administrative.region" = "Hranica regiónu";
-
-"type.boundary.administrative.state" = "Štátna hranica";
-
-"type.boundary.administrative.suburb" = "Suburb Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Hranica regiónu";
 
 "type.boundary.national_park" = "Národný park";
 
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
index dde7fc8267..bf68ad7035 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Administrative Boundary";
 
-"type.boundary.administrative.10" = "Administrative Boundary";
-
-"type.boundary.administrative.11" = "Administrative Boundary";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "National Border";
 
-"type.boundary.administrative.3" = "Administrative Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Regional Boundary";
 
-"type.boundary.administrative.4" = "Administrative Boundary";
-
-"type.boundary.administrative.5" = "Administrative Boundary";
-
-"type.boundary.administrative.6" = "Administrative Boundary";
-
-"type.boundary.administrative.7" = "Administrative Boundary";
-
-"type.boundary.administrative.8" = "Administrative Boundary";
-
-"type.boundary.administrative.9" = "Administrative Boundary";
-
-"type.boundary.administrative.city" = "City Boundary";
-
-"type.boundary.administrative.country" = "National Border";
-
-"type.boundary.administrative.county" = "County Boundary";
-
-"type.boundary.administrative.municipality" = "Municipality Boundary";
-
-"type.boundary.administrative.nation" = "National Border";
-
-"type.boundary.administrative.region" = "Regional Boundary";
-
-"type.boundary.administrative.state" = "State Boundary";
-
-"type.boundary.administrative.suburb" = "Suburb Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Regional Boundary";
 
 "type.boundary.national_park" = "Nationalpark";
 
diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
index 9779c9b62c..970ab0ba75 100644
--- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Administrative Boundary";
 
-"type.boundary.administrative.10" = "Administrative Boundary";
-
-"type.boundary.administrative.11" = "Administrative Boundary";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "National Border";
 
-"type.boundary.administrative.3" = "Administrative Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Regional Boundary";
 
-"type.boundary.administrative.4" = "Administrative Boundary";
-
-"type.boundary.administrative.5" = "Administrative Boundary";
-
-"type.boundary.administrative.6" = "Administrative Boundary";
-
-"type.boundary.administrative.7" = "Administrative Boundary";
-
-"type.boundary.administrative.8" = "Administrative Boundary";
-
-"type.boundary.administrative.9" = "Administrative Boundary";
-
-"type.boundary.administrative.city" = "City Boundary";
-
-"type.boundary.administrative.country" = "National Border";
-
-"type.boundary.administrative.county" = "County Boundary";
-
-"type.boundary.administrative.municipality" = "Municipality Boundary";
-
-"type.boundary.administrative.nation" = "National Border";
-
-"type.boundary.administrative.region" = "Regional Boundary";
-
-"type.boundary.administrative.state" = "State Boundary";
-
-"type.boundary.administrative.suburb" = "Suburb Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Regional Boundary";
 
 "type.boundary.national_park" = "Hifadhi ya taifa";
 
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
index efdcd23b14..04ecb62297 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Administrative Boundary";
 
-"type.boundary.administrative.10" = "Administrative Boundary";
-
-"type.boundary.administrative.11" = "Administrative Boundary";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "National Border";
 
-"type.boundary.administrative.3" = "Administrative Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Regional Boundary";
 
-"type.boundary.administrative.4" = "Administrative Boundary";
-
-"type.boundary.administrative.5" = "Administrative Boundary";
-
-"type.boundary.administrative.6" = "Administrative Boundary";
-
-"type.boundary.administrative.7" = "Administrative Boundary";
-
-"type.boundary.administrative.8" = "Administrative Boundary";
-
-"type.boundary.administrative.9" = "Administrative Boundary";
-
-"type.boundary.administrative.city" = "City Boundary";
-
-"type.boundary.administrative.country" = "National Border";
-
-"type.boundary.administrative.county" = "County Boundary";
-
-"type.boundary.administrative.municipality" = "Municipality Boundary";
-
-"type.boundary.administrative.nation" = "National Border";
-
-"type.boundary.administrative.region" = "Regional Boundary";
-
-"type.boundary.administrative.state" = "State Boundary";
-
-"type.boundary.administrative.suburb" = "Suburb Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Regional Boundary";
 
 "type.boundary.national_park" = "อุทยานแห่งชาติ";
 
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index 2fda35f873..0fd4ba7015 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "İdari Sınır";
 
-"type.boundary.administrative.10" = "İdari Sınır";
-
-"type.boundary.administrative.11" = "İdari Sınır";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "Ulusal Sınır";
 
-"type.boundary.administrative.3" = "İdari Sınır";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Bölgesel Sınır";
 
-"type.boundary.administrative.4" = "İdari Sınır";
-
-"type.boundary.administrative.5" = "İdari Sınır";
-
-"type.boundary.administrative.6" = "İdari Sınır";
-
-"type.boundary.administrative.7" = "İdari Sınır";
-
-"type.boundary.administrative.8" = "İdari Sınır";
-
-"type.boundary.administrative.9" = "İdari Sınır";
-
-"type.boundary.administrative.city" = "Şehir Sınırı";
-
-"type.boundary.administrative.country" = "Ulusal Sınır";
-
-"type.boundary.administrative.county" = "İlçe Sınırı";
-
-"type.boundary.administrative.municipality" = "Belediye Sınırı";
-
-"type.boundary.administrative.nation" = "Ulusal Sınır";
-
-"type.boundary.administrative.region" = "Bölgesel Sınır";
-
-"type.boundary.administrative.state" = "Devlet Sınırı";
-
-"type.boundary.administrative.suburb" = "Mahalle Sınırı";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Bölgesel Sınır";
 
 "type.boundary.national_park" = "Ulusal Park";
 
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
index 2c14c9e55c..5fe9b007dd 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Адміністративний поділ";
 
-"type.boundary.administrative.10" = "Адміністративний поділ";
-
-"type.boundary.administrative.11" = "Адміністративний поділ";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "Кордон країни";
 
-"type.boundary.administrative.3" = "Адміністративний поділ";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Областний поділ";
 
-"type.boundary.administrative.4" = "Адміністративний поділ";
-
-"type.boundary.administrative.5" = "Адміністративний поділ";
-
-"type.boundary.administrative.6" = "Адміністративний поділ";
-
-"type.boundary.administrative.7" = "Адміністративний поділ";
-
-"type.boundary.administrative.8" = "Адміністративний поділ";
-
-"type.boundary.administrative.9" = "Адміністративний поділ";
-
-"type.boundary.administrative.city" = "Межа міста";
-
-"type.boundary.administrative.country" = "Кордон країни";
-
-"type.boundary.administrative.county" = "Поділ округа";
-
-"type.boundary.administrative.municipality" = "Municipality Boundary";
-
-"type.boundary.administrative.nation" = "Кордон країни";
-
-"type.boundary.administrative.region" = "Областний поділ";
-
-"type.boundary.administrative.state" = "State Boundary";
-
-"type.boundary.administrative.suburb" = "Приміська межа";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Областний поділ";
 
 "type.boundary.national_park" = "Національний парк";
 
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
index 0f4e4029c6..49330102d7 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Administrative Boundary";
 
-"type.boundary.administrative.10" = "Administrative Boundary";
-
-"type.boundary.administrative.11" = "Administrative Boundary";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "National Border";
 
-"type.boundary.administrative.3" = "Administrative Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Regional Boundary";
 
-"type.boundary.administrative.4" = "Administrative Boundary";
-
-"type.boundary.administrative.5" = "Administrative Boundary";
-
-"type.boundary.administrative.6" = "Administrative Boundary";
-
-"type.boundary.administrative.7" = "Administrative Boundary";
-
-"type.boundary.administrative.8" = "Administrative Boundary";
-
-"type.boundary.administrative.9" = "Administrative Boundary";
-
-"type.boundary.administrative.city" = "City Boundary";
-
-"type.boundary.administrative.country" = "National Border";
-
-"type.boundary.administrative.county" = "County Boundary";
-
-"type.boundary.administrative.municipality" = "Municipality Boundary";
-
-"type.boundary.administrative.nation" = "National Border";
-
-"type.boundary.administrative.region" = "Regional Boundary";
-
-"type.boundary.administrative.state" = "State Boundary";
-
-"type.boundary.administrative.suburb" = "Suburb Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Regional Boundary";
 
 "type.boundary.national_park" = "Công viên quốc gia";
 
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index cd5c55ab48..5c610c77c8 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "行政区域界线";
 
-"type.boundary.administrative.10" = "10级行政区域界线";
-
-"type.boundary.administrative.11" = "11级行政区域界线";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "国家行政区域界线";
 
-"type.boundary.administrative.3" = "3级行政区域界线";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "1区域行政区域界线";
 
-"type.boundary.administrative.4" = "4级行政区域界线";
-
-"type.boundary.administrative.5" = "5级行政区域界线";
-
-"type.boundary.administrative.6" = "6级行政区域界线";
-
-"type.boundary.administrative.7" = "7级行政区域界线";
-
-"type.boundary.administrative.8" = "8级行政区域界线";
-
-"type.boundary.administrative.9" = "9级行政区域界线";
-
-"type.boundary.administrative.city" = "城市行政区域界线";
-
-"type.boundary.administrative.country" = "国家行政区域界线";
-
-"type.boundary.administrative.county" = "县行政区域界线";
-
-"type.boundary.administrative.municipality" = "自治市行政区域界线";
-
-"type.boundary.administrative.nation" = "国家行政区域界线";
-
-"type.boundary.administrative.region" = "1区域行政区域界线";
-
-"type.boundary.administrative.state" = "州省行政区域界线";
-
-"type.boundary.administrative.suburb" = "市郊行政区域界线";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "1区域行政区域界线";
 
 "type.boundary.national_park" = "国家公园";
 
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
index 717f4fab0f..bebe824b50 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
@@ -1674,41 +1674,14 @@
 
 "type.boundary.administrative" = "Administrative Boundary";
 
-"type.boundary.administrative.10" = "Administrative Boundary";
-
-"type.boundary.administrative.11" = "Administrative Boundary";
-
+/* Borders between countries. */
 "type.boundary.administrative.2" = "National Border";
 
-"type.boundary.administrative.3" = "Administrative Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.3" = "Regional Boundary";
 
-"type.boundary.administrative.4" = "Administrative Boundary";
-
-"type.boundary.administrative.5" = "Administrative Boundary";
-
-"type.boundary.administrative.6" = "Administrative Boundary";
-
-"type.boundary.administrative.7" = "Administrative Boundary";
-
-"type.boundary.administrative.8" = "Administrative Boundary";
-
-"type.boundary.administrative.9" = "Administrative Boundary";
-
-"type.boundary.administrative.city" = "City Boundary";
-
-"type.boundary.administrative.country" = "National Border";
-
-"type.boundary.administrative.county" = "County Boundary";
-
-"type.boundary.administrative.municipality" = "Municipality Boundary";
-
-"type.boundary.administrative.nation" = "National Border";
-
-"type.boundary.administrative.region" = "Regional Boundary";
-
-"type.boundary.administrative.state" = "State Boundary";
-
-"type.boundary.administrative.suburb" = "Suburb Boundary";
+/* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
+"type.boundary.administrative.4" = "Regional Boundary";
 
 "type.boundary.national_park" = "國家公園";