Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 33756: - Add Russian translation - Fixed parameters functions - Add debug functions - Add stubs for some functions
by dchapyshev＠svn.reactos.org 29 May '08

29 May '08

Author: dchapyshev Date: Thu May 29 09:30:26 2008 New Revision: 33756 URL: http://svn.reactos.org/svn/reactos?rev=33756&view=rev Log: - Add Russian translation - Fixed parameters functions - Add debug functions - Add stubs for some functions Added: trunk/reactos/dll/win32/shimgvw/lang/ru-RU.rc (with props) Modified: trunk/reactos/dll/win32/shimgvw/rsrc.rc trunk/reactos/dll/win32/shimgvw/shimgvw.c trunk/reactos/dll/win32/shimgvw/shimgvw.spec Added: trunk/reactos/dll/win32/shimgvw/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/lang/ru-RU.rc (added) +++ trunk/reactos/dll/win32/shimgvw/lang/ru-RU.rc [iso-8859-1] Thu May 29 09:30:26 2008 @@ -1,0 +1,17 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_APPTITLE "Ïðîãðàììà ïðîñìîòðà èçîáðàæåíèé è ôàêñîâ" + IDS_SETASDESKBG "Óñòàíîâèòü êàê ôîí ðàáî÷åãî ñòîëà" + + /* Tooltips */ + IDS_TOOLTIP_NEXT_PIC "Ñëåäóþùåå èçîáðàæåíèå" + IDS_TOOLTIP_PREV_PIC "Ïðåäûäóùåå èçîáðàæåíèå" + IDS_TOOLTIP_ZOOM_IN "Óâåëè÷èòü (+)" + IDS_TOOLTIP_ZOOM_OUT "Óìåíüøèòü (-)" + IDS_TOOLTIP_ROT_CLOCKW "Ïîâåðíóòü ïî ÷àñîâîé ñòðåëêå (Ctrl+K)" + IDS_TOOLTIP_ROT_COUNCW "Ïîâåðíóòü ïðîòèâ ÷àñîâîé ñòðåëêè (Ctrl+L)" + IDS_TOOLTIP_PRINT "Ïå÷àòü (Ctrl+P)" + IDS_TOOLTIP_SAVEAS "Ñîõðàíèòü êàê... (Ctrl+S)" +END Propchange: trunk/reactos/dll/win32/shimgvw/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shimgvw/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/rsrc.rc?… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/rsrc.rc [iso-8859-1] Thu May 29 09:30:26 2008 @@ -2,3 +2,4 @@ #include "resource.h" #include "lang/en-US.rc" +#include "lang/ru-RU.rc" Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] Thu May 29 09:30:26 2008 @@ -17,6 +17,7 @@ #include <commctrl.h> #include <gdiplus.h> #include <tchar.h> +#include <debug.h> #include "shimgvw.h" @@ -55,12 +56,34 @@ HDC hdc; if (GetFileAttributesW(szOpenFileName) == 0xFFFFFFFF) + { + DPRINT1("File %s not found!\n", szOpenFileName); return; + } hdc = BeginPaint(hwnd, &ps); + if (!hdc) + { + DPRINT1("BeginPaint() failed\n"); + return; + } GdipCreateFromHDC(hdc, &graphics); + if (!graphics) + { + DPRINT1("GdipCreateFromHDC() failed\n"); + DeleteDC(hdc); + return; + } + GdipLoadImageFromFile(szOpenFileName, &image); + if (!image) + { + DPRINT1("GdipLoadImageFromFile() failed\n"); + DeleteDC(hdc); + return; + } + GdipGetImageWidth(image, &uImgWidth); GdipGetImageHeight(image, &uImgHeight); @@ -128,9 +151,7 @@ } } - //TCHAR szBuf[MAX_PATH]; - //wsprintf(szBuf, _T("x = %d\ny = %d\nWidth = %d\nHeight = %d\n\nrect.right = %d\nrect.bottom = %d\n\nuImgWidth = %d\nuImgHeight = %d"), x, y, width, height, rect.right, rect.bottom, uImgWidth, uImgHeight); - //MessageBox(0, szBuf, NULL, MB_OK); + DPRINT1("x = %d\ny = %d\nWidth = %d\nHeight = %d\n\nrect.right = %d\nrect.bottom = %d\n\nuImgWidth = %d\nuImgHeight = %d", x, y, width, height, rect.right, rect.bottom, uImgWidth, uImgHeight); GdipDrawImageRect(graphics, image, x, y, width, height); } @@ -443,39 +464,51 @@ return -1; } -LONG -CALLBACK -ImageView_FullscreenW(HWND hwnd, UINT uMsg, LPARAM lParam1, LPARAM lParam2) -{ - return ImageView_CreateWindow(hwnd, (LPWSTR)lParam1); -} - -LONG -CALLBACK -ImageView_Fullscreen(HWND hwnd, UINT uMsg, LPARAM lParam1, LPARAM lParam2) +VOID +ImageView_FullscreenW(HWND hwnd, HINSTANCE hInst, LPCWSTR path, int nShow) +{ + ImageView_CreateWindow(hwnd, (LPWSTR)path); +} + +VOID +ImageView_Fullscreen(HWND hwnd, HINSTANCE hInst, LPCWSTR path, int nShow) +{ + ImageView_CreateWindow(hwnd, (LPWSTR)path); +} + +VOID +ImageView_FullscreenA(HWND hwnd, HINSTANCE hInst, LPCSTR path, int nShow) { WCHAR szFile[MAX_PATH]; - if (MultiByteToWideChar(CP_ACP, 0, (char*)lParam1, strlen((char*)lParam1)+1, szFile, MAX_PATH)) - { - return ImageView_CreateWindow(hwnd, (LPWSTR)szFile); - } - - return -1; -} - -LONG -CALLBACK -ImageView_FullscreenA(HWND hwnd, UINT uMsg, LPARAM lParam1, LPARAM lParam2) -{ - WCHAR szFile[MAX_PATH]; - - if (MultiByteToWideChar(CP_ACP, 0, (char*)lParam1, strlen((char*)lParam1)+1, szFile, MAX_PATH)) - { - return ImageView_CreateWindow(hwnd, (LPWSTR)szFile); - } - - return -1; + if (MultiByteToWideChar(CP_ACP, 0, (char*)path, strlen((char*)path)+1, szFile, MAX_PATH)) + { + ImageView_CreateWindow(hwnd, (LPWSTR)szFile); + } +} + +VOID +ImageView_PrintTo(HWND hwnd, HINSTANCE hInst, LPCWSTR path, int nShow) +{ + DPRINT("ImageView_PrintTo() not implemented\n"); +} + +VOID +ImageView_PrintToA(HWND hwnd, HINSTANCE hInst, LPCSTR path, int nShow) +{ + DPRINT("ImageView_PrintToA() not implemented\n"); +} + +VOID +ImageView_PrintToW(HWND hwnd, HINSTANCE hInst, LPCWSTR path, int nShow) +{ + DPRINT("ImageView_PrintToW() not implemented\n"); +} + +VOID +imageview_fullscreenW(HWND hwnd, HINSTANCE hInst, LPCWSTR path, int nShow) +{ + DPRINT("ImageView_fullscreenW() not implemented\n"); } BOOL WINAPI Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.spec [iso-8859-1] Thu May 29 09:30:26 2008 @@ -1,11 +1,11 @@ @ stub ImageView_COMServer -@ stdcall ImageView_Fullscreen(ptr long ptr ptr) -@ stdcall ImageView_FullscreenA(ptr long ptr ptr) -@ stdcall ImageView_FullscreenW(ptr long ptr ptr) -@ stub ImageView_PrintTo -@ stub ImageView_PrintToA -@ stub ImageView_PrintToW -@ stub imageview_fullscreenW +@ stdcall ImageView_Fullscreen(ptr ptr wstr long) +@ stdcall ImageView_FullscreenA(ptr ptr str long) +@ stdcall ImageView_FullscreenW(ptr ptr wstr long) +@ stdcall ImageView_PrintTo(ptr ptr wstr long) +@ stdcall ImageView_PrintToA(ptr ptr str long) +@ stdcall ImageView_PrintToW(ptr ptr wstr long) +@ stdcall imageview_fullscreenW(ptr ptr wstr long) @ stub ConvertDIBSECTIONToThumbnail @ stub DllCanUnloadNow @ stub DllGetClassObject

1 0

[dreimer] 33755: Bug 3282: Spanish and Basque translation by Javier Remacha (remialdo@gmail.com) Bug 3284: small slovak translation update by Mario Kacmar (kario@szm.sk) Part 2 of 2
by dreimer＠svn.reactos.org 29 May '08

29 May '08

Author: dreimer Date: Thu May 29 06:40:11 2008 New Revision: 33755 URL: http://svn.reactos.org/svn/reactos?rev=33755&view=rev Log: Bug 3282: Spanish and Basque translation by Javier Remacha (remialdo(a)gmail.com) Bug 3284: small slovak translation update by Mario Kacmar (kario(a)szm.sk) Part 2 of 2 Added: trunk/reactos/base/applications/dxdiag/lang/sk-SK.rc (with props) trunk/reactos/base/applications/games/solitaire/lang/eu-ES.rc (with props) trunk/reactos/base/applications/games/winemine/lang/eu-ES.rc (with props) trunk/reactos/base/applications/notepad/lang/eu-ES.rc (with props) trunk/reactos/base/applications/screensavers/3dtext/lang/eu-ES.rc (with props) trunk/reactos/base/applications/screensavers/logon/lang/eu-ES.rc (with props) trunk/reactos/base/setup/vmwinst/lang/sk-SK.rc (with props) trunk/reactos/base/system/userinit/lang/sk-SK.rc (with props) trunk/reactos/subsystems/win32/csrss/win32csr/lang/sk-SK.rc (with props) Modified: trunk/reactos/base/applications/dxdiag/rsrc.rc trunk/reactos/base/applications/games/solitaire/rsrc.rc trunk/reactos/base/applications/games/winemine/rsrc.rc trunk/reactos/base/applications/notepad/rsrc.rc trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc trunk/reactos/base/applications/screensavers/logon/logon.rc trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/vmwinst/lang/cs-CZ.rc trunk/reactos/base/system/format/lang/sk-SK.rc trunk/reactos/base/system/userinit/rsrc.rc trunk/reactos/dll/cpl/input/lang/es-ES.rc trunk/reactos/dll/cpl/main/lang/es-ES.rc trunk/reactos/dll/shellext/deskadp/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/syssetup/lang/es-ES.rc trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc Added: trunk/reactos/base/applications/dxdiag/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/sk-SK.rc (added) +++ trunk/reactos/base/applications/dxdiag/lang/sk-SK.rc [iso-8859-1] Thu May 29 06:40:11 2008 @@ -1,0 +1,229 @@ +/* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR.: 24-04-2008 + * LAST CHANGE: 25-05-2008 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +IDD_MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 478, 280 +STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | + WS_THICKFRAME +CAPTION "ReactX - diagnostický program" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,474,250 + PUSHBUTTON "&Pomocník", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "Ïalia stra&na", IDC_BUTTON_NEXT, 257, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Uloi vetky informácie...", IDC_BUTTON_SAVE_INFO, 311, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Skonèi", IDC_BUTTON_EXIT, 425, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Tento nástroj hlási detailné informácie o komponentoch a oládaèoch ReactX naintalovaných do systému.", -1, 10, 10, 443, 17 + LTEXT "If you know what area is causing the problem, click the appropiate tab above. Otherwise you can use the ""Next Page"" button below to visit each page in sequence.", -1, 10, 30, 443, 25 + GROUPBOX "Systémové informácie", -1, 10, 55, 443, 130, SS_RIGHT + LTEXT "Aktuálny dátum/èas:", -1, 70, 70, 80, 10, SS_RIGHT + LTEXT "Názov poèítaèa:", -1, 70, 80, 80, 10, SS_RIGHT + LTEXT "Operaèný systém:", -1, 70, 90, 80, 10, SS_RIGHT + LTEXT "Jazyk:", -1, 70, 100, 80, 10, SS_RIGHT + LTEXT "Výrobca systému:", -1, 70, 110, 80, 10, SS_RIGHT + LTEXT "Model systému:", -1, 70, 120, 80, 10, SS_RIGHT + LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT + LTEXT "Procesor:", -1, 70, 140, 80, 10, SS_RIGHT + LTEXT "Pamä:", -1, 70, 150, 80, 10, SS_RIGHT + LTEXT "Stránkovací súbor:", -1, 70, 160, 80, 10, SS_RIGHT + LTEXT "ReactX - versia:", -1, 70, 170, 80, 10, SS_RIGHT + LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT +END + +IDD_DISPLAY_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Zariadenie", -1, 10, 10, 250, 100 + RTEXT "Názov:", -1, 20, 25, 70, 10 + RTEXT "Výrobca:", -1, 20, 35, 70, 10 + RTEXT "Typ èipu:", -1, 20, 45, 70, 10 + RTEXT "Typ D-A konvertora:", -1, 20, 55, 70, 10 + RTEXT "Pribl. celková pamä:", -1, 20, 65, 70, 10 + RTEXT "Súèasný mód obrazovky:", -1, 20, 75, 70, 10 + RTEXT "Monitor:", -1, 20, 85, 70, 10 + LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 10 + + GROUPBOX "Ovládaè", -1, 270, 10, 190, 100 + RTEXT "Hlavný ovládaè:", -1, 275, 25, 55, 10 + RTEXT "Verzia:", -1, 275, 35, 55, 10 + RTEXT "Dátum:", -1, 275, 45, 55, 10 + RTEXT "WHQL-Logo:", -1, 275, 55, 55, 10 + RTEXT "Mini-VDD:", -1, 275, 65, 55, 10 + RTEXT " vvdddVDD:", -1, 275, 75, 55, 10 + RTEXT "Verzia DDI:", -1, 275, 85, 55, 10 + LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 35, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10 + + GROUPBOX "ReactX - funkcie", -1, 10, 115, 450, 60 + RTEXT "DirectDraw urých¾ovanie:", -1, 15, 130, 110, 12 + RTEXT "Direct3D urých¾ovanie:", -1, 15, 145, 110, 12 + RTEXT "AGP urých¾ovanie textúr:", -1, 15, 160, 110, 12 + LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10 + LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10 + LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10 + PUSHBUTTON "Enable", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED + PUSHBUTTON "Enable", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED + PUSHBUTTON "Enable", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED + PUSHBUTTON "Test DirectDraw", IDC_BUTTON_TESTDD, 250, 124, 80, 14 + PUSHBUTTON "Test Direct3D", IDC_BUTTON_TEST3D, 250, 140, 80, 14, WS_DISABLED + + GROUPBOX "Notes", -1, 10, 180, 450, 40 + EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP +END + + +IDD_SOUND_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Zariadenie", -1, 10, 10, 250, 100 + RTEXT "Názov:", -1, 20, 25, 70, 10 + RTEXT "ID zariadenia:", -1, 20, 35, 70, 10 + RTEXT "ID výrobcu:", -1, 20, 45, 70, 10 + RTEXT "ID produktu:", -1, 20, 55, 70, 10 + RTEXT "Typ:", -1, 20, 65, 70, 10 + RTEXT "Predvolené zariadenie:", -1, 20, 75, 70, 10 + LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10 + GROUPBOX "Ovládaè", -1, 270, 10, 190, 100 + RTEXT "Názov:", -1, 275, 25, 55, 10 + RTEXT "Verzia:", -1, 275, 35, 55, 10 + RTEXT "Dátum:", -1, 275, 45, 55, 10 + RTEXT "WHQL-Logo:", -1, 275, 55, 55, 10 + RTEXT "Other Files:", -1, 275, 65, 55, 10 + RTEXT "Provider:", -1, 275, 75, 55, 10 + LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10 + GROUPBOX "ReactX - funkcie", -1, 10, 115, 450, 60 + CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17 + RTEXT "Hardware Sound\nAcceleration Level:", -1, 20, 135, 90, 20 + PUSHBUTTON "Test DirectSound", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14 + GROUPBOX "Notes", -1, 10, 180, 450, 40 + EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP +END + +IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN +END + + +IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Zariadenia DirectInput", -1, 10, 10, 452, 80 + CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 20, 432, 60 + GROUPBOX "Vstupné zariadenia", -1, 10, 100, 452, 60 + CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 110, 432, 40, 0x00000200 + GROUPBOX "Informácie", -1, 10, 170, 452, 50 + EDITTEXT IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP +END + +IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Registered DirectPlay Service Provider", -1, 10, 10, 452, 80 + CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 20, 432, 60 +END + +IDD_HELP_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_MAIN_DIALOG "Diagnostický nástroj ReactX" + IDS_SYSTEM_DIALOG "Systém" + IDS_DISPLAY_DIALOG "Obrazovka" + IDS_SOUND_DIALOG "Zvuk" + IDS_MUSIC_DIALOG "Hudba" + IDS_INPUT_DIALOG "Vstup" + IDS_NETWORK_DIALOG "Sie" + IDS_HELP_DIALOG "Pomocník" + IDS_FORMAT_MB "%I64uMB RAM" + IDS_FORMAT_SWAP "%I64u MB pouité, %I64u MB dostupné" + IDS_FORMAT_UNIPROC "%s (%u procesor)" + IDS_FORMAT_MPPROC "%s (%u procesory)" + IDS_VERSION_UNKNOWN "Neznáma verzia" + IDS_DEVICE_STATUS_ATTACHED "Pripojené" + IDS_DEVICE_STATUS_MISSING "Odpojené" + IDS_DEVICE_STATUS_UNKNOWN "Neznáme" + IDS_DEVICE_NAME "Názov zariadenia" + IDS_DEVICE_STATUS "Stav" + IDS_DEVICE_CONTROLLER "ID radièa" + IDS_DEVICE_MANUFACTURER "ID výrobcu" + IDS_DEVICE_PRODUCT "ID produktu" + IDS_DEVICE_FORCEFEEDBACK "Ovládaè Force Feedback" + IDS_NOT_APPLICABLE "Not applicable" + IDS_OPTION_YES "Áno" + IDS_DIRECTPLAY_COL_NAME1 "Názov" + IDS_DIRECTPLAY_COL_NAME2 "Registry" + IDS_DIRECTPLAY_COL_NAME3 "Súbor" + IDS_DIRECTPLAY_COL_NAME4 "Verzia" + IDS_DIRECTPLAY8_MODEMSP "DirectPlay8-Modem Service Provider" + IDS_DIRECTPLAY8_SERIALSP "DirectPlay8 Serial Service Provider" + IDS_DIRECTPLAY8_IPXSP "DirectPlay8 IPX Service Provider" + IDS_DIRECTPLAY8_TCPSP "DirectPlay8-TCP/IP Service Provider" + IDS_DIRECTPLAY_TCPCONN "Internet TCP/IP Connection For DirectPlay" + IDS_DIRECTPLAY_IPXCONN "IPX Connection For DirectPlay" + IDS_DIRECTPLAY_MODEMCONN "Modem Connection For DirectPlay" + IDS_DIRECTPLAY_SERIALCONN "Serial Connection For DirectPlay" + IDS_REG_SUCCESS "OK" + IDS_REG_FAIL "Chyba" + IDS_DDTEST_ERROR "Test zlyhal!" + IDS_DDTEST_DESCRIPTION "This will start DirecDraw interface test. Continue?" + IDS_DDPRIMARY_DESCRIPTION "This test will use DirectDraw to draw on primary surface. Black and white rectangles should be drawn. Continue?" + IDS_DDPRIMARY_RESULT "Did you see black and white rectangles?" + IDS_DDOFFSCREEN_DESCRIPTION "This test will use DirectDraw to draw in an offscreen buffer. Moving white rectangle should be drawn. Continue?" + IDS_DDOFFSCREEN_RESULT "Did you see white moving reactangle?" + IDS_DDFULLSCREEN_DESCRIPTION "This test will use DirectDraw to draw in a fullscreen mode. Moving white rectangle should be drawn. Continue?" + IDS_DDFULLSCREEN_RESULT "Did you see white moving reactangle in a fullscreen mode?" + IDS_FORMAT_ADAPTER_MEM "%u MB" + IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_OPTION_NO "Nie" +END Propchange: trunk/reactos/base/applications/dxdiag/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/dxdiag/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/r… ============================================================================== --- trunk/reactos/base/applications/dxdiag/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/rsrc.rc [iso-8859-1] Thu May 29 06:40:11 2008 @@ -10,3 +10,4 @@ #include "lang/fr-FR.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" Added: trunk/reactos/base/applications/games/solitaire/lang/eu-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/eu-ES.rc (added) +++ trunk/reactos/base/applications/games/solitaire/lang/eu-ES.rc [iso-8859-1] Thu May 29 06:40:11 2008 @@ -1,0 +1,83 @@ +/* + * PROJECT: Solitaire + * LICENSE: Freeware, permission to use under Public Domain + * FILE: base/applications/games/solitaire/lang/eu-ES.rc + * PURPOSE: Basque Language File for Solitaire + * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) + */ +#include "resource.h" + +LANGUAGE LANG_BASQUE, SUBLANG_NEUTRAL + + +/* Dialogs */ + +IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "Aukerak" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Kartak ", -1, 7, 7, 72, 40 + AUTORADIOBUTTON "Banaka &atera", IDC_OPT_DRAWONE, 14, 19, 59, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Hirunaka &atera", IDC_OPT_DRAWTHREE, 14, 32, 59, 10 + + AUTOCHECKBOX "&Denbora erakutsi", IDC_OPT_SHOWTIME, 7 ,51 ,67 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "&Egoera barra", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + + DEFPUSHBUTTON "Ados", IDOK, 35, 97, 50, 14 + PUSHBUTTON "Utzi", IDCANCEL, 101, 97, 50, 14 +END + +IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +CAPTION "Hautatu karten atzealdea" +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +BEGIN + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 + DEFPUSHBUTTON "Ados", IDOK, 104, 77, 54, 13 + PUSHBUTTON "Utzi", IDCANCEL, 162, 77, 54, 13 +END + + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_SOL_NAME "Solitarioa" + IDS_SOL_ABOUT "Solitarioa J Brown\n\nCardLib-k egina 1.0. bertsioa" + IDS_SOL_QUIT "Uneko jokoa amaitu?" + IDS_SOL_WIN "Zorionak, irabazi duzu!!" +END + + +/* Menus */ + +IDR_MENU1 MENU DISCARDABLE +BEGIN + POPUP "&Jokoa" + BEGIN + MENUITEM "&Banatu\tF2", IDM_GAME_NEW + MENUITEM SEPARATOR + MENUITEM "&Barajak...", IDM_GAME_DECK + MENUITEM "&Aukerak...", IDM_GAME_OPTIONS + MENUITEM SEPARATOR + MENUITEM "&Irten", IDM_GAME_EXIT + END + POPUP "&Laguntza" + BEGIN + MENUITEM "&Edukia\tF1", IDM_HELP_CONTENTS + MENUITEM "&Solitariori buruz", IDM_HELP_ABOUT + END +END + + +/* Accelerator */ + +IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE +BEGIN + VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT + VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT +END Propchange: trunk/reactos/base/applications/games/solitaire/lang/eu-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/games/solitaire/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/rsrc.rc [iso-8859-1] Thu May 29 06:40:11 2008 @@ -12,6 +12,7 @@ #include "lang/el-GR.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" +#include "lang/eu-ES.rc" #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" Added: trunk/reactos/base/applications/games/winemine/lang/eu-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/eu-ES.rc (added) +++ trunk/reactos/base/applications/games/winemine/lang/eu-ES.rc [iso-8859-1] Thu May 29 06:40:11 2008 @@ -1,0 +1,78 @@ + +#include "resource.h" + +LANGUAGE LANG_BASQUE, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_SECONDS, "segunduak" + IDS_NOBODY, "Inor ez" + IDS_ABOUT, "Joshua Thielen eta ReactOS programatzaileek" +END + +IDM_WINEMINE MENU DISCARDABLE +BEGIN + POPUP "&Jokoa" + BEGIN + MENUITEM "&Berria\tF2", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "&Galdera ikurrak jarri", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "&Hasiberria", IDM_BEGINNER + MENUITEM "&Tartekoa", IDM_ADVANCED + MENUITEM "&Aditua", IDM_EXPERT + MENUITEM "&Pertsonalizatu jokoa", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "&Denborarik onenak", IDM_TIMES + MENUITEM SEPARATOR + MENUITEM "&Irten", IDM_EXIT + END + POPUP "&Informazioa" + BEGIN + MENUITEM "&Buscaminas-i buruz", IDM_ABOUT + END +END + +IDD_TIMES DIALOGEX DISCARDABLE 0, 0, 200, 75 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +CAPTION "Denborarik onenak" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Denborarik onenak ", IDNONE, 10, 10, 182, 45 + LTEXT "Hasiberria:", IDNONE, 20, 20, 58, 8 + LTEXT "Tartekoa:", IDNONE, 20, 30, 58, 8 + LTEXT "Aditua:", IDNONE, 20, 40, 58, 8 + LTEXT "", IDC_TIME1, 80, 20, 50, 8 + LTEXT "", IDC_TIME2, 80, 30, 50, 8 + LTEXT "", IDC_TIME3, 80, 40, 50, 8 + LTEXT "", IDC_NAME1, 132, 20, 55, 8 + LTEXT "", IDC_NAME2, 132, 30, 55, 8 + LTEXT "", IDC_NAME3, 132, 40, 55, 8 + DEFPUSHBUTTON "Ados", IDOK, 127, 57, 50, 15 + PUSHBUTTON "&Berrezarri markagailuak", IDRESET, 18, 57, 84, 15 +END + +IDD_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +CAPTION "Zorionak!" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Mesedez, idatzi zure izena", IDIGNORE, 25, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "Ados", IDOK, 60, 40, 40, 15 +END + +IDD_CUSTOM DIALOGEX DISCARDABLE 0, 0, 139, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +CAPTION "Pertsonalizatu jokoa" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Zabalera:", IDNONE, 5, 15, 43, 10 + LTEXT "Altuera:", IDNONE, 5, 35, 43, 10 + LTEXT "Minak:", IDNONE, 5, 55, 43, 10 + EDITTEXT IDC_EDITROWS, 49, 15, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 49, 35, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 49, 55, 30, 12, ES_NUMBER + DEFPUSHBUTTON "Ados", IDOK, 86, 32, 45, 15 + PUSHBUTTON "Utzi", IDCANCEL, 86, 52, 45, 15 +END Propchange: trunk/reactos/base/applications/games/winemine/lang/eu-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/games/winemine/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winemine/rsrc.rc [iso-8859-1] Thu May 29 06:40:11 2008 @@ -22,6 +22,7 @@ #include "lang/el-GR.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" +#include "lang/eu-ES.rc" #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" Added: trunk/reactos/base/applications/notepad/lang/eu-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/eu-ES.rc (added) +++ trunk/reactos/base/applications/notepad/lang/eu-ES.rc [iso-8859-1] Thu May 29 06:40:11 2008 @@ -1,0 +1,183 @@ +LANGUAGE LANG_BASQUE, SUBLANG_NEUTRAL + +ID_ACCEL ACCELERATORS +BEGIN + "^A", CMD_SELECT_ALL + "^C", CMD_COPY + "^F", CMD_SEARCH + "^G", CMD_GOTO + "H", CMD_REPLACE, VIRTKEY, CONTROL + "^O", CMD_OPEN + "^S", CMD_SAVE + "^V", CMD_PASTE + "^X", CMD_CUT + "^Z", CMD_UNDO + VK_F3, CMD_SEARCH_NEXT, VIRTKEY + VK_F5, CMD_TIME_DATE, VIRTKEY +END + +MAIN_MENU MENU +BEGIN + POPUP "&Fitxategia" + BEGIN + MENUITEM "&Berria...", CMD_NEW + MENUITEM "&Ireki\tCtrl+O", CMD_OPEN + MENUITEM "&Gorde\tCtrl+S", CMD_SAVE + MENUITEM "Gorde &honela...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&Imprimatu", CMD_PRINT + MENUITEM "Prestatu &orrialdea...", CMD_PAGE_SETUP + MENUITEM "Inprimatzeko &aurrebista...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&Irten", CMD_EXIT + END + POPUP "&Edizioa" + BEGIN + MENUITEM "&Desegin\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "Ebaki\tCtrl+X", CMD_CUT + MENUITEM "&Kopiatu\tCtrl+C", CMD_COPY + MENUITEM "&Itsasi\tCtrl+V", CMD_PASTE + MENUITEM "&Ezabatu\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&Bilatu\tCtrl+F", CMD_SEARCH + MENUITEM "Bilatu &hurrengoa\tF3", CMD_SEARCH_NEXT + MENUITEM "Ordeztu\tCtrl+H", CMD_REPLACE + MENUITEM "Joan...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "Hautatu dena\tCtrl+A", CMD_SELECT_ALL + MENUITEM "&Ordua eta data\tF5", CMD_TIME_DATE + END + POPUP "Formatua" + BEGIN + MENUITEM "&Lerrokatu", CMD_WRAP + MENUITEM "Letra-tipoa...", CMD_FONT + END + POPUP "&Ikusi" + BEGIN + MENUITEM "Egoera-barra", CMD_STATUSBAR + END + POPUP "Laguntza" + BEGIN + MENUITEM "Í&ndizea", CMD_HELP_CONTENTS + MENUITEM "&Bilatu...", CMD_HELP_SEARCH + MENUITEM "Laguntzari buruz laguntza", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&Ohar-blokari buruz" CMD_ABOUT + MENUITEM "&Informazioa...", CMD_ABOUT_WINE + END +END + +/* Dialog `Page setup' */ + +DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Doitu orria" +BEGIN +LTEXT "&Izenburua:", 0x140, 10, 07, 40, 15 +EDITTEXT 0x141, 60, 05,110, 12, WS_BORDER | WS_TABSTOP +LTEXT "&Oina:", 0x142, 10, 24, 40, 15 +EDITTEXT 0x143, 60, 22,110, 12, WS_BORDER | WS_TABSTOP + +GROUPBOX "&Marjinak:", 0x144, 10, 43,160, 45 +LTEXT "&Ezkerrera:", 0x145, 15, 55, 33, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "Gora:", 0x148, 15, 73, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&Eskuinera:", 0x14B, 95, 55, 33, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "Behera:", 0x14E,95, 73, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP + +DEFPUSHBUTTON "Ados", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "Utzi", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&Laguntza", IDHELP, 180, 39, 40, 15, WS_TABSTOP +END + +/* Dialog `Encoding' */ +DIALOG_ENCODING DIALOGEX 0, 0, 256, 44 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | + WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Kodifikazioa" +BEGIN +COMBOBOX ID_ENCODING,54,0,136,80,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP +LTEXT "Kodifikazioa:",0x155,5,2,41,12 +COMBOBOX ID_EOLN,54,18,136,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +LTEXT "Lerro amaiera:",0x156,5,20,48,12 +END + +/* Dialog 'Go To' */ +DIALOG_GOTO DIALOGEX 0,0,165,50 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Joan lerrora" +BEGIN +EDITTEXT ID_LINENUMBER,60,10,100,12,WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "Lerro zenbakia:",0x155,5,12,54,12,WS_CHILD | WS_TABSTOP | ES_NUMBER +DEFPUSHBUTTON "Ados", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP +PUSHBUTTON "Utzi", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP +END + +IDD_ABOUTBOX DIALOGEX DISCARDABLE 22,16,284,170 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS ohar-blokari buruz" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "ReactOS-en ohar-bloka v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack(a)looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n", + -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39 + CONTROL " ", + -1,"Static",0x50000000,8,48,272,11 + DEFPUSHBUTTON "Itxi",IDOK,114,149,44,15,WS_GROUP + ICON IDI_NPICON,-1,12,9,20,30 + EDITTEXT IDC_LICENSE,8,64,272,81,ES_MULTILINE | + ES_READONLY | WS_VSCROLL +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_LICENSE, "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." +END + +STRINGTABLE DISCARDABLE +BEGIN +STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ +STRING_PAGESETUP_FOOTERVALUE, "Orriak" /* FIXME */ +STRING_PAGESETUP_LEFTVALUE, "20 mm" /* FIXME */ +STRING_PAGESETUP_RIGHTVALUE, "20 mm" /* FIXME */ +STRING_PAGESETUP_TOPVALUE, "25 mm" /* FIXME */ +STRING_PAGESETUP_BOTTOMVALUE, "25 mm" /* FIXME */ + +STRING_NOTEPAD, "Ohar-bloka" +STRING_ERROR, "ERROREA" +STRING_WARNING, "OHARRA" +STRING_INFO, "Informazioa" + +STRING_UNTITLED, "(izenbururik gabe)" + +STRING_ALL_FILES, "Fitxategi guztiak (*.*)" +STRING_TEXT_FILES_TXT, "Testu dokumentuak (*.txt)" + +STRING_TOOLARGE, "'%s' fitxategia handiegia da\ + ohar-blokarentzat.\n Erabili beste editore bat." +STRING_NOTEXT, "Ez duzu ezer idatzi. \nMesedez zerbait idatzi e \ + berriz saiatu" +STRING_DOESNOTEXIST, "'%s'\nFitxategia ez dago\n\n ¿Fitxategi berri bat \ + sortu nahi duzu?" +STRING_NOTSAVED, "'%s'Fitxategiaren testua aldatu egin da\n\n \ + ¿Aldaketak gorde nahi dituzu?" +STRING_NOTFOUND, "Ez da aurkitu '%s'." +STRING_OUT_OF_MEMORY, "Ez dago memoria nahikorik lan hau\ + amaitzeko. \nItxi aplikazio bat edo gehiago \ + memoria librearen \nkopurua handitzeko." +STRING_CANNOTFIND "Ez da '%s' aurkitu" +STRING_ANSI, "ANSI" +STRING_UNICODE, "Unicode" +STRING_UNICODE_BE, "Unicode (big endian)" +STRING_UTF8, "UTF-8" +STRING_CRLF, "Windows" +STRING_LF, "Unix" +STRING_CR, "Mac" + +END Propchange: trunk/reactos/base/applications/notepad/lang/eu-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/notepad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/rsrc.rc [iso-8859-1] Thu May 29 06:40:11 2008 @@ -41,6 +41,7 @@ #include "lang/el-GR.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" +#include "lang/eu-ES.rc" #include "lang/fi-FI.rc" #include "lang/fr-FR.rc" #include "lang/hu-HU.rc" Added: trunk/reactos/base/applications/screensavers/3dtext/lang/eu-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/lang/eu-ES.rc (added) +++ trunk/reactos/base/applications/screensavers/3dtext/lang/eu-ES.rc [iso-8859-1] Thu May 29 06:40:11 2008 @@ -1,0 +1,17 @@ +LANGUAGE LANG_BASQUE, SUBLANG_NEUTRAL + +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Pantaila-babeslearen konfigurazioa Testua 3D-n" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "Ados",IDOK,216,7,50,14 + PUSHBUTTON "Utzi",IDCANCEL,216,24,50,14 + EDITTEXT IDC_MESSAGE_TEXT,18,28,122,14,ES_AUTOHSCROLL + LTEXT "Testu pertsonalizatua",IDC_STATIC,18,17,65,8 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Pantaila-babeslea Testua 3D-n" +END Propchange: trunk/reactos/base/applications/screensavers/3dtext/lang/eu-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc [iso-8859-1] Thu May 29 06:40:11 2008 @@ -15,6 +15,7 @@ #include "lang/el-GR.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" +#include "lang/eu-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" #include "lang/lt-LT.rc" Added: trunk/reactos/base/applications/screensavers/logon/lang/eu-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/lang/eu-ES.rc (added) +++ trunk/reactos/base/applications/screensavers/logon/lang/eu-ES.rc [iso-8859-1] Thu May 29 06:40:11 2008 @@ -1,0 +1,7 @@ +LANGUAGE LANG_BASQUE, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "ReactOS Logotipoa" + IDS_TEXT "Ez dago konfiguratu beharreko aukerarik." +END Propchange: trunk/reactos/base/applications/screensavers/logon/lang/eu-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/screensavers/logon/logon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/logon.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/screensavers/logon/logon.rc [iso-8859-1] Thu May 29 06:40:11 2008 @@ -18,6 +18,7 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" +#include "lang/eu-ES.rc" #include "lang/fr-FR.rc" #include "lang/lt-LT.rc" #include "lang/nl-NL.rc" Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Thu May 29 06:40:11 2008 @@ -1,7 +1,7 @@ /* TRANSLATOR: M rio Kam r /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR: 22-01-2008 * Encoding : Latin II (852) - * LastChange: 24-04-08 + * LastChange: 25-05-08 */ #ifndef LANG_SK_SK_H__ @@ -584,7 +584,7 @@ { 0, 0, - "Vypr zdåujem cache", //Flushing cache (zapisuje sa na disk obsah cache) + "Vypr zdåujem cache", //Flushing cache (zapisuje sa na disk obsah cache, doslovne "Preplachovanie cashe") TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1311,7 +1311,7 @@ }, { //ERROR_DRIVE_INFORMATION - "Setup could not retrieve system drive information.\n", + "Inçtal tor nemohol z¡ska inform cie o systmovìch diskoch.\n", "ENTER = Reçtart po¡taa" }, { @@ -1427,7 +1427,7 @@ }, { //ERROR_CREATE_DIR, - "Setup could not create install directories.", + "Inçtal tor nemohol vytvori inçtalan adres re.", "ENTER = Reçtart po¡taa" }, { @@ -1444,7 +1444,7 @@ }, { //ERROR_CREATE_INSTALL_DIR - "Setup could not create the install directory.", + "Inçtal tor nemohol vytvori inçtalanì adres r.", //could not = nemohol "ENTER = Reçtart po¡taa" }, { @@ -1460,7 +1460,7 @@ }, { //ERROR_ADDING_CODEPAGE, - "Setup failed to add codepage to registry.\n" + "Inçtal tor zlyhal pri prid van¡ k¢dovej str nky do registrov.\n" "ENTER = Reçtart po¡taa" }, { @@ -1470,7 +1470,7 @@ }, { //ERROR_ADDING_KBLAYOUTS, - "Inçtal tor zlyhal pri prid van¡ rozlo§eni¡ kl vesnice do registrov.\n" + "Inçtal tor zlyhal pri prid van¡ rozlo§en¡ kl vesnice do registrov.\n" "ENTER = Reçtart po¡taa" }, { @@ -1625,13 +1625,13 @@ {STRING_IMPORTFILE, " Importujem %S..."}, {STRING_DISPLAYETTINGSUPDATE, - " Updating display registry settings..."}, + " Aktualizujem nastavenia obrazovky v registrov..."}, //display registry settings {STRING_LOCALESETTINGSUPDATE, " Aktualizujem miestne nastavenia..."}, {STRING_KEYBOARDSETTINGSUPDATE, " Aktualizujem nastavenia rozlo§enia kl vesnice..."}, {STRING_CODEPAGEINFOUPDATE, - " Adding codepage information to registry..."}, + " Prid vam do registrov inform cie o k¢dovj str nke..."}, {STRING_DONE, " Hotovo..."}, {STRING_REBOOTCOMPUTER2, @@ -1639,7 +1639,7 @@ {STRING_CONSOLEFAIL1, "Nemo§no otvori konzolu\n\n"}, {STRING_CONSOLEFAIL2, - "The most common cause of this is using an USB keyboard\n"}, + "Najbe§nejçou pr¡inou tohto je pou§itie USB kl vesnice\n"}, {STRING_CONSOLEFAIL3, "USB kl vesnica eçte nie je plne podporovan \n"}, {STRING_FORMATTINGDISK, Modified: trunk/reactos/base/setup/vmwinst/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/cs… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/lang/cs-CZ.rc [iso-8859-1] Thu May 29 06:40:11 2008 @@ -95,6 +95,7 @@ IDS_FAILEDTOSELVGADRIVER "Nepodaøilo se zaktivovat ReactOS VGA ovladaè!" IDS_FAILEDTOSELVBEDRIVER "Nepodaøilo se zaktivovat ReactOS VBE ovladaè!" IDS_UNINSTNOTICE "Podpùrné soubory VMware(r) SVGA ovladaèe nebyly odstranìny.\nSmate je, prosím, po restarování systému." + IDS_FAILEDTOADDREGENTRIES "Failed to create registry entries for the VMware(r) SVGA driver!" END STRINGTABLE Added: trunk/reactos/base/setup/vmwinst/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/sk… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/sk-SK.rc (added) +++ trunk/reactos/base/setup/vmwinst/lang/sk-SK.rc [iso-8859-1] Thu May 29 06:40:11 2008 @@ -1,0 +1,136 @@ +/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR: 16-05-2008 + * THANKS TO : unknown Czech translator + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +IDD_WELCOMEPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Intalácia ovladaèa obrazovky" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Systém ReactOS zistil, e je spustený v prostredí VMware(r).", -1, 100, 8, 160, 24 + LTEXT "Ak chcete naintalova ovládaè VMware(r) SVGA kliknite na 'Ïalej', inak kliknite na 'Zrui'.", -1, 100, 140, 160, 24 +END + +IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Intalácia ovladaèa obrazovky" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Standardní instalace ReactOS neobsahuje VMware(r) SVGA ovladaè.\n\nProto musíte v oknì VMware(r) workstation vybrat nabídku 'VM' a zvolit poloku 'Install VMware tools...'\n\n\nKlepnìte na 'Ïalej' pro pokraèování nebo 'Zrui' pro pøeskoèení instalace SVGA ovladaèe.",-1,25,25,225,85 +END + +IDD_INSTALLING_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Intalácia ovladaèa obrazovky" +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_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Intalácia ovladaèa obrazovky" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Ovládaè obrazovky VMware(r) SVGA bol úspene naintalovaný. Nyní, prosím, vyberte preferované rozliení obrazovky:",-1,25,5,225,20 + PUSHBUTTON "640x480", 1120, 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 "Nyní vyberte preferovanou hloubku barev:", -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_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Intalácia ovladaèa obrazovky" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Nelze nainstalovat VMware(r) SVGA ovladaè.\n\n\nKlepnìte na 'Dokonèi' pro pokraèování v instalaèním procesu.",-1,25,25,225,85 +END + +IDD_CHOOSEACTION DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Intalácia ovladaèa obrazovky" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Ovladaè VMware(r) SVGA je ji nainstalován.\n\nNyní, prosím, zvolte, co chete provést:",-1,25,5,225,30 + PUSHBUTTON "Upravit nastavení obrazovky", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Pouít jiný grafický ovladaè", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Odebrat ovladaè VMware(r) SVGA", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON + LTEXT "Klepnìte na 'Ïalej' pro pokraèování nebo na 'Zrui' pro ukonèení prùvodce.", -1, 25, 93, 225, 19 +END + +IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Intalácia ovladaèa obrazovky" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Vyberte, prosím, grafický ovladaè, který chcete pouít:",-1,25,25,225,15 + PUSHBUTTON "ReactOS VGA ovladaè", IDC_VGA, 25, 40, 225, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "ReactOS VBE ovladaè (SVGA)", IDC_VBE, 25, 55, 225, 15, BS_AUTORADIOBUTTON + LTEXT "Klepnìte na 'Dokonèi' pro dokonèení operace nebo na 'Zrui' pro ukonèení nastavení beze zmìn.", -1, 25, 93, 225, 20 +END + +IDD_DOUNINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Intalácia ovladaèa obrazovky" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Nyní bude odebrán ovladaè VMware(r) SVGA!!!\n\n\nKlepnìte na 'Dokonèi' pro odebrání ovladaèe nebo na 'Zrui' pro ponechání.",-1,25,25,225,85 +END + +STRINGTABLE +BEGIN + IDS_WIZARD_NAME "Detekováno prostøedí VMware(r)" + IDS_FAILEDTOLOCATEDRIVERS "ReactOS nemùe nalézt poadované soubory.\nZkontrolujte, prosím, zda je VMware(r) tools CD-ROM správnì vloeno." + IDS_FAILEDTOCOPYFILES "Nelze zkopírovat poadované soubory.\nZkontrolujte, prosím, zda je VMware(r) tools CD-ROM správnì vloeno.\n" + IDS_FAILEDTOACTIVATEDRIVER "Nepodaøilo se zaktivovat VMware(r) SVGA ovladaè!" + IDS_FAILEDTOSELVGADRIVER "Nepodaøilo se zaktivovat ReactOS VGA ovladaè!" + IDS_FAILEDTOSELVBEDRIVER "Nepodaøilo se zaktivovat ReactOS VBE ovladaè!" + IDS_UNINSTNOTICE "Podpùrné soubory VMware(r) SVGA ovladaèe nebyly odstranìny.\nSmate je, prosím, po restarování systému." + IDS_FAILEDTOADDREGENTRIES "Failed to create registry entries for the VMware(r) SVGA driver!" +END + +STRINGTABLE +BEGIN + 10001 "Najniia (8BPP)" + 10002 "Stredná (16BPP)" + 10003 "Najvyia (32BPP)" +END + +STRINGTABLE +BEGIN + IDS_SEARCHINGFORCDROM "Hledá se VMware(r) Tools CD-ROM..." + IDS_COPYINGFILES "kopírují se soubory..." + IDS_ENABLINGDRIVER "Zavádí se ovladaè VMware(r) SVGA..." +END + +STRINGTABLE +BEGIN + IDD_INSERT_VMWARE_TOOLSTITLE "Prùvodce instalací VMware (r) SVGA ovladaèe" + IDD_INSERT_VMWARE_TOOLSSUBTITLE "Vlote, prosím, VMware(r) tools CD-ROM." + IDD_INSTALLING_VMWARE_TOOLSTITLE "Prùvodce instalací VMware (r) SVGA ovladaèe" + IDD_INSTALLING_VMWARE_TOOLSSUBTITLE "Vyhledání a kopírování VMware (r) SVGA ovladaèe." + IDD_CONFIGTITLE "Prùvodce instalací VMware (r) SVGA ovladaèe" + IDD_CONFIGSUBTITLE "Vyberte, prosím, preferované rozliení obrazovky:" + IDD_INSTALLATION_FAILEDTITLE "Prùvodce instalací VMware (r) SVGA ovladaèe" + IDD_INSTALLATION_FAILEDSUBTITLE "Instalace ovladaèe VMware (r) SVGA selhala." + IDD_CHOOSEACTIONTITLE "Prùvodce instalací VMware (r) SVGA ovladaèe" + IDD_CHOOSEACTIONSUBTITLE "Zvolte, prosím, co chete provést." + IDD_SELECTDRIVERTITLE "Prùvodce instalací VMware (r) SVGA ovladaèe" + IDD_SELECTDRIVERSUBTITLE "Vyberte ovládaè." + IDD_DOUNINSTALLTITLE "Prùvodce instalací VMware (r) SVGA ovladaèe" + IDD_DOUNINSTALLSUBTITLE "Odstranìní ovladaèe." +END Propchange: trunk/reactos/base/setup/vmwinst/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/format/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/sk… ============================================================================== --- trunk/reactos/base/system/format/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/format/lang/sk-SK.rc [iso-8859-1] Thu May 29 06:40:11 2008 @@ -32,11 +32,11 @@ STRING_UNKNOW_ARG "Neznámy argument: %S\n" -STRING_DRIVE_PARM "Required drive parameter is missing.\n\n" +STRING_DRIVE_PARM "Chýba nevyhnutný parameter jednotky.\n\n" STRING_ERROR_DRIVE_TYPE "Could not get drive type" -STRING_INSERT_DISK "Insert a new floppy in drive %C:\nand press Enter when ready..." +STRING_INSERT_DISK "Vlote novú disketu do jednotky %C:\na potom stlaète ENTER..." STRING_NO_VOLUME "Could not query volume" @@ -44,30 +44,30 @@ STRING_FILESYSTEM "Typ systému súborov je %S.\n" -STRING_LABEL_NAME_EDIT "Enter current volume label for drive %C: " +STRING_LABEL_NAME_EDIT "Vlote súèasnú menovku zväzku pre jednotku %C: " STRING_ERROR_LABEL "Bola zadaná nesprávna menovka zväzku pre túto jednotku.\n" STRING_YN_FORMAT "\nWARNING, ALL DATA ON NON_REMOVABLE DISK\n\ -DRIVE %C: WILL BE LOST!\nProceed with Format (Y/N)? " +DRIVE %C: WILL BE LOST!\nProceed with Format (A/N)? " -STRING_YES_NO_FAQ "YN" +STRING_YES_NO_FAQ "AN" STRING_VERIFYING "Overovanie" STRING_FAST_FMT "Rýchle formátovanie" -STRING_CREATE_FSYS "Creating file system structures.\n" +STRING_CREATE_FSYS "Vytváram truktúru súborového systému.\n" STRING_FMT_COMPLETE "Formátovanie dokonèené.\n" -STRING_VOL_COMPRESS "Volume does not support compression.\n" +STRING_VOL_COMPRESS "Zväzok nepodporuje kompresiu.\n" STRING_ENTER_LABEL "Menovka zväzku (11 znakov, ak nechcete zada tak iba Enter)? " -STRING_NO_LABEL "Could not label volume" +STRING_NO_LABEL "Zväzok sa nedá pomenova" -STRING_FREE_SPACE "\n%I64d bytes total disk space.\n%I64d bytes available on disk.\n" +STRING_FREE_SPACE "\nCelkové diskové miesto: %I64d bajtov.\nDostupné miesto na disku: %I64d bajtov.\n" STRING_SERIAL_NUMBER "\nSériové èíslo zväzku je %04X-%04X\n" END Added: trunk/reactos/base/system/userinit/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/sk-SK.rc (added) +++ trunk/reactos/base/system/userinit/lang/sk-SK.rc [iso-8859-1] Thu May 29 06:40:11 2008 @@ -1,0 +1,13 @@ +#include "resource.h" +/* Start move all hard code string to En.rc + * By Magnus Olsen 2005 + * Translated by Kario 2008 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +BEGIN + +STRING_USERINIT_FAIL, "Userinit zlyhal pri spúaní shellu!\n" + +END Propchange: trunk/reactos/base/system/userinit/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/userinit/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/rsrc.… ============================================================================== --- trunk/reactos/base/system/userinit/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/rsrc.rc [iso-8859-1] Thu May 29 06:40:11 2008 @@ -20,6 +20,7 @@ #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" #include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" #include "lang/sv-SE.rc" #include "lang/th-TH.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/dll/cpl/input/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/es-ES.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/es-ES.rc [iso-8859-1] Thu May 29 06:40:11 2008 @@ -52,22 +52,22 @@ IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 230, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Change Key Sequence" +CAPTION "Cambiar secuencia de teclas" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "", -1, 9, 5, 155, 110 - AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CB, 15, 15, 105, 12 - LTEXT "Shift", -1, 73, 37, 27, 12 + AUTOCHECKBOX "Ca&mbiar el idioma del dispositivo de entrada", IDC_SWITCH_INPUT_LANG_CB, 15, 15, 120, 12 + LTEXT "Mayús", -1, 73, 37, 27, 12 CTEXT "+", -1, 62, 37, 8, 9 AUTORADIOBUTTON "&Ctrl", IDC_CTRL_LANG, 29, 31, 30, 11 - AUTORADIOBUTTON "Left &ALT", IDC_LEFT_ALT_LANG, 29, 45, 46, 12 - AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KBLAYOUTS_CB, 16, 65, 141, 12 - LTEXT "Shift", -1, 74, 87, 27, 12 + AUTORADIOBUTTON "&ALT Izq", IDC_LEFT_ALT_LANG, 29, 45, 46, 12 + AUTOCHECKBOX "Camb&iar la distribución del teclado", IDC_SWITCH_KBLAYOUTS_CB, 16, 65, 141, 12 + LTEXT "Mayús", -1, 74, 87, 27, 12 CTEXT "+", -1, 63, 87, 8, 9 AUTORADIOBUTTON "C&trl", IDC_CTRL_LAYOUT, 30, 81, 30, 11 - AUTORADIOBUTTON "Left A&LT", IDC_LEFT_ALT_LAYOUT, 30, 95, 44, 12 - DEFPUSHBUTTON "OK", IDOK, 172, 9, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 172, 27, 50, 14 + AUTORADIOBUTTON "ALT I&zq", IDC_LEFT_ALT_LAYOUT, 30, 95, 44, 12 + DEFPUSHBUTTON "Aceptar", IDOK, 172, 9, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 172, 27, 50, 14 END IDD_INPUT_LANG_PROP DIALOGEX 20, 20, 227, 75 @@ -96,11 +96,11 @@ IDS_LAYOUT "Distribución del teclado" IDS_REM_QUESTION "¿Quiere eliminar la distribución del teclado seleccionada?" IDS_CONFIRMATION "Confirmación" - IDS_LAYOUT_EXISTS "This layout already exists." - IDS_LAYOUT_EXISTS2 "This layout already exists and can not be added." - IDS_CTRL_SHIFT "Ctrl+Shift" - IDS_LEFT_ALT_SHIFT "Left Alt+Shift" - IDS_SWITCH_BET_INLANG "Switch between input languages" + IDS_LAYOUT_EXISTS "Esta distribución y existe." + IDS_LAYOUT_EXISTS2 "Esta distribución y existe y no puede ser añadida." + IDS_CTRL_SHIFT "Ctrl+Mayús" + IDS_LEFT_ALT_SHIFT "lt Izq+Mayús" + IDS_SWITCH_BET_INLANG "Cambiar entre los idiomas de entrada" END STRINGTABLE Modified: trunk/reactos/dll/cpl/main/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/es-ES.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/lang/es-ES.rc [iso-8859-1] Thu May 29 06:40:11 2008 @@ -18,9 +18,9 @@ CONTROL "",IDC_SLIDER_REPEAT_RATE, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 75, 130, 17 LTEXT "&Haga clic aquí y mantenga presionada una tecla para probar la velocidad de repetición:", -1, 15, 94, 180, 14 EDITTEXT IDC_EDIT_REPEAT_RATE, 15, 115, 200, 15, WS_CHILD | WS_VISIBLE | WS_GROUP - GROUPBOX "&Velocidad de intermitencia del cursor: ", -1, 5, 145, 230, 50 + GROUPBOX "&Velocidad de intermitencia del cursor ", -1, 5, 145, 230, 50 LTEXT "", IDC_TEXT_CURSOR_BLINK, 20, 165, 1, 8 - LTEXT "Ninguna", -1, 40, 165, 31, 10 + LTEXT "Ninguna", -1, 39, 165, 31, 10 LTEXT "Rápida", -1, 200, 165, 30, 10 CONTROL "",IDC_SLIDER_CURSOR_BLINK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 165, 130, 17 END @@ -57,7 +57,7 @@ LTEXT "Activar esta casilla de verificación para asignar al botón de la derecha del ratón las funciones principales, tales como seleccionar y arrastrar", -1, 10, 30, 150, 30 GROUPBOX "Velocidad de doble clic ", -1, 5, 75, 230, 70 LTEXT "Haga Doble clic en la carpeta para probar su configuración. Si la carpeta no se abre o cierra, intente utilizar una configuración más lenta.", -1, 10, 85, 150, 30 - LTEXT "&Velocidad: Lenta", -1, 10, 120, 91, 8 + LTEXT "&Velocidad: Lenta", -1, 10, 120, 91, 8 LTEXT "Rápida", -1, 137, 120, 30, 8 CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 120, 70, 17 CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE @@ -89,7 +89,7 @@ CAPTION "Guardar combinación" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Guardar esta combinación de cursores como:", -1, 5, 5, 140, 10 + LTEXT "Guardar esta combinación de cursores como:", -1, 5, 5, 150, 10 EDITTEXT IDC_EDIT_SCHEME_NAME, 5, 15, 180, 15, WS_CHILD | WS_VISIBLE | WS_GROUP PUSHBUTTON "&Aceptar", IDOK, 60, 45, 50, 15 PUSHBUTTON "&Cancelar", IDCANCEL, 115, 45, 50, 15 Modified: trunk/reactos/dll/shellext/deskadp/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/lang/es-ES.rc [iso-8859-1] Thu May 29 06:40:11 2008 @@ -14,15 +14,15 @@ PUSHBUTTON "&Propiedades", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Información del adaptador ", -1, 7, 56, 237, 75 LTEXT "Tipo de Chip:", -1, 13, 68, 58, 8 - LTEXT "", IDC_CHIPTYPE, 82, 68, 160, 8, SS_NOPREFIX + LTEXT "", IDC_CHIPTYPE, 90, 68, 160, 8, SS_NOPREFIX LTEXT "Tipo de DAC:", -1, 13, 80, 58, 8 - LTEXT "", IDC_DACTYPE, 82, 80, 160, 8, SS_NOPREFIX + LTEXT "", IDC_DACTYPE, 90, 80, 160, 8, SS_NOPREFIX LTEXT "Tamaño de memoria:", -1, 13, 92, 70, 8 - LTEXT "", IDC_MEMORYSIZE, 82, 92, 160, 8, SS_NOPREFIX + LTEXT "", IDC_MEMORYSIZE, 90, 92, 160, 8, SS_NOPREFIX LTEXT "Nombre del adaptador:", -1, 13, 104, 80, 8 - LTEXT "", IDC_ADAPTERSTRING, 82, 104, 160, 8, SS_NOPREFIX + LTEXT "", IDC_ADAPTERSTRING, 90, 104, 160, 8, SS_NOPREFIX LTEXT "Información del BIOS:", -1, 13, 116, 80, 8 - LTEXT "", IDC_BIOSINFORMATION, 82, 116, 160, 8, SS_NOPREFIX + LTEXT "", IDC_BIOSINFORMATION, 90, 116, 160, 8, SS_NOPREFIX PUSHBUTTON "&Listar todos los modos...", IDC_LISTALLMODES, 7, 139, 85, 14 END @@ -51,3 +51,4 @@ END + Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Thu May 29 06:40:11 2008 @@ -177,15 +177,15 @@ EDITTEXT 14009, 79, 75, 150, 14, ES_AUTOHSCROLL LTEXT "I&niciar en:", 14010, 8, 96, 57, 10 EDITTEXT 14011, 79, 94, 150, 14, ES_AUTOHSCROLL - LTEXT "&Tecla de método abreviado:", 14014, 8, 111, 57, 11 + LTEXT "&Tecla de método abreviado:", 14014, 8, 111, 57, 14 EDITTEXT 14015, 79, 112, 150, 14, ES_LEFT LTEXT "&Ejecutar:", 14016, 8, 134, 57, 10 EDITTEXT 14017, 79, 131, 150, 14, ES_AUTOHSCROLL LTEXT "C&omentario:", 14018, 8, 152, 57, 10 EDITTEXT 14019, 79, 149, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Buscar destino...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "Cambiar &icono...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "Propiedades avan&zadas...", 14022, 149, 172, 80, 14, ES_LEFT + PUSHBUTTON "&Buscar destino...", 14020, 9, 172, 62, 14, ES_LEFT + PUSHBUTTON "Cambiar &icono...", 14021, 76, 172, 62, 14, ES_LEFT + PUSHBUTTON "Propiedades avan&zadas...", 14022, 144, 172, 85, 14, ES_LEFT END SHELL_EXTENDED_SHORTCUT_DLG DIALOGEX 0, 0, 230, 150 @@ -193,7 +193,7 @@ CAPTION "Propiedades avanzadas" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Elija las propiedades avanzadas que desee para este acceso directo.", -1, 5, 30, 210, 10 + LTEXT "Elija las propiedades avanzadas que desee para este acceso directo.", -1, 5, 25, 210, 14 CHECKBOX "Ejecutar con credenciales diferentes", 14000, 25, 50, 150, 10 LTEXT "Esta opción puede permitirle ejecutar este acceso directo como otro usuario, o continuar como usted mismo mientras protege su equipo y datos de una actividad de programa no autorizada.", -1, 50, 60, 175, 40 CHECKBOX "Ejecutar en otro espacio de memoria", 14001, 25, 100, 90, 10, WS_DISABLED Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/es… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] Thu May 29 06:40:11 2008 @@ -141,8 +141,8 @@ CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Registrando componentes", IDC_STATIC, 53, 7, 253, 20 - LTEXT "", IDC_STATIC, 53, 29, 253, 20 + 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 @@ -156,6 +156,7 @@ LTEXT "El asistente de Instalación de ReactOS ha terminado", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "Usted ha finalizado con éxito la instalación de ReactOS.\n\n" \ "Cuando pulse Terminar, su equipo será reiniciado.", 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 "Si hay un CD en su lector, quítelo. Luego, reinicie su equipo "\ "pulsando Terminar.", IDC_STATIC, 115, 169, 195, 17 END Added: trunk/reactos/subsystems/win32/csrss/win32csr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/sk-SK.rc (added) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/sk-SK.rc [iso-8859-1] Thu May 29 06:40:11 2008 @@ -1,0 +1,52 @@ +/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR: 29-05-2008 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +IDD_END_NOW DIALOGEX DISCARDABLE 0, 0, 200, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ukonèenie programu - " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ukonèujem program... Poèkajte, prosím.",IDC_STATIC,7,7,186,11 + CONTROL "Progress",IDC_PROGRESS,"msctls_progress32",WS_BORDER, + 7,20,186,13 + LTEXT "Ak zvolíte okamité ukonèenie programu, stratíte vetky neuloené údaje. Ak chcete program ukonèi okamite, kliknite na tlaèidlo Ukonèi ihneï.", + IDC_STATIC,7,40,186,26 + DEFPUSHBUTTON "&Ukonèi ihneï",IDC_END_NOW,150,71,43,17 +END + +IDD_NOT_RESPONDING DIALOGEX DISCARDABLE 0, 0, 192, 122 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ukonèenie programu - " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Zrui",IDCANCEL,142,98,43,17 + PUSHBUTTON "&Ukonèi ihneï",IDC_END_NOW,78,98,43,17 + LTEXT "Tento program neodpovedá.",IDC_STATIC,7,7,178,8 + LTEXT "Pre návrat do systému ReactOS a overenie stavu programu kliknite na tlaèidlo Zrui.", + IDC_STATIC,7,26,178,16 + LTEXT "Ak zvolíte okamité ukonèenie programu, stratíte vetky neuloené údaje. Ak chcete program ukonèi okamite, kliknite na tlaèidlo Ukonèi ihneï.", + IDC_STATIC,7,53,178,26 +END + +STRINGTABLE +BEGIN + IDS_EDIT "Upravi" + IDS_MARK "Oznaèi" + IDS_COPY "Kopírova\tEnter" + IDS_PASTE "Vloi" + IDS_SELECTALL "Vybra vetko" + IDS_SCROLL "Rolova" + IDS_FIND "Nájs..." //Find + IDS_DEFAULTS "Predvolené" //Defaults + IDS_PROPERTIES "Vlastnosti" + IDS_SCROLLHERE "Rolova sem" + IDS_SCROLLTOP "K hornému okraju" + IDS_SCROLLBOTTOM "K dolnému okraju" + IDS_SCROLLPAGE_UP "O stránku vyie" + IDS_SCROLLPAGE_DOWN "O stránku niie" + IDS_SCROLLUP "Rolova nahor" + IDS_SCROLLDOWN "Rolova nadol" +END Propchange: trunk/reactos/subsystems/win32/csrss/win32csr/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc [iso-8859-1] Thu May 29 06:40:11 2008 @@ -15,4 +15,5 @@ #include "lang/it-IT.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" #include "lang/uk-UA.rc"

1 0

[dreimer] 33754: Bug 3282: Spanish and Basque translation by Javier Remacha (remialdo@gmail.com) Bug 3284: small slovak translation update by Mario Kacmar (kario@szm.sk) Part 1 of 2
by dreimer＠svn.reactos.org 29 May '08

29 May '08

Author: dreimer Date: Thu May 29 06:36:08 2008 New Revision: 33754 URL: http://svn.reactos.org/svn/reactos?rev=33754&view=rev Log: Bug 3282: Spanish and Basque translation by Javier Remacha (remialdo(a)gmail.com) Bug 3284: small slovak translation update by Mario Kacmar (kario(a)szm.sk) Part 1 of 2 Added: trunk/rosapps/fontview/lang/sk-SK.rc (with props) Modified: trunk/rosapps/fontview/fontview.rc Modified: trunk/rosapps/fontview/fontview.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/fontview.rc?rev=3… ============================================================================== --- trunk/rosapps/fontview/fontview.rc [iso-8859-1] (original) +++ trunk/rosapps/fontview/fontview.rc [iso-8859-1] Thu May 29 06:36:08 2008 @@ -19,4 +19,5 @@ #include "lang/lt-LT.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" #include "lang/uk-UA.rc" Added: trunk/rosapps/fontview/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/lang/sk-SK.rc?rev… ============================================================================== --- trunk/rosapps/fontview/lang/sk-SK.rc (added) +++ trunk/rosapps/fontview/lang/sk-SK.rc [iso-8859-1] Thu May 29 06:36:08 2008 @@ -1,0 +1,18 @@ +/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR: 31-07-2007 + * UPDATED : 28-05-2008 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_QUIT, "Hotovo" + IDS_PRINT, "Tlaèi" + IDS_STRING, "Kàde¾ ïat¾ov uèí koòa ra kôru. 1234567890" + IDS_ERROR, "Chyba" + IDS_ERROR_NOMEM, "Na vykonanie tejto operácie nie je dostatok vo¾nej pamäte." + IDS_ERROR_NOFONT, "Poadovaný súbor %1 nie je platným súborom písiem." + IDS_ERROR_NOCLASS, "Nepodarilo sa inicializova triedu window." + IDS_ERROR_BADCMD, "Nebol zadaný iadny súbor písiem.\nPouitie:\n fontview.exe <súbor písiem>" +END Propchange: trunk/rosapps/fontview/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 33753: sorry forgot this one
by tkreuzer＠svn.reactos.org 29 May '08

29 May '08

Author: tkreuzer Date: Wed May 28 20:30:33 2008 New Revision: 33753 URL: http://svn.reactos.org/svn/reactos?rev=33753&view=rev Log: sorry forgot this one Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Wed May 28 20:30:33 2008 @@ -443,10 +443,67 @@ return 0; } +XLATEOBJ* +FASTCALL +IntCreateXlateForBlt(PDC pDCDest, PDC pDCSrc, BITMAPOBJ* pDestSurf, BITMAPOBJ* pSrcSurf) +{ + XLATEOBJ *XlateObj; + HPALETTE DestPalette, SourcePalette; + PDC_ATTR pDc_Attr; + + DPRINT("Enter IntCreateXlateFromDCs\n"); + + if (pDestSurf == pSrcSurf) + { + return NULL; + } + + DestPalette = pDestSurf->hDIBPalette; + if (!DestPalette) DestPalette = PrimarySurface.DevInfo.hpalDefault; + + SourcePalette = pSrcSurf->hDIBPalette; + if (!SourcePalette) SourcePalette = PrimarySurface.DevInfo.hpalDefault; + + DPRINT("DestPalette = %p, SourcePalette = %p, DefaultPatelle = %p\n", DestPalette, SourcePalette, NtGdiGetStockObject((INT)DEFAULT_PALETTE)); + + /* KB41464 details how to convert between mono and color */ + if (pDestSurf->SurfObj.iBitmapFormat == BMF_1BPP) + { + if (pSrcSurf->SurfObj.iBitmapFormat == BMF_1BPP) + { + XlateObj = NULL; + } + else + { + pDc_Attr = pDCSrc->pDc_Attr; + if (!pDc_Attr) pDc_Attr = &pDCSrc->Dc_Attr; + XlateObj = IntEngCreateMonoXlate(0, DestPalette, SourcePalette, pDc_Attr->crBackgroundClr); + } + } + else + { + if (pSrcSurf->SurfObj.iBitmapFormat == BMF_1BPP) + { + pDc_Attr = pDCDest->pDc_Attr; + if (!pDc_Attr) pDc_Attr = &pDCDest->Dc_Attr; + XlateObj = IntEngCreateSrcMonoXlate(DestPalette, pDc_Attr->crBackgroundClr, pDc_Attr->crForegroundClr); + } + else + { + XlateObj = IntEngCreateXlate(0, 0, DestPalette, SourcePalette); + } + if (!XlateObj) + { + return (XLATEOBJ*)-1; + } + } + return XlateObj; +} + /* PUBLIC FUNCTIONS ***********************************************************/ /* - * @implemented + * @implemented /// this is not a public function! */ VOID FASTCALL EngDeleteXlate(XLATEOBJ *XlateObj)

1 0

[tkreuzer] 33752: fix palette implementation: use the surface's palette to crate the xlate objects, default to the device default palette. The dc palette defaults to stock object default palette. Implement IntCreateXlateForBlt, used in BitBlt etc functions to perform the needed operations to create the xlate object instead of duplicating the code. This allows for global thermonuclear solitaire again and hopefully doesn't break everything else ; -)
by tkreuzer＠svn.reactos.org 29 May '08

29 May '08

Author: tkreuzer Date: Wed May 28 20:17:50 2008 New Revision: 33752 URL: http://svn.reactos.org/svn/reactos?rev=33752&view=rev Log: fix palette implementation: use the surface's palette to crate the xlate objects, default to the device default palette. The dc palette defaults to stock object default palette. Implement IntCreateXlateForBlt, used in BitBlt etc functions to perform the needed operations to create the xlate object instead of duplicating the code. This allows for global thermonuclear solitaire again and hopefully doesn't break everything else ;-) Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/include/intgdi.h trunk/reactos/subsystems/win32/win32k/objects/bitblt.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/brush.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Wed May 28 20:17:50 2008 @@ -311,5 +311,6 @@ HDC FASTCALL IntGdiCreateDisplayDC(HDEV hDev, ULONG DcType, BOOL EmptyDC); BOOL FASTCALL IntGdiCleanDC(HDC hDC); +extern GDIDEVICE PrimarySurface; #endif /* not __WIN32K_DC_H */ Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intgdi.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/intgdi.h [iso-8859-1] Wed May 28 20:17:50 2008 @@ -7,6 +7,10 @@ XLATEOBJ* FASTCALL IntGdiCreateBrushXlate(PDC Dc, GDIBRUSHOBJ *BrushObj, BOOLEAN *Failed); + +XLATEOBJ* +FASTCALL +IntCreateXlateForBlt(PDC pDCDest, PDC pDCSrc, BITMAPOBJ* pDestSurf, BITMAPOBJ* pSrcSurf); VOID FASTCALL IntGdiInitBrushInstance(GDIBRUSHINST *BrushInst, PGDIBRUSHOBJ BrushObj, XLATEOBJ *XlateObj); Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Wed May 28 20:17:50 2008 @@ -42,13 +42,11 @@ { PDC DCDest = NULL; PDC DCSrc = NULL; - PDC_ATTR Dc_Attr = NULL; BITMAPOBJ *BitmapDest, *BitmapSrc; RECTL DestRect, SourceRect; BOOL Status; XLATEOBJ *XlateObj; BLENDOBJ BlendObj; - HPALETTE SourcePalette = 0, DestPalette = 0; BlendObj.BlendFunction = BlendFunc; DCDest = DC_LockDc(hDCDest); @@ -87,9 +85,6 @@ { DCSrc = DCDest; } - - Dc_Attr = DCSrc->pDc_Attr; - if (!Dc_Attr) Dc_Attr = &DCSrc->Dc_Attr; /* Offset the destination and source by the origin of their DCs. */ XOriginDest += DCDest->w.DCOrgX; @@ -109,53 +104,43 @@ /* Determine surfaces to be used in the bitblt */ BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap); + if (!BitmapDest) + { + DC_UnlockDc(DCSrc); + DC_UnlockDc(DCDest); + return FALSE; + } if (DCSrc->w.hBitmap == DCDest->w.hBitmap) BitmapSrc = BitmapDest; else + { BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap); + if (!BitmapDest) + { + BITMAPOBJ_UnlockBitmap(BitmapDest); + DC_UnlockDc(DCSrc); + DC_UnlockDc(DCDest); + return FALSE; + } + } /* Create the XLATEOBJ. */ - if (DCDest->DcLevel.hpal != 0) - DestPalette = DCDest->DcLevel.hpal; - if (DCSrc->DcLevel.hpal != 0) - SourcePalette = DCSrc->DcLevel.hpal; - - /* KB41464 details how to convert between mono and color */ - if (DCDest->w.bitsPerPixel == 1 && DCSrc->w.bitsPerPixel == 1) - { + XlateObj = IntCreateXlateForBlt(DCDest, DCSrc, BitmapDest, BitmapSrc); + + if (XlateObj == (XLATEOBJ*)-1) + { + DPRINT1("error!!!\n"); + SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); XlateObj = NULL; + Status = FALSE; } else { - if (DCDest->w.bitsPerPixel == 1) - { - XlateObj = IntEngCreateMonoXlate(0, DestPalette, SourcePalette, Dc_Attr->crBackgroundClr); - } - else if (DCSrc->w.bitsPerPixel == 1) - { - XlateObj = IntEngCreateSrcMonoXlate(DestPalette, Dc_Attr->crBackgroundClr, Dc_Attr->crForegroundClr); - } - else - { - XlateObj = IntEngCreateXlate(0, 0, DestPalette, SourcePalette); - } - if (NULL == XlateObj) - { - BITMAPOBJ_UnlockBitmap(BitmapDest); - if (BitmapSrc != BitmapDest) - BITMAPOBJ_UnlockBitmap(BitmapSrc); - DC_UnlockDc(DCDest); - if (hDCSrc != hDCDest) - DC_UnlockDc(DCSrc); - SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); - return FALSE; - } - } - - /* Perform the alpha blend operation */ - Status = IntEngAlphaBlend(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, - DCDest->CombinedClip, XlateObj, - &DestRect, &SourceRect, &BlendObj); + /* Perform the alpha blend operation */ + Status = IntEngAlphaBlend(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, + DCDest->CombinedClip, XlateObj, + &DestRect, &SourceRect, &BlendObj); + } if (XlateObj != NULL) EngDeleteXlate(XlateObj); @@ -186,14 +171,13 @@ { PDC DCDest = NULL; PDC DCSrc = NULL; - PDC_ATTR Dc_Attr = NULL; - BITMAPOBJ *BitmapDest, *BitmapSrc; + PDC_ATTR Dc_Attr = NULL; + BITMAPOBJ *BitmapDest, *BitmapSrc = NULL; RECTL DestRect; POINTL SourcePoint, BrushOrigin; - BOOL Status; + BOOL Status = FALSE; XLATEOBJ *XlateObj = NULL; - HPALETTE SourcePalette = 0, DestPalette = 0; - PGDIBRUSHOBJ BrushObj; + PGDIBRUSHOBJ BrushObj = NULL; GDIBRUSHINST BrushInst; BOOL UsesSource = ROP3_USES_SOURCE(ROP); BOOL UsesPattern = ROP3_USES_PATTERN(ROP); @@ -240,8 +224,8 @@ DCSrc = NULL; } - Dc_Attr = DCDest->pDc_Attr; - if (!Dc_Attr) Dc_Attr = &DCDest->Dc_Attr; + Dc_Attr = DCDest->pDc_Attr; + if (!Dc_Attr) Dc_Attr = &DCDest->Dc_Attr; /* Offset the destination and source by the origin of their DCs. */ XDest += DCDest->w.DCOrgX; @@ -267,12 +251,19 @@ /* Determine surfaces to be used in the bitblt */ BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap); + if (!BitmapDest) + goto cleanup; + if (UsesSource) { if (DCSrc->w.hBitmap == DCDest->w.hBitmap) BitmapSrc = BitmapDest; else + { BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap); + if (!BitmapSrc) + goto cleanup; + } } else { @@ -284,21 +275,8 @@ BrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush); if (NULL == BrushObj) { - if (UsesSource && hDCSrc != hDCDest) - { - DC_UnlockDc(DCSrc); - } - if(BitmapDest != NULL) - { - BITMAPOBJ_UnlockBitmap(BitmapDest); - } - if(BitmapSrc != NULL && BitmapSrc != BitmapDest) - { - BITMAPOBJ_UnlockBitmap(BitmapSrc); - } - DC_UnlockDc(DCDest); SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; + goto cleanup; } BrushOrigin = *((PPOINTL)&BrushObj->ptOrigin); IntGdiInitBrushInstance(&BrushInst, BrushObj, DCDest->XlateBrush); @@ -311,55 +289,14 @@ /* Create the XLATEOBJ. */ if (UsesSource) { - if (DCDest->DcLevel.hpal != 0) - DestPalette = DCDest->DcLevel.hpal; - - if (DCSrc->DcLevel.hpal != 0) - SourcePalette = DCSrc->DcLevel.hpal; - - /* KB41464 details how to convert between mono and color */ - if (DCDest->w.bitsPerPixel == 1 && DCSrc->w.bitsPerPixel == 1) - { + XlateObj = IntCreateXlateForBlt(DCDest, DCSrc, BitmapDest, BitmapSrc); + + if (XlateObj == (XLATEOBJ*)-1) + { + DPRINT1("error!\n"); + SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); XlateObj = NULL; - } - else - { - Dc_Attr = DCSrc->pDc_Attr; - if (!Dc_Attr) Dc_Attr = &DCSrc->Dc_Attr; - if (DCDest->w.bitsPerPixel == 1) - { - XlateObj = IntEngCreateMonoXlate(0, DestPalette, SourcePalette, Dc_Attr->crBackgroundClr); - } - else if (DCSrc->w.bitsPerPixel == 1) - { - XlateObj = IntEngCreateSrcMonoXlate(DestPalette, Dc_Attr->crBackgroundClr, Dc_Attr->crForegroundClr); - } - else - { - XlateObj = IntEngCreateXlate(0, 0, DestPalette, SourcePalette); - } - if (NULL == XlateObj) - { - if (UsesSource && hDCSrc != hDCDest) - { - DC_UnlockDc(DCSrc); - } - DC_UnlockDc(DCDest); - if(BitmapDest != NULL) - { - BITMAPOBJ_UnlockBitmap(BitmapDest); - } - if(BitmapSrc != NULL && BitmapSrc != BitmapDest) - { - BITMAPOBJ_UnlockBitmap(BitmapSrc); - } - if(BrushObj != NULL) - { - BRUSHOBJ_UnlockBrush(BrushObj); - } - SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); - return FALSE; - } + goto cleanup; } } @@ -370,6 +307,7 @@ BrushObj ? &BrushInst.BrushObject : NULL, &BrushOrigin, ROP3_TO_ROP4(ROP)); +cleanup: if (UsesSource && XlateObj != NULL) EngDeleteXlate(XlateObj); @@ -410,8 +348,8 @@ { PDC DCDest, DCSrc; RECTL rcDest, rcSrc; - BITMAPOBJ *BitmapDest, *BitmapSrc; - XLATEOBJ *XlateObj; + BITMAPOBJ *BitmapDest, *BitmapSrc = NULL; + XLATEOBJ *XlateObj = NULL; HPALETTE SourcePalette = 0, DestPalette = 0; PPALGDI PalDestGDI, PalSourceGDI; USHORT PalDestMode, PalSrcMode; @@ -459,38 +397,46 @@ xSrc += DCSrc->w.DCOrgX; ySrc += DCSrc->w.DCOrgY; - if(DCDest->DcLevel.hpal) - DestPalette = DCDest->DcLevel.hpal; - - if(DCSrc->DcLevel.hpal) - SourcePalette = DCSrc->DcLevel.hpal; + BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap); + if (!BitmapDest) + { + goto done; + } + + BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap); + if (!BitmapSrc) + { + goto done; + } + + DestPalette = BitmapDest->hDIBPalette; + if (!DestPalette) DestPalette = PrimarySurface.DevInfo.hpalDefault; + + SourcePalette = BitmapSrc->hDIBPalette; + if (!SourcePalette) SourcePalette = PrimarySurface.DevInfo.hpalDefault; if(!(PalSourceGDI = PALETTE_LockPalette(SourcePalette))) { - DC_UnlockDc(DCSrc); - DC_UnlockDc(DCDest); SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if((DestPalette != SourcePalette) && !(PalDestGDI = PALETTE_LockPalette(DestPalette))) - { - PALETTE_UnlockPalette(PalSourceGDI); - DC_UnlockDc(DCSrc); - DC_UnlockDc(DCDest); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } + goto done; + } + PalSrcMode = PalSourceGDI->Mode; + PALETTE_UnlockPalette(PalSourceGDI); + if(DestPalette != SourcePalette) { + if (!(PalDestGDI = PALETTE_LockPalette(DestPalette))) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + goto done; + } PalDestMode = PalDestGDI->Mode; - PalSrcMode = PalSourceGDI->Mode; PALETTE_UnlockPalette(PalDestGDI); } else { - PalDestMode = PalSrcMode = PalSourceGDI->Mode; - } - PALETTE_UnlockPalette(PalSourceGDI); + PalDestMode = PalSrcMode; + } /* Translate Transparent (RGB) Color to the source palette */ if((XlateObj = (XLATEOBJ*)IntEngCreateXlate(PalSrcMode, PAL_RGB, SourcePalette, NULL))) @@ -501,13 +447,6 @@ /* Create the XLATE object to convert colors between source and destination */ XlateObj = (XLATEOBJ*)IntEngCreateXlate(PalDestMode, PalSrcMode, DestPalette, SourcePalette); - - BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap); - /* FIXME - BitmapDest can be NULL!!!! Don't assert here! */ - ASSERT(BitmapDest); - BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap); - /* FIXME - BitmapSrc can be NULL!!!! Don't assert here! */ - ASSERT(BitmapSrc); rcDest.left = xDst; rcDest.top = yDst; @@ -529,9 +468,15 @@ TransparentColor, 0); done: - BITMAPOBJ_UnlockBitmap(BitmapDest); - BITMAPOBJ_UnlockBitmap(BitmapSrc); DC_UnlockDc(DCSrc); + if (BitmapDest) + { + BITMAPOBJ_UnlockBitmap(BitmapDest); + } + if (BitmapSrc) + { + BITMAPOBJ_UnlockBitmap(BitmapSrc); + } if(hdcDst != hdcSrc) { DC_UnlockDc(DCDest); @@ -791,14 +736,13 @@ { PDC DCDest = NULL; PDC DCSrc = NULL; - PDC_ATTR Dc_Attr = NULL; + PDC_ATTR Dc_Attr; BITMAPOBJ *BitmapDest, *BitmapSrc; RECTL DestRect; RECTL SourceRect; BOOL Status; XLATEOBJ *XlateObj = NULL; - HPALETTE SourcePalette = 0, DestPalette = 0; - PGDIBRUSHOBJ BrushObj; + PGDIBRUSHOBJ BrushObj = NULL; BOOL UsesSource = ((ROP & 0xCC0000) >> 2) != (ROP & 0x330000); BOOL UsesPattern = ((ROP & 0xF00000) >> 4) != (ROP & 0x0F0000); @@ -852,6 +796,7 @@ } /* Offset the destination and source by the origin of their DCs. */ + // FIXME: DCOrg is in device coordinates! XOriginDest += DCDest->w.DCOrgX; YOriginDest += DCDest->w.DCOrgY; if (UsesSource) @@ -878,14 +823,7 @@ BitmapSrc = BitmapDest; else BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap); - } - else - { - BitmapSrc = NULL; - } - - if ( UsesSource ) - { + int sw = BitmapSrc->SurfObj.sizlBitmap.cx; int sh = BitmapSrc->SurfObj.sizlBitmap.cy; if ( SourceRect.left < 0 ) @@ -936,50 +874,36 @@ Status = FALSE; goto failed; } + + /* Create the XLATEOBJ. */ + XlateObj = IntCreateXlateForBlt(DCDest, DCSrc, BitmapDest, BitmapSrc); + if (XlateObj == (XLATEOBJ*)-1) + { + SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); + Status = FALSE; + goto failed; + } + } + else + { + BitmapSrc = NULL; } if (UsesPattern) { - Dc_Attr = DCDest->pDc_Attr; - if (!Dc_Attr) Dc_Attr = &DCDest->Dc_Attr; + Dc_Attr = DCDest->pDc_Attr; + if (!Dc_Attr) Dc_Attr = &DCDest->Dc_Attr; BrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush); if (NULL == BrushObj) { - if (UsesSource && hDCSrc != hDCDest) - { - DC_UnlockDc(DCSrc); - } - DC_UnlockDc(DCDest); SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; + Status = FALSE; + goto failed; } } else { BrushObj = NULL; - } - - /* Create the XLATEOBJ. */ - if (UsesSource) - { - if (DCDest->DcLevel.hpal != 0) - DestPalette = DCDest->DcLevel.hpal; - - if (DCSrc->DcLevel.hpal != 0) - SourcePalette = DCSrc->DcLevel.hpal; - - /* FIXME: Use the same logic for create XLATEOBJ as in NtGdiBitBlt. */ - XlateObj = (XLATEOBJ*)IntEngCreateXlate(0, 0, DestPalette, SourcePalette); - if (NULL == XlateObj) - { - if (UsesSource && hDCSrc != hDCDest) - { - DC_UnlockDc(DCSrc); - } - DC_UnlockDc(DCDest); - SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); - return FALSE; - } } /* Perform the bitblt operation */ @@ -988,13 +912,15 @@ &DestRect, &SourceRect, NULL, NULL, NULL, COLORONCOLOR); - if (UsesSource) +failed: + if (XlateObj) + { EngDeleteXlate(XlateObj); - if (UsesPattern) + } + if (BrushObj) { BRUSHOBJ_UnlockBrush(BrushObj); } -failed: if (UsesSource && DCSrc->w.hBitmap != DCDest->w.hBitmap) { BITMAPOBJ_UnlockBitmap(BitmapSrc); @@ -1074,7 +1000,7 @@ &DestRect, NULL, NULL, - &BrushInst.BrushObject, + &BrushInst.BrushObject, // use pDC->eboFill &BrushOrigin, ROP3_TO_ROP4(ROP)); } Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Wed May 28 20:17:50 2008 @@ -265,8 +265,9 @@ SurfaceObject = &BitmapObject->SurfObj; if ( BitmapObject ) { - if ( dc->DcLevel.hpal != 0 ) - Pal = dc->DcLevel.hpal; + Pal = BitmapObject->hDIBPalette; + if (!Pal) Pal = PrimarySurface.DevInfo.hpalDefault; + /* FIXME: Verify if it shouldn't be PAL_BGR! */ XlateObj = (XLATEOBJ*)IntEngCreateXlate ( PAL_RGB, 0, NULL, Pal ); if ( XlateObj ) Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] Wed May 28 20:17:50 2008 @@ -119,6 +119,16 @@ IntGdiCreateBrushXlate(PDC Dc, GDIBRUSHOBJ *BrushObj, BOOLEAN *Failed) { XLATEOBJ *Result = NULL; + BITMAPOBJ * pSurface; + HPALETTE hPalette = NULL; + + pSurface = BITMAPOBJ_LockBitmap(Dc->w.hBitmap); + if (pSurface) + { + hPalette = pSurface->hDIBPalette; + BITMAPOBJ_UnlockBitmap(pSurface); + } + if (!hPalette) hPalette = PrimarySurface.DevInfo.hpalDefault; if (BrushObj->flAttrs & GDIBRUSH_IS_NULL) { @@ -127,7 +137,7 @@ } else if (BrushObj->flAttrs & GDIBRUSH_IS_SOLID) { - Result = IntEngCreateXlate(0, PAL_RGB, Dc->DcLevel.hpal, NULL); + Result = IntEngCreateXlate(0, PAL_RGB, hPalette, NULL); *Failed = FALSE; } else @@ -143,11 +153,11 @@ if (!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; if (Dc->w.bitsPerPixel != 1) - Result = IntEngCreateSrcMonoXlate(Dc->DcLevel.hpal, Dc_Attr->crForegroundClr, Dc_Attr->crBackgroundClr); + Result = IntEngCreateSrcMonoXlate(hPalette, Dc_Attr->crForegroundClr, Dc_Attr->crBackgroundClr); } else if (BrushObj->flAttrs & GDIBRUSH_IS_DIB) { - Result = IntEngCreateXlate(0, 0, Dc->DcLevel.hpal, Pattern->hDIBPalette); + Result = IntEngCreateXlate(0, 0, hPalette, Pattern->hDIBPalette); } BITMAPOBJ_UnlockBitmap(Pattern); Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Wed May 28 20:17:50 2008 @@ -29,7 +29,7 @@ // --------------------------------------------------------- File Statics -static GDIDEVICE PrimarySurface; +GDIDEVICE PrimarySurface; static PGDIDEVICE pPrimarySurface = NULL; static KEVENT VideoDriverNeedsPreparation; static KEVENT VideoDriverPrepared; @@ -829,7 +829,8 @@ if (!CreateAsIC) { - NewDC->DcLevel.hpal = PrimarySurface.DevInfo.hpalDefault; + NewDC->DcLevel.hpal = NtGdiGetStockObject(DEFAULT_PALETTE); + nDc_Attr->jROP2 = R2_COPYPEN; NewDC->erclWindow.top = NewDC->erclWindow.left = 0; @@ -1957,12 +1958,10 @@ if(pBmp->dib) { pDC->w.bitsPerPixel = pBmp->dib->dsBmih.biBitCount; - pDC->DcLevel.hpal = pBmp->hDIBPalette; } else { pDC->w.bitsPerPixel = BitsPerFormat(pBmp->SurfObj.iBitmapFormat); - pDC->DcLevel.hpal = ((GDIDEVICE *)pDC->pPDev)->DevInfo.hpalDefault; } /* Regenerate the XLATEOBJs. */ Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Wed May 28 20:17:50 2008 @@ -1492,6 +1492,7 @@ POINTL DitherOrg; ULONG Mode, i; BOOL Ret; + HPALETTE hDestPalette; ASSERT(dc); ASSERT(pVertex); @@ -1550,13 +1551,19 @@ /* FIXME - BitmapObj can be NULL!!! Don't assert but handle this case gracefully! */ ASSERT(BitmapObj); - PalDestGDI = PALETTE_LockPalette(dc->DcLevel.hpal); - /* FIXME - PalDestGDI can be NULL!!! Don't assert but handle this case gracefully! */ - ASSERT(PalDestGDI); - Mode = PalDestGDI->Mode; - PALETTE_UnlockPalette(PalDestGDI); - - XlateObj = (XLATEOBJ*)IntEngCreateXlate(Mode, PAL_RGB, dc->DcLevel.hpal, NULL); + hDestPalette = BitmapObj->hDIBPalette; + if (!hDestPalette) hDestPalette = PrimarySurface.DevInfo.hpalDefault; + + PalDestGDI = PALETTE_LockPalette(hDestPalette); + if (PalDestGDI) + { + Mode = PalDestGDI->Mode; + PALETTE_UnlockPalette(PalDestGDI); + } + else + Mode = PAL_RGB; + + XlateObj = (XLATEOBJ*)IntEngCreateXlate(Mode, PAL_RGB, hDestPalette, NULL); ASSERT(XlateObj); Ret = IntEngGradientFill(&BitmapObj->SurfObj, Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] Wed May 28 20:17:50 2008 @@ -1547,6 +1547,7 @@ POINT Start; BOOL DoBreak = FALSE; LPCWSTR String, SafeString = NULL; + HPALETTE hDestPalette; // TODO: Write test-cases to exactly match real Windows in different // bad parameters (e.g. does Windows check the DC or the RECT first?). @@ -1629,7 +1630,9 @@ YStart = Start.y + dc->w.DCOrgY; /* Create the brushes */ - PalDestGDI = PALETTE_LockPalette(dc->DcLevel.hpal); + hDestPalette = BitmapObj->hDIBPalette; + if (!hDestPalette) hDestPalette = PrimarySurface.DevInfo.hpalDefault; + PalDestGDI = PALETTE_LockPalette(hDestPalette); if ( !PalDestGDI ) Mode = PAL_RGB; else @@ -1637,7 +1640,7 @@ Mode = PalDestGDI->Mode; PALETTE_UnlockPalette(PalDestGDI); } - XlateObj = (XLATEOBJ*)IntEngCreateXlate(Mode, PAL_RGB, dc->DcLevel.hpal, NULL); + XlateObj = (XLATEOBJ*)IntEngCreateXlate(Mode, PAL_RGB, hDestPalette, NULL); if ( !XlateObj ) { goto fail; @@ -1667,7 +1670,7 @@ } IntGdiInitBrushInstance(&BrushBgInst, BrushBg, NULL); } - XlateObj2 = (XLATEOBJ*)IntEngCreateXlate(PAL_RGB, Mode, NULL, dc->DcLevel.hpal); + XlateObj2 = (XLATEOBJ*)IntEngCreateXlate(PAL_RGB, Mode, NULL, hDestPalette); if ( !XlateObj2 ) { goto fail;

1 0

[tkreuzer] 33751: reapply Magnus Change to fix build. note to Colin: THAT is the reason why ; -)
by tkreuzer＠svn.reactos.org 28 May '08

28 May '08

Author: tkreuzer Date: Wed May 28 18:02:26 2008 New Revision: 33751 URL: http://svn.reactos.org/svn/reactos?rev=33751&view=rev Log: reapply Magnus Change to fix build. note to Colin: THAT is the reason why ;-) Modified: trunk/reactos/dll/win32/usp10/usp10.c trunk/reactos/dll/win32/usp10/usp10.spec Modified: trunk/reactos/dll/win32/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] Wed May 28 18:02:26 2008 @@ -1726,3 +1726,11 @@ for (i = 0; i < nbchars; i++) widths[i] = glyph_width[i]; return S_OK; } + + +VOID WINAPI LpkPresent() +{ + /* FIXME */ + DbgPrint("LPK: %s is unimplemented, please try again later.\n", __FUNCTION__); +} + Modified: trunk/reactos/dll/win32/usp10/usp10.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.spec… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.spec [iso-8859-1] Wed May 28 18:02:26 2008 @@ -1,4 +1,4 @@ -@ stub LpkPresent +@ stdcall LpkPresent() @ stdcall ScriptApplyDigitSubstitution(ptr ptr ptr) @ stub ScriptApplyLogicalWidth @ stdcall ScriptBreak(ptr long ptr ptr)

1 0

[tkreuzer] 33750: (Nt)GdiFlushUserBatch: - optmize by moving the locking of the dc to NtGdiFlushUserBatch instead of doing it for every object - fix wrong pointer calculation (GdiFlushUserBatch returns the size of the objects in bytes not in ULONG) - simplify a check - add a comment: on XP NtGdiFlushUserBatch doesn't return NTSTATUS, but a pointer to inside the Teb, maybe random/VOID
by tkreuzer＠svn.reactos.org 28 May '08

28 May '08

Author: tkreuzer Date: Wed May 28 17:25:08 2008 New Revision: 33750 URL: http://svn.reactos.org/svn/reactos?rev=33750&view=rev Log: (Nt)GdiFlushUserBatch: - optmize by moving the locking of the dc to NtGdiFlushUserBatch instead of doing it for every object - fix wrong pointer calculation (GdiFlushUserBatch returns the size of the objects in bytes not in ULONG) - simplify a check - add a comment: on XP NtGdiFlushUserBatch doesn't return NTSTATUS, but a pointer to inside the Teb, maybe random/VOID Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c [iso-8859-1] Wed May 28 17:25:08 2008 @@ -61,18 +61,13 @@ // ULONG FASTCALL -GdiFlushUserBatch(HDC hDC, PGDIBATCHHDR pHdr) +GdiFlushUserBatch(PDC dc, PGDIBATCHHDR pHdr) { - PDC dc = NULL; PDC_ATTR Dc_Attr = NULL; - if (hDC && !IsObjectDead(hDC)) + if (dc) { - dc = DC_LockDc(hDC); - if (dc) - { - Dc_Attr = dc->pDc_Attr; - if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - } + Dc_Attr = dc->pDc_Attr; + if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; } // The thread is approaching the end of sunset. switch(pHdr->Cmd) @@ -113,7 +108,7 @@ default: break; } - if (dc) DC_UnlockDc(dc); + return pHdr->Size; // Return the full size of the structure. } @@ -146,25 +141,39 @@ if( (GdiBatchCount > 0) && (GdiBatchCount <= (GDIBATCHBUFSIZE/4))) { HDC hDC = (HDC) pTeb->GdiTebBatch.HDC; -// -// If hDC is zero and the buffer fills up with delete objects we need to run -// anyway. So, hard code to the system batch limit. -// - if ((hDC) || ((!hDC) && (GdiBatchCount >= GDI_BATCH_LIMIT))) + + /* If hDC is zero and the buffer fills up with delete objects we need + to run anyway. So, hard code to the system batch limit. */ + if ((hDC) || (GdiBatchCount >= GDI_BATCH_LIMIT)) { - PULONG pHdr = &pTeb->GdiTebBatch.Buffer[0]; + PCHAR pHdr = (PCHAR)&pTeb->GdiTebBatch.Buffer[0]; + PDC pDC = NULL; + + if (hDC && !IsObjectDead(hDC)) + { + pDC = DC_LockDc(hDC); + } + // No need to init anything, just go! for (; GdiBatchCount > 0; GdiBatchCount--) { // Process Gdi Batch! - pHdr += GdiFlushUserBatch( hDC, (PGDIBATCHHDR) pHdr ); + pHdr += GdiFlushUserBatch(pDC, (PGDIBATCHHDR) pHdr); } + + if (pDC) + { + DC_UnlockDc(pDC); + } + // Exit and clear out for the next round. pTeb->GdiTebBatch.Offset = 0; pTeb->GdiBatchCount = 0; pTeb->GdiTebBatch.HDC = 0; } } + + // FIXME: on xp the function returns &pTeb->RealClientId, maybe VOID? return STATUS_SUCCESS; }

1 0

[cfinck] 33749: Sync usp10 with Wine again, fixes the corrupted text display in AbiWord. Thanks to CMan for regression-testing! Also I removed Magnus' change in r33700. If this is really required, please name the reason and add the change to a usp10_ros.diff file as this is a Wine-synched component. Also don't forget to include a header file for the DbgPrint prototype. See issue #3280 for more details.
by cfinck＠svn.reactos.org 28 May '08

28 May '08

Author: cfinck Date: Wed May 28 16:41:41 2008 New Revision: 33749 URL: http://svn.reactos.org/svn/reactos?rev=33749&view=rev Log: Sync usp10 with Wine again, fixes the corrupted text display in AbiWord. Thanks to CMan for regression-testing! Also I removed Magnus' change in r33700. If this is really required, please name the reason and add the change to a usp10_ros.diff file as this is a Wine-synched component. Also don't forget to include a header file for the DbgPrint prototype. See issue #3280 for more details. Modified: trunk/reactos/dll/win32/usp10/usp10.c trunk/reactos/dll/win32/usp10/usp10.spec Modified: trunk/reactos/dll/win32/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] Wed May 28 16:41:41 2008 @@ -1407,27 +1407,22 @@ int iReserved, const WORD *pwGlyphs, int cGlyphs, const int *piAdvance, const int *piJustify, const GOFFSET *pGoffset) { - HFONT hfont; HRESULT hr = S_OK; TRACE("(%p, %p, %d, %d, %04x, %p, %p, %p, %d, %p, %d, %p, %p, %p)\n", hdc, psc, x, y, fuOptions, lprc, psa, pwcReserved, iReserved, pwGlyphs, cGlyphs, piAdvance, piJustify, pGoffset); - if (!hdc && psc && !*psc) return E_INVALIDARG; + if (!hdc || !psc) return E_INVALIDARG; if (!piAdvance || !psa || !pwGlyphs) return E_INVALIDARG; - if ((hr = get_script_cache(hdc, psc))) return hr; - - hfont = select_cached_font(psc); fuOptions &= ETO_CLIPPED + ETO_OPAQUE; if (!psa->fNoGlyphIndex) /* Have Glyphs? */ fuOptions |= ETO_GLYPH_INDEX; /* Say don't do translation to glyph */ - if (!ExtTextOutW(get_cache_hdc(psc), x, y, fuOptions, lprc, pwGlyphs, cGlyphs, NULL)) + if (!ExtTextOutW(hdc, x, y, fuOptions, lprc, pwGlyphs, cGlyphs, NULL)) hr = S_FALSE; - unselect_cached_font(psc, hfont); return hr; } @@ -1731,11 +1726,3 @@ for (i = 0; i < nbchars; i++) widths[i] = glyph_width[i]; return S_OK; } - - -VOID WINAPI LpkPresent() -{ - /* FIXME */ - DbgPrint("LPK: %s is unimplemented, please try again later.\n", __FUNCTION__); -} - Modified: trunk/reactos/dll/win32/usp10/usp10.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.spec… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.spec [iso-8859-1] Wed May 28 16:41:41 2008 @@ -1,4 +1,4 @@ -@ stdcall LpkPresent() +@ stub LpkPresent @ stdcall ScriptApplyDigitSubstitution(ptr ptr ptr) @ stub ScriptApplyLogicalWidth @ stdcall ScriptBreak(ptr long ptr ptr)

1 0

[cfinck] 33748: Sorry, forgot this file
by cfinck＠svn.reactos.org 28 May '08

28 May '08

Author: cfinck Date: Wed May 28 16:37:05 2008 New Revision: 33748 URL: http://svn.reactos.org/svn/reactos?rev=33748&view=rev Log: Sorry, forgot this file Added: trunk/reactos/lib/sdk/crt/except/checkesp.c (with props) Added: trunk/reactos/lib/sdk/crt/except/checkesp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/checkes… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/checkesp.c (added) +++ trunk/reactos/lib/sdk/crt/except/checkesp.c [iso-8859-1] Wed May 28 16:37:05 2008 @@ -1,0 +1,35 @@ +/********************************************************************* +* _chkesp (MSVCRT.@) +* +* Trap to a debugger if the value of the stack pointer has changed. +* +* PARAMS +* None. +* +* RETURNS +* Does not return. +* +* NOTES +* This function is available for iX86 only. +* +* When VC++ generates debug code, it stores the value of the stack pointer +* before calling any external function, and checks the value following +* the call. It then calls this function, which will trap if the values are +* not the same. Usually this means that the prototype used to call +* the function is incorrect. It can also mean that the .spec entry has +* the wrong calling convention or parameters. +*/ + +#ifdef __i386__ + +void _chkesp(void) +{ +} + +#else + +void _chkesp(void) +{ +} + +#endif /* __i386__ */ Propchange: trunk/reactos/lib/sdk/crt/except/checkesp.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dreimer] 33746: Add winhlp32 to bootcd.
by dreimer＠svn.reactos.org 28 May '08

28 May '08

Author: dreimer Date: Wed May 28 15:10:50 2008 New Revision: 33746 URL: http://svn.reactos.org/svn/reactos?rev=33746&view=rev Log: Add winhlp32 to bootcd. Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Wed May 28 15:10:50 2008 @@ -71,6 +71,7 @@ base\applications\shutdown\shutdown.exe 1 base\applications\sndvol32\sndvol32.exe 1 base\applications\taskmgr\taskmgr.exe 1 +base\applications\winhlp32\winhlp32.exe 1 base\applications\wordpad\wordpad.exe 1 base\services\dhcp\dhcp.exe 1

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