Ros-diffs July 2007

ros-diffs@reactos.org

20 participants
707 discussions

[weiden] 27706: Revert r27705. This change is incorrect and breaks MDI applications.
by weiden＠svn.reactos.org 17 Jul '07

17 Jul '07

Author: weiden Date: Tue Jul 17 17:51:00 2007 New Revision: 27706 URL: http://svn.reactos.org/svn/reactos?rev=27706&view=rev Log: Revert r27705. This change is incorrect and breaks MDI applications. Modified: trunk/reactos/dll/win32/user32/windows/window.c Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c (original) +++ trunk/reactos/dll/win32/user32/windows/window.c Tue Jul 17 17:51:00 2007 @@ -193,10 +193,6 @@ ControlsInitialized = ControlsInit(ClassName.Buffer); } - /* remove DS_SHELLFONT style because it conflicts with WS_EX_MDICHILD */ - if (dwExStyle & DS_SHELLFONT) - dwExStyle &= ~DS_SHELLFONT; - if (dwExStyle & WS_EX_MDICHILD) { POINT mPos[2];

1 0

[cwittich] 27705: -forgot to save the file before committing - this is the actual fix from 27703
by cwittich＠svn.reactos.org 16 Jul '07

16 Jul '07

Author: cwittich Date: Tue Jul 17 03:02:29 2007 New Revision: 27705 URL: http://svn.reactos.org/svn/reactos?rev=27705&view=rev Log: -forgot to save the file before committing - this is the actual fix from 27703 Modified: trunk/reactos/dll/win32/user32/windows/window.c Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c (original) +++ trunk/reactos/dll/win32/user32/windows/window.c Tue Jul 17 03:02:29 2007 @@ -193,6 +193,10 @@ ControlsInitialized = ControlsInit(ClassName.Buffer); } + /* remove DS_SHELLFONT style because it conflicts with WS_EX_MDICHILD */ + if (dwExStyle & DS_SHELLFONT) + dwExStyle &= ~DS_SHELLFONT; + if (dwExStyle & WS_EX_MDICHILD) { POINT mPos[2];

1 0

[cwittich] 27704: -don't set DS_SHELLFONT as EXSTYLE
by cwittich＠svn.reactos.org 16 Jul '07

16 Jul '07

Author: cwittich Date: Tue Jul 17 02:57:35 2007 New Revision: 27704 URL: http://svn.reactos.org/svn/reactos?rev=27704&view=rev Log: -don't set DS_SHELLFONT as EXSTYLE Modified: trunk/reactos/base/applications/games/winemine/lang/bg-BG.rc trunk/reactos/base/applications/games/winemine/lang/de-DE.rc trunk/reactos/base/applications/games/winemine/lang/el-GR.rc trunk/reactos/base/applications/games/winemine/lang/en-US.rc trunk/reactos/base/applications/games/winemine/lang/es-ES.rc trunk/reactos/base/applications/games/winemine/lang/fr-FR.rc trunk/reactos/base/applications/games/winemine/lang/id-ID.rc trunk/reactos/base/applications/games/winemine/lang/it-IT.rc trunk/reactos/base/applications/games/winemine/lang/nb-NO.rc trunk/reactos/base/applications/games/winemine/lang/nl-NL.rc trunk/reactos/base/applications/games/winemine/lang/pl-PL.rc trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc trunk/reactos/base/applications/games/winemine/lang/th-TH.rc trunk/reactos/base/applications/games/winemine/lang/uk-UA.rc trunk/reactos/base/applications/games/winemine/lang/zh-CN.rc Modified: trunk/reactos/base/applications/games/winemine/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/bg-BG.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/bg-BG.rc Tue Jul 17 02:57:35 2007 @@ -28,10 +28,9 @@ } DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Fastest Times" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { GROUPBOX "Íàé- êúñè âðåìåíà", IDNONE, 10, 10, 140, 45 LTEXT "Íà÷èíàåù", IDNONE, 20, 20, 40, 8 @@ -47,10 +46,9 @@ } DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Ïîçäðàâè!" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "Âúâåäåòå èìåòî ñè", IDIGNORE, 10, 10, 150, 10 EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 @@ -58,10 +56,9 @@ } DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Íàãîäåíà èãðà" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "Ðåäà", IDNONE, 5, 5, 30, 10 LTEXT "Ñòúëáà", IDNONE, 5, 35, 30, 10 @@ -74,10 +71,9 @@ } DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Çà" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "Winemine", IDNONE, 10, 10, 35, 10 LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 Modified: trunk/reactos/base/applications/games/winemine/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/de-DE.rc Tue Jul 17 02:57:35 2007 @@ -27,10 +27,9 @@ } DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Bestzeiten" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { GROUPBOX "Bestzeiten", IDNONE, 10, 10, 140, 45 LTEXT "Anfänger", IDNONE, 20, 20, 40, 8 @@ -46,10 +45,9 @@ } DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Glückwunsch!" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "Bitte geben Sie ihren Namen ein", IDIGNORE, 10, 10, 150, 10 EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 @@ -57,10 +55,9 @@ } DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Benutzerdefiniertes Spiel" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "Zeilen", IDNONE, 5, 5, 30, 10 LTEXT "Spalten", IDNONE, 5, 35, 30, 10 @@ -73,10 +70,9 @@ } DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Über" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "Winemine", IDNONE, 10, 10, 35, 10 LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 Modified: trunk/reactos/base/applications/games/winemine/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/el-GR.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/el-GR.rc Tue Jul 17 02:57:35 2007 @@ -28,10 +28,9 @@ } DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Ãñçãïñüôåñïé ×ñüíïé" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { GROUPBOX "Ãñçãïñüôåñïé ×ñüíïé", IDNONE, 10, 10, 140, 45 LTEXT "Áñ÷Üñéïò", IDNONE, 20, 20, 40, 8 @@ -47,10 +46,9 @@ } DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Óõã÷áñçôÞñéá!" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "Ðáñáêáëþ óõìðëçñþóôå ôï üíïìÜ óáò", IDIGNORE, 10, 10, 150, 10 EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 @@ -58,10 +56,9 @@ } DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Ðñïóùðéêü Ðáé÷íßäé" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "ÃñáììÝò", IDNONE, 5, 5, 30, 10 LTEXT "ÓôÞëåò", IDNONE, 5, 35, 30, 10 @@ -74,10 +71,9 @@ } DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Ó÷åôéêÜ..." FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "Winemine", IDNONE, 10, 10, 35, 10 LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 Modified: trunk/reactos/base/applications/games/winemine/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/en-US.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/en-US.rc Tue Jul 17 02:57:35 2007 @@ -28,10 +28,9 @@ } DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Fastest Times" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { GROUPBOX "Fastest Times", IDNONE, 10, 10, 140, 45 LTEXT "Beginner", IDNONE, 20, 20, 40, 8 @@ -47,10 +46,9 @@ } DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Congratulations!" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "Please enter your name", IDIGNORE, 10, 10, 150, 10 EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 @@ -58,10 +56,9 @@ } DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Custom Game" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "Rows", IDNONE, 5, 5, 30, 10 LTEXT "Cols", IDNONE, 5, 35, 30, 10 @@ -74,10 +71,9 @@ } DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "About" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "Winemine", IDNONE, 10, 10, 35, 10 LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 Modified: trunk/reactos/base/applications/games/winemine/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/es-ES.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/es-ES.rc Tue Jul 17 02:57:35 2007 @@ -28,10 +28,9 @@ } DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Fastest Times" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { GROUPBOX "Mejores Tiempos", IDNONE, 10, 10, 140, 45 LTEXT "Principiante", IDNONE, 20, 20, 40, 8 @@ -47,10 +46,9 @@ } DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "¡Felicidades!" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "Por Favor, introduce tu nombre", IDIGNORE, 10, 10, 150, 10 EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 @@ -58,10 +56,9 @@ } DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Juego Personalizado" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "Filas", IDNONE, 5, 5, 30, 10 LTEXT "Columnas", IDNONE, 5, 35, 30, 10 @@ -74,10 +71,9 @@ } DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Acerca de" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "Winemine", IDNONE, 10, 10, 35, 10 LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 Modified: trunk/reactos/base/applications/games/winemine/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/fr-FR.rc Tue Jul 17 02:57:35 2007 @@ -34,10 +34,9 @@ } DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Temps accéléré" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { GROUPBOX "Temps accéléré", IDNONE, 10, 10, 140, 45 LTEXT "Débutant", IDNONE, 20, 20, 40, 8 @@ -53,10 +52,9 @@ } DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Félicitations!" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "Veuillez entrer votre nom :", IDNONE, 10, 10, 150, 10 EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 @@ -64,10 +62,9 @@ } DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Sur mesure" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "Lignes", IDNONE, 5, 5, 30, 10 LTEXT "Colonnes", IDNONE, 5, 35, 30, 10 @@ -80,10 +77,9 @@ } DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "À propos" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "Winemine", IDNONE, 10, 10, 35, 10 LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 Modified: trunk/reactos/base/applications/games/winemine/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/id-ID.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/id-ID.rc Tue Jul 17 02:57:35 2007 @@ -27,10 +27,9 @@ } DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Waktu Tercepat" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { GROUPBOX "Waktu Tercepat", IDNONE, 10, 10, 140, 45 LTEXT "Pemula", IDNONE, 20, 20, 40, 8 @@ -46,10 +45,9 @@ } DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Selamat!" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "Silahkan masukkan nama anda", IDIGNORE, 10, 10, 150, 10 EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 @@ -57,10 +55,9 @@ } DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Game Kustom" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "Baris", IDNONE, 5, 5, 30, 10 LTEXT "Kolom", IDNONE, 5, 35, 30, 10 @@ -73,10 +70,9 @@ } DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Tentang" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "Winemine", IDNONE, 10, 10, 35, 10 LTEXT "Hak Cipta 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 Modified: trunk/reactos/base/applications/games/winemine/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/it-IT.rc Tue Jul 17 02:57:35 2007 @@ -28,10 +28,9 @@ } DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Tempi migliori" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { GROUPBOX "Tempi migliori", IDNONE, 10, 10, 140, 45 LTEXT "Principiante", IDNONE, 20, 20, 40, 8 @@ -47,10 +46,9 @@ } DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Complimenti!" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "Digita il tuo nome per favore", IDIGNORE, 10, 10, 150, 10 EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 @@ -58,10 +56,9 @@ } DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Campo personalizzato" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "Righe", IDNONE, 5, 5, 30, 10 LTEXT "Colonne", IDNONE, 5, 35, 30, 10 @@ -74,10 +71,9 @@ } DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Informazioni su Prato fiorito" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "Campo fiorito", IDNONE, 10, 10, 35, 10 LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 Modified: trunk/reactos/base/applications/games/winemine/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/nb-NO.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/nb-NO.rc Tue Jul 17 02:57:35 2007 @@ -29,7 +29,7 @@ DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Beste tider" { GROUPBOX "Beste tider", IDNONE, 10, 10, 140, 45 @@ -47,7 +47,7 @@ DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "gratulerer!" { LTEXT "Skriv inn navnet ditt", IDIGNORE, 10, 10, 150, 10 @@ -57,7 +57,7 @@ DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Egendefinert spill" { LTEXT "Høyde", IDNONE, 5, 5, 30, 10 @@ -72,7 +72,7 @@ DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Om" { LTEXT "Minesveiper", IDNONE, 10, 10, 35, 10 Modified: trunk/reactos/base/applications/games/winemine/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/nl-NL.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/nl-NL.rc Tue Jul 17 02:57:35 2007 @@ -28,10 +28,9 @@ } DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Beste tijd" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { GROUPBOX "Beste tijd", IDNONE, 10, 10, 140, 45 LTEXT "Beginner", IDNONE, 20, 20, 40, 8 @@ -47,10 +46,9 @@ } DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Gefeleciteerd!" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "Gelieve uw naam in te voeren", IDIGNORE, 10, 10, 150, 10 EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 @@ -58,10 +56,9 @@ } DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Aangepast spel" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "Rijen", IDNONE, 5, 5, 30, 10 LTEXT "Kolommen", IDNONE, 5, 35, 30, 10 @@ -74,10 +71,9 @@ } DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Over" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "WineMine", IDNONE, 10, 10, 35, 10 LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 Modified: trunk/reactos/base/applications/games/winemine/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/pl-PL.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/pl-PL.rc Tue Jul 17 02:57:35 2007 @@ -36,7 +36,7 @@ DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Najlepsze czasy" { GROUPBOX "Najlepsze czasy", IDNONE, 10, 10, 140, 45 @@ -54,7 +54,7 @@ DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Gratulacje!" { LTEXT "Wpisz swoje imiê", IDNONE, 10, 10, 150, 10 @@ -64,7 +64,7 @@ DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Ustawienia gry" { LTEXT "Iloæ rzêdów", IDNONE, 5, 5, 30, 10 @@ -79,7 +79,7 @@ DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Winemine - informacje" { LTEXT "Winemine", IDNONE, 10, 10, 35, 10 Modified: trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc Tue Jul 17 02:57:35 2007 @@ -30,10 +30,9 @@ } DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Ëó÷øåå âðåìÿ" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { GROUPBOX "Ëó÷øåå âðåìÿ", IDNONE, 10, 10, 140, 45 LTEXT "Íîâè÷îê", IDNONE, 20, 20, 40, 8 @@ -49,10 +48,9 @@ } DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Ïîçäðàâëÿåì!" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "Ïîæàëóéñòâà ââåäèòå âàøå èìÿ", IDIGNORE, 10, 10, 150, 10 EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 @@ -60,10 +58,9 @@ } DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Îñîáàÿ èãðà" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "Âûñîòà", IDNONE, 5, 5, 30, 10 LTEXT "Øèðèíà", IDNONE, 5, 35, 30, 10 @@ -76,10 +73,9 @@ } DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Î ïðîãðàììå" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "Ñàïåð", IDNONE, 10, 10, 35, 10 LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 Modified: trunk/reactos/base/applications/games/winemine/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/th-TH.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/th-TH.rc Tue Jul 17 02:57:35 2007 @@ -28,10 +28,9 @@ } DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "àÇÅÒ·ÕèàÃçÇ·ÕèÊØ´" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { GROUPBOX "àÇÅÒ·ÕèàÃçÇ·ÕèÊØ´", IDNONE, 10, 10, 140, 45 LTEXT "àÃÔèÁµé¹", IDNONE, 20, 20, 40, 8 @@ -47,10 +46,9 @@ } DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "¢ÍáÊ´§¤ÇÒÁÂÔ¹´Õ´éÇÂ!" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "â»Ã´¡ÃÍ¡ª×èÍ¢Í§¤Ø³", IDIGNORE, 10, 10, 150, 10 EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 @@ -58,10 +56,9 @@ } DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "à¡ÁÃÐ´Ñº¤¹·ÑèÇä»" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "á¶Ç", IDNONE, 5, 5, 30, 10 LTEXT "ËÅÑ¡", IDNONE, 5, 35, 30, 10 @@ -74,10 +71,9 @@ } DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "à¡ÕèÂÇ¡Ñº" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "Winemine", IDNONE, 10, 10, 35, 10 LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 Modified: trunk/reactos/base/applications/games/winemine/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/uk-UA.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/uk-UA.rc Tue Jul 17 02:57:35 2007 @@ -36,10 +36,9 @@ } DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Êðàù³ ÷àñè" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { GROUPBOX "Êðàù³ ÷àñè", IDNONE, 10, 10, 140, 45 LTEXT "Ïî÷àòê³âåöü", IDNONE, 20, 20, 40, 8 @@ -55,10 +54,9 @@ } DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Â³òàííÿ!" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "Ââåä³òü Âàøå ³ì'ÿ", IDIGNORE, 10, 10, 150, 10 EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 @@ -66,10 +64,9 @@ } DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "Îñîáëèâà ãðà" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "Âèñîòà", IDNONE, 5, 5, 30, 10 LTEXT "Øèðèíà", IDNONE, 5, 35, 30, 10 @@ -82,10 +79,9 @@ } DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "About" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { LTEXT "Ñàïåð", IDNONE, 10, 10, 35, 10 LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 Modified: trunk/reactos/base/applications/games/winemine/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/zh-CN.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/zh-CN.rc Tue Jul 17 02:57:35 2007 @@ -49,7 +49,7 @@ } DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT FONT 9, "MS Shell Dlg" CAPTION "É¨À×Ó¢ÐÛ°ñ" { @@ -68,7 +68,7 @@ DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT FONT 9, "MS Shell Dlg" CAPTION "Ë¢ÐÂ¼ÍÂ¼!" { @@ -79,7 +79,7 @@ DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT FONT 9, "MS Shell Dlg" CAPTION "×Ô¶¨ÒåÀ×Çø" { @@ -95,7 +95,7 @@ DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT FONT 9, "MS Shell Dlg" CAPTION "¹ØÓÚÉ¨À×" {

1 0

[cwittich] 27703: -get rid of DS_SHELLFONT when set as EXSTYLE, it is a STYLE flag See issue #2289 for more details.
by cwittich＠svn.reactos.org 16 Jul '07

16 Jul '07

Author: cwittich Date: Tue Jul 17 02:56:04 2007 New Revision: 27703 URL: http://svn.reactos.org/svn/reactos?rev=27703&view=rev Log: -get rid of DS_SHELLFONT when set as EXSTYLE, it is a STYLE flag See issue #2289 for more details. Modified: trunk/reactos/dll/win32/user32/windows/dialog.c Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c Tue Jul 17 02:56:04 2007 @@ -611,7 +611,7 @@ } /* First control is on dword boundary */ - return (LPCSTR)((((int)p) + 3) & ~3); + return (LPCSTR)((((UINT_PTR)p) + 3) & ~3); } /***********************************************************************

1 0

[cfinck] 27702: Readd the removed line from the patch and add more information about the Usage of the "-f" option (see comment #6 of bug #2379) The "-f" option now works like in Windows: If you did not specify any other parameter, it will also log off from the current session.
by cfinck＠svn.reactos.org 16 Jul '07

16 Jul '07

Author: cfinck Date: Tue Jul 17 01:50:50 2007 New Revision: 27702 URL: http://svn.reactos.org/svn/reactos?rev=27702&view=rev Log: Readd the removed line from the patch and add more information about the Usage of the "-f" option (see comment #6 of bug #2379) The "-f" option now works like in Windows: If you did not specify any other parameter, it will also log off from the current session. Modified: trunk/reactos/base/applications/shutdown/shutdown.c Modified: trunk/reactos/base/applications/shutdown/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/shutdown.c (original) +++ trunk/reactos/base/applications/shutdown/shutdown.c Tue Jul 17 01:50:50 2007 @@ -19,6 +19,8 @@ _tprintf(_T("\n -s\t\t\tShutdown the computer")); _tprintf(_T("\n -r\t\t\tShutdown and restart the computer")); _tprintf(_T("\n -f\t\t\tForces running applications to close without warnings")); + _tprintf(_T("\n \t\t\tIf you did not specify any other parameter, this option")); + _tprintf(_T("\n \t\t\twill also log off")); _tprintf(_T("\n")); } @@ -96,7 +98,13 @@ // Sets additional flags if (opts.force) + { exitOpts.flags = exitOpts.flags | EWX_FORCE; + + // This makes sure that we log off, also if there is only the "-f" option specified. + // The Windows shutdown utility does it the same way. + exitOpts.shouldExit = TRUE; + } // Reason for shutdown // Hardcoded to "Other (Planned)"

1 0

[cfinck] 27701: - Cleaned up the whole HTML code of the Documentation - Converted the files to the more common UTF-8 encoding - Deleted the old 256x256 RosBE PNG icon with alpha transparency and added a 128x128 JPG icon without any transparency, so the icon does not need to be resized and IE 6 and older display it correctly
by cfinck＠svn.reactos.org 16 Jul '07

16 Jul '07

Author: cfinck Date: Tue Jul 17 01:34:15 2007 New Revision: 27701 URL: http://svn.reactos.org/svn/reactos?rev=27701&view=rev Log: - Cleaned up the whole HTML code of the Documentation - Converted the files to the more common UTF-8 encoding - Deleted the old 256x256 RosBE PNG icon with alpha transparency and added a 128x128 JPG icon without any transparency, so the icon does not need to be resized and IE 6 and older display it correctly Added: trunk/tools/RosBE-Windows/Documentation/files/ trunk/tools/RosBE-Windows/Documentation/files/RosBE.jpg (with props) trunk/tools/RosBE-Windows/Documentation/files/adv.html - copied, changed from r27700, trunk/tools/RosBE-Windows/Documentation/adv.html trunk/tools/RosBE-Windows/Documentation/files/basic.html - copied, changed from r27700, trunk/tools/RosBE-Windows/Documentation/basic.html trunk/tools/RosBE-Windows/Documentation/files/credits.html - copied, changed from r27700, trunk/tools/RosBE-Windows/Documentation/credits.html trunk/tools/RosBE-Windows/Documentation/files/features.html - copied, changed from r27700, trunk/tools/RosBE-Windows/Documentation/features.html trunk/tools/RosBE-Windows/Documentation/files/int.html - copied, changed from r27700, trunk/tools/RosBE-Windows/Documentation/int.html trunk/tools/RosBE-Windows/Documentation/files/intro.html - copied, changed from r27700, trunk/tools/RosBE-Windows/Documentation/intro.html trunk/tools/RosBE-Windows/Documentation/files/main.html - copied, changed from r27700, trunk/tools/RosBE-Windows/Documentation/main.html trunk/tools/RosBE-Windows/Documentation/files/menu.html - copied, changed from r27700, trunk/tools/RosBE-Windows/Documentation/menu.html Removed: trunk/tools/RosBE-Windows/Documentation/adv.html trunk/tools/RosBE-Windows/Documentation/basic.html trunk/tools/RosBE-Windows/Documentation/credits.html trunk/tools/RosBE-Windows/Documentation/features.html trunk/tools/RosBE-Windows/Documentation/int.html trunk/tools/RosBE-Windows/Documentation/intro.html trunk/tools/RosBE-Windows/Documentation/main.html trunk/tools/RosBE-Windows/Documentation/menu.html trunk/tools/RosBE-Windows/Documentation/pic.png Modified: trunk/tools/RosBE-Windows/Documentation/index.html Removed: trunk/tools/RosBE-Windows/Documentation/adv.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/adv.html (original) +++ trunk/tools/RosBE-Windows/Documentation/adv.html (removed) @@ -1,12 +1,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> - <title>Advanced Features</title> - <meta content="Daniel Reimer" name="author"> - <meta content="Lists the Advanced Features of RosBE" - name="description"> -</head> -<body> -SVN 1.4.4 is included in RosBE. Manual can be found here: -</body> -</html> Removed: trunk/tools/RosBE-Windows/Documentation/basic.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/basic.html (original) +++ trunk/tools/RosBE-Windows/Documentation/basic.html (removed) @@ -1,91 +1,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> - <title>Basic Features</title> - <meta content="Daniel Reimer" name="author"> - <meta content="Lists the Basic Features of RosBE" name="description"> -</head> -<body> -"make" -Usage: make [OPTIONS1] [OPTIONS2] -The command to build the ReactOS Source Tree in the Default directory. -Without options it does a standard build of ReactOS. OPTIONS1 are the -standard ReactOS build options ie. "bootcd", "livecd", etc. -"strip" as optional second parameter sets stripping to enabled and thus -reduces File Size by ~30% and Minimum needed RAM to use ReactOS to ~24 -MB. ISOs built with this command are NOT usable to file bugs in any way! - -"makex" -Usage: makex [OPTIONS1] [OPTIONS2] -Same as 'make' but automatically determines the number of CPU Cores in -your system and uses "make -j x" with the appropriate number to -threaden the build process for a massive speedup on Multi Core Systems. -NOTE: The number makex uses can be modified by editing Build-Multi.cmd -located in the RosBE directory, instructions for doing so are contained -within the file. This Command is incompatible to Windows Vista right -now due to a bug in GCC 4.X.X. - -"clean" -Usage: clean [logs] -Fully cleans the ReactOS source directory and does a better job than -"make clean" does. -It deletes files, which are being generated into the Source Tree while -compiling. After using this Command the tree is completely cleaned up -and 1:1 like a fresh loaded one. -   logs - Removes all build logs in the RosBE-Logs directory. - -"help" -Usage: help [COMMAND] -Shows help for the specified command or lists all available commands. - -"ssvn" -Usage: ssvn [OPTIONS] -This is the simple to use sSVN, written for newbies. It only Creates, -Updates or cleans up your ReactOS Source Tree or shows the Revision -Number of the Offline Tree and Online HEAD Revision to see if its up to -date. No need for any additional parameters, just "ssvn update" and -your Tree is fully updated. -   update  - Updates to HEAD Revision or to a specific -one when second parameter specifies one. -   create  - Creates a new ReactOS Source Tree and got -some Security Features. It -checks if the folder is empty, contains a Source Tree or any other -files and Cancels if continuing is unsecure. -   cleanup - Cleans up and fixes errors in the Source Tree. -It is mainly needed if the "ssvn update" or "ssvn create" command got -aborted in any way or show problems like error messages etc. -   status  - Shows Actual offline Revision Number and -online HEAD Revision Number to see if its up to date. - -"chdefdir" -Usage: chdefdir [OPTIONS] -Reconfigures the Default Source Folder for one Session. This is useful -for switching between branches or different ReactOS Source Trees. -Exiting RosBE sets back to the Default. -   default - Sets back to the Default Source Folder without a -restart of RosBE. - -"config" -Usage: config [OPTIONS] -This Command creates a Configuration File, which tells RosBE how to -build the Tree. There are many things you can modify in the build -process and this tool can edit all for you. ISOs made with a non -default are NOT usable to file bugs in any way! -   delete - Deletes the created configuration File and so -sets back to default settings. - -"raddr2line" -Usage: raddr2line [OPTIONS] -This Command translates program addresses of BSODs into file names and -line numbers of the Code it was built of to assist Developers to find -specific Bugs in ReactOS. This Tool is mainly a Dev Tool. Newbies -normally only need it if a devs wants them to try out something. -USAGE: The first parameter has to be the Executable to be analyzed. The -second one has to be the address to be translated. If you don't set the -needed Parameters, you will be asked for them. - -"basedir" -Usage: basedir -Switches back to the ReactOS source directory. -</body> -</html> Removed: trunk/tools/RosBE-Windows/Documentation/credits.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/credits.html (original) +++ trunk/tools/RosBE-Windows/Documentation/credits.html (removed) @@ -1,26 +1,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> - <title>Credits</title> - <meta content="Daniel Reimer" name="author"> - <meta content="Lists the Credits of the RosBE Staff" - name="description"> -</head> -<body> -This Build Environment is inspired by blight's ReactOS Build -Environment v0.2-3.4.5 -and Dazzle from TinyKRNL (<a href="http://www.tinykrnl.org/">http://www.tinykrnl.org/</a>) - -Originally Coded by Peter "dralnix" Ward (<a - href="mailto:dralnix@gmail.com">dralnix(a)gmail.com</a>) until Version -0.3.5B2 -Work continued by -Daniel "EmuandCo" Reimer (<a href="mailto:reimer.daniel@freenet.de">reimer.daniel(a)freenet.de</a>) -up to now. -*nix Version made and Maintained by Colin Finck (<a - href="mailto:mail@colinfinck.de">mail(a)colinfinck.de</a>) -up to now. - -Icon made by ROSFan. -</body> -</html> Removed: trunk/tools/RosBE-Windows/Documentation/features.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/features.html (original) +++ trunk/tools/RosBE-Windows/Documentation/features.html (removed) @@ -1,18 +1,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> - <title>Features</title> - <meta content="Daniel Reimer" name="author"> - <meta content="Lists the Features of RosBE" name="description"> -</head> -<body> -- Creating, Cleaning and Updating the Tree with included SVN and sSVN. -- Building the Source (Multi Core Optimized)* -- Maintain Several Trees at once. -- Configure the Tree Settings with an easy to use editor. -- Help for Debugging, thanks to included GDB and raddr2line. -- Support for non Admin Rights Account.* - -* = No Support for Windows Vista! -</body> -</html> Added: trunk/tools/RosBE-Windows/Documentation/files/RosBE.jpg URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/RosBE-Windows/Documentation/files/RosBE.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Copied: trunk/tools/RosBE-Windows/Documentation/files/adv.html (from r27700, trunk/tools/RosBE-Windows/Documentation/adv.html) URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/adv.html (original) +++ trunk/tools/RosBE-Windows/Documentation/files/adv.html Tue Jul 17 01:34:15 2007 @@ -1,12 +1,12 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> - <title>Advanced Features</title> - <meta content="Daniel Reimer" name="author"> - <meta content="Lists the Advanced Features of RosBE" - name="description"> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Advanced Features</title> + <meta name="author" content="Daniel Reimer"> + <meta name="description" content="Lists the Advanced Features of RosBE"> </head> <body> -SVN 1.4.4 is included in RosBE. Manual can be found here: + SVN 1.4.4 is included in RosBE. Manual can be found here: </body> -</html> +</html> Copied: trunk/tools/RosBE-Windows/Documentation/files/basic.html (from r27700, trunk/tools/RosBE-Windows/Documentation/basic.html) URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/basic.html (original) +++ trunk/tools/RosBE-Windows/Documentation/files/basic.html Tue Jul 17 01:34:15 2007 @@ -1,9 +1,10 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> - <title>Basic Features</title> - <meta content="Daniel Reimer" name="author"> - <meta content="Lists the Basic Features of RosBE" name="description"> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Basic Features</title> + <meta content="Daniel Reimer" name="author"> + <meta content="Lists the Basic Features of RosBE" name="description"> </head> <body> "make" @@ -86,6 +87,6 @@ "basedir" Usage: basedir -Switches back to the ReactOS source directory. +Switches back to the ReactOS source directory. </body> -</html> +</html> Copied: trunk/tools/RosBE-Windows/Documentation/files/credits.html (from r27700, trunk/tools/RosBE-Windows/Documentation/credits.html) URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/credits.html (original) +++ trunk/tools/RosBE-Windows/Documentation/files/credits.html Tue Jul 17 01:34:15 2007 @@ -1,10 +1,10 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> - <title>Credits</title> - <meta content="Daniel Reimer" name="author"> - <meta content="Lists the Credits of the RosBE Staff" - name="description"> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Credits</title> + <meta name="author" content="Daniel Reimer"> + <meta name="description" content="Lists the Credits of the RosBE Staff"> </head> <body> This Build Environment is inspired by blight's ReactOS Build @@ -21,6 +21,6 @@ href="mailto:mail@colinfinck.de">mail(a)colinfinck.de</a>) up to now. -Icon made by ROSFan. +Icon made by ROSFan. </body> -</html> +</html> Copied: trunk/tools/RosBE-Windows/Documentation/files/features.html (from r27700, trunk/tools/RosBE-Windows/Documentation/features.html) URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/features.html (original) +++ trunk/tools/RosBE-Windows/Documentation/files/features.html Tue Jul 17 01:34:15 2007 @@ -1,18 +1,21 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> - <title>Features</title> - <meta content="Daniel Reimer" name="author"> - <meta content="Lists the Features of RosBE" name="description"> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Features</title> + <meta content="Daniel Reimer" name="author"> + <meta content="Lists the Features of RosBE" name="description"> </head> <body> -- Creating, Cleaning and Updating the Tree with included SVN and sSVN. -- Building the Source (Multi Core Optimized)* -- Maintain Several Trees at once. -- Configure the Tree Settings with an easy to use editor. -- Help for Debugging, thanks to included GDB and raddr2line. -- Support for non Admin Rights Account.* - -* = No Support for Windows Vista! + <ul> + <li>Creating, Cleaning and Updating the Tree with included SVN and sSVN.</li> + <li>Building the Source (Multi Core Optimized)*</li> + <li>Maintain Several Trees at once.</li> + <li>Configure the Tree Settings with an easy to use editor.</li> + <li>Help for Debugging, thanks to included GDB and raddr2line.</li> + <li>Support for non Admin Rights Account.*</li> + </ul> + + * = This Feature is not supported under Windows Vista! </body> -</html> +</html> Copied: trunk/tools/RosBE-Windows/Documentation/files/int.html (from r27700, trunk/tools/RosBE-Windows/Documentation/int.html) URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/int.html (original) +++ trunk/tools/RosBE-Windows/Documentation/files/int.html Tue Jul 17 01:34:15 2007 @@ -1,9 +1,10 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> - <title>Introduction</title> - <meta content="Daniel Reimer" name="author"> - <meta content="Shows the Introduction to RosBE" name="description"> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Introduction</title> + <meta name="author" content="Daniel Reimer"> + <meta name="description" content="Shows the Introduction to RosBE"> </head> <body> First of all, lets answer the main question: What is RosBE? @@ -27,6 +28,6 @@ features. Devs will be happy with the included GDB and raddr2line. Multi Core PC Users will love "makex" which automatically detects the -number of CPU Cores and optimizes the Build process to that Number. +number of CPU Cores and optimizes the Build process to that Number. </body> </html> Copied: trunk/tools/RosBE-Windows/Documentation/files/intro.html (from r27700, trunk/tools/RosBE-Windows/Documentation/intro.html) URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/intro.html (original) +++ trunk/tools/RosBE-Windows/Documentation/files/intro.html Tue Jul 17 01:34:15 2007 @@ -1,32 +1,19 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> - <meta content="text/html; charset=ISO-8859-15" - http-equiv="content-type"> - <title>RosBE Logo and Title</title> - <meta content="Daniel Reimer" name="author"> - <meta content="Shows the official RosBE Logo and Title" - name="description"> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>RosBE Logo and Title</title> + <meta name="author" content="Daniel Reimer"> + <meta name="description" content="Shows the official RosBE Logo and Title"> </head> <body> -<div style="text-align: center;"> -<table style="text-align: left; width: 100%;" border="0" cellpadding="0" - cellspacing="0"> - <tbody> - <tr> - <td style="vertical-align: top;"><img - style="width: 128px; height: 128px;" alt="ReactOS Logo" - title="ReactOS Logo" src="pic.png"></td> - <td style="vertical-align: top; text-align: center;"><big><big><big>  -Documentation -for RosBE for Microsoft® -Windows© -and ReactOS Based Operating Systems</big></big></big></td> - </tr> - </tbody> -</table> -<big><big><big></big></big></big></div> + <table width="100%"> + <tr> + <td><img src="RosBE.jpg" alt="RosBE Logo"></td> + <td style="text-align: center; font-weight: bold; font-style: italic; font-size: 24pt;"> + Documentation for RosBE for Microsoft® Windows NT®-based Operating Systems + </td> + </tr> + </table> </body> -</html> +</html> Copied: trunk/tools/RosBE-Windows/Documentation/files/main.html (from r27700, trunk/tools/RosBE-Windows/Documentation/main.html) URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/main.html (original) +++ trunk/tools/RosBE-Windows/Documentation/files/main.html Tue Jul 17 01:34:15 2007 @@ -1,14 +1,14 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> - <title>RosBE Documentation Welcome Page</title> - <meta content="Daniel Reimer" name="author"> - <meta content="Shows the RosBE Documentation Welcome Page" - name="description"> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>RosBE Documentation Welcome Page</title> + <meta name="author" content="Daniel Reimer"> + <meta name="description" content="Shows the RosBE Documentation Welcome Page"> </head> <body> Welcome to ReactOS Build Environment for Windows. This Documentation was made to assist you -in building and maintaining the Source Code of ReactOS. +in building and maintaining the Source Code of ReactOS. </body> -</html> +</html> Copied: trunk/tools/RosBE-Windows/Documentation/files/menu.html (from r27700, trunk/tools/RosBE-Windows/Documentation/menu.html) URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/menu.html (original) +++ trunk/tools/RosBE-Windows/Documentation/files/menu.html Tue Jul 17 01:34:15 2007 @@ -1,29 +1,19 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> - <meta http-equiv="content-type" - content="text/html; charset=ISO-8859-15"> - <title>RosBE Documentation Menu</title> - <meta content="Daniel Reimer" name="author"> - <meta content="Shows the entries of the RosBE Documentation Menu" - name="description"> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>RosBE Documentation Menu</title> + <meta name="author" content="Daniel Reimer"> + <meta name="description" content="Shows the entries of the RosBE Documentation Menu"> + <base target="main"> </head> -<body alink="#0000ee" link="#0000ee" vlink="#551a8b"> -<a href="main.html" target="text"></a>Index: - -<a target="main" href="int.html">1. Introduction</a> - -<a target="main" href="features.html">2. Features</a> - -<a target="main" href="basic.html">3. Basic Functions</a> - -<a target="main" href="adv.html">4. Advanced Functions</a> - -<a target="main" href="credits.html">5. Credits</a> - +<body> + Index: + + <a href="int.html">1. Introduction</a> + <a href="features.html">2. Features</a> + <a href="basic.html">3. Basic Functions</a> + <a href="adv.html">4. Advanced Functions</a> + <a href="credits.html">5. Credits</a> </body> -</html> +</html> Modified: trunk/tools/RosBE-Windows/Documentation/index.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/index.html (original) +++ trunk/tools/RosBE-Windows/Documentation/index.html Tue Jul 17 01:34:15 2007 @@ -1,24 +1,17 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd"> <html> <head> - <title>ReactOS Documentation</title> - <meta http-equiv="content-type" - content="text/html; charset=ISO-8859-1"> - <meta content="Daniel Reimer" name="author"> - <meta content="Index Frame Site of RosBE Documentation" - name="description"> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>ReactOS Build Environment Documentation</title> + <meta name="author" content="Daniel Reimer"> + <meta name="description" content="Index Frame Site of RosBE Documentation"> </head> -<frameset cols="13%,87%"> - <frameset rows="*,0"> - <frame name="menu" src="menu.html" noresize="noresize"> +<frameset cols="180,*"> + <frame name="menu" src="files/menu.html" noresize> + + <frameset rows="160,*"> + <frame name="intro" src="files/intro.html" noresize frameborder="no" scrolling="no"> + <frame name="main" src="files/main.html" noresize frameborder="no"> + </frameset> </frameset> -<frameset rows="22%,78%"> - <frame name="intro" src="intro.html" noresize="noresize" frameborder="no" scrolling="no"> - <frame name="main" src="main.html" noresize="noresize" frameborder="no"> -</frameset> -<noframes> This is a FrameSet Document: <UL> - <LI> <A href="intro.html">Index</A> - <LI> <A href="main.html">MainPage</A> </UL> -</noframes> -</frameset> -</html> +</html> Removed: trunk/tools/RosBE-Windows/Documentation/int.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/int.html (original) +++ trunk/tools/RosBE-Windows/Documentation/int.html (removed) @@ -1,32 +1,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> - <title>Introduction</title> - <meta content="Daniel Reimer" name="author"> - <meta content="Shows the Introduction to RosBE" name="description"> -</head> -<body> -First of all, lets answer the main question: What is RosBE? -Its a -Environment for building ReactOS on your own, its based on GCC 4.1.3 -Compiler and aims to be the one and only Build Environment for absolute -Beginners up to skilled devs. - -Realizing this wide spectrum in one BE is quite difficult of course. -How, as an example, do you tell a newbie how -to use SVN or maintain/update a Source tree? -Easy. This package has the -typical, well known SVN for all advanced devs and a slim Version -specially made for newbies, called sSVN (Simple SVN), which only does -the main stuff and has no difficult to understand or even dangerous, if -wrong used, functions. Additionally it checks the working folder, if -its empty or not. If its no empty folder, it does not even allow the -User to continue. - -And this is just the beginning of a big list of -features. -Devs will be happy with the included GDB and raddr2line. -Multi Core PC Users will love "makex" which automatically detects the -number of CPU Cores and optimizes the Build process to that Number. -</body> -</html> Removed: trunk/tools/RosBE-Windows/Documentation/intro.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/intro.html (original) +++ trunk/tools/RosBE-Windows/Documentation/intro.html (removed) @@ -1,32 +1,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> - <meta content="text/html; charset=ISO-8859-15" - http-equiv="content-type"> - <title>RosBE Logo and Title</title> - <meta content="Daniel Reimer" name="author"> - <meta content="Shows the official RosBE Logo and Title" - name="description"> -</head> -<body> -<div style="text-align: center;"> -<table style="text-align: left; width: 100%;" border="0" cellpadding="0" - cellspacing="0"> - <tbody> - <tr> - <td style="vertical-align: top;"><img - style="width: 128px; height: 128px;" alt="ReactOS Logo" - title="ReactOS Logo" src="pic.png"></td> - <td style="vertical-align: top; text-align: center;"><big><big><big>  -Documentation -for RosBE for Microsoft® -Windows© -and ReactOS Based Operating Systems</big></big></big></td> - </tr> - </tbody> -</table> -<big><big><big></big></big></big></div> -</body> -</html> Removed: trunk/tools/RosBE-Windows/Documentation/main.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/main.html (original) +++ trunk/tools/RosBE-Windows/Documentation/main.html (removed) @@ -1,14 +1,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> - <title>RosBE Documentation Welcome Page</title> - <meta content="Daniel Reimer" name="author"> - <meta content="Shows the RosBE Documentation Welcome Page" - name="description"> -</head> -<body> -Welcome to ReactOS Build Environment for Windows. This Documentation -was made to assist you -in building and maintaining the Source Code of ReactOS. -</body> -</html> Removed: trunk/tools/RosBE-Windows/Documentation/menu.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/menu.html (original) +++ trunk/tools/RosBE-Windows/Documentation/menu.html (removed) @@ -1,29 +1,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> - <meta http-equiv="content-type" - content="text/html; charset=ISO-8859-15"> - <title>RosBE Documentation Menu</title> - <meta content="Daniel Reimer" name="author"> - <meta content="Shows the entries of the RosBE Documentation Menu" - name="description"> -</head> -<body alink="#0000ee" link="#0000ee" vlink="#551a8b"> -<a href="main.html" target="text"></a>Index: - -<a target="main" href="int.html">1. Introduction</a> - -<a target="main" href="features.html">2. Features</a> - -<a target="main" href="basic.html">3. Basic Functions</a> - -<a target="main" href="adv.html">4. Advanced Functions</a> - -<a target="main" href="credits.html">5. Credits</a> - -</body> -</html> Removed: trunk/tools/RosBE-Windows/Documentation/pic.png URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== Binary file - no diff available.

1 0

[janderwald] 27700: - add ukrainian translation by Artem Reznikov See issue #2411 for more details.
by janderwald＠svn.reactos.org 16 Jul '07

16 Jul '07

Author: janderwald Date: Mon Jul 16 23:30:12 2007 New Revision: 27700 URL: http://svn.reactos.org/svn/reactos?rev=27700&view=rev Log: - add ukrainian translation by Artem Reznikov See issue #2411 for more details. Added: trunk/reactos/base/applications/cacls/lang/uk-UA.rc (with props) trunk/reactos/base/applications/charmap/lang/uk-UA.rc (with props) trunk/reactos/base/applications/mmc/lang/uk-UA.rc (with props) trunk/reactos/base/applications/msconfig/lang/uk-UA.rc (with props) trunk/reactos/base/applications/regedit/clb/lang/uk-UA.rc (with props) Modified: trunk/reactos/base/applications/cacls/rsrc.rc trunk/reactos/base/applications/charmap/rsrc.rc trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc trunk/reactos/base/applications/mmc/rsrc.rc trunk/reactos/base/applications/msconfig/rsrc.rc trunk/reactos/base/applications/regedit/clb/rsrc.rc trunk/reactos/base/shell/explorer/explorer-uk.rc trunk/reactos/dll/win32/comdlg32/cdlg_Uk.rc trunk/reactos/dll/win32/console/lang/uk-UA.rc trunk/reactos/dll/win32/devmgr/lang/uk-UA.rc trunk/reactos/dll/win32/userenv/lang/uk-UA.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/uk-UA.rc Added: trunk/reactos/base/applications/cacls/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… ============================================================================== --- trunk/reactos/base/applications/cacls/lang/uk-UA.rc (added) +++ trunk/reactos/base/applications/cacls/lang/uk-UA.rc Mon Jul 16 23:30:12 2007 @@ -1,0 +1,81 @@ +/* + * PROJECT: ReactOS CACLS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: applications/cacls/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for PROJECT + * TRANSLATOR: Rostislav Zabolotny + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + +IDS_HELP, "Â³äîáðàæàº ÷è ìîäèô³êóº ñïèñêè äîñòóïó (ACLs) äî ôàéë³â\n\n\ +CACLS ³ì'ÿ_ôàéëó [/T] [/E] [/C] [/G êîðèñòóâà÷:ïðàâà [...]] [/R êîðèñòóâà÷ [...]]\n\ + [/P êîðèñòóâà÷:ïðàâà [...]] [/D êîðèñòóâà÷ [...]]\n\ + ³ì'ÿ_ôàéëó Âèâåäåííÿ ³ñíóþ÷èõ ACL.\n\ + /T Çì³íà ACL âêàçàíèõ ôàéë³â â\n\ + ïîòî÷í³é ïàïö³ ³ âñ³õ ï³äïàïêàõ.\n\ + /E Ðåäàãóâàííÿ ACL çàì³ñòü çàì³íè.\n\ + /C Ïðîäîâæåííÿ ï³ñëÿ ïîìèëîê â³äìîâè â äîñòóï³.\n\ + /G êîðèñòóâà÷:ïðàâà Íàäàííÿ âêàçàíîìó êîðèñòóâà÷ó ïåâíèõ ïðàâ.\n\ + Âèäè ïðàâ: R ×èòàòè\n\ + W Çàïèñóâàòè\n\ + C Çì³íþâàòè (çàïèñóâàòè)\n\ + F Ïîâíèé äîñòóï\n\ + /R êîðèñòóâà÷ Ñêàñóâàòè ïðàâà äîñòóïó âêàçàíîãî êîðèñòóâà÷à(êîððåêòíî ò³ëüêè ç /E).\n\ + /P êîðèñòóâà÷:ïðàâà Çàì³íèòè âêàçàí³ ïðàâà êîðèñòóâà÷à.\n\ + Âèäè ïðàâ: R ×èòàòè\n\ + W Çàïèñóâàòè\n\ + C Çì³íþâàòè (çàïèñóâàòè)\n\ + F Ïîâíèé äîñòóï\n\ + /D êîðèñòóâà÷ Çàáîðîíèòè äîñòóï âêàçàíîìó êîðèñòóâà÷åâ³.\n\ +Ìîæíà âèêîðèñòîâóâàòè øàáëîíè äëÿ îáðîáêè á³ëüøå í³æ îäíîãî ôàéëó çà êîìàíäó.\n\ +Ìîæíà âêàçóâàòè á³ëüøå í³æ îäíîãî êîðèñòóâà÷à çà êîìàíäó.\n\n\ +Ñêîðî÷åííÿ:\n\ + CI - Êîíòåéíåðíå Óñïàäêóâàííÿ.(Container Inherit)\n\ + ACE áóäå óñïàäêîâóâàòèñÿ ïàïêàìè.\n\ + OI - Îá'ºêòíå Óñïàäêóâàííÿ.(Object Inherit)\n\ + ACE áóäå óñïàäêîâóâàòèñÿ ôàéëàìè.\n\ + IO - Ò³ëüêè Óñïàäêóâàííÿ.(Inherit Only)\n\ + ACE íå áóäå çàñòîñîâàíèé äëÿ ïîòî÷íîãî ôàéëà/ïàïêè.\n" + +IDS_ABBR_CI, "(CI)" +IDS_ABBR_OI, "(OI)" +IDS_ABBR_IO, "(IO)" +IDS_ABBR_FULL, "F" +IDS_ABBR_READ, "R" +IDS_ABBR_WRITE, "W" +IDS_ABBR_CHANGE, "C" +IDS_ABBR_NONE, "N" +IDS_ALLOW, "" +IDS_DENY, "(DENY)" +IDS_SPECIAL_ACCESS, "(ñïåö³àëüíèé äîñòóï:)" +IDS_GENERIC_READ, "GENERIC_READ" +IDS_GENERIC_WRITE, "GENERIC_WRITE" +IDS_GENERIC_EXECUTE, "GENERIC_EXECUTE" +IDS_GENERIC_ALL, "GENERIC_ALL" +IDS_FILE_GENERIC_EXECUTE, "FILE_GENERIC_EXECUTE" +IDS_FILE_GENERIC_READ, "FILE_GENERIC_READ" +IDS_FILE_GENERIC_WRITE, "FILE_GENERIC_WRITE" +IDS_FILE_READ_DATA, "FILE_READ_DATA" +IDS_FILE_WRITE_DATA, "FILE_WRITE_DATA" +IDS_FILE_APPEND_DATA, "FILE_APPEND_DATA" +IDS_FILE_READ_EA, "FILE_READ_EA" +IDS_FILE_WRITE_EA, "FILE_WRITE_EA" +IDS_FILE_EXECUTE, "FILE_EXECUTE" +IDS_FILE_DELETE_CHILD, "FILE_DELETE_CHILD" +IDS_FILE_READ_ATTRIBUTES, "FILE_READ_ATTRIBUTES" +IDS_FILE_WRITE_ATTRIBUTES, "FILE_WRITE_ATTRIBUTES" +IDS_MAXIMUM_ALLOWED, "MAXIMUM_ALLOWED" +IDS_ACCESS_SYSTEM_SECURITY, "ACCESS_SYSTEM_SECURITY" +IDS_SPECIFIC_RIGHTS_ALL, "SPECIFIC_RIGHTS_ALL" +IDS_STANDARD_RIGHTS_REQUIRED, "STANDARD_RIGHTS_REQUIRED" +IDS_SYNCHRONIZE, "SYNCHRONIZE" +IDS_WRITE_OWNER, "WRITE_OWNER" +IDS_WRITE_DAC, "WRITE_DAC" +IDS_READ_CONTROL, "READ_CONTROL" +IDS_DELETE, "DELETE" +IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL" +} Propchange: trunk/reactos/base/applications/cacls/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cacls/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/rs… ============================================================================== --- trunk/reactos/base/applications/cacls/rsrc.rc (original) +++ trunk/reactos/base/applications/cacls/rsrc.rc Mon Jul 16 23:30:12 2007 @@ -18,4 +18,5 @@ #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" +#include "lang/uk-UA.rc" #include "lang/zh-CN.rc" Added: trunk/reactos/base/applications/charmap/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/uk-UA.rc (added) +++ trunk/reactos/base/applications/charmap/lang/uk-UA.rc Mon Jul 16 23:30:12 2007 @@ -1,0 +1,43 @@ +/* + * PROJECT: ReactOS Character Map + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/charmap/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for charmap + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 +CAPTION "Òàáëèöÿ ñèìâîë³â" +FONT 8,"MS Sans Serif",0,0 +STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +BEGIN + LTEXT "Øðèôò :", IDC_STATIC, 6, 7, 24, 9 + COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS + PUSHBUTTON "Äîâ³äêà", IDC_CMHELP, 249, 5, 35, 13 + CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 + LTEXT "Äëÿ êîï³þâàííÿ :", IDC_STATIC, 6, 188, 66, 9 + EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "Âèáðàòè", IDC_SELECT, 194, 186, 46, 13 + PUSHBUTTON "Êîï³þâàòè", IDC_COPY, 244, 186, 46, 13, WS_DISABLED + //AUTOCHECKBOX "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP + //EDITTEXT IDC_DISPLAY, 8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY +END + +IDD_ABOUTBOX DIALOGEX 22,16,210,182 +CAPTION "Ïðî Òàáëèöþ ñèìâîë³â" +FONT 8,"MS Sans Serif",0,0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "Òàáëèöÿ ñèìâîë³â v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 + PUSHBUTTON "Çàêðèòè", IDOK, 75, 162, 44, 15 + ICON IDI_ICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." + IDS_ABOUT "&Ïðî Òàáëèöþ ñèìâîë³â..." +END Propchange: trunk/reactos/base/applications/charmap/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/charmap/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/rsrc.rc (original) +++ trunk/reactos/base/applications/charmap/rsrc.rc Mon Jul 16 23:30:12 2007 @@ -15,4 +15,5 @@ #include "lang/id-ID.rc" #include "lang/it-IT.rc" #include "lang/pl-PL.rc" +#include "lang/uk-UA.rc" #include "lang/ru-RU.rc" Modified: trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc Mon Jul 16 23:30:12 2007 @@ -14,16 +14,16 @@ IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Options" +CAPTION "Ïàðàìåòðè" FONT 8, "MS Shell Dlg" EXSTYLE DS_SHELLFONT BEGIN - GROUPBOX "Cards", -1, 7, 7, 65, 40 - AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP - AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 + GROUPBOX "Êàðòè", -1, 7, 7, 65, 40 + AUTORADIOBUTTON "&Ïî îäí³é", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Ï&î òðè", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 - AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP - AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + AUTOCHECKBOX "&Ãðà çà ÷àñîì", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP + AUTOCHECKBOX "&Ðÿäîê ñòàíó", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 101, 97, 50, 14 @@ -34,10 +34,10 @@ STRINGTABLE BEGIN - IDS_SOL_NAME "Solitaire" - IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." - IDS_SOL_QUIT "Quit the current game?" - IDS_SOL_WIN "Congratulations, you win!!" + IDS_SOL_NAME "Êîñèíêà" + IDS_SOL_ABOUT "Êîñèíêà â³ä J Brown\n\nCardLib âåðñ³¿ 1.0." + IDS_SOL_QUIT "Âèéòè ç ïîòî÷íî¿ ãðè?" + IDS_SOL_WIN "Â³òàííÿ, Âè âèãðàëè!!" END Added: trunk/reactos/base/applications/mmc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/uk-UA.rc (added) +++ trunk/reactos/base/applications/mmc/lang/uk-UA.rc Mon Jul 16 23:30:12 2007 @@ -1,0 +1,29 @@ +/* + * PROJECT: ReactOS Management Console + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/mmc/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for MMC + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDM_CONSOLEROOT MENU DISCARDABLE +BEGIN + POPUP "&Ôàéë" + BEGIN + MENUITEM SEPARATOR + MENUITEM "Â&èõ³ä\tAlt+F4", ID_FILE_EXIT + END + + POPUP "&Äîâ³äêà" + BEGIN + MENUITEM "&Ïðî êîíñîëü êåðóâàííÿ ReactOS...", ID_HELP_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "Êîíñîëü êåðóâàííÿ ReactOS" + IDS_CONSOLETITLE "Console%1!u!" +END Propchange: trunk/reactos/base/applications/mmc/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mmc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/rsrc… ============================================================================== --- trunk/reactos/base/applications/mmc/rsrc.rc (original) +++ trunk/reactos/base/applications/mmc/rsrc.rc Mon Jul 16 23:30:12 2007 @@ -8,4 +8,5 @@ #include "lang/fr-FR.rc" #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" +#include "lang/uk-UA.rc" #include "lang/ru-RU.rc" Added: trunk/reactos/base/applications/msconfig/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/uk-UA.rc (added) +++ trunk/reactos/base/applications/msconfig/lang/uk-UA.rc Mon Jul 16 23:30:12 2007 @@ -1,0 +1,182 @@ +/* + * PROJECT: ReactOS Systemconfiguration Tool + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/msconfig/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for msconfig + * TRANSLATOR: Rostislav Zabolotny + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDD_MSCONFIG_DIALOG DIALOG DISCARDABLE 0, 0, 378, 220 +STYLE DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | + WS_THICKFRAME +CAPTION "Ïðîãðàìà íàëàøòóâàííÿ ñèñòåìè" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195 + DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Äîâ³äêà", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Çàñò&îñóâàòè", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_STARTUP_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148 + PUSHBUTTON "&Àêòèâóâàòè âñå",IDC_BTN_STARTUP_ACTIVATE,223,155,66,14 + PUSHBUTTON "&Äåàêòèâóâàòè âñå",IDC_BTN_STARTUP_DEACTIVATE,295,155,66,14 +END + +IDD_SYSTEM_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", 237, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 2, 1, 280, 148 + PUSHBUTTON "Move &Up", IDC_BTN_SYSTEM_UP, 290, 5, 66, 14 + PUSHBUTTON "Move &Down", IDC_BTN_SYSTEM_DOWN, 290, 25, 66, 14 + + PUSHBUTTON "&Enable", IDC_BTN_SYSTEM_ENABLE, 290, 50, 66, 14 + PUSHBUTTON "D&isable", IDC_BTN_SYSTEM_DISABLE, 290, 70, 66, 14 + + PUSHBUTTON "&Find", IDC_BTN_SYSTEM_FIND, 290, 95, 66, 14 + PUSHBUTTON "&New", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14 + PUSHBUTTON "Edi&t", IDC_BTN_SYSTEM_EDIT, 290, 135, 66, 14 + + PUSHBUTTON "Ena&ble All", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14 + PUSHBUTTON "Disable A&ll",IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14 +END + +IDD_TOOLS_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List2",IDC_TOOLS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 134 + EDITTEXT IDC_TOOLS_CMDLINE, 1, 139, 360, 12, ES_READONLY + PUSHBUTTON "&Çàïóñòèòè", IDC_BTN_RUN, 311, 155, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_SERVICES_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List1",IDC_SERVICES_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,2,1,360,148 + PUSHBUTTON "&Àêòèâóâàòè âñå",IDC_BTN_SERVICES_ACTIVATE,223,155,66,14 + PUSHBUTTON "&Äåàêòèâóâàòè âñå",IDC_BTN_SERVICES_DEACTIVATE,295,155,66,14 +END + +IDD_GENERAL_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Âàð³àíòè çàâàíòàæåííÿ", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT + CONTROL "&Çâè÷àéíå çàâàíòàæåííÿ - çàâàíòàæóâàòè âñ³ äðàéâåðè ³ ñëóæáè", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10 + CONTROL "&Ñêîðî÷åíå çàâàíòàæåííÿ - çóâàíòàæóâàòè ò³ëüêè îñíîâí³ äðàéâåðè ³ ñëóæáè", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10 + CONTROL "Âè&á³ðêîâå çàâàíòàæåííÿ", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10 + CHECKBOX "Îá&ðîáëÿòè ôàéë SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 + CHECKBOX "Çà&âàíòàæóâàòè ñèñòåìí³ ñëóæáè", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 + CHECKBOX "Çàâàíòàæóâàòè åëåìåíòè &àâòîçàâàíòàæåííÿ", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 +END + +IDD_FREELDR_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_LIST_BOX, "ListBox", 0x50010141, 10, 10, 340, 50, 0x00000200 + PUSHBUTTON "&Âèáðàòè âñ³ øëÿõè çàâàíòàæåííÿ", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12 + PUSHBUTTON "&Âñòàíîâèòè çà çàìîâ÷óâàííÿì", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 + PUSHBUTTON "Ïåðåì³ñòèòè Ââ&åðõ", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 + PUSHBUTTON "Ïåðåì³ñòèòè äî &íèçó", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 + GROUPBOX "Âàð³àíòè çàâàíòàæåííÿ", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT + CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10 + CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10 + CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 + CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 + CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 + PUSHBUTTON "Ä&îäàòêîâî...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 + LTEXT "&Çàòðèìêà:", -1, 280, 91, 30, 10 + EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT + LTEXT "ñåê.", -1, 340, 91, 15, 10 +END + +IDD_FREELDR_ADVANCED_PAGE DIALOG DISCARDABLE 0, 0, 175, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CHECKBOX "/&MAXMEM=", IDC_CBX_MAX_MEM, 10, 10, 50, 10 + EDITTEXT IDC_TXT_MAX_MEM, 80, 10, 60, 12 + CONTROL "",IDC_SCR_MAX_MEM, "msctls_updown32", 0x50000000, 140, 10, 11, 11 + CHECKBOX "/&NUMPROC=", IDC_CBX_NUM_PROC, 10, 25, 50, 10 + COMBOBOX IDC_DRP_NUM_PROC, 80, 25, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "/&PCILOCK", IDC_CBX_PCI_LOCK, 10, 40, 50, 10 + CHECKBOX "/P&ROFILE", IDC_CBX_PROFILE, 10, 55, 50, 10 + CHECKBOX "/&IRQ", IDC_CBX_IRQ, 10, 70, 40, 12 + EDITTEXT IDC_TXT_IRQ, 80, 70, 60, 12, ES_LEFT + CHECKBOX "/&DEBUG", IDC_CBX_DEBUG, 10, 85, 40, 10 + CHECKBOX "/D&EBUGPORT", IDC_CBX_DEBUG_PORT, 20, 100, 60, 10 + COMBOBOX IDC_DRP_DEBUG_PORT, 80, 100, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "/&BAUDRATE", IDC_CBX_BAUD_RATE, 20, 115, 50, 10 + COMBOBOX IDC_DRP_DRP_BAUD_RATE, 80, 115, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "/&CHANNEL", IDC_CBX_CHANNEL, 20, 130, 50, 10 + EDITTEXT IDC_TXT_CHANNEL, 80, 130, 60, 12, ES_LEFT + CONTROL "",IDC_SCR_CHANNEL, "msctls_updown32", 0x50000000, 140, 130, 11, 11 + PUSHBUTTON "OK", IDC_OK, 20, 160, 50, 12 + PUSHBUTTON "Ñêàñóâàòè", IDC_CANCEL, 100, 160, 50, 12 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_MSCONFIG "Ïðîãðàìà íàëàøòóâàííÿ ñèñòåìè" + IDS_TAB_GENERAL "Çàãàëüí³" + IDS_TAB_SYSTEM "SYSTEM.INI" + IDS_TAB_FREELDR "FREELDR.INI" + IDS_TAB_SERVICES "Ñëóæáè" + IDS_TAB_STARTUP "Àâòîçàâàíòàæåííÿ" + IDS_TAB_TOOLS "Óòèë³òè" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_COLUMN_SERVICE "Ñëóæáà" + IDS_SERVICES_COLUMN_REQ "Âèìàãàº" + IDS_SERVICES_COLUMN_VENDOR "Ïîñòà÷àëüíèê" + IDS_SERVICES_COLUMN_STATUS "Ñòàí" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLS_COLUMN_NAME "Íàçâà" + IDS_TOOLS_COLUMN_DESCR "Îïèñ" + + IDS_TOOLS_CMD_NAME "Êîíñîëü" + IDS_TOOLS_CMD_DESCR "" + IDS_TOOLS_CMD_CMD "cmd.exe" + + IDS_TOOLS_INFO_NAME "Âåðñ³ÿ" + IDS_TOOLS_INFO_DESCR "Âèâîäèòü ³íôîðìàö³þ ïðî âåðñ³þ ÎÑ." + IDS_TOOLS_INFO_CMD "winver.exe" + + IDS_TOOLS_REGEDIT_NAME "Ðåäàêòîð Ðåºñòðó" + IDS_TOOLS_REGEDIT_DESCR "Çàïóñêàº Ðåäàêòîð Ðåºñòðó." + IDS_TOOLS_REGEDIT_CMD "regedit.exe" + + IDS_TOOLS_SYSDM_NAME "Âëàñòèâîñò³ ñèñòåìè" + IDS_TOOLS_SYSDM_DESCR "Ïîêàçóº ³íôîðìàö³þ ïðî êîìï'þòåð." + IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" + + IDS_STARTUP_COLUMN_ELEMENT "Åëåìåíò" + IDS_STARTUP_COLUMN_CMD "Êîìàíäà" + IDS_STARTUP_COLUMN_PATH "Øëÿõ" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_STATUS_RUNNING "Ïðàöþº" + IDS_SERVICES_STATUS_STOPPED "Çóïèíåíà" + IDS_SERVICES_YES "Òàê" + IDS_SERVICES_UNKNOWN "Íåâ³äîìî" +END Propchange: trunk/reactos/base/applications/msconfig/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/msconfig/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/rsrc.rc (original) +++ trunk/reactos/base/applications/msconfig/rsrc.rc Mon Jul 16 23:30:12 2007 @@ -22,4 +22,5 @@ #include "lang/nl-NL.rc" #include "lang/nb-NO.rc" #include "lang/th-TH.rc" +#include "lang/uk-UA.rc" #include "lang/zh-CN.rc" Added: trunk/reactos/base/applications/regedit/clb/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/clb/lang/uk-UA.rc (added) +++ trunk/reactos/base/applications/regedit/clb/lang/uk-UA.rc Mon Jul 16 23:30:12 2007 @@ -1,0 +1,37 @@ +/* + * PROJECT: ReactOS Column List Box + * LICENSE: GPL - See COPYING in the top level directory + * FILE: lib/clb/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for PROJECT + * TRANSLATOR: Rostislav Zabolotny + */ + + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDD_COLUMNLISTBOXSTYLES DIALOGEX 0, 0, 227, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Column List Box Styles" +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Column List Box ñòèë³", -1, 6, 7, 158, 71 + CHECKBOX "&Ñòàíäàðò", 1710, 10, 20, 42, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Êðàé", 1713, 10, 30, 34, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Ñ&îðòóâàòè", 1705, 10, 40, 26, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Ïîâ³äîìèòè", 1706, 10, 50, 32, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Ãîðèçîíòàëüíà ñìóãà ïðîêðóòêè", 1707, 10, 60, 64, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Ìíîæèííå âèä³ëåííÿ", -1, 79, 20, 72, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP | WS_DISABLED + CHECKBOX "Çî&âí³øíº Âèä³ëåííÿ", -1, 79, 30, 77, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP | WS_DISABLED + CHECKBOX "&Popout Headings", 1714, 79, 40, 68, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Springy Columns", 1715, 79, 50, 66, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + GROUPBOX "Îñíîâí³ ñòèë³", -1, 6, 80, 158, 34 + CHECKBOX "&Âèäèìèé", 1701, 10, 92, 34, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Â³äêëþ÷åíèé", 1702, 10, 102, 41, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Ãðóïóâàòè", 1703, 79, 92, 32, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Tab Stop", 1704, 79, 102, 44, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 37, 125, 40, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 93, 125, 40, 14, BS_PUSHBUTTON | WS_GROUP | WS_TABSTOP + CHECKBOX "&Äîçâîëèòè ïðîêðóòêó", 1708, 79, 60, 66, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP +END + Propchange: trunk/reactos/base/applications/regedit/clb/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/regedit/clb/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/clb/rsrc.rc (original) +++ trunk/reactos/base/applications/regedit/clb/rsrc.rc Mon Jul 16 23:30:12 2007 @@ -35,5 +35,5 @@ #include "lang/pl-PL.rc" #include "lang/nb-NO.rc" #include "lang/th-TH.rc" +#include "lang/uk-UA.rc" - Modified: trunk/reactos/base/shell/explorer/explorer-uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-uk.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-uk.rc Mon Jul 16 23:30:12 2007 @@ -39,7 +39,7 @@ MENUITEM "&Ïàíåëü ³íñòðóìåíò³â", ID_VIEW_TOOL_BAR MENUITEM "&Äîäàòêîâà ïàíåëü", ID_VIEW_EXTRA_BAR MENUITEM "Ä&èñêè", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "&Âèáðàíå", ID_VIEW_SIDE_BAR + MENUITEM "&Îáðàíå", ID_VIEW_SIDE_BAR MENUITEM "&Ðÿäîê ñòàíó", ID_VIEW_STATUSBAR MENUITEM SEPARATOR MENUITEM "&Îíîâèòè\tF5", ID_REFRESH @@ -111,7 +111,7 @@ POPUP "&Âèãëÿä" BEGIN MENUITEM "&Ïàíåëü ³íñòðóìåíò³â", ID_VIEW_TOOL_BAR - MENUITEM "&Âèáðàíå", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "&Îáðàíå", ID_VIEW_SIDE_BAR, GRAYED MENUITEM "&Ðÿäîê ñòàíó", ID_VIEW_STATUSBAR MENUITEM SEPARATOR MENUITEM "&Îíîâèòè\tF5", ID_REFRESH @@ -334,7 +334,7 @@ IDS_START_HELP "Äîâ³äêà" IDS_SEARCH_FILES "Ïîøóê..." IDS_DOCUMENTS "Äîêóìåíòè" - IDS_FAVORITES "Âèáðàíå" + IDS_FAVORITES "Îáðàíå" IDS_PROGRAMS "Ïðîãðàìè" IDS_SETTINGS "Íàñòðîéêè" IDS_EXPLORE "Îãëÿä" Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Uk… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg_Uk.rc (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg_Uk.rc Mon Jul 16 23:30:12 2007 @@ -1,5 +1,6 @@ /* * Copyright 2004 Ilya Korniyko + * Copyright 2007 Artem Reznikov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -294,6 +295,36 @@ CONTROL "Ë&àíäøàôò", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 END +PAGESETUPDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ïàðàìåòðè ñòîð³íêè" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 + CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80 + CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4 + GROUPBOX "Ïàï³ð", grp2, 8, 96, 224, 56, BS_GROUPBOX + LTEXT "&Ðîçì³ð:", stc2, 16, 112, 36, 8 + COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + LTEXT "Ïîäà&÷à:", stc3, 16, 132, 36, 8 + COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + GROUPBOX "Îð³ºíòàö³ÿ", grp1, 8, 156, 64, 56, BS_GROUPBOX + AUTORADIOBUTTON "&Êíèæêîâà", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Àëüáîìíà", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + GROUPBOX "Ïîëÿ", grp4, 80, 156, 152, 56, BS_GROUPBOX + LTEXT "&ë³âå:", stc15, 88, 172, 21, 8 + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + LTEXT "&ïðàâå:", stc16, 159, 172, 27, 8 + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + LTEXT "&âåðõíº:", stc17, 88, 192, 21, 8 + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + LTEXT "&íèæíº:", stc18, 159, 192, 23, 8 + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 126, 220, 50, 14 + PUSHBUTTON "Ïð&èíòåð...", psh3, 184, 220, 48, 14 +END + NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN CAPTION "Â³äêðèòè" @@ -430,3 +461,13 @@ IDS_COLOR_AQUA "Àêâàìàðèí" IDS_COLOR_WHITE "Á³ëèé" } + +STRINGTABLE DISCARDABLE +{ + IDS_FONT_SIZE "Select a font size between %d and %d points." + IDS_SAVE_BUTTON "&Save" + IDS_SAVE_IN "Save &in:" + IDS_SAVE "Save" + IDS_SAVE_AS "Save as" + IDS_OPEN_FILE "Open File" +} Modified: trunk/reactos/dll/win32/console/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/console/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/console/lang/uk-UA.rc Mon Jul 16 23:30:12 2007 @@ -1,10 +1,12 @@ /* - * PROJECT: ReactOS Console Configuration DLL - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/console/uk.rc - * PURPOSE: Ukraianian resource file for console - * TRANSLATOR: Artem Reznikov + * PROJECT: ReactOS Console Configuration DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/console/lang/uk-UA.rc + * PURPOSE: Ukraianian resource file for console + * TRANSLATOR: Artem Reznikov */ + +#include <commctrl.h> LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT @@ -35,36 +37,104 @@ CHECKBOX "Ðåæèì &âñòàâêè", IDC_CHECK_INSERT_MODE, 150, 120, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP END -IDD_PROPPAGEFONT DIALOGEX 0, 0, 220, 220 +IDD_PROPPAGEFONT DIALOGEX 0, 0, 250, 220 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION CAPTION "Øðèôò" FONT 8, "MS Shell Dlg" BEGIN -LTEXT "This space is intentionally left blank", -1, 55, 103, 120, 10 +LTEXT "Window Preview", -1, 10, 7, 65, 10 +LTEXT "Size", -1, 130, 10, 30, 10 +CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 115, 70 +LISTBOX IDC_LBOX_FONTS, 130, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL +LTEXT "&Font", -1, 10, 105, 35, 10 +CHECKBOX "&Bold fonts", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10 +LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 50, LBS_DISABLENOSCROLL | WS_VSCROLL +GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 10, 155, 200, 50 +CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 95, 35 +LTEXT "Each character is:", -1, 130, 165, 75, 10 +LTEXT "screen pixel wide\nscreen pixel high", -1, 140, 180, 65, 20 +LTEXT "", IDC_FONT_SIZE_X, 125, 180, 10, 10 +LTEXT "", IDC_FONT_SIZE_Y, 125, 188, 10, 10 END -IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 220, 220 +IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 250, 220 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION CAPTION "Ðîçòàøóâàííÿ" FONT 8, "MS Shell Dlg" BEGIN -LTEXT "This space is intentionally left blank", -1, 55, 103, 120, 10 +LTEXT "Window Preview", -1, 10, 7, 65, 10 +CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 10, 20, 115, 70 +GROUPBOX "Screen Buffer Size", -1, 130, 15, 115, 40 +LTEXT "&Width:", -1, 135, 30, 25, 10 +LTEXT "&Height:", -1, 135, 40, 25, 10 +EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 165, 30, 35, 10, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 +EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 165, 40, 35, 10, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 +GROUPBOX "Window Size", -1, 130, 60, 115, 40 +LTEXT "&W&idth:", -1, 135, 70, 25, 10 +LTEXT "&H&eight:", -1, 135, 80, 25, 10 +EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 165, 70, 35, 10, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 +EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 165, 80, 35, 10, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 +GROUPBOX "Window Position", -1, 130, 105, 115, 55 +LTEXT "&Left:", -1, 135, 120, 25, 10 +LTEXT "&Top:", -1, 135, 130, 25, 10 +EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 165, 120, 35, 10, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 +EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 165, 130, 35, 10, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 +CHECKBOX "Let system &position window", IDC_CHECK_SYSTEM_POS_WINDOW, 135, 145, 100, 10 END -IDD_PROPPAGECOLORS DIALOGEX 0, 0, 220, 220 +IDD_PROPPAGECOLORS DIALOGEX 0, 0, 250, 220 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION CAPTION "Êîëüîðè" FONT 8, "MS Shell Dlg" BEGIN -LTEXT "This space is intentionally left blank", -1, 55, 103, 120, 10 +CONTROL "Screen &Text", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 15, 90, 10 +CONTROL "Screen &Background", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 25, 90, 10 +CONTROL "&Popup Text", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 90, 10 +CONTROL "Pop&up Background", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 45, 90, 10 +GROUPBOX "Selected Color Values", -1, 120, 15, 90, 45 +LTEXT "&Red:", -1, 125, 25, 30, 10 +EDITTEXT IDC_EDIT_COLOR_RED, 150, 25, 30, 10, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 25, 30, 10 +LTEXT "&Green:", -1, 125, 35, 30, 10 +EDITTEXT IDC_EDIT_COLOR_GREEN, 150, 35, 30, 10, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 35, 30, 10 +LTEXT "&Blue:", -1, 125, 45, 30, 10 +EDITTEXT IDC_EDIT_COLOR_BLUE, 150, 45, 30, 10, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 45, 30, 10 +CONTROL "", IDC_STATIC_COLOR1, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 15, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR2, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 27, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR3, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 39, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR4, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 51, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR5, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 63, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR6, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 75, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR7, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 87, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR8, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 99, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR9, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 111, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR10, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 123, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR11, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 135, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR12, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 147, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR13, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 159, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 171, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 183, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 195, 90, 10, 10 +GROUPBOX "Selected Screen Colors", -1, 10, 110, 200, 40 +CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 120, 180, 20 +GROUPBOX "Selected Popup Colors", -1, 10, 155, 200, 40 +CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 180, 20 END IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 100 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "Çì³íà âëàñòèâîñòåé" FONT 8, "MS Shell Dlg" BEGIN -CONTROL "&Çì³íèòè ò³ëüêè äëÿ ïîòî÷íîãî â³êíà", IDC_RADIO_APPLY_CURRENT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED, 25, 25, 150, 10 +CONTROL "&Çì³íèòè ò³ëüêè äëÿ ïîòî÷íîãî â³êíà", IDC_RADIO_APPLY_CURRENT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 25, 150, 10 CONTROL "&Çáåð³ãòè äëÿ ìàéáóòí³õ â³êîí ç òàêèì ñàìèì çàãîëîâêîì", IDC_RADIO_APPLY_ALL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 40, 185, 10 PUSHBUTTON "OK", IDOK, 25, 80, 40, 15, WS_VISIBLE PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 120, 80, 50, 15, WS_VISIBLE @@ -75,4 +145,6 @@ IDS_CPLNAME "Êîíñîëü" IDS_CPLDESCRIPTION "Íàñòðîéêà âëàñòèâîñòåé êîíñîë³." IDS_APPLY_SHORTCUT_ALL "Çì³íà &ÿðëèêà, ÿêèé çàïóñòèâ öå â³êíî" + IDS_SCREEN_TEXT "C:\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" + IDS_RASTERFONTS "Ðàñòðîâ³ øðèôòè" END Modified: trunk/reactos/dll/win32/devmgr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/uk-U… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/devmgr/lang/uk-UA.rc Mon Jul 16 23:30:12 2007 @@ -1,4 +1,10 @@ -// Ukrainian language resource file (Artem Reznikov, 2006-02-11) +/* + * PROJECT: ReactOS Device Manager Applet + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/devmgr/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for devmgr + * TRANSLATOR: Artem Reznikov + */ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT @@ -12,6 +18,7 @@ IDS_UNKNOWN "Íåâ³äîìèé" IDS_LOCATIONSTR "Ðîçì³ùåííÿ %1!u! (%2)" IDS_DEVCODE " (Êîä %1!u!)" + IDS_DEVCODE2 " (Êîä %2!u!)" IDS_ENABLEDEVICE "Öåé ïðèñòð³é âèêîðèñòîâóºòüñÿ (óâ³ìêíåíèé)" IDS_DISABLEDEVICE "Öåé ïðèñòð³é íå âèêîðèñòîâóºòüñÿ (âèìêíåíèé)" IDS_UNKNOWNDEVICE "Íåâ³äîìèé ïðèñòð³é" @@ -20,59 +27,73 @@ IDS_TROUBLESHOOTDEV "&Óñóíåííÿ íåñïðàâíîñòåé..." IDS_ENABLEDEV "&Ââ³ìêíóòè ïðèñòð³é" IDS_REINSTALLDRV "&Ïåðåâñòàíîâèòè äðàéâåð" + IDS_PROPERTIES "P&roperties" + IDS_UPDATEDRV "U&pdate Driver..." + IDS_REBOOT "Restart &Computer..." + IDS_NOTAVAILABLE "Not available" + IDS_NOTDIGITALLYSIGNED "Not digitally signed" + IDS_NODRIVERS "No driver files are required or have been loaded for this device." END STRINGTABLE BEGIN IDS_DEV_NO_PROBLEM "Öåé ïðèñòð³é ïðàöþº íîðìàëüíî." - IDS_DEV_NOT_CONFIGURED "CM_PROB_NOT_CONFIGURED" - IDS_DEV_OUT_OF_MEMORY "CM_PROB_DEVLOADER_FAILED" - IDS_DEV_ENTRY_IS_WRONG_TYPE "CM_PROB_ENTRY_IS_WRONG_TYPE" - IDS_DEV_LACKED_ARBITRATOR "CM_PROB_LACKED_ARBITRATOR" - IDS_DEV_BOOT_CONFIG_CONFLICT "CM_PROB_BOOT_CONFIG_CONFLICT" - IDS_DEV_FAILED_FILTER "CM_PROB_FAILED_FILTER" - IDS_DEV_DEVLOADER_NOT_FOUND "CM_PROB_DEVLOADER_NOT_FOUND" - IDS_DEV_INVALID_DATA "CM_PROB_INVALID_DATA" - IDS_DEV_FAILED_START "CM_PROB_FAILED_START" - IDS_DEV_LIAR "CM_PROB_LIAR" - IDS_DEV_NORMAL_CONFLICT "CM_PROB_NORMAL_CONFLICT" - IDS_DEV_NOT_VERIFIED "CM_PROB_NOT_VERIFIED" - IDS_DEV_NEED_RESTART "CM_PROB_NEED_RESTART" - IDS_DEV_REENUMERATION "CM_PROB_REENUMERATION" - IDS_DEV_PARTIAL_LOG_CONF "CM_PROB_PARTIAL_LOG_CONF" - IDS_DEV_UNKNOWN_RESOURCE "CM_PROB_UNKNOWN_RESOURCE" - IDS_DEV_REINSTALL "CM_PROB_REINSTALL" - IDS_DEV_REGISTRY "CM_PROB_REGISTRY" - IDS_DEV_WILL_BE_REMOVED "CM_PROB_WILL_BE_REMOVED" - IDS_DEV_DISABLED "CM_PROB_DISABLED" - IDS_DEV_DEVLOADER_NOT_READY "CM_PROB_DEVLOADER_NOT_READY" - IDS_DEV_DEVICE_NOT_THERE "CM_PROB_DEVICE_NOT_THERE" - IDS_DEV_MOVED "CM_PROB_MOVED" - IDS_DEV_TOO_EARLY "CM_PROB_TOO_EARLY" - IDS_DEV_NO_VALID_LOG_CONF "CM_PROB_NO_VALID_LOG_CONF" - IDS_DEV_FAILED_INSTALL "CM_PROB_FAILED_INSTALL" - IDS_DEV_HARDWARE_DISABLED "CM_PROB_HARDWARE_DISABLED" - IDS_DEV_CANT_SHARE_IRQ "CM_PROB_CANT_SHARE_IRQ" - IDS_DEV_FAILED_ADD "CM_PROB_FAILED_ADD" - IDS_DEV_DISABLED_SERVICE "CM_PROB_DISABLED_SERVICE" - IDS_DEV_TRANSLATION_FAILED "CM_PROB_TRANSLATION_FAILED" - IDS_DEV_NO_SOFTCONFIG "CM_PROB_NO_SOFTCONFIG" - IDS_DEV_BIOS_TABLE "CM_PROB_BIOS_TABLE" - IDS_DEV_IRQ_TRANSLATION_FAILED "CM_PROB_IRQ_TRANSLATION_FAILED" - IDS_DEV_FAILED_DRIVER_ENTRY "CM_PROB_FAILED_DRIVER_ENTRY" - IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "CM_PROB_DRIVER_FAILED_PRIOR_UNLOAD" - IDS_DEV_DRIVER_FAILED_LOAD "CM_PROB_DRIVER_FAILED_LOAD" - IDS_DEV_DRIVER_SERVICE_KEY_INVALID "CM_PROB_DRIVER_SERVICE_KEY_INVALID" - IDS_DEV_LEGACY_SERVICE_NO_DEVICES "CM_PROB_LEGACY_SERVICE_NO_DEVICES" - IDS_DEV_DUPLICATE_DEVICE "CM_PROB_DUPLICATE_DEVICE" - IDS_DEV_FAILED_POST_START "CM_PROB_FAILED_POST_START" - IDS_DEV_HALTED "CM_PROB_HALTED" - IDS_DEV_PHANTOM "CM_PROB_PHANTOM" - IDS_DEV_SYSTEM_SHUTDOWN "CM_PROB_SYSTEM_SHUTDOWN" - IDS_DEV_HELD_FOR_EJECT "CM_PROB_HELD_FOR_EJECT" - IDS_DEV_DRIVER_BLOCKED "CM_PROB_DRIVER_BLOCKED" - IDS_DEV_REGISTRY_TOO_LARGE "CM_PROB_REGISTRY_TOO_LARGE" - IDS_DEV_SETPROPERTIES_FAILED "CM_PROB_SETPROPERTIES_FAILED" + IDS_DEV_NOT_CONFIGURED "This device is not configured correctly." + IDS_DEV_DEVLOADER_FAILED "ReactOS could not load the driver for this device because the computer is reporting two $1 bus types." + IDS_DEV_DEVLOADER_FAILED2 "The $1 device loader(s) for this device could not load the device driver." + IDS_DEV_OUT_OF_MEMORY "The driver for this device may be bad, or your system may be running low on memory or other resources." + IDS_DEV_ENTRY_IS_WRONG_TYPE "This device is not working properly because one of its drivers may be bad, or your registry may be bad." + IDS_DEV_LACKED_ARBITRATOR "The driver for this device requested a resource that ReactOS does not know how to handle." + IDS_DEV_BOOT_CONFIG_CONFLICT "Another device is using the resources this device needs." + IDS_DEV_FAILED_FILTER "The drivers for this device need to be reinstalled." + IDS_DEV_DEVLOADER_NOT_FOUND "This device is not working properly because ReactOS cannot load the file $1 that loads the drivers for the device." + IDS_DEV_DEVLOADER_NOT_FOUND2 "This device is not working properly because the file $1 that loads the drivers for this device is bad." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn\'t work, see your hardware documentation." + IDS_DEV_INVALID_DATA "This device is not working properly because the BIOS in your computer is reporting the resources for the device incorrectly." + IDS_DEV_INVALID_DATA2 "This device is not working properly because the BIOS in the device is reporting the resources for the device incorrectly. " + IDS_DEV_FAILED_START "This device is either not present, not working properly, or does not have all the drivers installed." + IDS_DEV_LIAR "ReactOS stopped responding while attempting to start this device, and therefore will never attempt to start this device again." + IDS_DEV_NORMAL_CONFLICT "This device cannot find any free $1 resources to use." + IDS_DEV_NOT_VERIFIED "This device is either not present, not working properly, or does not have all the drivers installed." + IDS_DEV_NEED_RESTART "This device cannot work properly until you restart your computer." + IDS_DEV_REENUMERATION "This device is causing a resource conflict." + IDS_DEV_PARTIAL_LOG_CONF "ReactOS could not identify all the resources this device uses." + IDS_DEV_UNKNOWN_RESOURCE "The driver information file $1 is telling this child device to use a resource that the parent device does not have or recognize." + IDS_DEV_REINSTALL "The drivers for this device need to be reinstalled." + IDS_DEV_REGISTRY "Your registry may be bad." + IDS_DEV_WILL_BE_REMOVED "ReactOS is removing this device." + IDS_DEV_DISABLED "This device is not started." + IDS_DEV_DISABLED2 "This device is disabled." + IDS_DEV_DEVLOADER_NOT_READY "The loaders for this device cannot load the required drivers." + IDS_DEV_DEVLOADER_NOT_READY2 "This display adapter is functioning correctly." + IDS_DEV_DEVLOADER_NOT_READY3 "The loaders for this device cannot load the required drivers." + IDS_DEV_DEVICE_NOT_THERE "This device is either not present, not working properly, or does not have all the drivers installed." + IDS_DEV_MOVED "ReactOS is in the process of setting up this device." + IDS_DEV_TOO_EARLY "ReactOS is in the process of setting up this device." + 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.\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. \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." + IDS_DEV_DRIVER_SERVICE_KEY_INVALID "ReactOS cannot access this hardware because its service key information in the registry is missing or recorded incorrectly." + IDS_DEV_LEGACY_SERVICE_NO_DEVICES "ReactOS successfully loaded the device driver for this hardware but cannot find the hardware device." + IDS_DEV_DUPLICATE_DEVICE "ReactOS cannot load the device driver for this hardware because there is a duplicate device already running in the system." + IDS_DEV_FAILED_POST_START "ReactOS has stopped this device because it has reported problems." + 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_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." END IDD_HARDWARE DIALOG DISCARDABLE 0, 0, 300, 400 @@ -111,3 +132,45 @@ LTEXT "&Âèêîðèñòàííÿ ïðèñòðîþ:", IDC_DEVUSAGELABEL, 7, 188, 222, 8, WS_DISABLED COMBOBOX IDC_DEVUSAGE, 7, 198, 239, 40, CBS_DROPDOWNLIST | WS_VSCROLL | WS_DISABLED END + +IDD_DEVICEDRIVER DIALOG DISCARDABLE 0, 0, 252, 218 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Driver" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "Driver provider:", -1, 37, 39, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DRVPROVIDER, 100, 39, 146, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Driver date:", -1, 37, 53, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DRVDATE, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Driver version:", -1, 37, 67, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Digital Signer:", -1, 37, 81, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + PUSHBUTTON "&Driver Details...", IDC_DRIVERDETAILS, 7, 106, 70, 15 + LTEXT "To view details about the driver files.", -1, 91, 110, 154, 17, SS_NOPREFIX +END + +IDD_DRIVERDETAILS DIALOG DISCARDABLE 0, 0, 224, 250 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Driver File Details" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "&Driver files:", -1, 7, 36, 204, 8 + CONTROL "", IDC_DRIVERFILES, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 + LTEXT "Provider:", -1, 14, 134, 50, 8 + LTEXT "", IDC_FILEPROVIDER, 66, 134, 155, 8 + LTEXT "File version:", -1, 14, 150, 50, 8 + LTEXT "", IDC_FILEVERSION, 66, 150, 155, 8 + LTEXT "Copyright:", -1, 14, 166, 50, 8 + LTEXT "", IDC_FILECOPYRIGHT, 66, 166, 155, 8 + LTEXT "Digital Signer:", -1, 14, 182, 50, 8 + LTEXT "", IDC_DIGITALSIGNER, 66, 182, 155, 8 + PUSHBUTTON "OK", IDOK, 167, 228, 50, 14 +END + Modified: trunk/reactos/dll/win32/userenv/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/userenv/lang/uk-UA.rc Mon Jul 16 23:30:12 2007 @@ -1,5 +1,5 @@ /* - * Copyright 2006 Artem Reznikov + * Copyright 2006-2007 Artem Reznikov * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,7 +23,7 @@ IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" IDS_APPDATA "Application Data" IDS_DESKTOP "Desktop" - IDS_FAVORITES "Âèáðàíå" + IDS_FAVORITES "Îáðàíå" IDS_STARTMENU "Ãîëîâíå ìåíþ" IDS_PROGRAMS "Ãîëîâíå ìåíþ\\Ïðîãðàìè" IDS_ADMINTOOLS "Ãîëîâíå ìåíþ\\Ïðîãðàìè\\Ñëóæáîâ³" Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/uk-UA.rc (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/uk-UA.rc Mon Jul 16 23:30:12 2007 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS CSRSS subsystem * LICENSE: GPL - See COPYING in the top level directory - * FILE: subsys/csrss/win32csr/uk.rc + * FILE: subsystems/win32/csrss/win32csr/lang/uk-UA.rc * PURPOSE: Ukraianian resource file * TRANSLATOR: Artem Reznikov */ @@ -46,4 +46,11 @@ IDS_FIND "Çíàéòè..." IDS_DEFAULTS "Çàìîâ÷óâàííÿ" IDS_PROPERTIES "Âëàñòèâîñò³" + IDS_SCROLLHERE "Ïðîêðóòèòè ñþäè" + IDS_SCROLLTOP "Ïðîêðóòèòè íà ïî÷àòîê" + IDS_SCROLLBOTTOM "Ïðîêðóòèòè íà ê³íåöü" + IDS_SCROLLPAGE_UP "Ïîïåðåäíÿ ñîòð³íêà" + IDS_SCROLLPAGE_DOWN "Íàñòóïíà ñòîð³íêà" + IDS_SCROLLUP "Ïðîêðóòèòè äîãîðè" + IDS_SCROLLDOWN "Ïðîêðóòèòè äîíèçó" END

1 0

[gedmurphy] 27699: call the correct event on system boot
by gedmurphy＠svn.reactos.org 16 Jul '07

16 Jul '07

Author: gedmurphy Date: Mon Jul 16 22:43:13 2007 New Revision: 27699 URL: http://svn.reactos.org/svn/reactos?rev=27699&view=rev Log: call the correct event on system boot Modified: trunk/reactos/base/system/winlogon/winlogon.c Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c (original) +++ trunk/reactos/base/system/winlogon/winlogon.c Mon Jul 16 22:43:13 2007 @@ -64,18 +64,18 @@ { Sleep(1000); - TRACE("WL: Attempting to open event \"SvcctrlStartEvent_A3725DX\"\n"); + TRACE("WL: Attempting to open event \"SvcctrlStartEvent_A3752DX\"\n"); ServicesInitEvent = OpenEventW( SYNCHRONIZE, FALSE, - L"SvcctrlStartEvent_A3725DX"); + L"SvcctrlStartEvent_A3752DX"); if (ServicesInitEvent) break; } if (!ServicesInitEvent) { - ERR("WL: Failed to open event \"SvcctrlStartEvent_A3725DX\"\n"); + ERR("WL: Failed to open event \"SvcctrlStartEvent_A3752DX\"\n"); return FALSE; }

1 0

[gedmurphy] 27698: fix the startup event name as per r27697
by gedmurphy＠svn.reactos.org 16 Jul '07

16 Jul '07

Author: gedmurphy Date: Mon Jul 16 21:48:57 2007 New Revision: 27698 URL: http://svn.reactos.org/svn/reactos?rev=27698&view=rev Log: fix the startup event name as per r27697 Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c Mon Jul 16 21:48:57 2007 @@ -1251,7 +1251,7 @@ /* Try to open the existing event */ hEvent = OpenEventW(SYNCHRONIZE, FALSE, - L"SvcctrlStartEvent_A3725DX"); + L"SvcctrlStartEvent_A3752DX"); if (hEvent == NULL) { if (GetLastError() != ERROR_FILE_NOT_FOUND) @@ -1261,13 +1261,13 @@ hEvent = CreateEventW(NULL, TRUE, FALSE, - L"SvcctrlStartEvent_A3725DX"); + L"SvcctrlStartEvent_A3752DX"); if (hEvent == NULL) { /* Try to open the existing event again */ hEvent = OpenEventW(SYNCHRONIZE, FALSE, - L"SvcctrlStartEvent_A3725DX"); + L"SvcctrlStartEvent_A3752DX"); if (hEvent == NULL) return; }

1 0

[gedmurphy] 27697: revert r27695 as it's already implemented in advapi32. My tests failed because it's incorrectly named.
by gedmurphy＠svn.reactos.org 16 Jul '07

16 Jul '07

Author: gedmurphy Date: Mon Jul 16 21:47:12 2007 New Revision: 27697 URL: http://svn.reactos.org/svn/reactos?rev=27697&view=rev Log: revert r27695 as it's already implemented in advapi32. My tests failed because it's incorrectly named. Modified: trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/services.c trunk/reactos/base/system/services/services.h Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c (original) +++ trunk/reactos/base/system/services/rpcserver.c Mon Jul 16 21:47:12 2007 @@ -1511,9 +1511,6 @@ if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; - if (!ScmWaitForEvent()) - return ERROR_ACCESS_DENIED; - dwError = ScmCreateManagerHandle(lpDatabaseName, &hHandle); if (dwError != ERROR_SUCCESS) Modified: trunk/reactos/base/system/services/services.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.c (original) +++ trunk/reactos/base/system/services/services.c Mon Jul 16 21:47:12 2007 @@ -91,30 +91,6 @@ *StartEvent = hEvent; return TRUE; -} - - -BOOL ScmWaitForEvent() -{ - HANDLE hEvent; - BOOL ret = FALSE; - - hEvent = OpenEvent(EVENT_ALL_ACCESS, - FALSE, - TEXT("SvcctrlStartEvent_A3752DX")); - - if (hEvent) - { - DWORD ret = WaitForSingleObject(hEvent, - INFINITE); - - if (ret == WAIT_OBJECT_0) - ret = TRUE; - - CloseHandle(hEvent); - } - - return ret; } Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.h (original) +++ trunk/reactos/base/system/services/services.h Mon Jul 16 21:47:12 2007 @@ -134,7 +134,6 @@ /* services.c */ -BOOL ScmWaitForEvent(); VOID PrintString(LPCSTR fmt, ...); /* EOF */

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2007