diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2e973aa..d60d726 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -161,18 +161,13 @@ jobs:
           schtasks /Delete /TN "ThreadPilot_Startup" /F >nul 2>&1
           reg delete "HKCU\Software\Microsoft\Windows\CurrentVersion\Run" /v "ThreadPilot" /f >nul 2>&1
 
-          echo [3/4] Optional user data cleanup...
-          set "REMOVE_DATA=N"
-          set /p REMOVE_DATA=Do you want to remove user settings at "%APPDATA%\ThreadPilot"? [y/N]:
-          if /I "%REMOVE_DATA%"=="Y" (
-            if exist "%APPDATA%\ThreadPilot" (
-              rd /s /q "%APPDATA%\ThreadPilot"
-              echo User settings removed.
-            ) else (
-              echo No user settings folder found.
-            )
+          echo [3/4] Removing ThreadPilot user data for this Windows account...
+          rem Full uninstall removes only ThreadPilot-owned per-user AppData. Normal install/update paths never run this script.
+          if exist "%APPDATA%\ThreadPilot" (
+            rd /s /q "%APPDATA%\ThreadPilot"
+            echo ThreadPilot user data removed.
           ) else (
-            echo User settings were kept.
+            echo No ThreadPilot user data folder found.
           )
 
           echo [4/4] Scheduling app folder removal...
diff --git a/App.xaml.cs b/App.xaml.cs
index 4916d2a..06dc022 100644
--- a/App.xaml.cs
+++ b/App.xaml.cs
@@ -63,50 +63,22 @@ public App()
         protected override void OnStartup(StartupEventArgs e)
         {
             // Parse command line arguments early so special startup modes can short-circuit normal flow.
-            bool startMinimized = false;
-            bool isAutostart = false;
-            bool isSmokeTest = false;
-            bool registerLaunchTask = false;
-            bool launchedViaTask = false;
-#if DEBUG
-            bool isTestMode = false;
-#endif
+            var startupMode = StartupMode.Parse(e.Args);
             bool effectiveStartMinimized = false;
             ApplicationSettingsModel? loadedSettings = null;
 
-            foreach (var arg in e.Args)
+            effectiveStartMinimized = startupMode.StartMinimized;
+
+            if (startupMode.IsSmokeTest)
             {
-                switch (arg.ToLowerInvariant())
-                {
-#if DEBUG
-                    case "--test":
-                        isTestMode = true;
-                        break;
-#endif
-                    case "--smoke-test":
-                        isSmokeTest = true;
-                        break;
-                    case "--start-minimized":
-                        startMinimized = true;
-                        break;
-                    case "--autostart":
-                        isAutostart = true;
-                        break;
-                    case "--startup": // Alternative startup argument
-                        isAutostart = true;
-                        startMinimized = true;
-                        break;
-                    case RegisterLaunchTaskArgument:
-                        registerLaunchTask = true;
-                        break;
-                    case LaunchedViaTaskArgument:
-                        launchedViaTask = true;
-                        break;
-                }
+                var smokeLogger = this.ServiceProvider.GetRequiredService<ILogger<App>>();
+                var smokeTestResult = this.RunSmokeTestWithTimeout(smokeLogger, TimeSpan.FromSeconds(10));
+                Environment.ExitCode = smokeTestResult;
+                this.Shutdown(smokeTestResult);
+                Environment.Exit(smokeTestResult);
+                return;
             }
 
-            effectiveStartMinimized = startMinimized;
-
             // Set up global exception handlers first
             AppDomain.CurrentDomain.UnhandledException += this.OnUnhandledException;
             this.DispatcherUnhandledException += this.OnDispatcherUnhandledException;
@@ -130,14 +102,14 @@ protected override void OnStartup(StartupEventArgs e)
             }
             else
             {
-                if (launchedViaTask)
+                if (startupMode.LaunchedViaTask)
                 {
                     logger.LogError("Application was launched via managed task marker but is still not elevated.");
                 }
 #if DEBUG
-                else if (!isSmokeTest && !isTestMode)
+                else if (!startupMode.IsTestMode)
 #else
-                else if (!isSmokeTest)
+                else
 #endif
                 {
                     var launchedElevatedInstance = Task.Run(async () => await elevatedTaskService.TryRunLaunchTaskAsync()).GetAwaiter().GetResult();
@@ -148,7 +120,7 @@ protected override void OnStartup(StartupEventArgs e)
                         return;
                     }
 
-                    if (!registerLaunchTask)
+                    if (!startupMode.RegisterLaunchTask)
                     {
                         logger.LogInformation("Managed elevated launch task is unavailable. Requesting one-time elevation to bootstrap persistent launch.");
                         var restartInitiated = Task.Run(async () => await elevationService.RestartWithElevation(new[] { RegisterLaunchTaskArgument })).GetAwaiter().GetResult();
@@ -160,9 +132,9 @@ protected override void OnStartup(StartupEventArgs e)
                 }
 
 #if DEBUG
-                if (!isSmokeTest && !isTestMode)
+                if (!startupMode.IsTestMode)
 #else
-                if (!isSmokeTest)
+                if (true)
 #endif
                 {
                     logger.LogError("ThreadPilot requires administrator privileges and cannot continue without elevation.");
@@ -170,33 +142,28 @@ protected override void OnStartup(StartupEventArgs e)
                     this.Shutdown(1);
                     return;
                 }
-
-                logger.LogWarning("Application is running without administrator privileges in smoke test mode.");
             }
 
             // Enforce single-instance after elevation bootstrap logic to avoid mutex races during handoff.
-            if (!isSmokeTest)
+            bool createdNew;
+            this.singleInstanceMutex = new Mutex(initiallyOwned: true, name: "Global\\ThreadPilot_SingleInstance", createdNew: out createdNew);
+            if (!createdNew)
             {
-                bool createdNew;
-                this.singleInstanceMutex = new Mutex(initiallyOwned: true, name: "Global\\ThreadPilot_SingleInstance", createdNew: out createdNew);
-                if (!createdNew)
-                {
-                    System.Windows.MessageBox.Show(
-                        "ThreadPilot is already running.",
-                        "Instance already open",
-                        MessageBoxButton.OK,
-                        MessageBoxImage.Information);
+                System.Windows.MessageBox.Show(
+                    "ThreadPilot is already running.",
+                    "Instance already open",
+                    MessageBoxButton.OK,
+                    MessageBoxImage.Information);
 
-                    this.Shutdown();
-                    return;
-                }
+                this.Shutdown();
+                return;
             }
 
             base.OnStartup(e);
 
             // Check for test mode
 #if DEBUG
-            if (isTestMode)
+            if (startupMode.IsTestMode)
             {
                 // Run in console test mode
                 AllocConsole();
@@ -209,13 +176,6 @@ protected override void OnStartup(StartupEventArgs e)
             }
 #endif
 
-            if (isSmokeTest)
-            {
-                var smokeTestResult = Task.Run(async () => await this.RunSmokeTestAsync(logger)).GetAwaiter().GetResult();
-                this.Shutdown(smokeTestResult);
-                return;
-            }
-
             try
             {
                 var settingsService = this.ServiceProvider.GetRequiredService<IApplicationSettingsService>();
@@ -226,7 +186,7 @@ protected override void OnStartup(StartupEventArgs e)
                 var settings = settingsService.Settings;
                 loadedSettings = settings;
                 localizationService.ApplyLanguage(settings.Language);
-                effectiveStartMinimized = startMinimized || settings.StartMinimized;
+                effectiveStartMinimized = startupMode.StartMinimized || settings.StartMinimized;
                 var useDarkTheme = settings.HasUserThemePreference
                     ? settings.UseDarkTheme
                     : themeService.GetSystemUsesDarkTheme();
@@ -258,7 +218,7 @@ protected override void OnStartup(StartupEventArgs e)
                     throw new InvalidOperationException("MainWindow could not be created");
                 }
 
-                var startupWindowBehavior = StartupWindowBehavior.Resolve(isAutostart, effectiveStartMinimized);
+                var startupWindowBehavior = StartupWindowBehavior.Resolve(startupMode.IsAutostart, effectiveStartMinimized);
                 var showStartupSuggestion = loadedSettings != null
                     && StartupMinimizedSuggestionPolicy.ShouldShow(loadedSettings, startupWindowBehavior);
                 mainWindow.ConfigureStartupMode(
@@ -301,16 +261,33 @@ protected override void OnStartup(StartupEventArgs e)
             }
         }
 
-        private async Task<int> RunSmokeTestAsync(ILogger logger)
+        private int RunSmokeTestWithTimeout(ILogger logger, TimeSpan timeout)
+        {
+            var smokeTestTask = Task.Run(() => this.RunSmokeTest(logger));
+            if (smokeTestTask.Wait(timeout))
+            {
+                return smokeTestTask.GetAwaiter().GetResult();
+            }
+
+            logger.LogError("ThreadPilot smoke test timed out after {TimeoutSeconds} seconds", timeout.TotalSeconds);
+            return 2;
+        }
+
+        private int RunSmokeTest(ILogger logger)
         {
             try
             {
                 logger.LogInformation("Starting ThreadPilot smoke test");
 
-                var settingsService = this.ServiceProvider.GetRequiredService<IApplicationSettingsService>();
-                await settingsService.LoadSettingsAsync().ConfigureAwait(false);
-                _ = this.ServiceProvider.GetRequiredService<ProcessViewModel>();
-                _ = this.ServiceProvider.GetRequiredService<PowerPlanViewModel>();
+                _ = this.ServiceProvider.GetRequiredService<ILoggerFactory>();
+                _ = this.ServiceProvider.GetRequiredService<IApplicationSettingsService>();
+                _ = this.ServiceProvider.GetRequiredService<IThemeService>();
+                _ = this.ServiceProvider.GetRequiredService<ILocalizationService>();
+
+                if (!System.IO.Directory.Exists(AppContext.BaseDirectory))
+                {
+                    throw new InvalidOperationException("Application base directory was not found.");
+                }
 
                 logger.LogInformation("ThreadPilot smoke test completed successfully");
                 return 0;
@@ -322,6 +299,55 @@ private async Task<int> RunSmokeTestAsync(ILogger logger)
             }
         }
 
+        private readonly struct StartupMode
+        {
+            public bool StartMinimized { get; init; }
+
+            public bool IsAutostart { get; init; }
+
+            public bool IsSmokeTest { get; init; }
+
+            public bool RegisterLaunchTask { get; init; }
+
+            public bool LaunchedViaTask { get; init; }
+
+            public bool IsTestMode { get; init; }
+
+            public static StartupMode Parse(IEnumerable<string> args)
+            {
+                var mode = default(StartupMode);
+                foreach (var arg in args)
+                {
+                    switch (arg.ToLowerInvariant())
+                    {
+                        case "--test":
+                            mode = mode with { IsTestMode = true };
+                            break;
+                        case "--smoke-test":
+                            mode = mode with { IsSmokeTest = true };
+                            break;
+                        case "--start-minimized":
+                            mode = mode with { StartMinimized = true };
+                            break;
+                        case "--autostart":
+                            mode = mode with { IsAutostart = true };
+                            break;
+                        case "--startup":
+                            mode = mode with { IsAutostart = true, StartMinimized = true };
+                            break;
+                        case RegisterLaunchTaskArgument:
+                            mode = mode with { RegisterLaunchTask = true };
+                            break;
+                        case LaunchedViaTaskArgument:
+                            mode = mode with { LaunchedViaTask = true };
+                            break;
+                    }
+                }
+
+                return mode;
+            }
+        }
+
         protected override void OnExit(ExitEventArgs e)
         {
             AppDomain.CurrentDomain.UnhandledException -= this.OnUnhandledException;
diff --git a/Installer/Installer.iss b/Installer/Installer.iss
index 622de70..a17973c 100644
--- a/Installer/Installer.iss
+++ b/Installer/Installer.iss
@@ -5,7 +5,7 @@
 #define MyAppPublisher "ThreadPilot"
 #define MyAppURL "https://github.com/"
 #define MyAppExeName "ThreadPilot.exe"
-#define MyAppVersion "1.3.0"
+#define MyAppVersion "1.4.0"
 
 #ifndef MyWizardStyle
   #define MyWizardStyle "modern dynamic windows11"
@@ -20,7 +20,7 @@
 AppId={{A2A4C8B5-4A9A-4B1B-93F4-5F8B1C7E8C2A}
 AppName={#MyAppName}
 AppVersion={#MyAppVersion}
-AppVerName={#MyAppName} {#MyAppVersion}
+AppVerName={#MyAppName}
 AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
@@ -54,7 +54,15 @@ Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: de
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
 
 [UninstallRun]
-Filename: taskkill.exe; Parameters: "/IM '{#MyAppExeName}' /F"; Flags: runhidden waituntilterminated; RunOnceId: UninstallKill
+Filename: "taskkill.exe"; Parameters: "/IM ""{#MyAppExeName}"" /F"; Flags: runhidden waituntilterminated; RunOnceId: "UninstallKill"
+Filename: "schtasks.exe"; Parameters: "/Delete /TN ""ThreadPilot_Startup"" /F"; Flags: runhidden waituntilterminated; RunOnceId: "UninstallRemoveThreadPilotStartupTask"
+Filename: "reg.exe"; Parameters: "delete ""HKCU\Software\Microsoft\Windows\CurrentVersion\Run"" /v ""ThreadPilot"" /f"; Flags: runhidden waituntilterminated; RunOnceId: "UninstallRemoveThreadPilotRunEntry"
+
+; ThreadPilot user data is preserved during install/update and removed only when
+; the generated uninstaller runs. Per-user AppData cleanup is limited to the
+; account context used by uninstall.
+[UninstallDelete]
+Type: filesandordirs; Name: "{userappdata}\ThreadPilot"
 
 [Code]
 
diff --git a/Installer/ThreadPilot.wxs b/Installer/ThreadPilot.wxs
index b72c9fe..8bcf6f1 100644
--- a/Installer/ThreadPilot.wxs
+++ b/Installer/ThreadPilot.wxs
@@ -7,7 +7,7 @@
   <Package
       Name="ThreadPilot"
       Manufacturer="Prime Build"
-      Version="1.3.0.0"
+      Version="1.4.0.0"
       UpgradeCode="PUT-GENERATED-UPGRADE-CODE-HERE"
       Language="1033">
     <SummaryInformation Description="ThreadPilot MSI template" />
diff --git a/Installer/setup.iss b/Installer/setup.iss
index 25a2870..7fbed61 100644
--- a/Installer/setup.iss
+++ b/Installer/setup.iss
@@ -11,7 +11,7 @@
 #endif
 
 #ifndef MyAppVersion
-	#define MyAppVersion "1.3.0"
+	#define MyAppVersion "1.4.0"
 #endif
 
 #ifndef MyAppSourceDir
@@ -22,7 +22,7 @@
 AppId={{E8F7A3B2-5C4D-4E6F-8A9B-1C2D3E4F5A6B}
 AppName={#MyAppName}
 AppVersion={#MyAppVersion}
-AppVerName={#MyAppName} {#MyAppVersion}
+AppVerName={#MyAppName}
 AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}/issues
@@ -62,3 +62,49 @@ Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
 Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
 
 ; Intentionally do not auto-launch after setup to keep package-manager installs unattended.
+; ThreadPilot user data is preserved during install/update. Inno removes installed
+; files and shortcuts automatically only when the generated uninstaller runs.
+; Per-user AppData cleanup is limited to the account context used by uninstall.
+[UninstallRun]
+Filename: "taskkill.exe"; Parameters: "/IM ""{#MyAppExeName}"" /F"; Flags: runhidden waituntilterminated; RunOnceId: "UninstallKillThreadPilot"
+Filename: "schtasks.exe"; Parameters: "/Delete /TN ""ThreadPilot_Startup"" /F"; Flags: runhidden waituntilterminated; RunOnceId: "UninstallRemoveThreadPilotStartupTask"
+Filename: "reg.exe"; Parameters: "delete ""HKCU\Software\Microsoft\Windows\CurrentVersion\Run"" /v ""ThreadPilot"" /f"; Flags: runhidden waituntilterminated; RunOnceId: "UninstallRemoveThreadPilotRunEntry"
+
+[UninstallDelete]
+Type: filesandordirs; Name: "{userappdata}\ThreadPilot"
+
+[Code]
+const
+  LegacyBetaUninstallKey = 'Software\Microsoft\Windows\CurrentVersion\Uninstall\{A2A4C8B5-4A9A-4B1B-93F4-5F8B1C7E8C2A}_is1';
+  LegacyBetaDisplayName = 'ThreadPilot 0.1.0-beta';
+
+function IsLegacyThreadPilotInstallPath(InstallLocation: string): Boolean;
+var
+  NormalizedLocation: string;
+  ExpectedInstallRoot: string;
+begin
+  NormalizedLocation := Lowercase(RemoveBackslashUnlessRoot(RemoveQuotes(InstallLocation)));
+  ExpectedInstallRoot := Lowercase(RemoveBackslashUnlessRoot(ExpandConstant('{autopf}\ThreadPilot')));
+  Result := (NormalizedLocation = ExpectedInstallRoot);
+end;
+
+procedure DeleteLegacyBetaUninstallEntry(RootKey: Integer);
+var
+  DisplayName: string;
+  InstallLocation: string;
+begin
+  if RegQueryStringValue(RootKey, LegacyBetaUninstallKey, 'DisplayName', DisplayName) and
+     RegQueryStringValue(RootKey, LegacyBetaUninstallKey, 'InstallLocation', InstallLocation) and
+     (DisplayName = LegacyBetaDisplayName) and
+     IsLegacyThreadPilotInstallPath(InstallLocation) then
+  begin
+    RegDeleteKeyIncludingSubkeys(RootKey, LegacyBetaUninstallKey);
+  end;
+end;
+
+function InitializeSetup(): Boolean;
+begin
+  DeleteLegacyBetaUninstallEntry(HKLM);
+  DeleteLegacyBetaUninstallEntry(HKCU);
+  Result := True;
+end;
diff --git a/Locales/en-US.xaml b/Locales/en-US.xaml
index 41967ab..e2bc6fd 100644
--- a/Locales/en-US.xaml
+++ b/Locales/en-US.xaml
@@ -30,6 +30,12 @@
     <sys:String x:Key="MainWindow_Recommended">Recommended</sys:String>
     <sys:String x:Key="MainWindow_DontShowAgain">Don't show again</sys:String>
     <sys:String x:Key="MainWindow_OpenSettings">Open Settings</sys:String>
+    <sys:String x:Key="MainWindow_PrimaryNavigation">Primary navigation</sys:String>
+    <sys:String x:Key="MainWindow_ElevationWarningOverlay">Elevation warning overlay</sys:String>
+    <sys:String x:Key="MainWindow_PerformanceIntroductionOverlay">Performance introduction overlay</sys:String>
+    <sys:String x:Key="MainWindow_StartupMinimizedSuggestion">Startup minimized suggestion</sys:String>
+    <sys:String x:Key="MainWindow_UnsavedSettingsDialog">Unsaved settings dialog</sys:String>
+    <sys:String x:Key="MainWindow_LoadingOverlay">Application startup loading overlay</sys:String>
     
     <!-- LogViewerView -->
     <sys:String x:Key="LogViewerView_Title">ThreadPilot Activity</sys:String>
@@ -94,10 +100,13 @@
     <sys:String x:Key="MasksView_DeleteTooltip">Delete selected mask</sys:String>
     <sys:String x:Key="MasksView_CpusHeader">CPUs</sys:String>
     <sys:String x:Key="MasksView_Cpu">CPU</sys:String>
+    <sys:String x:Key="MasksView_Options">Mask Options</sys:String>
 
     <!-- PerformanceView -->
     <sys:String x:Key="PerformanceView_OptionalDiagnostics">Optional Diagnostics</sys:String>
     <sys:String x:Key="PerformanceView_DiagnosticsDesc">Diagnostics are optional and intended for troubleshooting. For in-game overlays and detailed performance graphs, use dedicated tools.</sys:String>
+    <sys:String x:Key="PerformanceView_DiagnosticsDesc1">Diagnostics are optional and intended for troubleshooting.</sys:String>
+    <sys:String x:Key="PerformanceView_DiagnosticsDesc2">For in-game overlays and detailed performance graphs, use dedicated tools.</sys:String>
     <sys:String x:Key="PerformanceView_QuickTips">Quick tips:</sys:String>
     <sys:String x:Key="PerformanceView_Tip1">1. Open diagnostics only when you need a focused troubleshooting snapshot.</sys:String>
     <sys:String x:Key="PerformanceView_Tip2">2. Review hotspots only as a hint before creating automation rules.</sys:String>
@@ -128,6 +137,12 @@
     <sys:String x:Key="PerformanceView_RefreshTooltip">Refresh the current dashboard snapshot</sys:String>
     
     <sys:String x:Key="PerformanceView_GlobalPowerPlan">Global Power Plan</sys:String>
+    <sys:String x:Key="PerformanceView_ProcessHotspots">Process Hotspots</sys:String>
+    <sys:String x:Key="PerformanceView_Filter">Filter</sys:String>
+    <sys:String x:Key="PerformanceView_Memory">Memory</sys:String>
+    <sys:String x:Key="PerformanceView_Name">Name</sys:String>
+    <sys:String x:Key="PerformanceView_Priority">Priority</sys:String>
+    <sys:String x:Key="PerformanceView_Window">Window</sys:String>
     <sys:String x:Key="PerformanceView_MemoryUsed">Memory Used</sys:String>
     <sys:String x:Key="PerformanceView_CpuPercent">CPU %</sys:String>
     <sys:String x:Key="PerformanceView_MemPercent">Mem %</sys:String>
@@ -180,6 +195,7 @@
     <sys:String x:Key="ProcessPowerPlanAssociationView_RuleCpuMask">Rule CPU Mask:</sys:String>
     <sys:String x:Key="ProcessPowerPlanAssociationView_RuleCpuMaskHelp">Optional: Select a CPU mask to apply when this process starts</sys:String>
     <sys:String x:Key="ProcessPowerPlanAssociationView_RulePriority">Rule Priority</sys:String>
+    <sys:String x:Key="ProcessPowerPlanAssociationView_Update">Update</sys:String>
     <sys:String x:Key="ProcessPowerPlanAssociationView_RulePriorityHelp">Optional: Select the process priority to apply when this process starts</sys:String>
     <sys:String x:Key="ProcessPowerPlanAssociationView_AssociationPriority">Association Priority:</sys:String>
     <sys:String x:Key="ProcessPowerPlanAssociationView_AssociationPriorityHelp">Higher priority associations take precedence when multiple match</sys:String>
@@ -206,6 +222,7 @@
     <sys:String x:Key="ProcessPowerPlanAssociationView_SaveConfig">Save Configuration</sys:String>
     <sys:String x:Key="ProcessPowerPlanAssociationView_NoRules">No automation rules yet</sys:String>
     <sys:String x:Key="ProcessPowerPlanAssociationView_Status">Status:</sys:String>
+    <sys:String x:Key="ProcessPowerPlanAssociationView_AutomationMonitoring">Automation Monitoring</sys:String>
     <sys:String x:Key="ProcessPowerPlanAssociationView_StartAutomation">Start Automation Monitoring</sys:String>
     <sys:String x:Key="ProcessPowerPlanAssociationView_StopAutomation">Stop Automation Monitoring</sys:String>
     
@@ -226,6 +243,7 @@
     <sys:String x:Key="ProcessView_Title">Process Management</sys:String>
     <sys:String x:Key="ProcessView_Subtitle">Search, filter, and control active process configurations</sys:String>
     <sys:String x:Key="ProcessView_SearchPlaceholder">Search processes by name</sys:String>
+    <sys:String x:Key="ProcessView_SearchAutomationName">Process search</sys:String>
     <sys:String x:Key="ProcessView_HideSystem">Hide Windows system processes</sys:String>
     <sys:String x:Key="ProcessView_HideSystemShort">Hide System Processes</sys:String>
     <sys:String x:Key="ProcessView_HideLowCpu">Hide processes with very low CPU usage</sys:String>
@@ -276,7 +294,11 @@
     <sys:String x:Key="ProcessView_RefreshTooltip">Refresh the process list</sys:String>
     <sys:String x:Key="ProcessView_LoadMore">Load More</sys:String>
     <sys:String x:Key="ProcessView_LoadMoreTooltip">Load more processes</sys:String>
-    
+    <sys:String x:Key="ProcessView_RefreshAutomationName">Refresh processes</sys:String>
+    <sys:String x:Key="ProcessView_LoadMoreAutomationName">Load more processes</sys:String>
+    <sys:String x:Key="ProcessView_RunningListAutomationName">Running process list</sys:String>
+    <sys:String x:Key="ProcessView_RunningListAutomationHelp">Virtualized process table with sorting and selection</sys:String>
+
     <sys:String x:Key="ProcessView_ColProcessName">Process Name</sys:String>
     <sys:String x:Key="ProcessView_ColWindowTitle">Window Title</sys:String>
     <sys:String x:Key="ProcessView_ColCpuUsage">CPU Usage</sys:String>
@@ -294,6 +316,32 @@
     <sys:String x:Key="ProcessView_ApplyPendingSettings">Apply Pending Settings</sys:String>
     <sys:String x:Key="ProcessView_ApplyPendingSettingsTooltip">Apply the pending affinity and selected power plan to the selected process</sys:String>
     <sys:String x:Key="ProcessView_RulesAppliedOnlyWhenConfigured">Rules and changes are applied by ThreadPilot only when configured.</sys:String>
+    <sys:String x:Key="ProcessView_CurrentProcessStatus">Current process status</sys:String>
+    <sys:String x:Key="ProcessView_AdvancedAffinityPicker">Advanced affinity picker</sys:String>
+    <sys:String x:Key="ProcessView_RowMaskTooltip">Select the pending mask for row context-menu affinity actions</sys:String>
+    <sys:String x:Key="ProcessView_SelectedPowerPlan">Selected power plan</sys:String>
+    <sys:String x:Key="ProcessView_SaveAsRule">Save as Rule</sys:String>
+    <sys:String x:Key="ProcessView_NoVisibleWindowTitle">No visible window title</sys:String>
+    <sys:String x:Key="ProcessView_BatchLabel">Batch </sys:String>
+    <sys:String x:Key="ProcessView_TotalSuffix"> total)</sys:String>
+    <sys:String x:Key="ProcessView_PriorityInlineLabel">  Priority </sys:String>
+    <sys:String x:Key="ProcessSummary_CpuUnavailable">CPU: unavailable</sys:String>
+    <sys:String x:Key="ProcessSummary_MemoryUnavailable">Memory: unavailable</sys:String>
+    <sys:String x:Key="ProcessSummary_CpuPriorityUnavailable">CPU priority: unavailable</sys:String>
+    <sys:String x:Key="ProcessSummary_MemoryPriorityUnavailable">Memory priority unavailable</sys:String>
+    <sys:String x:Key="ProcessSummary_AffinityUnavailable">Affinity: unavailable</sys:String>
+    <sys:String x:Key="ProcessSummary_NoSavedRule">No saved rule</sys:String>
+    <sys:String x:Key="ProcessSummary_NoRecentAction">No recent ThreadPilot action</sys:String>
+    <sys:String x:Key="ProcessSummary_SelectedProcessFormat">Selected process: {0} (PID {1})</sys:String>
+    <sys:String x:Key="ProcessSummary_StatusProtected">Current process status: protected or access denied</sys:String>
+    <sys:String x:Key="ProcessSummary_StatusSelected">Current process status: selected</sys:String>
+    <sys:String x:Key="ProcessSummary_CpuFormat">CPU: {0:N1}%</sys:String>
+    <sys:String x:Key="ProcessSummary_MemoryFormat">Memory: {0}</sys:String>
+    <sys:String x:Key="ProcessSummary_CpuPriorityFormat">CPU priority: {0}</sys:String>
+    <sys:String x:Key="ProcessSummary_AffinityLegacyFormat">Affinity: legacy mask 0x{0:X}</sys:String>
+    <sys:String x:Key="ProcessSummary_MemoryPriorityFormat">Memory priority: {0}</sys:String>
+    <sys:String x:Key="ProcessSummary_SavedRuleFallback">saved rule</sys:String>
+    <sys:String x:Key="ProcessSummary_SavedRuleExistsFormat">Saved rule exists: {0}</sys:String>
     
     <sys:String x:Key="ProcessView_PriorityAboveNormal">Above Normal</sys:String>
     <sys:String x:Key="ProcessView_PriorityBelowNormal">Below Normal</sys:String>
@@ -388,6 +436,12 @@
     <sys:String x:Key="SettingsView_Translator">Translator: Ylimhs</sys:String>
     <sys:String x:Key="SettingsView_License">License: AGPLv3</sys:String>
     <sys:String x:Key="SettingsView_CheckUpdates">Check for updates</sys:String>
+    <sys:String x:Key="SettingsView_DownloadInstallUpdate">Download and install update</sys:String>
+    <sys:String x:Key="SettingsView_EnableAutomaticUpdateChecks">Check automatically on startup</sys:String>
+    <sys:String x:Key="SettingsView_UpdateIntervalDays">Check interval (days):</sys:String>
+    <sys:String x:Key="SettingsView_IncludePrereleaseUpdates">Include prerelease updates</sys:String>
+    <sys:String x:Key="SettingsView_LatestVersion">Latest version:</sys:String>
+    <sys:String x:Key="SettingsView_LastUpdateCheck">Last checked:</sys:String>
     <sys:String x:Key="SettingsView_UpdatesDescription">Checks on demand using the official GitHub Releases.</sys:String>
     
     <sys:String x:Key="SettingsView_ResetDefaults">Reset to Defaults</sys:String>
@@ -395,6 +449,55 @@
     <sys:String x:Key="SettingsView_ImportConfig">Import Configuration</sys:String>
     <sys:String x:Key="SettingsView_SaveSettings">Save Settings</sys:String>
     <sys:String x:Key="SettingsView_ThreadPilot">ThreadPilot</sys:String>
+    <sys:String x:Key="Settings_StatusThemeChangedFormat">Theme changed to {0}.</sys:String>
+    <sys:String x:Key="Settings_StatusThemeChangeFailedFormat">Failed to change theme to {0}.</sys:String>
+    <sys:String x:Key="Settings_StatusLanguageChangedFormat">Language changed to {0}.</sys:String>
+    <sys:String x:Key="Settings_StatusLanguageChangeFailed">Failed to change language.</sys:String>
+    <sys:String x:Key="Settings_StatusSaving">Saving settings...</sys:String>
+    <sys:String x:Key="Settings_StatusSavedWarningsFormat">Settings saved with warnings: {0}</sys:String>
+    <sys:String x:Key="Settings_StatusSavedApplied">Settings saved and applied successfully.</sys:String>
+    <sys:String x:Key="Settings_StatusErrorSavingFormat">Error saving settings: {0}</sys:String>
+    <sys:String x:Key="Settings_StatusResetting">Resetting to defaults...</sys:String>
+    <sys:String x:Key="Settings_StatusResetPending">Settings reset to defaults (not saved yet)</sys:String>
+    <sys:String x:Key="Settings_StatusErrorResettingFormat">Error resetting settings: {0}</sys:String>
+    <sys:String x:Key="Settings_StatusExporting">Exporting configuration bundle...</sys:String>
+    <sys:String x:Key="Settings_StatusExportCanceled">Export canceled</sys:String>
+    <sys:String x:Key="Settings_StatusExportedFormat">Configuration exported to: {0}</sys:String>
+    <sys:String x:Key="Settings_StatusErrorExportingFormat">Error exporting settings: {0}</sys:String>
+    <sys:String x:Key="Settings_StatusImporting">Importing configuration...</sys:String>
+    <sys:String x:Key="Settings_StatusImportCanceled">Import canceled</sys:String>
+    <sys:String x:Key="Settings_StatusImportedApplied">Configuration bundle imported and applied</sys:String>
+    <sys:String x:Key="Settings_StatusLegacyImported">Legacy settings imported (rules unchanged)</sys:String>
+    <sys:String x:Key="Settings_StatusErrorImportingFormat">Error importing settings: {0}</sys:String>
+    <sys:String x:Key="Settings_StatusTestSent">Test notification sent</sys:String>
+    <sys:String x:Key="Settings_StatusErrorTestFormat">Error sending test notification: {0}</sys:String>
+    <sys:String x:Key="Settings_StatusLoading">Loading settings...</sys:String>
+    <sys:String x:Key="Settings_StatusLoaded">Settings loaded</sys:String>
+    <sys:String x:Key="Settings_StatusErrorLoadingFormat">Error loading settings: {0}</sys:String>
+    <sys:String x:Key="Settings_StatusSynchronized">Settings synchronized</sys:String>
+    <sys:String x:Key="Settings_StatusCheckingUpdates">Checking for updates...</sys:String>
+    <sys:String x:Key="Settings_StatusLatestUnknown">Unable to determine the latest version.</sys:String>
+    <sys:String x:Key="Settings_StatusNewVersionFormat">New version available: {0}</sys:String>
+    <sys:String x:Key="Settings_StatusUpToDateFormat">Application is up to date. Installed version: {0}</sys:String>
+    <sys:String x:Key="Settings_StatusUpdateErrorFormat">Error while checking updates: {0}</sys:String>
+    <sys:String x:Key="Settings_UpdateLatestUnknown">Unknown</sys:String>
+    <sys:String x:Key="Settings_UpdateNotChecked">Not checked</sys:String>
+    <sys:String x:Key="Settings_UpdateLastCheckedNever">Never</sys:String>
+    <sys:String x:Key="Settings_UpdateConfirmTitle">Install ThreadPilot update</sys:String>
+    <sys:String x:Key="Settings_UpdateConfirmMessageFormat">ThreadPilot will download and verify version {0}, then ask Windows for permission to run the installer. Continue?</sys:String>
+    <sys:String x:Key="Settings_StatusUpdateCanceled">Update canceled.</sys:String>
+    <sys:String x:Key="Settings_StatusDownloadingUpdate">Downloading and verifying update...</sys:String>
+    <sys:String x:Key="Settings_StatusUpdateInstallerStarted">Update installer started.</sys:String>
+    <sys:String x:Key="Settings_StatusUpdateInstallFailedFormat">Update install failed: {0}</sys:String>
+    <sys:String x:Key="Settings_StatusModified">Settings have been modified</sys:String>
+    <sys:String x:Key="Settings_StatusMatchSaved">Settings match the saved configuration</sys:String>
+    <sys:String x:Key="Settings_LanguageSimplifiedChinese">Simplified Chinese</sys:String>
+    <sys:String x:Key="Settings_LanguageEnglish">English</sys:String>
+    <sys:String x:Key="Settings_ThemeDark">Dark</sys:String>
+    <sys:String x:Key="Settings_ThemeLight">Light</sys:String>
+    <sys:String x:Key="Settings_DialogExportTitle">Export ThreadPilot Configuration</sys:String>
+    <sys:String x:Key="Settings_DialogImportTitle">Import ThreadPilot Configuration</sys:String>
+    <sys:String x:Key="Settings_WarningAutostartFailed">Failed to update Windows autostart. Keeping previous autostart state.</sys:String>
 
     <!-- SettingsWindow -->
     <sys:String x:Key="SettingsWindow_Title">ThreadPilot Settings</sys:String>
@@ -509,7 +612,30 @@
     <sys:String x:Key="Notification_GameBoostDeactivatedFormat">Game Boost mode deactivated after {0}</sys:String>
     <sys:String x:Key="Notification_ProcessMonitorErrorTitle">Process Monitor Error</sys:String>
     <sys:String x:Key="Notification_AffinityBlockedTitle">Affinity blocked</sys:String>
+    <sys:String x:Key="Notification_AffinityAppliedTitle">Affinity applied</sys:String>
+    <sys:String x:Key="Notification_AffinityAdjustedTitle">Affinity adjusted</sys:String>
+    <sys:String x:Key="Notification_AffinityFailedTitle">Affinity failed</sys:String>
+    <sys:String x:Key="Notification_AffinityErrorTitle">Affinity error</sys:String>
     <sys:String x:Key="Notification_PriorityBlockedTitle">Priority blocked</sys:String>
+    <sys:String x:Key="Notification_PriorityWarningTitle">Priority warning</sys:String>
+    <sys:String x:Key="Notification_PriorityAppliedTitle">Priority applied</sys:String>
+    <sys:String x:Key="Notification_PriorityAdjustedTitle">Priority adjusted</sys:String>
+    <sys:String x:Key="Notification_PriorityErrorTitle">Priority error</sys:String>
+    <sys:String x:Key="Notification_KeyboardShortcutTitle">Keyboard Shortcut</sys:String>
+    <sys:String x:Key="Notification_ToggleMonitoringShortcut">Toggle monitoring shortcut activated</sys:String>
+    <sys:String x:Key="Notification_HighPerformanceShortcut">High Performance power plan shortcut activated</sys:String>
+    <sys:String x:Key="Notification_RefreshProcessListShortcut">Refresh process list shortcut activated</sys:String>
+    <sys:String x:Key="Notification_ThreadPilotStartedTitle">ThreadPilot Started</sys:String>
+    <sys:String x:Key="Notification_ThreadPilotStartedMessage">Process monitoring and power plan management is now active</sys:String>
+    <sys:String x:Key="Notification_StartupErrorTitle">Startup Error</sys:String>
+    <sys:String x:Key="Notification_ProcessMonitoringStartFailed">Failed to start process monitoring manager</sys:String>
+    <sys:String x:Key="Notification_AutomationMonitoringErrorTitle">Automation Monitoring Error</sys:String>
+    <sys:String x:Key="Notification_SettingsSavedTitle">Settings Saved</sys:String>
+    <sys:String x:Key="Notification_SettingsSavedMessage">Application settings have been saved successfully</sys:String>
+    <sys:String x:Key="Notification_SettingsSavedWarningsTitle">Settings Saved with Warnings</sys:String>
+    <sys:String x:Key="Notification_SettingsErrorTitle">Settings Error</sys:String>
+    <sys:String x:Key="Notification_SettingsSaveFailed">Failed to save settings</sys:String>
+    <sys:String x:Key="Notification_TestNotificationMessage">This is a test notification to verify your settings are working correctly.</sys:String>
 
     <!-- Elevation Service -->
     <sys:String x:Key="Elevation_RequestPromptText">ThreadPilot requires administrator privileges to manage process affinity and power plans.&#x0a;&#x0a;Would you like to restart the application with administrator privileges?</sys:String>
diff --git a/Locales/zh-CN.xaml b/Locales/zh-CN.xaml
index 3a9ce20..d3cc1fa 100644
--- a/Locales/zh-CN.xaml
+++ b/Locales/zh-CN.xaml
@@ -30,6 +30,12 @@
     <sys:String x:Key="MainWindow_Recommended">推荐</sys:String>
     <sys:String x:Key="MainWindow_DontShowAgain">不再显示</sys:String>
     <sys:String x:Key="MainWindow_OpenSettings">打开设置</sys:String>
+    <sys:String x:Key="MainWindow_PrimaryNavigation">主导航</sys:String>
+    <sys:String x:Key="MainWindow_ElevationWarningOverlay">权限提升警告覆盖层</sys:String>
+    <sys:String x:Key="MainWindow_PerformanceIntroductionOverlay">性能诊断介绍覆盖层</sys:String>
+    <sys:String x:Key="MainWindow_StartupMinimizedSuggestion">启动时最小化建议</sys:String>
+    <sys:String x:Key="MainWindow_UnsavedSettingsDialog">未保存设置对话框</sys:String>
+    <sys:String x:Key="MainWindow_LoadingOverlay">应用启动加载覆盖层</sys:String>
     
     <!-- LogViewerView -->
     <sys:String x:Key="LogViewerView_Title">ThreadPilot 活动日志</sys:String>
@@ -94,10 +100,13 @@
     <sys:String x:Key="MasksView_DeleteTooltip">删除选定的掩码</sys:String>
     <sys:String x:Key="MasksView_CpusHeader">CPU 核心</sys:String>
     <sys:String x:Key="MasksView_Cpu">CPU</sys:String>
+    <sys:String x:Key="MasksView_Options">掩码选项</sys:String>
 
     <!-- PerformanceView -->
     <sys:String x:Key="PerformanceView_OptionalDiagnostics">可选性能诊断</sys:String>
     <sys:String x:Key="PerformanceView_DiagnosticsDesc">诊断是可选的，仅用于故障排除。对于游戏内覆盖层和详细的性能图表，请使用专用工具。</sys:String>
+    <sys:String x:Key="PerformanceView_DiagnosticsDesc1">诊断是可选的，仅用于故障排除。</sys:String>
+    <sys:String x:Key="PerformanceView_DiagnosticsDesc2">对于游戏内覆盖层和详细的性能图表，请使用专用工具。</sys:String>
     <sys:String x:Key="PerformanceView_QuickTips">快速提示：</sys:String>
     <sys:String x:Key="PerformanceView_Tip1">1. 仅在需要针对性的故障排除快照时才打开诊断。</sys:String>
     <sys:String x:Key="PerformanceView_Tip2">2. 在创建自动化规则之前，仅将热点查看作为提示。</sys:String>
@@ -128,6 +137,12 @@
     <sys:String x:Key="PerformanceView_RefreshTooltip">刷新当前的仪表板快照</sys:String>
     
     <sys:String x:Key="PerformanceView_GlobalPowerPlan">全局电源计划</sys:String>
+    <sys:String x:Key="PerformanceView_ProcessHotspots">进程热点</sys:String>
+    <sys:String x:Key="PerformanceView_Filter">筛选</sys:String>
+    <sys:String x:Key="PerformanceView_Memory">内存</sys:String>
+    <sys:String x:Key="PerformanceView_Name">名称</sys:String>
+    <sys:String x:Key="PerformanceView_Priority">优先级</sys:String>
+    <sys:String x:Key="PerformanceView_Window">窗口</sys:String>
     <sys:String x:Key="PerformanceView_MemoryUsed">已用内存</sys:String>
     <sys:String x:Key="PerformanceView_CpuPercent">CPU %</sys:String>
     <sys:String x:Key="PerformanceView_MemPercent">内存 %</sys:String>
@@ -180,6 +195,7 @@
     <sys:String x:Key="ProcessPowerPlanAssociationView_RuleCpuMask">规则 CPU 掩码:</sys:String>
     <sys:String x:Key="ProcessPowerPlanAssociationView_RuleCpuMaskHelp">可选: 选择在该进程启动时要应用的 CPU 掩码</sys:String>
     <sys:String x:Key="ProcessPowerPlanAssociationView_RulePriority">规则优先级</sys:String>
+    <sys:String x:Key="ProcessPowerPlanAssociationView_Update">更新</sys:String>
     <sys:String x:Key="ProcessPowerPlanAssociationView_RulePriorityHelp">可选: 选择在该进程启动时要应用的进程优先级</sys:String>
     <sys:String x:Key="ProcessPowerPlanAssociationView_AssociationPriority">关联优先级:</sys:String>
     <sys:String x:Key="ProcessPowerPlanAssociationView_AssociationPriorityHelp">当有多个匹配时，优先级较高的关联优先使用</sys:String>
@@ -206,6 +222,7 @@
     <sys:String x:Key="ProcessPowerPlanAssociationView_SaveConfig">保存配置</sys:String>
     <sys:String x:Key="ProcessPowerPlanAssociationView_NoRules">尚无自动化规则</sys:String>
     <sys:String x:Key="ProcessPowerPlanAssociationView_Status">状态:</sys:String>
+    <sys:String x:Key="ProcessPowerPlanAssociationView_AutomationMonitoring">自动化监控</sys:String>
     <sys:String x:Key="ProcessPowerPlanAssociationView_StartAutomation">启动自动化监控</sys:String>
     <sys:String x:Key="ProcessPowerPlanAssociationView_StopAutomation">停止自动化监控</sys:String>
     
@@ -226,6 +243,7 @@
     <sys:String x:Key="ProcessView_Title">系统进程管理</sys:String>
     <sys:String x:Key="ProcessView_Subtitle">搜索、过滤和控制活动的进程配置</sys:String>
     <sys:String x:Key="ProcessView_SearchPlaceholder">按名称搜索进程</sys:String>
+    <sys:String x:Key="ProcessView_SearchAutomationName">进程搜索</sys:String>
     <sys:String x:Key="ProcessView_HideSystem">隐藏 Windows 系统进程</sys:String>
     <sys:String x:Key="ProcessView_HideSystemShort">隐藏系统进程</sys:String>
     <sys:String x:Key="ProcessView_HideLowCpu">隐藏 CPU 使用率极低的进程</sys:String>
@@ -276,6 +294,10 @@
     <sys:String x:Key="ProcessView_RefreshTooltip">刷新进程列表</sys:String>
     <sys:String x:Key="ProcessView_LoadMore">加载更多</sys:String>
     <sys:String x:Key="ProcessView_LoadMoreTooltip">加载更多进程</sys:String>
+    <sys:String x:Key="ProcessView_RefreshAutomationName">刷新进程</sys:String>
+    <sys:String x:Key="ProcessView_LoadMoreAutomationName">加载更多进程</sys:String>
+    <sys:String x:Key="ProcessView_RunningListAutomationName">运行中进程列表</sys:String>
+    <sys:String x:Key="ProcessView_RunningListAutomationHelp">支持排序和选择的虚拟化进程表</sys:String>
     
     <sys:String x:Key="ProcessView_ColProcessName">进程名称</sys:String>
     <sys:String x:Key="ProcessView_ColWindowTitle">窗口标题</sys:String>
@@ -294,6 +316,32 @@
     <sys:String x:Key="ProcessView_ApplyPendingSettings">应用待处理设置</sys:String>
     <sys:String x:Key="ProcessView_ApplyPendingSettingsTooltip">将待处理的关联性和选定的电源计划应用于选定的进程</sys:String>
     <sys:String x:Key="ProcessView_RulesAppliedOnlyWhenConfigured">ThreadPilot 仅在配置后才应用规则和更改。</sys:String>
+    <sys:String x:Key="ProcessView_CurrentProcessStatus">当前进程状态</sys:String>
+    <sys:String x:Key="ProcessView_AdvancedAffinityPicker">高级关联性选择器</sys:String>
+    <sys:String x:Key="ProcessView_RowMaskTooltip">为行上下文菜单关联性操作选择待处理掩码</sys:String>
+    <sys:String x:Key="ProcessView_SelectedPowerPlan">所选电源计划</sys:String>
+    <sys:String x:Key="ProcessView_SaveAsRule">保存为规则</sys:String>
+    <sys:String x:Key="ProcessView_NoVisibleWindowTitle">无可见窗口标题</sys:String>
+    <sys:String x:Key="ProcessView_BatchLabel">批次 </sys:String>
+    <sys:String x:Key="ProcessView_TotalSuffix"> 总计)</sys:String>
+    <sys:String x:Key="ProcessView_PriorityInlineLabel">  优先级 </sys:String>
+    <sys:String x:Key="ProcessSummary_CpuUnavailable">CPU: 不可用</sys:String>
+    <sys:String x:Key="ProcessSummary_MemoryUnavailable">内存: 不可用</sys:String>
+    <sys:String x:Key="ProcessSummary_CpuPriorityUnavailable">CPU 优先级: 不可用</sys:String>
+    <sys:String x:Key="ProcessSummary_MemoryPriorityUnavailable">内存优先级不可用</sys:String>
+    <sys:String x:Key="ProcessSummary_AffinityUnavailable">关联性: 不可用</sys:String>
+    <sys:String x:Key="ProcessSummary_NoSavedRule">无已保存规则</sys:String>
+    <sys:String x:Key="ProcessSummary_NoRecentAction">暂无最近的 ThreadPilot 操作</sys:String>
+    <sys:String x:Key="ProcessSummary_SelectedProcessFormat">选定进程: {0} (PID {1})</sys:String>
+    <sys:String x:Key="ProcessSummary_StatusProtected">当前进程状态: 受保护或访问被拒绝</sys:String>
+    <sys:String x:Key="ProcessSummary_StatusSelected">当前进程状态: 已选择</sys:String>
+    <sys:String x:Key="ProcessSummary_CpuFormat">CPU: {0:N1}%</sys:String>
+    <sys:String x:Key="ProcessSummary_MemoryFormat">内存: {0}</sys:String>
+    <sys:String x:Key="ProcessSummary_CpuPriorityFormat">CPU 优先级: {0}</sys:String>
+    <sys:String x:Key="ProcessSummary_AffinityLegacyFormat">关联性: 旧版掩码 0x{0:X}</sys:String>
+    <sys:String x:Key="ProcessSummary_MemoryPriorityFormat">内存优先级: {0}</sys:String>
+    <sys:String x:Key="ProcessSummary_SavedRuleFallback">已保存规则</sys:String>
+    <sys:String x:Key="ProcessSummary_SavedRuleExistsFormat">存在已保存规则: {0}</sys:String>
     
     <sys:String x:Key="ProcessView_PriorityAboveNormal">高于正常</sys:String>
     <sys:String x:Key="ProcessView_PriorityBelowNormal">低于正常</sys:String>
@@ -388,6 +436,12 @@
     <sys:String x:Key="SettingsView_Translator">翻译人员：Ylimhs</sys:String>
     <sys:String x:Key="SettingsView_License">软件授权: AGPLv3</sys:String>
     <sys:String x:Key="SettingsView_CheckUpdates">检查新版本</sys:String>
+    <sys:String x:Key="SettingsView_DownloadInstallUpdate">下载并安装更新</sys:String>
+    <sys:String x:Key="SettingsView_EnableAutomaticUpdateChecks">启动时自动检查更新</sys:String>
+    <sys:String x:Key="SettingsView_UpdateIntervalDays">检查间隔（天）:</sys:String>
+    <sys:String x:Key="SettingsView_IncludePrereleaseUpdates">包含预发布版本</sys:String>
+    <sys:String x:Key="SettingsView_LatestVersion">最新版本:</sys:String>
+    <sys:String x:Key="SettingsView_LastUpdateCheck">上次检查:</sys:String>
     <sys:String x:Key="SettingsView_UpdatesDescription">按需通过官方 GitHub Releases API 检索最新稳定版本。</sys:String>
     
     <sys:String x:Key="SettingsView_ResetDefaults">重置为默认值</sys:String>
@@ -395,6 +449,55 @@
     <sys:String x:Key="SettingsView_ImportConfig">导入配置包</sys:String>
     <sys:String x:Key="SettingsView_SaveSettings">保存并应用设置</sys:String>
     <sys:String x:Key="SettingsView_ThreadPilot">ThreadPilot</sys:String>
+    <sys:String x:Key="Settings_StatusThemeChangedFormat">主题已切换为{0}。</sys:String>
+    <sys:String x:Key="Settings_StatusThemeChangeFailedFormat">无法切换主题为{0}。</sys:String>
+    <sys:String x:Key="Settings_StatusLanguageChangedFormat">语言已切换为{0}。</sys:String>
+    <sys:String x:Key="Settings_StatusLanguageChangeFailed">无法切换语言。</sys:String>
+    <sys:String x:Key="Settings_StatusSaving">正在保存设置...</sys:String>
+    <sys:String x:Key="Settings_StatusSavedWarningsFormat">设置已保存但有警告: {0}</sys:String>
+    <sys:String x:Key="Settings_StatusSavedApplied">设置已成功保存并应用。</sys:String>
+    <sys:String x:Key="Settings_StatusErrorSavingFormat">保存设置时出错: {0}</sys:String>
+    <sys:String x:Key="Settings_StatusResetting">正在重置为默认值...</sys:String>
+    <sys:String x:Key="Settings_StatusResetPending">设置已重置为默认值（尚未保存）</sys:String>
+    <sys:String x:Key="Settings_StatusErrorResettingFormat">重置设置时出错: {0}</sys:String>
+    <sys:String x:Key="Settings_StatusExporting">正在导出配置包...</sys:String>
+    <sys:String x:Key="Settings_StatusExportCanceled">已取消导出</sys:String>
+    <sys:String x:Key="Settings_StatusExportedFormat">配置已导出到: {0}</sys:String>
+    <sys:String x:Key="Settings_StatusErrorExportingFormat">导出设置时出错: {0}</sys:String>
+    <sys:String x:Key="Settings_StatusImporting">正在导入配置...</sys:String>
+    <sys:String x:Key="Settings_StatusImportCanceled">已取消导入</sys:String>
+    <sys:String x:Key="Settings_StatusImportedApplied">配置包已导入并应用</sys:String>
+    <sys:String x:Key="Settings_StatusLegacyImported">旧版设置已导入（规则未更改）</sys:String>
+    <sys:String x:Key="Settings_StatusErrorImportingFormat">导入设置时出错: {0}</sys:String>
+    <sys:String x:Key="Settings_StatusTestSent">测试通知已发送</sys:String>
+    <sys:String x:Key="Settings_StatusErrorTestFormat">发送测试通知时出错: {0}</sys:String>
+    <sys:String x:Key="Settings_StatusLoading">正在加载设置...</sys:String>
+    <sys:String x:Key="Settings_StatusLoaded">设置已加载</sys:String>
+    <sys:String x:Key="Settings_StatusErrorLoadingFormat">加载设置时出错: {0}</sys:String>
+    <sys:String x:Key="Settings_StatusSynchronized">设置已同步</sys:String>
+    <sys:String x:Key="Settings_StatusCheckingUpdates">正在检查更新...</sys:String>
+    <sys:String x:Key="Settings_StatusLatestUnknown">无法确定最新版本。</sys:String>
+    <sys:String x:Key="Settings_StatusNewVersionFormat">发现新版本: {0}</sys:String>
+    <sys:String x:Key="Settings_StatusUpToDateFormat">应用已是最新版本。已安装版本: {0}</sys:String>
+    <sys:String x:Key="Settings_StatusUpdateErrorFormat">检查更新时出错: {0}</sys:String>
+    <sys:String x:Key="Settings_UpdateLatestUnknown">未知</sys:String>
+    <sys:String x:Key="Settings_UpdateNotChecked">尚未检查</sys:String>
+    <sys:String x:Key="Settings_UpdateLastCheckedNever">从未检查</sys:String>
+    <sys:String x:Key="Settings_UpdateConfirmTitle">安装 ThreadPilot 更新</sys:String>
+    <sys:String x:Key="Settings_UpdateConfirmMessageFormat">ThreadPilot 将下载并验证版本 {0}，然后请求 Windows 权限运行安装程序。是否继续？</sys:String>
+    <sys:String x:Key="Settings_StatusUpdateCanceled">更新已取消。</sys:String>
+    <sys:String x:Key="Settings_StatusDownloadingUpdate">正在下载并验证更新...</sys:String>
+    <sys:String x:Key="Settings_StatusUpdateInstallerStarted">更新安装程序已启动。</sys:String>
+    <sys:String x:Key="Settings_StatusUpdateInstallFailedFormat">更新安装失败: {0}</sys:String>
+    <sys:String x:Key="Settings_StatusModified">设置已被修改</sys:String>
+    <sys:String x:Key="Settings_StatusMatchSaved">设置与已保存的配置一致</sys:String>
+    <sys:String x:Key="Settings_LanguageSimplifiedChinese">简体中文</sys:String>
+    <sys:String x:Key="Settings_LanguageEnglish">英文</sys:String>
+    <sys:String x:Key="Settings_ThemeDark">深色</sys:String>
+    <sys:String x:Key="Settings_ThemeLight">浅色</sys:String>
+    <sys:String x:Key="Settings_DialogExportTitle">导出 ThreadPilot 配置</sys:String>
+    <sys:String x:Key="Settings_DialogImportTitle">导入 ThreadPilot 配置</sys:String>
+    <sys:String x:Key="Settings_WarningAutostartFailed">无法更新 Windows 自启动。将保留之前的自启动状态。</sys:String>
 
     <!-- SettingsWindow -->
     <sys:String x:Key="SettingsWindow_Title">ThreadPilot 设置</sys:String>
@@ -509,7 +612,30 @@
     <sys:String x:Key="Notification_GameBoostDeactivatedFormat">游戏加速模式已关闭，持续时间: {0}</sys:String>
     <sys:String x:Key="Notification_ProcessMonitorErrorTitle">进程监控器错误</sys:String>
     <sys:String x:Key="Notification_AffinityBlockedTitle">关联性应用被阻止</sys:String>
+    <sys:String x:Key="Notification_AffinityAppliedTitle">关联性已应用</sys:String>
+    <sys:String x:Key="Notification_AffinityAdjustedTitle">关联性已调整</sys:String>
+    <sys:String x:Key="Notification_AffinityFailedTitle">关联性应用失败</sys:String>
+    <sys:String x:Key="Notification_AffinityErrorTitle">关联性错误</sys:String>
     <sys:String x:Key="Notification_PriorityBlockedTitle">优先级应用被阻止</sys:String>
+    <sys:String x:Key="Notification_PriorityWarningTitle">优先级警告</sys:String>
+    <sys:String x:Key="Notification_PriorityAppliedTitle">优先级已应用</sys:String>
+    <sys:String x:Key="Notification_PriorityAdjustedTitle">优先级已调整</sys:String>
+    <sys:String x:Key="Notification_PriorityErrorTitle">优先级错误</sys:String>
+    <sys:String x:Key="Notification_KeyboardShortcutTitle">键盘快捷键</sys:String>
+    <sys:String x:Key="Notification_ToggleMonitoringShortcut">切换监控快捷键已触发</sys:String>
+    <sys:String x:Key="Notification_HighPerformanceShortcut">高性能电源计划快捷键已触发</sys:String>
+    <sys:String x:Key="Notification_RefreshProcessListShortcut">刷新进程列表快捷键已触发</sys:String>
+    <sys:String x:Key="Notification_ThreadPilotStartedTitle">ThreadPilot 已启动</sys:String>
+    <sys:String x:Key="Notification_ThreadPilotStartedMessage">进程监控和电源计划管理现已激活</sys:String>
+    <sys:String x:Key="Notification_StartupErrorTitle">启动错误</sys:String>
+    <sys:String x:Key="Notification_ProcessMonitoringStartFailed">无法启动进程监控管理器</sys:String>
+    <sys:String x:Key="Notification_AutomationMonitoringErrorTitle">自动化监控错误</sys:String>
+    <sys:String x:Key="Notification_SettingsSavedTitle">设置已保存</sys:String>
+    <sys:String x:Key="Notification_SettingsSavedMessage">应用设置已成功保存</sys:String>
+    <sys:String x:Key="Notification_SettingsSavedWarningsTitle">设置已保存但有警告</sys:String>
+    <sys:String x:Key="Notification_SettingsErrorTitle">设置错误</sys:String>
+    <sys:String x:Key="Notification_SettingsSaveFailed">无法保存设置</sys:String>
+    <sys:String x:Key="Notification_TestNotificationMessage">这是一条用于验证您的设置是否正常工作的测试通知。</sys:String>
 
     <!-- Elevation Service -->
     <sys:String x:Key="Elevation_RequestPromptText">ThreadPilot 需要管理员权限来管理进程关联性和电源计划。&#x0a;&#x0a;您想以管理员权限重新启动应用程序吗？</sys:String>
diff --git a/MainWindow.Behaviors.partial.cs b/MainWindow.Behaviors.partial.cs
index a4da578..1c857ee 100644
--- a/MainWindow.Behaviors.partial.cs
+++ b/MainWindow.Behaviors.partial.cs
@@ -157,27 +157,26 @@ private async Task CheckForUpdatesAtStartupAsync()
             try
             {
                 this.LogDebug("Startup update check started");
-                var checker = this.serviceProvider.GetRequiredService<GitHubUpdateChecker>();
-                var currentVersion = GetCurrentApplicationVersion();
-                var (latest, _) = await checker.GetLatestVersionAsync("PrimeBuild-pc", "ThreadPilot");
+                var updateService = this.serviceProvider.GetRequiredService<IUpdateService>();
+                var result = await updateService.CheckForUpdatesAsync(new UpdateCheckRequest(UpdateCheckTrigger.Startup));
 
-                if (latest == null)
+                if (result.Status == UpdateCheckStatus.Skipped)
                 {
-                    this.LogDebug("Startup update check completed without release information");
+                    this.LogDebug($"Startup update check skipped: {result.Message}");
                     return;
                 }
 
-                if (latest <= currentVersion)
+                if (!result.IsUpdateAvailable || result.Release == null)
                 {
-                    this.LogDebug($"Startup update check complete: installed {currentVersion}, latest {latest}");
+                    this.LogDebug($"Startup update check complete: {result.Message}");
                     return;
                 }
 
                 await this.notificationService.ShowNotificationAsync(
                     "Update available",
-                    $"ThreadPilot {latest} is available from GitHub releases.",
+                    $"ThreadPilot {result.Release.Version} is available. Open Settings to download and install it.",
                     NotificationType.Information);
-                this.LogDebug($"Startup update check found update: installed {currentVersion}, latest {latest}");
+                this.LogDebug($"Startup update check found update: installed {result.CurrentVersion}, latest {result.Release.Version}");
             }
             catch (Exception ex)
             {
diff --git a/MainWindow.xaml b/MainWindow.xaml
index 7a203ed..c991768 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -10,7 +10,7 @@
         mc:Ignorable="d"
         ExtendsContentIntoTitleBar="True"
         WindowBackdropType="Mica"
-        Title="ThreadPilot - Process &amp; Power Plan Manager"
+        Title="{DynamicResource MainWindow_Title}"
         Height="864"
         Width="1280"
         WindowStartupLocation="CenterScreen"
@@ -86,7 +86,7 @@
                                IsPaneOpen="False"
                                OpenPaneLength="180"
                                CompactPaneLength="52"
-                               AutomationProperties.Name="Primary navigation">
+                               AutomationProperties.Name="{DynamicResource MainWindow_PrimaryNavigation}">
                 <ui:NavigationView.Resources>
                     <Style TargetType="ui:NavigationViewItem">
                         <Setter Property="Background" Value="Transparent"/>
@@ -118,37 +118,37 @@
                 </ui:NavigationView.Resources>
                 
                 <ui:NavigationView.MenuItems>
-                    <ui:NavigationViewItem x:Name="NavProcess" Content="Process Management" Tag="Process" TargetPageTag="Process" Click="NavMenuItem_Click">
+                    <ui:NavigationViewItem x:Name="NavProcess" Content="{DynamicResource MainWindow_NavProcess}" Tag="Process" TargetPageTag="Process" Click="NavMenuItem_Click">
                         <ui:NavigationViewItem.Icon>
                             <ui:SymbolIcon Symbol="Apps24"/>
                         </ui:NavigationViewItem.Icon>
                     </ui:NavigationViewItem>
-                    <ui:NavigationViewItem x:Name="NavMasks" Content="CPU Masks" Tag="Masks" TargetPageTag="Masks" Click="NavMenuItem_Click">
+                    <ui:NavigationViewItem x:Name="NavMasks" Content="{DynamicResource MainWindow_NavMasks}" Tag="Masks" TargetPageTag="Masks" Click="NavMenuItem_Click">
                         <ui:NavigationViewItem.Icon>
                             <ui:SymbolIcon Symbol="BranchFork24"/>
                         </ui:NavigationViewItem.Icon>
                     </ui:NavigationViewItem>
-                    <ui:NavigationViewItem x:Name="NavPower" Content="Power Plans" Tag="Power" TargetPageTag="Power" Click="NavMenuItem_Click">
+                    <ui:NavigationViewItem x:Name="NavPower" Content="{DynamicResource MainWindow_NavPower}" Tag="Power" TargetPageTag="Power" Click="NavMenuItem_Click">
                         <ui:NavigationViewItem.Icon>
                             <ui:SymbolIcon Symbol="Power24"/>
                         </ui:NavigationViewItem.Icon>
                     </ui:NavigationViewItem>
-                    <ui:NavigationViewItem x:Name="NavRules" Content="Rules" Tag="Rules" TargetPageTag="Rules" Click="NavMenuItem_Click">
+                    <ui:NavigationViewItem x:Name="NavRules" Content="{DynamicResource MainWindow_NavRules}" Tag="Rules" TargetPageTag="Rules" Click="NavMenuItem_Click">
                         <ui:NavigationViewItem.Icon>
                             <ui:SymbolIcon Symbol="TasksApp24"/>
                         </ui:NavigationViewItem.Icon>
                     </ui:NavigationViewItem>
-                    <ui:NavigationViewItem x:Name="NavPerf" Content="Diagnostics" Tag="Performance" TargetPageTag="Performance" Click="NavMenuItem_Click">
+                    <ui:NavigationViewItem x:Name="NavPerf" Content="{DynamicResource MainWindow_NavDiagnostics}" Tag="Performance" TargetPageTag="Performance" Click="NavMenuItem_Click">
                         <ui:NavigationViewItem.Icon>
                             <ui:SymbolIcon Symbol="DataHistogram24"/>
                         </ui:NavigationViewItem.Icon>
                     </ui:NavigationViewItem>
-                    <ui:NavigationViewItem x:Name="NavLogs" Content="ThreadPilot Activity" Tag="Logs" TargetPageTag="Logs" Click="NavMenuItem_Click">
+                    <ui:NavigationViewItem x:Name="NavLogs" Content="{DynamicResource MainWindow_NavActivity}" Tag="Logs" TargetPageTag="Logs" Click="NavMenuItem_Click">
                         <ui:NavigationViewItem.Icon>
                             <ui:SymbolIcon Symbol="DocumentText24"/>
                         </ui:NavigationViewItem.Icon>
                     </ui:NavigationViewItem>
-                    <ui:NavigationViewItem x:Name="NavTweaks" Content="Tweaks" Tag="Tweaks" TargetPageTag="Tweaks" Click="NavMenuItem_Click">
+                    <ui:NavigationViewItem x:Name="NavTweaks" Content="{DynamicResource MainWindow_NavTweaks}" Tag="Tweaks" TargetPageTag="Tweaks" Click="NavMenuItem_Click">
                         <ui:NavigationViewItem.Icon>
                             <ui:SymbolIcon Symbol="Wrench24"/>
                         </ui:NavigationViewItem.Icon>
@@ -156,7 +156,7 @@
                 </ui:NavigationView.MenuItems>
                 
                 <ui:NavigationView.FooterMenuItems>
-                    <ui:NavigationViewItem x:Name="NavSettings" TargetPageTag="Settings" Content="Settings" Tag="Settings" Click="NavMenuItem_Click">
+                    <ui:NavigationViewItem x:Name="NavSettings" TargetPageTag="Settings" Content="{DynamicResource MainWindow_NavSettings}" Tag="Settings" Click="NavMenuItem_Click">
                         <ui:NavigationViewItem.Icon>
                             <ui:SymbolIcon Symbol="Settings24"/>
                         </ui:NavigationViewItem.Icon>
@@ -175,7 +175,7 @@
                           Grid.RowSpan="2"
                           Visibility="Collapsed"
                           Panel.ZIndex="900"
-                          AutomationProperties.Name="Elevation warning overlay">
+                          AutomationProperties.Name="{DynamicResource MainWindow_ElevationWarningOverlay}">
                         <!-- Blurred Backdrop -->
                         <Grid x:Name="ElevationWarningBackdrop"
                               Background="{DynamicResource OverlayBrush}"
@@ -206,7 +206,7 @@
                                                FontSize="28"
                                                VerticalAlignment="Center"
                                                Margin="0,0,12,0"/>
-                                    <TextBlock Text="Administrator Privileges Recommended"
+                                    <TextBlock Text="{DynamicResource MainWindow_ElevationWarningTitle}"
                                                FontSize="22"
                                                FontWeight="SemiBold"
                                                Foreground="{DynamicResource TextFillColorPrimaryBrush}"
@@ -214,44 +214,44 @@
                                                TextWrapping="Wrap"/>
                                 </StackPanel>
 
-                                <TextBlock Text="ThreadPilot is running with limited privileges. Some features may not be available."
+                                <TextBlock Text="{DynamicResource MainWindow_ElevationWarningDescription}"
                                            TextWrapping="Wrap"
                                            Margin="0,0,0,12"
                                            FontSize="14"
                                            Foreground="{DynamicResource TextFillColorPrimaryBrush}"/>
 
-                                <TextBlock Text="Administrator access is required for:"
+                                <TextBlock Text="{DynamicResource MainWindow_ElevationWarningRequired}"
                                            FontWeight="SemiBold"
                                            Margin="0,0,0,8"
                                            Foreground="{DynamicResource TextFillColorSecondaryBrush}"/>
 
                                 <StackPanel Margin="20,0,0,0">
-                                    <TextBlock Text="• Modifying power plan configurations"
+                                    <TextBlock Text="{DynamicResource MainWindow_ElevationWarningPowerPlans}"
                                                TextWrapping="Wrap"
                                                Margin="0,0,0,4"
                                                Foreground="{DynamicResource TextFillColorSecondaryBrush}"/>
-                                    <TextBlock Text="• Changing process CPU affinity and priority"
+                                    <TextBlock Text="{DynamicResource MainWindow_ElevationWarningAffinity}"
                                                TextWrapping="Wrap"
                                                Margin="0,0,0,4"
                                                Foreground="{DynamicResource TextFillColorSecondaryBrush}"/>
-                                    <TextBlock Text="• Applying system-level optimizations and tweaks"
+                                    <TextBlock Text="{DynamicResource MainWindow_ElevationWarningTweaks}"
                                                TextWrapping="Wrap"
                                                Margin="0,0,0,4"
                                                Foreground="{DynamicResource TextFillColorSecondaryBrush}"/>
-                                    <TextBlock Text="• Managing protected processes"
+                                    <TextBlock Text="{DynamicResource MainWindow_ElevationWarningProtected}"
                                                TextWrapping="Wrap"
                                                Margin="0,0,0,16"
                                                Foreground="{DynamicResource TextFillColorSecondaryBrush}"/>
                                 </StackPanel>
 
                                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-                                    <Button Content="Continue Without Elevation"
+                                    <Button Content="{DynamicResource MainWindow_ContinueWithoutElevation}"
                                             Click="ElevationWarningDismiss_Click"
                                             Margin="0,0,12,0"
                                             Background="{DynamicResource ControlFillColorDefaultBrush}"
                                             Foreground="{DynamicResource TextFillColorPrimaryBrush}"
                                             Padding="16,8"/>
-                                    <Button Content="Request Elevation"
+                                    <Button Content="{DynamicResource MainWindow_RequestElevation}"
                                             Command="{Binding RequestElevationCommand}"
                                             Click="ElevationWarningRequestElevation_Click"
                                             Background="{DynamicResource AccentFillColorDefaultBrush}"
@@ -308,7 +308,7 @@
               Panel.ZIndex="950">
             <Grid x:Name="PerformanceIntroOverlay"
                   Visibility="Collapsed"
-                  AutomationProperties.Name="Performance introduction overlay">
+                  AutomationProperties.Name="{DynamicResource MainWindow_PerformanceIntroductionOverlay}">
                 <Border x:Name="PerformanceIntroCard"
                         Background="{DynamicResource CardSurfaceBrush}"
                         BorderBrush="{DynamicResource BorderSubtleBrush}"
@@ -325,40 +325,40 @@
                     </Border.Effect>
                     <StackPanel>
                         <TextBlock x:Name="PerformanceIntroTitle"
-                                   Text="Optional Diagnostics"
+                                   Text="{DynamicResource PerformanceView_OptionalDiagnostics}"
                                    FontSize="24"
                                    FontWeight="SemiBold"
                                    Foreground="{DynamicResource TextFillColorPrimaryBrush}"
                                    Margin="0,0,0,10"/>
 
                         <TextBlock x:Name="PerformanceIntroDescription"
-                                   Text="Diagnostics are optional and intended for troubleshooting. For in-game overlays and detailed performance graphs, use dedicated tools."
+                                   Text="{DynamicResource PerformanceView_DiagnosticsDesc}"
                                    TextWrapping="Wrap"
                                    Margin="0,0,0,10"
                                    Foreground="{DynamicResource TextFillColorSecondaryBrush}"/>
 
                         <TextBlock x:Name="PerformanceIntroTipsHeader"
-                                   Text="Quick tips:"
+                                   Text="{DynamicResource PerformanceView_QuickTips}"
                                    FontWeight="SemiBold"
                                    Foreground="{DynamicResource TextFillColorPrimaryBrush}"
                                    Margin="0,0,0,6"/>
 
                         <TextBlock x:Name="PerformanceIntroTip1"
-                                   Text="1. Open diagnostics only when you need a focused troubleshooting snapshot."
+                                   Text="{DynamicResource PerformanceView_Tip1}"
                                    Foreground="{DynamicResource TextFillColorSecondaryBrush}"
                                    Margin="0,0,0,4"/>
                         <TextBlock x:Name="PerformanceIntroTip2"
-                                   Text="2. Review hotspots only as a hint before creating automation rules."
+                                   Text="{DynamicResource PerformanceView_Tip2}"
                                    Foreground="{DynamicResource TextFillColorSecondaryBrush}"
                                    Margin="0,0,0,4"/>
                         <TextBlock x:Name="PerformanceIntroTip3"
-                                   Text="3. Stop live metrics when you are done troubleshooting."
+                                   Text="{DynamicResource PerformanceView_Tip3}"
                                    TextWrapping="Wrap"
                                    Foreground="{DynamicResource TextFillColorSecondaryBrush}"
                                    Margin="0,0,0,16"/>
 
                         <Button x:Name="PerformanceIntroContinueButton"
-                                Content="Continue to Diagnostics"
+                                Content="{DynamicResource PerformanceView_Continue}"
                                 Click="PerformanceIntroContinue_Click"
                                 HorizontalAlignment="Right"
                                 Background="{DynamicResource AccentFillColorDefaultBrush}"
@@ -372,7 +372,7 @@
                   Visibility="Collapsed"
                   Panel.ZIndex="955"
                   Background="{DynamicResource OverlayBrush}"
-                  AutomationProperties.Name="Startup minimized suggestion">
+                  AutomationProperties.Name="{DynamicResource MainWindow_StartupMinimizedSuggestion}">
                 <Border Background="{DynamicResource CardSurfaceBrush}"
                         BorderBrush="{DynamicResource BorderSubtleBrush}"
                         BorderThickness="1"
@@ -395,28 +395,28 @@
                                 Padding="8,3"
                                 HorizontalAlignment="Left"
                                 Margin="0,0,0,10">
-                            <TextBlock Text="Recommended"
+                            <TextBlock Text="{DynamicResource MainWindow_Recommended}"
                                        FontSize="{DynamicResource CaptionFontSize}"
                                        FontWeight="SemiBold"
                                        Foreground="{DynamicResource InfoTextBrush}"/>
                         </Border>
-                        <TextBlock Text="Startup minimized"
+                        <TextBlock Text="{DynamicResource MainWindow_StartupMinimizedSuggestionTitle}"
                                    FontSize="20"
                                    FontWeight="SemiBold"
                                    Foreground="{DynamicResource TextFillColorPrimaryBrush}"
                                    Margin="0,0,0,8"/>
-                        <TextBlock Text="Enable Startup minimized when you want ThreadPilot to start silently in the tray on future Windows sign-ins."
+                        <TextBlock Text="{DynamicResource MainWindow_StartupMinimizedSuggestionDescription}"
                                    TextWrapping="Wrap"
                                    Foreground="{DynamicResource TextFillColorSecondaryBrush}"
                                    Margin="0,0,0,16"/>
                         <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-                            <Button Content="Don't show again"
+                            <Button Content="{DynamicResource MainWindow_DontShowAgain}"
                                     Click="StartupSuggestionDontShowAgain_Click"
                                     Background="{DynamicResource ControlFillColorDefaultBrush}"
                                     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
                                     Padding="14,7"
                                     Margin="0,0,10,0"/>
-                            <Button Content="Open Settings"
+                            <Button Content="{DynamicResource MainWindow_OpenSettings}"
                                     Click="StartupSuggestionOpenSettings_Click"
                                     Background="{DynamicResource AccentFillColorDefaultBrush}"
                                     Foreground="{DynamicResource TextOnAccentFillColorPrimaryBrush}"
@@ -430,7 +430,7 @@
                   Visibility="Collapsed"
                   Panel.ZIndex="960"
                   Background="{DynamicResource OverlayBrush}"
-                  AutomationProperties.Name="Unsaved settings dialog">
+                  AutomationProperties.Name="{DynamicResource MainWindow_UnsavedSettingsDialog}">
                 <Border Background="{DynamicResource CardSurfaceBrush}"
                         BorderBrush="{DynamicResource BorderSubtleBrush}"
                         BorderThickness="1"
@@ -445,7 +445,7 @@
                         <DropShadowEffect BlurRadius="12" ShadowDepth="0" Opacity="0.18"/>
                     </Border.Effect>
                     <StackPanel>
-                        <TextBlock Text="Unsaved Settings"
+                        <TextBlock Text="{DynamicResource SettingsWindow_UnsavedTitle}"
                                    FontSize="22"
                                    FontWeight="SemiBold"
                                    Foreground="{DynamicResource TextFillColorPrimaryBrush}"
@@ -455,19 +455,19 @@
                                    Foreground="{DynamicResource TextFillColorSecondaryBrush}"
                                    Margin="0,0,0,18"/>
                         <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-                            <Button Content="Cancel"
+                            <Button Content="{DynamicResource SettingsWindow_Cancel}"
                                     Click="UnsavedSettingsCancel_Click"
                                     Background="{DynamicResource ControlFillColorDefaultBrush}"
                                     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
                                     Padding="16,8"
                                     Margin="0,0,10,0"/>
-                            <Button Content="Discard"
+                            <Button Content="{DynamicResource SettingsWindow_Discard}"
                                     Click="UnsavedSettingsDiscard_Click"
                                     Background="{DynamicResource ControlFillColorDefaultBrush}"
                                     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
                                     Padding="16,8"
                                     Margin="0,0,10,0"/>
-                            <Button Content="Save"
+                            <Button Content="{DynamicResource SettingsWindow_Save}"
                                     Click="UnsavedSettingsSave_Click"
                                     Background="{DynamicResource AccentFillColorDefaultBrush}"
                                     Foreground="{DynamicResource TextOnAccentFillColorPrimaryBrush}"
@@ -481,7 +481,7 @@
             <Grid x:Name="LoadingOverlay"
                   Visibility="Visible"
                   Panel.ZIndex="1000"
-                  AutomationProperties.Name="Application startup loading overlay"
+                  AutomationProperties.Name="{DynamicResource MainWindow_LoadingOverlay}"
                   AutomationProperties.LiveSetting="Polite">
 
             <!-- Loading Popup -->
diff --git a/Models/ApplicationSettingsModel.cs b/Models/ApplicationSettingsModel.cs
index 40e6c78..3219d8a 100644
--- a/Models/ApplicationSettingsModel.cs
+++ b/Models/ApplicationSettingsModel.cs
@@ -154,6 +154,18 @@ public partial class ApplicationSettingsModel : ObservableObject, IModel
         [ObservableProperty]
         private string language = LocalizationService.DefaultLanguage;
 
+        [ObservableProperty]
+        private bool enableAutomaticUpdateChecks = true;
+
+        [ObservableProperty]
+        private DateTimeOffset? lastUpdateCheckUtc = null;
+
+        [ObservableProperty]
+        private int updateCheckIntervalDays = 7;
+
+        [ObservableProperty]
+        private bool includePrereleaseUpdates = false;
+
         // Monitoring Settings
         [ObservableProperty]
         private int pollingIntervalMs = 5000;
@@ -253,6 +265,10 @@ public void CopyFrom(ApplicationSettingsModel other)
             this.UseDarkTheme = other.UseDarkTheme;
             this.HasUserThemePreference = other.HasUserThemePreference;
             this.Language = LocalizationService.NormalizeLanguage(other.Language);
+            this.EnableAutomaticUpdateChecks = other.EnableAutomaticUpdateChecks;
+            this.LastUpdateCheckUtc = other.LastUpdateCheckUtc;
+            this.UpdateCheckIntervalDays = other.UpdateCheckIntervalDays;
+            this.IncludePrereleaseUpdates = other.IncludePrereleaseUpdates;
 
             // Monitoring Settings
             this.PollingIntervalMs = other.PollingIntervalMs;
@@ -298,6 +314,11 @@ public ValidationResult Validate()
                 errors.Add("Fallback polling interval must be between 1 and 60 seconds");
             }
 
+            if (this.UpdateCheckIntervalDays < 1 || this.UpdateCheckIntervalDays > 365)
+            {
+                errors.Add("Update check interval must be between 1 and 365 days");
+            }
+
             return errors.Count == 0 ? ValidationResult.Success() : ValidationResult.Failure(errors.ToArray());
         }
 
diff --git a/Services/Abstractions/IGitHubReleaseClient.cs b/Services/Abstractions/IGitHubReleaseClient.cs
index bf062d6..15f0c2e 100644
--- a/Services/Abstractions/IGitHubReleaseClient.cs
+++ b/Services/Abstractions/IGitHubReleaseClient.cs
@@ -9,5 +9,7 @@ namespace ThreadPilot.Services.Abstractions
     public interface IGitHubReleaseClient
     {
         Task<string> GetLatestReleaseJsonAsync(string owner, string repo, CancellationToken cancellationToken = default);
+
+        Task<string> GetReleasesJsonAsync(string owner, string repo, CancellationToken cancellationToken = default);
     }
 }
diff --git a/Services/ApplicationSettingsService.cs b/Services/ApplicationSettingsService.cs
index 02d52b7..d7ae681 100644
--- a/Services/ApplicationSettingsService.cs
+++ b/Services/ApplicationSettingsService.cs
@@ -246,18 +246,28 @@ public void ValidateAndFixSettings()
                 this.settings.MaxNotificationHistoryItems = 1000;
             }
 
-            // Validate custom icon path
-            if (this.settings.UseCustomTrayIcon && !string.IsNullOrEmpty(this.settings.CustomTrayIconPath))
-            {
-                if (!File.Exists(this.settings.CustomTrayIconPath))
-                {
+            // Validate custom icon path
+            if (this.settings.UseCustomTrayIcon && !string.IsNullOrEmpty(this.settings.CustomTrayIconPath))
+            {
+                if (!File.Exists(this.settings.CustomTrayIconPath))
+                {
                     this.logger.LogWarning("Custom tray icon file not found: {Path}", this.settings.CustomTrayIconPath);
-                    this.settings.UseCustomTrayIcon = false;
-                }
-            }
-
-            this.settings.Language = LocalizationService.NormalizeLanguage(this.settings.Language);
-        }
+                    this.settings.UseCustomTrayIcon = false;
+                }
+            }
+
+            this.settings.Language = LocalizationService.NormalizeLanguage(this.settings.Language);
+
+            if (this.settings.UpdateCheckIntervalDays < 1)
+            {
+                this.settings.UpdateCheckIntervalDays = 1;
+            }
+
+            if (this.settings.UpdateCheckIntervalDays > 365)
+            {
+                this.settings.UpdateCheckIntervalDays = 365;
+            }
+        }
 
         public async Task ExportSettingsAsync(string filePath)
         {
diff --git a/Services/ApplicationVersionProvider.cs b/Services/ApplicationVersionProvider.cs
new file mode 100644
index 0000000..b62b44a
--- /dev/null
+++ b/Services/ApplicationVersionProvider.cs
@@ -0,0 +1,36 @@
+/*
+ * ThreadPilot - application version provider for update checks.
+ */
+namespace ThreadPilot.Services
+{
+    using System;
+    using System.Linq;
+    using System.Reflection;
+
+    public sealed class ApplicationVersionProvider : IApplicationVersionProvider
+    {
+        public SemanticVersion CurrentVersion
+        {
+            get
+            {
+                var rawVersion = GetRawVersion();
+                return SemanticVersion.TryParse(rawVersion, out var version)
+                    ? version
+                    : new SemanticVersion(0, 0, 0);
+            }
+        }
+
+        public string DisplayVersion => $"v{this.CurrentVersion}";
+
+        private static string GetRawVersion()
+        {
+            return typeof(App).Assembly
+                .GetCustomAttributes(typeof(AssemblyInformationalVersionAttribute), false)
+                .OfType<AssemblyInformationalVersionAttribute>()
+                .FirstOrDefault()?
+                .InformationalVersion
+                ?? typeof(App).Assembly.GetName().Version?.ToString()
+                ?? "0.0.0";
+        }
+    }
+}
diff --git a/Services/AuthenticodeSignatureVerifier.cs b/Services/AuthenticodeSignatureVerifier.cs
new file mode 100644
index 0000000..63b1735
--- /dev/null
+++ b/Services/AuthenticodeSignatureVerifier.cs
@@ -0,0 +1,46 @@
+/*
+ * ThreadPilot - best-effort Authenticode signature detection.
+ */
+namespace ThreadPilot.Services
+{
+    using System;
+    using System.IO;
+    using System.Security.Cryptography;
+    using System.Security.Cryptography.X509Certificates;
+
+    public sealed class AuthenticodeSignatureVerifier : IUpdateSignatureVerifier
+    {
+        public UpdateSignatureStatus Verify(string installerPath)
+        {
+            if (!File.Exists(installerPath))
+            {
+                return UpdateSignatureStatus.Invalid;
+            }
+
+            try
+            {
+                using var certificate = new X509Certificate2(X509Certificate.CreateFromSignedFile(installerPath));
+                using var chain = new X509Chain
+                {
+                    ChainPolicy =
+                    {
+                        RevocationMode = X509RevocationMode.Online,
+                        RevocationFlag = X509RevocationFlag.ExcludeRoot,
+                    },
+                };
+
+                return chain.Build(certificate)
+                    ? UpdateSignatureStatus.Valid
+                    : UpdateSignatureStatus.Unknown;
+            }
+            catch (CryptographicException)
+            {
+                return UpdateSignatureStatus.Unknown;
+            }
+            catch (PlatformNotSupportedException)
+            {
+                return UpdateSignatureStatus.Unknown;
+            }
+        }
+    }
+}
diff --git a/Services/GitHubReleaseClient.cs b/Services/GitHubReleaseClient.cs
index ac4a542..655ce50 100644
--- a/Services/GitHubReleaseClient.cs
+++ b/Services/GitHubReleaseClient.cs
@@ -23,5 +23,11 @@ public Task<string> GetLatestReleaseJsonAsync(string owner, string repo, Cancell
             var url = $"https://api.github.com/repos/{owner}/{repo}/releases/latest";
             return this.httpClient.GetStringAsync(url, cancellationToken);
         }
+
+        public Task<string> GetReleasesJsonAsync(string owner, string repo, CancellationToken cancellationToken = default)
+        {
+            var url = $"https://api.github.com/repos/{owner}/{repo}/releases";
+            return this.httpClient.GetStringAsync(url, cancellationToken);
+        }
     }
 }
diff --git a/Services/GitHubUpdateChecker.cs b/Services/GitHubUpdateChecker.cs
index 027753c..621b31e 100644
--- a/Services/GitHubUpdateChecker.cs
+++ b/Services/GitHubUpdateChecker.cs
@@ -17,6 +17,8 @@
 namespace ThreadPilot.Services
 {
     using System;
+    using System.Collections.Generic;
+    using System.Linq;
     using System.Text.Json;
     using System.Threading;
     using System.Threading.Tasks;
@@ -26,7 +28,14 @@ public sealed class GitHubUpdateChecker
     {
         private readonly IGitHubReleaseClient gitHubReleaseClient;
 
-        private record LatestRelease(string Tag_name, bool Prerelease, bool Draft, string Html_url);
+        private record LatestRelease(
+            string Tag_name,
+            bool Prerelease,
+            bool Draft,
+            string Html_url,
+            IReadOnlyList<LatestReleaseAsset>? Assets);
+
+        private record LatestReleaseAsset(string Name, string Browser_download_url, long Size);
 
         public GitHubUpdateChecker(IGitHubReleaseClient gitHubReleaseClient)
         {
@@ -71,6 +80,64 @@ public GitHubUpdateChecker(IGitHubReleaseClient gitHubReleaseClient)
                 ? (version, release.Html_url)
                 : (null, release.Html_url);
         }
+
+        public async Task<UpdateReleaseInfo?> GetLatestReleaseInfoAsync(
+            string owner,
+            string repo,
+            bool includePrereleases = false,
+            CancellationToken cancellationToken = default)
+        {
+            if (string.IsNullOrWhiteSpace(owner))
+            {
+                throw new ArgumentException("Owner is required", nameof(owner));
+            }
+
+            if (string.IsNullOrWhiteSpace(repo))
+            {
+                throw new ArgumentException("Repository is required", nameof(repo));
+            }
+
+            var json = await this.gitHubReleaseClient.GetReleasesJsonAsync(owner, repo, cancellationToken).ConfigureAwait(false);
+            var releases = JsonSerializer.Deserialize<List<LatestRelease>>(json, new JsonSerializerOptions
+            {
+                PropertyNameCaseInsensitive = true,
+            });
+
+            if (releases == null || releases.Count == 0)
+            {
+                return null;
+            }
+
+            return releases
+                .Where(release => !release.Draft)
+                .Where(release => includePrereleases || !release.Prerelease)
+                .Select(TryMapRelease)
+                .Where(release => release != null)
+                .Cast<UpdateReleaseInfo>()
+                .OrderByDescending(release => release.Version)
+                .FirstOrDefault();
+        }
+
+        private static UpdateReleaseInfo? TryMapRelease(LatestRelease release)
+        {
+            if (!SemanticVersion.TryParse(release.Tag_name, out var version) ||
+                string.IsNullOrWhiteSpace(release.Html_url) ||
+                !Uri.TryCreate(release.Html_url, UriKind.Absolute, out var releasePageUrl))
+            {
+                return null;
+            }
+
+            var assets = (release.Assets ?? Array.Empty<LatestReleaseAsset>())
+                .Where(asset => !string.IsNullOrWhiteSpace(asset.Name))
+                .Where(asset => Uri.TryCreate(asset.Browser_download_url, UriKind.Absolute, out _))
+                .Select(asset => new UpdateAsset(
+                    asset.Name,
+                    new Uri(asset.Browser_download_url, UriKind.Absolute),
+                    asset.Size))
+                .ToArray();
+
+            return new UpdateReleaseInfo(version, release.Tag_name, releasePageUrl, release.Prerelease, assets);
+        }
     }
 }
 
diff --git a/Services/HttpUpdateDownloadClient.cs b/Services/HttpUpdateDownloadClient.cs
new file mode 100644
index 0000000..a98aba1
--- /dev/null
+++ b/Services/HttpUpdateDownloadClient.cs
@@ -0,0 +1,44 @@
+/*
+ * ThreadPilot - HTTP downloads for update assets.
+ */
+namespace ThreadPilot.Services
+{
+    using System;
+    using System.IO;
+    using System.Net.Http;
+    using System.Threading;
+    using System.Threading.Tasks;
+
+    public sealed class HttpUpdateDownloadClient : IUpdateDownloadClient
+    {
+        private readonly HttpClient httpClient;
+
+        public HttpUpdateDownloadClient(HttpClient httpClient)
+        {
+            this.httpClient = httpClient ?? throw new ArgumentNullException(nameof(httpClient));
+        }
+
+        public async Task DownloadFileAsync(Uri uri, string destinationPath, CancellationToken cancellationToken = default)
+        {
+            using var response = await this.httpClient.GetAsync(uri, HttpCompletionOption.ResponseHeadersRead, cancellationToken)
+                .ConfigureAwait(false);
+            response.EnsureSuccessStatusCode();
+
+            await using var source = await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
+            await using var destination = File.Create(destinationPath);
+            await source.CopyToAsync(destination, cancellationToken).ConfigureAwait(false);
+        }
+
+        public async Task<string?> TryDownloadStringAsync(Uri uri, CancellationToken cancellationToken = default)
+        {
+            try
+            {
+                return await this.httpClient.GetStringAsync(uri, cancellationToken).ConfigureAwait(false);
+            }
+            catch (HttpRequestException)
+            {
+                return null;
+            }
+        }
+    }
+}
diff --git a/Services/NotificationService.cs b/Services/NotificationService.cs
index 3298302..e6e7081 100644
--- a/Services/NotificationService.cs
+++ b/Services/NotificationService.cs
@@ -436,7 +436,23 @@ private string TryGetLocalizedNotificationString(string input)
                 "Game Boost Deactivated" => "Notification_GameBoostDeactivatedTitle",
                 "Process Monitor Error" => "Notification_ProcessMonitorErrorTitle",
                 "Affinity blocked" => "Notification_AffinityBlockedTitle",
+                "Affinity applied" => "Notification_AffinityAppliedTitle",
+                "Affinity adjusted" => "Notification_AffinityAdjustedTitle",
+                "Affinity failed" => "Notification_AffinityFailedTitle",
+                "Affinity error" => "Notification_AffinityErrorTitle",
                 "Priority blocked" => "Notification_PriorityBlockedTitle",
+                "Priority warning" => "Notification_PriorityWarningTitle",
+                "Priority applied" => "Notification_PriorityAppliedTitle",
+                "Priority adjusted" => "Notification_PriorityAdjustedTitle",
+                "Priority error" => "Notification_PriorityErrorTitle",
+                "Keyboard Shortcut" => "Notification_KeyboardShortcutTitle",
+                "ThreadPilot Started" => "Notification_ThreadPilotStartedTitle",
+                "Startup Error" => "Notification_StartupErrorTitle",
+                "Automation Monitoring Error" => "Notification_AutomationMonitoringErrorTitle",
+                "Settings Saved" => "Notification_SettingsSavedTitle",
+                "Settings Saved with Warnings" => "Notification_SettingsSavedWarningsTitle",
+                "Settings Error" => "Notification_SettingsErrorTitle",
+                "Test Notification" => "SettingsView_TestNotification",
                 _ => null,
             };
 
@@ -471,6 +487,28 @@ private string TryGetLocalizedNotificationString(string input)
                 }
             }
 
+            key = input switch
+            {
+                "Toggle monitoring shortcut activated" => "Notification_ToggleMonitoringShortcut",
+                "High Performance power plan shortcut activated" => "Notification_HighPerformanceShortcut",
+                "Refresh process list shortcut activated" => "Notification_RefreshProcessListShortcut",
+                "Process monitoring and power plan management is now active" => "Notification_ThreadPilotStartedMessage",
+                "Failed to start process monitoring manager" => "Notification_ProcessMonitoringStartFailed",
+                "Application settings have been saved successfully" => "Notification_SettingsSavedMessage",
+                "Failed to save settings" => "Notification_SettingsSaveFailed",
+                "This is a test notification to verify your settings are working correctly." => "Notification_TestNotificationMessage",
+                _ => null,
+            };
+
+            if (key != null)
+            {
+                var localized = this.GetLocalizedString(key);
+                if (!string.Equals(localized, key, StringComparison.Ordinal))
+                {
+                    return localized;
+                }
+            }
+
             return input;
         }
 
diff --git a/Services/SemanticVersion.cs b/Services/SemanticVersion.cs
new file mode 100644
index 0000000..cf8dd64
--- /dev/null
+++ b/Services/SemanticVersion.cs
@@ -0,0 +1,104 @@
+/*
+ * ThreadPilot - semantic version parsing for updater decisions.
+ */
+namespace ThreadPilot.Services
+{
+    using System;
+    using System.Globalization;
+
+    public readonly record struct SemanticVersion(int Major, int Minor, int Patch, string? Prerelease = null)
+        : IComparable<SemanticVersion>
+    {
+        public bool IsPrerelease => !string.IsNullOrWhiteSpace(this.Prerelease);
+
+        public static bool TryParse(string? value, out SemanticVersion version)
+        {
+            version = default;
+            if (string.IsNullOrWhiteSpace(value))
+            {
+                return false;
+            }
+
+            var sanitized = value.Trim();
+            if (sanitized.StartsWith("v", StringComparison.OrdinalIgnoreCase))
+            {
+                sanitized = sanitized[1..];
+            }
+
+            sanitized = sanitized.Split('+')[0];
+            var versionAndPrerelease = sanitized.Split('-', 2);
+            var parts = versionAndPrerelease[0].Split('.');
+            if (parts.Length < 2 || parts.Length > 3)
+            {
+                return false;
+            }
+
+            if (!int.TryParse(parts[0], NumberStyles.None, CultureInfo.InvariantCulture, out var major) ||
+                !int.TryParse(parts[1], NumberStyles.None, CultureInfo.InvariantCulture, out var minor))
+            {
+                return false;
+            }
+
+            var patch = 0;
+            if (parts.Length == 3 &&
+                !int.TryParse(parts[2], NumberStyles.None, CultureInfo.InvariantCulture, out patch))
+            {
+                return false;
+            }
+
+            version = new SemanticVersion(
+                major,
+                minor,
+                patch,
+                versionAndPrerelease.Length == 2 ? versionAndPrerelease[1] : null);
+            return true;
+        }
+
+        public int CompareTo(SemanticVersion other)
+        {
+            var major = this.Major.CompareTo(other.Major);
+            if (major != 0)
+            {
+                return major;
+            }
+
+            var minor = this.Minor.CompareTo(other.Minor);
+            if (minor != 0)
+            {
+                return minor;
+            }
+
+            var patch = this.Patch.CompareTo(other.Patch);
+            if (patch != 0)
+            {
+                return patch;
+            }
+
+            if (!this.IsPrerelease && other.IsPrerelease)
+            {
+                return 1;
+            }
+
+            if (this.IsPrerelease && !other.IsPrerelease)
+            {
+                return -1;
+            }
+
+            return string.Compare(this.Prerelease, other.Prerelease, StringComparison.OrdinalIgnoreCase);
+        }
+
+        public override string ToString()
+        {
+            var version = $"{this.Major}.{this.Minor}.{this.Patch}";
+            return this.IsPrerelease ? $"{version}-{this.Prerelease}" : version;
+        }
+
+        public static bool operator >(SemanticVersion left, SemanticVersion right) => left.CompareTo(right) > 0;
+
+        public static bool operator <(SemanticVersion left, SemanticVersion right) => left.CompareTo(right) < 0;
+
+        public static bool operator >=(SemanticVersion left, SemanticVersion right) => left.CompareTo(right) >= 0;
+
+        public static bool operator <=(SemanticVersion left, SemanticVersion right) => left.CompareTo(right) <= 0;
+    }
+}
diff --git a/Services/ServiceConfiguration.cs b/Services/ServiceConfiguration.cs
index 23dc385..45a0a46 100644
--- a/Services/ServiceConfiguration.cs
+++ b/Services/ServiceConfiguration.cs
@@ -78,6 +78,16 @@ private static IServiceCollection ConfigureServiceInfrastructure(this IServiceCo
             });
             services.AddSingleton<IGitHubReleaseClient, GitHubReleaseClient>();
             services.AddSingleton<GitHubUpdateChecker>();
+            services.AddSingleton<IApplicationVersionProvider, ApplicationVersionProvider>();
+            services.AddSingleton<IUpdateClock, SystemUpdateClock>();
+            services.AddSingleton<IUpdateDownloadClient, HttpUpdateDownloadClient>();
+            services.AddSingleton<IUpdateTempDirectoryProvider, UpdateTempDirectoryProvider>();
+            services.AddSingleton<IUpdateSignatureVerifier, AuthenticodeSignatureVerifier>();
+            services.AddSingleton<IUpdateDownloadService, UpdateDownloadService>();
+            services.AddSingleton<IUpdateProcessLauncher, ShellUpdateProcessLauncher>();
+            services.AddSingleton<IUpdateInstallerService, UpdateInstallerService>();
+            services.AddSingleton<IApplicationShutdownService, WpfApplicationShutdownService>();
+            services.AddSingleton<IUpdateService, UpdateService>();
 
             // Memory caching for performance - PERFORMANCE IMPROVEMENT
             services.AddMemoryCache();
diff --git a/Services/SystemTrayService.cs b/Services/SystemTrayService.cs
index 049f44d..52e8b85 100644
--- a/Services/SystemTrayService.cs
+++ b/Services/SystemTrayService.cs
@@ -40,7 +40,10 @@ public class SystemTrayService : ISystemTrayService
         private ToolStripMenuItem? profilesMenuItem;
         private ToolStripMenuItem? performanceMenuItem;
         private ToolStripMenuItem? systemStatusMenuItem;
+        private ToolStripMenuItem? openDashboardMenuItem;
+        private ToolStripMenuItem? exitMenuItem;
         private ApplicationSettingsModel settings;
+        private readonly ILocalizationService? localizationService;
         private bool isMonitoring = true;
         private bool isWmiAvailable = true;
         private TrayIconState currentIconState = TrayIconState.Normal;
@@ -67,10 +70,15 @@ public class SystemTrayService : ISystemTrayService
 
         public event EventHandler? DashboardRequested;
 
-        public SystemTrayService(ILogger<SystemTrayService> logger)
+        public SystemTrayService(ILogger<SystemTrayService> logger, ILocalizationService? localizationService = null)
         {
             this.logger = logger ?? throw new ArgumentNullException(nameof(logger));
+            this.localizationService = localizationService;
             this.settings = new ApplicationSettingsModel(); // Default settings
+            if (this.localizationService != null)
+            {
+                this.localizationService.LanguageChanged += this.OnLanguageChanged;
+            }
         }
 
         public void Initialize()
@@ -89,7 +97,7 @@ public void Initialize()
                 // Create the notify icon
                 this.notifyIcon = new NotifyIcon
                 {
-                    Text = "ThreadPilot - Process & Power Plan Manager",
+                    Text = this.Localize("MainWindow_Title", "ThreadPilot - Process & Power Plan Manager"),
                     Visible = false,
                 };
 
@@ -121,16 +129,16 @@ private void CreateContextMenu()
             this.menuFont = CreatePreferredMenuFont(this.contextMenu.Font.Size);
             this.contextMenu.Font = this.menuFont;
 
-            var openDashboardMenuItem = new ToolStripMenuItem("Open Dashboard")
+            this.openDashboardMenuItem = new ToolStripMenuItem(this.Localize("SystemTray_OpenDashboard", "Open Dashboard"))
             {
                 Font = new Font(this.menuFont, FontStyle.Regular),
             };
-            openDashboardMenuItem.Click += this.OnDashboardClick;
-            this.contextMenu.Items.Add(openDashboardMenuItem);
+            this.openDashboardMenuItem.Click += this.OnDashboardClick;
+            this.contextMenu.Items.Add(this.openDashboardMenuItem);
 
             if (AppNavigationOptions.ShowAdvancedDiagnostics)
             {
-                this.performanceMenuItem = new ToolStripMenuItem("Open Diagnostics")
+                this.performanceMenuItem = new ToolStripMenuItem(this.Localize("SystemTray_OpenDiagnostics", "Open Diagnostics"))
                 {
                     Font = new Font(this.menuFont, FontStyle.Regular),
                 };
@@ -138,14 +146,14 @@ private void CreateContextMenu()
                 this.contextMenu.Items.Add(this.performanceMenuItem);
             }
 
-            this.monitoringToggleMenuItem = new ToolStripMenuItem("Pause Automation Monitoring");
+            this.monitoringToggleMenuItem = new ToolStripMenuItem(this.Localize("SystemTray_PauseMonitoring", "Pause Automation Monitoring"));
             this.monitoringToggleMenuItem.Click += this.OnMonitoringToggleClick;
             this.contextMenu.Items.Add(this.monitoringToggleMenuItem);
 
             this.contextMenu.Items.Add(new ToolStripSeparator());
 
             // System status (disabled, for display only)
-            this.systemStatusMenuItem = new ToolStripMenuItem("System Status")
+            this.systemStatusMenuItem = new ToolStripMenuItem(this.Localize("SystemTray_SystemStatus", "System Status"))
             {
                 Enabled = false,
                 Font = new Font(this.menuFont, FontStyle.Regular),
@@ -153,7 +161,7 @@ private void CreateContextMenu()
             this.contextMenu.Items.Add(this.systemStatusMenuItem);
 
             // Selected process info (disabled, for display only)
-            this.selectedProcessMenuItem = new ToolStripMenuItem("No process selected")
+            this.selectedProcessMenuItem = new ToolStripMenuItem(this.Localize("SystemTray_NoProcessSelected", "No process selected"))
             {
                 Enabled = false,
                 Font = new Font(this.menuFont, FontStyle.Regular),
@@ -161,7 +169,7 @@ private void CreateContextMenu()
             this.contextMenu.Items.Add(this.selectedProcessMenuItem);
 
             // Quick apply command
-            this.quickApplyMenuItem = new ToolStripMenuItem("Apply Pending Settings to Selected Process")
+            this.quickApplyMenuItem = new ToolStripMenuItem(this.Localize("SystemTray_ApplyPendingToSelected", "Apply Pending Settings to Selected Process"))
             {
                 Enabled = false,
             };
@@ -171,17 +179,17 @@ private void CreateContextMenu()
             this.contextMenu.Items.Add(new ToolStripSeparator());
 
             // Power Plans submenu
-            this.powerPlansMenuItem = new ToolStripMenuItem("🔋 Power Plans");
+            this.powerPlansMenuItem = new ToolStripMenuItem(this.Localize("SystemTray_PowerPlans", "🔋 Power Plans"));
             this.contextMenu.Items.Add(this.powerPlansMenuItem);
 
             // Profiles submenu
-            this.profilesMenuItem = new ToolStripMenuItem("📋 Profiles");
+            this.profilesMenuItem = new ToolStripMenuItem(this.Localize("SystemTray_Profiles", "📋 Profiles"));
             this.contextMenu.Items.Add(this.profilesMenuItem);
 
             this.contextMenu.Items.Add(new ToolStripSeparator());
 
             // Settings
-            this.settingsMenuItem = new ToolStripMenuItem("Settings");
+            this.settingsMenuItem = new ToolStripMenuItem(this.Localize("SystemTray_Settings", "Settings"));
             this.settingsMenuItem.Click += this.OnSettingsClick;
             this.contextMenu.Items.Add(this.settingsMenuItem);
 
@@ -189,9 +197,9 @@ private void CreateContextMenu()
             this.contextMenu.Items.Add(new ToolStripSeparator());
 
             // Exit
-            var exitMenuItem = new ToolStripMenuItem("Exit");
-            exitMenuItem.Click += this.OnExitClick;
-            this.contextMenu.Items.Add(exitMenuItem);
+            this.exitMenuItem = new ToolStripMenuItem(this.Localize("SystemTray_Exit", "Exit"));
+            this.exitMenuItem.Click += this.OnExitClick;
+            this.contextMenu.Items.Add(this.exitMenuItem);
 
             this.ApplyContextMenuTheme();
         }
@@ -239,15 +247,19 @@ public void UpdateContextMenu(string? selectedProcessName = null, bool hasSelect
 
             if (hasSelection && !string.IsNullOrEmpty(selectedProcessName))
             {
-                this.selectedProcessMenuItem.Text = $"Selected: {selectedProcessName}";
+                this.selectedProcessMenuItem.Text = string.Format(
+                    this.Localize("SystemTray_SelectedProcessFormat", "Selected: {0}"),
+                    selectedProcessName);
                 this.quickApplyMenuItem.Enabled = true;
-                this.quickApplyMenuItem.Text = $"Apply Pending Settings to {selectedProcessName}";
+                this.quickApplyMenuItem.Text = string.Format(
+                    this.Localize("SystemTray_ApplyPendingToProcessFormat", "Apply Pending Settings to {0}"),
+                    selectedProcessName);
             }
             else
             {
-                this.selectedProcessMenuItem.Text = "No process selected";
+                this.selectedProcessMenuItem.Text = this.Localize("SystemTray_NoProcessSelected", "No process selected");
                 this.quickApplyMenuItem.Enabled = false;
-                this.quickApplyMenuItem.Text = "Apply Pending Settings to Selected Process";
+                this.quickApplyMenuItem.Text = this.Localize("SystemTray_ApplyPendingToSelected", "Apply Pending Settings to Selected Process");
             }
         }
 
@@ -335,7 +347,9 @@ public void UpdateMonitoringStatus(bool isMonitoring, bool isWmiAvailable = true
 
             if (this.monitoringToggleMenuItem != null)
             {
-                this.monitoringToggleMenuItem.Text = isMonitoring ? "Pause Automation Monitoring" : "Resume Automation Monitoring";
+                this.monitoringToggleMenuItem.Text = isMonitoring
+                    ? this.Localize("SystemTray_PauseMonitoring", "Pause Automation Monitoring")
+                    : this.Localize("SystemTray_ResumeMonitoring", "Resume Automation Monitoring");
                 this.monitoringToggleMenuItem.Enabled = isWmiAvailable;
             }
 
@@ -345,8 +359,11 @@ public void UpdateMonitoringStatus(bool isMonitoring, bool isWmiAvailable = true
             this.UpdateTrayIcon(iconState);
 
             // Update tooltip
-            var status = !isWmiAvailable ? "Automation WMI Error" :
-                        isMonitoring ? "Automation Active" : "Automation Disabled";
+            var status = !isWmiAvailable
+                ? this.Localize("SystemTray_StatusWmiError", "Automation WMI Error")
+                : isMonitoring
+                    ? this.Localize("SystemTray_StatusActive", "Automation Active")
+                    : this.Localize("SystemTray_StatusDisabled", "Automation Disabled");
             this.UpdateTooltip($"ThreadPilot - {status}");
         }
 
@@ -460,7 +477,7 @@ public void UpdateProfiles(IEnumerable<string> profileNames)
 
                 if (!profileNames.Any())
                 {
-                    var noProfilesItem = new ToolStripMenuItem("No profiles available")
+                    var noProfilesItem = new ToolStripMenuItem(this.Localize("SystemTray_NoProfilesAvailable", "No profiles available"))
                     {
                         Enabled = false,
                     };
@@ -498,7 +515,11 @@ public void UpdateSystemStatus(string currentPowerPlan, double cpuUsage, double
 
             try
             {
-                this.systemStatusMenuItem.Text = $"💻 CPU: {cpuUsage:F1}% | RAM: {memoryUsage:F1}% | {currentPowerPlan}";
+                this.systemStatusMenuItem.Text = string.Format(
+                    this.Localize("SystemTray_CpuRamStatusFormat", "💻 CPU: {0:F1}% | RAM: {1:F1}% | {2}"),
+                    cpuUsage,
+                    memoryUsage,
+                    currentPowerPlan);
                 this.logger.LogDebug("Updated system status in context menu");
             }
             catch (Exception ex)
@@ -516,7 +537,9 @@ public void UpdateSystemStatus(string currentPowerPlan)
 
             try
             {
-                this.systemStatusMenuItem.Text = $"Power Plan: {currentPowerPlan}";
+                this.systemStatusMenuItem.Text = string.Format(
+                    this.Localize("SystemTray_PowerPlanFormat", "Power Plan: {0}"),
+                    currentPowerPlan);
                 this.logger.LogDebug("Updated non-performance system status in context menu");
             }
             catch (Exception ex)
@@ -552,6 +575,10 @@ public void Dispose()
 
                 this.menuFont?.Dispose();
                 this.menuFont = null;
+                if (this.localizationService != null)
+                {
+                    this.localizationService.LanguageChanged -= this.OnLanguageChanged;
+                }
 
                 this.disposed = true;
                 this.logger.LogInformation("System tray service disposed");
@@ -586,6 +613,70 @@ public void Dispose()
             return null;
         }
 
+        private void OnLanguageChanged(object? sender, string language)
+        {
+            this.UpdateLocalizedMenuText();
+        }
+
+        private void UpdateLocalizedMenuText()
+        {
+            if (this.notifyIcon != null)
+            {
+                this.notifyIcon.Text = this.Localize("MainWindow_Title", "ThreadPilot - Process & Power Plan Manager");
+            }
+
+            if (this.openDashboardMenuItem != null)
+            {
+                this.openDashboardMenuItem.Text = this.Localize("SystemTray_OpenDashboard", "Open Dashboard");
+            }
+
+            if (this.performanceMenuItem != null)
+            {
+                this.performanceMenuItem.Text = this.Localize("SystemTray_OpenDiagnostics", "Open Diagnostics");
+            }
+
+            if (this.systemStatusMenuItem != null)
+            {
+                this.systemStatusMenuItem.Text = this.Localize("SystemTray_SystemStatus", "System Status");
+            }
+
+            if (this.powerPlansMenuItem != null)
+            {
+                this.powerPlansMenuItem.Text = this.Localize("SystemTray_PowerPlans", "🔋 Power Plans");
+            }
+
+            if (this.profilesMenuItem != null)
+            {
+                this.profilesMenuItem.Text = this.Localize("SystemTray_Profiles", "📋 Profiles");
+            }
+
+            if (this.settingsMenuItem != null)
+            {
+                this.settingsMenuItem.Text = this.Localize("SystemTray_Settings", "Settings");
+            }
+
+            if (this.exitMenuItem != null)
+            {
+                this.exitMenuItem.Text = this.Localize("SystemTray_Exit", "Exit");
+            }
+
+            this.UpdateContextMenu();
+            this.UpdateMonitoringStatus(this.isMonitoring, this.isWmiAvailable);
+        }
+
+        private string Localize(string key, string fallback)
+        {
+            if (this.localizationService == null)
+            {
+                return fallback;
+            }
+
+            var localized = this.localizationService.GetString(key);
+            return string.IsNullOrWhiteSpace(localized) || string.Equals(localized, key, StringComparison.Ordinal)
+                ? fallback
+                : localized;
+        }
+
         private Icon? TryLoadEmbeddedIcon()
         {
             try
diff --git a/Services/SystemTrayStatusUpdater.cs b/Services/SystemTrayStatusUpdater.cs
index 13b2586..6fa2592 100644
--- a/Services/SystemTrayStatusUpdater.cs
+++ b/Services/SystemTrayStatusUpdater.cs
@@ -36,13 +36,16 @@ public sealed class SystemTrayStatusUpdater : ISystemTrayStatusUpdater
     {
         private readonly IPowerPlanService powerPlanService;
         private readonly Lazy<IPerformanceMonitoringService> performanceService;
+        private readonly ILocalizationService? localizationService;
 
         public SystemTrayStatusUpdater(
             IPowerPlanService powerPlanService,
-            Lazy<IPerformanceMonitoringService> performanceService)
+            Lazy<IPerformanceMonitoringService> performanceService,
+            ILocalizationService? localizationService = null)
         {
             this.powerPlanService = powerPlanService ?? throw new ArgumentNullException(nameof(powerPlanService));
             this.performanceService = performanceService ?? throw new ArgumentNullException(nameof(performanceService));
+            this.localizationService = localizationService;
         }
 
         public bool ShouldRunPerformanceStatusUpdates => AppNavigationOptions.ShowAdvancedDiagnostics;
@@ -110,7 +113,7 @@ private async Task UpdateStatusCoreAsync(
             PowerPlanModel? activePowerPlan,
             Func<Action, Task> dispatchAsync)
         {
-            var planName = activePowerPlan?.Name ?? "Unknown";
+            var planName = activePowerPlan?.Name ?? this.Localize("SystemTray_Unknown", "Unknown");
 
             if (!this.ShouldRunPerformanceStatusUpdates)
             {
@@ -140,5 +143,18 @@ await dispatchAsync(() => systemTrayService.UpdateSystemStatus(
 
             await dispatchAsync(() => systemTrayService.UpdateSystemStatus(planName)).ConfigureAwait(false);
         }
+
+        private string Localize(string key, string fallback)
+        {
+            if (this.localizationService == null)
+            {
+                return fallback;
+            }
+
+            var localized = this.localizationService.GetString(key);
+            return string.IsNullOrWhiteSpace(localized) || string.Equals(localized, key, StringComparison.Ordinal)
+                ? fallback
+                : localized;
+        }
     }
 }
diff --git a/Services/SystemUpdateClock.cs b/Services/SystemUpdateClock.cs
new file mode 100644
index 0000000..35f8351
--- /dev/null
+++ b/Services/SystemUpdateClock.cs
@@ -0,0 +1,12 @@
+/*
+ * ThreadPilot - updater clock abstraction.
+ */
+namespace ThreadPilot.Services
+{
+    using System;
+
+    public sealed class SystemUpdateClock : IUpdateClock
+    {
+        public DateTimeOffset UtcNow => DateTimeOffset.UtcNow;
+    }
+}
diff --git a/Services/UpdateAssetSelector.cs b/Services/UpdateAssetSelector.cs
new file mode 100644
index 0000000..10819f0
--- /dev/null
+++ b/Services/UpdateAssetSelector.cs
@@ -0,0 +1,81 @@
+/*
+ * ThreadPilot - release asset selection for safe installer updates.
+ */
+namespace ThreadPilot.Services
+{
+    using System;
+    using System.IO;
+    using System.Linq;
+
+    public static class UpdateAssetSelector
+    {
+        public static bool TrySelectInstaller(UpdateReleaseInfo release, out UpdateAsset asset)
+        {
+            var selected = release.Assets
+                .Where(IsInstallerAsset)
+                .OrderByDescending(candidate => candidate.Name.Contains("setup", StringComparison.OrdinalIgnoreCase))
+                .FirstOrDefault();
+
+            asset = selected!;
+            return selected != null;
+        }
+
+        public static UpdateAsset? SelectChecksumAsset(UpdateReleaseInfo release)
+        {
+            return release.Assets.FirstOrDefault(asset =>
+                string.Equals(asset.Name, "SHA256SUMS.txt", StringComparison.OrdinalIgnoreCase));
+        }
+
+        public static bool IsSafeGitHubAssetUrl(Uri uri)
+        {
+            if (uri.Scheme != Uri.UriSchemeHttps)
+            {
+                return false;
+            }
+
+            return string.Equals(uri.Host, "github.com", StringComparison.OrdinalIgnoreCase) ||
+                   string.Equals(uri.Host, "objects.githubusercontent.com", StringComparison.OrdinalIgnoreCase);
+        }
+
+        public static bool IsSafeAssetFileName(string assetName)
+        {
+            if (string.IsNullOrWhiteSpace(assetName))
+            {
+                return false;
+            }
+
+            if (!string.Equals(Path.GetFileName(assetName), assetName, StringComparison.Ordinal))
+            {
+                return false;
+            }
+
+            return assetName.IndexOfAny(Path.GetInvalidFileNameChars()) < 0;
+        }
+
+        private static bool IsInstallerAsset(UpdateAsset asset)
+        {
+            if (!IsSafeGitHubAssetUrl(asset.DownloadUrl) || !IsSafeAssetFileName(asset.Name))
+            {
+                return false;
+            }
+
+            if (!asset.Name.EndsWith(".exe", StringComparison.OrdinalIgnoreCase))
+            {
+                return false;
+            }
+
+            if (!asset.Name.StartsWith("ThreadPilot", StringComparison.OrdinalIgnoreCase))
+            {
+                return false;
+            }
+
+            if (asset.Name.Contains("portable", StringComparison.OrdinalIgnoreCase))
+            {
+                return false;
+            }
+
+            return asset.Name.Contains("setup", StringComparison.OrdinalIgnoreCase) ||
+                   asset.Name.Contains("installer", StringComparison.OrdinalIgnoreCase);
+        }
+    }
+}
diff --git a/Services/UpdateChecksumVerifier.cs b/Services/UpdateChecksumVerifier.cs
new file mode 100644
index 0000000..82ff53e
--- /dev/null
+++ b/Services/UpdateChecksumVerifier.cs
@@ -0,0 +1,73 @@
+/*
+ * ThreadPilot - SHA256SUMS parsing and verification.
+ */
+namespace ThreadPilot.Services
+{
+    using System;
+    using System.Globalization;
+    using System.IO;
+    using System.Linq;
+    using System.Security.Cryptography;
+
+    public static class UpdateChecksumVerifier
+    {
+        public static bool TryFindExpectedHash(string checksumsText, string fileName, out string expectedHash)
+        {
+            expectedHash = string.Empty;
+            foreach (var rawLine in checksumsText.Split(new[] { "\r\n", "\n" }, StringSplitOptions.RemoveEmptyEntries))
+            {
+                var line = rawLine.Trim();
+                if (line.Length == 0 || line.StartsWith('#'))
+                {
+                    continue;
+                }
+
+                if (line.StartsWith("SHA256(", StringComparison.OrdinalIgnoreCase))
+                {
+                    var close = line.IndexOf(')');
+                    var equals = line.IndexOf('=', StringComparison.Ordinal);
+                    if (close > 7 && equals > close)
+                    {
+                        var listedName = line[7..close];
+                        var hash = line[(equals + 1)..].Trim();
+                        if (IsHash(hash) && string.Equals(listedName, fileName, StringComparison.OrdinalIgnoreCase))
+                        {
+                            expectedHash = hash.ToUpperInvariant();
+                            return true;
+                        }
+                    }
+                }
+
+                var parts = line.Split((char[]?)null, StringSplitOptions.RemoveEmptyEntries);
+                if (parts.Length >= 2 && IsHash(parts[0]))
+                {
+                    var listedName = parts[^1].TrimStart('*');
+                    if (string.Equals(listedName, fileName, StringComparison.OrdinalIgnoreCase))
+                    {
+                        expectedHash = parts[0].ToUpperInvariant();
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        public static string ComputeSha256(string filePath)
+        {
+            using var stream = File.OpenRead(filePath);
+            var hash = SHA256.HashData(stream);
+            return string.Concat(hash.Select(b => b.ToString("X2", CultureInfo.InvariantCulture)));
+        }
+
+        public static bool Verify(string filePath, string expectedHash)
+        {
+            return string.Equals(ComputeSha256(filePath), expectedHash, StringComparison.OrdinalIgnoreCase);
+        }
+
+        private static bool IsHash(string value)
+        {
+            return value.Length == 64 && value.All(Uri.IsHexDigit);
+        }
+    }
+}
diff --git a/Services/UpdateDownloadService.cs b/Services/UpdateDownloadService.cs
new file mode 100644
index 0000000..e14c343
--- /dev/null
+++ b/Services/UpdateDownloadService.cs
@@ -0,0 +1,103 @@
+/*
+ * ThreadPilot - secure update installer download and verification.
+ */
+namespace ThreadPilot.Services
+{
+    using System;
+    using System.IO;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using Microsoft.Extensions.Logging;
+
+    public sealed class UpdateDownloadService : IUpdateDownloadService
+    {
+        private readonly IUpdateDownloadClient downloadClient;
+        private readonly IUpdateTempDirectoryProvider tempDirectoryProvider;
+        private readonly IUpdateSignatureVerifier signatureVerifier;
+        private readonly ILogger<UpdateDownloadService> logger;
+
+        public UpdateDownloadService(
+            IUpdateDownloadClient downloadClient,
+            IUpdateTempDirectoryProvider tempDirectoryProvider,
+            IUpdateSignatureVerifier signatureVerifier,
+            ILogger<UpdateDownloadService> logger)
+        {
+            this.downloadClient = downloadClient ?? throw new ArgumentNullException(nameof(downloadClient));
+            this.tempDirectoryProvider = tempDirectoryProvider ?? throw new ArgumentNullException(nameof(tempDirectoryProvider));
+            this.signatureVerifier = signatureVerifier ?? throw new ArgumentNullException(nameof(signatureVerifier));
+            this.logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        }
+
+        public async Task<UpdateDownloadResult> DownloadInstallerAsync(UpdateReleaseInfo release, CancellationToken cancellationToken = default)
+        {
+            if (!UpdateAssetSelector.TrySelectInstaller(release, out var installerAsset))
+            {
+                throw new InvalidOperationException("Release does not contain a ThreadPilot installer asset.");
+            }
+
+            var tempDirectory = this.tempDirectoryProvider.CreateUpdateTempDirectory(release.Version);
+            try
+            {
+                var installerPath = Path.Combine(tempDirectory, installerAsset.Name);
+                await this.downloadClient.DownloadFileAsync(installerAsset.DownloadUrl, installerPath, cancellationToken)
+                    .ConfigureAwait(false);
+
+                var checksumVerified = false;
+                var checksumAsset = UpdateAssetSelector.SelectChecksumAsset(release);
+                if (checksumAsset != null)
+                {
+                    var checksumText = await this.downloadClient.TryDownloadStringAsync(checksumAsset.DownloadUrl, cancellationToken)
+                        .ConfigureAwait(false);
+                    if (string.IsNullOrWhiteSpace(checksumText) ||
+                        !UpdateChecksumVerifier.TryFindExpectedHash(checksumText, installerAsset.Name, out var expectedHash))
+                    {
+                        throw new InvalidOperationException("SHA256SUMS.txt did not contain the installer checksum.");
+                    }
+
+                    if (!UpdateChecksumVerifier.Verify(installerPath, expectedHash))
+                    {
+                        throw new InvalidOperationException("Installer SHA256 checksum did not match SHA256SUMS.txt.");
+                    }
+
+                    checksumVerified = true;
+                }
+
+                var signatureStatus = this.signatureVerifier.Verify(installerPath);
+                if (signatureStatus == UpdateSignatureStatus.Invalid)
+                {
+                    throw new InvalidOperationException("Installer Authenticode signature is invalid.");
+                }
+
+                this.logger.LogInformation(
+                    "Downloaded ThreadPilot update installer {InstallerName}; checksum verified: {ChecksumVerified}; signature: {SignatureStatus}",
+                    installerAsset.Name,
+                    checksumVerified,
+                    signatureStatus);
+
+                return new UpdateDownloadResult(
+                    installerPath,
+                    tempDirectory,
+                    checksumVerified,
+                    signatureStatus,
+                    checksumVerified ? "Installer checksum verified." : "No SHA256SUMS.txt asset was available.");
+            }
+            catch
+            {
+                this.TryCleanup(tempDirectory);
+                throw;
+            }
+        }
+
+        private void TryCleanup(string tempDirectory)
+        {
+            try
+            {
+                this.tempDirectoryProvider.Cleanup(tempDirectory);
+            }
+            catch (Exception ex)
+            {
+                this.logger.LogWarning(ex, "Failed to clean update temp directory {TempDirectory}", tempDirectory);
+            }
+        }
+    }
+}
diff --git a/Services/UpdateInstallerService.cs b/Services/UpdateInstallerService.cs
new file mode 100644
index 0000000..d710d65
--- /dev/null
+++ b/Services/UpdateInstallerService.cs
@@ -0,0 +1,64 @@
+/*
+ * ThreadPilot - elevated update installer launch.
+ */
+namespace ThreadPilot.Services
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Diagnostics;
+    using System.IO;
+    using System.Threading;
+    using System.Threading.Tasks;
+
+    public sealed class UpdateInstallerService : IUpdateInstallerService
+    {
+        private readonly IUpdateTempDirectoryProvider tempDirectoryProvider;
+        private readonly IUpdateProcessLauncher processLauncher;
+
+        public UpdateInstallerService(
+            IUpdateTempDirectoryProvider tempDirectoryProvider,
+            IUpdateProcessLauncher processLauncher)
+        {
+            this.tempDirectoryProvider = tempDirectoryProvider ?? throw new ArgumentNullException(nameof(tempDirectoryProvider));
+            this.processLauncher = processLauncher ?? throw new ArgumentNullException(nameof(processLauncher));
+        }
+
+        public Task LaunchInstallerElevatedAsync(string installerPath, CancellationToken cancellationToken = default)
+        {
+            if (!File.Exists(installerPath))
+            {
+                throw new FileNotFoundException("Update installer was not found.", installerPath);
+            }
+
+            if (!string.Equals(Path.GetExtension(installerPath), ".exe", StringComparison.OrdinalIgnoreCase) ||
+                !this.tempDirectoryProvider.IsSafeUpdateTempPath(installerPath))
+            {
+                throw new InvalidOperationException("Update installer path is not trusted.");
+            }
+
+            return this.processLauncher.LaunchElevatedAsync(installerPath, Array.Empty<string>(), cancellationToken);
+        }
+    }
+
+    public sealed class ShellUpdateProcessLauncher : IUpdateProcessLauncher
+    {
+        public Task LaunchElevatedAsync(string fileName, IReadOnlyList<string> arguments, CancellationToken cancellationToken = default)
+        {
+            var startInfo = new ProcessStartInfo
+            {
+                FileName = fileName,
+                UseShellExecute = true,
+                Verb = "runas",
+                WorkingDirectory = Path.GetDirectoryName(fileName) ?? Environment.CurrentDirectory,
+            };
+
+            foreach (var argument in arguments)
+            {
+                startInfo.ArgumentList.Add(argument);
+            }
+
+            Process.Start(startInfo);
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/Services/UpdateModels.cs b/Services/UpdateModels.cs
new file mode 100644
index 0000000..85cfe3e
--- /dev/null
+++ b/Services/UpdateModels.cs
@@ -0,0 +1,126 @@
+/*
+ * ThreadPilot - updater models and abstractions.
+ */
+namespace ThreadPilot.Services
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Threading;
+    using System.Threading.Tasks;
+
+    public enum UpdateCheckTrigger
+    {
+        Startup,
+        Manual,
+    }
+
+    public enum UpdateCheckStatus
+    {
+        Skipped,
+        UpToDate,
+        UpdateAvailable,
+        Failed,
+    }
+
+    public enum UpdateInstallStatus
+    {
+        Started,
+        Failed,
+    }
+
+    public enum UpdateSignatureStatus
+    {
+        Valid,
+        Invalid,
+        Unknown,
+    }
+
+    public sealed record UpdateCheckRequest(UpdateCheckTrigger Trigger);
+
+    public sealed record UpdateAsset(string Name, Uri DownloadUrl, long Size);
+
+    public sealed record UpdateReleaseInfo(
+        SemanticVersion Version,
+        string TagName,
+        Uri ReleasePageUrl,
+        bool IsPrerelease,
+        IReadOnlyList<UpdateAsset> Assets);
+
+    public sealed record UpdateCheckResult(
+        UpdateCheckStatus Status,
+        SemanticVersion CurrentVersion,
+        UpdateReleaseInfo? Release,
+        string Message)
+    {
+        public bool IsUpdateAvailable => this.Status == UpdateCheckStatus.UpdateAvailable && this.Release != null;
+    }
+
+    public sealed record UpdateDownloadResult(
+        string InstallerPath,
+        string TempDirectory,
+        bool ChecksumVerified,
+        UpdateSignatureStatus SignatureStatus,
+        string Message);
+
+    public sealed record UpdateInstallResult(UpdateInstallStatus Status, string Message);
+
+    public interface IApplicationVersionProvider
+    {
+        SemanticVersion CurrentVersion { get; }
+
+        string DisplayVersion { get; }
+    }
+
+    public interface IUpdateClock
+    {
+        DateTimeOffset UtcNow { get; }
+    }
+
+    public interface IUpdateService
+    {
+        Task<UpdateCheckResult> CheckForUpdatesAsync(UpdateCheckRequest request, CancellationToken cancellationToken = default);
+
+        Task<UpdateInstallResult> DownloadAndInstallAsync(UpdateReleaseInfo release, CancellationToken cancellationToken = default);
+    }
+
+    public interface IUpdateDownloadService
+    {
+        Task<UpdateDownloadResult> DownloadInstallerAsync(UpdateReleaseInfo release, CancellationToken cancellationToken = default);
+    }
+
+    public interface IUpdateInstallerService
+    {
+        Task LaunchInstallerElevatedAsync(string installerPath, CancellationToken cancellationToken = default);
+    }
+
+    public interface IUpdateDownloadClient
+    {
+        Task DownloadFileAsync(Uri uri, string destinationPath, CancellationToken cancellationToken = default);
+
+        Task<string?> TryDownloadStringAsync(Uri uri, CancellationToken cancellationToken = default);
+    }
+
+    public interface IUpdateTempDirectoryProvider
+    {
+        string CreateUpdateTempDirectory(SemanticVersion version);
+
+        bool IsSafeUpdateTempPath(string path);
+
+        void Cleanup(string path);
+    }
+
+    public interface IUpdateSignatureVerifier
+    {
+        UpdateSignatureStatus Verify(string installerPath);
+    }
+
+    public interface IUpdateProcessLauncher
+    {
+        Task LaunchElevatedAsync(string fileName, IReadOnlyList<string> arguments, CancellationToken cancellationToken = default);
+    }
+
+    public interface IApplicationShutdownService
+    {
+        void RequestShutdownForUpdate();
+    }
+}
diff --git a/Services/UpdateService.cs b/Services/UpdateService.cs
new file mode 100644
index 0000000..5cc3256
--- /dev/null
+++ b/Services/UpdateService.cs
@@ -0,0 +1,158 @@
+/*
+ * ThreadPilot - safe in-app update orchestration.
+ */
+namespace ThreadPilot.Services
+{
+    using System;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using Microsoft.Extensions.Logging;
+
+    public sealed class UpdateService : IUpdateService
+    {
+        private const string OfficialOwner = "PrimeBuild-pc";
+        private const string OfficialRepository = "ThreadPilot";
+
+        private readonly GitHubUpdateChecker updateChecker;
+        private readonly IApplicationSettingsService settingsService;
+        private readonly IApplicationVersionProvider versionProvider;
+        private readonly IUpdateDownloadService downloadService;
+        private readonly IUpdateInstallerService installerService;
+        private readonly IUpdateTempDirectoryProvider tempDirectoryProvider;
+        private readonly IApplicationShutdownService shutdownService;
+        private readonly IUpdateClock clock;
+        private readonly ILogger<UpdateService> logger;
+        private readonly SemaphoreSlim checkGate = new(1, 1);
+        private readonly SemaphoreSlim installGate = new(1, 1);
+
+        public UpdateService(
+            GitHubUpdateChecker updateChecker,
+            IApplicationSettingsService settingsService,
+            IApplicationVersionProvider versionProvider,
+            IUpdateDownloadService downloadService,
+            IUpdateInstallerService installerService,
+            IUpdateTempDirectoryProvider tempDirectoryProvider,
+            IApplicationShutdownService shutdownService,
+            IUpdateClock clock,
+            ILogger<UpdateService> logger)
+        {
+            this.updateChecker = updateChecker ?? throw new ArgumentNullException(nameof(updateChecker));
+            this.settingsService = settingsService ?? throw new ArgumentNullException(nameof(settingsService));
+            this.versionProvider = versionProvider ?? throw new ArgumentNullException(nameof(versionProvider));
+            this.downloadService = downloadService ?? throw new ArgumentNullException(nameof(downloadService));
+            this.installerService = installerService ?? throw new ArgumentNullException(nameof(installerService));
+            this.tempDirectoryProvider = tempDirectoryProvider ?? throw new ArgumentNullException(nameof(tempDirectoryProvider));
+            this.shutdownService = shutdownService ?? throw new ArgumentNullException(nameof(shutdownService));
+            this.clock = clock ?? throw new ArgumentNullException(nameof(clock));
+            this.logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        }
+
+        public async Task<UpdateCheckResult> CheckForUpdatesAsync(UpdateCheckRequest request, CancellationToken cancellationToken = default)
+        {
+            var currentVersion = this.versionProvider.CurrentVersion;
+            var settings = this.settingsService.Settings;
+
+            if (request.Trigger == UpdateCheckTrigger.Startup)
+            {
+                if (!settings.EnableAutomaticUpdateChecks)
+                {
+                    return new UpdateCheckResult(UpdateCheckStatus.Skipped, currentVersion, null, "Automatic update checks are disabled.");
+                }
+
+                var intervalDays = Math.Max(1, settings.UpdateCheckIntervalDays);
+                if (settings.LastUpdateCheckUtc.HasValue &&
+                    this.clock.UtcNow - settings.LastUpdateCheckUtc.Value < TimeSpan.FromDays(intervalDays))
+                {
+                    return new UpdateCheckResult(UpdateCheckStatus.Skipped, currentVersion, null, "Startup update check throttled.");
+                }
+            }
+
+            await this.checkGate.WaitAsync(cancellationToken).ConfigureAwait(false);
+            try
+            {
+                await this.MarkUpdateCheckAttemptAsync(cancellationToken).ConfigureAwait(false);
+
+                var release = await this.updateChecker.GetLatestReleaseInfoAsync(
+                    OfficialOwner,
+                    OfficialRepository,
+                    settings.IncludePrereleaseUpdates,
+                    cancellationToken).ConfigureAwait(false);
+
+                if (release == null)
+                {
+                    return new UpdateCheckResult(UpdateCheckStatus.Failed, currentVersion, null, "Unable to determine the latest ThreadPilot release.");
+                }
+
+                if (release.Version > currentVersion)
+                {
+                    this.logger.LogInformation(
+                        "ThreadPilot update available: current {CurrentVersion}, latest {LatestVersion}",
+                        currentVersion,
+                        release.Version);
+                    return new UpdateCheckResult(UpdateCheckStatus.UpdateAvailable, currentVersion, release, "A newer ThreadPilot version is available.");
+                }
+
+                return new UpdateCheckResult(UpdateCheckStatus.UpToDate, currentVersion, release, "ThreadPilot is up to date.");
+            }
+            catch (Exception ex) when (ex is not OperationCanceledException)
+            {
+                this.logger.LogWarning(ex, "ThreadPilot update check failed");
+                return new UpdateCheckResult(UpdateCheckStatus.Failed, currentVersion, null, ex.Message);
+            }
+            finally
+            {
+                this.checkGate.Release();
+            }
+        }
+
+        public async Task<UpdateInstallResult> DownloadAndInstallAsync(UpdateReleaseInfo release, CancellationToken cancellationToken = default)
+        {
+            if (!await this.installGate.WaitAsync(0, cancellationToken).ConfigureAwait(false))
+            {
+                return new UpdateInstallResult(UpdateInstallStatus.Failed, "Another update is already in progress.");
+            }
+
+            UpdateDownloadResult? download = null;
+            try
+            {
+                download = await this.downloadService.DownloadInstallerAsync(release, cancellationToken).ConfigureAwait(false);
+                await this.installerService.LaunchInstallerElevatedAsync(download.InstallerPath, cancellationToken).ConfigureAwait(false);
+                this.shutdownService.RequestShutdownForUpdate();
+                return new UpdateInstallResult(UpdateInstallStatus.Started, "Update installer started.");
+            }
+            catch (Exception ex) when (ex is not OperationCanceledException)
+            {
+                this.logger.LogWarning(ex, "ThreadPilot update install failed");
+                return new UpdateInstallResult(UpdateInstallStatus.Failed, ex.Message);
+            }
+            finally
+            {
+                if (download != null)
+                {
+                    this.TryCleanup(download.TempDirectory);
+                }
+
+                this.installGate.Release();
+            }
+        }
+
+        private async Task MarkUpdateCheckAttemptAsync(CancellationToken cancellationToken)
+        {
+            var settings = this.settingsService.Settings;
+            settings.LastUpdateCheckUtc = this.clock.UtcNow;
+            await this.settingsService.UpdateSettingsAsync(settings).ConfigureAwait(false);
+        }
+
+        private void TryCleanup(string tempDirectory)
+        {
+            try
+            {
+                this.tempDirectoryProvider.Cleanup(tempDirectory);
+            }
+            catch (Exception ex)
+            {
+                this.logger.LogWarning(ex, "Failed to clean update temp directory {TempDirectory}", tempDirectory);
+            }
+        }
+    }
+}
diff --git a/Services/UpdateTempDirectoryProvider.cs b/Services/UpdateTempDirectoryProvider.cs
new file mode 100644
index 0000000..d2ac116
--- /dev/null
+++ b/Services/UpdateTempDirectoryProvider.cs
@@ -0,0 +1,68 @@
+/*
+ * ThreadPilot - safe temporary directory management for update downloads.
+ */
+namespace ThreadPilot.Services
+{
+    using System;
+    using System.IO;
+
+    public sealed class UpdateTempDirectoryProvider : IUpdateTempDirectoryProvider
+    {
+        private readonly string rootDirectory;
+
+        public UpdateTempDirectoryProvider()
+            : this(Path.Combine(Path.GetTempPath(), "ThreadPilot", "Updates"))
+        {
+        }
+
+        public UpdateTempDirectoryProvider(string rootDirectory)
+        {
+            this.rootDirectory = Path.GetFullPath(rootDirectory ?? throw new ArgumentNullException(nameof(rootDirectory)));
+        }
+
+        public string CreateUpdateTempDirectory(SemanticVersion version)
+        {
+            var directory = Path.Combine(this.rootDirectory, version.ToString(), Guid.NewGuid().ToString("N"));
+            Directory.CreateDirectory(directory);
+            return directory;
+        }
+
+        public bool IsSafeUpdateTempPath(string path)
+        {
+            if (string.IsNullOrWhiteSpace(path))
+            {
+                return false;
+            }
+
+            var fullPath = Path.GetFullPath(path);
+            var rootWithSeparator = this.rootDirectory.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar)
+                + Path.DirectorySeparatorChar;
+            return fullPath.StartsWith(rootWithSeparator, StringComparison.OrdinalIgnoreCase);
+        }
+
+        public void Cleanup(string path)
+        {
+            if (!this.IsSafeUpdateTempPath(path) || !Directory.Exists(path))
+            {
+                return;
+            }
+
+            Directory.Delete(path, recursive: true);
+            this.DeleteEmptyParentsUntilRoot(Path.GetDirectoryName(Path.GetFullPath(path)));
+        }
+
+        private void DeleteEmptyParentsUntilRoot(string? directory)
+        {
+            while (!string.IsNullOrWhiteSpace(directory) && this.IsSafeUpdateTempPath(directory))
+            {
+                if (Directory.GetFileSystemEntries(directory).Length > 0)
+                {
+                    return;
+                }
+
+                Directory.Delete(directory);
+                directory = Path.GetDirectoryName(directory);
+            }
+        }
+    }
+}
diff --git a/Services/WpfApplicationShutdownService.cs b/Services/WpfApplicationShutdownService.cs
new file mode 100644
index 0000000..2ae900d
--- /dev/null
+++ b/Services/WpfApplicationShutdownService.cs
@@ -0,0 +1,21 @@
+/*
+ * ThreadPilot - graceful shutdown hook after updater launch.
+ */
+namespace ThreadPilot.Services
+{
+    using System.Windows;
+
+    public sealed class WpfApplicationShutdownService : IApplicationShutdownService
+    {
+        public void RequestShutdownForUpdate()
+        {
+            var application = Application.Current;
+            if (application == null)
+            {
+                return;
+            }
+
+            application.Dispatcher.InvokeAsync(application.Shutdown);
+        }
+    }
+}
diff --git a/Tests/ThreadPilot.Core.Tests/AppSmokeTestStartupTests.cs b/Tests/ThreadPilot.Core.Tests/AppSmokeTestStartupTests.cs
new file mode 100644
index 0000000..882acdd
--- /dev/null
+++ b/Tests/ThreadPilot.Core.Tests/AppSmokeTestStartupTests.cs
@@ -0,0 +1,78 @@
+namespace ThreadPilot.Core.Tests
+{
+    public sealed class AppSmokeTestStartupTests
+    {
+        [Fact]
+        public void OnStartup_HandlesSmokeTestBeforeElevationSingleInstanceAndWindowStartup()
+        {
+            var source = File.ReadAllText(Path.Combine(GetRepositoryRoot(), "App.xaml.cs"));
+
+            var smokeTestBranchIndex = source.IndexOf("if (startupMode.IsSmokeTest)", StringComparison.Ordinal);
+            var elevationIndex = source.IndexOf("GetRequiredService<IElevationService>", StringComparison.Ordinal);
+            var mutexIndex = source.IndexOf("Global\\\\ThreadPilot_SingleInstance", StringComparison.Ordinal);
+            var baseStartupIndex = source.IndexOf("base.OnStartup(e);", StringComparison.Ordinal);
+            var mainWindowIndex = source.IndexOf("GetRequiredService<MainWindow>", StringComparison.Ordinal);
+
+            Assert.NotEqual(-1, smokeTestBranchIndex);
+            Assert.True(smokeTestBranchIndex < elevationIndex);
+            Assert.True(smokeTestBranchIndex < mutexIndex);
+            Assert.True(smokeTestBranchIndex < baseStartupIndex);
+            Assert.True(smokeTestBranchIndex < mainWindowIndex);
+        }
+
+        [Fact]
+        public void SmokeTestMode_ExitsTheProcessAfterShutdownToAvoidDispatcherOrTimerHangs()
+        {
+            var source = File.ReadAllText(Path.Combine(GetRepositoryRoot(), "App.xaml.cs"));
+
+            var smokeTestBranch = ExtractSection(
+                source,
+                "if (startupMode.IsSmokeTest)",
+                "            // Set up global exception handlers first");
+
+            Assert.Contains("this.Shutdown(smokeTestResult);", smokeTestBranch, StringComparison.Ordinal);
+            Assert.Contains("Environment.Exit(smokeTestResult);", smokeTestBranch, StringComparison.Ordinal);
+        }
+
+        [Fact]
+        public void RunSmokeTest_DoesNotResolveUiViewModelsOrMainWindow()
+        {
+            var source = File.ReadAllText(Path.Combine(GetRepositoryRoot(), "App.xaml.cs"));
+            var smokeTestMethod = ExtractSection(
+                source,
+                "private int RunSmokeTest",
+                "protected override void OnExit");
+
+            Assert.DoesNotContain("ProcessViewModel", smokeTestMethod, StringComparison.Ordinal);
+            Assert.DoesNotContain("PowerPlanViewModel", smokeTestMethod, StringComparison.Ordinal);
+            Assert.DoesNotContain("MainWindow", smokeTestMethod, StringComparison.Ordinal);
+        }
+
+        private static string ExtractSection(string source, string startMarker, string endMarker)
+        {
+            var startIndex = source.IndexOf(startMarker, StringComparison.Ordinal);
+            Assert.NotEqual(-1, startIndex);
+
+            var endIndex = source.IndexOf(endMarker, startIndex, StringComparison.Ordinal);
+            Assert.NotEqual(-1, endIndex);
+
+            return source[startIndex..endIndex];
+        }
+
+        private static string GetRepositoryRoot()
+        {
+            var directory = new DirectoryInfo(AppContext.BaseDirectory);
+            while (directory != null && !File.Exists(Path.Combine(directory.FullName, "ThreadPilot.csproj")))
+            {
+                directory = directory.Parent;
+            }
+
+            if (directory == null)
+            {
+                throw new InvalidOperationException("Repository root was not found.");
+            }
+
+            return directory.FullName;
+        }
+    }
+}
diff --git a/Tests/ThreadPilot.Core.Tests/ApplicationSettingsModelTests.cs b/Tests/ThreadPilot.Core.Tests/ApplicationSettingsModelTests.cs
index 214ac48..6eed3cb 100644
--- a/Tests/ThreadPilot.Core.Tests/ApplicationSettingsModelTests.cs
+++ b/Tests/ThreadPilot.Core.Tests/ApplicationSettingsModelTests.cs
@@ -14,6 +14,10 @@ public void Constructor_StartMinimizedDefaultsFalse_ForManualLaunchVisibility()
             Assert.True(settings.ApplyPersistentRulesOnProcessStart);
             Assert.False(settings.HasSeenStartupMinimizedSuggestion);
             Assert.Equal("en-US", settings.Language);
+            Assert.True(settings.EnableAutomaticUpdateChecks);
+            Assert.Equal(7, settings.UpdateCheckIntervalDays);
+            Assert.False(settings.IncludePrereleaseUpdates);
+            Assert.Null(settings.LastUpdateCheckUtc);
         }
 
         [Fact]
diff --git a/Tests/ThreadPilot.Core.Tests/GitHubUpdateCheckerTests.cs b/Tests/ThreadPilot.Core.Tests/GitHubUpdateCheckerTests.cs
index 4af15aa..51143bc 100644
--- a/Tests/ThreadPilot.Core.Tests/GitHubUpdateCheckerTests.cs
+++ b/Tests/ThreadPilot.Core.Tests/GitHubUpdateCheckerTests.cs
@@ -1,84 +1,89 @@
-namespace ThreadPilot.Core.Tests
-{
-    using System.Threading;
-    using System.Threading.Tasks;
-    using ThreadPilot.Services;
-    using ThreadPilot.Services.Abstractions;
-
-    public sealed class GitHubUpdateCheckerTests
-    {
-        [Fact]
-        public async Task GetLatestVersionAsync_ReturnsStableRelease_WhenTagIsSemver()
-        {
-            var client = new FakeGitHubReleaseClient(
-                """
-                {
-                  "tag_name": "v1.2.3",
-                  "prerelease": false,
-                  "draft": false,
-                  "html_url": "https://example.test/releases/v1.2.3"
-                }
-                """);
-            var checker = new GitHubUpdateChecker(client);
-
-            var (latest, releaseUrl) = await checker.GetLatestVersionAsync("PrimeBuild-pc", "ThreadPilot");
-
-            Assert.Equal(new System.Version(1, 2, 3), latest);
-            Assert.Equal("https://example.test/releases/v1.2.3", releaseUrl);
-        }
-
-        [Fact]
-        public async Task GetLatestVersionAsync_IgnoresDraftOrPrerelease()
-        {
-            var client = new FakeGitHubReleaseClient(
-                """
-                {
-                  "tag_name": "v1.2.3-beta1",
-                  "prerelease": true,
-                  "draft": false,
-                  "html_url": "https://example.test/releases/v1.2.3-beta1"
-                }
-                """);
-            var checker = new GitHubUpdateChecker(client);
-
-            var (latest, releaseUrl) = await checker.GetLatestVersionAsync("PrimeBuild-pc", "ThreadPilot");
-
-            Assert.Null(latest);
-            Assert.Null(releaseUrl);
-        }
-
-        [Fact]
-        public async Task GetLatestVersionAsync_ReturnsNull_WhenTagCannotBeParsed()
-        {
-            var client = new FakeGitHubReleaseClient(
-                """
-                {
-                  "tag_name": "release-main",
-                  "prerelease": false,
-                  "draft": false,
-                  "html_url": "https://example.test/releases/release-main"
-                }
-                """);
-            var checker = new GitHubUpdateChecker(client);
-
-            var (latest, releaseUrl) = await checker.GetLatestVersionAsync("PrimeBuild-pc", "ThreadPilot");
-
-            Assert.Null(latest);
-            Assert.Equal("https://example.test/releases/release-main", releaseUrl);
-        }
-
-        private sealed class FakeGitHubReleaseClient : IGitHubReleaseClient
-        {
-            private readonly string responseJson;
-
-            public FakeGitHubReleaseClient(string responseJson)
+namespace ThreadPilot.Core.Tests
+{
+    using System.Threading;
+    using System.Threading.Tasks;
+    using ThreadPilot.Services;
+    using ThreadPilot.Services.Abstractions;
+
+    public sealed class GitHubUpdateCheckerTests
+    {
+        [Fact]
+        public async Task GetLatestVersionAsync_ReturnsStableRelease_WhenTagIsSemver()
+        {
+            var client = new FakeGitHubReleaseClient(
+                """
+                {
+                  "tag_name": "v1.2.3",
+                  "prerelease": false,
+                  "draft": false,
+                  "html_url": "https://example.test/releases/v1.2.3"
+                }
+                """);
+            var checker = new GitHubUpdateChecker(client);
+
+            var (latest, releaseUrl) = await checker.GetLatestVersionAsync("PrimeBuild-pc", "ThreadPilot");
+
+            Assert.Equal(new System.Version(1, 2, 3), latest);
+            Assert.Equal("https://example.test/releases/v1.2.3", releaseUrl);
+        }
+
+        [Fact]
+        public async Task GetLatestVersionAsync_IgnoresDraftOrPrerelease()
+        {
+            var client = new FakeGitHubReleaseClient(
+                """
+                {
+                  "tag_name": "v1.2.3-beta1",
+                  "prerelease": true,
+                  "draft": false,
+                  "html_url": "https://example.test/releases/v1.2.3-beta1"
+                }
+                """);
+            var checker = new GitHubUpdateChecker(client);
+
+            var (latest, releaseUrl) = await checker.GetLatestVersionAsync("PrimeBuild-pc", "ThreadPilot");
+
+            Assert.Null(latest);
+            Assert.Null(releaseUrl);
+        }
+
+        [Fact]
+        public async Task GetLatestVersionAsync_ReturnsNull_WhenTagCannotBeParsed()
+        {
+            var client = new FakeGitHubReleaseClient(
+                """
+                {
+                  "tag_name": "release-main",
+                  "prerelease": false,
+                  "draft": false,
+                  "html_url": "https://example.test/releases/release-main"
+                }
+                """);
+            var checker = new GitHubUpdateChecker(client);
+
+            var (latest, releaseUrl) = await checker.GetLatestVersionAsync("PrimeBuild-pc", "ThreadPilot");
+
+            Assert.Null(latest);
+            Assert.Equal("https://example.test/releases/release-main", releaseUrl);
+        }
+
+        private sealed class FakeGitHubReleaseClient : IGitHubReleaseClient
+        {
+            private readonly string responseJson;
+
+            public FakeGitHubReleaseClient(string responseJson)
+            {
+                this.responseJson = responseJson;
+            }
+
+            public Task<string> GetLatestReleaseJsonAsync(string owner, string repo, CancellationToken cancellationToken = default)
             {
-                this.responseJson = responseJson;
+                return Task.FromResult(this.responseJson);
             }
 
-            public Task<string> GetLatestReleaseJsonAsync(string owner, string repo, CancellationToken cancellationToken = default)
+            public Task<string> GetReleasesJsonAsync(string owner, string repo, CancellationToken cancellationToken = default)
             {
-                return Task.FromResult(this.responseJson);
+                return Task.FromResult($"[{this.responseJson}]");
             }
         }
     }
diff --git a/Tests/ThreadPilot.Core.Tests/LocalizationServiceTests.cs b/Tests/ThreadPilot.Core.Tests/LocalizationServiceTests.cs
index 4f1d0d5..4764132 100644
--- a/Tests/ThreadPilot.Core.Tests/LocalizationServiceTests.cs
+++ b/Tests/ThreadPilot.Core.Tests/LocalizationServiceTests.cs
@@ -1,11 +1,12 @@
 namespace ThreadPilot.Core.Tests
 {
     using System.Reflection;
+    using System.Text.RegularExpressions;
     using System.Windows;
     using Microsoft.Extensions.Logging.Abstractions;
     using ThreadPilot.Services;
 
-    public sealed class LocalizationServiceTests
+    public sealed partial class LocalizationServiceTests
     {
         [Fact]
         public void Constructor_DefaultsToEnglish()
@@ -147,6 +148,56 @@ public void LocaleFiles_DefineEnglishDefaultAndOptionalChineseLanguageLabels()
             Assert.Contains("x:Key=\"SettingsView_LanguageZhCn\"", chinese, StringComparison.Ordinal);
         }
 
+        [Fact]
+        public void LocaleFiles_DefineTheSameResourceKeys()
+        {
+            var root = FindRepositoryRoot();
+            var english = ReadLocaleKeys(Path.Combine(root, "Locales", "en-US.xaml"));
+            var chinese = ReadLocaleKeys(Path.Combine(root, "Locales", "zh-CN.xaml"));
+
+            Assert.Empty(english.Except(chinese).Order(StringComparer.Ordinal));
+            Assert.Empty(chinese.Except(english).Order(StringComparer.Ordinal));
+        }
+
+        [Fact]
+        public void ImportantViews_DoNotUseHardcodedEnglishUiText()
+        {
+            var root = FindRepositoryRoot();
+            var viewPaths = new[]
+            {
+                "MainWindow.xaml",
+                Path.Combine("Views", "ProcessView.xaml"),
+                Path.Combine("Views", "MasksView.xaml"),
+                Path.Combine("Views", "PowerPlanView.xaml"),
+                Path.Combine("Views", "ProcessPowerPlanAssociationView.xaml"),
+                Path.Combine("Views", "PerformanceView.xaml"),
+                Path.Combine("Views", "LogViewerView.xaml"),
+                Path.Combine("Views", "SystemTweaksView.xaml"),
+                Path.Combine("Views", "SettingsView.xaml"),
+                Path.Combine("Views", "SettingsWindow.xaml"),
+            };
+
+            var failures = new List<string>();
+            foreach (var relativePath in viewPaths)
+            {
+                var fullPath = Path.Combine(root, relativePath);
+                var xaml = File.ReadAllText(fullPath);
+                foreach (Match match in HardcodedUiAttributeRegex().Matches(xaml))
+                {
+                    var attribute = match.Groups["attribute"].Value;
+                    var value = match.Groups["value"].Value;
+                    if (IsAllowedHardcodedUiValue(attribute, value))
+                    {
+                        continue;
+                    }
+
+                    failures.Add($"{relativePath}: {attribute}=\"{value}\"");
+                }
+            }
+
+            Assert.Empty(failures);
+        }
+
         private static LocalizationService CreateService(
             IReadOnlyDictionary<string, string>? englishStrings = null,
             IReadOnlyDictionary<string, string>? chineseStrings = null)
@@ -196,5 +247,56 @@ private static void InvokeApplyLanguageDictionary(
 
             method.Invoke(service, new object[] { resources, targetUri });
         }
+
+        private static SortedSet<string> ReadLocaleKeys(string path)
+        {
+            var keys = new SortedSet<string>(StringComparer.Ordinal);
+            var xaml = File.ReadAllText(path);
+            foreach (Match match in Regex.Matches(xaml, "x:Key=\"(?<key>[^\"]+)\"", RegexOptions.CultureInvariant))
+            {
+                keys.Add(match.Groups["key"].Value);
+            }
+
+            return keys;
+        }
+
+        private static bool IsAllowedHardcodedUiValue(string attribute, string value)
+        {
+            if (value.Contains('{', StringComparison.Ordinal) ||
+                value.Contains("DynamicResource", StringComparison.Ordinal) ||
+                value.Contains("StaticResource", StringComparison.Ordinal) ||
+                value.Contains("Binding", StringComparison.Ordinal) ||
+                value.Contains("x:Static", StringComparison.Ordinal))
+            {
+                return true;
+            }
+
+            if (string.Equals(attribute, "Tag", StringComparison.Ordinal) ||
+                string.Equals(attribute, "TargetPageTag", StringComparison.Ordinal) ||
+                string.Equals(attribute, "Name", StringComparison.Ordinal) ||
+                string.Equals(attribute, "x:Name", StringComparison.Ordinal) ||
+                string.Equals(attribute, "SelectedValuePath", StringComparison.Ordinal) ||
+                string.Equals(attribute, "DisplayMemberPath", StringComparison.Ordinal))
+            {
+                return true;
+            }
+
+            var trimmedValue = value.Trim();
+
+            if (value.Contains("ThreadPilot", StringComparison.Ordinal) ||
+                value.Contains("Segoe", StringComparison.Ordinal) ||
+                value.EndsWith(".exe", StringComparison.OrdinalIgnoreCase) ||
+                value.EndsWith(".pow", StringComparison.OrdinalIgnoreCase) ||
+                value.EndsWith(".json", StringComparison.OrdinalIgnoreCase) ||
+                trimmedValue is "CPU" or "PID" or "ID" or "MB" or "AGPLv3" or "Windows" or "WMI" or "HPET" or "SMT" or "CPU %")
+            {
+                return true;
+            }
+
+            return !Regex.IsMatch(value, "[A-Za-z]{3,}", RegexOptions.CultureInvariant);
+        }
+
+        [GeneratedRegex("(?<attribute>Text|Content|Header|Title|ToolTip|PlaceholderText|AutomationProperties\\.Name|AutomationProperties\\.HelpText)=\"(?<value>[^\"]*[A-Za-z][^\"]*)\"", RegexOptions.CultureInvariant)]
+        private static partial Regex HardcodedUiAttributeRegex();
     }
 }
diff --git a/Tests/ThreadPilot.Core.Tests/MasksViewModelTests.cs b/Tests/ThreadPilot.Core.Tests/MasksViewModelTests.cs
index 38c4426..2cedcf0 100644
--- a/Tests/ThreadPilot.Core.Tests/MasksViewModelTests.cs
+++ b/Tests/ThreadPilot.Core.Tests/MasksViewModelTests.cs
@@ -14,8 +14,10 @@ public void MasksView_SubtitleClarifiesPerProcessUse()
         {
             var document = LoadMasksViewXaml();
             var serialized = document.ToString(SaveOptions.DisableFormatting);
+            var locale = LoadEnglishLocale();
 
-            Assert.Contains("per-process use", serialized, StringComparison.Ordinal);
+            Assert.Contains("MasksView_Subtitle", serialized, StringComparison.Ordinal);
+            Assert.Contains("per-process use", locale, StringComparison.Ordinal);
         }
 
         [Fact]
@@ -33,9 +35,11 @@ public void MasksView_DefaultPresetTooltipWarnsNoAutoApply()
         {
             var document = LoadMasksViewXaml();
             var serialized = document.ToString(SaveOptions.DisableFormatting);
+            var locale = LoadEnglishLocale();
 
-            Assert.Contains("does not apply CPU affinity automatically", serialized, StringComparison.Ordinal);
-            Assert.Contains("Pre-selected when ThreadPilot", serialized, StringComparison.Ordinal);
+            Assert.Contains("MasksView_DefaultPresetTip", serialized, StringComparison.Ordinal);
+            Assert.Contains("does not apply CPU affinity automatically", locale, StringComparison.Ordinal);
+            Assert.Contains("Pre-selected when ThreadPilot", locale, StringComparison.Ordinal);
         }
 
         [Fact]
@@ -55,8 +59,10 @@ public void MasksView_ToggleCpuTextClarifiesNoRunningProcessImpact()
         {
             var document = LoadMasksViewXaml();
             var serialized = document.ToString(SaveOptions.DisableFormatting);
+            var locale = LoadEnglishLocale();
 
-            Assert.Contains("do not affect running processes", serialized, StringComparison.Ordinal);
+            Assert.Contains("MasksView_SelectCpusTip", serialized, StringComparison.Ordinal);
+            Assert.Contains("do not affect running processes", locale, StringComparison.Ordinal);
         }
 
         [Fact]
@@ -116,8 +122,10 @@ public void MasksView_AllCoresProtectedDefaultInText()
         {
             var document = LoadMasksViewXaml();
             var serialized = document.ToString(SaveOptions.DisableFormatting);
+            var locale = LoadEnglishLocale();
 
-            Assert.Contains("All Cores is the protected default preset", serialized, StringComparison.Ordinal);
+            Assert.Contains("MasksView_SelectCpusTip", serialized, StringComparison.Ordinal);
+            Assert.Contains("All Cores is the protected default preset", locale, StringComparison.Ordinal);
         }
 
         private static XDocument LoadMasksViewXaml()
@@ -127,6 +135,12 @@ private static XDocument LoadMasksViewXaml()
             return XDocument.Load(path, LoadOptions.PreserveWhitespace);
         }
 
+        private static string LoadEnglishLocale()
+        {
+            var repoRoot = GetRepositoryRoot();
+            return File.ReadAllText(Path.Combine(repoRoot, "Locales", "en-US.xaml"));
+        }
+
         private static string GetRepositoryRoot()
         {
             var currentDir = AppContext.BaseDirectory;
diff --git a/Tests/ThreadPilot.Core.Tests/PackagingMetadataTests.cs b/Tests/ThreadPilot.Core.Tests/PackagingMetadataTests.cs
new file mode 100644
index 0000000..d28b98f
--- /dev/null
+++ b/Tests/ThreadPilot.Core.Tests/PackagingMetadataTests.cs
@@ -0,0 +1,106 @@
+namespace ThreadPilot.Core.Tests
+{
+    using System.Text.RegularExpressions;
+
+    public sealed partial class PackagingMetadataTests
+    {
+        private const string ReleaseVersion = "1.4.0";
+        private const string ReleaseAssemblyVersion = "1.4.0.0";
+
+        [Fact]
+        public void InnoInstallers_UseStableDisplayNameAndSeparateVersionMetadata()
+        {
+            var root = FindRepositoryRoot();
+            var installerScripts = new[]
+            {
+                Path.Combine(root, "Installer", "setup.iss"),
+                Path.Combine(root, "Installer", "Installer.iss"),
+            };
+
+            foreach (var scriptPath in installerScripts)
+            {
+                var script = File.ReadAllText(scriptPath);
+
+                Assert.Contains("AppName={#MyAppName}", script, StringComparison.Ordinal);
+                Assert.Contains("AppVersion={#MyAppVersion}", script, StringComparison.Ordinal);
+                Assert.Contains("AppVerName={#MyAppName}", script, StringComparison.Ordinal);
+                Assert.DoesNotContain("AppVerName={#MyAppName} {#MyAppVersion}", script, StringComparison.Ordinal);
+                Assert.Matches(MyAppVersionRegex(), script);
+            }
+        }
+
+        [Fact]
+        public void PrimaryInstaller_RemovesThreadPilotOwnedDataOnlyDuringUninstall()
+        {
+            var root = FindRepositoryRoot();
+            var script = File.ReadAllText(Path.Combine(root, "Installer", "setup.iss"));
+
+            Assert.Contains("[UninstallDelete]", script, StringComparison.Ordinal);
+            Assert.Contains("Name: \"{userappdata}\\ThreadPilot\"", script, StringComparison.Ordinal);
+            Assert.Contains("ThreadPilot user data is preserved during install/update", script, StringComparison.Ordinal);
+            Assert.DoesNotContain("[InstallDelete]", script, StringComparison.Ordinal);
+            Assert.DoesNotContain("Name: \"{userappdata}\"", script, StringComparison.Ordinal);
+        }
+
+        [Fact]
+        public void PrimaryInstaller_CleansOnlyRecognizedLegacyBetaUninstallRegistryEntries()
+        {
+            var root = FindRepositoryRoot();
+            var script = File.ReadAllText(Path.Combine(root, "Installer", "setup.iss"));
+
+            Assert.Contains("ThreadPilot 0.1.0-beta", script, StringComparison.Ordinal);
+            Assert.Contains("DeleteLegacyBetaUninstallEntry", script, StringComparison.Ordinal);
+            Assert.Contains("DisplayName", script, StringComparison.Ordinal);
+            Assert.Contains("InstallLocation", script, StringComparison.Ordinal);
+            Assert.Contains("{autopf}\\ThreadPilot", script, StringComparison.Ordinal);
+            Assert.DoesNotContain(@"DeleteKeyIncludingSubkeys(HKLM, 'Software\Microsoft\Windows\CurrentVersion\Uninstall')", script, StringComparison.Ordinal);
+        }
+
+        [Fact]
+        public void VersionMetadata_IsBumpedToReleaseVersion()
+        {
+            var root = FindRepositoryRoot();
+
+            AssertFileContains(Path.Combine(root, "ThreadPilot.csproj"), $"<Version>{ReleaseVersion}</Version>");
+            AssertFileContains(Path.Combine(root, "ThreadPilot.csproj"), $"<AssemblyVersion>{ReleaseAssemblyVersion}</AssemblyVersion>");
+            AssertFileContains(Path.Combine(root, "ThreadPilot.csproj"), $"<FileVersion>{ReleaseAssemblyVersion}</FileVersion>");
+            AssertFileContains(Path.Combine(root, "ThreadPilot.csproj"), $"<InformationalVersion>{ReleaseVersion}</InformationalVersion>");
+            AssertFileContains(Path.Combine(root, "app.manifest"), $"version=\"{ReleaseAssemblyVersion}\"");
+            AssertFileContains(Path.Combine(root, "Installer", "ThreadPilot.wxs"), $"Version=\"{ReleaseAssemblyVersion}\"");
+            AssertFileContains(Path.Combine(root, "chocolatey", "threadpilot.nuspec"), $"<version>{ReleaseVersion}</version>");
+            AssertFileContains(Path.Combine(root, "chocolatey", "threadpilot.nuspec"), $"releases/tag/v{ReleaseVersion}");
+            AssertFileContains(Path.Combine(root, "sonar-project.properties"), $"sonar.projectVersion={ReleaseVersion}");
+            AssertFileContains(Path.Combine(root, "build", "build-release.ps1"), $"[string]$Version = \"{ReleaseVersion}\"");
+            AssertFileContains(Path.Combine(root, "build", "build-installer.ps1"), $"[string]$Version = \"{ReleaseVersion}\"");
+            AssertFileContains(Path.Combine(root, "build", "package-release-zips.ps1"), $"[string]$Version = \"{ReleaseVersion}\"");
+            Assert.True(File.Exists(Path.Combine(root, "docs", "releases", $"v{ReleaseVersion}.md")));
+            AssertFileContains(Path.Combine(root, "docs", "release", "RELEASE_NOTES.md"), $"v{ReleaseVersion}");
+        }
+
+        private static void AssertFileContains(string path, string expected)
+        {
+            var content = File.ReadAllText(path);
+            Assert.Contains(expected, content, StringComparison.Ordinal);
+        }
+
+        private static string FindRepositoryRoot()
+        {
+            var directory = new DirectoryInfo(AppContext.BaseDirectory);
+            while (directory != null)
+            {
+                if (File.Exists(Path.Combine(directory.FullName, "ThreadPilot.csproj")) &&
+                    Directory.Exists(Path.Combine(directory.FullName, "Installer")))
+                {
+                    return directory.FullName;
+                }
+
+                directory = directory.Parent;
+            }
+
+            throw new InvalidOperationException("Repository root could not be located.");
+        }
+
+        [GeneratedRegex("#define MyAppVersion \"1\\.4\\.0\"", RegexOptions.CultureInvariant)]
+        private static partial Regex MyAppVersionRegex();
+    }
+}
diff --git a/Tests/ThreadPilot.Core.Tests/PowerPlanViewXamlTests.cs b/Tests/ThreadPilot.Core.Tests/PowerPlanViewXamlTests.cs
index 0b9f5f7..de45109 100644
--- a/Tests/ThreadPilot.Core.Tests/PowerPlanViewXamlTests.cs
+++ b/Tests/ThreadPilot.Core.Tests/PowerPlanViewXamlTests.cs
@@ -34,8 +34,8 @@ public void HeaderInstructionText_WrapsToAvoidButtonOverlap()
                 .Descendants()
                 .Where(element => element.Name.LocalName == "TextBlock")
                 .Where(element => element.Attributes().Any(attribute =>
-                    attribute.Value.Contains("Select the Windows plan", StringComparison.Ordinal) ||
-                    attribute.Value.Contains("Local .pow files", StringComparison.Ordinal)))
+                    attribute.Value.Contains("PowerPlanView_SelectActiveTip", StringComparison.Ordinal) ||
+                    attribute.Value.Contains("PowerPlanView_LocalPlansTip", StringComparison.Ordinal)))
                 .ToList();
 
             Assert.Equal(2, instructionTextBlocks.Count);
@@ -50,7 +50,7 @@ public void ActivePowerPlanTemplate_ContainsActiveBadgeAndAccentBorder()
             var document = XDocument.Load(PowerPlanViewPath, LoadOptions.PreserveWhitespace);
             var serialized = document.ToString(SaveOptions.DisableFormatting);
 
-            Assert.Contains("Active", serialized, StringComparison.Ordinal);
+            Assert.Contains("PowerPlanView_Active", serialized, StringComparison.Ordinal);
             Assert.Contains("IsActive", serialized, StringComparison.Ordinal);
             Assert.Contains("Accent", serialized, StringComparison.Ordinal);
         }
diff --git a/Tests/ThreadPilot.Core.Tests/ProcessViewXamlBindingTests.cs b/Tests/ThreadPilot.Core.Tests/ProcessViewXamlBindingTests.cs
index 494b9d2..9348f80 100644
--- a/Tests/ThreadPilot.Core.Tests/ProcessViewXamlBindingTests.cs
+++ b/Tests/ThreadPilot.Core.Tests/ProcessViewXamlBindingTests.cs
@@ -161,24 +161,24 @@ public void ProcessGridContextMenu_ContainsExpectedActionsAndSubmenus()
             var document = XDocument.Load(ProcessViewPath, LoadOptions.PreserveWhitespace);
             var serialized = document.ToString(SaveOptions.DisableFormatting);
 
-            Assert.Contains("Header=\"Apply Affinity\"", serialized, StringComparison.Ordinal);
-            Assert.Contains("Header=\"Clear CPU Sets\"", serialized, StringComparison.Ordinal);
-            Assert.Contains("Header=\"Rules\"", serialized, StringComparison.Ordinal);
-            Assert.Contains("Header=\"Save Current Settings as Rule\"", serialized, StringComparison.Ordinal);
-            Assert.Contains("Header=\"Apply Affinity and Save as Rule\"", serialized, StringComparison.Ordinal);
-            Assert.Contains("Header=\"Set CPU Priority\"", serialized, StringComparison.Ordinal);
-            Assert.Contains("Header=\"Below Normal\"", serialized, StringComparison.Ordinal);
-            Assert.Contains("Header=\"Normal\"", serialized, StringComparison.Ordinal);
-            Assert.Contains("Header=\"Above Normal\"", serialized, StringComparison.Ordinal);
-            Assert.Contains("Header=\"High\"", serialized, StringComparison.Ordinal);
-            Assert.Contains("Header=\"Realtime (blocked)\"", serialized, StringComparison.Ordinal);
-            Assert.Contains("Header=\"Set Memory Priority\"", serialized, StringComparison.Ordinal);
-            Assert.Contains("Header=\"Very Low\"", serialized, StringComparison.Ordinal);
-            Assert.Contains("Header=\"Low\"", serialized, StringComparison.Ordinal);
-            Assert.Contains("Header=\"Medium\"", serialized, StringComparison.Ordinal);
-            Assert.Contains("Header=\"Open Executable Location\"", serialized, StringComparison.Ordinal);
-            Assert.Contains("Header=\"Copy Process Info\"", serialized, StringComparison.Ordinal);
-            Assert.Contains("Header=\"Refresh Process Info\"", serialized, StringComparison.Ordinal);
+            Assert.Contains("Header=\"{DynamicResource ProcessView_ApplyAffinity}\"", serialized, StringComparison.Ordinal);
+            Assert.Contains("Header=\"{DynamicResource ProcessView_ClearCpuSets}\"", serialized, StringComparison.Ordinal);
+            Assert.Contains("Header=\"{DynamicResource ProcessView_Rules}\"", serialized, StringComparison.Ordinal);
+            Assert.Contains("Header=\"{DynamicResource ProcessView_SaveCurrentRule}\"", serialized, StringComparison.Ordinal);
+            Assert.Contains("Header=\"{DynamicResource ProcessView_ApplyAffinitySaveRule}\"", serialized, StringComparison.Ordinal);
+            Assert.Contains("Header=\"{DynamicResource ProcessView_SetCpuPriority}\"", serialized, StringComparison.Ordinal);
+            Assert.Contains("Header=\"{DynamicResource ProcessView_PriorityBelowNormal}\"", serialized, StringComparison.Ordinal);
+            Assert.Contains("Header=\"{DynamicResource ProcessView_PriorityNormal}\"", serialized, StringComparison.Ordinal);
+            Assert.Contains("Header=\"{DynamicResource ProcessView_PriorityAboveNormal}\"", serialized, StringComparison.Ordinal);
+            Assert.Contains("Header=\"{DynamicResource ProcessView_PriorityHigh}\"", serialized, StringComparison.Ordinal);
+            Assert.Contains("Header=\"{DynamicResource ProcessView_RealtimeBlocked}\"", serialized, StringComparison.Ordinal);
+            Assert.Contains("Header=\"{DynamicResource ProcessView_SetMemoryPriority}\"", serialized, StringComparison.Ordinal);
+            Assert.Contains("Header=\"{DynamicResource ProcessView_PriorityVeryLow}\"", serialized, StringComparison.Ordinal);
+            Assert.Contains("Header=\"{DynamicResource ProcessView_PriorityLow}\"", serialized, StringComparison.Ordinal);
+            Assert.Contains("Header=\"{DynamicResource ProcessView_PriorityMedium}\"", serialized, StringComparison.Ordinal);
+            Assert.Contains("Header=\"{DynamicResource ProcessView_OpenLocation}\"", serialized, StringComparison.Ordinal);
+            Assert.Contains("Header=\"{DynamicResource ProcessView_CopyProcessInfo}\"", serialized, StringComparison.Ordinal);
+            Assert.Contains("Header=\"{DynamicResource ProcessView_RefreshInfo}\"", serialized, StringComparison.Ordinal);
         }
 
         [Fact]
@@ -187,9 +187,9 @@ public void ProcessToolbar_ExposesLockProcessListToggle()
             var document = XDocument.Load(ProcessViewPath, LoadOptions.PreserveWhitespace);
             var serialized = document.ToString(SaveOptions.DisableFormatting);
 
-            Assert.Contains("Lock process list", serialized, StringComparison.Ordinal);
+            Assert.Contains("ProcessView_LockList", serialized, StringComparison.Ordinal);
             Assert.Contains("IsChecked=\"{Binding IsProcessListLocked}\"", serialized, StringComparison.Ordinal);
-            Assert.Contains("Pause process list refresh and sorting updates while you work with the current list.", serialized, StringComparison.Ordinal);
+            Assert.Contains("ProcessView_LockListTooltip", serialized, StringComparison.Ordinal);
         }
 
         [Fact]
@@ -237,9 +237,9 @@ public void MainWindow_ContainsStartupMinimizedSuggestionOverlay()
             var serialized = document.ToString(SaveOptions.DisableFormatting);
 
             Assert.Contains("StartupMinimizedSuggestionOverlay", serialized, StringComparison.Ordinal);
-            Assert.Contains("Startup minimized", serialized, StringComparison.Ordinal);
-            Assert.Contains("Open Settings", serialized, StringComparison.Ordinal);
-            Assert.Contains("Don't show again", serialized, StringComparison.Ordinal);
+            Assert.Contains("MainWindow_StartupMinimizedSuggestionTitle", serialized, StringComparison.Ordinal);
+            Assert.Contains("MainWindow_OpenSettings", serialized, StringComparison.Ordinal);
+            Assert.Contains("MainWindow_DontShowAgain", serialized, StringComparison.Ordinal);
         }
 
         [Fact]
@@ -254,7 +254,8 @@ public void MainWindow_QueuesStartupUpdateCheckOnceWithoutBlockingStartup()
             Assert.Contains("QueueStartupUpdateCheck();", source, StringComparison.Ordinal);
             Assert.Contains("Interlocked.Exchange(ref this.startupUpdateCheckStarted, 1)", updateCheckSection, StringComparison.Ordinal);
             Assert.Contains("TaskSafety.FireAndForget(this.CheckForUpdatesAtStartupAsync()", updateCheckSection, StringComparison.Ordinal);
-            Assert.Contains("GetLatestVersionAsync(\"PrimeBuild-pc\", \"ThreadPilot\")", updateCheckSection, StringComparison.Ordinal);
+            Assert.Contains("GetRequiredService<IUpdateService>()", updateCheckSection, StringComparison.Ordinal);
+            Assert.Contains("CheckForUpdatesAsync(new UpdateCheckRequest(UpdateCheckTrigger.Startup))", updateCheckSection, StringComparison.Ordinal);
             Assert.Contains("Startup update check ignored failure", updateCheckSection, StringComparison.Ordinal);
             Assert.DoesNotContain("System.Windows.MessageBox.Show", updateCheckSection, StringComparison.Ordinal);
         }
@@ -266,7 +267,7 @@ public void LegacyActionSidePanel_IsNotPersistentPrimaryUi()
             var serialized = document.ToString(SaveOptions.DisableFormatting);
 
             Assert.Contains("Grid.Column=\"2\" Visibility=\"Collapsed\"", serialized, StringComparison.Ordinal);
-            Assert.Contains("Advanced affinity picker", serialized, StringComparison.Ordinal);
+            Assert.Contains("ProcessView_AdvancedAffinityPicker", serialized, StringComparison.Ordinal);
         }
 
         private static string GetRepositoryRoot()
diff --git a/Tests/ThreadPilot.Core.Tests/SettingsViewModelThemeTests.cs b/Tests/ThreadPilot.Core.Tests/SettingsViewModelThemeTests.cs
index f03e1cd..4afd6e0 100644
--- a/Tests/ThreadPilot.Core.Tests/SettingsViewModelThemeTests.cs
+++ b/Tests/ThreadPilot.Core.Tests/SettingsViewModelThemeTests.cs
@@ -6,7 +6,6 @@ namespace ThreadPilot.Core.Tests
     using Moq;
     using ThreadPilot.Models;
     using ThreadPilot.Services;
-    using ThreadPilot.Services.Abstractions;
     using ThreadPilot.ViewModels;
 
     public sealed class SettingsViewModelThemeTests
@@ -101,6 +100,25 @@ public async Task ChangingLanguage_AppliesLanguageAndLogsVisibleActivityEntry()
             Assert.Equal("Language changed to Simplified Chinese.", viewModel.StatusMessage);
         }
 
+        [Fact]
+        public void ChangingLanguage_UsesLocalizedStatusMessage()
+        {
+            var harness = new Harness();
+            harness.Localization
+                .Setup(service => service.GetString(It.IsAny<string>()))
+                .Returns<string>(key => key switch
+                {
+                    "Settings_LanguageSimplifiedChinese" => "简体中文",
+                    "Settings_StatusLanguageChangedFormat" => "语言已切换为{0}。",
+                    _ => key,
+                });
+            var viewModel = harness.CreateViewModel();
+
+            viewModel.Settings.Language = "zh-CN";
+
+            Assert.Equal("语言已切换为简体中文。", viewModel.StatusMessage);
+        }
+
         [Fact]
         public async Task SaveSettingsCommand_PersistsSelectedLanguage()
         {
@@ -182,6 +200,10 @@ private sealed class Harness
 
             public Mock<ILocalizationService> Localization { get; } = new(MockBehavior.Loose);
 
+            public Mock<IUpdateService> Updates { get; } = new(MockBehavior.Loose);
+
+            public Mock<IApplicationVersionProvider> VersionProvider { get; } = new(MockBehavior.Loose);
+
             public Mock<IEnhancedLoggingService> Logging { get; } = new(MockBehavior.Loose);
 
             public ActivityAuditService Audit { get; } = new(NullLogger<ActivityAuditService>.Instance);
@@ -209,6 +231,8 @@ public Harness(bool initialDarkTheme = false)
                 this.Associations
                     .Setup(service => service.GetDefaultPowerPlanAsync())
                     .ReturnsAsync((string.Empty, string.Empty));
+                this.VersionProvider.SetupGet(service => service.DisplayVersion).Returns("v1.3.1");
+                this.VersionProvider.SetupGet(service => service.CurrentVersion).Returns(new SemanticVersion(1, 3, 1));
             }
 
             public SettingsViewModel CreateViewModel() =>
@@ -222,7 +246,8 @@ public SettingsViewModel CreateViewModel() =>
                     this.ProcessMonitorManager.Object,
                     this.Theme.Object,
                     this.Tray.Object,
-                    new GitHubUpdateChecker(new Mock<IGitHubReleaseClient>().Object),
+                    this.Updates.Object,
+                    this.VersionProvider.Object,
                     this.Localization.Object,
                     this.Logging.Object,
                     this.Audit);
diff --git a/Tests/ThreadPilot.Core.Tests/UpdateServiceTests.cs b/Tests/ThreadPilot.Core.Tests/UpdateServiceTests.cs
new file mode 100644
index 0000000..2f9729e
--- /dev/null
+++ b/Tests/ThreadPilot.Core.Tests/UpdateServiceTests.cs
@@ -0,0 +1,323 @@
+namespace ThreadPilot.Core.Tests
+{
+    using System;
+    using System.Collections.Generic;
+    using System.IO;
+    using System.Text;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using Microsoft.Extensions.Logging.Abstractions;
+    using Moq;
+    using ThreadPilot.Models;
+    using ThreadPilot.Services;
+    using ThreadPilot.Services.Abstractions;
+
+    public sealed class UpdateServiceTests
+    {
+        [Fact]
+        public void SemanticVersion_OrdersStableAbovePrerelease()
+        {
+            Assert.True(SemanticVersion.TryParse("v1.4.0-beta.1", out var prerelease));
+            Assert.True(SemanticVersion.TryParse("1.4.0", out var stable));
+
+            Assert.True(stable > prerelease);
+        }
+
+        [Fact]
+        public async Task GitHubUpdateChecker_ExcludesPrereleasesByDefault()
+        {
+            var checker = new GitHubUpdateChecker(new FakeGitHubReleaseClient(
+                """
+                [
+                  { "tag_name": "v1.5.0-beta.1", "prerelease": true, "draft": false, "html_url": "https://github.com/PrimeBuild-pc/ThreadPilot/releases/tag/v1.5.0-beta.1", "assets": [] },
+                  { "tag_name": "v1.4.0", "prerelease": false, "draft": false, "html_url": "https://github.com/PrimeBuild-pc/ThreadPilot/releases/tag/v1.4.0", "assets": [] }
+                ]
+                """));
+
+            var release = await checker.GetLatestReleaseInfoAsync("PrimeBuild-pc", "ThreadPilot");
+
+            Assert.NotNull(release);
+            Assert.Equal("1.4.0", release.Version.ToString());
+        }
+
+        [Fact]
+        public async Task CheckForUpdatesAsync_StartupSkipsWhenLastCheckInsideInterval()
+        {
+            var harness = new Harness();
+            harness.Settings.LastUpdateCheckUtc = harness.Clock.UtcNow.AddDays(-2);
+
+            var result = await harness.Service.CheckForUpdatesAsync(new UpdateCheckRequest(UpdateCheckTrigger.Startup));
+
+            Assert.Equal(UpdateCheckStatus.Skipped, result.Status);
+            Assert.False(harness.ReleaseClient.RequestedReleases);
+        }
+
+        [Fact]
+        public async Task CheckForUpdatesAsync_ManualFindsNewerStableRelease()
+        {
+            var harness = new Harness();
+
+            var result = await harness.Service.CheckForUpdatesAsync(new UpdateCheckRequest(UpdateCheckTrigger.Manual));
+
+            Assert.True(result.IsUpdateAvailable);
+            Assert.Equal("1.4.0", result.Release?.Version.ToString());
+            Assert.Equal(harness.Clock.UtcNow, harness.SavedSettings?.LastUpdateCheckUtc);
+        }
+
+        [Fact]
+        public void UpdateAssetSelector_SelectsInstallerAndRejectsPortable()
+        {
+            var release = CreateRelease(
+                new UpdateAsset("ThreadPilot_v1.4.0_Portable.zip", new Uri("https://github.com/PrimeBuild-pc/ThreadPilot/releases/download/v1.4.0/ThreadPilot_v1.4.0_Portable.zip"), 1),
+                new UpdateAsset("ThreadPilot_v1.4.0_Setup.exe", new Uri("https://github.com/PrimeBuild-pc/ThreadPilot/releases/download/v1.4.0/ThreadPilot_v1.4.0_Setup.exe"), 1));
+
+            var selected = UpdateAssetSelector.TrySelectInstaller(release, out var asset);
+
+            Assert.True(selected);
+            Assert.Equal("ThreadPilot_v1.4.0_Setup.exe", asset.Name);
+        }
+
+        [Fact]
+        public async Task DownloadInstallerAsync_VerifiesChecksum()
+        {
+            using var tempRoot = new TempDirectory();
+            var installerBytes = Encoding.UTF8.GetBytes("installer-content");
+            var expectedHash = ComputeSha256(installerBytes);
+            var client = new FakeUpdateDownloadClient(installerBytes, $"{expectedHash}  ThreadPilot_v1.4.0_Setup.exe");
+            var service = CreateDownloadService(tempRoot.Path, client);
+
+            var result = await service.DownloadInstallerAsync(CreateReleaseWithInstallerAndChecksum());
+
+            Assert.True(result.ChecksumVerified);
+            Assert.True(File.Exists(result.InstallerPath));
+        }
+
+        [Fact]
+        public async Task DownloadInstallerAsync_RejectsInvalidChecksumAndCleansTemp()
+        {
+            using var tempRoot = new TempDirectory();
+            var client = new FakeUpdateDownloadClient(Encoding.UTF8.GetBytes("installer-content"), $"{new string('0', 64)}  ThreadPilot_v1.4.0_Setup.exe");
+            var service = CreateDownloadService(tempRoot.Path, client);
+
+            await Assert.ThrowsAsync<InvalidOperationException>(() => service.DownloadInstallerAsync(CreateReleaseWithInstallerAndChecksum()));
+            Assert.Empty(Directory.GetDirectories(tempRoot.Path));
+        }
+
+        [Fact]
+        public void UpdateTempDirectoryProvider_DoesNotDeleteOutsideUpdateRoot()
+        {
+            using var tempRoot = new TempDirectory();
+            using var outside = new TempDirectory();
+            File.WriteAllText(Path.Combine(outside.Path, "settings.json"), "{}");
+            var provider = new UpdateTempDirectoryProvider(tempRoot.Path);
+
+            provider.Cleanup(outside.Path);
+
+            Assert.True(File.Exists(Path.Combine(outside.Path, "settings.json")));
+        }
+
+        [Fact]
+        public async Task StartupCheck_DoesNotDownloadOrInstallWithoutUserConsent()
+        {
+            var harness = new Harness();
+
+            var result = await harness.Service.CheckForUpdatesAsync(new UpdateCheckRequest(UpdateCheckTrigger.Startup));
+
+            Assert.True(result.IsUpdateAvailable);
+            harness.Download.Verify(service => service.DownloadInstallerAsync(It.IsAny<UpdateReleaseInfo>(), It.IsAny<CancellationToken>()), Times.Never);
+            harness.Installer.Verify(service => service.LaunchInstallerElevatedAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()), Times.Never);
+        }
+
+        [Fact]
+        public async Task DownloadAndInstallAsync_StartsInstallerAndRequestsShutdown()
+        {
+            var harness = new Harness();
+            harness.Download
+                .Setup(service => service.DownloadInstallerAsync(It.IsAny<UpdateReleaseInfo>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new UpdateDownloadResult(
+                    Path.Combine(harness.TempDirectory, "ThreadPilot_v1.4.0_Setup.exe"),
+                    harness.TempDirectory,
+                    true,
+                    UpdateSignatureStatus.Unknown,
+                    "ok"));
+            File.WriteAllText(Path.Combine(harness.TempDirectory, "ThreadPilot_v1.4.0_Setup.exe"), "installer");
+
+            var result = await harness.Service.DownloadAndInstallAsync(CreateReleaseWithInstallerAndChecksum());
+
+            Assert.Equal(UpdateInstallStatus.Started, result.Status);
+            harness.Installer.Verify(service => service.LaunchInstallerElevatedAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()), Times.Once);
+            harness.Shutdown.Verify(service => service.RequestShutdownForUpdate(), Times.Once);
+        }
+
+        private static UpdateDownloadService CreateDownloadService(string tempRoot, IUpdateDownloadClient client)
+        {
+            var signature = new Mock<IUpdateSignatureVerifier>();
+            signature.Setup(verifier => verifier.Verify(It.IsAny<string>())).Returns(UpdateSignatureStatus.Unknown);
+            return new UpdateDownloadService(
+                client,
+                new UpdateTempDirectoryProvider(tempRoot),
+                signature.Object,
+                NullLogger<UpdateDownloadService>.Instance);
+        }
+
+        private static UpdateReleaseInfo CreateReleaseWithInstallerAndChecksum()
+        {
+            return CreateRelease(
+                new UpdateAsset("ThreadPilot_v1.4.0_Setup.exe", new Uri("https://github.com/PrimeBuild-pc/ThreadPilot/releases/download/v1.4.0/ThreadPilot_v1.4.0_Setup.exe"), 10),
+                new UpdateAsset("SHA256SUMS.txt", new Uri("https://github.com/PrimeBuild-pc/ThreadPilot/releases/download/v1.4.0/SHA256SUMS.txt"), 10));
+        }
+
+        private static UpdateReleaseInfo CreateRelease(params UpdateAsset[] assets)
+        {
+            return new UpdateReleaseInfo(
+                new SemanticVersion(1, 4, 0),
+                "v1.4.0",
+                new Uri("https://github.com/PrimeBuild-pc/ThreadPilot/releases/tag/v1.4.0"),
+                false,
+                assets);
+        }
+
+        private static string ComputeSha256(byte[] bytes)
+        {
+            var hash = System.Security.Cryptography.SHA256.HashData(bytes);
+            return Convert.ToHexString(hash);
+        }
+
+        private sealed class Harness
+        {
+            public ApplicationSettingsModel Settings { get; } = new();
+
+            public ApplicationSettingsModel? SavedSettings { get; private set; }
+
+            public FakeClock Clock { get; } = new();
+
+            public FakeGitHubReleaseClient ReleaseClient { get; } = new(
+                """
+                [
+                  {
+                    "tag_name": "v1.4.0",
+                    "prerelease": false,
+                    "draft": false,
+                    "html_url": "https://github.com/PrimeBuild-pc/ThreadPilot/releases/tag/v1.4.0",
+                    "assets": [
+                      { "name": "ThreadPilot_v1.4.0_Setup.exe", "browser_download_url": "https://github.com/PrimeBuild-pc/ThreadPilot/releases/download/v1.4.0/ThreadPilot_v1.4.0_Setup.exe", "size": 100 },
+                      { "name": "SHA256SUMS.txt", "browser_download_url": "https://github.com/PrimeBuild-pc/ThreadPilot/releases/download/v1.4.0/SHA256SUMS.txt", "size": 100 }
+                    ]
+                  }
+                ]
+                """);
+
+            public Mock<IUpdateDownloadService> Download { get; } = new(MockBehavior.Strict);
+
+            public Mock<IUpdateInstallerService> Installer { get; } = new(MockBehavior.Strict);
+
+            public Mock<IApplicationShutdownService> Shutdown { get; } = new(MockBehavior.Strict);
+
+            public string TempDirectory { get; }
+
+            public UpdateService Service { get; }
+
+            public Harness()
+            {
+                this.TempDirectory = Directory.CreateTempSubdirectory("ThreadPilotUpdateTest").FullName;
+                var settingsService = new Mock<IApplicationSettingsService>();
+                settingsService.SetupGet(service => service.Settings).Returns(() => (ApplicationSettingsModel)this.Settings.Clone());
+                settingsService
+                    .Setup(service => service.UpdateSettingsAsync(It.IsAny<ApplicationSettingsModel>()))
+                    .Callback<ApplicationSettingsModel>(settings =>
+                    {
+                        this.SavedSettings = (ApplicationSettingsModel)settings.Clone();
+                        this.Settings.CopyFrom(settings);
+                    })
+                    .Returns(Task.CompletedTask);
+
+                var versionProvider = new Mock<IApplicationVersionProvider>();
+                versionProvider.SetupGet(provider => provider.CurrentVersion).Returns(new SemanticVersion(1, 3, 1));
+                versionProvider.SetupGet(provider => provider.DisplayVersion).Returns("v1.3.1");
+
+                var tempProvider = new Mock<IUpdateTempDirectoryProvider>();
+                tempProvider.Setup(provider => provider.Cleanup(It.IsAny<string>()));
+
+                this.Shutdown.Setup(service => service.RequestShutdownForUpdate());
+                this.Installer
+                    .Setup(service => service.LaunchInstallerElevatedAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
+                    .Returns(Task.CompletedTask);
+
+                this.Service = new UpdateService(
+                    new GitHubUpdateChecker(this.ReleaseClient),
+                    settingsService.Object,
+                    versionProvider.Object,
+                    this.Download.Object,
+                    this.Installer.Object,
+                    tempProvider.Object,
+                    this.Shutdown.Object,
+                    this.Clock,
+                    NullLogger<UpdateService>.Instance);
+            }
+        }
+
+        private sealed class FakeClock : IUpdateClock
+        {
+            public DateTimeOffset UtcNow { get; } = new(2026, 6, 7, 12, 0, 0, TimeSpan.Zero);
+        }
+
+        private sealed class FakeGitHubReleaseClient : IGitHubReleaseClient
+        {
+            private readonly string releasesJson;
+
+            public bool RequestedReleases { get; private set; }
+
+            public FakeGitHubReleaseClient(string releasesJson)
+            {
+                this.releasesJson = releasesJson;
+            }
+
+            public Task<string> GetLatestReleaseJsonAsync(string owner, string repo, CancellationToken cancellationToken = default)
+            {
+                throw new NotSupportedException();
+            }
+
+            public Task<string> GetReleasesJsonAsync(string owner, string repo, CancellationToken cancellationToken = default)
+            {
+                this.RequestedReleases = true;
+                return Task.FromResult(this.releasesJson);
+            }
+        }
+
+        private sealed class FakeUpdateDownloadClient : IUpdateDownloadClient
+        {
+            private readonly byte[] fileBytes;
+            private readonly string? checksumsText;
+
+            public FakeUpdateDownloadClient(byte[] fileBytes, string? checksumsText)
+            {
+                this.fileBytes = fileBytes;
+                this.checksumsText = checksumsText;
+            }
+
+            public Task DownloadFileAsync(Uri uri, string destinationPath, CancellationToken cancellationToken = default)
+            {
+                File.WriteAllBytes(destinationPath, this.fileBytes);
+                return Task.CompletedTask;
+            }
+
+            public Task<string?> TryDownloadStringAsync(Uri uri, CancellationToken cancellationToken = default)
+            {
+                return Task.FromResult(this.checksumsText);
+            }
+        }
+
+        private sealed class TempDirectory : IDisposable
+        {
+            public string Path { get; } = Directory.CreateTempSubdirectory("ThreadPilotUpdateTest").FullName;
+
+            public void Dispose()
+            {
+                if (Directory.Exists(this.Path))
+                {
+                    Directory.Delete(this.Path, recursive: true);
+                }
+            }
+        }
+    }
+}
diff --git a/ThreadPilot.csproj b/ThreadPilot.csproj
index 85e6592..b244865 100644
--- a/ThreadPilot.csproj
+++ b/ThreadPilot.csproj
@@ -16,10 +16,10 @@
     <TrimMode>link</TrimMode>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>CS1998;CS0067;CS0414;WFAC010;IL3000;MVVMTK0034</NoWarn>
-    <Version>1.3.0</Version>
-    <AssemblyVersion>1.3.0.0</AssemblyVersion>
-    <FileVersion>1.3.0.0</FileVersion>
-    <InformationalVersion>1.3.0</InformationalVersion>
+    <Version>1.4.0</Version>
+    <AssemblyVersion>1.4.0.0</AssemblyVersion>
+    <FileVersion>1.4.0.0</FileVersion>
+    <InformationalVersion>1.4.0</InformationalVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/ViewModels/ProcessViewModel.cs b/ViewModels/ProcessViewModel.cs
index 9cdb0d0..31ba5fc 100644
--- a/ViewModels/ProcessViewModel.cs
+++ b/ViewModels/ProcessViewModel.cs
@@ -197,7 +197,8 @@ public ProcessViewModel(
             IPersistentProcessRuleMatcher? persistentRuleMatcher = null,
             IProcessRuleCreationService? processRuleCreationService = null,
             Action<string>? clipboardSetter = null,
-            Action<string>? executableLocationOpener = null)
+            Action<string>? executableLocationOpener = null,
+            ILocalizationService? localizationService = null)
             : base(logger, enhancedLoggingService, activityAuditService)
         {
             this.processService = processService ?? throw new ArgumentNullException(nameof(processService));
@@ -232,7 +233,8 @@ public ProcessViewModel(
             this.SelectedProcessSummary = new SelectedProcessSummaryViewModel(
                 memoryPriorityService,
                 persistentRuleStore,
-                persistentRuleMatcher);
+                persistentRuleMatcher,
+                localizationService);
 
             // Subscribe to topology detection events
             this.cpuTopologyService.TopologyDetected += this.OnTopologyDetected;
diff --git a/ViewModels/SelectedProcessSummaryViewModel.cs b/ViewModels/SelectedProcessSummaryViewModel.cs
index 18d32d9..2828231 100644
--- a/ViewModels/SelectedProcessSummaryViewModel.cs
+++ b/ViewModels/SelectedProcessSummaryViewModel.cs
@@ -14,6 +14,7 @@ public sealed class SelectedProcessSummaryViewModel : ObservableObject
         private readonly IProcessMemoryPriorityService? memoryPriorityService;
         private readonly IPersistentProcessRuleStore? persistentRuleStore;
         private readonly IPersistentProcessRuleMatcher? persistentRuleMatcher;
+        private readonly ILocalizationService? localizationService;
         private bool hasSelection;
         private int processId;
         private string processName = string.Empty;
@@ -40,11 +41,14 @@ public sealed class SelectedProcessSummaryViewModel : ObservableObject
         public SelectedProcessSummaryViewModel(
             IProcessMemoryPriorityService? memoryPriorityService = null,
             IPersistentProcessRuleStore? persistentRuleStore = null,
-            IPersistentProcessRuleMatcher? persistentRuleMatcher = null)
+            IPersistentProcessRuleMatcher? persistentRuleMatcher = null,
+            ILocalizationService? localizationService = null)
         {
             this.memoryPriorityService = memoryPriorityService;
             this.persistentRuleStore = persistentRuleStore;
             this.persistentRuleMatcher = persistentRuleMatcher;
+            this.localizationService = localizationService;
+            this.Clear(version: 0, lastOperationMessage: null, lastOperationIsError: false);
         }
 
         public bool HasSelection
@@ -194,14 +198,14 @@ public async Task UpdateAsync(
             this.CpuPriority = process.Priority;
             this.ProcessorAffinity = process.ProcessorAffinity;
             this.IsProtectedOrAccessDenied = process.Classification == ProcessClassification.ProtectedOrAccessDenied;
-            this.ProcessTitle = $"Selected process: {this.ProcessName} (PID {this.ProcessId})";
+            this.ProcessTitle = this.L("ProcessSummary_SelectedProcessFormat", "Selected process: {0} (PID {1})", this.ProcessName, this.ProcessId);
             this.CurrentProcessStatusText = this.IsProtectedOrAccessDenied
-                ? "Current process status: protected or access denied"
-                : "Current process status: selected";
-            this.CpuUsageText = $"CPU: {this.CpuUsage:N1}%";
-            this.MemoryUsageText = $"Memory: {FormatMemory(this.MemoryUsage)}";
-            this.CpuPriorityText = $"CPU priority: {this.CpuPriority}";
-            this.AffinityText = $"Affinity: legacy mask 0x{this.ProcessorAffinity:X}";
+                ? this.L("ProcessSummary_StatusProtected", "Current process status: protected or access denied")
+                : this.L("ProcessSummary_StatusSelected", "Current process status: selected");
+            this.CpuUsageText = this.L("ProcessSummary_CpuFormat", "CPU: {0:N1}%", this.CpuUsage);
+            this.MemoryUsageText = this.L("ProcessSummary_MemoryFormat", "Memory: {0}", FormatMemory(this.MemoryUsage));
+            this.CpuPriorityText = this.L("ProcessSummary_CpuPriorityFormat", "CPU priority: {0}", this.CpuPriority);
+            this.AffinityText = this.L("ProcessSummary_AffinityLegacyFormat", "Affinity: legacy mask 0x{0:X}", this.ProcessorAffinity);
             this.UpdateLastOperation(lastOperationMessage, lastOperationIsError);
 
             await this.UpdateMemoryPriorityAsync(process, version);
@@ -242,21 +246,21 @@ private void Clear(int version, string? lastOperationMessage, bool lastOperation
             this.MemoryPriority = null;
             this.IsProtectedOrAccessDenied = false;
             this.HasThreadPilotRule = false;
-            this.ProcessTitle = "No process selected";
-            this.CurrentProcessStatusText = "No process selected";
-            this.CpuUsageText = "CPU: unavailable";
-            this.MemoryUsageText = "Memory: unavailable";
-            this.CpuPriorityText = "CPU priority: unavailable";
-            this.MemoryPriorityText = "Memory priority unavailable";
-            this.AffinityText = "Affinity: unavailable";
-            this.RuleStatusText = "No saved rule";
+            this.ProcessTitle = this.L("ProcessView_NoProcessSelected", "No process selected");
+            this.CurrentProcessStatusText = this.L("ProcessView_NoProcessSelected", "No process selected");
+            this.CpuUsageText = this.L("ProcessSummary_CpuUnavailable", "CPU: unavailable");
+            this.MemoryUsageText = this.L("ProcessSummary_MemoryUnavailable", "Memory: unavailable");
+            this.CpuPriorityText = this.L("ProcessSummary_CpuPriorityUnavailable", "CPU priority: unavailable");
+            this.MemoryPriorityText = this.L("ProcessSummary_MemoryPriorityUnavailable", "Memory priority unavailable");
+            this.AffinityText = this.L("ProcessSummary_AffinityUnavailable", "Affinity: unavailable");
+            this.RuleStatusText = this.L("ProcessSummary_NoSavedRule", "No saved rule");
             this.UpdateLastOperation(lastOperationMessage, lastOperationIsError);
         }
 
         private async Task UpdateMemoryPriorityAsync(ProcessModel process, int version)
         {
             this.MemoryPriority = null;
-            this.MemoryPriorityText = "Memory priority unavailable";
+            this.MemoryPriorityText = this.L("ProcessSummary_MemoryPriorityUnavailable", "Memory priority unavailable");
 
             if (this.memoryPriorityService == null)
             {
@@ -277,7 +281,7 @@ private async Task UpdateMemoryPriorityAsync(ProcessModel process, int version)
                 }
 
                 this.MemoryPriority = priority.Value;
-                this.MemoryPriorityText = $"Memory priority: {priority.Value}";
+                this.MemoryPriorityText = this.L("ProcessSummary_MemoryPriorityFormat", "Memory priority: {0}", priority.Value);
             }
             catch (Exception)
             {
@@ -287,14 +291,14 @@ private async Task UpdateMemoryPriorityAsync(ProcessModel process, int version)
                 }
 
                 this.MemoryPriority = null;
-                this.MemoryPriorityText = "Memory priority unavailable";
+                this.MemoryPriorityText = this.L("ProcessSummary_MemoryPriorityUnavailable", "Memory priority unavailable");
             }
         }
 
         private async Task UpdateRuleStatusAsync(ProcessModel process, int version)
         {
             this.HasThreadPilotRule = false;
-            this.RuleStatusText = "No saved rule";
+            this.RuleStatusText = this.L("ProcessSummary_NoSavedRule", "No saved rule");
 
             if (this.persistentRuleStore == null || this.persistentRuleMatcher == null)
             {
@@ -316,8 +320,10 @@ private async Task UpdateRuleStatusAsync(ProcessModel process, int version)
                 }
 
                 this.HasThreadPilotRule = true;
-                var ruleName = string.IsNullOrWhiteSpace(matchingRule.Name) ? "saved rule" : matchingRule.Name.Trim();
-                this.RuleStatusText = $"Saved rule exists: {ruleName}";
+                var ruleName = string.IsNullOrWhiteSpace(matchingRule.Name)
+                    ? this.L("ProcessSummary_SavedRuleFallback", "saved rule")
+                    : matchingRule.Name.Trim();
+                this.RuleStatusText = this.L("ProcessSummary_SavedRuleExistsFormat", "Saved rule exists: {0}", ruleName);
             }
             catch (Exception)
             {
@@ -327,7 +333,7 @@ private async Task UpdateRuleStatusAsync(ProcessModel process, int version)
                 }
 
                 this.HasThreadPilotRule = false;
-                this.RuleStatusText = "No saved rule";
+                this.RuleStatusText = this.L("ProcessSummary_NoSavedRule", "No saved rule");
             }
         }
 
@@ -337,7 +343,7 @@ private void UpdateLastOperation(string? message, bool isError)
         {
             if (string.IsNullOrWhiteSpace(message))
             {
-                this.LastOperationMessage = "No recent ThreadPilot action";
+                this.LastOperationMessage = this.L("ProcessSummary_NoRecentAction", "No recent ThreadPilot action");
                 this.LastOperationSeverity = "Information";
                 return;
             }
@@ -345,5 +351,15 @@ private void UpdateLastOperation(string? message, bool isError)
             this.LastOperationMessage = message.Trim();
             this.LastOperationSeverity = isError ? "Error" : "Information";
         }
+
+        private string L(string key, string fallback, params object[] args)
+        {
+            var localized = this.localizationService?.GetString(key);
+            var format = string.IsNullOrWhiteSpace(localized) || string.Equals(localized, key, StringComparison.Ordinal)
+                ? fallback
+                : localized;
+
+            return args.Length == 0 ? format : string.Format(format, args);
+        }
     }
 }
diff --git a/ViewModels/SettingsViewModel.cs b/ViewModels/SettingsViewModel.cs
index 51d2ef3..fdbcde9 100644
--- a/ViewModels/SettingsViewModel.cs
+++ b/ViewModels/SettingsViewModel.cs
@@ -19,7 +19,6 @@ namespace ThreadPilot.ViewModels
     using System;
     using System.Collections.Generic;
     using System.Collections.ObjectModel;
-    using System.Diagnostics;
     using System.IO;
     using System.Linq;
     using System.Reflection;
@@ -48,13 +47,15 @@ public partial class SettingsViewModel : BaseViewModel
         private readonly IProcessMonitorManagerService processMonitorManagerService;
         private readonly IThemeService themeService;
         private readonly ISystemTrayService systemTrayService;
-        private readonly GitHubUpdateChecker gitHubUpdateChecker;
+        private readonly IUpdateService updateService;
+        private readonly IApplicationVersionProvider versionProvider;
         private readonly ILocalizationService localizationService;
         private ApplicationSettingsModel savedSettingsSnapshot;
         private bool isSyncingFromService = false;
         private bool? appliedThemePreference;
         private string cachedDefaultPowerPlanGuid = string.Empty;
         private string cachedDefaultPowerPlanName = string.Empty;
+        private UpdateReleaseInfo? availableUpdate;
         private static readonly JsonSerializerOptions ImportExportJsonOptions = new()
         {
             WriteIndented = true,
@@ -96,6 +97,19 @@ public partial class SettingsViewModel : BaseViewModel
 
         public ICommand CheckUpdatesCommand { get; }
 
+        public IAsyncRelayCommand DownloadAndInstallUpdateCommand { get; }
+
+        [ObservableProperty]
+        private string latestUpdateVersion = string.Empty;
+
+        [ObservableProperty]
+        private string lastUpdateCheckText = string.Empty;
+
+        [ObservableProperty]
+        private bool isUpdateAvailable = false;
+
+        public bool CanDownloadAndInstallUpdate => this.IsUpdateAvailable && !this.IsLoading;
+
         public SettingsViewModel(
             ILogger<SettingsViewModel> logger,
             IApplicationSettingsService settingsService,
@@ -106,7 +120,8 @@ public SettingsViewModel(
             IProcessMonitorManagerService processMonitorManagerService,
             IThemeService themeService,
             ISystemTrayService systemTrayService,
-            GitHubUpdateChecker gitHubUpdateChecker,
+            IUpdateService updateService,
+            IApplicationVersionProvider versionProvider,
             ILocalizationService localizationService,
             IEnhancedLoggingService? enhancedLoggingService = null,
             IActivityAuditService? activityAuditService = null)
@@ -120,24 +135,18 @@ public SettingsViewModel(
             this.processMonitorManagerService = processMonitorManagerService ?? throw new ArgumentNullException(nameof(processMonitorManagerService));
             this.themeService = themeService ?? throw new ArgumentNullException(nameof(themeService));
             this.systemTrayService = systemTrayService ?? throw new ArgumentNullException(nameof(systemTrayService));
-            this.gitHubUpdateChecker = gitHubUpdateChecker ?? throw new ArgumentNullException(nameof(gitHubUpdateChecker));
+            this.updateService = updateService ?? throw new ArgumentNullException(nameof(updateService));
+            this.versionProvider = versionProvider ?? throw new ArgumentNullException(nameof(versionProvider));
             this.localizationService = localizationService ?? throw new ArgumentNullException(nameof(localizationService));
 
-            // Get version and strip the git commit hash (everything after '+')
-            var rawVersion = typeof(App).Assembly
-                .GetCustomAttribute<AssemblyInformationalVersionAttribute>()?
-                .InformationalVersion
-                ?? typeof(App).Assembly.GetName().Version?.ToString()
-                ?? "0.0.0";
-
-            // Remove commit hash suffix and add 'v' prefix
-            var cleanVersion = rawVersion.Split('+')[0];
-            this.ApplicationVersion = $"v{cleanVersion}";
+            this.ApplicationVersion = this.versionProvider.DisplayVersion;
 
             // Initialize with current settings
             this.settings = (ApplicationSettingsModel)this.settingsService.Settings.Clone();
             this.savedSettingsSnapshot = (ApplicationSettingsModel)this.settings.Clone();
             this.appliedThemePreference = this.settings.UseDarkTheme;
+            this.LatestUpdateVersion = this.GetLocalizedString("Settings_UpdateNotChecked", "Not checked");
+            this.UpdateLastCheckedText();
 
             // Initialize commands
             this.SaveSettingsCommand = new AsyncRelayCommand(this.SaveSettingsAsync);
@@ -147,6 +156,9 @@ public SettingsViewModel(
             this.TestNotificationCommand = new AsyncRelayCommand(this.TestNotificationAsync);
             this.RefreshPowerPlansCommand = new AsyncRelayCommand(this.RefreshPowerPlansAsync);
             this.CheckUpdatesCommand = new AsyncRelayCommand(this.CheckUpdatesAsync);
+            this.DownloadAndInstallUpdateCommand = new AsyncRelayCommand(
+                this.DownloadAndInstallUpdateAsync,
+                () => this.CanDownloadAndInstallUpdate);
 
             // Subscribe to property changes to track unsaved changes
             this.Settings.PropertyChanged += this.OnSettingsPropertyChanged;
@@ -209,13 +221,15 @@ private void ApplyThemePreference(bool useDarkTheme, bool logUserAction)
                 return;
             }
 
-            var themeName = useDarkTheme ? "Dark" : "Light";
+            var themeName = useDarkTheme
+                ? this.GetLocalizedString("Settings_ThemeDark", "Dark")
+                : this.GetLocalizedString("Settings_ThemeLight", "Light");
             try
             {
                 this.themeService.ApplyTheme(useDarkTheme);
                 this.systemTrayService.ApplyTheme(useDarkTheme);
                 this.appliedThemePreference = useDarkTheme;
-                this.StatusMessage = $"Theme changed to {themeName}.";
+                this.StatusMessage = this.GetLocalizedString("Settings_StatusThemeChangedFormat", "Theme changed to {0}.", themeName);
 
                 if (logUserAction)
                 {
@@ -224,7 +238,7 @@ private void ApplyThemePreference(bool useDarkTheme, bool logUserAction)
             }
             catch (Exception ex)
             {
-                this.StatusMessage = $"Failed to change theme to {themeName}.";
+                this.StatusMessage = this.GetLocalizedString("Settings_StatusThemeChangeFailedFormat", "Failed to change theme to {0}.", themeName);
                 this.Logger.LogError(ex, "Failed to apply theme preference {ThemeName}", themeName);
                 _ = this.LogUserActionAsync("ThemeChangeFailed", $"Failed to change theme to {themeName}: {ex.Message}");
             }
@@ -238,9 +252,9 @@ private void ApplyLanguagePreference(string language, bool logUserAction)
                 this.localizationService.ApplyLanguage(normalizedLanguage);
                 this.Settings.Language = normalizedLanguage;
                 var languageName = normalizedLanguage == LocalizationService.SimplifiedChineseLanguage
-                    ? "Simplified Chinese"
-                    : "English";
-                this.StatusMessage = $"Language changed to {languageName}.";
+                    ? this.GetLocalizedString("Settings_LanguageSimplifiedChinese", "Simplified Chinese")
+                    : this.GetLocalizedString("Settings_LanguageEnglish", "English");
+                this.StatusMessage = this.GetLocalizedString("Settings_StatusLanguageChangedFormat", "Language changed to {0}.", languageName);
 
                 if (logUserAction)
                 {
@@ -249,7 +263,7 @@ private void ApplyLanguagePreference(string language, bool logUserAction)
             }
             catch (Exception ex)
             {
-                this.StatusMessage = "Failed to change language.";
+                this.StatusMessage = this.GetLocalizedString("Settings_StatusLanguageChangeFailed", "Failed to change language.");
                 this.Logger.LogError(ex, "Failed to apply language preference {Language}", normalizedLanguage);
                 _ = this.LogUserActionAsync("LanguageChangeFailed", $"Failed to change language to {normalizedLanguage}: {ex.Message}");
             }
@@ -263,6 +277,14 @@ partial void OnHasUnsavedChangesChanged(bool value)
         partial void OnIsLoadingChanged(bool value)
         {
             OnPropertyChanged(nameof(CanSaveSettings));
+            OnPropertyChanged(nameof(CanDownloadAndInstallUpdate));
+            this.DownloadAndInstallUpdateCommand.NotifyCanExecuteChanged();
+        }
+
+        partial void OnIsUpdateAvailableChanged(bool value)
+        {
+            OnPropertyChanged(nameof(CanDownloadAndInstallUpdate));
+            this.DownloadAndInstallUpdateCommand.NotifyCanExecuteChanged();
         }
 
         private async Task SaveSettingsAsync()
@@ -273,7 +295,7 @@ private async Task SaveSettingsAsync()
             try
             {
                 this.IsLoading = true;
-                this.StatusMessage = "Saving settings...";
+                this.StatusMessage = this.GetLocalizedString("Settings_StatusSaving", "Saving settings...");
                 var warnings = new List<string>();
 
                 previousDefaultPowerPlanGuid = this.Settings.DefaultPowerPlanId;
@@ -295,7 +317,9 @@ private async Task SaveSettingsAsync()
 
                     if (!autostartUpdated)
                     {
-                        warnings.Add("Failed to update Windows autostart. Keeping previous autostart state.");
+                        warnings.Add(this.GetLocalizedString(
+                            "Settings_WarningAutostartFailed",
+                            "Failed to update Windows autostart. Keeping previous autostart state."));
                         this.Settings.AutostartWithWindows = currentAutostartState;
                     }
                     else
@@ -322,7 +346,10 @@ private async Task SaveSettingsAsync()
                 this.SetSavedSettingsSnapshot(this.Settings);
                 if (warnings.Count > 0)
                 {
-                    this.StatusMessage = $"Settings saved with warnings: {string.Join(" ", warnings)}";
+                    this.StatusMessage = this.GetLocalizedString(
+                        "Settings_StatusSavedWarningsFormat",
+                        "Settings saved with warnings: {0}",
+                        string.Join(" ", warnings));
                     await this.notificationService.ShowNotificationAsync(
                         "Settings Saved with Warnings",
                         string.Join(" ", warnings),
@@ -330,7 +357,7 @@ await this.notificationService.ShowNotificationAsync(
                 }
                 else
                 {
-                    this.StatusMessage = "Settings saved and applied successfully.";
+                    this.StatusMessage = this.GetLocalizedString("Settings_StatusSavedApplied", "Settings saved and applied successfully.");
                     await this.notificationService.ShowSuccessNotificationAsync(
                         "Settings Saved",
                         "Application settings have been saved successfully");
@@ -344,7 +371,7 @@ await this.notificationService.ShowSuccessNotificationAsync(
                 this.Settings.DefaultPowerPlanId = previousDefaultPowerPlanGuid;
                 this.Settings.DefaultPowerPlanName = previousDefaultPowerPlanName;
 
-                this.StatusMessage = $"Error saving settings: {ex.Message}";
+                this.StatusMessage = this.GetLocalizedString("Settings_StatusErrorSavingFormat", "Error saving settings: {0}", ex.Message);
                 this.Logger.LogError(ex, "Error saving settings");
 
                 await this.notificationService.ShowErrorNotificationAsync(
@@ -364,20 +391,20 @@ private async Task ResetToDefaultsAsync()
             try
             {
                 this.IsLoading = true;
-                this.StatusMessage = "Resetting to defaults...";
+                this.StatusMessage = this.GetLocalizedString("Settings_StatusResetting", "Resetting to defaults...");
 
                 var defaultSettings = new ApplicationSettingsModel();
                 this.Settings.CopyFrom(defaultSettings);
 
                 this.UpdatePendingChangesState();
-                this.StatusMessage = "Settings reset to defaults (not saved yet)";
+                this.StatusMessage = this.GetLocalizedString("Settings_StatusResetPending", "Settings reset to defaults (not saved yet)");
 
                 await this.LogUserActionAsync("SettingsChanged", "Settings reset to defaults pending save");
                 this.Logger.LogInformation("Settings reset to defaults");
             }
             catch (Exception ex)
             {
-                this.StatusMessage = $"Error resetting settings: {ex.Message}";
+                this.StatusMessage = this.GetLocalizedString("Settings_StatusErrorResettingFormat", "Error resetting settings: {0}", ex.Message);
                 this.Logger.LogError(ex, "Error resetting settings");
                 await this.LogUserActionAsync("SettingsChangeFailed", $"Failed to reset settings: {ex.Message}");
             }
@@ -392,11 +419,11 @@ private async Task ExportSettingsAsync()
             try
             {
                 this.IsLoading = true;
-                this.StatusMessage = "Exporting configuration bundle...";
+                this.StatusMessage = this.GetLocalizedString("Settings_StatusExporting", "Exporting configuration bundle...");
 
                 var saveDialog = new SaveFileDialog
                 {
-                    Title = "Export ThreadPilot Configuration",
+                    Title = this.GetLocalizedString("Settings_DialogExportTitle", "Export ThreadPilot Configuration"),
                     Filter = "ThreadPilot configuration (*.json)|*.json|All files (*.*)|*.*",
                     DefaultExt = ".json",
                     FileName = $"ThreadPilot_Configuration_{DateTime.Now:yyyyMMdd_HHmmss}.json",
@@ -406,7 +433,7 @@ private async Task ExportSettingsAsync()
 
                 if (saveDialog.ShowDialog() != true)
                 {
-                    this.StatusMessage = "Export canceled";
+                    this.StatusMessage = this.GetLocalizedString("Settings_StatusExportCanceled", "Export canceled");
                     return;
                 }
 
@@ -424,7 +451,7 @@ private async Task ExportSettingsAsync()
                 var json = JsonSerializer.Serialize(bundle, ImportExportJsonOptions);
                 await AtomicFileWriter.WriteAllTextAsync(saveDialog.FileName, json, Encoding.UTF8);
 
-                this.StatusMessage = $"Configuration exported to: {saveDialog.FileName}";
+                this.StatusMessage = this.GetLocalizedString("Settings_StatusExportedFormat", "Configuration exported to: {0}", saveDialog.FileName);
 
                 await this.notificationService.ShowSuccessNotificationAsync(
                     "Configuration Exported",
@@ -435,7 +462,7 @@ await this.notificationService.ShowSuccessNotificationAsync(
             }
             catch (Exception ex)
             {
-                this.StatusMessage = $"Error exporting settings: {ex.Message}";
+                this.StatusMessage = this.GetLocalizedString("Settings_StatusErrorExportingFormat", "Error exporting settings: {0}", ex.Message);
                 this.Logger.LogError(ex, "Error exporting settings");
 
                 await this.notificationService.ShowErrorNotificationAsync(
@@ -455,11 +482,11 @@ private async Task ImportSettingsAsync()
             try
             {
                 this.IsLoading = true;
-                this.StatusMessage = "Importing configuration...";
+                this.StatusMessage = this.GetLocalizedString("Settings_StatusImporting", "Importing configuration...");
 
                 var openDialog = new OpenFileDialog
                 {
-                    Title = "Import ThreadPilot Configuration",
+                    Title = this.GetLocalizedString("Settings_DialogImportTitle", "Import ThreadPilot Configuration"),
                     Filter = "JSON files (*.json)|*.json|All files (*.*)|*.*",
                     Multiselect = false,
                     CheckFileExists = true,
@@ -467,7 +494,7 @@ private async Task ImportSettingsAsync()
 
                 if (openDialog.ShowDialog() != true)
                 {
-                    this.StatusMessage = "Import canceled";
+                    this.StatusMessage = this.GetLocalizedString("Settings_StatusImportCanceled", "Import canceled");
                     return;
                 }
 
@@ -490,7 +517,7 @@ private async Task ImportSettingsAsync()
                     await this.RefreshSettingsAsync();
                     this.HasUnsavedChanges = false;
 
-                    this.StatusMessage = "Configuration bundle imported and applied";
+                    this.StatusMessage = this.GetLocalizedString("Settings_StatusImportedApplied", "Configuration bundle imported and applied");
                     await this.notificationService.ShowSuccessNotificationAsync(
                         "Configuration Imported",
                         $"Settings and rules imported from {Path.GetFileName(importPath)}");
@@ -505,7 +532,7 @@ await this.notificationService.ShowSuccessNotificationAsync(
                 await this.RefreshSettingsAsync();
                 this.HasUnsavedChanges = false;
 
-                this.StatusMessage = "Legacy settings imported (rules unchanged)";
+                this.StatusMessage = this.GetLocalizedString("Settings_StatusLegacyImported", "Legacy settings imported (rules unchanged)");
                 await this.notificationService.ShowNotificationAsync(
                     "Legacy Import Completed",
                     $"Imported settings from {Path.GetFileName(importPath)}. Rules were not modified.",
@@ -516,7 +543,7 @@ await this.notificationService.ShowNotificationAsync(
             }
             catch (Exception ex)
             {
-                this.StatusMessage = $"Error importing settings: {ex.Message}";
+                this.StatusMessage = this.GetLocalizedString("Settings_StatusErrorImportingFormat", "Error importing settings: {0}", ex.Message);
                 this.Logger.LogError(ex, "Error importing settings");
 
                 await this.notificationService.ShowErrorNotificationAsync(
@@ -540,12 +567,12 @@ await this.notificationService.ShowNotificationAsync(
                     "This is a test notification to verify your settings are working correctly.",
                     NotificationType.Information);
 
-                this.StatusMessage = "Test notification sent";
+                this.StatusMessage = this.GetLocalizedString("Settings_StatusTestSent", "Test notification sent");
                 this.Logger.LogInformation("Test notification sent");
             }
             catch (Exception ex)
             {
-                this.StatusMessage = $"Error sending test notification: {ex.Message}";
+                this.StatusMessage = this.GetLocalizedString("Settings_StatusErrorTestFormat", "Error sending test notification: {0}", ex.Message);
                 this.Logger.LogError(ex, "Error sending test notification");
             }
         }
@@ -558,7 +585,7 @@ public async Task RefreshSettingsAsync()
             try
             {
                 this.IsLoading = true;
-                this.StatusMessage = "Loading settings...";
+                this.StatusMessage = this.GetLocalizedString("Settings_StatusLoading", "Loading settings...");
 
                 await this.settingsService.LoadSettingsAsync();
                 await this.associationService.LoadConfigurationAsync();
@@ -588,13 +615,13 @@ public async Task RefreshSettingsAsync()
                 this.ApplyLanguagePreference(this.Settings.Language, logUserAction: false);
 
                 this.SetSavedSettingsSnapshot(this.Settings);
-                this.StatusMessage = "Settings loaded";
+                this.StatusMessage = this.GetLocalizedString("Settings_StatusLoaded", "Settings loaded");
 
                 this.Logger.LogInformation("Settings refreshed");
             }
             catch (Exception ex)
             {
-                this.StatusMessage = $"Error loading settings: {ex.Message}";
+                this.StatusMessage = this.GetLocalizedString("Settings_StatusErrorLoadingFormat", "Error loading settings: {0}", ex.Message);
                 this.Logger.LogError(ex, "Error loading settings");
             }
             finally
@@ -628,7 +655,7 @@ private void OnSettingsServiceSettingsChanged(object? sender, ApplicationSetting
                     }
                     this.SetSavedSettingsSnapshot(this.Settings);
                     this.ApplyLanguagePreference(this.Settings.Language, logUserAction: false);
-                    this.StatusMessage = "Settings synchronized";
+                    this.StatusMessage = this.GetLocalizedString("Settings_StatusSynchronized", "Settings synchronized");
                 }
                 finally
                 {
@@ -662,43 +689,37 @@ private async Task CheckUpdatesAsync()
             try
             {
                 this.IsLoading = true;
-                this.StatusMessage = "Checking for updates...";
+                this.StatusMessage = this.GetLocalizedString("Settings_StatusCheckingUpdates", "Checking for updates...");
 
-                var currentVersion = ParseVersion(this.ApplicationVersion);
-                var (latest, releaseUrl) = await this.gitHubUpdateChecker.GetLatestVersionAsync("PrimeBuild-pc", "ThreadPilot");
+                var result = await this.updateService.CheckForUpdatesAsync(new UpdateCheckRequest(UpdateCheckTrigger.Manual));
+                this.UpdateLastCheckedText();
 
-                if (latest is null)
+                if (result.Status == UpdateCheckStatus.Failed)
                 {
-                    this.StatusMessage = "Unable to determine the latest version.";
+                    this.StatusMessage = this.GetLocalizedString("Settings_StatusLatestUnknown", "Unable to determine the latest version.");
                     await this.notificationService.ShowErrorNotificationAsync(
                         "Update Check",
-                        "Unable to retrieve latest release information.");
+                        result.Message);
                     return;
                 }
 
-                if (latest > currentVersion)
+                if (result.IsUpdateAvailable && result.Release != null)
                 {
-                    this.StatusMessage = $"New version available: {latest}";
-
-                    var result = System.Windows.MessageBox.Show(
-                        $"Update available\nInstalled version: {this.ApplicationVersion}\nNew version: {latest}\n\nDo you want to open the download page?",
+                    this.availableUpdate = result.Release;
+                    this.LatestUpdateVersion = $"v{result.Release.Version}";
+                    this.IsUpdateAvailable = true;
+                    this.StatusMessage = this.GetLocalizedString("Settings_StatusNewVersionFormat", "New version available: {0}", result.Release.Version);
+                    await this.notificationService.ShowNotificationAsync(
                         "Update available",
-                        MessageBoxButton.YesNo,
-                        MessageBoxImage.Information);
-
-                    if (result == MessageBoxResult.Yes)
-                    {
-                        var url = releaseUrl ?? "https://github.com/PrimeBuild-pc/ThreadPilot/releases/latest";
-                        Process.Start(new ProcessStartInfo
-                        {
-                            FileName = url,
-                            UseShellExecute = true,
-                        });
-                    }
+                        $"ThreadPilot {result.Release.Version} is available.",
+                        NotificationType.Information);
                 }
                 else
                 {
-                    this.StatusMessage = $"Application is up to date. Installed version: {this.ApplicationVersion}";
+                    this.availableUpdate = null;
+                    this.LatestUpdateVersion = result.Release != null ? $"v{result.Release.Version}" : this.GetLocalizedString("Settings_UpdateLatestUnknown", "Unknown");
+                    this.IsUpdateAvailable = false;
+                    this.StatusMessage = this.GetLocalizedString("Settings_StatusUpToDateFormat", "Application is up to date. Installed version: {0}", this.ApplicationVersion);
                     await this.notificationService.ShowSuccessNotificationAsync(
                         "Application up to date",
                         $"Installed version: {this.ApplicationVersion}");
@@ -706,7 +727,7 @@ await this.notificationService.ShowSuccessNotificationAsync(
             }
             catch (Exception ex)
             {
-                this.StatusMessage = $"Error while checking updates: {ex.Message}";
+                this.StatusMessage = this.GetLocalizedString("Settings_StatusUpdateErrorFormat", "Error while checking updates: {0}", ex.Message);
                 this.Logger.LogError(ex, "Error checking for updates");
 
                 await this.notificationService.ShowErrorNotificationAsync(
@@ -720,24 +741,83 @@ await this.notificationService.ShowErrorNotificationAsync(
             }
         }
 
-        private static Version ParseVersion(string versionString)
+        private async Task DownloadAndInstallUpdateAsync()
         {
-            if (string.IsNullOrWhiteSpace(versionString))
+            if (this.availableUpdate == null)
             {
-                return new Version(0, 0, 0);
+                this.StatusMessage = this.GetLocalizedString("Settings_StatusLatestUnknown", "Unable to determine the latest version.");
+                return;
             }
 
-            var sanitized = versionString.Trim();
-            if (sanitized.StartsWith("v", StringComparison.OrdinalIgnoreCase))
+            var message = this.GetLocalizedString(
+                "Settings_UpdateConfirmMessageFormat",
+                "ThreadPilot will download and verify version {0}, then ask Windows for permission to run the installer. Continue?",
+                this.availableUpdate.Version);
+            var confirmation = System.Windows.MessageBox.Show(
+                message,
+                this.GetLocalizedString("Settings_UpdateConfirmTitle", "Install ThreadPilot update"),
+                MessageBoxButton.YesNo,
+                MessageBoxImage.Information);
+
+            if (confirmation != MessageBoxResult.Yes)
             {
-                sanitized = sanitized[1..];
+                this.StatusMessage = this.GetLocalizedString("Settings_StatusUpdateCanceled", "Update canceled.");
+                return;
             }
 
-            sanitized = sanitized.Split('-', '+')[0];
+            try
+            {
+                this.IsLoading = true;
+                this.StatusMessage = this.GetLocalizedString("Settings_StatusDownloadingUpdate", "Downloading and verifying update...");
+
+                var result = await this.updateService.DownloadAndInstallAsync(this.availableUpdate);
+                if (result.Status == UpdateInstallStatus.Started)
+                {
+                    this.StatusMessage = this.GetLocalizedString("Settings_StatusUpdateInstallerStarted", "Update installer started.");
+                    await this.notificationService.ShowNotificationAsync(
+                        "Update installer started",
+                        "ThreadPilot will close while the installer runs.",
+                        NotificationType.Information);
+                }
+                else
+                {
+                    this.StatusMessage = this.GetLocalizedString("Settings_StatusUpdateInstallFailedFormat", "Update install failed: {0}", result.Message);
+                    await this.notificationService.ShowErrorNotificationAsync(
+                        "Update install failed",
+                        result.Message);
+                }
+            }
+            catch (Exception ex)
+            {
+                this.StatusMessage = this.GetLocalizedString("Settings_StatusUpdateInstallFailedFormat", "Update install failed: {0}", ex.Message);
+                this.Logger.LogError(ex, "Error downloading or installing update");
+                await this.notificationService.ShowErrorNotificationAsync(
+                    "Update install failed",
+                    "Unable to download or start the update installer",
+                    ex);
+            }
+            finally
+            {
+                this.IsLoading = false;
+            }
+        }
+
+        private void UpdateLastCheckedText()
+        {
+            var lastCheck = this.settingsService.Settings.LastUpdateCheckUtc;
+            this.LastUpdateCheckText = lastCheck.HasValue
+                ? lastCheck.Value.LocalDateTime.ToString("g", System.Globalization.CultureInfo.CurrentCulture)
+                : this.GetLocalizedString("Settings_UpdateLastCheckedNever", "Never");
+        }
+
+        private string GetLocalizedString(string key, string fallback, params object[] args)
+        {
+            var localized = this.localizationService.GetString(key);
+            var format = string.IsNullOrWhiteSpace(localized) || string.Equals(localized, key, StringComparison.Ordinal)
+                ? fallback
+                : localized;
 
-            return Version.TryParse(sanitized, out var parsed)
-                ? parsed
-                : new Version(0, 0, 0);
+            return args.Length == 0 ? format : string.Format(format, args);
         }
 
         public async Task<bool> SaveIfDirtyAsync()
@@ -765,8 +845,8 @@ private void UpdatePendingChangesState()
         {
             this.HasUnsavedChanges = !this.Settings.HasSameUserSettingsAs(this.savedSettingsSnapshot);
             this.StatusMessage = this.HasUnsavedChanges
-                ? "Settings have been modified"
-                : "Settings match the saved configuration";
+                ? this.GetLocalizedString("Settings_StatusModified", "Settings have been modified")
+                : this.GetLocalizedString("Settings_StatusMatchSaved", "Settings match the saved configuration");
         }
 
         private void SetSavedSettingsSnapshot(ApplicationSettingsModel settingsSnapshot)
diff --git a/Views/LogViewerView.xaml b/Views/LogViewerView.xaml
index e01dd43..36fa3c7 100644
--- a/Views/LogViewerView.xaml
+++ b/Views/LogViewerView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="ThreadPilot.Views.LogViewerView"
+<UserControl x:Class="ThreadPilot.Views.LogViewerView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -63,8 +63,8 @@
 
         <!-- Standardized Header -->
         <StackPanel Grid.Row="0" Margin="0,0,0,16">
-            <TextBlock Text="ThreadPilot Activity" Style="{StaticResource PageTitleTextStyle}" Margin="0,0,0,4"/>
-            <TextBlock Text="Shows actions performed by ThreadPilot, including applied rules, affinity changes, priority changes, power plan changes, settings changes, tweaks, optimizations, and safe failure messages." Style="{StaticResource PageSubtitleTextStyle}" TextWrapping="Wrap"/>
+            <TextBlock Text="{DynamicResource LogViewerView_Title}" Style="{StaticResource PageTitleTextStyle}" Margin="0,0,0,4"/>
+            <TextBlock Text="{DynamicResource LogViewerView_Subtitle}" Style="{StaticResource PageSubtitleTextStyle}" TextWrapping="Wrap"/>
         </StackPanel>
 
         <!-- Filter and Control Panel -->
@@ -92,14 +92,14 @@
                         <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
 
-                    <TextBlock Grid.Column="0" Text="Search:" VerticalAlignment="Center" Margin="0,0,8,0"/>
+                    <TextBlock Grid.Column="0" Text="{DynamicResource LogViewerView_Search}" VerticalAlignment="Center" Margin="0,0,8,0"/>
                     <TextBox Grid.Column="1" Text="{Binding SearchText, UpdateSourceTrigger=PropertyChanged}" />
 
-                    <TextBlock Grid.Column="3" Text="Category:" VerticalAlignment="Center" Margin="0,0,8,0"/>
+                    <TextBlock Grid.Column="3" Text="{DynamicResource LogViewerView_CategoryLabel}" VerticalAlignment="Center" Margin="0,0,8,0"/>
                     <ComboBox Grid.Column="4" ItemsSource="{Binding AvailableCategories}"
                               SelectedItem="{Binding SelectedCategory}" HorizontalAlignment="Stretch"/>
 
-                    <TextBlock Grid.Column="6" Text="Level:" VerticalAlignment="Center" Margin="0,0,8,0"/>
+                    <TextBlock Grid.Column="6" Text="{DynamicResource LogViewerView_LevelLabel}" VerticalAlignment="Center" Margin="0,0,8,0"/>
                     <ComboBox Grid.Column="7" ItemsSource="{Binding AvailableLogLevels}"
                               SelectedItem="{Binding SelectedLogLevel}" HorizontalAlignment="Stretch"/>
                 </Grid>
@@ -114,16 +114,16 @@
                         <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
 
-                    <TextBlock Grid.Column="0" Text="From:" VerticalAlignment="Center" Margin="0,0,8,0"/>
+                    <TextBlock Grid.Column="0" Text="{DynamicResource LogViewerView_From}" VerticalAlignment="Center" Margin="0,0,8,0"/>
                     <DatePicker Grid.Column="1" SelectedDate="{Binding FromDate}" HorizontalAlignment="Stretch"/>
 
-                    <TextBlock Grid.Column="3" Text="To:" VerticalAlignment="Center" Margin="0,0,8,0"/>
+                    <TextBlock Grid.Column="3" Text="{DynamicResource LogViewerView_To}" VerticalAlignment="Center" Margin="0,0,8,0"/>
                     <DatePicker Grid.Column="4" SelectedDate="{Binding ToDate}" HorizontalAlignment="Stretch"/>
                 </Grid>
 
                 <!-- Action Buttons -->
                 <StackPanel Grid.Row="0" Grid.RowSpan="2" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Bottom">
-                    <Button Content="Refresh" Command="{Binding RefreshLogsCommand}" Margin="5,0">
+                    <Button Content="{DynamicResource LogViewerView_Refresh}" Command="{Binding RefreshLogsCommand}" Margin="5,0">
                         <Button.IsEnabled>
                             <Binding Path="IsLoading">
                                 <Binding.Converter>
@@ -132,10 +132,10 @@
                             </Binding>
                         </Button.IsEnabled>
                     </Button>
-                    <Button Content="Clear Display" Command="{Binding ClearLogsCommand}" Margin="5,0"/>
-                    <Button Content="Export Activity" Command="{Binding ExportLogsCommand}" Margin="5,0"/>
-                    <Button Content="Cleanup Diagnostic Files" Command="{Binding CleanupOldLogsCommand}" Margin="5,0"/>
-                    <Button Content="Open Diagnostic Folder" Command="{Binding OpenLogDirectoryCommand}" Margin="5,0"/>
+                    <Button Content="{DynamicResource LogViewerView_ClearDisplay}" Command="{Binding ClearLogsCommand}" Margin="5,0"/>
+                    <Button Content="{DynamicResource LogViewerView_ExportActivity}" Command="{Binding ExportLogsCommand}" Margin="5,0"/>
+                    <Button Content="{DynamicResource LogViewerView_CleanupDiagnostics}" Command="{Binding CleanupOldLogsCommand}" Margin="5,0"/>
+                    <Button Content="{DynamicResource LogViewerView_OpenFolder}" Command="{Binding OpenLogDirectoryCommand}" Margin="5,0"/>
                 </StackPanel>
             </Grid>
         </Border>
@@ -154,7 +154,7 @@
                       ScrollViewer.CanContentScroll="True">
                 <ListView.View>
                     <GridView ColumnHeaderContainerStyle="{StaticResource LogGridViewHeaderStyle}">
-                    <GridViewColumn Header="Time" Width="150">
+                    <GridViewColumn Header="{DynamicResource LogViewerView_HeaderTime}" Width="150">
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
                                 <TextBlock Text="{Binding FormattedTimestamp}"/>
@@ -162,7 +162,7 @@
                         </GridViewColumn.CellTemplate>
                     </GridViewColumn>
 
-                    <GridViewColumn Header="Status" Width="90">
+                    <GridViewColumn Header="{DynamicResource LogViewerView_HeaderStatus}" Width="90">
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
                                 <TextBlock Text="{Binding Status}"
@@ -172,7 +172,7 @@
                         </GridViewColumn.CellTemplate>
                     </GridViewColumn>
 
-                    <GridViewColumn Header="Category" Width="120">
+                    <GridViewColumn Header="{DynamicResource LogViewerView_HeaderCategory}" Width="120">
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
                                 <TextBlock Text="{Binding Category}" FontWeight="SemiBold"/>
@@ -180,7 +180,7 @@
                         </GridViewColumn.CellTemplate>
                     </GridViewColumn>
 
-                    <GridViewColumn Header="Message" Width="500">
+                    <GridViewColumn Header="{DynamicResource LogViewerView_HeaderMessage}" Width="500">
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
                                 <TextBlock Text="{Binding ShortMessage}" TextWrapping="NoWrap"/>
@@ -188,7 +188,7 @@
                         </GridViewColumn.CellTemplate>
                     </GridViewColumn>
 
-                    <GridViewColumn Header="Details" Width="70">
+                    <GridViewColumn Header="{DynamicResource LogViewerView_HeaderDetails}" Width="70">
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
                                 <TextBlock Foreground="{DynamicResource ErrorTextBrush}" FontWeight="SemiBold">
@@ -209,7 +209,7 @@
                         </GridViewColumn.CellTemplate>
                     </GridViewColumn>
 
-                    <GridViewColumn Header="ID" Width="60">
+                    <GridViewColumn Header="{DynamicResource LogViewerView_HeaderId}" Width="60">
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
                                 <TextBlock Text="{Binding CorrelationId}" FontSize="10"/>
@@ -221,10 +221,10 @@
 
                 <ListView.ContextMenu>
                     <ContextMenu>
-                        <MenuItem Header="Copy Entry" Command="{Binding CopyLogEntryCommand}"
+                        <MenuItem Header="{DynamicResource LogViewerView_ContextMenuCopy}" Command="{Binding CopyLogEntryCommand}"
                                   CommandParameter="{Binding SelectedLogEntry}"/>
                         <Separator/>
-                        <MenuItem Header="Refresh" Command="{Binding RefreshLogsCommand}"/>
+                        <MenuItem Header="{DynamicResource LogViewerView_ContextMenuRefresh}" Command="{Binding RefreshLogsCommand}"/>
                     </ContextMenu>
                 </ListView.ContextMenu>
             </ListView>
@@ -244,11 +244,11 @@
                     </Style>
                 </Border.Style>
                 <StackPanel>
-                    <TextBlock Text="No log entries to display"
+                    <TextBlock Text="{DynamicResource LogViewerView_NoEntries}"
                                FontWeight="SemiBold"
                                HorizontalAlignment="Center"
                                Margin="0,0,0,4"/>
-                    <TextBlock Text="Adjust filters or refresh logs to load recent ThreadPilot activity."
+                    <TextBlock Text="{DynamicResource LogViewerView_NoEntriesTip}"
                                Foreground="{DynamicResource TextSecondaryBrush}"
                                TextAlignment="Center"
                                TextWrapping="Wrap"
@@ -265,7 +265,7 @@
         <Border Grid.Row="4" Background="{DynamicResource SolidBackgroundFillColorBaseBrush}" BorderBrush="{DynamicResource SurfaceStrokeColorDefaultBrush}" BorderThickness="0,1,0,0">
             <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
                 <StackPanel Margin="16" DataContext="{Binding SelectedLogEntry}">
-                    <TextBlock Text="Activity Details" FontWeight="SemiBold" FontSize="16" Margin="0,0,0,16"/>
+                    <TextBlock Text="{DynamicResource LogViewerView_DetailsTitle}" FontWeight="SemiBold" FontSize="16" Margin="0,0,0,16"/>
 
                     <Grid>
                         <Grid.Style>
@@ -290,22 +290,22 @@
                             <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
 
-                        <TextBlock Grid.Row="0" Grid.Column="0" Text="Timestamp:" FontWeight="SemiBold" Margin="0,0,10,5"/>
+                        <TextBlock Grid.Row="0" Grid.Column="0" Text="{DynamicResource LogViewerView_Timestamp}" FontWeight="SemiBold" Margin="0,0,10,5"/>
                         <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding FormattedTimestamp}" Margin="0,0,0,5"/>
 
-                        <TextBlock Grid.Row="1" Grid.Column="0" Text="Status:" FontWeight="SemiBold" Margin="0,0,10,5"/>
+                        <TextBlock Grid.Row="1" Grid.Column="0" Text="{DynamicResource LogViewerView_Status}" FontWeight="SemiBold" Margin="0,0,10,5"/>
                         <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding Status}"
                                    Foreground="{Binding LevelColor}" FontWeight="SemiBold" Margin="0,0,0,5"/>
 
-                        <TextBlock Grid.Row="2" Grid.Column="0" Text="Category:" FontWeight="SemiBold" Margin="0,0,10,5"/>
+                        <TextBlock Grid.Row="2" Grid.Column="0" Text="{DynamicResource LogViewerView_CategoryLabel}" FontWeight="SemiBold" Margin="0,0,10,5"/>
                         <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding Category}" Margin="0,0,0,5"/>
 
-                        <TextBlock Grid.Row="3" Grid.Column="0" Text="Message:" FontWeight="SemiBold" Margin="0,0,10,5" VerticalAlignment="Top"/>
+                        <TextBlock Grid.Row="3" Grid.Column="0" Text="{DynamicResource LogViewerView_Message}" FontWeight="SemiBold" Margin="0,0,10,5" VerticalAlignment="Top"/>
                         <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding Message, Mode=OneWay}"
                                  IsReadOnly="True" TextWrapping="Wrap" Background="Transparent"
                                  BorderThickness="0" Margin="0,0,0,10"/>
 
-                        <TextBlock Grid.Row="4" Grid.Column="0" Text="Details:" FontWeight="SemiBold" Margin="0,0,10,5"
+                        <TextBlock Grid.Row="4" Grid.Column="0" Text="{DynamicResource LogViewerView_Details}" FontWeight="SemiBold" Margin="0,0,10,5"
                                    VerticalAlignment="Top">
                             <TextBlock.Style>
                                 <Style TargetType="TextBlock">
@@ -331,11 +331,11 @@
                             </TextBox.Style>
                         </TextBox>
 
-                        <TextBlock Grid.Row="5" Grid.Column="0" Text="Correlation ID:" FontWeight="SemiBold" Margin="0,0,10,5"/>
+                        <TextBlock Grid.Row="5" Grid.Column="0" Text="{DynamicResource LogViewerView_CorrelationId}" FontWeight="SemiBold" Margin="0,0,10,5"/>
                         <TextBlock Grid.Row="5" Grid.Column="1" Text="{Binding CorrelationId}"/>
                     </Grid>
 
-                    <TextBlock Text="No log entry selected"
+                    <TextBlock Text="{DynamicResource LogViewerView_NoEntrySelected}"
                                HorizontalAlignment="Center" VerticalAlignment="Center"
                                Foreground="{DynamicResource TextSecondaryBrush}" FontStyle="Italic">
                         <TextBlock.Style>
@@ -365,10 +365,10 @@
                 <StackPanel Grid.Column="0" Orientation="Horizontal">
                     <TextBlock Text="{Binding StatusMessage}" VerticalAlignment="Center" Margin="0,0,20,0" Opacity="{Binding StatusOpacity}"/>
 
-                    <TextBlock Text="Files:" VerticalAlignment="Center" Margin="0,0,5,0" FontWeight="SemiBold"/>
+                    <TextBlock Text="{DynamicResource LogViewerView_Files}" VerticalAlignment="Center" Margin="0,0,5,0" FontWeight="SemiBold"/>
                     <TextBlock Text="{Binding LogStatistics.TotalLogFiles}" VerticalAlignment="Center" Margin="0,0,15,0"/>
 
-                    <TextBlock Text="Size:" VerticalAlignment="Center" Margin="0,0,5,0" FontWeight="SemiBold"/>
+                    <TextBlock Text="{DynamicResource LogViewerView_Size}" VerticalAlignment="Center" Margin="0,0,5,0" FontWeight="SemiBold"/>
                     <TextBlock VerticalAlignment="Center" Margin="0,0,15,0">
                         <TextBlock.Text>
                             <MultiBinding StringFormat="{}{0:F1} MB">
@@ -392,16 +392,16 @@
 
                 <!-- Settings Panel -->
                 <StackPanel Grid.Column="1" Orientation="Horizontal">
-                    <CheckBox Content="Debug Diagnostics" IsChecked="{Binding EnableDebugLogging}"
+                    <CheckBox Content="{DynamicResource LogViewerView_DebugDiagnostics}" IsChecked="{Binding EnableDebugLogging}"
                               VerticalAlignment="Center" Margin="0,0,15,0"/>
 
-                    <TextBlock Text="Max Size (MB):" VerticalAlignment="Center" Margin="0,0,5,0"/>
+                    <TextBlock Text="{DynamicResource LogViewerView_MaxSize}" VerticalAlignment="Center" Margin="0,0,5,0"/>
                     <TextBox Text="{Binding MaxLogFileSizeMb}" Width="50" Margin="0,0,15,0"/>
 
-                    <TextBlock Text="Retention (Days):" VerticalAlignment="Center" Margin="0,0,5,0"/>
+                    <TextBlock Text="{DynamicResource LogViewerView_Retention}" VerticalAlignment="Center" Margin="0,0,5,0"/>
                     <TextBox Text="{Binding LogRetentionDays}" Width="50" Margin="0,0,15,0"/>
 
-                    <Button Content="Save Settings" Command="{Binding SaveSettingsCommand}"
+                    <Button Content="{DynamicResource LogViewerView_SaveSettings}" Command="{Binding SaveSettingsCommand}"
                             Padding="10,5" Margin="5,0"/>
                 </StackPanel>
             </Grid>
diff --git a/Views/MasksView.xaml b/Views/MasksView.xaml
index 280e687..31c72d4 100644
--- a/Views/MasksView.xaml
+++ b/Views/MasksView.xaml
@@ -55,8 +55,8 @@
         </Grid.RowDefinitions>
 
         <StackPanel Grid.Row="0" Margin="0,0,0,16">
-            <TextBlock Text="CPU Masks" Style="{StaticResource PageTitleTextStyle}" Margin="0,0,0,4"/>
-            <TextBlock Text="Create reusable CPU affinity presets for per-process use." Style="{StaticResource PageSubtitleTextStyle}"/>
+            <TextBlock Text="{DynamicResource MasksView_Title}" Style="{StaticResource PageTitleTextStyle}" Margin="0,0,0,4"/>
+            <TextBlock Text="{DynamicResource MasksView_Subtitle}" Style="{StaticResource PageSubtitleTextStyle}"/>
             <TextBlock FontSize="11" Foreground="{DynamicResource TextFillColorSecondaryBrush}" TextWrapping="Wrap" Margin="0,6,0,0">
                 Selecting a mask here only edits the preset. It does not change CPU affinity until you apply it to a process or save it in a process rule.
             </TextBlock>
@@ -72,12 +72,12 @@
             <DockPanel Grid.Column="0">
                 <!-- Mask list actions -->
                 <StackPanel DockPanel.Dock="Top" Orientation="Horizontal" Margin="0,0,0,10">
-                    <Button Content="New" Command="{Binding CreateMaskCommand}"
+                    <Button Content="{DynamicResource MasksView_New}" Command="{Binding CreateMaskCommand}"
                             Padding="10,5" FontSize="13" Margin="0,0,5,0"
-                            ToolTip="Create a new CPU mask"/>
-                    <Button Content="Delete" Command="{Binding DeleteMaskCommand}"
+                            ToolTip="{DynamicResource MasksView_CreateNewTooltip}"/>
+                    <Button Content="{DynamicResource MasksView_Delete}" Command="{Binding DeleteMaskCommand}"
                             Padding="10,5" FontSize="13"
-                            ToolTip="Delete selected mask"/>
+                            ToolTip="{DynamicResource MasksView_DeleteTooltip}"/>
                 </StackPanel>
 
                 <Border BorderBrush="{DynamicResource BorderSubtleBrush}"
@@ -107,7 +107,7 @@
                                             <Run Text="{Binding SelectedCoreCount, Mode=OneWay}"/>
                                             <Run Text="/"/>
                                             <Run Text="{Binding BoolMask.Count, Mode=OneWay}"/>
-                                            <Run Text="CPUs"/>
+                                            <Run Text="{DynamicResource MasksView_CpusHeader}"/>
                                         </TextBlock>
                                     </StackPanel>
 
@@ -149,18 +149,18 @@
                         </Style>
                     </StackPanel.Style>
 
-                      <GroupBox Header="Mask Information" Padding="{DynamicResource CompactCardPadding}" Margin="0,0,0,10">
+                      <GroupBox Header="{DynamicResource MasksView_Info}" Padding="{DynamicResource CompactCardPadding}" Margin="0,0,0,10">
                         <StackPanel>
-                            <TextBlock Text="Mask names, descriptions, CPU selections, and options are saved automatically."
+                            <TextBlock Text="{DynamicResource MasksView_SavedAutomatically}"
                                        FontSize="11"
                                        Foreground="{DynamicResource TextFillColorSecondaryBrush}"
                                        TextWrapping="Wrap"
                                        Margin="0,0,0,10"/>
-                            <TextBlock Text="Name:" FontWeight="SemiBold" Margin="0,0,0,5"/>
+                            <TextBlock Text="{DynamicResource MasksView_Name}" FontWeight="SemiBold" Margin="0,0,0,5"/>
                             <TextBox Text="{Binding SelectedCoreMask.Name, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                      Padding="8,6" FontSize="13" Margin="0,0,0,10"/>
 
-                            <TextBlock Text="Description:" FontWeight="SemiBold" Margin="0,0,0,5"/>
+                            <TextBlock Text="{DynamicResource MasksView_Description}" FontWeight="SemiBold" Margin="0,0,0,5"/>
                             <TextBox Text="{Binding SelectedCoreMask.Description, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                      Padding="8,6" MinHeight="52" MaxHeight="90" TextWrapping="Wrap" AcceptsReturn="True"
                                      VerticalScrollBarVisibility="Auto"/>
@@ -168,9 +168,9 @@
                     </GroupBox>
 
                     <!-- CPU Selection Grid -->
-                    <GroupBox Header="Select CPUs" Padding="{DynamicResource CompactCardPadding}" Margin="0,10,0,10">
+                    <GroupBox Header="{DynamicResource MasksView_SelectCpus}" Padding="{DynamicResource CompactCardPadding}" Margin="0,10,0,10">
                         <StackPanel>
-                            <TextBlock Text="Toggle CPUs to edit this mask preset. Changes are saved automatically and do not affect running processes. All Cores is the protected default preset."
+                            <TextBlock Text="{DynamicResource MasksView_SelectCpusTip}"
                                        FontSize="11"
                                        Foreground="{DynamicResource TextFillColorSecondaryBrush}"
                                        TextWrapping="Wrap"
@@ -206,7 +206,7 @@
                                                           MinWidth="60">
                                                     <CheckBox.Content>
                                                         <TextBlock>
-                                                            <Run Text="CPU "/>
+                                                            <Run Text="{DynamicResource MasksView_Cpu}"/>
                                                             <Run Text="{Binding Index, Mode=OneWay}"/>
                                                         </TextBlock>
                                                     </CheckBox.Content>
@@ -219,20 +219,20 @@
                         </StackPanel>
                     </GroupBox>
 
-                    <GroupBox Header="Mask Options" Padding="{DynamicResource CompactCardPadding}">
+                    <GroupBox Header="{DynamicResource MasksView_Options}" Padding="{DynamicResource CompactCardPadding}">
                         <StackPanel>
-                            <Button Content="Duplicate Mask" Command="{Binding DuplicateMaskCommand}"
+                            <Button Content="{DynamicResource MasksView_Duplicate}" Command="{Binding DuplicateMaskCommand}"
                                     HorizontalAlignment="Left" Padding="10,6" Margin="0,0,0,5"/>
 
-                            <CheckBox Content="Default preset"
+                            <CheckBox Content="{DynamicResource MasksView_DefaultPreset}"
                                       IsChecked="{Binding SelectedCoreMask.IsDefault, Mode=TwoWay}"
                                       Margin="0,10,0,5"
-                                      ToolTip="Pre-selected when ThreadPilot needs a fallback mask or when creating per-process rules. It does not apply CPU affinity automatically."/>
+                                      ToolTip="{DynamicResource MasksView_DefaultPresetTip}"/>
 
-                            <CheckBox Content="Enabled"
+                            <CheckBox Content="{DynamicResource MasksView_Enabled}"
                                       IsChecked="{Binding SelectedCoreMask.IsEnabled, Mode=TwoWay}"
                                       Margin="0,5"
-                                      ToolTip="Disable to temporarily hide this mask"/>
+                                      ToolTip="{DynamicResource MasksView_DisableTip}"/>
                         </StackPanel>
                     </GroupBox>
                 </StackPanel>
diff --git a/Views/PerformanceView.xaml b/Views/PerformanceView.xaml
index 2279773..a7aa5ff 100644
--- a/Views/PerformanceView.xaml
+++ b/Views/PerformanceView.xaml
@@ -75,33 +75,33 @@
                         </Grid.ColumnDefinitions>
 
                         <StackPanel Grid.Column="0">
-                            <TextBlock Text="Optional Diagnostics" Style="{StaticResource TitleTextStyle}"/>
-                            <TextBlock Text="Diagnostics are optional and intended for troubleshooting." Style="{StaticResource LabelTextStyle}" Margin="0,4,0,0"/>
-                            <TextBlock Text="For in-game overlays and detailed performance graphs, use dedicated tools." Style="{StaticResource LabelTextStyle}" Margin="0,2,0,0"/>
+                            <TextBlock Text="{DynamicResource PerformanceView_OptionalDiagnostics}" Style="{StaticResource TitleTextStyle}"/>
+                            <TextBlock Text="{DynamicResource PerformanceView_DiagnosticsDesc1}" Style="{StaticResource LabelTextStyle}" Margin="0,4,0,0"/>
+                            <TextBlock Text="{DynamicResource PerformanceView_DiagnosticsDesc2}" Style="{StaticResource LabelTextStyle}" Margin="0,2,0,0"/>
                         </StackPanel>
 
                         <WrapPanel Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center" ItemHeight="32">
-                            <Button Content="Start Live Metrics"
+                            <Button Content="{DynamicResource PerformanceView_StartLive}"
                                     Command="{Binding StartMonitoringCommand}"
                                     IsEnabled="{Binding IsMonitoring, Converter={StaticResource InverseBooleanConverter}}"
                                     MinWidth="128"
                                     Margin="0,0,8,0"
-                                    ToolTip="Start live metrics collection for this dashboard"/>
-                            <Button Content="Stop Live Metrics"
+                                    ToolTip="{DynamicResource PerformanceView_StartLiveTooltip}"/>
+                            <Button Content="{DynamicResource PerformanceView_StopLive}"
                                     Command="{Binding StopMonitoringCommand}"
                                     IsEnabled="{Binding IsMonitoring}"
                                     MinWidth="120"
                                     Margin="0,0,8,0"
-                                    ToolTip="Pause live metrics collection; background automation is separate"/>
-                            <Button Content="Refresh"
+                                    ToolTip="{DynamicResource PerformanceView_StopLiveTooltip}"/>
+                            <Button Content="{DynamicResource PerformanceView_Refresh}"
                                     Command="{Binding RefreshMetricsCommand}"
                                     MinWidth="84"
                                     Margin="0,0,8,0"
-                                    ToolTip="Refresh the current dashboard snapshot"/>
-                            <Button Content="Clear History"
+                                    ToolTip="{DynamicResource PerformanceView_RefreshTooltip}"/>
+                            <Button Content="{DynamicResource PerformanceView_ClearHistory}"
                                     MinWidth="104"
                                     Command="{Binding ClearHistoricalDataCommand}"
-                                    ToolTip="Clear the displayed metrics and timeline history"/>
+                                    ToolTip="{DynamicResource PerformanceView_ClearHistoryTooltip}"/>
                         </WrapPanel>
                     </Grid>
                 </Border>
@@ -124,7 +124,7 @@
 
                     <Border Grid.Column="1" Style="{StaticResource CardStyle}" Margin="0,0,10,0">
                         <StackPanel>
-                            <TextBlock Text="Memory" Style="{StaticResource LabelTextStyle}"/>
+                            <TextBlock Text="{DynamicResource PerformanceView_Memory}" Style="{StaticResource LabelTextStyle}"/>
                             <TextBlock Text="{Binding MemoryUsageText}" Style="{StaticResource MetricValueTextStyle}" FontSize="18"/>
                             <TextBlock Text="{Binding MemoryUsagePercentage, StringFormat={}{0:F1}% utilized}" Style="{StaticResource LabelTextStyle}"/>
                         </StackPanel>
@@ -132,7 +132,7 @@
 
                     <Border Grid.Column="2" Style="{StaticResource CardStyle}" Margin="0,0,10,0">
                         <StackPanel>
-                            <TextBlock Text="Active Processes" Style="{StaticResource LabelTextStyle}"/>
+                            <TextBlock Text="{DynamicResource PerformanceView_ActiveProcesses}" Style="{StaticResource LabelTextStyle}"/>
                             <TextBlock Text="{Binding ProcessCountText}" Style="{StaticResource MetricValueTextStyle}"/>
                             <TextBlock Text="{Binding MonitoringStateText, StringFormat=Live metrics: {0}}" Style="{StaticResource LabelTextStyle}"/>
                         </StackPanel>
@@ -140,7 +140,7 @@
 
                     <Border Grid.Column="3" Style="{StaticResource CardStyle}" Margin="0">
                         <StackPanel>
-                            <TextBlock Text="Global Power Plan" Style="{StaticResource LabelTextStyle}"/>
+                            <TextBlock Text="{DynamicResource PerformanceView_GlobalPowerPlan}" Style="{StaticResource LabelTextStyle}"/>
                             <TextBlock Text="{Binding CurrentGlobalPowerPlanText}" Style="{StaticResource MetricValueTextStyle}" FontSize="16"/>
                             <TextBlock Text="{Binding LastUpdateTime, StringFormat=Last metric update: {0:HH:mm:ss}}" Style="{StaticResource LabelTextStyle}"/>
                         </StackPanel>
@@ -169,20 +169,20 @@
                                 </Grid.ColumnDefinitions>
 
                                 <StackPanel Grid.Column="0">
-                                    <TextBlock Text="Process Hotspots" Style="{StaticResource TitleTextStyle}"/>
-                                    <TextBlock Text="Top CPU and memory consumers with one-click rule creation." Style="{StaticResource LabelTextStyle}" Margin="0,2,0,0"/>
+                                    <TextBlock Text="{DynamicResource PerformanceView_ProcessHotspots}" Style="{StaticResource TitleTextStyle}"/>
+                                    <TextBlock Text="{DynamicResource PerformanceView_TopConsumersDesc}" Style="{StaticResource LabelTextStyle}" Margin="0,2,0,0"/>
                                 </StackPanel>
 
                                 <StackPanel Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center">
-                                    <Button Content="Create/Update Rule from Selection"
+                                    <Button Content="{DynamicResource PerformanceView_CreateRuleButton}"
                                             Command="{Binding CreateRuleFromSelectedProcessCommand}"
                                             IsEnabled="{Binding CanCreateRuleFromSelectedProcess}"
                                             Margin="0,0,8,0"
-                                            ToolTip="Create or update an automation rule from the selected hotspot process"/>
-                                    <Button Content="Toggle Core Panel"
+                                            ToolTip="{DynamicResource PerformanceView_CreateRuleTooltip}"/>
+                                    <Button Content="{DynamicResource PerformanceView_ToggleCore}"
                                             Command="{Binding ToggleCoreDetailsCommand}"
                                             Margin="0,0,8,0"/>
-                                    <Button Content="Toggle Process Panel"
+                                    <Button Content="{DynamicResource PerformanceView_ToggleProcess}"
                                             Command="{Binding ToggleProcessDetailsCommand}"/>
                                 </StackPanel>
                             </Grid>
@@ -198,7 +198,7 @@
                                 </Grid.ColumnDefinitions>
 
                                 <TextBlock Grid.Column="0"
-                                           Text="Filter"
+                                           Text="{DynamicResource PerformanceView_Filter}"
                                            Style="{StaticResource LabelTextStyle}"
                                            Margin="0,0,8,0"
                                            VerticalAlignment="Center"/>
@@ -215,18 +215,18 @@
                                           Width="110"
                                           Margin="0,0,8,0">
                                     <ComboBoxItem Content="CPU" Tag="Cpu"/>
-                                    <ComboBoxItem Content="Memory" Tag="Memory"/>
-                                    <ComboBoxItem Content="Name" Tag="Name"/>
+                                    <ComboBoxItem Content="{DynamicResource PerformanceView_Memory}" Tag="Memory"/>
+                                    <ComboBoxItem Content="{DynamicResource PerformanceView_Name}" Tag="Name"/>
                                 </ComboBox>
 
                                 <CheckBox Grid.Column="3"
-                                          Content="Actionable only"
+                                          Content="{DynamicResource PerformanceView_ActionableOnly}"
                                           IsChecked="{Binding ShowOnlyActionableHotspots}"
                                           Margin="0,0,8,0"
                                           VerticalAlignment="Center"/>
 
                                 <CheckBox Grid.Column="4"
-                                          Content="Rule-backed only"
+                                          Content="{DynamicResource PerformanceView_RuleBackedOnly}"
                                           IsChecked="{Binding ShowOnlyRuleBackedHotspots}"
                                           Margin="0,0,8,0"
                                           VerticalAlignment="Center"/>
@@ -250,12 +250,12 @@
                                        MinHeight="220"
                                        MaxHeight="380">
                                 <DataGrid.Columns>
-                                    <DataGridTextColumn Header="Process" Binding="{Binding ProcessName}" Width="2*"/>
-                                    <DataGridTextColumn Header="CPU %" Binding="{Binding CpuUsage, StringFormat={}{0:F1}}" Width="90"/>
-                                    <DataGridTextColumn Header="Memory" Binding="{Binding MemoryUsage, Converter={StaticResource BytesToStringConverter}}" Width="110"/>
-                                    <DataGridTextColumn Header="Threads" Binding="{Binding ThreadCount}" Width="80"/>
-                                    <DataGridTextColumn Header="Priority" Binding="{Binding Priority}" Width="110"/>
-                                    <DataGridTextColumn Header="Window" Binding="{Binding WindowTitle}" Width="3*"/>
+                                    <DataGridTextColumn Header="{DynamicResource PerformanceView_Process}" Binding="{Binding ProcessName}" Width="2*"/>
+                                    <DataGridTextColumn Header="{DynamicResource PerformanceView_CpuPercent}" Binding="{Binding CpuUsage, StringFormat={}{0:F1}}" Width="90"/>
+                                    <DataGridTextColumn Header="{DynamicResource PerformanceView_Memory}" Binding="{Binding MemoryUsage, Converter={StaticResource BytesToStringConverter}}" Width="110"/>
+                                    <DataGridTextColumn Header="{DynamicResource PerformanceView_Threads}" Binding="{Binding ThreadCount}" Width="80"/>
+                                    <DataGridTextColumn Header="{DynamicResource PerformanceView_Priority}" Binding="{Binding Priority}" Width="110"/>
+                                    <DataGridTextColumn Header="{DynamicResource PerformanceView_Window}" Binding="{Binding WindowTitle}" Width="3*"/>
                                 </DataGrid.Columns>
                             </DataGrid>
 
@@ -303,8 +303,8 @@
 
                         <Border Grid.Row="0" Style="{StaticResource CardStyle}">
                             <StackPanel>
-                                <TextBlock Text="Rule Impact" Style="{StaticResource TitleTextStyle}"/>
-                                <TextBlock Text="Selected hotspot process" Style="{StaticResource LabelTextStyle}" Margin="0,4,0,8"/>
+                                <TextBlock Text="{DynamicResource PerformanceView_RuleImpact}" Style="{StaticResource TitleTextStyle}"/>
+                                <TextBlock Text="{DynamicResource PerformanceView_SelectedHotspot}" Style="{StaticResource LabelTextStyle}" Margin="0,4,0,8"/>
 
                                 <TextBlock Text="{Binding SelectedProcessName}" FontWeight="SemiBold" FontSize="14"/>
                                 <TextBlock Text="{Binding SelectedProcessExecutable}" Style="{StaticResource LabelTextStyle}" TextWrapping="Wrap" TextTrimming="CharacterEllipsis" Margin="0,2,0,8"/>
@@ -320,8 +320,8 @@
 
                         <Border Grid.Row="1" Style="{StaticResource CardStyle}">
                             <StackPanel>
-                                <TextBlock Text="Core Snapshot" Style="{StaticResource TitleTextStyle}"/>
-                                <TextBlock Text="Per-core utilization for quick imbalance checks." Style="{StaticResource LabelTextStyle}" Margin="0,4,0,8"/>
+                                <TextBlock Text="{DynamicResource PerformanceView_CoreSnapshot}" Style="{StaticResource TitleTextStyle}"/>
+                                <TextBlock Text="{DynamicResource PerformanceView_CoreSnapshotDesc}" Style="{StaticResource LabelTextStyle}" Margin="0,4,0,8"/>
 
                                 <ScrollViewer VerticalScrollBarVisibility="Auto"
                                               HorizontalScrollBarVisibility="Disabled"
@@ -358,14 +358,14 @@
                                     <RowDefinition Height="Auto"/>
                                 </Grid.RowDefinitions>
 
-                                <TextBlock Grid.Row="0" Text="Stability Timeline" Style="{StaticResource TitleTextStyle}"/>
+                                <TextBlock Grid.Row="0" Text="{DynamicResource PerformanceView_Timeline}" Style="{StaticResource TitleTextStyle}"/>
                                 <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="0,6,0,8">
                                     <TextBlock Text="{Binding TimelineSampleCountText}" Style="{StaticResource LabelTextStyle}" Margin="0,0,14,0"/>
                                     <TextBlock Text="{Binding LastTimelineEventText}" Style="{StaticResource LabelTextStyle}"/>
                                 </StackPanel>
 
                                 <TabControl Grid.Row="2" MinHeight="260">
-                                    <TabItem Header="Events">
+                                    <TabItem Header="{DynamicResource PerformanceView_Events}">
                                         <DataGrid ItemsSource="{Binding TimelineEvents}"
                                                   AutoGenerateColumns="False"
                                                   IsReadOnly="True"
@@ -376,14 +376,14 @@
                                                   MaxHeight="280"
                                                   MinHeight="220">
                                             <DataGrid.Columns>
-                                                <DataGridTextColumn Header="Time" Binding="{Binding Timestamp, StringFormat={}{0:HH:mm:ss}}" Width="80"/>
-                                                <DataGridTextColumn Header="Category" Binding="{Binding Category}" Width="110"/>
-                                                <DataGridTextColumn Header="Severity" Binding="{Binding Severity}" Width="90"/>
-                                                <DataGridTextColumn Header="Detail" Binding="{Binding Detail}" Width="*"/>
+                                                <DataGridTextColumn Header="{DynamicResource PerformanceView_Time}" Binding="{Binding Timestamp, StringFormat={}{0:HH:mm:ss}}" Width="80"/>
+                                                <DataGridTextColumn Header="{DynamicResource PerformanceView_Category}" Binding="{Binding Category}" Width="110"/>
+                                                <DataGridTextColumn Header="{DynamicResource PerformanceView_Severity}" Binding="{Binding Severity}" Width="90"/>
+                                                <DataGridTextColumn Header="{DynamicResource PerformanceView_Detail}" Binding="{Binding Detail}" Width="*"/>
                                             </DataGrid.Columns>
                                         </DataGrid>
                                     </TabItem>
-                                    <TabItem Header="Metrics">
+                                    <TabItem Header="{DynamicResource PerformanceView_Metrics}">
                                         <DataGrid ItemsSource="{Binding HistoricalData}"
                                                   AutoGenerateColumns="False"
                                                   IsReadOnly="True"
@@ -394,11 +394,11 @@
                                                   MaxHeight="280"
                                                   MinHeight="220">
                                             <DataGrid.Columns>
-                                                <DataGridTextColumn Header="Time" Binding="{Binding Timestamp, StringFormat={}{0:HH:mm:ss}}" Width="80"/>
-                                                <DataGridTextColumn Header="CPU %" Binding="{Binding TotalCpuUsage, StringFormat={}{0:F1}}" Width="70"/>
-                                                <DataGridTextColumn Header="Mem %" Binding="{Binding MemoryUsagePercentage, StringFormat={}{0:F1}}" Width="70"/>
-                                                <DataGridTextColumn Header="Processes" Binding="{Binding ActiveProcessCount}" Width="90"/>
-                                                <DataGridTextColumn Header="Memory Used" Binding="{Binding TotalMemoryUsage, Converter={StaticResource BytesToStringConverter}}" Width="110"/>
+                                                <DataGridTextColumn Header="{DynamicResource PerformanceView_Time}" Binding="{Binding Timestamp, StringFormat={}{0:HH:mm:ss}}" Width="80"/>
+                                                <DataGridTextColumn Header="{DynamicResource PerformanceView_CpuPercent}" Binding="{Binding TotalCpuUsage, StringFormat={}{0:F1}}" Width="70"/>
+                                                <DataGridTextColumn Header="{DynamicResource PerformanceView_MemPercent}" Binding="{Binding MemoryUsagePercentage, StringFormat={}{0:F1}}" Width="70"/>
+                                                <DataGridTextColumn Header="{DynamicResource PerformanceView_Processes}" Binding="{Binding ActiveProcessCount}" Width="90"/>
+                                                <DataGridTextColumn Header="{DynamicResource PerformanceView_MemoryUsed}" Binding="{Binding TotalMemoryUsage, Converter={StaticResource BytesToStringConverter}}" Width="110"/>
                                             </DataGrid.Columns>
                                         </DataGrid>
                                     </TabItem>
diff --git a/Views/PowerPlanView.xaml b/Views/PowerPlanView.xaml
index d095797..c8d4bfd 100644
--- a/Views/PowerPlanView.xaml
+++ b/Views/PowerPlanView.xaml
@@ -16,8 +16,8 @@
         </Grid.RowDefinitions>
 
         <StackPanel Grid.Row="0" Margin="0,0,0,16">
-            <TextBlock Text="Power Plans" Style="{StaticResource PageTitleTextStyle}" Margin="0,0,0,4"/>
-            <TextBlock Text="Manage the active Windows power plan and import custom .pow profiles" Style="{StaticResource PageSubtitleTextStyle}"/>
+            <TextBlock Text="{DynamicResource PowerPlanView_Title}" Style="{StaticResource PageTitleTextStyle}" Margin="0,0,0,4"/>
+            <TextBlock Text="{DynamicResource PowerPlanView_Subtitle}" Style="{StaticResource PageSubtitleTextStyle}"/>
         </StackPanel>
 
         <Grid Grid.Row="1">
@@ -29,7 +29,7 @@
 
             <!-- System Power Plans -->
             <GroupBox Grid.Column="0"
-                    Header="Windows Power Plans"
+                    Header="{DynamicResource PowerPlanView_WindowsPowerPlans}"
                     Margin="0">
                 <Grid Margin="8">
                     <Grid.RowDefinitions>
@@ -43,21 +43,21 @@
                             <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
                         <TextBlock Grid.Row="0"
-                                   Text="Select the Windows plan to make active."
+                                   Text="{DynamicResource PowerPlanView_SelectActiveTip}"
                                    Foreground="{DynamicResource TextFillColorSecondaryBrush}"
                                    TextWrapping="Wrap"
                                    TextTrimming="CharacterEllipsis"
-                                   ToolTip="Select the Windows plan to make active."/>
+                                   ToolTip="{DynamicResource PowerPlanView_SelectActiveTip}"/>
                         <WrapPanel Grid.Row="1" Margin="0,8,0,0">
                             <Button Command="{Binding SetActivePlanCommand}"
-                                    Content="Set as Active Windows Plan"
+                                    Content="{DynamicResource PowerPlanView_SetActive}"
                                     Padding="10,5"
                                     Margin="0,0,8,0"
-                                    ToolTip="Change the active Windows power plan to the selected plan"/>
+                                    ToolTip="{DynamicResource PowerPlanView_SetActiveTooltip}"/>
                             <Button Command="{Binding LoadPowerPlansCommand}"
-                                    Content="Refresh Plans"
+                                    Content="{DynamicResource PowerPlanView_Refresh}"
                                     Padding="10,5"
-                                    ToolTip="Refresh the list of available power plans"/>
+                                    ToolTip="{DynamicResource PowerPlanView_RefreshTooltip}"/>
                         </WrapPanel>
                     </Grid>
 
@@ -73,7 +73,7 @@
                                 <Setter Property="ContextMenu">
                                     <Setter.Value>
                                         <ContextMenu DataContext="{Binding PlacementTarget.Tag, RelativeSource={RelativeSource Self}}">
-                                            <MenuItem Header="Delete"
+                                            <MenuItem Header="{DynamicResource PowerPlanView_Delete}"
                                                       Command="{Binding DeletePowerPlanCommand}"
                                                       CommandParameter="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource AncestorType=ContextMenu}}"/>
                                         </ContextMenu>
@@ -120,7 +120,7 @@
                                                 Padding="8,2"
                                                 VerticalAlignment="Top"
                                                 Visibility="{Binding IsActive, Converter={StaticResource BoolToVisibilityConverter}}">
-                                            <TextBlock Text="Active"
+                                            <TextBlock Text="{DynamicResource PowerPlanView_Active}"
                                                        FontSize="11"
                                                        FontWeight="SemiBold"
                                                        Foreground="{DynamicResource TextOnAccentFillColorPrimaryBrush}"/>
@@ -135,7 +135,7 @@
 
             <!-- Custom Power Plans -->
             <GroupBox Grid.Column="2"
-                    Header="Custom Power Plans"
+                    Header="{DynamicResource PowerPlanView_CustomPowerPlans}"
                     Margin="0">
                 <Grid Margin="8">
                     <Grid.RowDefinitions>
@@ -149,21 +149,21 @@
                             <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
                         <TextBlock Grid.Row="0"
-                                   Text="Local .pow files ready to import into Windows."
+                                   Text="{DynamicResource PowerPlanView_LocalPlansTip}"
                                    Foreground="{DynamicResource TextFillColorSecondaryBrush}"
                                    TextWrapping="Wrap"
                                    TextTrimming="CharacterEllipsis"
-                                   ToolTip="Local .pow files ready to import into Windows."/>
+                                   ToolTip="{DynamicResource PowerPlanView_LocalPlansTip}"/>
                         <WrapPanel Grid.Row="1" Margin="0,8,0,0">
                             <Button Command="{Binding ImportCustomPlanCommand}"
-                                    Content="Import Selected .pow"
+                                    Content="{DynamicResource PowerPlanView_ImportSelected}"
                                     Padding="10,5"
                                     Margin="0,0,8,0"
-                                    ToolTip="Import the selected custom .pow file into Windows"/>
+                                    ToolTip="{DynamicResource PowerPlanView_ImportSelectedTooltip}"/>
                             <Button Command="{Binding AddCustomPlanFileCommand}"
-                                    Content="Add .pow File"
+                                    Content="{DynamicResource PowerPlanView_AddFile}"
                                     Padding="10,5"
-                                    ToolTip="Add a new custom power plan file to the custom library"/>
+                                    ToolTip="{DynamicResource PowerPlanView_AddFileTooltip}"/>
                         </WrapPanel>
                     </Grid>
 
diff --git a/Views/ProcessPowerPlanAssociationView.xaml b/Views/ProcessPowerPlanAssociationView.xaml
index 7f05b0a..47de0e7 100644
--- a/Views/ProcessPowerPlanAssociationView.xaml
+++ b/Views/ProcessPowerPlanAssociationView.xaml
@@ -21,8 +21,8 @@
 
         <!-- Standardized Header -->
         <StackPanel Grid.Row="0" Margin="0,0,0,16">
-            <TextBlock Text="Rules &amp; Automation" Style="{StaticResource PageTitleTextStyle}" Margin="0,0,0,4"/>
-            <TextBlock Text="Define per-process rules. Power plans are global; masks and priorities apply to matching processes."
+            <TextBlock Text="{DynamicResource ProcessPowerPlanAssociationView_Title}" Style="{StaticResource PageTitleTextStyle}" Margin="0,0,0,4"/>
+            <TextBlock Text="{DynamicResource ProcessPowerPlanAssociationView_RulesDescription}"
                        Style="{StaticResource PageSubtitleTextStyle}"/>
         </StackPanel>
 
@@ -62,7 +62,7 @@
             </TabControl.Resources>
 
             <!-- Rules Tab -->
-            <TabItem Header="Rules">
+            <TabItem Header="{DynamicResource ProcessPowerPlanAssociationView_RulesHeader}">
                 <Grid Margin="10">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="2*"/>
@@ -71,7 +71,7 @@
                     </Grid.ColumnDefinitions>
 
                     <!-- Rules List -->
-                    <GroupBox Grid.Column="0" Header="Current Rules">
+                    <GroupBox Grid.Column="0" Header="{DynamicResource ProcessPowerPlanAssociationView_CurrentRules}">
                         <Grid>
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="*"/>
@@ -87,28 +87,28 @@
                                      HeadersVisibility="Column"
                                      BorderThickness="1">
                                 <DataGrid.Columns>
-                                    <DataGridCheckBoxColumn Header="Enabled" 
+                                    <DataGridCheckBoxColumn Header="{DynamicResource MasksView_Enabled}" 
                                                            Binding="{Binding IsEnabled}" 
                                                            Width="60"/>
-                                    <DataGridTextColumn Header="Executable"
+                                    <DataGridTextColumn Header="{DynamicResource ProcessPowerPlanAssociationView_Executable}"
                                                        Binding="{Binding ExecutableName}"
                                                        Width="150"/>
-                                    <DataGridTextColumn Header="Power Plan"
+                                    <DataGridTextColumn Header="{DynamicResource ProcessPowerPlanAssociationView_PowerPlan}"
                                                        Binding="{Binding PowerPlanName}"
                                                        Width="120"/>
-                                    <DataGridTextColumn Header="CPU Mask"
+                                    <DataGridTextColumn Header="{DynamicResource ProcessPowerPlanAssociationView_CpuMask}"
                                                        Binding="{Binding CoreMaskName}"
                                                        Width="100"/>
-                                    <DataGridTextColumn Header="Priority"
+                                    <DataGridTextColumn Header="{DynamicResource ProcessPowerPlanAssociationView_Priority}"
                                                        Binding="{Binding ProcessPriority}"
                                                        Width="80"/>
-                                     <DataGridTextColumn Header="Rule Priority"
+                                     <DataGridTextColumn Header="{DynamicResource ProcessPowerPlanAssociationView_RulePriority}"
                                                         Binding="{Binding Priority}"
                                                         Width="60"/>
-                                    <DataGridCheckBoxColumn Header="Match by Path"
+                                    <DataGridCheckBoxColumn Header="{DynamicResource ProcessPowerPlanAssociationView_MatchByPath}"
                                                            Binding="{Binding MatchByPath}"
                                                            Width="100"/>
-                                    <DataGridTextColumn Header="Description"
+                                    <DataGridTextColumn Header="{DynamicResource ProcessPowerPlanAssociationView_Description}"
                                                        Binding="{Binding Description}"
                                                        Width="*"/>
                                 </DataGrid.Columns>
@@ -130,11 +130,11 @@
                                     </Style>
                                 </Border.Style>
                                 <StackPanel>
-                                    <TextBlock Text="No automation rules yet"
+                                    <TextBlock Text="{DynamicResource ProcessPowerPlanAssociationView_NoRules}"
                                                FontWeight="SemiBold"
                                                HorizontalAlignment="Center"
                                                Margin="0,0,0,4"/>
-                                    <TextBlock Text="Create a rule from an executable or running process to automate power plan, CPU mask, and priority behavior."
+                                    <TextBlock Text="{DynamicResource ProcessPowerPlanAssociationView_EditorSubtitle}"
                                                Foreground="{DynamicResource TextSecondaryBrush}"
                                                TextWrapping="Wrap"
                                                TextAlignment="Center"
@@ -144,43 +144,43 @@
 
                             <StackPanel Grid.Row="1" Orientation="Horizontal" 
                                        HorizontalAlignment="Right" Margin="0,10,0,0">
-                                <Button Content="Update"
+                                <Button Content="{DynamicResource ProcessPowerPlanAssociationView_Update}"
                                        Command="{Binding UpdateAssociationCommand}"
                                        Margin="0,0,5,0" Padding="10,5"
-                                       ToolTip="Update the selected association"/>
-                                <Button Content="Remove"
+                                       ToolTip="{DynamicResource ProcessPowerPlanAssociationView_UpdateRuleTooltip}"/>
+                                <Button Content="{DynamicResource ProcessPowerPlanAssociationView_Remove}"
                                        Command="{Binding RemoveAssociationCommand}"
                                        Padding="10,5"
-                                       ToolTip="Remove the selected association"/>
+                                       ToolTip="{DynamicResource ProcessPowerPlanAssociationView_RemoveTooltip}"/>
                             </StackPanel>
                         </Grid>
                     </GroupBox>
 
                     <!-- Rule Editor -->
-                    <GroupBox Grid.Column="2" Header="Rule Editor">
+                    <GroupBox Grid.Column="2" Header="{DynamicResource ProcessPowerPlanAssociationView_RuleEditor}">
                         <ScrollViewer VerticalScrollBarVisibility="Auto">
                             <StackPanel>
                             <!-- Executable Selection Section -->
-                            <TextBlock Text="Executable Match:" FontWeight="SemiBold" Margin="0,0,0,5"/>
-                            <TextBlock Text="Choose an executable. Match by path is more precise; matching by name applies to any process with that executable name."
+                            <TextBlock Text="{DynamicResource ProcessPowerPlanAssociationView_ExecutableMatch}" FontWeight="SemiBold" Margin="0,0,0,5"/>
+                            <TextBlock Text="{DynamicResource ProcessPowerPlanAssociationView_ExecutableHelp}"
                                        Foreground="{DynamicResource TextSecondaryBrush}"
                                        FontSize="10"
                                        TextWrapping="Wrap"
                                        Margin="0,0,0,8"/>
 
                             <!-- Browse Button -->
-                            <Button Content="Browse for Executable"
+                            <Button Content="{DynamicResource ProcessPowerPlanAssociationView_Browse}"
                                    Command="{Binding BrowseExecutableCommand}"
                                    Padding="10,8" Margin="0,0,0,10"
                                    HorizontalAlignment="Left"
-                                   ToolTip="Click to select an executable file (.exe) from your computer"/>
+                                   ToolTip="{DynamicResource ProcessPowerPlanAssociationView_BrowseTooltip}"/>
 
                             <!-- Selected Executable Display -->
                              <Border BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
                                     Background="{DynamicResource SurfaceAltBrush}" Padding="8" Margin="0,0,0,10"
                                     Visibility="{Binding HasSelectedExecutable, Converter={StaticResource BoolToVisibilityConverter}}">
                                  <StackPanel>
-                                     <TextBlock Text="Selected Executable:" FontSize="10" Foreground="{DynamicResource TextSecondaryBrush}" Margin="0,0,0,2"/>
+                                     <TextBlock Text="{DynamicResource ProcessPowerPlanAssociationView_SelectedExecutable}" FontSize="10" Foreground="{DynamicResource TextSecondaryBrush}" Margin="0,0,0,2"/>
                                      <TextBlock Text="{Binding SelectedExecutableDisplayName}"
                                                FontWeight="SemiBold" Margin="0,0,0,2"/>
                                      <TextBlock Text="{Binding SelectedExecutableFullPath}"
@@ -189,20 +189,20 @@
                              </Border>
 
                             <!-- Clear Selection Button -->
-                            <Button Content="Clear Selection"
+                            <Button Content="{DynamicResource ProcessPowerPlanAssociationView_ClearSelection}"
                                    Command="{Binding ClearSelectedExecutableCommand}"
                                    Padding="5,3" Margin="0,0,0,15"
                                    HorizontalAlignment="Left" FontSize="10"
                                    Visibility="{Binding HasSelectedExecutable, Converter={StaticResource BoolToVisibilityConverter}}"
-                                   ToolTip="Clear the selected executable"/>
+                                   ToolTip="{DynamicResource ProcessPowerPlanAssociationView_ClearSelectionTooltip}"/>
 
-                            <CheckBox Content="Match by Path"
+                            <CheckBox Content="{DynamicResource ProcessPowerPlanAssociationView_MatchByPath}"
                                      IsChecked="{Binding MatchByPath}"
                                      Margin="0,0,0,10"
-                                     ToolTip="Match processes by full path instead of just executable name"/>
+                                     ToolTip="{DynamicResource ProcessPowerPlanAssociationView_MatchByPathTooltip}"/>
 
-                             <TextBlock Text="Rule Power Plan (global switch):" Margin="0,0,0,5" FontWeight="SemiBold"/>
-                             <TextBlock Text="When this rule matches, Windows switches the global active power plan."
+                             <TextBlock Text="{DynamicResource ProcessPowerPlanAssociationView_RulePowerPlan}" Margin="0,0,0,5" FontWeight="SemiBold"/>
+                             <TextBlock Text="{DynamicResource ProcessPowerPlanAssociationView_RulePowerPlanHelp}"
                                         Foreground="{DynamicResource TextSecondaryBrush}"
                                         FontSize="10"
                                         TextWrapping="Wrap"
@@ -212,8 +212,8 @@
                                      DisplayMemberPath="Name"
                                      Padding="5" Margin="0,0,0,10"/>
 
-                            <TextBlock Text="Rule CPU Mask:" Margin="0,0,0,5"/>
-                            <TextBlock Text="Applied only to matching processes; it does not change the global Windows power plan."
+                            <TextBlock Text="{DynamicResource ProcessPowerPlanAssociationView_RuleCpuMask}" Margin="0,0,0,5"/>
+                            <TextBlock Text="{DynamicResource ProcessPowerPlanAssociationView_AppliedOnlyToMatching}"
                                        Foreground="{DynamicResource TextSecondaryBrush}"
                                        FontSize="10"
                                        TextWrapping="Wrap"
@@ -222,10 +222,10 @@
                                      SelectedItem="{Binding SelectedCoreMask}"
                                      DisplayMemberPath="Name"
                                      Padding="5" Margin="0,0,0,10"
-                                     ToolTip="Optional: Select a CPU mask to apply when this process starts"/>
+                                     ToolTip="{DynamicResource ProcessPowerPlanAssociationView_RuleCpuMaskHelp}"/>
 
-                            <TextBlock Text="Process Priority:" Margin="0,0,0,5"/>
-                            <TextBlock Text="Applied to each matching process when the automation rule runs."
+                            <TextBlock Text="{DynamicResource ProcessPowerPlanAssociationView_ProcessPriority}" Margin="0,0,0,5"/>
+                            <TextBlock Text="{DynamicResource ProcessPowerPlanAssociationView_AppliedToMatching}"
                                        Foreground="{DynamicResource TextSecondaryBrush}"
                                        FontSize="10"
                                        TextWrapping="Wrap"
@@ -233,41 +233,41 @@
                             <ComboBox ItemsSource="{Binding AvailablePriorities}"
                                      SelectedItem="{Binding SelectedProcessPriority}"
                                      Padding="5" Margin="0,0,0,10"
-                                     ToolTip="Optional: Select the process priority to apply when this process starts"/>
+                                     ToolTip="{DynamicResource ProcessPowerPlanAssociationView_RulePriorityHelp}"/>
 
-                            <TextBlock Text="Association Priority:" Margin="0,0,0,5"/>
+                            <TextBlock Text="{DynamicResource ProcessPowerPlanAssociationView_AssociationPriority}" Margin="0,0,0,5"/>
                             <TextBox Text="{Binding Priority}"
                                     Padding="5" Margin="0,0,0,10"
-                                    ToolTip="Higher priority associations take precedence when multiple match"/>
+                                    ToolTip="{DynamicResource ProcessPowerPlanAssociationView_AssociationPriorityHelp}"/>
 
-                            <TextBlock Text="Description:" Margin="0,0,0,5"/>
+                            <TextBlock Text="{DynamicResource ProcessPowerPlanAssociationView_DescriptionLabel}" Margin="0,0,0,5"/>
                             <TextBox Text="{Binding Description}"
                                     Padding="5" Margin="0,0,0,15"/>
 
-                            <Button Content="Add Rule"
+                            <Button Content="{DynamicResource ProcessPowerPlanAssociationView_AddRule}"
                                     Command="{Binding AddAssociationCommand}"
                                     Padding="10,8"/>
 
-                            <Button Content="Update Selected Rule"
+                            <Button Content="{DynamicResource ProcessPowerPlanAssociationView_UpdateRule}"
                                     Command="{Binding UpdateAssociationCommand}"
                                     Padding="10,8"
                                     Margin="0,8,0,0"/>
 
                             <Separator Margin="0,15,0,15"/>
 
-                            <TextBlock Text="Use Running Process:"
+                            <TextBlock Text="{DynamicResource ProcessPowerPlanAssociationView_UseRunningProcess}"
                                        FontWeight="SemiBold" Margin="0,0,0,10"/>
 
                             <ComboBox ItemsSource="{Binding RunningProcesses}"
                                      SelectedItem="{Binding SelectedProcess}"
                                      DisplayMemberPath="Name"
                                      Padding="5" Margin="0,0,0,10"
-                                     ToolTip="Select a currently running process to use its executable"/>
+                                     ToolTip="{DynamicResource ProcessPowerPlanAssociationView_UseRunningProcessTooltip}"/>
 
-                            <Button Content="Use Selected Process"
+                            <Button Content="{DynamicResource ProcessPowerPlanAssociationView_UseSelectedProcess}"
                                     Command="{Binding UseSelectedProcessForAssociationCommand}"
                                     Padding="10,5"
-                                    ToolTip="Use the executable from the selected running process"/>
+                                    ToolTip="{DynamicResource ProcessPowerPlanAssociationView_UseSelectedProcessTooltip}"/>
                             </StackPanel>
                         </ScrollViewer>
                     </GroupBox>
@@ -275,29 +275,29 @@
             </TabItem>
 
             <!-- Automation Monitoring Tab -->
-            <TabItem Header="Automation Monitoring">
+            <TabItem Header="{DynamicResource ProcessPowerPlanAssociationView_AutomationMonitoring}">
                 <ScrollViewer Margin="10">
                     <StackPanel>
                         <!-- Service Control -->
-                        <GroupBox Header="Automation Service" Margin="0,0,0,15">
+                        <GroupBox Header="{DynamicResource ProcessPowerPlanAssociationView_AutomationService}" Margin="0,0,0,15">
                             <StackPanel>
-                                <TextBlock Text="Automation monitoring watches process start/stop events and applies configured power plan, CPU mask, and priority rules."
+                                <TextBlock Text="{DynamicResource ProcessPowerPlanAssociationView_Subtitle}"
                                            Foreground="{DynamicResource TextSecondaryBrush}"
                                            TextWrapping="Wrap"
                                            Margin="0,0,0,10"/>
                                 <StackPanel Orientation="Horizontal" Margin="0,0,0,10">
-                                    <TextBlock Text="Status: " VerticalAlignment="Center"/>
+                                    <TextBlock Text="{DynamicResource ProcessPowerPlanAssociationView_Status}" VerticalAlignment="Center"/>
                                     <TextBlock Text="{Binding ServiceStatus}"
                                               Foreground="{Binding IsServiceRunning, Converter={StaticResource BoolToColorConverter}}"
                                               FontWeight="SemiBold" VerticalAlignment="Center"/>
                                 </StackPanel>
 
                                 <StackPanel Orientation="Horizontal">
-                                    <Button Content="Start Automation Monitoring"
+                                    <Button Content="{DynamicResource ProcessPowerPlanAssociationView_StartAutomation}"
                                            Command="{Binding StartMonitoringCommand}"
                                            IsEnabled="{Binding IsServiceRunning, Converter={StaticResource InverseBoolConverter}}"
                                            Padding="15,8" Margin="0,0,10,0"/>
-                                    <Button Content="Stop Automation Monitoring"
+                                    <Button Content="{DynamicResource ProcessPowerPlanAssociationView_StopAutomation}"
                                            Command="{Binding StopMonitoringCommand}"
                                            IsEnabled="{Binding IsServiceRunning}"
                                            Padding="15,8"/>
@@ -306,9 +306,9 @@
                         </GroupBox>
 
                         <!-- Default Power Plan -->
-                         <GroupBox Header="Default Power Plan (fallback when no rule matches)" Margin="0,0,0,15">
+                         <GroupBox Header="{DynamicResource ProcessPowerPlanAssociationView_DefaultPowerPlan}" Margin="0,0,0,15">
                              <StackPanel>
-                                 <TextBlock Text="Power plan to use when no associated processes are running:"
+                                 <TextBlock Text="{DynamicResource ProcessPowerPlanAssociationView_DefaultPowerPlanHelp}"
                                             Foreground="{DynamicResource TextSecondaryBrush}" Margin="0,0,0,10"/>
 
                                 <ComboBox ItemsSource="{Binding AvailablePowerPlans}"
@@ -316,42 +316,42 @@
                                          DisplayMemberPath="Name"
                                          Padding="5" Margin="0,0,0,10"/>
 
-                                <Button Content="Set Default Power Plan"
+                                <Button Content="{DynamicResource ProcessPowerPlanAssociationView_SetDefault}"
                                        Command="{Binding SetDefaultPowerPlanCommand}"
                                        Padding="10,5" HorizontalAlignment="Left"/>
                             </StackPanel>
                         </GroupBox>
 
                         <!-- Automation Monitoring Settings -->
-                        <GroupBox Header="Automation Monitoring Settings" Margin="0,0,0,15">
+                        <GroupBox Header="{DynamicResource ProcessPowerPlanAssociationView_SettingsTitle}" Margin="0,0,0,15">
                             <StackPanel>
-                                <CheckBox Content="Enable Event-Based Automation (WMI)"
+                                <CheckBox Content="{DynamicResource ProcessPowerPlanAssociationView_EnableWmi}"
                                          IsChecked="{Binding IsEventBasedMonitoringEnabled}"
                                          Margin="0,0,0,10"/>
 
-                                <CheckBox Content="Enable Automation Fallback Polling"
+                                <CheckBox Content="{DynamicResource ProcessPowerPlanAssociationView_EnableFallback}"
                                          IsChecked="{Binding IsFallbackPollingEnabled}"
                                          Margin="0,0,0,10"/>
 
                                 <StackPanel Orientation="Horizontal" Margin="0,0,0,10">
-                                    <TextBlock Text="Polling Interval (seconds): "
+                                    <TextBlock Text="{DynamicResource ProcessPowerPlanAssociationView_PollingInterval}"
                                               VerticalAlignment="Center" Margin="0,0,10,0"/>
                                     <TextBox Text="{Binding PollingIntervalSeconds}"
                                             Width="60" Padding="5"/>
                                 </StackPanel>
 
-                                <CheckBox Content="Prevent Duplicate Power Plan Changes"
+                                <CheckBox Content="{DynamicResource ProcessPowerPlanAssociationView_PreventDuplicates}"
                                          IsChecked="{Binding PreventDuplicatePowerPlanChanges}"
                                          Margin="0,0,0,10"/>
 
                                 <StackPanel Orientation="Horizontal" Margin="0,0,0,15">
-                                    <TextBlock Text="Power Plan Change Delay (ms): "
+                                    <TextBlock Text="{DynamicResource ProcessPowerPlanAssociationView_ChangeDelay}"
                                               VerticalAlignment="Center" Margin="0,0,10,0"/>
                                     <TextBox Text="{Binding PowerPlanChangeDelayMs}"
                                             Width="80" Padding="5"/>
                                 </StackPanel>
 
-                                <Button Content="Save Configuration"
+                                <Button Content="{DynamicResource ProcessPowerPlanAssociationView_SaveConfig}"
                                        Command="{Binding SaveConfigurationCommand}"
                                        Padding="15,8" HorizontalAlignment="Left"/>
                             </StackPanel>
diff --git a/Views/ProcessView.xaml b/Views/ProcessView.xaml
index e194618..6a734ff 100644
--- a/Views/ProcessView.xaml
+++ b/Views/ProcessView.xaml
@@ -156,8 +156,8 @@
         </Grid.RowDefinitions>
 
         <StackPanel Grid.Row="0" Margin="0,0,0,16">
-            <TextBlock Text="Process Management" Style="{StaticResource PageTitleTextStyle}" Margin="0,0,0,4"/>
-            <TextBlock Text="Search, filter, and control active process configurations" Style="{StaticResource PageSubtitleTextStyle}"/>
+            <TextBlock Text="{DynamicResource ProcessView_Title}" Style="{StaticResource PageTitleTextStyle}" Margin="0,0,0,4"/>
+            <TextBlock Text="{DynamicResource ProcessView_Subtitle}" Style="{StaticResource PageSubtitleTextStyle}"/>
         </StackPanel>
 
         <Grid Grid.Row="1">
@@ -201,53 +201,53 @@
 
                             <TextBox Grid.Column="0"
                                      Text="{Binding SearchText, UpdateSourceTrigger=PropertyChanged}"
-                                     ToolTip="Search processes by name"
+                                     ToolTip="{DynamicResource ProcessView_SearchPlaceholder}"
                                      HorizontalAlignment="Stretch"
-                                     AutomationProperties.Name="Process search"/>
+                                     AutomationProperties.Name="{DynamicResource ProcessView_SearchAutomationName}"/>
                             <CheckBox Grid.Column="2"
-                                      Content="Active Apps Only"
+                                      Content="{DynamicResource ProcessView_ActiveAppsOnly}"
                                       IsChecked="{Binding ShowActiveApplicationsOnly}"
                                       VerticalAlignment="Center"
-                                      ToolTip="Show only applications with visible windows"/>
+                                      ToolTip="{DynamicResource ProcessView_VisibleWindowsOnly}"/>
                             <Button Grid.Column="4"
                                     Command="{Binding LoadProcessesCommand}"
-                                    Content="Refresh"
-                                    ToolTip="Refresh the process list"
-                                    AutomationProperties.Name="Refresh processes"/>
+                                    Content="{DynamicResource ProcessView_Refresh}"
+                                    ToolTip="{DynamicResource ProcessView_RefreshTooltip}"
+                                    AutomationProperties.Name="{DynamicResource ProcessView_RefreshAutomationName}"/>
                             <Button Grid.Column="6"
                                     Command="{Binding LoadMoreProcessesCommand}"
-                                    Content="Load More"
+                                    Content="{DynamicResource ProcessView_LoadMore}"
                                     Visibility="{Binding HasMoreBatches, Converter={StaticResource BoolToVisibilityConverter}}"
-                                    ToolTip="Load more processes"
-                                    AutomationProperties.Name="Load more processes"/>
+                                    ToolTip="{DynamicResource ProcessView_LoadMoreTooltip}"
+                                    AutomationProperties.Name="{DynamicResource ProcessView_LoadMoreAutomationName}"/>
                         </Grid>
 
                         <WrapPanel Grid.Row="2" Orientation="Horizontal">
-                            <CheckBox Content="Hide System Processes"
+                            <CheckBox Content="{DynamicResource ProcessView_HideSystemShort}"
                                       IsChecked="{Binding HideSystemProcesses}"
                                       Margin="0,0,15,0"
                                       VerticalAlignment="Center"
-                                      ToolTip="Hide Windows system processes"/>
-                            <CheckBox Content="Hide Idle Processes"
+                                      ToolTip="{DynamicResource ProcessView_HideSystem}"/>
+                            <CheckBox Content="{DynamicResource ProcessView_HideIdle}"
                                       IsChecked="{Binding HideIdleProcesses}"
                                       Margin="0,0,15,0"
                                       VerticalAlignment="Center"
-                                      ToolTip="Hide processes with very low CPU usage"/>
-                            <CheckBox Content="Lock process list"
+                                      ToolTip="{DynamicResource ProcessView_HideLowCpu}"/>
+                            <CheckBox Content="{DynamicResource ProcessView_LockList}"
                                       IsChecked="{Binding IsProcessListLocked}"
                                       Margin="0,0,15,0"
                                       VerticalAlignment="Center"
-                                      ToolTip="Pause process list refresh and sorting updates while you work with the current list. Background monitoring and saved-rule auto-apply continue while ThreadPilot is running."/>
-                            <TextBlock Text="Sort by:" VerticalAlignment="Center" Margin="0,0,5,0"/>
+                                      ToolTip="{DynamicResource ProcessView_LockListTooltip}"/>
+                            <TextBlock Text="{DynamicResource ProcessView_SortBy}" VerticalAlignment="Center" Margin="0,0,5,0"/>
                             <ComboBox SelectedValue="{Binding SortMode}"
                                       SelectedValuePath="Tag"
                                       Width="120"
                                       VerticalAlignment="Center"
-                                      ToolTip="Choose how to sort the process list">
-                                <ComboBoxItem Content="CPU Usage" Tag="CpuUsage"/>
-                                <ComboBoxItem Content="Memory Usage" Tag="MemoryUsage"/>
-                                <ComboBoxItem Content="Process Name" Tag="Name"/>
-                                <ComboBoxItem Content="Process ID" Tag="ProcessId"/>
+                                      ToolTip="{DynamicResource ProcessView_SortByTooltip}">
+                                <ComboBoxItem Content="{DynamicResource ProcessView_ColCpuUsage}" Tag="CpuUsage"/>
+                                <ComboBoxItem Content="{DynamicResource ProcessView_ColMemory}" Tag="MemoryUsage"/>
+                                <ComboBoxItem Content="{DynamicResource ProcessView_ColProcessName}" Tag="Name"/>
+                                <ComboBoxItem Content="{DynamicResource ProcessView_ID}" Tag="ProcessId"/>
                             </ComboBox>
                         </WrapPanel>
                     </Grid>
@@ -269,8 +269,8 @@
                               EnableRowVirtualization="True"
                               EnableColumnVirtualization="True"
                               ScrollViewer.CanContentScroll="True"
-                              AutomationProperties.Name="Running process list"
-                              AutomationProperties.HelpText="Virtualized process table with sorting and selection">
+                              AutomationProperties.Name="{DynamicResource ProcessView_RunningListAutomationName}"
+                              AutomationProperties.HelpText="{DynamicResource ProcessView_RunningListAutomationHelp}">
                         <DataGrid.RowStyle>
                             <Style TargetType="DataGridRow">
                                 <Setter Property="Tag" Value="{Binding DataContext, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
@@ -283,84 +283,84 @@
                                         <ContextMenu Style="{StaticResource ProcessContextMenuStyle}"
                                                      DataContext="{Binding PlacementTarget.Tag, RelativeSource={RelativeSource Self}}">
                                             <MenuItem Style="{StaticResource ProcessContextMenuItemStyle}"
-                                                      Header="Apply Affinity"
+                                                      Header="{DynamicResource ProcessView_ApplyAffinity}"
                                                       Command="{Binding ApplyContextAffinityCommand}"
                                                       CommandParameter="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource AncestorType=ContextMenu}}"/>
                                             <MenuItem Style="{StaticResource ProcessContextMenuItemStyle}"
-                                                      Header="Clear CPU Sets"
+                                                      Header="{DynamicResource ProcessView_ClearCpuSets}"
                                                       Command="{Binding ClearContextCpuSetsCommand}"
                                                       CommandParameter="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource AncestorType=ContextMenu}}"/>
                                             <Separator Style="{StaticResource ProcessContextMenuSeparatorStyle}"/>
                                             <MenuItem Style="{StaticResource ProcessContextMenuItemStyle}"
-                                                      Header="Rules">
+                                                      Header="{DynamicResource ProcessView_Rules}">
                                                 <MenuItem Style="{StaticResource ProcessContextMenuItemStyle}"
-                                                          Header="Save Current Settings as Rule"
+                                                          Header="{DynamicResource ProcessView_SaveCurrentRule}"
                                                           Command="{Binding SaveCurrentSettingsAsRuleCommand}"
                                                           CommandParameter="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource AncestorType=ContextMenu}}"/>
                                                 <MenuItem Style="{StaticResource ProcessContextMenuItemStyle}"
-                                                          Header="Apply Affinity and Save as Rule"
+                                                          Header="{DynamicResource ProcessView_ApplyAffinitySaveRule}"
                                                           Command="{Binding ApplyAffinityAndSaveAsRuleCommand}"
                                                           CommandParameter="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource AncestorType=ContextMenu}}"/>
                                             </MenuItem>
                                             <Separator Style="{StaticResource ProcessContextMenuSeparatorStyle}"/>
                                             <MenuItem Style="{StaticResource ProcessContextMenuItemStyle}"
-                                                      Header="Set CPU Priority">
+                                                      Header="{DynamicResource ProcessView_SetCpuPriority}">
                                                 <MenuItem Style="{StaticResource ProcessContextMenuItemStyle}"
-                                                          Header="Below Normal"
+                                                          Header="{DynamicResource ProcessView_PriorityBelowNormal}"
                                                           Command="{Binding SetContextBelowNormalPriorityCommand}"
                                                           CommandParameter="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource AncestorType=ContextMenu}}"/>
                                                 <MenuItem Style="{StaticResource ProcessContextMenuItemStyle}"
-                                                          Header="Normal"
+                                                          Header="{DynamicResource ProcessView_PriorityNormal}"
                                                           Command="{Binding SetContextNormalPriorityCommand}"
                                                           CommandParameter="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource AncestorType=ContextMenu}}"/>
                                                 <MenuItem Style="{StaticResource ProcessContextMenuItemStyle}"
-                                                          Header="Above Normal"
+                                                          Header="{DynamicResource ProcessView_PriorityAboveNormal}"
                                                           Command="{Binding SetContextAboveNormalPriorityCommand}"
                                                           CommandParameter="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource AncestorType=ContextMenu}}"/>
                                                 <MenuItem Style="{StaticResource ProcessContextMenuItemStyle}"
-                                                          Header="High"
+                                                          Header="{DynamicResource ProcessView_PriorityHigh}"
                                                           Command="{Binding SetContextHighPriorityCommand}"
                                                           CommandParameter="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource AncestorType=ContextMenu}}"/>
                                                 <MenuItem Style="{StaticResource ProcessContextMenuItemStyle}"
-                                                          Header="Realtime (blocked)"
+                                                          Header="{DynamicResource ProcessView_RealtimeBlocked}"
                                                           IsEnabled="False"
                                                           ToolTipService.ShowOnDisabled="True"
-                                                          ToolTip="Realtime priority is blocked by ThreadPilot because it can make Windows unstable or unresponsive."/>
+                                                          ToolTip="{DynamicResource ProcessView_RealtimeBlockedHelp}"/>
                                             </MenuItem>
                                             <MenuItem Style="{StaticResource ProcessContextMenuItemStyle}"
-                                                      Header="Set Memory Priority">
+                                                      Header="{DynamicResource ProcessView_SetMemoryPriority}">
                                                 <MenuItem Style="{StaticResource ProcessContextMenuItemStyle}"
-                                                          Header="Very Low"
+                                                          Header="{DynamicResource ProcessView_PriorityVeryLow}"
                                                           Command="{Binding SetContextMemoryPriorityVeryLowCommand}"
                                                           CommandParameter="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource AncestorType=ContextMenu}}"/>
                                                 <MenuItem Style="{StaticResource ProcessContextMenuItemStyle}"
-                                                          Header="Low"
+                                                          Header="{DynamicResource ProcessView_PriorityLow}"
                                                           Command="{Binding SetContextMemoryPriorityLowCommand}"
                                                           CommandParameter="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource AncestorType=ContextMenu}}"/>
                                                 <MenuItem Style="{StaticResource ProcessContextMenuItemStyle}"
-                                                          Header="Medium"
+                                                          Header="{DynamicResource ProcessView_PriorityMedium}"
                                                           Command="{Binding SetContextMemoryPriorityMediumCommand}"
                                                           CommandParameter="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource AncestorType=ContextMenu}}"/>
                                                 <MenuItem Style="{StaticResource ProcessContextMenuItemStyle}"
-                                                          Header="Below Normal"
+                                                          Header="{DynamicResource ProcessView_PriorityBelowNormal}"
                                                           Command="{Binding SetContextMemoryPriorityBelowNormalCommand}"
                                                           CommandParameter="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource AncestorType=ContextMenu}}"/>
                                                 <MenuItem Style="{StaticResource ProcessContextMenuItemStyle}"
-                                                          Header="Normal"
+                                                          Header="{DynamicResource ProcessView_PriorityNormal}"
                                                           Command="{Binding SetContextMemoryPriorityNormalCommand}"
                                                           CommandParameter="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource AncestorType=ContextMenu}}"/>
                                             </MenuItem>
                                             <Separator Style="{StaticResource ProcessContextMenuSeparatorStyle}"/>
                                             <MenuItem Style="{StaticResource ProcessContextMenuItemStyle}"
-                                                      Header="Open Executable Location"
+                                                      Header="{DynamicResource ProcessView_OpenLocation}"
                                                       Command="{Binding OpenContextExecutableLocationCommand}"
                                                       CommandParameter="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource AncestorType=ContextMenu}}"/>
                                             <MenuItem Style="{StaticResource ProcessContextMenuItemStyle}"
-                                                      Header="Copy Process Info"
+                                                      Header="{DynamicResource ProcessView_CopyProcessInfo}"
                                                       Command="{Binding CopyContextProcessInfoCommand}"
                                                       CommandParameter="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource AncestorType=ContextMenu}}"/>
                                             <MenuItem Style="{StaticResource ProcessContextMenuItemStyle}"
-                                                      Header="Refresh Process Info"
+                                                      Header="{DynamicResource ProcessView_RefreshInfo}"
                                                       Command="{Binding RefreshContextProcessInfoCommand}"
                                                       CommandParameter="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource AncestorType=ContextMenu}}"/>
                                         </ContextMenu>
@@ -386,15 +386,15 @@
                             </Style>
                         </DataGrid.RowStyle>
                         <DataGrid.Columns>
-                            <DataGridTextColumn Header="Name" Binding="{Binding Name}" Width="160"/>
-                            <DataGridTextColumn Header="ID" Binding="{Binding ProcessId}" Width="70"/>
-                            <DataGridTextColumn Header="Window Title" Binding="{Binding MainWindowTitle}" Width="220"/>
-                            <DataGridCheckBoxColumn Header="Has Window" Binding="{Binding HasVisibleWindow}" Width="90"/>
-                            <DataGridTextColumn Header="CPU Usage" Binding="{Binding CpuUsage, StringFormat={}{0:N1}%}" Width="90"/>
-                            <DataGridTextColumn Header="Memory (MB)"
+                            <DataGridTextColumn Header="{DynamicResource ProcessView_Name}" Binding="{Binding Name}" Width="160"/>
+                            <DataGridTextColumn Header="{DynamicResource ProcessView_ID}" Binding="{Binding ProcessId}" Width="70"/>
+                            <DataGridTextColumn Header="{DynamicResource ProcessView_ColWindowTitle}" Binding="{Binding MainWindowTitle}" Width="220"/>
+                            <DataGridCheckBoxColumn Header="{DynamicResource ProcessView_HasWindow}" Binding="{Binding HasVisibleWindow}" Width="90"/>
+                            <DataGridTextColumn Header="{DynamicResource ProcessView_ColCpuUsage}" Binding="{Binding CpuUsage, StringFormat={}{0:N1}%}" Width="90"/>
+                            <DataGridTextColumn Header="{DynamicResource ProcessView_MemoryMb}"
                                                 Binding="{Binding MemoryUsage, Converter={StaticResource BytesToMbConverter}}"
                                                 Width="90"/>
-                            <DataGridTextColumn Header="Priority" Binding="{Binding Priority}" Width="*"/>
+                            <DataGridTextColumn Header="{DynamicResource ProcessView_Priority}" Binding="{Binding Priority}" Width="*"/>
                         </DataGrid.Columns>
                     </DataGrid>
 
@@ -415,13 +415,13 @@
                             Padding="8,5"
                             CornerRadius="{DynamicResource StandardCardCornerRadius}">
                         <TextBlock FontSize="{StaticResource ProcessFontSmall}" Foreground="{DynamicResource TextSecondaryBrush}">
-                            <Run Text="Batch "/>
+                            <Run Text="{DynamicResource ProcessView_BatchLabel}"/>
                             <Run Text="{Binding CurrentBatchIndex, StringFormat={}{0:N0}}"/>
                             <Run Text="/"/>
                             <Run Text="{Binding TotalBatches, StringFormat={}{0:N0}}"/>
                             <Run Text=" ("/>
                             <Run Text="{Binding TotalProcessCount, StringFormat={}{0:N0}}"/>
-                            <Run Text=" total)"/>
+                            <Run Text="{DynamicResource ProcessView_TotalSuffix}"/>
                         </TextBlock>
                     </Border>
                 </Grid>
@@ -434,11 +434,11 @@
                         Padding="10"
                         Margin="0,12,0,0">
                     <StackPanel>
-                        <TextBlock Text="Current process status"
+                        <TextBlock Text="{DynamicResource ProcessView_CurrentProcessStatus}"
                                    FontSize="{StaticResource ProcessFontMediumSmall}"
                                    FontWeight="SemiBold"
                                    Margin="0,0,0,2"/>
-                        <TextBlock Text="Rules and changes are applied by ThreadPilot only when configured."
+                        <TextBlock Text="{DynamicResource ProcessView_RulesAppliedOnlyWhenConfigured}"
                                    FontSize="{StaticResource ProcessFontSmall}"
                                    Foreground="{DynamicResource TextSecondaryBrush}"
                                    TextWrapping="Wrap"
@@ -481,12 +481,12 @@
                             <TextBlock FontSize="{StaticResource ProcessFontSmall}"
                                        Foreground="{DynamicResource TextSecondaryBrush}"
                                        TextWrapping="Wrap">
-                                <Run Text="Last ThreadPilot action: "/>
+                                <Run Text="{DynamicResource ProcessView_LastAction}"/>
                                 <Run Text="{Binding SelectedProcessSummary.LastOperationMessage, Mode=OneWay}"/>
                             </TextBlock>
                         </WrapPanel>
 
-                        <Expander Header="Advanced affinity picker"
+                        <Expander Header="{DynamicResource ProcessView_AdvancedAffinityPicker}"
                                   IsExpanded="False"
                                   Margin="0,10,0,0">
                             <StackPanel Margin="0,8,0,0">
@@ -499,7 +499,7 @@
                                         <ColumnDefinition Width="Auto"/>
                                     </Grid.ColumnDefinitions>
                                     <TextBlock Grid.Column="0"
-                                               Text="Pending core mask"
+                                               Text="{DynamicResource ProcessView_PendingCoreMask}"
                                                FontSize="{StaticResource ProcessFontSmall}"
                                                FontWeight="SemiBold"
                                                VerticalAlignment="Center"/>
@@ -508,14 +508,14 @@
                                               SelectedItem="{Binding SelectedCoreMask, Mode=TwoWay}"
                                               DisplayMemberPath="Name"
                                               IsEnabled="{Binding SelectedProcess, Converter={StaticResource NullToBoolConverter}}"
-                                              ToolTip="Select the pending mask for row context-menu affinity actions"/>
+                                              ToolTip="{DynamicResource ProcessView_RowMaskTooltip}"/>
                                     <Button Grid.Column="4"
                                             Command="{Binding CreateCustomMaskCommand}"
                                             Padding="8,5"
-                                            ToolTip="Open CPU Masks tab to create a new custom mask">
+                                            ToolTip="{DynamicResource ProcessView_OpenMasksTabTooltip}">
                                         <StackPanel Orientation="Horizontal">
                                             <ui:SymbolIcon Symbol="Add12" Margin="0,0,6,0" VerticalAlignment="Center"/>
-                                            <TextBlock Text="Custom" FontSize="{StaticResource ProcessFontMediumSmall}" VerticalAlignment="Center"/>
+                                            <TextBlock Text="{DynamicResource ProcessView_PriorityCustom}" FontSize="{StaticResource ProcessFontMediumSmall}" VerticalAlignment="Center"/>
                                         </StackPanel>
                                     </Button>
                                 </Grid>
@@ -583,7 +583,7 @@
                     CornerRadius="8">
                 <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
                     <StackPanel Margin="14">
-                        <TextBlock Text="Selected Process"
+                        <TextBlock Text="{DynamicResource ProcessView_SelectedProcess}"
                                    FontSize="{StaticResource ProcessFontMedium}"
                                    FontWeight="SemiBold"
                                    Margin="0,0,0,8"/>
@@ -595,7 +595,7 @@
                                 Background="{DynamicResource QuietRowBackgroundBrush}"
                                 Margin="0,0,0,12">
                             <StackPanel>
-                                <TextBlock Text="No process selected"
+                                <TextBlock Text="{DynamicResource ProcessView_NoProcessSelected}"
                                            FontWeight="SemiBold"
                                            Foreground="{DynamicResource TextSecondaryBrush}"
                                            TextWrapping="Wrap">
@@ -610,7 +610,7 @@
                                         </Style>
                                     </TextBlock.Style>
                                 </TextBlock>
-                                <TextBlock Text="Select a process from the table to enable affinity, priority, power plan, and rule actions."
+                                <TextBlock Text="{DynamicResource ProcessView_SelectProcessTip}"
                                            FontSize="{StaticResource ProcessFontSmall}"
                                            Foreground="{DynamicResource TextSecondaryBrush}"
                                            TextWrapping="Wrap"
@@ -643,7 +643,7 @@
                                     <TextBlock FontSize="{StaticResource ProcessFontSmall}" Foreground="{DynamicResource TextSecondaryBrush}">
                                         <Run Text="PID "/>
                                         <Run Text="{Binding SelectedProcess.ProcessId}"/>
-                                        <Run Text="  Priority "/>
+                                        <Run Text="{DynamicResource ProcessView_PriorityInlineLabel}"/>
                                         <Run Text="{Binding SelectedProcess.Priority}"/>
                                     </TextBlock>
                                     <TextBlock Text="{Binding SelectedProcess.MainWindowTitle, TargetNullValue=No visible window title}"
@@ -655,31 +655,31 @@
                             </StackPanel>
                         </Border>
 
-                        <GroupBox Header="Affinity" Margin="0,0,0,12">
+                        <GroupBox Header="{DynamicResource ProcessView_Affinity}" Margin="0,0,0,12">
                             <StackPanel Margin="8">
                                 <TextBlock Text="{Binding CurrentAffinityText}"
                                            FontSize="{StaticResource ProcessFontSmall}"
                                            Foreground="{DynamicResource TextSecondaryBrush}"
                                            TextWrapping="Wrap"
-                                           ToolTip="Affinity currently reported by Windows for the selected process"/>
+                                           ToolTip="{DynamicResource ProcessView_AffinityCurrentTooltip}"/>
                                 <TextBlock Text="{Binding PendingAffinityText}"
                                            FontSize="{StaticResource ProcessFontSmall}"
                                            Foreground="{DynamicResource TextSecondaryBrush}"
                                            TextWrapping="Wrap"
                                            Margin="0,3,0,0"
-                                           ToolTip="Affinity staged in the UI. It is not applied until Apply Affinity is clicked."/>
+                                           ToolTip="{DynamicResource ProcessView_AffinityStagedTooltip}"/>
                                 <TextBlock Text="{Binding AffinityEditStateText}"
                                            FontSize="{StaticResource ProcessFontSmall}"
                                            Foreground="{DynamicResource WarningTextBrush}"
                                            TextWrapping="Wrap"
                                            Margin="0,3,0,10"/>
 
-                                <TextBlock Text="Pending core mask" FontSize="{StaticResource ProcessFontSmall}" FontWeight="SemiBold" Margin="0,0,0,4"/>
+                                <TextBlock Text="{DynamicResource ProcessView_PendingCoreMask}" FontSize="{StaticResource ProcessFontSmall}" FontWeight="SemiBold" Margin="0,0,0,4"/>
                                 <ComboBox ItemsSource="{Binding AvailableCoreMasks}"
                                           SelectedItem="{Binding SelectedCoreMask, Mode=TwoWay}"
                                           IsEnabled="{Binding SelectedProcess, Converter={StaticResource NullToBoolConverter}}"
                                           Margin="0,0,0,8"
-                                          ToolTip="Select a mask to stage it. This does not change OS affinity until Apply Affinity is clicked.">
+                                          ToolTip="{DynamicResource ProcessView_StageMaskTooltip}">
                                     <ComboBox.ItemTemplate>
                                         <DataTemplate>
                                             <StackPanel Orientation="Horizontal">
@@ -700,7 +700,7 @@
                                            FontSize="{StaticResource ProcessFontSmall}"
                                            Margin="0,2,0,6"
                                            Foreground="{Binding IsHyperThreadingActive, Converter={StaticResource BoolToColorConverter}}"
-                                           ToolTip="Shows whether Hyper-Threading (Intel) or SMT (AMD) is present and active on this system"/>
+                                           ToolTip="{DynamicResource ProcessView_HyperThreadingTooltip}"/>
 
                                 <ScrollViewer MaxHeight="92"
                                               VerticalScrollBarVisibility="Auto"
@@ -722,7 +722,7 @@
                                                           Margin="2"
                                                           FontSize="{StaticResource ProcessFontSmall}"
                                                           Foreground="{DynamicResource TextPrimaryBrush}"
-                                                          ToolTip="Read-only preview of current or pending CPU selection"/>
+                                                          ToolTip="{DynamicResource ProcessView_CpuSelectionPreviewTooltip}"/>
                                             </DataTemplate>
                                         </ItemsControl.ItemTemplate>
                                     </ItemsControl>
@@ -736,59 +736,59 @@
                                     </Grid.ColumnDefinitions>
                                     <Button Grid.Column="0"
                                             Command="{Binding SetAffinityCommand}"
-                                            Content="Apply Affinity"
+                                            Content="{DynamicResource ProcessView_ApplyAffinity}"
                                             Padding="10,6"
                                             IsEnabled="{Binding SelectedProcess, Converter={StaticResource NullToBoolConverter}}"
-                                            ToolTip="Apply the pending core mask to the selected process and verify the Windows affinity state"/>
+                                            ToolTip="{DynamicResource ProcessView_ApplyAffinityTooltip}"/>
                                     <Button Grid.Column="2"
                                             Command="{Binding CreateCustomMaskCommand}"
                                             Padding="8,6"
-                                            ToolTip="Open CPU Masks tab to create a new custom mask">
+                                            ToolTip="{DynamicResource ProcessView_OpenMasksTabTooltip}">
                                         <StackPanel Orientation="Horizontal">
                                             <ui:SymbolIcon Symbol="Add12" Margin="0,0,6,0" VerticalAlignment="Center"/>
-                                            <TextBlock Text="Custom" FontSize="{StaticResource ProcessFontMediumSmall}" VerticalAlignment="Center"/>
+                                            <TextBlock Text="{DynamicResource ProcessView_PriorityCustom}" FontSize="{StaticResource ProcessFontMediumSmall}" VerticalAlignment="Center"/>
                                         </StackPanel>
                                     </Button>
                                 </Grid>
                             </StackPanel>
                         </GroupBox>
 
-                        <GroupBox Header="Priority" Margin="0,0,0,12">
+                        <GroupBox Header="{DynamicResource ProcessView_Priority}" Margin="0,0,0,12">
                             <StackPanel Margin="8">
                                 <ComboBox x:Name="PriorityComboBox"
                                           SelectedValue="{Binding SelectedProcess.Priority, Mode=TwoWay}"
                                           SelectedValuePath="Tag"
                                           Margin="0,0,0,6"
                                           IsEnabled="{Binding SelectedProcess, Converter={StaticResource NullToBoolConverter}}">
-                                    <ComboBoxItem Content="Realtime" Tag="{x:Static Diagnostics:ProcessPriorityClass.RealTime}"/>
-                                    <ComboBoxItem Content="High" Tag="{x:Static Diagnostics:ProcessPriorityClass.High}"/>
-                                    <ComboBoxItem Content="Above Normal" Tag="{x:Static Diagnostics:ProcessPriorityClass.AboveNormal}"/>
-                                    <ComboBoxItem Content="Normal" Tag="{x:Static Diagnostics:ProcessPriorityClass.Normal}"/>
-                                    <ComboBoxItem Content="Below Normal" Tag="{x:Static Diagnostics:ProcessPriorityClass.BelowNormal}"/>
-                                    <ComboBoxItem Content="Idle" Tag="{x:Static Diagnostics:ProcessPriorityClass.Idle}"/>
+                                    <ComboBoxItem Content="{DynamicResource ProcessView_PriorityRealtime}" Tag="{x:Static Diagnostics:ProcessPriorityClass.RealTime}"/>
+                                    <ComboBoxItem Content="{DynamicResource ProcessView_PriorityHigh}" Tag="{x:Static Diagnostics:ProcessPriorityClass.High}"/>
+                                    <ComboBoxItem Content="{DynamicResource ProcessView_PriorityAboveNormal}" Tag="{x:Static Diagnostics:ProcessPriorityClass.AboveNormal}"/>
+                                    <ComboBoxItem Content="{DynamicResource ProcessView_PriorityNormal}" Tag="{x:Static Diagnostics:ProcessPriorityClass.Normal}"/>
+                                    <ComboBoxItem Content="{DynamicResource ProcessView_PriorityBelowNormal}" Tag="{x:Static Diagnostics:ProcessPriorityClass.BelowNormal}"/>
+                                    <ComboBoxItem Content="{DynamicResource ProcessView_PriorityIdle}" Tag="{x:Static Diagnostics:ProcessPriorityClass.Idle}"/>
                                 </ComboBox>
                                 <Button Command="{Binding SetPriorityCommand}"
                                         CommandParameter="{Binding ElementName=PriorityComboBox, Path=SelectedValue}"
-                                        Content="Set Priority"
+                                        Content="{DynamicResource ProcessView_SetPriority}"
                                         Padding="10,6"
                                         Margin="0,0,0,8"
                                         IsEnabled="{Binding SelectedProcess, Converter={StaticResource NullToBoolConverter}}"
-                                        ToolTip="Apply the selected priority to the process"/>
-                                <CheckBox Content="Enforce Priority by Registry"
+                                        ToolTip="{DynamicResource ProcessView_ApplyPriorityTooltip}"/>
+                                <CheckBox Content="{DynamicResource ProcessView_EnforcePriorityRegistry}"
                                           IsChecked="{Binding IsRegistryPriorityEnabled}"
                                           IsEnabled="{Binding SelectedProcess, Converter={StaticResource NullToBoolConverter}}"
                                           Margin="0,0,0,6"
-                                          ToolTip="Apply priority through Windows registry. Process must be restarted for changes to take effect. This setting persists across system reboots."/>
-                                <CheckBox Content="Disable Idle Server"
+                                          ToolTip="{DynamicResource ProcessView_EnforcePriorityRegistryTooltip}"/>
+                                <CheckBox Content="{DynamicResource ProcessView_DisableIdleServer}"
                                           IsChecked="{Binding IsIdleServerDisabled}"
                                           IsEnabled="{Binding SelectedProcess, Converter={StaticResource NullToBoolConverter}}"
-                                          ToolTip="Prevents the system from entering idle state while this process is running. Useful for games and performance-critical applications."/>
+                                          ToolTip="{DynamicResource ProcessView_DisableIdleServerTooltip}"/>
                             </StackPanel>
                         </GroupBox>
 
-                        <GroupBox Header="Power Plan / Pending Settings" Margin="0,0,0,12">
+                        <GroupBox Header="{DynamicResource ProcessView_PowerPlanPending}" Margin="0,0,0,12">
                             <StackPanel Margin="8">
-                                <TextBlock Text="Selected power plan"
+                                <TextBlock Text="{DynamicResource ProcessView_SelectedPowerPlan}"
                                            FontSize="{StaticResource ProcessFontSmall}"
                                            FontWeight="SemiBold"
                                            Margin="0,0,0,4"/>
@@ -796,7 +796,7 @@
                                           SelectedItem="{Binding SelectedPowerPlan, Mode=TwoWay}"
                                           DisplayMemberPath="Name"
                                           Margin="0,0,0,8"
-                                          ToolTip="Choose the power plan to activate manually or include with quick apply"/>
+                                          ToolTip="{DynamicResource ProcessView_PowerPlanTooltip}"/>
                                 <Grid>
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="*"/>
@@ -805,24 +805,24 @@
                                     </Grid.ColumnDefinitions>
                                     <Button Grid.Column="0"
                                             Command="{Binding SetPowerPlanCommand}"
-                                            Content="Set Power Plan"
+                                            Content="{DynamicResource ProcessView_SetPowerPlan}"
                                             Padding="10,6"
-                                            ToolTip="Activate the selected Windows power plan"/>
+                                            ToolTip="{DynamicResource ProcessView_SetPowerPlanTooltip}"/>
                                     <Button Grid.Column="2"
                                             Command="{Binding QuickApplyAffinityAndPowerPlanCommand}"
-                                            Content="Apply Pending Settings"
+                                            Content="{DynamicResource ProcessView_ApplyPendingSettings}"
                                             Padding="10,6"
                                             IsEnabled="{Binding SelectedProcess, Converter={StaticResource NullToBoolConverter}}"
-                                            ToolTip="Apply the pending affinity and selected power plan to the selected process"/>
+                                            ToolTip="{DynamicResource ProcessView_ApplyPendingSettingsTooltip}"/>
                                 </Grid>
                             </StackPanel>
                         </GroupBox>
 
-                        <GroupBox Header="Profile / Rule" Margin="0,0,0,12">
+                        <GroupBox Header="{DynamicResource ProcessView_ProfileRule}" Margin="0,0,0,12">
                             <StackPanel Margin="8">
                                 <TextBox Text="{Binding ProfileName, UpdateSourceTrigger=PropertyChanged}"
                                          Margin="0,0,0,8"
-                                         ToolTip="Enter a profile name to save or load settings"/>
+                                         ToolTip="{DynamicResource ProcessView_ProfileNamePlaceholder}"/>
                                 <Grid Margin="0,0,0,8">
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="*"/>
@@ -831,21 +831,21 @@
                                     </Grid.ColumnDefinitions>
                                     <Button Grid.Column="0"
                                             Command="{Binding SaveProfileCommand}"
-                                            Content="Save Profile"
+                                            Content="{DynamicResource ProcessView_SaveProfile}"
                                             Padding="10,6"
-                                            ToolTip="Save current CPU affinity and priority as a reusable profile"/>
+                                            ToolTip="{DynamicResource ProcessView_SaveProfileTooltip}"/>
                                     <Button Grid.Column="2"
                                             Command="{Binding LoadProfileCommand}"
-                                            Content="Load Profile"
+                                            Content="{DynamicResource ProcessView_LoadProfile}"
                                             Padding="10,6"
-                                            ToolTip="Load a previously saved profile"/>
+                                            ToolTip="{DynamicResource ProcessView_LoadProfileTooltip}"/>
                                 </Grid>
                                 <Button Command="{Binding SaveCurrentAsAssociationCommand}"
-                                        Content="Save as Rule"
+                                        Content="{DynamicResource ProcessView_SaveAsRule}"
                                         Padding="10,6"
                                         FontWeight="SemiBold"
                                         IsEnabled="{Binding SelectedProcess, Converter={StaticResource NullToBoolConverter}}"
-                                        ToolTip="Save current process settings as a rule. These settings will be automatically applied when this process starts in the future."/>
+                                        ToolTip="{DynamicResource ProcessView_ApplyAffinitySaveRuleTooltip}"/>
                             </StackPanel>
                         </GroupBox>
 
diff --git a/Views/SettingsView.xaml b/Views/SettingsView.xaml
index c72bd35..bb09a94 100644
--- a/Views/SettingsView.xaml
+++ b/Views/SettingsView.xaml
@@ -40,8 +40,8 @@
         </Grid.RowDefinitions>
 
         <StackPanel Grid.Row="0" Margin="0,0,0,16">
-            <TextBlock Text="Application Settings" Style="{StaticResource PageTitleTextStyle}" Margin="0,0,0,4"/>
-            <TextBlock Text="Configure notifications, system tray, and application behavior"
+            <TextBlock Text="{DynamicResource SettingsView_Title}" Style="{StaticResource PageTitleTextStyle}" Margin="0,0,0,4"/>
+            <TextBlock Text="{DynamicResource SettingsView_Subtitle}"
                        Style="{StaticResource PageSubtitleTextStyle}"/>
         </StackPanel>
 
@@ -51,54 +51,54 @@
                 
                  <!-- Notifications Section -->
                  <StackPanel Width="372" Margin="0,0,16,16">
-                     <TextBlock Text="Notifications" Style="{StaticResource SectionHeaderStyle}" Margin="0,0,0,8"/>
+                     <TextBlock Text="{DynamicResource SettingsView_Notifications}" Style="{StaticResource SectionHeaderStyle}" Margin="0,0,0,8"/>
                      <Border Style="{StaticResource SettingsCardStyle}">
                         <StackPanel>
-                            <CheckBox Content="Enable notifications" 
+                            <CheckBox Content="{DynamicResource SettingsView_EnableNotifications}" 
                                       IsChecked="{Binding Settings.EnableNotifications}"
                                       Margin="0,0,0,10"/>
 
                             <StackPanel Margin="20,0,0,10"
                                         IsEnabled="{Binding Settings.EnableNotifications}">
-                                <TextBlock Text="Notification Level" FontWeight="SemiBold" Margin="0,0,0,4"/>
+                                <TextBlock Text="{DynamicResource SettingsView_NotificationLevel}" FontWeight="SemiBold" Margin="0,0,0,4"/>
                                 <ComboBox SelectedValue="{Binding Settings.NotificationLevel}"
                                           SelectedValuePath="Tag">
-                                    <ComboBoxItem Content="All" Tag="{x:Static models:NotificationLevelProfile.All}"/>
-                                    <ComboBoxItem Content="Warnings/Errors only" Tag="{x:Static models:NotificationLevelProfile.WarningsAndErrorsOnly}"/>
-                                    <ComboBoxItem Content="Silent" Tag="{x:Static models:NotificationLevelProfile.Silent}"/>
+                                    <ComboBoxItem Content="{DynamicResource SettingsView_NotificationLevelAll}" Tag="{x:Static models:NotificationLevelProfile.All}"/>
+                                    <ComboBoxItem Content="{DynamicResource SettingsView_NotificationLevelWarningsErrors}" Tag="{x:Static models:NotificationLevelProfile.WarningsAndErrorsOnly}"/>
+                                    <ComboBoxItem Content="{DynamicResource SettingsView_NotificationLevelSilent}" Tag="{x:Static models:NotificationLevelProfile.Silent}"/>
                                 </ComboBox>
                             </StackPanel>
                             
-                            <CheckBox Content="Enable balloon notifications (system tray)" 
+                            <CheckBox Content="{DynamicResource SettingsView_EnableBalloon}" 
                                       IsChecked="{Binding Settings.EnableBalloonNotifications}"
                                       IsEnabled="{Binding Settings.EnableNotifications}"
                                       Margin="20,0,0,5"/>
                             
-                            <CheckBox Content="Enable toast notifications (Windows 10+)" 
+                            <CheckBox Content="{DynamicResource SettingsView_EnableToast}" 
                                       IsChecked="{Binding Settings.EnableToastNotifications}"
                                       IsEnabled="{Binding Settings.EnableNotifications}"
                                       Margin="20,0,0,10"/>
                             
                             <Separator Margin="0,10"/>
                             
-                            <TextBlock Text="Notification Types" FontWeight="SemiBold" Margin="0,5"/>
+                            <TextBlock Text="{DynamicResource SettingsView_NotificationTypes}" FontWeight="SemiBold" Margin="0,5"/>
                             
-                            <CheckBox Content="Power plan changes" 
+                            <CheckBox Content="{DynamicResource SettingsView_NotifyPowerPlan}" 
                                       IsChecked="{Binding Settings.EnablePowerPlanChangeNotifications}"
                                       IsEnabled="{Binding Settings.EnableNotifications}"
                                       Margin="20,5,0,5"/>
                             
-                            <CheckBox Content="Process monitoring events" 
+                            <CheckBox Content="{DynamicResource SettingsView_NotifyProcess}" 
                                       IsChecked="{Binding Settings.EnableProcessMonitoringNotifications}"
                                       IsEnabled="{Binding Settings.EnableNotifications}"
                                       Margin="20,0,0,5"/>
                             
-                            <CheckBox Content="Error notifications" 
+                            <CheckBox Content="{DynamicResource SettingsView_NotifyError}" 
                                       IsChecked="{Binding Settings.EnableErrorNotifications}"
                                       IsEnabled="{Binding Settings.EnableNotifications}"
                                       Margin="20,0,0,5"/>
                             
-                            <CheckBox Content="Success notifications" 
+                            <CheckBox Content="{DynamicResource SettingsView_NotifySuccess}" 
                                       IsChecked="{Binding Settings.EnableSuccessNotifications}"
                                       IsEnabled="{Binding Settings.EnableNotifications}"
                                       Margin="20,0,0,10"/>
@@ -112,7 +112,7 @@
                                     <ColumnDefinition Width="Auto"/>
                                 </Grid.ColumnDefinitions>
                                 
-                                <TextBlock Text="Duration (ms):" VerticalAlignment="Center"/>
+                                <TextBlock Text="{DynamicResource SettingsView_Duration}" VerticalAlignment="Center"/>
                                 <Slider Grid.Column="1" 
                                         Value="{Binding Settings.NotificationDisplayDurationMs}"
                                         Minimum="1000" Maximum="30000" 
@@ -124,7 +124,7 @@
                                            VerticalAlignment="Center" MinWidth="40"/>
                             </Grid>
                             
-                            <Button Content="Test Notification" 
+                            <Button Content="{DynamicResource SettingsView_TestNotification}" 
                                     Command="{Binding TestNotificationCommand}"
                                     HorizontalAlignment="Left" 
                                     Margin="0,10,0,0" 
@@ -135,40 +135,40 @@
 
                 <!-- System Tray Section -->
                 <StackPanel Width="372" Margin="0,0,16,16">
-                    <TextBlock Text="System Tray" Style="{StaticResource SectionHeaderStyle}" Margin="0,0,0,8"/>
+                    <TextBlock Text="{DynamicResource SettingsView_SystemTray}" Style="{StaticResource SectionHeaderStyle}" Margin="0,0,0,8"/>
                     <Border Style="{StaticResource SettingsCardStyle}">
                         <StackPanel>
-                            <CheckBox Content="Show tray icon" 
+                            <CheckBox Content="{DynamicResource SettingsView_ShowTrayIcon}" 
                                       IsChecked="{Binding Settings.ShowTrayIcon}"
                                       Margin="0,0,0,10"/>
                             
-                            <CheckBox Content="Minimize to tray" 
+                            <CheckBox Content="{DynamicResource SettingsView_MinimizeToTray}" 
                                       IsChecked="{Binding Settings.MinimizeToTray}"
                                       IsEnabled="{Binding Settings.ShowTrayIcon}"
                                       Margin="20,0,0,5"/>
                             
-                            <CheckBox Content="Close to tray (instead of exit)" 
+                            <CheckBox Content="{DynamicResource SettingsView_CloseToTray}" 
                                       IsChecked="{Binding Settings.CloseToTray}"
                                       IsEnabled="{Binding Settings.ShowTrayIcon}"
                                       Margin="20,0,0,5"/>
                             
-                            <CheckBox Content="Start minimized" 
+                            <CheckBox Content="{DynamicResource SettingsView_StartMinimized}" 
                                       IsChecked="{Binding Settings.StartMinimized}"
                                       Margin="20,0,0,10"/>
                             
                             <Separator Margin="0,10"/>
                             
-                            <CheckBox Content="Enable pending settings apply from tray"
+                            <CheckBox Content="{DynamicResource SettingsView_QuickApply}"
                                       IsChecked="{Binding Settings.EnableQuickApplyFromTray}"
                                       IsEnabled="{Binding Settings.ShowTrayIcon}"
                                       Margin="0,5"/>
                             
-                            <CheckBox Content="Enable automation monitoring controls from tray"
+                            <CheckBox Content="{DynamicResource SettingsView_MonitoringControl}"
                                       IsChecked="{Binding Settings.EnableMonitoringControlFromTray}"
                                       IsEnabled="{Binding Settings.ShowTrayIcon}"
                                       Margin="0,0,0,5"/>
                             
-                            <CheckBox Content="Show detailed tooltips" 
+                            <CheckBox Content="{DynamicResource SettingsView_DetailedTooltips}" 
                                       IsChecked="{Binding Settings.ShowDetailedTooltips}"
                                       IsEnabled="{Binding Settings.ShowTrayIcon}"
                                       Margin="0,0,0,10"/>
@@ -237,17 +237,17 @@
 
                             <Separator Margin="0,0,0,15"/>
 
-                            <CheckBox Content="Enable WMI process events"
+                            <CheckBox Content="{DynamicResource SettingsView_EnableWmi}"
                                       IsChecked="{Binding Settings.EnableWmiMonitoring}"
                                       Margin="0,0,0,5"/>
-                            <TextBlock Text="Use Windows Management Instrumentation for process start/stop events"
+                            <TextBlock Text="{DynamicResource SettingsView_WmiDescription}"
                                        Style="{StaticResource DescriptionStyle}"
                                        Margin="20,0,0,15"/>
 
-                            <CheckBox Content="Enable fallback polling"
+                            <CheckBox Content="{DynamicResource SettingsView_EnableFallback}"
                                       IsChecked="{Binding Settings.EnableFallbackPolling}"
                                       Margin="0,0,0,5"/>
-                            <TextBlock Text="Use polling as backup when WMI process events fail"
+                            <TextBlock Text="{DynamicResource SettingsView_FallbackDescription}"
                                        Style="{StaticResource DescriptionStyle}"
                                        Margin="20,0,0,15"/>
 
@@ -260,7 +260,7 @@
                                     <ColumnDefinition Width="Auto"/>
                                 </Grid.ColumnDefinitions>
 
-                                <TextBlock Text="Polling interval (ms):" VerticalAlignment="Center"/>
+                                <TextBlock Text="{DynamicResource SettingsView_PollingInterval}" VerticalAlignment="Center"/>
                                 <Slider Grid.Column="1"
                                         Value="{Binding Settings.PollingIntervalMs}"
                                         Minimum="1000" Maximum="30000"
@@ -279,7 +279,7 @@
                                     <ColumnDefinition Width="Auto"/>
                                 </Grid.ColumnDefinitions>
 
-                                <TextBlock Text="Fallback polling (ms):" VerticalAlignment="Center"/>
+                                <TextBlock Text="{DynamicResource SettingsView_FallbackPollingInterval}" VerticalAlignment="Center"/>
                                 <Slider Grid.Column="1"
                                         Value="{Binding Settings.FallbackPollingIntervalMs}"
                                         Minimum="5000" Maximum="60000"
@@ -296,10 +296,10 @@
 
                 <!-- Advanced Section -->
                 <StackPanel Width="372" Margin="0,0,16,16">
-                    <TextBlock Text="Advanced" Style="{StaticResource SectionHeaderStyle}" Margin="0,0,0,8"/>
+                    <TextBlock Text="{DynamicResource SettingsView_Advanced}" Style="{StaticResource SectionHeaderStyle}" Margin="0,0,0,8"/>
                     <Border Style="{StaticResource SettingsCardStyle}">
                         <StackPanel>
-                            <CheckBox Content="Enable notification history"
+                            <CheckBox Content="{DynamicResource SettingsView_NotificationHistory}"
                                       IsChecked="{Binding Settings.EnableNotificationHistory}"
                                       Margin="0,0,0,10"/>
 
@@ -310,7 +310,7 @@
                                     <ColumnDefinition Width="Auto"/>
                                 </Grid.ColumnDefinitions>
 
-                                <TextBlock Text="Max history items:" VerticalAlignment="Center"/>
+                                <TextBlock Text="{DynamicResource SettingsView_MaxHistory}" VerticalAlignment="Center"/>
                                 <Slider Grid.Column="1"
                                         Value="{Binding Settings.MaxNotificationHistoryItems}"
                                         Minimum="10" Maximum="1000"
@@ -322,19 +322,19 @@
                                            VerticalAlignment="Center" MinWidth="40"/>
                             </Grid>
 
-                            <CheckBox Content="Auto-hide notifications"
+                            <CheckBox Content="{DynamicResource SettingsView_AutoHide}"
                                       IsChecked="{Binding Settings.AutoHideNotifications}"
                                       Margin="0,10,0,5"/>
 
-                            <CheckBox Content="Enable notification sound"
+                            <CheckBox Content="{DynamicResource SettingsView_NotificationSound}"
                                       IsChecked="{Binding Settings.EnableNotificationSound}"
                                       Margin="0,0,0,5"/>
 
-                            <CheckBox Content="Enable debug logging"
+                            <CheckBox Content="{DynamicResource SettingsView_DebugLogging}"
                                       IsChecked="{Binding Settings.EnableDebugLogging}"
                                       Margin="0,0,0,5"/>
 
-                            <CheckBox Content="Enable performance counters"
+                            <CheckBox Content="{DynamicResource SettingsView_PerformanceCounters}"
                                       IsChecked="{Binding Settings.EnablePerformanceCounters}"
                                       Margin="0,0,0,10"/>
                         </StackPanel>
@@ -343,23 +343,61 @@
 
                 <!-- About Section -->
                 <StackPanel Width="372" Margin="0,0,16,16">
-                    <TextBlock Text="About" Style="{StaticResource SectionHeaderStyle}" Margin="0,0,0,8"/>
+                    <TextBlock Text="{DynamicResource SettingsView_About}" Style="{StaticResource SectionHeaderStyle}" Margin="0,0,0,8"/>
                     <Border Style="{StaticResource SettingsCardStyle}">
                         <StackPanel>
-                            <TextBlock Text="ThreadPilot" FontWeight="SemiBold" FontSize="14"/>
-                            <TextBlock Text="Version:" FontWeight="SemiBold" Margin="0,8,0,0"/>
+                            <TextBlock Text="{DynamicResource SettingsView_ThreadPilot}" FontWeight="SemiBold" FontSize="14"/>
+                            <TextBlock Text="{DynamicResource SettingsView_Version}" FontWeight="SemiBold" Margin="0,8,0,0"/>
                             <TextBlock Text="{Binding ApplicationVersion}" Margin="0,0,0,10"/>
 
-                            <TextBlock Text="Copyright © 2026 PrimeBuild" Margin="0,0,0,4"/>
-                            <TextBlock Text="License: AGPLv3" Style="{StaticResource DescriptionStyle}"/>
+                            <CheckBox Content="{DynamicResource SettingsView_EnableAutomaticUpdateChecks}"
+                                      IsChecked="{Binding Settings.EnableAutomaticUpdateChecks}"
+                                      Margin="0,0,0,6"/>
+
+                            <Grid Margin="20,0,0,8">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                </Grid.ColumnDefinitions>
+
+                                <TextBlock Text="{DynamicResource SettingsView_UpdateIntervalDays}" VerticalAlignment="Center"/>
+                                <Slider Grid.Column="1"
+                                        Value="{Binding Settings.UpdateCheckIntervalDays}"
+                                        Minimum="1" Maximum="30"
+                                        TickFrequency="1"
+                                        IsSnapToTickEnabled="True"
+                                        Margin="10,0"/>
+                                <TextBlock Grid.Column="2"
+                                           Text="{Binding Settings.UpdateCheckIntervalDays}"
+                                           VerticalAlignment="Center" MinWidth="30"/>
+                            </Grid>
+
+                            <CheckBox Content="{DynamicResource SettingsView_IncludePrereleaseUpdates}"
+                                      IsChecked="{Binding Settings.IncludePrereleaseUpdates}"
+                                      Margin="0,0,0,10"/>
+
+                            <TextBlock Text="{DynamicResource SettingsView_LatestVersion}" FontWeight="SemiBold" Margin="0,0,0,0"/>
+                            <TextBlock Text="{Binding LatestUpdateVersion}" Margin="0,0,0,6"/>
+                            <TextBlock Text="{DynamicResource SettingsView_LastUpdateCheck}" FontWeight="SemiBold" Margin="0,0,0,0"/>
+                            <TextBlock Text="{Binding LastUpdateCheckText}" Margin="0,0,0,10"/>
+
+                            <TextBlock Text="{DynamicResource SettingsView_Copyright}" Margin="0,0,0,4"/>
+                            <TextBlock Text="{DynamicResource SettingsView_License}" Style="{StaticResource DescriptionStyle}"/>
 
                             <Separator Margin="0,12,0,12"/>
 
-                            <Button Content="Check for updates"
+                            <Button Content="{DynamicResource SettingsView_CheckUpdates}"
                                     Command="{Binding CheckUpdatesCommand}"
                                     Padding="15,6"
                                     HorizontalAlignment="Left"/>
-                            <TextBlock Text="Checks on demand using the official GitHub Releases."
+                            <Button Content="{DynamicResource SettingsView_DownloadInstallUpdate}"
+                                    Command="{Binding DownloadAndInstallUpdateCommand}"
+                                    IsEnabled="{Binding CanDownloadAndInstallUpdate}"
+                                    Padding="15,6"
+                                    HorizontalAlignment="Left"
+                                    Margin="0,8,0,0"/>
+                            <TextBlock Text="{DynamicResource SettingsView_UpdatesDescription}"
                                        Style="{StaticResource DescriptionStyle}"
                                        Margin="0,6,0,0"/>
                         </StackPanel>
@@ -412,22 +450,22 @@
             
             <!-- Buttons -->
             <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right">
-                <Button Content="Reset to Defaults" 
+                <Button Content="{DynamicResource SettingsView_ResetDefaults}" 
                         Command="{Binding ResetToDefaultsCommand}"
                         Margin="0,0,10,0" 
                         Padding="15,8"/>
                 
-                <Button Content="Export Configuration" 
+                <Button Content="{DynamicResource SettingsView_ExportConfig}" 
                         Command="{Binding ExportSettingsCommand}"
                         Margin="0,0,10,0" 
                         Padding="15,8"/>
                 
-                <Button Content="Import Configuration" 
+                <Button Content="{DynamicResource SettingsView_ImportConfig}" 
                         Command="{Binding ImportSettingsCommand}"
                         Margin="0,0,20,0" 
                         Padding="15,8"/>
                 
-                <Button Content="Save Settings"
+                <Button Content="{DynamicResource SettingsView_SaveSettings}"
                         Command="{Binding SaveSettingsCommand}"
                         IsEnabled="{Binding CanSaveSettings}"
                         Padding="20,8"/>
diff --git a/Views/SettingsWindow.xaml b/Views/SettingsWindow.xaml
index 84a7dc3..4c7cb60 100644
--- a/Views/SettingsWindow.xaml
+++ b/Views/SettingsWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:ThreadPilot.Views"
         mc:Ignorable="d"
-        Title="ThreadPilot Settings" 
+        Title="{DynamicResource SettingsWindow_Title}" 
         Height="700" Width="900"
         MinHeight="600" MinWidth="800"
         WindowStartupLocation="CenterOwner"
@@ -25,7 +25,7 @@
               Visibility="Collapsed"
               Background="{DynamicResource OverlayBrush}"
               Panel.ZIndex="10"
-              AutomationProperties.Name="Unsaved settings dialog">
+              AutomationProperties.Name="{DynamicResource MainWindow_UnsavedSettingsDialog}">
             <Border Background="{DynamicResource CardSurfaceBrush}"
                     BorderBrush="{DynamicResource BorderSubtleBrush}"
                     BorderThickness="1"
@@ -39,29 +39,29 @@
                     <DropShadowEffect BlurRadius="12" ShadowDepth="0" Opacity="0.18"/>
                 </Border.Effect>
                 <StackPanel>
-                    <TextBlock Text="Unsaved Settings"
+                    <TextBlock Text="{DynamicResource SettingsWindow_UnsavedTitle}"
                                FontSize="22"
                                FontWeight="SemiBold"
                                Foreground="{DynamicResource TextFillColorPrimaryBrush}"
                                Margin="0,0,0,10"/>
-                    <TextBlock Text="You have unsaved changes. Save before closing, discard the changes, or cancel to keep editing."
+                    <TextBlock Text="{DynamicResource SettingsWindow_UnsavedDescription}"
                                TextWrapping="Wrap"
                                Foreground="{DynamicResource TextFillColorSecondaryBrush}"
                                Margin="0,0,0,18"/>
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-                        <Button Content="Cancel"
+                        <Button Content="{DynamicResource SettingsWindow_Cancel}"
                                 Click="UnsavedSettingsCancel_Click"
                                 Background="{DynamicResource ControlFillColorDefaultBrush}"
                                 Foreground="{DynamicResource TextFillColorPrimaryBrush}"
                                 Padding="16,8"
                                 Margin="0,0,10,0"/>
-                        <Button Content="Discard"
+                        <Button Content="{DynamicResource SettingsWindow_Discard}"
                                 Click="UnsavedSettingsDiscard_Click"
                                 Background="{DynamicResource ControlFillColorDefaultBrush}"
                                 Foreground="{DynamicResource TextFillColorPrimaryBrush}"
                                 Padding="16,8"
                                 Margin="0,0,10,0"/>
-                        <Button Content="Save"
+                        <Button Content="{DynamicResource SettingsWindow_Save}"
                                 Click="UnsavedSettingsSave_Click"
                                 Background="{DynamicResource AccentFillColorDefaultBrush}"
                                 Foreground="{DynamicResource TextOnAccentFillColorPrimaryBrush}"
diff --git a/Views/SystemTweaksView.xaml b/Views/SystemTweaksView.xaml
index ed1ad76..def8a93 100644
--- a/Views/SystemTweaksView.xaml
+++ b/Views/SystemTweaksView.xaml
@@ -103,18 +103,18 @@
                     </Grid.ColumnDefinitions>
 
                     <StackPanel Grid.Column="0">
-                        <TextBlock Text="System Tweaks &amp; Optimizations"
+                        <TextBlock Text="{DynamicResource SystemTweaksView_Title}"
                                    Style="{StaticResource PageTitleTextStyle}"
                                    Margin="0,0,0,4"/>
-                        <TextBlock Text="Configure Windows system optimizations and performance tweaks"
+                        <TextBlock Text="{DynamicResource SystemTweaksView_Subtitle}"
                                    Style="{StaticResource PageSubtitleTextStyle}"/>
                     </StackPanel>
 
                     <Button Grid.Column="1"
-                            Content="Refresh All"
+                            Content="{DynamicResource SystemTweaksView_RefreshAll}"
                             Command="{Binding RefreshAllTweaksCommand}"
                             Padding="12,6"
-                            ToolTip="Refresh all tweak states"
+                            ToolTip="{DynamicResource SystemTweaksView_RefreshAllTooltip}"
                             IsEnabled="{Binding IsRefreshing, Converter={StaticResource InverseBooleanConverter}}"/>
                 </Grid>
 
@@ -127,7 +127,7 @@
                     </Grid.ColumnDefinitions>
 
                     <TextBlock Grid.Column="0"
-                               Text="Status"
+                               Text="{DynamicResource SystemTweaksView_Status}"
                                FontWeight="SemiBold"
                                VerticalAlignment="Center"/>
 
@@ -227,7 +227,7 @@
                                               VerticalAlignment="Center"
                                               HorizontalAlignment="Right"
                                               Margin="10,0,0,0"
-                                              ToolTip="Toggle this Windows tweak"/>
+                                              ToolTip="{DynamicResource SystemTweaksView_TweakTooltip}"/>
                                 </Grid>
 
                                  <TextBlock Text="{Binding ErrorMessage}"
diff --git a/app.manifest b/app.manifest
index 5816daa..59561ee 100644
--- a/app.manifest
+++ b/app.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.3.0.0" name="ThreadPilot.app"/>
+  <assemblyIdentity version="1.4.0.0" name="ThreadPilot.app"/>
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
diff --git a/build/build-installer.ps1 b/build/build-installer.ps1
index 1fbdb8e..68818be 100644
--- a/build/build-installer.ps1
+++ b/build/build-installer.ps1
@@ -1,5 +1,5 @@
 param(
-    [string]$Version = "1.3.0",
+    [string]$Version = "1.4.0",
     [string]$Configuration = "Release",
     [switch]$SkipPublish
 )
diff --git a/build/build-release.ps1 b/build/build-release.ps1
index ec4dd78..35430d8 100644
--- a/build/build-release.ps1
+++ b/build/build-release.ps1
@@ -1,5 +1,5 @@
 param(
-    [string]$Version = "1.3.0",
+    [string]$Version = "1.4.0",
     [string]$Configuration = "Release",
     [string]$Runtime = "win-x64"
 )
@@ -65,18 +65,13 @@ echo [2/4] Removing startup task and startup registry entry...
 schtasks /Delete /TN "ThreadPilot_Startup" /F >nul 2>&1
 reg delete "HKCU\Software\Microsoft\Windows\CurrentVersion\Run" /v "ThreadPilot" /f >nul 2>&1
 
-echo [3/4] Optional user data cleanup...
-set "REMOVE_DATA=N"
-set /p REMOVE_DATA=Do you want to remove user settings at "%APPDATA%\ThreadPilot"? [y/N]:
-if /I "%REMOVE_DATA%"=="Y" (
-    if exist "%APPDATA%\ThreadPilot" (
-        rd /s /q "%APPDATA%\ThreadPilot"
-        echo User settings removed.
-    ) else (
-        echo No user settings folder found.
-    )
+echo [3/4] Removing ThreadPilot user data for this Windows account...
+rem Full uninstall removes only ThreadPilot-owned per-user AppData. Normal install/update paths never run this script.
+if exist "%APPDATA%\ThreadPilot" (
+    rd /s /q "%APPDATA%\ThreadPilot"
+    echo ThreadPilot user data removed.
 ) else (
-    echo User settings were kept.
+    echo No ThreadPilot user data folder found.
 )
 
 echo [4/4] Scheduling app folder removal...
diff --git a/build/package-release-zips.ps1 b/build/package-release-zips.ps1
index 54c8d59..214aec3 100644
--- a/build/package-release-zips.ps1
+++ b/build/package-release-zips.ps1
@@ -1,5 +1,5 @@
 param(
-    [string]$Version = "1.3.0"
+    [string]$Version = "1.4.0"
 )
 
 $ErrorActionPreference = "Stop"
@@ -38,18 +38,13 @@ echo [2/4] Removing startup task and startup registry entry...
 schtasks /Delete /TN "ThreadPilot_Startup" /F >nul 2>&1
 reg delete "HKCU\Software\Microsoft\Windows\CurrentVersion\Run" /v "ThreadPilot" /f >nul 2>&1
 
-echo [3/4] Optional user data cleanup...
-set "REMOVE_DATA=N"
-set /p REMOVE_DATA=Do you want to remove user settings at "%APPDATA%\ThreadPilot"? [y/N]:
-if /I "%REMOVE_DATA%"=="Y" (
-    if exist "%APPDATA%\ThreadPilot" (
-        rd /s /q "%APPDATA%\ThreadPilot"
-        echo User settings removed.
-    ) else (
-        echo No user settings folder found.
-    )
+echo [3/4] Removing ThreadPilot user data for this Windows account...
+rem Full uninstall removes only ThreadPilot-owned per-user AppData. Normal install/update paths never run this script.
+if exist "%APPDATA%\ThreadPilot" (
+    rd /s /q "%APPDATA%\ThreadPilot"
+    echo ThreadPilot user data removed.
 ) else (
-    echo User settings were kept.
+    echo No ThreadPilot user data folder found.
 )
 
 echo [4/4] Scheduling app folder removal...
diff --git a/chocolatey/threadpilot.nuspec b/chocolatey/threadpilot.nuspec
index e51f187..8ca6856 100644
--- a/chocolatey/threadpilot.nuspec
+++ b/chocolatey/threadpilot.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
   <metadata>
     <id>threadpilot</id>
-    <version>1.3.0</version>
+    <version>1.4.0</version>
     <title>Codestin Search App</title>
     <authors>Prime Build</authors>
     <projectUrl>https://github.com/PrimeBuild-pc/ThreadPilot</projectUrl>
@@ -15,7 +15,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Advanced Windows process and power plan manager with rules automation and performance controls.</description>
     <summary>ThreadPilot process and power plan manager.</summary>
-    <releaseNotes>https://github.com/PrimeBuild-pc/ThreadPilot/releases/tag/v1.3.0</releaseNotes>
+    <releaseNotes>https://github.com/PrimeBuild-pc/ThreadPilot/releases/tag/v1.4.0</releaseNotes>
     <tags>threadpilot process powerplan performance windows</tags>
   </metadata>
   <files>
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 490dda5..587ad60 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -2,6 +2,62 @@
 
 All notable changes to this project are documented in this file.
 
+## v1.4.0 - Safe in-app updater
+
+### Added
+
+- Added safe in-app updater support.
+- Added manual update checks from Settings.
+- Added optional background update checks with a default 7-day interval.
+- Added latest/current version display in Settings.
+- Added update download and install flow with explicit user confirmation.
+- Added updater documentation.
+
+### Security
+
+- Update metadata is fetched only from the official PrimeBuild-pc/ThreadPilot GitHub repository.
+- Prereleases are excluded by default.
+- Installer assets are selected from GitHub HTTPS release assets.
+- SHA256 checksums are verified when SHA256SUMS.txt is available.
+- Checksum mismatches are rejected.
+- Authenticode signature verification is performed on a best-effort basis, rejecting explicitly invalid signatures.
+- Installer launch uses ProcessStartInfo without shell command construction.
+- Concurrent update attempts are prevented.
+
+### User data preservation
+
+- Updates preserve AppData, settings, profiles, CPU masks, rules, custom/imported power plans, and logs.
+- Only updater temporary files are cleaned by the update flow.
+- Full uninstall behavior remains separate.
+
+### Changed
+
+- Project version updated to 1.4.0.
+- Installer, packaging, Chocolatey, and release metadata updated to v1.4.0.
+
+### Verification
+
+- Build passed.
+- Automated tests passed.
+
+## v1.3.1 - Localization and installer metadata hotfix
+
+### Fixed
+
+- Completed Simplified Chinese localization coverage for primary WPF views, dialogs, context menus, tooltips, tray menu text, status text, and user-facing service messages.
+- Changed Inno Setup display metadata so installed apps list ThreadPilot as `ThreadPilot` while keeping `1.3.1` in version metadata.
+- Added guarded cleanup for obsolete `ThreadPilot 0.1.0-beta` uninstall registry metadata only when it clearly matches the old ThreadPilot display name and Program Files install path.
+
+### Changed
+
+- Project, package, installer, Chocolatey, Sonar, and app manifest metadata updated to 1.3.1.
+- Full uninstall removes ThreadPilot-owned AppData/settings for the uninstalling user account and removes ThreadPilot startup entries; normal install/update preserves user data.
+
+### Safety
+
+- No automatic in-app updating was added.
+- No elevation, affinity, process control, power plan, or system tweak behavior was changed.
+
 ## v1.3.0 - Localization support
 
 ### Added
diff --git a/docs/UPDATES.md b/docs/UPDATES.md
new file mode 100644
index 0000000..3dd20c3
--- /dev/null
+++ b/docs/UPDATES.md
@@ -0,0 +1,50 @@
+# ThreadPilot In-App Updates
+
+ThreadPilot checks the official `PrimeBuild-pc/ThreadPilot` GitHub Releases feed for stable releases.
+
+## Check Behavior
+
+- Manual checks run from Settings.
+- Startup checks run in the background only when automatic checks are enabled and the last check was more than the configured interval ago.
+- The default interval is 7 days.
+- Prereleases are excluded by default.
+- Startup checks do not block app startup and never install updates.
+
+## Install Flow
+
+1. ThreadPilot reads release metadata from `PrimeBuild-pc/ThreadPilot`.
+2. The updater selects a ThreadPilot installer asset from that release.
+3. The installer downloads into a ThreadPilot-owned temp update directory.
+4. If `SHA256SUMS.txt` is present in the release, ThreadPilot verifies the installer hash before launch.
+5. ThreadPilot performs best-effort Authenticode verification. Invalid signatures are rejected; unsigned or unverifiable files are reported as unknown.
+6. The user must confirm the update from Settings before download/install starts.
+7. Windows shows the normal UAC prompt when the installer is launched elevated.
+8. ThreadPilot requests shutdown after the installer starts so the installer can replace app files.
+
+## Data Preservation
+
+Updates do not delete ThreadPilot user data. The updater only cleans its own temporary download directory.
+
+The following user-owned ThreadPilot data is preserved during update:
+
+- settings;
+- profiles;
+- CPU masks;
+- rules;
+- imported or custom power plans;
+- logs, subject to the app's normal log retention policy.
+
+Full uninstall remains the path that removes ThreadPilot-owned AppData/settings. Update code must not call uninstall cleanup or remove `%AppData%\ThreadPilot`.
+
+## Security Notes
+
+- Update metadata is fetched only for the official `PrimeBuild-pc/ThreadPilot` repository.
+- Asset URLs must be HTTPS GitHub release asset URLs.
+- Installer file names must be safe file names and must match ThreadPilot installer naming.
+- The updater does not invoke a shell command line to download files.
+- The installer is launched with `ProcessStartInfo.ArgumentList` and `UseShellExecute=true` for UAC elevation.
+- Concurrent update installation attempts are rejected.
+
+## Known Limitation
+
+If Windows keeps the elevated installer file locked after launch, immediate temp cleanup can fail. ThreadPilot logs the cleanup failure and leaves only the ThreadPilot update temp directory behind.
diff --git a/docs/release/PACKAGING.md b/docs/release/PACKAGING.md
index 5df81e1..a61fe1e 100644
--- a/docs/release/PACKAGING.md
+++ b/docs/release/PACKAGING.md
@@ -178,9 +178,9 @@ Generate manifests locally with:
 
 ```powershell
 ./build/generate-winget-manifests.ps1 `
-  -Version "1.3.0" `
-  -Tag "v1.3.0" `
-  -InstallerUrl "https://github.com/PrimeBuild-pc/ThreadPilot/releases/download/v1.3.0/ThreadPilot_v1.3.0_Setup.exe" `
+  -Version "1.4.0" `
+  -Tag "v1.4.0" `
+  -InstallerUrl "https://github.com/PrimeBuild-pc/ThreadPilot/releases/download/v1.4.0/ThreadPilot_v1.4.0_Setup.exe" `
   -InstallerSha256 "<sha256>" `
   -OutputRoot "winget-manifests"
 ```
@@ -224,9 +224,9 @@ Local packaging-only validation:
 
 ```powershell
 ./build/publish-chocolatey.ps1 `
-  -Version "1.3.0" `
-  -Tag "v1.3.0" `
-  -InstallerPath ".\artifacts\release\installer\ThreadPilot_v1.3.0_Setup.exe" `
+  -Version "1.4.0" `
+  -Tag "v1.4.0" `
+  -InstallerPath ".\artifacts\release\installer\ThreadPilot_v1.4.0_Setup.exe" `
   -DryRun `
   -PackageOutputDirectory ".\artifacts\choco-dryrun" `
   -MetadataOutputPath ".\artifacts\choco-dryrun\chocolatey-package-metadata.json"
@@ -250,9 +250,9 @@ Public publish path:
 
 ```powershell
 ./build/publish-chocolatey.ps1 `
-  -Version "1.3.0" `
-  -Tag "v1.3.0" `
-  -InstallerPath ".\artifacts\release\installer\ThreadPilot_v1.3.0_Setup.exe" `
+  -Version "1.4.0" `
+  -Tag "v1.4.0" `
+  -InstallerPath ".\artifacts\release\installer\ThreadPilot_v1.4.0_Setup.exe" `
   -ApiKey "<chocolatey-api-key>"
 ```
 
diff --git a/docs/release/RELEASE_NOTES.md b/docs/release/RELEASE_NOTES.md
index 193ee1d..358b482 100644
--- a/docs/release/RELEASE_NOTES.md
+++ b/docs/release/RELEASE_NOTES.md
@@ -1,48 +1,37 @@
-# ThreadPilot v1.3.0 Release Notes Draft
+## ThreadPilot v1.4.0
 
-## Highlights
+### Added
 
-- Added localization infrastructure with English and Simplified Chinese resources.
-- English remains the default language.
-- Simplified Chinese is available as an optional display language through Settings.
-- Selected user-facing notification messages now use localized resources.
-- Localization fallback behavior is covered by expanded tests.
+- Added safe in-app updater support.
+- Added manual update checks from Settings.
+- Added optional background update checks with a default 7-day interval.
+- Added latest/current version display in Settings.
+- Added update download and install flow with explicit user confirmation.
+- Added updater documentation.
 
-## Added
+### Security
 
-- Added localization infrastructure.
-- Added English and Simplified Chinese resource dictionaries.
-- Added language selector in Settings.
-- Added localized notification support for selected user-facing messages.
-- Added tests for localization fallback, language persistence, Settings language selection, and localized notifications.
+- Update metadata is fetched only from the official PrimeBuild-pc/ThreadPilot GitHub repository.
+- Prereleases are excluded by default.
+- Installer assets are selected from GitHub HTTPS release assets.
+- SHA256 checksums are verified when SHA256SUMS.txt is available.
+- Checksum mismatches are rejected.
+- Authenticode signature verification is performed on a best-effort basis, rejecting explicitly invalid signatures.
+- Installer launch uses ProcessStartInfo without shell command construction.
+- Concurrent update attempts are prevented.
 
-## Changed
+### User data preservation
 
-- English remains the default application language.
-- Simplified Chinese is available as an optional display language.
-- Project version updated to 1.3.0.
+- Updates preserve AppData, settings, profiles, CPU masks, rules, custom/imported power plans, and logs.
+- Only updater temporary files are cleaned by the update flow.
+- Full uninstall behavior remains separate.
 
-## Safety
+### Changed
 
-- Unsupported or invalid language settings now fall back to English.
-- Missing translation keys fall back safely to English or the key.
-- No changes to elevation, system tweaks, affinity, or privileged operation behavior.
+- Project version updated to 1.4.0.
+- Installer, packaging, Chocolatey, and release metadata updated to v1.4.0.
 
-## Compatibility and Upgrade Notes
+### Verification
 
-- Requires Windows 11 build 22000 or newer.
-- Existing settings continue to load.
-- Existing installations without a language setting default to English.
-- Existing process, affinity, power plan, and automation behavior is unchanged.
-
-## Known Non-Goals
-
-- No anti-cheat bypass.
-- No Windows Service.
-- No registry or IFEO persistence.
-- No generated release artifacts yet.
-- No GitHub release or tag yet.
-
-## Release Artifact Status
-
-- Installer, portable ZIP, checksums, package metadata verification, and release upload remain pending manual validation.
+- Build passed.
+- Automated tests passed.
diff --git a/docs/releases/v1.3.1.md b/docs/releases/v1.3.1.md
new file mode 100644
index 0000000..c186a41
--- /dev/null
+++ b/docs/releases/v1.3.1.md
@@ -0,0 +1,41 @@
+# ThreadPilot v1.3.1 Release Notes Draft
+
+## Highlights
+
+- Completed the Simplified Chinese localization pass for the main WPF views, dialogs, context menus, tray menu, tooltips, accessibility text, status text, and user-facing service notifications.
+- Kept English as the default startup language and Simplified Chinese as an optional Settings choice.
+- Changed installer display metadata so installed apps list ThreadPilot as `ThreadPilot` while preserving version metadata separately as `1.3.1`.
+- Improved uninstall cleanup for ThreadPilot-owned application files, shortcuts, startup entries, and per-user AppData/settings when the uninstaller runs.
+
+## Fixed
+
+- Fixed incomplete zh-CN coverage that left many v1.3.0 UI surfaces in English.
+- Fixed Inno Setup `AppVerName` so uninstall tools do not show versioned names such as `ThreadPilot 1.3.1`.
+- Added guarded cleanup for the obsolete `ThreadPilot 0.1.0-beta` uninstall registry entry only when it exactly matches the legacy ThreadPilot display name and Program Files install location.
+
+## Safety
+
+- No automatic in-app updater was added.
+- No elevation, affinity, process control, power plan, or system tweak behavior was changed.
+- Normal install/update preserves existing user settings and data.
+- Full uninstall removes only ThreadPilot-owned AppData for the uninstalling user account; elevated uninstall contexts may not be able to clean another Windows user's per-user AppData.
+
+## Testing
+
+- Added resource key parity coverage for `Locales/en-US.xaml` and `Locales/zh-CN.xaml`.
+- Added hardcoded-English checks for important WPF views with brand and technical terms whitelisted.
+- Added release metadata tests for installer display name, uninstall cleanup scope, legacy beta uninstall-entry cleanup, and v1.3.1 version surfaces.
+
+## Compatibility and Upgrade Notes
+
+- Requires Windows 11 build 22000 or newer.
+- Existing settings, profiles, masks, persistent rules, imported power plans, and logs continue to load after update.
+- Existing process, affinity, power plan, automation, and system tweak behavior is unchanged.
+
+## Known Non-Goals
+
+- No GitHub release or tag is created by this hotfix branch.
+- No automatic in-app updating.
+- No anti-cheat bypass.
+- No Windows Service.
+- No registry or IFEO persistence.
diff --git a/docs/releases/v1.4.0.md b/docs/releases/v1.4.0.md
new file mode 100644
index 0000000..358b482
--- /dev/null
+++ b/docs/releases/v1.4.0.md
@@ -0,0 +1,37 @@
+## ThreadPilot v1.4.0
+
+### Added
+
+- Added safe in-app updater support.
+- Added manual update checks from Settings.
+- Added optional background update checks with a default 7-day interval.
+- Added latest/current version display in Settings.
+- Added update download and install flow with explicit user confirmation.
+- Added updater documentation.
+
+### Security
+
+- Update metadata is fetched only from the official PrimeBuild-pc/ThreadPilot GitHub repository.
+- Prereleases are excluded by default.
+- Installer assets are selected from GitHub HTTPS release assets.
+- SHA256 checksums are verified when SHA256SUMS.txt is available.
+- Checksum mismatches are rejected.
+- Authenticode signature verification is performed on a best-effort basis, rejecting explicitly invalid signatures.
+- Installer launch uses ProcessStartInfo without shell command construction.
+- Concurrent update attempts are prevented.
+
+### User data preservation
+
+- Updates preserve AppData, settings, profiles, CPU masks, rules, custom/imported power plans, and logs.
+- Only updater temporary files are cleaned by the update flow.
+- Full uninstall behavior remains separate.
+
+### Changed
+
+- Project version updated to 1.4.0.
+- Installer, packaging, Chocolatey, and release metadata updated to v1.4.0.
+
+### Verification
+
+- Build passed.
+- Automated tests passed.
diff --git a/sonar-project.properties b/sonar-project.properties
index 6425be6..3294c87 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -1,6 +1,6 @@
 sonar.projectKey=threadpilot
 sonar.projectName=ThreadPilot
-sonar.projectVersion=1.3.0
+sonar.projectVersion=1.4.0
 
 sonar.sourceEncoding=UTF-8
 sonar.sources=.