Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 29134: Update to Bugzilla 3.0.2
by cfinck＠svn.reactos.org 22 Sep '07

22 Sep '07

1 0

[fireball] 29133: - Print out hardware information to the debug log in case of a crash (yes, even people like me do mistakes...)
by fireball＠svn.reactos.org 21 Sep '07

21 Sep '07

Author: fireball Date: Sat Sep 22 00:15:46 2007 New Revision: 29133 URL: http://svn.reactos.org/svn/reactos?rev=29133&view=rev Log: - Print out hardware information to the debug log in case of a crash (yes, even people like me do mistakes...) Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/i386/cmhar… ============================================================================== --- trunk/reactos/ntoskrnl/config/i386/cmhardwr.c (original) +++ trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Sat Sep 22 00:15:46 2007 @@ -248,7 +248,9 @@ LARGE_INTEGER ViewBase = {{0}}; ULONG_PTR VideoRomBase; PCHAR CurrentVersion; - + extern UNICODE_STRING KeRosProcessorName, KeRosBiosDate, KeRosBiosVersion; + extern UNICODE_STRING KeRosVideoBiosDate, KeRosVideoBiosVersion; + /* Open the SMSS Memory Management key */ RtlInitUnicodeString(&KeyName, L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\" @@ -471,6 +473,9 @@ Data.Buffer, Data.Length + sizeof(UNICODE_NULL)); + /* ROS: Save a copy for bugzilla reporting */ + RtlCreateUnicodeString(&KeRosProcessorName, Data.Buffer); + /* Free the temporary buffer */ RtlFreeUnicodeString(&Data); } @@ -490,7 +495,7 @@ REG_SZ, Data.Buffer, Data.Length + sizeof(UNICODE_NULL)); - + /* Free the temporary buffer */ RtlFreeUnicodeString(&Data); } @@ -647,6 +652,9 @@ REG_SZ, Data.Buffer, Data.Length + sizeof(UNICODE_NULL)); + + /* ROS: Save a copy for bugzilla reporting */ + RtlCreateUnicodeString(&KeRosBiosDate, Data.Buffer); /* Free the string */ RtlFreeUnicodeString(&Data); @@ -704,6 +712,9 @@ REG_MULTI_SZ, BiosVersion, TotalLength); + + /* ROS: Save a copy for bugzilla reporting */ + RtlCreateUnicodeString(&KeRosBiosVersion, (PWCH)BiosVersion); } } @@ -745,6 +756,9 @@ REG_SZ, Data.Buffer, Data.Length + sizeof(UNICODE_NULL)); + + /* ROS: Save a copy for bugzilla reporting */ + RtlCreateUnicodeString(&KeRosVideoBiosDate, Data.Buffer); /* Free the string */ RtlFreeUnicodeString(&Data); @@ -797,6 +811,9 @@ REG_MULTI_SZ, BiosVersion, TotalLength); + + /* ROS: Save a copy for bugzilla reporting */ + RtlCreateUnicodeString(&KeRosVideoBiosVersion, (PWCH)BiosVersion); } }

1 0

[fireball] 29132: - Print out hardware information to the debug log in case of a crash.
by fireball＠svn.reactos.org 21 Sep '07

21 Sep '07

Author: fireball Date: Sat Sep 22 00:14:34 2007 New Revision: 29132 URL: http://svn.reactos.org/svn/reactos?rev=29132&view=rev Log: - Print out hardware information to the debug log in case of a crash. Modified: trunk/reactos/ntoskrnl/ke/bug.c Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=2913… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c (original) +++ trunk/reactos/ntoskrnl/ke/bug.c Sat Sep 22 00:14:34 2007 @@ -29,6 +29,10 @@ PUNICODE_STRING KiBugCheckDriver; ULONG_PTR KiBugCheckData[5]; +/* Bugzilla Reporting */ +UNICODE_STRING KeRosProcessorName, KeRosBiosDate, KeRosBiosVersion; +UNICODE_STRING KeRosVideoBiosDate, KeRosVideoBiosVersion; + /* PRIVATE FUNCTIONS *********************************************************/ PVOID @@ -179,6 +183,78 @@ /* Finish the output */ DbgPrint("\n"); +} + +VOID +NTAPI +KeRosDumpTriageForBugZillaReport(VOID) +{ + extern BOOLEAN KiFastSystemCallDisable, KiSMTProcessorsPresent; + extern ULONG KeI386MachineType, MxcsrFeatureMask; + extern BOOLEAN Ke386Pae, Ke386NoExecute; + + DbgPrint("ReactOS has crashed! Please go to http://www.reactos.org/bugzilla/enter_bug.cgi to file a bug!\n"); +#ifdef __i386__ + DbgPrint("\nHardware Information\n"); + DbgPrint("Processor Architecture: %d\n" + "Feature Bits: %d\n" + "System Call Disabled: %d\n" + "NPX Present: %d\n" + "MXCsr Mask: %d\n" + "MXCsr Feature Mask: %d\n" + "XMMI Present: %d\n" + "FXSR Present: %d\n" + "Machine Type: %d\n" + "PAE: %d\n" + "NX: %d\n" + "Processors: %d\n" + "Active Processors: %d\n" + "Pentium LOCK Bug: %d\n" + "Hyperthreading: %d\n" + "CPU Manufacturer: %s\n" + "CPU Name: %wZ\n" + "CPUID: %d\n" + "CPU Type: %d\n" + "CPU Stepping: %d\n" + "CPU Speed: %d\n" + "CPU L2 Cache: %d\n" + "BIOS Date: %wZ\n" + "BIOS Version: %wZ\n" + "Video BIOS Date: %wZ\n" + "Video BIOS Version: %wZ\n" + "Memory: %d\n" + "NT Build Number: %lx\n" + "NT Build Lab: %s\n", + KeProcessorArchitecture, + KeFeatureBits, + KiFastSystemCallDisable, + KeI386NpxPresent, + KiMXCsrMask, + MxcsrFeatureMask, + KeI386XMMIPresent, + KeI386FxsrPresent, + KeI386MachineType, + Ke386Pae, + Ke386NoExecute, + KeNumberProcessors, + KeActiveProcessors, + KiI386PentiumLockErrataPresent, + KiSMTProcessorsPresent, + KeGetCurrentPrcb()->VendorString, + &KeRosProcessorName, + KeGetCurrentPrcb()->CpuID, + KeGetCurrentPrcb()->CpuType, + KeGetCurrentPrcb()->CpuStep, + KeGetCurrentPrcb()->MHz, + ((PKIPCR)KeGetPcr())->SecondLevelCacheSize, + &KeRosBiosDate, + &KeRosBiosVersion, + &KeRosVideoBiosDate, + &KeRosVideoBiosVersion, + MmStats.NrTotalPages * PAGE_SIZE, + NtBuildNumber, + NtBuildLab); +#endif } VOID @@ -894,6 +970,9 @@ * We'll manually dump the stack for the user. */ KeRosDumpStackFrames(NULL, 0); + + /* ROS HACK 2: Generate something useful for Bugzilla */ + KeRosDumpTriageForBugZillaReport(); } }

1 0

[cfinck] 29131: Spanish translations by Javier Remacha (remialdo AT gmail DOT com) See issue #2669 for more details.
by cfinck＠svn.reactos.org 21 Sep '07

21 Sep '07

Author: cfinck Date: Fri Sep 21 22:01:19 2007 New Revision: 29131 URL: http://svn.reactos.org/svn/reactos?rev=29131&view=rev Log: Spanish translations by Javier Remacha (remialdo AT gmail DOT com) See issue #2669 for more details. Added: trunk/reactos/base/applications/sndvol32/lang/es-ES.rc trunk/reactos/base/setup/reactos/lang/es-ES.rc trunk/rosapps/fontview/lang/es-ES.rc trunk/rosapps/magnify/lang/es-ES.rc Modified: trunk/reactos/base/applications/sndvol32/rsrc.rc trunk/reactos/base/setup/reactos/rsrc.rc trunk/rosapps/fontview/fontview.rc trunk/rosapps/magnify/rsrc.rc Added: trunk/reactos/base/applications/sndvol32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/es-ES.rc (added) +++ trunk/reactos/base/applications/sndvol32/lang/es-ES.rc Fri Sep 21 22:01:19 2007 @@ -1,0 +1,46 @@ +/* + * Spanish language file by Javier Remacha <2007-09-18> + */ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&Opciones" + BEGIN + MENUITEM "P&ropiedades", IDC_PROPERTIES + MENUITEM "&Controles Avanzados", IDC_ADVANCED_CONTROLS + MENUITEM SEPARATOR + MENUITEM "&Salir", IDC_EXIT + END + POPUP "Ay&uda" + BEGIN + MENUITEM "&Temas de Ayuda", IDC_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "&Acerca de Control de Volumen", IDC_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SNDVOL32 "Control de Volumen" + IDS_NOMIXERDEVICES "¡No hay dispositivos mezcladores activos en este momento! La aplicación se cerrará ahora." +END + +IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Propiedades" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&Dispositivo me&zclador:", -1, 7,8,48,9 + COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP + GROUPBOX "Ajustar volumen de:", -1, 7,25,211,77 + PUSHBUTTON "&Reproducción", IDC_PLAYBACK, 13,43,47,8, BS_AUTORADIOBUTTON + PUSHBUTTON "&Grabación", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON + PUSHBUTTON "&Otros:", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED + COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + LTEXT "Mostrar los controles de volumen siguientes:", IDC_LABELCONTROLS, 7, 109, 162, 8 + CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 + + PUSHBUTTON "Aceptar", IDOK, 114,226,50,14 + PUSHBUTTON "Cancelar", IDCANCEL, 168,226,50,14 +END Modified: trunk/reactos/base/applications/sndvol32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/rsrc.rc (original) +++ trunk/reactos/base/applications/sndvol32/rsrc.rc Fri Sep 21 22:01:19 2007 @@ -11,6 +11,7 @@ #include "lang/cs-CZ.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/hu-HU.rc" #include "lang/id-ID.rc" Added: trunk/reactos/base/setup/reactos/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/es… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/es-ES.rc (added) +++ trunk/reactos/base/setup/reactos/lang/es-ES.rc Fri Sep 21 22:01:19 2007 @@ -1,0 +1,13 @@ +/* + * Spanish language file by Javier Remacha <2007-09-21> + */ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +/* String Tables */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_CAPTION "Instalación de ReactOS" + IDS_TEXT "¡No puedes instalar ReactOS directamente desde este CD!\n\nPor favor reinicia tu computadora desde este CD para proceder a instalar ReactOS." +END + +/* EOF */ Modified: trunk/reactos/base/setup/reactos/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/rsrc.rc… ============================================================================== --- trunk/reactos/base/setup/reactos/rsrc.rc (original) +++ trunk/reactos/base/setup/reactos/rsrc.rc Fri Sep 21 22:01:19 2007 @@ -7,6 +7,7 @@ #include "lang/de-DE.rc" #include "lang/el-GR.rc" #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/fi-FI.rc" #include "lang/fr-FR.rc" #include "lang/hu-HU.rc" Modified: trunk/rosapps/fontview/fontview.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/fontview.rc?rev=2… ============================================================================== --- trunk/rosapps/fontview/fontview.rc (original) +++ trunk/rosapps/fontview/fontview.rc Fri Sep 21 22:01:19 2007 @@ -13,6 +13,7 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Added: trunk/rosapps/fontview/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/lang/es-ES.rc?rev… ============================================================================== --- trunk/rosapps/fontview/lang/es-ES.rc (added) +++ trunk/rosapps/fontview/lang/es-ES.rc Fri Sep 21 22:01:19 2007 @@ -1,0 +1,18 @@ +/* + * Spanish language file by Javier Remacha <2007-09-21> + */ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_QUIT, "Cerrar" + IDS_PRINT, "Imprimir" + IDS_STRING, "Haz el amor y no la guerra. 1234567890" + IDS_ERROR, "Error" + IDS_ERROR_NOMEM, "No hay memoria suficiente para completar la operación." + IDS_ERROR_NOFONT, "El archivo %1 no es un archivo válido de fuente." + IDS_ERROR_NOCLASS, "No es posible iniciar la clase." + IDS_ERROR_BADCMD, "No hay archivo de fuente.\nSyntax:\n fontview.exe <font file>" +} + + Added: trunk/rosapps/magnify/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/es-ES.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/es-ES.rc (added) +++ trunk/rosapps/magnify/lang/es-ES.rc Fri Sep 21 22:01:19 2007 @@ -1,0 +1,68 @@ +/* + * Spanish language file by Javier Remacha <2007-09-21> + */ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +IDC_MAGNIFIER MENU +BEGIN + POPUP "&Archivo" + BEGIN + MENUITEM "S&alir", IDM_EXIT + MENUITEM "&Opciones", IDM_OPTIONS + MENUITEM SEPARATOR + MENUITEM "&Acerca de...", IDM_ABOUT + END +END + +IDC_MAGNIFIER ACCELERATORS +BEGIN + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +END + +IDD_ABOUTBOX DIALOGEX 22, 17, 220, 75 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_CAPTION | WS_SYSMENU +CAPTION "Acerca de" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_ICON,IDC_MYICON,14,9,20,20 + LTEXT "Magnifier Version 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX + LTEXT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)",IDC_STATIC,48,24,125,22 + PUSHBUTTON "Aceptar",IDOK,162,48,50,14 +END + +IDD_DIALOGOPTIONS DIALOGEX 0, 0, 153, 182 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Configurar Magnifier" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "Salir",IDOK,96,161,50,14 + PUSHBUTTON "Ayuda",IDOK,38,161,50,14 + LTEXT "Nivel de aumento:",IDC_STATIC,6,12,68,8 + COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Rastreando",IDC_STATIC,7,25,139,59 + GROUPBOX "Presentación",IDC_STATIC,7,87,139,57 + CONTROL "Seguir el cursor del ratón",IDC_FOLLOWMOUSECHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,42,114,10 + CONTROL "Seguir el foco del teclado",IDC_FOLLOWKEYBOARDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,54,114,10 + CONTROL "Seguir la edición de texto",IDC_FOLLOWTEXTEDITINGCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,66,114,10 + CONTROL "Invertir colores",IDC_INVERTCOLORSCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,102,114,10 + CONTROL "Comenzar minimizado",IDC_STARTMINIMIZEDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,114,114,10 + CONTROL "Mostrar Magnifier",IDC_SHOWMAGNIFIERCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,126,114,10 +END + +IDD_WARNINGDIALOG DIALOGEX 0, 0, 250, 97 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION +CAPTION "ReactOS Magnifier" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "Aceptar",IDOK,193,76,50,14 + ICON IDI_ICON,IDC_STATIC,7,17,20,20 + LTEXT "Magnifier está pensada para proporcionar un nivel mínimo de funcionalidad para usuarios con pequeñas deficiencias visuales. La mayoría de los usuarios con deficiencias visuales necesitarán una utilidad de mayor ampliación para el uso diario.",IDC_STATIC,36,7,207,33 + CONTROL "No volver a mostrar este mensaje",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10 +END + +STRINGTABLE +BEGIN + IDS_APP_TITLE "Magnifier" + IDC_MAGNIFIER "MAGNIFIER" +END Modified: trunk/rosapps/magnify/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/rsrc.rc?rev=29131&… ============================================================================== --- trunk/rosapps/magnify/rsrc.rc (original) +++ trunk/rosapps/magnify/rsrc.rc Fri Sep 21 22:01:19 2007 @@ -2,6 +2,7 @@ #include "resource.h" #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/de-DE.rc" #include "lang/fr-FR.rc" #include "lang/uk-UA.rc"

1 0

[hpoussin] 29130: Send the right inf file handle to SetupCloseInfFile().
by hpoussin＠svn.reactos.org 21 Sep '07

21 Sep '07

Author: hpoussin Date: Fri Sep 21 17:00:16 2007 New Revision: 29130 URL: http://svn.reactos.org/svn/reactos?rev=29130&view=rev Log: Send the right inf file handle to SetupCloseInfFile(). Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Fri Sep 21 17:00:16 2007 @@ -474,7 +474,7 @@ if (!SetupFindFirstLineW(UnattendInf, L"Unattend", L"Signature", &Context)) { DPRINT("SetupFindFirstLineW() failed for section 'Unattend'\n"); - SetupCloseInfFile(&UnattendInf); + SetupCloseInfFile(UnattendInf); return; } @@ -482,7 +482,7 @@ if (!INF_GetData(&Context, NULL, &Value)) { DPRINT("INF_GetData() failed for key 'Signature'\n"); - SetupCloseInfFile(&UnattendInf); + SetupCloseInfFile(UnattendInf); return; } @@ -490,7 +490,7 @@ if (_wcsicmp(Value, L"$ReactOS$") != 0) { DPRINT("Signature not $ReactOS$\n"); - SetupCloseInfFile(&UnattendInf); + SetupCloseInfFile(UnattendInf); return; } @@ -498,19 +498,19 @@ if (!SetupFindFirstLineW(UnattendInf, L"Unattend", L"UnattendSetupEnabled", &Context)) { DPRINT("Can't find key 'UnattendSetupEnabled'\n"); - SetupCloseInfFile(&UnattendInf); + SetupCloseInfFile(UnattendInf); return; } if (!INF_GetData(&Context, NULL, &Value)) { DPRINT("Can't read key 'UnattendSetupEnabled'\n"); - SetupCloseInfFile(&UnattendInf); + SetupCloseInfFile(UnattendInf); return; } if (_wcsicmp(Value, L"yes") != 0) { DPRINT("Unattend setup is disabled by 'UnattendSetupEnabled' key!\n"); - SetupCloseInfFile(&UnattendInf); + SetupCloseInfFile(UnattendInf); return; } @@ -518,13 +518,13 @@ if (!SetupFindFirstLineW(UnattendInf, L"Unattend", L"DestinationDiskNumber", &Context)) { DPRINT("SetupFindFirstLine() failed for key 'DestinationDiskNumber'\n"); - SetupCloseInfFile(&UnattendInf); + SetupCloseInfFile(UnattendInf); return; } if (!SetupGetIntField(&Context, 1, &IntValue)) { DPRINT("SetupGetIntField() failed for key 'DestinationDiskNumber'\n"); - SetupCloseInfFile(&UnattendInf); + SetupCloseInfFile(UnattendInf); return; } UnattendDestinationDiskNumber = (LONG)IntValue;

1 0

[hpoussin] 29129: Fix typo
by hpoussin＠svn.reactos.org 21 Sep '07

21 Sep '07

Author: hpoussin Date: Fri Sep 21 16:45:39 2007 New Revision: 29129 URL: http://svn.reactos.org/svn/reactos?rev=29129&view=rev Log: Fix typo Modified: trunk/reactos/dll/win32/setupapi/stringtable.c Modified: trunk/reactos/dll/win32/setupapi/stringtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/stringt… ============================================================================== --- trunk/reactos/dll/win32/setupapi/stringtable.c (original) +++ trunk/reactos/dll/win32/setupapi/stringtable.c Fri Sep 21 16:45:39 2007 @@ -73,7 +73,7 @@ pStringTable->pSlots = MyMalloc(sizeof(TABLE_SLOT) * TABLE_DEFAULT_SIZE); if (pStringTable->pSlots == NULL) { - MyFree(pStringTable->pSlots); + MyFree(pStringTable); return NULL; } @@ -122,7 +122,7 @@ pStringTable->pSlots = MyMalloc(sizeof(TABLE_SLOT) * TABLE_DEFAULT_SIZE); if (pStringTable->pSlots == NULL) { - MyFree(pStringTable->pSlots); + MyFree(pStringTable); return NULL; }

1 0

[jimtabor] 29127: - Fixed CMP_UnregisterNotification. Add IN, sorry.
by jimtabor＠svn.reactos.org 21 Sep '07

21 Sep '07

Author: jimtabor Date: Fri Sep 21 04:07:26 2007 New Revision: 29127 URL: http://svn.reactos.org/svn/reactos?rev=29127&view=rev Log: - Fixed CMP_UnregisterNotification. Add IN, sorry. Modified: trunk/reactos/include/ddk/cfgmgr32.h Modified: trunk/reactos/include/ddk/cfgmgr32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/cfgmgr32.h?rev… ============================================================================== --- trunk/reactos/include/ddk/cfgmgr32.h (original) +++ trunk/reactos/include/ddk/cfgmgr32.h Fri Sep 21 04:07:26 2007 @@ -624,7 +624,7 @@ CMAPI CONFIGRET WINAPI -CMP_UnregisterNotification(ULONG luhDevNotify); +CMP_UnregisterNotification(IN ULONG luhDevNotify); /* FIXME: Missing CMP_WaitNoPendingInstallEvents */ /* FIXME: Missing CMP_WaitServicesAvailable */

1 0

[jimtabor] 29126: - Add CMP_RegisterNotification and CMP_UnregisterNotification. Both called from User32.
by jimtabor＠svn.reactos.org 21 Sep '07

21 Sep '07

Author: jimtabor Date: Fri Sep 21 04:05:17 2007 New Revision: 29126 URL: http://svn.reactos.org/svn/reactos?rev=29126&view=rev Log: - Add CMP_RegisterNotification and CMP_UnregisterNotification. Both called from User32. Modified: trunk/reactos/include/ddk/cfgmgr32.h Modified: trunk/reactos/include/ddk/cfgmgr32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/cfgmgr32.h?rev… ============================================================================== --- trunk/reactos/include/ddk/cfgmgr32.h (original) +++ trunk/reactos/include/ddk/cfgmgr32.h Fri Sep 21 04:05:17 2007 @@ -605,7 +605,14 @@ CMP_Init_Detection( IN DWORD dwMagic); -/* FIXME: Missing CMP_RegisterNotification */ +CMAPI +CONFIGRET +WINAPI +CMP_RegisterNotification( + IN HANDLE hRecipient, + IN LPVOID lpvNotificationFilter, + IN DWORD dwFlags, + OUT PULONG pluhDevNotify); CMAPI CONFIGRET @@ -614,7 +621,11 @@ IN DWORD dwMagic, IN DWORD dwProcessId); -/* FIXME: Missing CMP_UnregisterNotification */ +CMAPI +CONFIGRET +WINAPI +CMP_UnregisterNotification(ULONG luhDevNotify); + /* FIXME: Missing CMP_WaitNoPendingInstallEvents */ /* FIXME: Missing CMP_WaitServicesAvailable */

1 0

[cfinck] 29125: Change the file names of the Catalan resource files from "ca-CA" to "ca-ES". Thanks to Marc Piulachs for noticing this. Also fixed the sublang in the catalan "msconfig" resource file (thx to EmuandCo :-P) See issue #2662 for more details.
by cfinck＠svn.reactos.org 20 Sep '07

20 Sep '07

Author: cfinck Date: Fri Sep 21 00:57:28 2007 New Revision: 29125 URL: http://svn.reactos.org/svn/reactos?rev=29125&view=rev Log: Change the file names of the Catalan resource files from "ca-CA" to "ca-ES". Thanks to Marc Piulachs for noticing this. Also fixed the sublang in the catalan "msconfig" resource file (thx to EmuandCo :-P) See issue #2662 for more details. Added: trunk/reactos/base/applications/cacls/lang/ca-ES.rc - copied unchanged from r29123, trunk/reactos/base/applications/cacls/lang/ca-CA.rc trunk/reactos/base/applications/calc/lang/ca-ES.rc - copied unchanged from r29123, trunk/reactos/base/applications/calc/lang/ca-CA.rc trunk/reactos/base/applications/charmap/lang/ca-ES.rc - copied unchanged from r29123, trunk/reactos/base/applications/charmap/lang/ca-CA.rc trunk/reactos/base/applications/cmdutils/find/lang/ca-ES.rc - copied unchanged from r29123, trunk/reactos/base/applications/cmdutils/find/lang/ca-CA.rc trunk/reactos/base/applications/cmdutils/more/lang/ca-ES.rc - copied unchanged from r29123, trunk/reactos/base/applications/cmdutils/more/lang/ca-CA.rc trunk/reactos/base/applications/control/lang/ca-ES.rc - copied unchanged from r29123, trunk/reactos/base/applications/control/lang/ca-CA.rc trunk/reactos/base/applications/games/solitaire/lang/ca-ES.rc - copied unchanged from r29123, trunk/reactos/base/applications/games/solitaire/lang/ca-CA.rc trunk/reactos/base/applications/games/winemine/lang/ca-ES.rc - copied unchanged from r29123, trunk/reactos/base/applications/games/winemine/lang/ca-CA.rc trunk/reactos/base/applications/msconfig/lang/ca-ES.rc - copied, changed from r29123, trunk/reactos/base/applications/msconfig/lang/ca-CA.rc Removed: trunk/reactos/base/applications/cacls/lang/ca-CA.rc trunk/reactos/base/applications/calc/lang/ca-CA.rc trunk/reactos/base/applications/charmap/lang/ca-CA.rc trunk/reactos/base/applications/cmdutils/find/lang/ca-CA.rc trunk/reactos/base/applications/cmdutils/more/lang/ca-CA.rc trunk/reactos/base/applications/control/lang/ca-CA.rc trunk/reactos/base/applications/games/solitaire/lang/ca-CA.rc trunk/reactos/base/applications/games/winemine/lang/ca-CA.rc trunk/reactos/base/applications/msconfig/lang/ca-CA.rc Modified: trunk/reactos/base/applications/cacls/rsrc.rc trunk/reactos/base/applications/calc/rsrc.rc trunk/reactos/base/applications/charmap/rsrc.rc trunk/reactos/base/applications/cmdutils/find/rsrc.rc trunk/reactos/base/applications/cmdutils/more/rsrc.rc trunk/reactos/base/applications/control/rsrc.rc trunk/reactos/base/applications/games/solitaire/rsrc.rc trunk/reactos/base/applications/games/winemine/rsrc.rc trunk/reactos/base/applications/msconfig/rsrc.rc Removed: trunk/reactos/base/applications/cacls/lang/ca-CA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… ============================================================================== --- trunk/reactos/base/applications/cacls/lang/ca-CA.rc (original) +++ trunk/reactos/base/applications/cacls/lang/ca-CA.rc (removed) @@ -1,74 +1,0 @@ -LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - -IDS_HELP, "Mostra o modifica la llista de control d'accés (ACLs) dels fitxers\n\n\ -CACLS fitxer [/T] [/E] [/C] [/G user:perm [...]] [/R usuari [...]]\n\ - [/P user:perm [...]] [/D usuari [...]]\n\ - fitxer Mostra ACLs.\n\ - /T Canvia el ACLs dels fitxers especificats al\n\ - directori actual i tots els seus subdirectoris.\n\ - /E Edita ACL en comptes de substituir-lo.\n\ - /C Continua en cas d'error d'accés.\n\ - /G user:perm Assegura els drets d'accés especificats per al usuari.\n\ - perm pot ser: R Lectura\n\ - W Escriptura\n\ - C Modificació (Escriptura)\n\ - F Control total\n\ - /R usuari Revoca els drets d'accés especificats per al usuari(només vàlid amb /E).\n\ - /P user:perm Canvia els drets d'accés especificats per al usuari.\n\ - perm pot ser: N Cap\n\ - R Lectura\n\ - W Escriptura\n\ - C Modificació (Escriptura)\n\ - F Control total\n\ - /D usuari Denega els drets d'accés especificats per al usuari.\n\ -Es possible utilitzar comodins per especificar més d'un fitxer per comanda.\n\ -Podeu especificar més d'un usuari per comanda.\n\n\ -Abreviacions:\n\ - CI - Container heredat.\n\ - ACE s'heredarà per directoris.\n\ - OI - Objecte heredat.\n\ - ACE s'heredarà per fitxers.\n\ - IO - Només heredat.\n\ - ACE no s'aplicarà al directori/fitxer actual.\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, "(DENEGAT)" -IDS_SPECIAL_ACCESS, "(accés especial:)" -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" -} 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 Fri Sep 21 00:57:28 2007 @@ -9,7 +9,7 @@ /* include localised resources */ #include "lang/bg-BG.rc" -#include "lang/ca-CA.rc" +#include "lang/ca-ES.rc" #include "lang/de-DE.rc" #include "lang/el-GR.rc" #include "lang/en-US.rc" Removed: trunk/reactos/base/applications/calc/lang/ca-CA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ca-CA.rc (original) +++ trunk/reactos/base/applications/calc/lang/ca-CA.rc (removed) @@ -1,163 +1,0 @@ -/* - * WineCalc (En.rc) - * - * Copyright 2003 James Briggs - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "windows.h" -#include "resource.h" -#include "winecalc.h" - -LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - IDS_APPNAME, "Calculadora" - - IDS_COPYRIGHT1, "Calculadora 5.0. Sota llicenia LGPL 2" - IDS_COPYRIGHT2 "Copyright 2003, James Briggs" - IDS_COPYRIGHT3 "San Jose, California, USA" - IDS_COPYRIGHT4 "james(a)ActionMessage.com" - IDS_COPYRIGHT5 "http://www.ActionMessage.com/winecalc/" - - IDS_BTN_BACKSPACE, "Retrocés" - IDS_BTN_CLEAR_ENTRY, "CE" - IDS_BTN_CLEAR_ALL, "C" - IDS_BTN_MEM_CLEAR, "MC" - IDS_BTN_MEM_RECALL, "MR" - IDS_BTN_MEM_STORE, "MS" - IDS_BTN_MEM_PLUS, "M+" - IDS_BTN_MEM_STATUS_M, "M" - IDS_BTN_SQRT, "sqrt" - IDS_BTN_DEGREES, "Sexagesimal" - IDS_BTN_RADIANS, "Radiant" - IDS_BTN_GRADS, "Graus" - IDS_BTN_SHRT_HEX "Hex" - IDS_BTN_SHRT_DEC "Dec" - IDS_BTN_SHRT_OCT "Oct" - IDS_BTN_SHRT_BIN "Bin" - IDS_ERR_INVALID_INPUT, "Entrada invàlida per la funció." - IDS_ERR_DIVIDE_BY_ZERO, "No puc dividir per zero." - IDS_ERR_UNDEFINED, "El resultat de la funció és indefinit." -} - -MAIN_MENU MENU DISCARDABLE -{ - POPUP "&Edita" { - MENUITEM "&Copia Ctrl+C", IDM_COPY - MENUITEM "E&nganxa Ctrl+V", IDM_PASTE - } - POPUP "&Vista" { - MENUITEM "Estandard", IDM_MODE_STANDARD - MENUITEM "Científica", IDM_MODE_SCIENTIFIC - MENUITEM SEPARATOR - MENUITEM "Agrupació de dígits", IDM_DIGIT_GROUPING - } - POPUP "&Ajuda" { - MENUITEM "Temes d'ajuda", IDM_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "En quant a la Calculadora", IDM_ABOUT - } -} - -SCIMS_MENU MENU DISCARDABLE -{ - POPUP "&Edita" { - MENUITEM "&Copia Ctrl+C", IDM_COPY - MENUITEM "E&ngancxa Ctrl+V", IDM_PASTE - } - POPUP "&Vista" { - MENUITEM "Estandard", IDM_MODE_STANDARD - MENUITEM "Científica", IDM_MODE_SCIENTIFIC - MENUITEM SEPARATOR - MENUITEM "Hexadecimal\tF5", ID_CALC_NS_HEX - MENUITEM "Decimal\tF6", ID_CALC_NS_DEC - MENUITEM "Octal\tF7", ID_CALC_NS_OCT - MENUITEM "Binària\tF8", ID_CALC_NS_BIN - MENUITEM SEPARATOR - MENUITEM "Sexagesimal\tF2", ID_CALC_MS_DEGREES - MENUITEM "Radiants\tF3", ID_CALC_MS_RADIANS - MENUITEM "Graus\tF4", ID_CALC_MS_GRADS - MENUITEM SEPARATOR - MENUITEM "Agrupació de digits", IDM_DIGIT_GROUPING - } - POPUP "&Ajuda" { - MENUITEM "Temes d'ajuda", IDM_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "En quant a la Calculadora", IDM_ABOUT - } -} - -SCIWS_MENU MENU DISCARDABLE -{ - POPUP "&Edita" { - MENUITEM "&Copia Ctrl+C", IDM_COPY - MENUITEM "E&nganxa Ctrl+V", IDM_PASTE - } - POPUP "&Vista" { - MENUITEM "Estandard", IDM_MODE_STANDARD - MENUITEM "Cientifica", IDM_MODE_SCIENTIFIC - MENUITEM SEPARATOR - MENUITEM "Hexadecimal\tF5", ID_CALC_NS_HEX - MENUITEM "Decimal\tF6", ID_CALC_NS_DEC - MENUITEM "Octal\tF7", ID_CALC_NS_OCT - MENUITEM "Binària\tF8", ID_CALC_NS_BIN - MENUITEM SEPARATOR - MENUITEM "Qword\tF12", ID_CALC_WS_QWORD - MENUITEM "Dword\tF2", ID_CALC_WS_DWORD - MENUITEM "Word\tF3", ID_CALC_WS_WORD - MENUITEM "Byte\tF4", ID_CALC_WS_BYTE - MENUITEM SEPARATOR - MENUITEM "Agrupació de digits", IDM_DIGIT_GROUPING - } - POPUP "&Ajuda" { - MENUITEM "Temes d'ajuda", IDM_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "En quant a la Calculadora", IDM_ABOUT - } -} - -MAIN_MENU ACCELERATORS -BEGIN - VK_F1, IDV_HELP, VIRTKEY -END - -DLG_ABOUT DIALOG 12,0,120,82 -CAPTION "En quant a GNU winecalc" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -BEGIN - DEFPUSHBUTTON "Acceptar", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END - -WHATS_THIS_MENU MENU DISCARDABLE -{ - POPUP "" { - MENUITEM "Què es això?", IDM_WHATS_THIS - } -} - -DLG_STATS DIALOG 12,0,125,78 -CAPTION "Cuadre Estadístic" -FONT 9, "Tahoma" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -BEGIN - DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 25, 13, WS_TABSTOP | WS_GROUP - PUSHBUTTON "&CÀRREGA", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP - PUSHBUTTON "C&D" ID_STATS_CD, 64, 52, 25, 13, WS_TABSTOP | WS_GROUP - PUSHBUTTON "C&AD", ID_STATS_CAD, 94, 52, 25, 13, WS_TABSTOP | WS_GROUP -END - Modified: trunk/reactos/base/applications/calc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/rsr… ============================================================================== --- trunk/reactos/base/applications/calc/rsrc.rc (original) +++ trunk/reactos/base/applications/calc/rsrc.rc Fri Sep 21 00:57:28 2007 @@ -26,7 +26,7 @@ IDI_CALCICON ICON "calculator.ico" #include "lang/bg-BG.rc" -#include "lang/ca-CA.rc" +#include "lang/ca-ES.rc" #include "lang/cs-CZ.rc" #include "lang/de-DE.rc" #include "lang/el-GR.rc" Removed: trunk/reactos/base/applications/charmap/lang/ca-CA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/ca-CA.rc (original) +++ trunk/reactos/base/applications/charmap/lang/ca-CA.rc (removed) @@ -1,35 +1,0 @@ -LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT - -IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 -CAPTION "Mapa de caràcters" -FONT 8,"MS Sans Serif",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX -BEGIN - LTEXT "Font :", 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 "Ajuda", IDC_CMHELP, 249, 5, 35, 13 - CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 - LTEXT "Caràcters a copiar :", IDC_STATIC, 6, 188, 66, 9 - EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - DEFPUSHBUTTON "Selecciona", IDC_SELECT, 194, 186, 46, 13 - PUSHBUTTON "Copia", IDC_COPY, 244, 186, 46, 13, WS_DISABLED - //AUTOCHECKBOX "Vista avançada", 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 "En quanta al Mapa de caràcters" -FONT 8,"MS Sans Serif",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Character Map v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 - PUSHBUTTON "Tancar", 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 "&En quant a..." -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 Fri Sep 21 00:57:28 2007 @@ -8,7 +8,7 @@ IDI_ICON ICON "res/charmap.ico" #include "lang/bg-BG.rc" -#include "lang/ca-CA.rc" +#include "lang/ca-ES.rc" #include "lang/en-US.rc" #include "lang/de-DE.rc" #include "lang/es-ES.rc" Removed: trunk/reactos/base/applications/cmdutils/find/lang/ca-CA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/find/lang/ca-CA.rc (original) +++ trunk/reactos/base/applications/cmdutils/find/lang/ca-CA.rc (removed) @@ -1,17 +1,0 @@ -LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - -IDS_USAGE, "FIND: Mostra totes les linies que continguin una determinada cadena de caràcters.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"Cadena de caràcters\" [ file... ]\n\ - /C Conta el numero de linies que contenen la cadena de caràcters\n\ - /I Ignore case\n\ - /N Numero de linies mostrades, començant per la primera\n\ - /V Mostra les linies que no contenen la cadena de caràcters" - -IDS_NO_SUCH_FILE, "FIND: %s: No he trobat el fitxer\n" - -IDS_CANNOT_OPEN, "FIND: %s: No puc obrir el fitxer\n" - -} Modified: trunk/reactos/base/applications/cmdutils/find/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/find/rsrc.rc (original) +++ trunk/reactos/base/applications/cmdutils/find/rsrc.rc Fri Sep 21 00:57:28 2007 @@ -1,7 +1,7 @@ #include <windows.h> #include "resource.h" -#include "lang/ca-CA.rc" +#include "lang/ca-ES.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/ru-RU.rc" Removed: trunk/reactos/base/applications/cmdutils/more/lang/ca-CA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/ca-CA.rc (original) +++ trunk/reactos/base/applications/cmdutils/more/lang/ca-CA.rc (removed) @@ -1,15 +1,0 @@ -LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - IDS_USAGE, "Mostra en pantalla el contingut pàgina per pàgina.\n\n\ - MORE < [Unitat:][Ruta]Nom del fitxer\n\ - Instrucció | MORE \n\ - MORE [Unitat:][Ruta]Nom del fitxer\n\n\ - [Unitat:][Ruta]Nom del fitxer Un fitxer, el contingut del qual serà mostrat.\n\ - Instrucció\t\t Una instrucció, el resultat de la qual serà mostrada.\n\n\ - Al visualitzar ""-- Continua --"" heu de premer qualsevol tecla per visualitzar la següent pàgina.\n" - - IDS_CONTINUE, " -- Continua (100%) -- " - IDS_FILE_ACCESS, "No puc accedir al fitxer %s." -} Modified: trunk/reactos/base/applications/cmdutils/more/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/rsrc.rc (original) +++ trunk/reactos/base/applications/cmdutils/more/rsrc.rc Fri Sep 21 00:57:28 2007 @@ -1,7 +1,7 @@ #include <windows.h> #include "resource.h" -#include "lang/ca-CA.rc" +#include "lang/ca-ES.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" Removed: trunk/reactos/base/applications/control/lang/ca-CA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/lang/ca-CA.rc (original) +++ trunk/reactos/base/applications/control/lang/ca-CA.rc (removed) @@ -1,27 +1,0 @@ -// Catalan language resource file (Hiper, equip Capdelluç) - -LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT - -///////////////////////////////////////////////////////////////////////////// -// -// Menu -// - -IDM_MAINMENU MENU DISCARDABLE -BEGIN - POPUP "&Fitxer" - BEGIN - MENUITEM "&Tancar", IDM_CLOSE - END - POPUP "&Veure" - BEGIN - MENUITEM "Icones grans", IDM_LARGEICONS - MENUITEM "Icones petites", IDM_SMALLICONS - MENUITEM "Llista", IDM_LIST - MENUITEM "Detalls", IDM_DETAILS - END - POPUP "Ajuda" - BEGIN - MENUITEM "En quant a", IDM_ABOUT - END -END Modified: trunk/reactos/base/applications/control/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/rsrc.rc (original) +++ trunk/reactos/base/applications/control/rsrc.rc Fri Sep 21 00:57:28 2007 @@ -9,7 +9,7 @@ /* include localised resources */ #include "lang/bg-BG.rc" -#include "lang/ca-CA.rc" +#include "lang/ca-ES.rc" #include "lang/cs-CZ.rc" #include "lang/da-DK.rc" #include "lang/de-DE.rc" Removed: trunk/reactos/base/applications/games/solitaire/lang/ca-CA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/ca-CA.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/ca-CA.rc (removed) @@ -1,85 +1,0 @@ -/* - * PROJECT: Solitaire - * LICENSE: Freeware, permission to use under Public Domain - * FILE: base/applications/games/solitaire/ca-CA.rc - * PURPOSE: Catalan Language File for Solitaire - * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) - */ -#include "resource.h" - -LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT - - -/* Dialogs */ - -IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT -CAPTION "Options" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Cartes", -1, 7, 7, 65, 40 - AUTORADIOBUTTON "Treu-ne &Una", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP - AUTORADIOBUTTON "Treu-ne &Tres", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 - - AUTOCHECKBOX "&Mostra el temps", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED - AUTOCHECKBOX "&Barra d'estat", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP - - DEFPUSHBUTTON "Acceptar", IDOK, 35, 97, 50, 14 - PUSHBUTTON "CancelÂ·lar", IDCANCEL, 101, 97, 50, 14 -END - - -IDD_CARDBACK DIALOGEX 6, 6, 221, 96 -CAPTION "Seleccioneu l'anvers" -FONT 8, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT -BEGIN - CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 - CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 - CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 - CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 - DEFPUSHBUTTON "Acceptar", IDOK, 104, 77, 54, 13 - PUSHBUTTON "CancelÂ·lar", IDCANCEL, 162, 77, 54, 13 -END - - -/* Strings */ - -STRINGTABLE -BEGIN - IDS_SOL_NAME "Solitari" - IDS_SOL_ABOUT "Solitari per J Brown\n\nCardLib versio 1.0." - IDS_SOL_QUIT "Voleu sortir del joc actual?" - IDS_SOL_WIN "Felicitats, heu guanyat!!" -END - - -/* Menus */ - -IDR_MENU1 MENU DISCARDABLE -BEGIN - POPUP "&Joc" - BEGIN - MENUITEM "R&eparteix\tF2", IDM_GAME_NEW - MENUITEM SEPARATOR - MENUITEM "&Barallar...", IDM_GAME_DECK - MENUITEM "&Opcions...", IDM_GAME_OPTIONS - MENUITEM SEPARATOR - MENUITEM "&Sortida", IDM_GAME_EXIT - END - POPUP "&Ajuda" - BEGIN - MENUITEM "&Contingut\tF1", IDM_HELP_CONTENTS - MENUITEM "E&n quant a", IDM_HELP_ABOUT - END -END - - - -/* Accelerator */ - -IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE -BEGIN - VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT - VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT -END Modified: trunk/reactos/base/applications/games/solitaire/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/rsrc.rc (original) +++ trunk/reactos/base/applications/games/solitaire/rsrc.rc Fri Sep 21 00:57:28 2007 @@ -6,7 +6,7 @@ IDI_SOLITAIRE ICON DISCARDABLE "solitaire.ico" #include "lang/bg-BG.rc" -#include "lang/ca-CA.rc" +#include "lang/ca-ES.rc" #include "lang/de-DE.rc" #include "lang/el-GR.rc" #include "lang/en-US.rc" Removed: trunk/reactos/base/applications/games/winemine/lang/ca-CA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/ca-CA.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/ca-CA.rc (removed) @@ -1,83 +1,0 @@ -#include "resource.h" - -LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT - -STRINGTABLE { - IDS_APPNAME, "Cercamines" - -} - -MENU_WINEMINE MENU DISCARDABLE -{ - POPUP "&Opcions" { - MENUITEM "&Nou", IDM_NEW - MENUITEM SEPARATOR - MENUITEM "In&terrogant (?)", IDM_MARKQ - MENUITEM SEPARATOR - MENUITEM "&Principiant", IDM_BEGINNER - MENUITEM "&Avançat", IDM_ADVANCED - MENUITEM "&Expert", IDM_EXPERT - MENUITEM "Pe&rsonalitzat", IDM_CUSTOM - MENUITEM SEPARATOR - MENUITEM "&Sortida", IDM_EXIT - } - POPUP "&Info" { - MENUITEM "&Millors Temps", IDM_TIMES - MENUITEM "En q&uant a", IDM_ABOUT - } -} - -DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT -CAPTION "Millors temps" -FONT 8, "MS Shell Dlg" -{ - GROUPBOX "Millors Temps", IDNONE, 10, 10, 140, 45 - LTEXT "Principiant", IDNONE, 20, 20, 40, 8 - LTEXT "Avançat", IDNONE, 20, 30, 40, 8 - LTEXT "Expert", IDNONE, 20, 40, 40, 8 - LTEXT "999", IDC_TIME1, 70, 20, 15, 8 - LTEXT "999", IDC_TIME2, 70, 30, 15, 8 - LTEXT "999", IDC_TIME3, 70, 40, 15, 8 - LTEXT "", IDC_NAME1, 90, 20, 55, 8 - LTEXT "", IDC_NAME2, 90, 30, 55, 8 - LTEXT "", IDC_NAME3, 90, 40, 55, 8 - DEFPUSHBUTTON "Acceptar", IDOK, 55, 60, 50, 15 -} - -DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT -CAPTION "Felicitats!" -FONT 8, "MS Shell Dlg" -{ - LTEXT "Si us plau, entreu el vostre nom", IDIGNORE, 10, 10, 150, 10 - EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 - DEFPUSHBUTTON "Acceptar", IDOK, 60, 40, 40, 15 -} - -DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT -CAPTION "Joc Personalitzat" -FONT 8, "MS Shell Dlg" -{ - LTEXT "Files", IDNONE, 5, 5, 30, 10 - LTEXT "Columnes", IDNONE, 5, 35, 30, 10 - LTEXT "Mines", IDNONE, 5, 65, 30, 10 - EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER - EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER - EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER - DEFPUSHBUTTON "Acceptar", IDOK, 40, 30, 50, 15 - PUSHBUTTON "Cancel·lar", IDCANCEL, 40, 50, 50, 15 -} - -DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT -CAPTION "En quant a" -FONT 8, "MS Shell Dlg" -{ - LTEXT "Cercamines", IDNONE, 10, 10, 35, 10 - LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 - LTEXT "sota llicència Wine", IDNONE, 35, 35, 100, 10 - ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 - DEFPUSHBUTTON "Acceptar", IDOK, 50, 60, 55, 15 -} Modified: trunk/reactos/base/applications/games/winemine/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/rsrc.rc (original) +++ trunk/reactos/base/applications/games/winemine/rsrc.rc Fri Sep 21 00:57:28 2007 @@ -12,7 +12,7 @@ /* include localised resources */ #include "lang/bg-BG.rc" -#include "lang/ca-CA.rc" +#include "lang/ca-ES.rc" #include "lang/de-DE.rc" #include "lang/el-GR.rc" #include "lang/en-US.rc" Removed: trunk/reactos/base/applications/msconfig/lang/ca-CA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/ca-CA.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/ca-CA.rc (removed) @@ -1,174 +1,0 @@ -LANGUAGE LANG_CATALAN, SUBLANG_NEUTRAL - -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 "Progrma de configuracio del sistema" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195 - DEFPUSHBUTTON "Acceptar", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Ajuda", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Cancel·lar", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Aplicar", 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 "A&ctivar-ho tot",IDC_BTN_STARTUP_ACTIVATE,223,155,66,14 - PUSHBUTTON "&Deactivar-ho tot",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 "P&uja", IDC_BTN_SYSTEM_UP, 290, 5, 66, 14 - PUSHBUTTON "&Baixa", IDC_BTN_SYSTEM_DOWN, 290, 25, 66, 14 - - PUSHBUTTON "Ac&tiva", IDC_BTN_SYSTEM_ENABLE, 290, 50, 66, 14 - PUSHBUTTON "D&esactiva", IDC_BTN_SYSTEM_DISABLE, 290, 70, 66, 14 - - PUSHBUTTON "&Busca", IDC_BTN_SYSTEM_FIND, 290, 95, 66, 14 - PUSHBUTTON "&Nou", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14 - PUSHBUTTON "Ed&ita", IDC_BTN_SYSTEM_EDIT, 290, 135, 66, 14 - - PUSHBUTTON "A&ctivar-ho tot", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14 - PUSHBUTTON "&Deactivar-ho tot",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 "&Executa", 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 "A&ctivar-ho tot",IDC_BTN_SERVICES_ACTIVATE,223,155,66,14 - PUSHBUTTON "&Deactivar-ho tot",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 "Seleccio d'arrencada", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT - CONTROL "Arrencada &Normal - Carrega tots els serveis i controladors", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10 - CONTROL "Arrencada de &Diagnostic - Nomes carrega els seveis i controladors basics", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10 - CONTROL "Seleccio &Manual", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10 - CHECKBOX "&Processos del fitxer SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 - CHECKBOX "&Serveis del sistema", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 - CHECKBOX "P&rogrames del menu inici", 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 "&Prova camins d'arrencada", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12 - PUSHBUTTON "&Fes-ho per defecte", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 - PUSHBUTTON "P&uja", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 - PUSHBUTTON "&Baixa", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 - GROUPBOX "&Opcions d'arrencada", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT - CHECKBOX "/&SAFEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 - CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 - CHECKBOX "/BOO&TLOG", 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 "Op&cions Avançades...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 - LTEXT "Temps:", -1, 280, 91, 30, 10 - EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT - LTEXT "sec.", -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 "Acceptar", IDC_OK, 20, 160, 50, 12 - PUSHBUTTON "Cancel·lar", IDC_CANCEL, 100, 160, 50, 12 -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_MSCONFIG "Programa de configuracio de sistema" - IDS_TAB_GENERAL "General" - IDS_TAB_SYSTEM "SYSTEM.INI" - IDS_TAB_FREELDR "FREELDR.INI" - IDS_TAB_SERVICES "Serveis" - IDS_TAB_STARTUP "Arrencada" - IDS_TAB_TOOLS "Eines" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_SERVICES_COLUMN_SERVICE "Servei" - IDS_SERVICES_COLUMN_REQ "Obligatori" - IDS_SERVICES_COLUMN_VENDOR "Fabricant" - IDS_SERVICES_COLUMN_STATUS "Estat" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOOLS_COLUMN_NAME "Nom" - IDS_TOOLS_COLUMN_DESCR "Descripcio" - - IDS_TOOLS_CMD_NAME "Consola" - IDS_TOOLS_CMD_DESCR "" - IDS_TOOLS_CMD_CMD "cmd.exe" - - IDS_TOOLS_INFO_NAME "Versio" - IDS_TOOLS_INFO_DESCR "Mostra informacio de la versio." - IDS_TOOLS_INFO_CMD "winver.exe" - - IDS_TOOLS_REGEDIT_NAME "Editor del registre" - IDS_TOOLS_REGEDIT_DESCR "Obre l'editor del registre." - IDS_TOOLS_REGEDIT_CMD "regedit.exe" - - IDS_TOOLS_SYSDM_NAME "Propietats del sistema" - IDS_TOOLS_SYSDM_DESCR "Mostra la informacio d'aquest ordinador." - IDS_TOOLS_SYSDM_CMD "control" - IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" - - IDS_STARTUP_COLUMN_ELEMENT "Element" - IDS_STARTUP_COLUMN_CMD "Command" - IDS_STARTUP_COLUMN_PATH "Path" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_SERVICES_STATUS_RUNNING "En marxa" - IDS_SERVICES_STATUS_STOPPED "Parat" - IDS_SERVICES_YES "Si" - IDS_SERVICES_UNKNOWN "Indeterminat" -END Copied: trunk/reactos/base/applications/msconfig/lang/ca-ES.rc (from r29123, trunk/reactos/base/applications/msconfig/lang/ca-CA.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/ca-CA.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/ca-ES.rc Fri Sep 21 00:57:28 2007 @@ -1,4 +1,4 @@ -LANGUAGE LANG_CATALAN, SUBLANG_NEUTRAL +LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT IDD_MSCONFIG_DIALOG DIALOG DISCARDABLE 0, 0, 378, 220 STYLE DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | 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 Fri Sep 21 00:57:28 2007 @@ -10,7 +10,7 @@ /* include localised resources */ #include "lang/bg-BG.rc" -#include "lang/ca-CA.rc" +#include "lang/ca-ES.rc" #include "lang/cs-CZ.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc"

1 0

[cfinck] 29124: Updated Ukrainian translations by Artem Reznikov (temarez AT yandex DOT ru) See issue #2661 for more details.
by cfinck＠svn.reactos.org 20 Sep '07

20 Sep '07

Author: cfinck Date: Thu Sep 20 22:40:55 2007 New Revision: 29124 URL: http://svn.reactos.org/svn/reactos?rev=29124&view=rev Log: Updated Ukrainian translations by Artem Reznikov (temarez AT yandex DOT ru) See issue #2661 for more details. Added: trunk/reactos/boot/freeldr/fdebug/lang/uk-UA.rc Modified: trunk/reactos/base/applications/msconfig/lang/uk-UA.rc trunk/reactos/boot/freeldr/fdebug/fdebug.rc Modified: 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 (original) +++ trunk/reactos/base/applications/msconfig/lang/uk-UA.rc Thu Sep 20 22:40:55 2007 @@ -3,7 +3,7 @@ * 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 + * TRANSLATOR: Rostislav Zabolotny, Artem Reznikov */ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT @@ -36,18 +36,18 @@ 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 "Â&ãîðó", IDC_BTN_SYSTEM_UP, 290, 5, 66, 14 + PUSHBUTTON "Â&íèç", 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 "&Ââ³ìêíóòè", IDC_BTN_SYSTEM_ENABLE, 290, 50, 66, 14 + PUSHBUTTON "Â&èìêíóòè", 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 "&Çíàéòè", IDC_BTN_SYSTEM_FIND, 290, 95, 66, 14 + PUSHBUTTON "&Ñòâîðèòè", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14 + PUSHBUTTON "&Ïðàâêà", 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 + PUSHBUTTON "Ââ&³ìêíóòè Âñå", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14 + PUSHBUTTON "Âè&ìêíóòè Âñå",IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14 END IDD_TOOLS_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/fdebug… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/fdebug.rc (original) +++ trunk/reactos/boot/freeldr/fdebug/fdebug.rc Thu Sep 20 22:40:55 2007 @@ -16,4 +16,4 @@ #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/tr-TR.rc" - +#include "lang/uk-UA.rc" Added: trunk/reactos/boot/freeldr/fdebug/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/u… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/uk-UA.rc (added) +++ trunk/reactos/boot/freeldr/fdebug/lang/uk-UA.rc Thu Sep 20 22:40:55 2007 @@ -1,0 +1,191 @@ +///////////////////////////////////////////////////////////////////////////// +// Ukrainian resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +#pragma code_page(1251) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDC_FDEBUG MENU DISCARDABLE +BEGIN + POPUP "&Ôàéë" + BEGIN + MENUITEM "&Ï³äêëþ÷èòè", IDM_FILE_CONNECT + MENUITEM "&Â³äêëþ÷èòè", IDM_FILE_DISCONNECT, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Î÷èñòèòè åêðàí", IDM_FILE_CLEARDISPLAY + MENUITEM SEPARATOR + MENUITEM "Ïî÷àòè &çàõîïëåííÿ", IDM_FILE_STARTCAPTURE + MENUITEM "Çóïèíèòè ç&àõîïëåííÿ", IDM_FILE_STOPCAPTURE, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Ëîêàëüíà â³äïîâ³äü", IDM_FILE_LOCALECHO + MENUITEM SEPARATOR + MENUITEM "Â&èõ³ä", IDM_EXIT + END + POPUP "&Äîâ³äêà" + BEGIN + MENUITEM "&Ïðî ïðîãðàìó ...", IDM_ABOUT + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Accelerator +// + +IDC_FDEBUG ACCELERATORS MOVEABLE PURE +BEGIN + 63, IDM_ABOUT, ASCII, ALT // "?" + 47, IDM_ABOUT, ASCII, ALT // "/" +END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""resource.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_ABOUTBOX, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 252 + TOPMARGIN, 7 + BOTTOMMARGIN, 203 + END + + IDD_CONNECTION, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 189 + TOPMARGIN, 7 + BOTTOMMARGIN, 93 + END + + IDD_CAPTURE, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 244 + TOPMARGIN, 7 + BOTTOMMARGIN, 88 + END +END +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Ïðî ïðîãðàìó Íàëàãîäæóâà÷ FreeLoader" +FONT 8, "Tahoma" +BEGIN + CONTROL "Íàëàãîäæóâà÷ FreeLoader v1.0\nCopyright (C) 2003\nby Brian Palmer (brianp(a)reactos.org)", + IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, + 122,26 + DEFPUSHBUTTON "OK",IDOK,183,189,44,14,WS_GROUP + ICON IDI_FDEBUG,IDC_STATIC,19,30,20,20 + EDITTEXT IDC_LICENSE_EDIT,53,63,174,107,ES_MULTILINE | + ES_READONLY | WS_VSCROLL +END + +IDD_CONNECTION DIALOG DISCARDABLE 0, 0, 196, 100 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Íàñòðîéêè ç'ºäíàííÿ" +FONT 8, "Tahoma" +BEGIN + LTEXT "Ââåä³òü COM-ïîðò (íàïð. COM1):",IDC_STATIC,7,7,108,8 + EDITTEXT IDC_COMPORT,7,17,182,14,ES_AUTOHSCROLL + LTEXT "Ââåä³òü øâèäê³ñòü ïåðåäà÷³ (íàïð. 115200):",IDC_STATIC,7,38,114, + 8 + EDITTEXT IDC_BAUTRATE,7,48,182,14,ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,45,79,50,14 + PUSHBUTTON "Ñêàñóâàòè",IDCANCEL,100,79,50,14 +END + +IDD_CAPTURE DIALOG DISCARDABLE 0, 0, 251, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ôàéë çàõîïëåííÿ" +FONT 8, "Tahoma" +BEGIN + LTEXT "²ì'ÿ ôàéëó çàõîïëåííÿ:",IDC_STATIC,7,17,62,8 + EDITTEXT IDC_CAPTUREFILENAME,7,26,181,14,ES_AUTOHSCROLL + PUSHBUTTON "&Îãëÿä",IDC_BROWSE,194,26,50,14 + DEFPUSHBUTTON "OK",IDOK,139,74,50,14 + PUSHBUTTON "Ñêàñóâàòè",IDCANCEL,194,74,50,14 +END + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "fdebug" + IDS_HELLO "Ïðèâ³ò Ñâ³ò!" + IDC_FDEBUG "FDEBUG" +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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." +END + +#endif // Ukrainian resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED +

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs