From e4236f21a14e26aebe795e7e75a3e0b4f6b55cd3 Mon Sep 17 00:00:00 2001 From: Julien Schmidt Date: Thu, 20 Oct 2016 01:14:47 +0800 Subject: [PATCH] Corrected Spellings --- README.md | 28 +++++++++---------- .../AdvPreferencesWindowController.xib | 2 +- ShadowsocksX-NG/Base.lproj/MainMenu.xib | 8 +++--- .../Base.lproj/ProxyPreferencesController.xib | 2 +- .../ProxyPreferencesController.strings | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 755835e..dee24b9 100644 --- a/README.md +++ b/README.md @@ -8,13 +8,13 @@ Next Generation of [ShadowsocksX](https://github.com/shadowsocks/shadowsocks-iOS ## Why? -It's hard to maintain the original implement. There are too many unused code in it. -It also embed ss-local source. It's crazy to maintain depandences of ss-local. -So it's hard to update ss-local version. +It's hard to maintain the original implementation as there is too much unused code in it. +It also embeds the ss-local source. It's crazy to maintain dependencies of ss-local. +So it's hard to update the ss-local version. -Now I just copy the ss-local from home brew. Run ss-local executable as a Launch Agent in background. -Serve pac js file as a file url. So there are only some souce code related to GUI left. -Then I rewrite the GUI code by swift. +Now I just copied the ss-local from homebrew. Run ss-local executable as a Launch Agent in the background. +Serve PAC js file as a file URL. So there is only some source code related to GUI left. +Then I will rewrite the GUI code in Swift. ## Requirements @@ -34,27 +34,27 @@ From [here](https://github.com/shadowsocks/ShadowsocksX-NG/releases/) ## Fetures - Use ss-local from shadowsocks-libev 2.4.6 -- Update PAC by download GFW List from github. +- Update PAC by download GFW List from GitHub. - Show QRCode for current server profile. - Scan QRCode from screen. - Auto launch at login. - User rules for PAC. - Support OTA -- An advance preferences panel to configure: +- An advanced preferences panel to configure: - Local socks5 listen address. - Local socks5 listen port. - Local socks5 timeout. - If enable UDP relay. - - GFW List url. -- Manual spesify network service profiles which would be configure the proxy. + - GFW List URL. +- Manual specify network service profiles which would be configure the proxy. - Could reorder shadowsocks profiles by drag & drop in servers preferences panel. ## Different from orignal ShadowsocksX -Run ss-local as backgroud service through launchd, not in app process. -So after you quit the app, the ss-local maybe is still running. +Run ss-local as a background service through launchd, not as an in-app process. +So after you quit the app, the ss-local maybe be still running. -Add a manual mode which won't configure the system proxy settings. +Added a manual mode which won't configure the system proxy settings. Then you could configure your apps to use socks5 proxy manual. ## Contributing @@ -69,5 +69,5 @@ ref: [GitFlow](http://nvie.com/posts/a-successful-git-branching-model/) ## License -The project is released under the terms of GPLv3. +The project is released under the terms of the GPLv3. diff --git a/ShadowsocksX-NG/Base.lproj/AdvPreferencesWindowController.xib b/ShadowsocksX-NG/Base.lproj/AdvPreferencesWindowController.xib index 9e90f71..e4d375b 100644 --- a/ShadowsocksX-NG/Base.lproj/AdvPreferencesWindowController.xib +++ b/ShadowsocksX-NG/Base.lproj/AdvPreferencesWindowController.xib @@ -12,7 +12,7 @@ - + diff --git a/ShadowsocksX-NG/Base.lproj/MainMenu.xib b/ShadowsocksX-NG/Base.lproj/MainMenu.xib index 92b450c..be83a01 100755 --- a/ShadowsocksX-NG/Base.lproj/MainMenu.xib +++ b/ShadowsocksX-NG/Base.lproj/MainMenu.xib @@ -79,13 +79,13 @@ - + - + @@ -120,13 +120,13 @@ - + - + diff --git a/ShadowsocksX-NG/Base.lproj/ProxyPreferencesController.xib b/ShadowsocksX-NG/Base.lproj/ProxyPreferencesController.xib index ef62b91..b8137fe 100644 --- a/ShadowsocksX-NG/Base.lproj/ProxyPreferencesController.xib +++ b/ShadowsocksX-NG/Base.lproj/ProxyPreferencesController.xib @@ -13,7 +13,7 @@ - + diff --git a/ShadowsocksX-NG/zh-Hans.lproj/ProxyPreferencesController.strings b/ShadowsocksX-NG/zh-Hans.lproj/ProxyPreferencesController.strings index d735f48..ca91ca2 100644 --- a/ShadowsocksX-NG/zh-Hans.lproj/ProxyPreferencesController.strings +++ b/ShadowsocksX-NG/zh-Hans.lproj/ProxyPreferencesController.strings @@ -1,5 +1,5 @@ -/* Class = "NSWindow"; title = "Advance Proxy Preferences"; ObjectID = "F0z-JX-Cv5"; */ +/* Class = "NSWindow"; title = "Advanced Proxy Preferences"; ObjectID = "F0z-JX-Cv5"; */ "F0z-JX-Cv5.title" = "高级代理设置"; /* Class = "NSButtonCell"; title = "Auto Configure"; ObjectID = "FLv-D9-CRw"; */