Wrap title Column in Expanded to prevent horizontal overflow in AppBarTitle

Co-authored-by: wel97459 <12990640+wel97459@users.noreply.github.com>

.gitignore

@@ -65,6 +65,7 @@ secrets.dart
 **/ios/Flutter/Flutter.podspec
 
 # Android
+.gradle/
 **/android/.gradle/
 **/android/captures/
 **/android/local.properties

android/app/build.gradle.kts

@@ -83,5 +83,5 @@ flutter {
 }
 
 dependencies {
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
 }

flake.lock

@@ -0,0 +1,61 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1770562336,
+        "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "d6c71932130818840fc8fe9509cf50be8c64634f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,86 @@
+{
+  description = "MeshCore Flutter Application";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+      in
+      {
+        devShells.default = pkgs.mkShell {
+          buildInputs = with pkgs; [
+            # Flutter and Dart
+            flutter
+            dart
+
+            # Java (required for Android development)
+            jdk17
+
+            # Android development tools
+            android-tools
+            gradle
+
+            # For the shell hook to set up the environment for Flutter development
+            gtk3
+            glib
+            sysprof
+            libclang
+            cmake
+            ninja
+            pkg-config
+            libdatrie
+
+            # Additional tools for installing Android SDK if not present
+            curl
+            unzip
+          ];
+
+          shellHook = ''
+            echo "MeshCore Flutter Development Environment"
+            export PKG_CONFIG_PATH="${pkgs.gtk3}/lib/pkgconfig:${pkgs.glib}/lib/pkgconfig:${pkgs.sysprof}/lib/pkgconfig:$PKG_CONFIG_PATH"
+            export LD_LIBRARY_PATH="${pkgs.lib.makeLibraryPath [pkgs.gtk3 pkgs.glib pkgs.sysprof pkgs.libdatrie]}:$LD_LIBRARY_PATH"
+            export CMAKE_INSTALL_PREFIX="$PWD/build/bundle"
+            
+            # Setup Android SDK in home directory (standard location)
+            export ANDROID_HOME="$HOME/Android/Sdk"
+            export ANDROID_SDK_ROOT="$ANDROID_HOME"
+            export PATH="$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/tools/bin:$PATH"
+            
+            echo "Android SDK: $ANDROID_HOME"
+            echo ""
+            
+            # Check if Android SDK exists and offer to download if not
+            if [ ! -d "$ANDROID_HOME" ]; then
+              echo "WARNING: Android SDK not found at $ANDROID_HOME"
+              echo ""
+              echo "To download and set up the Android SDK, run this command:"
+              echo ""
+              cat << 'EOF'
+mkdir -p ~/Android/Sdk && cd ~/Android/Sdk && \
+curl -o cmdline-tools.zip ${if pkgs.stdenv.isDarwin then "https://dl.google.com/android/repository/commandlinetools-mac-10406996_latest.zip" else "https://dl.google.com/android/repository/commandlinetools-linux-10406996_latest.zip"} && \
+unzip -q cmdline-tools.zip && \
+mkdir -p cmdline-tools/latest && \
+mv cmdline-tools/* cmdline-tools/latest/ 2>/dev/null || echo "Warning: failed to move Android cmdline-tools into 'latest' directory; please check your SDK layout." >&2 && \
+rm cmdline-tools.zip && \
+cd cmdline-tools/latest/bin && \
+yes | ./sdkmanager --sdk_root=~/Android/Sdk 'platform-tools' && \
+echo "Android SDK setup complete!"
+EOF
+              echo ""
+              echo "Then run 'flutter doctor' again to verify."
+              echo ""
+            else
+              echo "Android SDK found at $ANDROID_HOME"
+            fi
+            
+            echo "To check that everything is set up correctly, run 'flutter doctor' and ensure there are no issues."
+          '';
+        };
+      }
+    );
+}

lib/connector/meshcore_connector.dart

@@ -5,7 +5,6 @@ import 'package:crypto/crypto.dart' as crypto;
 import 'package:pointycastle/export.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
-import 'package:wakelock_plus/wakelock_plus.dart';
 
 import '../models/channel.dart';
 import '../models/channel_message.dart';
@@ -38,6 +37,42 @@ class MeshCoreUuids {
   static const String txCharacteristic = "6e400003-b5a3-f393-e0a9-e50e24dcca9e";
 }
 
+class DirectRepeater {
+  static const int maxAgeMinutes = 30; // Max age for direct repeater info
+  final int pubkeyFirstByte;
+  double snr;
+  DateTime lastUpdated;
+
+  DirectRepeater({
+    required this.pubkeyFirstByte,
+    required this.snr,
+    DateTime? lastUpdated,
+  }) : lastUpdated = lastUpdated ?? DateTime.now();
+
+  void update(double newSNR) {
+    snr = newSNR;
+    lastUpdated = DateTime.now();
+  }
+
+  int get ranking {
+    if (isStale()) {
+      return -1; // Stale repeaters get lowest rank
+    }
+    // Higher SNR gets higher rank and recency within maxAgeMinutes breaks ties.
+    final ageMs =
+        DateTime.now().millisecondsSinceEpoch -
+        lastUpdated.millisecondsSinceEpoch;
+    final maxAgeMs = maxAgeMinutes * 60 * 1000;
+    final recencyScore = (maxAgeMs - ageMs).clamp(0, maxAgeMs);
+    return ((snr - 31.75) * 1000).round() + recencyScore;
+  }
+
+  bool isStale() {
+    return DateTime.now().difference(lastUpdated) >
+        const Duration(minutes: maxAgeMinutes);
+  }
+}
+
 enum MeshCoreConnectionState {
   disconnected,
   scanning,
@@ -94,6 +129,7 @@ class MeshCoreConnector extends ChangeNotifier {
   int? _batteryMillivolts;
   double? _selfLatitude;
   double? _selfLongitude;
+  final List<DirectRepeater> _directRepeaters = List.empty(growable: true);
   bool _isLoadingContacts = false;
   bool _isLoadingChannels = false;
   bool _hasLoadedChannels = false;
@@ -195,6 +231,7 @@ class MeshCoreConnector extends ChangeNotifier {
   String? get selfName => _selfName;
   double? get selfLatitude => _selfLatitude;
   double? get selfLongitude => _selfLongitude;
+  List<DirectRepeater> get directRepeaters => _directRepeaters;
   int? get currentTxPower => _currentTxPower;
   int? get maxTxPower => _maxTxPower;
   int? get currentFreqHz => _currentFreqHz;
@@ -658,7 +695,8 @@ class MeshCoreConnector extends ChangeNotifier {
       _scanResults.clear();
       for (var result in results) {
         if (result.device.platformName.startsWith("MeshCore-") ||
-            result.advertisementData.advName.startsWith("MeshCore-")) {
+            result.advertisementData.advName.startsWith("MeshCore-") ||
+            result.advertisementData.advName.startsWith("Whisper-")) {
           _scanResults.add(result);
         }
       }
@@ -775,9 +813,6 @@ class MeshCoreConnector extends ChangeNotifier {
 
       _setState(MeshCoreConnectionState.connected);
 
-      // Enable wake lock to prevent BLE disconnection when screen turns off
-      await WakelockPlus.enable();
-
       await _requestDeviceInfo();
       _startBatteryPolling();
       final gotSelfInfo = await _waitForSelfInfo(
@@ -886,9 +921,6 @@ class MeshCoreConnector extends ChangeNotifier {
     _setState(MeshCoreConnectionState.disconnecting);
     _stopBatteryPolling();
 
-    // Disable wake lock when disconnecting
-    await WakelockPlus.disable();
-
     await _notifySubscription?.cancel();
     _notifySubscription = null;
 
@@ -1696,6 +1728,11 @@ class MeshCoreConnector extends ChangeNotifier {
         _isLoadingContacts = true;
         notifyListeners();
         break;
+      case pushCodeNewAdvert:
+        debugPrint('Got New CONTACT');
+        // It's the same format as respCodeContact, so we can reuse the handler
+        _handleContact(frame);
+        break;
       case respCodeContact:
         debugPrint('Got CONTACT');
         _handleContact(frame);
@@ -1740,6 +1777,7 @@ class MeshCoreConnector extends ChangeNotifier {
       case pushCodeStatusResponse:
         break;
       case pushCodeLogRxData:
+        _handleRxData(frame);
         _handleLogRxData(frame);
         break;
       case respCodeChannelInfo:
@@ -1753,6 +1791,7 @@ class MeshCoreConnector extends ChangeNotifier {
         break;
       case respCodeCustomVars:
         _handleCustomVars(frame);
+        break;
       default:
         debugPrint('Unknown frame code: $code');
     }
@@ -2008,6 +2047,80 @@ class MeshCoreConnector extends ChangeNotifier {
     }
   }
 
+  void _handleContactAdvert(Contact contact) {
+    if (listEquals(contact.publicKey, _selfPublicKey)) {
+      return;
+    }
+
+    if (contact.type == advTypeRepeater) {
+      _contactUnreadCount.remove(contact.publicKeyHex);
+      _unreadStore.saveContactUnreadCount(
+        Map<String, int>.from(_contactUnreadCount),
+      );
+    }
+    // Check if this is a new contact
+    final isNewContact = !_knownContactKeys.contains(contact.publicKeyHex);
+    final existingIndex = _contacts.indexWhere(
+      (c) => c.publicKeyHex == contact.publicKeyHex,
+    );
+
+    if (existingIndex >= 0) {
+      final existing = _contacts[existingIndex];
+      final mergedLastMessageAt =
+          existing.lastMessageAt.isAfter(contact.lastMessageAt)
+          ? existing.lastMessageAt
+          : contact.lastMessageAt;
+
+      appLogger.info(
+        'Refreshing contact ${contact.name}: devicePath=${contact.pathLength}, existingOverride=${existing.pathOverride}',
+        tag: 'Connector',
+      );
+
+      // CRITICAL: Preserve user's path override when contact is refreshed from device
+      _contacts[existingIndex] = contact.copyWith(
+        lastMessageAt: mergedLastMessageAt,
+        pathOverride: existing.pathOverride, // Preserve user's path choice
+        pathOverrideBytes: existing.pathOverrideBytes,
+      );
+
+      appLogger.info(
+        'After merge: pathOverride=${_contacts[existingIndex].pathOverride}, devicePath=${_contacts[existingIndex].pathLength}',
+        tag: 'Connector',
+      );
+    } else {
+      _contacts.add(contact);
+      appLogger.info(
+        'Added new contact ${contact.name}: pathLen=${contact.pathLength}',
+        tag: 'Connector',
+      );
+    }
+    _knownContactKeys.add(contact.publicKeyHex);
+    _loadMessagesForContact(contact.publicKeyHex);
+
+    // Add path to history if we have a valid path
+    if (_pathHistoryService != null && contact.pathLength >= 0) {
+      _pathHistoryService!.handlePathUpdated(contact);
+    }
+
+    notifyListeners();
+
+    // Show notification for new contact (advertisement)
+    if (isNewContact && _appSettingsService != null) {
+      final settings = _appSettingsService!.settings;
+      if (settings.notificationsEnabled && settings.notifyOnNewAdvert) {
+        _notificationService.showAdvertNotification(
+          contactName: contact.name,
+          contactType: contact.typeLabel,
+          contactId: contact.publicKeyHex,
+        );
+      }
+    }
+
+    if (!_isLoadingContacts) {
+      unawaited(_persistContacts());
+    }
+  }
+
   Future<void> _persistContacts() async {
     await _contactStore.saveContacts(_contacts);
   }
@@ -3214,8 +3327,6 @@ class MeshCoreConnector extends ChangeNotifier {
   }
 
   void _handleDisconnection() {
-    // Disable wake lock when connection is lost
-    WakelockPlus.disable();
     _stopBatteryPolling();
 
     for (final entry in _pendingRepeaterAcks.values) {
@@ -3269,7 +3380,11 @@ class MeshCoreConnector extends ChangeNotifier {
 
   void _handleCustomVars(Uint8List frame) {
     final buf = BufferReader(frame.sublist(1));
-    _currentCustomVars = _parseKeyValueString(buf.readString());
+    try {
+      _currentCustomVars = _parseKeyValueString(buf.readString());
+    } catch (e) {
+      appLogger.warn('Malformed custom vars frame: $e', tag: 'Connector');
+    }
   }
 
   void _setState(MeshCoreConnectionState newState) {
@@ -3293,6 +3408,173 @@ class MeshCoreConnector extends ChangeNotifier {
 
     super.dispose();
   }
+
+  void _handleRxData(Uint8List frame) {
+    final packet = BufferReader(frame);
+    try {
+      packet.skipBytes(1); // Skip frame type byte
+      final snr = packet.readInt8() / 4.0;
+      packet.skipBytes(1); // Skip RSSI byte
+      //final rssi = packet.readByte();
+      final header = packet.readByte();
+      final routeType = header & 0x03;
+      final payloadType = (header >> 2) & 0x0F;
+      //final payloadVer = (header >> 6) & 0x03;
+      final pathLen = packet.readByte();
+      final pathBytes = packet.readBytes(pathLen);
+      final payload = packet.readBytes(packet.remaining);
+
+      switch (payloadType) {
+        case payloadTypeADVERT:
+          _handlePayloadAdvertReceived(payload, pathBytes, routeType, snr);
+          break;
+        default:
+      }
+    } catch (e) {
+      appLogger.warn('Malformed RX frame: $e', tag: 'Connector');
+    }
+  }
+
+  void _handlePayloadAdvertReceived(
+    Uint8List frame,
+    Uint8List path,
+    int routeType,
+    double snr,
+  ) {
+    final advert = BufferReader(frame);
+    double latitude = 0.0;
+    double longitude = 0.0;
+    String name = '';
+    String contactKeyHex = '';
+    Uint8List publicKey = Uint8List(0);
+    int type = 0;
+    int timestamp = 0;
+    bool hasLocation = false;
+    bool hasName = false;
+    try {
+      publicKey = advert.readBytes(32);
+      contactKeyHex = publicKey
+          .map((b) => b.toRadixString(16).padLeft(2, '0'))
+          .join();
+
+      timestamp = advert.readInt32LE();
+      //TODO add signature verification
+      advert.skipBytes(64); // Skip signature for now
+      final flags = advert.readByte();
+      type = flags & 0x0F;
+      hasLocation = (flags & 0x10) != 0;
+      // For future use:
+      //final hasFeature1 = (flags & 0x20) != 0;
+      //final hasFeature2 = (flags & 0x40) != 0;
+      hasName = (flags & 0x80) != 0;
+      if (hasLocation && advert.remaining >= 8) {
+        latitude = advert.readInt32LE() / 1e6;
+        longitude = advert.readInt32LE() / 1e6;
+      }
+      if (hasName && advert.remaining > 0) {
+        name = advert.readString();
+      }
+    } catch (e) {
+      appLogger.warn('Malformed advert frame: $e', tag: 'Connector');
+      return;
+    }
+
+    if (listEquals(publicKey, _selfPublicKey)) {
+      return;
+    }
+
+    // Check if this is a new contact
+    final isNewContact = !_knownContactKeys.contains(contactKeyHex);
+
+    if (isNewContact) {
+      final newContact = Contact(
+        publicKey: publicKey,
+        name: name,
+        type: type,
+        pathLength: path.length,
+        path: Uint8List.fromList(
+          path.reversed.toList(),
+        ), // Store path in reverse for easier use in outgoing messages
+        latitude: latitude,
+        longitude: longitude,
+        lastSeen: DateTime.fromMillisecondsSinceEpoch(timestamp * 1000),
+      );
+      _handleContactAdvert(newContact);
+      _updateDirectRepeater(newContact, snr, path);
+      return;
+    }
+
+    final existingIndex = _contacts.indexWhere(
+      (c) => c.publicKeyHex == contactKeyHex,
+    );
+
+    if (existingIndex >= 0) {
+      final existing = _contacts[existingIndex];
+      final mergedLastMessageAt = existing.lastMessageAt.isAfter(DateTime.now())
+          ? DateTime.now()
+          : existing.lastMessageAt;
+
+      appLogger.info(
+        'Refreshing contact ${existing.name}: devicePath=${existing.pathLength}, existingOverride=${existing.pathOverride}',
+        tag: 'Connector',
+      );
+
+      // CRITICAL: Preserve user's path override when contact is refreshed from device
+      _contacts[existingIndex] = existing.copyWith(
+        latitude: hasLocation ? latitude : existing.latitude,
+        longitude: hasLocation ? longitude : existing.longitude,
+        name: hasName ? name : existing.name,
+        path: Uint8List.fromList(path.reversed.toList()),
+        pathLength: path.length,
+        lastMessageAt: mergedLastMessageAt,
+        lastSeen: DateTime.fromMillisecondsSinceEpoch(timestamp * 1000),
+        pathOverride: existing.pathOverride, // Preserve user's path choice
+        pathOverrideBytes: existing.pathOverrideBytes,
+      );
+
+      // Add path to history if we have a valid path
+      if (_pathHistoryService != null &&
+          _contacts[existingIndex].pathLength >= 0) {
+        _pathHistoryService!.handlePathUpdated(_contacts[existingIndex]);
+      }
+
+      _updateDirectRepeater(_contacts[existingIndex], snr, path);
+
+      appLogger.info(
+        'After merge: pathOverride=${_contacts[existingIndex].pathOverride}, devicePath=${_contacts[existingIndex].pathLength}',
+        tag: 'Connector',
+      );
+    }
+  }
+
+  void _updateDirectRepeater(Contact contact, double snr, Uint8List path) {
+    final pubkeyFirstByte = path.isNotEmpty
+        ? path.last
+        : contact.publicKey.first;
+
+    _directRepeaters.removeWhere((r) => r.isStale());
+
+    //We can use adverts from chat and sensor nodes, but only if the advert has a path to get the last hop.
+    if ((contact.type == advTypeChat || contact.type == advTypeSensor) &&
+        path.isEmpty) {
+      notifyListeners();
+      return;
+    }
+
+    final isTracked = _directRepeaters.where(
+      (r) => r.pubkeyFirstByte == pubkeyFirstByte,
+    );
+
+    if (isTracked.isNotEmpty) {
+      final repeater = isTracked.first;
+      repeater.update(snr);
+    } else if (_directRepeaters.length < 5) {
+      _directRepeaters.add(
+        DirectRepeater(pubkeyFirstByte: pubkeyFirstByte, snr: snr),
+      );
+    }
+    notifyListeners();
+  }
 }
 
 const int _phRouteMask = 0x03;

lib/connector/meshcore_protocol.dart

@@ -13,12 +13,22 @@ class BufferReader {
   int readByte() => readBytes(1)[0];
 
   Uint8List readBytes(int count) {
+    if (_pointer + count > _buffer.length) {
+      throw RangeError(
+        'Attempted to read $count bytes at offset $_pointer, but only $remaining bytes remaining in buffer of length ${_buffer.length}',
+      );
+    }
     final data = _buffer.sublist(_pointer, _pointer + count);
     _pointer += count;
     return data;
   }
 
   void skipBytes(int count) {
+    if (_pointer + count > _buffer.length) {
+      throw RangeError(
+        'Attempted to skip $count bytes at offset $_pointer, but only $remaining bytes remaining in buffer of length ${_buffer.length}',
+      );
+    }
     _pointer += count;
   }
 
@@ -151,6 +161,7 @@ const int cmdGetContactByKey = 30;
 const int cmdGetChannel = 31;
 const int cmdSetChannel = 32;
 const int cmdSendTracePath = 36;
+const int cmdSetOtherParams = 38;
 const int cmdGetRadioSettings = 57;
 const int cmdGetTelemetryReq = 39;
 const int cmdGetCustomVar = 40;
@@ -166,7 +177,7 @@ const int reqTypeGetStatus = 0x01;
 const int reqTypeKeepAlive = 0x02;
 const int reqTypeGetTelemetry = 0x03;
 const int reqTypeGetAccessList = 0x05;
-const int reqTypeGetNeighbours = 0x06;
+const int reqTypeGetNeighbors = 0x06;
 
 // Repeater response codes
 const int respServerLoginOk = 0;
@@ -212,6 +223,30 @@ const int advTypeRepeater = 2;
 const int advTypeRoom = 3;
 const int advTypeSensor = 4;
 
+// Payload Types
+const int payloadTypeREQ =
+    0x00; // request (prefixed with dest/src hashes, MAC) (enc data: timestamp, blob)
+const int payloadTypeRESPONSE =
+    0x01; // response to REQ or ANON_REQ (prefixed with dest/src hashes, MAC) (enc data: timestamp, blob)
+const int payloadTypeTXTMSG =
+    0x02; // a plain text message (prefixed with dest/src hashes, MAC) (enc data: timestamp, text)
+const int payloadTypeACK = 0x03; // a simple ack
+const int payloadTypeADVERT = 0x04; // a node advertising its Identity
+const int payloadTypeGRPTXT =
+    0x05; // an (unverified) group text message (prefixed with channel hash, MAC) (enc data: timestamp, "name: msg")
+const int payloadTypeGRPDATA =
+    0x06; // an (unverified) group datagram (prefixed with channel hash, MAC) (enc data: timestamp, blob)
+const int payloadTypeANONREQ =
+    0x07; // generic request (prefixed with dest_hash, ephemeral pub_key, MAC) (enc data: ...)
+const int payloadTypePATH =
+    0x08; // returned path (prefixed with dest/src hashes, MAC) (enc data: path, extra)
+const int payloadTypeTRACE = 0x09; // trace a path, collecting SNI for each hop
+const int payloadTypeMULTIPART = 0x0A; // packet is one of a set of packets
+const int payloadTypeCONTROL = 0x0B; // a control/discovery packet
+//...
+const int payloadTypeRawCustom =
+    0x0F; // custom packet as raw bytes, for applications with custom encryption, payloads, etc
+
 // Sizes
 const int pubKeySize = 32;
 const int maxPathSize = 64;
@@ -777,3 +812,22 @@ Uint8List buildZeroHopContact(Uint8List pubKey) {
   writer.writeBytes(pubKey);
   return writer.toBytes();
 }
+
+// Build CMD_SET_OTHER_PARAMS frame
+// Format: [cmd][allowAutoAddContacts][allowTelemetryFlags][advertLocationPolicy][multiAcks]
+Uint8List buildSetOtherParamsFrame(
+  bool allowAutoAddContacts,
+  int allowTelemetryFlags,
+  int advertLocationPolicy,
+  int multiAcks,
+) {
+  final writer = BufferWriter();
+  writer.writeByte(cmdSetOtherParams);
+  writer.writeByte(
+    allowAutoAddContacts ? 0x00 : 0x01,
+  ); // Allow Auto Add Contacts
+  writer.writeByte(allowTelemetryFlags); // Allow Telemetry Flags
+  writer.writeByte(advertLocationPolicy); // Advertisement Location Policy
+  writer.writeByte(multiAcks); // Multi Acknowledgements
+  return writer.toBytes();
+}

lib/helpers/cayenne_lpp.dart

@@ -1,4 +1,6 @@
 import 'dart:typed_data';
+import 'package:meshcore_open/utils/app_logger.dart';
+
 import '../connector/meshcore_protocol.dart';
 
 class CayenneLpp {
@@ -84,180 +86,192 @@ class CayenneLpp {
   static List<Map<String, dynamic>> parse(Uint8List bytes) {
     final buffer = BufferReader(bytes);
     final telemetry = <Map<String, dynamic>>[];
+    try {
+      while (buffer.remaining >= 2) {
+        final channel = buffer.readUInt8();
+        final type = buffer.readUInt8();
 
-    while (buffer.remaining >= 2) {
-      final channel = buffer.readUInt8();
-      final type = buffer.readUInt8();
+        if (channel == 0 && type == 0) {
+          break;
+        }
 
-      if (channel == 0 && type == 0) {
-        break;
-      }
-
-      switch (type) {
-        case lppGenericSensor:
-          telemetry.add({
-            'channel': channel,
-            'type': type,
-            'value': buffer.readUInt32BE(),
-          });
-          break;
-        case lppLuminosity:
-          telemetry.add({
-            'channel': channel,
-            'type': type,
-            'value': buffer.readUInt16BE(),
-          });
-          break;
-        case lppPresence:
-          telemetry.add({
-            'channel': channel,
-            'type': type,
-            'value': buffer.readUInt8(),
-          });
-          break;
-        case lppTemperature:
-          telemetry.add({
-            'channel': channel,
-            'type': type,
-            'value': buffer.readInt16BE() / 10,
-          });
-          break;
-        case lppRelativeHumidity:
-          telemetry.add({
-            'channel': channel,
-            'type': type,
-            'value': buffer.readUInt8() / 2,
-          });
-          break;
-        case lppBarometricPressure:
-          telemetry.add({
-            'channel': channel,
-            'type': type,
-            'value': buffer.readUInt16BE() / 10,
-          });
-          break;
-        case lppVoltage:
-          telemetry.add({
-            'channel': channel,
-            'type': type,
-            'value': buffer.readInt16BE() / 100,
-          });
-          break;
-        case lppCurrent:
-          telemetry.add({
-            'channel': channel,
-            'type': type,
-            'value': buffer.readInt16BE() / 1000,
-          });
-          break;
-        case lppPercentage:
-          telemetry.add({
-            'channel': channel,
-            'type': type,
-            'value': buffer.readUInt8(),
-          });
-          break;
-        case lppConcentration:
-          telemetry.add({
-            'channel': channel,
-            'type': type,
-            'value': buffer.readUInt16BE(),
-          });
-          break;
-        case lppPower:
-          telemetry.add({
-            'channel': channel,
-            'type': type,
-            'value': buffer.readUInt16BE(),
-          });
-          break;
-        case lppGps:
-          telemetry.add({
-            'channel': channel,
-            'type': type,
-            'value': {
-              'latitude': buffer.readInt24BE() / 10000,
-              'longitude': buffer.readInt24BE() / 10000,
-              'altitude': buffer.readInt24BE() / 100,
-            },
-          });
-          break;
-        default:
-          return telemetry;
+        switch (type) {
+          case lppGenericSensor:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readUInt32BE(),
+            });
+            break;
+          case lppLuminosity:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readUInt16BE(),
+            });
+            break;
+          case lppPresence:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readUInt8(),
+            });
+            break;
+          case lppTemperature:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readInt16BE() / 10,
+            });
+            break;
+          case lppRelativeHumidity:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readUInt8() / 2,
+            });
+            break;
+          case lppBarometricPressure:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readUInt16BE() / 10,
+            });
+            break;
+          case lppVoltage:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readInt16BE() / 100,
+            });
+            break;
+          case lppCurrent:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readInt16BE() / 1000,
+            });
+            break;
+          case lppPercentage:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readUInt8(),
+            });
+            break;
+          case lppConcentration:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readUInt16BE(),
+            });
+            break;
+          case lppPower:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readUInt16BE(),
+            });
+            break;
+          case lppGps:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': {
+                'latitude': buffer.readInt24BE() / 10000,
+                'longitude': buffer.readInt24BE() / 10000,
+                'altitude': buffer.readInt24BE() / 100,
+              },
+            });
+            break;
+          default:
+            return telemetry;
+        }
       }
+      return telemetry;
+    } catch (e) {
+      // Handle parsing errors, possibly due to malformed data
+      appLogger.error('Error parsing Cayenne LPP data: $e');
+      // Return any telemetry parsed so far to preserve partial data
+      return telemetry;
     }
-
-    return telemetry;
   }
 
   static List<Map<String, dynamic>> parseByChannel(Uint8List bytes) {
     final buffer = BufferReader(bytes);
     final Map<int, Map<String, dynamic>> channels = {};
+    try {
+      while (buffer.remaining >= 2) {
+        final channel = buffer.readUInt8();
+        final type = buffer.readUInt8();
 
-    while (buffer.remaining >= 2) {
-      final channel = buffer.readUInt8();
-      final type = buffer.readUInt8();
+        // Optional: stop on padding (00 00)
+        if (channel == 0 && type == 0) {
+          break;
+        }
 
-      // Optional: stop on padding (00 00)
-      if (channel == 0 && type == 0) {
-        break;
+        final channelData = channels.putIfAbsent(
+          channel,
+          () => {'channel': channel, 'values': <String, dynamic>{}},
+        );
+
+        switch (type) {
+          case lppGenericSensor:
+            channelData['values']['generic'] = buffer.readUInt32BE();
+            break;
+          case lppLuminosity:
+            channelData['values']['luminosity'] = buffer.readUInt16BE();
+            break;
+          case lppPresence:
+            channelData['values']['presence'] = buffer.readUInt8() != 0;
+            break;
+          case lppTemperature:
+            channelData['values']['temperature'] = buffer.readInt16BE() / 10.0;
+            break;
+          case lppRelativeHumidity:
+            channelData['values']['humidity'] = buffer.readUInt8() / 2.0;
+            break;
+          case lppBarometricPressure:
+            channelData['values']['pressure'] = buffer.readUInt16BE() / 10.0;
+            break;
+          case lppVoltage:
+            channelData['values']['voltage'] = buffer.readInt16BE() / 100.0;
+            break;
+          case lppCurrent:
+            channelData['values']['current'] = buffer.readInt16BE() / 1000.0;
+            break;
+          case lppPercentage:
+            channelData['values']['percentage'] = buffer.readUInt8();
+            break;
+          case lppConcentration:
+            channelData['values']['concentration'] = buffer.readUInt16BE();
+            break;
+          case lppPower:
+            channelData['values']['power'] = buffer.readUInt16BE();
+            break;
+          case lppGps:
+            channelData['values']['gps'] = {
+              'latitude': buffer.readInt24BE() / 10000.0,
+              'longitude': buffer.readInt24BE() / 10000.0,
+              'altitude': buffer.readInt24BE() / 100.0,
+            };
+            break;
+          // Add more types as needed...
+          default:
+            //Stopped parsing to avoid misalignment
+            return channels.values.toList();
+        }
       }
 
-      final channelData = channels.putIfAbsent(
-        channel,
-        () => {'channel': channel, 'values': <String, dynamic>{}},
-      );
-
-      switch (type) {
-        case lppGenericSensor:
-          channelData['values']['generic'] = buffer.readUInt32BE();
-          break;
-        case lppLuminosity:
-          channelData['values']['luminosity'] = buffer.readUInt16BE();
-          break;
-        case lppPresence:
-          channelData['values']['presence'] = buffer.readUInt8() != 0;
-          break;
-        case lppTemperature:
-          channelData['values']['temperature'] = buffer.readInt16BE() / 10.0;
-          break;
-        case lppRelativeHumidity:
-          channelData['values']['humidity'] = buffer.readUInt8() / 2.0;
-          break;
-        case lppBarometricPressure:
-          channelData['values']['pressure'] = buffer.readUInt16BE() / 10.0;
-          break;
-        case lppVoltage:
-          channelData['values']['voltage'] = buffer.readInt16BE() / 100.0;
-          break;
-        case lppCurrent:
-          channelData['values']['current'] = buffer.readInt16BE() / 1000.0;
-          break;
-        case lppPercentage:
-          channelData['values']['percentage'] = buffer.readUInt8();
-          break;
-        case lppConcentration:
-          channelData['values']['concentration'] = buffer.readUInt16BE();
-          break;
-        case lppPower:
-          channelData['values']['power'] = buffer.readUInt16BE();
-          break;
-        case lppGps:
-          channelData['values']['gps'] = {
-            'latitude': buffer.readInt24BE() / 10000.0,
-            'longitude': buffer.readInt24BE() / 10000.0,
-            'altitude': buffer.readInt24BE() / 100.0,
-          };
-          break;
-        // Add more types as needed...
-        default:
-          // Unknown type: skip or handle error?
-          continue;
-      }
+      final List<Map<String, dynamic>> channelsOut = channels.values.toList();
+      channelsOut.sort((a, b) => a['channel'].compareTo(b['channel']));
+      return channelsOut;
+    } catch (e) {
+      // Handle parsing errors, possibly due to malformed data
+      appLogger.error('Error parsing Cayenne LPP data: $e');
+      return <
+        Map<String, dynamic>
+      >[]; // Return an empty list on error to avoid crashing the app
     }
-
-    final List<Map<String, dynamic>> channelsOut = channels.values.toList();
-    channelsOut.sort((a, b) => a['channel'].compareTo(b['channel']));
-    return channelsOut;
   }
 }

lib/l10n/app_bg.arb

@@ -1356,12 +1356,12 @@
       }
     }
   },
-  "repeater_neighboursSubtitle": "Преглед на съседни възли с нулев скок.",
-  "repeater_neighbours": "Съседи",
+  "repeater_neighborsSubtitle": "Преглед на съседни възли с нулев скок.",
+  "repeater_neighbors": "Съседи",
   "neighbors_receivedData": "Получени данни за съседи",
   "neighbors_requestTimedOut": "Съседите поискат изтичане на време.",
   "neighbors_errorLoading": "Грешка при зареждане на съседи: {error}",
-  "neighbors_repeatersNeighbours": "Повторители Съседи",
+  "neighbors_repeatersNeighbors": "Повторители Съседи",
   "neighbors_noData": "Няма налични данни за съседи.",
   "channels_createPrivateChannel": "Създай Частен Канал",
   "channels_joinPrivateChannel": "Присъедини се към Частен Канал",
@@ -1575,7 +1575,6 @@
   "notification_newNodesCount": "{count} {count, plural, =1{нов възел} other{нови възли}}",
   "notification_newTypeDiscovered": "Открит нов {contactType}",
   "notification_receivedNewMessage": "Получено ново съобщение",
-  "contacts_contactAdvertCopyFailed": "Копирането на обявата в клипборда не успя.",
   "settings_gpxExportContactsSubtitle": "Експортира спътници с местоположение в GPX файл.",
   "settings_gpxExportRepeatersSubtitle": "Изпраща повторители / roomserver с местоположение в GPX файл.",
   "settings_gpxExportAll": "Експортирай всички контакти в GPX",
@@ -1591,6 +1590,15 @@
   "settings_gpxExportAllContacts": "Местоположения на всички контакти",
   "settings_gpxExportShareText": "Картинни данни изнесени от meshcore-open",
   "settings_gpxExportShareSubject": "meshcore-open износ на данни за карта в формат GPX",
-  "pathTrace_someHopsNoLocation": "Един или повече от хмелите липсва местоположение!"
-
+  "pathTrace_someHopsNoLocation": "Един или повече от хмелите липсва местоположение!",
+  "map_pathTraceCancelled": "Отменен е следването на пътя.",
+  "pathTrace_clearTooltip": "Изчисти пътя",
+  "map_removeLast": "Премахни Последно",
+  "map_runTrace": "Изпълни Път на Следване",
+  "map_tapToAdd": "Натиснете върху възлите, за да ги добавите към пътя.",
+  "scanner_bluetoothOff": "Bluetooth е изключен.",
+  "scanner_enableBluetooth": "Активирайте Bluetooth",
+  "scanner_bluetoothOffMessage": "Моля, активирайте Bluetooth, за да сканирате за устройства.",
+  "snrIndicator_lastSeen": "Последно видян",
+  "snrIndicator_nearByRepeaters": "Близки повтарящи се устройства"
 }

lib/l10n/app_de.arb

@@ -96,14 +96,14 @@
   "settings_privacyModeEnabled": "Datenschutzmodus aktiviert",
   "settings_privacyModeDisabled": "Datenschutzmodus deaktiviert",
   "settings_actions": "Aktionen",
-  "settings_sendAdvertisement": "Sende eine Ankündigung",
-  "settings_sendAdvertisementSubtitle": "Sende Ankündigung",
+  "settings_sendAdvertisement": "Sende Ankündigung",
+  "settings_sendAdvertisementSubtitle": "Sende eine Ankündigung",
   "settings_advertisementSent": "Ankündigung gesendet",
   "settings_syncTime": "Zeitsynchronisierung",
   "settings_syncTimeSubtitle": "Stelle die Gerätezeit auf die Uhrzeit des Telefons ein",
   "settings_timeSynchronized": "Zeit synchronisiert",
   "settings_refreshContacts": "Kontakte aktualisieren",
-  "settings_refreshContactsSubtitle": "Kontakte-Liste vom Gerät neu laden",
+  "settings_refreshContactsSubtitle": "Kontakt-Liste vom Gerät neu laden",
   "settings_rebootDevice": "Gerät neu starten",
   "settings_rebootDeviceSubtitle": "MeshCore-Gerät neu starten",
   "settings_rebootDeviceConfirm": "Sind Sie sicher, dass Sie das Gerät neu starten möchten? Sie werden getrennt.",
@@ -540,7 +540,7 @@
   "chat_routingMode": "Routenmodus",
   "chat_autoUseSavedPath": "Automatisch (gespeicherten Pfad verwenden)",
   "chat_forceFloodMode": "Flut-Modus erzwingen",
-  "chat_recentAckPaths": "Aktuelle ACK-Pfade (tasten, um zu verwenden):",
+  "chat_recentAckPaths": "Aktuelle ACK-Pfade (antippen, um zu verwenden):",
   "chat_pathHistoryFull": "Die Pfadhistorie ist voll. Entferne Einträge, um neue hinzuzufügen.",
   "chat_hopSingular": "Sprung",
   "chat_hopPlural": "Sprünge",
@@ -554,7 +554,7 @@
   },
   "chat_successes": "Erfolgreich",
   "chat_removePath": "Pfad entfernen",
-  "chat_noPathHistoryYet": "Keine eine Pfadhistorie vorhanden.\nSende eine Nachricht, um Pfade zu entdecken.",
+  "chat_noPathHistoryYet": "Keine Pfadhistorie vorhanden.\nSende eine Nachricht, um Pfade zu entdecken.",
   "chat_pathActions": "Pfadaktionen:",
   "chat_setCustomPath": "Lege benutzerdefinierten Pfad fest",
   "chat_setCustomPathSubtitle": "Manuellen Routenpfad festlegen",
@@ -717,7 +717,7 @@
   "mapCache_cacheArea": "Zwischenspeicherbereich",
   "mapCache_useCurrentView": "Aktuelle Ansicht verwenden",
   "mapCache_zoomRange": "Zoom Bereich",
-  "mapCache_estimatedTiles": "Geschätzte Fliesen: {count}",
+  "mapCache_estimatedTiles": "Geschätzte Kacheln: {count}",
   "@mapCache_estimatedTiles": {
     "placeholders": {
       "count": {
@@ -854,7 +854,7 @@
   },
   "path_enterCustomPath": "Gebe Pfad ein",
   "path_currentPathLabel": "Aktueller Pfad",
-  "path_hexPrefixInstructions": "Gebe für jeden Hopfen 2-stellige Hex-Präfixe ein, getrennt durch Kommas.",
+  "path_hexPrefixInstructions": "Gebe für jeden Zwischen-Hop das 2-stellige Hex-Präfix ein, getrennt durch Kommas.",
   "path_hexPrefixExample": "Beispiel: A1,F2,3C (jeder Knoten verwendet den ersten Byte seines öffentlichen Schlüssels)",
   "path_labelHexPrefixes": "Pfad (Hex-Präfixe)",
   "path_helperMaxHops": "Max 64 Sprünge. Jede Präfixe ist 2 Hexadezimalzeichen (1 Byte)",
@@ -887,7 +887,7 @@
   "repeater_forceFloodMode": "Flut-Modus erzwingen",
   "repeater_pathManagement": "Pfadverwaltung",
   "repeater_refresh": "Aktualisieren",
-  "repeater_statusRequestTimeout": "Statusanfrage zeitweise fehlgeschlagen.",
+  "repeater_statusRequestTimeout": "Statusanfrage durch Timeout fehlgeschlagen.",
   "repeater_errorLoadingStatus": "Fehler beim Laden des Status: {error}",
   "@repeater_errorLoadingStatus": {
     "placeholders": {
@@ -957,7 +957,7 @@
       }
     }
   },
-  "repeater_duplicatesFloodDirect": "Überflut: {flood}, Direkt: {direct}",
+  "repeater_duplicatesFloodDirect": "Flut: {flood}, Direkt: {direct}",
   "@repeater_duplicatesFloodDirect": {
     "placeholders": {
       "flood": {
@@ -983,7 +983,7 @@
   "repeater_adminPassword": "Admin-Passwort",
   "repeater_adminPasswordHelper": "Vollzugriffspasswort",
   "repeater_guestPassword": "Gast-Passwort",
-  "repeater_guestPasswordHelper": "Schreibgeschützter Zugriffspasswort",
+  "repeater_guestPasswordHelper": "Schreibgeschütztes Zugriffspasswort",
   "repeater_radioSettings": "Funk Einstellungen",
   "repeater_frequencyMhz": "Frequenz (MHz)",
   "repeater_frequencyHelper": "300-2500 MHz",
@@ -1086,11 +1086,11 @@
     }
   },
   "repeater_cliTitle": "Repeater CLI",
-  "repeater_debugNextCommand": "Fehlersuche Nächster Befehl",
+  "repeater_debugNextCommand": "Fehlersuche des nächsten Befehls",
   "repeater_commandHelp": "Hilfe",
   "repeater_clearHistory": "Löschen der Historie",
   "repeater_noCommandsSent": "Noch keine Befehle gesendet.",
-  "repeater_typeCommandOrUseQuick": "Geben Sie einen Befehl unten ein oder verwenden Sie Schnellbefehle",
+  "repeater_typeCommandOrUseQuick": "Geben Sie unten einen Befehl ein oder verwenden Sie die Schnellbefehle",
   "repeater_enterCommandHint": "Geben Sie den Befehl ein...",
   "repeater_previousCommand": "Vorhergehende Aktion",
   "repeater_nextCommand": "Nächste Aktion",
@@ -1132,7 +1132,7 @@
   "repeater_cliHelpSetLat": "Legt die Breitengrad der Ankündigung fest. (dezimale Grad)",
   "repeater_cliHelpSetLon": "Legt die Längengrade der Ankündigung fest. (dezimale Grad)",
   "repeater_cliHelpSetRadio": "Legt komplett neue Radio-Parameter fest und speichert diese als Präferenzen. Benötigt einen \"Reboot\"-Befehl, um sie anzuwenden.",
-  "repeater_cliHelpSetRxDelay": "Sets (experimentell) als Basis (muss > 1 sein für den Effekt) zur Anwendung einer leichten Verzögerung bei empfangenen Paketen, basierend auf Signalstärke/Punktzahl. Auf 0 setzen, um die Funktion zu deaktivieren.",
+  "repeater_cliHelpSetRxDelay": "Fügt eine leichte Verzögerung bei empfangenen Paketen hinzu, basierend auf Signalstärke/Punktzahl. Auf 0 setzen, um die Funktion zu deaktivieren.",
   "repeater_cliHelpSetTxDelay": "Legt einen Faktor fest, der mit der Zeit bei voller Zuluft für ein Flood-Mode-Paket und mit einem zufälligen Slot-System multipliziert wird, um dessen Weiterleitung zu verzögern (um Kollisionen zu vermeiden).",
   "repeater_cliHelpSetDirectTxDelay": "Ähnlich wie txdelay, aber zum Anwenden einer zufälligen Verzögerung bei der Weiterleitung von Direktmodus-Paketen.",
   "repeater_cliHelpSetBridgeEnabled": "Brücke aktivieren/deaktivieren.",
@@ -1143,14 +1143,14 @@
   "repeater_cliHelpSetAdcMultiplier": "Legt einen benutzerdefinierten Faktor zur Anpassung der gemeldeten Batteriewirkspannung fest (nur auf ausgewählten Boards unterstützt).",
   "repeater_cliHelpTempRadio": "Legt vorübergehende Funkparameter für die angegebene Anzahl von Minuten fest und kehrt anschließend zu den ursprünglichen Funkparametern zurück (wird nicht in den Einstellungen gespeichert).",
   "repeater_cliHelpSetPerm": "Ändert die ACL. Entfernt das passende Eintragen (durch Pubkey-Präfix), wenn \"permissions\" auf 0 steht. Fügt ein neues Eintragen hinzu, wenn die Pubkey-Hex-Länge vollständig ist und nicht bereits in der ACL vorhanden ist. Aktualisiert das Eintragen anhand des übereinstimmenden Pubkey-Präfix. Berechtigungsbits variieren je nach Firmware-Rolle, aber die unteren 2 Bits sind: 0 (Gast), 1 (Nur Lesen), 2 (Lesen/Schreiben), 3 (Admin)",
-  "repeater_cliHelpGetBridgeType": "Ruft Brückentyp none, rs232, espnow ab.",
+  "repeater_cliHelpGetBridgeType": "Ruft Brückentyp: none, rs232, espnow ab.",
   "repeater_cliHelpLogStart": "Beginnt die Paketprotokollierung in das Dateisystem.",
   "repeater_cliHelpLogStop": "Stoppt das Paketprotokollieren in das Dateisystem.",
   "repeater_cliHelpLogErase": "Löscht die Paketprotokolle aus dem Dateisystem.",
   "repeater_cliHelpNeighbors": "Zeigt eine Liste anderer Repeater-Knoten an, die über Zero-Hop-Ankündigung gehört wurden. Jede Zeile ist id-prefix-hex:timestamp:snr-times-4",
   "repeater_cliHelpNeighborRemove": "Entfernt das erste übereinstimmende Element (über Pubkey-Präfix (hex)) aus der Liste der Nachbarn.",
   "repeater_cliHelpRegion": "Listet alle definierten Regionen auf.",
-  "repeater_cliHelpRegionLoad": "Hinweis: Dies ist ein spezieller Mehrbefehl-Aufruf. Jeder nachfolgende Befehl ist ein Regionsname (eingedruckt mit Leerzeichen zur Angabe der übergeordneten Hierarchie, mit mindestens einem Leerzeichen). Beendet durch das Senden einer Leerzeile/des Befehls.",
+  "repeater_cliHelpRegionLoad": "Hinweis: Dies ist ein spezieller Mehrbefehl-Aufruf. Jeder nachfolgende Befehl ist ein Regionsname (eingerückt mit Leerzeichen zur Angabe der übergeordneten Hierarchie, mit mindestens einem Leerzeichen). Beendet durch das Senden einer Leerzeile.",
   "repeater_cliHelpRegionGet": "Sucht die Region mit dem gegebenen Namenspräfix (oder \"\\\" für den globalen Scope) und antwortet mit \"-> region-name (parent-name) 'F'\".",
   "repeater_cliHelpRegionPut": "Fügt eine Region-Definition mit dem angegebenen Namen hinzu oder aktualisiert diese.",
   "repeater_cliHelpRegionRemove": "Löscht eine Regiondefinition mit dem angegebenen Namen. (muss genau übereinstimmen und keine Kindregionen haben)",
@@ -1243,7 +1243,7 @@
   "channelPath_otherObservedPaths": "Sonstige beobachtete Pfade",
   "channelPath_repeaterHops": "Repeater-Sprünge",
   "channelPath_noHopDetails": "Die Detailangaben für dieses Paket sind nicht verfügbar.",
-  "channelPath_messageDetails": "Nachrichtsdetails",
+  "channelPath_messageDetails": "Nachrichtendetails",
   "channelPath_senderLabel": "Sender",
   "channelPath_timeLabel": "Zeit",
   "channelPath_repeatsLabel": "Wiederholungen",
@@ -1347,7 +1347,7 @@
   "listFilter_users": "Benutzer",
   "listFilter_repeaters": "Repeater",
   "listFilter_roomServers": "Raumserver",
-  "listFilter_unreadOnly": "Nur nicht gelesen",
+  "listFilter_unreadOnly": "Nicht gelesen",
   "listFilter_newGroup": "Neue Gruppe",
   "@neighbors_errorLoading": {
     "placeholders": {
@@ -1356,13 +1356,13 @@
       }
     }
   },
-  "repeater_neighbours": "Nachbarn",
-  "repeater_neighboursSubtitle": "Anzahl der Hop-Nachbarn anzeigen.",
-  "neighbors_receivedData": "Empfangene Nachbarendaten",
-  "neighbors_requestTimedOut": "Nachbarn melden zeitweise Ausfall.",
+  "repeater_neighbors": "Nachbarn",
+  "repeater_neighborsSubtitle": "Anzahl der Hop-Nachbarn anzeigen.",
+  "neighbors_receivedData": "Empfangene Nachbarsdaten",
+  "neighbors_requestTimedOut": "Anfrage durch Timeout fehlgeschlagen.",
   "neighbors_errorLoading": "Fehler beim Laden der Nachbarn: {error}",
-  "neighbors_repeatersNeighbours": "Nachbarn",
-  "neighbors_noData": "Keine Nachbardaten verfügbar.",
+  "neighbors_repeatersNeighbors": "Nachbarn",
+  "neighbors_noData": "Keine Nachbarsdaten verfügbar.",
   "channels_joinPrivateChannel": "Treten Sie einem privaten Kanal bei",
   "channels_joinPrivateChannelDesc": "Manuelle Eingabe eines geheimen Schlüssels.",
   "channels_createPrivateChannel": "Erstelle einen privaten Kanal",
@@ -1389,8 +1389,8 @@
       }
     }
   },
-  "neighbors_heardAgo": "Hörte: {time} vor her.",
-  "neighbors_unknownContact": "Unbekannte {pubkey}",
+  "neighbors_heardAgo": "Gehört vor: {time}",
+  "neighbors_unknownContact": "Unbekannt {pubkey}",
   "settings_locationGPSEnable": "GPS aktivieren",
   "settings_locationGPSEnableSubtitle": "Aktiviert GPS zur automatischen Aktualisierung des Standorts.",
   "settings_locationIntervalSec": "Intervall für GPS (Sekunden)",
@@ -1493,9 +1493,9 @@
   "community_deleted": "Community \"{name}\" verlassen",
   "community_addHashtagChannel": "Füge einen Community-Hashtag hinzu",
   "community_addHashtagChannelDesc": "Füge einen Hashtag-Kanal für diese Community hinzu",
-  "community_selectCommunity": "Wählen Sie Community",
+  "community_selectCommunity": "Wählen Sie eine Community",
   "community_regularHashtag": "Regulärer Hashtag",
-  "community_regularHashtagDesc": "Öffentliches Hashtag (jeder kann teilnehmen)",
+  "community_regularHashtagDesc": "Öffentlicher Hashtag (jeder kann teilnehmen)",
   "community_communityHashtagDesc": "Nur für Mitglieder der Community",
   "community_forCommunity": "Für {name}",
   "community_communityHashtag": "Community Hashtag",
@@ -1559,59 +1559,74 @@
   "appSettings_languageUk": "Ukrainisch",
   "contacts_contactImported": "Kontakt wurde importiert.",
   "contacts_contactImportFailed": "Kontakt konnte nicht importiert werden",
-  "contacts_zeroHopAdvert": "Zero-Hop-Anzeige",
-  "contacts_floodAdvert": "Überflutungsanzeige",
+  "contacts_zeroHopAdvert": "Zero-Hop-Ankündigung",
+  "contacts_floodAdvert": "Flut-Ankündigung",
   "contacts_addContactFromClipboard": "Kontakt aus Zwischenablage hinzufügen",
   "contacts_ShareContactZeroHop": "Kontakt über Anzeige teilen",
-  "contacts_copyAdvertToClipboard": "Werbung in die Zwischenablage kopieren",
+  "contacts_copyAdvertToClipboard": "Ankündigung in die Zwischenablage kopieren",
   "contacts_ShareContact": "Kontakt in die Zwischenablage kopieren",
   "contacts_zeroHopContactAdvertFailed": "Kontakt konnte nicht gesendet werden.",
   "contacts_zeroHopContactAdvertSent": "Kontakt über Anzeige gesendet",
   "contacts_contactAdvertCopied": "Anzeige in die Zwischenablage kopiert.",
-  "contacts_contactAdvertCopyFailed": "Kopieren des Werbeinhalts in die Zwischenablage fehlgeschlagen.",
-
+  "contacts_contactAdvertCopyFailed": "Kopieren der Ankündigung in die Zwischenablage fehlgeschlagen.",
   "notification_activityTitle": "MeshCore Aktivität",
   "notification_messagesCount": "{count} {count, plural, =1{Nachricht} other{Nachrichten}}",
   "@notification_messagesCount": {
     "placeholders": {
-      "count": {"type": "int"}
+      "count": {
+        "type": "int"
+      }
     }
   },
   "notification_channelMessagesCount": "{count} {count, plural, =1{Kanalnachricht} other{Kanalnachrichten}}",
   "@notification_channelMessagesCount": {
     "placeholders": {
-      "count": {"type": "int"}
+      "count": {
+        "type": "int"
+      }
     }
   },
   "notification_newNodesCount": "{count} {count, plural, =1{neuer Knoten} other{neue Knoten}}",
   "@notification_newNodesCount": {
     "placeholders": {
-      "count": {"type": "int"}
+      "count": {
+        "type": "int"
+      }
     }
   },
   "notification_newTypeDiscovered": "Neuer {contactType} entdeckt",
   "@notification_newTypeDiscovered": {
     "placeholders": {
-      "contactType": {"type": "String"}
+      "contactType": {
+        "type": "String"
+      }
     }
   },
   "notification_receivedNewMessage": "Neue Nachricht empfangen",
-  "contacts_contactAdvertCopyFailed": "Kopieren des Werbeinhalts in die Zwischenablage fehlgeschlagen.",
-  "settings_gpxExportAll": "Alle Kontakte nach GPX exportieren",
-  "settings_gpxExportAllSubtitle": "Exportiert alle Kontakte mit einem Standort in eine GPX-Datei.",
-  "settings_gpxExportRepeaters": "Repeater und Raumserver nach GPX exportieren",
-  "settings_gpxExportContacts": "Begleiter nach GPX exportieren",
+  "settings_gpxExportAll": "Alle Knoten als GPX exportieren",
+  "settings_gpxExportAllSubtitle": "Exportiert alle Knoten mit einem Standort in eine GPX-Datei.",
+  "settings_gpxExportRepeaters": "Repeater und Raumserver als GPX exportieren",
+  "settings_gpxExportContacts": "Kontakte als GPX exportieren",
   "settings_gpxExportRepeatersSubtitle": "Exportiert Repeater und Raumserver mit einem Standort in eine GPX-Datei.",
-  "settings_gpxExportContactsSubtitle": "Exportiert Begleiter mit einem Ort in eine GPX-Datei.",
+  "settings_gpxExportContactsSubtitle": "Exportiert Kontakte mit einem Ort in eine GPX-Datei.",
   "settings_gpxExportRepeatersRoom": "Repeater- und Raumserver-Standorte",
-  "settings_gpxExportChat": "Begleiterstandorte",
+  "settings_gpxExportChat": "Kontaktstandorte",
   "settings_gpxExportNoContacts": "Keine Kontakte zum Exportieren.",
   "settings_gpxExportError": "Beim Export ist ein Fehler aufgetreten.",
   "settings_gpxExportNotAvailable": "Nicht auf Ihrem Gerät/Betriebssystem unterstützt",
-  "settings_gpxExportSuccess": "Erfolgreich GPX-Datei exportiert.",
+  "settings_gpxExportSuccess": "GPX-Datei erfolgreich exportiert.",
   "settings_gpxExportAllContacts": "Alle Kontaktstandorte",
-  "settings_gpxExportShareSubject": "meshcore-open GPX-Kartendaten exportieren",
-  "settings_gpxExportShareText": "Kartendaten aus meshcore-open exportiert",
-  "pathTrace_someHopsNoLocation": "Eine oder mehrere der Hopfen fehlen einen Standort!"
-
+  "settings_gpxExportShareSubject": "GPX-Kartendaten aus meshcore-open exportieren",
+  "settings_gpxExportShareText": "GPX-Kartendaten aus meshcore-open exportiert",
+  "pathTrace_someHopsNoLocation": "Bei einer oder mehreren Knoten fehlt der Standort!",
+  "map_removeLast": "Letztes Entfernen",
+  "map_tapToAdd": "Tippen Sie auf Knoten, um sie zum Pfad hinzuzufügen.",
+  "map_runTrace": "Pfadverlauf ausführen",
+  "pathTrace_clearTooltip": "Pfad löschen",
+  "map_pathTraceCancelled": "Pfadverfolgung abgebrochen.",
+  "scanner_bluetoothOffMessage": "Bitte aktivieren Sie Bluetooth, um nach Geräten zu suchen.",
+  "scanner_bluetoothOff": "Bluetooth ist deaktiviert.",
+  "scanner_enableBluetooth": "Bluetooth aktivieren",
+  "snrIndicator_lastSeen": "Zuletzt gesehen",
+  "snrIndicator_nearByRepeaters": "In der Nähe befindliche Repeater"
 }

lib/l10n/app_en.arb

@@ -66,6 +66,9 @@
   },
   "scanner_stop": "Stop",
   "scanner_scan": "Scan",
+  "scanner_bluetoothOff": "Bluetooth is off",
+  "scanner_bluetoothOffMessage": "Please turn on Bluetooth to scan for devices",
+  "scanner_enableBluetooth": "Enable Bluetooth",
 
   "device_quickSwitch": "Quick switch",
   "device_meshcore": "MeshCore",
@@ -619,6 +622,10 @@
   "map_sharedPin": "Shared pin",
   "map_joinRoom": "Join Room",
   "map_manageRepeater": "Manage Repeater",
+  "map_tapToAdd": "Tap on nodes to add them to the path.",
+  "map_runTrace": "Run Path Trace",
+  "map_removeLast": "Remove Last",
+  "map_pathTraceCancelled": "Path trace cancelled.",
   "mapCache_title": "Offline Map Cache",
   "mapCache_selectAreaFirst": "Select an area to cache first",
   "mapCache_noTilesToDownload": "No tiles to download for this area",
@@ -786,8 +793,8 @@
   "repeater_telemetrySubtitle": "View telemetry of sensors and system stats",
   "repeater_cli": "CLI",
   "repeater_cliSubtitle": "Send commands to the repeater",
-  "repeater_neighbours": "Neighbors",
-  "repeater_neighboursSubtitle": "View zero hop neighbors.",
+  "repeater_neighbors": "Neighbors",
+  "repeater_neighborsSubtitle": "View zero hop neighbors.",
   "repeater_settings": "Settings",
   "repeater_settingsSubtitle": "Configure repeater parameters",
 
@@ -1091,16 +1098,16 @@
     }
   },
 
-  "neighbors_receivedData": "Received Neighbours Data",
-  "neighbors_requestTimedOut": "Neighbours request timed out.",
+  "neighbors_receivedData": "Received Neighbors Data",
+  "neighbors_requestTimedOut": "Neighbors request timed out.",
   "neighbors_errorLoading": "Error loading neighbors: {error}",
   "@neighbors_errorLoading": {
     "placeholders": {
       "error": {"type": "String"}
     }
   },
-  "neighbors_repeatersNeighbours": "Repeaters Neighbours",
-  "neighbors_noData": "No neighbours data available.",
+  "neighbors_repeatersNeighbors": "Repeaters Neighbors",
+  "neighbors_noData": "No neighbors data available.",
   "neighbors_unknownContact": "Unknown {pubkey}",
   "@neighbors_unknownContact": {
     "placeholders": {
@@ -1317,6 +1324,7 @@
   "pathTrace_notAvailable": "Path trace not available.",
   "pathTrace_refreshTooltip": "Refresh Path Trace.",
   "pathTrace_someHopsNoLocation": "One or more of the hops is missing a location!",
+  "pathTrace_clearTooltip": "Clear path.",
   "contacts_pathTrace": "Path Trace",
   "contacts_ping": "Ping",
   "contacts_repeaterPathTrace": "Path trace to repeater",
@@ -1387,5 +1395,7 @@
   "settings_gpxExportChat": "Companion locations",
   "settings_gpxExportAllContacts": "All contacts locations",
   "settings_gpxExportShareText": "Map data exported from meshcore-open",
-  "settings_gpxExportShareSubject": "meshcore-open GPX map data export"
+  "settings_gpxExportShareSubject": "meshcore-open GPX map data export",
+  "snrIndicator_nearByRepeaters": "Nearby Repeaters",
+  "snrIndicator_lastSeen": "Last seen"
 }

lib/l10n/app_es.arb

@@ -1356,12 +1356,12 @@
       }
     }
   },
-  "repeater_neighbours": "Vecinos",
-  "repeater_neighboursSubtitle": "Ver vecinos de salto cero.",
+  "repeater_neighbors": "Vecinos",
+  "repeater_neighborsSubtitle": "Ver vecinos de salto cero.",
   "neighbors_receivedData": "Recibidas Datos de Vecinos",
   "neighbors_requestTimedOut": "Los vecinos solicitan que se desconecte.",
   "neighbors_errorLoading": "Error al cargar vecinos: {error}",
-  "neighbors_repeatersNeighbours": "Repetidores Vecinos",
+  "neighbors_repeatersNeighbors": "Repetidores Vecinos",
   "neighbors_noData": "No hay datos de vecinos disponibles.",
   "channels_joinPrivateChannel": "Únete a un Canal Privado",
   "channels_createPrivateChannel": "Crear un Canal Privado",
@@ -1569,34 +1569,40 @@
   "contacts_zeroHopContactAdvertSent": "Envió contacto por anuncio.",
   "contacts_contactAdvertCopied": "Anuncio copiado al Portapapeles.",
   "contacts_contactAdvertCopyFailed": "Copiar anuncio al Portapapeles ha fallado.",
-
   "notification_activityTitle": "Actividad de MeshCore",
   "notification_messagesCount": "{count} {count, plural, =1{mensaje} other{mensajes}}",
   "@notification_messagesCount": {
     "placeholders": {
-      "count": {"type": "int"}
+      "count": {
+        "type": "int"
+      }
     }
   },
   "notification_channelMessagesCount": "{count} {count, plural, =1{mensaje de canal} other{mensajes de canal}}",
   "@notification_channelMessagesCount": {
     "placeholders": {
-      "count": {"type": "int"}
+      "count": {
+        "type": "int"
+      }
     }
   },
   "notification_newNodesCount": "{count} {count, plural, =1{nuevo nodo} other{nuevos nodos}}",
   "@notification_newNodesCount": {
     "placeholders": {
-      "count": {"type": "int"}
+      "count": {
+        "type": "int"
+      }
     }
   },
   "notification_newTypeDiscovered": "Nuevo {contactType} descubierto",
   "@notification_newTypeDiscovered": {
     "placeholders": {
-      "contactType": {"type": "String"}
+      "contactType": {
+        "type": "String"
+      }
     }
   },
   "notification_receivedNewMessage": "Nuevo mensaje recibido",
-  "contacts_contactAdvertCopyFailed": "Copiar anuncio al Portapapeles ha fallado.",
   "settings_gpxExportContactsSubtitle": "Exporta compañeros con una ubicación a archivo GPX.",
   "settings_gpxExportRepeaters": "Exportar repetidores / servidor de sala a GPX",
   "settings_gpxExportSuccess": "Archivo GPX exportado con éxito.",
@@ -1612,6 +1618,15 @@
   "settings_gpxExportAllContacts": "Todas las ubicaciones de contactos",
   "settings_gpxExportShareText": "Datos del mapa exportados desde meshcore-open",
   "settings_gpxExportShareSubject": "meshcore-open exportación de datos de mapa GPX",
-  "pathTrace_someHopsNoLocation": "Uno o más de los lúpulos carecen de una ubicación"
-
+  "pathTrace_someHopsNoLocation": "Uno o más de los lúpulos carecen de una ubicación",
+  "pathTrace_clearTooltip": "Borrar ruta",
+  "map_runTrace": "Ejecutar Rastreo de Ruta",
+  "map_tapToAdd": "Pulse en los nodos para agregarlos al camino.",
+  "map_removeLast": "Eliminar último",
+  "map_pathTraceCancelled": "Rastreo de ruta cancelado.",
+  "scanner_bluetoothOffMessage": "Por favor, active el Bluetooth para escanear dispositivos.",
+  "scanner_bluetoothOff": "Bluetooth está desactivado.",
+  "scanner_enableBluetooth": "Habilitar Bluetooth",
+  "snrIndicator_nearByRepeaters": "Repetidores cercanos",
+  "snrIndicator_lastSeen": "Visto por última vez"
 }

lib/l10n/app_fr.arb

@@ -210,8 +210,8 @@
   "appSettings_batteryLifepo4": "LiFePO4 (2,6-3,65V)",
   "appSettings_batteryLipo": "LiPo (3,0-4,2V)",
   "appSettings_mapDisplay": "Affichage de la carte",
-  "appSettings_showRepeaters": "Afficher les répétiteurs",
-  "appSettings_showRepeatersSubtitle": "Afficher les nœuds répétiteurs sur la carte",
+  "appSettings_showRepeaters": "Afficher les répéteurs",
+  "appSettings_showRepeatersSubtitle": "Afficher les nœuds répéteurs sur la carte",
   "appSettings_showChatNodes": "Afficher les nœuds de discussion",
   "appSettings_showChatNodesSubtitle": "Afficher les nœuds de chat sur la carte",
   "appSettings_showOtherNodes": "Afficher d'autres nœuds",
@@ -266,7 +266,7 @@
       }
     }
   },
-  "contacts_manageRepeater": "Gérer le répétiteur",
+  "contacts_manageRepeater": "Gérer le répéteur",
   "contacts_roomLogin": "Connexion Salle",
   "contacts_openChat": "Ouverture du Chat",
   "contacts_editGroup": "Modifier le groupe",
@@ -542,9 +542,9 @@
   "chat_forceFloodMode": "Mode tout le réseau forcé",
   "chat_recentAckPaths": "Chemins ACK récents (touchez pour utiliser) :",
   "chat_pathHistoryFull": "L'historique du chemin est plein. Supprimez les entrées pour en ajouter de nouvelles.",
-  "chat_hopSingular": "Sautez",
-  "chat_hopPlural": "sautez",
-  "chat_hopsCount": "{count} {count, plural, =1{hop} other{hops}}",
+  "chat_hopSingular": "saut",
+  "chat_hopPlural": "sauts",
+  "chat_hopsCount": "{count} {count, plural, =1{saut} other{sauts}}",
   "@chat_hopsCount": {
     "placeholders": {
       "count": {
@@ -636,7 +636,7 @@
     }
   },
   "map_chat": "Chat",
-  "map_repeater": "Répétiteur",
+  "map_repeater": "Répéteur",
   "map_room": "Salle",
   "map_sensor": "Capteur",
   "map_pinDm": "Clé (DM)",
@@ -677,7 +677,7 @@
   "map_lastSeenTime": "Dernière fois vu",
   "map_sharedPin": "Clé partagée",
   "map_joinRoom": "Rejoindre la salle",
-  "map_manageRepeater": "Gérer le répétiteur",
+  "map_manageRepeater": "Gérer le répéteur",
   "mapCache_title": "Cache de Carte Hors Ligne",
   "mapCache_selectAreaFirst": "Sélectionner une zone pour la mise en cache en premier",
   "mapCache_noTilesToDownload": "Aucun tuilage à télécharger pour cette zone.",
@@ -800,13 +800,13 @@
   "time_allTime": "Tout le temps",
   "dialog_disconnect": "Déconnecter",
   "dialog_disconnectConfirm": "Êtes-vous sûr de vouloir vous déconnecter de cet appareil ?",
-  "login_repeaterLogin": "Connexion au répétiteur",
+  "login_repeaterLogin": "Connexion au répéteur",
   "login_roomLogin": "Connexion Salle",
   "login_password": "Mot de passe",
   "login_enterPassword": "Entrez votre mot de passe",
   "login_savePassword": "Sauvegarder le mot de passe",
   "login_savePasswordSubtitle": "Le mot de passe sera stocké en toute sécurité sur cet appareil.",
-  "login_repeaterDescription": "Entrez le mot de passe du répétiteur pour accéder aux paramètres et à l'état.",
+  "login_repeaterDescription": "Entrez le mot de passe du répéteur pour accéder aux paramètres et à l'état.",
   "login_roomDescription": "Entrez le mot de passe de la pièce pour accéder aux paramètres et à l'état.",
   "login_routing": "Redirection",
   "login_routingMode": "Mode de routage",
@@ -871,17 +871,17 @@
   },
   "path_tooLong": "Le chemin est trop long. Maximum 64 sauts autorisés.",
   "path_setPath": "Définir le chemin",
-  "repeater_management": "Gestion des répétiteurs",
+  "repeater_management": "Gestion des répéteurs",
   "repeater_managementTools": "Outils de Gestion",
   "repeater_status": "État",
-  "repeater_statusSubtitle": "Afficher l'état, les statistiques et les voisins du répétiteur",
+  "repeater_statusSubtitle": "Afficher l'état, les statistiques et les voisins du répéteur",
   "repeater_telemetry": "Télémetrie",
   "repeater_telemetrySubtitle": "Afficher la télémétrie des capteurs et les statistiques du système",
   "repeater_cli": "CLI",
-  "repeater_cliSubtitle": "Envoyer des commandes au répétiteur",
+  "repeater_cliSubtitle": "Envoyer des commandes au répéteur",
   "repeater_settings": "Paramètres",
-  "repeater_settingsSubtitle": "Configurer les paramètres du répétiteur",
-  "repeater_statusTitle": "État du répétiteur",
+  "repeater_settingsSubtitle": "Configurer les paramètres du répéteur",
+  "repeater_statusTitle": "État du répéteur",
   "repeater_routingMode": "Mode de routage",
   "repeater_autoUseSavedPath": "Auto (utiliser le chemin sauvegardé)",
   "repeater_forceFloodMode": "Mode tout le réseau forcé",
@@ -976,10 +976,10 @@
       }
     }
   },
-  "repeater_settingsTitle": "Paramètres du répétiteur",
+  "repeater_settingsTitle": "Paramètres du répéteur",
   "repeater_basicSettings": "Paramètres de base",
-  "repeater_repeaterName": "Nom du répétiteur",
-  "repeater_repeaterNameHelper": "Afficher le nom de ce répétiteur",
+  "repeater_repeaterName": "Nom du répéteur",
+  "repeater_repeaterNameHelper": "Afficher le nom de ce répéteur",
   "repeater_adminPassword": "Mot de passe Administrateur",
   "repeater_adminPasswordHelper": "Mot de passe d'accès complet",
   "repeater_guestPassword": "Mot de passe invité",
@@ -999,7 +999,7 @@
   "repeater_longitudeHelper": "Degrés décimaux (par exemple, -122,4194)",
   "repeater_features": "Fonctionnalités",
   "repeater_packetForwarding": "Transfert de paquets",
-  "repeater_packetForwardingSubtitle": "Activer le répétiteur pour transmettre des paquets",
+  "repeater_packetForwardingSubtitle": "Activer le répéteur pour transmettre des paquets",
   "repeater_guestAccess": "Accès Invité",
   "repeater_guestAccessSubtitle": "Autoriser l'accès invité en lecture seule",
   "repeater_privacyMode": "Mode de confidentialité",
@@ -1026,14 +1026,14 @@
   "repeater_encryptedAdvertInterval": "Intervalle d'annonces cryptées",
   "repeater_dangerZone": "Zone dangereuse",
   "repeater_rebootRepeater": "Redémarrer Répéteur",
-  "repeater_rebootRepeaterSubtitle": "Réinitialiser l'appareil répétiteur",
-  "repeater_rebootRepeaterConfirm": "Êtes-vous sûr de vouloir redémarrer ce répétiteur ?",
+  "repeater_rebootRepeaterSubtitle": "Réinitialiser l'appareil répéteur",
+  "repeater_rebootRepeaterConfirm": "Êtes-vous sûr de vouloir redémarrer ce répéteur ?",
   "repeater_regenerateIdentityKey": "Ré générer la clé d'identité",
   "repeater_regenerateIdentityKeySubtitle": "Générer une nouvelle paire de clés publique/privée",
-  "repeater_regenerateIdentityKeyConfirm": "Cela générera une nouvelle identité pour le répétiteur. Continuer ?",
+  "repeater_regenerateIdentityKeyConfirm": "Cela générera une nouvelle identité pour le répéteur. Continuer ?",
   "repeater_eraseFileSystem": "Supprimer le système de fichiers",
-  "repeater_eraseFileSystemSubtitle": "Formater le système de fichiers du répétiteur",
-  "repeater_eraseFileSystemConfirm": "AVERTISSEMENT : Cela effacera toutes les données du répétiteur. Cela ne peut pas être annulé !",
+  "repeater_eraseFileSystemSubtitle": "Formater le système de fichiers du répéteur",
+  "repeater_eraseFileSystemConfirm": "AVERTISSEMENT : Cela effacera toutes les données du répéteur. Cela ne peut pas être annulé !",
   "repeater_eraseSerialOnly": "Erase n'est disponible que via la console série.",
   "repeater_commandSent": "Commande envoyée : {command}",
   "@repeater_commandSent": {
@@ -1085,7 +1085,7 @@
       }
     }
   },
-  "repeater_cliTitle": "Répétiteur CLI",
+  "repeater_cliTitle": "Répéteur CLI",
   "repeater_debugNextCommand": "Déboguer Prochaine Commande",
   "repeater_commandHelp": "Aide",
   "repeater_clearHistory": "Effacer l'historique",
@@ -1119,13 +1119,13 @@
   "repeater_cliHelpClearStats": "Réinitialise divers compteurs de statistiques à zéro.",
   "repeater_cliHelpSetAf": "Définit le facteur de temps d'air.",
   "repeater_cliHelpSetTx": "Définit la puissance de transmission LoRa en dBm (réinitialisation requise pour appliquer).",
-  "repeater_cliHelpSetRepeat": "Active ou désactive le rôle du répétiteur pour ce nœud.",
+  "repeater_cliHelpSetRepeat": "Active ou désactive le rôle du répéteur pour ce nœud.",
   "repeater_cliHelpSetAllowReadOnly": "(Room server) Si \"activé\", alors un mot de passe vide permettra la connexion, mais ne permettra pas de publier dans la pièce. (lecture seule uniquement)",
   "repeater_cliHelpSetFloodMax": "Définit le nombre maximal de sauts pour les paquets de balayage entrants (si >= max, le paquet n'est pas acheminé).",
   "repeater_cliHelpSetIntThresh": "Définit le seuil d'interférence (en dB). La valeur par défaut est de 14. Définir sur 0 désactive la détection des interférences de canal.",
   "repeater_cliHelpSetAgcResetInterval": "Définit l'intervalle pour réinitialiser le contrôleur de gain automatique. Mettez à 0 pour désactiver.",
   "repeater_cliHelpSetMultiAcks": "Active ou désactive la fonctionnalité « double ACKs ».",
-  "repeater_cliHelpSetAdvertInterval": "Définit l'intervalle du minuteur pour envoyer un paquet d'annonce local (sans relais). Définir sur 0 pour désactiver.",
+  "repeater_cliHelpSetAdvertInterval": "Définit l'intervalle entre chaque émission d'une annonce locale (sans relais). Définir sur 0 pour désactiver.",
   "repeater_cliHelpSetFloodAdvertInterval": "Définit l'intervalle du minuteur en heures pour envoyer un paquet d'annonce massive. Définir sur 0 pour désactiver.",
   "repeater_cliHelpSetGuestPassword": "Définit/met à jour le mot de passe de l'invité. (pour les répéteurs, les connexions d'invités peuvent envoyer la requête \"Get Stats\")",
   "repeater_cliHelpSetName": "Définit le nom de l'annonce.",
@@ -1147,7 +1147,7 @@
   "repeater_cliHelpLogStart": "Démarre l'enregistrement des paquets dans le système de fichiers.",
   "repeater_cliHelpLogStop": "Arrêter de journaliser les paquets vers le système de fichiers.",
   "repeater_cliHelpLogErase": "Supprime les journaux de paquets du système de fichiers.",
-  "repeater_cliHelpNeighbors": "Affiche une liste d'autres nœuds répétiteurs entendus via des annonces sans relais. Chaque ligne est id-préfixe-hexadécimal:timestamp:snr-fois-4",
+  "repeater_cliHelpNeighbors": "Affiche une liste d'autres nœuds répéteurs entendus via des annonces sans relais. Chaque ligne est id-préfixe-hexadécimal:timestamp:snr-fois-4",
   "repeater_cliHelpNeighborRemove": "Supprime la première entrée correspondante (par préfixe de clé publique (hexadécimal)) de la liste des voisins.",
   "repeater_cliHelpRegion": "(série uniquement) Liste toutes les régions définies et les autorisations actuelles d'annonces sur tout le réseau (flood).",
   "repeater_cliHelpRegionLoad": "REMARQUE : il s'agit d'une invocation multi-commande spéciale. Chaque commande subséquente est un nom de région (indenté avec des espaces pour indiquer la hiérarchie parent, avec un minimum d'un espace). Terminé par l'envoi d'une ligne vide/commande.",
@@ -1171,8 +1171,8 @@
   "repeater_settingsCategory": "Paramètres",
   "repeater_bridge": "Pont",
   "repeater_logging": "Journalisation",
-  "repeater_neighborsRepeaterOnly": "Voisins (Uniquement répétiteur)",
-  "repeater_regionManagementRepeaterOnly": "Gestion des régions (uniquement pour le répétiteur)",
+  "repeater_neighborsRepeaterOnly": "Voisins (Uniquement répéteur)",
+  "repeater_regionManagementRepeaterOnly": "Gestion des régions (uniquement pour le répéteur)",
   "repeater_regionNote": "Les commandes de région ont été introduites pour gérer les définitions et les autorisations des régions.",
   "repeater_gpsManagement": "Gestion GPS",
   "repeater_gpsNote": "La commande GPS a été introduite pour gérer les sujets liés à la localisation.",
@@ -1241,7 +1241,7 @@
   "channelPath_title": "Chemin de paquet",
   "channelPath_viewMap": "Afficher la carte",
   "channelPath_otherObservedPaths": "Autres chemins observés",
-  "channelPath_repeaterHops": "Sauts du répétiteur",
+  "channelPath_repeaterHops": "Sauts du répéteur",
   "channelPath_noHopDetails": "Les détails de l'envoi ne sont pas fournis pour ce paquet.",
   "channelPath_messageDetails": "Détails du message",
   "channelPath_senderLabel": "Expéditeur",
@@ -1306,7 +1306,7 @@
     }
   },
   "channelPath_mapTitle": "Carte du chemin",
-  "channelPath_noRepeaterLocations": "Aucune position de répétiteur disponible pour ce chemin.",
+  "channelPath_noRepeaterLocations": "Aucune position de répéteur disponible pour ce chemin.",
   "channelPath_primaryPath": "Chemin {index} (Principal)",
   "@channelPath_primaryPath": {
     "placeholders": {
@@ -1356,12 +1356,12 @@
       }
     }
   },
-  "repeater_neighbours": "Voisins",
-  "repeater_neighboursSubtitle": "Afficher les voisins de saut nuls.",
+  "repeater_neighbors": "Voisins",
+  "repeater_neighborsSubtitle": "Afficher les voisins de saut nuls.",
   "neighbors_receivedData": "Données des voisins reçues",
   "neighbors_requestTimedOut": "Les voisins demandent un délai.",
   "neighbors_errorLoading": "Erreur lors du chargement des voisins : {error}",
-  "neighbors_repeatersNeighbours": "Répéteurs Voisins",
+  "neighbors_repeatersNeighbors": "Répéteurs Voisins",
   "neighbors_noData": "Aucune donnée concernant les voisins disponible.",
   "channels_createPrivateChannelDesc": "Sécurisé avec une clé secrète.",
   "channels_joinPrivateChannel": "Rejoindre un Canal Privé",
@@ -1558,9 +1558,9 @@
   "appSettings_languageRu": "Russe",
   "contacts_clipboardEmpty": "Le presse-papiers est vide.",
   "contacts_contactImported": "Le contact a été importé.",
-  "contacts_floodAdvert": "Annonce de crue",
+  "contacts_floodAdvert": "Annonce à tout le réseau",
   "contacts_contactImportFailed": "Échec de l'importation du contact.",
-  "contacts_zeroHopAdvert": "Annonce Zero Hop",
+  "contacts_zeroHopAdvert": "Annonce Zero saut",
   "contacts_copyAdvertToClipboard": "Copier l'annonce dans le presse-papiers",
   "contacts_addContactFromClipboard": "Ajouter un contact depuis le presse-papiers",
   "contacts_ShareContact": "Copier le contact dans le presse-papiers",
@@ -1575,7 +1575,6 @@
   "notification_newNodesCount": "{count} {count, plural, =1{nouveau nœud} other{nouveaux nœuds}}",
   "notification_newTypeDiscovered": "Nouveau {contactType} découvert",
   "notification_receivedNewMessage": "Nouveau message reçu",
-  "contacts_zeroHopContactAdvertFailed": "Échec de l'envoi du contact.",
   "settings_gpxExportRepeaters": "Exporter les répéteurs / serveur de salle au format GPX",
   "settings_gpxExportRepeatersSubtitle": "Exporte les répéteurs / roomserver avec une localisation vers un fichier GPX.",
   "settings_gpxExportNoContacts": "Aucun contact à exporter.",
@@ -1591,6 +1590,15 @@
   "settings_gpxExportAllContacts": "Tous les emplacements des contacts",
   "settings_gpxExportShareText": "Données de carte exportées à partir de meshcore-open",
   "settings_gpxExportShareSubject": "meshcore-open exporter les données de carte GPX",
-  "pathTrace_someHopsNoLocation": "Une ou plusieurs des houblons manquent d'une localisation !"
-
+  "pathTrace_someHopsNoLocation": "Un ou plusieurs des sauts manquent d'une localisation !",
+  "map_tapToAdd": "Appuyez sur les nœuds pour les ajouter au chemin.",
+  "pathTrace_clearTooltip": "Effacer le chemin",
+  "map_pathTraceCancelled": "Traçage de chemin annulé",
+  "map_removeLast": "Supprimer le dernier",
+  "map_runTrace": "Exécuter la traçage de chemin",
+  "scanner_bluetoothOffMessage": "Veuillez activer le Bluetooth pour rechercher des appareils.",
+  "scanner_bluetoothOff": "Le Bluetooth est désactivé.",
+  "scanner_enableBluetooth": "Activer le Bluetooth",
+  "snrIndicator_lastSeen": "Dernière fois vu",
+  "snrIndicator_nearByRepeaters": "Répéteurs à proximité"
 }

lib/l10n/app_it.arb

@@ -1356,12 +1356,12 @@
       }
     }
   },
-  "repeater_neighbours": "Vicini",
-  "repeater_neighboursSubtitle": "Visualizza vicini di salto pari a zero.",
+  "repeater_neighbors": "Vicini",
+  "repeater_neighborsSubtitle": "Visualizza vicini di salto pari a zero.",
   "neighbors_receivedData": "Ricevute dati vicini",
   "neighbors_requestTimedOut": "I vicini richiedono un timeout.",
   "neighbors_errorLoading": "Errore nel caricamento dei vicini: {error}",
-  "neighbors_repeatersNeighbours": "Ripetitori Vicini",
+  "neighbors_repeatersNeighbors": "Ripetitori Vicini",
   "neighbors_noData": "Nessun dato sugli vicini disponibile.",
   "channels_createPrivateChannel": "Crea un Canale Privato",
   "channels_createPrivateChannelDesc": "Protetta con una chiave segreta.",
@@ -1575,7 +1575,6 @@
   "notification_newNodesCount": "{count} {count, plural, =1{nuovo nodo} other{nuovi nodi}}",
   "notification_newTypeDiscovered": "Nuovo {contactType} scoperto",
   "notification_receivedNewMessage": "Nuovo messaggio ricevuto",
-  "contacts_contactAdvertCopied": "Annuncio copiato negli Appunti.",
   "settings_gpxExportRepeaters": "Esporta ripetitori / server di stanza in GPX",
   "settings_gpxExportContacts": "Esporta compagni in GPX",
   "settings_gpxExportSuccess": "Esportazione del file GPX completata con successo.",
@@ -1591,6 +1590,15 @@
   "settings_gpxExportAllContacts": "Tutte le posizioni dei contatti",
   "settings_gpxExportShareText": "Dati mappa esportati da meshcore-open",
   "settings_gpxExportShareSubject": "meshcore-open esportazione dati mappa GPX",
-  "pathTrace_someHopsNoLocation": "Uno o più dei luppoli mancano di una posizione!"
-
+  "pathTrace_someHopsNoLocation": "Uno o più dei luppoli mancano di una posizione!",
+  "map_removeLast": "Rimuovi ultimo",
+  "map_pathTraceCancelled": "Tracciamento del percorso annullato.",
+  "pathTrace_clearTooltip": "Pulisci percorso",
+  "map_runTrace": "Esegui Path Trace",
+  "map_tapToAdd": "Tocca i nodi per aggiungerli al percorso.",
+  "scanner_bluetoothOff": "Il Bluetooth è disattivato.",
+  "scanner_bluetoothOffMessage": "Si prega di attivare il Bluetooth per effettuare la scansione dei dispositivi.",
+  "scanner_enableBluetooth": "Abilita il Bluetooth",
+  "snrIndicator_nearByRepeaters": "Ripetitori vicini",
+  "snrIndicator_lastSeen": "Ultimo accesso"
 }

lib/l10n/app_localizations.dart

@@ -376,6 +376,24 @@ abstract class AppLocalizations {
   /// **'Scan'**
   String get scanner_scan;
 
+  /// No description provided for @scanner_bluetoothOff.
+  ///
+  /// In en, this message translates to:
+  /// **'Bluetooth is off'**
+  String get scanner_bluetoothOff;
+
+  /// No description provided for @scanner_bluetoothOffMessage.
+  ///
+  /// In en, this message translates to:
+  /// **'Please turn on Bluetooth to scan for devices'**
+  String get scanner_bluetoothOffMessage;
+
+  /// No description provided for @scanner_enableBluetooth.
+  ///
+  /// In en, this message translates to:
+  /// **'Enable Bluetooth'**
+  String get scanner_enableBluetooth;
+
   /// No description provided for @device_quickSwitch.
   ///
   /// In en, this message translates to:
@@ -2518,6 +2536,30 @@ abstract class AppLocalizations {
   /// **'Manage Repeater'**
   String get map_manageRepeater;
 
+  /// No description provided for @map_tapToAdd.
+  ///
+  /// In en, this message translates to:
+  /// **'Tap on nodes to add them to the path.'**
+  String get map_tapToAdd;
+
+  /// No description provided for @map_runTrace.
+  ///
+  /// In en, this message translates to:
+  /// **'Run Path Trace'**
+  String get map_runTrace;
+
+  /// No description provided for @map_removeLast.
+  ///
+  /// In en, this message translates to:
+  /// **'Remove Last'**
+  String get map_removeLast;
+
+  /// No description provided for @map_pathTraceCancelled.
+  ///
+  /// In en, this message translates to:
+  /// **'Path trace cancelled.'**
+  String get map_pathTraceCancelled;
+
   /// No description provided for @mapCache_title.
   ///
   /// In en, this message translates to:
@@ -2997,17 +3039,17 @@ abstract class AppLocalizations {
   /// **'Send commands to the repeater'**
   String get repeater_cliSubtitle;
 
-  /// No description provided for @repeater_neighbours.
+  /// No description provided for @repeater_neighbors.
   ///
   /// In en, this message translates to:
   /// **'Neighbors'**
-  String get repeater_neighbours;
+  String get repeater_neighbors;
 
-  /// No description provided for @repeater_neighboursSubtitle.
+  /// No description provided for @repeater_neighborsSubtitle.
   ///
   /// In en, this message translates to:
   /// **'View zero hop neighbors.'**
-  String get repeater_neighboursSubtitle;
+  String get repeater_neighborsSubtitle;
 
   /// No description provided for @repeater_settings.
   ///
@@ -4151,13 +4193,13 @@ abstract class AppLocalizations {
   /// No description provided for @neighbors_receivedData.
   ///
   /// In en, this message translates to:
-  /// **'Received Neighbours Data'**
+  /// **'Received Neighbors Data'**
   String get neighbors_receivedData;
 
   /// No description provided for @neighbors_requestTimedOut.
   ///
   /// In en, this message translates to:
-  /// **'Neighbours request timed out.'**
+  /// **'Neighbors request timed out.'**
   String get neighbors_requestTimedOut;
 
   /// No description provided for @neighbors_errorLoading.
@@ -4166,16 +4208,16 @@ abstract class AppLocalizations {
   /// **'Error loading neighbors: {error}'**
   String neighbors_errorLoading(String error);
 
-  /// No description provided for @neighbors_repeatersNeighbours.
+  /// No description provided for @neighbors_repeatersNeighbors.
   ///
   /// In en, this message translates to:
-  /// **'Repeaters Neighbours'**
-  String get neighbors_repeatersNeighbours;
+  /// **'Repeaters Neighbors'**
+  String get neighbors_repeatersNeighbors;
 
   /// No description provided for @neighbors_noData.
   ///
   /// In en, this message translates to:
-  /// **'No neighbours data available.'**
+  /// **'No neighbors data available.'**
   String get neighbors_noData;
 
   /// No description provided for @neighbors_unknownContact.
@@ -4730,6 +4772,12 @@ abstract class AppLocalizations {
   /// **'One or more of the hops is missing a location!'**
   String get pathTrace_someHopsNoLocation;
 
+  /// No description provided for @pathTrace_clearTooltip.
+  ///
+  /// In en, this message translates to:
+  /// **'Clear path.'**
+  String get pathTrace_clearTooltip;
+
   /// No description provided for @contacts_pathTrace.
   ///
   /// In en, this message translates to:
@@ -4987,6 +5035,18 @@ abstract class AppLocalizations {
   /// In en, this message translates to:
   /// **'meshcore-open GPX map data export'**
   String get settings_gpxExportShareSubject;
+
+  /// No description provided for @snrIndicator_nearByRepeaters.
+  ///
+  /// In en, this message translates to:
+  /// **'Nearby Repeaters'**
+  String get snrIndicator_nearByRepeaters;
+
+  /// No description provided for @snrIndicator_lastSeen.
+  ///
+  /// In en, this message translates to:
+  /// **'Last seen'**
+  String get snrIndicator_lastSeen;
 }
 
 class _AppLocalizationsDelegate

lib/l10n/app_localizations_bg.dart

@@ -143,6 +143,16 @@ class AppLocalizationsBg extends AppLocalizations {
   @override
   String get scanner_scan => 'Сканирай';
 
+  @override
+  String get scanner_bluetoothOff => 'Bluetooth е изключен.';
+
+  @override
+  String get scanner_bluetoothOffMessage =>
+      'Моля, активирайте Bluetooth, за да сканирате за устройства.';
+
+  @override
+  String get scanner_enableBluetooth => 'Активирайте Bluetooth';
+
   @override
   String get device_quickSwitch => 'Бързо превключване';
 
@@ -1363,6 +1373,19 @@ class AppLocalizationsBg extends AppLocalizations {
   @override
   String get map_manageRepeater => 'Управление на Повтарящ се Елемент';
 
+  @override
+  String get map_tapToAdd =>
+      'Натиснете върху възлите, за да ги добавите към пътя.';
+
+  @override
+  String get map_runTrace => 'Изпълни Път на Следване';
+
+  @override
+  String get map_removeLast => 'Премахни Последно';
+
+  @override
+  String get map_pathTraceCancelled => 'Отменен е следването на пътя.';
+
   @override
   String get mapCache_title => 'Кеш на офлайн карти';
 
@@ -1658,10 +1681,10 @@ class AppLocalizationsBg extends AppLocalizations {
   String get repeater_cliSubtitle => 'Изпрати команди към ретранслатора';
 
   @override
-  String get repeater_neighbours => 'Съседи';
+  String get repeater_neighbors => 'Съседи';
 
   @override
-  String get repeater_neighboursSubtitle =>
+  String get repeater_neighborsSubtitle =>
       'Преглед на съседни възли с нулев скок.';
 
   @override
@@ -2361,7 +2384,7 @@ class AppLocalizationsBg extends AppLocalizations {
   }
 
   @override
-  String get neighbors_repeatersNeighbours => 'Повторители Съседи';
+  String get neighbors_repeatersNeighbors => 'Повторители Съседи';
 
   @override
   String get neighbors_noData => 'Няма налични данни за съседи.';
@@ -2699,6 +2722,9 @@ class AppLocalizationsBg extends AppLocalizations {
   String get pathTrace_someHopsNoLocation =>
       'Един или повече от хмелите липсва местоположение!';
 
+  @override
+  String get pathTrace_clearTooltip => 'Изчисти пътя';
+
   @override
   String get contacts_pathTrace => 'Пътен проследяване';
 
@@ -2868,4 +2894,10 @@ class AppLocalizationsBg extends AppLocalizations {
   @override
   String get settings_gpxExportShareSubject =>
       'meshcore-open износ на данни за карта в формат GPX';
+
+  @override
+  String get snrIndicator_nearByRepeaters => 'Близки повтарящи се устройства';
+
+  @override
+  String get snrIndicator_lastSeen => 'Последно видян';
 }

lib/l10n/app_localizations_de.dart

@@ -143,6 +143,16 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get scanner_scan => 'Scannen';
 
+  @override
+  String get scanner_bluetoothOff => 'Bluetooth ist deaktiviert.';
+
+  @override
+  String get scanner_bluetoothOffMessage =>
+      'Bitte aktivieren Sie Bluetooth, um nach Geräten zu suchen.';
+
+  @override
+  String get scanner_enableBluetooth => 'Bluetooth aktivieren';
+
   @override
   String get device_quickSwitch => 'Schnelles Umschalten';
 
@@ -244,10 +254,10 @@ class AppLocalizationsDe extends AppLocalizations {
   String get settings_actions => 'Aktionen';
 
   @override
-  String get settings_sendAdvertisement => 'Sende eine Ankündigung';
+  String get settings_sendAdvertisement => 'Sende Ankündigung';
 
   @override
-  String get settings_sendAdvertisementSubtitle => 'Sende Ankündigung';
+  String get settings_sendAdvertisementSubtitle => 'Sende eine Ankündigung';
 
   @override
   String get settings_advertisementSent => 'Ankündigung gesendet';
@@ -267,7 +277,7 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get settings_refreshContactsSubtitle =>
-      'Kontakte-Liste vom Gerät neu laden';
+      'Kontakt-Liste vom Gerät neu laden';
 
   @override
   String get settings_rebootDevice => 'Gerät neu starten';
@@ -1086,7 +1096,7 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get chat_recentAckPaths =>
-      'Aktuelle ACK-Pfade (tasten, um zu verwenden):';
+      'Aktuelle ACK-Pfade (antippen, um zu verwenden):';
 
   @override
   String get chat_pathHistoryFull =>
@@ -1117,7 +1127,7 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get chat_noPathHistoryYet =>
-      'Keine eine Pfadhistorie vorhanden.\nSende eine Nachricht, um Pfade zu entdecken.';
+      'Keine Pfadhistorie vorhanden.\nSende eine Nachricht, um Pfade zu entdecken.';
 
   @override
   String get chat_pathActions => 'Pfadaktionen:';
@@ -1362,6 +1372,19 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get map_manageRepeater => 'Repeater verwalten';
 
+  @override
+  String get map_tapToAdd =>
+      'Tippen Sie auf Knoten, um sie zum Pfad hinzuzufügen.';
+
+  @override
+  String get map_runTrace => 'Pfadverlauf ausführen';
+
+  @override
+  String get map_removeLast => 'Letztes Entfernen';
+
+  @override
+  String get map_pathTraceCancelled => 'Pfadverfolgung abgebrochen.';
+
   @override
   String get mapCache_title => 'Offline-Karten-Cache';
 
@@ -1418,7 +1441,7 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String mapCache_estimatedTiles(int count) {
-    return 'Geschätzte Fliesen: $count';
+    return 'Geschätzte Kacheln: $count';
   }
 
   @override
@@ -1592,7 +1615,7 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get path_hexPrefixInstructions =>
-      'Gebe für jeden Hopfen 2-stellige Hex-Präfixe ein, getrennt durch Kommas.';
+      'Gebe für jeden Zwischen-Hop das 2-stellige Hex-Präfix ein, getrennt durch Kommas.';
 
   @override
   String get path_hexPrefixExample =>
@@ -1657,10 +1680,10 @@ class AppLocalizationsDe extends AppLocalizations {
   String get repeater_cliSubtitle => 'Sende Befehle an den Repeater';
 
   @override
-  String get repeater_neighbours => 'Nachbarn';
+  String get repeater_neighbors => 'Nachbarn';
 
   @override
-  String get repeater_neighboursSubtitle => 'Anzahl der Hop-Nachbarn anzeigen.';
+  String get repeater_neighborsSubtitle => 'Anzahl der Hop-Nachbarn anzeigen.';
 
   @override
   String get repeater_settings => 'Einstellungen';
@@ -1689,7 +1712,7 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get repeater_statusRequestTimeout =>
-      'Statusanfrage zeitweise fehlgeschlagen.';
+      'Statusanfrage durch Timeout fehlgeschlagen.';
 
   @override
   String repeater_errorLoadingStatus(String error) {
@@ -1766,7 +1789,7 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String repeater_duplicatesFloodDirect(String flood, String direct) {
-    return 'Überflut: $flood, Direkt: $direct';
+    return 'Flut: $flood, Direkt: $direct';
   }
 
   @override
@@ -1797,7 +1820,7 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get repeater_guestPasswordHelper =>
-      'Schreibgeschützter Zugriffspasswort';
+      'Schreibgeschütztes Zugriffspasswort';
 
   @override
   String get repeater_radioSettings => 'Funk Einstellungen';
@@ -1992,7 +2015,7 @@ class AppLocalizationsDe extends AppLocalizations {
   String get repeater_cliTitle => 'Repeater CLI';
 
   @override
-  String get repeater_debugNextCommand => 'Fehlersuche Nächster Befehl';
+  String get repeater_debugNextCommand => 'Fehlersuche des nächsten Befehls';
 
   @override
   String get repeater_commandHelp => 'Hilfe';
@@ -2005,7 +2028,7 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get repeater_typeCommandOrUseQuick =>
-      'Geben Sie einen Befehl unten ein oder verwenden Sie Schnellbefehle';
+      'Geben Sie unten einen Befehl ein oder verwenden Sie die Schnellbefehle';
 
   @override
   String get repeater_enterCommandHint => 'Geben Sie den Befehl ein...';
@@ -2131,7 +2154,7 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get repeater_cliHelpSetRxDelay =>
-      'Sets (experimentell) als Basis (muss > 1 sein für den Effekt) zur Anwendung einer leichten Verzögerung bei empfangenen Paketen, basierend auf Signalstärke/Punktzahl. Auf 0 setzen, um die Funktion zu deaktivieren.';
+      'Fügt eine leichte Verzögerung bei empfangenen Paketen hinzu, basierend auf Signalstärke/Punktzahl. Auf 0 setzen, um die Funktion zu deaktivieren.';
 
   @override
   String get repeater_cliHelpSetTxDelay =>
@@ -2175,7 +2198,7 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get repeater_cliHelpGetBridgeType =>
-      'Ruft Brückentyp none, rs232, espnow ab.';
+      'Ruft Brückentyp: none, rs232, espnow ab.';
 
   @override
   String get repeater_cliHelpLogStart =>
@@ -2202,7 +2225,7 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get repeater_cliHelpRegionLoad =>
-      'Hinweis: Dies ist ein spezieller Mehrbefehl-Aufruf. Jeder nachfolgende Befehl ist ein Regionsname (eingedruckt mit Leerzeichen zur Angabe der übergeordneten Hierarchie, mit mindestens einem Leerzeichen). Beendet durch das Senden einer Leerzeile/des Befehls.';
+      'Hinweis: Dies ist ein spezieller Mehrbefehl-Aufruf. Jeder nachfolgende Befehl ist ein Regionsname (eingerückt mit Leerzeichen zur Angabe der übergeordneten Hierarchie, mit mindestens einem Leerzeichen). Beendet durch das Senden einer Leerzeile.';
 
   @override
   String get repeater_cliHelpRegionGet =>
@@ -2351,10 +2374,11 @@ class AppLocalizationsDe extends AppLocalizations {
   }
 
   @override
-  String get neighbors_receivedData => 'Empfangene Nachbarendaten';
+  String get neighbors_receivedData => 'Empfangene Nachbarsdaten';
 
   @override
-  String get neighbors_requestTimedOut => 'Nachbarn melden zeitweise Ausfall.';
+  String get neighbors_requestTimedOut =>
+      'Anfrage durch Timeout fehlgeschlagen.';
 
   @override
   String neighbors_errorLoading(String error) {
@@ -2362,19 +2386,19 @@ class AppLocalizationsDe extends AppLocalizations {
   }
 
   @override
-  String get neighbors_repeatersNeighbours => 'Nachbarn';
+  String get neighbors_repeatersNeighbors => 'Nachbarn';
 
   @override
-  String get neighbors_noData => 'Keine Nachbardaten verfügbar.';
+  String get neighbors_noData => 'Keine Nachbarsdaten verfügbar.';
 
   @override
   String neighbors_unknownContact(String pubkey) {
-    return 'Unbekannte $pubkey';
+    return 'Unbekannt $pubkey';
   }
 
   @override
   String neighbors_heardAgo(String time) {
-    return 'Hörte: $time vor her.';
+    return 'Gehört vor: $time';
   }
 
   @override
@@ -2394,7 +2418,7 @@ class AppLocalizationsDe extends AppLocalizations {
       'Die Detailangaben für dieses Paket sind nicht verfügbar.';
 
   @override
-  String get channelPath_messageDetails => 'Nachrichtsdetails';
+  String get channelPath_messageDetails => 'Nachrichtendetails';
 
   @override
   String get channelPath_senderLabel => 'Sender';
@@ -2630,14 +2654,14 @@ class AppLocalizationsDe extends AppLocalizations {
       'Füge einen Hashtag-Kanal für diese Community hinzu';
 
   @override
-  String get community_selectCommunity => 'Wählen Sie Community';
+  String get community_selectCommunity => 'Wählen Sie eine Community';
 
   @override
   String get community_regularHashtag => 'Regulärer Hashtag';
 
   @override
   String get community_regularHashtagDesc =>
-      'Öffentliches Hashtag (jeder kann teilnehmen)';
+      'Öffentlicher Hashtag (jeder kann teilnehmen)';
 
   @override
   String get community_communityHashtag => 'Community Hashtag';
@@ -2682,7 +2706,7 @@ class AppLocalizationsDe extends AppLocalizations {
   String get listFilter_roomServers => 'Raumserver';
 
   @override
-  String get listFilter_unreadOnly => 'Nur nicht gelesen';
+  String get listFilter_unreadOnly => 'Nicht gelesen';
 
   @override
   String get listFilter_newGroup => 'Neue Gruppe';
@@ -2701,7 +2725,10 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get pathTrace_someHopsNoLocation =>
-      'Eine oder mehrere der Hopfen fehlen einen Standort!';
+      'Bei einer oder mehreren Knoten fehlt der Standort!';
+
+  @override
+  String get pathTrace_clearTooltip => 'Pfad löschen';
 
   @override
   String get contacts_pathTrace => 'Pfadverfolgung';
@@ -2743,14 +2770,14 @@ class AppLocalizationsDe extends AppLocalizations {
       'Kontakt konnte nicht importiert werden';
 
   @override
-  String get contacts_zeroHopAdvert => 'Zero-Hop-Anzeige';
+  String get contacts_zeroHopAdvert => 'Zero-Hop-Ankündigung';
 
   @override
-  String get contacts_floodAdvert => 'Überflutungsanzeige';
+  String get contacts_floodAdvert => 'Flut-Ankündigung';
 
   @override
   String get contacts_copyAdvertToClipboard =>
-      'Werbung in die Zwischenablage kopieren';
+      'Ankündigung in die Zwischenablage kopieren';
 
   @override
   String get contacts_addContactFromClipboard =>
@@ -2776,7 +2803,7 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get contacts_contactAdvertCopyFailed =>
-      'Kopieren des Werbeinhalts in die Zwischenablage fehlgeschlagen.';
+      'Kopieren der Ankündigung in die Zwischenablage fehlgeschlagen.';
 
   @override
   String get notification_activityTitle => 'MeshCore Aktivität';
@@ -2824,28 +2851,28 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get settings_gpxExportRepeaters =>
-      'Repeater und Raumserver nach GPX exportieren';
+      'Repeater und Raumserver als GPX exportieren';
 
   @override
   String get settings_gpxExportRepeatersSubtitle =>
       'Exportiert Repeater und Raumserver mit einem Standort in eine GPX-Datei.';
 
   @override
-  String get settings_gpxExportContacts => 'Begleiter nach GPX exportieren';
+  String get settings_gpxExportContacts => 'Kontakte als GPX exportieren';
 
   @override
   String get settings_gpxExportContactsSubtitle =>
-      'Exportiert Begleiter mit einem Ort in eine GPX-Datei.';
+      'Exportiert Kontakte mit einem Ort in eine GPX-Datei.';
 
   @override
-  String get settings_gpxExportAll => 'Alle Kontakte nach GPX exportieren';
+  String get settings_gpxExportAll => 'Alle Knoten als GPX exportieren';
 
   @override
   String get settings_gpxExportAllSubtitle =>
-      'Exportiert alle Kontakte mit einem Standort in eine GPX-Datei.';
+      'Exportiert alle Knoten mit einem Standort in eine GPX-Datei.';
 
   @override
-  String get settings_gpxExportSuccess => 'Erfolgreich GPX-Datei exportiert.';
+  String get settings_gpxExportSuccess => 'GPX-Datei erfolgreich exportiert.';
 
   @override
   String get settings_gpxExportNoContacts => 'Keine Kontakte zum Exportieren.';
@@ -2863,16 +2890,22 @@ class AppLocalizationsDe extends AppLocalizations {
       'Repeater- und Raumserver-Standorte';
 
   @override
-  String get settings_gpxExportChat => 'Begleiterstandorte';
+  String get settings_gpxExportChat => 'Kontaktstandorte';
 
   @override
   String get settings_gpxExportAllContacts => 'Alle Kontaktstandorte';
 
   @override
   String get settings_gpxExportShareText =>
-      'Kartendaten aus meshcore-open exportiert';
+      'GPX-Kartendaten aus meshcore-open exportiert';
 
   @override
   String get settings_gpxExportShareSubject =>
-      'meshcore-open GPX-Kartendaten exportieren';
+      'GPX-Kartendaten aus meshcore-open exportieren';
+
+  @override
+  String get snrIndicator_nearByRepeaters => 'In der Nähe befindliche Repeater';
+
+  @override
+  String get snrIndicator_lastSeen => 'Zuletzt gesehen';
 }

lib/l10n/app_localizations_en.dart

@@ -142,6 +142,16 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get scanner_scan => 'Scan';
 
+  @override
+  String get scanner_bluetoothOff => 'Bluetooth is off';
+
+  @override
+  String get scanner_bluetoothOffMessage =>
+      'Please turn on Bluetooth to scan for devices';
+
+  @override
+  String get scanner_enableBluetooth => 'Enable Bluetooth';
+
   @override
   String get device_quickSwitch => 'Quick switch';
 
@@ -1342,6 +1352,18 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get map_manageRepeater => 'Manage Repeater';
 
+  @override
+  String get map_tapToAdd => 'Tap on nodes to add them to the path.';
+
+  @override
+  String get map_runTrace => 'Run Path Trace';
+
+  @override
+  String get map_removeLast => 'Remove Last';
+
+  @override
+  String get map_pathTraceCancelled => 'Path trace cancelled.';
+
   @override
   String get mapCache_title => 'Offline Map Cache';
 
@@ -1632,10 +1654,10 @@ class AppLocalizationsEn extends AppLocalizations {
   String get repeater_cliSubtitle => 'Send commands to the repeater';
 
   @override
-  String get repeater_neighbours => 'Neighbors';
+  String get repeater_neighbors => 'Neighbors';
 
   @override
-  String get repeater_neighboursSubtitle => 'View zero hop neighbors.';
+  String get repeater_neighborsSubtitle => 'View zero hop neighbors.';
 
   @override
   String get repeater_settings => 'Settings';
@@ -2311,10 +2333,10 @@ class AppLocalizationsEn extends AppLocalizations {
   }
 
   @override
-  String get neighbors_receivedData => 'Received Neighbours Data';
+  String get neighbors_receivedData => 'Received Neighbors Data';
 
   @override
-  String get neighbors_requestTimedOut => 'Neighbours request timed out.';
+  String get neighbors_requestTimedOut => 'Neighbors request timed out.';
 
   @override
   String neighbors_errorLoading(String error) {
@@ -2322,10 +2344,10 @@ class AppLocalizationsEn extends AppLocalizations {
   }
 
   @override
-  String get neighbors_repeatersNeighbours => 'Repeaters Neighbours';
+  String get neighbors_repeatersNeighbors => 'Repeaters Neighbors';
 
   @override
-  String get neighbors_noData => 'No neighbours data available.';
+  String get neighbors_noData => 'No neighbors data available.';
 
   @override
   String neighbors_unknownContact(String pubkey) {
@@ -2659,6 +2681,9 @@ class AppLocalizationsEn extends AppLocalizations {
   String get pathTrace_someHopsNoLocation =>
       'One or more of the hops is missing a location!';
 
+  @override
+  String get pathTrace_clearTooltip => 'Clear path.';
+
   @override
   String get contacts_pathTrace => 'Path Trace';
 
@@ -2824,4 +2849,10 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get settings_gpxExportShareSubject =>
       'meshcore-open GPX map data export';
+
+  @override
+  String get snrIndicator_nearByRepeaters => 'Nearby Repeaters';
+
+  @override
+  String get snrIndicator_lastSeen => 'Last seen';
 }

lib/l10n/app_localizations_es.dart

@@ -143,6 +143,16 @@ class AppLocalizationsEs extends AppLocalizations {
   @override
   String get scanner_scan => 'Escanea';
 
+  @override
+  String get scanner_bluetoothOff => 'Bluetooth está desactivado.';
+
+  @override
+  String get scanner_bluetoothOffMessage =>
+      'Por favor, active el Bluetooth para escanear dispositivos.';
+
+  @override
+  String get scanner_enableBluetooth => 'Habilitar Bluetooth';
+
   @override
   String get device_quickSwitch => 'Cambiar rápidamente';
 
@@ -1360,6 +1370,18 @@ class AppLocalizationsEs extends AppLocalizations {
   @override
   String get map_manageRepeater => 'Gestionar Repetidor';
 
+  @override
+  String get map_tapToAdd => 'Pulse en los nodos para agregarlos al camino.';
+
+  @override
+  String get map_runTrace => 'Ejecutar Rastreo de Ruta';
+
+  @override
+  String get map_removeLast => 'Eliminar último';
+
+  @override
+  String get map_pathTraceCancelled => 'Rastreo de ruta cancelado.';
+
   @override
   String get mapCache_title => 'Caché de Mapa Offline';
 
@@ -1656,10 +1678,10 @@ class AppLocalizationsEs extends AppLocalizations {
   String get repeater_cliSubtitle => 'Enviar comandos al repetidor';
 
   @override
-  String get repeater_neighbours => 'Vecinos';
+  String get repeater_neighbors => 'Vecinos';
 
   @override
-  String get repeater_neighboursSubtitle => 'Ver vecinos de salto cero.';
+  String get repeater_neighborsSubtitle => 'Ver vecinos de salto cero.';
 
   @override
   String get repeater_settings => 'Configuración';
@@ -2358,7 +2380,7 @@ class AppLocalizationsEs extends AppLocalizations {
   }
 
   @override
-  String get neighbors_repeatersNeighbours => 'Repetidores Vecinos';
+  String get neighbors_repeatersNeighbors => 'Repetidores Vecinos';
 
   @override
   String get neighbors_noData => 'No hay datos de vecinos disponibles.';
@@ -2698,6 +2720,9 @@ class AppLocalizationsEs extends AppLocalizations {
   String get pathTrace_someHopsNoLocation =>
       'Uno o más de los lúpulos carecen de una ubicación';
 
+  @override
+  String get pathTrace_clearTooltip => 'Borrar ruta';
+
   @override
   String get contacts_pathTrace => 'Rastreo de caminos';
 
@@ -2868,4 +2893,10 @@ class AppLocalizationsEs extends AppLocalizations {
   @override
   String get settings_gpxExportShareSubject =>
       'meshcore-open exportación de datos de mapa GPX';
+
+  @override
+  String get snrIndicator_nearByRepeaters => 'Repetidores cercanos';
+
+  @override
+  String get snrIndicator_lastSeen => 'Visto por última vez';
 }

lib/l10n/app_localizations_fr.dart

@@ -143,6 +143,16 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get scanner_scan => 'Scanner';
 
+  @override
+  String get scanner_bluetoothOff => 'Le Bluetooth est désactivé.';
+
+  @override
+  String get scanner_bluetoothOffMessage =>
+      'Veuillez activer le Bluetooth pour rechercher des appareils.';
+
+  @override
+  String get scanner_enableBluetooth => 'Activer le Bluetooth';
+
   @override
   String get device_quickSwitch => 'Basculement rapide';
 
@@ -560,11 +570,11 @@ class AppLocalizationsFr extends AppLocalizations {
   String get appSettings_mapDisplay => 'Affichage de la carte';
 
   @override
-  String get appSettings_showRepeaters => 'Afficher les répétiteurs';
+  String get appSettings_showRepeaters => 'Afficher les répéteurs';
 
   @override
   String get appSettings_showRepeatersSubtitle =>
-      'Afficher les nœuds répétiteurs sur la carte';
+      'Afficher les nœuds répéteurs sur la carte';
 
   @override
   String get appSettings_showChatNodes => 'Afficher les nœuds de discussion';
@@ -671,7 +681,7 @@ class AppLocalizationsFr extends AppLocalizations {
   }
 
   @override
-  String get contacts_manageRepeater => 'Gérer le répétiteur';
+  String get contacts_manageRepeater => 'Gérer le répéteur';
 
   @override
   String get contacts_manageRoom => 'Gérer le Room Server';
@@ -1094,18 +1104,18 @@ class AppLocalizationsFr extends AppLocalizations {
       'L\'historique du chemin est plein. Supprimez les entrées pour en ajouter de nouvelles.';
 
   @override
-  String get chat_hopSingular => 'Sautez';
+  String get chat_hopSingular => 'saut';
 
   @override
-  String get chat_hopPlural => 'sautez';
+  String get chat_hopPlural => 'sauts';
 
   @override
   String chat_hopsCount(int count) {
     String _temp0 = intl.Intl.pluralLogic(
       count,
       locale: localeName,
-      other: 'hops',
-      one: 'hop',
+      other: 'sauts',
+      one: 'saut',
     );
     return '$count $_temp0';
   }
@@ -1259,7 +1269,7 @@ class AppLocalizationsFr extends AppLocalizations {
   String get map_chat => 'Chat';
 
   @override
-  String get map_repeater => 'Répétiteur';
+  String get map_repeater => 'Répéteur';
 
   @override
   String get map_room => 'Salle';
@@ -1365,7 +1375,20 @@ class AppLocalizationsFr extends AppLocalizations {
   String get map_joinRoom => 'Rejoindre la salle';
 
   @override
-  String get map_manageRepeater => 'Gérer le répétiteur';
+  String get map_manageRepeater => 'Gérer le répéteur';
+
+  @override
+  String get map_tapToAdd =>
+      'Appuyez sur les nœuds pour les ajouter au chemin.';
+
+  @override
+  String get map_runTrace => 'Exécuter la traçage de chemin';
+
+  @override
+  String get map_removeLast => 'Supprimer le dernier';
+
+  @override
+  String get map_pathTraceCancelled => 'Traçage de chemin annulé';
 
   @override
   String get mapCache_title => 'Cache de Carte Hors Ligne';
@@ -1509,7 +1532,7 @@ class AppLocalizationsFr extends AppLocalizations {
       'Êtes-vous sûr de vouloir vous déconnecter de cet appareil ?';
 
   @override
-  String get login_repeaterLogin => 'Connexion au répétiteur';
+  String get login_repeaterLogin => 'Connexion au répéteur';
 
   @override
   String get login_roomLogin => 'Connexion Salle';
@@ -1529,7 +1552,7 @@ class AppLocalizationsFr extends AppLocalizations {
 
   @override
   String get login_repeaterDescription =>
-      'Entrez le mot de passe du répétiteur pour accéder aux paramètres et à l\'état.';
+      'Entrez le mot de passe du répéteur pour accéder aux paramètres et à l\'état.';
 
   @override
   String get login_roomDescription =>
@@ -1634,7 +1657,7 @@ class AppLocalizationsFr extends AppLocalizations {
   String get path_setPath => 'Définir le chemin';
 
   @override
-  String get repeater_management => 'Gestion des répétiteurs';
+  String get repeater_management => 'Gestion des répéteurs';
 
   @override
   String get room_management => 'Administración del Servidor de Habitación';
@@ -1647,7 +1670,7 @@ class AppLocalizationsFr extends AppLocalizations {
 
   @override
   String get repeater_statusSubtitle =>
-      'Afficher l\'état, les statistiques et les voisins du répétiteur';
+      'Afficher l\'état, les statistiques et les voisins du répéteur';
 
   @override
   String get repeater_telemetry => 'Télémetrie';
@@ -1660,24 +1683,23 @@ class AppLocalizationsFr extends AppLocalizations {
   String get repeater_cli => 'CLI';
 
   @override
-  String get repeater_cliSubtitle => 'Envoyer des commandes au répétiteur';
+  String get repeater_cliSubtitle => 'Envoyer des commandes au répéteur';
 
   @override
-  String get repeater_neighbours => 'Voisins';
+  String get repeater_neighbors => 'Voisins';
 
   @override
-  String get repeater_neighboursSubtitle =>
-      'Afficher les voisins de saut nuls.';
+  String get repeater_neighborsSubtitle => 'Afficher les voisins de saut nuls.';
 
   @override
   String get repeater_settings => 'Paramètres';
 
   @override
   String get repeater_settingsSubtitle =>
-      'Configurer les paramètres du répétiteur';
+      'Configurer les paramètres du répéteur';
 
   @override
-  String get repeater_statusTitle => 'État du répétiteur';
+  String get repeater_statusTitle => 'État du répéteur';
 
   @override
   String get repeater_routingMode => 'Mode de routage';
@@ -1783,16 +1805,16 @@ class AppLocalizationsFr extends AppLocalizations {
   }
 
   @override
-  String get repeater_settingsTitle => 'Paramètres du répétiteur';
+  String get repeater_settingsTitle => 'Paramètres du répéteur';
 
   @override
   String get repeater_basicSettings => 'Paramètres de base';
 
   @override
-  String get repeater_repeaterName => 'Nom du répétiteur';
+  String get repeater_repeaterName => 'Nom du répéteur';
 
   @override
-  String get repeater_repeaterNameHelper => 'Afficher le nom de ce répétiteur';
+  String get repeater_repeaterNameHelper => 'Afficher le nom de ce répéteur';
 
   @override
   String get repeater_adminPassword => 'Mot de passe Administrateur';
@@ -1856,7 +1878,7 @@ class AppLocalizationsFr extends AppLocalizations {
 
   @override
   String get repeater_packetForwardingSubtitle =>
-      'Activer le répétiteur pour transmettre des paquets';
+      'Activer le répéteur pour transmettre des paquets';
 
   @override
   String get repeater_guestAccess => 'Accès Invité';
@@ -1905,11 +1927,11 @@ class AppLocalizationsFr extends AppLocalizations {
 
   @override
   String get repeater_rebootRepeaterSubtitle =>
-      'Réinitialiser l\'appareil répétiteur';
+      'Réinitialiser l\'appareil répéteur';
 
   @override
   String get repeater_rebootRepeaterConfirm =>
-      'Êtes-vous sûr de vouloir redémarrer ce répétiteur ?';
+      'Êtes-vous sûr de vouloir redémarrer ce répéteur ?';
 
   @override
   String get repeater_regenerateIdentityKey => 'Ré générer la clé d\'identité';
@@ -1920,18 +1942,18 @@ class AppLocalizationsFr extends AppLocalizations {
 
   @override
   String get repeater_regenerateIdentityKeyConfirm =>
-      'Cela générera une nouvelle identité pour le répétiteur. Continuer ?';
+      'Cela générera une nouvelle identité pour le répéteur. Continuer ?';
 
   @override
   String get repeater_eraseFileSystem => 'Supprimer le système de fichiers';
 
   @override
   String get repeater_eraseFileSystemSubtitle =>
-      'Formater le système de fichiers du répétiteur';
+      'Formater le système de fichiers du répéteur';
 
   @override
   String get repeater_eraseFileSystemConfirm =>
-      'AVERTISSEMENT : Cela effacera toutes les données du répétiteur. Cela ne peut pas être annulé !';
+      'AVERTISSEMENT : Cela effacera toutes les données du répéteur. Cela ne peut pas être annulé !';
 
   @override
   String get repeater_eraseSerialOnly =>
@@ -1999,7 +2021,7 @@ class AppLocalizationsFr extends AppLocalizations {
   }
 
   @override
-  String get repeater_cliTitle => 'Répétiteur CLI';
+  String get repeater_cliTitle => 'Répéteur CLI';
 
   @override
   String get repeater_debugNextCommand => 'Déboguer Prochaine Commande';
@@ -2091,7 +2113,7 @@ class AppLocalizationsFr extends AppLocalizations {
 
   @override
   String get repeater_cliHelpSetRepeat =>
-      'Active ou désactive le rôle du répétiteur pour ce nœud.';
+      'Active ou désactive le rôle du répéteur pour ce nœud.';
 
   @override
   String get repeater_cliHelpSetAllowReadOnly =>
@@ -2115,7 +2137,7 @@ class AppLocalizationsFr extends AppLocalizations {
 
   @override
   String get repeater_cliHelpSetAdvertInterval =>
-      'Définit l\'intervalle du minuteur pour envoyer un paquet d\'annonce local (sans relais). Définir sur 0 pour désactiver.';
+      'Définit l\'intervalle entre chaque émission d\'une annonce locale (sans relais). Définir sur 0 pour désactiver.';
 
   @override
   String get repeater_cliHelpSetFloodAdvertInterval =>
@@ -2201,7 +2223,7 @@ class AppLocalizationsFr extends AppLocalizations {
 
   @override
   String get repeater_cliHelpNeighbors =>
-      'Affiche une liste d\'autres nœuds répétiteurs entendus via des annonces sans relais. Chaque ligne est id-préfixe-hexadécimal:timestamp:snr-fois-4';
+      'Affiche une liste d\'autres nœuds répéteurs entendus via des annonces sans relais. Chaque ligne est id-préfixe-hexadécimal:timestamp:snr-fois-4';
 
   @override
   String get repeater_cliHelpNeighborRemove =>
@@ -2289,12 +2311,11 @@ class AppLocalizationsFr extends AppLocalizations {
   String get repeater_logging => 'Journalisation';
 
   @override
-  String get repeater_neighborsRepeaterOnly =>
-      'Voisins (Uniquement répétiteur)';
+  String get repeater_neighborsRepeaterOnly => 'Voisins (Uniquement répéteur)';
 
   @override
   String get repeater_regionManagementRepeaterOnly =>
-      'Gestion des régions (uniquement pour le répétiteur)';
+      'Gestion des régions (uniquement pour le répéteur)';
 
   @override
   String get repeater_regionNote =>
@@ -2373,7 +2394,7 @@ class AppLocalizationsFr extends AppLocalizations {
   }
 
   @override
-  String get neighbors_repeatersNeighbours => 'Répéteurs Voisins';
+  String get neighbors_repeatersNeighbors => 'Répéteurs Voisins';
 
   @override
   String get neighbors_noData =>
@@ -2399,7 +2420,7 @@ class AppLocalizationsFr extends AppLocalizations {
   String get channelPath_otherObservedPaths => 'Autres chemins observés';
 
   @override
-  String get channelPath_repeaterHops => 'Sauts du répétiteur';
+  String get channelPath_repeaterHops => 'Sauts du répéteur';
 
   @override
   String get channelPath_noHopDetails =>
@@ -2467,7 +2488,7 @@ class AppLocalizationsFr extends AppLocalizations {
 
   @override
   String get channelPath_noRepeaterLocations =>
-      'Aucune position de répétiteur disponible pour ce chemin.';
+      'Aucune position de répéteur disponible pour ce chemin.';
 
   @override
   String channelPath_primaryPath(int index) {
@@ -2713,7 +2734,10 @@ class AppLocalizationsFr extends AppLocalizations {
 
   @override
   String get pathTrace_someHopsNoLocation =>
-      'Une ou plusieurs des houblons manquent d\'une localisation !';
+      'Un ou plusieurs des sauts manquent d\'une localisation !';
+
+  @override
+  String get pathTrace_clearTooltip => 'Effacer le chemin';
 
   @override
   String get contacts_pathTrace => 'Traçage de chemin';
@@ -2756,10 +2780,10 @@ class AppLocalizationsFr extends AppLocalizations {
       'Échec de l\'importation du contact.';
 
   @override
-  String get contacts_zeroHopAdvert => 'Annonce Zero Hop';
+  String get contacts_zeroHopAdvert => 'Annonce Zero saut';
 
   @override
-  String get contacts_floodAdvert => 'Annonce de crue';
+  String get contacts_floodAdvert => 'Annonce à tout le réseau';
 
   @override
   String get contacts_copyAdvertToClipboard =>
@@ -2892,4 +2916,10 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get settings_gpxExportShareSubject =>
       'meshcore-open exporter les données de carte GPX';
+
+  @override
+  String get snrIndicator_nearByRepeaters => 'Répéteurs à proximité';
+
+  @override
+  String get snrIndicator_lastSeen => 'Dernière fois vu';
 }

lib/l10n/app_localizations_it.dart

@@ -143,6 +143,16 @@ class AppLocalizationsIt extends AppLocalizations {
   @override
   String get scanner_scan => 'Scansiona';
 
+  @override
+  String get scanner_bluetoothOff => 'Il Bluetooth è disattivato.';
+
+  @override
+  String get scanner_bluetoothOffMessage =>
+      'Si prega di attivare il Bluetooth per effettuare la scansione dei dispositivi.';
+
+  @override
+  String get scanner_enableBluetooth => 'Abilita il Bluetooth';
+
   @override
   String get device_quickSwitch => 'Passa velocemente';
 
@@ -1359,6 +1369,18 @@ class AppLocalizationsIt extends AppLocalizations {
   @override
   String get map_manageRepeater => 'Gestisci Ripetitore';
 
+  @override
+  String get map_tapToAdd => 'Tocca i nodi per aggiungerli al percorso.';
+
+  @override
+  String get map_runTrace => 'Esegui Path Trace';
+
+  @override
+  String get map_removeLast => 'Rimuovi ultimo';
+
+  @override
+  String get map_pathTraceCancelled => 'Tracciamento del percorso annullato.';
+
   @override
   String get mapCache_title => 'Cache Mappa Offline';
 
@@ -1654,10 +1676,10 @@ class AppLocalizationsIt extends AppLocalizations {
   String get repeater_cliSubtitle => 'Invia comandi al ripetitore';
 
   @override
-  String get repeater_neighbours => 'Vicini';
+  String get repeater_neighbors => 'Vicini';
 
   @override
-  String get repeater_neighboursSubtitle =>
+  String get repeater_neighborsSubtitle =>
       'Visualizza vicini di salto pari a zero.';
 
   @override
@@ -2358,7 +2380,7 @@ class AppLocalizationsIt extends AppLocalizations {
   }
 
   @override
-  String get neighbors_repeatersNeighbours => 'Ripetitori Vicini';
+  String get neighbors_repeatersNeighbors => 'Ripetitori Vicini';
 
   @override
   String get neighbors_noData => 'Nessun dato sugli vicini disponibile.';
@@ -2699,6 +2721,9 @@ class AppLocalizationsIt extends AppLocalizations {
   String get pathTrace_someHopsNoLocation =>
       'Uno o più dei luppoli mancano di una posizione!';
 
+  @override
+  String get pathTrace_clearTooltip => 'Pulisci percorso';
+
   @override
   String get contacts_pathTrace => 'Traccia Percorso';
 
@@ -2872,4 +2897,10 @@ class AppLocalizationsIt extends AppLocalizations {
   @override
   String get settings_gpxExportShareSubject =>
       'meshcore-open esportazione dati mappa GPX';
+
+  @override
+  String get snrIndicator_nearByRepeaters => 'Ripetitori vicini';
+
+  @override
+  String get snrIndicator_lastSeen => 'Ultimo accesso';
 }

lib/l10n/app_localizations_nl.dart

@@ -142,6 +142,16 @@ class AppLocalizationsNl extends AppLocalizations {
   @override
   String get scanner_scan => 'Scan';
 
+  @override
+  String get scanner_bluetoothOff => 'Bluetooth is uitgeschakeld';
+
+  @override
+  String get scanner_bluetoothOffMessage =>
+      'Zorg ervoor dat Bluetooth is ingeschakeld om naar apparaten te zoeken.';
+
+  @override
+  String get scanner_enableBluetooth => 'Activeer Bluetooth';
+
   @override
   String get device_quickSwitch => 'Snelle overschakeling';
 
@@ -1355,6 +1365,19 @@ class AppLocalizationsNl extends AppLocalizations {
   @override
   String get map_manageRepeater => 'Beheer Repeater';
 
+  @override
+  String get map_tapToAdd =>
+      'Tik op knooppunten om ze toe te voegen aan het pad';
+
+  @override
+  String get map_runTrace => 'Padeshulp traceren';
+
+  @override
+  String get map_removeLast => 'Verwijder Laatste';
+
+  @override
+  String get map_pathTraceCancelled => 'Pad traceren geannuleerd';
+
   @override
   String get mapCache_title => 'Offline Kaarten Cache';
 
@@ -1649,10 +1672,10 @@ class AppLocalizationsNl extends AppLocalizations {
   String get repeater_cliSubtitle => 'Verzend commando\'s naar de repeater';
 
   @override
-  String get repeater_neighbours => 'Buren';
+  String get repeater_neighbors => 'Buren';
 
   @override
-  String get repeater_neighboursSubtitle => 'Bekijk nul hops buren.';
+  String get repeater_neighborsSubtitle => 'Bekijk nul hops buren.';
 
   @override
   String get repeater_settings => 'Instellingen';
@@ -2348,7 +2371,7 @@ class AppLocalizationsNl extends AppLocalizations {
   }
 
   @override
-  String get neighbors_repeatersNeighbours => 'Herhalingen Buren';
+  String get neighbors_repeatersNeighbors => 'Herhalingen Buren';
 
   @override
   String get neighbors_noData => 'Geen gegevens van buren beschikbaar.';
@@ -2689,6 +2712,9 @@ class AppLocalizationsNl extends AppLocalizations {
   String get pathTrace_someHopsNoLocation =>
       'Een of meer van de hops ontbreken een locatie!';
 
+  @override
+  String get pathTrace_clearTooltip => 'Weg wissen';
+
   @override
   String get contacts_pathTrace => 'Pad Traceren';
 
@@ -2859,4 +2885,10 @@ class AppLocalizationsNl extends AppLocalizations {
   @override
   String get settings_gpxExportShareSubject =>
       'meshcore-open GPX kaartgegevens exporteren';
+
+  @override
+  String get snrIndicator_nearByRepeaters => 'Nabije herhalingseenheden';
+
+  @override
+  String get snrIndicator_lastSeen => 'Laatst gezien';
 }

lib/l10n/app_localizations_pl.dart

@@ -143,6 +143,16 @@ class AppLocalizationsPl extends AppLocalizations {
   @override
   String get scanner_scan => 'Przeskanuj';
 
+  @override
+  String get scanner_bluetoothOff => 'Bluetooth jest wyłączony';
+
+  @override
+  String get scanner_bluetoothOffMessage =>
+      'Prosimy włączyć Bluetooth, aby przeskanować urządzenia.';
+
+  @override
+  String get scanner_enableBluetooth => 'Włącz Bluetooth';
+
   @override
   String get device_quickSwitch => 'Szybka zmiana';
 
@@ -1361,6 +1371,18 @@ class AppLocalizationsPl extends AppLocalizations {
   @override
   String get map_manageRepeater => 'Zarządzaj Powtórzami';
 
+  @override
+  String get map_tapToAdd => 'Kliknij na węzły, aby dodać je do ścieżki.';
+
+  @override
+  String get map_runTrace => 'Uruchom ślad ścieżki';
+
+  @override
+  String get map_removeLast => 'Usuń ostatni';
+
+  @override
+  String get map_pathTraceCancelled => 'Śledzenie ścieżki anulowano.';
+
   @override
   String get mapCache_title => 'Bufor Map Offline';
 
@@ -1658,10 +1680,10 @@ class AppLocalizationsPl extends AppLocalizations {
   String get repeater_cliSubtitle => 'Wyślij polecenia do powielacza';
 
   @override
-  String get repeater_neighbours => 'Sąsiedzi';
+  String get repeater_neighbors => 'Sąsiedzi';
 
   @override
-  String get repeater_neighboursSubtitle =>
+  String get repeater_neighborsSubtitle =>
       'Wyświetl sąsiedztwo zerowych hopów.';
 
   @override
@@ -2357,7 +2379,7 @@ class AppLocalizationsPl extends AppLocalizations {
   }
 
   @override
-  String get neighbors_repeatersNeighbours => 'Powtarzacze Sąsiedzi';
+  String get neighbors_repeatersNeighbors => 'Powtarzacze Sąsiedzi';
 
   @override
   String get neighbors_noData => 'Brak danych dotyczących sąsiadów.';
@@ -2697,6 +2719,9 @@ class AppLocalizationsPl extends AppLocalizations {
   String get pathTrace_someHopsNoLocation =>
       'Jeden lub więcej z chmieli nie ma określonej lokalizacji!';
 
+  @override
+  String get pathTrace_clearTooltip => 'Wyczyść ścieżkę';
+
   @override
   String get contacts_pathTrace => 'Śledzenie Ścieżek';
 
@@ -2874,4 +2899,10 @@ class AppLocalizationsPl extends AppLocalizations {
   @override
   String get settings_gpxExportShareSubject =>
       'Eksport danych mapy GPX meshcore-open';
+
+  @override
+  String get snrIndicator_nearByRepeaters => 'Nadajniki w pobliżu';
+
+  @override
+  String get snrIndicator_lastSeen => 'Ostatnio widziany';
 }

lib/l10n/app_localizations_pt.dart

@@ -143,6 +143,16 @@ class AppLocalizationsPt extends AppLocalizations {
   @override
   String get scanner_scan => 'Digitalizar';
 
+  @override
+  String get scanner_bluetoothOff => 'Bluetooth está desativado';
+
+  @override
+  String get scanner_bluetoothOffMessage =>
+      'Por favor, ative o Bluetooth para escanear por dispositivos.';
+
+  @override
+  String get scanner_enableBluetooth => 'Ative o Bluetooth';
+
   @override
   String get device_quickSwitch => 'Mudar rapidamente';
 
@@ -1361,6 +1371,18 @@ class AppLocalizationsPt extends AppLocalizations {
   @override
   String get map_manageRepeater => 'Gerenciar Repetidor';
 
+  @override
+  String get map_tapToAdd => 'Toque nos nós para adicioná-los ao caminho.';
+
+  @override
+  String get map_runTrace => 'Executar Traçado de Caminho';
+
+  @override
+  String get map_removeLast => 'Remover Último';
+
+  @override
+  String get map_pathTraceCancelled => 'Rastreamento de caminho cancelado.';
+
   @override
   String get mapCache_title => 'Cache de Mapa Offline';
 
@@ -1656,11 +1678,10 @@ class AppLocalizationsPt extends AppLocalizations {
   String get repeater_cliSubtitle => 'Enviar comandos ao repetidor';
 
   @override
-  String get repeater_neighbours => 'Vizinhos';
+  String get repeater_neighbors => 'Vizinhos';
 
   @override
-  String get repeater_neighboursSubtitle =>
-      'Visualizar vizinhos de salto zero.';
+  String get repeater_neighborsSubtitle => 'Visualizar vizinhos de salto zero.';
 
   @override
   String get repeater_settings => 'Configurações';
@@ -2359,7 +2380,7 @@ class AppLocalizationsPt extends AppLocalizations {
   }
 
   @override
-  String get neighbors_repeatersNeighbours => 'Repetidores Vizinhos';
+  String get neighbors_repeatersNeighbors => 'Repetidores Vizinhos';
 
   @override
   String get neighbors_noData => 'Não estão disponíveis dados de vizinhos.';
@@ -2700,6 +2721,9 @@ class AppLocalizationsPt extends AppLocalizations {
   String get pathTrace_someHopsNoLocation =>
       'Um ou mais dos lúpulos estão sem localização!';
 
+  @override
+  String get pathTrace_clearTooltip => 'Limpar caminho';
+
   @override
   String get contacts_pathTrace => 'Traçado de Caminho';
 
@@ -2869,4 +2893,10 @@ class AppLocalizationsPt extends AppLocalizations {
   @override
   String get settings_gpxExportShareSubject =>
       'meshcore-open exportação de dados de mapa GPX';
+
+  @override
+  String get snrIndicator_nearByRepeaters => 'Repetidores Próximos';
+
+  @override
+  String get snrIndicator_lastSeen => 'Visto pela última vez';
 }

lib/l10n/app_localizations_ru.dart

@@ -142,6 +142,16 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get scanner_scan => 'Сканирование';
 
+  @override
+  String get scanner_bluetoothOff => 'Bluetooth выключен';
+
+  @override
+  String get scanner_bluetoothOffMessage =>
+      'Пожалуйста, включите Bluetooth, чтобы найти устройства.';
+
+  @override
+  String get scanner_enableBluetooth => 'Включите Bluetooth';
+
   @override
   String get device_quickSwitch => 'Быстрое переключение';
 
@@ -1362,6 +1372,18 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get map_manageRepeater => 'Управление репитером';
 
+  @override
+  String get map_tapToAdd => 'Нажимайте на узлы, чтобы добавить их в путь.';
+
+  @override
+  String get map_runTrace => 'Запустить трассировку пути';
+
+  @override
+  String get map_removeLast => 'Удалить последний';
+
+  @override
+  String get map_pathTraceCancelled => 'Отмена трассировки пути';
+
   @override
   String get mapCache_title => 'Кэш офлайн-карты';
 
@@ -1658,10 +1680,10 @@ class AppLocalizationsRu extends AppLocalizations {
   String get repeater_cliSubtitle => 'Отправка команд репитеру';
 
   @override
-  String get repeater_neighbours => 'Соседи';
+  String get repeater_neighbors => 'Соседи';
 
   @override
-  String get repeater_neighboursSubtitle => 'Просмотр соседей на нулевом хопе.';
+  String get repeater_neighborsSubtitle => 'Просмотр соседей на нулевом хопе.';
 
   @override
   String get repeater_settings => 'Настройки';
@@ -2361,7 +2383,7 @@ class AppLocalizationsRu extends AppLocalizations {
   }
 
   @override
-  String get neighbors_repeatersNeighbours => 'Соседи репитеров';
+  String get neighbors_repeatersNeighbors => 'Соседи репитеров';
 
   @override
   String get neighbors_noData => 'Данные о соседях недоступны.';
@@ -2702,6 +2724,9 @@ class AppLocalizationsRu extends AppLocalizations {
   String get pathTrace_someHopsNoLocation =>
       'Одному или нескольким хмелям не указано местоположение!';
 
+  @override
+  String get pathTrace_clearTooltip => 'Очистить путь';
+
   @override
   String get contacts_pathTrace => 'Трассировка пути';
 
@@ -2880,4 +2905,10 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get settings_gpxExportShareSubject =>
       'meshcore-open экспорт данных карты GPX';
+
+  @override
+  String get snrIndicator_nearByRepeaters => 'Ближайшие ретрансляторы';
+
+  @override
+  String get snrIndicator_lastSeen => 'Последний раз видели';
 }

lib/l10n/app_localizations_sk.dart

@@ -143,6 +143,16 @@ class AppLocalizationsSk extends AppLocalizations {
   @override
   String get scanner_scan => 'Skončiť';
 
+  @override
+  String get scanner_bluetoothOff => 'Bluetooth je vypnutý';
+
+  @override
+  String get scanner_bluetoothOffMessage =>
+      'Prosím, zapnite Bluetooth, aby ste mohli skenovať pre zariadenia.';
+
+  @override
+  String get scanner_enableBluetooth => 'Povolte Bluetooth';
+
   @override
   String get device_quickSwitch => 'Rýchle prepínač';
 
@@ -1356,6 +1366,18 @@ class AppLocalizationsSk extends AppLocalizations {
   @override
   String get map_manageRepeater => 'Spravovať Opakovanie';
 
+  @override
+  String get map_tapToAdd => 'Kliknite na uzly, aby ste ich pridali k ceste.';
+
+  @override
+  String get map_runTrace => 'Spustiť trasovaním cesty';
+
+  @override
+  String get map_removeLast => 'Odstrániť posledný';
+
+  @override
+  String get map_pathTraceCancelled => 'Zrušenie stopáže cesty bolo zrušené.';
+
   @override
   String get mapCache_title => 'Offline Mapa Pamäť';
 
@@ -1651,10 +1673,10 @@ class AppLocalizationsSk extends AppLocalizations {
   String get repeater_cliSubtitle => 'Pošlite príkazy opakovaču';
 
   @override
-  String get repeater_neighbours => 'Súsezný';
+  String get repeater_neighbors => 'Súsezný';
 
   @override
-  String get repeater_neighboursSubtitle => 'Zobraziť susedné body bez skokov.';
+  String get repeater_neighborsSubtitle => 'Zobraziť susedné body bez skokov.';
 
   @override
   String get repeater_settings => 'Nastavenia';
@@ -2345,7 +2367,7 @@ class AppLocalizationsSk extends AppLocalizations {
   }
 
   @override
-  String get neighbors_repeatersNeighbours => 'Opakovadlá Súsezná';
+  String get neighbors_repeatersNeighbors => 'Opakovadlá Súsezná';
 
   @override
   String get neighbors_noData =>
@@ -2685,6 +2707,9 @@ class AppLocalizationsSk extends AppLocalizations {
   String get pathTrace_someHopsNoLocation =>
       'Jedna alebo viac chmeľov chýba lokalita!';
 
+  @override
+  String get pathTrace_clearTooltip => 'Zmazať cestu';
+
   @override
   String get contacts_pathTrace => 'Sledovanie lúčov';
 
@@ -2856,4 +2881,10 @@ class AppLocalizationsSk extends AppLocalizations {
   @override
   String get settings_gpxExportShareSubject =>
       'meshcore-open export dát GPX mapových údajov';
+
+  @override
+  String get snrIndicator_nearByRepeaters => 'Miestne opakovače';
+
+  @override
+  String get snrIndicator_lastSeen => 'Naposledy videný';
 }

lib/l10n/app_localizations_sl.dart

@@ -143,6 +143,16 @@ class AppLocalizationsSl extends AppLocalizations {
   @override
   String get scanner_scan => 'Skeniraj';
 
+  @override
+  String get scanner_bluetoothOff => 'Bluetooth je izklopljen';
+
+  @override
+  String get scanner_bluetoothOffMessage =>
+      'Prosimo, vklopite Bluetooth, da lahko poiščete naprave.';
+
+  @override
+  String get scanner_enableBluetooth => 'Omogočite Bluetooth';
+
   @override
   String get device_quickSwitch => 'Hitro preklop';
 
@@ -1352,6 +1362,18 @@ class AppLocalizationsSl extends AppLocalizations {
   @override
   String get map_manageRepeater => 'Upravljajte Ponovitve';
 
+  @override
+  String get map_tapToAdd => 'Pritisnite na vozlišča, da jih dodate poti.';
+
+  @override
+  String get map_runTrace => 'Zaženi sledenje poti';
+
+  @override
+  String get map_removeLast => 'Odstrani Zadnji';
+
+  @override
+  String get map_pathTraceCancelled => 'Spremljanje poti je prekinjeno.';
+
   @override
   String get mapCache_title =>
       'Omrezni predpomnilnik zemljeških zemljejevskih slik';
@@ -1650,10 +1672,10 @@ class AppLocalizationsSl extends AppLocalizations {
       'Pošlji ukazne povelje na ponovitveno enoto.';
 
   @override
-  String get repeater_neighbours => 'Sosedi';
+  String get repeater_neighbors => 'Sosedi';
 
   @override
-  String get repeater_neighboursSubtitle => 'Pogledati nič sosednjih hopjev.';
+  String get repeater_neighborsSubtitle => 'Pogledati nič sosednjih hopjev.';
 
   @override
   String get repeater_settings => 'Nastavitve';
@@ -2349,7 +2371,7 @@ class AppLocalizationsSl extends AppLocalizations {
   }
 
   @override
-  String get neighbors_repeatersNeighbours => 'Ponovitve Sosedi';
+  String get neighbors_repeatersNeighbors => 'Ponovitve Sosedi';
 
   @override
   String get neighbors_noData => 'Niso na voljo podatki o sosedih.';
@@ -2688,6 +2710,9 @@ class AppLocalizationsSl extends AppLocalizations {
   String get pathTrace_someHopsNoLocation =>
       'Ena ali več hmelju manjka lokacija!';
 
+  @override
+  String get pathTrace_clearTooltip => 'Počisti pot';
+
   @override
   String get contacts_pathTrace => 'Sledenje poti';
 
@@ -2861,4 +2886,10 @@ class AppLocalizationsSl extends AppLocalizations {
   @override
   String get settings_gpxExportShareSubject =>
       'meshcore-open izvoz podatkov GPX karte';
+
+  @override
+  String get snrIndicator_nearByRepeaters => 'Bližnji ponovitelji';
+
+  @override
+  String get snrIndicator_lastSeen => 'Zadnjič videno';
 }

lib/l10n/app_localizations_sv.dart

@@ -142,6 +142,16 @@ class AppLocalizationsSv extends AppLocalizations {
   @override
   String get scanner_scan => 'Skanna';
 
+  @override
+  String get scanner_bluetoothOff => 'Bluetooth är avstängt';
+
+  @override
+  String get scanner_bluetoothOffMessage =>
+      'Vänligen aktivera Bluetooth för att söka efter enheter.';
+
+  @override
+  String get scanner_enableBluetooth => 'Aktivera Bluetooth';
+
   @override
   String get device_quickSwitch => 'Snabb växling';
 
@@ -1348,6 +1358,18 @@ class AppLocalizationsSv extends AppLocalizations {
   @override
   String get map_manageRepeater => 'Hantera Upprepare';
 
+  @override
+  String get map_tapToAdd => 'Tryck på noder för att lägga till dem i banan.';
+
+  @override
+  String get map_runTrace => 'Kör spårsökning';
+
+  @override
+  String get map_removeLast => 'Ta bort sista';
+
+  @override
+  String get map_pathTraceCancelled => 'Sökvägsspårning avbruten.';
+
   @override
   String get mapCache_title => 'Offline Kartcache';
 
@@ -1640,10 +1662,10 @@ class AppLocalizationsSv extends AppLocalizations {
   String get repeater_cliSubtitle => 'Skicka kommandon till repetitorn';
 
   @override
-  String get repeater_neighbours => 'Grannar';
+  String get repeater_neighbors => 'Grannar';
 
   @override
-  String get repeater_neighboursSubtitle => 'Visa noll hoppgrannar.';
+  String get repeater_neighborsSubtitle => 'Visa noll hoppgrannar.';
 
   @override
   String get repeater_settings => 'Inställningar';
@@ -2334,7 +2356,7 @@ class AppLocalizationsSv extends AppLocalizations {
   }
 
   @override
-  String get neighbors_repeatersNeighbours => 'Upprepar grannar';
+  String get neighbors_repeatersNeighbors => 'Upprepar grannar';
 
   @override
   String get neighbors_noData => 'Inga grannuppgifter finns tillgängliga.';
@@ -2673,6 +2695,9 @@ class AppLocalizationsSv extends AppLocalizations {
   String get pathTrace_someHopsNoLocation =>
       'En eller flera av humlen saknar en plats!';
 
+  @override
+  String get pathTrace_clearTooltip => 'Rensa väg';
+
   @override
   String get contacts_pathTrace => 'Path Trace';
 
@@ -2841,4 +2866,10 @@ class AppLocalizationsSv extends AppLocalizations {
   @override
   String get settings_gpxExportShareSubject =>
       'meshcore-open export av GPX-kartdata';
+
+  @override
+  String get snrIndicator_nearByRepeaters => 'Närliggande uppreparstationer';
+
+  @override
+  String get snrIndicator_lastSeen => 'Senast sedd';
 }

lib/l10n/app_localizations_uk.dart

@@ -143,6 +143,16 @@ class AppLocalizationsUk extends AppLocalizations {
   @override
   String get scanner_scan => 'Сканувати';
 
+  @override
+  String get scanner_bluetoothOff => 'Bluetooth вимкнено';
+
+  @override
+  String get scanner_bluetoothOffMessage =>
+      'Будь ласка, увімкніть Bluetooth, щоб сканувати пристрої.';
+
+  @override
+  String get scanner_enableBluetooth => 'Увімкніть Bluetooth';
+
   @override
   String get device_quickSwitch => 'Швидке перемикання';
 
@@ -1361,6 +1371,18 @@ class AppLocalizationsUk extends AppLocalizations {
   @override
   String get map_manageRepeater => 'Керувати ретранслятором';
 
+  @override
+  String get map_tapToAdd => 'Натисніть на вузли, щоб додати їх до шляху';
+
+  @override
+  String get map_runTrace => 'Виконати трасування шляху';
+
+  @override
+  String get map_removeLast => 'Видалити останній';
+
+  @override
+  String get map_pathTraceCancelled => 'Відмінується трасування шляху';
+
   @override
   String get mapCache_title => 'Офлайн-кеш карти';
 
@@ -1657,10 +1679,10 @@ class AppLocalizationsUk extends AppLocalizations {
   String get repeater_cliSubtitle => 'Надіслати команди ретранслятору';
 
   @override
-  String get repeater_neighbours => 'Сусіди';
+  String get repeater_neighbors => 'Сусіди';
 
   @override
-  String get repeater_neighboursSubtitle =>
+  String get repeater_neighborsSubtitle =>
       'Показати сусідів нульового стрибка.';
 
   @override
@@ -2362,7 +2384,7 @@ class AppLocalizationsUk extends AppLocalizations {
   }
 
   @override
-  String get neighbors_repeatersNeighbours => 'Ретранслятори-сусіди';
+  String get neighbors_repeatersNeighbors => 'Ретранслятори-сусіди';
 
   @override
   String get neighbors_noData => 'Дані про сусідів недоступні.';
@@ -2709,6 +2731,9 @@ class AppLocalizationsUk extends AppLocalizations {
   String get pathTrace_someHopsNoLocation =>
       'Одне або більше хмелів відсутнє місце розташування!';
 
+  @override
+  String get pathTrace_clearTooltip => 'Очистити шлях';
+
   @override
   String get contacts_pathTrace => 'Трасування шляхів';
 
@@ -2886,4 +2911,10 @@ class AppLocalizationsUk extends AppLocalizations {
   @override
   String get settings_gpxExportShareSubject =>
       'експорт даних карти meshcore-open у форматі GPX';
+
+  @override
+  String get snrIndicator_nearByRepeaters => 'Ближні ретранслятори';
+
+  @override
+  String get snrIndicator_lastSeen => 'Останній раз бачили';
 }

lib/l10n/app_localizations_zh.dart

@@ -142,6 +142,15 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get scanner_scan => '扫描';
 
+  @override
+  String get scanner_bluetoothOff => '蓝牙已关闭';
+
+  @override
+  String get scanner_bluetoothOffMessage => '请打开蓝牙功能，以便搜索设备。';
+
+  @override
+  String get scanner_enableBluetooth => '启用蓝牙';
+
   @override
   String get device_quickSwitch => '快速切换';
 
@@ -1301,6 +1310,18 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get map_manageRepeater => '管理重复器';
 
+  @override
+  String get map_tapToAdd => '点击节点将其添加到路径中';
+
+  @override
+  String get map_runTrace => '运行路径跟踪';
+
+  @override
+  String get map_removeLast => '删除最后一个';
+
+  @override
+  String get map_pathTraceCancelled => '路径跟踪已取消';
+
   @override
   String get mapCache_title => '离线地图缓存';
 
@@ -1580,10 +1601,10 @@ class AppLocalizationsZh extends AppLocalizations {
   String get repeater_cliSubtitle => '向复用器发送指令';
 
   @override
-  String get repeater_neighbours => '邻居';
+  String get repeater_neighbors => '邻居';
 
   @override
-  String get repeater_neighboursSubtitle => '查看邻居节点（无需中间节点）。';
+  String get repeater_neighborsSubtitle => '查看邻居节点（无需中间节点）。';
 
   @override
   String get repeater_settings => '设置';
@@ -2230,7 +2251,7 @@ class AppLocalizationsZh extends AppLocalizations {
   }
 
   @override
-  String get neighbors_repeatersNeighbours => '重复使用的邻居';
+  String get neighbors_repeatersNeighbors => '重复使用的邻居';
 
   @override
   String get neighbors_noData => '没有可用的邻居信息。';
@@ -2557,6 +2578,9 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get pathTrace_someHopsNoLocation => '其中一个或多个啤酒花缺少位置！';
 
+  @override
+  String get pathTrace_clearTooltip => '清除路径';
+
   @override
   String get contacts_pathTrace => '路径追踪';
 
@@ -2695,4 +2719,10 @@ class AppLocalizationsZh extends AppLocalizations {
 
   @override
   String get settings_gpxExportShareSubject => 'meshcore-open GPX 地图数据导出';
+
+  @override
+  String get snrIndicator_nearByRepeaters => '附近的重复器';
+
+  @override
+  String get snrIndicator_lastSeen => '最近访问';
 }

lib/l10n/app_nl.arb

@@ -1356,12 +1356,12 @@
       }
     }
   },
-  "repeater_neighbours": "Buren",
-  "repeater_neighboursSubtitle": "Bekijk nul hops buren.",
+  "repeater_neighbors": "Buren",
+  "repeater_neighborsSubtitle": "Bekijk nul hops buren.",
   "neighbors_receivedData": "Ontvangen Buurdata",
   "neighbors_requestTimedOut": "Buren vragen om tijdelijk uitgeschakeld.",
   "neighbors_errorLoading": "Fout bij het laden van buren: {error}",
-  "neighbors_repeatersNeighbours": "Herhalingen Buren",
+  "neighbors_repeatersNeighbors": "Herhalingen Buren",
   "neighbors_noData": "Geen gegevens van buren beschikbaar.",
   "channels_createPrivateChannelDesc": "Beveiligd met een geheime sleutel.",
   "channels_createPrivateChannel": "Maak een Privé Kanaal",
@@ -1575,7 +1575,6 @@
   "notification_newNodesCount": "{count} {count, plural, =1{nieuw knooppunt} other{nieuwe knooppunten}}",
   "notification_newTypeDiscovered": "Nieuw {contactType} ontdekt",
   "notification_receivedNewMessage": "Nieuw bericht ontvangen",
-  "contacts_zeroHopContactAdvertFailed": "Mislukt om contact te verzenden",
   "settings_gpxExportRepeatersSubtitle": "Exporteert repeaters / roomserver met een locatie naar GPX-bestand.",
   "settings_gpxExportRepeaters": "Exporteer repeaters / roomserver naar GPX",
   "settings_gpxExportSuccess": "Succesvol GPX-bestand geëxporteerd.",
@@ -1591,6 +1590,15 @@
   "settings_gpxExportAllContacts": "Alle contactlocaties",
   "settings_gpxExportShareText": "Kaartgegevens geëxporteerd uit meshcore-open",
   "settings_gpxExportShareSubject": "meshcore-open GPX kaartgegevens exporteren",
-  "pathTrace_someHopsNoLocation": "Een of meer van de hops ontbreken een locatie!"
-
+  "pathTrace_someHopsNoLocation": "Een of meer van de hops ontbreken een locatie!",
+  "map_removeLast": "Verwijder Laatste",
+  "pathTrace_clearTooltip": "Weg wissen",
+  "map_pathTraceCancelled": "Pad traceren geannuleerd",
+  "map_tapToAdd": "Tik op knooppunten om ze toe te voegen aan het pad",
+  "map_runTrace": "Padeshulp traceren",
+  "scanner_enableBluetooth": "Activeer Bluetooth",
+  "scanner_bluetoothOffMessage": "Zorg ervoor dat Bluetooth is ingeschakeld om naar apparaten te zoeken.",
+  "scanner_bluetoothOff": "Bluetooth is uitgeschakeld",
+  "snrIndicator_lastSeen": "Laatst gezien",
+  "snrIndicator_nearByRepeaters": "Nabije herhalingseenheden"
 }

lib/l10n/app_pl.arb

@@ -1356,12 +1356,12 @@
       }
     }
   },
-  "repeater_neighbours": "Sąsiedzi",
-  "repeater_neighboursSubtitle": "Wyświetl sąsiedztwo zerowych hopów.",
+  "repeater_neighbors": "Sąsiedzi",
+  "repeater_neighborsSubtitle": "Wyświetl sąsiedztwo zerowych hopów.",
   "neighbors_receivedData": "Otrzymano dane sąsiedztwa",
   "neighbors_requestTimedOut": "Sąsiedzi proszą o wyłączenie timingu.",
   "neighbors_errorLoading": "Błąd podczas ładowania sąsiadów: {error}",
-  "neighbors_repeatersNeighbours": "Powtarzacze Sąsiedzi",
+  "neighbors_repeatersNeighbors": "Powtarzacze Sąsiedzi",
   "neighbors_noData": "Brak danych dotyczących sąsiadów.",
   "channels_joinPrivateChannelDesc": "Ręcznie wprowadź klucz tajny.",
   "channels_createPrivateChannel": "Utwórz Prywatny Kanał",
@@ -1575,7 +1575,6 @@
   "notification_newNodesCount": "{count} {count, plural, =1{nowy węzeł} few{nowe węzły} many{nowych węzłów} other{nowych węzłów}}",
   "notification_newTypeDiscovered": "Nowy {contactType} wykryty",
   "notification_receivedNewMessage": "Otrzymano nową wiadomość",
-  "contacts_zeroHopContactAdvertFailed": "Nie udało się wysłać kontaktu.",
   "settings_gpxExportContacts": "Eksportuj towarzyszy do GPX",
   "settings_gpxExportRepeaters": "Eksportuj powtórki / serwer pokojowy do GPX",
   "settings_gpxExportRepeatersSubtitle": "Eksportuje powtarzacze / roomserver z lokalizacją do pliku GPX.",
@@ -1591,6 +1590,15 @@
   "settings_gpxExportChat": "Lokalizacje towarzyszy",
   "settings_gpxExportShareText": "Dane mapy wyeksportowane z meshcore-open",
   "settings_gpxExportShareSubject": "Eksport danych mapy GPX meshcore-open",
-  "pathTrace_someHopsNoLocation": "Jeden lub więcej z chmieli nie ma określonej lokalizacji!"
-
+  "pathTrace_someHopsNoLocation": "Jeden lub więcej z chmieli nie ma określonej lokalizacji!",
+  "map_pathTraceCancelled": "Śledzenie ścieżki anulowano.",
+  "map_runTrace": "Uruchom ślad ścieżki",
+  "pathTrace_clearTooltip": "Wyczyść ścieżkę",
+  "map_removeLast": "Usuń ostatni",
+  "map_tapToAdd": "Kliknij na węzły, aby dodać je do ścieżki.",
+  "scanner_bluetoothOffMessage": "Prosimy włączyć Bluetooth, aby przeskanować urządzenia.",
+  "scanner_bluetoothOff": "Bluetooth jest wyłączony",
+  "scanner_enableBluetooth": "Włącz Bluetooth",
+  "snrIndicator_lastSeen": "Ostatnio widziany",
+  "snrIndicator_nearByRepeaters": "Nadajniki w pobliżu"
 }

lib/l10n/app_pt.arb

@@ -1356,12 +1356,12 @@
       }
     }
   },
-  "repeater_neighbours": "Vizinhos",
+  "repeater_neighbors": "Vizinhos",
   "neighbors_receivedData": "Dados dos Vizinhos Recebidos",
-  "repeater_neighboursSubtitle": "Visualizar vizinhos de salto zero.",
+  "repeater_neighborsSubtitle": "Visualizar vizinhos de salto zero.",
   "neighbors_requestTimedOut": "Vizinhos solicitam tempo limite esgotado.",
   "neighbors_errorLoading": "Erro ao carregar vizinhos: {error}",
-  "neighbors_repeatersNeighbours": "Repetidores Vizinhos",
+  "neighbors_repeatersNeighbors": "Repetidores Vizinhos",
   "neighbors_noData": "Não estão disponíveis dados de vizinhos.",
   "channels_createPrivateChannelDesc": "Protegido com uma chave secreta.",
   "channels_joinPrivateChannelDesc": "Inserir uma chave secreta manualmente.",
@@ -1575,7 +1575,6 @@
   "notification_newNodesCount": "{count} {count, plural, =1{novo nó} other{novos nós}}",
   "notification_newTypeDiscovered": "Novo {contactType} descoberto",
   "notification_receivedNewMessage": "Nova mensagem recebida",
-  "contacts_zeroHopContactAdvertFailed": "Falha ao enviar contato.",
   "settings_gpxExportRepeaters": "Exportar repetidores / servidor de sala para GPX",
   "settings_gpxExportRepeatersSubtitle": "Exporta repetidores / roomserver com localização para arquivo GPX.",
   "settings_gpxExportSuccess": "Arquivo GPX exportado com sucesso.",
@@ -1591,6 +1590,15 @@
   "settings_gpxExportAllContacts": "Todos os locais de contatos",
   "settings_gpxExportShareText": "Dados do mapa exportados do meshcore-open",
   "settings_gpxExportShareSubject": "meshcore-open exportação de dados de mapa GPX",
-  "pathTrace_someHopsNoLocation": "Um ou mais dos lúpulos estão sem localização!"
-
+  "pathTrace_someHopsNoLocation": "Um ou mais dos lúpulos estão sem localização!",
+  "map_runTrace": "Executar Traçado de Caminho",
+  "map_pathTraceCancelled": "Rastreamento de caminho cancelado.",
+  "pathTrace_clearTooltip": "Limpar caminho",
+  "map_removeLast": "Remover Último",
+  "map_tapToAdd": "Toque nos nós para adicioná-los ao caminho.",
+  "scanner_enableBluetooth": "Ative o Bluetooth",
+  "scanner_bluetoothOff": "Bluetooth está desativado",
+  "scanner_bluetoothOffMessage": "Por favor, ative o Bluetooth para escanear por dispositivos.",
+  "snrIndicator_nearByRepeaters": "Repetidores Próximos",
+  "snrIndicator_lastSeen": "Visto pela última vez"
 }

lib/l10n/app_ru.arb

@@ -472,8 +472,8 @@
   "repeater_telemetrySubtitle": "Просмотр телеметрии датчиков и системной статистики",
   "repeater_cli": "CLI",
   "repeater_cliSubtitle": "Отправка команд репитеру",
-  "repeater_neighbours": "Соседи",
-  "repeater_neighboursSubtitle": "Просмотр соседей на нулевом хопе.",
+  "repeater_neighbors": "Соседи",
+  "repeater_neighborsSubtitle": "Просмотр соседей на нулевом хопе.",
   "repeater_settings": "Настройки",
   "repeater_settingsSubtitle": "Настройка параметров репитера",
   "repeater_statusTitle": "Статус репитера",
@@ -666,7 +666,7 @@
   "neighbors_receivedData": "Полученные данные о соседях",
   "neighbors_requestTimedOut": "Время ожидания данных о соседях истекло.",
   "neighbors_errorLoading": "Ошибка загрузки соседей: {error}",
-  "neighbors_repeatersNeighbours": "Соседи репитеров",
+  "neighbors_repeatersNeighbors": "Соседи репитеров",
   "neighbors_noData": "Данные о соседях недоступны.",
   "neighbors_unknownContact": "Неизвестный {pubkey}",
   "neighbors_heardA ago": "Слышали: {time} назад",
@@ -815,7 +815,6 @@
   "notification_newNodesCount": "{count} {count, plural, =1{новый узел} few{новых узла} many{новых узлов} other{новых узлов}}",
   "notification_newTypeDiscovered": "Обнаружен новый {contactType}",
   "notification_receivedNewMessage": "Получено новое сообщение",
-  "contacts_zeroHopContactAdvertSent": "Отправлено сообщение по объявлению.",
   "settings_gpxExportRepeaters": "Экспортировать рипитеры / сервер комнаты в GPX",
   "settings_gpxExportRepeatersSubtitle": "Экспортирует ретрансляторы / сервер комнат с местоположением в файл GPX.",
   "settings_gpxExportContacts": "Экспортировать спутников в GPX",
@@ -831,6 +830,15 @@
   "settings_gpxExportNoContacts": "Нет контактов для экспорта.",
   "settings_gpxExportShareText": "Данные карты экспортированы из meshcore-open",
   "settings_gpxExportShareSubject": "meshcore-open экспорт данных карты GPX",
-  "pathTrace_someHopsNoLocation": "Одному или нескольким хмелям не указано местоположение!"
-
+  "pathTrace_someHopsNoLocation": "Одному или нескольким хмелям не указано местоположение!",
+  "map_tapToAdd": "Нажимайте на узлы, чтобы добавить их в путь.",
+  "map_removeLast": "Удалить последний",
+  "map_pathTraceCancelled": "Отмена трассировки пути",
+  "pathTrace_clearTooltip": "Очистить путь",
+  "map_runTrace": "Запустить трассировку пути",
+  "scanner_enableBluetooth": "Включите Bluetooth",
+  "scanner_bluetoothOff": "Bluetooth выключен",
+  "scanner_bluetoothOffMessage": "Пожалуйста, включите Bluetooth, чтобы найти устройства.",
+  "snrIndicator_nearByRepeaters": "Ближайшие ретрансляторы",
+  "snrIndicator_lastSeen": "Последний раз видели"
 }

lib/l10n/app_sk.arb

@@ -1356,12 +1356,12 @@
       }
     }
   },
-  "repeater_neighboursSubtitle": "Zobraziť susedné body bez skokov.",
+  "repeater_neighborsSubtitle": "Zobraziť susedné body bez skokov.",
   "neighbors_requestTimedOut": "Súďia žiadajú o časové ukončenie.",
   "neighbors_receivedData": "Obdielo dáta suseda",
-  "repeater_neighbours": "Súsezný",
+  "repeater_neighbors": "Súsezný",
   "neighbors_errorLoading": "Chyba pri načítaní susedov: {error}",
-  "neighbors_repeatersNeighbours": "Opakovadlá Súsezná",
+  "neighbors_repeatersNeighbors": "Opakovadlá Súsezná",
   "neighbors_noData": "Nie je dostupná žiadna informácia o susedoch.",
   "channels_createPrivateChannel": "Vytvorte súkromný kanál",
   "channels_joinPrivateChannel": "Pripojiť sa k súkromnému kanálu",
@@ -1575,7 +1575,6 @@
   "notification_newNodesCount": "{count} {count, plural, =1{nový uzol} few{nové uzly} other{nových uzlov}}",
   "notification_newTypeDiscovered": "Nový {contactType} objavený",
   "notification_receivedNewMessage": "Prijatá nová správa",
-  "contacts_ShareContact": "Kopírovať kontakt do schránky",
   "settings_gpxExportRepeatersSubtitle": "Exportuje repeater / roomserver s lokalitou do súboru GPX.",
   "settings_gpxExportContacts": "Export sprievodcov do GPX",
   "settings_gpxExportSuccess": "Úspešne exportovaný súbor GPX.",
@@ -1591,6 +1590,15 @@
   "settings_gpxExportChat": "Lokácie sprievodcov",
   "settings_gpxExportShareText": "Mapové údaje exportované z meshcore-open",
   "settings_gpxExportShareSubject": "meshcore-open export dát GPX mapových údajov",
-  "pathTrace_someHopsNoLocation": "Jedna alebo viac chmeľov chýba lokalita!"
-
+  "pathTrace_someHopsNoLocation": "Jedna alebo viac chmeľov chýba lokalita!",
+  "pathTrace_clearTooltip": "Zmazať cestu",
+  "map_tapToAdd": "Kliknite na uzly, aby ste ich pridali k ceste.",
+  "map_removeLast": "Odstrániť posledný",
+  "map_runTrace": "Spustiť trasovaním cesty",
+  "map_pathTraceCancelled": "Zrušenie stopáže cesty bolo zrušené.",
+  "scanner_bluetoothOffMessage": "Prosím, zapnite Bluetooth, aby ste mohli skenovať pre zariadenia.",
+  "scanner_bluetoothOff": "Bluetooth je vypnutý",
+  "scanner_enableBluetooth": "Povolte Bluetooth",
+  "snrIndicator_lastSeen": "Naposledy videný",
+  "snrIndicator_nearByRepeaters": "Miestne opakovače"
 }

lib/l10n/app_sl.arb

@@ -1356,12 +1356,12 @@
       }
     }
   },
-  "repeater_neighboursSubtitle": "Pogledati nič sosednjih hopjev.",
-  "repeater_neighbours": "Sosedi",
+  "repeater_neighborsSubtitle": "Pogledati nič sosednjih hopjev.",
+  "repeater_neighbors": "Sosedi",
   "neighbors_receivedData": "Prejeto podatke o sosedih",
   "neighbors_requestTimedOut": "Sosedi zahtevajo izklop po dogovoru.",
   "neighbors_errorLoading": "Napaka pri obnašanju sosedov: {error}",
-  "neighbors_repeatersNeighbours": "Ponovitve Sosedi",
+  "neighbors_repeatersNeighbors": "Ponovitve Sosedi",
   "neighbors_noData": "Niso na voljo podatki o sosedih.",
   "channels_joinPrivateChannel": "Pridružite se zasebni skupini",
   "channels_createPrivateChannelDesc": "Varno zaklenjeno s skrivnim ključem.",
@@ -1575,7 +1575,6 @@
   "notification_newNodesCount": "{count} {count, plural, =1{novo vozlišče} =2{novi vozlišči} few{nova vozlišča} other{novih vozlišč}}",
   "notification_newTypeDiscovered": "Odkrito novo {contactType}",
   "notification_receivedNewMessage": "Prejeto novo sporočilo",
-  "contacts_ShareContact": "Kopiraj stik v Odložišče",
   "settings_gpxExportAll": "Izvozi vse kontakte v GPX",
   "settings_gpxExportContacts": "Izvoz spremljevalcev v GPX",
   "settings_gpxExportRepeatersSubtitle": "Izvozi ponovljene oddajnike / strežnik sobe z lokacijo v datoteko GPX.",
@@ -1591,6 +1590,15 @@
   "settings_gpxExportNoContacts": "Ni stikov za izvoz.",
   "settings_gpxExportNotAvailable": "Ni podprto na vašem napravi/operacijskem sistemu",
   "settings_gpxExportShareSubject": "meshcore-open izvoz podatkov GPX karte",
-  "pathTrace_someHopsNoLocation": "Ena ali več hmelju manjka lokacija!"
-
+  "pathTrace_someHopsNoLocation": "Ena ali več hmelju manjka lokacija!",
+  "map_tapToAdd": "Pritisnite na vozlišča, da jih dodate poti.",
+  "map_removeLast": "Odstrani Zadnji",
+  "map_runTrace": "Zaženi sledenje poti",
+  "pathTrace_clearTooltip": "Počisti pot",
+  "map_pathTraceCancelled": "Spremljanje poti je prekinjeno.",
+  "scanner_enableBluetooth": "Omogočite Bluetooth",
+  "scanner_bluetoothOffMessage": "Prosimo, vklopite Bluetooth, da lahko poiščete naprave.",
+  "scanner_bluetoothOff": "Bluetooth je izklopljen",
+  "snrIndicator_lastSeen": "Zadnjič videno",
+  "snrIndicator_nearByRepeaters": "Bližnji ponovitelji"
 }

lib/l10n/app_sv.arb

@@ -1356,12 +1356,12 @@
       }
     }
   },
-  "repeater_neighbours": "Grannar",
-  "repeater_neighboursSubtitle": "Visa noll hoppgrannar.",
+  "repeater_neighbors": "Grannar",
+  "repeater_neighborsSubtitle": "Visa noll hoppgrannar.",
   "neighbors_receivedData": "Mottagna grannars data",
   "neighbors_requestTimedOut": "Grannar begär tidsinställd utskick.",
   "neighbors_errorLoading": "Fel vid inläsning av grannar: {error}",
-  "neighbors_repeatersNeighbours": "Upprepar grannar",
+  "neighbors_repeatersNeighbors": "Upprepar grannar",
   "neighbors_noData": "Inga grannuppgifter finns tillgängliga.",
   "channels_createPrivateChannel": "Skapa en privat kanal",
   "channels_joinPrivateChannel": "Gå med i en Privat Kanal",
@@ -1575,7 +1575,6 @@
   "notification_newNodesCount": "{count} {count, plural, =1{ny nod} other{nya noder}}",
   "notification_newTypeDiscovered": "Ny {contactType} upptäckt",
   "notification_receivedNewMessage": "Nytt meddelande mottaget",
-  "contacts_ShareContactZeroHop": "Dela kontakt via annons",
   "settings_gpxExportAll": "Exportera alla kontakter till GPX",
   "settings_gpxExportRepeatersSubtitle": "Exporterar repeater / roomserver med plats till GPX-fil.",
   "settings_gpxExportSuccess": "Har exporterat GPX-fil med framgång",
@@ -1591,6 +1590,15 @@
   "settings_gpxExportAllContacts": "Alla kontakters platser",
   "settings_gpxExportShareSubject": "meshcore-open export av GPX-kartdata",
   "settings_gpxExportShareText": "Kartdata exporterad från meshcore-open",
-  "pathTrace_someHopsNoLocation": "En eller flera av humlen saknar en plats!"
-
+  "pathTrace_someHopsNoLocation": "En eller flera av humlen saknar en plats!",
+  "pathTrace_clearTooltip": "Rensa väg",
+  "map_pathTraceCancelled": "Sökvägsspårning avbruten.",
+  "map_runTrace": "Kör spårsökning",
+  "map_tapToAdd": "Tryck på noder för att lägga till dem i banan.",
+  "map_removeLast": "Ta bort sista",
+  "scanner_enableBluetooth": "Aktivera Bluetooth",
+  "scanner_bluetoothOffMessage": "Vänligen aktivera Bluetooth för att söka efter enheter.",
+  "scanner_bluetoothOff": "Bluetooth är avstängt",
+  "snrIndicator_lastSeen": "Senast sedd",
+  "snrIndicator_nearByRepeaters": "Närliggande uppreparstationer"
 }

lib/l10n/app_uk.arb

@@ -1357,12 +1357,12 @@
       }
     }
   },
-  "repeater_neighbours": "Сусіди",
-  "repeater_neighboursSubtitle": "Показати сусідів нульового стрибка.",
+  "repeater_neighbors": "Сусіди",
+  "repeater_neighborsSubtitle": "Показати сусідів нульового стрибка.",
   "neighbors_receivedData": "Дані сусідів отримано",
   "neighbors_requestTimedOut": "Час запиту сусідів вичерпано.",
   "neighbors_errorLoading": "Помилка завантаження сусідів: {error}",
-  "neighbors_repeatersNeighbours": "Ретранслятори-сусіди",
+  "neighbors_repeatersNeighbors": "Ретранслятори-сусіди",
   "neighbors_noData": "Дані про сусідів недоступні.",
   "channels_createPrivateChannelDesc": "Захищено секретним ключем.",
   "channels_joinPrivateChannel": "Приєднатися до приватного каналу",
@@ -1575,7 +1575,6 @@
   "notification_newNodesCount": "{count} {count, plural, =1{новий вузол} few{нових вузли} many{нових вузлів} other{нових вузлів}}",
   "notification_newTypeDiscovered": "Виявлено новий {contactType}",
   "notification_receivedNewMessage": "Отримано нове повідомлення",
-  "contacts_ShareContactZeroHop": "Поділитися контактом за оголошенням",
   "settings_gpxExportRepeaters": "Експортувати ретранслятори / сервер кімнати до GPX",
   "settings_gpxExportRepeatersSubtitle": "Експортує ретранслятори / сервер кімнати з місцезнаходженням у файл GPX.",
   "settings_gpxExportSuccess": "Успішно експортовано файл GPX.",
@@ -1591,6 +1590,15 @@
   "settings_gpxExportShareText": "Дані карти експортовані з meshcore-open",
   "settings_gpxExportAllContacts": "Усі місця контактів",
   "settings_gpxExportShareSubject": "експорт даних карти meshcore-open у форматі GPX",
-  "pathTrace_someHopsNoLocation": "Одне або більше хмелів відсутнє місце розташування!"
-
+  "pathTrace_someHopsNoLocation": "Одне або більше хмелів відсутнє місце розташування!",
+  "map_tapToAdd": "Натисніть на вузли, щоб додати їх до шляху",
+  "map_runTrace": "Виконати трасування шляху",
+  "pathTrace_clearTooltip": "Очистити шлях",
+  "map_removeLast": "Видалити останній",
+  "map_pathTraceCancelled": "Відмінується трасування шляху",
+  "scanner_enableBluetooth": "Увімкніть Bluetooth",
+  "scanner_bluetoothOffMessage": "Будь ласка, увімкніть Bluetooth, щоб сканувати пристрої.",
+  "scanner_bluetoothOff": "Bluetooth вимкнено",
+  "snrIndicator_lastSeen": "Останній раз бачили",
+  "snrIndicator_nearByRepeaters": "Ближні ретранслятори"
 }

lib/l10n/app_zh.arb

@@ -900,8 +900,8 @@
   "repeater_telemetrySubtitle": "查看传感器和系统状态的数据。",
   "repeater_cli": "命令行界面",
   "repeater_cliSubtitle": "向复用器发送指令",
-  "repeater_neighbours": "邻居",
-  "repeater_neighboursSubtitle": "查看邻居节点（无需中间节点）。",
+  "repeater_neighbors": "邻居",
+  "repeater_neighborsSubtitle": "查看邻居节点（无需中间节点）。",
   "repeater_settings": "设置",
   "repeater_settingsSubtitle": "配置重复器参数",
   "repeater_statusTitle": "重复器状态",
@@ -1271,7 +1271,7 @@
       }
     }
   },
-  "neighbors_repeatersNeighbours": "重复使用的邻居",
+  "neighbors_repeatersNeighbors": "重复使用的邻居",
   "neighbors_noData": "没有可用的邻居信息。",
   "neighbors_unknownContact": "Unknown {pubkey}",
   "@neighbors_unknownContact": {
@@ -1575,7 +1575,6 @@
   "notification_newNodesCount": "{count} 个新节点",
   "notification_newTypeDiscovered": "发现新 {contactType}",
   "notification_receivedNewMessage": "收到新消息",
-  "contacts_contactAdvertCopyFailed": "将广告复制到剪贴板操作失败。",
   "settings_gpxExportRepeaters": "导出重复器/房间服务器到GPX",
   "settings_gpxExportRepeatersSubtitle": "导出带有位置的重复器/房间服务器到GPX文件。",
   "settings_gpxExportContactsSubtitle": "导出带有位置的伙伴到GPX文件。",
@@ -1591,6 +1590,15 @@
   "settings_gpxExportNoContacts": "没有联系人可导出",
   "settings_gpxExportShareText": "来自meshcore-open的导出地图数据",
   "settings_gpxExportShareSubject": "meshcore-open GPX 地图数据导出",
-  "pathTrace_someHopsNoLocation": "其中一个或多个啤酒花缺少位置！"
-
+  "pathTrace_someHopsNoLocation": "其中一个或多个啤酒花缺少位置！",
+  "map_tapToAdd": "点击节点将其添加到路径中",
+  "pathTrace_clearTooltip": "清除路径",
+  "map_pathTraceCancelled": "路径跟踪已取消",
+  "map_removeLast": "删除最后一个",
+  "map_runTrace": "运行路径跟踪",
+  "scanner_bluetoothOffMessage": "请打开蓝牙功能，以便搜索设备。",
+  "scanner_bluetoothOff": "蓝牙已关闭",
+  "scanner_enableBluetooth": "启用蓝牙",
+  "snrIndicator_lastSeen": "最近访问",
+  "snrIndicator_nearByRepeaters": "附近的重复器"
 }

lib/models/contact.dart

@@ -119,7 +119,7 @@ class Contact {
     final pathBytes = _pathBytesForDisplay;
     Uint8List? traceBytes;
 
-    if (pathLength <= 0) {
+    if (pathBytes.isEmpty) {
       traceBytes = Uint8List(1);
       traceBytes[0] = publicKey[0];
       return traceBytes;
@@ -160,43 +160,47 @@ class Contact {
   }
 
   static Contact? fromFrame(Uint8List data) {
-    if (data.length < contactFrameSize) return null;
+    if (data.isEmpty) return null;
     if (data[0] != respCodeContact) return null;
+    try {
+      final pubKey = Uint8List.fromList(
+        data.sublist(contactPubKeyOffset, contactPubKeyOffset + pubKeySize),
+      );
+      final type = data[contactTypeOffset];
+      final pathLen = data[contactPathLenOffset].toSigned(8);
+      final safePathLen = pathLen > 0
+          ? (pathLen > maxPathSize ? maxPathSize : pathLen)
+          : 0;
+      final pathBytes = safePathLen > 0
+          ? Uint8List.fromList(
+              data.sublist(contactPathOffset, contactPathOffset + safePathLen),
+            )
+          : Uint8List(0);
+      final name = readCString(data, contactNameOffset, maxNameSize);
+      final lastmod = readUint32LE(data, contactLastmodOffset);
 
-    final pubKey = Uint8List.fromList(
-      data.sublist(contactPubKeyOffset, contactPubKeyOffset + pubKeySize),
-    );
-    final type = data[contactTypeOffset];
-    final pathLen = data[contactPathLenOffset].toSigned(8);
-    final safePathLen = pathLen > 0
-        ? (pathLen > maxPathSize ? maxPathSize : pathLen)
-        : 0;
-    final pathBytes = safePathLen > 0
-        ? Uint8List.fromList(
-            data.sublist(contactPathOffset, contactPathOffset + safePathLen),
-          )
-        : Uint8List(0);
-    final name = readCString(data, contactNameOffset, maxNameSize);
-    final lastmod = readUint32LE(data, contactLastmodOffset);
+      double? lat, lon;
+      final latRaw = readInt32LE(data, contactLatOffset);
+      final lonRaw = readInt32LE(data, contactLonOffset);
+      if (latRaw != 0 || lonRaw != 0) {
+        lat = latRaw / 1e6;
+        lon = lonRaw / 1e6;
+      }
 
-    double? lat, lon;
-    final latRaw = readInt32LE(data, contactLatOffset);
-    final lonRaw = readInt32LE(data, contactLonOffset);
-    if (latRaw != 0 || lonRaw != 0) {
-      lat = latRaw / 1e6;
-      lon = lonRaw / 1e6;
+      return Contact(
+        publicKey: pubKey,
+        name: name.isEmpty ? 'Unknown' : name,
+        type: type,
+        pathLength: pathLen,
+        path: pathBytes,
+        latitude: lat,
+        longitude: lon,
+        lastSeen: DateTime.fromMillisecondsSinceEpoch(lastmod * 1000),
+      );
+    } catch (e) {
+      // If parsing fails, return null
+      return null;
     }
-
-    return Contact(
-      publicKey: pubKey,
-      name: name.isEmpty ? 'Unknown' : name,
-      type: type,
-      pathLength: pathLen,
-      path: pathBytes,
-      latitude: lat,
-      longitude: lon,
-      lastSeen: DateTime.fromMillisecondsSinceEpoch(lastmod * 1000),
-    );
   }
 
   @override

lib/screens/app_debug_log_screen.dart

@@ -55,7 +55,7 @@ class AppDebugLogScreen extends StatelessWidget {
             child: hasEntries
                 ? ListView.separated(
                     itemCount: entries.length,
-                    separatorBuilder: (_, __) => const Divider(height: 1),
+                    separatorBuilder: (_, _) => const Divider(height: 1),
                     itemBuilder: (context, index) {
                       final entry = entries[index];
                       return ListTile(

lib/screens/app_settings_screen.dart

@@ -384,6 +384,7 @@ class AppSettingsScreen extends StatelessWidget {
     );
   }
 
+  // Fixed rendering issues
   Widget _buildBatteryCard(
     BuildContext context,
     AppSettingsService settingsService,
@@ -399,6 +400,7 @@ class AppSettingsScreen extends StatelessWidget {
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
+          const SizedBox(height: 4),
           Padding(
             padding: const EdgeInsets.fromLTRB(16, 16, 16, 8),
             child: Text(
@@ -406,6 +408,8 @@ class AppSettingsScreen extends StatelessWidget {
               style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
             ),
           ),
+
+          // Main tile (icon + text only)
           ListTile(
             leading: const Icon(Icons.battery_full),
             title: Text(context.l10n.appSettings_batteryChemistry),
@@ -416,8 +420,19 @@ class AppSettingsScreen extends StatelessWidget {
                     )
                   : context.l10n.appSettings_batteryChemistryConnectFirst,
             ),
-            trailing: DropdownButton<String>(
-              value: selection,
+            contentPadding: const EdgeInsets.symmetric(horizontal: 16),
+          ),
+
+          // Dropdown (separate full-width row)
+          Padding(
+            padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
+            child: DropdownButtonFormField<String>(
+              initialValue: selection,
+              isExpanded: true,
+              decoration: const InputDecoration(
+                border: UnderlineInputBorder(),
+                isDense: true,
+              ),
               onChanged: isConnected
                   ? (value) {
                       if (value != null) {

lib/screens/ble_debug_log_screen.dart

@@ -100,7 +100,7 @@ class _BleDebugLogScreenState extends State<BleDebugLogScreen> {
                           itemCount: showingFrames
                               ? entries.length
                               : rawEntries.length,
-                          separatorBuilder: (_, __) => const Divider(height: 1),
+                          separatorBuilder: (_, _) => const Divider(height: 1),
                           itemBuilder: (context, index) {
                             if (showingFrames) {
                               final entry = entries[index];

lib/screens/channel_chat_screen.dart

@@ -901,7 +901,8 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
     Navigator.push(
       context,
       MaterialPageRoute(
-        builder: (context) => ChannelMessagePathScreen(message: message),
+        builder: (context) =>
+            ChannelMessagePathScreen(message: message, channelMessage: true),
       ),
     );
   }

lib/screens/channel_message_path_screen.dart

@@ -17,18 +17,27 @@ import '../models/contact.dart';
 
 class ChannelMessagePathScreen extends StatelessWidget {
   final ChannelMessage message;
-
-  const ChannelMessagePathScreen({super.key, required this.message});
+  final bool channelMessage;
+  const ChannelMessagePathScreen({
+    super.key,
+    required this.message,
+    this.channelMessage = false,
+  });
 
   @override
   Widget build(BuildContext context) {
     return Consumer<MeshCoreConnector>(
       builder: (context, connector, _) {
         final l10n = context.l10n;
-        final primaryPath = _selectPrimaryPath(
+        final primaryPathTmp = _selectPrimaryPath(
           message.pathBytes,
           message.pathVariants,
         );
+
+        final primaryPath = !channelMessage && !message.isOutgoing
+            ? Uint8List.fromList(primaryPathTmp.reversed.toList())
+            : primaryPathTmp;
+
         final hops = _buildPathHops(primaryPath, connector.contacts, l10n);
         final hasHopDetails = primaryPath.isNotEmpty;
         final observedLabel = _formatObservedHops(
@@ -37,7 +46,6 @@ class ChannelMessagePathScreen extends StatelessWidget {
           l10n,
         );
         final extraPaths = _otherPaths(primaryPath, message.pathVariants);
-
         return Scaffold(
           appBar: AppBar(
             title: Text(l10n.channelPath_title),
@@ -50,9 +58,9 @@ class ChannelMessagePathScreen extends StatelessWidget {
                   MaterialPageRoute(
                     builder: (context) => PathTraceMapScreen(
                       title: context.l10n.contacts_repeaterPathTrace,
-                      path: Uint8List.fromList(primaryPath),
+                      path: primaryPath,
                       flipPathRound: true,
-                      reversePathRound: true,
+                      reversePathRound: !message.isOutgoing && !channelMessage,
                     ),
                   ),
                 ),
@@ -62,7 +70,7 @@ class ChannelMessagePathScreen extends StatelessWidget {
                 tooltip: l10n.channelPath_viewMap,
                 onPressed: hasHopDetails
                     ? () {
-                        _openPathMap(context);
+                        _openPathMap(context, channelMessage: channelMessage);
                       }
                     : null,
               ),
@@ -157,7 +165,11 @@ class ChannelMessagePathScreen extends StatelessWidget {
               ),
               subtitle: Text(_formatPathPrefixes(variants[i])),
               trailing: const Icon(Icons.map_outlined, size: 20),
-              onTap: () => _openPathMap(context, initialPath: variants[i]),
+              onTap: () => _openPathMap(
+                context,
+                initialPath: variants[i],
+                channelMessage: channelMessage,
+              ),
             ),
           ),
       ],
@@ -248,13 +260,18 @@ class ChannelMessagePathScreen extends StatelessWidget {
     );
   }
 
-  void _openPathMap(BuildContext context, {Uint8List? initialPath}) {
+  void _openPathMap(
+    BuildContext context, {
+    Uint8List? initialPath,
+    bool channelMessage = false,
+  }) {
     Navigator.push(
       context,
       MaterialPageRoute(
         builder: (context) => ChannelMessagePathMapScreen(
           message: message,
           initialPath: initialPath,
+          channelMessage: channelMessage,
         ),
       ),
     );
@@ -264,11 +281,13 @@ class ChannelMessagePathScreen extends StatelessWidget {
 class ChannelMessagePathMapScreen extends StatefulWidget {
   final ChannelMessage message;
   final Uint8List? initialPath;
+  final bool channelMessage;
 
   const ChannelMessagePathMapScreen({
     super.key,
     required this.message,
     this.initialPath,
+    this.channelMessage = false,
   });
 
   @override
@@ -323,11 +342,18 @@ class _ChannelMessagePathMapScreenState
           primaryPath,
           widget.message.pathVariants,
         );
-        final selectedPath = _resolveSelectedPath(
+        final selectedPathTmp = _resolveSelectedPath(
           _selectedPath,
           observedPaths,
           primaryPath,
         );
+
+        final selectedPath =
+            ((!widget.message.isOutgoing && !widget.channelMessage) ||
+                (widget.message.isOutgoing && widget.channelMessage))
+            ? Uint8List.fromList(selectedPathTmp.reversed.toList())
+            : selectedPathTmp;
+
         final selectedIndex = _indexForPath(selectedPath, observedPaths);
         final hops = _buildPathHops(
           selectedPath,
@@ -336,12 +362,24 @@ class _ChannelMessagePathMapScreenState
         );
 
         final points = <LatLng>[];
+        print(
+          'outgoing: ${widget.message.isOutgoing}, channelMsg: ${widget.channelMessage}',
+        );
+        if ((widget.message.isOutgoing && !widget.channelMessage) ||
+            (widget.message.isOutgoing && widget.channelMessage)) {
+          points.add(LatLng(connector.selfLatitude!, connector.selfLongitude!));
+        }
+
         for (final hop in hops) {
           if (hop.hasLocation) {
             points.add(hop.position!);
           }
         }
-        points.add(LatLng(connector.selfLatitude!, connector.selfLongitude!));
+
+        if ((!widget.message.isOutgoing && !widget.channelMessage) ||
+            (!widget.message.isOutgoing && widget.channelMessage)) {
+          points.add(LatLng(connector.selfLatitude!, connector.selfLongitude!));
+        }
 
         final polylines = points.length > 1
             ? [
@@ -594,7 +632,7 @@ class _ChannelMessagePathMapScreenState
                     : ListView.separated(
                         padding: const EdgeInsets.symmetric(vertical: 4),
                         itemCount: hops.length,
-                        separatorBuilder: (_, __) => const Divider(height: 1),
+                        separatorBuilder: (_, _) => const Divider(height: 1),
                         itemBuilder: (context, index) {
                           final hop = hops[index];
                           return ListTile(

lib/screens/channels_screen.dart

@@ -3,6 +3,7 @@ import 'dart:math';
 import 'dart:typed_data';
 
 import 'package:flutter/material.dart';
+import 'package:meshcore_open/widgets/app_bar.dart';
 import 'package:provider/provider.dart';
 import 'package:uuid/uuid.dart';
 
@@ -14,7 +15,6 @@ import '../storage/community_store.dart';
 import '../utils/dialog_utils.dart';
 import '../utils/disconnect_navigation_mixin.dart';
 import '../utils/route_transitions.dart';
-import '../widgets/battery_indicator.dart';
 import '../widgets/list_filter_widget.dart';
 import '../widgets/empty_state.dart';
 import '../widgets/qr_code_display.dart';
@@ -116,8 +116,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
       canPop: allowBack,
       child: Scaffold(
         appBar: AppBar(
-          leading: BatteryIndicator(connector: connector),
-          title: Text(context.l10n.channels_title),
+          title: AppBarTitle(context.l10n.channels_title),
           centerTitle: true,
           automaticallyImplyLeading: false,
           actions: [

lib/screens/chat_screen.dart

@@ -437,6 +437,20 @@ class _ChatScreenState extends State<ChatScreen> {
       builder: (context) => Consumer<PathHistoryService>(
         builder: (context, pathService, _) {
           final paths = pathService.getRecentPaths(widget.contact.publicKeyHex);
+
+          final repeatersList = List.of(connector.directRepeaters)
+            ..sort((a, b) => b.ranking.compareTo(a.ranking));
+
+          final directRepeater = repeatersList.isEmpty
+              ? null
+              : repeatersList.first;
+          final secondDirectRepeater = repeatersList.length < 2
+              ? null
+              : repeatersList.elementAt(1);
+          final thirdDirectRepeater = repeatersList.length < 3
+              ? null
+              : repeatersList.elementAt(2);
+
           return AlertDialog(
             title: Row(
               children: [
@@ -478,15 +492,38 @@ class _ChatScreenState extends State<ChatScreen> {
                     ],
                     const SizedBox(height: 8),
                     ...paths.map((path) {
+                      final isDirectRepeater =
+                          directRepeater != null &&
+                          path.pathBytes.isNotEmpty &&
+                          directRepeater.pubkeyFirstByte ==
+                              path.pathBytes.first;
+                      final isSecondDirectRepeater =
+                          secondDirectRepeater != null &&
+                          path.pathBytes.isNotEmpty &&
+                          secondDirectRepeater.pubkeyFirstByte ==
+                              path.pathBytes.first;
+                      final isThirdDirectRepeater =
+                          thirdDirectRepeater != null &&
+                          path.pathBytes.isNotEmpty &&
+                          thirdDirectRepeater.pubkeyFirstByte ==
+                              path.pathBytes.first;
+                      Color color = Colors.grey;
+                      if (isDirectRepeater) {
+                        color = Colors.green;
+                      } else if (isSecondDirectRepeater) {
+                        color = Colors.yellow;
+                      } else if (isThirdDirectRepeater) {
+                        color = Colors.red;
+                      } else if (path.wasFloodDiscovery) {
+                        color = Colors.blue;
+                      }
                       return Card(
                         margin: const EdgeInsets.symmetric(vertical: 4),
                         child: ListTile(
                           dense: true,
                           leading: CircleAvatar(
                             radius: 16,
-                            backgroundColor: path.wasFloodDiscovery
-                                ? Colors.blue
-                                : Colors.green,
+                            backgroundColor: color,
                             child: Text(
                               '${path.hopCount}',
                               style: const TextStyle(fontSize: 12),

lib/screens/contacts_screen.dart

@@ -3,6 +3,8 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:meshcore_open/screens/path_trace_map.dart';
+import 'package:meshcore_open/utils/app_logger.dart';
+import 'package:meshcore_open/widgets/app_bar.dart';
 import 'package:provider/provider.dart';
 
 import '../connector/meshcore_connector.dart';
@@ -16,7 +18,6 @@ import '../utils/dialog_utils.dart';
 import '../utils/disconnect_navigation_mixin.dart';
 import '../utils/emoji_utils.dart';
 import '../utils/route_transitions.dart';
-import '../widgets/battery_indicator.dart';
 import '../widgets/list_filter_widget.dart';
 import '../widgets/empty_state.dart';
 import '../widgets/quick_switch_bar.dart';
@@ -90,79 +91,90 @@ class _ContactsScreenState extends State<ContactsScreen>
     _frameSubscription = connector.receivedFrames.listen((frame) {
       if (frame.isEmpty) return;
       final frameBuffer = BufferReader(frame);
-      final code = frameBuffer.readUInt8();
+      try {
+        final code = frameBuffer.readUInt8();
 
-      if (code == respCodeExportContact) {
-        final advertPacket = frameBuffer.readRemainingBytes();
-        // Validate packet has expected minimum size (98+ bytes per protocol)
-        if (advertPacket.length < 98) {
-          if (mounted) {
+        if (code == respCodeExportContact) {
+          final advertPacket = frameBuffer.readRemainingBytes();
+          // Validate packet has expected minimum size (98+ bytes per protocol)
+          if (advertPacket.length < 98) {
+            if (mounted) {
+              ScaffoldMessenger.of(context).showSnackBar(
+                SnackBar(
+                  content: Text(context.l10n.contacts_invalidAdvertFormat),
+                ),
+              );
+            }
+            _pendingOperations.remove(ContactOperationType.export);
+            return;
+          }
+          final hexString = pubKeyToHex(advertPacket);
+          Clipboard.setData(ClipboardData(text: "meshcore://$hexString"));
+        }
+
+        if (code == respCodeOk) {
+          // Show a snackbar indicating success
+          if (!mounted) return;
+
+          if (_pendingOperations.contains(ContactOperationType.import)) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(content: Text(context.l10n.contacts_contactImported)),
+            );
+          }
+
+          if (_pendingOperations.contains(ContactOperationType.zeroHopShare)) {
             ScaffoldMessenger.of(context).showSnackBar(
               SnackBar(
-                content: Text(context.l10n.contacts_invalidAdvertFormat),
+                content: Text(context.l10n.contacts_zeroHopContactAdvertSent),
               ),
             );
           }
-          _pendingOperations.remove(ContactOperationType.export);
-          return;
-        }
-        final hexString = pubKeyToHex(advertPacket);
-        Clipboard.setData(ClipboardData(text: "meshcore://$hexString"));
-      }
 
-      if (code == respCodeOk) {
-        // Show a snackbar indicating success
-        if (!mounted) return;
+          if (_pendingOperations.contains(ContactOperationType.export)) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: Text(context.l10n.contacts_contactAdvertCopied),
+              ),
+            );
+          }
 
-        if (_pendingOperations.contains(ContactOperationType.import)) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(content: Text(context.l10n.contacts_contactImported)),
-          );
+          _pendingOperations.clear();
         }
 
-        if (_pendingOperations.contains(ContactOperationType.zeroHopShare)) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(
-              content: Text(context.l10n.contacts_zeroHopContactAdvertSent),
-            ),
-          );
+        if (code == respCodeErr) {
+          // Show a snackbar indicating failure
+          if (!mounted) return;
+
+          if (_pendingOperations.contains(ContactOperationType.import)) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: Text(context.l10n.contacts_contactImportFailed),
+              ),
+            );
+          }
+
+          if (_pendingOperations.contains(ContactOperationType.zeroHopShare)) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: Text(context.l10n.contacts_zeroHopContactAdvertFailed),
+              ),
+            );
+          }
+          if (_pendingOperations.contains(ContactOperationType.export)) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: Text(context.l10n.contacts_contactAdvertCopyFailed),
+              ),
+            );
+          }
+
+          _pendingOperations.clear();
         }
-
-        if (_pendingOperations.contains(ContactOperationType.export)) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(content: Text(context.l10n.contacts_contactAdvertCopied)),
-          );
-        }
-
-        _pendingOperations.clear();
-      }
-
-      if (code == respCodeErr) {
-        // Show a snackbar indicating failure
-        if (!mounted) return;
-
-        if (_pendingOperations.contains(ContactOperationType.import)) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(content: Text(context.l10n.contacts_contactImportFailed)),
-          );
-        }
-
-        if (_pendingOperations.contains(ContactOperationType.zeroHopShare)) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(
-              content: Text(context.l10n.contacts_zeroHopContactAdvertFailed),
-            ),
-          );
-        }
-        if (_pendingOperations.contains(ContactOperationType.export)) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(
-              content: Text(context.l10n.contacts_contactAdvertCopyFailed),
-            ),
-          );
-        }
-
-        _pendingOperations.clear();
+      } catch (e) {
+        appLogger.error(
+          'Error processing received frame: $e',
+          tag: 'ContactsScreen',
+        );
       }
     });
   }
@@ -229,9 +241,7 @@ class _ContactsScreenState extends State<ContactsScreen>
       canPop: allowBack,
       child: Scaffold(
         appBar: AppBar(
-          leading: BatteryIndicator(connector: connector),
-          title: Text(context.l10n.contacts_title),
-          centerTitle: true,
+          title: AppBarTitle(context.l10n.contacts_title),
           automaticallyImplyLeading: false,
           actions: [
             PopupMenuButton(

lib/screens/map_screen.dart

@@ -1,8 +1,11 @@
 import 'dart:math';
+import 'dart:typed_data';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:latlong2/latlong.dart';
+import 'package:meshcore_open/screens/path_trace_map.dart';
+import 'package:meshcore_open/widgets/app_bar.dart';
 import 'package:provider/provider.dart';
 
 import '../connector/meshcore_connector.dart';
@@ -15,7 +18,6 @@ import '../services/map_marker_service.dart';
 import '../services/map_tile_cache_service.dart';
 import '../utils/contact_search.dart';
 import '../utils/route_transitions.dart';
-import '../widgets/battery_indicator.dart';
 import '../widgets/quick_switch_bar.dart';
 import 'channels_screen.dart';
 import 'chat_screen.dart';
@@ -48,9 +50,14 @@ class _MapScreenState extends State<MapScreen> {
   final MapMarkerService _markerService = MapMarkerService();
   final Set<String> _hiddenMarkerIds = {};
   Set<String> _removedMarkerIds = {};
+  bool _isBuildingPathTrace = false;
   bool _isSelectingPoi = false;
   bool _hasInitializedMap = false;
   bool _removedMarkersLoaded = false;
+  final List<int> _pathTrace = [];
+  final List<LatLng> _points = [];
+  final List<Polyline> _polylines = [];
+  bool _legendExpanded = false;
 
   @override
   void initState() {
@@ -98,7 +105,7 @@ class _MapScreenState extends State<MapScreen> {
   double _zoomFromStdDev(double latStdDev, double lonStdDev) {
     final maxSpread = max(latStdDev, lonStdDev);
     if (maxSpread <= 0) return 13.0;
-    // Approzimate: each zoom level halves the visible area
+    // Approximate: each zoom level halves the visible area
     // ~0.01 degrees spread -> zoom 13, ~0.1 -> zoom 10, ~1.0 -> zoom 7
     final zoom = 10.0 - log(maxSpread * 10 + 1) / ln10 * 3;
     return zoom.clamp(4.0, 15.0);
@@ -147,6 +154,19 @@ class _MapScreenState extends State<MapScreen> {
             .where((c) => c.hasLocation)
             .toList();
 
+        _polylines.clear();
+        _polylines.addAll(
+          _points.length > 1
+              ? [
+                  Polyline(
+                    points: _points,
+                    strokeWidth: 4,
+                    color: Colors.blueAccent,
+                  ),
+                ]
+              : <Polyline>[],
+        );
+
         // Calculate center and zoom of all nodes, or default to (0, 0)
         LatLng center = const LatLng(0, 0);
         double initialZoom = 10.0;
@@ -242,11 +262,16 @@ class _MapScreenState extends State<MapScreen> {
           canPop: allowBack,
           child: Scaffold(
             appBar: AppBar(
-              leading: BatteryIndicator(connector: connector),
-              title: Text(context.l10n.map_title),
+              title: AppBarTitle(context.l10n.map_title),
               centerTitle: true,
               automaticallyImplyLeading: false,
               actions: [
+                if (!_isBuildingPathTrace)
+                  IconButton(
+                    icon: const Icon(Icons.radar),
+                    onPressed: () => _startPath(),
+                    tooltip: context.l10n.contacts_pathTrace,
+                  ),
                 PopupMenuButton(
                   itemBuilder: (context) => [
                     PopupMenuItem(
@@ -334,6 +359,8 @@ class _MapScreenState extends State<MapScreen> {
                           MapTileCacheService.userAgentPackageName,
                       maxZoom: 19,
                     ),
+                    if (_polylines.isNotEmpty && _isBuildingPathTrace)
+                      PolylineLayer(polylines: _polylines),
                     MarkerLayer(
                       markers: [
                         if (highlightPosition != null)
@@ -356,8 +383,8 @@ class _MapScreenState extends State<MapScreen> {
                               connector.selfLatitude!,
                               connector.selfLongitude!,
                             ),
-                            width: 35,
-                            height: 35,
+                            width: 40,
+                            height: 40,
                             child: Container(
                               padding: const EdgeInsets.all(4),
                               decoration: BoxDecoration(
@@ -390,7 +417,12 @@ class _MapScreenState extends State<MapScreen> {
                     ),
                   ],
                 ),
-                _buildLegend(contactsWithLocation.length, sharedMarkers.length),
+                if (!_isBuildingPathTrace)
+                  _buildLegend(
+                    contactsWithLocation.length,
+                    sharedMarkers.length,
+                  ),
+                if (_isBuildingPathTrace) _buildPathTraceOverlay(),
               ],
             ),
             bottomNavigationBar: SafeArea(
@@ -434,7 +466,11 @@ class _MapScreenState extends State<MapScreen> {
         width: 35,
         height: 35,
         child: GestureDetector(
-          onTap: () => _showNodeInfo(context, contact),
+          onLongPress: () =>
+              _isBuildingPathTrace ? _showNodeInfo(context, contact) : null,
+          onTap: () => _isBuildingPathTrace
+              ? _addToPath(context, contact)
+              : _showNodeInfo(context, contact),
           child: Column(
             children: [
               Container(
@@ -503,60 +539,102 @@ class _MapScreenState extends State<MapScreen> {
       top: 16,
       right: 16,
       child: Card(
-        child: Padding(
-          padding: const EdgeInsets.all(12.0),
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              Text(
-                context.l10n.map_nodesCount(nodeCount),
-                style: const TextStyle(
-                  fontWeight: FontWeight.bold,
-                  fontSize: 14,
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            InkWell(
+              borderRadius: BorderRadius.circular(12),
+              onTap: () {
+                setState(() {
+                  _legendExpanded = !_legendExpanded;
+                });
+              },
+              child: Padding(
+                padding: const EdgeInsets.fromLTRB(12, 10, 12, 10),
+                child: Row(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text(
+                          context.l10n.map_nodesCount(nodeCount),
+                          style: const TextStyle(
+                            fontWeight: FontWeight.bold,
+                            fontSize: 14,
+                          ),
+                        ),
+                        Text(
+                          context.l10n.map_pinsCount(markerCount),
+                          style: const TextStyle(
+                            fontWeight: FontWeight.w600,
+                            fontSize: 12,
+                          ),
+                        ),
+                      ],
+                    ),
+                    const SizedBox(width: 8),
+                    AnimatedRotation(
+                      turns: _legendExpanded ? 0.5 : 0,
+                      duration: const Duration(milliseconds: 200),
+                      child: const Icon(Icons.expand_more, size: 20),
+                    ),
+                  ],
                 ),
               ),
-              Text(
-                context.l10n.map_pinsCount(markerCount),
-                style: const TextStyle(
-                  fontWeight: FontWeight.bold,
-                  fontSize: 12,
+            ),
+            AnimatedCrossFade(
+              firstChild: const SizedBox.shrink(),
+              secondChild: Padding(
+                padding: const EdgeInsets.fromLTRB(12, 0, 12, 12),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    const SizedBox(height: 6),
+                    _buildLegendItem(
+                      Icons.person,
+                      context.l10n.map_chat,
+                      Colors.blue,
+                    ),
+                    _buildLegendItem(
+                      Icons.router,
+                      context.l10n.map_repeater,
+                      Colors.green,
+                    ),
+                    _buildLegendItem(
+                      Icons.meeting_room,
+                      context.l10n.map_room,
+                      Colors.purple,
+                    ),
+                    _buildLegendItem(
+                      Icons.sensors,
+                      context.l10n.map_sensor,
+                      Colors.orange,
+                    ),
+                    _buildLegendItem(
+                      Icons.flag,
+                      context.l10n.map_pinDm,
+                      Colors.blue,
+                    ),
+                    _buildLegendItem(
+                      Icons.flag,
+                      context.l10n.map_pinPrivate,
+                      Colors.purple,
+                    ),
+                    _buildLegendItem(
+                      Icons.flag,
+                      context.l10n.map_pinPublic,
+                      Colors.orange,
+                    ),
+                  ],
                 ),
               ),
-              const SizedBox(height: 8),
-              _buildLegendItem(
-                Icons.person,
-                context.l10n.map_chat,
-                Colors.blue,
-              ),
-              _buildLegendItem(
-                Icons.router,
-                context.l10n.map_repeater,
-                Colors.green,
-              ),
-              _buildLegendItem(
-                Icons.meeting_room,
-                context.l10n.map_room,
-                Colors.purple,
-              ),
-              _buildLegendItem(
-                Icons.sensors,
-                context.l10n.map_sensor,
-                Colors.orange,
-              ),
-              _buildLegendItem(Icons.flag, context.l10n.map_pinDm, Colors.blue),
-              _buildLegendItem(
-                Icons.flag,
-                context.l10n.map_pinPrivate,
-                Colors.purple,
-              ),
-              _buildLegendItem(
-                Icons.flag,
-                context.l10n.map_pinPublic,
-                Colors.orange,
-              ),
-            ],
-          ),
+              crossFadeState: _legendExpanded
+                  ? CrossFadeState.showSecond
+                  : CrossFadeState.showFirst,
+              duration: const Duration(milliseconds: 200),
+            ),
+          ],
         ),
       ),
     );
@@ -564,7 +642,7 @@ class _MapScreenState extends State<MapScreen> {
 
   Widget _buildLegendItem(IconData icon, String label, Color color) {
     return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 4.0),
+      padding: const EdgeInsets.symmetric(vertical: 1.0),
       child: Row(
         mainAxisSize: MainAxisSize.min,
         children: [
@@ -747,7 +825,7 @@ class _MapScreenState extends State<MapScreen> {
               color: _getNodeColor(contact.type),
             ),
             const SizedBox(width: 8),
-            Expanded(child: Text(contact.name)),
+            Expanded(child: SelectableText(contact.name)),
           ],
         ),
         content: Column(
@@ -918,7 +996,7 @@ class _MapScreenState extends State<MapScreen> {
             ),
           ),
           const SizedBox(height: 2),
-          Text(value, style: const TextStyle(fontSize: 14)),
+          SelectableText(value, style: const TextStyle(fontSize: 14)),
         ],
       ),
     );
@@ -1412,6 +1490,114 @@ class _MapScreenState extends State<MapScreen> {
       return context.l10n.time_allTime;
     }
   }
+
+  void _addToPath(BuildContext context, Contact contact) {
+    setState(() {
+      _pathTrace.add(
+        contact.publicKey[0],
+      ); // Add first 16 bytes of public key to path trace
+      _points.add(LatLng(contact.latitude!, contact.longitude!));
+    });
+  }
+
+  void _startPath() {
+    setState(() {
+      _isBuildingPathTrace = true;
+      _pathTrace.clear();
+      _points.clear();
+      _polylines.clear();
+    });
+  }
+
+  void _removePath() {
+    setState(() {
+      _pathTrace.removeLast(); // Remove last node from path trace
+      _points.removeLast(); // Remove last point from points list
+      _polylines.clear(); // Clear polylines
+    });
+  }
+
+  Widget _buildPathTraceOverlay() {
+    final l10n = context.l10n;
+    return Positioned(
+      top: 16,
+      left: 16,
+      right: 16,
+      child: Card(
+        child: Padding(
+          padding: const EdgeInsets.all(12.0),
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Text(
+                l10n.contacts_pathTrace,
+                style: TextStyle(fontWeight: FontWeight.bold),
+              ),
+              if (_pathTrace.isEmpty) const SizedBox(height: 8),
+              if (_pathTrace.isEmpty)
+                Text(l10n.map_tapToAdd, style: TextStyle(fontSize: 12)),
+              const SizedBox(height: 6),
+              if (_pathTrace.isNotEmpty)
+                Text(
+                  "${l10n.path_currentPathLabel} ${formatDistance(getPathDistanceMeters(_points))}",
+                  style: TextStyle(fontSize: 12, color: Colors.grey[700]),
+                ),
+              SelectableText(
+                _pathTrace
+                    .map((b) => b.toRadixString(16).padLeft(2, '0'))
+                    .join(','),
+                style: TextStyle(fontSize: 18),
+              ),
+              const SizedBox(height: 6),
+              Row(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  if (_pathTrace.isNotEmpty)
+                    ElevatedButton(
+                      onPressed: () {
+                        Navigator.push(
+                          context,
+                          MaterialPageRoute(
+                            builder: (context) => PathTraceMapScreen(
+                              title: l10n.contacts_pathTrace,
+                              path: Uint8List.fromList(_pathTrace),
+                            ),
+                          ),
+                        );
+                        setState(() {
+                          _isBuildingPathTrace = false;
+                        });
+                      },
+                      child: Text(l10n.map_runTrace),
+                    ),
+                  if (_pathTrace.isNotEmpty)
+                    ElevatedButton(
+                      onPressed: _removePath,
+                      child: Text(l10n.map_removeLast),
+                    ),
+                  if (_pathTrace.isEmpty)
+                    ElevatedButton(
+                      onPressed: () {
+                        setState(() {
+                          _isBuildingPathTrace = false;
+                          _pathTrace.clear();
+                          _points.clear();
+                          _polylines.clear();
+                        });
+                        ScaffoldMessenger.of(context).showSnackBar(
+                          SnackBar(content: Text(l10n.map_pathTraceCancelled)),
+                        );
+                      },
+                      child: Text(l10n.common_cancel),
+                    ),
+                ],
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
 }
 
 class _MarkerPayload {

lib/screens/neighbors_screen.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:meshcore_open/utils/app_logger.dart';
 import 'package:provider/provider.dart';
 import '../l10n/l10n.dart';
 import '../models/contact.dart';
@@ -11,28 +12,28 @@ import '../services/repeater_command_service.dart';
 import '../widgets/path_management_dialog.dart';
 import '../widgets/snr_indicator.dart';
 
-class NeighboursScreen extends StatefulWidget {
+class NeighborsScreen extends StatefulWidget {
   final Contact repeater;
   final String password;
 
-  const NeighboursScreen({
+  const NeighborsScreen({
     super.key,
     required this.repeater,
     required this.password,
   });
 
   @override
-  State<NeighboursScreen> createState() => _NeighboursScreenState();
+  State<NeighborsScreen> createState() => _NeighborsScreenState();
 }
 
-class _NeighboursScreenState extends State<NeighboursScreen> {
-  static const int _reqNeighboursKeyLen = 4;
+class _NeighborsScreenState extends State<NeighborsScreen> {
+  static const int _reqNeighborsKeyLen = 4;
   static const int _statusPayloadOffset = 8;
   static const int _statusStatsSize = 52;
   static const int _statusResponseBytes =
       _statusPayloadOffset + _statusStatsSize;
   Uint8List _tagData = Uint8List(4);
-  int _neighbourCount = 0;
+  int _neighborCount = 0;
 
   bool _isLoading = false;
   bool _isLoaded = false;
@@ -41,7 +42,7 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
   StreamSubscription<Uint8List>? _frameSubscription;
   RepeaterCommandService? _commandService;
   PathSelection? _pendingStatusSelection;
-  List<Map<String, dynamic>>? _parsedNeighbours;
+  List<Map<String, dynamic>>? _parsedNeighbors;
 
   @override
   void initState() {
@@ -49,7 +50,7 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
     final connector = Provider.of<MeshCoreConnector>(context, listen: false);
     _commandService = RepeaterCommandService(connector);
     _setupMessageListener();
-    _loadNeighbours();
+    _loadNeighbors();
     _hasData = false;
   }
 
@@ -62,13 +63,12 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
 
       if (frame[0] == respCodeSent) {
         _tagData = frame.sublist(2, 6);
-        //_timeEstment = frame.buffer.asByteData().getUint32(6, Endian.little);
       }
 
       // Check if it's a binary response
       if (frame[0] == pushCodeBinaryResponse &&
           listEquals(frame.sublist(2, 6), _tagData)) {
-        _handleNeighboursResponse(connector, frame.sublist(6));
+        _handleNeighborsResponse(connector, frame.sublist(6));
       }
     });
   }
@@ -91,65 +91,77 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
     return '${h}h ${m2}m';
   }
 
-  static List<Map<String, dynamic>> parseNeighboursData(
+  static List<Map<String, dynamic>> parseNeighborsData(
     BufferReader buffer,
     int resultsCount,
   ) {
-    final Map<int, Map<String, dynamic>> neighbours = {};
-    for (var i = 0; i < resultsCount; i++) {
-      final neighbourData = neighbours.putIfAbsent(
-        i,
-        () => {
-          'contact': null,
-          'publicKey': <Uint8List>{},
-          'lastHeard': <int>{},
-          'snr': <double>{},
-        },
-      );
-      neighbourData['publicKey'] = buffer.readBytes(_reqNeighboursKeyLen);
-      neighbourData['lastHeard'] = buffer.readUInt32LE();
-      neighbourData['snr'] = buffer.readInt8() / 4.0;
-    }
+    final Map<int, Map<String, dynamic>> neighbors = {};
+    try {
+      for (var i = 0; i < resultsCount; i++) {
+        final neighborData = neighbors.putIfAbsent(
+          i,
+          () => {
+            'contact': null,
+            'publicKey': <Uint8List>{},
+            'lastHeard': <int>{},
+            'snr': <double>{},
+          },
+        );
+        neighborData['publicKey'] = buffer.readBytes(_reqNeighborsKeyLen);
+        neighborData['lastHeard'] = buffer.readUInt32LE();
+        neighborData['snr'] = buffer.readInt8() / 4.0;
+      }
 
-    return neighbours.values.toList();
+      return neighbors.values.toList();
+    } catch (e) {
+      appLogger.error(
+        'Error parsing neighbors data: $e',
+        tag: 'NeighborsScreen',
+      );
+      return [];
+    }
   }
 
-  void _handleNeighboursResponse(MeshCoreConnector connector, Uint8List frame) {
+  void _handleNeighborsResponse(MeshCoreConnector connector, Uint8List frame) {
     final buffer = BufferReader(frame);
-    final neighbourCount = buffer.readUInt16LE();
-    final parsedNeighbours = parseNeighboursData(buffer, buffer.readUInt16LE());
-    connector.contacts.where((c) => c.type == advTypeRepeater).forEach((
-      repeater,
-    ) {
-      for (var neighbourData in parsedNeighbours) {
-        final publicKey = neighbourData['publicKey'];
-        if (listEquals(
-          repeater.publicKey.sublist(0, _reqNeighboursKeyLen),
-          publicKey,
-        )) {
-          neighbourData['contact'] = repeater;
+    try {
+      final neighborCount = buffer.readUInt16LE();
+      final parsedNeighbors = parseNeighborsData(buffer, buffer.readUInt16LE());
+      connector.contacts.where((c) => c.type == advTypeRepeater).forEach((
+        repeater,
+      ) {
+        for (var neighborData in parsedNeighbors) {
+          final publicKey = neighborData['publicKey'];
+          if (listEquals(
+            repeater.publicKey.sublist(0, _reqNeighborsKeyLen),
+            publicKey,
+          )) {
+            neighborData['contact'] = repeater;
+          }
         }
-      }
-    });
+      });
 
-    setState(() {
-      _parsedNeighbours = parsedNeighbours;
-      _neighbourCount = neighbourCount;
-    });
+      setState(() {
+        _parsedNeighbors = parsedNeighbors;
+        _neighborCount = neighborCount;
+      });
 
-    ScaffoldMessenger.of(context).showSnackBar(
-      SnackBar(
-        content: Text(context.l10n.neighbors_receivedData),
-        backgroundColor: Colors.green,
-      ),
-    );
-    _statusTimeout?.cancel();
-    if (!mounted) return;
-    setState(() {
-      _isLoading = false;
-      _isLoaded = true;
-      _hasData = true;
-    });
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          content: Text(context.l10n.neighbors_receivedData),
+          backgroundColor: Colors.green,
+        ),
+      );
+      _statusTimeout?.cancel();
+      if (!mounted) return;
+      setState(() {
+        _isLoading = false;
+        _isLoaded = true;
+        _hasData = true;
+      });
+    } catch (e) {
+      appLogger.error('Error handling neighbors response: $e');
+    }
   }
 
   Contact _resolveRepeater(MeshCoreConnector connector) {
@@ -159,7 +171,7 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
     );
   }
 
-  Future<void> _loadNeighbours() async {
+  Future<void> _loadNeighbors() async {
     if (_commandService == null) return;
 
     setState(() {
@@ -172,17 +184,17 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
       final selection = await connector.preparePathForContactSend(repeater);
       _pendingStatusSelection = selection;
 
-      //[version][number of requested neighbours][offset_16bit][order by][len of public key]
+      //[version][number of requested neighbors][offset_16bit][order by][len of public key]
       final frame = buildSendBinaryReq(
         repeater.publicKey,
         payload: Uint8List.fromList([
-          reqTypeGetNeighbours,
+          reqTypeGetNeighbors,
           0x00,
           0x0F,
           0x00,
           0x00,
           0x00,
-          _reqNeighboursKeyLen,
+          _reqNeighborsKeyLen,
         ]),
       );
       await connector.sendFrame(frame);
@@ -258,7 +270,7 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
           mainAxisSize: MainAxisSize.min,
           children: [
             Text(
-              l10n.neighbors_repeatersNeighbours,
+              l10n.neighbors_repeatersNeighbors,
               style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
             ),
             Text(
@@ -345,7 +357,7 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
                     child: CircularProgressIndicator(strokeWidth: 2),
                   )
                 : const Icon(Icons.refresh),
-            onPressed: _isLoading ? null : _loadNeighbours,
+            onPressed: _isLoading ? null : _loadNeighbors,
             tooltip: l10n.repeater_refresh,
           ),
         ],
@@ -353,13 +365,13 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
       body: SafeArea(
         top: false,
         child: RefreshIndicator(
-          onRefresh: _loadNeighbours,
+          onRefresh: _loadNeighbors,
           child: ListView(
             padding: const EdgeInsets.all(16),
             children: [
               if (!_isLoaded &&
                   !_hasData &&
-                  (_parsedNeighbours == null || _parsedNeighbours!.isEmpty))
+                  (_parsedNeighbors == null || _parsedNeighbors!.isEmpty))
                 Center(
                   child: Text(
                     l10n.neighbors_noData,
@@ -368,10 +380,9 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
                 ),
               if (_isLoaded ||
                   _hasData &&
-                      !(_parsedNeighbours == null ||
-                          _parsedNeighbours!.isEmpty))
-                _buildNeighboursInfoCard(
-                  "${l10n.repeater_neighbours} - $_neighbourCount",
+                      !(_parsedNeighbors == null || _parsedNeighbors!.isEmpty))
+                _buildNeighborsInfoCard(
+                  "${l10n.repeater_neighbors} - $_neighborCount",
                 ),
             ],
           ),
@@ -380,7 +391,7 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
     );
   }
 
-  Widget _buildNeighboursInfoCard(String title) {
+  Widget _buildNeighborsInfoCard(String title) {
     final connector = Provider.of<MeshCoreConnector>(context, listen: false);
     return Card(
       child: Padding(
@@ -405,7 +416,7 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
               ],
             ),
             const Divider(),
-            for (final entry in _parsedNeighbours!.asMap().entries)
+            for (final entry in _parsedNeighbors!.asMap().entries)
               _buildInfoRow(
                 entry.value['contact'] != null
                     ? entry.value['contact'].name
@@ -430,6 +441,7 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
     double snr,
     int spreadingFactor,
   ) {
+    final snrUi = snrUiFromSNR(snr, spreadingFactor);
     return Padding(
       padding: const EdgeInsets.symmetric(vertical: 3),
       child: Row(
@@ -443,9 +455,15 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
                 style: const TextStyle(fontWeight: FontWeight.w500),
               ),
               subtitle: Text(value),
-              trailing: SNRIcon(
-                snr: snr,
-                snrLevels: getSNRfromSF(spreadingFactor),
+              trailing: Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Icon(snrUi.icon, color: snrUi.color, size: 18.0),
+                  Text(
+                    snrUi.text,
+                    style: TextStyle(fontSize: 10, color: snrUi.color),
+                  ),
+                ],
               ),
             ),
           ),

lib/screens/path_trace_map.dart

@@ -10,12 +10,30 @@ import 'package:meshcore_open/connector/meshcore_protocol.dart';
 import 'package:meshcore_open/l10n/l10n.dart';
 import 'package:meshcore_open/models/contact.dart';
 import 'package:meshcore_open/services/map_tile_cache_service.dart';
+import 'package:meshcore_open/utils/app_logger.dart';
 import 'package:meshcore_open/widgets/snr_indicator.dart';
 import 'package:provider/provider.dart';
 
+double getPathDistanceMeters(List<LatLng> points) {
+  if (points.length <= 1) return 0.0;
+
+  double distanceMeters = 0.0;
+  final distanceCalculator = Distance();
+
+  for (int i = 0; i < points.length - 1; i++) {
+    distanceMeters += distanceCalculator(points[i], points[i + 1]);
+  }
+
+  return distanceMeters;
+}
+
+String formatDistance(double distanceMeters) {
+  return '(${(distanceMeters / 1609.34).toStringAsFixed(2)} Miles / ${(distanceMeters / 1000).toStringAsFixed(2)} Km)';
+}
+
 class PathTraceData {
   final Uint8List pathData;
-  final Uint8List snrData;
+  final List<double> snrData;
   final Map<int, Contact> pathContacts;
 
   PathTraceData({
@@ -28,6 +46,7 @@ class PathTraceData {
 class PathTraceMapScreen extends StatefulWidget {
   final String title;
   final Uint8List path;
+  final int? repeaterId;
   final bool flipPathRound;
   final bool reversePathRound;
 
@@ -35,6 +54,7 @@ class PathTraceMapScreen extends StatefulWidget {
     super.key,
     required this.title,
     required this.path,
+    this.repeaterId,
     this.flipPathRound = false,
     this.reversePathRound = false,
   });
@@ -50,7 +70,6 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
   bool _isLoading = false;
   bool _failed2Loaded = false;
   bool _hasData = false;
-  bool _noLocationErr = false;
   PathTraceData? _traceData;
   List<LatLng> _points = <LatLng>[];
   List<Polyline> _polylines = [];
@@ -58,7 +77,7 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
   double _initialZoom = 2.0;
   LatLngBounds? _bounds;
   ValueKey<String> _mapKey = const ValueKey('initial');
-  double _pathDistance = 0.0;
+  double _pathDistanceMeters = 0.0;
 
   String _formatPathPrefixes(Uint8List pathBytes) {
     return pathBytes
@@ -80,7 +99,7 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
     super.dispose();
   }
 
-  Uint8List addReturnpath(Uint8List pathBytes) {
+  Uint8List addReturnPath(Uint8List pathBytes) {
     Uint8List? traceBytes;
     final len = (pathBytes.length + pathBytes.length - 1);
     traceBytes = Uint8List(len);
@@ -93,23 +112,11 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
     return traceBytes;
   }
 
-  double getPathDistance() {
-    double totalDistance = 0.0;
-    final distanceCalculator = Distance();
-
-    for (int i = 0; i < _points.length - 1; i++) {
-      totalDistance += distanceCalculator(_points[i], _points[i + 1]);
-    }
-
-    return totalDistance;
-  }
-
   Future<void> _doPathTrace() async {
     if (mounted) {
       setState(() {
         _isLoading = true;
         _failed2Loaded = false;
-        _noLocationErr = false;
       });
     }
 
@@ -120,11 +127,13 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
         : widget.path;
 
     if (widget.flipPathRound) {
-      path = addReturnpath(pathTmp);
+      path = addReturnPath(pathTmp);
     } else {
       path = pathTmp;
     }
 
+    print('Initiating path trace with path: ${_formatPathPrefixes(path)}');
+
     final connector = Provider.of<MeshCoreConnector>(context, listen: false);
     final frame = buildTraceReq(
       DateTime.now().millisecondsSinceEpoch ~/ 1000,
@@ -142,34 +151,54 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
     _frameSubscription = connector.receivedFrames.listen((frame) {
       if (frame.isEmpty) return;
       final frameBuffer = BufferReader(frame);
-      final code = frameBuffer.readUInt8();
+      try {
+        final code = frameBuffer.readUInt8();
 
-      if (code == respCodeSent) {
-        frameBuffer.skipBytes(1); //reserved
-        tagData = frameBuffer.readBytes(4);
-        final timeoutSeconds = frameBuffer.readUInt32LE();
+        if (code == respCodeSent) {
+          frameBuffer.skipBytes(1); //reserved
+          tagData = frameBuffer.readBytes(4);
+          final timeoutSeconds = frameBuffer.readUInt32LE();
 
-        // Start timeout timer for trace response
-        _timeoutTimer?.cancel();
-        _timeoutTimer = Timer(Duration(milliseconds: timeoutSeconds), () {
+          // Start timeout timer for trace response
+          _timeoutTimer?.cancel();
+          _timeoutTimer = Timer(Duration(milliseconds: timeoutSeconds), () {
+            if (!mounted) return;
+            setState(() {
+              _isLoading = false;
+              _failed2Loaded = true;
+            });
+          });
+        }
+
+        if (code == respCodeErr) {
+          _timeoutTimer?.cancel();
           if (!mounted) return;
           setState(() {
             _isLoading = false;
             _failed2Loaded = true;
           });
-        });
-      }
+        }
 
-      // Check if it's a binary response
-      if (frame.length > 8 &&
-          code == pushCodeTraceData &&
-          listEquals(frame.sublist(4, 8), tagData)) {
+        // Check if it's a binary response
+        if (frame.length > 8 &&
+            code == pushCodeTraceData &&
+            listEquals(frame.sublist(4, 8), tagData)) {
+          _timeoutTimer?.cancel();
+          if (!mounted) return;
+          frameBuffer.skipBytes(3); //reserved + path length + flag
+          if (listEquals(frameBuffer.readBytes(4), tagData)) {
+            _handleTraceResponse(frame);
+          }
+        }
+      } catch (e) {
         _timeoutTimer?.cancel();
         if (!mounted) return;
-        frameBuffer.skipBytes(3); //reserved + path length + flag
-        if (listEquals(frameBuffer.readBytes(4), tagData)) {
-          _handleTraceResponse(frame);
-        }
+        setState(() {
+          _isLoading = false;
+          _failed2Loaded = true;
+        });
+        // Handle any parsing errors gracefully
+        appLogger.error('Error parsing frame: $e', tag: 'PathTraceMapScreen');
       }
     });
   }
@@ -178,65 +207,80 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
     final connector = Provider.of<MeshCoreConnector>(context, listen: false);
 
     final buffer = BufferReader(frame);
-    buffer.skipBytes(2); // Skip push code and reserved byte
-    int pathLength = buffer.readUInt8();
-    buffer.skipBytes(5); // Skip Flag byte and tag data
-    buffer.skipBytes(4); // Skip auth code
-    Uint8List pathData = buffer.readBytes(pathLength);
-    Uint8List snrData = buffer.readRemainingBytes();
+    try {
+      buffer.skipBytes(2); // Skip push code and reserved byte
+      int pathLength = buffer.readUInt8();
+      buffer.skipBytes(5); // Skip Flag byte and tag data
+      buffer.skipBytes(4); // Skip auth code
+      Uint8List pathData = buffer.readBytes(pathLength);
+      Uint8List snrData = buffer.readRemainingBytes();
 
-    Map<int, Contact> pathContacts = {};
+      Map<int, Contact> pathContacts = {};
 
-    connector.contacts.where((c) => c.type != advTypeChat).forEach((repeater) {
-      for (var repeaterData in pathData) {
-        if (listEquals(
-          repeater.publicKey.sublist(0, 1),
-          Uint8List.fromList([repeaterData]),
-        )) {
-          pathContacts[repeaterData] = repeater;
+      connector.contacts.where((c) => c.type != advTypeChat).forEach((
+        repeater,
+      ) {
+        for (var repeaterData in pathData) {
+          if (listEquals(
+            repeater.publicKey.sublist(0, 1),
+            Uint8List.fromList([repeaterData]),
+          )) {
+            pathContacts[repeaterData] = repeater;
+          }
         }
-      }
-    });
+      });
 
-    setState(() {
-      _isLoading = false;
-      _hasData = true;
-      _traceData = PathTraceData(
-        pathData: pathData,
-        snrData: snrData,
-        pathContacts: pathContacts,
-      );
-      _points = <LatLng>[];
-      _points.add(LatLng(connector.selfLatitude!, connector.selfLongitude!));
-      for (final hop in _traceData!.pathData) {
-        final contact = _traceData!.pathContacts[hop];
-        if (contact != null &&
-            contact.hasLocation &&
-            contact.latitude != null &&
-            contact.longitude != null) {
-          _points.add(LatLng(contact.latitude!, contact.longitude!));
-        } else {
-          _noLocationErr = true;
+      setState(() {
+        _isLoading = false;
+        _hasData = true;
+        _traceData = PathTraceData(
+          pathData: pathData,
+          snrData: snrData.map((e) => e.toSigned(8).toDouble() / 4).toList(),
+          pathContacts: pathContacts,
+        );
+        _points = <LatLng>[];
+        _points.add(LatLng(connector.selfLatitude!, connector.selfLongitude!));
+        for (final hop in _traceData!.pathData) {
+          final contact = _traceData!.pathContacts[hop];
+          if (contact != null &&
+              contact.hasLocation &&
+              contact.latitude != null &&
+              contact.longitude != null) {
+            _points.add(LatLng(contact.latitude!, contact.longitude!));
+          }
         }
-      }
-      _polylines = _points.length > 1
-          ? [
-              Polyline(
-                points: _points,
-                strokeWidth: 4,
-                color: Colors.blueAccent,
-              ),
-            ]
-          : <Polyline>[];
+        _polylines = _points.length > 1
+            ? [
+                Polyline(
+                  points: _points,
+                  strokeWidth: 4,
+                  color: Colors.blueAccent,
+                ),
+              ]
+            : <Polyline>[];
 
-      _initialCenter = _points.isNotEmpty ? _points.first : const LatLng(0, 0);
-      _initialZoom = _points.isNotEmpty ? 13.0 : 2.0;
-      _bounds = _points.length > 1 ? LatLngBounds.fromPoints(_points) : null;
-      _mapKey = ValueKey(
-        '${context.l10n.pathTrace_you},${_formatPathPrefixes(_traceData!.pathData)}',
+        _initialCenter = _points.isNotEmpty
+            ? _points.first
+            : const LatLng(0, 0);
+        _initialZoom = _points.isNotEmpty ? 13.0 : 2.0;
+        _bounds = _points.length > 1 ? LatLngBounds.fromPoints(_points) : null;
+        _mapKey = ValueKey(
+          '${context.l10n.pathTrace_you},${_formatPathPrefixes(_traceData!.pathData)}',
+        );
+        _pathDistanceMeters = getPathDistanceMeters(_points);
+      });
+    } catch (e) {
+      appLogger.error(
+        'Error handling trace response: $e',
+        tag: 'PathTraceMapScreen',
       );
-      _pathDistance = getPathDistance();
-    });
+      if (mounted) {
+        setState(() {
+          _isLoading = false;
+          _failed2Loaded = true;
+        });
+      }
+    }
   }
 
   @override
@@ -279,20 +323,7 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
             top: false,
             child: Stack(
               children: [
-                if (_noLocationErr)
-                  Center(
-                    child: Card(
-                      color: Colors.red,
-                      child: Padding(
-                        padding: EdgeInsets.all(12),
-                        child: Text(
-                          context.l10n.pathTrace_someHopsNoLocation,
-                          style: TextStyle(color: Colors.white),
-                        ),
-                      ),
-                    ),
-                  ),
-                if (!_hasData && !_noLocationErr)
+                if (!_hasData)
                   Center(
                     child: Column(
                       mainAxisSize: MainAxisSize.min,
@@ -304,43 +335,11 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
                       ],
                     ),
                   ),
-                if (_hasData && !_noLocationErr)
-                  FlutterMap(
-                    key: _mapKey,
-                    options: MapOptions(
-                      initialCenter: _initialCenter!,
-                      initialZoom: _initialZoom,
-                      initialCameraFit: _bounds == null
-                          ? null
-                          : CameraFit.bounds(
-                              bounds: _bounds!,
-                              padding: const EdgeInsets.all(64),
-                              maxZoom: 16,
-                            ),
-                      minZoom: 2.0,
-                      maxZoom: 18.0,
-                    ),
-                    children: [
-                      TileLayer(
-                        urlTemplate: kMapTileUrlTemplate,
-                        tileProvider: tileCache.tileProvider,
-                        userAgentPackageName:
-                            MapTileCacheService.userAgentPackageName,
-                        maxZoom: 19,
-                      ),
-                      if (_polylines.isNotEmpty)
-                        PolylineLayer(polylines: _polylines),
-                      if (_traceData!.pathData.isNotEmpty)
-                        MarkerLayer(
-                          markers: _buildHopMarkers(_traceData!.pathData),
-                        ),
-                    ],
-                  ),
+                if (_hasData) _buildMapPathTrace(context, tileCache),
                 if (_points.isEmpty &&
                     !_hasData &&
                     !_isLoading &&
-                    !_failed2Loaded &&
-                    !_noLocationErr)
+                    !_failed2Loaded)
                   Center(
                     child: Card(
                       color: Colors.white.withValues(alpha: 0.9),
@@ -352,8 +351,7 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
                       ),
                     ),
                   ),
-                if (_hasData && !_noLocationErr)
-                  _buildLegendCard(context, _traceData!),
+                if (_hasData) _buildLegendCard(context, _traceData!),
               ],
             ),
           ),
@@ -365,7 +363,8 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
   List<Marker> _buildHopMarkers(List<int> pathData) {
     return [
       for (final hop in pathData)
-        if (_traceData!.pathContacts[hop]!.hasLocation)
+        if (_traceData!.pathContacts[hop] != null &&
+            _traceData!.pathContacts[hop]!.hasLocation)
           Marker(
             point: LatLng(
               _traceData!.pathContacts[hop]!.latitude!,
@@ -453,7 +452,9 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
             .toRadixString(16)
             .padLeft(2, '0')
             .toUpperCase();
-        return contactName != null ? "$hex: $contactName" : hex;
+        return contactName != null
+            ? "$hex: $contactName"
+            : "$hex: ${context.l10n.channelPath_unknownRepeater}";
       }
     } else {
       final contactName =
@@ -462,7 +463,9 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
           .toRadixString(16)
           .padLeft(2, '0')
           .toUpperCase();
-      return contactName != null ? "$hex: $contactName" : hex;
+      return contactName != null
+          ? "$hex: $contactName"
+          : "$hex: ${context.l10n.channelPath_unknownRepeater}";
     }
   }
 
@@ -475,7 +478,9 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
             .toRadixString(16)
             .padLeft(2, '0')
             .toUpperCase();
-        return contactName != null ? "$hex: $contactName" : hex;
+        return contactName != null
+            ? "$hex: $contactName"
+            : "$hex: ${context.l10n.channelPath_unknownRepeater}";
       } else {
         return context.l10n.pathTrace_you;
       }
@@ -486,10 +491,46 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
           .toRadixString(16)
           .padLeft(2, '0')
           .toUpperCase();
-      return contactName != null ? "$hex: $contactName" : hex;
+      return contactName != null
+          ? "$hex: $contactName"
+          : "$hex: ${context.l10n.channelPath_unknownRepeater}";
     }
   }
 
+  Widget _buildMapPathTrace(
+    BuildContext context,
+    MapTileCacheService tileCache,
+  ) {
+    return FlutterMap(
+      key: _mapKey,
+      options: MapOptions(
+        interactionOptions: InteractionOptions(flags: ~InteractiveFlag.rotate),
+        initialCenter: _initialCenter!,
+        initialZoom: _initialZoom,
+        initialCameraFit: _bounds == null
+            ? null
+            : CameraFit.bounds(
+                bounds: _bounds!,
+                padding: const EdgeInsets.all(64),
+                maxZoom: 16,
+              ),
+        minZoom: 2.0,
+        maxZoom: 18.0,
+      ),
+      children: [
+        TileLayer(
+          urlTemplate: kMapTileUrlTemplate,
+          tileProvider: tileCache.tileProvider,
+          userAgentPackageName: MapTileCacheService.userAgentPackageName,
+          maxZoom: 19,
+        ),
+        if (_polylines.isNotEmpty) PolylineLayer(polylines: _polylines),
+        if (_traceData!.pathData.isNotEmpty)
+          MarkerLayer(markers: _buildHopMarkers(_traceData!.pathData)),
+      ],
+    );
+  }
+
   Widget _buildLegendCard(BuildContext context, PathTraceData pathTraceData) {
     final l10n = context.l10n;
     final maxHeight = MediaQuery.of(context).size.height * 0.35;
@@ -509,7 +550,7 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
               Padding(
                 padding: const EdgeInsets.all(12),
                 child: Text(
-                  '${l10n.channelPath_repeaterHops} (${(_pathDistance / 1609.34).toStringAsFixed(2)} Miles / ${(_pathDistance / 1000).toStringAsFixed(2)} Km)',
+                  '${l10n.channelPath_repeaterHops} ${formatDistance(_pathDistanceMeters)}',
                   style: const TextStyle(fontWeight: FontWeight.w600),
                 ),
               ),
@@ -523,8 +564,14 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
                         child: ListView.separated(
                           padding: const EdgeInsets.symmetric(vertical: 4),
                           itemCount: pathTraceData.pathData.length + 1,
-                          separatorBuilder: (_, __) => const Divider(height: 1),
+                          separatorBuilder: (_, _) => const Divider(height: 1),
                           itemBuilder: (context, index) {
+                            final snrUi = snrUiFromSNR(
+                              index < pathTraceData.snrData.length
+                                  ? pathTraceData.snrData[index]
+                                  : null,
+                              context.read<MeshCoreConnector>().currentSf,
+                            );
                             return Column(
                               children: [
                                 ListTile(
@@ -543,12 +590,22 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
                                     ),
                                     style: const TextStyle(fontSize: 14),
                                   ),
-                                  trailing: SNRIcon(
-                                    snr:
-                                        pathTraceData.snrData[index].toSigned(
-                                          8,
-                                        ) /
-                                        4.0,
+                                  trailing: Column(
+                                    mainAxisAlignment: MainAxisAlignment.center,
+                                    children: [
+                                      Icon(
+                                        snrUi.icon,
+                                        color: snrUi.color,
+                                        size: 18.0,
+                                      ),
+                                      Text(
+                                        snrUi.text,
+                                        style: TextStyle(
+                                          fontSize: 10,
+                                          color: snrUi.color,
+                                        ),
+                                      ),
+                                    ],
                                   ),
                                   onTap: () {
                                     // Handle item tap

lib/screens/repeater_hub_screen.dart

@@ -6,7 +6,7 @@ import 'repeater_status_screen.dart';
 import 'repeater_cli_screen.dart';
 import 'repeater_settings_screen.dart';
 import 'telemetry_screen.dart';
-import 'neighbours_screen.dart';
+import 'neighbors_screen.dart';
 
 class RepeaterHubScreen extends StatelessWidget {
   final Contact repeater;
@@ -174,17 +174,15 @@ class RepeaterHubScreen extends StatelessWidget {
             _buildManagementCard(
               context,
               icon: Icons.group,
-              title: l10n.repeater_neighbours,
-              subtitle: l10n.repeater_neighboursSubtitle,
+              title: l10n.repeater_neighbors,
+              subtitle: l10n.repeater_neighborsSubtitle,
               color: Colors.orange,
               onTap: () {
                 Navigator.push(
                   context,
                   MaterialPageRoute(
-                    builder: (context) => NeighboursScreen(
-                      repeater: repeater,
-                      password: password,
-                    ),
+                    builder: (context) =>
+                        NeighborsScreen(repeater: repeater, password: password),
                   ),
                 );
               },

lib/screens/scanner_screen.dart

@@ -1,3 +1,6 @@
+import 'dart:async';
+import 'dart:io' show Platform;
+
 import 'package:flutter/material.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 import 'package:provider/provider.dart';
@@ -18,6 +21,8 @@ class ScannerScreen extends StatefulWidget {
 class _ScannerScreenState extends State<ScannerScreen> {
   bool _changedNavigation = false;
   late final VoidCallback _connectionListener;
+  BluetoothAdapterState _bluetoothState = BluetoothAdapterState.unknown;
+  late StreamSubscription<BluetoothAdapterState> _bluetoothStateSubscription;
 
   @override
   void initState() {
@@ -39,12 +44,25 @@ class _ScannerScreenState extends State<ScannerScreen> {
     };
 
     connector.addListener(_connectionListener);
+
+    _bluetoothStateSubscription = FlutterBluePlus.adapterState.listen((state) {
+      if (mounted) {
+        setState(() {
+          _bluetoothState = state;
+        });
+        // Cancel scan if Bluetooth turns off while scanning
+        if (state != BluetoothAdapterState.on) {
+          unawaited(connector.stopScan());
+        }
+      }
+    });
   }
 
   @override
   void dispose() {
     final connector = Provider.of<MeshCoreConnector>(context, listen: false);
     connector.removeListener(_connectionListener);
+    unawaited(_bluetoothStateSubscription.cancel());
     super.dispose();
   }
 
@@ -62,6 +80,10 @@ class _ScannerScreenState extends State<ScannerScreen> {
           builder: (context, connector, child) {
             return Column(
               children: [
+                // Bluetooth off warning
+                if (_bluetoothState == BluetoothAdapterState.off)
+                  _bluetoothOffWarning(context),
+
                 // Status bar
                 _buildStatusBar(context, connector),
 
@@ -76,15 +98,18 @@ class _ScannerScreenState extends State<ScannerScreen> {
         builder: (context, connector, child) {
           final isScanning =
               connector.state == MeshCoreConnectionState.scanning;
+          final isBluetoothOff = _bluetoothState == BluetoothAdapterState.off;
 
           return FloatingActionButton.extended(
-            onPressed: () {
-              if (isScanning) {
-                connector.stopScan();
-              } else {
-                connector.startScan();
-              }
-            },
+            onPressed: isBluetoothOff
+                ? null
+                : () {
+                    if (isScanning) {
+                      connector.stopScan();
+                    } else {
+                      connector.startScan();
+                    }
+                  },
             icon: isScanning
                 ? const SizedBox(
                     width: 20,
@@ -205,4 +230,47 @@ class _ScannerScreenState extends State<ScannerScreen> {
       }
     }
   }
+
+  Widget _bluetoothOffWarning(BuildContext context) {
+    final errorColor = Theme.of(context).colorScheme.error;
+    return Container(
+      width: double.infinity,
+      padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 16),
+      color: errorColor.withValues(alpha: 0.15),
+      child: Row(
+        children: [
+          Icon(Icons.bluetooth_disabled, size: 24, color: errorColor),
+          const SizedBox(width: 12),
+          Expanded(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  context.l10n.scanner_bluetoothOff,
+                  style: TextStyle(
+                    color: errorColor,
+                    fontWeight: FontWeight.w600,
+                    fontSize: 14,
+                  ),
+                ),
+                const SizedBox(height: 4),
+                Text(
+                  context.l10n.scanner_bluetoothOffMessage,
+                  style: TextStyle(
+                    color: errorColor.withValues(alpha: 0.85),
+                    fontSize: 12,
+                  ),
+                ),
+              ],
+            ),
+          ),
+          if (Platform.isAndroid)
+            TextButton(
+              onPressed: () => FlutterBluePlus.turnOn(),
+              child: Text(context.l10n.scanner_enableBluetooth),
+            ),
+        ],
+      ),
+    );
+  }
 }

lib/screens/settings_screen.dart

@@ -21,6 +21,7 @@ class SettingsScreen extends StatefulWidget {
 
 class _SettingsScreenState extends State<SettingsScreen> {
   bool _showBatteryVoltage = false;
+  bool _deviceInfoExpanded = false;
   String _appVersion = '';
 
   @override
@@ -74,43 +75,84 @@ class _SettingsScreenState extends State<SettingsScreen> {
     MeshCoreConnector connector,
   ) {
     final l10n = context.l10n;
+
     return Card(
-      child: Padding(
-        padding: const EdgeInsets.all(16),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Text(
-              l10n.settings_deviceInfo,
-              style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
-            ),
-            const SizedBox(height: 16),
-            _buildInfoRow(l10n.settings_infoName, connector.deviceDisplayName),
-            _buildInfoRow(l10n.settings_infoId, connector.deviceIdLabel),
-            _buildInfoRow(
-              l10n.settings_infoStatus,
-              connector.isConnected
-                  ? l10n.common_connected
-                  : l10n.common_disconnected,
-            ),
-            _buildBatteryInfoRow(context, connector),
-            if (connector.selfName != null)
-              _buildInfoRow(l10n.settings_nodeName, connector.selfName!),
-            if (connector.selfPublicKey != null)
-              _buildInfoRow(
-                l10n.settings_infoPublicKey,
-                '${pubKeyToHex(connector.selfPublicKey!).substring(0, 16)}...',
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          InkWell(
+            borderRadius: BorderRadius.circular(12),
+            onTap: () {
+              setState(() {
+                _deviceInfoExpanded = !_deviceInfoExpanded;
+              });
+            },
+            child: Padding(
+              padding: const EdgeInsets.fromLTRB(16, 16, 16, 16),
+              child: Row(
+                children: [
+                  Expanded(
+                    child: Text(
+                      l10n.settings_deviceInfo,
+                      style: const TextStyle(
+                        fontSize: 18,
+                        fontWeight: FontWeight.bold,
+                      ),
+                    ),
+                  ),
+                  AnimatedRotation(
+                    turns: _deviceInfoExpanded ? 0.5 : 0,
+                    duration: const Duration(milliseconds: 200),
+                    child: const Icon(Icons.expand_more),
+                  ),
+                ],
               ),
-            _buildInfoRow(
-              l10n.settings_infoContactsCount,
-              '${connector.contacts.length}',
             ),
-            _buildInfoRow(
-              l10n.settings_infoChannelCount,
-              '${connector.channels.length}',
+          ),
+
+          AnimatedCrossFade(
+            firstChild: const SizedBox.shrink(),
+            secondChild: Padding(
+              padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  _buildInfoRow(
+                    l10n.settings_infoName,
+                    connector.deviceDisplayName,
+                  ),
+                  _buildInfoRow(l10n.settings_infoId, connector.deviceIdLabel),
+                  _buildInfoRow(
+                    l10n.settings_infoStatus,
+                    connector.isConnected
+                        ? l10n.common_connected
+                        : l10n.common_disconnected,
+                  ),
+                  _buildBatteryInfoRow(context, connector),
+                  if (connector.selfName != null)
+                    _buildInfoRow(l10n.settings_nodeName, connector.selfName!),
+                  if (connector.selfPublicKey != null)
+                    _buildInfoRow(
+                      l10n.settings_infoPublicKey,
+                      '${pubKeyToHex(connector.selfPublicKey!).substring(0, 16)}...',
+                    ),
+                  _buildInfoRow(
+                    l10n.settings_infoContactsCount,
+                    '${connector.contacts.length}',
+                  ),
+                  _buildInfoRow(
+                    l10n.settings_infoChannelCount,
+                    '${connector.channels.length}',
+                  ),
+                ],
+              ),
             ),
-          ],
-        ),
+            crossFadeState: _deviceInfoExpanded
+                ? CrossFadeState.showSecond
+                : CrossFadeState.showFirst,
+            duration: const Duration(milliseconds: 200),
+          ),
+        ],
       ),
     );
   }
@@ -355,22 +397,33 @@ class _SettingsScreenState extends State<SettingsScreen> {
     Color? valueColor,
     VoidCallback? onTap,
   }) {
+    final theme = Theme.of(context);
+
     final row = Padding(
-      padding: const EdgeInsets.symmetric(vertical: 4),
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      padding: const EdgeInsets.symmetric(vertical: 10),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           Row(
             children: [
               if (leading != null) ...[leading, const SizedBox(width: 8)],
-              Text(label, style: TextStyle(color: Colors.grey[600])),
+              Expanded(
+                child: Text(
+                  label,
+                  style: theme.textTheme.bodySmall?.copyWith(
+                    color: theme.colorScheme.onSurfaceVariant,
+                    fontWeight: FontWeight.w500,
+                  ),
+                ),
+              ),
             ],
           ),
-          Flexible(
-            child: Text(
-              value,
-              style: TextStyle(fontWeight: FontWeight.w500, color: valueColor),
-              overflow: TextOverflow.ellipsis,
+          const SizedBox(height: 4),
+          Text(
+            value,
+            style: theme.textTheme.bodyLarge?.copyWith(
+              color: valueColor,
+              fontWeight: FontWeight.w500,
             ),
           ),
         ],
@@ -379,11 +432,12 @@ class _SettingsScreenState extends State<SettingsScreen> {
 
     if (onTap != null) {
       return InkWell(
+        borderRadius: BorderRadius.circular(6),
         onTap: onTap,
-        borderRadius: BorderRadius.circular(4),
         child: row,
       );
     }
+
     return row;
   }
 
@@ -688,7 +742,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
     );
   }
 
-  _gpxExport(
+  Future<void> _gpxExport(
     GpxExport exporter,
     String name,
     String description,
@@ -728,7 +782,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
     }
   }
 
-  _buildExportCard(MeshCoreConnector connector) {
+  Widget _buildExportCard(MeshCoreConnector connector) {
     final l10n = context.l10n;
     return Card(
       child: Column(

lib/services/background_service.dart

@@ -1,4 +1,3 @@
-import 'dart:isolate';
 import 'dart:io';
 
 import 'package:flutter_foreground_task/flutter_foreground_task.dart';
@@ -15,20 +14,14 @@ class BackgroundService {
         channelDescription: 'Keeps MeshCore running in the background.',
         channelImportance: NotificationChannelImportance.LOW,
         priority: NotificationPriority.LOW,
-        iconData: const NotificationIconData(
-          resType: ResourceType.mipmap,
-          resPrefix: ResourcePrefix.ic,
-          name: 'launcher',
-        ),
       ),
       iosNotificationOptions: const IOSNotificationOptions(
         showNotification: false,
         playSound: false,
       ),
-      foregroundTaskOptions: const ForegroundTaskOptions(
-        interval: 5000,
+      foregroundTaskOptions: ForegroundTaskOptions(
+        eventAction: ForegroundTaskEventAction.repeat(5000),
         autoRunOnBoot: false,
-        allowWakeLock: true,
         allowWifiLock: false,
       ),
     );
@@ -64,13 +57,13 @@ void startCallback() {
 
 class _MeshCoreTaskHandler extends TaskHandler {
   @override
-  void onStart(DateTime timestamp, SendPort? sendPort) {}
+  Future<void> onStart(DateTime timestamp, TaskStarter starter) async {}
 
   @override
-  void onRepeatEvent(DateTime timestamp, SendPort? sendPort) {}
+  void onRepeatEvent(DateTime timestamp) {}
 
   @override
-  void onDestroy(DateTime timestamp, SendPort? sendPort) {}
+  Future<void> onDestroy(DateTime timestamp, bool isTimeout) async {}
 
   @override
   void onNotificationButtonPressed(String id) {}

lib/services/notification_service.dart

@@ -67,7 +67,7 @@ class NotificationService {
 
     try {
       await _notifications.initialize(
-        initSettings,
+        settings: initSettings,
         onDidReceiveNotificationResponse: _onNotificationTapped,
       );
       _isInitialized = true;
@@ -149,10 +149,10 @@ class NotificationService {
     );
 
     await _notifications.show(
-      contactId?.hashCode ?? 0,
-      contactName,
-      message,
-      notificationDetails,
+      id: contactId?.hashCode ?? 0,
+      title: contactName,
+      body: message,
+      notificationDetails: notificationDetails,
       payload: 'message:$contactId',
     );
   }
@@ -194,10 +194,10 @@ class NotificationService {
     );
 
     await _notifications.show(
-      contactId?.hashCode ?? DateTime.now().millisecondsSinceEpoch,
-      _l10n.notification_newTypeDiscovered(contactType),
-      contactName,
-      notificationDetails,
+      id: contactId?.hashCode ?? DateTime.now().millisecondsSinceEpoch,
+      title: _l10n.notification_newTypeDiscovered(contactType),
+      body: contactName,
+      notificationDetails: notificationDetails,
       payload: 'advert:$contactId',
     );
   }
@@ -248,10 +248,10 @@ class NotificationService {
         : preview;
 
     await _notifications.show(
-      channelIndex?.hashCode ?? DateTime.now().millisecondsSinceEpoch,
-      channelName,
-      body,
-      notificationDetails,
+      id: channelIndex?.hashCode ?? DateTime.now().millisecondsSinceEpoch,
+      title: channelName,
+      body: body,
+      notificationDetails: notificationDetails,
       payload: 'channel:$channelIndex',
     );
   }
@@ -285,7 +285,7 @@ class NotificationService {
   }
 
   Future<void> cancel(int id) async {
-    await _notifications.cancel(id);
+    await _notifications.cancel(id: id);
   }
 
   // ─────────────────────────────────────────────────────────────────
@@ -469,10 +469,10 @@ class NotificationService {
     const notificationDetails = NotificationDetails(android: androidDetails);
 
     await _notifications.show(
-      'batch_summary'.hashCode,
-      _l10n.notification_activityTitle,
-      parts.join(', '),
-      notificationDetails,
+      id: 'batch_summary'.hashCode,
+      title: _l10n.notification_activityTitle,
+      body: parts.join(', '),
+      notificationDetails: notificationDetails,
       payload: 'batch',
     );
   }

lib/widgets/app_bar.dart

@@ -0,0 +1,54 @@
+import 'package:flutter/material.dart';
+import 'package:meshcore_open/connector/meshcore_connector.dart';
+import 'package:meshcore_open/widgets/battery_indicator.dart';
+import 'package:provider/provider.dart';
+
+import 'snr_indicator.dart';
+
+class AppBarTitle extends StatelessWidget {
+  final String title;
+  final Widget? leading;
+  final Widget? trailing;
+  const AppBarTitle(this.title, {this.leading, this.trailing, super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final connector = context.watch<MeshCoreConnector>();
+
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.start,
+      children: [
+        leading ?? const SizedBox.shrink(),
+        Expanded(
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              leading ?? const SizedBox.shrink(),
+              Text(
+                title,
+                overflow: TextOverflow.ellipsis,
+              ),
+              if (connector.isConnected && connector.selfName != null)
+                Center(
+                  child: Text(
+                    '(${connector.selfName})',
+                    style: TextStyle(fontSize: 14, color: Colors.grey[600]),
+                    overflow: TextOverflow.ellipsis,
+                  ),
+                ),
+            ],
+          ),
+        ),
+        const SizedBox(width: 8),
+        Row(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            BatteryIndicator(connector: connector),
+            SNRIndicator(connector: connector),
+          ],
+        ),
+        trailing ?? const SizedBox.shrink(),
+      ],
+    );
+  }
+}

lib/widgets/battery_indicator.dart

@@ -68,20 +68,24 @@ class _BatteryIndicatorState extends State<BatteryIndicator> {
         child: Row(
           mainAxisSize: MainAxisSize.min,
           children: [
-            Icon(batteryUi.icon, size: 18, color: batteryUi.color),
-            const SizedBox(width: 2),
-            Flexible(
-              child: Text(
-                displayText,
-                style: TextStyle(
-                  fontSize: 12,
-                  fontWeight: FontWeight.w500,
-                  color: batteryUi.color,
+            Column(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                Icon(batteryUi.icon, size: 18, color: batteryUi.color),
+                const SizedBox(height: 2),
+                Flexible(
+                  child: Text(
+                    displayText,
+                    style: TextStyle(
+                      fontSize: 12,
+                      fontWeight: FontWeight.w500,
+                      color: batteryUi.color,
+                    ),
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                  ),
                 ),
-                overflow: TextOverflow.visible,
-                maxLines: 1,
-                softWrap: false,
-              ),
+              ],
             ),
           ],
         ),

lib/widgets/path_management_dialog.dart

@@ -134,6 +134,19 @@ class _PathManagementDialog extends StatelessWidget {
         final currentContact = _resolveContact(connector);
         final paths = pathService.getRecentPaths(currentContact.publicKeyHex);
 
+        final repeatersList = List.of(connector.directRepeaters)
+          ..sort((a, b) => b.ranking.compareTo(a.ranking));
+
+        final directRepeater = repeatersList.isEmpty
+            ? null
+            : repeatersList.first;
+        final secondDirectRepeater = repeatersList.length < 2
+            ? null
+            : repeatersList.elementAt(1);
+        final thirdDirectRepeater = repeatersList.length < 3
+            ? null
+            : repeatersList.elementAt(2);
+
         return AlertDialog(
           title: Text(l10n.chat_pathManagement),
           content: SingleChildScrollView(
@@ -174,15 +187,38 @@ class _PathManagementDialog extends StatelessWidget {
                   ],
                   const SizedBox(height: 8),
                   ...paths.map((path) {
+                    final isDirectRepeater =
+                        directRepeater != null &&
+                        path.pathBytes.isNotEmpty &&
+                        directRepeater.pubkeyFirstByte == path.pathBytes.first;
+                    final isSecondDirectRepeater =
+                        secondDirectRepeater != null &&
+                        path.pathBytes.isNotEmpty &&
+                        secondDirectRepeater.pubkeyFirstByte ==
+                            path.pathBytes.first;
+                    final isThirdDirectRepeater =
+                        thirdDirectRepeater != null &&
+                        path.pathBytes.isNotEmpty &&
+                        thirdDirectRepeater.pubkeyFirstByte ==
+                            path.pathBytes.first;
+
+                    Color color = Colors.grey;
+                    if (isDirectRepeater) {
+                      color = Colors.green;
+                    } else if (isSecondDirectRepeater) {
+                      color = Colors.yellow;
+                    } else if (isThirdDirectRepeater) {
+                      color = Colors.red;
+                    } else if (path.wasFloodDiscovery) {
+                      color = Colors.blue;
+                    }
                     return Card(
                       margin: const EdgeInsets.symmetric(vertical: 4),
                       child: ListTile(
                         dense: true,
                         leading: CircleAvatar(
                           radius: 16,
-                          backgroundColor: path.wasFloodDiscovery
-                              ? Colors.blue
-                              : Colors.green,
+                          backgroundColor: color,
                           child: Text(
                             '${path.hopCount}',
                             style: const TextStyle(fontSize: 12),

lib/widgets/qr_scanner_widget.dart

@@ -156,7 +156,7 @@ class _QrScannerWidgetState extends State<QrScannerWidget>
         MobileScanner(
           controller: _controller,
           onDetect: _handleDetection,
-          errorBuilder: (context, error, child) {
+          errorBuilder: (context, error) {
             return _buildErrorWidget(context, error);
           },
         ),

lib/widgets/snr_indicator.dart

@@ -1,4 +1,13 @@
 import 'package:flutter/material.dart';
+import '../connector/meshcore_connector.dart';
+import '../l10n/l10n.dart';
+
+class SNRUi {
+  final IconData icon;
+  final Color color;
+  final String text;
+  const SNRUi(this.icon, this.color, this.text);
+}
 
 List<double> getSNRfromSF(int spreadingFactor) {
   switch (spreadingFactor) {
@@ -19,44 +28,178 @@ List<double> getSNRfromSF(int spreadingFactor) {
   }
 }
 
-class SNRIcon extends StatelessWidget {
-  final double snr;
-  final List<double> snrLevels;
+SNRUi snrUiFromSNR(double? snr, int? spreadingFactor) {
+  if (snr == null ||
+      spreadingFactor == null ||
+      spreadingFactor < 7 ||
+      spreadingFactor > 12) {
+    return const SNRUi(Icons.signal_cellular_off, Colors.grey, '—');
+  }
 
-  const SNRIcon({
-    super.key,
-    required this.snr,
-    this.snrLevels = const [4.0, -2.0, -4.0, -6.0],
-  });
+  final snrLevels = getSNRfromSF(spreadingFactor);
+
+  IconData icon;
+  Color color;
+  String text = '${snr.toStringAsFixed(1)} dB';
+
+  if (snr >= snrLevels[0]) {
+    icon = Icons.signal_cellular_alt;
+    color = Colors.green;
+  } else if (snr >= snrLevels[1]) {
+    icon = Icons.signal_cellular_alt;
+    color = Colors.lightGreen;
+  } else if (snr >= snrLevels[2]) {
+    icon = Icons.signal_cellular_alt;
+    color = Colors.yellow;
+  } else if (snr >= snrLevels[3]) {
+    icon = Icons.signal_cellular_alt_2_bar;
+    color = Colors.orange;
+  } else {
+    icon = Icons.signal_cellular_alt_1_bar;
+    color = Colors.red;
+  }
+
+  return SNRUi(icon, color, text);
+}
+
+class SNRIndicator extends StatefulWidget {
+  final MeshCoreConnector connector;
+
+  const SNRIndicator({super.key, required this.connector});
 
+  @override
+  State<SNRIndicator> createState() => _SNRIndicatorState();
+}
+
+class _SNRIndicatorState extends State<SNRIndicator> {
   @override
   Widget build(BuildContext context) {
-    IconData icon;
-    Color color;
+    final directRepeaters = widget.connector.directRepeaters;
+    final directBestRepeaters = List.of(directRepeaters)
+      ..sort((a, b) => (b.ranking).compareTo(a.ranking));
+    final directRepeater = directBestRepeaters.isEmpty
+        ? null
+        : directBestRepeaters.first;
 
-    if (snr >= snrLevels[0]) {
-      icon = Icons.signal_cellular_alt;
-      color = Colors.green;
-    } else if (snr >= snrLevels[1]) {
-      icon = Icons.signal_cellular_alt;
-      color = Colors.lightGreen;
-    } else if (snr >= snrLevels[2]) {
-      icon = Icons.signal_cellular_alt;
-      color = Colors.yellow;
-    } else if (snr >= snrLevels[3]) {
-      icon = Icons.signal_cellular_alt_2_bar;
-      color = Colors.orange;
-    } else {
-      icon = Icons.signal_cellular_alt_1_bar;
-      color = Colors.red;
+    final snrUi = snrUiFromSNR(
+      directBestRepeaters.isNotEmpty ? directRepeater!.snr : null,
+      widget.connector.currentSf,
+    );
+
+    return InkWell(
+      onTap: () {
+        if (directRepeater != null) {
+          _showFullPathDialog(context, directBestRepeaters);
+        }
+      },
+      borderRadius: BorderRadius.circular(8),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 8),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Column(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                Icon(snrUi.icon, size: 18, color: snrUi.color),
+                Text(
+                  snrUi.text,
+                  style: TextStyle(fontSize: 12, color: snrUi.color),
+                ),
+              ],
+            ),
+            if (directRepeater != null)
+              Text(
+                '${directRepeaters.length}: ${directRepeater.pubkeyFirstByte.toRadixString(16).padLeft(2, '0')}: ${_formatLastUpdated(directRepeater.lastUpdated)}',
+                style: TextStyle(
+                  fontSize: 12,
+                  fontWeight: FontWeight.w500,
+                  color: Colors.grey,
+                ),
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  String _formatLastUpdated(DateTime lastSeen) {
+    final now = DateTime.now();
+    final diff = now.difference(lastSeen);
+    if (diff.isNegative) {
+      return "0s";
     }
+    if (diff.inMinutes < 1) {
+      return "${diff.inSeconds}s";
+    }
+    if (diff.inMinutes < 60) {
+      return "${diff.inMinutes}m";
+    }
+    if (diff.inHours < 24) {
+      final hours = diff.inHours;
+      return hours == 1 ? "1h" : "${hours}hs";
+    }
+    final days = diff.inDays;
+    return days == 1 ? "1d" : "${days}ds";
+  }
 
-    return Column(
-      mainAxisAlignment: MainAxisAlignment.center,
-      children: [
-        Icon(icon, color: color),
-        Text('$snr dB', style: TextStyle(fontSize: 10, color: color)),
-      ],
+  void _showFullPathDialog(
+    BuildContext context,
+    List<DirectRepeater> directBestRepeaters,
+  ) {
+    final l10n = context.l10n;
+
+    showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: Text(l10n.snrIndicator_nearByRepeaters),
+        content: SizedBox(
+          child: Scrollbar(
+            child: ListView.separated(
+              padding: const EdgeInsets.symmetric(vertical: 4),
+              itemCount: directBestRepeaters.length,
+              separatorBuilder: (_, _) => const Divider(height: 1),
+              itemBuilder: (context, index) {
+                final repeater = directBestRepeaters[index];
+                final snrUi = snrUiFromSNR(
+                  repeater.snr,
+                  widget.connector.currentSf,
+                );
+
+                final name = widget.connector.contacts
+                    .where((c) => c.publicKey.first == repeater.pubkeyFirstByte)
+                    .map((c) => c.name)
+                    .firstOrNull;
+
+                return Column(
+                  children: [
+                    ListTile(
+                      leading: Icon(snrUi.icon, color: snrUi.color),
+                      title: Text(
+                        name ??
+                            repeater.pubkeyFirstByte
+                                .toRadixString(16)
+                                .padLeft(2, '0'),
+                      ),
+                      subtitle: Text(
+                        'SNR: ${repeater.snr.toStringAsFixed(1)} dB\n${l10n.snrIndicator_lastSeen}: ${_formatLastUpdated(repeater.lastUpdated)}',
+                      ),
+                    ),
+                  ],
+                );
+              },
+            ),
+          ),
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(context),
+            child: Text(l10n.common_close),
+          ),
+        ],
+      ),
     );
   }
 }

pubspec.lock

@@ -69,10 +69,10 @@ packages:
     dependency: "direct main"
     description:
       name: characters
-      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
+      sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.4.1"
   checked_yaml:
     dependency: transitive
     description:
@@ -153,14 +153,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.0"
+  dart_polylabel2:
+    dependency: transitive
+    description:
+      name: dart_polylabel2
+      sha256: "7eeab15ce72894e4bdba6a8765712231fc81be0bd95247de4ad9966abc57adc6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
   dbus:
     dependency: transitive
     description:
       name: dbus
-      sha256: "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c"
+      sha256: d0c98dcd4f5169878b6cf8f6e0a52403a9dff371a3e2f019697accbf6f44a270
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.11"
+    version: "0.7.12"
   fake_async:
     dependency: transitive
     description:
@@ -173,10 +181,10 @@ packages:
     dependency: transitive
     description:
       name: ffi
-      sha256: d07d37192dbf97461359c1518788f203b0c9102cfd2c35a716b823741219542c
+      sha256: "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.5"
+    version: "2.2.0"
   file:
     dependency: transitive
     description:
@@ -202,10 +210,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_blue_plus
-      sha256: "399b3dbc15562ef59749f04e43a99ccbb91540022380d5f269aff3c2787534e4"
+      sha256: "88a65ead7dea67ddcc03e6ca846163c6b6cc09a2dcebdb8bb601fcd654ea9382"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   flutter_blue_plus_android:
     dependency: transitive
     description:
@@ -218,10 +226,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_blue_plus_darwin
-      sha256: d160a8128e3a016fa58dd65ab6dac05cbc73e0fa799a1f24211d041641ed63ba
+      sha256: "52b155d868e17c1c8ad85520a0912d447d92aedccb5a5e234d3edc98ebd1307a"
       url: "https://pub.dev"
     source: hosted
-    version: "8.1.0"
+    version: "8.1.1"
   flutter_blue_plus_linux:
     dependency: transitive
     description:
@@ -250,10 +258,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_blue_plus_winrt
-      sha256: "34be2d8e23d5881b46accebb0e71025f7d52869d72ea98b5082c20764e06aa80"
+      sha256: ed894f0ab341f4cece8fa33edc381d46424a7c5bfd0e841d933d0f8c34c86521
       url: "https://pub.dev"
     source: hosted
-    version: "0.0.16"
+    version: "0.0.18"
   flutter_cache_manager:
     dependency: "direct main"
     description:
@@ -266,18 +274,18 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_foreground_task
-      sha256: "6cf10a27f5e344cd2ecad0752d3a5f4ec32846d82fda8753b3fe2480ebb832a3"
+      sha256: "48ea45056155a99fb30b15f14f4039a044d925bc85f381ed0b2d3b00a60b99de"
       url: "https://pub.dev"
     source: hosted
-    version: "6.5.0"
+    version: "9.2.0"
   flutter_launcher_icons:
     dependency: "direct dev"
     description:
       name: flutter_launcher_icons
-      sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea"
+      sha256: "10f13781741a2e3972126fae08393d3c4e01fa4cd7473326b94b72cf594195e7"
       url: "https://pub.dev"
     source: hosted
-    version: "0.13.1"
+    version: "0.14.4"
   flutter_linkify:
     dependency: "direct main"
     description:
@@ -290,34 +298,42 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
+      sha256: "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.0"
+    version: "6.0.0"
   flutter_local_notifications:
     dependency: "direct main"
     description:
       name: flutter_local_notifications
-      sha256: ef41ae901e7529e52934feba19ed82827b11baa67336829564aeab3129460610
+      sha256: "2b50e938a275e1ad77352d6a25e25770f4130baa61eaf02de7a9a884680954ad"
       url: "https://pub.dev"
     source: hosted
-    version: "18.0.1"
+    version: "20.1.0"
   flutter_local_notifications_linux:
     dependency: transitive
     description:
       name: flutter_local_notifications_linux
-      sha256: "8f685642876742c941b29c32030f6f4f6dacd0e4eaecb3efbb187d6a3812ca01"
+      sha256: dce0116868cedd2cdf768af0365fc37ff1cbef7c02c4f51d0587482e625868d0
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.0"
+    version: "7.0.0"
   flutter_local_notifications_platform_interface:
     dependency: transitive
     description:
       name: flutter_local_notifications_platform_interface
-      sha256: "6c5b83c86bf819cdb177a9247a3722067dd8cc6313827ce7c77a4b238a26fd52"
+      sha256: "23de31678a48c084169d7ae95866df9de5c9d2a44be3e5915a2ff067aeeba899"
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.0"
+    version: "10.0.0"
+  flutter_local_notifications_windows:
+    dependency: transitive
+    description:
+      name: flutter_local_notifications_windows
+      sha256: e97a1a3016512437d9c0b12fae7d1491c3c7b9aa7f03a69b974308840656b02a
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
   flutter_localizations:
     dependency: "direct main"
     description: flutter
@@ -327,10 +343,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_map
-      sha256: "2ecb34619a4be19df6f40c2f8dce1591675b4eff7a6857bd8f533706977385da"
+      sha256: "391e7dc95cc3f5190748210a69d4cfeb5d8f84dcdfa9c3235d0a9d7742ccb3f8"
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.2"
+    version: "8.2.2"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -361,10 +377,10 @@ packages:
     dependency: transitive
     description:
       name: hooks
-      sha256: "5d309c86e7ce34cd8e37aa71cb30cb652d3829b900ab145e4d9da564b31d59f7"
+      sha256: "7a08a0d684cb3b8fb604b78455d5d352f502b68079f7b80b831c62220ab0a4f6"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.0.1"
   http:
     dependency: "direct main"
     description:
@@ -397,14 +413,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.20.2"
-  js:
-    dependency: transitive
-    description:
-      name: js
-      sha256: "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.7.2"
   json_annotation:
     dependency: transitive
     description:
@@ -457,10 +465,10 @@ packages:
     dependency: transitive
     description:
       name: lints
-      sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7
+      sha256: "12f842a479589fea194fe5c5a3095abc7be0c1f2ddfa9a0e76aed1dbd26a87df"
       url: "https://pub.dev"
     source: hosted
-    version: "5.1.1"
+    version: "6.1.0"
   lists:
     dependency: transitive
     description:
@@ -489,18 +497,18 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
+      sha256: "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.17"
+    version: "0.12.18"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
+      sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.11.1"
+    version: "0.13.0"
   meta:
     dependency: transitive
     description:
@@ -529,10 +537,10 @@ packages:
     dependency: "direct main"
     description:
       name: mobile_scanner
-      sha256: "0b466a0a8a211b366c2e87f3345715faef9b6011c7147556ad22f37de6ba3173"
+      sha256: c6184bf2913dd66be244108c9c27ca04b01caf726321c44b0e7a7a1e32d41044
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.11"
+    version: "7.1.4"
   native_toolchain_c:
     dependency: transitive
     description:
@@ -553,10 +561,10 @@ packages:
     dependency: transitive
     description:
       name: objective_c
-      sha256: "983c7fa1501f6dcc0cb7af4e42072e9993cb28d73604d25ebf4dab08165d997e"
+      sha256: "100a1c87616ab6ed41ec263b083c0ef3261ee6cd1dc3b0f35f8ddfa4f996fe52"
       url: "https://pub.dev"
     source: hosted
-    version: "9.2.5"
+    version: "9.3.0"
   octo_image:
     dependency: transitive
     description:
@@ -569,10 +577,10 @@ packages:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: "16eee997588c60225bda0488b6dcfac69280a6b7a3cf02c741895dd370a02968"
+      sha256: f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d
       url: "https://pub.dev"
     source: hosted
-    version: "8.3.1"
+    version: "9.0.0"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -665,18 +673,10 @@ packages:
     dependency: "direct main"
     description:
       name: pointycastle
-      sha256: "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe"
+      sha256: "92aa3841d083cc4b0f4709b5c74fd6409a3e6ba833ffc7dc6a8fee096366acf5"
       url: "https://pub.dev"
     source: hosted
-    version: "3.9.1"
-  polylabel:
-    dependency: transitive
-    description:
-      name: polylabel
-      sha256: "41b9099afb2aa6c1730bdd8a0fab1400d287694ec7615dd8516935fa3144214b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.1"
+    version: "4.0.0"
   posix:
     dependency: transitive
     description:
@@ -822,10 +822,10 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
+      sha256: "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab"
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.1"
+    version: "1.10.2"
   sqflite:
     dependency: transitive
     description:
@@ -910,10 +910,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55
+      sha256: "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.7"
+    version: "0.7.9"
   timezone:
     dependency: transitive
     description:
@@ -958,10 +958,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: cfde38aa257dae62ffe79c87fab20165dfdf6988c1d31b58ebf59b9106062aad
+      sha256: "580fe5dfb51671ae38191d316e027f6b76272b026370708c2d898799750a02b0"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.6"
+    version: "6.4.1"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -1030,10 +1030,10 @@ packages:
     dependency: "direct main"
     description:
       name: wakelock_plus
-      sha256: "61713aa82b7f85c21c9f4cd0a148abd75f38a74ec645fcb1e446f882c82fd09b"
+      sha256: "9296d40c9adbedaba95d1e704f4e0b434be446e2792948d0e4aa977048104228"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.3"
+    version: "1.4.0"
   wakelock_plus_platform_interface:
     dependency: transitive
     description:

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 5.0.0+6
+version: 6.0.0+7
 
 environment:
   sdk: ^3.9.2
@@ -41,19 +41,19 @@ dependencies:
   provider: ^6.1.5+1
   shared_preferences: ^2.2.2
   uuid: ^4.3.3
-  flutter_map: ^7.0.2
+  flutter_map: ^8.2.2
   latlong2: ^0.9.1
-  flutter_local_notifications: ^18.0.1
+  flutter_local_notifications: ^20.1.0
   crypto: ^3.0.3
-  pointycastle: ^3.7.4
+  pointycastle: ^4.0.0
   http: ^1.2.0
   cached_network_image: ^3.4.1
   flutter_cache_manager: ^3.4.1
-  flutter_foreground_task: ^6.1.2
+  flutter_foreground_task: ^9.2.0
   wakelock_plus: ^1.2.8
   characters: ^1.4.0
-  package_info_plus: ^8.0.0
-  mobile_scanner: ^6.0.0  # QR/barcode scanning
+  package_info_plus: ^9.0.0
+  mobile_scanner: ^7.1.4  # QR/barcode scanning
   qr_flutter: ^4.1.0      # QR code generation
   url_launcher: ^6.3.0    # Launch URLs in system browser
   flutter_linkify: ^6.0.0 # Auto-detect and linkify URLs in text
@@ -70,8 +70,8 @@ dev_dependencies:
   # activated in the `analysis_options.yaml` file located at the root of your
   # package. See that file for information about deactivating specific lint
   # rules and activating additional ones.
-  flutter_lints: ^5.0.0
-  flutter_launcher_icons: ^0.13.1
+  flutter_lints: ^6.0.0
+  flutter_launcher_icons: ^0.14.4
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec

untranslated.json

@@ -1,127 +1 @@
-{
-  "bg": [
-    "notification_activityTitle",
-    "notification_messagesCount",
-    "notification_channelMessagesCount",
-    "notification_newNodesCount",
-    "notification_newTypeDiscovered",
-    "notification_receivedNewMessage"
-  ],
-
-  "de": [
-    "notification_activityTitle",
-    "notification_messagesCount",
-    "notification_channelMessagesCount",
-    "notification_newNodesCount",
-    "notification_newTypeDiscovered",
-    "notification_receivedNewMessage"
-  ],
-
-  "es": [
-    "notification_activityTitle",
-    "notification_messagesCount",
-    "notification_channelMessagesCount",
-    "notification_newNodesCount",
-    "notification_newTypeDiscovered",
-    "notification_receivedNewMessage"
-  ],
-
-  "fr": [
-    "notification_activityTitle",
-    "notification_messagesCount",
-    "notification_channelMessagesCount",
-    "notification_newNodesCount",
-    "notification_newTypeDiscovered",
-    "notification_receivedNewMessage"
-  ],
-
-  "it": [
-    "notification_activityTitle",
-    "notification_messagesCount",
-    "notification_channelMessagesCount",
-    "notification_newNodesCount",
-    "notification_newTypeDiscovered",
-    "notification_receivedNewMessage"
-  ],
-
-  "nl": [
-    "notification_activityTitle",
-    "notification_messagesCount",
-    "notification_channelMessagesCount",
-    "notification_newNodesCount",
-    "notification_newTypeDiscovered",
-    "notification_receivedNewMessage"
-  ],
-
-  "pl": [
-    "notification_activityTitle",
-    "notification_messagesCount",
-    "notification_channelMessagesCount",
-    "notification_newNodesCount",
-    "notification_newTypeDiscovered",
-    "notification_receivedNewMessage"
-  ],
-
-  "pt": [
-    "notification_activityTitle",
-    "notification_messagesCount",
-    "notification_channelMessagesCount",
-    "notification_newNodesCount",
-    "notification_newTypeDiscovered",
-    "notification_receivedNewMessage"
-  ],
-
-  "ru": [
-    "notification_activityTitle",
-    "notification_messagesCount",
-    "notification_channelMessagesCount",
-    "notification_newNodesCount",
-    "notification_newTypeDiscovered",
-    "notification_receivedNewMessage"
-  ],
-
-  "sk": [
-    "notification_activityTitle",
-    "notification_messagesCount",
-    "notification_channelMessagesCount",
-    "notification_newNodesCount",
-    "notification_newTypeDiscovered",
-    "notification_receivedNewMessage"
-  ],
-
-  "sl": [
-    "notification_activityTitle",
-    "notification_messagesCount",
-    "notification_channelMessagesCount",
-    "notification_newNodesCount",
-    "notification_newTypeDiscovered",
-    "notification_receivedNewMessage"
-  ],
-
-  "sv": [
-    "notification_activityTitle",
-    "notification_messagesCount",
-    "notification_channelMessagesCount",
-    "notification_newNodesCount",
-    "notification_newTypeDiscovered",
-    "notification_receivedNewMessage"
-  ],
-
-  "uk": [
-    "notification_activityTitle",
-    "notification_messagesCount",
-    "notification_channelMessagesCount",
-    "notification_newNodesCount",
-    "notification_newTypeDiscovered",
-    "notification_receivedNewMessage"
-  ],
-
-  "zh": [
-    "notification_activityTitle",
-    "notification_messagesCount",
-    "notification_channelMessagesCount",
-    "notification_newNodesCount",
-    "notification_newTypeDiscovered",
-    "notification_receivedNewMessage"
-  ]
-}
+{}

windows/flutter/generated_plugins.cmake

@@ -9,6 +9,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST
+  flutter_local_notifications_windows
 )
 
 set(PLUGIN_BUNDLED_LIBRARIES)