Skip to content

Commit

Permalink
Merge pull request #169 from emoacht/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
emoacht authored Apr 11, 2021
2 parents c65e159 + 36cf931 commit 0c59d95
Show file tree
Hide file tree
Showing 6 changed files with 188 additions and 5 deletions.
9 changes: 8 additions & 1 deletion Source/Installer/Product.wxs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*" Name="Monitorian" Manufacturer="emoacht" Version="2.15.0"
<Product Id="*" Name="Monitorian" Manufacturer="emoacht" Version="2.16.0"
Language="1033" Codepage="1252" UpgradeCode="{81A4D148-75D3-462E-938D-8C208FB48E3C}">
<Package Id="*" InstallerVersion="500" Compressed="yes"
InstallScope="perMachine" InstallPrivileges="elevated"
Expand Down Expand Up @@ -88,6 +88,12 @@
<File Id="CoreResourcesLibrary_jaJP" Name="$(var.Monitorian.TargetName).Core.resources.dll" KeyPath="yes"/>
</Component>
</Directory>
<Directory Id="ResourcesFolder_koKR" Name="ko-KR"
FileSource="$(var.Monitorian.TargetDir)ko-KR">
<Component Id="CoreResourcesLibrary_koKR" Guid="{F2C43EB4-5522-4A42-A63F-0C229DB356A5}">
<File Id="CoreResourcesLibrary_koKR" Name="$(var.Monitorian.TargetName).Core.resources.dll" KeyPath="yes"/>
</Component>
</Directory>
<Directory Id="ResourcesFolder_plPL" Name="pl-PL"
FileSource="$(var.Monitorian.TargetDir)pl-PL">
<Component Id="CoreResourcesLibrary_plPL" Guid="{BFD709FC-0C56-4520-BCBD-657E15CDD02A}">
Expand Down Expand Up @@ -145,6 +151,7 @@
<ComponentRef Id="BridgeLibrary"/>
<ComponentRef Id="VisualManifest"/>
<ComponentRef Id="CoreResourcesLibrary_jaJP"/>
<ComponentRef Id="CoreResourcesLibrary_koKR"/>
<ComponentRef Id="CoreResourcesLibrary_plPL"/>
<ComponentRef Id="CoreResourcesLibrary_ruRU"/>
<ComponentRef Id="CoreResourcesLibrary_zhHans"/>
Expand Down
1 change: 1 addition & 0 deletions Source/Monitorian.Core/Models/LanguageService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public class LanguageService
{
{ "/en", "en-US" },
{ "/ja", "ja-JP" },
{ "/ko", "ko-KR" },
{ "/pl", "pl-PL" },
{ "/ru", "ru-RU" },
{ "/zh", "zh-Hans" },
Expand Down
4 changes: 4 additions & 0 deletions Source/Monitorian.Core/Monitorian.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,10 @@
<DependentUpon>Resources.resx</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.ko-KR.resx">
<DependentUpon>Resources.resx</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.pl-PL.resx">
<DependentUpon>Resources.resx</DependentUpon>
<SubType>Designer</SubType>
Expand Down
4 changes: 2 additions & 2 deletions Source/Monitorian.Core/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.15.0.0")]
[assembly: AssemblyFileVersion("2.15.0.0")]
[assembly: AssemblyVersion("2.16.0.0")]
[assembly: AssemblyFileVersion("2.16.0.0")]
[assembly: NeutralResourcesLanguage("en-US")]

// For unit test
Expand Down
171 changes: 171 additions & 0 deletions Source/Monitorian.Core/Properties/Resources.ko-KR.resx
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ChangeRange" xml:space="preserve">
<value>조정 가능한 범위 변경</value>
</data>
<data name="Close" xml:space="preserve">
<value>닫기</value>
</data>
<data name="CopyOperation" xml:space="preserve">
<value>작업 로그 복사</value>
</data>
<data name="CopyOperationMessage" xml:space="preserve">
<value>작업 로그를 데스크톱에 저장하시겠습니까?</value>
</data>
<data name="EnableUnison" xml:space="preserve">
<value>동시에 이동을 활성화합니다</value>
</data>
<data name="MakeOperation" xml:space="preserve">
<value>작업 로그 만들기</value>
</data>
<data name="Probe" xml:space="preserve">
<value>Probe into monitors</value>
</data>
<data name="RecordExceptionMessage" xml:space="preserve">
<value>예상치 못한 문제가 발생했습니다. 예외 로그를 데스크톱에 저장하시겠습니까?</value>
</data>
<data name="RecordProbeMessage" xml:space="preserve">
<value>프로브 로그를 데스크톱에 저장하시겠습니까?</value>
</data>
<data name="Rescan" xml:space="preserve">
<value>모니터를 다시 검색합니다</value>
</data>
<data name="ShowAdjusted" xml:space="preserve">
<value>조정된 밝기를 표시합니다</value>
</data>
<data name="SiteUrl" xml:space="preserve">
<value>https://github.com/emoacht/Monitorian</value>
</data>
<data name="StartSignIn" xml:space="preserve">
<value>로그인 시 시작합니다.</value>
</data>
<data name="StatusNotControllable" xml:space="preserve">
<value>모니터를 제어할 수 없습니다.</value>
</data>
<data name="StatusReasonDdcFailing" xml:space="preserve">
<value>DDC/CI가 반복적으로 실패했습니다.</value>
</data>
<data name="StatusReasonDdcNotEnabled" xml:space="preserve">
<value>DDC/CI가 지원되지 않거나 사용할 수 없습니다.</value>
</data>
<data name="UseLargeElements" xml:space="preserve">
<value>큰 버튼 사용</value>
</data>
</root>
4 changes: 2 additions & 2 deletions Source/Monitorian/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.15.0.0")]
[assembly: AssemblyFileVersion("2.15.0.0")]
[assembly: AssemblyVersion("2.16.0.0")]
[assembly: AssemblyFileVersion("2.16.0.0")]
[assembly: Guid("a4cc5362-9b08-465b-ad64-5cfabc72a4c7")]
[assembly: NeutralResourcesLanguage("en-US")]

0 comments on commit 0c59d95

Please sign in to comment.