further refinements to error messages

Author: tomysshadow

FlashpointSecurePlayer/FlashpointSecurePlayerGUI.cs

@@ -360,7 +360,7 @@ private async Task ImportActiveX(ErrorDelegate errorDelegate) {
                             fullPath = Path.GetFullPath(TemplateName);
                         } catch (Exception ex) {
                             LogExceptionToLauncher(ex);
-                            errorDelegate(String.Format(Properties.Resources.GameIsMissingFiles, TemplateName));
+                            errorDelegate(String.Format(Properties.Resources.GameIsMissingFile, TemplateName));
                             throw new ActiveXImportFailedException("The ActiveX Import failed because getting the Full Path failed.");
                         }
 
@@ -382,7 +382,7 @@ private async Task ImportActiveX(ErrorDelegate errorDelegate) {
                             throw new ActiveXImportFailedException("The ActiveX Import failed because the DLL is not an ActiveX Control.");
                         } catch (Exception ex) {
                             LogExceptionToLauncher(ex);
-                            errorDelegate(String.Format(Properties.Resources.GameIsMissingFiles, fullPath));
+                            errorDelegate(String.Format(Properties.Resources.GameIsMissingFile, fullPath));
                             throw new ActiveXImportFailedException("The ActiveX Import failed because the DLL was not found.");
                         }
 
@@ -894,7 +894,7 @@ private async Task ActivateModificationsAsync(TemplateElement templateElement, E
                                 await downloadsBefore.ActivateAsync(TemplateName, DownloadsBeforeModificationNames).ConfigureAwait(true);
                             } catch (DownloadFailedException ex) {
                                 LogExceptionToLauncher(ex);
-                                errorDelegate(String.Format(Properties.Resources.GameIsMissingFiles, String.Join(", ", DownloadsBeforeModificationNames)));
+                                errorDelegate(String.Format(Properties.Resources.GameIsMissingFile, String.Join(", ", DownloadsBeforeModificationNames)));
                             } catch (ConfigurationErrorsException ex) {
                                 LogExceptionToLauncher(ex);
                                 errorDelegate(Properties.Resources.ConfigurationUnableToLoad);
@@ -918,7 +918,7 @@ private async Task ActivateModificationsAsync(TemplateElement templateElement, E
                                     AskLaunchAsAdministratorUser();
                                 } catch (ArgumentException ex) {
                                     LogExceptionToLauncher(ex);
-                                    errorDelegate(Properties.Resources.GameIsMissingFiles);
+                                    errorDelegate(Properties.Resources.GameIsMissingFile);
                                 } catch (InvalidOperationException ex) {
                                     LogExceptionToLauncher(ex);
                                     errorDelegate(Properties.Resources.ModificationsUnableToLoadImport);
@@ -1028,7 +1028,7 @@ private async Task DeactivateModificationsAsync(ErrorDelegate errorDelegate) {
                             AskLaunchAsAdministratorUser();
                         } catch (ArgumentException ex) {
                             LogExceptionToLauncher(ex);
-                            errorDelegate(Properties.Resources.GameIsMissingFiles);
+                            errorDelegate(Properties.Resources.GameIsMissingFile);
                         } catch (InvalidOperationException ex) {
                             LogExceptionToLauncher(ex);
                             errorDelegate(Properties.Resources.ModificationsUnableToLoadImport);

FlashpointSecurePlayer/Properties/Resources.Designer.cs

@@ -124,7 +124,7 @@
     <value>The ActiveX Control is unable to be uninstalled.</value>
   </data>
   <data name="AddressNotUnderstood" xml:space="preserve">
-    <value>The address ({0}) wasn't understood. Please report this bug.</value>
+    <value>The address "{0}" wasn't understood. Please report this bug.</value>
   </data>
   <data name="AnotherInstancePreventingTemplate" xml:space="preserve">
     <value>The Template could not be activated.
@@ -158,8 +158,8 @@ Please ensure Flashpoint is not corrupted, was extracted correctly, and is not r
   <data name="GameDownloading" xml:space="preserve">
     <value>The game is downloading.</value>
   </data>
-  <data name="GameIsMissingFiles" xml:space="preserve">
-    <value>The game files ({0}) are missing.
+  <data name="GameIsMissingFile" xml:space="preserve">
+    <value>The game file "{0}" is missing.
 Please ensure Flashpoint is not corrupted, was extracted correctly, and is not running from OneDrive or a network drive.</value>
   </data>
   <data name="GameNotActiveXControl" xml:space="preserve">
@@ -212,7 +212,7 @@ If you choose No, the application will exit.</value>
     <value>Open the Flashpoint Launcher by opening the Start Flashpoint shortcut in the Flashpoint folder.</value>
   </data>
   <data name="ProcessCompatibilityConflict" xml:space="preserve">
-    <value>The process {0} causes a compatibility conflict with this game. Please close it to continue.</value>
+    <value>The process "{0}" causes a compatibility conflict with this game. Please close it to continue.</value>
   </data>
   <data name="ProcessUnableToStart" xml:space="preserve">
     <value>The process is unable to start.</value>
@@ -244,8 +244,8 @@ If you choose No, the application will exit.</value>
   <data name="UnableToCreateCustomSecurityManager" xml:space="preserve">
     <value>Unable to create a Custom Security Manager.</value>
   </data>
-  <data name="UnableToGetParentProcessEXEFileName" xml:space="preserve">
-    <value>Unable to get the Parent Process EXE File Name.</value>
+  <data name="UnableToGetParentProcessExecutableFileName" xml:space="preserve">
+    <value>Unable to get the Parent Process Executable File Name.</value>
   </data>
   <data name="UnableToSetWorkingDirectory" xml:space="preserve">
     <value>Unable to set the Working Directory.</value>