diff --git a/android/app/src/main/res/values-cs/strings.xml b/android/app/src/main/res/values-cs/strings.xml
index e2579db8e..9665bc99c 100644
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -505,8 +505,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Chcete změnu odeslat všem uživatelům?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Ujistěte se, že jste nezadali žádná soukromá nebo osobní data</string>
-    <string name="editor_share_to_all_dialog_message_2">Editoři OpenStreetMap zkontrolují změny a budou vás kontaktovat, pokud budou mít nějaké dotazy</string>
+    <string name="editor_share_to_all_dialog_message_1">Ujistěte se, že jste nezadali žádná soukromá nebo osobní data.</string>
+    <string name="editor_share_to_all_dialog_message_2">Editoři OpenStreetMap zkontrolují změny a budou vás kontaktovat, pokud budou mít nějaké dotazy.</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Záznam trasy</string>
     <!-- For the first routing -->
diff --git a/android/app/src/main/res/values-et/strings.xml b/android/app/src/main/res/values-et/strings.xml
index 65d68a3ef..98df77ad8 100644
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -516,8 +516,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Kas soovid saata selle kõigile kasutajatele?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Palun kontrolli, et sa ei sisestanud isiklikke andmeid</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMapi haldajad kontrollivad muudatused üle ja võtavad küsimuste korral sinuga ühendust</string>
+    <string name="editor_share_to_all_dialog_message_1">Palun kontrolli, et sa ei sisestanud isiklikke andmeid.</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMapi haldajad kontrollivad muudatused üle ja võtavad küsimuste korral sinuga ühendust.</string>
     <string name="navigation_stop_button">Lõpeta</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Rada on salvestamisel</string>
diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml
index 9dfbf4b99..305318143 100644
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -891,4 +891,8 @@
     <string name="unknown_count">sconosciuto</string>
     <string name="error_value_must_be_positive">Il valore deve essere positivo</string>
     <string name="error_invalid_number">Numero non valido</string>
+    <string name="editor_business_vacant_button">L\'attività è vacante</string>
+    <string name="editor_mark_business_vacant_title">Contrassegna l\'attività come vacante</string>
+    <string name="editor_mark_business_vacant_description">Utilizza questa opzione se l\'azienda ha traslocato e lo spazio è vuoto e pronto per un nuovo inquilino.</string>
+    <string name="editor_submit">Conferma</string>
 </resources>
diff --git a/android/app/src/main/res/values-nb/strings.xml b/android/app/src/main/res/values-nb/strings.xml
index c75f040da..f77fb68c7 100644
--- a/android/app/src/main/res/values-nb/strings.xml
+++ b/android/app/src/main/res/values-nb/strings.xml
@@ -522,8 +522,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Vil du sende det til alle brukere?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Sørg for at du ikke har angitt noen private eller personlige data</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap-redaktører vil sjekke endringene og kontakte deg hvis de har spørsmål</string>
+    <string name="editor_share_to_all_dialog_message_1">Sørg for at du ikke har angitt noen private eller personlige data.</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap-redaktører vil sjekke endringene og kontakte deg hvis de har spørsmål.</string>
     <string name="navigation_stop_button">Stopp</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Tar opp sporet</string>
@@ -894,4 +894,5 @@
     <string name="opens_day_at">Åpner %1$s %2$s</string>
     <string name="closes_at">Stenger %s</string>
     <string name="opens_at">Åpner %s</string>
+    <string name="editor_submit">Send</string>
 </resources>
diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml
index 4d8e10331..a7c4e92bc 100644
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -520,8 +520,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Wil je het naar alle gebruikers sturen?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Controleer dat je geen persoonlijke gegevens hebt ingevoerd</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap-editors zullen de wijzigingen controleren en contact met u opnemen als ze vragen hebben</string>
+    <string name="editor_share_to_all_dialog_message_1">Controleer dat je geen persoonlijke gegevens hebt ingevoerd.</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap-editors zullen de wijzigingen controleren en contact met u opnemen als ze vragen hebben.</string>
     <string name="navigation_stop_button">Stop</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Spoor opnemen</string>
diff --git a/android/app/src/main/res/values-pt-rBR/strings.xml b/android/app/src/main/res/values-pt-rBR/strings.xml
index b9321bbfe..928d6c6e3 100644
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -462,8 +462,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Deseja enviar para todos os usuários?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Certifique-se de não ter incluído nenhum dado privado ou pessoal</string>
-    <string name="editor_share_to_all_dialog_message_2">Os mapeadores do OpenStreetMap verificarão as mudanças e entrarão em contato com você se tiverem alguma dúvida</string>
+    <string name="editor_share_to_all_dialog_message_1">Certifique-se de não ter incluído nenhum dado privado ou pessoal.</string>
+    <string name="editor_share_to_all_dialog_message_2">Os mapeadores do OpenStreetMap verificarão as alterações e entrarão em contato caso tenham alguma dúvida.</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Registro da pista</string>
     <!-- For the first routing -->
@@ -880,4 +880,8 @@
         <item quantity="many">%d min</item>
         <item quantity="other">%d min</item>
     </plurals>
+    <string name="editor_business_vacant_button">Local está desocupado</string>
+    <string name="editor_mark_business_vacant_title">Marcar local como desocupado</string>
+    <string name="editor_mark_business_vacant_description">Use isto se o estabelecimento mudou de endereço ou o local está vago e disponível para outra empresa.</string>
+    <string name="editor_submit">Enviar</string>
 </resources>
diff --git a/android/app/src/main/res/values-sr/strings.xml b/android/app/src/main/res/values-sr/strings.xml
index 81614ad1b..74b40c464 100644
--- a/android/app/src/main/res/values-sr/strings.xml
+++ b/android/app/src/main/res/values-sr/strings.xml
@@ -513,8 +513,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Да ли желите да поделите са свим другим корисницима?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Проверите да нисте унели приватне или личне податке</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap мапери ће проверити промене и контактирати Вас уколико буду имали питања</string>
+    <string name="editor_share_to_all_dialog_message_1">Проверите да нисте унели приватне или личне податке.</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap мапери ће проверити промене и контактирати Вас уколико буду имали питања.</string>
     <string name="navigation_stop_button">Стоп</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Снимање путање</string>
diff --git a/android/app/src/main/res/values-zh/strings.xml b/android/app/src/main/res/values-zh/strings.xml
index 6147e941d..aebbaf9f9 100644
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -530,8 +530,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">您想要发送给所有用户吗？</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">请确保您没有输入任何私人或个人数据</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap 编辑人员将检查更改，如有任何疑问，将与您联系</string>
+    <string name="editor_share_to_all_dialog_message_1">请确保您没有输入任何私人或个人数据。</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap 编辑人员将检查更改，如有任何疑问，将与您联系。</string>
     <string name="navigation_stop_button">停止</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">记录轨迹</string>
@@ -634,7 +634,7 @@
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">避开收费公路</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
-    <string name="avoid_unpaved">避开非铺装道路‌</string>
+    <string name="avoid_unpaved">避开非铺装道路</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_ferry">避开轮渡</string>
     <string name="avoid_motorways">避开高速公路</string>
@@ -643,7 +643,7 @@
     <string name="define_to_avoid_btn">选择要避开的道路</string>
     <string name="change_driving_options_btn">绕行设置已开启</string>
     <string name="toll_road">收费公路</string>
-    <string name="unpaved_road">非铺装道路‌</string>
+    <string name="unpaved_road">非铺装道路</string>
     <string name="ferry_crossing">轮渡</string>
     <!-- A generic "Yes" button in dialogs -->
     <string name="yes">是</string>
diff --git a/android/sdk/src/main/res/values-et/types_strings.xml b/android/sdk/src/main/res/values-et/types_strings.xml
index f24ad9137..4984b8436 100644
--- a/android/sdk/src/main/res/values-et/types_strings.xml
+++ b/android/sdk/src/main/res/values-et/types_strings.xml
@@ -358,7 +358,7 @@
     <string name="type.entrance">Sissepääs</string>
     <!-- This is for main/primary entrances, for secondary entrances see type.entrance -->
     <string name="type.entrance.main">Peasissepääs</string>
-    <string name="type.entrance.exit">Väljapääs</string>
+    <string name="type.entrance.exit">Vaid väljapääs</string>
     <string name="type.fee.no">Tasuta</string>
     <string name="type.healthcare.laboratory">Meditsiinilabor</string>
     <string name="type.healthcare.physiotherapist">Füsioterapeut</string>
@@ -1457,4 +1457,39 @@
     <string name="type.amenity.flight_school">Lennukool</string>
     <string name="type.amenity.prep_school">Tugiõpe</string>
     <string name="type.amenity.sailing_school">Purjetamiskool</string>
+    <string name="type.entrance.house">Maja sissepääs</string>
+    <string name="type.entrance.garage">Garaaži sissepääs</string>
+    <string name="type.entrance.service">Teenistuskäik</string>
+    <string name="type.entrance.entry">Vaid sissepääs</string>
+    <string name="type.entrance.emergency">Avariiväljapääs</string>
+    <string name="type.natural.sand">Liiv</string>
+    <string name="type.natural.tree">Üksik puu</string>
+    <string name="type.xmas.tree">Jõulupuu</string>
+    <string name="type.beacon.cardinal.east">Idatooder</string>
+    <string name="type.beacon.cardinal.north">Põhjatooder</string>
+    <string name="type.beacon.cardinal.south">Lõunatooder</string>
+    <string name="type.beacon.cardinal.west">Läänetooder</string>
+    <string name="type.buoy.cardinal.east">Idapoi</string>
+    <string name="type.buoy.cardinal.north">Põhjapoi</string>
+    <string name="type.buoy.cardinal.south">Lõunapoi</string>
+    <string name="type.buoy.cardinal.west">Läänepoi</string>
+    <string name="type.buoy.lateral.port">Lateraalpoi pakpoordis</string>
+    <string name="type.buoy.lateral.starboard">Lateraalpoi tüürpoordis</string>
+    <string name="type.buoy.special_purpose">Eriotstarbeline poi</string>
+    <string name="type.spherical_buoy.cardinal.east">Kerapoi idas</string>
+    <string name="type.spherical_buoy.cardinal.north">Kerapoi põhjas</string>
+    <string name="type.spherical_buoy.cardinal.south">Kerapoi lõunas</string>
+    <string name="type.spherical_buoy.cardinal.west">Kerapoi läänes</string>
+    <string name="type.spherical_buoy.lateral.port">Kerapoi pakpoordis</string>
+    <string name="type.spherical_buoy.lateral.starboard">Kerapoi tüürpoordis</string>
+    <string name="type.spherical_buoy.special_purpose">Eritistarbeline kerapoi</string>
+    <string name="type.spherical_buoy.isolated_danger">Kerapoi eraldiasetseva ohu märkimiseks</string>
+    <string name="type.buoy.isolated_danger">Poi eraldiasetseva ohu märkimiseks</string>
+    <string name="type.beacon.isolated_danger">Tooder eraldiasetseva ohu märkimiseks</string>
+    <string name="type.beacon.lateral.port">Lateraalne tooder tüürpoordis</string>
+    <string name="type.beacon.lateral.starboard">Lateraalne tooder pakpoordis</string>
+    <string name="type.beacon.special_purpose">Eriotstarbeline tooder</string>
+    <string name="type.beacon.safe_water">Faarvaatri tooder</string>
+    <string name="type.buoy.safe_water">Faarvaatri poi</string>
+    <string name="type.spherical_buoy.safe_water">Faarvaatri kerapoi</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-fr/types_strings.xml b/android/sdk/src/main/res/values-fr/types_strings.xml
index 6122fb53e..571de4ef7 100644
--- a/android/sdk/src/main/res/values-fr/types_strings.xml
+++ b/android/sdk/src/main/res/values-fr/types_strings.xml
@@ -1457,4 +1457,45 @@
     <string name="type.emergency.access_point">Point de secours d\'urgence</string>
     <string name="type.emergency.life_ring">Bouée de sauvetage</string>
     <string name="type.shop.beauty.day_spa">Spa de jour</string>
+    <string name="type.beacon.cardinal.east">Phare cardinal</string>
+    <string name="type.beacon.cardinal.north">Phare cardinal</string>
+    <string name="type.beacon.cardinal.south">Phare cardinal</string>
+    <string name="type.beacon.cardinal.west">Phare cardinal</string>
+    <string name="type.beacon.isolated_danger">Balise de danger isolée</string>
+    <string name="type.beacon.lateral.port">Balise latérale</string>
+    <string name="type.beacon.lateral.starboard">Balise latérale</string>
+    <string name="type.beacon.safe_water">Balise d\'eau potable</string>
+    <string name="type.beacon.special_purpose">Balise à usage spécial</string>
+    <string name="type.buoy.cardinal.east">Bouée cardinale</string>
+    <string name="type.buoy.cardinal.north">Bouée cardinale</string>
+    <string name="type.buoy.cardinal.south">Bouée cardinale</string>
+    <string name="type.buoy.cardinal.west">Bouée cardinale</string>
+    <string name="type.buoy.isolated_danger">Bouée de danger isolée</string>
+    <string name="type.buoy.lateral.port">Bouée latérale</string>
+    <string name="type.buoy.lateral.starboard">Bouée latérale</string>
+    <string name="type.buoy.safe_water">Bouée en eau sûre</string>
+    <string name="type.buoy.special_purpose">Bouée à usage spécial</string>
+    <string name="type.spherical_buoy.cardinal.east">Bouée cardinale sphérique</string>
+    <string name="type.spherical_buoy.cardinal.north">Bouée cardinale sphérique</string>
+    <string name="type.spherical_buoy.cardinal.south">Bouée cardinale sphérique</string>
+    <string name="type.spherical_buoy.cardinal.west">Bouée cardinale sphérique</string>
+    <string name="type.spherical_buoy.isolated_danger">Bouée de danger sphérique isolée</string>
+    <string name="type.spherical_buoy.lateral.port">Bouée latérale sphérique</string>
+    <string name="type.spherical_buoy.lateral.starboard">Bouée latérale sphérique</string>
+    <string name="type.spherical_buoy.safe_water">Bouée sphérique de sécurité en eau</string>
+    <string name="type.spherical_buoy.special_purpose">Bouée sphérique à usage spécial</string>
+    <string name="type.lateral.port">Port</string>
+    <string name="type.lateral.starboard">Tribord</string>
+    <string name="type.cardinal.east">Est</string>
+    <string name="type.cardinal.north">Nord</string>
+    <string name="type.cardinal.south">Sud</string>
+    <string name="type.cardinal.west">Ouest</string>
+    <string name="type.entrance.house">Entrée de la maison</string>
+    <string name="type.entrance.garage">Entrée du garage</string>
+    <string name="type.entrance.service">Entrée de service</string>
+    <string name="type.entrance.entry">Entrée (uniquement)</string>
+    <string name="type.entrance.emergency">Issue de secours</string>
+    <string name="type.xmas.tree">Arbre de Noël</string>
+    <string name="type.natural.tree">Arbre</string>
+    <string name="type.natural.sand">Sable</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 01b2432cd..b58895d3d 100644
--- a/android/sdk/src/main/res/values-nb/types_strings.xml
+++ b/android/sdk/src/main/res/values-nb/types_strings.xml
@@ -314,7 +314,7 @@
     <string name="type.entrance">Inngang</string>
     <!-- This is for main/primary entrances, for secondary entrances see type.entrance -->
     <string name="type.entrance.main">Hovedinngang</string>
-    <string name="type.entrance.exit">Utgang</string>
+    <string name="type.entrance.exit">Utgang (bare)</string>
     <string name="type.fee.no">Gratis</string>
     <string name="type.healthcare.laboratory">Medisinsk laboratorium</string>
     <string name="type.healthcare.physiotherapist">Fysioterapeut</string>
@@ -1373,4 +1373,13 @@
     <string name="type.amenity.boat_rental">Båtutleie</string>
     <string name="type.man_made.observatory">Observatorium</string>
     <string name="type.emergency.life_ring">Livbøye</string>
+    <string name="type.natural.sand">Sand</string>
+    <string name="type.natural.tree">Tre</string>
+    <string name="type.cardinal.south">Sør</string>
+    <string name="type.cardinal.north">Nord</string>
+    <string name="type.cardinal.east">Øst</string>
+    <string name="type.cardinal.west">Vest</string>
+    <string name="type.xmas.tree">Juletre</string>
+    <string name="type.entrance.emergency">Nødutgang</string>
+    <string name="type.entrance.entry">Inngang (bare)</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-nl/types_strings.xml b/android/sdk/src/main/res/values-nl/types_strings.xml
index 3291006d1..6748f0e2e 100644
--- a/android/sdk/src/main/res/values-nl/types_strings.xml
+++ b/android/sdk/src/main/res/values-nl/types_strings.xml
@@ -355,7 +355,7 @@
     <string name="type.entrance">Ingang</string>
     <!-- This is for main/primary entrances, for secondary entrances see type.entrance -->
     <string name="type.entrance.main">Hoofdingang</string>
-    <string name="type.entrance.exit">Ga naar</string>
+    <string name="type.entrance.exit">Uitgang (enig)</string>
     <string name="type.fee.no">Gratis</string>
     <string name="type.healthcare.laboratory">Medisch laboratorium</string>
     <string name="type.healthcare.physiotherapist">Fysiotherapeut</string>
@@ -419,8 +419,8 @@
     <string name="type.highway.path.difficult">Moeilijk of slecht zichtbaar pad</string>
     <!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
     <string name="type.highway.path.expert">Zeer moeilijk of niet te onderscheiden spoor</string>
-    <string name="type.highway.path.bicycle">Fietspad</string>
-    <string name="type.highway.footway.bicycle">Fietspad</string>
+    <string name="type.highway.path.bicycle">Fiets- &amp; voetpad</string>
+    <string name="type.highway.footway.bicycle">Fiets- &amp; voetpad</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.path.bridge">Brug</string>
     <string name="type.highway.path.horse">Ruiterpad</string>
@@ -1453,4 +1453,43 @@
     <string name="type.amenity.sailing_school">Zeilschool</string>
     <string name="type.amenity.flight_school">Vliegschool</string>
     <string name="type.amenity.prep_school">Bijscholing</string>
+    <string name="type.cardinal.east">Oost</string>
+    <string name="type.cardinal.north">Noorden</string>
+    <string name="type.cardinal.south">Zuiden</string>
+    <string name="type.natural.sand">Zand</string>
+    <string name="type.natural.tree">Boom</string>
+    <string name="type.beacon.cardinal.east">Kardinaal baken</string>
+    <string name="type.beacon.cardinal.north">Kardinaal baken</string>
+    <string name="type.beacon.cardinal.south">Kardinaal baken</string>
+    <string name="type.beacon.cardinal.west">Kardinaal baken</string>
+    <string name="type.beacon.lateral.port">Lateraal baken</string>
+    <string name="type.beacon.lateral.starboard">Lateraal baken</string>
+    <string name="type.beacon.safe_water">Scheidingsbaken</string>
+    <string name="type.beacon.special_purpose">Speciaal baken</string>
+    <string name="type.buoy.cardinal.east">Kardinale boei</string>
+    <string name="type.buoy.cardinal.north">Kardinale boei</string>
+    <string name="type.buoy.cardinal.south">Kardinale boei</string>
+    <string name="type.buoy.cardinal.west">Kardinale boei</string>
+    <string name="type.buoy.lateral.port">Laterale boei</string>
+    <string name="type.buoy.lateral.starboard">Laterale boei</string>
+    <string name="type.buoy.safe_water">Scheidingsboei</string>
+    <string name="type.buoy.special_purpose">Speciale boei</string>
+    <string name="type.spherical_buoy.cardinal.east">Sferische kardinale boei</string>
+    <string name="type.spherical_buoy.cardinal.north">Sferische kardinale boei</string>
+    <string name="type.spherical_buoy.cardinal.south">Sferische kardinale boei</string>
+    <string name="type.spherical_buoy.cardinal.west">Sferische kardinale boei</string>
+    <string name="type.spherical_buoy.lateral.port">Sferische laterale boei</string>
+    <string name="type.spherical_buoy.lateral.starboard">Sferische laterale boei</string>
+    <string name="type.spherical_buoy.safe_water">Sferische scheidingsboei</string>
+    <string name="type.spherical_buoy.special_purpose">Sferische speciale boei</string>
+    <string name="type.lateral.port">Haven</string>
+    <string name="type.lateral.starboard">Stuurboord</string>
+    <string name="type.cardinal.west">West</string>
+    <string name="type.entrance.house">Huis entree</string>
+    <string name="type.entrance.garage">Garage entree</string>
+    <string name="type.entrance.service">Dienstingang</string>
+    <string name="type.entrance.entry">Ingang (enig)</string>
+    <string name="type.entrance.emergency">Nooduitgang</string>
+    <string name="type.xmas.tree">Kerstboom</string>
+    <string name="type.shop.beauty.day_spa">Schoonheidssalon</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-pt-rBR/types_strings.xml b/android/sdk/src/main/res/values-pt-rBR/types_strings.xml
index 17f8fd8ef..ec88f6280 100644
--- a/android/sdk/src/main/res/values-pt-rBR/types_strings.xml
+++ b/android/sdk/src/main/res/values-pt-rBR/types_strings.xml
@@ -1131,7 +1131,7 @@
     <string name="type.sport.curling">Curling</string>
     <string name="type.emergency.assembly_point">Ponto de Reunião de Emergência</string>
     <string name="type.emergency.mountain_rescue">Estação de resgate na montanha</string>
-    <string name="type.entrance.exit">Saída</string>
+    <string name="type.entrance.exit">Saída (apenas)</string>
     <string name="type.amenity.arts_centre">Centro de artes</string>
     <string name="type.amenity.bbq">Churrasqueira</string>
     <string name="type.amenity.compressed_air">Ar comprimido</string>
@@ -1442,4 +1442,49 @@
     <string name="type.amenity.give_box">Caixa de doação</string>
     <string name="type.emergency.access_point">Ponto de Resgate de Emergência</string>
     <string name="type.emergency.life_ring">Boia salva-vidas</string>
+    <string name="type.amenity.sailing_school">Escola de vela</string>
+    <string name="type.amenity.flight_school">Escola de aviação</string>
+    <string name="type.amenity.prep_school">Cursinho</string>
+    <string name="type.beacon.cardinal.east">Marca cardinal</string>
+    <string name="type.beacon.cardinal.north">Marca cardinal</string>
+    <string name="type.beacon.cardinal.south">Marca cardinal</string>
+    <string name="type.beacon.cardinal.west">Marco cardinal</string>
+    <string name="type.beacon.isolated_danger">Marco de período isolado</string>
+    <string name="type.beacon.lateral.port">Marca lateral</string>
+    <string name="type.buoy.lateral.starboard">Boia lateral</string>
+    <string name="type.buoy.safe_water">Boia de águas seguras</string>
+    <string name="type.buoy.special_purpose">Boia para fins especiais</string>
+    <string name="type.spherical_buoy.cardinal.east">Boia cardinal esférica</string>
+    <string name="type.spherical_buoy.cardinal.north">Boia cardinal esférica</string>
+    <string name="type.spherical_buoy.cardinal.south">Boia cardinal esférica</string>
+    <string name="type.spherical_buoy.cardinal.west">Boia cardinal esférica</string>
+    <string name="type.spherical_buoy.isolated_danger">Boia esférica de perigo isolado</string>
+    <string name="type.spherical_buoy.lateral.port">Boia esférica lateral</string>
+    <string name="type.spherical_buoy.lateral.starboard">Boia esférica lateral</string>
+    <string name="type.spherical_buoy.safe_water">Boia esférica de águas seguras</string>
+    <string name="type.spherical_buoy.special_purpose">Boia esférica para fins especiais</string>
+    <string name="type.lateral.port">Bombordo</string>
+    <string name="type.lateral.starboard">Estibordo</string>
+    <string name="type.cardinal.east">Leste</string>
+    <string name="type.cardinal.north">Norte</string>
+    <string name="type.cardinal.south">Sul</string>
+    <string name="type.cardinal.west">Oeste</string>
+    <string name="type.entrance.house">Entrada de casa</string>
+    <string name="type.entrance.garage">Entrada de garagem</string>
+    <string name="type.entrance.service">Entrada de serviço</string>
+    <string name="type.entrance.entry">Entrada (apenas)</string>
+    <string name="type.entrance.emergency">Saída de emergência</string>
+    <string name="type.natural.sand">Areia</string>
+    <string name="type.natural.tree">Árvore</string>
+    <string name="type.shop.beauty.day_spa">Spa sem alojamento</string>
+    <string name="type.xmas.tree">Árvore de natal</string>
+    <string name="type.beacon.lateral.starboard">Marco lateral</string>
+    <string name="type.beacon.safe_water">Marco de águas seguras</string>
+    <string name="type.beacon.special_purpose">Marco de fins especiais</string>
+    <string name="type.buoy.cardinal.east">Boia cardeal</string>
+    <string name="type.buoy.cardinal.north">Boia cardeal</string>
+    <string name="type.buoy.cardinal.south">Boia cardeal</string>
+    <string name="type.buoy.cardinal.west">Boia cardeal</string>
+    <string name="type.buoy.isolated_danger">Boia de perigo isolado</string>
+    <string name="type.buoy.lateral.port">Boia lateral</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 3c5ee4886..f447c8de9 100644
--- a/android/sdk/src/main/res/values-sl/types_strings.xml
+++ b/android/sdk/src/main/res/values-sl/types_strings.xml
@@ -236,4 +236,13 @@
     <string name="type.amenity.vending_machine.newspapers">Avtomat za časopis</string>
     <string name="type.amenity.vending_machine.parking_tickets">Avtomat za parkirne listke</string>
     <string name="type.amenity.vending_machine.sweets">Avtomat za sladkarije</string>
+    <string name="type.entrance.emergency">Izhod v sili</string>
+    <string name="type.fee.yes">€</string>
+    <string name="type.fee.no">Plačilo</string>
+    <string name="type.healthcare.physiotherapist">Fizioterapevt</string>
+    <string name="type.healthcare.alternative">Alternativno zdravljenje</string>
+    <string name="type.healthcare.audiologist">Strokovnjak za sluh</string>
+    <string name="type.healthcare.blood_donation">Središče za darovanje krvi</string>
+    <string name="type.healthcare.optometrist">Optometrist</string>
+    <string name="type.healthcare.podiatrist">Podiater</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 1476b3fab..409505284 100644
--- a/android/sdk/src/main/res/values-sr/types_strings.xml
+++ b/android/sdk/src/main/res/values-sr/types_strings.xml
@@ -359,7 +359,7 @@
     <string name="type.entrance">Улаз</string>
     <!-- This is for main/primary entrances, for secondary entrances see type.entrance -->
     <string name="type.entrance.main">Главни улаз</string>
-    <string name="type.entrance.exit">Излаз</string>
+    <string name="type.entrance.exit">Излаз (искључиво)</string>
     <string name="type.fee.no">Бесплатно</string>
     <string name="type.healthcare.laboratory">Медицинска лабораторија</string>
     <string name="type.healthcare.physiotherapist">Физиотерапеут</string>
@@ -1454,4 +1454,48 @@
     <string name="type.shop.beauty.day_spa">Дневни спа</string>
     <string name="type.emergency.life_ring">Појас за спасавање</string>
     <string name="type.emergency.access_point">Спасилачка тачка</string>
+    <string name="type.amenity.sailing_school">Школа једрења</string>
+    <string name="type.amenity.flight_school">Школа летења</string>
+    <string name="type.amenity.prep_school">Припремна школа</string>
+    <string name="type.beacon.cardinal.east">Кардинални светионик</string>
+    <string name="type.beacon.cardinal.north">Кардинални светионик</string>
+    <string name="type.beacon.cardinal.south">Кардинални светионик</string>
+    <string name="type.beacon.cardinal.west">Кардинални светионик</string>
+    <string name="type.beacon.isolated_danger">Светионик изоловане опасности</string>
+    <string name="type.beacon.lateral.port">Бочни светионик</string>
+    <string name="type.beacon.lateral.starboard">Бочни светионик</string>
+    <string name="type.beacon.safe_water">Светионик безбедне воде</string>
+    <string name="type.beacon.special_purpose">Светионик посебне намене</string>
+    <string name="type.buoy.cardinal.east">Кардинална бова</string>
+    <string name="type.buoy.cardinal.north">Кардинална бова</string>
+    <string name="type.buoy.cardinal.south">Кардинална бова</string>
+    <string name="type.buoy.cardinal.west">Кардинална бова</string>
+    <string name="type.buoy.isolated_danger">Бова изоловане опасности</string>
+    <string name="type.buoy.lateral.port">Бочна бова</string>
+    <string name="type.buoy.lateral.starboard">Бочна бова</string>
+    <string name="type.buoy.safe_water">Бова безбедне воде</string>
+    <string name="type.buoy.special_purpose">Бова посебне намене</string>
+    <string name="type.spherical_buoy.cardinal.east">Сферна кардинална бова</string>
+    <string name="type.spherical_buoy.cardinal.north">Сферна кардинална бова</string>
+    <string name="type.spherical_buoy.cardinal.south">Сферна кардинална бова</string>
+    <string name="type.spherical_buoy.cardinal.west">Сферна кардинална бова</string>
+    <string name="type.spherical_buoy.isolated_danger">Сферна бова изоловане опасности</string>
+    <string name="type.spherical_buoy.lateral.port">Сферна бочна бова</string>
+    <string name="type.spherical_buoy.lateral.starboard">Сферна бочна бова</string>
+    <string name="type.spherical_buoy.safe_water">Сферна бова безбедне воде</string>
+    <string name="type.spherical_buoy.special_purpose">Сферна бова посебне намене</string>
+    <string name="type.lateral.port">Лево (порт)</string>
+    <string name="type.lateral.starboard">Десно (старборд)</string>
+    <string name="type.cardinal.east">Исток</string>
+    <string name="type.cardinal.north">Север</string>
+    <string name="type.cardinal.south">Југ</string>
+    <string name="type.cardinal.west">Запад</string>
+    <string name="type.entrance.house">Улаз у кућу</string>
+    <string name="type.entrance.garage">Улаз у гаражу</string>
+    <string name="type.entrance.service">Сервисни улаз</string>
+    <string name="type.entrance.entry">Улаз (искључиво)</string>
+    <string name="type.entrance.emergency">Улаз за хитне случајеве</string>
+    <string name="type.natural.sand">Песак</string>
+    <string name="type.natural.tree">Дрво</string>
+    <string name="type.xmas.tree">Божићна јелка</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-ta/strings.xml b/android/sdk/src/main/res/values-ta/strings.xml
index 4ff1ff865..5cebd6c69 100644
--- a/android/sdk/src/main/res/values-ta/strings.xml
+++ b/android/sdk/src/main/res/values-ta/strings.xml
@@ -8,16 +8,27 @@
     <string name="ft">அடி</string>
     <string name="today">இன்று</string>
     <string name="yesterday">நேற்று</string>
-    <string name="days_ago">%s நாட்களுக்கு முன்</string>
-    <string name="weeks_ago">%s வாரங்களுக்கு முன்</string>
-    <string name="months_ago">%s மாதங்களுக்கு முன்</string>
-    <string name="years_ago">%s வருடங்களுக்கு முன்</string>
+    <string name="days_ago">%s நாட்களுக்கு முன்பு</string>
+    <string name="weeks_ago">%s வாரங்களுக்கு முன்பு</string>
+    <string name="months_ago">%s மாதங்களுக்கு முன்பு</string>
+    <string name="years_ago">%s ஆண்டுகளுக்கு முன்பு</string>
     <string name="km">கி.மீ</string>
     <string name="postal_code">குறியீடு</string>
     <string name="core_placepage_unknown_place">வரைபட புள்ளி</string>
     <string name="core_exit">வெளியேறு</string>
     <string name="core_entrance">நுழைவாயில்</string>
     <string name="subway_data_unavailable">சுரங்கப்பாதை வரைபடம் கிடைக்கவில்லை</string>
-    <string name="mb">MB</string>
-    <string name="gb">GB</string>
+    <string name="mb">எம்பி</string>
+    <string name="gb">சிபி</string>
+    <string name="maps_storage_internal">உள் தனிப்பட்ட சேமிப்பு</string>
+    <string name="maps_storage_shared">உள் பகிரப்பட்ட சேமிப்பு</string>
+    <string name="maps_storage_removable">SD அட்டை</string>
+    <string name="maps_storage_external">வெளிப்புற பகிர்ந்த சேமிப்பு</string>
+    <string name="public_access">பொது அணுகல்</string>
+    <string name="limited_access">வரையறுக்கப்பட்ட அணுகல்</string>
+    <string name="not_shared">தனிப்பட்ட</string>
+    <string name="access_rules_author_only">நிகழ்நிலை திருத்துதல்</string>
+    <string name="week_ago">%s வாரத்திற்கு முன்பு</string>
+    <string name="month_ago">%s மாதம் முன்பு</string>
+    <string name="year_ago">%s வருடத்திற்கு முன்பு</string>
 </resources>
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
index f4623b9e0..6cc49fc6d 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -700,7 +700,7 @@
 "editor_share_to_all_dialog_title" = "Chcete změnu odeslat všem uživatelům?";
 
 /* Dialog before publishing the modifications to the public map. */
-"editor_share_to_all_dialog_message_1" = "Ujistěte se, že jste nezadali žádná osobní data.";
+"editor_share_to_all_dialog_message_1" = "Ujistěte se, že jste nezadali žádná soukromá nebo osobní data.";
 "editor_share_to_all_dialog_message_2" = "Editoři OpenStreetMap zkontrolují změny a budou vás kontaktovat, pokud budou mít nějaké dotazy.";
 "navigation_stop_button" = "Zastavit";
 
diff --git a/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings
index 5d0809abe..a95f3b140 100644
--- a/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings
@@ -371,7 +371,7 @@
 
 /* This is for main/primary entrances, for secondary entrances see type.entrance */
 "type.entrance.main" = "Peasissepääs";
-"type.entrance.exit" = "Väljapääs";
+"type.entrance.exit" = "Vaid väljapääs";
 "type.fee.yes" = "$ / €";
 "type.fee.no" = "Tasuta";
 "type.healthcare.laboratory" = "Meditsiinilabor";
@@ -1548,3 +1548,38 @@
 "type.amenity.sailing_school" = "Purjetamiskool";
 "type.amenity.flight_school" = "Lennukool";
 "type.amenity.prep_school" = "Tugiõpe";
+"type.entrance.house" = "Maja sissepääs";
+"type.entrance.garage" = "Garaaži sissepääs";
+"type.natural.sand" = "Liiv";
+"type.entrance.service" = "Teenistuskäik";
+"type.entrance.entry" = "Vaid sissepääs";
+"type.entrance.emergency" = "Avariiväljapääs";
+"type.natural.tree" = "Üksik puu";
+"type.xmas.tree" = "Jõulupuu";
+"type.beacon.cardinal.east" = "Idatooder";
+"type.beacon.cardinal.north" = "Põhjatooder";
+"type.beacon.cardinal.south" = "Lõunatooder";
+"type.beacon.cardinal.west" = "Läänetooder";
+"type.buoy.cardinal.east" = "Idapoi";
+"type.buoy.cardinal.north" = "Põhjapoi";
+"type.buoy.cardinal.south" = "Lõunapoi";
+"type.buoy.cardinal.west" = "Läänepoi";
+"type.buoy.lateral.port" = "Lateraalpoi pakpoordis";
+"type.buoy.lateral.starboard" = "Lateraalpoi tüürpoordis";
+"type.buoy.special_purpose" = "Eriotstarbeline poi";
+"type.spherical_buoy.cardinal.east" = "Kerapoi idas";
+"type.spherical_buoy.cardinal.north" = "Kerapoi põhjas";
+"type.spherical_buoy.cardinal.south" = "Kerapoi lõunas";
+"type.spherical_buoy.cardinal.west" = "Kerapoi läänes";
+"type.spherical_buoy.lateral.port" = "Kerapoi pakpoordis";
+"type.spherical_buoy.lateral.starboard" = "Kerapoi tüürpoordis";
+"type.spherical_buoy.special_purpose" = "Eritistarbeline kerapoi";
+"type.spherical_buoy.isolated_danger" = "Kerapoi eraldiasetseva ohu märkimiseks";
+"type.buoy.isolated_danger" = "Poi eraldiasetseva ohu märkimiseks";
+"type.beacon.isolated_danger" = "Tooder eraldiasetseva ohu märkimiseks";
+"type.beacon.lateral.port" = "Lateraalne tooder tüürpoordis";
+"type.beacon.lateral.starboard" = "Lateraalne tooder pakpoordis";
+"type.beacon.special_purpose" = "Eriotstarbeline tooder";
+"type.beacon.safe_water" = "Faarvaatri tooder";
+"type.buoy.safe_water" = "Faarvaatri poi";
+"type.spherical_buoy.safe_water" = "Faarvaatri kerapoi";
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings
index 42979c382..818e28809 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings
@@ -1548,3 +1548,44 @@
 "type.emergency.access_point" = "Point de secours d'urgence";
 "type.emergency.life_ring" = "Bouée de sauvetage";
 "type.shop.beauty.day_spa" = "Spa de jour";
+"type.beacon.cardinal.east" = "Phare cardinal";
+"type.beacon.cardinal.north" = "Phare cardinal";
+"type.beacon.cardinal.south" = "Phare cardinal";
+"type.beacon.cardinal.west" = "Phare cardinal";
+"type.beacon.isolated_danger" = "Balise de danger isolée";
+"type.beacon.lateral.port" = "Balise latérale";
+"type.beacon.lateral.starboard" = "Balise latérale";
+"type.beacon.safe_water" = "Balise d'eau potable";
+"type.beacon.special_purpose" = "Balise à usage spécial";
+"type.buoy.cardinal.east" = "Bouée cardinale";
+"type.buoy.cardinal.north" = "Bouée cardinale";
+"type.buoy.cardinal.south" = "Bouée cardinale";
+"type.buoy.cardinal.west" = "Bouée cardinale";
+"type.buoy.isolated_danger" = "Bouée de danger isolée";
+"type.buoy.lateral.port" = "Bouée latérale";
+"type.buoy.lateral.starboard" = "Bouée latérale";
+"type.buoy.safe_water" = "Bouée en eau sûre";
+"type.buoy.special_purpose" = "Bouée à usage spécial";
+"type.spherical_buoy.cardinal.east" = "Bouée cardinale sphérique";
+"type.spherical_buoy.cardinal.north" = "Bouée cardinale sphérique";
+"type.spherical_buoy.cardinal.south" = "Bouée cardinale sphérique";
+"type.spherical_buoy.cardinal.west" = "Bouée cardinale sphérique";
+"type.spherical_buoy.isolated_danger" = "Bouée de danger sphérique isolée";
+"type.spherical_buoy.lateral.port" = "Bouée latérale sphérique";
+"type.spherical_buoy.lateral.starboard" = "Bouée latérale sphérique";
+"type.spherical_buoy.safe_water" = "Bouée sphérique de sécurité en eau";
+"type.spherical_buoy.special_purpose" = "Bouée sphérique à usage spécial";
+"type.lateral.port" = "Port";
+"type.lateral.starboard" = "Tribord";
+"type.cardinal.east" = "Est";
+"type.cardinal.north" = "Nord";
+"type.cardinal.south" = "Sud";
+"type.cardinal.west" = "Ouest";
+"type.entrance.house" = "Entrée de la maison";
+"type.entrance.garage" = "Entrée du garage";
+"type.entrance.service" = "Entrée de service";
+"type.entrance.entry" = "Entrée (uniquement)";
+"type.entrance.emergency" = "Issue de secours";
+"type.natural.sand" = "Sable";
+"type.xmas.tree" = "Arbre de Noël";
+"type.natural.tree" = "Arbre";
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index 95bb8e719..dcbc6f6a6 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -697,8 +697,8 @@
 "editor_share_to_all_dialog_title" = "Vil du sende det til alle brukere?";
 
 /* Dialog before publishing the modifications to the public map. */
-"editor_share_to_all_dialog_message_1" = "Sørg for at du ikke har skrevet noe personlig informasjon.";
-"editor_share_to_all_dialog_message_2" = "OpenStreetMap-redaktører vil sjekke endringene og ta kontakt med deg hvis de har spørsmål.";
+"editor_share_to_all_dialog_message_1" = "Sørg for at du ikke har angitt noen private eller personlige data.";
+"editor_share_to_all_dialog_message_2" = "OpenStreetMap-redaktører vil sjekke endringene og kontakte deg hvis de har spørsmål.";
 "navigation_stop_button" = "Stopp";
 
 /* iOS dialog for the case when recent track recording is on and the app comes back from background */
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings
index 3c4594bfa..17bbd93bd 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings
@@ -371,7 +371,7 @@
 
 /* This is for main/primary entrances, for secondary entrances see type.entrance */
 "type.entrance.main" = "Hovedinngang";
-"type.entrance.exit" = "Utgang";
+"type.entrance.exit" = "Utgang (bare)";
 "type.fee.yes" = "$";
 "type.fee.no" = "Gratis";
 "type.healthcare.laboratory" = "Medisinsk laboratorium";
@@ -1535,3 +1535,12 @@
 "type.shop.telecommunication" = "Telekommunikasjonsbutikk";
 "type.amenity.boat_rental" = "Båtutleie";
 "type.emergency.life_ring" = "Livbøye";
+"type.natural.sand" = "Sand";
+"type.natural.tree" = "Tre";
+"type.cardinal.south" = "Sør";
+"type.cardinal.north" = "Nord";
+"type.cardinal.east" = "Øst";
+"type.cardinal.west" = "Vest";
+"type.xmas.tree" = "Juletre";
+"type.entrance.emergency" = "Nødutgang";
+"type.entrance.entry" = "Inngang (bare)";
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings
index 249d29d59..19f458516 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings
@@ -371,7 +371,7 @@
 
 /* This is for main/primary entrances, for secondary entrances see type.entrance */
 "type.entrance.main" = "Hoofdingang";
-"type.entrance.exit" = "Ga naar";
+"type.entrance.exit" = "Uitgang (enig)";
 "type.fee.yes" = "€";
 "type.fee.no" = "Gratis";
 "type.healthcare.laboratory" = "Medisch laboratorium";
@@ -451,8 +451,8 @@
 
 /* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
 "type.highway.path.expert" = "Zeer moeilijk of niet te onderscheiden spoor";
-"type.highway.path.bicycle" = "Fietspad";
-"type.highway.footway.bicycle" = "Fietspad";
+"type.highway.path.bicycle" = "Fiets- & voetpad";
+"type.highway.footway.bicycle" = "Fiets- & voetpad";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Brug";
@@ -1544,3 +1544,42 @@
 "type.amenity.sailing_school" = "Zeilschool";
 "type.amenity.flight_school" = "Vliegschool";
 "type.amenity.prep_school" = "Bijscholing";
+"type.natural.sand" = "Zand";
+"type.cardinal.east" = "Oost";
+"type.cardinal.north" = "Noorden";
+"type.cardinal.south" = "Zuiden";
+"type.natural.tree" = "Boom";
+"type.beacon.cardinal.east" = "Kardinaal baken";
+"type.beacon.cardinal.north" = "Kardinaal baken";
+"type.beacon.cardinal.south" = "Kardinaal baken";
+"type.beacon.cardinal.west" = "Kardinaal baken";
+"type.beacon.lateral.port" = "Lateraal baken";
+"type.beacon.lateral.starboard" = "Lateraal baken";
+"type.beacon.safe_water" = "Scheidingsbaken";
+"type.beacon.special_purpose" = "Speciaal baken";
+"type.buoy.cardinal.east" = "Kardinale boei";
+"type.buoy.cardinal.north" = "Kardinale boei";
+"type.buoy.cardinal.south" = "Kardinale boei";
+"type.buoy.cardinal.west" = "Kardinale boei";
+"type.buoy.lateral.port" = "Laterale boei";
+"type.buoy.lateral.starboard" = "Laterale boei";
+"type.buoy.safe_water" = "Scheidingsboei";
+"type.buoy.special_purpose" = "Speciale boei";
+"type.spherical_buoy.cardinal.east" = "Sferische kardinale boei";
+"type.spherical_buoy.cardinal.north" = "Sferische kardinale boei";
+"type.spherical_buoy.cardinal.south" = "Sferische kardinale boei";
+"type.spherical_buoy.cardinal.west" = "Sferische kardinale boei";
+"type.spherical_buoy.lateral.port" = "Sferische laterale boei";
+"type.spherical_buoy.lateral.starboard" = "Sferische laterale boei";
+"type.spherical_buoy.safe_water" = "Sferische scheidingsboei";
+"type.spherical_buoy.special_purpose" = "Sferische speciale boei";
+"type.lateral.port" = "Haven";
+"type.lateral.starboard" = "Stuurboord";
+"type.cardinal.west" = "West";
+"type.entrance.house" = "Huis entree";
+"type.entrance.garage" = "Garage entree";
+"type.entrance.service" = "Dienstingang";
+"type.entrance.entry" = "Ingang (enig)";
+"type.entrance.emergency" = "Nooduitgang";
+"type.xmas.tree" = "Kerstboom";
+"type.shop.beauty.day_spa" = "Schoonheidssalon";
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index 16fe82583..dc7127dc5 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -700,8 +700,8 @@
 "editor_share_to_all_dialog_title" = "Deseja enviar para todos os usuários?";
 
 /* Dialog before publishing the modifications to the public map. */
-"editor_share_to_all_dialog_message_1" = "Certifique-se de não ter incluído nenhum dado pessoal.";
-"editor_share_to_all_dialog_message_2" = "Os editores do OpenStreetMap verificarão as mudanças e entrarão em contato com você se tiverem alguma dúvida.";
+"editor_share_to_all_dialog_message_1" = "Certifique-se de não ter incluído nenhum dado privado ou pessoal.";
+"editor_share_to_all_dialog_message_2" = "Os mapeadores do OpenStreetMap verificarão as alterações e entrarão em contato caso tenham alguma dúvida.";
 "navigation_stop_button" = "Parar";
 
 /* iOS dialog for the case when recent track recording is on and the app comes back from background */
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings
index e62b3db13..513ef98b3 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings
@@ -371,7 +371,7 @@
 
 /* This is for main/primary entrances, for secondary entrances see type.entrance */
 "type.entrance.main" = "Entrada principal";
-"type.entrance.exit" = "Saída";
+"type.entrance.exit" = "Saída (apenas)";
 "type.fee.yes" = "$";
 "type.fee.no" = "Gratuito";
 "type.healthcare.laboratory" = "Laboratório médico";
@@ -1544,3 +1544,48 @@
 "type.shop.telecommunication" = "Loja de Telecomunicação";
 "type.emergency.access_point" = "Ponto de Resgate de Emergência";
 "type.emergency.life_ring" = "Boia salva-vidas";
+"type.amenity.sailing_school" = "Escola de vela";
+"type.amenity.flight_school" = "Escola de aviação";
+"type.amenity.prep_school" = "Cursinho";
+"type.beacon.cardinal.east" = "Marca cardinal";
+"type.beacon.cardinal.north" = "Marca cardinal";
+"type.beacon.cardinal.south" = "Marca cardinal";
+"type.beacon.cardinal.west" = "Marco cardinal";
+"type.beacon.isolated_danger" = "Marco de período isolado";
+"type.beacon.lateral.port" = "Marca lateral";
+"type.natural.sand" = "Areia";
+"type.buoy.lateral.starboard" = "Boia lateral";
+"type.buoy.safe_water" = "Boia de águas seguras";
+"type.buoy.special_purpose" = "Boia para fins especiais";
+"type.spherical_buoy.cardinal.east" = "Boia cardinal esférica";
+"type.spherical_buoy.cardinal.north" = "Boia cardinal esférica";
+"type.spherical_buoy.cardinal.south" = "Boia cardinal esférica";
+"type.spherical_buoy.cardinal.west" = "Boia cardinal esférica";
+"type.spherical_buoy.isolated_danger" = "Boia esférica de perigo isolado";
+"type.spherical_buoy.lateral.port" = "Boia esférica lateral";
+"type.spherical_buoy.lateral.starboard" = "Boia esférica lateral";
+"type.spherical_buoy.safe_water" = "Boia esférica de águas seguras";
+"type.spherical_buoy.special_purpose" = "Boia esférica para fins especiais";
+"type.lateral.port" = "Bombordo";
+"type.lateral.starboard" = "Estibordo";
+"type.cardinal.east" = "Leste";
+"type.cardinal.north" = "Norte";
+"type.cardinal.south" = "Sul";
+"type.cardinal.west" = "Oeste";
+"type.entrance.house" = "Entrada de casa";
+"type.entrance.garage" = "Entrada de garagem";
+"type.entrance.service" = "Entrada de serviço";
+"type.entrance.entry" = "Entrada (apenas)";
+"type.entrance.emergency" = "Saída de emergência";
+"type.natural.tree" = "Árvore";
+"type.shop.beauty.day_spa" = "Spa sem alojamento";
+"type.xmas.tree" = "Árvore de natal";
+"type.beacon.lateral.starboard" = "Marco lateral";
+"type.beacon.safe_water" = "Marco de águas seguras";
+"type.beacon.special_purpose" = "Marco de fins especiais";
+"type.buoy.cardinal.east" = "Boia cardeal";
+"type.buoy.cardinal.north" = "Boia cardeal";
+"type.buoy.cardinal.south" = "Boia cardeal";
+"type.buoy.cardinal.west" = "Boia cardeal";
+"type.buoy.isolated_danger" = "Boia de perigo isolado";
+"type.buoy.lateral.port" = "Boia lateral";
diff --git a/iphone/Maps/LocalizedStrings/sl.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sl.lproj/LocalizableTypes.strings
index e5f59e2a3..42d2a84c0 100644
--- a/iphone/Maps/LocalizedStrings/sl.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/sl.lproj/LocalizableTypes.strings
@@ -235,3 +235,12 @@
 "type.amenity.vending_machine.newspapers" = "Avtomat za časopis";
 "type.amenity.vending_machine.parking_tickets" = "Avtomat za parkirne listke";
 "type.amenity.vending_machine.sweets" = "Avtomat za sladkarije";
+"type.entrance.emergency" = "Izhod v sili";
+"type.fee.yes" = "€";
+"type.fee.no" = "Plačilo";
+"type.healthcare.physiotherapist" = "Fizioterapevt";
+"type.healthcare.alternative" = "Alternativno zdravljenje";
+"type.healthcare.audiologist" = "Strokovnjak za sluh";
+"type.healthcare.blood_donation" = "Središče za darovanje krvi";
+"type.healthcare.optometrist" = "Optometrist";
+"type.healthcare.podiatrist" = "Podiater";
diff --git a/iphone/Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings
index ac7ca93c9..97182325a 100644
--- a/iphone/Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings
@@ -371,7 +371,7 @@
 
 /* This is for main/primary entrances, for secondary entrances see type.entrance */
 "type.entrance.main" = "Главни улаз";
-"type.entrance.exit" = "Излаз";
+"type.entrance.exit" = "Излаз (искључиво)";
 "type.fee.yes" = "$";
 "type.fee.no" = "Бесплатно";
 "type.healthcare.laboratory" = "Медицинска лабораторија";
@@ -1545,3 +1545,47 @@
 "type.shop.beauty.day_spa" = "Дневни спа";
 "type.emergency.life_ring" = "Појас за спасавање";
 "type.emergency.access_point" = "Спасилачка тачка";
+"type.natural.sand" = "Песак";
+"type.amenity.sailing_school" = "Школа једрења";
+"type.amenity.flight_school" = "Школа летења";
+"type.amenity.prep_school" = "Припремна школа";
+"type.beacon.cardinal.east" = "Кардинални светионик";
+"type.beacon.cardinal.north" = "Кардинални светионик";
+"type.beacon.cardinal.south" = "Кардинални светионик";
+"type.beacon.cardinal.west" = "Кардинални светионик";
+"type.beacon.isolated_danger" = "Светионик изоловане опасности";
+"type.beacon.lateral.port" = "Бочни светионик";
+"type.beacon.lateral.starboard" = "Бочни светионик";
+"type.beacon.safe_water" = "Светионик безбедне воде";
+"type.beacon.special_purpose" = "Светионик посебне намене";
+"type.buoy.cardinal.east" = "Кардинална бова";
+"type.buoy.cardinal.north" = "Кардинална бова";
+"type.buoy.cardinal.south" = "Кардинална бова";
+"type.buoy.cardinal.west" = "Кардинална бова";
+"type.buoy.isolated_danger" = "Бова изоловане опасности";
+"type.buoy.lateral.port" = "Бочна бова";
+"type.buoy.lateral.starboard" = "Бочна бова";
+"type.buoy.safe_water" = "Бова безбедне воде";
+"type.buoy.special_purpose" = "Бова посебне намене";
+"type.spherical_buoy.cardinal.east" = "Сферна кардинална бова";
+"type.spherical_buoy.cardinal.north" = "Сферна кардинална бова";
+"type.spherical_buoy.cardinal.south" = "Сферна кардинална бова";
+"type.spherical_buoy.cardinal.west" = "Сферна кардинална бова";
+"type.spherical_buoy.isolated_danger" = "Сферна бова изоловане опасности";
+"type.spherical_buoy.lateral.port" = "Сферна бочна бова";
+"type.spherical_buoy.lateral.starboard" = "Сферна бочна бова";
+"type.spherical_buoy.safe_water" = "Сферна бова безбедне воде";
+"type.spherical_buoy.special_purpose" = "Сферна бова посебне намене";
+"type.lateral.port" = "Лево (порт)";
+"type.lateral.starboard" = "Десно (старборд)";
+"type.cardinal.east" = "Исток";
+"type.cardinal.north" = "Север";
+"type.cardinal.south" = "Југ";
+"type.cardinal.west" = "Запад";
+"type.entrance.house" = "Улаз у кућу";
+"type.entrance.garage" = "Улаз у гаражу";
+"type.entrance.service" = "Сервисни улаз";
+"type.entrance.entry" = "Улаз (искључиво)";
+"type.entrance.emergency" = "Улаз за хитне случајеве";
+"type.natural.tree" = "Дрво";
+"type.xmas.tree" = "Божићна јелка";
diff --git a/iphone/Maps/LocalizedStrings/ta.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/ta.lproj/Localizable.stringsdict
new file mode 100644
index 000000000..36a870670
--- /dev/null
+++ b/iphone/Maps/LocalizedStrings/ta.lproj/Localizable.stringsdict
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+    </dict>
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index 60f470605..ab45b3ed2 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -700,8 +700,8 @@
 "editor_share_to_all_dialog_title" = "您想要发送给所有用户吗？";
 
 /* Dialog before publishing the modifications to the public map. */
-"editor_share_to_all_dialog_message_1" = "确保您没有输入任何个人数据。";
-"editor_share_to_all_dialog_message_2" = "OpenStreetMap 编辑人员将检查更改并在有任何问题时与您联系。";
+"editor_share_to_all_dialog_message_1" = "请确保您没有输入任何私人或个人数据。";
+"editor_share_to_all_dialog_message_2" = "OpenStreetMap 编辑人员将检查更改，如有任何疑问，将与您联系。";
 "navigation_stop_button" = "停止";
 
 /* iOS dialog for the case when recent track recording is on and the app comes back from background */
@@ -820,7 +820,7 @@
 "avoid_tolls" = "避开收费公路";
 
 /* Recommended length for CarPlay and Android Auto is around 25-27 characters */
-"avoid_unpaved" = "避开非铺装道路‌";
+"avoid_unpaved" = "避开非铺装道路";
 
 /* Recommended length for CarPlay and Android Auto is around 25-27 characters */
 "avoid_ferry" = "避开轮渡";
@@ -830,7 +830,7 @@
 "define_to_avoid_btn" = "选择要避开的道路";
 "change_driving_options_btn" = "绕行设置已开启";
 "toll_road" = "收费公路";
-"unpaved_road" = "非铺装道路‌";
+"unpaved_road" = "非铺装道路";
 "ferry_crossing" = "轮渡";
 "trip_start" = "出发";
 "pick_destination" = "目的地";