diff --git a/androidApp/src/main/assets/firmware_releases.json b/androidApp/src/main/assets/firmware_releases.json
index 30080b66b..bb424ded4 100644
--- a/androidApp/src/main/assets/firmware_releases.json
+++ b/androidApp/src/main/assets/firmware_releases.json
@@ -188,6 +188,18 @@
     ]
   },
   "pullRequests": [
+    {
+      "id": "10995",
+      "title": "feat: populate MyNodeInfo.device_id on all platforms",
+      "page_url": "https://github.com/meshtastic/firmware/pull/10995",
+      "zip_url": "https://img.shields.io/badge/Flash_this_PR_in_the_Web_Flasher-2C2D3C?style=for-the-badge"
+    },
+    {
+      "id": "10994",
+      "title": "Remove UA_868 as obsolete",
+      "page_url": "https://github.com/meshtastic/firmware/pull/10994",
+      "zip_url": "https://discord.com/invite/meshtastic"
+    },
     {
       "id": "10984",
       "title": "Draft: Restore XEdDSA material in keygen-excluded identity loads",
@@ -301,12 +313,6 @@
       "title": "Add Meshnology W12 (WiFi LoRa 32 V5) LR2021 board support",
       "page_url": "https://github.com/meshtastic/firmware/pull/10910",
       "zip_url": "https://img.shields.io/badge/Flash_this_PR_in_the_Web_Flasher-2C2D3C?style=for-the-badge"
-    },
-    {
-      "id": "10908",
-      "title": "feat: Support Elecrow ThinkNode M9",
-      "page_url": "https://github.com/meshtastic/firmware/pull/10908",
-      "zip_url": "+454.1 KB"
     }
   ]
 }
\ No newline at end of file
diff --git a/core/resources/src/commonMain/composeResources/values-ar/strings.xml b/core/resources/src/commonMain/composeResources/values-ar/strings.xml
index f9292c819..5cd26b688 100644
--- a/core/resources/src/commonMain/composeResources/values-ar/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-ar/strings.xml
@@ -248,6 +248,7 @@
     <string name="user">اسم المستخدم</string>
     <string name="via_mqtt">فقط شبكة MQTT</string>
     <string name="voltage">شدة التيار</string>
+    <!-- WAYPOINT -->
     <!-- WIFI -->
     <string name="wifi_provision_success_ip_address">عنوان الـ IP</string>
     <!-- WIND -->
diff --git a/core/resources/src/commonMain/composeResources/values-be/strings.xml b/core/resources/src/commonMain/composeResources/values-be/strings.xml
index 355fa2e3b..be0a15265 100644
--- a/core/resources/src/commonMain/composeResources/values-be/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-be/strings.xml
@@ -300,6 +300,7 @@
     <string name="user">Карыстальнік</string>
     <string name="username">Імя карыстальніка</string>
     <string name="via_mqtt">праз MQTT</string>
+    <!-- WAYPOINT -->
     <!-- WIFI -->
     <string name="wifi_ip">Wifi IP:</string>
     <string name="wifi_provision_success_ip_address">IP-адрас</string>
diff --git a/core/resources/src/commonMain/composeResources/values-bg/strings.xml b/core/resources/src/commonMain/composeResources/values-bg/strings.xml
index 58bd5ea27..8a4956a1a 100644
--- a/core/resources/src/commonMain/composeResources/values-bg/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-bg/strings.xml
@@ -1162,6 +1162,7 @@
     <string name="voltage">Напрежение</string>
     <string name="wake_on_tap_or_motion">Събуждане при докосване или движение</string>
     <string name="warning">Предупреждение</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">Изтриване на пътна точка?</string>
     <string name="waypoint_edit">Редактиране на пътна точка</string>
     <string name="waypoint_new">Нова пътна точка</string>
diff --git a/core/resources/src/commonMain/composeResources/values-ca/strings.xml b/core/resources/src/commonMain/composeResources/values-ca/strings.xml
index c58915bea..fb39e9db7 100644
--- a/core/resources/src/commonMain/composeResources/values-ca/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-ca/strings.xml
@@ -262,6 +262,7 @@
     <!-- USE -->
     <!-- USER -->
     <string name="via_mqtt">via MQTT</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">Esborrar punt de pas?</string>
     <string name="waypoint_edit">Editar punt de pas</string>
     <string name="waypoint_new">Nou punt de pas</string>
diff --git a/core/resources/src/commonMain/composeResources/values-cs/strings.xml b/core/resources/src/commonMain/composeResources/values-cs/strings.xml
index 46695029f..d2579864a 100644
--- a/core/resources/src/commonMain/composeResources/values-cs/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-cs/strings.xml
@@ -1123,6 +1123,7 @@
     <string name="wait_for_bluetooth_duration_seconds">Doba čekání na Bluetooth</string>
     <string name="wake_on_tap_or_motion">Probuzení klepnutím nebo pohybem</string>
     <string name="warning">Varování</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">Smazat waypoint?</string>
     <string name="waypoint_edit">Upravit waypoint</string>
     <string name="waypoint_new">Nový waypoint</string>
diff --git a/core/resources/src/commonMain/composeResources/values-de/strings.xml b/core/resources/src/commonMain/composeResources/values-de/strings.xml
index eb11cadae..ae089903e 100644
--- a/core/resources/src/commonMain/composeResources/values-de/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-de/strings.xml
@@ -1476,6 +1476,7 @@
     <string name="wait_for_bluetooth_duration_seconds">Zeit für Warten auf Bluetooth</string>
     <string name="wake_on_tap_or_motion">Aufwachen durch Tippen oder Bewegung</string>
     <string name="warning">Warnung</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">Wegpunkt löschen?</string>
     <string name="waypoint_edit">Wegpunkt bearbeiten</string>
     <string name="waypoint_new">Wegpunkt hinzufügen</string>
diff --git a/core/resources/src/commonMain/composeResources/values-el/strings.xml b/core/resources/src/commonMain/composeResources/values-el/strings.xml
index a2f6d601f..dcf04e56b 100644
--- a/core/resources/src/commonMain/composeResources/values-el/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-el/strings.xml
@@ -270,6 +270,7 @@
     <string name="username">Όνομα χρήστη</string>
     <string name="via_mqtt">μέσω MQTT</string>
     <string name="voltage">Τάση</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">Διαγραφή σημείου πορείας;</string>
     <string name="waypoint_edit">Επεξεργασία σημείου διαδρομής</string>
     <string name="waypoint_new">Νέο σημείο πορείας</string>
diff --git a/core/resources/src/commonMain/composeResources/values-es/strings.xml b/core/resources/src/commonMain/composeResources/values-es/strings.xml
index 2c364ed4a..8a9ce589e 100644
--- a/core/resources/src/commonMain/composeResources/values-es/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-es/strings.xml
@@ -914,6 +914,7 @@ Estos datos de ubicación pueden ser utilizados para fines como aparecer en un m
     <string name="wait_for_bluetooth_duration_seconds">Esperar Bluetooth durante</string>
     <string name="wake_on_tap_or_motion">Despertar al tocar o al mover</string>
     <string name="warning">Advertencia</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">¿Eliminar punto de referencia?</string>
     <string name="waypoint_edit">Editar punto de referencia</string>
     <string name="waypoint_new">Nuevo punto de referencia</string>
diff --git a/core/resources/src/commonMain/composeResources/values-et/strings.xml b/core/resources/src/commonMain/composeResources/values-et/strings.xml
index 1a2041214..49414b79c 100644
--- a/core/resources/src/commonMain/composeResources/values-et/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-et/strings.xml
@@ -1693,6 +1693,7 @@
     <string name="wait_for_bluetooth_duration_seconds">Oota Bluetoothi ​​kestust</string>
     <string name="wake_on_tap_or_motion">Ärata puudutusega või liigutusega</string>
     <string name="warning">Hoiatus</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">Eemalda teekonnapunkt?</string>
     <string name="waypoint_edit">Muuda teekonnapunkti</string>
     <string name="waypoint_new">Uus teekonnapunkti</string>
diff --git a/core/resources/src/commonMain/composeResources/values-fi/strings.xml b/core/resources/src/commonMain/composeResources/values-fi/strings.xml
index a69c62e50..9f4a46816 100644
--- a/core/resources/src/commonMain/composeResources/values-fi/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-fi/strings.xml
@@ -661,6 +661,7 @@
     <string name="firmware_update_method_usb">USB-tiedonsiirto</string>
     <string name="firmware_update_method_wifi">WiFi OTA</string>
     <string name="firmware_update_missing_target">Laiteohjelmistoston tiedot eivät ole saatavilla tälle laitteelle.</string>
+    <string name="firmware_update_nightly">Kehitysversio</string>
     <string name="firmware_update_no_device">Ei laitetta kytkettynä</string>
     <string name="firmware_update_node_info_missing">Laitteen käyttäjätiedot puuttuvat.</string>
     <string name="firmware_update_not_found_in_release">Ei löytynyt firmwarea kohteelle %1$s julkaisusta.</string>
@@ -823,6 +824,7 @@
     <string name="label_long_turbo">Long Range - Turbo</string>
     <string name="label_medium_fast">Medium Range - Fast</string>
     <string name="label_medium_slow">Medium Range - Slow</string>
+    <string name="label_medium_turbo">Medium Range - Turbo</string>
     <string name="label_narrow_fast">Narrow - Fast</string>
     <string name="label_narrow_slow">Narrow - Slow</string>
     <string name="label_short_fast">Short Range - Fast</string>
@@ -1743,10 +1745,14 @@
     <string name="wait_for_bluetooth_duration_seconds">Bluetoothin odotusaika</string>
     <string name="wake_on_tap_or_motion">Herätä napautuksesta tai liikkeestä</string>
     <string name="warning">Varoitus</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">Poista reittipiste?</string>
     <string name="waypoint_edit">Muokkaa reittipistettä</string>
     <string name="waypoint_new">Uusi reittipiste</string>
     <string name="waypoint_received">Vastaanotettu reittipiste: %1$s</string>
+    <string name="waypoint_recipient_broadcast">Yleislähetys (kaikki radiot)</string>
+    <string name="waypoint_recipient_channel">Kanava %1$d</string>
+    <string name="waypoint_send_to">Lähetä</string>
     <string name="weight">Paino</string>
     <!-- WIFI -->
     <string name="wifi_config">WiFi:n asetukset</string>
diff --git a/core/resources/src/commonMain/composeResources/values-fr/strings.xml b/core/resources/src/commonMain/composeResources/values-fr/strings.xml
index 7c7ab9e62..f8537cf6a 100644
--- a/core/resources/src/commonMain/composeResources/values-fr/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-fr/strings.xml
@@ -1402,6 +1402,7 @@
     <string name="wait_for_bluetooth_duration_seconds">Durée d'attente max du Bluetooth</string>
     <string name="wake_on_tap_or_motion">Réveil par appui ou mouvement</string>
     <string name="warning">Attention</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">Supprimer le repère ?</string>
     <string name="waypoint_edit">Modifier le repère</string>
     <string name="waypoint_new">Nouveau point de repère</string>
diff --git a/core/resources/src/commonMain/composeResources/values-ga/strings.xml b/core/resources/src/commonMain/composeResources/values-ga/strings.xml
index a32b64d97..e51985706 100644
--- a/core/resources/src/commonMain/composeResources/values-ga/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-ga/strings.xml
@@ -290,6 +290,7 @@
     <!-- USE -->
     <!-- USER -->
     <string name="via_mqtt">trí MQTT</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">Scrios an pointe bealach?</string>
     <string name="waypoint_edit">Cuir in eagar an pointe bealach</string>
     <string name="waypoint_new">Pointe bealach nua</string>
diff --git a/core/resources/src/commonMain/composeResources/values-gl/strings.xml b/core/resources/src/commonMain/composeResources/values-gl/strings.xml
index cd449122f..6fda188d3 100644
--- a/core/resources/src/commonMain/composeResources/values-gl/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-gl/strings.xml
@@ -226,6 +226,7 @@
     <!-- USE -->
     <!-- USER -->
     <string name="via_mqtt">vía MQTT</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">Eliminar punto de ruta?</string>
     <string name="waypoint_edit">Editar punto de ruta</string>
     <string name="waypoint_new">Novo punto de ruta</string>
diff --git a/core/resources/src/commonMain/composeResources/values-he/strings.xml b/core/resources/src/commonMain/composeResources/values-he/strings.xml
index f6741d058..4c37883f9 100644
--- a/core/resources/src/commonMain/composeResources/values-he/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-he/strings.xml
@@ -210,6 +210,7 @@
     <!-- URL -->
     <!-- USE -->
     <!-- USER -->
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">מחק נקודת ציון?</string>
     <string name="waypoint_edit">ערוך נקודת ציון</string>
     <string name="waypoint_new">נקודת ציון חדשה</string>
diff --git a/core/resources/src/commonMain/composeResources/values-hr/strings.xml b/core/resources/src/commonMain/composeResources/values-hr/strings.xml
index d4a712a60..178b99d9d 100644
--- a/core/resources/src/commonMain/composeResources/values-hr/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-hr/strings.xml
@@ -230,6 +230,7 @@
     <!-- USE -->
     <!-- USER -->
     <string name="via_mqtt">putem MQTT</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">Obriši putnu točku?</string>
     <string name="waypoint_edit">Uredi putnu točku</string>
     <string name="waypoint_new">Nova putna točka</string>
diff --git a/core/resources/src/commonMain/composeResources/values-ht/strings.xml b/core/resources/src/commonMain/composeResources/values-ht/strings.xml
index 2566adfba..118cf1224 100644
--- a/core/resources/src/commonMain/composeResources/values-ht/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-ht/strings.xml
@@ -278,6 +278,7 @@
     <!-- USE -->
     <!-- USER -->
     <string name="via_mqtt">atravè MQTT</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">Efase pwen?</string>
     <string name="waypoint_edit">Modifye pwen</string>
     <string name="waypoint_new">Nouvo pwen</string>
diff --git a/core/resources/src/commonMain/composeResources/values-hu/strings.xml b/core/resources/src/commonMain/composeResources/values-hu/strings.xml
index de8045831..318e743a0 100644
--- a/core/resources/src/commonMain/composeResources/values-hu/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-hu/strings.xml
@@ -923,6 +923,7 @@
     <string name="wait_for_bluetooth_duration_seconds">Bluetooth-várakozás időtartama</string>
     <string name="wake_on_tap_or_motion">Érintésre vagy mozgásra ébresztés</string>
     <string name="warning">Figyelmeztetés</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">Útpont törlés?</string>
     <string name="waypoint_edit">Útpont szerkesztés</string>
     <string name="waypoint_new">Új útpont</string>
diff --git a/core/resources/src/commonMain/composeResources/values-is/strings.xml b/core/resources/src/commonMain/composeResources/values-is/strings.xml
index 69eb0eae1..3930b9742 100644
--- a/core/resources/src/commonMain/composeResources/values-is/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-is/strings.xml
@@ -190,6 +190,7 @@
     <!-- URL -->
     <!-- USE -->
     <!-- USER -->
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">Eyða leiðarpunkti?</string>
     <string name="waypoint_edit">Breyta leiðarpunkti</string>
     <string name="waypoint_new">Nýr leiðarpunktur</string>
diff --git a/core/resources/src/commonMain/composeResources/values-it/strings.xml b/core/resources/src/commonMain/composeResources/values-it/strings.xml
index a2d7e40d9..2aaee3936 100644
--- a/core/resources/src/commonMain/composeResources/values-it/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-it/strings.xml
@@ -1042,6 +1042,7 @@
     <string name="wait_for_bluetooth_duration_seconds">Durata attesa Bluetooth</string>
     <string name="wake_on_tap_or_motion">Accendi lo schermo al tocco o al movimento</string>
     <string name="warning">Attenzione</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">Elimina waypoint?</string>
     <string name="waypoint_edit">Modifica waypoint</string>
     <string name="waypoint_new">Nuovo waypoint</string>
diff --git a/core/resources/src/commonMain/composeResources/values-ja/strings.xml b/core/resources/src/commonMain/composeResources/values-ja/strings.xml
index 2531f64b6..27efd219f 100644
--- a/core/resources/src/commonMain/composeResources/values-ja/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-ja/strings.xml
@@ -1705,6 +1705,7 @@
     <string name="wait_for_bluetooth_duration_seconds">Bluetooth 待機時間</string>
     <string name="wake_on_tap_or_motion">タップまたは動作で起動</string>
     <string name="warning">警告</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">ウェイポイントを削除しますか？</string>
     <string name="waypoint_edit">ウェイポイントを編集</string>
     <string name="waypoint_new">新規ウェイポイント</string>
diff --git a/core/resources/src/commonMain/composeResources/values-ko/strings.xml b/core/resources/src/commonMain/composeResources/values-ko/strings.xml
index 99ce5f59e..4dc482bee 100644
--- a/core/resources/src/commonMain/composeResources/values-ko/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-ko/strings.xml
@@ -610,6 +610,7 @@
     <string name="username">사용자명</string>
     <string name="via_mqtt">MQTT 경유</string>
     <string name="voltage">전압</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">웨이포인트 삭제?</string>
     <string name="waypoint_edit">웨이포인트 편집</string>
     <string name="waypoint_new">새 웨이포인트</string>
diff --git a/core/resources/src/commonMain/composeResources/values-lt/strings.xml b/core/resources/src/commonMain/composeResources/values-lt/strings.xml
index 607be6b55..6177d7bc2 100644
--- a/core/resources/src/commonMain/composeResources/values-lt/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-lt/strings.xml
@@ -298,6 +298,7 @@
     <!-- USE -->
     <!-- USER -->
     <string name="via_mqtt">per MQTT</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">Ištrinti orientyrą?</string>
     <string name="waypoint_edit">Redaguoti kelio tašką</string>
     <string name="waypoint_new">Naujas orientyras</string>
diff --git a/core/resources/src/commonMain/composeResources/values-nl/strings.xml b/core/resources/src/commonMain/composeResources/values-nl/strings.xml
index 3e8c463a3..6e1f7c786 100644
--- a/core/resources/src/commonMain/composeResources/values-nl/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-nl/strings.xml
@@ -485,6 +485,7 @@
     <string name="username">Gebruikersnaam</string>
     <string name="via_mqtt">via MQTT</string>
     <string name="voltage">Spanning</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">Waypoint verwijderen?</string>
     <string name="waypoint_edit">Wijzig waypoint</string>
     <string name="waypoint_new">Nieuw waypoint</string>
diff --git a/core/resources/src/commonMain/composeResources/values-no/strings.xml b/core/resources/src/commonMain/composeResources/values-no/strings.xml
index 29d9323ef..d46f1659f 100644
--- a/core/resources/src/commonMain/composeResources/values-no/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-no/strings.xml
@@ -301,6 +301,7 @@
     <!-- USE -->
     <!-- USER -->
     <string name="via_mqtt">via MQTT</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">Fjern veipunkt?</string>
     <string name="waypoint_edit">Rediger veipunkt</string>
     <string name="waypoint_new">Nytt veipunkt</string>
diff --git a/core/resources/src/commonMain/composeResources/values-pl/strings.xml b/core/resources/src/commonMain/composeResources/values-pl/strings.xml
index d1af5cfc4..eba4487a3 100644
--- a/core/resources/src/commonMain/composeResources/values-pl/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-pl/strings.xml
@@ -834,6 +834,7 @@
     <string name="voltage">Napięcie</string>
     <string name="wake_on_tap_or_motion">Wybudź przy dotknięciu lub ruchu</string>
     <string name="warning">Uwaga</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">Usuń punkt nawigacji?</string>
     <string name="waypoint_edit">Edytuj punkt nawigacji</string>
     <string name="waypoint_new">Nowy punkt nawigacyjny</string>
diff --git a/core/resources/src/commonMain/composeResources/values-pt-rBR/strings.xml b/core/resources/src/commonMain/composeResources/values-pt-rBR/strings.xml
index f693bf9cc..e69baa64f 100644
--- a/core/resources/src/commonMain/composeResources/values-pt-rBR/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-pt-rBR/strings.xml
@@ -735,6 +735,7 @@
     <string name="view_release">Ver Lançamento</string>
     <string name="voltage">Voltagem</string>
     <string name="warning">Atenção</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">Excluir ponto de referência?</string>
     <string name="waypoint_edit">Editar ponto de referência</string>
     <string name="waypoint_new">Novo ponto de referência</string>
diff --git a/core/resources/src/commonMain/composeResources/values-pt/strings.xml b/core/resources/src/commonMain/composeResources/values-pt/strings.xml
index bd2f3576a..11e48e463 100644
--- a/core/resources/src/commonMain/composeResources/values-pt/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-pt/strings.xml
@@ -583,6 +583,7 @@
     <string name="username">Utilizador</string>
     <string name="via_mqtt">via MQTT</string>
     <string name="voltage">Voltagem</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">Apagar o ponto de referência?</string>
     <string name="waypoint_edit">Editar ponto de referência</string>
     <string name="waypoint_new">Novo ponto de referência</string>
diff --git a/core/resources/src/commonMain/composeResources/values-ro/strings.xml b/core/resources/src/commonMain/composeResources/values-ro/strings.xml
index acb84398c..5ff16712f 100644
--- a/core/resources/src/commonMain/composeResources/values-ro/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-ro/strings.xml
@@ -1208,6 +1208,7 @@
     <string name="wait_for_bluetooth_duration_seconds">Așteptați pentru durata Bluetooth</string>
     <string name="wake_on_tap_or_motion">Trezire la apăsare sau mișcare</string>
     <string name="warning">Avertizare</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">Şterge waypointul?</string>
     <string name="waypoint_edit">Editează waypoint</string>
     <string name="waypoint_new">Waypoint nou</string>
diff --git a/core/resources/src/commonMain/composeResources/values-ru/strings.xml b/core/resources/src/commonMain/composeResources/values-ru/strings.xml
index 0fde5fe4a..cf4b89dea 100644
--- a/core/resources/src/commonMain/composeResources/values-ru/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-ru/strings.xml
@@ -1746,6 +1746,7 @@
     <string name="wait_for_bluetooth_duration_seconds">Длительность ожидания Bluetooth</string>
     <string name="wake_on_tap_or_motion">Включать экран при касании или движении</string>
     <string name="warning">Предупреждение</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">Удалить путевую точку?</string>
     <string name="waypoint_edit">Редактировать путевую точку</string>
     <string name="waypoint_new">Установить путевую точку</string>
diff --git a/core/resources/src/commonMain/composeResources/values-sk/strings.xml b/core/resources/src/commonMain/composeResources/values-sk/strings.xml
index 00127b8a3..c9a605d30 100644
--- a/core/resources/src/commonMain/composeResources/values-sk/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-sk/strings.xml
@@ -495,6 +495,7 @@
     <string name="username">Používateľské meno</string>
     <string name="via_mqtt">cez MQTT</string>
     <string name="voltage">Napätie</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">Vymazať cieľový bod?</string>
     <string name="waypoint_edit">Editovať cieľový bod</string>
     <string name="waypoint_new">Nový cieľový bod</string>
diff --git a/core/resources/src/commonMain/composeResources/values-sl/strings.xml b/core/resources/src/commonMain/composeResources/values-sl/strings.xml
index 0439c6640..e71c2650c 100644
--- a/core/resources/src/commonMain/composeResources/values-sl/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-sl/strings.xml
@@ -305,6 +305,7 @@
     <!-- USE -->
     <!-- USER -->
     <string name="via_mqtt">Preko MQTT</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">Izbriši točko poti?</string>
     <string name="waypoint_edit">Uredi točko poti</string>
     <string name="waypoint_new">Nova točka poti</string>
diff --git a/core/resources/src/commonMain/composeResources/values-sq/strings.xml b/core/resources/src/commonMain/composeResources/values-sq/strings.xml
index 714e38549..3166e1088 100644
--- a/core/resources/src/commonMain/composeResources/values-sq/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-sq/strings.xml
@@ -280,6 +280,7 @@
     <!-- USE -->
     <!-- USER -->
     <string name="via_mqtt">përmes MQTT</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">Të fshihet pika e rreshtit?</string>
     <string name="waypoint_edit">Redakto pikën e rreshtit</string>
     <string name="waypoint_new">Pikë e re rreshti</string>
diff --git a/core/resources/src/commonMain/composeResources/values-sr/strings.xml b/core/resources/src/commonMain/composeResources/values-sr/strings.xml
index 08ee7f41e..0185389b7 100644
--- a/core/resources/src/commonMain/composeResources/values-sr/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-sr/strings.xml
@@ -508,6 +508,7 @@
     <string name="username">Корисничко име</string>
     <string name="via_mqtt">preko MQTT-a</string>
     <string name="voltage">Напон</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">Обрисати тачку путање?</string>
     <string name="waypoint_edit">Измените тачку путање</string>
     <string name="waypoint_new">Нова тачка путање</string>
diff --git a/core/resources/src/commonMain/composeResources/values-srp/strings.xml b/core/resources/src/commonMain/composeResources/values-srp/strings.xml
index 97537255d..ff971463f 100644
--- a/core/resources/src/commonMain/composeResources/values-srp/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-srp/strings.xml
@@ -508,6 +508,7 @@
     <string name="username">Корисничко име</string>
     <string name="via_mqtt">преко MQTT-а</string>
     <string name="voltage">Напон</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">Обрисати тачку путање?</string>
     <string name="waypoint_edit">Измените тачку путање</string>
     <string name="waypoint_new">Нова тачка путање</string>
diff --git a/core/resources/src/commonMain/composeResources/values-sv/strings.xml b/core/resources/src/commonMain/composeResources/values-sv/strings.xml
index de1ba77dc..23ba071a7 100644
--- a/core/resources/src/commonMain/composeResources/values-sv/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-sv/strings.xml
@@ -1192,6 +1192,7 @@
     <string name="wait_for_bluetooth_duration_seconds">Vänta in Bluetooth (sekunder)</string>
     <string name="wake_on_tap_or_motion">Vakna vid tryck eller rörelse</string>
     <string name="warning">Varning</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">Radera vägpunkt?</string>
     <string name="waypoint_edit">Redigera vägpunkt</string>
     <string name="waypoint_new">Ny vägpunkt</string>
diff --git a/core/resources/src/commonMain/composeResources/values-tr/strings.xml b/core/resources/src/commonMain/composeResources/values-tr/strings.xml
index ce07686df..82c5ffe50 100644
--- a/core/resources/src/commonMain/composeResources/values-tr/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-tr/strings.xml
@@ -620,6 +620,7 @@
     <string name="username">Kullanıcı adı</string>
     <string name="via_mqtt">MQTT yoluyla</string>
     <string name="voltage">Voltaj</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">Yer işaretini sil?</string>
     <string name="waypoint_edit">Yer işareti düzenle</string>
     <string name="waypoint_new">Yeni yer işareti</string>
diff --git a/core/resources/src/commonMain/composeResources/values-uk/strings.xml b/core/resources/src/commonMain/composeResources/values-uk/strings.xml
index 9d126710d..83842d3a2 100644
--- a/core/resources/src/commonMain/composeResources/values-uk/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-uk/strings.xml
@@ -1300,6 +1300,7 @@
     <string name="wait_for_bluetooth_duration_seconds">Тривалість очікування Bluetooth</string>
     <string name="wake_on_tap_or_motion">Прокидання дотиком або рухом</string>
     <string name="warning">Попередження</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">Видалити мітку?</string>
     <string name="waypoint_edit">Редагувати точку</string>
     <string name="waypoint_new">Новий мітка</string>
diff --git a/core/resources/src/commonMain/composeResources/values-zh-rCN/strings.xml b/core/resources/src/commonMain/composeResources/values-zh-rCN/strings.xml
index 44503ab13..e5ea3a906 100644
--- a/core/resources/src/commonMain/composeResources/values-zh-rCN/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-zh-rCN/strings.xml
@@ -1627,6 +1627,7 @@
     <string name="wait_for_bluetooth_duration_seconds">等待蓝牙持续时间 </string>
     <string name="wake_on_tap_or_motion">点击或移动时唤醒屏幕</string>
     <string name="warning">警告</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">删除航点?</string>
     <string name="waypoint_edit">编辑航点</string>
     <string name="waypoint_new">新建航点</string>
diff --git a/core/resources/src/commonMain/composeResources/values-zh-rTW/strings.xml b/core/resources/src/commonMain/composeResources/values-zh-rTW/strings.xml
index 3750db2d6..063745f7f 100644
--- a/core/resources/src/commonMain/composeResources/values-zh-rTW/strings.xml
+++ b/core/resources/src/commonMain/composeResources/values-zh-rTW/strings.xml
@@ -1409,6 +1409,7 @@
     <string name="wait_for_bluetooth_duration_seconds">藍牙等待持續時間</string>
     <string name="wake_on_tap_or_motion">輕觸或移動喚醒</string>
     <string name="warning">警告</string>
+    <!-- WAYPOINT -->
     <string name="waypoint_delete">刪除航點？</string>
     <string name="waypoint_edit">編輯航點</string>
     <string name="waypoint_new">新建航點</string>