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

Kirill Smelkov : wrc: Drop hardcoded INCLUDEDIR.
by Alexandre Julliard 22 Apr '10

22 Apr '10

Module: wine Branch: master Commit: 277aba1d769abcc91443a18ff1c28e7b506a69fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=277aba1d769abcc91443a18ff… Author: Kirill Smelkov <kirr(a)mns.spb.ru> Date: Wed Apr 21 19:33:14 2010 +0400 wrc: Drop hardcoded INCLUDEDIR. INCLUDEDIR should be defined in Makefile.in, and if not, we should notice. --- tools/wrc/wrc.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 2919d38..614cc84 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -44,10 +44,6 @@ #include "parser.h" #include "wine/wpp.h" -#ifndef INCLUDEDIR -#define INCLUDEDIR "/usr/local/include/wine" -#endif - #ifdef WORDS_BIGENDIAN #define ENDIAN "big" #else

1 0

Aurimas Fišeras : shell32: Update Lithuanian translation.
by Alexandre Julliard 22 Apr '10

22 Apr '10

Module: wine Branch: master Commit: d39e99dc49bb954752e047a7ed1c85c0db29f461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d39e99dc49bb954752e047a7e… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Apr 21 19:00:33 2010 +0300 shell32: Update Lithuanian translation. --- dlls/shell32/shell32_Lt.rc | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32_Lt.rc b/dlls/shell32/shell32_Lt.rc index 132dcb3..8bbbb9c 100644 --- a/dlls/shell32/shell32_Lt.rc +++ b/dlls/shell32/shell32_Lt.rc @@ -1,5 +1,5 @@ /* - * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * Copyright 2009-2010 Aurimas Fišeras <aurimas(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -208,6 +208,10 @@ STRINGTABLE IDS_SHV_COLUMN11 "Grupė" IDS_SHV_COLUMN_DELFROM "Originali vieta" IDS_SHV_COLUMN_DELDATE "Pašalinimo data" + IDS_SHV_COL_DOCS "Dokumentai" + IDS_SHV_COL_STATUS "Būsena" + IDS_SHV_COL_LOCATION "Vieta" + IDS_SHV_COL_MODEL "Modelis" /* special folders */ IDS_DESKTOP "Darbalaukis"

1 0

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to FindContext().
by Alexandre Julliard 22 Apr '10

22 Apr '10

Module: wine Branch: master Commit: 1b26ccde9176bbec2dff0559e047ab4a43422497 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b26ccde9176bbec2dff0559e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 21 22:02:29 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to FindContext(). --- dlls/wined3d/context.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 7aae16d..640af0b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1807,7 +1807,7 @@ static struct wined3d_context *findThreadContextForSwapChain(IWineD3DSwapChain * * Returns: The needed context * *****************************************************************************/ -static struct wined3d_context *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target) +static struct wined3d_context *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *target) { IWineD3DSwapChain *swapchain = NULL; struct wined3d_context *current_context = context_get_current(); @@ -1822,27 +1822,28 @@ static struct wined3d_context *FindContext(IWineD3DDeviceImpl *This, IWineD3DSur && current_context->current_rt && current_context->swapchain->device == This) { - target = current_context->current_rt; + target = (IWineD3DSurfaceImpl *)current_context->current_rt; } else { IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *)This->swapchains[0]; - if (swapchain->backBuffer) target = swapchain->backBuffer[0]; - else target = swapchain->frontBuffer; + if (swapchain->backBuffer) target = (IWineD3DSurfaceImpl *)swapchain->backBuffer[0]; + else target = (IWineD3DSurfaceImpl *)swapchain->frontBuffer; } } - if (current_context && current_context->current_rt == target) + if (current_context && (IWineD3DSurfaceImpl *)current_context->current_rt == target) { context_validate(current_context); return current_context; } - if (SUCCEEDED(IWineD3DSurface_GetContainer(target, &IID_IWineD3DSwapChain, (void **)&swapchain))) { + if (target->Flags & SFLAG_SWAPCHAIN) + { TRACE("Rendering onscreen\n"); + swapchain = (IWineD3DSwapChain *)target->container; context = findThreadContextForSwapChain(swapchain, tid); - IWineD3DSwapChain_Release(swapchain); } else { @@ -2184,7 +2185,7 @@ struct wined3d_context *context_acquire(IWineD3DDeviceImpl *device, IWineD3DSurf TRACE("device %p, target %p, usage %#x.\n", device, target, usage); - context = FindContext(device, target); + context = FindContext(device, (IWineD3DSurfaceImpl *)target); context_setup_target(device, context, target); context_enter(context); if (!context->valid) return context;

1 0

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to context_setup_target().
by Alexandre Julliard 22 Apr '10

22 Apr '10

Module: wine Branch: master Commit: 95fb8eaa148567f8a2b0194a67c98bc69ea5d471 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95fb8eaa148567f8a2b0194a6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 21 22:02:30 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to context_setup_target(). --- dlls/wined3d/context.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 640af0b..e3833fc 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2090,14 +2090,15 @@ static void context_apply_state(struct wined3d_context *context, IWineD3DDeviceI } } -static void context_setup_target(IWineD3DDeviceImpl *device, struct wined3d_context *context, IWineD3DSurface *target) +static void context_setup_target(IWineD3DDeviceImpl *device, + struct wined3d_context *context, IWineD3DSurfaceImpl *target) { BOOL old_render_offscreen = context->render_offscreen, render_offscreen; const struct StateEntry *StateTable = device->StateTable; if (!target) return; - else if (context->current_rt == target) return; - render_offscreen = surface_is_offscreen((IWineD3DSurfaceImpl *)target); + else if ((IWineD3DSurfaceImpl *)context->current_rt == target) return; + render_offscreen = surface_is_offscreen(target); context_set_render_offscreen(context, StateTable, render_offscreen); @@ -2110,7 +2111,7 @@ static void context_setup_target(IWineD3DDeviceImpl *device, struct wined3d_cont else { const struct wined3d_format_desc *old = ((IWineD3DSurfaceImpl *)context->current_rt)->resource.format_desc; - const struct wined3d_format_desc *new = ((IWineD3DSurfaceImpl *)target)->resource.format_desc; + const struct wined3d_format_desc *new = target->resource.format_desc; if (old->format != new->format) { @@ -2130,7 +2131,7 @@ static void context_setup_target(IWineD3DDeviceImpl *device, struct wined3d_cont * has to be called with the old rendertarget active, otherwise a * wrong drawable is read. */ if (wined3d_settings.offscreen_rendering_mode != ORM_FBO - && old_render_offscreen && context->current_rt != target) + && old_render_offscreen && (IWineD3DSurfaceImpl *)context->current_rt != target) { BOOL oldInDraw = device->isInDraw; @@ -2162,7 +2163,7 @@ static void context_setup_target(IWineD3DDeviceImpl *device, struct wined3d_cont } context->draw_buffer_dirty = TRUE; - context->current_rt = target; + context->current_rt = (IWineD3DSurface *)target; } /***************************************************************************** @@ -2186,7 +2187,7 @@ struct wined3d_context *context_acquire(IWineD3DDeviceImpl *device, IWineD3DSurf TRACE("device %p, target %p, usage %#x.\n", device, target, usage); context = FindContext(device, (IWineD3DSurfaceImpl *)target); - context_setup_target(device, context, target); + context_setup_target(device, context, (IWineD3DSurfaceImpl *)target); context_enter(context); if (!context->valid) return context;

1 0

Henri Verbeet : wined3d: Store the current render target as an IWineD3DSurfaceImpl pointer in the context .
by Alexandre Julliard 22 Apr '10

22 Apr '10

Module: wine Branch: master Commit: 1c403e44b59d9f68e9a579af0a09126334138d42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c403e44b59d9f68e9a579af0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 21 22:02:31 2010 +0200 wined3d: Store the current render target as an IWineD3DSurfaceImpl pointer in the context. --- dlls/wined3d/context.c | 38 +++++++++++++++++++------------------- dlls/wined3d/device.c | 5 ++--- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/query.c | 14 ++++++++------ dlls/wined3d/swapchain.c | 5 ++--- dlls/wined3d/wined3d_private.h | 2 +- 6 files changed, 33 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c403e44b59d9f68e9a57…

1 0

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to context_acquire().
by Alexandre Julliard 22 Apr '10

22 Apr '10

Module: wine Branch: master Commit: 6b34b8e6d15a5977dbd2ccd52fa4a59de3fe8f83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b34b8e6d15a5977dbd2ccd52… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 21 22:02:32 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to context_acquire(). --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 7 ++++--- dlls/wined3d/device.c | 10 +++++----- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/query.c | 14 ++++++-------- dlls/wined3d/surface.c | 14 +++++++------- dlls/wined3d/swapchain.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 8 files changed, 27 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b34b8e6d15a5977dbd2c…

1 0

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to color_fill_fbo().
by Alexandre Julliard 22 Apr '10

22 Apr '10

Module: wine Branch: master Commit: 158a001859ab515a08ebf5204a5375fc0ba2e336 URL: http://source.winehq.org/git/wine.git/?a=commit;h=158a001859ab515a08ebf5204… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 21 22:02:33 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to color_fill_fbo(). --- dlls/wined3d/device.c | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4913805..d2b20c4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5449,23 +5449,23 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DeletePatch(IWineD3DDevice *iface, UINT return WINED3DERR_INVALIDCALL; } -static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, +static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surface, const WINED3DRECT *rect, const float color[4]) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; struct wined3d_context *context; - if (rect) IWineD3DSurface_LoadLocation(surface, SFLAG_INDRAWABLE, NULL); - IWineD3DSurface_ModifyLocation(surface, SFLAG_INDRAWABLE, TRUE); + if (rect) IWineD3DSurface_LoadLocation((IWineD3DSurface *)surface, SFLAG_INDRAWABLE, NULL); + IWineD3DSurface_ModifyLocation((IWineD3DSurface *)surface, SFLAG_INDRAWABLE, TRUE); - if (!surface_is_offscreen((IWineD3DSurfaceImpl *)surface)) + if (!surface_is_offscreen(surface)) { TRACE("Surface %p is onscreen\n", surface); - context = context_acquire(This, (IWineD3DSurfaceImpl *)surface, CTXUSAGE_RESOURCELOAD); + context = context_acquire(This, surface, CTXUSAGE_RESOURCELOAD); ENTER_GL(); context_bind_fbo(context, GL_FRAMEBUFFER, NULL); - context_set_draw_buffer(context, surface_get_gl_buffer((IWineD3DSurfaceImpl *)surface)); + context_set_draw_buffer(context, surface_get_gl_buffer(surface)); } else { @@ -5474,16 +5474,16 @@ static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, context = context_acquire(This, NULL, CTXUSAGE_RESOURCELOAD); ENTER_GL(); context_bind_fbo(context, GL_FRAMEBUFFER, &context->dst_fbo); - context_attach_surface_fbo(context, GL_FRAMEBUFFER, 0, (IWineD3DSurfaceImpl *)surface); + context_attach_surface_fbo(context, GL_FRAMEBUFFER, 0, surface); context_attach_depth_stencil_fbo(context, GL_FRAMEBUFFER, NULL, FALSE); } if (rect) { glEnable(GL_SCISSOR_TEST); - if (surface_is_offscreen((IWineD3DSurfaceImpl *)surface)) + if (surface_is_offscreen(surface)) glScissor(rect->x1, rect->y1, rect->x2 - rect->x1, rect->y2 - rect->y1); else - glScissor(rect->x1, ((IWineD3DSurfaceImpl *)surface)->currentDesc.Height - rect->y2, + glScissor(rect->x1, surface->currentDesc.Height - rect->y2, rect->x2 - rect->x1, rect->y2 - rect->y1); checkGLcall("glScissor"); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SCISSORRECT); @@ -5527,7 +5527,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { const float c[4] = {D3DCOLOR_R(color), D3DCOLOR_G(color), D3DCOLOR_B(color), D3DCOLOR_A(color)}; - color_fill_fbo(iface, pSurface, pRect, c); + color_fill_fbo(iface, surface, pRect, c); return WINED3D_OK; } else { /* Just forward this to the DirectDraw blitting engine */ @@ -5543,7 +5543,7 @@ static void WINAPI IWineD3DDeviceImpl_ClearRendertargetView(IWineD3DDevice *ifac IWineD3DRendertargetView *rendertarget_view, const float color[4]) { IWineD3DResource *resource; - IWineD3DSurface *surface; + IWineD3DSurfaceImpl *surface; HRESULT hr; hr = IWineD3DRendertargetView_GetResource(rendertarget_view, &resource); @@ -5560,7 +5560,7 @@ static void WINAPI IWineD3DDeviceImpl_ClearRendertargetView(IWineD3DDevice *ifac return; } - surface = (IWineD3DSurface *)resource; + surface = (IWineD3DSurfaceImpl *)resource; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { @@ -5581,8 +5581,9 @@ static void WINAPI IWineD3DDeviceImpl_ClearRendertargetView(IWineD3DDevice *ifac /* Just forward this to the DirectDraw blitting engine */ memset(&BltFx, 0, sizeof(BltFx)); BltFx.dwSize = sizeof(BltFx); - BltFx.u5.dwFillColor = color_convert_argb_to_fmt(c, ((IWineD3DSurfaceImpl *)surface)->resource.format_desc->format); - hr = IWineD3DSurface_Blt(surface, NULL, NULL, NULL, WINEDDBLT_COLORFILL, &BltFx, WINED3DTEXF_POINT); + BltFx.u5.dwFillColor = color_convert_argb_to_fmt(c, surface->resource.format_desc->format); + hr = IWineD3DSurface_Blt((IWineD3DSurface *)surface, NULL, NULL, NULL, + WINEDDBLT_COLORFILL, &BltFx, WINED3DTEXF_POINT); if (FAILED(hr)) { ERR("Blt failed, hr %#x\n", hr);

1 0

Michael Stefaniuc : kernel32: Update the Dutch (Suriname) NLS file.
by Alexandre Julliard 22 Apr '10

22 Apr '10

Module: wine Branch: master Commit: c8d0f70a5c0e53dae85c7117d3dc21c5e528e07a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8d0f70a5c0e53dae85c7117d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Apr 22 00:41:37 2010 +0200 kernel32: Update the Dutch (Suriname) NLS file. --- dlls/kernel32/nls/nls.nls | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/nls/nls.nls b/dlls/kernel32/nls/nls.nls index f4aa853..d6ec0b1 100644 --- a/dlls/kernel32/nls/nls.nls +++ b/dlls/kernel32/nls/nls.nls @@ -90,8 +90,8 @@ STRINGTABLE LANGUAGE LANG_DUTCH, SUBLANG_DUTCH_SURINAM LOCALE_SABBREVMONTHNAME11 "nov" LOCALE_SABBREVMONTHNAME12 "dec" LOCALE_SABBREVMONTHNAME13 "" - LOCALE_SCOUNTRY "" - LOCALE_SCURRENCY "" + LOCALE_SCOUNTRY "Suriname" + LOCALE_SCURRENCY "$" LOCALE_SDATE "-" LOCALE_SDAYNAME1 "maandag" LOCALE_SDAYNAME2 "dinsdag" @@ -102,7 +102,7 @@ STRINGTABLE LANGUAGE LANG_DUTCH, SUBLANG_DUTCH_SURINAM LOCALE_SDAYNAME7 "zondag" LOCALE_SDECIMAL "," LOCALE_SENGCOUNTRY "Suriname" - LOCALE_SENGCURRNAME "" + LOCALE_SENGCURRNAME "Surinamese Dollar" LOCALE_SENGLANGUAGE "Dutch" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "SRG" @@ -128,10 +128,10 @@ STRINGTABLE LANGUAGE LANG_DUTCH, SUBLANG_DUTCH_SURINAM LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "." LOCALE_SNAME "nl-SR" - LOCALE_SNATIVECTRYNAME "" - LOCALE_SNATIVECURRNAME "" + LOCALE_SNATIVECTRYNAME "Suriname" + LOCALE_SNATIVECURRNAME "Surinaamse dollar" LOCALE_SNATIVEDIGITS "0123456789" - LOCALE_SNATIVELANGNAME "" + LOCALE_SNATIVELANGNAME "Nederlands" LOCALE_SNEGATIVESIGN "-" LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Latn;"

1 0

Michael Stefaniuc : kernel32: Add some missing LOCALE_SNATIVECURRNAME constants.
by Alexandre Julliard 22 Apr '10

22 Apr '10

Module: wine Branch: master Commit: 40ea1a08a57853b1473431fb5b720265a3a76cd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40ea1a08a57853b1473431fb5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Apr 22 00:42:28 2010 +0200 kernel32: Add some missing LOCALE_SNATIVECURRNAME constants. --- dlls/kernel32/nls/brf.nls | 2 +- dlls/kernel32/nls/cor.nls | 2 +- dlls/kernel32/nls/gdh.nls | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/nls/brf.nls b/dlls/kernel32/nls/brf.nls index 8c0953c..7ac1e2e 100644 --- a/dlls/kernel32/nls/brf.nls +++ b/dlls/kernel32/nls/brf.nls @@ -124,7 +124,7 @@ STRINGTABLE LANGUAGE LANG_BRETON, SUBLANG_DEFAULT LOCALE_SMONTHOUSANDSEP "�" LOCALE_SNAME "br-FR" LOCALE_SNATIVECTRYNAME "Bro-C'haill" - LOCALE_SNATIVECURRNAME "" + LOCALE_SNATIVECURRNAME "euro" LOCALE_SNATIVEDIGITS "0123456789" LOCALE_SNATIVELANGNAME "Brezhoneg" LOCALE_SNEGATIVESIGN "-" diff --git a/dlls/kernel32/nls/cor.nls b/dlls/kernel32/nls/cor.nls index 177bc7a..7fc3214 100644 --- a/dlls/kernel32/nls/cor.nls +++ b/dlls/kernel32/nls/cor.nls @@ -124,7 +124,7 @@ STRINGTABLE LANGUAGE LANG_CORNISH, SUBLANG_DEFAULT LOCALE_SMONTHOUSANDSEP "," LOCALE_SNAME "kw-GB" LOCALE_SNATIVECTRYNAME "United Kingdom" - LOCALE_SNATIVECURRNAME "" + LOCALE_SNATIVECURRNAME "Peuns Sterling" LOCALE_SNATIVEDIGITS "0123456789" LOCALE_SNATIVELANGNAME "Kernewek" LOCALE_SNEGATIVESIGN "-" diff --git a/dlls/kernel32/nls/gdh.nls b/dlls/kernel32/nls/gdh.nls index 55480a3..69077c2 100644 --- a/dlls/kernel32/nls/gdh.nls +++ b/dlls/kernel32/nls/gdh.nls @@ -124,7 +124,7 @@ STRINGTABLE LANGUAGE LANG_GAELIC, SUBLANG_GAELIC_SCOTTISH LOCALE_SMONTHOUSANDSEP "," LOCALE_SNAME "gd-GB" LOCALE_SNATIVECTRYNAME "Breatainn Mh�r" - LOCALE_SNATIVECURRNAME "" + LOCALE_SNATIVECURRNAME "Puund Sasannach" LOCALE_SNATIVEDIGITS "0123456789" LOCALE_SNATIVELANGNAME "Gaidhlig" LOCALE_SNEGATIVESIGN "-"

1 0

Michael Stefaniuc : kernel32: The Isle of Man uses the Manx Pound.
by Alexandre Julliard 22 Apr '10

22 Apr '10

Module: wine Branch: master Commit: 6450b76a51c9fe9f5a3199cc0d62a99053b3842c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6450b76a51c9fe9f5a3199cc0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Apr 22 00:41:47 2010 +0200 kernel32: The Isle of Man uses the Manx Pound. --- dlls/kernel32/nls/gdv.nls | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/nls/gdv.nls b/dlls/kernel32/nls/gdv.nls index 67961ce..328a19c 100644 --- a/dlls/kernel32/nls/gdv.nls +++ b/dlls/kernel32/nls/gdv.nls @@ -97,7 +97,7 @@ STRINGTABLE LANGUAGE LANG_GAELIC, SUBLANG_GAELIC_MANX LOCALE_SDAYNAME7 "Jedoonee" LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "Isle of Man" - LOCALE_SENGCURRNAME "UK Pound Sterling" + LOCALE_SENGCURRNAME "Manx Pound" LOCALE_SENGLANGUAGE "Manx Gaelic" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "GBP" @@ -124,7 +124,7 @@ STRINGTABLE LANGUAGE LANG_GAELIC, SUBLANG_GAELIC_MANX LOCALE_SMONTHOUSANDSEP "," LOCALE_SNAME "gv-GB" LOCALE_SNATIVECTRYNAME "Manninn" - LOCALE_SNATIVECURRNAME "" + LOCALE_SNATIVECURRNAME "Punt Manninagh" LOCALE_SNATIVEDIGITS "0123456789" LOCALE_SNATIVELANGNAME "Gaelg" LOCALE_SNEGATIVESIGN "-"

1 0