Import and merge Wine-20041201 Added: trunk/reactos/lib/shell32/ Modified: trunk/reactos/lib/shell32/Makefile.in Added: trunk/reactos/lib/shell32/Makefile.ros-template Modified: trunk/reactos/lib/shell32/control.c Modified: trunk/reactos/lib/shell32/iconcache.c Added: trunk/reactos/lib/shell32/makefile Added: trunk/reactos/lib/shell32/ros-systray.c Modified: trunk/reactos/lib/shell32/shell32_Ca.rc Modified: trunk/reactos/lib/shell32/shell32_Cn.rc Modified: trunk/reactos/lib/shell32/shell32_Cs.rc Modified: trunk/reactos/lib/shell32/shell32_Da.rc Modified: trunk/reactos/lib/shell32/shell32_De.rc Modified: trunk/reactos/lib/shell32/shell32_En.rc Modified: trunk/reactos/lib/shell32/shell32_Eo.rc Modified: trunk/reactos/lib/shell32/shell32_Es.rc Modified: trunk/reactos/lib/shell32/shell32_Fi.rc Modified: trunk/reactos/lib/shell32/shell32_Fr.rc Modified: trunk/reactos/lib/shell32/shell32_Hu.rc Modified: trunk/reactos/lib/shell32/shell32_It.rc Modified: trunk/reactos/lib/shell32/shell32_Ja.rc Modified: trunk/reactos/lib/shell32/shell32_Ko.rc Modified: trunk/reactos/lib/shell32/shell32_Nl.rc Modified: trunk/reactos/lib/shell32/shell32_No.rc Modified: trunk/reactos/lib/shell32/shell32_Pl.rc Modified: trunk/reactos/lib/shell32/shell32_Pt.rc Modified: trunk/reactos/lib/shell32/shell32_Ru.rc Modified: trunk/reactos/lib/shell32/shell32_Si.rc Modified: trunk/reactos/lib/shell32/shell32_Sk.rc Modified: trunk/reactos/lib/shell32/shell32_Sv.rc Modified: trunk/reactos/lib/shell32/shell32_Uk.rc Modified: trunk/reactos/lib/shell32/shell32_Wa.rc Modified: trunk/reactos/lib/shell32/shell32_Zh.rc Modified: trunk/reactos/lib/shell32/shell32_main.c Modified: trunk/reactos/lib/shell32/shell32_main.h Modified: trunk/reactos/lib/shell32/shellfolder.h Modified: trunk/reactos/lib/shell32/shellpath.c Modified: trunk/reactos/lib/shell32/shres.rc _____
Copied: trunk/reactos/lib/shell32 (from rev 12598, vendor/wine/dlls/shell32/current) _____
Modified: trunk/reactos/lib/shell32/Makefile.in --- vendor/wine/dlls/shell32/current/Makefile.in 2004-12-31 15:57:39 UTC (rev 12598) +++ trunk/reactos/lib/shell32/Makefile.in 2004-12-31 16:00:23 UTC (rev 12599) @@ -46,7 +46,7 @@
shpolicy.c \ shv_bg_cmenu.c \ shv_item_cmenu.c \ - systray.c + ros-systray.c
RC_SRCS = shres.rc RC_BINSRC = shres.rc _____
Added: trunk/reactos/lib/shell32/Makefile.ros-template --- vendor/wine/dlls/shell32/current/Makefile.ros-template 2004-12-31 15:57:39 UTC (rev 12598) +++ trunk/reactos/lib/shell32/Makefile.ros-template 2004-12-31 16:00:23 UTC (rev 12599) @@ -0,0 +1,30 @@
+# $Id: Makefile.ros-template 11910 2004-12-03 23:37:44Z blight $ + +TARGET_NAME = shell32 + +TARGET_OBJECTS = @C_SRCS@ + +TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ + +TARGET_SDKLIBS = wine.a @IMPORTS@ ole32.a wine_uuid.a ntdll.a + +TARGET_BASE = $(TARGET_BASE_LIB_SHELL32) + +TARGET_RC_SRCS = @RC_SRCS@ +TARGET_RC_BINSRC = @RC_BINSRC@ +TARGET_RC_BINARIES = @RC_BINARIES@ + +TARGET_CLEAN = authors.c + +default: all + +authors.c: +ifeq ($(HOST),mingw32-linux) + echo 'const char * const SHELL_Authors[] = { "Copyright 1993-2004 WINE team", "Copyright 1998-2004 ReactOS team", 0 };' > authors.c +else + echo const char * const SHELL_Authors[] = { "Copyright 1993-2004 WINE team", "Copyright 1998-2004 ReactOS team", 0 }; > authors.c +endif + +DEP_OBJECTS = $(TARGET_OBJECTS) + +include $(TOOLS_PATH)/depend.mk _____
Modified: trunk/reactos/lib/shell32/control.c --- vendor/wine/dlls/shell32/current/control.c 2004-12-31 15:57:39 UTC (rev 12598) +++ trunk/reactos/lib/shell32/control.c 2004-12-31 16:00:23 UTC (rev 12599) @@ -464,6 +464,7 @@
void WINAPI RunDLL_CallEntry16( DWORD proc, HWND hwnd, HINSTANCE inst, LPCSTR cmdline, INT cmdshow ) { +#if !defined(__CYGWIN__) && !defined (__MINGW32__) && !defined(_MSC_VER) WORD args[5]; SEGPTR cmdline_seg;
@@ -478,6 +479,10 @@ args[0] = cmdshow; WOWCallback16Ex( proc, WCB16_PASCAL, sizeof(args), args, NULL ); UnMapLS( cmdline_seg ); +#else + FIXME( "proc %lx hwnd %p inst %p cmdline %s cmdshow %d\n", + proc, hwnd, inst, debugstr_a(cmdline), cmdshow ); +#endif }
/*********************************************************************** ** _____
Modified: trunk/reactos/lib/shell32/iconcache.c --- vendor/wine/dlls/shell32/current/iconcache.c 2004-12-31 15:57:39 UTC (rev 12598) +++ trunk/reactos/lib/shell32/iconcache.c 2004-12-31 16:00:23 UTC (rev 12599) @@ -143,9 +143,23 @@
{ HICON hiconLarge=0; HICON hiconSmall=0;
- PrivateExtractIconsW( sSourceFile, dwSourceIndex, 32, 32, &hiconLarge, 0, 1, 0 ); - PrivateExtractIconsW( sSourceFile, dwSourceIndex, 16, 16, &hiconSmall, 0, 1, 0 ); +#if defined(__CYGWIN__) || defined (__MINGW32__) || defined(_MSC_VER) + static UINT (WINAPI*PrivateExtractIconExW)(LPCWSTR,int,HICON*,HICON*,UINT) = NULL;
+ if (!PrivateExtractIconExW) { + HMODULE hUser32 = GetModuleHandleA("user32"); + PrivateExtractIconExW = (UINT(WINAPI*)(LPCWSTR,int,HICON*,HICON*,UINT)) GetProcAddress(hUser32, "PrivateExtractIconExW"); + } + + if (PrivateExtractIconExW) + PrivateExtractIconExW(sSourceFile, dwSourceIndex, &hiconLarge, &hiconSmall, 1); + else +#endif + { + PrivateExtractIconsW(sSourceFile, dwSourceIndex, 32, 32, &hiconLarge, NULL, 1, 0); + PrivateExtractIconsW(sSourceFile, dwSourceIndex, 16, 16, &hiconSmall, NULL, 1, 0); + } + if ( !hiconLarge || !hiconSmall) { WARN("failure loading icon %i from %s (%p %p)\n", dwSourceIndex, debugstr_w(sSourceFile), hiconLarge, hiconSmall); @@ -362,8 +376,12 @@ pdump(pidl);
if (pIndex) - PidlToSicIndex ( sh, pidl, 1, 0, pIndex); - PidlToSicIndex ( sh, pidl, 0, 0, &Index); + if (!PidlToSicIndex ( sh, pidl, 1, 0, pIndex)) + *pIndex = -1; + + if (!PidlToSicIndex ( sh, pidl, 0, 0, &Index)) + return -1; + return Index; }
@@ -420,6 +438,19 @@ */ UINT WINAPI ExtractIconExW(LPCWSTR lpszFile, INT nIconIndex, HICON * phiconLarge, HICON * phiconSmall, UINT nIcons) { + /* get entry point of undocumented function PrivateExtractIconExW() in user32 */ +#if defined(__CYGWIN__) || defined (__MINGW32__) || defined(_MSC_VER) + static UINT (WINAPI*PrivateExtractIconExW)(LPCWSTR,int,HICON*,HICON*,UINT) = NULL; + + if (!PrivateExtractIconExW) { + HMODULE hUser32 = GetModuleHandleA("user32"); + PrivateExtractIconExW = (UINT(WINAPI*)(LPCWSTR,int,HICON*,HICON*,UINT)) GetProcAddress(hUser32, "PrivateExtractIconExW"); + + if (!PrivateExtractIconExW) + return 0; + } +#endif + TRACE("%s %i %p %p %i\n", debugstr_w(lpszFile), nIconIndex, phiconLarge, phiconSmall, nIcons);
return PrivateExtractIconExW(lpszFile, nIconIndex, phiconLarge, phiconSmall, nIcons); _____
Added: trunk/reactos/lib/shell32/makefile --- vendor/wine/dlls/shell32/current/makefile 2004-12-31 15:57:39 UTC (rev 12598) +++ trunk/reactos/lib/shell32/makefile 2004-12-31 16:00:23 UTC (rev 12599) @@ -0,0 +1,9 @@
+# $Id: makefile 7409 2004-01-02 19:49:47Z gvg $ + +PATH_TO_TOP = ../.. + +TARGET_TYPE = winedll + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk _____
Added: trunk/reactos/lib/shell32/ros-systray.c --- vendor/wine/dlls/shell32/current/ros-systray.c 2004-12-31 15:57:39 UTC (rev 12598) +++ trunk/reactos/lib/shell32/ros-systray.c 2004-12-31 16:00:23 UTC (rev 12599) @@ -0,0 +1,80 @@
+/* + * Copyright 2004 Martin Fuchs + * + * Pass on icon notification messages to the systray implementation + * in the currently running shell. + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdarg.h> +#include <malloc.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "shellapi.h" + + + /* copy data structure for tray notifications */ +typedef struct TrayNotifyCDS_Dummy { + DWORD cookie; + DWORD notify_code; + DWORD nicon_data[1]; // placeholder for NOTIFYICONDATA structure +} TrayNotifyCDS_Dummy; + + /* The only difference between Shell_NotifyIconA and Shell_NotifyIconW is the call to SendMessageA/W. */ +static BOOL SHELL_NotifyIcon(DWORD dwMessage, void* pnid, HWND nid_hwnd, int nid_size, BOOL unicode) +{ + HWND hwnd; + COPYDATASTRUCT data; + + BOOL ret = FALSE; + int len = sizeof(TrayNotifyCDS_Dummy)-sizeof(DWORD)+nid_size; + + TrayNotifyCDS_Dummy* pnotify_data = (TrayNotifyCDS_Dummy*) alloca(len); + + pnotify_data->cookie = 1; + pnotify_data->notify_code = dwMessage; + memcpy(&pnotify_data->nicon_data, pnid, nid_size); + + data.dwData = 1; + data.cbData = len; + data.lpData = pnotify_data; + + for(hwnd=0; hwnd=FindWindowExW(0, hwnd, L"Shell_TrayWnd", NULL); ) + if ((unicode?SendMessageW:SendMessageA)(hwnd, WM_COPYDATA, (WPARAM)nid_hwnd, (LPARAM)&data)) + ret = TRUE; + + return ret; +} + + +/********************************************************************** *** + * Shell_NotifyIcon [SHELL32.296] + * Shell_NotifyIconA [SHELL32.297] + */ +BOOL WINAPI Shell_NotifyIconA(DWORD dwMessage, PNOTIFYICONDATAA pnid) +{ + return SHELL_NotifyIcon(dwMessage, pnid, pnid->hWnd, pnid->cbSize, FALSE); +} + +/********************************************************************** *** + * Shell_NotifyIconW [SHELL32.298] + */ +BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW pnid) +{ + return SHELL_NotifyIcon(dwMessage, pnid, pnid->hWnd, pnid->cbSize, TRUE); +} _____
Modified: trunk/reactos/lib/shell32/shell32_Ca.rc --- vendor/wine/dlls/shell32/current/shell32_Ca.rc 2004-12-31 15:57:39 UTC (rev 12598) +++ trunk/reactos/lib/shell32/shell32_Ca.rc 2004-12-31 16:00:23 UTC (rev 12599) @@ -23,11 +23,12 @@
CAPTION "Quant a %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "D'Acord", IDOK, 153, 130, 50, 12 + DEFPUSHBUTTON "D'Acord", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 - LTEXT "Wine ha estat construit per:", 98, 8, 55, 137, 10 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 + LTEXT "ReactOS ha estat construit per:", 98, 8, 55, 137, 10 }
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -36,7 +37,7 @@ FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and Wine will open it for you.", 12289, 36, 11, 182, 18 + LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 LTEXT "&Open:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP _____
Modified: trunk/reactos/lib/shell32/shell32_Cn.rc --- vendor/wine/dlls/shell32/current/shell32_Cn.rc 2004-12-31 15:57:39 UTC (rev 12598) +++ trunk/reactos/lib/shell32/shell32_Cn.rc 2004-12-31 16:00:23 UTC (rev 12599) @@ -24,11 +24,12 @@
CAPTION "¹ØÓÚ %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "È·¶¨", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "È·¶¨", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 - LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 + LTEXT "ReactOS was brought to you by:", 98, 8, 55, 137, 10 }
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -37,7 +38,7 @@ FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "ÊäÈë³ÌÐò£¬Ä¿Â¼£¬Îļþ»òÕßInternet×ÊÔ´Ãû£¬Wine½«ÎªÄú´ò¿ªËü¡£", 12289, 36, 11, 182, 18 + LTEXT "ÊäÈë³ÌÐò£¬Ä¿Â¼£¬Îļþ»òÕßInternet×ÊÔ´Ãû£¬ReactOS½«ÎªÄú´ò¿ªËü¡£", 12289, 36, 11, 182, 18 LTEXT "´ò¿ª(&O):", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "È·¶¨", IDOK, 62, 63, 50, 14, WS_TABSTOP _____
Modified: trunk/reactos/lib/shell32/shell32_Cs.rc --- vendor/wine/dlls/shell32/current/shell32_Cs.rc 2004-12-31 15:57:39 UTC (rev 12598) +++ trunk/reactos/lib/shell32/shell32_Cs.rc 2004-12-31 16:00:23 UTC (rev 12599) @@ -110,11 +110,12 @@
CAPTION "O aplikaci %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12 + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 - LTEXT "Wine je d¡lem:", 98, 8, 55, 137, 10 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 + LTEXT "ReactOS je d¡lem:", 98, 8, 55, 137, 10 }
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -123,7 +124,7 @@ FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Zadejte název programu, slozky, dokumentu, nebo zdroje v síti Internet a Wine jej pro vás otevøe.", 12289, 36, 11, 182, 18 + LTEXT "Zadejte název programu, slozky, dokumentu, nebo zdroje v síti Internet a ReactOS jej pro vás otevøe.", 12289, 36, 11, 182, 18 LTEXT "&Otevøít:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP _____
Modified: trunk/reactos/lib/shell32/shell32_Da.rc --- vendor/wine/dlls/shell32/current/shell32_Da.rc 2004-12-31 15:57:39 UTC (rev 12598) +++ trunk/reactos/lib/shell32/shell32_Da.rc 2004-12-31 16:00:23 UTC (rev 12599) @@ -23,11 +23,12 @@
CAPTION "Om %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12 + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 - LTEXT "Wine havde ikke været mulig uden hjælp fra disse personer:", 98, 8, 55, 137, 10 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 + LTEXT "ReactOS havde ikke været mulig uden hjælp fra disse personer:", 98, 8, 55, 137, 10 }
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -36,7 +37,7 @@ FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and Wine will open it for you.", 12289, 36, 11, 182, 18 + LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 LTEXT "&Open:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP _____
Modified: trunk/reactos/lib/shell32/shell32_De.rc --- vendor/wine/dlls/shell32/current/shell32_De.rc 2004-12-31 15:57:39 UTC (rev 12598) +++ trunk/reactos/lib/shell32/shell32_De.rc 2004-12-31 16:00:23 UTC (rev 12599) @@ -110,11 +110,12 @@
CAPTION "Informationen über %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 - LTEXT "WINE wurde für Sie gekeltert von:", 98, 8, 55, 137, 10 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 + LTEXT "ReactOS wurde Ihnen zur Verfügung gestellt von:", 98, 8, 55, 137, 10 }
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -123,7 +124,7 @@ FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Den Namen eines Programmes, eines Ordners, eines Dokumentes oder einer Internet Ressource eingeben, und Wine wird es für Sie öffnen", 12289, 36, 11, 182, 18 + LTEXT "Den Namen eines Programmes, eines Ordners, eines Dokumentes oder einer Internet Ressource eingeben, und ReactOS wird es für Sie öffnen", 12289, 36, 11, 182, 18 LTEXT "&Öffnen:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP @@ -185,5 +186,5 @@ IDS_RESTART_TITLE "Neustarten" IDS_RESTART_PROMPT "Möchten Sie, dass ein simulierter Windows Neustart durchgeführt wird ?" IDS_SHUTDOWN_TITLE "Anhalten" - IDS_SHUTDOWN_PROMPT "Möchten Sie die aktuelle Wine Sitzung beenden ?" + IDS_SHUTDOWN_PROMPT "Möchten Sie die aktuelle ReactOS Sitzung beenden ?" } _____
Modified: trunk/reactos/lib/shell32/shell32_En.rc --- vendor/wine/dlls/shell32/current/shell32_En.rc 2004-12-31 15:57:39 UTC (rev 12598) +++ trunk/reactos/lib/shell32/shell32_En.rc 2004-12-31 16:00:23 UTC (rev 12599) @@ -109,11 +109,12 @@
CAPTION "About %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 - LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 + LTEXT "ReactOS was brought to you by:", 98, 8, 55, 137, 10 }
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -122,7 +123,7 @@ FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and Wine will open it for you.", 12289, 36, 11, 182, 18 + LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 LTEXT "&Open:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP @@ -181,10 +182,10 @@ /* message box strings */ STRINGTABLE DISCARDABLE { - IDS_RESTART_TITLE "Restart" - IDS_RESTART_PROMPT "Do you want to simulate a Windows reboot?" - IDS_SHUTDOWN_TITLE "Shutdown" - IDS_SHUTDOWN_PROMPT "Do you want to shutdown your Wine session?" + IDS_RESTART_TITLE "Restart" + IDS_RESTART_PROMPT "Do you want to restart the system?" + IDS_SHUTDOWN_TITLE "Shutdown" + IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" }
/* shell folder path default values */ _____
Modified: trunk/reactos/lib/shell32/shell32_Eo.rc --- vendor/wine/dlls/shell32/current/shell32_Eo.rc 2004-12-31 15:57:39 UTC (rev 12598) +++ trunk/reactos/lib/shell32/shell32_Eo.rc 2004-12-31 16:00:23 UTC (rev 12599) @@ -23,11 +23,12 @@
CAPTION "Pri %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "Enorde", 1, 153, 130, 50, 12 + DEFPUSHBUTTON "Enorde", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 - LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 + LTEXT "ReactOS was brought to you by:", 98, 8, 55, 137, 10 }
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -36,7 +37,7 @@ FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and Wine will open it for you.", 12289, 36, 11, 182, 18 + LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 LTEXT "&Open:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP _____
Modified: trunk/reactos/lib/shell32/shell32_Es.rc --- vendor/wine/dlls/shell32/current/shell32_Es.rc 2004-12-31 15:57:39 UTC (rev 12598) +++ trunk/reactos/lib/shell32/shell32_Es.rc 2004-12-31 16:00:23 UTC (rev 12599) @@ -110,11 +110,12 @@
CAPTION "Acerca de %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "Aceptar", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "Aceptar", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 - LTEXT "Wine está disponible gracias a:", 98, 8, 55, 137, 10 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 + LTEXT "ReactOS está disponible gracias a:", 98, 8, 55, 137, 10 }
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -123,7 +124,7 @@ FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Introduzca el nombre de un programa, carpeta, documento o recurso de Internet, y Wine lo abrirá para usted.", 12289, 36, 11, 182, 18 + LTEXT "Introduzca el nombre de un programa, carpeta, documento o recurso de Internet, y ReactOS lo abrirá para usted.", 12289, 36, 11, 182, 18 LTEXT "&Abrir:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "Aceptar", IDOK, 62, 63, 50, 14, WS_TABSTOP @@ -185,5 +186,5 @@ IDS_RESTART_TITLE "Reiniciar" IDS_RESTART_PROMPT "¿Desea simular un reinicio de Windows?" IDS_SHUTDOWN_TITLE "Apagar" - IDS_SHUTDOWN_PROMPT "¿Desea terminar su sesión Wine?" + IDS_SHUTDOWN_PROMPT "¿Desea terminar su sesión ReactOS?" } _____
Modified: trunk/reactos/lib/shell32/shell32_Fi.rc --- vendor/wine/dlls/shell32/current/shell32_Fi.rc 2004-12-31 15:57:39 UTC (rev 12598) +++ trunk/reactos/lib/shell32/shell32_Fi.rc 2004-12-31 16:00:23 UTC (rev 12599) @@ -23,11 +23,12 @@
CAPTION "Tietoja: %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12 + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 - LTEXT "Wine:n tekijät:", 98, 8, 55, 137, 10 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 + LTEXT "ReactOS:n tekijät:", 98, 8, 55, 137, 10 }
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -36,7 +37,7 @@ FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and Wine will open it for you.", 12289, 36, 11, 182, 18 + LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 LTEXT "&Open:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP _____
Modified: trunk/reactos/lib/shell32/shell32_Fr.rc --- vendor/wine/dlls/shell32/current/shell32_Fr.rc 2004-12-31 15:57:39 UTC (rev 12598) +++ trunk/reactos/lib/shell32/shell32_Fr.rc 2004-12-31 16:00:23 UTC (rev 12599) @@ -112,11 +112,12 @@
CAPTION "À propos de %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 - LTEXT "Wine est une réalisation de :", 98, 8, 55, 137, 10 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 + LTEXT "ReactOS est une réalisation de :", 98, 8, 55, 137, 10 }
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -125,7 +126,7 @@ FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Entrez le nom d'un programme, d'un dossier, d'un document ou d'une ressource Internet, et Wine l'ouvrira pour vous.", 12289, 36, 11, 182, 18 + LTEXT "Entrez le nom d'un programme, d'un dossier, d'un document ou d'une ressource Internet, et ReactOS l'ouvrira pour vous.", 12289, 36, 11, 182, 18 LTEXT "&Ouvrir :", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP @@ -187,7 +188,7 @@ IDS_RESTART_TITLE "Redémarrer" IDS_RESTART_PROMPT "Voulez-vous simuler le redémarrage de Windows?" IDS_SHUTDOWN_TITLE "Arrêter" - IDS_SHUTDOWN_PROMPT "Voulez-vous fermer la session Wine?" + IDS_SHUTDOWN_PROMPT "Voulez-vous fermer la session ReactOS?" }
/* shell folder path default values */ _____
Modified: trunk/reactos/lib/shell32/shell32_Hu.rc --- vendor/wine/dlls/shell32/current/shell32_Hu.rc 2004-12-31 15:57:39 UTC (rev 12598) +++ trunk/reactos/lib/shell32/shell32_Hu.rc 2004-12-31 16:00:23 UTC (rev 12599) @@ -23,11 +23,12 @@
CAPTION "A %s-rõl" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12 + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 - LTEXT "A WINE-t írták:", 98, 8, 55, 137, 10 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 + LTEXT "A ReactOS-t írták:", 98, 8, 55, 137, 10 }
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -36,7 +37,7 @@ FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and Wine will open it for you.", 12289, 36, 11, 182, 18 + LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 LTEXT "&Open:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP _____
Modified: trunk/reactos/lib/shell32/shell32_It.rc --- vendor/wine/dlls/shell32/current/shell32_It.rc 2004-12-31 15:57:39 UTC (rev 12598) +++ trunk/reactos/lib/shell32/shell32_It.rc 2004-12-31 16:00:23 UTC (rev 12599) @@ -110,11 +110,12 @@
CAPTION "Informazioni su %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 - LTEXT "Wine è disponibile grazie a:", 98, 8, 55, 137, 10 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 + LTEXT "ReactOS è disponibile grazie a:", 98, 8, 55, 137, 10 }
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -123,7 +124,7 @@ FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Digitare il nome del programma, della cartella, del documento o della risorsa internet, e Wine la aprirà.", 12289, 36, 11, 182, 18 + LTEXT "Digitare il nome del programma, della cartella, del documento o della risorsa internet, e ReactOS la aprirà.", 12289, 36, 11, 182, 18 LTEXT "&Apri:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP @@ -186,5 +187,5 @@ IDS_RESTART_TITLE "Riavvia" IDS_RESTART_PROMPT "Vuoi simulare un riavvio do Windows?" IDS_SHUTDOWN_TITLE "Termina sessione" - IDS_SHUTDOWN_PROMPT "Vuoi terminare la sessione di Wine?" + IDS_SHUTDOWN_PROMPT "Vuoi terminare la sessione di ReactOS?" } _____
Modified: trunk/reactos/lib/shell32/shell32_Ja.rc --- vendor/wine/dlls/shell32/current/shell32_Ja.rc 2004-12-31 15:57:39 UTC (rev 12598) +++ trunk/reactos/lib/shell32/shell32_Ja.rc 2004-12-31 16:00:23 UTC (rev 12599) @@ -103,11 +103,12 @@
CAPTION "%s ,É,Â,¢,Ä" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12 + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 - LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 + LTEXT "ReactOS was brought to you by:", 98, 8, 55, 137, 10 }
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -116,7 +117,7 @@ FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and Wine will open it for you.", 12289, 36, 11, 182, 18 + LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 LTEXT "&Open:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP _____
Modified: trunk/reactos/lib/shell32/shell32_Ko.rc --- vendor/wine/dlls/shell32/current/shell32_Ko.rc 2004-12-31 15:57:39 UTC (rev 12598) +++ trunk/reactos/lib/shell32/shell32_Ko.rc 2004-12-31 16:00:23 UTC (rev 12599) @@ -23,11 +23,12 @@
CAPTION "%s¿¡ °üÇÏ¿©" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "È®ÀÎ", 1, 153, 130, 50, 12 + DEFPUSHBUTTON "È®ÀÎ", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 - LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 + LTEXT "ReactOS was brought to you by:", 98, 8, 55, 137, 10 }
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -36,7 +37,7 @@ FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and Wine will open it for you.", 12289, 36, 11, 182, 18 + LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 LTEXT "&Open:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP _____
Modified: trunk/reactos/lib/shell32/shell32_Nl.rc --- vendor/wine/dlls/shell32/current/shell32_Nl.rc 2004-12-31 15:57:39 UTC (rev 12598) +++ trunk/reactos/lib/shell32/shell32_Nl.rc 2004-12-31 16:00:23 UTC (rev 12599) @@ -23,11 +23,12 @@
CAPTION "Info %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 - LTEXT "Wine is geschreven door:", 98, 8, 55, 137, 10 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 + LTEXT "ReactOS is geschreven door:", 98, 8, 55, 137, 10 }
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -36,7 +37,7 @@ FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and Wine will open it for you.", 12289, 36, 11, 182, 18 + LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 LTEXT "&Open:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP _____
Modified: trunk/reactos/lib/shell32/shell32_No.rc --- vendor/wine/dlls/shell32/current/shell32_No.rc 2004-12-31 15:57:39 UTC (rev 12598) +++ trunk/reactos/lib/shell32/shell32_No.rc 2004-12-31 16:00:23 UTC (rev 12599) @@ -23,11 +23,12 @@
CAPTION "Om %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12 + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 - LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 + LTEXT "ReactOS was brought to you by:", 98, 8, 55, 137, 10 }
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -36,7 +37,7 @@ FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and Wine will open it for you.", 12289, 36, 11, 182, 18 + LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 LTEXT "&Open:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP _____
Modified: trunk/reactos/lib/shell32/shell32_Pl.rc --- vendor/wine/dlls/shell32/current/shell32_Pl.rc 2004-12-31 15:57:39 UTC (rev 12598) +++ trunk/reactos/lib/shell32/shell32_Pl.rc 2004-12-31 16:00:23 UTC (rev 12599) @@ -110,11 +110,12 @@
CAPTION "O %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 - LTEXT "Mo¿esz korzystaæ z Wine'a dziêki:", 98, 8, 55, 137, 10 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 + LTEXT "Mo¿esz korzystaæ z ReactOS'a dziêki:", 98, 8, 55, 137, 10 }
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -123,7 +124,7 @@ FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Wpisz nazwê programu, katalogu, dokumentu, a Wine otworzy go dla ciebie.", 12289, 36, 11, 182, 18 + LTEXT "Wpisz nazwê programu, katalogu, dokumentu, a ReactOS otworzy go dla ciebie.", 12289, 36, 11, 182, 18 LTEXT "&Otwórz:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP @@ -185,5 +186,5 @@ IDS_RESTART_TITLE "Uruchom ponownie" IDS_RESTART_PROMPT "Czy chcesz zasymulowaæ zrestartowanie Windowsa?" IDS_SHUTDOWN_TITLE "Wy³¹cz" - IDS_SHUTDOWN_PROMPT "Czy chcesz wy³¹czyæ sesjê Wine'a?" + IDS_SHUTDOWN_PROMPT "Czy chcesz wy³¹czyæ sesjê ReactOS'a?" } _____
Modified: trunk/reactos/lib/shell32/shell32_Pt.rc --- vendor/wine/dlls/shell32/current/shell32_Pt.rc 2004-12-31 15:57:39 UTC (rev 12598) +++ trunk/reactos/lib/shell32/shell32_Pt.rc 2004-12-31 16:00:23 UTC (rev 12599) @@ -110,11 +110,12 @@
CAPTION "Sobre %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12 + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 - LTEXT "Wine foi disponibilizado por:", 98, 8, 55, 137, 10 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 + LTEXT "ReactOS foi disponibilizado por:", 98, 8, 55, 137, 10 }
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -123,7 +124,7 @@ FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Digite o nome do programa, pasta, documento, ou endereço Internet, que o Wine irá abrí-lo para você.", 12289, 36, 11, 182, 18 + LTEXT "Digite o nome do programa, pasta, documento, ou endereço Internet, que o ReactOS irá abrí-lo para você.", 12289, 36, 11, 182, 18 LTEXT "&Abrir:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP @@ -185,5 +186,5 @@ IDS_RESTART_TITLE "Reiniciar" IDS_RESTART_PROMPT "Você quer simular a reinicialização do Windows?" IDS_SHUTDOWN_TITLE "Desligar" - IDS_SHUTDOWN_PROMPT "Você quer finalizar a sessão no Wine?" + IDS_SHUTDOWN_PROMPT "Você quer finalizar a sessão no ReactOS?" } _____
Modified: trunk/reactos/lib/shell32/shell32_Ru.rc --- vendor/wine/dlls/shell32/current/shell32_Ru.rc 2004-12-31 15:57:39 UTC (rev 12598) +++ trunk/reactos/lib/shell32/shell32_Ru.rc 2004-12-31 16:00:23 UTC (rev 12599) @@ -23,11 +23,12 @@
CAPTION "Î %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 - LTEXT "Ðàçðàáîò÷èêè Wine:", 98, 8, 55, 137, 10 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 + LTEXT "Ðàçðàáîò÷èêè ReactOS:", 98, 8, 55, 137, 10 }
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -36,7 +37,7 @@ FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Ââåäèòå èìÿ ïðîãðàììû, ïàïêè, äîêóìåíòà èëè ðåñóðñ Èíòåðíåòà, è Wine îòêðîåò èõ.", 12289, 36, 11, 182, 18 + LTEXT "Ââåäèòå èìÿ ïðîãðàììû, ïàïêè, äîêóìåíòà èëè ðåñóðñ Èíòåðíåòà, è ReactOS îòêðîåò èõ.", 12289, 36, 11, 182, 18 LTEXT "&Îòêðûòü:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP _____
Modified: trunk/reactos/lib/shell32/shell32_Si.rc --- vendor/wine/dlls/shell32/current/shell32_Si.rc 2004-12-31 15:57:39 UTC (rev 12598) +++ trunk/reactos/lib/shell32/shell32_Si.rc 2004-12-31 16:00:23 UTC (rev 12599) @@ -23,11 +23,12 @@
CAPTION "O %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "V redu", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "V redu", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 - LTEXT "Wine so ustvarili:", 98, 8, 55, 137, 10 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 + LTEXT "ReactOS so ustvarili:", 98, 8, 55, 137, 10 }
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -36,7 +37,7 @@ FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Vnesite ime programa, mape, dokumenta ali spletne strani, in Wine ga (jo) bo odprl.", 12289, 36, 11, 182, 18 + LTEXT "Vnesite ime programa, mape, dokumenta ali spletne strani, in ReactOS ga (jo) bo odprl.", 12289, 36, 11, 182, 18 LTEXT "&Odpri:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "V redu", IDOK, 62, 63, 50, 14, WS_TABSTOP _____
Modified: trunk/reactos/lib/shell32/shell32_Sk.rc --- vendor/wine/dlls/shell32/current/shell32_Sk.rc 2004-12-31 15:57:39 UTC (rev 12598) +++ trunk/reactos/lib/shell32/shell32_Sk.rc 2004-12-31 16:00:23 UTC (rev 12599) @@ -23,10 +23,11 @@
CAPTION "O programe %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12 + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 LTEXT "Víno pre vás pripravili:", 98, 8, 55, 137, 10 }
@@ -36,7 +37,7 @@ FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and Wine will open it for you.", 12289, 36, 11, 182, 18 + LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 LTEXT "&Open:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP _____
Modified: trunk/reactos/lib/shell32/shell32_Sv.rc --- vendor/wine/dlls/shell32/current/shell32_Sv.rc 2004-12-31 15:57:39 UTC (rev 12598) +++ trunk/reactos/lib/shell32/shell32_Sv.rc 2004-12-31 16:00:23 UTC (rev 12599) @@ -23,11 +23,12 @@
CAPTION "Om %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12 + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 - LTEXT "Wine hade inte varit möjligt utan dessa personer:", 98, 8, 55, 137, 10 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 + LTEXT "ReactOS hade inte varit möjligt utan dessa personer:", 98, 8, 55, 137, 10 }
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -36,7 +37,7 @@ FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Skriv namnet på ett program, en mapp eller ett dokument och wine kommer att öppna det för dig.", 12289, 36, 11, 182, 18 + LTEXT "Skriv namnet på ett program, en mapp eller ett dokument och ReactOS kommer att öppna det för dig.", 12289, 36, 11, 182, 18 LTEXT "&Öppna:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP _____
Modified: trunk/reactos/lib/shell32/shell32_Uk.rc --- vendor/wine/dlls/shell32/current/shell32_Uk.rc 2004-12-31 15:57:39 UTC (rev 12598) +++ trunk/reactos/lib/shell32/shell32_Uk.rc 2004-12-31 16:00:23 UTC (rev 12599) @@ -109,11 +109,12 @@
CAPTION "Ïðî %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 - LTEXT "Ðîçðîáíèêè Wine:", 98, 8, 55, 137, 10 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 + LTEXT "Ðîçðîáíèêè ReactOS:", 98, 8, 55, 137, 10 }
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -122,7 +123,7 @@ FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Ââåä³òü ³ì'ÿ ïðîãðàìè, òåêè, äîêóìåíòó ÷è ðåñóðñ ²íòåðíåòó, ³ Wine â³äêðèº ¿õ.", 12289, 36, 11, 182, 18 + LTEXT "Ââåä³òü ³ì'ÿ ïðîãðàìè, òåêè, äîêóìåíòó ÷è ðåñóðñ ²íòåðíåòó, ³ ReactOS â³äêðèº ¿õ.", 12289, 36, 11, 182, 18 LTEXT "&³äêðèòè:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP _____
Modified: trunk/reactos/lib/shell32/shell32_Wa.rc --- vendor/wine/dlls/shell32/current/shell32_Wa.rc 2004-12-31 15:57:39 UTC (rev 12598) +++ trunk/reactos/lib/shell32/shell32_Wa.rc 2004-12-31 16:00:23 UTC (rev 12599) @@ -28,11 +28,12 @@
CAPTION "Å dfait di %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "I Va", IDOK, 153, 130, 50, 12 + DEFPUSHBUTTON "I Va", IDOK, 153, 133, 50, 12, WS_TABSTOP LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 189, 10, 14, 16 - LTEXT "", 100, 8, 10, 137, 33 - LTEXT "Wine a estu fwait par:", 98, 8, 55, 137, 10 + ICON "", 1088, 10, 10, 14, 16 + LTEXT "", 100, 30, 10, 137, 10 + LTEXT "", 101, 30, 22, 137, 10 [truncated at 1000 lines; 8253 more skipped]