Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[gvg] 20297: Remember the last allocated port and try to allocate the next one on the
by gvg＠svn.reactos.com 22 Dec '05

22 Dec '05

Remember the last allocated port and try to allocate the next one on the following call (prevents 1024 from being allocated each time) Modified: trunk/reactos/drivers/lib/ip/network/ports.c Modified: trunk/reactos/drivers/net/tcpip/include/ports.h _____ Modified: trunk/reactos/drivers/lib/ip/network/ports.c --- trunk/reactos/drivers/lib/ip/network/ports.c 2005-12-21 21:29:07 UTC (rev 20296) +++ trunk/reactos/drivers/lib/ip/network/ports.c 2005-12-22 11:44:16 UTC (rev 20297) @@ -15,6 +15,8 @@ UINT PortsToManage ) { PortSet->StartingPort = StartingPort; PortSet->PortsToOversee = PortsToManage; + PortSet->LastAllocatedPort = PortSet->StartingPort + + PortSet->PortsToOversee - 1; PortSet->ProtoBitBuffer = PoolAllocateBuffer( (PortSet->PortsToOversee + 7) / 8 ); RtlInitializeBitMap( &PortSet->ProtoBitmap, @@ -52,12 +54,23 @@ ULONG AllocateAnyPort( PPORT_SET PortSet ) { ULONG AllocatedPort; + ULONG Next; +__asm__("int $3\n"); + if (PortSet->StartingPort + PortSet->PortsToOversee <= + PortSet->LastAllocatedPort + 1) { + Next = PortSet->StartingPort; + } else { + Next = PortSet->LastAllocatedPort + 1; + } + Next -= PortSet->StartingPort; + ExAcquireFastMutex( &PortSet->Mutex ); AllocatedPort = RtlFindClearBits( &PortSet->ProtoBitmap, 1, 0 ); if( AllocatedPort != (ULONG)-1 ) { RtlSetBit( &PortSet->ProtoBitmap, AllocatedPort ); AllocatedPort += PortSet->StartingPort; + PortSet->LastAllocatedPort = AllocatedPort; } ExReleaseFastMutex( &PortSet->Mutex ); @@ -68,16 +81,28 @@ ULONG AllocatePortFromRange( PPORT_SET PortSet, ULONG Lowest, ULONG Highest ) { ULONG AllocatedPort; + ULONG Next; + if (PortSet->StartingPort + PortSet->PortsToOversee <= + PortSet->LastAllocatedPort + 1) { + Next = PortSet->StartingPort; + } else { + Next = PortSet->LastAllocatedPort + 1; + } + if (Next < Lowest || Highest <= Next) { + Next = Lowest; + } + Next -= PortSet->StartingPort; Lowest -= PortSet->StartingPort; Highest -= PortSet->StartingPort; ExAcquireFastMutex( &PortSet->Mutex ); - AllocatedPort = RtlFindClearBits( &PortSet->ProtoBitmap, 1, Lowest ); + AllocatedPort = RtlFindClearBits( &PortSet->ProtoBitmap, 1, Next ); if( AllocatedPort != (ULONG)-1 && AllocatedPort >= Lowest && AllocatedPort <= Highest) { RtlSetBit( &PortSet->ProtoBitmap, AllocatedPort ); AllocatedPort += PortSet->StartingPort; + PortSet->LastAllocatedPort = AllocatedPort; } ExReleaseFastMutex( &PortSet->Mutex ); _____ Modified: trunk/reactos/drivers/net/tcpip/include/ports.h --- trunk/reactos/drivers/net/tcpip/include/ports.h 2005-12-21 21:29:07 UTC (rev 20296) +++ trunk/reactos/drivers/net/tcpip/include/ports.h 2005-12-22 11:44:16 UTC (rev 20297) @@ -16,6 +16,7 @@ PVOID ProtoBitBuffer; UINT StartingPort; UINT PortsToOversee; + UINT LastAllocatedPort; FAST_MUTEX Mutex; } PORT_SET, *PPORT_SET;

1 0

[greatlrd] 20296: Bug 1158 French translation from French translation team by zoken <mustang9@gmail.com>
by greatlrd＠svn.reactos.com 21 Dec '05

21 Dec '05

Bug 1158 French translation from French translation team by zoken <mustang9(a)gmail.com> Added: trunk/reactos/subsys/system/reactos/Fr.rc Modified: trunk/reactos/subsys/system/reactos/reactos.rc _____ Added: trunk/reactos/subsys/system/reactos/Fr.rc --- trunk/reactos/subsys/system/reactos/Fr.rc 2005-12-21 21:25:59 UTC (rev 20295) +++ trunk/reactos/subsys/system/reactos/Fr.rc 2005-12-21 21:29:07 UTC (rev 20296) @@ -0,0 +1,13 @@ +/* $Id: En.rc 18526 2005-10-17 18:04:11Z cwittich $ */ +// FRENCH translation by G. Maton (mustang9(a)gmail.com) + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +/* String Tables */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_CAPTION "Installation de ReactOS" + IDS_TEXT "Vous ne pouvez pas installer ReactOS directement depuis ce CD!\n\nVeuillez redÚmarrer votre ordinateur depuis ce CD afin d'installer ReactOS." +END + +/* EOF */ _____ Modified: trunk/reactos/subsys/system/reactos/reactos.rc --- trunk/reactos/subsys/system/reactos/reactos.rc 2005-12-21 21:25:59 UTC (rev 20295) +++ trunk/reactos/subsys/system/reactos/reactos.rc 2005-12-21 21:29:07 UTC (rev 20296) @@ -23,5 +23,6 @@ #include "It.rc" #include "Ja.rc" #include "Hu.rc" +#include "Fr.rc" /* EOF */

1 0

[greatlrd] 20295: Bug 1157 French translation from French translation team by zoken <mustang9@gmail.com>
by greatlrd＠svn.reactos.com 21 Dec '05

21 Dec '05

Bug 1157 French translation from French translation team by zoken <mustang9(a)gmail.com> Added: trunk/reactos/lib/cpl/access/Fr.rc Modified: trunk/reactos/lib/cpl/access/access.rc _____ Added: trunk/reactos/lib/cpl/access/Fr.rc --- trunk/reactos/lib/cpl/access/Fr.rc 2005-12-21 21:19:04 UTC (rev 20294) +++ trunk/reactos/lib/cpl/access/Fr.rc 2005-12-21 21:25:59 UTC (rev 20295) @@ -0,0 +1,110 @@ +// French resource file by G. Maton +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDI_CPLACCESS ICON "resources/applet.ico" + + +IDD_PROPPAGEKEYBOARD DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Clavier" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Touches rÚmanantes",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEET PADDING),LABELLINE(6)+PROPSHEETPADDING + LTEXT "Utilisez les touches rÚmanentes si vous voulez utiliser les touches Maj, Ctrl, Alt en appuyant sur une touche Ó la fois.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*P ROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + CHECKBOX "&Utiliser les touches rÚmanentes",IDC_STICKY_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPS HEETPADDING),14 + PUSHBUTTON "&ParamÞtres",IDC_STICKY_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LAB ELLINE(5)+2,(15*PROPSHEETPADDING),14 + GROUPBOX "Touches filtres",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSHEETP ADDING),LABELLINE(7)+2 + LTEXT "Utilisez les touches filtres si vous voulez que ReactOS ignore les frappes brÞves ou rÚpÚtÚes ou si vous voulez diminuer la frÚquence de rÚpÚtition.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETW IDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + CHECKBOX "Utiliser les touches &filtre",IDC_FILTER_BOX,(4*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROPSHE ETPADDING),14 + PUSHBUTTON "P&aramÞtres",IDC_FILTER_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LAB ELLINE(13)+2,(15*PROPSHEETPADDING),14 + GROUPBOX "Touches bascules",-1,PROPSHEETPADDING,LABELLINE(16)+3,PROPSHEETWIDTH-(2*PROPSHEE TPADDING),LABELLINE(6)+PROPSHEETPADDING + LTEXT "Utilisez les touches &bascules si vous voulez entendre un son Úmis Ó chaques fois que vous appuyez sur Verr. maj, Verr. num, et ArrÛt dÚfil.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH- (6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) + CHECKBOX "Utiliser les touches bascules",IDC_TOGGLE_BOX,(4*PROPSHEETPADDING),LABELLINE(20)+2,PROPSHEETW IDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) + PUSHBUTTON "Para&mÞtres",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LAB ELLINE(20)+2,(15*PROPSHEETPADDING),14 +// CHECKBOX "&Afficher l'aide supplÚmentaire sur le clavier dans les programmes",IDC_KEYBOARD_EXTRA +END + + +IDD_PROPPAGESOUND DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Son" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Sons visuels",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPAD DING),LABELLINE(6)+PROPSHEETPADDING + LTEXT "Utilisez les sons visuels si vous voulez que Reactos gÚnÞre un avertissement visuel lorsque votre systÞme Úmet un son.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PR OPSHEETPADDING)-ICONSIZE,LABELLINE(3) + CHECKBOX "Utiliser les &sons visuels",IDC_SENTRY_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEE TPADDING),14 + PUSHBUTTON "&ParamÞtres",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LAB ELLINE(5)+2,(15*PROPSHEETPADDING),14 + + GROUPBOX "Sons texte",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSHEETPAD DING),LABELLINE(7)+2 + LTEXT "Utilisez les sons texte pour que vos programmes affichent le texte des paroles et des sons qu'il gÚnÞrent.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWID TH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + CHECKBOX "Utiliser les sons &texte",IDC_SSHOW_BOX,(4*PROPSHEETPADDING),LABELLINE(12)+2,PROPSHEETWIDT H-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) +END + + +IDD_PROPPAGEDISPLAY DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Display" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Contraste ÚlevÚ",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDI NG),LABELLINE(6)+PROPSHEETPADDING + LTEXT "Utilisez cette option si vous voulez que ReactOS utilise les couleurs et les polices conþues pour une lecture facilitÚe.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH -(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + CHECKBOX "&Utiliser un contraste ÚlevÚ",IDC_CONTRAST_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEE TPADDING),14 + PUSHBUTTON "&ParamÞtres",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),L ABELLINE(5)+2,(15*PROPSHEETPADDING),14 +END + + + +IDD_PROPPAGEMOUSE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Souris" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Touches souris",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADD ING),LABELLINE(6)+PROPSHEETPADDING + LTEXT "Utilisez les touches souris si vous voulez contr¶ler le pointeur avec le pavÚ numÚrique de votre clavier.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-( 6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + CHECKBOX "Utiliser les touches &souris",IDC_MOUSE_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEET PADDING),14 + PUSHBUTTON "&ParamÞtres",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABE LLINE(5)+2,(15*PROPSHEETPADDING),14 +END + + +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "GÚnÚral" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "RÚinitialisation automatique",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEE TPADDING),LABELLINE(5) + CHECKBOX "&DÚsactiver les fonctionnalitÚs d'accessibilitÚ aprÞs un dÚlai d'inactivitÚ deá:",IDC_RESET_BOX,(2*PROPSHEETPADDING),LABELLINE(2)-2,PROPSHEETWIDTH-( 6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) + + //POPUP IDC_RESET_POPUP, GRAYED + //{ + // MENUITEM "5 Minutes", IDC_RESET_5 + // MENUITEM "10 Minutes", IDC_RESET_10 + // MENUITEM "15 Minutes", IDC_RESET_15 + // MENUITEM "20 Minutes", IDC_RESET_20 + // MENUITEM "25 Minutes", IDC_RESET_25 + // MENUITEM "30 Minutes", IDC_RESET_30 + //} + + GROUPBOX "Avertissement",-1,PROPSHEETPADDING,LABELLINE(7)-2,PROPSHEETWIDTH-(2*PRO PSHEETPADDING),LABELLINE(5) + CHECKBOX "Afficher un message d'avertissement lors de l'activation d'une fonctionnalitÚ",IDC_NOTIFICATION_MESSAGE,(2*PROPSHEETPADDING),LABELLINE( 8)-2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) + CHECKBOX "?mettre un son lors de l'activation/dÚsactivation d'une fonctionnalitÚ",IDC_NOTIFICATION_SOUND,(2*PROPSHEETPADDING),LABELLINE(10 )-2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1) + + + GROUPBOX "PÚriphÚriques Touches sÚrie",-1,PROPSHEETPADDING,LABELLINE(13)-4,PROPSHEETWIDTH-(2*PROPSHEETPA DDING),LABELLINE(5) + LTEXT "Les pÚriphÚriques Touches sÚrie reprÚsentent un une alternative pour accÚder aux fonctionnalitÚs du clavier et de la souris.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH -(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) + CHECKBOX "U&tiliser les touches sÚrie",IDC_SERIAL_BOX,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(16)-4,PROP SHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1) + + PUSHBUTTON "&ParamÞtres",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1) + + GROUPBOX "Options d'administration",-1,PROPSHEETPADDING,LABELLINE(19)-4,PROPSHEETWIDTH-(2* PROPSHEETPADDING),LABELLINE(5) + + CHECKBOX "Appliquer tous les paramÞtres au Bureau d'ou&verture de session",IDC_ADMIN_LOGON_BOX,(PROPSHEETPADDING*2),LABELLINE(20)-4,PROPSH EETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) + CHECKBOX "Appliq&uer tous les paramÞtres par dÚfaut aux nouveaux utilisateurs",IDC_ADMIN_USERS_BOX,(2*PROPSHEETPADDING),LABELLINE(22)-4,P ROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1) +END + + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "AccessibilitÚ" + IDS_CPLSYSTEMDESCRIPTION "Adapte les fonctionnalitÚs d'accessibilitÚ pour votre ordinateur." +END + _____ Modified: trunk/reactos/lib/cpl/access/access.rc --- trunk/reactos/lib/cpl/access/access.rc 2005-12-21 21:19:04 UTC (rev 20294) +++ trunk/reactos/lib/cpl/access/access.rc 2005-12-21 21:25:59 UTC (rev 20295) @@ -12,3 +12,4 @@ #include "Hu.rc" #include "Nl.rc" #include "Pl.rc" +#include "Fr.rc"

1 0

[greatlrd] 20294: Bug 1166 part 2 of 2 French translation from French translation team by cmoibenlepro <cmoibenlepro@hotmail.com>
by greatlrd＠svn.reactos.com 21 Dec '05

21 Dec '05

Bug 1166 part 2 of 2 French translation from French translation team by cmoibenlepro <cmoibenlepro(a)hotmail.com> Added: trunk/reactos/lib/cpl/appwiz/Fr.rc Modified: trunk/reactos/lib/cpl/appwiz/appwiz.rc Added: trunk/reactos/lib/cpl/desk/Fr.rc Modified: trunk/reactos/lib/cpl/desk/desk.rc Added: trunk/reactos/lib/cpl/intl/Fr.rc Modified: trunk/reactos/lib/cpl/intl/intl.rc _____ Added: trunk/reactos/lib/cpl/appwiz/Fr.rc --- trunk/reactos/lib/cpl/appwiz/Fr.rc 2005-12-21 21:12:35 UTC (rev 20293) +++ trunk/reactos/lib/cpl/appwiz/Fr.rc 2005-12-21 21:19:04 UTC (rev 20294) @@ -0,0 +1,52 @@ +/* French translation by Benoit Plante 2005 (cmoibenlepro AT hotmail DOT com) */ + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ajout/Supression de programmes" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,18,16,16 + LTEXT "Pour installer un nouveau programme, cliquez sur Installer",-1,36,18,PROPSHEETWIDTH-48,8 + PUSHBUTTON "&Installer...", IDC_INSTALL, PROPSHEETWIDTH-(72), 36, 60, 14 + LTEXT "", -1, PROPSHEETPADDING, 63, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN + + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 + LTEXT "Les logiciels suivant peuvent Ûtre supprimÚs automatiquement. Pour supprimer un programme ou modifier ses composantes installÚes, sÚlectionnez-le dans la liste et cliquez sur Ajouter/Supprimer.",-1,36,72,PROPSHEETWIDTH-48,32 + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 105, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP + PUSHBUTTON "Ajouter/Supp&rimer", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 +END + +IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Configuration de ReactOS" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + +END + +IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "CrÚer un raccourci" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Texte 1", -1, 115, 15, 160, 24 + LTEXT "Texte 2", -1, 115, 35, 160, 17 +END + +IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "CrÚer un raccourci" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Texte 1",-1,10,0,225,40 + LTEXT "Texte 2",-1,10,40,120,20 + LTEXT "Texte 3",-1,10,55,120,20 +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Ajout/Supression de programmes" + IDS_CPLSYSTEMDESCRIPTION "Installe et supprime les programmes et les composantes de ReactOS, ainsi que les raccourcis." +END _____ Modified: trunk/reactos/lib/cpl/appwiz/appwiz.rc --- trunk/reactos/lib/cpl/appwiz/appwiz.rc 2005-12-21 21:12:35 UTC (rev 20293) +++ trunk/reactos/lib/cpl/appwiz/appwiz.rc 2005-12-21 21:19:04 UTC (rev 20294) @@ -32,4 +32,5 @@ #include "Ru.rc" #include "Pl.rc" #include "Es.rc" +#include "Fr.rc" _____ Added: trunk/reactos/lib/cpl/desk/Fr.rc --- trunk/reactos/lib/cpl/desk/Fr.rc 2005-12-21 21:12:35 UTC (rev 20293) +++ trunk/reactos/lib/cpl/desk/Fr.rc 2005-12-21 21:19:04 UTC (rev 20294) @@ -0,0 +1,112 @@ +/* French translation by Benoit Plante 2005 (cmoibenlepro AT hotmail DOT com) */ + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Fond d'Úcran" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10, + 90,65,WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | + WS_BORDER | WS_TABSTOP,7,99,173,71 + LTEXT "SÚlectionnez une image Ó utiliser comme fond d'Úcran:", + IDC_STATIC,8,87,180,8 + PUSHBUTTON "&Parcourir...",IDC_BROWSE_BUTTON,187,135,50,14 + PUSHBUTTON "&Couleur...",IDC_COLOR_BUTTON,187,155,50,14 + LTEXT "Position:",IDC_STATIC,187,98,36,8 + COMBOBOX IDC_PLACEMENT_COMBO,187,108,50,90,CBS_DROPDOWNLIST | + CBS_SORT | WS_VSCROLL | WS_TABSTOP +END + +IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "?cran de veille" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "?&cran de veille",IDC_SCREENS_DUMMY, 5, 7, 238, 136 + + LTEXT "Liste des Úcrans de veille:",IDC_STATIC,13, 24, 71, 9 + CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | + WS_BORDER | WS_TABSTOP,13, 34, 171, 69 + PUSHBUTTON "&Supprimer",IDC_SCREENS_DELETE, 190,47,39,10 + PUSHBUTTON "&Ajouter",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 + + PUSHBUTTON "ParamÞ&tres...",IDC_SCREENS_SETTINGS,140, 124, 48, 12,WS_GROUP + PUSHBUTTON "&Aperþu",IDC_SCREENS_TESTSC,192, 124, 43, 12 + + CONTROL "? la reprise, protÚger par mot de passe",IDC_SCREENS_USEPASSCHK,"button", + BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18 + + LTEXT "DÚ&lai:",IDC_STATIC,13, 110, 17, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT | WS_GROUP + CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | + UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | + WS_BORDER | WS_GROUP,52, 109, 12, 12 + LTEXT "Minutes avant d'afficher l'Úcran de veille.",IDC_STATIC,70, 111, 147, 9 + + GROUPBOX "Gestion de l'alimentation du moniteur",IDC_SCREENS_DUMMY2,5, 146, 238, 35 + LTEXT "Pour modifier les paramÞtres de l'alimentation du moniteur et Úconomiser de l'Únergie, cliquez sur Gestion de l'alimentation.", + IDC_STATIC,16, 159, 155, 19 + PUSHBUTTON "&Gestion de l'alimentation",IDC_SCREENS_POWER_BUTTON,180, 162, 57, 12 +END + +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Apparence" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Vide pour l'instant....",IDC_STATIC,66, + 90,112,8 +END + +IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ParamÞtres" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Affichage:",1820,3,100,30,8 + LTEXT "<aucun>",IDC_SETTINGS_DEVICE,9,109,224,8 + GROUPBOX "&RÚgion de l'affichage",1818,3,120,115,43 + CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, + 30,130,58,17 + LTEXT "Moins",1815,9,130,15,8,NOT WS_GROUP + LTEXT "Plus",1816,93,130,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "QualitÚ &Couleur",1817,125,120,115,43 + COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP + CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, + 131,148,103,9 + PUSHBUTTON "A&vancÚ...",IDC_SETTINGS_ADVANCED,306,165,56,14 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "Affichage" + IDS_CPLDESCRIPTION "Personalise l'affichage du bureau et de l'Úcran de veille." + + IDS_NONE "(Aucun)" + IDS_CENTER "Centre" + IDS_STRETCH "?tirer" + IDS_TILE "Mosa´que" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_COLOR_4BIT "16 Couleurs" + IDS_COLOR_8BIT "256 Couleurs" + IDS_COLOR_16BIT "Moyenne (16 Bits)" + IDS_COLOR_24BIT "Vraies couleurs (24 Bits)" + IDS_COLOR_32BIT "Optimale (32 Bits)" + IDS_PIXEL "%lux%lu Pixel" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_BACKGROUND_COMDLG_FILTER "Images (*.bmp;*.jpg;*.dib;*.png)\0*.bmp;*.jpg;*.jpeg;*.dib;*.png\0" + IDS_SUPPORTED_EXT "*.jpg;*.jpeg;*.bmp;*.dib;*.png" +END _____ Modified: trunk/reactos/lib/cpl/desk/desk.rc --- trunk/reactos/lib/cpl/desk/desk.rc 2005-12-21 21:12:35 UTC (rev 20293) +++ trunk/reactos/lib/cpl/desk/desk.rc 2005-12-21 21:19:04 UTC (rev 20294) @@ -22,3 +22,4 @@ #include "sv.rc" #include "es.rc" #include "hu.rc" +#include "Fr.rc" _____ Added: trunk/reactos/lib/cpl/intl/Fr.rc --- trunk/reactos/lib/cpl/intl/Fr.rc 2005-12-21 21:12:35 UTC (rev 20293) +++ trunk/reactos/lib/cpl/intl/Fr.rc 2005-12-21 21:19:04 UTC (rev 20294) @@ -0,0 +1,82 @@ +/* French translation by Benoit Plante 2005 (cmoibenlepro AT hotmail DOT com) */ + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_GENERALPAGE DIALOGEX 0, 0, 246, 188 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "GÚnÚral" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Page de propriÚtÚs 1",-1,73,74,90,8 +END + + +IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 188 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Nombres" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Page de propriÚtÚs 2",-1,73,74,90,8 +END + + +IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 188 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Devise" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Page de propriÚtÚs 3",-1,73,74,90,8 +END + + +IDD_TIMEPAGE DIALOGEX 0, 0, 246, 188 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Heure" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Apparence de l'heure", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE + LTEXT "?chantillon d'heure:", -1, 13, 21, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_TIMESAMPLE, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Format d'heure:", -1, 13, 52, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEFORMAT, 68, 50, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "&SÚparateur des heures:", -1, 13, 70, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMESEPARATOR, 68, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Symbole de l'avant-midi(A&M):", -1, 13, 88, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Symbole de l'aprÞs-midi(&PM):", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "", -1, 7, 124, 228, 60, WS_VISIBLE + LTEXT "Notation de l'heure\n\n\ +h = heure m = minute s = seconde t = AM ou PM\n\n\ +h = 12 heures H =24 heures \n\ +hh, mm, ss = ZÚro de dÚpart h, m, s = Pas de zÚro de dÚpart", + -1, 13, 133, 214, 47, WS_CHILD |WS_VISIBLE | WS_GROUP +END + + +IDD_DATEPAGE DIALOGEX 0, 0, 246, 188 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Date" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Page de propriÚtÚs 5",-1,73,74,90,8 +END + + +IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 188 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Langues" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Langue principale", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "SÚlectionnez la langue principale que vous voulez utiliser:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL +END + + +STRINGTABLE +BEGIN + IDS_CPLNAME "Options rÚgionales" + IDS_CPLDESCRIPTION "Selectionner les langues, les formats de nombres, les devises, l'heure et la date." +END _____ Modified: trunk/reactos/lib/cpl/intl/intl.rc --- trunk/reactos/lib/cpl/intl/intl.rc 2005-12-21 21:12:35 UTC (rev 20293) +++ trunk/reactos/lib/cpl/intl/intl.rc 2005-12-21 21:19:04 UTC (rev 20294) @@ -29,4 +29,5 @@ #include "es.rc" #include "Ja.rc" #include "hu.rc" +#include "Fr.rc"

1 0

[greatlrd] 20293: Bug 1166 part 1 of 2 French translation from French translation team by cmoibenlepro <cmoibenlepro@hotmail.com>
by greatlrd＠svn.reactos.com 21 Dec '05

21 Dec '05

Bug 1166 part 1 of 2 French translation from French translation team by cmoibenlepro <cmoibenlepro(a)hotmail.com> Added: trunk/reactos/subsys/system/winlogon/Fr.rc Modified: trunk/reactos/subsys/system/winlogon/winlogon.rc _____ Added: trunk/reactos/subsys/system/winlogon/Fr.rc --- trunk/reactos/subsys/system/winlogon/Fr.rc 2005-12-21 21:07:03 UTC (rev 20292) +++ trunk/reactos/subsys/system/winlogon/Fr.rc 2005-12-21 21:12:35 UTC (rev 20293) @@ -0,0 +1,47 @@ +/* French translation by Benoit Plante 2005 (cmoibenlepro AT hotmail DOT com) */ + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_SHUTDOWNCOMPUTER DIALOG 45, 22, 164, 52 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ArrÛter l'ordinateur" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Vous pouvez maintenant Úteindre votre ordinateur en toute sÚcuritÚ", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 + DEFPUSHBUTTON "&RedÚmarrer", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 +END + +IDD_GINALOADFAILED DIALOG 58, 83, 231, 119 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "?chec de l'interface utilisateur" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Le chargement du DLL %s de l'interface utilisateur a ÚchouÚ", IDC_GINALOADFAILED, 39, 16, 156, 24 + LTEXT "Contactez votre administrateur systÞme pour remplacer le DLL, ou restaurez le DLL original.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 + DEFPUSHBUTTON "&RedÚmarrer", 1, 80, 91, 68, 14 +END + +STRINGTABLE +BEGIN + IDS_PREPARENETWORKCONNECTIONS "PrÚparation des connections rÚseau..." + IDS_APPLYINGCOMPUTERSETTINGS "Application des paramÞtres de l'ordinateur..." + IDS_RUNNINGSTARTUPSCRIPTS "ExÚcution des scripts de dÚmarrage..." + IDS_RUNNINGSHUTDOWNSCRIPTS "ExÚcution des scripts de fermeture..." + IDS_APPLYINGYOURPERSONALSETTINGS "Application de vos paramÞtres personnels..." + IDS_RUNNINGLOGOFFSCRIPTS "ExÚcution des scripts de fermeture de session..." + IDS_RUNNINGLOGONSCRIPTS "ExÚcution des scripts d'ouverture de session..." + IDS_LOADINGYOURPERSONALSETTINGS "Chargement de vos paramÞtres personnels..." + IDS_CLOSINGNETWORKCONNECTIONS "Fermeture des connections rÚseau..." + IDS_REACTOSISSHUTTINGDOWN "Fermeture de ReactOS..." + IDS_PREPARETOSTANDBY "PrÚparation de la Mise en Veille..." + IDS_PREPARETOHIBERNATE "PrÚparation de l'hibernation..." + IDS_SAVEYOURSETTINGS "Enregistrement de vos paramÞtres..." + IDS_REACTOSISSTARTINGUP "DÚmarrage de ReactOS..." +END + +STRINGTABLE +BEGIN + IDS_FAILEDACTIVATEUSERSHELL "Winlogon a ÚchouÚ lors de l'activation du shell!" +END + _____ Modified: trunk/reactos/subsys/system/winlogon/winlogon.rc --- trunk/reactos/subsys/system/winlogon/winlogon.rc 2005-12-21 21:07:03 UTC (rev 20292) +++ trunk/reactos/subsys/system/winlogon/winlogon.rc 2005-12-21 21:12:35 UTC (rev 20293) @@ -20,3 +20,4 @@ #include "Pl.rc" #include "Sv.rc" #include "Hu.rc" +#include "Fr.rc"

1 0

[greatlrd] 20292: Bug 1155 French translation from French translation team by zoken <mustang9@gmail.com
by greatlrd＠svn.reactos.com 21 Dec '05

21 Dec '05

Bug 1155 French translation from French translation team by zoken <mustang9(a)gmail.com Added: trunk/reactos/apps/utils/getfirefox/Fr.rc Modified: trunk/reactos/apps/utils/getfirefox/getfirefox.rc _____ Added: trunk/reactos/apps/utils/getfirefox/Fr.rc --- trunk/reactos/apps/utils/getfirefox/Fr.rc 2005-12-21 20:58:08 UTC (rev 20291) +++ trunk/reactos/apps/utils/getfirefox/Fr.rc 2005-12-21 21:07:03 UTC (rev 20292) @@ -0,0 +1,45 @@ +/* + * PROJECT: ReactOS utilities + * LICENSE: GPL - See COPYING in the top level directory + * FILE: apps/utils/getfirefox/En.rc + * PURPOSE: French resources + * COPYRIGHT: Copyright 2004 Mike McCormack for CodeWeavers + * Copyright 2005 Ge van Geldorp (gvg(a)reactos.org) + * Copyright 2005 G. Maton (mustang9(a)gmail.com) - French translation + */ +/* + * Based on Wine dlls/shdocvw/En.rc + * + * 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 + */ + +LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT + +IDD_GETFIREFOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "TÚlÚchargement de Firefox" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10, 200,12 + LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER + CHECKBOX "Supprimer ""Obtenir Firefox"" du Menu dÚmarrer une fois terminÚ", IDC_REMOVE, + 10, 44, 200, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Annuler", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE +BEGIN + IDS_START_MENU_NAME "Obtenir Firefox" +END _____ Modified: trunk/reactos/apps/utils/getfirefox/getfirefox.rc --- trunk/reactos/apps/utils/getfirefox/getfirefox.rc 2005-12-21 20:58:08 UTC (rev 20291) +++ trunk/reactos/apps/utils/getfirefox/getfirefox.rc 2005-12-21 21:07:03 UTC (rev 20292) @@ -22,6 +22,7 @@ */ 1 ICON "firefox.ico" +#include "De.rc" #include "En.rc" -#include "De.rc" +#include "Fr.rc" #include "Hu.rc"

1 0

[greatlrd] 20291: Bug 1163 French translation from Jerome Signouret "ggcom" by ReactOS French translation team
by greatlrd＠svn.reactos.com 21 Dec '05

21 Dec '05

Bug 1163 French translation from Jerome Signouret "ggcom" by ReactOS French translation team Added: trunk/reactos/subsys/system/regsvr32/Fr.rc Modified: trunk/reactos/subsys/system/regsvr32/regsvr32.rc _____ Added: trunk/reactos/subsys/system/regsvr32/Fr.rc --- trunk/reactos/subsys/system/regsvr32/Fr.rc 2005-12-21 20:50:15 UTC (rev 20290) +++ trunk/reactos/subsys/system/regsvr32/Fr.rc 2005-12-21 20:58:08 UTC (rev 20291) @@ -0,0 +1,35 @@ +#include "resource.h" +/* + * Moved all hardcoded strings to En.rc. + * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com + */ +/* + * Translation made by Jerome Signouret, 2005. + */ + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE +{ + +IDS_UsageMessage, "%s\n\nUtilisation : regsvr32 [/u] [/s] [/c] [/n] [/i[:lignedecommande]] nomDLL\n\ +/u - Serveur non enregistrÚ\n\ +/s - Silence; ne pas afficher les messages\n\ +/c - Sortie sur la console\n\ +/i - Installe la DLL avec des options dans la [:lignedecommande]; si /u est prÚsent, cela provoque la dÚsinstallation de la DLL\n\ +/n - Ne pas faire d'appel au serveur d'enregistrement; cette option doit Ûtre utilisÚ avec l'option /i" + +IDS_NoDllSpecified, "Pas de DLL indiquÚ." + +IDS_InvalidFlag, "Option non reconnue : %s" + +IDS_SwitchN_NoI, "Option non reconnue : /n vous devez utiliser l'indicateur /i." + +IDS_DllNotLoaded, "LoadLibrary('%s') a ÚchouÚ.\nGetLastError renvoie le code 0x%08x." + +IDS_MissingEntry, "%s est chargÚ mais le point d'entrÚe de %s n'a pas ÚtÚ trouvÚ.\n\n \ +%s ne peut Ûtre exportÚ, ou une version corrompue de %s est en mÚmoire. Vous pouvez utiliser Pview pour dÚtecter la DLL et la supprimer." + +IDS_FailureMessage, "%s dans %s a ÚchouÚ.\nLe code d'erreur est : 0x%08x" + +IDS_SuccessMessage "%s dans %s est un succÞs." +} _____ Modified: trunk/reactos/subsys/system/regsvr32/regsvr32.rc --- trunk/reactos/subsys/system/regsvr32/regsvr32.rc 2005-12-21 20:50:15 UTC (rev 20290) +++ trunk/reactos/subsys/system/regsvr32/regsvr32.rc 2005-12-21 20:58:08 UTC (rev 20291) @@ -6,7 +6,8 @@ #define REACTOS_STR_ORIGINAL_FILENAME "regsvr32.exe\0" #include <reactos/version.rc> +#include "De.rc" #include "En.rc" -#include "De.rc" +#include "Fr.rc" +#include "Hu.rc" #include "Ja.rc" -#include "Hu.rc"

1 0

[greatlrd] 20290: Bug 1162 correct French translation by Jerome Signouret "ggcom"
by greatlrd＠svn.reactos.com 21 Dec '05

21 Dec '05

Bug 1162 correct French translation by Jerome Signouret "ggcom" Modified: trunk/reactos/subsys/system/expand/Fr.rc _____ Modified: trunk/reactos/subsys/system/expand/Fr.rc --- trunk/reactos/subsys/system/expand/Fr.rc 2005-12-21 20:34:30 UTC (rev 20289) +++ trunk/reactos/subsys/system/expand/Fr.rc 2005-12-21 20:50:15 UTC (rev 20290) @@ -10,7 +10,7 @@ IDS_Copy, "ReactOS Utilitaire de dÚcompression de fichiers Version 1.0\n\ Copyright Victor Schneider 1997\n\n\ -Utilisation : %s fichierd'entrÚe [fichierdesortie]\n" +Utilisation : %s FichierEntrÚe [fichierdesortie]\n" -IDS_FAILS "LZCopy a echouÚ : code de retournÚ : %ld\n" +IDS_FAILS "LZCopy a echouÚ : code d'erreur retournÚ : %ld\n" }

1 0

[frik85] 20289: RosCMS update:
by frik85＠svn.reactos.com 21 Dec '05

21 Dec '05

RosCMS update: * new updated sql file (with sample content entries) * fix the "preview" bug * simplify the translator interface * improve the interface user interface Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_content.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php Modified: trunk/web/reactos.org/sql/roscms.sql _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_content.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_content.php 2005-12-21 19:07:47 UTC (rev 20288) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_content.php 2005-12-21 20:34:30 UTC (rev 20289) @@ -81,7 +81,8 @@ $rpm_lang_id="nolang"; } else { - $rpm_lang_id="all"; + $rpm_lang_id="nolang"; + //$rpm_lang_id="all"; } } echo '<p>Language: '; _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php 2005-12-21 19:07:47 UTC (rev 20288) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php 2005-12-21 20:34:30 UTC (rev 20289) @@ -64,9 +64,14 @@ <td width="15%" bgcolor="#5984C3"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Content ID </strong></font></div></td> <td width="85%" bgcolor="#E2E2E2"> <div align="left"><font face="Arial, Helvetica, sans-serif"> - [#cont_ - <input name="txt_contentid" type="text" id="txt_contentid" value="<?php echo $result_content['content_name']; ?>" size="50" maxlength="50"> - ]   (e.g. "about")</font></div></td> + [#cont_<?php + if ($rpm_page == "trans") { + echo '<input name="txt_contentid" type="hidden" id="txt_contentid" value="'.$result_content['content_name'].'"><b>'.$result_content['conten t_name'].'</b>'; + } + else { + echo '<input name="txt_contentid" type="text" id="txt_contentid" value="'.$result_content['content_name'].'" size="50" maxlength="50">'; + } + ?>]   (e.g. "about")</font></div></td> </tr> <tr> <td valign="top" bgcolor="#5984C3"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Language</strong></font></div></td> @@ -81,10 +86,15 @@ ORDER BY 'lang_level' DESC Limit 1"; $sql_query_lang=mysql_query($sql_lang); $myrow_lang=mysql_fetch_row($sql_query_lang); // Languages - ?> +?> <optgroup label="languages"> +<?php + if ($rpm_page != "trans") { +?> <option value="all"<?php if ($cmsros_intern_temp_lang_short == "all") { echo ' selected="selected"'; } ?>>All</option> - <?php +<?php + } + // Languages $sql_langa="SELECT * @@ -93,18 +103,29 @@ ORDER BY 'lang_level' DESC"; $sql_query_langa=mysql_query($sql_langa); while($myrow_langa=mysql_fetch_row($sql_query_langa)) { - echo '<option value="'.$myrow_langa[0].'"'; - if ($myrow_lang[0] == $myrow_langa[0]) { + if ($rpm_page == "trans" && $myrow_langa[0] == "en") { + // temp + } + else { + echo '<option value="'.$myrow_langa[0].'"'; + if ($myrow_lang[0] == $myrow_langa[0]) { echo ' selected="selected"'; - } - echo '>'.$myrow_langa[1].'</option>'; + } + echo '>'.$myrow_langa[1].'</option>'; + } } ?> </optgroup> + <?php + if ($rpm_page != "trans") { + ?> <optgroup label="other"> <option value="xhtml"<?php if ($result_content['content_lang'] == "xhtml") { echo ' selected="selected"'; } ?>>XHTML</option> <option value="html"<?php if ($result_content['content_lang'] == "html") { echo ' selected="selected"'; } ?>>HTML</option> </optgroup> + <?php + } + ?> </select> </div></td> </tr> @@ -138,25 +159,36 @@ <td valign="top" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Visible</strong></font></div></td> <td valign="top" bgcolor="#E2E2E2"><font face="Arial, Helvetica, sans-serif"> <?php - if ($result_content['content_visible'] == 1) { - echo ' <input name="content_visible" type="radio" value="yes" checked> yes   <input type="radio" name="content_visible" value="no"> no'; + if ($rpm_page == "trans") { + echo '<input name="content_visible" type="hidden" id="content_visible" value="yes">yes'; } else { - echo ' <input name="content_visible" type="radio" value="yes"> yes   <input type="radio" name="content_visible" value="no" checked> no'; - } + if ($result_content['content_visible'] == 1) { + echo ' <input name="content_visible" type="radio" value="yes" checked> yes   <input type="radio" name="content_visible" value="no"> no'; + } + else { + echo ' <input name="content_visible" type="radio" value="yes"> yes   <input type="radio" name="content_visible" value="no" checked> no'; + } + } ?> - </font></td> + +</font></td> </tr> <tr> <td valign="top" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Active</strong></font></div></td> <td valign="top" bgcolor="#EEEEEE"><font face="Arial, Helvetica, sans-serif"> <?php - if ($result_content['content_active'] == 1) { - echo ' <input name="content_active" type="radio" value="yes" checked> yes   <input type="radio" name="content_active" value="no"> no'; + if ($rpm_page == "trans") { + echo '<input name="content_active" type="hidden" id="content_active" value="yes">yes'; } else { - echo ' <input name="content_active" type="radio" value="yes"> yes   <input type="radio" name="content_active" value="no" checked> no'; - } + if ($result_content['content_active'] == 1) { + echo ' <input name="content_active" type="radio" value="yes" checked> yes   <input type="radio" name="content_active" value="no"> no'; + } + else { + echo ' <input name="content_active" type="radio" value="yes"> yes   <input type="radio" name="content_active" value="no" checked> no'; + } + } ?> </font></td> </tr> @@ -187,14 +219,27 @@ <tr> <td valign="top" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Type</strong></font></div></td> <td valign="top" bgcolor="#EEEEEE"><font face="Arial, Helvetica, sans-serif"> - <input name="txt_content_type" type="text" id="txt_content_type" value="<?php echo $result_content['content_type']; ?>" size="30" maxlength="30"> -("default", "layout", ...) </font></td> +<?php + + if ($rpm_page == "trans") { + echo '<input name="txt_content_type" type="hidden" id="txt_content_type" value="'.$result_content['content_type'].'">'.$result_content['content_t ype']; + } + else { + echo '<input name="txt_content_type" type="text" id="txt_content_type" value="'.$result_content['content_type'].'" size="30" maxlength="30"> ("default", "layout", ...)'; + } +?></font></td> </tr> <tr> <td valign="top" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Description</strong></font></div></td> <td valign="top" bgcolor="#E2E2E2"><font face="Arial, Helvetica, sans-serif"> - <input name="txt_content_desc" type="text" id="txt_content_desc" value="<?php echo $result_content['content_description']; ?>" size="50" maxlength="255"> - </font></td> +<?php + if ($rpm_page == "trans") { + echo '<input name="txt_content_desc" type="hidden" id="txt_content_desc" value="'.$result_content['content_description'].'">'.$result_content['co ntent_description']; + } + else { + echo '<input name="txt_content_desc" type="text" id="txt_content_desc" value="'.$result_content['content_description'].'" size="50" maxlength="255">'; + } + ?></font></td> </tr> <tr> <td valign="top" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Username</strong></font></div></td> @@ -263,10 +308,11 @@ ?> </p> <p> - <?php if ($rpm_opt=="translate") { ?> + <?php if ($rpm_opt == "translate") { ?> + <input name="content_rad_opt" type="radio" value="translate" checked> Translate - <p><b><blink>Please check, if you selected the right language, before you + <p><b><blink>Please check, if you have selected the right language, before you click "submit"!</blink></b></p> <input type="submit" name="Submit" value="Submit"> <p> </p> @@ -457,6 +503,7 @@ if ($content_savemode == "update") { echo "<p>The content '".$result_content['content_name']."' (id='".$rpm_db_id."') has been saved!</p>"; echo "<p><a href=".$_SERVER['HTTP_REFERER'].">Back to the 'content edit' page</a></p>"; + echo "<p> </p><p><fieldset><legend>Preview</legend><br>".$result_content ['content_text']."</fieldset></p>"; } else { $query_content_new_revision_preview = mysql_query("SELECT * @@ -470,8 +517,8 @@ echo "<p>A new version of content '".$result_content_new_revision_preview['content_name']."' (old id='".$rpm_db_id."', new id='". $result_content_new_revision_preview["content_id"] ."') has been saved!</p>"; echo "<p><a href='?page=". $rpm_page ."&sec=content&sec2=edit&sort=". $rpm_sort ."&filt=". $rpm_filt ."&langid=". $rpm_lang_id ."&db_id=". $result_content_new_revision_preview['content_id'] ."'>Go to the 'content edit' page (revision ". $result_content_new_revision_preview["content_id"] .")</a></p>"; echo "<p><a href='".$_SERVER['HTTP_REFERER']."'>Back to the 'content edit' page (revision ". $result_content['content_id'] .")</a></p>"; + echo "<p> </p><p><fieldset><legend>Preview</legend><br>".$result_content _new_revision_preview['content_text']."</fieldset></p>"; } - echo "<p> </p><p><fieldset><legend>Preview</legend><br>".$result_content ['content_text']."</fieldset></p>"; } ?> _____ Modified: trunk/web/reactos.org/sql/roscms.sql --- trunk/web/reactos.org/sql/roscms.sql 2005-12-21 19:07:47 UTC (rev 20288) +++ trunk/web/reactos.org/sql/roscms.sql 2005-12-21 20:34:30 UTC (rev 20289) @@ -1,29 +1,11 @@ --- --- RosCMS - ReactOS Content Management System --- Copyright (C) 2005 Ge van Geldorp <gvg(a)reactos.org> -- --- 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. +-- Database: RosCMS -- --- This 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. --- --- You 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. --- --- --- Database: `roscms` --- -- -------------------------------------------------------- -- --- `content` +-- Table structure for table `content` -- DROP TABLE IF EXISTS `content`; @@ -35,18 +17,37 @@ `content_version` int(11) NOT NULL default '0', `content_active` tinyint(4) NOT NULL default '0', `content_visible` tinyint(4) NOT NULL default '0', + `content_type` varchar(10) collate utf8_unicode_ci NOT NULL default 'default', `content_description` varchar(255) collate utf8_unicode_ci NOT NULL default '', `content_editor` varchar(10) collate utf8_unicode_ci NOT NULL default '', `content_usrname_id` bigint(20) NOT NULL default '0', `content_date` date NOT NULL default '0000-00-00', `content_time` time NOT NULL default '00:00:00', PRIMARY KEY (`content_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Contents' AUTO_INCREMENT=0; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Contents'; +-- +-- Data for table`content` +-- + +INSERT INTO `content` (`content_id`, `content_name`, `content_lang`, `content_text`, `content_version`, `content_active`, `content_visible`, `content_type`, `content_description`, `content_editor`, `content_usrname_id`, `content_date`, `content_time`) VALUES (31, 'index', 'all', '<h1>ReactOS Content Management System - Test Page</h1>\r\n<p>English start page</p>', 1, 1, 1, 'default', '', 'richtext', 2, '2005-12-05', '11:48:43'), +(2, 'bottom', 'all', '</div></td>\r\n </tr>\r\n</table>\r\n\r\n\r\n<hr style="height: 1px;"/>\r\n\r\n<address style="text-align:center;">\r\n ReactOS is a registered trademark or a trademark of ReactOS Foundation in the United States and other countries.</address>\r\n</body>\r\n</html> ', 1, 1, 1, 'layout', '', '', 2, '2005-09-19', '23:15:40'), +(21, 'menu_top', 'all', '<div id="top">\r\n <div id="topMenu"> \r\n \r\n <p style="text-align:left;"> \r\n <a href="[#link_index]">Home</a> <span style="color: #ffffff">|</span> \r\n <a href="[#link_news]">News</a> <span style="color: #ffffff">|</span> \r\n <a href="[#link_sitemap]">Sitemap</a></p>\r\n </div>\r\n </div>', 1, 1, 1, 'default', '2005-12-21 20:01:24 [2] |', '', 2, '2005-12-05', '11:49:02'), +(24, 'menu_side', 'all', '<table style="border:0" width="100%" cellpadding="0" cellspacing="0">\r\n <tr valign="top">\r\n <td style="width:147px" id="leftNav"> \r\n <div class="navTitle">Navigation</div>\r\n <ol>\r\n <li><a href="[#link_index]">Home</a></li>\r\n <li><a href="[#link_news]">News</a></li>\r\n <li><a href="[#link_sitemap]">Sitemap</a></li>\r\n </ol>\r\n <p></p>\r\n ', 1, 1, 1, 'default', '2005-12-21 20:01:51 [2] |', '', 2, '2005-12-05', '11:48:53'), +(96, 'head', 'all', '<?xml version="1.0" encoding="[#inc_charset]"?>\r\n<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"\r\n "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">\r\n<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="[#roscms_language_short]" >\r\n\r\n<head>\r\n <title>ReactOS Homepage - [#roscms_pagetitle]</title>\r\n \r\n <meta http-equiv="Content-Type" content="application/xml" />\r\n <meta http-equiv="pics-label" content=''(pics-1.1 "http://www.icra.org/ratingsv02.html" l gen true for "http://www.reactos.com/" r (cz 1 lz 1 nz 1 oz 1 vz 1))'' />\r\n <meta http-equiv="Pragma" content="no-cache" />\r\n <meta name="Publisher" content="ReactOS Web Team" />\r\n <meta name="Copyright" content="ReactOS Foundation" />\r\n <meta name="generator" content="RosCMS" />\r\n <meta name="Keywords" content="reactos, ros, ros32, win32 ros64, roscms, operating system, wiki, forum, download, information, support database, compatibility database, compatibility, package database, reactos package manager, reactos content management system, reactos 0.1, reactos 0.2, reactos 0.3, ros 0.1, ros 0.2, ros 0.3" />\r\n <meta name="Description" content="ReactOS Homepage - ..." />\r\n <meta name="Page-topic" content="Betriebssystem, Computer, Software, downloads" />\r\n <meta name="Audience" content="all" />\r\n <meta name="Content-language" content="DE" />\r\n <meta name="Page-type" content="Operating System/Information/News" />\r\n <meta name="Robots" content="index,follow" />\r\n \r\n <link rel="SHORTCUT ICON" href="[#roscms_path_homepage]favicon.ico" />\r\n <link rel="alternate" type="application/rss+xml" title="ReactOS News Feed (RSS)" href="[#roscms_path_homepage]reactos.rdf" />\r\n <link href="[#roscms_path_homepage]style.css" type="text/css" rel="stylesheet" />\r\n</head>\r\n<body>', 2, 1, 1, 'layout', '2005-12-21 19:17:16 [2] |', '', 2, '2005-09-19', '23:38:29'), +(228, 'menu_misc', 'all', '<div class="navTitle">Latest Update</div> \r\n <ol>\r\n <li><div style="text-align:center;">[#roscms_date] [#roscms_time]</div></li>\r\n </ol> \r\n <p> </p>\r\n </td>\r\n\r\n <td id="content"><div class="contentSmall"> ', 1, 1, 1, 'default', '', '', 2, '2005-12-21', '19:16:47'), +(229, 'sidebar_right', 'all', '</div></td>\r\n\r\n <td id="rightNav">\r\n<h1>Latest Release</h1>\r\n<p><strong>Version [#inc_reactos_version]</strong>\r\n</p>\r\n', 8, 1, 1, 'default', '2005-12-21 19:50:38 [2] |', '', 2, '2005-12-21', '19:18:36'), +(230, 'contmenu_home', 'all', '<div class="navTitle">Home</div> \r\n<ol> \r\n <li><a href="[#link_index]">Front Page</a></li>\r\n <li><a href="[#link_news]">News</a></li>\r\n <li><a href="[#link_sitemap]">Sitemap</a></li>\r\n</ol>\r\n<p></p>', 4, 1, 1, 'default', '2005-12-21 20:02:26 [2] |', '', 2, '2005-12-21', '19:20:34'), +(120, 'menu_search', 'all', ' <div class="navTitle">Search</div> \r\n <div class="navBox"><form method="get" action="http://www.google.com/search" style="padding:0;margin:0">\r\n <div style="text-align:center;">\r\n\r\n <input name="q" value="" size="12" maxlength="80" class="searchInput" type="text" /><input name="domains" value="http://www.reactos.org" type="hidden" /><input name="sitesearch" value="http://www.reactos.org" type="hidden" />\r\n <input name="btnG" value="Go" type="submit" class="button" />\r\n\r\n </div></form>\r\n </div>\r\n<p></p>', 2, 1, 1, 'default', '', '', 2, '2005-11-09', '23:04:31'), +(128, 'index', 'de', '<h1>ReactOS Content Management System - Test Page</h1>\r\n<p>German start page</p>', 1, 1, 1, 'default', '', 'richtext', 1, '2005-11-29', '20:14:46'), +(152, 'menu_language', 'all', '<div class="navTitle">Language</div> \r\n <div class="navBox"> \r\n <form method="post" action="[#roscms_path_homepage]?page=[#roscms_pagename]&forma=[#rosc ms_format]&lang=" style="padding:0;margin:0">\r\n <div style="text-align:center;"> \r\n <select id="lang" size="1" name="lang" class="selectbox" style="width:110px" onchange="window.open(''[#roscms_path_homepage]?page=[#roscms_pagename]& amp;forma=[#roscms_format]&lang='' + this.options[this.selectedIndex].value,''_main'')">\r\n <optgroup label="current language"> \r\n <option value="#" selected="selected">[#roscms_language]</option>\r\n </optgroup>\r\n <optgroup label="most popular"> \r\n <option value="en">English</option>\r\n <option value="de">Deutsch (German)</option>\r\n </optgroup>\r\n </select>\r\n <input name="langsubmit" type="submit" id="langsubmit" value=">" />\r\n </div>\r\n </form>\r\n </div>\r\n<p></p>', 3, 1, 1, 'layout', '2005-12-21 20:00:23 [2] |', '', 2, '2005-11-10', '21:48:20'), +(220, 'contmenu_home', 'de', '<div class="navTitle">Startseite</div> \r\n<ol> \r\n <li><a href="[#link_index]">Startseite</a></li>\r\n <li><a href="[#link_news]">Neuigkeiten</a></li>\r\n <li><a href="[#link_sitemap]">Sitemap</a></li> \r\n</ol>\r\n<p></p>', 3, 1, 1, 'default', '2005-12-21 20:02:35 [2] |', '', 15, '2005-12-07', '21:24:40'), +(222, 'sidebar_right', 'all', '</div></td>\r\n\r\n <td id="rightNav">\r\n[#inc_javascript_screenshot]\r\n <a href="[#link_screenshots]">More Screenshots</a><br />\r\n <a href="[#link_tour]">Take a look at the ReactOS Tour</a>\r\n</div><br />\r\n<h1>Latest Release</h1>\r\n<p><strong>Version [#inc_reactos_version]</strong><br />\r\n <a href="[#link_download]">Download Now!</a><br />\r\n <a href="[#link_dev_changelogs]">Changelog</a>\r\n</p>\r\n[#inc_template_ne ws_latest]\r\n[#inc_template_newsletter_latest]\r\n<div class="contentSmall">\r\n <span class="contentSmallTitle">Developer Quotes</span>\r\n\r\n[#inc_javascript_quote]', 7, 0, 1, 'default', '', '', 2, '2005-12-07', '21:30:53'); + -- -------------------------------------------------------- -- --- `dyn_content` +-- Table structure for table `dyn_content` -- DROP TABLE IF EXISTS `dyn_content`; @@ -68,12 +69,18 @@ `dyn_content_date` date NOT NULL default '0000-00-00', `dyn_content_time` time NOT NULL default '00:00:00', PRIMARY KEY (`dyn_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Contents' AUTO_INCREMENT=0 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Contents'; +-- +-- Data for table`dyn_content` +-- + +INSERT INTO `dyn_content` (`dyn_id`, `dyn_content_id`, `dyn_content_nr`, `dyn_content_name`, `dyn_content_lang`, `dyn_content_text1`, `dyn_content_text2`, `dyn_content_text3`, `dyn_content_text4`, `dyn_content_version`, `dyn_content_active`, `dyn_content_visible`, `dyn_content_editor`, `dyn_content_usrname_id`, `dyn_content_date`, `dyn_content_time`) VALUES (28, 1, 1, 'news_page', 'all', 'RosCMS test news', '', 'RosCMS test news description', '<p><b><u>RosCMS</u></b> test news content</p> ...', 0, 1, 1, '', 2, '2005-12-21', '19:53:14'); + -- -------------------------------------------------------- -- --- `include_text` +-- Table structure for table `include_text` -- DROP TABLE IF EXISTS `include_text`; @@ -90,12 +97,25 @@ `inc_date` date NOT NULL default '0000-00-00', `inc_time` time NOT NULL default '00:00:00', PRIMARY KEY (`inc_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Replace words with text phrases' AUTO_INCREMENT=0 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Replace words with text phrases'; +-- +-- Data for table`include_text` +-- + +INSERT INTO `include_text` (`inc_id`, `inc_level`, `inc_word`, `inc_text`, `inc_lang`, `inc_extra`, `inc_vis`, `inc_seclevel`, `inc_usrname_id`, `inc_date`, `inc_time`) VALUES (48, 15, 'template_news_detail', '<?php\r\n if ( !defined("ROSCMS_SYSTEM") ) {\r\n define ("ROSCMS_SYSTEM", "Version 0.1"); // to prevent hacking activity\r\n }\r\n\r\n include("db/connect_db.inc.php"); // database connection script\r\n\r\n $query_content = mysql_query("SELECT * \r\n FROM `dyn_content` \r\n WHERE 1 AND `dyn_content_name` = ''news_page'' AND `dyn_content_id` = ''$roscms_template_var_pageid''\r\n ORDER BY `dyn_content_nr` ASC Limit 1") ;\r\n \r\n $result_content = mysql_fetch_array($query_content);\r\n $roscms_usrnameid = $result_content["dyn_content_usrname_id"];\r\n $query_usraccount= mysql_query("SELECT * \r\n FROM `users` \r\n WHERE `user_id` = ".$roscms_usrnameid." LIMIT 1");\r\n $result_usraccount=mysql_fetch_array($query_usraccount);\r\n?>\r\n<h1><a href="[#link_index]">Home</a> > <a href="[#link_news]">ReactOS News</a> > News: <?php echo $result_content["dyn_content_text1"]; ?> #<?php echo $roscms_template_var_pageid; ?></h1> \r\n <p><strong><?php echo $result_content["dyn_content_text3"]; ?></strong></p>\r\n <p><i>by <?php echo $result_usraccount[''user_name'']; ?> on <?php echo $result_content[''dyn_content_date'']; ?></i></p>\r\n<?php echo $result_content[''dyn_content_text4'']; ?>\r\n<p><a href="[#link_news]">News Archive</a></p>', 'all', 'template_php', 1, 50, 1, '2005-12-21', '19:55:14'), +(19, 10, 'path_homepage_media', '[#roscms_path_homepage]media/', 'all', '', 1, 50, 0, '2005-07-13', '18:00:35'), +(20, 15, 'path_homepage_media_pictures', '[#roscms_path_homepage]media/pictures/', 'all', '', 1, 50, 0, '2005-07-13', '18:00:35'), +(23, 15, 'template_news', '<h1><a href="[#link_index]">Home</a> > ReactOS News</h1>\r\n<?php\r\n if ( !defined("ROSCMS_SYSTEM") ) {\r\n define ("ROSCMS_SYSTEM", "Version 0.1"); // to prevent hacking activity\r\n }\r\n\r\n include("db/connect_db.inc.php"); // database connection script\r\n\r\n\r\n $query_content = mysql_query("SELECT * \r\n FROM `dyn_content` \r\n WHERE 1 AND `dyn_content_name` = ''news_page'' AND `dyn_content_nr` = ''1''\r\n ORDER BY `dyn_content_id` DESC ") ;\r\n \r\n while($result_content = mysql_fetch_array($query_content)) { // content\r\n $roscms_usrnameid = $result_content["dyn_content_usrname_id"];\r\n $query_usraccount= mysql_query("SELECT * \r\n FROM `users` \r\n WHERE `user_id` = ".$roscms_usrnameid." LIMIT 0 , 1");\r\n $result_usraccount=mysql_fetch_array($query_usraccount);\r\n?>\r\n\r\n<p ><b><a href="<?php echo "[#link_".$result_content["dyn_content_name"]."_".$result_content["dyn_c ontent_id"]."]"; ?>"><?php echo $result_content["dyn_content_text1"]; ?></a></b>\r\n<br><?php echo $result_content[''dyn_content_text3'']; ?>\r\n<br><i>by <?php echo $result_usraccount[''user_name'']; ?> on <?php echo $result_content[''dyn_content_date'']; ?></i></p>\r\n <?php \r\n } // end while\r\n?>\r\n', 'all', 'template_php', 1, 50, 0, '2005-07-30', '11:50:18'), +(26, 0, 'reactos_version', '0.2.8', 'all', '', 1, 50, 1, '2005-08-13', '16:18:56'), +(27, 15, 'template_sitemap', '<h1><a href="[#link_index]">Home</a> > Sitemap</h1>\r\n<?php\r\n if ( !defined("ROSCMS_SYSTEM") ) {\r\n define ("ROSCMS_SYSTEM", "Version 0.1"); // to prevent hacking activity\r\n }\r\n\r\n include("db/connect_db.inc.php"); // database connection script\r\n\r\n\r\n $query_sitemap = mysql_query("SELECT * \r\n FROM pages\r\n WHERE page_active = ''1'' AND page_visible = ''1'' AND (page_language = ''all'' OR page_language = ''en'')\r\n ORDER BY ''page_name'' ASC") ;\r\n \r\n while($result_sitemap = mysql_fetch_array($query_sitemap)) { // content\r\n if ($result_sitemap[''page_description''] != "") {\r\n?>\r\n\r\n<p><b><a href="<?php echo "[#link_".$result_sitemap[''page_name'']."]"; ?>"><?php echo ucfirst($result_sitemap[''page_title'']); ?></a></b>\r\n<br><i><?php echo $result_sitemap[''page_description'']; ?></i></p>\r\n <?php\r\n } \r\n } // end while\r\n?>\r\n', 'all', 'template_php', 1, 50, 0, '2005-08-13', '20:58:04'), +(34, 0, 'charset', 'utf-8', 'all', '', 1, 50, 1, '2005-08-27', '15:54:16'), +(39, 15, 'path_homepage_media_screenshots', '[#roscms_path_homepage]media/screenshots/', 'all', '', 1, 50, 0, '2005-07-13', '18:00:35'); + -- -------------------------------------------------------- -- --- `languages` +-- Table structure for table `languages` -- DROP TABLE IF EXISTS `languages`; @@ -105,10 +125,18 @@ `lang_level` int(11) NOT NULL default '0' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='available languages'; +-- +-- Data for table`languages` +-- + +INSERT INTO `languages` (`lang_id`, `lang_name`, `lang_level`) +VALUES ('en', 'English', 10), +('de', 'German', 8); + -- -------------------------------------------------------- -- --- `pages` +-- Table structure for table `pages` -- DROP TABLE IF EXISTS `pages`; @@ -117,6 +145,7 @@ `page_name` varchar(50) collate utf8_unicode_ci NOT NULL default '', `page_language` varchar(50) collate utf8_unicode_ci NOT NULL default '', `pages_extra` varchar(20) collate utf8_unicode_ci NOT NULL default '', + `pages_extention` varchar(10) collate utf8_unicode_ci NOT NULL default 'default', `page_text` text collate utf8_unicode_ci NOT NULL, `page_version` int(11) NOT NULL default '0', `page_active` tinyint(4) NOT NULL default '0', @@ -129,12 +158,21 @@ `page_title` varchar(150) collate utf8_unicode_ci NOT NULL default '', `page_description` varchar(255) collate utf8_unicode_ci NOT NULL default '', PRIMARY KEY (`page_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Pages' AUTO_INCREMENT=0 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Pages'; +-- +-- Data for table`pages` +-- + +INSERT INTO `pages` (`page_id`, `page_name`, `page_language`, `pages_extra`, `pages_extention`, `page_text`, `page_version`, `page_active`, `page_visible`, `page_usrname_id`, `page_date`, `page_time`, `page_generate_usrid`, `page_generate_timestamp`, `page_title`, `page_description`) VALUES (6, 'news_page', 'all', 'dynamic', 'default', '[#cont_head]\r\n[#cont_menu_top]\r\n[#cont_menu_side]\r\n\r\n[#cont_con tmenu_home]\r\n\r\n[#cont_menu_search]\r\n[#cont_menu_language]\r\n[#con t_menu_misc]\r\n\r\n[#inc_template_news_detail]\r\n\r\n[#cont_bottom]', 1, 1, 1, 1, '2005-09-12', '18:50:20', 1, '1135191757', 'News', ''), +(7, 'news', 'all', '', 'default', '[#cont_head]\r\n[#cont_menu_top]\r\n[#cont_menu_side]\r\n\r\n[#cont_con tmenu_home]\r\n\r\n[#cont_menu_search]\r\n[#cont_menu_language]\r\n[#con t_menu_misc]\r\n\r\n[#inc_template_news]\r\n\r\n[#cont_bottom]', 1, 1, 1, 1, '2005-09-12', '18:50:28', 1, '1135191757', 'News', 'News page: latest ReactOS news, rss news feed'), +(9, 'index', 'all', '', 'default', '[#cont_head]\r\n[#cont_menu_top]\r\n[#cont_menu_side]\r\n\r\n[#cont_con tmenu_home]\r\n\r\n[#cont_menu_search]\r\n[#cont_menu_language]\r\n[#con t_menu_misc]\r\n\r\n[#cont_index]\r\n\r\n[#cont_sidebar_right]\r\n[#cont _bottom]', 1, 1, 1, 1, '2005-12-21', '19:21:43', 1, '1135191757', 'Frontpage', 'Frontpage'), +(91, 'sitemap', 'all', '', 'default', '[#cont_head]\r\n[#cont_menu_top]\r\n[#cont_menu_side]\r\n\r\n[#cont_con tmenu_home]\r\n\r\n[#cont_menu_search]\r\n[#cont_menu_language]\r\n[#con t_menu_misc]\r\n\r\n[#inc_template_sitemap]\r\n\r\n[#cont_bottom]\r\n', 1, 1, 1, 1, '2005-12-21', '19:58:07', 1, '1135191757', 'Sitemap', 'Sitemap page'); + -- -------------------------------------------------------- -- --- `roscms_security_log` +-- Table structure for table `roscms_security_log` -- DROP TABLE IF EXISTS `roscms_security_log`; @@ -152,12 +190,17 @@ `roscms_sec_log_time` time NOT NULL default '00:00:00', `roscms_sec_log_visible` int(11) NOT NULL default '1', PRIMARY KEY (`roscms_sec_log_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='RosCMS Security Log' AUTO_INCREMENT=0 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='RosCMS Security Log'; +-- +-- Data for table`roscms_security_log` +-- + + -- -------------------------------------------------------- -- --- `subsys_mappings` +-- Table structure for table `subsys_mappings` -- DROP TABLE IF EXISTS `subsys_mappings`; @@ -168,10 +211,11 @@ PRIMARY KEY (`map_roscms_userid`,`map_subsys_name`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + -- -------------------------------------------------------- -- --- `user_sessions` +-- Table structure for table `user_sessions` -- DROP TABLE IF EXISTS `user_sessions`; @@ -181,13 +225,15 @@ `usersession_expires` datetime default NULL COMMENT 'Expiry date/time (NULL if does not expire)', `usersession_browseragent` varchar(255) character set utf8 NOT NULL default '' COMMENT 'HTTP_USER_AGENT when this session was created', `usersession_ipaddress` varchar(15) character set utf8 NOT NULL default '' COMMENT 'IP address from which this session was created', + `usersession_created` datetime NOT NULL default '0000-00-00 00:00:00' COMMENT 'session created (date/time) - all session will get deleted ... by date', PRIMARY KEY (`usersession_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci PACK_KEYS=0 COMMENT='Sessions'; + -- -------------------------------------------------------- -- --- `usergroup_members` +-- Table structure for table `usergroup_members` -- DROP TABLE IF EXISTS `usergroup_members`; @@ -196,10 +242,21 @@ `usergroupmember_usergroupid` varchar(10) collate utf8_unicode_ci NOT NULL default 'user' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +-- +-- Data for table`usergroup_members` +-- + +INSERT INTO `usergroup_members` (`usergroupmember_userid`, `usergroupmember_usergroupid`) +VALUES (1, 'ros_sadmin'), +(1, 'developer'), +(1, 'translator'), +(1, 'moderator'), +(1, 'user'); + -- -------------------------------------------------------- -- --- `usergroups` +-- Table structure for table `usergroups` -- DROP TABLE IF EXISTS `usergroups`; @@ -213,10 +270,23 @@ UNIQUE KEY `usrgroup_name` (`usrgroup_name`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +-- +-- Data for table`usergroups` +-- + +INSERT INTO `usergroups` (`usrgroup_name_id`, `usrgroup_name`, `usrgroup_intern_id`, `usrgroup_securitylevel`, `usrgroup_description`) VALUES ('ros_admin', 'Administrator', 'roscms_usrgrp_admin', 70, 'Administrator-Group: manage the ReactOS homepage (content, database)'), +('user', 'User', 'roscms_usrgrp_user', 0, 'Normal Visitors'), +('developer', 'Developer', 'roscms_usrgrp_dev', 50, 'ReactOS Developer: persons with svn commit access'), +('moderator', 'Moderator', 'roscms_usrgrp_team', 20, 'Homepage Moderators: for compatibility & package manager database, etc.'), +('translator', 'Translator', 'roscms_usrgrp_trans', 10, 'Homepage Translators: translate the homepage content'), +('ros_sadmin', 'Super-Administrator', 'roscms_usrgrp_sadmin', 100, 'Super-Administrator-Group: manage the ReactOS homepage (content, database, etc.); only persons who know what they are doing ...'), +('mediateam', 'Media-Team', 'roscms_usrgrp_team', 20, 'Media-Team members: UI-Team, etc.'), +('test', 'Test-User', 'roscms_usrgrp_team', 10, 'RosCMS tester group'); + -- -------------------------------------------------------- -- --- `users` +-- Table structure for table `users` -- DROP TABLE IF EXISTS `users`; @@ -239,11 +309,18 @@ `user_timezone` varchar(3) collate utf8_unicode_ci NOT NULL default '', `user_occupation` varchar(50) collate utf8_unicode_ci NOT NULL default '', `user_description` varchar(255) collate utf8_unicode_ci NOT NULL default '', - `user_setting_multisession` varchar(5) collate utf8_unicode_ci NOT NULL default 'true', + `user_setting_multisession` varchar(5) collate utf8_unicode_ci NOT NULL default 'false', `user_setting_browseragent` varchar(5) collate utf8_unicode_ci NOT NULL default 'true', `user_setting_ipaddress` varchar(5) collate utf8_unicode_ci NOT NULL default 'true', `user_setting_timeout` varchar(5) collate utf8_unicode_ci NOT NULL default 'true', - PRIMARY KEY (`user_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='RosCMS User Table' AUTO_INCREMENT=0 ; + PRIMARY KEY (`user_id`), + UNIQUE KEY `user_name` (`user_name`), + UNIQUE KEY `user_email` (`user_email`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='RosCMS User Table'; +-- +-- Data for table`users` +-- +INSERT INTO `users` (`user_id`, `user_name`, `user_roscms_password`, `user_roscms_getpwd_id`, `user_timestamp_touch`, `user_timestamp_touch2`, `user_login_counter`, `user_account_enabled`, `user_account_hidden`, `user_register`, `user_fullname`, `user_email`, `user_website`, `user_language`, `user_country`, `user_timezone`, `user_occupation`, `user_description`, `user_setting_multisession`, `user_setting_browseragent`, `user_setting_ipaddress`, `user_setting_timeout`) +VALUES (1, 'roscms_user', '', '', '', '2005-12-08 20:02:50', 1, 'yes', 'yes', '2005-08-20 20:18:06', 'ReactOS Content Management System Default User', 'ros-dev(a)reactos.org', 'http://www.reactos.org', 'en', '', '', '', 'RosCMS Default User', 'true', 'false', 'false', 'true'); \ No newline at end of file

1 0

[weiden] 20287: fixed difference in signedness warning
by weiden＠svn.reactos.com 21 Dec '05

21 Dec '05

fixed difference in signedness warning Modified: trunk/reactos/lib/setupapi/install.c _____ Modified: trunk/reactos/lib/setupapi/install.c --- trunk/reactos/lib/setupapi/install.c 2005-12-21 18:03:28 UTC (rev 20286) +++ trunk/reactos/lib/setupapi/install.c 2005-12-21 19:07:47 UTC (rev 20287) @@ -1396,7 +1396,7 @@ struct needs_callback_info needs_info; LPWSTR ServiceName = NULL; LPWSTR ServiceSection = NULL; - UINT ServiceFlags; + INT ServiceFlags; INFCONTEXT ContextService; BOOL bNeedReboot = FALSE;

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
71
Older →

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 December 2005