SEBWIN-220: Renamed "ProgressIndicator_..." text keys to "OperationStatus_...".

SafeExamBrowser.Client.UnitTests/ClientControllerTests.cs

@@ -170,7 +170,7 @@ namespace SafeExamBrowser.Client.UnitTests
 		//[TestCleanup]
 		//public void Cleanup()
 		//{
-		//	// TODO sut.Stop();
+		//	// sut.Stop();
 		//}
 	}
 }

SafeExamBrowser.Client/Operations/BrowserOperation.cs

@@ -45,7 +45,7 @@ namespace SafeExamBrowser.Client.Operations
 		public OperationResult Perform()
 		{
 			logger.Info("Initializing browser...");
-			StatusChanged?.Invoke(TextKey.ProgressIndicator_InitializeBrowser);
+			StatusChanged?.Invoke(TextKey.OperationStatus_InitializeBrowser);
 
 			var browserButton = uiFactory.CreateApplicationButton(browserInfo);
 
@@ -65,7 +65,7 @@ namespace SafeExamBrowser.Client.Operations
 		public void Revert()
 		{
 			logger.Info("Terminating browser...");
-			StatusChanged?.Invoke(TextKey.ProgressIndicator_TerminateBrowser);
+			StatusChanged?.Invoke(TextKey.OperationStatus_TerminateBrowser);
 
 			browserController.Terminate();
 		}

SafeExamBrowser.Client/Operations/ClientHostDisconnectionOperation.cs

@@ -11,6 +11,7 @@ using SafeExamBrowser.Contracts.Communication.Events;
 using SafeExamBrowser.Contracts.Communication.Hosts;
 using SafeExamBrowser.Contracts.Core.OperationModel;
 using SafeExamBrowser.Contracts.Core.OperationModel.Events;
+using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.Logging;
 
 namespace SafeExamBrowser.Client.Operations
@@ -26,7 +27,7 @@ namespace SafeExamBrowser.Client.Operations
 		private int timeout_ms;
 
 		public event ActionRequiredEventHandler ActionRequired { add { } remove { } }
-		public event StatusChangedEventHandler StatusChanged { add { } remove { } }
+		public event StatusChangedEventHandler StatusChanged;
 
 		public ClientHostDisconnectionOperation(IClientHost clientHost, ILogger logger, int timeout_ms)
 		{
@@ -51,7 +52,7 @@ namespace SafeExamBrowser.Client.Operations
 			var disconnectedEvent = new AutoResetEvent(false);
 			var disconnectedEventHandler = new CommunicationEventHandler(() => disconnectedEvent.Set());
 
-			// TODO: Update status!
+			StatusChanged?.Invoke(TextKey.OperationStatus_WaitRuntimeDisconnection);
 
 			clientHost.RuntimeDisconnected += disconnectedEventHandler;
 

SafeExamBrowser.Client/Operations/ClipboardOperation.cs

@@ -48,7 +48,7 @@ namespace SafeExamBrowser.Client.Operations
 		private void EmptyClipboard()
 		{
 			logger.Info("Emptying clipboard...");
-			StatusChanged?.Invoke(TextKey.ProgressIndicator_EmptyClipboard);
+			StatusChanged?.Invoke(TextKey.OperationStatus_EmptyClipboard);
 
 			nativeMethods.EmptyClipboard();
 		}

SafeExamBrowser.Client/Operations/ConfigurationOperation.cs

@@ -35,7 +35,7 @@ namespace SafeExamBrowser.Client.Operations
 		public OperationResult Perform()
 		{
 			logger.Info("Initializing application configuration...");
-			StatusChanged?.Invoke(TextKey.ProgressIndicator_InitializeConfiguration);
+			StatusChanged?.Invoke(TextKey.OperationStatus_InitializeConfiguration);
 
 			try
 			{

SafeExamBrowser.Client/Operations/DisplayMonitorOperation.cs

@@ -34,7 +34,7 @@ namespace SafeExamBrowser.Client.Operations
 		public OperationResult Perform()
 		{
 			logger.Info("Initializing working area...");
-			StatusChanged?.Invoke(TextKey.ProgressIndicator_InitializeWorkingArea);
+			StatusChanged?.Invoke(TextKey.OperationStatus_InitializeWorkingArea);
 
 			displayMonitor.PreventSleepMode();
 			displayMonitor.InitializePrimaryDisplay(taskbar.GetAbsoluteHeight());
@@ -51,7 +51,7 @@ namespace SafeExamBrowser.Client.Operations
 		public void Revert()
 		{
 			logger.Info("Restoring working area...");
-			StatusChanged?.Invoke(TextKey.ProgressIndicator_RestoreWorkingArea);
+			StatusChanged?.Invoke(TextKey.OperationStatus_RestoreWorkingArea);
 
 			displayMonitor.StopMonitoringDisplayChanges();
 			displayMonitor.ResetPrimaryDisplay();

SafeExamBrowser.Client/Operations/KeyboardInterceptorOperation.cs

@@ -37,7 +37,7 @@ namespace SafeExamBrowser.Client.Operations
 		public OperationResult Perform()
 		{
 			logger.Info("Starting keyboard interception...");
-			StatusChanged?.Invoke(TextKey.ProgressIndicator_StartKeyboardInterception);
+			StatusChanged?.Invoke(TextKey.OperationStatus_StartKeyboardInterception);
 
 			nativeMethods.RegisterKeyboardHook(keyboardInterceptor);
 
@@ -52,7 +52,7 @@ namespace SafeExamBrowser.Client.Operations
 		public void Revert()
 		{
 			logger.Info("Stopping keyboard interception...");
-			StatusChanged?.Invoke(TextKey.ProgressIndicator_StopKeyboardInterception);
+			StatusChanged?.Invoke(TextKey.OperationStatus_StopKeyboardInterception);
 
 			nativeMethods.DeregisterKeyboardHook(keyboardInterceptor);
 		}

SafeExamBrowser.Client/Operations/MouseInterceptorOperation.cs

@@ -37,7 +37,7 @@ namespace SafeExamBrowser.Client.Operations
 		public OperationResult Perform()
 		{
 			logger.Info("Starting mouse interception...");
-			StatusChanged?.Invoke(TextKey.ProgressIndicator_StartMouseInterception);
+			StatusChanged?.Invoke(TextKey.OperationStatus_StartMouseInterception);
 
 			nativeMethods.RegisterMouseHook(mouseInterceptor);
 
@@ -52,7 +52,7 @@ namespace SafeExamBrowser.Client.Operations
 		public void Revert()
 		{
 			logger.Info("Stopping mouse interception...");
-			StatusChanged?.Invoke(TextKey.ProgressIndicator_StopMouseInterception);
+			StatusChanged?.Invoke(TextKey.OperationStatus_StopMouseInterception);
 
 			nativeMethods.DeregisterMouseHook(mouseInterceptor);
 		}

SafeExamBrowser.Client/Operations/ProcessMonitorOperation.cs

@@ -34,7 +34,7 @@ namespace SafeExamBrowser.Client.Operations
 		public OperationResult Perform()
 		{
 			logger.Info("Initializing process monitoring...");
-			StatusChanged?.Invoke(TextKey.ProgressIndicator_InitializeProcessMonitoring);
+			StatusChanged?.Invoke(TextKey.OperationStatus_InitializeProcessMonitoring);
 
 			if (settings.KioskMode == KioskMode.DisableExplorerShell)
 			{
@@ -52,7 +52,7 @@ namespace SafeExamBrowser.Client.Operations
 		public void Revert()
 		{
 			logger.Info("Stopping process monitoring...");
-			StatusChanged?.Invoke(TextKey.ProgressIndicator_StopProcessMonitoring);
+			StatusChanged?.Invoke(TextKey.OperationStatus_StopProcessMonitoring);
 
 			if (settings.KioskMode == KioskMode.DisableExplorerShell)
 			{

SafeExamBrowser.Client/Operations/RuntimeConnectionOperation.cs

@@ -35,7 +35,7 @@ namespace SafeExamBrowser.Client.Operations
 		public OperationResult Perform()
 		{
 			logger.Info("Initializing runtime connection...");
-			StatusChanged?.Invoke(TextKey.ProgressIndicator_InitializeRuntimeConnection);
+			StatusChanged?.Invoke(TextKey.OperationStatus_InitializeRuntimeConnection);
 
 			connected = runtime.Connect(token);
 
@@ -59,7 +59,7 @@ namespace SafeExamBrowser.Client.Operations
 		public void Revert()
 		{
 			logger.Info("Closing runtime connection...");
-			StatusChanged?.Invoke(TextKey.ProgressIndicator_CloseRuntimeConnection);
+			StatusChanged?.Invoke(TextKey.OperationStatus_CloseRuntimeConnection);
 
 			if (connected)
 			{

SafeExamBrowser.Client/Operations/TaskbarOperation.cs

@@ -65,7 +65,7 @@ namespace SafeExamBrowser.Client.Operations
 		public OperationResult Perform()
 		{
 			logger.Info("Initializing taskbar...");
-			StatusChanged?.Invoke(TextKey.ProgressIndicator_InitializeTaskbar);
+			StatusChanged?.Invoke(TextKey.OperationStatus_InitializeTaskbar);
 
 			if (settings.AllowApplicationLog)
 			{
@@ -98,7 +98,7 @@ namespace SafeExamBrowser.Client.Operations
 		public void Revert()
 		{
 			logger.Info("Terminating taskbar...");
-			StatusChanged?.Invoke(TextKey.ProgressIndicator_TerminateTaskbar);
+			StatusChanged?.Invoke(TextKey.OperationStatus_TerminateTaskbar);
 
 			if (settings.AllowApplicationLog)
 			{

SafeExamBrowser.Client/Operations/WindowMonitorOperation.cs

@@ -34,7 +34,7 @@ namespace SafeExamBrowser.Client.Operations
 		public OperationResult Perform()
 		{
 			logger.Info("Initializing window monitoring...");
-			StatusChanged?.Invoke(TextKey.ProgressIndicator_InitializeWindowMonitoring);
+			StatusChanged?.Invoke(TextKey.OperationStatus_InitializeWindowMonitoring);
 
 			if (kioskMode == KioskMode.DisableExplorerShell)
 			{
@@ -57,7 +57,7 @@ namespace SafeExamBrowser.Client.Operations
 		public void Revert()
 		{
 			logger.Info("Stopping window monitoring...");
-			StatusChanged?.Invoke(TextKey.ProgressIndicator_StopWindowMonitoring);
+			StatusChanged?.Invoke(TextKey.OperationStatus_StopWindowMonitoring);
 
 			if (kioskMode != KioskMode.None)
 			{

SafeExamBrowser.Communication/Proxies/ServiceProxy.cs

@@ -51,7 +51,7 @@ namespace SafeExamBrowser.Communication.Proxies
 				return new CommunicationResult(true);
 			}
 
-			// TODO: Implement service communication
+			// Implement service communication...
 			// Send(new StartSessionMessage { Id = sessionId, Settings = settings });
 
 			throw new NotImplementedException();
@@ -64,7 +64,7 @@ namespace SafeExamBrowser.Communication.Proxies
 				return new CommunicationResult(true);
 			}
 
-			// TODO: Implement service communication
+			// Implement service communication...
 			// Send(new StopSessionMessage { SessionId = sessionId });
 
 			throw new NotImplementedException();

SafeExamBrowser.Contracts/I18n/TextKey.cs

@@ -9,7 +9,7 @@
 namespace SafeExamBrowser.Contracts.I18n
 {
 	/// <summary>
-	/// Defines all text elements of the user interface. Use the pattern "Location_Description" to allow for a better overview over all
+	/// Defines all text elements of the user interface. Use the pattern "LogicalGroup_Description" to allow for a better overview over all
 	/// keys and their usage (where applicable).
 	/// </summary>
 	public enum TextKey
@@ -44,46 +44,46 @@ namespace SafeExamBrowser.Contracts.I18n
 		MessageBox_StartupErrorTitle,
 		Notification_AboutTooltip,
 		Notification_LogTooltip,
+		OperationStatus_CloseRuntimeConnection,
+		OperationStatus_EmptyClipboard,
+		OperationStatus_FinalizeServiceSession,
+		OperationStatus_InitializeBrowser,
+		OperationStatus_InitializeConfiguration,
+		OperationStatus_InitializeKioskMode,
+		OperationStatus_InitializeProcessMonitoring,
+		OperationStatus_InitializeRuntimeConnection,
+		OperationStatus_InitializeServiceSession,
+		OperationStatus_InitializeTaskbar,
+		OperationStatus_InitializeWindowMonitoring,
+		OperationStatus_InitializeWorkingArea,
+		OperationStatus_RestartCommunicationHost,
+		OperationStatus_RestoreWorkingArea,
+		OperationStatus_RevertKioskMode,
+		OperationStatus_ShutdownProcedure,
+		OperationStatus_StartClient,
+		OperationStatus_StartCommunicationHost,
+		OperationStatus_StartEventHandling,
+		OperationStatus_StartKeyboardInterception,
+		OperationStatus_StartMouseInterception,
+		OperationStatus_InitializeSession,
+		OperationStatus_StopClient,
+		OperationStatus_StopCommunicationHost,
+		OperationStatus_StopEventHandling,
+		OperationStatus_StopKeyboardInterception,
+		OperationStatus_StopMouseInterception,
+		OperationStatus_StopProcessMonitoring,
+		OperationStatus_StopWindowMonitoring,
+		OperationStatus_TerminateBrowser,
+		OperationStatus_TerminateTaskbar,
+		OperationStatus_WaitExplorerStartup,
+		OperationStatus_WaitExplorerTermination,
+		OperationStatus_WaitRuntimeDisconnection,
 		PasswordDialog_AdminPasswordRequired,
 		PasswordDialog_AdminPasswordRequiredTitle,
 		PasswordDialog_Cancel,
 		PasswordDialog_Confirm,
 		PasswordDialog_SettingsPasswordRequired,
 		PasswordDialog_SettingsPasswordRequiredTitle,
-		// TODO: Rename these...
-		ProgressIndicator_CloseRuntimeConnection,
-		ProgressIndicator_EmptyClipboard,
-		ProgressIndicator_FinalizeServiceSession,
-		ProgressIndicator_InitializeBrowser,
-		ProgressIndicator_InitializeConfiguration,
-		ProgressIndicator_InitializeKioskMode,
-		ProgressIndicator_InitializeProcessMonitoring,
-		ProgressIndicator_InitializeRuntimeConnection,
-		ProgressIndicator_InitializeServiceSession,
-		ProgressIndicator_InitializeTaskbar,
-		ProgressIndicator_InitializeWindowMonitoring,
-		ProgressIndicator_InitializeWorkingArea,
-		ProgressIndicator_RestartCommunicationHost,
-		ProgressIndicator_RestoreWorkingArea,
-		ProgressIndicator_RevertKioskMode,
-		ProgressIndicator_ShutdownProcedure,
-		ProgressIndicator_StartClient,
-		ProgressIndicator_StartCommunicationHost,
-		ProgressIndicator_StartEventHandling,
-		ProgressIndicator_StartKeyboardInterception,
-		ProgressIndicator_StartMouseInterception,
-		ProgressIndicator_InitializeSession,
-		ProgressIndicator_StopClient,
-		ProgressIndicator_StopCommunicationHost,
-		ProgressIndicator_StopEventHandling,
-		ProgressIndicator_StopKeyboardInterception,
-		ProgressIndicator_StopMouseInterception,
-		ProgressIndicator_StopProcessMonitoring,
-		ProgressIndicator_StopWindowMonitoring,
-		ProgressIndicator_TerminateBrowser,
-		ProgressIndicator_TerminateTaskbar,
-		ProgressIndicator_WaitExplorerStartup,
-		ProgressIndicator_WaitExplorerTermination,
 		RuntimeWindow_ApplicationRunning,
 		SystemControl_BatteryCharged,
 		SystemControl_BatteryCharging,

SafeExamBrowser.Core/Operations/CommunicationHostOperation.cs

@@ -35,7 +35,7 @@ namespace SafeExamBrowser.Core.Operations
 		public OperationResult Perform()
 		{
 			logger.Info("Starting communication host...");
-			StatusChanged?.Invoke(TextKey.ProgressIndicator_StartCommunicationHost);
+			StatusChanged?.Invoke(TextKey.OperationStatus_StartCommunicationHost);
 
 			host.Start();
 
@@ -47,7 +47,7 @@ namespace SafeExamBrowser.Core.Operations
 			if (!host.IsRunning)
 			{
 				logger.Info("Restarting communication host...");
-				StatusChanged?.Invoke(TextKey.ProgressIndicator_RestartCommunicationHost);
+				StatusChanged?.Invoke(TextKey.OperationStatus_RestartCommunicationHost);
 
 				host.Stop();
 				host.Start();
@@ -59,7 +59,7 @@ namespace SafeExamBrowser.Core.Operations
 		public void Revert()
 		{
 			logger.Info("Stopping communication host...");
-			StatusChanged?.Invoke(TextKey.ProgressIndicator_StopCommunicationHost);
+			StatusChanged?.Invoke(TextKey.OperationStatus_StopCommunicationHost);
 
 			host.Stop();
 		}

SafeExamBrowser.I18n/Text.xml

@@ -84,6 +84,108 @@
   <Entry key="Notification_LogTooltip">
     Application Log
   </Entry>
+  <Entry key="OperationStatus_CloseRuntimeConnection">
+    Closing runtime connection
+  </Entry>
+  <Entry key="OperationStatus_EmptyClipboard">
+    Emptying clipboard
+  </Entry>
+  <Entry key="OperationStatus_FinalizeServiceSession">
+    Finalizing service session
+  </Entry>
+  <Entry key="OperationStatus_InitializeBrowser">
+    Initializing browser
+  </Entry>
+  <Entry key="OperationStatus_InitializeConfiguration">
+    Initializing application configuration
+  </Entry>
+  <Entry key="OperationStatus_InitializeKioskMode">
+    Initializing kiosk mode
+  </Entry>
+  <Entry key="OperationStatus_InitializeProcessMonitoring">
+    Initializing process monitoring
+  </Entry>
+  <Entry key="OperationStatus_InitializeRuntimeConnection">
+    Initializing runtime connection
+  </Entry>
+  <Entry key="OperationStatus_InitializeServiceSession">
+    Initializing service session
+  </Entry>
+  <Entry key="OperationStatus_InitializeSession">
+    Initializing new session
+  </Entry>
+  <Entry key="OperationStatus_InitializeTaskbar">
+    Initializing taskbar
+  </Entry>
+  <Entry key="OperationStatus_InitializeWindowMonitoring">
+    Initializing window monitoring
+  </Entry>
+  <Entry key="OperationStatus_InitializeWorkingArea">
+    Initializing working area
+  </Entry>
+  <Entry key="OperationStatus_RestartCommunicationHost">
+    Restarting communication host
+  </Entry>
+  <Entry key="OperationStatus_RestoreWorkingArea">
+    Restoring working area
+  </Entry>
+  <Entry key="OperationStatus_RevertKioskMode">
+    Reverting kiosk mode
+  </Entry>
+  <Entry key="OperationStatus_ShutdownProcedure">
+    Initiating shutdown procedure
+  </Entry>
+  <Entry key="OperationStatus_StartClient">
+    Starting client
+  </Entry>
+  <Entry key="OperationStatus_StartCommunicationHost">
+    Starting communication host
+  </Entry>
+  <Entry key="OperationStatus_StartEventHandling">
+    Starting event handling
+  </Entry>
+  <Entry key="OperationStatus_StartKeyboardInterception">
+    Starting keyboard interception
+  </Entry>
+  <Entry key="OperationStatus_StartMouseInterception">
+    Starting mouse interception
+  </Entry>
+  <Entry key="OperationStatus_StopClient">
+    Stopping client
+  </Entry>
+  <Entry key="OperationStatus_StopCommunicationHost">
+    Stopping communication host
+  </Entry>
+  <Entry key="OperationStatus_StopEventHandling">
+    Stopping event handling
+  </Entry>
+  <Entry key="OperationStatus_StopKeyboardInterception">
+    Stopping keyboard interception
+  </Entry>
+  <Entry key="OperationStatus_StopMouseInterception">
+    Stopping mouse interception
+  </Entry>
+  <Entry key="OperationStatus_StopProcessMonitoring">
+    Stopping process monitoring
+  </Entry>
+  <Entry key="OperationStatus_StopWindowMonitoring">
+    Stopping window monitoring
+  </Entry>
+  <Entry key="OperationStatus_TerminateBrowser">
+    Terminating browser
+  </Entry>
+  <Entry key="OperationStatus_TerminateTaskbar">
+    Terminating taskbar
+  </Entry>
+  <Entry key="OperationStatus_WaitExplorerStartup">
+    Waiting for Windows explorer to start up
+  </Entry>
+  <Entry key="OperationStatus_WaitExplorerTermination">
+    Waiting for Windows explorer to shut down
+  </Entry>
+  <Entry key="OperationStatus_WaitRuntimeDisconnection">
+    Waiting for the runtime to disconnect
+  </Entry>
   <Entry key="PasswordDialog_AdminPasswordRequired">
     Please enter the administrator password for the application configuration:
   </Entry>
@@ -102,105 +204,6 @@
   <Entry key="PasswordDialog_SettingsPasswordRequiredTitle">
     Settings Password Required
   </Entry>
-  <Entry key="ProgressIndicator_CloseRuntimeConnection">
-    Closing runtime connection
-  </Entry>
-  <Entry key="ProgressIndicator_EmptyClipboard">
-    Emptying clipboard
-  </Entry>
-  <Entry key="ProgressIndicator_FinalizeServiceSession">
-    Finalizing service session
-  </Entry>
-  <Entry key="ProgressIndicator_InitializeBrowser">
-    Initializing browser
-  </Entry>
-  <Entry key="ProgressIndicator_InitializeConfiguration">
-    Initializing application configuration
-  </Entry>
-  <Entry key="ProgressIndicator_InitializeKioskMode">
-    Initializing kiosk mode
-  </Entry>
-  <Entry key="ProgressIndicator_InitializeProcessMonitoring">
-    Initializing process monitoring
-  </Entry>
-  <Entry key="ProgressIndicator_InitializeRuntimeConnection">
-    Initializing runtime connection
-  </Entry>
-  <Entry key="ProgressIndicator_InitializeServiceSession">
-    Initializing service session
-  </Entry>
-  <Entry key="ProgressIndicator_InitializeSession">
-    Initializing new session
-  </Entry>
-  <Entry key="ProgressIndicator_InitializeTaskbar">
-    Initializing taskbar
-  </Entry>
-  <Entry key="ProgressIndicator_InitializeWindowMonitoring">
-    Initializing window monitoring
-  </Entry>
-  <Entry key="ProgressIndicator_InitializeWorkingArea">
-    Initializing working area
-  </Entry>
-  <Entry key="ProgressIndicator_RestartCommunicationHost">
-    Restarting communication host
-  </Entry>
-  <Entry key="ProgressIndicator_RestoreWorkingArea">
-    Restoring working area
-  </Entry>
-  <Entry key="ProgressIndicator_RevertKioskMode">
-    Reverting kiosk mode
-  </Entry>
-  <Entry key="ProgressIndicator_ShutdownProcedure">
-    Initiating shutdown procedure
-  </Entry>
-  <Entry key="ProgressIndicator_StartClient">
-    Starting client
-  </Entry>
-  <Entry key="ProgressIndicator_StartCommunicationHost">
-    Starting communication host
-  </Entry>
-  <Entry key="ProgressIndicator_StartEventHandling">
-    Starting event handling
-  </Entry>
-  <Entry key="ProgressIndicator_StartKeyboardInterception">
-    Starting keyboard interception
-  </Entry>
-  <Entry key="ProgressIndicator_StartMouseInterception">
-    Starting mouse interception
-  </Entry>
-  <Entry key="ProgressIndicator_StopClient">
-    Stopping client
-  </Entry>
-  <Entry key="ProgressIndicator_StopCommunicationHost">
-    Stopping communication host
-  </Entry>
-  <Entry key="ProgressIndicator_StopEventHandling">
-    Stopping event handling
-  </Entry>
-  <Entry key="ProgressIndicator_StopKeyboardInterception">
-    Stopping keyboard interception
-  </Entry>
-  <Entry key="ProgressIndicator_StopMouseInterception">
-    Stopping mouse interception
-  </Entry>
-  <Entry key="ProgressIndicator_StopProcessMonitoring">
-    Stopping process monitoring
-  </Entry>
-  <Entry key="ProgressIndicator_StopWindowMonitoring">
-    Stopping window monitoring
-  </Entry>
-  <Entry key="ProgressIndicator_TerminateBrowser">
-    Terminating browser
-  </Entry>
-  <Entry key="ProgressIndicator_TerminateTaskbar">
-    Terminating taskbar
-  </Entry>
-  <Entry key="ProgressIndicator_WaitExplorerStartup">
-    Waiting for Windows explorer to start up
-  </Entry>
-  <Entry key="ProgressIndicator_WaitExplorerTermination">
-    Waiting for Windows explorer to shut down
-  </Entry>
   <Entry key="RuntimeWindow_ApplicationRunning">
     The application is running.
   </Entry>

SafeExamBrowser.Runtime/Operations/ClientOperation.cs

@@ -63,7 +63,7 @@ namespace SafeExamBrowser.Runtime.Operations
 
 		public virtual OperationResult Perform()
 		{
-			StatusChanged?.Invoke(TextKey.ProgressIndicator_StartClient);
+			StatusChanged?.Invoke(TextKey.OperationStatus_StartClient);
 
 			var success = TryStartClient();
 
@@ -88,7 +88,7 @@ namespace SafeExamBrowser.Runtime.Operations
 		{
 			if (ClientProcess != null && !ClientProcess.HasTerminated)
 			{
-				StatusChanged?.Invoke(TextKey.ProgressIndicator_StopClient);
+				StatusChanged?.Invoke(TextKey.OperationStatus_StopClient);
 				TryStopClient();
 			}
 		}

SafeExamBrowser.Runtime/Operations/ClientTerminationOperation.cs

@@ -43,7 +43,7 @@ namespace SafeExamBrowser.Runtime.Operations
 
 			if (ClientProcess != null && !ClientProcess.HasTerminated)
 			{
-				StatusChanged?.Invoke(TextKey.ProgressIndicator_StopClient);
+				StatusChanged?.Invoke(TextKey.OperationStatus_StopClient);
 				success = TryStopClient();
 			}
 

SafeExamBrowser.Runtime/Operations/ConfigurationOperation.cs

@@ -47,7 +47,7 @@ namespace SafeExamBrowser.Runtime.Operations
 		public OperationResult Perform()
 		{
 			logger.Info("Initializing application configuration...");
-			StatusChanged?.Invoke(TextKey.ProgressIndicator_InitializeConfiguration);
+			StatusChanged?.Invoke(TextKey.OperationStatus_InitializeConfiguration);
 
 			var isValidUri = TryInitializeSettingsUri(out Uri uri);
 
@@ -72,7 +72,7 @@ namespace SafeExamBrowser.Runtime.Operations
 		public OperationResult Repeat()
 		{
 			logger.Info("Initializing new application configuration...");
-			StatusChanged?.Invoke(TextKey.ProgressIndicator_InitializeConfiguration);
+			StatusChanged?.Invoke(TextKey.OperationStatus_InitializeConfiguration);
 
 			var isValidUri = TryValidateSettingsUri(configuration.ReconfigurationFilePath, out Uri uri);
 

SafeExamBrowser.Runtime/Operations/KioskModeOperation.cs

@@ -49,7 +49,7 @@ namespace SafeExamBrowser.Runtime.Operations
 			kioskMode = configuration.CurrentSettings.KioskMode;
 
 			logger.Info($"Initializing kiosk mode '{kioskMode}'...");
-			StatusChanged?.Invoke(TextKey.ProgressIndicator_InitializeKioskMode);
+			StatusChanged?.Invoke(TextKey.OperationStatus_InitializeKioskMode);
 
 			switch (kioskMode)
 			{
@@ -87,7 +87,7 @@ namespace SafeExamBrowser.Runtime.Operations
 		public void Revert()
 		{
 			logger.Info($"Reverting kiosk mode '{kioskMode}'...");
-			StatusChanged?.Invoke(TextKey.ProgressIndicator_RevertKioskMode);
+			StatusChanged?.Invoke(TextKey.OperationStatus_RevertKioskMode);
 
 			switch (kioskMode)
 			{
@@ -143,13 +143,13 @@ namespace SafeExamBrowser.Runtime.Operations
 
 		private void TerminateExplorerShell()
 		{
-			StatusChanged?.Invoke(TextKey.ProgressIndicator_WaitExplorerTermination);
+			StatusChanged?.Invoke(TextKey.OperationStatus_WaitExplorerTermination);
 			explorerShell.Terminate();
 		}
 
 		private void RestartExplorerShell()
 		{
-			StatusChanged?.Invoke(TextKey.ProgressIndicator_WaitExplorerStartup);
+			StatusChanged?.Invoke(TextKey.OperationStatus_WaitExplorerStartup);
 			explorerShell.Start();
 		}
 	}

SafeExamBrowser.Runtime/Operations/ServiceOperation.cs

@@ -36,7 +36,7 @@ namespace SafeExamBrowser.Runtime.Operations
 		public OperationResult Perform()
 		{
 			logger.Info($"Initializing service session...");
-			StatusChanged?.Invoke(TextKey.ProgressIndicator_InitializeServiceSession);
+			StatusChanged?.Invoke(TextKey.OperationStatus_InitializeServiceSession);
 
 			mandatory = configuration.CurrentSettings.ServicePolicy == ServicePolicy.Mandatory;
 			connected = service.Connect();
@@ -74,7 +74,7 @@ namespace SafeExamBrowser.Runtime.Operations
 		public void Revert()
 		{
 			logger.Info("Finalizing service session...");
-			StatusChanged?.Invoke(TextKey.ProgressIndicator_FinalizeServiceSession);
+			StatusChanged?.Invoke(TextKey.OperationStatus_FinalizeServiceSession);
 
 			if (connected)
 			{

SafeExamBrowser.Runtime/Operations/SessionInitializationOperation.cs

@@ -53,7 +53,7 @@ namespace SafeExamBrowser.Runtime.Operations
 		private void InitializeSessionConfiguration()
 		{
 			logger.Info("Initializing new session configuration...");
-			StatusChanged?.Invoke(TextKey.ProgressIndicator_InitializeSession);
+			StatusChanged?.Invoke(TextKey.OperationStatus_InitializeSession);
 
 			configuration.InitializeSessionConfiguration();
 			runtimeHost.StartupToken = configuration.CurrentSession.StartupToken;