Ros-diffs March 2007

ros-diffs@reactos.org

20 participants
287 discussions

[dgorbachev] 26059: Fix Bugzilla bug 2051 (French translation by Heis Spiter)
by dgorbachev＠svn.reactos.org 10 Mar '07

10 Mar '07

Author: dgorbachev Date: Sat Mar 10 22:07:20 2007 New Revision: 26059 URL: http://svn.reactos.org/svn/reactos?rev=26059&view=rev Log: Fix Bugzilla bug 2051 (French translation by Heis Spiter) Added: trunk/reactos/base/applications/charmap/lang/fr-FR.rc Modified: trunk/reactos/base/applications/charmap/rsrc.rc Added: trunk/reactos/base/applications/charmap/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/fr-FR.rc (added) +++ trunk/reactos/base/applications/charmap/lang/fr-FR.rc Sat Mar 10 22:07:20 2007 @@ -1,0 +1,35 @@ +LANGUAGE LANG_FRENCH, SUBLANG_FRENCH + +IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 +CAPTION "Table des Caractères" +FONT 8,"MS Sans Serif",0,0 +STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +BEGIN + LTEXT "Police :", 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 "Aide", IDC_CMHELP, 249, 5, 35, 13 + CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 + LTEXT "Caractères à copier :", IDC_STATIC, 6, 188, 66, 9 + EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "Sélectionner", IDC_SELECT, 194, 186, 46, 13 + PUSHBUTTON "Copier", IDC_COPY, 244, 186, 46, 13, WS_DISABLED + //AUTOCHECKBOX "Vue avancée", 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 "À propos de la Table des Caractères" +FONT 8,"MS Sans Serif",0,0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "Table des Caractères v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 + PUSHBUTTON "Fermer", 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 "À propos..." +END 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 Sat Mar 10 22:07:20 2007 @@ -9,4 +9,5 @@ #include "lang/en-US.rc" #include "lang/id-ID.rc" +#include "lang/fr-FR.rc"

1 0

[dgorbachev] 26058: Norwegian translation by LMH1 (bugs 1699, 1739, 1740)
by dgorbachev＠svn.reactos.org 10 Mar '07

10 Mar '07

Author: dgorbachev Date: Sat Mar 10 21:54:12 2007 New Revision: 26058 URL: http://svn.reactos.org/svn/reactos?rev=26058&view=rev Log: Norwegian translation by LMH1 (bugs 1699, 1739, 1740) Added: trunk/reactos/base/setup/vmwinst/lang/nb-NO.rc Modified: trunk/reactos/base/applications/taskmgr/lang/nb-NO.rc trunk/reactos/base/setup/vmwinst/rsrc.rc trunk/reactos/base/shell/cmd/nb-NO.rc Modified: trunk/reactos/base/applications/taskmgr/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/nb-NO.rc (original) +++ trunk/reactos/base/applications/taskmgr/lang/nb-NO.rc Sat Mar 10 21:54:12 2007 @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources +// Norwegian resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 @@ -59,8 +59,8 @@ END POPUP "&Vindu" BEGIN - MENUITEM "Hele &horisontalt", ID_WINDOWS_TILEHORIZONTALLY - MENUITEM "Hele &vertikalt", ID_WINDOWS_TILEVERTICALLY + MENUITEM "Sorter &horisontalt", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "Sorter &vertikalt", ID_WINDOWS_TILEVERTICALLY MENUITEM "&Minimer", ID_WINDOWS_MINIMIZE MENUITEM "Ma&ksimer", ID_WINDOWS_MAXIMIZE MENUITEM "&Overlappet", ID_WINDOWS_CASCADE @@ -76,8 +76,8 @@ IDR_WINDOWSMENU MENU DISCARDABLE BEGIN - MENUITEM "Hele &horisontalt", ID_WINDOWS_TILEHORIZONTALLY - MENUITEM "Hele &vertikalt", ID_WINDOWS_TILEVERTICALLY + MENUITEM "Sorter &horisontalt", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "Sorter &vertikalt", ID_WINDOWS_TILEVERTICALLY MENUITEM "&Minimer", ID_WINDOWS_MINIMIZE MENUITEM "Ma&ksimer", ID_WINDOWS_MAXIMIZE MENUITEM "&Cascade", ID_WINDOWS_CASCADE @@ -103,8 +103,8 @@ MENUITEM "&Bytt til", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&Plasser lengst frem", ID_WINDOWS_BRINGTOFRONT MENUITEM SEPARATOR - MENUITEM "Hele &horisontalt", ID_WINDOWS_TILEHORIZONTALLY - MENUITEM "Hele &vertikalt", ID_WINDOWS_TILEVERTICALLY + MENUITEM "Sorter &horisontalt", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "Sorter &vertikalt", ID_WINDOWS_TILEVERTICALLY MENUITEM "&Minimer", ID_WINDOWS_MINIMIZE MENUITEM "Ma&ksimer", ID_WINDOWS_MAXIMIZE MENUITEM "&Overlappet", ID_WINDOWS_CASCADE @@ -220,7 +220,7 @@ GROUPBOX "Tildelt minne (kb)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Fysisk minne (kb)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Kjerne minne (kb)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT - LTEXT "Referanser",IDS_TOTALS_HANDLE_COUNT,12,131,27,8 + LTEXT "Referanser",IDS_TOTALS_HANDLE_COUNT,12,131,50,8 LTEXT "Tråder",IDS_TOTALS_THREAD_COUNT,12,140,27,8 LTEXT "Prosesser",IDS_TOTALS_PROCESS_COUNT,12,149,34,8 EDITTEXT IDC_TOTALS_HANDLE_COUNT,65,131,45,8,ES_RIGHT | @@ -230,7 +230,7 @@ EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER LTEXT "Totalt",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 - LTEXT "Begrensning",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8 + LTEXT "Begrensninger",IDS_COMMIT_CHARGE_LIMIT,12,184,50,8 LTEXT "Topp",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER @@ -239,7 +239,7 @@ EDITTEXT IDC_COMMIT_CHARGE_PEAK,65,193,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER LTEXT "Totalt",IDS_PHYSICAL_MEMORY_TOTAL,137,131,27,8 - LTEXT "Tilgjengelig",IDS_PHYSICAL_MEMORY_AVAILABLE,137,140,30,8 + LTEXT "Tilgjengelig",IDS_PHYSICAL_MEMORY_AVAILABLE,137,140,40,8 LTEXT "Systembuffer",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,137,149,46,8 EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL,185,131,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER @@ -248,8 +248,8 @@ EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE,185,149,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER LTEXT "Totalt",IDS_KERNEL_MEMORY_TOTAL,137,174,27,8 - LTEXT "Sidevekslet",IDS_KERNEL_MEMORY_PAGED,137,184,21,8 - LTEXT "Ikke sidevekslet",IDS_KERNEL_MEMORY_NONPAGED,137,193,34,8 + LTEXT "Sidevekslet",IDS_KERNEL_MEMORY_PAGED,137,184,50,8 + LTEXT "Ikke sidevekslet",IDS_KERNEL_MEMORY_NONPAGED,137,193,75,8 EDITTEXT IDC_KERNEL_MEMORY_TOTAL,185,174,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER EDITTEXT IDC_KERNEL_MEMORY_PAGED,185,184,48,8,ES_RIGHT | @@ -669,7 +669,7 @@ END -#endif // English (U.S.) resources +#endif // Norwegian resources ///////////////////////////////////////////////////////////////////////////// Added: trunk/reactos/base/setup/vmwinst/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/nb… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/nb-NO.rc (added) +++ trunk/reactos/base/setup/vmwinst/lang/nb-NO.rc Sat Mar 10 21:54:12 2007 @@ -1,0 +1,131 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +IDD_WELCOMEPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Video Driver Installasjon" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "ReactOS installering oppdager om du kjører ReactOS i VMware(r).", -1, 100, 8, 160, 24 + LTEXT "Hvis du vil installere VMware(r) SVGA driver trykk 'Neste', ellers trykk 'Avbryt'.", -1, 100, 140, 160, 17 +END + +IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Video Driver Installasjon" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "ReactOS installering kommer ikke med VMware(r) SVGA driver.\n\nDerfor gå til 'VM' i din VMware(r) workstation menylinje og velg 'Innstaller VMware verktøy...'\n\n\nTrykk 'Neste' for å fortsette eller 'Avbryt' for å hoppe over SVGA driver installasjon.",-1,25,25,225,85 +END + +IDD_INSTALLING_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Video Driver Installasjon" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "{STATUS}",IDC_INSTALLINGSTATUS,25,68,225,8 + CONTROL "", IDC_INSTALLINGPROGRESS, "msctls_progress32", PBS_MARQUEE | WS_CHILD | WS_VISIBLE | WS_BORDER, 25, 80, 225, 8 +END + +IDD_CONFIG DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Video Driver Innstallasjon" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "VMware(r) SVGA driver har blitt vellykket innstallert. Venligst velg din favoritt skjerm oppløsning:",-1,25,5,225,20 + PUSHBUTTON "640x480", 540, 25, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "800x600", 1400, 25, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1024x768", 1792, 25, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1152x864", 2016, 25, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x960", 2240, 110, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x1024", 2304, 110, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1400x1050", 2450, 110, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1600x1200", 2800, 110, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1792x1344", 3136, 195, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1856x1392", 3248, 195, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1920x1440", 3360, 195, 60, 50, 15, BS_AUTORADIOBUTTON + LTEXT "Vennligst velg din favoritt farge kvalitet:", -1, 25, 93, 225, 12 + COMBOBOX IDC_COLORQUALITY, 25, 105, 75, 80, CBS_DROPDOWNLIST | WS_TABSTOP +END + +IDD_INSTALLATION_FAILED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Video Driver Innstallasjon" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "ReactOS innstallering var ute av stand til å installere VMware(r) SVGA driver.\n\n\nTrykk 'Ferdig' for å fortsette installasjon prosess.",-1,25,25,225,85 +END + +IDD_CHOOSEACTION DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Video Driver Installasjon" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "VMware(r) SVGA driver er allerede installert.\n\nVenligst velg hva du vil gjøre:",-1,25,5,225,30 + PUSHBUTTON "Konfigurere skjerm innstillinger", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Bruk en forsjellig grafikk driver", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Avinnstaller VMware(r) SVGA driver", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON + LTEXT "Trykk 'Neste' for å fortsette eller 'Avbryt' for å avslutte veiviseren.", -1, 25, 93, 225, 12 +END + +IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Video Driver Installasjon" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Venligst velg grafikk driver du vil bruke:",-1,25,25,225,15 + PUSHBUTTON "ReactOS VGA Driver", IDC_VGA, 25, 40, 225, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "ReactOS VBE Driver (SVGA)", IDC_VBE, 25, 55, 225, 15, BS_AUTORADIOBUTTON + LTEXT "Trykk 'Ferdig' for å avslutte operasjon eller 'Avbryt' for å avslutte innstalleringen uten endringer.", -1, 25, 93, 225, 20 +END + +IDD_DOUNINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Video Driver Installasjon" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "ReactOS innstallering er omtrent for å avinnstaller din VMware(r) SVGA driver!!!\n\n\nTrykk 'Ferdig' for å avinnstallere driveren eller 'Avbryt' for å la det være som det er.",-1,25,25,225,85 +END + +STRINGTABLE +BEGIN + IDS_WIZARD_NAME "VMware(r) oppdaget" + IDS_FAILEDTOLOCATEDRIVERS "ReactOS installering kunne ikke finne trengte filer.\nVennligst vær sikker på VMware(r) verktøy CD-ROM er satt inn." + IDS_FAILEDTOCOPYFILES "ReactOS installering mislykkes for å kopiere trengte filer.\nVennligst vær sikker på VMware(r) verktøy CD-ROM er satt inn.\n" + IDS_FAILEDTOACTIVATEDRIVER "Mislykkes å aktivere VMware(r) SVGA driver!" + IDS_FAILEDTOSELVGADRIVER "Mislykkes å aktivere ReactOS VGA driver!" + IDS_FAILEDTOSELVBEDRIVER "Mislykkes å aktivere ReactOS VBE driver!" + IDS_UNINSTNOTICE "VMware(r) SVGA driver filer har ikke enda blitt slettet.\nVenligst slett dem manuelt etter en system restart." + IDS_FAILEDTOADDREGENTRIES "Mislykkes å opprette registeret enheter for VMware(r) SVGA driver!" +END + +STRINGTABLE +BEGIN + 10001 "Laveste (8BPP)" + 10002 "Middels (16BPP)" + 10003 "Høyeste (32BPP)" +END + +STRINGTABLE +BEGIN + IDS_SEARCHINGFORCDROM "Søker for VMware(r) Vertøy CD-ROM..." + IDS_COPYINGFILES "Kopierer filer..." + IDS_ENABLINGDRIVER "Muliggjøre VMware(r) SVGA driver..." +END + +STRINGTABLE +BEGIN + IDD_INSERT_VMWARE_TOOLSTITLE "VMware (r) SVGA driver innstallasjon veiviser" + IDD_INSERT_VMWARE_TOOLSSUBTITLE "Vennligst sett inn VMware verktøy CD-Rom." + IDD_INSTALLING_VMWARE_TOOLSTITLE "VMware (r) SVGA driver innstallasjon veiviser" + IDD_INSTALLING_VMWARE_TOOLSSUBTITLE "Søker og kopierer VMware (r) SVGA driver." + IDD_CONFIGTITLE "VMware (r) SVGA driver innstallasjon veiviser" + IDD_CONFIGSUBTITLE "Velg din favoritt skjerm oppløsning." + IDD_INSTALLATION_FAILEDTITLE "VMware (r) SVGA driver innstallasjon veiviser" + IDD_INSTALLATION_FAILEDSUBTITLE "The VMware (r) SVGA driver innstallasjon mislykkes." + IDD_CHOOSEACTIONTITLE "VMware (r) SVGA driver innstallasjon veiviser" + IDD_CHOOSEACTIONSUBTITLE "Velg hva du vil gjøre." + IDD_SELECTDRIVERTITLE "VMware (r) SVGA driver innstallasjon veiviser" + IDD_SELECTDRIVERSUBTITLE "Velg en driver." + IDD_DOUNINSTALLTITLE "VMware (r) SVGA driver innstallasjon veiviser" + IDD_DOUNINSTALLSUBTITLE "Avinstallerer driveren." +END Modified: trunk/reactos/base/setup/vmwinst/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/rsrc.rc… ============================================================================== --- trunk/reactos/base/setup/vmwinst/rsrc.rc (original) +++ trunk/reactos/base/setup/vmwinst/rsrc.rc Sat Mar 10 21:54:12 2007 @@ -23,5 +23,6 @@ #include "lang/id-ID.rc" #include "lang/it-IT.rc" #include "lang/ja-JP.rc" +#include "lang/nb-NO.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/base/shell/cmd/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/nb-NO.rc?re… ============================================================================== --- trunk/reactos/base/shell/cmd/nb-NO.rc (original) +++ trunk/reactos/base/shell/cmd/nb-NO.rc Sat Mar 10 21:54:12 2007 @@ -1,9 +1,5 @@ #include "windows.h" #include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 - */ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE DISCARDABLE @@ -203,12 +199,12 @@ forhåndsinnstilt brytere etter retningsnummer noen bryter med - (hyphen)--for eksempel, /-W.\n" STRING_DIR_HELP2, " Volumet i stasjon %c er %s\n" -STRING_DIR_HELP3, " Volumet i stasjon %c har ingen merke.\n" -STRING_DIR_HELP4, " Volumet Serie nummer er %04X-%04X\n" -STRING_DIR_HELP5, "\n Totalt filer listet:\n%16i File(r)% 14s bytes\n" -STRING_DIR_HELP6, "%16i Dir(s)% 15s bytes\n" +STRING_DIR_HELP3, " Volumet i Stasjon %c har ingen navn.\n" +STRING_DIR_HELP4, " Volumets serienummer er %04X-%04X\n" +STRING_DIR_HELP5, "\n Totalt filer listet:\n%16i Fil(er)% 14s byte\n" +STRING_DIR_HELP6, "%16i mappe(r)% 15s byte\n" STRING_DIR_HELP7, "\n Katalog av %s\n\n" -STRING_DIR_HELP8, "%16i File(r)% 14s bytes\n" +STRING_DIR_HELP8, "%16i Fil(er)% 14s byte\n" STRING_DIRSTACK_HELP1, "lagringsenheter aktuelle katalog for bruk av POPD kommando, inntil da\n\ den endres til spesifiserte katalog.\n\n\ @@ -282,7 +278,7 @@ STRING_LABEL_HELP1, "Vis eller endre stasjon merke.\n\nMERKE [stasjon:][merke]\n" STRING_LABEL_HELP2, "Volumet i stasjon %c: er %s\n" -STRING_LABEL_HELP3, "Volumet i stasjon %c: har ingen merke\n" +STRING_LABEL_HELP3, "Volumet i stasjon %c: har ingen navn\n" STRING_LABEL_HELP4, "Volumet Serie Nummer er %04X-%04X\n" STRING_LABEL_HELP5, "Stasjon merke (11 tegn, innføre hvis ingen)? " @@ -480,7 +476,7 @@ STRING_VERSION_HELP7, "\nReactOS versjon skrivet av:\n" STRING_VOL_HELP1, " Volumet i stasjon %c: er %s" -STRING_VOL_HELP2, " Volumet i stasjon %c: har ingen merke" +STRING_VOL_HELP2, " Volumet i stasjon %c: har ingen navn" STRING_VOL_HELP3, " Volumet Serie nummer er %04X-%04X\n" STRING_VOL_HELP4, "Vis disk volumet merke og serie nummer, hvis det eksisterer.\n\nVOL [stasjon:]" @@ -625,7 +621,7 @@ STRING_ERROR_REQ_PARAM_MISSING, "Required parameter missing\n" STRING_ERROR_INVALID_DRIVE, "Ugyldig driver spesifikasjon\n" STRING_ERROR_INVALID_PARAM_FORMAT, "Ugyldig parameter format - %s\n" -STRING_ERROR_BADCOMMAND, "Feil kommando eller filenavn\n" +STRING_ERROR_BADCOMMAND, "Feil kommando eller filnavn\n" STRING_ERROR_OUT_OF_MEMORY, "Ute av minne feil.\n" STRING_ERROR_CANNOTPIPE, "Feil! Kan ikke pipe! kan ikke åpne temporære filer!\n" STRING_ERROR_D_PAUSEMSG, "Trykk en tast for å fortsette . . ."

1 0

[ekohl] 26057: Get rid of the ugly dialogs. User the current shell font instead.
by ekohl＠svn.reactos.org 10 Mar '07

10 Mar '07

Author: ekohl Date: Sat Mar 10 17:32:49 2007 New Revision: 26057 URL: http://svn.reactos.org/svn/reactos?rev=26057&view=rev Log: Get rid of the ugly dialogs. User the current shell font instead. Modified: 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/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/uk-UA.rc 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 Sat Mar 10 17:32:49 2007 @@ -4,7 +4,6 @@ STRINGTABLE { IDS_APPNAME, "WineMine" - } MENU_WINEMINE MENU DISCARDABLE @@ -27,10 +26,11 @@ } } -DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP 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 @@ -45,20 +45,22 @@ DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 } -DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP 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 DEFPUSHBUTTON "OK", IDOK, 60, 40, 40, 15 } -DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP 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 @@ -70,10 +72,11 @@ PUSHBUTTON "Abbrechen", IDCANCEL, 40, 50, 50, 15 } -DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP 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 Sat Mar 10 17:32:49 2007 @@ -27,10 +27,11 @@ } } -DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP CAPTION "Ãñçãïñüôåñïé ×ñüíïé" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT { GROUPBOX "Ãñçãïñüôåñïé ×ñüíïé", IDNONE, 10, 10, 140, 45 LTEXT "Áñ÷Üñéïò", IDNONE, 20, 20, 40, 8 @@ -45,20 +46,22 @@ DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 } -DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP CAPTION "Óõã÷áñçôÞñéá!" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT { LTEXT "Ðáñáêáëþ óõìðëçñþóôå ôï üíïìÜ óáò", IDIGNORE, 10, 10, 150, 10 EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 DEFPUSHBUTTON "OÊ", IDOK, 60, 40, 40, 15 } -DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP CAPTION "Ðñïóùðéêü Ðáé÷íßäé" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT { LTEXT "ÃñáììÝò", IDNONE, 5, 5, 30, 10 LTEXT "ÓôÞëåò", IDNONE, 5, 35, 30, 10 @@ -70,10 +73,11 @@ PUSHBUTTON "Áêýñùóç", IDCANCEL, 40, 50, 50, 15 } -DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP 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 Sat Mar 10 17:32:49 2007 @@ -27,10 +27,11 @@ } } -DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP 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 @@ -45,20 +46,22 @@ DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 } -DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP 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 DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15 } -DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP 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 @@ -70,10 +73,11 @@ PUSHBUTTON "Cancel", IDCANCEL, 40, 50, 50, 15 } -DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP 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/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 Sat Mar 10 17:32:49 2007 @@ -33,10 +33,11 @@ } } -DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP 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 @@ -51,20 +52,22 @@ DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 } -DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP 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 DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15 } -DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP 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 @@ -77,9 +80,10 @@ } DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP CAPTION "A 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 Sat Mar 10 17:32:49 2007 @@ -4,7 +4,6 @@ STRINGTABLE { IDS_APPNAME, "WineMine" - } MENU_WINEMINE MENU DISCARDABLE @@ -27,10 +26,11 @@ } } -DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP 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 @@ -45,20 +45,22 @@ DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 } -DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP 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 DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15 } -DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP 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 @@ -70,10 +72,11 @@ PUSHBUTTON "Batal", IDCANCEL, 40, 50, 50, 15 } -DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP 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 Sat Mar 10 17:32:49 2007 @@ -27,10 +27,11 @@ } } -DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP 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 @@ -45,20 +46,22 @@ DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 } -DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP 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 DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15 } -DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP 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 @@ -70,10 +73,11 @@ PUSHBUTTON "Annulla", IDCANCEL, 40, 50, 50, 15 } -DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP 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 Sat Mar 10 17:32:49 2007 @@ -27,10 +27,11 @@ } } -DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP CAPTION "Beste tider" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT { GROUPBOX "Beste tider", IDNONE, 10, 10, 140, 45 LTEXT "Nybegynner", IDNONE, 20, 20, 40, 8 @@ -45,20 +46,22 @@ DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 } -DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP CAPTION "Congratulations!" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT { LTEXT "Skriv inn navnet ditt", IDIGNORE, 10, 10, 150, 10 EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15 } -DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP CAPTION "Egendefinert spill" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT { LTEXT "Høyde", IDNONE, 5, 5, 30, 10 LTEXT "Bredde", IDNONE, 5, 35, 30, 10 @@ -70,10 +73,11 @@ PUSHBUTTON "Avbryt", IDCANCEL, 40, 50, 50, 15 } -DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP CAPTION "Om" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT { LTEXT "Minesveiper", IDNONE, 10, 10, 35, 10 LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 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 Sat Mar 10 17:32:49 2007 @@ -27,10 +27,11 @@ } } -DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP 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 @@ -45,20 +46,22 @@ DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 } -DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP 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 DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15 } -DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP 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 @@ -70,10 +73,11 @@ PUSHBUTTON "Annuleren", IDCANCEL, 40, 50, 50, 15 } -DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP 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 Sat Mar 10 17:32:49 2007 @@ -29,10 +29,11 @@ } } -DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP CAPTION "Najlepsze czasy" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT { GROUPBOX "Najlepsze czasy", IDNONE, 10, 10, 140, 45 LTEXT "Pocz¹tkuj¹cy", IDNONE, 20, 20, 40, 8 @@ -47,20 +48,22 @@ DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 } -DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP CAPTION "Gratulacje!" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT { LTEXT "Wpisz swoje imiê", IDNONE, 10, 10, 150, 10 EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15 } -DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP CAPTION "Ustawienia gry" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT { LTEXT "Iloæ rzêdów", IDNONE, 5, 5, 30, 10 LTEXT "Iloæ kolumn", IDNONE, 5, 35, 30, 10 @@ -72,10 +75,11 @@ PUSHBUTTON "Wycofaj", IDCANCEL, 40, 50, 50, 15 } -DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP 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/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 Sat Mar 10 17:32:49 2007 @@ -35,10 +35,11 @@ } } -DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP CAPTION "Êðàù³ ÷àñè" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT { GROUPBOX "Êðàù³ ÷àñè", IDNONE, 10, 10, 140, 45 LTEXT "Ïî÷àòê³âåöü", IDNONE, 20, 20, 40, 8 @@ -53,20 +54,22 @@ DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 } -DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP CAPTION "Â³òàííÿ!" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT { LTEXT "Ââåä³òü Âàøå ³ì'ÿ", IDIGNORE, 10, 10, 150, 10 EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 DEFPUSHBUTTON "OK", IDOK, 60, 40, 40, 15 } -DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP CAPTION "Îñîáëèâà ãðà" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT { LTEXT "Âèñîòà", IDNONE, 5, 5, 30, 10 LTEXT "Øèðèíà", IDNONE, 5, 35, 30, 10 @@ -78,10 +81,11 @@ PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 40, 50, 50, 15 } -DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP 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

1 0

[dgorbachev] 26056: Do not install them two times.
by dgorbachev＠svn.reactos.org 10 Mar '07

10 Mar '07

Author: dgorbachev Date: Sat Mar 10 15:47:04 2007 New Revision: 26056 URL: http://svn.reactos.org/svn/reactos?rev=26056&view=rev Log: Do not install them two times. Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Sat Mar 10 15:47:04 2007 @@ -229,7 +229,6 @@ ; Drivers -drivers\base\kdcom\kdcom.dll 2 drivers\base\bootvid\bootvid.dll 1 drivers\base\beep\beep.sys 2 drivers\base\null\null.sys 2 @@ -245,8 +244,6 @@ drivers\filesystems\mup\mup.sys 2 drivers\filesystems\np\npfs.sys 2 -drivers\input\i8042prt\i8042prt.sys 2 -drivers\input\kbdclass\kbdclass.sys 2 drivers\input\mouclass\mouclass.sys 2 drivers\input\sermouse\sermouse.sys 2

1 0

[dgorbachev] 26055: Disable incorrect optimization
by dgorbachev＠svn.reactos.org 10 Mar '07

10 Mar '07

Author: dgorbachev Date: Sat Mar 10 14:06:02 2007 New Revision: 26055 URL: http://svn.reactos.org/svn/reactos?rev=26055&view=rev Log: Disable incorrect optimization Modified: trunk/reactos/drivers/filesystems/vfat/finfo.c Modified: trunk/reactos/drivers/filesystems/vfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/f… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/finfo.c (original) +++ trunk/reactos/drivers/filesystems/vfat/finfo.c Sat Mar 10 14:06:02 2007 @@ -620,6 +620,7 @@ } else { +#if 0 /* FIXME */ if (Fcb->LastCluster > 0) { if (Fcb->RFCB.AllocationSize.u.LowPart - ClusterSize == Fcb->LastOffset) @@ -656,6 +657,12 @@ Status = OffsetToCluster(DeviceExt, Cluster, ROUND_DOWN(NewSize - 1, ClusterSize) - Fcb->LastOffset, &NCluster, TRUE); +#else + Status = OffsetToCluster(DeviceExt, FirstCluster, + ROUND_DOWN(NewSize - 1, ClusterSize), + &Cluster, TRUE); + NCluster = Cluster; +#endif if (NCluster == 0xffffffff || !NT_SUCCESS(Status)) { /* disk is full */ @@ -678,7 +685,7 @@ { AllocSizeChanged = TRUE; /* FIXME: Use the cached cluster/offset better way. */ - Fcb->LastCluster = Fcb->LastCluster = 0; + Fcb->LastCluster = Fcb->LastOffset = 0; UpdateFileSize(FileObject, Fcb, NewSize, ClusterSize); if (NewSize > 0) {

1 0

[tretiakov] 26054: Disable debug (second attempt
by tretiakov＠svn.reactos.org 10 Mar '07

10 Mar '07

Author: tretiakov Date: Sat Mar 10 13:40:11 2007 New Revision: 26054 URL: http://svn.reactos.org/svn/reactos?rev=26054&view=rev Log: Disable debug (second attempt Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c Sat Mar 10 13:40:11 2007 @@ -30,7 +30,7 @@ #include <w32k.h> -//#define YDEBUG +#define NDEBUG #include <debug.h> /* dialog resources appear to pass this in 16 bits, handle them properly */

1 0

[ekohl] 26053: - Let the user close dialogs by clicking the close (X) button.
by ekohl＠svn.reactos.org 10 Mar '07

10 Mar '07

Author: ekohl Date: Sat Mar 10 12:29:50 2007 New Revision: 26053 URL: http://svn.reactos.org/svn/reactos?rev=26053&view=rev Log: - Let the user close dialogs by clicking the close (X) button. Modified: trunk/reactos/base/applications/games/winemine/dialog.c Modified: trunk/reactos/base/applications/games/winemine/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/dialog.c (original) +++ trunk/reactos/base/applications/games/winemine/dialog.c Sat Mar 10 12:29:50 2007 @@ -97,7 +97,7 @@ for( i = 0; i < 3; i++ ) SetDlgItemText( hDlg, (IDC_NAME1) + i, p_board->best_name[i] ); - /* set best times */ + /* set best times */ for( i = 0; i < 3; i++ ) SetDlgItemInt( hDlg, (IDC_TIME1) + i, p_board->best_time[i], FALSE ); return TRUE; @@ -105,6 +105,7 @@ case WM_COMMAND: switch( LOWORD( wParam ) ) { case IDOK: + case IDCANCEL: EndDialog( hDlg, 0 ); return TRUE; } @@ -122,6 +123,7 @@ case WM_COMMAND: switch( LOWORD( wParam ) ) { case IDOK: + case IDCANCEL: EndDialog( hDlg, 0 ); return TRUE; }

1 0

[hyperion] 26052: Set _SEH_ENABLE_TRACE for debug builds
by hyperion＠svn.reactos.org 10 Mar '07

10 Mar '07

Author: hyperion Date: Sat Mar 10 09:42:05 2007 New Revision: 26052 URL: http://svn.reactos.org/svn/reactos?rev=26052&view=rev Log: Set _SEH_ENABLE_TRACE for debug builds Modified: trunk/reactos/ReactOS.rbuild Modified: trunk/reactos/ReactOS.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS.rbuild?rev=26052&r… ============================================================================== --- trunk/reactos/ReactOS.rbuild (original) +++ trunk/reactos/ReactOS.rbuild Sat Mar 10 09:42:05 2007 @@ -18,13 +18,14 @@ </if> <if property="DBG" value="1"> <define name="DBG" value="1" /> + <define name="_SEH_ENABLE_TRACE" /> <property name="DBG_OR_KDBG" value="true" /> </if> <if property="KDBG" value="1"> <define name="KDBG" value="1" /> <property name="DBG_OR_KDBG" value="true" /> </if> - + <if property="GDB" value="0"> <if property="OPTIMIZE" value="1"> <compilerflag>-Os</compilerflag>

1 0

[hyperion] 26051: added lib/debugsup added lib/debugsup/debugsup-ntos.def added lib/debugsup/debugsup.rbuild modified lib/lib.rbuild New import-only library. Links modules that need low-level debugging functions (DbgBreakPoint, DbgBreakPointWithStatus, DbgPrint, DbgPrompt, DbgPrintEx, RtlAssert, RtlUnwind) to the correct low-level library (ntdll for user mode and ntoskrnl for kernel mode). This ensures debugging macros will always work, everywhere, and it doesn't force all modules with debugging
by hyperion＠svn.reactos.org 10 Mar '07

10 Mar '07

Author: hyperion Date: Sat Mar 10 06:51:27 2007 New Revision: 26051 URL: http://svn.reactos.org/svn/reactos?rev=26051&view=rev Log: added lib/debugsup added lib/debugsup/debugsup-ntos.def added lib/debugsup/debugsup.rbuild modified lib/lib.rbuild New import-only library. Links modules that need low-level debugging functions (DbgBreakPoint, DbgBreakPointWithStatus, DbgPrint, DbgPrompt, DbgPrintEx, RtlAssert, RtlUnwind) to the correct low-level library (ntdll for user mode and ntoskrnl for kernel mode). This ensures debugging macros will always work, everywhere, and it doesn't force all modules with debugging information to link to ntdll/ntoskrnl. TODO: link RtlUnwind to kernel32 for Win32 modules modified tools/rbuild/backend/mingw/modulehandler.cpp modified tools/rbuild/backend/mingw/modulehandler.h Add debugsup_ntdll/debugsup_ntoskrnl as an implicit library for all executable modules (minus the kernel) Added: trunk/reactos/lib/debugsup/ trunk/reactos/lib/debugsup/debugsup-ntos.def trunk/reactos/lib/debugsup/debugsup.rbuild Modified: trunk/reactos/lib/lib.rbuild trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Added: trunk/reactos/lib/debugsup/debugsup-ntos.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/debugsup/debugsup-ntos… ============================================================================== --- trunk/reactos/lib/debugsup/debugsup-ntos.def (added) +++ trunk/reactos/lib/debugsup/debugsup-ntos.def Sat Mar 10 06:51:27 2007 @@ -1,0 +1,10 @@ +EXPORTS +DbgBreakPoint@0 +DbgBreakPointWithStatus@4 +DbgPrint +DbgPrompt@12 +DbgPrintEx +RtlAssert@16 +RtlUnwind@16 + +;EOF Added: trunk/reactos/lib/debugsup/debugsup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/debugsup/debugsup.rbui… ============================================================================== --- trunk/reactos/lib/debugsup/debugsup.rbuild (added) +++ trunk/reactos/lib/debugsup/debugsup.rbuild Sat Mar 10 06:51:27 2007 @@ -1,0 +1,8 @@ +<group> +<module name="debugsup_ntoskrnl" type="staticlibrary"> + <importlibrary definition="debugsup-ntos.def" dllname="ntoskrnl.exe" /> +</module> +<module name="debugsup_ntdll" type="staticlibrary"> + <importlibrary definition="debugsup-ntos.def" dllname="ntdll.dll" /> +</module> +</group> Modified: trunk/reactos/lib/lib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/lib.rbuild?rev=26051&r… ============================================================================== --- trunk/reactos/lib/lib.rbuild (original) +++ trunk/reactos/lib/lib.rbuild Sat Mar 10 06:51:27 2007 @@ -64,5 +64,8 @@ <directory name="wdmguid"> <xi:include href="wdmguid/wdmguid.rbuild" /> </directory> +<directory name="debugsup"> + <xi:include href="debugsup/debugsup.rbuild" /> +</directory> </group> Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Sat Mar 10 06:51:27 2007 @@ -418,7 +418,7 @@ if ( iend == 0 ) return; - + for ( size_t i = 0; i < iend; i++ ) { const Dependency& dependency = *module.dependencies[i]; @@ -506,7 +506,7 @@ } else newExtension = ".o"; - + if ( module.type == BootSector ) directoryTree = backend->outputDirectory; else @@ -547,7 +547,7 @@ { if ( module.type == Alias ) return; - + fprintf ( fMakefile, ".PHONY: %s_clean\n", module.name.c_str() ); @@ -604,7 +604,7 @@ const vector<CompilationUnit*>& compilationUnits = module.non_if_data.compilationUnits; if ( compilationUnits.size () == 0 ) return ""; - + string objectFilenames ( "" ); for ( size_t i = 0; i < compilationUnits.size (); i++ ) { @@ -636,7 +636,7 @@ return parameters; } -string +string MingwModuleHandler::GenerateGccDefineParameters () const { string parameters = GenerateGccDefineParametersFromVector ( module.project.non_if_data.defines ); @@ -824,7 +824,7 @@ GenerateMacro ( assignmentOperation, windresflagsMacro, data ); - + if ( linkerFlags != NULL ) { string linkerParameters = GenerateLinkerParametersFromVector ( *linkerFlags ); @@ -874,7 +874,7 @@ "+=", rIf.data, NULL ); - fprintf ( + fprintf ( fMakefile, "endif\n\n" ); } @@ -957,7 +957,7 @@ "+=", rIf.data, NULL ); - fprintf ( + fprintf ( fMakefile, "endif\n\n" ); } @@ -997,7 +997,7 @@ dependencies += " " + extraDependencies; if ( module.pch && use_pch ) dependencies += " " + GetPrecompiledHeaderFilename (); - + /* WIDL generated headers may be used */ vector<string> rpcDependencies; GetRpcHeaderDependencies ( rpcDependencies ); @@ -1172,7 +1172,7 @@ return PassThruCacheDirectory ( basename + "_s.h", backend->intermediateDirectory ); } - + void MingwModuleHandler::GenerateWidlCommandsServer ( const CompilationUnit& compilationUnit, @@ -1397,7 +1397,7 @@ GetBasename ( module.GetPath () ) + ".map", backend->outputDirectory ); CLEAN_FILE ( mapFilename ); - + fprintf ( fMakefile, "\t$(ECHO_OBJDUMP)\n" ); fprintf ( fMakefile, @@ -1438,14 +1438,14 @@ GetBasename ( filename ) + ".nostrip" + GetExtension ( filename ), backend->outputDirectory ); CLEAN_FILE ( nostripFilename ); - + fprintf ( fMakefile, "\t$(ECHO_CP)\n" ); fprintf ( fMakefile, "\t${cp} %s %s 1>$(NUL)\n", outputFilename.c_str (), nostripFilename.c_str () ); - + fprintf ( fMakefile, "endif\n" ); } @@ -1562,14 +1562,14 @@ { string temp_exp = ros_temp + module.name + ".temp.exp"; CLEAN_FILE ( temp_exp ); - + fprintf ( fMakefile, "\t${dlltool} --dllname %s --def %s --output-exp %s %s\n", targetName.c_str (), definitionFilename.c_str (), temp_exp.c_str (), killAt.c_str () ); - + fprintf ( fMakefile, "\t%s %s %s %s -o %s %s %s %s\n", linker.c_str (), @@ -1580,7 +1580,7 @@ objectsMacro.c_str (), libsMacro.c_str (), GetLinkerMacro ().c_str () ); - + fprintf ( fMakefile, "\t$(Q)$(PEFIXUP_TARGET) %s -exports %s\n", target.c_str (), @@ -1601,7 +1601,7 @@ objectsMacro.c_str (), libsMacro.c_str (), GetLinkerMacro ().c_str () ); - + #if 0 // causes crashes sometimes fprintf ( fMakefile, "\t${objcopy} -R .edata %s\n", @@ -1639,7 +1639,7 @@ const string& widlflagsMacro ) { size_t i; - + const vector<CompilationUnit*>& compilationUnits = data.compilationUnits; for ( i = 0; i < compilationUnits.size (); i++ ) { @@ -1728,7 +1728,7 @@ const string& objs_macro ) const { string archiveFilename ( GetModuleArchiveFilename () ); - + fprintf ( fMakefile, "%s: %s | %s\n", archiveFilename.c_str (), @@ -1908,7 +1908,7 @@ // Always force disabling of sibling calls optimisation for GCC // (TODO: Move to version-specific once this bug is fixed in GCC) globalCflags += " -fno-optimize-sibling-calls"; - + fprintf ( fMakefile, "%s += $(PROJECT_CFLAGS) %s\n", @@ -2047,7 +2047,7 @@ { if ( module.invocations.size () == 0 ) return; - + size_t iend = module.invocations.size (); for ( size_t i = 0; i < iend; i++ ) { @@ -2122,7 +2122,7 @@ GetModuleDependencies ( dependencies ); GetInvocationDependencies ( module, dependencies ); - + if ( dependencies.size() ) { fprintf ( fMakefile, @@ -2179,7 +2179,7 @@ string library_target ( GetImportLibraryFilename ( module, &clean_files ) ); string defFilename = GetDefinitionFilename (); - + string_list deps; GetDefinitionDependencies ( deps ); @@ -2256,6 +2256,33 @@ } } +enum DebugSupportType +{ + DebugKernelMode, + DebugUserMode +}; + +static void +MingwAddDebugSupportLibraries ( Module& module, DebugSupportType type ) +{ + Library* pLibrary; + + switch(type) + { + case DebugKernelMode: + pLibrary = new Library ( module, "debugsup_ntoskrnl" ); + break; + + case DebugUserMode: + pLibrary = new Library ( module, "debugsup_ntdll" ); + break; + + default: + assert(0); + } + + module.non_if_data.libraries.push_back(pLibrary); +} MingwBuildToolModuleHandler::MingwBuildToolModuleHandler ( const Module& module_ ) : MingwModuleHandler ( module_ ) @@ -2283,7 +2310,7 @@ linker = "${host_gpp}"; else linker = "${host_gcc}"; - + fprintf ( fMakefile, "%s: %s %s | %s\n", targetMacro.c_str (), objectsMacro.c_str (), @@ -2396,6 +2423,12 @@ } void +MingwKernelModeDLLModuleHandler::AddImplicitLibraries ( Module& module ) +{ + MingwAddDebugSupportLibraries ( module, DebugKernelMode ); +} + +void MingwKernelModeDLLModuleHandler::Process () { GenerateKernelModeDLLModuleTarget (); @@ -2443,6 +2476,12 @@ } void +MingwKernelModeDriverModuleHandler::AddImplicitLibraries ( Module& module ) +{ + MingwAddDebugSupportLibraries ( module, DebugKernelMode ); +} + +void MingwKernelModeDriverModuleHandler::Process () { GenerateKernelModeDriverModuleTarget (); @@ -2491,6 +2530,12 @@ } void +MingwNativeDLLModuleHandler::AddImplicitLibraries ( Module& module ) +{ + MingwAddDebugSupportLibraries ( module, DebugUserMode ); +} + +void MingwNativeDLLModuleHandler::Process () { GenerateNativeDLLModuleTarget (); @@ -2504,7 +2549,7 @@ string objectsMacro = GetObjectsMacro ( module ); string linkDepsMacro = GetLinkingDependenciesMacro (); string libsMacro = GetLibsMacro (); - + GenerateImportLibraryTargetIfNeeded (); if ( module.non_if_data.compilationUnits.size () > 0 ) @@ -2538,6 +2583,12 @@ } void +MingwNativeCUIModuleHandler::AddImplicitLibraries ( Module& module ) +{ + MingwAddDebugSupportLibraries ( module, DebugUserMode ); +} + +void MingwNativeCUIModuleHandler::Process () { GenerateNativeCUIModuleTarget (); @@ -2551,7 +2602,7 @@ string objectsMacro = GetObjectsMacro ( module ); string linkDepsMacro = GetLinkingDependenciesMacro (); string libsMacro = GetLibsMacro (); - + GenerateImportLibraryTargetIfNeeded (); if ( module.non_if_data.compilationUnits.size () > 0 ) @@ -2618,6 +2669,7 @@ MingwWin32DLLModuleHandler::AddImplicitLibraries ( Module& module ) { MingwAddImplicitLibraries ( module ); + MingwAddDebugSupportLibraries ( module, DebugUserMode ); } void @@ -2677,6 +2729,7 @@ MingwWin32CUIModuleHandler::AddImplicitLibraries ( Module& module ) { MingwAddImplicitLibraries ( module ); + MingwAddDebugSupportLibraries ( module, DebugUserMode ); } void @@ -2736,6 +2789,7 @@ MingwWin32GUIModuleHandler::AddImplicitLibraries ( Module& module ) { MingwAddImplicitLibraries ( module ); + MingwAddDebugSupportLibraries ( module, DebugUserMode ); } void @@ -2901,7 +2955,7 @@ linkDepsMacro.c_str (), payload->name.c_str (), GetDirectory(GetTargetFilename(module,NULL)).c_str () ); - + fprintf ( fMakefile, "\t$(ECHO_BOOTPROG)\n" ); fprintf ( fMakefile, "\t$(BOOTPROG_PREPARE) $(OUTPUT)$(SEP)%s %s\n", Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Sat Mar 10 06:51:27 2007 @@ -104,7 +104,7 @@ string_list* pclean_files ) const; std::string GetObjectFilenames (); - + std::string GetPreconditionDependenciesName () const; std::string GetCFlagsMacro () const; static std::string GetObjectsMacro ( const Module& ); @@ -280,6 +280,7 @@ virtual void Process (); std::string TypeSpecificCFlags() { return "-D_SEH_NO_NATIVE_NLG"; } std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; } + void AddImplicitLibraries ( Module& module ); private: void GenerateKernelModeDLLModuleTarget (); }; @@ -293,6 +294,7 @@ virtual void Process (); std::string TypeSpecificCFlags() { return "-D__NTDRIVER__ -D_SEH_NO_NATIVE_NLG"; } std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; } + void AddImplicitLibraries ( Module& module ); private: void GenerateKernelModeDriverModuleTarget (); }; @@ -306,6 +308,7 @@ virtual void Process (); std::string TypeSpecificCFlags() { return "-D_SEH_NO_NATIVE_NLG"; } std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; } + void AddImplicitLibraries ( Module& module ); private: void GenerateNativeDLLModuleTarget (); }; @@ -319,6 +322,7 @@ virtual void Process (); std::string TypeSpecificCFlags() { return "-D__NTAPP__ -D_SEH_NO_NATIVE_NLG"; } std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; } + void AddImplicitLibraries ( Module& module ); private: void GenerateNativeCUIModuleTarget (); };

1 0

[dgorbachev] 26050: Update Russian translation.
by dgorbachev＠svn.reactos.org 09 Mar '07

09 Mar '07

Author: dgorbachev Date: Sat Mar 10 01:27:04 2007 New Revision: 26050 URL: http://svn.reactos.org/svn/reactos?rev=26050&view=rev Log: Update Russian translation. Added: trunk/reactos/dll/cpl/sysdm/ru-RU.rc Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rc Added: trunk/reactos/dll/cpl/sysdm/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/ru-RU.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/ru-RU.rc (added) +++ trunk/reactos/dll/cpl/sysdm/ru-RU.rc Sat Mar 10 01:27:04 2007 @@ -1,0 +1,270 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 256, 218 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Îáùèå" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "Îïåðàöèîííàÿ ñèñòåìà:", IDC_STATIC, 4, 132, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 + LTEXT "Âåðñèÿ ", IDC_STATIC, 10, 153, 25, 9 + LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Êîìïüþòåð:", IDC_STATIC, 124, 132, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 + CONTROL "Ïîñåòèòå <A HREF=""http://www.reactos.org/"">äîìàøíþþ ñòðàíèöó ÐåàêòÎÑ</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 93, 8 + PUSHBUTTON "View &licence...", IDC_LICENCE, 170, 199, 78, 13 +END + + +IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, 256, 218 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Îáîðóäîâàíèå" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Äèñïåò÷åð óñòðîéñòâ", IDC_STATIC, 6, 7, 244, 61 + ICON IDI_DEVMGR, IDC_STATIC, 12, 18, 23, 21, SS_ICON + LTEXT "Äèñïåò÷åð óñòðîéñòâ ïðèâîäèò ñïèñîê âñåãî óñòàíîâëåííîãî îáîðóäîâàíèÿ íà äàííîì êîìïüþòåðå è ïîçâîëÿåò èçìåíèòü ñâîéñòâà ëþáîãî óñòðîéñòâà.", IDC_STATIC, 42, 18, 204, 24 + PUSHBUTTON "&Äèñïåò÷åð óñòðîéñòâ...", IDC_HARDWARE_DEVICE_MANAGER, 154, 48, 90, 15 + + GROUPBOX "Ìàñòåð îáîðóäîâàíèÿ", IDC_STATIC, 6, 79, 244, 61 + ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON + LTEXT "Ìàñòåð îáîðóäîâàíèÿ ïîìîãàåò óñòàíîâèòü, âîñòàíîâèòü, îòêëþ÷èòü èëè èçâëå÷ü ëþáîå óñòðîéñòâî, à òàêæå íàñòðîèòü åãî.", IDC_STATIC, 42, 90, 204, 24 + PUSHBUTTON "&Ìàñòåð îáîðóäîâàíèÿ...", IDC_HARDWARE_WIZARD, 154, 120, 90, 15 + + GROUPBOX "Ïðîôèëè îáîðóäîâàíèÿ", IDC_STATIC, 6, 149, 244, 61 + ICON IDI_HARDPROF, IDC_STATIC, 12, 160, 23, 21, SS_ICON + LTEXT "Ïðîôèëè îáîðóäîâàíèÿ ïîìîãàþò óñòàíàâëèâàòü è õðàíèòü ðàçëè÷íûå êîíôèãóðàöèè îáîðóäîâàíèÿ.", IDC_STATIC, 42, 160, 204, 24 + PUSHBUTTON "&Ïðîôèëè îáîðóäîâàíèÿ...", IDC_HARDWARE_PROFILE, 154, 190, 90, 15 +END + + +IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Äîïîëíèòåëüíî" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Administrator privileges are required for most of these settings.", IDC_STATIC, 12, 5, 236, 8 + GROUPBOX "Áûñòðîäåéñòâèå", IDC_STATIC, 6, 18, 244, 50 + LTEXT "Ïàðàìåòðû áåñòðîäåéñòâèÿ îïðåäåëÿþò, êàê ïðèëîæåíèÿ èñïîëüçóþò ïàìÿòü, ÷òî âëèÿåò íà ñêîðîñòü ðàáîòû êîìïüþòåðà.", IDC_STATIC, 16, 29, 210, 17 + PUSHBUTTON "&Ïàðàìåòðû áûñòðîäåéñòâèÿ...", IDC_PERFOR, 194, 48, 50, 15 + + GROUPBOX "Ïðîôèëè ïîëüçîâàòåëåé", IDC_STATIC, 6,75,244,48 + LTEXT "Desktop settings related to your logon", IDC_STATIC, 16, 88, 210, 20 + PUSHBUTTON "Settings", IDC_USERPROFILE, 194, 103, 50, 15 + + GROUPBOX "Çàãðóçêà è âîñòàíîâëåíèå", IDC_STATIC, 6, 131, 244, 52 + LTEXT "Ïàðàìåòðû çàãðóçêè è âîñòàíîâëåíèÿ îïðåäåëÿþò äåéñòâèÿ, âûïîëíÿåìûå ïðè çàïóñêå êîìïüþòåðà èëè ïðè îñòàíîâêå, âûçâàííîé êàêîé-íèáóäü îøèáêîé.", IDC_STATIC, 16, 144, 210, 19 + PUSHBUTTON "&Çàãðóçêà è âîñòàíîâëåíèå...", IDC_STAREC, 194, 162, 50, 15 + + PUSHBUTTON "Ï&åðåìåííûå ñðåäû...", IDC_ENVVAR, 84, 192, 80, 15 + PUSHBUTTON "Error Reporting", IDC_ERRORREPORT, 170, 192, 80, 15 +END + + +IDD_HARDWAREPROFILES DIALOGEX 6, 18, 254, 234 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ïðîôèëè îáîðóäîâàíèÿ" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HARDPROF, IDC_STATIC, 8, 11, 18, 20, SS_ICON + LTEXT "You can set up hardware profiles for different hardware configurations. At startup, you can choose the profile you want to use.", IDC_STATIC, 46, 11, 188, 25 + LTEXT "Äîñòóïíûå ïðîôèëè îáîðóäîâàíèÿ:", IDC_STATIC, 8, 41, 120, 8 + LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 15 + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 15 + PUSHBUTTON "Ñâîéñòâà", IDC_HRDPROFPROP, 8, 106, 50, 14 + PUSHBUTTON "Êîïèðîâàòü", IDC_HRDPROFCOPY, 63, 106, 50, 14 + PUSHBUTTON "Ïåðåèìåíîâàòü", IDC_HRDPROFRENAME, 118, 106, 50, 14 + PUSHBUTTON "Óäàëèòü", IDC_HRDPROFDEL, 173, 106, 50, 14 + + GROUPBOX "Hardware profiles selection", IDC_STATIC, 7, 130, 240, 75 + LTEXT "When ReactOS starts:", IDC_STATIC, 14, 142, 210, 8 + //RADIOBUTTON "&Wait until I select a hardware profile", IDC_HRDPROFWAIT, 14, 158, 133, 8 + //RADIOBUTTON "&Select the first profile listed if I don't select a profile in", IDC_HRDPROFSELECT, 14, 173, 190, 8 + CONTROL "&Wait until I select a hardware profile", IDC_HRDPROFWAIT, "button", BS_AUTORADIOBUTTON, 14, 158, 133, 8 + CONTROL "&Select the first profile listed if I don't select a profile in", IDC_HRDPROFSELECT, "button", BS_AUTORADIOBUTTON, 14, 173, 190, 8 + LTEXT "ñåêóíä", IDC_STATIC, 65, 187, 35, 8 + EDITTEXT IDC_HRDPROFEDIT, 25, 185, 35, 12 + CONTROL "", IDC_HRDPROFUPDWN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 + + DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 197, 213, 50, 14 +END + + +IDD_RENAMEPROFILE DIALOGEX 12, 26, 256, 52 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ïåðåèìåíîâàòü ïðîôèëü" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "From:", IDC_STATIC, 5, 10, 20, 8 + LTEXT "", IDC_RENPROFEDITFROM, 30, 10, 160, 10 + LTEXT "To:", IDC_STATIC, 5, 30, 20, 8 + EDITTEXT IDC_RENPROFEDITTO, 30, 30, 160, 12 + + DEFPUSHBUTTON "OK", IDOK, 196, 6, 50, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 196, 24, 50, 14 +END + + +IDD_USERPROFILE DIALOGEX 0, 0, 256, 218 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ïðîôèëè ïîëüçîâàòåëåé" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_USERPROF, IDC_STATIC, 6, 11, 16, 16, SS_ICON + LTEXT "Ïðîôèëü ïîëüçîâàòåëÿ ñîäåðæèò íàñòðîéêè ðàáî÷åãî ñòîëà è äðóãèå ñâåäåíèÿ, èñïîëüçóåìûå ïðè âõîäå â ñèñòåìó. Ìîæíî ñîçäàòü ðàçëè÷íûå ïðîôèëè íà ðàçíûõ êîìïüþòåðàõ äëÿ îäíîãî ïîëüçîâàòåëÿ èëè èñïîëüçîâàòü îäèí îáùèé ïðîôèëü.", + IDC_STATIC, 40, 11, 204, 35 + LTEXT "Ïðîôèëè, õðàíÿùèåñÿ íà ýòîì êîìïüþòåðå:", IDC_STATIC, 16, 51, 204, 9 + CONTROL "", IDC_USERPROFILE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, + 6, 66, 244, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "Ñìåíèòü òèï", IDC_USERPROFILE_CHANGE, 90, 156, 50, 13 + PUSHBUTTON "Óäàëèòü", IDC_USERPROFILE_DELETE, 145, 156, 50, 13 + PUSHBUTTON "Êîïèðîâàòü", IDC_USERPROFILE_COPY, 200, 156, 50, 13 + + CONTROL "To create new user accounts, open <A>User Accounts</A> in Control Panel.", IDC_USERACCOUNT_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 175, 228, 8 + + DEFPUSHBUTTON "OK", IDOK, 134, 200, 54, 13 + PUSHBUTTON "Îòìåíà", IDCANCEL, 196, 200, 54, 13 +END + + +IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Çàãðóçêà è âîñòàíîâëåíèå" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Çàãðóçêà ñèñòåìû", IDC_STATIC, 7, 12, 238, 95 + LTEXT "Îïåðàöèîííàÿ ñèñòåìà ïî óìîë÷àíèþ:", IDC_STATIC, 14, 26, 100, 8 + COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST + //CHECKBOX "&Time to display list of operating systems:", IDC_STRECLIST, 14, 56, 150, 8 + CONTROL "&Time to display list of operating systems:", IDC_STRECLIST, "button", BS_AUTOCHECKBOX, 14, 56, 150, 8 + EDITTEXT IDC_STRRECLISTEDIT, 179, 54, 30, 12 + CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 + LTEXT "ñåêóíä", IDC_STATIC, 215, 56, 25, 8 + CONTROL "Time to &display recovery options when needed:", IDC_STRRECREC, "button", BS_AUTOCHECKBOX, 14, 70, 163, 8 + EDITTEXT IDC_STRRECRECEDIT, 179, 68, 30, 12 + CONTROL "", IDC_STRRECRECUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 + LTEXT "ñåêóíä", IDC_STATIC, 215, 70, 25, 8 + LTEXT "To edit the startup options file manually, click Edit.", IDC_STATIC, 14, 89, 187, 8 + PUSHBUTTON "&Edit", IDC_STRRECEDIT, 188, 87, 50, 14 + + GROUPBOX "System failure", IDC_STATIC, 7, 111, 238, 140 + CONTROL "&Write an event to the system log", IDC_STRRECWRITEEVENT, "button", BS_AUTOCHECKBOX, 14, 124, 148, 10 + CONTROL "Se&nd an administrative alert", IDC_STRRECSENDALERT, "button", BS_AUTOCHECKBOX, 14, 138, 148, 10 + CONTROL "Automatically &restart", IDC_STRRECRESTART, "button", BS_AUTOCHECKBOX, 14, 152, 145, 10 + + GROUPBOX "Write debugging information", IDC_STATIC, 12, 167, 227, 76 + COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST + LTEXT "Dump &file:", IDC_STATIC, 17, 202, 150, 8 + EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 + CONTROL "&Overwrite any existing file", IDC_STRRECOVERWRITE, "button", BS_AUTOCHECKBOX, 17, 228, 125, 10 + + DEFPUSHBUTTON "OK", IDOK, 141, 259, 50, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 195, 259, 50, 14 +END + + +IDD_VIRTMEM DIALOGEX 6, 6, 223, 248 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Âèðòóàëüíàÿ ïàìÿòü" +FONT 8, "MS Sans Serif", 0, 0, 0x0 +BEGIN + LTEXT "Äèñê [ìåòêà òîìà]", IDC_STATIC, 12, 5, 96, 9 + LTEXT "Ôàéë ïîäêà÷êè (MB)", IDC_STATIC, 115, 5, 96, 9 + CONTROL "", IDC_PAGEFILELIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP, + 10, 16, 204, 52, WS_EX_CLIENTEDGE + + GROUPBOX "Ðàçìåð ôàéëà ïîäêà÷êè äëÿ âûáðàííîãî äèñêà", IDC_DRIVEGROUP, 10, 70, 204, 104 + LTEXT "Äèñê:", IDC_STATIC, 20, 80, 20, 8 + LTEXT "", IDC_DRIVE, 88, 81, 100, 9 + LTEXT "Äîñòóïíîå ïðîñòðàíñòâî:", IDC_STATIC, 20, 92, 56, 9 + LTEXT "", IDC_SPACEAVAIL, 88, 92, 104, 9 + LTEXT "Èñõîäíûé ðàçìåð (MB):", -1, 22, 118, 54, 9 + LTEXT "Ìàêñèìàëüíûé ðàçìåð (MB):", -1, 22, 131, 64, 9 + CONTROL "&Custom size", IDC_CUSTOM, "Button", BS_AUTORADIOBUTTON, 20, 105, 54, 9 + CONTROL "Ðàçìåð ïî âûáîðó ñèñòåìû", IDC_SYSMANSIZE, "Button", BS_AUTORADIOBUTTON, 20, 145, 88, 9 + CONTROL "Áåç ôàéëà ïîäêà÷êè", IDC_NOPAGEFILE, "Button", BS_AUTORADIOBUTTON, 20, 158, 78,9 + EDITTEXT IDC_INITIALSIZE, 100, 114, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE + EDITTEXT IDC_MAXSIZE, 100, 129, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE + PUSHBUTTON "Óñòàíîâèòü", IDC_SET, 158, 155, 50, 13 + + GROUPBOX "Îáùèé îáúåì ôàéëà ïîäêà÷êè íà âñåõ äèñêàõ", IDC_TOTALGROUP, 10, 177, 204, 46 + LTEXT "Minimum allowed:", IDC_STATIC, 18, 188, 58, 9 + LTEXT "", IDC_MINIMUM, 88, 188, 100, 9 + LTEXT "Recommended:", IDC_STATIC, 18, 199, 52, 9 + LTEXT "", IDC_RECOMMENDED, 88, 197, 100, 9 + LTEXT "Currently allocated:", IDC_STATIC, 18, 210, 66, 9 + LTEXT "", IDC_CURRENT, 88, 208, 100, 9 + + DEFPUSHBUTTON "OK", IDOK, 114, 232, 48, 13 + PUSHBUTTON "Îòìåíà", IDCANCEL, 168, 232, 48, 13 +END + + +IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ïåðåìííûå ñðåäû" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Ïåðåìåííûå ïîëüçîâàòåëÿ", IDC_STATIC, 7, 12, 238, 100 + + CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", + LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | + WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE + PUSHBUTTON "&Ñîçäàòü...", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 + PUSHBUTTON "&Èçìåíèòü...", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 + PUSHBUTTON "&Óäàëèòü", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 + GROUPBOX "Ñèñòåìíûå ïåðåìåííûå", IDC_STATIC, 7, 116, 238, 100 + + CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", + LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | + WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE + PUSHBUTTON "Ñ&îçäàòü...", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 + PUSHBUTTON "È&çìåíèòü...", IDC_SYSTEM_VARIABLE_EDIT, 134, 194, 50, 14 + PUSHBUTTON "Ó&äàëèòü", IDC_SYSTEM_VARIABLE_DELETE, 188, 194, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 141, 224, 50, 14, WS_GROUP + PUSHBUTTON "Îòìåíà", IDCANCEL, 195, 224, 50, 14 +END + + +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Èçìåíåíèå ïåðåìåííîé" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Èì&ÿ ïåðåìåííîé:", IDC_STATIC, 7, 14, 50, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL + LTEXT "Çíà÷åíèå ïåðåìåí&íîé:", IDC_STATIC, 7, 32, 50, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 116, 50, 50, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 170, 50, 50, 14 +END + + +IDD_LICENCE DIALOGEX 6, 5, 267, 159 +CAPTION "Ëèöåíçèîííîå ñîãëàøåíèå" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +STYLE WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +BEGIN + EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE + DEFPUSHBUTTON "OK", IDOK, 106, 142, 54, 13 +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CPLSYSTEMNAME "Ñèñòåìà" + IDS_CPLSYSTEMDESCRIPTION "Ïðîñìîòð èíôîðìàöèè î âàøåì êîìïüþòåðå è èçìåíåíèå ðàçëè÷íûõ ñèñòåìíûõ è àïïàðàòíûõ ïàðàìåòðîâ." + IDS_MEGABYTE "Ìá ÎÇÓ" + IDS_GIGABYTE "Ãá ÎÇÓ" + IDS_TERABYTE "Òá ÎÇÓ" + IDS_PETABYTE "Ïá ÎÇÓ" + IDS_VARIABLE "Ïåðåìåííàÿ" + IDS_VALUE "Çíà÷åíèå" +END Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/sysdm.rc (original) +++ trunk/reactos/dll/cpl/sysdm/sysdm.rc Sat Mar 10 01:27:04 2007 @@ -26,6 +26,7 @@ #include "en.rc" #include "fr.rc" #include "id-ID.rc" +#include "ru-RU.rc" /* #include "cz.rc" @@ -36,6 +37,5 @@ #include "es.rc" #include "Ja.rc" #include "hu.rc" -#include "ru.rc" #include "uk.rc" */

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
29
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 March 2007