From 895fa54ac3f7c088c6884cefd7c7e458b0a30475 Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Thu, 20 Jan 2022 19:29:02 +0300
Subject: [PATCH] [strings] Regenerated.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 android/res/values-ar/strings.xml             |  7 +++--
 android/res/values-be/strings.xml             | 10 +++++++
 android/res/values-bg/strings.xml             |  1 +
 android/res/values-cs/strings.xml             |  7 +++--
 android/res/values-da/strings.xml             |  7 +++--
 android/res/values-de/strings.xml             |  9 +++---
 android/res/values-el/strings.xml             |  7 +++--
 android/res/values-es-rMX/strings.xml         |  4 +--
 android/res/values-es/strings.xml             |  7 +++--
 android/res/values-fa/strings.xml             |  7 +++--
 android/res/values-fi/strings.xml             |  7 +++--
 android/res/values-fr/strings.xml             |  8 +++--
 android/res/values-hu/strings.xml             |  7 +++--
 android/res/values-in/strings.xml             |  7 +++--
 android/res/values-it/strings.xml             |  8 +++--
 android/res/values-iw/strings.xml             |  1 +
 android/res/values-ja/strings.xml             |  9 +++---
 android/res/values-ko/strings.xml             |  7 +++--
 android/res/values-nb/strings.xml             |  7 +++--
 android/res/values-nl/strings.xml             |  7 +++--
 android/res/values-pl/strings.xml             |  9 +++---
 android/res/values-pt-rBR/strings.xml         |  9 +++---
 android/res/values-pt/strings.xml             |  9 +++---
 android/res/values-ro/strings.xml             |  7 +++--
 android/res/values-ru/strings.xml             | 18 +++++++----
 android/res/values-sk/strings.xml             |  7 +++--
 android/res/values-sv/strings.xml             |  7 +++--
 android/res/values-sw/strings.xml             |  1 +
 android/res/values-th/strings.xml             |  7 +++--
 android/res/values-tr/strings.xml             |  7 +++--
 android/res/values-uk/strings.xml             | 18 +++++++----
 android/res/values-vi/strings.xml             |  7 +++--
 android/res/values-zh-rTW/strings.xml         |  7 +++--
 android/res/values-zh/strings.xml             |  8 ++---
 android/res/values/strings.xml                | 18 +++++++----
 .../ar.lproj/Localizable.strings              | 30 ++++++++++++++-----
 .../be.lproj/Localizable.strings              | 30 ++++++++++++++-----
 .../bg.lproj/Localizable.strings              | 30 ++++++++++++++-----
 .../cs.lproj/Localizable.strings              | 30 ++++++++++++++-----
 .../da.lproj/Localizable.strings              | 30 ++++++++++++++-----
 .../de.lproj/Localizable.strings              | 30 ++++++++++++++-----
 .../el.lproj/Localizable.strings              | 30 ++++++++++++++-----
 .../en-GB.lproj/Localizable.strings           | 30 ++++++++++++++-----
 .../en.lproj/Localizable.strings              | 30 ++++++++++++++-----
 .../es-MX.lproj/Localizable.strings           | 30 ++++++++++++++-----
 .../es.lproj/Localizable.strings              | 30 ++++++++++++++-----
 .../fa.lproj/Localizable.strings              | 30 ++++++++++++++-----
 .../fi.lproj/Localizable.strings              | 30 ++++++++++++++-----
 .../fr.lproj/Localizable.strings              | 30 ++++++++++++++-----
 .../he.lproj/Localizable.strings              | 30 ++++++++++++++-----
 .../hu.lproj/Localizable.strings              | 30 ++++++++++++++-----
 .../id.lproj/Localizable.strings              | 30 ++++++++++++++-----
 .../it.lproj/Localizable.strings              | 30 ++++++++++++++-----
 .../ja.lproj/Localizable.strings              | 30 ++++++++++++++-----
 .../ko.lproj/Localizable.strings              | 30 ++++++++++++++-----
 .../nb.lproj/Localizable.strings              | 30 ++++++++++++++-----
 .../nl.lproj/Localizable.strings              | 30 ++++++++++++++-----
 .../pl.lproj/Localizable.strings              | 30 ++++++++++++++-----
 .../pt-BR.lproj/Localizable.strings           | 30 ++++++++++++++-----
 .../pt.lproj/Localizable.strings              | 30 ++++++++++++++-----
 .../ro.lproj/Localizable.strings              | 30 ++++++++++++++-----
 .../ru.lproj/Localizable.strings              | 30 ++++++++++++++-----
 .../sk.lproj/Localizable.strings              | 30 ++++++++++++++-----
 .../sv.lproj/Localizable.strings              | 30 ++++++++++++++-----
 .../sw.lproj/Localizable.strings              | 30 ++++++++++++++-----
 .../th.lproj/Localizable.strings              | 30 ++++++++++++++-----
 .../tr.lproj/Localizable.strings              | 30 ++++++++++++++-----
 .../uk.lproj/Localizable.strings              | 30 ++++++++++++++-----
 .../vi.lproj/Localizable.strings              | 30 ++++++++++++++-----
 .../zh-Hans.lproj/Localizable.strings         | 30 ++++++++++++++-----
 .../zh-Hant.lproj/Localizable.strings         | 30 ++++++++++++++-----
 71 files changed, 993 insertions(+), 360 deletions(-)

diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index ceb9d125aa..f8085d055c 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -722,9 +722,10 @@
 	<string name="type.amenity.post_office">مكتب بريد</string>
 	<string name="type.amenity.pub">بار</string>
 	<string name="type.amenity.public_bookcase">مكتبة، تبادل كتب</string>
-	<string name="type.amenity.recycling">مركز إعادة تدوير</string>
-	<string name="type.amenity.recycling_container">حاوية لإعادة التدوير</string>
-	<string name="type.recycling.toxic">نفايات سامة</string>
+	<string name="type.amenity.recycling.centre">مركز إعادة تدوير</string>
+	<string name="type.amenity.recycling">حاوية لإعادة التدوير</string>
+	<string name="type.amenity.recycling.container">حاوية لإعادة التدوير</string>
+	<string name="type.recycling.batteries">ﺕﺎﻳﺭﺎﻄﺑ</string>
 	<string name="type.recycling.clothes">ملابس قديمة</string>
 	<string name="type.recycling.glass_bottles">زجاجات زجاجية</string>
 	<string name="type.recycling.paper">نفايات ورقية</string>
diff --git a/android/res/values-be/strings.xml b/android/res/values-be/strings.xml
index af73716564..2592bd8057 100644
--- a/android/res/values-be/strings.xml
+++ b/android/res/values-be/strings.xml
@@ -667,6 +667,14 @@
 	<string name="type.amenity.grave_yard">Могілкі</string>
 	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard.christian">Хрысціянскія могілкі</string>
+	<string name="type.recycling.batteries">Батарэйкі</string>
+	<string name="type.recycling.cardboard">Кардон</string>
+	<string name="type.recycling.cans">Бляшаныя банкі</string>
+	<string name="type.recycling.shoes">Абутак</string>
+	<string name="type.recycling.green_waste">Арганічныя адходы</string>
+	<string name="type.recycling.cartons">Тэтрапак і аналагі</string>
+	<string name="type.amenity.sanitary_dump_station">Зліў нечыстотаў</string>
+	<string name="type.amenity.waste_transfer_station">Станцыя перавалкі адходаў</string>
 	<string name="type.barrier.chain">Ланцуг</string>
 	<string name="type.barrier.lift_gate">Шлагбаўм</string>
 	<string name="type.barrier.swing_gate">Шлагбаўм</string>
@@ -679,6 +687,8 @@
 	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery.christian">Хрысціянскія могілкі</string>
 	<string name="type.leisure.picnic_table">Стол для пікніка</string>
+	<string name="type.man_made.flagpole">Флагшток</string>
+	<string name="type.man_made.mast">Слуп-шчогла</string>
 	<string name="type.man_made.silo">Сілас</string>
 	<string name="type.man_made.storage_tank">Рэзервуар</string>
 	<string name="type.mountain_pass">Перавал</string>
diff --git a/android/res/values-bg/strings.xml b/android/res/values-bg/strings.xml
index 14ca4f98d4..050a5a2613 100644
--- a/android/res/values-bg/strings.xml
+++ b/android/res/values-bg/strings.xml
@@ -614,6 +614,7 @@
 	<string name="enable_screen_sleep_description">Когато е разрешено, екранът ще бъде оставен да заспи след определен период на неактивност.</string>
 
 	<!-- SECTION: Types -->
+	<string name="type.recycling.batteries">Батерии</string>
 	<string name="type.healthcare.laboratory">Медицинска лаборатория</string>
 
 	<!-- SECTION: Types: Historic -->
diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index b323bb8de6..97a833632d 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -719,9 +719,10 @@
 	<string name="type.amenity.post_office">Pošta</string>
 	<string name="type.amenity.pub">Hospoda</string>
 	<string name="type.amenity.public_bookcase">Knihovna</string>
-	<string name="type.amenity.recycling">Recyklační středisko</string>
-	<string name="type.amenity.recycling_container">Recyklační nádoba</string>
-	<string name="type.recycling.toxic">Toxický odpad</string>
+	<string name="type.amenity.recycling.centre">Recyklační středisko</string>
+	<string name="type.amenity.recycling">Recyklační nádoba</string>
+	<string name="type.amenity.recycling.container">Recyklační nádoba</string>
+	<string name="type.recycling.batteries">Baterie</string>
 	<string name="type.recycling.clothes">Staré oblečení</string>
 	<string name="type.recycling.glass_bottles">Skleněné lahve</string>
 	<string name="type.recycling.paper">Papírový odpad</string>
diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml
index 4a4cc98789..c7b082b409 100644
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@@ -717,9 +717,10 @@
 	<string name="type.amenity.post_office">Postkontor</string>
 	<string name="type.amenity.pub">Værtshus</string>
 	<string name="type.amenity.public_bookcase">Bog udveksling</string>
-	<string name="type.amenity.recycling">Genbrugsplads</string>
-	<string name="type.amenity.recycling_container">Genbrugscontainer</string>
-	<string name="type.recycling.toxic">Giftigt affald</string>
+	<string name="type.amenity.recycling.centre">Genbrugsplads</string>
+	<string name="type.amenity.recycling">Genbrugscontainer</string>
+	<string name="type.amenity.recycling.container">Genbrugscontainer</string>
+	<string name="type.recycling.batteries">Batterier</string>
 	<string name="type.recycling.clothes">Gammelt tøj</string>
 	<string name="type.recycling.glass_bottles">Glasflasker</string>
 	<string name="type.recycling.paper">Papiraffald</string>
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index 10d2bbc5e9..9d126c89ae 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -747,9 +747,10 @@
 	<string name="type.amenity.prison">Gefängnis</string>
 	<string name="type.amenity.pub">Kneipe</string>
 	<string name="type.amenity.public_bookcase">Bücherschrank</string>
-	<string name="type.amenity.recycling">Recyclinghof</string>
-	<string name="type.amenity.recycling_container">Wertstoffcontainer</string>
-	<string name="type.recycling.toxic">Giftmüll</string>
+	<string name="type.amenity.recycling.centre">Recyclinghof</string>
+	<string name="type.amenity.recycling">Wertstoffcontainer</string>
+	<string name="type.amenity.recycling.container">Wertstoffcontainer</string>
+	<string name="type.recycling.batteries">Batterien</string>
 	<string name="type.recycling.clothes">Altkleider</string>
 	<string name="type.recycling.glass_bottles">Glas</string>
 	<string name="type.recycling.paper">Papier</string>
@@ -757,6 +758,7 @@
 	<string name="type.recycling.plastic_bottles">Plastikflaschen</string>
 	<string name="type.recycling.scrap_metal">Altmetall</string>
 	<string name="type.recycling.small_appliances">Elektroschrott</string>
+	<string name="type.amenity.sanitary_dump_station">VE-Station</string>
 	<string name="type.amenity.school">Schule</string>
 	<string name="type.amenity.shelter">Schutzhütte</string>
 	<string name="type.amenity.shower">Dusche</string>
@@ -797,7 +799,6 @@
 	<string name="type.boundary.administrative.11">Verwaltungsgrenze</string>
 	<string name="type.boundary.administrative.3">Verwaltungsgrenze</string>
 	<string name="type.boundary.administrative.4">Verwaltungsgrenze</string>
-	<string name="type.boundary.administrative.4.state">Verwaltungsgrenze</string>
 	<string name="type.boundary.administrative.5">Verwaltungsgrenze</string>
 	<string name="type.boundary.administrative.6">Verwaltungsgrenze</string>
 	<string name="type.boundary.administrative.7">Verwaltungsgrenze</string>
diff --git a/android/res/values-el/strings.xml b/android/res/values-el/strings.xml
index 89e8eff683..b5a7d1e579 100644
--- a/android/res/values-el/strings.xml
+++ b/android/res/values-el/strings.xml
@@ -720,9 +720,10 @@
 	<string name="type.amenity.post_office">Ταχυδρομείο</string>
 	<string name="type.amenity.pub">Παμπ</string>
 	<string name="type.amenity.public_bookcase">Ανταλλαγή βιβλίων</string>
-	<string name="type.amenity.recycling">Κέντρο ανακύκλωσης</string>
-	<string name="type.amenity.recycling_container">Κάδος ανακύκλωσης</string>
-	<string name="type.recycling.toxic">Τοξικά απόβλητα</string>
+	<string name="type.amenity.recycling.centre">Κέντρο ανακύκλωσης</string>
+	<string name="type.amenity.recycling">Κάδος ανακύκλωσης</string>
+	<string name="type.amenity.recycling.container">Κάδος ανακύκλωσης</string>
+	<string name="type.recycling.batteries">Μπαταρίες</string>
 	<string name="type.recycling.clothes">Παλιά ρούχα</string>
 	<string name="type.recycling.glass_bottles">Γυάλινα μπουκάλια</string>
 	<string name="type.recycling.paper">Απορρίμματα χαρτιού</string>
diff --git a/android/res/values-es-rMX/strings.xml b/android/res/values-es-rMX/strings.xml
index 9a320b3a17..d5e3a9a9d2 100644
--- a/android/res/values-es-rMX/strings.xml
+++ b/android/res/values-es-rMX/strings.xml
@@ -184,8 +184,8 @@
 	<string name="type.amenity.parking_space.private">Plaza de aparcamiento</string>
 	<string name="type.amenity.parking_space.underground">Plaza de aparcamiento</string>
 	<string name="type.amenity.post_office">Oficina de correos</string>
-	<string name="type.amenity.recycling_container">Contenedor de reciclaje</string>
-	<string name="type.recycling.toxic">Desechos tóxicos</string>
+	<string name="type.amenity.recycling">Contenedor de reciclaje</string>
+	<string name="type.amenity.recycling.container">Contenedor de reciclaje</string>
 	<string name="type.recycling.clothes">Ropa vieja</string>
 	<string name="type.recycling.glass_bottles">Envase de vidrio</string>
 	<string name="type.recycling.paper">Desechos de papel</string>
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index 53c525ee81..52d7e0e599 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -735,9 +735,10 @@
 	<string name="type.amenity.post_box">Buzón</string>
 	<string name="type.amenity.post_office">Oficina de correos</string>
 	<string name="type.amenity.public_bookcase">Intercambio de libros</string>
-	<string name="type.amenity.recycling">Centro de reciclaje</string>
-	<string name="type.amenity.recycling_container">Contenedor de reciclaje</string>
-	<string name="type.recycling.toxic">Residuos tóxicos</string>
+	<string name="type.amenity.recycling.centre">Centro de reciclaje</string>
+	<string name="type.amenity.recycling">Contenedor de reciclaje</string>
+	<string name="type.amenity.recycling.container">Contenedor de reciclaje</string>
+	<string name="type.recycling.batteries">Baterías</string>
 	<string name="type.recycling.clothes">Ropa vieja</string>
 	<string name="type.recycling.glass_bottles">Cascos de botellas</string>
 	<string name="type.recycling.paper">Desperdicio de papel</string>
diff --git a/android/res/values-fa/strings.xml b/android/res/values-fa/strings.xml
index 8381c279b4..266ec61d60 100644
--- a/android/res/values-fa/strings.xml
+++ b/android/res/values-fa/strings.xml
@@ -719,9 +719,10 @@
 	<string name="type.amenity.post_box">صندوق پست</string>
 	<string name="type.amenity.post_office">دفتر پست</string>
 	<string name="type.amenity.pub">میکده</string>
-	<string name="type.amenity.recycling">مرکز بازیافت</string>
-	<string name="type.amenity.recycling_container">ظرف بازیافت</string>
-	<string name="type.recycling.toxic">پسماند سمی</string>
+	<string name="type.amenity.recycling.centre">مرکز بازیافت</string>
+	<string name="type.amenity.recycling">ظرف بازیافت</string>
+	<string name="type.amenity.recycling.container">ظرف بازیافت</string>
+	<string name="type.recycling.batteries">ﺎﻫ ﯼﺮﺗﺎﺑ</string>
 	<string name="type.recycling.clothes">لباسهای قدیمی</string>
 	<string name="type.recycling.glass_bottles">بطریهای شیشهای</string>
 	<string name="type.recycling.paper">پسماند کاغذ</string>
diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml
index 13cf44d98b..9495056f0d 100644
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@@ -728,9 +728,10 @@
 	<string name="type.amenity.post_office">Postitoimisto</string>
 	<string name="type.amenity.pub">Pubi</string>
 	<string name="type.amenity.public_bookcase">Kirjahylly</string>
-	<string name="type.amenity.recycling">Kierrätyskeskus</string>
-	<string name="type.amenity.recycling_container">Kierrätysjäteastia</string>
-	<string name="type.recycling.toxic">Myrkkyjäte</string>
+	<string name="type.amenity.recycling.centre">Kierrätyskeskus</string>
+	<string name="type.amenity.recycling">Kierrätysjäteastia</string>
+	<string name="type.amenity.recycling.container">Kierrätysjäteastia</string>
+	<string name="type.recycling.batteries">Paristot</string>
 	<string name="type.recycling.clothes">Vanhat vaatteet</string>
 	<string name="type.recycling.glass_bottles">Lasipullot</string>
 	<string name="type.recycling.paper">Paperi- ja kartonkijäte</string>
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index 32bc5d1c1d..5cafff7f91 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -745,9 +745,10 @@
 	<string name="type.amenity.post_office">Bureau de poste</string>
 	<string name="type.amenity.pub">Pub</string>
 	<string name="type.amenity.public_bookcase">Microbibliothèque</string>
-	<string name="type.amenity.recycling">Centre de recyclage</string>
-	<string name="type.amenity.recycling_container">Conteneur de recyclage</string>
-	<string name="type.recycling.toxic">Déchets toxiques</string>
+	<string name="type.amenity.recycling.centre">Centre de recyclage</string>
+	<string name="type.amenity.recycling">Conteneur de recyclage</string>
+	<string name="type.amenity.recycling.container">Conteneur de recyclage</string>
+	<string name="type.recycling.batteries">Batteries</string>
 	<string name="type.recycling.clothes">Vêtement usagés</string>
 	<string name="type.recycling.glass_bottles">Verre</string>
 	<string name="type.recycling.paper">Papier usagé</string>
@@ -755,6 +756,7 @@
 	<string name="type.recycling.plastic_bottles">Collecte de bouteilles en plastique</string>
 	<string name="type.recycling.scrap_metal">Ferraille</string>
 	<string name="type.recycling.small_appliances">Déchets d\'équipements électriques</string>
+	<string name="type.amenity.sanitary_dump_station">Station de vidange</string>
 	<string name="type.amenity.school">École</string>
 	<string name="type.amenity.shelter">Abri</string>
 	<string name="type.amenity.shower">Douche</string>
diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml
index 95e6c9ad87..2ecc20e45f 100644
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@@ -718,9 +718,10 @@
 	<string name="type.amenity.post_office">Posta</string>
 	<string name="type.amenity.pub">Kocsma</string>
 	<string name="type.amenity.public_bookcase">Nyilvános könyvespolc</string>
-	<string name="type.amenity.recycling">Újrahasznosító központ</string>
-	<string name="type.amenity.recycling_container">Újrahasznosító tartály</string>
-	<string name="type.recycling.toxic">Mérgező hulladék</string>
+	<string name="type.amenity.recycling.centre">Újrahasznosító központ</string>
+	<string name="type.amenity.recycling">Újrahasznosító tartály</string>
+	<string name="type.amenity.recycling.container">Újrahasznosító tartály</string>
+	<string name="type.recycling.batteries">Elemek</string>
 	<string name="type.recycling.clothes">Régi ruhák</string>
 	<string name="type.recycling.glass_bottles">Üveg palackok</string>
 	<string name="type.recycling.paper">Papír hulladék</string>
diff --git a/android/res/values-in/strings.xml b/android/res/values-in/strings.xml
index e401ac1d54..9f526f7360 100644
--- a/android/res/values-in/strings.xml
+++ b/android/res/values-in/strings.xml
@@ -716,9 +716,10 @@
 	<string name="type.amenity.post_box">Kotak pos</string>
 	<string name="type.amenity.post_office">Kantor pos</string>
 	<string name="type.amenity.public_bookcase">Rak Buku</string>
-	<string name="type.amenity.recycling">TPA</string>
-	<string name="type.amenity.recycling_container">Wadah daur ulang</string>
-	<string name="type.recycling.toxic">Limbah beracun</string>
+	<string name="type.amenity.recycling.centre">TPA</string>
+	<string name="type.amenity.recycling">Wadah daur ulang</string>
+	<string name="type.amenity.recycling.container">Wadah daur ulang</string>
+	<string name="type.recycling.batteries">Baterai</string>
 	<string name="type.recycling.clothes">Pakaian lama</string>
 	<string name="type.recycling.glass_bottles">Botol kaca</string>
 	<string name="type.recycling.paper">Limbah kertas</string>
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index 4d5548d5ea..723b7412b4 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -740,9 +740,10 @@
 	<string name="type.amenity.post_box">Casella</string>
 	<string name="type.amenity.post_office">Ufficio postale</string>
 	<string name="type.amenity.public_bookcase">Libreria</string>
-	<string name="type.amenity.recycling">Centro di riciclaggio</string>
-	<string name="type.amenity.recycling_container">Contenitore per materiali riciclabili</string>
-	<string name="type.recycling.toxic">Rifiuti tossici</string>
+	<string name="type.amenity.recycling.centre">Centro di riciclaggio</string>
+	<string name="type.amenity.recycling">Contenitore per materiali riciclabili</string>
+	<string name="type.amenity.recycling.container">Contenitore per materiali riciclabili</string>
+	<string name="type.recycling.batteries">Batterie</string>
 	<string name="type.recycling.clothes">Vestiti usati</string>
 	<string name="type.recycling.glass_bottles">Contenitori in vetro</string>
 	<string name="type.recycling.paper">Rifiuti in carta e cartone</string>
@@ -751,6 +752,7 @@
 	<string name="type.recycling.scrap_metal">Rifiuti metallici</string>
 	<string name="type.recycling.small_appliances">Rifiuti di apparecchiature elettriche ed elettroniche</string>
 	<string name="type.amenity.restaurant">Ristorante</string>
+	<string name="type.amenity.sanitary_dump_station">Camper service</string>
 	<string name="type.amenity.school">Scuola</string>
 	<string name="type.amenity.shelter">Riparo</string>
 	<string name="type.amenity.shower">Doccia</string>
diff --git a/android/res/values-iw/strings.xml b/android/res/values-iw/strings.xml
index 41259fb458..8754c1f524 100644
--- a/android/res/values-iw/strings.xml
+++ b/android/res/values-iw/strings.xml
@@ -214,6 +214,7 @@
 	<string name="enable_screen_sleep_description">כאשר מופעל המסך יורשה לישון לאחר תקופה של חוסר פעילות.</string>
 
 	<!-- SECTION: Types -->
+	<string name="type.recycling.batteries">תוללוס</string>
 	<string name="type.cuisine.african">מטבח אפריקאי</string>
 	<string name="type.cuisine.american">מטבח אמריקאי</string>
 	<string name="type.cuisine.arab">מטבח ערבי</string>
diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml
index d5d8f7d2c3..25cfb7d9b0 100644
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@@ -729,9 +729,10 @@
 	<string name="type.amenity.prison">刑務所</string>
 	<string name="type.amenity.pub">バー</string>
 	<string name="type.amenity.public_bookcase">街角文庫</string>
-	<string name="type.amenity.recycling">リサイクルセンター</string>
-	<string name="type.amenity.recycling_container">リサイクルボックス</string>
-	<string name="type.recycling.toxic">有毒廃棄物</string>
+	<string name="type.amenity.recycling.centre">リサイクルセンター</string>
+	<string name="type.amenity.recycling">リサイクルボックス</string>
+	<string name="type.amenity.recycling.container">リサイクルボックス</string>
+	<string name="type.recycling.batteries">バッテリー</string>
 	<string name="type.recycling.clothes">古着</string>
 	<string name="type.recycling.glass_bottles">ガラス瓶</string>
 	<string name="type.recycling.paper">紙くず</string>
@@ -780,7 +781,6 @@
 	<string name="type.boundary.administrative.11">行政境界</string>
 	<string name="type.boundary.administrative.3">行政境界</string>
 	<string name="type.boundary.administrative.4">行政境界</string>
-	<string name="type.boundary.administrative.4.state">行政境界</string>
 	<string name="type.boundary.administrative.5">行政境界</string>
 	<string name="type.boundary.administrative.6">行政境界</string>
 	<string name="type.boundary.administrative.7">行政境界</string>
@@ -1164,7 +1164,6 @@
 	<string name="type.natural.wetland.bog">泥炭地</string>
 	<string name="type.natural.wetland.marsh">沼地</string>
 	<string name="type.noexit">行き止まり</string>
-	<string name="type.noexit.motor_vehicle">行き止まり</string>
 	<string name="type.office">オフィス</string>
 	<string name="type.office.company">会社事務所</string>
 	<string name="type.office.estate_agent">不動産業者</string>
diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml
index 966cbbd694..ff1ae6cfe3 100644
--- a/android/res/values-ko/strings.xml
+++ b/android/res/values-ko/strings.xml
@@ -717,9 +717,10 @@
 	<string name="type.amenity.post_office">우체국</string>
 	<string name="type.amenity.pub">술집</string>
 	<string name="type.amenity.public_bookcase">도서 교환</string>
-	<string name="type.amenity.recycling">재활용센터</string>
-	<string name="type.amenity.recycling_container">재활용 쓰레기통</string>
-	<string name="type.recycling.toxic">유독성 폐기물</string>
+	<string name="type.amenity.recycling.centre">재활용센터</string>
+	<string name="type.amenity.recycling">재활용 쓰레기통</string>
+	<string name="type.amenity.recycling.container">재활용 쓰레기통</string>
+	<string name="type.recycling.batteries">배터리</string>
 	<string name="type.recycling.clothes">낡은 옷</string>
 	<string name="type.recycling.glass_bottles">유리병</string>
 	<string name="type.recycling.paper">종이 쓰레기</string>
diff --git a/android/res/values-nb/strings.xml b/android/res/values-nb/strings.xml
index 3e946dc97f..bc38c2181c 100644
--- a/android/res/values-nb/strings.xml
+++ b/android/res/values-nb/strings.xml
@@ -715,9 +715,10 @@
 	<string name="type.amenity.post_box">Postboks</string>
 	<string name="type.amenity.post_office">Postkontor</string>
 	<string name="type.amenity.public_bookcase">Bokhylle</string>
-	<string name="type.amenity.recycling">Resirkuleringssenter</string>
-	<string name="type.amenity.recycling_container">Gjenvinningsbeholder</string>
-	<string name="type.recycling.toxic">Giftig avfall</string>
+	<string name="type.amenity.recycling.centre">Resirkuleringssenter</string>
+	<string name="type.amenity.recycling">Gjenvinningsbeholder</string>
+	<string name="type.amenity.recycling.container">Gjenvinningsbeholder</string>
+	<string name="type.recycling.batteries">Batterier</string>
 	<string name="type.recycling.clothes">Gamle klær</string>
 	<string name="type.recycling.glass_bottles">Glassemballasje</string>
 	<string name="type.recycling.paper">Papiravfall</string>
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index 2ab48f7843..45818f8c6a 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -719,9 +719,10 @@
 	<string name="type.amenity.post_office">Postkantoor</string>
 	<string name="type.amenity.pub">Kroeg</string>
 	<string name="type.amenity.public_bookcase">Boekenkast</string>
-	<string name="type.amenity.recycling">Milieustraat</string>
-	<string name="type.amenity.recycling_container">Recycling container</string>
-	<string name="type.recycling.toxic">Giftig afval</string>
+	<string name="type.amenity.recycling.centre">Milieustraat</string>
+	<string name="type.amenity.recycling">Recycling container</string>
+	<string name="type.amenity.recycling.container">Recycling container</string>
+	<string name="type.recycling.batteries">Batterijen</string>
 	<string name="type.recycling.clothes">Oude kleding</string>
 	<string name="type.recycling.glass_bottles">Glazen flessen</string>
 	<string name="type.recycling.paper">Papierafval</string>
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index 1b2e276030..40dccbfe92 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -745,9 +745,10 @@
 	<string name="type.amenity.post_office">Urząd Pocztowy</string>
 	<string name="type.amenity.prison">Więzienie</string>
 	<string name="type.amenity.public_bookcase">Wymiana książek</string>
-	<string name="type.amenity.recycling">Centrum przetwórstwa odpadów</string>
-	<string name="type.amenity.recycling_container">Pojemnik do recyklingu</string>
-	<string name="type.recycling.toxic">Odpady toksyczne</string>
+	<string name="type.amenity.recycling.centre">Centrum przetwórstwa odpadów</string>
+	<string name="type.amenity.recycling">Pojemnik do recyklingu</string>
+	<string name="type.amenity.recycling.container">Pojemnik do recyklingu</string>
+	<string name="type.recycling.batteries">Baterie</string>
 	<string name="type.recycling.clothes">Stare ubrania</string>
 	<string name="type.recycling.glass_bottles">Szkło</string>
 	<string name="type.recycling.paper">Makulatura</string>
@@ -797,7 +798,6 @@
 	<string name="type.boundary.administrative.2">Granica państwa</string>
 	<string name="type.boundary.administrative.3">Granica administracyjna</string>
 	<string name="type.boundary.administrative.4">Granica administracyjna</string>
-	<string name="type.boundary.administrative.4.state">Granica administracyjna</string>
 	<string name="type.boundary.administrative.5">Granica administracyjna</string>
 	<string name="type.boundary.administrative.6">Granica administracyjna</string>
 	<string name="type.boundary.administrative.7">Granica administracyjna</string>
@@ -1182,7 +1182,6 @@
 	<string name="type.natural.wetland.bog">Torfowisko</string>
 	<string name="type.natural.wetland.marsh">Moczary</string>
 	<string name="type.noexit">Ślepy koniec drogi</string>
-	<string name="type.noexit.motor_vehicle">Ślepy koniec drogi</string>
 	<string name="type.office">Biuro</string>
 	<string name="type.office.company">Biuro przedsiębiorstwa</string>
 	<string name="type.office.estate_agent">Pośrednik handlu nieruchomościami</string>
diff --git a/android/res/values-pt-rBR/strings.xml b/android/res/values-pt-rBR/strings.xml
index 759bb50c59..cc139cb5d7 100644
--- a/android/res/values-pt-rBR/strings.xml
+++ b/android/res/values-pt-rBR/strings.xml
@@ -745,9 +745,10 @@
 	<string name="type.amenity.prison">Presidiário</string>
 	<string name="type.amenity.pub">Pub ou buteco</string>
 	<string name="type.amenity.public_bookcase">Biblioteca livre</string>
-	<string name="type.amenity.recycling">Centro de reciclagem</string>
-	<string name="type.amenity.recycling_container">Recipiente de reciclagem</string>
-	<string name="type.recycling.toxic">Lixo tóxico</string>
+	<string name="type.amenity.recycling.centre">Centro de reciclagem</string>
+	<string name="type.amenity.recycling">Recipiente de reciclagem</string>
+	<string name="type.amenity.recycling.container">Recipiente de reciclagem</string>
+	<string name="type.recycling.batteries">Baterias</string>
 	<string name="type.recycling.clothes">Roupas velhas</string>
 	<string name="type.recycling.glass_bottles">Garrafas de vidro</string>
 	<string name="type.recycling.paper">Lixo de papel</string>
@@ -797,7 +798,6 @@
 	<string name="type.boundary.administrative.2">Fronteira de país</string>
 	<string name="type.boundary.administrative.3">Fronteira administrativa</string>
 	<string name="type.boundary.administrative.4">Fronteira administrativa</string>
-	<string name="type.boundary.administrative.4.state">Fronteira administrativa</string>
 	<string name="type.boundary.administrative.5">Fronteira administrativa</string>
 	<string name="type.boundary.administrative.6">Fronteira administrativa</string>
 	<string name="type.boundary.administrative.7">Fronteira administrativa</string>
@@ -1192,7 +1192,6 @@
 	<string name="type.natural.wetland.bog">Zona úmida</string>
 	<string name="type.natural.wetland.marsh">Zona úmida</string>
 	<string name="type.noexit">Via sem saída</string>
-	<string name="type.noexit.motor_vehicle">Via sem saída</string>
 	<string name="type.office">Escritório</string>
 	<string name="type.office.company">Escritório de empresa</string>
 	<string name="type.office.estate_agent">Corretor imobiliário</string>
diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml
index abe4e85a02..11672e21fb 100644
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@@ -749,9 +749,10 @@
 	<string name="type.amenity.prison">Prisão</string>
 	<string name="type.amenity.pub">Pub ou taberna</string>
 	<string name="type.amenity.public_bookcase">Biblioteca livre</string>
-	<string name="type.amenity.recycling">Centro de reciclagem</string>
-	<string name="type.amenity.recycling_container">Contentor de reciclagem</string>
-	<string name="type.recycling.toxic">Resíduos tóxicos</string>
+	<string name="type.amenity.recycling.centre">Centro de reciclagem</string>
+	<string name="type.amenity.recycling">Contentor de reciclagem</string>
+	<string name="type.amenity.recycling.container">Contentor de reciclagem</string>
+	<string name="type.recycling.batteries">Baterias</string>
 	<string name="type.recycling.clothes">Roupas velhas</string>
 	<string name="type.recycling.glass_bottles">Garrafas de vidro</string>
 	<string name="type.recycling.paper">Papel</string>
@@ -801,7 +802,6 @@
 	<string name="type.boundary.administrative.2">Fronteira de país</string>
 	<string name="type.boundary.administrative.3">Fronteira administrativa</string>
 	<string name="type.boundary.administrative.4">Fronteira administrativa</string>
-	<string name="type.boundary.administrative.4.state">Fronteira administrativa</string>
 	<string name="type.boundary.administrative.5">Fronteira administrativa</string>
 	<string name="type.boundary.administrative.6">Fronteira administrativa</string>
 	<string name="type.boundary.administrative.7">Fronteira administrativa</string>
@@ -1197,7 +1197,6 @@
 	<string name="type.natural.wetland.bog">Zona úmida</string>
 	<string name="type.natural.wetland.marsh">Zona úmida</string>
 	<string name="type.noexit">Via sem saída</string>
-	<string name="type.noexit.motor_vehicle">Via sem saída</string>
 	<string name="type.office">Escritório</string>
 	<string name="type.office.company">Empresa</string>
 	<string name="type.office.estate_agent">Imobiliária</string>
diff --git a/android/res/values-ro/strings.xml b/android/res/values-ro/strings.xml
index ca8da1c221..22f4d08a38 100644
--- a/android/res/values-ro/strings.xml
+++ b/android/res/values-ro/strings.xml
@@ -739,9 +739,10 @@
 	<string name="type.amenity.post_box">Cutie poștală</string>
 	<string name="type.amenity.post_office">Oficiu poștal</string>
 	<string name="type.amenity.public_bookcase">Bibliotecă</string>
-	<string name="type.amenity.recycling">Centru de reciclare</string>
-	<string name="type.amenity.recycling_container">Containere pentru reciclare</string>
-	<string name="type.recycling.toxic">Deșeuri toxice</string>
+	<string name="type.amenity.recycling.centre">Centru de reciclare</string>
+	<string name="type.amenity.recycling">Containere pentru reciclare</string>
+	<string name="type.amenity.recycling.container">Containere pentru reciclare</string>
+	<string name="type.recycling.batteries">Baterii</string>
 	<string name="type.recycling.clothes">Haine vechi</string>
 	<string name="type.recycling.glass_bottles">Deșeuri de sticlă</string>
 	<string name="type.recycling.paper">Deșeuri de hârtie</string>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index 7f6c30d02b..8ca11e13c4 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -767,9 +767,10 @@
 	<string name="type.amenity.prison">Тюрьма</string>
 	<string name="type.amenity.pub">Паб</string>
 	<string name="type.amenity.public_bookcase">Книгообмен</string>
-	<string name="type.amenity.recycling">Приём вторсырья</string>
-	<string name="type.amenity.recycling_container">Контейнер для вторсырья</string>
-	<string name="type.recycling.toxic">Ядовитые отходы</string>
+	<string name="type.amenity.recycling.centre">Приём вторсырья</string>
+	<string name="type.amenity.recycling">Контейнер для вторсырья</string>
+	<string name="type.amenity.recycling.container">Контейнер для вторсырья</string>
+	<string name="type.recycling.batteries">Батарейки</string>
 	<string name="type.recycling.clothes">Старая одежда</string>
 	<string name="type.recycling.glass_bottles">Стеклотара</string>
 	<string name="type.recycling.paper">Макулатура</string>
@@ -777,7 +778,13 @@
 	<string name="type.recycling.plastic_bottles">Сбор пластиковых бутылок</string>
 	<string name="type.recycling.scrap_metal">Металлолом</string>
 	<string name="type.recycling.small_appliances">Электроотходы</string>
+	<string name="type.recycling.cardboard">Картон</string>
+	<string name="type.recycling.cans">Жестяные банки</string>
+	<string name="type.recycling.shoes">Обувь</string>
+	<string name="type.recycling.green_waste">Органические отходы</string>
+	<string name="type.recycling.cartons">Тетрапак и аналоги</string>
 	<string name="type.amenity.restaurant">Ресторан</string>
+	<string name="type.amenity.sanitary_dump_station">Слив нечистот</string>
 	<string name="type.amenity.school">Школа</string>
 	<string name="type.amenity.shelter">Укрытие</string>
 	<string name="type.amenity.shower">Душ</string>
@@ -795,6 +802,7 @@
 	<string name="type.amenity.veterinary">Ветеринарная клиника</string>
 	<string name="type.amenity.waste_basket">Урна</string>
 	<string name="type.amenity.waste_disposal">Мусорный контейнер</string>
+	<string name="type.amenity.waste_transfer_station">Станция перевалки отходов</string>
 	<string name="type.amenity.water_point">Заправка водой</string>
 	<string name="type.barrier">Преграда</string>
 	<string name="type.barrier.block">Блок</string>
@@ -820,7 +828,6 @@
 	<string name="type.boundary.administrative.2">Граница страны</string>
 	<string name="type.boundary.administrative.3">Административная граница</string>
 	<string name="type.boundary.administrative.4">Административная граница</string>
-	<string name="type.boundary.administrative.4.state">Административная граница</string>
 	<string name="type.boundary.administrative.5">Административная граница</string>
 	<string name="type.boundary.administrative.6">Административная граница</string>
 	<string name="type.boundary.administrative.7">Административная граница</string>
@@ -1169,7 +1176,9 @@
 	<string name="type.man_made.cairn">Тур</string>
 	<string name="type.man_made.chimney">Заводская труба</string>
 	<string name="type.man_made.cutline">Просека</string>
+	<string name="type.man_made.flagpole">Флагшток</string>
 	<string name="type.man_made.lighthouse">Маяк</string>
+	<string name="type.man_made.mast">Столб-мачта</string>
 	<string name="type.man_made.pier">Пирс</string>
 	<string name="type.man_made.pipeline">Трубопровод</string>
 	<string name="type.man_made.pipeline.overground">Наземный трубопровод</string>
@@ -1224,7 +1233,6 @@
 	<string name="type.natural.wetland.bog">Торфяное болото</string>
 	<string name="type.natural.wetland.marsh">Болотистая местность</string>
 	<string name="type.noexit">Тупик</string>
-	<string name="type.noexit.motor_vehicle">Тупик</string>
 	<string name="type.office">Офис</string>
 	<string name="type.office.company">Организация</string>
 	<string name="type.office.estate_agent">Агентство недвижимости</string>
diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml
index 08803876aa..a56a726db1 100644
--- a/android/res/values-sk/strings.xml
+++ b/android/res/values-sk/strings.xml
@@ -717,9 +717,10 @@
 	<string name="type.amenity.post_office">Pošta</string>
 	<string name="type.amenity.pub">Pohostinstvo</string>
 	<string name="type.amenity.public_bookcase">Knižnica</string>
-	<string name="type.amenity.recycling">Zberné suroviny</string>
-	<string name="type.amenity.recycling_container">Recyklačný odpad</string>
-	<string name="type.recycling.toxic">Toxický odpad</string>
+	<string name="type.amenity.recycling.centre">Zberné suroviny</string>
+	<string name="type.amenity.recycling">Recyklačný odpad</string>
+	<string name="type.amenity.recycling.container">Recyklačný odpad</string>
+	<string name="type.recycling.batteries">Batérie</string>
 	<string name="type.recycling.clothes">Staré oblečenie</string>
 	<string name="type.recycling.glass_bottles">Sklenené fľaše</string>
 	<string name="type.recycling.paper">Papierový odpad</string>
diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml
index bedfbd16d0..06011ca79b 100644
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@@ -715,9 +715,10 @@
 	<string name="type.amenity.post_office">Postkontor</string>
 	<string name="type.amenity.pub">Krog</string>
 	<string name="type.amenity.public_bookcase">Bokskåp</string>
-	<string name="type.amenity.recycling">Återvinningscentral</string>
-	<string name="type.amenity.recycling_container">Behållare för återvinningsbart avfall</string>
-	<string name="type.recycling.toxic">Giftigt avfall</string>
+	<string name="type.amenity.recycling.centre">Återvinningscentral</string>
+	<string name="type.amenity.recycling">Behållare för återvinningsbart avfall</string>
+	<string name="type.amenity.recycling.container">Behållare för återvinningsbart avfall</string>
+	<string name="type.recycling.batteries">Batterier</string>
 	<string name="type.recycling.clothes">Gamla kläder</string>
 	<string name="type.recycling.glass_bottles">Returglas</string>
 	<string name="type.recycling.paper">Returpapper</string>
diff --git a/android/res/values-sw/strings.xml b/android/res/values-sw/strings.xml
index 515c852ac3..18d9f74a67 100644
--- a/android/res/values-sw/strings.xml
+++ b/android/res/values-sw/strings.xml
@@ -208,6 +208,7 @@
 	<string name="type.amenity.parking_space.private">Sehemu ya maegesho</string>
 	<string name="type.amenity.parking_space.underground">Sehemu ya maegesho</string>
 	<string name="type.amenity.post_office">Ofisi ya posta</string>
+	<string name="type.recycling.batteries">Betri</string>
 	<string name="type.amenity.vending_machine.public_transport_tickets">Mashine ya kuuzia tiketi za usafiri wa umma</string>
 	<string name="type.boundary.national_park">Hifadhi ya taifa</string>
 	<string name="type.cuisine.coffee_shop">Kahawa</string>
diff --git a/android/res/values-th/strings.xml b/android/res/values-th/strings.xml
index 1d59d5239f..9544825235 100644
--- a/android/res/values-th/strings.xml
+++ b/android/res/values-th/strings.xml
@@ -720,9 +720,10 @@
 	<string name="type.amenity.post_office">ที่ทำการไปรษณีย์</string>
 	<string name="type.amenity.pub">ผับ</string>
 	<string name="type.amenity.public_bookcase">ตู้หนังสือ สถานที่แลกเปลี่ยนหนังสือ</string>
-	<string name="type.amenity.recycling">ศูนย์รีไซเคิล</string>
-	<string name="type.amenity.recycling_container">บรรจุภัณฑ์รีไซเคิล</string>
-	<string name="type.recycling.toxic">ขยะสารพิษ</string>
+	<string name="type.amenity.recycling.centre">ศูนย์รีไซเคิล</string>
+	<string name="type.amenity.recycling">บรรจุภัณฑ์รีไซเคิล</string>
+	<string name="type.amenity.recycling.container">บรรจุภัณฑ์รีไซเคิล</string>
+	<string name="type.recycling.batteries">แบตเตอรี่</string>
 	<string name="type.recycling.clothes">เสื้อผ้าเก่า</string>
 	<string name="type.recycling.glass_bottles">ขวดแก้ว</string>
 	<string name="type.recycling.paper">ขยะกระดาษ</string>
diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml
index bcd573bb16..269692c417 100644
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@@ -740,9 +740,10 @@
 	<string name="type.amenity.post_box">Posta kutusu</string>
 	<string name="type.amenity.post_office">Postane</string>
 	<string name="type.amenity.public_bookcase">Kütüphane</string>
-	<string name="type.amenity.recycling">Geri dönüşüm merkezi</string>
-	<string name="type.amenity.recycling_container">Atık toplama merkezi</string>
-	<string name="type.recycling.toxic">Zehirli atık</string>
+	<string name="type.amenity.recycling.centre">Geri dönüşüm merkezi</string>
+	<string name="type.amenity.recycling">Atık toplama merkezi</string>
+	<string name="type.amenity.recycling.container">Atık toplama merkezi</string>
+	<string name="type.recycling.batteries">Piller</string>
 	<string name="type.recycling.clothes">Eski kıyafetler</string>
 	<string name="type.recycling.glass_bottles">Cam şişeler</string>
 	<string name="type.recycling.paper">Kağıt atıkları</string>
diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml
index a9d23ac1e0..d958101a86 100644
--- a/android/res/values-uk/strings.xml
+++ b/android/res/values-uk/strings.xml
@@ -748,9 +748,10 @@
 	<string name="type.amenity.prison">В\'язниця</string>
 	<string name="type.amenity.pub">Паб</string>
 	<string name="type.amenity.public_bookcase">Книгообмін</string>
-	<string name="type.amenity.recycling">Прийом вторсировини</string>
-	<string name="type.amenity.recycling_container">Контейнер для вторсировини</string>
-	<string name="type.recycling.toxic">Отруйні відходи</string>
+	<string name="type.amenity.recycling.centre">Прийом вторсировини</string>
+	<string name="type.amenity.recycling">Контейнер для вторсировини</string>
+	<string name="type.amenity.recycling.container">Контейнер для вторсировини</string>
+	<string name="type.recycling.batteries">Батарейки</string>
 	<string name="type.recycling.clothes">Старий одяг</string>
 	<string name="type.recycling.glass_bottles">Склотара</string>
 	<string name="type.recycling.paper">Макулатура</string>
@@ -758,7 +759,13 @@
 	<string name="type.recycling.plastic_bottles">Збір пластикових пляшок</string>
 	<string name="type.recycling.scrap_metal">Металобрухт</string>
 	<string name="type.recycling.small_appliances">Електровідходи</string>
+	<string name="type.recycling.cardboard">Картон</string>
+	<string name="type.recycling.cans">Бляшані банки</string>
+	<string name="type.recycling.shoes">Взуття</string>
+	<string name="type.recycling.green_waste">Органічні відходи</string>
+	<string name="type.recycling.cartons">Тетрапак та аналоги</string>
 	<string name="type.amenity.restaurant">Ресторан</string>
+	<string name="type.amenity.sanitary_dump_station">Злив нечистот</string>
 	<string name="type.amenity.school">Школа</string>
 	<string name="type.amenity.shelter">Укриття</string>
 	<string name="type.amenity.shower">Душ</string>
@@ -775,6 +782,7 @@
 	<string name="type.amenity.veterinary">Ветеринарна клініка</string>
 	<string name="type.amenity.waste_basket">Бак для сміття</string>
 	<string name="type.amenity.waste_disposal">Сміттєвий контейнер</string>
+	<string name="type.amenity.waste_transfer_station">Станція передачі сміття</string>
 	<string name="type.amenity.water_point">Заправка водою</string>
 	<string name="type.barrier">Перешкода</string>
 	<string name="type.barrier.block">Блок</string>
@@ -798,7 +806,6 @@
 	<string name="type.boundary.administrative.2">Кордон країни</string>
 	<string name="type.boundary.administrative.3">Адміністративний поділ</string>
 	<string name="type.boundary.administrative.4">Адміністративний поділ</string>
-	<string name="type.boundary.administrative.4.state">Адміністративний поділ</string>
 	<string name="type.boundary.administrative.5">Адміністративний поділ</string>
 	<string name="type.boundary.administrative.6">Адміністративний поділ</string>
 	<string name="type.boundary.administrative.7">Адміністративний поділ</string>
@@ -1144,7 +1151,9 @@
 	<string name="type.man_made.cairn">Тур</string>
 	<string name="type.man_made.chimney">Заводська труба</string>
 	<string name="type.man_made.cutline">Просіка</string>
+	<string name="type.man_made.flagpole">Флагшток</string>
 	<string name="type.man_made.lighthouse">Маяк</string>
+	<string name="type.man_made.mast">Стовп-щогла</string>
 	<string name="type.man_made.pier">Пірс</string>
 	<string name="type.man_made.pipeline">Трубопровід</string>
 	<string name="type.man_made.silo">Силос</string>
@@ -1197,7 +1206,6 @@
 	<string name="type.natural.wetland.bog">Торф\'яне болото</string>
 	<string name="type.natural.wetland.marsh">Болотиста мiсцевiсть</string>
 	<string name="type.noexit">Тупик</string>
-	<string name="type.noexit.motor_vehicle">Тупик</string>
 	<string name="type.office">Офіс</string>
 	<string name="type.office.company">Організація</string>
 	<string name="type.office.estate_agent">Агенція нерухомості</string>
diff --git a/android/res/values-vi/strings.xml b/android/res/values-vi/strings.xml
index 536ab4deda..93eccc62d3 100644
--- a/android/res/values-vi/strings.xml
+++ b/android/res/values-vi/strings.xml
@@ -718,9 +718,10 @@
 	<string name="type.amenity.post_office">Bưu cục</string>
 	<string name="type.amenity.pub">Quán rượu</string>
 	<string name="type.amenity.public_bookcase">Kệ sách</string>
-	<string name="type.amenity.recycling">Trung tâm tái sinh</string>
-	<string name="type.amenity.recycling_container">Thùng rác</string>
-	<string name="type.recycling.toxic">Chất thải độc hại</string>
+	<string name="type.amenity.recycling.centre">Trung tâm tái sinh</string>
+	<string name="type.amenity.recycling">Thùng rác</string>
+	<string name="type.amenity.recycling.container">Thùng rác</string>
+	<string name="type.recycling.batteries">Ắc quy</string>
 	<string name="type.recycling.clothes">Quần áo cũ</string>
 	<string name="type.recycling.glass_bottles">Chai lọ thủy tinh</string>
 	<string name="type.recycling.paper">Giấy phế liệu</string>
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index 57f9b3331c..6d41b35708 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -743,9 +743,10 @@
 	<string name="type.amenity.post_office">郵局</string>
 	<string name="type.amenity.pub">酒館</string>
 	<string name="type.amenity.public_bookcase">書架</string>
-	<string name="type.amenity.recycling">回收中心</string>
-	<string name="type.amenity.recycling_container">回收箱</string>
-	<string name="type.recycling.toxic">有毒垃圾</string>
+	<string name="type.amenity.recycling.centre">回收中心</string>
+	<string name="type.amenity.recycling">回收箱</string>
+	<string name="type.amenity.recycling.container">回收箱</string>
+	<string name="type.recycling.batteries">電池</string>
 	<string name="type.recycling.clothes">舊衣物</string>
 	<string name="type.recycling.glass_bottles">玻璃瓶</string>
 	<string name="type.recycling.paper">廢紙</string>
diff --git a/android/res/values-zh/strings.xml b/android/res/values-zh/strings.xml
index 2adcc8c219..47daca3de6 100644
--- a/android/res/values-zh/strings.xml
+++ b/android/res/values-zh/strings.xml
@@ -742,9 +742,10 @@
 	<string name="type.amenity.prison">监狱</string>
 	<string name="type.amenity.pub">酒馆</string>
 	<string name="type.amenity.public_bookcase">公共书架</string>
-	<string name="type.amenity.recycling">资源回收设施</string>
-	<string name="type.amenity.recycling_container">回收容器</string>
-	<string name="type.recycling.toxic">有毒垃圾</string>
+	<string name="type.amenity.recycling.centre">资源回收设施</string>
+	<string name="type.amenity.recycling">回收容器</string>
+	<string name="type.amenity.recycling.container">回收容器</string>
+	<string name="type.recycling.batteries">电池</string>
 	<string name="type.recycling.clothes">旧衣物</string>
 	<string name="type.recycling.glass_bottles">玻璃瓶</string>
 	<string name="type.recycling.paper">废纸</string>
@@ -793,7 +794,6 @@
 	<string name="type.boundary.administrative.2">国家行政区域界线</string>
 	<string name="type.boundary.administrative.3">3级行政区域界线</string>
 	<string name="type.boundary.administrative.4">4级行政区域界线</string>
-	<string name="type.boundary.administrative.4.state">4级州省界线</string>
 	<string name="type.boundary.administrative.5">5级行政区域界线</string>
 	<string name="type.boundary.administrative.6">6级行政区域界线</string>
 	<string name="type.boundary.administrative.7">7级行政区域界线</string>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 7b9243ccec..e9c62402a1 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -779,9 +779,10 @@
 	<string name="type.amenity.prison">Prison</string>
 	<string name="type.amenity.pub">Pub</string>
 	<string name="type.amenity.public_bookcase">Book Exchange</string>
-	<string name="type.amenity.recycling">Recycling Center</string>
-	<string name="type.amenity.recycling_container">Recycling Container</string>
-	<string name="type.recycling.toxic">Toxic Waste</string>
+	<string name="type.amenity.recycling.centre">Recycling Center</string>
+	<string name="type.amenity.recycling">Recycling Container</string>
+	<string name="type.amenity.recycling.container">Recycling Container</string>
+	<string name="type.recycling.batteries">Batteries</string>
 	<string name="type.recycling.clothes">Old Clothes</string>
 	<string name="type.recycling.glass_bottles">Glass Bottles</string>
 	<string name="type.recycling.paper">Paper Waste</string>
@@ -789,7 +790,13 @@
 	<string name="type.recycling.plastic_bottles">Plastic Bottles</string>
 	<string name="type.recycling.scrap_metal">Scrap Metal</string>
 	<string name="type.recycling.small_appliances">Electronic Waste</string>
+	<string name="type.recycling.cardboard">Cardboard</string>
+	<string name="type.recycling.cans">Cans</string>
+	<string name="type.recycling.shoes">Shoes</string>
+	<string name="type.recycling.green_waste">Green/Organic Waste</string>
+	<string name="type.recycling.cartons">Cartons</string>
 	<string name="type.amenity.restaurant">Restaurant</string>
+	<string name="type.amenity.sanitary_dump_station">Holding Tank Dump Station</string>
 	<string name="type.amenity.school">School</string>
 	<string name="type.amenity.shelter">Shelter</string>
 	<string name="type.amenity.shower">Shower</string>
@@ -807,6 +814,7 @@
 	<string name="type.amenity.veterinary">Veterinary Doctor</string>
 	<string name="type.amenity.waste_basket">Trash Bin</string>
 	<string name="type.amenity.waste_disposal">Dumpster</string>
+	<string name="type.amenity.waste_transfer_station">Waste Transfer Station</string>
 	<string name="type.amenity.water_point">Water Point</string>
 	<string name="type.barrier">Barrier</string>
 	<string name="type.barrier.block">Block</string>
@@ -832,7 +840,6 @@
 	<string name="type.boundary.administrative.2">National Border</string>
 	<string name="type.boundary.administrative.3">Administrative Boundary</string>
 	<string name="type.boundary.administrative.4">Administrative Boundary</string>
-	<string name="type.boundary.administrative.4.state">Administrative Boundary</string>
 	<string name="type.boundary.administrative.5">Administrative Boundary</string>
 	<string name="type.boundary.administrative.6">Administrative Boundary</string>
 	<string name="type.boundary.administrative.7">Administrative Boundary</string>
@@ -1196,7 +1203,9 @@
 	<string name="type.man_made.cairn">Cairn</string>
 	<string name="type.man_made.chimney">Factory Chimney</string>
 	<string name="type.man_made.cutline">Cutline</string>
+	<string name="type.man_made.flagpole">Flagpole</string>
 	<string name="type.man_made.lighthouse">Lighthouse</string>
+	<string name="type.man_made.mast">Pole mast</string>
 	<string name="type.man_made.pier">Pier</string>
 	<string name="type.man_made.pipeline">Pipeline</string>
 	<string name="type.man_made.pipeline.overground">Overground Pipeline</string>
@@ -1253,7 +1262,6 @@
 	<string name="type.natural.wetland.bog">Wetland</string>
 	<string name="type.natural.wetland.marsh">Wetland</string>
 	<string name="type.noexit">Dead End</string>
-	<string name="type.noexit.motor_vehicle">Dead End</string>
 	<string name="type.office">Office</string>
 	<string name="type.office.company">Company Office</string>
 	<string name="type.office.estate_agent">Estate Agent</string>
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
index c14fa37c41..0f77bde3ec 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "مكتبة، تبادل كتب";
 
-"type.amenity.recycling" = "مركز إعادة تدوير";
+"type.amenity.recycling.centre" = "مركز إعادة تدوير";
 
-"type.amenity.recycling_container" = "حاوية لإعادة التدوير";
+"type.amenity.recycling" = "حاوية لإعادة التدوير";
 
-"type.recycling.toxic" = "نفايات سامة";
+"type.amenity.recycling.container" = "حاوية لإعادة التدوير";
+
+"type.recycling.batteries" = "ﺕﺎﻳﺭﺎﻄﺑ";
 
 "type.recycling.clothes" = "ملابس قديمة";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "نفايات الكترونية";
 
+"type.recycling.cardboard" = "Cardboard";
+
+"type.recycling.cans" = "Cans";
+
+"type.recycling.shoes" = "Shoes";
+
+"type.recycling.green_waste" = "Green/Organic Waste";
+
+"type.recycling.cartons" = "Cartons";
+
 "type.amenity.restaurant" = "مطعم";
 
+"type.amenity.sanitary_dump_station" = "Holding Tank Dump Station";
+
 "type.amenity.school" = "مدرسة";
 
 "type.amenity.shelter" = "ملجأ";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "قمامة";
 
+"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+
 "type.amenity.water_point" = "نقطة مائية";
 
 "type.barrier" = "Barrier";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "Administrative Boundary";
 
-"type.boundary.administrative.4.state" = "Administrative Boundary";
-
 "type.boundary.administrative.5" = "Administrative Boundary";
 
 "type.boundary.administrative.6" = "Administrative Boundary";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "Cutline";
 
+"type.man_made.flagpole" = "Flagpole";
+
 "type.man_made.lighthouse" = "منارة";
 
+"type.man_made.mast" = "Pole mast";
+
 "type.man_made.pier" = "Pier";
 
 "type.man_made.pipeline" = "Pipeline";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Dead End";
 
-"type.noexit.motor_vehicle" = "Dead End";
-
 "type.office" = "مكتب";
 
 "type.office.company" = "مكتب شركة";
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
index e24de47458..e9cb905160 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "Book Exchange";
 
-"type.amenity.recycling" = "Recycling Center";
+"type.amenity.recycling.centre" = "Recycling Center";
 
-"type.amenity.recycling_container" = "Recycling Container";
+"type.amenity.recycling" = "Recycling Container";
 
-"type.recycling.toxic" = "Toxic Waste";
+"type.amenity.recycling.container" = "Recycling Container";
+
+"type.recycling.batteries" = "Батарэйкі";
 
 "type.recycling.clothes" = "Old Clothes";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "Electronic Waste";
 
+"type.recycling.cardboard" = "Кардон";
+
+"type.recycling.cans" = "Бляшаныя банкі";
+
+"type.recycling.shoes" = "Абутак";
+
+"type.recycling.green_waste" = "Арганічныя адходы";
+
+"type.recycling.cartons" = "Тэтрапак і аналагі";
+
 "type.amenity.restaurant" = "Restaurant";
 
+"type.amenity.sanitary_dump_station" = "Зліў нечыстотаў";
+
 "type.amenity.school" = "School";
 
 "type.amenity.shelter" = "Shelter";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "Dumpster";
 
+"type.amenity.waste_transfer_station" = "Станцыя перавалкі адходаў";
+
 "type.amenity.water_point" = "Water Point";
 
 "type.barrier" = "Barrier";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "Administrative Boundary";
 
-"type.boundary.administrative.4.state" = "Administrative Boundary";
-
 "type.boundary.administrative.5" = "Administrative Boundary";
 
 "type.boundary.administrative.6" = "Administrative Boundary";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "Cutline";
 
+"type.man_made.flagpole" = "Флагшток";
+
 "type.man_made.lighthouse" = "Lighthouse";
 
+"type.man_made.mast" = "Слуп-шчогла";
+
 "type.man_made.pier" = "Pier";
 
 "type.man_made.pipeline" = "Pipeline";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Dead End";
 
-"type.noexit.motor_vehicle" = "Dead End";
-
 "type.office" = "Office";
 
 "type.office.company" = "Company Office";
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
index c5acc26741..fe1e69f151 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "Book Exchange";
 
-"type.amenity.recycling" = "Recycling Center";
+"type.amenity.recycling.centre" = "Recycling Center";
 
-"type.amenity.recycling_container" = "Recycling Container";
+"type.amenity.recycling" = "Recycling Container";
 
-"type.recycling.toxic" = "Toxic Waste";
+"type.amenity.recycling.container" = "Recycling Container";
+
+"type.recycling.batteries" = "Батерии";
 
 "type.recycling.clothes" = "Old Clothes";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "Electronic Waste";
 
+"type.recycling.cardboard" = "Cardboard";
+
+"type.recycling.cans" = "Cans";
+
+"type.recycling.shoes" = "Shoes";
+
+"type.recycling.green_waste" = "Green/Organic Waste";
+
+"type.recycling.cartons" = "Cartons";
+
 "type.amenity.restaurant" = "Restaurant";
 
+"type.amenity.sanitary_dump_station" = "Holding Tank Dump Station";
+
 "type.amenity.school" = "School";
 
 "type.amenity.shelter" = "Shelter";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "Dumpster";
 
+"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+
 "type.amenity.water_point" = "Water Point";
 
 "type.barrier" = "Barrier";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "Administrative Boundary";
 
-"type.boundary.administrative.4.state" = "Administrative Boundary";
-
 "type.boundary.administrative.5" = "Administrative Boundary";
 
 "type.boundary.administrative.6" = "Administrative Boundary";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "Cutline";
 
+"type.man_made.flagpole" = "Flagpole";
+
 "type.man_made.lighthouse" = "Lighthouse";
 
+"type.man_made.mast" = "Pole mast";
+
 "type.man_made.pier" = "Pier";
 
 "type.man_made.pipeline" = "Pipeline";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Dead End";
 
-"type.noexit.motor_vehicle" = "Dead End";
-
 "type.office" = "Office";
 
 "type.office.company" = "Company Office";
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
index 919c6df42f..38c9f8cee2 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "Knihovna";
 
-"type.amenity.recycling" = "Recyklační středisko";
+"type.amenity.recycling.centre" = "Recyklační středisko";
 
-"type.amenity.recycling_container" = "Recyklační nádoba";
+"type.amenity.recycling" = "Recyklační nádoba";
 
-"type.recycling.toxic" = "Toxický odpad";
+"type.amenity.recycling.container" = "Recyklační nádoba";
+
+"type.recycling.batteries" = "Baterie";
 
 "type.recycling.clothes" = "Staré oblečení";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "Elektronický odpad";
 
+"type.recycling.cardboard" = "Cardboard";
+
+"type.recycling.cans" = "Cans";
+
+"type.recycling.shoes" = "Shoes";
+
+"type.recycling.green_waste" = "Green/Organic Waste";
+
+"type.recycling.cartons" = "Cartons";
+
 "type.amenity.restaurant" = "Restaurace";
 
+"type.amenity.sanitary_dump_station" = "Holding Tank Dump Station";
+
 "type.amenity.school" = "Škola";
 
 "type.amenity.shelter" = "Přístřešek";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "Odpadky";
 
+"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+
 "type.amenity.water_point" = "Vodní zdroj";
 
 "type.barrier" = "Barrier";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "Administrative Boundary";
 
-"type.boundary.administrative.4.state" = "Administrative Boundary";
-
 "type.boundary.administrative.5" = "Administrative Boundary";
 
 "type.boundary.administrative.6" = "Administrative Boundary";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "Cutline";
 
+"type.man_made.flagpole" = "Flagpole";
+
 "type.man_made.lighthouse" = "Maják";
 
+"type.man_made.mast" = "Pole mast";
+
 "type.man_made.pier" = "Pier";
 
 "type.man_made.pipeline" = "Pipeline";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Dead End";
 
-"type.noexit.motor_vehicle" = "Dead End";
-
 "type.office" = "Kancelář";
 
 "type.office.company" = "Kancelář společnosti";
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
index 607c510c19..242c9df66f 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "Bog udveksling";
 
-"type.amenity.recycling" = "Genbrugsplads";
+"type.amenity.recycling.centre" = "Genbrugsplads";
 
-"type.amenity.recycling_container" = "Genbrugscontainer";
+"type.amenity.recycling" = "Genbrugscontainer";
 
-"type.recycling.toxic" = "Giftigt affald";
+"type.amenity.recycling.container" = "Genbrugscontainer";
+
+"type.recycling.batteries" = "Batterier";
 
 "type.recycling.clothes" = "Gammelt tøj";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "Elektronik affald";
 
+"type.recycling.cardboard" = "Cardboard";
+
+"type.recycling.cans" = "Cans";
+
+"type.recycling.shoes" = "Shoes";
+
+"type.recycling.green_waste" = "Green/Organic Waste";
+
+"type.recycling.cartons" = "Cartons";
+
 "type.amenity.restaurant" = "Restaurant";
 
+"type.amenity.sanitary_dump_station" = "Holding Tank Dump Station";
+
 "type.amenity.school" = "Skole";
 
 "type.amenity.shelter" = "Shelter";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "Bortskaffelse af affald";
 
+"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+
 "type.amenity.water_point" = "Vandstation";
 
 "type.barrier" = "Barrier";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "Administrative Boundary";
 
-"type.boundary.administrative.4.state" = "Administrative Boundary";
-
 "type.boundary.administrative.5" = "Administrative Boundary";
 
 "type.boundary.administrative.6" = "Administrative Boundary";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "Cutline";
 
+"type.man_made.flagpole" = "Flagpole";
+
 "type.man_made.lighthouse" = "Fyrtårn";
 
+"type.man_made.mast" = "Pole mast";
+
 "type.man_made.pier" = "Pier";
 
 "type.man_made.pipeline" = "Pipeline";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Dead End";
 
-"type.noexit.motor_vehicle" = "Dead End";
-
 "type.office" = "Kontor";
 
 "type.office.company" = "Selskabskontor";
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
index 19e2e78ec7..4b5d16d01f 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "Bücherschrank";
 
-"type.amenity.recycling" = "Recyclinghof";
+"type.amenity.recycling.centre" = "Recyclinghof";
 
-"type.amenity.recycling_container" = "Wertstoffcontainer";
+"type.amenity.recycling" = "Wertstoffcontainer";
 
-"type.recycling.toxic" = "Giftmüll";
+"type.amenity.recycling.container" = "Wertstoffcontainer";
+
+"type.recycling.batteries" = "Batterien";
 
 "type.recycling.clothes" = "Altkleider";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "Elektroschrott";
 
+"type.recycling.cardboard" = "Cardboard";
+
+"type.recycling.cans" = "Cans";
+
+"type.recycling.shoes" = "Shoes";
+
+"type.recycling.green_waste" = "Green/Organic Waste";
+
+"type.recycling.cartons" = "Cartons";
+
 "type.amenity.restaurant" = "Restaurant";
 
+"type.amenity.sanitary_dump_station" = "VE-Station";
+
 "type.amenity.school" = "Schule";
 
 "type.amenity.shelter" = "Schutzhütte";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "Müllcontainer";
 
+"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+
 "type.amenity.water_point" = "Wasseranschluss";
 
 "type.barrier" = "Barriere";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "Verwaltungsgrenze";
 
-"type.boundary.administrative.4.state" = "Verwaltungsgrenze";
-
 "type.boundary.administrative.5" = "Verwaltungsgrenze";
 
 "type.boundary.administrative.6" = "Verwaltungsgrenze";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "Schneise";
 
+"type.man_made.flagpole" = "Flagpole";
+
 "type.man_made.lighthouse" = "Leuchtturm";
 
+"type.man_made.mast" = "Pole mast";
+
 "type.man_made.pier" = "Anlegestelle";
 
 "type.man_made.pipeline" = "Pipeline";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Dead End";
 
-"type.noexit.motor_vehicle" = "Dead End";
-
 "type.office" = "Büro";
 
 "type.office.company" = "Niederlassung";
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
index aaaa54776c..36d0ef73c4 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "Ανταλλαγή βιβλίων";
 
-"type.amenity.recycling" = "Κέντρο ανακύκλωσης";
+"type.amenity.recycling.centre" = "Κέντρο ανακύκλωσης";
 
-"type.amenity.recycling_container" = "Κάδος ανακύκλωσης";
+"type.amenity.recycling" = "Κάδος ανακύκλωσης";
 
-"type.recycling.toxic" = "Τοξικά απόβλητα";
+"type.amenity.recycling.container" = "Κάδος ανακύκλωσης";
+
+"type.recycling.batteries" = "Μπαταρίες";
 
 "type.recycling.clothes" = "Παλιά ρούχα";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "Ηλεκτρονικά απορρίμματα";
 
+"type.recycling.cardboard" = "Cardboard";
+
+"type.recycling.cans" = "Cans";
+
+"type.recycling.shoes" = "Shoes";
+
+"type.recycling.green_waste" = "Green/Organic Waste";
+
+"type.recycling.cartons" = "Cartons";
+
 "type.amenity.restaurant" = "Εστιατόριο";
 
+"type.amenity.sanitary_dump_station" = "Holding Tank Dump Station";
+
 "type.amenity.school" = "Σχολείο";
 
 "type.amenity.shelter" = "Καταφύγιο";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "Διαχείριση απορριμμάτων";
 
+"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+
 "type.amenity.water_point" = "Παροχή νερού";
 
 "type.barrier" = "Barrier";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "Administrative Boundary";
 
-"type.boundary.administrative.4.state" = "Administrative Boundary";
-
 "type.boundary.administrative.5" = "Administrative Boundary";
 
 "type.boundary.administrative.6" = "Administrative Boundary";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "Cutline";
 
+"type.man_made.flagpole" = "Flagpole";
+
 "type.man_made.lighthouse" = "Φάρος";
 
+"type.man_made.mast" = "Pole mast";
+
 "type.man_made.pier" = "Pier";
 
 "type.man_made.pipeline" = "Pipeline";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Dead End";
 
-"type.noexit.motor_vehicle" = "Dead End";
-
 "type.office" = "Γραφείο";
 
 "type.office.company" = "Γραφείο επιχείρησης";
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
index d7d9648855..4762ba1d1c 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "Book Exchange";
 
-"type.amenity.recycling" = "Recycling Center";
+"type.amenity.recycling.centre" = "Recycling Center";
 
-"type.amenity.recycling_container" = "Recycling Container";
+"type.amenity.recycling" = "Recycling Container";
 
-"type.recycling.toxic" = "Toxic Waste";
+"type.amenity.recycling.container" = "Recycling Container";
+
+"type.recycling.batteries" = "Batteries";
 
 "type.recycling.clothes" = "Old Clothes";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "Electronic Waste";
 
+"type.recycling.cardboard" = "Cardboard";
+
+"type.recycling.cans" = "Cans";
+
+"type.recycling.shoes" = "Shoes";
+
+"type.recycling.green_waste" = "Green/Organic Waste";
+
+"type.recycling.cartons" = "Cartons";
+
 "type.amenity.restaurant" = "Restaurant";
 
+"type.amenity.sanitary_dump_station" = "Holding Tank Dump Station";
+
 "type.amenity.school" = "School";
 
 "type.amenity.shelter" = "Shelter";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "Dumpster";
 
+"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+
 "type.amenity.water_point" = "Water Point";
 
 "type.barrier" = "Barrier";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "Administrative Boundary";
 
-"type.boundary.administrative.4.state" = "Administrative Boundary";
-
 "type.boundary.administrative.5" = "Administrative Boundary";
 
 "type.boundary.administrative.6" = "Administrative Boundary";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "Cutline";
 
+"type.man_made.flagpole" = "Flagpole";
+
 "type.man_made.lighthouse" = "Lighthouse";
 
+"type.man_made.mast" = "Pole mast";
+
 "type.man_made.pier" = "Pier";
 
 "type.man_made.pipeline" = "Pipeline";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Dead End";
 
-"type.noexit.motor_vehicle" = "Dead End";
-
 "type.office" = "Office";
 
 "type.office.company" = "Company Office";
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
index 09991b9a7d..27cc3059af 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "Book Exchange";
 
-"type.amenity.recycling" = "Recycling Center";
+"type.amenity.recycling.centre" = "Recycling Center";
 
-"type.amenity.recycling_container" = "Recycling Container";
+"type.amenity.recycling" = "Recycling Container";
 
-"type.recycling.toxic" = "Toxic Waste";
+"type.amenity.recycling.container" = "Recycling Container";
+
+"type.recycling.batteries" = "Batteries";
 
 "type.recycling.clothes" = "Old Clothes";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "Electronic Waste";
 
+"type.recycling.cardboard" = "Cardboard";
+
+"type.recycling.cans" = "Cans";
+
+"type.recycling.shoes" = "Shoes";
+
+"type.recycling.green_waste" = "Green/Organic Waste";
+
+"type.recycling.cartons" = "Cartons";
+
 "type.amenity.restaurant" = "Restaurant";
 
+"type.amenity.sanitary_dump_station" = "Holding Tank Dump Station";
+
 "type.amenity.school" = "School";
 
 "type.amenity.shelter" = "Shelter";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "Dumpster";
 
+"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+
 "type.amenity.water_point" = "Water Point";
 
 "type.barrier" = "Barrier";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "Administrative Boundary";
 
-"type.boundary.administrative.4.state" = "Administrative Boundary";
-
 "type.boundary.administrative.5" = "Administrative Boundary";
 
 "type.boundary.administrative.6" = "Administrative Boundary";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "Cutline";
 
+"type.man_made.flagpole" = "Flagpole";
+
 "type.man_made.lighthouse" = "Lighthouse";
 
+"type.man_made.mast" = "Pole mast";
+
 "type.man_made.pier" = "Pier";
 
 "type.man_made.pipeline" = "Pipeline";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Dead End";
 
-"type.noexit.motor_vehicle" = "Dead End";
-
 "type.office" = "Office";
 
 "type.office.company" = "Company Office";
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
index 860ea121a3..529dcfbfe9 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "Book Exchange";
 
-"type.amenity.recycling" = "Recycling Center";
+"type.amenity.recycling.centre" = "Recycling Center";
 
-"type.amenity.recycling_container" = "Contenedor de reciclaje";
+"type.amenity.recycling" = "Contenedor de reciclaje";
 
-"type.recycling.toxic" = "Desechos tóxicos";
+"type.amenity.recycling.container" = "Contenedor de reciclaje";
+
+"type.recycling.batteries" = "Batteries";
 
 "type.recycling.clothes" = "Ropa vieja";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "Desechos electrónicos";
 
+"type.recycling.cardboard" = "Cardboard";
+
+"type.recycling.cans" = "Cans";
+
+"type.recycling.shoes" = "Shoes";
+
+"type.recycling.green_waste" = "Green/Organic Waste";
+
+"type.recycling.cartons" = "Cartons";
+
 "type.amenity.restaurant" = "Restaurant";
 
+"type.amenity.sanitary_dump_station" = "Holding Tank Dump Station";
+
 "type.amenity.school" = "School";
 
 "type.amenity.shelter" = "Shelter";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "Dumpster";
 
+"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+
 "type.amenity.water_point" = "Water Point";
 
 "type.barrier" = "Barrier";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "Administrative Boundary";
 
-"type.boundary.administrative.4.state" = "Administrative Boundary";
-
 "type.boundary.administrative.5" = "Administrative Boundary";
 
 "type.boundary.administrative.6" = "Administrative Boundary";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "Cutline";
 
+"type.man_made.flagpole" = "Flagpole";
+
 "type.man_made.lighthouse" = "Lighthouse";
 
+"type.man_made.mast" = "Pole mast";
+
 "type.man_made.pier" = "Pier";
 
 "type.man_made.pipeline" = "Pipeline";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Dead End";
 
-"type.noexit.motor_vehicle" = "Dead End";
-
 "type.office" = "Office";
 
 "type.office.company" = "Company Office";
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index 9605a30886..616ea9b782 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "Intercambio de libros";
 
-"type.amenity.recycling" = "Centro de reciclaje";
+"type.amenity.recycling.centre" = "Centro de reciclaje";
 
-"type.amenity.recycling_container" = "Contenedor de reciclaje";
+"type.amenity.recycling" = "Contenedor de reciclaje";
 
-"type.recycling.toxic" = "Residuos tóxicos";
+"type.amenity.recycling.container" = "Contenedor de reciclaje";
+
+"type.recycling.batteries" = "Baterías";
 
 "type.recycling.clothes" = "Ropa vieja";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "Residuos electrónicos";
 
+"type.recycling.cardboard" = "Cardboard";
+
+"type.recycling.cans" = "Cans";
+
+"type.recycling.shoes" = "Shoes";
+
+"type.recycling.green_waste" = "Green/Organic Waste";
+
+"type.recycling.cartons" = "Cartons";
+
 "type.amenity.restaurant" = "Restaurante";
 
+"type.amenity.sanitary_dump_station" = "Holding Tank Dump Station";
+
 "type.amenity.school" = "Escuela";
 
 "type.amenity.shelter" = "Refugio";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "Basura";
 
+"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+
 "type.amenity.water_point" = "Fuente de agua";
 
 "type.barrier" = "Barrier";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "Administrative Boundary";
 
-"type.boundary.administrative.4.state" = "Administrative Boundary";
-
 "type.boundary.administrative.5" = "Administrative Boundary";
 
 "type.boundary.administrative.6" = "Administrative Boundary";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "Cutline";
 
+"type.man_made.flagpole" = "Flagpole";
+
 "type.man_made.lighthouse" = "Faro";
 
+"type.man_made.mast" = "Pole mast";
+
 "type.man_made.pier" = "Pier";
 
 "type.man_made.pipeline" = "Pipeline";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Dead End";
 
-"type.noexit.motor_vehicle" = "Dead End";
-
 "type.office" = "Oficina";
 
 "type.office.company" = "Oficina";
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
index 4c3e41790c..7d35c501df 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "Book Exchange";
 
-"type.amenity.recycling" = "مرکز بازیافت";
+"type.amenity.recycling.centre" = "مرکز بازیافت";
 
-"type.amenity.recycling_container" = "ظرف بازیافت";
+"type.amenity.recycling" = "ظرف بازیافت";
 
-"type.recycling.toxic" = "پسماند سمی";
+"type.amenity.recycling.container" = "ظرف بازیافت";
+
+"type.recycling.batteries" = "ﺎﻫ ﯼﺮﺗﺎﺑ";
 
 "type.recycling.clothes" = "لباسهای قدیمی";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "پسماند الکترونیکی";
 
+"type.recycling.cardboard" = "Cardboard";
+
+"type.recycling.cans" = "Cans";
+
+"type.recycling.shoes" = "Shoes";
+
+"type.recycling.green_waste" = "Green/Organic Waste";
+
+"type.recycling.cartons" = "Cartons";
+
 "type.amenity.restaurant" = "غذا";
 
+"type.amenity.sanitary_dump_station" = "Holding Tank Dump Station";
+
 "type.amenity.school" = "مدرسه";
 
 "type.amenity.shelter" = "پناهگاه";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "زباله دانی";
 
+"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+
 "type.amenity.water_point" = "شیر آب قابل شرب";
 
 "type.barrier" = "Barrier";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "Administrative Boundary";
 
-"type.boundary.administrative.4.state" = "Administrative Boundary";
-
 "type.boundary.administrative.5" = "Administrative Boundary";
 
 "type.boundary.administrative.6" = "Administrative Boundary";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "Cutline";
 
+"type.man_made.flagpole" = "Flagpole";
+
 "type.man_made.lighthouse" = "گردشگری";
 
+"type.man_made.mast" = "Pole mast";
+
 "type.man_made.pier" = "Pier";
 
 "type.man_made.pipeline" = "Pipeline";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Dead End";
 
-"type.noexit.motor_vehicle" = "Dead End";
-
 "type.office" = "اداره";
 
 "type.office.company" = "دفتر شرکت";
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index 1c6392ec86..51285c0e68 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "Kirjahylly";
 
-"type.amenity.recycling" = "Kierrätyskeskus";
+"type.amenity.recycling.centre" = "Kierrätyskeskus";
 
-"type.amenity.recycling_container" = "Kierrätysjäteastia";
+"type.amenity.recycling" = "Kierrätysjäteastia";
 
-"type.recycling.toxic" = "Myrkkyjäte";
+"type.amenity.recycling.container" = "Kierrätysjäteastia";
+
+"type.recycling.batteries" = "Paristot";
 
 "type.recycling.clothes" = "Vanhat vaatteet";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "Kodinkonejäte";
 
+"type.recycling.cardboard" = "Cardboard";
+
+"type.recycling.cans" = "Cans";
+
+"type.recycling.shoes" = "Shoes";
+
+"type.recycling.green_waste" = "Green/Organic Waste";
+
+"type.recycling.cartons" = "Cartons";
+
 "type.amenity.restaurant" = "Ravintola";
 
+"type.amenity.sanitary_dump_station" = "Holding Tank Dump Station";
+
 "type.amenity.school" = "Koulu";
 
 "type.amenity.shelter" = "Turvapaikka";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "Roska";
 
+"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+
 "type.amenity.water_point" = "Vesipiste";
 
 "type.barrier" = "Barrier";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "Administrative Boundary";
 
-"type.boundary.administrative.4.state" = "Administrative Boundary";
-
 "type.boundary.administrative.5" = "Administrative Boundary";
 
 "type.boundary.administrative.6" = "Administrative Boundary";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "Cutline";
 
+"type.man_made.flagpole" = "Flagpole";
+
 "type.man_made.lighthouse" = "Majakka";
 
+"type.man_made.mast" = "Pole mast";
+
 "type.man_made.pier" = "Pier";
 
 "type.man_made.pipeline" = "Pipeline";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Dead End";
 
-"type.noexit.motor_vehicle" = "Dead End";
-
 "type.office" = "Toimisto";
 
 "type.office.company" = "Yhtiön toimisto";
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
index 664c80f936..5d49388b95 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "Microbibliothèque";
 
-"type.amenity.recycling" = "Centre de recyclage";
+"type.amenity.recycling.centre" = "Centre de recyclage";
 
-"type.amenity.recycling_container" = "Conteneur de recyclage";
+"type.amenity.recycling" = "Conteneur de recyclage";
 
-"type.recycling.toxic" = "Déchets toxiques";
+"type.amenity.recycling.container" = "Conteneur de recyclage";
+
+"type.recycling.batteries" = "Batteries";
 
 "type.recycling.clothes" = "Vêtement usagés";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "Déchets d'équipements électriques";
 
+"type.recycling.cardboard" = "Cardboard";
+
+"type.recycling.cans" = "Cans";
+
+"type.recycling.shoes" = "Shoes";
+
+"type.recycling.green_waste" = "Green/Organic Waste";
+
+"type.recycling.cartons" = "Cartons";
+
 "type.amenity.restaurant" = "Restaurant";
 
+"type.amenity.sanitary_dump_station" = "Station de vidange";
+
 "type.amenity.school" = "École";
 
 "type.amenity.shelter" = "Abri";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "Déchets";
 
+"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+
 "type.amenity.water_point" = "Point d’eau";
 
 "type.barrier" = "Barrière";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "Administrative Boundary";
 
-"type.boundary.administrative.4.state" = "Administrative Boundary";
-
 "type.boundary.administrative.5" = "Administrative Boundary";
 
 "type.boundary.administrative.6" = "Administrative Boundary";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "Cutline";
 
+"type.man_made.flagpole" = "Flagpole";
+
 "type.man_made.lighthouse" = "Phare";
 
+"type.man_made.mast" = "Pole mast";
+
 "type.man_made.pier" = "Jetée";
 
 "type.man_made.pipeline" = "Pipeline";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Dead End";
 
-"type.noexit.motor_vehicle" = "Dead End";
-
 "type.office" = "Bureau";
 
 "type.office.company" = "Bureaux d'entreprise";
diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
index 061eb97293..76c92adba5 100644
--- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "Book Exchange";
 
-"type.amenity.recycling" = "Recycling Center";
+"type.amenity.recycling.centre" = "Recycling Center";
 
-"type.amenity.recycling_container" = "Recycling Container";
+"type.amenity.recycling" = "Recycling Container";
 
-"type.recycling.toxic" = "Toxic Waste";
+"type.amenity.recycling.container" = "Recycling Container";
+
+"type.recycling.batteries" = "תוללוס";
 
 "type.recycling.clothes" = "Old Clothes";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "Electronic Waste";
 
+"type.recycling.cardboard" = "Cardboard";
+
+"type.recycling.cans" = "Cans";
+
+"type.recycling.shoes" = "Shoes";
+
+"type.recycling.green_waste" = "Green/Organic Waste";
+
+"type.recycling.cartons" = "Cartons";
+
 "type.amenity.restaurant" = "Restaurant";
 
+"type.amenity.sanitary_dump_station" = "Holding Tank Dump Station";
+
 "type.amenity.school" = "School";
 
 "type.amenity.shelter" = "Shelter";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "Dumpster";
 
+"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+
 "type.amenity.water_point" = "Water Point";
 
 "type.barrier" = "Barrier";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "Administrative Boundary";
 
-"type.boundary.administrative.4.state" = "Administrative Boundary";
-
 "type.boundary.administrative.5" = "Administrative Boundary";
 
 "type.boundary.administrative.6" = "Administrative Boundary";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "Cutline";
 
+"type.man_made.flagpole" = "Flagpole";
+
 "type.man_made.lighthouse" = "Lighthouse";
 
+"type.man_made.mast" = "Pole mast";
+
 "type.man_made.pier" = "Pier";
 
 "type.man_made.pipeline" = "Pipeline";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Dead End";
 
-"type.noexit.motor_vehicle" = "Dead End";
-
 "type.office" = "Office";
 
 "type.office.company" = "Company Office";
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index 169ba68a8e..5cd7a1836c 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "Nyilvános könyvespolc";
 
-"type.amenity.recycling" = "Újrahasznosító központ";
+"type.amenity.recycling.centre" = "Újrahasznosító központ";
 
-"type.amenity.recycling_container" = "Újrahasznosító tartály";
+"type.amenity.recycling" = "Újrahasznosító tartály";
 
-"type.recycling.toxic" = "Mérgező hulladék";
+"type.amenity.recycling.container" = "Újrahasznosító tartály";
+
+"type.recycling.batteries" = "Elemek";
 
 "type.recycling.clothes" = "Régi ruhák";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "Elektromos hulladék";
 
+"type.recycling.cardboard" = "Cardboard";
+
+"type.recycling.cans" = "Cans";
+
+"type.recycling.shoes" = "Shoes";
+
+"type.recycling.green_waste" = "Green/Organic Waste";
+
+"type.recycling.cartons" = "Cartons";
+
 "type.amenity.restaurant" = "Étterem";
 
+"type.amenity.sanitary_dump_station" = "Holding Tank Dump Station";
+
 "type.amenity.school" = "Iskola";
 
 "type.amenity.shelter" = "Menedék";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "Szemét";
 
+"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+
 "type.amenity.water_point" = "Vízvételi pont";
 
 "type.barrier" = "Barrier";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "Administrative Boundary";
 
-"type.boundary.administrative.4.state" = "Administrative Boundary";
-
 "type.boundary.administrative.5" = "Administrative Boundary";
 
 "type.boundary.administrative.6" = "Administrative Boundary";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "Cutline";
 
+"type.man_made.flagpole" = "Flagpole";
+
 "type.man_made.lighthouse" = "Világítótorony";
 
+"type.man_made.mast" = "Pole mast";
+
 "type.man_made.pier" = "Pier";
 
 "type.man_made.pipeline" = "Pipeline";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Dead End";
 
-"type.noexit.motor_vehicle" = "Dead End";
-
 "type.office" = "Hivatal";
 
 "type.office.company" = "Vállalati iroda";
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
index fee72a2301..59a70b5fd1 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "Rak Buku";
 
-"type.amenity.recycling" = "TPA";
+"type.amenity.recycling.centre" = "TPA";
 
-"type.amenity.recycling_container" = "Wadah daur ulang";
+"type.amenity.recycling" = "Wadah daur ulang";
 
-"type.recycling.toxic" = "Limbah beracun";
+"type.amenity.recycling.container" = "Wadah daur ulang";
+
+"type.recycling.batteries" = "Baterai";
 
 "type.recycling.clothes" = "Pakaian lama";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "Limbah elektronik";
 
+"type.recycling.cardboard" = "Cardboard";
+
+"type.recycling.cans" = "Cans";
+
+"type.recycling.shoes" = "Shoes";
+
+"type.recycling.green_waste" = "Green/Organic Waste";
+
+"type.recycling.cartons" = "Cartons";
+
 "type.amenity.restaurant" = "Restoran";
 
+"type.amenity.sanitary_dump_station" = "Holding Tank Dump Station";
+
 "type.amenity.school" = "Sekolah";
 
 "type.amenity.shelter" = "Tempat penampungan";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "Sampah";
 
+"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+
 "type.amenity.water_point" = "Titik Air";
 
 "type.barrier" = "Barrier";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "Administrative Boundary";
 
-"type.boundary.administrative.4.state" = "Administrative Boundary";
-
 "type.boundary.administrative.5" = "Administrative Boundary";
 
 "type.boundary.administrative.6" = "Administrative Boundary";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "Cutline";
 
+"type.man_made.flagpole" = "Flagpole";
+
 "type.man_made.lighthouse" = "Mercusuar";
 
+"type.man_made.mast" = "Pole mast";
+
 "type.man_made.pier" = "Pier";
 
 "type.man_made.pipeline" = "Pipeline";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Dead End";
 
-"type.noexit.motor_vehicle" = "Dead End";
-
 "type.office" = "Kantor";
 
 "type.office.company" = "Kantor perusahaan";
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index 9c485713b2..0a5ef5e51f 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "Libreria";
 
-"type.amenity.recycling" = "Centro di riciclaggio";
+"type.amenity.recycling.centre" = "Centro di riciclaggio";
 
-"type.amenity.recycling_container" = "Contenitore per materiali riciclabili";
+"type.amenity.recycling" = "Contenitore per materiali riciclabili";
 
-"type.recycling.toxic" = "Rifiuti tossici";
+"type.amenity.recycling.container" = "Contenitore per materiali riciclabili";
+
+"type.recycling.batteries" = "Batterie";
 
 "type.recycling.clothes" = "Vestiti usati";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "Rifiuti di apparecchiature elettriche ed elettroniche";
 
+"type.recycling.cardboard" = "Cardboard";
+
+"type.recycling.cans" = "Cans";
+
+"type.recycling.shoes" = "Shoes";
+
+"type.recycling.green_waste" = "Green/Organic Waste";
+
+"type.recycling.cartons" = "Cartons";
+
 "type.amenity.restaurant" = "Ristorante";
 
+"type.amenity.sanitary_dump_station" = "Camper service";
+
 "type.amenity.school" = "Scuola";
 
 "type.amenity.shelter" = "Riparo";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "Spazzatura";
 
+"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+
 "type.amenity.water_point" = "Distributore acqua";
 
 "type.barrier" = "Barrier";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "Administrative Boundary";
 
-"type.boundary.administrative.4.state" = "Administrative Boundary";
-
 "type.boundary.administrative.5" = "Administrative Boundary";
 
 "type.boundary.administrative.6" = "Administrative Boundary";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "Cutline";
 
+"type.man_made.flagpole" = "Flagpole";
+
 "type.man_made.lighthouse" = "Faro";
 
+"type.man_made.mast" = "Pole mast";
+
 "type.man_made.pier" = "Pier";
 
 "type.man_made.pipeline" = "Pipeline";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Dead End";
 
-"type.noexit.motor_vehicle" = "Dead End";
-
 "type.office" = "Ufficio";
 
 "type.office.company" = "Ufficio aziendale";
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
index c07af82558..300283cbb5 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "街角文庫";
 
-"type.amenity.recycling" = "リサイクルセンター";
+"type.amenity.recycling.centre" = "リサイクルセンター";
 
-"type.amenity.recycling_container" = "リサイクルボックス";
+"type.amenity.recycling" = "リサイクルボックス";
 
-"type.recycling.toxic" = "有毒廃棄物";
+"type.amenity.recycling.container" = "リサイクルボックス";
+
+"type.recycling.batteries" = "バッテリー";
 
 "type.recycling.clothes" = "古着";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "電子廃棄物";
 
+"type.recycling.cardboard" = "Cardboard";
+
+"type.recycling.cans" = "Cans";
+
+"type.recycling.shoes" = "Shoes";
+
+"type.recycling.green_waste" = "Green/Organic Waste";
+
+"type.recycling.cartons" = "Cartons";
+
 "type.amenity.restaurant" = "レストラン";
 
+"type.amenity.sanitary_dump_station" = "Holding Tank Dump Station";
+
 "type.amenity.school" = "学校";
 
 "type.amenity.shelter" = "避難所";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "ゴミ";
 
+"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+
 "type.amenity.water_point" = "給水所";
 
 "type.barrier" = "障害物";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "行政境界";
 
-"type.boundary.administrative.4.state" = "行政境界";
-
 "type.boundary.administrative.5" = "行政境界";
 
 "type.boundary.administrative.6" = "行政境界";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "森林の切れ目";
 
+"type.man_made.flagpole" = "Flagpole";
+
 "type.man_made.lighthouse" = "灯台";
 
+"type.man_made.mast" = "Pole mast";
+
 "type.man_made.pier" = "桟橋";
 
 "type.man_made.pipeline" = "パイプライン";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "行き止まり";
 
-"type.noexit.motor_vehicle" = "行き止まり";
-
 "type.office" = "オフィス";
 
 "type.office.company" = "会社事務所";
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
index 7b93601d03..0374c0c2fa 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "도서 교환";
 
-"type.amenity.recycling" = "재활용센터";
+"type.amenity.recycling.centre" = "재활용센터";
 
-"type.amenity.recycling_container" = "재활용 쓰레기통";
+"type.amenity.recycling" = "재활용 쓰레기통";
 
-"type.recycling.toxic" = "유독성 폐기물";
+"type.amenity.recycling.container" = "재활용 쓰레기통";
+
+"type.recycling.batteries" = "배터리";
 
 "type.recycling.clothes" = "낡은 옷";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "전자제품 쓰레기";
 
+"type.recycling.cardboard" = "Cardboard";
+
+"type.recycling.cans" = "Cans";
+
+"type.recycling.shoes" = "Shoes";
+
+"type.recycling.green_waste" = "Green/Organic Waste";
+
+"type.recycling.cartons" = "Cartons";
+
 "type.amenity.restaurant" = "레스토랑";
 
+"type.amenity.sanitary_dump_station" = "Holding Tank Dump Station";
+
 "type.amenity.school" = "학교";
 
 "type.amenity.shelter" = "대피소";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "휴지통";
 
+"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+
 "type.amenity.water_point" = "상수도";
 
 "type.barrier" = "Barrier";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "Administrative Boundary";
 
-"type.boundary.administrative.4.state" = "Administrative Boundary";
-
 "type.boundary.administrative.5" = "Administrative Boundary";
 
 "type.boundary.administrative.6" = "Administrative Boundary";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "Cutline";
 
+"type.man_made.flagpole" = "Flagpole";
+
 "type.man_made.lighthouse" = "등대";
 
+"type.man_made.mast" = "Pole mast";
+
 "type.man_made.pier" = "Pier";
 
 "type.man_made.pipeline" = "Pipeline";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Dead End";
 
-"type.noexit.motor_vehicle" = "Dead End";
-
 "type.office" = "사무실";
 
 "type.office.company" = "회사";
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index e481ad398f..b184403d00 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "Bokhylle";
 
-"type.amenity.recycling" = "Resirkuleringssenter";
+"type.amenity.recycling.centre" = "Resirkuleringssenter";
 
-"type.amenity.recycling_container" = "Gjenvinningsbeholder";
+"type.amenity.recycling" = "Gjenvinningsbeholder";
 
-"type.recycling.toxic" = "Giftig avfall";
+"type.amenity.recycling.container" = "Gjenvinningsbeholder";
+
+"type.recycling.batteries" = "Batterier";
 
 "type.recycling.clothes" = "Gamle klær";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "Elektronisk avfall";
 
+"type.recycling.cardboard" = "Cardboard";
+
+"type.recycling.cans" = "Cans";
+
+"type.recycling.shoes" = "Shoes";
+
+"type.recycling.green_waste" = "Green/Organic Waste";
+
+"type.recycling.cartons" = "Cartons";
+
 "type.amenity.restaurant" = "Restaurant";
 
+"type.amenity.sanitary_dump_station" = "Holding Tank Dump Station";
+
 "type.amenity.school" = "Skole";
 
 "type.amenity.shelter" = "Tilfluktsrom";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "Søppel";
 
+"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+
 "type.amenity.water_point" = "Vannpunkt";
 
 "type.barrier" = "Barrier";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "Administrative Boundary";
 
-"type.boundary.administrative.4.state" = "Administrative Boundary";
-
 "type.boundary.administrative.5" = "Administrative Boundary";
 
 "type.boundary.administrative.6" = "Administrative Boundary";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "Cutline";
 
+"type.man_made.flagpole" = "Flagpole";
+
 "type.man_made.lighthouse" = "Fyr";
 
+"type.man_made.mast" = "Pole mast";
+
 "type.man_made.pier" = "Pier";
 
 "type.man_made.pipeline" = "Pipeline";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Dead End";
 
-"type.noexit.motor_vehicle" = "Dead End";
-
 "type.office" = "Kontor";
 
 "type.office.company" = "Firmakontor";
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index 8758a0598d..145e187e25 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "Boekenkast";
 
-"type.amenity.recycling" = "Milieustraat";
+"type.amenity.recycling.centre" = "Milieustraat";
 
-"type.amenity.recycling_container" = "Recycling container";
+"type.amenity.recycling" = "Recycling container";
 
-"type.recycling.toxic" = "Giftig afval";
+"type.amenity.recycling.container" = "Recycling container";
+
+"type.recycling.batteries" = "Batterijen";
 
 "type.recycling.clothes" = "Oude kleding";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "Elektronisch afval";
 
+"type.recycling.cardboard" = "Cardboard";
+
+"type.recycling.cans" = "Cans";
+
+"type.recycling.shoes" = "Shoes";
+
+"type.recycling.green_waste" = "Green/Organic Waste";
+
+"type.recycling.cartons" = "Cartons";
+
 "type.amenity.restaurant" = "Restaurant";
 
+"type.amenity.sanitary_dump_station" = "Holding Tank Dump Station";
+
 "type.amenity.school" = "School";
 
 "type.amenity.shelter" = "Beschutting";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "Uitschot";
 
+"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+
 "type.amenity.water_point" = "Waterpunt";
 
 "type.barrier" = "Barrier";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "Administrative Boundary";
 
-"type.boundary.administrative.4.state" = "Administrative Boundary";
-
 "type.boundary.administrative.5" = "Administrative Boundary";
 
 "type.boundary.administrative.6" = "Administrative Boundary";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "Cutline";
 
+"type.man_made.flagpole" = "Flagpole";
+
 "type.man_made.lighthouse" = "Vuurtoren";
 
+"type.man_made.mast" = "Pole mast";
+
 "type.man_made.pier" = "Pier";
 
 "type.man_made.pipeline" = "Pijpleiding";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Dead End";
 
-"type.noexit.motor_vehicle" = "Dead End";
-
 "type.office" = "Kantoor";
 
 "type.office.company" = "Bedrijfskantoor";
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
index ecf3050642..eabfd077da 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "Wymiana książek";
 
-"type.amenity.recycling" = "Centrum przetwórstwa odpadów";
+"type.amenity.recycling.centre" = "Centrum przetwórstwa odpadów";
 
-"type.amenity.recycling_container" = "Pojemnik do recyklingu";
+"type.amenity.recycling" = "Pojemnik do recyklingu";
 
-"type.recycling.toxic" = "Odpady toksyczne";
+"type.amenity.recycling.container" = "Pojemnik do recyklingu";
+
+"type.recycling.batteries" = "Baterie";
 
 "type.recycling.clothes" = "Stare ubrania";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "Odpady elektryczne";
 
+"type.recycling.cardboard" = "Cardboard";
+
+"type.recycling.cans" = "Cans";
+
+"type.recycling.shoes" = "Shoes";
+
+"type.recycling.green_waste" = "Green/Organic Waste";
+
+"type.recycling.cartons" = "Cartons";
+
 "type.amenity.restaurant" = "Restauracja";
 
+"type.amenity.sanitary_dump_station" = "Holding Tank Dump Station";
+
 "type.amenity.school" = "Szkoła";
 
 "type.amenity.shelter" = "Wiata";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "Wysypisko śmieci";
 
+"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+
 "type.amenity.water_point" = "Ujęcie wody";
 
 "type.barrier" = "Bariera";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "Granica administracyjna";
 
-"type.boundary.administrative.4.state" = "Granica administracyjna";
-
 "type.boundary.administrative.5" = "Granica administracyjna";
 
 "type.boundary.administrative.6" = "Granica administracyjna";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "Przecinka leśna";
 
+"type.man_made.flagpole" = "Flagpole";
+
 "type.man_made.lighthouse" = "Latarnia morska";
 
+"type.man_made.mast" = "Pole mast";
+
 "type.man_made.pier" = "Molo";
 
 "type.man_made.pipeline" = "Rurociąg";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Ślepy koniec drogi";
 
-"type.noexit.motor_vehicle" = "Ślepy koniec drogi";
-
 "type.office" = "Biuro";
 
 "type.office.company" = "Biuro przedsiębiorstwa";
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index 31d97ef78f..83565edc7c 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "Biblioteca livre";
 
-"type.amenity.recycling" = "Centro de reciclagem";
+"type.amenity.recycling.centre" = "Centro de reciclagem";
 
-"type.amenity.recycling_container" = "Recipiente de reciclagem";
+"type.amenity.recycling" = "Recipiente de reciclagem";
 
-"type.recycling.toxic" = "Lixo tóxico";
+"type.amenity.recycling.container" = "Recipiente de reciclagem";
+
+"type.recycling.batteries" = "Baterias";
 
 "type.recycling.clothes" = "Roupas velhas";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "Lixo eletrônico";
 
+"type.recycling.cardboard" = "Cardboard";
+
+"type.recycling.cans" = "Cans";
+
+"type.recycling.shoes" = "Shoes";
+
+"type.recycling.green_waste" = "Green/Organic Waste";
+
+"type.recycling.cartons" = "Cartons";
+
 "type.amenity.restaurant" = "Restaurante";
 
+"type.amenity.sanitary_dump_station" = "Holding Tank Dump Station";
+
 "type.amenity.school" = "Escola";
 
 "type.amenity.shelter" = "Abrigo";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "Depósito de lixo";
 
+"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+
 "type.amenity.water_point" = "Ponto de água";
 
 "type.barrier" = "Barreira";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "Fronteira administrativa";
 
-"type.boundary.administrative.4.state" = "Fronteira administrativa";
-
 "type.boundary.administrative.5" = "Fronteira administrativa";
 
 "type.boundary.administrative.6" = "Fronteira administrativa";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "Aceiro";
 
+"type.man_made.flagpole" = "Flagpole";
+
 "type.man_made.lighthouse" = "Farol";
 
+"type.man_made.mast" = "Pole mast";
+
 "type.man_made.pier" = "Píer";
 
 "type.man_made.pipeline" = "Pipeline";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Via sem saída";
 
-"type.noexit.motor_vehicle" = "Via sem saída";
-
 "type.office" = "Escritório";
 
 "type.office.company" = "Escritório de empresa";
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
index ae4a2dcb36..d84e1acd65 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "Biblioteca livre";
 
-"type.amenity.recycling" = "Centro de reciclagem";
+"type.amenity.recycling.centre" = "Centro de reciclagem";
 
-"type.amenity.recycling_container" = "Contentor de reciclagem";
+"type.amenity.recycling" = "Contentor de reciclagem";
 
-"type.recycling.toxic" = "Resíduos tóxicos";
+"type.amenity.recycling.container" = "Contentor de reciclagem";
+
+"type.recycling.batteries" = "Baterias";
 
 "type.recycling.clothes" = "Roupas velhas";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "Pequenos eletrodomésticos";
 
+"type.recycling.cardboard" = "Cardboard";
+
+"type.recycling.cans" = "Cans";
+
+"type.recycling.shoes" = "Shoes";
+
+"type.recycling.green_waste" = "Green/Organic Waste";
+
+"type.recycling.cartons" = "Cartons";
+
 "type.amenity.restaurant" = "Restaurante";
 
+"type.amenity.sanitary_dump_station" = "Holding Tank Dump Station";
+
 "type.amenity.school" = "Escola";
 
 "type.amenity.shelter" = "Abrigo";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "Contentor do lixo";
 
+"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+
 "type.amenity.water_point" = "Ponto de água";
 
 "type.barrier" = "Barreira";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "Fronteira administrativa";
 
-"type.boundary.administrative.4.state" = "Fronteira administrativa";
-
 "type.boundary.administrative.5" = "Fronteira administrativa";
 
 "type.boundary.administrative.6" = "Fronteira administrativa";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "Atalhada";
 
+"type.man_made.flagpole" = "Flagpole";
+
 "type.man_made.lighthouse" = "Farol";
 
+"type.man_made.mast" = "Pole mast";
+
 "type.man_made.pier" = "Pontão";
 
 "type.man_made.pipeline" = "Pipeline";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Via sem saída";
 
-"type.noexit.motor_vehicle" = "Via sem saída";
-
 "type.office" = "Escritório";
 
 "type.office.company" = "Empresa";
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
index f4a7ca0105..4ef626dda0 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "Bibliotecă";
 
-"type.amenity.recycling" = "Centru de reciclare";
+"type.amenity.recycling.centre" = "Centru de reciclare";
 
-"type.amenity.recycling_container" = "Containere pentru reciclare";
+"type.amenity.recycling" = "Containere pentru reciclare";
 
-"type.recycling.toxic" = "Deșeuri toxice";
+"type.amenity.recycling.container" = "Containere pentru reciclare";
+
+"type.recycling.batteries" = "Baterii";
 
 "type.recycling.clothes" = "Haine vechi";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "Deșeuri electrice";
 
+"type.recycling.cardboard" = "Cardboard";
+
+"type.recycling.cans" = "Cans";
+
+"type.recycling.shoes" = "Shoes";
+
+"type.recycling.green_waste" = "Green/Organic Waste";
+
+"type.recycling.cartons" = "Cartons";
+
 "type.amenity.restaurant" = "Restaurant";
 
+"type.amenity.sanitary_dump_station" = "Holding Tank Dump Station";
+
 "type.amenity.school" = "Școală";
 
 "type.amenity.shelter" = "Adăpost";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "Gunoi";
 
+"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+
 "type.amenity.water_point" = "Punct de alimentare cu apă";
 
 "type.barrier" = "Barrier";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "Administrative Boundary";
 
-"type.boundary.administrative.4.state" = "Administrative Boundary";
-
 "type.boundary.administrative.5" = "Administrative Boundary";
 
 "type.boundary.administrative.6" = "Administrative Boundary";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "Cutline";
 
+"type.man_made.flagpole" = "Flagpole";
+
 "type.man_made.lighthouse" = "Far";
 
+"type.man_made.mast" = "Pole mast";
+
 "type.man_made.pier" = "Pier";
 
 "type.man_made.pipeline" = "Pipeline";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Dead End";
 
-"type.noexit.motor_vehicle" = "Dead End";
-
 "type.office" = "Birou";
 
 "type.office.company" = "Sediu companei";
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
index 273341cb76..7c9b3ca68f 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "Книгообмен";
 
-"type.amenity.recycling" = "Приём вторсырья";
+"type.amenity.recycling.centre" = "Приём вторсырья";
 
-"type.amenity.recycling_container" = "Контейнер для вторсырья";
+"type.amenity.recycling" = "Контейнер для вторсырья";
 
-"type.recycling.toxic" = "Ядовитые отходы";
+"type.amenity.recycling.container" = "Контейнер для вторсырья";
+
+"type.recycling.batteries" = "Батарейки";
 
 "type.recycling.clothes" = "Старая одежда";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "Электроотходы";
 
+"type.recycling.cardboard" = "Картон";
+
+"type.recycling.cans" = "Жестяные банки";
+
+"type.recycling.shoes" = "Обувь";
+
+"type.recycling.green_waste" = "Органические отходы";
+
+"type.recycling.cartons" = "Тетрапак и аналоги";
+
 "type.amenity.restaurant" = "Ресторан";
 
+"type.amenity.sanitary_dump_station" = "Слив нечистот";
+
 "type.amenity.school" = "Школа";
 
 "type.amenity.shelter" = "Укрытие";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "Мусорный контейнер";
 
+"type.amenity.waste_transfer_station" = "Станция перевалки отходов";
+
 "type.amenity.water_point" = "Заправка водой";
 
 "type.barrier" = "Преграда";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "Административная граница";
 
-"type.boundary.administrative.4.state" = "Административная граница";
-
 "type.boundary.administrative.5" = "Административная граница";
 
 "type.boundary.administrative.6" = "Административная граница";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "Просека";
 
+"type.man_made.flagpole" = "Флагшток";
+
 "type.man_made.lighthouse" = "Маяк";
 
+"type.man_made.mast" = "Столб-мачта";
+
 "type.man_made.pier" = "Пирс";
 
 "type.man_made.pipeline" = "Трубопровод";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Тупик";
 
-"type.noexit.motor_vehicle" = "Тупик";
-
 "type.office" = "Офис";
 
 "type.office.company" = "Организация";
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
index 8543cb16fb..4458935564 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "Knižnica";
 
-"type.amenity.recycling" = "Zberné suroviny";
+"type.amenity.recycling.centre" = "Zberné suroviny";
 
-"type.amenity.recycling_container" = "Recyklačný odpad";
+"type.amenity.recycling" = "Recyklačný odpad";
 
-"type.recycling.toxic" = "Toxický odpad";
+"type.amenity.recycling.container" = "Recyklačný odpad";
+
+"type.recycling.batteries" = "Batérie";
 
 "type.recycling.clothes" = "Staré oblečenie";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "Elektronický odpad";
 
+"type.recycling.cardboard" = "Cardboard";
+
+"type.recycling.cans" = "Cans";
+
+"type.recycling.shoes" = "Shoes";
+
+"type.recycling.green_waste" = "Green/Organic Waste";
+
+"type.recycling.cartons" = "Cartons";
+
 "type.amenity.restaurant" = "Reštaurácia";
 
+"type.amenity.sanitary_dump_station" = "Holding Tank Dump Station";
+
 "type.amenity.school" = "Škola";
 
 "type.amenity.shelter" = "Prístrešok";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "Odpadky";
 
+"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+
 "type.amenity.water_point" = "Voda";
 
 "type.barrier" = "Barrier";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "Administrative Boundary";
 
-"type.boundary.administrative.4.state" = "Administrative Boundary";
-
 "type.boundary.administrative.5" = "Administrative Boundary";
 
 "type.boundary.administrative.6" = "Administrative Boundary";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "Cutline";
 
+"type.man_made.flagpole" = "Flagpole";
+
 "type.man_made.lighthouse" = "Maják";
 
+"type.man_made.mast" = "Pole mast";
+
 "type.man_made.pier" = "Pier";
 
 "type.man_made.pipeline" = "Pipeline";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Dead End";
 
-"type.noexit.motor_vehicle" = "Dead End";
-
 "type.office" = "Kancelária";
 
 "type.office.company" = "Sídlo spoločnosti";
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
index 3cfc795a37..d8e303ee80 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "Bokskåp";
 
-"type.amenity.recycling" = "Återvinningscentral";
+"type.amenity.recycling.centre" = "Återvinningscentral";
 
-"type.amenity.recycling_container" = "Behållare för återvinningsbart avfall";
+"type.amenity.recycling" = "Behållare för återvinningsbart avfall";
 
-"type.recycling.toxic" = "Giftigt avfall";
+"type.amenity.recycling.container" = "Behållare för återvinningsbart avfall";
+
+"type.recycling.batteries" = "Batterier";
 
 "type.recycling.clothes" = "Gamla kläder";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "Elektriskt avfall";
 
+"type.recycling.cardboard" = "Cardboard";
+
+"type.recycling.cans" = "Cans";
+
+"type.recycling.shoes" = "Shoes";
+
+"type.recycling.green_waste" = "Green/Organic Waste";
+
+"type.recycling.cartons" = "Cartons";
+
 "type.amenity.restaurant" = "Restaurang";
 
+"type.amenity.sanitary_dump_station" = "Holding Tank Dump Station";
+
 "type.amenity.school" = "Skola";
 
 "type.amenity.shelter" = "Skyddsrum";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "Avfallscontainer";
 
+"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+
 "type.amenity.water_point" = "Vattenpost";
 
 "type.barrier" = "Barrier";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "Administrative Boundary";
 
-"type.boundary.administrative.4.state" = "Administrative Boundary";
-
 "type.boundary.administrative.5" = "Administrative Boundary";
 
 "type.boundary.administrative.6" = "Administrative Boundary";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "Cutline";
 
+"type.man_made.flagpole" = "Flagpole";
+
 "type.man_made.lighthouse" = "Fyr";
 
+"type.man_made.mast" = "Pole mast";
+
 "type.man_made.pier" = "Pier";
 
 "type.man_made.pipeline" = "Pipeline";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Dead End";
 
-"type.noexit.motor_vehicle" = "Dead End";
-
 "type.office" = "Kontor";
 
 "type.office.company" = "Företagskontor";
diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
index a99fb0dcf5..89a84a235f 100644
--- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "Book Exchange";
 
-"type.amenity.recycling" = "Recycling Center";
+"type.amenity.recycling.centre" = "Recycling Center";
 
-"type.amenity.recycling_container" = "Recycling Container";
+"type.amenity.recycling" = "Recycling Container";
 
-"type.recycling.toxic" = "Toxic Waste";
+"type.amenity.recycling.container" = "Recycling Container";
+
+"type.recycling.batteries" = "Betri";
 
 "type.recycling.clothes" = "Old Clothes";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "Electronic Waste";
 
+"type.recycling.cardboard" = "Cardboard";
+
+"type.recycling.cans" = "Cans";
+
+"type.recycling.shoes" = "Shoes";
+
+"type.recycling.green_waste" = "Green/Organic Waste";
+
+"type.recycling.cartons" = "Cartons";
+
 "type.amenity.restaurant" = "Restaurant";
 
+"type.amenity.sanitary_dump_station" = "Holding Tank Dump Station";
+
 "type.amenity.school" = "School";
 
 "type.amenity.shelter" = "Shelter";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "Dumpster";
 
+"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+
 "type.amenity.water_point" = "Water Point";
 
 "type.barrier" = "Barrier";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "Administrative Boundary";
 
-"type.boundary.administrative.4.state" = "Administrative Boundary";
-
 "type.boundary.administrative.5" = "Administrative Boundary";
 
 "type.boundary.administrative.6" = "Administrative Boundary";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "Cutline";
 
+"type.man_made.flagpole" = "Flagpole";
+
 "type.man_made.lighthouse" = "Lighthouse";
 
+"type.man_made.mast" = "Pole mast";
+
 "type.man_made.pier" = "Pier";
 
 "type.man_made.pipeline" = "Pipeline";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Dead End";
 
-"type.noexit.motor_vehicle" = "Dead End";
-
 "type.office" = "Office";
 
 "type.office.company" = "Company Office";
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
index 557cf8a5e0..685384fb4a 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "ตู้หนังสือ สถานที่แลกเปลี่ยนหนังสือ";
 
-"type.amenity.recycling" = "ศูนย์รีไซเคิล";
+"type.amenity.recycling.centre" = "ศูนย์รีไซเคิล";
 
-"type.amenity.recycling_container" = "บรรจุภัณฑ์รีไซเคิล";
+"type.amenity.recycling" = "บรรจุภัณฑ์รีไซเคิล";
 
-"type.recycling.toxic" = "ขยะสารพิษ";
+"type.amenity.recycling.container" = "บรรจุภัณฑ์รีไซเคิล";
+
+"type.recycling.batteries" = "แบตเตอรี่";
 
 "type.recycling.clothes" = "เสื้อผ้าเก่า";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "ขยะอิเล็กทรอนิกส์";
 
+"type.recycling.cardboard" = "Cardboard";
+
+"type.recycling.cans" = "Cans";
+
+"type.recycling.shoes" = "Shoes";
+
+"type.recycling.green_waste" = "Green/Organic Waste";
+
+"type.recycling.cartons" = "Cartons";
+
 "type.amenity.restaurant" = "ร้านอาหาร";
 
+"type.amenity.sanitary_dump_station" = "Holding Tank Dump Station";
+
 "type.amenity.school" = "โรงเรียน";
 
 "type.amenity.shelter" = "ที่อยู่อาศัย";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "ขยะ";
 
+"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+
 "type.amenity.water_point" = "จุดเติมน้ำ";
 
 "type.barrier" = "Barrier";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "Administrative Boundary";
 
-"type.boundary.administrative.4.state" = "Administrative Boundary";
-
 "type.boundary.administrative.5" = "Administrative Boundary";
 
 "type.boundary.administrative.6" = "Administrative Boundary";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "Cutline";
 
+"type.man_made.flagpole" = "Flagpole";
+
 "type.man_made.lighthouse" = "ประภาคาร";
 
+"type.man_made.mast" = "Pole mast";
+
 "type.man_made.pier" = "Pier";
 
 "type.man_made.pipeline" = "Pipeline";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Dead End";
 
-"type.noexit.motor_vehicle" = "Dead End";
-
 "type.office" = "สำนักงาน";
 
 "type.office.company" = "สำนักงานบริษัท";
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index b13adfb6bd..40d3360938 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "Kütüphane";
 
-"type.amenity.recycling" = "Geri dönüşüm merkezi";
+"type.amenity.recycling.centre" = "Geri dönüşüm merkezi";
 
-"type.amenity.recycling_container" = "Atık toplama merkezi";
+"type.amenity.recycling" = "Atık toplama merkezi";
 
-"type.recycling.toxic" = "Zehirli atık";
+"type.amenity.recycling.container" = "Atık toplama merkezi";
+
+"type.recycling.batteries" = "Piller";
 
 "type.recycling.clothes" = "Eski kıyafetler";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "Elektronik atık";
 
+"type.recycling.cardboard" = "Cardboard";
+
+"type.recycling.cans" = "Cans";
+
+"type.recycling.shoes" = "Shoes";
+
+"type.recycling.green_waste" = "Green/Organic Waste";
+
+"type.recycling.cartons" = "Cartons";
+
 "type.amenity.restaurant" = "Restoran";
 
+"type.amenity.sanitary_dump_station" = "Holding Tank Dump Station";
+
 "type.amenity.school" = "Okul";
 
 "type.amenity.shelter" = "Barınak";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "Çöplüğü";
 
+"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+
 "type.amenity.water_point" = "Su Noktası";
 
 "type.barrier" = "Barrier";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "Administrative Boundary";
 
-"type.boundary.administrative.4.state" = "Administrative Boundary";
-
 "type.boundary.administrative.5" = "Administrative Boundary";
 
 "type.boundary.administrative.6" = "Administrative Boundary";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "Cutline";
 
+"type.man_made.flagpole" = "Flagpole";
+
 "type.man_made.lighthouse" = "Deniz Feneri";
 
+"type.man_made.mast" = "Pole mast";
+
 "type.man_made.pier" = "Pier";
 
 "type.man_made.pipeline" = "Pipeline";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Dead End";
 
-"type.noexit.motor_vehicle" = "Dead End";
-
 "type.office" = "Ofis";
 
 "type.office.company" = "Şirket bürosu";
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
index 11368bf2f0..c69561e0ca 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "Книгообмін";
 
-"type.amenity.recycling" = "Прийом вторсировини";
+"type.amenity.recycling.centre" = "Прийом вторсировини";
 
-"type.amenity.recycling_container" = "Контейнер для вторсировини";
+"type.amenity.recycling" = "Контейнер для вторсировини";
 
-"type.recycling.toxic" = "Отруйні відходи";
+"type.amenity.recycling.container" = "Контейнер для вторсировини";
+
+"type.recycling.batteries" = "Батарейки";
 
 "type.recycling.clothes" = "Старий одяг";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "Електровідходи";
 
+"type.recycling.cardboard" = "Картон";
+
+"type.recycling.cans" = "Бляшані банки";
+
+"type.recycling.shoes" = "Взуття";
+
+"type.recycling.green_waste" = "Органічні відходи";
+
+"type.recycling.cartons" = "Тетрапак та аналоги";
+
 "type.amenity.restaurant" = "Ресторан";
 
+"type.amenity.sanitary_dump_station" = "Злив нечистот";
+
 "type.amenity.school" = "Школа";
 
 "type.amenity.shelter" = "Укриття";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "Сміттєвий контейнер";
 
+"type.amenity.waste_transfer_station" = "Станція передачі сміття";
+
 "type.amenity.water_point" = "Заправка водою";
 
 "type.barrier" = "Перешкода";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "Адміністративний поділ";
 
-"type.boundary.administrative.4.state" = "Адміністративний поділ";
-
 "type.boundary.administrative.5" = "Адміністративний поділ";
 
 "type.boundary.administrative.6" = "Адміністративний поділ";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "Просіка";
 
+"type.man_made.flagpole" = "Флагшток";
+
 "type.man_made.lighthouse" = "Маяк";
 
+"type.man_made.mast" = "Стовп-щогла";
+
 "type.man_made.pier" = "Пірс";
 
 "type.man_made.pipeline" = "Трубопровід";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Тупик";
 
-"type.noexit.motor_vehicle" = "Тупик";
-
 "type.office" = "Офіс";
 
 "type.office.company" = "Організація";
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
index 0d197ab73e..ee50434e64 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "Kệ sách";
 
-"type.amenity.recycling" = "Trung tâm tái sinh";
+"type.amenity.recycling.centre" = "Trung tâm tái sinh";
 
-"type.amenity.recycling_container" = "Thùng rác";
+"type.amenity.recycling" = "Thùng rác";
 
-"type.recycling.toxic" = "Chất thải độc hại";
+"type.amenity.recycling.container" = "Thùng rác";
+
+"type.recycling.batteries" = "Ắc quy";
 
 "type.recycling.clothes" = "Quần áo cũ";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "Chất thải đồ điện";
 
+"type.recycling.cardboard" = "Cardboard";
+
+"type.recycling.cans" = "Cans";
+
+"type.recycling.shoes" = "Shoes";
+
+"type.recycling.green_waste" = "Green/Organic Waste";
+
+"type.recycling.cartons" = "Cartons";
+
 "type.amenity.restaurant" = "Quán ăn";
 
+"type.amenity.sanitary_dump_station" = "Holding Tank Dump Station";
+
 "type.amenity.school" = "Trường học";
 
 "type.amenity.shelter" = "Chổ nương thân";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "Xử lý chất thải";
 
+"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+
 "type.amenity.water_point" = "Điểm cấp nước";
 
 "type.barrier" = "Barrier";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "Administrative Boundary";
 
-"type.boundary.administrative.4.state" = "Administrative Boundary";
-
 "type.boundary.administrative.5" = "Administrative Boundary";
 
 "type.boundary.administrative.6" = "Administrative Boundary";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "Cutline";
 
+"type.man_made.flagpole" = "Flagpole";
+
 "type.man_made.lighthouse" = "Hải đăng";
 
+"type.man_made.mast" = "Pole mast";
+
 "type.man_made.pier" = "Pier";
 
 "type.man_made.pipeline" = "Pipeline";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Dead End";
 
-"type.noexit.motor_vehicle" = "Dead End";
-
 "type.office" = "Văn phòng";
 
 "type.office.company" = "Văn phòng công ty";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index 6715bc0102..8683b7fda6 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "公共书架";
 
-"type.amenity.recycling" = "资源回收设施";
+"type.amenity.recycling.centre" = "资源回收设施";
 
-"type.amenity.recycling_container" = "回收容器";
+"type.amenity.recycling" = "回收容器";
 
-"type.recycling.toxic" = "有毒垃圾";
+"type.amenity.recycling.container" = "回收容器";
+
+"type.recycling.batteries" = "电池";
 
 "type.recycling.clothes" = "旧衣物";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "电子垃圾";
 
+"type.recycling.cardboard" = "Cardboard";
+
+"type.recycling.cans" = "Cans";
+
+"type.recycling.shoes" = "Shoes";
+
+"type.recycling.green_waste" = "Green/Organic Waste";
+
+"type.recycling.cartons" = "Cartons";
+
 "type.amenity.restaurant" = "餐馆";
 
+"type.amenity.sanitary_dump_station" = "Holding Tank Dump Station";
+
 "type.amenity.school" = "学校";
 
 "type.amenity.shelter" = "庇护所";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "大型垃圾箱";
 
+"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+
 "type.amenity.water_point" = "取水点";
 
 "type.barrier" = "屏障";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "4级行政区域界线";
 
-"type.boundary.administrative.4.state" = "4级州省界线";
-
 "type.boundary.administrative.5" = "5级行政区域界线";
 
 "type.boundary.administrative.6" = "6级行政区域界线";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "树林分界线";
 
+"type.man_made.flagpole" = "Flagpole";
+
 "type.man_made.lighthouse" = "灯塔";
 
+"type.man_made.mast" = "Pole mast";
+
 "type.man_made.pier" = "码头";
 
 "type.man_made.pipeline" = "管道";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Dead End";
 
-"type.noexit.motor_vehicle" = "Dead End";
-
 "type.office" = "办公地点";
 
 "type.office.company" = "企业公司";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
index 8829b78490..800244f05c 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
@@ -1383,11 +1383,13 @@
 
 "type.amenity.public_bookcase" = "書架";
 
-"type.amenity.recycling" = "回收中心";
+"type.amenity.recycling.centre" = "回收中心";
 
-"type.amenity.recycling_container" = "回收箱";
+"type.amenity.recycling" = "回收箱";
 
-"type.recycling.toxic" = "有毒垃圾";
+"type.amenity.recycling.container" = "回收箱";
+
+"type.recycling.batteries" = "電池";
 
 "type.recycling.clothes" = "舊衣物";
 
@@ -1403,8 +1405,20 @@
 
 "type.recycling.small_appliances" = "電子垃圾";
 
+"type.recycling.cardboard" = "Cardboard";
+
+"type.recycling.cans" = "Cans";
+
+"type.recycling.shoes" = "Shoes";
+
+"type.recycling.green_waste" = "Green/Organic Waste";
+
+"type.recycling.cartons" = "Cartons";
+
 "type.amenity.restaurant" = "餐廳";
 
+"type.amenity.sanitary_dump_station" = "Holding Tank Dump Station";
+
 "type.amenity.school" = "學校";
 
 "type.amenity.shelter" = "隱藏處";
@@ -1439,6 +1453,8 @@
 
 "type.amenity.waste_disposal" = "垃圾";
 
+"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+
 "type.amenity.water_point" = "飲水站";
 
 "type.barrier" = "Barrier";
@@ -1489,8 +1505,6 @@
 
 "type.boundary.administrative.4" = "Administrative Boundary";
 
-"type.boundary.administrative.4.state" = "Administrative Boundary";
-
 "type.boundary.administrative.5" = "Administrative Boundary";
 
 "type.boundary.administrative.6" = "Administrative Boundary";
@@ -2213,8 +2227,12 @@
 
 "type.man_made.cutline" = "Cutline";
 
+"type.man_made.flagpole" = "Flagpole";
+
 "type.man_made.lighthouse" = "燈塔";
 
+"type.man_made.mast" = "Pole mast";
+
 "type.man_made.pier" = "Pier";
 
 "type.man_made.pipeline" = "Pipeline";
@@ -2327,8 +2345,6 @@
 
 "type.noexit" = "Dead End";
 
-"type.noexit.motor_vehicle" = "Dead End";
-
 "type.office" = "辦公室";
 
 "type.office.company" = "公司辦公室";