Added new strings for issue #148 and #149

This commit is contained in:
Michael J. Seiferling
2018-08-30 10:53:29 -06:00
parent 647193f933
commit b04c1bc18b
4 changed files with 65 additions and 5 deletions
+2 -2
View File
@@ -1935,11 +1935,11 @@ Public Class frmMain
Dim sWinePrefix As String = mgrPath.GetWinePrefix(oProcess.FoundProcess) Dim sWinePrefix As String = mgrPath.GetWinePrefix(oProcess.FoundProcess)
Dim sWineSavePath As String Dim sWineSavePath As String
If Not sWinePrefix = String.Empty Then If Not sWinePrefix = String.Empty Then
UpdateLog(oProcess.GameInfo.Name & " Wine Prefix: " & sWinePrefix, False) UpdateLog(mgrCommon.FormatString(frmMain_WinePrefix, New String() {oProcess.GameInfo.Name, sWinePrefix}), False)
sWineSavePath = mgrPath.GetWineSavePath(sWinePrefix, oProcess.GameInfo.TruePath) sWineSavePath = mgrPath.GetWineSavePath(sWinePrefix, oProcess.GameInfo.TruePath)
If Not sWineSavePath = oProcess.GameInfo.TruePath Then If Not sWineSavePath = oProcess.GameInfo.TruePath Then
oProcess.GameInfo.TruePath = sWineSavePath oProcess.GameInfo.TruePath = sWineSavePath
UpdateLog(oProcess.GameInfo.Name & " Converted Save Path: " & sWineSavePath, False) UpdateLog(mgrCommon.FormatString(frmMain_WineSavePath, New String() {oProcess.GameInfo.Name, sWineSavePath}), False)
End If End If
End If End If
End If End If
+3 -3
View File
@@ -225,7 +225,7 @@ Public Class mgrPath
Return sWinePrefix & Path.DirectorySeparatorChar & sRealPath Return sWinePrefix & Path.DirectorySeparatorChar & sRealPath
Catch ex As Exception Catch ex As Exception
MsgBox(ex.Message) mgrCommon.ShowMessage(mgrPath_ErrorBuildingWinePath, ex.Message, MsgBoxStyle.Exclamation)
Return String.Empty Return String.Empty
End Try End Try
End Function End Function
@@ -271,7 +271,7 @@ Public Class mgrPath
Return sPath Return sPath
Catch ex As Exception Catch ex As Exception
MsgBox(ex.Message) mgrCommon.ShowMessage(mgrPath_ErrorConvertWineSavePath, ex.Message, MsgBoxStyle.Exclamation)
Return sPath Return sPath
End Try End Try
End Function End Function
@@ -298,7 +298,7 @@ Public Class mgrPath
Return String.Empty Return String.Empty
End If End If
Catch ex As Exception Catch ex As Exception
MsgBox(ex.Message) mgrCommon.ShowMessage(mgrPath_ErrorWinePrefix, ex.Message, MsgBoxStyle.Exclamation)
Return String.Empty Return String.Empty
End Try End Try
End Function End Function
+45
View File
@@ -3876,6 +3876,24 @@ Namespace My.Resources
End Get End Get
End Property End Property
'''<summary>
''' Looks up a localized string similar to [PARAM] Wine Prefix: [PARAM].
'''</summary>
Friend ReadOnly Property frmMain_WinePrefix() As String
Get
Return ResourceManager.GetString("frmMain_WinePrefix", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to [PARAM] Converted Save Path: [PARAM].
'''</summary>
Friend ReadOnly Property frmMain_WineSavePath() As String
Get
Return ResourceManager.GetString("frmMain_WineSavePath", resourceCulture)
End Get
End Property
'''<summary> '''<summary>
''' Looks up a localized string similar to +. ''' Looks up a localized string similar to +.
'''</summary> '''</summary>
@@ -6087,6 +6105,33 @@ Namespace My.Resources
End Get End Get
End Property End Property
'''<summary>
''' Looks up a localized string similar to An error occured when building a Wine path.[BR][BR][PARAM].
'''</summary>
Friend ReadOnly Property mgrPath_ErrorBuildingWinePath() As String
Get
Return ResourceManager.GetString("mgrPath_ErrorBuildingWinePath", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to An error occured when converting to a Wine save path.[BR][BR][PARAM].
'''</summary>
Friend ReadOnly Property mgrPath_ErrorConvertWineSavePath() As String
Get
Return ResourceManager.GetString("mgrPath_ErrorConvertWineSavePath", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to An error occured when determining a Wine prefix.[BR][BR][PARAM].
'''</summary>
Friend ReadOnly Property mgrPath_ErrorWinePrefix() As String
Get
Return ResourceManager.GetString("mgrPath_ErrorWinePrefix", resourceCulture)
End Get
End Property
'''<summary> '''<summary>
''' Looks up a localized string similar to An error occured while determining a required system path. [BR][BR]The environment value for [PARAM] is empty.[BR][BR]The application will now exit.. ''' Looks up a localized string similar to An error occured while determining a required system path. [BR][BR]The environment value for [PARAM] is empty.[BR][BR]The application will now exit..
'''</summary> '''</summary>
+15
View File
@@ -2203,4 +2203,19 @@
<data name="frmGameManager_ErrorRenameFolderExists" xml:space="preserve"> <data name="frmGameManager_ErrorRenameFolderExists" xml:space="preserve">
<value>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?</value> <value>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?</value>
</data> </data>
<data name="frmMain_WinePrefix" xml:space="preserve">
<value>[PARAM] Wine Prefix: [PARAM]</value>
</data>
<data name="frmMain_WineSavePath" xml:space="preserve">
<value>[PARAM] Converted Save Path: [PARAM]</value>
</data>
<data name="mgrPath_ErrorBuildingWinePath" xml:space="preserve">
<value>An error occured when building a Wine path.[BR][BR][PARAM]</value>
</data>
<data name="mgrPath_ErrorConvertWineSavePath" xml:space="preserve">
<value>An error occured when converting to a Wine save path.[BR][BR][PARAM]</value>
</data>
<data name="mgrPath_ErrorWinePrefix" xml:space="preserve">
<value>An error occured when determining a Wine prefix.[BR][BR][PARAM]</value>
</data>
</root> </root>