diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
index 32a6a5853..a980a8847 100644
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -502,7 +502,7 @@
     <string name="placepage_edit_bookmark_button">Lesezeichen bearbeiten</string>
     <string name="placepage_personal_notes_hint">Persönliche Notizen (Text oder html)</string>
     <string name="editor_reset_edits_message">Alle lokalen Änderungen verwerfen?</string>
-    <string name="editor_reset_edits_button">Verwerfen</string>
+    <string name="editor_reset_edits_button">Änderungen verwerfen</string>
     <string name="editor_remove_place_message">Hinzugefügtes Objekt löschen?</string>
     <string name="editor_remove_place_button">Löschen</string>
     <string name="editor_place_doesnt_exist">Dieser Ort existiert nicht</string>
@@ -902,9 +902,17 @@
         <item quantity="other">%d min</item>
     </plurals>
     <string name="editor_business_vacant_button">Geschäft steht leer</string>
-    <string name="editor_mark_business_vacant_title">Geschäft als leerstehend markieren</string>
+    <string name="editor_mark_business_vacant_title">Geschäft auf leerstehend setzen</string>
     <string name="editor_submit">Absenden</string>
-    <string name="editor_mark_business_vacant_description">Wenn das Unternehmen ausgezogen ist und die Fläche leer und bereit für die nächste Miete ist.</string>
+    <string name="editor_mark_business_vacant_description">Verwenden Sie diese Option, wenn das Geschäft ausgezogen ist und ein neues Geschäft die leerstehenden Räume übernehmen könnte.</string>
     <string name="charge_socket_schuko">Schuko</string>
     <string name="power_management">Energiemanagement</string>
+    <string name="place_page_map_too_old_title">Kartendaten veraltet</string>
+    <string name="place_page_map_too_old_description">Die aktuellen Kartendaten sind sehr alt, bitte aktualisiere die Karte.</string>
+    <string name="place_page_app_too_old_description">Die aktuellen Kartendaten sind sehr alt, bitte aktualisiere die CoMaps-App.</string>
+    <string name="place_page_update_too_old_map">Kartenregion aktualisieren</string>
+    <string name="place_page_too_old_to_edit">OpenStreetMap-Bearbeitung ist deaktiviert, da die Kartendaten zu alt sind.</string>
+    <string name="prefs_speed_cameras_information">Blitzerwarnungen sind in Ländern deaktiviert, in denen Warnungen durch lokale Gesetze verboten sind.</string>
+    <string name="navigation_start_tts_message">"Navigation wird gestartet, Sprache der Sprachansagen: "</string>
+    <string name="navigation_start_tts_disabled_message">Sprachansagen deaktiviert: TTS-Engine nicht verfügbar</string>
 </resources>
diff --git a/android/app/src/main/res/values-fa/strings.xml b/android/app/src/main/res/values-fa/strings.xml
index 45fd67937..cd0fc89d3 100644
--- a/android/app/src/main/res/values-fa/strings.xml
+++ b/android/app/src/main/res/values-fa/strings.xml
@@ -42,15 +42,15 @@
     <!-- Text in About screen -->
     <string name="about_proposition_3">• آفلاین، چابک و جمع و جور</string>
     <!-- Text in About screen -->
-    <string name="about_developed_by_enthusiasts">منبع کاملا باز، نه برای سود، تصمیم گیری شفاف و امور مالی شفاف.</string>
+    <string name="about_developed_by_enthusiasts">ویدابُن بُوَندگ، نه ازبرای سود، وزیریدن اود تیس‌های مالی رو راست.</string>
     <!-- The button that opens system location settings -->
     <string name="location_settings">پیکربندی‌های گیاگ</string>
     <string name="close">بستن</string>
-    <string name="unsupported_phone">متأسفانه دستگاه شما از آن پشتیبانی نمی‌کندبرنامه برای اجرا به OpenGL نیازمند است.</string>
+    <string name="unsupported_phone">برنامه به OpenGL نیازمند است.شوربختانه، از دستگاه شما پشتیبانی نمی‌شود.</string>
     <string name="download">بارگیری</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="not_enough_free_space_on_sdcard">لطفا مقداری از فضای ذخیره‌سازی را آزاد نمایید</string>
-    <string name="download_resources">قبل از استفاده از اپلیکیشن, اجازه دهید تا ما نقشه جهانی را بر روی موبایل شما دانلود کنیم. \nمقدار %s از حافظه شما اشغال می شود.</string>
+    <string name="not_enough_free_space_on_sdcard">لطفا پیش از بکارگیری برنامه، نخست کمی جا در کارت SD/ویر USB آزاد کنید</string>
+    <string name="download_resources">پیش از بکارگیری برنامه, لطفا نقشه پیش‌نمایش جهانی را بر روی دستگاه خویش بارگیری کنید.\nاندازه %s از ویر شما را می‌گیرد.</string>
     <string name="download_resources_continue">برو به نقشه</string>
     <string name="downloading_country_can_proceed">بارگیری می‌شود %1$s (%2$s). شما اکنون می‌توانید\nبه نقشه بروید.</string>
     <string name="download_country_ask">بارگیری %1$s؟ (%2$s)</string>
@@ -64,7 +64,7 @@
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">افزودن پهرستی نو</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">نشانه‌ها</string>
+    <string name="bookmarks">نشانگ‌ها</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">نشانه‌ها و مسیر ها</string>
     <!-- Add bookmark dialog - bookmark name -->
@@ -138,7 +138,7 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">یادداشت‌ها</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">در حال بارگیری نشانه‌ها</string>
+    <string name="load_kmz_title">بارگذاری نشانگ‌ها</string>
     <!-- Kmz file successful loading -->
     <string name="load_kmz_successful">نشانه‌ها با موفقیت بارگذاری شد!شما می توانید آنها را در نقشه یا بخش مدیریت نشانه‌ها بیابید.</string>
     <!-- Kml file loading failed -->
@@ -784,4 +784,6 @@
     <string name="backup_interval_every_week">هفتگی</string>
     <string name="backup_interval_manual_only">خاموش (تنها به شیوه دستی)</string>
     <string name="backup_interval_every_day">روزانه</string>
+    <string name="disconnect_usb_cable">برای بکارگیری CoMaps، لطفا USB را بگسلانید یا کارت‌ویر را اندرون گذارید.</string>
+    <string name="bookmark_set_name">نام پهرست نشانگ‌ها</string>
 </resources>
diff --git a/android/app/src/main/res/values-kw/strings.xml b/android/app/src/main/res/values-kw/strings.xml
index b31a183ba..3cad28a29 100644
--- a/android/app/src/main/res/values-kw/strings.xml
+++ b/android/app/src/main/res/values-kw/strings.xml
@@ -373,4 +373,6 @@
     <string name="offline_explanation_title">Mappys Dhywarlinen</string>
     <string name="category_shopping">Gwerthjiow</string>
     <string name="edit">Golegi</string>
+    <string name="downloader_no_space_title">Nyns eus lowr dalghuster</string>
+    <string name="translated_om_site_url">https://comaps.app/</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 34b540000..02060bfd2 100644
--- a/android/app/src/main/res/values-nb/strings.xml
+++ b/android/app/src/main/res/values-nb/strings.xml
@@ -503,7 +503,7 @@
     <string name="placepage_edit_bookmark_button">Rediger bokmerke</string>
     <string name="placepage_personal_notes_hint">Personlige notater (tekst eller html)</string>
     <string name="editor_reset_edits_message">Forkaste alle lokale endringer?</string>
-    <string name="editor_reset_edits_button">Forkast</string>
+    <string name="editor_reset_edits_button">Forkast endringer</string>
     <string name="editor_remove_place_message">Slette tillagt sted?</string>
     <string name="editor_remove_place_button">Slett</string>
     <string name="editor_place_doesnt_exist">Sted finnes ikke</string>
@@ -906,4 +906,10 @@
     <string name="place_page_too_old_to_edit">OpenStreetMap-redigering er deaktivert fordi kartdataene er for gamle.</string>
     <string name="osm_note_hint">Alternativt, så kan du legge til et notat i OpenStreetMap, slik at noen andre kan redigere eller legge til stedet.</string>
     <string name="osm_note_toast">Notatet vil bli sendt til OpenStreetMap</string>
+    <string name="advanced">Avansert</string>
+    <string name="download_resources_custom_url_summary_none">Ikke angitt</string>
+    <string name="download_resources_custom_url_error_scheme">Angi en fullstendig nettadresse som starter med https:// og slutter med /</string>
+    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
+    <string name="download_resources_custom_url_message">Overstyr standardserveren som brukes til nedlasting av kart. La det stå tomt for å bruke CoMaps standardserver.</string>
+    <string name="download_resources_custom_url_title">Tilpasset kartserver</string>
 </resources>
diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml
index 8bdf59cdb..f798f777a 100644
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -909,4 +909,10 @@
     <string name="prefs_speed_cameras_information">Avisos de câmaras de velocidade estão desativados em países onde alertas estão proibidos por lei.</string>
     <string name="navigation_start_tts_message">"Iniciando Navegação, idioma das instruções por voz: "</string>
     <string name="navigation_start_tts_disabled_message">Instruções por voz desativadas: nenhum motor de TTS disponível</string>
+    <string name="advanced">Avançadas</string>
+    <string name="download_resources_custom_url_title">Servidor de Mapa Personalizado</string>
+    <string name="download_resources_custom_url_message">Substitui o servidor de download de mapas normal. Deixe em branco para usar o servidor do CoMaps padrão.</string>
+    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
+    <string name="download_resources_custom_url_summary_none">Indefinido</string>
+    <string name="download_resources_custom_url_error_scheme">Por favor insira um URL inteiro começando com https:// e acabando com /</string>
 </resources>
diff --git a/android/app/src/main/res/values-ro/strings.xml b/android/app/src/main/res/values-ro/strings.xml
index 4dbce2f54..e530efe2f 100644
--- a/android/app/src/main/res/values-ro/strings.xml
+++ b/android/app/src/main/res/values-ro/strings.xml
@@ -277,7 +277,7 @@
     <!-- Preference title -->
     <string name="google_play_services">Serviciul de Localizare Fuzionat Google</string>
     <!-- Preference text -->
-    <string name="pref_use_google_play">Un serviciu proprietar care combină GPS, Wi-Fi, rețelele celulare etc. pentru a-ți determina locația mai precisă. Se poate conecta la serverele Google.</string>
+    <string name="pref_use_google_play">Un serviciu proprietar care combină GPS, Wi-Fi, rețelele celulare etc. pentru a-ți determina locația mai precis. Se poate conecta la serverele Google.</string>
     <!-- Preference title -->
     <!-- Preference description -->
     <!-- Text for routing error dialog -->
@@ -460,7 +460,7 @@
     <string name="osm_presentation">Date OpenStreetMap create de comunitate la data de %s. Aflați mai multe despre cum să editați și să actualizați harta la OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
     <string name="login_osm_presentation">OpenStreetMap.org (OSM) este un proiect comunitar pentru construirea unei hărți libere și deschise. Este principala sursă de date cartografice în CoMaps și funcționează similar cu Wikipedia. Puteți adăuga sau edita locuri, iar acestea devin disponibile pentru milioane de utilizatori din întreaga lume. \nAlăturați-vă comunității și ajutați la crearea unei hărți mai bune pentru toată lumea!</string>
-    <string name="login_to_make_edits_visible">Creați un cont OpenStreetMap sau conectați-vă pentru a vă publica edițiile de hartă în întreaga lume</string>
+    <string name="login_to_make_edits_visible">Creați un cont OpenStreetMap sau conectați-vă pentru a vă publica editările hărții pentru întreaga lume</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d din %2$d</string>
     <string name="download_over_mobile_header">Vrei să descarci prin rețeaua de telefonie mobilă?</string>
@@ -475,7 +475,7 @@
     <!-- Hint of the input field in the OSM note section of the editor -->
     <string name="editor_note_hint">Descrieți erorile de pe hartă sau lucrurile care nu pot fi editate cu CoMaps</string>
     <!-- Information about OSM at the top of the editing page -->
-    <string name="editor_about_osm">Edițiile dvs. sunt încărcate în baza de date publică <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a>. Vă rugăm să nu adăugați informații personale sau protejate prin drepturi de autor.</string>
+    <string name="editor_about_osm">Editările dvs. sunt încărcate în baza de date publică <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a>. Vă rugăm să nu adăugați informații personale sau protejate prin drepturi de autor.</string>
     <string name="editor_more_about_osm">Mai multe despre OpenStreetMap</string>
     <string name="editor_osm_history">Istoricul dvs. de editare</string>
     <string name="editor_osm_notes">Note privind datele hărții dvs</string>
@@ -889,4 +889,13 @@
     <string name="list_description_empty">Editează lista ca să adaugi o descriere</string>
     <string name="charging_station_available_sockets">Conectori</string>
     <string name="charge_socket_unknown_other">Alte tipuri necunoscute</string>
+    <string name="place_page_map_too_old_title">Harta este prea veche</string>
+    <string name="place_page_map_too_old_description">Harta dvs. este foarte veche, vă rugăm actualizați-o.</string>
+    <string name="place_page_app_too_old_description">Harta dvs. este foarte veche, vă rugăm actualizați CoMaps.</string>
+    <string name="place_page_update_too_old_map">Actualizează harta</string>
+    <string name="place_page_too_old_to_edit">Editarea OpenStreetMap este dezactivată pentru că harta descărcată este prea veche.</string>
+    <string name="prefs_speed_cameras_information">Avertizările pentru radare sunt dezactivate unde avertizarea este interzisă de legea locală.</string>
+    <string name="navigation_start_tts_disabled_message">Instrucțiuni vocale dezactivate: Nu este disponibil niciun sistem TTS</string>
+    <string name="charge_socket_count">Număr</string>
+    <string name="unknown_count">Necunoscut</string>
 </resources>
diff --git a/android/app/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml
index 1afab5a1a..025988778 100644
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -893,4 +893,5 @@
     <string name="unknown_count">bilinmiyor</string>
     <string name="error_value_must_be_positive">Değer pozitif olmalıdır</string>
     <string name="error_invalid_number">Geçersiz sayı</string>
+    <string name="avoid_paved">Asfalt yollardan kaçın</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-es/types_strings.xml b/android/sdk/src/main/res/values-es/types_strings.xml
index 06ae2c8ef..091ec591e 100644
--- a/android/sdk/src/main/res/values-es/types_strings.xml
+++ b/android/sdk/src/main/res/values-es/types_strings.xml
@@ -707,7 +707,7 @@
     <string name="type.natural.beach.sand">Playa de arena</string>
     <string name="type.natural.beach.gravel">Playa de grava</string>
     <string name="type.natural.cape">Cabo</string>
-    <string name="type.natural.cave_entrance">Cueva</string>
+    <string name="type.natural.cave_entrance">Entrada de cueva</string>
     <string name="type.natural.cliff">Acantilado</string>
     <string name="type.natural.earth_bank">Talud de tierra</string>
     <string name="type.man_made.embankment">Terraplén</string>
@@ -743,7 +743,7 @@
     <string name="type.natural.wetland.marsh">Ciénaga</string>
     <string name="type.noexit">Sin salida</string>
     <string name="type.office">Oficina</string>
-    <string name="type.office.company">Oficina</string>
+    <string name="type.office.company">Oficina de compañía</string>
     <string name="type.office.estate_agent">Agente inmobiliario</string>
     <string name="type.office.government">Oficina gubernamental</string>
     <string name="type.office.insurance">Oficina de seguros</string>
@@ -784,13 +784,13 @@
     <string name="type.place.state">Estado</string>
     <string name="type.place.state.USA">Estado</string>
     <!-- Named part of a city or town, bigger than place=quarter (Wiki: https://wiki.openstreetmap.org/wiki/Tag:place%3Dsuburb) -->
-    <string name="type.place.suburb">Barrio</string>
+    <string name="type.place.suburb">Suburbio</string>
     <string name="type.place.town">Pueblo</string>
     <string name="type.place.village">Pueblo</string>
     <string name="type.power">Energía</string>
     <string name="type.power.generator">Generador</string>
     <string name="type.power.generator.solar">Generador solar</string>
-    <string name="type.power.generator.wind">Generador de viento</string>
+    <string name="type.power.generator.wind">Aerogenerador</string>
     <string name="type.power.generator.gas">Planta termoeléctrica de gas</string>
     <string name="type.power.generator.hydro">Planta hidroeléctrica</string>
     <string name="type.power.line">Línea eléctrica</string>
@@ -849,10 +849,10 @@
     <string name="type.railway.station">Estación de tren</string>
     <string name="type.railway.station.funicular">Funicular</string>
     <string name="type.railway.station.light_rail">Estación de tren</string>
-    <string name="type.railway.station.light_rail.berlin">Estación de tren</string>
+    <string name="type.railway.station.light_rail.berlin">Estación de tren (S-Bahn)</string>
     <string name="type.railway.station.light_rail.london">Estación de tren</string>
-    <string name="type.railway.station.light_rail.porto">Estación de tren</string>
-    <string name="type.railway.station.monorail">Estación de tren</string>
+    <string name="type.railway.station.light_rail.porto">Estación de metro</string>
+    <string name="type.railway.station.monorail">Estación de monoriel</string>
     <string name="type.railway.station.subway">Estación de metro</string>
     <string name="type.railway.station.subway.adana">Estación de metro</string>
     <string name="type.railway.station.subway.algiers">Estación de metro</string>
@@ -1207,7 +1207,7 @@
     <string name="type.shop.tobacco">Tabaco</string>
     <string name="type.shop.trade">Suministros comerciales</string>
     <string name="type.shop.watches">Relojes</string>
-    <string name="type.shop.wholesale">Almacén al por mayor</string>
+    <string name="type.shop.wholesale">Tienda al por mayor</string>
     <string name="type.sport">Deporte</string>
     <string name="type.sport.american_football">Fútbol americano</string>
     <string name="type.sport.archery">Tiro al arco</string>
@@ -1247,7 +1247,7 @@
     <string name="type.tourism.aquarium">Acuario</string>
     <!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
     <string name="type.tourism.alpine_hut">Albergue de montaña</string>
-    <string name="type.tourism.apartment">Apartamento de vacaciones</string>
+    <string name="type.tourism.apartment">Apartamento vacacional</string>
     <string name="type.tourism.artwork">Obra de arte</string>
     <string name="type.tourism.artwork.architecture">Arte arquitectónico</string>
     <string name="type.tourism.artwork.painting">Pintura</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 3119a643a..131ae8df6 100644
--- a/android/sdk/src/main/res/values-et/types_strings.xml
+++ b/android/sdk/src/main/res/values-et/types_strings.xml
@@ -1494,4 +1494,5 @@
     <string name="type.spherical_buoy.safe_water">Faarvaatri kerapoi</string>
     <string name="type.man_made.mast.communication">Sidemast</string>
     <string name="type.shop.beauty.nails">Küünestuudio</string>
+    <string name="type.amenity.hydrant">Kastmishüdrant</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 8f4e4fff3..2a44d3fde 100644
--- a/android/sdk/src/main/res/values-nl/types_strings.xml
+++ b/android/sdk/src/main/res/values-nl/types_strings.xml
@@ -1500,4 +1500,5 @@
     <string name="type.shop.beauty.nails">Nagelsalon</string>
     <string name="type.amenity.food_sharing">Voedsel delen</string>
     <string name="type.amenity.give_box">Giftenkist</string>
+    <string name="type.amenity.hydrant">Watertappunt|waterkraan</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-pt/types_strings.xml b/android/sdk/src/main/res/values-pt/types_strings.xml
index 429aeec47..a17f14e79 100644
--- a/android/sdk/src/main/res/values-pt/types_strings.xml
+++ b/android/sdk/src/main/res/values-pt/types_strings.xml
@@ -1501,4 +1501,5 @@
     <string name="type.natural.tree">Árvore</string>
     <string name="type.shop.beauty.nails">Salão de Unhas</string>
     <string name="type.xmas.tree">Árvore de Natal</string>
+    <string name="type.amenity.hydrant">Boca de Rega</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 3eb02643e..12e484238 100644
--- a/android/sdk/src/main/res/values-sl/types_strings.xml
+++ b/android/sdk/src/main/res/values-sl/types_strings.xml
@@ -369,4 +369,92 @@
     <string name="type.cuisine.breakfast">Zajtrk</string>
     <string name="type.cuisine.bubble_tea">Čaj s tapiokinimi kroglicami (\'Bubble Tea\')</string>
     <string name="type.cuisine.chicken">Piščanec</string>
+    <string name="type.cuisine.greek">Grška kuhinja</string>
+    <string name="type.cuisine.hungarian">Madžarska kuhinja</string>
+    <string name="type.cuisine.ice_cream">Sladoled</string>
+    <string name="type.cuisine.indian">Indijska kuhinja</string>
+    <string name="type.cuisine.indonesian">Indonezijska kuhinja</string>
+    <string name="type.cuisine.international">Mednarodna kuhinja</string>
+    <string name="type.cuisine.irish">Irska kuhinja</string>
+    <string name="type.cuisine.italian">Italijanska kuhinja</string>
+    <string name="type.cuisine.italian_pizza">Italijanska kuhinja, pica</string>
+    <string name="type.cuisine.japanese">Japonska kuhinja</string>
+    <string name="type.cuisine.korean">Korejska kuhinja</string>
+    <string name="type.cuisine.lao">Laoška kuhinja</string>
+    <string name="type.cuisine.lebanese">Libanonska kuhinja</string>
+    <string name="type.cuisine.local">Krajevna kuhinja</string>
+    <string name="type.cuisine.malaysian">Malezijska kuhinja</string>
+    <string name="type.cuisine.mediterranean">Sredozemska kuhinja</string>
+    <string name="type.cuisine.mexican">Mehiška kuhinja</string>
+    <string name="type.cuisine.moroccan">Maroška kuhinja</string>
+    <string name="type.cuisine.oriental">Orientalska kuhinja</string>
+    <string name="type.cuisine.pancake">Palačinke</string>
+    <string name="type.cuisine.pasta">Testenine</string>
+    <string name="type.cuisine.persian">Perzijska kuhinja</string>
+    <string name="type.cuisine.peruvian">Perujska kuhinja</string>
+    <string name="type.cuisine.pizza">Pica</string>
+    <string name="type.cuisine.polish">Poljska kuhinja</string>
+    <string name="type.cuisine.portuguese">Portugalska kuhinja</string>
+    <string name="type.cuisine.russian">Ruska kuhinja</string>
+    <string name="type.cuisine.sandwich">Sendvič</string>
+    <string name="type.cuisine.sausage">Salama</string>
+    <string name="type.cuisine.savory_pancakes">Slane palačinke</string>
+    <string name="type.cuisine.seafood">Morska hrana</string>
+    <string name="type.cuisine.soba">Soba (ajdovi rezanci)</string>
+    <string name="type.cuisine.spanish">Španska kuhinja</string>
+    <string name="type.cuisine.steak_house">Zrezkarnica</string>
+    <string name="type.cuisine.sushi">Suši</string>
+    <string name="type.cuisine.tea">Čaj</string>
+    <string name="type.cuisine.turkish">Turška kuhinja</string>
+    <string name="type.cuisine.vegan">Veganska kuhinja</string>
+    <string name="type.cuisine.vegetarian">Vegetarijanska kuhinja</string>
+    <string name="type.cuisine.vietnamese">Vietnamska kuhinja</string>
+    <string name="type.emergency">V sili</string>
+    <string name="type.emergency.access_point">Reševalno mesto</string>
+    <string name="type.emergency.assembly_point">Zbirno mesto</string>
+    <string name="type.emergency.life_ring">Reševalni obroč</string>
+    <string name="type.emergency.defibrillator">Defibrilator</string>
+    <string name="type.emergency.fire_hydrant">Požarni hidrant</string>
+    <string name="type.amenity.hydrant">Namakalni hidrant</string>
+    <string name="type.emergency.phone">Telefon v sili</string>
+    <string name="type.emergency.lifeguard">Reševalec</string>
+    <string name="type.beacon.cardinal.east">Glavni usmerjevalni znak</string>
+    <string name="type.beacon.cardinal.north">Glavni usmerjevalni znak</string>
+    <string name="type.beacon.cardinal.south">Glavni usmerjevalni znak</string>
+    <string name="type.beacon.cardinal.west">Glavni usmerjevalni znak</string>
+    <string name="type.beacon.isolated_danger">Usmerjevalni znak ločene nevarnosti</string>
+    <string name="type.craft.caterer">Ponudnik cateringa</string>
+    <string name="type.cuisine.balkan">Balkanska kuhinja</string>
+    <string name="type.cuisine.barbecue">Jedi na žaru</string>
+    <string name="type.cuisine.bavarian">Bavarska kuhinja</string>
+    <string name="type.cuisine.brazilian">Brazilska kuhinja</string>
+    <string name="type.cuisine.burger">Burger</string>
+    <string name="type.cuisine.buschenschank">Vinotoč (Buschenschank)</string>
+    <string name="type.cuisine.deli">Delkatesa</string>
+    <string name="type.cuisine.regional">Regionalna kuhinja</string>
+    <string name="type.cuisine.tapas">Tapas (španski prigrizki)</string>
+    <string name="type.cuisine.thai">Tajska kuhinja</string>
+    <string name="type.beacon.lateral.port">Bočni usmerjevalni znak</string>
+    <string name="type.beacon.lateral.starboard">Bočni usmerjevalni znak</string>
+    <string name="type.beacon.safe_water">Znak varne plovne poti</string>
+    <string name="type.beacon.special_purpose">Usmerjevalni znak posebnega namena</string>
+    <string name="type.buoy.cardinal.east">Glavna boja</string>
+    <string name="type.buoy.cardinal.north">Glavna boja</string>
+    <string name="type.buoy.cardinal.south">Glavna boja</string>
+    <string name="type.buoy.cardinal.west">Glavna boja</string>
+    <string name="type.lateral.port">Pristanišče</string>
+    <string name="type.cardinal.east">Vzhod</string>
+    <string name="type.cardinal.north">Sever</string>
+    <string name="type.cardinal.south">Jug</string>
+    <string name="type.cardinal.west">Zahod</string>
+    <string name="type.emergency.mountain_rescue">Postaja gorskih reševalcev</string>
+    <string name="type.entrance">Vhod</string>
+    <string name="type.entrance.main">Glavni vhod</string>
+    <string name="type.entrance.house">Vhod hiše</string>
+    <string name="type.entrance.garage">Vhod garaže</string>
+    <string name="type.entrance.service">Servisni vhod</string>
+    <string name="type.entrance.entry">Vstop (samo)</string>
+    <string name="type.entrance.exit">Izhod (samo)</string>
+    <string name="type.healthcare.laboratory">Zdravstveni laboratorij</string>
+    <string name="type.healthcare.psychotherapist">Psihoterapevt</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-tr/types_strings.xml b/android/sdk/src/main/res/values-tr/types_strings.xml
index cd4d10328..736e72e94 100644
--- a/android/sdk/src/main/res/values-tr/types_strings.xml
+++ b/android/sdk/src/main/res/values-tr/types_strings.xml
@@ -1399,4 +1399,5 @@
     <string name="type.amenity.ranger_station">Orman Bekçisi</string>
     <string name="type.amenity.bench.backless">Sırtı Açık Bank</string>
     <string name="type.amenity.charging_station.motorcar.small">Araç Şarj Noktası</string>
+    <string name="type.amenity.sailing_school">Denizcilik Okulu</string>
 </resources>
diff --git a/data/countries-strings/sr.json/localize.json b/data/countries-strings/sr.json/localize.json
index a81037187..2d2b4bad9 100644
--- a/data/countries-strings/sr.json/localize.json
+++ b/data/countries-strings/sr.json/localize.json
@@ -550,7 +550,7 @@
 "Italy_Emilia-Romagna_Forli-Cesena":"Покрајина Форли-Чезена",
 "Italy_Emilia-Romagna_Modena":"Покрајина Модена",
 "Italy_Emilia-Romagna_Parma":"Покрајина Парма",
-"Italy_Emilia-Romagna_Piacenza":"Покрајина Пјаћенца",
+"Italy_Emilia-Romagna_Piacenza":"Покрајина Пјаченца",
 "Italy_Emilia-Romagna_Ravenna":"Покрајина Равена",
 "Italy_Emilia-Romagna_Reggio Emilia":"Покрајина Ређо Емилија",
 "Italy_Emilia-Romagna_Rimini":"Покрајина Римини",
@@ -1881,7 +1881,7 @@
 "Italy_Veneto_Treviso Description":"Тревизо, Конелијано, Кастелфранко Венето",
 "Italy_Veneto_Venezia Description":"Венеција, Местре, Кјоџа",
 "Italy_Veneto_Verona Description":"Верона, Вилафранка ди Верона, Лењаго",
-"Italy_Veneto_Vicenza Description":"Вићенца, Басано дел Грапа, Скио",
+"Italy_Veneto_Vicenza Description":"Виченца, Басано дел Грапа, Скио",
 "Jamaica Description":"Кингстон, Монтего Беј, Спениш Таун",
 "Japan_Chubu Region_Aichi_Nagoya Description":"Нагоја, Цушима, Кијосу",
 "Japan_Chubu Region_Aichi_Toyohashi Description":"Тахара, Гамагори, Нишио",
diff --git a/data/sound-strings/de.json/localize.json b/data/sound-strings/de.json/localize.json
index 2dc25addf..f1c9cb5fd 100644
--- a/data/sound-strings/de.json/localize.json
+++ b/data/sound-strings/de.json/localize.json
@@ -28,7 +28,7 @@
 "take_exit_number":"Nehmen Sie die Ausfahrt auf",
 "take_exit_number_street_verb":"NULL",
 "route_recalculating":"Neuberechnung der Route",
-"destination":"Werden Sie ankommen.",
+"destination":"erreichen Sie ihr Ziel.",
 "you_have_reached_the_destination":"Sie haben Ihr Ziel erreicht.",
 "in_50_meters":"In fünfzig Metern",
 "in_100_meters":"In einhundert Metern",
diff --git a/data/sound-strings/nl.json/localize.json b/data/sound-strings/nl.json/localize.json
index 927c0ccac..c334023e2 100644
--- a/data/sound-strings/nl.json/localize.json
+++ b/data/sound-strings/nl.json/localize.json
@@ -1,32 +1,32 @@
 {
 "make_a_slight_right_turn":"Rechts aanhouden.",
-"make_a_slight_right_turn_street":"flauwe bocht naar rechts",
+"make_a_slight_right_turn_street":"een flauwe bocht naar rechts",
 "make_a_right_turn":"Sla rechtsaf.",
 "make_a_right_turn_street":"Sla rechtsaf",
 "make_a_sharp_right_turn":"Scherp rechtsaf.",
 "make_a_sharp_right_turn_street":"scherp naar rechts afslaan",
 "enter_the_roundabout":"Rij de rotonde op.",
-"enter_the_roundabout_street":"de rotonde",
-"enter_the_roundabout_street_verb":"Rijd",
+"enter_the_roundabout_street":"de rotonde op",
+"enter_the_roundabout_street_verb":"Rij",
 "leave_the_roundabout":"Verlaat de rotonde.",
 "leave_the_roundabout_street":"de rotonde",
 "leave_the_roundabout_street_verb":"Verlaat",
 "make_a_slight_left_turn":"Links aanhouden.",
-"make_a_slight_left_turn_street":"de flauwe bocht naar links",
+"make_a_slight_left_turn_street":"een flauwe bocht naar links",
 "make_a_slight_left_turn_street_verb":"Neem",
 "make_a_left_turn":"Sla linksaf.",
-"make_a_left_turn_street":"naar links afslaan",
+"make_a_left_turn_street":"Sla linksaf",
 "make_a_sharp_left_turn":"Scherp linksaf.",
 "make_a_sharp_left_turn_street":"scherp naar links afslaan",
 "make_a_u_turn":"Keer om.",
-"make_a_u_turn_street":"NULL",
-"make_a_u_turn_street_verb":"NULL",
+"make_a_u_turn_street":"om",
+"make_a_u_turn_street_verb":"Keer",
 "go_straight":"Rij rechtdoor.",
 "exit":"Verlaat.",
 "onto":"naar",
 "take_exit_number":"Verlaat naar",
 "take_exit_number_street_verb":"Neem",
-"route_recalculating":"De route herberekenen",
+"route_recalculating":"Route herberekenen",
 "destination":"Arriveert u.",
 "you_have_reached_the_destination":"Bestemming bereikt.",
 "in_50_meters":"Over vijftig meter",
@@ -104,5 +104,5 @@
 "in_1_5_miles":"Over anderhalve mijl",
 "in_2_miles":"Over twee mijl",
 "unknown_camera":"Camera in zicht",
-"make_a_slight_right_turn_street_verb":"NULL"
+"make_a_slight_right_turn_street_verb":"Neem"
 }
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
index 2d4e47675..960fdd73b 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -685,7 +685,7 @@
 "editor_edits_sent_message" = "Ihre Notiz wird an OpenStreetMap gesendet";
 "editor_comment_hint" = "Kommentar…";
 "editor_reset_edits_message" = "Alle lokalen Korrekturen verwerfen?";
-"editor_reset_edits_button" = "Verwerfen";
+"editor_reset_edits_button" = "Änderungen verwerfen";
 "editor_remove_place_message" = "Hinzugefügtes Objekt löschen?";
 "editor_remove_place_button" = "Löschen";
 "editor_place_doesnt_exist" = "Dieser Ort existiert nicht";
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
index ef5ba40cb..438cef8aa 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
@@ -779,7 +779,7 @@
 "type.natural.beach.sand" = "Playa de arena";
 "type.natural.beach.gravel" = "Playa de grava";
 "type.natural.cape" = "Cabo";
-"type.natural.cave_entrance" = "Cueva";
+"type.natural.cave_entrance" = "Entrada de cueva";
 "type.natural.cliff" = "Acantilado";
 "type.natural.earth_bank" = "Talud de tierra";
 "type.man_made.embankment" = "Terraplén";
@@ -815,7 +815,7 @@
 "type.natural.wetland.marsh" = "Ciénaga";
 "type.noexit" = "Sin salida";
 "type.office" = "Oficina";
-"type.office.company" = "Oficina";
+"type.office.company" = "Oficina de compañía";
 "type.office.estate_agent" = "Agente inmobiliario";
 "type.office.government" = "Oficina gubernamental";
 "type.office.insurance" = "Oficina de seguros";
@@ -859,13 +859,13 @@
 "type.place.state.USA" = "Estado";
 
 /* Named part of a city or town, bigger than place=quarter (Wiki: https://wiki.openstreetmap.org/wiki/Tag:place%3Dsuburb) */
-"type.place.suburb" = "Barrio";
+"type.place.suburb" = "Suburbio";
 "type.place.town" = "Pueblo";
 "type.place.village" = "Pueblo";
 "type.power" = "Energía";
 "type.power.generator" = "Generador";
 "type.power.generator.solar" = "Generador solar";
-"type.power.generator.wind" = "Generador de viento";
+"type.power.generator.wind" = "Aerogenerador";
 "type.power.generator.gas" = "Planta termoeléctrica de gas";
 "type.power.generator.hydro" = "Planta hidroeléctrica";
 "type.power.line" = "Línea eléctrica";
@@ -947,10 +947,10 @@
 "type.railway.station" = "Estación de tren";
 "type.railway.station.funicular" = "Funicular";
 "type.railway.station.light_rail" = "Estación de tren";
-"type.railway.station.light_rail.berlin" = "Estación de tren";
+"type.railway.station.light_rail.berlin" = "Estación de tren (S-Bahn)";
 "type.railway.station.light_rail.london" = "Estación de tren";
-"type.railway.station.light_rail.porto" = "Estación de tren";
-"type.railway.station.monorail" = "Estación de tren";
+"type.railway.station.light_rail.porto" = "Estación de metro";
+"type.railway.station.monorail" = "Estación de monoriel";
 "type.railway.station.subway" = "Estación de metro";
 "type.railway.station.subway.adana" = "Estación de metro";
 "type.railway.station.subway.algiers" = "Estación de metro";
@@ -1306,7 +1306,7 @@
 "type.shop.tobacco" = "Tabaco";
 "type.shop.trade" = "Suministros comerciales";
 "type.shop.watches" = "Relojes";
-"type.shop.wholesale" = "Almacén al por mayor";
+"type.shop.wholesale" = "Tienda al por mayor";
 "type.sport" = "Deporte";
 "type.sport.american_football" = "Fútbol americano";
 "type.sport.archery" = "Tiro al arco";
@@ -1348,7 +1348,7 @@
 
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "Albergue de montaña";
-"type.tourism.apartment" = "Apartamento de vacaciones";
+"type.tourism.apartment" = "Apartamento vacacional";
 "type.tourism.artwork" = "Obra de arte";
 "type.tourism.artwork.architecture" = "Arte arquitectónico";
 "type.tourism.artwork.painting" = "Pintura";
diff --git a/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings
index d7d49c7a4..105951424 100644
--- a/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings
@@ -1585,3 +1585,4 @@
 "type.spherical_buoy.safe_water" = "Faarvaatri kerapoi";
 "type.man_made.mast.communication" = "Sidemast";
 "type.shop.beauty.nails" = "Küünestuudio";
+"type.amenity.hydrant" = "Kastmishüdrant";
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
index 7461d3a45..68b76cd5d 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -57,13 +57,13 @@
 "add_new_set" = "افزودن پهرستی نو";
 
 /* Add Bookmark list dialog - hint when the list name is empty */
-"bookmark_set_name" = "Bookmark List Name";
+"bookmark_set_name" = "نام پهرست نشانگ‌ها";
 
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Bookmark Lists";
 
 /* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
-"bookmarks" = "نشانه‌ها";
+"bookmarks" = "نشانگ‌ها";
 
 /* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
 "bookmarks_and_tracks" = "نشانه‌ها و مسیر ها";
@@ -151,7 +151,7 @@
 "share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks; please open them in CoMaps. If you don't have it installed you can download it here: https://www.comaps.app/download/\n\nEnjoy travelling with CoMaps!";
 
 /* message title of loading file */
-"load_kmz_title" = "در حال بارگیری نشانه‌ها";
+"load_kmz_title" = "بارگذاری نشانگ‌ها";
 
 /* Kmz file successful loading */
 "load_kmz_successful" = "نشانه‌ها با موفقیت بارگذاری شد!شما می توانید آنها را در نقشه یا بخش مدیریت نشانه‌ها بیابید.";
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index dcbc6f6a6..27f33c22a 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -680,7 +680,7 @@
 "editor_edits_sent_message" = "Notatet ditt vil bli sendt til OpenStreetMap";
 "editor_comment_hint" = "Kommentar…";
 "editor_reset_edits_message" = "Forkaste alle lokale endringer?";
-"editor_reset_edits_button" = "Forkast";
+"editor_reset_edits_button" = "Forkast endringer";
 "editor_remove_place_message" = "Slette tillagt sted?";
 "editor_remove_place_button" = "Slett";
 "editor_place_doesnt_exist" = "Sted finnes ikke";
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings
index 5d12bbb77..7f9e44731 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings
@@ -1591,3 +1591,4 @@
 "type.shop.beauty.nails" = "Nagelsalon";
 "type.amenity.food_sharing" = "Voedsel delen";
 "type.amenity.give_box" = "Giftenkist";
+"type.amenity.hydrant" = "Watertappunt|waterkraan";
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings
index 8b0a04c16..999189508 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings
@@ -1591,3 +1591,4 @@
 "type.natural.tree" = "Árvore";
 "type.shop.beauty.nails" = "Salão de Unhas";
 "type.xmas.tree" = "Árvore de Natal";
+"type.amenity.hydrant" = "Boca de Rega";
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
index ce629c781..08451db16 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -543,7 +543,7 @@
 
 /* OpenStreetMap Profile */
 "osm_profile" = "Profil OpenStreetMap";
-"osm_profile_promt" = "Creați un cont OpenStreetMap sau conectați-vă pentru a vă publica edițiile de hartă în întreaga lume.";
+"osm_profile_promt" = "Creați un cont OpenStreetMap sau conectați-vă pentru a vă publica editările hărții pentru întreaga lume.";
 "osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) este un proiect comunitar pentru construirea unei hărți libere și deschise. Este principala sursă de date cartografice în CoMaps și funcționează similar cu Wikipedia. Puteți adăuga sau edita locuri, iar acestea devin disponibile pentru milioane de utilizatori din întreaga lume. \nAlăturați-vă comunității și ajutați la crearea unei hărți mai bune pentru toată lumea!";
 "osm_profile_login" = "Conectează-te la contul OpenStreetMap";
 "osm_profile_reauthorize_promt" = "Contul OpenStreetMap a fost deconectat de la această aplicație";
diff --git a/iphone/Maps/LocalizedStrings/sl.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sl.lproj/LocalizableTypes.strings
index 18d00e029..85713199b 100644
--- a/iphone/Maps/LocalizedStrings/sl.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/sl.lproj/LocalizableTypes.strings
@@ -368,3 +368,91 @@
 "type.cuisine.bubble_tea" = "Čaj s tapiokinimi kroglicami ('Bubble Tea')";
 "type.cuisine.breakfast" = "Zajtrk";
 "type.cuisine.chicken" = "Piščanec";
+"type.amenity.hydrant" = "Namakalni hidrant";
+"type.cuisine.greek" = "Grška kuhinja";
+"type.cuisine.hungarian" = "Madžarska kuhinja";
+"type.cuisine.ice_cream" = "Sladoled";
+"type.cuisine.indian" = "Indijska kuhinja";
+"type.cuisine.indonesian" = "Indonezijska kuhinja";
+"type.cuisine.international" = "Mednarodna kuhinja";
+"type.cuisine.irish" = "Irska kuhinja";
+"type.cuisine.italian" = "Italijanska kuhinja";
+"type.cuisine.italian_pizza" = "Italijanska kuhinja, pica";
+"type.cuisine.japanese" = "Japonska kuhinja";
+"type.cuisine.korean" = "Korejska kuhinja";
+"type.cuisine.lao" = "Laoška kuhinja";
+"type.cuisine.lebanese" = "Libanonska kuhinja";
+"type.cuisine.local" = "Krajevna kuhinja";
+"type.cuisine.malaysian" = "Malezijska kuhinja";
+"type.cuisine.mediterranean" = "Sredozemska kuhinja";
+"type.cuisine.mexican" = "Mehiška kuhinja";
+"type.cuisine.moroccan" = "Maroška kuhinja";
+"type.cuisine.oriental" = "Orientalska kuhinja";
+"type.cuisine.pancake" = "Palačinke";
+"type.cuisine.pasta" = "Testenine";
+"type.cuisine.persian" = "Perzijska kuhinja";
+"type.cuisine.peruvian" = "Perujska kuhinja";
+"type.cuisine.pizza" = "Pica";
+"type.cuisine.polish" = "Poljska kuhinja";
+"type.cuisine.portuguese" = "Portugalska kuhinja";
+"type.cuisine.russian" = "Ruska kuhinja";
+"type.cuisine.sandwich" = "Sendvič";
+"type.cuisine.sausage" = "Salama";
+"type.cuisine.savory_pancakes" = "Slane palačinke";
+"type.cuisine.seafood" = "Morska hrana";
+"type.cuisine.soba" = "Soba (ajdovi rezanci)";
+"type.cuisine.spanish" = "Španska kuhinja";
+"type.cuisine.steak_house" = "Zrezkarnica";
+"type.cuisine.sushi" = "Suši";
+"type.cuisine.tea" = "Čaj";
+"type.cuisine.turkish" = "Turška kuhinja";
+"type.cuisine.vegan" = "Veganska kuhinja";
+"type.cuisine.vegetarian" = "Vegetarijanska kuhinja";
+"type.cuisine.vietnamese" = "Vietnamska kuhinja";
+"type.emergency" = "V sili";
+"type.emergency.access_point" = "Reševalno mesto";
+"type.emergency.assembly_point" = "Zbirno mesto";
+"type.emergency.life_ring" = "Reševalni obroč";
+"type.emergency.defibrillator" = "Defibrilator";
+"type.emergency.fire_hydrant" = "Požarni hidrant";
+"type.emergency.phone" = "Telefon v sili";
+"type.emergency.lifeguard" = "Reševalec";
+"type.beacon.cardinal.east" = "Glavni usmerjevalni znak";
+"type.beacon.cardinal.north" = "Glavni usmerjevalni znak";
+"type.beacon.cardinal.south" = "Glavni usmerjevalni znak";
+"type.beacon.cardinal.west" = "Glavni usmerjevalni znak";
+"type.beacon.isolated_danger" = "Usmerjevalni znak ločene nevarnosti";
+"type.cuisine.burger" = "Burger";
+"type.craft.caterer" = "Ponudnik cateringa";
+"type.cuisine.balkan" = "Balkanska kuhinja";
+"type.cuisine.barbecue" = "Jedi na žaru";
+"type.cuisine.bavarian" = "Bavarska kuhinja";
+"type.cuisine.brazilian" = "Brazilska kuhinja";
+"type.cuisine.buschenschank" = "Vinotoč (Buschenschank)";
+"type.cuisine.deli" = "Delkatesa";
+"type.cuisine.regional" = "Regionalna kuhinja";
+"type.cuisine.tapas" = "Tapas (španski prigrizki)";
+"type.cuisine.thai" = "Tajska kuhinja";
+"type.beacon.lateral.port" = "Bočni usmerjevalni znak";
+"type.beacon.lateral.starboard" = "Bočni usmerjevalni znak";
+"type.beacon.safe_water" = "Znak varne plovne poti";
+"type.beacon.special_purpose" = "Usmerjevalni znak posebnega namena";
+"type.buoy.cardinal.east" = "Glavna boja";
+"type.buoy.cardinal.north" = "Glavna boja";
+"type.buoy.cardinal.south" = "Glavna boja";
+"type.buoy.cardinal.west" = "Glavna boja";
+"type.lateral.port" = "Pristanišče";
+"type.cardinal.east" = "Vzhod";
+"type.cardinal.north" = "Sever";
+"type.cardinal.south" = "Jug";
+"type.cardinal.west" = "Zahod";
+"type.emergency.mountain_rescue" = "Postaja gorskih reševalcev";
+"type.entrance" = "Vhod";
+"type.entrance.main" = "Glavni vhod";
+"type.entrance.house" = "Vhod hiše";
+"type.entrance.garage" = "Vhod garaže";
+"type.entrance.service" = "Servisni vhod";
+"type.entrance.entry" = "Vstop (samo)";
+"type.entrance.exit" = "Izhod (samo)";
+"type.healthcare.laboratory" = "Zdravstveni laboratorij";
+"type.healthcare.psychotherapist" = "Psihoterapevt";
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index b5aa58a95..55af58b5d 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -1101,3 +1101,4 @@
 "offline_explanation_title" = "Çevrimdışı Haritalar";
 "avoid_steps" = "Merdivenlerden kaçın";
 "editor_place_doesnt_exist_description" = "OpeenStreetMap topluluğuna bir hata notu göndermek için şimdi mekanın nasıl gözüktüğünü tarif et";
+"avoid_paved" = "Asfalt yollardan kaçın";
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings
index db4731f31..4ba8156f9 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings
@@ -1491,3 +1491,4 @@
 "type.shop.lighting" = "Aydınlatma dükkanı";
 "type.amenity.charging_station.motorcar.small" = "Araç Şarj Noktası";
 "type.amenity.bench.backless" = "Sırtı Açık Bank";
+"type.amenity.sailing_school" = "Denizcilik Okulu";
diff --git a/iphone/metadata/es-ES/description.txt b/iphone/metadata/es-ES/description.txt
index 924b7c950..e97e5fbc7 100644
--- a/iphone/metadata/es-ES/description.txt
+++ b/iphone/metadata/es-ES/description.txt
@@ -2,7 +2,7 @@ Una aplicación de mapas gratuita y de código abierto, liderada por la comunida
 
 ‣ Simple y elegante: funciones esenciales, fáciles de usar y que simplemente funcionan.
 ‣ Funciona sin conexión: Planifica y navega tu viaje al extranjero sin necesidad de cobertura móvil, busca puntos de referencia durante una excursión, etc. Todas las funciones de la aplicación están diseñadas para funcionar sin conexión.
-‣ Respeto a la privacidad: La aplicación está diseñada pensando en la privacidad: no identifica a las personas, no rastrea ni recopila información personal. Sin anuncios.
+‣ Respeto a la privacidad: La aplicación está diseñada pensando en la privacidad, no identifica a las personas, no rastrea ni recopila información personal. Sin anuncios.
 ‣ Ahorra batería y espacio: No consume mucha batería como otras aplicaciones de navegación. Los mapas compactos ahorran el valioso espacio en tu teléfono.
 ‣ Gratuita y desarrollada por la comunidad: Personas como tú ayudaron a desarrollar la aplicación añadiendo lugares a OpenStreetMap, probando y compartiendo sus comentarios sobre las funciones, y aportando sus habilidades de desarrollo y su dinero.
 ‣ Toma de decisiones y finanzas abiertas y transparentes, sin fines de lucro y totalmente de código abierto.
@@ -25,4 +25,4 @@ Características principales:
 • Compatibilidad con CarPlay
 
 La libertad está aquí
-¡Descubre tu camino y navega por el mundo priorizando la privacidad y la comunidad!
\ No newline at end of file
+¡Descubre tu camino y navega por el mundo priorizando la privacidad y la comunidad!
diff --git a/iphone/metadata/es-ES/keywords.txt b/iphone/metadata/es-ES/keywords.txt
index c652f203e..ff1621916 100644
--- a/iphone/metadata/es-ES/keywords.txt
+++ b/iphone/metadata/es-ES/keywords.txt
@@ -1 +1 @@
-comaps,mapas,openstreetmap,osm,viajes,senderismo,bicicleta,conducción,sin conexión,privacidad,gps
\ No newline at end of file
+comaps,mapas,openstreetmap,osm,viajes,senderismo,bicicleta,conducción,sin conexión,privacidad,gps
diff --git a/iphone/metadata/es-ES/marketing_url.txt b/iphone/metadata/es-ES/marketing_url.txt
index 45580d2f0..5778d1766 100644
--- a/iphone/metadata/es-ES/marketing_url.txt
+++ b/iphone/metadata/es-ES/marketing_url.txt
@@ -1 +1 @@
-https://comaps.app/es/
\ No newline at end of file
+https://comaps.app/es/
diff --git a/iphone/metadata/es-ES/privacy_url.txt b/iphone/metadata/es-ES/privacy_url.txt
index ef98013df..a0644a377 100644
--- a/iphone/metadata/es-ES/privacy_url.txt
+++ b/iphone/metadata/es-ES/privacy_url.txt
@@ -1 +1 @@
-https://comaps.app/es/privacy
\ No newline at end of file
+https://comaps.app/es/privacy
diff --git a/iphone/metadata/es-ES/subtitle.txt b/iphone/metadata/es-ES/subtitle.txt
index f91b038ba..40793fd86 100644
--- a/iphone/metadata/es-ES/subtitle.txt
+++ b/iphone/metadata/es-ES/subtitle.txt
@@ -1 +1 @@
-Navega con privacidad
\ No newline at end of file
+Navega con privacidad
diff --git a/iphone/metadata/es-ES/support_url.txt b/iphone/metadata/es-ES/support_url.txt
index 3b3b80f3d..f93b754b6 100644
--- a/iphone/metadata/es-ES/support_url.txt
+++ b/iphone/metadata/es-ES/support_url.txt
@@ -1 +1 @@
-https://codeberg.org/comaps/comaps/issues
\ No newline at end of file
+https://codeberg.org/comaps/comaps/issues