June 2010 - Wine-commits - list.winehq.org

Frédéric Delanoy : kernel32: Fix a spelling error in French locale definitions.
by Alexandre Julliard 02 Jun '10

02 Jun '10

Module: wine Branch: master Commit: da05cbd8ce81392b950ab00a13349dfb4293c165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da05cbd8ce81392b950ab00a1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jun 1 23:59:51 2010 +0200 kernel32: Fix a spelling error in French locale definitions. --- dlls/kernel32/nls/fra.nls | 2 +- dlls/kernel32/nls/frb.nls | 2 +- dlls/kernel32/nls/frc.nls | 2 +- dlls/kernel32/nls/frl.nls | 2 +- dlls/kernel32/nls/frm.nls | 2 +- dlls/kernel32/nls/frs.nls | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/nls/fra.nls b/dlls/kernel32/nls/fra.nls index 80b34fb..9ee0137 100644 --- a/dlls/kernel32/nls/fra.nls +++ b/dlls/kernel32/nls/fra.nls @@ -152,5 +152,5 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamien" LGRPID_INDIC+LGRPID_RES_BASE "Indien" LGRPID_GEORGIAN+LGRPID_RES_BASE "G�orgien" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm�nian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm�nien" } diff --git a/dlls/kernel32/nls/frb.nls b/dlls/kernel32/nls/frb.nls index caeaa76..1a0480f 100644 --- a/dlls/kernel32/nls/frb.nls +++ b/dlls/kernel32/nls/frb.nls @@ -152,5 +152,5 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_BELGIAN LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamien" LGRPID_INDIC+LGRPID_RES_BASE "Indien" LGRPID_GEORGIAN+LGRPID_RES_BASE "G�orgien" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm�nian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm�nien" } diff --git a/dlls/kernel32/nls/frc.nls b/dlls/kernel32/nls/frc.nls index 5b7730c..a8c07b9 100644 --- a/dlls/kernel32/nls/frc.nls +++ b/dlls/kernel32/nls/frc.nls @@ -152,5 +152,5 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_CANADIAN LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamien" LGRPID_INDIC+LGRPID_RES_BASE "Indien" LGRPID_GEORGIAN+LGRPID_RES_BASE "G�orgien" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm�nian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm�nien" } diff --git a/dlls/kernel32/nls/frl.nls b/dlls/kernel32/nls/frl.nls index e0610e2..bc5874c 100644 --- a/dlls/kernel32/nls/frl.nls +++ b/dlls/kernel32/nls/frl.nls @@ -152,5 +152,5 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_LUXEMBOURG LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamien" LGRPID_INDIC+LGRPID_RES_BASE "Indien" LGRPID_GEORGIAN+LGRPID_RES_BASE "G�orgien" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm�nian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm�nien" } diff --git a/dlls/kernel32/nls/frm.nls b/dlls/kernel32/nls/frm.nls index 511bb51..0fc0b57 100644 --- a/dlls/kernel32/nls/frm.nls +++ b/dlls/kernel32/nls/frm.nls @@ -152,5 +152,5 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_MONACO LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamien" LGRPID_INDIC+LGRPID_RES_BASE "Indien" LGRPID_GEORGIAN+LGRPID_RES_BASE "G�orgien" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm�nian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm�nien" } diff --git a/dlls/kernel32/nls/frs.nls b/dlls/kernel32/nls/frs.nls index 45f4894..6613776 100644 --- a/dlls/kernel32/nls/frs.nls +++ b/dlls/kernel32/nls/frs.nls @@ -152,5 +152,5 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_SWISS LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamien" LGRPID_INDIC+LGRPID_RES_BASE "Indien" LGRPID_GEORGIAN+LGRPID_RES_BASE "G�orgien" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm�nian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm�nien" }

1 0

Jose Rostagno : mshtml: Update Spanish translation.
by Alexandre Julliard 02 Jun '10

02 Jun '10

Module: wine Branch: master Commit: 0b8e214365be921b7e42670628049d82beafd83e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b8e214365be921b7e4267062… Author: Jose Rostagno <joserostagno(a)hotmail.com> Date: Tue Jun 1 16:22:39 2010 -0300 mshtml: Update Spanish translation. --- dlls/mshtml/Es.rc | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/Es.rc b/dlls/mshtml/Es.rc index be8fe7d..590cf6a 100644 --- a/dlls/mshtml/Es.rc +++ b/dlls/mshtml/Es.rc @@ -57,3 +57,14 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Aceptar", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Anular", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP } + +ID_PROMPT_DIALOG DIALOG 0, 0, 200, 90 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", ID_PROMPT_PROMPT, 10, 10, 180, 30 + EDITTEXT ID_PROMPT_EDIT, 10, 45, 180, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Aceptar", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancelar", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP +}

1 0

Jose Rostagno : wininet: Update Spanish translation.
by Alexandre Julliard 02 Jun '10

02 Jun '10

Module: wine Branch: master Commit: 2a52bb82f2a4d18c500e2f0d4077140656edd55b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a52bb82f2a4d18c500e2f0d4… Author: Jose Rostagno <joserostagno(a)hotmail.com> Date: Tue Jun 1 16:19:47 2010 -0300 wininet: Update Spanish translation. --- dlls/wininet/wininet_Es.rc | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/wininet_Es.rc b/dlls/wininet/wininet_Es.rc index c9ce2ce..8704db6 100644 --- a/dlls/wininet/wininet_Es.rc +++ b/dlls/wininet/wininet_Es.rc @@ -40,6 +40,26 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Cancelar", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } +IDD_AUTHDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Autentificaci�n Requerida" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Por favor introduzca su nombre de usuario y contrase�a:", -1, 40, 6, 150, 15 + LTEXT "Servidor", -1, 40, 26, 50, 10 + LTEXT "Dominio", -1, 40, 46, 50, 10 + LTEXT "Usuario", -1, 40, 66, 50, 10 + LTEXT "Contrase�a", -1, 40, 86, 50, 10 + LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Guardar esta contrase�a (inseguro)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Aceptar", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Cancelar", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + STRINGTABLE DISCARDABLE { IDS_LANCONNECTION "Conexi�n LAN"

1 0

John Voltz : gdi32: Fix typo in enhanced metafile Arc function.
by Alexandre Julliard 02 Jun '10

02 Jun '10

Module: wine Branch: master Commit: c9f729c2f7b4017eb136da2bfd285fa1cacae4f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9f729c2f7b4017eb136da2bf… Author: John Voltz <john.voltz(a)gmail.com> Date: Tue Jun 1 09:16:23 2010 -0400 gdi32: Fix typo in enhanced metafile Arc function. --- dlls/gdi32/enhmfdrv/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 9c9cf6b..e066d0d 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -114,7 +114,7 @@ EMFDRV_ArcChordPie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, emr.ptlStart.x = xstart; emr.ptlStart.y = ystart; emr.ptlEnd.x = xend; - emr.ptlEnd.x = yend; + emr.ptlEnd.y = yend; /* Now calculate the BBox */

1 0

Alexandre Julliard : winex11: Ignore fontconfig and Xft configuration if the app explicitly requested antialiasing .
by Alexandre Julliard 02 Jun '10

02 Jun '10

Module: wine Branch: master Commit: 46e231cc85c2940ef98e1f99920775505ffa9525 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46e231cc85c2940ef98e1f999… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 2 10:55:19 2010 +0200 winex11: Ignore fontconfig and Xft configuration if the app explicitly requested antialiasing. --- dlls/winex11.drv/xrender.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index cca3321..810b163 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -886,7 +886,7 @@ static int GetCacheEntry(X11DRV_PDEVICE *physDev, LFANDSIZE *plfsz) { case ANTIALIASED_QUALITY: entry->aa_default = get_antialias_type( physDev, FALSE, hinter ); - break; + return ret; /* ignore further configuration */ case CLEARTYPE_QUALITY: case CLEARTYPE_NATURAL_QUALITY: entry->aa_default = get_antialias_type( physDev, subpixel, hinter );

1 0

Henri Verbeet : wined3d: Sampler states are 1-based.
by Alexandre Julliard 02 Jun '10

02 Jun '10

Module: wine Branch: master Commit: eb3c81fd6913385174202a37f47af052b8185d03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb3c81fd6913385174202a37f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 2 11:24:54 2010 +0200 wined3d: Sampler states are 1-based. 0 isn't a valid sampler state, and including it would overflow the stateblock's contained_sampler_states array in stateblock_init_contained_states(). --- dlls/wined3d/stateblock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 1696646..181b357 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -262,7 +262,7 @@ static void stateblock_savedstates_set_all(SAVEDSTATES *states, DWORD vs_consts, stateblock_set_bits(states->transform, HIGHEST_TRANSFORMSTATE + 1); stateblock_set_bits(states->renderState, WINEHIGHEST_RENDER_STATE + 1); for (i = 0; i < MAX_TEXTURES; ++i) states->textureState[i] = 0x3ffff; - for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) states->samplerState[i] = 0x3fff; + for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) states->samplerState[i] = 0x3ffe; states->clipplane = 0xffffffff; states->pixelShaderConstantsB = 0xffff; states->pixelShaderConstantsI = 0xffff;

1 0

Alexandre Julliard : comctl32: Only support an alpha channel for 32-bpp DIB-based imagelists.
by Alexandre Julliard 02 Jun '10

02 Jun '10

Module: wine Branch: master Commit: 95c529dee6abc68c12837c7b51fd158978f3d96e URL: http://source.winehq.org/git/wine.git/?a=commit;h=95c529dee6abc68c12837c7b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 2 12:21:41 2010 +0200 comctl32: Only support an alpha channel for 32-bpp DIB-based imagelists. --- dlls/comctl32/imagelist.c | 21 +++++++++++---------- dlls/comctl32/toolbar.c | 4 ++-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index a73b423..e4249b9 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -153,8 +153,9 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, if (!GetObjectW( hbmImage, sizeof(bm), &bm )) return FALSE; - /* if neither the imagelist nor the source bitmap can have an alpha channel, bail out now */ - if (himl->uBitsPixel != 32 && bm.bmBitsPixel != 32) return FALSE; + /* if either the imagelist or the source bitmap don't have an alpha channel, bail out now */ + if (!himl->has_alpha) return FALSE; + if (bm.bmBitsPixel != 32) return FALSE; SelectObject( hdc, hbmImage ); mask_width = (bm.bmWidth + 31) / 32 * 4; @@ -208,7 +209,7 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, } else { - if (himl->has_alpha) himl->has_alpha[pos + n] = 1; + himl->has_alpha[pos + n] = 1; if (mask_info && himl->hbmMask) /* generate the mask from the alpha channel */ { @@ -751,7 +752,7 @@ ImageList_Create (INT cx, INT cy, UINT flags, else himl->hbmMask = 0; - if (himl->uBitsPixel == 32) + if (ilc == ILC_COLOR32) himl->has_alpha = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, himl->cMaxImage ); else himl->has_alpha = NULL; @@ -1204,7 +1205,7 @@ static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int des } } - if (himl->uBitsPixel == 32) /* we already have an alpha channel in this case */ + if (himl->has_alpha) /* we already have an alpha channel in this case */ { /* pre-multiply by the alpha channel */ for (i = 0, ptr = bits; i < cx * cy; i++, ptr++) @@ -2515,7 +2516,7 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon) if (hdcImage == 0) ERR("invalid hdcImage!\n"); - if (himl->uBitsPixel == 32) + if (himl->has_alpha) { if (!ii.hbmColor) { @@ -2525,13 +2526,13 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon) SelectObject( hdcImage, color ); SelectObject( hdcMask, ii.hbmMask ); BitBlt( hdcImage, 0, 0, bmp.bmWidth, height, hdcMask, 0, height, SRCCOPY ); - add_with_alpha( himl, hdcImage, nIndex, 1, bmp.bmWidth, height, color, ii.hbmMask ); + ret = add_with_alpha( himl, hdcImage, nIndex, 1, bmp.bmWidth, height, color, ii.hbmMask ); DeleteDC( hdcMask ); DeleteObject( color ); + if (ret) goto done; } - else add_with_alpha( himl, hdcImage, nIndex, 1, bmp.bmWidth, bmp.bmHeight, ii.hbmColor, ii.hbmMask ); - - goto done; + else if (add_with_alpha( himl, hdcImage, nIndex, 1, bmp.bmWidth, bmp.bmHeight, + ii.hbmColor, ii.hbmMask )) goto done; } imagelist_point_from_index(himl, nIndex, &pt); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index d24b3dc..684406b 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -2757,7 +2757,7 @@ TOOLBAR_CheckImageListIconSize(TOOLBAR_INFO *infoPtr) cx, cy, infoPtr->nBitmapWidth, infoPtr->nBitmapHeight); himlNew = ImageList_Create(infoPtr->nBitmapWidth, infoPtr->nBitmapHeight, - ILC_COLORDDB|ILC_MASK, 8, 2); + ILC_COLOR32|ILC_MASK, 8, 2); for (i = 0; i < infoPtr->nNumBitmapInfos; i++) TOOLBAR_AddBitmapToImageList(infoPtr, himlNew, &infoPtr->bitmaps[i]); TOOLBAR_InsertImageList(&infoPtr->himlDef, &infoPtr->cimlDef, himlNew, 0); @@ -2854,7 +2854,7 @@ TOOLBAR_AddBitmap (TOOLBAR_INFO *infoPtr, INT count, const TBADDBITMAP *lpAddBmp TRACE ("creating default image list!\n"); himlDef = ImageList_Create (infoPtr->nBitmapWidth, infoPtr->nBitmapHeight, - ILC_COLORDDB | ILC_MASK, info.nButtons, 2); + ILC_COLOR32 | ILC_MASK, info.nButtons, 2); TOOLBAR_InsertImageList(&infoPtr->himlDef, &infoPtr->cimlDef, himlDef, 0); infoPtr->himlInt = himlDef; }

1 0

Alexandre Julliard : comctl32: Load comctl32 builtin bitmaps as 32-bit DIBs .
by Alexandre Julliard 02 Jun '10

02 Jun '10

Module: wine Branch: master Commit: 48e396ea6cdba2cac3d0c1ea3df44c9f3b879f35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48e396ea6cdba2cac3d0c1ea3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 2 15:51:39 2010 +0200 comctl32: Load comctl32 builtin bitmaps as 32-bit DIBs. --- dlls/comctl32/toolbar.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 684406b..fe782c3 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -2710,6 +2710,9 @@ TOOLBAR_AddBitmapToImageList(TOOLBAR_INFO *infoPtr, HIMAGELIST himlDef, const TB /* Add bitmaps to the default image list */ if (bitmap->hInst == NULL) /* a handle was passed */ hbmLoad = CopyImage(ULongToHandle(bitmap->nID), IMAGE_BITMAP, 0, 0, 0); + else if (bitmap->hInst == COMCTL32_hModule) + hbmLoad = LoadImageW( bitmap->hInst, MAKEINTRESOURCEW(bitmap->nID), + IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION ); else hbmLoad = CreateMappedBitmap(bitmap->hInst, bitmap->nID, 0, NULL, 0);

1 0

Paul Vriens : kernel32: Fix the Korean resources.
by Alexandre Julliard 02 Jun '10

02 Jun '10

Module: wine Branch: master Commit: dda58216eae4bd13f4d40fb263eb441f60121ff0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dda58216eae4bd13f4d40fb26… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jun 1 18:57:24 2010 +0200 kernel32: Fix the Korean resources. --- dlls/kernel32/nls/winerr_kor.mc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/nls/winerr_kor.mc b/dlls/kernel32/nls/winerr_kor.mc index 95082e4..289b17e 100644 --- a/dlls/kernel32/nls/winerr_kor.mc +++ b/dlls/kernel32/nls/winerr_kor.mc @@ -664,7 +664,7 @@ MessageId=160 SymbolicName=ERROR_BAD_ARGUMENTS Language=KOR DosExecPgm�� - +. MessageId=161 SymbolicName=ERROR_BAD_PATHNAME Language=KOR @@ -974,7 +974,7 @@ MessageId=534 SymbolicName=ERROR_ARITHMETIC_OVERFLOW Language=KOR Arithmetic ��÷ο� - +. MessageId=535 SymbolicName=ERROR_PIPE_CONNECTED Language=KOR @@ -3109,7 +3109,7 @@ MessageId=1739 SymbolicName=RPC_S_UUID_NO_ADDRESS Language=KOR ��Ʈ��ũ �ּҰ� ��ϴ�. - +. MessageId=1740 SymbolicName=RPC_S_DUPLICATE_ENDPOINT Language=KOR @@ -3489,7 +3489,7 @@ MessageId=1816 SymbolicName=ERROR_NOT_ENOUGH_QUOTA Language=KOR ��Ͱ� �� ʽ��ϴ� - +. MessageId=1817 SymbolicName=RPC_S_NO_INTERFACES Language=KOR @@ -3579,7 +3579,7 @@ MessageId=1899 SymbolicName=EPT_S_CANT_CREATE Language=KOR ��Ʈ �� DB�� ϴ� - +. MessageId=1900 SymbolicName=RPC_S_INVALID_OBJECT Language=KOR

1 0

Paul Vriens : wininet: Update the Danish translation and convert to UTF-8.
by Alexandre Julliard 02 Jun '10

02 Jun '10

Module: wine Branch: master Commit: e7eb9175318073f6d20093eda911d575ede2151b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7eb9175318073f6d20093eda… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jun 1 19:07:57 2010 +0200 wininet: Update the Danish translation and convert to UTF-8. Translation by Thomas Larsen <sikker2004(a)yahoo.com> --- dlls/wininet/wininet_Da.rc | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/wininet_Da.rc b/dlls/wininet/wininet_Da.rc index 6b37857..46efeb6 100644 --- a/dlls/wininet/wininet_Da.rc +++ b/dlls/wininet/wininet_Da.rc @@ -1,5 +1,6 @@ /* * Copyright 2008 Jens Albretsen + * 2010 Thomas Larsen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,11 +19,13 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Skriv netv�rkskodeord" +CAPTION "Skriv netværkskodeord" FONT 8, "MS Shell Dlg" { LTEXT "Skriv dit brugernavn og kodeord:", -1, 40, 6, 150, 15 @@ -40,7 +43,27 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Annuller", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } +IDD_AUTHDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Godkendelse Påkrævet" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Indtast venligst, dit brugernavn og adgangskode:", -1, 40, 6, 150, 15 + LTEXT "Server", -1, 40, 26, 50, 10 + LTEXT "Domæne", -1, 40, 46, 50, 10 + LTEXT "Bruger", -1, 40, 66, 50, 10 + LTEXT "Adgangskode", -1, 40, 86, 50, 10 + LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Gem denne adgangskode (usikker)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Annuller", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + STRINGTABLE DISCARDABLE { - IDS_LANCONNECTION "Lokal netv�rksforbindelse" + IDS_LANCONNECTION "Lokal netværksforbindelse" }

1 0