diff --git a/Localizable.xcstrings b/Localizable.xcstrings
index ece3b65f..e91ed98c 100644
--- a/Localizable.xcstrings
+++ b/Localizable.xcstrings
@@ -4540,6 +4540,64 @@
         }
       }
     },
+    "Bluetooth config received: %@" : {
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Bluetooth Konfiguration empfangen: %@"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Configuration Bluetooth reçue : %@"
+          }
+        },
+        "he" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "הגדרות בלוטוס התקבלו: %@"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Configurazione Bluetooth ricevuta: %@"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Otrzymano konfigurację Bluetooth: %@"
+          }
+        },
+        "se" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Bluetooth-konfiguration mottagen: %@"
+          }
+        },
+        "sr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Примљена конфигурација блутута: %@"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Bluetooth config received: %@"
+          }
+        },
+        "zh-Hant-TW" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Bluetooth config received: %@"
+          }
+        }
+      }
+    },
     "Bluetooth is off" : {
       "localizations" : {
         "de" : {
@@ -5066,6 +5124,58 @@
         }
       }
     },
+    "Canned Message module config received: %@" : {
+      "localizations" : {
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Configuration du module messages préformatés reçue : %@"
+          }
+        },
+        "he" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "הגדרות מודולת תגובות שמורות התקבלו: %@"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Configurazione del modulo Canned Message ricevuta: %@"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Otrzymano konfigurację modułu wiadomości gotowych: %@"
+          }
+        },
+        "se" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Konfiguration för modulen med fördefinierade meddelanden mottagen: %@"
+          }
+        },
+        "sr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Конфигурација модула за унапред припремљене поруке примљена: %@"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Canned Message module config received: %@"
+          }
+        },
+        "zh-Hant-TW" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Canned Message module config received: %@"
+          }
+        }
+      }
+    },
     "Canned Messages" : {
       "localizations" : {
         "de" : {
@@ -5182,6 +5292,64 @@
         }
       }
     },
+    "Canned Messages Messages Received For: %@" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : ""
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Messages préformatés reçus pour : %@"
+          }
+        },
+        "he" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "הודעות עבור הודעות שמורות התקבלו מ-%@"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Messaggi in scatola Messaggi ricevuti per: %@"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Otrzymano Wiadomości Gotowe Dla: %@"
+          }
+        },
+        "se" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Mottagna meddelanden för fördefinierade meddelanden För: %@"
+          }
+        },
+        "sr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Примљене поруке за унапред припремљене поруке за: %@"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Canned Messages Messages Received For: %@"
+          }
+        },
+        "zh-Hant-TW" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Canned Messages Messages Received For: %@"
+          }
+        }
+      }
+    },
     "Carousel Interval" : {
       "localizations" : {
         "it" : {
@@ -8165,14 +8333,8 @@
         }
       }
     },
-    "default.128x64.screen.layout" : {
+    "Default 128x64 screen layout" : {
       "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Default 128x64 screen layout"
-          }
-        },
         "it" : {
           "stringUnit" : {
             "state" : "translated",
@@ -8395,6 +8557,34 @@
         }
       }
     },
+    "Delete all pax data?" : {
+      "localizations" : {
+        "it" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "Cancellare tutti i dati dei passeggeri?"
+          }
+        },
+        "se" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "Radera all paxdata?"
+          }
+        },
+        "sr" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "Избриши све PAX податке?"
+          }
+        },
+        "zh-Hant-TW" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "要刪除所有 PAX 資料嗎？"
+          }
+        }
+      }
+    },
     "Delete all positions?" : {
       "localizations" : {
         "it" : {
@@ -8633,57 +8823,8 @@
         }
       }
     },
-    "Detection Sensor Log" : {
-      "localizations" : {
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Registro del sensore di rilevamento"
-          }
-        },
-        "sr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Логови сензора откривања"
-          }
-        },
-        "zh-Hant-TW" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "檢測感測器紀錄"
-          }
-        }
-      }
-    },
-    "Detection sensor messages are received as text messages.  If you enable notifications you will recieve a notification for each detection message received and a corresponding unread message badge." : {
-      "localizations" : {
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "I messaggi del sensore di rilevamento vengono ricevuti come messaggi di testo.  Se si attivano le notifiche, si riceverà una notifica per ogni messaggio di rilevamento ricevuto e un badge per il messaggio non letto corrispondente."
-          }
-        },
-        "sr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Поруке сензора за откривање се примају као текстуалне поруке. Ако омогућите обавештења, добићете обавештење за сваку примљену поруку за откривање и одговарајућу значку непрочитане поруке."
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "检测传感器信息以文本信息的形式接收。如果启用通知功能，则每收到一条检测信息都会收到一条通知，并显示相应的未读信息。"
-          }
-        },
-        "zh-Hant-TW" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "偵測感測器的訊息會以文字訊息的形式接收。若啟用通知功能，每當接收到偵測訊息時，您將會收到一則通知，並顯示對應的未讀訊息標記。"
-          }
-        }
-      }
-    },
-    "detection.sensor" : {
+    "Detection Sensor" : {
+      "extractionState" : "manual",
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -8691,12 +8832,6 @@
             "value" : "Detection Sensor"
           }
         },
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Detection Sensor"
-          }
-        },
         "fr" : {
           "stringUnit" : {
             "state" : "translated",
@@ -8747,14 +8882,8 @@
         }
       }
     },
-    "detection.sensor.config" : {
+    "Detection Sensor Config" : {
       "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Detection Sensor Config"
-          }
-        },
         "fr" : {
           "stringUnit" : {
             "state" : "translated",
@@ -8799,54 +8928,104 @@
         }
       }
     },
-    "detection.sensor.log" : {
+    "Detection Sensor Log" : {
       "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Detection Sensor Log"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Journal du capteur de détection"
-          }
-        },
-        "he" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "יומן חיישן זיהוי"
-          }
-        },
         "it" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Registro del sensore di rilevamento"
           }
         },
-        "se" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Logg för Detektionssensor"
-          }
-        },
         "sr" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Логови сензора откривања"
           }
         },
+        "zh-Hant-TW" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "檢測感測器紀錄"
+          }
+        }
+      }
+    },
+    "Detection sensor messages are received as text messages.  If you enable notifications you will recieve a notification for each detection message received and a corresponding unread message badge." : {
+      "localizations" : {
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "I messaggi del sensore di rilevamento vengono ricevuti come messaggi di testo.  Se si attivano le notifiche, si riceverà una notifica per ogni messaggio di rilevamento ricevuto e un badge per il messaggio non letto corrispondente."
+          }
+        },
+        "sr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Поруке сензора за откривање се примају као текстуалне поруке. Ако омогућите обавештења, добићете обавештење за сваку примљену поруку за откривање и одговарајућу значку непрочитане поруке."
+          }
+        },
         "zh-Hans" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "检测传感器日志"
+            "value" : "检测传感器信息以文本信息的形式接收。如果启用通知功能，则每收到一条检测信息都会收到一条通知，并显示相应的未读信息。"
           }
         },
         "zh-Hant-TW" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "檢測感測器紀錄"
+            "value" : "偵測感測器的訊息會以文字訊息的形式接收。若啟用通知功能，每當接收到偵測訊息時，您將會收到一則通知，並顯示對應的未讀訊息標記。"
+          }
+        }
+      }
+    },
+    "Detection Sensor module config received: %@" : {
+      "localizations" : {
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Configuration du module capteur de détection reçue : %@"
+          }
+        },
+        "he" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "הגדרות מודולת חיישן זיהוי התקבלו: %@"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Configurazione del modulo sensore di rilevamento ricevuta: %@"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Detection Sensor module config received: %@"
+          }
+        },
+        "se" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Konfiguration för detektionssensormodulen mottagen: %@"
+          }
+        },
+        "sr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Конфигурација модула за сензор детекције примљена: %@"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Detection Sensor module config received: %@"
+          }
+        },
+        "zh-Hant-TW" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Detection Sensor module config received: %@"
           }
         }
       }
@@ -8937,6 +9116,122 @@
         }
       }
     },
+    "Device Config" : {
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Gerätekonfiguration"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Configuration de l'appareil"
+          }
+        },
+        "he" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "הגדרות מכשיר"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Configurazione del dispositivo"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Konfiguracja urządzenia"
+          }
+        },
+        "se" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Enhetskonfiguration"
+          }
+        },
+        "sr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Подешавања уређаја"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "设备配置"
+          }
+        },
+        "zh-Hant-TW" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "節點設定"
+          }
+        }
+      }
+    },
+    "Device config received: %@" : {
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Gerätekonfiguration empfangen: %@"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Configuration de l'appareil reçue : %@"
+          }
+        },
+        "he" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "הגדרות מכשיר התקבלו: %@"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Configurazione dispositivo ricevuta: %@"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Otrzymano konfigurację urządzenia: %@"
+          }
+        },
+        "se" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Enhetskonfiguration mottagen: %@"
+          }
+        },
+        "sr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Примљена конфигурација уређаја: %@"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Device config received: %@"
+          }
+        },
+        "zh-Hant-TW" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Device config received: %@"
+          }
+        }
+      }
+    },
     "Device Configuration" : {
       "localizations" : {
         "de" : {
@@ -9039,6 +9334,64 @@
         }
       }
     },
+    "Device Metadata received from: %@" : {
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Device Metadata empfangen von: %@"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Metadatas de l'appareil reçues de : %@"
+          }
+        },
+        "he" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "מטא-דאטה של מכשיר התקבל מ-%@"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Metadati del dispositivo ricevuti da: %@"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Otrzymano metadane urządzenia od: %@"
+          }
+        },
+        "se" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Metadata för enhet mottagen från: %@"
+          }
+        },
+        "sr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Метаподаци уређаја примљени од: %@"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Device Metadata admin message received from: %@"
+          }
+        },
+        "zh-Hant-TW" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Device Metadata received from: %@"
+          }
+        }
+      }
+    },
     "Device Metrics" : {
       "localizations" : {
         "it" : {
@@ -9301,134 +9654,6 @@
         }
       }
     },
-    "device.config" : {
-      "localizations" : {
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Gerätekonfiguration"
-          }
-        },
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Device Config"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Configuration de l'appareil"
-          }
-        },
-        "he" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "הגדרות מכשיר"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Configurazione del dispositivo"
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Konfiguracja urządzenia"
-          }
-        },
-        "se" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Enhetskonfiguration"
-          }
-        },
-        "sr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Подешавања уређаја"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "设备配置"
-          }
-        },
-        "zh-Hant-TW" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "節點設定"
-          }
-        }
-      }
-    },
-    "device.metrics.log" : {
-      "localizations" : {
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Device Metrics Log"
-          }
-        },
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Device Metrics Log"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Journal des mesures de l'appareil"
-          }
-        },
-        "he" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "יומן מכשיר"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Registro delle metriche del dispositivo"
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Dziennik metryk urządzenia"
-          }
-        },
-        "se" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Logg för Enhetsmätvärden"
-          }
-        },
-        "sr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Логови метрике уређаја"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "设备指标日志"
-          }
-        },
-        "zh-Hant-TW" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "裝置指標紀錄檔"
-          }
-        }
-      }
-    },
     "Dilution of precision (DOP) PDOP used by default" : {
       "localizations" : {
         "it" : {
@@ -9513,6 +9738,64 @@
         }
       }
     },
+    "Direct Messages" : {
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Direktnachrichten"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Messages directs"
+          }
+        },
+        "he" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "הודעה פרטית"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Messaggi diretti"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Bezpośrednie Wiadomości"
+          }
+        },
+        "se" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Direktmeddelanden"
+          }
+        },
+        "sr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Директне поруке"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "私聊"
+          }
+        },
+        "zh-Hant-TW" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "私人訊息"
+          }
+        }
+      }
+    },
     "Direct messages are using the new public key infrastructure for encryption. Requires firmware version 2.5 or greater." : {
       "localizations" : {
         "it" : {
@@ -9569,70 +9852,6 @@
         }
       }
     },
-    "direct.messages" : {
-      "localizations" : {
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Direktnachrichten"
-          }
-        },
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Direct Messages"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Messages directs"
-          }
-        },
-        "he" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "הודעה פרטית"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Messaggi diretti"
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Bezpośrednie Wiadomości"
-          }
-        },
-        "se" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Direktmeddelanden"
-          }
-        },
-        "sr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Директне поруке"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "私聊"
-          }
-        },
-        "zh-Hant-TW" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "私人訊息"
-          }
-        }
-      }
-    },
     "Disabled" : {
       "localizations" : {
         "de" : {
@@ -11555,7 +11774,7 @@
         }
       }
     },
-    "external.notification" : {
+    "External Notification" : {
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -11563,12 +11782,6 @@
             "value" : "Externe Benachrichtigung"
           }
         },
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "External Notification"
-          }
-        },
         "fr" : {
           "stringUnit" : {
             "state" : "translated",
@@ -11619,6 +11832,58 @@
         }
       }
     },
+    "External Notification module config received: %@" : {
+      "localizations" : {
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Configuration du module notification extérieure reçue : %@"
+          }
+        },
+        "he" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "הגדרות מודולת נוטיפיקציה חיצונית התקבלו: %@"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Configurazione del modulo di notifica esterno ricevuta: %@"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Otrzymano konfigurację modułu zewnętrznych powiadomień: %@"
+          }
+        },
+        "se" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Konfiguration för modulen för externa notifikationer mottagen: %@"
+          }
+        },
+        "sr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Конфигурација модула за екстерне нотификације примљена: %@"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "External Notification module config received: %@"
+          }
+        },
+        "zh-Hant-TW" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "External Notification module config received: %@"
+          }
+        }
+      }
+    },
     "external.notification.config" : {
       "localizations" : {
         "de" : {
@@ -12315,70 +12580,6 @@
         }
       }
     },
-    "firmware.version.unsupported" : {
-      "localizations" : {
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Nicht unterstützte Firmware Version erkannt. Kann nicht verbinden."
-          }
-        },
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Unsupported Firmware Version Detected, unable to connect to device."
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Version non supportée du firmware détectée, impossible de se connecter à l'appareil."
-          }
-        },
-        "he" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "גרסת קושחה אינה נתמכת, לא ניתן להתחבר למכשיר."
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Rilevata versione firmware non supportata, impossibile connettersi al dispositivo."
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Wykryto nieobsługiwany wersję oprogramowania, brak możliwości połączenia z urządzeniem."
-          }
-        },
-        "se" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Okänd Firmwareversion upptäckt, kan inte ansluta till enheten."
-          }
-        },
-        "sr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Откривена је неподржана верзија фирмвера, није могуће повезати са уређајем."
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "检测到不支持的固件版本，无法连接到设备。"
-          }
-        },
-        "zh-Hant-TW" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "檢測到不支援的韌體版本，無法連接到節點。"
-          }
-        }
-      }
-    },
     "First heard" : {
       "localizations" : {
         "it" : {
@@ -13841,27 +14042,21 @@
     },
     "Hazardous" : {
       "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Hazardous"
-          }
-        },
         "it" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Pericoloso"
           }
         },
         "sr" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Опасно"
           }
         },
         "zh-Hant-TW" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "危險"
           }
         }
@@ -15499,14 +15694,8 @@
         }
       }
     },
-    "inverted.top.bar.for.2.color.display" : {
+    "Inverted top bar for 2 Color display" : {
       "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Inverted top bar for 2 Color display"
-          }
-        },
         "it" : {
           "stringUnit" : {
             "state" : "translated",
@@ -17319,122 +17508,6 @@
         }
       }
     },
-    "Bluetooth config received: %@" : {
-      "localizations" : {
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Bluetooth Konfiguration empfangen: %@"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Configuration Bluetooth reçue : %@"
-          }
-        },
-        "he" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "הגדרות בלוטוס התקבלו: %@"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Configurazione Bluetooth ricevuta: %@"
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Otrzymano konfigurację Bluetooth: %@"
-          }
-        },
-        "se" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Bluetooth-konfiguration mottagen: %@"
-          }
-        },
-        "sr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Примљена конфигурација блутута: %@"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Bluetooth config received: %@"
-          }
-        },
-        "zh-Hant-TW" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Bluetooth config received: %@"
-          }
-        }
-      }
-    },
-    "mesh.log.cannedmessage.config %@" : {
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Canned Message module config received: %@"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Configuration du module messages préformatés reçue : %@"
-          }
-        },
-        "he" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "הגדרות מודולת תגובות שמורות התקבלו: %@"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Configurazione del modulo Canned Message ricevuta: %@"
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Otrzymano konfigurację modułu wiadomości gotowych: %@"
-          }
-        },
-        "se" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Konfiguration för modulen med fördefinierade meddelanden mottagen: %@"
-          }
-        },
-        "sr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Конфигурација модула за унапред припремљене поруке примљена: %@"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Canned Message module config received: %@"
-          }
-        },
-        "zh-Hant-TW" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Canned Message module config received: %@"
-          }
-        }
-      }
-    },
     "mesh.log.cannedmessages.messages.get %@" : {
       "localizations" : {
         "en" : {
@@ -17493,64 +17566,6 @@
         }
       }
     },
-    "mesh.log.cannedmessages.messages.received %@" : {
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Canned Messages Messages Received For: %@"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Messages préformatés reçus pour : %@"
-          }
-        },
-        "he" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "הודעות עבור הודעות שמורות התקבלו מ-%@"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Messaggi in scatola Messaggi ricevuti per: %@"
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Otrzymano Wiadomości Gotowe Dla: %@"
-          }
-        },
-        "se" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Mottagna meddelanden för fördefinierade meddelanden För: %@"
-          }
-        },
-        "sr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Примљене поруке за унапред припремљене поруке за: %@"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Canned Messages Messages Received For: %@"
-          }
-        },
-        "zh-Hant-TW" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Canned Messages Messages Received For: %@"
-          }
-        }
-      }
-    },
     "mesh.log.channel.sent %@ %d" : {
       "localizations" : {
         "en" : {
@@ -17609,187 +17624,7 @@
         }
       }
     },
-    "mesh.log.detectionsensor.config %@" : {
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Detection Sensor module config received: %@"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Configuration du module capteur de détection reçue : %@"
-          }
-        },
-        "he" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "הגדרות מודולת חיישן זיהוי התקבלו: %@"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Configurazione del modulo sensore di rilevamento ricevuta: %@"
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Detection Sensor module config received: %@"
-          }
-        },
-        "se" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Konfiguration för detektionssensormodulen mottagen: %@"
-          }
-        },
-        "sr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Конфигурација модула за сензор детекције примљена: %@"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Detection Sensor module config received: %@"
-          }
-        },
-        "zh-Hant-TW" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Detection Sensor module config received: %@"
-          }
-        }
-      }
-    },
-    "Device config received: %@" : {
-      "localizations" : {
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Gerätekonfiguration empfangen: %@"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Configuration de l'appareil reçue : %@"
-          }
-        },
-        "he" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "הגדרות מכשיר התקבלו: %@"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Configurazione dispositivo ricevuta: %@"
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Otrzymano konfigurację urządzenia: %@"
-          }
-        },
-        "se" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Enhetskonfiguration mottagen: %@"
-          }
-        },
-        "sr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Примљена конфигурација уређаја: %@"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Device config received: %@"
-          }
-        },
-        "zh-Hant-TW" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Device config received: %@"
-          }
-        }
-      }
-    },
-    "mesh.log.device.metadata.received %@" : {
-      "localizations" : {
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Device Metadata empfangen von: %@"
-          }
-        },
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Device Metadata received from: %@"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Metadatas de l'appareil reçues de : %@"
-          }
-        },
-        "he" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "מטא-דאטה של מכשיר התקבל מ-%@"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Metadati del dispositivo ricevuti da: %@"
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Otrzymano metadane urządzenia od: %@"
-          }
-        },
-        "se" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Metadata för enhet mottagen från: %@"
-          }
-        },
-        "sr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Метаподаци уређаја примљени од: %@"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Device Metadata admin message received from: %@"
-          }
-        },
-        "zh-Hant-TW" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Device Metadata received from: %@"
-          }
-        }
-      }
-    },
-    "mesh.log.display.config %@" : {
+    "Display config received: %@" : {
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -17797,12 +17632,6 @@
             "value" : "Display Konfiguration empfangen: %@"
           }
         },
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Display config received: %@"
-          }
-        },
         "fr" : {
           "stringUnit" : {
             "state" : "translated",
@@ -17853,64 +17682,6 @@
         }
       }
     },
-    "mesh.log.externalnotification.config %@" : {
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "External Notification module config received: %@"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Configuration du module notification extérieure reçue : %@"
-          }
-        },
-        "he" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "הגדרות מודולת נוטיפיקציה חיצונית התקבלו: %@"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Configurazione del modulo di notifica esterno ricevuta: %@"
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Otrzymano konfigurację modułu zewnętrznych powiadomień: %@"
-          }
-        },
-        "se" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Konfiguration för modulen för externa notifikationer mottagen: %@"
-          }
-        },
-        "sr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Конфигурација модула за екстерне нотификације примљена: %@"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "External Notification module config received: %@"
-          }
-        },
-        "zh-Hant-TW" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "External Notification module config received: %@"
-          }
-        }
-      }
-    },
     "mesh.log.lora.config %@" : {
       "localizations" : {
         "de" : {
@@ -18835,122 +18606,6 @@
         }
       }
     },
-    "mesh.log.storeforward.config %@" : {
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Store & Forward module config received: %@"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Configuration du module Stocker et Transmettre reçue : %@"
-          }
-        },
-        "he" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "הגדרות מודולת שמירה ושליחה התקבלו: %@"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Configurazione del modulo Store & Forward ricevuta: %@"
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Store & Forward module config received: %@"
-          }
-        },
-        "se" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Konfiguration för Store & Forward-modulen mottagen: %@"
-          }
-        },
-        "sr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Конфигурација модула за чување и прослеђивање примљена: %@"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Store & Forward module config received: %@"
-          }
-        },
-        "zh-Hant-TW" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Store & Forward module config received: %@"
-          }
-        }
-      }
-    },
-    "Telemetry module config received: %@" : {
-      "localizations" : {
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Telemetrie Modul Konfiguration empfangen: %@"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Configuration du module télémetrie reçue : %@"
-          }
-        },
-        "he" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "הגדרות מודולת טלמטריה התקבלו: %@"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Configurazione del modulo di telemetria ricevuta: %@"
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Odebrano konfigurację modułu telemetrii: %@"
-          }
-        },
-        "se" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Telemetrimodulkonfiguration mottagen: %@"
-          }
-        },
-        "sr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Конфигурација модула телеметрије примљена: %@"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Telemetry module config received: %@"
-          }
-        },
-        "zh-Hant-TW" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Telemetry module config received: %@"
-          }
-        }
-      }
-    },
     "mesh.log.telemetry.received %@" : {
       "localizations" : {
         "de" : {
@@ -19393,70 +19048,6 @@
         }
       }
     },
-    "mesh.log.waypoint.received %@" : {
-      "localizations" : {
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Wegpunkt von Knoten empfangen: %@"
-          }
-        },
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Waypoint Packet received from node: %@"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Paquet Waypoint reçu du noeud : %@"
-          }
-        },
-        "he" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "נקודת ציון התקבלה מ-%@"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Pacchetto Waypoint ricevuto dal nodo: %@"
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Odebrano pakiet punktu orientacyjnego od węzła: %@"
-          }
-        },
-        "se" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Vägpunktspaket mottaget från nod: %@"
-          }
-        },
-        "sr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Пакет са тачкама пута примљен од чвора: %@"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Waypoint Packet received from node: %@"
-          }
-        },
-        "zh-Hant-TW" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Waypoint Packet received from node: %@"
-          }
-        }
-      }
-    },
     "mesh.log.waypoint.sent %@" : {
       "localizations" : {
         "de" : {
@@ -21626,64 +21217,6 @@
         }
       }
     },
-    "up to %@ away" : {
-      "localizations" : {
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "bis zu %@ entfernt"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "up to %@ away"
-          }
-        },
-        "he" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "up to %@ away"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "fino a %@ di distanza"
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "up to %@ away"
-          }
-        },
-        "se" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "upp till %@ bort"
-          }
-        },
-        "sr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "удаљено до максималних %@"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "最远距离 %@"
-          }
-        },
-        "zh-Hant-TW" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "距離%@以內"
-          }
-        }
-      }
-    },
     "nodes" : {
       "localizations" : {
         "de" : {
@@ -22742,6 +22275,28 @@
         }
       }
     },
+    "Optimized for 2 color displays" : {
+      "localizations" : {
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ottimizzato per i display a 2 colori"
+          }
+        },
+        "sr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Оптимизовано за двобојне дисплеје"
+          }
+        },
+        "zh-Hant-TW" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "為雙色螢幕最佳化"
+          }
+        }
+      }
+    },
     "Optimized for ATAK system communication, reduces routine broadcasts." : {
       "localizations" : {
         "de" : {
@@ -22800,34 +22355,6 @@
         }
       }
     },
-    "optimized.for.2.color.displays" : {
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Optimized for 2 color displays"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Ottimizzato per i display a 2 colori"
-          }
-        },
-        "sr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Оптимизовано за двобојне дисплеје"
-          }
-        },
-        "zh-Hant-TW" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "為雙色螢幕最佳化"
-          }
-        }
-      }
-    },
     "Optional fields to include when assembling position messages. the more fields are included, the larger the message will be - leading to longer airtime and a higher risk of packet loss" : {
       "localizations" : {
         "it" : {
@@ -23582,40 +23109,6 @@
         }
       }
     },
-    "paxcounter.delete" : {
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Delete all pax data?"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Cancellare tutti i dati dei passeggeri?"
-          }
-        },
-        "se" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Radera all paxdata?"
-          }
-        },
-        "sr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Избриши све PAX податке?"
-          }
-        },
-        "zh-Hant-TW" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "要刪除所有 PAX 資料嗎？"
-          }
-        }
-      }
-    },
     "paxcounter.log" : {
       "localizations" : {
         "en" : {
@@ -25354,7 +24847,7 @@
         }
       }
     },
-    "range.test" : {
+    "Range Test" : {
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -25362,12 +24855,6 @@
             "value" : "Entfernungstest"
           }
         },
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Range Test"
-          }
-        },
         "fr" : {
           "stringUnit" : {
             "state" : "translated",
@@ -28629,6 +28116,64 @@
         }
       }
     },
+    "Serial Config" : {
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Serial Konfiguration"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Configuration série"
+          }
+        },
+        "he" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "'הגדרות מודולה 'סיריאלי"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Configurazione seriale"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Konfiguracja seryjna"
+          }
+        },
+        "se" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Seriekonfiguration"
+          }
+        },
+        "sr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Подешавања серијске везе"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "串口配置"
+          }
+        },
+        "zh-Hant-TW" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "序列設定"
+          }
+        }
+      }
+    },
     "Serial Console" : {
       "localizations" : {
         "de" : {
@@ -28685,70 +28230,6 @@
         }
       }
     },
-    "serial.config" : {
-      "localizations" : {
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Serial Konfiguration"
-          }
-        },
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Serial Config"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Configuration série"
-          }
-        },
-        "he" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "'הגדרות מודולה 'סיריאלי"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Configurazione seriale"
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Konfiguracja seryjna"
-          }
-        },
-        "se" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Seriekonfiguration"
-          }
-        },
-        "sr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Подешавања серијске везе"
-          }
-        },
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "串口配置"
-          }
-        },
-        "zh-Hant-TW" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "序列設定"
-          }
-        }
-      }
-    },
     "Series" : {
       "localizations" : {
         "it" : {
@@ -30283,7 +29764,7 @@
         }
       }
     },
-    "start" : {
+    "Start" : {
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -30291,12 +29772,6 @@
             "value" : "Start"
           }
         },
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Start"
-          }
-        },
         "fr" : {
           "stringUnit" : {
             "state" : "translated",
@@ -30425,6 +29900,58 @@
         }
       }
     },
+    "Store & Forward module config received: %@" : {
+      "localizations" : {
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Configuration du module Stocker et Transmettre reçue : %@"
+          }
+        },
+        "he" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "הגדרות מודולת שמירה ושליחה התקבלו: %@"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Configurazione del modulo Store & Forward ricevuta: %@"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Store & Forward module config received: %@"
+          }
+        },
+        "se" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Konfiguration för Store & Forward-modulen mottagen: %@"
+          }
+        },
+        "sr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Конфигурација модула за чување и прослеђивање примљена: %@"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Store & Forward module config received: %@"
+          }
+        },
+        "zh-Hant-TW" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Store & Forward module config received: %@"
+          }
+        }
+      }
+    },
     "Store and forward servers require an ESP32 device with PSRAM or Linux Native." : {
       "localizations" : {
         "en" : {
@@ -30913,6 +30440,64 @@
         }
       }
     },
+    "Telemetry module config received: %@" : {
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Telemetrie Modul Konfiguration empfangen: %@"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Configuration du module télémetrie reçue : %@"
+          }
+        },
+        "he" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "הגדרות מודולת טלמטריה התקבלו: %@"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Configurazione del modulo di telemetria ricevuta: %@"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Odebrano konfigurację modułu telemetrii: %@"
+          }
+        },
+        "se" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Telemetrimodulkonfiguration mottagen: %@"
+          }
+        },
+        "sr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Конфигурација модула телеметрије примљена: %@"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Telemetry module config received: %@"
+          }
+        },
+        "zh-Hant-TW" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Telemetry module config received: %@"
+          }
+        }
+      }
+    },
     "Temp" : {
       "localizations" : {
         "de" : {
@@ -31177,14 +30762,8 @@
         }
       }
     },
-    "tft.full.color.displays" : {
+    "TFT Full Color Displays" : {
       "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "TFT Full Color Displays"
-          }
-        },
         "it" : {
           "stringUnit" : {
             "state" : "translated",
@@ -33847,6 +33426,64 @@
         }
       }
     },
+    "Unsupported Firmware Version Detected, unable to connect to device." : {
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Nicht unterstützte Firmware Version erkannt. Kann nicht verbinden."
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Version non supportée du firmware détectée, impossible de se connecter à l'appareil."
+          }
+        },
+        "he" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "גרסת קושחה אינה נתמכת, לא ניתן להתחבר למכשיר."
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Rilevata versione firmware non supportata, impossibile connettersi al dispositivo."
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Wykryto nieobsługiwany wersję oprogramowania, brak możliwości połączenia z urządzeniem."
+          }
+        },
+        "se" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Okänd Firmwareversion upptäckt, kan inte ansluta till enheten."
+          }
+        },
+        "sr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Откривена је неподржана верзија фирмвера, није могуће повезати са уређајем."
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "检测到不支持的固件版本，无法连接到设备。"
+          }
+        },
+        "zh-Hant-TW" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "檢測到不支援的韌體版本，無法連接到節點。"
+          }
+        }
+      }
+    },
     "Up" : {
       "localizations" : {
         "de" : {
@@ -33933,6 +33570,64 @@
         }
       }
     },
+    "up to %@ away" : {
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "bis zu %@ entfernt"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "up to %@ away"
+          }
+        },
+        "he" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "up to %@ away"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "fino a %@ di distanza"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "up to %@ away"
+          }
+        },
+        "se" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "upp till %@ bort"
+          }
+        },
+        "sr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "удаљено до максималних %@"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "最远距离 %@"
+          }
+        },
+        "zh-Hant-TW" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "距離%@以內"
+          }
+        }
+      }
+    },
     "Update Interval" : {
       "localizations" : {
         "it" : {
@@ -34615,7 +34310,7 @@
         }
       }
     },
-    "Version: %@ (%@) " : {
+    "Version: %1$@ (%2$@)" : {
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -34623,12 +34318,6 @@
             "value" : "Version: %1$@ (%2$@) "
           }
         },
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Version: %1$@ (%2$@) "
-          }
-        },
         "it" : {
           "stringUnit" : {
             "state" : "translated",
@@ -35045,6 +34734,64 @@
         }
       }
     },
+    "Waypoint Packet received from node: %@" : {
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Wegpunkt von Knoten empfangen: %@"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Paquet Waypoint reçu du noeud : %@"
+          }
+        },
+        "he" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "נקודת ציון התקבלה מ-%@"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Pacchetto Waypoint ricevuto dal nodo: %@"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Odebrano pakiet punktu orientacyjnego od węzła: %@"
+          }
+        },
+        "se" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Vägpunktspaket mottaget från nod: %@"
+          }
+        },
+        "sr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Пакет са тачкама пута примљен од чвора: %@"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Waypoint Packet received from node: %@"
+          }
+        },
+        "zh-Hant-TW" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Waypoint Packet received from node: %@"
+          }
+        }
+      }
+    },
     "Weather Conditions" : {
       "localizations" : {
         "de" : {
diff --git a/Meshtastic/Enums/DisplayEnums.swift b/Meshtastic/Enums/DisplayEnums.swift
index 089140f0..664d72a5 100644
--- a/Meshtastic/Enums/DisplayEnums.swift
+++ b/Meshtastic/Enums/DisplayEnums.swift
@@ -149,13 +149,13 @@ enum DisplayModes: Int, CaseIterable, Identifiable {
 	var description: String {
 		switch self {
 		case .defaultMode:
-			return "default.128x64.screen.layout".localized
+			return "Default 128x64 screen layout".localized
 		case .twoColor:
-			return "optimized.for.2.color.displays".localized
+			return "Optimized for 2 color displays".localized
 		case .inverted:
-			return "inverted.top.bar.for.2.color.display".localized
+			return "Inverted top bar for 2 Color display".localized
 		case .color:
-			return "tft.full.color.displays".localized
+			return "TFT Full Color Displays".localized
 		}
 	}
 	func protoEnumValue() -> Config.DisplayConfig.DisplayMode {
diff --git a/Meshtastic/Helpers/BLEManager.swift b/Meshtastic/Helpers/BLEManager.swift
index 5f54afd1..6c34d65c 100644
--- a/Meshtastic/Helpers/BLEManager.swift
+++ b/Meshtastic/Helpers/BLEManager.swift
@@ -498,7 +498,7 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate
 		guard connectedPeripheral?.peripheral.state ?? CBPeripheralState.disconnected == CBPeripheralState.connected else { return }
 
 		if FROMRADIO_characteristic == nil {
-			Logger.mesh.error("🚨 \("firmware.version.unsupported".localized, privacy: .public)")
+			Logger.mesh.error("🚨 \("Unsupported Firmware Version Detected, unable to connect to device.".localized, privacy: .public)")
 			invalidVersion = true
 			return
 		} else {
diff --git a/Meshtastic/Helpers/MeshPackets.swift b/Meshtastic/Helpers/MeshPackets.swift
index bcc4659b..c208c525 100644
--- a/Meshtastic/Helpers/MeshPackets.swift
+++ b/Meshtastic/Helpers/MeshPackets.swift
@@ -209,7 +209,7 @@ func channelPacket (channel: Channel, fromNum: Int64, context: NSManagedObjectCo
 func deviceMetadataPacket (metadata: DeviceMetadata, fromNum: Int64, sessionPasskey: Data? = Data(), context: NSManagedObjectContext) {
 
 	if metadata.isInitialized {
-		let logString = String.localizedStringWithFormat("mesh.log.device.metadata.received %@".localized, fromNum.toHex())
+		let logString = String.localizedStringWithFormat("Device Metadata received from: %@".localized, fromNum.toHex())
 		Logger.mesh.info("🏷️ \(logString, privacy: .public)")
 
 		let fetchedNodeRequest = NodeInfoEntity.fetchRequest()
@@ -472,7 +472,7 @@ func adminAppPacket (packet: MeshPacket, context: NSManagedObjectContext) {
 
 				if !cmmc.messages.isEmpty {
 
-					let logString = String.localizedStringWithFormat("mesh.log.cannedmessages.messages.received %@".localized, packet.from.toHex())
+					let logString = String.localizedStringWithFormat("Canned Messages Messages Received For: %@".localized, packet.from.toHex())
 					Logger.mesh.info("🥫 \(logString, privacy: .public)")
 
 					let fetchNodeRequest = NodeInfoEntity.fetchRequest()
@@ -1037,7 +1037,7 @@ func textMessageAppPacket(
 
 func waypointPacket (packet: MeshPacket, context: NSManagedObjectContext) {
 
-	let logString = String.localizedStringWithFormat("mesh.log.waypoint.received %@".localized, String(packet.from))
+	let logString = String.localizedStringWithFormat("Waypoint Packet received from node: %@".localized, String(packet.from))
 	Logger.mesh.info("📍 \(logString, privacy: .public)")
 
 	let fetchWaypointRequest = WaypointEntity.fetchRequest()
diff --git a/Meshtastic/Persistence/UpdateCoreData.swift b/Meshtastic/Persistence/UpdateCoreData.swift
index 431bf95d..7823272b 100644
--- a/Meshtastic/Persistence/UpdateCoreData.swift
+++ b/Meshtastic/Persistence/UpdateCoreData.swift
@@ -505,7 +505,7 @@ func upsertDeviceConfigPacket(config: Config.DeviceConfig, nodeNum: Int64, sessi
 
 func upsertDisplayConfigPacket(config: Config.DisplayConfig, nodeNum: Int64, sessionPasskey: Data? = Data(), context: NSManagedObjectContext) {
 
-	let logString = String.localizedStringWithFormat("mesh.log.display.config %@".localized, nodeNum.toHex())
+	let logString = String.localizedStringWithFormat("Display config received: %@".localized, nodeNum.toHex())
 	Logger.data.info("🖥️ \(logString, privacy: .public)")
 
 	let fetchNodeInfoRequest = NodeInfoEntity.fetchRequest()
@@ -916,7 +916,7 @@ func upsertAmbientLightingModuleConfigPacket(config: ModuleConfig.AmbientLightin
 
 func upsertCannedMessagesModuleConfigPacket(config: ModuleConfig.CannedMessageConfig, nodeNum: Int64, sessionPasskey: Data? = Data(), context: NSManagedObjectContext) {
 
-	let logString = String.localizedStringWithFormat("mesh.log.cannedmessage.config %@".localized, String(nodeNum))
+	let logString = String.localizedStringWithFormat("Canned Message module config received: %@".localized, String(nodeNum))
 	Logger.data.info("🥫 \(logString, privacy: .public)")
 
 	let fetchNodeInfoRequest = NodeInfoEntity.fetchRequest()
@@ -975,7 +975,7 @@ func upsertCannedMessagesModuleConfigPacket(config: ModuleConfig.CannedMessageCo
 
 func upsertDetectionSensorModuleConfigPacket(config: ModuleConfig.DetectionSensorConfig, nodeNum: Int64, sessionPasskey: Data? = Data(), context: NSManagedObjectContext) {
 
-	let logString = String.localizedStringWithFormat("mesh.log.detectionsensor.config %@".localized, String(nodeNum))
+	let logString = String.localizedStringWithFormat("Detection Sensor module config received: %@".localized, String(nodeNum))
 	Logger.data.info("🕵️ \(logString, privacy: .public)")
 
 	let fetchNodeInfoRequest = NodeInfoEntity.fetchRequest()
@@ -1032,7 +1032,7 @@ func upsertDetectionSensorModuleConfigPacket(config: ModuleConfig.DetectionSenso
 
 func upsertExternalNotificationModuleConfigPacket(config: ModuleConfig.ExternalNotificationConfig, nodeNum: Int64, sessionPasskey: Data? = Data(), context: NSManagedObjectContext) {
 
-	let logString = String.localizedStringWithFormat("mesh.log.externalnotification.config %@".localized, String(nodeNum))
+	let logString = String.localizedStringWithFormat("External Notification module config received: %@".localized, String(nodeNum))
 	Logger.data.info("📣 \(logString, privacy: .public)")
 
 	let fetchNodeInfoRequest = NodeInfoEntity.fetchRequest()
@@ -1344,7 +1344,7 @@ func upsertSerialModuleConfigPacket(config: ModuleConfig.SerialConfig, nodeNum:
 
 func upsertStoreForwardModuleConfigPacket(config: ModuleConfig.StoreForwardConfig, nodeNum: Int64, sessionPasskey: Data? = Data(), context: NSManagedObjectContext) {
 
-	let logString = String.localizedStringWithFormat("mesh.log.storeforward.config %@".localized, String(nodeNum))
+	let logString = String.localizedStringWithFormat("Store & Forward module config received: %@".localized, String(nodeNum))
 	Logger.data.info("📬 \(logString, privacy: .public)")
 
 	let fetchNodeInfoRequest = NodeInfoEntity.fetchRequest()
diff --git a/Meshtastic/Views/Messages/Messages.swift b/Meshtastic/Views/Messages/Messages.swift
index 7580079b..cb6947c0 100644
--- a/Meshtastic/Views/Messages/Messages.swift
+++ b/Meshtastic/Views/Messages/Messages.swift
@@ -50,7 +50,7 @@ struct Messages: View {
 				}
 				NavigationLink(value: MessagesNavigationState.directMessages()) {
 					Label {
-						Text("direct.messages")
+						Text("Direct Messages")
 							.badge(unreadDirectMessages)
 							.font(.title2)
 							.padding()
diff --git a/Meshtastic/Views/Nodes/DetectionSensorLog.swift b/Meshtastic/Views/Nodes/DetectionSensorLog.swift
index af07b9e7..e4c22e0d 100644
--- a/Meshtastic/Views/Nodes/DetectionSensorLog.swift
+++ b/Meshtastic/Views/Nodes/DetectionSensorLog.swift
@@ -118,7 +118,7 @@ struct DetectionSensorLog: View {
 			.padding(.bottom)
 			.padding(.trailing)
 		}
-		.navigationTitle("detection.sensor.log")
+		.navigationTitle("Detection Sensor Log")
 		.navigationBarTitleDisplayMode(.inline)
 		.navigationBarItems(trailing:
 			ZStack {
@@ -128,7 +128,7 @@ struct DetectionSensorLog: View {
 			isPresented: $isExporting,
 			document: CsvDocument(emptyCsv: exportString),
 			contentType: .commaSeparatedText,
-			defaultFilename: String("\(node.user?.longName ?? "Node") \("detection.sensor.log".localized)"),
+			defaultFilename: String("\(node.user?.longName ?? "Node") \("Detection Sensor Log".localized)"),
 			onCompletion: { result in
 				switch result {
 				case .success:
diff --git a/Meshtastic/Views/Nodes/DeviceMetricsLog.swift b/Meshtastic/Views/Nodes/DeviceMetricsLog.swift
index 6335bcb3..e7b4c952 100644
--- a/Meshtastic/Views/Nodes/DeviceMetricsLog.swift
+++ b/Meshtastic/Views/Nodes/DeviceMetricsLog.swift
@@ -240,7 +240,7 @@ struct DeviceMetricsLog: View {
 				ContentUnavailableView("No Device Metrics", systemImage: "slash.circle")
 			}
 		}
-		.navigationTitle("device.metrics.log")
+		.navigationTitle("Device Metrics Log")
 		.navigationBarTitleDisplayMode(.inline)
 		.navigationBarItems(trailing:
 			ZStack {
@@ -250,7 +250,7 @@ struct DeviceMetricsLog: View {
 			isPresented: $isExporting,
 			document: CsvDocument(emptyCsv: exportString),
 			contentType: .commaSeparatedText,
-			defaultFilename: String("\(node.user?.longName ?? "Node") \("device.metrics.log".localized)"),
+			defaultFilename: String("\(node.user?.longName ?? "Node") \("Device Metrics Log".localized)"),
 			onCompletion: { result in
 				switch result {
 				case .success:
diff --git a/Meshtastic/Views/Nodes/PaxCounterLog.swift b/Meshtastic/Views/Nodes/PaxCounterLog.swift
index ed5a87c8..a5ca0194 100644
--- a/Meshtastic/Views/Nodes/PaxCounterLog.swift
+++ b/Meshtastic/Views/Nodes/PaxCounterLog.swift
@@ -174,7 +174,7 @@ struct PaxCounterLog: View {
 						isPresented: $isPresentingClearLogConfirm,
 						titleVisibility: .visible
 					) {
-						Button("paxcounter.delete", role: .destructive) {
+						Button("Delete all pax data?", role: .destructive) {
 							if clearPax(destNum: node.num, context: context) {
 								Logger.services.info("Cleared Pax Counter for \(node.num, privacy: .public)")
 							} else {
diff --git a/Meshtastic/Views/Settings/About.swift b/Meshtastic/Views/Settings/About.swift
index f6854bcb..e65a4c64 100644
--- a/Meshtastic/Views/Settings/About.swift
+++ b/Meshtastic/Views/Settings/About.swift
@@ -48,7 +48,7 @@ struct AboutMeshtastic: View {
 					}
 					.font(.title2)
 
-					Text("Version: \(Bundle.main.appVersionLong) (\(Bundle.main.appBuild)) ")
+					Text("Version: \(Bundle.main.appVersionLong) (\(Bundle.main.appBuild))")
 				}
 
 				Section(header: Text("Project information")) {
diff --git a/Meshtastic/Views/Settings/Config/DeviceConfig.swift b/Meshtastic/Views/Settings/Config/DeviceConfig.swift
index 89f50cc9..6539848a 100644
--- a/Meshtastic/Views/Settings/Config/DeviceConfig.swift
+++ b/Meshtastic/Views/Settings/Config/DeviceConfig.swift
@@ -247,7 +247,7 @@ struct DeviceConfig: View {
 			}
 			Spacer()
 		}
-		.navigationTitle("device.config")
+		.navigationTitle("Device Config")
 		.navigationBarItems(
 			trailing: ZStack {
 				ConnectedDevice(
diff --git a/Meshtastic/Views/Settings/Config/Module/DetectionSensorConfig.swift b/Meshtastic/Views/Settings/Config/Module/DetectionSensorConfig.swift
index ebe21b81..e042ca77 100644
--- a/Meshtastic/Views/Settings/Config/Module/DetectionSensorConfig.swift
+++ b/Meshtastic/Views/Settings/Config/Module/DetectionSensorConfig.swift
@@ -181,7 +181,7 @@ struct DetectionSensorConfig: View {
 				}
 			}
 		}
-		.navigationTitle("detection.sensor.config")
+		.navigationTitle("Detection Sensor Config")
 		.navigationBarItems(
 			trailing: ZStack {
 				ConnectedDevice(
diff --git a/Meshtastic/Views/Settings/Config/Module/SerialConfig.swift b/Meshtastic/Views/Settings/Config/Module/SerialConfig.swift
index 47dca015..0bbe9fbc 100644
--- a/Meshtastic/Views/Settings/Config/Module/SerialConfig.swift
+++ b/Meshtastic/Views/Settings/Config/Module/SerialConfig.swift
@@ -126,7 +126,7 @@ struct SerialConfig: View {
 					}
 				}
 			}
-			.navigationTitle("serial.config")
+			.navigationTitle("Serial Config")
 			.navigationBarItems(
 				trailing: ZStack {
 					ConnectedDevice(
diff --git a/Meshtastic/Views/Settings/RouteRecorder.swift b/Meshtastic/Views/Settings/RouteRecorder.swift
index 56c35163..3c7bd81a 100644
--- a/Meshtastic/Views/Settings/RouteRecorder.swift
+++ b/Meshtastic/Views/Settings/RouteRecorder.swift
@@ -191,7 +191,7 @@ struct RouteRecorder: View {
 											Logger.data.error("Error Saving RouteEntity from the Route Recorder \(nsError, privacy: .public)")
 										}
 									} label: {
-										Label("start", systemImage: "play")
+										Label("Start", systemImage: "play")
 									}
 									.buttonStyle(.bordered)
 									.buttonBorderShape(.capsule)
diff --git a/Meshtastic/Views/Settings/Settings.swift b/Meshtastic/Views/Settings/Settings.swift
index fc40aa52..d84d24cd 100644
--- a/Meshtastic/Views/Settings/Settings.swift
+++ b/Meshtastic/Views/Settings/Settings.swift
@@ -189,7 +189,7 @@ struct Settings: View {
 			if isModuleSupported(.detectionsensorConfig) {
 				NavigationLink(value: SettingsNavigationState.detectionSensor) {
 					Label {
-						Text("detection.sensor")
+						Text("Detection Sensor")
 					} icon: {
 						Image(systemName: "sensor")
 					}
@@ -199,7 +199,7 @@ struct Settings: View {
 			if isModuleSupported(.extnotifConfig) {
 				NavigationLink(value: SettingsNavigationState.externalNotification) {
 					Label {
-						Text("external.notification")
+						Text("External Notification")
 					} icon: {
 						Image(systemName: "megaphone")
 					}
@@ -219,7 +219,7 @@ struct Settings: View {
 			if isModuleSupported(.rangetestConfig) {
 				NavigationLink(value: SettingsNavigationState.rangeTest) {
 					Label {
-						Text("range.test")
+						Text("Range Test")
 					} icon: {
 						Image(systemName: "point.3.connected.trianglepath.dotted")
 					}