diff --git a/mRemoteNG/App.config b/mRemoteNG/App.config index f326b7695..1da402e18 100644 --- a/mRemoteNG/App.config +++ b/mRemoteNG/App.config @@ -5,7 +5,7 @@ - + \ No newline at end of file diff --git a/mRemoteNG/App/ProgramRoot.cs b/mRemoteNG/App/ProgramRoot.cs index c6410494b..1a2b22128 100644 --- a/mRemoteNG/App/ProgramRoot.cs +++ b/mRemoteNG/App/ProgramRoot.cs @@ -16,6 +16,7 @@ namespace mRemoteNG.App { private static Mutex _mutex; private static FrmSplashScreenNew _frmSplashScreen = null; + private static string customResourcePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Languages"); /// /// The main entry point for the application. diff --git a/mRemoteNG/Language/Language.Designer.cs b/mRemoteNG/Language/Language.Designer.cs index 062d57ad5..6843981a7 100644 --- a/mRemoteNG/Language/Language.Designer.cs +++ b/mRemoteNG/Language/Language.Designer.cs @@ -39,6 +39,9 @@ namespace mRemoteNG.Resources.Language { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { + //string resourceFilePath = "Languages/ru/mRemoteNG.resources.dll"; + //global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager(resourceFilePath, typeof(Language).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("mRemoteNG.Language.Language", typeof(Language).Assembly); resourceMan = temp; } diff --git a/mRemoteNG/mRemoteNG.csproj b/mRemoteNG/mRemoteNG.csproj index acaf144bc..e9054d8b4 100644 --- a/mRemoteNG/mRemoteNG.csproj +++ b/mRemoteNG/mRemoteNG.csproj @@ -538,9 +538,27 @@ --> + + + + + + + + + + + - + \ No newline at end of file