merge zjs81/dev: resolve conflicting implementations

lib/l10n/app_en.arb

@@ -28,6 +28,12 @@
   "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": "—",
@@ -47,6 +53,8 @@
       }
     }
   },
+  "common_autoRefresh": "Autorefresh",
+  "common_interval": "Interval",
   "scanner_title": "MeshCore Open",
   "connectionChoiceUsbLabel": "USB",
   "connectionChoiceBluetoothLabel": "Bluetooth",
@@ -135,6 +143,7 @@
   "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",
@@ -295,17 +304,6 @@
   "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})",
@@ -344,6 +342,19 @@
   "appSettings_last6Hours": "Last 6 hours",
   "appSettings_last24Hours": "Last 24 hours",
   "appSettings_lastWeek": "Last week",
+  "appSettings_rasterTileSource": "Raster Tile Source",
+  "appSettings_stadiaEndpoint": "Stadia Endpoint",
+  "appSettings_stadiaApiKey": "Stadia API Key",
+  "appSettings_stadiaApiKeyRequired": "Required for Stadia Maps usage",
+  "appSettings_stadiaApiKeyConfigured": "Configured: {maskedKey}",
+  "@appSettings_stadiaApiKeyConfigured": {
+    "placeholders": {
+      "maskedKey": {
+        "type": "String"
+      }
+    }
+  },
+  "appSettings_stadiaApiKeyDialogDescription": "Enter your Stadia Maps API key. This app uses it for raster tile requests.",
   "appSettings_offlineMapCache": "Offline Map Cache",
   "appSettings_unitsTitle": "Units",
   "appSettings_unitsMetric": "Metric (m / km)",
@@ -451,6 +462,9 @@
     }
   },
   "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",
@@ -775,15 +789,6 @@
     }
   },
   "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": {
@@ -792,31 +797,80 @@
       }
     }
   },
-  "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",
-  "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": {
+  "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": {
     "placeholders": {
-      "hopCount": {
-        "type": "int"
-      },
-      "status": {
+      "when": {
         "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.",
@@ -860,6 +914,17 @@
   },
   "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",
@@ -1008,6 +1073,56 @@
       }
     }
   },
+  "mapCache_cachedTilesLabel": "Cached tiles",
+  "mapCache_cachedTileSummaryLabel": "Cached tile summary",
+  "mapCache_bulkDownloadDisabledForSource": "Offline bulk downloads are disabled for {source}.",
+  "@mapCache_bulkDownloadDisabledForSource": {
+    "placeholders": {
+      "source": {
+        "type": "String"
+      }
+    }
+  },
+  "mapCache_bulkDownloadDisabledInConfig": "Offline bulk downloads are disabled for {source} in this app configuration.",
+  "@mapCache_bulkDownloadDisabledInConfig": {
+    "placeholders": {
+      "source": {
+        "type": "String"
+      }
+    }
+  },
+  "mapCache_summarySource": "Source: {source}",
+  "@mapCache_summarySource": {
+    "placeholders": {
+      "source": {
+        "type": "String"
+      }
+    }
+  },
+  "mapCache_summaryCachedTilesForSource": "Cached tiles for source: {count}",
+  "@mapCache_summaryCachedTilesForSource": {
+    "placeholders": {
+      "count": {
+        "type": "int"
+      }
+    }
+  },
+  "mapCache_summaryCachedInSelection": "Cached in selected area/zoom: {count}",
+  "@mapCache_summaryCachedInSelection": {
+    "placeholders": {
+      "count": {
+        "type": "int"
+      }
+    }
+  },
+  "mapCache_summaryApproxCacheSize": "Approx cache size: {size}",
+  "@mapCache_summaryApproxCacheSize": {
+    "placeholders": {
+      "size": {
+        "type": "String"
+      }
+    }
+  },
   "mapCache_boundsLabel": "N {north}, S {south}, E {east}, W {west}",
   "@mapCache_boundsLabel": {
     "placeholders": {
@@ -1098,41 +1213,8 @@
   "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",
@@ -1159,9 +1241,6 @@
   },
   "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}",
@@ -1661,6 +1740,120 @@
       }
     }
   },
+  "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}",
@@ -2369,5 +2562,101 @@
   "contact_typeRepeater": "Repeater",
   "contact_typeRoom": "Room",
   "contact_typeSensor": "Sensor",
-  "contact_typeUnknown": "Unknown"
+  "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"
 }