diff --git a/android/app/src/main/res/values-nb/strings.xml b/android/app/src/main/res/values-nb/strings.xml
index 0e550e72c..23c82f80c 100644
--- a/android/app/src/main/res/values-nb/strings.xml
+++ b/android/app/src/main/res/values-nb/strings.xml
@@ -885,4 +885,5 @@
     <string name="editor_socket">Rediger kontakt</string>
     <string name="charge_socket_type1">Type 1</string>
     <string name="edit_socket_info_tooltip">Opprett nye kontakter eller rediger eksisterende.</string>
+    <string name="avoid_paved">Unngå asfalterte veier</string>
 </resources>
diff --git a/android/app/src/main/res/values-pl/strings.xml b/android/app/src/main/res/values-pl/strings.xml
index b5bfe04e5..8400adefa 100644
--- a/android/app/src/main/res/values-pl/strings.xml
+++ b/android/app/src/main/res/values-pl/strings.xml
@@ -372,7 +372,7 @@
     <!-- The message when user did not find anything in the search. -->
     <string name="search_not_found_query">Pobierz region, w którym szukasz lub spróbuj dodać nazwę pobliskiego miasta/wsi.</string>
     <string name="search_history_title">Historia wyszukiwania</string>
-    <string name="search_history_text">Uzyskaj szybki dostęp do ostatniego hasła wyszukiwania.</string>
+    <string name="search_history_text">Zobacz swoje ostatnie wyszukiwania</string>
     <string name="clear_search">Wyczyść historię wyszukiwania</string>
     <!-- Place Page link to Wikipedia article (if map object has it). -->
     <string name="read_in_wikipedia">Wikipedia</string>
diff --git a/android/sdk/src/main/res/values-da/types_strings.xml b/android/sdk/src/main/res/values-da/types_strings.xml
index cc5a4cdb3..08f41a16d 100644
--- a/android/sdk/src/main/res/values-da/types_strings.xml
+++ b/android/sdk/src/main/res/values-da/types_strings.xml
@@ -28,9 +28,9 @@
     <string name="type.amenity.gambling">Gambling</string>
     <string name="type.leisure.adult_gaming_centre">Spillehal for voksne</string>
     <string name="type.leisure.amusement_arcade">Arkadespil</string>
-    <string name="type.amenity.charging_station">Ladestander</string>
-    <string name="type.amenity.charging_station.bicycle">Cykelladestander</string>
-    <string name="type.amenity.charging_station.motorcar">Billadestander</string>
+    <string name="type.amenity.charging_station">Ladestation</string>
+    <string name="type.amenity.charging_station.bicycle">Ladestation til elcykler</string>
+    <string name="type.amenity.charging_station.motorcar">Ladestation til elbiler</string>
     <string name="type.amenity.childcare">Vuggestue</string>
     <string name="type.amenity.cinema">Biograf</string>
     <string name="type.leisure.bowling_alley">Bowlinghal</string>
@@ -83,17 +83,17 @@
     <string name="type.amenity.parking.street_side">Parkeringslomme</string>
     <string name="type.amenity.parking.street_side.fee">Parkeringslomme</string>
     <string name="type.amenity.parking.street_side.private">Privat parkeringslomme</string>
-    <string name="type.amenity.parking.lane">Parkering i vejside</string>
-    <string name="type.amenity.parking.lane.fee">Parkering i vejside</string>
-    <string name="type.amenity.parking.lane.private">Privat parkering i vejside</string>
-    <string name="type.amenity.parking_entrance">Parkeringsindkørsel</string>
-    <string name="type.amenity.parking_entrance.private">Privat parkeringsindkørsel</string>
-    <string name="type.amenity.parking_entrance.permissive">Parkeringsindkørsel</string>
-    <string name="type.amenity.parking_space">Parkeringsplads</string>
-    <string name="type.amenity.parking_space.permissive">Parkeringsplads</string>
-    <string name="type.amenity.parking_space.private">Parkeringsplads</string>
-    <string name="type.amenity.parking_space.underground">Parkeringsplads</string>
-    <string name="type.amenity.parking_space.disabled">Handicapparkeringsplads</string>
+    <string name="type.amenity.parking.lane">Gadeparkering</string>
+    <string name="type.amenity.parking.lane.fee">Gadeparkering</string>
+    <string name="type.amenity.parking.lane.private">Privat gadeparkering</string>
+    <string name="type.amenity.parking_entrance">Indkørsel til parkeringshus</string>
+    <string name="type.amenity.parking_entrance.private">Indkørsel til privat parkeringshus</string>
+    <string name="type.amenity.parking_entrance.permissive">Indkørsel til parkeringshus</string>
+    <string name="type.amenity.parking_space">Parkeringsbås</string>
+    <string name="type.amenity.parking_space.permissive">Parkeringsbås</string>
+    <string name="type.amenity.parking_space.private">Parkeringsbås</string>
+    <string name="type.amenity.parking_space.underground">Parkeringsbås</string>
+    <string name="type.amenity.parking_space.disabled">Handicapparkeringsbås</string>
     <string name="type.amenity.payment_terminal">Betalingsautomat</string>
     <string name="type.amenity.pharmacy">Apotek</string>
     <string name="type.amenity.place_of_worship">Tilbedelsessted</string>
@@ -393,7 +393,7 @@
     <string name="type.man_made.bridge">Bro</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.road.tunnel">Tunnel</string>
-    <string name="type.highway.secondary">Sækunder hovedvej</string>
+    <string name="type.highway.secondary">Sekundær hovedvej</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.secondary.bridge">Bro</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
@@ -964,7 +964,7 @@
     <string name="type.shop.curtain">Gardinhandel</string>
     <string name="type.shop.deli">Delikatessebutik</string>
     <string name="type.shop.department_store">Stormagasin</string>
-    <string name="type.shop.doityourself">Isenkræmmer</string>
+    <string name="type.shop.doityourself">Byggemarked</string>
     <string name="type.shop.dry_cleaning">Renseri</string>
     <string name="type.shop.electronics">Elektronikbutik</string>
     <string name="type.shop.erotic">Erotikbutik</string>
@@ -984,7 +984,7 @@
     <string name="type.shop.hearing_aids">Høreapparatbutik</string>
     <string name="type.shop.herbalist">Urtebutik</string>
     <string name="type.shop.hifi">HiFi lyd</string>
-    <string name="type.shop.houseware">Husholdningsartikler butik</string>
+    <string name="type.shop.houseware">Isenkræmmer</string>
     <string name="type.shop.jewelry">Smykkebutik</string>
     <string name="type.shop.kitchen">Køkkenforretning</string>
     <string name="type.shop.laundry">Vaskeri</string>
@@ -993,21 +993,21 @@
     <string name="type.shop.mobile_phone">Mobiltelefonbutik</string>
     <string name="type.shop.money_lender">Pengeudlåner</string>
     <string name="type.shop.motorcycle">Motorcykelforhandler</string>
-    <string name="type.shop.motorcycle_repair">Motorcykel reparation</string>
+    <string name="type.shop.motorcycle_repair">Motorcykelværksted</string>
     <string name="type.shop.music">Pladebutik</string>
-    <string name="type.shop.musical_instrument">Butik med musikinstrumenter</string>
+    <string name="type.shop.musical_instrument">Instrumentbutik</string>
     <string name="type.shop.newsagent">Avis-kiosk</string>
     <string name="type.shop.optician">Optiker</string>
-    <string name="type.shop.outdoor">Fritidsudstyr</string>
+    <string name="type.shop.outdoor">Friluftsbutik</string>
     <string name="type.shop.outpost">Afhentningssted</string>
-    <string name="type.shop.pasta">Pasta butik</string>
+    <string name="type.shop.pasta">Pastabutik</string>
     <string name="type.shop.pastry">Bagværk</string>
     <string name="type.shop.pawnbroker">Pantelåner</string>
     <string name="type.shop.pet">Dyrehandel</string>
     <string name="type.shop.pet_grooming">Kæledyrspleje</string>
     <string name="type.shop.photo">Fotobutik</string>
     <string name="type.shop.rental">Udlejningsbutik</string>
-    <string name="type.shop.rental.bicycle">Cykeludlejningsbutik</string>
+    <string name="type.shop.rental.bicycle">Cykeludlejning</string>
     <string name="type.shop.seafood">Fiskehandler</string>
     <string name="type.shop.second_hand">Genbrugsbutik</string>
     <string name="type.shop.shoes">Skobutik</string>
@@ -1015,7 +1015,7 @@
     <string name="type.shop.stationery">Kontorartikler</string>
     <string name="type.shop.supermarket">Supermarked</string>
     <string name="type.shop.tattoo">Tatovør</string>
-    <string name="type.shop.tea">Tebutik</string>
+    <string name="type.shop.tea">Tehandel</string>
     <string name="type.shop.ticket">Billetkontor</string>
     <string name="type.shop.toys">Legetøjsbutik</string>
     <string name="type.shop.travel_agency">Rejsebureau</string>
@@ -1026,7 +1026,7 @@
     <string name="type.shop.wine">Vinhandel</string>
     <string name="type.shop.agrarian">Landbrugsbutik</string>
     <string name="type.shop.antiques">Antikvitetsbutik</string>
-    <string name="type.shop.appliance">Hvidevarer butik</string>
+    <string name="type.shop.appliance">Hvidevareforretning</string>
     <!-- maybe change to Art Gallery for en-US when supported -->
     <string name="type.shop.art">Kunstbutik</string>
     <string name="type.shop.baby_goods">Børnebutik</string>
@@ -1036,8 +1036,8 @@
     <string name="type.shop.charity">Velgørenhedsbutik</string>
     <string name="type.shop.cheese">Ostebutik</string>
     <string name="type.shop.craft">Kunst og kunsthåndværk</string>
-    <string name="type.shop.dairy">Mejeriprodukter</string>
-    <string name="type.shop.electrical">El-butik</string>
+    <string name="type.shop.dairy">Mejeributik</string>
+    <string name="type.shop.electrical">Elektrikerbutik</string>
     <string name="type.shop.fishing">Fiskeributik</string>
     <string name="type.shop.interior_decoration">Brugskunsthandel</string>
     <string name="type.shop.lottery">Lottobutik</string>
@@ -1058,7 +1058,7 @@
     <string name="type.sport.australian_football">Australsk fodbold</string>
     <string name="type.sport.baseball">Baseball</string>
     <string name="type.sport.basketball">Basketball</string>
-    <string name="type.sport.beachvolleyball">Beachvolley</string>
+    <string name="type.sport.beachvolleyball">Strandvolley</string>
     <string name="type.sport.chess">Skak</string>
     <string name="type.sport.curling">Curling</string>
     <string name="type.sport.equestrian">Ridesport</string>
@@ -1163,7 +1163,7 @@
     <string name="type.highway.bridleway">Ridesti</string>
     <string name="type.highway.elevator">Elevator</string>
     <string name="type.highway.bridleway.permissive">Ridesti</string>
-    <string name="type.amenity.biergarten">Traktørsted</string>
+    <string name="type.amenity.biergarten">Biergarten</string>
     <string name="type.aerialway">Svævebane</string>
     <string name="type.aerialway.cable_car">Kabinelift</string>
     <string name="type.aerialway.drag_lift">Træklift</string>
@@ -1220,7 +1220,7 @@
     <string name="type.cuisine.bubble_tea">Boblete</string>
     <string name="type.barrier.wall">Mur</string>
     <string name="type.cuisine.fish_and_chips">Fish and Chips</string>
-    <string name="type.highway">Hovedvej</string>
+    <string name="type.highway">Vej</string>
     <string name="type.highway.services">Rasteplads</string>
     <string name="type.internet_access">Internet</string>
     <string name="type.internet_access.wlan">Trådløst internet</string>
@@ -1305,7 +1305,7 @@
     <string name="type.railway.subway">Metrolinje</string>
     <string name="type.public_transport.platform">Stoppested</string>
     <string name="type.railway.subway.tunnel">Metrolinjetunnel</string>
-    <string name="type.shop.hardware">Byggemarked</string>
+    <string name="type.shop.hardware">Isenkræmmer</string>
     <string name="type.aerialway.t.bar">Ankerlift</string>
     <string name="type.traffic_calming.bump">Vejbump</string>
     <string name="type.route.ferry">Færgerute</string>
@@ -1389,8 +1389,32 @@
     <string name="type.barrier.wicket_gate">Portlåge</string>
     <string name="type.natural.wetland.reedbed">Rørskov</string>
     <string name="type.shop.lighting">Lysbutik</string>
-    <string name="type.amenity.bench.backless">Rygløs bænk</string>
-    <string name="type.amenity.charging_station.motorcar.small">Opladningspunkt til biler</string>
-    <string name="type.leisure.sports_centre.sport.multi">Sportscenter</string>
-    <string name="type.leisure.sports_centre.sport.american_football">Sportscenter</string>
+    <string name="type.amenity.bench.backless">Bænk</string>
+    <string name="type.amenity.charging_station.motorcar.small">Ladestander til biler</string>
+    <string name="type.leisure.sports_centre.sport.multi">Idrætscenter</string>
+    <string name="type.leisure.sports_centre.sport.american_football">Idrætscenter</string>
+    <string name="type.amenity.car_pooling">Samkørsel</string>
+    <string name="type.shop.telecommunication">Telefonibutik</string>
+    <string name="type.disusedbusiness">Ledig forretning</string>
+    <string name="type.amenity.boat_rental">Bådudlejning</string>
+    <string name="type.man_made.observatory">Observatorium</string>
+    <string name="type.amenity.lounger">Solseng</string>
+    <string name="type.leisure.bandstand">Scenepavillon</string>
+    <string name="type.leisure.indoor_play">Legeland</string>
+    <string name="type.leisure.sports_centre.sport.archery">Bueskydningscenter</string>
+    <string name="type.leisure.sports_centre.sport.athletics">Atletikcenter</string>
+    <string name="type.leisure.sports_centre.sport.baseball">Baseballcenter</string>
+    <string name="type.leisure.sports_centre.sport.badminton">Badmintoncenter</string>
+    <string name="type.leisure.sports_centre.sport.basketball">Basketballcenter</string>
+    <string name="type.leisure.sports_centre.sport.golf">Golfcenter</string>
+    <string name="type.leisure.sports_centre.sport.gymnastics">Gymnastikcenter</string>
+    <string name="type.man_made.telescope">Teleskop</string>
+    <string name="type.man_made.telescope.optical">Teleskop (Optisk)</string>
+    <string name="type.man_made.telescope.radio">Teleskop (Radio)</string>
+    <string name="type.man_made.telescope.gamma">Teleskop (Gamma)</string>
+    <string name="type.leisure.sports_centre.sport.swimming">Svømmehal</string>
+    <string name="type.amenity.food_bank">Fødevarebank</string>
+    <string name="type.amenity.soup_kitchen">Suppekøkken</string>
+    <string name="type.amenity.food_sharing">Fødevarerdeling</string>
+    <string name="type.amenity.give_box">Donationsbøsse</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-nb/types_strings.xml b/android/sdk/src/main/res/values-nb/types_strings.xml
index 36cc432ab..07dbfda51 100644
--- a/android/sdk/src/main/res/values-nb/types_strings.xml
+++ b/android/sdk/src/main/res/values-nb/types_strings.xml
@@ -1363,4 +1363,13 @@
     <string name="type.railway.funicular.tunnel">Kabelbanetunnel</string>
     <string name="type.military">Militært</string>
     <string name="type.landuse.education">Utdanningsinstitusjon</string>
+    <string name="type.man_made.telescope">Teleskop</string>
+    <string name="type.amenity.food_bank">Matsentral</string>
+    <string name="type.man_made.telescope.gamma">Teleskop (Gamma)</string>
+    <string name="type.man_made.telescope.radio">Teleskop (Radio)</string>
+    <string name="type.amenity.soup_kitchen">Suppekjøkken</string>
+    <string name="type.amenity.car_pooling">Samkjøring</string>
+    <string name="type.shop.telecommunication">Telekommunikasjonsbutikk</string>
+    <string name="type.amenity.boat_rental">Båtutleie</string>
+    <string name="type.man_made.observatory">Observatorium</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-pl/types_strings.xml b/android/sdk/src/main/res/values-pl/types_strings.xml
index 472e1f081..db36b4c5e 100644
--- a/android/sdk/src/main/res/values-pl/types_strings.xml
+++ b/android/sdk/src/main/res/values-pl/types_strings.xml
@@ -1435,4 +1435,15 @@
     <string name="type.leisure.sports_centre.sport.yoga">Centrum sportowe</string>
     <string name="type.leisure.fitness_centre.sport.yoga">Studio Jogi</string>
     <string name="type.disusedbusiness">Pusty lokal</string>
+    <string name="type.amenity.boat_rental">Wypożyczalnia łodzi</string>
+    <string name="type.man_made.telescope">Teleskop</string>
+    <string name="type.man_made.telescope.optical">Teleskop optyczny</string>
+    <string name="type.man_made.telescope.radio">Radioteleskop</string>
+    <string name="type.man_made.telescope.gamma">Teleskop (prom. gamma)</string>
+    <string name="type.man_made.observatory">Obserwatorium</string>
+    <string name="type.amenity.car_pooling">Car Pooling</string>
+    <string name="type.shop.telecommunication">Sklep dostawcy usług telekomunikacyjnych</string>
+    <string name="type.amenity.food_bank">Bank żywności</string>
+    <string name="type.amenity.soup_kitchen">Jadłodajnia</string>
+    <string name="type.amenity.food_sharing">Jadłodzielnia</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-sl/types_strings.xml b/android/sdk/src/main/res/values-sl/types_strings.xml
index 32db72bc5..361af82e2 100644
--- a/android/sdk/src/main/res/values-sl/types_strings.xml
+++ b/android/sdk/src/main/res/values-sl/types_strings.xml
@@ -154,4 +154,10 @@
     <string name="type.amenity.charging_station.motorcar.small">Polnilno mesto za avtomobile</string>
     <string name="type.amenity.childcare">Vrtec</string>
     <string name="type.amenity.cinema">Kino</string>
+    <string name="type.amenity.boat_rental">Izposoja čolnov</string>
+    <string name="type.man_made.telescope">Teleskop</string>
+    <string name="type.man_made.telescope.optical">Teleskop (svetlobni)</string>
+    <string name="type.man_made.telescope.radio">Teleskop (radijski)</string>
+    <string name="type.man_made.telescope.gamma">Teleskop (gama žarki)</string>
+    <string name="type.man_made.observatory">Zvezdarna</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-sr/types_strings.xml b/android/sdk/src/main/res/values-sr/types_strings.xml
index b2a04129c..4acc791bf 100644
--- a/android/sdk/src/main/res/values-sr/types_strings.xml
+++ b/android/sdk/src/main/res/values-sr/types_strings.xml
@@ -1230,7 +1230,7 @@
     <string name="type.sport.soccer">Фудбал</string>
     <string name="type.sport.swimming">Пливање</string>
     <string name="type.sport.table_tennis">Стони тенис</string>
-    <string name="type.sport.tennis">Тенис</string>
+    <string name="type.sport.tennis">Тениски терен</string>
     <string name="type.sport.volleyball">Одбојка</string>
     <string name="type.sport.10pin">Куглање</string>
     <string name="type.sport.9pin">Куглање</string>
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings
index 87e12be88..aa12d3d9f 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings
@@ -27,7 +27,7 @@
 "type.amenity.bicycle_parking" = "Cykelparkering";
 "type.amenity.bicycle_rental" = "Cykeludlejning";
 "type.amenity.bicycle_repair_station" = "Cykelreparationsstation";
-"type.amenity.biergarten" = "Traktørsted";
+"type.amenity.biergarten" = "Biergarten";
 "type.amenity.brothel" = "Bordel";
 "type.amenity.bureau_de_change" = "Valutaveksling";
 "type.amenity.bus_station" = "Rutebilstation";
@@ -40,9 +40,9 @@
 "type.amenity.gambling" = "Gambling";
 "type.leisure.adult_gaming_centre" = "Spillehal for voksne";
 "type.leisure.amusement_arcade" = "Arkadespil";
-"type.amenity.charging_station" = "Ladestander";
-"type.amenity.charging_station.bicycle" = "Cykelladestander";
-"type.amenity.charging_station.motorcar" = "Billadestander";
+"type.amenity.charging_station" = "Ladestation";
+"type.amenity.charging_station.bicycle" = "Ladestation til elcykler";
+"type.amenity.charging_station.motorcar" = "Ladestation til elbiler";
 "type.amenity.childcare" = "Vuggestue";
 "type.amenity.cinema" = "Biograf";
 "type.leisure.bowling_alley" = "Bowlinghal";
@@ -99,17 +99,17 @@
 "type.amenity.parking.street_side" = "Parkeringslomme";
 "type.amenity.parking.street_side.fee" = "Parkeringslomme";
 "type.amenity.parking.street_side.private" = "Privat parkeringslomme";
-"type.amenity.parking.lane" = "Parkering i vejside";
-"type.amenity.parking.lane.fee" = "Parkering i vejside";
-"type.amenity.parking.lane.private" = "Privat parkering i vejside";
-"type.amenity.parking_entrance" = "Parkeringsindkørsel";
-"type.amenity.parking_entrance.private" = "Privat parkeringsindkørsel";
-"type.amenity.parking_entrance.permissive" = "Parkeringsindkørsel";
-"type.amenity.parking_space" = "Parkeringsplads";
-"type.amenity.parking_space.permissive" = "Parkeringsplads";
-"type.amenity.parking_space.private" = "Parkeringsplads";
-"type.amenity.parking_space.underground" = "Parkeringsplads";
-"type.amenity.parking_space.disabled" = "Handicapparkeringsplads";
+"type.amenity.parking.lane" = "Gadeparkering";
+"type.amenity.parking.lane.fee" = "Gadeparkering";
+"type.amenity.parking.lane.private" = "Privat gadeparkering";
+"type.amenity.parking_entrance" = "Indkørsel til parkeringshus";
+"type.amenity.parking_entrance.private" = "Indkørsel til privat parkeringshus";
+"type.amenity.parking_entrance.permissive" = "Indkørsel til parkeringshus";
+"type.amenity.parking_space" = "Parkeringsbås";
+"type.amenity.parking_space.permissive" = "Parkeringsbås";
+"type.amenity.parking_space.private" = "Parkeringsbås";
+"type.amenity.parking_space.underground" = "Parkeringsbås";
+"type.amenity.parking_space.disabled" = "Handicapparkeringsbås";
 "type.amenity.payment_terminal" = "Betalingsautomat";
 "type.amenity.pharmacy" = "Apotek";
 "type.amenity.place_of_worship" = "Tilbedelsessted";
@@ -384,7 +384,7 @@
 "type.healthcare.psychotherapist" = "Psykoterapi";
 "type.healthcare.sample_collection" = "Prøvetagning";
 "type.healthcare.speech_therapist" = "Tale terapi";
-"type.highway" = "Hovedvej";
+"type.highway" = "Vej";
 "type.highway.bridleway" = "Ridesti";
 
 /* These translations are used for all type.highway.*.bridge. */
@@ -503,7 +503,7 @@
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.road.tunnel" = "Tunnel";
-"type.highway.secondary" = "Sækunder hovedvej";
+"type.highway.secondary" = "Sekundær hovedvej";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.secondary.bridge" = "Bro";
@@ -1216,7 +1216,7 @@
 "type.shop.curtain" = "Gardinhandel";
 "type.shop.deli" = "Delikatessebutik";
 "type.shop.department_store" = "Stormagasin";
-"type.shop.doityourself" = "Isenkræmmer";
+"type.shop.doityourself" = "Byggemarked";
 "type.shop.dry_cleaning" = "Renseri";
 "type.shop.electronics" = "Elektronikbutik";
 "type.shop.erotic" = "Erotikbutik";
@@ -1232,12 +1232,12 @@
 "type.shop.greengrocer" = "Grønthandler";
 "type.shop.grocery" = "Købmand";
 "type.shop.hairdresser" = "Frisør";
-"type.shop.hardware" = "Byggemarked";
+"type.shop.hardware" = "Isenkræmmer";
 "type.shop.health_food" = "Helsekostbutik";
 "type.shop.hearing_aids" = "Høreapparatbutik";
 "type.shop.herbalist" = "Urtebutik";
 "type.shop.hifi" = "HiFi lyd";
-"type.shop.houseware" = "Husholdningsartikler butik";
+"type.shop.houseware" = "Isenkræmmer";
 "type.shop.jewelry" = "Smykkebutik";
 "type.shop.kiosk" = "Kiosk";
 "type.shop.kitchen" = "Køkkenforretning";
@@ -1247,21 +1247,21 @@
 "type.shop.mobile_phone" = "Mobiltelefonbutik";
 "type.shop.money_lender" = "Pengeudlåner";
 "type.shop.motorcycle" = "Motorcykelforhandler";
-"type.shop.motorcycle_repair" = "Motorcykel reparation";
+"type.shop.motorcycle_repair" = "Motorcykelværksted";
 "type.shop.music" = "Pladebutik";
-"type.shop.musical_instrument" = "Butik med musikinstrumenter";
+"type.shop.musical_instrument" = "Instrumentbutik";
 "type.shop.newsagent" = "Avis-kiosk";
 "type.shop.optician" = "Optiker";
-"type.shop.outdoor" = "Fritidsudstyr";
+"type.shop.outdoor" = "Friluftsbutik";
 "type.shop.outpost" = "Afhentningssted";
-"type.shop.pasta" = "Pasta butik";
+"type.shop.pasta" = "Pastabutik";
 "type.shop.pastry" = "Bagværk";
 "type.shop.pawnbroker" = "Pantelåner";
 "type.shop.pet" = "Dyrehandel";
 "type.shop.pet_grooming" = "Kæledyrspleje";
 "type.shop.photo" = "Fotobutik";
 "type.shop.rental" = "Udlejningsbutik";
-"type.shop.rental.bicycle" = "Cykeludlejningsbutik";
+"type.shop.rental.bicycle" = "Cykeludlejning";
 "type.shop.seafood" = "Fiskehandler";
 "type.shop.second_hand" = "Genbrugsbutik";
 "type.shop.shoes" = "Skobutik";
@@ -1269,7 +1269,7 @@
 "type.shop.stationery" = "Kontorartikler";
 "type.shop.supermarket" = "Supermarked";
 "type.shop.tattoo" = "Tatovør";
-"type.shop.tea" = "Tebutik";
+"type.shop.tea" = "Tehandel";
 "type.shop.ticket" = "Billetkontor";
 "type.shop.toys" = "Legetøjsbutik";
 "type.shop.travel_agency" = "Rejsebureau";
@@ -1280,7 +1280,7 @@
 "type.shop.wine" = "Vinhandel";
 "type.shop.agrarian" = "Landbrugsbutik";
 "type.shop.antiques" = "Antikvitetsbutik";
-"type.shop.appliance" = "Hvidevarer butik";
+"type.shop.appliance" = "Hvidevareforretning";
 
 /* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "Kunstbutik";
@@ -1291,8 +1291,8 @@
 "type.shop.charity" = "Velgørenhedsbutik";
 "type.shop.cheese" = "Ostebutik";
 "type.shop.craft" = "Kunst og kunsthåndværk";
-"type.shop.dairy" = "Mejeriprodukter";
-"type.shop.electrical" = "El-butik";
+"type.shop.dairy" = "Mejeributik";
+"type.shop.electrical" = "Elektrikerbutik";
 "type.shop.fishing" = "Fiskeributik";
 "type.shop.interior_decoration" = "Brugskunsthandel";
 "type.shop.lottery" = "Lottobutik";
@@ -1313,7 +1313,7 @@
 "type.sport.australian_football" = "Australsk fodbold";
 "type.sport.baseball" = "Baseball";
 "type.sport.basketball" = "Basketball";
-"type.sport.beachvolleyball" = "Beachvolley";
+"type.sport.beachvolleyball" = "Strandvolley";
 "type.sport.bowls" = "Bowls";
 "type.sport.chess" = "Skak";
 "type.sport.cricket" = "Cricket";
@@ -1489,7 +1489,31 @@
 "type.power.portal" = "Power Portal";
 "type.building.guardhouse" = "Sikkerhedsbås";
 "type.shop.lighting" = "Lysbutik";
-"type.amenity.charging_station.motorcar.small" = "Opladningspunkt til biler";
-"type.leisure.sports_centre.sport.american_football" = "Sportscenter";
-"type.leisure.sports_centre.sport.multi" = "Sportscenter";
-"type.amenity.bench.backless" = "Rygløs bænk";
+"type.amenity.charging_station.motorcar.small" = "Ladestander til biler";
+"type.leisure.sports_centre.sport.american_football" = "Idrætscenter";
+"type.leisure.sports_centre.sport.multi" = "Idrætscenter";
+"type.amenity.bench.backless" = "Bænk";
+"type.man_made.observatory" = "Observatorium";
+"type.man_made.telescope.optical" = "Teleskop (Optisk)";
+"type.man_made.telescope.radio" = "Teleskop (Radio)";
+"type.amenity.food_sharing" = "Fødevarerdeling";
+"type.amenity.food_bank" = "Fødevarebank";
+"type.amenity.soup_kitchen" = "Suppekøkken";
+"type.man_made.telescope" = "Teleskop";
+"type.amenity.give_box" = "Donationsbøsse";
+"type.man_made.telescope.gamma" = "Teleskop (Gamma)";
+"type.amenity.car_pooling" = "Samkørsel";
+"type.shop.telecommunication" = "Telefonibutik";
+"type.disusedbusiness" = "Ledig forretning";
+"type.amenity.boat_rental" = "Bådudlejning";
+"type.amenity.lounger" = "Solseng";
+"type.leisure.bandstand" = "Scenepavillon";
+"type.leisure.indoor_play" = "Legeland";
+"type.leisure.sports_centre.sport.archery" = "Bueskydningscenter";
+"type.leisure.sports_centre.sport.athletics" = "Atletikcenter";
+"type.leisure.sports_centre.sport.baseball" = "Baseballcenter";
+"type.leisure.sports_centre.sport.badminton" = "Badmintoncenter";
+"type.leisure.sports_centre.sport.basketball" = "Basketballcenter";
+"type.leisure.sports_centre.sport.golf" = "Golfcenter";
+"type.leisure.sports_centre.sport.gymnastics" = "Gymnastikcenter";
+"type.leisure.sports_centre.sport.swimming" = "Svømmehal";
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index cb09da8dd..95bb8e719 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -1099,3 +1099,4 @@
 "offline_explanation_title" = "Offline-kart";
 "avoid_steps" = "Unngå trapper";
 "editor_place_doesnt_exist_description" = "Beskriv hvordan stedet ser ut nå for å sende en feilmelding til OpenStreetMap-fellesskapet";
+"avoid_paved" = "Unngå asfalterte veier";
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings
index cba4741f9..2e8ed1b79 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings
@@ -1525,3 +1525,12 @@
 "type.shop.lighting" = "Lampebutikk";
 "type.leisure.sports_centre.sport.swimming" = "Svømmesenter";
 "type.amenity.bench.backless" = "Benk uten rygg";
+"type.man_made.telescope.radio" = "Teleskop (Radio)";
+"type.amenity.food_bank" = "Matsentral";
+"type.amenity.soup_kitchen" = "Suppekjøkken";
+"type.man_made.telescope" = "Teleskop";
+"type.man_made.telescope.gamma" = "Teleskop (Gamma)";
+"type.amenity.car_pooling" = "Samkjøring";
+"type.man_made.observatory" = "Observatorium";
+"type.shop.telecommunication" = "Telekommunikasjonsbutikk";
+"type.amenity.boat_rental" = "Båtutleie";
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
index e8ed09c8b..39cddf2e3 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -487,7 +487,7 @@
 /* The message when user did not find anything in the search. */
 "search_not_found_query" = "Pobierz region, w którym szukasz lub spróbuj dodać nazwę pobliskiego miasta/wsi.";
 "search_history_title" = "Historia wyszukiwania";
-"search_history_text" = "Uzyskaj szybki dostęp do ostatniego hasła wyszukiwania.";
+"search_history_text" = "Zobacz swoje ostatnie wyszukiwania.";
 "clear_search" = "Wyczyść historię wyszukiwania";
 
 /* Place Page link to Wikipedia article (if map object has it). */
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings
index 6c941db95..2973250b7 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings
@@ -1527,3 +1527,14 @@
 "type.leisure.bandstand" = "Muszla koncertowa";
 "type.disusedbusiness" = "Pusty lokal";
 "type.amenity.lounger" = "Leżak";
+"type.man_made.observatory" = "Obserwatorium";
+"type.man_made.telescope.optical" = "Teleskop optyczny";
+"type.man_made.telescope.radio" = "Radioteleskop";
+"type.man_made.telescope" = "Teleskop";
+"type.man_made.telescope.gamma" = "Teleskop (prom. gamma)";
+"type.amenity.boat_rental" = "Wypożyczalnia łodzi";
+"type.amenity.food_sharing" = "Jadłodzielnia";
+"type.amenity.food_bank" = "Bank żywności";
+"type.amenity.soup_kitchen" = "Jadłodajnia";
+"type.amenity.car_pooling" = "Car Pooling";
+"type.shop.telecommunication" = "Sklep dostawcy usług telekomunikacyjnych";
diff --git a/iphone/Maps/LocalizedStrings/sl.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sl.lproj/LocalizableTypes.strings
index 5d6b1f115..602945e51 100644
--- a/iphone/Maps/LocalizedStrings/sl.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/sl.lproj/LocalizableTypes.strings
@@ -153,3 +153,9 @@
 "type.amenity.love_hotel" = "Hotel za zaljubljence";
 "type.amenity.charging_station.motorcar.small" = "Polnilno mesto za avtomobile";
 "type.amenity.cinema" = "Kino";
+"type.man_made.observatory" = "Zvezdarna";
+"type.man_made.telescope.optical" = "Teleskop (svetlobni)";
+"type.man_made.telescope.radio" = "Teleskop (radijski)";
+"type.man_made.telescope" = "Teleskop";
+"type.man_made.telescope.gamma" = "Teleskop (gama žarki)";
+"type.amenity.boat_rental" = "Izposoja čolnov";