diff --git a/android/res/values-nb/strings.xml b/android/res/values-nb/strings.xml
index 59dc9d6f75..823d3156d0 100644
--- a/android/res/values-nb/strings.xml
+++ b/android/res/values-nb/strings.xml
@@ -664,13 +664,19 @@
 	<string name="splash_subtitle">Kartdata fra OpenStreetMap</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.aerialway.station">Kabelbanestasjon</string>
+	<string name="type.aerialway">Taubane</string>
+	<string name="type.aerialway.cable_car">Pendeltaubane</string>
+	<string name="type.aerialway.chair_lift">Stolheis</string>
+	<string name="type.aerialway.drag_lift">Skitrekk</string>
+	<string name="type.aerialway.gondola">Gondolbane</string>
+	<string name="type.aerialway.mixed_lift">Kombibane</string>
+	<string name="type.aerialway.station">Taubanestasjon</string>
 	<string name="type.aeroway.aerodrome">Flyplass</string>
 	<string name="type.aeroway.aerodrome.international">Flyplass</string>
-	<string name="type.amenity">Rekreasjonsområde</string>
+	<string name="type.amenity">Fasilitet</string>
 	<string name="type.amenity.arts_centre">Kunstsenter</string>
 	<string name="type.amenity.atm">Minibank</string>
-	<string name="type.amenity.bbq">Rasteplasser</string>
+	<string name="type.amenity.bbq">Rasteplass</string>
 	<string name="type.amenity.bench">Benk</string>
 	<string name="type.amenity.bicycle_parking">Sykkelparkering</string>
 	<string name="type.amenity.bicycle_rental">Sykkelutleie</string>
@@ -681,11 +687,11 @@
 	<string name="type.amenity.bus_station">Busstasjon</string>
 	<string name="type.amenity.cafe">Kafé</string>
 	<string name="type.amenity.car_rental">Bilutleie</string>
-	<string name="type.amenity.car_sharing">Kjøre sammen</string>
+	<string name="type.amenity.car_sharing">Bildeling</string>
 	<string name="type.amenity.car_wash">Bilvask</string>
 	<string name="type.amenity.casino">Kasino</string>
 	<string name="type.amenity.charging_station">Ladestasjon</string>
-	<string name="type.amenity.childcare">Førskole</string>
+	<string name="type.amenity.childcare">Daghjem</string>
 	<string name="type.amenity.cinema">Kino</string>
 	<string name="type.amenity.clinic">Klinikk</string>
 	<string name="type.amenity.college">Høyskole</string>
@@ -761,7 +767,7 @@
 	<string name="type.recycling.scrap_metal">Metallavfall</string>
 	<string name="type.recycling.small_appliances">Elektronisk avfall</string>
 	<string name="type.amenity.school">Skole</string>
-	<string name="type.amenity.shelter">Tilfluktsrom</string>
+	<string name="type.amenity.shelter">Ly</string>
 	<string name="type.amenity.shower">Dusj</string>
 	<string name="type.amenity.taxi">Drosje</string>
 	<string name="type.amenity.telephone">Telefon</string>
@@ -774,25 +780,27 @@
 	<string name="type.amenity.vending_machine.parking_tickets">Parkeringsautomat</string>
 	<string name="type.amenity.vending_machine.public_transport_tickets">Billettmaskin for offentlig transport</string>
 	<string name="type.amenity.veterinary">Veterinær</string>
-	<string name="type.amenity.waste_basket">Søppelkasse</string>
-	<string name="type.amenity.waste_disposal">Søppel</string>
+	<string name="type.amenity.waste_basket">Søppelbøtte</string>
+	<string name="type.amenity.waste_disposal">Søppeldunk</string>
 	<string name="type.amenity.water_point">Vannpunkt</string>
+	<string name="type.barrier">Barriere</string>
 	<string name="type.barrier.block">Blokk</string>
 	<string name="type.barrier.bollard">Pullert</string>
 	<string name="type.barrier.border_control">Grensekontroll</string>
-	<string name="type.barrier.city_wall">Bymurer</string>
+	<string name="type.barrier.city_wall">Bymur</string>
 	<string name="type.barrier.ditch">Vollgrav</string>
 	<string name="type.barrier.entrance">Inngangspassasje</string>
+	<string name="type.barrier.fence">Gjerde</string>
 	<string name="type.barrier.gate">Port</string>
 	<string name="type.barrier.kissing_gate">Port</string>
 	<string name="type.barrier.lift_gate">Bom</string>
-	<string name="type.barrier.stile">Sperre</string>
+	<string name="type.barrier.stile">Gjerdeklyver</string>
 	<string name="type.barrier.swing_gate">Bom</string>
 	<string name="type.barrier.toll_booth">Bomstasjon</string>
-	<string name="type.boundary.national_park">Nasonalpark</string>
+	<string name="type.boundary.national_park">Nasjonalpark</string>
 	<string name="type.building">Bygning</string>
 	<string name="type.building.address">Bygning</string>
-	<string name="type.building.garage">Verksted</string>
+	<string name="type.building.garage">Garasje</string>
 	<string name="type.building.has_parts">Bygning</string>
 	<string name="type.building.train_station">Togstasjon</string>
 	<string name="type.cemetery.grave">Grav</string>
@@ -801,7 +809,7 @@
 	<string name="type.craft.blacksmith">Smed</string>
 	<string name="type.craft.brewery">Bryggeri</string>
 	<string name="type.craft.carpenter">Snekker</string>
-	<string name="type.craft.confectionery">Konditor</string>
+	<string name="type.craft.confectionery">Konditori</string>
 	<string name="type.craft.electrician">Elektriker</string>
 	<string name="type.craft.electronics_repair">Elektronikk reparasjon</string>
 	<string name="type.craft.gardener">Anleggsgartner</string>
@@ -839,7 +847,7 @@
 	<string name="type.cuisine.crepe">Crepe</string>
 	<string name="type.cuisine.croatian">Kroatisk mat</string>
 	<string name="type.cuisine.curry">Karri</string>
-	<string name="type.cuisine.deli">Delimat</string>
+	<string name="type.cuisine.deli">Delikatesse</string>
 	<string name="type.cuisine.diner">Middag</string>
 	<string name="type.cuisine.donut">Smultring</string>
 	<string name="type.cuisine.ethiopian">Etiopisk mat</string>
@@ -898,8 +906,8 @@
 	<string name="type.cuisine.tea">Te</string>
 	<string name="type.cuisine.thai">Thaimat</string>
 	<string name="type.cuisine.turkish">Tyrkisk mat</string>
-	<string name="type.cuisine.vegan">Veganermat</string>
-	<string name="type.cuisine.vegetarian">Vegetar mat</string>
+	<string name="type.cuisine.vegan">Vegansk</string>
+	<string name="type.cuisine.vegetarian">Vegetarisk</string>
 	<string name="type.cuisine.vietnamese">Vietnamesisk mat</string>
 	<string name="type.emergency.defibrillator">Hjertestarter</string>
 	<string name="type.emergency.fire_hydrant">Brannhydrant</string>
@@ -909,51 +917,55 @@
 	<string name="type.healthcare.physiotherapist">Fysioterapeut</string>
 
 	<!-- SECTION: Types: Roads -->
+	<string name="type.highway.bridleway">Ridevei</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.bridleway.bridge">Bridge</string>
+	<string name="type.highway.bridleway.bridge">Bru</string>
+	<string name="type.highway.bridleway.permissive">Ridevei</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.bridleway.tunnel">Tunnel</string>
 	<string name="type.highway.bus_stop">Busstopp</string>
 	<string name="type.highway.construction">Veikonstruksjon</string>
+	<string name="type.highway.cycleway">Sykkelvei</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.cycleway.bridge">Bridge</string>
+	<string name="type.highway.cycleway.bridge">Bru</string>
+	<string name="type.highway.cycleway.permissive">Sykkelvei</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.cycleway.tunnel">Tunnel</string>
-	<string name="type.highway.footway">Sti</string>
+	<string name="type.highway.footway">Gangvei</string>
 	<string name="type.highway.footway.alpine_hiking">Sti</string>
-	<string name="type.highway.footway.area">Sti</string>
+	<string name="type.highway.footway.area">Gangvei</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.footway.bridge">Bridge</string>
+	<string name="type.highway.footway.bridge">Bru</string>
 	<string name="type.highway.footway.demanding_alpine_hiking">Sti</string>
 	<string name="type.highway.footway.demanding_mountain_hiking">Sti</string>
 	<string name="type.highway.footway.difficult_alpine_hiking">Sti</string>
 	<string name="type.highway.footway.hiking">Sti</string>
 	<string name="type.highway.footway.mountain_hiking">Sti</string>
-	<string name="type.highway.footway.permissive">Sti</string>
+	<string name="type.highway.footway.permissive">Gangvei</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">Tunnel</string>
 	<string name="type.highway.ford">Vadested</string>
 	<string name="type.highway.living_street">Gate</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.living_street.bridge">Bridge</string>
+	<string name="type.highway.living_street.bridge">Bru</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.living_street.tunnel">Tunnel</string>
-	<string name="type.highway.motorway">Gate</string>
+	<string name="type.highway.motorway">Motorvei</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.motorway.bridge">Bridge</string>
+	<string name="type.highway.motorway.bridge">Bru</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway.tunnel">Tunnel</string>
-	<string name="type.highway.motorway_junction">Utgang</string>
-	<string name="type.highway.motorway_link">Gate</string>
+	<string name="type.highway.motorway_junction">Avkjørsel</string>
+	<string name="type.highway.motorway_link">Motorvei</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.motorway_link.bridge">Bridge</string>
+	<string name="type.highway.motorway_link.bridge">Bru</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">Tunnel</string>
 	<string name="type.highway.path">Sti</string>
 	<string name="type.highway.path.alpine_hiking">Sti</string>
 	<string name="type.highway.path.bicycle">Sti</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.path.bridge">Bridge</string>
+	<string name="type.highway.path.bridge">Bru</string>
 	<string name="type.highway.path.demanding_alpine_hiking">Sti</string>
 	<string name="type.highway.path.demanding_mountain_hiking">Sti</string>
 	<string name="type.highway.path.difficult_alpine_hiking">Sti</string>
@@ -963,119 +975,120 @@
 	<string name="type.highway.path.permissive">Sti</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">Tunnel</string>
-	<string name="type.highway.pedestrian">Gate</string>
-	<string name="type.highway.pedestrian.area">Gate</string>
+	<string name="type.highway.pedestrian">Gågate</string>
+	<string name="type.highway.pedestrian.area">Gågate</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.pedestrian.bridge">Bridge</string>
+	<string name="type.highway.pedestrian.bridge">Bru</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.pedestrian.tunnel">Tunnel</string>
-	<string name="type.highway.primary">Gate</string>
+	<string name="type.highway.primary">Hovedvei</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.primary.bridge">Bridge</string>
+	<string name="type.highway.primary.bridge">Bru</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.primary.tunnel">Tunnel</string>
-	<string name="type.highway.primary_link">Gate</string>
+	<string name="type.highway.primary_link">Hovedvei</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.primary_link.bridge">Bridge</string>
+	<string name="type.highway.primary_link.bridge">Bru</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.primary_link.tunnel">Tunnel</string>
 	<string name="type.highway.raceway">Løpebane</string>
 	<string name="type.highway.residential">Gate</string>
 	<string name="type.highway.residential.area">Gate</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.residential.bridge">Bridge</string>
+	<string name="type.highway.residential.bridge">Bru</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.residential.tunnel">Tunnel</string>
 	<string name="type.highway.rest_area">Rasteplass</string>
-	<string name="type.highway.road">Gate</string>
+	<string name="type.highway.road">Vei</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.road.bridge">Bridge</string>
+	<string name="type.highway.road.bridge">Bru</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.road.tunnel">Tunnel</string>
-	<string name="type.highway.secondary">Gate</string>
+	<string name="type.highway.secondary">Sekundærvei</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.secondary.bridge">Bridge</string>
+	<string name="type.highway.secondary.bridge">Bru</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.secondary.tunnel">Tunnel</string>
-	<string name="type.highway.secondary_link">Gate</string>
+	<string name="type.highway.secondary_link">Sekundærvei</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.secondary_link.bridge">Bridge</string>
+	<string name="type.highway.secondary_link.bridge">Bru</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.secondary_link.tunnel">Tunnel</string>
-	<string name="type.highway.service">Gate</string>
-	<string name="type.highway.service.area">Gate</string>
+	<string name="type.highway.service">Service-vei</string>
+	<string name="type.highway.service.area">Service-vei</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.service.bridge">Bridge</string>
-	<string name="type.highway.service.driveway">Gate</string>
-	<string name="type.highway.service.parking_aisle">Gate</string>
+	<string name="type.highway.service.bridge">Bru</string>
+	<string name="type.highway.service.driveway">Service-vei</string>
+	<string name="type.highway.service.parking_aisle">Service-vei</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.service.tunnel">Tunnel</string>
 	<string name="type.highway.speed_camera">Fotoboks</string>
-	<string name="type.highway.steps">Sti</string>
+	<string name="type.highway.steps">Trapper</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.steps.bridge">Bridge</string>
+	<string name="type.highway.steps.bridge">Bru</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.steps.tunnel">Tunnel</string>
-	<string name="type.highway.tertiary">Gate</string>
+	<string name="type.highway.tertiary">Tertiærvei</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.tertiary.bridge">Bridge</string>
+	<string name="type.highway.tertiary.bridge">Bru</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.tertiary.tunnel">Tunnel</string>
-	<string name="type.highway.tertiary_link">Gate</string>
+	<string name="type.highway.tertiary_link">Tertiærvei</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.tertiary_link.bridge">Bridge</string>
+	<string name="type.highway.tertiary_link.bridge">Bru</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.tertiary_link.tunnel">Tunnel</string>
-	<string name="type.highway.track">Gate</string>
-	<string name="type.highway.track.area">Gate</string>
+	<string name="type.highway.track">Traktor/Skogsbilvei</string>
+	<string name="type.highway.track.area">Traktor/Skogsbilvei</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.track.bridge">Bridge</string>
-	<string name="type.highway.track.grade1">Gate</string>
-	<string name="type.highway.track.grade2">Gate</string>
-	<string name="type.highway.track.grade3">Gate</string>
-	<string name="type.highway.track.grade4">Gate</string>
-	<string name="type.highway.track.grade5">Gate</string>
-	<string name="type.highway.track.no.access">Gate</string>
-	<string name="type.highway.track.permissive">Gate</string>
+	<string name="type.highway.track.bridge">Bru</string>
+	<string name="type.highway.track.grade1">Traktor/Skogsbilvei</string>
+	<string name="type.highway.track.grade2">Traktor/Skogsbilvei</string>
+	<string name="type.highway.track.grade3">Traktor/Skogsbilvei</string>
+	<string name="type.highway.track.grade4">Traktor/Skogsbilvei</string>
+	<string name="type.highway.track.grade5">Traktor/Skogsbilvei</string>
+	<string name="type.highway.track.no.access">Traktor/Skogsbilvei</string>
+	<string name="type.highway.track.permissive">Traktor/Skogsbilvei</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">Tunnel</string>
 	<string name="type.highway.traffic_signals">Trafikklys</string>
-	<string name="type.highway.trunk">Gate</string>
+	<string name="type.highway.trunk">Riksvei</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.trunk.bridge">Bridge</string>
+	<string name="type.highway.trunk.bridge">Bru</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.trunk.tunnel">Tunnel</string>
-	<string name="type.highway.trunk_link">Gate</string>
+	<string name="type.highway.trunk_link">Riksvei</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.trunk_link.bridge">Bridge</string>
+	<string name="type.highway.trunk_link.bridge">Bru</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.trunk_link.tunnel">Tunnel</string>
-	<string name="type.highway.unclassified">Gate</string>
-	<string name="type.highway.unclassified.area">Gate</string>
+	<string name="type.highway.unclassified">Småvei</string>
+	<string name="type.highway.unclassified.area">Småvei</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.unclassified.bridge">Bridge</string>
+	<string name="type.highway.unclassified.bridge">Bru</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.unclassified.tunnel">Tunnel</string>
-	<string name="type.area_highway.footway">Sti</string>
+	<string name="type.area_highway.cycleway">Sykkelvei</string>
+	<string name="type.area_highway.footway">Gangvei</string>
 	<string name="type.area_highway.living_street">Gate</string>
-	<string name="type.area_highway.motorway">Gate</string>
+	<string name="type.area_highway.motorway">Motorvei</string>
 	<string name="type.area_highway.path">Sti</string>
-	<string name="type.area_highway.pedestrian">Gate</string>
-	<string name="type.area_highway.primary">Gate</string>
+	<string name="type.area_highway.pedestrian">Gågate</string>
+	<string name="type.area_highway.primary">Hovedvei</string>
 	<string name="type.area_highway.residential">Gate</string>
-	<string name="type.area_highway.secondary">Gate</string>
-	<string name="type.area_highway.service">Gate</string>
-	<string name="type.area_highway.tertiary">Gate</string>
-	<string name="type.area_highway.steps">Sti</string>
-	<string name="type.area_highway.track">Gate</string>
-	<string name="type.area_highway.trunk">Gate</string>
-	<string name="type.area_highway.unclassified">Gate</string>
+	<string name="type.area_highway.secondary">Sekundærvei</string>
+	<string name="type.area_highway.service">Service-vei</string>
+	<string name="type.area_highway.tertiary">Tertiærvei</string>
+	<string name="type.area_highway.steps">Trapper</string>
+	<string name="type.area_highway.track">Traktor/Skogsbilvei</string>
+	<string name="type.area_highway.trunk">Riksvei</string>
+	<string name="type.area_highway.unclassified">Småvei</string>
 
 	<!-- SECTION: Types: Historic -->
 	<string name="type.historic">Historisk gjenstand</string>
 	<string name="type.historic.archaeological_site">Arkeologisk område</string>
 	<string name="type.historic.battlefield">Slagmarken</string>
-	<string name="type.historic.boundary_stone">Grensemerke</string>
+	<string name="type.historic.boundary_stone">Grensestein</string>
 	<string name="type.historic.castle">Borg</string>
 	<string name="type.historic.castle.castrum">Romersk fort</string>
 	<string name="type.historic.castle.defensive">Borg</string>
@@ -1088,23 +1101,23 @@
 	<string name="type.historic.castle.shiro">Japanske borger</string>
 	<string name="type.historic.castle.stately">Slott</string>
 	<string name="type.historic.city_gate">Byport</string>
-	<string name="type.historic.citywalls">Bymurer</string>
+	<string name="type.historic.citywalls">Bymur</string>
 	<string name="type.historic.fort">Fort</string>
 	<string name="type.historic.gallows">Galge</string>
 	<string name="type.historic.memorial">Minnesmerke</string>
 	<string name="type.historic.memorial.cross">Minnekors</string>
-	<string name="type.historic.memorial.plaque">Minnesmerke</string>
-	<string name="type.historic.memorial.sculpture">Minnesmerke</string>
-	<string name="type.historic.memorial.statue">Minnesmerke</string>
+	<string name="type.historic.memorial.plaque">Minneplakett</string>
+	<string name="type.historic.memorial.sculpture">Skulptur</string>
+	<string name="type.historic.memorial.statue">Statue</string>
 	<string name="type.historic.memorial.stolperstein">Snublesteiner</string>
 	<string name="type.historic.memorial.war_memorial">Krigsminnesmerke</string>
-	<string name="type.historic.pillory">Pilry</string>
+	<string name="type.historic.pillory">Gapestokk</string>
 	<string name="type.historic.ruins">Ruiner</string>
-	<string name="type.historic.ship">Severdigheter</string>
-	<string name="type.historic.tomb">Severdigheter</string>
+	<string name="type.historic.ship">Skip</string>
+	<string name="type.historic.tomb">Grav</string>
 	<string name="type.historic.wayside_cross">Veikantkors</string>
 	<string name="type.historic.wayside_shrine">Helligdom ved veikanten</string>
-	<string name="type.landuse.basin">Vannvask</string>
+	<string name="type.landuse.basin">Basseng</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.landuse.cemetery">Gravplass</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. -->
@@ -1112,8 +1125,8 @@
 	<string name="type.landuse.churchyard">Kirkegård</string>
 	<string name="type.landuse.farmland">Jordbruksområde</string>
 	<string name="type.landuse.forest">Skog</string>
-	<string name="type.landuse.forest.coniferous">Skog</string>
-	<string name="type.landuse.forest.deciduous">Skog</string>
+	<string name="type.landuse.forest.coniferous">Barskog</string>
+	<string name="type.landuse.forest.deciduous">Løvskog</string>
 	<string name="type.landuse.forest.mixed">Skog</string>
 	<string name="type.landuse.grass">Plen</string>
 	<string name="type.landuse.landfill">Land-deponi</string>
@@ -1121,18 +1134,18 @@
 	<string name="type.landuse.reservoir">Vann</string>
 	<string name="type.leisure.dog_park">Hundeområde</string>
 	<string name="type.leisure.fitness_centre">Treningssenter</string>
-	<string name="type.leisure.fitness_station">Treningssenter</string>
+	<string name="type.leisure.fitness_station">Treningsstasjon</string>
 	<string name="type.leisure.dance">Dansesal</string>
 	<string name="type.leisure.garden">Hage</string>
 	<string name="type.leisure.garden.residential">Hage</string>
 	<string name="type.leisure.golf_course">Golfbane</string>
-	<string name="type.leisure.nature_reserve">Reservat</string>
+	<string name="type.leisure.nature_reserve">Naturreservat</string>
 	<string name="type.leisure.park">Park</string>
 	<string name="type.leisure.park.no.access">Park</string>
 	<string name="type.leisure.park.permissive">Park</string>
 	<string name="type.leisure.park.private">Park</string>
 	<string name="type.leisure.picnic_table">Piknikbord</string>
-	<string name="type.leisure.pitch">Sportssenter</string>
+	<string name="type.leisure.pitch">Idrettsplass</string>
 	<string name="type.leisure.playground">Lekeplass</string>
 	<string name="type.leisure.sauna">Badstue</string>
 	<string name="type.leisure.sports_centre">Sportssenter</string>
@@ -1159,35 +1172,35 @@
 	<string name="type.natural.cape">Kapp</string>
 	<string name="type.natural.cave_entrance">Grotte</string>
 	<string name="type.natural.cliff">Klippe</string>
-	<string name="type.natural.earth_bank">Klippe</string>
+	<string name="type.natural.earth_bank">Jordbanke</string>
 	<string name="type.man_made.embankment">Fylling</string>
 	<string name="type.natural.coastline">Kyst</string>
 	<string name="type.natural.desert">Ørken</string>
-	<string name="type.natural.geyser">Gaysir</string>
+	<string name="type.natural.geyser">Geysir</string>
 	<string name="type.natural.glacier">Isbre</string>
 	<string name="type.natural.grassland">Sletteland</string>
-	<string name="type.natural.heath">Heath</string>
+	<string name="type.natural.heath">Hei</string>
 	<string name="type.natural.hot_spring">Varm kilde</string>
 	<string name="type.natural.water.lake">Innsjø</string>
 	<string name="type.natural.water.lock">Låsekammer</string>
 	<string name="type.natural.water.pond">Dam</string>
 	<string name="type.natural.water.reservoir">Reservoar</string>
-	<string name="type.natural.water.basin">Vannvask</string>
+	<string name="type.natural.water.basin">Basseng</string>
 	<string name="type.natural.water.river">Elv</string>
 	<string name="type.natural.land">Land</string>
 	<string name="type.natural.meadow">Eng</string>
 	<string name="type.natural.orchard">Frukthage</string>
-	<string name="type.natural.peak">Høydepunkt</string>
+	<string name="type.natural.peak">Topp</string>
 	<string name="type.natural.saddle">Fjellsadel</string>
-	<string name="type.natural.rock">Bergart</string>
-	<string name="type.natural.scrub">Myr</string>
-	<string name="type.natural.spring">Vår</string>
+	<string name="type.natural.rock">Fjell</string>
+	<string name="type.natural.scrub">Kratt</string>
+	<string name="type.natural.spring">Kilde</string>
 	<string name="type.natural.strait">Sund</string>
 	<string name="type.natural.tree">Tre</string>
 	<string name="type.natural.tree_row">Trerekke</string>
 	<string name="type.natural.vineyard">Vingård</string>
 	<string name="type.natural.volcano">Vulkan</string>
-	<string name="type.natural.water">Vassmasse</string>
+	<string name="type.natural.water">Vann</string>
 	<string name="type.natural.wetland">Våtmarksområde</string>
 	<string name="type.natural.wetland.bog">Myr</string>
 	<string name="type.natural.wetland.marsh">Sump</string>
@@ -1218,8 +1231,8 @@
 	<string name="type.place.hamlet">Landsby</string>
 	<string name="type.place.island">Øy</string>
 	<string name="type.place.islet">Øy</string>
-	<string name="type.place.isolated_dwelling">Isolert bolig</string>
-	<string name="type.place.locality">Lokalitet</string>
+	<string name="type.place.isolated_dwelling">Isolert bosetting</string>
+	<string name="type.place.locality">Sted</string>
 	<string name="type.place.neighbourhood">Strøk</string>
 	<string name="type.place.ocean">Hav</string>
 	<string name="type.place.region">Region</string>
@@ -1233,9 +1246,14 @@
 	<string name="type.power.pole">Strømmast</string>
 	<string name="type.power.substation">Trafo</string>
 	<string name="type.power.tower">Strømmast</string>
+	<string name="type.public_transport">Offentlig transport</string>
+	<string name="type.railway">Jernbane</string>
 	<string name="type.railway.halt">Togstasjon</string>
 	<string name="type.railway.level_crossing">Planovergang</string>
 	<string name="type.railway.monorail">Monorail</string>
+	<string name="type.railway.narrow_gauge">Smalsporet jernbane</string>
+	<string name="type.railway.platform">Jernbaneplattform</string>
+	<string name="type.railway.preserved">Museumsjernbane</string>
 	<string name="type.railway.rail">Toglinje</string>
 	<string name="type.railway.station">Togstasjon</string>
 	<string name="type.railway.station.light_rail">Togstasjon</string>
@@ -1500,20 +1518,20 @@
 	<string name="type.shop.health_food">Helsekostbutikk</string>
 	<string name="type.shop.houseware">Husholdningsbutikk</string>
 	<string name="type.shop.jewelry">Gullsmed</string>
-	<string name="type.shop.kiosk">Butikk</string>
+	<string name="type.shop.kiosk">Kiosk</string>
 	<string name="type.shop.kitchen">Kjøkkenbutikk</string>
 	<string name="type.shop.laundry">Vaskeri</string>
-	<string name="type.shop.mall">Kjøpesenteret</string>
+	<string name="type.shop.mall">Kjøpesenter</string>
 	<string name="type.shop.massage">Massasjesalong</string>
 	<string name="type.shop.mobile_phone">Mobiltelefonbutikk</string>
 	<string name="type.shop.money_lender">Butikk</string>
 	<string name="type.shop.motorcycle">Motorsykkelforretning</string>
-	<string name="type.shop.music">Butikk</string>
-	<string name="type.shop.musical_instrument">Butikk</string>
+	<string name="type.shop.music">Platebutikk</string>
+	<string name="type.shop.musical_instrument">Musikkinstrumenter</string>
 	<string name="type.shop.newsagent">Aviskiosk</string>
 	<string name="type.shop.optician">Optiker</string>
 	<string name="type.shop.outdoor">Fritidsutstyr</string>
-	<string name="type.shop.pastry">Kake</string>
+	<string name="type.shop.pastry">Bakverk</string>
 	<string name="type.shop.pawnbroker">Pantelåner</string>
 	<string name="type.shop.pet">Dyrebutikk</string>
 	<string name="type.shop.photo">Fotobutikk</string>
@@ -1521,12 +1539,12 @@
 	<string name="type.shop.second_hand">Bruktbutikk</string>
 	<string name="type.shop.shoes">Skobutikk</string>
 	<string name="type.shop.sports">Sportsutstyr</string>
-	<string name="type.shop.stationery">Bokhandel</string>
+	<string name="type.shop.stationery">Kontorrekvisita</string>
 	<string name="type.shop.supermarket">Supermarked</string>
 	<string name="type.shop.tattoo">Tatovør</string>
-	<string name="type.shop.tea">Butikk</string>
+	<string name="type.shop.tea">Tebutikk</string>
 	<string name="type.shop.ticket">Billettkontor</string>
-	<string name="type.shop.toys">Legebutikk</string>
+	<string name="type.shop.toys">Leketøybutikk</string>
 	<string name="type.shop.travel_agency">Reisebyrå</string>
 	<string name="type.shop.tyres">Dekkforretning</string>
 	<string name="type.shop.variety_store">Billigbutikk</string>
@@ -1551,7 +1569,7 @@
 	<string name="type.shop.paint">Maling</string>
 	<string name="type.shop.perfumery">Parfymeri</string>
 	<string name="type.shop.sewing">Syutstyr</string>
-	<string name="type.shop.storage_rental">Utleie av lager</string>
+	<string name="type.shop.storage_rental">Lagerutleie</string>
 	<string name="type.shop.tobacco">Tobakk</string>
 	<string name="type.shop.trade">Handler rekvisita</string>
 	<string name="type.shop.watches">Klokker</string>
@@ -1591,6 +1609,7 @@
 	<string name="type.sport.field_hockey">Landhockey</string>
 	<string name="type.sport.badminton">Badminton</string>
 	<string name="type.sport.pelota">Baskisk pelota</string>
+	<string name="type.tourism">Turisme</string>
 	<string name="type.tourism.alpine_hut">Fjellstue</string>
 	<string name="type.tourism.apartment">Leiligheter</string>
 	<string name="type.tourism.artwork">Kunstverk</string>
@@ -1601,9 +1620,9 @@
 	<string name="type.tourism.attraction">Attraksjon</string>
 	<string name="type.tourism.attraction.animal">Attraksjon</string>
 	<string name="type.tourism.attraction.specified">Attraksjon</string>
-	<string name="type.tourism.camp_site">Overnatting i bobiler</string>
+	<string name="type.tourism.camp_site">Campingplass</string>
 	<string name="type.tourism.caravan_site">Camping</string>
-	<string name="type.tourism.gallery">Severdigheter</string>
+	<string name="type.tourism.gallery">Galleri</string>
 	<string name="type.tourism.guest_house">Gjestehus</string>
 	<string name="type.tourism.hostel">Vandrerhjem</string>
 	<string name="type.tourism.hotel">Hotell</string>
@@ -1615,7 +1634,7 @@
 	<string name="type.tourism.motel">Motell</string>
 	<string name="type.tourism.picnic_site">Rasteplasser</string>
 	<string name="type.tourism.resort">Ferieresort</string>
-	<string name="type.tourism.theme_park">Severdigheter</string>
+	<string name="type.tourism.theme_park">Temapark</string>
 	<string name="type.tourism.viewpoint">Utsiktspunkt</string>
 	<string name="type.tourism.wilderness_hut">Villmarkshytte</string>
 	<string name="type.tourism.zoo">Dyrehage</string>
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index 803184ad1b..c833b19f7c 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -1230,19 +1230,19 @@
 
 /********** Types **********/
 
-"type.aerialway" = "Aerialway";
+"type.aerialway" = "Taubane";
 
-"type.aerialway.cable_car" = "Cable car";
+"type.aerialway.cable_car" = "Pendeltaubane";
 
-"type.aerialway.chair_lift" = "Chair lift";
+"type.aerialway.chair_lift" = "Stolheis";
 
-"type.aerialway.drag_lift" = "Drag lift";
+"type.aerialway.drag_lift" = "Skitrekk";
 
-"type.aerialway.gondola" = "Gondola";
+"type.aerialway.gondola" = "Gondolbane";
 
-"type.aerialway.mixed_lift" = "Mixed lift";
+"type.aerialway.mixed_lift" = "Kombibane";
 
-"type.aerialway.station" = "Kabelbanestasjon";
+"type.aerialway.station" = "Taubanestasjon";
 
 "type.aeroway" = "Airspace Infrastructure";
 
@@ -1262,7 +1262,7 @@
 
 "type.aeroway.terminal" = "Terminal";
 
-"type.amenity" = "Rekreasjonsområde";
+"type.amenity" = "Fasilitet";
 
 "type.amenity.arts_centre" = "Kunstsenter";
 
@@ -1272,7 +1272,7 @@
 
 "type.amenity.bar" = "Bar";
 
-"type.amenity.bbq" = "Rasteplasser";
+"type.amenity.bbq" = "Rasteplass";
 
 "type.amenity.bench" = "Benk";
 
@@ -1294,7 +1294,7 @@
 
 "type.amenity.car_rental" = "Bilutleie";
 
-"type.amenity.car_sharing" = "Kjøre sammen";
+"type.amenity.car_sharing" = "Bildeling";
 
 "type.amenity.car_wash" = "Bilvask";
 
@@ -1302,7 +1302,7 @@
 
 "type.amenity.charging_station" = "Ladestasjon";
 
-"type.amenity.childcare" = "Førskole";
+"type.amenity.childcare" = "Daghjem";
 
 "type.amenity.cinema" = "Kino";
 
@@ -1471,7 +1471,7 @@
 
 "type.amenity.school" = "Skole";
 
-"type.amenity.shelter" = "Tilfluktsrom";
+"type.amenity.shelter" = "Ly";
 
 "type.amenity.shower" = "Dusj";
 
@@ -1515,15 +1515,15 @@
 
 "type.amenity.veterinary" = "Veterinær";
 
-"type.amenity.waste_basket" = "Søppelkasse";
+"type.amenity.waste_basket" = "Søppelbøtte";
 
-"type.amenity.waste_disposal" = "Søppel";
+"type.amenity.waste_disposal" = "Søppeldunk";
 
 "type.amenity.waste_transfer_station" = "Waste Transfer Station";
 
 "type.amenity.water_point" = "Vannpunkt";
 
-"type.barrier" = "Barrier";
+"type.barrier" = "Barriere";
 
 "type.barrier.block" = "Blokk";
 
@@ -1533,7 +1533,7 @@
 
 "type.barrier.chain" = "Chain";
 
-"type.barrier.city_wall" = "Bymurer";
+"type.barrier.city_wall" = "Bymur";
 
 "type.barrier.cycle_barrier" = "Cycle Barrier";
 
@@ -1541,7 +1541,7 @@
 
 "type.barrier.entrance" = "Inngangspassasje";
 
-"type.barrier.fence" = "Fence";
+"type.barrier.fence" = "Gjerde";
 
 "type.barrier.gate" = "Port";
 
@@ -1553,7 +1553,7 @@
 
 "type.barrier.retaining_wall" = "Retaining Wall";
 
-"type.barrier.stile" = "Sperre";
+"type.barrier.stile" = "Gjerdeklyver";
 
 "type.barrier.swing_gate" = "Bom";
 
@@ -1601,13 +1601,13 @@
 
 "type.boundary.administrative.suburb" = "Suburb Boundary";
 
-"type.boundary.national_park" = "Nasonalpark";
+"type.boundary.national_park" = "Nasjonalpark";
 
 "type.building" = "Bygning";
 
 "type.building.address" = "Bygning";
 
-"type.building.garage" = "Verksted";
+"type.building.garage" = "Garasje";
 
 "type.building.has_parts" = "Bygning";
 
@@ -1627,7 +1627,7 @@
 
 "type.craft.carpenter" = "Snekker";
 
-"type.craft.confectionery" = "Konditor";
+"type.craft.confectionery" = "Konditori";
 
 "type.craft.electrician" = "Elektriker";
 
@@ -1704,7 +1704,7 @@
 
 "type.cuisine.curry" = "Karri";
 
-"type.cuisine.deli" = "Delimat";
+"type.cuisine.deli" = "Delikatesse";
 
 "type.cuisine.diner" = "Middag";
 
@@ -1822,9 +1822,9 @@
 
 "type.cuisine.turkish" = "Tyrkisk mat";
 
-"type.cuisine.vegan" = "Veganermat";
+"type.cuisine.vegan" = "Vegansk";
 
-"type.cuisine.vegetarian" = "Vegetar mat";
+"type.cuisine.vegetarian" = "Vegetarisk";
 
 "type.cuisine.vietnamese" = "Vietnamesisk mat";
 
@@ -1847,12 +1847,12 @@
 
 "type.highway" = "Highway";
 
-"type.highway.bridleway" = "Bridle Path";
+"type.highway.bridleway" = "Ridevei";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.bridleway.bridge" = "Bridge";
+"type.highway.bridleway.bridge" = "Bru";
 
-"type.highway.bridleway.permissive" = "Bridle Path";
+"type.highway.bridleway.permissive" = "Ridevei";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.bridleway.tunnel" = "Tunnel";
@@ -1861,26 +1861,26 @@
 
 "type.highway.construction" = "Veikonstruksjon";
 
-"type.highway.cycleway" = "Cycle Path";
+"type.highway.cycleway" = "Sykkelvei";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.cycleway.bridge" = "Bridge";
+"type.highway.cycleway.bridge" = "Bru";
 
-"type.highway.cycleway.permissive" = "Cycle Path";
+"type.highway.cycleway.permissive" = "Sykkelvei";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.cycleway.tunnel" = "Tunnel";
 
 "type.highway.elevator" = "Elevator";
 
-"type.highway.footway" = "Sti";
+"type.highway.footway" = "Gangvei";
 
 "type.highway.footway.alpine_hiking" = "Sti";
 
-"type.highway.footway.area" = "Sti";
+"type.highway.footway.area" = "Gangvei";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.footway.bridge" = "Bridge";
+"type.highway.footway.bridge" = "Bru";
 
 "type.highway.footway.demanding_alpine_hiking" = "Sti";
 
@@ -1892,7 +1892,7 @@
 
 "type.highway.footway.mountain_hiking" = "Sti";
 
-"type.highway.footway.permissive" = "Sti";
+"type.highway.footway.permissive" = "Gangvei";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Tunnel";
@@ -1902,25 +1902,25 @@
 "type.highway.living_street" = "Gate";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.living_street.bridge" = "Bridge";
+"type.highway.living_street.bridge" = "Bru";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.living_street.tunnel" = "Tunnel";
 
-"type.highway.motorway" = "Gate";
+"type.highway.motorway" = "Motorvei";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.motorway.bridge" = "Bridge";
+"type.highway.motorway.bridge" = "Bru";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.motorway.tunnel" = "Tunnel";
 
-"type.highway.motorway_junction" = "Utgang";
+"type.highway.motorway_junction" = "Avkjørsel";
 
-"type.highway.motorway_link" = "Gate";
+"type.highway.motorway_link" = "Motorvei";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.motorway_link.bridge" = "Bridge";
+"type.highway.motorway_link.bridge" = "Bru";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.motorway_link.tunnel" = "Tunnel";
@@ -1932,7 +1932,7 @@
 "type.highway.path.bicycle" = "Sti";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.path.bridge" = "Bridge";
+"type.highway.path.bridge" = "Bru";
 
 "type.highway.path.demanding_alpine_hiking" = "Sti";
 
@@ -1951,28 +1951,28 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Tunnel";
 
-"type.highway.pedestrian" = "Gate";
+"type.highway.pedestrian" = "Gågate";
 
-"type.highway.pedestrian.area" = "Gate";
+"type.highway.pedestrian.area" = "Gågate";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.pedestrian.bridge" = "Bridge";
+"type.highway.pedestrian.bridge" = "Bru";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.pedestrian.tunnel" = "Tunnel";
 
-"type.highway.primary" = "Gate";
+"type.highway.primary" = "Hovedvei";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.primary.bridge" = "Bridge";
+"type.highway.primary.bridge" = "Bru";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.primary.tunnel" = "Tunnel";
 
-"type.highway.primary_link" = "Gate";
+"type.highway.primary_link" = "Hovedvei";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.primary_link.bridge" = "Bridge";
+"type.highway.primary_link.bridge" = "Bru";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.primary_link.tunnel" = "Tunnel";
@@ -1984,47 +1984,47 @@
 "type.highway.residential.area" = "Gate";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.residential.bridge" = "Bridge";
+"type.highway.residential.bridge" = "Bru";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.residential.tunnel" = "Tunnel";
 
 "type.highway.rest_area" = "Rasteplass";
 
-"type.highway.road" = "Gate";
+"type.highway.road" = "Vei";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.road.bridge" = "Bridge";
+"type.highway.road.bridge" = "Bru";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.road.tunnel" = "Tunnel";
 
-"type.highway.secondary" = "Gate";
+"type.highway.secondary" = "Sekundærvei";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.secondary.bridge" = "Bridge";
+"type.highway.secondary.bridge" = "Bru";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.secondary.tunnel" = "Tunnel";
 
-"type.highway.secondary_link" = "Gate";
+"type.highway.secondary_link" = "Sekundærvei";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.secondary_link.bridge" = "Bridge";
+"type.highway.secondary_link.bridge" = "Bru";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.secondary_link.tunnel" = "Tunnel";
 
-"type.highway.service" = "Gate";
+"type.highway.service" = "Service-vei";
 
-"type.highway.service.area" = "Gate";
+"type.highway.service.area" = "Service-vei";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.service.bridge" = "Bridge";
+"type.highway.service.bridge" = "Bru";
 
-"type.highway.service.driveway" = "Gate";
+"type.highway.service.driveway" = "Service-vei";
 
-"type.highway.service.parking_aisle" = "Gate";
+"type.highway.service.parking_aisle" = "Service-vei";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.service.tunnel" = "Tunnel";
@@ -2033,111 +2033,111 @@
 
 "type.highway.speed_camera" = "Fotoboks";
 
-"type.highway.steps" = "Sti";
+"type.highway.steps" = "Trapper";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.steps.bridge" = "Bridge";
+"type.highway.steps.bridge" = "Bru";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.steps.tunnel" = "Tunnel";
 
-"type.highway.tertiary" = "Gate";
+"type.highway.tertiary" = "Tertiærvei";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.tertiary.bridge" = "Bridge";
+"type.highway.tertiary.bridge" = "Bru";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.tertiary.tunnel" = "Tunnel";
 
-"type.highway.tertiary_link" = "Gate";
+"type.highway.tertiary_link" = "Tertiærvei";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.tertiary_link.bridge" = "Bridge";
+"type.highway.tertiary_link.bridge" = "Bru";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.tertiary_link.tunnel" = "Tunnel";
 
-"type.highway.track" = "Gate";
+"type.highway.track" = "Traktor/Skogsbilvei";
 
-"type.highway.track.area" = "Gate";
+"type.highway.track.area" = "Traktor/Skogsbilvei";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.track.bridge" = "Bridge";
+"type.highway.track.bridge" = "Bru";
 
-"type.highway.track.grade1" = "Gate";
+"type.highway.track.grade1" = "Traktor/Skogsbilvei";
 
-"type.highway.track.grade2" = "Gate";
+"type.highway.track.grade2" = "Traktor/Skogsbilvei";
 
-"type.highway.track.grade3" = "Gate";
+"type.highway.track.grade3" = "Traktor/Skogsbilvei";
 
-"type.highway.track.grade4" = "Gate";
+"type.highway.track.grade4" = "Traktor/Skogsbilvei";
 
-"type.highway.track.grade5" = "Gate";
+"type.highway.track.grade5" = "Traktor/Skogsbilvei";
 
-"type.highway.track.no.access" = "Gate";
+"type.highway.track.no.access" = "Traktor/Skogsbilvei";
 
-"type.highway.track.permissive" = "Gate";
+"type.highway.track.permissive" = "Traktor/Skogsbilvei";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Tunnel";
 
 "type.highway.traffic_signals" = "Trafikklys";
 
-"type.highway.trunk" = "Gate";
+"type.highway.trunk" = "Riksvei";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.trunk.bridge" = "Bridge";
+"type.highway.trunk.bridge" = "Bru";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.trunk.tunnel" = "Tunnel";
 
-"type.highway.trunk_link" = "Gate";
+"type.highway.trunk_link" = "Riksvei";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.trunk_link.bridge" = "Bridge";
+"type.highway.trunk_link.bridge" = "Bru";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.trunk_link.tunnel" = "Tunnel";
 
-"type.highway.unclassified" = "Gate";
+"type.highway.unclassified" = "Småvei";
 
-"type.highway.unclassified.area" = "Gate";
+"type.highway.unclassified.area" = "Småvei";
 
 /* These translations are used for all type.highway.*.bridge. */
-"type.highway.unclassified.bridge" = "Bridge";
+"type.highway.unclassified.bridge" = "Bru";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.unclassified.tunnel" = "Tunnel";
 
-"type.area_highway.cycleway" = "Cycle Path";
+"type.area_highway.cycleway" = "Sykkelvei";
 
-"type.area_highway.footway" = "Sti";
+"type.area_highway.footway" = "Gangvei";
 
 "type.area_highway.living_street" = "Gate";
 
-"type.area_highway.motorway" = "Gate";
+"type.area_highway.motorway" = "Motorvei";
 
 "type.area_highway.path" = "Sti";
 
-"type.area_highway.pedestrian" = "Gate";
+"type.area_highway.pedestrian" = "Gågate";
 
-"type.area_highway.primary" = "Gate";
+"type.area_highway.primary" = "Hovedvei";
 
 "type.area_highway.residential" = "Gate";
 
-"type.area_highway.secondary" = "Gate";
+"type.area_highway.secondary" = "Sekundærvei";
 
-"type.area_highway.service" = "Gate";
+"type.area_highway.service" = "Service-vei";
 
-"type.area_highway.tertiary" = "Gate";
+"type.area_highway.tertiary" = "Tertiærvei";
 
-"type.area_highway.steps" = "Sti";
+"type.area_highway.steps" = "Trapper";
 
-"type.area_highway.track" = "Gate";
+"type.area_highway.track" = "Traktor/Skogsbilvei";
 
-"type.area_highway.trunk" = "Gate";
+"type.area_highway.trunk" = "Riksvei";
 
-"type.area_highway.unclassified" = "Gate";
+"type.area_highway.unclassified" = "Småvei";
 
 "type.highway.world_level" = "highway-world_level";
 
@@ -2152,7 +2152,7 @@
 
 "type.historic.battlefield" = "Slagmarken";
 
-"type.historic.boundary_stone" = "Grensemerke";
+"type.historic.boundary_stone" = "Grensestein";
 
 "type.historic.castle" = "Borg";
 
@@ -2178,7 +2178,7 @@
 
 "type.historic.city_gate" = "Byport";
 
-"type.historic.citywalls" = "Bymurer";
+"type.historic.citywalls" = "Bymur";
 
 "type.historic.fort" = "Fort";
 
@@ -2188,11 +2188,11 @@
 
 "type.historic.memorial.cross" = "Minnekors";
 
-"type.historic.memorial.plaque" = "Minnesmerke";
+"type.historic.memorial.plaque" = "Minneplakett";
 
-"type.historic.memorial.sculpture" = "Minnesmerke";
+"type.historic.memorial.sculpture" = "Skulptur";
 
-"type.historic.memorial.statue" = "Minnesmerke";
+"type.historic.memorial.statue" = "Statue";
 
 "type.historic.memorial.stolperstein" = "Snublesteiner";
 
@@ -2200,13 +2200,13 @@
 
 "type.historic.monument" = "Monument";
 
-"type.historic.pillory" = "Pilry";
+"type.historic.pillory" = "Gapestokk";
 
 "type.historic.ruins" = "Ruiner";
 
-"type.historic.ship" = "Severdigheter";
+"type.historic.ship" = "Skip";
 
-"type.historic.tomb" = "Severdigheter";
+"type.historic.tomb" = "Grav";
 
 "type.historic.wayside_cross" = "Veikantkors";
 
@@ -2250,7 +2250,7 @@
 
 "type.landuse.allotments" = "Allotments";
 
-"type.landuse.basin" = "Vannvask";
+"type.landuse.basin" = "Basseng";
 
 "type.landuse.brownfield" = "Brownfield";
 
@@ -2278,9 +2278,9 @@
 
 "type.landuse.forest" = "Skog";
 
-"type.landuse.forest.coniferous" = "Skog";
+"type.landuse.forest.coniferous" = "Barskog";
 
-"type.landuse.forest.deciduous" = "Skog";
+"type.landuse.forest.deciduous" = "Løvskog";
 
 "type.landuse.forest.mixed" = "Skog";
 
@@ -2328,7 +2328,7 @@
 
 "type.leisure.fitness_centre" = "Treningssenter";
 
-"type.leisure.fitness_station" = "Treningssenter";
+"type.leisure.fitness_station" = "Treningsstasjon";
 
 "type.leisure.dance" = "Dansesal";
 
@@ -2344,7 +2344,7 @@
 
 "type.leisure.marina" = "Marina";
 
-"type.leisure.nature_reserve" = "Reservat";
+"type.leisure.nature_reserve" = "Naturreservat";
 
 "type.leisure.park" = "Park";
 
@@ -2356,7 +2356,7 @@
 
 "type.leisure.picnic_table" = "Piknikbord";
 
-"type.leisure.pitch" = "Sportssenter";
+"type.leisure.pitch" = "Idrettsplass";
 
 "type.leisure.playground" = "Lekeplass";
 
@@ -2456,7 +2456,7 @@
 
 "type.natural.cliff" = "Klippe";
 
-"type.natural.earth_bank" = "Klippe";
+"type.natural.earth_bank" = "Jordbanke";
 
 "type.man_made.embankment" = "Fylling";
 
@@ -2464,13 +2464,13 @@
 
 "type.natural.desert" = "Ørken";
 
-"type.natural.geyser" = "Gaysir";
+"type.natural.geyser" = "Geysir";
 
 "type.natural.glacier" = "Isbre";
 
 "type.natural.grassland" = "Sletteland";
 
-"type.natural.heath" = "Heath";
+"type.natural.heath" = "Hei";
 
 "type.natural.hot_spring" = "Varm kilde";
 
@@ -2482,7 +2482,7 @@
 
 "type.natural.water.reservoir" = "Reservoar";
 
-"type.natural.water.basin" = "Vannvask";
+"type.natural.water.basin" = "Basseng";
 
 "type.natural.water.river" = "Elv";
 
@@ -2492,15 +2492,15 @@
 
 "type.natural.orchard" = "Frukthage";
 
-"type.natural.peak" = "Høydepunkt";
+"type.natural.peak" = "Topp";
 
 "type.natural.saddle" = "Fjellsadel";
 
-"type.natural.rock" = "Bergart";
+"type.natural.rock" = "Fjell";
 
-"type.natural.scrub" = "Myr";
+"type.natural.scrub" = "Kratt";
 
-"type.natural.spring" = "Vår";
+"type.natural.spring" = "Kilde";
 
 "type.natural.strait" = "Sund";
 
@@ -2512,7 +2512,7 @@
 
 "type.natural.volcano" = "Vulkan";
 
-"type.natural.water" = "Vassmasse";
+"type.natural.water" = "Vann";
 
 "type.natural.wetland" = "Våtmarksområde";
 
@@ -2580,9 +2580,9 @@
 
 "type.place.islet" = "Øy";
 
-"type.place.isolated_dwelling" = "Isolert bolig";
+"type.place.isolated_dwelling" = "Isolert bosetting";
 
-"type.place.locality" = "Lokalitet";
+"type.place.locality" = "Sted";
 
 "type.place.neighbourhood" = "Strøk";
 
@@ -2632,11 +2632,11 @@
 
 "type.psurface.unpaved_good" = "psurface-unpaved_good";
 
-"type.public_transport" = "Public Transport";
+"type.public_transport" = "Offentlig transport";
 
 "type.public_transport.platform" = "Platform";
 
-"type.railway" = "Railway";
+"type.railway" = "Jernbane";
 
 "type.railway.abandoned" = "Abandoned railway";
 
@@ -2672,15 +2672,15 @@
 
 "type.railway.monorail.tunnel" = "Monorail";
 
-"type.railway.narrow_gauge" = "Narrow Gauge Rail";
+"type.railway.narrow_gauge" = "Smalsporet jernbane";
 
 "type.railway.narrow_gauge.bridge" = "Narrow Gauge Rail";
 
 "type.railway.narrow_gauge.tunnel" = "Narrow Gauge Rail";
 
-"type.railway.platform" = "Railway Platform";
+"type.railway.platform" = "Jernbaneplattform";
 
-"type.railway.preserved" = "Preserved Rail";
+"type.railway.preserved" = "Museumsjernbane";
 
 "type.railway.preserved.bridge" = "Preserved Rail";
 
@@ -3262,13 +3262,13 @@
 
 "type.shop.jewelry" = "Gullsmed";
 
-"type.shop.kiosk" = "Butikk";
+"type.shop.kiosk" = "Kiosk";
 
 "type.shop.kitchen" = "Kjøkkenbutikk";
 
 "type.shop.laundry" = "Vaskeri";
 
-"type.shop.mall" = "Kjøpesenteret";
+"type.shop.mall" = "Kjøpesenter";
 
 "type.shop.massage" = "Massasjesalong";
 
@@ -3278,9 +3278,9 @@
 
 "type.shop.motorcycle" = "Motorsykkelforretning";
 
-"type.shop.music" = "Butikk";
+"type.shop.music" = "Platebutikk";
 
-"type.shop.musical_instrument" = "Butikk";
+"type.shop.musical_instrument" = "Musikkinstrumenter";
 
 "type.shop.newsagent" = "Aviskiosk";
 
@@ -3288,7 +3288,7 @@
 
 "type.shop.outdoor" = "Fritidsutstyr";
 
-"type.shop.pastry" = "Kake";
+"type.shop.pastry" = "Bakverk";
 
 "type.shop.pawnbroker" = "Pantelåner";
 
@@ -3304,17 +3304,17 @@
 
 "type.shop.sports" = "Sportsutstyr";
 
-"type.shop.stationery" = "Bokhandel";
+"type.shop.stationery" = "Kontorrekvisita";
 
 "type.shop.supermarket" = "Supermarked";
 
 "type.shop.tattoo" = "Tatovør";
 
-"type.shop.tea" = "Butikk";
+"type.shop.tea" = "Tebutikk";
 
 "type.shop.ticket" = "Billettkontor";
 
-"type.shop.toys" = "Legebutikk";
+"type.shop.toys" = "Leketøybutikk";
 
 "type.shop.travel_agency" = "Reisebyrå";
 
@@ -3364,7 +3364,7 @@
 
 "type.shop.sewing" = "Syutstyr";
 
-"type.shop.storage_rental" = "Utleie av lager";
+"type.shop.storage_rental" = "Lagerutleie";
 
 "type.shop.tobacco" = "Tobakk";
 
@@ -3443,7 +3443,7 @@
 
 "type.sport.pelota" = "Baskisk pelota";
 
-"type.tourism" = "Tourism";
+"type.tourism" = "Turisme";
 
 "type.tourism.alpine_hut" = "Fjellstue";
 
@@ -3465,13 +3465,13 @@
 
 "type.tourism.attraction.specified" = "Attraksjon";
 
-"type.tourism.camp_site" = "Overnatting i bobiler";
+"type.tourism.camp_site" = "Campingplass";
 
 "type.tourism.caravan_site" = "Camping";
 
 "type.tourism.chalet" = "Chalet";
 
-"type.tourism.gallery" = "Severdigheter";
+"type.tourism.gallery" = "Galleri";
 
 "type.tourism.guest_house" = "Gjestehus";
 
@@ -3497,7 +3497,7 @@
 
 "type.tourism.resort" = "Ferieresort";
 
-"type.tourism.theme_park" = "Severdigheter";
+"type.tourism.theme_park" = "Temapark";
 
 "type.tourism.viewpoint" = "Utsiktspunkt";
 
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index 4a49da383e..8f1404fa4e 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -1382,9 +1382,9 @@
 
 "type.amenity.parking.underground" = "Estacionamento subterrâneo";
 
-"type.amenity.parking_entrance.private" = "Entrada do estacionamento";
+"type.amenity.parking_entrance.private" = "Parking entrance";
 
-"type.amenity.parking_entrance.permissive" = "Entrada do estacionamento";
+"type.amenity.parking_entrance.permissive" = "Parking entrance";
 
 "type.amenity.parking_entrance" = "Entrada do estacionamento";
 
@@ -1533,7 +1533,7 @@
 
 "type.barrier.chain" = "Chain";
 
-"type.barrier.city_wall" = "Muralha";
+"type.barrier.city_wall" = "City Wall";
 
 "type.barrier.cycle_barrier" = "Barreira de bicicletas";