December 2010 - Wine-commits

Anders Jonsson : jscript: Update Swedish translation.
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: 8ba970d5aa8cf40932dee626156d420c7ad3fdde URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ba970d5aa8cf40932dee6261… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Wed Dec 29 20:34:09 2010 +0100 jscript: Update Swedish translation. --- dlls/jscript/jscript_Sv.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Sv.rc b/dlls/jscript/jscript_Sv.rc index fbabaa0..41be3e2 100644 --- a/dlls/jscript/jscript_Sv.rc +++ b/dlls/jscript/jscript_Sv.rc @@ -36,6 +36,7 @@ STRINGTABLE IDS_LBRACKET "'(' förväntades" IDS_RBRACKET "')' förväntades" IDS_UNTERMINATED_STR "Oterminerad strängkonstant" + IDS_DISABLED_CC "Villkorlig kompilering är avslagen" IDS_NOT_FUNC "Funktion förväntades" IDS_NOT_DATE "'[object]' är inte ett datumobjekt" IDS_NOT_NUM "Nummer förväntades"

1 0

Łukasz Wojniłowicz : appwiz.cpl: Update Polish translation.
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: 5766d7565dcb30aa76e4af804e59b3dfbd05602d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5766d7565dcb30aa76e4af804… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Wed Dec 29 20:29:39 2010 +0100 appwiz.cpl: Update Polish translation. --- dlls/appwiz.cpl/Pl.rc | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/appwiz.cpl/Pl.rc b/dlls/appwiz.cpl/Pl.rc index 38f8fe0..a8ba3d0 100644 --- a/dlls/appwiz.cpl/Pl.rc +++ b/dlls/appwiz.cpl/Pl.rc @@ -44,8 +44,9 @@ STRINGTABLE STRINGTABLE { - IDS_DOWNLOADING "Pobieranie plik�w..." - IDS_INSTALLING "Instalacja..." + IDS_DOWNLOADING "Pobieranie..." + IDS_INSTALLING "Instalowanie..." + IDS_INVALID_SHA "Nieoczekiwana suma pobranego pliku. Przerywanie instalacji uszkodzonego pliku." } IDD_MAIN DIALOG 0, 0, 320, 220

1 0

Łukasz Wojniłowicz : jscript: Update Polish translation.
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: d8186eb4bce451fc1d28f0ce3eff1c2783c99716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8186eb4bce451fc1d28f0ce3… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Wed Dec 29 20:29:40 2010 +0100 jscript: Update Polish translation. --- dlls/jscript/jscript_Pl.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Pl.rc b/dlls/jscript/jscript_Pl.rc index 397683e..e417095 100644 --- a/dlls/jscript/jscript_Pl.rc +++ b/dlls/jscript/jscript_Pl.rc @@ -34,6 +34,7 @@ STRINGTABLE IDS_LBRACKET "Oczekiwane '('" IDS_RBRACKET "Oczekiwane ')'" IDS_UNTERMINATED_STR "Niezako�czona sta�a znakowa" + IDS_DISABLED_CC "Warunkowa kompilacja jest wy��czona" IDS_NOT_FUNC "Oczekiwana funkcja" IDS_NOT_DATE "'[obiekt]' nie jest obiektem daty" IDS_NOT_NUM "Oczekiwana liczba"

1 0

Luca Bennati : jscript: Update Italian translation.
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: e6983d20fb4f52d6555f45dd4bfc21dd1aab4d1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6983d20fb4f52d6555f45dd4… Author: Luca Bennati <lucak3(a)gmail.com> Date: Wed Dec 29 21:10:07 2010 +0100 jscript: Update Italian translation. --- dlls/jscript/jscript_It.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_It.rc b/dlls/jscript/jscript_It.rc index 42033d3..fcfc568 100644 --- a/dlls/jscript/jscript_It.rc +++ b/dlls/jscript/jscript_It.rc @@ -38,6 +38,7 @@ STRINGTABLE IDS_LBRACKET "Richiesto '('" IDS_RBRACKET "Richiesto ')'" IDS_UNTERMINATED_STR "Costante stringa non terminata" + IDS_DISABLED_CC "Compilazione condizionale disattivata" IDS_NOT_FUNC "Richiesta una funzione" IDS_NOT_DATE "'[oggetto]' non è un oggetto data" IDS_NOT_NUM "Richiesto un numero"

1 0

Luca Bennati : appwiz.cpl: Update Italian translation.
by Alexandre Julliard 30 Dec '10

30 Dec '10

Module: wine Branch: master Commit: be3127f5c6e67d9f7f585d3c1fbcedaa8bf4e957 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be3127f5c6e67d9f7f585d3c1… Author: Luca Bennati <lucak3(a)gmail.com> Date: Wed Dec 29 21:07:16 2010 +0100 appwiz.cpl: Update Italian translation. --- dlls/appwiz.cpl/It.rc | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/appwiz.cpl/It.rc b/dlls/appwiz.cpl/It.rc index f4ebba3..c9cbdd5 100644 --- a/dlls/appwiz.cpl/It.rc +++ b/dlls/appwiz.cpl/It.rc @@ -46,8 +46,9 @@ STRINGTABLE STRINGTABLE { - IDS_DOWNLOADING "Scaricando..." - IDS_INSTALLING "Installando..." + IDS_DOWNLOADING "Scaricamento..." + IDS_INSTALLING "Installazione..." + IDS_INVALID_SHA "Checksum inaspettato del file scaricato. Interruzione dell'installazione del file corrotto." } IDD_MAIN DIALOG 0, 0, 320, 220 @@ -72,7 +73,7 @@ STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Informazioni di supporto" FONT 8, "MS Shell Dlg" { - CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 + CONTROL "Ok", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 CONTROL "Le seguenti informazioni possono essere usate per ottenere supporto tecnico per %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 CONTROL "Editore:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 CONTROL "Versione:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 @@ -97,8 +98,8 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Installer di Wine Gecko" FONT 8, "MS Shell Dlg" { - LTEXT "Wine non ha trovato un pacchetto Gecko che è necessario per applicazioni che incorporano HTML " \ - "per funzionare correttamente. Wine può automaticamente scaricarlo ed installarlo per te.\n\n" \ + LTEXT "Wine non ha trovato un pacchetto Gecko, necessario ad applicazioni che incorporano HTML " \ + "per funzionare correttamente. Wine lo può scaricare e installare automaticamente per te.\n\n" \ "Nota: è raccomandato usare i pacchetti delle distribuzioni. Leggi http://wiki.winehq.org/Gecko per i dettagli.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "Avanzamento", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12

1 0

Jacek Caban : jscript: Moved remaining registration to IRegistrar mechanism .
by Alexandre Julliard 29 Dec '10

29 Dec '10

Module: wine Branch: master Commit: 4582a8fe42a974f2004127d3251ae4eb3f21d9ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=4582a8fe42a974f2004127d32… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 29 16:02:46 2010 +0100 jscript: Moved remaining registration to IRegistrar mechanism. --- dlls/jscript/jscript.inf | 86 ------------------------------ dlls/jscript/jscript.rgs | 124 +++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/jscript_main.c | 75 +------------------------- dlls/jscript/rsrc.rc | 4 +- 4 files changed, 128 insertions(+), 161 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4582a8fe42a974f200412…

1 0

Jacek Caban : jscript: Return 'unknown' in typeof operator for native object's values that can't be retrieved.
by Alexandre Julliard 29 Dec '10

29 Dec '10

Module: wine Branch: master Commit: 3d1595dc81b62793063212c9ead3e347333dd9a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d1595dc81b62793063212c9e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 29 16:02:25 2010 +0100 jscript: Return 'unknown' in typeof operator for native object's values that can't be retrieved. --- dlls/jscript/engine.c | 8 +++++++- dlls/jscript/tests/lang.js | 7 +++++-- dlls/jscript/tests/run.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 42d6762..9a5ecbc 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2365,6 +2365,7 @@ static HRESULT typeof_exprval(script_ctx_t *ctx, exprval_t *exprval, jsexcept_t static const WCHAR objectW[] = {'o','b','j','e','c','t',0}; static const WCHAR stringW[] = {'s','t','r','i','n','g',0}; static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; + static const WCHAR unknownW[] = {'u','n','k','n','o','w','n',0}; if(exprval->type == EXPRVAL_INVALID) { *ret = undefinedW; @@ -2372,8 +2373,13 @@ static HRESULT typeof_exprval(script_ctx_t *ctx, exprval_t *exprval, jsexcept_t } hres = exprval_to_value(ctx, exprval, ei, &val); - if(FAILED(hres)) + if(FAILED(hres)) { + if(exprval->type == EXPRVAL_IDREF) { + *ret = unknownW; + return S_OK; + } return hres; + } switch(V_VT(&val)) { case VT_EMPTY: diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 5a361d7..bf74ed7 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -108,6 +108,11 @@ ok(typeof(testFunc1) === "function", "typeof(testFunc1) is not function"); ok(typeof(String) === "function", "typeof(String) is not function"); ok(typeof(ScriptEngine) === "function", "typeof(ScriptEngine) is not function"); ok(typeof(this) === "object", "typeof(this) is not object"); +ok(typeof(doesnotexist) === "undefined", "typeof(doesnotexist) = " + typeof(doesnotexist)); +tmp = typeof((new Object()).doesnotexist); +ok(tmp === "undefined", "typeof((new Object).doesnotexist = " + tmp); +tmp = typeof(testObj.onlyDispID); +ok(tmp === "unknown", "typeof(testObj.onlyDispID) = " + tmp); ok(testFunc1(true, "test") === true, "testFunc1 not returned true"); @@ -1057,8 +1062,6 @@ if(false) { ok(in_if_false(), "in_if_false failed"); -ok(typeof(doesnotexist) === "undefined", "typeof(doesnotexist) = " + typeof(doesnotexist)); - (function() { newValue = 1; })(); ok(newValue === 1, "newValue = " + newValue); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 7b198df..f473c6c 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -68,6 +68,8 @@ DEFINE_EXPECT(testobj_delete); DEFINE_EXPECT(testobj_value); DEFINE_EXPECT(testobj_prop_d); DEFINE_EXPECT(testobj_noprop_d); +DEFINE_EXPECT(testobj_onlydispid_d); +DEFINE_EXPECT(testobj_onlydispid_i); DEFINE_EXPECT(GetItemInfo_testVal); DEFINE_EXPECT(ActiveScriptSite_OnScriptError); DEFINE_EXPECT(invoke_func); @@ -90,6 +92,7 @@ DEFINE_EXPECT(invoke_func); #define DISPID_GLOBAL_ISWIN64 0x100f #define DISPID_TESTOBJ_PROP 0x2000 +#define DISPID_TESTOBJ_ONLYDISPID 0x2001 static const WCHAR testW[] = {'t','e','s','t',0}; static const CHAR testA[] = "test"; @@ -230,6 +233,13 @@ static HRESULT WINAPI testObj_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD test_grfdex(grfdex, fdexNameCaseSensitive); return DISP_E_UNKNOWNNAME; } + if(!strcmp_wa(bstrName, "onlyDispID")) { + if(strict_dispid_check) + CHECK_EXPECT(testobj_onlydispid_d); + test_grfdex(grfdex, fdexNameCaseSensitive); + *pid = DISPID_TESTOBJ_ONLYDISPID; + return S_OK; + } ok(0, "unexpected name %s\n", wine_dbgstr_w(bstrName)); return E_NOTIMPL; @@ -266,6 +276,19 @@ static HRESULT WINAPI testObj_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_VT(pvarRes) = VT_I4; V_I4(pvarRes) = 1; return S_OK; + case DISPID_TESTOBJ_ONLYDISPID: + if(strict_dispid_check) + CHECK_EXPECT(testobj_onlydispid_i); + ok(wFlags == INVOKE_PROPERTYGET, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(!pdp->rgvarg, "rgvarg != NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(!pdp->cArgs, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(V_VT(pvarRes) == VT_EMPTY, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); + ok(pei != NULL, "pei == NULL\n"); + return DISP_E_MEMBERNOTFOUND; } ok(0, "unexpected call %x\n", id); @@ -1431,6 +1454,12 @@ static void run_tests(void) parse_script_a("testThis(this);"); parse_script_a("(function () { testThis(this); })();"); + SET_EXPECT(testobj_onlydispid_d); + SET_EXPECT(testobj_onlydispid_i); + parse_script_a("ok(typeof(testObj.onlyDispID) === 'unknown', 'unexpected typeof(testObj.onlyDispID)');"); + CHECK_CALLED(testobj_onlydispid_d); + CHECK_CALLED(testobj_onlydispid_i); + run_from_res("lang.js"); run_from_res("api.js"); run_from_res("regexp.js");

1 0

Alexandre Julliard : configure: Make the import lib name optional in WINE_CONFIG_DLL.
by Alexandre Julliard 29 Dec '10

29 Dec '10

Module: wine Branch: master Commit: 1858f43d99dfb3e9875eeb891e025a6c8b09c412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1858f43d99dfb3e9875eeb891… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 29 14:10:47 2010 +0100 configure: Make the import lib name optional in WINE_CONFIG_DLL. --- aclocal.m4 | 2 +- configure | 290 +++++++++++++++++++++++++------------------------- configure.ac | 288 +++++++++++++++++++++++++------------------------- tools/make_makefiles | 2 +- 4 files changed, 291 insertions(+), 291 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1858f43d99dfb3e9875ee…

1 0

Hwang YunSong : net: Update Korean resource.
by Alexandre Julliard 29 Dec '10

29 Dec '10

Module: wine Branch: master Commit: ab4eb729fd147e23ca654e6effce5480beec1a23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab4eb729fd147e23ca654e6ef… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Dec 29 11:03:03 2010 +0900 net: Update Korean resource. --- programs/net/Ko.rc | 40 +++++++++++++++++++++------------------- 1 files changed, 21 insertions(+), 19 deletions(-) diff --git a/programs/net/Ko.rc b/programs/net/Ko.rc index 713edf8..20f1e0f 100644 --- a/programs/net/Ko.rc +++ b/programs/net/Ko.rc @@ -3,7 +3,7 @@ * KOREAN language support * * Copyright (C) 2007 Tim Schwartz - * Copyright (C) 2007 YunSong Hwang (hys545(a)dreamwiz.com) + * Copyright (C) 2007,2010 YunSong Hwang (hys545(a)dreamwiz.com) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,26 +22,28 @@ #include "resources.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE { - STRING_USAGE, "�� ɾ�� :\n\nNET [ HELP | START | STOP | USE ]\n" - STRING_START_USAGE, "�� .\n" - STRING_STOP_USAGE, "�� .\n" - STRING_STOP_DEP, "��ӵ� �� : %s\n" - STRING_CANT_STOP, "%s ��񽺸� �� ϴ�\n" - STRING_NO_SCM, "�� ڸ� �ٷ� �� ϴ�.\n" - STRING_NO_SVCHANDLE, "�� ڵ�� ϴ�.\n" - STRING_START_SVC, "%s ��񽺴� ��.\n" - STRING_START_SVC_SUCCESS, " %s �� .\n" - STRING_START_SVC_FAIL, "%s �� .\n" - STRING_STOP_SVC, "%s �� .\n" - STRING_STOP_SVC_SUCCESS, "%s �� .\n" - STRING_STOP_SVC_FAIL, "%s �� .\n" - STRING_HELP_USAGE, "��ɾ� ��:\n\nNET HELP ��ɾ�\n -or-\nNET ��ɾ� /HELP\n\n"\ - " �� ɾ�:\n NET HELP NET START NET STOP NET USE\n" - STRING_NO_ENTRIES, "��Ʈ�� ֽ��ϴ�.\n" - STRING_USE_HEADER, "\n�� \n---------------------------------------------------------------\n" - STRING_USE_ENTRY, "%s %S %S �� ҽ�: %lu\n" + STRING_USAGE, "이 명령어의 문법:\n\nNET [ HELP | START | STOP | USE ]\n" + STRING_START_USAGE, "지정된 서비스 시작.\n" + STRING_STOP_USAGE, "지정된 서비스 정지.\n" + STRING_STOP_DEP, "종속된 서비스 정지중: %s\n" + STRING_CANT_STOP, "%s 서비스를 정지할 수 없습니다\n" + STRING_NO_SCM, "서비스 제어 관리자를 다룰 수 없습니다.\n" + STRING_NO_SVCHANDLE, "서비스 핸들을 얻을 수 없습니다.\n" + STRING_START_SVC, "%s 서비스는 시작중.\n" + STRING_START_SVC_SUCCESS, " %s 서비스 시작 성공.\n" + STRING_START_SVC_FAIL, "%s 서비스 시작 실패.\n" + STRING_STOP_SVC, "%s 서비스 정지.\n" + STRING_STOP_SVC_SUCCESS, "%s 서비스 정지 성공.\n" + STRING_STOP_SVC_FAIL, "%s 서비스 정지 실패.\n" + STRING_HELP_USAGE, "명령어 문법:\n\nNET HELP 명령어\n -or-\nNET 명령어 /HELP\n\n"\ + " 가능한 명령어:\n NET HELP NET START NET STOP NET USE\n" + STRING_NO_ENTRIES, "리스트가 비어 있습니다.\n" + STRING_USE_HEADER, "\n상태 로컬 원격\n---------------------------------------------------------------\n" + STRING_USE_ENTRY, "%s %S %S 열린 리소스: %lu\n" }

1 0

Hwang YunSong : notepad: Update Korean resource.
by Alexandre Julliard 29 Dec '10

29 Dec '10

Module: wine Branch: master Commit: 0dea1a65b4f7c7d94d38960c95e28a776d40d862 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dea1a65b4f7c7d94d38960c9… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Dec 29 11:03:57 2010 +0900 notepad: Update Korean resource. --- programs/notepad/Ko.rc | 134 ++++++++++++++++++++++++----------------------- 1 files changed, 68 insertions(+), 66 deletions(-) diff --git a/programs/notepad/Ko.rc b/programs/notepad/Ko.rc index 5e13239..8e687d2 100644 --- a/programs/notepad/Ko.rc +++ b/programs/notepad/Ko.rc @@ -5,7 +5,7 @@ * Proofread 1998 by David Lee Lambert <lamber45(a)egr.msu.edu> * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> * Copyright 2007 Bang Jun-Young <junyoung(a)mogua.com> - * Copyright 2009 YunSong Hwang <hys545(a)dreamwiz.com> + * Copyright 2009,2010 YunSong Hwang <hys545(a)dreamwiz.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,47 +24,49 @@ #include "notepad_res.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT MAIN_MENU MENU { - POPUP "��(&F)" { - MENUITEM "�� (&N)\tCtrl+N", CMD_NEW - MENUITEM "��(&O)...\tCtrl+O", CMD_OPEN - MENUITEM "��(&S)\tCtrl+S", CMD_SAVE - MENUITEM "�ٸ� �̸�� (&A)...", CMD_SAVE_AS + POPUP "파일(&F)" { + MENUITEM "새로 만들기(&N)\tCtrl+N", CMD_NEW + MENUITEM "열기(&O)...\tCtrl+O", CMD_OPEN + MENUITEM "저장(&S)\tCtrl+S", CMD_SAVE + MENUITEM "다른 이름으로 저장(&A)...", CMD_SAVE_AS MENUITEM SEPARATOR - MENUITEM "�μ�(&P)...\tCtrl+P", CMD_PRINT - MENUITEM "�� (&T)...", CMD_PAGE_SETUP - MENUITEM "�� (&R)...", CMD_PRINTER_SETUP + MENUITEM "인쇄(&P)...\tCtrl+P", CMD_PRINT + MENUITEM "페이지 설정(&T)...", CMD_PAGE_SETUP + MENUITEM "프린터 설정(&R)...", CMD_PRINTER_SETUP MENUITEM SEPARATOR - MENUITEM "��(&X)", CMD_EXIT + MENUITEM "끝내기(&X)", CMD_EXIT } -POPUP "��(&E)" { - MENUITEM "�� (&U)\tCtrl+Z", CMD_UNDO +POPUP "편집(&E)" { + MENUITEM "실행 취소(&U)\tCtrl+Z", CMD_UNDO MENUITEM SEPARATOR - MENUITEM "�߶󳻱�(&T)\tCtrl+X", CMD_CUT - MENUITEM "��(&C)\tCtrl+C", CMD_COPY - MENUITEM "�ٿ��ֱ�(&P)\tCtrl+V", CMD_PASTE - MENUITEM "��(&D)\tDel", CMD_DELETE + MENUITEM "잘라내기(&T)\tCtrl+X", CMD_CUT + MENUITEM "복사(&C)\tCtrl+C", CMD_COPY + MENUITEM "붙여넣기(&P)\tCtrl+V", CMD_PASTE + MENUITEM "삭제(&D)\tDel", CMD_DELETE MENUITEM SEPARATOR - MENUITEM "�� (&A)\tCtrl+A", CMD_SELECT_ALL - MENUITEM "�ð�/��¥(&T)\tF5", CMD_TIME_DATE + MENUITEM "모두 선택(&A)\tCtrl+A", CMD_SELECT_ALL + MENUITEM "시간/날짜(&T)\tF5", CMD_TIME_DATE MENUITEM SEPARATOR - MENUITEM "�ڵ� �� ٲ�(&W)", CMD_WRAP - MENUITEM "�۲�(&F)...", CMD_FONT + MENUITEM "자동 줄 바꿈(&W)", CMD_WRAP + MENUITEM "글꼴(&F)...", CMD_FONT } -POPUP "ã��(&S)" { - MENUITEM "ã��(&S)...\tCtrl+F", CMD_SEARCH - MENUITEM "�� ã��(&N)\tF3", CMD_SEARCH_NEXT - MENUITEM "�ٲٱ�(&R)...\tCtrl+H", CMD_REPLACE +POPUP "찾기(&S)" { + MENUITEM "찾기(&S)...\tCtrl+F", CMD_SEARCH + MENUITEM "다음 찾기(&N)\tF3", CMD_SEARCH_NEXT + MENUITEM "바꾸기(&R)...\tCtrl+H", CMD_REPLACE } -POPUP "��(&H)" { - MENUITEM "�׸�(&C)", CMD_HELP_CONTENTS - MENUITEM "ã��(&S)...", CMD_HELP_SEARCH - MENUITEM "�� (&H)", CMD_HELP_ON_HELP +POPUP "도움말(&H)" { + MENUITEM "항목(&C)", CMD_HELP_CONTENTS + MENUITEM "찾기(&S)...", CMD_HELP_SEARCH + MENUITEM "도움말 사용법(&H)", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "��Ʈ�е� ��(&A)", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "노트패드 정보(&A)", CMD_HELP_ABOUT_NOTEPAD } } @@ -73,63 +75,63 @@ POPUP " DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 9, "MS Shell Dlg" -CAPTION "�� " +CAPTION "페이지 설정" { -LTEXT "�Ӹ��(&H):", 0x140, 10, 07, 40, 15 +LTEXT "머리글(&H):", 0x140, 10, 07, 40, 15 EDITTEXT IDC_PAGESETUP_HEADERVALUE, 60, 05,110, 12, WS_BORDER | WS_TABSTOP -LTEXT "�ٴڱ�(&F):", 0x142, 10, 24, 40, 15 +LTEXT "바닥글(&F):", 0x142, 10, 24, 40, 15 EDITTEXT IDC_PAGESETUP_FOOTERVALUE, 60, 22,110, 12, WS_BORDER | WS_TABSTOP -GROUPBOX "��(&M):", 0x144, 10, 43,160, 45 -LTEXT "��(&L):", 0x145, 20, 55, 30, 10, WS_CHILD +GROUPBOX "여백(&M):", 0x144, 10, 43,160, 45 +LTEXT "왼쪽(&L):", 0x145, 20, 55, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_LEFTVALUE, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "��(&T):", 0x148, 20, 73, 30, 10, WS_CHILD +LTEXT "위(&T):", 0x148, 20, 73, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_TOPVALUE, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "��(&R):", 0x14B, 100, 55, 30, 10, WS_CHILD +LTEXT "오른쪽(&R):", 0x14B, 100, 55, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_RIGHTVALUE, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "�Ʒ�(&B):", 0x14E,100, 73, 30, 10, WS_CHILD +LTEXT "아래(&B):", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_BOTTOMVALUE, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -DEFPUSHBUTTON "Ȯ��", IDOK, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "��", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "��(&H)", IDHELP, 180, 39, 40, 15, WS_TABSTOP +DEFPUSHBUTTON "확인", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "취소", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "도움말(&H)", IDHELP, 180, 39, 40, 15, WS_TABSTOP } STRINGTABLE { STRING_PAGESETUP_HEADERVALUE, "&f" -STRING_PAGESETUP_FOOTERVALUE, "&p ��" +STRING_PAGESETUP_FOOTERVALUE, "&p 페이지" -STRING_NOTEPAD, "�޸��" -STRING_ERROR, "��" -STRING_WARNING, "��" -STRING_INFO, "��" +STRING_NOTEPAD, "메모장" +STRING_ERROR, "오류" +STRING_WARNING, "경고" +STRING_INFO, "정보" -STRING_UNTITLED, "�� " +STRING_UNTITLED, "제목 없음" -STRING_ALL_FILES, "�� (*.*)" -STRING_TEXT_FILES_TXT, "�ؽ�Ʈ �� (*.txt)" +STRING_ALL_FILES, "모든 파일 (*.*)" +STRING_TEXT_FILES_TXT, "텍스트 문서 (*.txt)" -STRING_TOOLARGE, "%s �� ʹ� Ŀ�� ޸��δ� �� ϴ�.\n \ -�ٸ� ��⸦ ��Ͻʽÿ�." -STRING_NOTEXT, "�Է�� ϴ�.\ -\n�� Է�� õ��Ͻʽÿ�" -STRING_DOESNOTEXIST, "%s\ �� ϴ�.\n\n \ -�� ðڽ��ϱ�?" -STRING_NOTSAVED, "%s\ �� Ǿ��ϴ�.\n\n \ -�� Ͻðڽ��ϱ�?" -STRING_NOTFOUND, "%s ��ڿ�� ã�� ϴ�." -STRING_OUT_OF_MEMORY, "�� ۾�� Ϸ��ϴ� �� ʿ�� ޸𸮰� ��մϴ�.\ -\n�� ޸�� Ȯ��ϱ� �� ϳ� �̻�� α׷�� ݾ� �ֽʽÿ�." +STRING_TOOLARGE, "%s 파일이 너무 커서 메모장으로는 열 수 없습니다.\n \ +다른 편집기를 사용하십시오." +STRING_NOTEXT, "입력한 내용이 없습니다.\ +\n내용을 입력한 후 재시도하십시오" +STRING_DOESNOTEXIST, "%s\ 파일이 없습니다.\n\n \ +파일을 새로 만드시겠습니까?" +STRING_NOTSAVED, "%s\ 파일 내용이 변경되었습니다.\n\n \ +변경 내용을 저장하시겠습니까?" +STRING_NOTFOUND, "%s 문자열을 찾을 수 없습니다." +STRING_OUT_OF_MEMORY, "이 작업을 완료하는 데 필요한 메모리가 부족합니다.\ +\n사용 가능한 메모리의 양을 확보하기 위해 하나 이상의 응용 프로그램을 닫아 주십시오." -STRING_UNICODE_LE, "��ڵ� (UTF-16)" -STRING_UNICODE_BE, "��ڵ� (UTF-16 ��-��)" +STRING_UNICODE_LE, "유니코드 (UTF-16)" +STRING_UNICODE_BE, "유니코드 (UTF-16 빅-엔디언)" STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ -��ڵ� ��ڸ� ��ϰ� �ִ� �� %s ��ڵ��\n\ -�� ϸ� �� ս�� Դϴ�.\n\ -�� ڸ� ��Ϸ�� Ҹ� Ŭ��ϰ�, ��ڵ� ��Ӵٿ�� ڵ�\n\ -�ɼ� �� ϳ�� Ͻʽÿ�t.\n\ -��Ͻðڽ��ϱ�?" +유니코드 문자를 포함하고 있는 이 파일은 만약 당신이 %s 인코딩으로\n\ +파일을 저장하면 문자의 손실이 있을 것입니다.\n\ +이 문자를 보존하려면 취소를 클릭하고, 인코딩 드롭다운목록의 유니코드\n\ +옵션 중의 하나를 선택하십시오t.\n\ +계속하시겠습니까?" }

1 0