Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 22398: Langues Nl.rc patch from i386dx see wiki how have done the translate
by greatlrd＠svn.reactos.org 18 Jun '06

18 Jun '06

Author: greatlrd Date: Sun Jun 18 23:32:03 2006 New Revision: 22398 URL: http://svn.reactos.ru/svn/reactos?rev=22398&view=rev Log: Langues Nl.rc patch from i386dx see wiki how have done the translate Added: trunk/reactos/base/setup/welcome/Nl.rc (with props) Modified: trunk/reactos/base/setup/welcome/welcome.rc Added: trunk/reactos/base/setup/welcome/Nl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/setup/welcome/Nl.rc?re… ============================================================================== --- trunk/reactos/base/setup/welcome/Nl.rc (added) +++ trunk/reactos/base/setup/welcome/Nl.rc Sun Jun 18 23:32:03 2006 @@ -1,0 +1,60 @@ +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +/* String Tables */ + +/* Default settings */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "ReactOS - Welkom" + IDS_DEFAULTTOPICTITLE "ReactOS" + IDS_DEFAULTTOPICDESC "Welkom bij het React Operation System.\n\nKlik links op een onderwerp." +// IDS_CHECKTEXT "Gaat terug naar dit scherm" +// IDS_CLOSETEXT "Afsluiten" +END + +/* Topic buttons */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICBUTTON0 "Installeer ReactOS" + IDS_TOPICBUTTON1 "Deze CD Verkennen" + IDS_TOPICBUTTON2 "Afsluiten" +// IDS_TOPICBUTTON3 "Empty Topic 3" +// IDS_TOPICBUTTON4 "Empty Topic 4" +// IDS_TOPICBUTTON5 "Empty Topic 5" +// IDS_TOPICBUTTON6 "Empty Topic 6" +// IDS_TOPICBUTTON7 "Empty Topic 7" +// IDS_TOPICBUTTON8 "Empty Topic 8" +// IDS_TOPICBUTTON9 "Empty Topic 9" +END + +/* Topic titles */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICTITLE0 "Installeer ReactOS" + IDS_TOPICTITLE1 "Deze CD Verkennen" + IDS_TOPICTITLE2 "Afsluiten" +// IDS_TOPICTITLE3 "Empty Topic Title 3" +// IDS_TOPICTITLE4 "Empty Topic Title 4" +// IDS_TOPICTITLE5 "Empty Topic Title 5" +// IDS_TOPICTITLE6 "Empty Topic Title 6" +// IDS_TOPICTITLE7 "Empty Topic Title 7" +// IDS_TOPICTITLE8 "Empty Topic Title 8" +// IDS_TOPICTITLE9 "Empty Topic Title 9" +END + +/* Topic descriptions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICDESC0 "Maak een nieuwe ReactOS installatie of upgrade een bestaande installatie." + IDS_TOPICDESC1 "Deze CD Verkennen." + IDS_TOPICDESC2 "Klik om dit programma af te sluiten." +// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." +// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." +// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." +// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." +// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." +// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." +// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." +END + +/* EOF */ Propchange: trunk/reactos/base/setup/welcome/Nl.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/setup/welcome/welcome.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/setup/welcome/welcome.… ============================================================================== --- trunk/reactos/base/setup/welcome/welcome.rc (original) +++ trunk/reactos/base/setup/welcome/welcome.rc Sun Jun 18 23:32:03 2006 @@ -56,6 +56,7 @@ #include "Fr.rc" #include "Hu.rc" #include "Ja.rc" +#include "Nl.rc" #include "Sv.rc" #include "Ru.rc" #include "Uk.rc"

1 0

[greatlrd] 22397: Langues Nl.rc patch from i386dx see wiki how have done the translate
by greatlrd＠svn.reactos.org 18 Jun '06

18 Jun '06

Author: greatlrd Date: Sun Jun 18 23:29:44 2006 New Revision: 22397 URL: http://svn.reactos.ru/svn/reactos?rev=22397&view=rev Log: Langues Nl.rc patch from i386dx see wiki how have done the translate Added: trunk/reactos/base/applications/reporterror/Nl.rc (with props) Modified: trunk/reactos/base/applications/reporterror/reporterror.rc Added: trunk/reactos/base/applications/reporterror/Nl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/reporterr… ============================================================================== --- trunk/reactos/base/applications/reporterror/Nl.rc (added) +++ trunk/reactos/base/applications/reporterror/Nl.rc Sun Jun 18 23:29:44 2006 @@ -1,0 +1,61 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Error Reporting Assistant + * FILE: base/application/reporterror/Nl.rc + * AUTHOR: Maurus Cuelenaere + */ + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Foutafhandelingassistent" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + CONTROL "Het systeem herstelde zich van een fout.",-1,"Static",0x50020000,115,15,160,24 + CONTROL "Wilt u de fout rapporteren aan het ReactOS-team?",-1,"Static",0x50020000,115,35,160,17 +END + +IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Foutafhandelingassistent" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + CONTROL "Gelieve te beschrijven wat u deed toen de fout optrad.\n\nKlik op 'Volgende' om het rapport te verzenden aan het ReactOS-team of klik op 'Annuleren' om geen informatie te verzenden.",-1,"Static",0x50020000,10,0,225,40 + CONTROL "Uw e-mail adres (optioneel):",-1,"Static",0x50020000,10,40,120,20 + CONTROL "",IDE_SUBMIT_REPORT_YOUR_EMAIL,"Edit",0x50010000,110,40,150,12,0x00000200 + CONTROL "Het probleem (optioneel):",-1,"Static",0x50020000,10,55,147,20 + CONTROL "",IDE_SUBMIT_REPORT_PROBLEM_DESCRIPTION,"Edit",0x50A11004,10,65,250,55,0x00000200 +END + + +IDD_SUBMITTING_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Foutafhandelingassistent" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + CONTROL "{STATUS}",IDC_SUBMISSION_STATUS,"Static",0x50020000,25,58,225,8 + CONTROL "",IDC_SUBMITTING_IN_PROGRESS,"msctls_progress32",0x50800000,25,80,225,8 +END + +IDD_SUBMITTED_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Foutafhandelingassistent" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + CONTROL "Het rapport is succesvol verzonden naar het ReactOS-team.",-1,"Static",0x50020000,25,5,225,20 +END + +STRINGTABLE +BEGIN + IDS_WIZARD_NAME "Rapporteer een fout aan het ReactOS-team" + IDS_FAILED_TO_CONTACT_SERVER "Het systeem kon de server niet bereiken.\nControleer of u verbonden bent met het internet." + IDS_FAILED_TO_DELIVER_ERROR_REPORT "Het systeem kon het rapport niet afleveren." +END + +STRINGTABLE +BEGIN + IDS_CONTACTING_SERVER "Bezig met verbinden met de server..." + IDS_FAILED_TO_INITIALIZE_WINSOCK "Kan winsock niet initialiseren (windows error code %d)" + IDS_FAILED_TO_LOCATE_SERVER "Kan geen verbinding maken met de server." +END Propchange: trunk/reactos/base/applications/reporterror/Nl.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/reporterror/reporterror.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/reporterr… ============================================================================== --- trunk/reactos/base/applications/reporterror/reporterror.rc (original) +++ trunk/reactos/base/applications/reporterror/reporterror.rc Sun Jun 18 23:29:44 2006 @@ -20,4 +20,5 @@ #include "Ja.rc" #include "sv.rc" #include "hu.rc" +#include "Nl.rc" #include "ru.rc"

1 0

[fireball] 22396: Remove "_" decoration from module entries, since MSVC doesn't need them
by fireball＠svn.reactos.org 18 Jun '06

18 Jun '06

Author: fireball Date: Sun Jun 18 23:28:54 2006 New Revision: 22396 URL: http://svn.reactos.ru/svn/reactos?rev=22396&view=rev Log: Remove "_" decoration from module entries, since MSVC doesn't need them Modified: trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?rev… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Sun Jun 18 23:28:54 2006 @@ -823,23 +823,23 @@ switch ( type ) { case Kernel: - return "_NtProcessStartup"; + return "NtProcessStartup"; case KernelModeDLL: case KernelModeDriver: case ExportDriver: - return "_DriverEntry@8"; + return "DriverEntry@8"; case NativeDLL: - return "_DllMainCRTStartup@12"; + return "DllMainCRTStartup@12"; case NativeCUI: - return "_NtProcessStartup@4"; + return "NtProcessStartup@4"; case Win32DLL: - return "_DllMain@12"; + return "DllMain@12"; case Win32CUI: case Test: if ( isUnicode ) - return "_wmainCRTStartup"; + return "wmainCRTStartup"; else - return "_mainCRTStartup"; + return "mainCRTStartup"; case Win32SCR: case Win32GUI: if ( isUnicode )

1 0

[janderwald] 22395: update resource file patch by EmuandCo
by janderwald＠svn.reactos.org 18 Jun '06

18 Jun '06

Author: janderwald Date: Sun Jun 18 23:25:41 2006 New Revision: 22395 URL: http://svn.reactos.ru/svn/reactos?rev=22395&view=rev Log: update resource file patch by EmuandCo Modified: trunk/reactos/dll/win32/devmgr/En.rc Modified: trunk/reactos/dll/win32/devmgr/En.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/devmgr/En.rc?rev=… ============================================================================== --- trunk/reactos/dll/win32/devmgr/En.rc (original) +++ trunk/reactos/dll/win32/devmgr/En.rc Sun Jun 18 23:25:41 2006 @@ -68,16 +68,13 @@ IDS_DEV_NO_VALID_LOG_CONF "ReactOS can\'t specify the resources for this device." IDS_DEV_FAILED_INSTALL "The drivers for this device are not installed." IDS_DEV_HARDWARE_DISABLED "This device is disabled because the BIOS for the device did not give it any resources." - IDS_DEV_CANT_SHARE_IRQ "This device is using an Interrupt Request (IRQ) resource that is in use by another device and cannot be shared. "\ - "You must change the conflicting setting or remove the real-mode driver causing the conflict." + IDS_DEV_CANT_SHARE_IRQ "This device is using an Interrupt Request (IRQ) resource that is in use by another device and cannot be shared.\nYou must change the conflicting setting or remove the real-mode driver causing the conflict." IDS_DEV_FAILED_ADD "This device is not working properly because $1 is not working properly." IDS_DEV_DISABLED_SERVICE "ReactOS cannot install the drivers for this device because it cannot access the drive or network location that has the setup files on it." IDS_DEV_TRANSLATION_FAILED "This device isn\'t responding to its driver." IDS_DEV_NO_SOFTCONFIG "ReactOS cannot determine the settings for this device. Consult the documentation that came with this device and use the Resource tab to set the configuration." - IDS_DEV_BIOS_TABLE "Your computer\'s system firmware does not include enough information to properly configure and use this device. "\ - "To use this device, contact your computer manufacturer to obtain a firmware or BIOS update." - IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). "\ - "Please use the computer\'s system setup program to reconfigure the interrupt for this device." + IDS_DEV_BIOS_TABLE "Your computer\'s system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." + IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer\'s system setup program to reconfigure the interrupt for this device." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS cannot initialize the device driver for this hardware." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS cannot load the device driver for this hardware because a previous instance of the device driver is still in memory." IDS_DEV_DRIVER_FAILED_LOAD "ReactOS cannot load the device driver for this hardware. The driver may be corrupted or missing." @@ -88,7 +85,7 @@ IDS_DEV_HALTED "An application or service has shut down this hardware device." IDS_DEV_PHANTOM "Currently, this hardware device is not connected to the computer." IDS_DEV_SYSTEM_SHUTDOWN "ReactOS cannot gain access to this hardware device because the operating system is in the process of shutting down." - IDS_DEV_HELD_FOR_EJECT "ReactOS cannot use this hardware device because it has been prepared for \"safe removal\", but it has not been removed from the computer" + IDS_DEV_HELD_FOR_EJECT "ReactOS cannot use this hardware device because it has been prepared for safe removal, but it has not been removed from the computer" IDS_DEV_DRIVER_BLOCKED "The software for this device has been blocked from starting because it is known to have problems with ReactOS. Contact the hardware vendor for a new driver." IDS_DEV_REGISTRY_TOO_LARGE "ReactOS cannot start new hardware devices because the system hive is too large (exceeds the Registry Size Limit)." IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn\'t able to change the settings of this device."

1 0

[greatlrd] 22394: Langues Nl.rc patch from i386dx see wiki how have done the translate
by greatlrd＠svn.reactos.org 18 Jun '06

18 Jun '06

Author: greatlrd Date: Sun Jun 18 23:25:18 2006 New Revision: 22394 URL: http://svn.reactos.ru/svn/reactos?rev=22394&view=rev Log: Langues Nl.rc patch from i386dx see wiki how have done the translate Added: trunk/reactos/base/applications/ibrowser/Nl.rc (with props) Modified: trunk/reactos/base/applications/ibrowser/ibrowser_intres.rc Added: trunk/reactos/base/applications/ibrowser/Nl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/ibrowser/… ============================================================================== --- trunk/reactos/base/applications/ibrowser/Nl.rc (added) +++ trunk/reactos/base/applications/ibrowser/Nl.rc Sun Jun 18 23:25:18 2006 @@ -1,0 +1,161 @@ +//Microsoft Developer Studio generated resource script. +// +#include "ibrowser_intres.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include <windows.h> +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// German (Germany) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) +#ifdef _WIN32 +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "ibrowser_intres.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include <windows.h>\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "#ifndef _ROS_\r\n" + "LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL\r\n" + "STRINGTABLE DISCARDABLE \r\n" + "BEGIN\r\n" + "#ifdef UNICODE\r\n" + "IDS_IBROWSER_VERSION_STR ""ROS IBrowser%0s""\r\n" + "#else\r\n" + "IDS_IBROWSER_VERSION_STR ""ROS IBrowser Ansi%0s""\r\n" + "#endif\r\n" + "END\r\n" + "#endif\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // German (Germany) resources +///////////////////////////////////////////////////////////////////////////// + + +///////////////////////////////////////////////////////////////////////////// +// Dutch resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDM_SDIFRAME MENU PRELOAD DISCARDABLE +BEGIN + POPUP "&Bestand" + BEGIN + MENUITEM "&Openen", ID_FILE_OPEN + MENUITEM "&Afsluiten", ID_FILE_EXIT + END + POPUP "&Beeld" + BEGIN + MENUITEM "&Werkbalk", ID_VIEW_TOOL_BAR + MENUITEM "&ZijBalk", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "&Statusbalk", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Vernieuwen\tF5", ID_REFRESH + MENUITEM "V&olledig Scherm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + END + POPUP "&Help" + BEGIN + MENUITEM "IBrowser &FAQ...", ID_IBROWSER_FAQ + MENUITEM "Info...", ID_ABOUT_IBROWSER + MENUITEM "Info over het &OS...", ID_ABOUT_WINDOWS + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_ABOUT_IBROWSER DIALOG DISCARDABLE 0, 0, 199, 106 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Info" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "ReactOS Web Browser",IDC_ROS_IBROWSER,91,13,104,11 + LTEXT "V 0.9",IDC_VERSION_TXT,91,27,104,8 + LTEXT "(c) 2005 Martin Fuchs",IDC_STATIC,91,42,104,8 + LTEXT "",IDC_WIN_VERSION,91,58,98,22 + LTEXT "http://www.sky.franken.de/explorer/",IDC_WWW,17,84,129, + 8 + CONTROL "&OK",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP, + 154,90,38,12 +END + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TITLE "Reactos Internet Web Browser" + IDS_EMPTY "(Leeg)" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ABOUT_IBROWSER "&Info..." +END + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// +#ifndef _ROS_ +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE +BEGIN +#ifdef UNICODE +IDS_IBROWSER_VERSION_STR "ROS IBrowser%0s" +#else +IDS_IBROWSER_VERSION_STR "ROS IBrowser Ansi%0s" +#endif +END +#endif + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Propchange: trunk/reactos/base/applications/ibrowser/Nl.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/ibrowser/ibrowser_intres.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/ibrowser/… ============================================================================== --- trunk/reactos/base/applications/ibrowser/ibrowser_intres.rc (original) +++ trunk/reactos/base/applications/ibrowser/ibrowser_intres.rc Sun Jun 18 23:25:18 2006 @@ -66,6 +66,7 @@ "#include ""Sv.rc""\r\n" "#include ""Hu.rc""\r\n" "#include ""Ro.rc""\r\n" + "#include ""Nl.rc""\r\n" "#include ""Ja.rc""\0" END @@ -101,6 +102,7 @@ #include "Sv.rc" #include "Hu.rc" #include "Ro.rc" +#include "Nl.rc" #include "Ja.rc" ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED

1 0

[janderwald] 22393: [AUDIT] unlock resource file
by janderwald＠svn.reactos.org 18 Jun '06

18 Jun '06

Author: janderwald Date: Sun Jun 18 23:23:03 2006 New Revision: 22393 URL: http://svn.reactos.ru/svn/reactos?rev=22393&view=rev Log: [AUDIT] unlock resource file Modified: trunk/reactos/dll/win32/devmgr/En.rc (props changed) Propchange: trunk/reactos/dll/win32/devmgr/En.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[janderwald] 22392: fix typos, use correct sub languages, update resource files, change dialog font to "MS Shell Dlg" patch by EmuandCo
by janderwald＠svn.reactos.org 18 Jun '06

18 Jun '06

Author: janderwald Date: Sun Jun 18 23:01:48 2006 New Revision: 22392 URL: http://svn.reactos.ru/svn/reactos?rev=22392&view=rev Log: fix typos, use correct sub languages, update resource files, change dialog font to "MS Shell Dlg" patch by EmuandCo Modified: trunk/reactos/dll/cpl/access/De.rc trunk/reactos/dll/cpl/appwiz/De.rc trunk/reactos/dll/cpl/desk/de.rc trunk/reactos/dll/cpl/hdwwiz/De.rc trunk/reactos/dll/cpl/intl/de.rc trunk/reactos/dll/cpl/liccpa/De.rc trunk/reactos/dll/cpl/main/De.rc trunk/reactos/dll/cpl/mmsys/De.rc trunk/reactos/dll/cpl/ncpa/de.rc trunk/reactos/dll/cpl/powercfg/de.rc trunk/reactos/dll/cpl/powercfg/en.rc trunk/reactos/dll/cpl/sysdm/de.rc trunk/reactos/dll/directx/devenum/devenum.rc trunk/reactos/dll/win32/aclui/aclui_De.rc trunk/reactos/dll/win32/crypt32/crypt32_De.rc trunk/reactos/dll/win32/msgina/msgina.rc trunk/reactos/dll/win32/newdev/De.rc trunk/reactos/dll/win32/serialui/serialui.rc trunk/reactos/dll/win32/syssetup/syssetup_De.rc trunk/reactos/dll/win32/syssetup/syssetup_En.rc trunk/reactos/dll/win32/syssetup/syssetup_Es.rc trunk/reactos/dll/win32/syssetup/syssetup_Fr.rc trunk/reactos/dll/win32/syssetup/syssetup_Hu.rc trunk/reactos/dll/win32/syssetup/syssetup_Ja.rc trunk/reactos/dll/win32/syssetup/syssetup_Nl.rc trunk/reactos/dll/win32/user32/Da.rc trunk/reactos/dll/win32/user32/De.rc trunk/reactos/dll/win32/user32/En.rc trunk/reactos/dll/win32/user32/Es.rc trunk/reactos/dll/win32/user32/Fr.rc trunk/reactos/dll/win32/user32/Hu.rc trunk/reactos/dll/win32/user32/Nl.rc trunk/reactos/dll/win32/user32/Pl.rc trunk/reactos/dll/win32/user32/Sv.rc trunk/reactos/dll/win32/userenv/De.rc trunk/reactos/dll/win32/winmm/winmm_De.rc trunk/reactos/subsystems/ntvdm/De.rc trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rc Modified: trunk/reactos/dll/cpl/access/De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/access/De.rc?rev=22… ============================================================================== --- trunk/reactos/dll/cpl/access/De.rc (original) +++ trunk/reactos/dll/cpl/access/De.rc Sun Jun 18 23:01:48 2006 @@ -1,6 +1,6 @@ // German (De) resources by Friedrich Stange (dj_smith_reactos at online.de) -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN IDI_CPLACCESS ICON "resources/applet.ico" @@ -11,11 +11,11 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Einrastfunktion",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING - LTEXT "Benutzen Sie die Feststellfunktion um Kombinationen mit Shift, Strg ode Alt als Tastenfolge eingeben zu können.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + LTEXT "Benutzen Sie die Feststellfunktion um Kombinationen mit Shift, Strg oder Alt als Tastenfolge eingeben zu können.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) CHECKBOX "Einrastfunktion a&ktivieren",IDC_STICKY_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING)+4,14 PUSHBUTTON "&Einstellungen",IDC_STICKY_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14 GROUPBOX "Verzögerung",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(7)+2 - LTEXT "Benutzen Sie die Anschlägsverzögerung, wenn ReactOS kurze oder wiederholte Anschläge irgnorieren oder die Wiederholungsrate verringern soll.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + LTEXT "Benutzen Sie die Anschlägsverzögerung, wenn ReactOS kurze oder wiederholte Anschläge ignorieren oder die Wiederholungsrate verringern soll.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) CHECKBOX "&Verzögerung aktivieren",IDC_FILTER_BOX,(4*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14 PUSHBUTTON "E&instellungen",IDC_FILTER_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14 GROUPBOX "Signalfunktion",-1,PROPSHEETPADDING,LABELLINE(16)+3,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING Modified: trunk/reactos/dll/cpl/appwiz/De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/appwiz/De.rc?rev=22… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/De.rc (original) +++ trunk/reactos/dll/cpl/appwiz/De.rc Sun Jun 18 23:01:48 2006 @@ -1,4 +1,4 @@ -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION Modified: trunk/reactos/dll/cpl/desk/de.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/de.rc?rev=2239… ============================================================================== --- trunk/reactos/dll/cpl/desk/de.rc (original) +++ trunk/reactos/dll/cpl/desk/de.rc Sun Jun 18 23:01:48 2006 @@ -1,4 +1,4 @@ -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 205 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION Modified: trunk/reactos/dll/cpl/hdwwiz/De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/De.rc?rev=22… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/De.rc (original) +++ trunk/reactos/dll/cpl/hdwwiz/De.rc Sun Jun 18 23:01:48 2006 @@ -1,4 +1,4 @@ -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN STRINGTABLE BEGIN Modified: trunk/reactos/dll/cpl/intl/de.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/intl/de.rc?rev=2239… ============================================================================== --- trunk/reactos/dll/cpl/intl/de.rc (original) +++ trunk/reactos/dll/cpl/intl/de.rc Sun Jun 18 23:01:48 2006 @@ -1,6 +1,6 @@ /* $Id: intl.rc 12852 2005-01-06 13:58:04Z mf $ */ -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN IDD_GENERALPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION Modified: trunk/reactos/dll/cpl/liccpa/De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/liccpa/De.rc?rev=22… ============================================================================== --- trunk/reactos/dll/cpl/liccpa/De.rc (original) +++ trunk/reactos/dll/cpl/liccpa/De.rc Sun Jun 18 23:01:48 2006 @@ -1,6 +1,6 @@ // German (De) resources by DJ_Smith (dj_smith_reactos at online.de) -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN IDD_PROPPAGE1 DIALOG DISCARDABLE 20, 40, 315, 104 STYLE DS_MODALFRAME | WS_OVERLAPPED | WS_CAPTION | WS_VISIBLE | WS_SYSMENU Modified: trunk/reactos/dll/cpl/main/De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/main/De.rc?rev=2239… ============================================================================== --- trunk/reactos/dll/cpl/main/De.rc (original) +++ trunk/reactos/dll/cpl/main/De.rc Sun Jun 18 23:01:48 2006 @@ -1,13 +1,13 @@ -// German (De) resources by DJ_Smith (dj_smith_reactos at online.de) +// German (De) resources by DJ_Smith and Daniel Reimer (EmuandCo) -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN IDD_KEYBSPEED DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Geschwindigkeit" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Tastaturgeschwindikeit",-1,73,74,130,8 + LTEXT "Tastaturgeschwindigkeit",-1,73,74,130,8 END IDD_HARDWARE DIALOGEX 0, 0, 246, 228 @@ -19,7 +19,7 @@ IDD_CLICK_LOCK DIALOGEX 0, 0, 246, 100 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CAPTION | WS_SYSMENU -CAPTION "Click Lock" +CAPTION "KlickEinrasten" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Kurz", -1, 35, 50, 30, 10 @@ -27,29 +27,29 @@ CONTROL "",IDC_SLIDER_CLICK_LOCK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 50, 70, 17 PUSHBUTTON "&OK", IDOK, 120, 75, 50, 15 PUSHBUTTON "&Abbrechen", IDCANCEL, 175, 75, 50, 15 - LTEXT "&Adjust how long you need to hold down a mouse or trackball button before your click is locked",-1,60,15,170,30 + LTEXT "&Stellen Sie ein, wie lange eine Maus- oder Trackballtaste gedrückt werden muss, bevor die KlickEinrasten-Funktion aktiviert wird.",-1,60,15,170,30 ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 END IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION -CAPTION "Button" +CAPTION "Tasten" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Button configuration", -1, 5, 5, 230, 70 - CHECKBOX "&Switch primary and secondary buttons", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 + GROUPBOX "Tastenkonfiguration", -1, 5, 5, 230, 70 + CHECKBOX "&Primäre und sekundäre Taste umschalten", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 145, 10 CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_OWNERDRAW, 155, 15, 75, 57, WS_EX_STATICEDGE - LTEXT "Select this checkbox to make the button the right one the one you use for primary functions such as selecting and dragging", -1, 10, 30, 140, 30 - GROUPBOX "Double-click speed", -1, 5, 75, 230, 70 - LTEXT "Double-click the folder to test your settings. If the folder does not open or close, try using a slower setting.", -1, 10, 85, 160, 30 - LTEXT "Spee&d: Slow", -1, 10, 120, 90, 8 + LTEXT "Aktivieren Sie dieses Kontrollkästchen, um die rechte Maustaste für primäre Funktionen, wie Auswählen und Ziehen zu verwenden.", -1, 10, 30, 140, 31 + GROUPBOX "Doppelklickgeschwindigkeit", -1, 5, 75, 230, 70 + LTEXT "Doppelklicken Sie auf den Ordner, um die Einstellung zu testen. Verwenden Sie eine langsamere Einstellung, wenn der Ordner sich nicht öffnen oder schließen lässt.", -1, 10, 85, 160, 32 + LTEXT "Langsam", -1, 10, 120, 90, 8 LTEXT "Schnell", -1, 140, 120, 30, 8 CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_OWNERDRAW, 165, 85, 65, 57, WS_EX_STATICEDGE - GROUPBOX "ClickLock", -1, 5, 150, 230, 70 - CHECKBOX "&Turn on ClickLock", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 - PUSHBUTTON "&Einstellungen...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 10 - LTEXT "Enables you to highlight or drag without holding down the mouse button. To set, briefly press the mouse button. To release, click the mouse button again", -1, 10, 180, 190, 30 + GROUPBOX "KlickEinrasten", -1, 5, 150, 230, 70 + CHECKBOX "&KlickEinrasten aktivieren", IDC_CHECK_CLICK_LOCK, 10, 160, 91, 20 + PUSHBUTTON "&Einstellungen...", IDC_BUTTON_CLICK_LOCK, 167, 160, 53, 10 + LTEXT "Ermöglicht das Markieren oder Ziehen, ohne die Maustaste ständig gedrückt zu halten. Drücken Sie die Maustaste kurzzeitig, um die Funktion zu verwenden. Klicken Sie die Maustaste erneut, um die Tastenfeststellung zu beenden.", -1, 10, 180, 190, 33 END IDD_PAGE_POINTER DIALOGEX 0, 0, 246, 228 @@ -57,16 +57,16 @@ CAPTION "Zeiger" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Schema", -1, 5, 5, 170, 45 + GROUPBOX "S&chema", -1, 5, 5, 170, 45 COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120 - PUSHBUTTON "Sa&ve As...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 + PUSHBUTTON "Speichern &unter...", IDC_BUTTON_SAVEAS_SCHEME, 55, 30, 65, 15 PUSHBUTTON "&Löschen", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE - LTEXT "&Anpassen", -1, 5, 60, 40, 10 - CHECKBOX "&Enable pointer shadow", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 - PUSHBUTTON "Use De&fault", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 - PUSHBUTTON "&Durchsuchen", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 + LTEXT "An&passen:", -1, 5, 60, 40, 10 + CHECKBOX "Zeigerschatten &aktivieren", IDC_CHECK_DROP_SHADOW, 5, 200, 95, 10 + PUSHBUTTON "&Standard verwenden", IDC_BUTTON_USE_DEFAULT_CURSOR, 99, 200, 73, 15 + PUSHBUTTON "&Durchsuchen...", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 56, 15 END IDD_CURSOR_SCHEME_SAVEAS DIALOGEX 0, 0, 200, 75 @@ -74,9 +74,9 @@ CAPTION "Schema speichern" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Save this cursor scheme as:", -1, 5, 5, 100, 10 + LTEXT "Cursorschema speichern unter:", -1, 5, 5, 100, 10 EDITTEXT IDC_EDIT_SCHEME_NAME, 5, 15, 180, 15, WS_CHILD | WS_VISIBLE | WS_GROUP - PUSHBUTTON "&Ok", IDOK, 60, 45, 50, 15 + PUSHBUTTON "&OK", IDOK, 60, 45, 50, 15 PUSHBUTTON "&Abbrechen", IDCANCEL, 115, 45, 50, 15 END @@ -87,25 +87,25 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Bewegung", -1, 5, 5, 230, 60 - LTEXT "Sele&ct a pointer speed:", -1, 60, 15, 110, 10 - LTEXT "Slow", -1, 60, 30, 20, 10 + LTEXT "&Zeigergeschwindigkeit auswählen:", -1, 60, 15, 110, 10 + LTEXT "Langsam", -1, 60, 30, 29, 10 CONTROL "",IDC_SLIDER_MOUSE_SENSITIVITY, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 - LTEXT "Fast", -1, 170, 30, 20, 10 + LTEXT "Schnell", -1, 170, 30, 23, 10 ICON -1, IDC_ICON_MOUSE_SENSITIVITY, 15, 15, 15, 15 - CHECKBOX "&Enhance pointer precision", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 - GROUPBOX "Snap To", -1, 5, 65, 230, 40 + CHECKBOX "Z&eigerbeschleunigung verbessern", IDC_CHECK_POINTER_PRECISION, 60, 50, 121, 10 + GROUPBOX "Zur Standardschaltfläche springen", -1, 5, 65, 230, 40 CHECKBOX "", IDC_CHECK_SNAP_TO, 60, 75, 10, 10 ICON -1, IDC_ICON_SNAP_TO, 15, 75, 15, 15 - LTEXT "A&utomatically move pointer to the default button in a dialog box", -1, 73, 75, 152, 20 - GROUPBOX "Visibility", -1, 5, 105, 230, 90 - CHECKBOX "&Display pointer trails", IDC_CHECK_POINTER_TRAIL, 60, 110, 80, 10 + LTEXT "&In Dialogfeldern automatisch zur Standardschaltfläche springen", -1, 73, 75, 152, 20 + GROUPBOX "Sichtbarkeit", -1, 5, 105, 230, 90 + CHECKBOX "&Mausspur anzeigen", IDC_CHECK_POINTER_TRAIL, 60, 110, 80, 10 LTEXT "Kurz", -1, 60, 130, 30, 10 LTEXT "Lang", -1, 160, 130, 30, 10 ICON -1, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 - CHECKBOX "&Hide pointer while typing", IDC_CHECK_HIDE_POINTER, 60, 150, 90, 10 + CHECKBOX "Zeiger bei &Tastatureingaben ausblenden", IDC_CHECK_HIDE_POINTER, 60, 150, 141, 10 ICON -1, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 - CHECKBOX "&Show location of pointer when I press the CTRL key", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 10 + CHECKBOX "Zeigerposition beim Drücken der &STRG-Taste anzeigen", IDC_CHECK_SHOW_POINTER, 60, 175, 173, 10 ICON -1, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 END @@ -114,12 +114,12 @@ CAPTION "Rad" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Scrolling", -1, 5, 5, 230, 80 - LTEXT "Roll the wheel one notch to scroll", -1, 60, 15, 150, 10 - CONTROL "The following &number of lines at a time", IDC_RADIO_WHEEL_SCROLL_LINES, "Button", 0x50010009, 60, 30, 150, 10 + GROUPBOX "Bildlauf", -1, 5, 5, 230, 80 + LTEXT "Durch Drehen des Rades um eine Einbuchtung wird ein Bildlauf durchgeführt um:", -1, 60, 11, 150, 16 + CONTROL "&Folgende Anzahl Zeilen:", IDC_RADIO_WHEEL_SCROLL_LINES, "Button", 0x50010009, 60, 30, 150, 10 EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15,ES_RIGHT | WS_GROUP CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 45, 12, 12 - CONTROL "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, "Button", 0x50010009, 60, 65, 90, 10 + CONTROL "&Eine Bildschirmseite", IDC_RADIO_WHEEL_SCROLL_PAGE, "Button", 0x50010009, 60, 65, 90, 10 ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 END @@ -127,23 +127,23 @@ STRINGTABLE BEGIN IDS_CPLNAME_1 "Maus" - IDS_CPLDESCRIPTION_1 "Mauseinstellungen ändern." + IDS_CPLDESCRIPTION_1 "Mauseinstellungen anpassen." IDS_CPLNAME_2 "Tastatur" - IDS_CPLDESCRIPTION_2 "Tastatureinstellungen ändern." - IDS_ARROW "Normal Select" - IDS_HELP "Help Select" - IDS_APPSTARTING "Working in Background" - IDS_WAIT "Busy" - IDS_CROSSHAIR "Precision Select" - IDS_IBEAM "Text Select" - IDS_NWPEN "Handwriting" - IDS_NO "Unavailable" - IDS_SIZENS "Vertical Resize" - IDS_SIZENWSE "Diagonal Resize 1" - IDS_SIZENESW "Diagonal Resize 2" - IDS_SIZEALL "Move" - IDS_UPARROW "Alternative Select" - IDS_HAND "Link Select" - IDS_NONE "(None)" - IDS_SYSTEM_SCHEME "(systemschema)" + IDS_CPLDESCRIPTION_2 "Tastatureinstellungen anpassen." + IDS_ARROW "Normale Auswahl" + IDS_HELP "Hilfeauswahl" + IDS_APPSTARTING "Hintergrundaktivität" + IDS_WAIT "Ausgelastet" + IDS_CROSSHAIR "Präzisionsauswahl" + IDS_IBEAM "Textauswahl" + IDS_NWPEN "Handschrift" + IDS_NO "Nicht verfügbar" + IDS_SIZENS "Vertikale Größenänderung" + IDS_SIZENWSE "Diagonale Größenänderung 1" + IDS_SIZENESW "Diagonale Größenänderung 2" + IDS_SIZEALL "Verschieben" + IDS_UPARROW "Alternative Auswahl" + IDS_HAND "Verknüpfungsauswahl" + IDS_NONE "(Kein)" + IDS_SYSTEM_SCHEME "(Systemschema)" END Modified: trunk/reactos/dll/cpl/mmsys/De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/mmsys/De.rc?rev=223… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/De.rc (original) +++ trunk/reactos/dll/cpl/mmsys/De.rc Sun Jun 18 23:01:48 2006 @@ -1,4 +1,4 @@ -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN IDD_HARDWARE DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION Modified: trunk/reactos/dll/cpl/ncpa/de.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/ncpa/de.rc?rev=2239… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/de.rc (original) +++ trunk/reactos/dll/cpl/ncpa/de.rc Sun Jun 18 23:01:48 2006 @@ -1,4 +1,4 @@ -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION @@ -59,10 +59,10 @@ CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "IP-Einstellungen können automatisch zugewiesen werden, wenn das Netzwerk diese Funktion unterstützt. Wenden Sie sich andernfalls an den Netzwerkadministrator, um die geeigneten IP-Einstellungen zu beziehen.", -1, 9, 9, 228, 27 + LTEXT "IP-Einstellungen können automatisch zugewiesen werden, wenn das Netzwerk diese Funktion unterstützt. Wenden Sie sich andernfalls an den Netzwerkadministrator, um die geeigneten IP-Einstellungen zu beziehen.", -1, 9, 9, 228, 32 CONTROL "I&P-Adresse automatisch beziehen", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX - CONTROL "Folgende IP-&Adresse verwenden:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 105, 12 + CONTROL "Folgende IP-&Adresse verwenden:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 LTEXT "&IP-Addresse:", -1, 14, 75, 135, 8 CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP,0,150,75-2,80,12 LTEXT "S&ubnetzmaske:", -1, 14, 90, 135, 8 Modified: trunk/reactos/dll/cpl/powercfg/de.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/powercfg/de.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/de.rc (original) +++ trunk/reactos/dll/cpl/powercfg/de.rc Sun Jun 18 23:01:48 2006 @@ -1,6 +1,6 @@ // German (De) resources by Lohnegrim (Lohnegrim at gmx dot net) -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN IDD_PROPPAGEPOWERSHEMES DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION @@ -83,7 +83,7 @@ CONTROL "&Symbol in der Taskleiste anzeigen",IDC_SYSTRAYBATTERYMETER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,200,10 CONTROL "&Kennwort beim Reaktivieren aus dem Standbymodus anfordern",IDC_PASSWORDLOGON,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,15,55,200,10 + WS_TABSTOP,15,55,210,10 CONTROL "&Helligkeit der Anzeige beim Batteriebetrieb verringern",IDC_VIDEODIMDISPLAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,65,200,10 GROUPBOX "Netzschaltervorgänge",-1,5,100,230,105 Modified: trunk/reactos/dll/cpl/powercfg/en.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/powercfg/en.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/en.rc (original) +++ trunk/reactos/dll/cpl/powercfg/en.rc Sun Jun 18 23:01:48 2006 @@ -37,7 +37,7 @@ IDD_PROPPAGEALARMS DIALOG DISCARDABLE 0, 0, 250, 220 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Alarms" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Low battery alarm",-1,10,15,235,95 CONTROL "Activate &low battery alarm when power level reaches:",IDC_ALARM1, @@ -75,7 +75,7 @@ IDD_PROPPAGEADVANCED DIALOG DISCARDABLE 0, 0, 250, 220 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Advanced" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ACDC,IDI_ACDC,5,5,20,20 LTEXT "Select the power-saving settings you want to use.",-1,30,5,205,20 @@ -101,7 +101,7 @@ IDD_PROPPAGEHIBERNATE DIALOG DISCARDABLE 0, 0, 250, 220 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Hibernate" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SCREEN,IDI_SCREEN,5,5,20,20 LTEXT "When your computer hibernates, it stores whatever it has in memory on your hard disk and then shuts down. When your computer comes out of hibernation, it returns to its previous state. ", Modified: trunk/reactos/dll/cpl/sysdm/de.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/sysdm/de.rc?rev=223… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/de.rc (original) +++ trunk/reactos/dll/cpl/sysdm/de.rc Sun Jun 18 23:01:48 2006 @@ -137,7 +137,7 @@ LTEXT "V&ariablen:",-1,14,128,224,8 CONTROL "",IDC_SYSTEM_VARIABLE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_SHOWSELALWAYS|LVS_SORTASCENDING|LVS_NOSORTHEADER|WS_VSCROLL|WS_HSCROLL|WS_TABSTOP,14,139,224,48,WS_EX_CLIENTEDGE PUSHBUTTON "&Neu...",IDC_SYSTEM_VARIABLE_NEW,80,194,50,14 - PUSHBUTTON "&Andern...",IDC_SYSTEM_VARIABLE_EDIT,134,194,50,14 + PUSHBUTTON "&Ändern...",IDC_SYSTEM_VARIABLE_EDIT,134,194,50,14 PUSHBUTTON "&Löschen",IDC_SYSTEM_VARIABLE_DELETE,188,194,50,14 DEFPUSHBUTTON "OK",IDOK,141,224,50,14,WS_GROUP Modified: trunk/reactos/dll/directx/devenum/devenum.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/devenum/devenum… ============================================================================== --- trunk/reactos/dll/directx/devenum/devenum.rc (original) +++ trunk/reactos/dll/directx/devenum/devenum.rc Sun Jun 18 23:01:48 2006 @@ -43,7 +43,7 @@ } STRINGTABLE DISCARDABLE -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN { 7 "Standard DirectSound" 8 "DirectSound: %s" Modified: trunk/reactos/dll/win32/aclui/aclui_De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/aclui/aclui_De.rc… ============================================================================== --- trunk/reactos/dll/win32/aclui/aclui_De.rc (original) +++ trunk/reactos/dll/win32/aclui/aclui_De.rc Sun Jun 18 23:01:48 2006 @@ -1,4 +1,4 @@ -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN IDD_SECPAGE DIALOGEX 0, 0, 227, 215 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION Modified: trunk/reactos/dll/win32/crypt32/crypt32_De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_D… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32_De.rc (original) +++ trunk/reactos/dll/win32/crypt32/crypt32_De.rc Sun Jun 18 23:01:48 2006 @@ -117,7 +117,7 @@ IDS_KEY_RECOVERY_AGENT "Agent zur Schlüsselwiederherstellung" IDS_CERTIFICATE_TEMPLATE "Zertifikatsvorlageninformation" IDS_ENTERPRISE_ROOT_OID "Unternehmensstamm-OID" - IDS_RDN_DUMMY_SIGNER "Attrapenunterzeichner" + IDS_RDN_DUMMY_SIGNER "Atrappenunterzeichner" IDS_ARCHIVED_KEY_ATTR "Verschlüsselter, privater Schlüssel" IDS_CRL_SELF_CDP "Veröffentlichte CRL Standorte" IDS_REQUIRE_CERT_CHAIN_POLICY "Erzwinge Zertifikatskettenrichtlinie" Modified: trunk/reactos/dll/win32/msgina/msgina.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rc?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.rc (original) +++ trunk/reactos/dll/win32/msgina/msgina.rc Sun Jun 18 23:01:48 2006 @@ -15,7 +15,7 @@ STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Log Off ReactOS" LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" { ICON IDI_LOGOFFICON, IDC_LOGOFFICON, 7, 7, 21, 21, SS_ICON | WS_CHILD | WS_VISIBLE LTEXT "Are you sure you want to log off?", -1, 35, 16, 146, 8, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP @@ -27,7 +27,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "Please wait..." LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" { LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_ENDELLIPSIS } Modified: trunk/reactos/dll/win32/newdev/De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/newdev/De.rc?rev=… ============================================================================== --- trunk/reactos/dll/win32/newdev/De.rc (original) +++ trunk/reactos/dll/win32/newdev/De.rc Sun Jun 18 23:01:48 2006 @@ -1,4 +1,4 @@ -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | Modified: trunk/reactos/dll/win32/serialui/serialui.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/serialui/serialui… ============================================================================== --- trunk/reactos/dll/win32/serialui/serialui.rc (original) +++ trunk/reactos/dll/win32/serialui/serialui.rc Sun Jun 18 23:01:48 2006 @@ -27,7 +27,7 @@ END IDD_COMMDLG DIALOGEX 6,5,222,175 -FONT 8,"MS Sans Serif" +FONT 8, "MS Shell Dlg" STYLE 0x10C80080 EXSTYLE 0x00000001 BEGIN Modified: trunk/reactos/dll/win32/syssetup/syssetup_De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetup… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup_De.rc (original) +++ trunk/reactos/dll/win32/syssetup/syssetup_De.rc Sun Jun 18 23:01:48 2006 @@ -17,7 +17,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 @@ -72,7 +72,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Geben sie einen Computernamen ein, der höchstens 63 Zeichen lang ist. "\ - "Wenn Sie im Netzwerk sind muss dieser Name einmalig sein.", + "Wenn Sie im Netzwerk sind, muss dieser Name einmalig sein.", IDC_STATIC, 54, 7, 250, 24 LTEXT "&Computername:", IDC_STATIC, 54, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE @@ -95,17 +95,17 @@ BEGIN LTEXT "Die lokalen Systemeinstellungen sollten mit der Sprache der Anwendungen, "\ "die Sie nutzen wollen übereinstimmen. Die lokalen Nutzereinstellungen geben vor, "\ - "wie Nummern, Währungen und Datumsangaben dargestellt werden.", IDC_STATIC, 53, 7, 253, 20 - LTEXT "<locale text>", IDC_LOCALETEXT, 53, 29, 250, 16 + "wie Nummern, Währungen und Datumsangaben dargestellt werden.", IDC_STATIC, 53, 6, 253, 26 + LTEXT "", IDC_LOCALETEXT, 54, 34, 250, 16 LTEXT "Um die lokalen Nutzer- oder Systemeinstellungen zu ändern, klicken Sie auf Einstellen", - IDC_STATIC, 53, 60, 184, 8 + IDC_STATIC, 53, 57, 188, 15 PUSHBUTTON "&Einstellen...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 LTEXT "Das Tastaturlayout gibt vor, welche Zeichen erscheinen, wenn Sie eine Taste drücken.", IDC_STATIC, 53, 86, 253, 8 - LTEXT "<layout text>", IDC_LAYOUTTEXT, 53, 100, 250, 16 + LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "Um das Tastaturlayout zu ändern, klicken Sie auf Einstellen.", - IDC_STATIC, 53, 126, 184, 8 - PUSHBUTTON "C&ustomize...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 + IDC_STATIC, 53, 126, 189, 8 + PUSHBUTTON "&Einstellen...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 END Modified: trunk/reactos/dll/win32/syssetup/syssetup_En.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetup… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup_En.rc (original) +++ trunk/reactos/dll/win32/syssetup/syssetup_En.rc Sun Jun 18 23:01:48 2006 @@ -96,13 +96,13 @@ LTEXT "The system locale should match the language of the applications "\ "you want to use. The user locale controls how numbers, "\ "currencies, and dates appear.", IDC_STATIC, 53, 7, 253, 20 - LTEXT "<locale text>", IDC_LOCALETEXT, 53, 29, 250, 16 + LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "To change system or user locale settings, click Customize.", IDC_STATIC, 53, 60, 184, 8 PUSHBUTTON "&Customize...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 LTEXT "The keyboard layout controls the characters that appear when you type.", IDC_STATIC, 53, 86, 253, 8 - LTEXT "<layout text>", IDC_LAYOUTTEXT, 53, 100, 250, 16 + LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "To change the keyboard layout, click Customize.", IDC_STATIC, 53, 126, 184, 8 PUSHBUTTON "C&ustomize...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 Modified: trunk/reactos/dll/win32/syssetup/syssetup_Es.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetup… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup_Es.rc (original) +++ trunk/reactos/dll/win32/syssetup/syssetup_Es.rc Sun Jun 18 23:01:48 2006 @@ -102,13 +102,13 @@ LTEXT "La localidad del sistema de ser compatible con la de las aplicaciones "\ "que usted desea usar. La localidad del usuario controla como se representan los numeros, "\ "monedas, y fechas que aparecen en el sistema.", IDC_STATIC, 53, 7, 253, 20 - LTEXT "<locale text>", IDC_LOCALETEXT, 53, 29, 250, 16 + LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "Para cambiar la localidad del sistema o de los usuarios, pulse Modificar.", IDC_STATIC, 53, 60, 184, 8 PUSHBUTTON "&Modificar...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 LTEXT "La disposición de teclado controla los characteres que aparesen cuando usted escribe.", IDC_STATIC, 53, 86, 253, 8 - LTEXT "<layout text>", IDC_LAYOUTTEXT, 53, 100, 250, 16 + LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "Para cambiar la disposición de teclad, pulse Modificar.", IDC_STATIC, 53, 126, 184, 8 PUSHBUTTON "&Modificar...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 Modified: trunk/reactos/dll/win32/syssetup/syssetup_Fr.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetup… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup_Fr.rc (original) +++ trunk/reactos/dll/win32/syssetup/syssetup_Fr.rc Sun Jun 18 23:01:48 2006 @@ -97,13 +97,13 @@ LTEXT "La localisation système correspond à la langue souhaitée "\ "pour les applications. Elle contrôle la manière dont les nombres, "\ "monnaies et dates sont affichées.", IDC_STATIC, 53, 7, 253, 20 - LTEXT "<locale text>", IDC_LOCALETEXT, 53, 29, 250, 16 + LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "Pour changer la localisation système, cliquez sur Modifier.", IDC_STATIC, 53, 60, 184, 8 PUSHBUTTON "&Modifier...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 LTEXT "La configuration clavier contrôle la saisie des touches quand vous tapez.", IDC_STATIC, 53, 86, 253, 8 - LTEXT "<layout text>", IDC_LAYOUTTEXT, 53, 100, 250, 16 + LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "Pour changer la configuration clavier, cliquez sur Modifier.", IDC_STATIC, 53, 126, 184, 8 PUSHBUTTON "M&odifier...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 Modified: trunk/reactos/dll/win32/syssetup/syssetup_Hu.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetup… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup_Hu.rc (original) +++ trunk/reactos/dll/win32/syssetup/syssetup_Hu.rc Sun Jun 18 23:01:48 2006 @@ -92,12 +92,12 @@ LTEXT "A rendszer területi beállítása meghatározzák a használni kívánt nyelvet. "\ "A területi beállítások határozzák meg, hogy a számok, "\ "valuta és dátum információk hogyan jelennek meg.", IDC_STATIC, 53, 7, 253, 24 - LTEXT "<locale text>", IDC_LOCALETEXT, 53, 35, 250, 16 + LTEXT "", IDC_LOCALETEXT, 53, 35, 250, 16 LTEXT "A területi beállítás megváltoztatásához kattints\n" \ "a Kiválasztás gombra.", IDC_STATIC, 53, 56, 184, 16 PUSHBUTTON "&Kiválasztás...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 LTEXT "A billentyûzet kiosztás határozza meg a gombok mûködését.", IDC_STATIC, 53, 86, 253, 8 - LTEXT "<layout text>", IDC_LAYOUTTEXT, 53, 100, 250, 16 + LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "A kiosztás megváltoztatásához kattints a Kiosztás gombra.", IDC_STATIC, 53, 126, 230, 8 PUSHBUTTON "&Kiosztás...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 END Modified: trunk/reactos/dll/win32/syssetup/syssetup_Ja.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetup… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup_Ja.rc (original) +++ trunk/reactos/dll/win32/syssetup/syssetup_Ja.rc Sun Jun 18 23:01:48 2006 @@ -96,13 +96,13 @@ LTEXT "VXeÌP[ðAAvP[VÅgpµ½¢¾êÉÝèµÄ"\ "¾³¢B[U[ P[ÍAlAÊÝAútÌ\\¦û@ð§ä"\ "µÜ·B", IDC_STATIC, 53, 7, 253, 20 - LTEXT "<locale text>", IDC_LOCALETEXT, 53, 29, 250, 16 + LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "VXeâ[U[ÌP[ÝèðÏX·éÉÍA[JX^}CY] ðNbNµÄ¾³¢B", IDC_STATIC, 53, 60, 184, 8 PUSHBUTTON "JX^}CY(&C)...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 LTEXT "L[{[h CAEgÍAL[ðµ½Æ«ÉÇÌ¶ªüÍ³êé©ð§äµÜ·B", IDC_STATIC, 53, 86, 253, 8 - LTEXT "<layout text>", IDC_LAYOUTTEXT, 53, 100, 250, 16 + LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "L[{[h CAEgðÏX·éÉÍA[JX^}CY] ðNbNµÄ¾³¢B", IDC_STATIC, 53, 126, 184, 8 PUSHBUTTON "JX^}CY(&U)...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 Modified: trunk/reactos/dll/win32/syssetup/syssetup_Nl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetup… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup_Nl.rc (original) +++ trunk/reactos/dll/win32/syssetup/syssetup_Nl.rc Sun Jun 18 23:01:48 2006 @@ -96,13 +96,13 @@ LTEXT "The system locale should match the language of the applications "\ "you want to use. The user locale controls how numbers, "\ "currencies, and dates appear.", IDC_STATIC, 53, 7, 253, 20 - LTEXT "<locale text>", IDC_LOCALETEXT, 53, 29, 250, 16 + LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "To change system or user locale settings, click Customize.", IDC_STATIC, 53, 60, 184, 8 PUSHBUTTON "&Customize...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 LTEXT "The keyboard layout controls the characters that appear when you type.", IDC_STATIC, 53, 86, 253, 8 - LTEXT "<layout text>", IDC_LAYOUTTEXT, 53, 100, 250, 16 + LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "To change the keyboard layout, click Customize.", IDC_STATIC, 53, 126, 184, 8 PUSHBUTTON "C&ustomize...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 Modified: trunk/reactos/dll/win32/user32/Da.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/Da.rc?rev=… ============================================================================== --- trunk/reactos/dll/win32/user32/Da.rc (original) +++ trunk/reactos/dll/win32/user32/Da.rc Sun Jun 18 23:01:48 2006 @@ -8,7 +8,7 @@ SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140 STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -FONT 8, "Bitstream Vera Sans" +FONT 8, "MS Shell Dlg" CAPTION "Vælg Vindue" BEGIN LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL Modified: trunk/reactos/dll/win32/user32/De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/De.rc?rev=… ============================================================================== --- trunk/reactos/dll/win32/user32/De.rc (original) +++ trunk/reactos/dll/win32/user32/De.rc Sun Jun 18 23:01:48 2006 @@ -10,7 +10,7 @@ SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140 STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -FONT 8, "Bitstream Vera Sans" +FONT 8, "MS Shell Dlg" CAPTION "Fenster Auswählen" BEGIN LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL Modified: trunk/reactos/dll/win32/user32/En.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/En.rc?rev=… ============================================================================== --- trunk/reactos/dll/win32/user32/En.rc (original) +++ trunk/reactos/dll/win32/user32/En.rc Sun Jun 18 23:01:48 2006 @@ -8,7 +8,7 @@ SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140 STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -FONT 8, "Bitstream Vera Sans" +FONT 8, "MS Shell Dlg" CAPTION "Select Window" BEGIN LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL Modified: trunk/reactos/dll/win32/user32/Es.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/Es.rc?rev=… ============================================================================== --- trunk/reactos/dll/win32/user32/Es.rc (original) +++ trunk/reactos/dll/win32/user32/Es.rc Sun Jun 18 23:01:48 2006 @@ -8,7 +8,7 @@ SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140 STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -FONT 8, "Bitstream Vera Sans" +FONT 8, "MS Shell Dlg" CAPTION "Selecciones Ventana" BEGIN LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL Modified: trunk/reactos/dll/win32/user32/Fr.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/Fr.rc?rev=… ============================================================================== --- trunk/reactos/dll/win32/user32/Fr.rc (original) +++ trunk/reactos/dll/win32/user32/Fr.rc Sun Jun 18 23:01:48 2006 @@ -12,7 +12,7 @@ SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140 STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -FONT 8, "Bitstream Vera Sans" +FONT 8, "MS Shell Dlg" CAPTION "Select Window" BEGIN LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL Modified: trunk/reactos/dll/win32/user32/Hu.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/Hu.rc?rev=… ============================================================================== --- trunk/reactos/dll/win32/user32/Hu.rc (original) +++ trunk/reactos/dll/win32/user32/Hu.rc Sun Jun 18 23:01:48 2006 @@ -12,7 +12,7 @@ SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140 STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -FONT 8, "Bitstream Vera Sans" +FONT 8, "MS Shell Dlg" CAPTION "Select Window" BEGIN LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL Modified: trunk/reactos/dll/win32/user32/Nl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/Nl.rc?rev=… ============================================================================== --- trunk/reactos/dll/win32/user32/Nl.rc (original) +++ trunk/reactos/dll/win32/user32/Nl.rc Sun Jun 18 23:01:48 2006 @@ -8,7 +8,7 @@ SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140 STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -FONT 8, "Bitstream Vera Sans" +FONT 8, "MS Shell Dlg" CAPTION "Selecteer venster" BEGIN LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL Modified: trunk/reactos/dll/win32/user32/Pl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/Pl.rc?rev=… ============================================================================== --- trunk/reactos/dll/win32/user32/Pl.rc (original) +++ trunk/reactos/dll/win32/user32/Pl.rc Sun Jun 18 23:01:48 2006 @@ -10,7 +10,7 @@ SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140 STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -FONT 8, "Bitstream Vera Sans" +FONT 8, "MS Shell Dlg" CAPTION "Wybieranie okna" BEGIN LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL Modified: trunk/reactos/dll/win32/user32/Sv.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/Sv.rc?rev=… ============================================================================== --- trunk/reactos/dll/win32/user32/Sv.rc (original) +++ trunk/reactos/dll/win32/user32/Sv.rc Sun Jun 18 23:01:48 2006 @@ -28,7 +28,7 @@ SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140 STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -FONT 8, "Bitstream Vera Sans" +FONT 8, "MS Shell Dlg" CAPTION "Välj fönster" BEGIN LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL Modified: trunk/reactos/dll/win32/userenv/De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/userenv/De.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/userenv/De.rc (original) +++ trunk/reactos/dll/win32/userenv/De.rc Sun Jun 18 23:01:48 2006 @@ -16,7 +16,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN STRINGTABLE BEGIN Modified: trunk/reactos/dll/win32/winmm/winmm_De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/winmm/winmm_De.rc… ============================================================================== --- trunk/reactos/dll/win32/winmm/winmm_De.rc (original) +++ trunk/reactos/dll/win32/winmm/winmm_De.rc Sun Jun 18 23:01:48 2006 @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN BEGIN /* MMSYS errors */ @@ -45,7 +45,7 @@ MIDIERR_NOMAP, "Es wurde keine MIDI - Map gefunden. Es könnte ein Problem mit dem Treiber geben oder die Datei MIDIMAP.CFG fehlt oder ist beschädigt." MIDIERR_NOTREADY, "Der Anschluss ist mit der Datenausgabe belegt. Warten Sie, bis die Daten übertragen wurden und versuchen Sie es erneut." MIDIERR_NODEVICE, "Das gegenwärtige MIDI - Mapper Setup benutzt ein MIDI - Gerät, das nicht installiert ist. Benutzen Sie den MIDI - Mapper, um das Setup zu ändern." -MIDIERR_INVALIDSETUP, "Das aktuelle MIDI Setup ist beschädigt. Kopieren sie die ursprüngliche Datei MIDIMAP.CFG ind das ReactOS - Systemverzeichnis und versuchen Sie es erneut." +MIDIERR_INVALIDSETUP, "Das aktuelle MIDI Setup ist beschädigt. Kopieren sie die ursprüngliche Datei MIDIMAP.CFG in das ReactOS - Systemverzeichnis und versuchen Sie es erneut." /* MCI errors */ MCIERR_INVALID_DEVICE_ID, "Ungültige MCI - Gerätekennung. Benutzen Sie die zurückgegebene ID, wenn Sie das MCI - Gerät öffnen." Modified: trunk/reactos/subsystems/ntvdm/De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/ntvdm/De.rc?rev=… ============================================================================== --- trunk/reactos/subsystems/ntvdm/De.rc (original) +++ trunk/reactos/subsystems/ntvdm/De.rc Sun Jun 18 23:01:48 2006 @@ -4,7 +4,7 @@ * By Rouven Wessling 2005 pentiumforever(a)gmail.com */ -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN STRINGTABLE DISCARDABLE { Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/csrss/win3… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rc (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rc Sun Jun 18 23:01:48 2006 @@ -14,7 +14,7 @@ IDD_END_NOW DIALOG DISCARDABLE 0, 0, 200, 95 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "End Program - " -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN LTEXT "Ending Program... Please wait",IDC_STATIC,7,7,186,11 CONTROL "Progress",IDC_PROGRESS,"msctls_progress32",WS_BORDER, @@ -27,7 +27,7 @@ IDD_NOT_RESPONDING DIALOG DISCARDABLE 0, 0, 192, 122 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "End Program - " -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Cancel",IDCANCEL,142,98,43,17 PUSHBUTTON "&End Now",IDC_END_NOW,78,98,43,17

1 0

[ekohl] 22391: Implement CM_Get_HW_Prof_Flags[_Ex]A/W and add PNP_HwProfFlags stub.
by ekohl＠svn.reactos.org 18 Jun '06

18 Jun '06

Author: ekohl Date: Sun Jun 18 18:36:42 2006 New Revision: 22391 URL: http://svn.reactos.ru/svn/reactos?rev=22391&view=rev Log: Implement CM_Get_HW_Prof_Flags[_Ex]A/W and add PNP_HwProfFlags stub. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/setupapi.spec trunk/reactos/include/ddk/cfgmgr32.h trunk/reactos/include/reactos/idl/pnp.idl trunk/reactos/include/reactos/wine/cfgmgr32.h Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/services/umpnpmgr/umpn… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Sun Jun 18 18:36:42 2006 @@ -1222,6 +1222,27 @@ } +/* Function 40 */ +CONFIGRET +PNP_HwProfFlags(handle_t BindingHandle, + unsigned long Action, + wchar_t *DeviceId, + unsigned long ProfileId, + unsigned long *Value, // out + unsigned long Flags) +{ + CONFIGRET ret = CR_SUCCESS; + + DPRINT1("PNP_HwProfFlags() called\n"); + + ret = CR_CALL_NOT_IMPLEMENTED; /* FIXME */ + + DPRINT1("PNP_HwProfFlags() done (returns %lx)\n", ret); + + return ret; +} + + /* Function 58 */ CONFIGRET PNP_RunDetection(handle_t BindingHandle, Modified: trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/cfgmgr32/cfgmgr32… ============================================================================== --- trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def (original) +++ trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def Sun Jun 18 18:36:42 2006 @@ -117,10 +117,10 @@ ;CM_Get_First_Log_Conf_Ex CM_Get_Global_State(a)8=SETUPAPI.CM_Get_Global_State CM_Get_Global_State_Ex(a)12=SETUPAPI.CM_Get_Global_State_Ex -;CM_Get_HW_Prof_FlagsA -;CM_Get_HW_Prof_FlagsW -;CM_Get_HW_Prof_Flags_ExA -;CM_Get_HW_Prof_Flags_ExW +CM_Get_HW_Prof_FlagsA(a)16=SETUPAPI.CM_Get_HW_Prof_FlagsA +CM_Get_HW_Prof_FlagsW(a)16=SETUPAPI.CM_Get_HW_Prof_FlagsW +CM_Get_HW_Prof_Flags_ExA(a)20=SETUPAPI.CM_Get_HW_Prof_Flags_ExA +CM_Get_HW_Prof_Flags_ExW(a)20=SETUPAPI.CM_Get_HW_Prof_Flags_ExW ;CM_Get_Hardware_Profile_InfoA ;CM_Get_Hardware_Profile_InfoW ;CM_Get_Hardware_Profile_Info_ExA Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c Sun Jun 18 18:36:42 2006 @@ -1779,6 +1779,102 @@ } return PNP_GetGlobalState(BindingHandle, pulState, ulFlags); +} + + +/*********************************************************************** + * CM_Get_HW_Prof_FlagsA [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_HW_Prof_FlagsA( + DEVINSTID_A szDevInstName, ULONG ulHardwareProfile, PULONG pulValue, + ULONG ulFlags) +{ + TRACE("%s %lu %p %lx\n", szDevInstName, + ulHardwareProfile, pulValue, ulFlags); + + return CM_Get_HW_Prof_Flags_ExA(szDevInstName, ulHardwareProfile, + pulValue, ulFlags, NULL); +} + + +/*********************************************************************** + * CM_Get_HW_Prof_FlagsW [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_HW_Prof_FlagsW( + DEVINSTID_W szDevInstName, ULONG ulHardwareProfile, PULONG pulValue, + ULONG ulFlags) +{ + TRACE("%s %lu %p %lx\n", debugstr_w(szDevInstName), + ulHardwareProfile, pulValue, ulFlags); + + return CM_Get_HW_Prof_Flags_ExW(szDevInstName, ulHardwareProfile, + pulValue, ulFlags, NULL); +} + + +/*********************************************************************** + * CM_Get_HW_Prof_Flags_ExA [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_HW_Prof_Flags_ExA( + DEVINSTID_A szDevInstName, ULONG ulHardwareProfile, PULONG pulValue, + ULONG ulFlags, HMACHINE hMachine) +{ + DEVINSTID_W pszDevIdW = NULL; + CONFIGRET ret = CR_SUCCESS; + + TRACE("%s %lu %p %lx %lx\n", szDevInstName, + ulHardwareProfile, pulValue, ulFlags, hMachine); + + if (szDevInstName != NULL) + { + if (CaptureAndConvertAnsiArg(szDevInstName, &pszDevIdW)) + return CR_INVALID_DEVICE_ID; + } + + ret = CM_Get_HW_Prof_Flags_ExW(pszDevIdW, ulHardwareProfile, + pulValue, ulFlags, hMachine); + + if (pszDevIdW != NULL) + MyFree(pszDevIdW); + + return ret; +} + + +/*********************************************************************** + * CM_Get_HW_Prof_Flags_ExW [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_HW_Prof_Flags_ExW( + DEVINSTID_W szDevInstName, ULONG ulHardwareProfile, PULONG pulValue, + ULONG ulFlags, HMACHINE hMachine) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + + FIXME("%s %lu %p %lx %lx\n", debugstr_w(szDevInstName), + ulHardwareProfile, pulValue, ulFlags, hMachine); + + if ((szDevInstName == NULL) || (pulValue == NULL)) + return CR_INVALID_POINTER; + + if (ulFlags != 0) + return CR_INVALID_FLAG; + + /* FIXME: Check whether szDevInstName is valid */ + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, NULL)) + return CR_FAILURE; + } + + return PNP_HwProfFlags(BindingHandle, PNP_GET_HW_PROFILE_FLAGS, szDevInstName, + ulHardwareProfile, pulValue, 0); } Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/setupapi… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec Sun Jun 18 18:36:42 2006 @@ -101,10 +101,10 @@ @ stub CM_Get_First_Log_Conf_Ex @ stdcall CM_Get_Global_State(ptr long) @ stdcall CM_Get_Global_State_Ex(ptr long long) -@ stub CM_Get_HW_Prof_FlagsA -@ stub CM_Get_HW_Prof_FlagsW -@ stub CM_Get_HW_Prof_Flags_ExA -@ stub CM_Get_HW_Prof_Flags_ExW +@ stdcall CM_Get_HW_Prof_FlagsA(str long ptr long) +@ stdcall CM_Get_HW_Prof_FlagsW(wstr long ptr long) +@ stdcall CM_Get_HW_Prof_Flags_ExA(str long ptr long long) +@ stdcall CM_Get_HW_Prof_Flags_ExW(wstr long ptr long long) @ stub CM_Get_Hardware_Profile_InfoA @ stub CM_Get_Hardware_Profile_InfoW @ stub CM_Get_Hardware_Profile_Info_ExA Modified: trunk/reactos/include/ddk/cfgmgr32.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/ddk/cfgmgr32.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/cfgmgr32.h (original) +++ trunk/reactos/include/ddk/cfgmgr32.h Sun Jun 18 18:36:42 2006 @@ -1428,8 +1428,52 @@ /* FIXME: Obsolete CM_Get_Hardware_Profile_Info */ /* FIXME: Obsolete CM_Get_Hardware_Profile_Info_Ex */ -/* FIXME: Obsolete CM_Get_HW_Prof_Flags */ -/* FIXME: Obsolete CM_Get_HW_Prof_Flags_Ex */ + +CMAPI +CONFIGRET +WINAPI +CM_Get_HW_Prof_FlagsA( + IN DEVINSTID_A szDevInstName, + IN ULONG ulHardwareProfile, + OUT PULONG pulValue, + IN ULONG ulFlags); + +CMAPI +CONFIGRET +WINAPI +CM_Get_HW_Prof_FlagsW( + IN DEVINSTID_W szDevInstName, + IN ULONG ulHardwareProfile, + OUT PULONG pulValue, + IN ULONG ulFlags); + +CMAPI +CONFIGRET +WINAPI +CM_Get_HW_Prof_Flags_ExA( + IN DEVINSTID_A szDevInstName, + IN ULONG ulHardwareProfile, + OUT PULONG pulValue, + IN ULONG ulFlags, + IN HMACHINE hMachine); + +CMAPI +CONFIGRET +WINAPI +CM_Get_HW_Prof_Flags_ExW( + IN DEVINSTID_W szDevInstName, + IN ULONG ulHardwareProfile, + OUT PULONG pulValue, + IN ULONG ulFlags, + IN HMACHINE hMachine); + +#ifdef UNICODE +#define CM_Get_HW_Prof_Flags CM_Get_HW_Prof_FlagsW +#define CM_Get_HW_Prof_Flags_Ex CM_Get_HW_Prof_Flags_ExW +#else +#define CM_Get_HW_Prof_Flags CM_Get_HW_Prof_FlagsA +#define CM_Get_HW_Prof_Flags_Ex CM_Get_HW_Prof_Flags_ExA +#endif /* UNICODE */ CMAPI CONFIGRET Modified: trunk/reactos/include/reactos/idl/pnp.idl URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/reactos/idl/pnp.idl… ============================================================================== --- trunk/reactos/include/reactos/idl/pnp.idl (original) +++ trunk/reactos/include/reactos/idl/pnp.idl Sun Jun 18 18:36:42 2006 @@ -187,6 +187,16 @@ /* Function 39 */ CONFIGRET PNP_RequestEjectPC(handle_t BindingHandle); + /* Function 40 */ + cpp_quote("#define PNP_SET_HW_PROFILE_FLAGS 0") + cpp_quote("#define PNP_GET_HW_PROFILE_FLAGS 1") + CONFIGRET PNP_HwProfFlags(handle_t BindingHandle, + [in] DWORD Action, + [in, string] wchar_t *DeviceId, + [in] DWORD ProfileId, + [in, out] unsigned long *Value, + [in] DWORD Flags); + /* Function 58 */ CONFIGRET PNP_RunDetection(handle_t BindingHandle, [in] unsigned long Flags); Modified: trunk/reactos/include/reactos/wine/cfgmgr32.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/reactos/wine/cfgmgr… ============================================================================== --- trunk/reactos/include/reactos/wine/cfgmgr32.h (original) +++ trunk/reactos/include/reactos/wine/cfgmgr32.h Sun Jun 18 18:36:42 2006 @@ -270,6 +270,12 @@ CONFIGRET WINAPI CM_Get_Device_ID_Size_Ex( PULONG, DEVINST, ULONG, HMACHINE ); CONFIGRET WINAPI CM_Get_Global_State( PULONG, ULONG ); CONFIGRET WINAPI CM_Get_Global_State_Ex( PULONG, ULONG, HMACHINE ); +CONFIGRET WINAPI CM_Get_HW_Prof_FlagsA( DEVINSTID_A, ULONG, PULONG, ULONG ); +CONFIGRET WINAPI CM_Get_HW_Prof_FlagsW( DEVINSTID_W, ULONG, PULONG, ULONG ); +#define CM_Get_HW_Prof_Flags WINELIB_NAME_AW(CM_Get_HW_Prof_Flags) +CONFIGRET WINAPI CM_Get_HW_Prof_Flags_ExA( DEVINSTID_A, ULONG, PULONG, ULONG, HMACHINE ); +CONFIGRET WINAPI CM_Get_HW_Prof_Flags_ExW( DEVINSTID_W, ULONG, PULONG, ULONG, HMACHINE ); +#define CM_Get_HW_Prof_Flags_Ex WINELIB_NAME_AW(CM_Get_HW_Prof_Flags_Ex) CONFIGRET WINAPI CM_Get_Parent( PDEVINST, DEVINST, ULONG ); CONFIGRET WINAPI CM_Get_Parent_Ex( PDEVINST, DEVINST, ULONG, HMACHINE ); CONFIGRET WINAPI CM_Get_Sibling( PDEVINST, DEVINST, ULONG );

1 0

[janderwald] 22390: specify CF_INITTOLOGFONTSTRUCT flag to auto-select current font in font selection dialog.c bug report by tsg1zzn fixes bug 1561
by janderwald＠svn.reactos.org 18 Jun '06

18 Jun '06

Author: janderwald Date: Sun Jun 18 18:13:03 2006 New Revision: 22390 URL: http://svn.reactos.ru/svn/reactos?rev=22390&view=rev Log: specify CF_INITTOLOGFONTSTRUCT flag to auto-select current font in font selection dialog.c bug report by tsg1zzn fixes bug 1561 Modified: trunk/reactos/base/applications/notepad/dialog.c Modified: trunk/reactos/base/applications/notepad/dialog.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/notepad/d… ============================================================================== --- trunk/reactos/base/applications/notepad/dialog.c (original) +++ trunk/reactos/base/applications/notepad/dialog.c Sun Jun 18 18:13:03 2006 @@ -670,7 +670,7 @@ cf.lStructSize=sizeof(cf); cf.hwndOwner=Globals.hMainWnd; cf.lpLogFont=&lf; - cf.Flags=CF_SCREENFONTS; + cf.Flags=CF_SCREENFONTS | CF_INITTOLOGFONTSTRUCT; if( ChooseFont(&cf) ) {

1 0

[fireball] 22389: Patch by Mikhail Y. Zvyozdochkin (mzvyozd at narod dot ru): Simplify compilation under Linux.
by fireball＠svn.reactos.org 17 Jun '06

17 Jun '06

Author: fireball Date: Sun Jun 18 00:28:53 2006 New Revision: 22389 URL: http://svn.reactos.ru/svn/reactos?rev=22389&view=rev Log: Patch by Mikhail Y. Zvyozdochkin (mzvyozd at narod dot ru): Simplify compilation under Linux. Modified: trunk/reactos/tools/xml.cpp Modified: trunk/reactos/tools/xml.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/xml.cpp?rev=22389&r1=… ============================================================================== --- trunk/reactos/tools/xml.cpp (original) +++ trunk/reactos/tools/xml.cpp Sun Jun 18 00:28:53 2006 @@ -25,6 +25,8 @@ # include <io.h> #else # include <sys/stat.h> +# include <unistd.h> +# include <ctype.h> # define MAX_PATH PATH_MAX #endif #include <assert.h>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs