diff options
| author | rmcardle <riley@mremoteng.org> | 2011-12-29 05:59:06 +0400 |
|---|---|---|
| committer | rmcardle <riley@mremoteng.org> | 2011-12-29 05:59:06 +0400 |
| commit | 82d56f13fcb50253d348ad07056ff5097cc2e77f (patch) | |
| tree | 103eb527d2d536ddcbfc61cd1ce74b320169e550 /mRemoteV1/My Project/Resources.Designer.vb | |
| parent | f249505d84d37dae57e75bea090f05dbbd9be35b (diff) | |
| parent | 68cee498302e08bed4ef944635b6abc0e2984fce (diff) | |
Merge branch 'master' into develop
Conflicts:
CHANGELOG.TXT
Installer/mRemote.nsi
mRemoteV1/App/App.Runtime.vb
mRemoteV1/Config/Config.Connections.Load.vb
mRemoteV1/My Project/Resources.Designer.vb
mRemoteV1/My Project/Settings.Designer.vb
Diffstat (limited to 'mRemoteV1/My Project/Resources.Designer.vb')
| -rw-r--r-- | mRemoteV1/My Project/Resources.Designer.vb | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/mRemoteV1/My Project/Resources.Designer.vb b/mRemoteV1/My Project/Resources.Designer.vb index 386c6a66..60fb6dd6 100644 --- a/mRemoteV1/My Project/Resources.Designer.vb +++ b/mRemoteV1/My Project/Resources.Designer.vb @@ -1,7 +1,7 @@ '------------------------------------------------------------------------------ ' <auto-generated> ' This code was generated by a tool. -' Runtime Version:2.0.50727.5446 +' 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.Resources '''<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(), _ Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _ @@ -757,6 +757,15 @@ Namespace My.Resources 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 |