diff --git a/android/app/src/main/res/values-ar/strings.xml b/android/app/src/main/res/values-ar/strings.xml
index d994585a6e..3c6de849c9 100644
--- a/android/app/src/main/res/values-ar/strings.xml
+++ b/android/app/src/main/res/values-ar/strings.xml
@@ -83,7 +83,7 @@
 	<string name="core_my_places">أماكني</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">الاسم</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">العنوان</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">قائمة</string>
@@ -1006,7 +1006,8 @@
 	<string name="type.boundary.protected_area.5">منطقة محمية</string>
 	<string name="type.boundary.protected_area.6">منطقة محمية</string>
 	<string name="type.building">مبنى</string>
-	<string name="type.building.address">مبنى</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">العنوان</string>
 	<string name="type.building.has_parts">مبنى</string>
 	<string name="type.building_part">مبنى</string>
 	<string name="type.building.garage">مرآب</string>
diff --git a/android/app/src/main/res/values-be/strings.xml b/android/app/src/main/res/values-be/strings.xml
index b3291eae9d..8839329681 100644
--- a/android/app/src/main/res/values-be/strings.xml
+++ b/android/app/src/main/res/values-be/strings.xml
@@ -83,7 +83,7 @@
 	<string name="core_my_places">Мае месцы</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Назва</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">Адрас</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">Спіс</string>
@@ -862,6 +862,8 @@
 	<string name="type.boundary.protected_area.4">Запаведная зона</string>
 	<string name="type.boundary.protected_area.5">Запаведная зона</string>
 	<string name="type.boundary.protected_area.6">Запаведная зона</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">Адрас</string>
 	<string name="type.cemetery.grave">Магіла</string>
 	<string name="type.craft">Рамяство</string>
 	<string name="type.craft.beekeeper">Пчаляр</string>
diff --git a/android/app/src/main/res/values-bg/strings.xml b/android/app/src/main/res/values-bg/strings.xml
index 5763a8b0b3..f3c8407fe4 100644
--- a/android/app/src/main/res/values-bg/strings.xml
+++ b/android/app/src/main/res/values-bg/strings.xml
@@ -83,7 +83,7 @@
 	<string name="core_my_places">Мои места</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Име</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">Адрес</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">Списък</string>
@@ -746,6 +746,8 @@
 	<string name="type.boundary.protected_area.4">Защитена местност</string>
 	<string name="type.boundary.protected_area.5">Защитена местност</string>
 	<string name="type.boundary.protected_area.6">Защитена местност</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">Адрес</string>
 	<string name="type.cemetery.grave">Гроб</string>
 	<string name="type.craft">Занаяти</string>
 	<string name="type.craft.beekeeper">Пчелар</string>
diff --git a/android/app/src/main/res/values-ca/strings.xml b/android/app/src/main/res/values-ca/strings.xml
index 162cd572a6..888d2e738d 100644
--- a/android/app/src/main/res/values-ca/strings.xml
+++ b/android/app/src/main/res/values-ca/strings.xml
@@ -72,7 +72,7 @@
 	<string name="core_my_places">Els meus llocs</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Nom</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">Adreça</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">Llista</string>
@@ -801,6 +801,8 @@
 	<string name="type.boundary.protected_area.4">Àrea Protegida</string>
 	<string name="type.boundary.protected_area.5">Àrea Protegida</string>
 	<string name="type.boundary.protected_area.6">Àrea Protegida</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">Adreça</string>
 	<string name="type.craft.caterer">Càtering</string>
 	<string name="type.craft.grinding_mill">Molí de mòlta</string>
 	<string name="type.craft.key_cutter">Tall de claus</string>
diff --git a/android/app/src/main/res/values-cs/strings.xml b/android/app/src/main/res/values-cs/strings.xml
index 8b13fd20f8..7da2efd414 100644
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -80,7 +80,7 @@
 	<string name="core_my_places">Moje místa</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Název</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">Adresa</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">Seznam</string>
@@ -899,7 +899,8 @@
 	<string name="type.boundary.protected_area.5">Chráněné území</string>
 	<string name="type.boundary.protected_area.6">Chráněné území</string>
 	<string name="type.building">Stavba</string>
-	<string name="type.building.address">Stavba</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">Adresa</string>
 	<string name="type.building.has_parts">Stavba</string>
 	<string name="type.building_part">Stavba</string>
 	<string name="type.building.garage">Garáž</string>
diff --git a/android/app/src/main/res/values-da/strings.xml b/android/app/src/main/res/values-da/strings.xml
index e41925d783..b8ea4fa428 100644
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -80,7 +80,7 @@
 	<string name="core_my_places">Mine Steder</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Navn</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">Adresse</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">Liste</string>
@@ -886,7 +886,8 @@
 	<string name="type.boundary.protected_area.5">Beskyttet område</string>
 	<string name="type.boundary.protected_area.6">Beskyttet område</string>
 	<string name="type.building">Bygning</string>
-	<string name="type.building.address">Bygning</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">Adresse</string>
 	<string name="type.building.has_parts">Bygning</string>
 	<string name="type.building_part">Bygning</string>
 	<string name="type.building.train_station">Togstation</string>
diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
index c0909f28d1..db637c8f6a 100644
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -80,7 +80,7 @@
 	<string name="core_my_places">Meine Orte</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Name</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">Adresse</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">Liste</string>
@@ -980,7 +980,8 @@
 	<string name="type.boundary.protected_area.5">Geschützter Bereich</string>
 	<string name="type.boundary.protected_area.6">Geschützter Bereich</string>
 	<string name="type.building">Gebäude</string>
-	<string name="type.building.address">Gebäude</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">Adresse</string>
 	<string name="type.building.has_parts">Gebäude</string>
 	<string name="type.building_part">Gebäude</string>
 	<string name="type.building.train_station">Bahnhof</string>
diff --git a/android/app/src/main/res/values-el/strings.xml b/android/app/src/main/res/values-el/strings.xml
index 450d5401c7..675e73ac6d 100644
--- a/android/app/src/main/res/values-el/strings.xml
+++ b/android/app/src/main/res/values-el/strings.xml
@@ -81,7 +81,7 @@
 	<string name="core_my_places">Οι τοποθεσίες μου</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Όνομα</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">Διεύθυνση</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">Λίστα</string>
@@ -885,7 +885,8 @@
 	<string name="type.boundary.protected_area.5">Προστατευόμενη Περιοχή</string>
 	<string name="type.boundary.protected_area.6">Προστατευόμενη Περιοχή</string>
 	<string name="type.building">Κτίριο</string>
-	<string name="type.building.address">Κτίριο</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">Διεύθυνση</string>
 	<string name="type.building.has_parts">Κτίριο</string>
 	<string name="type.building_part">Κτίριο</string>
 	<string name="type.building.garage">Γκαράζ</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 0a7de758d7..95cfa3d350 100644
--- a/android/app/src/main/res/values-es-rMX/strings.xml
+++ b/android/app/src/main/res/values-es-rMX/strings.xml
@@ -6,6 +6,8 @@
 	<!-- SECTION: Strings -->
 	<!-- The button that opens system location settings -->
 	<string name="location_settings">Configuración de ubicación</string>
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
+	<string name="address">Dirección</string>
 
 	<!-- SECTION: Search categories -->
 	<!-- Search category for recycling; any changes should be duplicated in categories.txt @recycling! -->
@@ -258,6 +260,8 @@
 	<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>
 	<string name="type.entrance.exit">Salida</string>
 
 	<!-- SECTION: Types: Roads -->
diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml
index 67bdaa4f46..edae8a0ba4 100644
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -80,7 +80,7 @@
 	<string name="core_my_places">Mis lugares</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Nombre</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">Dirección</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">Lista</string>
@@ -1000,7 +1000,8 @@
 	<string name="type.boundary.protected_area.5">Área protegida</string>
 	<string name="type.boundary.protected_area.6">Área protegida</string>
 	<string name="type.building">Edificio</string>
-	<string name="type.building.address">Edificio</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">Dirección</string>
 	<string name="type.building.has_parts">Edificio</string>
 	<string name="type.building_part">Edificio</string>
 	<string name="type.building.garage">Garaje</string>
diff --git a/android/app/src/main/res/values-et/strings.xml b/android/app/src/main/res/values-et/strings.xml
index 91f3b6e809..0e17145b48 100644
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -72,7 +72,7 @@
 	<string name="core_my_places">Minu kohad</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Nimi</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">Aadress</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">Loetelu</string>
@@ -983,7 +983,8 @@
 	<string name="type.boundary.protected_area.5">Kaitseala</string>
 	<string name="type.boundary.protected_area.6">Kaitseala</string>
 	<string name="type.building">Hoone</string>
-	<string name="type.building.address">Hoone</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">Aadress</string>
 	<string name="type.building.has_parts">Hoone</string>
 	<string name="type.building_part">Hoone</string>
 	<string name="type.building.garage">Garaaž</string>
diff --git a/android/app/src/main/res/values-eu/strings.xml b/android/app/src/main/res/values-eu/strings.xml
index 949ace24f5..b8d9530d52 100644
--- a/android/app/src/main/res/values-eu/strings.xml
+++ b/android/app/src/main/res/values-eu/strings.xml
@@ -80,7 +80,7 @@
 	<string name="core_my_places">Nire tokiak</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Izena</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">Helbidea</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">Zerrenda</string>
@@ -991,7 +991,8 @@
 	<string name="type.boundary.protected_area.5">Babestutako Eremua</string>
 	<string name="type.boundary.protected_area.6">Babestutako Eremua</string>
 	<string name="type.building">Eraikin</string>
-	<string name="type.building.address">Eraikin</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">Helbidea</string>
 	<string name="type.building.has_parts">Eraikin</string>
 	<string name="type.building_part">Eraikin</string>
 	<string name="type.building.garage">Garajea</string>
diff --git a/android/app/src/main/res/values-fa/strings.xml b/android/app/src/main/res/values-fa/strings.xml
index 8949acb26c..952c70f25f 100644
--- a/android/app/src/main/res/values-fa/strings.xml
+++ b/android/app/src/main/res/values-fa/strings.xml
@@ -79,7 +79,7 @@
 	<string name="core_my_places">مکان من</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">نام</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">آدرس</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">لیست</string>
@@ -891,7 +891,8 @@
 	<string name="type.boundary.protected_area.5">منطقه حفاظت شده</string>
 	<string name="type.boundary.protected_area.6">منطقه حفاظت شده</string>
 	<string name="type.building">ساختمان</string>
-	<string name="type.building.address">ساختمان</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">آدرس</string>
 	<string name="type.building.has_parts">ساختمان</string>
 	<string name="type.building_part">ساختمان</string>
 	<string name="type.building.garage">گاراژ</string>
diff --git a/android/app/src/main/res/values-fi/strings.xml b/android/app/src/main/res/values-fi/strings.xml
index e11b0777e2..2bc7334343 100644
--- a/android/app/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
@@ -83,7 +83,7 @@
 	<string name="core_my_places">Paikkani</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Nimi</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">Osoite</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">Luettelo</string>
@@ -990,7 +990,8 @@
 	<string name="type.boundary.protected_area.5">Suojeltu alue</string>
 	<string name="type.boundary.protected_area.6">Suojeltu alue</string>
 	<string name="type.building">Rakennus</string>
-	<string name="type.building.address">Rakennus</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">Osoite</string>
 	<string name="type.building.has_parts">Rakennus</string>
 	<string name="type.building_part">Rakennus</string>
 	<string name="type.building.garage">Autotalli</string>
diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml
index f249d685bf..904f153d04 100644
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -82,7 +82,7 @@
 	<string name="core_my_places">Mes endroits</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Nom</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">Adresse</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">Liste</string>
@@ -990,7 +990,8 @@
 	<string name="type.boundary.protected_area.5">Zone protégée</string>
 	<string name="type.boundary.protected_area.6">Zone protégée</string>
 	<string name="type.building">Bâtiment</string>
-	<string name="type.building.address">Bâtiment</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">Adresse</string>
 	<string name="type.building.has_parts">Bâtiment</string>
 	<string name="type.building_part">Bâtiment</string>
 	<string name="type.building.train_station">Gare ferroviaire</string>
diff --git a/android/app/src/main/res/values-hu/strings.xml b/android/app/src/main/res/values-hu/strings.xml
index 24022ee0be..c3c2646bba 100644
--- a/android/app/src/main/res/values-hu/strings.xml
+++ b/android/app/src/main/res/values-hu/strings.xml
@@ -80,7 +80,7 @@
 	<string name="core_my_places">Saját helyeim</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Név</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">Cím</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">Lista</string>
@@ -910,7 +910,8 @@
 	<string name="type.boundary.protected_area.5">Védett terület</string>
 	<string name="type.boundary.protected_area.6">Védett terület</string>
 	<string name="type.building">Épület</string>
-	<string name="type.building.address">Épület</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">Cím</string>
 	<string name="type.building.has_parts">Épület</string>
 	<string name="type.building_part">Épület</string>
 	<string name="type.building.garage">Garázs</string>
diff --git a/android/app/src/main/res/values-in/strings.xml b/android/app/src/main/res/values-in/strings.xml
index f1c9504638..0436ff5391 100644
--- a/android/app/src/main/res/values-in/strings.xml
+++ b/android/app/src/main/res/values-in/strings.xml
@@ -82,7 +82,7 @@
 	<string name="core_my_places">Tempat-tempat Saya</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Nama</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">Alamat</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">Daftar</string>
@@ -887,7 +887,8 @@
 	<string name="type.boundary.protected_area.5">Kawasan Lindung</string>
 	<string name="type.boundary.protected_area.6">Kawasan Lindung</string>
 	<string name="type.building">Gedung</string>
-	<string name="type.building.address">Gedung</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">Alamat</string>
 	<string name="type.building.has_parts">Gedung</string>
 	<string name="type.building_part">Gedung</string>
 	<string name="type.building.garage">Garasi</string>
diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml
index 6c3fa31956..d2be11df7a 100644
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -80,7 +80,7 @@
 	<string name="core_my_places">I miei luoghi</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Nome</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">Indirizzo</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">Elenco</string>
@@ -977,7 +977,8 @@
 	<string name="type.boundary.protected_area.5">Area protetta</string>
 	<string name="type.boundary.protected_area.6">Area protetta</string>
 	<string name="type.building">Edificio</string>
-	<string name="type.building.address">Edificio</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">Indirizzo</string>
 	<string name="type.building.has_parts">Edificio</string>
 	<string name="type.building_part">Edificio</string>
 	<string name="type.building.garage">Garage</string>
diff --git a/android/app/src/main/res/values-iw/strings.xml b/android/app/src/main/res/values-iw/strings.xml
index 026823296d..aa2d1cf5b8 100644
--- a/android/app/src/main/res/values-iw/strings.xml
+++ b/android/app/src/main/res/values-iw/strings.xml
@@ -80,7 +80,7 @@
 	<string name="core_my_places">המקומות שלי</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">שם</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">כתובת</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">רשימה</string>
@@ -816,6 +816,8 @@
 	<string name="type.boundary.protected_area.4">אזור מוגן</string>
 	<string name="type.boundary.protected_area.5">אזור מוגן</string>
 	<string name="type.boundary.protected_area.6">אזור מוגן</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">כתובת</string>
 	<string name="type.cemetery.grave">רבק</string>
 	<string name="type.craft">מְלָאכָה</string>
 	<string name="type.craft.beekeeper">כוורן</string>
diff --git a/android/app/src/main/res/values-ja/strings.xml b/android/app/src/main/res/values-ja/strings.xml
index de2691a986..33a602cd03 100644
--- a/android/app/src/main/res/values-ja/strings.xml
+++ b/android/app/src/main/res/values-ja/strings.xml
@@ -80,7 +80,7 @@
 	<string name="core_my_places">マイロケーション</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">名称</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">住所</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">一覧</string>
@@ -920,7 +920,8 @@
 	<string name="type.boundary.protected_area.5">保護区域</string>
 	<string name="type.boundary.protected_area.6">保護区域</string>
 	<string name="type.building">建物</string>
-	<string name="type.building.address">建物</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">住所</string>
 	<string name="type.building.has_parts">建物</string>
 	<string name="type.building_part">建物</string>
 	<string name="type.building.garage">車庫</string>
diff --git a/android/app/src/main/res/values-ko/strings.xml b/android/app/src/main/res/values-ko/strings.xml
index f21cac3c41..4e0c4fcc76 100644
--- a/android/app/src/main/res/values-ko/strings.xml
+++ b/android/app/src/main/res/values-ko/strings.xml
@@ -80,7 +80,7 @@
 	<string name="core_my_places">내 장소</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">이름</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">주소</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">목록</string>
@@ -890,7 +890,8 @@
 	<string name="type.boundary.protected_area.5">보호구역</string>
 	<string name="type.boundary.protected_area.6">보호구역</string>
 	<string name="type.building">건물</string>
-	<string name="type.building.address">건물</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">주소</string>
 	<string name="type.building.has_parts">건물</string>
 	<string name="type.building_part">건물</string>
 	<string name="type.building.garage">차고</string>
diff --git a/android/app/src/main/res/values-mr/strings.xml b/android/app/src/main/res/values-mr/strings.xml
index d89fee5cd8..9614bf56e4 100644
--- a/android/app/src/main/res/values-mr/strings.xml
+++ b/android/app/src/main/res/values-mr/strings.xml
@@ -72,7 +72,7 @@
 	<string name="core_my_places">माझी ठिकाणे</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">नाव</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">पत्ता</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">यादी</string>
@@ -934,7 +934,8 @@
 	<string name="type.boundary.protected_area.5">संरक्षित क्षेत्र</string>
 	<string name="type.boundary.protected_area.6">संरक्षित क्षेत्र</string>
 	<string name="type.building">इमारत</string>
-	<string name="type.building.address">इमारत</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">पत्ता</string>
 	<string name="type.building.has_parts">इमारत</string>
 	<string name="type.building_part">इमारत</string>
 	<string name="type.building.garage">गराज</string>
diff --git a/android/app/src/main/res/values-nb/strings.xml b/android/app/src/main/res/values-nb/strings.xml
index 46a03dc742..492f68dc01 100644
--- a/android/app/src/main/res/values-nb/strings.xml
+++ b/android/app/src/main/res/values-nb/strings.xml
@@ -82,7 +82,7 @@
 	<string name="core_my_places">Mine steder</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Navn</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">Adresse</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">Liste</string>
@@ -939,7 +939,8 @@
 	<string name="type.boundary.protected_area.5">Vernet område</string>
 	<string name="type.boundary.protected_area.6">Vernet område</string>
 	<string name="type.building">Bygning</string>
-	<string name="type.building.address">Bygning</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">Adresse</string>
 	<string name="type.building.has_parts">Bygning</string>
 	<string name="type.building_part">Bygning</string>
 	<string name="type.building.garage">Garasje</string>
diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml
index ab88f66d1b..b9b00c9559 100644
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -80,7 +80,7 @@
 	<string name="core_my_places">Mijn plaatsen</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Naam</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">Adres</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">Lijst</string>
@@ -992,7 +992,8 @@
 	<string name="type.boundary.protected_area.5">Beschermd gebied</string>
 	<string name="type.boundary.protected_area.6">Beschermd gebied</string>
 	<string name="type.building">Gebouw</string>
-	<string name="type.building.address">Gebouw</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">Adres</string>
 	<string name="type.building.has_parts">Gebouw</string>
 	<string name="type.building_part">Gebouw</string>
 	<string name="type.building.garage">Garage</string>
diff --git a/android/app/src/main/res/values-pl/strings.xml b/android/app/src/main/res/values-pl/strings.xml
index e4eac8c0eb..a52c67eadd 100644
--- a/android/app/src/main/res/values-pl/strings.xml
+++ b/android/app/src/main/res/values-pl/strings.xml
@@ -80,7 +80,7 @@
 	<string name="core_my_places">Moje miejsca</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Nazwa</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">Adres</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">Lista</string>
@@ -997,7 +997,8 @@
 	<string name="type.boundary.protected_area.5">Strefa chroniona</string>
 	<string name="type.boundary.protected_area.6">Strefa chroniona</string>
 	<string name="type.building">Budynek</string>
-	<string name="type.building.address">Budynek</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">Adres</string>
 	<string name="type.building.has_parts">Budynek</string>
 	<string name="type.building_part">Budynek</string>
 	<string name="type.building.garage">Garaż</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 57055a5119..3322ae4e94 100644
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -78,7 +78,7 @@
 	<string name="core_my_places">Meus locais</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Nome</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">Endereço</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">Lista</string>
@@ -940,7 +940,8 @@
 	<string name="type.boundary.protected_area.5">Área protegida</string>
 	<string name="type.boundary.protected_area.6">Área protegida</string>
 	<string name="type.building">Edifício</string>
-	<string name="type.building.address">Edifício</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">Endereço</string>
 	<string name="type.building.has_parts">Edifício</string>
 	<string name="type.building_part">Edifício</string>
 	<string name="type.building.garage">Garagem</string>
diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml
index 4562f050ce..49d0ce9e7a 100644
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -80,8 +80,8 @@
 	<string name="core_my_places">Os meus locais</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Nome</string>
-	<!-- Editor title above street and house number -->
-	<string name="address">Endereço</string>
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
+	<string name="address">Morada</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">Lista</string>
 	<!-- Settings button in system menu -->
@@ -947,7 +947,8 @@
 	<string name="type.boundary.protected_area.5">Área protegida</string>
 	<string name="type.boundary.protected_area.6">Área protegida</string>
 	<string name="type.building">Edifício</string>
-	<string name="type.building.address">Edifício</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">Morada</string>
 	<string name="type.building.has_parts">Edifício</string>
 	<string name="type.building_part">Edifício</string>
 	<string name="type.building.garage">Garagem</string>
diff --git a/android/app/src/main/res/values-ro/strings.xml b/android/app/src/main/res/values-ro/strings.xml
index e368117be6..5adc943aeb 100644
--- a/android/app/src/main/res/values-ro/strings.xml
+++ b/android/app/src/main/res/values-ro/strings.xml
@@ -80,7 +80,7 @@
 	<string name="core_my_places">Locurile mele</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Denumire</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">Adresă</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">Listă</string>
@@ -906,7 +906,8 @@
 	<string name="type.boundary.protected_area.5">Zonă protejată</string>
 	<string name="type.boundary.protected_area.6">Zonă protejată</string>
 	<string name="type.building">Clădire</string>
-	<string name="type.building.address">Clădire</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">Adresă</string>
 	<string name="type.building.has_parts">Clădire</string>
 	<string name="type.building_part">Clădire</string>
 	<string name="type.building.garage">Garaj</string>
diff --git a/android/app/src/main/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml
index c434f900b5..e898102191 100644
--- a/android/app/src/main/res/values-ru/strings.xml
+++ b/android/app/src/main/res/values-ru/strings.xml
@@ -83,7 +83,7 @@
 	<string name="core_my_places">Мои Метки</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Название</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">Адрес</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">Список</string>
@@ -1009,7 +1009,8 @@
 	<string name="type.boundary.protected_area.5">Заповедная зона</string>
 	<string name="type.boundary.protected_area.6">Заповедная зона</string>
 	<string name="type.building">Здание</string>
-	<string name="type.building.address">Здание</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">Адрес</string>
 	<string name="type.building.has_parts">Здание</string>
 	<string name="type.building_part">Здание</string>
 	<string name="type.building.garage">Гараж</string>
diff --git a/android/app/src/main/res/values-sk/strings.xml b/android/app/src/main/res/values-sk/strings.xml
index c75ff928fa..b65aaabacf 100644
--- a/android/app/src/main/res/values-sk/strings.xml
+++ b/android/app/src/main/res/values-sk/strings.xml
@@ -80,7 +80,7 @@
 	<string name="core_my_places">Moje miesta</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Názov</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">Adresa</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">Zoznam</string>
@@ -886,7 +886,8 @@
 	<string name="type.boundary.protected_area.5">Chránené územie</string>
 	<string name="type.boundary.protected_area.6">Chránené územie</string>
 	<string name="type.building">Budova</string>
-	<string name="type.building.address">Budova</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">Adresa</string>
 	<string name="type.building.has_parts">Budova</string>
 	<string name="type.building_part">Budova</string>
 	<string name="type.building.garage">Garáž</string>
diff --git a/android/app/src/main/res/values-sv/strings.xml b/android/app/src/main/res/values-sv/strings.xml
index ec914f59e1..1f3d7b9d39 100644
--- a/android/app/src/main/res/values-sv/strings.xml
+++ b/android/app/src/main/res/values-sv/strings.xml
@@ -80,7 +80,7 @@
 	<string name="core_my_places">Mina Platser</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Namn</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">Adress</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">Lista</string>
@@ -888,7 +888,8 @@
 	<string name="type.boundary.protected_area.5">Skyddat område</string>
 	<string name="type.boundary.protected_area.6">Skyddat område</string>
 	<string name="type.building">Byggnad</string>
-	<string name="type.building.address">Byggnad</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">Adress</string>
 	<string name="type.building.has_parts">Byggnad</string>
 	<string name="type.building_part">Byggnad</string>
 	<string name="type.building.train_station">Tågstation</string>
diff --git a/android/app/src/main/res/values-sw/strings.xml b/android/app/src/main/res/values-sw/strings.xml
index 0288064ab8..af5695b1cc 100644
--- a/android/app/src/main/res/values-sw/strings.xml
+++ b/android/app/src/main/res/values-sw/strings.xml
@@ -16,6 +16,8 @@
 	<string name="about_developed_by_enthusiasts">Maombi ya chanzo-wazi iliyoundwa na wanaovutia na wanaojitolea.</string>
 	<!-- The button that opens system location settings -->
 	<string name="location_settings">Mipangilio ya mahali</string>
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
+	<string name="address">Anwani</string>
 	<!-- Header of settings activity where user defines storage path -->
 	<string name="maps_storage">Hifadhi ramani kwenye</string>
 
@@ -345,6 +347,8 @@
 	<string name="type.boundary.protected_area.4">Eneo Lindwa</string>
 	<string name="type.boundary.protected_area.5">Eneo Lindwa</string>
 	<string name="type.boundary.protected_area.6">Eneo Lindwa</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">Anwani</string>
 	<string name="type.cemetery.grave">Kaburi</string>
 	<string name="type.craft">Ufundi</string>
 	<string name="type.craft.beekeeper">Mfugaji nyuki</string>
diff --git a/android/app/src/main/res/values-th/strings.xml b/android/app/src/main/res/values-th/strings.xml
index fa625a32eb..00ac3a612f 100644
--- a/android/app/src/main/res/values-th/strings.xml
+++ b/android/app/src/main/res/values-th/strings.xml
@@ -82,7 +82,7 @@
 	<string name="core_my_places">สถานที่ของฉัน</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">ชื่อ</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">ที่อยู่</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">รายการ</string>
@@ -891,7 +891,8 @@
 	<string name="type.boundary.protected_area.5">พื้นที่คุ้มครอง</string>
 	<string name="type.boundary.protected_area.6">พื้นที่คุ้มครอง</string>
 	<string name="type.building">อาคาร</string>
-	<string name="type.building.address">อาคาร</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">ที่อยู่</string>
 	<string name="type.building.has_parts">อาคาร</string>
 	<string name="type.building_part">อาคาร</string>
 	<string name="type.building.garage">อาคารจอดรถ</string>
diff --git a/android/app/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml
index 0df7a5f836..ab4f71a0cd 100644
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -82,7 +82,7 @@
 	<string name="core_my_places">Yerlerim</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Adı</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">Adres</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">Liste</string>
@@ -995,7 +995,8 @@
 	<string name="type.boundary.protected_area.5">Korunmuş bölge</string>
 	<string name="type.boundary.protected_area.6">Korunmuş bölge</string>
 	<string name="type.building">Bina</string>
-	<string name="type.building.address">Bina</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">Adres</string>
 	<string name="type.building.has_parts">Bina</string>
 	<string name="type.building_part">Bina</string>
 	<string name="type.building.garage">Garaj</string>
diff --git a/android/app/src/main/res/values-uk/strings.xml b/android/app/src/main/res/values-uk/strings.xml
index 5e68f75c6d..fac74efed1 100644
--- a/android/app/src/main/res/values-uk/strings.xml
+++ b/android/app/src/main/res/values-uk/strings.xml
@@ -83,7 +83,7 @@
 	<string name="core_my_places">Мої Мітки</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Iм\'я</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">Адреса</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">Список</string>
@@ -996,7 +996,8 @@
 	<string name="type.boundary.protected_area.5">Заповідна зона</string>
 	<string name="type.boundary.protected_area.6">Заповідна зона</string>
 	<string name="type.building">Будівля</string>
-	<string name="type.building.address">Будівля</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">Адреса</string>
 	<string name="type.building.has_parts">Будівля</string>
 	<string name="type.building_part">Будівля</string>
 	<string name="type.building.garage">Гараж</string>
diff --git a/android/app/src/main/res/values-vi/strings.xml b/android/app/src/main/res/values-vi/strings.xml
index a075ad8550..e551e63513 100644
--- a/android/app/src/main/res/values-vi/strings.xml
+++ b/android/app/src/main/res/values-vi/strings.xml
@@ -80,7 +80,7 @@
 	<string name="core_my_places">Các Địa chỉ của Tôi</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Tên</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">Địa chỉ</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">Danh sách</string>
@@ -888,7 +888,8 @@
 	<string name="type.boundary.protected_area.5">Khu bảo tồn</string>
 	<string name="type.boundary.protected_area.6">Khu bảo tồn</string>
 	<string name="type.building">Tòa nhà</string>
-	<string name="type.building.address">Tòa nhà</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">Địa chỉ</string>
 	<string name="type.building.has_parts">Tòa nhà</string>
 	<string name="type.building_part">Tòa nhà</string>
 	<string name="type.building.garage">Gara</string>
diff --git a/android/app/src/main/res/values-zh-rTW/strings.xml b/android/app/src/main/res/values-zh-rTW/strings.xml
index fda424527f..bdda2ede5c 100644
--- a/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -80,7 +80,7 @@
 	<string name="core_my_places">我的地點</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">名稱</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">地址</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">清單</string>
@@ -929,7 +929,8 @@
 	<string name="type.boundary.protected_area.5">保護區</string>
 	<string name="type.boundary.protected_area.6">保護區</string>
 	<string name="type.building">建築物</string>
-	<string name="type.building.address">建築物</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">地址</string>
 	<string name="type.building.has_parts">建築物</string>
 	<string name="type.building_part">建築物</string>
 	<string name="type.building.garage">車庫</string>
diff --git a/android/app/src/main/res/values-zh/strings.xml b/android/app/src/main/res/values-zh/strings.xml
index f8ae72a3c9..394e980930 100644
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -80,7 +80,7 @@
 	<string name="core_my_places">我的位置</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">名字</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">地址</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">列表</string>
@@ -948,7 +948,8 @@
 	<string name="type.boundary.protected_area.5">保护区</string>
 	<string name="type.boundary.protected_area.6">保护区</string>
 	<string name="type.building">建筑物</string>
-	<string name="type.building.address">建筑物</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">地址</string>
 	<string name="type.building.has_parts">建筑物</string>
 	<string name="type.building_part">建筑物</string>
 	<string name="type.building.garage">独立1车库</string>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 0f23cfc184..7b611ba29c 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -83,7 +83,7 @@
 	<string name="core_my_places">My Places</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Name</string>
-	<!-- Editor title above street and house number -->
+	<!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
 	<string name="address">Address</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">List</string>
@@ -1031,7 +1031,8 @@
 	<string name="type.boundary.protected_area.5">Protected Area</string>
 	<string name="type.boundary.protected_area.6">Protected Area</string>
 	<string name="type.building">Building</string>
-	<string name="type.building.address">Building</string>
+	<!-- Duplicates [address] in strings.txt -->
+	<string name="type.building.address">Address</string>
 	<string name="type.building.has_parts">Building</string>
 	<string name="type.building_part">Building</string>
 	<string name="type.building.garage">Garage</string>
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
index 24cab4f816..5c9e5d9673 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "أماكني";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "العنوان";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "مبنى";
 
-"type.building.address" = "مبنى";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "العنوان";
 
 "type.building.has_parts" = "مبنى";
 
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
index 83f168293c..c38e50f6c5 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "Мае месцы";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "Адрас";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "Building";
 
-"type.building.address" = "Building";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "Адрас";
 
 "type.building.has_parts" = "Building";
 
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
index 54d546e11f..3e1dc1c3cf 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "Мои места";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "Адрес";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "Building";
 
-"type.building.address" = "Building";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "Адрес";
 
 "type.building.has_parts" = "Building";
 
diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
index 91d6d6637c..a5bd8af581 100644
--- a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "Els meus llocs";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "Adreça";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "Building";
 
-"type.building.address" = "Building";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "Adreça";
 
 "type.building.has_parts" = "Building";
 
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
index e98b4312da..d0882fbaa2 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "Moje místa";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "Adresa";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "Stavba";
 
-"type.building.address" = "Stavba";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "Adresa";
 
 "type.building.has_parts" = "Stavba";
 
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
index 26ad668f24..faa4cfb683 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "Mine Steder";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "Adresse";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "Bygning";
 
-"type.building.address" = "Bygning";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "Adresse";
 
 "type.building.has_parts" = "Bygning";
 
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
index f17565dc03..ed7d05f45a 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "Meine Orte";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "Adresse";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "Gebäude";
 
-"type.building.address" = "Gebäude";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "Adresse";
 
 "type.building.has_parts" = "Gebäude";
 
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
index 595bdbb234..7c8a2c5cd2 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "Οι τοποθεσίες μου";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "Διεύθυνση";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "Κτίριο";
 
-"type.building.address" = "Κτίριο";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "Διεύθυνση";
 
 "type.building.has_parts" = "Κτίριο";
 
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
index 423ba90538..b3dd5c9260 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "My Places";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "Address";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "Building";
 
-"type.building.address" = "Building";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "Address";
 
 "type.building.has_parts" = "Building";
 
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
index f81f1b73af..d6c38463f9 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "My Places";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "Address";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "Building";
 
-"type.building.address" = "Building";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "Address";
 
 "type.building.has_parts" = "Building";
 
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
index 2b855160dc..b708164851 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "Mis lugares";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "Dirección";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "Edificio";
 
-"type.building.address" = "Edificio";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "Dirección";
 
 "type.building.has_parts" = "Edificio";
 
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index 04ce1905f7..cbbf7f92b6 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "Mis lugares";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "Dirección";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "Edificio";
 
-"type.building.address" = "Edificio";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "Dirección";
 
 "type.building.has_parts" = "Edificio";
 
diff --git a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
index 0a09454432..0857e345e9 100644
--- a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "Minu kohad";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "Aadress";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "Hoone";
 
-"type.building.address" = "Hoone";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "Aadress";
 
 "type.building.has_parts" = "Hoone";
 
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
index 36cdf169b5..b55e1b09b6 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "Nire tokiak";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "Helbidea";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "Eraikin";
 
-"type.building.address" = "Eraikin";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "Helbidea";
 
 "type.building.has_parts" = "Eraikin";
 
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
index b7c7e7f442..f1688131c4 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "مکان من";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "آدرس";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "ساختمان";
 
-"type.building.address" = "ساختمان";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "آدرس";
 
 "type.building.has_parts" = "ساختمان";
 
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index 74f89fbfd8..bba9d273f1 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "Paikkani";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "Osoite";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "Rakennus";
 
-"type.building.address" = "Rakennus";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "Osoite";
 
 "type.building.has_parts" = "Rakennus";
 
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
index 337fd14bff..3976e5d8b5 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "Mes endroits";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "Adresse";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "Bâtiment";
 
-"type.building.address" = "Bâtiment";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "Adresse";
 
 "type.building.has_parts" = "Bâtiment";
 
diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
index 7eb73cf7af..359ca30999 100644
--- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "המקומות שלי";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "כתובת";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "Building";
 
-"type.building.address" = "Building";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "כתובת";
 
 "type.building.has_parts" = "Building";
 
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index a7218dd2f7..6e5a7629e3 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "Saját helyeim";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "Cím";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "Épület";
 
-"type.building.address" = "Épület";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "Cím";
 
 "type.building.has_parts" = "Épület";
 
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
index 9c1014956f..899b902d3c 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "Tempat-tempat Saya";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "Alamat";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "Gedung";
 
-"type.building.address" = "Gedung";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "Alamat";
 
 "type.building.has_parts" = "Gedung";
 
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index c5965742f1..c8891d9994 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "I miei luoghi";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "Indirizzo";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "Edificio";
 
-"type.building.address" = "Edificio";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "Indirizzo";
 
 "type.building.has_parts" = "Edificio";
 
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
index 76d26be272..6121f07bd8 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "マイロケーション";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "住所";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "建物";
 
-"type.building.address" = "建物";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "住所";
 
 "type.building.has_parts" = "建物";
 
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
index 856e32e6ff..f7a24108bb 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "내 장소";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "주소";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "건물";
 
-"type.building.address" = "건물";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "주소";
 
 "type.building.has_parts" = "건물";
 
diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
index 684925ad88..5863676bef 100644
--- a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "माझी ठिकाणे";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "पत्ता";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "इमारत";
 
-"type.building.address" = "इमारत";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "पत्ता";
 
 "type.building.has_parts" = "इमारत";
 
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index a692cd234f..d242741aa7 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "Mine steder";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "Adresse";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "Bygning";
 
-"type.building.address" = "Bygning";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "Adresse";
 
 "type.building.has_parts" = "Bygning";
 
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index ee0400d866..1d65d24738 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "Mijn plaatsen";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "Adres";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "Gebouw";
 
-"type.building.address" = "Gebouw";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "Adres";
 
 "type.building.has_parts" = "Gebouw";
 
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
index 4e76e6b72a..f7672119f4 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "Moje miejsca";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "Adres";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "Budynek";
 
-"type.building.address" = "Budynek";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "Adres";
 
 "type.building.has_parts" = "Budynek";
 
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index 9d0ddeedc1..5c6d8ca31a 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "Meus locais";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "Endereço";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "Edifício";
 
-"type.building.address" = "Edifício";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "Endereço";
 
 "type.building.has_parts" = "Edifício";
 
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
index 434a518f12..394d5da0dc 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -80,8 +80,8 @@
 /* Default bookmark list name */
 "core_my_places" = "Os meus locais";
 
-/* Editor title above street and house number */
-"address" = "Endereço";
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
+"address" = "Morada";
 
 /* Settings button in system menu */
 "settings" = "Configurações";
@@ -1696,7 +1696,8 @@
 
 "type.building" = "Edifício";
 
-"type.building.address" = "Edifício";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "Morada";
 
 "type.building.has_parts" = "Edifício";
 
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
index 92b24a5a17..825ba45838 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "Locurile mele";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "Adresă";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "Clădire";
 
-"type.building.address" = "Clădire";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "Adresă";
 
 "type.building.has_parts" = "Clădire";
 
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
index 969b210fd8..67c1405515 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "Мои Метки";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "Адрес";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "Здание";
 
-"type.building.address" = "Здание";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "Адрес";
 
 "type.building.has_parts" = "Здание";
 
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
index fa37f6204d..8e158f4416 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "Moje miesta";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "Adresa";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "Budova";
 
-"type.building.address" = "Budova";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "Adresa";
 
 "type.building.has_parts" = "Budova";
 
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
index 3c102d9a8f..cfb6cb60cd 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "Mina Platser";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "Adress";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "Byggnad";
 
-"type.building.address" = "Byggnad";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "Adress";
 
 "type.building.has_parts" = "Byggnad";
 
diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
index c09b766d45..04d9515f55 100644
--- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
@@ -80,8 +80,8 @@
 /* Default bookmark list name */
 "core_my_places" = "My Places";
 
-/* Editor title above street and house number */
-"address" = "Address";
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
+"address" = "Anwani";
 
 /* Settings button in system menu */
 "settings" = "Settings";
@@ -1696,7 +1696,8 @@
 
 "type.building" = "Building";
 
-"type.building.address" = "Building";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "Anwani";
 
 "type.building.has_parts" = "Building";
 
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
index 33b37d0ba1..dc71996df0 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "สถานที่ของฉัน";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "ที่อยู่";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "อาคาร";
 
-"type.building.address" = "อาคาร";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "ที่อยู่";
 
 "type.building.has_parts" = "อาคาร";
 
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index 0e2e4a3396..40749d55d8 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "Yerlerim";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "Adres";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "Bina";
 
-"type.building.address" = "Bina";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "Adres";
 
 "type.building.has_parts" = "Bina";
 
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
index a6330131aa..043c0e2593 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "Мої Мітки";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "Адреса";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "Будівля";
 
-"type.building.address" = "Будівля";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "Адреса";
 
 "type.building.has_parts" = "Будівля";
 
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
index c86ceca1b9..a66bf4545f 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "Các Địa chỉ của Tôi";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "Địa chỉ";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "Tòa nhà";
 
-"type.building.address" = "Tòa nhà";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "Địa chỉ";
 
 "type.building.has_parts" = "Tòa nhà";
 
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index e8c72921fe..641da0c3bc 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "我的位置";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "地址";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "建筑物";
 
-"type.building.address" = "建筑物";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "地址";
 
 "type.building.has_parts" = "建筑物";
 
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
index c01130dd65..a12f3de448 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
@@ -80,7 +80,7 @@
 /* Default bookmark list name */
 "core_my_places" = "我的地點";
 
-/* Editor title above street and house number */
+/* Editor title above street and house number, duplicates [type.building.address] in types_strings.txt */
 "address" = "地址";
 
 /* Settings button in system menu */
@@ -1696,7 +1696,8 @@
 
 "type.building" = "建築物";
 
-"type.building.address" = "建築物";
+/* Duplicates [address] in strings.txt */
+"type.building.address" = "地址";
 
 "type.building.has_parts" = "建築物";