Skip to content

Commit

Permalink
0.4.7
Browse files Browse the repository at this point in the history
  • Loading branch information
yinghuocho committed May 30, 2017
1 parent 32f6264 commit 6f48465
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions client/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
VERSION := 0.4.6
SHORTVERSION := 0.4.6
VERSION := 0.4.7
SHORTVERSION := 0.4.7

.PHONY: windows package-windows linux package-linux darwin package-darwin clean

Expand Down
2 changes: 1 addition & 1 deletion client/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
)

const (
FIREFLY_VERSION = "0.4.6"
FIREFLY_VERSION = "0.4.7"
)

type clientOptions struct {
Expand Down
2 changes: 1 addition & 1 deletion client/resources/locale/en_US.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"UI_HTTPADDR": "HTTP proxy address",
"UI_SOCKSADDR": "SOCKS proxy address",
"UI_SETTINGS": "Settings",
"UI_FIREFOXHELP": "Firefox by-default does not recognize Firefly's automatic proxy settings, please set proxy yourself using the addresses showing in \"Proxy Address\", or do the following steps: \"menu\" → \"preferences\" → \"Advanced\" → \"Network\" → \"Settings...\" → \"User system proxy settings\"",
"UI_FIREFOXHELP": "Firefox may not recognize Firefly's automatic proxy settings, please set proxy yourself using the addresses showing in \"Proxy Address\", or do the following steps: \"menu\" → \"preferences\" → \"Advanced\" → \"Network\" → \"Settings...\" → \"User system proxy settings\"",
"UI_PROXY_ALL": "Proxy all traffic (Note: When this option is not marked, Firefly loads <a href=\"domains\" target=\"_blank\">an embedded list of blocked websites(domains)</a>, and only proxies requests to these websites. This usually works well. If you cannot access a website, maybe the website is blocked but is not included in the embedded list. You can first try to add the website in the textbox below then try again. If still failed, please enable this option and try again)",
"UI_ADDITIONAL_DOMAINS": "Additional websites(domains) you want to tunnel through proxy",
"UI_SETTINGS_PAGE": "Open (this) settings page when Firefly starts",
Expand Down
2 changes: 1 addition & 1 deletion client/resources/locale/zh_CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"UI_HTTPADDR": "HTTP 代理地址",
"UI_SOCKSADDR": "SOCKS 代理地址",
"UI_SETTINGS": "配置",
"UI_FIREFOXHELP": "Firefox 默认不使用 Firefly 自动设置的系统代理, 请使用 \"代理地址\" 中显示的地址自己设置代理, 或进行以下操作: \"菜单\" &#8594; \"选项\" &#8594; \"高级\" &#8594; \"网络\" &#8594; \"设置...\" &#8594; \"使用系统代理设置\"",
"UI_FIREFOXHELP": "Firefox 可能不使用 Firefly 自动设置的系统代理, 请使用 \"代理地址\" 中显示的地址自己设置代理, 或进行以下操作: \"菜单\" &#8594; \"选项\" &#8594; \"高级\" &#8594; \"网络\" &#8594; \"设置...\" &#8594; \"使用系统代理设置\"",
"UI_PROXY_ALL": "通过代理转发所有请求 (说明: 当本选项未选择时, Firefly 会加载<a href=\"domains\" target=\"_blank\">一个内置的被封网站(域名)列表</a>. 只有向这些网站所发送的请求会通过代理转发. 一般情况下这一选项无需打开. 如果遇到有的网站无法打开, 可能是网站已经被封但不在内置的列表中. 这时候你可以在下面文本框中添加无法打开的网站, 然后重试. 如果还是无法打开, 请打开这一选项, 然后重试)",
"UI_ADDITIONAL_DOMAINS": "其他通过代理转发的网站(域名)",
"UI_SETTINGS_PAGE": "Firefly 启动时自动打开配置界面(即本页面)",
Expand Down

0 comments on commit 6f48465

Please sign in to comment.