adjusted namespace

mRemoteNG/App/CompatibilityChecker.cs

@@ -4,6 +4,8 @@ using System.Windows.Forms;
 using Microsoft.Win32;
 using mRemoteNG.App.Info;
 using mRemoteNG.Messages;
+using mRemoteNG.Properties;
+using mRemoteNG.Resources.Language;
 using mRemoteNG.UI.Forms;
 using mRemoteNG.UI.TaskDialog;
 

mRemoteNG/App/Export.cs

@@ -4,8 +4,8 @@ using System.Windows.Forms;
 using mRemoteNG.Config.Connections;
 using mRemoteNG.Config.DataProviders;
 using mRemoteNG.Config.Serializers;
-using mRemoteNG.Config.Serializers.Csv;
+using mRemoteNG.Config.Serializers.ConnectionSerializers.Csv;
-using mRemoteNG.Config.Serializers.Xml;
+using mRemoteNG.Config.Serializers.ConnectionSerializers.Xml;
 using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.Security;

mRemoteNG/App/Import.cs

@@ -6,6 +6,7 @@ using mRemoteNG.Config.Import;
 using mRemoteNG.Connection;
 using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Container;
+using mRemoteNG.Resources.Language;
 using mRemoteNG.Tools;
 
 namespace mRemoteNG.App

mRemoteNG/App/Info/UpdateChannelInfo.cs

@@ -1,4 +1,5 @@
 using System;
+using mRemoteNG.Properties;
 
 // ReSharper disable InconsistentNaming
 

mRemoteNG/App/Initialization/CredsAndConsSetup.cs

@@ -1,5 +1,6 @@
 using System.IO;
 using mRemoteNG.Config.Connections;
+using mRemoteNG.Properties;
 
 namespace mRemoteNG.App.Initialization
 {

mRemoteNG/App/Initialization/MessageCollectorSetup.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using mRemoteNG.Messages;
+using mRemoteNG.Messages.MessageFilteringOptions;
 using mRemoteNG.Messages.MessageWriters;
 using mRemoteNG.Messages.WriterDecorators;
 

mRemoteNG/App/Initialization/StartupDataLogger.cs

@@ -3,6 +3,7 @@ using System.Management;
 using System.Threading;
 using System.Windows.Forms;
 using mRemoteNG.Messages;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.App.Initialization
 {

mRemoteNG/App/Logger.cs

@@ -4,6 +4,7 @@ using System.Windows.Forms;
 using log4net;
 using log4net.Appender;
 using log4net.Config;
+using mRemoteNG.Properties;
 
 // ReSharper disable ArrangeAccessorOwnerBody
 

mRemoteNG/App/ProgramRoot.cs

@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.Threading;
 using System.Windows.Forms;
+using mRemoteNG.Properties;
 using mRemoteNG.UI.Forms;
 
 namespace mRemoteNG.App

mRemoteNG/App/Runtime.cs

@@ -15,6 +15,8 @@ using System.IO;
 using System.Security;
 using System.Threading;
 using System.Windows.Forms;
+using mRemoteNG.Properties;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.App
 {

mRemoteNG/App/Shutdown.cs

@@ -3,6 +3,8 @@ using System;
 using System.Diagnostics;
 using System.Windows.Forms;
 using mRemoteNG.Config.Putty;
+using mRemoteNG.Properties;
+using mRemoteNG.Resources.Language;
 using mRemoteNG.UI.Controls;
 using mRemoteNG.UI.Forms;
 

mRemoteNG/App/Startup.cs

@@ -9,6 +9,7 @@ using mRemoteNG.Config.Connections;
 using mRemoteNG.Config.Connections.Multiuser;
 using mRemoteNG.Connection;
 using mRemoteNG.Messages;
+using mRemoteNG.Properties;
 using mRemoteNG.Tools;
 using mRemoteNG.Tools.Cmdline;
 using mRemoteNG.UI;

mRemoteNG/App/SupportedCultures.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
 using System.Runtime.Serialization;
+using mRemoteNG.Properties;
 
 // ReSharper disable ArrangeAccessorOwnerBody
 

mRemoteNG/App/Update/AppUpdater.cs

@@ -7,6 +7,7 @@ using System.Reflection;
 using mRemoteNG.App.Info;
 using mRemoteNG.Security.SymmetricEncryption;
 using System.Security.Cryptography;
+using mRemoteNG.Properties;
 #if !PORTABLE
 using mRemoteNG.Tools;
 

mRemoteNG/Config/Connections/CsvConnectionsSaver.cs

@@ -1,7 +1,7 @@
 using System;
 using mRemoteNG.App;
 using mRemoteNG.Config.DataProviders;
-using mRemoteNG.Config.Serializers.Csv;
+using mRemoteNG.Config.Serializers.ConnectionSerializers.Csv;
 using mRemoteNG.Security;
 using mRemoteNG.Tree;
 

mRemoteNG/Config/Connections/Multiuser/SqlConnectionsUpdateChecker.cs

@@ -1,13 +1,12 @@
-using mRemoteNG.App;
+using System;
-using mRemoteNG.Config.Connections.Multiuser;
-using mRemoteNG.Config.DatabaseConnectors;
-using mRemoteNG.Messages;
-using System;
 using System.Data;
 using System.Data.Common;
 using System.Threading;
+using mRemoteNG.App;
+using mRemoteNG.Config.DatabaseConnectors;
+using mRemoteNG.Messages;
 
-namespace mRemoteNG.Config.Connections
+namespace mRemoteNG.Config.Connections.Multiuser
 {
     public class SqlConnectionsUpdateChecker : IConnectionsUpdateChecker
     {

mRemoteNG/Config/Connections/SaveConnectionsOnEdit.cs

@@ -48,7 +48,7 @@ namespace mRemoteNG.Config.Connections
 
         private void SaveConnectionOnEdit(string propertyName = "")
         {
-            if (!mRemoteNG.Settings.Default.SaveConnectionsAfterEveryEdit)
+            if (!Properties.Settings.Default.SaveConnectionsAfterEveryEdit)
                 return;
             if (FrmMain.Default.IsClosing)
                 return;

mRemoteNG/Config/Connections/SqlConnectionsLoader.cs

@@ -5,7 +5,7 @@ using System.Security;
 using mRemoteNG.Config.DatabaseConnectors;
 using mRemoteNG.Config.DataProviders;
 using mRemoteNG.Config.Serializers;
-using mRemoteNG.Config.Serializers.MsSql;
+using mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql;
 using mRemoteNG.Config.Serializers.Versioning;
 using mRemoteNG.Container;
 using mRemoteNG.Security;

mRemoteNG/Config/Connections/SqlConnectionsSaver.cs

@@ -7,11 +7,12 @@ using mRemoteNG.App.Info;
 using mRemoteNG.Config.DatabaseConnectors;
 using mRemoteNG.Config.DataProviders;
 using mRemoteNG.Config.Serializers;
-using mRemoteNG.Config.Serializers.MsSql;
+using mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql;
 using mRemoteNG.Config.Serializers.Versioning;
 using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.Messages;
+using mRemoteNG.Resources.Language;
 using mRemoteNG.Security;
 using mRemoteNG.Security.SymmetricEncryption;
 using mRemoteNG.Tools;
@@ -177,7 +178,7 @@ namespace mRemoteNG.Config.Connections
 
         private bool SqlUserIsReadOnly()
         {
-            return mRemoteNG.Settings.Default.SQLReadOnly;
+            return Properties.Settings.Default.SQLReadOnly;
         }
     }
 }

mRemoteNG/Config/Connections/XmlConnectionsLoader.cs

@@ -1,10 +1,10 @@
 using mRemoteNG.Config.DataProviders;
-using mRemoteNG.Config.Serializers.Xml;
 using mRemoteNG.Tools;
 using mRemoteNG.Tree;
 using System;
 using System.IO;
 using System.Security;
+using mRemoteNG.Config.Serializers.ConnectionSerializers.Xml;
 
 namespace mRemoteNG.Config.Connections
 {

mRemoteNG/Config/Connections/XmlConnectionsSaver.cs

@@ -2,7 +2,7 @@
 using System.Linq;
 using mRemoteNG.App;
 using mRemoteNG.Config.DataProviders;
-using mRemoteNG.Config.Serializers.Xml;
+using mRemoteNG.Config.Serializers.ConnectionSerializers.Xml;
 using mRemoteNG.Security;
 using mRemoteNG.Security.Factories;
 using mRemoteNG.Tree;
@@ -37,7 +37,7 @@ namespace mRemoteNG.Config.Connections
                     cryptographyProvider,
                     connectionTreeModel,
                     _saveFilter,
-                    mRemoteNG.Settings.Default.EncryptCompleteConnectionsFile);
+                    Properties.Settings.Default.EncryptCompleteConnectionsFile);
 
                 var rootNode = connectionTreeModel.RootNodes.OfType<RootNodeInfo>().First();
                 var xml = xmlConnectionsSerializer.Serialize(rootNode);

mRemoteNG/Config/DataProviders/FileBackupCreator.cs

@@ -2,6 +2,7 @@
 using System.IO;
 using mRemoteNG.App;
 using mRemoteNG.Messages;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Config.DataProviders
 {
@@ -15,7 +16,7 @@ namespace mRemoteNG.Config.DataProviders
                     return;
 
                 var backupFileName =
-                    string.Format(mRemoteNG.Settings.Default.BackupFileNameFormat, fileName, DateTime.Now);
+                    string.Format(Properties.Settings.Default.BackupFileNameFormat, fileName, DateTime.Now);
                 File.Copy(fileName, backupFileName);
             }
             catch (Exception ex)
@@ -38,7 +39,7 @@ namespace mRemoteNG.Config.DataProviders
 
         private bool FeatureIsTurnedOff()
         {
-            return mRemoteNG.Settings.Default.BackupFileKeepCount == 0;
+            return Properties.Settings.Default.BackupFileKeepCount == 0;
         }
     }
 }

mRemoteNG/Config/DataProviders/FileBackupPruner.cs

@@ -13,7 +13,7 @@ namespace mRemoteNG.Config.DataProviders
             if (string.IsNullOrEmpty(fileName) || string.IsNullOrEmpty(directoryName))
                 return;
 
-            var searchPattern = string.Format(mRemoteNG.Settings.Default.BackupFileNameFormat, fileName, "*");
+            var searchPattern = string.Format(Properties.Settings.Default.BackupFileNameFormat, fileName, "*");
             var files = Directory.GetFiles(directoryName, searchPattern);
 
             if (files.Length <= maxBackupsToKeep)

mRemoteNG/Config/DataProviders/SqlDataProvider.cs

@@ -108,7 +108,7 @@ namespace mRemoteNG.Config.DataProviders
 
         private bool DbUserIsReadOnly()
         {
-            return mRemoteNG.Settings.Default.SQLReadOnly;
+            return Properties.Settings.Default.SQLReadOnly;
         }
     }
 }

mRemoteNG/Config/DatabaseConnectors/DatabaseConnectorFactory.cs

@@ -7,12 +7,12 @@ namespace mRemoteNG.Config.DatabaseConnectors
     {
         public static IDatabaseConnector DatabaseConnectorFromSettings()
         {
-            var sqlType = mRemoteNG.Settings.Default.SQLServerType;
+            var sqlType = Properties.Settings.Default.SQLServerType;
-            var sqlHost = mRemoteNG.Settings.Default.SQLHost;
+            var sqlHost = Properties.Settings.Default.SQLHost;
-            var sqlCatalog = mRemoteNG.Settings.Default.SQLDatabaseName;
+            var sqlCatalog = Properties.Settings.Default.SQLDatabaseName;
-            var sqlUsername = mRemoteNG.Settings.Default.SQLUser;
+            var sqlUsername = Properties.Settings.Default.SQLUser;
             var cryptographyProvider = new LegacyRijndaelCryptographyProvider();
-            var sqlPassword = cryptographyProvider.Decrypt(mRemoteNG.Settings.Default.SQLPass, Runtime.EncryptionKey);
+            var sqlPassword = cryptographyProvider.Decrypt(Properties.Settings.Default.SQLPass, Runtime.EncryptionKey);
 
             return DatabaseConnector(sqlType, sqlHost, sqlCatalog, sqlUsername, sqlPassword);
         }

mRemoteNG/Config/Import/ActiveDirectoryImporter.cs

@@ -2,6 +2,7 @@ using System;
 using System.Linq;
 using mRemoteNG.App;
 using mRemoteNG.Config.Serializers;
+using mRemoteNG.Config.Serializers.MiscSerializers;
 using mRemoteNG.Container;
 using mRemoteNG.Tools;
 

mRemoteNG/Config/Import/MRemoteNGCsvImporter.cs

@@ -2,7 +2,7 @@
 using System.Linq;
 using mRemoteNG.App;
 using mRemoteNG.Config.DataProviders;
-using mRemoteNG.Config.Serializers.Csv;
+using mRemoteNG.Config.Serializers.ConnectionSerializers.Csv;
 using mRemoteNG.Container;
 using mRemoteNG.Messages;
 

mRemoteNG/Config/Import/MRemoteNGXmlImporter.cs

@@ -2,7 +2,7 @@
 using System.Linq;
 using mRemoteNG.App;
 using mRemoteNG.Config.DataProviders;
-using mRemoteNG.Config.Serializers.Xml;
+using mRemoteNG.Config.Serializers.ConnectionSerializers.Xml;
 using mRemoteNG.Container;
 using mRemoteNG.Messages;
 

mRemoteNG/Config/Import/PortScanImporter.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using mRemoteNG.Config.Serializers;
+using mRemoteNG.Config.Serializers.MiscSerializers;
 using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Container;
 using mRemoteNG.Tools;

mRemoteNG/Config/Import/PuttyConnectionManagerImporter.cs

@@ -1,6 +1,7 @@
 using System.Linq;
 using mRemoteNG.Config.DataProviders;
 using mRemoteNG.Config.Serializers;
+using mRemoteNG.Config.Serializers.MiscSerializers;
 using mRemoteNG.Container;
 
 

mRemoteNG/Config/Import/RemoteDesktopConnectionImporter.cs

@@ -2,6 +2,7 @@ using System.IO;
 using System.Linq;
 using mRemoteNG.Config.DataProviders;
 using mRemoteNG.Config.Serializers;
+using mRemoteNG.Config.Serializers.MiscSerializers;
 using mRemoteNG.Container;
 
 

mRemoteNG/Config/Import/RemoteDesktopConnectionManagerImporter.cs

@@ -1,6 +1,7 @@
 using System.Linq;
 using mRemoteNG.Config.DataProviders;
 using mRemoteNG.Config.Serializers;
+using mRemoteNG.Config.Serializers.MiscSerializers;
 using mRemoteNG.Container;
 
 

mRemoteNG/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormat.cs

@@ -11,7 +11,7 @@ using mRemoteNG.Container;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
 
-namespace mRemoteNG.Config.Serializers.Csv
+namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Csv
 {
     public class CsvConnectionsDeserializerMremotengFormat : IDeserializer<string, ConnectionTreeModel>
     {

mRemoteNG/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsSerializerMremotengFormat.cs

@@ -1,15 +1,15 @@
-using mRemoteNG.Connection;
+using System;
+using System.Linq;
+using System.Text;
+using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.Credential;
 using mRemoteNG.Security;
 using mRemoteNG.Tools;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
-using System;
-using System.Linq;
-using System.Text;
 
-namespace mRemoteNG.Config.Serializers.Csv
+namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Csv
 {
     public class CsvConnectionsSerializerMremotengFormat : ISerializer<ConnectionInfo, string>
     {

mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableDeserializer.cs

@@ -1,4 +1,9 @@
-using mRemoteNG.App;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Security;
+using mRemoteNG.App;
 using mRemoteNG.Connection;
 using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Connection.Protocol.Http;
@@ -6,17 +11,12 @@ using mRemoteNG.Connection.Protocol.ICA;
 using mRemoteNG.Connection.Protocol.RDP;
 using mRemoteNG.Connection.Protocol.VNC;
 using mRemoteNG.Container;
-using mRemoteNG.Tree;
-using mRemoteNG.Tree.Root;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Security;
 using mRemoteNG.Security;
 using mRemoteNG.Tools;
+using mRemoteNG.Tree;
+using mRemoteNG.Tree.Root;
 
-namespace mRemoteNG.Config.Serializers.MsSql
+namespace mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql
 {
     public class DataTableDeserializer : IDeserializer<DataTable, ConnectionTreeModel>
     {

mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableSerializer.cs

@@ -1,16 +1,16 @@
-using mRemoteNG.Connection;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Security;
+using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.Security;
 using mRemoteNG.Tools;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Security;
 
-namespace mRemoteNG.Config.Serializers.MsSql
+namespace mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql
 {
     public class DataTableSerializer : ISerializer<ConnectionInfo, DataTable>
     {

mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/LocalConnectionPropertiesModel.cs

@@ -1,4 +1,4 @@
-namespace mRemoteNG.Config.Serializers.MsSql
+namespace mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql
 {
     public class LocalConnectionPropertiesModel
     {

mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/LocalConnectionPropertiesXmlSerializer.cs

@@ -6,7 +6,7 @@ using System.Text;
 using System.Xml;
 using System.Xml.Linq;
 
-namespace mRemoteNG.Config.Serializers.MsSql
+namespace mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql
 {
     public class LocalConnectionPropertiesXmlSerializer :
         ISerializer<IEnumerable<LocalConnectionPropertiesModel>, string>,

mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/SqlConnectionListMetaData.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace mRemoteNG.Config.Serializers.MsSql
+namespace mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql
 {
     public class SqlConnectionListMetaData
     {

mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/SqlDatabaseMetaDataRetriever.cs

@@ -10,7 +10,7 @@ using mRemoteNG.Security.SymmetricEncryption;
 using mRemoteNG.Tools;
 using mRemoteNG.Tree.Root;
 
-namespace mRemoteNG.Config.Serializers.MsSql
+namespace mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql
 {
     public class SqlDatabaseMetaDataRetriever
     {

mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer26.cs

@@ -1,11 +1,11 @@
-using mRemoteNG.Connection;
+using System;
-using mRemoteNG.Container;
-using mRemoteNG.Security;
-using System;
 using System.Security;
 using System.Xml.Linq;
+using mRemoteNG.Connection;
+using mRemoteNG.Container;
+using mRemoteNG.Security;
 
-namespace mRemoteNG.Config.Serializers.Xml
+namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml
 {
     // ReSharper disable once InconsistentNaming
     public class XmlConnectionNodeSerializer26 : ISerializer<ConnectionInfo, XElement>

mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer27.cs

@@ -1,12 +1,12 @@
-using mRemoteNG.App;
+using System;
+using System.Security;
+using System.Xml.Linq;
+using mRemoteNG.App;
 using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.Security;
-using System;
-using System.Security;
-using System.Xml.Linq;
 
-namespace mRemoteNG.Config.Serializers.Xml
+namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml
 {
     // ReSharper disable once InconsistentNaming
     public class XmlConnectionNodeSerializer27 : ISerializer<ConnectionInfo, XElement>

mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionSerializerFactory.cs

@@ -4,7 +4,7 @@ using mRemoteNG.Security;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
 
-namespace mRemoteNG.Config.Serializers.Xml
+namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml
 {
     public class XmlConnectionSerializerFactory
     {

mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializer.cs

@@ -1,4 +1,9 @@
-using mRemoteNG.App;
+using System;
+using System.Globalization;
+using System.Security;
+using System.Windows.Forms;
+using System.Xml;
+using mRemoteNG.App;
 using mRemoteNG.Connection;
 using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Connection.Protocol.Http;
@@ -7,20 +12,15 @@ using mRemoteNG.Connection.Protocol.RDP;
 using mRemoteNG.Connection.Protocol.VNC;
 using mRemoteNG.Container;
 using mRemoteNG.Messages;
+using mRemoteNG.Resources.Language;
 using mRemoteNG.Security;
 using mRemoteNG.Tools;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
 using mRemoteNG.UI.Forms;
 using mRemoteNG.UI.TaskDialog;
-using System;
-using System.Globalization;
-using System.Security;
-using System.Windows.Forms;
-using System.Xml;
-using mRemoteNG.Config.Serializers.ConnectionSerializers.Xml;
 
-namespace mRemoteNG.Config.Serializers.Xml
+namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml
 {
     public class XmlConnectionsDeserializer : IDeserializer<string, ConnectionTreeModel>
     {

mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDocumentCompiler.cs

@@ -1,14 +1,14 @@
-using mRemoteNG.Connection;
+using System;
+using System.Linq;
+using System.Security;
+using System.Xml.Linq;
+using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.Security;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
-using System;
-using System.Linq;
-using System.Security;
-using System.Xml.Linq;
 
-namespace mRemoteNG.Config.Serializers.Xml
+namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml
 {
     public class XmlConnectionsDocumentCompiler
     {

mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDocumentEncryptor.cs

@@ -2,7 +2,7 @@
 using System.Xml.Linq;
 using mRemoteNG.Security;
 
-namespace mRemoteNG.Config.Serializers.Xml
+namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml
 {
     public class XmlConnectionsDocumentEncryptor
     {

mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsSerializer.cs

@@ -1,16 +1,16 @@
-using mRemoteNG.App;
+using System;
-using mRemoteNG.Connection;
-using mRemoteNG.Security;
-using mRemoteNG.Tree;
-using mRemoteNG.Tree.Root;
-using System;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Xml;
 using System.Xml.Linq;
+using mRemoteNG.App;
+using mRemoteNG.Connection;
+using mRemoteNG.Security;
+using mRemoteNG.Tree;
+using mRemoteNG.Tree.Root;
 
-namespace mRemoteNG.Config.Serializers.Xml
+namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml
 {
     public class XmlConnectionsSerializer : ISerializer<ConnectionTreeModel, string>,
                                             ISerializer<ConnectionInfo, string>

mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlRootNodeSerializer.cs

@@ -1,9 +1,9 @@
-using mRemoteNG.Security;
+using System;
-using mRemoteNG.Tree.Root;
-using System;
 using System.Xml.Linq;
+using mRemoteNG.Security;
+using mRemoteNG.Tree.Root;
 
-namespace mRemoteNG.Config.Serializers.Xml
+namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml
 {
     public class XmlRootNodeSerializer
     {

mRemoteNG/Config/Serializers/MiscSerializers/ActiveDirectoryDeserializer.cs

@@ -6,12 +6,12 @@ using mRemoteNG.Config.Import;
 using mRemoteNG.Connection;
 using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Container;
+using mRemoteNG.Resources.Language;
 using mRemoteNG.Tools;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
 
-
+namespace mRemoteNG.Config.Serializers.MiscSerializers
-namespace mRemoteNG.Config.Serializers
 {
     public class ActiveDirectoryDeserializer
     {

mRemoteNG/Config/Serializers/MiscSerializers/PortScanDeserializer.cs

@@ -6,8 +6,7 @@ using mRemoteNG.Tools;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
 
-
+namespace mRemoteNG.Config.Serializers.MiscSerializers
-namespace mRemoteNG.Config.Serializers
 {
     public class PortScanDeserializer : IDeserializer<IEnumerable<ScanHost>, ConnectionTreeModel>
     {

mRemoteNG/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializer.cs

@@ -7,7 +7,7 @@ using mRemoteNG.Container;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
 
-namespace mRemoteNG.Config.Serializers
+namespace mRemoteNG.Config.Serializers.MiscSerializers
 {
     public class PuttyConnectionManagerDeserializer : IDeserializer<string, ConnectionTreeModel>
     {

mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializer.cs

@@ -1,10 +1,10 @@
-using mRemoteNG.Connection;
+using System;
+using mRemoteNG.Connection;
 using mRemoteNG.Connection.Protocol.RDP;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
-using System;
 
-namespace mRemoteNG.Config.Serializers
+namespace mRemoteNG.Config.Serializers.MiscSerializers
 {
     public class RemoteDesktopConnectionDeserializer : IDeserializer<string, ConnectionTreeModel>
     {

mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs

@@ -7,11 +7,11 @@ using mRemoteNG.Connection;
 using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Connection.Protocol.RDP;
 using mRemoteNG.Container;
+using mRemoteNG.Resources.Language;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
 
-
+namespace mRemoteNG.Config.Serializers.MiscSerializers
-namespace mRemoteNG.Config.Serializers
 {
 	public class RemoteDesktopConnectionManagerDeserializer : IDeserializer<string, ConnectionTreeModel>
     {

mRemoteNG/Config/Serializers/Versioning/SqlDatabaseVersionVerifier.cs

@@ -3,6 +3,7 @@ using mRemoteNG.App.Info;
 using mRemoteNG.Config.DatabaseConnectors;
 using mRemoteNG.Messages;
 using System;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Config.Serializers.Versioning
 {

mRemoteNG/Config/Settings/ExternalAppsLoader.cs

@@ -105,7 +105,7 @@ namespace mRemoteNG.Config.Settings
                 Runtime.ExternalToolsService.ExternalTools.Add(extA);
             }
 
-            _externalToolsToolStrip.SwitchToolBarText(mRemoteNG.Settings.Default.ExtAppsTBShowText);
+            _externalToolsToolStrip.SwitchToolBarText(Properties.Settings.Default.ExtAppsTBShowText);
             _externalToolsToolStrip.AddExternalToolsToToolBar();
         }
     }

mRemoteNG/Config/Settings/Settings.cs

@@ -1,4 +1,4 @@
-namespace mRemoteNG
+namespace mRemoteNG.Config.Settings
 {
     // This class allows you to handle specific events on the settings class:
     //  The SettingChanging event is raised before a setting's value is changed.

mRemoteNG/Config/Settings/SettingsLoader.cs

@@ -74,7 +74,7 @@ namespace mRemoteNG.Config.Settings
                 LoadExternalAppsFromXml();
                 SetAlwaysShowPanelTabs();
 
-                if (mRemoteNG.Settings.Default.ResetToolbars)
+                if (Properties.Settings.Default.ResetToolbars)
                     SetToolbarsDefault();
                 else
                     LoadToolbarsFromSettings();
@@ -87,16 +87,16 @@ namespace mRemoteNG.Config.Settings
 
         private static void SetAlwaysShowPanelTabs()
         {
-            if (mRemoteNG.Settings.Default.AlwaysShowPanelTabs)
+            if (Properties.Settings.Default.AlwaysShowPanelTabs)
                 FrmMain.Default.pnlDock.DocumentStyle = DocumentStyle.DockingWindow;
         }
 
 
         private void SetSupportedCulture()
         {
-            if (mRemoteNG.Settings.Default.OverrideUICulture == "" ||
+            if (Properties.Settings.Default.OverrideUICulture == "" ||
-                !SupportedCultures.IsNameSupported(mRemoteNG.Settings.Default.OverrideUICulture)) return;
+                !SupportedCultures.IsNameSupported(Properties.Settings.Default.OverrideUICulture)) return;
-            Thread.CurrentThread.CurrentUICulture = new CultureInfo(mRemoteNG.Settings.Default.OverrideUICulture);
+            Thread.CurrentThread.CurrentUICulture = new CultureInfo(Properties.Settings.Default.OverrideUICulture);
             _messageCollector.AddMessage(MessageClass.InformationMsg,
                                          $"Override Culture: {Thread.CurrentThread.CurrentUICulture.Name}/{Thread.CurrentThread.CurrentUICulture.NativeName}",
                                          true);
@@ -105,22 +105,22 @@ namespace mRemoteNG.Config.Settings
         private void SetApplicationWindowPositionAndSize()
         {
             MainForm.WindowState = FormWindowState.Normal;
-            if (mRemoteNG.Settings.Default.MainFormState == FormWindowState.Normal)
+            if (Properties.Settings.Default.MainFormState == FormWindowState.Normal)
             {
-                if (!mRemoteNG.Settings.Default.MainFormLocation.IsEmpty)
+                if (!Properties.Settings.Default.MainFormLocation.IsEmpty)
-                    MainForm.Location = mRemoteNG.Settings.Default.MainFormLocation;
+                    MainForm.Location = Properties.Settings.Default.MainFormLocation;
-                if (!mRemoteNG.Settings.Default.MainFormSize.IsEmpty)
+                if (!Properties.Settings.Default.MainFormSize.IsEmpty)
-                    MainForm.Size = mRemoteNG.Settings.Default.MainFormSize;
+                    MainForm.Size = Properties.Settings.Default.MainFormSize;
             }
             else
             {
-                if (!mRemoteNG.Settings.Default.MainFormRestoreLocation.IsEmpty)
+                if (!Properties.Settings.Default.MainFormRestoreLocation.IsEmpty)
-                    MainForm.Location = mRemoteNG.Settings.Default.MainFormRestoreLocation;
+                    MainForm.Location = Properties.Settings.Default.MainFormRestoreLocation;
-                if (!mRemoteNG.Settings.Default.MainFormRestoreSize.IsEmpty)
+                if (!Properties.Settings.Default.MainFormRestoreSize.IsEmpty)
-                    MainForm.Size = mRemoteNG.Settings.Default.MainFormRestoreSize;
+                    MainForm.Size = Properties.Settings.Default.MainFormRestoreSize;
             }
 
-            if (mRemoteNG.Settings.Default.MainFormState == FormWindowState.Maximized)
+            if (Properties.Settings.Default.MainFormState == FormWindowState.Maximized)
             {
                 MainForm.WindowState = FormWindowState.Maximized;
             }
@@ -145,33 +145,33 @@ namespace mRemoteNG.Config.Settings
 
         private void SetAutoSave()
         {
-            if (mRemoteNG.Settings.Default.AutoSaveEveryMinutes <= 0) return;
+            if (Properties.Settings.Default.AutoSaveEveryMinutes <= 0) return;
-            MainForm.tmrAutoSave.Interval = mRemoteNG.Settings.Default.AutoSaveEveryMinutes * 60000;
+            MainForm.tmrAutoSave.Interval = Properties.Settings.Default.AutoSaveEveryMinutes * 60000;
             MainForm.tmrAutoSave.Enabled = true;
         }
 
         private void SetKioskMode()
         {
-            if (!mRemoteNG.Settings.Default.MainFormKiosk) return;
+            if (!Properties.Settings.Default.MainFormKiosk) return;
             MainForm.Fullscreen.Value = true;
         }
 
         private static void SetShowSystemTrayIcon()
         {
-            if (mRemoteNG.Settings.Default.ShowSystemTrayIcon)
+            if (Properties.Settings.Default.ShowSystemTrayIcon)
                 Runtime.NotificationAreaIcon = new NotificationAreaIcon();
         }
 
         private static void SetPuttyPath()
         {
-            PuttyBase.PuttyPath = mRemoteNG.Settings.Default.UseCustomPuttyPath
+            PuttyBase.PuttyPath = Properties.Settings.Default.UseCustomPuttyPath
-                ? mRemoteNG.Settings.Default.CustomPuttyPath
+                ? Properties.Settings.Default.CustomPuttyPath
                 : GeneralAppInfo.PuttyPath;
         }
 
         private void EnsureSettingsAreSavedInNewestVersion()
         {
-            if (mRemoteNG.Settings.Default.DoUpgrade)
+            if (Properties.Settings.Default.DoUpgrade)
                 UpgradeSettingsVersion();
         }
 
@@ -179,20 +179,20 @@ namespace mRemoteNG.Config.Settings
         {
             try
             {
-                mRemoteNG.Settings.Default.Save();
+                Properties.Settings.Default.Save();
-                mRemoteNG.Settings.Default.Upgrade();
+                Properties.Settings.Default.Upgrade();
             }
             catch (Exception ex)
             {
                 _messageCollector.AddExceptionMessage("Settings.Upgrade() failed", ex);
             }
 
-            mRemoteNG.Settings.Default.DoUpgrade = false;
+            Properties.Settings.Default.DoUpgrade = false;
 
             // Clear pending update flag
             // This is used for automatic updates, not for settings migration, but it
             // needs to be cleared here because we know that we just updated.
-            mRemoteNG.Settings.Default.UpdatePending = false;
+            Properties.Settings.Default.UpdatePending = false;
         }
 
         private void SetToolbarsDefault()
@@ -236,30 +236,30 @@ namespace mRemoteNG.Config.Settings
         private void AddQuickConnectPanel()
         {
             SetToolstripGripStyle(_quickConnectToolStrip);
-            _quickConnectToolStrip.Visible = mRemoteNG.Settings.Default.QuickyTBVisible;
+            _quickConnectToolStrip.Visible = Properties.Settings.Default.QuickyTBVisible;
-            var toolStripPanel = ToolStripPanelFromString(mRemoteNG.Settings.Default.QuickyTBParentDock);
+            var toolStripPanel = ToolStripPanelFromString(Properties.Settings.Default.QuickyTBParentDock);
-            toolStripPanel.Join(_quickConnectToolStrip, mRemoteNG.Settings.Default.QuickyTBLocation);
+            toolStripPanel.Join(_quickConnectToolStrip, Properties.Settings.Default.QuickyTBLocation);
         }
 
         private void AddExternalAppsPanel()
         {
             SetToolstripGripStyle(_externalToolsToolStrip);
-            _externalToolsToolStrip.Visible = mRemoteNG.Settings.Default.ExtAppsTBVisible;
+            _externalToolsToolStrip.Visible = Properties.Settings.Default.ExtAppsTBVisible;
-            var toolStripPanel = ToolStripPanelFromString(mRemoteNG.Settings.Default.ExtAppsTBParentDock);
+            var toolStripPanel = ToolStripPanelFromString(Properties.Settings.Default.ExtAppsTBParentDock);
-            toolStripPanel.Join(_externalToolsToolStrip, mRemoteNG.Settings.Default.ExtAppsTBLocation);
+            toolStripPanel.Join(_externalToolsToolStrip, Properties.Settings.Default.ExtAppsTBLocation);
         }
 
         private void AddMultiSshPanel()
         {
             SetToolstripGripStyle(_multiSshToolStrip);
-            _multiSshToolStrip.Visible = mRemoteNG.Settings.Default.MultiSshToolbarVisible;
+            _multiSshToolStrip.Visible = Properties.Settings.Default.MultiSshToolbarVisible;
-            var toolStripPanel = ToolStripPanelFromString(mRemoteNG.Settings.Default.MultiSshToolbarParentDock);
+            var toolStripPanel = ToolStripPanelFromString(Properties.Settings.Default.MultiSshToolbarParentDock);
-            toolStripPanel.Join(_multiSshToolStrip, mRemoteNG.Settings.Default.MultiSshToolbarLocation);
+            toolStripPanel.Join(_multiSshToolStrip, Properties.Settings.Default.MultiSshToolbarLocation);
         }
 
         private void SetToolstripGripStyle(ToolStrip toolbar)
         {
-            toolbar.GripStyle = mRemoteNG.Settings.Default.LockToolbars
+            toolbar.GripStyle = Properties.Settings.Default.LockToolbars
                 ? ToolStripGripStyle.Hidden
                 : ToolStripGripStyle.Visible;
         }

mRemoteNG/Config/Settings/SettingsSaver.cs

@@ -25,32 +25,32 @@ namespace mRemoteNG.Config.Settings
                     frmMain.WindowState = FormWindowState.Maximized;
                 }
 
-                mRemoteNG.Settings.Default.MainFormLocation = frmMain.Location;
+                Properties.Settings.Default.MainFormLocation = frmMain.Location;
-                mRemoteNG.Settings.Default.MainFormSize = frmMain.Size;
+                Properties.Settings.Default.MainFormSize = frmMain.Size;
 
                 if (frmMain.WindowState != FormWindowState.Normal)
                 {
-                    mRemoteNG.Settings.Default.MainFormRestoreLocation = frmMain.RestoreBounds.Location;
+                    Properties.Settings.Default.MainFormRestoreLocation = frmMain.RestoreBounds.Location;
-                    mRemoteNG.Settings.Default.MainFormRestoreSize = frmMain.RestoreBounds.Size;
+                    Properties.Settings.Default.MainFormRestoreSize = frmMain.RestoreBounds.Size;
                 }
 
-                mRemoteNG.Settings.Default.MainFormState = frmMain.WindowState;
+                Properties.Settings.Default.MainFormState = frmMain.WindowState;
 
                 if (frmMain.Fullscreen != null)
                 {
-                    mRemoteNG.Settings.Default.MainFormKiosk = frmMain.Fullscreen.Value;
+                    Properties.Settings.Default.MainFormKiosk = frmMain.Fullscreen.Value;
                 }
 
-                mRemoteNG.Settings.Default.FirstStart = false;
+                Properties.Settings.Default.FirstStart = false;
-                mRemoteNG.Settings.Default.ResetPanels = false;
+                Properties.Settings.Default.ResetPanels = false;
-                mRemoteNG.Settings.Default.ResetToolbars = false;
+                Properties.Settings.Default.ResetToolbars = false;
-                mRemoteNG.Settings.Default.NoReconnect = false;
+                Properties.Settings.Default.NoReconnect = false;
 
                 SaveExternalAppsToolbarLocation(externalToolsToolStrip);
                 SaveQuickConnectToolbarLocation(quickConnectToolStrip);
                 SaveMultiSshToolbarLocation(multiSshToolStrip);
 
-                mRemoteNG.Settings.Default.Save();
+                Properties.Settings.Default.Save();
 
                 SaveDockPanelLayout();
                 SaveExternalApps();
@@ -63,35 +63,35 @@ namespace mRemoteNG.Config.Settings
 
         private static void SaveExternalAppsToolbarLocation(ExternalToolsToolStrip externalToolsToolStrip)
         {
-            mRemoteNG.Settings.Default.ExtAppsTBLocation = externalToolsToolStrip.Location;
+            Properties.Settings.Default.ExtAppsTBLocation = externalToolsToolStrip.Location;
-            mRemoteNG.Settings.Default.ExtAppsTBVisible = externalToolsToolStrip.Visible;
+            Properties.Settings.Default.ExtAppsTBVisible = externalToolsToolStrip.Visible;
-            mRemoteNG.Settings.Default.ExtAppsTBShowText = externalToolsToolStrip.CMenToolbarShowText.Checked;
+            Properties.Settings.Default.ExtAppsTBShowText = externalToolsToolStrip.CMenToolbarShowText.Checked;
 
             if (externalToolsToolStrip.Parent != null)
             {
-                mRemoteNG.Settings.Default.ExtAppsTBParentDock = externalToolsToolStrip.Parent.Dock.ToString();
+                Properties.Settings.Default.ExtAppsTBParentDock = externalToolsToolStrip.Parent.Dock.ToString();
             }
         }
 
         private static void SaveQuickConnectToolbarLocation(Control quickConnectToolStrip)
         {
-            mRemoteNG.Settings.Default.QuickyTBLocation = quickConnectToolStrip.Location;
+            Properties.Settings.Default.QuickyTBLocation = quickConnectToolStrip.Location;
-            mRemoteNG.Settings.Default.QuickyTBVisible = quickConnectToolStrip.Visible;
+            Properties.Settings.Default.QuickyTBVisible = quickConnectToolStrip.Visible;
 
             if (quickConnectToolStrip.Parent != null)
             {
-                mRemoteNG.Settings.Default.QuickyTBParentDock = quickConnectToolStrip.Parent.Dock.ToString();
+                Properties.Settings.Default.QuickyTBParentDock = quickConnectToolStrip.Parent.Dock.ToString();
             }
         }
 
         private static void SaveMultiSshToolbarLocation(MultiSshToolStrip multiSshToolStrip)
         {
-            mRemoteNG.Settings.Default.MultiSshToolbarLocation = multiSshToolStrip.Location;
+            Properties.Settings.Default.MultiSshToolbarLocation = multiSshToolStrip.Location;
-            mRemoteNG.Settings.Default.MultiSshToolbarVisible = multiSshToolStrip.Visible;
+            Properties.Settings.Default.MultiSshToolbarVisible = multiSshToolStrip.Visible;
 
             if (multiSshToolStrip.Parent != null)
             {
-                mRemoteNG.Settings.Default.MultiSshToolbarParentDock = multiSshToolStrip.Parent.Dock.ToString();
+                Properties.Settings.Default.MultiSshToolbarParentDock = multiSshToolStrip.Parent.Dock.ToString();
             }
         }
 

mRemoteNG/Connection/AbstractConnectionRecord.cs

@@ -5,6 +5,8 @@ using mRemoteNG.Connection.Protocol.Http;
 using mRemoteNG.Connection.Protocol.ICA;
 using mRemoteNG.Connection.Protocol.RDP;
 using mRemoteNG.Connection.Protocol.VNC;
+using mRemoteNG.Properties;
+using mRemoteNG.Resources.Language;
 using mRemoteNG.Tools;
 using mRemoteNG.Tools.Attributes;
 

mRemoteNG/Connection/ConnectionInfo.cs

@@ -15,6 +15,8 @@ using mRemoteNG.Connection.Protocol.SSH;
 using mRemoteNG.Connection.Protocol.Telnet;
 using mRemoteNG.Connection.Protocol.VNC;
 using mRemoteNG.Container;
+using mRemoteNG.Properties;
+using mRemoteNG.Resources.Language;
 using mRemoteNG.Tree;
 
 

mRemoteNG/Connection/ConnectionInfoInheritance.cs

@@ -2,6 +2,7 @@
 using System.ComponentModel;
 using System.Linq;
 using System.Reflection;
+using mRemoteNG.Resources.Language;
 using mRemoteNG.Tools;
 
 namespace mRemoteNG.Connection

mRemoteNG/Connection/ConnectionInitiator.cs

@@ -5,6 +5,8 @@ using mRemoteNG.App;
 using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Container;
 using mRemoteNG.Messages;
+using mRemoteNG.Properties;
+using mRemoteNG.Resources.Language;
 using mRemoteNG.Tools;
 using mRemoteNG.Tree;
 using mRemoteNG.UI.Forms;

mRemoteNG/Connection/ConnectionsService.cs

@@ -9,9 +9,11 @@ using mRemoteNG.Config.Connections;
 using mRemoteNG.Config.Connections.Multiuser;
 using mRemoteNG.Config.DataProviders;
 using mRemoteNG.Config.Putty;
-using mRemoteNG.Config.Serializers.MsSql;
+using mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql;
 using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Messages;
+using mRemoteNG.Properties;
+using mRemoteNG.Resources.Language;
 using mRemoteNG.Security;
 using mRemoteNG.Tools;
 using mRemoteNG.Tree;

mRemoteNG/Connection/Protocol/Http/Connection.Protocol.HTTPBase.cs

@@ -4,6 +4,7 @@ using CefSharp;
 using CefSharp.WinForms;
 using mRemoteNG.Tools;
 using mRemoteNG.App;
+using mRemoteNG.Resources.Language;
 using mRemoteNG.UI.Tabs;
 
 

mRemoteNG/Connection/Protocol/ICA/IcaProtocol.cs

@@ -9,6 +9,8 @@ using System;
 using System.Threading;
 using System.Timers;
 using System.Windows.Forms;
+using mRemoteNG.Properties;
+using mRemoteNG.Resources.Language;
 
 
 namespace mRemoteNG.Connection.Protocol.ICA

mRemoteNG/Connection/Protocol/IntegratedProgram.cs

@@ -5,6 +5,8 @@ using System.Threading;
 using System.Windows.Forms;
 using mRemoteNG.App;
 using mRemoteNG.Messages;
+using mRemoteNG.Properties;
+using mRemoteNG.Resources.Language;
 using mRemoteNG.Tools;
 
 namespace mRemoteNG.Connection.Protocol

mRemoteNG/Connection/Protocol/PowerShell/Connection.Protocol.PowerShell.cs

@@ -3,6 +3,7 @@ using System.Drawing;
 using System.Windows.Forms;
 using mRemoteNG.App;
 using mRemoteNG.Messages;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Connection.Protocol.PowerShell
 {

mRemoteNG/Connection/Protocol/ProtocolFactory.cs

@@ -8,6 +8,8 @@ using mRemoteNG.Connection.Protocol.Telnet;
 using mRemoteNG.Connection.Protocol.VNC;
 using System;
 using mRemoteNG.Connection.Protocol.PowerShell;
+using mRemoteNG.Properties;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Connection.Protocol
 {

mRemoteNG/Connection/Protocol/ProtocolType.cs

@@ -1,4 +1,5 @@
-using mRemoteNG.Tools;
+using mRemoteNG.Resources.Language;
+using mRemoteNG.Tools;
 
 namespace mRemoteNG.Connection.Protocol
 {

mRemoteNG/Connection/Protocol/PuttyBase.cs

@@ -9,6 +9,8 @@ using System.Diagnostics;
 using System.Drawing;
 using System.Threading;
 using System.Windows.Forms;
+using mRemoteNG.Properties;
+using mRemoteNG.Resources.Language;
 
 // ReSharper disable ArrangeAccessorOwnerBody
 

mRemoteNG/Connection/Protocol/RDP/AuthenticationLevel.cs

@@ -1,4 +1,5 @@
-using mRemoteNG.Tools;
+using mRemoteNG.Resources.Language;
+using mRemoteNG.Tools;
 
 namespace mRemoteNG.Connection.Protocol.RDP
 {

mRemoteNG/Connection/Protocol/RDP/RDGatewayUsageMethod.cs

@@ -1,4 +1,5 @@
-using mRemoteNG.Tools;
+using mRemoteNG.Resources.Language;
+using mRemoteNG.Tools;
 
 namespace mRemoteNG.Connection.Protocol.RDP
 {

mRemoteNG/Connection/Protocol/RDP/RDGatewayUseConnectionCredentials.cs

@@ -1,4 +1,5 @@
-using mRemoteNG.Tools;
+using mRemoteNG.Resources.Language;
+using mRemoteNG.Tools;
 
 namespace mRemoteNG.Connection.Protocol.RDP
 {

mRemoteNG/Connection/Protocol/RDP/RDPColors.cs

@@ -1,4 +1,5 @@
-using mRemoteNG.Tools;
+using mRemoteNG.Resources.Language;
+using mRemoteNG.Tools;
 
 namespace mRemoteNG.Connection.Protocol.RDP
 {

mRemoteNG/Connection/Protocol/RDP/RDPResolutions.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel;
+using mRemoteNG.Resources.Language;
 using mRemoteNG.Tools;
 
 namespace mRemoteNG.Connection.Protocol.RDP

mRemoteNG/Connection/Protocol/RDP/RDPSoundQuality.cs

@@ -1,4 +1,5 @@
-using mRemoteNG.Tools;
+using mRemoteNG.Resources.Language;
+using mRemoteNG.Tools;
 
 namespace mRemoteNG.Connection.Protocol.RDP
 {

mRemoteNG/Connection/Protocol/RDP/RDPSounds.cs

@@ -1,4 +1,5 @@
-using mRemoteNG.Tools;
+using mRemoteNG.Resources.Language;
+using mRemoteNG.Tools;
 
 namespace mRemoteNG.Connection.Protocol.RDP
 {

mRemoteNG/Connection/Protocol/RDP/RdpErrorCodes.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using mRemoteNG.App;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Connection.Protocol.RDP
 {

mRemoteNG/Connection/Protocol/RDP/RdpProtocol6.cs

@@ -7,6 +7,8 @@ using System.Windows.Forms;
 using AxMSTSCLib;
 using mRemoteNG.App;
 using mRemoteNG.Messages;
+using mRemoteNG.Properties;
+using mRemoteNG.Resources.Language;
 using mRemoteNG.Security.SymmetricEncryption;
 using mRemoteNG.Tools;
 using mRemoteNG.UI;

mRemoteNG/Connection/Protocol/RDP/RdpProtocol7.cs

@@ -3,6 +3,7 @@ using mRemoteNG.App;
 using MSTSCLib;
 using System;
 using System.Windows.Forms;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Connection.Protocol.RDP
 {

mRemoteNG/Connection/Protocol/RDP/RdpProtocol8.cs

@@ -4,6 +4,7 @@ using System.Windows.Forms;
 using AxMSTSCLib;
 using mRemoteNG.App;
 using mRemoteNG.Messages;
+using mRemoteNG.Resources.Language;
 using MSTSCLib;
 
 namespace mRemoteNG.Connection.Protocol.RDP

mRemoteNG/Connection/Protocol/VNC/Connection.Protocol.VNC.cs

@@ -3,6 +3,7 @@ using System.Threading;
 using System.ComponentModel;
 using System.Net.Sockets;
 using mRemoteNG.App;
+using mRemoteNG.Resources.Language;
 using mRemoteNG.Tools;
 using mRemoteNG.UI.Forms;
 

mRemoteNG/Connection/Protocol/VNC/VNCEnum.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel;
+using mRemoteNG.Resources.Language;
 using mRemoteNG.Tools;
 
 namespace mRemoteNG.Connection.Protocol.VNC

mRemoteNG/Connection/PuttySessionInfo.cs

@@ -4,6 +4,7 @@ using mRemoteNG.Tools;
 using System;
 using System.ComponentModel;
 using mRemoteNG.Connection.Protocol;
+using mRemoteNG.Resources.Language;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
 

mRemoteNG/Connection/WebHelper.cs

@@ -1,4 +1,5 @@
 using mRemoteNG.Connection.Protocol;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Connection
 {

mRemoteNG/Credential/CredentialDeletionMsgBoxConfirmer.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
+using mRemoteNG.Resources.Language;
 using mRemoteNG.Tree;
 
 

mRemoteNG/Credential/PlaceholderCredentialRecord.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using System.Security;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Credential
 {

mRemoteNG/Messages/MessageFilteringOptions/IMessageTypeFilteringOptions.cs

@@ -1,4 +1,4 @@
-namespace mRemoteNG.Messages
+namespace mRemoteNG.Messages.MessageFilteringOptions
 {
     public interface IMessageTypeFilteringOptions
     {

mRemoteNG/Messages/MessageFilteringOptions/LogMessageTypeFilteringOptions.cs

@@ -1,4 +1,6 @@
-namespace mRemoteNG.Messages
+using mRemoteNG.Properties;
+
+namespace mRemoteNG.Messages.MessageFilteringOptions
 {
     public class LogMessageTypeFilteringOptions : IMessageTypeFilteringOptions
     {

mRemoteNG/Messages/MessageFilteringOptions/NotificationPanelMessageFilteringOptions.cs

@@ -1,4 +1,6 @@
-namespace mRemoteNG.Messages
+using mRemoteNG.Properties;
+
+namespace mRemoteNG.Messages.MessageFilteringOptions
 {
     public class NotificationPanelMessageFilteringOptions : IMessageTypeFilteringOptions
     {

mRemoteNG/Messages/MessageFilteringOptions/NotificationPanelSwitchOnMessageFilteringOptions.cs

@@ -1,4 +1,6 @@
-namespace mRemoteNG.Messages
+using mRemoteNG.Properties;
+
+namespace mRemoteNG.Messages.MessageFilteringOptions
 {
     public class NotificationPanelSwitchOnMessageFilteringOptions : IMessageTypeFilteringOptions
     {

mRemoteNG/Messages/MessageFilteringOptions/PopupMessageFilteringOptions.cs

@@ -1,4 +1,6 @@
-namespace mRemoteNG.Messages
+using mRemoteNG.Properties;
+
+namespace mRemoteNG.Messages.MessageFilteringOptions
 {
     public class PopupMessageFilteringOptions : IMessageTypeFilteringOptions
     {

mRemoteNG/Messages/MessageWriters/PopupMessageWriter.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Windows.Forms;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Messages.MessageWriters
 {

mRemoteNG/Messages/WriterDecorators/MessageFocusDecorator.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using mRemoteNG.Messages.MessageFilteringOptions;
 using mRemoteNG.Messages.MessageWriters;
 using mRemoteNG.UI.Forms;
 using mRemoteNG.UI.Window;

mRemoteNG/Messages/WriterDecorators/MessageTypeFilterDecorator.cs

@@ -1,4 +1,5 @@
 using System;
+using mRemoteNG.Messages.MessageFilteringOptions;
 using mRemoteNG.Messages.MessageWriters;
 
 namespace mRemoteNG.Messages.WriterDecorators

mRemoteNG/Properties/Resources.Designer.cs

@@ -8,10 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace mRemoteNG {
+namespace mRemoteNG.Properties {
-    using System;
-    
-    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

mRemoteNG/Properties/Settings.Designer.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace mRemoteNG {
+namespace mRemoteNG.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

mRemoteNG/Resources/Language/Language.Designer.cs

@@ -8,10 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace mRemoteNG {
+namespace mRemoteNG.Resources.Language {
-    using System;
-    
-    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

mRemoteNG/Resources/Themes/ColorMapTheme.Designer.cs

@@ -8,10 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace mRemoteNG {
+namespace mRemoteNG.Resources.Themes {
-    using System;
-    
-    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

mRemoteNG/Security/Factories/CryptoProviderFactoryFromSettings.cs

@@ -1,4 +1,6 @@
-namespace mRemoteNG.Security.Factories
+using mRemoteNG.Properties;
+
+namespace mRemoteNG.Security.Factories
 {
     public class CryptoProviderFactoryFromSettings : ICryptoProviderFactory
     {