Module: wine
Branch: master
Commit: 56d28f7d5baeacb4f865df3629a1ad820cd47b94
URL: http://source.winehq.org/git/wine.git/?a=commit;h=56d28f7d5baeacb4f865df362…
Author: André Hentschel <nerv(a)dawncrow.de>
Date: Fri Apr 30 18:38:59 2010 +0200
kernel32: Double the alarm timeout to prevent a failed test.
---
dlls/kernel32/tests/pipe.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c
index 948c704..b48ceec 100644
--- a/dlls/kernel32/tests/pipe.c
+++ b/dlls/kernel32/tests/pipe.c
@@ -794,9 +794,9 @@ static void test_NamedPipe_2(void)
DWORD alarmThreadId;
trace("test_NamedPipe_2 starting\n");
- /* Set up a ten second timeout */
+ /* Set up a twenty second timeout */
alarm_event = CreateEvent( NULL, TRUE, FALSE, NULL );
- alarmThread = CreateThread(NULL, 0, alarmThreadMain, (void *) 10000, 0, &alarmThreadId);
+ alarmThread = CreateThread(NULL, 0, alarmThreadMain, (void *) 20000, 0, &alarmThreadId);
/* The servers we're about to exercize do try to clean up carefully,
* but to reduce the change of a test failure due to a pipe handle
Module: wine
Branch: master
Commit: 61493dee95741a67c16a71b4056a274c4b6efdcd
URL: http://source.winehq.org/git/wine.git/?a=commit;h=61493dee95741a67c16a71b40…
Author: Sven Baars <sven.wine(a)gmail.com>
Date: Thu May 6 21:20:35 2010 +0200
mshtml: Update Dutch translation.
---
dlls/mshtml/Nl.rc | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/mshtml/Nl.rc b/dlls/mshtml/Nl.rc
index 33baf39..d32980b 100644
--- a/dlls/mshtml/Nl.rc
+++ b/dlls/mshtml/Nl.rc
@@ -35,9 +35,9 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN
CAPTION "Wine-Gecko-Installatie"
FONT 8, "MS Shell Dlg"
{
- LTEXT "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's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.",
+ LTEXT "Wine kon geen Gecko pakket vinden. Gecko is nodig voor programma's die gebruik maken " \
+ "van embedded HTML. Wine kan het automatisch voor u downloaden en installeren.\n\n" \
+ "Noot: het is aanbevolen om distro pakketten te gebruiken. Zie http://wiki.winehq.org/Gecko voor details.",
ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT
CONTROL "Voortgang", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12
DEFPUSHBUTTON "&Installeren", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP