diff --git a/android/app/src/main/res/values-cs/types_strings.xml b/android/app/src/main/res/values-cs/types_strings.xml
index 10e633329..567000651 100644
--- a/android/app/src/main/res/values-cs/types_strings.xml
+++ b/android/app/src/main/res/values-cs/types_strings.xml
@@ -774,7 +774,7 @@
     <string name="type.railway.station.subway.lille">Stanice metra</string>
     <string name="type.railway.station.subway.lima">Stanice metra</string>
     <string name="type.railway.station.subway.lisboa">Stanice metra</string>
-    <string name="type.railway.station.subway.london">Stanice metra</string>
+    <string name="type.railway.station.subway.london">Stanice londýnského metra</string>
     <string name="type.railway.station.subway.lyon">Stanice metra</string>
     <string name="type.railway.station.subway.madrid">Stanice metra</string>
     <string name="type.railway.station.subway.malaga">Stanice metra</string>
@@ -1403,5 +1403,6 @@
     <string name="type.natural.wetland.fen">Slatiniště</string>
     <string name="type.natural.wetland.reedbed">Rákosina</string>
     <string name="type.natural.wetland.swamp">Bažina</string>
-    <string name="type.natural.wetland.mangrove">mangrovy</string>
+    <string name="type.natural.wetland.mangrove">Mangrovy</string>
+    <string name="type.natural.wetland.tidalflat">Wattové pobřeží</string>
 </resources>
diff --git a/android/app/src/main/res/values-et/types_strings.xml b/android/app/src/main/res/values-et/types_strings.xml
index 54b624aa0..0e42d90f8 100644
--- a/android/app/src/main/res/values-et/types_strings.xml
+++ b/android/app/src/main/res/values-et/types_strings.xml
@@ -1401,4 +1401,11 @@
     <string name="type.man_made.crane">Kraana</string>
     <string name="type.railway.station.subway.qingdao">Qingdao metroojaam</string>
     <string name="type.landuse.religious">Usuorganisatsiooni maa</string>
+    <string name="type.natural.wetland.saltmarsh.tidal">Loodete mõjutatud sooldunud padur</string>
+    <string name="type.natural.wetland.fen">Madalsoo</string>
+    <string name="type.natural.wetland.reedbed">Roostik</string>
+    <string name="type.natural.wetland.swamp">Lodu</string>
+    <string name="type.natural.wetland.mangrove">Mangroov</string>
+    <string name="type.natural.wetland.tidalflat">Loodeline tasandik</string>
+    <string name="type.natural.wetland.saltmarsh">Sooldunud padur</string>
 </resources>
diff --git a/android/app/src/main/res/values-eu/strings.xml b/android/app/src/main/res/values-eu/strings.xml
index 20d1bb4fd..8a9462642 100644
--- a/android/app/src/main/res/values-eu/strings.xml
+++ b/android/app/src/main/res/values-eu/strings.xml
@@ -307,7 +307,7 @@
     <!-- Text for routing error dialog -->
     <string name="routing_download_maps_along">Deskargatu zure arrastoaren mapa guztiak</string>
     <!-- Text for routing error dialog -->
-    <string name="routing_requires_all_map">Arrasto bat sortzeko beharrezkoa da helmugako kokapenaren mapa guztiak deskargatzea eta eguneratzea.</string>
+    <string name="routing_requires_all_map">Arrasto bat sortzeko beharrezkoa da kokapenetik helmugarainoko mapa guztiak deskargatzea eta eguneratzea.</string>
     <!-- Text for routing error dialog -->
     <string name="routing_not_enough_space">Leku nahikorik ez</string>
     <!-- location service disabled -->
@@ -349,7 +349,7 @@
     <!-- SECTION: Routing dialogs strings -->
     <string name="dialog_routing_disclaimer_title">Arrastoa jarraitzean, kontuan izan:</string>
     <string name="dialog_routing_disclaimer_priority">— Bidearen egoera, zirkulazio arauek eta bide seinaleek lehentasuna dute beti nabigazio-iradokizunen gainetik;</string>
-    <string name="dialog_routing_disclaimer_precision">— Mapa zehazgabea izan daiteke eta helmugara iristeko biderik onena ez den ibilbide bat iradoki dezake;</string>
+    <string name="dialog_routing_disclaimer_precision">— Zehaztasunik gabeko mapa izan daiteke eta helmugara iristeko biderik onena ez den ibilbide bat iradoki dezake;</string>
     <string name="dialog_routing_disclaimer_recommendations">— Iradokitako ibilbideak gomendio gisa soilik hartu behar dira;</string>
     <string name="dialog_routing_disclaimer_borders">— Kontuz ibili muga-eremuak dituzten ibilbideetan: gure aplikazioak sortutako ibilbideek batzuetan herrialdeen mugak zeharkatu ditzakete baimendu gabeko tokietan.</string>
     <string name="dialog_routing_disclaimer_beware">Egon adi eta seguru errepideetan!</string>
@@ -360,7 +360,7 @@
     <string name="dialog_routing_location_unknown_turn_on">Ezin dira GPS koordenatuak aurkitu. Aktibatu kokapen zerbitzuak arrastoa kalkulatzeko.</string>
     <string name="dialog_routing_unable_locate_route">Ezin da ibilbiderik aurkitu</string>
     <string name="dialog_routing_cant_build_route">Ezin da ibilbidea sortu.</string>
-    <string name="dialog_routing_change_start_or_end">Ezarri zure abiapuntua edo helmuga.</string>
+    <string name="dialog_routing_change_start_or_end">Ezarri zure abiapuntua edota helmuga.</string>
     <string name="dialog_routing_change_start">Ezarri abiapuntua</string>
     <string name="dialog_routing_start_not_determined">Ibilbidea ez da sortu. Abiapuntua ezin izan da aurkitu.</string>
     <string name="dialog_routing_select_closer_start">Hautatu errepide batetik gertuko abiapuntua.</string>
@@ -392,8 +392,8 @@
     <string name="clear_search">Garbitu bilaketa historia</string>
     <string name="p2p_your_location">Zure kokapena</string>
     <string name="p2p_start">Hasi</string>
-    <string name="p2p_from_here">Hemendik</string>
-    <string name="p2p_to_here">Bidea hona</string>
+    <string name="p2p_from_here">Abiapuntua</string>
+    <string name="p2p_to_here">Helmuga</string>
     <string name="p2p_only_from_current">Nabigazioa zure uneko kokapenetik soilik dago erabilgarri.</string>
     <string name="p2p_reroute_from_current">Zure uneko kokapenetik ibilbide bat antolatzea nahi duzu?</string>
     <!-- Edit open hours/set time and minutes dialog -->
@@ -591,7 +591,7 @@
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Erabili bilaketa edo sakatu mapan ibilbidearen abiapuntua gehitzeko</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
-    <string name="routing_add_finish_point">Erabili bilaketa edo sakatu mapan helmuga puntu bat gehitzeko</string>
+    <string name="routing_add_finish_point">Erabili bilaketa edo sakatu mapan helmuga puntua gehitzeko</string>
     <string name="planning_route_manage_route">Kudeatu ibilbidea</string>
     <string name="button_plan">Planifikatu</string>
     <string name="placepage_remove_stop">Kendu geltokia</string>
diff --git a/android/app/src/main/res/values-pt-rBR/types_strings.xml b/android/app/src/main/res/values-pt-rBR/types_strings.xml
index af4a6c08e..1b73ab093 100644
--- a/android/app/src/main/res/values-pt-rBR/types_strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/types_strings.xml
@@ -1273,7 +1273,7 @@
     <string name="type.natural.volcano">Vulcão</string>
     <string name="type.natural.water">Água</string>
     <string name="type.natural.wetland.bog">Jardim</string>
-    <string name="type.natural.wetland.marsh">Pântano</string>
+    <string name="type.natural.wetland.marsh">Brejo</string>
     <string name="type.place.city">Cidade</string>
     <string name="type.place.city.capital">Capital</string>
     <string name="type.place.city.capital.10">Cidade</string>
@@ -1390,4 +1390,11 @@
     <string name="type.shop.hearing_aids">Loja de aparelhos auditivos</string>
     <string name="type.railway.station.subway.qingdao">Estação de Metrô</string>
     <string name="type.landuse.religious">Local Religioso</string>
+    <string name="type.natural.wetland.saltmarsh.tidal">Marisma</string>
+    <string name="type.natural.wetland.fen">Fen</string>
+    <string name="type.natural.wetland.reedbed">Caniçal</string>
+    <string name="type.natural.wetland.swamp">Pântano</string>
+    <string name="type.natural.wetland.mangrove">Manguezal</string>
+    <string name="type.natural.wetland.tidalflat">Planície de Maré</string>
+    <string name="type.natural.wetland.saltmarsh">Sapal</string>
 </resources>
diff --git a/data/countries-strings/de.json/localize.json b/data/countries-strings/de.json/localize.json
index 8feec74ff..33f8188d0 100644
--- a/data/countries-strings/de.json/localize.json
+++ b/data/countries-strings/de.json/localize.json
@@ -16,7 +16,7 @@
 "Argentina_Buenos Aires_South":"Provinz Buenos Aires — Süden",
 "Argentina_Cuyo":"Cuyo",
 "Argentina_Mesopotamia":"Mesopotamia",
-"Argentina_Northwest":"Región Noroeste Argentino",
+"Argentina_Northwest":"Nordwest-Argentinien",
 "Argentina_Pampas":"Pampa",
 "Argentina_Patagonia":"Patagonien",
 "Arizona":"Arizona",
@@ -46,7 +46,7 @@
 "Bangladesh":"Bangladesch",
 "Barbados":"Barbados",
 "Belarus":"Weißrussland",
-"Belarus_Brest Region":"Breszkaja Woblasz",
+"Belarus_Brest Region":"Region Brest",
 "Belarus_Homiel Region":"Woblast Homel",
 "Belarus_Hrodna Region":"Woblast Hrodna",
 "Belarus_Maglieu Region":"Woblast Mahiljou",
@@ -1351,7 +1351,7 @@
 "Andorra Description":"Andorra la Vella, La Massana, Ordino",
 "Angola Description":"Luanda",
 "Anguilla Description":"The Valley, George Hill, Stoney Ground",
-"Antarctica Description":"McMurdo Station, Chilean research station „Villa Las Estrellas”, Rocky Cove",
+"Antarctica Description":"McMurdo-Station, Chilenische Forschungsstation „Villa Las Estrellas“, Rocky Cove",
 "Antigua and Barbuda Description":"St. John's, English Harbour, Freetown",
 "Argentina_Buenos Aires_Buenos Aires Description":"Buenos Aires",
 "Argentina_Buenos Aires_North Description":"Dolores, Pinamar, Villa Gesell",
@@ -1587,7 +1587,7 @@
 "Estonia_East Description":"Stadtgemeinde Oberpahlen, Dorpat",
 "Estonia_West Description":"Reval, Pernau",
 "Ethiopia Description":"Addis Abeba",
-"Falkland Islands Description":"Stanley, Falkland Islands, Dunnose Head, Port Edgar",
+"Falkland Islands Description":"Stanley, Falklandinseln, Dunnose Head, Port Edgar",
 "Faroe Islands Description":"Thorshaven",
 "Federated States of Micronesia Description":"Palikir, Colonia, Tamworohi",
 "Fiji Description":"Suva",
@@ -1692,7 +1692,7 @@
 "France_Southern Islands Description":"Le Port, Saint-Denis, Coconi",
 "France_Upper Normandy Description":"Le Havre, Rouen, Évreux",
 "French Polynesia Description":"Vaitape, Vaitahu, Tiputa",
-"Gabon Description":"Libreville",
+"Gabon Description":"Libreville, Port-Gentil, Sangala",
 "Georgia Description":"Tiflis, Kutaissi, Batumi",
 "Germany_Baden-Wurttemberg_Regierungsbezirk Freiburg Description":"Freiburg im Breisgau, Villingen-Schwenningen, Konstanz",
 "Germany_Baden-Wurttemberg_Regierungsbezirk Karlsruhe Description":"Mannheim, Karlsruhe, Heidelberg",
@@ -1734,7 +1734,7 @@
 "Germany_North Rhine-Westphalia_Regierungsbezirk Munster_Recklinghausen Description":"Gelsenkirchen, Bottrop, Recklinghausen",
 "Germany_Rhineland-Palatinate_Koblenz Description":"Koblenz, Trier",
 "Germany_Rhineland-Palatinate_South Description":"Mainz, Ludwigshafen am Rhein, Kaiserslautern",
-"Germany_Saarland Description":"Saarbruecken, Neunkirchen (Saar), Homburg",
+"Germany_Saarland Description":"Saarbrücken, Neunkirchen (Saar), Homburg",
 "Germany_Saxony-Anhalt_Halle Description":"Halle (Saale), Dessau-Roßlau, Zerbst/Anhalt",
 "Germany_Saxony-Anhalt_Magdeburg Description":"Magdeburg, Halberstadt, Aschersleben",
 "Germany_Saxony_Dresden Description":"Dresden, Görlitz, Schirgiswalde-Kirschau",
diff --git a/data/sound-strings/eu.json/localize.json b/data/sound-strings/eu.json/localize.json
index 0af31f2b4..781e1ac0b 100644
--- a/data/sound-strings/eu.json/localize.json
+++ b/data/sound-strings/eu.json/localize.json
@@ -28,7 +28,7 @@
 "take_exit_number":"Irten",
 "take_exit_number_street_verb":"NULL",
 "route_recalculating":"Ibilbidea berriro kalkulatzea",
-"destination":"Zure helmugara iritsiko zara.",
+"destination":"Helmugara iristen ari zara.",
 "you_have_reached_the_destination":"Helmugara iritsi zara.",
 "in_50_meters":"Berrogeita hamar metrora",
 "in_100_meters":"Ehun metrora",
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings
index ddfbcd17f..de19585cd 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings
@@ -966,56 +966,56 @@
 "type.railway.station" = "Železniční stanice";
 "type.railway.station.funicular" = "Pozemní lanová dráha";
 "type.railway.station.light_rail" = "Stanice lehké železnice";
-"type.railway.station.light_rail.berlin" = "Stanice Stadtbahn";
-"type.railway.station.light_rail.london" = "Stanice Docklands Light Railway";
-"type.railway.station.light_rail.porto" = "Stanice metra v Portu";
+"type.railway.station.light_rail.berlin" = "Stanice S-Bahn";
+"type.railway.station.light_rail.london" = "Stanice DLR";
+"type.railway.station.light_rail.porto" = "Metro v Portu";
 "type.railway.station.monorail" = "Stanice monorailu";
 "type.railway.station.subway" = "Stanice metra";
-"type.railway.station.subway.adana" = "Stanice metra v Adaně";
+"type.railway.station.subway.adana" = "Stanice metra";
 "type.railway.station.subway.algiers" = "Stanice metra v Alžíru";
-"type.railway.station.subway.almaty" = "Stanice metra v Almaty";
-"type.railway.station.subway.amsterdam" = "Stanice metra v Amsterdamu";
-"type.railway.station.subway.ankara" = "Stanice metra v Ankaře";
-"type.railway.station.subway.athens" = "Stanice metra v Aténách";
-"type.railway.station.subway.baku" = "Stanice metra v Baku";
-"type.railway.station.subway.bangkok" = "Stanice metra v Bangkoku / BTS Skytrain";
-"type.railway.station.subway.barcelona" = "Stanice metra v Barceloně";
-"type.railway.station.subway.beijing" = "Stanice metra v Pekingu";
-"type.railway.station.subway.bengalore" = "Stanice metra v Bengalúru";
-"type.railway.station.subway.berlin" = "Stanice metra v Berlíně";
-"type.railway.station.subway.bilbao" = "Stanice metra v Bilbau";
-"type.railway.station.subway.brasilia" = "Stanice metra v Brasílii";
-"type.railway.station.subway.brescia" = "Stanice metra v Brescii";
-"type.railway.station.subway.brussels" = "Stanice metra v Bruselu";
-"type.railway.station.subway.bucharest" = "Stanice metra v Bukurešti";
-"type.railway.station.subway.budapest" = "Stanice metra v Budapešti";
-"type.railway.station.subway.buenos_aires" = "Stanice metra v Buenos Aires";
-"type.railway.station.subway.bursa" = "Stanice metra v Burse";
-"type.railway.station.subway.cairo" = "Stanice metra v Káhiře";
-"type.railway.station.subway.caracas" = "Stanice metra v Caracasu";
-"type.railway.station.subway.catania" = "Stanice metra v Katánii";
-"type.railway.station.subway.changchun" = "Stanice železnice v Čchang-čchunu";
-"type.railway.station.subway.chengdu" = "Stanice metra v Čcheng-tu";
-"type.railway.station.subway.chicago" = "Stanice metra v Chicagu";
-"type.railway.station.subway.chongqing" = "Stanice železnice v Čchung-čchingu";
-"type.railway.station.subway.dalian" = "Stanice metra v Ta-lienu";
-"type.railway.station.subway.delhi" = "Stanice metra v Dillí";
-"type.railway.station.subway.dnepro" = "Stanice metra v Dněpru";
-"type.railway.station.subway.dubai" = "Stanice metra v Dubaji";
-"type.railway.station.subway.ekb" = "Stanice metra v Jekatěrinburgu";
-"type.railway.station.subway.fukuoka" = "Stanice metra v Fukuoce";
-"type.railway.station.subway.glasgow" = "Stanice metra v Glasgow";
-"type.railway.station.subway.guangzhou" = "Stanice metra v Kantonu";
-"type.railway.station.subway.hamburg" = "Stanice metra v Hamburku";
-"type.railway.station.subway.helsinki" = "Stanice metra v Helsinkách";
-"type.railway.station.subway.hiroshima" = "Stanice metra v Hirošimě";
+"type.railway.station.subway.almaty" = "Stanice metra";
+"type.railway.station.subway.amsterdam" = "Stanice metra";
+"type.railway.station.subway.ankara" = "Stanice metra";
+"type.railway.station.subway.athens" = "Stanice metra";
+"type.railway.station.subway.baku" = "Stanice metra";
+"type.railway.station.subway.bangkok" = "Stanice metra";
+"type.railway.station.subway.barcelona" = "Stanice metra";
+"type.railway.station.subway.beijing" = "Stanice metra";
+"type.railway.station.subway.bengalore" = "Stanice metra";
+"type.railway.station.subway.berlin" = "Stanice metra";
+"type.railway.station.subway.bilbao" = "Stanice metra";
+"type.railway.station.subway.brasilia" = "Stanice metra";
+"type.railway.station.subway.brescia" = "Stanice metra";
+"type.railway.station.subway.brussels" = "Stanice metra";
+"type.railway.station.subway.bucharest" = "Stanice metra";
+"type.railway.station.subway.budapest" = "Stanice metra";
+"type.railway.station.subway.buenos_aires" = "Stanice metra";
+"type.railway.station.subway.bursa" = "Stanice metra";
+"type.railway.station.subway.cairo" = "Stanice metra";
+"type.railway.station.subway.caracas" = "Stanice metra";
+"type.railway.station.subway.catania" = "Stanice metra";
+"type.railway.station.subway.changchun" = "Stanice metra";
+"type.railway.station.subway.chengdu" = "Stanice metra";
+"type.railway.station.subway.chicago" = "Stanice metra";
+"type.railway.station.subway.chongqing" = "Stanice metra";
+"type.railway.station.subway.dalian" = "Stanice metra";
+"type.railway.station.subway.delhi" = "Stanice metra";
+"type.railway.station.subway.dnepro" = "Stanice metra";
+"type.railway.station.subway.dubai" = "Stanice metra";
+"type.railway.station.subway.ekb" = "Stanice metra";
+"type.railway.station.subway.fukuoka" = "Stanice metra";
+"type.railway.station.subway.glasgow" = "Stanice metra";
+"type.railway.station.subway.guangzhou" = "Stanice metra";
+"type.railway.station.subway.hamburg" = "Stanice metra";
+"type.railway.station.subway.helsinki" = "Stanice metra";
+"type.railway.station.subway.hiroshima" = "Stanice metra";
 "type.railway.station.subway.hongkong" = "Stanice metra";
 "type.railway.station.subway.isfahan" = "Stanice metra";
 "type.railway.station.subway.istanbul" = "Stanice metra";
 "type.railway.station.subway.izmir" = "Stanice metra";
 "type.railway.station.subway.kazan" = "Stanice metra";
-"type.railway.station.subway.kharkiv" = "Stanice charkovského metra";
-"type.railway.station.subway.kiev" = "Stanice kyjevského metra";
+"type.railway.station.subway.kharkiv" = "Stanice metra";
+"type.railway.station.subway.kiev" = "Stanice metra";
 "type.railway.station.subway.kobe" = "Stanice metra";
 "type.railway.station.subway.kolkata" = "Stanice metra";
 "type.railway.station.subway.kunming" = "Stanice metra";
@@ -1034,56 +1034,56 @@
 "type.railway.station.subway.mashhad" = "Stanice metra";
 "type.railway.station.subway.mecca" = "Stanice metra";
 "type.railway.station.subway.medellin" = "Stanice metra";
-"type.railway.station.subway.mexico" = "Stanice mexického metra";
-"type.railway.station.subway.milan" = "Stanice milánského metra";
-"type.railway.station.subway.minsk" = "Stanice metra v Minsku";
-"type.railway.station.subway.montreal" = "Stanice montrealského metra";
-"type.railway.station.subway.moscow" = "Stanice moskevského metra";
+"type.railway.station.subway.mexico" = "Stanice metra";
+"type.railway.station.subway.milan" = "Stanice metra";
+"type.railway.station.subway.minsk" = "Stanice metra";
+"type.railway.station.subway.montreal" = "Stanice metra";
+"type.railway.station.subway.moscow" = "Stanice metra";
 "type.railway.station.subway.munchen" = "Stanice metra";
-"type.railway.station.subway.nagoya" = "Stanice nagojského metra";
-"type.railway.station.subway.newyork" = "Stanice newyorského metra";
+"type.railway.station.subway.nagoya" = "Stanice metra";
+"type.railway.station.subway.newyork" = "Stanice metra";
 "type.railway.station.subway.nnov" = "Stanice metra";
-"type.railway.station.subway.novosibirsk" = "Stanice novosibirského metra";
-"type.railway.station.subway.osaka" = "Stanice ósackého metra";
-"type.railway.station.subway.oslo" = "Stanice metra v Oslu";
+"type.railway.station.subway.novosibirsk" = "Stanice metra";
+"type.railway.station.subway.osaka" = "Stanice metra";
+"type.railway.station.subway.oslo" = "Stanice metra";
 "type.railway.station.subway.palma" = "Stanice metra";
-"type.railway.station.subway.panama" = "Stanice panamského metra";
-"type.railway.station.subway.paris" = "Stanice pařížského metra";
-"type.railway.station.subway.philadelphia" = "Metro SEPTA";
-"type.railway.station.subway.pyongyang" = "Stanice pchjongjanského metra";
+"type.railway.station.subway.panama" = "Stanice metra";
+"type.railway.station.subway.paris" = "Stanice metra";
+"type.railway.station.subway.philadelphia" = "Stanice metra";
+"type.railway.station.subway.pyongyang" = "Stanice metra";
 "type.railway.station.subway.rennes" = "Stanice metra";
 "type.railway.station.subway.rio" = "Stanice metra";
 "type.railway.station.subway.roma" = "Stanice metra";
-"type.railway.station.subway.rotterdam" = "Stanice rotterdamského metra";
+"type.railway.station.subway.rotterdam" = "Stanice metra";
 "type.railway.station.subway.samara" = "Stanice metra";
 "type.railway.station.subway.santiago" = "Stanice metra";
-"type.railway.station.subway.santo_domingo" = "Stanice metra v Santo Domingo";
+"type.railway.station.subway.santo_domingo" = "Stanice metra";
 "type.railway.station.subway.saopaulo" = "Stanice metra";
-"type.railway.station.subway.sapporo" = "Stanice sapporského metra";
-"type.railway.station.subway.sendai" = "Stanice sendaiského metra";
+"type.railway.station.subway.sapporo" = "Stanice metra";
+"type.railway.station.subway.sendai" = "Stanice metra";
 "type.railway.station.subway.sf" = "Stanice metra";
-"type.railway.station.subway.shanghai" = "Stanice šanghajského metra";
-"type.railway.station.subway.shenzhen" = "Stanice metra v Šen-čenu";
+"type.railway.station.subway.shanghai" = "Stanice metra";
+"type.railway.station.subway.shenzhen" = "Stanice metra";
 "type.railway.station.subway.shiraz" = "Stanice metra";
-"type.railway.station.subway.singapore" = "Stanice singapurské železnice";
+"type.railway.station.subway.singapore" = "Stanice metra";
 "type.railway.station.subway.sofia" = "Stanice metra";
 "type.railway.station.subway.spb" = "Stanice metra";
-"type.railway.station.subway.stockholm" = "Stanice stockholmského metra";
+"type.railway.station.subway.stockholm" = "Stanice metra";
 "type.railway.station.subway.tabriz" = "Stanice metra";
-"type.railway.station.subway.taipei" = "Stanice metra v Taipei";
-"type.railway.station.subway.taoyuan" = "Stanice metra v Tchao-jüanu";
+"type.railway.station.subway.taipei" = "Stanice metra";
+"type.railway.station.subway.taoyuan" = "Stanice metra";
 "type.railway.station.subway.tashkent" = "Stanice metra";
-"type.railway.station.subway.tbilisi" = "Stanice metra v Tbilisi";
-"type.railway.station.subway.tehran" = "Stanice teheránského metra";
-"type.railway.station.subway.tianjin" = "Stanice metra v Tchien-ťinu";
-"type.railway.station.subway.tokyo" = "Stanice tokyjského metra";
-"type.railway.station.subway.valencia" = "Stanice Metrovalencia";
-"type.railway.station.subway.vienna" = "Stanice vídeňského metra";
-"type.railway.station.subway.warszawa" = "Stanice varšavského metra";
-"type.railway.station.subway.washington" = "Stanice washingtonského metra";
-"type.railway.station.subway.wuhan" = "Stanice wuhanského metra";
-"type.railway.station.subway.yerevan" = "Stanice jerevanského metra";
-"type.railway.station.subway.yokohama" = "Stanice jokohamského metra";
+"type.railway.station.subway.tbilisi" = "Stanice metra";
+"type.railway.station.subway.tehran" = "Stanice metra";
+"type.railway.station.subway.tianjin" = "Stanice metra";
+"type.railway.station.subway.tokyo" = "Stanice metra";
+"type.railway.station.subway.valencia" = "Stanice metra";
+"type.railway.station.subway.vienna" = "Stanice metra";
+"type.railway.station.subway.warszawa" = "Stanice metra";
+"type.railway.station.subway.washington" = "Stanice metra";
+"type.railway.station.subway.wuhan" = "Stanice metra";
+"type.railway.station.subway.yerevan" = "Stanice metra";
+"type.railway.station.subway.yokohama" = "Stanice metra";
 "type.railway.subway" = "Trať metra";
 "type.railway.subway.bridge" = "Most trati metra";
 "type.railway.subway.tunnel" = "Tunel trati metra";
@@ -1491,10 +1491,11 @@
 "type.leisure.firepit" = "Ohniště";
 "type.sport.diving" = "Skoky do vody z velkých výšek";
 "type.man_made.crane" = "Jeřáb";
-"type.railway.station.subway.qingdao" = "Stanice metra v Čching-tao";
+"type.railway.station.subway.qingdao" = "Stanice metra";
 "type.natural.wetland.saltmarsh.tidal" = "Přílivové slanisko";
 "type.natural.wetland.fen" = "Slatiniště";
 "type.natural.wetland.swamp" = "Bažina";
 "type.natural.wetland.saltmarsh" = "Slanisko";
 "type.natural.wetland.reedbed" = "Rákosina";
-"type.natural.wetland.mangrove" = "mangrovy";
+"type.natural.wetland.mangrove" = "Mangrovy";
+"type.natural.wetland.tidalflat" = "Wattové pobřeží";
diff --git a/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings
index fca024cce..a516d67e8 100644
--- a/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings
@@ -1492,3 +1492,10 @@
 "type.sport.diving" = "Vettehüpped";
 "type.man_made.crane" = "Kraana";
 "type.railway.station.subway.qingdao" = "Qingdao metroojaam";
+"type.natural.wetland.fen" = "Madalsoo";
+"type.natural.wetland.reedbed" = "Roostik";
+"type.natural.wetland.swamp" = "Lodu";
+"type.natural.wetland.mangrove" = "Mangroov";
+"type.natural.wetland.tidalflat" = "Loodeline tasandik";
+"type.natural.wetland.saltmarsh" = "Sooldunud padur";
+"type.natural.wetland.saltmarsh.tidal" = "Loodete mõjutatud sooldunud padur";
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
index bacc4f15a..beef21e2d 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
@@ -372,7 +372,7 @@
 "routing_download_maps_along" = "Deskargatu zure arrastoaren mapa guztiak";
 
 /* Text for routing error dialog */
-"routing_requires_all_map" = "Arrasto bat sortzeko beharrezkoa da helmugako kokapenaren mapa guztiak deskargatzea eta eguneratzea.";
+"routing_requires_all_map" = "Arrasto bat sortzeko beharrezkoa da kokapenetik helmugarainoko mapa guztiak deskargatzea eta eguneratzea.";
 
 /* bookmark button text */
 "bookmark" = "Markagailua";
@@ -428,7 +428,7 @@
 "blue_gray" = "Gris urdinxka";
 "dialog_routing_disclaimer_title" = "Arrastoa jarraitzean, kontuan izan:";
 "dialog_routing_disclaimer_priority" = "— Bidearen egoera, zirkulazio arauek eta bide seinaleek lehentasuna dute beti nabigazio-iradokizunen gainetik;";
-"dialog_routing_disclaimer_precision" = "— Mapa zehazgabea izan daiteke eta helmugara iristeko biderik onena ez den ibilbide bat iradoki dezake;";
+"dialog_routing_disclaimer_precision" = "— Zehaztasunik gabeko mapa izan daiteke eta helmugara iristeko biderik onena ez den ibilbide bat iradoki dezake;";
 "dialog_routing_disclaimer_recommendations" = "— Iradokitako ibilbideak gomendio gisa soilik hartu behar dira;";
 "dialog_routing_disclaimer_borders" = "— Kontuz ibili muga-eremuak dituzten ibilbideetan: gure aplikazioak sortutako ibilbideek batzuetan herrialdeen mugak zeharkatu ditzakete baimendu gabeko tokietan.";
 "dialog_routing_disclaimer_beware" = "Egon adi eta seguru errepideetan!";
@@ -440,7 +440,7 @@
 "dialog_routing_download_files" = "Deskargatu beharrezko fitxategiak";
 "dialog_routing_download_and_update_all" = "Deskargatu eta eguneratu mapa eta ibilbideen informazio guztia aurreikusitako ibilbidearekin batera arrastoa kalkulatzeko.";
 "dialog_routing_unable_locate_route" = "Ezin da ibilbiderik aurkitu";
-"dialog_routing_change_start_or_end" = "Ezarri zure abiapuntua edo helmuga.";
+"dialog_routing_change_start_or_end" = "Ezarri zure abiapuntua edota helmuga.";
 "dialog_routing_change_start" = "Ezarri abiapuntua";
 "dialog_routing_start_not_determined" = "Ibilbidea ez da sortu. Abiapuntua ezin izan da aurkitu.";
 "dialog_routing_select_closer_start" = "Hautatu errepide batetik gertuko abiapuntua.";
@@ -486,8 +486,8 @@
 "wikimedia_commons" = "Wikimedia Commons";
 "p2p_your_location" = "Zure kokapena";
 "p2p_start" = "Hasi";
-"p2p_from_here" = "Hemendik";
-"p2p_to_here" = "Bidea hona";
+"p2p_from_here" = "Abiapuntua";
+"p2p_to_here" = "Helmuga";
 "p2p_only_from_current" = "Nabigazioa zure uneko kokapenetik soilik dago erabilgarri.";
 "p2p_reroute_from_current" = "Zure uneko kokapenetik ibilbide bat antolatzea nahi duzu?";
 "editor_time_add" = "Gehitu ordutegia";
@@ -732,7 +732,7 @@
 "routing_add_start_point" = "Erabili bilaketa edo sakatu mapan ibilbidearen abiapuntua gehitzeko";
 
 /* User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". */
-"routing_add_finish_point" = "Erabili bilaketa edo sakatu mapan helmuga puntu bat gehitzeko";
+"routing_add_finish_point" = "Erabili bilaketa edo sakatu mapan helmuga puntua gehitzeko";
 "planning_route_manage_route" = "Kudeatu ibilbidea";
 "button_plan" = "Planifikatu";
 "placepage_remove_stop" = "Kendu geltokia";
@@ -824,7 +824,7 @@
 "unpaved_road" = "Asfaltatu gabeko errepidea";
 "ferry_crossing" = "Ferry zeharkaldia";
 "trip_start" = "Goazen";
-"pick_destination" = "Helmuga";
+"pick_destination" = "Norakoa";
 "follow_my_position" = "Berriz zentratu";
 "search_results" = "Bilaketa emaitzak";
 "then_turn" = "Gero";
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings
index 392ebb92f..9b670e37c 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings
@@ -826,7 +826,7 @@
 "type.natural.water" = "Água";
 "type.natural.wetland" = "Zona úmida";
 "type.natural.wetland.bog" = "Jardim";
-"type.natural.wetland.marsh" = "Pântano";
+"type.natural.wetland.marsh" = "Brejo";
 "type.noexit" = "Via sem saída";
 "type.office" = "Escritório";
 "type.office.company" = "Escritório de empresa";
@@ -1492,3 +1492,10 @@
 "type.man_made.crane" = "Guindaste";
 "type.place.city.capital.5" = "Cidade";
 "type.railway.station.subway.qingdao" = "Estação de Metrô";
+"type.natural.wetland.saltmarsh.tidal" = "Marisma";
+"type.natural.wetland.fen" = "Fen";
+"type.natural.wetland.reedbed" = "Caniçal";
+"type.natural.wetland.swamp" = "Pântano";
+"type.natural.wetland.mangrove" = "Manguezal";
+"type.natural.wetland.tidalflat" = "Planície de Maré";
+"type.natural.wetland.saltmarsh" = "Sapal";