Skip to content

Commit

Permalink
Merge pull request #326 from emoacht/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
emoacht authored May 17, 2022
2 parents 6fcec58 + 370b32f commit 0df0323
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 11 deletions.
2 changes: 1 addition & 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="3.11.0"
<Product Id="*" Name="Monitorian" Manufacturer="emoacht" Version="3.11.1"
Language="1033" Codepage="1252" UpgradeCode="{81A4D148-75D3-462E-938D-8C208FB48E3C}">
<Package Id="*" InstallerVersion="500" Compressed="yes"
InstallScope="perMachine" InstallPrivileges="elevated"
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("3.11.0.0")]
[assembly: AssemblyFileVersion("3.11.0.0")]
[assembly: AssemblyVersion("3.11.1.0")]
[assembly: AssemblyFileVersion("3.11.1.0")]
[assembly: NeutralResourcesLanguage("en-US")]

// For unit test
Expand Down
51 changes: 45 additions & 6 deletions Source/Monitorian.Core/Properties/Resources.ko-KR.resx
Original file line number Diff line number Diff line change
Expand Up @@ -117,38 +117,74 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Arguments" xml:space="preserve">
<value>명령줄 인수</value>
</data>
<data name="ChangeContrast" xml:space="preserve">
<value>대비 변경</value>
</data>
<data name="ChangeRange" xml:space="preserve">
<value>조정 가능한 범위 변경</value>
</data>
<data name="ChangeUnison" 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="CopySaveOperationMessage" xml:space="preserve">
<value>작업 로그를 데스크톱에 저장하시겠습니까?</value>
<value>작업 로그를 바탕화면에 저장하시겠습니까?</value>
</data>
<data name="CopyWaitOperationMessage" xml:space="preserve">
<value>작업 로그에 추가 정보가 기록될 때까지 기다립니다.</value>
</data>
<data name="DeferChange" xml:space="preserve">
<value>중지될 때까지 변경 연기</value>
</data>
<data name="EnableContrast" xml:space="preserve">
<value>대비 변경 사용</value>
</data>
<data name="EnableRange" xml:space="preserve">
<value>조정 가능한 범위 변경 사용</value>
</data>
<data name="EnableUnison" xml:space="preserve">
<value>동시에 이동을 활성화합니다</value>
<value>동시에 밝기 변경 사용</value>
</data>
<data name="MakeOperation" xml:space="preserve">
<value>작업 로그 만들기</value>
</data>
<data name="OrderArrangement" xml:space="preserve">
<value>모니터별 순서 배열</value>
</data>
<data name="Probe" xml:space="preserve">
<value>모니터 조사</value>
</data>
<data name="RecordExceptionMessage" xml:space="preserve">
<value>예상치 못한 문제가 발생했습니다. 예외 로그를 데스크톱에 저장하시겠습니까?</value>
</data>
<data name="RecordProbeMessage" xml:space="preserve">
<value>프로브 로그를 데스크톱에 저장하시겠습니까?</value>
<value>프로브 로그를 바탕화면에 저장하시겠습니까?</value>
</data>
<data name="Rescan" xml:space="preserve">
<value>모니터를 다시 검색합니다</value>
<value>모니터 다시 검색</value>
</data>
<data name="RestoreReconnection" xml:space="preserve">
<value>다시 연결시 밝기 복원</value>
</data>
<data name="Settings" xml:space="preserve">
<value>설정</value>
</data>
<data name="ShowAdjusted" xml:space="preserve">
<value>조정된 밝기를 표시합니다</value>
<value>조정된 밝기 표시</value>
</data>
<data name="ShowNumber" xml:space="preserve">
<value>현재 번호 표시</value>
</data>
<data name="StartSignIn" xml:space="preserve">
<value>로그인 시 시작합니다.</value>
<value>로그인시 시작</value>
</data>
<data name="StatusNotControllable" xml:space="preserve">
<value>모니터를 제어할 수 없습니다.</value>
Expand All @@ -159,6 +195,9 @@
<data name="StatusReasonDdcNotEnabled" xml:space="preserve">
<value>DDC/CI가 지원되지 않거나 사용할 수 없습니다.</value>
</data>
<data name="UseAccentColor" xml:space="preserve">
<value>밝기에 강조 색상 사용</value>
</data>
<data name="UseLargeElements" xml:space="preserve">
<value>큰 슬라이더 사용</value>
</data>
Expand Down
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("3.11.0.0")]
[assembly: AssemblyFileVersion("3.11.0.0")]
[assembly: AssemblyVersion("3.11.1.0")]
[assembly: AssemblyFileVersion("3.11.1.0")]
[assembly: Guid("a4cc5362-9b08-465b-ad64-5cfabc72a4c7")]
[assembly: NeutralResourcesLanguage("en-US")]

0 comments on commit 0df0323

Please sign in to comment.