wine-commits June 2008

wine-commits@winehq.org

3 participants
944 discussions

Dan Kegel : msxml/tests: Use VariantInit, not VariantClear, to initialize new variants.
by Alexandre Julliard 06 Jun '08

06 Jun '08

Module: wine Branch: master Commit: d38dc0233a60d516f90a0626c3fd7b3a68281a36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d38dc0233a60d516f90a0626c… Author: Dan Kegel <dank(a)kegel.com> Date: Thu Jun 5 17:07:40 2008 -0700 msxml/tests: Use VariantInit, not VariantClear, to initialize new variants. --- dlls/msxml3/tests/domdoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index cd50215..820a37a 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1934,7 +1934,7 @@ static void test_XPath(void) ole_expect(IXMLDOMDocument_selectNodes(doc, _bstr_("root//foo:c"), &list), E_FAIL); - VariantClear(&var); + VariantInit(&var); todo_wine ole_check(IXMLDOMDocument2_getProperty(doc, _bstr_("SelectionNamespaces"), &var)); todo_wine expect_eq(V_VT(&var), VT_BSTR, int, "%x"); if (V_VT(&var) == VT_BSTR)

1 0

Dan Kegel : msi/tests: Initialize buffer lengths before calling MsiSourceListEnumMediaDisks.
by Alexandre Julliard 06 Jun '08

06 Jun '08

Module: wine Branch: master Commit: a302ec645ca5f314f9985ac452ac70f002caf3a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a302ec645ca5f314f9985ac45… Author: Dan Kegel <dank(a)kegel.com> Date: Thu Jun 5 16:58:54 2008 -0700 msi/tests: Initialize buffer lengths before calling MsiSourceListEnumMediaDisks. --- dlls/msi/tests/source.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index 4d2cbbd..148ea40 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -2319,6 +2319,8 @@ static void test_MsiSourceListEnumMediaDisks(void) /* GetLastError is not set by the function */ /* NULL szProductCodeOrPatchCode */ + labelsz = sizeof(label); + promptsz = sizeof(prompt); r = pMsiSourceListEnumMediaDisksA(NULL, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, 0, &id, label, &labelsz, prompt, &promptsz); @@ -2326,6 +2328,8 @@ static void test_MsiSourceListEnumMediaDisks(void) "Expected ERROR_INVALID_PARAMETER, got %d\n", r); /* empty szProductCodeOrPatchCode */ + labelsz = sizeof(label); + promptsz = sizeof(prompt); r = pMsiSourceListEnumMediaDisksA("", usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, 0, &id, label, &labelsz, prompt, &promptsz); @@ -2333,6 +2337,8 @@ static void test_MsiSourceListEnumMediaDisks(void) "Expected ERROR_INVALID_PARAMETER, got %d\n", r); /* garbage szProductCodeOrPatchCode */ + labelsz = sizeof(label); + promptsz = sizeof(prompt); r = pMsiSourceListEnumMediaDisksA("garbage", usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, 0, &id, label, &labelsz, prompt, &promptsz); @@ -2340,6 +2346,8 @@ static void test_MsiSourceListEnumMediaDisks(void) "Expected ERROR_INVALID_PARAMETER, got %d\n", r); /* guid without brackets */ + labelsz = sizeof(label); + promptsz = sizeof(prompt); r = pMsiSourceListEnumMediaDisksA("51CD2AD5-0482-4C46-8DDD-0ED1022AA1AA", usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, 0, &id, label, &labelsz, @@ -2348,6 +2356,8 @@ static void test_MsiSourceListEnumMediaDisks(void) "Expected ERROR_INVALID_PARAMETER, got %d\n", r); /* guid with brackets */ + labelsz = sizeof(label); + promptsz = sizeof(prompt); r = pMsiSourceListEnumMediaDisksA("{51CD2AD5-0482-4C46-8DDD-0ED1022AA1AA}", usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, 0, &id, label, &labelsz, @@ -2356,6 +2366,8 @@ static void test_MsiSourceListEnumMediaDisks(void) "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); /* dwOptions has MSISOURCETYPE_NETWORK */ + labelsz = sizeof(label); + promptsz = sizeof(prompt); r = pMsiSourceListEnumMediaDisksA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT | MSISOURCETYPE_NETWORK, 0, &id, label, &labelsz, @@ -2364,6 +2376,8 @@ static void test_MsiSourceListEnumMediaDisks(void) "Expected ERROR_INVALID_PARAMETER, got %d\n", r); /* dwOptions has MSISOURCETYPE_URL */ + labelsz = sizeof(label); + promptsz = sizeof(prompt); r = pMsiSourceListEnumMediaDisksA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT | MSISOURCETYPE_URL, 0, &id, label, &labelsz, @@ -2372,6 +2386,8 @@ static void test_MsiSourceListEnumMediaDisks(void) "Expected ERROR_INVALID_PARAMETER, got %d\n", r); /* dwIndex is non-zero */ + labelsz = sizeof(label); + promptsz = sizeof(prompt); r = pMsiSourceListEnumMediaDisksA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, 1, &id, label, &labelsz, prompt, &promptsz); @@ -2387,6 +2403,8 @@ static void test_MsiSourceListEnumMediaDisks(void) ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); /* user product key exists */ + labelsz = sizeof(label); + promptsz = sizeof(prompt); r = pMsiSourceListEnumMediaDisksA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, 0, &id, label, &labelsz, prompt, &promptsz);

1 0

Stefan Dösinger : wined3d: Avoid float-> string conversion in arb shaders.
by Alexandre Julliard 06 Jun '08

06 Jun '08

Module: wine Branch: master Commit: 2173fde722ca979d1cff245ac7421e3651d54bed URL: http://source.winehq.org/git/wine.git/?a=commit;h=2173fde722ca979d1cff245ac… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jun 6 01:07:23 2008 +0200 wined3d: Avoid float->string conversion in arb shaders. --- dlls/wined3d/arb_program_shader.c | 28 ++++++++++++++++++++++++---- include/wine/wined3d_gl.h | 1 + 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index bc55712..bd633f6 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -354,12 +354,13 @@ void shader_generate_arb_declarations( ps_impl->srgb_mode_hardcoded = 1; } - /* Hardcodable local constants */ + /* Load local constants using the program-local space, + * this avoids reloading them each time the shader is used + */ if(!This->baseShader.load_local_constsF) { LIST_FOR_EACH_ENTRY(lconst, &This->baseShader.constantsF, local_constant, entry) { - float *value = (float *) lconst->value; - shader_addline(buffer, "PARAM C%u = {%f, %f, %f, %f};\n", lconst->idx, - value[0], value[1], value[2], value[3]); + shader_addline(buffer, "PARAM C%u = program.local[%u];\n", lconst->idx, + lconst->idx); } } @@ -1873,6 +1874,7 @@ static void shader_arb_generate_pshader(IWineD3DPixelShader *iface, SHADER_BUFFE CONST DWORD *function = This->baseShader.function; const char *fragcolor; WineD3D_GL_Info *gl_info = &((IWineD3DDeviceImpl *)This->baseShader.device)->adapter->gl_info; + local_constant* lconst; /* Create the hw ARB shader */ shader_addline(buffer, "!!ARBfp1.0\n"); @@ -1954,6 +1956,15 @@ static void shader_arb_generate_pshader(IWineD3DPixelShader *iface, SHADER_BUFFE errPos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); This->baseShader.prgId = -1; } + + /* Load immediate constants */ + if(!This->baseShader.load_local_constsF) { + LIST_FOR_EACH_ENTRY(lconst, &This->baseShader.constantsF, local_constant, entry) { + float *value = (float *) lconst->value; + GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, lconst->idx, value)); + checkGLcall("glProgramLocalParameter4fvARB"); + } + } } static void shader_arb_generate_vshader(IWineD3DVertexShader *iface, SHADER_BUFFER *buffer) { @@ -1961,6 +1972,7 @@ static void shader_arb_generate_vshader(IWineD3DVertexShader *iface, SHADER_BUFF shader_reg_maps* reg_maps = &This->baseShader.reg_maps; CONST DWORD *function = This->baseShader.function; WineD3D_GL_Info *gl_info = &((IWineD3DDeviceImpl *)This->baseShader.device)->adapter->gl_info; + local_constant* lconst; /* Create the hw ARB shader */ shader_addline(buffer, "!!ARBvp1.0\n"); @@ -2049,6 +2061,14 @@ static void shader_arb_generate_vshader(IWineD3DVertexShader *iface, SHADER_BUFF errPos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); This->baseShader.prgId = -1; } + + /* Load immediate constants */ + if(!This->baseShader.load_local_constsF) { + LIST_FOR_EACH_ENTRY(lconst, &This->baseShader.constantsF, local_constant, entry) { + float *value = (float *) lconst->value; + GL_EXTCALL(glProgramLocalParameter4fvARB(GL_VERTEX_PROGRAM_ARB, lconst->idx, value)); + } + } } static void shader_arb_get_caps(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_info, struct shader_caps *pCaps) { diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 9bd5a44..86be618 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -3487,6 +3487,7 @@ typedef enum _GL_SupportedExt { USE_GL_FUNC(PGLFNPROGRAMSTRINGARBPROC, glProgramStringARB, ARB_VERTEX_PROGRAM, NULL );\ USE_GL_FUNC(PGLFNDELETEPROGRAMSARBPROC, glDeleteProgramsARB, ARB_VERTEX_PROGRAM, NULL );\ USE_GL_FUNC(PGLFNPROGRAMENVPARAMETER4FVARBPROC, glProgramEnvParameter4fvARB, ARB_VERTEX_PROGRAM, NULL );\ + USE_GL_FUNC(PGLFNPROGRAMLOCALPARAMETER4FVARBPROC, glProgramLocalParameter4fvARB, ARB_VERTEX_PROGRAM, NULL );\ USE_GL_FUNC(PGLFNVERTEXATTRIBPOINTERARBPROC, glVertexAttribPointerARB, ARB_VERTEX_PROGRAM, NULL );\ USE_GL_FUNC(PGLFNENABLEVERTEXATTRIBARRAYARBPROC, glEnableVertexAttribArrayARB, ARB_VERTEX_PROGRAM, NULL );\ USE_GL_FUNC(PGLFNDISABLEVERTEXATTRIBARRAYARBPROC, glDisableVertexAttribArrayARB, ARB_VERTEX_PROGRAM, NULL );\

1 0

Michael Stefaniuc : notepad: Fix the Danish translation.
by Alexandre Julliard 06 Jun '08

06 Jun '08

Module: wine Branch: master Commit: 20655afb2ae1db4c39d8fa539df1b2593e61b2a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20655afb2ae1db4c39d8fa539… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 6 00:13:19 2008 +0200 notepad: Fix the Danish translation. --- programs/notepad/Da.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Da.rc b/programs/notepad/Da.rc index 0d1a4a0..ac289da 100644 --- a/programs/notepad/Da.rc +++ b/programs/notepad/Da.rc @@ -29,6 +29,7 @@ MAIN_MENU MENU MENUITEM "�&bn...\tCtrl+O", CMD_OPEN MENUITEM "&Gem\tCtrl+S", CMD_SAVE MENUITEM "Gem so&m...", CMD_SAVE_AS + MENUITEM SEPARATOR MENUITEM "&Udskriv...\tCtrl+P", CMD_PRINT MENUITEM "Side&ops�tning...", CMD_PAGE_SETUP MENUITEM "&Indstil printer...", CMD_PRINTER_SETUP @@ -47,6 +48,7 @@ POPUP "&Rediger" { MENUITEM "&Dato/tid\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "Automatisk &linjeskift", CMD_WRAP + MENUITEM "&Font...", CMD_FONT } POPUP "&S�g" { MENUITEM "&S�g...", CMD_SEARCH

1 0

Michael Stefaniuc : wordpad: Fix the Turkish translation.
by Alexandre Julliard 06 Jun '08

06 Jun '08

Module: wine Branch: master Commit: 76a80d24ae0d61c1826676ba0d49fc0fed603cae URL: http://source.winehq.org/git/wine.git/?a=commit;h=76a80d24ae0d61c1826676ba0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 6 00:13:00 2008 +0200 wordpad: Fix the Turkish translation. --- programs/wordpad/Tr.rc | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/Tr.rc b/programs/wordpad/Tr.rc index 4c9461a..eeb4455 100644 --- a/programs/wordpad/Tr.rc +++ b/programs/wordpad/Tr.rc @@ -28,11 +28,10 @@ BEGIN MENUITEM "&A�...\tCtrl+O", ID_FILE_OPEN MENUITEM "&Kaydet\tCtrl+S", ID_FILE_SAVE MENUITEM "&Farkl� Kaydet...", ID_FILE_SAVEAS - MENUITEM "Pag&e setup...", ID_PRINTSETUP MENUITEM SEPARATOR MENUITEM "&Print...\tCtrl+P", ID_PRINT - MENUITEM "Pag&e setup...", ID_PRINTSETUP MENUITEM "Print previe&w...", ID_PREVIEW + MENUITEM "Pag&e setup...", ID_PRINTSETUP MENUITEM SEPARATOR MENUITEM "&��k", ID_FILE_EXIT END

1 0

Michael Stefaniuc : shell32: Fix the Turkish translation.
by Alexandre Julliard 06 Jun '08

06 Jun '08

Module: wine Branch: master Commit: 9a62d27ff14672b0492569f14afe5c64b223a3ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a62d27ff14672b0492569f14… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 6 00:12:44 2008 +0200 shell32: Fix the Turkish translation. --- dlls/shell32/shell32_Tr.rc | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shell32_Tr.rc b/dlls/shell32/shell32_Tr.rc index e5d761e..ab9f61a 100644 --- a/dlls/shell32/shell32_Tr.rc +++ b/dlls/shell32/shell32_Tr.rc @@ -105,17 +105,19 @@ FONT 8, "MS Shell Dlg" 4, 40, 180, 120 } -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 +SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 220, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "%s Hakk�nda" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "Tamam", IDOK, 153, 133, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "Tamam", IDOK, 153, 133, 60, 12, WS_TABSTOP + PUSHBUTTON "Wine &license...", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER ICON "", stc1, 10, 10, 30, 30 - LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 137, 10 - LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 137, 10 - LTEXT "Wine'� size sunan geli�tiriciler:", IDC_ABOUT_WINE_TEXT, 8, 55, 137, 10 + LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 170, 10 + LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 170, 10 + LTEXT "Running on %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 + LTEXT "Wine'� size sunan geli�tiriciler:", IDC_ABOUT_WINE_TEXT, 8, 54, 204, 10 } SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95

1 0

Michael Stefaniuc : net: Use consistent whitespace placement in the usage and help strings.
by Alexandre Julliard 06 Jun '08

06 Jun '08

Module: wine Branch: master Commit: a29c6d59abe500301ddc7402df096aae0d73d606 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a29c6d59abe500301ddc7402d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 6 00:12:26 2008 +0200 net: Use consistent whitespace placement in the usage and help strings. --- programs/net/De.rc | 4 ++-- programs/net/En.rc | 4 ++-- programs/net/Ru.rc | 2 +- programs/net/Si.rc | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/net/De.rc b/programs/net/De.rc index f57a42e..276d126 100644 --- a/programs/net/De.rc +++ b/programs/net/De.rc @@ -23,7 +23,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE { - STRING_USAGE, "Die Syntax von diesem Befehl ist:\n\nNET [ HELP | START | STOP | USE]\n" + STRING_USAGE, "Die Syntax von diesem Befehl ist:\n\nNET [ HELP | START | STOP | USE ]\n" STRING_START_USAGE, "Gib den zu startenden Dienst an.\n" STRING_STOP_USAGE, "Gib den zu stoppenden Dienst an.\n" STRING_STOP_DEP, "Stoppe den abbhängigen Dienst: %s\n" @@ -37,7 +37,7 @@ STRINGTABLE STRING_STOP_SVC_SUCCESS, "Der %s Dienst wurde erfolgreich beendet.\n" STRING_STOP_SVC_FAIL, "Der %s Dienst konnte nicht beendet werden.\n" STRING_HELP_USAGE, "Die Syntax von diesem Befehl ist:\n\nNET HELP Befehl\n -or-\nNET Befehl /HELP\n\n"\ - " Mögliche Befehle:\n NET HELP NET START NET STOP NET USE\n" + " Mögliche Befehle:\n NET HELP NET START NET STOP NET USE\n" STRING_NO_ENTRIES, "Es sind keine Einträge in der Liste.\n" STRING_USE_HEADER, "\nStatus Lokal Entfernt\n---------------------------------------------------------------\n" STRING_USE_ENTRY, "%s %S %S Offene Ressourcen: %lu\n" diff --git a/programs/net/En.rc b/programs/net/En.rc index 913dcc4..54da5ed 100644 --- a/programs/net/En.rc +++ b/programs/net/En.rc @@ -23,7 +23,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE { - STRING_USAGE, "The syntax of this command is:\n\nNET [ HELP | START | STOP | USE]\n" + STRING_USAGE, "The syntax of this command is:\n\nNET [ HELP | START | STOP | USE ]\n" STRING_START_USAGE, "Specify service name to start.\n" STRING_STOP_USAGE, "Specify service name to stop.\n" STRING_STOP_DEP, "Stopping dependent service: %s\n" @@ -37,7 +37,7 @@ STRINGTABLE STRING_STOP_SVC_SUCCESS, "The %s service was stopped successfully.\n" STRING_STOP_SVC_FAIL, "The %s service failed to stop.\n" STRING_HELP_USAGE, "The syntax of this command is:\n\nNET HELP command\n -or-\nNET command /HELP\n\n"\ - " Commands available are:\n NET HELP NET START NET STOP NET USE\n" + " Commands available are:\n NET HELP NET START NET STOP NET USE\n" STRING_NO_ENTRIES, "There are no entries in the list.\n" STRING_USE_HEADER, "\nStatus Local Remote\n---------------------------------------------------------------\n" STRING_USE_ENTRY, "%s %S %S Open resources: %lu\n" diff --git a/programs/net/Ru.rc b/programs/net/Ru.rc index 7a1a870..33da048 100644 --- a/programs/net/Ru.rc +++ b/programs/net/Ru.rc @@ -37,7 +37,7 @@ STRINGTABLE STRING_STOP_SVC_SUCCESS, "�� %s �� .\n" STRING_STOP_SVC_FAIL, "�� %s.\n" STRING_HELP_USAGE, "��:\n\nNET HELP ��\n -��-\nNET �� /HELP\n\n"\ - " �� :\n NET HELP NET START NET STOP NET USE\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" diff --git a/programs/net/Si.rc b/programs/net/Si.rc index cfbdab0..7130967 100644 --- a/programs/net/Si.rc +++ b/programs/net/Si.rc @@ -25,7 +25,7 @@ LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT STRINGTABLE { - STRING_USAGE, "Sintaksa ukaza:\n\nNET [ HELP | START | STOP | USE]\n" + STRING_USAGE, "Sintaksa ukaza:\n\nNET [ HELP | START | STOP | USE ]\n" STRING_START_USAGE, "Navedite ime storitve, ki naj jo zaženem.\n" STRING_STOP_USAGE, "Navedite ime storitve, ki naj jo ustavim.\n" STRING_STOP_DEP, "Ustavljam odvisno storitev: %s\n" @@ -39,7 +39,7 @@ STRINGTABLE STRING_STOP_SVC_SUCCESS, "Ustavljanje storitve %s je uspelo.\n" STRING_STOP_SVC_FAIL, "Ustavljanje storitve %s ni uspelo.\n" STRING_HELP_USAGE, "Sintaksa ukaza je:\n\nNET HELP ukaz\n -ali-\nNET ukaz /HELP\n\n"\ - " Razpoložljivi ukazi:\n NET HELP NET START NET STOP NET USE\n" + " Razpoložljivi ukazi:\n NET HELP NET START NET STOP NET USE\n" STRING_NO_ENTRIES, "Na seznamu ni vnosov.\n" STRING_USE_HEADER, "\nStanje Lokalno Oddaljeno\n---------------------------------------------------------------\n" STRING_USE_ENTRY, "%s %S %S Porabljena sredstva: %lu\n"

1 0

Michael Stefaniuc : net: Add the USE subcommand to the translations that are missing it.
by Alexandre Julliard 06 Jun '08

06 Jun '08

Module: wine Branch: master Commit: 17c9953a1f4592f5e112bf9f2e5ec65bb3a07e6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=17c9953a1f4592f5e112bf9f2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 6 00:12:08 2008 +0200 net: Add the USE subcommand to the translations that are missing it. Spotted by Mikolaj Zalewski. --- programs/net/Da.rc | 4 ++-- programs/net/Fr.rc | 4 ++-- programs/net/Ko.rc | 2 +- programs/net/Nl.rc | 4 ++-- programs/net/No.rc | 4 ++-- programs/net/Pl.rc | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/programs/net/Da.rc b/programs/net/Da.rc index 592d5cd..02694fd 100644 --- a/programs/net/Da.rc +++ b/programs/net/Da.rc @@ -23,7 +23,7 @@ LANGUAGE LANG_DANISH, SUBLANG_DEFAULT STRINGTABLE { - STRING_USAGE, "S�dan bruges programmet:\n\nNET [ HELP | START | STOP ]\n" + STRING_USAGE, "S�dan bruges programmet:\n\nNET [ HELP | START | STOP | USE ]\n" STRING_START_USAGE, "Angiv navnet p� servicen som skal startes.\n" STRING_STOP_USAGE, "Angiv navnet p� servicen som skal stoppes.\n" STRING_STOP_DEP, "Stopper afh�ngig tjeneste: %s\n" @@ -36,7 +36,7 @@ STRINGTABLE STRING_STOP_SVC, "Tjenesten �%s� stopper.\n" STRING_STOP_SVC_SUCCESS, "Tjenesten �%s� stoppede vellykket.\n" STRING_STOP_SVC_FAIL, "Kunne ikke stoppe tjenesten �%s�.\n" - STRING_HELP_USAGE, "S�dan for du hj�lp:\n\nNET HELP kommando\n -eller-\nNET kommando /HELP\n\n Tilg�ngelige kommandoer:\n NET HELP NET START NET STOP\n" + STRING_HELP_USAGE, "S�dan for du hj�lp:\n\nNET HELP kommando\n -eller-\nNET kommando /HELP\n\n Tilg�ngelige kommandoer:\n NET HELP NET START NET STOP NET USE\n" STRING_NO_ENTRIES, "Det er ingen indskrivning i listen.\n" STRING_USE_HEADER, "\nStatus Lokal Remote\n---------------------------------------------------------------\n" STRING_USE_ENTRY, "%s %S %S �bne resourser: %lu\n" diff --git a/programs/net/Fr.rc b/programs/net/Fr.rc index bca25a4..3890649 100644 --- a/programs/net/Fr.rc +++ b/programs/net/Fr.rc @@ -24,7 +24,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE { - STRING_USAGE, "La syntaxe de cette commande est :\n\nNET [ HELP | START | STOP ]\n" + STRING_USAGE, "La syntaxe de cette commande est :\n\nNET [ HELP | START | STOP | USE ]\n" STRING_START_USAGE, "Spécifie le service à démarrer.\n" STRING_STOP_USAGE, "Spécifie le service à arrêter.\n" STRING_STOP_DEP, "Arrêt du service dépendant : %s\n" @@ -37,7 +37,7 @@ STRINGTABLE STRING_STOP_SVC, "Le service %s est en train d'être arrêté.\n" STRING_STOP_SVC_SUCCESS, "Le service %s a été arrêté avec succès.\n" STRING_STOP_SVC_FAIL, "Le service %s n'a pas pu être arrêté.\n" - STRING_HELP_USAGE, "La syntaxe de cette commande est :\n\nNET HELP commande\n -ou-\nNET commande /HELP\n\n Les commandes disponibles sont :\n NET HELP NET START NET STOP\n" + STRING_HELP_USAGE, "La syntaxe de cette commande est :\n\nNET HELP commande\n -ou-\nNET commande /HELP\n\n Les commandes disponibles sont :\n NET HELP NET START NET STOP NET USE\n" STRING_NO_ENTRIES, "Il n'y a pas d'entrées dans la liste.\n" STRING_USE_HEADER, "\nStatut Local Distant\n---------------------------------------------------------------\n" STRING_USE_ENTRY, "%s %S %S Ressources ouvertes : %lu\n" diff --git a/programs/net/Ko.rc b/programs/net/Ko.rc index 23055f5..7821187 100644 --- a/programs/net/Ko.rc +++ b/programs/net/Ko.rc @@ -38,7 +38,7 @@ STRINGTABLE 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\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" diff --git a/programs/net/Nl.rc b/programs/net/Nl.rc index a172b04..93fa834 100644 --- a/programs/net/Nl.rc +++ b/programs/net/Nl.rc @@ -23,7 +23,7 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE { - STRING_USAGE, "Gebruik van dit commando is:\n\nNET [ HELP | START | STOP ]\n" + STRING_USAGE, "Gebruik van dit commando is:\n\nNET [ HELP | START | STOP | USE ]\n" STRING_START_USAGE, "Specificeer de te starten service naam.\n" STRING_STOP_USAGE, "Specificeer de te stoppen service naam.\n" STRING_STOP_DEP, "Stoppen van afhankelijke service: %s\n" @@ -36,7 +36,7 @@ STRINGTABLE STRING_STOP_SVC, "De %s service is aan het stoppen.\n" STRING_STOP_SVC_SUCCESS, "De %s service was succesvol gestopt.\n" STRING_STOP_SVC_FAIL, "De %s service wilde niet stoppen.\n" - STRING_HELP_USAGE, "Gebruik van dit commando is:\n\nNET HELP commando\n -of-\nNET commando /HELP\n\n Beschikbare commando's zijn:\n NET HELP NET START NET STOP\n" + STRING_HELP_USAGE, "Gebruik van dit commando is:\n\nNET HELP commando\n -of-\nNET commando /HELP\n\n Beschikbare commando's zijn:\n NET HELP NET START NET STOP NET USE\n" STRING_NO_ENTRIES, "De opgegeven lijst is leeg.\n" STRING_USE_HEADER, "\nStatus Lokaal Op afstand\n---------------------------------------------------------------\n" STRING_USE_ENTRY, "%s %S %S Open resources: %lu\n" diff --git a/programs/net/No.rc b/programs/net/No.rc index ededb05..bc0ad33 100644 --- a/programs/net/No.rc +++ b/programs/net/No.rc @@ -23,7 +23,7 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE { - STRING_USAGE, "Programmet brukes som f�lger:\n\nNET [ HELP | START | STOP ]\n" + STRING_USAGE, "Programmet brukes som f�lger:\n\nNET [ HELP | START | STOP USE ]\n" STRING_START_USAGE, "Oppgi navnet p� tjeneren soms skal startes.\n" STRING_STOP_USAGE, "Oppgi navnet p� tjeneren som skal stoppes.\n" STRING_STOP_DEP, "Stopper avhengig tjeneste: %s\n" @@ -36,7 +36,7 @@ STRINGTABLE STRING_STOP_SVC, "Tjenesten �%s� stopper.\n" STRING_STOP_SVC_SUCCESS, "Tjenesten �%s� ble stoppet vellykket.\n" STRING_STOP_SVC_FAIL, "Klarte ikke stoppe tjenesten �%s�.\n" - STRING_HELP_USAGE, "Hjelp brukes som f�lgende:\n\nNET HELP kommando\n -eller-\nNET kommando /HELP\n\n Tilgjengelige kommandoer:\n NET HELP NET START NET STOP\n" + STRING_HELP_USAGE, "Hjelp brukes som f�lgende:\n\nNET HELP kommando\n -eller-\nNET kommando /HELP\n\n Tilgjengelige kommandoer:\n NET HELP NET START NET STOP NET USE\n" STRING_NO_ENTRIES, "Det er ingen oppf�ringer p� listen.\n" STRING_USE_HEADER, "\nStatus Lokal Remote\n---------------------------------------------------------------\n" STRING_USE_ENTRY, "%s %S %S �pne ressurser: %lu\n" diff --git a/programs/net/Pl.rc b/programs/net/Pl.rc index 2918e64..c5ef8a3 100644 --- a/programs/net/Pl.rc +++ b/programs/net/Pl.rc @@ -24,7 +24,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE { - STRING_USAGE, "Sk�adnia polecenia:\n\nNET [ HELP | START | STOP ]\n" + STRING_USAGE, "Sk�adnia polecenia:\n\nNET [ HELP | START | STOP | USE ]\n" STRING_START_USAGE, "Podaj nazw� serwisu do uruchomienia.\n" STRING_STOP_USAGE, "Podaj nazw� serwisu do zatrzymania.\n" STRING_STOP_DEP, "Zatrzymuj� serwis: %s\n" @@ -37,7 +37,7 @@ STRINGTABLE STRING_STOP_SVC, "Serwis %s jest zatrzymywany...\n" STRING_STOP_SVC_SUCCESS, "Serwis %s zosta� pomy�lnie zatrzymany.\n" STRING_STOP_SVC_FAIL, "Zatrzymanie serwisu %s nie powiod�o si�.\n" - STRING_HELP_USAGE, "Sk�adnia tego polecenia:\n\nNET HELP polecenie\n -lub-\nNET polecenie /HELP\n\n Dost�pne polecenia:\n NET HELP NET START NET STOP\n" + STRING_HELP_USAGE, "Sk�adnia tego polecenia:\n\nNET HELP polecenie\n -lub-\nNET polecenie /HELP\n\n Dost�pne polecenia:\n NET HELP NET START NET STOP NET USE\n" STRING_NO_ENTRIES, "Brak pozycji na li�cie.\n" STRING_USE_HEADER, "\nStatus Lokalny Zdalny\n---------------------------------------------------------------\n" STRING_USE_ENTRY, "%s %S %S Otwarte zasoby: %lu\n"

1 0

Mikołaj Zalewski : regedit: Add/ remove favorite opens a dialog, thus should have ellipsis.
by Alexandre Julliard 06 Jun '08

06 Jun '08

Module: wine Branch: master Commit: d0319d0530e0b8c625b6f77196e90e14f39aab59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0319d0530e0b8c625b6f7719… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Jun 5 23:24:08 2008 +0200 regedit: Add/remove favorite opens a dialog, thus should have ellipsis. --- programs/regedit/Bg.rc | 4 ++-- programs/regedit/Cs.rc | 4 ++-- programs/regedit/Da.rc | 4 ++-- programs/regedit/De.rc | 4 ++-- programs/regedit/En.rc | 8 ++++---- programs/regedit/Es.rc | 4 ++-- programs/regedit/Fr.rc | 4 ++-- programs/regedit/Hu.rc | 4 ++-- programs/regedit/It.rc | 4 ++-- programs/regedit/Ja.rc | 4 ++-- programs/regedit/Ko.rc | 4 ++-- programs/regedit/Nl.rc | 4 ++-- programs/regedit/No.rc | 4 ++-- programs/regedit/Pl.rc | 4 ++-- programs/regedit/Pt.rc | 4 ++-- programs/regedit/Ru.rc | 4 ++-- programs/regedit/Si.rc | 4 ++-- programs/regedit/Tr.rc | 4 ++-- 18 files changed, 38 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d0319d0530e0b8c625b6f…

1 0

Mikołaj Zalewski : regedit: Update Polish translation.
by Alexandre Julliard 06 Jun '08

06 Jun '08

Module: wine Branch: master Commit: b29e46c67bd37d5b79ba47bc62f07348f34badec URL: http://source.winehq.org/git/wine.git/?a=commit;h=b29e46c67bd37d5b79ba47bc6… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Jun 5 23:19:56 2008 +0200 regedit: Update Polish translation. --- programs/regedit/Pl.rc | 37 +++++++++++++++++++------------------ 1 files changed, 19 insertions(+), 18 deletions(-) diff --git a/programs/regedit/Pl.rc b/programs/regedit/Pl.rc index c07ddf8..e6048c7 100644 --- a/programs/regedit/Pl.rc +++ b/programs/regedit/Pl.rc @@ -106,6 +106,7 @@ BEGIN MENUITEM "U&su�\tDel", ID_EDIT_DELETE MENUITEM "Z&mie� nazw�\tF2", ID_EDIT_RENAME MENUITEM SEPARATOR + MENUITEM "&Eksportuj...", ID_EDIT_EXPORT MENUITEM "&Kopiuj nazw� klucza", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR MENUITEM "&Znajd�...\tCtrl+F", ID_EDIT_FIND, GRAYED @@ -128,7 +129,7 @@ BEGIN EDITTEXT IDC_EXPORT_PATH, 82, 30, 184, 12 END -IDD_FIND DIALOG DISCARDABLE 22, 17, 210, 85 +IDD_FIND DIALOG DISCARDABLE 22, 17, 220, 85 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Wyszukaj w rejestrze" FONT 8, "MS Shell Dlg" @@ -140,8 +141,8 @@ BEGIN CHECKBOX "Nazwach warto�ci", IDC_FIND_VALUES, 5, 46, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX CHECKBOX "Tre�ci warto�ci", IDC_FIND_CONTENT, 5, 58, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX CHECKBOX "Tylko pe�ne dopasowanie", IDC_FIND_WHOLE, 5, 70, 120, 10, WS_TABSTOP | BS_AUTOCHECKBOX - DEFPUSHBUTTON "Znajd�",IDOK,175,5,30,11,WS_GROUP - PUSHBUTTON "Zamknij",IDCANCEL,175,22,30,11, WS_GROUP + DEFPUSHBUTTON "Znajd�",IDOK,175,5,40,15,WS_GROUP + PUSHBUTTON "Zamknij",IDCANCEL,175,24,40,15, WS_GROUP END IDD_ADDFAVORITE DIALOG DISCARDABLE 22, 17, 210, 55 @@ -151,8 +152,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Nazwa:",IDC_STATIC,5,5,119,8 EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK",IDOK,140,40,30,11,WS_GROUP - PUSHBUTTON "Anuluj",IDCANCEL,175,40,30,11, WS_GROUP + DEFPUSHBUTTON "OK",IDOK,120,36,40,15,WS_GROUP + PUSHBUTTON "Anuluj",IDCANCEL,165,36,40,15, WS_GROUP END IDD_DELFAVORITE DIALOG DISCARDABLE 22, 17, 210, 90 @@ -162,8 +163,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Nazwa:",IDC_STATIC,5,5,119,8 LISTBOX IDC_NAME_LIST,5,15,200,52, WS_BORDER | WS_TABSTOP | LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL - DEFPUSHBUTTON "OK",IDOK,140,73,30,11,WS_GROUP - PUSHBUTTON "Anuluj",IDCANCEL,175,73,30,11, WS_GROUP + DEFPUSHBUTTON "OK",IDOK,120,72,40,15,WS_GROUP + PUSHBUTTON "Anuluj",IDCANCEL,165,72,40,15, WS_GROUP END IDD_EDIT_STRING DIALOG DISCARDABLE 22, 17, 210, 75 @@ -175,8 +176,8 @@ BEGIN EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL | WS_DISABLED LTEXT "Warto��:",IDC_STATIC,5,30,119,8 EDITTEXT IDC_VALUE_DATA,5,40,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK",IDOK,140,60,30,11,WS_GROUP - PUSHBUTTON "Anuluj",IDCANCEL,175,60,30,11,WS_GROUP + DEFPUSHBUTTON "OK",IDOK,120,56,40,15,WS_GROUP + PUSHBUTTON "Anuluj",IDCANCEL,165,56,40,15,WS_GROUP END IDD_EDIT_DWORD DIALOG DISCARDABLE 22, 17, 210, 100 @@ -191,21 +192,21 @@ BEGIN GROUPBOX "System", IDC_DWORD_BASE, 120, 30, 85, 37, BS_GROUPBOX AUTORADIOBUTTON "Szesnastkowy", IDC_DWORD_HEX, 130, 40, 60, 10, WS_TABSTOP AUTORADIOBUTTON "Dziesi�tny", IDC_DWORD_DEC, 130, 52, 60, 10, WS_TABSTOP - DEFPUSHBUTTON "OK",IDOK,140,80,30,11,WS_GROUP - PUSHBUTTON "Anuluj",IDCANCEL,175,80,30,11,WS_GROUP + DEFPUSHBUTTON "OK",IDOK,120,78,40,15,WS_GROUP + PUSHBUTTON "Anuluj",IDCANCEL,165,78,40,15,WS_GROUP END -IDD_EDIT_BINARY DIALOG DISCARDABLE 22, 17, 210, 100 +IDD_EDIT_BINARY DIALOG DISCARDABLE 22, 17, 170, 100 STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU CAPTION "Edycja danej binarnej" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Nazwa:",IDC_STATIC,5,5,119,8 - EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED + EDITTEXT IDC_VALUE_NAME,5,15,160,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED LTEXT "Warto��:",IDC_STATIC,5,30,90,8 - CONTROL "",IDC_VALUE_DATA,"HexEdit",WS_TABSTOP,4,40,160,40 - DEFPUSHBUTTON "OK",IDOK,140,80,30,11,WS_GROUP - PUSHBUTTON "Anuluj",IDCANCEL,175,80,30,11,WS_GROUP + CONTROL "",IDC_VALUE_DATA,"HexEdit",WS_TABSTOP,5,40,160,40 + DEFPUSHBUTTON "OK",IDOK,80,83,40,15,WS_GROUP + PUSHBUTTON "Anuluj",IDCANCEL,125,83,40,15,WS_GROUP END IDD_EDIT_MULTI_STRING DIALOG DISCARDABLE 22, 17, 210, 175 @@ -217,8 +218,8 @@ BEGIN EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED LTEXT "Warto��:",IDC_STATIC,5,30,119,8 EDITTEXT IDC_VALUE_DATA,5,40,200,112, WS_BORDER | WS_TABSTOP | WS_HSCROLL | WS_VSCROLL | ES_MULTILINE | ES_WANTRETURN - DEFPUSHBUTTON "OK",IDOK,140,160,30,11,WS_GROUP - PUSHBUTTON "Anuluj",IDCANCEL,175,160,30,11,WS_GROUP + DEFPUSHBUTTON "OK",IDOK,120,156,40,15,WS_GROUP + PUSHBUTTON "Anuluj",IDCANCEL,165,156,40,15,WS_GROUP END /*

1 0

← Newer
1
...
80
81
82
83
84
85
86
...
95
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 June 2008