Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 32066: Bug 3021: slovak translations of rosapps (kario@szm.sk)
by dreimer＠svn.reactos.org 31 Jan '08

31 Jan '08

Author: dreimer Date: Thu Jan 31 19:41:33 2008 New Revision: 32066 URL: http://svn.reactos.org/svn/reactos?rev=32066&view=rev Log: Bug 3021: slovak translations of rosapps (kario(a)szm.sk) Added: trunk/rosapps/applications/screensavers/butterflies/lang/sk-SK.rc (with props) trunk/rosapps/applications/screensavers/mazescr/lang/sk-SK.rc (with props) trunk/rosapps/roscalc/lang/sk-SK.rc (with props) trunk/rosapps/write/Sk.rc (with props) Modified: trunk/rosapps/applications/screensavers/butterflies/rsrc.rc trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc trunk/rosapps/roscalc/resource.rc trunk/rosapps/write/rsrc.rc Added: trunk/rosapps/applications/screensavers/butterflies/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/lang/sk-SK.rc (added) +++ trunk/rosapps/applications/screensavers/butterflies/lang/sk-SK.rc Thu Jan 31 19:41:33 2008 @@ -1,0 +1,38 @@ +/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR: 30-01-2008 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +IDD_DLG_SCREEN DIALOGEX DISCARDABLE 0, 0, 172, 57 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Nastavenie etrièa obrazovky Motýle" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,7,35,50,14 + PUSHBUTTON "Zrui",IDCANCEL,61,35,50,14 + CONTROL "Otáèa motýle",ROTATE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,56,15,70,8 + PUSHBUTTON "Èo je ...",IDABOUT,115,35,50,14 +END + +IDD_DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 149, 79 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Èo je ..." +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,48,58,56,14 + CTEXT "Motýle - etriè obrazovky",IDC_STATIC,7,7,135,9 + CTEXT "Demo od: NeHe ",IDC_STATIC,7,20,135,8 + CTEXT "http://nehe.gamedev.net",WEBPAGE1,7,29,135,8,SS_NOTIFY | + NOT WS_GROUP + CTEXT "etriè obrazovky od: tHaPuTeR",IDC_STATIC,7,38,135,8,NOT + WS_GROUP + CTEXT "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY | + NOT WS_GROUP +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Motýle - etriè obrazovky" +END Propchange: trunk/rosapps/applications/screensavers/butterflies/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/butterflies/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/rsrc.rc (original) +++ trunk/rosapps/applications/screensavers/butterflies/rsrc.rc Thu Jan 31 19:41:33 2008 @@ -4,4 +4,5 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/lt-LT.rc" +#include "lang/sk-SK.rc" #include "lang/uk-UA.rc" Added: trunk/rosapps/applications/screensavers/mazescr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/lang/sk-SK.rc (added) +++ trunk/rosapps/applications/screensavers/mazescr/lang/sk-SK.rc Thu Jan 31 19:41:33 2008 @@ -1,0 +1,12 @@ +/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR: 30-01-2008 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Bludisko - etriè obrazovky" + IDS_TITLE "Èo je ..." + IDS_TEXT "Nie sú potrebné iadne nastavenia." +END Propchange: trunk/rosapps/applications/screensavers/mazescr/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc (original) +++ trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc Thu Jan 31 19:41:33 2008 @@ -15,3 +15,4 @@ #include "lang/lt-LT.rc" #include "lang/uk-UA.rc" #include "lang/es-ES.rc" +#include "lang/sk-SK.rc" Added: trunk/rosapps/roscalc/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/roscalc/lang/sk-SK.rc?rev=… ============================================================================== --- trunk/rosapps/roscalc/lang/sk-SK.rc (added) +++ trunk/rosapps/roscalc/lang/sk-SK.rc Thu Jan 31 19:41:33 2008 @@ -1,0 +1,369 @@ +/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR: 30-01-2008 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +// Dialog + +IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161 +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Kalkulaèka systému ReactOS" +MENU IDR_MENU_SCIENTIFIC_1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "",IDC_STATIC,4,16,132,21 + CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29, + 10 + CONTROL "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29, + 10 + CONTROL "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27, + 10 + CONTROL "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24, + 26,10 + GROUPBOX "",IDC_STATIC,4,36,76,21 + CONTROL "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,8,44,26,10 + CONTROL "Hyp",IDC_CHECK_HYP,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,40,44,29,10 + CTEXT "",IDC_TEXT_PARENT,84,40,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + CTEXT "",IDC_TEXT_MEMORY,112,40,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "Sta",IDC_BUTTON_STA,4,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Ave",IDC_BUTTON_AVE,4,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Sum",IDC_BUTTON_SUM,4,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "s",IDC_BUTTON_S,4,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Dat",IDC_BUTTON_DAT,4,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "F-E",IDC_BUTTON_FE,38,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "dms",IDC_BUTTON_DMS,38,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "sin",IDC_BUTTON_SIN,38,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "cos",IDC_BUTTON_COS,38,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "tan",IDC_BUTTON_TAN,38,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "(",IDC_BUTTON_LEFTPAR,64,64,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Exp",IDC_BUTTON_EXP,64,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^y",IDC_BUTTON_XeY,64,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^2",IDC_BUTTON_Xe2,64,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^3",IDC_BUTTON_Xe3,64,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ")",IDC_BUTTON_RIGHTPAR,90,64,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "ln",IDC_BUTTON_LN,90,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "log",IDC_BUTTON_LOG,90,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "n!",IDC_BUTTON_NF,90,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1/x",IDC_BUTTON_RX,90,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MC",IDC_BUTTON_MC,124,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MR",IDC_BUTTON_MR,124,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MS",IDC_BUTTON_MS,124,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "M+",IDC_BUTTON_MP,124,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "pi",IDC_BUTTON_PI,124,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "7",IDC_BUTTON_7,158,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "4",IDC_BUTTON_4,158,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1",IDC_BUTTON_1,158,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "0",IDC_BUTTON_0,158,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "A",IDC_BUTTON_A,158,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "8",IDC_BUTTON_8,184,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "5",IDC_BUTTON_5,184,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "2",IDC_BUTTON_2,184,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+/-",IDC_BUTTON_SIGN,184,121,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "B",IDC_BUTTON_B,184,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "9",IDC_BUTTON_9,210,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "6",IDC_BUTTON_6,210,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "3",IDC_BUTTON_3,210,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ",",IDC_BUTTON_DOT,210,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "C",IDC_BUTTON_C,210,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "/",IDC_BUTTON_DIV,236,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "*",IDC_BUTTON_MULT,236,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "-",IDC_BUTTON_SUB,236,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+",IDC_BUTTON_ADD,236,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "D",IDC_BUTTON_D,236,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Mod",IDC_BUTTON_MOD,262,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Or",IDC_BUTTON_OR,262,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Lsh",IDC_BUTTON_LSH,262,102,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "=",IDC_BUTTON_EQU,262,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "E",IDC_BUTTON_E,262,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "And",IDC_BUTTON_AND,288,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Xor",IDC_BUTTON_XOR,288,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Not",IDC_BUTTON_NOT,288,102,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Int",IDC_BUTTON_INT,288,121,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "F",IDC_BUTTON_F,288,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + GROUPBOX "",IDC_STATIC,140,16,172,21 + CONTROL "Qword",IDC_RADIO_QWORD,"Button",BS_AUTORADIOBUTTON | + NOT WS_VISIBLE,148,24,37,10 + CONTROL "Dword",IDC_RADIO_DWORD,"Button",BS_AUTORADIOBUTTON | + NOT WS_VISIBLE,188,24,37,10 + CONTROL "Word",IDC_RADIO_WORD,"Button",BS_AUTORADIOBUTTON | NOT + WS_VISIBLE,232,24,33,10 + CONTROL "Bajt",IDC_RADIO_BYTE,"Button",BS_AUTORADIOBUTTON | NOT + WS_VISIBLE,272,24,30,10 + CONTROL "Stupne",IDC_RADIO_DEG,"Button",BS_AUTORADIOBUTTON,148,24, + 42,10 + CONTROL "Radiány",IDC_RADIO_RAD,"Button",BS_AUTORADIOBUTTON,192, + 24,42,10 + CONTROL "Grady",IDC_RADIO_GRAD,"Button",BS_AUTORADIOBUTTON, + 236,24,44,10 + PUSHBUTTON "C",IDC_BUTTON_CANC,272,40,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "CE",IDC_BUTTON_CE,228,40,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Spä",IDC_BUTTON_BACK,184,40,40,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + RTEXT "",IDC_TEXT_OUTPUT,4,4,308,12,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE +END + +IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127 +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Kalkulaèka systému ReactOS" +MENU IDR_MENU_STANDARD +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + PUSHBUTTON "C",IDC_BUTTON_CANC,128,24,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "CE",IDC_BUTTON_CE,84,24,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Spä",IDC_BUTTON_BACK,40,24,40,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + RTEXT "",IDC_TEXT_OUTPUT,4,4,164,12,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "7",IDC_BUTTON_7,40,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "4",IDC_BUTTON_4,40,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1",IDC_BUTTON_1,40,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "0",IDC_BUTTON_0,40,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "8",IDC_BUTTON_8,66,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "5",IDC_BUTTON_5,66,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "2",IDC_BUTTON_2,66,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+/-",IDC_BUTTON_SIGN,66,105,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "9",IDC_BUTTON_9,92,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "6",IDC_BUTTON_6,92,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "3",IDC_BUTTON_3,92,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ",",IDC_BUTTON_DOT,92,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "/",IDC_BUTTON_DIV,118,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "*",IDC_BUTTON_MULT,118,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "-",IDC_BUTTON_SUB,118,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+",IDC_BUTTON_ADD,118,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Sqrt",IDC_BUTTON_SQRT,144,48,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "%",IDC_BUTTON_PERCENT,144,67,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1/x",IDC_BUTTON_RX,144,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "=",IDC_BUTTON_EQU,144,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + CTEXT "",IDC_TEXT_MEMORY,4,24,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "MC",IDC_BUTTON_MC,4,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MR",IDC_BUTTON_MR,4,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MS",IDC_BUTTON_MS,4,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "M+",IDC_BUTTON_MP,4,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE +END + +IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Èo je kalkulaèka systému ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,105,148,52,16 + CONTROL 106,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | + SS_REALSIZEIMAGE | WS_BORDER,4,4,104,48 + LTEXT "Kalkulaèka systému ReactOS",IDC_STATIC,120,12,132,8, + SS_CENTERIMAGE + LTEXT "Verzia ",IDC_TEXT_VERSION,120,20,132,8,SS_CENTERIMAGE + LTEXT "Napísal Carlo Bramini",IDC_STATIC,120,32,132,8, + SS_CENTERIMAGE + GROUPBOX "",IDC_STATIC,112,0,148,52 + GROUPBOX "",IDC_STATIC,4,56,256,88 + EDITTEXT IDC_EDIT_LICENSE,12,68,240,68,ES_MULTILINE | ES_READONLY | + WS_VSCROLL +END + +IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85 +STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "tatistika" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_LIST_STAT,4,4,156,40,LBS_NOINTEGRALHEIGHT | + WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "RET",IDC_BUTTON_RET,4,48,36,16 + PUSHBUTTON "LOAD",IDC_BUTTON_LOAD,44,48,36,16 + PUSHBUTTON "CD",IDC_BUTTON_CD,84,48,36,16 + PUSHBUTTON "CAD",IDC_BUTTON_CAD,124,48,36,16 + CTEXT "n=0",IDC_TEXT_NITEMS,4,68,156,12,SS_CENTERIMAGE | + SS_SUNKEN +END + + +// Menus + +IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE +BEGIN + POPUP "Úpravy" + BEGIN + MENUITEM "Kopírova\tCTRL-C", IDM_EDIT_COPY + MENUITEM "Prilepi\tCTRL-V", IDM_EDIT_PASTE + END + POPUP "Zobrazi" + BEGIN + MENUITEM "tandardná", IDM_VIEW_STANDARD, CHECKED + MENUITEM "Vedecká", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Prevody", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "estnástková\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "Desiatková\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "Osmièková\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "Dvojková\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "Stupne\tF2", IDM_VIEW_DEG, CHECKED + MENUITEM "Radiány\tF3", IDM_VIEW_RAD, CHECKED + MENUITEM "Grady\tF4", IDM_VIEW_GRAD, CHECKED + MENUITEM SEPARATOR + MENUITEM "Zoskupova èíslice", IDM_VIEW_GROUP, CHECKED + END + POPUP "Pomocník" + BEGIN + MENUITEM "Témy pomocníka", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "Èo je kalkulaèka systému ReactOS", IDM_HELP_ABOUT + END +END + +IDR_MENU_SCIENTIFIC_2 MENU DISCARDABLE +BEGIN + POPUP "Úpravy" + BEGIN + MENUITEM "Kopírova\tCTRL-C", IDM_EDIT_COPY + MENUITEM "Prilepi\tCTRL-V", IDM_EDIT_PASTE + END + POPUP "Zobrazi" + BEGIN + MENUITEM "tandardná", IDM_VIEW_STANDARD, CHECKED + MENUITEM "Vedecká", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Prevody", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "estnástková\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "Desiatková\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "Osmièková\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "Dvojková\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "Qword\tF12", IDM_VIEW_QWORD, CHECKED + MENUITEM "Dword\tF2", IDM_VIEW_DWORD, CHECKED + MENUITEM "Word\tF3", IDM_VIEW_WORD, CHECKED + MENUITEM "Bajt\tF4", IDM_VIEW_BYTE, CHECKED + MENUITEM SEPARATOR + MENUITEM "Zoskupova èíslice", IDM_VIEW_GROUP, CHECKED + END + POPUP "Pomocník" + BEGIN + MENUITEM "Témy pomocníka", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "Èo je kalkulaèka systému ReactOS", IDM_HELP_ABOUT + END +END + +IDR_MENU_STANDARD MENU DISCARDABLE +BEGIN + POPUP "Úpravy" + BEGIN + MENUITEM "Kopírova\tCTRL-C", IDM_EDIT_COPY + MENUITEM "Prilepi\tCTRL-V", IDM_EDIT_PASTE + END + POPUP "Zobrazi" + BEGIN + MENUITEM "tandardná", IDM_VIEW_STANDARD, CHECKED + MENUITEM "Vedecká", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Prevody", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "Zoskupova èíslice", IDM_VIEW_GROUP, CHECKED + END + POPUP "Pomocník" + BEGIN + MENUITEM "Témy pomocníka", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "Èo je kalkulaèka systému ReactOS", IDM_HELP_ABOUT + END +END + +// String Tables + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STRING_LICENSE "Kalkulaèka systému ReactOS je vo¾ný softvér vydaný pod licenciou GNU GPL.\r\n\r\nKópiu licenie GNU GPL môete získa tu:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nRovnako môete získa preklad licencie GNU GPL tu:\r\nhttp://www.gnu.org/licenses/translations.html" + IDS_MATH_ERROR "Chyba" + IDS_QUICKHELP "Rýchla pomoc" +END + Propchange: trunk/rosapps/roscalc/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/roscalc/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/roscalc/resource.rc?rev=32… ============================================================================== --- trunk/rosapps/roscalc/resource.rc (original) +++ trunk/rosapps/roscalc/resource.rc Thu Jan 31 19:41:33 2008 @@ -46,3 +46,4 @@ #include "lang/it-IT.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" +#include "lang/sk-SK.rc" Added: trunk/rosapps/write/Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/Sk.rc?rev=32066&view… ============================================================================== --- trunk/rosapps/write/Sk.rc (added) +++ trunk/rosapps/write/Sk.rc Thu Jan 31 19:41:33 2008 @@ -1,0 +1,10 @@ +/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR: 30-01-2008 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_FAILED, "Nepodarilo sa spusti Wordpad" +END Propchange: trunk/rosapps/write/Sk.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/write/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/rsrc.rc?rev=32066&r1… ============================================================================== --- trunk/rosapps/write/rsrc.rc (original) +++ trunk/rosapps/write/rsrc.rc Thu Jan 31 19:41:33 2008 @@ -28,3 +28,4 @@ #include "Fr.rc" #include "Ko.rc" #include "Uk.rc" +#include "Sk.rc"

1 0

[cwittich] 32065: allow nested (...) blocks (but still no support for else)
by cwittich＠svn.reactos.org 31 Jan '08

31 Jan '08

Author: cwittich Date: Thu Jan 31 18:11:25 2008 New Revision: 32065 URL: http://svn.reactos.org/svn/reactos?rev=32065&view=rev Log: allow nested (...) blocks (but still no support for else) Modified: trunk/reactos/base/shell/cmd/batch.c trunk/reactos/base/shell/cmd/batch.h trunk/reactos/base/shell/cmd/if.c Modified: trunk/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.c (original) +++ trunk/reactos/base/shell/cmd/batch.c Thu Jan 31 18:11:25 2008 @@ -272,8 +272,8 @@ SetFilePointer (bc->hBatchFile, 0, NULL, FILE_BEGIN); bc->bEcho = bEcho; /* Preserve echo across batch calls */ bc->shiftlevel = 0; - bc->bCmdBlock = FALSE; - + bc->bCmdBlock = -1; + bc->ffind = NULL; bc->forvar = _T('\0'); bc->forproto = NULL; @@ -454,15 +454,25 @@ *++ip = _T('\0'); /* cmd block over multiple lines (..) */ - if (bc->bCmdBlock) + if (bc->bCmdBlock >= 0) { if (*first == _T(')')) { - bc->bCmdBlock = FALSE; + bc->bCmdBlock--; continue; } - if (!bc->bExecuteBlock) - continue; + if ((bc->bCmdBlock >= 0) && (bc->bCmdBlock < MAX_PATH)) + if (!bc->bExecuteBlock[bc->bCmdBlock]) + { + /* increase the bCmdBlock count when there is another conditon which opens a new bracket */ + if ((_tcsncicmp (first, _T("if"), 2) == 0) && _tcschr(first, _T('('))) + { + bc->bCmdBlock++; + if ((bc->bCmdBlock > 0) && (bc->bCmdBlock < MAX_PATH)) + bc->bExecuteBlock[bc->bCmdBlock] = bc->bExecuteBlock[bc->bCmdBlock - 1]; + } + continue; + } } /* ignore labels and empty lines */ Modified: trunk/reactos/base/shell/cmd/batch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.h?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.h (original) +++ trunk/reactos/base/shell/cmd/batch.h Thu Jan 31 18:11:25 2008 @@ -6,7 +6,6 @@ #ifndef _BATCH_H_INCLUDED_ #define _BATCH_H_INCLUDED_ - typedef struct tagBATCHCONTEXT { @@ -23,8 +22,8 @@ TCHAR Out[MAX_PATH]; TCHAR Err[MAX_PATH]; TCHAR forvar; - BOOL bCmdBlock; - BOOL bExecuteBlock; + INT bCmdBlock; + BOOL bExecuteBlock[MAX_PATH]; } BATCH_CONTEXT, *LPBATCH_CONTEXT; Modified: trunk/reactos/base/shell/cmd/if.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/if.c?rev=32… ============================================================================== --- trunk/reactos/base/shell/cmd/if.c (original) +++ trunk/reactos/base/shell/cmd/if.c Thu Jan 31 18:11:25 2008 @@ -188,8 +188,13 @@ { if (bc) { - bc->bCmdBlock = TRUE; - bc->bExecuteBlock = x_flag & X_EXEC; + pp++; + bc->bCmdBlock++; + if ((bc->bCmdBlock >= 0) && (bc->bCmdBlock < MAX_PATH)) + bc->bExecuteBlock[bc->bCmdBlock] = x_flag & X_EXEC; + /* commands are in the next lines */ + if (*pp == _T('\0')) + return 0; } }

1 0

[cwittich] 32064: rename it back to matrix.src to get it included on bootcd again
by cwittich＠svn.reactos.org 31 Jan '08

31 Jan '08

Author: cwittich Date: Thu Jan 31 13:35:34 2008 New Revision: 32064 URL: http://svn.reactos.org/svn/reactos?rev=32064&view=rev Log: rename it back to matrix.src to get it included on bootcd again Modified: trunk/rosapps/applications/screensavers/matrix/matrix.rbuild Modified: trunk/rosapps/applications/screensavers/matrix/matrix.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/matrix/matrix.rbuild (original) +++ trunk/rosapps/applications/screensavers/matrix/matrix.rbuild Thu Jan 31 13:35:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="matrix" type="win32scr" installbase="system32" installname="matrix2.scr" allowwarnings="true" unicode="true"> +<module name="matrix" type="win32scr" installbase="system32" installname="matrix.scr" allowwarnings="true" unicode="true"> <include base="matrix">.</include> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define>

1 0

[cwittich] 32063: fix storing and loading registry settings
by cwittich＠svn.reactos.org 31 Jan '08

31 Jan '08

Author: cwittich Date: Thu Jan 31 13:05:02 2008 New Revision: 32063 URL: http://svn.reactos.org/svn/reactos?rev=32063&view=rev Log: fix storing and loading registry settings Modified: trunk/rosapps/applications/screensavers/matrix/settings.c Modified: trunk/rosapps/applications/screensavers/matrix/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/matrix/settings.c (original) +++ trunk/rosapps/applications/screensavers/matrix/settings.c Thu Jan 31 13:05:02 2008 @@ -35,7 +35,7 @@ if(hugechar == 0) return; - hugechar[0] = _T('\0'); + ZeroMemory(hugechar, 4096); RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\Catch22\\Matrix Screen Saver"), 0, _T(""), 0, KEY_READ, NULL, &hkey, NULL); @@ -71,21 +71,15 @@ if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("Randomize"), 0, 0, (BYTE *)&value, &len)) g_fRandomizeMessages = (value == 0 ? FALSE : TRUE); - len = 4096; - if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("FontName"), 0, 0, (BYTE *)hugechar, &len)) - { - if(len > 0) - lstrcpy(g_szFontName, hugechar); - else - lstrcpy(g_szFontName, _T("Arial")); - - } + len = 512; + if(RegQueryValueEx(hkey, _T("FontName"), 0, 0, (BYTE *)g_szFontName, &len) != ERROR_SUCCESS) + lstrcpy(g_szFontName, _T("Arial")); len = 4096; if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("Messages"), 0, 0 , (BYTE *)hugechar, &len)) { - while(len > 0 && *hptr && isascii(*hptr)) + while(len > 0 && *hptr && _istascii(*hptr)) { if(lstrlen(hptr) > 0) { @@ -109,7 +103,7 @@ void SaveSettings() { HKEY hkey; - TCHAR *hugechar = malloc(4096); + TCHAR *hugechar = malloc(4096 * sizeof(TCHAR)); TCHAR *msgptr = hugechar; int totallen = 0; int i,len; @@ -118,7 +112,7 @@ if(hugechar == 0) return; - hugechar[0] = _T('\0'); + ZeroMemory(hugechar, 4096 * sizeof(TCHAR)); msgptr = hugechar; RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\Catch22\\Matrix Screen Saver"), 0, @@ -142,7 +136,7 @@ value = g_fFontBold; RegSetValueEx(hkey, _T("FontBold"), 0, REG_DWORD, (BYTE *)&value, sizeof value); - RegSetValueEx(hkey, _T("FontName"), 0, REG_SZ, (BYTE *)g_szFontName, lstrlen(g_szFontName)); + RegSetValueEx(hkey, _T("FontName"), 0, REG_SZ, (BYTE *)g_szFontName, lstrlen(g_szFontName) * sizeof(TCHAR)); for(i = 0; i < g_nNumMessages; i++) { @@ -156,10 +150,10 @@ } } - *msgptr = _T('\0'); + //*msgptr = _T('\0'); totallen++; - RegSetValueEx(hkey, _T("Messages"), 0, REG_MULTI_SZ, (BYTE *)hugechar, totallen); + RegSetValueEx(hkey, _T("Messages"), 0, REG_MULTI_SZ, (BYTE *)hugechar, totallen * sizeof(TCHAR)); RegCloseKey(hkey); free(hugechar);

1 0

[cwittich] 32062: don't try to append when there is only one parameter given See issue #3023 for more details.
by cwittich＠svn.reactos.org 31 Jan '08

31 Jan '08

Author: cwittich Date: Thu Jan 31 12:00:27 2008 New Revision: 32062 URL: http://svn.reactos.org/svn/reactos?rev=32062&view=rev Log: don't try to append when there is only one parameter given See issue #3023 for more details. Modified: trunk/reactos/base/shell/cmd/copy.c Modified: trunk/reactos/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/copy.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/copy.c (original) +++ trunk/reactos/base/shell/cmd/copy.c Thu Jan 31 12:00:27 2008 @@ -539,17 +539,20 @@ return 1; } - if(((_tcschr (arg[nSrc], _T('+')) != NULL) || - (_tcschr (arg[nSrc], _T('*')) != NULL && _tcschr (arg[nDes], _T('*')) == NULL) || - (IsExistingDirectory (arg[nSrc]) && (_tcschr (arg[nDes], _T('*')) == NULL && !IsExistingDirectory (arg[nDes]))) - )) - { - /* There is a + in the source filename, this means - that there is more then one file being put into - one file. */ - bAppend = TRUE; - if(_tcschr (arg[nSrc], _T('+')) != NULL) - appendPointer = arg[nSrc]; + if (nDes != -1) /* you can only append files when there is a destination */ + { + if(((_tcschr (arg[nSrc], _T('+')) != NULL) || + (_tcschr (arg[nSrc], _T('*')) != NULL && _tcschr (arg[nDes], _T('*')) == NULL) || + (IsExistingDirectory (arg[nSrc]) && (_tcschr (arg[nDes], _T('*')) == NULL && !IsExistingDirectory (arg[nDes]))) + )) + { + /* There is a + in the source filename, this means + that there is more then one file being put into + one file. */ + bAppend = TRUE; + if(_tcschr (arg[nSrc], _T('+')) != NULL) + appendPointer = arg[nSrc]; + } } /* Reusing the number of files variable */

1 0

[cwittich] 32061: don't draw the standard UI background in minimal mode some code reduction
by cwittich＠svn.reactos.org 31 Jan '08

31 Jan '08

Author: cwittich Date: Thu Jan 31 10:33:02 2008 New Revision: 32061 URL: http://svn.reactos.org/svn/reactos?rev=32061&view=rev Log: don't draw the standard UI background in minimal mode some code reduction Modified: trunk/reactos/boot/freeldr/freeldr/ui/minitui.c trunk/reactos/boot/freeldr/freeldr/ui/ui.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/minitui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/mi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/minitui.c (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/minitui.c Thu Jan 31 10:33:02 2008 @@ -149,7 +149,7 @@ TuiEditBox, TuiTextToColor, TuiTextToFillStyle, - TuiFadeInBackdrop, + MiniTuiDrawBackdrop, /* no FadeIn */ TuiFadeOut, TuiDisplayMenu, MiniTuiDrawMenu, Modified: trunk/reactos/boot/freeldr/freeldr/ui/ui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/ui… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/ui.c (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/ui.c Thu Jan 31 10:33:02 2008 @@ -95,7 +95,6 @@ } DbgPrint((DPRINT_UI, "Initializing User Interface.\n")); - DbgPrint((DPRINT_UI, "Reading in UI settings from [Display] section.\n")); DisplayModeText[0] = '\0'; @@ -107,14 +106,7 @@ } if (IniReadSettingByName(SectionId, "MinimalUI", SettingText, sizeof(SettingText))) { - if (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3) - { - UiMinimal = TRUE; - } - else - { - UiMinimal = FALSE; - } + UiMinimal = (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3); } } @@ -208,47 +200,19 @@ } if (IniReadSettingByName(SectionId, "SpecialEffects", SettingText, sizeof(SettingText))) { - if (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3) - { - UiUseSpecialEffects = TRUE; - } - else - { - UiUseSpecialEffects = FALSE; - } + UiUseSpecialEffects = (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3); } if (IniReadSettingByName(SectionId, "ShowTime", SettingText, sizeof(SettingText))) { - if (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3) - { - UiDrawTime = TRUE; - } - else - { - UiDrawTime = FALSE; - } + UiDrawTime = (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3); } if (IniReadSettingByName(SectionId, "MenuBox", SettingText, sizeof(SettingText))) { - if (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3) - { - UiMenuBox = TRUE; - } - else - { - UiMenuBox = FALSE; - } + UiMenuBox = (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3); } if (IniReadSettingByName(SectionId, "CenterMenu", SettingText, sizeof(SettingText))) { - if (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3) - { - UiCenterMenu = TRUE; - } - else - { - UiCenterMenu = FALSE; - } + UiCenterMenu = (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3); } }

1 0

[navaraf] 32060: Add NT6 members to the enumerations and structures.
by navaraf＠svn.reactos.org 30 Jan '08

30 Jan '08

Author: navaraf Date: Thu Jan 31 02:04:37 2008 New Revision: 32060 URL: http://svn.reactos.org/svn/reactos?rev=32060&view=rev Log: Add NT6 members to the enumerations and structures. Modified: trunk/reactos/include/reactos/arc/arc.h Modified: trunk/reactos/include/reactos/arc/arc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arc/arc.h?… ============================================================================== --- trunk/reactos/include/reactos/arc/arc.h (original) +++ trunk/reactos/include/reactos/arc/arc.h Thu Jan 31 02:04:37 2008 @@ -83,6 +83,7 @@ LoaderXIPRom, LoaderHALCachedMemory, LoaderLargePageFiller, + LoaderErrorLogMemory, LoaderMaximum } TYPE_OF_MEMORY; @@ -317,6 +318,11 @@ LIST_ENTRY BootApplicationPersistentData; PVOID WmdTestResult; GUID BootIdentifier; + // + // NT 6 + // + ULONG ResumePages; + PVOID DumpHeader; } LOADER_PARAMETER_EXTENSION, *PLOADER_PARAMETER_EXTENSION; // @@ -344,6 +350,51 @@ PVOID BootInfo; ULONG MachineType; } PPC_LOADER_BLOCK, *PPPC_LOADER_BLOCK; + +// +// Firmware information block (NT6+) +// + +typedef struct _VIRTUAL_EFI_RUNTIME_SERVICES +{ + ULONG_PTR GetTime; + ULONG_PTR SetTime; + ULONG_PTR GetWakeupTime; + ULONG_PTR SetWakeupTime; + ULONG_PTR SetVirtualAddressMap; + ULONG_PTR ConvertPointer; + ULONG_PTR GetVariable; + ULONG_PTR GetNextVariableName; + ULONG_PTR SetVariable; + ULONG_PTR GetNextHighMonotonicCount; + ULONG_PTR ResetSystem; + ULONG_PTR UpdateCapsule; + ULONG_PTR QueryCapsuleCapabilities; + ULONG_PTR QueryVariableInfo; +} VIRTUAL_EFI_RUNTIME_SERVICES, *PVIRTUAL_EFI_RUNTIME_SERVICES; + +typedef struct _EFI_FIRMWARE_INFORMATION +{ + ULONG FirmwareVersion; + PVIRTUAL_EFI_RUNTIME_SERVICES VirtualEfiRuntimeServices; + ULONG SetVirtualAddressMapStatus; + ULONG MissedMappingsCount; +} EFI_FIRMWARE_INFORMATION, *PEFI_FIRMWARE_INFORMATION; + +typedef struct _PCAT_FIRMWARE_INFORMATION +{ + ULONG PlaceHolder; +} PCAT_FIRMWARE_INFORMATION, *PPCAT_FIRMWARE_INFORMATION; + +typedef struct _FIRMWARE_INFORMATION_LOADER_BLOCK +{ + ULONG FirmwareTypeEfi:1; + ULONG Reserved:31; + union { + EFI_FIRMWARE_INFORMATION EfiInformation; + PCAT_FIRMWARE_INFORMATION PcatInformation; + } u; +} FIRMWARE_INFORMATION_LOADER_BLOCK, *PFIRMWARE_INFORMATION_LOADER_BLOCK; // // Loader Parameter Block @@ -377,6 +428,7 @@ IA64_LOADER_BLOCK Ia64; PPC_LOADER_BLOCK PowerPC; } u; + FIRMWARE_INFORMATION_LOADER_BLOCK FirmwareInformation; } LOADER_PARAMETER_BLOCK, *PLOADER_PARAMETER_BLOCK; #endif

1 0

[dreimer] 32059: Bug 2993: slovak translation for usetup (kario@szm.sk) Bug 3020: Ukrainian translation update (temarez@yandex.ru)
by dreimer＠svn.reactos.org 30 Jan '08

30 Jan '08

Author: dreimer Date: Wed Jan 30 20:59:13 2008 New Revision: 32059 URL: http://svn.reactos.org/svn/reactos?rev=32059&view=rev Log: Bug 2993: slovak translation for usetup (kario(a)szm.sk) Bug 3020: Ukrainian translation update (temarez(a)yandex.ru) Added: trunk/reactos/base/setup/usetup/lang/sk-SK.h (with props) Modified: trunk/reactos/base/setup/usetup/mui.c trunk/reactos/dll/win32/shell32/lang/uk-UA.rc Added: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h (added) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h Wed Jan 30 20:59:13 2008 @@ -1,0 +1,1575 @@ +/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR: 22-01-2008 + */ + +#ifndef LANG_SK_SK_H__ +#define LANG_SK_SK_H__ + +static MUI_ENTRY skSKLanguagePageEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Výber jazyka.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Zvo¾te si jazyk, ktorý sa pouije poèas intalácie.", + TEXT_NORMAL + }, + { + 8, + 11, + " Potom stlaète ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Tento jazyk bude predvoleným jazykom naintalovaného systému.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraèova F3 = Skonèi", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKWelcomePageEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Víta Vás Intalátor systému ReactOS", + TEXT_HIGHLIGHT + }, + { + 6, + 11, + "Tento stupeò Intalátora skopíruje operaèný systém ReactOS na Vá", + TEXT_NORMAL + }, + { + 6, + 12, + "poèítaè a pripraví druhý stupeò Intalátora.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Stlaète ENTER pre naintalovanie systému ReactOS.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Stlaète R pre opravu systému ReactOS.", + TEXT_NORMAL + }, + { + 8, + 19, + "\x07 Stlaète L, ak chcete zobrazi licenèné podmienky systému ReactOS.", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 Stlaète F3 pre skonèenie intalácie bez naintalovania systému ReactOS.", + TEXT_NORMAL + }, + { + 6, + 23, + "Pre viac informácií o systéme ReactOS, navtívte prosím:", + TEXT_NORMAL + }, + { + 6, + 24, + "http://www.reactos.org", + TEXT_HIGHLIGHT + }, + { + 0, + 0, + " ENTER = Pokraèova R = Opravi F3 = Skonèi", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKIntroPageEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Intalátor systému ReactOS je v zaèiatoènom tádiu vývoja. Zatia¾", + TEXT_NORMAL + }, + { + 6, + 9, + "nepodporuje vetky funkcie plne vyuívajúce program Intalátor.", + TEXT_NORMAL + }, + { + 6, + 12, + "Má nasledujúce obmedzenia:", + TEXT_NORMAL + }, + { + 8, + 13, + "- Intalátor nepracuje s viac ako 1 primárnou oblasou na 1 disk.", + TEXT_NORMAL + }, + { + 8, + 14, + "- Intalátor nevie odstráni primárnu oblas z disku,", + TEXT_NORMAL + }, + { + 8, + 15, + " pokia¾ existujú rozírené oblasti na disku.", + TEXT_NORMAL + }, + { + 8, + 16, + "- Intalátor nevie odstráni prvú rozírenú oblas z disku,", + TEXT_NORMAL + }, + { + 8, + 17, + " pokia¾ existujú iné rozírené oblasti na disku.", + TEXT_NORMAL + }, + { + 8, + 18, + "- Intalátor podporuje iba súborový systém FAT.", + TEXT_NORMAL + }, + { + 8, + 19, + "- Kontrola súborového systému zatia¾ nie je implementovaná.", + TEXT_NORMAL + }, + { + 8, + 23, + "\x07 Stlaète ENTER pre naintalovanie systému ReactOS.", + TEXT_NORMAL + }, + { + 8, + 25, + "\x07 Stlaète F3 pre skonèenie intalácie bez naintalovania systému ReactOS.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraèova F3 = Skonèi", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKLicensePageEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 6, + "Licencia:", + TEXT_HIGHLIGHT + }, + { + 8, + 8, + "The ReactOS System is licensed under the terms of the", + TEXT_NORMAL + }, + { + 8, + 9, + "GNU GPL with parts containing code from other compatible", + TEXT_NORMAL + }, + { + 8, + 10, + "licenses such as the X11 or BSD and GNU LGPL licenses.", + TEXT_NORMAL + }, + { + 8, + 11, + "All software that is part of the ReactOS system is", + TEXT_NORMAL + }, + { + 8, + 12, + "therefore released under the GNU GPL as well as maintaining", + TEXT_NORMAL + }, + { + 8, + 13, + "the original license.", + TEXT_NORMAL + }, + { + 8, + 15, + "This software comes with NO WARRANTY or restrictions on usage", + TEXT_NORMAL + }, + { + 8, + 16, + "save applicable local and international law. The licensing of", + TEXT_NORMAL + }, + { + 8, + 17, + "ReactOS only covers distribution to third parties.", + TEXT_NORMAL + }, + { + 8, + 18, + "If for some reason you did not receive a copy of the", + TEXT_NORMAL + }, + { + 8, + 19, + "GNU General Public License with ReactOS please visit", + TEXT_NORMAL + }, + { + 8, + 20, + "http://www.gnu.org/licenses/licenses.html", + TEXT_HIGHLIGHT + }, + { + 8, + 22, + "Záruka:", + TEXT_HIGHLIGHT + }, + { + 8, + 24, + "This is free software; see the source for copying conditions.", + TEXT_NORMAL + }, + { + 8, + 25, + "There is NO warranty; not even for MERCHANTABILITY or", + TEXT_NORMAL + }, + { + 8, + 26, + "FITNESS FOR A PARTICULAR PURPOSE", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Návrat", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKDevicePageEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Zoznam niie, zobrazuje súèasné nastavenia zariadení.", + TEXT_NORMAL + }, + { + 8, + 11, + " Poèítaè:", + TEXT_NORMAL + }, + { + 8, + 12, + " Monitor:", + TEXT_NORMAL, + }, + { + 8, + 13, + " Klávesnica:", + TEXT_NORMAL + }, + { + 8, + 14, + " Rozloenie kl.:", + TEXT_NORMAL + }, + { + 8, + 16, + " Akceptova:", + TEXT_NORMAL + }, + { + 25, + 16, "Akceptova tieto nastavenia zariadení", + TEXT_NORMAL + }, + { + 6, + 19, + "Môete zmeni hardvérové nastavenia stlaèením klávesov HORE alebo DOLE", + TEXT_NORMAL + }, + { + 6, + 20, + "pre výber poloky. Potom stlaète kláves ENTER pre výber alternatívnych", + TEXT_NORMAL + }, + { + 6, + 21, + "nastavení.", + TEXT_NORMAL + }, + { + 6, + 23, + "Ak sú vetky nastavenia správne, vyberte \"Akceptova tieto nastavenia zariadení\"", + TEXT_NORMAL + }, + { + 6, + 24, + "a stlaète ENTER.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraèova F3 = Skonèi", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKRepairPageEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Intalátor systému ReactOS je v zaèiatoènom tádiu vývoja. Zatia¾", + TEXT_NORMAL + }, + { + 6, + 9, + "nepodporuje vetky funkcie plne vyuívajúce program Intalátor.", + TEXT_NORMAL + }, + { + 6, + 12, + "Funkcie na opravu systému zatia¾ nie sú implementované.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Stlaète U pre aktualizáciu OS.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Stlaète R pre záchrannú konzolu.", + TEXT_NORMAL + }, + { + 8, + 19, + "\x07 Stlaète ESC pre návrat na hlavnú stránku.", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 Stlaète ENTER pre retart poèítaèa.", + TEXT_NORMAL + }, + { + 0, + 0, + " ESC = Hlavná stránka ENTER = Retart", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; +static MUI_ENTRY skSKComputerPageEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Chcete zmeni typ poèítaèa, ktorý má by naintalovaný.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Stlaète kláves HORE alebo DOLE pre výber poadovaného typu poèítaèa.", + TEXT_NORMAL + }, + { + 8, + 11, + " Potom stlaète ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Stlaète kláves ESC pre návrat na predchádzajúcu stránku bez zmeny", + TEXT_NORMAL + }, + { + 8, + 14, + " typu poèítaèa.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraèova ESC = Zrui F3 = Skonèi", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKFlushPageEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 10, + 6, + "Systém práve overuje vetky uloené údaje na Vaom disku", + TEXT_NORMAL + }, + { + 10, + 8, + "To môe trva nieko¾ko minút", + TEXT_NORMAL + }, + { + 10, + 9, + "Keï skonèí, poèítaè sa automaticky retartuje", + TEXT_NORMAL + }, + { + 0, + 0, + " Flushing cache", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKQuitPageEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 10, + 6, + "Systém ReactOS nie je naintalovaný kompletne", + TEXT_NORMAL + }, + { + 10, + 8, + "Vyberte disketu z mechaniky A: a", + TEXT_NORMAL + }, + { + 10, + 9, + "vetky médiá CD-ROM z CD mechaník.", + TEXT_NORMAL + }, + { + 10, + 11, + "Stlaète ENTER pre retart poèítaèa.", + TEXT_NORMAL + }, + { + 0, + 0, + " Poèkajte, prosím ...", + TEXT_STATUS, + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKDisplayPageEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Chcete zmeni typ monitora, ktorý má by naintalovaný.", + TEXT_NORMAL + }, + { 8, + 10, + "\x07 Stlaète kláves HORE alebo DOLE pre výber poadovaného typu monitora.", + TEXT_NORMAL + }, + { + 8, + 11, + " Potom stlaète ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Stlaète kláves ESC pre návrat na predchádzajúcu stránku bez zmeny", + TEXT_NORMAL + }, + { + 8, + 14, + " typu monitora.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraèova ESC = Zrui F3 = Skonèi", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKSuccessPageEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 10, + 6, + "Základné súèastí systému ReactOS boli úspene naintalované.", + TEXT_NORMAL + }, + { + 10, + 8, + "Vyberte disketu z mechaniky A: a", + TEXT_NORMAL + }, + { + 10, + 9, + "vetky médiá CD-ROM z CD mechaník.", + TEXT_NORMAL + }, + { + 10, + 11, + "Stlaète ENTER pre retart poèítaèa.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Retart poèítaèa", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKBootPageEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Intalátor nemôe naintalova zavádzaè systému na pevný disk Váho", //bootloader = zavádzaè systému + TEXT_NORMAL + }, + { + 6, + 9, + "poèítaèa", + TEXT_NORMAL + }, + { + 6, + 13, + "Vlote prosím, naformátovanú disketu do mechaniky A:", + TEXT_NORMAL + }, + { + 6, + 14, + "a stlaète ENTER.", + TEXT_NORMAL, + }, + { + 0, + 0, + " ENTER = Pokraèova F3 = Skonèi", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } + +}; + +static MUI_ENTRY skSKSelectPartitionEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "The list below shows existing partitions and unused disk", + TEXT_NORMAL + }, + { + 6, + 9, + "space for new partitions.", + TEXT_NORMAL + }, + { + 8, + 11, + "\x07 Stlaète HORE alebo DOLE pre výber zo zoznamu poloiek.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Stlaète ENTER to install ReactOS onto the selected partition.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Stlaète C pre vytvorenie novej oblasti.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Stlaète D pre vymazanie existujúcej oblasti.", + TEXT_NORMAL + }, + { + 0, + 0, + " Poèkajte, prosím ...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKFormatPartitionEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Formátovanie oblasti", + TEXT_NORMAL + }, + { + 6, + 10, + "Intalátor teraz naformátuje oblas. Stlaète ENTER pre pokraèovanie.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraèova F3 = Skonèi", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + TEXT_NORMAL + } +}; + +static MUI_ENTRY skSKInstallDirectoryEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Intalátor intaluje súbory systému ReactOS na zvolenú oblas.", + TEXT_NORMAL + }, + { + 6, + 9, + "Vyberte adresár kam chcete naintalova systém ReactOS:", + TEXT_NORMAL + }, + { + 6, + 14, + "To change the suggested directory, press BACKSPACE to delete", + TEXT_NORMAL + }, + { + 6, + 15, + "characters and then type the directory where you want ReactOS to", + TEXT_NORMAL + }, + { + 6, + 16, + "be installed.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraèova F3 = Skonèi", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKFileCopyEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 11, + 12, + "Poèkajte, prosím, kým Intalátor systému ReactOS skopíruje súbory", + TEXT_NORMAL + }, + { + 30, + 13, + "do Váho intalaèného prieèinka pre ReactOS.", + TEXT_NORMAL + }, + { + 20, + 14, + "Dokonèenie môe trva nieko¾ko minút.", + TEXT_NORMAL + }, + { + 0, + 0, + " \xB3 Poèkajte, prosím ... ", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKBootLoaderEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Intalátor intaluje zavádzaè operaèného systému", + TEXT_NORMAL + }, + { + 8, + 12, + "Naintalova zavádzaè systému na pevný disk (MBR).", + TEXT_NORMAL + }, + { + 8, + 13, + "Naintalova zavádzaè systému na disketu.", + TEXT_NORMAL + }, + { + 8, + 14, + "Preskoèi intaláciu zavádzaèa systému.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraèova F3 = Skonèi", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKKeyboardSettingsEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Chcete zmeni typ klávesnice, ktorý má by naintalovaný.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Stlaète kláves HORE alebo DOLE pre výber poadovaného typu klávesnice.", + TEXT_NORMAL + }, + { + 8, + 11, + " Potom stlaète ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Stlaète kláves ESC pre návrat na predchádzajúcu stránku bez zmeny", + TEXT_NORMAL + }, + { + 8, + 14, + " typu klávesnice.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraèova ESC = Zrui F3 = Skonèi", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKLayoutSettingsEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Chcete zmeni rozloenie klávesnice, ktoré má by naintalované.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Stlaète kláves HORE alebo DOLE pre výber poadovaného rozloenia", + TEXT_NORMAL + }, + { + 8, + 11, + " klávesnice. Potom stlaète ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Stlaète kláves ESC pre návrat na predchádzajúcu stránku bez zmeny", + TEXT_NORMAL + }, + { + 8, + 14, + " rozloenia klávesnice.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraèova ESC = Zrui F3 = Skonèi", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY skSKPrepareCopyEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Pripravuje sa kopírovanie súborov systému ReactOS. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Vytvára sa zoznam potrebných súborov ...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY skSKSelectFSEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 17, + "Vyberte systém súborov zo zoznamu uvedeného niie.", + 0 + }, + { + 8, + 19, + "\x07 Stlaète HORE alebo DOLE pre výber systému súborov.", + 0 + }, + { + 8, + 21, + "\x07 Stlaète ENTER pre formátovanie oblasti.", + 0 + }, + { + 8, + 23, + "\x07 Stlaète ESC pre výber inej oblasti.", + 0 + }, + { + 0, + 0, + " ENTER = Pokraèova ESC = Zrui F3 = Skonèi", + TEXT_STATUS + }, + + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKDeletePartitionEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Vybrali Ste si odstránenie oblasti", + TEXT_NORMAL + }, + { + 8, + 18, + "\x07 Stlaète D pre odstránenie oblasti.", + TEXT_NORMAL + }, + { + 11, + 19, + "UPOZORNENIE: Vetky údaje na tejto oblasti sa nenávratne stratia!", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 Stlaète ESC pre zruenie.", + TEXT_NORMAL + }, + { + 0, + 0, + " D = Odstráni oblas ESC = Zrui F3 = Skonèi", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKRegistryEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Aktualizujú sa systémové nastavenia.", + TEXT_NORMAL + }, + { + 0, + 0, + " Vytvárajú sa poloky registrov ...", //registry hives + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +MUI_ERROR skSKErrorEntries[] = +{ + { + //ERROR_NOT_INSTALLED + "Systém ReactOS nie je kompletne naintalovaný na Vá\n" + "poèítaè. Ak teraz preruíte intaláciu, budete musie\n" + "spusti Intalátor znova, aby sa systém ReactOS naintaloval.\n" + "\n" + " \x07 Stlaète ENTER pre pokraèovanie v intalácii.\n" + " \x07 Stlaète F3 pre skonèenie intalácie.", + "F3 = Skonèi ENTER = Pokraèova" + }, + { + //ERROR_NO_HDD + "Intalátoru sa nepodarilo nájs pevný disk.\n", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_NO_SOURCE_DRIVE + "Intalátoru sa nepodarilo nájs jej zdrojovú mechaniku.\n", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_LOAD_TXTSETUPSIF + "Intalátor zlyhal pri nahrávaní súboru TXTSETUP.SIF.\n", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_CORRUPT_TXTSETUPSIF + "Intalátor naiel pokodený súbor TXTSETUP.SIF.\n", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_SIGNATURE_TXTSETUPSIF, + "Setup found an invalid signature in TXTSETUP.SIF.\n", //chybný (neplatný) podpis (znak, znaèka, ifra) + "ENTER = Retart poèítaèa" + }, + { + //ERROR_DRIVE_INFORMATION + "Setup could not retrieve system drive information.\n", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_WRITE_BOOT, + "Setup failed to install FAT bootcode on the system partition.", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_LOAD_COMPUTER, + "Intalátor zlyhal pri nahrávaní zoznamu typov poèítaèov.\n", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_LOAD_DISPLAY, + "Intalátor zlyhal pri nahrávaní zoznamu nastavení monitora.\n", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_LOAD_KEYBOARD, + "Intalátor zlyhal pri nahrávaní zoznamu typov klávesníc.\n", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_LOAD_KBLAYOUT, + "Intalátor zlyhal pri nahrávaní zoznamu rozloenia klávesníc.\n", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_WARN_PARTITION, + "Setup found that at least one harddisk contains an incompatible\n" + "partition table that can not be handled properly!\n" + "\n" + "Vytvorenie alebo odstránenie oblastí môe znièi tabu¾ku oblastí.\n" + "\n" + " \x07 Stlaète F3 pre skonèenie intalácie." + " \x07 Stlaète ENTER pre pokraèovanie.", + "F3 = Skonèi ENTER = Pokraèova" + }, + { + //ERROR_NEW_PARTITION, + "Nemôete vytvori novú oblas\n" + "vo vnútri u existujúcej oblasti!\n" + "\n" + " * Pokraèujte stlaèením ¾ubovo¾ného klávesu.", + NULL + }, + { + //ERROR_DELETE_SPACE, + "Nemôete odstráni miesto na disku, ktoré nie je oblasou!\n" + "\n" + " * Pokraèujte stlaèením ¾ubovo¾ného klávesu.", + NULL + }, + { + //ERROR_INSTALL_BOOTCODE, + "Setup failed to install the FAT bootcode on the system partition.", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_NO_FLOPPY, + "V mechanike A: nie je disketa.", + "ENTER = Pokraèova" + }, + { + //ERROR_UPDATE_KBSETTINGS, + "Setup failed to update keyboard layout settings.", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_UPDATE_DISPLAY_SETTINGS, + "Setup failed to update display registry settings.", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_IMPORT_HIVE, + "Setup failed to import a hive file.", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_FIND_REGISTRY + "Setup failed to find the registry data files.", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_CREATE_HIVE, + "Setup failed to create the registry hives.", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_INITIALIZE_REGISTRY, + "Setup failed to set the initialize the registry.", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_INVALID_CABINET_INF, + "Cabinet has no valid inf file.\n", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_CABINET_MISSING, + "Cabinet not found.\n", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_CABINET_SCRIPT, + "Cabinet has no setup script.\n", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_COPY_QUEUE, + "Setup failed to open the copy file queue.\n", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_CREATE_DIR, + "Setup could not create install directories.", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_TXTSETUP_SECTION, + "Setup failed to find the 'Directories' section\n" + "in TXTSETUP.SIF.\n", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_CABINET_SECTION, + "Setup failed to find the 'Directories' section\n" + "in the cabinet.\n", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_CREATE_INSTALL_DIR + "Setup could not create the install directory.", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_FIND_SETUPDATA, + "Intalátor zlyhal pri h¾adaní sekcie 'SetupData'\n" + "v súbore TXTSETUP.SIF.\n", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_WRITE_PTABLE, + "Intalátor zlyhal pri zápise do tabuliek oblastí.\n" + "ENTER = Retart poèítaèa" + }, + { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" + "ENTER = Retart poèítaèa" + }, + { + //ERROR_UPDATE_LOCALESETTINGS, + "Setup could not set the system locale.\n" + "ENTER = Retart poèítaèa" + }, + { + NULL, + NULL + } +}; + + +MUI_PAGE skSKPages[] = +{ + { + LANGUAGE_PAGE, + skSKLanguagePageEntries + }, + { + START_PAGE, + skSKWelcomePageEntries + }, + { + INSTALL_INTRO_PAGE, + skSKIntroPageEntries + }, + { + LICENSE_PAGE, + skSKLicensePageEntries + }, + { + DEVICE_SETTINGS_PAGE, + skSKDevicePageEntries + }, + { + REPAIR_INTRO_PAGE, + skSKRepairPageEntries + }, + { + COMPUTER_SETTINGS_PAGE, + skSKComputerPageEntries + }, + { + DISPLAY_SETTINGS_PAGE, + skSKDisplayPageEntries + }, + { + FLUSH_PAGE, + skSKFlushPageEntries + }, + { + SELECT_PARTITION_PAGE, + skSKSelectPartitionEntries + }, + { + SELECT_FILE_SYSTEM_PAGE, + skSKSelectFSEntries + }, + { + FORMAT_PARTITION_PAGE, + skSKFormatPartitionEntries + }, + { + DELETE_PARTITION_PAGE, + skSKDeletePartitionEntries + }, + { + INSTALL_DIRECTORY_PAGE, + skSKInstallDirectoryEntries + }, + { + PREPARE_COPY_PAGE, + skSKPrepareCopyEntries + }, + { + FILE_COPY_PAGE, + skSKFileCopyEntries + }, + { + KEYBOARD_SETTINGS_PAGE, + skSKKeyboardSettingsEntries + }, + { + BOOT_LOADER_PAGE, + skSKBootLoaderEntries + }, + { + LAYOUT_SETTINGS_PAGE, + skSKLayoutSettingsEntries + }, + { + QUIT_PAGE, + skSKQuitPageEntries + }, + { + SUCCESS_PAGE, + skSKSuccessPageEntries + }, + { + BOOT_LOADER_FLOPPY_PAGE, + skSKBootPageEntries + }, + { + REGISTRY_PAGE, + skSKRegistryEntries + }, + { + -1, + NULL + } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/sk-SK.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c (original) +++ trunk/reactos/base/setup/usetup/mui.c Wed Jan 30 20:59:13 2008 @@ -40,6 +40,7 @@ #include "lang/it-IT.h" #include "lang/pl-PL.h" #include "lang/ru-RU.h" +#include "lang/sk-SK.h" #include "lang/sv-SE.h" #include "lang/uk-UA.h" #include "lang/lt-LT.h" @@ -233,8 +234,8 @@ L"852", L"10029", L"Slovak", - enUSPages, - enUSErrorEntries + skSKPages, + skSKErrorEntries }, { L"0000040A", Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc Wed Jan 30 20:59:13 2008 @@ -627,7 +627,7 @@ IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Videos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" - IDS_NETWORKPLACE "My Network Place" + IDS_NETWORKPLACE "Ìåðåæíå îòî÷åííÿ" IDS_NEWFOLDER "Íîâà ïàïêà"

1 0

[dreimer] 32058: Bug 2993: slovak translation for usetup (kario@szm.sk) Bug 3020: Ukrainian translation update (temarez@yandex.ru)
by dreimer＠svn.reactos.org 30 Jan '08

30 Jan '08

Author: dreimer Date: Wed Jan 30 20:43:12 2008 New Revision: 32058 URL: http://svn.reactos.org/svn/reactos?rev=32058&view=rev Log: Bug 2993: slovak translation for usetup (kario(a)szm.sk) Bug 3020: Ukrainian translation update (temarez(a)yandex.ru) Modified: trunk/rosapps/downloader/lang/uk-UA.rc Modified: trunk/rosapps/downloader/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/uk-UA.rc?r… ============================================================================== --- trunk/rosapps/downloader/lang/uk-UA.rc (original) +++ trunk/rosapps/downloader/lang/uk-UA.rc Wed Jan 30 20:43:12 2008 @@ -62,8 +62,8 @@ IDS_DOWNLOAD_FOLDER "Downloader" IDS_UNABLECREATE_FOLDER "Íå âäàëîñÿ ñòâîðèòè ïàïêó ç òàêèì ³ì'ÿì!" IDS_UPDATE_URL "http://svn.reactos.org" - IDS_INSTALL_DEP "%s is required to run %s. Should %s be installed now?" - TTT_HELPBUTTON "Îòðèìàéòè äîïîìîãó ïðî downloader" + IDS_INSTALL_DEP "%s ïîòð³áíèé ùîá çàïóñòèòè %s. Âñòàíîâèòè %s çàðàç?" + TTT_HELPBUTTON "Îòðèìàéòè äîïîìîãó ïðî çàâàíòàæóâà÷" TTT_UPDATEBUTTON "Ïîêè ùî íå äîñòóïíî" TTT_PROFBUTTON "Íàëàøòóâàòè downloader" END

1 0

[cwittich] 32057: disable Search when there is no text call SearchDialog when SearchNext is called without a string to search for
by cwittich＠svn.reactos.org 30 Jan '08

30 Jan '08

Author: cwittich Date: Wed Jan 30 20:20:47 2008 New Revision: 32057 URL: http://svn.reactos.org/svn/reactos?rev=32057&view=rev Log: disable Search when there is no text call SearchDialog when SearchNext is called without a string to search for Modified: trunk/reactos/base/applications/notepad/dialog.c trunk/reactos/base/applications/notepad/main.c trunk/reactos/base/applications/notepad/main.h Modified: trunk/reactos/base/applications/notepad/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/dialog.c (original) +++ trunk/reactos/base/applications/notepad/dialog.c Wed Jan 30 20:20:47 2008 @@ -320,16 +320,16 @@ */ if (GetWindowText(Globals.hEdit, log, SIZEOF(log)) && !_tcscmp(log, dotlog)) { - static const TCHAR lf[] = _T("\r\n"); - SendMessage(Globals.hEdit, EM_SETSEL, GetWindowTextLength(Globals.hEdit), -1); - SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)lf); - DIALOG_EditTimeDate(); - SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)lf); + static const TCHAR lf[] = _T("\r\n"); + SendMessage(Globals.hEdit, EM_SETSEL, GetWindowTextLength(Globals.hEdit), -1); + SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)lf); + DIALOG_EditTimeDate(); + SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)lf); } SetFileName(szFileName); UpdateWindowCaption(); - + NOTEPAD_EnableSearchMenu(); done: if (hFile != INVALID_HANDLE_VALUE) CloseHandle(hFile); @@ -344,6 +344,7 @@ SetWindowText(Globals.hEdit, empty_str); SendMessage(Globals.hEdit, EM_EMPTYUNDOBUFFER, 0, 0); SetFocus(Globals.hEdit); + NOTEPAD_EnableSearchMenu(); } } @@ -783,6 +784,8 @@ { if (Globals.find.lpstrFindWhat != NULL) NOTEPAD_FindNext(&Globals.find, FALSE, TRUE); + else + DIALOG_Search(); } VOID DIALOG_Replace(VOID) Modified: trunk/reactos/base/applications/notepad/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/main.c (original) +++ trunk/reactos/base/applications/notepad/main.c Wed Jan 30 20:20:47 2008 @@ -26,6 +26,14 @@ NOTEPAD_GLOBALS Globals; static ATOM aFINDMSGSTRING; + +VOID NOTEPAD_EnableSearchMenu() +{ + EnableMenuItem(GetMenu(Globals.hMainWnd), CMD_SEARCH, + MF_BYCOMMAND | ((GetWindowTextLength(Globals.hEdit) == 0) ? MF_DISABLED | MF_GRAYED : MF_ENABLED)); + EnableMenuItem(GetMenu(Globals.hMainWnd), CMD_SEARCH_NEXT, + MF_BYCOMMAND | ((GetWindowTextLength(Globals.hEdit) == 0) ? MF_DISABLED | MF_GRAYED : MF_ENABLED)); +} /*********************************************************************** * @@ -346,6 +354,8 @@ case WM_COMMAND: if (HIWORD(wParam) == EN_CHANGE || HIWORD(wParam) == EN_HSCROLL || HIWORD(wParam) == EN_VSCROLL) DIALOG_StatusBarUpdateCaretPos(); + if ((HIWORD(wParam) == EN_CHANGE)) + NOTEPAD_EnableSearchMenu(); NOTEPAD_MenuCommand(LOWORD(wParam)); break; Modified: trunk/reactos/base/applications/notepad/main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/main.h (original) +++ trunk/reactos/base/applications/notepad/main.h Wed Jan 30 20:20:47 2008 @@ -85,3 +85,4 @@ /* from main.c */ BOOL NOTEPAD_FindNext(FINDREPLACE *, BOOL , BOOL ); +VOID NOTEPAD_EnableSearchMenu(VOID);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs