Merge branch 'dev-offline' of github.com:zjs81/meshcore-open into dev-offline

fix: Improve error handling when restoring last companion public key and update disconnection message in Dutch localization
Potential fix for pull request finding
2026-08-05 23:42:57 +10:00 · 2026-05-27 10:31:23 -07:00 · 2026-05-27 10:26:19 -07:00 · 2026-05-12 18:49:25 -07:00 · 2026-05-12 18:31:55 -07:00 · 2026-05-12 18:30:39 -07:00
140 changed files with 18700 additions and 38903 deletions
@@ -91,6 +91,3 @@ keystore.properties

 # Cloudflare Wrangler
 .wrangler
-
-# Claude Code local working dir (worktrees, jobs, settings)
-.claude/
@@ -41,7 +41,7 @@ lib/
 ├── models/          # Plain data classes (Contact, Channel, Message, Community, …)
 ├── services/        # ChangeNotifier services + IO services (retry, translation, ML, …)
 ├── storage/         # SharedPreferences-backed stores, scoped per device key
-├── helpers/         # Pure utilities (Smaz compression, GIF parsing, scroll helpers, path hop resolution)
+├── helpers/         # Pure utilities (Smaz compression, GIF parsing, scroll helpers)
 ├── utils/           # Platform / IO / UX utilities (logger, GPX export, dialogs)
 ├── theme/           # MeshPalette (defined, not yet wired in main.dart)
 ├── l10n/            # ARB localization for 18 locales
@@ -194,14 +194,14 @@ enum MeshCoreConnectionState {

 ## Dependencies

-App version: `9.5.0+13` — Dart SDK constraint: `^3.9.2`
+App version: `8.0.0+11` — Dart SDK constraint: `^3.9.2`

 **Connectivity**

 | Package | Version | Purpose |
 |---------|---------|---------|
 | flutter_blue_plus | ^2.1.0 | BLE scanning, connecting, and UART data transfer |
-| flutter_blue_plus_platform_interface | ^9.0.2 | Platform-interface layer required by flutter_blue_plus |
+| flutter_blue_plus_platform_interface | ^8.2.1 | Platform-interface layer required by flutter_blue_plus |
 | flserial | git (MeshEnvy fork) | USB serial transport for wired device connections (TODO: upstream pending) |

 **State / Storage**
@@ -232,7 +232,7 @@ App version: `9.5.0+13` — Dart SDK constraint: `^3.9.2`

 | Package | Version | Purpose |
 |---------|---------|---------|
-| material_symbols_icons | ^4.2928.1 | Extended Material Symbols icon set (line-of-sight, etc.) |
+| material_symbols_icons | ^4.2906.0 | Extended Material Symbols icon set (line-of-sight, etc.) |
 | flutter_svg | ^2.0.10+1 | Renders SVG assets (custom icons such as LoS indicator) |
 | cached_network_image | ^3.4.1 | Caches map tile images downloaded over the network |
 | flutter_cache_manager | ^3.4.1 | Underlying cache manager used by cached_network_image |
@@ -246,7 +246,7 @@ App version: `9.5.0+13` — Dart SDK constraint: `^3.9.2`

 | Package | Version | Purpose |
 |---------|---------|---------|
-| flutter_local_notifications | ^22.0.0 | Shows local push notifications for incoming messages |
+| flutter_local_notifications | ^20.1.0 | Shows local push notifications for incoming messages |
 | flutter_foreground_task | ^9.2.0 | Keeps the app alive in background to maintain BLE/USB connection |

 **ML / AI**
@@ -255,8 +255,7 @@ App version: `9.5.0+13` — Dart SDK constraint: `^3.9.2`
 |---------|---------|---------|
 | ml_algo | ^16.0.0 | OLS regression used in `timeout_prediction_service.dart` to predict message ACK timeouts |
 | ml_dataframe | ^1.0.0 | DataFrame input format required by ml_algo |
-| llamadart | ^0.8.0 | On-device LLM inference used in `translation_service.dart` for message translation |
-| flutter_langdetect | ^0.0.1 | Detects a message's source language in `translation_service.dart` before translating |
+| llamadart | >=0.6.8 <0.7.0 | On-device LLM inference used in `translation_service.dart` for message translation |

 **Misc**

@@ -264,8 +263,8 @@ App version: `9.5.0+13` — Dart SDK constraint: `^3.9.2`
 |---------|---------|---------|
 | http | ^1.2.0 | Fetches tile URLs and any remote API calls |
 | url_launcher | ^6.3.0 | Opens URLs in the system browser from linkified chat text |
-| share_plus | ^13.1.0 | Shares files (e.g. exported GPX tracks) via the system share sheet |
-| package_info_plus | ^10.1.0 | Reads app version/build number displayed in settings |
+| share_plus | ^12.0.1 | Shares files (e.g. exported GPX tracks) via the system share sheet |
+| package_info_plus | ^9.0.0 | Reads app version/build number displayed in settings |
 | web | ^1.1.1 | Web-platform APIs for USB serial and browser detection on Flutter Web |
 | intl | any | Internationalization and locale formatting (required by flutter_localizations) |
 | build_pipe | ^0.3.1 | CI/CD build pipeline configuration (web release builds with versioned assets) |
@@ -334,4 +333,4 @@ PWA scaffold present but boilerplate (`manifest.json` and `index.html` are unmod
 | `lib/services/translation_service.dart` | On-device LLM translation (llamadart) |
 | `lib/storage/prefs_manager.dart` | SharedPreferences singleton initialized in `main()` |
 | `lib/screens/scanner_screen.dart` | Home screen — BLE scan and connect |
-| `pubspec.yaml` | Dependencies and project metadata (current version `9.5.0+13`) |
+| `pubspec.yaml` | Dependencies and project metadata (current version `8.0.0+11`) |
@@ -94,12 +94,12 @@ MeshCore Open is a cross-platform mobile application for communicating with Mesh
 |---------|---------|
 | flutter_blue_plus | Bluetooth Low Energy communication |
 | provider | State management |
-| shared_preferences | Local key-value storage (scoped per device) |
+| sqflite | Local database storage |
 | flutter_map | Interactive map display |
 | latlong2 | Geographic coordinate handling |
 | flutter_local_notifications | Background notification support |
+| smaz | Message compression |
 | pointycastle | Cryptographic operations |
-| llamadart | On-device LLM message translation |
 | intl | Internationalization and date formatting |

 ## Getting Started
@@ -1,7 +1,3 @@
 org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true
-# This builtInKotlin flag was added automatically by Flutter migrator
-android.builtInKotlin=false
-# This newDsl flag was added automatically by Flutter migrator
-android.newDsl=false
@@ -198,7 +198,6 @@ Tap the translate button on any received message. On first use, the GGUF model f

 ### How It Works
 - Model files are managed by `TranslationFileStore`; download progress is shown in-place
- Before translating, the source language is automatically detected using the `flutter_langdetect` package. If the detected language already matches the target language, translation is skipped
 - Translation runs via `TranslationService` using the llamadart CPU backend (arm64 and x64 on Android)
 - Translated text is shown in `TranslatedMessageContent` as an inline overlay on the original message bubble
 - Each translation is cached; re-tapping shows the cached result without re-running inference
@@ -56,7 +56,6 @@ enum MeshCoreConnectionState {
    - `Lilygo`
    - `HT-`
    - `LowMesh_MC_`
-    - `NRF52`
 2. **Connect** with 15-second timeout (6 seconds on Linux)
 3. **Request MTU** 185 bytes (non-web only)
 4. **Discover services** and locate NUS
@@ -116,15 +115,13 @@ On unexpected disconnection, auto-reconnect with exponential backoff:
 | 32 | CMD_SET_CHANNEL | Set channel name and PSK |
 | 36 | CMD_SEND_TRACE_PATH | Request path trace |
 | 38 | CMD_SET_OTHER_PARAMS | Set misc parameters |
-| 39 | CMD_SEND_TELEMETRY_REQ | Request sensor telemetry |
+| 39 | CMD_GET_TELEMETRY_REQ | Request sensor telemetry |
 | 40 | CMD_GET_CUSTOM_VAR | Get custom variables |
 | 41 | CMD_SET_CUSTOM_VAR | Set a custom variable |
 | 50 | CMD_SEND_BINARY_REQ | Send binary request |
-| 56 | CMD_GET_STATS | Request companion radio stats |
 | 57 | CMD_SEND_ANON_REQ | Send anonymous request |
 | 58 | CMD_SET_AUTO_ADD_CONFIG | Set auto-add configuration |
 | 59 | CMD_GET_AUTO_ADD_CONFIG | Get auto-add configuration |
-| 61 | CMD_SET_PATH_HASH_MODE | Set path hash width (bytes per hop) |

 ## Response / Push Codes (Device → App)

@@ -148,7 +145,6 @@ On unexpected disconnection, auto-reconnect with exponential backoff:
 | 17 | RESP_CODE_CHANNEL_MSG_RECV_V3 | Incoming channel message (v3) |
 | 18 | RESP_CODE_CHANNEL_INFO | Channel definition |
 | 21 | RESP_CODE_CUSTOM_VARS | Custom variables |
-| 24 | RESP_CODE_STATS | Companion radio stats |
 | 25 | RESP_CODE_AUTO_ADD_CONFIG | Auto-add flags |
 | 0x80 | PUSH_CODE_ADVERT | Known contact re-seen |
 | 0x81 | PUSH_CODE_PATH_UPDATED | Better path found; carries the 32-byte public key of the updated contact |
@@ -4,7 +4,7 @@

 Channels are broadcast group-chat spaces secured by a 16-byte pre-shared key (PSK). Any device with the same channel index and PSK will receive and decrypt channel messages. Unlike direct messages, channel messages are broadcast to the entire mesh.

-The number of active channels is determined by the firmware (default 40); the device reports its actual limit at login.
+Up to 8 channels (indices 0–7) can be active simultaneously on one device.

 ## How to Access

@@ -17,7 +17,7 @@ QuickSwitchBar tab 1 (middle) from any main screen.
 | Public | Globe | Green | Fixed well-known PSK; any device can join |
 | Hashtag | Hash tag | Blue | PSK derived from the hashtag name via SHA-256; discoverable by convention |
 | Private | Lock | Blue | Random PSK; requires out-of-band sharing of the 32-hex key |
-| Community | Groups/Tag | Magenta | PSK derived via HMAC-SHA256 from a community's shared secret |
+| Community | Groups/Tag | Purple | PSK derived via HMAC-SHA256 from a community's shared secret |

 ## Channels List Screen

@@ -26,12 +26,12 @@ QuickSwitchBar tab 1 (middle) from any main screen.
 - **Search bar** with live text filtering (300ms debounce)
 - **Sort/filter button**
 - **Scrollable list of channel cards**, each showing:
-  - Type icon with color coding (magenta badge overlay for community channels)
+  - Type icon with color coding (purple badge overlay for community channels)
  - Channel name (or "Channel N" if unnamed)
  - Unread badge (if messages are unread)
  - Drag handle (when manual sort is active)
 - **"+" FAB** to add a new channel
- **Overflow menu**: Disconnect, Manage Communities, Settings
+- **Overflow menu**: Disconnect, Manage Communities (only shown when at least one community exists), Settings

 If no channels exist, an empty state with an "Add Public Channel" shortcut is shown. If a search produces no results, a separate "no results" empty state with a search-off icon is shown.

@@ -59,7 +59,7 @@ Tap the "+" FAB to open a dialog with six options:

 | Action | Description |
 |---|---|
-| Edit | Change name, PSK (with a dice icon to generate a random PSK), SMAZ compression toggle (compresses outgoing messages to allow longer text within the byte limit), or Cyr2Lat encoding toggle (transliterates Cyrillic to Latin for compatibility) |
+| Edit | Change name, PSK (with a dice icon to generate a random PSK), or SMAZ compression toggle (compresses outgoing messages to allow longer text within the byte limit) |
 | Mute / Unmute | Toggle push notification suppression for this channel |
 | Delete | Remove the channel from the device (confirmation required) |

@@ -100,7 +100,8 @@ Tap a channel card to open the channel chat screen.

 ### Message Path Viewing

- **All platforms**: Long-press (or right-click on desktop) a message bubble → "Path"
+- **Mobile**: Tap a message bubble to view its routing path
+- **Desktop**: Long-press/right-click → "Path" (tapping the bubble does nothing on desktop)
 - Opens the Channel Message Path Screen (see [Additional Features](additional-features.md))

 ### Context Actions (Long-Press / Right-Click)
@@ -108,7 +109,7 @@ Tap a channel card to open the channel chat screen.
 | Action | Availability | Description |
 |---|---|---|
 | Reply | All messages | Triggers reply mode |
-| Path | All messages | Opens message path view |
+| Path | Desktop only | Opens message path view |
 | Add Reaction | Incoming messages only | Opens emoji picker (cannot react to your own messages) |
 | Copy | All messages | Copies text to clipboard |
 | Mark as Unread | Incoming messages only | Marks this message and all subsequent incoming messages as unread |
@@ -141,7 +142,7 @@ From the channels screen overflow menu → "Manage Communities". Opens a draggab
 - **Tap a community** to directly show its QR code for sharing
 - **Popup menu** per community:
  - **Show QR** — displays the QR code for sharing with new members
-  - **Leave Community** — removes the community locally and deletes all associated device channels (confirmation dialog warns how many channels will be removed)
+  - **Delete** — removes the community locally and deletes all associated device channels (confirmation dialog warns how many channels will be removed)

 ## How Channels Differ from Direct Messages

@@ -18,15 +18,17 @@ From the Contacts screen, tap any Chat-type contact to open the ChatScreen.

 - **Title**: Contact name
 - **Subtitle**: Current routing path label (e.g., "2 hops", "flood (auto)", "direct (forced)") and unread count. Tapping the subtitle shows the full path details.
- **Action button**:
-  - **Overflow menu** (⋮ icon): Contains Routing, Info, Telemetry, Settings, and Clear Chat. Routing opens the routing sheet where you can switch between Auto, Direct, and Flood routing and manage recent paths (hop count, round-trip time, age, success count, color-coded by repeater). Info shows a dialog with contact type, path, GPS coordinates, and public key.
+- **Action buttons**:
+  - **Routing mode** (waves icon): Switch between Auto, Direct, and Flood routing
+  - **Path management** (timeline icon): View recent paths with hop count, round-trip time, age, and success count. Paths are color-coded by direct repeater (green/yellow/red/blue for ranked repeaters, grey for unknown). Tap a path to activate it (the device verifies and confirms via snackbar), long-press to view full path details, set custom paths, or force flood mode. A warning banner appears when history reaches 100 entries.
+  - **Info** (info icon): Contact info dialog showing type, path, GPS coordinates, public key, and SMAZ compression toggle

 ### Message List

 - Scrollable list with newest messages at the bottom
 - **Outgoing messages**: Right-aligned, primary color background. **Failed messages** change to a red-toned error container background
 - **Incoming messages**: Left-aligned, grey background with a colored avatar (initial letter or first emoji of sender name; color is deterministic from a hash of the sender name)
- Bubble width capped at 72% of screen width
+- Bubble width capped at 65% of screen width
 - Hyperlinks rendered as tappable green underlined text
 - **Pinch-to-zoom**: Two-finger zoom (0.8x–1.8x) and double-tap to reset
 - **Jump to bottom**: Floating button appears when scrolled away from the bottom
@@ -85,7 +87,7 @@ When a direct message is sent:

 1. The app computes an expected ACK hash: `SHA256([timestamp][attempt][text][selfPubKey])[0:4]` — matching the firmware's hash calculation. If SMAZ compression is enabled, the compressed text (not the original) is hashed
 2. On device acknowledgment (`RESP_CODE_SENT`), the message transitions to "sent" and a timeout timer starts
-3. **Timeout duration**: Preferably from the ML timeout prediction service; otherwise from the device's own `est_timeout` in `RESP_CODE_SENT` (clamped to the physics range); otherwise calculated from LoRa airtime physics: `500 + (airtime × 6 + 250) × (pathLength + 1)` ms for direct paths, `500 + 16 × airtime` ms for flood (airtime is estimated from the radio's current spreading factor, bandwidth, and coding rate). The result is capped at 45 seconds.
+3. **Timeout duration**: Preferably from the ML timeout prediction service; otherwise calculated from LoRa airtime physics: `500 + (airtime × 6 + 250) × (pathLength + 1)` ms for direct paths, `500 + 16 × airtime` ms for flood (airtime is estimated from the radio's current spreading factor, bandwidth, and coding rate)
 4. On timeout, the message is retried with **exponential backoff**: `1000 × 2^retryCount` ms (1s, 2s, 4s, 8s, 16s...)
 5. **Max retries**: Configurable (default 5, range 2–10)
 6. After max retries, the message is marked "failed" — but a **30-second grace window** remains during which a late ACK can still resolve the message to "delivered"
@@ -112,9 +114,8 @@ Add emoji reactions to incoming messages (not your own):
 | Action | Availability | Description |
 |---|---|---|
 | Add reaction | Incoming messages only | Opens emoji picker |
-| View path | All platforms: long-press/right-click menu | Shows message routing path |
+| View path | Mobile: tap bubble directly; Desktop: long-press/right-click menu | Shows message routing path |
 | Copy | All messages | Copies text to clipboard |
-| Translate | Incoming messages only (when translation is enabled and not yet translated) | Translates the message on-demand using the on-device model |
 | Mark as Unread | Incoming messages only | Marks this message and all subsequent incoming messages as unread |
 | Delete | All messages | Removes locally (not from mesh) |
 | Retry | Failed outgoing messages | Re-sends the message |
@@ -6,17 +6,18 @@ The Contacts screen is the primary hub for managing mesh nodes your radio has a

 ## How to Access

- QuickSwitchBar tab 0 (leftmost) from Channels or Map screens (Channels is shown first after connecting)
+- Automatically shown after connecting to a device
+- QuickSwitchBar tab 0 (leftmost) from Channels or Map screens
 - Back navigation from Chat or Settings screens

 ## Contact Types

 | Type | Avatar Color | Icon | Description |
 |---|---|---|---|
-| Chat | Blue | Initials / emoji | Another user's mesh radio |
-| Repeater | Amber | Cell tower | A mesh repeater/relay node |
-| Room | Magenta | Meeting room | A room server for group chat |
-| Sensor | Teal | Sensors | A sensor device |
+| Chat | Blue | Chat bubble | Another user's mesh radio |
+| Repeater | Orange | Cell tower | A mesh repeater/relay node |
+| Room | Purple | Group | A room server for group chat |
+| Sensor | Green | Sensors | A sensor device |

 ## Contact List

@@ -72,31 +73,31 @@ Groups are stored per radio identity (scoped by public key).

 | Action | Availability | Description |
 |---|---|---|
-| Ping | Repeaters only | Opens PathTraceMapScreen targeting the repeater |
-| Path Trace | Rooms (always); Chat/Sensor only if `pathLength > 0` | Opens PathTraceMapScreen. For rooms, label shows "Ping" when no path bytes are known, "Path Trace" when path bytes are available |
+| Ping | Repeaters (always) | Opens PathTraceMapScreen targeting the repeater |
+| Path Trace | Rooms (always); Chat/Sensor if `pathLength > 0` | Opens PathTraceMapScreen. For rooms, label shows "Ping" when no path bytes are known, "Path Trace" when path bytes are available |
 | Manage Repeater | Repeaters only | Login dialog → RepeaterHubScreen |
 | Room Login | Rooms only | Login dialog → ChatScreen |
 | Room Management | Rooms only | Login dialog → RepeaterHubScreen (management mode) |
+| Open Chat | Chat/Sensor | Same as single tap |
 | Add/Remove Favorite | All types | Toggles the favorite flag |
-| Share Contact | All types | Requests advert from device → copies `meshcore://<hex>` URI to clipboard |
+| Share Contact | All types | Copies `meshcore://<hex>` URI to clipboard |
 | Share Contact Zero-Hop | All types | Broadcasts the contact's advertisement one hop |
 | Delete Contact | All types | Confirmation dialog → removes from device and clears messages |

 ## App Bar Menus

-The Contacts screen has a single **three-dot overflow menu** (`⋮`) in the app bar:
+The Contacts screen has **two separate popup menus** in the app bar:

- Discovered Contacts — opens the DiscoveryScreen
- Add Contact from Clipboard — reads a `meshcore://<hex>` URI from clipboard and imports it
- *(divider)*
+**Antenna icon menu** (contact sharing):
 - Zero-Hop Advert — broadcasts your advertisement to immediately adjacent nodes
 - Flood Advert — broadcasts across the full mesh network
 - Copy Advert to Clipboard — copies your `meshcore://<hex>` URI for sharing externally
- *(divider)*
- Disconnect — disconnects from the device
- Settings — opens the Settings screen
+- Add Contact from Clipboard — reads a `meshcore://<hex>` URI from clipboard and imports it

-A **floating action button** (person-add icon) provides a shortcut sheet to "Add Contact from Clipboard" or "Discovered Contacts".
+**Three-dot overflow menu**:
+- Disconnect — disconnects from the device
+- Discovered Contacts — opens the DiscoveryScreen
+- Settings — opens the Settings screen

 ## Adding Contacts

@@ -104,10 +105,10 @@ A **floating action button** (person-add icon) provides a shortcut sheet to "Add
 When the radio hears an advertisement, the contact appears automatically if auto-add is enabled for that type (configurable in Settings → Contact Settings).

 ### Import from Clipboard
-Overflow menu (or the FAB shortcut) → "Add Contact from Clipboard". Reads a `meshcore://<hex>` URI from clipboard and imports it to the device.
+Antenna menu → "Add Contact from Clipboard". Reads a `meshcore://<hex>` URI from clipboard and imports it to the device.

 ### Import from Discovered Contacts
-Overflow menu → "Discovered Contacts". Shows nodes heard passively that haven't been added yet. Tap to immediately import (no confirmation dialog), or long-press for more options (Copy URI, Delete). The Discovery screen has its own search bar, type filters (Users, Repeaters, Rooms), and sort options (Last Seen, A-Z). An overflow "Delete All" option clears all discovered contacts.
+Overflow menu → "Discovered Contacts". Shows nodes heard passively that haven't been added yet. Tap to immediately import (no confirmation dialog), or long-press for more options (Add, Copy URI, Delete). The Discovery screen has its own search bar, type filters (Users, Repeaters, Rooms, Favorites), and sort options (Last Seen, A-Z). An overflow "Delete All" option clears all discovered contacts.

 ## Contact Sharing Format

@@ -35,9 +35,9 @@ Location pins shared in chat messages are displayed as flags:

 Tap a pin to see its info. Options to "Hide" (session only) or "Remove" (persistent).

-### Predicted / Guessed Locations
+### Predicted / Guessed Locations (Semi-Transparent)

-Many contacts on the mesh don't have GPS hardware, so the map has no explicit coordinates for them. Instead of leaving these contacts invisible, the app **infers an approximate position** by analyzing the repeater path the contact's messages travel through. These inferred positions are displayed as markers with a `not_listed_location` icon and a muted grey or colored border, visually distinct from confirmed-location markers.
+Many contacts on the mesh don't have GPS hardware, so the map has no explicit coordinates for them. Instead of leaving these contacts invisible, the app **infers an approximate position** by analyzing the repeater path the contact's messages travel through. These inferred positions are displayed as semi-transparent markers with a `not_listed_location` icon, visually distinct from confirmed-location markers.

 #### Why guessed locations exist

@@ -55,19 +55,19 @@ In a mesh network, every message hops through one or more repeaters on its way t

 5. **Compute the estimated position**:
   - **Single anchor**: The contact is placed on a small circle (330m radius) around the repeater. The angle on the circle is deterministic — derived from an FNV-1a hash of the contact's public key — so the same contact always appears at the same offset, preventing markers from stacking on top of each other.
-   - **Two or more anchors**: The position is a weighted average of all anchor coordinates (each subsequent anchor weighted at half the previous one, biasing toward the first), with a smaller offset radius (120m for 2 anchors, 80m for 3+) applied for visual separation.
+   - **Two or more anchors**: The position is the average (centroid) of all anchor coordinates, with a smaller offset radius (80–120m) applied for visual separation.

 6. **Assign confidence level**:
-   - **High confidence** (2+ anchors): The marker border uses the node's type color (brighter border).
-   - **Low confidence** (1 anchor): The marker border is rendered in a muted grey.
+   - **High confidence** (2+ anchors): Displayed at 55% opacity.
+   - **Low confidence** (1 anchor): Displayed at 30% opacity.

 7. **Cache the result**: The computation is cached using a key derived from the contact's paths, anchor positions, path-history version, and radio parameters. The cache is only invalidated when any of these inputs change, avoiding recomputation on every UI rebuild.

 #### How to read guessed locations on the map

- **Marker with `not_listed_location` icon**: This is a guessed position, not a confirmed GPS fix.
- **Colored border** (type color): Higher confidence — the contact was seen through 2 or more repeaters with known positions.
- **Grey border**: Lower confidence — based on a single repeater anchor only.
+- **Semi-transparent marker** with a `not_listed_location` icon: This is a guessed position, not a confirmed GPS fix.
+- **More opaque** (55%): Higher confidence — the contact was seen through 2 or more repeaters with known positions.
+- **More transparent** (30%): Lower confidence — based on a single repeater anchor only.
 - Coordinates shown in the marker info dialog are prefixed with `~` to indicate they are estimated.
 - Guessed locations can be toggled on/off in the map filter dialog (FAB → "Guessed locations" toggle).

@@ -110,16 +110,9 @@ A map with a polyline showing the route from your node through repeater hops to
 - **Green circles**: Hops with known GPS coordinates
 - **Orange circles** (`~HH`): Inferred positions (no GPS but deducible from contacts)
 - **Red endpoint**: Target contact with known GPS
- **Magenta endpoint**: Target with guessed position
+- **Purple semi-transparent endpoint**: Target with guessed position

-A bottom panel shows each hop pair with SNR quality icons and total path distance. When multiple observed paths are available, a **Single / Combined** toggle appears at the top of the map. In Combined view, all paths are overlaid; shared segments are highlighted with a white halo and a path count badge appears on shared nodes.
-
-The bottom panel also provides **packet animation controls**:
- **Animation toggle** (on/off)
- **Step back / Play / Step forward / Replay** buttons
- **Follow packet lock** — keeps the map camera centered on the moving packet dot
- **Speed selector** (0.5×, 1×, 2×, 4×)
- A live **"Hop x of y · from → to"** label that tracks the active segment
+A legend card at the bottom lists each hop pair with SNR quality icons and total path distance.

 ### How It Works
 Sends a trace request frame over the mesh. The repeater network traces the path hop-by-hop and returns per-hop SNR data. For hops without GPS, positions are inferred by averaging GPS coordinates of contacts sharing that last-hop byte.
@@ -132,17 +125,17 @@ Sends a trace request frame over the mesh. The repeater network traces the path
 From the main map, tap the terrain/antenna icon.

 ### What the User Sees
-A full-screen map with a draggable bottom sheet containing:
- **Elevation profile chart**: Terrain fill (green), LOS beam line (white), radio horizon line (yellow); obstruction points are marked as clickable dots on the chart
- **Status summary**: Clear (green), Marginal (amber, within 5 m of obstruction), or Blocked (red) with distance and clearance/obstruction amount
- **Options section** (collapsible): Node toggles, endpoint dropdowns, antenna height sliders (0–400 ft), Run LOS button
+A full-screen map with a collapsible control panel containing:
+- **Elevation profile chart**: Terrain fill (green), LOS beam line (white), radio horizon line (yellow)
+- **Status**: Clear (green) or blocked (red) with distance and minimum clearance
+- **Options panel**: Node toggles, endpoint dropdowns, antenna height sliders (0–400 ft), Run LOS button

 ### Key Interactions
- **Long-press the map** to add custom endpoints (pushpin markers, renameable/deleteable)
+- **Long-press the map** to add custom endpoints (orange pushpin markers, renameable/deleteable)
 - **Tap a marker** to select it as Point A or B; LOS runs automatically when both are set
 - **Antenna heights** are adjustable for both endpoints
- **Map line** between endpoints is colored green (clear), amber (marginal), or red (blocked)
- Terrain elevation is fetched from the Open-Meteo API (21, 41, or 81 sample points depending on link distance, cached 24 hours)
+- **Map line** between endpoints is colored green (clear) or red (blocked)
+- Terrain elevation is fetched from the Open-Meteo API (21–81 sample points, cached 24 hours)
 - K-factor is adjusted per radio frequency from a baseline of 4/3 at 915 MHz

 ---
@@ -156,7 +149,7 @@ Settings → App Settings → Map Display → Offline Map Cache
 - Map with a blue polygon overlay showing previously selected cache bounds
 - Bounding box coordinates card
 - **Cache Area** controls: "Use Current View" and Clear buttons
- **Zoom Range** range slider (3–18, dual-handle for min and max) with estimated tile count
+- **Zoom Range** slider (3–18) with estimated tile count
 - **Download progress** bar (when downloading)
 - **Download Tiles** and **Clear Cache** buttons

@@ -5,7 +5,7 @@
 The app follows this general flow:

 ```
-Launch → Scanner Screen → [Connect via BLE/USB/TCP] → Channels Screen
+Launch → Scanner Screen → [Connect via BLE/USB/TCP] → Contacts Screen
 ```

 After connecting, the three main screens (Contacts, Channels, Map) are accessible via a persistent bottom navigation bar called the **QuickSwitchBar**.
@@ -24,7 +24,7 @@ Tapping a tab replaces the current screen with a subtle fade + slight horizontal

 ## Disconnection

- The disconnect button (available in the overflow menu of each main screen) shows a confirmation dialog before disconnecting
+- The disconnect button (available in the Settings screen and other main screens) shows a confirmation dialog before disconnecting
 - If the device disconnects unexpectedly, the app automatically navigates back to the Scanner screen (fires after the current frame completes via a post-frame callback)
 - This auto-navigation behavior (`DisconnectNavigationMixin`) is shared across all main screens

@@ -38,11 +38,11 @@ Tapping a tab replaces the current screen with a subtle fade + slight horizontal

 ```
 ScannerScreen (root, always on stack)
-  ├─ [BLE connect] → push → ChannelsScreen
-  ├─ [TCP icon button] → push → TcpScreen
-  │     └─ [TCP connected] → pushReplacement → ChannelsScreen
-  └─ [USB icon button] → push → UsbScreen
-        └─ [USB connected] → pushReplacement → ChannelsScreen
+  ├─ [BLE connect] → push → ContactsScreen
+  ├─ [TCP FAB] → push → TcpScreen
+  │     └─ [TCP connected] → pushReplacement → ContactsScreen
+  └─ [USB FAB] → push → UsbScreen
+        └─ [USB connected] → pushReplacement → ContactsScreen

 ContactsScreen (selected=0)
  ├─ [quick-switch 1] → pushReplacement → ChannelsScreen
@@ -60,9 +60,9 @@ ChannelsScreen (selected=1)
 MapScreen (selected=2)
  ├─ [quick-switch 0] → pushReplacement → ContactsScreen
  ├─ [quick-switch 1] → pushReplacement → ChannelsScreen
-  ├─ [radar menu item] → enters in-map path trace mode (push → PathTraceMapScreen after path is built)
-  ├─ [terrain menu item] → push → LineOfSightMapScreen
-  └─ [long-press] → share marker sheet
+  ├─ [radar button] → push → PathTraceMapScreen
+  ├─ [terrain button] → push → LineOfSightMapScreen
+  └─ [long-press] → share marker / set location

 Settings (push from any main screen)
  └─ [App Settings] → push → AppSettingsScreen
@@ -22,7 +22,7 @@ MeshCore Open provides both **system notifications** (push-style OS alerts) and

 ### 3. Advertisement Notifications
 - **Triggered when**: A new node is discovered on the mesh for the first time
- **Title**: "New [type] discovered" (e.g., "New Chat discovered")
+- **Title**: "New [type] discovered" (e.g., "New chat node discovered")
 - **Body**: Contact's name
 - **Priority**: Default
 - **Android channel**: `adverts`
@@ -43,7 +43,7 @@ Red numeric badges appear throughout the UI:
 - **Contacts list**: Each contact row shows a red pill badge (e.g., "3") for unread messages
 - **Channels list**: Each channel row shows an unread badge
 - **Chat screen subtitle**: Shows unread count inline
- Badges cap at "9999+" for display
+- Badges cap at "99+" for display

 ### How Unread Counts Work

@@ -34,8 +34,8 @@ The central management screen showing:
 |---|---|---|
 | Status | Repeater Status Screen | All users |
 | Telemetry | Telemetry Screen | All users |
-| Neighbors | Neighbors Screen | All users |
 | CLI | Repeater CLI Screen | Admin only |
+| Neighbors | Neighbors Screen | All users |
 | Settings | Repeater Settings Screen | Admin only |

 The battery chemistry selector and CLI/Settings cards are hidden from guest users.
@@ -89,7 +89,7 @@ A terminal-style interface for sending commands directly to the repeater.
 - Type a command and press send (or Enter on desktop)
 - Up/down arrows navigate through command history
 - Quick-command buttons populate and send common commands
- Overflow menu (three-dot icon): "Debug next command" option shows raw frame debug info for the next typed command (shows error snackbar if input field is empty)
+- Bug report icon: Shows raw frame debug info for the next typed command (shows error snackbar if input field is empty)
 - Help icon: Opens a scrollable reference of all known CLI commands. Tapping any command populates the input field immediately
 - Clear icon: Wipes the command/response history
 - Failed/timed-out commands are automatically retried once
@@ -112,9 +112,7 @@ The in-app help reference (help icon) documents all known commands. Categories:

 **Power Management**: `get pwrmgt.support`, `get pwrmgt.source`, `get pwrmgt.bootreason`, `get pwrmgt.bootmv`

-**Sensors**: `sensor get {key}`, `sensor set {key} {value}`, `sensor list [start]`
-
-**GPS Management**: `gps`, `gps {on|off}`, `gps sync`, `gps setloc`, `gps advert`, `gps advert {none|share|prefs}`
+**Sensors**: `sensor get {key}`

 **Region Management**: `region`, `region load`, `region get`, `region put`, `region remove`, `region allowf`, `region denyf`, `region home`, `region save`, `region default`, `region list allowed`, `region list denied`

@@ -209,7 +207,7 @@ Nine configuration cards, each with its own per-field refresh button(s):

 **Danger Zone** (red-styled card)
 - Reboot repeater (sends `reboot` with confirmation dialog)
- Erase filesystem (serial-only; shows a confirmation dialog, then an informational snackbar — no command is sent over the air)
+- Erase filesystem (serial-only; shows informational snackbar only — no command is sent over the air)

 ### Key Interactions
 - **Settings are NOT auto-fetched on open**. Name is pre-filled from cached contact data. Each section has its own refresh button to fetch live values from the repeater
@@ -28,11 +28,9 @@ The BLE Scanner is the app's home screen, displayed immediately on launch.

 **Device List**: When no devices are found, shows a large Bluetooth icon with a prompt. The prompt text is dynamic: "Searching for devices..." while actively scanning, or "Tap Scan to search" when idle. When devices are found, shows a scrollable list of `DeviceTile` widgets.

-**App Bar Actions**: Icon buttons in the top-right corner of the app bar:
- **USB** icon button - Opens USB connection screen (Android, Windows, Linux, macOS, Chrome web only)
- **TCP/IP** icon button - Opens TCP connection screen (all non-web platforms)
-
-**Bottom FAB**: A single floating action button:
+**Bottom FAB Row**: Up to three floating action buttons:
+- **USB** button - Opens USB connection screen (Android, Windows, Linux, macOS, Chrome web only)
+- **TCP/IP** button - Opens TCP connection screen (all non-web platforms)
 - **BLE Scan** button - Toggles BLE scanning on/off; shows a spinner when scanning. **Disabled** (greyed out, not tappable) when Bluetooth is off

 ### Device Tile
@@ -53,7 +51,7 @@ Note: The weak (-80 to -90 dBm) and poor (< -90 dBm) tiers share the same icon s

 ### How Scanning Works

- Filters for devices advertising the Nordic UART Service UUID (so community forks with non-standard names are still found). Known name prefixes used by stock firmware builds for reference: `MeshCore-`, `Whisper-`, `WisCore-`, `Seeed`, `Lilygo`, `HT-`, `LowMesh_MC_`, `NRF52`
+- Filters for devices with names starting with one of the known prefixes: `MeshCore-`, `Whisper-`, `WisCore-`, `Seeed`, `Lilygo`, `HT-`, `LowMesh_MC_`
 - Uses low-latency scan mode on Android
 - Scans for 10 seconds then auto-stops
 - On iOS/macOS, waits for BLE adapter initialization before starting
@@ -67,7 +65,7 @@ Tap a device tile or its Connect button:
 3. Requests MTU 185 bytes for optimal throughput
 4. Discovers BLE services and locates the Nordic UART Service
 5. Subscribes to TX notifications for receiving data
-6. On success, automatically navigates to the Channels screen
+6. On success, automatically navigates to the Contacts screen
 7. On failure, shows a red error snackbar

 ---
@@ -76,7 +74,7 @@ Tap a device tile or its Connect button:

 ### How to Access

-From the Scanner screen, tap the **USB** icon button in the app bar.
+From the Scanner screen, tap the **USB** FAB button.

 ### What the User Sees

@@ -84,15 +82,15 @@ From the Scanner screen, tap the **USB** icon button in the app bar.
 - A list of detected USB serial ports, each showing:
  - Friendly display name
  - Raw port name (subtitle, only shown when it differs from the display name)
-  - Chevron trailing icon (the entire tile is tappable to connect)
- Transport switcher buttons (outlined, not FABs) to switch to BLE or TCP (these use `pushReplacement`, so back navigation returns to Scanner, not between USB/TCP)
+  - "Connect" button
+- FABs at the bottom to switch to BLE or TCP (these use `pushReplacement`, so back navigation returns to Scanner, not between USB/TCP)

 ### Key Interactions

 - On desktop (Windows, Linux, macOS): ports are polled every 2 seconds for hot-plug detection (polling pauses while connecting/connected)
 - On mobile: tap the "Scan" FAB to manually refresh
- Tap a port tile to connect
- On successful connection, navigates to Channels screen
+- Tap a port or its Connect button to connect
+- On successful connection, navigates to Contacts screen
 - On connection failure, the port list automatically refreshes
 - Platform-specific error messages for common USB failures (permission denied, device missing, device detached, device busy, driver missing, port invalid, timeout, and more)

@@ -102,7 +100,7 @@ From the Scanner screen, tap the **USB** icon button in the app bar.

 ### How to Access

-From the Scanner screen, tap the **TCP/IP** icon button in the app bar.
+From the Scanner screen, tap the **TCP/IP** FAB button.

 ### What the User Sees

@@ -110,7 +108,7 @@ From the Scanner screen, tap the **TCP/IP** icon button in the app bar.
 - **Host address** text field
 - **Port number** text field
 - **Connect** button
- Transport switcher buttons (outlined, not FABs) to switch to USB or BLE
+- FABs at the bottom to switch to USB or BLE

 ### Key Interactions

@@ -121,6 +119,6 @@ From the Scanner screen, tap the **TCP/IP** icon button in the app bar.
  - Validation errors are shown as red snackbars
 - The Connect button shows a spinner and "Connecting..." label while in progress
 - The status bar shows the specific host:port being connected to (e.g., "Connecting to 192.168.1.1:5000")
- On success, navigates to Channels screen and saves the host/port to settings
+- On success, navigates to Contacts screen and saves the host/port to settings
 - On connection, the status bar shows the active TCP endpoint (e.g., "Connected to 192.168.1.1:5000")
 - Error messages for timeout, unsupported platform, and connection failures
@@ -12,13 +12,12 @@ Settings are only accessible while a device is connected.
 The settings screen is a scrollable list of cards:

 1. [Device Info](#device-info)
-2. [Node Settings](#node-settings)
-3. [Location](#location)
-4. [App Settings](#app-settings) (link to sub-screen)
-5. [Actions](#actions)
+2. [App Settings](#app-settings) (link to sub-screen)
+3. [Node Settings](#node-settings)
+4. [Actions](#actions)
+5. [Debug](#debug)
 6. [Export](#export)
-7. [Debug](#debug)
-8. [About](#about)
+7. [About](#about)

 ---

@@ -41,6 +40,56 @@ Battery shows an alert icon and orange text when at 15% or below. The toggle onl

 ---

+## App Settings
+
+A dedicated sub-screen for app-level preferences (nothing here is sent to the device). All settings persist locally via SharedPreferences.
+
+### Appearance
+- **Theme**: System / Light / Dark
+- **Language**: System default or one of 18 languages (English, French, Spanish, German, Polish, Slovenian, Portuguese, Italian, Chinese, Swedish, Dutch, Slovak, Bulgarian, Russian, Ukrainian, Hungarian, Japanese, Korean)
+- **Enable Message Tracing**: Shows path trace overlays and extra metadata on messages
+
+### Notifications
+- **Master enable/disable**: Requests OS permission when enabling
+- **Message notifications**: New direct message alerts
+- **Channel message notifications**: New channel message alerts
+- **Advertisement notifications**: New node discovery alerts
+
+### Messaging
+- **Clear Path on Max Retry**: Erases the stored routing path after all retries fail
+- **Jump to Oldest Unread**: When opening a chat, scrolls to the oldest unread message instead of the newest
+- **Auto Route Rotation**: Enables weighted routing algorithm. When enabled, expands to show five slider sub-settings (hidden when off):
+  - Max Route Weight (1–10, default 5, integer steps)
+  - Initial Route Weight (0.5–5.0, default 3.0)
+  - Success Increment (0.1–2.0, default 0.5, 0.1 steps)
+  - Failure Decrement (0.1–2.0, default 0.2, 0.1 steps)
+  - Max Message Retries (2–10, default 5)
+
+### Battery
+- **Battery Chemistry**: NMC / LiFePO4 / LiPo (per device, used to calibrate percentage from voltage)
+
+### Translation
+Not shown on web. Controls on-device message translation powered by a locally-downloaded ML model:
+- **Enable Translation**: Translates incoming messages into the selected target language
+- **Translate Composer**: Translates outgoing messages from the target language back before sending
+- **Target Language**: Language to translate into (searchable list; defaults to the app language)
+- **Downloaded Model**: Dropdown to select among already-downloaded translation models
+- **Preset Model**: Download a curated preset model with one tap
+- **Custom Model URL**: Enter a URL to download a custom GGUF-format model; shows download progress and a cancel button
+
+### Map Display
+- **Show Repeaters**: Toggle repeater markers on map
+- **Show Chat Nodes**: Toggle chat node markers
+- **Show Other Nodes**: Toggle room/sensor markers
+- **Time Filter**: All time / Last 1h / Last 6h / Last 24h / Last week
+- **Units**: Metric / Imperial
+- **Offline Map Cache**: Navigate to tile download screen
+
+### Debug
+- **App Debug Logging**: Enable the in-app debug log
+
+---
+
 ## Node Settings

 These settings are sent directly to the connected device firmware.
@@ -52,7 +101,7 @@ These settings are sent directly to the connected device firmware.

 ### Radio Settings
 Opens a dialog pre-populated with the device's current radio settings. Contains:
- **Preset dropdown**: Regional presets — selecting a preset immediately fills all fields below. Includes presets for Australia, Australia (Narrow), Australia SA WA QLD, Czech Republic, EU 433MHz, EU/UK (Long Range), EU/UK (Medium Range), EU/UK (Narrow), New Zealand, New Zealand (Narrow), Portugal 433, Portugal 869, numerous Russia city presets, Switzerland, USA Arizona, USA/Canada, and Vietnam
+- **Preset dropdown**: 19 regional presets — selecting a preset immediately fills all fields below. Full list: Australia, Australia (Narrow), Australia SA, WA, QLD, Czech Republic, EU 433MHz, EU/UK (Long Range), EU/UK (Medium Range), EU/UK (Narrow), New Zealand, New Zealand (Narrow), Portugal 433, Portugal 869, Switzerland, USA Arizona, USA/Canada, Vietnam, Off-Grid 433, Off-Grid 869, Off-Grid 918
 - **Frequency** (MHz): Free text, validated 300–2500 MHz
 - **Bandwidth**: Dropdown (7.8 / 10.4 / 15.6 / 20.8 / 31.25 / 41.7 / 62.5 / 125 / 250 / 500 kHz)
 - **Spreading Factor**: SF5–SF12
@@ -60,13 +109,6 @@ Opens a dialog pre-populated with the device's current radio settings. Contains:
 - **TX Power** (dBm): Validated 0 to device max (typically 22 dBm)
 - **Client Repeat** toggle: Only shown on firmware v9+; requires frequency to be exactly 433.000, 869.000, or 918.000 MHz (the Off-Grid presets). Save is blocked with a warning if enabled on other frequencies

-### Companion Radio Stats
-Opens the RF statistics screen (RSSI, SNR, packet counts) for the paired radio. Only enabled when connected to a device that supports companion radio stats.
-
---
-
-## Location
-
 ### Location
 Opens a dialog pre-populated with the device's current coordinates (if known):
 - Latitude and longitude fields (decimal, 6 decimal places). If only one field is provided, the other uses the device's current value
@@ -83,68 +125,8 @@ Five toggles controlling which node types are auto-added when heard:
 - Auto-add Sensors
 - Overwrite Oldest (when contact list is full)

-### Privacy
-Opens a dialog with controls for how the node shares telemetry and location data:
- **Advert Location**: Toggle whether the node broadcasts its location in advertisements
- **Multi-Ack**: Toggle multi-ack delivery confirmations
- **Telemetry Base Mode**: Deny All / Allow by Contact / Allow All
- **Telemetry Location Mode**: Deny All / Allow by Contact / Allow All
- **Telemetry Environment Mode**: Deny All / Allow by Contact / Allow All
-
-Settings take effect when saved. A snackbar confirms the update.
-
---
-
-## App Settings
-
-A dedicated sub-screen for app-level preferences (nothing here is sent to the device). All settings persist locally via SharedPreferences.
-
-### Appearance
- **Theme**: System / Light / Dark
- **Language**: System default or one of 18 languages (English, French, Spanish, German, Polish, Slovenian, Portuguese, Italian, Chinese, Swedish, Dutch, Slovak, Bulgarian, Russian, Ukrainian, Hungarian, Japanese, Korean)
-
-### Notifications
- **Master enable/disable**: Requests OS permission when enabling
- **Message notifications**: New direct message alerts
- **Channel message notifications**: New channel message alerts
- **Advertisement notifications**: New node discovery alerts
-
-### Messaging
- **Clear Path on Max Retry**: Erases the stored routing path after all retries fail
- **Jump to Oldest Unread**: When opening a chat, scrolls to the oldest unread message instead of the newest
- **Auto Route Rotation**: Enables weighted routing algorithm. When enabled, expands to show five slider sub-settings (hidden when off):
-  - Max Route Weight (1–10, default 5, integer steps)
-  - Initial Route Weight (0.5–5.0, default 3.0)
-  - Success Increment (0.1–2.0, default 0.5, 0.1 steps)
-  - Failure Decrement (0.1–2.0, default 0.2, 0.1 steps)
-  - Max Message Retries (2–10, default 5)
- **Enable Message Tracing**: Shows path trace overlays and extra metadata on messages
-
-### Battery
- **Battery Chemistry**: NMC / LiFePO4 / LiPo (per device, used to calibrate percentage from voltage)
-
-### Map Display
- **Show Repeaters**: Toggle repeater markers on map
- **Show Chat Nodes**: Toggle chat node markers
- **Show Other Nodes**: Toggle room/sensor markers
- **Time Filter**: All time / Last 1h / Last 6h / Last 24h / Last week
- **Units**: Metric / Imperial
- **Offline Map Cache**: Navigate to tile download screen
-
-### Translation
-Not shown on web. Controls on-device message translation powered by a locally-downloaded ML model:
- **Enable Translation**: Translates incoming messages into the selected target language
- **Translate Composer**: Translates outgoing messages from the target language back before sending
- **Target Language**: Language to translate into (searchable list; defaults to the app language)
- **Downloaded Model**: Dropdown to select among already-downloaded translation models
- **Preset Model**: Download a curated preset model with one tap
- **Custom Model URL**: Enter a URL to download a custom GGUF-format model; shows download progress and a cancel button
-
-### Cyrillic-to-Latin (Cyr2Lat)
-Controls character substitution profiles used to render Cyrillic text in Latin characters. A dropdown selects the active profile; Add, Edit, and Delete buttons manage the profile list (the last remaining profile cannot be deleted). Each profile stores a JSON character map.
-
-### Debug
- **App Debug Logging**: Enable the in-app debug log
+### Privacy Mode
+Opens a confirmation dialog with three buttons: Cancel, Enable, and Disable. Both states can be set from the same dialog regardless of current state. A snackbar confirms which state was applied. When on, the node stops broadcasting its location in advertisements.

 ---

@@ -154,24 +136,10 @@ One-tap device operations:

 | Action | Description |
 |---|---|
+| Send Advertisement | Floods the mesh with your node's advertisement |
 | Sync Time | Sends current Unix timestamp to the device |
 | Refresh Contacts | Re-requests the full contact list |
-| Reboot Device | Confirmation dialog → reboots the device (shown in warning color) |
-| Delete All Paths | Confirmation dialog → clears all stored routing paths (shown in alert color) |
-
---
-
-## Export
-
-Three GPX export options (not available on web):
-
-| Option | Exports |
-|---|---|
-| Export Repeaters | Repeaters and Rooms with GPS coordinates |
-| Export Contacts | Chat contacts with GPS coordinates |
-| Export All | All contacts with GPS coordinates |
-
-Each creates a `.gpx` file and opens the OS share sheet. Feedback via snackbar for four outcomes: success, no contacts with coordinates, feature not available (web), or error.
+| Reboot Device | Confirmation dialog → reboots the device (shown in orange) |

 ---

@@ -192,6 +160,20 @@ Structured log entries (Info / Warning / Error), with tag, message, and timestam

 ---

+## Export
+
+Three GPX export options (not available on web):
+
+| Option | Exports |
+|---|---|
+| Export Repeaters | Repeaters and Rooms with GPS coordinates |
+| Export Contacts | Chat contacts with GPS coordinates |
+| Export All | All contacts with GPS coordinates |
+
+Each creates a `.gpx` file and opens the OS share sheet. Feedback via snackbar for four outcomes: success, no contacts with coordinates, feature not available (web), or error.
+
+---
+
 ## About

 Shows the standard Flutter about dialog with app name, version, and legal notice.
@@ -19,7 +19,6 @@ class MeshCoreUsbManager {
  String? get activePortKey => _activePortKey;
  String? get activePortDisplayLabel => _activePortLabel ?? _activePortKey;
  bool get isConnected => _service.isConnected;
-  Object? get lastError => _service.lastError;
  Stream<Uint8List> get frameStream => _service.frameStream;

  // --- Configuration ---
@@ -224,12 +224,6 @@ const int reqTypeGetTelemetry = 0x03;
 const int reqTypeGetAccessList = 0x05;
 const int reqTypeGetNeighbors = 0x06;

-Uint8List buildTelemetryBinaryPayload() {
-  // Room servers/repeaters read byte 1 as an inverse telemetry permission mask.
-  // Zero means "request every telemetry field allowed for this contact".
-  return Uint8List.fromList([reqTypeGetTelemetry, 0x00, 0x00, 0x00, 0x00]);
-}
-
 // Repeater response codes
 const int respServerLoginOk = 0;

@@ -457,13 +451,8 @@ String pubKeyToHex(Uint8List pubKey) {

 // Helper to convert hex string to public key
 Uint8List hexToPubKey(String hex) {
-  if (hex.length != pubKeySize * 2) {
-    throw FormatException(
-      'Public key hex must be ${pubKeySize * 2} chars, got ${hex.length}',
-    );
-  }
  final result = Uint8List(pubKeySize);
-  for (int i = 0; i < pubKeySize; i++) {
+  for (int i = 0; i < pubKeySize && i * 2 + 1 < hex.length; i++) {
    result[i] = int.parse(hex.substring(i * 2, i * 2 + 2), radix: 16);
  }
  return result;
@@ -956,7 +945,7 @@ Uint8List buildSendTelemetryReq(Uint8List? pubKey) {
    writer.writeBytes(Uint8List(3)); // reserved bytes
    writer.writeBytes(pubKey);
  } else {
-    writer.writeBytes(Uint8List(3)); // reserved bytes
+    writer.writeBytes(Uint8List(4)); // reserved bytes
  }
  return writer.toBytes();
 }
@@ -3,10 +3,6 @@ class MeshCoreUuids {
  static const String rxCharacteristic = "6e400002-b5a3-f393-e0a9-e50e24dcca9e";
  static const String txCharacteristic = "6e400003-b5a3-f393-e0a9-e50e24dcca9e";

-  /// Known advertised-name prefixes used by stock MeshCore firmware builds.
-  /// Discovery no longer filters on these (it filters on the [service] UUID so
-  /// that community forks with custom names are still found); kept for
-  /// reference and possible future display heuristics.
  static const List<String> deviceNamePrefixes = [
    "MeshCore-",
    "Whisper-",
@@ -96,34 +96,6 @@ class CayenneLpp {
        }

        switch (type) {
-          case lppDigitalInput:
-            telemetry.add({
-              'channel': channel,
-              'type': type,
-              'value': buffer.readUInt8(),
-            });
-            break;
-          case lppDigitalOutput:
-            telemetry.add({
-              'channel': channel,
-              'type': type,
-              'value': buffer.readUInt8(),
-            });
-            break;
-          case lppAnalogInput:
-            telemetry.add({
-              'channel': channel,
-              'type': type,
-              'value': buffer.readInt16BE() / 100,
-            });
-            break;
-          case lppAnalogOutput:
-            telemetry.add({
-              'channel': channel,
-              'type': type,
-              'value': buffer.readInt16BE() / 100,
-            });
-            break;
          case lppGenericSensor:
            telemetry.add({
              'channel': channel,
@@ -159,17 +131,6 @@ class CayenneLpp {
              'value': buffer.readUInt8() / 2,
            });
            break;
-          case lppAccelerometer:
-            telemetry.add({
-              'channel': channel,
-              'type': type,
-              'value': {
-                'x': buffer.readInt16BE() / 1000,
-                'y': buffer.readInt16BE() / 1000,
-                'z': buffer.readInt16BE() / 1000,
-              },
-            });
-            break;
          case lppBarometricPressure:
            telemetry.add({
              'channel': channel,
@@ -177,13 +138,6 @@ class CayenneLpp {
              'value': buffer.readUInt16BE() / 10,
            });
            break;
-          case lppAltitude:
-            telemetry.add({
-              'channel': channel,
-              'type': type,
-              'value': buffer.readInt16BE(),
-            });
-            break;
          case lppVoltage:
            telemetry.add({
              'channel': channel,
@@ -198,13 +152,6 @@ class CayenneLpp {
              'value': buffer.readInt16BE() / 1000,
            });
            break;
-          case lppFrequency:
-            telemetry.add({
-              'channel': channel,
-              'type': type,
-              'value': buffer.readUInt32BE(),
-            });
-            break;
          case lppPercentage:
            telemetry.add({
              'channel': channel,
@@ -226,56 +173,6 @@ class CayenneLpp {
              'value': buffer.readUInt16BE(),
            });
            break;
-          case lppDistance:
-            telemetry.add({
-              'channel': channel,
-              'type': type,
-              'value': buffer.readUInt32BE() / 1000,
-            });
-            break;
-          case lppEnergy:
-            telemetry.add({
-              'channel': channel,
-              'type': type,
-              'value': buffer.readUInt32BE() / 1000,
-            });
-            break;
-          case lppDirection:
-            telemetry.add({
-              'channel': channel,
-              'type': type,
-              'value': buffer.readUInt16BE(),
-            });
-            break;
-          case lppUnixTime:
-            telemetry.add({
-              'channel': channel,
-              'type': type,
-              'value': buffer.readUInt32BE(),
-            });
-            break;
-          case lppGyrometer:
-            telemetry.add({
-              'channel': channel,
-              'type': type,
-              'value': {
-                'x': buffer.readInt16BE() / 100,
-                'y': buffer.readInt16BE() / 100,
-                'z': buffer.readInt16BE() / 100,
-              },
-            });
-            break;
-          case lppColour:
-            telemetry.add({
-              'channel': channel,
-              'type': type,
-              'value': {
-                'red': buffer.readUInt8(),
-                'green': buffer.readUInt8(),
-                'blue': buffer.readUInt8(),
-              },
-            });
-            break;
          case lppGps:
            telemetry.add({
              'channel': channel,
@@ -287,24 +184,6 @@ class CayenneLpp {
              },
            });
            break;
-          case lppSwitch:
-            telemetry.add({
-              'channel': channel,
-              'type': type,
-              'value': buffer.readUInt8(),
-            });
-            break;
-          case lppPolyline:
-            final size = buffer.readUInt8();
-            telemetry.add({
-              'channel': channel,
-              'type': type,
-              'value': {
-                'size': size,
-                'data': _bytesToHex(_readPolylinePayload(buffer, size)),
-              },
-            });
-            break;
          default:
            return telemetry;
        }
@@ -337,19 +216,6 @@ class CayenneLpp {
        );

        switch (type) {
-          case lppDigitalInput:
-            channelData['values']['digitalInput'] = buffer.readUInt8();
-            break;
-          case lppDigitalOutput:
-            channelData['values']['digitalOutput'] = buffer.readUInt8();
-            break;
-          case lppAnalogInput:
-            channelData['values']['analogInput'] = buffer.readInt16BE() / 100.0;
-            break;
-          case lppAnalogOutput:
-            channelData['values']['analogOutput'] =
-                buffer.readInt16BE() / 100.0;
-            break;
          case lppGenericSensor:
            channelData['values']['generic'] = buffer.readUInt32BE();
            break;
@@ -365,29 +231,15 @@ class CayenneLpp {
          case lppRelativeHumidity:
            channelData['values']['humidity'] = buffer.readUInt8() / 2.0;
            break;
-          case lppAccelerometer:
-            channelData['values']['accelerometer'] = {
-              'x': buffer.readInt16BE() / 1000.0,
-              'y': buffer.readInt16BE() / 1000.0,
-              'z': buffer.readInt16BE() / 1000.0,
-            };
-            break;
          case lppBarometricPressure:
            channelData['values']['pressure'] = buffer.readUInt16BE() / 10.0;
            break;
-          case lppAltitude:
-            // MeshCore encodes standalone barometric altitude as LPP type 121.
-            channelData['values']['altitude'] = buffer.readInt16BE();
-            break;
          case lppVoltage:
            channelData['values']['voltage'] = buffer.readInt16BE() / 100.0;
            break;
          case lppCurrent:
            channelData['values']['current'] = buffer.readInt16BE() / 1000.0;
            break;
-          case lppFrequency:
-            channelData['values']['frequency'] = buffer.readUInt32BE();
-            break;
          case lppPercentage:
            channelData['values']['percentage'] = buffer.readUInt8();
            break;
@@ -397,32 +249,6 @@ class CayenneLpp {
          case lppPower:
            channelData['values']['power'] = buffer.readUInt16BE();
            break;
-          case lppDistance:
-            channelData['values']['distance'] = buffer.readUInt32BE() / 1000.0;
-            break;
-          case lppEnergy:
-            channelData['values']['energy'] = buffer.readUInt32BE() / 1000.0;
-            break;
-          case lppDirection:
-            channelData['values']['direction'] = buffer.readUInt16BE();
-            break;
-          case lppUnixTime:
-            channelData['values']['time'] = buffer.readUInt32BE();
-            break;
-          case lppGyrometer:
-            channelData['values']['gyrometer'] = {
-              'x': buffer.readInt16BE() / 100.0,
-              'y': buffer.readInt16BE() / 100.0,
-              'z': buffer.readInt16BE() / 100.0,
-            };
-            break;
-          case lppColour:
-            channelData['values']['colour'] = {
-              'red': buffer.readUInt8(),
-              'green': buffer.readUInt8(),
-              'blue': buffer.readUInt8(),
-            };
-            break;
          case lppGps:
            channelData['values']['gps'] = {
              'latitude': buffer.readInt24BE() / 10000.0,
@@ -430,48 +256,22 @@ class CayenneLpp {
              'altitude': buffer.readInt24BE() / 100.0,
            };
            break;
-          case lppSwitch:
-            channelData['values']['switch'] = buffer.readUInt8() != 0;
-            break;
-          case lppPolyline:
-            final size = buffer.readUInt8();
-            channelData['values']['polyline'] = {
-              'size': size,
-              'data': _bytesToHex(_readPolylinePayload(buffer, size)),
-            };
-            break;
+          // Add more types as needed...
          default:
-            // Stop parsing to avoid losing alignment on an unknown LPP type.
-            return _sortedChannelValues(channels);
+            //Stopped parsing to avoid misalignment
+            return channels.values.toList();
        }
      }

-      return _sortedChannelValues(channels);
+      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');
-      // Preserve any fields parsed before the malformed value.
-      return _sortedChannelValues(channels);
+      return <
+        Map<String, dynamic>
+      >[]; // Return an empty list on error to avoid crashing the app
    }
  }
-
-  static Uint8List _readPolylinePayload(BufferReader buffer, int size) {
-    final declaredPayloadSize = size > 0 ? size - 1 : 0;
-    final availablePayloadSize = declaredPayloadSize <= buffer.remaining
-        ? declaredPayloadSize
-        : buffer.remaining;
-    return buffer.readBytes(availablePayloadSize);
-  }
-
-  static List<Map<String, dynamic>> _sortedChannelValues(
-    Map<int, Map<String, dynamic>> channels,
-  ) {
-    final channelsOut = channels.values.toList();
-    channelsOut.sort((a, b) => a['channel'].compareTo(b['channel']));
-    return channelsOut;
-  }
-
-  static String _bytesToHex(Uint8List bytes) {
-    return bytes.map((b) => b.toRadixString(16).padLeft(2, '0')).join();
-  }
 }
@@ -1,59 +0,0 @@
-import 'package:flutter/material.dart';
-
-import '../connector/meshcore_protocol.dart';
-import '../utils/emoji_utils.dart';
-
-IconData contactTypeIcon(int type) {
-  switch (type) {
-    case advTypeChat:
-      return Icons.chat;
-    case advTypeRepeater:
-      return Icons.cell_tower;
-    case advTypeRoom:
-      return Icons.group;
-    case advTypeSensor:
-      return Icons.sensors;
-    default:
-      return Icons.device_unknown;
-  }
-}
-
-Color contactTypeColor(int type) {
-  switch (type) {
-    case advTypeChat:
-      return Colors.blue;
-    case advTypeRepeater:
-      return Colors.orange;
-    case advTypeRoom:
-      return Colors.purple;
-    case advTypeSensor:
-      return Colors.green;
-    default:
-      return Colors.grey;
-  }
-}
-
-Color colorForName(String name) {
-  const colors = [
-    Colors.blue,
-    Colors.green,
-    Colors.orange,
-    Colors.purple,
-    Colors.pink,
-    Colors.teal,
-    Colors.indigo,
-    Colors.cyan,
-    Colors.amber,
-    Colors.deepOrange,
-  ];
-  return colors[name.hashCode.abs() % colors.length];
-}
-
-String firstCharacterOrEmoji(String name) {
-  if (name.isEmpty) return '?';
-  final emoji = firstEmoji(name);
-  if (emoji != null) return emoji;
-  final runes = name.runes.toList();
-  if (runes.isEmpty) return '?';
-  return String.fromCharCode(runes[0]).toUpperCase();
-}
@@ -8,29 +8,24 @@ class PathHelper {
        .join(',');
  }

-  static String hopHex(int byte) {
-    return byte.toRadixString(16).padLeft(2, '0').toUpperCase();
-  }
-
-  static String? hopName(int byte, List<Contact> allContacts) {
-    final matches = allContacts
-        .where(
-          (c) =>
-              c.publicKey.first == byte &&
-              (c.type == advTypeRepeater || c.type == advTypeRoom),
-        )
-        .toList();
-    if (matches.isEmpty) return null;
-    if (matches.length == 1) return matches.first.name;
-    return matches.map((c) => c.name).join(' | ');
-  }
-
  static String resolvePathNames(
    List<int> pathBytes,
    List<Contact> allContacts,
  ) {
    return pathBytes
-        .map((b) => hopName(b, allContacts) ?? hopHex(b))
+        .map((b) {
+          final hex = b.toRadixString(16).padLeft(2, '0').toUpperCase();
+          final matches = allContacts
+              .where(
+                (c) =>
+                    c.publicKey.first == b &&
+                    (c.type == advTypeRepeater || c.type == advTypeRoom),
+              )
+              .toList();
+          if (matches.isEmpty) return hex;
+          if (matches.length == 1) return matches.first.name;
+          return matches.map((c) => c.name).join(' | ');
+        })
        .join(' \u2192 ');
  }
 }
@@ -1,70 +0,0 @@
-import 'package:latlong2/latlong.dart';
-
-import '../connector/meshcore_protocol.dart';
-import '../models/contact.dart';
-
-class PathHopResolver {
-  const PathHopResolver._();
-
-  static List<Contact?> resolve({
-    required List<int> pathBytes,
-    required List<Contact> contacts,
-    LatLng? endpoint,
-    bool resolveFromEnd = false,
-  }) {
-    final candidatesByPrefix = <int, List<Contact>>{};
-    for (final contact in contacts) {
-      if (contact.publicKey.isEmpty) continue;
-      if (contact.type != advTypeRepeater && contact.type != advTypeRoom) {
-        continue;
-      }
-      candidatesByPrefix
-          .putIfAbsent(contact.publicKey.first, () => <Contact>[])
-          .add(contact);
-    }
-    for (final candidates in candidatesByPrefix.values) {
-      candidates.sort((a, b) => b.lastSeen.compareTo(a.lastSeen));
-    }
-
-    final resolved = List<Contact?>.filled(pathBytes.length, null);
-    final indexes = resolveFromEnd
-        ? List<int>.generate(pathBytes.length, (i) => pathBytes.length - 1 - i)
-        : List<int>.generate(pathBytes.length, (i) => i);
-    final distance = Distance();
-    var previousPosition = endpoint;
-
-    for (final index in indexes) {
-      final candidates = candidatesByPrefix[pathBytes[index]];
-      if (candidates == null || candidates.isEmpty) continue;
-
-      var bestIndex = 0;
-      if (previousPosition != null && candidates.length > 1) {
-        double? nearestDistance;
-        for (var i = 0; i < candidates.length; i++) {
-          final position = _positionOf(candidates[i]);
-          if (position == null) continue;
-          final candidateDistance = distance(previousPosition, position);
-          if (nearestDistance == null || candidateDistance < nearestDistance) {
-            nearestDistance = candidateDistance;
-            bestIndex = i;
-          }
-        }
-      }
-
-      final contact = candidates.removeAt(bestIndex);
-      resolved[index] = contact;
-      previousPosition = _positionOf(contact) ?? previousPosition;
-    }
-
-    return resolved;
-  }
-
-  static LatLng? _positionOf(Contact contact) {
-    if (!contact.hasLocation ||
-        contact.latitude == null ||
-        contact.longitude == null) {
-      return null;
-    }
-    return LatLng(contact.latitude!, contact.longitude!);
-  }
-}
@@ -25,19 +25,7 @@ void showDismissibleSnackBar(
  DismissDirection? dismissDirection,
  Clip? clipBehavior,
 }) {
-  // Callers often reach here after an async gap; the context may already be
-  // unmounted, or deactivated (popped but not yet disposed) — ancestor
-  // lookups on a deactivated element throw. Showing nothing is the right
-  // outcome in both cases.
-  if (!context.mounted) return;
-  var isActive = true;
-  assert(() {
-    isActive = (context as Element).debugIsActive;
-    return true;
-  }());
-  if (!isActive) return;
-  final messenger = ScaffoldMessenger.maybeOf(context);
-  if (messenger == null) return;
+  final messenger = ScaffoldMessenger.of(context);
  messenger.showSnackBar(
    SnackBar(
      key: key,
@@ -28,12 +28,6 @@
  "common_remove": "Remove",
  "common_enable": "Enable",
  "common_disable": "Disable",
-  "common_undo": "Undo",
-  "messageStatus_sent": "Sent",
-  "messageStatus_delivered": "Delivered",
-  "messageStatus_pending": "Sending",
-  "messageStatus_failed": "Failed to send",
-  "messageStatus_repeated": "Heard repeated",
  "common_reboot": "Reboot",
  "common_loading": "Loading...",
  "common_notAvailable": "—",
@@ -53,8 +47,6 @@
      }
    }
  },
-  "common_autoRefresh": "Autorefresh",
-  "common_interval": "Interval",
  "scanner_title": "MeshCore Open",
  "connectionChoiceUsbLabel": "USB",
  "connectionChoiceBluetoothLabel": "Bluetooth",
@@ -143,7 +135,6 @@
  "scanner_chromeRequired": "Chrome Browser Required",
  "scanner_chromeRequiredMessage": "This web application requires Google Chrome or a Chromium-based browser for Bluetooth support.",
  "scanner_enableBluetooth": "Enable Bluetooth",
-  "scanner_bluetoothWebUnsupported": "Bluetooth isn't available in the browser. Connect over USB instead.",
  "device_quickSwitch": "Quick switch",
  "device_meshcore": "MeshCore",
  "settings_title": "Settings",
@@ -304,6 +295,17 @@
  "appSettings_routeWeightFailureDecrementSubtitle": "Weight removed from a path after failed delivery",
  "appSettings_maxMessageRetries": "Max Message Retries",
  "appSettings_maxMessageRetriesSubtitle": "Number of retry attempts before marking a message as failed",
+  "path_routeWeight": "{weight}/{max}",
+  "@path_routeWeight": {
+    "placeholders": {
+      "weight": {
+        "type": "String"
+      },
+      "max": {
+        "type": "String"
+      }
+    }
+  },
  "appSettings_battery": "Battery",
  "appSettings_batteryChemistry": "Battery Chemistry",
  "appSettings_batteryChemistryPerDevice": "Set per device ({deviceName})",
@@ -449,9 +451,6 @@
    }
  },
  "contacts_newGroup": "New Group",
-  "contacts_moreOptions": "More options",
-  "contacts_searchOpen": "Search contacts",
-  "contacts_searchClose": "Close search",
  "contacts_groupName": "Group name",
  "contacts_groupNameRequired": "Group name is required",
  "contacts_groupNameReserved": "This group name is reserved",
@@ -776,6 +775,15 @@
    }
  },
  "debugFrame_hexDump": "Hex Dump:",
+  "chat_pathManagement": "Path Management",
+  "chat_ShowAllPaths": "Show all paths",
+  "chat_routingMode": "Routing mode",
+  "chat_autoUseSavedPath": "Auto (use saved path)",
+  "chat_forceFloodMode": "Force Flood Mode",
+  "chat_recentAckPaths": "Recent ACK Paths (tap to use):",
+  "chat_pathHistoryFull": "Path history is full. Remove entries to add new ones.",
+  "chat_hopSingular": "hop",
+  "chat_hopPlural": "hops",
  "chat_hopsCount": "{count} {count, plural, =1{hop} other{hops}}",
  "@chat_hopsCount": {
    "placeholders": {
@@ -784,80 +792,31 @@
      }
    }
  },
+  "chat_successes": "successes",
+  "chat_score": "Score",
  "chat_removePath": "Remove path",
  "chat_noPathHistoryYet": "No path history yet.\nSend a message to discover paths.",
+  "chat_pathActions": "Path Actions:",
+  "chat_setCustomPath": "Set Custom Path",
+  "chat_setCustomPathSubtitle": "Manually specify routing path",
+  "chat_clearPath": "Clear Path",
+  "chat_clearPathSubtitle": "Force rediscovery on next send",
  "chat_pathCleared": "Path cleared. Next message will rediscover route.",
+  "chat_floodModeSubtitle": "Use routing toggle in app bar",
+  "chat_floodModeEnabled": "Flood mode enabled. Toggle back via routing icon in app bar.",
  "chat_fullPath": "Full Path",
-  "routing_title": "Routing",
-  "routing_modeAuto": "Auto",
-  "routing_modeFlood": "Flood",
-  "routing_modeManual": "Manual",
-  "routing_modeAutoHint": "Picks the best known path automatically, flooding when none is known.",
-  "routing_modeFloodHint": "Broadcasts through every repeater. Most reliable, but uses more airtime.",
-  "routing_modeManualHint": "Always sends along the exact path you set.",
-  "routing_currentRoute": "Current route",
-  "routing_directNoHops": "Direct — no repeater hops",
-  "routing_noPathYet": "No path yet. The next message floods until a route is discovered.",
-  "routing_floodBroadcast": "Broadcast through every repeater",
-  "routing_editPath": "Edit path",
-  "routing_forgetPath": "Forget path",
-  "routing_knownPaths": "Known paths",
-  "routing_knownPathsHint": "Tap a path to switch to it.",
-  "routing_inUse": "In use",
-  "routing_qualityStrong": "Strong first hop",
-  "routing_qualityGood": "Good first hop",
-  "routing_qualityFair": "Fair first hop",
-  "routing_qualityWorked": "Has delivered",
-  "routing_qualityFlood": "Heard via flood",
-  "routing_qualityUntested": "Untested",
-  "routing_lastWorked": "worked {when}",
-  "@routing_lastWorked": {
+  "chat_pathDetailsNotAvailable": "Path details not available yet. Try sending a message to refresh.",
+  "chat_pathSetHops": "Path set: {hopCount} {hopCount, plural, =1{hop} other{hops}} - {status}",
+  "@chat_pathSetHops": {
    "placeholders": {
-      "when": {
+      "hopCount": {
+        "type": "int"
+      },
+      "status": {
        "type": "String"
      }
    }
  },
-  "routing_neverWorked": "never confirmed",
-  "routing_deliveryCounts": "{successes} delivered, {failures} failed",
-  "@routing_deliveryCounts": {
-    "placeholders": {
-      "successes": {
-        "type": "int"
-      },
-      "failures": {
-        "type": "int"
-      }
-    }
-  },
-  "routing_floodDelivery": "Flood delivery",
-  "pathEditor_title": "Build Path",
-  "pathEditor_hopCounter": "{count} of 64 hops",
-  "@pathEditor_hopCounter": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "pathEditor_noHops": "No hops yet. Tap repeaters below to add them in order, or save with no hops to send direct.",
-  "pathEditor_addHops": "Add hops in order",
-  "pathEditor_searchRepeaters": "Search repeaters",
-  "pathEditor_advancedHex": "Advanced: raw hex path",
-  "pathEditor_hexLabel": "Hex prefixes",
-  "pathEditor_hexHelper": "Two hex characters per hop, separated by commas",
-  "pathEditor_invalidTokens": "Invalid: {tokens}",
-  "@pathEditor_invalidTokens": {
-    "placeholders": {
-      "tokens": {
-        "type": "String"
-      }
-    }
-  },
-  "pathEditor_tooManyHops": "Maximum 64 hops",
-  "pathEditor_usePath": "Use this path",
-  "pathEditor_removeHop": "Remove hop",
-  "pathEditor_unknownHop": "Unknown repeater",
  "chat_pathSavedLocally": "Saved locally. Connect to sync.",
  "chat_pathDeviceConfirmed": "Device confirmed.",
  "chat_pathDeviceNotConfirmed": "Device not confirmed yet.",
@@ -901,17 +860,6 @@
  },
  "chat_invalidLink": "Invalid link format",
  "map_title": "Node Map",
-  "map_searchHint": "Search node name or ID",
-  "map_activity": "Activity",
-  "map_online": "Online",
-  "map_recent": "Recent",
-  "map_stale": "Stale",
-  "map_visible": "Visible",
-  "map_hidden": "Hidden",
-  "map_centerOnNode": "Center on node",
-  "map_details": "Details",
-  "map_noGps": "No GPS",
-  "map_noResults": "No matching nodes",
  "map_lineOfSight": "Line of Sight",
  "map_losScreenTitle": "Line of Sight",
  "map_noNodesWithLocation": "No nodes with location data",
@@ -1114,6 +1062,9 @@
  "time_allTime": "All Time",
  "dialog_disconnect": "Disconnect",
  "dialog_disconnectConfirm": "Are you sure you want to disconnect from this device?",
+  "dialog_disconnectedTitle": "Disconnected",
+  "dialog_disconnectedMessage": "You have been disconnected from your companion.",
+  "dialog_connectCompanion": "Connect to a companion to access repeater and room server features.",
  "login_repeaterLogin": "Repeater Login",
  "login_roomLogin": "Room Server Login",
  "login_password": "Password",
@@ -1150,8 +1101,41 @@
  "login_failedMessage": "Login failed. Either the password is incorrect or the repeater is unreachable.",
  "common_reload": "Reload",
  "common_clear": "Clear",
+  "path_currentPath": "Current path: {path}",
+  "@path_currentPath": {
+    "placeholders": {
+      "path": {
+        "type": "String"
+      }
+    }
+  },
+  "path_usingHopsPath": "Using {count} {count, plural, =1{hop} other{hops}} path",
+  "@path_usingHopsPath": {
+    "placeholders": {
+      "count": {
+        "type": "int"
+      }
+    }
+  },
+  "path_enterCustomPath": "Enter Custom Path",
  "path_currentPathLabel": "Current path",
+  "path_hexPrefixInstructions": "Enter 2-character hex prefixes for each hop, separated by commas.",
+  "path_hexPrefixExample": "Example: A1,F2,3C (each node uses first byte of its public key)",
+  "path_labelHexPrefixes": "Path (hex prefixes)",
+  "path_helperMaxHops": "Max 64 hops. Each prefix is 2 hex characters (1 byte)",
+  "path_selectFromContacts": "Or select from contacts:",
  "path_noRepeatersFound": "No repeaters or room servers found.",
+  "path_customPathsRequire": "Custom paths require intermediate hops that can relay messages.",
+  "path_invalidHexPrefixes": "Invalid hex prefixes: {prefixes}",
+  "@path_invalidHexPrefixes": {
+    "placeholders": {
+      "prefixes": {
+        "type": "String"
+      }
+    }
+  },
+  "path_tooLong": "Path too long. Maximum 64 hops allowed.",
+  "path_setPath": "Set Path",
  "repeater_management": "Repeater Management",
  "room_management": "Room Server Management",
  "repeater_guest": "Repeater Information",
@@ -1178,6 +1162,9 @@
  },
  "repeater_statusTitle": "Repeater Status",
  "repeater_routingMode": "Routing mode",
+  "repeater_autoUseSavedPath": "Auto (use saved path)",
+  "repeater_forceFloodMode": "Force Flood Mode",
+  "repeater_pathManagement": "Path management",
  "repeater_refresh": "Refresh",
  "repeater_statusRequestTimeout": "Status request timed out.",
  "repeater_errorLoadingStatus": "Error loading status: {error}",
@@ -1677,120 +1664,6 @@
      }
    }
  },
-  "telemetry_digitalInputLabel": "Digital Input",
-  "telemetry_digitalOutputLabel": "Digital Output",
-  "telemetry_analogInputLabel": "Analog Input",
-  "telemetry_analogOutputLabel": "Analog Output",
-  "telemetry_genericLabel": "Generic Sensor",
-  "telemetry_luminosityLabel": "Luminosity",
-  "telemetry_presenceLabel": "Presence",
-  "telemetry_humidityLabel": "Humidity",
-  "telemetry_accelerometerLabel": "Accelerometer",
-  "telemetry_pressureLabel": "Pressure",
-  "telemetry_altitudeLabel": "Altitude",
-  "telemetry_frequencyLabel": "Frequency",
-  "telemetry_percentageLabel": "Percentage",
-  "telemetry_concentrationLabel": "Concentration",
-  "telemetry_powerLabel": "Power",
-  "telemetry_distanceLabel": "Distance",
-  "telemetry_energyLabel": "Energy",
-  "telemetry_directionLabel": "Direction",
-  "telemetry_timeLabel": "Time",
-  "telemetry_gyrometerLabel": "Gyrometer",
-  "telemetry_colourLabel": "Colour",
-  "telemetry_gpsLabel": "GPS",
-  "telemetry_switchLabel": "Switch",
-  "telemetry_polylineLabel": "Polyline",
-  "telemetry_altitudeValue": "{meters} m",
-  "@telemetry_altitudeValue": {
-    "placeholders": {
-      "meters": {
-        "type": "String"
-      }
-    }
-  },
-  "telemetry_frequencyValue": "{hertz} Hz",
-  "@telemetry_frequencyValue": {
-    "placeholders": {
-      "hertz": {
-        "type": "String"
-      }
-    }
-  },
-  "telemetry_pressureValue": "{hpa} hPa",
-  "@telemetry_pressureValue": {
-    "placeholders": {
-      "hpa": {
-        "type": "String"
-      }
-    }
-  },
-  "telemetry_luminosityValue": "{lux} lx",
-  "@telemetry_luminosityValue": {
-    "placeholders": {
-      "lux": {
-        "type": "String"
-      }
-    }
-  },
-  "telemetry_powerValue": "{watts} W",
-  "@telemetry_powerValue": {
-    "placeholders": {
-      "watts": {
-        "type": "String"
-      }
-    }
-  },
-  "telemetry_distanceValue": "{meters} m",
-  "@telemetry_distanceValue": {
-    "placeholders": {
-      "meters": {
-        "type": "String"
-      }
-    }
-  },
-  "telemetry_energyValue": "{kilowattHours} kWh",
-  "@telemetry_energyValue": {
-    "placeholders": {
-      "kilowattHours": {
-        "type": "String"
-      }
-    }
-  },
-  "telemetry_directionValue": "{degrees}°",
-  "@telemetry_directionValue": {
-    "placeholders": {
-      "degrees": {
-        "type": "String"
-      }
-    }
-  },
-  "telemetry_concentrationValue": "{ppm} ppm",
-  "@telemetry_concentrationValue": {
-    "placeholders": {
-      "ppm": {
-        "type": "String"
-      }
-    }
-  },
-  "telemetry_percentageValue": "{percent}%",
-  "@telemetry_percentageValue": {
-    "placeholders": {
-      "percent": {
-        "type": "String"
-      }
-    }
-  },
-  "telemetry_analogValue": "{value}",
-  "@telemetry_analogValue": {
-    "placeholders": {
-      "value": {
-        "type": "String"
-      }
-    }
-  },
-  "telemetry_autoFetchQuantity": "Requests quantity",
-  "telemetry_error": "Unable to retrieve data",
  "neighbors_receivedData": "Received Neighbors Data",
  "neighbors_requestTimedOut": "Neighbors request timed out.",
  "neighbors_errorLoading": "Error loading neighbors: {error}",
@@ -2418,9 +2291,6 @@
  "translation_enableSubtitle": "Translate incoming messages and allow pre-send translation.",
  "translation_composerTitle": "Translate before sending",
  "translation_composerSubtitle": "Controls the default state of the composer translation icon.",
-  "translation_autoIncomingTitle": "Auto-translate incoming messages",
-  "translation_autoIncomingSubtitle": "Translates Messages for notification and for chat or channel automatically.",
-  "translation_translateMessage": "Translate message",
  "translation_targetLanguage": "Target language",
  "translation_useAppLanguage": "Use app language",
  "translation_downloadedModelLabel": "Downloaded model",
@@ -2499,101 +2369,5 @@
  "contact_typeRepeater": "Repeater",
  "contact_typeRoom": "Room",
  "contact_typeSensor": "Sensor",
-  "contact_typeUnknown": "Unknown",
-  "map_zoomIn": "Zoom in",
-  "map_zoomOut": "Zoom out",
-  "map_centerMap": "Center map",
-  "chrome_bluetoothRequiresChromium": "Web Bluetooth requires a Chromium browser",
-  "channels_communityShortId": "ID: {id}...",
-  "@channels_communityShortId": {
-    "placeholders": {
-      "id": {
-        "type": "String"
-      }
-    }
-  },
-  "pathTrace_legendGpsConfirmed": "GPS confirmed",
-  "pathTrace_legendInferred": "Inferred position",
-  "pathMap_viewSingle": "Single",
-  "pathMap_viewCombined": "Combined",
-  "pathMap_play": "Play",
-  "pathMap_pause": "Pause",
-  "pathMap_replay": "Replay",
-  "pathMap_stepBack": "Previous hop",
-  "pathMap_stepForward": "Next hop",
-  "pathMap_animationOn": "Show packet animation",
-  "pathMap_animationOff": "Hide packet animation",
-  "pathMap_hopOf": "Hop {current} of {total}",
-  "@pathMap_hopOf": {
-    "placeholders": {
-      "current": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "pathMap_observedPaths": "Observed paths: {count}",
-  "@pathMap_observedPaths": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "pathMap_primary": "Primary",
-  "pathMap_alternate": "Alt {index}",
-  "@pathMap_alternate": {
-    "placeholders": {
-      "index": {
-        "type": "int"
-      }
-    }
-  },
-  "pathMap_hopCount": "{count, plural, =1{1 hop} other{{count} hops}}",
-  "@pathMap_hopCount": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "pathMap_gpsCount": "{confirmed}/{total} GPS",
-  "@pathMap_gpsCount": {
-    "placeholders": {
-      "confirmed": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "pathMap_legendShared": "Shared segment",
-  "pathMap_legendEstimated": "Estimated segment",
-  "pathMap_sharedNodeCount": "Used by {count} paths",
-  "@pathMap_sharedNodeCount": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "pathMap_partialAnimation": "{count, plural, =1{1 hop has no location — the shown path is partial} other{{count} hops have no location — the shown path is partial}}",
-  "@pathMap_partialAnimation": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "pathMap_showAllPaths": "Show all",
-  "pathMap_hidePath": "Hide path",
-  "pathMap_showPath": "Show path",
-  "pathMap_collapsePanel": "Collapse panel",
-  "pathMap_expandPanel": "Expand panel",
-  "pathMap_noLocation": "No location",
-  "pathMap_followPacket": "Lock view to packet",
-  "pathMap_unfollowPacket": "Unlock view from packet"
+  "contact_typeUnknown": "Unknown"
 }
@@ -5,8 +5,8 @@
  "nav_channels": "채널",
  "nav_map": "지도",
  "common_cancel": "취소",
-  "common_ok": "확인",
-  "common_connect": "연결하기",
+  "common_ok": "알겠습니다",
+  "common_connect": "연결",
  "common_unknownDevice": "알 수 없는 장치",
  "common_save": "저장",
  "common_delete": "삭제",
@@ -16,21 +16,19 @@
  "common_add": "추가",
  "common_settings": "설정",
  "common_disconnect": "연결 해제",
-  "common_connected": "연결됨",
-  "common_disconnected": "연결 해제됨",
-  "common_create": "만들기",
+  "common_connected": "연결된",
+  "common_disconnected": "단절",
+  "common_create": "만들다",
  "common_continue": "계속",
  "common_share": "공유",
  "common_copy": "복사",
  "common_retry": "다시 시도",
-  "common_hide": "숨기기",
+  "common_hide": "숨기다",
  "common_remove": "제거",
-  "common_enable": "사용",
-  "common_disable": "사용 안 함",
-  "common_autoRefresh": "자동 새로고침",
-  "common_interval": "간격",
+  "common_enable": "활성화",
+  "common_disable": "비활성화",
  "common_reboot": "재부팅",
-  "common_loading": "불러오는 중...",
+  "common_loading": "로딩 중...",
  "common_notAvailable": "—",
  "common_voltageValue": "{volts} V",
  "@common_voltageValue": {
@@ -48,16 +46,16 @@
      }
    }
  },
-  "scanner_title": "MeshCore Open",
+  "scanner_title": "MeshCore 공개",
  "connectionChoiceUsbLabel": "USB",
  "connectionChoiceBluetoothLabel": "블루투스",
  "connectionChoiceTcpLabel": "TCP",
  "tcpScreenTitle": "TCP를 통해 연결",
  "tcpHostLabel": "IP 주소",
-  "tcpHostHint": "192.168.40.10 / example.com",
-  "tcpPortLabel": "포트",
+  "tcpHostHint": "192.168.40.10",
+  "tcpPortLabel": "항",
  "tcpPortHint": "5000",
-  "tcpStatus_notConnected": "엔드포인트를 입력한 뒤 연결하세요.",
+  "tcpStatus_notConnected": "목적지 주소 입력 후 연결",
  "tcpStatus_connectingTo": "{endpoint}에 연결 중...",
  "@tcpStatus_connectingTo": {
    "placeholders": {
@@ -80,21 +78,21 @@
  },
  "usbScreenTitle": "USB를 통해 연결",
  "usbScreenSubtitle": "감지된 시리얼 장치를 선택하고 MeshCore 노드에 직접 연결하십시오.",
-  "usbScreenStatus": "USB 장치를 선택하세요.",
-  "usbScreenNote": "USB 직렬 통신은 지원되는 Android 기기 및 데스크톱 플랫폼에서 사용할 수 있습니다.",
-  "usbScreenEmptyState": "USB 장치가 없습니다. 하나 연결한 뒤 새로고침하세요.",
+  "usbScreenStatus": "USB 장치를 선택합니다.",
+  "usbScreenNote": "USB 직렬 통신은 지원되는 안드로이드 장치 및 데스크톱 플랫폼에서 활성화됩니다.",
+  "usbScreenEmptyState": "USB 장치가 탐지되지 않았습니다. USB 장치를 연결하고 다시 시도해 보세요.",
  "usbErrorPermissionDenied": "USB 접근 권한이 거부되었습니다.",
-  "usbErrorDeviceMissing": "선택한 USB 장치를 더 이상 사용할 수 없습니다.",
+  "usbErrorDeviceMissing": "선택한 USB 장치는 더 이상 사용 불가능합니다.",
  "usbErrorInvalidPort": "유효한 USB 장치를 선택하세요.",
-  "usbErrorBusy": "다른 USB 연결 요청이 이미 진행 중입니다.",
+  "usbErrorBusy": "또 다른 USB 연결 요청이 이미 진행 중입니다.",
  "usbErrorNotConnected": "USB 장치가 연결되지 않았습니다.",
  "usbErrorOpenFailed": "선택한 USB 장치를 열 수 없습니다.",
-  "usbErrorConnectFailed": "선택한 USB 장치에 연결하지 못했습니다.",
+  "usbErrorConnectFailed": "선택한 USB 장치에 연결에 실패했습니다.",
  "usbErrorUnsupported": "이 플랫폼에서는 USB 직렬 통신을 지원하지 않습니다.",
-  "usbErrorAlreadyActive": "USB 연결이 이미 활성 상태입니다.",
+  "usbErrorAlreadyActive": "USB 연결이 이미 활성화되어 있습니다.",
  "usbErrorNoDeviceSelected": "USB 장치가 선택되지 않았습니다.",
-  "usbErrorPortClosed": "USB 연결이 열려 있지 않습니다.",
-  "usbErrorConnectTimedOut": "연결 시간이 초과되었습니다. 장치에 USB Companion 펌웨어가 있는지 확인하세요.",
+  "usbErrorPortClosed": "USB 연결이 활성화되지 않았습니다.",
+  "usbErrorConnectTimedOut": "연결이 시간 초과되었습니다. 장치가 USB Companion 펌웨어를 가지고 있는지 확인해 주세요.",
  "usbFallbackDeviceName": "웹 시리얼 장치",
  "usbStatus_notConnected": "USB 장치를 선택합니다.",
  "usbStatus_connecting": "USB 장치에 연결 중...",
@@ -131,13 +129,13 @@
  },
  "scanner_stop": "멈춰",
  "scanner_scan": "스캔",
-  "scanner_bluetoothOff": "블루투스가 꺼져 있습니다.",
-  "scanner_bluetoothOffMessage": "기기를 검색하려면 블루투스를 켜세요.",
-  "scanner_chromeRequired": "Chrome 브라우저 필요",
-  "scanner_chromeRequiredMessage": "이 웹 앱은 블루투스 지원을 위해 Google Chrome 또는 Chromium 기반 브라우저가 필요합니다.",
-  "scanner_enableBluetooth": "블루투스 켜기",
+  "scanner_bluetoothOff": "블루투스는 꺼져 있습니다.",
+  "scanner_bluetoothOffMessage": "블루투스를 켜서 장치를 검색해주세요.",
+  "scanner_chromeRequired": "크롬 브라우저 필요",
+  "scanner_chromeRequiredMessage": "이 웹 애플리케이션은 블루투드 지원을 위해 Google Chrome 또는 Chromium 기반 브라우저가 필요합니다.",
+  "scanner_enableBluetooth": "블루투스 활성화",
  "device_quickSwitch": "빠른 전환",
-  "device_meshcore": "MeshCore",
+  "device_meshcore": "메쉬코어",
  "settings_title": "설정",
  "settings_deviceInfo": "장치 정보",
  "settings_appSettings": "앱 설정",
@@ -148,7 +146,7 @@
  "settings_nodeNameHint": "노드 이름을 입력하세요",
  "settings_nodeNameUpdated": "이름 변경",
  "settings_radioSettings": "라디오 설정",
-  "settings_radioSettingsSubtitle": "주파수, 전력, 확산 계수",
+  "settings_radioSettingsSubtitle": "주파수, 전력, 스펙트럼",
  "settings_radioSettingsUpdated": "라디오 설정이 업데이트되었습니다.",
  "settings_location": "위치",
  "settings_locationSubtitle": "GPS 좌표",
@@ -169,26 +167,26 @@
  "settings_privacyModeEnabled": "개인 정보 보호 모드 활성화",
  "settings_privacyModeDisabled": "개인 정보 보호 모드 비활성화",
  "settings_actions": "행동",
-  "settings_deleteAllPaths": "모든 경로 삭제",
-  "settings_deleteAllPathsSubtitle": "연락처의 모든 경로 데이터를 지웁니다.",
+  "settings_deleteAllPaths": "Delete All Paths",
+  "settings_deleteAllPathsSubtitle": "Clear all path data from contacts.",
  "settings_sendAdvertisement": "광고 전송",
-  "settings_sendAdvertisementSubtitle": "현재 존재를 방송합니다.",
-  "settings_advertisementSent": "광고가 전송되었습니다.",
-  "settings_syncTime": "시간 동기화",
+  "settings_sendAdvertisementSubtitle": "방송 활동",
+  "settings_advertisementSent": "광고 전송",
+  "settings_syncTime": "동기화 시간",
  "settings_syncTimeSubtitle": "장치 시계를 휴대폰 시간으로 설정",
-  "settings_timeSynchronized": "시간이 동기화되었습니다.",
-  "settings_refreshContacts": "연락처 새로고침",
+  "settings_timeSynchronized": "시간 동기화",
+  "settings_refreshContacts": "연락처 갱신",
  "settings_refreshContactsSubtitle": "장치에서 연락처 목록을 다시 불러오기",
  "settings_rebootDevice": "장치 재부팅",
-  "settings_rebootDeviceSubtitle": "MeshCore 장치를 재부팅합니다.",
-  "settings_rebootDeviceConfirm": "정말 장치를 재부팅하시겠습니까? 연결이 끊어집니다.",
-  "settings_debug": "디버그",
+  "settings_rebootDeviceSubtitle": "MeshCore 장치를 재부팅하세요.",
+  "settings_rebootDeviceConfirm": "정말로 장치를 재부팅하시겠습니까? 이 경우 연결이 끊어집니다.",
+  "settings_debug": "디버깅",
  "settings_bleDebugLog": "BLE 디버그 로그",
-  "settings_bleDebugLogSubtitle": "BLE 명령, 응답 및 원시 데이터",
-  "settings_appDebugLog": "앱 디버그 로그",
-  "settings_appDebugLogSubtitle": "애플리케이션 디버그 메시지",
-  "settings_about": "정보",
-  "settings_aboutVersion": "MeshCore Open v{version}",
+  "settings_bleDebugLogSubtitle": "BLE 명령어, 응답 및 원시 데이터",
+  "settings_appDebugLog": "앱 디버깅 로그",
+  "settings_appDebugLogSubtitle": "애플리케이션 디버깅 메시지",
+  "settings_about": "소개",
+  "settings_aboutVersion": "MeshCore Open {version} 버전",
  "@settings_aboutVersion": {
    "placeholders": {
      "version": {
@@ -196,8 +194,8 @@
      }
    }
  },
-  "settings_aboutLegalese": "2026 MeshCore 오픈 소스 프로젝트",
-  "settings_aboutDescription": "MeshCore LoRa 메시 네트워크 장치를 위한 오픈소스 Flutter 클라이언트.",
+  "settings_aboutLegalese": "2026년 MeshCore 오픈 소스 프로젝트",
+  "settings_aboutDescription": "MeshCore LoRa 메시 네트워크 장치를 위한 오픈 소스 Flutter 클라이언트.",
  "settings_aboutOpenMeteoAttribution": "LOS 고도 데이터: Open-Meteo (CC BY 4.0)",
  "settings_infoName": "이름",
  "settings_infoId": "ID",
@@ -206,19 +204,19 @@
  "settings_infoPublicKey": "공개 키",
  "settings_infoContactsCount": "연락처 수",
  "settings_infoChannelCount": "채널 수",
-  "settings_presets": "프리셋",
+  "settings_presets": "기본 설정",
  "settings_frequency": "주파수 (MHz)",
  "settings_frequencyHelper": "300.0 - 2500.0",
  "settings_frequencyInvalid": "유효하지 않은 주파수 (300-2500 MHz)",
  "settings_bandwidth": "대역폭",
  "settings_spreadingFactor": "분산 계수",
  "settings_codingRate": "코딩 속도",
-  "settings_txPower": "송신 전력 (dBm)",
+  "settings_txPower": "TX 전력 (dBm)",
  "settings_txPowerHelper": "0 - 22",
-  "settings_txPowerInvalid": "유효하지 않은 송신 전력 (0-22 dBm)",
+  "settings_txPowerInvalid": "유효하지 않은 TX 전력 (0-22 dBm)",
  "settings_clientRepeat": "오프그리드 반복",
-  "settings_clientRepeatSubtitle": "이 장치가 다른 장치의 메시 패킷을 반복하도록 허용합니다.",
-  "settings_clientRepeatFreqWarning": "오프그리드 반복에는 433MHz, 869MHz 또는 918MHz 주파수가 필요합니다.",
+  "settings_clientRepeatSubtitle": "이 장치가 다른 사람들을 위해 메시 패킷을 반복하도록 허용합니다.",
+  "settings_clientRepeatFreqWarning": "오프그리드(무전력) 시스템 재연결에는 433MHz, 869MHz, 또는 918MHz 주파수가 필요합니다.",
  "settings_error": "오류: {message}",
  "@settings_error": {
    "placeholders": {
@@ -228,36 +226,36 @@
    }
  },
  "appSettings_title": "앱 설정",
-  "appSettings_appearance": "모양",
-  "appSettings_theme": "테마",
-  "appSettings_themeSystem": "시스템 기본값",
-  "appSettings_themeLight": "밝음",
-  "appSettings_themeDark": "어두움",
+  "appSettings_appearance": "외관",
+  "appSettings_theme": "주제",
+  "appSettings_themeSystem": "기본 설정",
+  "appSettings_themeLight": "빛",
+  "appSettings_themeDark": "어둡다",
  "appSettings_language": "언어",
  "appSettings_languageSystem": "기본 설정",
  "appSettings_languageEn": "영어",
  "appSettings_languageFr": "프랑스어",
  "appSettings_languageEs": "스페인어",
  "appSettings_languageDe": "독일어",
-  "appSettings_languagePl": "폴란드어",
+  "appSettings_languagePl": "폴란드",
  "appSettings_languageSl": "슬로베니아어",
  "appSettings_languagePt": "포르투갈어",
  "appSettings_languageIt": "이탈리아어",
  "appSettings_languageZh": "중국어",
  "appSettings_languageSv": "스웨덴어",
  "appSettings_languageNl": "네덜란드어",
-  "appSettings_languageSk": "슬로바키아어",
-  "appSettings_languageBg": "불가리아어",
+  "appSettings_languageSk": "슬로베니아어",
+  "appSettings_languageBg": "불가리",
  "appSettings_languageRu": "러시아어",
-  "appSettings_languageUk": "우크라이나어",
+  "appSettings_languageUk": "우크라이나",
  "appSettings_enableMessageTracing": "메시지 추적 기능 활성화",
  "appSettings_enableMessageTracingSubtitle": "메시지에 대한 상세한 경로 및 시간 정보를 표시",
  "appSettings_notifications": "알림",
  "appSettings_enableNotifications": "알림 활성화",
  "appSettings_enableNotificationsSubtitle": "메시지와 광고에 대한 알림을 받으세요.",
  "appSettings_notificationPermissionDenied": "알림 권한 거부",
-  "appSettings_notificationsEnabled": "알림 사용",
-  "appSettings_notificationsDisabled": "알림 사용 안 함",
+  "appSettings_notificationsEnabled": "알림 기능 활성화",
+  "appSettings_notificationsDisabled": "알림 기능 끄기",
  "appSettings_messageNotifications": "메시지 알림",
  "appSettings_messageNotificationsSubtitle": "새로운 메시지를 받을 때 알림 표시",
  "appSettings_channelMessageNotifications": "채널 메시지 알림",
@@ -265,22 +263,22 @@
  "appSettings_advertisementNotifications": "광고 알림",
  "appSettings_advertisementNotificationsSubtitle": "새 노드가 발견되었을 때 알림 표시",
  "appSettings_messaging": "메시징",
-  "appSettings_clearPathOnMaxRetry": "최대 재시도 시 경로 지우기",
-  "appSettings_clearPathOnMaxRetrySubtitle": "전송 시도가 5번 실패하면 연락 경로를 재설정합니다.",
-  "appSettings_pathsWillBeCleared": "5번 실패하면 해당 경로를 지웁니다.",
-  "appSettings_pathsWillNotBeCleared": "경로를 자동으로 지우지 않습니다.",
+  "appSettings_clearPathOnMaxRetry": "Max 재시도 시 경로 명확하게 설정",
+  "appSettings_clearPathOnMaxRetrySubtitle": "5번의 전송 시도가 실패하면 연락 경로를 재설정",
+  "appSettings_pathsWillBeCleared": "5번의 시도 실패 후, 해당 경로가 확보될 것입니다.",
+  "appSettings_pathsWillNotBeCleared": "경로는 자동으로 정리되지 않습니다.",
  "appSettings_autoRouteRotation": "자동 경로 순환",
-  "appSettings_autoRouteRotationSubtitle": "최적 경로와 플러드 모드 사이를 전환합니다.",
+  "appSettings_autoRouteRotationSubtitle": "최적 경로와 방수 모드 사이를 전환",
  "appSettings_autoRouteRotationEnabled": "자동 경로 순환 기능 활성화",
  "appSettings_autoRouteRotationDisabled": "자동 경로 순환 기능 비활성화",
-  "appSettings_maxRouteWeight": "최대 경로 가중치",
-  "appSettings_maxRouteWeightSubtitle": "한 경로가 성공적인 전송을 통해 누적할 수 있는 최대 가중치",
+  "appSettings_maxRouteWeight": "최대 경로 무게",
+  "appSettings_maxRouteWeightSubtitle": "한 경로가 성공적인 배송을 통해 누적할 수 있는 최대 무게",
  "appSettings_initialRouteWeight": "초기 경로 가중치",
-  "appSettings_initialRouteWeightSubtitle": "새로 발견된 경로의 초기 가중치",
-  "appSettings_routeWeightSuccessIncrement": "성공 시 증가",
-  "appSettings_routeWeightSuccessIncrementSubtitle": "성공적으로 전송된 경로에 추가되는 가중치",
-  "appSettings_routeWeightFailureDecrement": "실패 시 감소",
-  "appSettings_routeWeightFailureDecrementSubtitle": "전송 실패 후 경로에서 제거되는 가중치",
+  "appSettings_initialRouteWeightSubtitle": "새롭게 발견된 경로의 초기 무게",
+  "appSettings_routeWeightSuccessIncrement": "성공 횟수 증가",
+  "appSettings_routeWeightSuccessIncrementSubtitle": "성공적으로 배송된 경로에 추가된 무게",
+  "appSettings_routeWeightFailureDecrement": "오류 가중치 감소",
+  "appSettings_routeWeightFailureDecrementSubtitle": "배송 실패 후 경로에서 제거된 무게",
  "appSettings_maxMessageRetries": "최대 메시지 재시도 횟수",
  "appSettings_maxMessageRetriesSubtitle": "메시지를 실패로 처리하기 전 시도 횟수",
  "path_routeWeight": "{weight}/{max}",
@@ -295,8 +293,8 @@
    }
  },
  "appSettings_battery": "배터리",
-  "appSettings_batteryChemistry": "배터리 종류",
-  "appSettings_batteryChemistryPerDevice": "{deviceName}별",
+  "appSettings_batteryChemistry": "배터리 화학",
+  "appSettings_batteryChemistryPerDevice": "{deviceName} 당분간",
  "@appSettings_batteryChemistryPerDevice": {
    "placeholders": {
      "deviceName": {
@@ -304,20 +302,20 @@
      }
    }
  },
-  "appSettings_batteryChemistryConnectFirst": "배터리 종류를 선택하려면 먼저 장치를 연결하세요.",
+  "appSettings_batteryChemistryConnectFirst": "장치를 선택하기 위해 연결",
  "appSettings_batteryNmc": "18650 NMC (3.0-4.2V)",
  "appSettings_batteryLifepo4": "LiFePO4 (2.6-3.65V)",
  "appSettings_batteryLipo": "리튬 폴리머 (3.0-4.2V)",
  "appSettings_mapDisplay": "지도 표시",
-  "appSettings_showRepeaters": "리피터 표시",
-  "appSettings_showRepeatersSubtitle": "지도에 리피터 노드를 표시",
+  "appSettings_showRepeaters": "반복 기능 표시",
+  "appSettings_showRepeatersSubtitle": "지도에 반복자 노드를 표시",
  "appSettings_showChatNodes": "채팅 노드 표시",
  "appSettings_showChatNodesSubtitle": "지도에 채팅 노드를 표시",
  "appSettings_showOtherNodes": "다른 노드 표시",
-  "appSettings_showOtherNodesSubtitle": "지도에 다른 노드 유형을 표시",
+  "appSettings_showOtherNodesSubtitle": "지도에서 다른 노드 유형을 표시",
  "appSettings_timeFilter": "시간 필터",
  "appSettings_timeFilterShowAll": "모든 노드 표시",
-  "appSettings_timeFilterShowLast": "최근 {hours}시간 동안의 노드 표시",
+  "appSettings_timeFilterShowLast": "지난 {hours} 시간 동안의 노드 표시",
  "@appSettings_timeFilterShowLast": {
    "placeholders": {
      "hours": {
@@ -325,17 +323,17 @@
      }
    }
  },
-  "appSettings_mapTimeFilter": "지도 시간 필터",
-  "appSettings_showNodesDiscoveredWithin": "다음 기간 내에 발견된 노드 표시:",
-  "appSettings_allTime": "전체 기간",
-  "appSettings_lastHour": "지난 1시간",
+  "appSettings_mapTimeFilter": "지도 필터",
+  "appSettings_showNodesDiscoveredWithin": "다음 내역에서 발견된 노드 표시:",
+  "appSettings_allTime": "모든 시간",
+  "appSettings_lastHour": "지난 시간",
  "appSettings_last6Hours": "지난 6시간",
  "appSettings_last24Hours": "지난 24시간",
  "appSettings_lastWeek": "지난 주",
  "appSettings_offlineMapCache": "오프라인 지도 캐시",
  "appSettings_unitsTitle": "단위",
-  "appSettings_unitsMetric": "미터법 (m / km)",
-  "appSettings_unitsImperial": "영국식 (ft / mi)",
+  "appSettings_unitsMetric": "단위 (m / km)",
+  "appSettings_unitsImperial": "제국 (피트/마일)",
  "appSettings_noAreaSelected": "선택된 영역 없음",
  "appSettings_areaSelectedZoom": "선택된 영역 (줌 레벨: {minZoom} - {maxZoom})",
  "@appSettings_areaSelectedZoom": {
@@ -348,9 +346,9 @@
      }
    }
  },
-  "appSettings_debugCard": "디버그",
-  "appSettings_appDebugLogging": "앱 디버그 로깅",
-  "appSettings_appDebugLoggingSubtitle": "문제 해결을 위한 앱 디버그 메시지를 기록합니다.",
+  "appSettings_debugCard": "디버깅",
+  "appSettings_appDebugLogging": "앱 디버깅 로깅",
+  "appSettings_appDebugLoggingSubtitle": "로그 앱 디버깅 메시지 (문제 해결을 위한)",
  "appSettings_appDebugLoggingEnabled": "앱 디버깅 로깅 활성화",
  "appSettings_appDebugLoggingDisabled": "앱 디버깅 로깅 비활성화",
  "contacts_title": "연락처",
@@ -454,7 +452,7 @@
  "contacts_noContactsMatchFilter": "입력하신 검색 조건과 일치하는 연락처가 없습니다.",
  "contacts_noMembers": "회원 없음",
  "contacts_lastSeenNow": "최근",
-  "contacts_lastSeenMinsAgo": "~ {minutes}분",
+  "contacts_lastSeenMinsAgo": "~ {minutes} min.",
  "@contacts_lastSeenMinsAgo": {
    "placeholders": {
      "minutes": {
@@ -463,7 +461,7 @@
    }
  },
  "contacts_lastSeenHourAgo": "약 1시간",
-  "contacts_lastSeenHoursAgo": "~ {hours}시간",
+  "contacts_lastSeenHoursAgo": "~ {hours} hours",
  "@contacts_lastSeenHoursAgo": {
    "placeholders": {
      "hours": {
@@ -721,7 +719,7 @@
    }
  },
  "debugFrame_textTypeCli": "명령줄 인터페이스 (CLI)",
-  "debugFrame_textTypePlain": "일반 텍스트",
+  "debugFrame_textTypePlain": "단순한",
  "debugFrame_text": "- 텍스트: \"{text}\"",
  "@debugFrame_text": {
    "placeholders": {
@@ -735,7 +733,7 @@
  "chat_ShowAllPaths": "모든 경로 표시",
  "chat_routingMode": "라우팅 방식",
  "chat_autoUseSavedPath": "자동 (저장된 경로 사용)",
-  "chat_forceFloodMode": "플러드 모드 활성화",
+  "chat_forceFloodMode": "강수 모드 활성화",
  "chat_recentAckPaths": "최근 사용한 ACK 경로 (사용하려면 탭):",
  "chat_pathHistoryFull": "이력 기록은 이미 가득 차 있습니다. 항목을 삭제하여 새로운 항목을 추가할 수 있습니다.",
  "chat_hopSingular": "점프",
@@ -748,20 +746,20 @@
      }
    }
  },
-  "chat_successes": "성공",
+  "chat_successes": "성공 사례",
  "chat_removePath": "경로 제거",
  "chat_noPathHistoryYet": "아직 경로 기록이 없습니다.\n경로를 찾기 위해 메시지를 보내세요.",
  "chat_pathActions": "경로 작업:",
  "chat_setCustomPath": "사용자 지정 경로 설정",
  "chat_setCustomPathSubtitle": "수동으로 경로를 지정",
-  "chat_clearPath": "경로 지우기",
-  "chat_clearPathSubtitle": "다음 전송 시 강제로 새 경로를 찾습니다.",
+  "chat_clearPath": "명확한 길",
+  "chat_clearPathSubtitle": "다음 전송 시, 강제 재전송 설정",
  "chat_pathCleared": "경로가 확보되었습니다. 다음 메시지는 경로를 다시 찾을 것입니다.",
-  "chat_floodModeSubtitle": "앱 바의 라우팅 스위치를 사용하세요.",
-  "chat_floodModeEnabled": "플러드 모드가 활성화되었습니다. 앱 바의 경로 아이콘으로 다시 전환할 수 있습니다.",
+  "chat_floodModeSubtitle": "앱 바에서 라우팅 스위치를 사용",
+  "chat_floodModeEnabled": "홍수 모드 활성화됨. 앱 바의 경로 아이콘을 사용하여 다시 전환할 수 있습니다.",
  "chat_fullPath": "전체 경로",
  "chat_pathDetailsNotAvailable": "경로 정보는 아직 제공되지 않습니다. 메시지를 보내어 다시 시도해 보세요.",
-  "chat_pathSetHops": "경로 설정: {hopCount} {hopCount, plural, =1{홉} other{홉}} - {status}",
+  "chat_pathSetHops": "Path set: {hopCount} {hopCount, plural, =1{hop} other{hops}} - {status}",
  "@chat_pathSetHops": {
    "placeholders": {
      "hopCount": {
@@ -772,16 +770,16 @@
      }
    }
  },
-  "chat_pathSavedLocally": "로컬에 저장되었습니다. 동기화할 장치에 연결하세요.",
-  "chat_pathDeviceConfirmed": "장치가 확인되었습니다.",
+  "chat_pathSavedLocally": "로컬에 저장. 동기화 연결",
+  "chat_pathDeviceConfirmed": "장치 확인 완료.",
  "chat_pathDeviceNotConfirmed": "기기가 아직 확인되지 않았습니다.",
-  "chat_type": "유형",
+  "chat_type": "종류",
  "chat_path": "경로",
  "chat_publicKey": "공개 키",
  "chat_compressOutgoingMessages": "전송되는 메시지 압축",
-  "chat_floodForced": "플러드 (강제)",
-  "chat_directForced": "직접 (강제)",
-  "chat_hopsForced": "{count}홉 (강제)",
+  "chat_floodForced": "홍수 (강제)",
+  "chat_directForced": "직접적인 (강제적인)",
+  "chat_hopsForced": "{count}번 띄우기 (강제)",
  "@chat_hopsForced": {
    "placeholders": {
      "count": {
@@ -789,7 +787,7 @@
      }
    }
  },
-  "chat_floodAuto": "플러드 (자동)",
+  "chat_floodAuto": "홍수 (자동)",
  "chat_direct": "직접",
  "chat_poiShared": "공유된 POI",
  "chat_unread": "읽지 않음: {count}",
@@ -905,7 +903,7 @@
      }
    }
  },
-  "mapCache_cachedTilesWithFailed": "캐시된 타일 {downloaded}개 ({failed}개 실패)",
+  "mapCache_cachedTilesWithFailed": "Cached {downloaded} tiles ({failed} failed)",
  "@mapCache_cachedTilesWithFailed": {
    "placeholders": {
      "downloaded": {
@@ -931,7 +929,7 @@
      }
    }
  },
-  "mapCache_downloadedTiles": "다운로드됨 {completed} / {total}",
+  "mapCache_downloadedTiles": "Downloaded {completed} / {total}",
  "@mapCache_downloadedTiles": {
    "placeholders": {
      "completed": {
@@ -978,7 +976,7 @@
      }
    }
  },
-  "time_hoursAgo": "{hours}시간 전",
+  "time_hoursAgo": "{hours}h ago",
  "@time_hoursAgo": {
    "placeholders": {
      "hours": {
@@ -1040,8 +1038,8 @@
    }
  },
  "login_failedMessage": "로그인에 실패했습니다. 비밀번호가 잘못되었거나, 연결이 되지 않는 것 같습니다.",
-  "common_reload": "다시 불러오기",
-  "common_clear": "지우기",
+  "common_reload": "다시 로드",
+  "common_clear": "명확하게",
  "path_currentPath": "현재 경로: {path}",
  "@path_currentPath": {
    "placeholders": {
@@ -1050,7 +1048,7 @@
      }
    }
  },
-  "path_usingHopsPath": "{count} {count, plural, =1{홉} other{홉}} 경로 사용 중",
+  "path_usingHopsPath": "Using {count} {count, plural, =1{hop} other{hops}} path",
  "@path_usingHopsPath": {
    "placeholders": {
      "count": {
@@ -1468,43 +1466,6 @@
      }
    }
  },
-  "telemetry_digitalInputLabel": "디지털 입력",
-  "telemetry_digitalOutputLabel": "디지털 출력",
-  "telemetry_analogInputLabel": "아날로그 입력",
-  "telemetry_analogOutputLabel": "아날로그 출력",
-  "telemetry_genericLabel": "일반 센서",
-  "telemetry_luminosityLabel": "조도",
-  "telemetry_presenceLabel": "존재 감지",
-  "telemetry_humidityLabel": "습도",
-  "telemetry_accelerometerLabel": "가속도계",
-  "telemetry_pressureLabel": "압력",
-  "telemetry_altitudeLabel": "고도",
-  "telemetry_frequencyLabel": "주파수",
-  "telemetry_percentageLabel": "백분율",
-  "telemetry_concentrationLabel": "농도",
-  "telemetry_powerLabel": "전력",
-  "telemetry_distanceLabel": "거리",
-  "telemetry_energyLabel": "에너지",
-  "telemetry_directionLabel": "방향",
-  "telemetry_timeLabel": "시간",
-  "telemetry_gyrometerLabel": "자이로미터",
-  "telemetry_colourLabel": "색상",
-  "telemetry_gpsLabel": "GPS",
-  "telemetry_switchLabel": "스위치",
-  "telemetry_polylineLabel": "폴리라인",
-  "telemetry_altitudeValue": "{meters} m",
-  "telemetry_frequencyValue": "{hertz} Hz",
-  "telemetry_pressureValue": "{hpa} hPa",
-  "telemetry_luminosityValue": "{lux} lx",
-  "telemetry_powerValue": "{watts} W",
-  "telemetry_distanceValue": "{meters} m",
-  "telemetry_energyValue": "{kilowattHours} kWh",
-  "telemetry_directionValue": "{degrees}°",
-  "telemetry_concentrationValue": "{ppm} ppm",
-  "telemetry_percentageValue": "{percent}%",
-  "telemetry_analogValue": "{value}",
-  "telemetry_autoFetchQuantity": "요청 수",
-  "telemetry_error": "데이터를 가져올 수 없습니다",
  "telemetry_noData": "텔레메트리 데이터는 제공되지 않습니다.",
  "telemetry_channelTitle": "채널 {channel}",
  "@telemetry_channelTitle": {
@@ -1577,7 +1538,7 @@
      }
    }
  },
-  "neighbors_heardAgo": "수신: {time} 전",
+  "neighbors_heardAgo": "Heard: {time} ago",
  "@neighbors_heardAgo": {
    "placeholders": {
      "time": {
@@ -1641,7 +1602,7 @@
      }
    }
  },
-  "channelPath_observedSomeOf": "{observed}/{total} 홉 관찰됨",
+  "channelPath_observedSomeOf": "{observed} of {total} hops",
  "@channelPath_observedSomeOf": {
    "placeholders": {
      "observed": {
@@ -1877,7 +1838,7 @@
      }
    }
  },
-  "losAntennaB": "안테나 B: {value} {unit}",
+  "losAntennaB": "Antenna B: {value} {unit}",
  "@losAntennaB": {
    "placeholders": {
      "value": {
@@ -1890,7 +1851,7 @@
  },
  "losRun": "LOS (Loss of Signal) 상태로 전환",
  "losNoElevationData": "고도 정보 없음",
-  "losProfileClear": "{distance} {distanceUnit}, LOS 확보, 최소 여유 {clearance} {heightUnit}",
+  "losProfileClear": "{distance} {distanceUnit}, clear LOS, min clearance {clearance} {heightUnit}",
  "@losProfileClear": {
    "placeholders": {
      "distance": {
@@ -1907,7 +1868,7 @@
      }
    }
  },
-  "losProfileBlocked": "{distance} {distanceUnit}, {obstruction} {heightUnit}에 의해 차단됨",
+  "losProfileBlocked": "{distance} {distanceUnit}, blocked by {obstruction} {heightUnit}",
  "@losProfileBlocked": {
    "placeholders": {
      "distance": {
@@ -2176,9 +2137,6 @@
  "translation_enableTitle": "번역 기능 활성화",
  "translation_composerTitle": "보내기 전에 번역",
  "translation_composerSubtitle": "컴포저 번역 아이콘의 기본 상태를 제어합니다.",
-  "translation_autoIncomingTitle": "메시지 자동 번역",
-  "translation_autoIncomingSubtitle": "알림과 채팅 또는 채널의 메시지를 자동으로 번역합니다.",
-  "translation_translateMessage": "메시지 번역",
  "translation_targetLanguage": "목표 언어",
  "translation_useAppLanguage": "앱 언어 사용",
  "translation_downloadedModelLabel": "다운로드한 모델",
@@ -2305,10 +2263,10 @@
  "repeater_cliHelpStatsPackets": "(전송 속도만 표시) 패킷 수준의 통계 정보를 보여줍니다.",
  "repeater_cliHelpStatsRadio": "(특정 시리즈만 해당) 라디오 통계 정보를 표시합니다.",
  "repeater_cliHelpStatsCore": "(시리얼 번호만 표시) 핵심 펌웨어 통계 정보를 보여줍니다.",
-  "common_done": "완료",
-  "background_serviceTitle": "MeshCore 실행 중",
-  "background_serviceText": "BLE 연결 유지 중",
-  "appSettings_translationModelDeleted": "{name} 삭제됨",
+  "common_done": "Done",
+  "background_serviceTitle": "MeshCore running",
+  "background_serviceText": "Keeping BLE connected",
+  "appSettings_translationModelDeleted": "Deleted {name}",
  "@appSettings_translationModelDeleted": {
    "placeholders": {
      "name": {
@@ -2316,7 +2274,7 @@
      }
    }
  },
-  "appSettings_translationModelDeleteFailed": "삭제 실패: {error}",
+  "appSettings_translationModelDeleteFailed": "Failed to delete: {error}",
  "@appSettings_translationModelDeleteFailed": {
    "placeholders": {
      "error": {
@@ -2324,7 +2282,7 @@
      }
    }
  },
-  "channels_channelUpdateFailed": "채널 업데이트 실패: {error}",
+  "channels_channelUpdateFailed": "Failed to update channel: {error}",
  "@channels_channelUpdateFailed": {
    "placeholders": {
      "error": {
@@ -2332,19 +2290,19 @@
      }
    }
  },
-  "map_type": "유형",
-  "map_path": "경로",
-  "map_location": "위치",
-  "map_estLocation": "추정 위치",
-  "map_publicKey": "공개 키",
-  "map_publicKeyPrefixHint": "예: ab12",
-  "contact_typeChat": "채팅",
-  "contact_typeRepeater": "리피터",
-  "contact_typeRoom": "룸",
-  "contact_typeSensor": "센서",
-  "contact_typeUnknown": "알 수 없음",
-  "channels_via": "{path} 경유",
-  "chat_score": "점수",
+  "map_type": "Type",
+  "map_path": "Path",
+  "map_location": "Location",
+  "map_estLocation": "Est. Location",
+  "map_publicKey": "Public Key",
+  "map_publicKeyPrefixHint": "e.g. ab12",
+  "contact_typeChat": "Chat",
+  "contact_typeRepeater": "Repeater",
+  "contact_typeRoom": "Room",
+  "contact_typeSensor": "Sensor",
+  "contact_typeUnknown": "Unknown",
+  "channels_via": "via {path}",
+  "chat_score": "Score",
  "settings_multiAck": "다중 ACK",
  "map_sharedAt": "공유됨",
  "@losBlockedSpotChip": {
@@ -2386,296 +2344,14 @@
  "losBlockedSpotsTitle": "차단된 공간",
  "losSelectedObstructionTitle": "선택된 장애물",
  "losBlockedSpotChip": "{distance} {distanceUnit} • {obstruction} {heightUnit}",
-  "losSelectedObstructionDetails": "{obstruction} {heightUnit}에 의해 차단됨, A에서 {distanceFromA}, B에서 {distanceFromB} ({distanceUnit})",
+  "losSelectedObstructionDetails": "Blocked by {obstruction} {heightUnit}, {distanceFromA} from A and {distanceFromB} from B ({distanceUnit}).",
  "settings_companionDebugLog": "동반 디버깅 로그",
  "chat_newMessages": "새로운 메시지",
  "settings_companionDebugLogSubtitle": "BLE/TCP/USB 명령어, 응답 및 원시 데이터",
  "chat_markAsUnread": "미리 읽지 않음으로 표시",
  "repeater_chanUtil": "채널 활용도",
-  "@routing_lastWorked": {
-    "placeholders": {
-      "when": {
-        "type": "String"
-      }
-    }
-  },
-  "@routing_deliveryCounts": {
-    "placeholders": {
-      "successes": {
-        "type": "int"
-      },
-      "failures": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathEditor_hopCounter": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathEditor_invalidTokens": {
-    "placeholders": {
-      "tokens": {
-        "type": "String"
-      }
-    }
-  },
-  "@channels_communityShortId": {
-    "placeholders": {
-      "id": {
-        "type": "String"
-      }
-    }
-  },
-  "messageStatus_pending": "발송",
-  "messageStatus_sent": "발송",
-  "messageStatus_delivered": "배송 완료",
-  "common_undo": "되돌리기",
-  "messageStatus_pending": "전송 중",
-  "messageStatus_sent": "전송됨",
-  "messageStatus_delivered": "전달됨",
-  "messageStatus_failed": "전송 실패",
-  "messageStatus_repeated": "반복 수신됨",
-  "contacts_searchOpen": "연락처 검색",
-  "contacts_moreOptions": "더 많은 옵션",
-  "contacts_searchClose": "검색 닫기",
-  "routing_title": "라우팅",
-  "routing_modeAuto": "자동",
-  "routing_modeFlood": "플러드",
-  "routing_modeManual": "수동",
-  "routing_modeAutoHint": "가장 잘 알려진 경로를 자동으로 선택하고, 경로가 없으면 플러드로 전환합니다.",
-  "routing_modeFloodHint": "모든 중계기를 통해 방송합니다. 가장 안정적이지만 송신 시간을 더 많이 사용합니다.",
-  "routing_modeManualHint": "항상 지정한 정확한 경로를 따릅니다.",
-  "routing_currentRoute": "현재 경로",
-  "routing_directNoHops": "직접 연결 - 중계 없음",
-  "routing_noPathYet": "아직 경로가 없습니다. 다음 메시지가 도착할 때까지 계속 탐색합니다.",
-  "routing_floodBroadcast": "모든 중계기를 통해 방송",
-  "routing_editPath": "경로 편집",
-  "routing_forgetPath": "경로 지우기",
-  "routing_knownPaths": "알려진 경로",
-  "routing_knownPathsHint": "전환할 경로를 선택하세요.",
-  "routing_inUse": "사용 중",
-  "routing_qualityStrong": "매우 좋음",
-  "routing_qualityGood": "좋음",
-  "routing_qualityFair": "보통",
-  "routing_qualityWorked": "작동함",
-  "routing_qualityFlood": "플러드로 수신됨",
-  "routing_qualityUntested": "미검증",
-  "routing_lastWorked": "{when}에 작동",
-  "routing_neverWorked": "아직 작동한 적 없음",
-  "routing_floodDelivery": "플러드 전송",
-  "pathEditor_title": "경로 만들기",
-  "pathEditor_hopCounter": "64개 중 {count} 홉",
-  "pathEditor_noHops": "아직 홉이 추가되지 않았습니다. 아래 탭을 사용해 순서대로 추가하거나, 홉 없이 바로 보내려면 \"홉 없음\"으로 저장하세요.",
-  "pathEditor_addHops": "홉을 순서대로 추가하세요.",
-  "pathEditor_searchRepeaters": "리피터 검색",
-  "pathEditor_advancedHex": "고급: 원시 HEX 경로",
-  "pathEditor_hexLabel": "HEX 접두사",
-  "pathEditor_hexHelper": "각 홉마다 2개의 16진수 바이트, 쉼표로 구분",
-  "pathEditor_invalidTokens": "유효하지 않음: {tokens}",
-  "pathEditor_tooManyHops": "최대 64개의 홉",
-  "pathEditor_usePath": "이 경로 사용",
-  "pathEditor_removeHop": "홉 제거",
-  "pathEditor_unknownHop": "알 수 없는 중계기",
-  "map_zoomIn": "확대",
-  "routing_deliveryCounts": "{successes}건 성공, {failures}건 실패",
-  "map_zoomOut": "축소",
-  "map_centerMap": "지도 중앙 맞추기",
-  "chrome_bluetoothRequiresChromium": "웹 블루투스는 Chromium 기반 브라우저가 필요합니다.",
-  "channels_communityShortId": "ID: {id}...",
-  "pathTrace_legendGpsConfirmed": "GPS로 확인됨",
-  "pathTrace_legendInferred": "추정된 위치",
-  "@pathMap_hopOf": {
-    "placeholders": {
-      "current": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_observedPaths": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_alternate": {
-    "placeholders": {
-      "index": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_hopCount": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_gpsCount": {
-    "placeholders": {
-      "confirmed": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_sharedNodeCount": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_partialAnimation": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "map_activity": "활동",
-  "map_searchHint": "노드 이름 또는 ID 검색",
-  "map_online": "온라인",
-  "scanner_bluetoothWebUnsupported": "브라우저에서는 블루투스를 사용할 수 없습니다. 대신 USB로 연결하세요.",
-  "map_recent": "최근",
-  "map_stale": "오래됨",
-  "map_visible": "보임",
-  "map_hidden": "숨김",
-  "map_centerOnNode": "노드 중심으로 보기",
-  "map_details": "세부 정보",
-  "map_noGps": "GPS 없음",
-  "map_noResults": "일치하는 노드가 없습니다.",
-  "pathMap_viewSingle": "단일",
-  "pathMap_viewCombined": "결합",
-  "pathMap_play": "재생",
-  "pathMap_pause": "일시 정지",
-  "pathMap_replay": "다시 재생",
-  "pathMap_stepBack": "이전 홉",
-  "pathMap_stepForward": "다음 홉",
-  "pathMap_animationOn": "패킷 애니메이션 표시",
-  "pathMap_animationOff": "패킷 애니메이션 숨기기",
-  "pathMap_hopOf": "{current}/{total} 홉",
-  "pathMap_observedPaths": "관찰된 경로: {count}",
-  "pathMap_primary": "주 경로",
-  "pathMap_alternate": "대체 {index}",
-  "pathMap_hopCount": "{count, plural, =1{1 홉} other{{count} 홉}}",
-  "pathMap_legendShared": "공유 구간",
-  "pathMap_legendEstimated": "추정 구간",
-  "pathMap_sharedNodeCount": "{count}개의 경로에서 사용됨",
-  "pathMap_partialAnimation": "{count, plural, =1{1 홉은 위치가 없어 표시된 경로가 일부입니다} other{{count} 홉은 위치가 없어 표시된 경로가 일부입니다}}",
-  "pathMap_showAllPaths": "모두 보기",
-  "pathMap_hidePath": "경로 숨기기",
-  "pathMap_showPath": "경로 표시",
-  "pathMap_collapsePanel": "패널 접기",
-  "pathMap_expandPanel": "패널 펼치기",
-  "pathMap_noLocation": "위치 없음",
-  "pathMap_followPacket": "패킷 고정",
-  "pathMap_unfollowPacket": "패킷 고정 해제",
-  "pathMap_gpsCount": "{confirmed}/{total} GPS",
-  "@channels_cyr2latSettingsDialogWrongJSON": {
-    "placeholders": {
-      "error": {}
-    }
-  },
-  "@channels_via": {
-    "placeholders": {
-      "path": {
-        "type": "String"
-      }
-    }
-  },
-  "@settings_cyr2latProfileDeleteDscr": {
-    "placeholders": {
-      "name": {
-        "type": "String"
-      }
-    }
-  },
-  "@telemetry_altitudeValue": {
-    "placeholders": {
-      "meters": {
-        "type": "String"
-      }
-    }
-  },
-  "@telemetry_analogValue": {
-    "placeholders": {
-      "value": {
-        "type": "String"
-      }
-    }
-  },
-  "@telemetry_concentrationValue": {
-    "placeholders": {
-      "ppm": {
-        "type": "String"
-      }
-    }
-  },
-  "@telemetry_directionValue": {
-    "placeholders": {
-      "degrees": {
-        "type": "String"
-      }
-    }
-  },
-  "@telemetry_distanceValue": {
-    "placeholders": {
-      "meters": {
-        "type": "String"
-      }
-    }
-  },
-  "@telemetry_energyValue": {
-    "placeholders": {
-      "kilowattHours": {
-        "type": "String"
-      }
-    }
-  },
-  "@telemetry_frequencyValue": {
-    "placeholders": {
-      "hertz": {
-        "type": "String"
-      }
-    }
-  },
-  "@telemetry_luminosityValue": {
-    "placeholders": {
-      "lux": {
-        "type": "String"
-      }
-    }
-  },
-  "@telemetry_percentageValue": {
-    "placeholders": {
-      "percent": {
-        "type": "String"
-      }
-    }
-  },
-  "@telemetry_powerValue": {
-    "placeholders": {
-      "watts": {
-        "type": "String"
-      }
-    }
-  },
-  "@telemetry_pressureValue": {
-    "placeholders": {
-      "hpa": {
-        "type": "String"
-      }
-    }
-  }
+  "dialog_connectCompanion": "리피터 및 룸 서버 기능에 액세스하려면 컴패니언에 연결하세요.",
+  "dialog_disconnectedTitle": "연결 끊김",
+  "dialog_disconnectedMessage": "컴패니언과의 연결이 끊어졌습니다.",
+  "contact_connectCompanion": "리피터 및 룸 서버 기능에 액세스하려면 컴패니언에 연결하세요."
 }
@@ -92,24 +92,6 @@ class AppLocalizationsEn extends AppLocalizations {
  @override
  String get common_disable => 'Disable';

-  @override
-  String get common_undo => 'Undo';
-
-  @override
-  String get messageStatus_sent => 'Sent';
-
-  @override
-  String get messageStatus_delivered => 'Delivered';
-
-  @override
-  String get messageStatus_pending => 'Sending';
-
-  @override
-  String get messageStatus_failed => 'Failed to send';
-
-  @override
-  String get messageStatus_repeated => 'Heard repeated';
-
  @override
  String get common_reboot => 'Reboot';

@@ -129,12 +111,6 @@ class AppLocalizationsEn extends AppLocalizations {
    return '$percent%';
  }

-  @override
-  String get common_autoRefresh => 'Autorefresh';
-
-  @override
-  String get common_interval => 'Interval';
-
  @override
  String get scanner_title => 'MeshCore Open';

@@ -315,10 +291,6 @@ class AppLocalizationsEn extends AppLocalizations {
  @override
  String get scanner_enableBluetooth => 'Enable Bluetooth';

-  @override
-  String get scanner_bluetoothWebUnsupported =>
-      'Bluetooth isn\'t available in the browser. Connect over USB instead.';
-
  @override
  String get device_quickSwitch => 'Quick switch';

@@ -799,6 +771,11 @@ class AppLocalizationsEn extends AppLocalizations {
  String get appSettings_maxMessageRetriesSubtitle =>
      'Number of retry attempts before marking a message as failed';

+  @override
+  String path_routeWeight(String weight, String max) {
+    return '$weight/$max';
+  }
+
  @override
  String get appSettings_battery => 'Battery';

@@ -998,15 +975,6 @@ class AppLocalizationsEn extends AppLocalizations {
  @override
  String get contacts_newGroup => 'New Group';

-  @override
-  String get contacts_moreOptions => 'More options';
-
-  @override
-  String get contacts_searchOpen => 'Search contacts';
-
-  @override
-  String get contacts_searchClose => 'Close search';
-
  @override
  String get contacts_groupName => 'Group name';

@@ -1478,6 +1446,34 @@ class AppLocalizationsEn extends AppLocalizations {
  @override
  String get debugFrame_hexDump => 'Hex Dump:';

+  @override
+  String get chat_pathManagement => 'Path Management';
+
+  @override
+  String get chat_ShowAllPaths => 'Show all paths';
+
+  @override
+  String get chat_routingMode => 'Routing mode';
+
+  @override
+  String get chat_autoUseSavedPath => 'Auto (use saved path)';
+
+  @override
+  String get chat_forceFloodMode => 'Force Flood Mode';
+
+  @override
+  String get chat_recentAckPaths => 'Recent ACK Paths (tap to use):';
+
+  @override
+  String get chat_pathHistoryFull =>
+      'Path history is full. Remove entries to add new ones.';
+
+  @override
+  String get chat_hopSingular => 'hop';
+
+  @override
+  String get chat_hopPlural => 'hops';
+
  @override
  String chat_hopsCount(int count) {
    String _temp0 = intl.Intl.pluralLogic(
@@ -1489,6 +1485,12 @@ class AppLocalizationsEn extends AppLocalizations {
    return '$count $_temp0';
  }

+  @override
+  String get chat_successes => 'successes';
+
+  @override
+  String get chat_score => 'Score';
+
  @override
  String get chat_removePath => 'Remove path';

@@ -1496,144 +1498,50 @@ class AppLocalizationsEn extends AppLocalizations {
  String get chat_noPathHistoryYet =>
      'No path history yet.\nSend a message to discover paths.';

+  @override
+  String get chat_pathActions => 'Path Actions:';
+
+  @override
+  String get chat_setCustomPath => 'Set Custom Path';
+
+  @override
+  String get chat_setCustomPathSubtitle => 'Manually specify routing path';
+
+  @override
+  String get chat_clearPath => 'Clear Path';
+
+  @override
+  String get chat_clearPathSubtitle => 'Force rediscovery on next send';
+
  @override
  String get chat_pathCleared =>
      'Path cleared. Next message will rediscover route.';

+  @override
+  String get chat_floodModeSubtitle => 'Use routing toggle in app bar';
+
+  @override
+  String get chat_floodModeEnabled =>
+      'Flood mode enabled. Toggle back via routing icon in app bar.';
+
  @override
  String get chat_fullPath => 'Full Path';

  @override
-  String get routing_title => 'Routing';
+  String get chat_pathDetailsNotAvailable =>
+      'Path details not available yet. Try sending a message to refresh.';

  @override
-  String get routing_modeAuto => 'Auto';
-
-  @override
-  String get routing_modeFlood => 'Flood';
-
-  @override
-  String get routing_modeManual => 'Manual';
-
-  @override
-  String get routing_modeAutoHint =>
-      'Picks the best known path automatically, flooding when none is known.';
-
-  @override
-  String get routing_modeFloodHint =>
-      'Broadcasts through every repeater. Most reliable, but uses more airtime.';
-
-  @override
-  String get routing_modeManualHint =>
-      'Always sends along the exact path you set.';
-
-  @override
-  String get routing_currentRoute => 'Current route';
-
-  @override
-  String get routing_directNoHops => 'Direct — no repeater hops';
-
-  @override
-  String get routing_noPathYet =>
-      'No path yet. The next message floods until a route is discovered.';
-
-  @override
-  String get routing_floodBroadcast => 'Broadcast through every repeater';
-
-  @override
-  String get routing_editPath => 'Edit path';
-
-  @override
-  String get routing_forgetPath => 'Forget path';
-
-  @override
-  String get routing_knownPaths => 'Known paths';
-
-  @override
-  String get routing_knownPathsHint => 'Tap a path to switch to it.';
-
-  @override
-  String get routing_inUse => 'In use';
-
-  @override
-  String get routing_qualityStrong => 'Strong first hop';
-
-  @override
-  String get routing_qualityGood => 'Good first hop';
-
-  @override
-  String get routing_qualityFair => 'Fair first hop';
-
-  @override
-  String get routing_qualityWorked => 'Has delivered';
-
-  @override
-  String get routing_qualityFlood => 'Heard via flood';
-
-  @override
-  String get routing_qualityUntested => 'Untested';
-
-  @override
-  String routing_lastWorked(String when) {
-    return 'worked $when';
+  String chat_pathSetHops(int hopCount, String status) {
+    String _temp0 = intl.Intl.pluralLogic(
+      hopCount,
+      locale: localeName,
+      other: 'hops',
+      one: 'hop',
+    );
+    return 'Path set: $hopCount $_temp0 - $status';
  }

-  @override
-  String get routing_neverWorked => 'never confirmed';
-
-  @override
-  String routing_deliveryCounts(int successes, int failures) {
-    return '$successes delivered, $failures failed';
-  }
-
-  @override
-  String get routing_floodDelivery => 'Flood delivery';
-
-  @override
-  String get pathEditor_title => 'Build Path';
-
-  @override
-  String pathEditor_hopCounter(int count) {
-    return '$count of 64 hops';
-  }
-
-  @override
-  String get pathEditor_noHops =>
-      'No hops yet. Tap repeaters below to add them in order, or save with no hops to send direct.';
-
-  @override
-  String get pathEditor_addHops => 'Add hops in order';
-
-  @override
-  String get pathEditor_searchRepeaters => 'Search repeaters';
-
-  @override
-  String get pathEditor_advancedHex => 'Advanced: raw hex path';
-
-  @override
-  String get pathEditor_hexLabel => 'Hex prefixes';
-
-  @override
-  String get pathEditor_hexHelper =>
-      'Two hex characters per hop, separated by commas';
-
-  @override
-  String pathEditor_invalidTokens(String tokens) {
-    return 'Invalid: $tokens';
-  }
-
-  @override
-  String get pathEditor_tooManyHops => 'Maximum 64 hops';
-
-  @override
-  String get pathEditor_usePath => 'Use this path';
-
-  @override
-  String get pathEditor_removeHop => 'Remove hop';
-
-  @override
-  String get pathEditor_unknownHop => 'Unknown repeater';
-
  @override
  String get chat_pathSavedLocally => 'Saved locally. Connect to sync.';

@@ -1707,39 +1615,6 @@ class AppLocalizationsEn extends AppLocalizations {
  @override
  String get map_title => 'Node Map';

-  @override
-  String get map_searchHint => 'Search node name or ID';
-
-  @override
-  String get map_activity => 'Activity';
-
-  @override
-  String get map_online => 'Online';
-
-  @override
-  String get map_recent => 'Recent';
-
-  @override
-  String get map_stale => 'Stale';
-
-  @override
-  String get map_visible => 'Visible';
-
-  @override
-  String get map_hidden => 'Hidden';
-
-  @override
-  String get map_centerOnNode => 'Center on node';
-
-  @override
-  String get map_details => 'Details';
-
-  @override
-  String get map_noGps => 'No GPS';
-
-  @override
-  String get map_noResults => 'No matching nodes';
-
  @override
  String get map_lineOfSight => 'Line of Sight';

@@ -2063,6 +1938,17 @@ class AppLocalizationsEn extends AppLocalizations {
  String get dialog_disconnectConfirm =>
      'Are you sure you want to disconnect from this device?';

+  @override
+  String get dialog_disconnectedTitle => 'Disconnected';
+
+  @override
+  String get dialog_disconnectedMessage =>
+      'You have been disconnected from your companion.';
+
+  @override
+  String get dialog_connectCompanion =>
+      'Connect to a companion to access repeater and room server features.';
+
  @override
  String get login_repeaterLogin => 'Repeater Login';

@@ -2128,12 +2014,64 @@ class AppLocalizationsEn extends AppLocalizations {
  @override
  String get common_clear => 'Clear';

+  @override
+  String path_currentPath(String path) {
+    return 'Current path: $path';
+  }
+
+  @override
+  String path_usingHopsPath(int count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other: 'hops',
+      one: 'hop',
+    );
+    return 'Using $count $_temp0 path';
+  }
+
+  @override
+  String get path_enterCustomPath => 'Enter Custom Path';
+
  @override
  String get path_currentPathLabel => 'Current path';

+  @override
+  String get path_hexPrefixInstructions =>
+      'Enter 2-character hex prefixes for each hop, separated by commas.';
+
+  @override
+  String get path_hexPrefixExample =>
+      'Example: A1,F2,3C (each node uses first byte of its public key)';
+
+  @override
+  String get path_labelHexPrefixes => 'Path (hex prefixes)';
+
+  @override
+  String get path_helperMaxHops =>
+      'Max 64 hops. Each prefix is 2 hex characters (1 byte)';
+
+  @override
+  String get path_selectFromContacts => 'Or select from contacts:';
+
  @override
  String get path_noRepeatersFound => 'No repeaters or room servers found.';

+  @override
+  String get path_customPathsRequire =>
+      'Custom paths require intermediate hops that can relay messages.';
+
+  @override
+  String path_invalidHexPrefixes(String prefixes) {
+    return 'Invalid hex prefixes: $prefixes';
+  }
+
+  @override
+  String get path_tooLong => 'Path too long. Maximum 64 hops allowed.';
+
+  @override
+  String get path_setPath => 'Set Path';
+
  @override
  String get repeater_management => 'Repeater Management';

@@ -2197,6 +2135,15 @@ class AppLocalizationsEn extends AppLocalizations {
  @override
  String get repeater_routingMode => 'Routing mode';

+  @override
+  String get repeater_autoUseSavedPath => 'Auto (use saved path)';
+
+  @override
+  String get repeater_forceFloodMode => 'Force Flood Mode';
+
+  @override
+  String get repeater_pathManagement => 'Path management';
+
  @override
  String get repeater_refresh => 'Refresh';

@@ -3277,139 +3224,6 @@ class AppLocalizationsEn extends AppLocalizations {
    return '$celsius°C / $fahrenheit°F';
  }

-  @override
-  String get telemetry_digitalInputLabel => 'Digital Input';
-
-  @override
-  String get telemetry_digitalOutputLabel => 'Digital Output';
-
-  @override
-  String get telemetry_analogInputLabel => 'Analog Input';
-
-  @override
-  String get telemetry_analogOutputLabel => 'Analog Output';
-
-  @override
-  String get telemetry_genericLabel => 'Generic Sensor';
-
-  @override
-  String get telemetry_luminosityLabel => 'Luminosity';
-
-  @override
-  String get telemetry_presenceLabel => 'Presence';
-
-  @override
-  String get telemetry_humidityLabel => 'Humidity';
-
-  @override
-  String get telemetry_accelerometerLabel => 'Accelerometer';
-
-  @override
-  String get telemetry_pressureLabel => 'Pressure';
-
-  @override
-  String get telemetry_altitudeLabel => 'Altitude';
-
-  @override
-  String get telemetry_frequencyLabel => 'Frequency';
-
-  @override
-  String get telemetry_percentageLabel => 'Percentage';
-
-  @override
-  String get telemetry_concentrationLabel => 'Concentration';
-
-  @override
-  String get telemetry_powerLabel => 'Power';
-
-  @override
-  String get telemetry_distanceLabel => 'Distance';
-
-  @override
-  String get telemetry_energyLabel => 'Energy';
-
-  @override
-  String get telemetry_directionLabel => 'Direction';
-
-  @override
-  String get telemetry_timeLabel => 'Time';
-
-  @override
-  String get telemetry_gyrometerLabel => 'Gyrometer';
-
-  @override
-  String get telemetry_colourLabel => 'Colour';
-
-  @override
-  String get telemetry_gpsLabel => 'GPS';
-
-  @override
-  String get telemetry_switchLabel => 'Switch';
-
-  @override
-  String get telemetry_polylineLabel => 'Polyline';
-
-  @override
-  String telemetry_altitudeValue(String meters) {
-    return '$meters m';
-  }
-
-  @override
-  String telemetry_frequencyValue(String hertz) {
-    return '$hertz Hz';
-  }
-
-  @override
-  String telemetry_pressureValue(String hpa) {
-    return '$hpa hPa';
-  }
-
-  @override
-  String telemetry_luminosityValue(String lux) {
-    return '$lux lx';
-  }
-
-  @override
-  String telemetry_powerValue(String watts) {
-    return '$watts W';
-  }
-
-  @override
-  String telemetry_distanceValue(String meters) {
-    return '$meters m';
-  }
-
-  @override
-  String telemetry_energyValue(String kilowattHours) {
-    return '$kilowattHours kWh';
-  }
-
-  @override
-  String telemetry_directionValue(String degrees) {
-    return '$degrees°';
-  }
-
-  @override
-  String telemetry_concentrationValue(String ppm) {
-    return '$ppm ppm';
-  }
-
-  @override
-  String telemetry_percentageValue(String percent) {
-    return '$percent%';
-  }
-
-  @override
-  String telemetry_analogValue(String value) {
-    return '$value';
-  }
-
-  @override
-  String get telemetry_autoFetchQuantity => 'Requests quantity';
-
-  @override
-  String get telemetry_error => 'Unable to retrieve data';
-
  @override
  String get neighbors_receivedData => 'Received Neighbors Data';

@@ -4282,17 +4096,6 @@ class AppLocalizationsEn extends AppLocalizations {
  String get translation_composerSubtitle =>
      'Controls the default state of the composer translation icon.';

-  @override
-  String get translation_autoIncomingTitle =>
-      'Auto-translate incoming messages';
-
-  @override
-  String get translation_autoIncomingSubtitle =>
-      'Translates Messages for notification and for chat or channel automatically.';
-
-  @override
-  String get translation_translateMessage => 'Translate message';
-
  @override
  String get translation_targetLanguage => 'Target language';

@@ -4418,135 +4221,4 @@ class AppLocalizationsEn extends AppLocalizations {

  @override
  String get contact_typeUnknown => 'Unknown';
-
-  @override
-  String get map_zoomIn => 'Zoom in';
-
-  @override
-  String get map_zoomOut => 'Zoom out';
-
-  @override
-  String get map_centerMap => 'Center map';
-
-  @override
-  String get chrome_bluetoothRequiresChromium =>
-      'Web Bluetooth requires a Chromium browser';
-
-  @override
-  String channels_communityShortId(String id) {
-    return 'ID: $id...';
-  }
-
-  @override
-  String get pathTrace_legendGpsConfirmed => 'GPS confirmed';
-
-  @override
-  String get pathTrace_legendInferred => 'Inferred position';
-
-  @override
-  String get pathMap_viewSingle => 'Single';
-
-  @override
-  String get pathMap_viewCombined => 'Combined';
-
-  @override
-  String get pathMap_play => 'Play';
-
-  @override
-  String get pathMap_pause => 'Pause';
-
-  @override
-  String get pathMap_replay => 'Replay';
-
-  @override
-  String get pathMap_stepBack => 'Previous hop';
-
-  @override
-  String get pathMap_stepForward => 'Next hop';
-
-  @override
-  String get pathMap_animationOn => 'Show packet animation';
-
-  @override
-  String get pathMap_animationOff => 'Hide packet animation';
-
-  @override
-  String pathMap_hopOf(int current, int total) {
-    return 'Hop $current of $total';
-  }
-
-  @override
-  String pathMap_observedPaths(int count) {
-    return 'Observed paths: $count';
-  }
-
-  @override
-  String get pathMap_primary => 'Primary';
-
-  @override
-  String pathMap_alternate(int index) {
-    return 'Alt $index';
-  }
-
-  @override
-  String pathMap_hopCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count hops',
-      one: '1 hop',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String pathMap_gpsCount(int confirmed, int total) {
-    return '$confirmed/$total GPS';
-  }
-
-  @override
-  String get pathMap_legendShared => 'Shared segment';
-
-  @override
-  String get pathMap_legendEstimated => 'Estimated segment';
-
-  @override
-  String pathMap_sharedNodeCount(int count) {
-    return 'Used by $count paths';
-  }
-
-  @override
-  String pathMap_partialAnimation(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count hops have no location — the shown path is partial',
-      one: '1 hop has no location — the shown path is partial',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get pathMap_showAllPaths => 'Show all';
-
-  @override
-  String get pathMap_hidePath => 'Hide path';
-
-  @override
-  String get pathMap_showPath => 'Show path';
-
-  @override
-  String get pathMap_collapsePanel => 'Collapse panel';
-
-  @override
-  String get pathMap_expandPanel => 'Expand panel';
-
-  @override
-  String get pathMap_noLocation => 'No location';
-
-  @override
-  String get pathMap_followPacket => 'Lock view to packet';
-
-  @override
-  String get pathMap_unfollowPacket => 'Unlock view from packet';
 }
@@ -92,24 +92,6 @@ class AppLocalizationsNl extends AppLocalizations {
  @override
  String get common_disable => 'Uitschakelen';

-  @override
-  String get common_undo => 'Achterhalen/Annuleren';
-
-  @override
-  String get messageStatus_sent => 'Verzonden';
-
-  @override
-  String get messageStatus_delivered => 'Leverd';
-
-  @override
-  String get messageStatus_pending => 'Verzenden';
-
-  @override
-  String get messageStatus_failed => 'Niet verzonden';
-
-  @override
-  String get messageStatus_repeated => 'Hearsay, herhaald';
-
  @override
  String get common_reboot => 'Herstarten';

@@ -129,12 +111,6 @@ class AppLocalizationsNl extends AppLocalizations {
    return '$percent%';
  }

-  @override
-  String get common_autoRefresh => 'Automatisch vernieuwen';
-
-  @override
-  String get common_interval => 'Tijdsinterval';
-
  @override
  String get scanner_title => 'MeshCore Open';

@@ -317,10 +293,6 @@ class AppLocalizationsNl extends AppLocalizations {
  @override
  String get scanner_enableBluetooth => 'Activeer Bluetooth';

-  @override
-  String get scanner_bluetoothWebUnsupported =>
-      'Bluetooth is niet beschikbaar in de browser. Verbind dan via USB.';
-
  @override
  String get device_quickSwitch => 'Snelle overschakeling';

@@ -808,6 +780,11 @@ class AppLocalizationsNl extends AppLocalizations {
  String get appSettings_maxMessageRetriesSubtitle =>
      'Aantal pogingen om een bericht opnieuw te versturen voordat het als mislukt wordt gemarkeerd';

+  @override
+  String path_routeWeight(String weight, String max) {
+    return '$weight/$max';
+  }
+
  @override
  String get appSettings_battery => 'Batterij';

@@ -1008,15 +985,6 @@ class AppLocalizationsNl extends AppLocalizations {
  @override
  String get contacts_newGroup => 'Nieuwe Groep';

-  @override
-  String get contacts_moreOptions => 'Meer opties';
-
-  @override
-  String get contacts_searchOpen => 'Zoek contactpersonen';
-
-  @override
-  String get contacts_searchClose => 'Zoeken';
-
  @override
  String get contacts_groupName => 'Groepnaam';

@@ -1494,6 +1462,34 @@ class AppLocalizationsNl extends AppLocalizations {
  @override
  String get debugFrame_hexDump => 'Hex-dump:';

+  @override
+  String get chat_pathManagement => 'Beheer van Paden';
+
+  @override
+  String get chat_ShowAllPaths => 'Toon alle paden';
+
+  @override
+  String get chat_routingMode => 'Routeerwijze';
+
+  @override
+  String get chat_autoUseSavedPath => 'Automatisch (gebruik opgeslagen pad)';
+
+  @override
+  String get chat_forceFloodMode => 'Dwing Floodsmodus';
+
+  @override
+  String get chat_recentAckPaths => 'Recente ACK Paden (tik om te gebruiken):';
+
+  @override
+  String get chat_pathHistoryFull =>
+      'De voorgeschiedenis is vol. Verwijder vermeldingen om er nieuwe aan toe te voegen.';
+
+  @override
+  String get chat_hopSingular => 'Hop';
+
+  @override
+  String get chat_hopPlural => 'hoppen';
+
  @override
  String chat_hopsCount(int count) {
    String _temp0 = intl.Intl.pluralLogic(
@@ -1505,6 +1501,12 @@ class AppLocalizationsNl extends AppLocalizations {
    return '$count $_temp0';
  }

+  @override
+  String get chat_successes => 'Succesvol';
+
+  @override
+  String get chat_score => 'Score';
+
  @override
  String get chat_removePath => 'Pad verwijderen';

@@ -1512,144 +1514,52 @@ class AppLocalizationsNl extends AppLocalizations {
  String get chat_noPathHistoryYet =>
      'Geen geschiedenis van paden nog beschikbaar.\nVerzend een bericht om paden te ontdekken.';

+  @override
+  String get chat_pathActions => 'Padacties:';
+
+  @override
+  String get chat_setCustomPath => 'Stel aangepaste pad in';
+
+  @override
+  String get chat_setCustomPathSubtitle => 'Handmatig routepad specificeren';
+
+  @override
+  String get chat_clearPath => 'Duidelijke Pad';
+
+  @override
+  String get chat_clearPathSubtitle =>
+      'Dwing herontdekking bij volgende verzending';
+
  @override
  String get chat_pathCleared =>
      'Pad is vrijgegeven. Volgende bericht herontdekt route.';

+  @override
+  String get chat_floodModeSubtitle =>
+      'Gebruik de route-schakelaar in de app-balk';
+
+  @override
+  String get chat_floodModeEnabled =>
+      'Floodmodus is ingeschakeld. Schakel dit uit via het route-icoon in de app-balk.';
+
  @override
  String get chat_fullPath => 'Volledige Pad';

  @override
-  String get routing_title => 'Routeplanning';
+  String get chat_pathDetailsNotAvailable =>
+      'De paddetails zijn nog niet beschikbaar. Probeer een bericht te sturen om te vernieuwen.';

  @override
-  String get routing_modeAuto => 'Auto';
-
-  @override
-  String get routing_modeFlood => 'Overstroming';
-
-  @override
-  String get routing_modeManual => 'Handleiding';
-
-  @override
-  String get routing_modeAutoHint =>
-      'Selecteert automatisch het bekendste pad, en gebruikt een flood-algoritme als er geen bekend pad is.';
-
-  @override
-  String get routing_modeFloodHint =>
-      'Uitzendingen via elke zender. De meest betrouwbare methode, maar vereist meer uitzendtijd.';
-
-  @override
-  String get routing_modeManualHint =>
-      'Stuurt altijd de exacte route die u heeft aangegeven.';
-
-  @override
-  String get routing_currentRoute => 'Huidige route';
-
-  @override
-  String get routing_directNoHops => 'Direct – zonder tussenliggende schakels';
-
-  @override
-  String get routing_noPathYet =>
-      'Er is nog geen route gevonden. De berichten blijven binnenkomen totdat een route is ontdekt.';
-
-  @override
-  String get routing_floodBroadcast => 'Uitgestoten via elke zender.';
-
-  @override
-  String get routing_editPath => 'Pad bewerken';
-
-  @override
-  String get routing_forgetPath => 'Vergeet het pad';
-
-  @override
-  String get routing_knownPaths => 'Bekende routes';
-
-  @override
-  String get routing_knownPathsHint => 'Maak een route om er naartoe te gaan.';
-
-  @override
-  String get routing_inUse => 'In gebruik';
-
-  @override
-  String get routing_qualityStrong => 'Sterke eerste sprong';
-
-  @override
-  String get routing_qualityGood => 'Een goede eerste stap';
-
-  @override
-  String get routing_qualityFair => 'Een goede eerste hop';
-
-  @override
-  String get routing_qualityWorked => 'Is geleverd';
-
-  @override
-  String get routing_qualityFlood => 'Hears via een overstroming';
-
-  @override
-  String get routing_qualityUntested => 'Niet getest';
-
-  @override
-  String routing_lastWorked(String when) {
-    return 'worked $when';
+  String chat_pathSetHops(int hopCount, String status) {
+    String _temp0 = intl.Intl.pluralLogic(
+      hopCount,
+      locale: localeName,
+      other: 'hops',
+      one: 'hop',
+    );
+    return 'Pad ingesteld: $hopCount $_temp0 - $status';
  }

-  @override
-  String get routing_neverWorked => 'nooit bevestigd';
-
-  @override
-  String routing_deliveryCounts(int successes, int failures) {
-    return '$successes zijn behaald, $failures zijn mislukt';
-  }
-
-  @override
-  String get routing_floodDelivery => 'Levering bij overstroming';
-
-  @override
-  String get pathEditor_title => 'Pad creëren';
-
-  @override
-  String pathEditor_hopCounter(int count) {
-    return '$count van 64 hopgranen';
-  }
-
-  @override
-  String get pathEditor_noHops =>
-      'Er zijn nog geen hop toegevoegd. Klik op de onderstaande knoppen om ze in de juiste volgorde toe te voegen, of sla de bestelling op zonder hop om deze direct te versturen.';
-
-  @override
-  String get pathEditor_addHops => 'Voeg hop toe in de juiste volgorde.';
-
-  @override
-  String get pathEditor_searchRepeaters => 'Zoek naar herhaaldelijke zenders';
-
-  @override
-  String get pathEditor_advancedHex => 'Geavanceerd: ruwe hex-pad';
-
-  @override
-  String get pathEditor_hexLabel => 'Hex-voorkanten';
-
-  @override
-  String get pathEditor_hexHelper =>
-      'Twee hex-tekens per stap, gescheiden door komma\'s';
-
-  @override
-  String pathEditor_invalidTokens(String tokens) {
-    return 'Ongeldig: $tokens';
-  }
-
-  @override
-  String get pathEditor_tooManyHops => 'Maximaal 64 hopken';
-
-  @override
-  String get pathEditor_usePath => 'Gebruik deze route.';
-
-  @override
-  String get pathEditor_removeHop => 'Verwijder de hop';
-
-  @override
-  String get pathEditor_unknownHop => 'Onbekend type zender';
-
  @override
  String get chat_pathSavedLocally =>
      'Opgeslagen lokaal. Verbinden om te synchroniseren.';
@@ -1725,39 +1635,6 @@ class AppLocalizationsNl extends AppLocalizations {
  @override
  String get map_title => 'Kaart van de knopen';

-  @override
-  String get map_searchHint => 'Zoek op naam of ID van de knoop';
-
-  @override
-  String get map_activity => 'Activiteit';
-
-  @override
-  String get map_online => 'Online';
-
-  @override
-  String get map_recent => 'Recent';
-
-  @override
-  String get map_stale => 'Verouderd';
-
-  @override
-  String get map_visible => 'Zichtbaar';
-
-  @override
-  String get map_hidden => 'Verborgen';
-
-  @override
-  String get map_centerOnNode => 'Centreer op node';
-
-  @override
-  String get map_details => 'Details';
-
-  @override
-  String get map_noGps => 'Geen GPS';
-
-  @override
-  String get map_noResults => 'Geen overeenkomende nodes';
-
  @override
  String get map_lineOfSight => 'Zichtlijn';

@@ -2086,6 +1963,17 @@ class AppLocalizationsNl extends AppLocalizations {
  String get dialog_disconnectConfirm =>
      'Ben je er zeker van dat je verbinding met dit apparaat wilt verbreken?';

+  @override
+  String get dialog_disconnectedTitle => 'Verbroken';
+
+  @override
+  String get dialog_disconnectedMessage =>
+      'Je bent losgekoppeld van je companion.';
+
+  @override
+  String get dialog_connectCompanion =>
+      'Maak verbinding met een companion om repeater- en kamerserverfuncties te gebruiken.';
+
  @override
  String get login_repeaterLogin => 'Inloggen Repeater';

@@ -2151,12 +2039,65 @@ class AppLocalizationsNl extends AppLocalizations {
  @override
  String get common_clear => 'Schoonmaken';

+  @override
+  String path_currentPath(String path) {
+    return 'Huidige pad: $path';
+  }
+
+  @override
+  String path_usingHopsPath(int count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other: 'hops',
+      one: 'hop',
+    );
+    return 'Gebruik $count $_temp0 pad';
+  }
+
+  @override
+  String get path_enterCustomPath => 'Voer aangepaste pad in';
+
  @override
  String get path_currentPathLabel => 'Huidige pad';

+  @override
+  String get path_hexPrefixInstructions =>
+      'Voer 2-letter hex-voorgiffen voor elke hop in, gescheiden door komma\'s.';
+
+  @override
+  String get path_hexPrefixExample =>
+      'Voorbeeld: A1,F2,3C (elke node gebruikt het eerste byte van zijn openbare sleutel)';
+
+  @override
+  String get path_labelHexPrefixes => 'Pad (hex-voorkeursletters)';
+
+  @override
+  String get path_helperMaxHops =>
+      'Maximaal 64 sprongen. Elke prefix is 2 hexadecimale tekens (1 byte)';
+
+  @override
+  String get path_selectFromContacts => 'Of select contacten:';
+
  @override
  String get path_noRepeatersFound => 'Geen repeaters of roomservers gevonden.';

+  @override
+  String get path_customPathsRequire =>
+      'Aangepaste paden vereisen tussentse overstappen die berichten kunnen doorgeven.';
+
+  @override
+  String path_invalidHexPrefixes(String prefixes) {
+    return 'Ongeldige hex-voorkeursletters: $prefixes';
+  }
+
+  @override
+  String get path_tooLong =>
+      'Pad is te lang. Maximaal 64 sprongen zijn toegestaan.';
+
+  @override
+  String get path_setPath => 'Stel Pad in';
+
  @override
  String get repeater_management => 'Beheer Repeaters';

@@ -2221,6 +2162,16 @@ class AppLocalizationsNl extends AppLocalizations {
  @override
  String get repeater_routingMode => 'Routeerwijze';

+  @override
+  String get repeater_autoUseSavedPath =>
+      'Automatisch (gebruik opgeslagen pad)';
+
+  @override
+  String get repeater_forceFloodMode => 'Dwing Floodmodus Af';
+
+  @override
+  String get repeater_pathManagement => 'Beheer van paden';
+
  @override
  String get repeater_refresh => 'Vernieuwen';

@@ -3316,139 +3267,6 @@ class AppLocalizationsNl extends AppLocalizations {
    return '$celsius°C / $fahrenheit°F';
  }

-  @override
-  String get telemetry_digitalInputLabel => 'Digitale ingang';
-
-  @override
-  String get telemetry_digitalOutputLabel => 'Digitale uitgang';
-
-  @override
-  String get telemetry_analogInputLabel => 'Analoge ingang';
-
-  @override
-  String get telemetry_analogOutputLabel => 'Analoge uitgang';
-
-  @override
-  String get telemetry_genericLabel => 'Algemene sensor';
-
-  @override
-  String get telemetry_luminosityLabel => 'Lichtsterkte';
-
-  @override
-  String get telemetry_presenceLabel => 'Aanwezigheid';
-
-  @override
-  String get telemetry_humidityLabel => 'Luchtvochtigheid';
-
-  @override
-  String get telemetry_accelerometerLabel => 'Versnellingsmeter';
-
-  @override
-  String get telemetry_pressureLabel => 'Druk';
-
-  @override
-  String get telemetry_altitudeLabel => 'Hoogte';
-
-  @override
-  String get telemetry_frequencyLabel => 'Frequentie';
-
-  @override
-  String get telemetry_percentageLabel => 'Percentage';
-
-  @override
-  String get telemetry_concentrationLabel => 'Concentratie';
-
-  @override
-  String get telemetry_powerLabel => 'Vermogen';
-
-  @override
-  String get telemetry_distanceLabel => 'Afstand';
-
-  @override
-  String get telemetry_energyLabel => 'Energie';
-
-  @override
-  String get telemetry_directionLabel => 'Richting';
-
-  @override
-  String get telemetry_timeLabel => 'Tijd';
-
-  @override
-  String get telemetry_gyrometerLabel => 'Gyrometer';
-
-  @override
-  String get telemetry_colourLabel => 'Kleur';
-
-  @override
-  String get telemetry_gpsLabel => 'GPS';
-
-  @override
-  String get telemetry_switchLabel => 'Schakelaar';
-
-  @override
-  String get telemetry_polylineLabel => 'Polylijn';
-
-  @override
-  String telemetry_altitudeValue(String meters) {
-    return '$meters m';
-  }
-
-  @override
-  String telemetry_frequencyValue(String hertz) {
-    return '$hertz Hz';
-  }
-
-  @override
-  String telemetry_pressureValue(String hpa) {
-    return '$hpa hPa';
-  }
-
-  @override
-  String telemetry_luminosityValue(String lux) {
-    return '$lux lx';
-  }
-
-  @override
-  String telemetry_powerValue(String watts) {
-    return '$watts W';
-  }
-
-  @override
-  String telemetry_distanceValue(String meters) {
-    return '$meters m';
-  }
-
-  @override
-  String telemetry_energyValue(String kilowattHours) {
-    return '$kilowattHours kWh';
-  }
-
-  @override
-  String telemetry_directionValue(String degrees) {
-    return '$degrees°';
-  }
-
-  @override
-  String telemetry_concentrationValue(String ppm) {
-    return '$ppm ppm';
-  }
-
-  @override
-  String telemetry_percentageValue(String percent) {
-    return '$percent%';
-  }
-
-  @override
-  String telemetry_analogValue(String value) {
-    return '$value';
-  }
-
-  @override
-  String get telemetry_autoFetchQuantity => 'Aantal aanvragen';
-
-  @override
-  String get telemetry_error => 'Kan gegevens niet ophalen';
-
  @override
  String get neighbors_receivedData => 'Ontvangen Buurdata';

@@ -4339,16 +4157,6 @@ class AppLocalizationsNl extends AppLocalizations {
  String get translation_composerSubtitle =>
      'Stelt de standaardstatus van het pictogram voor de vertaling van de componist in.';

-  @override
-  String get translation_autoIncomingTitle => 'Berichten automatisch vertalen';
-
-  @override
-  String get translation_autoIncomingSubtitle =>
-      'Vertaalt berichten automatisch voor meldingen en voor chats of kanalen.';
-
-  @override
-  String get translation_translateMessage => 'Bericht vertalen';
-
  @override
  String get translation_targetLanguage => 'Doeltaal';

@@ -4476,136 +4284,4 @@ class AppLocalizationsNl extends AppLocalizations {

  @override
  String get contact_typeUnknown => 'Unknown';
-
-  @override
-  String get map_zoomIn => 'Inzoomen';
-
-  @override
-  String get map_zoomOut => 'Inzoomen';
-
-  @override
-  String get map_centerMap => 'Centraal overzicht';
-
-  @override
-  String get chrome_bluetoothRequiresChromium =>
-      'Web Bluetooth vereist een Chromium-browser.';
-
-  @override
-  String channels_communityShortId(String id) {
-    return 'ID: $id...';
-  }
-
-  @override
-  String get pathTrace_legendGpsConfirmed => 'GPS-locatie bevestigd';
-
-  @override
-  String get pathTrace_legendInferred => 'Afgeleide positie';
-
-  @override
-  String get pathMap_viewSingle => 'Enkel';
-
-  @override
-  String get pathMap_viewCombined => 'Gezamenlijk';
-
-  @override
-  String get pathMap_play => 'Afspelen';
-
-  @override
-  String get pathMap_pause => 'Pauze';
-
-  @override
-  String get pathMap_replay => 'Herhalen';
-
-  @override
-  String get pathMap_stepBack => 'Vorige hop';
-
-  @override
-  String get pathMap_stepForward => 'Volgende hop';
-
-  @override
-  String get pathMap_animationOn => 'Pakketanimatie tonen';
-
-  @override
-  String get pathMap_animationOff => 'Pakketanimatie verbergen';
-
-  @override
-  String pathMap_hopOf(int current, int total) {
-    return 'Hop $current van $total';
-  }
-
-  @override
-  String pathMap_observedPaths(int count) {
-    return 'Waargenomen paden: $count';
-  }
-
-  @override
-  String get pathMap_primary => 'Primair';
-
-  @override
-  String pathMap_alternate(int index) {
-    return 'Alternatief $index';
-  }
-
-  @override
-  String pathMap_hopCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count hops',
-      one: '1 hop',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String pathMap_gpsCount(int confirmed, int total) {
-    return '$confirmed/$total GPS';
-  }
-
-  @override
-  String get pathMap_legendShared => 'Gedeeld segment';
-
-  @override
-  String get pathMap_legendEstimated => 'Geschat segment';
-
-  @override
-  String pathMap_sharedNodeCount(int count) {
-    return 'Gebruikt door $count paden';
-  }
-
-  @override
-  String pathMap_partialAnimation(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other:
-          '$count hops hebben geen locatie — het weergegeven pad is onvolledig',
-      one: '1 hop heeft geen locatie — het weergegeven pad is onvolledig',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get pathMap_showAllPaths => 'Toon alles';
-
-  @override
-  String get pathMap_hidePath => 'Verberg pad';
-
-  @override
-  String get pathMap_showPath => 'Toon pad';
-
-  @override
-  String get pathMap_collapsePanel => 'Paneel inklappen';
-
-  @override
-  String get pathMap_expandPanel => 'Paneel uitklappen';
-
-  @override
-  String get pathMap_noLocation => 'Geen locatie';
-
-  @override
-  String get pathMap_followPacket => 'Weergave vergrendelen op pakket';
-
-  @override
-  String get pathMap_unfollowPacket => 'Weergave ontgrendelen van pakket';
 }
@@ -92,24 +92,6 @@ class AppLocalizationsPl extends AppLocalizations {
  @override
  String get common_disable => 'Wyłącz';

-  @override
-  String get common_undo => 'Wycofaj';
-
-  @override
-  String get messageStatus_sent => 'Wysłane';
-
-  @override
-  String get messageStatus_delivered => 'Dostarczone';
-
-  @override
-  String get messageStatus_pending => 'Wysyłanie';
-
-  @override
-  String get messageStatus_failed => 'Nie udało się wysłać';
-
-  @override
-  String get messageStatus_repeated => 'Usłyszałem to wielokrotnie';
-
  @override
  String get common_reboot => 'Uruchom ponownie';

@@ -129,12 +111,6 @@ class AppLocalizationsPl extends AppLocalizations {
    return '$percent%';
  }

-  @override
-  String get common_autoRefresh => 'Automatyczne odświeżanie';
-
-  @override
-  String get common_interval => 'Interwał';
-
  @override
  String get scanner_title => 'MeshCore – wersja open source';

@@ -322,10 +298,6 @@ class AppLocalizationsPl extends AppLocalizations {
  @override
  String get scanner_enableBluetooth => 'Włącz Bluetooth';

-  @override
-  String get scanner_bluetoothWebUnsupported =>
-      'Bluetooth nie jest dostępny w przeglądarce. Połącz się przez USB.';
-
  @override
  String get device_quickSwitch => 'Szybka zmiana';

@@ -818,6 +790,11 @@ class AppLocalizationsPl extends AppLocalizations {
  String get appSettings_maxMessageRetriesSubtitle =>
      'Liczba prób ponownego wysłania wiadomości przed oznaczaniem jej jako nieudanej';

+  @override
+  String path_routeWeight(String weight, String max) {
+    return '$weight/$max';
+  }
+
  @override
  String get appSettings_battery => 'Bateria';

@@ -1026,15 +1003,6 @@ class AppLocalizationsPl extends AppLocalizations {
  @override
  String get contacts_newGroup => 'Nowa Grupa';

-  @override
-  String get contacts_moreOptions => 'Więcej opcji';
-
-  @override
-  String get contacts_searchOpen => 'Wyszukaj kontakty';
-
-  @override
-  String get contacts_searchClose => 'Zaawansowane wyszukiwanie';
-
  @override
  String get contacts_groupName => 'Nazwa grupy';

@@ -1517,6 +1485,35 @@ class AppLocalizationsPl extends AppLocalizations {
  @override
  String get debugFrame_hexDump => 'Zrzut hex:';

+  @override
+  String get chat_pathManagement => 'Zarządzanie ścieżkami';
+
+  @override
+  String get chat_ShowAllPaths => 'Pokaż wszystkie ścieżki';
+
+  @override
+  String get chat_routingMode => 'Tryb routingu';
+
+  @override
+  String get chat_autoUseSavedPath => 'Automatyczne (użyj zapisanej ścieżki)';
+
+  @override
+  String get chat_forceFloodMode => 'Wymuś tryb zalewowy';
+
+  @override
+  String get chat_recentAckPaths =>
+      'Ostatnie ścieżki ACK (naciśnij, aby użyć):';
+
+  @override
+  String get chat_pathHistoryFull =>
+      'Historia ścieżek jest pełna. Usuń wpisy, aby dodać nowe.';
+
+  @override
+  String get chat_hopSingular => 'skok';
+
+  @override
+  String get chat_hopPlural => 'skoki';
+
  @override
  String chat_hopsCount(int count) {
    String _temp0 = intl.Intl.pluralLogic(
@@ -1530,6 +1527,12 @@ class AppLocalizationsPl extends AppLocalizations {
    return '$count $_temp0';
  }

+  @override
+  String get chat_successes => 'Sukcesy';
+
+  @override
+  String get chat_score => 'Score';
+
  @override
  String get chat_removePath => 'Usuń ścieżkę';

@@ -1537,148 +1540,52 @@ class AppLocalizationsPl extends AppLocalizations {
  String get chat_noPathHistoryYet =>
      'Brak historii ścieżek.\nWyślij wiadomość, aby odkryć ścieżki.';

+  @override
+  String get chat_pathActions => 'Działania ścieżki:';
+
+  @override
+  String get chat_setCustomPath => 'Ustaw ścieżkę niestandardową';
+
+  @override
+  String get chat_setCustomPathSubtitle => 'Ręcznie określ trasę.';
+
+  @override
+  String get chat_clearPath => 'Wyczyść Ścieżkę';
+
+  @override
+  String get chat_clearPathSubtitle =>
+      'Wymuś ponowne wyznaczenie trasy przy następnym wysłaniu';
+
  @override
  String get chat_pathCleared =>
      'Ścieżka wyczyszczona. Następna wiadomość odnajdzie trasę.';

+  @override
+  String get chat_floodModeSubtitle =>
+      'Użyj przełącznika routingu w pasku narzędzi.';
+
+  @override
+  String get chat_floodModeEnabled =>
+      'Tryb zalewowy włączony. Przełącz z powrotem ikoną routingu w pasku aplikacji.';
+
  @override
  String get chat_fullPath => 'Pełna ścieżka';

  @override
-  String get routing_title => 'Planowanie tras';
+  String get chat_pathDetailsNotAvailable =>
+      'Szczegóły ścieżki jeszcze niedostępne. Spróbuj wysłać wiadomość, aby odświeżyć.';

  @override
-  String get routing_modeAuto => 'Samochód';
-
-  @override
-  String get routing_modeFlood => 'Powódź';
-
-  @override
-  String get routing_modeManual => 'Instrukcja obsługi';
-
-  @override
-  String get routing_modeAutoHint =>
-      'Automatycznie wybiera najpopularniejszą ścieżkę, a w przypadku braku znanej, przechodzi do trybu \"przepływu\".';
-
-  @override
-  String get routing_modeFloodHint =>
-      'Transmisje za pośrednictwem każdego repeatera. Najbardziej niezawodna metoda, ale zużywa więcej czasu transmisji.';
-
-  @override
-  String get routing_modeManualHint =>
-      'Zawsze prowadzi dokładnie po trasie, którą określiłeś.';
-
-  @override
-  String get routing_currentRoute => 'Obecna trasa';
-
-  @override
-  String get routing_directNoHops =>
-      'Bezpośrednio – bez pośrednictwa repeaterów';
-
-  @override
-  String get routing_noPathYet =>
-      'Na razie nie ma żadnej ścieżki. Komunikacja trwa do momentu, gdy zostanie odkryta trasa.';
-
-  @override
-  String get routing_floodBroadcast =>
-      'Transmisja za pośrednictwem każdego urządzenia powielającego';
-
-  @override
-  String get routing_editPath => 'Edytuj ścieżkę';
-
-  @override
-  String get routing_forgetPath => 'Zapomnij o ścieżce';
-
-  @override
-  String get routing_knownPaths => 'Znane trasy';
-
-  @override
-  String get routing_knownPathsHint =>
-      'Wybierz ścieżkę, aby przełączyć się na nią.';
-
-  @override
-  String get routing_inUse => 'W użyciu';
-
-  @override
-  String get routing_qualityStrong => 'Silny pierwszy skok';
-
-  @override
-  String get routing_qualityGood => 'Świetny początek';
-
-  @override
-  String get routing_qualityFair => 'Świetny pierwszy krzak';
-
-  @override
-  String get routing_qualityWorked => 'Zostało dostarczone';
-
-  @override
-  String get routing_qualityFlood => 'Usłyszano dzięki doniesieniom';
-
-  @override
-  String get routing_qualityUntested => 'Nieużywany';
-
-  @override
-  String routing_lastWorked(String when) {
-    return 'pracował $when';
+  String chat_pathSetHops(int hopCount, String status) {
+    String _temp0 = intl.Intl.pluralLogic(
+      hopCount,
+      locale: localeName,
+      other: 'hops',
+      one: 'hop',
+    );
+    return 'Ścieżka ustawiona: $hopCount $_temp0 - $status';
  }

-  @override
-  String get routing_neverWorked => 'nigdy nie zostało potwierdzone';
-
-  @override
-  String routing_deliveryCounts(int successes, int failures) {
-    return '$successes delivered, $failures failed';
-  }
-
-  @override
-  String get routing_floodDelivery => 'Dostawa w przypadku powodzi';
-
-  @override
-  String get pathEditor_title => 'Stworzenie ścieżki';
-
-  @override
-  String pathEditor_hopCounter(int count) {
-    return '$count z 64 rodzajów chmielu';
-  }
-
-  @override
-  String get pathEditor_noHops =>
-      'Na razie nie dodano żadnych chmielu. Aby dodać je w odpowiedniej kolejności, kliknij w odpowiednie przyciski poniżej, lub zapisz przepis bez chmielu, aby wysłać go bezpośrednio.';
-
-  @override
-  String get pathEditor_addHops => 'Dodawaj chmiel zgodnie z kolejnością.';
-
-  @override
-  String get pathEditor_searchRepeaters => 'Funkcje powtarzania';
-
-  @override
-  String get pathEditor_advancedHex =>
-      'Zaawansowane: ścieżka w formacie szesnastkowym';
-
-  @override
-  String get pathEditor_hexLabel => 'Prefiksy heksadecymalne';
-
-  @override
-  String get pathEditor_hexHelper =>
-      'Dwa znaki szesnastkowe na każdym kroku, oddzielone przecinkami';
-
-  @override
-  String pathEditor_invalidTokens(String tokens) {
-    return 'Nieprawidłowe: $tokens';
-  }
-
-  @override
-  String get pathEditor_tooManyHops => 'Maksymalnie 64 hopów';
-
-  @override
-  String get pathEditor_usePath => 'Użyj tej ścieżki.';
-
-  @override
-  String get pathEditor_removeHop => 'Usuń dziką psiankę';
-
-  @override
-  String get pathEditor_unknownHop => 'Nieznany repeater';
-
  @override
  String get chat_pathSavedLocally =>
      'Zapisano lokalnie. Połącz się, aby zsynchronizować.';
@@ -1754,39 +1661,6 @@ class AppLocalizationsPl extends AppLocalizations {
  @override
  String get map_title => 'Mapa węzłów';

-  @override
-  String get map_searchHint => 'Wyszukaj nazwę lub identyfikator węzła';
-
-  @override
-  String get map_activity => 'Aktywność';
-
-  @override
-  String get map_online => 'Online';
-
-  @override
-  String get map_recent => 'Ostatnie';
-
-  @override
-  String get map_stale => 'Nieaktualne';
-
-  @override
-  String get map_visible => 'Widoczny';
-
-  @override
-  String get map_hidden => 'Ukryty';
-
-  @override
-  String get map_centerOnNode => 'Wyśrodkuj na węźle';
-
-  @override
-  String get map_details => 'Szczegóły';
-
-  @override
-  String get map_noGps => 'Brak GPS';
-
-  @override
-  String get map_noResults => 'Brak pasujących węzłów';
-
  @override
  String get map_lineOfSight => 'Linia wzroku';

@@ -2116,6 +1990,17 @@ class AppLocalizationsPl extends AppLocalizations {
  String get dialog_disconnectConfirm =>
      'Czy na pewno chcesz się odłączyć od tego urządzenia?';

+  @override
+  String get dialog_disconnectedTitle => 'Rozłączono';
+
+  @override
+  String get dialog_disconnectedMessage =>
+      'Zostałeś rozłączony ze swoim towarzyszem.';
+
+  @override
+  String get dialog_connectCompanion =>
+      'Połącz się z towarzyszem, aby uzyskać dostęp do funkcji powtarzacza i serwera pokoi.';
+
  @override
  String get login_repeaterLogin => 'Logowanie do przekaźnika';

@@ -2181,13 +2066,68 @@ class AppLocalizationsPl extends AppLocalizations {
  @override
  String get common_clear => 'Wyczyść';

+  @override
+  String path_currentPath(String path) {
+    return 'Aktualna ścieżka: $path';
+  }
+
+  @override
+  String path_usingHopsPath(int count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other: 'skoków',
+      many: 'skoków',
+      few: 'skoki',
+      one: 'skok',
+    );
+    return 'Użyj ścieżki $count $_temp0.';
+  }
+
+  @override
+  String get path_enterCustomPath => 'Wprowadź własną ścieżkę';
+
  @override
  String get path_currentPathLabel => 'Aktualna ścieżka';

+  @override
+  String get path_hexPrefixInstructions =>
+      'Wprowadź 2-znakowe prefiksy szesnastkowe dla każdego skoku, oddzielone przecinkami.';
+
+  @override
+  String get path_hexPrefixExample =>
+      'A1,F2,3C (każdy węzeł używa pierwszego bajtu swojego klucza publicznego)';
+
+  @override
+  String get path_labelHexPrefixes => 'Ścieżka (prefiksy hex)';
+
+  @override
+  String get path_helperMaxHops =>
+      'Maksymalnie 64 skoki. Każdy prefiks ma 2 znaki szesnastkowe (1 bajt).';
+
+  @override
+  String get path_selectFromContacts => 'Albo wybierz z kontaktów:';
+
  @override
  String get path_noRepeatersFound =>
      'Nie znaleziono przekaźników ani serwerów pokoi.';

+  @override
+  String get path_customPathsRequire =>
+      'Dostosowane ścieżki wymagają pośrednich skoków, które mogą przekazywać wiadomości.';
+
+  @override
+  String path_invalidHexPrefixes(String prefixes) {
+    return 'Nieprawidłowe prefiksy szesnastkowe: $prefixes';
+  }
+
+  @override
+  String get path_tooLong =>
+      'Ścieżka jest zbyt długa. Dozwolonych skoków wynosi 64.';
+
+  @override
+  String get path_setPath => 'Ustaw Ścieżkę';
+
  @override
  String get repeater_management => 'Zarządzanie przekaźnikami';

@@ -2252,6 +2192,16 @@ class AppLocalizationsPl extends AppLocalizations {
  @override
  String get repeater_routingMode => 'Tryb routingu';

+  @override
+  String get repeater_autoUseSavedPath =>
+      'Automatycznie (użyj zapisanej ścieżki)';
+
+  @override
+  String get repeater_forceFloodMode => 'Wymuś tryb zalewowy';
+
+  @override
+  String get repeater_pathManagement => 'Zarządzanie ścieżkami';
+
  @override
  String get repeater_refresh => 'Odśwież';

@@ -3349,139 +3299,6 @@ class AppLocalizationsPl extends AppLocalizations {
    return '$celsius°C / $fahrenheit°F';
  }

-  @override
-  String get telemetry_digitalInputLabel => 'Wejście cyfrowe';
-
-  @override
-  String get telemetry_digitalOutputLabel => 'Wyjście cyfrowe';
-
-  @override
-  String get telemetry_analogInputLabel => 'Wejście analogowe';
-
-  @override
-  String get telemetry_analogOutputLabel => 'Wyjście analogowe';
-
-  @override
-  String get telemetry_genericLabel => 'Czujnik ogólny';
-
-  @override
-  String get telemetry_luminosityLabel => 'Jasność';
-
-  @override
-  String get telemetry_presenceLabel => 'Obecność';
-
-  @override
-  String get telemetry_humidityLabel => 'Wilgotność';
-
-  @override
-  String get telemetry_accelerometerLabel => 'Akcelerometr';
-
-  @override
-  String get telemetry_pressureLabel => 'Ciśnienie';
-
-  @override
-  String get telemetry_altitudeLabel => 'Wysokość';
-
-  @override
-  String get telemetry_frequencyLabel => 'Częstotliwość';
-
-  @override
-  String get telemetry_percentageLabel => 'Procent';
-
-  @override
-  String get telemetry_concentrationLabel => 'Stężenie';
-
-  @override
-  String get telemetry_powerLabel => 'Moc';
-
-  @override
-  String get telemetry_distanceLabel => 'Odległość';
-
-  @override
-  String get telemetry_energyLabel => 'Energia';
-
-  @override
-  String get telemetry_directionLabel => 'Kierunek';
-
-  @override
-  String get telemetry_timeLabel => 'Czas';
-
-  @override
-  String get telemetry_gyrometerLabel => 'Żyrometr';
-
-  @override
-  String get telemetry_colourLabel => 'Kolor';
-
-  @override
-  String get telemetry_gpsLabel => 'GPS';
-
-  @override
-  String get telemetry_switchLabel => 'Przełącznik';
-
-  @override
-  String get telemetry_polylineLabel => 'Polilinia';
-
-  @override
-  String telemetry_altitudeValue(String meters) {
-    return '$meters m';
-  }
-
-  @override
-  String telemetry_frequencyValue(String hertz) {
-    return '$hertz Hz';
-  }
-
-  @override
-  String telemetry_pressureValue(String hpa) {
-    return '$hpa hPa';
-  }
-
-  @override
-  String telemetry_luminosityValue(String lux) {
-    return '$lux lx';
-  }
-
-  @override
-  String telemetry_powerValue(String watts) {
-    return '$watts W';
-  }
-
-  @override
-  String telemetry_distanceValue(String meters) {
-    return '$meters m';
-  }
-
-  @override
-  String telemetry_energyValue(String kilowattHours) {
-    return '$kilowattHours kWh';
-  }
-
-  @override
-  String telemetry_directionValue(String degrees) {
-    return '$degrees°';
-  }
-
-  @override
-  String telemetry_concentrationValue(String ppm) {
-    return '$ppm ppm';
-  }
-
-  @override
-  String telemetry_percentageValue(String percent) {
-    return '$percent%';
-  }
-
-  @override
-  String telemetry_analogValue(String value) {
-    return '$value';
-  }
-
-  @override
-  String get telemetry_autoFetchQuantity => 'Liczba żądań';
-
-  @override
-  String get telemetry_error => 'Nie udało się pobrać danych';
-
  @override
  String get neighbors_receivedData => 'Otrzymano dane sąsiedztwa';

@@ -4378,17 +4195,6 @@ class AppLocalizationsPl extends AppLocalizations {
  String get translation_composerSubtitle =>
      'Kontroluje domyślny stan ikony tłumaczenia w edytorze.';

-  @override
-  String get translation_autoIncomingTitle =>
-      'Automatycznie tłumacz wiadomości';
-
-  @override
-  String get translation_autoIncomingSubtitle =>
-      'Automatycznie tłumaczy wiadomości do powiadomień oraz do czatów lub kanałów.';
-
-  @override
-  String get translation_translateMessage => 'Przetłumacz wiadomość';
-
  @override
  String get translation_targetLanguage => 'Język docelowy';

@@ -4514,142 +4320,4 @@ class AppLocalizationsPl extends AppLocalizations {

  @override
  String get contact_typeUnknown => 'Unknown';
-
-  @override
-  String get map_zoomIn => 'Przybliż';
-
-  @override
-  String get map_zoomOut => 'Przybliż z powrotem';
-
-  @override
-  String get map_centerMap => 'Mapa centrum';
-
-  @override
-  String get chrome_bluetoothRequiresChromium =>
-      'Web Bluetooth wymaga przeglądarki Chromium.';
-
-  @override
-  String channels_communityShortId(String id) {
-    return 'ID: $id...';
-  }
-
-  @override
-  String get pathTrace_legendGpsConfirmed => 'GPS potwierdzone';
-
-  @override
-  String get pathTrace_legendInferred => 'Wywnioskowana pozycja';
-
-  @override
-  String get pathMap_viewSingle => 'Pojedyncza';
-
-  @override
-  String get pathMap_viewCombined => 'Połączone';
-
-  @override
-  String get pathMap_play => 'Odtwórz';
-
-  @override
-  String get pathMap_pause => 'Wstrzymaj';
-
-  @override
-  String get pathMap_replay => 'Odtwórz ponownie';
-
-  @override
-  String get pathMap_stepBack => 'Poprzedni skok';
-
-  @override
-  String get pathMap_stepForward => 'Następny skok';
-
-  @override
-  String get pathMap_animationOn => 'Pokaż animację pakietu';
-
-  @override
-  String get pathMap_animationOff => 'Ukryj animację pakietu';
-
-  @override
-  String pathMap_hopOf(int current, int total) {
-    return 'Skok $current z $total';
-  }
-
-  @override
-  String pathMap_observedPaths(int count) {
-    return 'Obserwowane trasy: $count';
-  }
-
-  @override
-  String get pathMap_primary => 'Główna';
-
-  @override
-  String pathMap_alternate(int index) {
-    return 'Alt. $index';
-  }
-
-  @override
-  String pathMap_hopCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count skoku',
-      many: '$count skoków',
-      few: '$count skoki',
-      one: '1 skok',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String pathMap_gpsCount(int confirmed, int total) {
-    return '$confirmed/$total GPS';
-  }
-
-  @override
-  String get pathMap_legendShared => 'Wspólny segment';
-
-  @override
-  String get pathMap_legendEstimated => 'Szacunkowy segment';
-
-  @override
-  String pathMap_sharedNodeCount(int count) {
-    return 'Wykorzystywane przez $count ścieżek';
-  }
-
-  @override
-  String pathMap_partialAnimation(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other:
-          '$count skoku nie ma lokalizacji — pokazana ścieżka jest niekompletna',
-      many:
-          '$count skoków nie ma lokalizacji — pokazana ścieżka jest niekompletna',
-      few:
-          '$count skoki nie mają lokalizacji — pokazana ścieżka jest niekompletna',
-      one: '1 skok nie ma lokalizacji — pokazana ścieżka jest niekompletna',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get pathMap_showAllPaths => 'Pokaż wszystkie';
-
-  @override
-  String get pathMap_hidePath => 'Ukryj ścieżkę';
-
-  @override
-  String get pathMap_showPath => 'Wyświetl trasę';
-
-  @override
-  String get pathMap_collapsePanel => 'Zwiń panel';
-
-  @override
-  String get pathMap_expandPanel => 'Rozwiń panel';
-
-  @override
-  String get pathMap_noLocation => 'Brak lokalizacji';
-
-  @override
-  String get pathMap_followPacket => 'Śledź pakiet';
-
-  @override
-  String get pathMap_unfollowPacket => 'Przestań śledzić pakiet';
 }
@@ -92,24 +92,6 @@ class AppLocalizationsPt extends AppLocalizations {
  @override
  String get common_disable => 'Desativar';

-  @override
-  String get common_undo => 'Desfazer';
-
-  @override
-  String get messageStatus_sent => 'Enviado';
-
-  @override
-  String get messageStatus_delivered => 'Entregue';
-
-  @override
-  String get messageStatus_pending => 'Enviar';
-
-  @override
-  String get messageStatus_failed => 'Falhou ao enviar';
-
-  @override
-  String get messageStatus_repeated => 'Ouvi repetidamente';
-
  @override
  String get common_reboot => 'Reiniciar';

@@ -129,12 +111,6 @@ class AppLocalizationsPt extends AppLocalizations {
    return '$percent%';
  }

-  @override
-  String get common_autoRefresh => 'Atualização automática';
-
-  @override
-  String get common_interval => 'Intervalo';
-
  @override
  String get scanner_title => 'MeshCore: Versão aberta';

@@ -320,10 +296,6 @@ class AppLocalizationsPt extends AppLocalizations {
  @override
  String get scanner_enableBluetooth => 'Ative o Bluetooth';

-  @override
-  String get scanner_bluetoothWebUnsupported =>
-      'A funcionalidade Bluetooth não está disponível no navegador. Conecte-se via USB em vez disso.';
-
  @override
  String get device_quickSwitch => 'Mudar rapidamente';

@@ -815,6 +787,11 @@ class AppLocalizationsPt extends AppLocalizations {
  String get appSettings_maxMessageRetriesSubtitle =>
      'Número de tentativas de reenvio antes de classificar uma mensagem como falha.';

+  @override
+  String path_routeWeight(String weight, String max) {
+    return '$weight/$max';
+  }
+
  @override
  String get appSettings_battery => 'Bateria';

@@ -1016,15 +993,6 @@ class AppLocalizationsPt extends AppLocalizations {
  @override
  String get contacts_newGroup => 'Novo Grupo';

-  @override
-  String get contacts_moreOptions => 'Mais opções';
-
-  @override
-  String get contacts_searchOpen => 'Pesquisar contatos';
-
-  @override
-  String get contacts_searchClose => 'Pesquisa avançada';
-
  @override
  String get contacts_groupName => 'Nome do grupo';

@@ -1504,6 +1472,34 @@ class AppLocalizationsPt extends AppLocalizations {
  @override
  String get debugFrame_hexDump => 'Espaço Hexadecimal:';

+  @override
+  String get chat_pathManagement => 'Gerenciamento de Caminhos';
+
+  @override
+  String get chat_ShowAllPaths => 'Mostrar todos os caminhos';
+
+  @override
+  String get chat_routingMode => 'Modo de roteamento';
+
+  @override
+  String get chat_autoUseSavedPath => 'Auto (usar caminho salvo)';
+
+  @override
+  String get chat_forceFloodMode => 'Modo de Inundação Forçado';
+
+  @override
+  String get chat_recentAckPaths => 'Rotas de ACK Recentes (toque para usar):';
+
+  @override
+  String get chat_pathHistoryFull =>
+      'O histórico está cheio. Remova entradas para adicionar novas.';
+
+  @override
+  String get chat_hopSingular => 'pule';
+
+  @override
+  String get chat_hopPlural => 'salta';
+
  @override
  String chat_hopsCount(int count) {
    String _temp0 = intl.Intl.pluralLogic(
@@ -1515,6 +1511,12 @@ class AppLocalizationsPt extends AppLocalizations {
    return '$count $_temp0';
  }

+  @override
+  String get chat_successes => 'Sucessos';
+
+  @override
+  String get chat_score => 'Score';
+
  @override
  String get chat_removePath => 'Remover caminho';

@@ -1522,148 +1524,53 @@ class AppLocalizationsPt extends AppLocalizations {
  String get chat_noPathHistoryYet =>
      'Ainda não há histórico de caminhos.\nEnvie uma mensagem para descobrir caminhos.';

+  @override
+  String get chat_pathActions => 'Ações do Caminho:';
+
+  @override
+  String get chat_setCustomPath => 'Definir Caminho Personalizado';
+
+  @override
+  String get chat_setCustomPathSubtitle =>
+      'Especifique manualmente o caminho de roteamento';
+
+  @override
+  String get chat_clearPath => 'Limpar Caminho';
+
+  @override
+  String get chat_clearPathSubtitle =>
+      'Forçar a descoberta na próxima transmissão';
+
  @override
  String get chat_pathCleared =>
      'Caminho limpo. A próxima mensagem redescobrirá a rota.';

+  @override
+  String get chat_floodModeSubtitle =>
+      'Use a chave de roteamento na barra de ferramentas';
+
+  @override
+  String get chat_floodModeEnabled =>
+      'Modo de inundação ativado. Desative-o novamente através do ícone de roteamento na barra de ferramentas.';
+
  @override
  String get chat_fullPath => 'Caminho Completo';

  @override
-  String get routing_title => 'Rotas';
+  String get chat_pathDetailsNotAvailable =>
+      'Os detalhes do caminho ainda não estão disponíveis. Tente enviar uma mensagem para atualizar.';

  @override
-  String get routing_modeAuto => 'Carro';
-
-  @override
-  String get routing_modeFlood => 'Inundação';
-
-  @override
-  String get routing_modeManual => 'Manual';
-
-  @override
-  String get routing_modeAutoHint =>
-      'Seleciona automaticamente o caminho mais conhecido, e, se nenhum caminho conhecido for encontrado, utiliza a estratégia de \"inundação\".';
-
-  @override
-  String get routing_modeFloodHint =>
-      'Transmissão através de todos os repetidores. É a opção mais confiável, mas utiliza mais tempo de transmissão.';
-
-  @override
-  String get routing_modeManualHint =>
-      'Sempre segue exatamente o caminho que você define.';
-
-  @override
-  String get routing_currentRoute => 'Rota atual';
-
-  @override
-  String get routing_directNoHops => 'Direto – sem saltos de repetidor';
-
-  @override
-  String get routing_noPathYet =>
-      'Ainda não há um caminho definido. A mensagem continua a ser enviada até que uma rota seja encontrada.';
-
-  @override
-  String get routing_floodBroadcast =>
-      'Transmissão através de todos os repetidores';
-
-  @override
-  String get routing_editPath => 'Editar caminho';
-
-  @override
-  String get routing_forgetPath => 'Esqueça o caminho';
-
-  @override
-  String get routing_knownPaths => 'Rotas conhecidas';
-
-  @override
-  String get routing_knownPathsHint =>
-      'Toque em um caminho para alternar para ele.';
-
-  @override
-  String get routing_inUse => 'Em uso';
-
-  @override
-  String get routing_qualityStrong => 'Primeiro salto notável';
-
-  @override
-  String get routing_qualityGood => 'Primeiro salto bem-sucedido';
-
-  @override
-  String get routing_qualityFair => 'Primeira etapa bem-sucedida';
-
-  @override
-  String get routing_qualityWorked => 'Foi entregue';
-
-  @override
-  String get routing_qualityFlood =>
-      'Informação obtida através de relatos generalizados.';
-
-  @override
-  String get routing_qualityUntested => 'Não testado';
-
-  @override
-  String routing_lastWorked(String when) {
-    return 'worked $when';
+  String chat_pathSetHops(int hopCount, String status) {
+    String _temp0 = intl.Intl.pluralLogic(
+      hopCount,
+      locale: localeName,
+      other: 'hops',
+      one: 'hop',
+    );
+    return 'Caminho definido: $hopCount $_temp0 - $status';
  }

-  @override
-  String get routing_neverWorked => 'nunca confirmado';
-
-  @override
-  String routing_deliveryCounts(int successes, int failures) {
-    return '$successes delivered, $failures failed';
-  }
-
-  @override
-  String get routing_floodDelivery =>
-      'Entrega em áreas afetadas por inundações';
-
-  @override
-  String get pathEditor_title => 'Criar Caminho';
-
-  @override
-  String pathEditor_hopCounter(int count) {
-    return '$count de 64 gramas de lúpulo';
-  }
-
-  @override
-  String get pathEditor_noHops =>
-      'Ainda não há lúpulos adicionados. Clique nos repetidores abaixo para adicioná-los na ordem desejada, ou salve sem adicionar lúpulos para enviar diretamente.';
-
-  @override
-  String get pathEditor_addHops => 'Adicione os lúpulos na seguinte ordem.';
-
-  @override
-  String get pathEditor_searchRepeaters => 'Encontrar repetidores';
-
-  @override
-  String get pathEditor_advancedHex => 'Avançado: caminho hexadecimal bruto';
-
-  @override
-  String get pathEditor_hexLabel => 'Prefixos hexadecimais';
-
-  @override
-  String get pathEditor_hexHelper =>
-      'Dois caracteres hexadecimais por salto, separados por vírgulas.';
-
-  @override
-  String pathEditor_invalidTokens(String tokens) {
-    return 'Inválido: $tokens';
-  }
-
-  @override
-  String get pathEditor_tooManyHops => 'Máximo de 64 saltos';
-
-  @override
-  String get pathEditor_usePath => 'Utilize este caminho.';
-
-  @override
-  String get pathEditor_removeHop => 'Remova o lúpulo';
-
-  @override
-  String get pathEditor_unknownHop => 'Repetidor desconhecido';
-
  @override
  String get chat_pathSavedLocally =>
      'Salvo localmente. Conectar para sincronizar.';
@@ -1738,39 +1645,6 @@ class AppLocalizationsPt extends AppLocalizations {
  @override
  String get map_title => 'Mapa de Nós';

-  @override
-  String get map_searchHint => 'Pesquisar por nome ou ID do nó';
-
-  @override
-  String get map_activity => 'Atividade';
-
-  @override
-  String get map_online => 'Online';
-
-  @override
-  String get map_recent => 'Recente';
-
-  @override
-  String get map_stale => 'Vencido';
-
-  @override
-  String get map_visible => 'Visível';
-
-  @override
-  String get map_hidden => 'Escondido';
-
-  @override
-  String get map_centerOnNode => 'Centralizar no nó';
-
-  @override
-  String get map_details => 'Detalhes';
-
-  @override
-  String get map_noGps => 'Sem GPS';
-
-  @override
-  String get map_noResults => 'Nenhum nó encontrado';
-
  @override
  String get map_lineOfSight => 'Linha de visão';

@@ -2099,6 +1973,17 @@ class AppLocalizationsPt extends AppLocalizations {
  String get dialog_disconnectConfirm =>
      'Tem certeza de que deseja desconectar deste dispositivo?';

+  @override
+  String get dialog_disconnectedTitle => 'Desconectado';
+
+  @override
+  String get dialog_disconnectedMessage =>
+      'Você foi desconectado do seu companheiro.';
+
+  @override
+  String get dialog_connectCompanion =>
+      'Conecte-se a um dispositivo companion para acessar as funcionalidades de repetidor e servidor de salas.';
+
  @override
  String get login_repeaterLogin => 'Login ao Repetidor';

@@ -2164,13 +2049,66 @@ class AppLocalizationsPt extends AppLocalizations {
  @override
  String get common_clear => 'Limpar';

+  @override
+  String path_currentPath(String path) {
+    return 'Caminho atual: $path';
+  }
+
+  @override
+  String path_usingHopsPath(int count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other: 'hops',
+      one: 'hop',
+    );
+    return 'Usando $count $_temp0 caminho';
+  }
+
+  @override
+  String get path_enterCustomPath => 'Insira Caminho Personalizado';
+
  @override
  String get path_currentPathLabel => 'Caminho atual';

+  @override
+  String get path_hexPrefixInstructions =>
+      'Insira os prefixos hexadecimais de 2 caracteres para cada salto, separados por vírgulas.';
+
+  @override
+  String get path_hexPrefixExample =>
+      'A1,F2,3C (cada nó usa o primeiro byte de sua chave pública)';
+
+  @override
+  String get path_labelHexPrefixes => 'Prefixo Hexadecimal';
+
+  @override
+  String get path_helperMaxHops =>
+      'Máximo de 64 saltos. Cada prefixo tem 2 caracteres hexadecimais (1 byte)';
+
+  @override
+  String get path_selectFromContacts => 'Ou selecione de contatos:';
+
  @override
  String get path_noRepeatersFound =>
      'Não foram encontrados repetidores ou servidores de sala.';

+  @override
+  String get path_customPathsRequire =>
+      'Caminhos personalizados exigem saltos intermediários que podem transmitir mensagens.';
+
+  @override
+  String path_invalidHexPrefixes(String prefixes) {
+    return 'Prefixos hexadecimais inválidos: $prefixes';
+  }
+
+  @override
+  String get path_tooLong =>
+      'Caminho muito longo. Máximo de 64 saltos permitidos.';
+
+  @override
+  String get path_setPath => 'Definir Caminho';
+
  @override
  String get repeater_management => 'Gerenciamento de Repetidor';

@@ -2235,6 +2173,15 @@ class AppLocalizationsPt extends AppLocalizations {
  @override
  String get repeater_routingMode => 'Modo de roteamento';

+  @override
+  String get repeater_autoUseSavedPath => 'Auto (usar caminho salvo)';
+
+  @override
+  String get repeater_forceFloodMode => 'Modo de Inundação Forçado';
+
+  @override
+  String get repeater_pathManagement => 'Gerenciamento de caminhos';
+
  @override
  String get repeater_refresh => 'Atualizar';

@@ -3333,139 +3280,6 @@ class AppLocalizationsPt extends AppLocalizations {
    return '$celsius°C / $fahrenheit°F';
  }

-  @override
-  String get telemetry_digitalInputLabel => 'Entrada digital';
-
-  @override
-  String get telemetry_digitalOutputLabel => 'Saída digital';
-
-  @override
-  String get telemetry_analogInputLabel => 'Entrada analógica';
-
-  @override
-  String get telemetry_analogOutputLabel => 'Saída analógica';
-
-  @override
-  String get telemetry_genericLabel => 'Sensor genérico';
-
-  @override
-  String get telemetry_luminosityLabel => 'Luminosidade';
-
-  @override
-  String get telemetry_presenceLabel => 'Presença';
-
-  @override
-  String get telemetry_humidityLabel => 'Humidade';
-
-  @override
-  String get telemetry_accelerometerLabel => 'Acelerómetro';
-
-  @override
-  String get telemetry_pressureLabel => 'Pressão';
-
-  @override
-  String get telemetry_altitudeLabel => 'Altitude';
-
-  @override
-  String get telemetry_frequencyLabel => 'Frequência';
-
-  @override
-  String get telemetry_percentageLabel => 'Percentagem';
-
-  @override
-  String get telemetry_concentrationLabel => 'Concentração';
-
-  @override
-  String get telemetry_powerLabel => 'Potência';
-
-  @override
-  String get telemetry_distanceLabel => 'Distância';
-
-  @override
-  String get telemetry_energyLabel => 'Energia';
-
-  @override
-  String get telemetry_directionLabel => 'Direção';
-
-  @override
-  String get telemetry_timeLabel => 'Hora';
-
-  @override
-  String get telemetry_gyrometerLabel => 'Girómetro';
-
-  @override
-  String get telemetry_colourLabel => 'Cor';
-
-  @override
-  String get telemetry_gpsLabel => 'GPS';
-
-  @override
-  String get telemetry_switchLabel => 'Interruptor';
-
-  @override
-  String get telemetry_polylineLabel => 'Polilinha';
-
-  @override
-  String telemetry_altitudeValue(String meters) {
-    return '$meters m';
-  }
-
-  @override
-  String telemetry_frequencyValue(String hertz) {
-    return '$hertz Hz';
-  }
-
-  @override
-  String telemetry_pressureValue(String hpa) {
-    return '$hpa hPa';
-  }
-
-  @override
-  String telemetry_luminosityValue(String lux) {
-    return '$lux lx';
-  }
-
-  @override
-  String telemetry_powerValue(String watts) {
-    return '$watts W';
-  }
-
-  @override
-  String telemetry_distanceValue(String meters) {
-    return '$meters m';
-  }
-
-  @override
-  String telemetry_energyValue(String kilowattHours) {
-    return '$kilowattHours kWh';
-  }
-
-  @override
-  String telemetry_directionValue(String degrees) {
-    return '$degrees°';
-  }
-
-  @override
-  String telemetry_concentrationValue(String ppm) {
-    return '$ppm ppm';
-  }
-
-  @override
-  String telemetry_percentageValue(String percent) {
-    return '$percent%';
-  }
-
-  @override
-  String telemetry_analogValue(String value) {
-    return '$value';
-  }
-
-  @override
-  String get telemetry_autoFetchQuantity => 'Número de solicitações';
-
-  @override
-  String get telemetry_error => 'Não foi possível obter os dados';
-
  @override
  String get neighbors_receivedData => 'Dados dos Vizinhos Recebidos';

@@ -4356,17 +4170,6 @@ class AppLocalizationsPt extends AppLocalizations {
  String get translation_composerSubtitle =>
      'Controla o estado padrão do ícone de tradução do compositor.';

-  @override
-  String get translation_autoIncomingTitle =>
-      'Traduzir mensagens automaticamente';
-
-  @override
-  String get translation_autoIncomingSubtitle =>
-      'Traduz automaticamente mensagens para notificações e para chats ou canais.';
-
-  @override
-  String get translation_translateMessage => 'Traduzir mensagem';
-
  @override
  String get translation_targetLanguage => 'Língua-alvo';

@@ -4493,135 +4296,4 @@ class AppLocalizationsPt extends AppLocalizations {

  @override
  String get contact_typeUnknown => 'Unknown';
-
-  @override
-  String get map_zoomIn => 'Ampliar';
-
-  @override
-  String get map_zoomOut => 'Ampliar';
-
-  @override
-  String get map_centerMap => 'Mapa do centro';
-
-  @override
-  String get chrome_bluetoothRequiresChromium =>
-      'O Web Bluetooth requer um navegador Chromium.';
-
-  @override
-  String channels_communityShortId(String id) {
-    return 'ID: $id...';
-  }
-
-  @override
-  String get pathTrace_legendGpsConfirmed => 'GPS confirmado';
-
-  @override
-  String get pathTrace_legendInferred => 'Posição inferida';
-
-  @override
-  String get pathMap_viewSingle => 'Único';
-
-  @override
-  String get pathMap_viewCombined => 'Combinado';
-
-  @override
-  String get pathMap_play => 'Reproduzir';
-
-  @override
-  String get pathMap_pause => 'Pausa';
-
-  @override
-  String get pathMap_replay => 'Repetir';
-
-  @override
-  String get pathMap_stepBack => 'Salto anterior';
-
-  @override
-  String get pathMap_stepForward => 'Próximo salto';
-
-  @override
-  String get pathMap_animationOn => 'Exibir animação do pacote';
-
-  @override
-  String get pathMap_animationOff => 'Ocultar a animação do pacote';
-
-  @override
-  String pathMap_hopOf(int current, int total) {
-    return 'Salto $current de $total';
-  }
-
-  @override
-  String pathMap_observedPaths(int count) {
-    return 'Caminhos observados: $count';
-  }
-
-  @override
-  String get pathMap_primary => 'Primário';
-
-  @override
-  String pathMap_alternate(int index) {
-    return 'Alt $index';
-  }
-
-  @override
-  String pathMap_hopCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count saltos',
-      one: '1 salto',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String pathMap_gpsCount(int confirmed, int total) {
-    return '$confirmed/$total GPS';
-  }
-
-  @override
-  String get pathMap_legendShared => 'Segmento compartilhado';
-
-  @override
-  String get pathMap_legendEstimated => 'Segmento estimado';
-
-  @override
-  String pathMap_sharedNodeCount(int count) {
-    return 'Utilizado em $count caminhos';
-  }
-
-  @override
-  String pathMap_partialAnimation(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count saltos não têm localização — o caminho mostrado é parcial',
-      one: '1 salto não tem localização — o caminho mostrado é parcial',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get pathMap_showAllPaths => 'Mostrar tudo';
-
-  @override
-  String get pathMap_hidePath => 'Esconder caminho';
-
-  @override
-  String get pathMap_showPath => 'Mostrar o caminho';
-
-  @override
-  String get pathMap_collapsePanel => 'Recolher painel';
-
-  @override
-  String get pathMap_expandPanel => 'Expandir painel';
-
-  @override
-  String get pathMap_noLocation => 'Sem localização';
-
-  @override
-  String get pathMap_followPacket => 'Fixar vista no pacote';
-
-  @override
-  String get pathMap_unfollowPacket => 'Liberar vista do pacote';
 }
@@ -92,24 +92,6 @@ class AppLocalizationsRu extends AppLocalizations {
  @override
  String get common_disable => 'Выключить';

-  @override
-  String get common_undo => 'Отменить';
-
-  @override
-  String get messageStatus_sent => 'Отправлено';
-
-  @override
-  String get messageStatus_delivered => 'Доставлено';
-
-  @override
-  String get messageStatus_pending => 'Отправка';
-
-  @override
-  String get messageStatus_failed => 'Не удалось отправить';
-
-  @override
-  String get messageStatus_repeated => 'Услышал несколько раз';
-
  @override
  String get common_reboot => 'Перезагрузить';

@@ -129,12 +111,6 @@ class AppLocalizationsRu extends AppLocalizations {
    return '$percent%';
  }

-  @override
-  String get common_autoRefresh => 'Автообновление';
-
-  @override
-  String get common_interval => 'Интервал';
-
  @override
  String get scanner_title => 'MeshCore Open';

@@ -320,10 +296,6 @@ class AppLocalizationsRu extends AppLocalizations {
  @override
  String get scanner_enableBluetooth => 'Включите Bluetooth';

-  @override
-  String get scanner_bluetoothWebUnsupported =>
-      'Bluetooth недоступен в браузере. Подключитесь через USB.';
-
  @override
  String get device_quickSwitch => 'Быстрое переключение';

@@ -817,6 +789,11 @@ class AppLocalizationsRu extends AppLocalizations {
  String get appSettings_maxMessageRetriesSubtitle =>
      'Количество попыток повторной отправки сообщения перед тем, как пометить его как неудачное.';

+  @override
+  String path_routeWeight(String weight, String max) {
+    return '$weight/$max';
+  }
+
  @override
  String get appSettings_battery => 'Батарея';

@@ -1017,15 +994,6 @@ class AppLocalizationsRu extends AppLocalizations {
  @override
  String get contacts_newGroup => 'Новая группа';

-  @override
-  String get contacts_moreOptions => 'Больше вариантов';
-
-  @override
-  String get contacts_searchOpen => 'Найти контакты';
-
-  @override
-  String get contacts_searchClose => 'Закрыть поиск';
-
  @override
  String get contacts_groupName => 'Имя группы';

@@ -1505,6 +1473,35 @@ class AppLocalizationsRu extends AppLocalizations {
  @override
  String get debugFrame_hexDump => 'Шестнадцатеричный дамп:';

+  @override
+  String get chat_pathManagement => 'Управление маршрутами';
+
+  @override
+  String get chat_ShowAllPaths => 'Показать все пути';
+
+  @override
+  String get chat_routingMode => 'Режим маршрутизации';
+
+  @override
+  String get chat_autoUseSavedPath => 'Авто (использовать сохранённый маршрут)';
+
+  @override
+  String get chat_forceFloodMode => 'Принудительный режим рассылки';
+
+  @override
+  String get chat_recentAckPaths =>
+      'Недавние подтверждённые маршруты (нажмите, чтобы использовать):';
+
+  @override
+  String get chat_pathHistoryFull =>
+      'История маршрутов заполнена. Удалите записи, чтобы добавить новые.';
+
+  @override
+  String get chat_hopSingular => 'хоп';
+
+  @override
+  String get chat_hopPlural => 'хопов';
+
  @override
  String chat_hopsCount(int count) {
    String _temp0 = intl.Intl.pluralLogic(
@@ -1518,6 +1515,12 @@ class AppLocalizationsRu extends AppLocalizations {
    return '$count $_temp0';
  }

+  @override
+  String get chat_successes => 'успешно';
+
+  @override
+  String get chat_score => 'Оценка';
+
  @override
  String get chat_removePath => 'Удалить маршрут';

@@ -1525,150 +1528,54 @@ class AppLocalizationsRu extends AppLocalizations {
  String get chat_noPathHistoryYet =>
      'История маршрутов пока пуста.\nОтправьте сообщение, чтобы обнаружить маршруты.';

+  @override
+  String get chat_pathActions => 'Действия с маршрутом:';
+
+  @override
+  String get chat_setCustomPath => 'Указать маршрут вручную';
+
+  @override
+  String get chat_setCustomPathSubtitle => 'Вручную задать маршрут передачи';
+
+  @override
+  String get chat_clearPath => 'Очистить маршрут';
+
+  @override
+  String get chat_clearPathSubtitle =>
+      'Принудительно обновить маршрут при следующей отправке';
+
  @override
  String get chat_pathCleared =>
      'Маршрут очищен. Следующее сообщение обновит маршрут.';

+  @override
+  String get chat_floodModeSubtitle =>
+      'Используйте переключатель маршрутизации в панели приложения';
+
+  @override
+  String get chat_floodModeEnabled =>
+      'Режим рассылки включён. Отключите через значок маршрутизации в панели приложения.';
+
  @override
  String get chat_fullPath => 'Полный маршрут';

  @override
-  String get routing_title => 'Маршрутизация';
+  String get chat_pathDetailsNotAvailable =>
+      'Детали маршрута ещё недоступны. Попробуйте отправить сообщение для обновления.';

  @override
-  String get routing_modeAuto => 'Авто';
-
-  @override
-  String get routing_modeFlood => 'Наводнение';
-
-  @override
-  String get routing_modeManual => 'Инструкция';
-
-  @override
-  String get routing_modeAutoHint =>
-      'Автоматически выбирает наиболее известный путь, и если такой путь неизвестен, использует алгоритм поиска пути.';
-
-  @override
-  String get routing_modeFloodHint =>
-      'Передача сигнала через все ретрансляторы. Самый надежный способ, но требует больше времени на передачу.';
-
-  @override
-  String get routing_modeManualHint =>
-      'Всегда следует точно по указанному вами маршруту.';
-
-  @override
-  String get routing_currentRoute => 'Текущий маршрут';
-
-  @override
-  String get routing_directNoHops =>
-      'Прямое соединение – без использования ретрансляторов';
-
-  @override
-  String get routing_noPathYet =>
-      'Пока нет пути. Следующее сообщение будет отправлено до тех пор, пока не будет обнаружен маршрут.';
-
-  @override
-  String get routing_floodBroadcast => 'Транслируется через все ретрансляторы';
-
-  @override
-  String get routing_editPath => 'Изменить путь';
-
-  @override
-  String get routing_forgetPath => 'Забудьте о маршруте';
-
-  @override
-  String get routing_knownPaths => 'Известные маршруты';
-
-  @override
-  String get routing_knownPathsHint =>
-      'Создайте маршрут для переключения на этот пункт.';
-
-  @override
-  String get routing_inUse => 'В эксплуатации';
-
-  @override
-  String get routing_qualityStrong => 'Сильный первый скачок';
-
-  @override
-  String get routing_qualityGood => 'Хорошее начало';
-
-  @override
-  String get routing_qualityFair => 'Первый хороший урожай';
-
-  @override
-  String get routing_qualityWorked => 'Осуществлено';
-
-  @override
-  String get routing_qualityFlood =>
-      'Узнал из новостей, распространяющихся в интернете.';
-
-  @override
-  String get routing_qualityUntested => 'Непроверенный';
-
-  @override
-  String routing_lastWorked(String when) {
-    return 'worked $when';
+  String chat_pathSetHops(int hopCount, String status) {
+    String _temp0 = intl.Intl.pluralLogic(
+      hopCount,
+      locale: localeName,
+      other: 'хопов',
+      many: 'хопов',
+      few: 'хопа',
+      one: 'хоп',
+    );
+    return 'Маршрут установлен: $hopCount $_temp0 — $status';
  }

-  @override
-  String get routing_neverWorked => 'никогда не было подтверждено';
-
-  @override
-  String routing_deliveryCounts(int successes, int failures) {
-    return '$successes delivered, $failures failed';
-  }
-
-  @override
-  String get routing_floodDelivery => 'Доставка при затоплении';
-
-  @override
-  String get pathEditor_title => 'Создать маршрут';
-
-  @override
-  String pathEditor_hopCounter(int count) {
-    return '$count из 64 хмеля';
-  }
-
-  @override
-  String get pathEditor_noHops =>
-      'На данный момент хмель еще не добавлен. Чтобы добавить его, нажмите на соответствующие кнопки ниже в нужном порядке, или сохраните рецепт без хмеля, чтобы отправить его напрямую.';
-
-  @override
-  String get pathEditor_addHops =>
-      'Добавляйте хмель в соответствии с указанным порядком.';
-
-  @override
-  String get pathEditor_searchRepeaters => 'Поиск повторителей';
-
-  @override
-  String get pathEditor_advancedHex =>
-      'Продвинутый уровень: прямой путь в шестнадцатеричном формате';
-
-  @override
-  String get pathEditor_hexLabel => 'Префиксы шестнадцатеричной системы';
-
-  @override
-  String get pathEditor_hexHelper =>
-      'Два шестнадцатеричных символа на каждом шаге, разделенные запятыми.';
-
-  @override
-  String pathEditor_invalidTokens(String tokens) {
-    return 'Неверно: $tokens';
-  }
-
-  @override
-  String get pathEditor_tooManyHops =>
-      'Максимальное количество ингредиентов – 64';
-
-  @override
-  String get pathEditor_usePath => 'Используйте этот путь';
-
-  @override
-  String get pathEditor_removeHop => 'Удалить хмель';
-
-  @override
-  String get pathEditor_unknownHop => 'Неизвестный ретранслятор';
-
  @override
  String get chat_pathSavedLocally =>
      'Сохранено локально. Подключитесь для синхронизации.';
@@ -1743,39 +1650,6 @@ class AppLocalizationsRu extends AppLocalizations {
  @override
  String get map_title => 'Карта нод';

-  @override
-  String get map_searchHint => 'Поиск по имени или ID узла';
-
-  @override
-  String get map_activity => 'Активность';
-
-  @override
-  String get map_online => 'Онлайн';
-
-  @override
-  String get map_recent => 'Недавно';
-
-  @override
-  String get map_stale => 'Устаревший';
-
-  @override
-  String get map_visible => 'Видимый';
-
-  @override
-  String get map_hidden => 'Скрытый';
-
-  @override
-  String get map_centerOnNode => 'Центрировать на узле';
-
-  @override
-  String get map_details => 'Детали';
-
-  @override
-  String get map_noGps => 'Без GPS';
-
-  @override
-  String get map_noResults => 'Не найдено соответствующих узлов';
-
  @override
  String get map_lineOfSight => 'Линия видимости';

@@ -2103,6 +1977,17 @@ class AppLocalizationsRu extends AppLocalizations {
  String get dialog_disconnectConfirm =>
      'Вы уверены, что хотите отключиться от этого устройства?';

+  @override
+  String get dialog_disconnectedTitle => 'Отключено';
+
+  @override
+  String get dialog_disconnectedMessage =>
+      'Вы были отключены от вашего компаньона.';
+
+  @override
+  String get dialog_connectCompanion =>
+      'Подключитесь к компаньону, чтобы получить доступ к функциям ретранслятора и сервера комнат.';
+
  @override
  String get login_repeaterLogin => 'Вход в репитер';

@@ -2169,12 +2054,66 @@ class AppLocalizationsRu extends AppLocalizations {
  @override
  String get common_clear => 'Очистить';

+  @override
+  String path_currentPath(String path) {
+    return 'Текущий маршрут: $path';
+  }
+
+  @override
+  String path_usingHopsPath(int count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other: 'хопов',
+      many: 'хопов',
+      few: 'хопа',
+      one: 'хоп',
+    );
+    return 'Используется маршрут из $count $_temp0';
+  }
+
+  @override
+  String get path_enterCustomPath => 'Введите маршрут вручную';
+
  @override
  String get path_currentPathLabel => 'Текущий маршрут';

+  @override
+  String get path_hexPrefixInstructions =>
+      'Введите 2-символьные шестнадцатеричные префиксы для каждого хопа, разделённые запятыми.';
+
+  @override
+  String get path_hexPrefixExample =>
+      'Пример: A1,F2,3C (каждый узел использует первый байт своего публичного ключа)';
+
+  @override
+  String get path_labelHexPrefixes => 'Маршрут (шестнадцатеричные префиксы)';
+
+  @override
+  String get path_helperMaxHops =>
+      'Максимум 64 хопа. Каждый префикс — 2 шестнадцатеричных символа (1 байт)';
+
+  @override
+  String get path_selectFromContacts => 'Или выберите из контактов:';
+
  @override
  String get path_noRepeatersFound => 'Репитеры или серверы комнат не найдены.';

+  @override
+  String get path_customPathsRequire =>
+      'Пользовательские маршруты требуют промежуточных узлов, способных ретранслировать сообщения.';
+
+  @override
+  String path_invalidHexPrefixes(String prefixes) {
+    return 'Недопустимые шестнадцатеричные префиксы: $prefixes';
+  }
+
+  @override
+  String get path_tooLong => 'Маршрут слишком длинный. Максимум 64 хопа.';
+
+  @override
+  String get path_setPath => 'Установить маршрут';
+
  @override
  String get repeater_management => 'Управление репитером';

@@ -2239,6 +2178,16 @@ class AppLocalizationsRu extends AppLocalizations {
  @override
  String get repeater_routingMode => 'Режим маршрутизации';

+  @override
+  String get repeater_autoUseSavedPath =>
+      'Авто (использовать сохранённый маршрут)';
+
+  @override
+  String get repeater_forceFloodMode => 'Принудительный режим рассылки';
+
+  @override
+  String get repeater_pathManagement => 'Управление маршрутами';
+
  @override
  String get repeater_refresh => 'Обновить';

@@ -3339,139 +3288,6 @@ class AppLocalizationsRu extends AppLocalizations {
    return '$celsius°C / $fahrenheit°F';
  }

-  @override
-  String get telemetry_digitalInputLabel => 'Цифровой вход';
-
-  @override
-  String get telemetry_digitalOutputLabel => 'Цифровой выход';
-
-  @override
-  String get telemetry_analogInputLabel => 'Аналоговый вход';
-
-  @override
-  String get telemetry_analogOutputLabel => 'Аналоговый выход';
-
-  @override
-  String get telemetry_genericLabel => 'Общий датчик';
-
-  @override
-  String get telemetry_luminosityLabel => 'Освещённость';
-
-  @override
-  String get telemetry_presenceLabel => 'Присутствие';
-
-  @override
-  String get telemetry_humidityLabel => 'Влажность';
-
-  @override
-  String get telemetry_accelerometerLabel => 'Акселерометр';
-
-  @override
-  String get telemetry_pressureLabel => 'Давление';
-
-  @override
-  String get telemetry_altitudeLabel => 'Высота';
-
-  @override
-  String get telemetry_frequencyLabel => 'Частота';
-
-  @override
-  String get telemetry_percentageLabel => 'Процент';
-
-  @override
-  String get telemetry_concentrationLabel => 'Концентрация';
-
-  @override
-  String get telemetry_powerLabel => 'Мощность';
-
-  @override
-  String get telemetry_distanceLabel => 'Расстояние';
-
-  @override
-  String get telemetry_energyLabel => 'Энергия';
-
-  @override
-  String get telemetry_directionLabel => 'Направление';
-
-  @override
-  String get telemetry_timeLabel => 'Время';
-
-  @override
-  String get telemetry_gyrometerLabel => 'Гирометр';
-
-  @override
-  String get telemetry_colourLabel => 'Цвет';
-
-  @override
-  String get telemetry_gpsLabel => 'GPS';
-
-  @override
-  String get telemetry_switchLabel => 'Переключатель';
-
-  @override
-  String get telemetry_polylineLabel => 'Полилиния';
-
-  @override
-  String telemetry_altitudeValue(String meters) {
-    return '$meters м';
-  }
-
-  @override
-  String telemetry_frequencyValue(String hertz) {
-    return '$hertz Гц';
-  }
-
-  @override
-  String telemetry_pressureValue(String hpa) {
-    return '$hpa гПа';
-  }
-
-  @override
-  String telemetry_luminosityValue(String lux) {
-    return '$lux лк';
-  }
-
-  @override
-  String telemetry_powerValue(String watts) {
-    return '$watts Вт';
-  }
-
-  @override
-  String telemetry_distanceValue(String meters) {
-    return '$meters м';
-  }
-
-  @override
-  String telemetry_energyValue(String kilowattHours) {
-    return '$kilowattHours кВт⋅ч';
-  }
-
-  @override
-  String telemetry_directionValue(String degrees) {
-    return '$degrees°';
-  }
-
-  @override
-  String telemetry_concentrationValue(String ppm) {
-    return '$ppm ppm';
-  }
-
-  @override
-  String telemetry_percentageValue(String percent) {
-    return '$percent%';
-  }
-
-  @override
-  String telemetry_analogValue(String value) {
-    return '$value';
-  }
-
-  @override
-  String get telemetry_autoFetchQuantity => 'Количество запросов';
-
-  @override
-  String get telemetry_error => 'Не удалось получить данные';
-
  @override
  String get neighbors_receivedData => 'Полученные данные о соседях';

@@ -4372,17 +4188,6 @@ class AppLocalizationsRu extends AppLocalizations {
  String get translation_composerSubtitle =>
      'Управляет исходным состоянием значка перевода, предоставляемого редактором.';

-  @override
-  String get translation_autoIncomingTitle =>
-      'Автоматически переводить сообщения';
-
-  @override
-  String get translation_autoIncomingSubtitle =>
-      'Автоматически переводит сообщения для уведомлений, а также для чатов и каналов.';
-
-  @override
-  String get translation_translateMessage => 'Перевести сообщение';
-
  @override
  String get translation_targetLanguage => 'Целевой язык';

@@ -4509,139 +4314,4 @@ class AppLocalizationsRu extends AppLocalizations {

  @override
  String get contact_typeUnknown => 'Неизвестно';
-
-  @override
-  String get map_zoomIn => 'Увеличить масштаб';
-
-  @override
-  String get map_zoomOut => 'Увеличить масштаб';
-
-  @override
-  String get map_centerMap => 'Карта центра';
-
-  @override
-  String get chrome_bluetoothRequiresChromium =>
-      'Для работы Web Bluetooth требуется браузер на основе Chromium.';
-
-  @override
-  String channels_communityShortId(String id) {
-    return 'Идентификатор: $id...';
-  }
-
-  @override
-  String get pathTrace_legendGpsConfirmed => 'GPS подтверждено';
-
-  @override
-  String get pathTrace_legendInferred => 'Выведенная позиция';
-
-  @override
-  String get pathMap_viewSingle => 'Одиночный';
-
-  @override
-  String get pathMap_viewCombined => 'Объединённые';
-
-  @override
-  String get pathMap_play => 'Воспроизвести';
-
-  @override
-  String get pathMap_pause => 'Пауза';
-
-  @override
-  String get pathMap_replay => 'Повтор';
-
-  @override
-  String get pathMap_stepBack => 'Предыдущий хоп';
-
-  @override
-  String get pathMap_stepForward => 'Следующий хоп';
-
-  @override
-  String get pathMap_animationOn => 'Показать анимацию пакета';
-
-  @override
-  String get pathMap_animationOff => 'Скрыть анимацию пакета';
-
-  @override
-  String pathMap_hopOf(int current, int total) {
-    return 'Хоп $current из $total';
-  }
-
-  @override
-  String pathMap_observedPaths(int count) {
-    return 'Наблюдаемые маршруты: $count';
-  }
-
-  @override
-  String get pathMap_primary => 'Основной';
-
-  @override
-  String pathMap_alternate(int index) {
-    return 'Альт $index';
-  }
-
-  @override
-  String pathMap_hopCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count хопов',
-      many: '$count хопов',
-      few: '$count хопа',
-      one: '$count хоп',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String pathMap_gpsCount(int confirmed, int total) {
-    return '$confirmed/$total GPS';
-  }
-
-  @override
-  String get pathMap_legendShared => 'Общий сегмент';
-
-  @override
-  String get pathMap_legendEstimated => 'Расчётный сегмент';
-
-  @override
-  String pathMap_sharedNodeCount(int count) {
-    return 'Используется в $count маршрутах';
-  }
-
-  @override
-  String pathMap_partialAnimation(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count хопов не имеют координат — показанный путь неполный',
-      many: '$count хопов не имеют координат — показанный путь неполный',
-      few: '$count хопа не имеют координат — показанный путь неполный',
-      one: '$count хоп не имеет координат — показанный путь неполный',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get pathMap_showAllPaths => 'Показать всё';
-
-  @override
-  String get pathMap_hidePath => 'Скрыть путь';
-
-  @override
-  String get pathMap_showPath => 'Показать маршрут';
-
-  @override
-  String get pathMap_collapsePanel => 'Скрыть панель';
-
-  @override
-  String get pathMap_expandPanel => 'Расширить панель';
-
-  @override
-  String get pathMap_noLocation => 'Нет координат';
-
-  @override
-  String get pathMap_followPacket => 'Следить за пакетом';
-
-  @override
-  String get pathMap_unfollowPacket => 'Не следить за пакетом';
 }
@@ -92,24 +92,6 @@ class AppLocalizationsSk extends AppLocalizations {
  @override
  String get common_disable => 'Zakázať';

-  @override
-  String get common_undo => 'Zrušiť';
-
-  @override
-  String get messageStatus_sent => 'Odoslané';
-
-  @override
-  String get messageStatus_delivered => 'Doručené';
-
-  @override
-  String get messageStatus_pending => 'Odoslanie';
-
-  @override
-  String get messageStatus_failed => 'Neúspešné odeslanie';
-
-  @override
-  String get messageStatus_repeated => 'Slyšal som to opakovane';
-
  @override
  String get common_reboot => 'Restartovať';

@@ -129,12 +111,6 @@ class AppLocalizationsSk extends AppLocalizations {
    return '$percent%';
  }

-  @override
-  String get common_autoRefresh => 'Automatické obnovenie';
-
-  @override
-  String get common_interval => 'Časový interval';
-
  @override
  String get scanner_title => 'MeshCore – Verzia pre verejnosť';

@@ -319,10 +295,6 @@ class AppLocalizationsSk extends AppLocalizations {
  @override
  String get scanner_enableBluetooth => 'Povolte Bluetooth';

-  @override
-  String get scanner_bluetoothWebUnsupported =>
-      'Funkcia Bluetooth nie je dostupná v prehliadači. Prepojte sa pomocou USB.';
-
  @override
  String get device_quickSwitch => 'Rýchle prepínač';

@@ -804,6 +776,11 @@ class AppLocalizationsSk extends AppLocalizations {
  String get appSettings_maxMessageRetriesSubtitle =>
      'Počet pokusov o odošleť pred označením správy ako neúspešnej';

+  @override
+  String path_routeWeight(String weight, String max) {
+    return '$weight/$max';
+  }
+
  @override
  String get appSettings_battery => 'Batéria';

@@ -1005,15 +982,6 @@ class AppLocalizationsSk extends AppLocalizations {
  @override
  String get contacts_newGroup => 'Nová skupina';

-  @override
-  String get contacts_moreOptions => 'Ďalšie možnosti';
-
-  @override
-  String get contacts_searchOpen => 'Vyhľadajte kontakty';
-
-  @override
-  String get contacts_searchClose => 'Zavrieť vyhľadávanie';
-
  @override
  String get contacts_groupName => 'Názov skupiny';

@@ -1495,6 +1463,35 @@ class AppLocalizationsSk extends AppLocalizations {
  @override
  String get debugFrame_hexDump => 'Hexová analýza:';

+  @override
+  String get chat_pathManagement => 'Správa ciest';
+
+  @override
+  String get chat_ShowAllPaths => 'Zobraziť všetky cesty';
+
+  @override
+  String get chat_routingMode => 'Režim trasy';
+
+  @override
+  String get chat_autoUseSavedPath => 'Použiť uloženú cestu';
+
+  @override
+  String get chat_forceFloodMode =>
+      'Zavrieť režim núdzového povodňového režimu';
+
+  @override
+  String get chat_recentAckPaths => 'Nedávne cesty ACK (klepni na použitie):';
+
+  @override
+  String get chat_pathHistoryFull =>
+      'História ciest je plná. Odstráňte záznamy, aby ste mohli pridať nové.';
+
+  @override
+  String get chat_hopSingular => 'Skok';
+
+  @override
+  String get chat_hopPlural => 'Skákať';
+
  @override
  String chat_hopsCount(int count) {
    String _temp0 = intl.Intl.pluralLogic(
@@ -1506,6 +1503,12 @@ class AppLocalizationsSk extends AppLocalizations {
    return '$count $_temp0';
  }

+  @override
+  String get chat_successes => 'Úspechy';
+
+  @override
+  String get chat_score => 'Score';
+
  @override
  String get chat_removePath => 'Odstrániť cestu';

@@ -1513,148 +1516,52 @@ class AppLocalizationsSk extends AppLocalizations {
  String get chat_noPathHistoryYet =>
      'Zatiaľ žiadna história trás.\nPošlite správu a objavte trasy.';

+  @override
+  String get chat_pathActions => 'Cesty:';
+
+  @override
+  String get chat_setCustomPath => 'Nastaviť vlastnú cestu';
+
+  @override
+  String get chat_setCustomPathSubtitle => 'Ručne zadajte trasu.';
+
+  @override
+  String get chat_clearPath => 'Vyčistiš cestu';
+
+  @override
+  String get chat_clearPathSubtitle =>
+      'Znovu nájsť vynútene pri nasledujúcej pošlite';
+
  @override
  String get chat_pathCleared =>
      'Cesta vyčistená. Nasledujúce prepočetné získa trasu znova.';

+  @override
+  String get chat_floodModeSubtitle =>
+      'Použite prepínanie trasy v navigačnom paneli.';
+
+  @override
+  String get chat_floodModeEnabled =>
+      'Odosporňovacia prevádzka je zapnutá. Vypnite ju znova cez ikonu routovania v navigačnom páse.';
+
  @override
  String get chat_fullPath => 'Celá cesta';

  @override
-  String get routing_title => 'Navigácia';
+  String get chat_pathDetailsNotAvailable =>
+      'Podrobnosti o ceste zatiaľ dostupné nie sú. Skúste poslať správu na obnovenie.';

  @override
-  String get routing_modeAuto => 'Auto';
-
-  @override
-  String get routing_modeFlood => 'Povodňová vlna';
-
-  @override
-  String get routing_modeManual => 'Ručná príručka';
-
-  @override
-  String get routing_modeAutoHint =>
-      'Automaticky vyberá najznámejší trasa, a ak žiadna nie je známa, použije náhodnú trasu.';
-
-  @override
-  String get routing_modeFloodHint =>
-      'Prenos prostredníctvom všetkých opakovačov. Najspoľahlivejší spôsob, ale vyžaduje viac času vysielania.';
-
-  @override
-  String get routing_modeManualHint =>
-      'Vždy dodáva presne podľa zadaného trasy.';
-
-  @override
-  String get routing_currentRoute => 'Aktuálna trasa';
-
-  @override
-  String get routing_directNoHops => 'Priamo – bez prechodných trás';
-
-  @override
-  String get routing_noPathYet =>
-      'Zatiaľ neexistuje žiadna cesta. Nasledujúce správy budú pokračovať, kým sa nenájde trasa.';
-
-  @override
-  String get routing_floodBroadcast =>
-      'Prenos prostredníctvom každého opakovača';
-
-  @override
-  String get routing_editPath => 'Upraviť trasu';
-
-  @override
-  String get routing_forgetPath => 'Zabudnite na trasu';
-
-  @override
-  String get routing_knownPaths => 'Známe cesty';
-
-  @override
-  String get routing_knownPathsHint =>
-      'Kliknite na cestu, aby ste sa k nej presunuli.';
-
-  @override
-  String get routing_inUse => 'V prevádzke';
-
-  @override
-  String get routing_qualityStrong => 'Silný prvý krok';
-
-  @override
-  String get routing_qualityGood => 'Úspešný prvý krok';
-
-  @override
-  String get routing_qualityFair => 'Prvá, spravodlivá fáza';
-
-  @override
-  String get routing_qualityWorked => 'Dosiahnutý úspech';
-
-  @override
-  String get routing_qualityFlood =>
-      'Zistil som to z informácií, ktoré som získal v dôsledku povodňovej situácie.';
-
-  @override
-  String get routing_qualityUntested => 'Neotestované';
-
-  @override
-  String routing_lastWorked(String when) {
-    return 'worked $when';
+  String chat_pathSetHops(int hopCount, String status) {
+    String _temp0 = intl.Intl.pluralLogic(
+      hopCount,
+      locale: localeName,
+      other: 'hops',
+      one: 'hop',
+    );
+    return 'Cesta nastavená: $hopCount $_temp0 - $status';
  }

-  @override
-  String get routing_neverWorked => 'nikedy nebolo potvrdené';
-
-  @override
-  String routing_deliveryCounts(int successes, int failures) {
-    return '$successes delivered, $failures failed';
-  }
-
-  @override
-  String get routing_floodDelivery => 'Doručenie v prípade povodní';
-
-  @override
-  String get pathEditor_title => 'Vytvorenie cesty';
-
-  @override
-  String pathEditor_hopCounter(int count) {
-    return '$count z 64 chmelových zŕš';
-  }
-
-  @override
-  String get pathEditor_noHops =>
-      'Zatiaľ žiadne chmel. Kliknite na opakované, aby ste ich pridali postupne, alebo uložte bez chmelu, aby ste ho mohli poslať priamo.';
-
-  @override
-  String get pathEditor_addHops => 'Pridávajte chmel podľa zadaného poriadku.';
-
-  @override
-  String get pathEditor_searchRepeaters => 'Hľadať opakované';
-
-  @override
-  String get pathEditor_advancedHex => 'Pokročilé: pôvodná hexová cesta';
-
-  @override
-  String get pathEditor_hexLabel => 'Prefiksy pre hexadecimálne čísla';
-
-  @override
-  String get pathEditor_hexHelper =>
-      'Dve hexové čísla na každý krok, oddelené čiarkami';
-
-  @override
-  String pathEditor_invalidTokens(String tokens) {
-    return 'Neplatné: $tokens';
-  }
-
-  @override
-  String get pathEditor_tooManyHops => 'Maximálne 64 krokov';
-
-  @override
-  String get pathEditor_usePath => 'Použite túto cestu';
-
-  @override
-  String get pathEditor_removeHop => 'Odstráňte chmel';
-
-  @override
-  String get pathEditor_unknownHop =>
-      'Neznáme zariadenie na opakované vysielanie';
-
  @override
  String get chat_pathSavedLocally =>
      'Uložené lokálne. Spojte sa na synchronizáciu.';
@@ -1730,39 +1637,6 @@ class AppLocalizationsSk extends AppLocalizations {
  @override
  String get map_title => 'Mapa uzlov';

-  @override
-  String get map_searchHint => 'Vyhľadajte podľa názvu alebo ID uzla';
-
-  @override
-  String get map_activity => 'Aktivita';
-
-  @override
-  String get map_online => 'Online';
-
-  @override
-  String get map_recent => 'Nedávne';
-
-  @override
-  String get map_stale => 'Neaktuálne';
-
-  @override
-  String get map_visible => 'Viditeľný';
-
-  @override
-  String get map_hidden => 'Skrytý';
-
-  @override
-  String get map_centerOnNode => 'Nacentrovať na uzol';
-
-  @override
-  String get map_details => 'Podrobnosti';
-
-  @override
-  String get map_noGps => 'Bez GPS';
-
-  @override
-  String get map_noResults => 'Nenašli sa žiadne zodpovedajúce uzly.';
-
  @override
  String get map_lineOfSight => 'Úroveň výhľadu';

@@ -2089,6 +1963,17 @@ class AppLocalizationsSk extends AppLocalizations {
  String get dialog_disconnectConfirm =>
      'Ste si istý/á, že chcete odpojiť od tohto zariadenia?';

+  @override
+  String get dialog_disconnectedTitle => 'Odpojené';
+
+  @override
+  String get dialog_disconnectedMessage =>
+      'Od vášho spoločníka ste boli odpojený.';
+
+  @override
+  String get dialog_connectCompanion =>
+      'Pripojte sa k sprievodcovi a získajte prístup k funkciám opakovača a serveru miestností.';
+
  @override
  String get login_repeaterLogin => 'Opätovné prihlásenie';

@@ -2155,13 +2040,66 @@ class AppLocalizationsSk extends AppLocalizations {
  @override
  String get common_clear => 'Zmazať';

+  @override
+  String path_currentPath(String path) {
+    return 'Aktívna cesta: $path';
+  }
+
+  @override
+  String path_usingHopsPath(int count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other: 'hops',
+      one: 'hop',
+    );
+    return 'Používa $count $_temp0 cestu';
+  }
+
+  @override
+  String get path_enterCustomPath => 'Zadajte vlastný priebeh';
+
  @override
  String get path_currentPathLabel => 'Aktuálny priebeh';

+  @override
+  String get path_hexPrefixInstructions =>
+      'Zadajte 2-miestne hexové predpony pre každú fázu, oddelené čiarkami.';
+
+  @override
+  String get path_hexPrefixExample =>
+      'A1,F2,3C (každý uzel používa prvý bajt svojho verejného kľúča)';
+
+  @override
+  String get path_labelHexPrefixes => 'Cesty (hexové predpony)';
+
+  @override
+  String get path_helperMaxHops =>
+      'Max 64 skokov. Každý prefix je 2 hexadecimálne znaky (1 bajt).';
+
+  @override
+  String get path_selectFromContacts => 'Vyberte sa z kontaktov:';
+
  @override
  String get path_noRepeatersFound =>
      'Nenašli sa žiadne opakovače ani serverové miestnosti.';

+  @override
+  String get path_customPathsRequire =>
+      'Vlastné cesty vyžadujú medziletoch, ktoré môžu prenášať správky.';
+
+  @override
+  String path_invalidHexPrefixes(String prefixes) {
+    return 'Neplatné hexové predpony: $prefixes';
+  }
+
+  @override
+  String get path_tooLong =>
+      'Cesta je príliš dlhá. Umožnené je maximum 64 skokov.';
+
+  @override
+  String get path_setPath => 'Nastaviť cestu';
+
  @override
  String get repeater_management => 'Správa opakérov';

@@ -2226,6 +2164,16 @@ class AppLocalizationsSk extends AppLocalizations {
  @override
  String get repeater_routingMode => 'Režim trasy';

+  @override
+  String get repeater_autoUseSavedPath => 'Použiť uloženú cestu';
+
+  @override
+  String get repeater_forceFloodMode =>
+      'Zavrieť režim núdzového povodňového režimu';
+
+  @override
+  String get repeater_pathManagement => 'Správa trás';
+
  @override
  String get repeater_refresh => 'Obnoviť';

@@ -3318,139 +3266,6 @@ class AppLocalizationsSk extends AppLocalizations {
    return '$celsius°C / $fahrenheit°F';
  }

-  @override
-  String get telemetry_digitalInputLabel => 'Digitálny vstup';
-
-  @override
-  String get telemetry_digitalOutputLabel => 'Digitálny výstup';
-
-  @override
-  String get telemetry_analogInputLabel => 'Analógový vstup';
-
-  @override
-  String get telemetry_analogOutputLabel => 'Analógový výstup';
-
-  @override
-  String get telemetry_genericLabel => 'Všeobecný senzor';
-
-  @override
-  String get telemetry_luminosityLabel => 'Osvetlenie';
-
-  @override
-  String get telemetry_presenceLabel => 'Prítomnosť';
-
-  @override
-  String get telemetry_humidityLabel => 'Vlhkosť';
-
-  @override
-  String get telemetry_accelerometerLabel => 'Akcelerometer';
-
-  @override
-  String get telemetry_pressureLabel => 'Tlak';
-
-  @override
-  String get telemetry_altitudeLabel => 'Nadmorská výška';
-
-  @override
-  String get telemetry_frequencyLabel => 'Frekvencia';
-
-  @override
-  String get telemetry_percentageLabel => 'Percento';
-
-  @override
-  String get telemetry_concentrationLabel => 'Koncentrácia';
-
-  @override
-  String get telemetry_powerLabel => 'Výkon';
-
-  @override
-  String get telemetry_distanceLabel => 'Vzdialenosť';
-
-  @override
-  String get telemetry_energyLabel => 'Energia';
-
-  @override
-  String get telemetry_directionLabel => 'Smer';
-
-  @override
-  String get telemetry_timeLabel => 'Čas';
-
-  @override
-  String get telemetry_gyrometerLabel => 'Gyrometer';
-
-  @override
-  String get telemetry_colourLabel => 'Farba';
-
-  @override
-  String get telemetry_gpsLabel => 'GPS';
-
-  @override
-  String get telemetry_switchLabel => 'Prepínač';
-
-  @override
-  String get telemetry_polylineLabel => 'Lomená čiara';
-
-  @override
-  String telemetry_altitudeValue(String meters) {
-    return '$meters m';
-  }
-
-  @override
-  String telemetry_frequencyValue(String hertz) {
-    return '$hertz Hz';
-  }
-
-  @override
-  String telemetry_pressureValue(String hpa) {
-    return '$hpa hPa';
-  }
-
-  @override
-  String telemetry_luminosityValue(String lux) {
-    return '$lux lx';
-  }
-
-  @override
-  String telemetry_powerValue(String watts) {
-    return '$watts W';
-  }
-
-  @override
-  String telemetry_distanceValue(String meters) {
-    return '$meters m';
-  }
-
-  @override
-  String telemetry_energyValue(String kilowattHours) {
-    return '$kilowattHours kWh';
-  }
-
-  @override
-  String telemetry_directionValue(String degrees) {
-    return '$degrees°';
-  }
-
-  @override
-  String telemetry_concentrationValue(String ppm) {
-    return '$ppm ppm';
-  }
-
-  @override
-  String telemetry_percentageValue(String percent) {
-    return '$percent%';
-  }
-
-  @override
-  String telemetry_analogValue(String value) {
-    return '$value';
-  }
-
-  @override
-  String get telemetry_autoFetchQuantity => 'Počet požiadaviek';
-
-  @override
-  String get telemetry_error => 'Nepodarilo sa získať údaje';
-
  @override
  String get neighbors_receivedData => 'Obdielo dáta suseda';

@@ -4337,16 +4152,6 @@ class AppLocalizationsSk extends AppLocalizations {
  String get translation_composerSubtitle =>
      'Riadi výchoce stav ikony pre preklad, ktorú používa program.';

-  @override
-  String get translation_autoIncomingTitle => 'Automaticky prekladať správy';
-
-  @override
-  String get translation_autoIncomingSubtitle =>
-      'Automaticky prekladá správy pre upozornenia aj pre čet alebo kanál.';
-
-  @override
-  String get translation_translateMessage => 'Preložiť správu';
-
  @override
  String get translation_targetLanguage => 'Cieľový jazyk';

@@ -4475,137 +4280,4 @@ class AppLocalizationsSk extends AppLocalizations {

  @override
  String get contact_typeUnknown => 'Unknown';
-
-  @override
-  String get map_zoomIn => 'Zväčšiť';
-
-  @override
-  String get map_zoomOut => 'Zmenť zamer zblízka';
-
-  @override
-  String get map_centerMap => 'Mapa centra';
-
-  @override
-  String get chrome_bluetoothRequiresChromium =>
-      'Web Bluetooth vyžaduje prehliadač Chromium.';
-
-  @override
-  String channels_communityShortId(String id) {
-    return 'ID: $id...';
-  }
-
-  @override
-  String get pathTrace_legendGpsConfirmed => 'GPS potvrdilo';
-
-  @override
-  String get pathTrace_legendInferred => 'Odvodená poloha';
-
-  @override
-  String get pathMap_viewSingle => 'Jednotlivý';
-
-  @override
-  String get pathMap_viewCombined => 'Spojené';
-
-  @override
-  String get pathMap_play => 'Prehrať';
-
-  @override
-  String get pathMap_pause => 'Pozastaviť';
-
-  @override
-  String get pathMap_replay => 'Prehrať znova';
-
-  @override
-  String get pathMap_stepBack => 'Predchádzajúci skok';
-
-  @override
-  String get pathMap_stepForward => 'Nasledujúci skok';
-
-  @override
-  String get pathMap_animationOn => 'Zobraziť animáciu paketu';
-
-  @override
-  String get pathMap_animationOff => 'Skryť animáciu paketu';
-
-  @override
-  String pathMap_hopOf(int current, int total) {
-    return 'Skok $current z $total';
-  }
-
-  @override
-  String pathMap_observedPaths(int count) {
-    return 'Pozorované cesty: $count';
-  }
-
-  @override
-  String get pathMap_primary => 'Primárna';
-
-  @override
-  String pathMap_alternate(int index) {
-    return 'Alternatívny $index';
-  }
-
-  @override
-  String pathMap_hopCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count skokov',
-      few: '$count skoky',
-      one: '1 skok',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String pathMap_gpsCount(int confirmed, int total) {
-    return '$confirmed/$total GPS';
-  }
-
-  @override
-  String get pathMap_legendShared => 'Spoločný segment';
-
-  @override
-  String get pathMap_legendEstimated => 'Odhadovaný segment';
-
-  @override
-  String pathMap_sharedNodeCount(int count) {
-    return 'Používané $count cestami';
-  }
-
-  @override
-  String pathMap_partialAnimation(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count skokov nemá polohu — zobrazená trasa je neúplná',
-      few: '$count skoky nemajú polohu — zobrazená trasa je neúplná',
-      one: '1 skok nemá polohu — zobrazená trasa je neúplná',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get pathMap_showAllPaths => 'Zobraziť všetky';
-
-  @override
-  String get pathMap_hidePath => 'Skryť cestu';
-
-  @override
-  String get pathMap_showPath => 'Zobraziť trasu';
-
-  @override
-  String get pathMap_collapsePanel => 'Zatvoriť panel';
-
-  @override
-  String get pathMap_expandPanel => 'Rozbaliť panel';
-
-  @override
-  String get pathMap_noLocation => 'Bez polohy';
-
-  @override
-  String get pathMap_followPacket => 'Uzamknúť pohľad na paket';
-
-  @override
-  String get pathMap_unfollowPacket => 'Odomknúť pohľad od paketu';
 }
@@ -92,25 +92,6 @@ class AppLocalizationsSl extends AppLocalizations {
  @override
  String get common_disable => 'Izklopiti';

-  @override
-  String get common_undo => 'Preobrn';
-
-  @override
-  String get messageStatus_sent => 'Pošljeno';
-
-  @override
-  String get messageStatus_delivered => 'Dostavljeno';
-
-  @override
-  String get messageStatus_pending => 'Pošiljanje';
-
-  @override
-  String get messageStatus_failed =>
-      'Uspešno ni bilo mogo, da se sporočilo pošlje';
-
-  @override
-  String get messageStatus_repeated => 'Slišal sem večkrat';
-
  @override
  String get common_reboot => 'Ponoviti';

@@ -130,12 +111,6 @@ class AppLocalizationsSl extends AppLocalizations {
    return '$percent %';
  }

-  @override
-  String get common_autoRefresh => 'Samodejno osveževanje';
-
-  @override
-  String get common_interval => 'Časovni interval';
-
  @override
  String get scanner_title => 'MeshCore – Odprto';

@@ -318,10 +293,6 @@ class AppLocalizationsSl extends AppLocalizations {
  @override
  String get scanner_enableBluetooth => 'Omogočite Bluetooth';

-  @override
-  String get scanner_bluetoothWebUnsupported =>
-      'Funkcija Bluetooth v brskalniku ni na voljo. Povežite se preko USB-ja namesto tega.';
-
  @override
  String get device_quickSwitch => 'Hitro preklop';

@@ -806,6 +777,11 @@ class AppLocalizationsSl extends AppLocalizations {
  String get appSettings_maxMessageRetriesSubtitle =>
      'Število poskusov ponovnega poslanja, preden se sporočilo označuje kot neuspešno';

+  @override
+  String path_routeWeight(String weight, String max) {
+    return '$weight/$max';
+  }
+
  @override
  String get appSettings_battery => 'Baterija';

@@ -1005,15 +981,6 @@ class AppLocalizationsSl extends AppLocalizations {
  @override
  String get contacts_newGroup => 'Nova skupina';

-  @override
-  String get contacts_moreOptions => 'Več možnosti';
-
-  @override
-  String get contacts_searchOpen => 'Iskanje kontaktov';
-
-  @override
-  String get contacts_searchClose => 'Izklopi iskanje';
-
  @override
  String get contacts_groupName => 'Ime skupine';

@@ -1493,6 +1460,34 @@ class AppLocalizationsSl extends AppLocalizations {
  @override
  String get debugFrame_hexDump => 'Izpis heksadecimalnih vrednosti:';

+  @override
+  String get chat_pathManagement => 'Upravljanje poti';
+
+  @override
+  String get chat_ShowAllPaths => 'Prikaži vse poti';
+
+  @override
+  String get chat_routingMode => 'Navodilo za usmerjevalni način';
+
+  @override
+  String get chat_autoUseSavedPath => 'Avto (uporabi shranjeno pot)';
+
+  @override
+  String get chat_forceFloodMode => 'Nasilje obvezati v način';
+
+  @override
+  String get chat_recentAckPaths => 'Nedavni poti ACK (tap za uporabo):';
+
+  @override
+  String get chat_pathHistoryFull =>
+      'Zapiske o poti so popolni. Izbriši vnose, da dodaš nove.';
+
+  @override
+  String get chat_hopSingular => 'skok';
+
+  @override
+  String get chat_hopPlural => 'skokov';
+
  @override
  String chat_hopsCount(int count) {
    String _temp0 = intl.Intl.pluralLogic(
@@ -1504,6 +1499,12 @@ class AppLocalizationsSl extends AppLocalizations {
    return '$count $_temp0';
  }

+  @override
+  String get chat_successes => 'Uspešni';
+
+  @override
+  String get chat_score => 'Score';
+
  @override
  String get chat_removePath => 'Izbriši pot';

@@ -1511,144 +1512,51 @@ class AppLocalizationsSl extends AppLocalizations {
  String get chat_noPathHistoryYet =>
      'Ni shranjenih poti.\nPošlji sporočilo za odkrivanje poti.';

+  @override
+  String get chat_pathActions => 'Potni ukazi:';
+
+  @override
+  String get chat_setCustomPath => 'Nastavi Prilozeno Pot';
+
+  @override
+  String get chat_setCustomPathSubtitle => 'Ročno določite potniško pot.';
+
+  @override
+  String get chat_clearPath => 'Počisti pot';
+
+  @override
+  String get chat_clearPathSubtitle => 'Ob naslednji pošiljanju znova zbrati.';
+
  @override
  String get chat_pathCleared =>
      'Pot je očiščena. Naslednje sporočilo bo ponovno odkril pot.';

+  @override
+  String get chat_floodModeSubtitle =>
+      'Uporabi tipko usmerjevanja v meniju aplikacije.';
+
+  @override
+  String get chat_floodModeEnabled =>
+      'Narejena je bila omrežna modaliteta. Vklopi jo znova preko ikone v meniju aplikacije.';
+
  @override
  String get chat_fullPath => 'Polna pot';

  @override
-  String get routing_title => 'Navigacija';
+  String get chat_pathDetailsNotAvailable =>
+      'Podrobnosti poti zaenkrat niso na voljo. Poskusite poslati sporočilo za osvežitev.';

  @override
-  String get routing_modeAuto => 'Avto';
-
-  @override
-  String get routing_modeFlood => 'Poplavo';
-
-  @override
-  String get routing_modeManual => 'Navodilo';
-
-  @override
-  String get routing_modeAutoHint =>
-      'Samodejno izbere najbolj poznano pot, in sicer, ko ni na voljo nobena.';
-
-  @override
-  String get routing_modeFloodHint =>
-      'Prenosi preko vseh repetitorjev. Najzanesljivejši način, vendar zahteva več časa.';
-
-  @override
-  String get routing_modeManualHint =>
-      'Vedno sledi natančni poti, ki jo ste določili.';
-
-  @override
-  String get routing_currentRoute => 'Trenutna pot';
-
-  @override
-  String get routing_directNoHops => 'Neposredno – brez prehodov';
-
-  @override
-  String get routing_noPathYet =>
-      'Žep trenutno ni mogoče najti. Naslednje sporočilo bo posredovano, dokler ne bo ugotovljeno, kje je pot.';
-
-  @override
-  String get routing_floodBroadcast => 'Prenos preko vseh repetitiv';
-
-  @override
-  String get routing_editPath => 'Uredi pot';
-
-  @override
-  String get routing_forgetPath => 'Pozabi na pot';
-
-  @override
-  String get routing_knownPaths => 'Poznati poti';
-
-  @override
-  String get routing_knownPathsHint => 'Kliknite na pot, da jo izberete.';
-
-  @override
-  String get routing_inUse => 'V uporabi';
-
-  @override
-  String get routing_qualityStrong => 'Močan prvi korak';
-
-  @override
-  String get routing_qualityGood => 'Prva uspešna faza';
-
-  @override
-  String get routing_qualityFair => 'Prva, uspešna faza';
-
-  @override
-  String get routing_qualityWorked => 'Izpolnil';
-
-  @override
-  String get routing_qualityFlood => 'Slišano preko poplave';
-
-  @override
-  String get routing_qualityUntested => 'Ne preizkušen';
-
-  @override
-  String routing_lastWorked(String when) {
-    return 'delal/a $when';
+  String chat_pathSetHops(int hopCount, String status) {
+    String _temp0 = intl.Intl.pluralLogic(
+      hopCount,
+      locale: localeName,
+      other: 'hops',
+      one: 'hop',
+    );
+    return 'Pot nastavljen: $hopCount $_temp0 - $status';
  }

-  @override
-  String get routing_neverWorked => 'nikoli ni bilo potrjeno';
-
-  @override
-  String routing_deliveryCounts(int successes, int failures) {
-    return '$successes delivered, $failures failed';
-  }
-
-  @override
-  String get routing_floodDelivery => 'Dostava zaradi poplave';
-
-  @override
-  String get pathEditor_title => 'Izgradnja poti';
-
-  @override
-  String pathEditor_hopCounter(int count) {
-    return '$count od 64 različnih sort hropa';
-  }
-
-  @override
-  String get pathEditor_noHops =>
-      'Še niso dodani hmelji. Za dodajanje hmelja v vrstnem redu kliknite na povezavo spodaj, ali pa shranite brez dodanega hmelja, da ga lahko posredujete neposredno.';
-
-  @override
-  String get pathEditor_addHops => 'Dodajte suho travo v skladu s postopkom.';
-
-  @override
-  String get pathEditor_searchRepeaters => 'Iskanje ponovitev';
-
-  @override
-  String get pathEditor_advancedHex => 'Napredno: surovi šestnajstni pot';
-
-  @override
-  String get pathEditor_hexLabel => 'Predfiks za heksadecimalno šifro';
-
-  @override
-  String get pathEditor_hexHelper =>
-      'Dva šestbitna znaka na vsak skok, ločena z vejico';
-
-  @override
-  String pathEditor_invalidTokens(String tokens) {
-    return 'Neveljaven: $tokens';
-  }
-
-  @override
-  String get pathEditor_tooManyHops => 'Največ 64 hopov';
-
-  @override
-  String get pathEditor_usePath => 'Uporabite to poto';
-
-  @override
-  String get pathEditor_removeHop => 'Odstranite hmelj';
-
-  @override
-  String get pathEditor_unknownHop => 'Neznani ponovitelj';
-
  @override
  String get chat_pathSavedLocally =>
      'Shrano lokalno. Povežite se za sinhronizacijo.';
@@ -1723,39 +1631,6 @@ class AppLocalizationsSl extends AppLocalizations {
  @override
  String get map_title => 'Mapa omrežja';

-  @override
-  String get map_searchHint => 'Iščite ime ali ID vozlišča';
-
-  @override
-  String get map_activity => 'Dejavnost';
-
-  @override
-  String get map_online => 'V omrežju';
-
-  @override
-  String get map_recent => 'Nedavni';
-
-  @override
-  String get map_stale => 'Zastarelo';
-
-  @override
-  String get map_visible => 'Vidno';
-
-  @override
-  String get map_hidden => 'Skrit';
-
-  @override
-  String get map_centerOnNode => 'Centriraj na vozlišče';
-
-  @override
-  String get map_details => 'Podrobnosti';
-
-  @override
-  String get map_noGps => 'Brez GPS';
-
-  @override
-  String get map_noResults => 'Ni ujemajočih se vozlišč';
-
  @override
  String get map_lineOfSight => 'Linija vida';

@@ -2086,6 +1961,17 @@ class AppLocalizationsSl extends AppLocalizations {
  String get dialog_disconnectConfirm =>
      'Ste prepričani, da želite se odklopiti s tega naprave?';

+  @override
+  String get dialog_disconnectedTitle => 'Prekinjeno';
+
+  @override
+  String get dialog_disconnectedMessage =>
+      'Prekinjena povezava s vašim spre伴ovalcem.';
+
+  @override
+  String get dialog_connectCompanion =>
+      'Povežite se s spremljevalnikom za dostop do funkcij ponavljalnika in strežnika sob.';
+
  @override
  String get login_repeaterLogin => 'Ponovni vnos';

@@ -2151,13 +2037,65 @@ class AppLocalizationsSl extends AppLocalizations {
  @override
  String get common_clear => 'Ponoviti';

+  @override
+  String path_currentPath(String path) {
+    return 'Trenutna pot: $path';
+  }
+
+  @override
+  String path_usingHopsPath(int count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other: 'hops',
+      one: 'hop',
+    );
+    return 'Uporablja $count $_temp0 pot';
+  }
+
+  @override
+  String get path_enterCustomPath => 'Vnesite prilagojeno pot';
+
  @override
  String get path_currentPathLabel => 'Trenutna pot';

+  @override
+  String get path_hexPrefixInstructions =>
+      'Vnesite 2-karakterne heksadecimalne prefixe za vsako skopo, ločeno z zvezekami.';
+
+  @override
+  String get path_hexPrefixExample =>
+      'Primer: A1,F2,3C (vsak notranji element uporablja prvi bajt svojega javnega ključa)';
+
+  @override
+  String get path_labelHexPrefixes => 'Pot (heksafixne skrajšave)';
+
+  @override
+  String get path_helperMaxHops =>
+      'Maksimalno 64 skokov. Vsak prefiks je 2 heksadecimalna znamenja (1 bajt).';
+
+  @override
+  String get path_selectFromContacts => 'Izberi iz kontaktov:';
+
  @override
  String get path_noRepeatersFound =>
      'Ne najdenih ponoviteljev ali strežnikov sob.';

+  @override
+  String get path_customPathsRequire =>
+      'Prilojene poti zahtevajo medhodne prenose, ki lahko prenašajo sporočila.';
+
+  @override
+  String path_invalidHexPrefixes(String prefixes) {
+    return 'Neveljačni šesteročlenski prefiksi: $prefixes';
+  }
+
+  @override
+  String get path_tooLong => 'Pot je prevelika. Dovoljeno največ 64 skokov.';
+
+  @override
+  String get path_setPath => 'Nastavi Pot';
+
  @override
  String get repeater_management => 'Upravljanje ponovitve';

@@ -2223,6 +2161,15 @@ class AppLocalizationsSl extends AppLocalizations {
  @override
  String get repeater_routingMode => 'Navodilo za usmerjevalni način';

+  @override
+  String get repeater_autoUseSavedPath => 'Avto (uporabi shranjeno pot)';
+
+  @override
+  String get repeater_forceFloodMode => 'Nasilje obvezati v način';
+
+  @override
+  String get repeater_pathManagement => 'Upravljanje poti';
+
  @override
  String get repeater_refresh => 'Ponovno obnavljati';

@@ -3314,139 +3261,6 @@ class AppLocalizationsSl extends AppLocalizations {
    return '$celsius°C / $fahrenheit°F';
  }

-  @override
-  String get telemetry_digitalInputLabel => 'Digitalni vhod';
-
-  @override
-  String get telemetry_digitalOutputLabel => 'Digitalni izhod';
-
-  @override
-  String get telemetry_analogInputLabel => 'Analogni vhod';
-
-  @override
-  String get telemetry_analogOutputLabel => 'Analogni izhod';
-
-  @override
-  String get telemetry_genericLabel => 'Splošni senzor';
-
-  @override
-  String get telemetry_luminosityLabel => 'Osvetljenost';
-
-  @override
-  String get telemetry_presenceLabel => 'Prisotnost';
-
-  @override
-  String get telemetry_humidityLabel => 'Vlažnost';
-
-  @override
-  String get telemetry_accelerometerLabel => 'Merilnik pospeška';
-
-  @override
-  String get telemetry_pressureLabel => 'Tlak';
-
-  @override
-  String get telemetry_altitudeLabel => 'Nadmorska višina';
-
-  @override
-  String get telemetry_frequencyLabel => 'Frekvenca';
-
-  @override
-  String get telemetry_percentageLabel => 'Odstotek';
-
-  @override
-  String get telemetry_concentrationLabel => 'Koncentracija';
-
-  @override
-  String get telemetry_powerLabel => 'Moč';
-
-  @override
-  String get telemetry_distanceLabel => 'Razdalja';
-
-  @override
-  String get telemetry_energyLabel => 'Energija';
-
-  @override
-  String get telemetry_directionLabel => 'Smer';
-
-  @override
-  String get telemetry_timeLabel => 'Čas';
-
-  @override
-  String get telemetry_gyrometerLabel => 'Žiroskop';
-
-  @override
-  String get telemetry_colourLabel => 'Barva';
-
-  @override
-  String get telemetry_gpsLabel => 'GPS';
-
-  @override
-  String get telemetry_switchLabel => 'Stikalo';
-
-  @override
-  String get telemetry_polylineLabel => 'Polilinija';
-
-  @override
-  String telemetry_altitudeValue(String meters) {
-    return '$meters m';
-  }
-
-  @override
-  String telemetry_frequencyValue(String hertz) {
-    return '$hertz Hz';
-  }
-
-  @override
-  String telemetry_pressureValue(String hpa) {
-    return '$hpa hPa';
-  }
-
-  @override
-  String telemetry_luminosityValue(String lux) {
-    return '$lux lx';
-  }
-
-  @override
-  String telemetry_powerValue(String watts) {
-    return '$watts W';
-  }
-
-  @override
-  String telemetry_distanceValue(String meters) {
-    return '$meters m';
-  }
-
-  @override
-  String telemetry_energyValue(String kilowattHours) {
-    return '$kilowattHours kWh';
-  }
-
-  @override
-  String telemetry_directionValue(String degrees) {
-    return '$degrees°';
-  }
-
-  @override
-  String telemetry_concentrationValue(String ppm) {
-    return '$ppm ppm';
-  }
-
-  @override
-  String telemetry_percentageValue(String percent) {
-    return '$percent%';
-  }
-
-  @override
-  String telemetry_analogValue(String value) {
-    return '$value';
-  }
-
-  @override
-  String get telemetry_autoFetchQuantity => 'Število zahtev';
-
-  @override
-  String get telemetry_error => 'Podatkov ni bilo mogoče pridobiti';
-
  @override
  String get neighbors_receivedData => 'Prejeto podatke o sosedih';

@@ -4336,16 +4150,6 @@ class AppLocalizationsSl extends AppLocalizations {
  String get translation_composerSubtitle =>
      'Ureja privzeto stanje ikone za prevod, ki jo uporablja avtor.';

-  @override
-  String get translation_autoIncomingTitle => 'Samodejno prevajaj sporočila';
-
-  @override
-  String get translation_autoIncomingSubtitle =>
-      'Samodejno prevaja sporočila za obvestila ter za klepete ali kanale.';
-
-  @override
-  String get translation_translateMessage => 'Prevedi sporočilo';
-
  @override
  String get translation_targetLanguage => 'Ciljna jezika';

@@ -4474,139 +4278,4 @@ class AppLocalizationsSl extends AppLocalizations {

  @override
  String get contact_typeUnknown => 'Unknown';
-
-  @override
-  String get map_zoomIn => 'Povečaj';
-
-  @override
-  String get map_zoomOut => 'Povečajte pogled';
-
-  @override
-  String get map_centerMap => 'Krajšarska karta';
-
-  @override
-  String get chrome_bluetoothRequiresChromium =>
-      'Web Bluetooth zahteva brskalnik Chromium.';
-
-  @override
-  String channels_communityShortId(String id) {
-    return 'ID: $id...';
-  }
-
-  @override
-  String get pathTrace_legendGpsConfirmed => 'GPS potrdilo';
-
-  @override
-  String get pathTrace_legendInferred => 'Izpeljana lokacija';
-
-  @override
-  String get pathMap_viewSingle => 'Posamično';
-
-  @override
-  String get pathMap_viewCombined => 'Skupno';
-
-  @override
-  String get pathMap_play => 'Predvajaj';
-
-  @override
-  String get pathMap_pause => 'Premor';
-
-  @override
-  String get pathMap_replay => 'Ponovitev';
-
-  @override
-  String get pathMap_stepBack => 'Prejšnji skok';
-
-  @override
-  String get pathMap_stepForward => 'Naslednji skok';
-
-  @override
-  String get pathMap_animationOn => 'Prikaži animacijo paketa';
-
-  @override
-  String get pathMap_animationOff => 'Skrij animacijo paketa';
-
-  @override
-  String pathMap_hopOf(int current, int total) {
-    return 'Skok $current od $total';
-  }
-
-  @override
-  String pathMap_observedPaths(int count) {
-    return 'Opazovane poti: $count';
-  }
-
-  @override
-  String get pathMap_primary => 'Primarna';
-
-  @override
-  String pathMap_alternate(int index) {
-    return 'Alternativa $index';
-  }
-
-  @override
-  String pathMap_hopCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count skokov',
-      few: '$count skoki',
-      two: '2 skoka',
-      one: '1 skok',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String pathMap_gpsCount(int confirmed, int total) {
-    return '$confirmed/$total GPS';
-  }
-
-  @override
-  String get pathMap_legendShared => 'Deljen segment';
-
-  @override
-  String get pathMap_legendEstimated => 'Ocenjen segment';
-
-  @override
-  String pathMap_sharedNodeCount(int count) {
-    return 'Uporablja $count poti';
-  }
-
-  @override
-  String pathMap_partialAnimation(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count skokov nima lokacije — prikazana pot je delna',
-      few: '$count skoki nimajo lokacije — prikazana pot je delna',
-      two: '2 skoka nimata lokacije — prikazana pot je delna',
-      one: '1 skok nima lokacije — prikazana pot je delna',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get pathMap_showAllPaths => 'Pokaži vse';
-
-  @override
-  String get pathMap_hidePath => 'Skrij pot';
-
-  @override
-  String get pathMap_showPath => 'Pokaži pot';
-
-  @override
-  String get pathMap_collapsePanel => 'Strni ploščo';
-
-  @override
-  String get pathMap_expandPanel => 'Razširi ploščo';
-
-  @override
-  String get pathMap_noLocation => 'Brez lokacije';
-
-  @override
-  String get pathMap_followPacket => 'Zakleni pogled na paket';
-
-  @override
-  String get pathMap_unfollowPacket => 'Odkleni pogled od paketa';
 }
@@ -92,24 +92,6 @@ class AppLocalizationsSv extends AppLocalizations {
  @override
  String get common_disable => 'Inaktivera';

-  @override
-  String get common_undo => 'Ångra';
-
-  @override
-  String get messageStatus_sent => 'Sen';
-
-  @override
-  String get messageStatus_delivered => 'Levererad';
-
-  @override
-  String get messageStatus_pending => 'Skicka';
-
-  @override
-  String get messageStatus_failed => 'Misslyckades med att skicka';
-
-  @override
-  String get messageStatus_repeated => 'Hördes upprepade gånger';
-
  @override
  String get common_reboot => 'Start om';

@@ -129,12 +111,6 @@ class AppLocalizationsSv extends AppLocalizations {
    return '$percent%';
  }

-  @override
-  String get common_autoRefresh => 'Automatisk uppdatering';
-
-  @override
-  String get common_interval => 'Intervall';
-
  @override
  String get scanner_title => 'MeshCore – Öppen version';

@@ -316,10 +292,6 @@ class AppLocalizationsSv extends AppLocalizations {
  @override
  String get scanner_enableBluetooth => 'Aktivera Bluetooth';

-  @override
-  String get scanner_bluetoothWebUnsupported =>
-      'Bluetooth är inte tillgängligt i webbläsaren. Anslut istället via USB.';
-
  @override
  String get device_quickSwitch => 'Snabb växling';

@@ -799,6 +771,11 @@ class AppLocalizationsSv extends AppLocalizations {
  String get appSettings_maxMessageRetriesSubtitle =>
      'Antal försök att skicka om ett meddelande innan det markeras som misslyckat.';

+  @override
+  String path_routeWeight(String weight, String max) {
+    return '$weight/$max';
+  }
+
  @override
  String get appSettings_battery => 'Batteri';

@@ -999,15 +976,6 @@ class AppLocalizationsSv extends AppLocalizations {
  @override
  String get contacts_newGroup => 'Ny grupp';

-  @override
-  String get contacts_moreOptions => 'Fler alternativ';
-
-  @override
-  String get contacts_searchOpen => 'Sök efter kontakter';
-
-  @override
-  String get contacts_searchClose => 'Avancerad sökning';
-
  @override
  String get contacts_groupName => 'Gruppnamn';

@@ -1486,6 +1454,35 @@ class AppLocalizationsSv extends AppLocalizations {
  @override
  String get debugFrame_hexDump => 'Hexdump:';

+  @override
+  String get chat_pathManagement => 'Stigarhantering';
+
+  @override
+  String get chat_ShowAllPaths => 'Visa alla vägar';
+
+  @override
+  String get chat_routingMode => 'Ruttläge';
+
+  @override
+  String get chat_autoUseSavedPath => 'Automatisk (använd sparad sökväg)';
+
+  @override
+  String get chat_forceFloodMode => 'Tvinga Översvämningsläge';
+
+  @override
+  String get chat_recentAckPaths =>
+      'Nyligen Ack-vägar (tryck för att använda):';
+
+  @override
+  String get chat_pathHistoryFull =>
+      'Historisk sökväg är full. Ta bort poster för att lägga till nya.';
+
+  @override
+  String get chat_hopSingular => 'hoppa';
+
+  @override
+  String get chat_hopPlural => 'hoppar';
+
  @override
  String chat_hopsCount(int count) {
    String _temp0 = intl.Intl.pluralLogic(
@@ -1497,6 +1494,12 @@ class AppLocalizationsSv extends AppLocalizations {
    return '$count $_temp0';
  }

+  @override
+  String get chat_successes => 'framgångar';
+
+  @override
+  String get chat_score => 'Score';
+
  @override
  String get chat_removePath => 'Ta bort sökväg';

@@ -1504,144 +1507,50 @@ class AppLocalizationsSv extends AppLocalizations {
  String get chat_noPathHistoryYet =>
      'Ingen historik ännu.\nSkicka ett meddelande för att upptäcka spår.';

+  @override
+  String get chat_pathActions => 'Stigar:';
+
+  @override
+  String get chat_setCustomPath => 'Ange anpassad sökväg';
+
+  @override
+  String get chat_setCustomPathSubtitle => 'Ange ruttväg manuellt';
+
+  @override
+  String get chat_clearPath => 'Rensa Vägen';
+
+  @override
+  String get chat_clearPathSubtitle => 'Tvinga fram omstart vid nästa sändning';
+
  @override
  String get chat_pathCleared =>
      'Routen är nu fri. Nästa meddelande kommer att upptäcka rutten igen.';

+  @override
+  String get chat_floodModeSubtitle => 'Använd routningsomkopplaren i appraden';
+
+  @override
+  String get chat_floodModeEnabled =>
+      'Översvämningsläge aktiverat. Stäng av via ruttikonen i appraden.';
+
  @override
  String get chat_fullPath => 'Fullständig sökväg';

  @override
-  String get routing_title => 'Ruttplanering';
+  String get chat_pathDetailsNotAvailable =>
+      'Stigaruppgifterna är ännu inte tillgängliga. Försök att skicka ett meddelande för att uppdatera.';

  @override
-  String get routing_modeAuto => 'Bil';
-
-  @override
-  String get routing_modeFlood => 'Översvämning';
-
-  @override
-  String get routing_modeManual => 'Instruktioner';
-
-  @override
-  String get routing_modeAutoHint =>
-      'Väljer automatiskt den bästa kända vägen, och använder en \"flooding\"-strategi om ingen väg är känd.';
-
-  @override
-  String get routing_modeFloodHint =>
-      'Sändningar via alla repetrar. Det mest pålitliga alternativet, men kräver mer sändtid.';
-
-  @override
-  String get routing_modeManualHint =>
-      'Skickar alltid den exakta väg du har angivit.';
-
-  @override
-  String get routing_currentRoute => 'Nuvarande rutt';
-
-  @override
-  String get routing_directNoHops => 'Direkt – utan mellanliggande routrar';
-
-  @override
-  String get routing_noPathYet =>
-      'Ingen väg hittad ännu. Nästa meddelande skickas tills en rutt har upptäckts.';
-
-  @override
-  String get routing_floodBroadcast => 'Sändas via alla repetrar';
-
-  @override
-  String get routing_editPath => 'Redigera sökväg';
-
-  @override
-  String get routing_forgetPath => 'Glöm vägen';
-
-  @override
-  String get routing_knownPaths => 'Kända vägar';
-
-  @override
-  String get routing_knownPathsHint => 'Välj en väg för att byta till den.';
-
-  @override
-  String get routing_inUse => 'I användning';
-
-  @override
-  String get routing_qualityStrong => 'En stark start';
-
-  @override
-  String get routing_qualityGood => 'Bra första steg';
-
-  @override
-  String get routing_qualityFair => 'Bra första hopp';
-
-  @override
-  String get routing_qualityWorked => 'Har levererat';
-
-  @override
-  String get routing_qualityFlood => 'Fått information via nyhetsflöde';
-
-  @override
-  String get routing_qualityUntested => 'Ej testat';
-
-  @override
-  String routing_lastWorked(String when) {
-    return 'arbetade $when';
+  String chat_pathSetHops(int hopCount, String status) {
+    String _temp0 = intl.Intl.pluralLogic(
+      hopCount,
+      locale: localeName,
+      other: 'hoppar',
+      one: 'hopp',
+    );
+    return 'Sökväg inställd: $hopCount $_temp0 - $status';
  }

-  @override
-  String get routing_neverWorked => 'aldrig bekräftat';
-
-  @override
-  String routing_deliveryCounts(int successes, int failures) {
-    return '$successes delivered, $failures failed';
-  }
-
-  @override
-  String get routing_floodDelivery => 'Leverans vid översvämningsområde';
-
-  @override
-  String get pathEditor_title => 'Skapa väg';
-
-  @override
-  String pathEditor_hopCounter(int count) {
-    return '$count av 64 humlor';
-  }
-
-  @override
-  String get pathEditor_noHops =>
-      'Inga humle än. Använd knapparna nedan för att lägga till dem i rätt ordning, eller spara utan humle för att skicka direkt.';
-
-  @override
-  String get pathEditor_addHops => 'Tillsätt humlen i rätt ordning.';
-
-  @override
-  String get pathEditor_searchRepeaters => 'Sök efter återupptagna samtal';
-
-  @override
-  String get pathEditor_advancedHex => 'Avancerat: rå hex-sökväg';
-
-  @override
-  String get pathEditor_hexLabel => 'Hex-prefikser';
-
-  @override
-  String get pathEditor_hexHelper =>
-      'Två hex-tecken per steg, separerade med kommatecken.';
-
-  @override
-  String pathEditor_invalidTokens(String tokens) {
-    return 'Ogiltigt: $tokens';
-  }
-
-  @override
-  String get pathEditor_tooManyHops => 'Maximalt 64 humlörter';
-
-  @override
-  String get pathEditor_usePath => 'Använd denna väg';
-
-  @override
-  String get pathEditor_removeHop => 'Ta bort humlen';
-
-  @override
-  String get pathEditor_unknownHop => 'Okänd förstärkare';
-
  @override
  String get chat_pathSavedLocally =>
      'Sparat lokalt. Anslut för att synkronisera.';
@@ -1716,39 +1625,6 @@ class AppLocalizationsSv extends AppLocalizations {
  @override
  String get map_title => 'Nodkarta';

-  @override
-  String get map_searchHint => 'Sök efter nodens namn eller ID';
-
-  @override
-  String get map_activity => 'Aktivitet';
-
-  @override
-  String get map_online => 'Online';
-
-  @override
-  String get map_recent => 'Nyligen';
-
-  @override
-  String get map_stale => 'Inaktuell';
-
-  @override
-  String get map_visible => 'Synlig';
-
-  @override
-  String get map_hidden => 'Dold';
-
-  @override
-  String get map_centerOnNode => 'Centrera på nod';
-
-  @override
-  String get map_details => 'Detaljer';
-
-  @override
-  String get map_noGps => 'Ingen GPS';
-
-  @override
-  String get map_noResults => 'Inga matchande noder';
-
  @override
  String get map_lineOfSight => 'Synlinje';

@@ -2074,6 +1950,17 @@ class AppLocalizationsSv extends AppLocalizations {
  String get dialog_disconnectConfirm =>
      'Är du säker på att du vill koppla från enheten?';

+  @override
+  String get dialog_disconnectedTitle => 'Ansluten ej';
+
+  @override
+  String get dialog_disconnectedMessage =>
+      'Du har kopplats från din companion.';
+
+  @override
+  String get dialog_connectCompanion =>
+      'Anslut till en sällskapstjänst för att komma åt upprepning och rumsserverfunktioner.';
+
  @override
  String get login_repeaterLogin => 'Återuppta Inloggning';

@@ -2139,13 +2026,65 @@ class AppLocalizationsSv extends AppLocalizations {
  @override
  String get common_clear => 'Rensa';

+  @override
+  String path_currentPath(String path) {
+    return 'Nuvarande sökväg: $path';
+  }
+
+  @override
+  String path_usingHopsPath(int count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other: 'hops',
+      one: 'hop',
+    );
+    return 'Använda $count $_temp0 sökväg';
+  }
+
+  @override
+  String get path_enterCustomPath => 'Ange anpassad sökväg';
+
  @override
  String get path_currentPathLabel => 'Nuvarande sökväg';

+  @override
+  String get path_hexPrefixInstructions =>
+      'Ange 2-tecknets hex-prefett för varje hopp, åtskilda med komma.';
+
+  @override
+  String get path_hexPrefixExample =>
+      'Exempel: A1,F2,3C (varje nod använder det första bytet av sitt publika nyckel)';
+
+  @override
+  String get path_labelHexPrefixes => 'Hexprefixer';
+
+  @override
+  String get path_helperMaxHops =>
+      'Max 64 hopp. Varje prefix är 2 hex-tecken (1 byte)';
+
+  @override
+  String get path_selectFromContacts => 'Välj istället från kontakter:';
+
  @override
  String get path_noRepeatersFound =>
      'Inga återuppspelare eller rumsservrar hittades.';

+  @override
+  String get path_customPathsRequire =>
+      'Anpassade sökvägar kräver mellansteg som kan vidarebefordra meddelanden.';
+
+  @override
+  String path_invalidHexPrefixes(String prefixes) {
+    return 'Ogiltiga hex-prefikser: $prefixes';
+  }
+
+  @override
+  String get path_tooLong => 'Sökvägen är för lång. Max 64 hopp tillåtna.';
+
+  @override
+  String get path_setPath => 'Ange Sökväg';
+
  @override
  String get repeater_management => 'Återuppspelarens Hantering';

@@ -2210,6 +2149,15 @@ class AppLocalizationsSv extends AppLocalizations {
  @override
  String get repeater_routingMode => 'Ruttläge';

+  @override
+  String get repeater_autoUseSavedPath => 'Automatisk (använd sparad sökväg)';
+
+  @override
+  String get repeater_forceFloodMode => 'Tvinga Översvämningsläge';
+
+  @override
+  String get repeater_pathManagement => 'Stigarhantering';
+
  @override
  String get repeater_refresh => 'Uppdatera';

@@ -3294,139 +3242,6 @@ class AppLocalizationsSv extends AppLocalizations {
    return '$celsius°C / $fahrenheit°F';
  }

-  @override
-  String get telemetry_digitalInputLabel => 'Digital ingång';
-
-  @override
-  String get telemetry_digitalOutputLabel => 'Digital utgång';
-
-  @override
-  String get telemetry_analogInputLabel => 'Analog ingång';
-
-  @override
-  String get telemetry_analogOutputLabel => 'Analog utgång';
-
-  @override
-  String get telemetry_genericLabel => 'Allmän sensor';
-
-  @override
-  String get telemetry_luminosityLabel => 'Ljusstyrka';
-
-  @override
-  String get telemetry_presenceLabel => 'Närvaro';
-
-  @override
-  String get telemetry_humidityLabel => 'Luftfuktighet';
-
-  @override
-  String get telemetry_accelerometerLabel => 'Accelerometer';
-
-  @override
-  String get telemetry_pressureLabel => 'Tryck';
-
-  @override
-  String get telemetry_altitudeLabel => 'Höjd';
-
-  @override
-  String get telemetry_frequencyLabel => 'Frekvens';
-
-  @override
-  String get telemetry_percentageLabel => 'Procent';
-
-  @override
-  String get telemetry_concentrationLabel => 'Koncentration';
-
-  @override
-  String get telemetry_powerLabel => 'Effekt';
-
-  @override
-  String get telemetry_distanceLabel => 'Avstånd';
-
-  @override
-  String get telemetry_energyLabel => 'Energi';
-
-  @override
-  String get telemetry_directionLabel => 'Riktning';
-
-  @override
-  String get telemetry_timeLabel => 'Tid';
-
-  @override
-  String get telemetry_gyrometerLabel => 'Gyrometer';
-
-  @override
-  String get telemetry_colourLabel => 'Färg';
-
-  @override
-  String get telemetry_gpsLabel => 'GPS';
-
-  @override
-  String get telemetry_switchLabel => 'Brytare';
-
-  @override
-  String get telemetry_polylineLabel => 'Polylinje';
-
-  @override
-  String telemetry_altitudeValue(String meters) {
-    return '$meters m';
-  }
-
-  @override
-  String telemetry_frequencyValue(String hertz) {
-    return '$hertz Hz';
-  }
-
-  @override
-  String telemetry_pressureValue(String hpa) {
-    return '$hpa hPa';
-  }
-
-  @override
-  String telemetry_luminosityValue(String lux) {
-    return '$lux lx';
-  }
-
-  @override
-  String telemetry_powerValue(String watts) {
-    return '$watts W';
-  }
-
-  @override
-  String telemetry_distanceValue(String meters) {
-    return '$meters m';
-  }
-
-  @override
-  String telemetry_energyValue(String kilowattHours) {
-    return '$kilowattHours kWh';
-  }
-
-  @override
-  String telemetry_directionValue(String degrees) {
-    return '$degrees°';
-  }
-
-  @override
-  String telemetry_concentrationValue(String ppm) {
-    return '$ppm ppm';
-  }
-
-  @override
-  String telemetry_percentageValue(String percent) {
-    return '$percent%';
-  }
-
-  @override
-  String telemetry_analogValue(String value) {
-    return '$value';
-  }
-
-  @override
-  String get telemetry_autoFetchQuantity => 'Antal förfrågningar';
-
-  @override
-  String get telemetry_error => 'Det gick inte att hämta data';
-
  @override
  String get neighbors_receivedData => 'Mottagna grannars data';

@@ -4309,17 +4124,6 @@ class AppLocalizationsSv extends AppLocalizations {
  String get translation_composerSubtitle =>
      'Styr standardtillståndet för kompositorns översättningsikon.';

-  @override
-  String get translation_autoIncomingTitle =>
-      'Översätt meddelanden automatiskt';
-
-  @override
-  String get translation_autoIncomingSubtitle =>
-      'Översätter meddelanden automatiskt för aviseringar och för chattar eller kanaler.';
-
-  @override
-  String get translation_translateMessage => 'Översätt meddelande';
-
  @override
  String get translation_targetLanguage => 'Målmedvetet språk';

@@ -4448,135 +4252,4 @@ class AppLocalizationsSv extends AppLocalizations {

  @override
  String get contact_typeUnknown => 'Unknown';
-
-  @override
-  String get map_zoomIn => 'Zooma in';
-
-  @override
-  String get map_zoomOut => 'Zooma ut';
-
-  @override
-  String get map_centerMap => 'Kartöversikt';
-
-  @override
-  String get chrome_bluetoothRequiresChromium =>
-      'Web Bluetooth kräver en Chromium-baserad webbläsare.';
-
-  @override
-  String channels_communityShortId(String id) {
-    return 'ID: $id...';
-  }
-
-  @override
-  String get pathTrace_legendGpsConfirmed => 'GPS-verifierat';
-
-  @override
-  String get pathTrace_legendInferred => 'Antagen position';
-
-  @override
-  String get pathMap_viewSingle => 'Enkel';
-
-  @override
-  String get pathMap_viewCombined => 'Kombinerat';
-
-  @override
-  String get pathMap_play => 'Spela';
-
-  @override
-  String get pathMap_pause => 'Pausa';
-
-  @override
-  String get pathMap_replay => 'Återspela';
-
-  @override
-  String get pathMap_stepBack => 'Föregående hopp';
-
-  @override
-  String get pathMap_stepForward => 'Nästa hopp';
-
-  @override
-  String get pathMap_animationOn => 'Visa paketanimering';
-
-  @override
-  String get pathMap_animationOff => 'Dölj paketanimering';
-
-  @override
-  String pathMap_hopOf(int current, int total) {
-    return 'Hopp $current av $total';
-  }
-
-  @override
-  String pathMap_observedPaths(int count) {
-    return 'Observerade vägar: $count';
-  }
-
-  @override
-  String get pathMap_primary => 'Primär';
-
-  @override
-  String pathMap_alternate(int index) {
-    return 'Alternativ $index';
-  }
-
-  @override
-  String pathMap_hopCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count hopp',
-      one: '1 hopp',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String pathMap_gpsCount(int confirmed, int total) {
-    return '$confirmed/$total GPS';
-  }
-
-  @override
-  String get pathMap_legendShared => 'Delat segment';
-
-  @override
-  String get pathMap_legendEstimated => 'Uppskattat segment';
-
-  @override
-  String pathMap_sharedNodeCount(int count) {
-    return 'Används av $count vägar';
-  }
-
-  @override
-  String pathMap_partialAnimation(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count hopp saknar position — den visade vägen är ofullständig',
-      one: '1 hopp saknar position — den visade vägen är ofullständig',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get pathMap_showAllPaths => 'Visa allt';
-
-  @override
-  String get pathMap_hidePath => 'Dölj väg';
-
-  @override
-  String get pathMap_showPath => 'Visa väg';
-
-  @override
-  String get pathMap_collapsePanel => 'Fäll ihop panel';
-
-  @override
-  String get pathMap_expandPanel => 'Expandera panel';
-
-  @override
-  String get pathMap_noLocation => 'Ingen position';
-
-  @override
-  String get pathMap_followPacket => 'Lås vy till paket';
-
-  @override
-  String get pathMap_unfollowPacket => 'Lås upp vy från paket';
 }
@@ -92,24 +92,6 @@ class AppLocalizationsUk extends AppLocalizations {
  @override
  String get common_disable => 'Вимкнути';

-  @override
-  String get common_undo => 'Скасувати';
-
-  @override
-  String get messageStatus_sent => 'Надіслано';
-
-  @override
-  String get messageStatus_delivered => 'Доставлено';
-
-  @override
-  String get messageStatus_pending => 'Надсилання';
-
-  @override
-  String get messageStatus_failed => 'Не вдалося надіслати';
-
-  @override
-  String get messageStatus_repeated => 'Почув неодноразово';
-
  @override
  String get common_reboot => 'Перезавантажити';

@@ -129,12 +111,6 @@ class AppLocalizationsUk extends AppLocalizations {
    return '$percent%';
  }

-  @override
-  String get common_autoRefresh => 'Автооновлення';
-
-  @override
-  String get common_interval => 'Інтервал';
-
  @override
  String get scanner_title => 'MeshCore: Відкритий доступ';

@@ -319,10 +295,6 @@ class AppLocalizationsUk extends AppLocalizations {
  @override
  String get scanner_enableBluetooth => 'Увімкніть Bluetooth';

-  @override
-  String get scanner_bluetoothWebUnsupported =>
-      'Bluetooth недоступний у браузері. Підключіться через USB.';
-
  @override
  String get device_quickSwitch => 'Швидке перемикання';

@@ -811,6 +783,11 @@ class AppLocalizationsUk extends AppLocalizations {
  String get appSettings_maxMessageRetriesSubtitle =>
      'Кількість спроб повторного відправлення повідомлення перед тим, як позначити його як невдале';

+  @override
+  String path_routeWeight(String weight, String max) {
+    return '$weight/$max';
+  }
+
  @override
  String get appSettings_battery => 'Батарея';

@@ -1012,15 +989,6 @@ class AppLocalizationsUk extends AppLocalizations {
  @override
  String get contacts_newGroup => 'Нова група';

-  @override
-  String get contacts_moreOptions => 'Більше можливостей';
-
-  @override
-  String get contacts_searchOpen => 'Пошук контактів';
-
-  @override
-  String get contacts_searchClose => 'Закрити пошук';
-
  @override
  String get contacts_groupName => 'Назва групи';

@@ -1500,6 +1468,35 @@ class AppLocalizationsUk extends AppLocalizations {
  @override
  String get debugFrame_hexDump => 'Дамп Hex:';

+  @override
+  String get chat_pathManagement => 'Керування шляхами';
+
+  @override
+  String get chat_ShowAllPaths => 'Показати всі шляхи';
+
+  @override
+  String get chat_routingMode => 'Режим маршрутизації';
+
+  @override
+  String get chat_autoUseSavedPath => 'Авто (використовувати збережений шлях)';
+
+  @override
+  String get chat_forceFloodMode => 'Примусово через всю мережу';
+
+  @override
+  String get chat_recentAckPaths =>
+      'Підтверджені шляхи (натисніть, щоб використати):';
+
+  @override
+  String get chat_pathHistoryFull =>
+      'Історія шляхів заповнена. Видаліть записи, щоб додати нові.';
+
+  @override
+  String get chat_hopSingular => 'Перехід';
+
+  @override
+  String get chat_hopPlural => 'переходів';
+
  @override
  String chat_hopsCount(int count) {
    String _temp0 = intl.Intl.pluralLogic(
@@ -1513,6 +1510,12 @@ class AppLocalizationsUk extends AppLocalizations {
    return '$count $_temp0';
  }

+  @override
+  String get chat_successes => 'Успішно';
+
+  @override
+  String get chat_score => 'Оцінка';
+
  @override
  String get chat_removePath => 'Видалити шлях';

@@ -1520,148 +1523,54 @@ class AppLocalizationsUk extends AppLocalizations {
  String get chat_noPathHistoryYet =>
      'Історія шляхів недоступна.\nНадішліть повідомлення, щоб виявити шляхи.';

+  @override
+  String get chat_pathActions => 'Дії зі шляхом:';
+
+  @override
+  String get chat_setCustomPath => 'Встановити власний шлях';
+
+  @override
+  String get chat_setCustomPathSubtitle => 'Вказати шлях маршрутизації вручну';
+
+  @override
+  String get chat_clearPath => 'Очистити шлях';
+
+  @override
+  String get chat_clearPathSubtitle =>
+      'Примусово повторити пошук при наступному надсиланні';
+
  @override
  String get chat_pathCleared =>
      'Шлях очищено. Наступне повідомлення оновить маршрут.';

+  @override
+  String get chat_floodModeSubtitle =>
+      'Використовувати перемикач маршрутизації в панелі застосунку';
+
+  @override
+  String get chat_floodModeEnabled =>
+      'Увімкнено режим «через всю мережу». Перемикайте через іконку маршрутизації на панелі інструментів.';
+
  @override
  String get chat_fullPath => 'Повний шлях';

  @override
-  String get routing_title => 'Маршрутизація';
+  String get chat_pathDetailsNotAvailable =>
+      'Деталі шляху ще недоступні. Спробуйте надіслати повідомлення для оновлення.';

  @override
-  String get routing_modeAuto => 'Автомобіль';
-
-  @override
-  String get routing_modeFlood => 'Повені';
-
-  @override
-  String get routing_modeManual => 'Інструкція';
-
-  @override
-  String get routing_modeAutoHint =>
-      'Автоматично обирає найкращий відомий шлях, та у разі відсутності відомого шляху, використовує алгоритм \"занурення\".';
-
-  @override
-  String get routing_modeFloodHint =>
-      'Передавання через усі ретранслятори. Найбільш надійний спосіб, але потребує більше часу.';
-
-  @override
-  String get routing_modeManualHint =>
-      'Завжди доставляє точно за вказаним вами маршрутом.';
-
-  @override
-  String get routing_currentRoute => 'Поточний маршрут';
-
-  @override
-  String get routing_directNoHops =>
-      'Пряме з\'єднання – без проміжних ретрансляторів';
-
-  @override
-  String get routing_noPathYet =>
-      'Поки що немає жодного шляху. Повідомлення продовжуються надходити, поки не буде знайдено маршрут.';
-
-  @override
-  String get routing_floodBroadcast => 'Поширення через усі ретранслятори';
-
-  @override
-  String get routing_editPath => 'Редагувати шлях';
-
-  @override
-  String get routing_forgetPath => 'Забудь про шлях';
-
-  @override
-  String get routing_knownPaths => 'Відомі маршрути';
-
-  @override
-  String get routing_knownPathsHint =>
-      'Виберіть опцію, щоб переключитися на неї.';
-
-  @override
-  String get routing_inUse => 'У робочому стані';
-
-  @override
-  String get routing_qualityStrong => 'Сильний перший стрибок';
-
-  @override
-  String get routing_qualityGood => 'Чудова перша спроба';
-
-  @override
-  String get routing_qualityFair => 'Перший, але вдалий, крок';
-
-  @override
-  String get routing_qualityWorked => 'Доставлено';
-
-  @override
-  String get routing_qualityFlood => 'Дізнався через новини';
-
-  @override
-  String get routing_qualityUntested => 'Не протестовано';
-
-  @override
-  String routing_lastWorked(String when) {
-    return 'worked $when';
+  String chat_pathSetHops(int hopCount, String status) {
+    String _temp0 = intl.Intl.pluralLogic(
+      hopCount,
+      locale: localeName,
+      other: 'переходів',
+      many: 'переходів',
+      few: 'переходи',
+      one: 'перехід',
+    );
+    return 'Шлях встановлено: $hopCount $_temp0 - $status';
  }

-  @override
-  String get routing_neverWorked => 'ніколи не підтверджено';
-
-  @override
-  String routing_deliveryCounts(int successes, int failures) {
-    return '$successes delivered, $failures failed';
-  }
-
-  @override
-  String get routing_floodDelivery => 'Доставка під час повені';
-
-  @override
-  String get pathEditor_title => 'Створити маршрут';
-
-  @override
-  String pathEditor_hopCounter(int count) {
-    return '$count з 64 штук хмелю';
-  }
-
-  @override
-  String get pathEditor_noHops =>
-      'Ще не додано хміль. Натисніть на відповідні кнопки, щоб додати його в потрібному порядку, або збережіть рецепт без хмілю, щоб відправити його безпосередньо.';
-
-  @override
-  String get pathEditor_addHops => 'Додавайте хміль у наступній послідовності.';
-
-  @override
-  String get pathEditor_searchRepeaters => 'Пошук повторювачів';
-
-  @override
-  String get pathEditor_advancedHex =>
-      'Просунутий рівень: пряма шлях у форматі шестнадцяткової системи.';
-
-  @override
-  String get pathEditor_hexLabel =>
-      'Префікси для шестнадцяткової системи числення';
-
-  @override
-  String get pathEditor_hexHelper =>
-      'Два шестизначні символи на кожний крок, розділені комами';
-
-  @override
-  String pathEditor_invalidTokens(String tokens) {
-    return 'Неправильно: $tokens';
-  }
-
-  @override
-  String get pathEditor_tooManyHops => 'Максимум 64 хмелеві колоди';
-
-  @override
-  String get pathEditor_usePath => 'Використовуйте цей шлях';
-
-  @override
-  String get pathEditor_removeHop => 'Видалити хміль';
-
-  @override
-  String get pathEditor_unknownHop => 'Невідомий ретранслятор';
-
  @override
  String get chat_pathSavedLocally =>
      'Збережено локально. Підключіться для синхронізації.';
@@ -1736,39 +1645,6 @@ class AppLocalizationsUk extends AppLocalizations {
  @override
  String get map_title => 'Карта вузлів';

-  @override
-  String get map_searchHint => 'Назва або ID вузла';
-
-  @override
-  String get map_activity => 'Активність';
-
-  @override
-  String get map_online => 'Онлайн';
-
-  @override
-  String get map_recent => 'Нещодавні';
-
-  @override
-  String get map_stale => 'Застаріло';
-
-  @override
-  String get map_visible => 'Видимий';
-
-  @override
-  String get map_hidden => 'Прихований';
-
-  @override
-  String get map_centerOnNode => 'Центрувати на вузлі';
-
-  @override
-  String get map_details => 'Деталі';
-
-  @override
-  String get map_noGps => 'Без GPS';
-
-  @override
-  String get map_noResults => 'Не знайдено відповідних вузлів';
-
  @override
  String get map_lineOfSight => 'Пряма видимість';

@@ -2096,6 +1972,17 @@ class AppLocalizationsUk extends AppLocalizations {
  String get dialog_disconnectConfirm =>
      'Ви впевнені, що хочете відключитись від цього пристрою?';

+  @override
+  String get dialog_disconnectedTitle => 'Від’єднано';
+
+  @override
+  String get dialog_disconnectedMessage =>
+      'Вас від’єднано від вашого супутника.';
+
+  @override
+  String get dialog_connectCompanion =>
+      'Підключіться до супутнього пристрою, щоб отримати доступ до функцій ретранслятора та сервера кімнат.';
+
  @override
  String get login_repeaterLogin => 'Вхід у ретранслятор';

@@ -2161,13 +2048,67 @@ class AppLocalizationsUk extends AppLocalizations {
  @override
  String get common_clear => 'Очистити';

+  @override
+  String path_currentPath(String path) {
+    return 'Поточний шлях: $path';
+  }
+
+  @override
+  String path_usingHopsPath(int count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other: 'переходами',
+      many: 'переходами',
+      few: 'переходами',
+      one: 'переходом',
+    );
+    return 'Використання шляху з $count $_temp0';
+  }
+
+  @override
+  String get path_enterCustomPath => 'Ввести власний шлях';
+
  @override
  String get path_currentPathLabel => 'Поточний шлях';

+  @override
+  String get path_hexPrefixInstructions =>
+      'Введіть 2-символьні hex-префікси для кожного переходу, розділені комами.';
+
+  @override
+  String get path_hexPrefixExample =>
+      'Приклад: A1,F2,3C (кожен вузол використовує перший байт свого відкритого ключа).';
+
+  @override
+  String get path_labelHexPrefixes => 'Hex-префікси';
+
+  @override
+  String get path_helperMaxHops =>
+      'Макс. 64 переходи. Кожен префікс — 2 шістнадцяткові символи (1 байт)';
+
+  @override
+  String get path_selectFromContacts => 'Вибрати з контактів:';
+
  @override
  String get path_noRepeatersFound =>
      'Ретрансляторів або серверів кімнат не знайдено.';

+  @override
+  String get path_customPathsRequire =>
+      'Власні шляхи вимагають проміжних вузлів, які можуть передавати повідомлення.';
+
+  @override
+  String path_invalidHexPrefixes(String prefixes) {
+    return 'Некоректні hex-префікси: $prefixes';
+  }
+
+  @override
+  String get path_tooLong => 'Шлях занадто довгий. Максимум 64 переходи.';
+
+  @override
+  String get path_setPath => 'Встановити шлях';
+
  @override
  String get repeater_management => 'Керування ретранслятором';

@@ -2232,6 +2173,16 @@ class AppLocalizationsUk extends AppLocalizations {
  @override
  String get repeater_routingMode => 'Режим маршрутизації';

+  @override
+  String get repeater_autoUseSavedPath =>
+      'Авто (використовувати збережений шлях)';
+
+  @override
+  String get repeater_forceFloodMode => 'Примусово через всю мережу';
+
+  @override
+  String get repeater_pathManagement => 'Керування шляхами';
+
  @override
  String get repeater_refresh => 'Оновити';

@@ -3334,139 +3285,6 @@ class AppLocalizationsUk extends AppLocalizations {
    return '$celsius°C / $fahrenheit°F';
  }

-  @override
-  String get telemetry_digitalInputLabel => 'Цифровий вхід';
-
-  @override
-  String get telemetry_digitalOutputLabel => 'Цифровий вихід';
-
-  @override
-  String get telemetry_analogInputLabel => 'Аналоговий вхід';
-
-  @override
-  String get telemetry_analogOutputLabel => 'Аналоговий вихід';
-
-  @override
-  String get telemetry_genericLabel => 'Загальний датчик';
-
-  @override
-  String get telemetry_luminosityLabel => 'Освітленість';
-
-  @override
-  String get telemetry_presenceLabel => 'Присутність';
-
-  @override
-  String get telemetry_humidityLabel => 'Вологість';
-
-  @override
-  String get telemetry_accelerometerLabel => 'Акселерометр';
-
-  @override
-  String get telemetry_pressureLabel => 'Тиск';
-
-  @override
-  String get telemetry_altitudeLabel => 'Висота';
-
-  @override
-  String get telemetry_frequencyLabel => 'Частота';
-
-  @override
-  String get telemetry_percentageLabel => 'Відсоток';
-
-  @override
-  String get telemetry_concentrationLabel => 'Концентрація';
-
-  @override
-  String get telemetry_powerLabel => 'Потужність';
-
-  @override
-  String get telemetry_distanceLabel => 'Відстань';
-
-  @override
-  String get telemetry_energyLabel => 'Енергія';
-
-  @override
-  String get telemetry_directionLabel => 'Напрямок';
-
-  @override
-  String get telemetry_timeLabel => 'Час';
-
-  @override
-  String get telemetry_gyrometerLabel => 'Гірометр';
-
-  @override
-  String get telemetry_colourLabel => 'Колір';
-
-  @override
-  String get telemetry_gpsLabel => 'GPS';
-
-  @override
-  String get telemetry_switchLabel => 'Перемикач';
-
-  @override
-  String get telemetry_polylineLabel => 'Полілінія';
-
-  @override
-  String telemetry_altitudeValue(String meters) {
-    return '$meters м';
-  }
-
-  @override
-  String telemetry_frequencyValue(String hertz) {
-    return '$hertz Гц';
-  }
-
-  @override
-  String telemetry_pressureValue(String hpa) {
-    return '$hpa гПа';
-  }
-
-  @override
-  String telemetry_luminosityValue(String lux) {
-    return '$lux лк';
-  }
-
-  @override
-  String telemetry_powerValue(String watts) {
-    return '$watts Вт';
-  }
-
-  @override
-  String telemetry_distanceValue(String meters) {
-    return '$meters м';
-  }
-
-  @override
-  String telemetry_energyValue(String kilowattHours) {
-    return '$kilowattHours кВт⋅год';
-  }
-
-  @override
-  String telemetry_directionValue(String degrees) {
-    return '$degrees°';
-  }
-
-  @override
-  String telemetry_concentrationValue(String ppm) {
-    return '$ppm ppm';
-  }
-
-  @override
-  String telemetry_percentageValue(String percent) {
-    return '$percent%';
-  }
-
-  @override
-  String telemetry_analogValue(String value) {
-    return '$value';
-  }
-
-  @override
-  String get telemetry_autoFetchQuantity => 'Кількість запитів';
-
-  @override
-  String get telemetry_error => 'Не вдалося отримати дані';
-
  @override
  String get neighbors_receivedData => 'Дані сусідів отримано';

@@ -4369,17 +4187,6 @@ class AppLocalizationsUk extends AppLocalizations {
  String get translation_composerSubtitle =>
      'Контролює стан ікон перекладу, який використовується за замовчуванням.';

-  @override
-  String get translation_autoIncomingTitle =>
-      'Автоматично перекладати повідомлення';
-
-  @override
-  String get translation_autoIncomingSubtitle =>
-      'Автоматично перекладає повідомлення для сповіщень, а також для чатів і каналів.';
-
-  @override
-  String get translation_translateMessage => 'Перекласти повідомлення';
-
  @override
  String get translation_targetLanguage => 'Цільова мова';

@@ -4508,140 +4315,4 @@ class AppLocalizationsUk extends AppLocalizations {

  @override
  String get contact_typeUnknown => 'Невідомо';
-
-  @override
-  String get map_zoomIn => 'Увійти в режим збільшення';
-
-  @override
-  String get map_zoomOut => 'Видалити зум';
-
-  @override
-  String get map_centerMap => 'Карта центру';
-
-  @override
-  String get chrome_bluetoothRequiresChromium =>
-      'Web Bluetooth вимагає браузера на основі Chromium';
-
-  @override
-  String channels_communityShortId(String id) {
-    return 'ID: $id...';
-  }
-
-  @override
-  String get pathTrace_legendGpsConfirmed => 'GPS підтверджено';
-
-  @override
-  String get pathTrace_legendInferred => 'Висновок щодо положення';
-
-  @override
-  String get pathMap_viewSingle => 'Один';
-
-  @override
-  String get pathMap_viewCombined => 'Об\'єднаний';
-
-  @override
-  String get pathMap_play => 'Відтворити';
-
-  @override
-  String get pathMap_pause => 'Призупинити';
-
-  @override
-  String get pathMap_replay => 'Повтор';
-
-  @override
-  String get pathMap_stepBack => 'Попередній перехід';
-
-  @override
-  String get pathMap_stepForward => 'Наступний перехід';
-
-  @override
-  String get pathMap_animationOn => 'Відобразити анімацію пакета';
-
-  @override
-  String get pathMap_animationOff => 'Приховати анімацію пакета';
-
-  @override
-  String pathMap_hopOf(int current, int total) {
-    return 'Перехід $current з $total';
-  }
-
-  @override
-  String pathMap_observedPaths(int count) {
-    return 'Зафіксовані маршрути: $count';
-  }
-
-  @override
-  String get pathMap_primary => 'Основний';
-
-  @override
-  String pathMap_alternate(int index) {
-    return 'Альт. $index';
-  }
-
-  @override
-  String pathMap_hopCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count переходів',
-      many: '$count переходів',
-      few: '$count переходи',
-      one: '1 перехід',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String pathMap_gpsCount(int confirmed, int total) {
-    return '$confirmed/$total GPS';
-  }
-
-  @override
-  String get pathMap_legendShared => 'Об\'єднаний сегмент';
-
-  @override
-  String get pathMap_legendEstimated => 'Орієнтовний сегмент';
-
-  @override
-  String pathMap_sharedNodeCount(int count) {
-    return 'Використовується $count шляхами';
-  }
-
-  @override
-  String pathMap_partialAnimation(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other:
-          '$count переходів не мають геопозиції — показаний шлях є частковим',
-      many: '$count переходів не мають геопозиції — показаний шлях є частковим',
-      few: '$count переходи не мають геопозиції — показаний шлях є частковим',
-      one: '1 перехід не має геопозиції — показаний шлях є частковим',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get pathMap_showAllPaths => 'Показати все';
-
-  @override
-  String get pathMap_hidePath => 'Приховати шлях';
-
-  @override
-  String get pathMap_showPath => 'Показати шлях';
-
-  @override
-  String get pathMap_collapsePanel => 'Згорнути панель';
-
-  @override
-  String get pathMap_expandPanel => 'Розгорнути панель';
-
-  @override
-  String get pathMap_noLocation => 'Без геопозиції';
-
-  @override
-  String get pathMap_followPacket => 'Прив\'язати вигляд до пакету';
-
-  @override
-  String get pathMap_unfollowPacket => 'Відв\'язати вигляд від пакету';
 }
@@ -92,24 +92,6 @@ class AppLocalizationsZh extends AppLocalizations {
  @override
  String get common_disable => '禁用';

-  @override
-  String get common_undo => '撤销';
-
-  @override
-  String get messageStatus_sent => '发送';
-
-  @override
-  String get messageStatus_delivered => '已送达';
-
-  @override
-  String get messageStatus_pending => '发送';
-
-  @override
-  String get messageStatus_failed => '发送失败';
-
-  @override
-  String get messageStatus_repeated => '多次听到';
-
  @override
  String get common_reboot => '重启';

@@ -129,12 +111,6 @@ class AppLocalizationsZh extends AppLocalizations {
    return '$percent%';
  }

-  @override
-  String get common_autoRefresh => '自动刷新';
-
-  @override
-  String get common_interval => '间隔';
-
  @override
  String get scanner_title => '连接设备';

@@ -305,9 +281,6 @@ class AppLocalizationsZh extends AppLocalizations {
  @override
  String get scanner_enableBluetooth => '启用蓝牙';

-  @override
-  String get scanner_bluetoothWebUnsupported => '浏览器不支持蓝牙，请改用 USB 连接。';
-
  @override
  String get device_quickSwitch => '快速切换';

@@ -756,6 +729,11 @@ class AppLocalizationsZh extends AppLocalizations {
  @override
  String get appSettings_maxMessageRetriesSubtitle => '在将消息标记为失败之前，允许尝试的次数';

+  @override
+  String path_routeWeight(String weight, String max) {
+    return '$weight/$max';
+  }
+
  @override
  String get appSettings_battery => '电池';

@@ -947,15 +925,6 @@ class AppLocalizationsZh extends AppLocalizations {
  @override
  String get contacts_newGroup => '新建群聊';

-  @override
-  String get contacts_moreOptions => '更多选择';
-
-  @override
-  String get contacts_searchOpen => '搜索联系人';
-
-  @override
-  String get contacts_searchClose => '高级搜索';
-
  @override
  String get contacts_groupName => '群聊名称';

@@ -1422,149 +1391,85 @@ class AppLocalizationsZh extends AppLocalizations {
  @override
  String get debugFrame_hexDump => '十六进制数据：';

+  @override
+  String get chat_pathManagement => '路径管理';
+
+  @override
+  String get chat_ShowAllPaths => '显示所有路径';
+
+  @override
+  String get chat_routingMode => '路由模式';
+
+  @override
+  String get chat_autoUseSavedPath => '自动（使用保存的路径）';
+
+  @override
+  String get chat_forceFloodMode => '强制泛洪模式';
+
+  @override
+  String get chat_recentAckPaths => '最近使用的 ACK 路径（点击使用）：';
+
+  @override
+  String get chat_pathHistoryFull => '路径历史已满，请删除后再添加。';
+
+  @override
+  String get chat_hopSingular => '跳';
+
+  @override
+  String get chat_hopPlural => '跳';
+
  @override
  String chat_hopsCount(int count) {
    return '$count 跳';
  }

+  @override
+  String get chat_successes => '成功';
+
+  @override
+  String get chat_score => 'Score';
+
  @override
  String get chat_removePath => '移除路径';

  @override
  String get chat_noPathHistoryYet => '暂无路径历史。\n发送消息以探索路径。';

+  @override
+  String get chat_pathActions => '路径操作：';
+
+  @override
+  String get chat_setCustomPath => '设置自定义路径';
+
+  @override
+  String get chat_setCustomPathSubtitle => '手动指定路由路径';
+
+  @override
+  String get chat_clearPath => '清除路径';
+
+  @override
+  String get chat_clearPathSubtitle => '清除当前路径，下次发送将重新尝试。';
+
  @override
  String get chat_pathCleared => '路径已清除。下一条消息将重新路由。';

+  @override
+  String get chat_floodModeSubtitle => '在应用栏中切换路由模式。';
+
+  @override
+  String get chat_floodModeEnabled => '泛洪模式已启用。可通过应用栏的路由图标切换。';
+
  @override
  String get chat_fullPath => '完整路径';

  @override
-  String get routing_title => '路由';
+  String get chat_pathDetailsNotAvailable => '路径信息暂不可用，请尝试发送消息刷新。';

  @override
-  String get routing_modeAuto => '汽车';
-
-  @override
-  String get routing_modeFlood => '洪水';
-
-  @override
-  String get routing_modeManual => '手册';
-
-  @override
-  String get routing_modeAutoHint => '自动选择已知最佳路径，当没有已知路径时，则进行“洪水”搜索。';
-
-  @override
-  String get routing_modeFloodHint => '通过所有中继站进行广播。 这种方式最可靠，但占用更多的时间。';
-
-  @override
-  String get routing_modeManualHint => '总是按照您设置的路径进行导航。';
-
-  @override
-  String get routing_currentRoute => '当前路线';
-
-  @override
-  String get routing_directNoHops => '直接连接— 无中继跳';
-
-  @override
-  String get routing_noPathYet => '目前还没有找到路径。直到找到路径，才会收到后续消息。';
-
-  @override
-  String get routing_floodBroadcast => '通过所有中继器进行广播';
-
-  @override
-  String get routing_editPath => '编辑路径';
-
-  @override
-  String get routing_forgetPath => '忘记原路';
-
-  @override
-  String get routing_knownPaths => '已知的路径';
-
-  @override
-  String get routing_knownPathsHint => '点击该路径以切换到它。';
-
-  @override
-  String get routing_inUse => '使用中';
-
-  @override
-  String get routing_qualityStrong => '强劲的初始阶段';
-
-  @override
-  String get routing_qualityGood => '不错的开端';
-
-  @override
-  String get routing_qualityFair => '第一次尝试，结果良好';
-
-  @override
-  String get routing_qualityWorked => '已完成';
-
-  @override
-  String get routing_qualityFlood => '通过新闻报道';
-
-  @override
-  String get routing_qualityUntested => '未经测试';
-
-  @override
-  String routing_lastWorked(String when) {
-    return '工作于 $when';
+  String chat_pathSetHops(int hopCount, String status) {
+    return '路径设置：$hopCount 跳 - $status';
  }

-  @override
-  String get routing_neverWorked => '从未得到证实';
-
-  @override
-  String routing_deliveryCounts(int successes, int failures) {
-    return '$successes delivered, $failures failed';
-  }
-
-  @override
-  String get routing_floodDelivery => '洪水配送';
-
-  @override
-  String get pathEditor_title => '构建路径';
-
-  @override
-  String pathEditor_hopCounter(int count) {
-    return '$count of 64 hops';
-  }
-
-  @override
-  String get pathEditor_noHops =>
-      '目前还没有添加任何啤酒花。点击下面的“添加”按钮，按顺序添加，或者直接保存，不添加任何啤酒花。';
-
-  @override
-  String get pathEditor_addHops => '按照顺序添加啤酒花';
-
-  @override
-  String get pathEditor_searchRepeaters => '重复搜索';
-
-  @override
-  String get pathEditor_advancedHex => '高级：原始十六进制路径';
-
-  @override
-  String get pathEditor_hexLabel => '十六进制前缀';
-
-  @override
-  String get pathEditor_hexHelper => '每次跳跃，使用两个十六进制字符，用逗号分隔。';
-
-  @override
-  String pathEditor_invalidTokens(String tokens) {
-    return '无效：$tokens';
-  }
-
-  @override
-  String get pathEditor_tooManyHops => '最多 64 个跳跃';
-
-  @override
-  String get pathEditor_usePath => '请使用此路径';
-
-  @override
-  String get pathEditor_removeHop => '去除啤酒花';
-
-  @override
-  String get pathEditor_unknownHop => '未知的重复器';
-
  @override
  String get chat_pathSavedLocally => '已本地保存，连接设备后可同步。';

@@ -1637,39 +1542,6 @@ class AppLocalizationsZh extends AppLocalizations {
  @override
  String get map_title => '节点地图';

-  @override
-  String get map_searchHint => '搜索节点名称或ID';
-
-  @override
-  String get map_activity => '活动';
-
-  @override
-  String get map_online => '在线';
-
-  @override
-  String get map_recent => '最近';
-
-  @override
-  String get map_stale => '过时';
-
-  @override
-  String get map_visible => '可见';
-
-  @override
-  String get map_hidden => '已隐藏';
-
-  @override
-  String get map_centerOnNode => '以节点为中心';
-
-  @override
-  String get map_details => '详细信息';
-
-  @override
-  String get map_noGps => '无 GPS';
-
-  @override
-  String get map_noResults => '未找到匹配的节点';
-
  @override
  String get map_lineOfSight => '视线';

@@ -1989,6 +1861,15 @@ class AppLocalizationsZh extends AppLocalizations {
  @override
  String get dialog_disconnectConfirm => '确定要断开与此设备的连接吗？';

+  @override
+  String get dialog_disconnectedTitle => '已断开连接';
+
+  @override
+  String get dialog_disconnectedMessage => '你已与你的伙伴断开连接。';
+
+  @override
+  String get dialog_connectCompanion => '连接伴机以访问中继器和房间服务器功能。';
+
  @override
  String get login_repeaterLogin => '转发节点登录';

@@ -2050,12 +1931,54 @@ class AppLocalizationsZh extends AppLocalizations {
  @override
  String get common_clear => '清除';

+  @override
+  String path_currentPath(String path) {
+    return '当前路径：$path';
+  }
+
+  @override
+  String path_usingHopsPath(int count) {
+    return '使用 $count 跳路径';
+  }
+
+  @override
+  String get path_enterCustomPath => '输入自定义路径';
+
  @override
  String get path_currentPathLabel => '当前路径';

+  @override
+  String get path_hexPrefixInstructions => '请输入每个中继节点的2字符十六进制前缀，用逗号分隔。';
+
+  @override
+  String get path_hexPrefixExample => '例如：A1, F2, 3C（每个节点使用其公钥的第一字节）';
+
+  @override
+  String get path_labelHexPrefixes => '路径（十六进制前缀）';
+
+  @override
+  String get path_helperMaxHops => '最多 64 跳。每个前缀由 2 个十六进制字符（1 字节）组成。';
+
+  @override
+  String get path_selectFromContacts => '或从联系人列表中选择：';
+
  @override
  String get path_noRepeatersFound => '未找到任何转发节点或房间服务器。';

+  @override
+  String get path_customPathsRequire => '自定义路径需要中间节点转发消息。';
+
+  @override
+  String path_invalidHexPrefixes(String prefixes) {
+    return '无效的十六进制前缀：$prefixes';
+  }
+
+  @override
+  String get path_tooLong => '路径过长，最多允许 64 跳。';
+
+  @override
+  String get path_setPath => '设置路径';
+
  @override
  String get repeater_management => '转发节点管理';

@@ -2116,6 +2039,15 @@ class AppLocalizationsZh extends AppLocalizations {
  @override
  String get repeater_routingMode => '路由模式';

+  @override
+  String get repeater_autoUseSavedPath => '自动（使用保存的路径）';
+
+  @override
+  String get repeater_forceFloodMode => '强制泛洪模式';
+
+  @override
+  String get repeater_pathManagement => '路径管理';
+
  @override
  String get repeater_refresh => '刷新';

@@ -3076,139 +3008,6 @@ class AppLocalizationsZh extends AppLocalizations {
    return '$celsius°C / $fahrenheit°F';
  }

-  @override
-  String get telemetry_digitalInputLabel => '数字输入';
-
-  @override
-  String get telemetry_digitalOutputLabel => '数字输出';
-
-  @override
-  String get telemetry_analogInputLabel => '模拟输入';
-
-  @override
-  String get telemetry_analogOutputLabel => '模拟输出';
-
-  @override
-  String get telemetry_genericLabel => '通用传感器';
-
-  @override
-  String get telemetry_luminosityLabel => '照度';
-
-  @override
-  String get telemetry_presenceLabel => '存在检测';
-
-  @override
-  String get telemetry_humidityLabel => '湿度';
-
-  @override
-  String get telemetry_accelerometerLabel => '加速度计';
-
-  @override
-  String get telemetry_pressureLabel => '气压';
-
-  @override
-  String get telemetry_altitudeLabel => '高度';
-
-  @override
-  String get telemetry_frequencyLabel => '频率';
-
-  @override
-  String get telemetry_percentageLabel => '百分比';
-
-  @override
-  String get telemetry_concentrationLabel => '浓度';
-
-  @override
-  String get telemetry_powerLabel => '功率';
-
-  @override
-  String get telemetry_distanceLabel => '距离';
-
-  @override
-  String get telemetry_energyLabel => '能量';
-
-  @override
-  String get telemetry_directionLabel => '方向';
-
-  @override
-  String get telemetry_timeLabel => '时间';
-
-  @override
-  String get telemetry_gyrometerLabel => '陀螺仪';
-
-  @override
-  String get telemetry_colourLabel => '颜色';
-
-  @override
-  String get telemetry_gpsLabel => 'GPS';
-
-  @override
-  String get telemetry_switchLabel => '开关';
-
-  @override
-  String get telemetry_polylineLabel => '折线';
-
-  @override
-  String telemetry_altitudeValue(String meters) {
-    return '$meters m';
-  }
-
-  @override
-  String telemetry_frequencyValue(String hertz) {
-    return '$hertz Hz';
-  }
-
-  @override
-  String telemetry_pressureValue(String hpa) {
-    return '$hpa hPa';
-  }
-
-  @override
-  String telemetry_luminosityValue(String lux) {
-    return '$lux lx';
-  }
-
-  @override
-  String telemetry_powerValue(String watts) {
-    return '$watts W';
-  }
-
-  @override
-  String telemetry_distanceValue(String meters) {
-    return '$meters m';
-  }
-
-  @override
-  String telemetry_energyValue(String kilowattHours) {
-    return '$kilowattHours kWh';
-  }
-
-  @override
-  String telemetry_directionValue(String degrees) {
-    return '$degrees°';
-  }
-
-  @override
-  String telemetry_concentrationValue(String ppm) {
-    return '$ppm ppm';
-  }
-
-  @override
-  String telemetry_percentageValue(String percent) {
-    return '$percent%';
-  }
-
-  @override
-  String telemetry_analogValue(String value) {
-    return '$value';
-  }
-
-  @override
-  String get telemetry_autoFetchQuantity => '请求次数';
-
-  @override
-  String get telemetry_error => '无法获取数据';
-
  @override
  String get neighbors_receivedData => '已接收邻居信息';

@@ -4026,15 +3825,6 @@ class AppLocalizationsZh extends AppLocalizations {
  @override
  String get translation_composerSubtitle => '控制作曲家翻译图标的默认状态。';

-  @override
-  String get translation_autoIncomingTitle => '自动翻译消息';
-
-  @override
-  String get translation_autoIncomingSubtitle => '自动为通知以及聊天或频道翻译消息。';
-
-  @override
-  String get translation_translateMessage => '翻译消息';
-
  @override
  String get translation_targetLanguage => '目标语言';

@@ -4157,135 +3947,4 @@ class AppLocalizationsZh extends AppLocalizations {

  @override
  String get contact_typeUnknown => 'Unknown';
-
-  @override
-  String get map_zoomIn => '放大';
-
-  @override
-  String get map_zoomOut => '放大';
-
-  @override
-  String get map_centerMap => '中心地图';
-
-  @override
-  String get chrome_bluetoothRequiresChromium =>
-      'Web Bluetooth 需要 Chromium 浏览器';
-
-  @override
-  String channels_communityShortId(String id) {
-    return 'ID：$id...';
-  }
-
-  @override
-  String get pathTrace_legendGpsConfirmed => '通过GPS确认';
-
-  @override
-  String get pathTrace_legendInferred => '推测的位置';
-
-  @override
-  String get pathMap_viewSingle => '单条';
-
-  @override
-  String get pathMap_viewCombined => '综合';
-
-  @override
-  String get pathMap_play => '播放';
-
-  @override
-  String get pathMap_pause => '暂停';
-
-  @override
-  String get pathMap_replay => '重播';
-
-  @override
-  String get pathMap_stepBack => '上一跳';
-
-  @override
-  String get pathMap_stepForward => '下一跳';
-
-  @override
-  String get pathMap_animationOn => '显示数据包动画';
-
-  @override
-  String get pathMap_animationOff => '隐藏数据包动画';
-
-  @override
-  String pathMap_hopOf(int current, int total) {
-    return '第 $current 跳，共 $total 跳';
-  }
-
-  @override
-  String pathMap_observedPaths(int count) {
-    return '观测到的路径：$count';
-  }
-
-  @override
-  String get pathMap_primary => '主路径';
-
-  @override
-  String pathMap_alternate(int index) {
-    return '备用 $index';
-  }
-
-  @override
-  String pathMap_hopCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count 跳',
-      one: '1 跳',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String pathMap_gpsCount(int confirmed, int total) {
-    return '$confirmed/$total GPS';
-  }
-
-  @override
-  String get pathMap_legendShared => '共享路段';
-
-  @override
-  String get pathMap_legendEstimated => '估算路段';
-
-  @override
-  String pathMap_sharedNodeCount(int count) {
-    return '已被 $count 条路径使用';
-  }
-
-  @override
-  String pathMap_partialAnimation(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count 跳无位置信息 — 显示的路径不完整',
-      one: '1 跳无位置信息 — 显示的路径不完整',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get pathMap_showAllPaths => '显示全部';
-
-  @override
-  String get pathMap_hidePath => '隐藏路径';
-
-  @override
-  String get pathMap_showPath => '显示路径';
-
-  @override
-  String get pathMap_collapsePanel => '收起面板';
-
-  @override
-  String get pathMap_expandPanel => '展开面板';
-
-  @override
-  String get pathMap_noLocation => '无位置';
-
-  @override
-  String get pathMap_followPacket => '锁定视图跟随数据包';
-
-  @override
-  String get pathMap_unfollowPacket => '解锁视图跟随';
 }
@@ -33,8 +33,6 @@
  "common_remove": "Verwijderen",
  "common_enable": "Activeren",
  "common_disable": "Uitschakelen",
-  "common_autoRefresh": "Automatisch vernieuwen",
-  "common_interval": "Tijdsinterval",
  "common_reboot": "Herstarten",
  "common_loading": "Laden...",
  "common_notAvailable": "—",
@@ -1282,43 +1280,6 @@
      }
    }
  },
-  "telemetry_digitalInputLabel": "Digitale ingang",
-  "telemetry_digitalOutputLabel": "Digitale uitgang",
-  "telemetry_analogInputLabel": "Analoge ingang",
-  "telemetry_analogOutputLabel": "Analoge uitgang",
-  "telemetry_genericLabel": "Algemene sensor",
-  "telemetry_luminosityLabel": "Lichtsterkte",
-  "telemetry_presenceLabel": "Aanwezigheid",
-  "telemetry_humidityLabel": "Luchtvochtigheid",
-  "telemetry_accelerometerLabel": "Versnellingsmeter",
-  "telemetry_pressureLabel": "Druk",
-  "telemetry_altitudeLabel": "Hoogte",
-  "telemetry_frequencyLabel": "Frequentie",
-  "telemetry_percentageLabel": "Percentage",
-  "telemetry_concentrationLabel": "Concentratie",
-  "telemetry_powerLabel": "Vermogen",
-  "telemetry_distanceLabel": "Afstand",
-  "telemetry_energyLabel": "Energie",
-  "telemetry_directionLabel": "Richting",
-  "telemetry_timeLabel": "Tijd",
-  "telemetry_gyrometerLabel": "Gyrometer",
-  "telemetry_colourLabel": "Kleur",
-  "telemetry_gpsLabel": "GPS",
-  "telemetry_switchLabel": "Schakelaar",
-  "telemetry_polylineLabel": "Polylijn",
-  "telemetry_altitudeValue": "{meters} m",
-  "telemetry_frequencyValue": "{hertz} Hz",
-  "telemetry_pressureValue": "{hpa} hPa",
-  "telemetry_luminosityValue": "{lux} lx",
-  "telemetry_powerValue": "{watts} W",
-  "telemetry_distanceValue": "{meters} m",
-  "telemetry_energyValue": "{kilowattHours} kWh",
-  "telemetry_directionValue": "{degrees}°",
-  "telemetry_concentrationValue": "{ppm} ppm",
-  "telemetry_percentageValue": "{percent}%",
-  "telemetry_analogValue": "{value}",
-  "telemetry_autoFetchQuantity": "Aantal aanvragen",
-  "telemetry_error": "Kan gegevens niet ophalen",
  "telemetry_noData": "Geen telemetriedata beschikbaar.",
  "telemetry_channelTitle": "Kanaal {channel}",
  "@telemetry_channelTitle": {
@@ -2140,9 +2101,6 @@
  "translation_composerTitle": "Vertaal voor verzending",
  "translation_composerSubtitle": "Stelt de standaardstatus van het pictogram voor de vertaling van de componist in.",
  "translation_useAppLanguage": "Gebruik de taal van de app",
-  "translation_autoIncomingTitle": "Berichten automatisch vertalen",
-  "translation_autoIncomingSubtitle": "Vertaalt berichten automatisch voor meldingen en voor chats of kanalen.",
-  "translation_translateMessage": "Bericht vertalen",
  "translation_targetLanguage": "Doeltaal",
  "translation_downloadedModelLabel": "Gedownloade model",
  "translation_presetModelLabel": "Voorgeprogrammeerd Hugging Face-model",
@@ -2354,191 +2312,8 @@
  "chat_markAsUnread": "Markeer als ongelezen",
  "settings_companionDebugLogSubtitle": "BLE/TCP/USB commando's, antwoorden en ruwe data",
  "repeater_chanUtil": "Gebruik van het kanaal",
-  "@routing_lastWorked": {
-    "placeholders": {
-      "when": {
-        "type": "String"
-      }
-    }
-  },
-  "@routing_deliveryCounts": {
-    "placeholders": {
-      "successes": {
-        "type": "int"
-      },
-      "failures": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathEditor_hopCounter": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathEditor_invalidTokens": {
-    "placeholders": {
-      "tokens": {
-        "type": "String"
-      }
-    }
-  },
-  "@channels_communityShortId": {
-    "placeholders": {
-      "id": {
-        "type": "String"
-      }
-    }
-  },
-  "messageStatus_sent": "Verzonden",
-  "common_undo": "Achterhalen/Annuleren",
-  "messageStatus_delivered": "Leverd",
-  "messageStatus_pending": "Verzenden",
-  "messageStatus_failed": "Niet verzonden",
-  "messageStatus_repeated": "Hearsay, herhaald",
-  "contacts_moreOptions": "Meer opties",
-  "contacts_searchOpen": "Zoek contactpersonen",
-  "contacts_searchClose": "Zoeken",
-  "routing_title": "Routeplanning",
-  "routing_modeAuto": "Auto",
-  "routing_modeFlood": "Overstroming",
-  "routing_modeManual": "Handleiding",
-  "routing_modeAutoHint": "Selecteert automatisch het bekendste pad, en gebruikt een flood-algoritme als er geen bekend pad is.",
-  "routing_modeFloodHint": "Uitzendingen via elke zender. De meest betrouwbare methode, maar vereist meer uitzendtijd.",
-  "routing_modeManualHint": "Stuurt altijd de exacte route die u heeft aangegeven.",
-  "routing_currentRoute": "Huidige route",
-  "routing_directNoHops": "Direct – zonder tussenliggende schakels",
-  "routing_noPathYet": "Er is nog geen route gevonden. De berichten blijven binnenkomen totdat een route is ontdekt.",
-  "routing_floodBroadcast": "Uitgestoten via elke zender.",
-  "routing_editPath": "Pad bewerken",
-  "routing_forgetPath": "Vergeet het pad",
-  "routing_knownPaths": "Bekende routes",
-  "routing_knownPathsHint": "Maak een route om er naartoe te gaan.",
-  "routing_inUse": "In gebruik",
-  "routing_qualityStrong": "Sterke eerste sprong",
-  "routing_qualityGood": "Een goede eerste stap",
-  "routing_qualityFair": "Een goede eerste hop",
-  "routing_qualityWorked": "Is geleverd",
-  "routing_qualityFlood": "Hears via een overstroming",
-  "routing_qualityUntested": "Niet getest",
-  "routing_neverWorked": "nooit bevestigd",
-  "routing_deliveryCounts": "{successes} zijn behaald, {failures} zijn mislukt",
-  "routing_floodDelivery": "Levering bij overstroming",
-  "pathEditor_title": "Pad creëren",
-  "pathEditor_hopCounter": "{count} van 64 hopgranen",
-  "pathEditor_noHops": "Er zijn nog geen hop toegevoegd. Klik op de onderstaande knoppen om ze in de juiste volgorde toe te voegen, of sla de bestelling op zonder hop om deze direct te versturen.",
-  "pathEditor_addHops": "Voeg hop toe in de juiste volgorde.",
-  "pathEditor_searchRepeaters": "Zoek naar herhaaldelijke zenders",
-  "pathEditor_advancedHex": "Geavanceerd: ruwe hex-pad",
-  "pathEditor_hexLabel": "Hex-voorkanten",
-  "pathEditor_hexHelper": "Twee hex-tekens per stap, gescheiden door komma's",
-  "pathEditor_invalidTokens": "Ongeldig: {tokens}",
-  "pathEditor_tooManyHops": "Maximaal 64 hopken",
-  "pathEditor_usePath": "Gebruik deze route.",
-  "pathEditor_removeHop": "Verwijder de hop",
-  "pathEditor_unknownHop": "Onbekend type zender",
-  "map_zoomIn": "Inzoomen",
-  "routing_lastWorked": "worked {when}",
-  "map_zoomOut": "Inzoomen",
-  "map_centerMap": "Centraal overzicht",
-  "chrome_bluetoothRequiresChromium": "Web Bluetooth vereist een Chromium-browser.",
-  "channels_communityShortId": "ID: {id}...",
-  "pathTrace_legendGpsConfirmed": "GPS-locatie bevestigd",
-  "pathTrace_legendInferred": "Afgeleide positie",
-  "@pathMap_hopOf": {
-    "placeholders": {
-      "current": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_observedPaths": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_alternate": {
-    "placeholders": {
-      "index": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_hopCount": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_gpsCount": {
-    "placeholders": {
-      "confirmed": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_sharedNodeCount": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_partialAnimation": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "map_activity": "Activiteit",
-  "map_searchHint": "Zoek op naam of ID van de knoop",
-  "scanner_bluetoothWebUnsupported": "Bluetooth is niet beschikbaar in de browser. Verbind dan via USB.",
-  "map_online": "Online",
-  "map_recent": "Recent",
-  "map_stale": "Verouderd",
-  "map_visible": "Zichtbaar",
-  "map_hidden": "Verborgen",
-  "map_centerOnNode": "Centreer op node",
-  "map_details": "Details",
-  "map_noGps": "Geen GPS",
-  "map_noResults": "Geen overeenkomende nodes",
-  "pathMap_viewSingle": "Enkel",
-  "pathMap_viewCombined": "Gezamenlijk",
-  "pathMap_play": "Afspelen",
-  "pathMap_pause": "Pauze",
-  "pathMap_replay": "Herhalen",
-  "pathMap_stepBack": "Vorige hop",
-  "pathMap_stepForward": "Volgende hop",
-  "pathMap_animationOn": "Pakketanimatie tonen",
-  "pathMap_animationOff": "Pakketanimatie verbergen",
-  "pathMap_hopOf": "Hop {current} van {total}",
-  "pathMap_observedPaths": "Waargenomen paden: {count}",
-  "pathMap_primary": "Primair",
-  "pathMap_alternate": "Alternatief {index}",
-  "pathMap_hopCount": "{count, plural, =1{1 hop} other{{count} hops}}",
-  "pathMap_legendShared": "Gedeeld segment",
-  "pathMap_legendEstimated": "Geschat segment",
-  "pathMap_sharedNodeCount": "Gebruikt door {count} paden",
-  "pathMap_partialAnimation": "{count, plural, =1{1 hop heeft geen locatie — het weergegeven pad is onvolledig} other{{count} hops hebben geen locatie — het weergegeven pad is onvolledig}}",
-  "pathMap_showAllPaths": "Toon alles",
-  "pathMap_hidePath": "Verberg pad",
-  "pathMap_showPath": "Toon pad",
-  "pathMap_collapsePanel": "Paneel inklappen",
-  "pathMap_expandPanel": "Paneel uitklappen",
-  "pathMap_noLocation": "Geen locatie",
-  "pathMap_followPacket": "Weergave vergrendelen op pakket",
-  "pathMap_unfollowPacket": "Weergave ontgrendelen van pakket",
-  "pathMap_gpsCount": "{confirmed}/{total} GPS"
+  "dialog_connectCompanion": "Maak verbinding met een companion om repeater- en kamerserverfuncties te gebruiken.",
+  "dialog_disconnectedTitle": "Verbroken",
+  "dialog_disconnectedMessage": "Je bent losgekoppeld van je companion.",
+  "contact_connectCompanion": "Maak verbinding met een companion om toegang te krijgen tot repeater- en roomserverfuncties."
 }
@@ -33,8 +33,6 @@
  "common_remove": "Usuń",
  "common_enable": "Włącz",
  "common_disable": "Wyłącz",
-  "common_autoRefresh": "Automatyczne odświeżanie",
-  "common_interval": "Interwał",
  "common_reboot": "Uruchom ponownie",
  "common_loading": "Ładowanie...",
  "common_notAvailable": "—",
@@ -1292,43 +1290,6 @@
      }
    }
  },
-  "telemetry_digitalInputLabel": "Wejście cyfrowe",
-  "telemetry_digitalOutputLabel": "Wyjście cyfrowe",
-  "telemetry_analogInputLabel": "Wejście analogowe",
-  "telemetry_analogOutputLabel": "Wyjście analogowe",
-  "telemetry_genericLabel": "Czujnik ogólny",
-  "telemetry_luminosityLabel": "Jasność",
-  "telemetry_presenceLabel": "Obecność",
-  "telemetry_humidityLabel": "Wilgotność",
-  "telemetry_accelerometerLabel": "Akcelerometr",
-  "telemetry_pressureLabel": "Ciśnienie",
-  "telemetry_altitudeLabel": "Wysokość",
-  "telemetry_frequencyLabel": "Częstotliwość",
-  "telemetry_percentageLabel": "Procent",
-  "telemetry_concentrationLabel": "Stężenie",
-  "telemetry_powerLabel": "Moc",
-  "telemetry_distanceLabel": "Odległość",
-  "telemetry_energyLabel": "Energia",
-  "telemetry_directionLabel": "Kierunek",
-  "telemetry_timeLabel": "Czas",
-  "telemetry_gyrometerLabel": "Żyrometr",
-  "telemetry_colourLabel": "Kolor",
-  "telemetry_gpsLabel": "GPS",
-  "telemetry_switchLabel": "Przełącznik",
-  "telemetry_polylineLabel": "Polilinia",
-  "telemetry_altitudeValue": "{meters} m",
-  "telemetry_frequencyValue": "{hertz} Hz",
-  "telemetry_pressureValue": "{hpa} hPa",
-  "telemetry_luminosityValue": "{lux} lx",
-  "telemetry_powerValue": "{watts} W",
-  "telemetry_distanceValue": "{meters} m",
-  "telemetry_energyValue": "{kilowattHours} kWh",
-  "telemetry_directionValue": "{degrees}°",
-  "telemetry_concentrationValue": "{ppm} ppm",
-  "telemetry_percentageValue": "{percent}%",
-  "telemetry_analogValue": "{value}",
-  "telemetry_autoFetchQuantity": "Liczba żądań",
-  "telemetry_error": "Nie udało się pobrać danych",
  "telemetry_noData": "Brak dostępnych danych telemetrycznych.",
  "telemetry_channelTitle": "Kanał {channel}",
  "@telemetry_channelTitle": {
@@ -2176,9 +2137,6 @@
  "translation_enableTitle": "Włącz tłumaczenie",
  "translation_enableSubtitle": "Tłumaczenie otrzymywanych wiadomości oraz umożliwienie tłumaczenia przed wysłaniem.",
  "translation_composerSubtitle": "Kontroluje domyślny stan ikony tłumaczenia w edytorze.",
-  "translation_autoIncomingTitle": "Automatycznie tłumacz wiadomości",
-  "translation_autoIncomingSubtitle": "Automatycznie tłumaczy wiadomości do powiadomień oraz do czatów lub kanałów.",
-  "translation_translateMessage": "Przetłumacz wiadomość",
  "translation_targetLanguage": "Język docelowy",
  "translation_useAppLanguage": "Użyj języka aplikacji",
  "translation_downloadedModelLabel": "Pobudowany model",
@@ -2392,191 +2350,8 @@
  "chat_markAsUnread": "Oznacz jako nieprzeczytane",
  "settings_companionDebugLog": "Log debugowania (dla pomocy w rozwiązywaniu problemów)",
  "repeater_chanUtil": "Wykorzystanie kanału",
-  "@routing_lastWorked": {
-    "placeholders": {
-      "when": {
-        "type": "String"
-      }
-    }
-  },
-  "@routing_deliveryCounts": {
-    "placeholders": {
-      "successes": {
-        "type": "int"
-      },
-      "failures": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathEditor_hopCounter": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathEditor_invalidTokens": {
-    "placeholders": {
-      "tokens": {
-        "type": "String"
-      }
-    }
-  },
-  "@channels_communityShortId": {
-    "placeholders": {
-      "id": {
-        "type": "String"
-      }
-    }
-  },
-  "messageStatus_sent": "Wysłane",
-  "messageStatus_delivered": "Dostarczone",
-  "messageStatus_pending": "Wysyłanie",
-  "common_undo": "Wycofaj",
-  "messageStatus_failed": "Nie udało się wysłać",
-  "messageStatus_repeated": "Usłyszałem to wielokrotnie",
-  "contacts_moreOptions": "Więcej opcji",
-  "contacts_searchOpen": "Wyszukaj kontakty",
-  "contacts_searchClose": "Zaawansowane wyszukiwanie",
-  "routing_title": "Planowanie tras",
-  "routing_modeAuto": "Samochód",
-  "routing_modeFlood": "Powódź",
-  "routing_modeManual": "Instrukcja obsługi",
-  "routing_modeAutoHint": "Automatycznie wybiera najpopularniejszą ścieżkę, a w przypadku braku znanej, przechodzi do trybu \"przepływu\".",
-  "routing_modeFloodHint": "Transmisje za pośrednictwem każdego repeatera. Najbardziej niezawodna metoda, ale zużywa więcej czasu transmisji.",
-  "routing_modeManualHint": "Zawsze prowadzi dokładnie po trasie, którą określiłeś.",
-  "routing_currentRoute": "Obecna trasa",
-  "routing_directNoHops": "Bezpośrednio – bez pośrednictwa repeaterów",
-  "routing_noPathYet": "Na razie nie ma żadnej ścieżki. Komunikacja trwa do momentu, gdy zostanie odkryta trasa.",
-  "routing_floodBroadcast": "Transmisja za pośrednictwem każdego urządzenia powielającego",
-  "routing_editPath": "Edytuj ścieżkę",
-  "routing_forgetPath": "Zapomnij o ścieżce",
-  "routing_knownPaths": "Znane trasy",
-  "routing_knownPathsHint": "Wybierz ścieżkę, aby przełączyć się na nią.",
-  "routing_inUse": "W użyciu",
-  "routing_qualityStrong": "Silny pierwszy skok",
-  "routing_qualityGood": "Świetny początek",
-  "routing_qualityFair": "Świetny pierwszy krzak",
-  "routing_qualityWorked": "Zostało dostarczone",
-  "routing_qualityFlood": "Usłyszano dzięki doniesieniom",
-  "routing_qualityUntested": "Nieużywany",
-  "routing_lastWorked": "pracował {when}",
-  "routing_neverWorked": "nigdy nie zostało potwierdzone",
-  "routing_floodDelivery": "Dostawa w przypadku powodzi",
-  "pathEditor_title": "Stworzenie ścieżki",
-  "pathEditor_hopCounter": "{count} z 64 rodzajów chmielu",
-  "pathEditor_noHops": "Na razie nie dodano żadnych chmielu. Aby dodać je w odpowiedniej kolejności, kliknij w odpowiednie przyciski poniżej, lub zapisz przepis bez chmielu, aby wysłać go bezpośrednio.",
-  "pathEditor_addHops": "Dodawaj chmiel zgodnie z kolejnością.",
-  "pathEditor_searchRepeaters": "Funkcje powtarzania",
-  "pathEditor_advancedHex": "Zaawansowane: ścieżka w formacie szesnastkowym",
-  "pathEditor_hexLabel": "Prefiksy heksadecymalne",
-  "pathEditor_hexHelper": "Dwa znaki szesnastkowe na każdym kroku, oddzielone przecinkami",
-  "pathEditor_invalidTokens": "Nieprawidłowe: {tokens}",
-  "pathEditor_tooManyHops": "Maksymalnie 64 hopów",
-  "pathEditor_usePath": "Użyj tej ścieżki.",
-  "pathEditor_removeHop": "Usuń dziką psiankę",
-  "pathEditor_unknownHop": "Nieznany repeater",
-  "map_zoomIn": "Przybliż",
-  "routing_deliveryCounts": "{successes} delivered, {failures} failed",
-  "map_zoomOut": "Przybliż z powrotem",
-  "map_centerMap": "Mapa centrum",
-  "chrome_bluetoothRequiresChromium": "Web Bluetooth wymaga przeglądarki Chromium.",
-  "channels_communityShortId": "ID: {id}...",
-  "pathTrace_legendGpsConfirmed": "GPS potwierdzone",
-  "pathTrace_legendInferred": "Wywnioskowana pozycja",
-  "@pathMap_hopOf": {
-    "placeholders": {
-      "current": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_observedPaths": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_alternate": {
-    "placeholders": {
-      "index": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_hopCount": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_gpsCount": {
-    "placeholders": {
-      "confirmed": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_sharedNodeCount": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_partialAnimation": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "map_online": "Online",
-  "map_searchHint": "Wyszukaj nazwę lub identyfikator węzła",
-  "scanner_bluetoothWebUnsupported": "Bluetooth nie jest dostępny w przeglądarce. Połącz się przez USB.",
-  "map_activity": "Aktywność",
-  "map_recent": "Ostatnie",
-  "map_stale": "Nieaktualne",
-  "map_visible": "Widoczny",
-  "map_hidden": "Ukryty",
-  "map_centerOnNode": "Wyśrodkuj na węźle",
-  "map_details": "Szczegóły",
-  "map_noGps": "Brak GPS",
-  "map_noResults": "Brak pasujących węzłów",
-  "pathMap_viewSingle": "Pojedyncza",
-  "pathMap_viewCombined": "Połączone",
-  "pathMap_play": "Odtwórz",
-  "pathMap_pause": "Wstrzymaj",
-  "pathMap_replay": "Odtwórz ponownie",
-  "pathMap_stepBack": "Poprzedni skok",
-  "pathMap_stepForward": "Następny skok",
-  "pathMap_animationOn": "Pokaż animację pakietu",
-  "pathMap_animationOff": "Ukryj animację pakietu",
-  "pathMap_hopOf": "Skok {current} z {total}",
-  "pathMap_observedPaths": "Obserwowane trasy: {count}",
-  "pathMap_primary": "Główna",
-  "pathMap_alternate": "Alt. {index}",
-  "pathMap_hopCount": "{count, plural, =1{1 skok} few{{count} skoki} many{{count} skoków} other{{count} skoku}}",
-  "pathMap_legendShared": "Wspólny segment",
-  "pathMap_legendEstimated": "Szacunkowy segment",
-  "pathMap_sharedNodeCount": "Wykorzystywane przez {count} ścieżek",
-  "pathMap_partialAnimation": "{count, plural, =1{1 skok nie ma lokalizacji — pokazana ścieżka jest niekompletna} few{{count} skoki nie mają lokalizacji — pokazana ścieżka jest niekompletna} many{{count} skoków nie ma lokalizacji — pokazana ścieżka jest niekompletna} other{{count} skoku nie ma lokalizacji — pokazana ścieżka jest niekompletna}}",
-  "pathMap_showAllPaths": "Pokaż wszystkie",
-  "pathMap_hidePath": "Ukryj ścieżkę",
-  "pathMap_showPath": "Wyświetl trasę",
-  "pathMap_collapsePanel": "Zwiń panel",
-  "pathMap_expandPanel": "Rozwiń panel",
-  "pathMap_noLocation": "Brak lokalizacji",
-  "pathMap_followPacket": "Śledź pakiet",
-  "pathMap_unfollowPacket": "Przestań śledzić pakiet",
-  "pathMap_gpsCount": "{confirmed}/{total} GPS"
+  "dialog_connectCompanion": "Połącz się z towarzyszem, aby uzyskać dostęp do funkcji powtarzacza i serwera pokoi.",
+  "dialog_disconnectedTitle": "Rozłączono",
+  "dialog_disconnectedMessage": "Zostałeś rozłączony ze swoim towarzyszem.",
+  "contact_connectCompanion": "Połącz się z towarzyszem, aby uzyskać dostęp do funkcji repeatera i serwera pokojowego."
 }
@@ -33,8 +33,6 @@
  "common_remove": "Remover",
  "common_enable": "Ativar",
  "common_disable": "Desativar",
-  "common_autoRefresh": "Atualização automática",
-  "common_interval": "Intervalo",
  "common_reboot": "Reiniciar",
  "common_loading": "Carregando...",
  "common_notAvailable": "—",
@@ -1282,43 +1280,6 @@
      }
    }
  },
-  "telemetry_digitalInputLabel": "Entrada digital",
-  "telemetry_digitalOutputLabel": "Saída digital",
-  "telemetry_analogInputLabel": "Entrada analógica",
-  "telemetry_analogOutputLabel": "Saída analógica",
-  "telemetry_genericLabel": "Sensor genérico",
-  "telemetry_luminosityLabel": "Luminosidade",
-  "telemetry_presenceLabel": "Presença",
-  "telemetry_humidityLabel": "Humidade",
-  "telemetry_accelerometerLabel": "Acelerómetro",
-  "telemetry_pressureLabel": "Pressão",
-  "telemetry_altitudeLabel": "Altitude",
-  "telemetry_frequencyLabel": "Frequência",
-  "telemetry_percentageLabel": "Percentagem",
-  "telemetry_concentrationLabel": "Concentração",
-  "telemetry_powerLabel": "Potência",
-  "telemetry_distanceLabel": "Distância",
-  "telemetry_energyLabel": "Energia",
-  "telemetry_directionLabel": "Direção",
-  "telemetry_timeLabel": "Hora",
-  "telemetry_gyrometerLabel": "Girómetro",
-  "telemetry_colourLabel": "Cor",
-  "telemetry_gpsLabel": "GPS",
-  "telemetry_switchLabel": "Interruptor",
-  "telemetry_polylineLabel": "Polilinha",
-  "telemetry_altitudeValue": "{meters} m",
-  "telemetry_frequencyValue": "{hertz} Hz",
-  "telemetry_pressureValue": "{hpa} hPa",
-  "telemetry_luminosityValue": "{lux} lx",
-  "telemetry_powerValue": "{watts} W",
-  "telemetry_distanceValue": "{meters} m",
-  "telemetry_energyValue": "{kilowattHours} kWh",
-  "telemetry_directionValue": "{degrees}°",
-  "telemetry_concentrationValue": "{ppm} ppm",
-  "telemetry_percentageValue": "{percent}%",
-  "telemetry_analogValue": "{value}",
-  "telemetry_autoFetchQuantity": "Número de solicitações",
-  "telemetry_error": "Não foi possível obter os dados",
  "telemetry_noData": "Não estão disponíveis dados de telemetria.",
  "telemetry_channelTitle": "Canal {channel}",
  "@telemetry_channelTitle": {
@@ -2139,9 +2100,6 @@
  "translation_enableTitle": "Ativar a tradução",
  "translation_title": "Tradução",
  "translation_composerSubtitle": "Controla o estado padrão do ícone de tradução do compositor.",
-  "translation_autoIncomingTitle": "Traduzir mensagens automaticamente",
-  "translation_autoIncomingSubtitle": "Traduz automaticamente mensagens para notificações e para chats ou canais.",
-  "translation_translateMessage": "Traduzir mensagem",
  "translation_targetLanguage": "Língua-alvo",
  "translation_useAppLanguage": "Utilize o idioma da aplicação",
  "translation_downloadedModelLabel": "Modelo baixado",
@@ -2354,191 +2312,8 @@
  "chat_markAsUnread": "Marcar como não lido",
  "chat_newMessages": "Novas mensagens",
  "repeater_chanUtil": "Utilização do canal",
-  "@routing_lastWorked": {
-    "placeholders": {
-      "when": {
-        "type": "String"
-      }
-    }
-  },
-  "@routing_deliveryCounts": {
-    "placeholders": {
-      "successes": {
-        "type": "int"
-      },
-      "failures": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathEditor_hopCounter": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathEditor_invalidTokens": {
-    "placeholders": {
-      "tokens": {
-        "type": "String"
-      }
-    }
-  },
-  "@channels_communityShortId": {
-    "placeholders": {
-      "id": {
-        "type": "String"
-      }
-    }
-  },
-  "common_undo": "Desfazer",
-  "messageStatus_sent": "Enviado",
-  "messageStatus_pending": "Enviar",
-  "messageStatus_delivered": "Entregue",
-  "messageStatus_failed": "Falhou ao enviar",
-  "messageStatus_repeated": "Ouvi repetidamente",
-  "contacts_moreOptions": "Mais opções",
-  "contacts_searchOpen": "Pesquisar contatos",
-  "contacts_searchClose": "Pesquisa avançada",
-  "routing_title": "Rotas",
-  "routing_modeAuto": "Carro",
-  "routing_modeFlood": "Inundação",
-  "routing_modeManual": "Manual",
-  "routing_modeAutoHint": "Seleciona automaticamente o caminho mais conhecido, e, se nenhum caminho conhecido for encontrado, utiliza a estratégia de \"inundação\".",
-  "routing_modeFloodHint": "Transmissão através de todos os repetidores. É a opção mais confiável, mas utiliza mais tempo de transmissão.",
-  "routing_modeManualHint": "Sempre segue exatamente o caminho que você define.",
-  "routing_currentRoute": "Rota atual",
-  "routing_directNoHops": "Direto – sem saltos de repetidor",
-  "routing_noPathYet": "Ainda não há um caminho definido. A mensagem continua a ser enviada até que uma rota seja encontrada.",
-  "routing_floodBroadcast": "Transmissão através de todos os repetidores",
-  "routing_editPath": "Editar caminho",
-  "routing_forgetPath": "Esqueça o caminho",
-  "routing_knownPaths": "Rotas conhecidas",
-  "routing_knownPathsHint": "Toque em um caminho para alternar para ele.",
-  "routing_inUse": "Em uso",
-  "routing_qualityStrong": "Primeiro salto notável",
-  "routing_qualityGood": "Primeiro salto bem-sucedido",
-  "routing_qualityFair": "Primeira etapa bem-sucedida",
-  "routing_qualityWorked": "Foi entregue",
-  "routing_qualityFlood": "Informação obtida através de relatos generalizados.",
-  "routing_qualityUntested": "Não testado",
-  "routing_neverWorked": "nunca confirmado",
-  "routing_floodDelivery": "Entrega em áreas afetadas por inundações",
-  "pathEditor_title": "Criar Caminho",
-  "pathEditor_hopCounter": "{count} de 64 gramas de lúpulo",
-  "pathEditor_noHops": "Ainda não há lúpulos adicionados. Clique nos repetidores abaixo para adicioná-los na ordem desejada, ou salve sem adicionar lúpulos para enviar diretamente.",
-  "pathEditor_addHops": "Adicione os lúpulos na seguinte ordem.",
-  "pathEditor_searchRepeaters": "Encontrar repetidores",
-  "pathEditor_advancedHex": "Avançado: caminho hexadecimal bruto",
-  "pathEditor_hexLabel": "Prefixos hexadecimais",
-  "pathEditor_hexHelper": "Dois caracteres hexadecimais por salto, separados por vírgulas.",
-  "pathEditor_invalidTokens": "Inválido: {tokens}",
-  "routing_lastWorked": "worked {when}",
-  "pathEditor_tooManyHops": "Máximo de 64 saltos",
-  "routing_deliveryCounts": "{successes} delivered, {failures} failed",
-  "pathEditor_usePath": "Utilize este caminho.",
-  "pathEditor_removeHop": "Remova o lúpulo",
-  "pathEditor_unknownHop": "Repetidor desconhecido",
-  "map_zoomIn": "Ampliar",
-  "map_zoomOut": "Ampliar",
-  "map_centerMap": "Mapa do centro",
-  "chrome_bluetoothRequiresChromium": "O Web Bluetooth requer um navegador Chromium.",
-  "channels_communityShortId": "ID: {id}...",
-  "pathTrace_legendGpsConfirmed": "GPS confirmado",
-  "pathTrace_legendInferred": "Posição inferida",
-  "@pathMap_hopOf": {
-    "placeholders": {
-      "current": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_observedPaths": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_alternate": {
-    "placeholders": {
-      "index": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_hopCount": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_gpsCount": {
-    "placeholders": {
-      "confirmed": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_sharedNodeCount": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_partialAnimation": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "map_online": "Online",
-  "map_activity": "Atividade",
-  "scanner_bluetoothWebUnsupported": "A funcionalidade Bluetooth não está disponível no navegador. Conecte-se via USB em vez disso.",
-  "map_searchHint": "Pesquisar por nome ou ID do nó",
-  "map_recent": "Recente",
-  "map_stale": "Vencido",
-  "map_visible": "Visível",
-  "map_hidden": "Escondido",
-  "map_centerOnNode": "Centralizar no nó",
-  "map_details": "Detalhes",
-  "map_noGps": "Sem GPS",
-  "map_noResults": "Nenhum nó encontrado",
-  "pathMap_viewSingle": "Único",
-  "pathMap_viewCombined": "Combinado",
-  "pathMap_play": "Reproduzir",
-  "pathMap_pause": "Pausa",
-  "pathMap_stepBack": "Salto anterior",
-  "pathMap_replay": "Repetir",
-  "pathMap_stepForward": "Próximo salto",
-  "pathMap_animationOn": "Exibir animação do pacote",
-  "pathMap_animationOff": "Ocultar a animação do pacote",
-  "pathMap_hopOf": "Salto {current} de {total}",
-  "pathMap_observedPaths": "Caminhos observados: {count}",
-  "pathMap_primary": "Primário",
-  "pathMap_alternate": "Alt {index}",
-  "pathMap_hopCount": "{count, plural, =1{1 salto} other{{count} saltos}}",
-  "pathMap_legendShared": "Segmento compartilhado",
-  "pathMap_legendEstimated": "Segmento estimado",
-  "pathMap_sharedNodeCount": "Utilizado em {count} caminhos",
-  "pathMap_partialAnimation": "{count, plural, =1{1 salto não tem localização — o caminho mostrado é parcial} other{{count} saltos não têm localização — o caminho mostrado é parcial}}",
-  "pathMap_showAllPaths": "Mostrar tudo",
-  "pathMap_hidePath": "Esconder caminho",
-  "pathMap_showPath": "Mostrar o caminho",
-  "pathMap_collapsePanel": "Recolher painel",
-  "pathMap_expandPanel": "Expandir painel",
-  "pathMap_noLocation": "Sem localização",
-  "pathMap_followPacket": "Fixar vista no pacote",
-  "pathMap_unfollowPacket": "Liberar vista do pacote",
-  "pathMap_gpsCount": "{confirmed}/{total} GPS"
+  "dialog_connectCompanion": "Conecte-se a um dispositivo companion para acessar as funcionalidades de repetidor e servidor de salas.",
+  "dialog_disconnectedTitle": "Desconectado",
+  "dialog_disconnectedMessage": "Você foi desconectado do seu companheiro.",
+  "contact_connectCompanion": "Conecte-se a um companheiro para acessar recursos de repetidor e servidor de sala."
 }
@@ -39,8 +39,6 @@
  "common_notAvailable": "—",
  "common_voltageValue": "{volts} В",
  "common_percentValue": "{percent}%",
-  "common_autoRefresh": "Автообновление",
-  "common_interval": "Интервал",
  "scanner_title": "MeshCore Open",
  "scanner_scanning": "Поиск устройств...",
  "scanner_connecting": "Подключение...",
@@ -688,43 +686,6 @@
  "telemetry_voltageValue": "{volts}В",
  "telemetry_currentValue": "{amps}А",
  "telemetry_temperatureValue": "{celsius}°C / {fahrenheit}°F",
-  "telemetry_digitalInputLabel": "Цифровой вход",
-  "telemetry_digitalOutputLabel": "Цифровой выход",
-  "telemetry_analogInputLabel": "Аналоговый вход",
-  "telemetry_analogOutputLabel": "Аналоговый выход",
-  "telemetry_genericLabel": "Общий датчик",
-  "telemetry_luminosityLabel": "Освещённость",
-  "telemetry_presenceLabel": "Присутствие",
-  "telemetry_humidityLabel": "Влажность",
-  "telemetry_accelerometerLabel": "Акселерометр",
-  "telemetry_pressureLabel": "Давление",
-  "telemetry_altitudeLabel": "Высота",
-  "telemetry_frequencyLabel": "Частота",
-  "telemetry_percentageLabel": "Процент",
-  "telemetry_concentrationLabel": "Концентрация",
-  "telemetry_powerLabel": "Мощность",
-  "telemetry_distanceLabel": "Расстояние",
-  "telemetry_energyLabel": "Энергия",
-  "telemetry_directionLabel": "Направление",
-  "telemetry_timeLabel": "Время",
-  "telemetry_gyrometerLabel": "Гирометр",
-  "telemetry_colourLabel": "Цвет",
-  "telemetry_gpsLabel": "GPS",
-  "telemetry_switchLabel": "Переключатель",
-  "telemetry_polylineLabel": "Полилиния",
-  "telemetry_altitudeValue": "{meters} м",
-  "telemetry_frequencyValue": "{hertz} Гц",
-  "telemetry_pressureValue": "{hpa} гПа",
-  "telemetry_luminosityValue": "{lux} лк",
-  "telemetry_powerValue": "{watts} Вт",
-  "telemetry_distanceValue": "{meters} м",
-  "telemetry_energyValue": "{kilowattHours} кВт⋅ч",
-  "telemetry_directionValue": "{degrees}°",
-  "telemetry_concentrationValue": "{ppm} ppm",
-  "telemetry_percentageValue": "{percent}%",
-  "telemetry_analogValue": "{value}",
-  "telemetry_autoFetchQuantity": "Количество запросов",
-  "telemetry_error": "Не удалось получить данные",
  "neighbors_receivedData": "Полученные данные о соседях",
  "neighbors_requestTimedOut": "Время ожидания данных о соседях истекло.",
  "neighbors_errorLoading": "Ошибка загрузки соседей: {error}",
@@ -1307,9 +1268,6 @@
  "translation_title": "Перевод",
  "translation_enableTitle": "Включить перевод",
  "translation_composerSubtitle": "Управляет исходным состоянием значка перевода, предоставляемого редактором.",
-  "translation_autoIncomingTitle": "Автоматически переводить сообщения",
-  "translation_autoIncomingSubtitle": "Автоматически переводит сообщения для уведомлений, а также для чатов и каналов.",
-  "translation_translateMessage": "Перевести сообщение",
  "translation_targetLanguage": "Целевой язык",
  "translation_useAppLanguage": "Используйте язык приложения",
  "translation_downloadedModelLabel": "Загруженная модель",
@@ -1657,191 +1615,8 @@
  "settings_companionDebugLogSubtitle": "Команды, ответы и необработанные данные, используемые для протоколов BLE, TCP и USB.",
  "repeater_chanUtil": "Использование канала",
  "settings_companionDebugLog": "Журнал отладки (для сопутствующего приложения)",
-  "@routing_lastWorked": {
-    "placeholders": {
-      "when": {
-        "type": "String"
-      }
-    }
-  },
-  "@routing_deliveryCounts": {
-    "placeholders": {
-      "successes": {
-        "type": "int"
-      },
-      "failures": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathEditor_hopCounter": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathEditor_invalidTokens": {
-    "placeholders": {
-      "tokens": {
-        "type": "String"
-      }
-    }
-  },
-  "@channels_communityShortId": {
-    "placeholders": {
-      "id": {
-        "type": "String"
-      }
-    }
-  },
-  "messageStatus_pending": "Отправка",
-  "common_undo": "Отменить",
-  "messageStatus_delivered": "Доставлено",
-  "messageStatus_sent": "Отправлено",
-  "messageStatus_failed": "Не удалось отправить",
-  "messageStatus_repeated": "Услышал несколько раз",
-  "contacts_moreOptions": "Больше вариантов",
-  "contacts_searchOpen": "Найти контакты",
-  "contacts_searchClose": "Закрыть поиск",
-  "routing_title": "Маршрутизация",
-  "routing_modeAuto": "Авто",
-  "routing_modeFlood": "Наводнение",
-  "routing_modeManual": "Инструкция",
-  "routing_modeAutoHint": "Автоматически выбирает наиболее известный путь, и если такой путь неизвестен, использует алгоритм поиска пути.",
-  "routing_modeFloodHint": "Передача сигнала через все ретрансляторы. Самый надежный способ, но требует больше времени на передачу.",
-  "routing_modeManualHint": "Всегда следует точно по указанному вами маршруту.",
-  "routing_currentRoute": "Текущий маршрут",
-  "routing_directNoHops": "Прямое соединение – без использования ретрансляторов",
-  "routing_noPathYet": "Пока нет пути. Следующее сообщение будет отправлено до тех пор, пока не будет обнаружен маршрут.",
-  "routing_floodBroadcast": "Транслируется через все ретрансляторы",
-  "routing_editPath": "Изменить путь",
-  "routing_forgetPath": "Забудьте о маршруте",
-  "routing_knownPaths": "Известные маршруты",
-  "routing_knownPathsHint": "Создайте маршрут для переключения на этот пункт.",
-  "routing_inUse": "В эксплуатации",
-  "routing_qualityStrong": "Сильный первый скачок",
-  "routing_qualityGood": "Хорошее начало",
-  "routing_qualityFair": "Первый хороший урожай",
-  "routing_qualityWorked": "Осуществлено",
-  "routing_qualityFlood": "Узнал из новостей, распространяющихся в интернете.",
-  "routing_qualityUntested": "Непроверенный",
-  "routing_neverWorked": "никогда не было подтверждено",
-  "routing_floodDelivery": "Доставка при затоплении",
-  "pathEditor_title": "Создать маршрут",
-  "pathEditor_hopCounter": "{count} из 64 хмеля",
-  "pathEditor_noHops": "На данный момент хмель еще не добавлен. Чтобы добавить его, нажмите на соответствующие кнопки ниже в нужном порядке, или сохраните рецепт без хмеля, чтобы отправить его напрямую.",
-  "pathEditor_addHops": "Добавляйте хмель в соответствии с указанным порядком.",
-  "pathEditor_searchRepeaters": "Поиск повторителей",
-  "pathEditor_advancedHex": "Продвинутый уровень: прямой путь в шестнадцатеричном формате",
-  "pathEditor_hexLabel": "Префиксы шестнадцатеричной системы",
-  "pathEditor_hexHelper": "Два шестнадцатеричных символа на каждом шаге, разделенные запятыми.",
-  "pathEditor_invalidTokens": "Неверно: {tokens}",
-  "routing_lastWorked": "worked {when}",
-  "routing_deliveryCounts": "{successes} delivered, {failures} failed",
-  "pathEditor_tooManyHops": "Максимальное количество ингредиентов – 64",
-  "pathEditor_usePath": "Используйте этот путь",
-  "pathEditor_removeHop": "Удалить хмель",
-  "pathEditor_unknownHop": "Неизвестный ретранслятор",
-  "map_zoomIn": "Увеличить масштаб",
-  "map_zoomOut": "Увеличить масштаб",
-  "map_centerMap": "Карта центра",
-  "chrome_bluetoothRequiresChromium": "Для работы Web Bluetooth требуется браузер на основе Chromium.",
-  "channels_communityShortId": "Идентификатор: {id}...",
-  "pathTrace_legendGpsConfirmed": "GPS подтверждено",
-  "pathTrace_legendInferred": "Выведенная позиция",
-  "@pathMap_hopOf": {
-    "placeholders": {
-      "current": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_observedPaths": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_alternate": {
-    "placeholders": {
-      "index": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_hopCount": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_gpsCount": {
-    "placeholders": {
-      "confirmed": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_sharedNodeCount": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_partialAnimation": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "map_searchHint": "Поиск по имени или ID узла",
-  "map_online": "Онлайн",
-  "scanner_bluetoothWebUnsupported": "Bluetooth недоступен в браузере. Подключитесь через USB.",
-  "map_activity": "Активность",
-  "map_recent": "Недавно",
-  "map_stale": "Устаревший",
-  "map_visible": "Видимый",
-  "map_hidden": "Скрытый",
-  "map_centerOnNode": "Центрировать на узле",
-  "map_details": "Детали",
-  "map_noGps": "Без GPS",
-  "map_noResults": "Не найдено соответствующих узлов",
-  "pathMap_viewSingle": "Одиночный",
-  "pathMap_viewCombined": "Объединённые",
-  "pathMap_play": "Воспроизвести",
-  "pathMap_pause": "Пауза",
-  "pathMap_replay": "Повтор",
-  "pathMap_stepBack": "Предыдущий хоп",
-  "pathMap_stepForward": "Следующий хоп",
-  "pathMap_animationOn": "Показать анимацию пакета",
-  "pathMap_animationOff": "Скрыть анимацию пакета",
-  "pathMap_hopOf": "Хоп {current} из {total}",
-  "pathMap_observedPaths": "Наблюдаемые маршруты: {count}",
-  "pathMap_primary": "Основной",
-  "pathMap_alternate": "Альт {index}",
-  "pathMap_hopCount": "{count, plural, one{{count} хоп} few{{count} хопа} many{{count} хопов} other{{count} хопов}}",
-  "pathMap_legendShared": "Общий сегмент",
-  "pathMap_legendEstimated": "Расчётный сегмент",
-  "pathMap_sharedNodeCount": "Используется в {count} маршрутах",
-  "pathMap_partialAnimation": "{count, plural, one{{count} хоп не имеет координат — показанный путь неполный} few{{count} хопа не имеют координат — показанный путь неполный} many{{count} хопов не имеют координат — показанный путь неполный} other{{count} хопов не имеют координат — показанный путь неполный}}",
-  "pathMap_showAllPaths": "Показать всё",
-  "pathMap_hidePath": "Скрыть путь",
-  "pathMap_collapsePanel": "Скрыть панель",
-  "pathMap_showPath": "Показать маршрут",
-  "pathMap_expandPanel": "Расширить панель",
-  "pathMap_noLocation": "Нет координат",
-  "pathMap_followPacket": "Следить за пакетом",
-  "pathMap_unfollowPacket": "Не следить за пакетом",
-  "pathMap_gpsCount": "{confirmed}/{total} GPS"
+  "dialog_connectCompanion": "Подключитесь к компаньону, чтобы получить доступ к функциям ретранслятора и сервера комнат.",
+  "dialog_disconnectedTitle": "Отключено",
+  "dialog_disconnectedMessage": "Вы были отключены от вашего компаньона.",
+  "contact_connectCompanion": "Подключитесь к компаньону, чтобы получить доступ к функциям репитера и серверу комнаты."
 }
@@ -33,8 +33,6 @@
  "common_remove": "Odstrániť",
  "common_enable": "Povolit",
  "common_disable": "Zakázať",
-  "common_autoRefresh": "Automatické obnovenie",
-  "common_interval": "Časový interval",
  "common_reboot": "Restartovať",
  "common_loading": "Načítavanie...",
  "common_notAvailable": "—",
@@ -1282,43 +1280,6 @@
      }
    }
  },
-  "telemetry_digitalInputLabel": "Digitálny vstup",
-  "telemetry_digitalOutputLabel": "Digitálny výstup",
-  "telemetry_analogInputLabel": "Analógový vstup",
-  "telemetry_analogOutputLabel": "Analógový výstup",
-  "telemetry_genericLabel": "Všeobecný senzor",
-  "telemetry_luminosityLabel": "Osvetlenie",
-  "telemetry_presenceLabel": "Prítomnosť",
-  "telemetry_humidityLabel": "Vlhkosť",
-  "telemetry_accelerometerLabel": "Akcelerometer",
-  "telemetry_pressureLabel": "Tlak",
-  "telemetry_altitudeLabel": "Nadmorská výška",
-  "telemetry_frequencyLabel": "Frekvencia",
-  "telemetry_percentageLabel": "Percento",
-  "telemetry_concentrationLabel": "Koncentrácia",
-  "telemetry_powerLabel": "Výkon",
-  "telemetry_distanceLabel": "Vzdialenosť",
-  "telemetry_energyLabel": "Energia",
-  "telemetry_directionLabel": "Smer",
-  "telemetry_timeLabel": "Čas",
-  "telemetry_gyrometerLabel": "Gyrometer",
-  "telemetry_colourLabel": "Farba",
-  "telemetry_gpsLabel": "GPS",
-  "telemetry_switchLabel": "Prepínač",
-  "telemetry_polylineLabel": "Lomená čiara",
-  "telemetry_altitudeValue": "{meters} m",
-  "telemetry_frequencyValue": "{hertz} Hz",
-  "telemetry_pressureValue": "{hpa} hPa",
-  "telemetry_luminosityValue": "{lux} lx",
-  "telemetry_powerValue": "{watts} W",
-  "telemetry_distanceValue": "{meters} m",
-  "telemetry_energyValue": "{kilowattHours} kWh",
-  "telemetry_directionValue": "{degrees}°",
-  "telemetry_concentrationValue": "{ppm} ppm",
-  "telemetry_percentageValue": "{percent}%",
-  "telemetry_analogValue": "{value}",
-  "telemetry_autoFetchQuantity": "Počet požiadaviek",
-  "telemetry_error": "Nepodarilo sa získať údaje",
  "telemetry_noData": "Nejsú dostupné žiadne údaje z telemetrie.",
  "telemetry_channelTitle": "Kanál {channel}",
  "@telemetry_channelTitle": {
@@ -2139,9 +2100,6 @@
  "translation_composerTitle": "Preložte pred odeslaním",
  "translation_title": "Preklad",
  "translation_composerSubtitle": "Riadi výchoce stav ikony pre preklad, ktorú používa program.",
-  "translation_autoIncomingTitle": "Automaticky prekladať správy",
-  "translation_autoIncomingSubtitle": "Automaticky prekladá správy pre upozornenia aj pre čet alebo kanál.",
-  "translation_translateMessage": "Preložiť správu",
  "translation_targetLanguage": "Cieľový jazyk",
  "translation_useAppLanguage": "Použite jazyk aplikácie",
  "translation_downloadedModelLabel": "Stiahnutý model",
@@ -2354,191 +2312,8 @@
  "settings_companionDebugLog": "Logovanie pre ladenie (sprievodný log)",
  "chat_newMessages": "Nové správy",
  "repeater_chanUtil": "Využitie kanálu",
-  "@routing_lastWorked": {
-    "placeholders": {
-      "when": {
-        "type": "String"
-      }
-    }
-  },
-  "@routing_deliveryCounts": {
-    "placeholders": {
-      "successes": {
-        "type": "int"
-      },
-      "failures": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathEditor_hopCounter": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathEditor_invalidTokens": {
-    "placeholders": {
-      "tokens": {
-        "type": "String"
-      }
-    }
-  },
-  "@channels_communityShortId": {
-    "placeholders": {
-      "id": {
-        "type": "String"
-      }
-    }
-  },
-  "messageStatus_sent": "Odoslané",
-  "messageStatus_delivered": "Doručené",
-  "messageStatus_pending": "Odoslanie",
-  "common_undo": "Zrušiť",
-  "messageStatus_failed": "Neúspešné odeslanie",
-  "messageStatus_repeated": "Slyšal som to opakovane",
-  "contacts_moreOptions": "Ďalšie možnosti",
-  "contacts_searchOpen": "Vyhľadajte kontakty",
-  "contacts_searchClose": "Zavrieť vyhľadávanie",
-  "routing_title": "Navigácia",
-  "routing_modeAuto": "Auto",
-  "routing_modeFlood": "Povodňová vlna",
-  "routing_modeManual": "Ručná príručka",
-  "routing_modeAutoHint": "Automaticky vyberá najznámejší trasa, a ak žiadna nie je známa, použije náhodnú trasu.",
-  "routing_modeFloodHint": "Prenos prostredníctvom všetkých opakovačov. Najspoľahlivejší spôsob, ale vyžaduje viac času vysielania.",
-  "routing_modeManualHint": "Vždy dodáva presne podľa zadaného trasy.",
-  "routing_currentRoute": "Aktuálna trasa",
-  "routing_directNoHops": "Priamo – bez prechodných trás",
-  "routing_noPathYet": "Zatiaľ neexistuje žiadna cesta. Nasledujúce správy budú pokračovať, kým sa nenájde trasa.",
-  "routing_floodBroadcast": "Prenos prostredníctvom každého opakovača",
-  "routing_editPath": "Upraviť trasu",
-  "routing_forgetPath": "Zabudnite na trasu",
-  "routing_knownPaths": "Známe cesty",
-  "routing_knownPathsHint": "Kliknite na cestu, aby ste sa k nej presunuli.",
-  "routing_inUse": "V prevádzke",
-  "routing_qualityStrong": "Silný prvý krok",
-  "routing_qualityGood": "Úspešný prvý krok",
-  "routing_qualityFair": "Prvá, spravodlivá fáza",
-  "routing_qualityWorked": "Dosiahnutý úspech",
-  "routing_qualityFlood": "Zistil som to z informácií, ktoré som získal v dôsledku povodňovej situácie.",
-  "routing_qualityUntested": "Neotestované",
-  "routing_neverWorked": "nikedy nebolo potvrdené",
-  "routing_floodDelivery": "Doručenie v prípade povodní",
-  "pathEditor_title": "Vytvorenie cesty",
-  "pathEditor_hopCounter": "{count} z 64 chmelových zŕš",
-  "pathEditor_noHops": "Zatiaľ žiadne chmel. Kliknite na opakované, aby ste ich pridali postupne, alebo uložte bez chmelu, aby ste ho mohli poslať priamo.",
-  "pathEditor_addHops": "Pridávajte chmel podľa zadaného poriadku.",
-  "pathEditor_searchRepeaters": "Hľadať opakované",
-  "pathEditor_advancedHex": "Pokročilé: pôvodná hexová cesta",
-  "pathEditor_hexLabel": "Prefiksy pre hexadecimálne čísla",
-  "pathEditor_hexHelper": "Dve hexové čísla na každý krok, oddelené čiarkami",
-  "routing_lastWorked": "worked {when}",
-  "pathEditor_invalidTokens": "Neplatné: {tokens}",
-  "routing_deliveryCounts": "{successes} delivered, {failures} failed",
-  "pathEditor_tooManyHops": "Maximálne 64 krokov",
-  "pathEditor_usePath": "Použite túto cestu",
-  "pathEditor_removeHop": "Odstráňte chmel",
-  "pathEditor_unknownHop": "Neznáme zariadenie na opakované vysielanie",
-  "map_zoomIn": "Zväčšiť",
-  "map_zoomOut": "Zmenť zamer zblízka",
-  "map_centerMap": "Mapa centra",
-  "chrome_bluetoothRequiresChromium": "Web Bluetooth vyžaduje prehliadač Chromium.",
-  "channels_communityShortId": "ID: {id}...",
-  "pathTrace_legendGpsConfirmed": "GPS potvrdilo",
-  "pathTrace_legendInferred": "Odvodená poloha",
-  "@pathMap_hopOf": {
-    "placeholders": {
-      "current": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_observedPaths": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_alternate": {
-    "placeholders": {
-      "index": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_hopCount": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_gpsCount": {
-    "placeholders": {
-      "confirmed": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_sharedNodeCount": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_partialAnimation": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "map_online": "Online",
-  "scanner_bluetoothWebUnsupported": "Funkcia Bluetooth nie je dostupná v prehliadači. Prepojte sa pomocou USB.",
-  "map_searchHint": "Vyhľadajte podľa názvu alebo ID uzla",
-  "map_activity": "Aktivita",
-  "map_recent": "Nedávne",
-  "map_stale": "Neaktuálne",
-  "map_hidden": "Skrytý",
-  "map_visible": "Viditeľný",
-  "map_centerOnNode": "Nacentrovať na uzol",
-  "map_details": "Podrobnosti",
-  "map_noGps": "Bez GPS",
-  "map_noResults": "Nenašli sa žiadne zodpovedajúce uzly.",
-  "pathMap_viewSingle": "Jednotlivý",
-  "pathMap_viewCombined": "Spojené",
-  "pathMap_play": "Prehrať",
-  "pathMap_pause": "Pozastaviť",
-  "pathMap_replay": "Prehrať znova",
-  "pathMap_stepBack": "Predchádzajúci skok",
-  "pathMap_stepForward": "Nasledujúci skok",
-  "pathMap_animationOn": "Zobraziť animáciu paketu",
-  "pathMap_animationOff": "Skryť animáciu paketu",
-  "pathMap_hopOf": "Skok {current} z {total}",
-  "pathMap_observedPaths": "Pozorované cesty: {count}",
-  "pathMap_primary": "Primárna",
-  "pathMap_alternate": "Alternatívny {index}",
-  "pathMap_hopCount": "{count, plural, =1{1 skok} few{{count} skoky} other{{count} skokov}}",
-  "pathMap_legendShared": "Spoločný segment",
-  "pathMap_legendEstimated": "Odhadovaný segment",
-  "pathMap_sharedNodeCount": "Používané {count} cestami",
-  "pathMap_partialAnimation": "{count, plural, =1{1 skok nemá polohu — zobrazená trasa je neúplná} few{{count} skoky nemajú polohu — zobrazená trasa je neúplná} other{{count} skokov nemá polohu — zobrazená trasa je neúplná}}",
-  "pathMap_showAllPaths": "Zobraziť všetky",
-  "pathMap_hidePath": "Skryť cestu",
-  "pathMap_showPath": "Zobraziť trasu",
-  "pathMap_collapsePanel": "Zatvoriť panel",
-  "pathMap_expandPanel": "Rozbaliť panel",
-  "pathMap_noLocation": "Bez polohy",
-  "pathMap_followPacket": "Uzamknúť pohľad na paket",
-  "pathMap_unfollowPacket": "Odomknúť pohľad od paketu",
-  "pathMap_gpsCount": "{confirmed}/{total} GPS"
+  "dialog_connectCompanion": "Pripojte sa k sprievodcovi a získajte prístup k funkciám opakovača a serveru miestností.",
+  "dialog_disconnectedTitle": "Odpojené",
+  "dialog_disconnectedMessage": "Od vášho spoločníka ste boli odpojený.",
+  "contact_connectCompanion": "Pripojte sa k spoločníkovi pre prístup k funkciám opakovača a miestneho servera."
 }
@@ -33,8 +33,6 @@
  "common_remove": "Izbrisati",
  "common_enable": "Omogoči",
  "common_disable": "Izklopiti",
-  "common_autoRefresh": "Samodejno osveževanje",
-  "common_interval": "Časovni interval",
  "common_reboot": "Ponoviti",
  "common_loading": "Naložanje...",
  "common_notAvailable": "—",
@@ -1282,43 +1280,6 @@
      }
    }
  },
-  "telemetry_digitalInputLabel": "Digitalni vhod",
-  "telemetry_digitalOutputLabel": "Digitalni izhod",
-  "telemetry_analogInputLabel": "Analogni vhod",
-  "telemetry_analogOutputLabel": "Analogni izhod",
-  "telemetry_genericLabel": "Splošni senzor",
-  "telemetry_luminosityLabel": "Osvetljenost",
-  "telemetry_presenceLabel": "Prisotnost",
-  "telemetry_humidityLabel": "Vlažnost",
-  "telemetry_accelerometerLabel": "Merilnik pospeška",
-  "telemetry_pressureLabel": "Tlak",
-  "telemetry_altitudeLabel": "Nadmorska višina",
-  "telemetry_frequencyLabel": "Frekvenca",
-  "telemetry_percentageLabel": "Odstotek",
-  "telemetry_concentrationLabel": "Koncentracija",
-  "telemetry_powerLabel": "Moč",
-  "telemetry_distanceLabel": "Razdalja",
-  "telemetry_energyLabel": "Energija",
-  "telemetry_directionLabel": "Smer",
-  "telemetry_timeLabel": "Čas",
-  "telemetry_gyrometerLabel": "Žiroskop",
-  "telemetry_colourLabel": "Barva",
-  "telemetry_gpsLabel": "GPS",
-  "telemetry_switchLabel": "Stikalo",
-  "telemetry_polylineLabel": "Polilinija",
-  "telemetry_altitudeValue": "{meters} m",
-  "telemetry_frequencyValue": "{hertz} Hz",
-  "telemetry_pressureValue": "{hpa} hPa",
-  "telemetry_luminosityValue": "{lux} lx",
-  "telemetry_powerValue": "{watts} W",
-  "telemetry_distanceValue": "{meters} m",
-  "telemetry_energyValue": "{kilowattHours} kWh",
-  "telemetry_directionValue": "{degrees}°",
-  "telemetry_concentrationValue": "{ppm} ppm",
-  "telemetry_percentageValue": "{percent}%",
-  "telemetry_analogValue": "{value}",
-  "telemetry_autoFetchQuantity": "Število zahtev",
-  "telemetry_error": "Podatkov ni bilo mogoče pridobiti",
  "telemetry_noData": "Niso na voljo podatki o telemetriji.",
  "telemetry_channelTitle": "Kanal {channel}",
  "@telemetry_channelTitle": {
@@ -2138,9 +2099,6 @@
  "translation_enableSubtitle": "Prevedite vstopne sporočila in omogočite predhodno prevajanje.",
  "translation_enableTitle": "Omogočite prevod",
  "translation_composerSubtitle": "Ureja privzeto stanje ikone za prevod, ki jo uporablja avtor.",
-  "translation_autoIncomingTitle": "Samodejno prevajaj sporočila",
-  "translation_autoIncomingSubtitle": "Samodejno prevaja sporočila za obvestila ter za klepete ali kanale.",
-  "translation_translateMessage": "Prevedi sporočilo",
  "translation_targetLanguage": "Ciljna jezika",
  "translation_useAppLanguage": "Uporabite jezik aplikacije",
  "translation_downloadedModelLabel": "Naložen model",
@@ -2354,191 +2312,8 @@
  "chat_newMessages": "Nove novice",
  "settings_companionDebugLogSubtitle": "Navodila, odgovori in surova podatka za BLE/TCP/USB.",
  "repeater_chanUtil": "Uporaba kanala",
-  "@routing_lastWorked": {
-    "placeholders": {
-      "when": {
-        "type": "String"
-      }
-    }
-  },
-  "@routing_deliveryCounts": {
-    "placeholders": {
-      "successes": {
-        "type": "int"
-      },
-      "failures": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathEditor_hopCounter": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathEditor_invalidTokens": {
-    "placeholders": {
-      "tokens": {
-        "type": "String"
-      }
-    }
-  },
-  "@channels_communityShortId": {
-    "placeholders": {
-      "id": {
-        "type": "String"
-      }
-    }
-  },
-  "common_undo": "Preobrn",
-  "messageStatus_delivered": "Dostavljeno",
-  "messageStatus_sent": "Pošljeno",
-  "messageStatus_pending": "Pošiljanje",
-  "messageStatus_failed": "Uspešno ni bilo mogo, da se sporočilo pošlje",
-  "messageStatus_repeated": "Slišal sem večkrat",
-  "contacts_moreOptions": "Več možnosti",
-  "contacts_searchOpen": "Iskanje kontaktov",
-  "contacts_searchClose": "Izklopi iskanje",
-  "routing_title": "Navigacija",
-  "routing_modeAuto": "Avto",
-  "routing_modeFlood": "Poplavo",
-  "routing_modeManual": "Navodilo",
-  "routing_modeAutoHint": "Samodejno izbere najbolj poznano pot, in sicer, ko ni na voljo nobena.",
-  "routing_modeFloodHint": "Prenosi preko vseh repetitorjev. Najzanesljivejši način, vendar zahteva več časa.",
-  "routing_modeManualHint": "Vedno sledi natančni poti, ki jo ste določili.",
-  "routing_currentRoute": "Trenutna pot",
-  "routing_directNoHops": "Neposredno – brez prehodov",
-  "routing_noPathYet": "Žep trenutno ni mogoče najti. Naslednje sporočilo bo posredovano, dokler ne bo ugotovljeno, kje je pot.",
-  "routing_floodBroadcast": "Prenos preko vseh repetitiv",
-  "routing_editPath": "Uredi pot",
-  "routing_forgetPath": "Pozabi na pot",
-  "routing_knownPaths": "Poznati poti",
-  "routing_knownPathsHint": "Kliknite na pot, da jo izberete.",
-  "routing_inUse": "V uporabi",
-  "routing_qualityStrong": "Močan prvi korak",
-  "routing_qualityGood": "Prva uspešna faza",
-  "routing_qualityFair": "Prva, uspešna faza",
-  "routing_qualityWorked": "Izpolnil",
-  "routing_qualityFlood": "Slišano preko poplave",
-  "routing_qualityUntested": "Ne preizkušen",
-  "routing_lastWorked": "delal/a {when}",
-  "routing_neverWorked": "nikoli ni bilo potrjeno",
-  "routing_floodDelivery": "Dostava zaradi poplave",
-  "pathEditor_title": "Izgradnja poti",
-  "pathEditor_hopCounter": "{count} od 64 različnih sort hropa",
-  "pathEditor_noHops": "Še niso dodani hmelji. Za dodajanje hmelja v vrstnem redu kliknite na povezavo spodaj, ali pa shranite brez dodanega hmelja, da ga lahko posredujete neposredno.",
-  "pathEditor_addHops": "Dodajte suho travo v skladu s postopkom.",
-  "pathEditor_searchRepeaters": "Iskanje ponovitev",
-  "pathEditor_advancedHex": "Napredno: surovi šestnajstni pot",
-  "pathEditor_hexLabel": "Predfiks za heksadecimalno šifro",
-  "pathEditor_hexHelper": "Dva šestbitna znaka na vsak skok, ločena z vejico",
-  "pathEditor_invalidTokens": "Neveljaven: {tokens}",
-  "pathEditor_tooManyHops": "Največ 64 hopov",
-  "pathEditor_usePath": "Uporabite to poto",
-  "pathEditor_removeHop": "Odstranite hmelj",
-  "pathEditor_unknownHop": "Neznani ponovitelj",
-  "map_zoomIn": "Povečaj",
-  "routing_deliveryCounts": "{successes} delivered, {failures} failed",
-  "map_zoomOut": "Povečajte pogled",
-  "map_centerMap": "Krajšarska karta",
-  "chrome_bluetoothRequiresChromium": "Web Bluetooth zahteva brskalnik Chromium.",
-  "channels_communityShortId": "ID: {id}...",
-  "pathTrace_legendGpsConfirmed": "GPS potrdilo",
-  "pathTrace_legendInferred": "Izpeljana lokacija",
-  "@pathMap_hopOf": {
-    "placeholders": {
-      "current": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_observedPaths": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_alternate": {
-    "placeholders": {
-      "index": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_hopCount": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_gpsCount": {
-    "placeholders": {
-      "confirmed": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_sharedNodeCount": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_partialAnimation": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "scanner_bluetoothWebUnsupported": "Funkcija Bluetooth v brskalniku ni na voljo. Povežite se preko USB-ja namesto tega.",
-  "map_searchHint": "Iščite ime ali ID vozlišča",
-  "map_online": "V omrežju",
-  "map_activity": "Dejavnost",
-  "map_recent": "Nedavni",
-  "map_stale": "Zastarelo",
-  "map_visible": "Vidno",
-  "map_hidden": "Skrit",
-  "map_centerOnNode": "Centriraj na vozlišče",
-  "map_details": "Podrobnosti",
-  "map_noGps": "Brez GPS",
-  "map_noResults": "Ni ujemajočih se vozlišč",
-  "pathMap_viewSingle": "Posamično",
-  "pathMap_viewCombined": "Skupno",
-  "pathMap_play": "Predvajaj",
-  "pathMap_pause": "Premor",
-  "pathMap_replay": "Ponovitev",
-  "pathMap_stepBack": "Prejšnji skok",
-  "pathMap_stepForward": "Naslednji skok",
-  "pathMap_animationOn": "Prikaži animacijo paketa",
-  "pathMap_animationOff": "Skrij animacijo paketa",
-  "pathMap_hopOf": "Skok {current} od {total}",
-  "pathMap_observedPaths": "Opazovane poti: {count}",
-  "pathMap_primary": "Primarna",
-  "pathMap_alternate": "Alternativa {index}",
-  "pathMap_legendShared": "Deljen segment",
-  "pathMap_legendEstimated": "Ocenjen segment",
-  "pathMap_sharedNodeCount": "Uporablja {count} poti",
-  "pathMap_partialAnimation": "{count, plural, =1{1 skok nima lokacije — prikazana pot je delna} =2{2 skoka nimata lokacije — prikazana pot je delna} few{{count} skoki nimajo lokacije — prikazana pot je delna} other{{count} skokov nima lokacije — prikazana pot je delna}}",
-  "pathMap_hopCount": "{count, plural, =1{1 skok} =2{2 skoka} few{{count} skoki} other{{count} skokov}}",
-  "pathMap_showAllPaths": "Pokaži vse",
-  "pathMap_hidePath": "Skrij pot",
-  "pathMap_showPath": "Pokaži pot",
-  "pathMap_collapsePanel": "Strni ploščo",
-  "pathMap_expandPanel": "Razširi ploščo",
-  "pathMap_noLocation": "Brez lokacije",
-  "pathMap_followPacket": "Zakleni pogled na paket",
-  "pathMap_unfollowPacket": "Odkleni pogled od paketa",
-  "pathMap_gpsCount": "{confirmed}/{total} GPS"
+  "dialog_connectCompanion": "Povežite se s spremljevalnikom za dostop do funkcij ponavljalnika in strežnika sob.",
+  "dialog_disconnectedTitle": "Prekinjeno",
+  "dialog_disconnectedMessage": "Prekinjena povezava s vašim spre伴ovalcem.",
+  "contact_connectCompanion": "Povežite se s ponсоbnikom za dostop do funkcij pon 반복nika in strežnika prostorov."
 }
@@ -33,8 +33,6 @@
  "common_remove": "Ta bort",
  "common_enable": "Aktivera",
  "common_disable": "Inaktivera",
-  "common_autoRefresh": "Automatisk uppdatering",
-  "common_interval": "Intervall",
  "common_reboot": "Start om",
  "common_loading": "Laddar...",
  "common_notAvailable": "—",
@@ -1282,43 +1280,6 @@
      }
    }
  },
-  "telemetry_digitalInputLabel": "Digital ingång",
-  "telemetry_digitalOutputLabel": "Digital utgång",
-  "telemetry_analogInputLabel": "Analog ingång",
-  "telemetry_analogOutputLabel": "Analog utgång",
-  "telemetry_genericLabel": "Allmän sensor",
-  "telemetry_luminosityLabel": "Ljusstyrka",
-  "telemetry_presenceLabel": "Närvaro",
-  "telemetry_humidityLabel": "Luftfuktighet",
-  "telemetry_accelerometerLabel": "Accelerometer",
-  "telemetry_pressureLabel": "Tryck",
-  "telemetry_altitudeLabel": "Höjd",
-  "telemetry_frequencyLabel": "Frekvens",
-  "telemetry_percentageLabel": "Procent",
-  "telemetry_concentrationLabel": "Koncentration",
-  "telemetry_powerLabel": "Effekt",
-  "telemetry_distanceLabel": "Avstånd",
-  "telemetry_energyLabel": "Energi",
-  "telemetry_directionLabel": "Riktning",
-  "telemetry_timeLabel": "Tid",
-  "telemetry_gyrometerLabel": "Gyrometer",
-  "telemetry_colourLabel": "Färg",
-  "telemetry_gpsLabel": "GPS",
-  "telemetry_switchLabel": "Brytare",
-  "telemetry_polylineLabel": "Polylinje",
-  "telemetry_altitudeValue": "{meters} m",
-  "telemetry_frequencyValue": "{hertz} Hz",
-  "telemetry_pressureValue": "{hpa} hPa",
-  "telemetry_luminosityValue": "{lux} lx",
-  "telemetry_powerValue": "{watts} W",
-  "telemetry_distanceValue": "{meters} m",
-  "telemetry_energyValue": "{kilowattHours} kWh",
-  "telemetry_directionValue": "{degrees}°",
-  "telemetry_concentrationValue": "{ppm} ppm",
-  "telemetry_percentageValue": "{percent}%",
-  "telemetry_analogValue": "{value}",
-  "telemetry_autoFetchQuantity": "Antal förfrågningar",
-  "telemetry_error": "Det gick inte att hämta data",
  "telemetry_noData": "Inga telemetridata tillgängliga.",
  "telemetry_channelTitle": "Kanal {channel}",
  "@telemetry_channelTitle": {
@@ -2139,9 +2100,6 @@
  "translation_title": "Översättning",
  "translation_composerTitle": "Översätt innan du skickar",
  "translation_composerSubtitle": "Styr standardtillståndet för kompositorns översättningsikon.",
-  "translation_autoIncomingTitle": "Översätt meddelanden automatiskt",
-  "translation_autoIncomingSubtitle": "Översätter meddelanden automatiskt för aviseringar och för chattar eller kanaler.",
-  "translation_translateMessage": "Översätt meddelande",
  "translation_targetLanguage": "Målmedvetet språk",
  "translation_useAppLanguage": "Använd appens språk",
  "translation_downloadedModelLabel": "Nedladdad modell",
@@ -2354,191 +2312,8 @@
  "chat_newMessages": "Nya meddelanden",
  "settings_companionDebugLogSubtitle": "BLE/TCP/USB-kommandon, svar och rådata",
  "repeater_chanUtil": "Användning av kanal",
-  "@routing_lastWorked": {
-    "placeholders": {
-      "when": {
-        "type": "String"
-      }
-    }
-  },
-  "@routing_deliveryCounts": {
-    "placeholders": {
-      "successes": {
-        "type": "int"
-      },
-      "failures": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathEditor_hopCounter": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathEditor_invalidTokens": {
-    "placeholders": {
-      "tokens": {
-        "type": "String"
-      }
-    }
-  },
-  "@channels_communityShortId": {
-    "placeholders": {
-      "id": {
-        "type": "String"
-      }
-    }
-  },
-  "messageStatus_sent": "Sen",
-  "messageStatus_delivered": "Levererad",
-  "common_undo": "Ångra",
-  "messageStatus_pending": "Skicka",
-  "messageStatus_failed": "Misslyckades med att skicka",
-  "messageStatus_repeated": "Hördes upprepade gånger",
-  "contacts_moreOptions": "Fler alternativ",
-  "contacts_searchOpen": "Sök efter kontakter",
-  "contacts_searchClose": "Avancerad sökning",
-  "routing_title": "Ruttplanering",
-  "routing_modeAuto": "Bil",
-  "routing_modeFlood": "Översvämning",
-  "routing_modeManual": "Instruktioner",
-  "routing_modeAutoHint": "Väljer automatiskt den bästa kända vägen, och använder en \"flooding\"-strategi om ingen väg är känd.",
-  "routing_modeFloodHint": "Sändningar via alla repetrar. Det mest pålitliga alternativet, men kräver mer sändtid.",
-  "routing_modeManualHint": "Skickar alltid den exakta väg du har angivit.",
-  "routing_currentRoute": "Nuvarande rutt",
-  "routing_directNoHops": "Direkt – utan mellanliggande routrar",
-  "routing_noPathYet": "Ingen väg hittad ännu. Nästa meddelande skickas tills en rutt har upptäckts.",
-  "routing_floodBroadcast": "Sändas via alla repetrar",
-  "routing_editPath": "Redigera sökväg",
-  "routing_forgetPath": "Glöm vägen",
-  "routing_knownPaths": "Kända vägar",
-  "routing_knownPathsHint": "Välj en väg för att byta till den.",
-  "routing_inUse": "I användning",
-  "routing_qualityStrong": "En stark start",
-  "routing_qualityGood": "Bra första steg",
-  "routing_qualityFair": "Bra första hopp",
-  "routing_qualityWorked": "Har levererat",
-  "routing_qualityFlood": "Fått information via nyhetsflöde",
-  "routing_qualityUntested": "Ej testat",
-  "routing_lastWorked": "arbetade {when}",
-  "routing_neverWorked": "aldrig bekräftat",
-  "routing_floodDelivery": "Leverans vid översvämningsområde",
-  "pathEditor_title": "Skapa väg",
-  "pathEditor_hopCounter": "{count} av 64 humlor",
-  "pathEditor_noHops": "Inga humle än. Använd knapparna nedan för att lägga till dem i rätt ordning, eller spara utan humle för att skicka direkt.",
-  "pathEditor_addHops": "Tillsätt humlen i rätt ordning.",
-  "pathEditor_searchRepeaters": "Sök efter återupptagna samtal",
-  "pathEditor_advancedHex": "Avancerat: rå hex-sökväg",
-  "pathEditor_hexLabel": "Hex-prefikser",
-  "pathEditor_hexHelper": "Två hex-tecken per steg, separerade med kommatecken.",
-  "pathEditor_invalidTokens": "Ogiltigt: {tokens}",
-  "pathEditor_tooManyHops": "Maximalt 64 humlörter",
-  "pathEditor_usePath": "Använd denna väg",
-  "pathEditor_removeHop": "Ta bort humlen",
-  "pathEditor_unknownHop": "Okänd förstärkare",
-  "map_zoomIn": "Zooma in",
-  "routing_deliveryCounts": "{successes} delivered, {failures} failed",
-  "map_zoomOut": "Zooma ut",
-  "map_centerMap": "Kartöversikt",
-  "chrome_bluetoothRequiresChromium": "Web Bluetooth kräver en Chromium-baserad webbläsare.",
-  "channels_communityShortId": "ID: {id}...",
-  "pathTrace_legendGpsConfirmed": "GPS-verifierat",
-  "pathTrace_legendInferred": "Antagen position",
-  "@pathMap_hopOf": {
-    "placeholders": {
-      "current": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_observedPaths": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_alternate": {
-    "placeholders": {
-      "index": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_hopCount": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_gpsCount": {
-    "placeholders": {
-      "confirmed": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_sharedNodeCount": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_partialAnimation": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "map_online": "Online",
-  "scanner_bluetoothWebUnsupported": "Bluetooth är inte tillgängligt i webbläsaren. Anslut istället via USB.",
-  "map_activity": "Aktivitet",
-  "map_searchHint": "Sök efter nodens namn eller ID",
-  "map_recent": "Nyligen",
-  "map_stale": "Inaktuell",
-  "map_visible": "Synlig",
-  "map_hidden": "Dold",
-  "map_centerOnNode": "Centrera på nod",
-  "map_details": "Detaljer",
-  "map_noGps": "Ingen GPS",
-  "map_noResults": "Inga matchande noder",
-  "pathMap_viewSingle": "Enkel",
-  "pathMap_viewCombined": "Kombinerat",
-  "pathMap_play": "Spela",
-  "pathMap_pause": "Pausa",
-  "pathMap_replay": "Återspela",
-  "pathMap_stepBack": "Föregående hopp",
-  "pathMap_stepForward": "Nästa hopp",
-  "pathMap_animationOn": "Visa paketanimering",
-  "pathMap_animationOff": "Dölj paketanimering",
-  "pathMap_hopOf": "Hopp {current} av {total}",
-  "pathMap_observedPaths": "Observerade vägar: {count}",
-  "pathMap_primary": "Primär",
-  "pathMap_alternate": "Alternativ {index}",
-  "pathMap_hopCount": "{count, plural, =1{1 hopp} other{{count} hopp}}",
-  "pathMap_legendShared": "Delat segment",
-  "pathMap_legendEstimated": "Uppskattat segment",
-  "pathMap_sharedNodeCount": "Används av {count} vägar",
-  "pathMap_partialAnimation": "{count, plural, =1{1 hopp saknar position — den visade vägen är ofullständig} other{{count} hopp saknar position — den visade vägen är ofullständig}}",
-  "pathMap_showAllPaths": "Visa allt",
-  "pathMap_hidePath": "Dölj väg",
-  "pathMap_showPath": "Visa väg",
-  "pathMap_collapsePanel": "Fäll ihop panel",
-  "pathMap_expandPanel": "Expandera panel",
-  "pathMap_noLocation": "Ingen position",
-  "pathMap_unfollowPacket": "Lås upp vy från paket",
-  "pathMap_followPacket": "Lås vy till paket",
-  "pathMap_gpsCount": "{confirmed}/{total} GPS"
+  "dialog_connectCompanion": "Anslut till en sällskapstjänst för att komma åt upprepning och rumsserverfunktioner.",
+  "dialog_disconnectedTitle": "Ansluten ej",
+  "dialog_disconnectedMessage": "Du har kopplats från din companion.",
+  "contact_connectCompanion": "Anslut till en companion för att få tillgång till repeater- och rumsserverfunktioner."
 }
@@ -34,8 +34,6 @@
  "common_remove": "Прибрати",
  "common_enable": "Увімкнути",
  "common_disable": "Вимкнути",
-  "common_autoRefresh": "Автооновлення",
-  "common_interval": "Інтервал",
  "common_reboot": "Перезавантажити",
  "common_loading": "Завантаження...",
  "common_notAvailable": "—",
@@ -1293,43 +1291,6 @@
      }
    }
  },
-  "telemetry_digitalInputLabel": "Цифровий вхід",
-  "telemetry_digitalOutputLabel": "Цифровий вихід",
-  "telemetry_analogInputLabel": "Аналоговий вхід",
-  "telemetry_analogOutputLabel": "Аналоговий вихід",
-  "telemetry_genericLabel": "Загальний датчик",
-  "telemetry_luminosityLabel": "Освітленість",
-  "telemetry_presenceLabel": "Присутність",
-  "telemetry_humidityLabel": "Вологість",
-  "telemetry_accelerometerLabel": "Акселерометр",
-  "telemetry_pressureLabel": "Тиск",
-  "telemetry_altitudeLabel": "Висота",
-  "telemetry_frequencyLabel": "Частота",
-  "telemetry_percentageLabel": "Відсоток",
-  "telemetry_concentrationLabel": "Концентрація",
-  "telemetry_powerLabel": "Потужність",
-  "telemetry_distanceLabel": "Відстань",
-  "telemetry_energyLabel": "Енергія",
-  "telemetry_directionLabel": "Напрямок",
-  "telemetry_timeLabel": "Час",
-  "telemetry_gyrometerLabel": "Гірометр",
-  "telemetry_colourLabel": "Колір",
-  "telemetry_gpsLabel": "GPS",
-  "telemetry_switchLabel": "Перемикач",
-  "telemetry_polylineLabel": "Полілінія",
-  "telemetry_altitudeValue": "{meters} м",
-  "telemetry_frequencyValue": "{hertz} Гц",
-  "telemetry_pressureValue": "{hpa} гПа",
-  "telemetry_luminosityValue": "{lux} лк",
-  "telemetry_powerValue": "{watts} Вт",
-  "telemetry_distanceValue": "{meters} м",
-  "telemetry_energyValue": "{kilowattHours} кВт⋅год",
-  "telemetry_directionValue": "{degrees}°",
-  "telemetry_concentrationValue": "{ppm} ppm",
-  "telemetry_percentageValue": "{percent}%",
-  "telemetry_analogValue": "{value}",
-  "telemetry_autoFetchQuantity": "Кількість запитів",
-  "telemetry_error": "Не вдалося отримати дані",
  "telemetry_noData": "Дані телеметрії недоступні.",
  "telemetry_channelTitle": "Канал {channel}",
  "@telemetry_channelTitle": {
@@ -2148,9 +2109,6 @@
  "translation_enableTitle": "Увімкнути переклад",
  "translation_enableSubtitle": "Перекладати отримані повідомлення та дозволяти попередній переклад перед відправкою.",
  "translation_composerSubtitle": "Контролює стан ікон перекладу, який використовується за замовчуванням.",
-  "translation_autoIncomingTitle": "Автоматично перекладати повідомлення",
-  "translation_autoIncomingSubtitle": "Автоматично перекладає повідомлення для сповіщень, а також для чатів і каналів.",
-  "translation_translateMessage": "Перекласти повідомлення",
  "translation_targetLanguage": "Цільова мова",
  "translation_useAppLanguage": "Використовувати мову застосунку",
  "translation_downloadedModelLabel": "Завантажений шаблон",
@@ -2334,191 +2292,8 @@
  "chat_newMessages": "Нові повідомлення",
  "chat_markAsUnread": "Позначити як непрочитане",
  "repeater_chanUtil": "Використання каналу",
-  "@routing_lastWorked": {
-    "placeholders": {
-      "when": {
-        "type": "String"
-      }
-    }
-  },
-  "@routing_deliveryCounts": {
-    "placeholders": {
-      "successes": {
-        "type": "int"
-      },
-      "failures": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathEditor_hopCounter": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathEditor_invalidTokens": {
-    "placeholders": {
-      "tokens": {
-        "type": "String"
-      }
-    }
-  },
-  "@channels_communityShortId": {
-    "placeholders": {
-      "id": {
-        "type": "String"
-      }
-    }
-  },
-  "messageStatus_delivered": "Доставлено",
-  "messageStatus_sent": "Надіслано",
-  "common_undo": "Скасувати",
-  "messageStatus_pending": "Надсилання",
-  "messageStatus_failed": "Не вдалося надіслати",
-  "messageStatus_repeated": "Почув неодноразово",
-  "contacts_moreOptions": "Більше можливостей",
-  "contacts_searchOpen": "Пошук контактів",
-  "contacts_searchClose": "Закрити пошук",
-  "routing_title": "Маршрутизація",
-  "routing_modeAuto": "Автомобіль",
-  "routing_modeFlood": "Повені",
-  "routing_modeManual": "Інструкція",
-  "routing_modeAutoHint": "Автоматично обирає найкращий відомий шлях, та у разі відсутності відомого шляху, використовує алгоритм \"занурення\".",
-  "routing_modeFloodHint": "Передавання через усі ретранслятори. Найбільш надійний спосіб, але потребує більше часу.",
-  "routing_modeManualHint": "Завжди доставляє точно за вказаним вами маршрутом.",
-  "routing_currentRoute": "Поточний маршрут",
-  "routing_directNoHops": "Пряме з'єднання – без проміжних ретрансляторів",
-  "routing_noPathYet": "Поки що немає жодного шляху. Повідомлення продовжуються надходити, поки не буде знайдено маршрут.",
-  "routing_floodBroadcast": "Поширення через усі ретранслятори",
-  "routing_editPath": "Редагувати шлях",
-  "routing_forgetPath": "Забудь про шлях",
-  "routing_knownPaths": "Відомі маршрути",
-  "routing_knownPathsHint": "Виберіть опцію, щоб переключитися на неї.",
-  "routing_inUse": "У робочому стані",
-  "routing_qualityStrong": "Сильний перший стрибок",
-  "routing_qualityGood": "Чудова перша спроба",
-  "routing_qualityFair": "Перший, але вдалий, крок",
-  "routing_qualityWorked": "Доставлено",
-  "routing_qualityFlood": "Дізнався через новини",
-  "routing_qualityUntested": "Не протестовано",
-  "routing_neverWorked": "ніколи не підтверджено",
-  "routing_floodDelivery": "Доставка під час повені",
-  "pathEditor_title": "Створити маршрут",
-  "pathEditor_hopCounter": "{count} з 64 штук хмелю",
-  "pathEditor_noHops": "Ще не додано хміль. Натисніть на відповідні кнопки, щоб додати його в потрібному порядку, або збережіть рецепт без хмілю, щоб відправити його безпосередньо.",
-  "pathEditor_addHops": "Додавайте хміль у наступній послідовності.",
-  "pathEditor_searchRepeaters": "Пошук повторювачів",
-  "pathEditor_advancedHex": "Просунутий рівень: пряма шлях у форматі шестнадцяткової системи.",
-  "pathEditor_hexLabel": "Префікси для шестнадцяткової системи числення",
-  "pathEditor_hexHelper": "Два шестизначні символи на кожний крок, розділені комами",
-  "pathEditor_invalidTokens": "Неправильно: {tokens}",
-  "routing_lastWorked": "worked {when}",
-  "routing_deliveryCounts": "{successes} delivered, {failures} failed",
-  "pathEditor_tooManyHops": "Максимум 64 хмелеві колоди",
-  "pathEditor_usePath": "Використовуйте цей шлях",
-  "pathEditor_removeHop": "Видалити хміль",
-  "pathEditor_unknownHop": "Невідомий ретранслятор",
-  "map_zoomIn": "Увійти в режим збільшення",
-  "map_zoomOut": "Видалити зум",
-  "map_centerMap": "Карта центру",
-  "chrome_bluetoothRequiresChromium": "Web Bluetooth вимагає браузера на основі Chromium",
-  "channels_communityShortId": "ID: {id}...",
-  "pathTrace_legendGpsConfirmed": "GPS підтверджено",
-  "pathTrace_legendInferred": "Висновок щодо положення",
-  "@pathMap_hopOf": {
-    "placeholders": {
-      "current": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_observedPaths": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_alternate": {
-    "placeholders": {
-      "index": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_hopCount": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_gpsCount": {
-    "placeholders": {
-      "confirmed": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_sharedNodeCount": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_partialAnimation": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "scanner_bluetoothWebUnsupported": "Bluetooth недоступний у браузері. Підключіться через USB.",
-  "map_searchHint": "Назва або ID вузла",
-  "map_activity": "Активність",
-  "map_online": "Онлайн",
-  "map_recent": "Нещодавні",
-  "map_stale": "Застаріло",
-  "map_visible": "Видимий",
-  "map_hidden": "Прихований",
-  "map_centerOnNode": "Центрувати на вузлі",
-  "map_details": "Деталі",
-  "map_noGps": "Без GPS",
-  "map_noResults": "Не знайдено відповідних вузлів",
-  "pathMap_viewSingle": "Один",
-  "pathMap_viewCombined": "Об'єднаний",
-  "pathMap_play": "Відтворити",
-  "pathMap_pause": "Призупинити",
-  "pathMap_replay": "Повтор",
-  "pathMap_stepForward": "Наступний перехід",
-  "pathMap_stepBack": "Попередній перехід",
-  "pathMap_animationOn": "Відобразити анімацію пакета",
-  "pathMap_animationOff": "Приховати анімацію пакета",
-  "pathMap_hopOf": "Перехід {current} з {total}",
-  "pathMap_observedPaths": "Зафіксовані маршрути: {count}",
-  "pathMap_primary": "Основний",
-  "pathMap_alternate": "Альт. {index}",
-  "pathMap_hopCount": "{count, plural, =1{1 перехід} few{{count} переходи} many{{count} переходів} other{{count} переходів}}",
-  "pathMap_legendShared": "Об'єднаний сегмент",
-  "pathMap_legendEstimated": "Орієнтовний сегмент",
-  "pathMap_sharedNodeCount": "Використовується {count} шляхами",
-  "pathMap_partialAnimation": "{count, plural, =1{1 перехід не має геопозиції — показаний шлях є частковим} few{{count} переходи не мають геопозиції — показаний шлях є частковим} many{{count} переходів не мають геопозиції — показаний шлях є частковим} other{{count} переходів не мають геопозиції — показаний шлях є частковим}}",
-  "pathMap_showAllPaths": "Показати все",
-  "pathMap_hidePath": "Приховати шлях",
-  "pathMap_showPath": "Показати шлях",
-  "pathMap_collapsePanel": "Згорнути панель",
-  "pathMap_expandPanel": "Розгорнути панель",
-  "pathMap_noLocation": "Без геопозиції",
-  "pathMap_followPacket": "Прив'язати вигляд до пакету",
-  "pathMap_unfollowPacket": "Відв'язати вигляд від пакету",
-  "pathMap_gpsCount": "{confirmed}/{total} GPS"
+  "dialog_connectCompanion": "Підключіться до супутнього пристрою, щоб отримати доступ до функцій ретранслятора та сервера кімнат.",
+  "dialog_disconnectedTitle": "Від’єднано",
+  "dialog_disconnectedMessage": "Вас від’єднано від вашого супутника.",
+  "contact_connectCompanion": "Підключіться до супутника, щоб отримати доступ до функцій репітера та серверів кімнат."
 }
@@ -34,8 +34,6 @@
  "common_remove": "移除",
  "common_enable": "启用",
  "common_disable": "禁用",
-  "common_autoRefresh": "自动刷新",
-  "common_interval": "间隔",
  "common_reboot": "重启",
  "common_loading": "正在加载...",
  "common_notAvailable": "—",
@@ -1312,43 +1310,6 @@
      }
    }
  },
-  "telemetry_digitalInputLabel": "数字输入",
-  "telemetry_digitalOutputLabel": "数字输出",
-  "telemetry_analogInputLabel": "模拟输入",
-  "telemetry_analogOutputLabel": "模拟输出",
-  "telemetry_genericLabel": "通用传感器",
-  "telemetry_luminosityLabel": "照度",
-  "telemetry_presenceLabel": "存在检测",
-  "telemetry_humidityLabel": "湿度",
-  "telemetry_accelerometerLabel": "加速度计",
-  "telemetry_pressureLabel": "气压",
-  "telemetry_altitudeLabel": "高度",
-  "telemetry_frequencyLabel": "频率",
-  "telemetry_percentageLabel": "百分比",
-  "telemetry_concentrationLabel": "浓度",
-  "telemetry_powerLabel": "功率",
-  "telemetry_distanceLabel": "距离",
-  "telemetry_energyLabel": "能量",
-  "telemetry_directionLabel": "方向",
-  "telemetry_timeLabel": "时间",
-  "telemetry_gyrometerLabel": "陀螺仪",
-  "telemetry_colourLabel": "颜色",
-  "telemetry_gpsLabel": "GPS",
-  "telemetry_switchLabel": "开关",
-  "telemetry_polylineLabel": "折线",
-  "telemetry_altitudeValue": "{meters} m",
-  "telemetry_frequencyValue": "{hertz} Hz",
-  "telemetry_pressureValue": "{hpa} hPa",
-  "telemetry_luminosityValue": "{lux} lx",
-  "telemetry_powerValue": "{watts} W",
-  "telemetry_distanceValue": "{meters} m",
-  "telemetry_energyValue": "{kilowattHours} kWh",
-  "telemetry_directionValue": "{degrees}°",
-  "telemetry_concentrationValue": "{ppm} ppm",
-  "telemetry_percentageValue": "{percent}%",
-  "telemetry_analogValue": "{value}",
-  "telemetry_autoFetchQuantity": "请求次数",
-  "telemetry_error": "无法获取数据",
  "telemetry_noData": "暂无遥测数据",
  "telemetry_channelTitle": "频道 {channel}",
  "@telemetry_channelTitle": {
@@ -2144,9 +2105,6 @@
  "translation_composerTitle": "在发送之前进行翻译",
  "translation_enableTitle": "启用翻译功能",
  "translation_composerSubtitle": "控制作曲家翻译图标的默认状态。",
-  "translation_autoIncomingTitle": "自动翻译消息",
-  "translation_autoIncomingSubtitle": "自动为通知以及聊天或频道翻译消息。",
-  "translation_translateMessage": "翻译消息",
  "translation_targetLanguage": "目标语言",
  "translation_useAppLanguage": "使用应用程序语言",
  "translation_downloadedModelLabel": "下载的模型",
@@ -2359,191 +2317,8 @@
  "chat_newMessages": "新的消息",
  "settings_companionDebugLogSubtitle": "BLE/TCP/USB 协议、响应和原始数据",
  "repeater_chanUtil": "频道利用率",
-  "@routing_lastWorked": {
-    "placeholders": {
-      "when": {
-        "type": "String"
-      }
-    }
-  },
-  "@routing_deliveryCounts": {
-    "placeholders": {
-      "successes": {
-        "type": "int"
-      },
-      "failures": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathEditor_hopCounter": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathEditor_invalidTokens": {
-    "placeholders": {
-      "tokens": {
-        "type": "String"
-      }
-    }
-  },
-  "@channels_communityShortId": {
-    "placeholders": {
-      "id": {
-        "type": "String"
-      }
-    }
-  },
-  "messageStatus_sent": "发送",
-  "common_undo": "撤销",
-  "messageStatus_delivered": "已送达",
-  "messageStatus_pending": "发送",
-  "messageStatus_failed": "发送失败",
-  "messageStatus_repeated": "多次听到",
-  "contacts_moreOptions": "更多选择",
-  "contacts_searchOpen": "搜索联系人",
-  "contacts_searchClose": "高级搜索",
-  "routing_title": "路由",
-  "routing_modeAuto": "汽车",
-  "routing_modeFlood": "洪水",
-  "routing_modeManual": "手册",
-  "routing_modeAutoHint": "自动选择已知最佳路径，当没有已知路径时，则进行“洪水”搜索。",
-  "routing_modeFloodHint": "通过所有中继站进行广播。 这种方式最可靠，但占用更多的时间。",
-  "routing_modeManualHint": "总是按照您设置的路径进行导航。",
-  "routing_currentRoute": "当前路线",
-  "routing_directNoHops": "直接连接— 无中继跳",
-  "routing_noPathYet": "目前还没有找到路径。直到找到路径，才会收到后续消息。",
-  "routing_floodBroadcast": "通过所有中继器进行广播",
-  "routing_editPath": "编辑路径",
-  "routing_forgetPath": "忘记原路",
-  "routing_knownPaths": "已知的路径",
-  "routing_knownPathsHint": "点击该路径以切换到它。",
-  "routing_inUse": "使用中",
-  "routing_qualityStrong": "强劲的初始阶段",
-  "routing_qualityGood": "不错的开端",
-  "routing_qualityFair": "第一次尝试，结果良好",
-  "routing_qualityWorked": "已完成",
-  "routing_qualityFlood": "通过新闻报道",
-  "routing_qualityUntested": "未经测试",
-  "routing_lastWorked": "工作于 {when}",
-  "routing_neverWorked": "从未得到证实",
-  "routing_floodDelivery": "洪水配送",
-  "pathEditor_title": "构建路径",
-  "pathEditor_noHops": "目前还没有添加任何啤酒花。点击下面的“添加”按钮，按顺序添加，或者直接保存，不添加任何啤酒花。",
-  "pathEditor_addHops": "按照顺序添加啤酒花",
-  "pathEditor_searchRepeaters": "重复搜索",
-  "pathEditor_advancedHex": "高级：原始十六进制路径",
-  "pathEditor_hexLabel": "十六进制前缀",
-  "pathEditor_hexHelper": "每次跳跃，使用两个十六进制字符，用逗号分隔。",
-  "pathEditor_invalidTokens": "无效：{tokens}",
-  "pathEditor_tooManyHops": "最多 64 个跳跃",
-  "pathEditor_usePath": "请使用此路径",
-  "pathEditor_removeHop": "去除啤酒花",
-  "routing_deliveryCounts": "{successes} delivered, {failures} failed",
-  "pathEditor_hopCounter": "{count} of 64 hops",
-  "pathEditor_unknownHop": "未知的重复器",
-  "map_zoomIn": "放大",
-  "map_zoomOut": "放大",
-  "map_centerMap": "中心地图",
-  "chrome_bluetoothRequiresChromium": "Web Bluetooth 需要 Chromium 浏览器",
-  "channels_communityShortId": "ID：{id}...",
-  "pathTrace_legendGpsConfirmed": "通过GPS确认",
-  "pathTrace_legendInferred": "推测的位置",
-  "@pathMap_hopOf": {
-    "placeholders": {
-      "current": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_observedPaths": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_alternate": {
-    "placeholders": {
-      "index": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_hopCount": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_gpsCount": {
-    "placeholders": {
-      "confirmed": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_sharedNodeCount": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "@pathMap_partialAnimation": {
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "map_online": "在线",
-  "scanner_bluetoothWebUnsupported": "浏览器不支持蓝牙，请改用 USB 连接。",
-  "map_activity": "活动",
-  "map_searchHint": "搜索节点名称或ID",
-  "map_recent": "最近",
-  "map_visible": "可见",
-  "map_stale": "过时",
-  "map_hidden": "已隐藏",
-  "map_centerOnNode": "以节点为中心",
-  "map_details": "详细信息",
-  "map_noGps": "无 GPS",
-  "map_noResults": "未找到匹配的节点",
-  "pathMap_viewSingle": "单条",
-  "pathMap_viewCombined": "综合",
-  "pathMap_play": "播放",
-  "pathMap_pause": "暂停",
-  "pathMap_replay": "重播",
-  "pathMap_stepBack": "上一跳",
-  "pathMap_stepForward": "下一跳",
-  "pathMap_animationOn": "显示数据包动画",
-  "pathMap_animationOff": "隐藏数据包动画",
-  "pathMap_hopOf": "第 {current} 跳，共 {total} 跳",
-  "pathMap_observedPaths": "观测到的路径：{count}",
-  "pathMap_primary": "主路径",
-  "pathMap_alternate": "备用 {index}",
-  "pathMap_hopCount": "{count, plural, =1{1 跳} other{{count} 跳}}",
-  "pathMap_legendShared": "共享路段",
-  "pathMap_legendEstimated": "估算路段",
-  "pathMap_sharedNodeCount": "已被 {count} 条路径使用",
-  "pathMap_showAllPaths": "显示全部",
-  "pathMap_hidePath": "隐藏路径",
-  "pathMap_showPath": "显示路径",
-  "pathMap_collapsePanel": "收起面板",
-  "pathMap_expandPanel": "展开面板",
-  "pathMap_noLocation": "无位置",
-  "pathMap_followPacket": "锁定视图跟随数据包",
-  "pathMap_unfollowPacket": "解锁视图跟随",
-  "pathMap_gpsCount": "{confirmed}/{total} GPS",
-  "pathMap_partialAnimation": "{count, plural, =1{1 跳无位置信息 — 显示的路径不完整} other{{count} 跳无位置信息 — 显示的路径不完整}}"
+  "dialog_connectCompanion": "连接伴机以访问中继器和房间服务器功能。",
+  "dialog_disconnectedTitle": "已断开连接",
+  "dialog_disconnectedMessage": "你已与你的伙伴断开连接。",
+  "contact_connectCompanion": "连接至伴侣设备以访问中继器和房间服务器功能。"
 }
@@ -1,15 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/services.dart';
 import 'l10n/app_localizations.dart';
 import 'package:provider/provider.dart';

 import 'screens/chrome_required_screen.dart';
+import 'screens/contacts_screen.dart';
 import 'utils/platform_info.dart';

 import 'connector/meshcore_connector.dart';
-import 'screens/scanner_screen.dart';
 import 'services/storage_service.dart';
 import 'services/message_retry_service.dart';
 import 'services/path_history_service.dart';
@@ -24,21 +23,11 @@ import 'services/translation_service.dart';
 import 'services/ui_view_state_service.dart';
 import 'services/timeout_prediction_service.dart';
 import 'storage/prefs_manager.dart';
-import 'theme/mesh_theme.dart';
 import 'utils/app_logger.dart';

 void main() async {
  WidgetsFlutterBinding.ensureInitialized();

-  // On desktop, debugPrint is not suppressed in release builds and every
-  // call is a synchronous stdout write. The connector logs heavily on hot
-  // paths (frame handling, queue/channel sync), which shows up as syscall
-  // overhead on low-end Linux machines (issue #202). The in-app debug log
-  // screens are unaffected — they store entries themselves.
-  if (kReleaseMode) {
-    debugPrint = (String? message, {int? wrapWidth}) {};
-  }
-
  // Initialize SharedPreferences cache
  await PrefsManager.initialize();

@@ -92,13 +81,8 @@ void main() async {
    timeoutPredictionService: timeoutPredictionService,
  );

-  await connector.loadContactCache();
-  await connector.loadChannelSettings();
-  await connector.loadCachedChannels();
-
-  // Load persisted channel messages
-  await connector.loadAllChannelMessages();
-  await connector.loadUnreadState();
+  await connector.restoreLastCompanionScope();
+  await connector.loadAllCachedDataForCurrentCompanion();

  runApp(
    MeshCoreApp(
@@ -201,8 +185,23 @@ class MeshCoreApp extends StatelessWidget {
            locale: _localeFromSetting(
              settingsService.settings.languageOverride,
            ),
-            theme: MeshTheme.light(),
-            darkTheme: MeshTheme.dark(),
+            theme: ThemeData(
+              colorScheme: ColorScheme.fromSeed(seedColor: Colors.blue),
+              useMaterial3: true,
+              snackBarTheme: const SnackBarThemeData(
+                behavior: SnackBarBehavior.floating,
+              ),
+            ),
+            darkTheme: ThemeData(
+              colorScheme: ColorScheme.fromSeed(
+                seedColor: Colors.blue,
+                brightness: Brightness.dark,
+              ),
+              useMaterial3: true,
+              snackBarTheme: const SnackBarThemeData(
+                behavior: SnackBarBehavior.floating,
+              ),
+            ),
            themeMode: _themeModeFromSetting(
              settingsService.settings.themeMode,
            ),
@@ -210,14 +209,11 @@ class MeshCoreApp extends StatelessWidget {
              // Update notification service with resolved locale
              final locale = Localizations.localeOf(context);
              NotificationService().setLocale(locale);
-              return AnnotatedRegion<SystemUiOverlayStyle>(
-                value: _systemUiOverlayStyle(context),
-                child: child ?? const SizedBox.shrink(),
-              );
+              return child ?? const SizedBox.shrink();
            },
            home: (PlatformInfo.isWeb && !PlatformInfo.isChrome)
                ? const ChromeRequiredScreen()
-                : const ScannerScreen(),
+                : const ContactsScreen(),
          );
        },
      ),
@@ -235,24 +231,6 @@ class MeshCoreApp extends StatelessWidget {
    }
  }

-  SystemUiOverlayStyle _systemUiOverlayStyle(BuildContext context) {
-    final theme = Theme.of(context);
-    final colorScheme = theme.colorScheme;
-    final isDark = theme.brightness == Brightness.dark;
-    final iconBrightness = isDark ? Brightness.light : Brightness.dark;
-
-    // Keep Android system bars aligned with the resolved Flutter theme.
-    return SystemUiOverlayStyle(
-      statusBarColor: Colors.transparent,
-      statusBarIconBrightness: iconBrightness,
-      statusBarBrightness: isDark ? Brightness.dark : Brightness.light,
-      systemNavigationBarColor: colorScheme.surface,
-      systemNavigationBarIconBrightness: iconBrightness,
-      systemNavigationBarDividerColor: colorScheme.surface,
-      systemNavigationBarContrastEnforced: false,
-    );
-  }
-
  Locale? _localeFromSetting(String? languageCode) {
    if (languageCode == null) return null;
    return Locale(languageCode);
@@ -113,7 +113,6 @@ class AppSettings {
  final int tcpServerPort;
  final bool jumpToOldestUnread;
  final bool translationEnabled;
-  final bool autoTranslateIncomingMessages;
  final String? translationTargetLanguageCode;
  final bool composerTranslationEnabled;
  final String? translationModelSourceUrl;
@@ -141,7 +140,7 @@ class AppSettings {
    this.mapKeyPrefix = '',
    this.mapShowMarkers = true,
    this.mapShowGuessedLocations = true,
-    this.enableMessageTracing = true,
+    this.enableMessageTracing = false,
    this.mapCacheBounds,
    this.mapCacheMinZoom = 10,
    this.mapCacheMaxZoom = 15,
@@ -149,7 +148,7 @@ class AppSettings {
    this.notifyOnNewMessage = true,
    this.notifyOnNewChannelMessage = true,
    this.notifyOnNewAdvert = true,
-    this.autoRouteRotationEnabled = true,
+    this.autoRouteRotationEnabled = false,
    this.maxRouteWeight = 5.0,
    this.initialRouteWeight = 3.0,
    this.routeWeightSuccessIncrement = 0.5,
@@ -167,7 +166,6 @@ class AppSettings {
    this.tcpServerPort = 0,
    this.jumpToOldestUnread = false,
    this.translationEnabled = false,
-    this.autoTranslateIncomingMessages = true,
    this.translationTargetLanguageCode,
    this.composerTranslationEnabled = false,
    this.translationModelSourceUrl,
@@ -228,7 +226,6 @@ class AppSettings {
      'tcp_server_port': tcpServerPort,
      'jump_to_oldest_unread': jumpToOldestUnread,
      'translation_enabled': translationEnabled,
-      'auto_translate_incoming_messages': autoTranslateIncomingMessages,
      'translation_target_language_code': translationTargetLanguageCode,
      'composer_translation_enabled': composerTranslationEnabled,
      'translation_model_source_url': translationModelSourceUrl,
@@ -264,7 +261,7 @@ class AppSettings {
      mapShowMarkers: json['map_show_markers'] as bool? ?? true,
      mapShowGuessedLocations:
          json['map_show_guessed_locations'] as bool? ?? true,
-      enableMessageTracing: json['enable_message_tracing'] as bool? ?? true,
+      enableMessageTracing: json['enable_message_tracing'] as bool? ?? false,
      mapCacheBounds: (json['map_cache_bounds'] as Map?)?.map(
        (key, value) => MapEntry(key.toString(), (value as num).toDouble()),
      ),
@@ -276,7 +273,7 @@ class AppSettings {
          json['notify_on_new_channel_message'] as bool? ?? true,
      notifyOnNewAdvert: json['notify_on_new_advert'] as bool? ?? true,
      autoRouteRotationEnabled:
-          json['auto_route_rotation_enabled'] as bool? ?? true,
+          json['auto_route_rotation_enabled'] as bool? ?? false,
      maxRouteWeight: (json['max_route_weight'] as num?)?.toDouble() ?? 5.0,
      initialRouteWeight:
          (json['initial_route_weight'] as num?)?.toDouble() ?? 3.0,
@@ -310,8 +307,6 @@ class AppSettings {
      tcpServerPort: json['tcp_server_port'] as int? ?? 0,
      jumpToOldestUnread: json['jump_to_oldest_unread'] as bool? ?? false,
      translationEnabled: json['translation_enabled'] as bool? ?? false,
-      autoTranslateIncomingMessages:
-          json['auto_translate_incoming_messages'] as bool? ?? true,
      translationTargetLanguageCode:
          json['translation_target_language_code'] as String?,
      composerTranslationEnabled:
@@ -401,7 +396,6 @@ class AppSettings {
    int? tcpServerPort,
    bool? jumpToOldestUnread,
    bool? translationEnabled,
-    bool? autoTranslateIncomingMessages,
    Object? translationTargetLanguageCode = _unset,
    bool? composerTranslationEnabled,
    Object? translationModelSourceUrl = _unset,
@@ -459,8 +453,6 @@ class AppSettings {
      tcpServerPort: tcpServerPort ?? this.tcpServerPort,
      jumpToOldestUnread: jumpToOldestUnread ?? this.jumpToOldestUnread,
      translationEnabled: translationEnabled ?? this.translationEnabled,
-      autoTranslateIncomingMessages:
-          autoTranslateIncomingMessages ?? this.autoTranslateIncomingMessages,
      translationTargetLanguageCode: translationTargetLanguageCode == _unset
          ? this.translationTargetLanguageCode
          : translationTargetLanguageCode as String?,
@@ -1,69 +0,0 @@
-import 'dart:ui';
-
-import 'package:latlong2/latlong.dart';
-
-import 'path_history.dart';
-
-/// One observed route rendered on the path map — the live traced path
-/// (primary) or an alternate from the contact's path history — resolved to
-/// map coordinates with per-hop confidence flags.
-class DisplayPath {
-  final String id;
-  final String label;
-  final Color color;
-  final bool isPrimary;
-
-  /// Outbound hop bytes, including hops that could not be placed on the map.
-  final List<int> hopBytes;
-
-  /// Resolved map points: self, each locatable hop, then the target when its
-  /// position is known. Hops with no position are skipped here but still
-  /// counted in [unresolvedHops].
-  final List<LatLng> points;
-
-  /// Display name for each entry of [points].
-  final List<String> pointLabels;
-
-  /// Whether each entry of [points] is a GPS-grade position (vs inferred).
-  final List<bool> pointConfirmed;
-
-  /// Per segment (length points-1): true when either endpoint is inferred or
-  /// unlocatable hops were skipped in between — rendered dashed.
-  final List<bool> segmentEstimated;
-
-  /// Per segment: the transmission ordinal of the segment's destination,
-  /// used to highlight the matching hop-list row during animation.
-  final List<int> rowForSegment;
-
-  /// Total transmissions on the full route (including unlocatable hops).
-  final int totalTransmissions;
-
-  /// True when the route ends with a chat-target endpoint row.
-  final bool hasTargetEndpoint;
-
-  final int gpsConfirmedHops;
-  final int unresolvedHops;
-  final double distanceMeters;
-
-  /// History metadata; null for the live traced (primary) path.
-  final PathRecord? record;
-
-  const DisplayPath({
-    required this.id,
-    required this.label,
-    required this.color,
-    required this.isPrimary,
-    required this.hopBytes,
-    required this.points,
-    required this.pointLabels,
-    required this.pointConfirmed,
-    required this.segmentEstimated,
-    required this.rowForSegment,
-    required this.totalTransmissions,
-    required this.hasTargetEndpoint,
-    required this.gpsConfirmedHops,
-    required this.unresolvedHops,
-    required this.distanceMeters,
-    this.record,
-  });
-}
@@ -3,6 +3,7 @@ class PathRecord {
  final int tripTimeMs;
  final DateTime? timestamp;
  final bool wasFloodDiscovery;
+  final int byteCount;
  final List<int> pathBytes;
  final int successCount;
  final int failureCount;
@@ -17,6 +18,7 @@ class PathRecord {
    required this.successCount,
    required this.failureCount,
    this.routeWeight = 1.0,
+    this.byteCount = 0,
  });

  String get displayText =>
@@ -48,6 +50,7 @@ class PathRecord {
      successCount: json['success_count'] as int? ?? 0,
      failureCount: json['failure_count'] as int? ?? 0,
      routeWeight: (json['route_weight'] as num?)?.toDouble() ?? 1.0,
+      byteCount: json['byte_count'] as int? ?? 0,
    );
  }
 }
@@ -1,177 +0,0 @@
-import 'package:flutter/foundation.dart';
-import 'package:flutter/scheduler.dart';
-import 'package:latlong2/latlong.dart';
-
-/// Timeline state for the packet-flow animation on the path map.
-///
-/// The packet travels each segment over [segmentMs] (scaled by [speed]),
-/// then dwells at the reached hop for [dwellMs] so the hop visibly lights up.
-/// Overlay layers listen to this controller directly; [activeSegment] only
-/// fires when the segment index changes so list highlights rebuild cheaply.
-class PathPlaybackController extends ChangeNotifier {
-  static const double segmentMs = 1100;
-  static const double dwellMs = 380;
-  static const List<double> speedSteps = [0.5, 1.0, 2.0];
-
-  late final Ticker _ticker;
-  List<LatLng> _points = const [];
-  double _timelineMs = 0;
-  Duration _lastTick = Duration.zero;
-  bool _playing = false;
-  bool _started = false;
-  double _speed = 1.0;
-
-  /// Segment currently being traveled (clamped to the last segment), or -1
-  /// while the animation has not been started — listeners use this for
-  /// hop-list highlighting without rebuilding every tick.
-  final ValueNotifier<int> activeSegment = ValueNotifier(-1);
-
-  PathPlaybackController(TickerProvider vsync) {
-    _ticker = vsync.createTicker(_onTick);
-  }
-
-  List<LatLng> get points => _points;
-  bool get hasPath => _points.length >= 2;
-  int get segmentCount => hasPath ? _points.length - 1 : 0;
-  bool get playing => _playing;
-  double get speed => _speed;
-
-  /// True once the user has started or stepped the animation; the packet
-  /// overlay renders only in this state.
-  bool get started => _started;
-
-  double get _slotMs => segmentMs + dwellMs;
-  double get _totalMs => segmentCount * _slotMs;
-  bool get isComplete => hasPath && _timelineMs >= _totalMs;
-
-  int get currentSegment {
-    if (!hasPath) return 0;
-    return (_timelineMs / _slotMs).floor().clamp(0, segmentCount - 1);
-  }
-
-  /// Travel progress through [currentSegment]; 1.0 while dwelling at its end.
-  double get segmentProgress {
-    if (!hasPath) return 0;
-    final within = _timelineMs - currentSegment * _slotMs;
-    return (within / segmentMs).clamp(0.0, 1.0);
-  }
-
-  /// Dwell progress (0..1) at the reached hop, or null while traveling.
-  double? get dwellProgress {
-    if (!hasPath || isComplete) return null;
-    final within = _timelineMs - currentSegment * _slotMs;
-    if (within < segmentMs) return null;
-    return ((within - segmentMs) / dwellMs).clamp(0.0, 1.0);
-  }
-
-  /// Index of the point the packet has most recently reached.
-  int get reachedPointIndex {
-    if (!hasPath) return 0;
-    if (isComplete) return _points.length - 1;
-    return segmentProgress >= 1.0 ? currentSegment + 1 : currentSegment;
-  }
-
-  LatLng get position {
-    if (!hasPath) return const LatLng(0, 0);
-    final seg = currentSegment;
-    final a = _points[seg];
-    final b = _points[seg + 1];
-    final t = segmentProgress;
-    return LatLng(
-      a.latitude + (b.latitude - a.latitude) * t,
-      a.longitude + (b.longitude - a.longitude) * t,
-    );
-  }
-
-  /// Replaces the path and resets the animation to the start.
-  void setPath(List<LatLng> points) {
-    _ticker.stop();
-    _points = List.unmodifiable(points);
-    _timelineMs = 0;
-    _playing = false;
-    _started = false;
-    activeSegment.value = -1;
-    notifyListeners();
-  }
-
-  void play() {
-    if (!hasPath) return;
-    if (isComplete) _timelineMs = 0;
-    _started = true;
-    _playing = true;
-    activeSegment.value = currentSegment;
-    if (!_ticker.isActive) {
-      _lastTick = Duration.zero;
-      _ticker.start();
-    }
-    notifyListeners();
-  }
-
-  void pause() {
-    _ticker.stop();
-    _playing = false;
-    notifyListeners();
-  }
-
-  void togglePlay() => _playing ? pause() : play();
-
-  void replay() {
-    if (!hasPath) return;
-    _timelineMs = 0;
-    activeSegment.value = 0;
-    play();
-  }
-
-  /// Stops playback and hides the packet overlay.
-  void stop() {
-    _ticker.stop();
-    _playing = false;
-    _started = false;
-    _timelineMs = 0;
-    activeSegment.value = -1;
-    notifyListeners();
-  }
-
-  void stepForward() => _jumpToPoint(reachedPointIndex + 1);
-
-  void stepBack() => _jumpToPoint(reachedPointIndex - 1);
-
-  void cycleSpeed() {
-    final index = speedSteps.indexOf(_speed);
-    _speed = speedSteps[(index + 1) % speedSteps.length];
-    notifyListeners();
-  }
-
-  void _jumpToPoint(int index) {
-    if (!hasPath) return;
-    _ticker.stop();
-    _playing = false;
-    _started = true;
-    final clamped = index.clamp(0, _points.length - 1);
-    // Land at the start of the dwell window so the hop pulse plays.
-    _timelineMs = clamped == 0 ? 0 : (clamped - 1) * _slotMs + segmentMs;
-    activeSegment.value = currentSegment;
-    notifyListeners();
-  }
-
-  void _onTick(Duration elapsed) {
-    final dtMs = (elapsed - _lastTick).inMicroseconds / 1000.0;
-    _lastTick = elapsed;
-    _timelineMs = (_timelineMs + dtMs * _speed).clamp(0.0, _totalMs);
-    if (_timelineMs >= _totalMs) {
-      _ticker.stop();
-      _playing = false;
-    }
-    if (activeSegment.value != currentSegment) {
-      activeSegment.value = currentSegment;
-    }
-    notifyListeners();
-  }
-
-  @override
-  void dispose() {
-    _ticker.dispose();
-    activeSegment.dispose();
-    super.dispose();
-  }
-}
@@ -181,276 +181,6 @@ class RadioSettings {
        txPowerDbm: 14,
      ),
    ),
-    (
-      'Russia Artyom (VVO)',
-      RadioSettings(
-        frequencyMHz: 864.281,
-        bandwidth: LoRaBandwidth.bw62_5,
-        spreadingFactor: LoRaSpreadingFactor.sf8,
-        codingRate: LoRaCodingRate.cr4_6,
-        txPowerDbm: 20,
-      ),
-    ),
-    (
-      'Russia Biysk (BSK)',
-      RadioSettings(
-        frequencyMHz: 869.000,
-        bandwidth: LoRaBandwidth.bw62_5,
-        spreadingFactor: LoRaSpreadingFactor.sf8,
-        codingRate: LoRaCodingRate.cr4_5,
-        txPowerDbm: 20,
-      ),
-    ),
-    (
-      'Russia Chelyabinsk (CEK)',
-      RadioSettings(
-        frequencyMHz: 868.731,
-        bandwidth: LoRaBandwidth.bw62_5,
-        spreadingFactor: LoRaSpreadingFactor.sf8,
-        codingRate: LoRaCodingRate.cr4_6,
-        txPowerDbm: 20,
-      ),
-    ),
-    (
-      'Russia Cherepovets (CEE)',
-      RadioSettings(
-        frequencyMHz: 868.570,
-        bandwidth: LoRaBandwidth.bw62_5,
-        spreadingFactor: LoRaSpreadingFactor.sf7,
-        codingRate: LoRaCodingRate.cr4_8,
-        txPowerDbm: 20,
-      ),
-    ),
-    (
-      'Russia Irkutsk (IKT)',
-      RadioSettings(
-        frequencyMHz: 868.731,
-        bandwidth: LoRaBandwidth.bw62_5,
-        spreadingFactor: LoRaSpreadingFactor.sf7,
-        codingRate: LoRaCodingRate.cr4_7,
-        txPowerDbm: 20,
-      ),
-    ),
-    (
-      'Russia Ivanovo (IWA)',
-      RadioSettings(
-        frequencyMHz: 868.731,
-        bandwidth: LoRaBandwidth.bw62_5,
-        spreadingFactor: LoRaSpreadingFactor.sf8,
-        codingRate: LoRaCodingRate.cr4_8,
-        txPowerDbm: 20,
-      ),
-    ),
-    (
-      'Russia Izhevsk (IJK)',
-      RadioSettings(
-        frequencyMHz: 868.732,
-        bandwidth: LoRaBandwidth.bw62_5,
-        spreadingFactor: LoRaSpreadingFactor.sf8,
-        codingRate: LoRaCodingRate.cr4_8,
-        txPowerDbm: 20,
-      ),
-    ),
-    (
-      'Russia Kaluga (KLF)',
-      RadioSettings(
-        frequencyMHz: 868.731,
-        bandwidth: LoRaBandwidth.bw62_5,
-        spreadingFactor: LoRaSpreadingFactor.sf7,
-        codingRate: LoRaCodingRate.cr4_7,
-        txPowerDbm: 20,
-      ),
-    ),
-    (
-      'Russia Kazan (KZN)',
-      RadioSettings(
-        frequencyMHz: 868.731,
-        bandwidth: LoRaBandwidth.bw62_5,
-        spreadingFactor: LoRaSpreadingFactor.sf8,
-        codingRate: LoRaCodingRate.cr4_6,
-        txPowerDbm: 20,
-      ),
-    ),
-    (
-      'Russia Khabarovsk (KHV)',
-      RadioSettings(
-        frequencyMHz: 864.281,
-        bandwidth: LoRaBandwidth.bw62_5,
-        spreadingFactor: LoRaSpreadingFactor.sf8,
-        codingRate: LoRaCodingRate.cr4_6,
-        txPowerDbm: 20,
-      ),
-    ),
-    (
-      'Russia Kirov (KVX)',
-      RadioSettings(
-        frequencyMHz: 868.731,
-        bandwidth: LoRaBandwidth.bw62_5,
-        spreadingFactor: LoRaSpreadingFactor.sf8,
-        codingRate: LoRaCodingRate.cr4_8,
-        txPowerDbm: 20,
-      ),
-    ),
-    (
-      'Russia Lipetsk (LPK)',
-      RadioSettings(
-        frequencyMHz: 868.950,
-        bandwidth: LoRaBandwidth.bw62_5,
-        spreadingFactor: LoRaSpreadingFactor.sf9,
-        codingRate: LoRaCodingRate.cr4_7,
-        txPowerDbm: 20,
-      ),
-    ),
-    (
-      'Russia Moscow (MOW)',
-      RadioSettings(
-        frequencyMHz: 868.731,
-        bandwidth: LoRaBandwidth.bw62_5,
-        spreadingFactor: LoRaSpreadingFactor.sf7,
-        codingRate: LoRaCodingRate.cr4_7,
-        txPowerDbm: 20,
-      ),
-    ),
-    (
-      'Russia Nizhny Novgorod (GOJ)',
-      RadioSettings(
-        frequencyMHz: 868.731,
-        bandwidth: LoRaBandwidth.bw62_5,
-        spreadingFactor: LoRaSpreadingFactor.sf8,
-        codingRate: LoRaCodingRate.cr4_6,
-        txPowerDbm: 20,
-      ),
-    ),
-    (
-      'Russia Novosibirsk (OVB)',
-      RadioSettings(
-        frequencyMHz: 869.000,
-        bandwidth: LoRaBandwidth.bw62_5,
-        spreadingFactor: LoRaSpreadingFactor.sf9,
-        codingRate: LoRaCodingRate.cr4_8,
-        txPowerDbm: 20,
-      ),
-    ),
-    (
-      'Russia Rostov-on-Don (ROV)',
-      RadioSettings(
-        frequencyMHz: 868.731,
-        bandwidth: LoRaBandwidth.bw62_5,
-        spreadingFactor: LoRaSpreadingFactor.sf9,
-        codingRate: LoRaCodingRate.cr4_7,
-        txPowerDbm: 20,
-      ),
-    ),
-    (
-      'Russia Ryazan (RZN)',
-      RadioSettings(
-        frequencyMHz: 868.880,
-        bandwidth: LoRaBandwidth.bw62_5,
-        spreadingFactor: LoRaSpreadingFactor.sf9,
-        codingRate: LoRaCodingRate.cr4_5,
-        txPowerDbm: 20,
-      ),
-    ),
-    (
-      'Russia Samara (KUF)',
-      RadioSettings(
-        frequencyMHz: 864.281,
-        bandwidth: LoRaBandwidth.bw62_5,
-        spreadingFactor: LoRaSpreadingFactor.sf8,
-        codingRate: LoRaCodingRate.cr4_7,
-        txPowerDbm: 20,
-      ),
-    ),
-    (
-      'Russia Saratov (GSV)',
-      RadioSettings(
-        frequencyMHz: 864.281,
-        bandwidth: LoRaBandwidth.bw62_5,
-        spreadingFactor: LoRaSpreadingFactor.sf8,
-        codingRate: LoRaCodingRate.cr4_7,
-        txPowerDbm: 20,
-      ),
-    ),
-    (
-      'Russia St. Petersburg (LED)',
-      RadioSettings(
-        frequencyMHz: 868.856,
-        bandwidth: LoRaBandwidth.bw62_5,
-        spreadingFactor: LoRaSpreadingFactor.sf7,
-        codingRate: LoRaCodingRate.cr4_7,
-        txPowerDbm: 20,
-      ),
-    ),
-    (
-      'Russia Tambov (TBW)',
-      RadioSettings(
-        frequencyMHz: 868.950,
-        bandwidth: LoRaBandwidth.bw62_5,
-        spreadingFactor: LoRaSpreadingFactor.sf10,
-        codingRate: LoRaCodingRate.cr4_5,
-        txPowerDbm: 20,
-      ),
-    ),
-    (
-      'Russia Tula (TYA)',
-      RadioSettings(
-        frequencyMHz: 868.731,
-        bandwidth: LoRaBandwidth.bw62_5,
-        spreadingFactor: LoRaSpreadingFactor.sf8,
-        codingRate: LoRaCodingRate.cr4_7,
-        txPowerDbm: 20,
-      ),
-    ),
-    (
-      'Russia Tver (KLD)',
-      RadioSettings(
-        frequencyMHz: 869.169,
-        bandwidth: LoRaBandwidth.bw62_5,
-        spreadingFactor: LoRaSpreadingFactor.sf8,
-        codingRate: LoRaCodingRate.cr4_8,
-        txPowerDbm: 20,
-      ),
-    ),
-    (
-      'Russia Ufa (UFA)',
-      RadioSettings(
-        frequencyMHz: 868.732,
-        bandwidth: LoRaBandwidth.bw62_5,
-        spreadingFactor: LoRaSpreadingFactor.sf8,
-        codingRate: LoRaCodingRate.cr4_8,
-        txPowerDbm: 20,
-      ),
-    ),
-    (
-      'Russia Volgograd (VOG)',
-      RadioSettings(
-        frequencyMHz: 869.525,
-        bandwidth: LoRaBandwidth.bw62_5,
-        spreadingFactor: LoRaSpreadingFactor.sf7,
-        codingRate: LoRaCodingRate.cr4_7,
-        txPowerDbm: 20,
-      ),
-    ),
-    (
-      'Russia Voronezh (VOZ)',
-      RadioSettings(
-        frequencyMHz: 868.731,
-        bandwidth: LoRaBandwidth.bw62_5,
-        spreadingFactor: LoRaSpreadingFactor.sf8,
-        codingRate: LoRaCodingRate.cr4_6,
-        txPowerDbm: 20,
-      ),
-    ),
-    (
-      'Russia Yekaterinburg (SVX)',
-      RadioSettings(
-        frequencyMHz: 869.046,
-        bandwidth: LoRaBandwidth.bw62_5,
-        spreadingFactor: LoRaSpreadingFactor.sf7,
-        codingRate: LoRaCodingRate.cr4_7,
-        txPowerDbm: 20,
-      ),
-    ),
    (
      'Switzerland',
      RadioSettings(
@@ -4,7 +4,6 @@ import 'package:provider/provider.dart';

 import '../l10n/l10n.dart';
 import '../services/app_debug_log_service.dart';
-import '../theme/mesh_theme.dart';
 import '../widgets/adaptive_app_bar_title.dart';
 import '../helpers/snack_bar_builder.dart';

@@ -59,58 +58,26 @@ class AppDebugLogScreen extends StatelessWidget {
            child: hasEntries
                ? ListView.separated(
                    itemCount: entries.length,
-                    separatorBuilder: (_, _) =>
-                        const Divider(height: 1, color: MeshPalette.line),
+                    separatorBuilder: (_, _) => const Divider(height: 1),
                    itemBuilder: (context, index) {
                      final entry = entries[index];
-                      return Container(
-                        color: MeshPalette.bg,
-                        padding: const EdgeInsets.symmetric(
-                          horizontal: 16,
-                          vertical: 8,
-                        ),
-                        child: Row(
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: [
-                            _buildLevelIcon(context, entry.level),
-                            const SizedBox(width: 10),
-                            Expanded(
-                              child: Column(
-                                crossAxisAlignment: CrossAxisAlignment.start,
-                                children: [
-                                  Text.rich(
-                                    TextSpan(
-                                      children: [
-                                        TextSpan(
-                                          text: '[${entry.tag}] ',
-                                          style: MeshTheme.mono(
-                                            fontSize: 11.5,
-                                            color: _levelColor(entry.level),
+                      return ListTile(
+                        dense: true,
+                        leading: _buildLevelIcon(entry.level),
+                        title: Text(
+                          '[${entry.tag}] ${entry.message}',
+                          style: const TextStyle(
+                            fontSize: 12,
+                            fontFamily: 'monospace',
                          ),
                        ),
-                                        TextSpan(
-                                          text: entry.message,
-                                          style: MeshTheme.mono(
-                                            fontSize: 11.5,
-                                            color: MeshPalette.ink2,
-                                          ),
-                                        ),
-                                      ],
-                                    ),
-                                  ),
-                                  const SizedBox(height: 2),
-                                  Text(
+                        subtitle: Text(
                          entry.formattedTime,
-                                    style: MeshTheme.mono(
-                                      fontSize: 9.5,
-                                      color: MeshPalette.ink4,
+                          style: TextStyle(
+                            fontSize: 10,
+                            color: Colors.grey[600],
                          ),
                        ),
-                                ],
-                              ),
-                            ),
-                          ],
-                        ),
                      );
                    },
                  )
@@ -118,25 +85,25 @@ class AppDebugLogScreen extends StatelessWidget {
                    child: Column(
                      mainAxisAlignment: MainAxisAlignment.center,
                      children: [
-                        const Icon(
+                        Icon(
                          Icons.bug_report_outlined,
                          size: 64,
-                          color: MeshPalette.ink3,
+                          color: Colors.grey[400],
                        ),
                        const SizedBox(height: 16),
                        Text(
                          context.l10n.debugLog_noEntries,
-                          style: const TextStyle(
+                          style: TextStyle(
                            fontSize: 16,
-                            color: MeshPalette.ink3,
+                            color: Colors.grey[600],
                          ),
                        ),
                        const SizedBox(height: 8),
                        Text(
                          context.l10n.debugLog_enableInSettings,
-                          style: const TextStyle(
+                          style: TextStyle(
                            fontSize: 12,
-                            color: MeshPalette.ink3,
+                            color: Colors.grey[500],
                          ),
                        ),
                      ],
@@ -148,37 +115,18 @@ class AppDebugLogScreen extends StatelessWidget {
    );
  }

-  Color _levelColor(AppDebugLogLevel level) {
+  Widget _buildLevelIcon(AppDebugLogLevel level) {
    switch (level) {
      case AppDebugLogLevel.info:
-        return MeshPalette.blue;
-      case AppDebugLogLevel.warning:
-        return MeshPalette.warn;
-      case AppDebugLogLevel.error:
-        return MeshPalette.alert;
-    }
-  }
-
-  Widget _buildLevelIcon(BuildContext context, AppDebugLogLevel level) {
-    switch (level) {
-      case AppDebugLogLevel.info:
-        return const Icon(
-          Icons.info_outline,
-          size: 18,
-          color: MeshPalette.blue,
-        );
+        return const Icon(Icons.info_outline, size: 18, color: Colors.blue);
      case AppDebugLogLevel.warning:
        return const Icon(
          Icons.warning_amber_outlined,
          size: 18,
-          color: MeshPalette.warn,
+          color: Colors.orange,
        );
      case AppDebugLogLevel.error:
-        return const Icon(
-          Icons.error_outline,
-          size: 18,
-          color: MeshPalette.alert,
-        );
+        return const Icon(Icons.error_outline, size: 18, color: Colors.red);
    }
  }
 }
@@ -4,7 +4,6 @@ import 'package:flutter/services.dart';
 import '../l10n/l10n.dart';
 import '../services/ble_debug_log_service.dart';
 import '../connector/meshcore_protocol.dart';
-import '../theme/mesh_theme.dart';
 import '../widgets/adaptive_app_bar_title.dart';
 import '../helpers/snack_bar_builder.dart';

@@ -33,7 +32,6 @@ class _BleDebugLogScreenState extends State<BleDebugLogScreen> {
        return Scaffold(
          appBar: AppBar(
            title: AdaptiveAppBarTitle(context.l10n.debugLog_bleTitle),
-            centerTitle: true,
            actions: [
              IconButton(
                tooltip: context.l10n.debugLog_copyLog,
@@ -103,14 +101,23 @@ class _BleDebugLogScreenState extends State<BleDebugLogScreen> {
                          itemCount: showingFrames
                              ? entries.length
                              : rawEntries.length,
-                          separatorBuilder: (_, _) =>
-                              const Divider(height: 1, color: MeshPalette.line),
+                          separatorBuilder: (_, _) => const Divider(height: 1),
                          itemBuilder: (context, index) {
                            if (showingFrames) {
                              final entry = entries[index];
                              final time =
                                  '${entry.timestamp.hour.toString().padLeft(2, '0')}:${entry.timestamp.minute.toString().padLeft(2, '0')}:${entry.timestamp.second.toString().padLeft(2, '0')}';
-                              return GestureDetector(
+                              return ListTile(
+                                dense: true,
+                                title: Text(entry.description),
+                                subtitle: Text('${entry.hexPreview}\n$time'),
+                                isThreeLine: true,
+                                leading: Icon(
+                                  entry.outgoing
+                                      ? Icons.upload
+                                      : Icons.download,
+                                  size: 18,
+                                ),
                                onLongPress: () async {
                                  await Clipboard.setData(
                                    ClipboardData(
@@ -124,60 +131,6 @@ class _BleDebugLogScreenState extends State<BleDebugLogScreen> {
                                    ),
                                  );
                                },
-                                child: Container(
-                                  color: MeshPalette.bg,
-                                  padding: const EdgeInsets.symmetric(
-                                    horizontal: 16,
-                                    vertical: 8,
-                                  ),
-                                  child: Row(
-                                    crossAxisAlignment:
-                                        CrossAxisAlignment.start,
-                                    children: [
-                                      Icon(
-                                        entry.outgoing
-                                            ? Icons.upload
-                                            : Icons.download,
-                                        size: 18,
-                                        color: entry.outgoing
-                                            ? MeshPalette.blue
-                                            : MeshPalette.signal,
-                                      ),
-                                      const SizedBox(width: 10),
-                                      Expanded(
-                                        child: Column(
-                                          crossAxisAlignment:
-                                              CrossAxisAlignment.start,
-                                          children: [
-                                            Text(
-                                              entry.description,
-                                              style: MeshTheme.mono(
-                                                fontSize: 11.5,
-                                                color: MeshPalette.ink,
-                                              ),
-                                            ),
-                                            const SizedBox(height: 2),
-                                            Text(
-                                              entry.hexPreview,
-                                              style: MeshTheme.mono(
-                                                fontSize: 10,
-                                                color: MeshPalette.ink3,
-                                              ),
-                                            ),
-                                            const SizedBox(height: 2),
-                                            Text(
-                                              time,
-                                              style: MeshTheme.mono(
-                                                fontSize: 9.5,
-                                                color: MeshPalette.ink4,
-                                              ),
-                                            ),
-                                          ],
-                                        ),
-                                      ),
-                                    ],
-                                  ),
-                                ),
                              );
                            }

@@ -185,65 +138,18 @@ class _BleDebugLogScreenState extends State<BleDebugLogScreen> {
                            final info = _decodeRawPacket(entry.payload);
                            final time =
                                '${entry.timestamp.hour.toString().padLeft(2, '0')}:${entry.timestamp.minute.toString().padLeft(2, '0')}:${entry.timestamp.second.toString().padLeft(2, '0')}';
-                            return GestureDetector(
+                            return ListTile(
+                              dense: true,
+                              title: Text(info.title),
+                              subtitle: Text('${info.summary}\n$time'),
+                              isThreeLine: true,
+                              leading: const Icon(Icons.download, size: 18),
                              onTap: () => _showRawDialog(context, info),
-                              child: Container(
-                                color: MeshPalette.bg,
-                                padding: const EdgeInsets.symmetric(
-                                  horizontal: 16,
-                                  vertical: 8,
-                                ),
-                                child: Row(
-                                  crossAxisAlignment: CrossAxisAlignment.start,
-                                  children: [
-                                    const Icon(
-                                      Icons.download,
-                                      size: 18,
-                                      color: MeshPalette.signal,
-                                    ),
-                                    const SizedBox(width: 10),
-                                    Expanded(
-                                      child: Column(
-                                        crossAxisAlignment:
-                                            CrossAxisAlignment.start,
-                                        children: [
-                                          Text(
-                                            info.title,
-                                            style: MeshTheme.mono(
-                                              fontSize: 11.5,
-                                              color: MeshPalette.ink,
-                                            ),
-                                          ),
-                                          const SizedBox(height: 2),
-                                          Text(
-                                            info.summary,
-                                            style: MeshTheme.mono(
-                                              fontSize: 10,
-                                              color: MeshPalette.ink3,
-                                            ),
-                                          ),
-                                          const SizedBox(height: 2),
-                                          Text(
-                                            time,
-                                            style: MeshTheme.mono(
-                                              fontSize: 9.5,
-                                              color: MeshPalette.ink4,
-                                            ),
-                                          ),
-                                        ],
-                                      ),
-                                    ),
-                                  ],
-                                ),
-                              ),
                            );
                          },
                        )
                      : Center(
-                          child: Text(
-                            context.l10n.debugLog_noBleActivity,
-                            style: const TextStyle(color: MeshPalette.ink3),
-                          ),
+                          child: Text(context.l10n.debugLog_noBleActivity),
                        ),
                ),
              ],
@@ -1,7 +1,5 @@
 import 'package:flutter/material.dart';
 import '../l10n/l10n.dart';
-import '../theme/mesh_theme.dart';
-import '../widgets/mesh_ui.dart';

 class ChromeRequiredScreen extends StatelessWidget {
  const ChromeRequiredScreen({super.key});
@@ -9,88 +7,76 @@ class ChromeRequiredScreen extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    final l10n = context.l10n;
-    final scheme = Theme.of(context).colorScheme;
+    final theme = Theme.of(context);
+    final isDark = theme.brightness == Brightness.dark;

    return Scaffold(
-      body: SafeArea(
-        child: Center(
-          child: SingleChildScrollView(
-            padding: const EdgeInsets.symmetric(horizontal: 32, vertical: 40),
+      body: Container(
+        width: double.infinity,
+        padding: const EdgeInsets.symmetric(horizontal: 32),
+        decoration: BoxDecoration(
+          gradient: LinearGradient(
+            begin: Alignment.topLeft,
+            end: Alignment.bottomRight,
+            colors: isDark
+                ? [const Color(0xFF1A1A1A), const Color(0xFF0D0D0D)]
+                : [const Color(0xFFF5F7FA), const Color(0xFFE4E7EB)],
+          ),
+        ),
        child: Column(
          mainAxisAlignment: MainAxisAlignment.center,
          children: [
-                // Icon in tinted circle
            Container(
-                  width: 88,
-                  height: 88,
+              padding: const EdgeInsets.all(24),
              decoration: BoxDecoration(
+                color: Colors.orange.withValues(alpha: 0.1),
                shape: BoxShape.circle,
-                    color: scheme.tertiary.withValues(alpha: 0.10),
-                    border: Border.all(
-                      color: scheme.tertiary.withValues(alpha: 0.25),
-                      width: 1.5,
              ),
-                  ),
-                  child: Icon(
+              child: const Icon(
                Icons.browser_not_supported_rounded,
-                    size: 42,
-                    color: scheme.tertiary,
-                  ),
-                ),
-                const SizedBox(height: 28),
-
-                // Title
-                Text(
-                  l10n.scanner_chromeRequired,
-                  textAlign: TextAlign.center,
-                  style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                    fontWeight: FontWeight.w700,
-                    color: scheme.onSurface,
-                    letterSpacing: -0.3,
-                  ),
-                ),
-                const SizedBox(height: 12),
-
-                // Body text
-                Text(
-                  l10n.scanner_chromeRequiredMessage,
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                    fontSize: 14,
-                    color: scheme.onSurfaceVariant,
-                    height: 1.55,
+                size: 80,
+                color: Colors.orange,
              ),
            ),
            const SizedBox(height: 32),
-
-                // Info chip
-                MeshCard(
-                  margin: EdgeInsets.zero,
-                  padding: const EdgeInsets.symmetric(
-                    horizontal: 16,
-                    vertical: 12,
+            Text(
+              l10n.scanner_chromeRequired,
+              textAlign: TextAlign.center,
+              style: theme.textTheme.headlineMedium?.copyWith(
+                fontWeight: FontWeight.bold,
+                color: isDark ? Colors.white : Colors.black87,
+              ),
+            ),
+            const SizedBox(height: 16),
+            Text(
+              l10n.scanner_chromeRequiredMessage,
+              textAlign: TextAlign.center,
+              style: theme.textTheme.bodyLarge?.copyWith(
+                color: isDark ? Colors.white70 : Colors.black54,
+                height: 1.5,
+              ),
+            ),
+            const SizedBox(height: 48),
+            // We can't really "fix" it for them other than telling them to use Chrome
+            // but we can provide a nice visual.
+            Container(
+              padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 12),
+              decoration: BoxDecoration(
+                color: Colors.blue.withValues(alpha: 0.1),
+                borderRadius: BorderRadius.circular(30),
+                border: Border.all(color: Colors.blue.withValues(alpha: 0.3)),
              ),
-                  color: scheme.secondaryContainer.withValues(alpha: 0.35),
-                  borderColor: scheme.outline.withValues(alpha: 0.3),
              child: Row(
                mainAxisSize: MainAxisSize.min,
                children: [
-                      Icon(
-                        Icons.info_outline,
-                        size: 18,
-                        color: scheme.secondary,
-                      ),
-                      const SizedBox(width: 10),
-                      Flexible(
-                        child: Text(
-                          l10n.chrome_bluetoothRequiresChromium,
-                          style: MeshTheme.mono(
-                            fontSize: 12,
-                            color: scheme.onSecondaryContainer,
+                  const Icon(Icons.info_outline, size: 20, color: Colors.blue),
+                  const SizedBox(width: 12),
+                  Text(
+                    "Web Bluetooth requires a Chromium browser",
+                    style: theme.textTheme.bodyMedium?.copyWith(
+                      color: Colors.blue,
                      fontWeight: FontWeight.w500,
                    ),
-                          textAlign: TextAlign.center,
-                        ),
                  ),
                ],
              ),
@@ -98,8 +84,6 @@ class ChromeRequiredScreen extends StatelessWidget {
          ],
        ),
      ),
-        ),
-      ),
    );
  }
 }
@@ -1,18 +1,14 @@
-import 'dart:async';
-
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:uuid/uuid.dart';

 import '../connector/meshcore_connector.dart';
-import '../helpers/snack_bar_builder.dart';
 import '../l10n/l10n.dart';
 import '../models/community.dart';
 import '../storage/community_store.dart';
-import '../theme/mesh_theme.dart';
 import '../widgets/adaptive_app_bar_title.dart';
-import '../widgets/mesh_ui.dart';
 import '../widgets/qr_scanner_widget.dart';
+import '../helpers/snack_bar_builder.dart';

 /// Screen for scanning community QR codes to join communities.
 ///
@@ -39,87 +35,16 @@ class _CommunityQrScannerScreenState extends State<CommunityQrScannerScreen> {
        centerTitle: true,
      ),
      body: _isProcessing
-          ? Container(
-              color: Theme.of(context).colorScheme.surface,
-              child: const Center(child: CircularProgressIndicator()),
-            )
+          ? const Center(child: CircularProgressIndicator())
          : QrScannerWidget(
              onScanned: (data) => _handleScannedData(context, data),
              validator: Community.isValidQrData,
              onValidationFailed: (_) => _showInvalidQrError(context),
              instructions: context.l10n.community_scanInstructions,
-              overlay: _buildThemedOverlay(context),
            ),
    );
  }

-  Widget _buildThemedOverlay(BuildContext context) {
-    return Stack(
-      fit: StackFit.expand,
-      children: [
-        // Dark semi-transparent background with cutout
-        ColorFiltered(
-          colorFilter: ColorFilter.mode(
-            Colors.black.withValues(alpha: 0.5),
-            BlendMode.srcOut,
-          ),
-          child: Stack(
-            fit: StackFit.expand,
-            children: [
-              Container(
-                decoration: const BoxDecoration(
-                  color: Colors.black,
-                  backgroundBlendMode: BlendMode.dstOut,
-                ),
-              ),
-              Center(
-                child: Container(
-                  height: 250,
-                  width: 250,
-                  decoration: BoxDecoration(
-                    color: Colors.red,
-                    borderRadius: BorderRadius.circular(16),
-                  ),
-                ),
-              ),
-            ],
-          ),
-        ),
-        // Corner brackets on top
-        const ScannerCornerOverlay(
-          scanWindowSize: 250,
-          borderColor: MeshPalette.blue,
-          borderWidth: 2,
-          cornerLength: 24,
-        ),
-        // Instructions pill below the scan window
-        Center(
-          child: Column(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              const SizedBox(height: 250 + 24),
-              Container(
-                padding: const EdgeInsets.symmetric(
-                  horizontal: 20,
-                  vertical: 10,
-                ),
-                decoration: BoxDecoration(
-                  color: Colors.black.withValues(alpha: 0.72),
-                  borderRadius: BorderRadius.circular(MeshRadii.pill),
-                ),
-                child: Text(
-                  context.l10n.community_scanInstructions,
-                  style: const TextStyle(color: MeshPalette.ink2, fontSize: 13),
-                  textAlign: TextAlign.center,
-                ),
-              ),
-            ],
-          ),
-        ),
-      ],
-    );
-  }
-
  Future<void> _handleScannedData(BuildContext context, String data) async {
    if (_isProcessing) return;

@@ -155,7 +80,7 @@ class _CommunityQrScannerScreenState extends State<CommunityQrScannerScreen> {
        showDismissibleSnackBar(
          context,
          content: Text(context.l10n.community_invalidQrCode),
-          backgroundColor: MeshPalette.alert,
+          backgroundColor: Colors.red,
        );
      }
    } finally {
@@ -171,74 +96,29 @@ class _CommunityQrScannerScreenState extends State<CommunityQrScannerScreen> {
    showDismissibleSnackBar(
      context,
      content: Text(context.l10n.community_invalidQrCode),
-      backgroundColor: MeshPalette.warn,
+      backgroundColor: Colors.orange,
      duration: const Duration(seconds: 2),
    );
  }

  void _showAlreadyMemberDialog(BuildContext context, Community community) {
-    showMeshSheet(
-      context,
-      builder: (sheetContext) {
-        final sheetScheme = Theme.of(sheetContext).colorScheme;
-        return Column(
-          mainAxisSize: MainAxisSize.min,
-          crossAxisAlignment: CrossAxisAlignment.stretch,
-          children: [
-            BottomSheetHeader(title: context.l10n.community_alreadyMember),
-            Padding(
-              padding: const EdgeInsets.fromLTRB(20, 0, 20, 4),
-              child: Text(
+    showDialog(
+      context: context,
+      builder: (dialogContext) => AlertDialog(
+        title: Text(context.l10n.community_alreadyMember),
+        content: Text(
          context.l10n.community_alreadyMemberMessage(community.name),
-                style: TextStyle(color: sheetScheme.onSurfaceVariant),
        ),
-            ),
-            MeshCard(
-              child: Row(
-                children: [
-                  const Icon(
-                    Icons.groups,
-                    color: MeshPalette.magenta,
-                    size: 32,
-                  ),
-                  const SizedBox(width: 14),
-                  Expanded(
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        Text(
-                          community.name,
-                          style: const TextStyle(
-                            fontWeight: FontWeight.w600,
-                            fontSize: 15,
-                          ),
-                        ),
-                        Text(
-                          'ID: ${community.shortCommunityId}...',
-                          style: MeshTheme.mono(
-                            fontSize: 11.5,
-                            color: sheetScheme.onSurfaceVariant,
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-                ],
-              ),
-            ),
-            Padding(
-              padding: const EdgeInsets.fromLTRB(16, 8, 16, 16),
-              child: FilledButton(
+        actions: [
+          TextButton(
            onPressed: () {
-                  Navigator.pop(sheetContext);
+              Navigator.pop(dialogContext);
              Navigator.pop(context);
            },
            child: Text(context.l10n.common_ok),
          ),
-            ),
        ],
-        );
-      },
+      ),
    );
  }

@@ -247,51 +127,38 @@ class _CommunityQrScannerScreenState extends State<CommunityQrScannerScreen> {
    Community community,
  ) async {
    bool addPublicChannel = true;
-    final completer = Completer<bool>();

-    await showMeshSheet<void>(
-      context,
-      builder: (sheetContext) => StatefulBuilder(
-        builder: (sheetContext, setSheetState) {
-          final joinScheme = Theme.of(sheetContext).colorScheme;
-          return Column(
+    final result = await showDialog<bool>(
+      context: context,
+      builder: (dialogContext) => StatefulBuilder(
+        builder: (dialogContext, setDialogState) => AlertDialog(
+          title: Text(context.l10n.community_joinTitle),
+          content: Column(
            mainAxisSize: MainAxisSize.min,
-            crossAxisAlignment: CrossAxisAlignment.stretch,
+            crossAxisAlignment: CrossAxisAlignment.start,
            children: [
-              BottomSheetHeader(title: context.l10n.community_joinTitle),
-              Padding(
-                padding: const EdgeInsets.fromLTRB(20, 0, 20, 4),
-                child: Text(
-                  context.l10n.community_joinConfirmation(community.name),
-                  style: TextStyle(color: joinScheme.onSurfaceVariant),
-                ),
-              ),
-              MeshCard(
-                child: Row(
+              Text(context.l10n.community_joinConfirmation(community.name)),
+              const SizedBox(height: 16),
+              Row(
                children: [
-                    AvatarCircle(
-                      name: community.name,
-                      icon: Icons.groups,
-                      color: MeshPalette.magenta,
-                      size: 44,
+                  Icon(
+                    Icons.groups,
+                    color: Theme.of(dialogContext).colorScheme.primary,
                  ),
-                    const SizedBox(width: 14),
+                  const SizedBox(width: 12),
                  Expanded(
                    child: Column(
                      crossAxisAlignment: CrossAxisAlignment.start,
                      children: [
                        Text(
                          community.name,
-                            style: const TextStyle(
-                              fontWeight: FontWeight.w600,
-                              fontSize: 15,
-                            ),
+                          style: const TextStyle(fontWeight: FontWeight.bold),
                        ),
                        Text(
                          'ID: ${community.shortCommunityId}...',
-                            style: MeshTheme.mono(
-                              fontSize: 11.5,
-                              color: joinScheme.onSurfaceVariant,
+                          style: TextStyle(
+                            fontSize: 12,
+                            color: Colors.grey[600],
                          ),
                        ),
                      ],
@@ -299,59 +166,38 @@ class _CommunityQrScannerScreenState extends State<CommunityQrScannerScreen> {
                  ),
                ],
              ),
-              ),
+              const SizedBox(height: 16),
+              const Divider(),
+              const SizedBox(height: 8),
              CheckboxListTile(
                value: addPublicChannel,
                onChanged: (value) {
-                  setSheetState(() {
+                  setDialogState(() {
                    addPublicChannel = value ?? true;
                  });
                },
                title: Text(context.l10n.community_addPublicChannel),
                subtitle: Text(context.l10n.community_addPublicChannelHint),
                controlAffinity: ListTileControlAffinity.leading,
-                contentPadding: const EdgeInsets.symmetric(horizontal: 16),
+                contentPadding: EdgeInsets.zero,
              ),
-              Padding(
-                padding: const EdgeInsets.fromLTRB(16, 8, 16, 16),
-                child: Row(
-                  children: [
-                    Expanded(
-                      child: OutlinedButton(
-                        onPressed: () {
-                          completer.complete(false);
-                          Navigator.pop(sheetContext);
-                        },
+            ],
+          ),
+          actions: [
+            TextButton(
+              onPressed: () => Navigator.pop(dialogContext, false),
              child: Text(context.l10n.common_cancel),
            ),
-                    ),
-                    const SizedBox(width: 12),
-                    Expanded(
-                      child: FilledButton(
-                        onPressed: () {
-                          completer.complete(true);
-                          Navigator.pop(sheetContext);
-                        },
+            FilledButton(
+              onPressed: () => Navigator.pop(dialogContext, true),
              child: Text(context.l10n.community_join),
            ),
-                    ),
          ],
        ),
      ),
-            ],
-          );
-        },
-      ),
    );

-    // If sheet was dismissed without a button press, treat as cancel
-    if (!completer.isCompleted) {
-      completer.complete(false);
-    }
-
-    final result = await completer.future;
-
-    if (result && context.mounted) {
+    if (result == true && context.mounted) {
      await _joinCommunity(context, community, addPublicChannel);
    } else if (context.mounted) {
      // User cancelled - go back
@@ -385,7 +231,7 @@ class _CommunityQrScannerScreenState extends State<CommunityQrScannerScreen> {
      showDismissibleSnackBar(
        context,
        content: Text(context.l10n.community_joined(community.name)),
-        backgroundColor: MeshPalette.signal,
+        backgroundColor: Colors.green,
      );

      // Return to previous screen
@@ -2,8 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:meshcore_open/connector/meshcore_connector.dart';
 import 'package:meshcore_open/models/companion_radio_stats.dart';
 import 'package:meshcore_open/l10n/l10n.dart';
-import 'package:meshcore_open/theme/mesh_theme.dart';
-import 'package:meshcore_open/widgets/mesh_ui.dart';
 import 'package:provider/provider.dart';

 class CompanionRadioStatsScreen extends StatefulWidget {
@@ -51,25 +49,6 @@ class _CompanionRadioStatsScreenState extends State<CompanionRadioStatsScreen> {
    super.dispose();
  }

-  Widget _tile(String text, IconData icon, Color color) {
-    final scheme = Theme.of(context).colorScheme;
-    return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
-      child: Row(
-        children: [
-          Icon(icon, size: 16, color: color),
-          const SizedBox(width: 10),
-          Expanded(
-            child: Text(
-              text,
-              style: MeshTheme.mono(fontSize: 13, color: scheme.onSurface),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
  @override
  Widget build(BuildContext context) {
    final l10n = context.l10n;
@@ -106,93 +85,27 @@ class _CompanionRadioStatsScreenState extends State<CompanionRadioStatsScreen> {
            valueListenable: connector.radioStatsNotifier,
            builder: (context, stats, _) {
              return ListView(
-                padding: const EdgeInsets.symmetric(vertical: 8),
+                padding: const EdgeInsets.all(16),
                children: [
                  if (stats != null) ...[
-                    const SectionHeader(
-                      'Signal',
-                      padding: EdgeInsets.fromLTRB(16, 16, 16, 8),
-                    ),
-                    MeshCard(
-                      margin: const EdgeInsets.symmetric(
-                        horizontal: 16,
-                        vertical: 4,
-                      ),
-                      padding: const EdgeInsets.all(4),
-                      child: Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
-                          _tile(
+                    Text(
                      l10n.radioStats_noiseFloor(stats.noiseFloorDbm),
-                            Icons.noise_aware,
-                            scheme.onSurfaceVariant,
+                      style: tt.titleMedium,
                    ),
-                          const Divider(height: 1),
-                          _tile(
-                            l10n.radioStats_lastRssi(stats.lastRssiDbm),
-                            Icons.wifi_tethering,
-                            scheme.onSurfaceVariant,
-                          ),
-                          const Divider(height: 1),
-                          _tile(
+                    const SizedBox(height: 4),
+                    Text(l10n.radioStats_lastRssi(stats.lastRssiDbm)),
+                    Text(
                      l10n.radioStats_lastSnr(
                        stats.lastSnrDb.toStringAsFixed(1),
                      ),
-                            Icons.signal_cellular_alt,
-                            MeshTheme.snrColor(stats.lastSnrDb, blocked: false),
                    ),
-                        ],
-                      ),
-                    ),
-                    const SectionHeader(
-                      'Airtime',
-                      padding: EdgeInsets.fromLTRB(16, 16, 16, 8),
-                    ),
-                    MeshCard(
-                      margin: const EdgeInsets.symmetric(
-                        horizontal: 16,
-                        vertical: 4,
-                      ),
-                      padding: const EdgeInsets.all(4),
-                      child: Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
-                          _tile(
-                            l10n.radioStats_txAir(stats.txAirSecs),
-                            Icons.upload,
-                            MeshPalette.blue,
-                          ),
-                          const Divider(height: 1),
-                          _tile(
-                            l10n.radioStats_rxAir(stats.rxAirSecs),
-                            Icons.download,
-                            MeshPalette.blue,
-                          ),
-                        ],
-                      ),
-                    ),
-                  ] else ...[
-                    const SizedBox(height: 80),
-                    Center(
-                      child: CircularProgressIndicator(
-                        color: Theme.of(context).colorScheme.primary,
-                      ),
-                    ),
-                    const SizedBox(height: 8),
-                    Center(
-                      child: Text(
-                        l10n.radioStats_waiting,
-                        style: TextStyle(color: scheme.onSurfaceVariant),
-                      ),
-                    ),
-                  ],
-                  SectionHeader(
-                    l10n.radioStats_chartCaption,
-                    padding: const EdgeInsets.fromLTRB(16, 16, 16, 8),
-                  ),
-                  Padding(
-                    padding: const EdgeInsets.symmetric(horizontal: 16),
-                    child: SizedBox(
+                    Text(l10n.radioStats_txAir(stats.txAirSecs)),
+                    Text(l10n.radioStats_rxAir(stats.rxAirSecs)),
+                    const SizedBox(height: 16),
+                  ] else
+                    Text(l10n.radioStats_waiting),
+                  const SizedBox(height: 16),
+                  SizedBox(
                    height: 200,
                    child: CustomPaint(
                      painter: _NoiseChartPainter(
@@ -203,8 +116,13 @@ class _CompanionRadioStatsScreenState extends State<CompanionRadioStatsScreen> {
                      child: const SizedBox.expand(),
                    ),
                  ),
-                  ),
                  const SizedBox(height: 8),
+                  Text(
+                    l10n.radioStats_chartCaption,
+                    style: tt.bodySmall?.copyWith(
+                      color: scheme.onSurfaceVariant,
+                    ),
+                  ),
                ],
              );
            },
@@ -292,10 +210,10 @@ class _NoiseChartPainter extends CustomPainter {
    }
    final span = maxV - minV;

-    for (var i = 0; i <= 4; i++) {
-      final v = maxV - span * i / 4;
+    for (var i = 0; i <= 2; i++) {
+      final v = maxV - span * i / 2;
      final tp = _yAxisLabel(v);
-      final y = chart.top + (chart.height * i / 4) - tp.height / 2;
+      final y = chart.top + (chart.height * i / 2) - tp.height / 2;
      tp.paint(canvas, Offset(4, y));
    }

@@ -7,14 +7,11 @@ import 'package:provider/provider.dart';
 import '../connector/meshcore_connector.dart';
 import '../connector/meshcore_protocol.dart';
 import '../l10n/l10n.dart';
-import '../l10n/contact_localization.dart';
 import '../models/contact.dart';
-import '../theme/mesh_theme.dart';
 import '../utils/contact_search.dart';
 import '../utils/platform_info.dart';
 import '../widgets/app_bar.dart';
 import '../widgets/list_filter_widget.dart';
-import '../widgets/mesh_ui.dart';
 import '../helpers/snack_bar_builder.dart';

 enum DiscoverySortOption { lastSeen, name, type }
@@ -49,34 +46,6 @@ class _DiscoveryScreenState extends State<DiscoveryScreen> {
        : contact.lastSeen;
  }

-  /// Node-type avatar color per design language.
-  Color _avatarColor(int type) {
-    switch (type) {
-      case advTypeRepeater:
-        return MeshPalette.warn;
-      case advTypeRoom:
-        return MeshPalette.magenta;
-      case advTypeSensor:
-        return const Color(0xFF4ACCC4); // teal
-      default:
-        return MeshPalette.blue;
-    }
-  }
-
-  /// Node-type avatar icon; null = show initials for chat nodes.
-  IconData? _avatarIcon(int type) {
-    switch (type) {
-      case advTypeRepeater:
-        return Icons.cell_tower;
-      case advTypeRoom:
-        return Icons.meeting_room;
-      case advTypeSensor:
-        return Icons.sensors;
-      default:
-        return null;
-    }
-  }
-
  @override
  Widget build(BuildContext context) {
    final l10n = context.l10n;
@@ -102,10 +71,7 @@ class _DiscoveryScreenState extends State<DiscoveryScreen> {
              PopupMenuItem(
                child: Row(
                  children: [
-                    Icon(
-                      Icons.delete,
-                      color: Theme.of(context).colorScheme.error,
-                    ),
+                    const Icon(Icons.delete, color: Colors.red),
                    const SizedBox(width: 8),
                    Text(context.l10n.discoveredContacts_deleteContactAll),
                  ],
@@ -123,29 +89,90 @@ class _DiscoveryScreenState extends State<DiscoveryScreen> {
        children: [
          _buildFilters(filteredAndSorted, connector),
          Expanded(
-            child: AnimatedSwitcher(
-              duration: const Duration(milliseconds: 220),
            child: discoveredContacts.isEmpty
-                  ? Center(
-                      key: const ValueKey('empty_all'),
-                      child: Text(l10n.contacts_noContacts),
-                    )
+                ? Center(child: Text(l10n.contacts_noContacts))
                : filteredAndSorted.isEmpty
-                  ? Center(
-                      key: const ValueKey('empty_filtered'),
-                      child: Text(l10n.discoveredContacts_noMatching),
-                    )
+                ? Center(child: Text(l10n.discoveredContacts_noMatching))
                : ListView.builder(
-                      key: const ValueKey('list'),
-                      padding: const EdgeInsets.only(bottom: 24),
                    itemCount: filteredAndSorted.length,
                    itemBuilder: (context, index) {
                      final contact = filteredAndSorted[index];
-                        final tile = _buildDiscoveryTile(
+                      final tile = ListTile(
+                        leading: CircleAvatar(
+                          backgroundColor: _getTypeColor(contact.type),
+                          child: Icon(
+                            _getTypeIcon(contact.type),
+                            color: Colors.white,
+                            size: 20,
+                          ),
+                        ),
+                        title: Text(
+                          contact.name,
+                          maxLines: 1,
+                          overflow: TextOverflow.ellipsis,
+                        ),
+                        subtitle: Text(
+                          contact.shortPubKeyHex,
+                          maxLines: 1,
+                          overflow: TextOverflow.ellipsis,
+                        ),
+                        // Clamp text scaling in trailing section to prevent overflow while
+                        // maintaining accessibility. Primary content (title/subtitle) scales normally.
+                        trailing: MediaQuery(
+                          data: MediaQuery.of(context).copyWith(
+                            textScaler: TextScaler.linear(
+                              MediaQuery.textScalerOf(
                                context,
-                          contact,
-                          connector,
-                          index,
+                              ).scale(1.0).clamp(1.0, 1.3),
+                            ),
+                          ),
+                          child: SizedBox(
+                            width: 120,
+                            child: Column(
+                              mainAxisAlignment: MainAxisAlignment.center,
+                              crossAxisAlignment: CrossAxisAlignment.end,
+                              children: [
+                                Text(
+                                  _formatLastSeen(
+                                    context,
+                                    _resolveLastSeen(contact),
+                                  ),
+                                  maxLines: 1,
+                                  overflow: TextOverflow.ellipsis,
+                                  textAlign: TextAlign.right,
+                                  style: TextStyle(
+                                    fontSize: 12,
+                                    color: Colors.grey[600],
+                                  ),
+                                ),
+                                Row(
+                                  mainAxisSize: MainAxisSize.min,
+                                  children: [
+                                    if (contact.hasLocation)
+                                      Icon(
+                                        Icons.location_on,
+                                        size: 14,
+                                        color: Colors.grey[400],
+                                      ),
+                                    if (contact.rawPacket != null)
+                                      const SizedBox(width: 2),
+                                    if (contact.rawPacket != null)
+                                      Icon(
+                                        Icons.cell_tower,
+                                        size: 14,
+                                        color: Colors.grey[400],
+                                      ),
+                                  ],
+                                ),
+                              ],
+                            ),
+                          ),
+                        ),
+                        onTap: () {
+                          connector.importDiscoveredContact(contact);
+                        },
+                        onLongPress: () =>
+                            _showContactContextMenu(contact, connector),
                      );
                      if (PlatformInfo.isDesktop) {
                        return GestureDetector(
@@ -158,169 +185,28 @@ class _DiscoveryScreenState extends State<DiscoveryScreen> {
                    },
                  ),
          ),
-          ),
        ],
      ),
    );
  }

-  Widget _buildDiscoveryTile(
-    BuildContext context,
-    Contact contact,
-    MeshCoreConnector connector,
-    int index,
-  ) {
-    final scheme = Theme.of(context).colorScheme;
-    final isChat = contact.type == advTypeChat;
-
-    return ListEntrance(
-      index: index,
-      child: MeshCard(
-        onTap: () async {
-          try {
-            final imported = await connector.importDiscoveredContact(contact);
-            if (!context.mounted) return;
-            if (!imported) {
-              showDismissibleSnackBar(
-                context,
-                content: Text(context.l10n.contacts_contactImportFailed),
-              );
-              return;
-            }
-            showDismissibleSnackBar(
-              context,
-              content: Text(context.l10n.discoveredContacts_contactAdded),
-              action: SnackBarAction(
-                label: context.l10n.common_undo,
-                onPressed: () => connector.removeContact(contact),
-              ),
-            );
-          } catch (_) {
-            if (!context.mounted) return;
-            showDismissibleSnackBar(
-              context,
-              content: Text(context.l10n.contacts_contactImportFailed),
-            );
-          }
-        },
-        onLongPress: () => _showContactContextMenu(contact, connector),
-        padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 10),
-        child: Row(
-          children: [
-            AvatarCircle(
-              name: contact.name,
-              size: 42,
-              color: isChat ? null : _avatarColor(contact.type),
-              icon: _avatarIcon(contact.type),
-            ),
-            const SizedBox(width: 12),
-            Expanded(
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  // Name + type chip
-                  Row(
-                    children: [
-                      Expanded(
-                        child: Text(
-                          contact.name,
-                          maxLines: 1,
-                          overflow: TextOverflow.ellipsis,
-                          style: const TextStyle(
-                            fontWeight: FontWeight.w500,
-                            fontSize: 15,
-                          ),
-                        ),
-                      ),
-                      const SizedBox(width: 6),
-                      StatusChip(
-                        label: contact.typeLabel(context.l10n).toUpperCase(),
-                        color: _avatarColor(contact.type),
-                        icon: _avatarIcon(contact.type),
-                      ),
-                    ],
-                  ),
-                  const SizedBox(height: 3),
-                  // Short pub key
-                  Row(
-                    children: [
-                      Expanded(
-                        child: Text(
-                          contact.shortPubKeyHex,
-                          maxLines: 1,
-                          overflow: TextOverflow.ellipsis,
-                          style: MeshTheme.mono(
-                            fontSize: 11,
-                            color: scheme.onSurfaceVariant,
-                          ),
-                        ),
-                      ),
-                      if (contact.hasLocation) ...[
-                        const SizedBox(width: 6),
-                        Icon(
-                          Icons.location_on,
-                          size: 13,
-                          color: scheme.onSurfaceVariant.withValues(
-                            alpha: 0.55,
-                          ),
-                        ),
-                      ],
-                      if (contact.rawPacket != null) ...[
-                        const SizedBox(width: 4),
-                        Icon(
-                          Icons.cell_tower,
-                          size: 13,
-                          color: scheme.onSurfaceVariant.withValues(
-                            alpha: 0.55,
-                          ),
-                        ),
-                      ],
-                    ],
-                  ),
-                ],
-              ),
-            ),
-            const SizedBox(width: 10),
-            // Last seen time
-            MediaQuery(
-              data: MediaQuery.of(context).copyWith(
-                textScaler: TextScaler.linear(
-                  MediaQuery.textScalerOf(context).scale(1.0).clamp(1.0, 1.3),
-                ),
-              ),
-              child: Text(
-                _formatLastSeen(context, _resolveLastSeen(contact)),
-                maxLines: 1,
-                overflow: TextOverflow.ellipsis,
-                textAlign: TextAlign.right,
-                style: MeshTheme.mono(
-                  fontSize: 11,
-                  color: scheme.onSurfaceVariant,
-                ),
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
  Future<void> _showContactContextMenu(
    Contact contact,
    MeshCoreConnector connector,
  ) async {
-    final action = await showMeshSheet<String>(
-      context,
+    final action = await showModalBottomSheet<String>(
+      context: context,
+      showDragHandle: true,
      builder: (sheetContext) {
        final l10n = context.l10n;
        return SafeArea(
          child: Column(
            mainAxisSize: MainAxisSize.min,
            children: [
-              BottomSheetHeader(
-                title: contact.name,
-                subtitle: contact.typeLabel(l10n),
+              ListTile(
+                leading: const Icon(Icons.add_reaction_sharp),
+                title: Text(l10n.discoveredContacts_addContact),
+                onTap: () => Navigator.of(sheetContext).pop('import_contact'),
              ),
              ListTile(
                leading: const Icon(Icons.copy),
@@ -332,7 +218,6 @@ class _DiscoveryScreenState extends State<DiscoveryScreen> {
                title: Text(l10n.discoveredContacts_deleteContact),
                onTap: () => Navigator.of(sheetContext).pop('delete_contact'),
              ),
-              const SizedBox(height: 8),
            ],
          ),
        );
@@ -342,6 +227,9 @@ class _DiscoveryScreenState extends State<DiscoveryScreen> {
    if (!mounted || action == null) return;

    switch (action) {
+      case 'import_contact':
+        connector.importDiscoveredContact(contact);
+        break;
      case 'copy_contact':
        if (contact.rawPacket == null) return;
        final hexString = pubKeyToHex(contact.rawPacket!);
@@ -541,6 +429,36 @@ class _DiscoveryScreenState extends State<DiscoveryScreen> {
    }
  }

+  IconData _getTypeIcon(int type) {
+    switch (type) {
+      case advTypeChat:
+        return Icons.chat;
+      case advTypeRepeater:
+        return Icons.cell_tower;
+      case advTypeRoom:
+        return Icons.group;
+      case advTypeSensor:
+        return Icons.sensors;
+      default:
+        return Icons.device_unknown;
+    }
+  }
+
+  Color _getTypeColor(int type) {
+    switch (type) {
+      case advTypeChat:
+        return Colors.blue;
+      case advTypeRepeater:
+        return Colors.orange;
+      case advTypeRoom:
+        return Colors.purple;
+      case advTypeSensor:
+        return Colors.green;
+      default:
+        return Colors.grey;
+    }
+  }
+
  String _formatLastSeen(BuildContext context, DateTime lastSeen) {
    final now = DateTime.now();
    final diff = now.difference(lastSeen);
@@ -10,9 +10,6 @@ import '../services/app_settings_service.dart';
 import '../services/map_tile_cache_service.dart';
 import '../widgets/adaptive_app_bar_title.dart';
 import '../helpers/snack_bar_builder.dart';
-import '../theme/mesh_theme.dart';
-import '../widgets/mesh_ui.dart';
-import '../widgets/themed_map_tile_layer.dart';

 class MapCacheScreen extends StatefulWidget {
  const MapCacheScreen({super.key});
@@ -79,36 +76,29 @@ class _MapCacheScreenState extends State<MapCacheScreen> {
    return Positioned(
      top: 12,
      left: 12,
-      child: DecoratedBox(
-        decoration: BoxDecoration(
-          color: MeshPalette.bg1.withValues(alpha: 0.90),
-          borderRadius: BorderRadius.circular(MeshRadii.md),
-          border: Border.all(color: MeshPalette.line2),
-        ),
-        child: ClipRRect(
-          borderRadius: BorderRadius.circular(MeshRadii.md),
+      child: Card(
+        elevation: 4,
        child: Column(
          mainAxisSize: MainAxisSize.min,
          children: [
            IconButton(
              icon: const Icon(Icons.add),
-                tooltip: context.l10n.map_zoomIn,
+              tooltip: 'Zoom in',
              onPressed: () => _zoomMapBy(1),
            ),
            IconButton(
              icon: const Icon(Icons.remove),
-                tooltip: context.l10n.map_zoomOut,
+              tooltip: 'Zoom out',
              onPressed: () => _zoomMapBy(-1),
            ),
            IconButton(
              icon: const Icon(Icons.my_location),
-                tooltip: context.l10n.map_centerMap,
+              tooltip: 'Center map',
              onPressed: _resetMapView,
            ),
          ],
        ),
      ),
-      ),
    );
  }

@@ -291,7 +281,6 @@ class _MapCacheScreenState extends State<MapCacheScreen> {
    final tileCache = context.read<MapTileCacheService>();
    final selectedBounds = _selectedBounds;
    final l10n = context.l10n;
-    final scheme = Theme.of(context).colorScheme;
    final isDesktop = _isDesktopPlatform(defaultTargetPlatform);
    final progressValue = _estimatedTiles == 0
        ? 0.0
@@ -329,7 +318,13 @@ class _MapCacheScreenState extends State<MapCacheScreen> {
                    ),
                  ),
                  children: [
-                    ThemedMapTileLayer(tileCache: tileCache),
+                    TileLayer(
+                      urlTemplate: kMapTileUrlTemplate,
+                      tileProvider: tileCache.tileProvider,
+                      userAgentPackageName:
+                          MapTileCacheService.userAgentPackageName,
+                      maxZoom: 19,
+                    ),
                    if (selectedBounds != null)
                      PolygonLayer(
                        polygons: [
@@ -347,25 +342,14 @@ class _MapCacheScreenState extends State<MapCacheScreen> {
                Positioned(
                  top: 12,
                  right: 12,
-                  child: DecoratedBox(
-                    decoration: BoxDecoration(
-                      color: MeshPalette.bg1.withValues(alpha: 0.93),
-                      borderRadius: BorderRadius.circular(MeshRadii.md),
-                      border: Border.all(color: MeshPalette.line2),
-                    ),
+                  child: Card(
                    child: Padding(
-                      padding: const EdgeInsets.symmetric(
-                        horizontal: 10,
-                        vertical: 6,
-                      ),
+                      padding: const EdgeInsets.all(8),
                      child: Text(
                        selectedBounds == null
                            ? l10n.mapCache_noAreaSelected
                            : _formatBounds(selectedBounds, l10n),
-                        style: MeshTheme.mono(
-                          fontSize: 11,
-                          color: MeshPalette.ink2,
-                        ),
+                        style: const TextStyle(fontSize: 12),
                      ),
                    ),
                  ),
@@ -375,30 +359,27 @@ class _MapCacheScreenState extends State<MapCacheScreen> {
          ),
          SafeArea(
            top: false,
-            child: DecoratedBox(
-              decoration: BoxDecoration(
-                color: scheme.surfaceContainerLow,
-                border: Border(top: BorderSide(color: scheme.outlineVariant)),
-              ),
            child: Padding(
-                padding: const EdgeInsets.fromLTRB(16, 4, 16, 16),
+              padding: const EdgeInsets.fromLTRB(16, 12, 16, 16),
              child: Column(
                crossAxisAlignment: CrossAxisAlignment.start,
                mainAxisSize: MainAxisSize.min,
                children: [
-                    SectionHeader(
+                  Text(
                    l10n.mapCache_cacheArea,
-                      padding: const EdgeInsets.fromLTRB(0, 12, 0, 8),
+                    style: const TextStyle(
+                      fontWeight: FontWeight.bold,
+                      fontSize: 16,
                    ),
+                  ),
+                  const SizedBox(height: 8),
                  Row(
                    children: [
                      Expanded(
                        child: ElevatedButton.icon(
                          icon: const Icon(Icons.crop_free),
                          label: Text(l10n.mapCache_useCurrentView),
-                            onPressed: _isDownloading
-                                ? null
-                                : _setBoundsFromView,
+                          onPressed: _isDownloading ? null : _setBoundsFromView,
                        ),
                      ),
                      const SizedBox(width: 12),
@@ -411,9 +392,12 @@ class _MapCacheScreenState extends State<MapCacheScreen> {
                    ],
                  ),
                  const SizedBox(height: 12),
-                    SectionHeader(
+                  Text(
                    l10n.mapCache_zoomRange,
-                      padding: const EdgeInsets.fromLTRB(0, 8, 0, 0),
+                    style: const TextStyle(
+                      fontWeight: FontWeight.bold,
+                      fontSize: 16,
+                    ),
                  ),
                  RangeSlider(
                    values: RangeValues(
@@ -438,30 +422,16 @@ class _MapCacheScreenState extends State<MapCacheScreen> {
                            _saveZoomRange();
                          },
                  ),
-                    Text(
-                      l10n.mapCache_estimatedTiles(_estimatedTiles),
-                      style: MeshTheme.mono(
-                        fontSize: 12,
-                        color: scheme.onSurfaceVariant,
-                      ),
-                    ),
+                  Text(l10n.mapCache_estimatedTiles(_estimatedTiles)),
                  if (_isDownloading) ...[
                    const SizedBox(height: 8),
-                      LinearProgressIndicator(
-                        value: progressValue,
-                        color: MeshPalette.blue,
-                        backgroundColor: scheme.surfaceContainerHighest,
-                      ),
+                    LinearProgressIndicator(value: progressValue),
                    const SizedBox(height: 4),
                    Text(
                      l10n.mapCache_downloadedTiles(
                        _completedTiles,
                        _estimatedTiles,
                      ),
-                        style: MeshTheme.mono(
-                          fontSize: 12,
-                          color: scheme.onSurfaceVariant,
-                        ),
                    ),
                  ],
                  const SizedBox(height: 12),
@@ -478,12 +448,6 @@ class _MapCacheScreenState extends State<MapCacheScreen> {
                      ),
                      const SizedBox(width: 12),
                      OutlinedButton(
-                          style: OutlinedButton.styleFrom(
-                            foregroundColor: MeshPalette.alert,
-                            side: const BorderSide(
-                              color: MeshPalette.alertLine,
-                            ),
-                          ),
                        onPressed: _isDownloading ? null : _clearCache,
                        child: Text(l10n.mapCache_clearCacheButton),
                      ),
@@ -494,17 +458,13 @@ class _MapCacheScreenState extends State<MapCacheScreen> {
                      padding: const EdgeInsets.only(top: 8),
                      child: Text(
                        l10n.mapCache_failedDownloads(_failedTiles),
-                          style: MeshTheme.mono(
-                            fontSize: 12,
-                            color: MeshPalette.alert,
-                          ),
+                        style: TextStyle(color: Colors.orange[700]),
                      ),
                    ),
                ],
              ),
            ),
          ),
-          ),
        ],
      ),
    );
@@ -9,10 +9,8 @@ import '../models/path_selection.dart';
 import '../connector/meshcore_connector.dart';
 import '../connector/meshcore_protocol.dart';
 import '../services/repeater_command_service.dart';
-import '../theme/mesh_theme.dart';
-import '../widgets/empty_state.dart';
-import '../widgets/mesh_ui.dart';
-import '../widgets/routing_sheet.dart';
+import '../widgets/path_management_dialog.dart';
+import '../widgets/snr_indicator.dart';
 import '../helpers/snack_bar_builder.dart';

 class NeighborsScreen extends StatefulWidget {
@@ -169,7 +167,7 @@ class _NeighborsScreenState extends State<NeighborsScreen> {
      showDismissibleSnackBar(
        context,
        content: Text(context.l10n.neighbors_receivedData),
-        backgroundColor: Theme.of(context).colorScheme.tertiary,
+        backgroundColor: Colors.green,
      );
      _statusTimeout?.cancel();
      if (!mounted) return;
@@ -229,7 +227,7 @@ class _NeighborsScreenState extends State<NeighborsScreen> {
        showDismissibleSnackBar(
          context,
          content: Text(context.l10n.neighbors_requestTimedOut),
-          backgroundColor: Theme.of(context).colorScheme.error,
+          backgroundColor: Colors.red,
        );
        _recordStatusResult(false);
      });
@@ -243,7 +241,7 @@ class _NeighborsScreenState extends State<NeighborsScreen> {
        showDismissibleSnackBar(
          context,
          content: Text(context.l10n.neighbors_errorLoading(e.toString())),
-          backgroundColor: Theme.of(context).colorScheme.error,
+          backgroundColor: Colors.red,
        );
      }
    }
@@ -281,9 +279,7 @@ class _NeighborsScreenState extends State<NeighborsScreen> {
          children: [
            Text(
              l10n.neighbors_repeatersNeighbors,
-              style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
-              maxLines: 1,
-              overflow: TextOverflow.ellipsis,
+              style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
            ),
            Text(
              repeater.name,
@@ -291,18 +287,75 @@ class _NeighborsScreenState extends State<NeighborsScreen> {
                fontSize: 14,
                fontWeight: FontWeight.normal,
              ),
-              maxLines: 1,
-              overflow: TextOverflow.ellipsis,
            ),
          ],
        ),
        centerTitle: false,
        actions: [
-          IconButton(
+          PopupMenuButton<String>(
            icon: Icon(isFloodMode ? Icons.waves : Icons.route),
            tooltip: l10n.repeater_routingMode,
+            onSelected: (mode) async {
+              if (mode == 'flood') {
+                await connector.setPathOverride(repeater, pathLen: -1);
+              } else {
+                await connector.setPathOverride(repeater, pathLen: null);
+              }
+            },
+            itemBuilder: (context) => [
+              PopupMenuItem(
+                value: 'auto',
+                child: Row(
+                  children: [
+                    Icon(
+                      Icons.auto_mode,
+                      size: 20,
+                      color: !isFloodMode
+                          ? Theme.of(context).primaryColor
+                          : null,
+                    ),
+                    const SizedBox(width: 8),
+                    Text(
+                      l10n.repeater_autoUseSavedPath,
+                      style: TextStyle(
+                        fontWeight: !isFloodMode
+                            ? FontWeight.bold
+                            : FontWeight.normal,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+              PopupMenuItem(
+                value: 'flood',
+                child: Row(
+                  children: [
+                    Icon(
+                      Icons.waves,
+                      size: 20,
+                      color: isFloodMode
+                          ? Theme.of(context).primaryColor
+                          : null,
+                    ),
+                    const SizedBox(width: 8),
+                    Text(
+                      l10n.repeater_forceFloodMode,
+                      style: TextStyle(
+                        fontWeight: isFloodMode
+                            ? FontWeight.bold
+                            : FontWeight.normal,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ],
+          ),
+          IconButton(
+            icon: const Icon(Icons.timeline),
+            tooltip: l10n.repeater_pathManagement,
            onPressed: () =>
-                ContactRoutingSheet.show(context, contact: repeater),
+                PathManagementDialog.show(context, contact: repeater),
          ),
          IconButton(
            icon: _isLoading
@@ -322,16 +375,23 @@ class _NeighborsScreenState extends State<NeighborsScreen> {
        child: RefreshIndicator(
          onRefresh: _loadNeighbors,
          child: ListView(
-            padding: const EdgeInsets.fromLTRB(16, 8, 16, 24),
+            padding: const EdgeInsets.all(16),
            children: [
              if (!_isLoaded &&
                  !_hasData &&
                  (_parsedNeighbors == null || _parsedNeighbors!.isEmpty))
-                EmptyState(icon: Icons.wifi_find, title: l10n.neighbors_noData),
+                Center(
+                  child: Text(
+                    l10n.neighbors_noData,
+                    style: TextStyle(fontSize: 16, color: Colors.grey),
+                  ),
+                ),
              if (_isLoaded ||
                  _hasData &&
                      !(_parsedNeighbors == null || _parsedNeighbors!.isEmpty))
-                _buildNeighborsList(connector),
+                _buildNeighborsInfoCard(
+                  "${l10n.repeater_neighbors} - $_neighborCount",
+                ),
            ],
          ),
        ),
@@ -339,98 +399,82 @@ class _NeighborsScreenState extends State<NeighborsScreen> {
    );
  }

-  Widget _buildNeighborsList(MeshCoreConnector connector) {
-    final l10n = context.l10n;
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        SectionHeader(
-          '${l10n.repeater_neighbors} — $_neighborCount',
-          padding: const EdgeInsets.fromLTRB(4, 8, 4, 10),
-        ),
-        for (var i = 0; i < _parsedNeighbors!.length; i++)
-          ListEntrance(
-            index: i,
-            child: _buildNeighborRow(_parsedNeighbors![i], connector.currentSf),
-          ),
-      ],
-    );
-  }
-
-  Widget _buildNeighborRow(Map<String, dynamic> data, int? spreadingFactor) {
-    final l10n = context.l10n;
-    final scheme = Theme.of(context).colorScheme;
-    final Contact? contact = data['contact'] as Contact?;
-    final double snr = data['snr'] as double;
-    final int lastHeardSeconds = data['lastHeard'] as int;
-
-    final name = contact != null
-        ? contact.name
-        : l10n.neighbors_unknownContact(
-            '<${pubKeyToHex(data['publicKey'] as Uint8List)}>',
-          );
-
-    final snrColor = MeshTheme.snrColor(snr, blocked: false);
-    final heardLabel = l10n.neighbors_heardAgo(
-      fmtDuration(lastHeardSeconds + 0.0),
-    );
-
-    return MeshCard(
-      padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 10),
-      margin: const EdgeInsets.symmetric(vertical: 4),
-      child: Row(
-        children: [
-          AvatarCircle(
-            name: name,
-            size: 40,
-            color: contact != null ? MeshPalette.warn : scheme.onSurfaceVariant,
-            icon: contact != null ? Icons.cell_tower : Icons.device_unknown,
-          ),
-          const SizedBox(width: 12),
-          Expanded(
+  Widget _buildNeighborsInfoCard(String title) {
+    final connector = Provider.of<MeshCoreConnector>(context, listen: false);
+    return Card(
+      child: Padding(
+        padding: const EdgeInsets.all(16),
        child: Column(
          crossAxisAlignment: CrossAxisAlignment.start,
-              mainAxisSize: MainAxisSize.min,
          children: [
+            Row(
+              children: [
+                Icon(
+                  Icons.info_outline,
+                  color: Theme.of(context).textTheme.headlineSmall?.color,
+                ),
+                const SizedBox(width: 8),
                Text(
-                  name,
-                  maxLines: 1,
-                  overflow: TextOverflow.ellipsis,
+                  title,
                  style: const TextStyle(
-                    fontWeight: FontWeight.w500,
-                    fontSize: 15,
-                  ),
-                ),
-                const SizedBox(height: 2),
-                Text(
-                  heardLabel,
-                  maxLines: 1,
-                  overflow: TextOverflow.ellipsis,
-                  style: TextStyle(
-                    fontSize: 12,
-                    color: Theme.of(context).colorScheme.onSurfaceVariant,
+                    fontSize: 18,
+                    fontWeight: FontWeight.bold,
                  ),
                ),
              ],
            ),
+            const Divider(),
+            for (final entry in _parsedNeighbors!.asMap().entries)
+              _buildInfoRow(
+                entry.value['contact'] != null
+                    ? entry.value['contact'].name
+                    : context.l10n.neighbors_unknownContact(
+                        "<${pubKeyToHex(entry.value['publicKey'])}>",
                      ),
-          const SizedBox(width: 10),
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.end,
-            mainAxisSize: MainAxisSize.min,
+                context.l10n.neighbors_heardAgo(
+                  fmtDuration(entry.value['lastHeard'] + 0.0),
+                ),
+                entry.value['snr'],
+                connector.currentSf!,
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildInfoRow(
+    String label,
+    String value,
+    double snr,
+    int spreadingFactor,
+  ) {
+    final snrUi = snrUiFromSNR(snr, spreadingFactor);
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 3),
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
-              SignalBars(snr: snr, height: 16),
-              const SizedBox(height: 4),
-              Text(
-                '${snr.toStringAsFixed(1)} dB',
-                style: MeshTheme.mono(
-                  fontSize: 11,
-                  fontWeight: FontWeight.w600,
-                  color: snrColor,
+          Expanded(
+            child: ListTile(
+              contentPadding: EdgeInsets.zero,
+              title: Text(
+                label,
+                style: const TextStyle(fontWeight: FontWeight.w500),
              ),
+              subtitle: Text(value),
+              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),
                  ),
                ],
              ),
+            ),
+          ),
        ],
      ),
    );
@@ -1,15 +1,14 @@
 import 'dart:async';
+import 'dart:typed_data';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 import '../l10n/l10n.dart';
 import '../models/contact.dart';
 import '../connector/meshcore_connector.dart';
 import '../connector/meshcore_protocol.dart';
-import '../theme/mesh_theme.dart';
 import '../widgets/debug_frame_viewer.dart';
 import '../services/repeater_command_service.dart';
-import '../widgets/routing_sheet.dart';
+import '../widgets/path_management_dialog.dart';
 import '../helpers/snack_bar_builder.dart';

 class RepeaterCliScreen extends StatefulWidget {
@@ -35,6 +34,7 @@ class _RepeaterCliScreenState extends State<RepeaterCliScreen> {
  StreamSubscription<Uint8List>? _frameSubscription;
  RepeaterCommandService? _commandService;

+  // Common commands for quick access
  late final List<Map<String, String>> _quickCommands = [
    {'labelKey': 'advertise', 'command': 'advert'},
    {'labelKey': 'getName', 'command': 'get name'},
@@ -67,8 +67,12 @@ class _RepeaterCliScreenState extends State<RepeaterCliScreen> {

  void _setupMessageListener() {
    final connector = Provider.of<MeshCoreConnector>(context, listen: false);
+
+    // Listen for incoming text messages from the repeater
    _frameSubscription = connector.receivedFrames.listen((frame) {
      if (frame.isEmpty) return;
+
+      // Check if it's a text message response
      if (frame[0] == respCodeContactMsgRecv ||
          frame[0] == respCodeContactMsgRecvV3) {
        _handleTextMessageResponse(frame);
@@ -98,7 +102,12 @@ class _RepeaterCliScreenState extends State<RepeaterCliScreen> {
    final parsed = parseContactMessageText(frame);
    if (parsed == null) return;
    if (!_matchesRepeaterPrefix(parsed.senderPrefix)) return;
+
+    // Notify command service of response (for retry handling)
    _commandService?.handleResponse(widget.repeater, parsed.text);
+
+    // Note: The command service will handle the response via the Future
+    // We don't need to add it to history here anymore as _sendCommand will do it
  }

  bool _matchesRepeaterPrefix(Uint8List prefix) {
@@ -122,6 +131,7 @@ class _RepeaterCliScreenState extends State<RepeaterCliScreen> {
      });
    });

+    // Show debug info if requested
    if (showDebug && mounted) {
      final frame = buildSendCliCommandFrame(
        widget.repeater.publicKey,
@@ -134,6 +144,7 @@ class _RepeaterCliScreenState extends State<RepeaterCliScreen> {
      );
    }

+    // Send CLI command to repeater with retry
    try {
      if (_commandService != null) {
        final connector = Provider.of<MeshCoreConnector>(
@@ -146,6 +157,7 @@ class _RepeaterCliScreenState extends State<RepeaterCliScreen> {
          command,
          retries: 1,
        );
+
        if (mounted) {
          setState(() {
            _commandHistory.add({
@@ -172,6 +184,7 @@ class _RepeaterCliScreenState extends State<RepeaterCliScreen> {
    _historyIndex = -1;
    _commandFocusNode.requestFocus();

+    // Auto-scroll to bottom
    Future.delayed(const Duration(milliseconds: 100), () {
      if (_scrollController.hasClients) {
        _scrollController.animateTo(
@@ -226,6 +239,161 @@ class _RepeaterCliScreenState extends State<RepeaterCliScreen> {
    });
  }

+  @override
+  Widget build(BuildContext context) {
+    final l10n = context.l10n;
+    final connector = context.watch<MeshCoreConnector>();
+    final repeater = _resolveRepeater(connector);
+    final isFloodMode = repeater.pathOverride == -1;
+
+    return Scaffold(
+      appBar: AppBar(
+        title: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Text(l10n.repeater_cliTitle),
+            Text(
+              repeater.name,
+              style: const TextStyle(
+                fontSize: 14,
+                fontWeight: FontWeight.normal,
+              ),
+            ),
+          ],
+        ),
+        centerTitle: false,
+        actions: [
+          PopupMenuButton<String>(
+            icon: Icon(isFloodMode ? Icons.waves : Icons.route),
+            tooltip: l10n.repeater_routingMode,
+            onSelected: (mode) async {
+              if (mode == 'flood') {
+                await connector.setPathOverride(repeater, pathLen: -1);
+              } else {
+                await connector.setPathOverride(repeater, pathLen: null);
+              }
+            },
+            itemBuilder: (context) => [
+              PopupMenuItem(
+                value: 'auto',
+                child: Row(
+                  children: [
+                    Icon(
+                      Icons.auto_mode,
+                      size: 20,
+                      color: !isFloodMode
+                          ? Theme.of(context).primaryColor
+                          : null,
+                    ),
+                    const SizedBox(width: 8),
+                    Text(
+                      l10n.repeater_autoUseSavedPath,
+                      style: TextStyle(
+                        fontWeight: !isFloodMode
+                            ? FontWeight.bold
+                            : FontWeight.normal,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+              PopupMenuItem(
+                value: 'flood',
+                child: Row(
+                  children: [
+                    Icon(
+                      Icons.waves,
+                      size: 20,
+                      color: isFloodMode
+                          ? Theme.of(context).primaryColor
+                          : null,
+                    ),
+                    const SizedBox(width: 8),
+                    Text(
+                      l10n.repeater_forceFloodMode,
+                      style: TextStyle(
+                        fontWeight: isFloodMode
+                            ? FontWeight.bold
+                            : FontWeight.normal,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ],
+          ),
+          IconButton(
+            icon: const Icon(Icons.timeline),
+            tooltip: l10n.repeater_pathManagement,
+            onPressed: () =>
+                PathManagementDialog.show(context, contact: repeater),
+          ),
+          IconButton(
+            icon: const Icon(Icons.bug_report),
+            tooltip: l10n.repeater_debugNextCommand,
+            onPressed: () {
+              // Set a flag or just send next command with debug
+              if (_commandController.text.trim().isNotEmpty) {
+                _sendCommand(showDebug: true);
+              } else {
+                showDismissibleSnackBar(
+                  context,
+                  content: Text(l10n.repeater_enterCommandFirst),
+                );
+              }
+            },
+          ),
+          IconButton(
+            icon: const Icon(Icons.help_outline),
+            tooltip: l10n.repeater_commandHelp,
+            onPressed: () => _showCommandHelp(context),
+          ),
+          IconButton(
+            icon: const Icon(Icons.clear_all),
+            tooltip: l10n.repeater_clearHistory,
+            onPressed: _commandHistory.isEmpty ? null : _clearHistory,
+          ),
+        ],
+      ),
+      body: Column(
+        children: [
+          _buildQuickCommandsBar(),
+          const Divider(height: 1),
+          Expanded(
+            child: _commandHistory.isEmpty
+                ? _buildEmptyState()
+                : _buildCommandHistory(),
+          ),
+          const Divider(height: 1),
+          _buildCommandInput(),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildQuickCommandsBar() {
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 8),
+      child: SingleChildScrollView(
+        scrollDirection: Axis.horizontal,
+        child: Row(
+          children: _quickCommands.map((cmd) {
+            final label = _quickCommandLabel(cmd['labelKey']!);
+            return Padding(
+              padding: const EdgeInsets.only(right: 8),
+              child: ActionChip(
+                label: Text(label),
+                onPressed: () => _useQuickCommand(cmd['command']!),
+                avatar: const Icon(Icons.play_arrow, size: 16),
+              ),
+            );
+          }).toList(),
+        ),
+      ),
+    );
+  }
+
  String _quickCommandLabel(String key) {
    final l10n = context.l10n;
    switch (key) {
@@ -252,234 +420,22 @@ class _RepeaterCliScreenState extends State<RepeaterCliScreen> {
    }
  }

-  @override
-  Widget build(BuildContext context) {
-    final l10n = context.l10n;
-    final scheme = Theme.of(context).colorScheme;
-    final connector = context.watch<MeshCoreConnector>();
-    final repeater = _resolveRepeater(connector);
-    final isFloodMode = repeater.pathOverride == -1;
-
-    return Scaffold(
-      backgroundColor: MeshPalette.bg,
-      appBar: AppBar(
-        backgroundColor: MeshPalette.bg1,
-        title: Text(l10n.repeater_cliTitle),
-        centerTitle: true,
-        actions: [
-          IconButton(
-            icon: Icon(isFloodMode ? Icons.waves : Icons.route),
-            tooltip: l10n.repeater_routingMode,
-            onPressed: () =>
-                ContactRoutingSheet.show(context, contact: repeater),
-          ),
-          IconButton(
-            icon: const Icon(Icons.help_outline),
-            tooltip: l10n.repeater_commandHelp,
-            onPressed: () => _showCommandHelp(context),
-          ),
-          IconButton(
-            icon: const Icon(Icons.clear_all),
-            tooltip: l10n.repeater_clearHistory,
-            onPressed: _commandHistory.isEmpty ? null : _clearHistory,
-          ),
-          PopupMenuButton<String>(
-            icon: const Icon(Icons.more_vert),
-            onSelected: (value) {
-              if (value == 'debug') {
-                if (_commandController.text.trim().isNotEmpty) {
-                  _sendCommand(showDebug: true);
-                } else {
-                  showDismissibleSnackBar(
-                    context,
-                    content: Text(l10n.repeater_enterCommandFirst),
-                  );
-                }
-              }
-            },
-            itemBuilder: (context) => [
-              PopupMenuItem(
-                value: 'debug',
-                child: Row(
-                  children: [
-                    const Icon(Icons.bug_report),
-                    const SizedBox(width: 8),
-                    Text(l10n.repeater_debugNextCommand),
-                  ],
-                ),
-              ),
-            ],
-          ),
-        ],
-      ),
-      body: Column(
-        children: [
-          // Quick commands bar
-          Container(
-            color: MeshPalette.bg1,
-            padding: const EdgeInsets.fromLTRB(8, 6, 8, 6),
-            child: SingleChildScrollView(
-              scrollDirection: Axis.horizontal,
-              child: Row(
-                children: _quickCommands.map((cmd) {
-                  final label = _quickCommandLabel(cmd['labelKey']!);
-                  return Padding(
-                    padding: const EdgeInsets.only(right: 6),
-                    child: ActionChip(
-                      label: Text(
-                        label,
-                        style: MeshTheme.mono(
-                          fontSize: 11,
-                          fontWeight: FontWeight.w600,
-                          color: MeshPalette.blue,
-                        ),
-                      ),
-                      backgroundColor: MeshPalette.blueBg,
-                      side: const BorderSide(color: MeshPalette.blueLine),
-                      visualDensity: VisualDensity.compact,
-                      onPressed: () => _useQuickCommand(cmd['command']!),
-                    ),
-                  );
-                }).toList(),
-              ),
-            ),
-          ),
-          Divider(height: 1, color: MeshPalette.line),
-
-          // Output area
-          Expanded(
-            child: _commandHistory.isEmpty
-                ? _buildEmptyState()
-                : _buildCommandHistory(),
-          ),
-
-          Divider(height: 1, color: MeshPalette.line),
-
-          // Command input
-          Container(
-            color: MeshPalette.bg1,
-            padding: const EdgeInsets.fromLTRB(8, 8, 8, 8),
-            child: SafeArea(
-              child: Row(
-                children: [
-                  IconButton(
-                    icon: Icon(
-                      Icons.arrow_upward,
-                      size: 18,
-                      color: scheme.onSurfaceVariant,
-                    ),
-                    tooltip: l10n.repeater_previousCommand,
-                    onPressed: () => _navigateHistory(true),
-                    visualDensity: VisualDensity.compact,
-                  ),
-                  IconButton(
-                    icon: Icon(
-                      Icons.arrow_downward,
-                      size: 18,
-                      color: scheme.onSurfaceVariant,
-                    ),
-                    tooltip: l10n.repeater_nextCommand,
-                    onPressed: () => _navigateHistory(false),
-                    visualDensity: VisualDensity.compact,
-                  ),
-                  const SizedBox(width: 4),
-                  Expanded(
-                    child: TextField(
-                      controller: _commandController,
-                      focusNode: _commandFocusNode,
-                      style: MeshTheme.mono(
-                        fontSize: 13,
-                        color: MeshPalette.ink,
-                      ),
-                      decoration: InputDecoration(
-                        hintText: context.l10n.repeater_enterCommandHint,
-                        hintStyle: MeshTheme.mono(
-                          fontSize: 13,
-                          color: MeshPalette.ink4,
-                        ),
-                        prefixText: '> ',
-                        prefixStyle: MeshTheme.mono(
-                          fontSize: 13,
-                          color: MeshPalette.blue,
-                          fontWeight: FontWeight.w700,
-                        ),
-                        filled: true,
-                        fillColor: MeshPalette.bg2,
-                        contentPadding: const EdgeInsets.symmetric(
-                          horizontal: 12,
-                          vertical: 10,
-                        ),
-                        border: OutlineInputBorder(
-                          borderRadius: BorderRadius.circular(MeshRadii.pill),
-                          borderSide: const BorderSide(
-                            color: MeshPalette.line2,
-                          ),
-                        ),
-                        enabledBorder: OutlineInputBorder(
-                          borderRadius: BorderRadius.circular(MeshRadii.pill),
-                          borderSide: const BorderSide(
-                            color: MeshPalette.line2,
-                          ),
-                        ),
-                        focusedBorder: OutlineInputBorder(
-                          borderRadius: BorderRadius.circular(MeshRadii.pill),
-                          borderSide: const BorderSide(
-                            color: MeshPalette.blue,
-                            width: 1.5,
-                          ),
-                        ),
-                      ),
-                      textInputAction: TextInputAction.send,
-                      onSubmitted: (_) => _sendCommand(),
-                    ),
-                  ),
-                  const SizedBox(width: 6),
-                  Material(
-                    color: MeshPalette.blue.withValues(alpha: 0.15),
-                    shape: const CircleBorder(
-                      side: BorderSide(color: MeshPalette.blueLine),
-                    ),
-                    child: InkWell(
-                      customBorder: const CircleBorder(),
-                      onTap: () {
-                        HapticFeedback.lightImpact();
-                        _sendCommand();
-                      },
-                      child: const Padding(
-                        padding: EdgeInsets.all(10),
-                        child: Icon(
-                          Icons.send,
-                          size: 18,
-                          color: MeshPalette.blue,
-                        ),
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
  Widget _buildEmptyState() {
    final l10n = context.l10n;
    return Center(
      child: Column(
        mainAxisAlignment: MainAxisAlignment.center,
        children: [
-          const Icon(Icons.terminal, size: 48, color: MeshPalette.ink4),
-          const SizedBox(height: 12),
+          Icon(Icons.terminal, size: 64, color: Colors.grey[400]),
+          const SizedBox(height: 16),
          Text(
            l10n.repeater_noCommandsSent,
-            style: MeshTheme.mono(fontSize: 13, color: MeshPalette.ink3),
+            style: TextStyle(fontSize: 16, color: Colors.grey[600]),
          ),
-          const SizedBox(height: 4),
+          const SizedBox(height: 8),
          Text(
            l10n.repeater_typeCommandOrUseQuick,
-            style: const TextStyle(fontSize: 12, color: MeshPalette.ink4),
+            style: TextStyle(fontSize: 14, color: Colors.grey[500]),
          ),
        ],
      ),
@@ -489,38 +445,50 @@ class _RepeaterCliScreenState extends State<RepeaterCliScreen> {
  Widget _buildCommandHistory() {
    return ListView.builder(
      controller: _scrollController,
-      padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+      padding: const EdgeInsets.all(16),
      itemCount: _commandHistory.length,
      itemBuilder: (context, index) {
        final entry = _commandHistory[index];
        final isCommand = entry['type'] == 'command';

        return Padding(
-          padding: const EdgeInsets.only(bottom: 2),
+          padding: const EdgeInsets.only(bottom: 12),
          child: Row(
            crossAxisAlignment: CrossAxisAlignment.start,
            children: [
-              // Gutter prefix
-              SizedBox(
-                width: 20,
-                child: Text(
-                  isCommand ? '>' : ' ',
-                  style: MeshTheme.mono(
-                    fontSize: 12,
-                    fontWeight: FontWeight.w700,
-                    color: isCommand ? MeshPalette.blue : MeshPalette.ink3,
+              Container(
+                padding: const EdgeInsets.all(6),
+                decoration: BoxDecoration(
+                  color: isCommand
+                      ? Theme.of(context).colorScheme.primaryContainer
+                      : Theme.of(context).colorScheme.secondaryContainer,
+                  borderRadius: BorderRadius.circular(4),
+                ),
+                child: Icon(
+                  isCommand ? Icons.chevron_right : Icons.arrow_back,
+                  size: 16,
+                  color: isCommand
+                      ? Theme.of(context).colorScheme.onPrimaryContainer
+                      : Theme.of(context).colorScheme.onSecondaryContainer,
                ),
              ),
-              ),
-              const SizedBox(width: 6),
+              const SizedBox(width: 12),
              Expanded(
-                child: SelectableText(
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    SelectableText(
                      entry['text']!,
-                  style: MeshTheme.mono(
-                    fontSize: 12.5,
-                    color: isCommand ? MeshPalette.blue : MeshPalette.ink,
+                      style: TextStyle(
+                        fontFamily: 'monospace',
+                        fontSize: 13,
+                        color: isCommand
+                            ? Theme.of(context).colorScheme.primary
+                            : Theme.of(context).colorScheme.onSurface,
                      ),
                    ),
+                  ],
+                ),
              ),
            ],
          ),
@@ -529,6 +497,54 @@ class _RepeaterCliScreenState extends State<RepeaterCliScreen> {
    );
  }

+  Widget _buildCommandInput() {
+    final l10n = context.l10n;
+    return Container(
+      padding: const EdgeInsets.all(12),
+      color: Theme.of(context).colorScheme.surface,
+      child: SafeArea(
+        child: Row(
+          children: [
+            IconButton(
+              icon: const Icon(Icons.arrow_upward, size: 20),
+              tooltip: l10n.repeater_previousCommand,
+              onPressed: () => _navigateHistory(true),
+            ),
+            IconButton(
+              icon: const Icon(Icons.arrow_downward, size: 20),
+              tooltip: l10n.repeater_nextCommand,
+              onPressed: () => _navigateHistory(false),
+            ),
+            const SizedBox(width: 8),
+            Expanded(
+              child: TextField(
+                controller: _commandController,
+                focusNode: _commandFocusNode,
+                decoration: InputDecoration(
+                  hintText: l10n.repeater_enterCommandHint,
+                  border: const OutlineInputBorder(),
+                  contentPadding: const EdgeInsets.symmetric(
+                    horizontal: 16,
+                    vertical: 12,
+                  ),
+                  prefixText: '> ',
+                ),
+                style: const TextStyle(fontFamily: 'monospace'),
+                textInputAction: TextInputAction.send,
+                onSubmitted: (_) => _sendCommand(),
+              ),
+            ),
+            const SizedBox(width: 8),
+            IconButton.filled(
+              icon: const Icon(Icons.send),
+              onPressed: _sendCommand,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
  void _applyHelpCommand(String command) {
    _commandController.text = command;
    _commandController.selection = TextSelection.fromPosition(
@@ -1149,20 +1165,16 @@ class _RepeaterCliScreenState extends State<RepeaterCliScreen> {
    List<_CommandHelpEntry> commands, {
    String? note,
  }) {
-    final scheme = Theme.of(context).colorScheme;
    return Column(
      crossAxisAlignment: CrossAxisAlignment.start,
      children: [
        Text(
          title,
-          style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 15),
+          style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 16),
        ),
        if (note != null) ...[
-          const SizedBox(height: 4),
-          Text(
-            note,
-            style: TextStyle(fontSize: 11, color: scheme.onSurfaceVariant),
-          ),
+          const SizedBox(height: 6),
+          Text(note, style: const TextStyle(fontSize: 12)),
        ],
        const SizedBox(height: 8),
        ...commands.map((entry) => _buildHelpCommandCard(context, entry)),
@@ -1171,35 +1183,39 @@ class _RepeaterCliScreenState extends State<RepeaterCliScreen> {
  }

  Widget _buildHelpCommandCard(BuildContext context, _CommandHelpEntry entry) {
-    final scheme = Theme.of(context).colorScheme;
+    final colorScheme = Theme.of(context).colorScheme;
    return Card(
      elevation: 0,
-      margin: const EdgeInsets.only(bottom: 6),
-      color: scheme.surfaceContainerHighest,
+      margin: const EdgeInsets.only(bottom: 8),
+      color: colorScheme.surfaceContainerHighest,
      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(MeshRadii.sm),
-        side: BorderSide(color: scheme.outlineVariant),
+        borderRadius: BorderRadius.circular(8),
+        side: BorderSide(color: colorScheme.outlineVariant),
      ),
      child: InkWell(
-        borderRadius: BorderRadius.circular(MeshRadii.sm),
+        borderRadius: BorderRadius.circular(8),
        onTap: () => _applyHelpCommand(entry.command),
        child: Padding(
-          padding: const EdgeInsets.all(10),
+          padding: const EdgeInsets.all(12),
          child: Column(
            crossAxisAlignment: CrossAxisAlignment.start,
            children: [
              Text(
                entry.command,
-                style: MeshTheme.mono(
-                  fontSize: 12,
-                  fontWeight: FontWeight.w600,
-                  color: MeshPalette.blue,
+                style: TextStyle(
+                  fontFamily: 'monospace',
+                  fontSize: 13,
+                  fontWeight: FontWeight.bold,
+                  color: colorScheme.onSurfaceVariant,
                ),
              ),
-              const SizedBox(height: 4),
+              const SizedBox(height: 6),
              Text(
                entry.description,
-                style: TextStyle(fontSize: 12, color: scheme.onSurfaceVariant),
+                style: TextStyle(
+                  fontSize: 12,
+                  color: colorScheme.onSurfaceVariant,
+                ),
              ),
            ],
          ),
@@ -1212,5 +1228,6 @@ class _RepeaterCliScreenState extends State<RepeaterCliScreen> {
 class _CommandHelpEntry {
  final String command;
  final String description;
+
  const _CommandHelpEntry({required this.command, required this.description});
 }
@@ -1,13 +1,10 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:meshcore_open/connector/meshcore_protocol.dart';
 import 'package:provider/provider.dart';
 import '../l10n/l10n.dart';
 import '../models/contact.dart';
 import '../l10n/contact_localization.dart';
 import '../services/app_settings_service.dart';
-import '../theme/mesh_theme.dart';
-import '../widgets/mesh_ui.dart';
 import 'repeater_status_screen.dart';
 import 'repeater_cli_screen.dart';
 import 'repeater_settings_screen.dart';
@@ -29,116 +26,132 @@ class RepeaterHubScreen extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    final l10n = context.l10n;
-    final scheme = Theme.of(context).colorScheme;
    final settingsService = context.watch<AppSettingsService>();
    final chemistry = settingsService.batteryChemistryForRepeater(
      repeater.publicKeyHex,
    );
-
    return Scaffold(
      appBar: AppBar(
-        title: Text(
+        title: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            if (isAdmin)
+              Text(
                repeater.type == advTypeRepeater
-              ? (isAdmin ? l10n.repeater_management : l10n.repeater_guest)
-              : (isAdmin ? l10n.room_management : l10n.room_guest),
+                    ? l10n.repeater_management
+                    : l10n.room_management,
              ),
-        centerTitle: true,
+            if (!isAdmin)
+              Text(
+                repeater.type == advTypeRepeater
+                    ? l10n.repeater_guest
+                    : l10n.room_guest,
+              ),
+            Text(
+              repeater.name,
+              style: const TextStyle(
+                fontSize: 14,
+                fontWeight: FontWeight.normal,
+              ),
+            ),
+          ],
+        ),
+        centerTitle: false,
      ),
      body: SafeArea(
        top: false,
        child: ListView(
-          padding: const EdgeInsets.only(bottom: 24),
+          padding: const EdgeInsets.all(16),
          children: [
-            // ── Identity card ─────────────────────────────────────────────
-            Padding(
-              padding: const EdgeInsets.fromLTRB(16, 20, 16, 4),
-              child: MeshCard(
-                margin: EdgeInsets.zero,
-                padding: const EdgeInsets.all(20),
-                child: Row(
-                  children: [
-                    AvatarCircle(
-                      name: repeater.name,
-                      size: 52,
-                      color: MeshPalette.warn,
-                      icon: Icons.cell_tower,
-                    ),
-                    const SizedBox(width: 16),
-                    Expanded(
+            // Repeater info card
+            Card(
+              child: Padding(
+                padding: const EdgeInsets.all(16),
                child: Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
                  children: [
+                    CircleAvatar(
+                      radius: 40,
+                      backgroundColor: Colors.orange,
+                      child: const Icon(
+                        Icons.cell_tower,
+                        size: 40,
+                        color: Colors.white,
+                      ),
+                    ),
+                    const SizedBox(height: 16),
                    Text(
                      repeater.name,
-                            style: Theme.of(context).textTheme.titleMedium
-                                ?.copyWith(fontWeight: FontWeight.w700),
-                            maxLines: 1,
-                            overflow: TextOverflow.ellipsis,
+                      style: const TextStyle(
+                        fontSize: 24,
+                        fontWeight: FontWeight.bold,
                      ),
-                          const SizedBox(height: 2),
+                    ),
+                    const SizedBox(height: 8),
                    Text(
                      repeater.shortPubKeyHex,
-                            style: MeshTheme.mono(
-                              fontSize: 11,
-                              color: scheme.onSurfaceVariant,
+                      style: TextStyle(fontSize: 14, color: Colors.grey[600]),
                    ),
-                          ),
-                          const SizedBox(height: 4),
+                    const SizedBox(height: 8),
                    Text(
-                            repeater.pathLabel(l10n),
-                            style: Theme.of(context).textTheme.bodySmall
-                                ?.copyWith(color: scheme.onSurfaceVariant),
+                      repeater.pathLabel(context.l10n),
+                      style: TextStyle(fontSize: 14, color: Colors.grey[600]),
                    ),
                    if (repeater.hasLocation) ...[
-                            const SizedBox(height: 2),
+                      const SizedBox(height: 4),
                      Row(
+                        mainAxisAlignment: MainAxisAlignment.center,
                        children: [
                          Icon(
                            Icons.location_on,
-                                  size: 12,
-                                  color: scheme.onSurfaceVariant,
+                            size: 14,
+                            color: Colors.grey[600],
                          ),
-                                const SizedBox(width: 3),
+                          const SizedBox(width: 4),
+                          Text(
+                            '${repeater.latitude?.toStringAsFixed(4)}, ${repeater.longitude?.toStringAsFixed(4)}',
+                            style: TextStyle(
+                              fontSize: 12,
+                              color: Colors.grey[600],
+                            ),
+                          ),
+                        ],
+                      ),
+                    ],
+                  ],
+                ),
+              ),
+            ),
+            const SizedBox(height: 24),
+            if (isAdmin)
+              Card(
+                child: Padding(
+                  padding: const EdgeInsets.fromLTRB(16, 16, 16, 12),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Row(
+                        children: [
+                          const Icon(Icons.battery_full),
+                          const SizedBox(width: 10),
                          Expanded(
                            child: Text(
-                                    '${repeater.latitude?.toStringAsFixed(4)}, '
-                                    '${repeater.longitude?.toStringAsFixed(4)}',
-                                    style: MeshTheme.mono(
-                                      fontSize: 10,
-                                      color: scheme.onSurfaceVariant,
+                              l10n.appSettings_batteryChemistry,
+                              style: const TextStyle(
+                                fontSize: 16,
+                                fontWeight: FontWeight.w600,
                              ),
-                                    overflow: TextOverflow.ellipsis,
                            ),
                          ),
                        ],
                      ),
-                          ],
-                        ],
-                      ),
-                    ),
-                    StatusChip(
-                      label: isAdmin ? 'ADMIN' : 'GUEST',
-                      color: isAdmin
-                          ? MeshPalette.blue
-                          : scheme.onSurfaceVariant,
-                    ),
-                  ],
-                ),
-              ),
-            ),
-
-            // ── Battery chemistry (admin only) ─────────────────────────────
-            if (isAdmin) ...[
-              SectionHeader(l10n.appSettings_batteryChemistry),
-              MeshCard(
-                margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
-                padding: const EdgeInsets.fromLTRB(14, 10, 14, 14),
-                child: DropdownButtonFormField<String>(
+                      const SizedBox(height: 12),
+                      DropdownButtonFormField<String>(
                        initialValue: chemistry,
                        isExpanded: true,
-                  decoration: InputDecoration(
-                    prefixIcon: const Icon(Icons.battery_full, size: 18),
-                    labelText: l10n.appSettings_batteryChemistry,
+                        decoration: const InputDecoration(
+                          border: UnderlineInputBorder(),
+                          isDense: true,
                        ),
                        onChanged: (value) {
                          if (value == null) return;
@@ -162,24 +175,26 @@ class RepeaterHubScreen extends StatelessWidget {
                          ),
                        ],
                      ),
-              ),
                    ],
-
-            // ── Tools ──────────────────────────────────────────────────────
-            SectionHeader(
+                  ),
+                ),
+              ),
+            const SizedBox(height: 24),
+            Text(
              isAdmin
                  ? l10n.repeater_managementTools
                  : l10n.repeater_guestTools,
+              style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
            ),
-
-            _HubActionTile(
-              index: 0,
+            const SizedBox(height: 16),
+            // Status button
+            _buildManagementCard(
+              context,
              icon: Icons.analytics,
              title: l10n.repeater_status,
              subtitle: l10n.repeater_statusSubtitle,
-              accentColor: MeshPalette.blue,
+              color: Colors.blue,
              onTap: () {
-                HapticFeedback.selectionClick();
                Navigator.push(
                  context,
                  MaterialPageRoute(
@@ -191,15 +206,15 @@ class RepeaterHubScreen extends StatelessWidget {
                );
              },
            ),
-
-            _HubActionTile(
-              index: 1,
+            const SizedBox(height: 16),
+            // Telemetry button
+            _buildManagementCard(
+              context,
              icon: Icons.bar_chart_sharp,
              title: l10n.repeater_telemetry,
              subtitle: l10n.repeater_telemetrySubtitle,
-              accentColor: MeshPalette.magenta,
+              color: Colors.teal,
              onTap: () {
-                HapticFeedback.selectionClick();
                Navigator.push(
                  context,
                  MaterialPageRoute(
@@ -208,34 +223,16 @@ class RepeaterHubScreen extends StatelessWidget {
                );
              },
            ),
-
-            _HubActionTile(
-              index: 2,
-              icon: Icons.group,
-              title: l10n.repeater_neighbors,
-              subtitle: l10n.repeater_neighborsSubtitle,
-              accentColor: MeshPalette.signal,
-              onTap: () {
-                HapticFeedback.selectionClick();
-                Navigator.push(
+            if (isAdmin) const SizedBox(height: 12),
+            // CLI button
+            if (isAdmin)
+              _buildManagementCard(
                context,
-                  MaterialPageRoute(
-                    builder: (context) =>
-                        NeighborsScreen(repeater: repeater, password: password),
-                  ),
-                );
-              },
-            ),
-
-            if (isAdmin) ...[
-              _HubActionTile(
-                index: 3,
                icon: Icons.terminal,
                title: l10n.repeater_cli,
                subtitle: l10n.repeater_cliSubtitle,
-                accentColor: MeshPalette.warn,
+                color: Colors.green,
                onTap: () {
-                  HapticFeedback.selectionClick();
                  Navigator.push(
                    context,
                    MaterialPageRoute(
@@ -247,14 +244,34 @@ class RepeaterHubScreen extends StatelessWidget {
                  );
                },
              ),
-              _HubActionTile(
-                index: 4,
+            const SizedBox(height: 12),
+            // Neighbors button
+            _buildManagementCard(
+              context,
+              icon: Icons.group,
+              title: l10n.repeater_neighbors,
+              subtitle: l10n.repeater_neighborsSubtitle,
+              color: Colors.orange,
+              onTap: () {
+                Navigator.push(
+                  context,
+                  MaterialPageRoute(
+                    builder: (context) =>
+                        NeighborsScreen(repeater: repeater, password: password),
+                  ),
+                );
+              },
+            ),
+            if (isAdmin) const SizedBox(height: 12),
+            // Settings button
+            if (isAdmin)
+              _buildManagementCard(
+                context,
                icon: Icons.settings,
                title: l10n.repeater_settings,
                subtitle: l10n.repeater_settingsSubtitle,
-                accentColor: MeshPalette.alert,
+                color: Colors.deepOrange,
                onTap: () {
-                  HapticFeedback.selectionClick();
                  Navigator.push(
                    context,
                    MaterialPageRoute(
@@ -267,51 +284,37 @@ class RepeaterHubScreen extends StatelessWidget {
                },
              ),
          ],
-          ],
        ),
      ),
    );
  }
-}

-class _HubActionTile extends StatelessWidget {
-  final int index;
-  final IconData icon;
-  final String title;
-  final String subtitle;
-  final Color accentColor;
-  final VoidCallback onTap;
-
-  const _HubActionTile({
-    required this.index,
-    required this.icon,
-    required this.title,
-    required this.subtitle,
-    required this.accentColor,
-    required this.onTap,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final scheme = Theme.of(context).colorScheme;
-    return ListEntrance(
-      index: index,
-      child: MeshCard(
+  Widget _buildManagementCard(
+    BuildContext context, {
+    required IconData icon,
+    required String title,
+    required String subtitle,
+    required Color color,
+    required VoidCallback onTap,
+  }) {
+    return Card(
+      elevation: 2,
+      child: InkWell(
        onTap: onTap,
+        borderRadius: BorderRadius.circular(12),
+        child: Padding(
+          padding: const EdgeInsets.all(16),
          child: Row(
            children: [
              Container(
-              width: 44,
-              height: 44,
+                padding: const EdgeInsets.all(12),
                decoration: BoxDecoration(
-                color: accentColor.withValues(alpha: 0.12),
-                borderRadius: BorderRadius.circular(MeshRadii.md),
-                border: Border.all(color: accentColor.withValues(alpha: 0.3)),
+                  color: color.withValues(alpha: 0.1),
+                  borderRadius: BorderRadius.circular(12),
                ),
-              alignment: Alignment.center,
-              child: Icon(icon, size: 22, color: accentColor),
+                child: Icon(icon, color: color, size: 32),
              ),
-            const SizedBox(width: 14),
+              const SizedBox(width: 16),
              Expanded(
                child: Column(
                  crossAxisAlignment: CrossAxisAlignment.start,
@@ -319,25 +322,23 @@ class _HubActionTile extends StatelessWidget {
                    Text(
                      title,
                      style: const TextStyle(
-                      fontWeight: FontWeight.w600,
-                      fontSize: 15,
+                        fontSize: 18,
+                        fontWeight: FontWeight.bold,
                      ),
                    ),
-                  const SizedBox(height: 2),
+                    const SizedBox(height: 4),
                    Text(
                      subtitle,
-                    style: TextStyle(
-                      fontSize: 12.5,
-                      color: scheme.onSurfaceVariant,
-                    ),
+                      style: TextStyle(fontSize: 14, color: Colors.grey[600]),
                    ),
                  ],
                ),
              ),
-            Icon(Icons.chevron_right, color: scheme.onSurfaceVariant, size: 20),
+              Icon(Icons.chevron_right, color: Colors.grey[400]),
            ],
          ),
        ),
+      ),
    );
  }
 }
@@ -2,7 +2,6 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:typed_data';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 import '../l10n/l10n.dart';
 import '../models/contact.dart';
@@ -11,10 +10,8 @@ import '../connector/meshcore_connector.dart';
 import '../connector/meshcore_protocol.dart';
 import '../services/app_settings_service.dart';
 import '../services/repeater_command_service.dart';
-import '../theme/mesh_theme.dart';
 import '../utils/battery_utils.dart';
-import '../widgets/mesh_ui.dart';
-import '../widgets/routing_sheet.dart';
+import '../widgets/path_management_dialog.dart';
 import '../helpers/snack_bar_builder.dart';

 class RepeaterStatusScreen extends StatefulWidget {
@@ -67,6 +64,8 @@ class _RepeaterStatusScreenState extends State<RepeaterStatusScreen> {
    final connector = Provider.of<MeshCoreConnector>(context, listen: false);
    _commandService = RepeaterCommandService(connector);
    _setupMessageListener();
+    // Defer until after the first frame so any notifyListeners() triggered
+    // during preparePathForContactSend doesn't fire mid-build.
    WidgetsBinding.instance.addPostFrameCallback((_) {
      if (mounted) _loadStatus();
    });
@@ -82,8 +81,12 @@ class _RepeaterStatusScreenState extends State<RepeaterStatusScreen> {

  void _setupMessageListener() {
    final connector = Provider.of<MeshCoreConnector>(context, listen: false);
+
+    // Listen for incoming text messages from the repeater
    _frameSubscription = connector.receivedFrames.listen((frame) {
      if (frame.isEmpty) return;
+
+      // Check if it's a text message response
      if (frame[0] == pushCodeStatusResponse) {
        _handleStatusResponse(frame);
      } else if (frame[0] == respCodeContactMsgRecv ||
@@ -115,7 +118,11 @@ class _RepeaterStatusScreenState extends State<RepeaterStatusScreen> {
    final parsed = parseContactMessageText(frame);
    if (parsed == null) return;
    if (!_matchesRepeaterPrefix(parsed.senderPrefix)) return;
+
+    // Notify command service of response (for retry handling)
    _commandService?.handleResponse(widget.repeater, parsed.text);
+
+    // Parse status responses
    _parseStatusResponse(parsed.text);
    _recordStatusResult(true);
  }
@@ -124,6 +131,7 @@ class _RepeaterStatusScreenState extends State<RepeaterStatusScreen> {
    if (frame.length < 8) return;
    final prefix = frame.sublist(2, 8);
    if (!_matchesRepeaterPrefix(prefix)) return;
+
    if (frame.length < _statusResponseBytes) return;

    final data = ByteData.sublistView(
@@ -246,9 +254,14 @@ class _RepeaterStatusScreenState extends State<RepeaterStatusScreen> {
          _dupFlood = _asInt(data['dup_flood']);
          _dupDirect = _asInt(data['dup_direct']);
        }
-      } catch (_) {}
+      } catch (_) {
+        // Ignore parse failures for non-JSON responses.
+      }
+    }
+
+    if (mounted) {
+      setState(() {});
    }
-    if (mounted) setState(() {});
  }

  Future<void> _loadStatus() async {
@@ -289,7 +302,9 @@ class _RepeaterStatusScreenState extends State<RepeaterStatusScreen> {
      var messageBytes = frame.length >= _statusResponseBytes
          ? frame.length
          : _statusResponseBytes;
-      if (messageBytes < maxFrameSize) messageBytes = maxFrameSize;
+      if (messageBytes < maxFrameSize) {
+        messageBytes = maxFrameSize;
+      }
      final timeoutMs = connector.calculateTimeout(
        pathLength: pathLengthValue,
        messageBytes: messageBytes,
@@ -297,21 +312,26 @@ class _RepeaterStatusScreenState extends State<RepeaterStatusScreen> {
      _statusTimeout?.cancel();
      _statusTimeout = Timer(Duration(milliseconds: timeoutMs), () {
        if (!mounted) return;
-        setState(() => _isLoading = false);
+        setState(() {
+          _isLoading = false;
+        });
        showDismissibleSnackBar(
          context,
          content: Text(context.l10n.repeater_statusRequestTimeout),
-          backgroundColor: Theme.of(context).colorScheme.error,
+          backgroundColor: Colors.red,
        );
        _recordStatusResult(false);
      });
    } catch (e) {
      if (mounted) {
-        setState(() => _isLoading = false);
+        setState(() {
+          _isLoading = false;
+        });
+
        showDismissibleSnackBar(
          context,
          content: Text(context.l10n.repeater_errorLoadingStatus(e.toString())),
-          backgroundColor: Theme.of(context).colorScheme.error,
+          backgroundColor: Colors.red,
        );
      }
      _recordStatusResult(false);
@@ -327,6 +347,268 @@ class _RepeaterStatusScreenState extends State<RepeaterStatusScreen> {
    _pendingStatusSelection = null;
  }

+  @override
+  Widget build(BuildContext context) {
+    final l10n = context.l10n;
+    final connector = context.watch<MeshCoreConnector>();
+    final repeater = _resolveRepeater(connector);
+    final isFloodMode = repeater.pathOverride == -1;
+
+    return Scaffold(
+      appBar: AppBar(
+        title: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Text(l10n.repeater_statusTitle),
+            Text(
+              repeater.name,
+              style: const TextStyle(
+                fontSize: 14,
+                fontWeight: FontWeight.normal,
+              ),
+            ),
+          ],
+        ),
+        centerTitle: false,
+        actions: [
+          PopupMenuButton<String>(
+            icon: Icon(isFloodMode ? Icons.waves : Icons.route),
+            tooltip: l10n.repeater_routingMode,
+            onSelected: (mode) async {
+              if (mode == 'flood') {
+                await connector.setPathOverride(repeater, pathLen: -1);
+              } else {
+                await connector.setPathOverride(repeater, pathLen: null);
+              }
+            },
+            itemBuilder: (context) => [
+              PopupMenuItem(
+                value: 'auto',
+                child: Row(
+                  children: [
+                    Icon(
+                      Icons.auto_mode,
+                      size: 20,
+                      color: !isFloodMode
+                          ? Theme.of(context).primaryColor
+                          : null,
+                    ),
+                    const SizedBox(width: 8),
+                    Text(
+                      l10n.repeater_autoUseSavedPath,
+                      style: TextStyle(
+                        fontWeight: !isFloodMode
+                            ? FontWeight.bold
+                            : FontWeight.normal,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+              PopupMenuItem(
+                value: 'flood',
+                child: Row(
+                  children: [
+                    Icon(
+                      Icons.waves,
+                      size: 20,
+                      color: isFloodMode
+                          ? Theme.of(context).primaryColor
+                          : null,
+                    ),
+                    const SizedBox(width: 8),
+                    Text(
+                      l10n.repeater_forceFloodMode,
+                      style: TextStyle(
+                        fontWeight: isFloodMode
+                            ? FontWeight.bold
+                            : FontWeight.normal,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ],
+          ),
+          IconButton(
+            icon: const Icon(Icons.timeline),
+            tooltip: l10n.repeater_pathManagement,
+            onPressed: () =>
+                PathManagementDialog.show(context, contact: repeater),
+          ),
+          IconButton(
+            icon: _isLoading
+                ? const SizedBox(
+                    width: 20,
+                    height: 20,
+                    child: CircularProgressIndicator(strokeWidth: 2),
+                  )
+                : const Icon(Icons.refresh),
+            onPressed: _isLoading ? null : _loadStatus,
+            tooltip: l10n.repeater_refresh,
+          ),
+        ],
+      ),
+      body: SafeArea(
+        top: false,
+        child: RefreshIndicator(
+          onRefresh: _loadStatus,
+          child: ListView(
+            padding: const EdgeInsets.all(16),
+            children: [
+              _buildSystemInfoCard(),
+              const SizedBox(height: 16),
+              _buildRadioStatsCard(),
+              const SizedBox(height: 16),
+              _buildPacketStatsCard(),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildSystemInfoCard() {
+    final l10n = context.l10n;
+    return Card(
+      child: Padding(
+        padding: const EdgeInsets.all(16),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                Icon(
+                  Icons.info_outline,
+                  color: Theme.of(context).textTheme.headlineSmall?.color,
+                ),
+                const SizedBox(width: 8),
+                Text(
+                  l10n.repeater_systemInformation,
+                  style: const TextStyle(
+                    fontSize: 18,
+                    fontWeight: FontWeight.bold,
+                  ),
+                ),
+              ],
+            ),
+            const Divider(),
+            _buildInfoRow(l10n.repeater_battery, _batteryText()),
+            _buildInfoRow(l10n.repeater_clockAtLogin, _clockText()),
+            _buildInfoRow(l10n.repeater_uptime, _formatDuration(_uptimeSecs)),
+            _buildInfoRow(l10n.repeater_queueLength, _formatValue(_queueLen)),
+            _buildInfoRow(l10n.repeater_debugFlags, _formatValue(_debugFlags)),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildRadioStatsCard() {
+    final l10n = context.l10n;
+    return Card(
+      child: Padding(
+        padding: const EdgeInsets.all(16),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                Icon(
+                  Icons.radio,
+                  color: Theme.of(context).textTheme.headlineSmall?.color,
+                ),
+                const SizedBox(width: 8),
+                Text(
+                  l10n.repeater_radioStatistics,
+                  style: const TextStyle(
+                    fontSize: 18,
+                    fontWeight: FontWeight.bold,
+                  ),
+                ),
+              ],
+            ),
+            const Divider(),
+            _buildInfoRow(
+              l10n.repeater_lastRssi,
+              _formatValue(_lastRssi, suffix: ' dB'),
+            ),
+            _buildInfoRow(l10n.repeater_lastSnr, _formatSnr(_lastSnr)),
+            _buildInfoRow(
+              l10n.repeater_noiseFloor,
+              _formatValue(_noiseFloor, suffix: ' dB'),
+            ),
+            _buildInfoRow(l10n.repeater_txAirtime, _formatDuration(_txAirSecs)),
+            _buildInfoRow(l10n.repeater_rxAirtime, _formatDuration(_rxAirSecs)),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildPacketStatsCard() {
+    final l10n = context.l10n;
+    return Card(
+      child: Padding(
+        padding: const EdgeInsets.all(16),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                Icon(
+                  Icons.analytics,
+                  color: Theme.of(context).textTheme.headlineSmall?.color,
+                ),
+                const SizedBox(width: 8),
+                Text(
+                  l10n.repeater_packetStatistics,
+                  style: const TextStyle(
+                    fontSize: 18,
+                    fontWeight: FontWeight.bold,
+                  ),
+                ),
+              ],
+            ),
+            const Divider(),
+            _buildInfoRow(l10n.repeater_sent, _packetTxText()),
+            _buildInfoRow(l10n.repeater_received, _packetRxText()),
+            _buildInfoRow(l10n.repeater_duplicates, _duplicateText()),
+            _buildInfoRow(l10n.repeater_chanUtil, _chanUtilText()),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildInfoRow(String label, String value) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 6),
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          SizedBox(
+            width: 130,
+            child: Text(
+              label,
+              style: TextStyle(
+                color: Colors.grey[600],
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ),
+          Expanded(
+            child: Text(
+              value,
+              style: const TextStyle(fontWeight: FontWeight.w400),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
  int? _asInt(dynamic value) {
    if (value == null) return null;
    if (value is int) return value;
@@ -433,222 +715,4 @@ class _RepeaterStatusScreenState extends State<RepeaterStatusScreen> {
    if (snr == null) return '—';
    return snr.toStringAsFixed(2);
  }
-
-  @override
-  Widget build(BuildContext context) {
-    final l10n = context.l10n;
-    final connector = context.watch<MeshCoreConnector>();
-    final repeater = _resolveRepeater(connector);
-    final isFloodMode = repeater.pathOverride == -1;
-
-    return Scaffold(
-      appBar: AppBar(
-        title: Text(l10n.repeater_statusTitle),
-        centerTitle: true,
-        actions: [
-          IconButton(
-            icon: Icon(isFloodMode ? Icons.waves : Icons.route),
-            tooltip: l10n.repeater_routingMode,
-            onPressed: () =>
-                ContactRoutingSheet.show(context, contact: repeater),
-          ),
-          IconButton(
-            icon: _isLoading
-                ? const SizedBox(
-                    width: 20,
-                    height: 20,
-                    child: CircularProgressIndicator(strokeWidth: 2),
-                  )
-                : const Icon(Icons.refresh),
-            onPressed: _isLoading ? null : _loadStatus,
-            tooltip: l10n.repeater_refresh,
-          ),
-        ],
-      ),
-      body: SafeArea(
-        top: false,
-        child: RefreshIndicator(
-          onRefresh: _loadStatus,
-          child: _isLoading && _batteryMv == null
-              ? const Center(child: CircularProgressIndicator())
-              : _buildBody(l10n, repeater.name),
-        ),
-      ),
-    );
-  }
-
-  Widget _buildBody(dynamic l10n, String name) {
-    final scheme = Theme.of(context).colorScheme;
-    return ListView(
-      padding: const EdgeInsets.only(bottom: 24),
-      children: [
-        // ── System ─────────────────────────────────────────────────────────
-        SectionHeader(l10n.repeater_systemInformation),
-        Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 16),
-          child: _buildStatGrid([
-            _StatItem(
-              icon: Icons.battery_std,
-              label: l10n.repeater_battery,
-              value: _batteryText(),
-              color: _batteryColor(),
-            ),
-            _StatItem(
-              icon: Icons.timer_outlined,
-              label: l10n.repeater_uptime,
-              value: _formatDuration(_uptimeSecs),
-              color: MeshPalette.blue,
-            ),
-            _StatItem(
-              icon: Icons.schedule,
-              label: l10n.repeater_clockAtLogin,
-              value: _clockText(),
-              color: scheme.onSurfaceVariant,
-            ),
-            _StatItem(
-              icon: Icons.inbox,
-              label: l10n.repeater_queueLength,
-              value: _formatValue(_queueLen),
-              color: scheme.onSurfaceVariant,
-            ),
-            _StatItem(
-              icon: Icons.bug_report_outlined,
-              label: l10n.repeater_debugFlags,
-              value: _formatValue(_debugFlags),
-              color: _debugFlags != null && _debugFlags! > 0
-                  ? MeshPalette.warn
-                  : scheme.onSurfaceVariant,
-            ),
-          ]),
-        ),
-
-        // ── Radio ──────────────────────────────────────────────────────────
-        SectionHeader(l10n.repeater_radioStatistics),
-        Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 16),
-          child: _buildStatGrid([
-            _StatItem(
-              icon: Icons.signal_cellular_alt,
-              label: l10n.repeater_lastRssi,
-              value: _formatValue(_lastRssi, suffix: ' dB'),
-              color: MeshPalette.blue,
-            ),
-            _StatItem(
-              icon: Icons.waves,
-              label: l10n.repeater_lastSnr,
-              value: _formatSnr(_lastSnr),
-              color: MeshTheme.snrColor(_lastSnr, blocked: false),
-            ),
-            _StatItem(
-              icon: Icons.noise_control_off,
-              label: l10n.repeater_noiseFloor,
-              value: _formatValue(_noiseFloor, suffix: ' dB'),
-              color: scheme.onSurfaceVariant,
-            ),
-            _StatItem(
-              icon: Icons.upload,
-              label: l10n.repeater_txAirtime,
-              value: _formatDuration(_txAirSecs),
-              color: MeshPalette.warn,
-            ),
-            _StatItem(
-              icon: Icons.download,
-              label: l10n.repeater_rxAirtime,
-              value: _formatDuration(_rxAirSecs),
-              color: MeshPalette.signal,
-            ),
-          ]),
-        ),
-
-        // ── Packets ────────────────────────────────────────────────────────
-        SectionHeader(l10n.repeater_packetStatistics),
-        Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 16),
-          child: _buildStatGrid([
-            _StatItem(
-              icon: Icons.send,
-              label: l10n.repeater_sent,
-              value: _packetTxText(),
-              color: MeshPalette.blue,
-            ),
-            _StatItem(
-              icon: Icons.call_received,
-              label: l10n.repeater_received,
-              value: _packetRxText(),
-              color: MeshPalette.signal,
-            ),
-            _StatItem(
-              icon: Icons.content_copy,
-              label: l10n.repeater_duplicates,
-              value: _duplicateText(),
-              color: scheme.onSurfaceVariant,
-            ),
-            _StatItem(
-              icon: Icons.percent,
-              label: l10n.repeater_chanUtil,
-              value: _chanUtilText(),
-              color: _chanUtil != null && _chanUtil! > 80
-                  ? MeshPalette.alert
-                  : _chanUtil != null && _chanUtil! > 50
-                  ? MeshPalette.warn
-                  : MeshPalette.signal,
-            ),
-          ]),
-        ),
-        const SizedBox(height: 8),
-      ],
-    );
-  }
-
-  Color _batteryColor() {
-    final connector = context.watch<MeshCoreConnector>();
-    final batteryMv =
-        connector.getRepeaterBatteryMillivolts(widget.repeater.publicKeyHex) ??
-        _batteryMv;
-    if (batteryMv == null) {
-      return Theme.of(context).colorScheme.onSurfaceVariant;
-    }
-    final percent = estimateBatteryPercentFromMillivolts(
-      batteryMv,
-      _batteryChemistry(),
-    );
-    if (percent < 20) return MeshPalette.alert;
-    if (percent < 40) return MeshPalette.warn;
-    return MeshPalette.signal;
-  }
-
-  Widget _buildStatGrid(List<_StatItem> items) {
-    return GridView.count(
-      crossAxisCount: 2,
-      shrinkWrap: true,
-      physics: const NeverScrollableScrollPhysics(),
-      mainAxisSpacing: 8,
-      crossAxisSpacing: 8,
-      childAspectRatio: 2.2,
-      children: items
-          .map(
-            (item) => StatTile(
-              icon: item.icon,
-              label: item.label,
-              value: item.value,
-              color: item.color,
-            ),
-          )
-          .toList(),
-    );
-  }
-}
-
-class _StatItem {
-  final IconData icon;
-  final String label;
-  final String value;
-  final Color color;
-
-  const _StatItem({
-    required this.icon,
-    required this.label,
-    required this.value,
-    required this.color,
-  });
 }
@@ -1,6 +1,5 @@
 import 'dart:async';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import '../utils/platform_info.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 import 'package:provider/provider.dart';
@@ -8,14 +7,11 @@ import 'package:provider/provider.dart';
 import '../connector/meshcore_connector.dart';
 import '../l10n/l10n.dart';
 import '../services/linux_ble_error_classifier.dart';
-import '../theme/mesh_theme.dart';
 import '../utils/app_logger.dart';
 import '../widgets/adaptive_app_bar_title.dart';
 import '../widgets/device_tile.dart';
-import '../widgets/empty_state.dart';
-import '../widgets/mesh_ui.dart';
 import '../helpers/snack_bar_builder.dart';
-import 'channels_screen.dart';
+import 'contacts_screen.dart';
 import 'tcp_screen.dart';
 import 'usb_screen.dart';

@@ -29,7 +25,6 @@ class ScannerScreen extends StatefulWidget {

 class _ScannerScreenState extends State<ScannerScreen> {
  bool _changedNavigation = false;
-  String? _connectingDeviceId;
  late final MeshCoreConnector _connector;
  late final VoidCallback _connectionListener;
  BluetoothAdapterState _bluetoothState = BluetoothAdapterState.unknown;
@@ -51,7 +46,7 @@ class _ScannerScreenState extends State<ScannerScreen> {
        _changedNavigation = true;
        if (mounted) {
          Navigator.of(context).push(
-            MaterialPageRoute(builder: (context) => const ChannelsScreen()),
+            MaterialPageRoute(builder: (context) => const ContactsScreen()),
          );
        }
      }
@@ -106,32 +101,6 @@ class _ScannerScreenState extends State<ScannerScreen> {
        title: AdaptiveAppBarTitle(context.l10n.scanner_title),
        centerTitle: true,
        automaticallyImplyLeading: false,
-        actions: [
-          if (PlatformInfo.supportsUsbSerial)
-            IconButton(
-              icon: const Icon(Icons.usb),
-              tooltip: context.l10n.connectionChoiceUsbLabel,
-              onPressed: () {
-                appLogger.info(
-                  'USB selected, opening UsbScreen',
-                  tag: 'ScannerScreen',
-                );
-                Navigator.of(
-                  context,
-                ).push(MaterialPageRoute(builder: (_) => const UsbScreen()));
-              },
-            ),
-          if (!PlatformInfo.isWeb)
-            IconButton(
-              icon: const Icon(Icons.lan),
-              tooltip: context.l10n.connectionChoiceTcpLabel,
-              onPressed: () {
-                Navigator.of(
-                  context,
-                ).push(MaterialPageRoute(builder: (_) => const TcpScreen()));
-              },
-            ),
-        ],
      ),
      body: SafeArea(
        top: false,
@@ -139,21 +108,12 @@ class _ScannerScreenState extends State<ScannerScreen> {
          builder: (context, connector, child) {
            return Column(
              children: [
-                // Bluetooth off warning — slides in/out with AnimatedSize
-                AnimatedSize(
-                  duration: const Duration(milliseconds: 250),
-                  curve: Curves.easeInOut,
-                  child: _bluetoothState == BluetoothAdapterState.off
-                      ? _BluetoothOffBanner(
-                          onEnable: PlatformInfo.isAndroid
-                              ? () => FlutterBluePlus.turnOn()
-                              : null,
-                        )
-                      : const SizedBox.shrink(),
-                ),
+                // Bluetooth off warning
+                if (_bluetoothState == BluetoothAdapterState.off)
+                  _bluetoothOffWarning(context),

-                // Connection status header
-                _ConnectionStatusHeader(connector: connector),
+                // Status bar
+                _buildStatusBar(context, connector),

                // Device list
                Expanded(child: _buildDeviceList(context, connector)),
@@ -162,114 +122,164 @@ class _ScannerScreenState extends State<ScannerScreen> {
          },
        ),
      ),
-      floatingActionButton: Consumer<MeshCoreConnector>(
+      bottomNavigationBar: Consumer<MeshCoreConnector>(
        builder: (context, connector, child) {
          final isScanning =
              connector.state == MeshCoreConnectionState.scanning;
          final isBluetoothOff = _bluetoothState == BluetoothAdapterState.off;
+          final usbSupported = PlatformInfo.supportsUsbSerial;
+          final tcpSupported = !PlatformInfo.isWeb;

-          return FloatingActionButton.extended(
+          return SafeArea(
+            top: false,
+            minimum: const EdgeInsets.fromLTRB(16, 8, 16, 16),
+            child: FittedBox(
+              fit: BoxFit.scaleDown,
+              alignment: Alignment.centerRight,
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.end,
+                children: [
+                  if (usbSupported)
+                    FloatingActionButton.extended(
+                      onPressed: () {
+                        appLogger.info(
+                          'USB selected, opening UsbScreen',
+                          tag: 'ScannerScreen',
+                        );
+                        Navigator.of(context).push(
+                          MaterialPageRoute(builder: (_) => const UsbScreen()),
+                        );
+                      },
+                      heroTag: 'scanner_usb_action',
+                      icon: const Icon(Icons.usb),
+                      label: Text(context.l10n.connectionChoiceUsbLabel),
+                    ),
+                  if (usbSupported) const SizedBox(width: 12),
+                  if (tcpSupported)
+                    FloatingActionButton.extended(
+                      onPressed: () {
+                        Navigator.of(context).push(
+                          MaterialPageRoute(builder: (_) => const TcpScreen()),
+                        );
+                      },
+                      heroTag: 'scanner_tcp_action',
+                      icon: const Icon(Icons.lan),
+                      label: Text(context.l10n.connectionChoiceTcpLabel),
+                    ),
+                  if (tcpSupported) const SizedBox(width: 12),
+                  FloatingActionButton.extended(
                    heroTag: 'scanner_ble_action',
                    onPressed: isBluetoothOff
                        ? null
                        : () {
-                    HapticFeedback.lightImpact();
-                    _toggleScan(connector);
+                            if (isScanning) {
+                              connector.stopScan();
+                            } else {
+                              unawaited(
+                                connector.startScan().catchError((e) {
+                                  appLogger.warn(
+                                    'startScan error: $e',
+                                    tag: 'ScannerScreen',
+                                  );
+                                }),
+                              );
+                            }
                          },
-            icon: AnimatedSwitcher(
-              duration: const Duration(milliseconds: 220),
-              transitionBuilder: (child, anim) =>
-                  ScaleTransition(scale: anim, child: child),
-              child: isScanning
-                  ? SizedBox(
-                      key: const ValueKey('scanning'),
+                    icon: isScanning
+                        ? const SizedBox(
                            width: 20,
                            height: 20,
-                      child: CircularProgressIndicator(
-                        strokeWidth: 2,
-                        color: Theme.of(context).colorScheme.onPrimary,
-                      ),
+                            child: CircularProgressIndicator(strokeWidth: 2),
                          )
-                  : const Icon(
-                      Icons.bluetooth_searching,
-                      key: ValueKey('idle'),
-                    ),
-            ),
+                        : const Icon(Icons.bluetooth_searching),
                    label: Text(
                      isScanning
                          ? context.l10n.scanner_stop
                          : context.l10n.scanner_scan,
                    ),
+                  ),
+                ],
+              ),
+            ),
          );
        },
      ),
    );
  }

-  void _toggleScan(MeshCoreConnector connector) {
-    if (PlatformInfo.isWeb) {
-      // flutter_blue_plus has no web backend, so a BLE scan silently no-ops in
-      // the browser. Tell the user instead of leaving them staring at a button.
-      showDismissibleSnackBar(
-        context,
-        content: Text(context.l10n.scanner_bluetoothWebUnsupported),
-      );
-      return;
+  Widget _buildStatusBar(BuildContext context, MeshCoreConnector connector) {
+    String statusText;
+    Color statusColor;
+
+    final l10n = context.l10n;
+    switch (connector.state) {
+      case MeshCoreConnectionState.scanning:
+        statusText = l10n.scanner_scanning;
+        statusColor = Colors.blue;
+        break;
+      case MeshCoreConnectionState.connecting:
+        statusText = l10n.scanner_connecting;
+        statusColor = Colors.orange;
+        break;
+      case MeshCoreConnectionState.connected:
+        statusText = l10n.scanner_connectedTo(connector.deviceDisplayName);
+        statusColor = Colors.green;
+        break;
+      case MeshCoreConnectionState.disconnecting:
+        statusText = l10n.scanner_disconnecting;
+        statusColor = Colors.orange;
+        break;
+      case MeshCoreConnectionState.disconnected:
+        statusText = l10n.scanner_notConnected;
+        statusColor = Colors.grey;
+        break;
    }
-    if (connector.state == MeshCoreConnectionState.scanning) {
-      connector.stopScan();
-    } else {
-      unawaited(
-        connector.startScan().catchError((e) {
-          appLogger.warn('startScan error: $e', tag: 'ScannerScreen');
-        }),
+
+    return Container(
+      width: double.infinity,
+      padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
+      color: statusColor.withValues(alpha: 0.1),
+      child: Row(
+        children: [
+          Icon(Icons.circle, size: 12, color: statusColor),
+          const SizedBox(width: 8),
+          Text(
+            statusText,
+            style: TextStyle(color: statusColor, fontWeight: FontWeight.w500),
+          ),
+        ],
+      ),
    );
  }
-  }

  Widget _buildDeviceList(BuildContext context, MeshCoreConnector connector) {
    if (connector.scanResults.isEmpty) {
-      final isBluetoothOff = _bluetoothState == BluetoothAdapterState.off;
-      final isScanning = connector.state == MeshCoreConnectionState.scanning;
-      return EmptyState(
-        icon: isBluetoothOff ? Icons.bluetooth_disabled : Icons.bluetooth,
-        title: isBluetoothOff
-            ? context.l10n.scanner_bluetoothOff
-            : isScanning
+      return Center(
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Icon(Icons.bluetooth, size: 64, color: Colors.grey[400]),
+            const SizedBox(height: 16),
+            Text(
+              connector.state == MeshCoreConnectionState.scanning
                  ? context.l10n.scanner_searchingDevices
                  : context.l10n.scanner_tapToScan,
-        subtitle: isBluetoothOff
-            ? context.l10n.scanner_bluetoothOffMessage
-            : null,
-        action: (isBluetoothOff || isScanning)
-            ? null
-            : FilledButton.icon(
-                onPressed: () {
-                  HapticFeedback.lightImpact();
-                  _toggleScan(connector);
-                },
-                icon: const Icon(Icons.bluetooth_searching),
-                label: Text(context.l10n.scanner_scan),
+              style: TextStyle(fontSize: 16, color: Colors.grey[600]),
+            ),
+          ],
        ),
      );
    }

-    final isConnecting = connector.state == MeshCoreConnectionState.connecting;
-    return ListView.builder(
-      padding: const EdgeInsets.fromLTRB(0, 8, 0, 96),
+    return ListView.separated(
+      padding: const EdgeInsets.all(8),
      itemCount: connector.scanResults.length,
+      separatorBuilder: (context, index) => const Divider(),
      itemBuilder: (context, index) {
        final result = connector.scanResults[index];
-        final deviceId = result.device.remoteId.toString();
-        return ListEntrance(
-          index: index,
-          child: DeviceTile(
+        return DeviceTile(
          scanResult: result,
-            isConnecting: isConnecting && _connectingDeviceId == deviceId,
-            onTap: isConnecting
-                ? null
-                : () => _connectToDevice(context, connector, result),
-          ),
+          onTap: () => _connectToDevice(context, connector, result),
        );
      },
    );
@@ -283,9 +293,6 @@ class _ScannerScreenState extends State<ScannerScreen> {
    final name = result.device.platformName.isNotEmpty
        ? result.device.platformName
        : result.advertisementData.advName;
-    setState(() {
-      _connectingDeviceId = result.device.remoteId.toString();
-    });
    try {
      await connector.connect(
        result.device,
@@ -314,15 +321,9 @@ class _ScannerScreenState extends State<ScannerScreen> {
        showDismissibleSnackBar(
          context,
          content: Text(context.l10n.scanner_connectionFailed(e.toString())),
-          backgroundColor: Theme.of(context).colorScheme.error,
+          backgroundColor: Colors.red,
        );
      }
-    } finally {
-      if (mounted) {
-        setState(() {
-          _connectingDeviceId = null;
-        });
-      }
    }
  }

@@ -411,112 +412,46 @@ class _ScannerScreenState extends State<ScannerScreen> {
    );
    return pin;
  }
-}

-// ── Private sub-widgets ────────────────────────────────────────────────────
-
-/// Bluetooth-off warning banner — styled as an alert MeshCard.
-class _BluetoothOffBanner extends StatelessWidget {
-  final VoidCallback? onEnable;
-
-  const _BluetoothOffBanner({this.onEnable});
-
-  @override
-  Widget build(BuildContext context) {
-    final scheme = Theme.of(context).colorScheme;
-    return MeshCard(
-      color: scheme.error.withValues(alpha: 0.08),
-      borderColor: scheme.error.withValues(alpha: 0.35),
-      padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 12),
+  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: 20, color: scheme.error),
-          const SizedBox(width: 10),
+          Icon(Icons.bluetooth_disabled, size: 24, color: errorColor),
+          const SizedBox(width: 12),
          Expanded(
            child: Column(
              crossAxisAlignment: CrossAxisAlignment.start,
-              mainAxisSize: MainAxisSize.min,
              children: [
                Text(
                  context.l10n.scanner_bluetoothOff,
                  style: TextStyle(
-                    color: scheme.error,
+                    color: errorColor,
                    fontWeight: FontWeight.w600,
-                    fontSize: 13.5,
+                    fontSize: 14,
                  ),
                ),
-                const SizedBox(height: 2),
+                const SizedBox(height: 4),
                Text(
                  context.l10n.scanner_bluetoothOffMessage,
                  style: TextStyle(
-                    color: scheme.error.withValues(alpha: 0.8),
+                    color: errorColor.withValues(alpha: 0.85),
                    fontSize: 12,
                  ),
                ),
              ],
            ),
          ),
-          if (onEnable != null) ...[
-            const SizedBox(width: 8),
+          if (PlatformInfo.isAndroid)
            TextButton(
-              onPressed: onEnable,
+              onPressed: () => FlutterBluePlus.turnOn(),
              child: Text(context.l10n.scanner_enableBluetooth),
            ),
        ],
-        ],
-      ),
-    );
-  }
-}
-
-/// Connection status header with AnimatedSwitcher between states.
-class _ConnectionStatusHeader extends StatelessWidget {
-  final MeshCoreConnector connector;
-
-  const _ConnectionStatusHeader({required this.connector});
-
-  @override
-  Widget build(BuildContext context) {
-    final l10n = context.l10n;
-    final scheme = Theme.of(context).colorScheme;
-
-    final (String label, Color color, bool pulse) = switch (connector.state) {
-      MeshCoreConnectionState.scanning => (
-        l10n.scanner_scanning,
-        MeshPalette.blue,
-        true,
-      ),
-      MeshCoreConnectionState.connecting => (
-        l10n.scanner_connecting,
-        MeshPalette.warn,
-        true,
-      ),
-      MeshCoreConnectionState.connected => (
-        l10n.scanner_connectedTo(connector.deviceDisplayName),
-        MeshPalette.signal,
-        false,
-      ),
-      MeshCoreConnectionState.disconnecting => (
-        l10n.scanner_disconnecting,
-        MeshPalette.warn,
-        true,
-      ),
-      MeshCoreConnectionState.disconnected => (
-        l10n.scanner_notConnected,
-        scheme.onSurfaceVariant,
-        false,
-      ),
-    };
-
-    return Padding(
-      padding: const EdgeInsets.fromLTRB(16, 12, 16, 4),
-      child: AnimatedSwitcher(
-        duration: const Duration(milliseconds: 300),
-        child: Align(
-          key: ValueKey(connector.state),
-          alignment: Alignment.centerLeft,
-          child: StatusChip(label: label, color: color, pulse: pulse),
-        ),
      ),
    );
  }
@@ -1,18 +1,15 @@
 import 'dart:async';

 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';

 import '../connector/meshcore_connector.dart';
 import '../l10n/l10n.dart';
 import '../services/app_settings_service.dart';
-import '../theme/mesh_theme.dart';
 import '../utils/platform_info.dart';
 import '../widgets/adaptive_app_bar_title.dart';
-import '../widgets/mesh_ui.dart';
 import '../helpers/snack_bar_builder.dart';
-import 'channels_screen.dart';
+import 'contacts_screen.dart';
 import 'usb_screen.dart';

 class TcpScreen extends StatefulWidget {
@@ -27,7 +24,7 @@ class _TcpScreenState extends State<TcpScreen> {
  late final TextEditingController _portController;
  late final MeshCoreConnector _connector;
  late final VoidCallback _connectionListener;
-  bool _navigatedToChannels = false;
+  bool _navigatedToContacts = false;

  @override
  void initState() {
@@ -45,20 +42,20 @@ class _TcpScreenState extends State<TcpScreen> {
    _connectionListener = () {
      if (!mounted) return;
      if (_connector.state == MeshCoreConnectionState.disconnected) {
-        _navigatedToChannels = false;
+        _navigatedToContacts = false;
      }
      if (_connector.state == MeshCoreConnectionState.connected &&
          _connector.isTcpTransportConnected &&
-          !_navigatedToChannels) {
+          !_navigatedToContacts) {
        context.read<AppSettingsService>().setTcpServerAddress(
          _hostController.text,
        );
        context.read<AppSettingsService>().setTcpServerPort(
          int.tryParse(_portController.text) ?? 0,
        );
-        _navigatedToChannels = true;
+        _navigatedToContacts = true;
        Navigator.of(context).pushReplacement(
-          MaterialPageRoute(builder: (_) => const ChannelsScreen()),
+          MaterialPageRoute(builder: (_) => const ContactsScreen()),
        );
      }
    };
@@ -70,7 +67,7 @@ class _TcpScreenState extends State<TcpScreen> {
    _hostController.dispose();
    _portController.dispose();
    _connector.removeListener(_connectionListener);
-    if (!_navigatedToChannels &&
+    if (!_navigatedToContacts &&
        _connector.activeTransport == MeshCoreTransportType.tcp &&
        _connector.state != MeshCoreConnectionState.disconnected) {
      WidgetsBinding.instance.addPostFrameCallback((_) {
@@ -98,32 +95,13 @@ class _TcpScreenState extends State<TcpScreen> {
            final isConnecting =
                connector.state == MeshCoreConnectionState.connecting &&
                connector.activeTransport == MeshCoreTransportType.tcp;
-            // Connect is only available from a fully disconnected state —
-            // scanning, connecting, or an active session must settle first.
            final isButtonDisabled =
-                connector.state != MeshCoreConnectionState.disconnected;
-            return ListView(
-              padding: const EdgeInsets.only(bottom: 32),
+                isConnecting ||
+                connector.state == MeshCoreConnectionState.scanning;
+            return Column(
              children: [
-                // Status header
+                _buildStatusBar(context, connector),
                Padding(
-                  padding: const EdgeInsets.fromLTRB(16, 12, 16, 4),
-                  child: AnimatedSwitcher(
-                    duration: const Duration(milliseconds: 300),
-                    child: Align(
-                      key: ValueKey(connector.state),
-                      alignment: Alignment.centerLeft,
-                      child: _buildStatusChip(context, connector),
-                    ),
-                  ),
-                ),
-
-                // Transport switcher
-                _buildTransportLinks(context),
-
-                // Connection form
-                const SectionHeader('TCP / IP'),
-                MeshCard(
                  padding: const EdgeInsets.all(16),
                  child: Column(
                    crossAxisAlignment: CrossAxisAlignment.stretch,
@@ -133,6 +111,7 @@ class _TcpScreenState extends State<TcpScreen> {
                        decoration: InputDecoration(
                          labelText: context.l10n.tcpHostLabel,
                          hintText: context.l10n.tcpHostHint,
+                          border: const OutlineInputBorder(),
                        ),
                        enabled: !isConnecting,
                        keyboardType: TextInputType.url,
@@ -143,6 +122,7 @@ class _TcpScreenState extends State<TcpScreen> {
                        decoration: InputDecoration(
                          labelText: context.l10n.tcpPortLabel,
                          hintText: context.l10n.tcpPortHint,
+                          border: const OutlineInputBorder(),
                        ),
                        enabled: !isConnecting,
                        keyboardType: TextInputType.number,
@@ -150,12 +130,7 @@ class _TcpScreenState extends State<TcpScreen> {
                      const SizedBox(height: 16),
                      FilledButton.icon(
                        key: const Key('tcp_connect_button'),
-                        onPressed: isButtonDisabled
-                            ? null
-                            : () {
-                                HapticFeedback.lightImpact();
-                                _connectTcp();
-                              },
+                        onPressed: isButtonDisabled ? null : _connectTcp,
                        icon: isConnecting
                            ? const SizedBox(
                                width: 18,
@@ -174,103 +149,97 @@ class _TcpScreenState extends State<TcpScreen> {
                    ],
                  ),
                ),
-
-                // Last used endpoint
-                if (connector.activeTcpEndpoint != null &&
-                    connector.isTcpTransportConnected) ...[
-                  const SectionHeader('CONNECTED TO'),
-                  MeshCard(
-                    padding: const EdgeInsets.symmetric(
-                      horizontal: 14,
-                      vertical: 10,
-                    ),
-                    child: Row(
-                      children: [
-                        Icon(
-                          Icons.lan,
-                          size: 16,
-                          color: Theme.of(context).colorScheme.primary,
-                        ),
-                        const SizedBox(width: 10),
-                        Expanded(
-                          child: Text(
-                            connector.activeTcpEndpoint!,
-                            style: MeshTheme.mono(
-                              fontSize: 13,
-                              color: Theme.of(context).colorScheme.onSurface,
-                            ),
-                            maxLines: 1,
-                            overflow: TextOverflow.ellipsis,
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-                ],
              ],
            );
          },
        ),
      ),
-    );
-  }
-
-  Widget _buildStatusChip(BuildContext context, MeshCoreConnector connector) {
-    final l10n = context.l10n;
-
-    if (connector.isTcpTransportConnected) {
-      return StatusChip(
-        label: l10n.scanner_connectedTo(connector.activeTcpEndpoint ?? 'TCP'),
-        color: MeshPalette.signal,
-      );
-    } else if (connector.state == MeshCoreConnectionState.connecting &&
-        connector.activeTransport == MeshCoreTransportType.tcp) {
-      return StatusChip(
-        label: l10n.tcpStatus_connectingTo(
-          '${_hostController.text}:${_portController.text}',
-        ),
-        color: MeshPalette.warn,
-        pulse: true,
-      );
-    } else if (connector.state == MeshCoreConnectionState.disconnecting &&
-        connector.activeTransport == MeshCoreTransportType.tcp) {
-      return StatusChip(
-        label: l10n.scanner_disconnecting,
-        color: MeshPalette.warn,
-        pulse: true,
-      );
-    } else {
-      return StatusChip(
-        label: l10n.tcpStatus_notConnected,
-        color: Theme.of(context).colorScheme.onSurfaceVariant,
-      );
-    }
-  }
-
-  Widget _buildTransportLinks(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-      child: Wrap(
-        spacing: 12,
-        runSpacing: 8,
+      bottomNavigationBar: SafeArea(
+        top: false,
+        minimum: const EdgeInsets.fromLTRB(16, 8, 16, 16),
+        child: FittedBox(
+          fit: BoxFit.scaleDown,
+          alignment: Alignment.centerRight,
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.end,
            children: [
              if (PlatformInfo.supportsUsbSerial)
-            OutlinedButton.icon(
+                FloatingActionButton.extended(
                  onPressed: () {
                    Navigator.of(context).pushReplacement(
                      MaterialPageRoute(builder: (_) => const UsbScreen()),
                    );
                  },
+                  heroTag: 'tcp_usb_action',
+                  extendedPadding: const EdgeInsets.symmetric(horizontal: 12),
                  icon: const Icon(Icons.usb),
                  label: Text(context.l10n.connectionChoiceUsbLabel),
                ),
-          OutlinedButton.icon(
-            onPressed: () => Navigator.of(context).maybePop(),
+              if (PlatformInfo.supportsUsbSerial) const SizedBox(width: 12),
+              FloatingActionButton.extended(
+                onPressed: () {
+                  Navigator.of(context).maybePop();
+                },
+                heroTag: 'tcp_ble_action',
+                extendedPadding: const EdgeInsets.symmetric(horizontal: 12),
                icon: const Icon(Icons.bluetooth),
                label: Text(context.l10n.connectionChoiceBluetoothLabel),
              ),
            ],
          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildStatusBar(BuildContext context, MeshCoreConnector connector) {
+    final l10n = context.l10n;
+    String statusText;
+    Color statusColor;
+
+    if (connector.isTcpTransportConnected) {
+      statusText = l10n.scanner_connectedTo(
+        connector.activeTcpEndpoint ?? 'TCP',
+      );
+      statusColor = Colors.green;
+    } else if (connector.state == MeshCoreConnectionState.connecting &&
+        connector.activeTransport == MeshCoreTransportType.tcp) {
+      statusText = l10n.tcpStatus_connectingTo(
+        '${_hostController.text}:${_portController.text}',
+      );
+      statusColor = Colors.orange;
+    } else if (connector.state == MeshCoreConnectionState.disconnecting &&
+        connector.activeTransport == MeshCoreTransportType.tcp) {
+      statusText = l10n.scanner_disconnecting;
+      statusColor = Colors.orange;
+    } else {
+      statusText = l10n.tcpStatus_notConnected;
+      statusColor = Colors.grey;
+    }
+
+    return Container(
+      width: double.infinity,
+      padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
+      color: statusColor.withValues(alpha: 0.1),
+      child: Row(
+        children: [
+          Icon(Icons.circle, size: 12, color: statusColor),
+          const SizedBox(width: 8),
+          Expanded(
+            child: FittedBox(
+              fit: BoxFit.scaleDown,
+              alignment: Alignment.centerLeft,
+              child: Text(
+                statusText,
+                style: TextStyle(
+                  color: statusColor,
+                  fontWeight: FontWeight.w500,
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
    );
  }

@@ -305,7 +274,7 @@ class _TcpScreenState extends State<TcpScreen> {
    showDismissibleSnackBar(
      context,
      content: Text(message),
-      backgroundColor: Theme.of(context).colorScheme.error,
+      backgroundColor: Colors.red,
    );
  }

@@ -1,26 +1,20 @@
 import 'dart:async';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 import '../l10n/l10n.dart';
 import '../models/contact.dart';
 import '../models/path_selection.dart';
 import '../models/app_settings.dart';
-import '../storage/prefs_manager.dart';
 import '../connector/meshcore_connector.dart';
 import '../connector/meshcore_protocol.dart';
 import '../services/app_settings_service.dart';
 import '../services/repeater_command_service.dart';
 import '../utils/app_logger.dart';
-import '../widgets/routing_sheet.dart';
+import '../widgets/path_management_dialog.dart';
 import '../helpers/cayenne_lpp.dart';
 import '../utils/battery_utils.dart';
 import '../helpers/snack_bar_builder.dart';
-import '../widgets/sync_progress_overlay.dart';
-import '../widgets/telemetry_location_map.dart';
-import '../theme/mesh_theme.dart';
-import '../widgets/mesh_ui.dart';

 class TelemetryScreen extends StatefulWidget {
  final Contact contact;
@@ -32,13 +26,6 @@ class TelemetryScreen extends StatefulWidget {
 }

 class _TelemetryScreenState extends State<TelemetryScreen> {
-  static const int _autoRefreshDefaultIntervalSeconds = 20;
-  static const int _autoRefreshDefaultQuantity = 10;
-  static const int _autoRefreshMinIntervalSeconds = 10;
-  static const int _autoRefreshMaxIntervalSeconds = 300;
-  static const int _autoRefreshMinQuantity = 1;
-  static const int _autoRefreshMaxQuantity = 10;
-
  int _tagData = 0;

  bool _isLoading = false;
@@ -49,17 +36,6 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
  RepeaterCommandService? _commandService;
  PathSelection? _pendingStatusSelection;
  List<Map<String, dynamic>>? _parsedTelemetry;
-  final TextEditingController _autoRefreshIntervalController =
-      TextEditingController(text: '$_autoRefreshDefaultIntervalSeconds');
-  final TextEditingController _autoRefreshQuantityController =
-      TextEditingController(text: '$_autoRefreshDefaultQuantity');
-  Timer? _autoRefreshTimer;
-  bool _isAutoRefreshEnabled = false;
-  bool _activeTelemetryRequestIsAutoRefresh = false;
-  bool _autoRefreshLastAttemptFailed = false;
-  int _autoRefreshCurrentAttempt = 0;
-  int _autoRefreshTotalAttempts = 0;
-  int _autoRefreshIntervalSeconds = _autoRefreshDefaultIntervalSeconds;

  int _tripTime = 0;

@@ -86,7 +62,6 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
    super.initState();
    final connector = Provider.of<MeshCoreConnector>(context, listen: false);
    _commandService = RepeaterCommandService(connector);
-    _loadAutoRefreshSettings();
    _setupMessageListener();
    _loadTelemetry();
    _hasData = false;
@@ -106,26 +81,17 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
          _tagData = reader.readUInt32LE();
          _tripTime = reader.readUInt32LE();
          _statusTimeout?.cancel();
-          final isAutoRefreshRequest = _activeTelemetryRequestIsAutoRefresh;
          _statusTimeout = Timer(Duration(milliseconds: _tripTime), () {
            if (!mounted) return;
            setState(() {
              _isLoading = false;
              _isLoaded = false;
-              if (isAutoRefreshRequest && _isAutoRefreshEnabled) {
-                _autoRefreshLastAttemptFailed = true;
-              }
            });
-            if (!isAutoRefreshRequest) {
            showDismissibleSnackBar(
              context,
              content: Text(context.l10n.telemetry_requestTimeout),
-                backgroundColor: Theme.of(context).colorScheme.error,
+              backgroundColor: Colors.red,
            );
-            }
-            if (isAutoRefreshRequest && _isAutoRefreshEnabled) {
-              _scheduleNextAutoRefreshAttempt();
-            }
            _recordTelemetryResult(false);
          });
        }
@@ -167,21 +133,15 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
      );
    }
    if (!mounted) return;
-    final isAutoRefreshRequest = _activeTelemetryRequestIsAutoRefresh;
    setState(() {
      _parsedTelemetry = parsedTelemetry;
-      if (isAutoRefreshRequest) {
-        _autoRefreshLastAttemptFailed = false;
-      }
-      _activeTelemetryRequestIsAutoRefresh = false;
    });

-    if (!isAutoRefreshRequest) {
    showDismissibleSnackBar(
      context,
      content: Text(context.l10n.telemetry_receivedData),
+      backgroundColor: Colors.green,
    );
-    }
    _statusTimeout?.cancel();
    if (!mounted) return;
    setState(() {
@@ -189,18 +149,14 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
      _isLoaded = true;
      _hasData = true;
    });
-    if (isAutoRefreshRequest) {
-      _scheduleNextAutoRefreshAttempt();
-    }
  }

-  Future<void> _loadTelemetry({bool isAutoRefresh = false}) async {
+  Future<void> _loadTelemetry() async {
    if (_commandService == null) return;

    setState(() {
      _isLoading = true;
      _isLoaded = false;
-      _activeTelemetryRequestIsAutoRefresh = isAutoRefresh;
    });
    try {
      final connector = Provider.of<MeshCoreConnector>(context, listen: false);
@@ -212,7 +168,7 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
      if (widget.contact.type != advTypeChat) {
        frame = buildSendBinaryReq(
          widget.contact.publicKey,
-          payload: buildTelemetryBinaryPayload(),
+          payload: Uint8List.fromList([reqTypeGetTelemetry]),
        );
      } else {
        frame = buildSendTelemetryReq(widget.contact.publicKey);
@@ -223,75 +179,16 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
        setState(() {
          _isLoading = false;
          _isLoaded = false;
-          if (isAutoRefresh) {
-            _autoRefreshLastAttemptFailed = true;
-          }
-          _activeTelemetryRequestIsAutoRefresh = false;
        });
-        if (isAutoRefresh) {
-          _scheduleNextAutoRefreshAttempt();
-        }

-        if (!isAutoRefresh) {
        showDismissibleSnackBar(
          context,
          content: Text(context.l10n.telemetry_errorLoading(e.toString())),
-            backgroundColor: Theme.of(context).colorScheme.error,
+          backgroundColor: Colors.red,
        );
      }
    }
  }
-  }
-
-  void _loadAutoRefreshSettings() {
-    final prefs = PrefsManager.instance;
-    final contactKey = widget.contact.publicKeyHex;
-    final interval =
-        (prefs.getInt(_autoRefreshIntervalKey(contactKey)) ??
-                _autoRefreshDefaultIntervalSeconds)
-            .clamp(
-              _autoRefreshMinIntervalSeconds,
-              _autoRefreshMaxIntervalSeconds,
-            )
-            .toInt();
-    final quantity =
-        (prefs.getInt(_autoRefreshQuantityKey(contactKey)) ??
-                _autoRefreshDefaultQuantity)
-            .clamp(_autoRefreshMinQuantity, _autoRefreshMaxQuantity)
-            .toInt();
-
-    _autoRefreshIntervalSeconds = interval;
-    _autoRefreshIntervalController.text = interval.toString();
-    _autoRefreshQuantityController.text = quantity.toString();
-  }
-
-  Future<void> _saveAutoRefreshSettings() async {
-    final contactKey = widget.contact.publicKeyHex;
-    final interval = _clampControllerValue(
-      controller: _autoRefreshIntervalController,
-      min: _autoRefreshMinIntervalSeconds,
-      max: _autoRefreshMaxIntervalSeconds,
-      fallback: _autoRefreshIntervalSeconds,
-    );
-    final quantity = _clampControllerValue(
-      controller: _autoRefreshQuantityController,
-      min: _autoRefreshMinQuantity,
-      max: _autoRefreshMaxQuantity,
-      fallback: _autoRefreshDefaultQuantity,
-    );
-
-    final prefs = PrefsManager.instance;
-    await prefs.setInt(_autoRefreshIntervalKey(contactKey), interval);
-    await prefs.setInt(_autoRefreshQuantityKey(contactKey), quantity);
-  }
-
-  String _autoRefreshIntervalKey(String contactKey) {
-    return 'telemetry_auto_refresh_interval_$contactKey';
-  }
-
-  String _autoRefreshQuantityKey(String contactKey) {
-    return 'telemetry_auto_refresh_quantity_$contactKey';
-  }

  void _recordTelemetryResult(bool success) {
    final selection = _pendingStatusSelection;
@@ -308,28 +205,19 @@ class _TelemetryScreenState extends State<TelemetryScreen> {

  @override
  void dispose() {
-    unawaited(_saveAutoRefreshSettings());
    _frameSubscription?.cancel();
    _commandService?.dispose();
    _statusTimeout?.cancel();
-    _autoRefreshTimer?.cancel();
-    _autoRefreshIntervalController.dispose();
-    _autoRefreshQuantityController.dispose();
    super.dispose();
  }

  @override
  Widget build(BuildContext context) {
    final l10n = context.l10n;
-    final scheme = Theme.of(context).colorScheme;
    final connector = context.watch<MeshCoreConnector>();
    final settings = context.watch<AppSettingsService>().settings;
    final isImperialUnits = settings.unitSystem == UnitSystem.imperial;
-    final contact = connector.contacts.firstWhere(
-      (c) => c.publicKeyHex == widget.contact.publicKeyHex,
-      orElse: () => widget.contact,
-    );
-    final isFloodMode = contact.pathOverride == -1;
+    final isFloodMode = widget.contact.pathOverride == -1;

    return Scaffold(
      appBar: AppBar(
@@ -351,13 +239,71 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
          ],
        ),
        centerTitle: false,
-        bottom: const SyncProgressAppBarBottom(),
        actions: [
-          IconButton(
+          PopupMenuButton<String>(
            icon: Icon(isFloodMode ? Icons.waves : Icons.route),
            tooltip: l10n.repeater_routingMode,
+            onSelected: (mode) async {
+              if (mode == 'flood') {
+                await connector.setPathOverride(widget.contact, pathLen: -1);
+              } else {
+                await connector.setPathOverride(widget.contact, pathLen: null);
+              }
+            },
+            itemBuilder: (context) => [
+              PopupMenuItem(
+                value: 'auto',
+                child: Row(
+                  children: [
+                    Icon(
+                      Icons.auto_mode,
+                      size: 20,
+                      color: !isFloodMode
+                          ? Theme.of(context).primaryColor
+                          : null,
+                    ),
+                    const SizedBox(width: 8),
+                    Text(
+                      l10n.repeater_autoUseSavedPath,
+                      style: TextStyle(
+                        fontWeight: !isFloodMode
+                            ? FontWeight.bold
+                            : FontWeight.normal,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+              PopupMenuItem(
+                value: 'flood',
+                child: Row(
+                  children: [
+                    Icon(
+                      Icons.waves,
+                      size: 20,
+                      color: isFloodMode
+                          ? Theme.of(context).primaryColor
+                          : null,
+                    ),
+                    const SizedBox(width: 8),
+                    Text(
+                      l10n.repeater_forceFloodMode,
+                      style: TextStyle(
+                        fontWeight: isFloodMode
+                            ? FontWeight.bold
+                            : FontWeight.normal,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ],
+          ),
+          IconButton(
+            icon: const Icon(Icons.timeline),
+            tooltip: l10n.repeater_pathManagement,
            onPressed: () =>
-                ContactRoutingSheet.show(context, contact: widget.contact),
+                PathManagementDialog.show(context, contact: widget.contact),
          ),
          IconButton(
            icon: _isLoading
@@ -367,9 +313,7 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
                    child: CircularProgressIndicator(strokeWidth: 2),
                  )
                : const Icon(Icons.refresh),
-            onPressed: (_isLoading || _isAutoRefreshEnabled)
-                ? null
-                : () => _loadTelemetry(),
+            onPressed: _isLoading ? null : _loadTelemetry,
            tooltip: l10n.repeater_refresh,
          ),
        ],
@@ -377,8 +321,7 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
      body: SafeArea(
        top: false,
        child: RefreshIndicator(
-          onRefresh: () =>
-              _isAutoRefreshEnabled ? Future.value() : _loadTelemetry(),
+          onRefresh: _loadTelemetry,
          child: ListView(
            padding: const EdgeInsets.all(16),
            children: [
@@ -388,10 +331,7 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
                Center(
                  child: Text(
                    l10n.telemetry_noData,
-                    style: TextStyle(
-                      fontSize: 16,
-                      color: scheme.onSurfaceVariant,
-                    ),
+                    style: const TextStyle(fontSize: 16, color: Colors.grey),
                  ),
                ),
              if ((_isLoaded || _hasData) &&
@@ -404,7 +344,6 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
                    entry['channel'],
                    isImperialUnits,
                  ),
-              _buildAutoRefreshCard(),
            ],
          ),
        ),
@@ -417,505 +356,86 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
    String title,
    int channel,
    bool isImperialUnits,
-  ) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        SectionHeader(title, padding: const EdgeInsets.fromLTRB(16, 16, 16, 8)),
-        MeshCard(
-          padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              for (final entry in channelData.entries)
-                _buildTelemetryField(entry, channel, isImperialUnits),
-            ],
-          ),
-        ),
-      ],
-    );
-  }
-
-  Widget _buildTelemetryField(
-    MapEntry<String, dynamic> entry,
-    int channel,
-    bool isImperialUnits,
-  ) {
-    if (entry.key == 'gps') {
-      return _buildGpsInfo(entry.value);
-    }
-
-    final display = _formatTelemetryField(
-      entry.key,
-      entry.value,
-      channel,
-      isImperialUnits,
-    );
-    return _buildInfoRow(display.label, display.value);
-  }
-
-  _TelemetryFieldDisplay _formatTelemetryField(
-    String key,
-    dynamic value,
-    int channel,
-    bool isImperialUnits,
  ) {
    final l10n = context.l10n;
-    final text = _telemetryValueText(value);
-
-    switch (key) {
-      case 'digitalInput':
-        return _TelemetryFieldDisplay(l10n.telemetry_digitalInputLabel, text);
-      case 'digitalOutput':
-        return _TelemetryFieldDisplay(l10n.telemetry_digitalOutputLabel, text);
-      case 'analogInput':
-        return _TelemetryFieldDisplay(
-          l10n.telemetry_analogInputLabel,
-          l10n.telemetry_analogValue(text),
-        );
-      case 'analogOutput':
-        return _TelemetryFieldDisplay(
-          l10n.telemetry_analogOutputLabel,
-          l10n.telemetry_analogValue(text),
-        );
-      case 'generic':
-        return _TelemetryFieldDisplay(l10n.telemetry_genericLabel, text);
-      case 'luminosity':
-        return _TelemetryFieldDisplay(
-          l10n.telemetry_luminosityLabel,
-          l10n.telemetry_luminosityValue(text),
-        );
-      case 'presence':
-        return _TelemetryFieldDisplay(l10n.telemetry_presenceLabel, text);
-      case 'temperature':
-        return _TelemetryFieldDisplay(
-          channel == 1
-              ? l10n.telemetry_mcuTemperatureLabel
-              : l10n.telemetry_temperatureLabel,
-          _temperatureText(value, isImperialUnits),
-        );
-      case 'humidity':
-        return _TelemetryFieldDisplay(l10n.telemetry_humidityLabel, text);
-      case 'accelerometer':
-        return _TelemetryFieldDisplay(
-          l10n.telemetry_accelerometerLabel,
-          _telemetryAxisText(value),
-        );
-      case 'pressure':
-        return _TelemetryFieldDisplay(
-          l10n.telemetry_pressureLabel,
-          l10n.telemetry_pressureValue(text),
-        );
-      case 'altitude':
-        return _TelemetryFieldDisplay(
-          l10n.telemetry_altitudeLabel,
-          l10n.telemetry_altitudeValue(text),
-        );
-      case 'voltage':
-        return _TelemetryFieldDisplay(
-          channel == 1
-              ? l10n.telemetry_batteryLabel
-              : l10n.telemetry_voltageLabel,
-          channel == 1
-              ? _batteryText(value)
-              : l10n.telemetry_voltageValue(text),
-        );
-      case 'current':
-        return _TelemetryFieldDisplay(
-          l10n.telemetry_currentLabel,
-          l10n.telemetry_currentValue(text),
-        );
-      case 'frequency':
-        return _TelemetryFieldDisplay(
-          l10n.telemetry_frequencyLabel,
-          l10n.telemetry_frequencyValue(text),
-        );
-      case 'percentage':
-        return _TelemetryFieldDisplay(
-          l10n.telemetry_percentageLabel,
-          l10n.telemetry_percentageValue(text),
-        );
-      case 'concentration':
-        return _TelemetryFieldDisplay(
-          l10n.telemetry_concentrationLabel,
-          l10n.telemetry_concentrationValue(text),
-        );
-      case 'power':
-        return _TelemetryFieldDisplay(
-          l10n.telemetry_powerLabel,
-          l10n.telemetry_powerValue(text),
-        );
-      case 'distance':
-        return _TelemetryFieldDisplay(
-          l10n.telemetry_distanceLabel,
-          l10n.telemetry_distanceValue(text),
-        );
-      case 'energy':
-        return _TelemetryFieldDisplay(
-          l10n.telemetry_energyLabel,
-          l10n.telemetry_energyValue(text),
-        );
-      case 'direction':
-        return _TelemetryFieldDisplay(
-          l10n.telemetry_directionLabel,
-          l10n.telemetry_directionValue(text),
-        );
-      case 'time':
-        return _TelemetryFieldDisplay(
-          l10n.telemetry_timeLabel,
-          _telemetryTimeText(value),
-        );
-      case 'gyrometer':
-        return _TelemetryFieldDisplay(
-          l10n.telemetry_gyrometerLabel,
-          _telemetryAxisText(value),
-        );
-      case 'colour':
-        return _TelemetryFieldDisplay(
-          l10n.telemetry_colourLabel,
-          _telemetryColorText(value),
-        );
-      case 'switch':
-        return _TelemetryFieldDisplay(l10n.telemetry_switchLabel, text);
-      case 'polyline':
-        return _TelemetryFieldDisplay(
-          l10n.telemetry_polylineLabel,
-          _telemetryMapText(value),
-        );
-      default:
-        return _TelemetryFieldDisplay(key, text);
-    }
-  }
-
-  Widget _buildAutoRefreshCard() {
-    final l10n = context.l10n;
-    final counterText = _autoRefreshCounterText();
-
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        SectionHeader(
-          l10n.common_autoRefresh,
-          padding: const EdgeInsets.fromLTRB(16, 16, 16, 8),
-        ),
-        MeshCard(
+    return Card(
+      child: Padding(
        padding: const EdgeInsets.all(16),
        child: Column(
-            crossAxisAlignment: CrossAxisAlignment.stretch,
-            children: [
-              _buildAutoRefreshNumberField(
-                controller: _autoRefreshIntervalController,
-                label: l10n.common_interval,
-                min: _autoRefreshMinIntervalSeconds,
-                max: _autoRefreshMaxIntervalSeconds,
-                fallback: _autoRefreshIntervalSeconds,
-              ),
-              const SizedBox(height: 12),
-              _buildAutoRefreshNumberField(
-                controller: _autoRefreshQuantityController,
-                label: l10n.telemetry_autoFetchQuantity,
-                min: _autoRefreshMinQuantity,
-                max: _autoRefreshMaxQuantity,
-                fallback: _autoRefreshDefaultQuantity,
-              ),
-              if (counterText != null) ...[
-                const SizedBox(height: 12),
-                Text(
-                  counterText,
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                    color: _autoRefreshLastAttemptFailed
-                        ? Theme.of(context).colorScheme.error
-                        : null,
-                    fontWeight: FontWeight.w600,
-                  ),
-                ),
-              ],
-              const SizedBox(height: 12),
-              FilledButton(
-                onPressed: _isLoading && !_isAutoRefreshEnabled
-                    ? null
-                    : _toggleAutoRefresh,
-                child: _isAutoRefreshEnabled
-                    ? SizedBox(
-                        width: double.infinity,
-                        height: 20,
-                        child: Stack(
-                          alignment: Alignment.center,
-                          children: [
-                            Center(child: Text(l10n.common_disable)),
-                            Positioned(
-                              right: 0,
-                              child: SizedBox(
-                                width: 18,
-                                height: 18,
-                                child: CircularProgressIndicator(
-                                  strokeWidth: 2,
-                                  color: Theme.of(
-                                    context,
-                                  ).colorScheme.onPrimary,
-                                ),
-                              ),
-                            ),
-                          ],
-                        ),
-                      )
-                    : Text(l10n.common_enable),
-              ),
-            ],
-          ),
-        ),
-      ],
-    );
-  }
-
-  Widget _buildAutoRefreshNumberField({
-    required TextEditingController controller,
-    required String label,
-    required int min,
-    required int max,
-    required int fallback,
-  }) {
-    return TextField(
-      controller: controller,
-      enabled: !_isAutoRefreshEnabled,
-      keyboardType: TextInputType.number,
-      inputFormatters: [FilteringTextInputFormatter.digitsOnly],
-      decoration: InputDecoration(
-        labelText: label,
-        border: const OutlineInputBorder(),
-        isDense: true,
-      ),
-      onEditingComplete: () {
-        _clampControllerValue(
-          controller: controller,
-          min: min,
-          max: max,
-          fallback: fallback,
-        );
-        unawaited(_saveAutoRefreshSettings());
-        FocusScope.of(context).unfocus();
-      },
-      onSubmitted: (_) => unawaited(_saveAutoRefreshSettings()),
-      onTapOutside: (_) {
-        unawaited(_saveAutoRefreshSettings());
-        FocusScope.of(context).unfocus();
-      },
-    );
-  }
-
-  String? _autoRefreshCounterText() {
-    if (!_isAutoRefreshEnabled && _autoRefreshCurrentAttempt == 0) return null;
-    final counter = '$_autoRefreshCurrentAttempt/$_autoRefreshTotalAttempts';
-    if (_autoRefreshLastAttemptFailed) {
-      return '${context.l10n.telemetry_error}: $counter';
-    }
-    return counter;
-  }
-
-  void _toggleAutoRefresh() {
-    if (_isAutoRefreshEnabled) {
-      _stopAutoRefresh();
-      return;
-    }
-    _startAutoRefresh();
-  }
-
-  void _startAutoRefresh() {
-    final interval = _clampControllerValue(
-      controller: _autoRefreshIntervalController,
-      min: _autoRefreshMinIntervalSeconds,
-      max: _autoRefreshMaxIntervalSeconds,
-      fallback: _autoRefreshIntervalSeconds,
-    );
-    final quantity = _clampControllerValue(
-      controller: _autoRefreshQuantityController,
-      min: _autoRefreshMinQuantity,
-      max: _autoRefreshMaxQuantity,
-      fallback: _autoRefreshDefaultQuantity,
-    );
-    unawaited(_saveAutoRefreshSettings());
-
-    setState(() {
-      _isAutoRefreshEnabled = true;
-      _autoRefreshIntervalSeconds = interval;
-      _autoRefreshTotalAttempts = quantity;
-      _autoRefreshCurrentAttempt = 0;
-      _autoRefreshLastAttemptFailed = false;
-    });
-    _runAutoRefreshAttempt();
-  }
-
-  void _stopAutoRefresh() {
-    _autoRefreshTimer?.cancel();
-    _autoRefreshTimer = null;
-    if (!mounted) return;
-    setState(() {
-      _isAutoRefreshEnabled = false;
-    });
-  }
-
-  Future<void> _runAutoRefreshAttempt() async {
-    if (!_isAutoRefreshEnabled || !mounted) return;
-    if (_autoRefreshCurrentAttempt >= _autoRefreshTotalAttempts) {
-      _stopAutoRefresh();
-      return;
-    }
-
-    setState(() {
-      _autoRefreshCurrentAttempt += 1;
-    });
-    await _loadTelemetry(isAutoRefresh: true);
-  }
-
-  void _scheduleNextAutoRefreshAttempt() {
-    if (!_isAutoRefreshEnabled || !mounted) return;
-    _autoRefreshTimer?.cancel();
-    if (_autoRefreshCurrentAttempt >= _autoRefreshTotalAttempts) {
-      _stopAutoRefresh();
-      return;
-    }
-    // Start the interval only after the current request has finished: after a
-    // telemetry response, timeout, or send error. This keeps slow replies from
-    // shortening the intended pause between requests.
-    _autoRefreshTimer = Timer(
-      Duration(seconds: _autoRefreshIntervalSeconds),
-      _runAutoRefreshAttempt,
-    );
-  }
-
-  int _clampControllerValue({
-    required TextEditingController controller,
-    required int min,
-    required int max,
-    required int fallback,
-  }) {
-    final parsed = int.tryParse(controller.text);
-    final value = (parsed ?? fallback).clamp(min, max).toInt();
-    controller.text = value.toString();
-    controller.selection = TextSelection.collapsed(
-      offset: controller.text.length,
-    );
-    return value;
-  }
-
-  Widget _buildGpsInfo(dynamic value) {
-    final latitude = _readGpsValue(value, 'latitude');
-    final longitude = _readGpsValue(value, 'longitude');
-    final altitude = _readGpsValue(value, 'altitude');
-    final isValidPosition = _isValidGpsPosition(latitude, longitude);
-    final gpsText = isValidPosition
-        ? [
-            latitude!.toStringAsFixed(5),
-            longitude!.toStringAsFixed(5),
-            if (altitude != null) '${altitude.toStringAsFixed(1)} m',
-          ].join(', ')
-        : value.toString();
-
-    return Column(
          crossAxisAlignment: CrossAxisAlignment.start,
          children: [
-        _buildInfoRow(context.l10n.telemetry_gpsLabel, gpsText),
-        if (isValidPosition)
-          TelemetryLocationMap(
-            // The map renders only after bounds validation, keeping malformed
-            // Cayenne payloads from creating an invalid FlutterMap center.
-            latitude: latitude!,
-            longitude: longitude!,
-            label: widget.contact.name,
-            contactType: widget.contact.type,
-            contactPublicKeyHex: widget.contact.publicKeyHex,
+            Row(
+              children: [
+                Icon(
+                  Icons.info_outline,
+                  color: Theme.of(context).textTheme.headlineSmall?.color,
+                ),
+                const SizedBox(width: 8),
+                Text(
+                  title,
+                  style: const TextStyle(
+                    fontSize: 18,
+                    fontWeight: FontWeight.bold,
+                  ),
                ),
              ],
+            ),
+            const Divider(),
+            for (final entry in channelData.entries)
+              if (entry.key == 'voltage' && channel == 1)
+                _buildInfoRow(
+                  l10n.telemetry_batteryLabel,
+                  _batteryText(entry.value),
+                )
+              else if (entry.key == 'voltage')
+                _buildInfoRow(
+                  l10n.telemetry_voltageLabel,
+                  l10n.telemetry_voltageValue(entry.value.toString()),
+                )
+              else if (entry.key == 'temperature' && channel == 1)
+                _buildInfoRow(
+                  l10n.telemetry_mcuTemperatureLabel,
+                  _temperatureText(entry.value, isImperialUnits),
+                )
+              else if (entry.key == 'temperature')
+                _buildInfoRow(
+                  l10n.telemetry_temperatureLabel,
+                  _temperatureText(entry.value, isImperialUnits),
+                )
+              else if (entry.key == 'current' && channel == 1)
+                _buildInfoRow(
+                  l10n.telemetry_currentLabel,
+                  l10n.telemetry_currentValue(entry.value.toString()),
+                )
+              else
+                _buildInfoRow(entry.key, entry.value.toString()),
+          ],
+        ),
+      ),
    );
  }

-  double? _readGpsValue(dynamic value, String key) {
-    if (value is! Map) return null;
-    final rawValue = value[key];
-    if (rawValue is num) return rawValue.toDouble();
-    return null;
-  }
-
-  bool _isValidGpsPosition(double? latitude, double? longitude) {
-    if (latitude == null || longitude == null) return false;
-    const double epsilon = 1e-6;
-    return (latitude.abs() > epsilon || longitude.abs() > epsilon) &&
-        latitude >= -90.0 &&
-        latitude <= 90.0 &&
-        longitude >= -180.0 &&
-        longitude <= 180.0;
-  }
-
-  String _telemetryValueText(dynamic value) {
-    if (value == null) return context.l10n.common_notAvailable;
-    if (value is double) {
-      return value.toStringAsFixed(value.truncateToDouble() == value ? 0 : 2);
-    }
-    if (value is num) {
-      return value.toString();
-    }
-    return value.toString();
-  }
-
-  String _telemetryAxisText(dynamic value) {
-    if (value is! Map) return _telemetryValueText(value);
-    final x = _telemetryValueText(value['x']);
-    final y = _telemetryValueText(value['y']);
-    final z = _telemetryValueText(value['z']);
-    return 'X: $x, Y: $y, Z: $z';
-  }
-
-  String _telemetryColorText(dynamic value) {
-    if (value is! Map) return _telemetryValueText(value);
-    final red = _telemetryValueText(value['red']);
-    final green = _telemetryValueText(value['green']);
-    final blue = _telemetryValueText(value['blue']);
-    return 'R: $red, G: $green, B: $blue';
-  }
-
-  String _telemetryMapText(dynamic value) {
-    if (value is! Map) return _telemetryValueText(value);
-    return value.entries
-        .map((entry) => '${entry.key}: ${entry.value}')
-        .join(', ');
-  }
-
-  String _telemetryTimeText(dynamic value) {
-    if (value is! num || value <= 0) return _telemetryValueText(value);
-    final dateTime = DateTime.fromMillisecondsSinceEpoch(
-      value.toInt() * 1000,
-      isUtc: true,
-    ).toLocal();
-    final localizations = MaterialLocalizations.of(context);
-    final time = localizations.formatTimeOfDay(
-      TimeOfDay.fromDateTime(dateTime),
-    );
-    return '${localizations.formatFullDate(dateTime)} $time';
-  }
-
  Widget _buildInfoRow(String label, String value) {
-    final scheme = Theme.of(context).colorScheme;
    return Padding(
      padding: const EdgeInsets.symmetric(vertical: 6),
      child: Row(
        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
-          Expanded(
+          SizedBox(
+            width: 130,
            child: Text(
              label,
              style: TextStyle(
-                color: scheme.onSurfaceVariant,
-                fontSize: 13,
+                color: Colors.grey[600],
                fontWeight: FontWeight.w500,
              ),
            ),
          ),
-          const SizedBox(width: 8),
-          Text(
+          Expanded(
+            child: Text(
              value,
-            style: MeshTheme.mono(fontSize: 13, color: scheme.onSurface),
-            textAlign: TextAlign.end,
+              style: const TextStyle(fontWeight: FontWeight.w400),
+            ),
          ),
        ],
      ),
@@ -963,10 +483,3 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
    return '${tempC.toStringAsFixed(1)}°C';
  }
 }
-
-class _TelemetryFieldDisplay {
-  final String label;
-  final String value;
-
-  const _TelemetryFieldDisplay(this.label, this.value);
-}
@@ -6,15 +6,13 @@ import 'package:provider/provider.dart';

 import '../connector/meshcore_connector.dart';
 import '../l10n/l10n.dart';
-import '../theme/mesh_theme.dart';
 import '../utils/app_logger.dart';
 import '../utils/platform_info.dart';
 import '../utils/usb_port_labels.dart';
 import '../widgets/adaptive_app_bar_title.dart';
-import '../widgets/empty_state.dart';
-import '../widgets/mesh_ui.dart';
 import '../helpers/snack_bar_builder.dart';
-import 'channels_screen.dart';
+import 'contacts_screen.dart';
+import 'scanner_screen.dart';
 import 'tcp_screen.dart';

 class UsbScreen extends StatefulWidget {
@@ -27,7 +25,7 @@ class UsbScreen extends StatefulWidget {
 class _UsbScreenState extends State<UsbScreen> {
  final List<String> _ports = <String>[];
  bool _isLoadingPorts = true;
-  bool _navigatedToChannels = false;
+  bool _navigatedToContacts = false;
  bool _didScheduleInitialLoad = false;
  Timer? _hotPlugTimer;
  late final MeshCoreConnector _connector;
@@ -43,14 +41,14 @@ class _UsbScreenState extends State<UsbScreen> {
    _connectionListener = () {
      if (!mounted) return;
      if (_connector.state == MeshCoreConnectionState.disconnected) {
-        _navigatedToChannels = false;
+        _navigatedToContacts = false;
      }
      if (_connector.state == MeshCoreConnectionState.connected &&
          _connector.isUsbTransportConnected &&
-          !_navigatedToChannels) {
-        _navigatedToChannels = true;
+          !_navigatedToContacts) {
+        _navigatedToContacts = true;
        Navigator.of(context).pushReplacement(
-          MaterialPageRoute(builder: (_) => const ChannelsScreen()),
+          MaterialPageRoute(builder: (_) => const ContactsScreen()),
        );
      }
    };
@@ -74,7 +72,7 @@ class _UsbScreenState extends State<UsbScreen> {
    _hotPlugTimer?.cancel();
    _hotPlugTimer = null;
    _connector.removeListener(_connectionListener);
-    if (!_navigatedToChannels &&
+    if (!_navigatedToContacts &&
        _connector.activeTransport == MeshCoreTransportType.usb &&
        _connector.state != MeshCoreConnectionState.disconnected) {
      WidgetsBinding.instance.addPostFrameCallback((_) {
@@ -100,43 +98,70 @@ class _UsbScreenState extends State<UsbScreen> {
        child: Consumer<MeshCoreConnector>(
          builder: (context, connector, child) {
            return Column(
-              crossAxisAlignment: CrossAxisAlignment.stretch,
              children: [
-                // Status header
-                Padding(
-                  padding: const EdgeInsets.fromLTRB(16, 12, 16, 4),
-                  child: AnimatedSwitcher(
-                    duration: const Duration(milliseconds: 300),
-                    child: Align(
-                      key: ValueKey('${connector.state}_$_isLoadingPorts'),
-                      alignment: Alignment.centerLeft,
-                      child: _buildStatusChip(context, connector),
-                    ),
-                  ),
-                ),
-
-                // Transport switcher
-                _buildTransportLinks(context),
-
-                // Port list
+                _buildStatusBar(context, connector),
                Expanded(child: _buildPortList(context, connector)),
              ],
            );
          },
        ),
      ),
-      bottomNavigationBar: _supportsHotPlug
-          ? null
-          : SafeArea(
+      bottomNavigationBar: Consumer<MeshCoreConnector>(
+        builder: (context, connector, child) {
+          final isLoading = _isLoadingPorts;
+          final showBle = true;
+          final showTcp = !PlatformInfo.isWeb;
+
+          return SafeArea(
            top: false,
            minimum: const EdgeInsets.fromLTRB(16, 8, 16, 16),
+            child: FittedBox(
+              fit: BoxFit.scaleDown,
+              alignment: Alignment.centerRight,
              child: Row(
                mainAxisAlignment: MainAxisAlignment.end,
                children: [
+                  if (showTcp)
                    FloatingActionButton.extended(
-                    onPressed: _isLoadingPorts ? null : _loadPorts,
+                      onPressed: () {
+                        Navigator.of(context).pushReplacement(
+                          MaterialPageRoute(builder: (_) => const TcpScreen()),
+                        );
+                      },
+                      heroTag: 'usb_tcp_action',
+                      extendedPadding: const EdgeInsets.symmetric(
+                        horizontal: 12,
+                      ),
+                      icon: const Icon(Icons.lan),
+                      label: Text(context.l10n.connectionChoiceTcpLabel),
+                    ),
+                  if (showTcp && showBle) const SizedBox(width: 12),
+                  if (showBle)
+                    FloatingActionButton.extended(
+                      onPressed: () {
+                        Navigator.of(context).pushReplacement(
+                          MaterialPageRoute(
+                            builder: (_) => const ScannerScreen(),
+                          ),
+                        );
+                      },
+                      heroTag: 'usb_ble_action',
+                      extendedPadding: const EdgeInsets.symmetric(
+                        horizontal: 12,
+                      ),
+                      icon: const Icon(Icons.bluetooth),
+                      label: Text(context.l10n.connectionChoiceBluetoothLabel),
+                    ),
+                  if ((showTcp || showBle) && !_supportsHotPlug)
+                    const SizedBox(width: 12),
+                  if (!_supportsHotPlug)
+                    FloatingActionButton.extended(
+                      onPressed: isLoading ? null : _loadPorts,
                      heroTag: 'usb_refresh_action',
-                    icon: _isLoadingPorts
+                      extendedPadding: const EdgeInsets.symmetric(
+                        horizontal: 12,
+                      ),
+                      icon: isLoading
                          ? const SizedBox(
                              width: 20,
                              height: 20,
@@ -149,75 +174,62 @@ class _UsbScreenState extends State<UsbScreen> {
              ),
            ),
          );
+        },
+      ),
+    );
  }

-  Widget _buildStatusChip(BuildContext context, MeshCoreConnector connector) {
+  Widget _buildStatusBar(BuildContext context, MeshCoreConnector connector) {
    final l10n = context.l10n;
-    final scheme = Theme.of(context).colorScheme;
+    String statusText;
+    Color statusColor;

    if (_isLoadingPorts) {
-      return StatusChip(
-        label: l10n.usbStatus_searching,
-        color: scheme.primary,
-        pulse: true,
-      );
+      statusText = l10n.usbStatus_searching;
+      statusColor = Colors.blue;
    } else if (connector.isUsbTransportConnected) {
      switch (connector.state) {
        case MeshCoreConnectionState.connected:
-          return StatusChip(
-            label: l10n.scanner_connectedTo(
+          statusText = l10n.scanner_connectedTo(
            connector.activeUsbPortDisplayLabel ?? 'USB',
-            ),
-            color: MeshPalette.signal,
          );
+          statusColor = Colors.green;
        case MeshCoreConnectionState.disconnecting:
-          return StatusChip(
-            label: l10n.scanner_disconnecting,
-            color: MeshPalette.warn,
-            pulse: true,
-          );
+          statusText = l10n.scanner_disconnecting;
+          statusColor = Colors.orange;
        default:
-          return StatusChip(
-            label: l10n.usbStatus_notConnected,
-            color: scheme.onSurfaceVariant,
-          );
+          statusText = l10n.usbStatus_notConnected;
+          statusColor = Colors.grey;
      }
    } else if (connector.state == MeshCoreConnectionState.connecting &&
        connector.activeTransport == MeshCoreTransportType.usb) {
-      return StatusChip(
-        label: l10n.usbStatus_connecting,
-        color: MeshPalette.warn,
-        pulse: true,
-      );
+      statusText = l10n.usbStatus_connecting;
+      statusColor = Colors.orange;
    } else {
-      return StatusChip(
-        label: l10n.usbStatus_notConnected,
-        color: scheme.onSurfaceVariant,
-      );
-    }
+      statusText = l10n.usbStatus_notConnected;
+      statusColor = Colors.grey;
    }

-  Widget _buildTransportLinks(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-      child: Wrap(
-        spacing: 12,
-        runSpacing: 8,
+    return Container(
+      width: double.infinity,
+      padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
+      color: statusColor.withValues(alpha: 0.1),
+      child: Row(
        children: [
-          if (!PlatformInfo.isWeb)
-            OutlinedButton.icon(
-              onPressed: () {
-                Navigator.of(context).pushReplacement(
-                  MaterialPageRoute(builder: (_) => const TcpScreen()),
-                );
-              },
-              icon: const Icon(Icons.lan),
-              label: Text(context.l10n.connectionChoiceTcpLabel),
+          Icon(Icons.circle, size: 12, color: statusColor),
+          const SizedBox(width: 8),
+          Expanded(
+            child: FittedBox(
+              fit: BoxFit.scaleDown,
+              alignment: Alignment.centerLeft,
+              child: Text(
+                statusText,
+                style: TextStyle(
+                  color: statusColor,
+                  fontWeight: FontWeight.w500,
+                ),
+              ),
            ),
-          OutlinedButton.icon(
-            onPressed: () => Navigator.of(context).maybePop(),
-            icon: const Icon(Icons.bluetooth),
-            label: Text(context.l10n.connectionChoiceBluetoothLabel),
          ),
        ],
      ),
@@ -228,20 +240,46 @@ class _UsbScreenState extends State<UsbScreen> {
    final l10n = context.l10n;

    if (_isLoadingPorts) {
-      return EmptyState(icon: Icons.usb, title: l10n.usbStatus_searching);
+      return Center(
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Icon(Icons.usb, size: 64, color: Colors.grey[400]),
+            const SizedBox(height: 16),
+            Text(
+              l10n.usbStatus_searching,
+              style: TextStyle(fontSize: 16, color: Colors.grey[600]),
+            ),
+          ],
+        ),
+      );
    }

    if (_ports.isEmpty) {
-      return EmptyState(icon: Icons.usb, title: l10n.usbScreenEmptyState);
+      return Center(
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Icon(Icons.usb, size: 64, color: Colors.grey[400]),
+            const SizedBox(height: 16),
+            Text(
+              l10n.usbScreenEmptyState,
+              textAlign: TextAlign.center,
+              style: TextStyle(fontSize: 16, color: Colors.grey[600]),
+            ),
+          ],
+        ),
+      );
    }

    final isConnecting =
        connector.state == MeshCoreConnectionState.connecting &&
        connector.activeTransport == MeshCoreTransportType.usb;

-    return ListView.builder(
-      padding: const EdgeInsets.only(bottom: 32),
+    return ListView.separated(
+      padding: const EdgeInsets.all(8),
      itemCount: _ports.length,
+      separatorBuilder: (context, index) => const Divider(),
      itemBuilder: (context, index) {
        final port = _ports[index];
        final displayName = friendlyUsbPortName(port);
@@ -249,50 +287,18 @@ class _UsbScreenState extends State<UsbScreen> {
        final showRawName =
            rawName != displayName && !rawName.startsWith('web:');

-        return ListEntrance(
-          index: index,
-          child: MeshCard(
-            padding: EdgeInsets.zero,
-            child: ListTile(
-              onTap: isConnecting
-                  ? null
-                  : () {
-                      HapticFeedback.selectionClick();
-                      _connectPort(port);
-                    },
-              leading: AvatarCircle(
-                name: displayName,
-                size: 40,
-                icon: Icons.usb,
-                color: Theme.of(context).colorScheme.primary,
-              ),
+        return ListTile(
+          leading: const Icon(Icons.usb),
          title: Text(
            displayName,
-                style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                  fontWeight: FontWeight.w600,
-                  color: Theme.of(context).colorScheme.onSurface,
-                ),
-                maxLines: 1,
-                overflow: TextOverflow.ellipsis,
-              ),
-              subtitle: showRawName
-                  ? Text(
-                      rawName,
-                      style: MeshTheme.mono(
-                        fontSize: 11,
-                        color: Theme.of(context).colorScheme.onSurfaceVariant,
-                      ),
-                      maxLines: 1,
-                      overflow: TextOverflow.ellipsis,
-                    )
-                  : null,
-              trailing: Icon(
-                Icons.chevron_right,
-                size: 18,
-                color: Theme.of(context).colorScheme.onSurfaceVariant,
-              ),
+            style: const TextStyle(fontWeight: FontWeight.w500),
          ),
+          subtitle: showRawName ? Text(rawName) : null,
+          trailing: ElevatedButton(
+            onPressed: isConnecting ? null : () => _connectPort(port),
+            child: Text(l10n.common_connect),
          ),
+          onTap: isConnecting ? null : () => _connectPort(port),
        );
      },
    );
@@ -378,27 +384,13 @@ class _UsbScreenState extends State<UsbScreen> {

  void _showError(Object error) {
    if (!mounted) return;
-    // Cancelling the browser's serial port picker is a normal user action, not
-    // an error — don't show a scary red toast (and never leak the raw
-    // DOMException text).
-    if (_isUserCancelledPortPicker(error)) return;
    showDismissibleSnackBar(
      context,
      content: Text(_friendlyErrorMessage(error)),
-      backgroundColor: Theme.of(context).colorScheme.error,
+      backgroundColor: Colors.red,
    );
  }

-  bool _isUserCancelledPortPicker(Object error) {
-    if (error is StateError &&
-        error.message.contains('No USB serial device selected')) {
-      return true;
-    }
-    final text = error.toString();
-    return text.contains('No port selected by the user') ||
-        text.contains("Failed to execute 'requestPort'");
-  }
-
  String _friendlyErrorMessage(Object error) {
    final l10n = context.l10n;

@@ -235,12 +235,6 @@ class AppSettingsService extends ChangeNotifier {
    await updateSettings(_settings.copyWith(translationEnabled: value));
  }

-  Future<void> setAutoTranslateIncomingMessages(bool value) async {
-    await updateSettings(
-      _settings.copyWith(autoTranslateIncomingMessages: value),
-    );
-  }
-
  Future<void> setTranslationTargetLanguageCode(String? value) async {
    await updateSettings(
      _settings.copyWith(translationTargetLanguageCode: value),
@@ -39,12 +39,7 @@ class RetryServiceConfig {
  final void Function(Message) updateMessage;
  final Function(Contact)? clearContactPath;
  final Function(Contact, Uint8List, int)? setContactPath;
-  final int Function(
-    int pathLength,
-    int messageBytes, {
-    String? contactKey,
-    int? deviceTimeoutMs,
-  })?
+  final int Function(int pathLength, int messageBytes, {String? contactKey})?
  calculateTimeout;
  final Uint8List? Function()? getSelfPublicKey;
  final String Function(Contact, String)? prepareContactOutboundText;
@@ -79,12 +74,6 @@ class RetryServiceConfig {

 class MessageRetryService extends ChangeNotifier {
  static const int maxAckHistorySize = 100;
-
-  /// Global cap on concurrent in-flight messages across ALL contacts.
-  /// The firmware's expected_ack_table is a single 8-entry circular buffer
-  /// shared globally; cap at 6 to leave two slots of headroom.
-  static const int _maxGlobalInFlight = 6;
-
  int _maxRetries = 5;
  int get maxRetries => _maxRetries;

@@ -181,9 +170,8 @@ class MessageRetryService extends ChangeNotifier {

    _config?.addMessage(contact.publicKeyHex, message);

-    // Queue per contact — one message in-flight per contact at a time, and
-    // bounded globally by _maxGlobalInFlight across all contacts so we never
-    // overflow the firmware's 8-entry global expected_ack_table.
+    // Queue per contact — only one message in-flight at a time to avoid
+    // overflowing the firmware's 8-entry expected_ack_table.
    final contactKey = contact.publicKeyHex;
    _sendQueue[contactKey] ??= [];
    _sendQueue[contactKey]!.add(messageId);
@@ -196,11 +184,6 @@ class MessageRetryService extends ChangeNotifier {
  }

  void _sendNextForContact(String contactKey) {
-    // Enforce the global in-flight cap before starting a new send.
-    // The firmware's expected_ack_table is a single 8-entry circular buffer
-    // shared across all contacts; exceeding it silently evicts an older slot.
-    if (_activeMessages.length >= _maxGlobalInFlight) return;
-
    final queue = _sendQueue[contactKey];
    if (queue == null) return;

@@ -227,23 +210,8 @@ class MessageRetryService extends ChangeNotifier {
  void _onMessageResolved(String messageId, String contactKey) {
    if (_resolvedMessages.contains(messageId)) return;
    _resolvedMessages.add(messageId);
-    // If cleanup already removed this message from the active set, it has
-    // already pumped the queues; avoid double-pumping.
-    if (!_activeMessages.remove(messageId)) return;
-    _pumpQueues(contactKey);
-  }
-
-  void _pumpQueues(String contactKey) {
-    // Pump this contact's queue first, then any other contacts that are waiting.
+    _activeMessages.remove(messageId);
    _sendNextForContact(contactKey);
-    for (final key in _sendQueue.keys) {
-      if (key == contactKey) continue;
-      if (_activeMessages.length >= _maxGlobalInFlight) break;
-      final queue = _sendQueue[key];
-      if (queue != null && queue.isNotEmpty) {
-        _sendNextForContact(key);
-      }
-    }
  }

  PathSelection? _selectPathForAttempt(Message message, Contact contact) {
@@ -384,10 +352,6 @@ class MessageRetryService extends ChangeNotifier {
  }

  bool updateMessageFromSent(int ackHash, int timeoutMs) {
-    // Firmware sets expected_ack = 0 for CLI/command sends (TXT_TYPE_CLI_DATA).
-    // No ACK will ever be issued for these, so arming a retry timer is wrong.
-    if (ackHash == 0) return false;
-
    final config = _config;
    if (config == null) return false;

@@ -440,18 +404,13 @@ class MessageRetryService extends ChangeNotifier {

    // Calculate timeout: prefer ML prediction, then device-provided, then physics fallback
    final pathLengthValue = message.pathLength ?? contact.pathLength;
-    final outboundTextForTimeout =
-        config.prepareContactOutboundText?.call(contact, message.text) ??
-        message.text;
-    final messageBytesForTimeout = utf8.encode(outboundTextForTimeout).length;

    int actualTimeout = timeoutMs;
    if (config.calculateTimeout != null) {
      actualTimeout = config.calculateTimeout!(
        pathLengthValue,
-        messageBytesForTimeout,
+        message.text.length,
        contactKey: contact.publicKeyHex,
-        deviceTimeoutMs: timeoutMs > 0 ? timeoutMs : null,
      );
    }

@@ -490,28 +449,17 @@ class MessageRetryService extends ChangeNotifier {
    });
  }

-  void untrack(String messageId) {
-    _timeoutTimers[messageId]?.cancel();
-    _cleanupMessage(messageId);
-  }
-
  void _cleanupMessage(String messageId) {
    _moveAckHashesToHistory(messageId);
    _ackHashToMessageId.removeWhere(
      (_, mapping) => mapping.messageId == messageId,
    );
    _expectedHashToMessageId.removeWhere((_, msgId) => msgId == messageId);
-    final contactKey = _pendingContacts[messageId]?.publicKeyHex;
    _pendingMessages.remove(messageId);
    _pendingContacts.remove(messageId);
    _attemptPathHistory.remove(messageId);
    _timeoutTimers.remove(messageId);
    _resolvedMessages.remove(messageId);
-    // Cancellation (and other cleanup paths) must release the active in-flight
-    // slot and pump waiting queues so the global cap does not stall forever.
-    if (_activeMessages.remove(messageId) && contactKey != null) {
-      _pumpQueues(contactKey);
-    }
  }

  void _handleTimeout(String messageId) {
@@ -664,6 +612,7 @@ class MessageRetryService extends ChangeNotifier {
        for (final expectedHash in expectedHashes) {
          if (expectedHash == ackHash) {
            matchedMessageId = messageId;
+            matchedAttemptIndex = expectedHashes.indexOf(expectedHash);
            break;
          }
        }
@@ -715,16 +664,10 @@ class MessageRetryService extends ChangeNotifier {
        if (config?.onDeliveryObserved != null &&
            tripTimeMs > 0 &&
            message.pathLength != null) {
-          final outboundTextForObserved =
-              config!.prepareContactOutboundText?.call(contact, message.text) ??
-              message.text;
-          final messageBytesForObserved = utf8
-              .encode(outboundTextForObserved)
-              .length;
-          config.onDeliveryObserved!(
+          config!.onDeliveryObserved!(
            contact.publicKeyHex,
            message.pathLength!,
-            messageBytesForObserved,
+            message.text.length,
            tripTimeMs,
          );
        }
@@ -114,36 +114,6 @@ class NotificationService {
    return _isInitialized;
  }

-  // Cached "are we allowed to post notifications" result. Null = not yet
-  // determined. Avoids calling _notifications.show() when it would only throw
-  // "You must request notifications permissions first" (every web build, and
-  // Android 13+ before the user grants the permission).
-  bool? _canNotify;
-
-  Future<bool> _ensureCanNotify() async {
-    if (!await _ensureInitialized()) return false;
-    final cached = _canNotify;
-    if (cached != null) return cached;
-
-    // flutter_local_notifications has no web backend, so show() always throws.
-    // Skip silently instead of logging an error per incoming message.
-    if (kIsWeb) return _canNotify = false;
-
-    // On Android 13+ notifications require an explicit grant; reflect the real
-    // OS state so we don't spam failed show() calls when denied.
-    final androidPlugin = _notifications
-        .resolvePlatformSpecificImplementation<
-          AndroidFlutterLocalNotificationsPlugin
-        >();
-    if (androidPlugin != null) {
-      final enabled = await androidPlugin.areNotificationsEnabled();
-      return _canNotify = enabled ?? false;
-    }
-
-    // iOS/macOS request permission during initialize(); desktop has no gate.
-    return _canNotify = true;
-  }
-
  Future<bool> requestPermissions() async {
    if (!_isInitialized) {
      await initialize();
@@ -156,8 +126,7 @@ class NotificationService {
        >();
    if (androidPlugin != null) {
      final granted = await androidPlugin.requestNotificationsPermission();
-      _canNotify = granted ?? false;
-      return _canNotify!;
+      return granted ?? false;
    }

    // iOS permissions are requested during initialization
@@ -171,8 +140,7 @@ class NotificationService {
        badge: true,
        sound: true,
      );
-      _canNotify = granted ?? false;
-      return _canNotify!;
+      return granted ?? false;
    }

    return true;
@@ -197,7 +165,7 @@ class NotificationService {
    String? contactId,
    int? badgeCount,
  }) async {
-    if (!await _ensureCanNotify()) return;
+    if (!await _ensureInitialized()) return;

    final androidDetails = AndroidNotificationDetails(
      'messages',
@@ -247,7 +215,7 @@ class NotificationService {
    required String contactType,
    String? contactId,
  }) async {
-    if (!await _ensureCanNotify()) return;
+    if (!await _ensureInitialized()) return;

    const androidDetails = AndroidNotificationDetails(
      'adverts',
@@ -280,7 +248,7 @@ class NotificationService {
      await _notifications.show(
        id: contactId != null
            ? 'advert:$contactId'.hashCode
-            : DateTime.now().millisecondsSinceEpoch & 0x7FFFFFFF,
+            : DateTime.now().millisecondsSinceEpoch,
        title: _l10n.notification_newTypeDiscovered(contactType),
        body: contactName,
        notificationDetails: notificationDetails,
@@ -297,7 +265,7 @@ class NotificationService {
    int? channelIndex,
    int? badgeCount,
  }) async {
-    if (!await _ensureCanNotify()) return;
+    if (!await _ensureInitialized()) return;

    final androidDetails = AndroidNotificationDetails(
      'channel_messages',
@@ -336,9 +304,7 @@ class NotificationService {

    try {
      await _notifications.show(
-        id:
-            channelIndex?.hashCode ??
-            DateTime.now().millisecondsSinceEpoch & 0x7FFFFFFF,
+        id: channelIndex?.hashCode ?? DateTime.now().millisecondsSinceEpoch,
        title: channelName,
        body: body,
        notificationDetails: notificationDetails,
@@ -577,7 +543,7 @@ class NotificationService {
  }

  Future<void> _showBatchSummary(List<_PendingNotification> batch) async {
-    if (!await _ensureCanNotify()) return;
+    if (!await _ensureInitialized()) return;

    // Group by type
    final messages = batch
@@ -134,12 +134,10 @@ class PathHistoryService extends ChangeNotifier {
      newWeight = (currentWeight + successIncrement).clamp(0.0, maxWeight);
    } else {
      newWeight = currentWeight - failureDecrement;
-      if (newWeight <= 0 && failureCount >= 3) {
+      if (newWeight <= 0) {
        removePathRecord(contactPubKeyHex, selection.pathBytes);
        return;
      }
-      // Keep the record with a small floor weight until we have enough evidence
-      newWeight = newWeight.clamp(0.1, maxWeight);
    }

    _addPathRecord(
@@ -63,15 +63,12 @@ class TimeoutPredictionService extends ChangeNotifier {
    required int tripTimeMs,
    int secondsSinceLastRx = 0,
  }) {
-    final isFlood = pathLength < 0;
    final observation = DeliveryObservation(
      contactKey: contactKey,
-      // Clamp to 0 for flood so the hop-count slope is learned from direct paths
-      // only; isFlood carries the flood signal as a separate feature.
-      pathLength: isFlood ? 0 : pathLength,
+      pathLength: pathLength,
      messageBytes: messageBytes,
      secondsSinceLastRx: secondsSinceLastRx,
-      isFlood: isFlood,
+      isFlood: pathLength < 0,
      deliveryMs: tripTimeMs,
      timestamp: DateTime.now(),
    );
@@ -79,11 +76,10 @@ class TimeoutPredictionService extends ChangeNotifier {
    _observations.add(observation);
    if (_observations.length > maxObservations) {
      _observations.removeAt(0);
-      _rebuildContactStats();
-    } else {
+    }
+
    _contactStats.putIfAbsent(contactKey, () => _ContactStats());
    _contactStats[contactKey]!.add(tripTimeMs.toDouble());
-    }

    _observationsSinceLastTrain++;
    if (_observationsSinceLastTrain >= _retrainInterval &&
@@ -112,14 +108,11 @@ class TimeoutPredictionService extends ChangeNotifier {
    try {
      if (_activeFeatures.isEmpty) return null;

-      final flood = pathLength < 0;
      final allFeatures = {
-        // Clamp to 0 for flood — mirrors recordObservation so training and
-        // prediction see the same pathLength values; isFlood carries the signal.
-        'pathLength': flood ? 0.0 : pathLength.toDouble(),
+        'pathLength': pathLength.toDouble(),
        'messageBytes': messageBytes.toDouble(),
        'secSinceRx': secondsSinceLastRx.toDouble(),
-        'isFlood': flood ? 1.0 : 0.0,
+        'isFlood': pathLength < 0 ? 1.0 : 0.0,
      };
      final row = _activeFeatures.map((f) => allFeatures[f]!).toList();

@@ -171,9 +164,7 @@ class TimeoutPredictionService extends ChangeNotifier {
      // (ml_algo's OLS produces all-zero coefficients for singular matrices)
      final allNames = ['pathLength', 'messageBytes', 'secSinceRx', 'isFlood'];
      final allExtractors = <double Function(DeliveryObservation)>[
-        // pathLength is already clamped to >=0 in recordObservation, but guard
-        // here as well for any observations loaded from older persisted data.
-        (o) => o.pathLength < 0 ? 0.0 : o.pathLength.toDouble(),
+        (o) => o.pathLength.toDouble(),
        (o) => o.messageBytes.toDouble(),
        (o) => o.secondsSinceLastRx.toDouble(),
        (o) => o.isFlood ? 1.0 : 0.0,
@@ -224,9 +215,6 @@ class TimeoutPredictionService extends ChangeNotifier {

  @override
  void dispose() {
-    if (_persistTimer?.isActive == true) {
-      _storage?.saveDeliveryObservations(_observations);
-    }
    _persistTimer?.cancel();
    super.dispose();
  }
@@ -3,7 +3,6 @@ import 'dart:async';
 import 'package:flutter/foundation.dart';
 import 'package:http/http.dart' as http;
 import 'package:llamadart/llamadart.dart';
-import 'package:flutter_langdetect/flutter_langdetect.dart';

 import '../models/app_settings.dart';
 import '../models/translation_support.dart';
@@ -42,12 +41,8 @@ class TranslationService extends ChangeNotifier {
  TranslationService(
    this._appSettingsService, {
    TranslationFileStore? fileStore,
-  }) : _fileStore = fileStore ?? TranslationFileStore() {
-    // Initialize langdetect once at service construction.
-    _langDetectInit = initLangDetect();
-  }
+  }) : _fileStore = fileStore ?? TranslationFileStore();

-  bool _disposed = false;
  bool _isBusy = false;
  bool _isDownloading = false;
  bool _cancelDownloadRequested = false;
@@ -56,7 +51,6 @@ class TranslationService extends ChangeNotifier {
  LlamaEngine? _engine;
  String? _loadedModelPath;
  String? _failedModelPath;
-  Future<void>? _langDetectInit;
  int _downloadedBytes = 0;
  int? _downloadTotalBytes;
  String? _downloadFileName;
@@ -90,22 +84,7 @@ class TranslationService extends ChangeNotifier {
        'en';
  }

-  bool shouldAutoTranslateIncoming({
-    required String text,
-    required bool isCli,
-    required bool isOutgoing,
-  }) {
-    if (!_settings.autoTranslateIncomingMessages) {
-      return false;
-    }
-    return canTranslateIncoming(
-      text: text,
-      isCli: isCli,
-      isOutgoing: isOutgoing,
-    );
-  }
-
-  bool canTranslateIncoming({
+  bool shouldTranslateIncoming({
    required String text,
    required bool isCli,
    required bool isOutgoing,
@@ -216,7 +195,7 @@ class TranslationService extends ChangeNotifier {
        }

        _downloadTotalBytes = totalSize;
-        _notify();
+        notifyListeners();

        DownloadedModelFile downloaded;
        if (supportsRange &&
@@ -269,7 +248,7 @@ class TranslationService extends ChangeNotifier {
        throw StateError('Model download failed: HTTP ${response.statusCode}');
      }
      _downloadTotalBytes ??= response.contentLength;
-      _notify();
+      notifyListeners();
      final trackedStream = _trackDownloadProgress(response.stream);
      return await _fileStore.writeModelBytes(
        fileName: fileName,
@@ -314,7 +293,7 @@ class TranslationService extends ChangeNotifier {
        throw const TranslationDownloadCancelled();
      }
      _downloadFileName = 'Merging chunks...';
-      _notify();
+      notifyListeners();
      combineReached = true;
      return await _fileStore.combineChunks(
        fileName: fileName,
@@ -362,7 +341,7 @@ class TranslationService extends ChangeNotifier {
    }
    _cancelDownloadRequested = true;
    _lastError = 'Download stopped.';
-    _notify();
+    notifyListeners();
  }

  Future<void> removeModel(TranslationModelRecord model) async {
@@ -389,9 +368,7 @@ class TranslationService extends ChangeNotifier {
    if (targetLanguageCode == null || !_isPlainTextEligible(text)) {
      return null;
    }
-    final detectedLanguageCode = await detectLanguage(
-      _stripReplyInfoForDetection(text),
-    );
+    final detectedLanguageCode = await detectLanguage(text);
    if (detectedLanguageCode != null &&
        detectedLanguageCode == targetLanguageCode) {
      return const TranslationResult(
@@ -432,9 +409,7 @@ class TranslationService extends ChangeNotifier {
    if (targetLanguageCode == null || !_isPlainTextEligible(text)) {
      return null;
    }
-    final detectedLanguageCode = await detectLanguage(
-      _stripReplyInfoForDetection(text),
-    );
+    final detectedLanguageCode = await detectLanguage(text);
    if (detectedLanguageCode != null &&
        detectedLanguageCode == targetLanguageCode) {
      return const TranslationResult(
@@ -461,26 +436,7 @@ class TranslationService extends ChangeNotifier {
  }

  Future<String?> detectLanguage(String text) async {
-    try {
-      // Ensure the detector is initialized (constructor starts init).
-      await (_langDetectInit ??= initLangDetect());
-      final code = detect(text);
-      if (code.isEmpty) return null;
-      return code;
-    } catch (error) {
-      _lastError = error.toString();
-      appLogger.warn('Language detection failed: $error');
-      _notify();
-      return null;
-    }
-  }
-
-  String _stripReplyInfoForDetection(String text) {
-    final match = RegExp(
-      r'@\[([^\]]+)\]\s+(.+)$',
-      dotAll: true,
-    ).firstMatch(text);
-    return match?.group(2) ?? text;
+    return _heuristicLanguageCode(text);
  }

  Future<String?> _translateText({
@@ -539,7 +495,7 @@ class TranslationService extends ChangeNotifier {
    } catch (error) {
      _lastError = error.toString();
      appLogger.warn('Translation request failed: $error');
-      _notify();
+      notifyListeners();
      return null;
    }
  }
@@ -562,6 +518,72 @@ class TranslationService extends ChangeNotifier {
        trimmed.startsWith('r:'));
  }

+  String? _heuristicLanguageCode(String text) {
+    final trimmed = text.trim();
+    if (trimmed.isEmpty) {
+      return null;
+    }
+
+    if (RegExp(r'[ぁ-んァ-ン]').hasMatch(text)) {
+      return 'ja';
+    }
+    if (RegExp(r'[가-힣]').hasMatch(text)) {
+      return 'ko';
+    }
+    if (RegExp(r'[\u4e00-\u9fff]').hasMatch(text)) {
+      return 'zh';
+    }
+
+    final lower = trimmed.toLowerCase();
+    final patterns = <String, String>{
+      'uk': r'\b(привіт|дякую|будь|ласка|як|де|не|так|це|є|най|ще|може|для)\b',
+      'ru':
+          r'\b(что|это|как|не|да|нет|он|она|они|быть|есть|для|сегодня|если|уже|может)\b',
+      'bg': r'\b(ще|няма|благодаря|моля|това|какво|тук|ние|вие|не|със|за)\b',
+      'de':
+          r'\b(der|die|das|und|ist|nicht|ein|eine|ich|für|mit|auf|zu|auch|als|an|im|am|es|dem|den|sich|von)\b',
+      'en':
+          r'\b(the|and|is|you|for|with|from|not|that|this|have|be|are|was|were|but|can|will|your|what|when|how|they)\b',
+      'es':
+          r'\b(el|la|los|las|es|que|de|en|con|por|para|no|un|una|se|como|su|al|del|está)\b',
+      'fr':
+          r'\b(le|la|les|un|une|et|est|que|qui|pour|dans|pas|avec|sur|ne|vous|il|elle|des|ce|cette|je|tu|nous|vous)\b',
+      'it':
+          r'\b(il|la|lo|un|una|che|di|da|in|per|con|non|si|mi|ti|noi|voi|lui|lei)\b',
+      'pt':
+          r'\b(os|as|que|de|do|da|em|para|com|por|não|uma|um|se|você|também)\b',
+      'nl':
+          r'\b(de|het|een|en|is|niet|dat|wat|je|ik|op|aan|voor|met|als|nog|zijn)\b',
+      'sv':
+          r'\b(och|är|det|att|som|en|på|inte|har|var|men|du|jag|vi|ni|den|detta)\b',
+      'pl':
+          r'\b(na|się|nie|jest|to|że|do|od|dla|czy|tak|ale|ma|jak|on|ona|my)\b',
+      'sk': r'\b(je|na|so|že|do|od|za|si|to|ten|tá|tí|ako|má|nie|som|sa)\b',
+      'sl': r'\b(in|je|na|se|da|za|od|ne|to|ta|so|kako|bo|sem|si)\b',
+      'hu':
+          r'\b(az|és|nem|van|volt|hogy|mit|mire|ki|mi|ez|azért|is|de|ha|te|ő|mi|itt)\b',
+    };
+
+    final scores = <String, int>{};
+    for (final entry in patterns.entries) {
+      scores[entry.key] = RegExp(
+        entry.value,
+        caseSensitive: false,
+      ).allMatches(lower).length;
+    }
+
+    final sorted = scores.entries.toList()
+      ..sort((a, b) => b.value.compareTo(a.value));
+    if (sorted.isEmpty || sorted.first.value == 0) {
+      return null;
+    }
+    if (sorted.length > 1 && sorted.first.value == sorted[1].value) {
+      return null;
+    }
+
+    return sorted.first.key;
+  }
+
  String _languageLabel(String code) {
    for (final option in supportedTranslationLanguages) {
      if (option.code == code) {
@@ -632,10 +654,6 @@ class TranslationService extends ChangeNotifier {
    final completer = Completer<T>();
    _setBusy(true);
    _queue = _queue.then((_) async {
-      if (_disposed) {
-        completer.completeError(StateError('TranslationService disposed.'));
-        return;
-      }
      try {
        completer.complete(await action());
      } catch (error, stackTrace) {
@@ -653,24 +671,17 @@ class TranslationService extends ChangeNotifier {
        throw const TranslationDownloadCancelled();
      }
      _downloadedBytes += chunk.length;
-      _notify();
+      notifyListeners();
      yield chunk;
    }
  }

-  void _notify() {
-    if (_disposed) {
-      return;
-    }
-    notifyListeners();
-  }
-
  void _setBusy(bool value) {
    if (_isBusy == value) {
      return;
    }
    _isBusy = value;
-    _notify();
+    notifyListeners();
  }

  void _setDownloading(bool value) {
@@ -681,12 +692,11 @@ class TranslationService extends ChangeNotifier {
      _downloadTotalBytes = null;
      _downloadFileName = null;
    }
-    _notify();
+    notifyListeners();
  }

  @override
  void dispose() {
-    _disposed = true;
    final engine = _engine;
    _engine = null;
    _loadedModelPath = null;
@@ -33,14 +33,12 @@ class UsbSerialService {
  String? _connectedPortLabel;
  FlSerial? _serial;
  AppDebugLogService? _debugLogService;
-  Object? _lastError;

  UsbSerialStatus get status => _status;
  String? get activePortKey => _connectedPortKey;
  String? get activePortDisplayLabel =>
      _connectedPortLabel ?? _connectedPortKey;
  Stream<Uint8List> get frameStream => _frameController.stream;
-  Object? get lastError => _lastError;
  bool get _useAndroidUsbHost =>
      !kIsWeb && defaultTargetPlatform == TargetPlatform.android;
  bool get _useDesktopFlSerial =>
@@ -436,7 +434,6 @@ class UsbSerialService {
  }

  void _addFrameError(Object error, [StackTrace? stackTrace]) {
-    _lastError = error;
    if (_frameController.isClosed) {
      return;
    }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Winston Lowe	ba4fd3eff5	Merge branch 'dev-offline' of github.com:zjs81/meshcore-open into dev-offline	2026-05-27 10:31:23 -07:00
Winston Lowe	beb3e1996d	fix: Improve error handling when restoring last companion public key and update disconnection message in Dutch localization	2026-05-27 10:26:19 -07:00
Winston Lowe	3f4e6f4e13	Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>	2026-05-12 18:49:25 -07:00
Winston Lowe	e1cc285c8a	fix: Correct channel addition logic to prevent duplicates based on pskHex	2026-05-12 18:31:55 -07:00
Winston Lowe	f4b32e8a8a	Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>	2026-05-12 18:30:39 -07:00
Winston Lowe	01bf95c98e	fix: Implement disconnect method in _FakeMeshCoreConnector for TCP and USB flow tests	2026-05-12 18:21:18 -07:00
Winston Lowe	fa044dd204	feat: Add dialog messages for companion connection and disconnection - Introduced new dialog messages for connecting to a companion and handling disconnection across multiple languages. - Updated localization files for French, Hungarian, Italian, Japanese, Korean, Bulgarian, German, English, Spanish, Dutch, Polish, Portuguese, Russian, Slovak, Slovenian, Swedish, Ukrainian, and Chinese. - Modified the contacts and map screens to utilize the new dialog messages. - Enhanced the disconnect confirmation dialog to show a message upon successful disconnection. - Updated app bar to conditionally display radio stats based on companion connection status.	2026-05-12 18:01:31 -07:00
Winston Lowe	72fea3fc32	fix: Enhance channel deduplication logic in loadChannels method	2026-05-12 18:01:31 -07:00
Winston Lowe	f0bd61144c	fix: Remove unnecessary whitespace in keyedMessageIds initialization	2026-05-12 18:01:31 -07:00
Winston Lowe	61c897630c	fix: Improve message key handling and enhance contact tile key uniqueness	2026-05-12 18:01:31 -07:00
Winston Lowe	a270e2e6d1	fix: Add byteCount initialization in PathRecord.fromJson method	2026-05-12 18:01:31 -07:00
Winston Lowe	247db6a36d	fix: Initialize _selfPublicKey with lastCompanionPublicKeyHex in MeshCoreConnector	2026-05-12 18:01:31 -07:00
Winston Lowe	78d08afb47	Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>	2026-05-12 18:01:31 -07:00
Winston Lowe	c77264cc81	Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>	2026-05-12 18:01:31 -07:00
Winston Lowe	d6ed8c5f13	feat: Enhance companion connection features and UI updates - Added functionality to load and restore the last companion's scope on app startup. - Implemented caching mechanisms for contacts, channels, and messages related to the current companion. - Updated UI to reflect connection status, including disabling message input when disconnected. - Introduced new dialog prompts to inform users when they need to connect to a companion for accessing features. - Refactored navigation logic to improve user experience when disconnected, directing users to the scanner screen. - Added localization strings for new companion connection prompts in multiple languages.	2026-05-12 18:01:31 -07:00
Winston Lowe	209fee48ca	Add byteCount field to PathRecord class with default value	2026-05-12 17:59:58 -07:00