From 6f4846584602615427070b9040ae340fe9c9b4db Mon Sep 17 00:00:00 2001 From: yinghuocho Date: Mon, 29 May 2017 22:02:57 -0700 Subject: [PATCH] 0.4.7 --- client/Makefile | 4 ++-- client/main.go | 2 +- client/resources/locale/en_US.json | 2 +- client/resources/locale/zh_CN.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/Makefile b/client/Makefile index 09cabcb..62ba233 100755 --- a/client/Makefile +++ b/client/Makefile @@ -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 diff --git a/client/main.go b/client/main.go index c49dc3a..2cfa918 100644 --- a/client/main.go +++ b/client/main.go @@ -34,7 +34,7 @@ import ( ) const ( - FIREFLY_VERSION = "0.4.6" + FIREFLY_VERSION = "0.4.7" ) type clientOptions struct { diff --git a/client/resources/locale/en_US.json b/client/resources/locale/en_US.json index 8093fc1..3c224bd 100644 --- a/client/resources/locale/en_US.json +++ b/client/resources/locale/en_US.json @@ -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 an embedded list of blocked websites(domains), 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", diff --git a/client/resources/locale/zh_CN.json b/client/resources/locale/zh_CN.json index dcaf9c1..79fe5cf 100644 --- a/client/resources/locale/zh_CN.json +++ b/client/resources/locale/zh_CN.json @@ -7,7 +7,7 @@ "UI_HTTPADDR": "HTTP 代理地址", "UI_SOCKSADDR": "SOCKS 代理地址", "UI_SETTINGS": "配置", - "UI_FIREFOXHELP": "Firefox 默认不使用 Firefly 自动设置的系统代理, 请使用 \"代理地址\" 中显示的地址自己设置代理, 或进行以下操作: \"菜单\" → \"选项\" → \"高级\" → \"网络\" → \"设置...\" → \"使用系统代理设置\"", + "UI_FIREFOXHELP": "Firefox 可能不使用 Firefly 自动设置的系统代理, 请使用 \"代理地址\" 中显示的地址自己设置代理, 或进行以下操作: \"菜单\" → \"选项\" → \"高级\" → \"网络\" → \"设置...\" → \"使用系统代理设置\"", "UI_PROXY_ALL": "通过代理转发所有请求 (说明: 当本选项未选择时, Firefly 会加载一个内置的被封网站(域名)列表. 只有向这些网站所发送的请求会通过代理转发. 一般情况下这一选项无需打开. 如果遇到有的网站无法打开, 可能是网站已经被封但不在内置的列表中. 这时候你可以在下面文本框中添加无法打开的网站, 然后重试. 如果还是无法打开, 请打开这一选项, 然后重试)", "UI_ADDITIONAL_DOMAINS": "其他通过代理转发的网站(域名)", "UI_SETTINGS_PAGE": "Firefly 启动时自动打开配置界面(即本页面)",