Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 23283: Implement Main_DDrawSurface_GetAttachedSurface after wine desgin of it we need rewrite Createsurface and Implement AttahedSurface Thanks to wine code and some wine devloper to expain how it works
by greatlrd＠svn.reactos.org 25 Jul '06

25 Jul '06

Author: greatlrd Date: Tue Jul 25 16:21:00 2006 New Revision: 23283 URL: http://svn.reactos.org/svn/reactos?rev=23283&view=rev Log: Implement Main_DDrawSurface_GetAttachedSurface after wine desgin of it we need rewrite Createsurface and Implement AttahedSurface Thanks to wine code and some wine devloper to expain how it works Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/main/surface_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Tue Jul 25 16:21:00 2006 @@ -325,10 +325,10 @@ if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - memcpy(&That->Surf->mddsdPrimary,pDDSD,sizeof(DDSURFACEDESC)); - That->Surf->mddsdPrimary.dwSize = sizeof(DDSURFACEDESC); + memcpy(&That->Surf->mddsdPrimary,pDDSD,pDDSD->dwSize); + That->Surf->mddsdPrimary.dwSize = sizeof(DDSURFACEDESC2); This->mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; - This->mDdCanCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdPrimary; + This->mDdCanCreateSurface.lpDDSurfaceDesc = (DDSURFACEDESC*)&That->Surf->mddsdPrimary; if (This->mDdCanCreateSurface.CanCreateSurface(&This->mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) { @@ -366,7 +366,7 @@ - This->mDdCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdPrimary; + This->mDdCreateSurface.lpDDSurfaceDesc = (DDSURFACEDESC*)&That->Surf->mddsdPrimary; This->mDdCreateSurface.lplpSList = That->Surf->mpPrimaryLocals; This->mDdCreateSurface.dwSCnt = This->mDDrawGlobal.dsList->dwIntRefCnt ; Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/sur… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/surface_main.c Tue Jul 25 16:21:00 2006 @@ -234,9 +234,54 @@ LPDDSCAPS2 pCaps, LPDIRECTDRAWSURFACE7* ppSurface) { - DX_WINDBG_trace(); - - DX_STUB; + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + IDirectDrawSurfaceImpl *surf; + DDSCAPS2 our_caps; + + DX_WINDBG_trace(); + + /* + Wine Code from wine cvs 27/7-2006 + with small changes to fith into our ddraw desgin + */ + + our_caps = *pCaps; + + /* + FIXME adding version check + Earlier dx apps put garbage into these members, clear them + */ + our_caps.dwCaps2 = 0; + our_caps.dwCaps3 = 0; + our_caps.dwCaps4 = 0; + + surf = This; + while( (surf = surf->Surf->next_complex) ) + { + if (((surf->Surf->mddsdPrimary.ddsCaps.dwCaps & our_caps.dwCaps) == our_caps.dwCaps) && + ((surf->Surf->mddsdPrimary.ddsCaps.dwCaps2 & our_caps.dwCaps2) == our_caps.dwCaps2)) + { + *ppSurface = (LPDIRECTDRAWSURFACE7)surf; + Main_DDrawSurface_AddRef(*ppSurface); + return DD_OK; + } + } + + /* Next, look at the attachment chain */ + surf = This; + + while( (surf = surf->Surf->next_attached) ) + { + if (((surf->Surf->mddsdPrimary.ddsCaps.dwCaps & our_caps.dwCaps) == our_caps.dwCaps) && + ((surf->Surf->mddsdPrimary.ddsCaps.dwCaps2 & our_caps.dwCaps2) == our_caps.dwCaps2)) + { + *ppSurface = (LPDIRECTDRAWSURFACE7)surf; + Main_DDrawSurface_AddRef(*ppSurface); + return DD_OK; + } + } + + return DDERR_NOTFOUND; } HRESULT WINAPI Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Tue Jul 25 16:21:00 2006 @@ -116,10 +116,26 @@ DDRAWI_DDRAWCLIPPER_LCL mPrimaryClipperLocal; DDRAWI_DDRAWCLIPPER_GBL mPrimaryClipperGlobal; - DDSURFACEDESC mddsdPrimary; + DDSURFACEDESC2 mddsdPrimary; DDRAWI_DDRAWSURFACE_LCL *mpInUseSurfaceLocals[1]; + /* + AttachList We need getting surface pointer + of already create surface that have some private + data msdn ATTACHLIST can not provide all info + we need with our desgin therfor we are using + wine desgin for it + type IDirectDrawSurfaceImpl; + */ + LPVOID next_attached; + LPVOID first_attached; + LPVOID next_complex; + LPVOID first_complex; + LPVOID next; + LPVOID prev; + + /* Need be delete later */ DDRAWI_DDRAWSURFACE_GBL mSurfGlobal; DDRAWI_DDRAWSURFACE_MORE mSurfMore; DDRAWI_DDRAWSURFACE_LCL mSurfLocal;

1 0

[greatlrd] 23282: patch from LMH1 : Bug#: 1678 : Norwegian translation
by greatlrd＠svn.reactos.org 25 Jul '06

25 Jul '06

Author: greatlrd Date: Tue Jul 25 13:02:45 2006 New Revision: 23282 URL: http://svn.reactos.org/svn/reactos?rev=23282&view=rev Log: patch from LMH1 : Bug#: 1678 : Norwegian translation Added: trunk/reactos/base/applications/games/winemine/No.rc (with props) Modified: trunk/reactos/base/applications/games/winemine/winemine.rc Added: trunk/reactos/base/applications/games/winemine/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/No.rc (added) +++ trunk/reactos/base/applications/games/winemine/No.rc Tue Jul 25 13:02:45 2006 @@ -1,0 +1,83 @@ +#include "resource.h" + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +STRINGTABLE { + IDS_APPNAME, "Minesveiper" + +} + +MENU_WINEMINE MENU DISCARDABLE +{ + POPUP "&Valg" { + MENUITEM "&Nytt", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "&Merk spørsmål", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "&Nybegynner", IDM_BEGINNER + MENUITEM "&Anvansert", IDM_ADVANCED + MENUITEM "&Ekspert", IDM_EXPERT + MENUITEM "&Egendefinert", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "A&vslutt", IDM_EXIT + } + POPUP "&Informasjon" { + MENUITEM "&Beste tider", IDM_TIMES + MENUITEM "&Om", IDM_ABOUT + } +} + +DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Beste tider" +{ + GROUPBOX "Beste tider", IDNONE, 10, 10, 140, 45 + LTEXT "Nybegynner", IDNONE, 20, 20, 40, 8 + LTEXT "Anvansert", IDNONE, 20, 30, 40, 8 + LTEXT "Ekspert", IDNONE, 20, 40, 40, 8 + LTEXT "999", IDC_TIME1, 70, 20, 15, 8 + LTEXT "999", IDC_TIME2, 70, 30, 15, 8 + LTEXT "999", IDC_TIME3, 70, 40, 15, 8 + LTEXT "", IDC_NAME1, 90, 20, 55, 8 + LTEXT "", IDC_NAME2, 90, 30, 55, 8 + LTEXT "", IDC_NAME3, 90, 40, 55, 8 + DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 +} + +DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Congratulations!" +{ + LTEXT "Skriv inn navnet ditt", IDIGNORE, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15 +} + +DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Egendefinert spill" +{ + LTEXT "Høyde", IDNONE, 5, 5, 30, 10 + LTEXT "Bredde", IDNONE, 5, 35, 30, 10 + LTEXT "Miner", IDNONE, 5, 65, 30, 10 + EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER + DEFPUSHBUTTON "Ok", IDOK, 40, 30, 50, 15 + PUSHBUTTON "Avbryt", IDCANCEL, 40, 50, 50, 15 +} + +DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Om" +{ + LTEXT "Minesveiper", IDNONE, 10, 10, 35, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 + LTEXT "under Wine lisensen", IDNONE, 35, 35, 100, 10 + ICON "Minesveiper", IDNONE, 10, 25, 20, 20 + DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15 +} Propchange: trunk/reactos/base/applications/games/winemine/No.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/games/winemine/winemine.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/winemine.rc (original) +++ trunk/reactos/base/applications/games/winemine/winemine.rc Tue Jul 25 13:02:45 2006 @@ -27,7 +27,7 @@ #include "Pl.rc" #include "Nl.rc" #include "Uk.rc" - +#include "No.rc" IDI_WINEMINE ICON MOVEABLE "rc/winemine.ico"

1 0

[greatlrd] 23281: patch from LMH1 : Bug#: 1677 : Norwegian translation
by greatlrd＠svn.reactos.org 25 Jul '06

25 Jul '06

Author: greatlrd Date: Tue Jul 25 12:57:37 2006 New Revision: 23281 URL: http://svn.reactos.org/svn/reactos?rev=23281&view=rev Log: patch from LMH1 : Bug#: 1677 : Norwegian translation Added: trunk/reactos/base/applications/ibrowser/No.rc (with props) Modified: trunk/reactos/base/applications/ibrowser/ibrowser_intres.rc Added: trunk/reactos/base/applications/ibrowser/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/ibrowser… ============================================================================== --- trunk/reactos/base/applications/ibrowser/No.rc (added) +++ trunk/reactos/base/applications/ibrowser/No.rc Tue Jul 25 12:57:37 2006 @@ -1,0 +1,161 @@ +//Microsoft Developer Studio generated resource script. +// +#include "ibrowser_intres.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include <windows.h> +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// German (Germany) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) +#ifdef _WIN32 +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "ibrowser_intres.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include <windows.h>\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "#ifndef _ROS_\r\n" + "LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_NO\r\n" + "STRINGTABLE DISCARDABLE \r\n" + "BEGIN\r\n" + "#ifdef UNICODE\r\n" + "IDS_IBROWSER_VERSION_STR ""ROS IBrowser%0s""\r\n" + "#else\r\n" + "IDS_IBROWSER_VERSION_STR ""ROS IBrowser Ansi%0s""\r\n" + "#endif\r\n" + "END\r\n" + "#endif\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // German (Germany) resources +///////////////////////////////////////////////////////////////////////////// + + +///////////////////////////////////////////////////////////////////////////// +// Norwegian (N.O.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDM_SDIFRAME MENU PRELOAD DISCARDABLE +BEGIN + POPUP "&Fil" + BEGIN + MENUITEM "&Åpne", ID_FILE_OPEN + MENUITEM "A&vslutt", ID_FILE_EXIT + END + POPUP "&Vis" + BEGIN + MENUITEM "&Verktøylinje", ID_VIEW_TOOL_BAR + MENUITEM "S&idelinje", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "&Statuslinje", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Oppdater\tF5", ID_REFRESH + MENUITEM "&Fullskjerm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + END + POPUP "&Hjelp" + BEGIN + MENUITEM "IBrowser &FAQ...", ID_IBROWSER_FAQ + MENUITEM "&Om IBrowser...", ID_ABOUT_IBROWSER + MENUITEM "Om &OS...", ID_ABOUT_WINDOWS + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_ABOUT_IBROWSER DIALOG DISCARDABLE 0, 0, 199, 106 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Om ReactOS Internett nettleser" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "ReactOS Internett nettleser",IDC_ROS_IBROWSER,91,13,104,11 + LTEXT "V 0.9",IDC_VERSION_TXT,91,27,104,8 + LTEXT "(c) 2005 Martin Fuchs",IDC_STATIC,91,42,104,8 + LTEXT "",IDC_WIN_VERSION,91,58,98,22 + LTEXT "http://www.sky.franken.de/explorer/",IDC_WWW,17,84,129, + 8 + CONTROL "&OK",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP, + 154,90,38,12 +END + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TITLE "Reactos Internett nettleser" + IDS_EMPTY "(TOM)" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ABOUT_IBROWSER "&Om..." +END + +#endif // NORWEGIAN (N.O.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// +#ifndef _ROS_ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_NO +STRINGTABLE DISCARDABLE +BEGIN +#ifdef UNICODE +IDS_IBROWSER_VERSION_STR "ROS IBrowser%0s" +#else +IDS_IBROWSER_VERSION_STR "ROS IBrowser Ansi%0s" +#endif +END +#endif + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Propchange: trunk/reactos/base/applications/ibrowser/No.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/ibrowser/ibrowser_intres.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/ibrowser… ============================================================================== --- trunk/reactos/base/applications/ibrowser/ibrowser_intres.rc (original) +++ trunk/reactos/base/applications/ibrowser/ibrowser_intres.rc Tue Jul 25 12:57:37 2006 @@ -66,7 +66,8 @@ "#include ""Sv.rc""\r\n" "#include ""Hu.rc""\r\n" "#include ""Ro.rc""\r\n" - "#include ""Nl.rc""\r\n" + "#include ""Nl.rc""\r\n" + "#include ""No.rc""\r\n" "#include ""Ja.rc""\0" END @@ -104,6 +105,7 @@ #include "Ro.rc" #include "Nl.rc" #include "Ja.rc" +#include "No.rc" ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED

1 0

[greatlrd] 23280: patch from LMH1 : Bug#: 1676 : Norwegian translation
by greatlrd＠svn.reactos.org 25 Jul '06

25 Jul '06

Author: greatlrd Date: Tue Jul 25 12:41:07 2006 New Revision: 23280 URL: http://svn.reactos.org/svn/reactos?rev=23280&view=rev Log: patch from LMH1 : Bug#: 1676 : Norwegian translation Added: trunk/reactos/base/applications/calc/No.rc (with props) Modified: trunk/reactos/base/applications/calc/rsrc.rc Added: trunk/reactos/base/applications/calc/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/No.… ============================================================================== --- trunk/reactos/base/applications/calc/No.rc (added) +++ trunk/reactos/base/applications/calc/No.rc Tue Jul 25 12:41:07 2006 @@ -1,0 +1,155 @@ +/* + * WineCalc (En.rc) + * + * Copyright 2003 James Briggs + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "windows.h" +#include "resource.h" +#include "winecalc.h" + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_APPNAME, "Kalkulator" + + IDS_COPYRIGHT1, "Kalkulator 5.0. Lisensert under LGPL 2" + IDS_COPYRIGHT2 "Copyright 2003, James Briggs" + IDS_COPYRIGHT3 "San Jose, California, USA" + IDS_COPYRIGHT4 "james(a)ActionMessage.com" + IDS_COPYRIGHT5 "http://www.ActionMessage.com/winecalc/" + + IDS_BTN_BACKSPACE, "Tilbake" + IDS_BTN_CLEAR_ENTRY, "CE" + IDS_BTN_CLEAR_ALL, "C" + IDS_BTN_MEM_CLEAR, "MC" + IDS_BTN_MEM_RECALL, "MR" + IDS_BTN_MEM_STORE, "MS" + IDS_BTN_MEM_PLUS, "M+" + IDS_BTN_MEM_STATUS_M, "M" + IDS_BTN_SQRT, "sqrt" + IDS_ERR_INVALID_INPUT, "Ugyldig informasjon for funksjon." + IDS_ERR_DIVIDE_BY_ZERO, "Kan ikke dividere på null." + IDS_ERR_UNDEFINED, "Resultatet av funksjoner er ubestemt." +} + +MAIN_MENU MENU DISCARDABLE +{ + POPUP "&Rediger" { + MENUITEM "&Kopier Ctrl+C", IDM_COPY + MENUITEM "&Lim inn Ctrl+V", IDM_PASTE + } + POPUP "&Vis" { + MENUITEM "Standard", IDM_MODE_STANDARD + MENUITEM "Vitenskapelig", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "Siffergruppering", IDM_DIGIT_GROUPING + } + POPUP "&Hjelp" { + MENUITEM "Emner i hjelp", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "Om kalkulator", IDM_ABOUT + } +} + +SCIMS_MENU MENU DISCARDABLE +{ + POPUP "&Rediger" { + MENUITEM "&Kopiere Ctrl+C", IDM_COPY + MENUITEM "&Lim inn Ctrl+V", IDM_PASTE + } + POPUP "&Vis" { + MENUITEM "Standard", IDM_MODE_STANDARD + MENUITEM "Vitenskapelig", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "Heksadesimalt\tF5", ID_CALC_NS_HEX + MENUITEM "Desimalt\tF6", ID_CALC_NS_DEC + MENUITEM "Oktalt\tF7", ID_CALC_NS_OCT + MENUITEM "Binært\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "Grader\tF2", ID_CALC_MS_DEGREES + MENUITEM "Radianer\tF3", ID_CALC_MS_RADIANS + MENUITEM "Gradienter\tF4", ID_CALC_MS_GRADS + MENUITEM SEPARATOR + MENUITEM "Siffergruppering", IDM_DIGIT_GROUPING + } + POPUP "&Hjelp" { + MENUITEM "Emner i hjelp", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "Om Kalkulator", IDM_ABOUT + } +} + +SCIWS_MENU MENU DISCARDABLE +{ + POPUP "&Rediger" { + MENUITEM "&Kopier Ctrl+C", IDM_COPY + MENUITEM "&Lim inn Ctrl+V", IDM_PASTE + } + POPUP "&Vis" { + MENUITEM "Standard", IDM_MODE_STANDARD + MENUITEM "Vitenskapelig", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "Heksadesimalt\tF5", ID_CALC_NS_HEX + MENUITEM "Desimal\tF6", ID_CALC_NS_DEC + MENUITEM "Oktalt\tF7", ID_CALC_NS_OCT + MENUITEM "Binært\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "Qword\tF12", ID_CALC_WS_QWORD + MENUITEM "Dword\tF2", ID_CALC_WS_DWORD + MENUITEM "Word\tF3", ID_CALC_WS_WORD + MENUITEM "Byte\tF4", ID_CALC_WS_BYTE + MENUITEM SEPARATOR + MENUITEM "Siffergruppering", IDM_DIGIT_GROUPING + } + POPUP "&Help" { + MENUITEM "Emner i hjelp", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "Om Kalkulator", IDM_ABOUT + } +} + +MAIN_MENU ACCELERATORS +BEGIN + VK_F1, IDV_HELP, VIRTKEY +END + +DLG_ABOUT DIALOG 12,0,120,82 +CAPTION "Om GNU winecalc" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +BEGIN + DEFPUSHBUTTON "OK", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +WHATS_THIS_MENU MENU DISCARDABLE +{ + POPUP "" { + MENUITEM "Hva er dette?", IDM_WHATS_THIS + } +} + +DLG_STATS DIALOG 12,0,125,78 +CAPTION "Statistics Box" +FONT 9, "Tahoma" +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +BEGIN + DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&CD" ID_STATS_CD, 64, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "C&AD", ID_STATS_CAD, 94, 52, 25, 13, WS_TABSTOP | WS_GROUP +END Propchange: trunk/reactos/base/applications/calc/No.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/calc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/rsr… ============================================================================== --- trunk/reactos/base/applications/calc/rsrc.rc (original) +++ trunk/reactos/base/applications/calc/rsrc.rc Tue Jul 25 12:41:07 2006 @@ -37,5 +37,6 @@ #include "Hu.rc" #include "Uk.rc" #include "Gr.rc" +#include "No.rc" LANGUAGE LANG_NEUTRAL,SUBLANG_NEUTRAL

1 0

[janderwald] 23279: Ukraianian translation by Temarez
by janderwald＠svn.reactos.org 25 Jul '06

25 Jul '06

Author: janderwald Date: Tue Jul 25 11:12:28 2006 New Revision: 23279 URL: http://svn.reactos.org/svn/reactos?rev=23279&view=rev Log: Ukraianian translation by Temarez Added: trunk/reactos/base/setup/vmwinst/Uk.rc (with props) Modified: trunk/reactos/base/setup/vmwinst/vmwinst.rc Added: trunk/reactos/base/setup/vmwinst/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/Uk.rc?r… ============================================================================== --- trunk/reactos/base/setup/vmwinst/Uk.rc (added) +++ trunk/reactos/base/setup/vmwinst/Uk.rc Tue Jul 25 11:12:28 2006 @@ -1,0 +1,139 @@ +/* + * PROJECT: ReactOS VMware(r) driver installation utility + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/setup/vmwinst/Uk.rc + * PURPOSE: Ukraianian Language File for vmwinst + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDD_WELCOMEPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Ïðîãðàìà óñòàíîâêè ReactOS âèÿâèëà, ùî Âè çàïóñòèëè ReactOS âñåðåäåí³ VMware(r).", -1, 100, 8, 160, 24 + LTEXT "ßêùî Âè áàæàºòå âñòàíîâèòè SVGA äðàéâåð VMware(r), íàòèñí³òü 'Äàë³', ³íàêøå íàòèñí³òü 'Ñêàñóâàòè'.", -1, 100, 140, 160, 17 +END + +IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Ïðîãðàìà óñòàíîâêè ReactOS íå âêëþ÷àº SVGA äðàéâåð VMware(r).\n\nÒîìó éä³òü äî ìåíþ 'VM' ó VMware(r) workstation ³ âèáåð³òü 'Install VMware tools...'\n\n\nÍàòèñí³òü 'Äàë³' äëÿ ïðîäîâæåííÿ àáî 'Ñêàñóâàòè', ùîá ïðîïóñòèòè óñòàíîâêó SVGA äðàéâåðà.",-1,25,25,225,85 +END + +IDD_INSTALLING_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "{STATUS}",IDC_INSTALLINGSTATUS,25,68,225,8 + CONTROL "", IDC_INSTALLINGPROGRESS, "msctls_progress32", PBS_MARQUEE | WS_CHILD | WS_VISIBLE | WS_BORDER, 25, 80, 225, 8 +END + +IDD_CONFIG DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Óñòàíîâêó SVGA äðàéâåðà VMware(r) çàâåðøåíî óñï³øíî. Îáåð³òü ïåðåâàæíó ðîçä³ëüíó çäàòí³ñòü åêðàíó:",-1,25,5,225,20 + PUSHBUTTON "640x480", 540, 25, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "800x600", 1400, 25, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1024x768", 1792, 25, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1152x864", 2016, 25, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x960", 2240, 110, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x1024", 2304, 110, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1400x1050", 2450, 110, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1600x1200", 2800, 110, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1792x1344", 3136, 195, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1856x1392", 3248, 195, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1920x1440", 3360, 195, 60, 50, 15, BS_AUTORADIOBUTTON + LTEXT "Áóäü ëàñêà îáåð³òü ÿê³ñòü ïåðåäà÷³ êîëüîðó:", -1, 25, 93, 225, 12 + COMBOBOX IDC_COLORQUALITY, 25, 105, 75, 80, CBS_DROPDOWNLIST | WS_TABSTOP +END + +IDD_INSTALLATION_FAILED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Ïðîãðàìà óñòàíîâêè ReactOS íå çìîãëà âñòàíîâèòè SVGA äðàéâåð VMware(r).\n\n\nÍàòèñí³òü 'Çàâåðøèòè' äëÿ ïðîäîâæåííÿ ïðîöåñó óñòàíîâêè.",-1,25,25,225,85 +END + +IDD_CHOOSEACTION DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "SVGA äðàéâåð VMware(r) SVGA âæå âñòàíîâëåíèé.\n\nÎáåð³òü, ùî Âè õî÷åòå çðîáèòè:",-1,25,5,225,30 + PUSHBUTTON "Íàëàøòóâàòè ïàðàìåòðè åêðàíó", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Ñêîðèñòàòèñÿ ³íøèì ãðàô³÷íèì äðàéâåðîì", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Âèäàëèòè SVGA äðàéâåð VMware(r)", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON + LTEXT "Íàòèñí³òü 'Äàë³' äëÿ ïðîäîâæåííÿ àáî 'Ñêàñóâàòè' äëÿ âèõîäó ç ìàéñòðà.", -1, 25, 93, 225, 12 +END + +IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Áóäü ëàñêà îáåð³òü ãðàô³÷íèé äðàéâåð, ÿêèé Âè õîò³ëè á âèêîðèñòîâóâàòè:",-1,25,25,225,15 + PUSHBUTTON "ReactOS VGA äðàéâåð", IDC_VGA, 25, 40, 225, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "ReactOS VBE äðàéâåð (SVGA)", IDC_VBE, 25, 55, 225, 15, BS_AUTORADIOBUTTON + LTEXT "Íàòèñí³òü 'Çàâåðøèòè' äëÿ çàâåðøåííÿ îïåðàö³¿ àáî 'Ñêàñóâàòè' äëÿ âèõîäó ç ïðîãðàìè óñòàíîâêè áåç çáåðåæåííÿ çì³í.", -1, 25, 93, 225, 20 +END + +IDD_DOUNINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Ïðîãðàìà óñòàíîâêè ReactOS ãîòîâà âèäàëèòè SVGA äðàéâåð VMWare(r)!!!\n\n\nÍàòèñí³òü 'Çàâåðøèòè' äëÿ âèäàëåííÿ äðàéâåðà àáî 'Ñêàñóâàòè' ùîá çàëèøèòè éîãî ÿê º.",-1,25,25,225,85 +END + +STRINGTABLE +BEGIN + IDS_WIZARD_NAME "Âèÿâëåíèé VMware(r)" + IDS_FAILEDTOLOCATEDRIVERS "Ïðîãðàìà óñòàíîâêè ReactOS íå çìîãëà çíàéòè íåîáõ³äí³ ôàéëè.\nÏåðåêîíàéòåñÿ, ùî CD-ROM VMware(r) tools âñòàâëåíèé." + IDS_FAILEDTOCOPYFILES "Ïðîãðàìà óñòàíîâêè ReactOS íå çìîãëà ñêîï³þâàòè íåîáõ³äí³ ôàéëè.\nÏåðåêîíàéòåñÿ, ùî CD-ROM VMware(r) tools âñòàâëåíèé.\n" + IDS_FAILEDTOACTIVATEDRIVER "Íå âäàëîñÿ çàïóñòèòè SVGA äðàéâåð VMware(r)!" + IDS_FAILEDTOSELVGADRIVER "Íå âäàëîñÿ çàïóñòèòè ReactOS VGA äðàéâåð!" + IDS_FAILEDTOSELVBEDRIVER "Íå âäàëîñÿ çàïóñòèòè ReactOS VBE äðàéâåð!" + IDS_UNINSTNOTICE "Ôàéëè SVGA äðàéâåðà VMware(r) ùå íå áóëè âèäàëåí³.\nÁóäü ëàñêà âèäàë³òü ¿õ âðó÷íó ï³ñëÿ ïåðåçàâàíòàæåííÿ ñèñòåìè." + IDS_FAILEDTOADDREGENTRIES "Íå âäàëîñÿ ñòâîðèòè çàïèñè â ðåºñòð³ äëÿ SVGA äðàéâåðà VMware(r)!" +END + +STRINGTABLE +BEGIN + 10001 "Íèçüêà (8BPP)" + 10002 "Ñåðåäíÿ (16BPP)" + 10003 "Íàéâèùà (32BPP)" +END + +STRINGTABLE +BEGIN + IDS_SEARCHINGFORCDROM "Ïîøóê êîìïàêò-äèñêà VMware(r) Tools..." + IDS_COPYINGFILES "Êîï³þâàííÿ ôàéë³â..." + IDS_ENABLINGDRIVER "Çàïóñê SVGA äðàéâåðà VMware(r)..." +END + +STRINGTABLE +BEGIN + IDD_INSERT_VMWARE_TOOLSTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" + IDD_INSERT_VMWARE_TOOLSSUBTITLE "Áóäü ëàñêà âñòàâòå äèñê VMware tools." + IDD_INSTALLING_VMWARE_TOOLSTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" + IDD_INSTALLING_VMWARE_TOOLSSUBTITLE "Ïîøóê ³ êîï³þâàííÿ SVGA äðàéâåðà VMware (r)." + IDD_CONFIGTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" + IDD_CONFIGSUBTITLE "Îáåð³òü Âàøó óëþáëåíó ðîçä³ëüíó çäàòí³ñòü åêðàíó." + IDD_INSTALLATION_FAILEDTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" + IDD_INSTALLATION_FAILEDSUBTITLE "Óñòàíîâêà SVGA äðàéâåðà VMware (r) íå âäàëàñÿ." + IDD_CHOOSEACTIONTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" + IDD_CHOOSEACTIONSUBTITLE "Âèáåð³òü, ùî Âè õî÷åòå çðîáèòè." + IDD_SELECTDRIVERTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" + IDD_SELECTDRIVERSUBTITLE "Îáðàòè äðàéâåð." + IDD_DOUNINSTALLTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" + IDD_DOUNINSTALLSUBTITLE "Âèäàëèòè äðàéâåð." +END Propchange: trunk/reactos/base/setup/vmwinst/Uk.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/setup/vmwinst/vmwinst.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/vmwinst… ============================================================================== --- trunk/reactos/base/setup/vmwinst/vmwinst.rc (original) +++ trunk/reactos/base/setup/vmwinst/vmwinst.rc Tue Jul 25 11:12:28 2006 @@ -33,3 +33,4 @@ #include "Ja.rc" #include "Hu.rc" #include "Ru.rc" +#include "Uk.rc"

1 0

[janderwald] 23278: Ukraianian translation by Temarez
by janderwald＠svn.reactos.org 25 Jul '06

25 Jul '06

Author: janderwald Date: Tue Jul 25 11:10:14 2006 New Revision: 23278 URL: http://svn.reactos.org/svn/reactos?rev=23278&view=rev Log: Ukraianian translation by Temarez Added: trunk/reactos/subsystems/ntvdm/Uk.rc (with props) Added: trunk/reactos/subsystems/ntvdm/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/Uk.rc?rev… ============================================================================== --- trunk/reactos/subsystems/ntvdm/Uk.rc (added) +++ trunk/reactos/subsystems/ntvdm/Uk.rc Tue Jul 25 11:10:14 2006 @@ -1,0 +1,18 @@ +/* + * PROJECT: Virtual DOS Machine + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/ntvdm/Uk.rc + * PURPOSE: Ukraianian Language File for Virtual DOS Machine + * TRANSLATOR: Artem Reznikov + */ + +#include "resource.h" + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + +STRING_WelcomeMsg, "Ï³äòðèìêà â³ðòóàëüíî¿ ìàøèíè DOS ó ReactOS.\n" +STRING_PromptMsg, "Ââåä³òü r<cr> äëÿ çàïóñêó, s<cr> äëÿ çàêðèòòÿ àáî q<cr>, ùîá âèéòè çàðàç." +} Propchange: trunk/reactos/subsystems/ntvdm/Uk.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 23277: Ukraianian translation by Temarez
by janderwald＠svn.reactos.org 25 Jul '06

25 Jul '06

Author: janderwald Date: Tue Jul 25 11:06:38 2006 New Revision: 23277 URL: http://svn.reactos.org/svn/reactos?rev=23277&view=rev Log: Ukraianian translation by Temarez Modified: trunk/reactos/subsystems/ntvdm/ntvdm.rc Modified: trunk/reactos/subsystems/ntvdm/ntvdm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/ntvdm.rc?… ============================================================================== --- trunk/reactos/subsystems/ntvdm/ntvdm.rc (original) +++ trunk/reactos/subsystems/ntvdm/ntvdm.rc Tue Jul 25 11:06:38 2006 @@ -12,4 +12,4 @@ #include "Hu.rc" #include "Es.rc" #include "No.rc" - +#include "Uk.rc"

1 0

[janderwald] 23276: Ukraianian translation by Temarez
by janderwald＠svn.reactos.org 25 Jul '06

25 Jul '06

Author: janderwald Date: Tue Jul 25 11:03:34 2006 New Revision: 23276 URL: http://svn.reactos.org/svn/reactos?rev=23276&view=rev Log: Ukraianian translation by Temarez Added: trunk/reactos/dll/win32/syssetup/syssetup_Uk.rc (with props) Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup.rc (original) +++ trunk/reactos/dll/win32/syssetup/syssetup.rc Tue Jul 25 11:03:34 2006 @@ -50,4 +50,4 @@ #include "syssetup_Ja.rc" #include "syssetup_Es.rc" #include "syssetup_Hu.rc" - +#include "syssetup_Uk.rc" Added: trunk/reactos/dll/win32/syssetup/syssetup_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup_Uk.rc (added) +++ trunk/reactos/dll/win32/syssetup/syssetup_Uk.rc Tue Jul 25 11:03:34 2006 @@ -1,0 +1,211 @@ +/* + * PROJECT: System setup + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/syssetup/syssetup_Uk.rc + * PURPOSE: Ukraianian Language File for syssetup + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + + +IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Óñòàíîâêà ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ëàñêàâî ïðîñèìî äî ìàéñòðà óñòàíîâêè ReactOS.", IDC_WELCOMETITLE, 115, 8, 195, 24 + LTEXT "Öåé ìàéñòåð âñòàíîâëþº ReactOS íà Âàø êîìï'þòåð. Éîìó "\ + "ïîòð³áíî ç³áðàòè äåÿê³ â³äîìîñò³ ïðî Âàñ ³ Âàø êîìï'þòåð "\ + "ùîá óñòàíîâèòè ReactOS íàëåæíèì ÷èíîì.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Íàòèñí³òü 'Äàë³', ùîá ïðîäîâæèòè óñòàíîâêó.", IDC_STATIC, 115, 169, 195, 17 +END + + +IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Óñòàíîâêà ReactOS" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Ðîçðîáíèêè ReactOS õîò³ëè á ïîäÿêóâàòè íàñòóïíèì Open Source ïðîåêòàì, "\ + "ùî (÷àñòêîâî) âèêîðèñòîâóâàëèñÿ ïðè ñòâîðåíí³ ReactOS:", + IDC_STATIC,15,7,286,19 + LISTBOX IDC_PROJECTS,15,30,286,75,LBS_NOSEL | LBS_HASSTRINGS | + LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LTEXT "ReactOS ë³öåíçóºòüñÿ ïî GPL, òàê ùî ÿêùî Âè õî÷åòå ïîâòîðíî âèêîðèñòîâóâàòè "\ + "àáî ïîøèðþâàòè éîãî (÷àñòèíè), Âè ìàºòå ïîâàæàòè GPL", + IDC_STATIC,15,110,227,19 + PUSHBUTTON "&Ïåðåãëÿä GPL...",IDC_VIEWGPL,251,110,50,19 + LTEXT "Íàòèñí³òü 'Äàë³', ùîá ïðîäîâæèòè óñòàíîâêó.",IDC_STATIC,15,136, + 195,17 +END + + +IDD_OWNERPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Óñòàíîâêà ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ââåä³òü ñâîº ïîâíå ³ì'ÿ ³ íàçâó âàøî¿ êîìïàí³¿ àáî îðãàí³çàö³¿.", + IDC_STATIC, 54, 7, 242, 21 + LTEXT "&²ì'ÿ:", IDC_STATIC, 54, 37, 44, 8 + EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Îðãàí³çàö³ÿ:", IDC_STATIC, 54, 57, 44, 8 + EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL +END + + +IDD_COMPUTERPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Óñòàíîâêà ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ââåä³òü ³ì'ÿ Âàøîãî êîìï'þòåðà äîâæèíîþ äî 63 ñèìâîë³â. "\ + "ßêùî Âè ïðàöþº â ìåðåæ³, ³ì'ÿ Âàøîãî êîìï'þòåðà ìàº áóòè óí³êàëüíèì.", + IDC_STATIC, 54, 7, 250, 24 + LTEXT "&²ì'ÿ êîìï'þòåðà:", IDC_STATIC, 54, 38, 75, 8 + EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + LTEXT "Ïðîãðàìà óñòàíîâêè ñòâîðèòü îáë³êîâèé çàïèñ êîðèñòóâà÷à 'Àäì³í³ñòðàòîð', "\ + "ÿêèé äàº ïîâí³ ïðàâà äîñòóïó äî Âàøîãî êîìï'þòåðà.", + IDC_STATIC, 54, 57, 250, 25 + LTEXT "Ââåä³òü ïàðîëü àäì³í³ñòðàòîðà äîâæèíîþ äî 14 ñèìâîë³â.", + IDC_STATIC, 54, 87, 250, 8 + LTEXT "&Ïàðîëü àäì³í³ñòðàòîðà:", IDC_STATIC, 54, 104, 75, 8 + EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + LTEXT "Ï³&äòâåðäæåííÿ:", IDC_STATIC, 54, 123, 75, 8 + EDITTEXT IDC_ADMINPASSWORD2, 132, 120, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD +END + + +IDD_LOCALEPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Óñòàíîâêà ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ìîâà ñèñòåìè ìàº â³äïîâ³äàòè ìîâ³ äîäàòê³â, ÿê³ âè õî÷åòå "\ + "âèêîðèñòîâóâàòè. Ìîâà êîðèñòóâà÷à çàäàº ôîðìàò âèâåäåííÿ, "\ + "÷èñåë, ãðîøîâèõ îäèíèöü ³ äàò.", IDC_STATIC, 53, 7, 253, 20 + LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 + LTEXT "Äëÿ çì³íè ìîâè ñèñòåìè àáî ìîâè êîðèñòóâà÷à íàòèñí³òü 'Íàëàøòóâàòè'.", + IDC_STATIC, 53, 60, 184, 8 + PUSHBUTTON "Íà&ëàøòóâàòè...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 + LTEXT "Ðîçêëàäêà êëàâ³àòóðè çàäàº ñèìâîëè, ùî ââîäÿòüñÿ ïðè íàòèñíåíí³ êëàâ³ø.", + IDC_STATIC, 53, 86, 253, 8 + LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 + LTEXT "Äëÿ çì³íè ðîçêëàäêè êëàâ³àòóðè íàòèñí³òü 'Íàëàøòóâàòè'.", + IDC_STATIC, 53, 126, 184, 8 + PUSHBUTTON "Íàë&àøòóâàòè...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 +END + + +IDD_DATETIMEPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Óñòàíîâêà ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Äàòà é ÷àñ", IDC_STATIC, 53, 7, 253, 8 + CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", + DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 + CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", + DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 + LTEXT "×àñîâèé ïîÿñ", IDC_STATIC, 53, 42, 253, 8 + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, + CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + AUTOCHECKBOX "Àâòîìàòè&÷íå ïåðåâåäåííÿ ãîäèííèêà íà ë³òíèé/çèìîâèé ÷àñ", + IDC_AUTODAYLIGHT, 53, 124, 201, 10 +END + + +IDD_PROCESSPAGE DIALOG 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Óñòàíîâêà ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 + LTEXT "", IDC_ITEM, 53, 29, 253, 20 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", + PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 +END + + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Çàâåðøåííÿ óñòàíîâêè ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Çàâåðøåííÿ óñòàíîâêè ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24 + LTEXT "Âè óñï³øíî çàâåðøèëè óñòàíîâêó ReactOS.\n\n" \ + "Ï³ñëÿ íàòèñíåííÿ êíîïêè 'Çàâåðøèòè' êîìï'þòåð áóäå ïåðåçàâàíòàæåíèé.", IDC_STATIC, 115, 40, 195, 100 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12 + LTEXT "ßêùî â äèñêîâîä âñòàâëåíèé êîìïàêò-äèñê, âèéì³òü éîãî. Ïîò³ì "\ + "äëÿ ïåðåçàâàíòàæåííÿ Âàøîãî êîìï'þòåðà íàòèñòí³òü 'Çàâåðøèòè'.", IDC_STATIC, 115, 169, 195, 17 +END + + +IDD_GPL DIALOG 0, 0, 333, 230 +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "GNU General Public License" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_GPL_TEXT,7,7,319,190,ES_MULTILINE | ES_AUTOHSCROLL | + ES_READONLY | WS_VSCROLL + DEFPUSHBUTTON "OK",IDOK,141,209,50,14 +END + + +STRINGTABLE +BEGIN + IDS_ACKTITLE "Ï³äòâåðäæåííÿ" + IDS_ACKSUBTITLE "The shoulders ReactOS stands on and license information" + IDS_OWNERTITLE "Íàëàøòóâàííÿ ïðèíàëåæíîñò³ ïðîãðàì" + IDS_OWNERSUBTITLE "Ö³ îñîáèñò³ â³äîìîñò³ âêàçóþòü íà ïðèíàëåæí³ñòü ïðîãðàì ReactOS." + IDS_COMPUTERTITLE "²ì'ÿ êîìï'þòåðà òà ïàðîëü àäì³í³ñòðàòîðà" + IDS_COMPUTERSUBTITLE "Âè ìàºòå âêàçàòè ³ì'ÿ òà ïàðîëü àäì³í³ñòðàòîðà Âàøîãî êîìï'þòåðà." + IDS_LOCALETITLE "Ìîâà ³ ñòàíäàðòè" + IDS_LOCALESUBTITLE "Âè ìîæåòå íàëàøòóâàòè ReactOS äëÿ ð³çíèõ ðåã³îí³â ³ ìîâ." + IDS_DATETIMETITLE "Äàòà é ÷àñ" + IDS_DATETIMESUBTITLE "Âñòàíîâèòè ïðàâèëüí³ äàòó ³ ÷àñ äëÿ Âàøîãî êîìï'þòåðà." + IDS_PROCESSTITLE "Process page title" + IDS_PROCESSSUBTITLE "Process page subtitle" +END + +STRINGTABLE +BEGIN + IDS_CMT_WINEFILE "Çàïóñòèòè Winefile" + IDS_CMT_IBROWSER "Çàïóñòèòè iBrowser" + IDS_CMT_GETFIREFOX "Çàâàíòàæèòè/âñòàíîâèòè Firefox" +END + +STRINGTABLE +BEGIN + IDS_ACCESSORIES "Äîïîì³æí³ ïðîãðàìè" + IDS_CMT_CALC "Çàïóñòèòè Êàëüêóëÿòîð" + IDS_CMT_CMD "Â³äêðèòè êîìàíäíèé ðÿäîê" + IDS_CMT_EXPLORER "Çàïóñòèòè Ïðîâ³äíèê" + IDS_CMT_NOTEPAD "Çàïóñòèòè Òåêñòîâèé ðåäàêòîð" + IDS_CMT_REGEDIT "Çàïóñòèòè Ðåäàêòîð ðåºñòðà" + IDS_CMT_WORDPAD "Çàïóñòèòè Ðåäàêòîð äîêóìåíò³â" + IDS_CMT_SCREENSHOT "Çðîáèòè çí³ìîê åêðàíà" +END + +STRINGTABLE +BEGIN + IDS_GAMES "²ãðè" + IDS_CMT_SOLITAIRE "Solitaire" + IDS_CMT_WINEMINE "Ñàïåð" +END + +STRINGTABLE +BEGIN + IDS_REACTOS_SETUP "Óñòàíîâêà ReactOS" + IDS_UNKNOWN_ERROR "Íåâ³äîìà ïîìèëêà" + IDS_REGISTERING_COMPONENTS "Ðåºñòðàö³ÿ êîìïîíåíò³â..." + IDS_LOADLIBRARY_FAILED "LoadLibrary failed: " + IDS_GETPROCADDR_FAILED "GetProcAddr failed: " + IDS_REGSVR_FAILED "DllRegisterServer failed: " + IDS_DLLINSTALL_FAILED "DllInstall failed: " + IDS_TIMEOUT "Timeout during registration" + IDS_REASON_UNKNOWN "" +END + +/* EOF */ Propchange: trunk/reactos/dll/win32/syssetup/syssetup_Uk.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 23275: Ukraianian translation by Temarez
by janderwald＠svn.reactos.org 25 Jul '06

25 Jul '06

Author: janderwald Date: Tue Jul 25 11:02:51 2006 New Revision: 23275 URL: http://svn.reactos.org/svn/reactos?rev=23275&view=rev Log: Ukraianian translation by Temarez Added: trunk/reactos/base/system/rundll32/Uk.rc (with props) trunk/reactos/base/system/userinit/Uk.rc (with props) Modified: trunk/reactos/base/system/rundll32/rundll32.rc trunk/reactos/base/system/userinit/userinit.rc Added: trunk/reactos/base/system/rundll32/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/Uk.rc… ============================================================================== --- trunk/reactos/base/system/rundll32/Uk.rc (added) +++ trunk/reactos/base/system/rundll32/Uk.rc Tue Jul 25 11:02:51 2006 @@ -1,0 +1,17 @@ +/* + * PROJECT: ReactOS rundll32.exe + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/rundll32/Uk.rc + * PURPOSE: Ukraianian Language File for rundll32 + * TRANSLATOR: Artem Reznikov + */ + +#include "resource.h" + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ +IDS_DllNotLoaded, "LoadLibrary íå âäàëîñÿ çàâàíòàæèòè '%s'" +IDS_MissingEntry, "Íåìîæëèâî çíàéòè òî÷êó âõîäó:%s\nÂ á³áë³îòåö³ %s" +} Propchange: trunk/reactos/base/system/rundll32/Uk.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/rundll32/rundll32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rundl… ============================================================================== --- trunk/reactos/base/system/rundll32/rundll32.rc (original) +++ trunk/reactos/base/system/rundll32/rundll32.rc Tue Jul 25 11:02:51 2006 @@ -12,4 +12,4 @@ #include "Ru.rc" #include "Gr.rc" #include "No.rc" - +#include "Uk.rc" Added: trunk/reactos/base/system/userinit/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/Uk.rc… ============================================================================== --- trunk/reactos/base/system/userinit/Uk.rc (added) +++ trunk/reactos/base/system/userinit/Uk.rc Tue Jul 25 11:02:51 2006 @@ -1,0 +1,18 @@ +/* + * PROJECT: ReactOS Userinit Logon Application + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/userinit/Uk.rc + * PURPOSE: Ukraianian Language File for userinit + * TRANSLATOR: Artem Reznikov + */ + +#include "resource.h" + +LANGUAGE LANG_UKRAINIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + +STRING_USERINIT_FAIL, "Userinit íå âäàëîñÿ çàïóñòèòè îáîëîíêó!\n" + +} Propchange: trunk/reactos/base/system/userinit/Uk.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/userinit/userinit.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… ============================================================================== --- trunk/reactos/base/system/userinit/userinit.rc (original) +++ trunk/reactos/base/system/userinit/userinit.rc Tue Jul 25 11:02:51 2006 @@ -14,3 +14,4 @@ #include "Es.rc" #include "Ru.rc" #include "Gr.rc" +#include "Uk.rc"

1 0

[jimtabor] 23274: Broken explorer popups with IsBadString, revert string pointer checking. Misc fix to win32k menu and removed byposition flag check and save.
by jimtabor＠svn.reactos.org 25 Jul '06

25 Jul '06

Author: jimtabor Date: Tue Jul 25 04:50:35 2006 New Revision: 23274 URL: http://svn.reactos.org/svn/reactos?rev=23274&view=rev Log: Broken explorer popups with IsBadString, revert string pointer checking. Misc fix to win32k menu and removed byposition flag check and save. Modified: trunk/reactos/dll/win32/user32/windows/menu.c trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c Tue Jul 25 04:50:35 2006 @@ -3698,11 +3698,6 @@ mii->fType |= MFT_RIGHTJUSTIFY; } - if(Flags & MF_BYPOSITION) - { - mii->fType |= MF_BYPOSITION; - } - if(Flags & MF_MENUBREAK) { mii->fType |= MFT_MENUBREAK; @@ -4396,9 +4391,6 @@ ((mi.fMask & MIIM_TYPE) && (MENU_ITEM_TYPE(mi.fType) == MF_STRING))) && mi.dwTypeData != NULL) { - UINT Count = lpmii->cch; - if(!Count) Count++; - if (IsBadStringPtrA(lpmii->dwTypeData, Count)) return FALSE; Status = RtlCreateUnicodeStringFromAsciiz(&MenuText, (LPSTR)mi.dwTypeData); if (!NT_SUCCESS (Status)) { @@ -4451,9 +4443,6 @@ ((mi.fMask & MIIM_TYPE) && (MENU_ITEM_TYPE(mi.fType) == MF_STRING))) && mi.dwTypeData != NULL) { - UINT Count = lpmii->cch; - if(!Count) Count++; - if (IsBadStringPtrW(lpmii->dwTypeData, Count)) return FALSE; RtlInitUnicodeString(&MenuText, (PWSTR)lpmii->dwTypeData); mi.dwTypeData = MenuText.Buffer; mi.cch = MenuText.Length / sizeof(WCHAR); @@ -4826,9 +4815,6 @@ && MenuItemInfoW.dwTypeData != NULL) { /* cch is ignored when the content of a menu item is set by calling SetMenuItemInfo. */ - UINT Count = lpmii->cch; - if(!Count) Count++; - if (IsBadStringPtrA(lpmii->dwTypeData, Count )) return FALSE; Status = RtlCreateUnicodeStringFromAsciiz(&UnicodeString, (LPSTR)MenuItemInfoW.dwTypeData); if (!NT_SUCCESS (Status)) @@ -4883,9 +4869,6 @@ (MENU_ITEM_TYPE(MenuItemInfoW.fType) == MF_STRING))) && MenuItemInfoW.dwTypeData != NULL) { - UINT Count = lpmii->cch; - if (!Count) Count++; - if (IsBadStringPtrW(lpmii->dwTypeData, Count)) return FALSE; MenuItemInfoW.cch = strlenW(MenuItemInfoW.dwTypeData); } Result = NtUserMenuItemInfo(hMenu, uItem, fByPosition, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Tue Jul 25 04:50:35 2006 @@ -756,7 +756,7 @@ IntSetMenuItemInfo(PMENU_OBJECT MenuObject, PMENU_ITEM MenuItem, PROSMENUITEMINFO lpmii) { PMENU_OBJECT SubMenuObject; - UINT fTypeMask = (MFT_BITMAP | MFT_MENUBARBREAK | MFT_MENUBREAK | MF_BYPOSITION | MFT_OWNERDRAW | MFT_RADIOCHECK | MFT_RIGHTJUSTIFY | MFT_SEPARATOR | MF_POPUP); + UINT fTypeMask = (MFT_BITMAP | MFT_MENUBARBREAK | MFT_MENUBREAK | MFT_OWNERDRAW | MFT_RADIOCHECK | MFT_RIGHTJUSTIFY | MFT_SEPARATOR | MF_POPUP); if(!MenuItem || !MenuObject || !lpmii) { @@ -805,7 +805,7 @@ SetLastNtError( ERROR_INVALID_PARAMETER); return FALSE; } - MenuItem->fType |= lpmii->fType; + MenuItem->fType |= lpmii->fType; /* Need to save all the flags, this fixed MFT_RIGHTJUSTIFY */ } if(lpmii->fMask & MIIM_BITMAP) { @@ -1058,6 +1058,7 @@ mii.hSubMenu = CurItem->hSubMenu; mii.Rect = CurItem->Rect; mii.XTab = CurItem->XTab; + mii.Text = CurItem->Text.Buffer; Status = MmCopyToCaller(Buf, &mii, sizeof(ROSMENUITEMINFO)); if (! NT_SUCCESS(Status))

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