Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 22:11:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge of two language strings.

Browse Source
This commit is contained in:
rmcardle
2012-01-14 17:47:28 -06:00
parent 701933cfb5
commit 00db5c4dc7
5 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mRemoteV1/App/App.Runtime.vb
View File

@@ -1031,7 +1031,7 @@ Namespace App
LoadConnections()
Exit Sub
Else
MsgBox(String.Format(My.Resources.strErrorStartupConnectionFileLoad, vbNewLine, Application.ProductName, GetStartupConnectionFileName(), ex.Message), MsgBoxStyle.OkOnly + MsgBoxStyle.Critical)
MsgBox(String.Format(My.Language.strErrorStartupConnectionFileLoad, vbNewLine, Application.ProductName, GetStartupConnectionFileName(), ex.Message), MsgBoxStyle.OkOnly + MsgBoxStyle.Critical)
Application.Exit()
End If
End If

22
mRemoteV1/Language/Language.Designer.vb generated
View File

@@ -1,7 +1,7 @@
'------------------------------------------------------------------------------
' <auto-generated>
' This code was generated by a tool.
' Runtime Version:2.0.50727.5444
' Runtime Version:4.0.30319.239
'
' Changes to this file may cause incorrect behavior and will be lost if
' the code is regenerated.
@@ -22,7 +22,7 @@ Namespace My
'''<summary>
''' A strongly-typed resource class, for looking up localized strings, etc.
'''</summary>
<Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0"), _
<Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()> _
Friend Class Language
@@ -1555,6 +1555,15 @@ Namespace My
End Get
End Property
'''<summary>
''' Looks up a localized string similar to The startup connection file could not be loaded.{0}{0}{2}{0}{3}{0}{0}In order to prevent data loss, {1} will now exit..
'''</summary>
Friend Shared ReadOnly Property strErrorStartupConnectionFileLoad() As String
Get
Return ResourceManager.GetString("strErrorStartupConnectionFileLoad", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to VerifyDatabaseVersion (Config.Connections.Save) failed. {0}.
'''</summary>
@@ -5474,6 +5483,15 @@ Namespace My
End Get
End Property
'''<summary>
''' Looks up a localized string similar to mRemoteNG Portable Edition does not currently support automatic updates..
'''</summary>
Friend Shared ReadOnly Property strUpdateCheckPortableEdition() As String
Get
Return ResourceManager.GetString("strUpdateCheckPortableEdition", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to Error deleting update file!.
'''</summary>

6
mRemoteV1/Language/Language.resx
View File

@@ -2040,4 +2040,10 @@ mRemoteNG will now quit and begin with the installation.</value>
<data name="strYes" xml:space="preserve">
<value>Yes</value>
</data>
<data name="strErrorStartupConnectionFileLoad" xml:space="preserve">
<value>The startup connection file could not be loaded.{0}{0}{2}{0}{3}{0}{0}In order to prevent data loss, {1} will now exit.</value>
</data>
<data name="strUpdateCheckPortableEdition" xml:space="preserve">
<value>mRemoteNG Portable Edition does not currently support automatic updates.</value>
</data>
</root>

20
mRemoteV1/My Project/Resources.Designer.vb generated
View File

@@ -753,28 +753,10 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Looks up a localized string similar to The startup connection file could not be loaded.{0}{0}{2}{0}{3}{0}{0}In order to prevent data loss, {1} will now exit..
'''</summary>
Friend ReadOnly Property strErrorStartupConnectionFileLoad() As String
Get
Return ResourceManager.GetString("strErrorStartupConnectionFileLoad", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to mRemoteNG Portable Edition does not currently support automatic updates..
'''</summary>
Friend ReadOnly Property strUpdateCheckPortableEdition() As String
Get
Return ResourceManager.GetString("strUpdateCheckPortableEdition", resourceCulture)
End Get
End Property
Friend ReadOnly Property Tab_Icon() As System.Drawing.Icon
Get
Dim obj As Object = ResourceManager.GetObject("Tab_Icon", resourceCulture)
Return CType(obj, System.Drawing.Icon)
Return CType(obj,System.Drawing.Icon)
End Get
End Property

8
mRemoteV1/My Project/Resources.resx
View File

@@ -117,7 +117,7 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="_Error" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Images\Error.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -444,11 +444,5 @@
</data>
<data name="News" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Images_FamFamFam\News.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="strUpdateCheckPortableEdition">
<value xml:space="preserve">mRemoteNG Portable Edition does not currently support automatic updates.</value>
</data>
<data name="strErrorStartupConnectionFileLoad">
<value xml:space="preserve">The startup connection file could not be loaded.{0}{0}{2}{0}{3}{0}{0}In order to prevent data loss, {1} will now exit.</value>
</data>
</root>