From 00db5c4dc7f81e74601df683ffad11677ffffb59 Mon Sep 17 00:00:00 2001 From: rmcardle Date: Sat, 14 Jan 2012 17:47:28 -0600 Subject: [PATCH] Fix merge of two language strings. --- mRemoteV1/App/App.Runtime.vb | 2 +- mRemoteV1/Language/Language.Designer.vb | 22 ++++++++++++++++++++-- mRemoteV1/Language/Language.resx | 6 ++++++ mRemoteV1/My Project/Resources.Designer.vb | 20 +------------------- mRemoteV1/My Project/Resources.resx | 8 +------- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/mRemoteV1/App/App.Runtime.vb b/mRemoteV1/App/App.Runtime.vb index 8840703d4..afaf051b2 100644 --- a/mRemoteV1/App/App.Runtime.vb +++ b/mRemoteV1/App/App.Runtime.vb @@ -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 diff --git a/mRemoteV1/Language/Language.Designer.vb b/mRemoteV1/Language/Language.Designer.vb index bf30e466f..2daea5bd7 100644 --- a/mRemoteV1/Language/Language.Designer.vb +++ b/mRemoteV1/Language/Language.Designer.vb @@ -1,7 +1,7 @@ '------------------------------------------------------------------------------ ' ' 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 ''' ''' A strongly-typed resource class, for looking up localized strings, etc. ''' - _ Friend Class Language @@ -1555,6 +1555,15 @@ Namespace My End Get End Property + ''' + ''' 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.. + ''' + Friend Shared ReadOnly Property strErrorStartupConnectionFileLoad() As String + Get + Return ResourceManager.GetString("strErrorStartupConnectionFileLoad", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to VerifyDatabaseVersion (Config.Connections.Save) failed. {0}. ''' @@ -5474,6 +5483,15 @@ Namespace My End Get End Property + ''' + ''' Looks up a localized string similar to mRemoteNG Portable Edition does not currently support automatic updates.. + ''' + Friend Shared ReadOnly Property strUpdateCheckPortableEdition() As String + Get + Return ResourceManager.GetString("strUpdateCheckPortableEdition", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Error deleting update file!. ''' diff --git a/mRemoteV1/Language/Language.resx b/mRemoteV1/Language/Language.resx index 8a1f21053..f77166105 100644 --- a/mRemoteV1/Language/Language.resx +++ b/mRemoteV1/Language/Language.resx @@ -2040,4 +2040,10 @@ mRemoteNG will now quit and begin with the installation. Yes + + 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. + + + mRemoteNG Portable Edition does not currently support automatic updates. + \ No newline at end of file diff --git a/mRemoteV1/My Project/Resources.Designer.vb b/mRemoteV1/My Project/Resources.Designer.vb index cd58a0f80..6cec63b96 100644 --- a/mRemoteV1/My Project/Resources.Designer.vb +++ b/mRemoteV1/My Project/Resources.Designer.vb @@ -753,28 +753,10 @@ Namespace My.Resources End Get End Property - ''' - ''' 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.. - ''' - Friend ReadOnly Property strErrorStartupConnectionFileLoad() As String - Get - Return ResourceManager.GetString("strErrorStartupConnectionFileLoad", resourceCulture) - End Get - End Property - - ''' - ''' Looks up a localized string similar to mRemoteNG Portable Edition does not currently support automatic updates.. - ''' - 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 diff --git a/mRemoteV1/My Project/Resources.resx b/mRemoteV1/My Project/Resources.resx index 29c043fd9..3cb7855fd 100644 --- a/mRemoteV1/My Project/Resources.resx +++ b/mRemoteV1/My Project/Resources.resx @@ -117,7 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + ..\Resources\Images\Error.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -444,11 +444,5 @@ ..\Resources\Images_FamFamFam\News.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - mRemoteNG Portable Edition does not currently support automatic updates. - - - 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. \ No newline at end of file