diff --git a/android/app/src/main/res/values-ar/strings.xml b/android/app/src/main/res/values-ar/strings.xml
index c314226811..b915d2c81e 100644
--- a/android/app/src/main/res/values-ar/strings.xml
+++ b/android/app/src/main/res/values-ar/strings.xml
@@ -938,6 +938,7 @@
 	<string name="type.amenity.telephone">هاتف</string>
 	<string name="type.amenity.theatre">مسرح</string>
 	<string name="type.amenity.toilets">مرحاض</string>
+	<string name="type.toilets.yes">مرحاض</string>
 	<string name="type.amenity.townhall">مبنى البلدية</string>
 	<string name="type.amenity.university">جامعة</string>
 	<string name="type.amenity.vending_machine">آلة البيع الذاتي</string>
diff --git a/android/app/src/main/res/values-az/strings.xml b/android/app/src/main/res/values-az/strings.xml
index f8ffebc7fe..b0ac12a74e 100644
--- a/android/app/src/main/res/values-az/strings.xml
+++ b/android/app/src/main/res/values-az/strings.xml
@@ -925,6 +925,7 @@
 	<string name="type.amenity.telephone">Telefon</string>
 	<string name="type.amenity.theatre">Teatr</string>
 	<string name="type.amenity.toilets">Tualet</string>
+	<string name="type.toilets.yes">Tualet</string>
 	<string name="type.amenity.townhall">Şəhər zalı</string>
 	<string name="type.amenity.university">Universitet</string>
 	<string name="type.amenity.vending_machine.cigarettes">Siqaret Dispenseri</string>
diff --git a/android/app/src/main/res/values-cs/strings.xml b/android/app/src/main/res/values-cs/strings.xml
index 94ab7d0aaf..4474f752c5 100644
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -870,6 +870,7 @@
 	<string name="type.amenity.telephone">Telefon</string>
 	<string name="type.amenity.theatre">Divadlo</string>
 	<string name="type.amenity.toilets">Záchody</string>
+	<string name="type.toilets.yes">Záchody</string>
 	<string name="type.amenity.townhall">Radnice</string>
 	<string name="type.amenity.university">Univerzita</string>
 	<string name="type.amenity.vending_machine.cigarettes">Automat na cigarety</string>
diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
index 8b018b5f72..0a9ad19a42 100644
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -923,6 +923,7 @@
 	<string name="type.amenity.telephone">Telefon</string>
 	<string name="type.amenity.theatre">Theater</string>
 	<string name="type.amenity.toilets">Toilette</string>
+	<string name="type.toilets.yes">Toilette</string>
 	<string name="type.amenity.townhall">Rathaus</string>
 	<string name="type.amenity.university">Universität</string>
 	<string name="type.amenity.vending_machine">Verkaufsautomat</string>
diff --git a/android/app/src/main/res/values-el/strings.xml b/android/app/src/main/res/values-el/strings.xml
index dfe3654224..fdfd7b0935 100644
--- a/android/app/src/main/res/values-el/strings.xml
+++ b/android/app/src/main/res/values-el/strings.xml
@@ -856,6 +856,7 @@
 	<string name="type.amenity.telephone">Τηλέφωνο</string>
 	<string name="type.amenity.theatre">Θέατρο</string>
 	<string name="type.amenity.toilets">Τουαλέτα</string>
+	<string name="type.toilets.yes">Τουαλέτα</string>
 	<string name="type.amenity.townhall">Δημαρχείο</string>
 	<string name="type.amenity.university">Πανεπιστήμιο</string>
 	<string name="type.amenity.vending_machine.cigarettes">Αυτόματος πωλητής τσιγάρων</string>
diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml
index b749166077..5a884636d6 100644
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -934,6 +934,7 @@
 	<string name="type.amenity.telephone">Teléfono</string>
 	<string name="type.amenity.theatre">Teatro</string>
 	<string name="type.amenity.toilets">WC</string>
+	<string name="type.toilets.yes">WC</string>
 	<string name="type.amenity.townhall">Ayuntamiento</string>
 	<string name="type.amenity.university">Universidad</string>
 	<string name="type.amenity.vending_machine">Máquina expendedora</string>
diff --git a/android/app/src/main/res/values-et/strings.xml b/android/app/src/main/res/values-et/strings.xml
index 1105235054..de59515c2f 100644
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -917,6 +917,7 @@
 	<string name="type.amenity.telephone">Telefon</string>
 	<string name="type.amenity.theatre">Teater</string>
 	<string name="type.amenity.toilets">Tualett</string>
+	<string name="type.toilets.yes">Tualett</string>
 	<string name="type.amenity.townhall">Raekoda</string>
 	<string name="type.amenity.university">Ülikool</string>
 	<string name="type.amenity.vending_machine">Müügiautomaat</string>
diff --git a/android/app/src/main/res/values-eu/strings.xml b/android/app/src/main/res/values-eu/strings.xml
index 14bd712b05..7fcb7b29a1 100644
--- a/android/app/src/main/res/values-eu/strings.xml
+++ b/android/app/src/main/res/values-eu/strings.xml
@@ -925,6 +925,7 @@
 	<string name="type.amenity.telephone">Telefonoa</string>
 	<string name="type.amenity.theatre">Antzerkia</string>
 	<string name="type.amenity.toilets">Komuna</string>
+	<string name="type.toilets.yes">Komuna</string>
 	<string name="type.amenity.townhall">Udaletxea</string>
 	<string name="type.amenity.university">Unibertsitatea</string>
 	<string name="type.amenity.vending_machine">Makina saltzailea</string>
diff --git a/android/app/src/main/res/values-fa/strings.xml b/android/app/src/main/res/values-fa/strings.xml
index 61fb453c34..1267a64353 100644
--- a/android/app/src/main/res/values-fa/strings.xml
+++ b/android/app/src/main/res/values-fa/strings.xml
@@ -860,6 +860,7 @@
 	<string name="type.amenity.telephone">تلفن خانه</string>
 	<string name="type.amenity.theatre">سرگرمی</string>
 	<string name="type.amenity.toilets">دستشویی</string>
+	<string name="type.toilets.yes">دستشویی</string>
 	<string name="type.amenity.townhall">گردشگری</string>
 	<string name="type.amenity.university">دانشگاه</string>
 	<string name="type.amenity.vending_machine.cigarettes">ماشین سیگار فروشی</string>
diff --git a/android/app/src/main/res/values-fi/strings.xml b/android/app/src/main/res/values-fi/strings.xml
index f582d0d85a..85a61a45df 100644
--- a/android/app/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
@@ -918,6 +918,7 @@
 	<string name="type.recycling.green_waste">Biojäte</string>
 	<string name="type.recycling.cartons">Kartonki</string>
 	<string name="type.amenity.restaurant">Ravintola</string>
+	<string name="type.amenity.sanitary_dump_station">Jäteveden tyhjennyspiste</string>
 	<string name="type.amenity.school">Koulu</string>
 	<string name="type.amenity.shelter">Katos</string>
 	<string name="type.amenity.public_bath">Julkinen kylpylä</string>
@@ -927,6 +928,7 @@
 	<string name="type.amenity.telephone">Puhelin</string>
 	<string name="type.amenity.theatre">Teatteri</string>
 	<string name="type.amenity.toilets">WC</string>
+	<string name="type.toilets.yes">WC</string>
 	<string name="type.amenity.townhall">Kaupungintalo</string>
 	<string name="type.amenity.university">Yliopisto</string>
 	<string name="type.amenity.vending_machine">Myyntiautomaatti</string>
@@ -945,6 +947,7 @@
 	<string name="type.amenity.veterinary">Eläinlääkäri</string>
 	<string name="type.amenity.waste_basket">Roskakori</string>
 	<string name="type.amenity.waste_disposal">Roska</string>
+	<string name="type.amenity.waste_transfer_station">Jätteiden vastaanottoasema</string>
 	<string name="type.amenity.water_point">Vesipiste</string>
 	<string name="type.barrier">Este</string>
 	<string name="type.barrier.block">Este</string>
@@ -1403,6 +1406,8 @@
 	<string name="type.leisure.garden">Puutarha</string>
 	<string name="type.leisure.garden.residential">Puutarha</string>
 	<string name="type.leisure.golf_course">Golf-rata</string>
+	<string name="type.leisure.hackerspace">Hacklab</string>
+	<string name="type.leisure.marina">Venesatama</string>
 	<string name="type.leisure.nature_reserve">Luonnonsuojelualue</string>
 	<string name="type.leisure.outdoor_seating">Ulkona istuminen</string>
 	<string name="type.leisure.park">Puisto</string>
@@ -1421,6 +1426,7 @@
 	<string name="type.leisure.swimming_pool.private">Uima-allas</string>
 	<string name="type.leisure.water_park">Vesipuisto</string>
 	<string name="type.man_made.chimney">Tehtaan piippu</string>
+	<string name="type.man_made.flagpole">Lipputanko</string>
 	<string name="type.man_made.lighthouse">Majakka</string>
 	<string name="type.man_made.surveillance">Valvontakamera</string>
 	<string name="type.man_made.tower">Torni</string>
@@ -1798,6 +1804,7 @@
 	<string name="type.shop.car_parts">Auton osat</string>
 	<string name="type.shop.car_repair">Autokorjaamo</string>
 	<string name="type.shop.car_repair.tyres">Rengashuolto</string>
+	<string name="type.shop.caravan">Matkailu- ja retkeilyautokauppias</string>
 	<string name="type.shop.carpet">Matot</string>
 	<string name="type.shop.chemist">Kosmetiikkamyymälä</string>
 	<string name="type.shop.chocolate">Suklaakauppa</string>
@@ -1827,6 +1834,7 @@
 	<string name="type.shop.greengrocer">Vihanneskauppias</string>
 	<string name="type.shop.grocery">Päivittäistavarakauppa</string>
 	<string name="type.shop.hairdresser">Kampaamo</string>
+	<string name="type.shop.hardware">Rautakauppa</string>
 	<string name="type.shop.health_food">Terveysruokakauppa</string>
 	<string name="type.shop.herbalist">Yrttikauppa</string>
 	<string name="type.shop.hifi">HiFi Audio</string>
diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml
index 777cc14cf3..a0073ac246 100644
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -925,6 +925,7 @@
 	<string name="type.amenity.telephone">Téléphone</string>
 	<string name="type.amenity.theatre">Théâtre</string>
 	<string name="type.amenity.toilets">Toilettes</string>
+	<string name="type.toilets.yes">Toilettes</string>
 	<string name="type.amenity.townhall">Mairie</string>
 	<string name="type.amenity.university">Université</string>
 	<string name="type.amenity.vending_machine">Distributeur automatique</string>
diff --git a/android/app/src/main/res/values-hu/strings.xml b/android/app/src/main/res/values-hu/strings.xml
index 8deda437f4..6037a17ce9 100644
--- a/android/app/src/main/res/values-hu/strings.xml
+++ b/android/app/src/main/res/values-hu/strings.xml
@@ -881,6 +881,7 @@
 	<string name="type.amenity.telephone">Telefon</string>
 	<string name="type.amenity.theatre">Színház</string>
 	<string name="type.amenity.toilets">Mosdó</string>
+	<string name="type.toilets.yes">Mosdó</string>
 	<string name="type.amenity.townhall">Városháza</string>
 	<string name="type.amenity.university">Egyetem</string>
 	<string name="type.amenity.vending_machine.cigarettes">Cigarettaautomata</string>
diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml
index 7d822b09a6..94daba6d2b 100644
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -913,6 +913,7 @@
 	<string name="type.amenity.telephone">Telefono</string>
 	<string name="type.amenity.theatre">Teatro</string>
 	<string name="type.amenity.toilets">Servizi igienici</string>
+	<string name="type.toilets.yes">Servizi igienici</string>
 	<string name="type.amenity.townhall">Municipio</string>
 	<string name="type.amenity.university">Università</string>
 	<string name="type.amenity.vending_machine">Distributore automatico</string>
diff --git a/android/app/src/main/res/values-ja/strings.xml b/android/app/src/main/res/values-ja/strings.xml
index f3df1b15b3..6c11bbdd45 100644
--- a/android/app/src/main/res/values-ja/strings.xml
+++ b/android/app/src/main/res/values-ja/strings.xml
@@ -873,6 +873,7 @@
 	<string name="type.amenity.telephone">公衆電話</string>
 	<string name="type.amenity.theatre">劇場</string>
 	<string name="type.amenity.toilets">トイレ</string>
+	<string name="type.toilets.yes">トイレ</string>
 	<string name="type.amenity.townhall">役場</string>
 	<string name="type.amenity.university">大学</string>
 	<string name="type.amenity.vending_machine">自動販売機</string>
diff --git a/android/app/src/main/res/values-ko/strings.xml b/android/app/src/main/res/values-ko/strings.xml
index 1f77f60791..9fa62b52f8 100644
--- a/android/app/src/main/res/values-ko/strings.xml
+++ b/android/app/src/main/res/values-ko/strings.xml
@@ -861,6 +861,7 @@
 	<string name="type.amenity.telephone">전화</string>
 	<string name="type.amenity.theatre">연극</string>
 	<string name="type.amenity.toilets">화장실</string>
+	<string name="type.toilets.yes">화장실</string>
 	<string name="type.amenity.townhall">시청</string>
 	<string name="type.amenity.university">대학</string>
 	<string name="type.amenity.vending_machine.cigarettes">담배자판기</string>
diff --git a/android/app/src/main/res/values-mr/strings.xml b/android/app/src/main/res/values-mr/strings.xml
index 36d96beb94..0eda167d5d 100644
--- a/android/app/src/main/res/values-mr/strings.xml
+++ b/android/app/src/main/res/values-mr/strings.xml
@@ -869,6 +869,7 @@
 	<string name="type.amenity.telephone">फोन</string>
 	<string name="type.amenity.theatre">नाट्यगृह</string>
 	<string name="type.amenity.toilets">शौचालय</string>
+	<string name="type.toilets.yes">शौचालय</string>
 	<string name="type.amenity.townhall">नगर भवन</string>
 	<string name="type.amenity.university">विद्यापीठ</string>
 	<string name="type.amenity.vending_machine">विक्रीयंत्र</string>
diff --git a/android/app/src/main/res/values-nb/strings.xml b/android/app/src/main/res/values-nb/strings.xml
index 77486a456a..f64f0795bb 100644
--- a/android/app/src/main/res/values-nb/strings.xml
+++ b/android/app/src/main/res/values-nb/strings.xml
@@ -908,6 +908,7 @@
 	<string name="type.amenity.telephone">Telefon</string>
 	<string name="type.amenity.theatre">Teater</string>
 	<string name="type.amenity.toilets">Toalett</string>
+	<string name="type.toilets.yes">Toalett</string>
 	<string name="type.amenity.townhall">Rådhus</string>
 	<string name="type.amenity.university">Universitet</string>
 	<string name="type.amenity.vending_machine.cigarettes">Sigarettautomat</string>
diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml
index a0622d8990..91a0135cbf 100644
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -926,6 +926,7 @@
 	<string name="type.amenity.telephone">Telefoon</string>
 	<string name="type.amenity.theatre">Theater</string>
 	<string name="type.amenity.toilets">Toiletten</string>
+	<string name="type.toilets.yes">Toiletten</string>
 	<string name="type.amenity.townhall">Gemeentehuis</string>
 	<string name="type.amenity.university">Universiteit</string>
 	<string name="type.amenity.vending_machine">Automaat</string>
diff --git a/android/app/src/main/res/values-pl/strings.xml b/android/app/src/main/res/values-pl/strings.xml
index 4ac0df2cd9..2f37610b5a 100644
--- a/android/app/src/main/res/values-pl/strings.xml
+++ b/android/app/src/main/res/values-pl/strings.xml
@@ -932,6 +932,7 @@
 	<string name="type.amenity.telephone">Telefon</string>
 	<string name="type.amenity.theatre">Teatr</string>
 	<string name="type.amenity.toilets">Toaleta</string>
+	<string name="type.toilets.yes">Toaleta</string>
 	<string name="type.amenity.townhall">Ratusz</string>
 	<string name="type.amenity.university">Uniwersytet</string>
 	<string name="type.amenity.vending_machine">Automat sprzedający</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 85924118b5..948162c130 100644
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -874,6 +874,7 @@
 	<string name="type.amenity.telephone">Telefone</string>
 	<string name="type.amenity.theatre">Teatro</string>
 	<string name="type.amenity.toilets">Banheiro</string>
+	<string name="type.toilets.yes">Banheiro</string>
 	<string name="type.amenity.townhall">Prefeitura ou subprefeitura</string>
 	<string name="type.amenity.university">Universidade</string>
 	<string name="type.amenity.vending_machine">Máquina de venda automática</string>
diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml
index b4ab4e7159..223ffe9695 100644
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -890,6 +890,7 @@
 	<string name="type.amenity.telephone">Telefone</string>
 	<string name="type.amenity.theatre">Teatro</string>
 	<string name="type.amenity.toilets">Casa de banho</string>
+	<string name="type.toilets.yes">Casa de banho</string>
 	<string name="type.amenity.townhall">Câmara municipal ou junta de freguesia</string>
 	<string name="type.amenity.university">Universidade</string>
 	<string name="type.amenity.vending_machine">Máquina de venda automática</string>
diff --git a/android/app/src/main/res/values-ro/strings.xml b/android/app/src/main/res/values-ro/strings.xml
index fc486412a1..10e75308db 100644
--- a/android/app/src/main/res/values-ro/strings.xml
+++ b/android/app/src/main/res/values-ro/strings.xml
@@ -877,6 +877,7 @@
 	<string name="type.amenity.telephone">Telefon</string>
 	<string name="type.amenity.theatre">Teatru</string>
 	<string name="type.amenity.toilets">Toaletă</string>
+	<string name="type.toilets.yes">Toaletă</string>
 	<string name="type.amenity.townhall">Primărie</string>
 	<string name="type.amenity.university">Universitate</string>
 	<string name="type.amenity.vending_machine.cigarettes">Automat de țigări</string>
diff --git a/android/app/src/main/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml
index 6867c86cd2..0425027ab3 100644
--- a/android/app/src/main/res/values-ru/strings.xml
+++ b/android/app/src/main/res/values-ru/strings.xml
@@ -943,6 +943,7 @@
 	<string name="type.amenity.telephone">Телефон</string>
 	<string name="type.amenity.theatre">Театр</string>
 	<string name="type.amenity.toilets">Туалет</string>
+	<string name="type.toilets.yes">Туалет</string>
 	<string name="type.amenity.townhall">Администрация</string>
 	<string name="type.amenity.university">Университет</string>
 	<string name="type.amenity.vending_machine">Торговый автомат</string>
diff --git a/android/app/src/main/res/values-sk/strings.xml b/android/app/src/main/res/values-sk/strings.xml
index f8dade6b0f..3f6f0b20da 100644
--- a/android/app/src/main/res/values-sk/strings.xml
+++ b/android/app/src/main/res/values-sk/strings.xml
@@ -857,6 +857,7 @@
 	<string name="type.amenity.telephone">Telefón</string>
 	<string name="type.amenity.theatre">Divadlo</string>
 	<string name="type.amenity.toilets">Záchody</string>
+	<string name="type.toilets.yes">Záchody</string>
 	<string name="type.amenity.townhall">Radnica</string>
 	<string name="type.amenity.university">Univerzita</string>
 	<string name="type.amenity.vending_machine.cigarettes">Automat na cigarety</string>
diff --git a/android/app/src/main/res/values-sv/strings.xml b/android/app/src/main/res/values-sv/strings.xml
index 5a4dd9c5fa..cc5273d896 100644
--- a/android/app/src/main/res/values-sv/strings.xml
+++ b/android/app/src/main/res/values-sv/strings.xml
@@ -859,6 +859,7 @@
 	<string name="type.amenity.telephone">Telefon</string>
 	<string name="type.amenity.theatre">Teater</string>
 	<string name="type.amenity.toilets">Toalett</string>
+	<string name="type.toilets.yes">Toalett</string>
 	<string name="type.amenity.townhall">Rådhus</string>
 	<string name="type.amenity.university">Universitet</string>
 	<string name="type.amenity.vending_machine.cigarettes">Cigarettmaskin</string>
diff --git a/android/app/src/main/res/values-th/strings.xml b/android/app/src/main/res/values-th/strings.xml
index b206b9bf0d..475904cee3 100644
--- a/android/app/src/main/res/values-th/strings.xml
+++ b/android/app/src/main/res/values-th/strings.xml
@@ -860,6 +860,7 @@
 	<string name="type.amenity.telephone">โทรศัพท์</string>
 	<string name="type.amenity.theatre">โรงละคร</string>
 	<string name="type.amenity.toilets">ห้องน้ำ</string>
+	<string name="type.toilets.yes">ห้องน้ำ</string>
 	<string name="type.amenity.townhall">ศาลากลางจังหวัด</string>
 	<string name="type.amenity.university">มหาวิทยาลัย</string>
 	<string name="type.amenity.vending_machine.cigarettes">เครื่องขายบุหรี่</string>
diff --git a/android/app/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml
index ddc10c7895..a357db4b00 100644
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -934,6 +934,7 @@
 	<string name="type.amenity.telephone">Telefon</string>
 	<string name="type.amenity.theatre">Tiyatro</string>
 	<string name="type.amenity.toilets">Tuvalet</string>
+	<string name="type.toilets.yes">Tuvalet</string>
 	<string name="type.amenity.townhall">Belediye Binası</string>
 	<string name="type.amenity.university">Üniversite</string>
 	<string name="type.amenity.vending_machine">Otomat</string>
diff --git a/android/app/src/main/res/values-uk/strings.xml b/android/app/src/main/res/values-uk/strings.xml
index bb0e10f26b..7c0c02447d 100644
--- a/android/app/src/main/res/values-uk/strings.xml
+++ b/android/app/src/main/res/values-uk/strings.xml
@@ -934,6 +934,7 @@
 	<string name="type.amenity.telephone">Телефон</string>
 	<string name="type.amenity.theatre">Театр</string>
 	<string name="type.amenity.toilets">Туалет</string>
+	<string name="type.toilets.yes">Туалет</string>
 	<string name="type.amenity.townhall">Адміністрація</string>
 	<string name="type.amenity.university">Університет</string>
 	<string name="type.amenity.vending_machine">Торговий автомат</string>
diff --git a/android/app/src/main/res/values-vi/strings.xml b/android/app/src/main/res/values-vi/strings.xml
index a47a7fd178..be92a6998c 100644
--- a/android/app/src/main/res/values-vi/strings.xml
+++ b/android/app/src/main/res/values-vi/strings.xml
@@ -857,6 +857,7 @@
 	<string name="type.amenity.telephone">Điện thoại</string>
 	<string name="type.amenity.theatre">Điểm trú ẩn</string>
 	<string name="type.amenity.toilets">Nhà vệ sinh</string>
+	<string name="type.toilets.yes">Nhà vệ sinh</string>
 	<string name="type.amenity.townhall">Trung tâm thành phố</string>
 	<string name="type.amenity.university">Nhà hát</string>
 	<string name="type.amenity.vending_machine.cigarettes">Máy bán thuốc lá</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 da43eae5cd..9f81f24361 100644
--- a/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -896,6 +896,7 @@
 	<string name="type.amenity.telephone">電話</string>
 	<string name="type.amenity.theatre">劇場</string>
 	<string name="type.amenity.toilets">廁所</string>
+	<string name="type.toilets.yes">廁所</string>
 	<string name="type.amenity.townhall">市政廳</string>
 	<string name="type.amenity.university">大學</string>
 	<string name="type.amenity.vending_machine.cigarettes">香菸自動販賣機</string>
diff --git a/android/app/src/main/res/values-zh/strings.xml b/android/app/src/main/res/values-zh/strings.xml
index 0dd9775dca..8cd307cdd9 100644
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -891,6 +891,7 @@
 	<string name="type.amenity.telephone">电话</string>
 	<string name="type.amenity.theatre">剧院</string>
 	<string name="type.amenity.toilets">厕所</string>
+	<string name="type.toilets.yes">厕所</string>
 	<string name="type.amenity.townhall">市政府</string>
 	<string name="type.amenity.university">大学</string>
 	<string name="type.amenity.vending_machine">自动售货机</string>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index a723e9bb94..2fc39531e6 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -965,6 +965,7 @@
 	<string name="type.amenity.telephone">Phone</string>
 	<string name="type.amenity.theatre">Theatre</string>
 	<string name="type.amenity.toilets">Toilet</string>
+	<string name="type.toilets.yes">Toilet</string>
 	<string name="type.amenity.townhall">Town Hall</string>
 	<string name="type.amenity.university">University</string>
 	<string name="type.amenity.vending_machine">Vending Machine</string>
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
index 4a1c326c0c..9afd243d9d 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "مرحاض";
 
+"type.toilets.yes" = "مرحاض";
+
 "type.amenity.townhall" = "مبنى البلدية";
 
 "type.amenity.university" = "جامعة";
diff --git a/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings
index 55cdcd55cc..8e8dec133c 100644
--- a/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "Tualet";
 
+"type.toilets.yes" = "Tualet";
+
 "type.amenity.townhall" = "Şəhər zalı";
 
 "type.amenity.university" = "Universitet";
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
index 57630d1ba4..2955a60f96 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "Toilet";
 
+"type.toilets.yes" = "Toilet";
+
 "type.amenity.townhall" = "Адміністрацыя";
 
 "type.amenity.university" = "University";
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
index e2905a5046..976e635913 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "Toilet";
 
+"type.toilets.yes" = "Toilet";
+
 "type.amenity.townhall" = "Town Hall";
 
 "type.amenity.university" = "University";
diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
index 035bbc75e8..2d7f2922a6 100644
--- a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "Toilet";
 
+"type.toilets.yes" = "Toilet";
+
 "type.amenity.townhall" = "Town Hall";
 
 "type.amenity.university" = "University";
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
index 88856b515d..1c537c91c0 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "Záchody";
 
+"type.toilets.yes" = "Záchody";
+
 "type.amenity.townhall" = "Radnice";
 
 "type.amenity.university" = "Univerzita";
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
index 732e6b3272..aa9a794471 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "Toilet";
 
+"type.toilets.yes" = "Toilet";
+
 "type.amenity.townhall" = "Rådhus";
 
 "type.amenity.university" = "Universitet";
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
index 51b24d541f..a2475ecf46 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "Toilette";
 
+"type.toilets.yes" = "Toilette";
+
 "type.amenity.townhall" = "Rathaus";
 
 "type.amenity.university" = "Universität";
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
index 99367d5892..665754041a 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "Τουαλέτα";
 
+"type.toilets.yes" = "Τουαλέτα";
+
 "type.amenity.townhall" = "Δημαρχείο";
 
 "type.amenity.university" = "Πανεπιστήμιο";
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
index 1fc3eb5e96..1b1e4571e2 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "Toilet";
 
+"type.toilets.yes" = "Toilet";
+
 "type.amenity.townhall" = "Town Hall";
 
 "type.amenity.university" = "University";
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
index 9c80dc2ae7..01c62b59f2 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "Toilet";
 
+"type.toilets.yes" = "Toilet";
+
 "type.amenity.townhall" = "Town Hall";
 
 "type.amenity.university" = "University";
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
index 1046081c2e..9c027acb5a 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "WC";
 
+"type.toilets.yes" = "WC";
+
 "type.amenity.townhall" = "Ayuntamiento";
 
 "type.amenity.university" = "Universidad";
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index c49aad83a8..7812ae3136 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "WC";
 
+"type.toilets.yes" = "WC";
+
 "type.amenity.townhall" = "Ayuntamiento";
 
 "type.amenity.university" = "Universidad";
diff --git a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
index 52ec84b56b..8f9542b270 100644
--- a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "Tualett";
 
+"type.toilets.yes" = "Tualett";
+
 "type.amenity.townhall" = "Raekoda";
 
 "type.amenity.university" = "Ülikool";
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
index a437d643a1..fce6a98ccc 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "Komuna";
 
+"type.toilets.yes" = "Komuna";
+
 "type.amenity.townhall" = "Udaletxea";
 
 "type.amenity.university" = "Unibertsitatea";
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
index c291f43f38..80b95bf544 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "دستشویی";
 
+"type.toilets.yes" = "دستشویی";
+
 "type.amenity.townhall" = "گردشگری";
 
 "type.amenity.university" = "دانشگاه";
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index a828d0340d..e1ad907b12 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -1535,7 +1535,7 @@
 
 "type.amenity.restaurant" = "Ravintola";
 
-"type.amenity.sanitary_dump_station" = "Holding Tank Dump Station";
+"type.amenity.sanitary_dump_station" = "Jäteveden tyhjennyspiste";
 
 "type.amenity.school" = "Koulu";
 
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "WC";
 
+"type.toilets.yes" = "WC";
+
 "type.amenity.townhall" = "Kaupungintalo";
 
 "type.amenity.university" = "Yliopisto";
@@ -1593,7 +1595,7 @@
 
 "type.amenity.waste_disposal" = "Roska";
 
-"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+"type.amenity.waste_transfer_station" = "Jätteiden vastaanottoasema";
 
 "type.amenity.water_point" = "Vesipiste";
 
@@ -2506,13 +2508,13 @@
 
 "type.leisure.golf_course" = "Golf-rata";
 
-"type.leisure.hackerspace" = "Hackerspace";
+"type.leisure.hackerspace" = "Hacklab";
 
 "type.leisure.ice_rink" = "Ice Rink";
 
 "type.leisure.landscape_reserve" = "Landscape Reserve";
 
-"type.leisure.marina" = "Marina";
+"type.leisure.marina" = "Venesatama";
 
 "type.leisure.nature_reserve" = "Luonnonsuojelualue";
 
@@ -2570,7 +2572,7 @@
 
 "type.man_made.survey_point" = "Survey Point";
 
-"type.man_made.flagpole" = "Flagpole";
+"type.man_made.flagpole" = "Lipputanko";
 
 "type.man_made.lighthouse" = "Majakka";
 
@@ -3439,7 +3441,7 @@
 
 "type.shop.car_repair.tyres" = "Rengashuolto";
 
-"type.shop.caravan" = "RV Dealership";
+"type.shop.caravan" = "Matkailu- ja retkeilyautokauppias";
 
 "type.shop.carpet" = "Matot";
 
@@ -3499,7 +3501,7 @@
 
 "type.shop.hairdresser" = "Kampaamo";
 
-"type.shop.hardware" = "Hardware Store";
+"type.shop.hardware" = "Rautakauppa";
 
 "type.shop.health_food" = "Terveysruokakauppa";
 
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
index c6c50c4403..9773db239c 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "Toilettes";
 
+"type.toilets.yes" = "Toilettes";
+
 "type.amenity.townhall" = "Mairie";
 
 "type.amenity.university" = "Université";
diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
index 99471158b4..7ffb2fa6cf 100644
--- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "Toilet";
 
+"type.toilets.yes" = "Toilet";
+
 "type.amenity.townhall" = "Town Hall";
 
 "type.amenity.university" = "University";
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index e7bb1019ae..bb77fc489e 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "Mosdó";
 
+"type.toilets.yes" = "Mosdó";
+
 "type.amenity.townhall" = "Városháza";
 
 "type.amenity.university" = "Egyetem";
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
index 392bd17f8b..936c80ecd6 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "Toilet";
 
+"type.toilets.yes" = "Toilet";
+
 "type.amenity.townhall" = "Balai kota";
 
 "type.amenity.university" = "Universitas";
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index 37c65769c3..465b4857af 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "Servizi igienici";
 
+"type.toilets.yes" = "Servizi igienici";
+
 "type.amenity.townhall" = "Municipio";
 
 "type.amenity.university" = "Università";
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
index e0dff834ec..a7daa2c2ce 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "トイレ";
 
+"type.toilets.yes" = "トイレ";
+
 "type.amenity.townhall" = "役場";
 
 "type.amenity.university" = "大学";
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
index ab8dc14a4b..7186e6ed53 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "화장실";
 
+"type.toilets.yes" = "화장실";
+
 "type.amenity.townhall" = "시청";
 
 "type.amenity.university" = "대학";
diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
index 1e82aec383..4687b1e994 100644
--- a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "शौचालय";
 
+"type.toilets.yes" = "शौचालय";
+
 "type.amenity.townhall" = "नगर भवन";
 
 "type.amenity.university" = "विद्यापीठ";
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index 50351f85a1..0f13445555 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "Toalett";
 
+"type.toilets.yes" = "Toalett";
+
 "type.amenity.townhall" = "Rådhus";
 
 "type.amenity.university" = "Universitet";
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index 1d9a9f0d51..acfc99d9f5 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "Toiletten";
 
+"type.toilets.yes" = "Toiletten";
+
 "type.amenity.townhall" = "Gemeentehuis";
 
 "type.amenity.university" = "Universiteit";
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
index c30796c997..7350fc0af9 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "Toaleta";
 
+"type.toilets.yes" = "Toaleta";
+
 "type.amenity.townhall" = "Ratusz";
 
 "type.amenity.university" = "Uniwersytet";
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index 27c7035568..6fc212c168 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "Banheiro";
 
+"type.toilets.yes" = "Banheiro";
+
 "type.amenity.townhall" = "Prefeitura ou subprefeitura";
 
 "type.amenity.university" = "Universidade";
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
index d67d801281..383b22bf0b 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "Casa de banho";
 
+"type.toilets.yes" = "Casa de banho";
+
 "type.amenity.townhall" = "Câmara municipal ou junta de freguesia";
 
 "type.amenity.university" = "Universidade";
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
index f7ae17365c..2806142c91 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "Toaletă";
 
+"type.toilets.yes" = "Toaletă";
+
 "type.amenity.townhall" = "Primărie";
 
 "type.amenity.university" = "Universitate";
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
index 424a4ccbf2..35704f6f45 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "Туалет";
 
+"type.toilets.yes" = "Туалет";
+
 "type.amenity.townhall" = "Администрация";
 
 "type.amenity.university" = "Университет";
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
index c08dabb6c5..16f1293a2c 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "Záchody";
 
+"type.toilets.yes" = "Záchody";
+
 "type.amenity.townhall" = "Radnica";
 
 "type.amenity.university" = "Univerzita";
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
index 6726afbce7..a114232c16 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "Toalett";
 
+"type.toilets.yes" = "Toalett";
+
 "type.amenity.townhall" = "Rådhus";
 
 "type.amenity.university" = "Universitet";
diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
index dde527d4bf..9dacab9163 100644
--- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "Toilet";
 
+"type.toilets.yes" = "Toilet";
+
 "type.amenity.townhall" = "Town Hall";
 
 "type.amenity.university" = "University";
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
index b098e7c8be..ed21344c82 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "ห้องน้ำ";
 
+"type.toilets.yes" = "ห้องน้ำ";
+
 "type.amenity.townhall" = "ศาลากลางจังหวัด";
 
 "type.amenity.university" = "มหาวิทยาลัย";
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index 29609e44b8..351825b1e7 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "Tuvalet";
 
+"type.toilets.yes" = "Tuvalet";
+
 "type.amenity.townhall" = "Belediye Binası";
 
 "type.amenity.university" = "Üniversite";
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
index 946bfbd748..140977e279 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "Туалет";
 
+"type.toilets.yes" = "Туалет";
+
 "type.amenity.townhall" = "Адміністрація";
 
 "type.amenity.university" = "Університет";
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
index 673c97e693..7d8d00bbc0 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "Nhà vệ sinh";
 
+"type.toilets.yes" = "Nhà vệ sinh";
+
 "type.amenity.townhall" = "Trung tâm thành phố";
 
 "type.amenity.university" = "Nhà hát";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index c7e7ea1d41..45061959bb 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "厕所";
 
+"type.toilets.yes" = "厕所";
+
 "type.amenity.townhall" = "市政府";
 
 "type.amenity.university" = "大学";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
index a3c922fb2a..b3a0e044e1 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
@@ -1555,6 +1555,8 @@
 
 "type.amenity.toilets" = "廁所";
 
+"type.toilets.yes" = "廁所";
+
 "type.amenity.townhall" = "市政廳";
 
 "type.amenity.university" = "大學";