wine-commits May 2012

wine-commits@winehq.org

2 participants
737 discussions

Jacek Caban : wininet: Added real implementation of InternetQueryOption( INTERNET_OPTION_REQUEST_FLAGS).
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: 27af81972fd9d78a5b28a4a638aa189cacbe9375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27af81972fd9d78a5b28a4a63… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 24 15:24:43 2012 +0200 wininet: Added real implementation of InternetQueryOption(INTERNET_OPTION_REQUEST_FLAGS). --- dlls/wininet/http.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 0e3c1a3..2f64b03 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2159,17 +2159,29 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe *size = sizeof(DWORD); *(DWORD *)buffer = req->connect_timeout; return ERROR_SUCCESS; - case INTERNET_OPTION_REQUEST_FLAGS: - TRACE("INTERNET_OPTION_REQUEST_FLAGS\n"); + case INTERNET_OPTION_REQUEST_FLAGS: { + DWORD flags = 0; if (*size < sizeof(DWORD)) return ERROR_INSUFFICIENT_BUFFER; - *(DWORD*)buffer = 4; - *size = sizeof(DWORD); + /* FIXME: Add support for: + * INTERNET_REQFLAG_FROM_CACHE + * INTERNET_REQFLAG_CACHE_WRITE_DISABLED + */ + + if(req->session->appInfo->proxy) + flags |= INTERNET_REQFLAG_VIA_PROXY; + if(!req->rawHeaders) + flags |= INTERNET_REQFLAG_NO_HEADERS; + TRACE("INTERNET_OPTION_REQUEST_FLAGS returning %x\n", flags); + + *size = sizeof(DWORD); + *(DWORD*)buffer = flags; return ERROR_SUCCESS; } + } return INET_QueryOption(hdr, option, buffer, size, unicode); }

1 0

Michael Stefaniuc : urlmon/tests: Remove stray ok() call.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: afe73325f55c533c809596785b588ba963ff0950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afe73325f55c533c809596785… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu May 24 14:01:52 2012 +0200 urlmon/tests: Remove stray ok() call. --- dlls/urlmon/tests/protocol.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index ce383ee..889f3a9 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -941,7 +941,6 @@ static HRESULT WINAPI ProtocolSink_ReportData(IInternetProtocolSink *iface, DWOR if(!emulate_prot) CHECK_CALLED(ReportData2); CHECK_CALLED(ReportResult); - ok(hres == S_OK, "Read failed: %08x\n", hres); reported_all_data = TRUE; }else { if(!emulate_prot)

1 0

Dmitry Timoshkov : windowscodecs: Add a stubbed out IWICMetadataBlockReader interface.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: 882c1026a865a703711f2d78235075320b02f48c URL: http://source.winehq.org/git/wine.git/?a=commit;h=882c1026a865a703711f2d782… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 24 18:39:50 2012 +0900 windowscodecs: Add a stubbed out IWICMetadataBlockReader interface. --- dlls/windowscodecs/metadatahandler.c | 69 ++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index afcff21..ffe6763 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -39,6 +39,7 @@ typedef struct MetadataHandler { IWICMetadataWriter IWICMetadataWriter_iface; LONG ref; IWICPersistStream IWICPersistStream_iface; + IWICMetadataBlockReader IWICMetadataBlockReader_iface; const MetadataHandlerVtbl *vtable; MetadataItem *items; DWORD item_count; @@ -55,6 +56,11 @@ static inline MetadataHandler *impl_from_IWICPersistStream(IWICPersistStream *if return CONTAINING_RECORD(iface, MetadataHandler, IWICPersistStream_iface); } +static inline MetadataHandler *impl_from_IWICMetadataBlockReader(IWICMetadataBlockReader *iface) +{ + return CONTAINING_RECORD(iface, MetadataHandler, IWICMetadataBlockReader_iface); +} + static void MetadataHandler_FreeItems(MetadataHandler *This) { int i; @@ -92,6 +98,10 @@ static HRESULT WINAPI MetadataHandler_QueryInterface(IWICMetadataWriter *iface, { *ppv = &This->IWICPersistStream_iface; } + else if (IsEqualIID(&IID_IWICMetadataBlockReader, iid)) + { + *ppv = &This->IWICMetadataBlockReader_iface; + } else { *ppv = NULL; @@ -317,6 +327,64 @@ static const IWICPersistStreamVtbl MetadataHandler_PersistStream_Vtbl = { MetadataHandler_SaveEx }; +static HRESULT WINAPI MetadataHandler_MetadataBlockReader_QueryInterface(IWICMetadataBlockReader *iface, + REFIID iid, void **ppv) +{ + MetadataHandler *This = impl_from_IWICMetadataBlockReader(iface); + return IWICMetadataWriter_QueryInterface(&This->IWICMetadataWriter_iface, iid, ppv); +} + +static ULONG WINAPI MetadataHandler_MetadataBlockReader_AddRef(IWICMetadataBlockReader *iface) +{ + MetadataHandler *This = impl_from_IWICMetadataBlockReader(iface); + return IWICMetadataWriter_AddRef(&This->IWICMetadataWriter_iface); +} + +static ULONG WINAPI MetadataHandler_MetadataBlockReader_Release(IWICMetadataBlockReader *iface) +{ + MetadataHandler *This = impl_from_IWICMetadataBlockReader(iface); + return IWICMetadataWriter_Release(&This->IWICMetadataWriter_iface); +} + +static HRESULT WINAPI MetadataHandler_MetadataBlockReader_GetContainerFormat( + IWICMetadataBlockReader *iface, GUID *guid) +{ + FIXME("(%p,%p): stub\n", iface, guid); + return E_NOTIMPL; +} + +static HRESULT WINAPI MetadataHandler_MetadataBlockReader_GetCount( + IWICMetadataBlockReader *iface, UINT *count) +{ + FIXME("(%p,%p): stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI MetadataHandler_MetadataBlockReader_GetReaderByIndex( + IWICMetadataBlockReader *iface, UINT index, IWICMetadataReader **reader) +{ + FIXME("(%p,%u,%p): stub\n", iface, index, reader); + return E_NOTIMPL; +} + +static HRESULT WINAPI MetadataHandler_MetadataBlockReader_GetEnumerator( + IWICMetadataBlockReader *iface, IEnumUnknown **enum_metadata) +{ + FIXME("(%p,%p): stub\n", iface, enum_metadata); + return E_NOTIMPL; +} + +static const IWICMetadataBlockReaderVtbl MetadataHandler_MetadataBlockReader_Vtbl = +{ + MetadataHandler_MetadataBlockReader_QueryInterface, + MetadataHandler_MetadataBlockReader_AddRef, + MetadataHandler_MetadataBlockReader_Release, + MetadataHandler_MetadataBlockReader_GetContainerFormat, + MetadataHandler_MetadataBlockReader_GetCount, + MetadataHandler_MetadataBlockReader_GetReaderByIndex, + MetadataHandler_MetadataBlockReader_GetEnumerator +}; + HRESULT MetadataReader_Create(const MetadataHandlerVtbl *vtable, IUnknown *pUnkOuter, REFIID iid, void** ppv) { MetadataHandler *This; @@ -333,6 +401,7 @@ HRESULT MetadataReader_Create(const MetadataHandlerVtbl *vtable, IUnknown *pUnkO This->IWICMetadataWriter_iface.lpVtbl = &MetadataHandler_Vtbl; This->IWICPersistStream_iface.lpVtbl = &MetadataHandler_PersistStream_Vtbl; + This->IWICMetadataBlockReader_iface.lpVtbl = &MetadataHandler_MetadataBlockReader_Vtbl; This->ref = 1; This->vtable = vtable; This->items = NULL;

1 0

Hans Leidekker : fusion: Add a stub implementation of InitializeFusion.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: 4f392d53e3aa9e59b825e1d5d5a2566772fc5b58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f392d53e3aa9e59b825e1d5d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 24 09:53:43 2012 +0200 fusion: Add a stub implementation of InitializeFusion. --- dlls/fusion/fusion.spec | 2 +- dlls/fusion/fusion_main.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/fusion/fusion.spec b/dlls/fusion/fusion.spec index 54e4ead..264aff7 100644 --- a/dlls/fusion/fusion.spec +++ b/dlls/fusion/fusion.spec @@ -8,7 +8,7 @@ @ stdcall CreateInstallReferenceEnum(ptr ptr long ptr) @ stdcall GetCachePath(long wstr ptr) @ stub GetHistoryFileDirectory -@ stub InitializeFusion +@ stdcall InitializeFusion() @ stub InstallCustomAssembly @ stub InstallCustomModule @ stub LookupHistoryAssembly diff --git a/dlls/fusion/fusion_main.c b/dlls/fusion/fusion_main.c index 5c9d776..8f0906b 100644 --- a/dlls/fusion/fusion_main.c +++ b/dlls/fusion/fusion_main.c @@ -47,3 +47,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +HRESULT WINAPI InitializeFusion(void) +{ + FIXME("\n"); + return E_NOTIMPL; +}

1 0

Christian Costa : dmusic: Cleanup IDirectMusic8Impl_QueryInterface.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: 2024e241ffa1bc7ad2c291b945ba1d61d6505710 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2024e241ffa1bc7ad2c291b94… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 24 08:50:32 2012 +0200 dmusic: Cleanup IDirectMusic8Impl_QueryInterface. --- dlls/dmusic/dmusic.c | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 8afe2cc..9c93ba8 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -31,22 +31,27 @@ static inline IDirectMusic8Impl *impl_from_IDirectMusic8(IDirectMusic8 *iface) } /* IDirectMusic8Impl IUnknown part: */ -static HRESULT WINAPI IDirectMusic8Impl_QueryInterface(LPDIRECTMUSIC8 iface, REFIID riid, LPVOID *ppobj) +static HRESULT WINAPI IDirectMusic8Impl_QueryInterface(LPDIRECTMUSIC8 iface, REFIID riid, LPVOID *ret_iface) { - IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown) || - IsEqualIID (riid, &IID_IDirectMusic) || - IsEqualIID (riid, &IID_IDirectMusic2) || - IsEqualIID (riid, &IID_IDirectMusic8)) { - IUnknown_AddRef(iface); - *ppobj = This; - return S_OK; - } + IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); - return E_NOINTERFACE; + TRACE("(%p)->(%s, %p)\n", iface, debugstr_dmguid(riid), ret_iface); + + if (IsEqualIID (riid, &IID_IUnknown) || + IsEqualIID (riid, &IID_IDirectMusic) || + IsEqualIID (riid, &IID_IDirectMusic2) || + IsEqualIID (riid, &IID_IDirectMusic8)) + { + IDirectMusic8_AddRef(iface); + *ret_iface = iface; + return S_OK; + } + + *ret_iface = NULL; + + WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); + + return E_NOINTERFACE; } static ULONG WINAPI IDirectMusic8Impl_AddRef(LPDIRECTMUSIC8 iface)

1 0

Christian Costa : dmusic: Display new ref in trace for AddRef and Release for direct music object.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: 7c78cf2d3195ec718c1845a252df6ceb10c607d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c78cf2d3195ec718c1845a25… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 24 08:50:24 2012 +0200 dmusic: Display new ref in trace for AddRef and Release for direct music object. --- dlls/dmusic/dmusic.c | 34 ++++++++++++++++++---------------- 1 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 1a00236..8afe2cc 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -1,6 +1,8 @@ -/* IDirectMusic8 Implementation +/* + * IDirectMusic8 Implementation * * Copyright (C) 2003-2004 Rok Mandeljc + * Copyright (C) 2012 Christian Costa * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -49,31 +51,31 @@ static HRESULT WINAPI IDirectMusic8Impl_QueryInterface(LPDIRECTMUSIC8 iface, REF static ULONG WINAPI IDirectMusic8Impl_AddRef(LPDIRECTMUSIC8 iface) { - IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); - ULONG refCount = InterlockedIncrement(&This->ref); + IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); + TRACE("(%p)->(): new ref = %u\n", This, ref); - DMUSIC_LockModule(); + DMUSIC_LockModule(); - return refCount; + return ref; } static ULONG WINAPI IDirectMusic8Impl_Release(LPDIRECTMUSIC8 iface) { - IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); - ULONG refCount = InterlockedDecrement(&This->ref); + IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); + TRACE("(%p)->(): new ref = %u\n", This, ref); - if (!refCount) { - HeapFree(GetProcessHeap(), 0, This->ppPorts); - HeapFree(GetProcessHeap(), 0, This); - } + if (!ref) { + HeapFree(GetProcessHeap(), 0, This->ppPorts); + HeapFree(GetProcessHeap(), 0, This); + } - DMUSIC_UnlockModule(); - - return refCount; + DMUSIC_UnlockModule(); + + return ref; } /* IDirectMusic8Impl IDirectMusic part: */

1 0

Christian Costa : d3drm: Add stub interface for IDirectTextureX.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: b8a504729f39c8138a846a823e967fc7879f62e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8a504729f39c8138a846a823… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 24 08:50:02 2012 +0200 d3drm: Add stub interface for IDirectTextureX. --- dlls/d3drm/Makefile.in | 1 + dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/texture.c | 843 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 845 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8a504729f39c8138a846…

1 0

Christian Costa : d3drm: Add some tests for mesh default material and texture.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: 2d09fb800b9617380d91a8bccbf8fa45e5110390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d09fb800b9617380d91a8bcc… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 24 08:49:53 2012 +0200 d3drm: Add some tests for mesh default material and texture. --- dlls/d3drm/tests/d3drm.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index c0869be..5bbd363 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -353,6 +353,9 @@ static void test_MeshBuilder(void) DWORD nb_groups; unsigned nb_vertices, nb_faces, nb_face_vertices; DWORD data_size; + LPDIRECT3DRMMATERIAL material; + LPDIRECT3DRMTEXTURE texture; + D3DVALUE values[3]; nb_groups = IDirect3DRMMesh_GetGroupCount(mesh); ok(nb_groups == 1, "GetCroupCount returned %u\n", nb_groups); @@ -364,6 +367,27 @@ static void test_MeshBuilder(void) ok(nb_faces == 1, "Wrong number of faces %u (must be 1)\n", nb_faces); todo_wine ok(nb_face_vertices == 3, "Wrong number of vertices per face %u (must be 3)\n", nb_face_vertices); todo_wine ok(data_size == 3, "Wrong number of face data bytes %u (must be 3)\n", data_size); + hr = IDirect3DRMMesh_GetGroupTexture(mesh, 0, &texture); + todo_wine ok(hr == D3DRM_OK, "GetCroupTexture failed returning hr = %x\n", hr); + todo_wine ok(texture == NULL, "No texture should be present\n"); + hr = IDirect3DRMMesh_GetGroupMaterial(mesh, 0, &material); + todo_wine ok(hr == D3DRM_OK, "GetCroupMaterial failed returning hr = %x\n", hr); + todo_wine ok(material != NULL, "No material should be present\n"); + if ((hr == D3DRM_OK) && material) + { + hr = IDirect3DRMMaterial_GetEmissive(material, &values[0], &values[1], &values[2]); + ok(hr == D3DRM_OK, "GetMaterialEmissive failed returning hr = %x\n", hr); + ok(values[0] == 0.5f, "Emissive red component should be %f instead of %f\n", 0.5f, values[0]); + ok(values[1] == 0.5f, "Emissive green component should be %f instead of %f\n", 0.5f, values[1]); + ok(values[2] == 0.5f, "Emissive blue component should be %f instead of %f\n", 0.5f, values[2]); + hr = IDirect3DRMMaterial_GetSpecular(material, &values[0], &values[1], &values[2]); + ok(hr == D3DRM_OK, "GetMaterialEmissive failed returning hr = %x\n", hr); + ok(values[0] == 1.0f, "Specular red component should be %f instead of %f\n", 1.0f, values[0]); + ok(values[1] == 0.0f, "Specular green component should be %f instead of %f\n", 0.0f, values[1]); + ok(values[2] == 0.0f, "Specular blue component should be %f instead of %f\n", 0.0f, values[2]); + values[0] = IDirect3DRMMaterial_GetPower(material); + ok(values[0] == 30.0f, "Power value should be %f instead of %f\n", 30.0f, values[0]); + } IDirect3DRMMesh_Release(mesh); }

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: e943a4f0cc6413e5b7ed5d795d60128d9232ba4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e943a4f0cc6413e5b7ed5d795… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu May 24 15:22:51 2012 +0200 po: Update German translation. --- po/de.po | 31 ++++++++++--------------------- 1 files changed, 10 insertions(+), 21 deletions(-) diff --git a/po/de.po b/po/de.po index 3b791ab..8a5301f 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-05-05 11:36+0200\n" +"PO-Revision-Date: 2012-05-24 02:18+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -126,7 +126,7 @@ msgid "" "href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> for " "details." msgstr "" -"Wine kann das Gecko-Paket nicht finden. Es wird von Programmen mit " +"Wine konnte das Gecko-Paket nicht finden. Es wird von Programmen mit " "eingebettetem HTML benötigt, damit diese richtig funktionieren. Wine kann " "das Paket für Sie herunterladen und installieren.\n" "\n" @@ -159,21 +159,10 @@ msgid "Cancel" msgstr "Abbrechen" #: appwiz.rc:112 -#, fuzzy -#| msgid "Wine Gecko Installer" msgid "Wine Mono Installer" -msgstr "Wine-Gecko-Installation" +msgstr "Wine-Mono-Installation" #: appwiz.rc:115 -#, fuzzy -#| msgid "" -#| "Wine could not find a Gecko package which is needed for applications " -#| "embedding HTML to work correctly. Wine can automatically download and " -#| "install it for you.\n" -#| "\n" -#| "Note: it is recommended to use your distribution's packages instead. See " -#| "<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " -#| "for details." msgid "" "Wine could not find a Mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" @@ -182,13 +171,13 @@ msgid "" "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine kann das Gecko-Paket nicht finden. Es wird von Programmen mit " -"eingebettetem HTML benötigt, damit diese richtig funktionieren. Wine kann " -"das Paket für Sie herunterladen und installieren.\n" +"Wine konnte das Mono-Paket nicht finden. Es wird von .NET-Programmen " +"benötigt, damit diese richtig funktionieren. Wine kann das Paket für Sie " +"herunterladen und installieren.\n" "\n" "Hinweis: Es wird empfohlen, das Paket ihrer Distribution zu verwenden. " -"Weitere Hinweise finden Sie unter <a href=\"http://wiki.winehq.org/Gecko\"> " -"http://wiki.winehq.org/Gecko</a>." +"Weitere Hinweise finden Sie unter <a href=\"http://wiki.winehq.org/Mono\"> " +"http://wiki.winehq.org/Mono</a>." #: appwiz.rc:28 msgid "Add/Remove Programs" @@ -13159,11 +13148,11 @@ msgstr "Dies ist ein Test" #: wineconsole.rc:41 msgid "wineconsole: Couldn't parse event id\n" -msgstr "wineconsole: Kann Ereignis-ID nicht parsen\n" +msgstr "wineconsole: Ereignis-ID konnte nicht geparsed werden\n" #: wineconsole.rc:42 msgid "wineconsole: Invalid backend\n" -msgstr "wineconsole: Ungültiges backend\n" +msgstr "wineconsole: Ungültiges Backend\n" #: wineconsole.rc:43 msgid "wineconsole: Unrecognized command line option\n"

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: 9832be25e4f7c8bc9b8b8afb1e11177a2c45b0a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9832be25e4f7c8bc9b8b8afb1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu May 24 15:10:01 2012 +0200 po: Update French translation. --- po/fr.po | 23 ++++++----------------- 1 files changed, 6 insertions(+), 17 deletions(-) diff --git a/po/fr.po b/po/fr.po index a9c9fac..a6a9e17 100644 --- a/po/fr.po +++ b/po/fr.po @@ -159,21 +159,10 @@ msgid "Cancel" msgstr "Annuler" #: appwiz.rc:112 -#, fuzzy -#| msgid "Wine Gecko Installer" msgid "Wine Mono Installer" -msgstr "Programme d'installation de Gecko pour Wine" +msgstr "Programme d'installation de Mono pour Wine" #: appwiz.rc:115 -#, fuzzy -#| msgid "" -#| "Wine could not find a Gecko package which is needed for applications " -#| "embedding HTML to work correctly. Wine can automatically download and " -#| "install it for you.\n" -#| "\n" -#| "Note: it is recommended to use your distribution's packages instead. See " -#| "<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " -#| "for details." msgid "" "Wine could not find a Mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" @@ -182,13 +171,13 @@ msgid "" "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine n'a pu trouver de paquet Gecko, qui est nécessaire pour que les " -"applications incorporant du HTML puissent fonctionner correctement. Wine " -"peut automatiquement le télécharger et l'installer pour vous.\n" +"Wine n'a pu trouver de paquet Mono, qui est nécessaire pour que les " +"applications .NET fonctionnent correctement. Wine peut automatiquement le " +"télécharger et l'installer pour vous.\n" "\n" "Note : il est recommandé d'utiliser le paquet de votre distribution. " -"Consultez <a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/" -"Gecko</a> pour plus de détails." +"Consultez <a href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/" +"Mono</a> pour plus de détails." #: appwiz.rc:28 msgid "Add/Remove Programs"

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
74
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 May 2012