diff --git a/ShadowsocksX-NG/AppDelegate.swift b/ShadowsocksX-NG/AppDelegate.swift
index 7bbeebf..53cf895 100755
--- a/ShadowsocksX-NG/AppDelegate.swift
+++ b/ShadowsocksX-NG/AppDelegate.swift
@@ -103,7 +103,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
"LocalHTTP.ListenAddress": "127.0.0.1",
"LocalHTTP.ListenPort": NSNumber(value: 1087 as UInt16),
"LocalHTTPOn": true,
- "LocalHTTP.FollowGlobal": true,
+ "LocalHTTP.FollowGlobal": false,
"ProxyExceptions": "127.0.0.1, localhost, 192.168.0.0/16, 10.0.0.0/8, FE80::/64, ::1, FD00::/8",
])
diff --git a/ShadowsocksX-NG/Base.lproj/PreferencesWinController.xib b/ShadowsocksX-NG/Base.lproj/PreferencesWinController.xib
index 3faf730..a86d9f1 100644
--- a/ShadowsocksX-NG/Base.lproj/PreferencesWinController.xib
+++ b/ShadowsocksX-NG/Base.lproj/PreferencesWinController.xib
@@ -19,7 +19,7 @@
-
+
@@ -383,7 +383,7 @@
+
-
+
-
+
-
+
+
+
@@ -436,7 +451,7 @@
-
+
diff --git a/ShadowsocksX-NG/ProxyConfHelper.m b/ShadowsocksX-NG/ProxyConfHelper.m
index e2e8dd6..ea46dbf 100644
--- a/ShadowsocksX-NG/ProxyConfHelper.m
+++ b/ShadowsocksX-NG/ProxyConfHelper.m
@@ -159,16 +159,15 @@ GCDWebServer *webServer =nil;
NSMutableArray* args = [@[@"--mode", @"global", @"--port"
, [NSString stringWithFormat:@"%lu", (unsigned long)port],@"--socks-listen-address",socks5ListenAddress]mutableCopy];
- // Because issue #106 https://github.com/shadowsocks/ShadowsocksX-NG/issues/106
- // Comment below out.
-// if ([[NSUserDefaults standardUserDefaults] boolForKey:@"LocalHTTPOn"] && [[NSUserDefaults standardUserDefaults] boolForKey:@"LocalHTTP.FollowGlobal"]) {
-// NSUInteger privoxyPort = [[NSUserDefaults standardUserDefaults]integerForKey:@"LocalHTTP.ListenPort"];
-// NSString* privoxyListenAddress = [[NSUserDefaults standardUserDefaults]stringForKey:@"LocalHTTP.ListenAddress"];
-// [args addObject:@"--privoxy-port"];
-// [args addObject:[NSString stringWithFormat:@"%lu", (unsigned long)privoxyPort]];
-// [args addObject:@"--privoxy-listen-address"];
-// [args addObject:privoxyListenAddress];
-// }
+ // Known issue #106 https://github.com/shadowsocks/ShadowsocksX-NG/issues/106
+ if ([[NSUserDefaults standardUserDefaults] boolForKey:@"LocalHTTPOn"] && [[NSUserDefaults standardUserDefaults] boolForKey:@"LocalHTTP.FollowGlobal"]) {
+ NSUInteger privoxyPort = [[NSUserDefaults standardUserDefaults]integerForKey:@"LocalHTTP.ListenPort"];
+ NSString* privoxyListenAddress = [[NSUserDefaults standardUserDefaults]stringForKey:@"LocalHTTP.ListenAddress"];
+ [args addObject:@"--privoxy-port"];
+ [args addObject:[NSString stringWithFormat:@"%lu", (unsigned long)privoxyPort]];
+ [args addObject:@"--privoxy-listen-address"];
+ [args addObject:privoxyListenAddress];
+ }
[self addArguments4ManualSpecifyNetworkServices:args];
[self addArguments4ManualSpecifyProxyExceptions:args];
diff --git a/ShadowsocksX-NG/zh-Hans.lproj/PreferencesWinController.strings b/ShadowsocksX-NG/zh-Hans.lproj/PreferencesWinController.strings
index 9bd56b3..d7fbf6f 100644
--- a/ShadowsocksX-NG/zh-Hans.lproj/PreferencesWinController.strings
+++ b/ShadowsocksX-NG/zh-Hans.lproj/PreferencesWinController.strings
@@ -132,3 +132,6 @@
/* Class = "NSTabViewItem"; label = "General"; ObjectID = "xbG-eW-Prj"; */
"xbG-eW-Prj.label" = "常规";
+
+/* Class = "NSButtonCell"; title = "Set HTTP proxy to system proxy configure in global mode"; ObjectID = "m8L-D6-ye3"; */
+"m8L-D6-ye3.title" = "全局模式时,在系统代理中设置HTTP代理服务器";