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

Merge branch 'develop' into fix

Browse Source
This commit is contained in:
Qiu Yuzhou
2017-01-13 00:14:24 +08:00
committed by GitHub
parent 913e1cc0bc f137d51cb2
commit 57fce4c25d
78 changed files with 3940 additions and 1103 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" = "代理 - 手动";

8
ShadowsocksX-NG/zh-Hans.lproj/MainMenu.strings
View File

@ -80,3 +80,11 @@
/* Class = "NSMenuItem"; title = "HTTP Proxy Preference ..."; ObjectID = "uEp-Gz-cu0"; */
"uEp-Gz-cu0.title" = "HTTP代理设置...";
/* Class = "NSMenuItem"; title = "Show Bunch Json Example File..."; ObjectID = "pdy-JE-50Q"; */
"pdy-JE-50Q.title" = "显示示例服务器配置文件...";
/* Class = "NSMenuItem"; title = "Import Bunch Json File..."; ObjectID = "T9g-gy-gvv"; */
"T9g-gy-gvv.title" = "导入服务器配置文件...";
/* Class = "NSMenuItem"; title = "Export All Server To Json..."; ObjectID = "6k0-gn-DQv"; */
"6k0-gn-DQv.title" = "导出全部服务器配置...";

3
ShadowsocksX-NG/zh-Hans.lproj/PreferencesWindowController.strings
View File

@ -34,3 +34,6 @@
/* Class = "NSButtonCell"; title = "OK"; ObjectID = "zPE-oD-PwK"; */
"zPE-oD-PwK.title" = "确定";
/* Class = "NSMenuItem"; title = "Duplicate"; ObjectID = "bl9-lq-u9V"; */
"bl9-lq-u9V.title" = "复制";