diff --git a/app/src/main/assets/device_hardware.json b/app/src/main/assets/device_hardware.json
index 8ef03e895..35b26921f 100644
--- a/app/src/main/assets/device_hardware.json
+++ b/app/src/main/assets/device_hardware.json
@@ -875,6 +875,23 @@
     ],
     "hasInkHud": true
   },
+  {
+    "hwModel": 107,
+    "hwModelSlug": "THINKNODE_M5",
+    "platformioTarget": "thinknode_m5",
+    "architecture": "esp32-s3",
+    "activelySupported": true,
+    "supportLevel": 1,
+    "displayName": "ThinkNode M5",
+    "tags": [
+      "Elecrow"
+    ],
+    "requiresDfu": true,
+    "images": [
+      "thinknode_m1.svg"
+    ],
+    "hasInkHud": true
+  },
   {
     "hwModel": 90,
     "hwModelSlug": "THINKNODE_M2",
diff --git a/app/src/main/assets/firmware_releases.json b/app/src/main/assets/firmware_releases.json
index e17893044..ae239cd9a 100644
--- a/app/src/main/assets/firmware_releases.json
+++ b/app/src/main/assets/firmware_releases.json
@@ -42,16 +42,16 @@
         "page_url": "https://github.com/meshtastic/firmware/releases/tag/v2.5.15.79da236",
         "zip_url": "https://github.com/meshtastic/firmware/releases/download/v2.5.15.79da236/firmware-esp32-2.5.15.79da236.zip",
         "release_notes": "## 🚀 Enhancements\r\n* Support for the ClimateGuard RadSens Geiger-Muller tube by @jake-b in https://github.com/meshtastic/firmware/pull/5425\r\n* Enable MQTT with TLS on RPi picow by @tomasdubec in https://github.com/meshtastic/firmware/pull/5442\r\n* Don't powersave on Wifi by @thebentern in https://github.com/meshtastic/firmware/pull/5443\r\n\r\n\r\n## 🐛 Bug fixes and maintenance\r\n* Fixes https://github.com/meshtastic/firmware/issues/5434 by @caveman99 in https://github.com/meshtastic/firmware/pull/5435\r\n* Fix memory leaks by adding missing `free()` calls before early returns in `MQTT::onReceive` by @CTassisF in https://github.com/meshtastic/firmware/pull/5439\r\n* Clean up some inline functions by @thebentern in https://github.com/meshtastic/firmware/pull/5454\r\n* Use isWithinTimespanMs to avoid refererence to NodeDb instance inside of NodeDb by @thebentern in https://github.com/meshtastic/firmware/pull/5453\r\n* Fixes CORS for meshtasticd to allow use of clients on other origins by @liamcottle in https://github.com/meshtastic/firmware/pull/5463\r\n* Remove ATECC crypto chip placeholder code by @thebentern in https://github.com/meshtastic/firmware/pull/5461\r\n* GPS.h cleanups round 3. by @charlieh0tel in https://github.com/meshtastic/firmware/pull/5447\r\n* Fix ukrainian fonts by @panaceya in https://github.com/meshtastic/firmware/pull/5468\r\n* Disable  lightsleep for indicator by @Wvirgil123 in https://github.com/meshtastic/firmware/pull/5470\r\n* Warnings and log cleanup by @thebentern in https://github.com/meshtastic/firmware/pull/5472\r\n* Revert \"Seems like the last DIY board that's not \"extra\"\" by @thebentern in https://github.com/meshtastic/firmware/pull/5446\r\n* Removing 1.0 legacy boards from releases and completely removing Heltec wireless capsule from support by @thebentern in https://github.com/meshtastic/firmware/pull/5436\r\n* A second round of cleanup on GPS.h by @charlieh0tel in https://github.com/meshtastic/firmware/pull/5433\r\n* Actually gunzip all the files when building a .deb by @jp-bennett in https://github.com/meshtastic/firmware/pull/5449\r\n* Cleanup i2c scan logs and macro to save some bytes and remain consistent by @thebentern in https://github.com/meshtastic/firmware/pull/5455\r\n\r\n## New Contributors\r\n* @jake-b made their first contribution in https://github.com/meshtastic/firmware/pull/5425\r\n* @CTassisF made their first contribution in https://github.com/meshtastic/firmware/pull/5439\r\n* @tomasdubec made their first contribution in https://github.com/meshtastic/firmware/pull/5442\r\n* @liamcottle made their first contribution in https://github.com/meshtastic/firmware/pull/5463\r\n\r\n**Full Changelog**: https://github.com/meshtastic/firmware/compare/v2.5.14.f2ee0df...v2.5.15.79da236"
-      },
-      {
-        "id": "v2.5.14.f2ee0df",
-        "title": "Meshtastic Firmware 2.5.14.f2ee0df Beta",
-        "page_url": "https://github.com/meshtastic/firmware/releases/tag/v2.5.14.f2ee0df",
-        "zip_url": "https://github.com/meshtastic/firmware/releases/download/v2.5.14.f2ee0df/firmware-esp32-2.5.14.f2ee0df.zip",
-        "release_notes": "> [!IMPORTANT]  \r\n> When we initially released the 2.5 version of the firmware, [we added a new bit `OkToMqtt` to packets to express the intent of users to opt-in to their packets being uplinked to an MQTT broker](https://meshtastic.org/docs/configuration/radio/lora/#ok-to-mqtt\r\n). \r\n>\r\n>Prior to this, uplinking of packets was just implicit fact, which was not fair to users wishing to remain off of any public brokers, maps, etc. However, in order to not immediately begin dumping all of the traffic from previous firmware versions from going to MQTT, we allowed for a grace period to transition folks to the newer 2.5.X firmware, where they can now opt-in, or remain off (by default). This grace period has concluded. The firmware will now enforce that the `OkToMqtt` bit is both present and opted into before uplinking any packets to MQTT. \r\n\r\n## 🚀 Enhancements \r\n* Minimize time between channel scan and actual transmit by @GUVWAF in https://github.com/meshtastic/firmware/pull/5383\r\n* Allows all 3 PKI keys to be added to userPrefs.h (#4969) and a tool. by @gjelsoe in https://github.com/meshtastic/firmware/pull/5368\r\n* Check for OkToMqtt flag presence before uplinking to MQTT by @thebentern in https://github.com/meshtastic/firmware/pull/5413\r\n* Telemetry can respond to want-response for LocalStats variant by @thebentern in https://github.com/meshtastic/firmware/pull/5414\r\n* Add canned message and keyboard in indicator board by @Dylanliacc in https://github.com/meshtastic/firmware/pull/5410\r\n* Add smiley emoji by @jcyrio in https://github.com/meshtastic/firmware/pull/5391\r\n* Enable trace route function on rak wismeshtap platform by @DanielCao0 in https://github.com/meshtastic/firmware/pull/5389\r\n* Add GPS in indicator board by @Dylanliacc in https://github.com/meshtastic/firmware/pull/5411\r\n* /api/v1/fromradio: add OPTIONS handler for CORS. by @cpatulea in https://github.com/meshtastic/firmware/pull/5386\r\n* Create a specific hw_model for WisMesh Tap by @thebentern in https://github.com/meshtastic/firmware/pull/5400\r\n\r\n## 🐛 Bug fixes and maintenance\r\n* Make heart emoji usable by @jcyrio in https://github.com/meshtastic/firmware/pull/5403\r\n* Fix RTC time injection and consolidate position logic by @thebentern in https://github.com/meshtastic/firmware/pull/5396\r\n* Update arduino-pico core to fix sporadic hangs by @GUVWAF in https://github.com/meshtastic/firmware/pull/5406\r\n* Update platform-raspberrypi also by @GUVWAF in https://github.com/meshtastic/firmware/pull/5407\r\n* --web added to device-install(.sh/.bat) by @gjelsoe in https://github.com/meshtastic/firmware/pull/5405\r\n* Fixed NMEA sentence issue in CalTopo as well as bug with no printing all of the nodes by @thebentern in https://github.com/meshtastic/firmware/pull/5412\r\n* --web littlefswebui-* typo fix by @gjelsoe in https://github.com/meshtastic/firmware/pull/5416\r\n* Temporarily disable MDNS when MQTT is enabled on RP2040 by @GUVWAF in https://github.com/meshtastic/firmware/pull/5418\r\n* Seems like the last DIY board that's not \"extra\" by @jp-bennett in https://github.com/meshtastic/firmware/pull/5420\r\n* Cherry pick tdeck fixes by @thebentern in https://github.com/meshtastic/firmware/pull/5422\r\n* Update build-native.sh by @madeofstown in https://github.com/meshtastic/firmware/pull/5415\r\n* Cleans up visibility in GPS.h by @charlieh0tel in https://github.com/meshtastic/firmware/pull/5426\r\n* Fix admin key loading from userPrefs.h by @Mictronics in https://github.com/meshtastic/firmware/pull/5417\r\n* Try to detect dfrobot station to tell it apart from an ublox gps. by @caveman99 in https://github.com/meshtastic/firmware/pull/5393\r\n* Remove BMA-423 and STK8X by default by @thebentern in https://github.com/meshtastic/firmware/pull/5429\r\n\r\n## New Contributors\r\n* @cpatulea made their first contribution in https://github.com/meshtastic/firmware/pull/5386\r\n\r\n**Full Changelog**: https://github.com/meshtastic/firmware/compare/v2.5.13.1a06f88...v2.5.14.f2ee0df"
       }
     ],
     "alpha": [
+      {
+        "id": "v2.7.5.ddd1499",
+        "title": "Meshtastic Firmware 2.7.5.ddd1499 Alpha",
+        "page_url": "https://github.com/meshtastic/firmware/releases/tag/v2.7.5.ddd1499",
+        "zip_url": "https://github.com/meshtastic/firmware/releases/download/v2.7.5.ddd1499/firmware-esp32-2.7.5.ddd1499.zip",
+        "release_notes": "\r\n## 🚀  What's Changed\r\n* Reorder for correct recognition by @caveman99 in https://github.com/meshtastic/firmware/pull/7604\r\n* Stop the bleeding with malicious NodeDB overwrites by @jp-bennett in https://github.com/meshtastic/firmware/pull/7596\r\n* Chore(deps): update actions/checkout action to v5 by @renovate[bot] in https://github.com/meshtastic/firmware/pull/7605\r\n* Mark meshPackets based on which interface received. by @jp-bennett in https://github.com/meshtastic/firmware/pull/7589\r\n* chore(deps): update actions/download-artifact action to v5 by @renovate[bot] in https://github.com/meshtastic/firmware/pull/7559\r\n* Adding  medium and large RU fonts. Fixing RU string width calculation by @mrekin in https://github.com/meshtastic/firmware/pull/7498\r\n* nRF52840 promicro deepsleep fix with some additions by @MagnusKos in https://github.com/meshtastic/firmware/pull/7407\r\n* More spoof remediation by @jp-bennett in https://github.com/meshtastic/firmware/pull/7612\r\n\r\n## New Contributors\r\n* @MagnusKos made their first contribution in https://github.com/meshtastic/firmware/pull/7407\r\n\r\n**Full Changelog**: https://github.com/meshtastic/firmware/compare/v2.7.4.c1f4f79...v2.7.5.ddd1499"
+      },
       {
         "id": "v2.7.4.c1f4f79",
         "title": "Meshtastic Firmware 2.7.4.c1f4f79 Alpha",
diff --git a/app/src/main/res/values-b+sr+Latn/strings.xml b/app/src/main/res/values-b+sr+Latn/strings.xml
index 1df059f3d..8610e6e56 100644
--- a/app/src/main/res/values-b+sr+Latn/strings.xml
+++ b/app/src/main/res/values-b+sr+Latn/strings.xml
@@ -355,4 +355,6 @@
     <!-- Security Help Dialog Titles and Buttons (from your existing code structure) -->
     <string name="security_icon_help_dismiss">Отпусти</string>
     <string name="message_input_label">Порука</string>
+    <string name="map_type_satellite">Сателит</string>
+    <string name="map_type_hybrid">Хибридни</string>
 </resources>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index cba03288b..caf071602 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -544,4 +544,13 @@
     <string name="notification_permissions_description">Meshtastic използва известия, за да ви държи в течение за нови съобщения и други важни събития. Можете да актуализирате разрешенията си за известия по всяко време от настройките.</string>
     <string name="next">Напред</string>
     <string name="connecting_to_device">Свързване с устройство</string>
+    <string name="map_type_normal">Нормален</string>
+    <string name="map_type_satellite">Сателит</string>
+    <string name="map_type_terrain">Терен</string>
+    <string name="map_type_hybrid">Хибриден</string>
+    <string name="manage_map_layers">Управление на слоевете на картата</string>
+    <string name="no_map_layers_loaded">Няма заредени персонализирани слоеве.</string>
+    <string name="remove_layer">Премахване на слой</string>
+    <string name="add_layer">Добавяне на слой</string>
+    <string name="nodes_at_this_location">Възли на това място</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 88dcea303..82c1d0c69 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -736,4 +736,20 @@
     <string name="nodes_queued_for_deletion">%d Knoten in der Warteschlange zum Löschen:</string>
     <string name="clean_node_database_description">Achtung: Dies entfernt Knoten aus der App und Gerätedatenbank.\nDie Auswahl ist kumulativ.</string>
     <string name="connecting_to_device">Verbinde mit Gerät</string>
+    <string name="map_type_normal">Normal</string>
+    <string name="map_type_satellite">Satellit</string>
+    <string name="map_type_terrain">Gelände</string>
+    <string name="map_type_hybrid">Hybrid</string>
+    <string name="manage_map_layers">Kartenebenen verwalten</string>
+    <string name="no_map_layers_loaded">Keine benutzerdefinierten Ebenen geladen.</string>
+    <string name="remove_layer">Ebene entfernen</string>
+    <string name="add_layer">Ebene hinzufügen</string>
+    <string name="nodes_at_this_location">Knoten an diesem Standort</string>
+    <string name="selected_map_type">Ausgewählter Kartentyp</string>
+    <string name="manage_custom_tile_sources">Benutzerdefinierte Kachelquellen verwalten</string>
+    <string name="no_custom_tile_sources_found">Keine benutzerdefinierten Kachelquellen</string>
+    <string name="edit_custom_tile_source">Benutzerdefinierte Kachelquelle bearbeiten</string>
+    <string name="provider_name_exists">Der Name des Anbieters existiert bereits.</string>
+    <string name="url_must_contain_placeholders">URL muss Platzhalter enthalten.</string>
+    <string name="url_template">URL Vorlage</string>
 </resources>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index ae5c97082..ff7cf6f40 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -736,4 +736,18 @@
     <string name="nodes_queued_for_deletion">%d eemaldatavat sõlme nimekirjas:</string>
     <string name="clean_node_database_description">Hoiatus: See eemaldab sõlmed rakendusest, kui ka seadmest.\nValikud on lisaks eelnevale.</string>
     <string name="connecting_to_device">Ühendan seadet</string>
+    <string name="map_type_normal">Normaalne</string>
+    <string name="map_type_satellite">Sateliit</string>
+    <string name="map_type_terrain">Maastik</string>
+    <string name="map_type_hybrid">Hübriid</string>
+    <string name="manage_map_layers">Halda kaardikihte</string>
+    <string name="no_map_layers_loaded">Kaardikihid laadimata.</string>
+    <string name="remove_layer">Eemalda kiht</string>
+    <string name="add_layer">Lisa kiht</string>
+    <string name="nodes_at_this_location">Sõlmed siin asukohas</string>
+    <string name="selected_map_type">Vali kaardi tüüp</string>
+    <string name="manage_custom_tile_sources">Halda kohandatud kardikihti</string>
+    <string name="no_custom_tile_sources_found">Kohandatud kardikihte ei ole</string>
+    <string name="edit_custom_tile_source">Muuda kohandatud kardikihti</string>
+    <string name="provider_name_exists">Teenusepakkuja nimi on olemas.</string>
 </resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 3a792cc05..3afb588d2 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -736,4 +736,19 @@
     <string name="nodes_queued_for_deletion">%d laitetta jonossa poistettavaksi:</string>
     <string name="clean_node_database_description">Varoitus: Tämä poistaa laitteet sovelluksen sekä laitteen tietokannoista.\nValinnat lisätään aiempiin.</string>
     <string name="connecting_to_device">Yhdistetään laitteeseen</string>
+    <string name="map_type_normal">Normaali</string>
+    <string name="map_type_satellite">Satelliitti</string>
+    <string name="map_type_terrain">Maasto</string>
+    <string name="map_type_hybrid">Hybridi</string>
+    <string name="manage_map_layers">Hallitse Karttatasoja</string>
+    <string name="no_map_layers_loaded">Mukautettuja karttatasoja ei ladattu.</string>
+    <string name="remove_layer">Poista taso</string>
+    <string name="add_layer">Lisää taso</string>
+    <string name="nodes_at_this_location">Laitteet tässä sijainnissa</string>
+    <string name="selected_map_type">Valittu karttatyyppi</string>
+    <string name="manage_custom_tile_sources">Hallitse mukautettuja karttatasoja</string>
+    <string name="no_custom_tile_sources_found">Ei mukautettuja karttatasoja</string>
+    <string name="edit_custom_tile_source">Muokkaa mukautettua karttatasoa</string>
+    <string name="provider_name_exists">Palveluntarjoajan nimi on olemassa.</string>
+    <string name="url_must_contain_placeholders">URL-osoitteessa on oltava paikkamerkkejä.</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index a2f9d6070..2f31caae3 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -97,6 +97,7 @@
     <string name="pairing_failed_try_again">Le jumelage a échoué, veuillez sélectionner à nouveau</string>
     <string name="location_disabled">L\'accès à la localisation est désactivé, impossible de fournir la position du maillage.</string>
     <string name="share">Partager</string>
+    <string name="new_node_seen">Nouveau noeud vu : %s</string>
     <string name="disconnected">Déconnecté</string>
     <string name="device_sleeping">Appareil en veille</string>
     <string name="connected_count">Connectés : %1$s sur en ligne</string>
@@ -180,6 +181,8 @@
     <string name="quick_chat_edit">Éditer le clavardage</string>
     <string name="quick_chat_append">Ajouter au message</string>
     <string name="quick_chat_instant">Envoi instantané</string>
+    <string name="quick_chat_show">Afficher le menu de discussion rapide</string>
+    <string name="quick_chat_hide">Masquer le menu de discussion rapide</string>
     <string name="factory_reset">Réinitialisation d\'usine</string>
     <string name="bluetooth_disabled">Le Bluetooth est désactivé</string>
     <string name="permission_missing_31">Meshtastic a besoin de la permission des appareils à proximité pour trouver et se connecter à des appareils via le Bluetooth. Vous pouvez le désactiver quand il n\'est pas utilisé.</string>
@@ -347,6 +350,7 @@
     <string name="downlink_enabled">Liaison descendante activé</string>
     <string name="default_">Défaut</string>
     <string name="position_enabled">Position activée</string>
+    <string name="precise_location">Emplacement précis</string>
     <string name="gpio_pin">Broche GPIO</string>
     <string name="type">Type</string>
     <string name="hide_password">Masquer le mot de passe</string>
@@ -480,6 +484,7 @@
     <string name="latitude">Latitude</string>
     <string name="longitude">Longitude</string>
     <string name="altitude_meters">Altitude (mètres)</string>
+    <string name="position_config_set_fixed_from_phone">Définir à partir de l\'emplacement actuel du téléphone</string>
     <string name="gps_mode">Mode GPS</string>
     <string name="gps_update_interval_seconds">Intervalle de mise à jour GPS (secondes)</string>
     <string name="redefine_gps_rx_pin">Redéfinir GPS_RX_PIN</string>
@@ -562,8 +567,11 @@
     <string name="node_number">Numéro de nœud</string>
     <string name="user_id">ID utilisateur</string>
     <string name="uptime">Durée de fonctionnement</string>
+    <string name="load_indexed">Charge %1$d</string>
+    <string name="disk_free_indexed">Disque libre %1$d</string>
     <string name="timestamp">Horodatage</string>
     <string name="heading">En-tête</string>
+    <string name="speed">Vitesse</string>
     <string name="sats">Sats</string>
     <string name="alt">Alt</string>
     <string name="freq">Fréq</string>
@@ -641,6 +649,13 @@
     <string name="overflow_menu">Menu supplémentaire</string>
     <string name="uv_lux">UV Lux</string>
     <string name="unknown">Inconnu</string>
+    <string name="clean_node_database_title">Nettoyer la base de données des nœuds</string>
+    <string name="clean_nodes_older_than">Nettoyer les nœuds vus pour la dernière fois depuis %1$d jours</string>
+    <string name="clean_unknown_nodes">Nettoyer uniquement les nœuds inconnus</string>
+    <string name="clean_low_interaction_nodes">Nettoyer les nœuds avec une interaction faible/sans interaction</string>
+    <string name="clean_ignored_nodes">Nettoyer les nœuds ignorés</string>
+    <string name="clean_now">Nettoyer maintenant</string>
+    <string name="clean_node_database_confirmation">Cela supprimera les %1$d nœuds  de votre base de données. Cette action ne peut pas être annulée.</string>
     <string name="security_icon_help_green_lock">Un cadenas vert signifie que le canal est chiffré de façon sécurisée avec une clé AES 128 ou 256 bits.</string>
     <!-- INSECURE_NO_PRECISE State (Yellow Open Lock) -->
     <string name="security_icon_insecure_no_precise">Canal non sécurisé, non précisé</string>
@@ -676,6 +691,38 @@
     <string name="latest_stable_firmware">Dernière version stable</string>
     <string name="latest_alpha_firmware">Dernière version alpha</string>
     <string name="supported_by_community">Soutenu par la communauté Meshtastic</string>
+    <string name="firmware_edition">Version du micrologiciel</string>
+    <string name="recent_network_devices">Périphériques réseau récents</string>
+    <string name="discovered_network_devices">Appareils réseau découverts</string>
+    <string name="get_started">Commencer</string>
+    <string name="intro_welcome">Bienvenue sur</string>
+    <string name="stay_connected_anywhere">Restez connecté n\'importe où</string>
+    <string name="communicate_off_the_grid">Communiquez en dehors du réseau avec vos amis et votre communauté sans service cellulaire.</string>
+    <string name="create_your_own_networks">Créez vos propres réseaux</string>
+    <string name="easily_set_up_private_mesh_networks">Installez facilement des réseaux de maillage privé pour une communication sûre et fiable dans les régions éloignées.</string>
+    <string name="track_and_share_locations">Suivre et partager les emplacements</string>
+    <string name="share_your_location_in_real_time">Partagez votre position en temps réel et gardez votre groupe coordonné avec les fonctionnalités GPS intégrées.</string>
+    <string name="app_notifications">Notifications de l’application</string>
+    <string name="incoming_messages">Messages entrants</string>
+    <string name="notifications_for_channel_and_direct_messages">Notifications pour le canal et les messages directs.</string>
+    <string name="new_nodes">Nouveaux nœuds</string>
+    <string name="notifications_for_newly_discovered_nodes">Notifications pour les nouveaux nœuds découverts.</string>
     <string name="skip">Ignorer</string>
     <string name="next">Suivant</string>
+    <string name="map_type_normal">Normal</string>
+    <string name="map_type_satellite">Satellite</string>
+    <string name="map_type_terrain">Terrain</string>
+    <string name="map_type_hybrid">Hybride</string>
+    <string name="manage_map_layers">Gérer les calques de la carte</string>
+    <string name="no_map_layers_loaded">Aucun calque personnalisé chargé.</string>
+    <string name="remove_layer">Supprimer le calque</string>
+    <string name="add_layer">Ajouter un calque</string>
+    <string name="nodes_at_this_location">Nœuds à cet emplacement</string>
+    <string name="selected_map_type">Type de carte sélectionné</string>
+    <string name="manage_custom_tile_sources">Gérer les sources de tuiles personnalisées</string>
+    <string name="no_custom_tile_sources_found">Aucune source de tuiles personnalisée</string>
+    <string name="edit_custom_tile_source">Modifier la source de tuile personnalisée</string>
+    <string name="provider_name_exists">Le nom du fournisseur existe déjà.</string>
+    <string name="url_must_contain_placeholders">L\'URL doit contenir des espaces réservés.</string>
+    <string name="url_template">Modèle d\'URL</string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 8e5a8abae..e9483778f 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -366,4 +366,6 @@
     <!-- Security Help Dialog Titles and Buttons (from your existing code structure) -->
     <string name="security_icon_help_dismiss">Zamknij</string>
     <string name="message_input_label">Wiadomość</string>
+    <string name="map_type_satellite">Satelita</string>
+    <string name="map_type_hybrid">Hybrydowy</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index d7988b506..c086be1ce 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -725,4 +725,20 @@
     <string name="notification_permissions_description">Meshtastic usa notificações para mantê-lo atualizado sobre novas mensagens e outros eventos importantes. Você pode atualizar suas permissões de notificação a qualquer momento nas configurações.</string>
     <string name="next">Avançar</string>
     <string name="grant_permissions_and_scan">Conceder Permissões e Escanear</string>
+    <string name="map_type_normal">Normal</string>
+    <string name="map_type_satellite">Satélite</string>
+    <string name="map_type_terrain">Terreno</string>
+    <string name="map_type_hybrid">Híbrido</string>
+    <string name="manage_map_layers">Gerenciar Camadas do Mapa</string>
+    <string name="no_map_layers_loaded">Nenhuma camada personalizada carregada.</string>
+    <string name="remove_layer">Remover Camada</string>
+    <string name="add_layer">Adicionar Camada</string>
+    <string name="nodes_at_this_location">Nós neste local</string>
+    <string name="selected_map_type">Tipo de Mapa Selecionado</string>
+    <string name="manage_custom_tile_sources">Gerenciar Fontes de Bloco Personalizados</string>
+    <string name="no_custom_tile_sources_found">Sem Fontes de Blocos Personalizadas</string>
+    <string name="edit_custom_tile_source">Editar Fonte do Bloco Personalizado</string>
+    <string name="provider_name_exists">O nome do provedor existe.</string>
+    <string name="url_must_contain_placeholders">A URL deve conter espaços reservados.</string>
+    <string name="url_template">Modelo de URL</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index bca7c5bb7..adbac5c3a 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -688,4 +688,20 @@
     <string name="critical_alerts">Алерты</string>
     <string name="critical_alerts_dnd_request_text"></string>
     <string name="next">Далее</string>
+    <string name="map_type_normal">Обычный</string>
+    <string name="map_type_satellite">Спутниковая</string>
+    <string name="map_type_terrain">Ландшафт</string>
+    <string name="map_type_hybrid">Смешанный</string>
+    <string name="manage_map_layers">Управление Слоями Карты</string>
+    <string name="no_map_layers_loaded">Пользовательские слои не загружены.</string>
+    <string name="remove_layer">Удалить слой</string>
+    <string name="add_layer">Добавить слой</string>
+    <string name="nodes_at_this_location">Узлы в этом месте</string>
+    <string name="selected_map_type">Выбранный тип карты</string>
+    <string name="manage_custom_tile_sources">Управление собственными источниками плиток</string>
+    <string name="no_custom_tile_sources_found">Нет пользовательских источников плиток</string>
+    <string name="edit_custom_tile_source">Изменить свой источник плиток</string>
+    <string name="provider_name_exists">Имя провайдера уже существует.</string>
+    <string name="url_must_contain_placeholders">URL должен содержать placeholders.</string>
+    <string name="url_template">Шаблон URL</string>
 </resources>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index b18032b83..3482e15a0 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -355,4 +355,6 @@
     <!-- Security Help Dialog Titles and Buttons (from your existing code structure) -->
     <string name="security_icon_help_dismiss">Отпусти</string>
     <string name="message_input_label">Порука</string>
+    <string name="map_type_satellite">Сателит</string>
+    <string name="map_type_hybrid">Хибридни</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index c3abc89fd..c6724082a 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -696,4 +696,15 @@
     <string name="settings">设置</string>
     <string name="next">下一步</string>
     <string name="grant_permissions_and_scan">授予权限并扫描</string>
+    <string name="map_type_normal">普通</string>
+    <string name="map_type_satellite">卫星</string>
+    <string name="map_type_terrain">地形</string>
+    <string name="map_type_hybrid">混合</string>
+    <string name="manage_map_layers">管理地图图层</string>
+    <string name="no_map_layers_loaded">没有自定义图层被加载。</string>
+    <string name="remove_layer">移除图层</string>
+    <string name="add_layer">添加图层</string>
+    <string name="nodes_at_this_location">在此位置的节点</string>
+    <string name="selected_map_type">所选地图类型</string>
+    <string name="manage_custom_tile_sources">管理自定义瓦片源</string>
 </resources>