Ros-diffs December 2007

ros-diffs@reactos.org

22 participants
605 discussions

[cwittich] 31319: fix a crash in SaveBoard

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Dec 19 13:05:36 2007 New Revision: 31319 URL: http://svn.reactos.org/svn/reactos?rev=31319&view=rev Log: fix a crash in SaveBoard Modified: trunk/reactos/base/applications/games/winemine/main.c Modified: trunk/reactos/base/applications/games/winemine/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/main.c (original) +++ trunk/reactos/base/applications/games/winemine/main.c Wed Dec 19 13:05:36 2007 @@ -404,7 +404,7 @@ for( i = 0; i < 3; i++ ) { wsprintf( key_name, "Time%u", i ); - RegSetValueEx( hkey, key_name, 0, REG_DWORD, (LPBYTE) p_board->best_time[i], sizeof(DWORD) ); + RegSetValueEx( hkey, key_name, 0, REG_DWORD, (LPBYTE) &p_board->best_time[i], sizeof(DWORD) ); } RegCloseKey( hkey );

17 years

[cwittich] 31318: %wZ req. PUNICODE_STRING instead of UNICODE_STRING

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Dec 19 12:52:12 2007 New Revision: 31318 URL: http://svn.reactos.org/svn/reactos?rev=31318&view=rev Log: %wZ req. PUNICODE_STRING instead of UNICODE_STRING Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Wed Dec 19 12:52:12 2007 @@ -967,7 +967,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("Can't locate driver object for %wZ\n", ObjectName); + DPRINT1("Can't locate driver object for %wZ\n", &ObjectName); return Status; }

17 years

[dchapyshev] 31317: - Add myself to CREDITS (no comments ; )) - Add rasapi32, rasdlg and rasman to apistatus.lst

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Dec 19 12:21:21 2007 New Revision: 31317 URL: http://svn.reactos.org/svn/reactos?rev=31317&view=rev Log: - Add myself to CREDITS (no comments ;)) - Add rasapi32, rasdlg and rasman to apistatus.lst Modified: trunk/reactos/CREDITS trunk/reactos/apistatus.lst Modified: trunk/reactos/CREDITS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CREDITS?rev=31317&r1=31316… ============================================================================== --- trunk/reactos/CREDITS (original) +++ trunk/reactos/CREDITS Wed Dec 19 12:21:21 2007 @@ -13,6 +13,7 @@ Christoph von Wittich <christoph_vw(a)reactos.org> Daniel Reimer <reimer.daniel(a)freenet.de> David Welch <welch(a)cwcom.net> +Dmitry Chapyshev <dmitry(a)reactos.org> Emanuele Aliberti <ea(a)iol.it> Eric Kohl <ekohl(a)rz-online.de> Eugene Ingerman <geneing(a)myrealbox.com> Modified: trunk/reactos/apistatus.lst URL: http://svn.reactos.org/svn/reactos/trunk/reactos/apistatus.lst?rev=31317&r1… ============================================================================== --- trunk/reactos/apistatus.lst (original) +++ trunk/reactos/apistatus.lst Wed Dec 19 12:21:21 2007 @@ -10,6 +10,9 @@ iphlpapi ../reactos/dll/win32/iphlpapi kernel32 ../reactos/dll/win32/kernel32 msvcrt ../reactos/dll/win32/msvcrt +rasapi32 ../reactos/dll/win32/rasapi32 +rasdlg ../reactos/dll/win32/rasdlg +rasman ../reactos/dll/win32/rasman rpcrt4 ../reactos/dll/win32/rpcrt4 secur32 ../reactos/dll/win32/secur32 snmpapi ../reactos/dll/win32/snmpapi

17 years

[dchapyshev] 31316: - Functions for definition BIOS date and version, Domain are added

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Dec 19 11:54:15 2007 New Revision: 31316 URL: http://svn.reactos.org/svn/reactos?rev=31316&view=rev Log: - Functions for definition BIOS date and version, Domain are added Modified: trunk/rosapps/sysutils/systeminfo/lang/de-DE.rc trunk/rosapps/sysutils/systeminfo/lang/en-US.rc trunk/rosapps/sysutils/systeminfo/lang/fr-FR.rc trunk/rosapps/sysutils/systeminfo/resource.h trunk/rosapps/sysutils/systeminfo/systeminfo.c Modified: trunk/rosapps/sysutils/systeminfo/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/systeminfo/lang/d… ============================================================================== --- trunk/rosapps/sysutils/systeminfo/lang/de-DE.rc (original) +++ trunk/rosapps/sysutils/systeminfo/lang/de-DE.rc Wed Dec 19 11:54:15 2007 @@ -1,7 +1,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE -{ +BEGIN IDS_USAGE, "SYSTEMINFO [/S System [/U Benutzername [/P [Passwort]]]] [/FO Format] [/NH]\n\n\ Beschreibung:\n\ @@ -58,5 +58,9 @@ IDS_HOST_NAME, "Domäne: %s\n" IDS_PAGEFILE_LOC, "Auslagerungsdateipfad(e) %s" IDS_TIME_ZONE, "Zeitzone: %s\n" +IDS_DOMINE, "Domain: %s\n" +IDS_BIOS_DATE, "BIOS Date: %s\n" +IDS_BIOS_VERSION, "BIOS Version: %s\n" +IDS_NETWORK_CARDS, "Network Card(s) %u Installed.\n" -} +END Modified: trunk/rosapps/sysutils/systeminfo/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/systeminfo/lang/e… ============================================================================== --- trunk/rosapps/sysutils/systeminfo/lang/en-US.rc (original) +++ trunk/rosapps/sysutils/systeminfo/lang/en-US.rc Wed Dec 19 11:54:15 2007 @@ -1,7 +1,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE DISCARDABLE -{ +BEGIN IDS_USAGE, "SYSTEMINFO [/S system [/U username [/P [password]]]] [/FO format] [/NH]\n\n\ Description:\n\ @@ -54,7 +54,11 @@ IDS_VIRT_MEM_AVAIL, "Virtual Memory: Available: %ld MB (%ld KB)\n" IDS_VIRT_MEM_INUSE, "Virtual Memory: In Use: %ld MB (%ld KB)\n" IDS_HOST_NAME, "Host Name: %s\n" -IDS_PAGEFILE_LOC, "Page File Location(s) %s" +IDS_PAGEFILE_LOC, "Page File Location(s) %s\n" IDS_TIME_ZONE, "Time zone: %s\n" +IDS_DOMINE, "Domain: %s\n" +IDS_BIOS_DATE, "BIOS Date: %s\n" +IDS_BIOS_VERSION, "BIOS Version: %s\n" +IDS_NETWORK_CARDS, "Network Card(s) %u Installed.\n" -} +END Modified: trunk/rosapps/sysutils/systeminfo/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/systeminfo/lang/f… ============================================================================== --- trunk/rosapps/sysutils/systeminfo/lang/fr-FR.rc (original) +++ trunk/rosapps/sysutils/systeminfo/lang/fr-FR.rc Wed Dec 19 11:54:15 2007 @@ -1,9 +1,9 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE -{ +BEGIN -IDS_USAGE, "SYSTEMINFO [/S système [/U utilisateur [/P [motdepasse]]]] [/FO format] [/NH]\n\n\ +IDS_USAGE "SYSTEMINFO [/S système [/U utilisateur [/P [motdepasse]]]] [/FO format] [/NH]\n\n\ Description:\n\ Cet outil en ligne de commande permet à un administrateur d'effectuer une requête sur les informations\n\ basiques de la configuration du système.\n\n\ @@ -56,5 +56,9 @@ IDS_HOST_NAME, "Nom d'hôte: %s\n" IDS_PAGEFILE_LOC, "Emplacement(s) des fichiers d'échange %s" IDS_TIME_ZONE, "Fuseau horaire: %s\n" +IDS_DOMINE, "Domain: %s\n" +IDS_BIOS_DATE, "BIOS Date: %s\n" +IDS_BIOS_VERSION, "BIOS Version: %s\n" +IDS_NETWORK_CARDS, "Network Card(s) %u Installed.\n" -} +END Modified: trunk/rosapps/sysutils/systeminfo/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/systeminfo/resour… ============================================================================== --- trunk/rosapps/sysutils/systeminfo/resource.h (original) +++ trunk/rosapps/sysutils/systeminfo/resource.h Wed Dec 19 11:54:15 2007 @@ -27,3 +27,7 @@ #define IDS_HOST_NAME 124 #define IDS_PAGEFILE_LOC 125 #define IDS_TIME_ZONE 126 +#define IDS_DOMINE 127 +#define IDS_BIOS_DATE 128 +#define IDS_BIOS_VERSION 129 +#define IDS_NETWORK_CARDS 130 Modified: trunk/rosapps/sysutils/systeminfo/systeminfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/systeminfo/system… ============================================================================== --- trunk/rosapps/sysutils/systeminfo/systeminfo.c (original) +++ trunk/rosapps/sysutils/systeminfo/systeminfo.c Wed Dec 19 11:54:15 2007 @@ -220,6 +220,18 @@ } //getting BIOS Version + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + TEXT("HARDWARE\\DESCRIPTION\\System"), + TEXT("SystemBiosVersion"), + Buf)) + if(GetOemStrings(IDS_BIOS_VERSION,Msg)) fprintf(stderr,Msg,Buf); + + //gettings BIOS date + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + TEXT("HARDWARE\\DESCRIPTION\\System"), + TEXT("SystemBiosDate"), + Buf)) + if(GetOemStrings(IDS_BIOS_DATE,Msg)) fprintf(stderr,Msg,Buf); //getting ReactOS Directory if(!GetWindowsDirectory(Buf,BUFFER_SIZE)) printf("Error getting: GetWindowsDirectory"); @@ -327,11 +339,19 @@ } //getting Domain + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon"), + TEXT("CachePrimaryDomain"), + Buf)) + if(GetOemStrings(IDS_DOMINE,Msg)) fprintf(stderr,Msg,Buf); //getting Logon Server //getting NetWork Card(s) - + if(GetOemStrings(IDS_NETWORK_CARDS,Msg)) + { + + } } /* Main program */

17 years

[dchapyshev] 31315: - Update Russian translation

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Dec 19 11:44:31 2007 New Revision: 31315 URL: http://svn.reactos.org/svn/reactos?rev=31315&view=rev Log: - Update Russian translation Modified: trunk/reactos/boot/freeldr/fdebug/lang/ru-RU.rc Modified: trunk/reactos/boot/freeldr/fdebug/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/r… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/ru-RU.rc (original) +++ trunk/reactos/boot/freeldr/fdebug/lang/ru-RU.rc Wed Dec 19 11:44:31 2007 @@ -117,10 +117,10 @@ IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Î ïðîãðàììå FreeLoader Debugger" +CAPTION "Î ïðîãðàììå Îòëàä÷èê FreeLoader" FONT 8, "Tahoma" BEGIN - CONTROL "FreeLoader Debugger v1.0\nCopyright (C) 2003\nîò Brian Palmer (brianp(a)reactos.org)", + CONTROL "Îòëàä÷èê FreeLoader v1.0\nÀâòîðñêèå ïðàâà (C) 2003\nÁðàèí Ïàëìåð (brianp(a)reactos.org)", IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, 122,26 DEFPUSHBUTTON "OK",IDOK,183,189,44,14,WS_GROUP @@ -170,7 +170,7 @@ 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." + IDS_LICENSE "Ýòà ïðîãðàììà ÿâëÿåòñÿ ñâîáîäíûì ïðîãðàììíûì îáåñïå÷åíèåì; Âû ìîæåòå ðàñïðîñòðàíÿòü è/èëè èçìåíÿòü åå â ñîîòâåòñòâèè ñ ëèöåíçèåé GNU General Public License âåðñèè 2 èëè áîëåå ïîçäíåé, îïóáëèêîâàííîé Free Software Foundation.\r\n\r\nÝòà ïðîãðàììà ðàñïðîñòðàíÿåòñÿ ñ íàäåæäîé, ÷òî îíà ìîæåò áûòü ïîëåçíà, íî ÁÅÇ ÂÑßÊÎÉ ÃÀÐÀÍÒÈÈ; íå ïîäðàçóìåâàåòñÿ äàæå ÐÀÁÎÒÎÑÏÎÑÎÁÍÎÑÒÜ èëè ÏÐÈÃÎÄÍÎÑÒÜ ÄËß ÂÛÏÎËÍÅÍÈß ÍÅÎÁÕÎÄÈÌÛÕ ÇÀÄÀ×. Ñì. GNU General Public License äëÿ ïîëó÷åíèÿ äîïîëíèòåëüíûõ ñâåäåíèé.\r\n\r\nÂû äîëæíû ïîëó÷èòü êîïèþ ëèöåíçèè GNU âìåñòå ñ ýòîé ïðîãðàììîé, â ïðîòèâíîì ñëó÷àå îáðàùàéòåñü â Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." END #endif

17 years

[dchapyshev] 31314: - Fix Russian Translation for mstsc - Fix English Translation for servman

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Dec 19 11:42:33 2007 New Revision: 31314 URL: http://svn.reactos.org/svn/reactos?rev=31314&view=rev Log: - Fix Russian Translation for mstsc - Fix English Translation for servman Modified: trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc trunk/reactos/base/applications/mstsc/lang/ru-RU.rc Modified: trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc Wed Dec 19 11:42:33 2007 @@ -68,7 +68,7 @@ FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Service Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 26 + LTEXT "Service Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 30 PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE Modified: trunk/reactos/base/applications/mstsc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/mstsc/lang/ru-RU.rc Wed Dec 19 11:42:33 2007 @@ -15,7 +15,7 @@ PUSHBUTTON "Ñîõðàíèòü êàê...",IDC_SAVEAS,123,139,50,14 PUSHBUTTON "Îòêðûòü...",IDC_OPEN,177,139,50,14 ICON "", IDC_CONNICON, 16,114,20,20 - LTEXT "Ñîõðàíèòü òåêóùèå íàñòðîéêè ïîäêëþ÷åíèÿ èëè îòêðûòü ñóùåñòóþùóþ êîíôèãóðàöèþ",IDC_STATIC,50,115,172,20 + LTEXT "Ñîõðàíèòü òåêóùèå íàñòðîéêè ïîäêëþ÷åíèÿ èëè îòêðûòü ñóùåñòâóþùóþ êîíôèãóðàöèþ",IDC_STATIC,50,115,172,20 END IDD_DISPLAY DIALOGEX 0, 0, 242, 175 @@ -30,7 +30,7 @@ CONTROL "", IDC_GEOSLIDER, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 56, 42, 124, 17 COMBOBOX IDC_BPPCOMBO,56,102,128,80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "",IDC_COLORIMAGE,"Static",SS_OWNERDRAW | SS_SUNKEN, 56,121,127,10 - LTEXT "Ïðèìå÷àíèå: Íàñòðîéêè óäàëåííîãî êîìïüþòåðà îïðåäåëÿþò ýòè ïàðàìåòðû.",IDC_STATIC,56,143,165,18 + LTEXT "Ïðèìå÷àíèå: Ýòè ïàðàìåòðû îïðåäåëÿþòñÿ íàñòðîéêàìè óäàëåííîãî êîìïüþòåðà.",IDC_STATIC,56,143,165,18 LTEXT "Ìåíüøå",IDC_STATIC,35,52,15,8 LTEXT "Áîëüøå",IDC_STATIC,189,51,17,8 LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 62, 120, 10, SS_CENTER @@ -51,7 +51,7 @@ BEGIN IDS_TAB_GENERAL "Îáùèå" IDS_TAB_DISPLAY "Ýêðàí" - IDS_256COLORS "256 Öâåòîâ" + IDS_256COLORS "256 öâåòîâ" IDS_HIGHCOLOR15 "Ðàçðåøåíèå (15 áèò)" IDS_HIGHCOLOR16 "Ðàçðåøåíèå (16 áèò)" IDS_HIGHCOLOR24 "Ðàçðåøåíèå (24 áèò)"

17 years

[mpiulachs] 31313: Add r31312 new translations to build

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Wed Dec 19 02:15:35 2007 New Revision: 31313 URL: http://svn.reactos.org/svn/reactos?rev=31313&view=rev Log: Add r31312 new translations to build Modified: trunk/reactos/base/applications/mmc/rsrc.rc trunk/reactos/base/applications/screensavers/logon/logon.rc trunk/reactos/boot/freeldr/fdebug/fdebug.rc trunk/reactos/dll/win32/console/rsrc.rc Modified: trunk/reactos/base/applications/mmc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/rsrc… ============================================================================== --- trunk/reactos/base/applications/mmc/rsrc.rc (original) +++ trunk/reactos/base/applications/mmc/rsrc.rc Wed Dec 19 02:15:35 2007 @@ -5,6 +5,7 @@ #include "lang/ca-ES.rc" #include "lang/de-DE.rc" #include "lang/el-GR.rc" +#include "lang/es-ES.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" #include "lang/nb-NO.rc" Modified: trunk/reactos/base/applications/screensavers/logon/logon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/logon.rc (original) +++ trunk/reactos/base/applications/screensavers/logon/logon.rc Wed Dec 19 02:15:35 2007 @@ -16,6 +16,7 @@ #include "lang/bg-BG.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/lt-LT.rc" #include "lang/nl-NL.rc" 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 Wed Dec 19 02:15:35 2007 @@ -8,6 +8,7 @@ #include "lang/bg-BG.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" Modified: trunk/reactos/dll/win32/console/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/rsrc.rc?… ============================================================================== --- trunk/reactos/dll/win32/console/rsrc.rc (original) +++ trunk/reactos/dll/win32/console/rsrc.rc Wed Dec 19 02:15:35 2007 @@ -5,6 +5,7 @@ #include "lang/en-US.rc" #include "lang/de-DE.rc" +#include "lang/es-ES.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" #include "lang/pl-PL.rc"

17 years

[mpiulachs] 31312: spanish localizations by Remialdo <remialdo at gmail dot com> - Updated: downloader, solitarie, winemine, screensaver 3dtext - Added: mmc, screensaver logon, freeldr fdebug, console See issue #2898 for more details.

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Wed Dec 19 02:05:26 2007 New Revision: 31312 URL: http://svn.reactos.org/svn/reactos?rev=31312&view=rev Log: spanish localizations by Remialdo <remialdo at gmail dot com> - Updated: downloader,solitarie, winemine,screensaver 3dtext - Added: mmc,screensaver logon, freeldr fdebug, console See issue #2898 for more details. Added: trunk/reactos/base/applications/mmc/lang/es-ES.rc (with props) trunk/reactos/base/applications/screensavers/logon/lang/es-ES.rc (with props) trunk/reactos/boot/freeldr/fdebug/lang/es-ES.rc (with props) trunk/reactos/dll/win32/console/lang/es-ES.rc (with props) Modified: trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc trunk/reactos/base/applications/games/winemine/lang/es-ES.rc trunk/reactos/base/applications/screensavers/3dtext/lang/es-ES.rc trunk/rosapps/downloader/lang/es-ES.rc Modified: trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc Wed Dec 19 02:05:26 2007 @@ -4,6 +4,7 @@ * FILE: base/applications/games/solitaire/lang/es-ES.rc * PURPOSE: Spanish Language File for Solitaire * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) + * ACTUALIZADO: Javier Remacha - 18/12/17 */ #include "resource.h" @@ -14,22 +15,22 @@ IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT -CAPTION "Options" +CAPTION "Opciones" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Cards", -1, 7, 7, 65, 40 - AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP - AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 + GROUPBOX "Cartas", -1, 7, 7, 65, 40 + AUTORADIOBUTTON "Sacar &Una", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Sacar &Tres", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 - AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED - AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + AUTOCHECKBOX "&Mostrar tiempo", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "&Barra de estado", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP DEFPUSHBUTTON "Aceptar", IDOK, 35, 97, 50, 14 PUSHBUTTON "Cancelar", IDCANCEL, 101, 97, 50, 14 END IDD_CARDBACK DIALOGEX 6, 6, 221, 96 -CAPTION "Select Card Back" +CAPTION "Seleccionar el reverso" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN @@ -37,8 +38,8 @@ 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 "OK", IDOK, 104, 77, 54, 13 - PUSHBUTTON "Cancel", IDCANCEL, 162, 77, 54, 13 + DEFPUSHBUTTON "Aceptar", IDOK, 104, 77, 54, 13 + PUSHBUTTON "Cancelar", IDCANCEL, 162, 77, 54, 13 END @@ -46,10 +47,10 @@ STRINGTABLE BEGIN - IDS_SOL_NAME "Solitaire" - IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." + IDS_SOL_NAME "Solitario" + IDS_SOL_ABOUT "Solitario por J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Quit the current game?" - IDS_SOL_WIN "Congratulations, you win!!" + IDS_SOL_WIN "Felicidadas, ¡¡Has ganado!!" END @@ -61,7 +62,7 @@ BEGIN MENUITEM "&Repartir\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "&Barajar...", IDM_GAME_DECK + MENUITEM "&Barajas...", IDM_GAME_DECK MENUITEM "&Opciones...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "&Salir", IDM_GAME_EXIT Modified: trunk/reactos/base/applications/games/winemine/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/es-ES.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/es-ES.rc Wed Dec 19 02:05:26 2007 @@ -69,7 +69,7 @@ EDITTEXT IDC_EDITCOLS, 49, 35, 30, 12, ES_NUMBER EDITTEXT IDC_EDITMINES, 49, 55, 30, 12, ES_NUMBER DEFPUSHBUTTON "Aceptar", IDOK, 86, 32, 45, 15 - PUSHBUTTON "Cancel", IDCANCEL, 86, 52, 45, 15 + PUSHBUTTON "Cancelar", IDCANCEL, 86, 52, 45, 15 } DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 Added: trunk/reactos/base/applications/mmc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/es-ES.rc (added) +++ trunk/reactos/base/applications/mmc/lang/es-ES.rc Wed Dec 19 02:05:26 2007 @@ -1,0 +1,26 @@ +/* + *Spanish Language resource file + * Traducido por: Javier Remacha 2007-12-18 + */ + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +IDM_CONSOLEROOT MENU DISCARDABLE +BEGIN + POPUP "&Archivo" + BEGIN + MENUITEM SEPARATOR + MENUITEM "Sa&lir\tAlt+F4", ID_FILE_EXIT + END + + POPUP "&Ayuda" + BEGIN + MENUITEM "&Acerca de la Consola de Administración de ReactOS...", ID_HELP_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "Consola de Administración de ReactOS" + IDS_CONSOLETITLE "Consola%1!u!" +END Propchange: trunk/reactos/base/applications/mmc/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/screensavers/3dtext/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/lang/es-ES.rc (original) +++ trunk/reactos/base/applications/screensavers/3dtext/lang/es-ES.rc Wed Dec 19 02:05:26 2007 @@ -15,5 +15,5 @@ BEGIN IDS_DESCRIPTION "3D Text ScreenSaver" IDS_TITLE "Acerca de.." - IDS_TEXT "No options need to be set." + IDS_TEXT "Ninguna opción necesita ser configurada." END Added: trunk/reactos/base/applications/screensavers/logon/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/lang/es-ES.rc (added) +++ trunk/reactos/base/applications/screensavers/logon/lang/es-ES.rc Wed Dec 19 02:05:26 2007 @@ -1,0 +1,8 @@ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Logotipo ReactOS" + IDS_TITLE "Acerca de" + IDS_TEXT "Ninguna opción necesita ser configurada." +END Propchange: trunk/reactos/base/applications/screensavers/logon/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/boot/freeldr/fdebug/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/e… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/es-ES.rc (added) +++ trunk/reactos/boot/freeldr/fdebug/lang/es-ES.rc Wed Dec 19 02:05:26 2007 @@ -1,0 +1,191 @@ +///////////////////////////////////////////////////////////////////////////// +// Spanish resources, Javier Remacha 2007-12-18 + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDC_FDEBUG MENU DISCARDABLE +BEGIN + POPUP "&Archivo" + BEGIN + MENUITEM "&Conectar", IDM_FILE_CONNECT + MENUITEM "&Desconectar", IDM_FILE_DISCONNECT, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Limpiar pantalla", IDM_FILE_CLEARDISPLAY + MENUITEM SEPARATOR + MENUITEM "&Comenzar Captura", IDM_FILE_STARTCAPTURE + MENUITEM "&Parar Captura", IDM_FILE_STOPCAPTURE, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Local Echo", IDM_FILE_LOCALECHO + MENUITEM SEPARATOR + MENUITEM "Sa&lir", IDM_EXIT + END + POPUP "Ay&uda" + BEGIN + MENUITEM "&Acerca de ...", 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 "Acerca de FreeLoader Debugger" +FONT 8, "Tahoma" +BEGIN + CONTROL "FreeLoader Debugger v1.0\nCopyright (C) 2003\nby Brian Palmer (brianp(a)reactos.org)", + IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, + 122,26 + DEFPUSHBUTTON "Aceptar",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 "Opciones de Conexión" +FONT 8, "Tahoma" +BEGIN + LTEXT "Introduzca el puerto COM (p.e. COM1):",IDC_STATIC,7,7,108,8 + EDITTEXT IDC_COMPORT,7,17,182,14,ES_AUTOHSCROLL + LTEXT "Introduzca la velocidad de transmisión (p.e. 115200):",IDC_STATIC,7,38,114, + 8 + EDITTEXT IDC_BAUTRATE,7,48,182,14,ES_AUTOHSCROLL + DEFPUSHBUTTON "Aceptar",IDOK,45,79,50,14 + PUSHBUTTON "Cancelar",IDCANCEL,100,79,50,14 +END + +IDD_CAPTURE DIALOG DISCARDABLE 0, 0, 251, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Archivo de Captura" +FONT 8, "Tahoma" +BEGIN + LTEXT "Archivo de la Captura:",IDC_STATIC,7,17,62,8 + EDITTEXT IDC_CAPTUREFILENAME,7,26,181,14,ES_AUTOHSCROLL + PUSHBUTTON "&Buscar",IDC_BROWSE,194,26,50,14 + DEFPUSHBUTTON "Aceptar",IDOK,139,74,50,14 + PUSHBUTTON "Cancelar",IDCANCEL,194,74,50,14 +END + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "fdebug" + IDS_HELLO "Hola mundo" + 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 // +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Propchange: trunk/reactos/boot/freeldr/fdebug/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/console/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/console/lang/es-ES.rc (added) +++ trunk/reactos/dll/win32/console/lang/es-ES.rc Wed Dec 19 02:05:26 2007 @@ -1,0 +1,150 @@ + +/* + *Spanish Language resource file + * Javier Remacha 2007-12-01 + */ + + + +#include <commctrl.h> + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +IDD_PROPPAGEOPTIONS DIALOGEX 0, 0, 250, 220 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Opciones" +FONT 8, "MS Shell Dlg" +BEGIN +GROUPBOX "Tamaño del Cursor", -1, 15, 15, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP +CONTROL "&Pequeño", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 25, 90, 10 +CONTROL "&Mediano", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 40, 90, 10 +CONTROL "&Grande", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 90, 10 +GROUPBOX "Mostrar Opciones", -1, 140, 15, 100, 70, WS_CHILD | WS_VISIBLE | WS_GROUP +CONTROL "&Ventana", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 35, 70, 10 +CONTROL "&Pantalla Completa", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 50, 70, 10 +GROUPBOX "Historial de Comandos:", -1, 15, 90, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP +LTEXT "Tamaño del &Buffer", -1, 25, 100, 60, 15 +EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 100, 30, 15, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 100, 12, 12 +LTEXT "&Númber de Buffers:", -1, 25, 120, 80, 15 +EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 120, 12, 12 +CHECKBOX "&Descartar Viejos Duplicados", IDC_CHECK_DISCARD_DUPLICATES, 25, 140, 100, 15 + + +GROUPBOX "Editar Opciones", -1, 140, 90, 100, 70, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP +CHECKBOX "Modo &Edición rápida", IDC_CHECK_QUICK_EDIT, 150, 100, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP +CHECKBOX "Modo &Insertar", IDC_CHECK_INSERT_MODE, 150, 120, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_PROPPAGEFONT DIALOGEX 0, 0, 250, 220 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Fuente" +FONT 8, "MS Shell Dlg" +BEGIN +LTEXT "Window Preview", -1, 10, 7, 65, 10 +LTEXT "Tamaño", -1, 130, 10, 30, 10 +CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 115, 70 +LISTBOX IDC_LBOX_FONTS, 130, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL +LTEXT "&Fuente", -1, 10, 105, 35, 10 +CHECKBOX "&Negrita", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10 +LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 50, LBS_DISABLENOSCROLL | WS_VSCROLL +GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 10, 155, 200, 50 +CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 95, 35 +LTEXT "Cada caracter es:", -1, 130, 165, 75, 10 +LTEXT "anchura del pixel\naltura del pixel", -1, 140, 180, 65, 20 +LTEXT "", IDC_FONT_SIZE_X, 125, 180, 10, 10 +LTEXT "", IDC_FONT_SIZE_Y, 125, 188, 10, 10 +END + +IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 250, 220 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Disposición" +FONT 8, "MS Shell Dlg" +BEGIN +LTEXT "Ventana de Previsualización", -1, 10, 7, 65, 10 +CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 10, 20, 115, 70 +GROUPBOX "Tamaño del Buffer de Pantalla", -1, 130, 15, 115, 40 +LTEXT "&Anchura:", -1, 135, 30, 25, 10 +LTEXT "A&ltura:", -1, 135, 40, 25, 10 +EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 165, 30, 35, 10, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 +EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 165, 40, 35, 10, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 +GROUPBOX "Tamaño de la Ventana", -1, 130, 60, 115, 40 +LTEXT "&A&nchura:", -1, 135, 70, 25, 10 +LTEXT "A&l&tura:", -1, 135, 80, 25, 10 +EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 165, 70, 35, 10, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 +EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 165, 80, 35, 10, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 +GROUPBOX "Posición de la Ventana", -1, 130, 105, 115, 55 +LTEXT "&Izquierda:", -1, 135, 120, 25, 10 +LTEXT "&Arriba:", -1, 135, 130, 25, 10 +EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 165, 120, 35, 10, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 +EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 165, 130, 35, 10, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 +CHECKBOX "Deje la &posición de ventana del sistema", IDC_CHECK_SYSTEM_POS_WINDOW, 135, 145, 100, 10 +END + +IDD_PROPPAGECOLORS DIALOGEX 0, 0, 250, 220 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Colores" +FONT 8, "MS Shell Dlg" +BEGIN +CONTROL "&Texto Pantalla", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 15, 90, 10 +CONTROL "&Fondo Pantalla", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 25, 90, 10 +CONTROL "Texto &Emergente", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 90, 10 +CONTROL "Fondo E&mergente", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 45, 90, 10 +GROUPBOX "Valores de Color Seleccionados", -1, 120, 15, 90, 45 +LTEXT "&Rojo:", -1, 125, 25, 30, 10 +EDITTEXT IDC_EDIT_COLOR_RED, 150, 25, 30, 10, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 25, 30, 10 +LTEXT "&Verde:", -1, 125, 35, 30, 10 +EDITTEXT IDC_EDIT_COLOR_GREEN, 150, 35, 30, 10, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 35, 30, 10 +LTEXT "&Azul:", -1, 125, 45, 30, 10 +EDITTEXT IDC_EDIT_COLOR_BLUE, 150, 45, 30, 10, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 45, 30, 10 +CONTROL "", IDC_STATIC_COLOR1, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 15, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR2, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 27, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR3, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 39, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR4, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 51, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR5, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 63, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR6, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 75, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR7, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 87, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR8, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 99, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR9, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 111, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR10, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 123, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR11, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 135, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR12, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 147, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR13, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 159, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 171, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 183, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 195, 90, 10, 10 +GROUPBOX "Colores de Pantalla Seleccionados", -1, 10, 110, 200, 40 +CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 120, 180, 20 +GROUPBOX "Colores Emergentes Seleccionados", -1, 10, 155, 200, 40 +CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 180, 20 +END + +IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 100 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +CAPTION "Aplicar Propiedades" +FONT 8, "MS Shell Dlg" +BEGIN +CONTROL "&Aplicar propiedades sólo a la ventana actual", IDC_RADIO_APPLY_CURRENT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 25, 150, 10 +CONTROL "&Guardar propiedades para futuras ventanas con el mismo título", IDC_RADIO_APPLY_ALL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 40, 185, 10 +PUSHBUTTON "Aceptar", IDOK, 25, 80, 40, 15, WS_VISIBLE +PUSHBUTTON "Cancelar", IDCANCEL, 120, 80, 50, 15, WS_VISIBLE +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "Consola" + IDS_CPLDESCRIPTION "Configurar propiedades de la consola." + IDS_APPLY_SHORTCUT_ALL "Modificar &atajo que comienza esta ventana" + IDS_SCREEN_TEXT "C:\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" + IDS_RASTERFONTS "Fuentes Raster" +END Propchange: trunk/reactos/dll/win32/console/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/downloader/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/es-ES.rc?r… ============================================================================== --- trunk/rosapps/downloader/lang/es-ES.rc (original) +++ trunk/rosapps/downloader/lang/es-ES.rc Wed Dec 19 02:05:26 2007 @@ -1,3 +1,8 @@ +/* + *Spanish Language resource file + * Actualizado Javier Remacha 2007-12-01 + */ + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL IDD_DOWNLOAD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 @@ -7,22 +12,22 @@ BEGIN CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Cancel", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancelar", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP END IDD_PROF DIALOGEX 6, 6, 267, 110 STYLE DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE -CAPTION "Proferences" +CAPTION "Preferencias" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Download folder:", -1, 6, 10, 140, 8 + LTEXT "Carpeta de descarga:", -1, 6, 10, 140, 8 EDITTEXT IDC_DOWNLOAD_FOLDER_EDIT, 6, 20, 205, 14, WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "C&hoose...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 - AUTOCHECKBOX "&Delete installation files after setup", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP - LTEXT "Update server:", -1, 6, 55, 140, 8 + PUSHBUTTON "&Seleccionar...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 + AUTOCHECKBOX "&Borrar archivos de instalación tras la instalación", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP + LTEXT "Actualizar servidor:", -1, 6, 55, 140, 8 EDITTEXT IDC_UPDATE_SERVER_EDIT, 6, 65, 255, 14, WS_VISIBLE | WS_TABSTOP - DEFPUSHBUTTON "&OK", IDOK, 147, 90, 54, 15 - PUSHBUTTON "&Cancel", IDCANCEL, 207, 90, 54, 15 + DEFPUSHBUTTON "&Aceptar", IDOK, 147, 90, 54, 15 + PUSHBUTTON "&Cancelar", IDCANCEL, 207, 90, 54, 15 END STRINGTABLE DISCARDABLE @@ -31,11 +36,11 @@ IDS_WELCOME_TITLE "Bienvenido al descargador de ReactOS" IDS_WELCOME "Por favor selecciona una categoría de la izquierda. Esta es la versión 1.1." IDS_NO_APP_TITLE "Ninguna aplicación seleccionada" - IDS_NO_APP "Please select a Application before you click the download button, if you need assistance please click on the question mark button on the top right corner." + IDS_NO_APP "Por favor seleccione una Aplicación antes de pulsar el botón de Descarga, si necesita asistencia por favor pulsa el botón con la interrogación en la esquina superior derecha." IDS_UPDATE_TITLE "Actualizar" - IDS_UPDATE "Perdona esta característica no a sido implementada todavía." + IDS_UPDATE "Perdón esta característica no a sido implementada todavía." IDS_HELP_TITLE "Ayuda" - IDS_HELP "Selecciona una categoría de la izquierda, entonces selecciona una aplicación y pulda el botón de descargar. Para actualizar la información de la aplicación pulsa el botón junto al botón de ayuda." + IDS_HELP "Selecciona una categoría de la izquierda, entonces selecciona una aplicación y pulsa el botón de descargar. Para actualizar la información de la aplicación pulsa el botón junto al botón de ayuda." IDS_NO_APPS "Perdón, aun no hay ninguna aplicación en esta categoría. Puedes ayudar y añadir más aplicaciones." IDS_CHOOSE_APP "Por favor selecciona una aplicación." IDS_CHOOSE_SUB "Por favor selecciona una subcategoría." @@ -44,14 +49,14 @@ IDS_XMLERROR_1 "¡No se a encontrado el archivo xml!" IDS_XMLERROR_2 "¡No se ha podido analizar el archivo xml!" IDS_DOWNLOAD_ERROR "Imposible descargar el archivo.\nPor favor verifica tu conexión a internet." - IDS_VERSION "Version: " - IDS_LICENCE "Licence: " - IDS_MAINTAINER "Maintainer: " - IDS_APPS_TITLE "Applications" - IDS_CATS_TITLE "Categories" - IDS_CHOOSE_FOLDER "Please, choose the folder..." - IDS_NOTCREATE_REGKEY "Could not create the registry key." + IDS_VERSION "Versión: " + IDS_LICENCE "Licencia: " + IDS_MAINTAINER "Mantenido por: " + IDS_APPS_TITLE "Aplicaciones" + IDS_CATS_TITLE "Categorias" + IDS_CHOOSE_FOLDER "Por favor, seleccione la carpeta..." + IDS_NOTCREATE_REGKEY "No se puede crear la llave del registro." IDS_DOWNLOAD_FOLDER "Downloader" - IDS_UNABLECREATE_FOLDER "Unable to create a folder with this name!" + IDS_UNABLECREATE_FOLDER "¡Imposible crear una carpeta con este nombre!" IDS_UPDATE_URL "http://svn.reactos.org" END

17 years

[janderwald] 31311: - convert buffer back if pidle simple - fixes error message when opening control panel in explorer and displays the name for the folder option cpl (thus executing is not yet implemented)

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Dec 19 02:01:14 2007 New Revision: 31311 URL: http://svn.reactos.org/svn/reactos?rev=31311&view=rev Log: - convert buffer back if pidle simple - fixes error message when opening control panel in explorer and displays the name for the folder option cpl (thus executing is not yet implemented) Modified: trunk/reactos/dll/win32/shell32/cpanelfolder.c Modified: trunk/reactos/dll/win32/shell32/cpanelfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/cpanelfo… ============================================================================== --- trunk/reactos/dll/win32/shell32/cpanelfolder.c (original) +++ trunk/reactos/dll/win32/shell32/cpanelfolder.c Wed Dec 19 02:01:14 2007 @@ -691,7 +691,12 @@ return E_OUTOFMEMORY; if (!WideCharToMultiByte(CP_ACP, 0, wszPath, -1, szPath, MAX_PATH, NULL, NULL)) wszPath[0] = '\0'; - } + } else { + if (bSimplePidl) { + if (!WideCharToMultiByte(CP_ACP, 0, wszPath, -1, szPath, MAX_PATH, NULL, NULL)) + wszPath[0] = '\0'; + } + } } strRet->uType = STRRET_CSTR;

17 years

[mpiulachs] 31310: - Validate base address format - Ensure base address value between 0x00400000 and 0x80000000

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Wed Dec 19 00:20:59 2007 New Revision: 31310 URL: http://svn.reactos.org/svn/reactos?rev=31310&view=rev Log: - Validate base address format - Ensure base address value between 0x00400000 and 0x80000000 Modified: branches/rbuild/reactos/tools/rbuild/module.cpp branches/rbuild/reactos/tools/rbuild/project.cpp branches/rbuild/reactos/tools/rbuild/rbuild.h Modified: branches/rbuild/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/mod… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/module.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/module.cpp Wed Dec 19 00:20:59 2007 @@ -2029,7 +2029,26 @@ const Module* module_ ) : Property( node_ , project_, module_) { - //TODO: Add code to validate baseaddress + if (Convert::IsValidHex(value)) + { + if ((Convert::HexToInt(value) >= Convert::HexToInt("0x00400000")) && + (Convert::HexToInt(value) <= Convert::HexToInt("0x80000000")) ) + { + //Is valid + } + else + throw XMLInvalidBuildFileException ( + node->location, + "Out of range base address '%s' with value '%s'. Valid range is from 0x00400000 to 0x80000000", + name.c_str(), + value.c_str()); + } + else + throw XMLInvalidBuildFileException ( + node->location, + "Base adress '%s' has an invalid hexadecimal value '%s'", + name.c_str(), + value.c_str() ); } PchFile::PchFile ( Modified: branches/rbuild/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/pro… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/project.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/project.cpp Wed Dec 19 00:20:59 2007 @@ -17,6 +17,7 @@ */ #include "pch.h" #include <assert.h> +#include <sstream> #include "rbuild.h" #include "backend/backend.h" @@ -33,6 +34,41 @@ value ); else return ""; +} + +bool +Convert::IsValidHex ( const std::string& value ) +{ + return (HexToInt (value) != 0); +} + +unsigned long +Convert::HexToInt( const std::string& value ) +{ + unsigned long num = 0; + std::istringstream ss(value); + ss >> std::hex; + if (!(ss >> num)) + { + return 0; + } + return num; +} + +std::string +Convert::StringToHex (unsigned long num) +{ + std::string s1; + char sign[] = {'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'}; + int div, base = 16; + + while (num >= 1) + { + div = num % base; + num = num / base; + s1 = sign[div] + s1; + } + return s1; } string Modified: branches/rbuild/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/rbu… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/rbuild.h (original) +++ branches/rbuild/reactos/tools/rbuild/rbuild.h Wed Dec 19 00:20:59 2007 @@ -197,6 +197,14 @@ bool InstallFiles; }; +class Convert +{ +public: + static unsigned long HexToInt ( const std::string& value ); + static bool IsValidHex ( const std::string& value ); + static std::string StringToHex ( unsigned long num); +}; + class Environment { public:

17 years

← Newer
1
...
19
20
21
22
23
24
25
...
61
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2007