wine-commits November 2011

wine-commits@winehq.org

2 participants
852 discussions

Andrew Talbot : sane.ds: Remove extraneous braces from switch statement.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 8cf1f49005564dd5769fef730ae31d7da8a64fb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cf1f49005564dd5769fef730… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 5 20:54:08 2011 +0000 sane.ds: Remove extraneous braces from switch statement. --- dlls/sane.ds/ui.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index 8ff3b70..815478d 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -1011,17 +1011,13 @@ static INT_PTR CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM } } case WM_COMMAND: + switch (HIWORD(wParam)) { - switch (HIWORD(wParam)) - { - case BN_CLICKED: - ButtonClicked(hwndDlg,LOWORD(wParam), - (HWND)lParam); - break; - case CBN_SELCHANGE: - ComboChanged(hwndDlg,LOWORD(wParam), - (HWND)lParam); - } + case BN_CLICKED: + ButtonClicked(hwndDlg,LOWORD(wParam), (HWND)lParam); + break; + case CBN_SELCHANGE: + ComboChanged(hwndDlg,LOWORD(wParam), (HWND)lParam); } }

1 0

Andrew Talbot : oledlg: Remove extraneous braces from switch statement.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 47a68bbdbe983ac045029d4fece00eec782b4dcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=47a68bbdbe983ac045029d4fe… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 5 20:53:59 2011 +0000 oledlg: Remove extraneous braces from switch statement. --- dlls/oledlg/insobjdlg.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/oledlg/insobjdlg.c b/dlls/oledlg/insobjdlg.c index 01d242e..c801fba 100644 --- a/dlls/oledlg/insobjdlg.c +++ b/dlls/oledlg/insobjdlg.c @@ -197,11 +197,9 @@ static LRESULT UIINSOBJDLG_OnWMCommand(HWND hwnd, WPARAM wParam, LPARAM lParam) UIINSERTOBJECTDLG_AddControl(pdlgInfo); case IDC_OBJTYPELIST: - { if (wNotifyCode == LBN_SELCHANGE) UIINSERTOBJECTDLG_SelChange(pdlgInfo); break; - } } return 0; }

1 0

Andrew Talbot : msi: Remove extraneous braces from switch statement.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 3358b541ac830c16877985d0efbc15063eedf791 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3358b541ac830c16877985d0e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 5 20:53:52 2011 +0000 msi: Remove extraneous braces from switch statement. --- dlls/msi/tokenize.c | 27 +++++++++------------------ 1 files changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/msi/tokenize.c b/dlls/msi/tokenize.c index 8f6fe0f..64e14b8 100644 --- a/dlls/msi/tokenize.c +++ b/dlls/msi/tokenize.c @@ -193,16 +193,14 @@ static const char isIdChar[] = { int sqliteGetToken(const WCHAR *z, int *tokenType){ int i; switch( *z ){ - case ' ': case '\t': case '\n': case '\f': { + case ' ': case '\t': case '\n': case '\f': for(i=1; isspace(z[i]) && z[i] != '\r'; i++){} *tokenType = TK_SPACE; return i; - } - case '-': { + case '-': if( z[1]==0 ) return -1; *tokenType = TK_MINUS; return 1; - } case '(': *tokenType = TK_LP; return 1; @@ -215,7 +213,7 @@ int sqliteGetToken(const WCHAR *z, int *tokenType){ case '=': *tokenType = TK_EQ; return 1; - case '<': { + case '<': if( z[1]=='=' ){ *tokenType = TK_LE; return 2; @@ -226,8 +224,7 @@ int sqliteGetToken(const WCHAR *z, int *tokenType){ *tokenType = TK_LT; return 1; } - } - case '>': { + case '>': if( z[1]=='=' ){ *tokenType = TK_GE; return 2; @@ -235,8 +232,7 @@ int sqliteGetToken(const WCHAR *z, int *tokenType){ *tokenType = TK_GT; return 1; } - } - case '!': { + case '!': if( z[1]!='=' ){ *tokenType = TK_ILLEGAL; return 2; @@ -244,7 +240,6 @@ int sqliteGetToken(const WCHAR *z, int *tokenType){ *tokenType = TK_NE; return 2; } - } case '?': *tokenType = TK_WILDCARD; return 1; @@ -264,32 +259,28 @@ int sqliteGetToken(const WCHAR *z, int *tokenType){ *tokenType = TK_STRING; return i; } - case '.': { + case '.': if( !isdigit(z[1]) ){ *tokenType = TK_DOT; return 1; } /* Fall thru into the next case */ - } case '0': case '1': case '2': case '3': case '4': - case '5': case '6': case '7': case '8': case '9': { + case '5': case '6': case '7': case '8': case '9': *tokenType = TK_INTEGER; for(i=1; isdigit(z[i]); i++){} return i; - } - case '[': { + case '[': for(i=1; z[i] && z[i-1]!=']'; i++){} *tokenType = TK_ID; return i; - } - default: { + default: if( !isIdChar[*z] ){ break; } for(i=1; isIdChar[z[i]]; i++){} *tokenType = sqliteKeywordCode(z, i); return i; - } } *tokenType = TK_ILLEGAL; return 1;

1 0

Andrew Talbot : kernel32: Remove extraneous braces from switch statement.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: d5ad5ca91ca6aa1a3eb2a3849bb0dbcb6f67f5d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5ad5ca91ca6aa1a3eb2a3849… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 5 20:53:46 2011 +0000 kernel32: Remove extraneous braces from switch statement. --- dlls/kernel32/volume.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index e2b03a2..5d7a07d 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -585,12 +585,10 @@ static DWORD VOLUME_GetSuperblockSerial( const UNICODE_STRING *device, HANDLE ha case FS_FAT32: return GETLONG( superblock, 0x33 ); case FS_UDF: - { - if (!VOLUME_ReadCDBlock(handle, block, 257*BLOCK_SIZE)) - break; - superblock = block; - /* fallthrough */ - } + if (!VOLUME_ReadCDBlock(handle, block, 257*BLOCK_SIZE)) + break; + superblock = block; + /* fallthrough */ case FS_ISO9660: { BYTE sum[4];

1 0

Andrew Talbot : inetcomm: Remove extraneous braces from switch statements.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: f03c8a19a280bd5b464659e8c874536fe5dc13d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f03c8a19a280bd5b464659e8c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 5 20:53:39 2011 +0000 inetcomm: Remove extraneous braces from switch statements. --- dlls/inetcomm/pop3transport.c | 41 +++++++++++------------------------------ 1 files changed, 11 insertions(+), 30 deletions(-) diff --git a/dlls/inetcomm/pop3transport.c b/dlls/inetcomm/pop3transport.c index b0e31df..af7d1bf 100644 --- a/dlls/inetcomm/pop3transport.c +++ b/dlls/inetcomm/pop3transport.c @@ -63,7 +63,6 @@ static HRESULT parse_response(POP3Transport *This) switch (This->state) { case STATE_NONE: - { if (strlen(This->response) < 3) { WARN("parse error\n"); @@ -78,7 +77,7 @@ static HRESULT parse_response(POP3Transport *This) } This->state = STATE_DONE; return S_FALSE; - } + default: return S_OK; } } @@ -92,7 +91,6 @@ static HRESULT parse_uidl_response(POP3Transport *This, POP3UIDL *uidl) switch (This->state) { case STATE_OK: - { if (This->type == POP3CMD_GET_POPID) { if ((p = strchr(This->ptr, ' '))) @@ -111,9 +109,8 @@ static HRESULT parse_uidl_response(POP3Transport *This, POP3UIDL *uidl) } This->state = STATE_MULTILINE; return S_OK; - } + case STATE_MULTILINE: - { if (This->response[0] == '.' && !This->response[1]) { This->valid_info = FALSE; @@ -128,14 +125,12 @@ static HRESULT parse_uidl_response(POP3Transport *This, POP3UIDL *uidl) This->valid_info = TRUE; return S_OK; } - } + default: - { WARN("parse error\n"); This->state = STATE_DONE; return S_FALSE; } - } } static HRESULT parse_stat_response(POP3Transport *This, POP3STAT *stat) @@ -147,7 +142,6 @@ static HRESULT parse_stat_response(POP3Transport *This, POP3STAT *stat) switch (This->state) { case STATE_OK: - { if ((p = strchr(This->ptr, ' '))) { while (*p == ' ') p++; @@ -156,14 +150,12 @@ static HRESULT parse_stat_response(POP3Transport *This, POP3STAT *stat) This->state = STATE_DONE; return S_OK; } - } + default: - { WARN("parse error\n"); This->state = STATE_DONE; return S_FALSE; } - } } static HRESULT parse_list_response(POP3Transport *This, POP3LIST *list) @@ -175,7 +167,6 @@ static HRESULT parse_list_response(POP3Transport *This, POP3LIST *list) switch (This->state) { case STATE_OK: - { if (This->type == POP3CMD_GET_POPID) { if ((p = strchr(This->ptr, ' '))) @@ -189,9 +180,8 @@ static HRESULT parse_list_response(POP3Transport *This, POP3LIST *list) } This->state = STATE_MULTILINE; return S_OK; - } + case STATE_MULTILINE: - { if (This->response[0] == '.' && !This->response[1]) { This->valid_info = FALSE; @@ -206,14 +196,12 @@ static HRESULT parse_list_response(POP3Transport *This, POP3LIST *list) This->valid_info = TRUE; return S_OK; } - } + default: - { WARN("parse error\n"); This->state = STATE_DONE; return S_FALSE; } - } } static HRESULT parse_dele_response(POP3Transport *This, DWORD *dwPopId) @@ -221,18 +209,15 @@ static HRESULT parse_dele_response(POP3Transport *This, DWORD *dwPopId) switch (This->state) { case STATE_OK: - { *dwPopId = 0; /* FIXME */ This->state = STATE_DONE; return S_OK; - } + default: - { WARN("parse error\n"); This->state = STATE_DONE; return S_FALSE; } - } } static HRESULT parse_retr_response(POP3Transport *This, POP3RETR *retr) @@ -240,7 +225,6 @@ static HRESULT parse_retr_response(POP3Transport *This, POP3RETR *retr) switch (This->state) { case STATE_OK: - { retr->fHeader = FALSE; retr->fBody = FALSE; retr->dwPopId = This->msgid; @@ -251,7 +235,7 @@ static HRESULT parse_retr_response(POP3Transport *This, POP3RETR *retr) This->state = STATE_MULTILINE; This->valid_info = FALSE; return S_OK; - } + case STATE_MULTILINE: { int len; @@ -273,13 +257,12 @@ static HRESULT parse_retr_response(POP3Transport *This, POP3RETR *retr) This->valid_info = TRUE; return S_OK; } + default: - { WARN("parse error\n"); This->state = STATE_DONE; return S_FALSE; } - } } static HRESULT parse_top_response(POP3Transport *This, POP3TOP *top) @@ -287,7 +270,6 @@ static HRESULT parse_top_response(POP3Transport *This, POP3TOP *top) switch (This->state) { case STATE_OK: - { top->fHeader = FALSE; top->fBody = FALSE; top->dwPopId = This->msgid; @@ -299,7 +281,7 @@ static HRESULT parse_top_response(POP3Transport *This, POP3TOP *top) This->state = STATE_MULTILINE; This->valid_info = FALSE; return S_OK; - } + case STATE_MULTILINE: { int len; @@ -321,13 +303,12 @@ static HRESULT parse_top_response(POP3Transport *This, POP3TOP *top) This->valid_info = TRUE; return S_OK; } + default: - { WARN("parse error\n"); This->state = STATE_DONE; return S_FALSE; } - } } static void init_parser(POP3Transport *This, POP3COMMAND command, POP3CMDTYPE type)

1 0

Andrew Talbot : dplayx: Remove extraneous braces from switch statement.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: f640ba231b9d7ecbd8d081d4b14c3af4792842f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f640ba231b9d7ecbd8d081d4b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 5 20:53:31 2011 +0000 dplayx: Remove extraneous braces from switch statement. --- dlls/dplayx/dplay.c | 22 ++-------------------- 1 files changed, 2 insertions(+), 20 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 501b749..87eb185 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -648,23 +648,18 @@ HRESULT DP_HandleMessage( IDirectPlay2Impl* This, LPCVOID lpcMessageBody, { /* Name server needs to handle this request */ case DPMSGCMD_ENUMSESSIONSREQUEST: - { /* Reply expected */ NS_ReplyToEnumSessionsRequest( lpcMessageBody, lplpReply, lpdwMsgSize, This ); - break; - } /* Name server needs to handle this request */ case DPMSGCMD_ENUMSESSIONSREPLY: - { /* No reply expected */ NS_AddRemoteComputerAsNameServer( lpcMessageHeader, This->dp2->spData.dwSPHeaderSize, lpcMessageBody, This->dp2->lpNameServerData ); break; - } case DPMSGCMD_REQUESTNEWPLAYERID: { @@ -691,56 +686,43 @@ HRESULT DP_HandleMessage( IDirectPlay2Impl* This, LPCVOID lpcMessageBody, TRACE( "Allocating new playerid 0x%08x from remote request\n", lpReply->dpidNewPlayerId ); - break; } case DPMSGCMD_GETNAMETABLEREPLY: case DPMSGCMD_NEWPLAYERIDREPLY: - { - #if 0 if( wCommandId == DPMSGCMD_NEWPLAYERIDREPLY ) DebugBreak(); #endif DP_MSG_ReplyReceived( This, wCommandId, lpcMessageBody, dwMessageBodySize ); - break; - } #if 1 case DPMSGCMD_JUSTENVELOPE: - { TRACE( "GOT THE SELF MESSAGE: %p -> 0x%08x\n", lpcMessageHeader, ((const DWORD *)lpcMessageHeader)[1] ); NS_SetLocalAddr( This->dp2->lpNameServerData, lpcMessageHeader, 20 ); DP_MSG_ReplyReceived( This, wCommandId, lpcMessageBody, dwMessageBodySize ); - } #endif case DPMSGCMD_FORWARDADDPLAYER: - { #if 0 DebugBreak(); #endif #if 1 - TRACE( "Sending message to self to get my addr\n" ); - DP_MSG_ToSelf( This, 1 ); /* This is a hack right now */ + TRACE( "Sending message to self to get my addr\n" ); + DP_MSG_ToSelf( This, 1 ); /* This is a hack right now */ #endif break; - } case DPMSGCMD_FORWARDADDPLAYERNACK: - { DP_MSG_ErrorReceived( This, wCommandId, lpcMessageBody, dwMessageBodySize ); break; - } default: - { FIXME( "Unknown wCommandId %u. Ignoring message\n", wCommandId ); DebugBreak(); break; - } } /* FIXME: There is code in dplaysp.c to handle dplay commands. Move to here. */

1 0

Alexandre Julliard : advpack: Pass all the specified parameters to do_ocx_reg.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 2d60d9146097c4f8daad27c11891c6a71c439193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d60d9146097c4f8daad27c11… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 7 11:45:18 2011 +0100 advpack: Pass all the specified parameters to do_ocx_reg. --- dlls/advpack/advpack.c | 4 ++-- dlls/advpack/advpack_private.h | 2 +- dlls/advpack/install.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 112d38a..919c0bc 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -452,7 +452,7 @@ HRESULT WINAPI RebootCheckOnInstallW(HWND hWnd, LPCWSTR pszINF, } /* registers the OCX if do_reg is TRUE, unregisters it otherwise */ -HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg) +HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg, const WCHAR *flags, const WCHAR *param) { DLLREGISTER reg_func; @@ -519,7 +519,7 @@ HRESULT WINAPI RegisterOCX(HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show) if (!hm) goto done; - hr = do_ocx_reg(hm, TRUE); + hr = do_ocx_reg(hm, TRUE, str_flags, param); done: FreeLibrary(hm); diff --git a/dlls/advpack/advpack_private.h b/dlls/advpack/advpack_private.h index 23babf6..cbbbf48 100644 --- a/dlls/advpack/advpack_private.h +++ b/dlls/advpack/advpack_private.h @@ -21,7 +21,7 @@ #ifndef __ADVPACK_PRIVATE_H #define __ADVPACK_PRIVATE_H -HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg) DECLSPEC_HIDDEN; +HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg, const WCHAR *flags, const WCHAR *param) DECLSPEC_HIDDEN; LPWSTR get_parameter(LPWSTR *params, WCHAR separator) DECLSPEC_HIDDEN; void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) DECLSPEC_HIDDEN; diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 129ea82..6079625 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -161,7 +161,7 @@ static HRESULT register_ocxs_callback(HINF hinf, PCWSTR field, const void *arg) hm = LoadLibraryExW(buffer, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); if (hm) { - if (do_ocx_reg(hm, TRUE) != S_OK) + if (do_ocx_reg(hm, TRUE, NULL, NULL) != S_OK) hr = E_FAIL; FreeLibrary(hm);

1 0

Alexandre Julliard : shell32/tests: Avoid some array bounds warnings.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 30a7d0a5a73cca607f2ed77497fd8acaef74688e URL: http://source.winehq.org/git/wine.git/?a=commit;h=30a7d0a5a73cca607f2ed7749… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 7 11:44:35 2011 +0100 shell32/tests: Avoid some array bounds warnings. --- dlls/shell32/tests/shlfolder.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index c61a972..bee6cb5 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1806,6 +1806,7 @@ static void test_ITEMIDLIST_format(void) { cbOffset <= pidlFile->mkid.cb - sizeof(struct FileStructW)) { struct FileStructW *pFileStructW = (struct FileStructW *)(((LPBYTE)pidlFile)+cbOffset); + WCHAR *name = pFileStructW->wszName; ok(pidlFile->mkid.cb == cbOffset + pFileStructW->cbLen, "FileStructW's offset and length should add up to the PIDL's length!\n"); @@ -1842,9 +1843,9 @@ static void test_ITEMIDLIST_format(void) { /* TODO: Perform check for date being within one day.*/ } - ok (!lstrcmpW(wszFile[i], pFileStructW->wszName) || - !lstrcmpW(wszFile[i], (WCHAR *)(pFileStructW->abFooBar2 + 22)) || /* Vista */ - !lstrcmpW(wszFile[i], (WCHAR *)(pFileStructW->abFooBar2 + 26)), /* Win7 */ + ok (!lstrcmpW(wszFile[i], name) || + !lstrcmpW(wszFile[i], name + 9) || /* Vista */ + !lstrcmpW(wszFile[i], name + 11), /* Win7 */ "The filename should be stored in unicode at this position!\n"); } }

1 0

Alexandre Julliard : gdi32/tests: Avoid some array bounds warnings.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 6098a0457bff4c68170931f161007dc51004e68e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6098a0457bff4c68170931f16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 7 11:43:46 2011 +0100 gdi32/tests: Avoid some array bounds warnings. --- dlls/gdi32/tests/pen.c | 74 +++++++++++++++++++++++------------------------ 1 files changed, 36 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6098a0457bff4c6817093…

1 0

Hwang YunSong : po: Updated Korean translation.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: f61fb839280a82a8264699f79ffbfe9e4b52d683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f61fb839280a82a8264699f79… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sun Nov 6 21:48:26 2011 +0900 po: Updated Korean translation. --- po/ko.po | 74 +++++++++++++++++++++----------------------------------------- 1 files changed, 25 insertions(+), 49 deletions(-) diff --git a/po/ko.po b/po/ko.po index 4ad63f2..c5c5475 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6838,9 +6838,8 @@ msgid "Trash" msgstr "휴지통" #: shlwapi.rc:27 -#, fuzzy msgid "%d bytes" -msgstr "%ld 바이트" +msgstr "%d 바이트" #: shlwapi.rc:28 msgctxt "time unit: hours" @@ -7768,9 +7767,8 @@ msgstr "" "\n" #: attrib.rc:28 -#, fuzzy msgid "%1: File Not Found\n" -msgstr "%s :파일을 찾을 수 없습니다\n" +msgstr "%1 :파일을 찾을 수 없습니다\n" #: attrib.rc:47 msgid "" @@ -8690,14 +8688,12 @@ msgstr "" "'서비스'는 정지할 서비스의 이름입니다.\n" #: net.rc:30 -#, fuzzy msgid "Stopping dependent service: %1\n" -msgstr "종속된 서비스 정지중: %s\n" +msgstr "종속된 서비스 정지중: %1\n" #: net.rc:31 -#, fuzzy msgid "Could not stop service %1\n" -msgstr "%s 서비스를 정지할 수 없습니다\n" +msgstr "%1 서비스를 정지할 수 없음\n" #: net.rc:32 msgid "Could not get handle to service control manager.\n" @@ -8708,34 +8704,28 @@ msgid "Could not get handle to service.\n" msgstr "서비스 핸들을 얻을 수 없습니다.\n" #: net.rc:34 -#, fuzzy msgid "The %1 service is starting.\n" -msgstr "%s 서비스는 시작중.\n" +msgstr "%1 서비스는 시작중입니다.\n" #: net.rc:35 -#, fuzzy msgid "The %1 service was started successfully.\n" -msgstr "%s 서비스 시작 성공.\n" +msgstr "%1 서비스 시작 성공했습니다.\n" #: net.rc:36 -#, fuzzy msgid "The %1 service failed to start.\n" -msgstr "%s 서비스 시작 실패.\n" +msgstr "%1 서비스 시작 실패했습니다.\n" #: net.rc:37 -#, fuzzy msgid "The %1 service is stopping.\n" -msgstr "%s 서비스 정지.\n" +msgstr "%1 서비스는 정지하는 중입니다.\n" #: net.rc:38 -#, fuzzy msgid "The %1 service was stopped successfully.\n" -msgstr "%s 서비스 정지 성공.\n" +msgstr "%1 서비스 정지 성공했습니다.\n" #: net.rc:39 -#, fuzzy msgid "The %1 service failed to stop.\n" -msgstr "%s 서비스 정지 실패.\n" +msgstr "%1 서비스 정지 실패했습니다.\n" #: net.rc:41 msgid "There are no entries in the list.\n" @@ -8752,9 +8742,8 @@ msgstr "" "---------------------------------------------------------------\n" #: net.rc:43 -#, fuzzy msgid "%1 %2 %3 Open resources: %4!u!\n" -msgstr "%s %s %s 열린 리소스: %lu\n" +msgstr "%1 %2 %3 열린 리소스: %4!u!\n" #: net.rc:44 notepad.rc:122 oleview.rc:159 oleview.rc:172 wineconsole.rc:131 #: winefile.rc:131 winefile.rc:154 winefile.rc:184 winemine.rc:68 @@ -8901,9 +8890,8 @@ msgid "&Bottom:" msgstr "아래(&B):" #: notepad.rc:131 -#, fuzzy msgid "Encoding:" -msgstr "인코딩(&E)" +msgstr "인코딩:" #: notepad.rc:66 msgid "Page &p" @@ -8931,7 +8919,7 @@ msgstr "제목 없음" #: notepad.rc:76 msgid "Text files (*.txt)" -msgstr "텍스트 문서 (*.txt)" +msgstr "텍스트 파일 (*.txt)" #: notepad.rc:79 msgid "" @@ -11037,9 +11025,8 @@ msgid "Screen buffer size must be greater or equal to the window's one" msgstr "스크린 버퍼 크기는 반드시 창보다 같거나 커야합니다." #: wineconsole.rc:34 -#, fuzzy msgid "Each character is %1!u! pixels wide on %2!u! pixels high" -msgstr "각각의 글자는 %ld 픽셀 너비에 %ld 픽셀 높이를 가집니다" +msgstr "각각의 글자는 %1!u! 픽셀 너비에 %2!u! 픽셀 높이를 가집니다" #: wineconsole.rc:35 msgid "This is a test" @@ -11349,9 +11336,8 @@ msgid "Index/Inode" msgstr "인덱스/아이노드" #: winefile.rc:120 -#, fuzzy msgid "%1 of %2 free" -msgstr "%s of %s 사용가능" +msgstr "%1 의 %2 사용가능" #: winemine.rc:34 msgid "&Game" @@ -11422,9 +11408,8 @@ msgid "Rows" msgstr "가로줄" #: winemine.rc:87 -#, fuzzy msgid "Columns" -msgstr "세로줄(&C)" +msgstr "세로줄" #: winemine.rc:88 msgid "Mines" @@ -11882,59 +11867,50 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "올바르지 않은 매개변수의 갯수 - xcopy /?로 도움말을 보시오\n" #: xcopy.rc:28 -#, fuzzy msgid "Invalid parameter '%1' - Use xcopy /? for help\n" -msgstr "올바르지 않은 매개변수 '%s' - xcopy /?로 도움말을 보시오\n" +msgstr "올바르지 않은 매개변수 '%1' - xcopy /?로 도움말을 보시오\n" #: xcopy.rc:29 msgid "Press <enter> to begin copying\n" msgstr "<enter> 를 누르면 복사가 시작될 것입니다\n" #: xcopy.rc:30 -#, fuzzy msgid "%1!d! file(s) would be copied\n" -msgstr "%d 파일이 복사될 것입니다\n" +msgstr "%1!d! 파일이 복사될 것입니다\n" #: xcopy.rc:31 -#, fuzzy msgid "%1!d! file(s) copied\n" -msgstr "%d 파일이 복사되었습니다\n" +msgstr "%1!d! 파일이 복사되었습니다\n" #: xcopy.rc:34 -#, fuzzy msgid "" "Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" -"'%s'이 복사할 파일이나 디렉토리?\n" +"'%1'이 복사할 파일이나 디렉토리\n" "입니까?\n" "(F - 파일, D - 디렉토리)\n" #: xcopy.rc:35 -#, fuzzy msgid "%1? (Yes|No)\n" -msgstr "%s? (예|아니오)\n" +msgstr "%1? (예|아니오)\n" #: xcopy.rc:36 -#, fuzzy msgid "Overwrite %1? (Yes|No|All)\n" -msgstr "%s를 덮어쓰겠습니까? (예|아니오|모두)\n" +msgstr "%1를 덮어쓰겠습니까? (예|아니오|모두)\n" #: xcopy.rc:37 -#, fuzzy msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" -msgstr "r/c %d로 '%s'를 '%s'로 복사 실패 \n" +msgstr "r/c %3!d!로 '%1'를 '%2'로 복사 실패 \n" #: xcopy.rc:38 -#, fuzzy msgid "Failed to open '%1'\n" -msgstr "'%s' 열기 실패\n" +msgstr "'%1' 열기 실패\n" #: xcopy.rc:39 -#, fuzzy msgid "Failed during reading of '%1'\n" -msgstr "'%s를 읽지 못했습니다'\n" +msgstr "'%1를 읽지 못했습니다'\n" #: xcopy.rc:43 msgctxt "File key"

1 0

← Newer
1
...
67
68
69
70
71
72
73
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2011