Merge pull request #2837 from hpwamr/mui

MUI - Fixed failed PR and minor Korean (ko-KR) translation update
This commit is contained in:
Pairi Daiza 2020-09-17 11:56:10 +02:00 committed by GitHub
commit b846966f23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 10 additions and 12 deletions

View File

@ -1 +1 @@
916
917

View File

@ -9,7 +9,7 @@
#
# encoding: UTF-8
# Language: Korean (Korea) resources
# Translator: (ko-KR) 한국어 번역 ohgree
# Translator: (ko-KR) 한국어 번역: VenusGirl
#
#, fuzzy

View File

@ -187,7 +187,6 @@ FONT 9, "Segoe UI", 400, 0, 0x1
BEGIN
GROUPBOX "기본 인코딩 (새 파일):",IDC_STATIC,7,7,183,48,0,WS_EX_TRANSPARENT
CONTROL "",IDC_ENCODINGLIST,"ComboBoxEx32",CBS_DROPDOWNLIST | WS_CLIPSIBLINGS | WS_VSCROLL | WS_TABSTOP,14,19,167,128
//COMBOBOX IDC_ENCODINGLIST, 14, 19, 167, 128, CBS_OWNERDRAWFIXED | CBS_DROPDOWNLIST | WS_CLIPSIBLINGS | WS_VSCROLL | WS_TABSTOP,
CONTROL "감지 실패시 대체로 사용합니다(&F).",IDC_USEASREADINGFALLBACK,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,38,155,10
GROUPBOX "인코딩 감지: ",IDC_STATIC,7,58,183,88,0,WS_EX_TRANSPARENT
@ -473,7 +472,6 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | WS_POPUP | W
CAPTION "암호화"
FONT 9, "Segoe UI", 0, 0, 0x0
BEGIN
GROUPBOX "암호", IDC_STATIC, 7, 7, 297, 108
DEFPUSHBUTTON "확인",IDOK,245,98,50,14
PUSHBUTTON "취소",IDCANCEL,184,98,50,14
CONTROL "새 마스터 키 설정",IDC_PWD_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,60,84,10
@ -491,7 +489,6 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | WS_POPUP | W
CAPTION "파일 해독"
FONT 9, "Segoe UI", 0, 0, 0x0
BEGIN
GROUPBOX "암호", IDC_STATIC, 8, 6, 283, 69
DEFPUSHBUTTON "확인",IDOK,233,58,50,14
PUSHBUTTON "취소",IDCANCEL,175,58,50,14
EDITTEXT IDC_PWD_EDIT3,16,23,267,12,ES_PASSWORD | ES_AUTOHSCROLL | WS_GROUP
@ -612,7 +609,7 @@ BEGIN
CONTROL IDR_MAINWND, IDC_INFOBOXICON, "Static", SS_BITMAP | SS_NOTIFY, 7, 7, 24, 24, WS_EX_TRANSPARENT
LTEXT "",IDC_INFOBOXTEXT,35,7,126,41,SS_EDITCONTROL | SS_NOPREFIX | SS_LEFT
DEFPUSHBUTTON "예(&Y)",IDOK,7,70,50,14
PUSHBUTTON "아니오"(&N),IDNO,61,70,50,14
PUSHBUTTON "아니오(&N)",IDNO,61,70,50,14
PUSHBUTTON "취소(&C)",IDCANCEL,115,70,50,14
CONTROL "이 메시지를 다시 표시하지 않습니다(&D).",IDC_INFOBOXCHECK,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,54,122,10
@ -687,7 +684,7 @@ BEGIN
CONTROL "오른쪽(&R)",101,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,59,10
CONTROL "가운데(&C)",102,"Button",BS_AUTORADIOBUTTON,7,31,59,10
CONTROL "균등 맞춤(&J)",103,"Button",BS_AUTORADIOBUTTON,7,43,59,10
CONTROL "균등 맞춤 (단락 모드(&P))",104,"Button",BS_AUTORADIOBUTTON,7,55,100,10
CONTROL "균등 맞춤 (단락 모드)(&P)",104,"Button",BS_AUTORADIOBUTTON,7,55,100,10
DEFPUSHBUTTON "확인",IDOK,127,7,50,14
PUSHBUTTON "취소",IDCANCEL,127,24,50,14
END

View File

@ -514,7 +514,7 @@ BEGIN
MENUITEM "웹 사이트에서 업데이트 확인(&W)", IDM_HELP_UPDATEWEBSITE
MENUITEM SEPARATOR
MENUITEM "명령행 도움말(&C)...", IDM_HELP_CMD
MENUITEM "정보(&A) 한국어 번역: VₑₙᵤₛGᵢᵣₗ...\tShift+F1", IDM_HELP_ABOUT
MENUITEM "정보(&A)...\tShift+F1", IDM_HELP_ABOUT
END
END

View File

@ -235,7 +235,7 @@ END
STRINGTABLE
BEGIN
IDS_MUI_TRANSL_AUTHOR "(ko-KR) 한국어 번역: VₑₙᵤₛGᵢᵣₗ💋´``°³о💗"
IDS_MUI_TRANSL_AUTHOR "(ko-KR) 한국어 번역: VenusGirl"
IDS_MUI_TITLE_FIXBASE " BASE (%s)"
IDS_MUI_TITLE_RELCUR " +++ %s: %s - 스타일 +++"
IDS_MUI_TITLE_FIXCUR " %s: %s - 스타일"
@ -361,3 +361,4 @@ END
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

View File

@ -132,7 +132,7 @@ BEGIN
IDS_COPYMOVE "지정 프로그램 디렉토리 선택."
IDS_CREATELINK "새로 만들 링크의 디렉토리를 선택하세요."
IDS_SAVESETTINGS "설정 저장\n현재의 프로그램 설정이 저장 되었습니다."
IDS_MUI_TRANSL_AUTHOR "(ko-KR) 한국어 번역 ohgree"
IDS_MUI_TRANSL_AUTHOR "(ko-KR) 한국어 번역: VenusGirl"
END

View File

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.20.916.1"
version="5.20.917.1"
type="win32"
/>
<description>Notepad3 beta</description>

View File

@ -8,7 +8,7 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 20
#define VERSION_REV 916
#define VERSION_REV 917
#define VERSION_BUILD 1
#define SCINTILLA_VER 445
#define ONIGURUMA_REGEX_VER 6.9.5