diff --git a/Controls/HistoryWorkspace.Actions.cs b/Controls/HistoryWorkspace.Actions.cs
index e23c668..4e567d1 100644
--- a/Controls/HistoryWorkspace.Actions.cs
+++ b/Controls/HistoryWorkspace.Actions.cs
@@ -105,7 +105,8 @@ private async void ExecuteAction(string action)
             {
                 if (SelectedHistoryDevice is { } saved)
                 {
-                    var dialog = new HomeAssistantAdviceWindow(HomeAssistantText.FromHistory(saved), WebLink.Open, value => Clipboard.SetText(value));
+                    var dialog = new HomeAssistantAdviceWindow(HomeAssistantText.FromHistory(saved), WebLink.Open,
+                        value => Clipboard.SetText(value), surveyStore: SurveySource(StoreFor(_entry)));
                     dialog.Owner = Window.GetWindow(this); dialog.ShowDialog();
                 }
                 return;
diff --git a/Controls/HistoryWorkspace.xaml.cs b/Controls/HistoryWorkspace.xaml.cs
index ef39102..1799909 100644
--- a/Controls/HistoryWorkspace.xaml.cs
+++ b/Controls/HistoryWorkspace.xaml.cs
@@ -17,6 +17,7 @@ public partial class HistoryWorkspace : UserControl
 
         /// <summary>The history the shown entry belongs to, which picks its baseline. Set by the shell.</summary>
         internal Func<HistoryStore> HistorySource { get; set; } = () => ScanHistory.Store;
+        internal Func<HistoryStore, SurveyStore?> SurveySource { get; set; } = _ => null;
 
         private HistoryStore StoreFor(ScanHistoryEntry? entry) => entry?.Owner ?? HistorySource();
         private string Loc(string key) => TryFindResource(key) as string ?? key;
diff --git a/Controls/HomeAssistantAdviceWindow.cs b/Controls/HomeAssistantAdviceWindow.cs
index 93f9979..27043a6 100644
--- a/Controls/HomeAssistantAdviceWindow.cs
+++ b/Controls/HomeAssistantAdviceWindow.cs
@@ -20,9 +20,22 @@ internal sealed class HomeAssistantAdviceWindow : Window
     { ManufacturerModel = IdentityInput.Text, Protocol = ((ComboBoxItem?)ProtocolInput.SelectedItem)?.Tag as string ?? "",
         Goal = ((ComboBoxItem?)GoalInput.SelectedItem)?.Tag as string ?? "Monitor" };
 
-    internal HomeAssistantAdviceWindow(NetworkDevice device, Action<string> open, Action<string> copy)
+    internal HomeAssistantAdviceWindow(NetworkDevice device, Action<string> open, Action<string> copy,
+        HomeAssistantContext? initialContext = null, Action<HomeAssistantContext>? apply = null, string? observation = null,
+        SurveyStore? surveyStore = null)
     {
         _device = HomeAssistantText.Freeze(device);
+        SurveyEntry? savedEntry = null;
+        if (apply == null && surveyStore != null)
+        {
+            try
+            {
+                string identity = SurveyStore.Mac(_device.MacAddress);
+                savedEntry = identity == "" ? null : surveyStore.Load().SingleOrDefault(entry => entry.LinkedMac == identity);
+                initialContext ??= savedEntry?.Context;
+            }
+            catch (Exception) { observation = SurveyText.L("Error"); }
+        }
         _open = open; _copy = copy; CurrentAdvice = HomeAssistantAdvisor.ForDevice(_device);
         Title = HomeAssistantText.L("Title"); Width = 920; Height = 760; MinWidth = 540; MinHeight = 380;
         WindowStartupLocation = WindowStartupLocation.CenterOwner;
@@ -36,13 +49,56 @@ internal HomeAssistantAdviceWindow(NetworkDevice device, Action<string> open, Ac
         copyPlan.Click += (_, _) => _copy(HomeAssistantText.Describe(_device, CurrentAdvice, CurrentContext));
         var close = Button(Application.Current.TryFindResource("Str_Sys_Close") as string ?? "Close"); close.Click += (_, _) => Close();
         buttons.Children.Add(catalogue); buttons.Children.Add(copyPlan); buttons.Children.Add(close);
+        var save = Button(apply == null ? SurveyText.L("Add") : SurveyText.L("Hints")); save.Tag = "survey-save";
+        save.Click += (_, _) =>
+        {
+            if (apply != null) { apply(CurrentContext); Close(); return; }
+            try
+            {
+                var store = surveyStore ?? throw new InvalidOperationException();
+                SurveyEntry? target = savedEntry;
+                string? confirmedIpChoice = null;
+                if (target == null)
+                {
+                    string mac = SurveyStore.Mac(_device.MacAddress);
+                    var candidates = store.Load().Where(entry => !entry.Manual && _device.IpAddress.Length > 0 &&
+                        entry.Observation?.Device.IpAddress == _device.IpAddress && (entry.LinkedMac == "" || mac == "")).ToArray();
+                    if (candidates.Length > 0)
+                    {
+                        confirmedIpChoice = SurveyPanel.Choose(this, candidates);
+                        if (confirmedIpChoice == null) return;
+                        target = candidates.SingleOrDefault(entry => entry.Id == confirmedIpChoice);
+                    }
+                }
+                bool manual = savedEntry == null && _device.IpAddress.Length == 0 && SurveyStore.Mac(_device.MacAddress).Length == 0;
+                var draft = (target ?? new SurveyEntry { Name = manual ? "" : SurveyStore.DeviceName(_device), Manual = manual,
+                    Observation = manual ? null : new SurveyObservation { Device = _device, LastSeenUtc = _device.Identification?.ObservationCompletedAtUtc } }) with
+                    { ManufacturerModel = target?.ManufacturerModel ?? CurrentContext.ManufacturerModel,
+                        Protocol = target?.Protocol ?? CurrentContext.Protocol, Goal = target?.Goal ?? CurrentContext.Goal };
+                if (savedEntry != null) draft = draft with { ManufacturerModel = CurrentContext.ManufacturerModel, Protocol = CurrentContext.Protocol, Goal = CurrentContext.Goal };
+                var editor = new SurveyEditorWindow(draft, entry =>
+                {
+                    if (savedEntry != null) { store.Save(entry); savedEntry = entry; return; }
+                    if (manual) { store.AddManual(entry); savedEntry = entry; return; }
+                    var saved = store.AddObserved(_device, candidates => confirmedIpChoice ?? SurveyPanel.Choose(this, candidates), entry);
+                    if (saved == null) throw new OperationCanceledException();
+                    savedEntry = saved;
+                }, _open, _copy) { Owner = this };
+                editor.ShowDialog();
+            }
+            catch (Exception) { MessageBox.Show(this, SurveyText.L("Error"), SurveyText.L("Title"), MessageBoxButton.OK, MessageBoxImage.Error); }
+        };
+        if (apply != null || surveyStore != null) buttons.Children.Insert(0, save);
         DockPanel.SetDock(buttons, Dock.Bottom); panel.Children.Add(buttons);
         var header = new StackPanel();
         string deviceLabel = (device.IpAddress + "  " + device.Hostname).Trim();
         header.Children.Add(Text(deviceLabel.Length == 0 ? HomeAssistantText.L("Workflow") : deviceLabel, 18));
+        if (observation != null) header.Children.Add(Text(observation));
         var inputs = new StackPanel();
         inputs.Children.Add(Text(HomeAssistantText.L("Identity"))); IdentityInput.SetResourceReference(StyleProperty, "DarkTextBox");
         System.Windows.Automation.AutomationProperties.SetName(IdentityInput, HomeAssistantText.L("Identity")); inputs.Children.Add(IdentityInput);
+        ProtocolInput.SetResourceReference(StyleProperty, "DarkComboBox");
+        GoalInput.SetResourceReference(StyleProperty, "DarkComboBox");
         var fields = new WrapPanel();
         fields.Children.Add(Field(HomeAssistantText.L("Protocol"), ProtocolInput));
         ProtocolInput.Items.Add(new ComboBoxItem { Content = Application.Current.TryFindResource("Str_Access_Unknown") as string ?? "Unknown", Tag = "" });
@@ -53,6 +109,12 @@ internal HomeAssistantAdviceWindow(NetworkDevice device, Action<string> open, Ac
         foreach (var (id, label) in new[] { ("Monitor", "Monitor"), ("Control", "ControlGoal"), ("Media", "MediaGoal") })
             GoalInput.Items.Add(new ComboBoxItem { Content = HomeAssistantText.L(label), Tag = id });
         GoalInput.SelectedIndex = 0; inputs.Children.Add(fields);
+        if (initialContext != null)
+        {
+            IdentityInput.Text = initialContext.ManufacturerModel;
+            ProtocolInput.SelectedItem = ProtocolInput.Items.Cast<ComboBoxItem>().FirstOrDefault(item => item.Tag as string == initialContext.Protocol) ?? ProtocolInput.Items[0];
+            GoalInput.SelectedItem = GoalInput.Items.Cast<ComboBoxItem>().FirstOrDefault(item => item.Tag as string == initialContext.Goal) ?? GoalInput.Items[0];
+        }
         header.Children.Add(Expand(HomeAssistantText.L("Inputs"), inputs));
         DockPanel.SetDock(header, Dock.Top); panel.Children.Add(header);
         panel.Children.Add(new ScrollViewer { Content = Results, VerticalScrollBarVisibility = ScrollBarVisibility.Auto, HorizontalScrollBarVisibility = ScrollBarVisibility.Disabled });
diff --git a/Controls/HomeAssistantOverviewWindow.cs b/Controls/HomeAssistantOverviewWindow.cs
index 5c211e0..b2a5d59 100644
--- a/Controls/HomeAssistantOverviewWindow.cs
+++ b/Controls/HomeAssistantOverviewWindow.cs
@@ -31,12 +31,16 @@ internal sealed class Row(NetworkDevice device)
     }
     internal IReadOnlyList<Row> Rows { get; }
     internal readonly DataGrid Grid = new() { AutoGenerateColumns = false, IsReadOnly = true, CanUserAddRows = false,
-        SelectionMode = DataGridSelectionMode.Single, HeadersVisibility = DataGridHeadersVisibility.Column,
+        SelectionMode = DataGridSelectionMode.Extended, HeadersVisibility = DataGridHeadersVisibility.Column,
         RowHeaderWidth = 0, MinRowHeight = 54, HorizontalScrollBarVisibility = ScrollBarVisibility.Auto };
     private readonly Action<string> _open, _copy;
-    internal HomeAssistantOverviewWindow(IEnumerable<NetworkDevice> devices, Action<string> open, Action<string> copy)
+    private readonly SurveyStore? _survey;
+
+    internal HomeAssistantOverviewWindow(IEnumerable<NetworkDevice> devices, Action<string> open, Action<string> copy, LocationData? location = null)
     {
         _open = open; _copy = copy;
+        _survey = location?.Survey;
+        SurveyPanel.Theme(this);
         Rows = devices.Select(HomeAssistantText.Freeze).OrderBy(device => device.IpSortKey).Select(device => new Row(device)).ToArray();
         Title = HomeAssistantText.L("AllTitle"); Width = 1180; Height = 720; MinWidth = 660; MinHeight = 380;
         WindowStartupLocation = WindowStartupLocation.CenterOwner;
@@ -61,7 +65,7 @@ Button AddButton(string label, string tag, Action action)
             button.SetResourceReference(StyleProperty, "OutlineButton"); button.Click += (_, _) => action(); buttons.Children.Add(button); return button;
         }
         var detail = AddButton(HomeAssistantText.L("Details"), "detail", OpenSelected); detail.IsEnabled = false;
-        AddButton(HomeAssistantText.L("Copy"), "copy-all", () => _copy(Describe()));
+        var copyAll = AddButton(HomeAssistantText.L("Copy"), "copy-all", () => _copy(Describe()));
         AddButton(Application.Current.TryFindResource("Str_Sys_Close") as string ?? "Close", "close", Close);
         DockPanel.SetDock(buttons, Dock.Bottom); root.Children.Add(buttons);
         void Column(string title, string path, double width)
@@ -79,10 +83,46 @@ void Column(string title, string path, double width)
         Grid.ItemsSource = Rows;
         Grid.SelectionChanged += (_, _) => detail.IsEnabled = Grid.SelectedItem is Row;
         Grid.MouseDoubleClick += (_, e) => { if (ItemsControl.ContainerFromElement(Grid, e.OriginalSource as DependencyObject) is DataGridRow) OpenSelected(); };
-        root.Children.Add(Grid); Content = root;
+        var scan = new DockPanel();
+        var tabs = new TabControl();
+        SurveyPanel? survey = null;
+        if (_survey != null)
+        {
+            survey = new SurveyPanel(_survey, Rows.Select(row => row.Device), open, copy);
+            var add = SurveyPanel.Button(SurveyText.L("Add"), () =>
+            {
+                var selected = Grid.SelectedItems.Cast<Row>().Select(row => row.Device).ToArray();
+                tabs.SelectedIndex = 1;
+                survey.AddSelected(selected);
+            }, "survey-add");
+            add.IsEnabled = false;
+            Grid.SelectionChanged += (_, _) => add.IsEnabled = Grid.SelectedItems.Count > 0;
+            DockPanel.SetDock(add, Dock.Bottom);
+            scan.Children.Add(add);
+        }
+        scan.Children.Add(Grid);
+        tabs.SetResourceReference(Control.BackgroundProperty, "BackgroundBrush");
+        tabs.SetResourceReference(Control.ForegroundProperty, "TextBrush");
+        tabs.Items.Add(new TabItem { Header = SurveyText.L("Scan"), Content = scan });
+        var unavailable = location?.IsTemporary == true
+            ? Application.Current.TryFindResource("Str_Loc_TemporaryNotice") as string ?? SurveyText.L("Error")
+            : SurveyText.L("Error");
+        tabs.Items.Add(new TabItem
+        {
+            Header = SurveyText.L("Title") + (location?.Info is { } info ? " · " + info.Name : ""),
+            Content = (FrameworkElement?)survey ?? SurveyPanel.Text(unavailable)
+        });
+        tabs.SelectionChanged += (_, args) =>
+        {
+            if (!ReferenceEquals(args.Source, tabs)) return;
+            detail.IsEnabled = tabs.SelectedIndex == 0 && Grid.SelectedItem is Row;
+            copyAll.IsEnabled = tabs.SelectedIndex == 0;
+            if (tabs.SelectedIndex == 1) survey?.Reload();
+        };
+        root.Children.Add(tabs); Content = root;
     }
     internal HomeAssistantAdviceWindow? CreateSelected() => Grid.SelectedItem is Row row
-        ? new HomeAssistantAdviceWindow(row.Device, _open, _copy) : null;
+        ? new HomeAssistantAdviceWindow(row.Device, _open, _copy, surveyStore: _survey) : null;
     private void OpenSelected()
     {
         if (CreateSelected() is not { } dialog) return;
diff --git a/Controls/ScanWorkspace/HomeAssistantActions.cs b/Controls/ScanWorkspace/HomeAssistantActions.cs
index 036a2ff..dc682ee 100644
--- a/Controls/ScanWorkspace/HomeAssistantActions.cs
+++ b/Controls/ScanWorkspace/HomeAssistantActions.cs
@@ -5,8 +5,8 @@ namespace KillerScan.Controls;
 public partial class ScanWorkspace
 {
     private void HomeAssistantAll_Click(object sender, RoutedEventArgs e) { var window = CreateHomeAssistantOverview(); window.Owner = Window.GetWindow(this); window.ShowDialog(); }
-    internal HomeAssistantOverviewWindow CreateHomeAssistantOverview() => new(ActiveDevices, WebLink.Open, CopyDeviceText);
-    internal HomeAssistantAdviceWindow CreateHomeAssistantAdvice(NetworkDevice? device = null) => new(device ?? GetSelectedDevice() ?? new NetworkDevice(), WebLink.Open, CopyDeviceText);
+    internal HomeAssistantOverviewWindow CreateHomeAssistantOverview() => new(ActiveDevices, WebLink.Open, CopyDeviceText, _location);
+    internal HomeAssistantAdviceWindow CreateHomeAssistantAdvice(NetworkDevice? device = null) => new(device ?? GetSelectedDevice() ?? new NetworkDevice(), WebLink.Open, CopyDeviceText, surveyStore: _location.Survey);
     private void HomeAssistant_Click(object sender, RoutedEventArgs e) { var window = CreateHomeAssistantAdvice(); window.Owner = Window.GetWindow(this); window.ShowDialog(); }
     private void HomeAssistantRow_Click(object sender, RoutedEventArgs e)
     { if ((sender as FrameworkElement)?.DataContext is NetworkDevice device) { var window = CreateHomeAssistantAdvice(device); window.Owner = Window.GetWindow(this); window.ShowDialog(); } }
diff --git a/Controls/ScanWorkspace/Location.cs b/Controls/ScanWorkspace/Location.cs
index 411b71c..acc2dea 100644
--- a/Controls/ScanWorkspace/Location.cs
+++ b/Controls/ScanWorkspace/Location.cs
@@ -100,6 +100,12 @@ private bool SetLocation(LocationData data, bool keepResults)
                 if (!discard) return false;
             }
             if (clear) ClearResults();
+            if (keepResults)
+                foreach (var device in _active.Devices)
+                {
+                    device.LocationId = data.Info?.Id;
+                    device.LocationName = data.Info?.Name;
+                }
             EnterLocation(data);
             return true;
         }
diff --git a/Controls/ScanWorkspace/Rescan.cs b/Controls/ScanWorkspace/Rescan.cs
index 04261b8..9747031 100644
--- a/Controls/ScanWorkspace/Rescan.cs
+++ b/Controls/ScanWorkspace/Rescan.cs
@@ -62,6 +62,8 @@ private async void RescanSelected_Click(object sender, RoutedEventArgs e)
 
             var s = _active;
             var scanner = s.Scanner;
+            var location = _location;
+            var surveyObservations = new List<NetworkDevice>();
             _rescanCts = new CancellationTokenSource();
             var ct = _rescanCts.Token;
             UpdateDeepScanButton();
@@ -92,7 +94,12 @@ private async void RescanSelected_Click(object sender, RoutedEventArgs e)
                     catch { done++; ScanProgress.Value = done * 100.0 / targets.Count; continue; }
 
                     int idx = s.Devices.IndexOf(old);
-                    if (idx >= 0) { s.Devices[idx] = fresh; refreshed++; }
+                    if (idx >= 0)
+                    {
+                        s.Devices[idx] = fresh;
+                        surveyObservations.Add(fresh);
+                        refreshed++;
+                    }
 
                     done++;
                     ScanProgress.Value = done * 100.0 / targets.Count;
@@ -105,6 +112,7 @@ private async void RescanSelected_Click(object sender, RoutedEventArgs e)
                 NoteRefresh(s, refreshed, targets.Count - refreshed, canceled);
                 _rescanCts.Dispose();
                 _rescanCts = null;
+                if (!LeaveDeletedLocation()) RefreshSurvey(location, surveyObservations);
                 FinishRescanUi();
             }
         }
@@ -138,6 +146,8 @@ private async Task DeepScanAllAsync(bool recordProfile = false)
 
             var s = _active;
             var scanner = s.Scanner;
+            var location = _location;
+            var surveyObservations = new List<NetworkDevice>();
             var targets = s.Devices.OrderBy(d => d.IpSortKey).ToList();
             // The automatic deep phase belongs to the run that already validated its adapter.
             if (!recordProfile)
@@ -173,6 +183,7 @@ private async Task DeepScanAllAsync(bool recordProfile = false)
                         if (idx >= 0)
                         {
                             s.Devices[idx] = fresh;
+                            surveyObservations.Add(fresh);
                             refreshed++;
                         }
                     }
@@ -208,10 +219,11 @@ private async Task DeepScanAllAsync(bool recordProfile = false)
             {
                 try
                 {
+                    bool left = LeaveDeletedLocation();
+                    if (!left) RefreshSurvey(location, surveyObservations);
                     if (recordProfile)
                     {
                         _scanCompleted = completion == ScanCompletion.Complete;
-                        LeaveDeletedLocation();
                         RecordCompletedRun(options, deep: true, completion);
                     }
                     // A manual Deep Scan All refreshes an existing snapshot; an automatic one is
diff --git a/Controls/ScanWorkspace/Scanning.cs b/Controls/ScanWorkspace/Scanning.cs
index c936480..a3448b4 100644
--- a/Controls/ScanWorkspace/Scanning.cs
+++ b/Controls/ScanWorkspace/Scanning.cs
@@ -97,7 +97,11 @@ private async void ScanBtn_Click(object sender, RoutedEventArgs e)
                     if (left) location = _location;
                     if (!runDeep || _active.Devices.Count == 0) RecordCompletedRun(options, deep: false);
                     NoteKnownDevices(location);
-                    if (!left) NoteUnsaved(location);
+                    if (!left)
+                    {
+                        RefreshSurvey(location, _active.Devices);
+                        NoteUnsaved(location);
+                    }
                 }
             }
             catch (OperationCanceledException)
diff --git a/Controls/ScanWorkspace/SurveyActions.cs b/Controls/ScanWorkspace/SurveyActions.cs
new file mode 100644
index 0000000..c9e56f6
--- /dev/null
+++ b/Controls/ScanWorkspace/SurveyActions.cs
@@ -0,0 +1,18 @@
+using System.Windows;
+using KillerScan.Services;
+
+namespace KillerScan.Controls;
+
+public partial class ScanWorkspace
+{
+    private void RefreshSurvey(LocationData location, IEnumerable<NetworkDevice> observed)
+    {
+        if (_disposed) return;
+        try { location.Survey?.Refresh(observed); }
+        catch (Exception)
+        {
+            // A survey write error must not turn a completed network scan into a failed scan.
+            if (!_disposed) MessageBox.Show(Window.GetWindow(this), SurveyText.L("Error"), SurveyText.L("Title"), MessageBoxButton.OK, MessageBoxImage.Error);
+        }
+    }
+}
diff --git a/Controls/SurveyEditorWindow.cs b/Controls/SurveyEditorWindow.cs
new file mode 100644
index 0000000..fe66574
--- /dev/null
+++ b/Controls/SurveyEditorWindow.cs
@@ -0,0 +1,74 @@
+using System.Windows;
+using System.Windows.Controls;
+using KillerScan.Services;
+
+namespace KillerScan.Controls;
+
+internal sealed class SurveyEditorWindow : Window
+{
+    internal readonly Dictionary<string, TextBox> Inputs = new();
+    private SurveyEntry _draft;
+    private readonly Action<SurveyEntry> _save;
+    private readonly Action<string> _open, _copy;
+    internal SurveyEditorWindow(SurveyEntry draft, Action<SurveyEntry> save, Action<string> open, Action<string> copy)
+    {
+        _draft = draft; _save = save; _open = open; _copy = copy;
+        SurveyPanel.Theme(this);
+        Title = SurveyText.L("Edit"); Width = 700; Height = 820; MinWidth = 420; MinHeight = 380;
+        WindowStartupLocation = WindowStartupLocation.CenterOwner;
+        Loaded += (_, _) => KillerFamily.Windowing.WorkAreaFit.Fit(this);
+        SetResourceReference(BackgroundProperty, "BackgroundBrush"); SetResourceReference(ForegroundProperty, "TextBrush"); SetResourceReference(FontFamilyProperty, "UiFont");
+        var root = new DockPanel { Margin = new Thickness(18) };
+        var buttons = new WrapPanel { HorizontalAlignment = HorizontalAlignment.Right };
+        buttons.Children.Add(SurveyPanel.Button(SurveyText.L("Save"), () => { if (TrySave()) DialogResult = true; }, "save"));
+        var cancel = SurveyPanel.Button(SurveyText.L("Cancel"), Close, "cancel"); cancel.IsCancel = true; buttons.Children.Add(cancel);
+        DockPanel.SetDock(buttons, Dock.Bottom); root.Children.Add(buttons);
+        var fields = new StackPanel();
+        fields.Children.Add(SurveyPanel.Text(SurveyText.L("Notice")));
+        void Field(string key, string value, string? label = null, bool multiline = false)
+        {
+            fields.Children.Add(SurveyPanel.Text(label ?? SurveyText.L(key)));
+            var input = new TextBox { Text = value, MaxLength = key == "Name" ? 160 : 8000, MinHeight = multiline ? 65 : 30,
+                AcceptsReturn = multiline, TextWrapping = TextWrapping.Wrap, VerticalScrollBarVisibility = ScrollBarVisibility.Auto };
+            input.SetResourceReference(StyleProperty, "DarkTextBox");
+            System.Windows.Automation.AutomationProperties.SetName(input, label ?? SurveyText.L(key));
+            Inputs[key] = input; fields.Children.Add(input);
+        }
+        Field("Name", draft.Name); Field("Room", draft.Room);
+        Field("ManufacturerModel", draft.ManufacturerModel, HomeAssistantText.L("Identity"));
+        Field("Firmware", draft.Firmware); Field("Connection", draft.Connection);
+        Field("Functions", draft.DesiredFunctions, multiline: true); Field("Notes", draft.Notes, multiline: true);
+        var hints = SurveyPanel.Text("");
+        void UpdateHints() => hints.Text = HomeAssistantText.L("Protocol") + ": " +
+            (HomeAssistantAdvisor.Integration(_draft.Protocol)?.Name ?? Application.Current.TryFindResource("Str_Access_Unknown") as string ?? "Unknown") + " · " + HomeAssistantText.L("Goal") + ": " +
+            HomeAssistantText.L(_draft.Goal == "Control" ? "ControlGoal" : _draft.Goal == "Media" ? "MediaGoal" : "Monitor");
+        fields.Children.Add(hints); UpdateHints();
+        fields.Children.Add(SurveyPanel.Button(HomeAssistantText.L("Title"), () =>
+        {
+            var dialog = CreateAdvice();
+            dialog.Owner = this; dialog.ShowDialog();
+            UpdateHints();
+        }, "advice"));
+        fields.Children.Add(SurveyPanel.Text(SurveyPanel.ObservationText(draft)));
+        root.Children.Add(new ScrollViewer { Content = fields, VerticalScrollBarVisibility = ScrollBarVisibility.Auto }); Content = root;
+    }
+    internal HomeAssistantAdviceWindow CreateAdvice()
+    {
+        _draft = Draft();
+        return new HomeAssistantAdviceWindow(SurveyStore.AdviceDevice(_draft), _open, _copy, _draft.Context, context =>
+        {
+            _draft = _draft with { ManufacturerModel = context.ManufacturerModel, Protocol = context.Protocol, Goal = context.Goal };
+            Inputs["ManufacturerModel"].Text = context.ManufacturerModel;
+        }, SurveyPanel.ObservationText(_draft));
+    }
+    internal SurveyEntry Draft() => _draft with { Name = Inputs["Name"].Text.Trim(), Room = Inputs["Room"].Text,
+        ManufacturerModel = Inputs["ManufacturerModel"].Text, Firmware = Inputs["Firmware"].Text,
+        Connection = Inputs["Connection"].Text, DesiredFunctions = Inputs["Functions"].Text, Notes = Inputs["Notes"].Text };
+    internal bool TrySave()
+    {
+        if (string.IsNullOrWhiteSpace(Inputs["Name"].Text)) { MessageBox.Show(this, SurveyText.L("Required"), Title); return false; }
+        try { _save(Draft()); return true; }
+        catch (OperationCanceledException) { return false; }
+        catch (Exception) { MessageBox.Show(this, SurveyText.L("Error"), Title, MessageBoxButton.OK, MessageBoxImage.Error); return false; }
+    }
+}
diff --git a/Controls/SurveyPanel.cs b/Controls/SurveyPanel.cs
new file mode 100644
index 0000000..b8b5bc2
--- /dev/null
+++ b/Controls/SurveyPanel.cs
@@ -0,0 +1,129 @@
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using KillerScan.Services;
+
+namespace KillerScan.Controls;
+
+internal sealed class SurveyPanel : DockPanel
+{
+    internal static void Theme(Window window) => window.Resources.MergedDictionaries.Add(new ResourceDictionary
+        { Source = new Uri("pack://application:,,,/KillerScan;component/Controls/SurveyStyles.xaml") });
+    private readonly SurveyStore _store;
+    private readonly Action<string> _open, _copy;
+    private readonly NetworkDevice[] _devices;
+    internal readonly DataGrid Grid = new() { AutoGenerateColumns = false, IsReadOnly = true, CanUserAddRows = false,
+        SelectionMode = DataGridSelectionMode.Single, HeadersVisibility = DataGridHeadersVisibility.Column, MinRowHeight = 44 };
+    private readonly TextBlock _status = Text("");
+    private readonly List<Button> _actions = [];
+    internal sealed class Row(SurveyEntry entry)
+    {
+        internal SurveyEntry Entry { get; } = entry;
+        public string Name => Entry.Name;
+        public string Room => Entry.Room;
+        public string Functions => Entry.DesiredFunctions;
+        public string Observation => ObservationText(Entry);
+    }
+    internal SurveyPanel(SurveyStore store, IEnumerable<NetworkDevice> devices, Action<string> open, Action<string> copy)
+    {
+        _store = store; _devices = devices.ToArray(); _open = open; _copy = copy;
+        var notice = Text(SurveyText.L("Notice")); SetDock(notice, Dock.Top); Children.Add(notice);
+        SetDock(_status, Dock.Top); Children.Add(_status);
+        var actions = new WrapPanel(); SetDock(actions, Dock.Bottom); Children.Add(actions);
+        void Action(string key, Action run)
+        { var button = Button(SurveyText.L(key), run, key.ToLowerInvariant()); actions.Children.Add(button); _actions.Add(button); }
+        Action("Manual", () => Edit(new SurveyEntry { Manual = true }, true));
+        Action("Edit", () => { if (Selected is { } entry) Edit(entry, false); });
+        Action("Remove", () =>
+        {
+            RemoveSelected(_ => MessageBox.Show(Window.GetWindow(this), SurveyText.L("ConfirmRemove"), SurveyText.L("Title"),
+                MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.Yes);
+        });
+        Action("Link", Link);
+        Grid.SetResourceReference(Control.BackgroundProperty, "BackgroundBrush"); Grid.SetResourceReference(Control.ForegroundProperty, "TextBrush");
+        Grid.SetResourceReference(DataGrid.RowStyleProperty, "DarkDataGridRow"); Grid.SetResourceReference(DataGrid.CellStyleProperty, "DarkDataGridCell");
+        Grid.SetResourceReference(DataGrid.ColumnHeaderStyleProperty, "ThemedDataGridColumnHeader");
+        foreach (var (key, path, width) in new[] { ("Name", "Name", 180d), ("Room", "Room", 130d), ("Functions", "Functions", 240d), ("Observation", "Observation", 420d) })
+        {
+            var style = new Style(typeof(TextBlock)); style.Setters.Add(new Setter(TextBlock.TextWrappingProperty, TextWrapping.Wrap));
+            style.Setters.Add(new Setter(FrameworkElement.MarginProperty, new Thickness(6)));
+            Grid.Columns.Add(new DataGridTextColumn { Header = SurveyText.L(key), Binding = new Binding(path), Width = width, ElementStyle = style });
+        }
+        Grid.MouseDoubleClick += (_, args) => { if (ItemsControl.ContainerFromElement(Grid, args.OriginalSource as DependencyObject) is DataGridRow && Selected is { } entry) Edit(entry, false); };
+        Children.Add(Grid); Reload();
+    }
+    private SurveyEntry? Selected => (Grid.SelectedItem as Row)?.Entry;
+    internal void RemoveSelected(Func<SurveyEntry, bool> confirm)
+    { if (Selected is { } entry && confirm(entry)) Run(() => _store.Remove(entry.Id)); }
+    internal void Reload()
+    {
+        try
+        {
+            Grid.ItemsSource = _store.Load().Select(entry => new Row(entry)).ToArray(); _status.Text = "";
+            foreach (var action in _actions) action.IsEnabled = true;
+        }
+        catch (Exception) { _status.Text = SurveyText.L("Error"); Grid.ItemsSource = null; foreach (var action in _actions) action.IsEnabled = false; }
+    }
+    internal bool Run(Action action)
+    {
+        try { action(); Reload(); return true; }
+        catch (Exception) { _status.Text = SurveyText.L("Error"); return false; }
+    }
+    internal void AddSelected(IEnumerable<NetworkDevice> selected)
+    {
+        foreach (var device in selected)
+        {
+            SurveyEntry? added = null;
+            if (!Run(() => added = _store.AddObserved(device, candidates => Choose(Window.GetWindow(this), candidates))) || added == null) break;
+        }
+    }
+    internal static string? Choose(Window owner, IReadOnlyList<SurveyEntry> candidates)
+    {
+        var choices = new ComboBox { MinWidth = 280, Margin = new Thickness(8), DisplayMemberPath = "Name", ItemsSource = candidates, SelectedIndex = 0 };
+        string? result = null;
+        choices.SetResourceReference(StyleProperty, "DarkComboBox");
+        var dialog = Prompt(owner, SurveyText.L("IpWarning"), choices, buttons =>
+        {
+            buttons.Children.Add(Button(SurveyText.L("Link"), () => { result = (choices.SelectedItem as SurveyEntry)?.Id; Window.GetWindow(buttons).Close(); }));
+            buttons.Children.Add(Button(SurveyText.L("New"), () => { result = ""; Window.GetWindow(buttons).Close(); }));
+        });
+        dialog.ShowDialog(); return result;
+    }
+    private void Link()
+    {
+        if (Selected is not { } entry) return;
+        var choices = new ComboBox { MinWidth = 280, Margin = new Thickness(8), ItemsSource = _devices.Select((device, index) => new { Name = device.IpAddress + " · " + device.Hostname, Index = index }).ToArray(), DisplayMemberPath = "Name", SelectedIndex = _devices.Length > 0 ? 0 : -1 };
+        choices.SetResourceReference(StyleProperty, "DarkComboBox");
+        var dialog = Prompt(Window.GetWindow(this), SurveyText.L("ConfirmLink") + "\n" + entry.Name, choices, buttons =>
+        {
+            var link = Button(SurveyText.L("Link"), () =>
+            {
+                if (choices.SelectedIndex >= 0 && Run(() => _store.Link(entry.Id, _devices[choices.SelectedIndex]))) Window.GetWindow(buttons).Close();
+            }); link.IsEnabled = _devices.Length > 0; buttons.Children.Add(link);
+        }); dialog.ShowDialog();
+    }
+    private static Window Prompt(Window owner, string message, FrameworkElement choices, Action<WrapPanel> add)
+    {
+        var dialog = new Window { Title = SurveyText.L("Title"), Width = 560, Height = 300, MinWidth = 360, MinHeight = 240,
+            Owner = owner, WindowStartupLocation = WindowStartupLocation.CenterOwner };
+        Theme(dialog);
+        dialog.SetResourceReference(Window.BackgroundProperty, "BackgroundBrush"); dialog.SetResourceReference(Window.ForegroundProperty, "TextBrush");
+        var panel = new StackPanel { Margin = new Thickness(18) }; panel.Children.Add(Text(message)); panel.Children.Add(choices);
+        var buttons = new WrapPanel(); add(buttons); var cancel = Button(SurveyText.L("Cancel"), dialog.Close); cancel.IsCancel = true; buttons.Children.Add(cancel); panel.Children.Add(buttons);
+        dialog.Content = new ScrollViewer { Content = panel, VerticalScrollBarVisibility = ScrollBarVisibility.Auto }; return dialog;
+    }
+    private void Edit(SurveyEntry entry, bool create)
+    {
+        var dialog = new SurveyEditorWindow(entry, updated => { if (create) _store.AddManual(updated); else _store.Save(updated); }, _open, _copy)
+            { Owner = Window.GetWindow(this) };
+        dialog.ShowDialog(); Reload();
+    }
+    internal static string ObservationText(SurveyEntry entry) => entry.Observation is not { } observation ? SurveyText.L("NoObservation") :
+        SurveyText.L("Observation") + ": " + HomeAssistantText.Time(observation.LastSeenUtc) + "\n" + observation.Device.IpAddress + " · " + observation.Device.MacAddress;
+    internal static TextBlock Text(string text) => new() { Text = text, TextWrapping = TextWrapping.Wrap, Margin = new Thickness(0, 6, 0, 8) };
+    internal static Button Button(string label, Action action, string tag = "")
+    {
+        var button = new Button { Content = label, Tag = tag, Padding = new Thickness(10, 6, 10, 6), Margin = new Thickness(0, 8, 8, 8) };
+        button.SetResourceReference(StyleProperty, "OutlineButton"); button.Click += (_, _) => action(); return button;
+    }
+}
diff --git a/Controls/SurveyStyles.xaml b/Controls/SurveyStyles.xaml
new file mode 100644
index 0000000..1d20879
--- /dev/null
+++ b/Controls/SurveyStyles.xaml
@@ -0,0 +1,22 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Style TargetType="TabItem">
+        <Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource BackgroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource PaneBorderBrush}"/>
+        <Setter Property="Padding" Value="12,8"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="TabItem">
+                    <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1" Padding="{TemplateBinding Padding}">
+                        <ContentPresenter ContentSource="Header" RecognizesAccessKey="True"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsSelected" Value="True"><Setter Property="BorderBrush" Value="{DynamicResource AccentBrush}"/></Trigger>
+                        <Trigger Property="IsKeyboardFocusWithin" Value="True"><Setter Property="BorderBrush" Value="{DynamicResource AccentBrush}"/></Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
diff --git a/README.md b/README.md
index 2e27cdd..baea11a 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ One-click, fast network scanner built for field techs. Single portable EXE, free
 Part of [killertools.net](https://killertools.net).
 
 This fork additionally retains [Home Assistant integration advice](docs/home-assistant-advisor.md)
-per device and for the whole scan. [Fork synchronization and data compatibility](docs/fork-upstream-1.9.md)
+per device and for the whole scan, plus a [persistent location inventory](docs/location-survey.md). [Fork synchronization and data compatibility](docs/fork-upstream-1.9.md)
 describe its differences from upstream. Upstream downloads do not contain these fork additions.
 
 ## Features
diff --git a/Services/HomeAssistantText.cs b/Services/HomeAssistantText.cs
index 566baf4..764505e 100644
--- a/Services/HomeAssistantText.cs
+++ b/Services/HomeAssistantText.cs
@@ -30,7 +30,7 @@ internal static class HomeAssistantText
         ["Inputs"] = "Refine device information",
         ["Next"] = "In HA, use Add integration and select this integration. Check its model support and prerequisites below.",
         ["NoDevices"] = "This scan has no devices yet. Run a scan first.",
-        ["Note"] = "Suggestions are not verified compatibility. No connection or setup is performed. Optional inputs stay in this window; documentation links never include device data.",
+        ["Note"] = "Suggestions are not verified compatibility. No connection or setup is performed. Manual inputs persist only after explicit saving to the location inventory; documentation links contain no device data.",
         ["Unknown"] = "No specific match in this catalogue. This does not mean the device is unsupported.",
         ["Candidates"] = "Integration candidates", ["Workflow"] = "Find the best integration path",
         ["Identity"] = "Manufacturer / exact model (optional, no credentials)",
diff --git a/Services/Locations.cs b/Services/Locations.cs
index 8b4d2a7..0fbfa84 100644
--- a/Services/Locations.cs
+++ b/Services/Locations.cs
@@ -57,6 +57,7 @@ internal sealed class LocationData
         public DeviceLoginStore Logins => _logins();
         public SavedScanStore SavedScans => _savedScans();
         public HistoryStore History => _history();
+        internal SurveyStore? Survey { get; }
 
         private LocationData(LocationInfo? info, string directory, bool memoryOnly)
         {
@@ -66,6 +67,7 @@ private LocationData(LocationInfo? info, string directory, bool memoryOnly)
             var logins = new DeviceLoginStore(Path.Combine(directory, "logins.json"), memoryOnly);
             var savedScans = new SavedScanStore(Path.Combine(directory, "profiles.json"), memoryOnly);
             var history = new HistoryStore(Path.Combine(directory, "history.json"), memoryOnly);
+            if (info != null) Survey = new SurveyStore(Path.Combine(directory, "survey.json"), info.Id, memoryOnly);
             _devices = () => devices; _overrides = () => overrides; _logins = () => logins;
             _savedScans = () => savedScans; _history = () => history;
         }
diff --git a/Services/SurveyStore.cs b/Services/SurveyStore.cs
new file mode 100644
index 0000000..c19d139
--- /dev/null
+++ b/Services/SurveyStore.cs
@@ -0,0 +1,217 @@
+using System.IO;
+using System.Text.Json;
+using KillerScan.Engine;
+
+namespace KillerScan.Services;
+
+// Deliberately outside Engine and the scan/export contracts. User leads are never scan facts.
+internal sealed record SurveyEntry
+{
+    [System.Text.Json.Serialization.JsonRequired]
+    public string Id { get; init; } = Guid.NewGuid().ToString("N");
+    public bool Manual { get; init; }
+    [System.Text.Json.Serialization.JsonRequired]
+    public string Name { get; init; } = "";
+    public string Room { get; init; } = "";
+    public string ManufacturerModel { get; init; } = "";
+    public string Firmware { get; init; } = "";
+    public string Connection { get; init; } = "";
+    public string DesiredFunctions { get; init; } = "";
+    public string Notes { get; init; } = "";
+    public string Protocol { get; init; } = "";
+    public string Goal { get; init; } = "Monitor";
+    public string LinkedMac { get; init; } = "";
+    public SurveyObservation? Observation { get; init; }
+    internal HomeAssistantContext Context => new() { ManufacturerModel = ManufacturerModel, Protocol = Protocol, Goal = Goal };
+}
+
+internal sealed record SurveyObservation
+{
+    [System.Text.Json.Serialization.JsonRequired]
+    public NetworkDevice Device { get; init; } = new();
+    public DateTimeOffset? LastSeenUtc { get; init; }
+    public DateTimeOffset SavedAtUtc { get; init; } = DateTimeOffset.UtcNow;
+}
+
+internal sealed class SurveyStore
+{
+    private sealed class Document
+    {
+        [System.Text.Json.Serialization.JsonRequired]
+        public int Version { get; set; }
+        [System.Text.Json.Serialization.JsonRequired]
+        public string LocationId { get; set; } = "";
+        [System.Text.Json.Serialization.JsonRequired]
+        public List<SurveyEntry> Entries { get; set; } = [];
+    }
+    private static readonly JsonSerializerOptions Json = new() { WriteIndented = true };
+    private readonly string _path, _location;
+    private readonly bool _memoryOnly;
+    private Document _memory;
+    internal SurveyStore(string path, string location, bool memoryOnly = false)
+    { _path = path; _location = location; _memoryOnly = memoryOnly; _memory = new() { Version = 1, LocationId = location }; }
+    private static T Clone<T>(T value) => JsonSerializer.Deserialize<T>(JsonSerializer.Serialize(value, Json), Json)!;
+    internal static string Mac(string? value)
+    {
+        string normalized = (value ?? "").Replace(":", "").Replace("-", "").Trim().ToUpperInvariant();
+        return normalized.Length == 12 && normalized.All(Uri.IsHexDigit) && normalized != "000000000000" && normalized != "FFFFFFFFFFFF" ? normalized : "";
+    }
+    internal static string DeviceName(NetworkDevice device)
+    {
+        string name = new[] { device.Hostname, device.IpAddress, device.MacAddress }
+            .FirstOrDefault(value => !string.IsNullOrWhiteSpace(value))?.Trim() ?? "?";
+        return name.Length <= 160 ? name : name.Substring(0, char.IsHighSurrogate(name[159]) ? 159 : 160);
+    }
+    private Document Read()
+    {
+        if (_memoryOnly) return Clone(_memory);
+        if (!File.Exists(_path)) return new() { Version = 1, LocationId = _location };
+        try
+        {
+            var data = JsonSerializer.Deserialize<Document>(File.ReadAllText(_path), Json);
+            if (data == null || data.Version != 1 || data.LocationId != _location || data.Entries == null ||
+                data.Entries.Any(entry => entry == null || !Guid.TryParseExact(entry.Id, "N", out _) || !Valid(entry) ||
+                    (entry.LinkedMac != "" && Mac(entry.LinkedMac) != entry.LinkedMac) ||
+                    (entry.Observation != null && (!Usable(entry.Observation.Device) ||
+                        (entry.Observation.Device.LocationId != null && entry.Observation.Device.LocationId != _location) ||
+                        (entry.LinkedMac != "" && Mac(entry.Observation.Device.MacAddress) != entry.LinkedMac)))) ||
+                data.Entries.Select(entry => entry.Id).Distinct().Count() != data.Entries.Count ||
+                data.Entries.Where(entry => entry.LinkedMac != "").GroupBy(entry => entry.LinkedMac).Any(group => group.Count() > 1))
+                throw new InvalidDataException("Invalid survey schema or location.");
+            return data;
+        }
+        catch (Exception error) when (error is JsonException || error is ArgumentException || error is NullReferenceException)
+        { throw new InvalidDataException("Invalid survey; the original file was preserved.", error); }
+    }
+    private static bool Usable(NetworkDevice? device) => device != null &&
+        new[] { device.IpAddress, device.MacAddress, device.Hostname, device.Vendor, device.DeviceType, device.HttpTitle, device.HttpServer, device.SnmpDescr, device.SsdpServer }.All(value => value != null) &&
+        device.OpenPorts != null && device.MdnsServices != null && device.MdnsServices.All(value => value != null) &&
+        (device.Identification is not { } identification || identification.Evidence != null && identification.Evidence.All(fact => fact != null && fact.Source != null && fact.Value != null)) &&
+        (device.HomeAssistant is not { } advice || advice.Candidates != null && advice.Steps != null && advice.Candidates.All(candidate => candidate != null && candidate.Evidence != null && candidate.Requirements != null && candidate.Evidence.All(fact => fact != null && fact.Source != null && fact.Value != null)));
+    private static bool Valid(SurveyEntry entry) => !string.IsNullOrWhiteSpace(entry.Name) && entry.Name.Length <= 160 &&
+        new[] { entry.Room, entry.ManufacturerModel, entry.Firmware, entry.Connection, entry.DesiredFunctions, entry.Notes, entry.Protocol, entry.Goal, entry.LinkedMac }
+            .All(value => value != null && value.Length <= 8000) && entry.Goal is "Monitor" or "Control" or "Media";
+    internal IReadOnlyList<SurveyEntry> Load() => Clone(Read().Entries);
+    private T Change<T>(Func<Document, T> change)
+    {
+        if (!_memoryOnly) Directory.CreateDirectory(Path.GetDirectoryName(_path)!);
+        using var lease = _memoryOnly ? null : new FileStream(_path + ".lock", FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+        var document = Read();
+        T result = change(document);
+        if (_memoryOnly) _memory = Clone(document);
+        else DevelopmentData.WriteAtomic(_path, JsonSerializer.Serialize(document, Json));
+        return result;
+    }
+    internal void Save(SurveyEntry entry) => Change(document =>
+    {
+        if (!Valid(entry) || !Guid.TryParseExact(entry.Id, "N", out _)) throw new ArgumentException("A device name is required.");
+        int index = document.Entries.FindIndex(item => item.Id == entry.Id);
+        if (index < 0) throw new InvalidOperationException("The survey entry no longer exists. Reload the survey.");
+        // Editing may change only manual fields, never the network binding or observation.
+        var previous = document.Entries[index];
+        document.Entries[index] = Clone(entry with { Manual = previous.Manual, LinkedMac = previous.LinkedMac, Observation = previous.Observation });
+        return true;
+    });
+    internal void AddManual(SurveyEntry entry) => Change(document =>
+    {
+        if (!Valid(entry) || !Guid.TryParseExact(entry.Id, "N", out _) || document.Entries.Any(item => item.Id == entry.Id)) throw new ArgumentException("A unique device name/ID is required.");
+        document.Entries.Add(Clone(entry with { Manual = true, LinkedMac = "", Observation = null })); return true;
+    });
+    internal void Remove(string id) => Change(document => document.Entries.RemoveAll(item => item.Id == id));
+    private SurveyObservation Capture(NetworkDevice device)
+    {
+        if (!Usable(device)) throw new InvalidDataException("Invalid device observation.");
+        if (device.LocationId != null && device.LocationId != _location) throw new InvalidDataException("The device belongs to a different location.");
+        var frozen = Clone(device);
+        frozen.LocationId = _location;
+        return new() { Device = frozen, LastSeenUtc = device.Identification?.ObservationCompletedAtUtc };
+    }
+    // Confirmation is supplied by the UI. Cancellation returns before any disk mutation.
+    internal SurveyEntry? AddObserved(NetworkDevice device, Func<IReadOnlyList<SurveyEntry>, string?> chooseIpMatch, SurveyEntry? edited = null)
+    {
+        var snapshot = Capture(device); string mac = Mac(device.MacAddress);
+        var entries = Load();
+        var matched = mac == "" ? null : entries.SingleOrDefault(item => !item.Manual && item.LinkedMac == mac);
+        if (matched == null)
+        {
+            var candidates = entries.Where(item => !item.Manual && item.Observation?.Device.IpAddress == device.IpAddress &&
+                device.IpAddress.Length > 0 && (item.LinkedMac == "" || mac == "")).ToArray();
+            if (candidates.Length > 0)
+            {
+                string? choice = chooseIpMatch(candidates);
+                if (choice == null) return null;
+                matched = choice == "" ? null : candidates.SingleOrDefault(item => item.Id == choice)
+                    ?? throw new ArgumentException("Select an existing survey entry explicitly.");
+            }
+        }
+        string? expected = matched?.Id;
+        return Change(document =>
+        {
+            var current = expected == null ? null : document.Entries.SingleOrDefault(item => item.Id == expected);
+            if (expected != null && current == null) throw new InvalidOperationException("The survey changed. Reload before linking.");
+            if (mac != "" && document.Entries.Any(item => item.LinkedMac == mac && item.Id != expected))
+                throw new InvalidOperationException("This MAC is already linked. Reload the survey.");
+            var updated = current ?? new SurveyEntry { Name = DeviceName(device) };
+            if (edited != null)
+            {
+                if (!Valid(edited)) throw new ArgumentException("A device name is required.");
+                if (current != null && edited.Id != current.Id)
+                    throw new InvalidOperationException("Reload the linked entry before editing its manual fields.");
+                updated = edited with { Id = updated.Id, Manual = false };
+            }
+            var keep = current?.Observation;
+            if (keep == null || Mac(keep.Device.MacAddress) != mac || (snapshot.LastSeenUtc != null && (keep.LastSeenUtc == null || snapshot.LastSeenUtc >= keep.LastSeenUtc))) keep = snapshot;
+            updated = updated with { LinkedMac = mac, Observation = keep };
+            if (current == null) document.Entries.Add(updated); else document.Entries[document.Entries.IndexOf(current)] = updated;
+            return Clone(updated);
+        });
+    }
+    internal void Link(string id, NetworkDevice device) => Change(document =>
+    {
+        int index = document.Entries.FindIndex(entry => entry.Id == id);
+        if (index < 0) throw new InvalidOperationException("The survey entry no longer exists.");
+        string mac = Mac(device.MacAddress);
+        if (mac != "" && document.Entries.Any(entry => entry.Id != id && entry.LinkedMac == mac))
+            throw new InvalidOperationException("This MAC is already linked. Reload the survey.");
+        document.Entries[index] = document.Entries[index] with { LinkedMac = mac, Observation = Capture(device) };
+        return true;
+    });
+    internal void Refresh(IEnumerable<NetworkDevice> devices)
+    {
+        var found = devices.ToArray();
+        if (found.Length == 0) return;
+        var entries = Load();
+        if (!entries.Any(entry => entry.LinkedMac != "" && found.Any(device => Mac(device.MacAddress) == entry.LinkedMac))) return;
+        Change(document =>
+        {
+            for (int index = 0; index < document.Entries.Count; index++)
+            {
+                var entry = document.Entries[index];
+                var matches = found.Where(device => entry.LinkedMac != "" && Mac(device.MacAddress) == entry.LinkedMac).ToArray();
+                if (matches.Length != 1) continue; // Ambiguous duplicate MAC observations need a human.
+                var observation = Capture(matches[0]);
+                if (observation.LastSeenUtc == null || (entry.Observation?.LastSeenUtc is { } previous && observation.LastSeenUtc < previous)) continue;
+                document.Entries[index] = entry with { Observation = observation };
+            }
+            return true;
+        });
+    }
+    internal static NetworkDevice AdviceDevice(SurveyEntry entry)
+    {
+        var device = entry.Observation == null ? new NetworkDevice() : Clone(entry.Observation.Device);
+        if (entry.Observation != null && device.Identification == null)
+        {
+            // Legacy network fields have no trustworthy capture time. Retain only the existing
+            // advisor's network facts, explicitly cached, without promoting any manual fields.
+            device.Identification = new DeviceIdentification { Scope = "survey", AssessedAtUtc = entry.Observation.SavedAtUtc,
+                Evidence = HomeAssistantAdvisor.Assess(device).Candidates.SelectMany(candidate => candidate.Evidence)
+                    .Select(fact => fact with { Reused = true }).Distinct().ToArray() };
+        }
+        if (device.Identification is { } identification)
+            device.Identification = identification with { Evidence = identification.Evidence.Select(fact => fact with { Reused = true }).ToArray() };
+        if (device.HomeAssistant is { } advice)
+            device.HomeAssistant = advice with { Candidates = advice.Candidates.Select(candidate => candidate with
+                { Evidence = candidate.Evidence.Select(fact => fact with { Reused = true }).ToArray() }).ToArray() };
+        return device;
+    }
+}
diff --git a/Services/SurveyText.cs b/Services/SurveyText.cs
new file mode 100644
index 0000000..9400934
--- /dev/null
+++ b/Services/SurveyText.cs
@@ -0,0 +1,9 @@
+using System.Windows;
+
+namespace KillerScan.Services;
+
+internal static class SurveyText
+{
+    internal static readonly string[] Keys = ["Title", "Scan", "Add", "Manual", "Edit", "Remove", "ConfirmRemove", "Name", "Room", "Firmware", "Connection", "Functions", "Notes", "Save", "Cancel", "Required", "Notice", "Observation", "NoObservation", "Error", "Link", "ConfirmLink", "New", "IpWarning", "Hints"];
+    internal static string L(string key) => Application.Current?.TryFindResource("Str_Survey_" + key) as string ?? key;
+}
diff --git a/Shell/History.cs b/Shell/History.cs
index 1dedb0d..2e4ad71 100644
--- a/Shell/History.cs
+++ b/Shell/History.cs
@@ -238,7 +238,8 @@ private void ShowHistoryEntry()
                 _historyWorkspace = new HistoryWorkspace
                 {
                     LayoutTransform = new ScaleTransform(_appScale, _appScale),
-                    HistorySource = () => ShellLocation.History
+                    HistorySource = () => ShellLocation.History,
+                    SurveySource = history => ReferenceEquals(history, ShellLocation.History) ? ShellLocation.Survey : null
                 };
                 _historyWorkspace.UseTableHeaderStyle(((DataGrid)_scanWorkspace!.FindName("ResultsGrid")).ColumnHeaderStyle);
                 RegisterViewToolbar("history", _historyWorkspace.DetachToolbar());
diff --git a/Strings/bn.xaml b/Strings/bn.xaml
index 894507e..e13f7b1 100644
--- a/Strings/bn.xaml
+++ b/Strings/bn.xaml
@@ -690,7 +690,7 @@
     <sys:String x:Key="Str_Access_Note">খুললে নতুন সংযোগ তৈরি হয়। HTTP 200 লগইন ছাড়া প্রবেশ প্রমাণ করে না। HTTPS সনদ যাচাই করা হয়নি। প্রমাণীকরণের তথ্য শুধু অনুরোধ করা ঠিকানার জন্য প্রযোজ্য।</sys:String>
     <sys:String x:Key="Str_Access_NoTime">পর্যবেক্ষণের সময় উপলব্ধ নেই</sys:String>
     <sys:String x:Key="Str_HA_Title">Home Assistant ইন্টিগ্রেশন</sys:String>
-    <sys:String x:Key="Str_HA_Note">পরামর্শ মানেই যাচাইকৃত সামঞ্জস্য নয়। কোনো সংযোগ বা সেটআপ করা হয় না। ঐচ্ছিক তথ্য এই উইন্ডোতেই থাকে; নথির লিংকে ডিভাইসের তথ্য যায় না।</sys:String>
+    <sys:String x:Key="Str_HA_Note">সুপারিশ সামঞ্জস্য নিশ্চিত করে না। কোনো সংযোগ বা সেটআপ করা হয় না। হাতে লেখা তথ্য অবস্থানের তালিকায় স্পষ্টভাবে সংরক্ষণ করলেই থাকে; নির্দেশনার লিংকে ডিভাইসের তথ্য থাকে না।</sys:String>
     <sys:String x:Key="Str_HA_Unknown">এই তালিকায় নির্দিষ্ট মিল নেই। এর মানে ডিভাইসটি অসমর্থিত নয়।</sys:String>
     <sys:String x:Key="Str_HA_Candidates">সম্ভাব্য ইন্টিগ্রেশন</sys:String>
     <sys:String x:Key="Str_HA_Workflow">সেরা ইন্টিগ্রেশন পথ খুঁজুন</sys:String>
@@ -750,4 +750,31 @@
     <sys:String x:Key="Str_HA_TuyaAccount">ডিভাইস আপনার Tuya Smart / Smart Life অ্যাকাউন্টে যুক্ত থাকতে হবে; সুবিধা যাচাই করুন</sys:String>
     <sys:String x:Key="Str_HA_GoeApi">সামঞ্জস্যপূর্ণ go-e মডেল/ফার্মওয়্যার এবং সক্রিয় স্থানীয় HTTP API v2 বা WebSocket</sys:String>
     <sys:String x:Key="Str_HA_EwelinkFirmware">মূল eWeLink ফার্মওয়্যারসহ সমর্থিত ডিভাইস; LAN/ক্লাউড মোড যাচাই করুন</sys:String>
+
+    <!-- Persistent, explicitly saved initial-survey inventory. -->
+    <sys:String x:Key="Str_Survey_Title">অবস্থানের তালিকা</sys:String>
+    <sys:String x:Key="Str_Survey_Scan">বর্তমান স্ক্যান</sys:String>
+    <sys:String x:Key="Str_Survey_Add">নির্বাচিতগুলো তালিকায় যোগ করুন</sys:String>
+    <sys:String x:Key="Str_Survey_Manual">হাতে ডিভাইস যোগ করুন</sys:String>
+    <sys:String x:Key="Str_Survey_Edit">ডিভাইস সম্পাদনা</sys:String>
+    <sys:String x:Key="Str_Survey_Remove">তালিকা থেকে সরান</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmRemove">এই এন্ট্রি সরাবেন? স্ক্যানের ইতিহাস রাখা হবে।</sys:String>
+    <sys:String x:Key="Str_Survey_Name">নাম (আবশ্যক)</sys:String>
+    <sys:String x:Key="Str_Survey_Room">ঘর</sys:String>
+    <sys:String x:Key="Str_Survey_Firmware">ফার্মওয়্যার</sys:String>
+    <sys:String x:Key="Str_Survey_Connection">সংযোগ / প্রোটোকল</sys:String>
+    <sys:String x:Key="Str_Survey_Functions">Home Assistant-এ কাঙ্ক্ষিত কাজ</sys:String>
+    <sys:String x:Key="Str_Survey_Notes">নোট</sys:String>
+    <sys:String x:Key="Str_Survey_Save">সংরক্ষণ</sys:String>
+    <sys:String x:Key="Str_Survey_Cancel">বাতিল</sys:String>
+    <sys:String x:Key="Str_Survey_Required">ডিভাইসের নাম লিখুন।</sys:String>
+    <sys:String x:Key="Str_Survey_Notice">হাতে লেখা তথ্য ব্যবহারকারীর দেওয়া, যাচাইকৃত সামঞ্জস্য নয়। সুপারিশ যাচাই করতে হবে। তালিকা খুললে ডিভাইস বা Home Assistant-এর সঙ্গে যোগাযোগ হয় না।</sys:String>
+    <sys:String x:Key="Str_Survey_Observation">সংরক্ষিত পর্যবেক্ষণ (সরাসরি অবস্থা নয়)</sys:String>
+    <sys:String x:Key="Str_Survey_NoObservation">সংরক্ষিত নেটওয়ার্ক পর্যবেক্ষণ নেই</sys:String>
+    <sys:String x:Key="Str_Survey_Error">তালিকা পড়া বা সংরক্ষণ করা যায়নি। আগের তথ্য রাখা হয়েছে। ডেটা ফোল্ডার ও তার ব্যাকআপ পরীক্ষা করুন।</sys:String>
+    <sys:String x:Key="Str_Survey_Link">পর্যবেক্ষণ যুক্ত করুন</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmLink">এই এন্ট্রিকে পাওয়া ডিভাইসের সঙ্গে যুক্ত করবেন? শুধু নেটওয়ার্কের সংযোগ বদলাবে। আগে ডিভাইসের পরিচয় যাচাই করুন।</sys:String>
+    <sys:String x:Key="Str_Survey_New">আলাদা এন্ট্রি তৈরি করুন</sys:String>
+    <sys:String x:Key="Str_Survey_IpWarning">IP একটি এন্ট্রির সঙ্গে মেলে, কিন্তু পরিচয় নিশ্চিত নয়। এন্ট্রি বাছুন, আলাদা তৈরি করুন বা বাতিল করুন।</sys:String>
+    <sys:String x:Key="Str_Survey_Hints">এই তথ্য ব্যবহার করুন</sys:String>
 </ResourceDictionary>
diff --git a/Strings/cs-CZ.xaml b/Strings/cs-CZ.xaml
index b189380..38fdc6c 100644
--- a/Strings/cs-CZ.xaml
+++ b/Strings/cs-CZ.xaml
@@ -688,7 +688,7 @@ Vaše nastavení nebude odstraněno.</sys:String>
     <sys:String x:Key="Str_Access_Note">Otevření vytvoří nové spojení. HTTP 200 nedokazuje přístup bez přihlášení. Certifikáty HTTPS nebyly ověřeny. Doklad přihlášení platí jen pro požadovanou adresu.</sys:String>
     <sys:String x:Key="Str_Access_NoTime">Čas pozorování není dostupný</sys:String>
     <sys:String x:Key="Str_HA_Title">Integrace Home Assistant</sys:String>
-    <sys:String x:Key="Str_HA_Note">Návrhy nepotvrzují kompatibilitu. Nic se nepřipojuje ani nenastavuje. Volitelné údaje zůstávají v tomto okně; odkazy neobsahují údaje zařízení.</sys:String>
+    <sys:String x:Key="Str_HA_Note">Návrhy nepotvrzují kompatibilitu. Neprobíhá připojení ani nastavení. Ruční údaje se zachovají až po výslovném uložení do soupisu lokality; odkazy na dokumentaci neobsahují údaje zařízení.</sys:String>
     <sys:String x:Key="Str_HA_Unknown">V katalogu není konkrétní shoda. Neznamená to, že zařízení není podporováno.</sys:String>
     <sys:String x:Key="Str_HA_Candidates">Možné integrace</sys:String>
     <sys:String x:Key="Str_HA_Workflow">Najít nejlepší cestu integrace</sys:String>
@@ -748,4 +748,31 @@ Vaše nastavení nebude odstraněno.</sys:String>
     <sys:String x:Key="Str_HA_TuyaAccount">Zařízení musí být v účtu Tuya Smart / Smart Life; ověřte funkce</sys:String>
     <sys:String x:Key="Str_HA_GoeApi">Kompatibilní model/firmware go-e a povolené místní HTTP API v2 nebo WebSocket</sys:String>
     <sys:String x:Key="Str_HA_EwelinkFirmware">Podporované zařízení s původním firmwarem eWeLink; ověřte režim LAN/cloud</sys:String>
+
+    <!-- Persistent, explicitly saved initial-survey inventory. -->
+    <sys:String x:Key="Str_Survey_Title">Soupis lokality</sys:String>
+    <sys:String x:Key="Str_Survey_Scan">Aktuální skenování</sys:String>
+    <sys:String x:Key="Str_Survey_Add">Přidat vybrané do soupisu</sys:String>
+    <sys:String x:Key="Str_Survey_Manual">Přidat zařízení ručně</sys:String>
+    <sys:String x:Key="Str_Survey_Edit">Upravit zařízení</sys:String>
+    <sys:String x:Key="Str_Survey_Remove">Odebrat ze soupisu</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmRemove">Odebrat tento záznam? Historie skenování zůstane zachována.</sys:String>
+    <sys:String x:Key="Str_Survey_Name">Název (povinný)</sys:String>
+    <sys:String x:Key="Str_Survey_Room">Místnost</sys:String>
+    <sys:String x:Key="Str_Survey_Firmware">Firmware</sys:String>
+    <sys:String x:Key="Str_Survey_Connection">Připojení / protokol</sys:String>
+    <sys:String x:Key="Str_Survey_Functions">Požadované funkce v Home Assistant</sys:String>
+    <sys:String x:Key="Str_Survey_Notes">Poznámky</sys:String>
+    <sys:String x:Key="Str_Survey_Save">Uložit</sys:String>
+    <sys:String x:Key="Str_Survey_Cancel">Zrušit</sys:String>
+    <sys:String x:Key="Str_Survey_Required">Zadejte název zařízení.</sys:String>
+    <sys:String x:Key="Str_Survey_Notice">Ruční údaje jsou informace uživatele, nikoli ověřená kompatibilita. Doporučení je nutné ověřit. Otevření soupisu nekontaktuje zařízení ani Home Assistant.</sys:String>
+    <sys:String x:Key="Str_Survey_Observation">Uložené pozorování (nejde o živý stav)</sys:String>
+    <sys:String x:Key="Str_Survey_NoObservation">Žádné uložené síťové pozorování</sys:String>
+    <sys:String x:Key="Str_Survey_Error">Soupis nelze přečíst nebo uložit. Existující data byla zachována. Zkontrolujte datovou složku a zálohu.</sys:String>
+    <sys:String x:Key="Str_Survey_Link">Propojit pozorování</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmLink">Propojit tento záznam s nalezeným zařízením? Změní se pouze síťové propojení. Nejprve ověřte totožnost zařízení.</sys:String>
+    <sys:String x:Key="Str_Survey_New">Vytvořit samostatný záznam</sys:String>
+    <sys:String x:Key="Str_Survey_IpWarning">IP odpovídá záznamu, ale totožnost není potvrzena. Vyberte záznam, vytvořte samostatný nebo akci zrušte.</sys:String>
+    <sys:String x:Key="Str_Survey_Hints">Použít tyto údaje</sys:String>
 </ResourceDictionary>
diff --git a/Strings/de-DE.xaml b/Strings/de-DE.xaml
index 8a77c44..25cae19 100644
--- a/Strings/de-DE.xaml
+++ b/Strings/de-DE.xaml
@@ -691,7 +691,7 @@ Ihre Einstellungen bleiben erhalten.</sys:String>
     <sys:String x:Key="Str_Access_Note">Öffnen stellt eine neue Verbindung her. HTTP 200 belegt keinen Zugriff ohne Anmeldung. HTTPS-Zertifikate wurden nicht validiert. Anmeldebelege gelten nur für die angeforderte Adresse.</sys:String>
     <sys:String x:Key="Str_Access_NoTime">Beobachtungszeit nicht verfügbar</sys:String>
     <sys:String x:Key="Str_HA_Title">Home-Assistant-Integrationen</sys:String>
-    <sys:String x:Key="Str_HA_Note">Vorschläge sind kein Kompatibilitätsnachweis. Es wird nichts verbunden oder eingerichtet. Optionale Eingaben bleiben in diesem Fenster; Dokumentationslinks enthalten keine Gerätedaten.</sys:String>
+    <sys:String x:Key="Str_HA_Note">Vorschläge sind keine bestätigte Kompatibilität. Es wird keine Verbindung oder Einrichtung durchgeführt. Manuelle Eingaben bleiben erst nach ausdrücklichem Speichern im Standortinventar erhalten; Dokumentationslinks enthalten keine Gerätedaten.</sys:String>
     <sys:String x:Key="Str_HA_Unknown">Kein konkreter Treffer in diesem Katalog. Das bedeutet nicht, dass das Gerät nicht unterstützt wird.</sys:String>
     <sys:String x:Key="Str_HA_Candidates">Mögliche Integrationen</sys:String>
     <sys:String x:Key="Str_HA_Workflow">Den besten Integrationsweg finden</sys:String>
@@ -751,4 +751,31 @@ Ihre Einstellungen bleiben erhalten.</sys:String>
     <sys:String x:Key="Str_HA_TuyaAccount">Gerät muss mit deinem Tuya-Smart-/Smart-Life-Konto verknüpft sein; Funktionen prüfen</sys:String>
     <sys:String x:Key="Str_HA_GoeApi">Kompatibles go-e-Modell/Firmware und aktivierte lokale HTTP API v2 oder WebSocket</sys:String>
     <sys:String x:Key="Str_HA_EwelinkFirmware">Unterstütztes Gerät mit originaler eWeLink-Firmware; LAN-/Cloud-Modus prüfen</sys:String>
+
+    <!-- Persistent, explicitly saved initial-survey inventory. -->
+    <sys:String x:Key="Str_Survey_Title">Standortinventar</sys:String>
+    <sys:String x:Key="Str_Survey_Scan">Aktueller Scan</sys:String>
+    <sys:String x:Key="Str_Survey_Add">Auswahl zum Inventar hinzufügen</sys:String>
+    <sys:String x:Key="Str_Survey_Manual">Gerät manuell hinzufügen</sys:String>
+    <sys:String x:Key="Str_Survey_Edit">Gerät bearbeiten</sys:String>
+    <sys:String x:Key="Str_Survey_Remove">Aus Inventar entfernen</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmRemove">Diesen Inventareintrag entfernen? Der Scanverlauf bleibt erhalten.</sys:String>
+    <sys:String x:Key="Str_Survey_Name">Name (erforderlich)</sys:String>
+    <sys:String x:Key="Str_Survey_Room">Raum</sys:String>
+    <sys:String x:Key="Str_Survey_Firmware">Firmware</sys:String>
+    <sys:String x:Key="Str_Survey_Connection">Verbindung / Protokoll</sys:String>
+    <sys:String x:Key="Str_Survey_Functions">Gewünschte Home-Assistant-Funktionen</sys:String>
+    <sys:String x:Key="Str_Survey_Notes">Notizen</sys:String>
+    <sys:String x:Key="Str_Survey_Save">Speichern</sys:String>
+    <sys:String x:Key="Str_Survey_Cancel">Abbrechen</sys:String>
+    <sys:String x:Key="Str_Survey_Required">Geben Sie einen Gerätenamen ein.</sys:String>
+    <sys:String x:Key="Str_Survey_Notice">Manuelle Eingaben sind Benutzerangaben, keine bestätigte Kompatibilität. Empfehlungen müssen geprüft werden. Beim Öffnen werden weder Geräte noch Home Assistant kontaktiert.</sys:String>
+    <sys:String x:Key="Str_Survey_Observation">Gespeicherte Beobachtung (kein Live-Status)</sys:String>
+    <sys:String x:Key="Str_Survey_NoObservation">Keine gespeicherte Netzwerkbeobachtung</sys:String>
+    <sys:String x:Key="Str_Survey_Error">Das Inventar konnte nicht gelesen oder gespeichert werden. Vorhandene Daten bleiben erhalten. Prüfen Sie Datenordner und Sicherung.</sys:String>
+    <sys:String x:Key="Str_Survey_Link">Beobachtung verknüpfen</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmLink">Diesen Eintrag mit einem gefundenen Gerät verknüpfen? Nur die Netzwerkzuordnung wird geändert. Prüfen Sie zuerst die Geräteidentität.</sys:String>
+    <sys:String x:Key="Str_Survey_New">Separaten Eintrag erstellen</sys:String>
+    <sys:String x:Key="Str_Survey_IpWarning">Die IP stimmt mit einem Eintrag überein, die Identität ist jedoch unbestätigt. Wählen Sie einen Eintrag, erstellen Sie einen separaten oder brechen Sie ab.</sys:String>
+    <sys:String x:Key="Str_Survey_Hints">Diese Hinweise übernehmen</sys:String>
 </ResourceDictionary>
diff --git a/Strings/en-US.xaml b/Strings/en-US.xaml
index 4c90d80..99cc020 100644
--- a/Strings/en-US.xaml
+++ b/Strings/en-US.xaml
@@ -732,7 +732,7 @@ Your settings will not be removed.</sys:String>
     <sys:String x:Key="Str_Access_Note">Opening makes a new connection. HTTP 200 does not prove access without login. HTTPS certificates were not validated. Login evidence applies only to the requested address.</sys:String>
     <sys:String x:Key="Str_Access_NoTime">Observation time unavailable</sys:String>
     <sys:String x:Key="Str_HA_Title">Home Assistant integrations</sys:String>
-    <sys:String x:Key="Str_HA_Note">Suggestions are not verified compatibility. No connection or setup is performed. Optional inputs stay in this window; documentation links never include device data.</sys:String>
+    <sys:String x:Key="Str_HA_Note">Suggestions are not verified compatibility. No connection or setup is performed. Manual inputs persist only after explicit saving to the location inventory; documentation links contain no device data.</sys:String>
     <sys:String x:Key="Str_HA_Unknown">No specific match in this catalogue. This does not mean the device is unsupported.</sys:String>
     <sys:String x:Key="Str_HA_Candidates">Integration candidates</sys:String>
     <sys:String x:Key="Str_HA_Workflow">Find the best integration path</sys:String>
@@ -792,4 +792,31 @@ Your settings will not be removed.</sys:String>
     <sys:String x:Key="Str_HA_TuyaAccount">Device must be linked to your Tuya Smart / Smart Life account; check exposed functions</sys:String>
     <sys:String x:Key="Str_HA_GoeApi">Compatible go-e model/firmware and enabled local HTTP API v2 or WebSocket</sys:String>
     <sys:String x:Key="Str_HA_EwelinkFirmware">Supported device with original eWeLink firmware; check LAN/cloud mode</sys:String>
+
+    <!-- Persistent, explicitly saved initial-survey inventory. -->
+    <sys:String x:Key="Str_Survey_Title">Location inventory</sys:String>
+    <sys:String x:Key="Str_Survey_Scan">Current scan</sys:String>
+    <sys:String x:Key="Str_Survey_Add">Add selected to inventory</sys:String>
+    <sys:String x:Key="Str_Survey_Manual">Add device manually</sys:String>
+    <sys:String x:Key="Str_Survey_Edit">Edit device</sys:String>
+    <sys:String x:Key="Str_Survey_Remove">Remove from inventory</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmRemove">Remove this inventory entry? Scan history will be kept.</sys:String>
+    <sys:String x:Key="Str_Survey_Name">Name (required)</sys:String>
+    <sys:String x:Key="Str_Survey_Room">Room</sys:String>
+    <sys:String x:Key="Str_Survey_Firmware">Firmware</sys:String>
+    <sys:String x:Key="Str_Survey_Connection">Connection / protocol</sys:String>
+    <sys:String x:Key="Str_Survey_Functions">Desired Home Assistant functions</sys:String>
+    <sys:String x:Key="Str_Survey_Notes">Notes</sys:String>
+    <sys:String x:Key="Str_Survey_Save">Save</sys:String>
+    <sys:String x:Key="Str_Survey_Cancel">Cancel</sys:String>
+    <sys:String x:Key="Str_Survey_Required">Enter a device name.</sys:String>
+    <sys:String x:Key="Str_Survey_Notice">Manual entries are user information, not verified compatibility. Recommendations require verification. Opening this inventory does not contact devices or Home Assistant.</sys:String>
+    <sys:String x:Key="Str_Survey_Observation">Saved observation (not a live status)</sys:String>
+    <sys:String x:Key="Str_Survey_NoObservation">No saved network observation</sys:String>
+    <sys:String x:Key="Str_Survey_Error">The inventory could not be read or saved. Existing data was preserved. Check the data folder and its backup.</sys:String>
+    <sys:String x:Key="Str_Survey_Link">Link observation</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmLink">Link the selected inventory entry to a found device? This changes its network link only. Check the device identity first.</sys:String>
+    <sys:String x:Key="Str_Survey_New">Create separate entry</sys:String>
+    <sys:String x:Key="Str_Survey_IpWarning">The IP matches an inventory entry, but identity is unconfirmed. Select the entry to link, create a separate entry, or cancel.</sys:String>
+    <sys:String x:Key="Str_Survey_Hints">Use these hints</sys:String>
 </ResourceDictionary>
diff --git a/Strings/es.xaml b/Strings/es.xaml
index c21b707..6248d6d 100644
--- a/Strings/es.xaml
+++ b/Strings/es.xaml
@@ -690,7 +690,7 @@ Su configuración no se eliminará.</sys:String>
     <sys:String x:Key="Str_Access_Note">Abrir crea una nueva conexión. HTTP 200 no demuestra acceso sin iniciar sesión. No se validaron los certificados HTTPS. La evidencia de autenticación solo se aplica a la dirección solicitada.</sys:String>
     <sys:String x:Key="Str_Access_NoTime">Hora de observación no disponible</sys:String>
     <sys:String x:Key="Str_HA_Title">Integraciones de Home Assistant</sys:String>
-    <sys:String x:Key="Str_HA_Note">Las sugerencias no confirman compatibilidad. No se conecta ni configura nada. Los datos opcionales quedan en esta ventana; los enlaces no incluyen datos del dispositivo.</sys:String>
+    <sys:String x:Key="Str_HA_Note">Las sugerencias no confirman compatibilidad. No se conecta ni configura nada. Los datos manuales solo se conservan al guardarlos expresamente en el inventario de la ubicación; los enlaces de documentación no contienen datos del dispositivo.</sys:String>
     <sys:String x:Key="Str_HA_Unknown">Sin coincidencia concreta en este catálogo. Esto no significa que el dispositivo no sea compatible.</sys:String>
     <sys:String x:Key="Str_HA_Candidates">Integraciones posibles</sys:String>
     <sys:String x:Key="Str_HA_Workflow">Encontrar la mejor vía de integración</sys:String>
@@ -750,4 +750,31 @@ Su configuración no se eliminará.</sys:String>
     <sys:String x:Key="Str_HA_TuyaAccount">Dispositivo vinculado a tu cuenta Tuya Smart / Smart Life; verifica funciones</sys:String>
     <sys:String x:Key="Str_HA_GoeApi">Modelo/firmware go-e compatible y HTTP API v2 local o WebSocket habilitado</sys:String>
     <sys:String x:Key="Str_HA_EwelinkFirmware">Dispositivo compatible con firmware eWeLink original; verifica modo LAN/nube</sys:String>
+
+    <!-- Persistent, explicitly saved initial-survey inventory. -->
+    <sys:String x:Key="Str_Survey_Title">Inventario de la ubicación</sys:String>
+    <sys:String x:Key="Str_Survey_Scan">Análisis actual</sys:String>
+    <sys:String x:Key="Str_Survey_Add">Añadir selección al inventario</sys:String>
+    <sys:String x:Key="Str_Survey_Manual">Añadir dispositivo manualmente</sys:String>
+    <sys:String x:Key="Str_Survey_Edit">Editar dispositivo</sys:String>
+    <sys:String x:Key="Str_Survey_Remove">Quitar del inventario</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmRemove">¿Quitar esta entrada? Se conservará el historial de análisis.</sys:String>
+    <sys:String x:Key="Str_Survey_Name">Nombre (obligatorio)</sys:String>
+    <sys:String x:Key="Str_Survey_Room">Habitación</sys:String>
+    <sys:String x:Key="Str_Survey_Firmware">Firmware</sys:String>
+    <sys:String x:Key="Str_Survey_Connection">Conexión / protocolo</sys:String>
+    <sys:String x:Key="Str_Survey_Functions">Funciones deseadas en Home Assistant</sys:String>
+    <sys:String x:Key="Str_Survey_Notes">Notas</sys:String>
+    <sys:String x:Key="Str_Survey_Save">Guardar</sys:String>
+    <sys:String x:Key="Str_Survey_Cancel">Cancelar</sys:String>
+    <sys:String x:Key="Str_Survey_Required">Introduce un nombre de dispositivo.</sys:String>
+    <sys:String x:Key="Str_Survey_Notice">Los datos manuales son información del usuario, no compatibilidad verificada. Hay que verificar las recomendaciones. Abrir el inventario no contacta con dispositivos ni Home Assistant.</sys:String>
+    <sys:String x:Key="Str_Survey_Observation">Observación guardada (no es un estado en directo)</sys:String>
+    <sys:String x:Key="Str_Survey_NoObservation">No hay observación de red guardada</sys:String>
+    <sys:String x:Key="Str_Survey_Error">No se pudo leer o guardar el inventario. Se conservan los datos existentes. Revisa la carpeta de datos y su copia de seguridad.</sys:String>
+    <sys:String x:Key="Str_Survey_Link">Vincular observación</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmLink">¿Vincular esta entrada a un dispositivo encontrado? Solo cambia su vínculo de red. Comprueba primero la identidad del dispositivo.</sys:String>
+    <sys:String x:Key="Str_Survey_New">Crear entrada independiente</sys:String>
+    <sys:String x:Key="Str_Survey_IpWarning">La IP coincide con una entrada, pero la identidad no está confirmada. Elige la entrada, crea una independiente o cancela.</sys:String>
+    <sys:String x:Key="Str_Survey_Hints">Usar estas indicaciones</sys:String>
 </ResourceDictionary>
diff --git a/Strings/fr-FR.xaml b/Strings/fr-FR.xaml
index ad84b82..8c011aa 100644
--- a/Strings/fr-FR.xaml
+++ b/Strings/fr-FR.xaml
@@ -690,7 +690,7 @@ Vos paramètres ne seront pas supprimés.</sys:String>
     <sys:String x:Key="Str_Access_Note">Ouvrir établit une nouvelle connexion. HTTP 200 ne prouve pas un accès sans connexion. Les certificats HTTPS n’ont pas été validés. Les preuves d’authentification concernent uniquement l’adresse demandée.</sys:String>
     <sys:String x:Key="Str_Access_NoTime">Heure d’observation indisponible</sys:String>
     <sys:String x:Key="Str_HA_Title">Intégrations Home Assistant</sys:String>
-    <sys:String x:Key="Str_HA_Note">Les suggestions ne prouvent pas la compatibilité. Aucune connexion ni configuration. Les saisies facultatives restent dans cette fenêtre ; les liens de documentation ne contiennent aucune donnée de l’appareil.</sys:String>
+    <sys:String x:Key="Str_HA_Note">Les suggestions ne confirment pas la compatibilité. Aucune connexion ni configuration n’est effectuée. Les saisies manuelles ne sont conservées qu’après un enregistrement explicite dans l’inventaire du site ; les liens ne contiennent aucune donnée d’appareil.</sys:String>
     <sys:String x:Key="Str_HA_Unknown">Aucune correspondance précise dans ce catalogue. Cela ne signifie pas que l’appareil n’est pas pris en charge.</sys:String>
     <sys:String x:Key="Str_HA_Candidates">Intégrations possibles</sys:String>
     <sys:String x:Key="Str_HA_Workflow">Trouver la meilleure voie d’intégration</sys:String>
@@ -750,4 +750,31 @@ Vos paramètres ne seront pas supprimés.</sys:String>
     <sys:String x:Key="Str_HA_TuyaAccount">Appareil lié à votre compte Tuya Smart / Smart Life ; vérifier les fonctions</sys:String>
     <sys:String x:Key="Str_HA_GoeApi">Modèle/firmware go-e compatible et HTTP API v2 locale ou WebSocket activé</sys:String>
     <sys:String x:Key="Str_HA_EwelinkFirmware">Appareil compatible avec firmware eWeLink d’origine ; vérifier le mode LAN/cloud</sys:String>
+
+    <!-- Persistent, explicitly saved initial-survey inventory. -->
+    <sys:String x:Key="Str_Survey_Title">Inventaire du site</sys:String>
+    <sys:String x:Key="Str_Survey_Scan">Analyse actuelle</sys:String>
+    <sys:String x:Key="Str_Survey_Add">Ajouter la sélection à l’inventaire</sys:String>
+    <sys:String x:Key="Str_Survey_Manual">Ajouter un appareil manuellement</sys:String>
+    <sys:String x:Key="Str_Survey_Edit">Modifier l’appareil</sys:String>
+    <sys:String x:Key="Str_Survey_Remove">Retirer de l’inventaire</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmRemove">Retirer cette entrée ? L’historique des analyses sera conservé.</sys:String>
+    <sys:String x:Key="Str_Survey_Name">Nom (obligatoire)</sys:String>
+    <sys:String x:Key="Str_Survey_Room">Pièce</sys:String>
+    <sys:String x:Key="Str_Survey_Firmware">Micrologiciel</sys:String>
+    <sys:String x:Key="Str_Survey_Connection">Connexion / protocole</sys:String>
+    <sys:String x:Key="Str_Survey_Functions">Fonctions Home Assistant souhaitées</sys:String>
+    <sys:String x:Key="Str_Survey_Notes">Notes</sys:String>
+    <sys:String x:Key="Str_Survey_Save">Enregistrer</sys:String>
+    <sys:String x:Key="Str_Survey_Cancel">Annuler</sys:String>
+    <sys:String x:Key="Str_Survey_Required">Saisissez un nom d’appareil.</sys:String>
+    <sys:String x:Key="Str_Survey_Notice">Les saisies manuelles sont des informations utilisateur, pas une compatibilité vérifiée. Les recommandations doivent être vérifiées. L’ouverture ne contacte ni les appareils ni Home Assistant.</sys:String>
+    <sys:String x:Key="Str_Survey_Observation">Observation enregistrée (pas un état en direct)</sys:String>
+    <sys:String x:Key="Str_Survey_NoObservation">Aucune observation réseau enregistrée</sys:String>
+    <sys:String x:Key="Str_Survey_Error">Impossible de lire ou d’enregistrer l’inventaire. Les données existantes sont conservées. Vérifiez le dossier de données et sa sauvegarde.</sys:String>
+    <sys:String x:Key="Str_Survey_Link">Associer l’observation</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmLink">Associer cette entrée à un appareil trouvé ? Seule l’association réseau change. Vérifiez d’abord l’identité de l’appareil.</sys:String>
+    <sys:String x:Key="Str_Survey_New">Créer une entrée distincte</sys:String>
+    <sys:String x:Key="Str_Survey_IpWarning">L’IP correspond à une entrée, mais l’identité n’est pas confirmée. Choisissez l’entrée à associer, créez une entrée distincte ou annulez.</sys:String>
+    <sys:String x:Key="Str_Survey_Hints">Utiliser ces indications</sys:String>
 </ResourceDictionary>
diff --git a/Strings/hu-HU.xaml b/Strings/hu-HU.xaml
index 410ce99..b41dbcf 100644
--- a/Strings/hu-HU.xaml
+++ b/Strings/hu-HU.xaml
@@ -706,7 +706,7 @@ A beállítások nem törlődnek.</sys:String>
     <sys:String x:Key="Str_Access_Note">A megnyitás új kapcsolatot hoz létre. A HTTP 200 nem bizonyít bejelentkezés nélküli hozzáférést. A HTTPS-tanúsítványok nem lettek hitelesítve. A belépési bizonyíték csak a kért címre érvényes.</sys:String>
     <sys:String x:Key="Str_Access_NoTime">A megfigyelés ideje nem érhető el</sys:String>
     <sys:String x:Key="Str_HA_Title">Home Assistant-integrációk</sys:String>
-    <sys:String x:Key="Str_HA_Note">A javaslatok nem igazolják a kompatibilitást. Nem történik kapcsolódás vagy beállítás. Az opcionális adatok az ablakban maradnak; a hivatkozások nem tartalmaznak eszközadatot.</sys:String>
+    <sys:String x:Key="Str_HA_Note">A javaslatok nem igazolják a kompatibilitást. Nem történik kapcsolódás vagy beállítás. A kézi adatok csak a helyszínleltárba történő kifejezett mentés után maradnak meg; a dokumentáció hivatkozásai nem tartalmaznak eszközadatot.</sys:String>
     <sys:String x:Key="Str_HA_Unknown">Nincs konkrét találat ebben a katalógusban. Ez nem jelenti azt, hogy az eszköz nem támogatott.</sys:String>
     <sys:String x:Key="Str_HA_Candidates">Lehetséges integrációk</sys:String>
     <sys:String x:Key="Str_HA_Workflow">A legjobb integrációs út kiválasztása</sys:String>
@@ -766,4 +766,31 @@ A beállítások nem törlődnek.</sys:String>
     <sys:String x:Key="Str_HA_TuyaAccount">Az eszköz legyen a Tuya Smart / Smart Life fiókodban; ellenőrizd a funkciókat</sys:String>
     <sys:String x:Key="Str_HA_GoeApi">Kompatibilis go-e modell/firmware és engedélyezett helyi HTTP API v2 vagy WebSocket</sys:String>
     <sys:String x:Key="Str_HA_EwelinkFirmware">Támogatott eszköz eredeti eWeLink firmware-rel; ellenőrizd a LAN/felhő módot</sys:String>
+
+    <!-- Persistent, explicitly saved initial-survey inventory. -->
+    <sys:String x:Key="Str_Survey_Title">Helyszínleltár</sys:String>
+    <sys:String x:Key="Str_Survey_Scan">Aktuális vizsgálat</sys:String>
+    <sys:String x:Key="Str_Survey_Add">Kijelöltek hozzáadása a leltárhoz</sys:String>
+    <sys:String x:Key="Str_Survey_Manual">Eszköz kézi hozzáadása</sys:String>
+    <sys:String x:Key="Str_Survey_Edit">Eszköz szerkesztése</sys:String>
+    <sys:String x:Key="Str_Survey_Remove">Eltávolítás a leltárból</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmRemove">Eltávolítja ezt a bejegyzést? A vizsgálati előzmények megmaradnak.</sys:String>
+    <sys:String x:Key="Str_Survey_Name">Név (kötelező)</sys:String>
+    <sys:String x:Key="Str_Survey_Room">Helyiség</sys:String>
+    <sys:String x:Key="Str_Survey_Firmware">Firmware</sys:String>
+    <sys:String x:Key="Str_Survey_Connection">Kapcsolat / protokoll</sys:String>
+    <sys:String x:Key="Str_Survey_Functions">Kívánt Home Assistant-funkciók</sys:String>
+    <sys:String x:Key="Str_Survey_Notes">Megjegyzések</sys:String>
+    <sys:String x:Key="Str_Survey_Save">Mentés</sys:String>
+    <sys:String x:Key="Str_Survey_Cancel">Mégse</sys:String>
+    <sys:String x:Key="Str_Survey_Required">Adjon meg egy eszköznevet.</sys:String>
+    <sys:String x:Key="Str_Survey_Notice">A kézi adatok felhasználói információk, nem igazolt kompatibilitás. Az ajánlásokat ellenőrizni kell. A leltár megnyitása nem kapcsolódik eszközökhöz vagy a Home Assistanthoz.</sys:String>
+    <sys:String x:Key="Str_Survey_Observation">Mentett észlelés (nem élő állapot)</sys:String>
+    <sys:String x:Key="Str_Survey_NoObservation">Nincs mentett hálózati észlelés</sys:String>
+    <sys:String x:Key="Str_Survey_Error">A leltár nem olvasható vagy menthető. A meglévő adatok megmaradtak. Ellenőrizze az adatmappát és a biztonsági mentést.</sys:String>
+    <sys:String x:Key="Str_Survey_Link">Észlelés összekapcsolása</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmLink">Összekapcsolja a bejegyzést egy megtalált eszközzel? Csak a hálózati kapcsolat módosul. Előbb ellenőrizze az eszköz azonosságát.</sys:String>
+    <sys:String x:Key="Str_Survey_New">Külön bejegyzés létrehozása</sys:String>
+    <sys:String x:Key="Str_Survey_IpWarning">Az IP egyezik egy bejegyzéssel, de az azonosság nem igazolt. Válasszon bejegyzést, hozzon létre külön bejegyzést vagy szakítsa meg.</sys:String>
+    <sys:String x:Key="Str_Survey_Hints">Ezeknek az adatoknak a használata</sys:String>
 </ResourceDictionary>
diff --git a/Strings/it-IT.xaml b/Strings/it-IT.xaml
index 7e493dc..6f7976c 100644
--- a/Strings/it-IT.xaml
+++ b/Strings/it-IT.xaml
@@ -706,7 +706,7 @@ Le tue impostazioni non verranno rimosse.</sys:String>
     <sys:String x:Key="Str_Access_Note">Aprire crea una nuova connessione. HTTP 200 non dimostra accesso senza autenticazione. I certificati HTTPS non sono stati convalidati. La prova di autenticazione vale solo per l’indirizzo richiesto.</sys:String>
     <sys:String x:Key="Str_Access_NoTime">Ora dell’osservazione non disponibile</sys:String>
     <sys:String x:Key="Str_HA_Title">Integrazioni Home Assistant</sys:String>
-    <sys:String x:Key="Str_HA_Note">I suggerimenti non confermano la compatibilità. Non vengono eseguite connessioni o configurazioni. I dati facoltativi restano nella finestra; i link non includono dati del dispositivo.</sys:String>
+    <sys:String x:Key="Str_HA_Note">I suggerimenti non confermano la compatibilità. Non viene eseguita alcuna connessione o configurazione. I dati manuali persistono solo dopo il salvataggio esplicito nell’inventario della sede; i collegamenti non contengono dati del dispositivo.</sys:String>
     <sys:String x:Key="Str_HA_Unknown">Nessuna corrispondenza specifica nel catalogo. Non significa che il dispositivo non sia supportato.</sys:String>
     <sys:String x:Key="Str_HA_Candidates">Integrazioni possibili</sys:String>
     <sys:String x:Key="Str_HA_Workflow">Trovare il percorso di integrazione migliore</sys:String>
@@ -766,4 +766,31 @@ Le tue impostazioni non verranno rimosse.</sys:String>
     <sys:String x:Key="Str_HA_TuyaAccount">Dispositivo associato al tuo account Tuya Smart / Smart Life; verifica le funzioni</sys:String>
     <sys:String x:Key="Str_HA_GoeApi">Modello/firmware go-e compatibile e HTTP API v2 locale o WebSocket abilitato</sys:String>
     <sys:String x:Key="Str_HA_EwelinkFirmware">Dispositivo supportato con firmware eWeLink originale; verifica modalità LAN/cloud</sys:String>
+
+    <!-- Persistent, explicitly saved initial-survey inventory. -->
+    <sys:String x:Key="Str_Survey_Title">Inventario della sede</sys:String>
+    <sys:String x:Key="Str_Survey_Scan">Scansione attuale</sys:String>
+    <sys:String x:Key="Str_Survey_Add">Aggiungi selezionati all’inventario</sys:String>
+    <sys:String x:Key="Str_Survey_Manual">Aggiungi dispositivo manualmente</sys:String>
+    <sys:String x:Key="Str_Survey_Edit">Modifica dispositivo</sys:String>
+    <sys:String x:Key="Str_Survey_Remove">Rimuovi dall’inventario</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmRemove">Rimuovere questa voce? La cronologia delle scansioni sarà conservata.</sys:String>
+    <sys:String x:Key="Str_Survey_Name">Nome (obbligatorio)</sys:String>
+    <sys:String x:Key="Str_Survey_Room">Stanza</sys:String>
+    <sys:String x:Key="Str_Survey_Firmware">Firmware</sys:String>
+    <sys:String x:Key="Str_Survey_Connection">Connessione / protocollo</sys:String>
+    <sys:String x:Key="Str_Survey_Functions">Funzioni desiderate in Home Assistant</sys:String>
+    <sys:String x:Key="Str_Survey_Notes">Note</sys:String>
+    <sys:String x:Key="Str_Survey_Save">Salva</sys:String>
+    <sys:String x:Key="Str_Survey_Cancel">Annulla</sys:String>
+    <sys:String x:Key="Str_Survey_Required">Inserisci un nome per il dispositivo.</sys:String>
+    <sys:String x:Key="Str_Survey_Notice">I dati manuali sono informazioni dell’utente, non compatibilità verificata. Le raccomandazioni vanno verificate. L’apertura non contatta dispositivi né Home Assistant.</sys:String>
+    <sys:String x:Key="Str_Survey_Observation">Osservazione salvata (non è uno stato in tempo reale)</sys:String>
+    <sys:String x:Key="Str_Survey_NoObservation">Nessuna osservazione di rete salvata</sys:String>
+    <sys:String x:Key="Str_Survey_Error">Impossibile leggere o salvare l’inventario. I dati esistenti sono conservati. Controlla la cartella dati e il backup.</sys:String>
+    <sys:String x:Key="Str_Survey_Link">Collega osservazione</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmLink">Collegare questa voce a un dispositivo trovato? Cambia solo il collegamento di rete. Verifica prima l’identità del dispositivo.</sys:String>
+    <sys:String x:Key="Str_Survey_New">Crea voce separata</sys:String>
+    <sys:String x:Key="Str_Survey_IpWarning">L’IP corrisponde a una voce, ma l’identità non è confermata. Scegli la voce da collegare, creane una separata o annulla.</sys:String>
+    <sys:String x:Key="Str_Survey_Hints">Usa questi indizi</sys:String>
 </ResourceDictionary>
diff --git a/Strings/ja-JP.xaml b/Strings/ja-JP.xaml
index 6f09aae..71c6b8c 100644
--- a/Strings/ja-JP.xaml
+++ b/Strings/ja-JP.xaml
@@ -701,7 +701,7 @@
     <sys:String x:Key="Str_Access_Note">開く操作は新しい接続を開始します。HTTP 200はログイン不要の証拠ではありません。HTTPS証明書の有効性は未検証です。認証の証拠は要求したアドレスにのみ適用されます。</sys:String>
     <sys:String x:Key="Str_Access_NoTime">観測時刻不明</sys:String>
     <sys:String x:Key="Str_HA_Title">Home Assistant の連携</sys:String>
-    <sys:String x:Key="Str_HA_Note">候補は互換性の確認ではありません。接続や設定は行いません。任意入力はこのウィンドウ内にとどまり、資料へのリンクに機器情報は含まれません。</sys:String>
+    <sys:String x:Key="Str_HA_Note">推奨内容は互換性の確認結果ではありません。接続や設定は行いません。手動入力は拠点の台帳に明示的に保存した場合のみ保持されます。説明書へのリンクに機器の情報は含まれません。</sys:String>
     <sys:String x:Key="Str_HA_Unknown">このカタログに具体的な一致はありません。機器が非対応という意味ではありません。</sys:String>
     <sys:String x:Key="Str_HA_Candidates">連携の候補</sys:String>
     <sys:String x:Key="Str_HA_Workflow">最適な連携方法を探す</sys:String>
@@ -761,4 +761,31 @@
     <sys:String x:Key="Str_HA_TuyaAccount">Tuya Smart / Smart Lifeアカウントに登録された機器が必要。機能を確認</sys:String>
     <sys:String x:Key="Str_HA_GoeApi">対応するgo-e型番とファームウェア、ローカルHTTP API v2またはWebSocketの有効化</sys:String>
     <sys:String x:Key="Str_HA_EwelinkFirmware">純正eWeLinkファームウェアの対応機器。LAN/クラウド方式を確認</sys:String>
+
+    <!-- Persistent, explicitly saved initial-survey inventory. -->
+    <sys:String x:Key="Str_Survey_Title">拠点の機器台帳</sys:String>
+    <sys:String x:Key="Str_Survey_Scan">現在のスキャン</sys:String>
+    <sys:String x:Key="Str_Survey_Add">選択した機器を台帳に追加</sys:String>
+    <sys:String x:Key="Str_Survey_Manual">機器を手動で追加</sys:String>
+    <sys:String x:Key="Str_Survey_Edit">機器を編集</sys:String>
+    <sys:String x:Key="Str_Survey_Remove">台帳から削除</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmRemove">この項目を削除しますか？スキャン履歴は保持されます。</sys:String>
+    <sys:String x:Key="Str_Survey_Name">名前（必須）</sys:String>
+    <sys:String x:Key="Str_Survey_Room">部屋</sys:String>
+    <sys:String x:Key="Str_Survey_Firmware">ファームウェア</sys:String>
+    <sys:String x:Key="Str_Survey_Connection">接続 / プロトコル</sys:String>
+    <sys:String x:Key="Str_Survey_Functions">Home Assistantで利用したい機能</sys:String>
+    <sys:String x:Key="Str_Survey_Notes">メモ</sys:String>
+    <sys:String x:Key="Str_Survey_Save">保存</sys:String>
+    <sys:String x:Key="Str_Survey_Cancel">キャンセル</sys:String>
+    <sys:String x:Key="Str_Survey_Required">機器名を入力してください。</sys:String>
+    <sys:String x:Key="Str_Survey_Notice">手動入力は利用者の情報であり、互換性の確認結果ではありません。推奨内容は確認が必要です。台帳を開いても機器やHome Assistantには接続しません。</sys:String>
+    <sys:String x:Key="Str_Survey_Observation">保存済みの観測（現在の状態ではありません）</sys:String>
+    <sys:String x:Key="Str_Survey_NoObservation">保存済みのネットワーク観測なし</sys:String>
+    <sys:String x:Key="Str_Survey_Error">台帳を読み込みまたは保存できませんでした。既存のデータは保持されています。データフォルダーとバックアップを確認してください。</sys:String>
+    <sys:String x:Key="Str_Survey_Link">観測を関連付ける</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmLink">この項目を検出された機器に関連付けますか？ネットワークの関連付けのみ変更します。先に機器の同一性を確認してください。</sys:String>
+    <sys:String x:Key="Str_Survey_New">別の項目を作成</sys:String>
+    <sys:String x:Key="Str_Survey_IpWarning">IPが台帳の項目と一致しますが、同じ機器かは未確認です。関連付ける項目を選ぶか、別の項目を作成するか、キャンセルしてください。</sys:String>
+    <sys:String x:Key="Str_Survey_Hints">この手掛かりを使用</sys:String>
 </ResourceDictionary>
diff --git a/Strings/kk-KZ.xaml b/Strings/kk-KZ.xaml
index 255b664..dd25805 100644
--- a/Strings/kk-KZ.xaml
+++ b/Strings/kk-KZ.xaml
@@ -732,7 +732,7 @@
     <sys:String x:Key="Str_Access_Note">Ашу жаңа қосылым орнатады. HTTP 200 кірусіз қол жеткізуді дәлелдемейді. HTTPS сертификаттары тексерілмеген. Аутентификация дәлелі тек сұралған мекенжайға қатысты.</sys:String>
     <sys:String x:Key="Str_Access_NoTime">Бақылау уақыты қолжетімсіз</sys:String>
     <sys:String x:Key="Str_HA_Title">Home Assistant интеграциялары</sys:String>
-    <sys:String x:Key="Str_HA_Note">Ұсыныстар үйлесімділікті растамайды. Қосылу не баптау орындалмайды. Қосымша деректер осы терезеде қалады; сілтемелерде құрылғы деректері жоқ.</sys:String>
+    <sys:String x:Key="Str_HA_Note">Ұсыныстар үйлесімділікті растамайды. Қосылым не баптау орындалмайды. Қолмен енгізілген деректер орналасу тізіміне анық сақталғаннан кейін ғана қалады; құжаттама сілтемелерінде құрылғы деректері жоқ.</sys:String>
     <sys:String x:Key="Str_HA_Unknown">Бұл каталогта нақты сәйкестік жоқ. Бұл құрылғы қолдау таппайды деген сөз емес.</sys:String>
     <sys:String x:Key="Str_HA_Candidates">Ықтимал интеграциялар</sys:String>
     <sys:String x:Key="Str_HA_Workflow">Ең қолайлы интеграция жолын табу</sys:String>
@@ -792,4 +792,31 @@
     <sys:String x:Key="Str_HA_TuyaAccount">Құрылғы Tuya Smart / Smart Life тіркелгіңізге байланысуы керек; функцияларды тексеріңіз</sys:String>
     <sys:String x:Key="Str_HA_GoeApi">Үйлесімді go-e моделі/микробағдарламасы және қосылған жергілікті HTTP API v2 не WebSocket</sys:String>
     <sys:String x:Key="Str_HA_EwelinkFirmware">Бастапқы eWeLink микробағдарламасы бар қолдау көрсетілетін құрылғы; LAN/бұлт режимін тексеріңіз</sys:String>
+
+    <!-- Persistent, explicitly saved initial-survey inventory. -->
+    <sys:String x:Key="Str_Survey_Title">Орналасу тізімі</sys:String>
+    <sys:String x:Key="Str_Survey_Scan">Ағымдағы сканерлеу</sys:String>
+    <sys:String x:Key="Str_Survey_Add">Таңдалғандарды тізімге қосу</sys:String>
+    <sys:String x:Key="Str_Survey_Manual">Құрылғыны қолмен қосу</sys:String>
+    <sys:String x:Key="Str_Survey_Edit">Құрылғыны өңдеу</sys:String>
+    <sys:String x:Key="Str_Survey_Remove">Тізімнен жою</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmRemove">Осы жазбаны жою керек пе? Сканерлеу тарихы сақталады.</sys:String>
+    <sys:String x:Key="Str_Survey_Name">Атауы (міндетті)</sys:String>
+    <sys:String x:Key="Str_Survey_Room">Бөлме</sys:String>
+    <sys:String x:Key="Str_Survey_Firmware">Микробағдарлама</sys:String>
+    <sys:String x:Key="Str_Survey_Connection">Қосылым / протокол</sys:String>
+    <sys:String x:Key="Str_Survey_Functions">Қажетті Home Assistant функциялары</sys:String>
+    <sys:String x:Key="Str_Survey_Notes">Ескертпелер</sys:String>
+    <sys:String x:Key="Str_Survey_Save">Сақтау</sys:String>
+    <sys:String x:Key="Str_Survey_Cancel">Болдырмау</sys:String>
+    <sys:String x:Key="Str_Survey_Required">Құрылғы атауын енгізіңіз.</sys:String>
+    <sys:String x:Key="Str_Survey_Notice">Қолмен енгізілген деректер — пайдаланушы ақпараты, расталған үйлесімділік емес. Ұсыныстарды тексеру қажет. Тізімді ашу құрылғыларға не Home Assistant жүйесіне қосылмайды.</sys:String>
+    <sys:String x:Key="Str_Survey_Observation">Сақталған бақылау (ағымдағы күй емес)</sys:String>
+    <sys:String x:Key="Str_Survey_NoObservation">Сақталған желілік бақылау жоқ</sys:String>
+    <sys:String x:Key="Str_Survey_Error">Тізімді оқу немесе сақтау мүмкін болмады. Бар деректер сақталды. Деректер қалтасы мен сақтық көшірмесін тексеріңіз.</sys:String>
+    <sys:String x:Key="Str_Survey_Link">Бақылауды байланыстыру</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmLink">Жазбаны табылған құрылғымен байланыстыру керек пе? Тек желілік байланысы өзгереді. Алдымен құрылғының сәйкестігін тексеріңіз.</sys:String>
+    <sys:String x:Key="Str_Survey_New">Бөлек жазба жасау</sys:String>
+    <sys:String x:Key="Str_Survey_IpWarning">IP жазбаға сәйкес келеді, бірақ сәйкестік расталмаған. Жазбаны таңдаңыз, бөлек жазба жасаңыз немесе болдырмаңыз.</sys:String>
+    <sys:String x:Key="Str_Survey_Hints">Осы мәліметтерді қолдану</sys:String>
 </ResourceDictionary>
diff --git a/Strings/nb-NO.xaml b/Strings/nb-NO.xaml
index fec585a..c92db8c 100644
--- a/Strings/nb-NO.xaml
+++ b/Strings/nb-NO.xaml
@@ -732,7 +732,7 @@ Innstillingene dine fjernes ikke.</sys:String>
     <sys:String x:Key="Str_Access_Note">Åpne oppretter en ny tilkobling. HTTP 200 beviser ikke tilgang uten innlogging. HTTPS-sertifikater ble ikke validert. Innloggingsbevis gjelder bare den forespurte adressen.</sys:String>
     <sys:String x:Key="Str_Access_NoTime">Observasjonstid utilgjengelig</sys:String>
     <sys:String x:Key="Str_HA_Title">Home Assistant-integrasjoner</sys:String>
-    <sys:String x:Key="Str_HA_Note">Forslag bekrefter ikke kompatibilitet. Ingen tilkobling eller oppsett utføres. Valgfrie opplysninger blir i dette vinduet; lenker inneholder ikke enhetsdata.</sys:String>
+    <sys:String x:Key="Str_HA_Note">Forslag bekrefter ikke kompatibilitet. Ingen tilkobling eller oppsett utføres. Manuelle opplysninger beholdes bare når de lagres uttrykkelig i stedsinventaret; dokumentasjonslenker inneholder ingen enhetsdata.</sys:String>
     <sys:String x:Key="Str_HA_Unknown">Ingen konkret treff i denne katalogen. Det betyr ikke at enheten mangler støtte.</sys:String>
     <sys:String x:Key="Str_HA_Candidates">Mulige integrasjoner</sys:String>
     <sys:String x:Key="Str_HA_Workflow">Finn den beste integrasjonsveien</sys:String>
@@ -792,4 +792,31 @@ Innstillingene dine fjernes ikke.</sys:String>
     <sys:String x:Key="Str_HA_TuyaAccount">Enheten må være koblet til Tuya Smart / Smart Life-kontoen din; sjekk funksjonene</sys:String>
     <sys:String x:Key="Str_HA_GoeApi">Kompatibel go-e-modell/fastvare og aktivert lokal HTTP API v2 eller WebSocket</sys:String>
     <sys:String x:Key="Str_HA_EwelinkFirmware">Støttet enhet med original eWeLink-fastvare; sjekk LAN-/skymodus</sys:String>
+
+    <!-- Persistent, explicitly saved initial-survey inventory. -->
+    <sys:String x:Key="Str_Survey_Title">Stedsinventar</sys:String>
+    <sys:String x:Key="Str_Survey_Scan">Gjeldende skanning</sys:String>
+    <sys:String x:Key="Str_Survey_Add">Legg valgte til inventaret</sys:String>
+    <sys:String x:Key="Str_Survey_Manual">Legg til enhet manuelt</sys:String>
+    <sys:String x:Key="Str_Survey_Edit">Rediger enhet</sys:String>
+    <sys:String x:Key="Str_Survey_Remove">Fjern fra inventaret</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmRemove">Fjerne denne oppføringen? Skannehistorikken beholdes.</sys:String>
+    <sys:String x:Key="Str_Survey_Name">Navn (påkrevd)</sys:String>
+    <sys:String x:Key="Str_Survey_Room">Rom</sys:String>
+    <sys:String x:Key="Str_Survey_Firmware">Fastvare</sys:String>
+    <sys:String x:Key="Str_Survey_Connection">Tilkobling / protokoll</sys:String>
+    <sys:String x:Key="Str_Survey_Functions">Ønskede funksjoner i Home Assistant</sys:String>
+    <sys:String x:Key="Str_Survey_Notes">Merknader</sys:String>
+    <sys:String x:Key="Str_Survey_Save">Lagre</sys:String>
+    <sys:String x:Key="Str_Survey_Cancel">Avbryt</sys:String>
+    <sys:String x:Key="Str_Survey_Required">Skriv inn et enhetsnavn.</sys:String>
+    <sys:String x:Key="Str_Survey_Notice">Manuelle opplysninger er brukerdata, ikke bekreftet kompatibilitet. Anbefalinger må kontrolleres. Å åpne inventaret kontakter verken enheter eller Home Assistant.</sys:String>
+    <sys:String x:Key="Str_Survey_Observation">Lagret observasjon (ikke sanntidsstatus)</sys:String>
+    <sys:String x:Key="Str_Survey_NoObservation">Ingen lagret nettverksobservasjon</sys:String>
+    <sys:String x:Key="Str_Survey_Error">Inventaret kunne ikke leses eller lagres. Eksisterende data er bevart. Kontroller datamappen og sikkerhetskopien.</sys:String>
+    <sys:String x:Key="Str_Survey_Link">Koble observasjon</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmLink">Koble denne oppføringen til en funnet enhet? Bare nettverkskoblingen endres. Kontroller enhetens identitet først.</sys:String>
+    <sys:String x:Key="Str_Survey_New">Opprett separat oppføring</sys:String>
+    <sys:String x:Key="Str_Survey_IpWarning">IP-adressen samsvarer med en oppføring, men identiteten er ubekreftet. Velg oppføring, opprett en separat eller avbryt.</sys:String>
+    <sys:String x:Key="Str_Survey_Hints">Bruk disse opplysningene</sys:String>
 </ResourceDictionary>
diff --git a/Strings/pl-PL.xaml b/Strings/pl-PL.xaml
index 07a8332..34a665d 100644
--- a/Strings/pl-PL.xaml
+++ b/Strings/pl-PL.xaml
@@ -675,7 +675,7 @@ Twoje ustawienia nie zostaną usunięte.</sys:String>
     <sys:String x:Key="Str_Access_Note">Otwarcie tworzy nowe połączenie. HTTP 200 nie dowodzi dostępu bez logowania. Certyfikaty HTTPS nie zostały zweryfikowane. Dowód uwierzytelniania dotyczy tylko żądanego adresu.</sys:String>
     <sys:String x:Key="Str_Access_NoTime">Czas obserwacji niedostępny</sys:String>
     <sys:String x:Key="Str_HA_Title">Integracje Home Assistant</sys:String>
-    <sys:String x:Key="Str_HA_Note">Sugestie nie potwierdzają zgodności. Nie następuje połączenie ani konfiguracja. Opcjonalne dane pozostają w tym oknie; odnośniki nie zawierają danych urządzenia.</sys:String>
+    <sys:String x:Key="Str_HA_Note">Sugestie nie potwierdzają zgodności. Nie następuje połączenie ani konfiguracja. Dane ręczne są zachowywane dopiero po jawnym zapisaniu w inwentarzu lokalizacji; linki do dokumentacji nie zawierają danych urządzenia.</sys:String>
     <sys:String x:Key="Str_HA_Unknown">Brak konkretnego dopasowania w katalogu. Nie oznacza to braku obsługi urządzenia.</sys:String>
     <sys:String x:Key="Str_HA_Candidates">Możliwe integracje</sys:String>
     <sys:String x:Key="Str_HA_Workflow">Znajdź najlepszą drogę integracji</sys:String>
@@ -735,4 +735,31 @@ Twoje ustawienia nie zostaną usunięte.</sys:String>
     <sys:String x:Key="Str_HA_TuyaAccount">Urządzenie powiązane z kontem Tuya Smart / Smart Life; sprawdź funkcje</sys:String>
     <sys:String x:Key="Str_HA_GoeApi">Zgodny model/firmware go-e i włączone lokalne HTTP API v2 lub WebSocket</sys:String>
     <sys:String x:Key="Str_HA_EwelinkFirmware">Obsługiwane urządzenie z oryginalnym firmware eWeLink; sprawdź tryb LAN/chmura</sys:String>
+
+    <!-- Persistent, explicitly saved initial-survey inventory. -->
+    <sys:String x:Key="Str_Survey_Title">Inwentarz lokalizacji</sys:String>
+    <sys:String x:Key="Str_Survey_Scan">Bieżące skanowanie</sys:String>
+    <sys:String x:Key="Str_Survey_Add">Dodaj zaznaczone do inwentarza</sys:String>
+    <sys:String x:Key="Str_Survey_Manual">Dodaj urządzenie ręcznie</sys:String>
+    <sys:String x:Key="Str_Survey_Edit">Edytuj urządzenie</sys:String>
+    <sys:String x:Key="Str_Survey_Remove">Usuń z inwentarza</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmRemove">Usunąć ten wpis? Historia skanowania zostanie zachowana.</sys:String>
+    <sys:String x:Key="Str_Survey_Name">Nazwa (wymagana)</sys:String>
+    <sys:String x:Key="Str_Survey_Room">Pomieszczenie</sys:String>
+    <sys:String x:Key="Str_Survey_Firmware">Oprogramowanie układowe</sys:String>
+    <sys:String x:Key="Str_Survey_Connection">Połączenie / protokół</sys:String>
+    <sys:String x:Key="Str_Survey_Functions">Oczekiwane funkcje Home Assistant</sys:String>
+    <sys:String x:Key="Str_Survey_Notes">Uwagi</sys:String>
+    <sys:String x:Key="Str_Survey_Save">Zapisz</sys:String>
+    <sys:String x:Key="Str_Survey_Cancel">Anuluj</sys:String>
+    <sys:String x:Key="Str_Survey_Required">Wpisz nazwę urządzenia.</sys:String>
+    <sys:String x:Key="Str_Survey_Notice">Dane ręczne to informacje użytkownika, a nie potwierdzona zgodność. Zalecenia wymagają sprawdzenia. Otwarcie inwentarza nie łączy się z urządzeniami ani Home Assistant.</sys:String>
+    <sys:String x:Key="Str_Survey_Observation">Zapisana obserwacja (nie stan na żywo)</sys:String>
+    <sys:String x:Key="Str_Survey_NoObservation">Brak zapisanej obserwacji sieciowej</sys:String>
+    <sys:String x:Key="Str_Survey_Error">Nie można odczytać lub zapisać inwentarza. Istniejące dane zachowano. Sprawdź folder danych i kopię zapasową.</sys:String>
+    <sys:String x:Key="Str_Survey_Link">Powiąż obserwację</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmLink">Powiązać ten wpis ze znalezionym urządzeniem? Zmieni się tylko powiązanie sieciowe. Najpierw sprawdź tożsamość urządzenia.</sys:String>
+    <sys:String x:Key="Str_Survey_New">Utwórz osobny wpis</sys:String>
+    <sys:String x:Key="Str_Survey_IpWarning">IP pasuje do wpisu, ale tożsamość nie jest potwierdzona. Wybierz wpis, utwórz osobny lub anuluj.</sys:String>
+    <sys:String x:Key="Str_Survey_Hints">Użyj tych wskazówek</sys:String>
 </ResourceDictionary>
diff --git a/Strings/pt-BR.xaml b/Strings/pt-BR.xaml
index 8b317c5..37a8df4 100644
--- a/Strings/pt-BR.xaml
+++ b/Strings/pt-BR.xaml
@@ -732,7 +732,7 @@ Suas configurações não serão removidas.</sys:String>
     <sys:String x:Key="Str_Access_Note">Abrir cria uma nova conexão. HTTP 200 não comprova acesso sem login. Os certificados HTTPS não foram validados. A evidência de autenticação vale apenas para o endereço solicitado.</sys:String>
     <sys:String x:Key="Str_Access_NoTime">Horário da observação indisponível</sys:String>
     <sys:String x:Key="Str_HA_Title">Integrações do Home Assistant</sys:String>
-    <sys:String x:Key="Str_HA_Note">Sugestões não confirmam compatibilidade. Nenhuma conexão ou configuração é feita. As entradas opcionais ficam nesta janela; os links não incluem dados do dispositivo.</sys:String>
+    <sys:String x:Key="Str_HA_Note">Sugestões não confirmam compatibilidade. Nenhuma conexão ou configuração é realizada. Os dados manuais só persistem após serem salvos explicitamente no inventário do local; os links de documentação não contêm dados do dispositivo.</sys:String>
     <sys:String x:Key="Str_HA_Unknown">Nenhuma correspondência específica neste catálogo. Isso não significa que o dispositivo não seja compatível.</sys:String>
     <sys:String x:Key="Str_HA_Candidates">Integrações possíveis</sys:String>
     <sys:String x:Key="Str_HA_Workflow">Encontrar o melhor caminho de integração</sys:String>
@@ -792,4 +792,31 @@ Suas configurações não serão removidas.</sys:String>
     <sys:String x:Key="Str_HA_TuyaAccount">Dispositivo vinculado à sua conta Tuya Smart / Smart Life; verifique as funções</sys:String>
     <sys:String x:Key="Str_HA_GoeApi">Modelo/firmware go-e compatível e HTTP API v2 local ou WebSocket ativado</sys:String>
     <sys:String x:Key="Str_HA_EwelinkFirmware">Dispositivo compatível com firmware eWeLink original; verifique modo LAN/nuvem</sys:String>
+
+    <!-- Persistent, explicitly saved initial-survey inventory. -->
+    <sys:String x:Key="Str_Survey_Title">Inventário do local</sys:String>
+    <sys:String x:Key="Str_Survey_Scan">Verificação atual</sys:String>
+    <sys:String x:Key="Str_Survey_Add">Adicionar selecionados ao inventário</sys:String>
+    <sys:String x:Key="Str_Survey_Manual">Adicionar dispositivo manualmente</sys:String>
+    <sys:String x:Key="Str_Survey_Edit">Editar dispositivo</sys:String>
+    <sys:String x:Key="Str_Survey_Remove">Remover do inventário</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmRemove">Remover esta entrada? O histórico de verificações será mantido.</sys:String>
+    <sys:String x:Key="Str_Survey_Name">Nome (obrigatório)</sys:String>
+    <sys:String x:Key="Str_Survey_Room">Cômodo</sys:String>
+    <sys:String x:Key="Str_Survey_Firmware">Firmware</sys:String>
+    <sys:String x:Key="Str_Survey_Connection">Conexão / protocolo</sys:String>
+    <sys:String x:Key="Str_Survey_Functions">Funções desejadas no Home Assistant</sys:String>
+    <sys:String x:Key="Str_Survey_Notes">Observações</sys:String>
+    <sys:String x:Key="Str_Survey_Save">Salvar</sys:String>
+    <sys:String x:Key="Str_Survey_Cancel">Cancelar</sys:String>
+    <sys:String x:Key="Str_Survey_Required">Informe um nome para o dispositivo.</sys:String>
+    <sys:String x:Key="Str_Survey_Notice">Os dados manuais são informações do usuário, não compatibilidade verificada. As recomendações precisam ser verificadas. Abrir o inventário não contata dispositivos nem o Home Assistant.</sys:String>
+    <sys:String x:Key="Str_Survey_Observation">Observação salva (não é estado ao vivo)</sys:String>
+    <sys:String x:Key="Str_Survey_NoObservation">Nenhuma observação de rede salva</sys:String>
+    <sys:String x:Key="Str_Survey_Error">Não foi possível ler ou salvar o inventário. Os dados existentes foram preservados. Verifique a pasta de dados e seu backup.</sys:String>
+    <sys:String x:Key="Str_Survey_Link">Vincular observação</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmLink">Vincular esta entrada a um dispositivo encontrado? Apenas o vínculo de rede será alterado. Confira primeiro a identidade do dispositivo.</sys:String>
+    <sys:String x:Key="Str_Survey_New">Criar entrada separada</sys:String>
+    <sys:String x:Key="Str_Survey_IpWarning">O IP corresponde a uma entrada, mas a identidade não foi confirmada. Escolha a entrada, crie uma separada ou cancele.</sys:String>
+    <sys:String x:Key="Str_Survey_Hints">Usar estas indicações</sys:String>
 </ResourceDictionary>
diff --git a/Strings/ru-RU.xaml b/Strings/ru-RU.xaml
index e057756..25cfac6 100644
--- a/Strings/ru-RU.xaml
+++ b/Strings/ru-RU.xaml
@@ -716,7 +716,7 @@
     <sys:String x:Key="Str_Access_Note">Открытие создаёт новое соединение. HTTP 200 не доказывает доступ без входа. Сертификаты HTTPS не проверены. Данные об аутентификации относятся только к запрошенному адресу.</sys:String>
     <sys:String x:Key="Str_Access_NoTime">Время наблюдения недоступно</sys:String>
     <sys:String x:Key="Str_HA_Title">Интеграции Home Assistant</sys:String>
-    <sys:String x:Key="Str_HA_Note">Предложения не подтверждают совместимость. Подключение и настройка не выполняются. Необязательные данные остаются в окне; ссылки не содержат данных устройства.</sys:String>
+    <sys:String x:Key="Str_HA_Note">Предложения не подтверждают совместимость. Подключение и настройка не выполняются. Ручные данные сохраняются только после явного сохранения в описи объекта; ссылки на документацию не содержат данных устройства.</sys:String>
     <sys:String x:Key="Str_HA_Unknown">В каталоге нет точного совпадения. Это не означает, что устройство не поддерживается.</sys:String>
     <sys:String x:Key="Str_HA_Candidates">Возможные интеграции</sys:String>
     <sys:String x:Key="Str_HA_Workflow">Найти лучший путь интеграции</sys:String>
@@ -776,4 +776,31 @@
     <sys:String x:Key="Str_HA_TuyaAccount">Устройство должно быть связано с вашим аккаунтом Tuya Smart / Smart Life; проверьте функции</sys:String>
     <sys:String x:Key="Str_HA_GoeApi">Совместимая модель/прошивка go-e и включённый локальный HTTP API v2 или WebSocket</sys:String>
     <sys:String x:Key="Str_HA_EwelinkFirmware">Поддерживаемое устройство с оригинальной прошивкой eWeLink; проверьте режим LAN/облако</sys:String>
+
+    <!-- Persistent, explicitly saved initial-survey inventory. -->
+    <sys:String x:Key="Str_Survey_Title">Опись объекта</sys:String>
+    <sys:String x:Key="Str_Survey_Scan">Текущее сканирование</sys:String>
+    <sys:String x:Key="Str_Survey_Add">Добавить выбранные в опись</sys:String>
+    <sys:String x:Key="Str_Survey_Manual">Добавить устройство вручную</sys:String>
+    <sys:String x:Key="Str_Survey_Edit">Изменить устройство</sys:String>
+    <sys:String x:Key="Str_Survey_Remove">Удалить из описи</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmRemove">Удалить эту запись? История сканирования сохранится.</sys:String>
+    <sys:String x:Key="Str_Survey_Name">Название (обязательно)</sys:String>
+    <sys:String x:Key="Str_Survey_Room">Помещение</sys:String>
+    <sys:String x:Key="Str_Survey_Firmware">Прошивка</sys:String>
+    <sys:String x:Key="Str_Survey_Connection">Подключение / протокол</sys:String>
+    <sys:String x:Key="Str_Survey_Functions">Желаемые функции Home Assistant</sys:String>
+    <sys:String x:Key="Str_Survey_Notes">Примечания</sys:String>
+    <sys:String x:Key="Str_Survey_Save">Сохранить</sys:String>
+    <sys:String x:Key="Str_Survey_Cancel">Отмена</sys:String>
+    <sys:String x:Key="Str_Survey_Required">Введите название устройства.</sys:String>
+    <sys:String x:Key="Str_Survey_Notice">Ручные данные — сведения пользователя, а не подтверждённая совместимость. Рекомендации требуют проверки. Открытие описи не подключается к устройствам или Home Assistant.</sys:String>
+    <sys:String x:Key="Str_Survey_Observation">Сохранённое наблюдение (не текущее состояние)</sys:String>
+    <sys:String x:Key="Str_Survey_NoObservation">Нет сохранённого сетевого наблюдения</sys:String>
+    <sys:String x:Key="Str_Survey_Error">Не удалось прочитать или сохранить опись. Имеющиеся данные сохранены. Проверьте папку данных и резервную копию.</sys:String>
+    <sys:String x:Key="Str_Survey_Link">Связать наблюдение</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmLink">Связать запись с найденным устройством? Изменится только сетевая привязка. Сначала проверьте идентичность устройства.</sys:String>
+    <sys:String x:Key="Str_Survey_New">Создать отдельную запись</sys:String>
+    <sys:String x:Key="Str_Survey_IpWarning">IP совпадает с записью, но идентичность не подтверждена. Выберите запись, создайте отдельную или отмените действие.</sys:String>
+    <sys:String x:Key="Str_Survey_Hints">Использовать эти сведения</sys:String>
 </ResourceDictionary>
diff --git a/Strings/sl-SI.xaml b/Strings/sl-SI.xaml
index eaf18b8..06df6f5 100644
--- a/Strings/sl-SI.xaml
+++ b/Strings/sl-SI.xaml
@@ -667,7 +667,7 @@ Tvoje nastavitve bodo ohranjene.</sys:String>
     <sys:String x:Key="Str_Access_Note">Odpri vzpostavi novo povezavo. HTTP 200 ne dokazuje dostopa brez prijave. Veljavnost certifikatov HTTPS ni preverjena. Dokaz prijave velja samo za zahtevani naslov.</sys:String>
     <sys:String x:Key="Str_Access_NoTime">Čas opažanja ni na voljo</sys:String>
     <sys:String x:Key="Str_HA_Title">Integracije Home Assistanta</sys:String>
-    <sys:String x:Key="Str_HA_Note">Predlogi niso potrjena združljivost. Povezava ali nastavitev se ne izvede. Dodatni vnosi ostanejo v tem oknu; povezave do navodil ne vsebujejo podatkov naprave.</sys:String>
+    <sys:String x:Key="Str_HA_Note">Predlogi niso potrjena združljivost. Povezava ali nastavitev se ne izvede. Ročni vnosi se ohranijo šele po izrecnem shranjevanju v popis lokacije; povezave do navodil ne vsebujejo podatkov naprave.</sys:String>
     <sys:String x:Key="Str_HA_Unknown">V tem katalogu ni konkretnega ujemanja. To ne pomeni, da naprava ni podprta.</sys:String>
     <sys:String x:Key="Str_HA_Candidates">Možne integracije</sys:String>
     <sys:String x:Key="Str_HA_Workflow">Poišči najboljšo pot do integracije</sys:String>
@@ -727,4 +727,31 @@ Tvoje nastavitve bodo ohranjene.</sys:String>
     <sys:String x:Key="Str_HA_TuyaAccount">Naprava mora biti v tvojem računu Tuya Smart / Smart Life; preveri razpoložljive funkcije</sys:String>
     <sys:String x:Key="Str_HA_GoeApi">Združljiv model/firmware go-e in omogočen lokalni HTTP API v2 ali WebSocket</sys:String>
     <sys:String x:Key="Str_HA_EwelinkFirmware">Podprta naprava z izvirnim firmwareom eWeLink; preveri način LAN/oblak</sys:String>
+
+    <!-- Persistent, explicitly saved initial-survey inventory. -->
+    <sys:String x:Key="Str_Survey_Title">Popis lokacije</sys:String>
+    <sys:String x:Key="Str_Survey_Scan">Trenutni pregled</sys:String>
+    <sys:String x:Key="Str_Survey_Add">Dodaj izbrane v popis</sys:String>
+    <sys:String x:Key="Str_Survey_Manual">Dodaj napravo ročno</sys:String>
+    <sys:String x:Key="Str_Survey_Edit">Uredi napravo</sys:String>
+    <sys:String x:Key="Str_Survey_Remove">Odstrani iz popisa</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmRemove">Odstranim ta zapis iz popisa? Zgodovina pregledov bo ohranjena.</sys:String>
+    <sys:String x:Key="Str_Survey_Name">Ime (obvezno)</sys:String>
+    <sys:String x:Key="Str_Survey_Room">Prostor</sys:String>
+    <sys:String x:Key="Str_Survey_Firmware">Firmware</sys:String>
+    <sys:String x:Key="Str_Survey_Connection">Povezava / protokol</sys:String>
+    <sys:String x:Key="Str_Survey_Functions">Želene funkcije v Home Assistantu</sys:String>
+    <sys:String x:Key="Str_Survey_Notes">Opombe</sys:String>
+    <sys:String x:Key="Str_Survey_Save">Shrani</sys:String>
+    <sys:String x:Key="Str_Survey_Cancel">Prekliči</sys:String>
+    <sys:String x:Key="Str_Survey_Required">Vnesi ime naprave.</sys:String>
+    <sys:String x:Key="Str_Survey_Notice">Ročni vnosi so uporabniški podatki, ne potrjena združljivost. Priporočila je treba preveriti. Odpiranje popisa ne vzpostavlja povezav z napravami ali Home Assistantom.</sys:String>
+    <sys:String x:Key="Str_Survey_Observation">Shranjeno opažanje (ni stanje v živo)</sys:String>
+    <sys:String x:Key="Str_Survey_NoObservation">Ni shranjenega omrežnega opažanja</sys:String>
+    <sys:String x:Key="Str_Survey_Error">Popisa ni bilo mogoče prebrati ali shraniti. Obstoječi podatki so ohranjeni. Preveri podatkovno mapo in njeno varnostno kopijo.</sys:String>
+    <sys:String x:Key="Str_Survey_Link">Poveži opažanje</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmLink">Povežem izbrani zapis z najdeno napravo? Spremeni se samo omrežna povezava zapisa. Najprej preveri identiteto naprave.</sys:String>
+    <sys:String x:Key="Str_Survey_New">Ustvari ločen zapis</sys:String>
+    <sys:String x:Key="Str_Survey_IpWarning">IP se ujema z zapisom v popisu, identiteta pa ni potrjena. Izberi zapis za povezavo, ustvari ločen zapis ali prekliči.</sys:String>
+    <sys:String x:Key="Str_Survey_Hints">Uporabi te namige</sys:String>
 </ResourceDictionary>
diff --git a/Strings/tr-TR.xaml b/Strings/tr-TR.xaml
index 6e53e4d..b416056 100644
--- a/Strings/tr-TR.xaml
+++ b/Strings/tr-TR.xaml
@@ -690,7 +690,7 @@ Ayarlarınız silinmeyecek.</sys:String>
     <sys:String x:Key="Str_Access_Note">Aç yeni bir bağlantı kurar. HTTP 200, oturum açmadan erişimi kanıtlamaz. HTTPS sertifikaları doğrulanmadı. Kimlik doğrulama kanıtı yalnızca istenen adres için geçerlidir.</sys:String>
     <sys:String x:Key="Str_Access_NoTime">Gözlem zamanı kullanılamıyor</sys:String>
     <sys:String x:Key="Str_HA_Title">Home Assistant entegrasyonları</sys:String>
-    <sys:String x:Key="Str_HA_Note">Öneriler uyumluluğu doğrulamaz. Bağlantı veya kurulum yapılmaz. İsteğe bağlı bilgiler bu pencerede kalır; belge bağlantıları cihaz verisi içermez.</sys:String>
+    <sys:String x:Key="Str_HA_Note">Öneriler uyumluluğu doğrulamaz. Bağlantı veya kurulum yapılmaz. Elle girilen bilgiler yalnızca konum envanterine açıkça kaydedilirse korunur; belge bağlantıları cihaz verisi içermez.</sys:String>
     <sys:String x:Key="Str_HA_Unknown">Bu katalogda belirli bir eşleşme yok. Bu, cihazın desteklenmediği anlamına gelmez.</sys:String>
     <sys:String x:Key="Str_HA_Candidates">Olası entegrasyonlar</sys:String>
     <sys:String x:Key="Str_HA_Workflow">En iyi entegrasyon yolunu bul</sys:String>
@@ -750,4 +750,31 @@ Ayarlarınız silinmeyecek.</sys:String>
     <sys:String x:Key="Str_HA_TuyaAccount">Cihaz Tuya Smart / Smart Life hesabınıza bağlı olmalı; işlevleri doğrulayın</sys:String>
     <sys:String x:Key="Str_HA_GoeApi">Uyumlu go-e modeli/yazılımı ve etkin yerel HTTP API v2 veya WebSocket</sys:String>
     <sys:String x:Key="Str_HA_EwelinkFirmware">Orijinal eWeLink yazılımlı desteklenen cihaz; LAN/bulut modunu doğrulayın</sys:String>
+
+    <!-- Persistent, explicitly saved initial-survey inventory. -->
+    <sys:String x:Key="Str_Survey_Title">Konum envanteri</sys:String>
+    <sys:String x:Key="Str_Survey_Scan">Geçerli tarama</sys:String>
+    <sys:String x:Key="Str_Survey_Add">Seçilenleri envantere ekle</sys:String>
+    <sys:String x:Key="Str_Survey_Manual">Cihazı elle ekle</sys:String>
+    <sys:String x:Key="Str_Survey_Edit">Cihazı düzenle</sys:String>
+    <sys:String x:Key="Str_Survey_Remove">Envanterden kaldır</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmRemove">Bu kayıt kaldırılsın mı? Tarama geçmişi korunacaktır.</sys:String>
+    <sys:String x:Key="Str_Survey_Name">Ad (zorunlu)</sys:String>
+    <sys:String x:Key="Str_Survey_Room">Oda</sys:String>
+    <sys:String x:Key="Str_Survey_Firmware">Donanım yazılımı</sys:String>
+    <sys:String x:Key="Str_Survey_Connection">Bağlantı / protokol</sys:String>
+    <sys:String x:Key="Str_Survey_Functions">İstenen Home Assistant işlevleri</sys:String>
+    <sys:String x:Key="Str_Survey_Notes">Notlar</sys:String>
+    <sys:String x:Key="Str_Survey_Save">Kaydet</sys:String>
+    <sys:String x:Key="Str_Survey_Cancel">İptal</sys:String>
+    <sys:String x:Key="Str_Survey_Required">Bir cihaz adı girin.</sys:String>
+    <sys:String x:Key="Str_Survey_Notice">Elle girilen bilgiler kullanıcı verisidir, doğrulanmış uyumluluk değildir. Öneriler doğrulanmalıdır. Envanterin açılması cihazlara veya Home Assistant’a bağlanmaz.</sys:String>
+    <sys:String x:Key="Str_Survey_Observation">Kaydedilmiş gözlem (canlı durum değil)</sys:String>
+    <sys:String x:Key="Str_Survey_NoObservation">Kaydedilmiş ağ gözlemi yok</sys:String>
+    <sys:String x:Key="Str_Survey_Error">Envanter okunamadı veya kaydedilemedi. Mevcut veriler korundu. Veri klasörünü ve yedeğini kontrol edin.</sys:String>
+    <sys:String x:Key="Str_Survey_Link">Gözlemi bağla</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmLink">Bu kayıt bulunan bir cihaza bağlansın mı? Yalnızca ağ bağlantısı değişir. Önce cihazın kimliğini doğrulayın.</sys:String>
+    <sys:String x:Key="Str_Survey_New">Ayrı kayıt oluştur</sys:String>
+    <sys:String x:Key="Str_Survey_IpWarning">IP bir kayıtla eşleşiyor ancak kimlik doğrulanmadı. Bağlanacak kaydı seçin, ayrı kayıt oluşturun veya iptal edin.</sys:String>
+    <sys:String x:Key="Str_Survey_Hints">Bu ipuçlarını kullan</sys:String>
 </ResourceDictionary>
diff --git a/Strings/uk-UA.xaml b/Strings/uk-UA.xaml
index 7a9f2f5..5699fdd 100644
--- a/Strings/uk-UA.xaml
+++ b/Strings/uk-UA.xaml
@@ -732,7 +732,7 @@
     <sys:String x:Key="Str_Access_Note">Відкриття створює нове з’єднання. HTTP 200 не доводить доступ без входу. Сертифікати HTTPS не перевірено. Доказ автентифікації стосується лише запитаної адреси.</sys:String>
     <sys:String x:Key="Str_Access_NoTime">Час спостереження недоступний</sys:String>
     <sys:String x:Key="Str_HA_Title">Інтеграції Home Assistant</sys:String>
-    <sys:String x:Key="Str_HA_Note">Пропозиції не підтверджують сумісність. Підключення й налаштування не виконуються. Необов’язкові дані залишаються у вікні; посилання не містять даних пристрою.</sys:String>
+    <sys:String x:Key="Str_HA_Note">Пропозиції не підтверджують сумісність. Підключення та налаштування не виконуються. Ручні дані зберігаються лише після явного збереження в описі об’єкта; посилання на документацію не містять даних пристрою.</sys:String>
     <sys:String x:Key="Str_HA_Unknown">У каталозі немає конкретного збігу. Це не означає, що пристрій не підтримується.</sys:String>
     <sys:String x:Key="Str_HA_Candidates">Можливі інтеграції</sys:String>
     <sys:String x:Key="Str_HA_Workflow">Знайти найкращий шлях інтеграції</sys:String>
@@ -792,4 +792,31 @@
     <sys:String x:Key="Str_HA_TuyaAccount">Пристрій має бути у вашому обліковому записі Tuya Smart / Smart Life; перевірте функції</sys:String>
     <sys:String x:Key="Str_HA_GoeApi">Сумісна модель/прошивка go-e та ввімкнений локальний HTTP API v2 або WebSocket</sys:String>
     <sys:String x:Key="Str_HA_EwelinkFirmware">Підтримуваний пристрій з оригінальною прошивкою eWeLink; перевірте режим LAN/хмара</sys:String>
+
+    <!-- Persistent, explicitly saved initial-survey inventory. -->
+    <sys:String x:Key="Str_Survey_Title">Опис об’єкта</sys:String>
+    <sys:String x:Key="Str_Survey_Scan">Поточне сканування</sys:String>
+    <sys:String x:Key="Str_Survey_Add">Додати вибрані до опису</sys:String>
+    <sys:String x:Key="Str_Survey_Manual">Додати пристрій вручну</sys:String>
+    <sys:String x:Key="Str_Survey_Edit">Редагувати пристрій</sys:String>
+    <sys:String x:Key="Str_Survey_Remove">Видалити з опису</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmRemove">Видалити цей запис? Історія сканування збережеться.</sys:String>
+    <sys:String x:Key="Str_Survey_Name">Назва (обов’язково)</sys:String>
+    <sys:String x:Key="Str_Survey_Room">Приміщення</sys:String>
+    <sys:String x:Key="Str_Survey_Firmware">Прошивка</sys:String>
+    <sys:String x:Key="Str_Survey_Connection">Підключення / протокол</sys:String>
+    <sys:String x:Key="Str_Survey_Functions">Бажані функції Home Assistant</sys:String>
+    <sys:String x:Key="Str_Survey_Notes">Примітки</sys:String>
+    <sys:String x:Key="Str_Survey_Save">Зберегти</sys:String>
+    <sys:String x:Key="Str_Survey_Cancel">Скасувати</sys:String>
+    <sys:String x:Key="Str_Survey_Required">Введіть назву пристрою.</sys:String>
+    <sys:String x:Key="Str_Survey_Notice">Ручні дані — відомості користувача, а не підтверджена сумісність. Рекомендації потребують перевірки. Відкриття опису не підключається до пристроїв чи Home Assistant.</sys:String>
+    <sys:String x:Key="Str_Survey_Observation">Збережене спостереження (не поточний стан)</sys:String>
+    <sys:String x:Key="Str_Survey_NoObservation">Немає збереженого мережевого спостереження</sys:String>
+    <sys:String x:Key="Str_Survey_Error">Не вдалося прочитати або зберегти опис. Наявні дані збережено. Перевірте папку даних і резервну копію.</sys:String>
+    <sys:String x:Key="Str_Survey_Link">Пов’язати спостереження</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmLink">Пов’язати запис зі знайденим пристроєм? Зміниться лише мережева прив’язка. Спочатку перевірте ідентичність пристрою.</sys:String>
+    <sys:String x:Key="Str_Survey_New">Створити окремий запис</sys:String>
+    <sys:String x:Key="Str_Survey_IpWarning">IP збігається із записом, але ідентичність не підтверджена. Виберіть запис, створіть окремий або скасуйте дію.</sys:String>
+    <sys:String x:Key="Str_Survey_Hints">Використати ці відомості</sys:String>
 </ResourceDictionary>
diff --git a/Strings/vi-VN.xaml b/Strings/vi-VN.xaml
index 89fce3e..1d40272 100644
--- a/Strings/vi-VN.xaml
+++ b/Strings/vi-VN.xaml
@@ -671,7 +671,7 @@ Cài đặt của bạn sẽ không bị xóa.</sys:String>
     <sys:String x:Key="Str_Access_Note">Mở sẽ tạo kết nối mới. HTTP 200 không chứng minh có thể truy cập mà không đăng nhập. Chứng chỉ HTTPS chưa được xác thực. Bằng chứng xác thực chỉ áp dụng cho địa chỉ đã yêu cầu.</sys:String>
     <sys:String x:Key="Str_Access_NoTime">Không có thời gian quan sát</sys:String>
     <sys:String x:Key="Str_HA_Title">Tích hợp Home Assistant</sys:String>
-    <sys:String x:Key="Str_HA_Note">Gợi ý không xác nhận tương thích. Không kết nối hoặc thiết lập. Thông tin tùy chọn chỉ ở trong cửa sổ này; liên kết tài liệu không chứa dữ liệu thiết bị.</sys:String>
+    <sys:String x:Key="Str_HA_Note">Đề xuất không xác nhận khả năng tương thích. Không thực hiện kết nối hay thiết lập. Dữ liệu thủ công chỉ được giữ sau khi lưu rõ ràng vào danh mục địa điểm; liên kết tài liệu không chứa dữ liệu thiết bị.</sys:String>
     <sys:String x:Key="Str_HA_Unknown">Không có kết quả cụ thể trong danh mục này. Điều đó không có nghĩa thiết bị không được hỗ trợ.</sys:String>
     <sys:String x:Key="Str_HA_Candidates">Các tích hợp có thể phù hợp</sys:String>
     <sys:String x:Key="Str_HA_Workflow">Tìm cách tích hợp phù hợp nhất</sys:String>
@@ -731,4 +731,31 @@ Cài đặt của bạn sẽ không bị xóa.</sys:String>
     <sys:String x:Key="Str_HA_TuyaAccount">Thiết bị phải thuộc tài khoản Tuya Smart / Smart Life của bạn; kiểm tra chức năng</sys:String>
     <sys:String x:Key="Str_HA_GoeApi">Mẫu/firmware go-e tương thích và HTTP API v2 cục bộ hoặc WebSocket được bật</sys:String>
     <sys:String x:Key="Str_HA_EwelinkFirmware">Thiết bị hỗ trợ với firmware eWeLink gốc; kiểm tra chế độ LAN/đám mây</sys:String>
+
+    <!-- Persistent, explicitly saved initial-survey inventory. -->
+    <sys:String x:Key="Str_Survey_Title">Danh mục thiết bị tại địa điểm</sys:String>
+    <sys:String x:Key="Str_Survey_Scan">Lần quét hiện tại</sys:String>
+    <sys:String x:Key="Str_Survey_Add">Thêm mục đã chọn vào danh mục</sys:String>
+    <sys:String x:Key="Str_Survey_Manual">Thêm thiết bị thủ công</sys:String>
+    <sys:String x:Key="Str_Survey_Edit">Sửa thiết bị</sys:String>
+    <sys:String x:Key="Str_Survey_Remove">Xóa khỏi danh mục</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmRemove">Xóa mục này? Lịch sử quét sẽ được giữ lại.</sys:String>
+    <sys:String x:Key="Str_Survey_Name">Tên (bắt buộc)</sys:String>
+    <sys:String x:Key="Str_Survey_Room">Phòng</sys:String>
+    <sys:String x:Key="Str_Survey_Firmware">Phần sụn</sys:String>
+    <sys:String x:Key="Str_Survey_Connection">Kết nối / giao thức</sys:String>
+    <sys:String x:Key="Str_Survey_Functions">Chức năng mong muốn trong Home Assistant</sys:String>
+    <sys:String x:Key="Str_Survey_Notes">Ghi chú</sys:String>
+    <sys:String x:Key="Str_Survey_Save">Lưu</sys:String>
+    <sys:String x:Key="Str_Survey_Cancel">Hủy</sys:String>
+    <sys:String x:Key="Str_Survey_Required">Nhập tên thiết bị.</sys:String>
+    <sys:String x:Key="Str_Survey_Notice">Dữ liệu thủ công là thông tin người dùng, không phải khả năng tương thích đã xác minh. Cần kiểm tra các đề xuất. Mở danh mục không kết nối với thiết bị hoặc Home Assistant.</sys:String>
+    <sys:String x:Key="Str_Survey_Observation">Quan sát đã lưu (không phải trạng thái trực tiếp)</sys:String>
+    <sys:String x:Key="Str_Survey_NoObservation">Chưa có quan sát mạng đã lưu</sys:String>
+    <sys:String x:Key="Str_Survey_Error">Không thể đọc hoặc lưu danh mục. Dữ liệu hiện có được giữ nguyên. Kiểm tra thư mục dữ liệu và bản sao lưu.</sys:String>
+    <sys:String x:Key="Str_Survey_Link">Liên kết quan sát</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmLink">Liên kết mục này với thiết bị tìm thấy? Chỉ liên kết mạng được thay đổi. Hãy xác minh thiết bị trước.</sys:String>
+    <sys:String x:Key="Str_Survey_New">Tạo mục riêng</sys:String>
+    <sys:String x:Key="Str_Survey_IpWarning">IP trùng với một mục, nhưng chưa xác minh danh tính. Chọn mục để liên kết, tạo mục riêng hoặc hủy.</sys:String>
+    <sys:String x:Key="Str_Survey_Hints">Dùng các thông tin gợi ý này</sys:String>
 </ResourceDictionary>
diff --git a/Strings/zh-CN.xaml b/Strings/zh-CN.xaml
index b7b68b0..df67040 100644
--- a/Strings/zh-CN.xaml
+++ b/Strings/zh-CN.xaml
@@ -690,7 +690,7 @@
     <sys:String x:Key="Str_Access_Note">打开会建立新连接。HTTP 200 不能证明无需登录即可访问。HTTPS 证书未经验证。身份验证证据仅适用于请求的地址。</sys:String>
     <sys:String x:Key="Str_Access_NoTime">观察时间不可用</sys:String>
     <sys:String x:Key="Str_HA_Title">Home Assistant 集成</sys:String>
-    <sys:String x:Key="Str_HA_Note">建议不代表已验证兼容性。不会连接或配置设备。可选输入仅保留在此窗口中；文档链接不会包含设备数据。</sys:String>
+    <sys:String x:Key="Str_HA_Note">建议并不代表已验证的兼容性。不会进行连接或设置。手动输入仅在明确保存到地点清单后保留；文档链接不包含设备数据。</sys:String>
     <sys:String x:Key="Str_HA_Unknown">此目录中没有具体匹配项。这不表示设备不受支持。</sys:String>
     <sys:String x:Key="Str_HA_Candidates">可能适用的集成</sys:String>
     <sys:String x:Key="Str_HA_Workflow">寻找最佳集成路径</sys:String>
@@ -750,4 +750,31 @@
     <sys:String x:Key="Str_HA_TuyaAccount">设备须绑定到你的Tuya Smart / Smart Life账户；核对功能</sys:String>
     <sys:String x:Key="Str_HA_GoeApi">兼容的go-e型号/固件，并启用本地HTTP API v2或WebSocket</sys:String>
     <sys:String x:Key="Str_HA_EwelinkFirmware">使用原厂eWeLink固件的受支持设备；核对LAN/云模式</sys:String>
+
+    <!-- Persistent, explicitly saved initial-survey inventory. -->
+    <sys:String x:Key="Str_Survey_Title">地点设备清单</sys:String>
+    <sys:String x:Key="Str_Survey_Scan">当前扫描</sys:String>
+    <sys:String x:Key="Str_Survey_Add">将所选设备加入清单</sys:String>
+    <sys:String x:Key="Str_Survey_Manual">手动添加设备</sys:String>
+    <sys:String x:Key="Str_Survey_Edit">编辑设备</sys:String>
+    <sys:String x:Key="Str_Survey_Remove">从清单移除</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmRemove">移除此条目？扫描历史将保留。</sys:String>
+    <sys:String x:Key="Str_Survey_Name">名称（必填）</sys:String>
+    <sys:String x:Key="Str_Survey_Room">房间</sys:String>
+    <sys:String x:Key="Str_Survey_Firmware">固件</sys:String>
+    <sys:String x:Key="Str_Survey_Connection">连接 / 协议</sys:String>
+    <sys:String x:Key="Str_Survey_Functions">希望在Home Assistant中使用的功能</sys:String>
+    <sys:String x:Key="Str_Survey_Notes">备注</sys:String>
+    <sys:String x:Key="Str_Survey_Save">保存</sys:String>
+    <sys:String x:Key="Str_Survey_Cancel">取消</sys:String>
+    <sys:String x:Key="Str_Survey_Required">请输入设备名称。</sys:String>
+    <sys:String x:Key="Str_Survey_Notice">手动输入是用户提供的信息，并非已验证的兼容性。建议需要核实。打开清单不会连接设备或Home Assistant。</sys:String>
+    <sys:String x:Key="Str_Survey_Observation">已保存的观测（非实时状态）</sys:String>
+    <sys:String x:Key="Str_Survey_NoObservation">没有已保存的网络观测</sys:String>
+    <sys:String x:Key="Str_Survey_Error">无法读取或保存清单。原有数据已保留。请检查数据文件夹及其备份。</sys:String>
+    <sys:String x:Key="Str_Survey_Link">关联观测</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmLink">将此条目关联到发现的设备？仅更改网络关联。请先核实设备身份。</sys:String>
+    <sys:String x:Key="Str_Survey_New">创建独立条目</sys:String>
+    <sys:String x:Key="Str_Survey_IpWarning">IP与清单条目相同，但设备身份尚未确认。请选择要关联的条目、创建独立条目或取消。</sys:String>
+    <sys:String x:Key="Str_Survey_Hints">使用这些线索</sys:String>
 </ResourceDictionary>
diff --git a/Strings/zh-TW.xaml b/Strings/zh-TW.xaml
index 018d75a..33766e9 100644
--- a/Strings/zh-TW.xaml
+++ b/Strings/zh-TW.xaml
@@ -690,7 +690,7 @@
     <sys:String x:Key="Str_Access_Note">開啟會建立新連線。HTTP 200 無法證明不需登入即可存取。HTTPS 憑證未經驗證。身分驗證證據僅適用於要求的位址。</sys:String>
     <sys:String x:Key="Str_Access_NoTime">無可用的觀察時間</sys:String>
     <sys:String x:Key="Str_HA_Title">Home Assistant 整合</sys:String>
-    <sys:String x:Key="Str_HA_Note">建議不代表已驗證相容性。不會連線或設定裝置。選填資料只留在此視窗；文件連結不會包含裝置資料。</sys:String>
+    <sys:String x:Key="Str_HA_Note">建議並不代表已驗證的相容性。不會進行連線或設定。手動輸入僅在明確儲存至地點清單後保留；文件連結不包含裝置資料。</sys:String>
     <sys:String x:Key="Str_HA_Unknown">此目錄中沒有具體相符項目。這不表示裝置不受支援。</sys:String>
     <sys:String x:Key="Str_HA_Candidates">可能適用的整合</sys:String>
     <sys:String x:Key="Str_HA_Workflow">尋找最佳整合方式</sys:String>
@@ -750,4 +750,31 @@
     <sys:String x:Key="Str_HA_TuyaAccount">裝置須綁定至你的Tuya Smart / Smart Life帳戶；核對功能</sys:String>
     <sys:String x:Key="Str_HA_GoeApi">相容的go-e型號/韌體，並啟用本機HTTP API v2或WebSocket</sys:String>
     <sys:String x:Key="Str_HA_EwelinkFirmware">使用原廠eWeLink韌體的受支援裝置；核對LAN/雲端模式</sys:String>
+
+    <!-- Persistent, explicitly saved initial-survey inventory. -->
+    <sys:String x:Key="Str_Survey_Title">地點裝置清單</sys:String>
+    <sys:String x:Key="Str_Survey_Scan">目前掃描</sys:String>
+    <sys:String x:Key="Str_Survey_Add">將所選裝置加入清單</sys:String>
+    <sys:String x:Key="Str_Survey_Manual">手動新增裝置</sys:String>
+    <sys:String x:Key="Str_Survey_Edit">編輯裝置</sys:String>
+    <sys:String x:Key="Str_Survey_Remove">從清單移除</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmRemove">移除此項目？掃描歷程將保留。</sys:String>
+    <sys:String x:Key="Str_Survey_Name">名稱（必填）</sys:String>
+    <sys:String x:Key="Str_Survey_Room">房間</sys:String>
+    <sys:String x:Key="Str_Survey_Firmware">韌體</sys:String>
+    <sys:String x:Key="Str_Survey_Connection">連線 / 通訊協定</sys:String>
+    <sys:String x:Key="Str_Survey_Functions">希望在Home Assistant中使用的功能</sys:String>
+    <sys:String x:Key="Str_Survey_Notes">備註</sys:String>
+    <sys:String x:Key="Str_Survey_Save">儲存</sys:String>
+    <sys:String x:Key="Str_Survey_Cancel">取消</sys:String>
+    <sys:String x:Key="Str_Survey_Required">請輸入裝置名稱。</sys:String>
+    <sys:String x:Key="Str_Survey_Notice">手動輸入是使用者提供的資訊，並非已驗證的相容性。建議需要確認。開啟清單不會連線至裝置或Home Assistant。</sys:String>
+    <sys:String x:Key="Str_Survey_Observation">已儲存的觀測（非即時狀態）</sys:String>
+    <sys:String x:Key="Str_Survey_NoObservation">沒有已儲存的網路觀測</sys:String>
+    <sys:String x:Key="Str_Survey_Error">無法讀取或儲存清單。原有資料已保留。請檢查資料夾及其備份。</sys:String>
+    <sys:String x:Key="Str_Survey_Link">關聯觀測</sys:String>
+    <sys:String x:Key="Str_Survey_ConfirmLink">將此項目關聯至找到的裝置？僅變更網路關聯。請先確認裝置身分。</sys:String>
+    <sys:String x:Key="Str_Survey_New">建立獨立項目</sys:String>
+    <sys:String x:Key="Str_Survey_IpWarning">IP與清單項目相同，但裝置身分尚未確認。請選擇要關聯的項目、建立獨立項目或取消。</sys:String>
+    <sys:String x:Key="Str_Survey_Hints">使用這些線索</sys:String>
 </ResourceDictionary>
diff --git a/docs/home-assistant-advisor.md b/docs/home-assistant-advisor.md
index 7db4c54..2afb8ed 100644
--- a/docs/home-assistant-advisor.md
+++ b/docs/home-assistant-advisor.md
@@ -133,7 +133,10 @@ can still affect discovery. Physical-network validation remains necessary.
    which HA entities/functions are needed: reading state, control, or media.
 2. Optionally enter the model and known protocol in the window. These are manual
    research leads, never new observations or changes to saved identity. Inputs
-   stay in this window; **Copy integration plan** explicitly includes them.
+   stay in this window unless explicitly saved to the [location inventory](location-survey.md);
+   **Copy integration plan** explicitly includes them. Inventory edits require
+   **Save**; canceling discards them. Existing MAC-linked entries recover their
+   saved hints when their per-device advisor opens.
 3. Check [HA discovery and Add integration](https://www.home-assistant.io/getting-started/integration/)
    and the [official integration catalogue](https://www.home-assistant.io/integrations/).
    Prefer a supported integration with the required functions; compare local/cloud
diff --git a/docs/location-survey.md b/docs/location-survey.md
new file mode 100644
index 0000000..958ba14
--- /dev/null
+++ b/docs/location-survey.md
@@ -0,0 +1,134 @@
+# Persistent initial Home Assistant survey
+
+Implemented in the fork on **28 October 2026** and integrated with KillerScan
+**1.9.0** on **3 November 2026**.
+This inventory supports an initial customer visit. Installation work orders,
+acceptance, contracts, maintenance, router/AP connectors and new reports are
+outside its scope.
+
+## Workflow
+
+Select a saved Location and open **HA**. A Temporary scan can use the advisor;
+choose a saved Location to edit a persistent inventory. **Current scan** still contains every found device, independent of
+the workspace filter. Select one or more rows and choose **Add selected to
+inventory**. Nothing is added automatically. The second tab, **Location inventory**,
+shows the explicitly selected location name and its saved inventory even when
+there are no current scan results.
+
+Use **Add device manually** for a Zigbee sensor, equipment behind a bridge or
+an unavailable device. Only its name is required; no IP or MAC is needed. Edit
+name, room, manufacturer/model, firmware, connection/protocol, desired Home
+Assistant functions and notes. All are user information, distinct from the
+saved network observation. The connection field accepts free text; the advisor
+also offers its existing known-platform/protocol and monitor/control/media goals.
+
+The editor's **Home Assistant** action uses the existing recommendation rules.
+**Use these hints** returns model/protocol/goal changes to the editor only.
+Choose **Save** in the editor to persist them. Canceling either dialog discards
+its unaccepted changes. Existing per-device HA actions also offer an explicit
+inventory save and recover previously saved hints through a confirmed MAC link.
+
+**Remove from inventory** asks for confirmation and never removes scan history.
+**Link observation** explicitly associates the selected entry with a device from
+the current scan. Check identity before accepting, especially for entries created
+manually or without a MAC. Opening any of these windows performs no discovery,
+device query, HA login or installation. Documentation links still open only when
+requested.
+
+## Identity, observations and recommendations
+
+- Every entry has its own stable ID inside an explicit location. Identical
+  IP/MAC values at different locations do not join their data.
+- Re-adding an automatically linked network device with the same normalized
+  MAC updates that entry without overwriting manually entered fields.
+- An IP match without a MAC requires a choice: an existing entry, a separate new
+  entry, or cancel. IP alone is never an automatic identity.
+- Manually created entries are never automatically merged into scan results.
+  An explicit link can enable subsequent MAC-based observation refreshes.
+- Completed GUI scans and successfully completed individual/deep probes refresh
+  only existing unambiguous MAC links. No scan result creates inventory entries.
+  A duplicate MAC within one result set is left for manual review.
+- IP changes do not erase room, model, firmware, goals, functions or notes.
+  Missing devices remain in the inventory with their original last-observed time.
+  Older or undated results do not replace a newer dated observation automatically.
+- The inventory displays **Saved observation (not a live status)**. Capture time
+  comes from the saved recognition observation, never the act of opening or
+  adding a record. Legacy results lacking a trustworthy time say it is unknown.
+  The local save time is separate. Saved advisory facts retain their source/time
+  and are marked reused. Manual hints never become captured evidence.
+- A recommendation, including one selected from manual input, is still a proposal
+  requiring model, firmware, prerequisites and actual functionality to be checked.
+  This extension does not change the advisor catalogue or selection policy.
+
+CLI scan/probe output remains unchanged and does not write this GUI inventory.
+Existing public Engine APIs, scan JSON/CSV/HTML, history and profile formats remain
+compatible. This step adds no inventory reports or automatic migration of old data.
+
+## Storage and recovery
+
+`locations/<location-id>/survey.json` uses version `1` and includes the location
+ID, stable entry IDs, manual fields, an optional MAC link, and a separate frozen
+network observation. It is not a legacy migration input. The file is local user
+data and must not be committed or attached to public issues.
+
+Writes use the existing atomic temporary-file/replace helper and retain the
+previous file as `survey.json.bak`. A per-file writer lock serializes cooperating
+instances. Saving edits rereads the latest observation instead of replacing it
+with the editor's older snapshot. Corruption, an unsupported version, wrong
+location or an unsuccessful write is reported; the existing file is preserved.
+There is no silent reset, fallback to another location or automatic backup restore.
+Resolve the error before continuing to edit the inventory. The rest of the scan
+history is not reinterpreted as inventory.
+
+### Before using existing customer data
+
+1. Close every KillerScan process using the data folder.
+2. Copy the **entire data root**, including `locations.json`, `locations/`,
+   settings and existing backups, to a dated sibling backup folder. The default
+   is `%LOCALAPPDATA%\KillerScan`; an isolated/USB launch can override it with
+   `KILLERSCAN_DATA_ROOT`. Back up the actual overridden folder in that case.
+3. First run the development executable with a **copy** of that root through
+   `KILLERSCAN_DATA_ROOT`. Select the intended location explicitly. Do not start
+   a real network scan until the visit/test has been authorized.
+4. To roll back, close all copies, preserve the post-test root separately, and
+   run the previous executable with the untouched whole-root backup. Never merge
+   files from different location IDs or restore a catalogue without its matching
+   location folders. A previous build does not understand the new survey file.
+5. To recover one corrupt survey, keep the bad file and validate that its `.bak`
+   has version `1` and the **same location ID** before manually restoring a copy
+   with the application closed. If this cannot be established, keep both files
+   for diagnosis instead of deleting them.
+
+Demo mode keeps inventory edits in memory only. Use an isolated normal launch,
+not demo mode, to check persistence across actual application restarts.
+
+## Verification
+
+`SpeedTest.Tests.exe --survey` runs synthetic fixtures and two fresh child
+processes. It covers location isolation, stable IDs, explicit additions/manual
+entries, MAC de-duplication, IP confirmation/new/cancel, explicit links, changed
+IP, absent devices, old observations, immutable snapshots, manual provenance,
+special characters, backup creation, malformed/wrong-location/version data and
+failed atomic replacement. It is also part of the focused CI suite.
+
+`--release-ui` additionally checks inventory selection, editor save/cancel,
+advisor round trips, manual creation, removal confirmation, unchanged history,
+all 20 language dictionaries and rendering across 13 themes at 125%/200% scale.
+All test devices use fabricated names and documentation addresses. Existing
+Engine, history, location/profile and export regression suites remain applicable.
+
+Physical customer networks, installed user data and an actual HA setup have not
+been used for this feature's development checks. First deployment still needs a
+backed-up data copy and a supervised initial visit.
+
+## Kratka navodila
+
+**HA → Trenutni pregled → izberi naprave → Dodaj izbrane v popis.** Na zavihku
+**Popis lokacije** dodaj tudi ročne naprave, prostor in želene funkcije. Samo ime
+je obvezno. Model, protokol in cilj iz HA svetovalca se ohranijo šele s potrditvijo
+namigov in **Shrani** v urejevalniku. **Prekliči** ne shrani sprememb. Zadnje
+opažanje ni dokaz trenutne dosegljivosti ali potrjene združljivosti.
+
+Pred uporabo z obstoječimi podatki zapri program in kopiraj **celotno podatkovno
+mapo**. Najprej preizkusi njeno ločeno kopijo. Za povratek ohrani tudi podatke po
+preizkusu in uporabi prejšnjo sestavo z nedotaknjeno celotno varnostno kopijo.
diff --git a/docs/locations.md b/docs/locations.md
index c84cab4..18cd7c8 100644
--- a/docs/locations.md
+++ b/docs/locations.md
@@ -143,3 +143,9 @@ Still open:
 - **Notes in reports.** Notes stay out of reports, as planned; there is no report option yet.
 - **Retention.** Each Location keeps its own retention setting, copied at migration. The History settings dialog changes the current Location's only.
 - **Real-app checks.** Migration, the picker, the banner and the adapter prompt are covered by automated checks with scratch folders. On 2026-10-26 migration also ran against a copy of a real 1.8.3 install's data: 47 history entries, one saved scan and the device names moved into Unassigned in 85 ms, the original files stayed byte-identical, and a second start found the same Location. The picker, banner and adapter prompt have not yet been run on hardware with several adapters.
+
+## Initial Home Assistant survey
+
+Open HA in a saved Location to edit its [location inventory](location-survey.md).
+Back up the whole data folder to include the survey. Location exports do not
+include the survey.
diff --git a/tests/SpeedTest.Tests/LocationWorkspaceTests.cs b/tests/SpeedTest.Tests/LocationWorkspaceTests.cs
index 6e5ce97..f6d473a 100644
--- a/tests/SpeedTest.Tests/LocationWorkspaceTests.cs
+++ b/tests/SpeedTest.Tests/LocationWorkspaceTests.cs
@@ -96,7 +96,8 @@ internal static void Run()
                 !a.Devices.IsTrusted(device) && workspace.Location == a,
                 "Saving results adds the run and its names to the Location, approves nothing, and moves the tab there.");
             Require(!workspace.SaveResultsTo(b), "Only a Temporary scan's results can be saved to a Location.");
-            Require(workspace.Session.Devices.Count == 1, "Saved results stay on screen in the Location they moved to.");
+            Require(workspace.Session.Devices.Count == 1 && workspace.Session.Devices.Single().LocationId == a.Info!.Id,
+                "Saved results stay on screen and belong to the Location that now owns them.");
             ResultsFollowLocation(a, b, scanner);
             SaveResultsIsDurable(Path.Combine(root, "move"));
             SaveResultsEdges(Path.Combine(root, "edges"));
diff --git a/tests/SpeedTest.Tests/Program.cs b/tests/SpeedTest.Tests/Program.cs
index 1a55e5d..15816a2 100644
--- a/tests/SpeedTest.Tests/Program.cs
+++ b/tests/SpeedTest.Tests/Program.cs
@@ -29,6 +29,8 @@ private static async Task<int> Main(string[] args)
     {
         try
         {
+            if (args.SequenceEqual(new[] { "--survey" })) { SurveyTests.Run(); return 0; }
+            if (args.Length == 3 && args[0] == "--survey-phase") { SurveyTests.Phase(args[1], args[2]); return 0; }
             if (args.SequenceEqual(new[] { "--fork-upgrade" })) { await ForkUpgradeTests.Run(); return 0; }
             if (args.SequenceEqual(new[] { "--installation-cleanup" }))
             {
diff --git a/tests/SpeedTest.Tests/ReleaseUiTests.cs b/tests/SpeedTest.Tests/ReleaseUiTests.cs
index 90fb9ae..d10ac09 100644
--- a/tests/SpeedTest.Tests/ReleaseUiTests.cs
+++ b/tests/SpeedTest.Tests/ReleaseUiTests.cs
@@ -160,6 +160,7 @@ void CaptureSettings(string name, int windowWidth = 1200)
             return;
         }
         ForkHaUiChecks.Run(window, (element, name) => Save(Render(element, 1050, 740), Path.Combine(output, name)));
+        SurveyUiChecks.Run((element, name) => Save(Render(element, 1050, 820), Path.Combine(output, name)));
         var samples = new List<(string Label, BitmapSource Image)>();
         int states = 0;
         foreach (string theme in Enum.GetNames(themeType))
diff --git a/tests/SpeedTest.Tests/SurveyTests.cs b/tests/SpeedTest.Tests/SurveyTests.cs
new file mode 100644
index 0000000..32fff11
--- /dev/null
+++ b/tests/SpeedTest.Tests/SurveyTests.cs
@@ -0,0 +1,140 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Text.Json;
+using KillerScan.Engine;
+using KillerScan.Services;
+
+internal static class SurveyTests
+{
+    private static int _checks;
+    private static void Require(bool value, string message) { _checks++; if (!value) throw new InvalidOperationException(message); }
+    private static void Refuses(Action action, string message)
+    { bool refused = false; try { action(); } catch (Exception) { refused = true; } Require(refused, message); }
+    private static readonly DateTimeOffset First = new(2026, 10, 20, 10, 0, 0, TimeSpan.Zero);
+    private static NetworkDevice Device(string ip = "192.0.2.20", string mac = "02:00:00:00:00:20", int day = 0) => new()
+    {
+        IpAddress = ip, MacAddress = mac, Hostname = "fixture", HttpTitle = "Tasmota", OpenPorts = new() { 80 },
+        Identification = new DeviceIdentification { ObservationCompletedAtUtc = First.AddDays(day),
+            Evidence = new[] { new RecognitionEvidence { Source = "HTTP", Value = "Tasmota", Origin = "fixture", ObservedAtUtc = First.AddDays(day) } } }
+    };
+    internal static void Run()
+    {
+        string root = Path.Combine(Path.GetTempPath(), "KillerScan-survey-" + Guid.NewGuid().ToString("N")); Directory.CreateDirectory(root);
+        File.WriteAllText(Path.Combine(root, "fixture.txt"), "Synthetic survey test");
+        foreach (string phase in new[] { "create", "restart" })
+        {
+            using var process = Process.Start(new ProcessStartInfo(typeof(SurveyTests).Assembly.Location, "--survey-phase " + phase + " \"" + root + "\"")
+                { UseShellExecute = false, CreateNoWindow = true, RedirectStandardOutput = true, RedirectStandardError = true })!;
+            string output = process.StandardOutput.ReadToEnd(), error = process.StandardError.ReadToEnd();
+            Require(process.WaitForExit(30000) && process.ExitCode == 0, "Fresh-process survey phase " + phase + ": " + error); Console.Write(output);
+        }
+        var a = new SurveyStore(Path.Combine(root, "a", "survey.json"), "site-a");
+        var original = a.Load().Single(entry => !entry.Manual);
+        a.Refresh(new[] { Device("192.0.2.99", day: 2) });
+        var refreshed = a.Load().Single(entry => entry.Id == original.Id);
+        Require(refreshed.Observation!.Device.IpAddress == "192.0.2.99" && refreshed.Room == "Kuhinja čžš <&>" && refreshed.DesiredFunctions == "Temperature\nControl", "MAC refresh changes IP without changing manual fields or stable ID.");
+        a.Save(original with { Notes = "Saved from an older editor" });
+        Require(a.Load().Single(entry => entry.Id == original.Id).Observation!.Device.IpAddress == "192.0.2.99", "Saving an older editor preserves the latest scan snapshot.");
+        a.Refresh(Array.Empty<NetworkDevice>());
+        Require(a.Load().Single(entry => entry.Id == original.Id).Observation!.LastSeenUtc == First.AddDays(2), "Absent devices retain their last observation.");
+        a.AddObserved(Device("192.0.2.1", day: 1), _ => throw new Exception("Unexpected IP prompt"));
+        Require(a.Load().Single(entry => entry.Id == original.Id).Observation!.LastSeenUtc == First.AddDays(2), "Adding an older observation does not roll the last sighting backwards.");
+        var noMac = a.AddObserved(Device("192.0.2.50", ""), _ => throw new Exception())!;
+        byte[] before = File.ReadAllBytes(Path.Combine(root, "a", "survey.json")); int prompts = 0;
+        Require(a.AddObserved(Device("192.0.2.50", ""), candidates => { prompts++; Require(candidates.Single().Id == noMac.Id, "IP choice lists only explicit candidates."); return null; }) == null, "Canceling an IP match adds nothing.");
+        Require(prompts == 1 && before.SequenceEqual(File.ReadAllBytes(Path.Combine(root, "a", "survey.json"))), "IP match requires confirmation and cancellation preserves disk bytes.");
+        a.AddObserved(Device("192.0.2.50", ""), _ => noMac.Id);
+        Require(a.Load().Count(entry => entry.Observation?.Device.IpAddress == "192.0.2.50") == 1, "Confirmed IP-only match keeps the stable entry.");
+        Refuses(() => a.AddObserved(Device("192.0.2.50", ""), _ => noMac.Id, new SurveyEntry { Name = "New draft" }), "A new draft cannot overwrite existing manual fields while linking.");
+        a.AddObserved(Device("192.0.2.50", ""), _ => "");
+        Require(a.Load().Count(entry => entry.Observation?.Device.IpAddress == "192.0.2.50") == 2, "The user can instead create a separate IP-only entry.");
+        var manual = a.Load().Single(entry => entry.Manual);
+        Require(manual.Observation == null && manual.LinkedMac == "", "Manual device needs no IP or MAC.");
+        a.AddObserved(Device("192.0.2.77", "02:00:00:00:00:77"), _ => "");
+        Require(a.Load().Single(entry => entry.Id == manual.Id).Observation == null, "Adding network results never merges a manual entry.");
+        a.Link(manual.Id, Device("192.0.2.78", "02:00:00:00:00:78"));
+        a.Refresh(new[] { Device("192.0.2.79", "02:00:00:00:00:78", 3) });
+        Require(a.Load().Single(entry => entry.Id == manual.Id).Observation!.Device.IpAddress == "192.0.2.79", "An explicitly linked manual entry can refresh its observation.");
+        Refuses(() => a.Link(manual.Id, Device()), "Explicit linking refuses a MAC already attached elsewhere.");
+        var lead = new SurveyEntry { Manual = true, Name = "No IP", ManufacturerModel = "Tasmota", Protocol = "zha", Goal = "Control" };
+        var advised = HomeAssistantAdvisor.Assess(SurveyStore.AdviceDevice(lead), lead.Context);
+        Require(advised.Status == "Research" && advised.Candidates.All(candidate => candidate.Basis == "Manual" && candidate.Evidence.Length == 0 && candidate.Requirements.Length > 0), "Manual leads stay proposals requiring verification, never observed facts or confirmed compatibility.");
+        var cached = SurveyStore.AdviceDevice(refreshed);
+        Require(cached.Identification!.Evidence.All(fact => fact.Reused && fact.ObservedAtUtc == First.AddDays(2)), "Saved evidence retains its original date and is marked reused.");
+        Require(!refreshed.Observation.Device.Identification!.Evidence[0].Reused, "Advisory rendering cannot mutate stored evidence.");
+        var edited = refreshed with { Name = "Changed", Notes = "Пример 日本語 🔌\n<&> =value", Observation = null, LinkedMac = "" };
+        a.Save(edited);
+        Require(a.Load().Single(entry => entry.Id == edited.Id).Observation != null && a.Load().Single(entry => entry.Id == edited.Id).LinkedMac != "", "Manual editor cannot replace network evidence/binding.");
+        Require(a.Load().Single(entry => entry.Id == edited.Id).Notes == edited.Notes, "Special characters and multiline text survive persistence.");
+        Refuses(() => a.AddManual(new SurveyEntry { Name = " " }), "Only name is required and cannot be blank.");
+        Refuses(() => a.Save(edited with { Name = "" }), "Invalid edits are rejected before publication.");
+        a.Remove(noMac.Id); Require(!a.Load().Any(entry => entry.Id == noMac.Id), "Remove affects only the selected survey entry.");
+        Require(File.Exists(Path.Combine(root, "a", "survey.json.bak")), "Atomic updates retain the previous version as backup.");
+        var emptyPath = Path.Combine(root, "empty", "survey.json");
+        var empty = new SurveyStore(emptyPath, "empty"); empty.Refresh(new[] { Device() });
+        var wrongLocation = Device(); wrongLocation.LocationId = "different";
+        Refuses(() => empty.AddObserved(wrongLocation, _ => ""), "A foreign-location observation cannot be attached to this inventory.");
+        Require(empty.Load().Count == 0 && !File.Exists(emptyPath), "A scan never creates an inventory or adds an unknown device.");
+        var longName = Device(); longName.Hostname = new string('a', 159) + "🔌.example";
+        var named = empty.AddObserved(longName, _ => throw new Exception());
+        Require(empty.Load().Single().Name == new string('a', 159) && named?.Name.Length == 159,
+            "Long observed hostnames fit the survey name limit without splitting a Unicode character.");
+        Corruption(root);
+        var memory = new SurveyStore(Path.Combine(root, "memory.json"), "demo", true); memory.AddManual(new SurveyEntry { Name = "Demo" });
+        Require(memory.Load().Count == 1 && !File.Exists(Path.Combine(root, "memory.json")), "Demo storage does not write persistent data.");
+        Console.WriteLine("PASS: " + _checks + " survey persistence, isolation, matching, stale-evidence and failure assertions; two fresh processes.");
+        Console.WriteLine("Synthetic survey artifacts: " + root);
+    }
+    internal static void Phase(string phase, string root)
+    {
+        Require(Path.GetFullPath(root).StartsWith(Path.Combine(Path.GetTempPath(), "KillerScan-survey-"), StringComparison.OrdinalIgnoreCase) && File.Exists(Path.Combine(root, "fixture.txt")), "Only this test's synthetic root is accepted.");
+        foreach (string id in new[] { "a", "b" })
+        {
+            var store = new SurveyStore(Path.Combine(root, id, "survey.json"), "site-" + id);
+            if (phase == "create")
+            {
+                var device = Device(); var entry = store.AddObserved(device, _ => throw new Exception())!;
+                device.OpenPorts.Clear(); Require(store.Load().Single().Observation!.Device.OpenPorts.Count == 1, "Stored snapshots do not alias live devices.");
+                store.Save(entry with { Room = id == "a" ? "Kuhinja čžš <&>" : "Other room", ManufacturerModel = "User model", DesiredFunctions = "Temperature\nControl", Firmware = "1.2", Connection = "Wi-Fi", Notes = "Keep" });
+                store.AddManual(new SurveyEntry { Name = "Zigbee sensor", Protocol = "zha", Goal = "Monitor" });
+                store.AddObserved(Device("192.0.2.21", "02-00-00-00-00-20", 1), _ => throw new Exception("MAC must match without a prompt"));
+            }
+            else Require(phase == "restart", "Known fresh-process phase.");
+            var found = store.Load(); Require(found.Count == 2 && found.Single(entry => !entry.Manual).Room == (id == "a" ? "Kuhinja čžš <&>" : "Other room"), "Same IP/MAC remain isolated across locations and fresh processes.");
+            Require(found.Single(entry => !entry.Manual).ManufacturerModel == "User model", "Re-adding a MAC preserves manually entered model.");
+        }
+        var catalog = new LocationCatalog(Path.Combine(root, "catalog"));
+        catalog.Load("Unassigned");
+        Require(!LocationData.StoreFiles.Contains("survey.json"), "Survey data never enters automatic legacy migration.");
+        foreach (string name in new[] { "Synthetic A", "Synthetic B" })
+        {
+            LocationInfo? location;
+            if (phase == "create") Require(catalog.Create(name, out location), "Create a real Location.");
+            else location = catalog.Items.Single(item => item.Name == name);
+            var scoped = catalog.Open(location!).Survey!;
+            if (phase == "create") scoped.AddObserved(Device(), _ => throw new Exception());
+            Require(scoped.Load().Single().Observation!.Device.LocationId == location!.Id, "Real location catalog scopes same-IP/MAC survey snapshots after restart.");
+        }
+        Console.WriteLine("PASS: survey " + phase + " (" + _checks + " assertions).");
+    }
+    private static void Corruption(string root)
+    {
+        string path = Path.Combine(root, "broken.json");
+        foreach (string text in new[] { "{", "null", "{\"Version\":2,\"LocationId\":\"correct\",\"Entries\":[]}", "{\"Version\":1,\"LocationId\":\"wrong\",\"Entries\":[]}",
+            "{\"Version\":1,\"LocationId\":\"correct\"}", "{\"Version\":1,\"LocationId\":\"correct\",\"Entries\":[{\"Name\":\"Missing ID\"}]}" })
+        {
+            File.WriteAllText(path, text); var store = new SurveyStore(path, "correct");
+            Refuses(() => store.Load(), "Corrupt/version/location mismatch is reported.");
+            Refuses(() => store.AddManual(new SurveyEntry { Name = "Keep original" }), "A failed read cannot be overwritten by saving.");
+            Require(File.ReadAllText(path) == text && !File.Exists(path + ".bak"), "Unreadable original is preserved byte-for-byte.");
+        }
+        string blocked = Path.Combine(root, "blocked.json"); var blockedStore = new SurveyStore(blocked, "correct");
+        blockedStore.AddManual(new SurveyEntry { Name = "Before" }); byte[] before = File.ReadAllBytes(blocked);
+        using (new FileStream(blocked, FileMode.Open, FileAccess.Read, FileShare.Read))
+            Refuses(() => blockedStore.AddManual(new SurveyEntry { Name = "After" }), "A locked destination reports write failure.");
+        Require(before.SequenceEqual(File.ReadAllBytes(blocked)) && blockedStore.Load().Count == 1, "Failed publication keeps disk and subsequent reads consistent.");
+        Require(!Directory.GetFiles(root, "*.tmp").Any(), "Failed writes clean only their own temporary files.");
+    }
+}
diff --git a/tests/SpeedTest.Tests/SurveyUiChecks.cs b/tests/SpeedTest.Tests/SurveyUiChecks.cs
new file mode 100644
index 0000000..6601887
--- /dev/null
+++ b/tests/SpeedTest.Tests/SurveyUiChecks.cs
@@ -0,0 +1,99 @@
+using System;
+using System.Linq;
+using System.Reflection;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+using KillerScan.Controls;
+using KillerScan.Engine;
+using KillerScan.Services;
+
+internal static class SurveyUiChecks
+{
+    private const BindingFlags Static = BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public;
+    private static int _checks;
+    private static void Require(bool value, string message) { _checks++; if (!value) throw new InvalidOperationException(message); }
+    private static System.Collections.Generic.IEnumerable<T> Children<T>(DependencyObject root) where T : DependencyObject
+    {
+        foreach (var child in LogicalTreeHelper.GetChildren(root).OfType<DependencyObject>())
+        { if (child is T item) yield return item; foreach (var next in Children<T>(child)) yield return next; }
+    }
+    internal static void Run(Action<FrameworkElement, string> capture)
+    {
+        Require(DemoData.Enabled && IsolatedSettings.Enabled, "Survey UI tests require isolated demo data.");
+        var location = LocationData.Demo(new LocationInfo { Id = "survey-fixture", Name = "Synthetic survey" });
+        var store = location.Survey!;
+        var originalIds = store.Load().Select(entry => entry.Id).ToArray();
+        var beforeHistory = ScanHistory.Entries.ToArray();
+        var device = new NetworkDevice { IpAddress = "192.0.2.180", MacAddress = "02:00:00:00:00:B4", Hostname = "Synthetic survey fixture" };
+        var temporary = new HomeAssistantOverviewWindow(new[] { device }, _ => { }, _ => { }, LocationData.Temporary());
+        Require(temporary.Rows.Count == 1 && !Children<SurveyPanel>((DependencyObject)temporary.Content).Any(),
+            "Temporary scans still offer advice but do not create an inventory in another Location.");
+        temporary.Close();
+        var overview = new HomeAssistantOverviewWindow(new[] { device }, _ => throw new Exception("No browser allowed"), _ => { }, location);
+        var tabs = Children<TabControl>((DependencyObject)overview.Content).Single();
+        Require(tabs.Items.Count == 2 && overview.Rows.Count == 1, "HA retains current scan and adds a separate location inventory tab.");
+        var survey = Children<SurveyPanel>((DependencyObject)overview.Content).Single();
+        Require(store.Load().Count == originalIds.Length, "Opening HA does not add any found device.");
+        overview.Grid.SelectAll();
+        var add = Children<Button>((DependencyObject)overview.Content).Single(button => button.Tag as string == "survey-add");
+        Require(add.IsEnabled, "Explicit multi-selection enables adding found devices.");
+        add.RaiseEvent(new RoutedEventArgs(Button.ClickEvent));
+        Require(store.Load().Count == originalIds.Length + 1, "Only the explicitly selected scan device is persisted.");
+        add.RaiseEvent(new RoutedEventArgs(Button.ClickEvent));
+        Require(store.Load().Count == originalIds.Length + 1, "Adding the same MAC does not create another entry.");
+        tabs.SelectedIndex = 1;
+        var entry = store.Load().Single(item => item.LinkedMac == SurveyStore.Mac(device.MacAddress));
+        var editor = new SurveyEditorWindow(entry, store.Save, _ => throw new Exception("No network allowed"), _ => { });
+        editor.Inputs["Room"].Text = "Cancelled room"; editor.Inputs["Notes"].Text = "Cancelled note"; editor.Close();
+        Require(store.Load().Single(item => item.Id == entry.Id).Room == "", "Closing the editor discards manual changes.");
+        editor = new SurveyEditorWindow(entry, store.Save, _ => { }, _ => { });
+        editor.Inputs["Room"].Text = "Living room"; editor.Inputs["Functions"].Text = "Temperature and dimming";
+        var advice = editor.CreateAdvice(); advice.IdentityInput.Text = "Tasmota";
+        advice.ProtocolInput.SelectedItem = advice.ProtocolInput.Items.Cast<ComboBoxItem>().Single(item => item.Tag as string == "zha");
+        advice.GoalInput.SelectedItem = advice.GoalInput.Items.Cast<ComboBoxItem>().Single(item => item.Tag as string == "Control");
+        Children<Button>((DependencyObject)advice.Content).Single(button => button.Tag as string == "survey-save").RaiseEvent(new RoutedEventArgs(Button.ClickEvent));
+        Require(store.Load().Single(item => item.Id == entry.Id).ManufacturerModel == "", "Accepting advisor hints alone does not save the parent editor.");
+        Require(editor.TrySave(), "An explicit editor save persists manual data and advisor hints."); editor.Close();
+        entry = store.Load().Single(item => item.Id == entry.Id);
+        Require(entry.Room == "Living room" && entry.DesiredFunctions.Contains("dimming") && entry.Protocol == "zha" && entry.Goal == "Control" && entry.ManufacturerModel == "Tasmota", "All manual fields and HA context survive reopening.");
+        advice = new HomeAssistantAdviceWindow(device, _ => { }, _ => { }, surveyStore: store);
+        Require(advice.IdentityInput.Text == "Tasmota" && advice.CurrentAdvice.Candidates.All(candidate => candidate.Basis == "Manual"), "Existing HA actions reuse saved manual hints with manual provenance."); advice.Close();
+        var manualDraft = new SurveyEntry { Name = "Manual Zigbee sensor", Manual = true };
+        var manualEditor = new SurveyEditorWindow(manualDraft, store.AddManual, _ => { }, _ => { });
+        Require(manualEditor.TrySave(), "Manual creation requires only a name, without any IP or MAC."); manualEditor.Close();
+        survey.Reload(); survey.Grid.SelectedItem = survey.Grid.Items.Cast<SurveyPanel.Row>().Single(row => row.Entry.Id == manualDraft.Id);
+        int confirmations = 0; survey.RemoveSelected(_ => { confirmations++; return false; });
+        Require(confirmations == 1 && store.Load().Any(item => item.Id == manualDraft.Id), "Removal always asks for confirmation and cancel keeps the record.");
+        survey.RemoveSelected(_ => true);
+        Require(!store.Load().Any(item => item.Id == manualDraft.Id) && ScanHistory.Entries.SequenceEqual(beforeHistory), "Confirmed removal does not delete scan history.");
+        foreach (Locale locale in Enum.GetValues(typeof(Locale)))
+        {
+            typeof(LocaleManager).GetMethod("ApplyInternal", Static)!.Invoke(null, new object[] { locale });
+            var dictionary = Application.Current.Resources.MergedDictionaries.Single(resource =>
+                resource.Source?.OriginalString.EndsWith("/Strings/" + LocaleManager.LanguageTag + ".xaml", StringComparison.OrdinalIgnoreCase) == true);
+            foreach (string key in SurveyText.Keys) Require(dictionary.Contains("Str_Survey_" + key), locale + " has own survey translation: " + key);
+            var localized = new SurveyEditorWindow(entry, _ => { }, _ => { }, _ => { });
+            capture((FrameworkElement)localized.Content, "Survey-" + locale + ".png"); localized.Close();
+        }
+        typeof(LocaleManager).GetMethod("ApplyInternal", Static)!.Invoke(null, new object[] { Locale.SlSI });
+        foreach (Theme theme in Enum.GetValues(typeof(Theme)))
+        {
+            typeof(ThemeManager).GetMethod("LoadDict", Static)!.Invoke(null, new object[] { theme, Accent.Blue });
+            foreach (double scale in new[] { 1.25, 2.0 })
+            {
+                var themed = new SurveyEditorWindow(entry, _ => { }, _ => { }, _ => { });
+                var root = (FrameworkElement)themed.Content; root.LayoutTransform = new ScaleTransform(scale, scale);
+                capture(root, "Survey-" + theme + "-" + scale + ".png");
+                Require(Children<ScrollViewer>(root).Any(scroll => scroll.ViewportHeight > 0) && Children<Button>(root).Single(button => button.Tag as string == "save").ActualHeight > 0, "Scrollable editor and save action remain available at " + scale + " in " + theme);
+                themed.Close();
+            }
+        }
+        capture((FrameworkElement)overview.Content, "Survey-Inventory.png"); overview.Close();
+        foreach (var added in store.Load().Where(item => !originalIds.Contains(item.Id))) store.Remove(added.Id);
+        typeof(ThemeManager).GetMethod("LoadDict", Static)!.Invoke(null, new object[] { Theme.Black, Accent.Orange });
+        typeof(LocaleManager).GetMethod("ApplyInternal", Static)!.Invoke(null, new object[] { Locale.EnUS });
+        Console.WriteLine("PASS: " + _checks + " survey UI assertions, all 20 locales, 13 themes and 125%/200% scaling; no network actions.");
+
+    }
+}
diff --git a/tests/suites.json b/tests/suites.json
index 0762007..827078b 100644
--- a/tests/suites.json
+++ b/tests/suites.json
@@ -14,7 +14,7 @@
     "project": "tests/SpeedTest.Tests/SpeedTest.Tests.csproj",
     "program": "tests/SpeedTest.Tests/Program.cs",
     "ci": [
-      "--fork-upgrade", "--installation-cleanup", "--loopback-headers", "--transfer-sequence", "--empty-transfers",
+      "--survey", "--fork-upgrade", "--installation-cleanup", "--loopback-headers", "--transfer-sequence", "--empty-transfers",
       "--terminal-memory", "--terminal-unicode", "--terminal-accessibility", "--history-retention",
       "--preference-persistence", "--demo-stores", "--osc-parser", "--terminal-safety", "--terminal-paste", "--conpty-backpressure", "--scan-lifecycle",
       "--scan-presentation", "--menu-separators", "--startup-fade", "--release-ui", "--scan-options-ui",
@@ -33,6 +33,7 @@
       "--terminal-memory-child": "Child process started by --terminal-memory.",
       "--history-writer": "Child process started by --history-retention.",
       "--profile-lock-child": "Child process started by --preference-persistence and terminated while holding a lease.",
+      "--survey-phase": "Child process started by --survey to check fresh-process persistence.",
       "--observe-writer": "Child process started by --locations.",
       "--import-then-die": "Child process started by --locations, which kills itself mid-import.",
       "---": "Not a flag: a table-separator string in a check."