Skip to content

Commit ef90caf

Browse files
TGSANTGSAN
committed
Upgrade to v2.3
修复手动模式密钥不正确时依然可以进行下一步的BUG 修改赞助地址到官网域名下 增加备用镜像服务器地址 优化错误代码-4的提示友好性（增加详细错误信息和解决方案） 增加检查更新功能 增加多语言支持（现已支持简体中文和英文） 增加根据语言环境自动调节本地化字体（需要在本地化文件里增加字体名称） 优化启动速度 界面代码和相关流程代码重构 Google Translate : Fix issue.(You can still proceed to the next step when key is Incorrect in manual mode.) Modify the sponsored address to the official website. Increase the alternate mirror server address. Optimize the error tips of error code-4 to more friendly (add detailed error information and solutions) Added Module of check updates. Added multi-language support. (Simplified Chinese and English are now supported) Increase the automatic adjustment of localized fonts according to the locale (requires adding font names to localized files) Optimize startup speed. UI code and related process code refactoring.
1 parent 73d16ff commit ef90caf

20 files changed

+811
-1150
lines changed

‎.vs/CMWTAT_DIGITAL/DesignTimeBuild/.dtbcache

-146 Bytes
Binary file not shown.

‎.vs/CMWTAT_DIGITAL/v15/.suo

-149 KB
Binary file not shown.

‎.vs/CMWTAT_DIGITAL/v15/Server/sqlite3/db.lock

Whitespace-only changes.

‎.vs/CMWTAT_DIGITAL/v15/Server/sqlite3/storage.ide

-1.46 MB
Binary file not shown.

‎.vs/CMWTAT_DIGITAL/v15/Server/sqlite3/storage.ide-shm

-32 KB
Binary file not shown.

‎.vs/CMWTAT_DIGITAL/v15/Server/sqlite3/storage.ide-wal

-3.95 MB
Binary file not shown.

‎.vs/config/applicationhost.config

-1,022
This file was deleted.

‎CMWTAT_DIGITAL/App.xaml

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
1212
<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.Pink.xaml" />
1313
<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Lime.xaml" />
14+
<ResourceDictionary Source="Lang/en.xaml"/>
1415
</ResourceDictionary.MergedDictionaries>
1516
</ResourceDictionary>
1617
</Application.Resources>

‎CMWTAT_DIGITAL/CMWTAT_DIGITAL.csproj

+6-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<OutputType>WinExe</OutputType>
1010
<RootNamespace>CMWTAT_DIGITAL</RootNamespace>
1111
<AssemblyName>CMWTAT_DIGITAL</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1515
<WarningLevel>4</WarningLevel>
@@ -99,7 +99,11 @@
9999
<Generator>MSBuild:Compile</Generator>
100100
<SubType>Designer</SubType>
101101
</ApplicationDefinition>
102-
<Page Include="Lang\zh-cn.xaml">
102+
<Page Include="Lang\en.xaml">
103+
<SubType>Designer</SubType>
104+
<Generator>MSBuild:Compile</Generator>
105+
</Page>
106+
<Page Include="Lang\zh.xaml">
103107
<SubType>Designer</SubType>
104108
<Generator>MSBuild:Compile</Generator>
105109
</Page>

‎CMWTAT_DIGITAL/CMWTAT_DIGITAL.csproj.user

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
4-
<StartArguments>--hide -a</StartArguments>
4+
<StartArguments>
5+
</StartArguments>
56
</PropertyGroup>
67
<PropertyGroup>
78
<PublishUrlHistory>publish\</PublishUrlHistory>

‎CMWTAT_DIGITAL/Lang/en.xaml

+203
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,203 @@
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib">
2+
3+
<!--FontFamily Dictionary-->
4+
5+
<FontFamily x:Key="Font">
6+
Roboto
7+
</FontFamily>
8+
9+
<!--String Dictionary-->
10+
11+
<sys:String x:Key="OK">
12+
OK
13+
</sys:String>
14+
<sys:String x:Key="Cancel">
15+
Cancel
16+
</sys:String>
17+
<sys:String x:Key="Refuse">
18+
Refuse
19+
</sys:String>
20+
<sys:String x:Key="DonateBtn">
21+
Thanks developer and donate a dinner
22+
</sys:String>
23+
<sys:String x:Key="Exit">
24+
Exit
25+
</sys:String>
26+
<sys:String x:Key="UpdateNow">
27+
Update Now
28+
</sys:String>
29+
<sys:String x:Key="Ignore">
30+
Ignore
31+
</sys:String>
32+
<sys:String x:Key="TitleName">
33+
CMWTAT Digital Edition
34+
</sys:String>
35+
<sys:String x:Key="AppName">
36+
CMWTAT Digital Edition V2
37+
</sys:String>
38+
<sys:String x:Key="UpdateTitle">
39+
A new version available!
40+
</sys:String>
41+
<sys:String x:Key="CurrentVersion">
42+
Current Version
43+
</sys:String>
44+
<sys:String x:Key="LatestVersion">
45+
Latest Version
46+
</sys:String>
47+
<sys:String x:Key="Auto_Mode">
48+
Auto Mode
49+
</sys:String>
50+
<sys:String x:Key="Manual_Mode">
51+
Manual Mode
52+
</sys:String>
53+
<sys:String x:Key="Activate_Button">
54+
Activate
55+
</sys:String>
56+
<sys:String x:Key="Convert_versions">
57+
Convert versions (Install Key without Activate)
58+
</sys:String>
59+
<sys:String x:Key="test">
60+
Test Text
61+
</sys:String>
62+
<sys:String x:Key="Loading">
63+
Loading
64+
</sys:String>
65+
<sys:String x:Key="Activating">
66+
Activating
67+
</sys:String>
68+
<sys:String x:Key="Complete">
69+
Complete
70+
</sys:String>
71+
<sys:String x:Key="notifyIconTitle">
72+
CloudMoe Windows 10 Activation Toolkit V2
73+
</sys:String>
74+
<sys:String x:Key="Running">
75+
Running.
76+
</sys:String>
77+
<sys:String x:Key="Experimental">
78+
Experimental
79+
</sys:String>
80+
<sys:String x:Key="Attention">
81+
Attention
82+
</sys:String>
83+
<sys:String x:Key="System_Edition">
84+
System edition
85+
</sys:String>
86+
<sys:String x:Key="May_be_not_be_supported">
87+
Unable to correctly identify your operating system edition in support list, may be not be supported.
88+
</sys:String>
89+
<sys:String x:Key="Only_find_experimental">
90+
Only find experimental options that can be used with this operating system edition, little hope of activation success.
91+
</sys:String>
92+
<sys:String x:Key="notify_May_be_not_be_supported_try">
93+
Your system edition may not be supported, program will exit. you can try add --expact or -e to startup.
94+
</sys:String>
95+
<sys:String x:Key="notify_May_be_not_be_supported_exit">
96+
Your system edition may not be supported, program will exit.
97+
</sys:String>
98+
<sys:String x:Key="notify_Disconnect_to_server_exit">
99+
Unable to connect to server, Please check the network and try to try again later, program will exit.
100+
</sys:String>
101+
<sys:String x:Key="Disconnect_to_server_exit">
102+
Unable to connect to server, Please check the network and try to try again later, program will exit.
103+
</sys:String>
104+
<sys:String x:Key="RunInstall_Converting">
105+
Converting
106+
</sys:String>
107+
<sys:String x:Key="RunAct_Activating">
108+
Activating
109+
</sys:String>
110+
<sys:String x:Key="RunInstall_Getting_Key">
111+
Getting Key via Internet
112+
</sys:String>
113+
<sys:String x:Key="RunAct_Getting_Key">
114+
Getting Key via Internet
115+
</sys:String>
116+
<sys:String x:Key="RunInstall_Uninstalling_old_Key">
117+
Uninstalling old Key
118+
</sys:String>
119+
<sys:String x:Key="RunAct_Uninstalling_old_Key">
120+
Uninstalling old Key
121+
</sys:String>
122+
<sys:String x:Key="RunAct_Uninstalling_old_Key_Exp">
123+
Uninstalling old Key (Experimental)
124+
</sys:String>
125+
<sys:String x:Key="RunInstall_Installing_Key">
126+
Installing Key
127+
</sys:String>
128+
<sys:String x:Key="RunAct_Installing_Key">
129+
Installing Key
130+
</sys:String>
131+
<sys:String x:Key="RunAct_Getting_edition_code_Exp">
132+
Getting edition code (Experimental)
133+
</sys:String>
134+
<sys:String x:Key="RunAct_Prepare_for_the_next_step_Exp">
135+
Prepare for the next step (Experimental)
136+
</sys:String>
137+
<sys:String x:Key="RunAct_Writing_old_OS">
138+
Writing feature of old Windows version
139+
</sys:String>
140+
<sys:String x:Key="RunAct_Getting_free_upgrade_permissions">
141+
Getting free upgrade permissions
142+
</sys:String>
143+
<sys:String x:Key="RunAct_Cleaning_changes">
144+
Cleaning changes
145+
</sys:String>
146+
<sys:String x:Key="RunAct_Getting_digital_license">
147+
Getting digital license
148+
</sys:String>
149+
<sys:String x:Key="CompleteTitle">
150+
Complete
151+
</sys:String>
152+
<sys:String x:Key="ErrorTitle">
153+
Error
154+
</sys:String>
155+
<sys:String x:Key="ErrorCode">
156+
Code:
157+
</sys:String>
158+
<sys:String x:Key="SysMsg">
159+
System return:
160+
</sys:String>
161+
162+
<!--
163+
Attention:
164+
DO NOT USE ANY Indentation in Preserve Mode, Please!
165+
-->
166+
167+
<sys:String x:Key="HelpText" xml:space="preserve">
168+
This application now supports the use of console args to startup!&#10;&#10;-a&#9;--auto&#9;&#9;Auto activate.&#10;-h&#9;--hide&#9;&#9;Run with hide mode (Only be worked with -auto).&#10;-e&#9;--expact&#9;&#9;Experimental activation.&#10;-?&#9;--help&#9;&#9;Show this help Dialog.
169+
</sys:String>
170+
<sys:String x:Key="DonateTextConverted" xml:space="preserve">
171+
Congratulation! &#10;&#10;Windows 10 has been successful converted.
172+
</sys:String>
173+
<sys:String x:Key="DonateTextActivated" xml:space="preserve">
174+
Congratulation! &#10;&#10;Windows 10 has been successful activated.
175+
</sys:String>
176+
<sys:String x:Key="UpdateText" xml:space="preserve">
177+
We found a new version for CloudMoe Windows 10 Activation Toolkit Digital Edition.&#10;Please update to the latest version to make sure it works.
178+
</sys:String>
179+
<sys:String x:Key="UpdateMustText" xml:space="preserve">
180+
We found a new version for CloudMoe Windows 10 Activation Toolkit Digital Edition.&#10;And because your version is too old, so you MUST update to the latest version to make sure it works.
181+
</sys:String>
182+
<sys:String x:Key="ErrorMsg-0" xml:space="preserve">
183+
Activate Windows 10 requires a network to gets the product key :)
184+
</sys:String>
185+
<sys:String x:Key="ErrorMsg-1" xml:space="preserve">
186+
Cannot to uninstall old key. :(
187+
</sys:String>
188+
<sys:String x:Key="ErrorMsg-1.1" xml:space="preserve">
189+
Cannot to install key, may be you choose or enter a incorrect version. :(
190+
</sys:String>
191+
<sys:String x:Key="ErrorMsg-1.2" xml:space="preserve">
192+
Cannot to get edition code. :(
193+
</sys:String>
194+
<sys:String x:Key="ErrorMsg-2" xml:space="preserve">
195+
Cannot to install key, may be you choose or enter a incorrect version. :(
196+
</sys:String>
197+
<sys:String x:Key="ErrorMsg-3" xml:space="preserve">
198+
Time out, may be you choose or enter a incorrect version. :(
199+
</sys:String>
200+
<sys:String x:Key="ErrorMsg-4" xml:space="preserve">
201+
Activation Failed. :( &#10;Maybe: &#10;1.This edition/version of Windows does not support digital license activation. &#10;2. Unable to connect to Microsoft Windows Activation Server. &#10;3. Other unexpected problems. &#10;&#10;You can try to wait a minute or try again later. &#10;
202+
</sys:String>
203+
</ResourceDictionary>

0 commit comments

Comments
 (0)