Charlie Qiu 91124b9e90 Merge branch 'pr/85' into develop ...

# Conflicts:
#	ShadowsocksX-NG/AppDelegate.swift

2016-10-14 23:39:11 +08:00

..

AdvPreferencesWindowController.strings

增加 HTTP代理 跟随全局设置

2016-10-10 14:17:47 +08:00

HTTPPreferencesWindowController.strings

增加 HTTP代理 跟随全局设置

2016-10-10 14:17:47 +08:00

Localizable.strings

代理菜单内增加状态栏文本显示开关

2016-10-02 23:59:01 +08:00

MainMenu.strings

add privoxy

2016-10-10 14:17:02 +08:00

PreferencesWindowController.strings

Translation.

2016-06-11 06:12:27 +08:00

ProxyPreferencesController.strings

Localize advance proxy preferences panel.

2016-07-06 13:18:07 +08:00

UserRulesController.strings

add edit user rule window

2016-08-01 15:28:59 +08:00