v4.27-9665-betav4.27-9665-beta

11 files changed, 22 insertions, 10 deletions

diff --git a/src/Cedar/CM.c b/src/Cedar/CM.c
index cd3d2d69..8a2dc133 100644
--- a/src/Cedar/CM.c
+++ b/src/Cedar/CM.c
@@ -5718,6 +5718,15 @@ void CmMainWindowOnCommandEx(HWND hWnd, WPARAM wParam, LPARAM lParam, bool easy)
 			// Installation is prohibited

 			break;

 		}

+		// Warning message

+		if (MsIsWindows10())

+		{

+			if (MsgBox(hWnd, MB_ICONINFORMATION | MB_OKCANCEL, _UU("CM_VLAN_REINSTALL_MSG")) == IDCANCEL)

+			{

+				// Cancel

+				break;

+			}

+		}

 		index = LvGetSelected(hWnd, L_VLAN);

 		if (index != INFINITE)

 		{

diff --git a/src/Cedar/Cedar.h b/src/Cedar/Cedar.h
index 432324ad..2be48125 100644
--- a/src/Cedar/Cedar.h
+++ b/src/Cedar/Cedar.h
@@ -138,7 +138,7 @@
 #define	CEDAR_VER					427

 

 // Build Number

-#define	CEDAR_BUILD					9664

+#define	CEDAR_BUILD					9665

 

 // Beta number

 //#define	BETA_NUMBER					3

@@ -159,10 +159,10 @@
 // Specifies the build date

 #define	BUILD_DATE_Y		2018

 #define	BUILD_DATE_M		4

-#define	BUILD_DATE_D		20

-#define	BUILD_DATE_HO		16

-#define	BUILD_DATE_MI		26

-#define	BUILD_DATE_SE		40

+#define	BUILD_DATE_D		21

+#define	BUILD_DATE_HO		0

+#define	BUILD_DATE_MI		54

+#define	BUILD_DATE_SE		23

 

 // Tolerable time difference

 #define	ALLOW_TIMESTAMP_DIFF		(UINT64)(3 * 24 * 60 * 60 * 1000)

diff --git a/src/CurrentBuild.txt b/src/CurrentBuild.txt
index a2927e44..8d567071 100644
--- a/src/CurrentBuild.txt
+++ b/src/CurrentBuild.txt
@@ -1,4 +1,4 @@
-BUILD_NUMBER 9664

+BUILD_NUMBER 9665

 VERSION 427

 BUILD_NAME beta

-BUILD_DATE 20180420_162640

+BUILD_DATE 20180421_005423

diff --git a/src/bin/hamcore/strtable_cn.stb b/src/bin/hamcore/strtable_cn.stb
index 7d86c2f7..6789b355 100644
--- a/src/bin/hamcore/strtable_cn.stb
+++ b/src/bin/hamcore/strtable_cn.stb
@@ -1004,6 +1004,7 @@ CM_WOULDYOULOAD_IE_PROXY	目前，这台计算机的 Internet Explorer 配置使
 CM_MSG_TITLE				VPN Server "%S" (虚拟 HUB: "%S")

 CM_JUMPLIST_RCCONNECT		最近使用的连接设置

 CM_VPNGATE_MESSAGE			在 VPN Gate 学术项目网站上有一个公共 VPN 中继服务器列表。\r\n互联网上的任何人都可以建立 VPN 连接至任一列表上的 VPN 服务器。无需用户注册。\r\n\r\nVPN Gate 不是 SoftEther VPN 的一部分。\r\n此图标只提供了一个超链接到 http://www.vpngate.net/。\r\n\r\n安装带有 SoftEther VPN Client 的 VPN Gate Client 插件。它可用简单的配置连接到 VPN Gate 的一个公共 VPN 中继服务器。\r\n\r\n你想访问 http://www.vpngate.net/ (设在日本筑波大学) ?

+CM_VLAN_REINSTALL_MSG	After reinstalling the driver of the Virtual Network Adapter, it may not operate properly. In that case, delete the Virtual Network Adapter once and create it again. If it still does not work properly please create a new Virtual Network Adapter with a different name.

 

 

 # VPN Gate Service

diff --git a/src/bin/hamcore/strtable_en.stb b/src/bin/hamcore/strtable_en.stb
index 16e6b08f..b9c0cf5d 100644
--- a/src/bin/hamcore/strtable_en.stb
+++ b/src/bin/hamcore/strtable_en.stb
@@ -995,6 +995,7 @@ CM_WOULDYOULOAD_IE_PROXY	Currently the Internet Explorer on this computer is con
 CM_MSG_TITLE			VPN Server "%S" (Virtual Hub: "%S")

 CM_JUMPLIST_RCCONNECT	Recent VPN Servers

 CM_VPNGATE_MESSAGE		There is the list of Public VPN Relay Servers on the VPN Gate Academic Project Web Site.\r\nAnyone on the Internet can connect a VPN connection to any VPN servers on the list.\r\n\r\nVPN Gate Academic Project is not a part of SoftEther VPN.\r\nThis icon provides just a link to http://www.vpngate.net/.\r\nYou need to install VPN Gate Plugin to connect VPN Gate.\r\n\r\nDo you want to visit http://www.vpngate.net/ (provided by University of Tsukuba) ?

+CM_VLAN_REINSTALL_MSG	After reinstalling the driver of the Virtual Network Adapter, it may not operate properly. In that case, delete the Virtual Network Adapter once and create it again. If it still does not work properly please create a new Virtual Network Adapter with a different name.

 

 

 VGC_COLUMN_0			DDNS Hostname

diff --git a/src/bin/hamcore/strtable_ja.stb b/src/bin/hamcore/strtable_ja.stb
index 720fdb89..c25f9cc9 100644
--- a/src/bin/hamcore/strtable_ja.stb
+++ b/src/bin/hamcore/strtable_ja.stb
@@ -998,6 +998,7 @@ CM_WOULDYOULOAD_IE_PROXY	現在、このコンピュータは Internet Explorer
 CM_MSG_TITLE			VPN サーバー "%S" (仮想 HUB: "%S")

 CM_JUMPLIST_RCCONNECT	最近の接続先

 CM_VPNGATE_MESSAGE		VPN Gate 学術実験プロジェクトの Web サイトには、公開 VPN 中継サーバーの一覧が公開されています。\r\nこれらの VPN サーバーには、誰でもユーザー登録なしで VPN 接続することができます。\r\n\r\nVPN Gate 学術実験プロジェクトは SoftEther VPN の一部ではありません。\r\nこのアイコンは http://www.vpngate.net/ へのリンクを提供しているに過ぎません。\r\nVPN Gate に接続するためには、VPN Gate Plugin をインストールする必要があります。\r\n\r\nhttp://www.vpngate.net/ (筑波大学における学術実験サイト) を開きますか?

+CM_VLAN_REINSTALL_MSG	仮想 LAN カードのドライバを再インストールした後に、正常に動作しない場合があります。その場合は、一度仮想 LAN カードを削除し、再度作成してください。それでも正常に動作しない場合は、別の名前で仮想 LAN カードを作成してください。

 

 

 # VPN Gate Service 関係

diff --git a/src/bin/vpnweb.cab b/src/bin/vpnweb.cab
index e7e805f7..553a3cb7 100644
--- a/src/bin/vpnweb.cab
+++ b/src/bin/vpnweb.cab
diff --git a/src/bin/vpnweb.ocx b/src/bin/vpnweb.ocx
index 7ff940dc..3a4feeb5 100644
--- a/src/bin/vpnweb.ocx
+++ b/src/bin/vpnweb.ocx
diff --git a/src/vpnweb/vpnweb.h b/src/vpnweb/vpnweb.h
index b1452a22..b75b5fc7 100644
--- a/src/vpnweb/vpnweb.h
+++ b/src/vpnweb/vpnweb.h
@@ -4,7 +4,7 @@
 

 

  /* File created by MIDL compiler version 7.00.0500 */

-/* at Fri Apr 20 16:26:58 2018

+/* at Sat Apr 21 00:54:40 2018

  */

 /* Compiler settings for .\vpnweb.idl:

     Oicf, W1, Zp8, env=Win32 (32b run)

diff --git a/src/vpnweb/vpnweb_i.c b/src/vpnweb/vpnweb_i.c
index b17783c6..70fca44f 100644
--- a/src/vpnweb/vpnweb_i.c
+++ b/src/vpnweb/vpnweb_i.c
@@ -6,7 +6,7 @@
 

 

  /* File created by MIDL compiler version 7.00.0500 */

-/* at Fri Apr 20 16:26:58 2018

+/* at Sat Apr 21 00:54:40 2018

  */

 /* Compiler settings for .\vpnweb.idl:

     Oicf, W1, Zp8, env=Win32 (32b run)

diff --git a/src/vpnweb/vpnweb_p.c b/src/vpnweb/vpnweb_p.c
index abacad49..734023ce 100644
--- a/src/vpnweb/vpnweb_p.c
+++ b/src/vpnweb/vpnweb_p.c
@@ -4,7 +4,7 @@
 

 

  /* File created by MIDL compiler version 7.00.0500 */

-/* at Fri Apr 20 16:26:58 2018

+/* at Sat Apr 21 00:54:40 2018

  */

 /* Compiler settings for .\vpnweb.idl:

     Oicf, W1, Zp8, env=Win32 (32b run)