Merge conflicts handled.

Author: Light

SmartSystemMenu/EnumWindows.cs

@@ -31,13 +31,9 @@ public static IList<Window> EnumProcessWindows(int processId, IntPtr[] filterHan
             _filterHandles = filterHandles ?? new IntPtr[0];
             _windows = new List<Window>();
             _menuItems = menuItems;
-<<<<<<< HEAD
+            _menuLanguage = menuLanguage;
             var process = SystemUtils.GetProcessByIdSafely(processId);
             if (process != null)
-=======
-            _menuLanguage = menuLanguage;
-            foreach (ProcessThread thread in Process.GetProcessById(processId).Threads)
->>>>>>> add_language_string
             {
                 foreach (ProcessThread thread in process.Threads)
                 {

SmartSystemMenu/Forms/MainForm.cs

@@ -73,11 +73,8 @@ protected override void OnLoad(EventArgs e)
                     return;
                 }
             }
-<<<<<<< HEAD
-            _systemTrayMenu = new SystemTrayMenu(_settings.ShowSystemTrayIcon);
-=======
-            _systemTrayMenu = new SystemTrayMenu(_settings.MenuLanguage);
->>>>>>> add_language_string
+
+            _systemTrayMenu = new SystemTrayMenu(_settings.ShowSystemTrayIcon, _settings.MenuLanguage);
             _systemTrayMenu.MenuItemAutoStart.Click += MenuItemAutoStartClick;
             _systemTrayMenu.MenuItemSettings.Click += MenuItemSettingsClick;
             _systemTrayMenu.MenuItemAbout.Click += MenuItemAboutClick;

SmartSystemMenu/Settings/SmartSystemMenuSettings.cs

@@ -22,11 +22,8 @@ public SmartSystemMenuSettings()
         {
             ProcessExclusions = new List<string>();
             MenuItems = new MenuItems();
-<<<<<<< HEAD
             ShowSystemTrayIcon = true;
-=======
             MenuLanguage = new MenuLanguage();
->>>>>>> add_language_string
         }
 
         public object Clone()
@@ -146,13 +143,12 @@ public static SmartSystemMenuSettings Read(string fileName, string languageFileN
                 })
                 .ToList();
 
-<<<<<<< HEAD
             var systemTrayIconElement = document.XPathSelectElement("/smartSystemMenu/systemTrayIcon");
             if (systemTrayIconElement != null && systemTrayIconElement.Attribute("show") != null && systemTrayIconElement.Attribute("show").Value != null && systemTrayIconElement.Attribute("show").Value.ToLower() == "false")
             {
                 settings.ShowSystemTrayIcon = false;
             }
-=======
+
             if ((System.Threading.Thread.CurrentThread.CurrentCulture.Name == "zh-CN") || (System.Threading.Thread.CurrentThread.CurrentCulture.Name == "zh-TW"))
             {
                 readLanguage = "/menuLanguage/menuTitleString/cn/stringItem";
@@ -165,7 +161,6 @@ public static SmartSystemMenuSettings Read(string fileName, string languageFileN
                     StringValue = x.Attribute("stringValue") != null ? x.Attribute("stringValue").Value : "",
                 })
                 .ToList();
->>>>>>> add_language_string
 
             return settings;
         }

SmartSystemMenu/SystemTrayMenu.cs

@@ -16,11 +16,7 @@ class SystemTrayMenu
 
         public NotifyIcon Icon { get; private set; }
 
-<<<<<<< HEAD
-        public SystemTrayMenu(bool showIcon)
-=======
-        public SystemTrayMenu(MenuLanguage menuLanguage)
->>>>>>> add_language_string
+        public SystemTrayMenu(bool showIcon, MenuLanguage menuLanguage)
         {
             MenuItemAutoStart = new ToolStripMenuItem();
             MenuItemAutoStart.Name = "miAutoStart";