Skip to content

Commit 5dd5818

Browse files
emoachtemoacht
authored
Merge pull request #665 from emoacht/develop
Develop
2 parents eadea84 + 12da7a5 commit 5dd5818

File tree

10 files changed

+313
-52
lines changed

10 files changed

+313
-52
lines changed

‎README.md

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,27 @@ https://user-images.githubusercontent.com/7205690/210137118-66cfdd6e-9847-41b3-a
1919

2020
Additional languages:
2121

22-
- Arabic (ar) by @MohammadShughri
23-
- Catalan (ca) by @ericmp33
24-
- German (de) by @uDEV2019
25-
- Greek (el-GR) by @NickMihal
26-
- Spanish (es) by @josemirm and @ericmp33
27-
- French (fr) by @AlexZeGamer and @Rikiiiiiii
28-
- Italian (it) by @GhostyJade
29-
- Japanese (ja-JP) by @emoacht
30-
- Korean (ko-KR) by @VenusGirl
31-
- Dutch (nl-NL) by @JordyEGNL
32-
- Polish (pl-PL) by @Daxxxis and @FakeMichau
33-
- Portuguese (pt-BR) by @guilhermgonzaga
34-
- Romanian (ro) by @calini
35-
- Russian (ru-RU) by @SigmaTel71 and @San4es
22+
- Arabic (ar) by [@MohammadShughri](https://github.com/mohammadshughri)
23+
- Catalan (ca) by [@ericmp33](https://github.com/ericmp33)
24+
- German (de) by [@uDEV2019](https://github.com/uDEV2019)
25+
- Greek (el-GR) by [@NickMihal](https://github.com/NickMihal)
26+
- Spanish (es) by [@josemirm](https://github.com/josemirm) and [@ericmp33](https://github.com/ericmp33)
27+
- French (fr) by [@AlexZeGamer](https://github.com/AlexZeGamer) and [@Rikiiiiiii](https://github.com/rikiiiiiii)
28+
- Italian (it) by [@GhostyJade](https://github.com/GhostyJade)
29+
- Japanese (ja-JP) by [@emoacht](https://github.com/emoacht)
30+
- Korean (ko-KR) by [@VenusGirl](https://github.com/VenusGirl)
31+
- Dutch (nl-NL) by [@JordyEGNL](https://github.com/JordyEGNL)
32+
- Polish (pl-PL) by [@Daxxxis](https://github.com/Daxxxis) and [@FakeMichau](https://github.com/FakeMichau)
33+
- Portuguese (pt-BR) by [@guilhermgonzaga](https://github.com/guilhermgonzaga)
34+
- Romanian (ro) by [@calini](https://github.com/calini)
35+
- Russian (ru-RU) by [@SigmaTel71](https://github.com/SigmaTel71) and [@San4es](https://github.com/San4es)
3636
- Albanian (sq) by @RDN000
37-
- Swedish (sv-SE) by @Sopor
38-
- Turkish (tr-TR) by @webbudesign
39-
- Ukrainian (uk-UA) by @kaplun07
40-
- Simplified Chinese (zh-Hans) by @ComMouse, @zhujunsan, @XMuli, @FISHandCHEAP and @FrzMtrsprt
41-
- Traditional Chinese (zh-Hant) by @toto6038 and @XMuli
37+
- Swedish (sv-SE) by [@Sopor](https://github.com/Sopor)
38+
- Turkish (tr-TR) by [@webbudesign](https://github.com/webbudesign)
39+
- Ukrainian (uk-UA) by [@kaplun07](https://github.com/kaplun07)
40+
- Vietnamese (vi-VN) by [@dongsinhho](https://github.com/dongsinhho)
41+
- Simplified Chinese (zh-Hans) by [@ComMouse](https://github.com/ComMouse), [@zhujunsan](https://github.com/zhujunsan), [@XMuli](https://github.com/XMuli), [@FISHandCHEAP](https://github.com/Fishandcheap) and [@FrzMtrsprt](https://github.com/FrzMtrsprt)
42+
- Traditional Chinese (zh-Hant) by [@toto6038](https://github.com/toto6038) and [@XMuli](https://github.com/XMuli)
4243

4344
## Requirements
4445

@@ -59,7 +60,7 @@ Additional languages:
5960
```
6061

6162
* Other:<br>
62-
:floppy_disk: [Installer](https://github.com/emoacht/Monitorian/releases/download/4.9.1-Installer/MonitorianInstaller491.zip)
63+
:floppy_disk: [Installer](https://github.com/emoacht/Monitorian/releases/download/4.10.0-Installer/MonitorianInstaller4100.zip)
6364

6465
## Install/Uninstall
6566

@@ -207,7 +208,6 @@ In any case, reporting on the controllability of a monitor MUST include probe.lo
207208
| Windows 10 SDK (10.0.19041.0) | TargetPlatformVersion |
208209

209210
3. Load the solution by specifying `/Source/Monitorian.sln`. Then go to the solution explorer and right click the solution name and execute `Restore NuGet Packages`.
210-
4. To open installer project, install [WiX Toolset Build Tools](https://wixtoolset.org/releases/) and [WiX Toolset Visual Studio Extension](https://marketplace.visualstudio.com/items?itemName=WixToolset.WiXToolset).
211211

212212
### Globalization
213213

@@ -222,6 +222,11 @@ An alternative language can be shown by adding a Resources (.resx) file into `/S
222222

223223
## History
224224

225+
Ver 4.10 2024-12-26
226+
227+
- Improve internal code
228+
- Add Vietnamese (vi-VN) language. Thanks to @dongsinhho!
229+
225230
Ver 4.9 2024-11-16
226231

227232
- Improve internal code

‎Source/Installer/Product.wxs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
22
xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui"
33
xmlns:netfx="http://wixtoolset.org/schemas/v4/wxs/netfx">
4-
<Package Name="Monitorian" Manufacturer="emoacht" Version="4.9.4"
4+
<Package Name="Monitorian" Manufacturer="emoacht" Version="4.10.0"
55
Language="1033" Codepage="1252" UpgradeCode="{81A4D148-75D3-462E-938D-8C208FB48E3C}">
66
<SummaryInformation Description="Installer for Monitorian"/>
77

@@ -191,6 +191,12 @@
191191
<File Id="CoreResourcesLibrary_ukUA" Name="$(var.Monitorian.TargetName).Core.resources.dll" KeyPath="yes"/>
192192
</Component>
193193
</Directory>
194+
<Directory Id="ResourcesFolder_viVN" Name="vi-VN"
195+
FileSource="$(var.Monitorian.TargetDir)vi-VN">
196+
<Component Id="CoreResourcesLibrary_viVN" Guid="{48D1E1AF-BCEF-431D-977A-68B289B78BD0}">
197+
<File Id="CoreResourcesLibrary_viVN" Name="$(var.Monitorian.TargetName).Core.resources.dll" KeyPath="yes"/>
198+
</Component>
199+
</Directory>
194200
<Directory Id="ResourcesFolder_zhHans" Name="zh-Hans"
195201
FileSource="$(var.Monitorian.TargetDir)zh-Hans">
196202
<Component Id="CoreResourcesLibrary_zhHans" Guid="{D4727E68-157A-495D-B9B8-0CD100291E5E}">
@@ -257,6 +263,7 @@
257263
<ComponentRef Id="CoreResourcesLibrary_svSE"/>
258264
<ComponentRef Id="CoreResourcesLibrary_trTR"/>
259265
<ComponentRef Id="CoreResourcesLibrary_ukUA"/>
266+
<ComponentRef Id="CoreResourcesLibrary_viVN"/>
260267
<ComponentRef Id="CoreResourcesLibrary_zhHans"/>
261268
<ComponentRef Id="CoreResourcesLibrary_zhHant"/>
262269
<ComponentRef Id="ApplicationShortcut"/>

‎Source/Monitorian.Core/AppControllerCore.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ public virtual async Task InitiateAsync()
6969
Settings.PropertyChanged += OnSettingsChanged;
7070

7171
OnSettingsInitiated();
72+
await OperationRecorder.RecordAsync($"Connectable by named pipes: {_keeper.StartupAgent.IsConnectable}");
7273

7374
NotifyIconContainer.ShowIcon(WindowPainter.GetIconPath(), ProductInfo.Title);
7475
WindowPainter.ThemeChanged += (_, _) =>

‎Source/Monitorian.Core/Monitorian.Core.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,10 @@
249249
<DependentUpon>Resources.resx</DependentUpon>
250250
<SubType>Designer</SubType>
251251
</EmbeddedResource>
252+
<EmbeddedResource Include="Properties\Resources.vi-VN.resx">
253+
<DependentUpon>Resources.resx</DependentUpon>
254+
<SubType>Designer</SubType>
255+
</EmbeddedResource>
252256
<EmbeddedResource Include="Properties\Resources.zh-Hans.resx">
253257
<DependentUpon>Resources.resx</DependentUpon>
254258
<SubType>Designer</SubType>

‎Source/Monitorian.Core/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
// You can specify all the values or you can default the Build and Revision Numbers
3434
// by using the '*' as shown below:
3535
// [assembly: AssemblyVersion("1.0.*")]
36-
[assembly: AssemblyVersion("4.9.4.0")]
37-
[assembly: AssemblyFileVersion("4.9.4.0")]
36+
[assembly: AssemblyVersion("4.10.0.0")]
37+
[assembly: AssemblyFileVersion("4.10.0.0")]
3838
[assembly: NeutralResourcesLanguage("en-US")]
3939

4040
// For unit test

‎Source/Monitorian.Core/Properties/Resources.vi-VN.resx

Lines changed: 204 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,204 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<data name="Arguments" xml:space="preserve">
121+
<value>Tham số dòng lệnh</value>
122+
</data>
123+
<data name="ChangeContrast" xml:space="preserve">
124+
<value>Thay đổi độ tương phản</value>
125+
</data>
126+
<data name="ChangeRange" xml:space="preserve">
127+
<value>Thay đổi phạm vi điều chỉnh</value>
128+
</data>
129+
<data name="ChangeUnison" xml:space="preserve">
130+
<value>Thay đổi độ sáng đồng loạt</value>
131+
</data>
132+
<data name="Close" xml:space="preserve">
133+
<value>Đóng</value>
134+
</data>
135+
<data name="CopyOperation" xml:space="preserve">
136+
<value>Sao chép nhật ký hoạt động</value>
137+
</data>
138+
<data name="CopySaveOperationMessage" xml:space="preserve">
139+
<value>Lưu nhật ký hoạt động vào Màn hình chính?</value>
140+
</data>
141+
<data name="CopyWaitOperationMessage" xml:space="preserve">
142+
<value>Chờ thêm thông tin được ghi vào nhật ký hoạt động.</value>
143+
</data>
144+
<data name="DeferChange" xml:space="preserve">
145+
<value>Hoãn thay đổi cho đến khi dừng</value>
146+
</data>
147+
<data name="EnableContrast" xml:space="preserve">
148+
<value>Bật thay đổi độ tương phản</value>
149+
</data>
150+
<data name="EnableRange" xml:space="preserve">
151+
<value>Bật thay đổi phạm vi điều chỉnh</value>
152+
</data>
153+
<data name="EnableUnison" xml:space="preserve">
154+
<value>Bật thay đổi độ sáng đồng loạt</value>
155+
</data>
156+
<data name="MakeOperation" xml:space="preserve">
157+
<value>Tạo nhật ký hoạt động</value>
158+
</data>
159+
<data name="OrderArrangement" xml:space="preserve">
160+
<value>Tạo nhật ký hoạt động</value>
161+
</data>
162+
<data name="Probe" xml:space="preserve">
163+
<value>Kiểm tra màn hình</value>
164+
</data>
165+
<data name="RecordExceptionMessage" xml:space="preserve">
166+
<value>Xảy ra sự cố bất ngờ. Lưu nhật ký lỗi vào Màn hình chính?</value>
167+
</data>
168+
<data name="RecordProbeMessage" xml:space="preserve">
169+
<value>Lưu nhật ký kiểm tra vào Màn hình chính?</value>
170+
</data>
171+
<data name="Rescan" xml:space="preserve">
172+
<value>Quét lại màn hình</value>
173+
</data>
174+
<data name="RestoreReconnection" xml:space="preserve">
175+
<value>Khôi phục độ sáng khi kết nối lại</value>
176+
</data>
177+
<data name="Settings" xml:space="preserve">
178+
<value>Cài đặt</value>
179+
</data>
180+
<data name="ShowAdjusted" xml:space="preserve">
181+
<value>Hiển thị độ sáng đã điều chỉnh</value>
182+
</data>
183+
<data name="ShowNumber" xml:space="preserve">
184+
<value>Hiển thị số hiện tại</value>
185+
</data>
186+
<data name="StartSignIn" xml:space="preserve">
187+
<value>Khởi động khi đăng nhập</value>
188+
</data>
189+
<data name="StatusNotControllable" xml:space="preserve">
190+
<value>Màn hình không thể điều khiển được.</value>
191+
</data>
192+
<data name="StatusReasonDdcFailing" xml:space="preserve">
193+
<value>DDC/CI đã liên tục gặp lỗi.</value>
194+
</data>
195+
<data name="StatusReasonDdcNotEnabled" xml:space="preserve">
196+
<value>DDC/CI không được hỗ trợ hoặc chưa được bật.</value>
197+
</data>
198+
<data name="UseAccentColor" xml:space="preserve">
199+
<value>Sử dụng màu nhấn cho độ sáng</value>
200+
</data>
201+
<data name="UseLargeElements" xml:space="preserve">
202+
<value>Sử dụng thanh trượt lớn</value>
203+
</data>
204+
</root>

‎Source/Monitorian/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
// You can specify all the values or you can default the Build and Revision Numbers
5252
// by using the '*' as shown below:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("4.9.4.0")]
55-
[assembly: AssemblyFileVersion("4.9.4.0")]
54+
[assembly: AssemblyVersion("4.10.0.0")]
55+
[assembly: AssemblyFileVersion("4.10.0.0")]
5656
[assembly: Guid("a4cc5362-9b08-465b-ad64-5cfabc72a4c7")]
5757
[assembly: NeutralResourcesLanguage("en-US")]

0 commit comments

Comments
 (0)