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

Paul Vriens : winhlp32: Define LANGUAGE only once.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: 4896c7c91ac541271e1f015cf82b971b4a89cb93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4896c7c91ac541271e1f015cf… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jun 4 21:06:02 2010 +0200 winhlp32: Define LANGUAGE only once. --- programs/winhlp32/Nl.rc | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/programs/winhlp32/Nl.rc b/programs/winhlp32/Nl.rc index 4988326..0a4594a 100644 --- a/programs/winhlp32/Nl.rc +++ b/programs/winhlp32/Nl.rc @@ -23,9 +23,11 @@ #pragma code_page(65001) +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +MAIN_MENU MENU { POPUP "&Bestand" { MENUITEM "&Openen", MNID_FILE_OPEN @@ -70,7 +72,7 @@ MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL } } -IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Index" @@ -78,7 +80,7 @@ CAPTION "Index" LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } -IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Zoeken" @@ -87,7 +89,7 @@ CAPTION "Zoeken" } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "Wine Help" STID_WHERROR, "FOUT" @@ -105,7 +107,7 @@ STID_NO_RICHEDIT "Kan geen richedit implementatie vinden... Actie afgebroken" STID_PSH_INDEX, "Help-onderwerpen: " } -CONTEXT_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +CONTEXT_MENU MENU BEGIN POPUP "" BEGIN

1 0

Sven Baars : winmm: Fix Dutch translation.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: 7dafe8692f2ae45366a739a1b489277ff948bf65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dafe8692f2ae45366a739a1b… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Jun 4 21:53:42 2010 +0200 winmm: Fix Dutch translation. --- dlls/winmm/winmm_Nl.rc | 86 ++++++++++++++++++++++++------------------------ 1 files changed, 43 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7dafe8692f2ae45366a73…

1 0

Robert McDonald : include: Add missing typedef keyword to avoid multiply-defined symbols.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: ef6d668d6312b5f2c8423b5b1e596c44f19a1ff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef6d668d6312b5f2c8423b5b1… Author: Robert McDonald <rmcdonald(a)bittorrent.com> Date: Wed Jun 2 12:07:50 2010 -0700 include: Add missing typedef keyword to avoid multiply-defined symbols. --- include/ws2ipdef.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index 9818fbd..11b3689 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -133,19 +133,19 @@ typedef struct WS(sockaddr_in6) * Multicast group information */ -struct WS(ip_mreq) +typedef struct WS(ip_mreq) { struct WS(in_addr) imr_multiaddr; struct WS(in_addr) imr_interface; } WS(IP_MREQ), *WS(PIP_MREQ); -struct WS(ip_mreq_source) { +typedef struct WS(ip_mreq_source) { struct WS(in_addr) imr_multiaddr; struct WS(in_addr) imr_sourceaddr; struct WS(in_addr) imr_interface; } WS(IP_MREQ_SOURCE), *WS(PIP_MREQ_SOURCE); -struct WS(ip_msfilter) { +typedef struct WS(ip_msfilter) { struct WS(in_addr) imsf_multiaddr; struct WS(in_addr) imsf_interface; ULONG imsf_fmode;

1 0

Joel Holdsworth : iexplore: Renamed iexplore resource file.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: da8831be97a8c4292270607ebe845195ff593a67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da8831be97a8c4292270607eb… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sat Jun 5 11:08:06 2010 +0100 iexplore: Renamed iexplore resource file. --- programs/iexplore/Makefile.in | 2 +- programs/iexplore/{version.rc => iexplore.rc} | 0 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/iexplore/Makefile.in b/programs/iexplore/Makefile.in index 9f2b653..0d12f90 100644 --- a/programs/iexplore/Makefile.in +++ b/programs/iexplore/Makefile.in @@ -10,6 +10,6 @@ IMPORTS = shdocvw user32 gdi32 kernel32 C_SRCS = \ main.c -RC_SRCS = version.rc +RC_SRCS = iexplore.rc @MAKE_PROG_RULES@ diff --git a/programs/iexplore/version.rc b/programs/iexplore/iexplore.rc similarity index 100% rename from programs/iexplore/version.rc rename to programs/iexplore/iexplore.rc

1 0

Joel Holdsworth : iexplore: Added a Tango compliant icon.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: 8703e9c522fdd26e243e150c40e1a50cebbc7f56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8703e9c522fdd26e243e150c4… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sat Jun 5 11:08:10 2010 +0100 iexplore: Added a Tango compliant icon. --- programs/iexplore/iexplore.ico | Bin 0 -> 25214 bytes programs/iexplore/iexplore.rc | 5 + programs/iexplore/iexplore.svg | 265 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 270 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8703e9c522fdd26e243e1…

1 0

Eric Pouech : winhelp: Added support for hotspot in images with target window embedded.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: 3acf62f5e70ea58fab6b6ae91f5b8f5c36b428cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3acf62f5e70ea58fab6b6ae91… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Jun 2 22:22:42 2010 +0200 winhelp: Added support for hotspot in images with target window embedded. --- programs/winhlp32/hlpfile.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 8c0d325..5146c38 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -815,6 +815,34 @@ static void HLPFILE_AddHotSpotLinks(struct RtfData* rd, HLPFILE* file, file->lpszPath, -1, HLPFILE_Hash(str), 0, 1, -1); break; + + case 0xEE: + case 0xEF: + { + const char* win = strchr(str, '>'); + int wnd = -1; + char* tgt = NULL; + + if (win) + { + for (wnd = file->numWindows - 1; wnd >= 0; wnd--) + { + if (!strcmp(win + 1, file->windows[wnd].name)) break; + } + if (wnd == -1) + WINE_WARN("Couldn't find window info for %s\n", win); + if ((tgt = HeapAlloc(GetProcessHeap(), 0, win - str + 1))) + { + memcpy(tgt, str, win - str); + tgt[win - str] = '\0'; + } + } + hslink = (HLPFILE_HOTSPOTLINK*) + HLPFILE_AllocLink(rd, (start[7 + 15 * i + 0] & 1) ? hlp_link_link : hlp_link_popup, + file->lpszPath, -1, HLPFILE_Hash(tgt ? tgt : str), 0, 1, wnd); + HeapFree(GetProcessHeap(), 0, tgt); + break; + } default: WINE_FIXME("unknown hotsport target 0x%x\n", start[7 + 15 * i + 0]); }

1 0

Paul Vriens : write: Add the Danish translation.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: de4cf25349f9dc214e23bb9d58bf15a4a7e7d4de URL: http://source.winehq.org/git/wine.git/?a=commit;h=de4cf25349f9dc214e23bb9d5… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jun 3 16:11:31 2010 +0200 write: Add the Danish translation. Translation by Thomas Larsen <sikker2004(a)yahoo.com> --- programs/write/Da.rc | 29 +++++++++++++++++++++++++++++ programs/write/Makefile.in | 1 + 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/programs/write/Da.rc b/programs/write/Da.rc new file mode 100644 index 0000000..98b628f --- /dev/null +++ b/programs/write/Da.rc @@ -0,0 +1,29 @@ +/* + * Danish language support + * + * Copyright 2010 Thomas Larsen + * Paul Vriens + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resources.h" + +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_FAILED, "Kunne ikke starte Wordpad" +} diff --git a/programs/write/Makefile.in b/programs/write/Makefile.in index e0ffa98..b89f338 100644 --- a/programs/write/Makefile.in +++ b/programs/write/Makefile.in @@ -10,6 +10,7 @@ IMPORTS = user32 gdi32 kernel32 C_SRCS = write.c RC_SRCS = \ + Da.rc \ De.rc \ En.rc \ Fr.rc \

1 0

Paul Vriens : jscript: Add the Danish translation.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: 3f03f4636dddd7df04d70e1faca4f45ffe120aea URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f03f4636dddd7df04d70e1fa… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jun 3 21:12:22 2010 +0200 jscript: Add the Danish translation. Translation by Thomas Larsen <sikker2004(a)yahoo.com> --- dlls/jscript/Makefile.in | 1 + dlls/jscript/jscript_Da.rc | 50 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 0a20c41..c1053b3 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -6,6 +6,7 @@ MODULE = jscript.dll IMPORTS = oleaut32 ole32 user32 advapi32 kernel32 RC_SRCS = \ + jscript_Da.rc \ jscript_De.rc \ jscript_En.rc \ jscript_Fr.rc \ diff --git a/dlls/jscript/jscript_Da.rc b/dlls/jscript/jscript_Da.rc new file mode 100644 index 0000000..07e2292 --- /dev/null +++ b/dlls/jscript/jscript_Da.rc @@ -0,0 +1,50 @@ +/* + * Copyright 2010 Thomas Larsen + * Paul Vriens + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_TO_PRIMITIVE "Fejl ved konvertering af objekt til primitiv type" + IDS_INVALID_CALL_ARG "Ugyldig procedure kald eller argument" + IDS_CREATE_OBJ_ERROR "Automations-serveren kan ikke oprette objektet" + IDS_NO_PROPERTY "Objektet understøtter ikke denne egenskab eller metode" + IDS_ARG_NOT_OPT "Argument ikke valgfrit" + IDS_SYNTAX_ERROR "Syntaksfejl" + IDS_SEMICOLON "Forventet ';'" + IDS_LBRACKET "Forventet '('" + IDS_RBRACKET "Forventet ')'" + IDS_UNTERMINATED_STR "Uafsluttet streng konstant" + IDS_NOT_FUNC "Funktion forventet" + IDS_NOT_DATE "[objekt]' er ikke en dato objekt" + IDS_NOT_NUM "Nummer forventet" + IDS_OBJECT_EXPECTED "objekt forventet" + IDS_ILLEGAL_ASSIGN "Ulovlig tildeling" + IDS_UNDEFINED "'|' er ikke defineret" + IDS_NOT_BOOL "Boolean objekt forventet" + IDS_JSCRIPT_EXPECTED "JScript objekt forventet" + IDS_REGEXP_SYNTAX_ERROR "Syntax fejl i regulært udtryk" + IDS_URI_INVALID_CHAR "URI, der skal kodes indeholder ugyldige tegn" + IDS_INVALID_LENGTH "Array længde skal være et endeligt positivt heltal" + IDS_ARRAY_EXPECTED "Array objekt forventet" +}

1 0

Paul Vriens : start: Add the Danish translation.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: c78793b966841711952ec94ca330ff4a4b085fa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c78793b966841711952ec94ca… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jun 3 21:57:19 2010 +0200 start: Add the Danish translation. Translation by Thomas Larsen <sikker2004(a)yahoo.com> --- programs/start/Da.rc | 72 ++++++++++++++++++++++++++++++++++++++++++++ programs/start/Makefile.in | 1 + 2 files changed, 73 insertions(+), 0 deletions(-) diff --git a/programs/start/Da.rc b/programs/start/Da.rc new file mode 100644 index 0000000..912111c --- /dev/null +++ b/programs/start/Da.rc @@ -0,0 +1,72 @@ +/* + * Start + * Danish Language Support + * + * Copyright 2010 Thomas Larsen + * Paul Vriens + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resources.h" + +#pragma code_page(65001) + +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ +STRING_USAGE, "Start et program, eller åbn et dokument i programmet, der normalt anvendes til filer med den endelse.\n\ +Vejledning:\n\ +start [Mulighed] program_filnavn [...]\n\ +start [Mulighed] dokument_filnavn\n\ +\n\ +Mulighed:\n\ +/M[inimized] Start programmet minimeret.\n\ +/MAX[imized] Start programmet maksimeret.\n\ +/R[estored] Start programmet normalt (hverken minimeret eller maksimeret).\n\ +/W[ait] Vent på startede program afslutter, afslut derefter med dets afslutnings kode.\n\ +/Unix Brug en Unix filnavn og starte filen som Windows Stifinder.\n\ +/ProgIDOpen Åbn et dokument ved hjælp af følgende progID.\n\ +/L Vis slutbrugerlicensaftalen.\n\ +\n\ +start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n\ +Start leveres med ABSOLUT INGEN GARANTI, for detaljer kør med mulighed /L.\n\ +Det er gratis software, og du er velkommen til at redistribuere det\n\ +under visse betingelser; kør 'start /L' for yderligere oplysninger.\n\ +" + +STRING_LICENSE, "start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n\ +This program is free software; you can redistribute it and/or\n\ +modify it under the terms of the GNU Lesser Public License\n\ +as published by the Free Software Foundation; either version 2.1\n\ +of the License, or (at your option) any later version.\n\ +\n\ +This program is distributed in the hope that it will be useful,\n\ +but WITHOUT ANY WARRANTY; without even the implied warranty of\n\ +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\ +GNU Lesser Public License for more details.\n\ +\n\ +You should have received a copy of the GNU Lesser Public License\n\ +along with this program; if not, write to the Free Software\n\ +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.\n\ +\n\ +Se COPYING.LIB filen for licens information.\n\ +" + +STRING_EXECFAIL, "Applikationen kunne ikke starte, eller der ingen applikationer associeret med den specifikke fil.\nShellExecuteEx fejlet" + +STRING_UNIXFAIL, "Kunne ikke oversætte det angivne Unix filnavn til et DOS filnavn." +} diff --git a/programs/start/Makefile.in b/programs/start/Makefile.in index 7fe99cc..d8848a1 100644 --- a/programs/start/Makefile.in +++ b/programs/start/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = start.c RC_SRCS = \ Cs.rc \ + Da.rc \ De.rc \ En.rc \ Es.rc \

1 0

Paul Vriens : devenum: Add the Danish translation.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: 7b82143c9754f2fa897621dd55be6ec7b1fecec2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b82143c9754f2fa897621dd5… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jun 3 22:20:02 2010 +0200 devenum: Add the Danish translation. Translation by Thomas Larsen <sikker2004(a)yahoo.com> --- dlls/devenum/Da.rc | 32 ++++++++++++++++++++++++++++++++ dlls/devenum/Makefile.in | 1 + 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/devenum/Da.rc b/dlls/devenum/Da.rc new file mode 100644 index 0000000..2ad7fa0 --- /dev/null +++ b/dlls/devenum/Da.rc @@ -0,0 +1,32 @@ +/* + * Resources for Device Enumerator + * + * Copyright 2010 Thomas Larsen + * Paul Vriens + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "devenum_private.h" + +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_DEVENUM_DSDEFAULT "Standard DirectSound" + IDS_DEVENUM_DS "DirectSound: %s" + IDS_DEVENUM_WODEFAULT "Standard WaveOut Enhed" + IDS_DEVENUM_MIDEFAULT "Standard MidiOut Enhed" +} diff --git a/dlls/devenum/Makefile.in b/dlls/devenum/Makefile.in index 8d1bc61..df3c136 100644 --- a/dlls/devenum/Makefile.in +++ b/dlls/devenum/Makefile.in @@ -14,6 +14,7 @@ C_SRCS = \ RC_SRCS = \ Cs.rc \ + Da.rc \ De.rc \ En.rc \ Es.rc \

1 0