xuemingqiang/ShadowsocksX-NG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pr/159' into develop

Browse Source 
# Conflicts:
#	ShadowsocksX-NG/Base.lproj/MainMenu.xib
This commit is contained in:
Charlie Qiu
2017-01-10 15:23:13 +08:00
parent 500e524d05 4dd3bd495e
commit c63f6b2ee3
45 changed files with 1428 additions and 787 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ShadowsocksX-NG/zh-Hans.lproj/Localizable.strings
View File

@ -44,9 +44,9 @@
"Turn Shadowsocks On" = "打开 Shadowsocks";
"Proxy - Auto By PAC" = "代理 - PAC自动";
"Proxy - Auto By PAC" = "代理 - PAC自动（⌃⌘P）";
"Proxy - Global" = "代理 - 全局";
"Proxy - Global" = "代理 - 全局（⌃⌘P）";
"Proxy - Manual" = "代理 - 手动";