From e6277f1ae4f76a3e3e7bab67e736dba06b576a5b Mon Sep 17 00:00:00 2001 From: "Michael J. Seiferling" Date: Sat, 25 Aug 2018 19:58:09 -0600 Subject: [PATCH] Typo and comment fixes for issue #147 --- GBM/Forms/frmGameManager.vb | 1 - GBM/My Project/Resources.Designer.vb | 2 +- GBM/My Project/Resources.resx | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/GBM/Forms/frmGameManager.vb b/GBM/Forms/frmGameManager.vb index 2162e5f..e1656ae 100644 --- a/GBM/Forms/frmGameManager.vb +++ b/GBM/Forms/frmGameManager.vb @@ -213,7 +213,6 @@ Public Class frmGameManager 'Check for existing files For Each oBackupItem As clsBackup In oBackupItems - 'Rename Current Backup File sFileName = BackupFolder & oBackupItem.FileName sNewFileName = Path.GetDirectoryName(sFileName) & Path.DirectorySeparatorChar & Path.GetFileName(sFileName).Replace(sOriginalAppItem, sNewAppItem) If File.Exists(sNewFileName) Then diff --git a/GBM/My Project/Resources.Designer.vb b/GBM/My Project/Resources.Designer.vb index fe0c1b0..def094c 100644 --- a/GBM/My Project/Resources.Designer.vb +++ b/GBM/My Project/Resources.Designer.vb @@ -2014,7 +2014,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to The backup folder contains one or more backup files that cannot be renamed to [PARAM] because a file using that name already exist.[BR][BR]Do you want to continue and remove the existing files?. + ''' Looks up a localized string similar to The backup folder contains one or more backup files that cannot be renamed to [PARAM] because a file using that name already exists.[BR][BR]Do you want to continue and remove the existing files?. ''' Friend ReadOnly Property frmGameManager_ErrorRenameFilesExist() As String Get diff --git a/GBM/My Project/Resources.resx b/GBM/My Project/Resources.resx index a33fa5c..8f16cb6 100644 --- a/GBM/My Project/Resources.resx +++ b/GBM/My Project/Resources.resx @@ -2198,7 +2198,7 @@ An error occured while extracting the executable icon. - The backup folder contains one or more backup files that cannot be renamed to [PARAM] because a file using that name already exist.[BR][BR]Do you want to continue and remove the existing files? + The backup folder contains one or more backup files that cannot be renamed to [PARAM] because a file using that name already exists.[BR][BR]Do you want to continue and remove the existing files? The backup folder [PARAM] cannot be renamed to [PARAM] because a folder with that name already exists.[BR][BR]Do you want to continue and remove the existing folder?