Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 32482: - Add Copy & Paste functions for whole characters - Add an "Edit" menu now that we have some more menu items belonging to this category
by cfinck＠svn.reactos.org 25 Feb '08

25 Feb '08

Author: cfinck Date: Mon Feb 25 21:01:06 2008 New Revision: 32482 URL: http://svn.reactos.org/svn/reactos?rev=32482&view=rev Log: - Add Copy & Paste functions for whole characters - Add an "Edit" menu now that we have some more menu items belonging to this category Modified: trunk/rosapps/devutils/vgafontedit/fontwnd.c trunk/rosapps/devutils/vgafontedit/lang/bg-BG.rc trunk/rosapps/devutils/vgafontedit/lang/de-DE.rc trunk/rosapps/devutils/vgafontedit/lang/en-US.rc trunk/rosapps/devutils/vgafontedit/lang/fr-FR.rc trunk/rosapps/devutils/vgafontedit/lang/pl-PL.rc trunk/rosapps/devutils/vgafontedit/lang/ru-RU.rc trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc trunk/rosapps/devutils/vgafontedit/main.c trunk/rosapps/devutils/vgafontedit/main.rc trunk/rosapps/devutils/vgafontedit/mainwnd.c trunk/rosapps/devutils/vgafontedit/precomp.h trunk/rosapps/devutils/vgafontedit/resource.h Modified: trunk/rosapps/devutils/vgafontedit/fontwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/fontw… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/fontwnd.c (original) +++ trunk/rosapps/devutils/vgafontedit/fontwnd.c Mon Feb 25 21:01:06 2008 @@ -108,6 +108,7 @@ case WM_CHILDACTIVATE: Info->MainWndInfo->CurrentFontWnd = Info; SetToolbarFileButtonState(Info->MainWndInfo, TRUE); + SetPasteButtonState(Info->MainWndInfo); break; case WM_CREATE: @@ -165,6 +166,7 @@ // Otherwise CurrentFontWnd will stay NULL, so the main window knows that no more childs are opened. Info->MainWndInfo->CurrentFontWnd = NULL; SetToolbarFileButtonState(Info->MainWndInfo, FALSE); + SetPasteButtonState(Info->MainWndInfo); if(uMsg == WM_USER_APPCLOSE) { Modified: trunk/rosapps/devutils/vgafontedit/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/bg-BG.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/bg-BG.rc Mon Feb 25 21:01:06 2008 @@ -47,6 +47,14 @@ MENUITEM "Èçõîä êàòî\tAlt+F4", ID_FILE_EXIT END + POPUP "&Edit" + BEGIN + MENUITEM "Copy\tCtrl+C", ID_EDIT_COPY + MENUITEM "Paste\tCtrl+V", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "Edit Glyph...", ID_EDIT_GLYPH + END + POPUP "&Ïðîçîðåö" BEGIN MENUITEM "&Íàäèïëÿíå", ID_WINDOW_CASCADE @@ -81,4 +89,6 @@ IDS_TOOLTIP_OPEN, "Îòâàðÿíå" IDS_TOOLTIP_SAVE, "Çàïèñ" IDS_TOOLTIP_EDIT_GLYPH, "Îáðàáîòêà íà çíàê" + IDS_TOOLTIP_COPY, "Copy" + IDS_TOOLTIP_PASTE, "Paste" END Modified: trunk/rosapps/devutils/vgafontedit/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/de-DE.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/de-DE.rc Mon Feb 25 21:01:06 2008 @@ -47,6 +47,14 @@ MENUITEM "Beenden\tAlt+F4", ID_FILE_EXIT END + POPUP "&Bearbeiten" + BEGIN + MENUITEM "Kopieren\tStrg+C", ID_EDIT_COPY + MENUITEM "Einfügen\tStrg+V", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "Schriftzeichen bearbeiten...", ID_EDIT_GLYPH + END + POPUP "&Fenster" BEGIN MENUITEM "&Überlappend", ID_WINDOW_CASCADE @@ -81,4 +89,6 @@ IDS_TOOLTIP_OPEN, "Öffnen" IDS_TOOLTIP_SAVE, "Speichern" IDS_TOOLTIP_EDIT_GLYPH, "Schriftzeichen bearbeiten" + IDS_TOOLTIP_COPY, "Kopieren" + IDS_TOOLTIP_PASTE, "Einfügen" END Modified: trunk/rosapps/devutils/vgafontedit/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/en-US.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/en-US.rc Mon Feb 25 21:01:06 2008 @@ -47,6 +47,14 @@ MENUITEM "Exit\tAlt+F4", ID_FILE_EXIT END + POPUP "&Edit" + BEGIN + MENUITEM "Copy\tCtrl+C", ID_EDIT_COPY + MENUITEM "Paste\tCtrl+V", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "Edit Glyph...", ID_EDIT_GLYPH + END + POPUP "&Window" BEGIN MENUITEM "&Cascade", ID_WINDOW_CASCADE @@ -81,4 +89,6 @@ IDS_TOOLTIP_OPEN, "Open" IDS_TOOLTIP_SAVE, "Save" IDS_TOOLTIP_EDIT_GLYPH, "Edit Glyph" + IDS_TOOLTIP_COPY, "Copy" + IDS_TOOLTIP_PASTE, "Paste" END Modified: trunk/rosapps/devutils/vgafontedit/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/fr-FR.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/fr-FR.rc Mon Feb 25 21:01:06 2008 @@ -47,6 +47,14 @@ MENUITEM "Quitter\tAlt+F4", ID_FILE_EXIT END + POPUP "&Edit" + BEGIN + MENUITEM "Copy\tCtrl+C", ID_EDIT_COPY + MENUITEM "Paste\tCtrl+V", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "Edit Glyph...", ID_EDIT_GLYPH + END + POPUP "Fenêtres" BEGIN MENUITEM "En &cascade", ID_WINDOW_CASCADE @@ -81,4 +89,6 @@ IDS_TOOLTIP_OPEN, "Ouvrir" IDS_TOOLTIP_SAVE, "Enregistrer" IDS_TOOLTIP_EDIT_GLYPH, "Éditer le glyphe" + IDS_TOOLTIP_COPY, "Copy" + IDS_TOOLTIP_PASTE, "Paste" END Modified: trunk/rosapps/devutils/vgafontedit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/pl-PL.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/pl-PL.rc Mon Feb 25 21:01:06 2008 @@ -47,6 +47,14 @@ MENUITEM "Wyjd\tAlt+F4", ID_FILE_EXIT END + POPUP "&Edit" + BEGIN + MENUITEM "Copy\tCtrl+C", ID_EDIT_COPY + MENUITEM "Paste\tCtrl+V", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "Edit Glyph...", ID_EDIT_GLYPH + END + POPUP "&Okna" BEGIN MENUITEM "&Kaskadowo", ID_WINDOW_CASCADE @@ -81,4 +89,6 @@ IDS_TOOLTIP_OPEN, "Otwórz" IDS_TOOLTIP_SAVE, "Zapisz" IDS_TOOLTIP_EDIT_GLYPH, "Edytuj Glify" + IDS_TOOLTIP_COPY, "Copy" + IDS_TOOLTIP_PASTE, "Paste" END Modified: trunk/rosapps/devutils/vgafontedit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/ru-RU.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/ru-RU.rc Mon Feb 25 21:01:06 2008 @@ -47,6 +47,14 @@ MENUITEM "Âûõîä\tAlt+F4", ID_FILE_EXIT END + POPUP "&Edit" + BEGIN + MENUITEM "Copy\tCtrl+C", ID_EDIT_COPY + MENUITEM "Paste\tCtrl+V", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "Edit Glyph...", ID_EDIT_GLYPH + END + POPUP "&Îêíà" BEGIN MENUITEM "&Êàñêàäîì", ID_WINDOW_CASCADE @@ -81,4 +89,6 @@ IDS_TOOLTIP_OPEN, "Îòêðûòü" IDS_TOOLTIP_SAVE, "Ñîõðàíèòü" IDS_TOOLTIP_EDIT_GLYPH, "Ðåäàêòèðîâàòü ñèìâîë" + IDS_TOOLTIP_COPY, "Copy" + IDS_TOOLTIP_PASTE, "Paste" END Modified: trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc Mon Feb 25 21:01:06 2008 @@ -47,6 +47,14 @@ MENUITEM "Â&èõ³ä\tAlt+F4", ID_FILE_EXIT END + POPUP "&Edit" + BEGIN + MENUITEM "Copy\tCtrl+C", ID_EDIT_COPY + MENUITEM "Paste\tCtrl+V", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "Edit Glyph...", ID_EDIT_GLYPH + END + POPUP "&Â³êíî" BEGIN MENUITEM "&Êàñêàäîì", ID_WINDOW_CASCADE @@ -81,4 +89,6 @@ IDS_TOOLTIP_OPEN, "Â³äêðèòè" IDS_TOOLTIP_SAVE, "Çáåðåãòè" IDS_TOOLTIP_EDIT_GLYPH, "Ðåäàãóâàòè ñèìâîë" + IDS_TOOLTIP_COPY, "Copy" + IDS_TOOLTIP_PASTE, "Paste" END Modified: trunk/rosapps/devutils/vgafontedit/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/main.… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/main.c (original) +++ trunk/rosapps/devutils/vgafontedit/main.c Mon Feb 25 21:01:06 2008 @@ -8,9 +8,12 @@ #include "precomp.h" +static const WCHAR szCharacterClipboardFormat[] = L"RosVgaFontChar"; + HINSTANCE hInstance; HANDLE hProcessHeap; PWSTR szAppName; +UINT uCharacterClipboardFormat; INT WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow) @@ -29,6 +32,10 @@ AllocAndLoadString(&szAppName, IDS_APPTITLE); hAccel = LoadAcceleratorsW( hInstance, MAKEINTRESOURCEW(IDA_MAINACCELERATORS) ); + + uCharacterClipboardFormat = RegisterClipboardFormatW(szCharacterClipboardFormat); + if(!uCharacterClipboardFormat) + return 1; if( InitMainWndClass() && InitFontWndClass() && InitFontBoxesWndClass() && InitEditGlyphWndClasses() ) { Modified: trunk/rosapps/devutils/vgafontedit/main.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/main.… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/main.rc (original) +++ trunk/rosapps/devutils/vgafontedit/main.rc Mon Feb 25 21:01:06 2008 @@ -21,6 +21,8 @@ "N", ID_FILE_NEW, VIRTKEY, CONTROL "O", ID_FILE_OPEN, VIRTKEY, CONTROL "S", ID_FILE_SAVE, VIRTKEY, CONTROL + "C", ID_EDIT_COPY, VIRTKEY, CONTROL + "V", ID_EDIT_PASTE, VIRTKEY, CONTROL END IDB_MAIN_TOOLBAR BITMAP "res/toolbar.bmp" Modified: trunk/rosapps/devutils/vgafontedit/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/mainw… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/mainwnd.c (original) +++ trunk/rosapps/devutils/vgafontedit/mainwnd.c Mon Feb 25 21:01:06 2008 @@ -88,6 +88,7 @@ { SetToolbarButtonState(Info, ID_FILE_SAVE, bEnabled); SetToolbarButtonState(Info, ID_EDIT_GLYPH, bEnabled); + SetToolbarButtonState(Info, ID_EDIT_COPY, bEnabled); } static VOID @@ -143,11 +144,15 @@ AddToolbarButton(Info, iStandardBitmaps + STD_FILESAVE, ID_FILE_SAVE, IDS_TOOLTIP_SAVE); AddToolbarSeparator(Info); AddToolbarButton(Info, iCustomBitmaps + TOOLBAR_EDIT_GLYPH, ID_EDIT_GLYPH, IDS_TOOLTIP_EDIT_GLYPH); + AddToolbarSeparator(Info); + AddToolbarButton(Info, iStandardBitmaps + STD_COPY, ID_EDIT_COPY, IDS_TOOLTIP_COPY); + AddToolbarButton(Info, iStandardBitmaps + STD_PASTE, ID_EDIT_PASTE, IDS_TOOLTIP_PASTE); SetToolbarFileButtonState(Info, FALSE); + SetPasteButtonState(Info); // Add the MDI client area - ccs.hWindowMenu = GetSubMenu(Info->hMenu, 1); + ccs.hWindowMenu = GetSubMenu(Info->hMenu, 2); ccs.idFirstChild = ID_MDI_FIRSTCHILD; Info->hMdiClient = CreateWindowExW(WS_EX_CLIENTEDGE, @@ -172,11 +177,17 @@ { UINT uState; - uState = MF_BYCOMMAND | (Info->CurrentFontWnd == NULL); + uState = MF_BYCOMMAND | !(Info->CurrentFontWnd); EnableMenuItem(Info->hMenu, ID_FILE_CLOSE, uState); EnableMenuItem(Info->hMenu, ID_FILE_SAVE, uState); EnableMenuItem(Info->hMenu, ID_FILE_SAVE_AS, uState); + + EnableMenuItem(Info->hMenu, ID_EDIT_COPY, uState); + EnableMenuItem(Info->hMenu, ID_EDIT_GLYPH, uState); + + uState = MF_BYCOMMAND | !(Info->CurrentFontWnd && IsClipboardFormatAvailable(uCharacterClipboardFormat)); + EnableMenuItem(Info->hMenu, ID_EDIT_PASTE, uState); } static VOID @@ -248,6 +259,72 @@ CloseHandle(hFile); } +static VOID +CopyCurrentGlyph(IN PFONT_WND_INFO FontWndInfo) +{ + HGLOBAL hMem; + PUCHAR pCharacterBits; + + if(!OpenClipboard(NULL)) + return; + + EmptyClipboard(); + + hMem = GlobalAlloc(GMEM_MOVEABLE, 8); + pCharacterBits = GlobalLock(hMem); + RtlCopyMemory(pCharacterBits, FontWndInfo->Font->Bits + FontWndInfo->uSelectedCharacter * 8, 8); + GlobalUnlock(hMem); + + SetClipboardData(uCharacterClipboardFormat, hMem); + + CloseClipboard(); +} + +static VOID +PasteIntoCurrentGlyph(IN PFONT_WND_INFO FontWndInfo) +{ + HGLOBAL hMem; + + if(!IsClipboardFormatAvailable(uCharacterClipboardFormat)) + return; + + if(!OpenClipboard(NULL)) + return; + + hMem = GetClipboardData(uCharacterClipboardFormat); + if(hMem) + { + PUCHAR pCharacterBits; + + pCharacterBits = GlobalLock(hMem); + if(pCharacterBits) + { + RECT CharacterRect; + UINT uFontRow; + UINT uFontColumn; + + RtlCopyMemory(FontWndInfo->Font->Bits + FontWndInfo->uSelectedCharacter * 8, pCharacterBits, 8); + GlobalUnlock(hMem); + + FontWndInfo->OpenInfo->bModified = TRUE; + + GetCharacterPosition(FontWndInfo->uSelectedCharacter, &uFontRow, &uFontColumn); + GetCharacterRect(uFontRow, uFontColumn, &CharacterRect); + InvalidateRect(FontWndInfo->hFontBoxesWnd, &CharacterRect, FALSE); + } + } + + CloseClipboard(); +} + +VOID +SetPasteButtonState(IN PMAIN_WND_INFO Info) +{ + SetToolbarButtonState(Info, + ID_EDIT_PASTE, + (Info->CurrentFontWnd && IsClipboardFormatAvailable(uCharacterClipboardFormat))); +} + static BOOL MenuCommand(IN INT nMenuItemID, IN PMAIN_WND_INFO Info) { @@ -278,9 +355,17 @@ PostMessage(Info->hMainWnd, WM_CLOSE, 0, 0); return TRUE; - // "Edit Glyph" toolbar button + // Edit Menu case ID_EDIT_GLYPH: EditCurrentGlyph(Info->CurrentFontWnd); + return TRUE; + + case ID_EDIT_COPY: + CopyCurrentGlyph(Info->CurrentFontWnd); + return TRUE; + + case ID_EDIT_PASTE: + PasteIntoCurrentGlyph(Info->CurrentFontWnd); return TRUE; // Window Menu @@ -349,6 +434,8 @@ static LRESULT CALLBACK MainWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { + static HWND hNextClipboardViewer; + PMAIN_WND_INFO Info; Info = (PMAIN_WND_INFO) GetWindowLongW(hwnd, GWLP_USERDATA); @@ -362,6 +449,14 @@ return 0; break; + + case WM_CHANGECBCHAIN: + if((HWND)wParam == hNextClipboardViewer) + hNextClipboardViewer = (HWND)lParam; + else + SendMessage(hNextClipboardViewer, uMsg, wParam, lParam); + + return 0; case WM_CLOSE: if(Info->FirstFontWnd) @@ -392,6 +487,8 @@ Info->hMenu = GetMenu(hwnd); SetWindowLongW(hwnd, GWLP_USERDATA, (LONG)Info); + hNextClipboardViewer = SetClipboardViewer(hwnd); + InitMainWnd(Info); InitResources(Info); @@ -404,6 +501,13 @@ HeapFree(hProcessHeap, 0, Info); SetWindowLongW(hwnd, GWLP_USERDATA, 0); PostQuitMessage(0); + return 0; + + case WM_DRAWCLIPBOARD: + SetPasteButtonState(Info); + + // Pass the message to the next clipboard window in the chain + SendMessage(hNextClipboardViewer, uMsg, wParam, lParam); return 0; case WM_INITMENUPOPUP: Modified: trunk/rosapps/devutils/vgafontedit/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/preco… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/precomp.h (original) +++ trunk/rosapps/devutils/vgafontedit/precomp.h Mon Feb 25 21:01:06 2008 @@ -147,6 +147,7 @@ extern PWSTR szAppName; extern HINSTANCE hInstance; extern HANDLE hProcessHeap; +extern UINT uCharacterClipboardFormat; // mainwnd.c BOOL CreateMainWindow(IN INT nCmdShow, OUT PMAIN_WND_INFO* Info); @@ -154,6 +155,7 @@ VOID UnInitMainWndClass(VOID); VOID DoFileSave(IN PMAIN_WND_INFO Info, IN BOOL bSaveAs); VOID SetToolbarFileButtonState(IN PMAIN_WND_INFO Info, BOOL bEnabled); +VOID SetPasteButtonState(IN PMAIN_WND_INFO Info); // misc.c INT AllocAndLoadString(OUT PWSTR *lpTarget, IN UINT uID); Modified: trunk/rosapps/devutils/vgafontedit/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/resou… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/resource.h (original) +++ trunk/rosapps/devutils/vgafontedit/resource.h Mon Feb 25 21:01:06 2008 @@ -43,6 +43,8 @@ #define ID_FILE_EXIT 1006 #define ID_EDIT_GLYPH 2001 +#define ID_EDIT_COPY 2002 +#define ID_EDIT_PASTE 2003 #define ID_WINDOW_TILE_HORZ 3001 #define ID_WINDOW_TILE_VERT 3002 @@ -71,5 +73,7 @@ #define IDS_TOOLTIP_OPEN 11002 #define IDS_TOOLTIP_SAVE 11003 #define IDS_TOOLTIP_EDIT_GLYPH 11004 +#define IDS_TOOLTIP_COPY 11005 +#define IDS_TOOLTIP_PASTE 11006 #endif

1 0

[mpiulachs] 32481: - remove autoresource usage
by mpiulachs＠svn.reactos.org 25 Feb '08

25 Feb '08

Author: mpiulachs Date: Mon Feb 25 17:54:44 2008 New Revision: 32481 URL: http://svn.reactos.org/svn/reactos?rev=32481&view=rev Log: - remove autoresource usage Modified: branches/rbuild/reactos/dll/cpl/desk/desk.rbuild Modified: branches/rbuild/reactos/dll/cpl/desk/desk.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/cpl/desk/des… ============================================================================== --- branches/rbuild/reactos/dll/cpl/desk/desk.rbuild (original) +++ branches/rbuild/reactos/dll/cpl/desk/desk.rbuild Mon Feb 25 17:54:44 2008 @@ -38,7 +38,6 @@ <file>desk.rc</file>  - <automanifest>manifest.xml</automanifest> <autoresource>auto.rc</autoresource>

1 0

[mpiulachs] 32480: - remove AutoManifest element, manifest generation has to be implemented in a different more complex way to fully support msvc 8.0
by mpiulachs＠svn.reactos.org 25 Feb '08

25 Feb '08

Author: mpiulachs Date: Mon Feb 25 17:50:21 2008 New Revision: 32480 URL: http://svn.reactos.org/svn/reactos?rev=32480&view=rev Log: - remove AutoManifest element, manifest generation has to be implemented in a different more complex way to fully support msvc 8.0 Modified: branches/rbuild/reactos/tools/rbuild/linkerscript.cpp branches/rbuild/reactos/tools/rbuild/module.cpp branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp branches/rbuild/reactos/tools/rbuild/modulesresourcegenerator.cpp branches/rbuild/reactos/tools/rbuild/rbuild.h Modified: branches/rbuild/reactos/tools/rbuild/linkerscript.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/lin… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/linkerscript.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/linkerscript.cpp Mon Feb 25 17:50:21 2008 @@ -48,18 +48,6 @@ { } -AutoManifest::AutoManifest ( const XMLElement& node_, - const Module& module_, - const FileLocation& file_ ) - : node(node_), module(module_), file(file_) -{ -} - -void -AutoManifest::ProcessXML() -{ -} - InstallComponent::InstallComponent ( const XMLElement& node_, const Module& module_, const FileLocation& file_ ) Modified: branches/rbuild/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/mod… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/module.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/module.cpp Mon Feb 25 17:50:21 2008 @@ -248,7 +248,6 @@ pch (NULL), cplusplus (false), host (HostDefault), - autoManifest (NULL), autoResource (NULL), installComponent (NULL) { @@ -763,35 +762,6 @@ string dir = e.value.substr ( 0, pos ); string name = e.value.substr ( pos + 1); autoResource = new AutoResource ( - e, *this, FileLocation ( SourceDirectory, relative_path + sSep + dir, name, &e ) ); - } - subs_invalid = true; - } - else if ( e.name == "automanifest" ) - { - if ( parseContext.ifData ) - { - throw XMLInvalidBuildFileException ( - e.location, - "<automanifest> is not a valid sub-element of <if>" ); - } - if ( autoManifest ) - { - throw XMLInvalidBuildFileException ( - e.location, - "Only one <automanifest> is valid per module" ); - } - size_t pos = e.value.find_last_of ( "/\\" ); - if ( pos == string::npos ) - { - autoManifest = new AutoManifest ( - e, *this, FileLocation ( SourceDirectory, relative_path, e.value, &e ) ); - } - else - { - string dir = e.value.substr ( 0, pos ); - string name = e.value.substr ( pos + 1); - autoManifest = new AutoManifest ( e, *this, FileLocation ( SourceDirectory, relative_path + sSep + dir, name, &e ) ); } subs_invalid = true; Modified: branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/mod… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp Mon Feb 25 17:50:21 2008 @@ -33,14 +33,7 @@ void ModulesManifestGenerator::Generate () { - for ( size_t i = 0; i < project.modules.size (); i++ ) - { - Module& module = *project.modules[i]; - if (module.autoManifest != NULL) - { - WriteManifestFile (module); - } - } + /* Don't do anything for now */ } void Modified: branches/rbuild/reactos/tools/rbuild/modulesresourcegenerator.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/mod… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/modulesresourcegenerator.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/modulesresourcegenerator.cpp Mon Feb 25 17:50:21 2008 @@ -77,11 +77,13 @@ s = s + sprintf ( s, "#include <reactos/version.rc>\n"); s = s + sprintf ( s, "\n" ); - if (module.autoManifest != NULL) + /* + if (module.visualStyles != NULL) { s = s + sprintf ( s, "1 24 DISCARDABLE \"manifest.xml\"\n"); s = s + sprintf ( s, "\n" ); } + */ /* Include resources for module localizations */ for ( size_t i = 0; i < module.localizations.size (); i++ ) Modified: branches/rbuild/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/rbu… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/rbuild.h (original) +++ branches/rbuild/reactos/tools/rbuild/rbuild.h Mon Feb 25 17:50:21 2008 @@ -114,7 +114,6 @@ class Contributor; class Localization; class Author; -class AutoManifest; class AutoResource; class InstallComponent; class InstallFolder; @@ -440,7 +439,6 @@ FileLocation *output; // "path/foo.exe" FileLocation *dependency; // "path/foo.exe" or "path/libfoo.a" FileLocation *install; - AutoManifest* autoManifest; AutoResource* autoResource; InstallComponent* installComponent; @@ -652,20 +650,6 @@ bool IsSupportedModuleType ( ModuleType type ); Family ( const XMLElement& node , const Module& _module ); - - void ProcessXML(); -}; - -class AutoManifest -{ - const XMLElement& node; -public: - const Module& module; - FileLocation file; - - AutoManifest ( const XMLElement& node, - const Module& module, - const FileLocation& file ); void ProcessXML(); };

1 0

[cwittich] 32479: fix a typo
by cwittich＠svn.reactos.org 25 Feb '08

25 Feb '08

Author: cwittich Date: Mon Feb 25 17:25:15 2008 New Revision: 32479 URL: http://svn.reactos.org/svn/reactos?rev=32479&view=rev Log: fix a typo Modified: trunk/reactos/drivers/video/videoprt/int10.c Modified: trunk/reactos/drivers/video/videoprt/int10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/int… ============================================================================== --- trunk/reactos/drivers/video/videoprt/int10.c (original) +++ trunk/reactos/drivers/video/videoprt/int10.c Mon Feb 25 17:25:15 2008 @@ -161,7 +161,7 @@ /* Clear the context */ RtlZeroMemory(&BiosContext, sizeof(CONTEXT)); - /* Fil out the bios arguments */ + /* Fill out the bios arguments */ BiosContext.Eax = BiosArguments->Eax; BiosContext.Ebx = BiosArguments->Ebx; BiosContext.Ecx = BiosArguments->Ecx;

1 0

[dchapyshev] 32478: - Fix build
by dchapyshev＠svn.reactos.org 25 Feb '08

25 Feb '08

Author: dchapyshev Date: Mon Feb 25 16:07:51 2008 New Revision: 32478 URL: http://svn.reactos.org/svn/reactos?rev=32478&view=rev Log: - Fix build Added: trunk/reactos/dll/cpl/appwiz-new/lang/bg-BG.rc (with props) Removed: trunk/reactos/dll/cpl/appwiz-new/lang/bg-Bg.rc Added: trunk/reactos/dll/cpl/appwiz-new/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/lang/bg… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/lang/bg-BG.rc (added) +++ trunk/reactos/dll/cpl/appwiz-new/lang/bg-BG.rc Mon Feb 25 16:07:51 2008 @@ -1,0 +1,199 @@ +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + +IDR_POPUP_APP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "Ïðå&ìàõâàíå", ID_APP_REMOVE + MENUITEM "&Ïðîìÿíà", ID_APP_MODIFY, GRAYED + END +END + +IDD_NETINSTALL DIALOGEX 0, 0, 242, 221 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ñëàãàíå îò ìðåæà" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "&Ñëàãàíå...", IDC_INSTALL, 150, 171, 85, 14 + LTEXT "&Ñëåäíèÿò ñîôòóåð ìîæå äà áúäå ñëîæåí îò ÐåàêòÎÑ. Çà äà ñëîæèòå ïðèëîæåíèå, èçáåðåòå ãî îò ñïèñúêà è íàòèñíåòå Ñëàãàíå.", IDC_NETTEXT, 40, 6, 195, 32 + LISTBOX IDC_NETPROGLIST, 7, 42, 228, 125, LBS_STANDARD | WS_TABSTOP + ICON IDI_APPICO, IDC_NETICON, 9, 10, 20, 20 +END + +IDD_CREATESHORTCUT DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ñúçäàâàíå íà ïðåïðàòêà" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Âúëøåáíèêúò ùå âè ïîìîãíå äà ñúçäàäåòå ïðåïðàòêè êúì ìåñòíè èëè ìðåæîâè ïðîãðàìè, ôàéëîâå, êîìïþòðè èëè àäðåñè â èíòåðíåò.", -1, 97, 7, 195, 28 + LTEXT "&Íàïèøåòå ìÿñòîòî íà ïðåäìåòà:", IDC_LOCATIONITEM, 98, 46, 196, 8 + EDITTEXT IDC_LOCITEMEDIT, 97, 58, 133, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Îáçîð...", IDC_LOCBROWSE, 233, 58, 60, 14 + LTEXT "Íàòèñíåòå Íàïðåä çà ïðîäúëæàâàíå.", -1, 97, 95, 198, 8 +END + +IDD_SELPROGFOLDER DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Èçáåðåòå ïàïêà çà ïðîãðàìàòà" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Ïàïêà, â êîÿòî äà áúäå ñëîæåíà ïðåïðàòêàòà:", -1, 100, 7, 193, 10 + CONTROL "", IDC_SELFOLDER, "SYSTREEVIEW32", WS_BORDER | WS_TABSTOP | 0x00000028, 100, 19, 193, 90 + PUSHBUTTON "Íîâà &ïàïêà...", IDC_NEWFOLDERBTN, 218, 116, 75, 14 + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT +END + +IDD_SELPROGTITLE DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Èçáåðåòå çàãëàâèå çà ïðèëîæåíèåòî" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Íàïèøåòå èìå çà ïðåïðàòêàòà:", -1, 100, 10, 194, 10 + EDITTEXT IDC_NAMESCEDIT, 100, 23, 194, 14, ES_AUTOHSCROLL + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Íàòèñíåòå Êðàé çà ñúçäàâàíå íà ïðåïðàòêà.", -1, 100, 61, 194, 8 +END + +IDD_SELPROGICON DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Èçáîð íà çíà÷å" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Èçáåðåòå çíà÷å çà ïðåïðàòêàòà:", -1, 100, 8, 195, 10 + LISTBOX IDC_SELICONLIST, 100, 20, 192, 130, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT +END + +IDD_INSTFROMCD DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ñëàãàíå íà ïðèëîæåíèå îò ôëîïè èëè ÊÄ óñòðîéñòâî" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "", IDC_HEADTEXT, 101, 7, 193, 28 + ICON 0, IDC_INSTFROMCDICON, 100, 60, 18, 20 + LTEXT "", IDC_INSTFROMCDTEXT, 123, 66, 146, 8 +END + +IDD_RUNINSTPROG DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ïóñêàíå íà ïðîãðàìàòà çà ñëàãàíå" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "", IDC_HEADTEXT, 101, 6, 195, 28 + LTEXT "&Îòâàðÿíå:", IDC_LOCATIONITEM, 100, 53, 195, 8 + EDITTEXT IDC_LOCITEMEDIT, 98, 64, 133, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Îáçîð...", IDC_LOCBROWSE, 234, 64, 60, 14 +END + +IDD_CHANGEUSEROPT DIALOG 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ïðîìÿíà íà ïîòðåáèòåëñêèòå âúçìîæíîñòè" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Ìîæåòå äà íàïðàâèòå òîâà ïðèëîæåíèå äîñòúïíî çà âñè÷êè ïîòðåáèòåëè.", 1012, 101, 5, 194, 40 + AUTORADIOBUTTON "Ñëàãàíå", IDC_INSTALLRB, 108, 51, 146, 14, BS_MULTILINE | WS_GROUP + AUTORADIOBUTTON "Èçïúëíÿâàíå", IDC_LOCATIONITEM, 108, 74, 146, 14, BS_MULTILINE | NOT WS_TABSTOP +END + +IDD_FINISHADMINST DIALOG 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ïðèêëþ÷âàíå íà óïðàâíè÷åñêîòî ñëàãàíå" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Êîãàòî íàòèñíåòå Ïðèêëþ÷è, ñúñòîÿíèåòî íà INI ôàéëîâåòå ùå áúäå âúçñòàíîâåíî.", IDC_HEADTEXT, 98, 7, 196, 40 +END + +IDD_AFTERINST DIALOG 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ñëåä ñëàãàíåòî" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Íàòèñíåòå Íàïðåä.", IDC_HEADTEXT, 98, 7, 197, 40 +END + +IDD_RUNINSTPROG2 DIALOG 0, 0, 250, 120 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ïóñêàíå íà ïðîãðàìàòà çà ñëàãàíå" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Óêàæåòå ìÿñòîòî íà ïðîãðàìàòà çà ìàõàíå.", IDC_UNINSTLOCTEXT, 9, 8, 235, 37 + LTEXT "&Ðåä óïðàâëåíèå íà ïðîãðàìàòà çà ìàõàíå:", IDC_LOCATIONITEM, 9, 57, 237, 8 + EDITTEXT IDC_LOCITEMEDIT, 7, 69, 165, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Îáçîð...", IDC_LOCBROWSE, 178, 69, 66, 14 + DEFPUSHBUTTON "Äîáðå", IDOK, 118, 100, 60, 14 + PUSHBUTTON "Îòêàç", IDCANCEL, 184, 100, 60, 14 +END + +IDD_WARNING DIALOG 20, 20, 255, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "ÏÐÅÄÓÏÐÅÆÄÅÍÈÅ" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_WARNINGICON, 8, 10, 20, 20 + LTEXT "Èìà è äðóãè ïîòðåáèòåëè, âëåçëè â êîìïþòúðà.", -1, 37, 8, 214, 10 + LTEXT "Àêî ìàõíåòå òîâà ïðèëîæåíèå, äîêàòî äðóã ãî èçïîëçâà, òî ìîæå è äà íå áúäå ïðåìàõíàòî íàïúëíî.", -1, 37, 23, 212, 22 + LTEXT "Çà äà ïðîìåíèòå èëè ìàõíåòå òîâà ïðèëîæåíèå, ïðåâêëþ÷åòå ñå è èçëåçòå îò âñåêè îò ïîòðåáèòåëèòå, ïðåäè äà ïðîäúëæèòå.", IDC_WARNINGTEXT, 37, 46, 212, 26 + PUSHBUTTON "&Ïðåâêëþ÷âàíå íà ïîòðåáèòåëÿ", IDC_SWITCHUSER, 20, 81, 110, 14 + PUSHBUTTON "Ïðî&äúëæàâàíå", IDOK, 125, 81, 60, 14 + PUSHBUTTON "Îòêàç", IDCANCEL, 189, 81, 60, 14 +END + +IDD_REMSHORTCUTS DIALOGEX 20, 20, 220, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ïðåìàõâàíå íà ïðåïðàòêè/ïàïêè" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Çà äà ïðåìàõíåòå ïðåäìåò îò ïóñêîâèÿ èçáîðíèê, íàòèñíåòå ïðåäìåòà è ñëåä òîâà Ïðåìàõâàíå.", IDC_UNINSTLOCTEXT, 10, 7, 204, 16 + CONTROL "", IDC_SELFOLDER, "SYSTREEVIEW32", WS_BORDER | WS_TABSTOP | 0x00000023, 10, 28, 200, 145 + PUSHBUTTON "Ïðå&ìàõâàíå", IDC_REMOVEBTN, 84, 182, 60, 14 + DEFPUSHBUTTON "Çàòâàðÿíå", IDOK, 151, 182, 60, 14 +END + +IDD_ADDLATER DIALOGEX 0, 0, 220, 160 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTERMOUSE | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Îòëîæåíî äîáàâÿíå" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ìîæåòå äà èçáåðåòå äàòà è âðåìå, íà êîèòî äà áúäå äîáàâåíà òàçè ïðîãðàíà. Íàïðèìåð, ìîæåòå äà íàñðî÷èòå òîâà çà âðåìå, êîãàòî íå ñòå íà êîìïþòúðà ñè.", IDC_UNINSTLOCTEXT, 7, 4, 208, 33 + AUTORADIOBUTTON "&Îòëîæåíî äîáàâÿíå íà ïðèëîæåíèå", IDC_ADDPROGLATER, 7, 47, 207, 10, WS_GROUP + CONTROL "Picker", 12368, "SYSDATETIMEPICK32", WS_BORDER | WS_TABSTOP | 0x0000000C, 29, 62, 107, 14 + AUTORADIOBUTTON "Äà &íå ñå äîáàâÿ ïðèëîæåíèåòî", IDC_NOTADDPROG, 7, 87, 208, 10 + DEFPUSHBUTTON "Äîáðå", IDOK, 89, 141, 60, 14, WS_GROUP + PUSHBUTTON "Îòêàç", IDCANCEL, 154, 141, 60, 14, NOT WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Äîáàâÿíå èëè ïðåìàõâàíå íà ïðîãðàìè" + IDS_CPLSYSTEMDESCRIPTION "Ñëàãàíå è ìàõàíå íà ïðîãðàìè è ñúñòàâêè íà ÐåàêòÎÑ." + IDS_UNABLEOPEN_UNINSTKEY "Îòâàðÿíåòî íà êëþ÷úò çà ïðåìàõâàíå å íåâúçìîæíî" + IDS_LIST_TITLE "Ñïèñúê" + IDS_SIZE_TITLE "Ðàçìåð (ÌÁ)" + IDS_LAST_USED "Ïîñëåäíà óïîòðåáà" + IDS_PROGANDUPDATES "Ïðèëîæåíèÿ è îáíîâëåíèÿ" + IDS_PROGRAMS_ONLY "Ñàìî ïðèëîæåíèÿ" + IDS_UPDATES_ONLY "Ñàìî îáíîâëåíèÿ" + IDS_WELCOME_TITLE "Ïîìîùíèêúò çà ñëàãàíå è ìàõàíå íà ïðîãðàìè âè ïðèâåòñòâà." + IDS_WELCOME_MSG "Èçáåðåòå ðàçäåë âëÿâî èëè èçáåðåòå ïðèëîæåíèå îò ñïèñúêà, çà äà ãî ïðåìàõíåòå èëè äà ïîëó÷èòå ñâåäåíèÿ." + IDS_SEARCH_TEXT "Òúðñåíå â ñïèñúêà" + IDS_REMOVE_BTN "Ïðå&ìàõâàíå" + IDS_MODIFY_BTN "&Ïðîìÿíà" + IDS_UNABLEREAD_UNINSTSTR "Ïðî÷èòàíåòî íà ïðåìàõâàùèÿ íèç å íåâúçìîæíî. Ïîïúëíåíèåòî å íåïðàâèëíî èëè å áèëî ñúçäàäåíî îò MSI ñëàãà÷." + IDS_INF_REG_OWNER "Âïèñàí ñîáñòâåíèê:" + IDS_INF_PRODUCT_ID "ÎÓ íà ïðîèçâåäåíèåòî:" + IDS_INF_PUBLISHER "Èçäàòåë:" + IDS_INF_VERSION "Âåðñèÿ:" + IDS_INF_CONTACT "Çà âðúçêà:" + IDS_INF_SUP_INFO "Ñâåäåíèÿòà çà ïîääðúæêàòà:" + IDS_INF_SUP_PHONE "Òåëåôîí íà ïîääðúæêàòà:" + IDS_INF_PRODUCT_UPD "Îáíîâÿâàíèÿ íà ïðîèçâåäåíèåòî:" + IDS_INF_README "Ïðî÷åòèÌå:" + IDS_INF_COMMENTS "Çàáåëåæêè:" + IDS_NO_INFORMATION "Íÿìà ñâåäåíèÿ çà òîâà ïðèëîæåíèå." +END Propchange: trunk/reactos/dll/cpl/appwiz-new/lang/bg-BG.rc ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/dll/cpl/appwiz-new/lang/bg-Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/lang/bg… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/lang/bg-Bg.rc (original) +++ trunk/reactos/dll/cpl/appwiz-new/lang/bg-Bg.rc (removed) @@ -1,199 +1,0 @@ -LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT - -IDR_POPUP_APP MENU -BEGIN - POPUP "popup" - BEGIN - MENUITEM "Ïðå&ìàõâàíå", ID_APP_REMOVE - MENUITEM "&Ïðîìÿíà", ID_APP_MODIFY, GRAYED - END -END - -IDD_NETINSTALL DIALOGEX 0, 0, 242, 221 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Ñëàãàíå îò ìðåæà" -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "&Ñëàãàíå...", IDC_INSTALL, 150, 171, 85, 14 - LTEXT "&Ñëåäíèÿò ñîôòóåð ìîæå äà áúäå ñëîæåí îò ÐåàêòÎÑ. Çà äà ñëîæèòå ïðèëîæåíèå, èçáåðåòå ãî îò ñïèñúêà è íàòèñíåòå Ñëàãàíå.", IDC_NETTEXT, 40, 6, 195, 32 - LISTBOX IDC_NETPROGLIST, 7, 42, 228, 125, LBS_STANDARD | WS_TABSTOP - ICON IDI_APPICO, IDC_NETICON, 9, 10, 20, 20 -END - -IDD_CREATESHORTCUT DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Ñúçäàâàíå íà ïðåïðàòêà" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT - LTEXT "Âúëøåáíèêúò ùå âè ïîìîãíå äà ñúçäàäåòå ïðåïðàòêè êúì ìåñòíè èëè ìðåæîâè ïðîãðàìè, ôàéëîâå, êîìïþòðè èëè àäðåñè â èíòåðíåò.", -1, 97, 7, 195, 28 - LTEXT "&Íàïèøåòå ìÿñòîòî íà ïðåäìåòà:", IDC_LOCATIONITEM, 98, 46, 196, 8 - EDITTEXT IDC_LOCITEMEDIT, 97, 58, 133, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Îáçîð...", IDC_LOCBROWSE, 233, 58, 60, 14 - LTEXT "Íàòèñíåòå Íàïðåä çà ïðîäúëæàâàíå.", -1, 97, 95, 198, 8 -END - -IDD_SELPROGFOLDER DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Èçáåðåòå ïàïêà çà ïðîãðàìàòà" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Ïàïêà, â êîÿòî äà áúäå ñëîæåíà ïðåïðàòêàòà:", -1, 100, 7, 193, 10 - CONTROL "", IDC_SELFOLDER, "SYSTREEVIEW32", WS_BORDER | WS_TABSTOP | 0x00000028, 100, 19, 193, 90 - PUSHBUTTON "Íîâà &ïàïêà...", IDC_NEWFOLDERBTN, 218, 116, 75, 14 - CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT -END - -IDD_SELPROGTITLE DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Èçáåðåòå çàãëàâèå çà ïðèëîæåíèåòî" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Íàïèøåòå èìå çà ïðåïðàòêàòà:", -1, 100, 10, 194, 10 - EDITTEXT IDC_NAMESCEDIT, 100, 23, 194, 14, ES_AUTOHSCROLL - CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT - LTEXT "Íàòèñíåòå Êðàé çà ñúçäàâàíå íà ïðåïðàòêà.", -1, 100, 61, 194, 8 -END - -IDD_SELPROGICON DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Èçáîð íà çíà÷å" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Èçáåðåòå çíà÷å çà ïðåïðàòêàòà:", -1, 100, 8, 195, 10 - LISTBOX IDC_SELICONLIST, 100, 20, 192, 130, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP - CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT -END - -IDD_INSTFROMCD DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Ñëàãàíå íà ïðèëîæåíèå îò ôëîïè èëè ÊÄ óñòðîéñòâî" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT - LTEXT "", IDC_HEADTEXT, 101, 7, 193, 28 - ICON 0, IDC_INSTFROMCDICON, 100, 60, 18, 20 - LTEXT "", IDC_INSTFROMCDTEXT, 123, 66, 146, 8 -END - -IDD_RUNINSTPROG DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Ïóñêàíå íà ïðîãðàìàòà çà ñëàãàíå" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT - LTEXT "", IDC_HEADTEXT, 101, 6, 195, 28 - LTEXT "&Îòâàðÿíå:", IDC_LOCATIONITEM, 100, 53, 195, 8 - EDITTEXT IDC_LOCITEMEDIT, 98, 64, 133, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Îáçîð...", IDC_LOCBROWSE, 234, 64, 60, 14 -END - -IDD_CHANGEUSEROPT DIALOG 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Ïðîìÿíà íà ïîòðåáèòåëñêèòå âúçìîæíîñòè" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT - LTEXT "Ìîæåòå äà íàïðàâèòå òîâà ïðèëîæåíèå äîñòúïíî çà âñè÷êè ïîòðåáèòåëè.", 1012, 101, 5, 194, 40 - AUTORADIOBUTTON "Ñëàãàíå", IDC_INSTALLRB, 108, 51, 146, 14, BS_MULTILINE | WS_GROUP - AUTORADIOBUTTON "Èçïúëíÿâàíå", IDC_LOCATIONITEM, 108, 74, 146, 14, BS_MULTILINE | NOT WS_TABSTOP -END - -IDD_FINISHADMINST DIALOG 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Ïðèêëþ÷âàíå íà óïðàâíè÷åñêîòî ñëàãàíå" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT - LTEXT "Êîãàòî íàòèñíåòå Ïðèêëþ÷è, ñúñòîÿíèåòî íà INI ôàéëîâåòå ùå áúäå âúçñòàíîâåíî.", IDC_HEADTEXT, 98, 7, 196, 40 -END - -IDD_AFTERINST DIALOG 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Ñëåä ñëàãàíåòî" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT - LTEXT "Íàòèñíåòå Íàïðåä.", IDC_HEADTEXT, 98, 7, 197, 40 -END - -IDD_RUNINSTPROG2 DIALOG 0, 0, 250, 120 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Ïóñêàíå íà ïðîãðàìàòà çà ñëàãàíå" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Óêàæåòå ìÿñòîòî íà ïðîãðàìàòà çà ìàõàíå.", IDC_UNINSTLOCTEXT, 9, 8, 235, 37 - LTEXT "&Ðåä óïðàâëåíèå íà ïðîãðàìàòà çà ìàõàíå:", IDC_LOCATIONITEM, 9, 57, 237, 8 - EDITTEXT IDC_LOCITEMEDIT, 7, 69, 165, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Îáçîð...", IDC_LOCBROWSE, 178, 69, 66, 14 - DEFPUSHBUTTON "Äîáðå", IDOK, 118, 100, 60, 14 - PUSHBUTTON "Îòêàç", IDCANCEL, 184, 100, 60, 14 -END - -IDD_WARNING DIALOG 20, 20, 255, 100 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "ÏÐÅÄÓÏÐÅÆÄÅÍÈÅ" -FONT 8, "MS Shell Dlg" -BEGIN - ICON "", IDC_WARNINGICON, 8, 10, 20, 20 - LTEXT "Èìà è äðóãè ïîòðåáèòåëè, âëåçëè â êîìïþòúðà.", -1, 37, 8, 214, 10 - LTEXT "Àêî ìàõíåòå òîâà ïðèëîæåíèå, äîêàòî äðóã ãî èçïîëçâà, òî ìîæå è äà íå áúäå ïðåìàõíàòî íàïúëíî.", -1, 37, 23, 212, 22 - LTEXT "Çà äà ïðîìåíèòå èëè ìàõíåòå òîâà ïðèëîæåíèå, ïðåâêëþ÷åòå ñå è èçëåçòå îò âñåêè îò ïîòðåáèòåëèòå, ïðåäè äà ïðîäúëæèòå.", IDC_WARNINGTEXT, 37, 46, 212, 26 - PUSHBUTTON "&Ïðåâêëþ÷âàíå íà ïîòðåáèòåëÿ", IDC_SWITCHUSER, 20, 81, 110, 14 - PUSHBUTTON "Ïðî&äúëæàâàíå", IDOK, 125, 81, 60, 14 - PUSHBUTTON "Îòêàç", IDCANCEL, 189, 81, 60, 14 -END - -IDD_REMSHORTCUTS DIALOGEX 20, 20, 220, 200 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Ïðåìàõâàíå íà ïðåïðàòêè/ïàïêè" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Çà äà ïðåìàõíåòå ïðåäìåò îò ïóñêîâèÿ èçáîðíèê, íàòèñíåòå ïðåäìåòà è ñëåä òîâà Ïðåìàõâàíå.", IDC_UNINSTLOCTEXT, 10, 7, 204, 16 - CONTROL "", IDC_SELFOLDER, "SYSTREEVIEW32", WS_BORDER | WS_TABSTOP | 0x00000023, 10, 28, 200, 145 - PUSHBUTTON "Ïðå&ìàõâàíå", IDC_REMOVEBTN, 84, 182, 60, 14 - DEFPUSHBUTTON "Çàòâàðÿíå", IDOK, 151, 182, 60, 14 -END - -IDD_ADDLATER DIALOGEX 0, 0, 220, 160 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTERMOUSE | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Îòëîæåíî äîáàâÿíå" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Ìîæåòå äà èçáåðåòå äàòà è âðåìå, íà êîèòî äà áúäå äîáàâåíà òàçè ïðîãðàíà. Íàïðèìåð, ìîæåòå äà íàñðî÷èòå òîâà çà âðåìå, êîãàòî íå ñòå íà êîìïþòúðà ñè.", IDC_UNINSTLOCTEXT, 7, 4, 208, 33 - AUTORADIOBUTTON "&Îòëîæåíî äîáàâÿíå íà ïðèëîæåíèå", IDC_ADDPROGLATER, 7, 47, 207, 10, WS_GROUP - CONTROL "Picker", 12368, "SYSDATETIMEPICK32", WS_BORDER | WS_TABSTOP | 0x0000000C, 29, 62, 107, 14 - AUTORADIOBUTTON "Äà &íå ñå äîáàâÿ ïðèëîæåíèåòî", IDC_NOTADDPROG, 7, 87, 208, 10 - DEFPUSHBUTTON "Äîáðå", IDOK, 89, 141, 60, 14, WS_GROUP - PUSHBUTTON "Îòêàç", IDCANCEL, 154, 141, 60, 14, NOT WS_TABSTOP -END - -STRINGTABLE -BEGIN - IDS_CPLSYSTEMNAME "Äîáàâÿíå èëè ïðåìàõâàíå íà ïðîãðàìè" - IDS_CPLSYSTEMDESCRIPTION "Ñëàãàíå è ìàõàíå íà ïðîãðàìè è ñúñòàâêè íà ÐåàêòÎÑ." - IDS_UNABLEOPEN_UNINSTKEY "Îòâàðÿíåòî íà êëþ÷úò çà ïðåìàõâàíå å íåâúçìîæíî" - IDS_LIST_TITLE "Ñïèñúê" - IDS_SIZE_TITLE "Ðàçìåð (ÌÁ)" - IDS_LAST_USED "Ïîñëåäíà óïîòðåáà" - IDS_PROGANDUPDATES "Ïðèëîæåíèÿ è îáíîâëåíèÿ" - IDS_PROGRAMS_ONLY "Ñàìî ïðèëîæåíèÿ" - IDS_UPDATES_ONLY "Ñàìî îáíîâëåíèÿ" - IDS_WELCOME_TITLE "Ïîìîùíèêúò çà ñëàãàíå è ìàõàíå íà ïðîãðàìè âè ïðèâåòñòâà." - IDS_WELCOME_MSG "Èçáåðåòå ðàçäåë âëÿâî èëè èçáåðåòå ïðèëîæåíèå îò ñïèñúêà, çà äà ãî ïðåìàõíåòå èëè äà ïîëó÷èòå ñâåäåíèÿ." - IDS_SEARCH_TEXT "Òúðñåíå â ñïèñúêà" - IDS_REMOVE_BTN "Ïðå&ìàõâàíå" - IDS_MODIFY_BTN "&Ïðîìÿíà" - IDS_UNABLEREAD_UNINSTSTR "Ïðî÷èòàíåòî íà ïðåìàõâàùèÿ íèç å íåâúçìîæíî. Ïîïúëíåíèåòî å íåïðàâèëíî èëè å áèëî ñúçäàäåíî îò MSI ñëàãà÷." - IDS_INF_REG_OWNER "Âïèñàí ñîáñòâåíèê:" - IDS_INF_PRODUCT_ID "ÎÓ íà ïðîèçâåäåíèåòî:" - IDS_INF_PUBLISHER "Èçäàòåë:" - IDS_INF_VERSION "Âåðñèÿ:" - IDS_INF_CONTACT "Çà âðúçêà:" - IDS_INF_SUP_INFO "Ñâåäåíèÿòà çà ïîääðúæêàòà:" - IDS_INF_SUP_PHONE "Òåëåôîí íà ïîääðúæêàòà:" - IDS_INF_PRODUCT_UPD "Îáíîâÿâàíèÿ íà ïðîèçâåäåíèåòî:" - IDS_INF_README "Ïðî÷åòèÌå:" - IDS_INF_COMMENTS "Çàáåëåæêè:" - IDS_NO_INFORMATION "Íÿìà ñâåäåíèÿ çà òîâà ïðèëîæåíèå." -END

1 0

[dchapyshev] 32477: - Fix typos
by dchapyshev＠svn.reactos.org 25 Feb '08

25 Feb '08

Author: dchapyshev Date: Mon Feb 25 15:27:49 2008 New Revision: 32477 URL: http://svn.reactos.org/svn/reactos?rev=32477&view=rev Log: - Fix typos Modified: trunk/reactos/dll/cpl/intl/advanced.c Modified: trunk/reactos/dll/cpl/intl/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/advanced.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/advanced.c (original) +++ trunk/reactos/dll/cpl/intl/advanced.c Mon Feb 25 15:27:49 2008 @@ -58,7 +58,7 @@ } TCHAR Section[MAX_PATH]; - _stprintf(Section, TEXT("%s%d"), _T("CODEPAGE_REMOVE_"), uiCPage); + _stprintf(Section, _T("%s%d"), _T("CODEPAGE_REMOVE_"), uiCPage); if ((uiCPage == GetACP()) || (uiCPage == GetOEMCP()) || (!SetupFindFirstLine(hIntlInf, Section, _T("AddReg"), &infCont))) {

1 0

[dreimer] 32476: Bug 3093: Bulgarian language update of Vgafonteditor by sstpr@narod.ru
by dreimer＠svn.reactos.org 25 Feb '08

25 Feb '08

Author: dreimer Date: Mon Feb 25 13:29:44 2008 New Revision: 32476 URL: http://svn.reactos.org/svn/reactos?rev=32476&view=rev Log: Bug 3093: Bulgarian language update of Vgafonteditor by sstpr(a)narod.ru Modified: trunk/rosapps/devutils/vgafontedit/lang/bg-BG.rc Modified: trunk/rosapps/devutils/vgafontedit/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/bg-BG.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/bg-BG.rc Mon Feb 25 13:29:44 2008 @@ -75,7 +75,7 @@ IDS_DOCNAME, "Øðèôò %1!u!" IDS_SAVEPROMPT, "Ôàéëúò ""%1"" å ïðîìåíåí, íî íå å ñúõðàíåí.\n\nèñêàòå ëè äà ãî ñúõðíàèòå?" IDS_APPTITLE, "Îáðàáîò÷èêúò íà ÐåàêòÎÑ çà VGA øðèôòîâå" - IDS_CLOSEEDIT, "Please close all open Edit windows first!" + IDS_CLOSEEDIT, "Ïúðâî çàòâîðåòå âñè÷êè ïðîçîðöè çà îáðàáîòêà!" IDS_TOOLTIP_NEW, "Íîâ" IDS_TOOLTIP_OPEN, "Îòâàðÿíå"

1 0

[dreimer] 32475: Bug 3092: Bulgarian translation update by sstpr@narod.ru
by dreimer＠svn.reactos.org 25 Feb '08

25 Feb '08

Author: dreimer Date: Mon Feb 25 13:29:41 2008 New Revision: 32475 URL: http://svn.reactos.org/svn/reactos?rev=32475&view=rev Log: Bug 3092: Bulgarian translation update by sstpr(a)narod.ru Added: trunk/reactos/base/setup/vmwinst/lang/bg-BG.rc (with props) trunk/reactos/dll/cpl/appwiz-new/lang/bg-Bg.rc (with props) Modified: trunk/reactos/base/applications/winhelp/lang/bg-BG.rc trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/vmwinst/rsrc.rc trunk/reactos/dll/cpl/appwiz-new/rsrc.rc trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.c Modified: trunk/reactos/base/applications/winhelp/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/bg-BG.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/bg-BG.rc Mon Feb 25 13:29:41 2008 @@ -1,6 +1,8 @@ /* - * Help Viewer Bulgarian resource + * Help Viewer * + * Copyright 1996 Ulrich Schmid + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> * Copyright 2005 Milko Krachounov * * This library is free software; you can redistribute it and/or @@ -18,52 +20,69 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT +MAIN_MENU MENU { - POPUP "&Ôàéë" { - MENUITEM "&Îòâîðè", MNID_FILE_OPEN + POPUP "&Ôàéë" + { + MENUITEM "&Îòâàðÿíå", MNID_FILE_OPEN MENUITEM SEPARATOR MENUITEM "&Ïå÷àò", MNID_FILE_PRINT - MENUITEM "&Íàñòðîéêà íà ïðèíòåðà...", MNID_FILE_SETUP + MENUITEM "&Íàñòðîéêè íà ïå÷àòà÷à...", MNID_FILE_SETUP + MENUITEM SEPARATOR + MENUITEM "Èç&õîä", MNID_FILE_EXIT + } + POPUP "&Îáðàáîòêà" + { + MENUITEM "Çà&ïîìíÿíå", MNID_EDIT_COPYDLG MENUITEM SEPARATOR - MENUITEM "&Èçõîä", MNID_FILE_EXIT + MENUITEM "&Ðàçÿñíÿâàíå...", MNID_EDIT_ANNOTATE } - POPUP "&Ðåäàêòèðàíå" { - MENUITEM "&Êîïèðàé...", MNID_EDIT_COPYDLG + POPUP "&Îòìåòêà" + { + MENUITEM "&Çàäàâàíå...", MNID_BKMK_DEFINE + } + POPUP "Ïîìî&ù" + { + MENUITEM "Ïîìîù çà &ïîìîùòà", MNID_HELP_HELPON + MENUITEM "Âèíàãè îòãîðå", MNID_HELP_HELPTOP MENUITEM SEPARATOR - MENUITEM "&Àíîòèðàé...", MNID_EDIT_ANNOTATE - } - POPUP "&Îòìåòêè" { - MENUITEM "&Çàäàé...", MNID_BKMK_DEFINE - } - POPUP "&Ïîìîù" { - MENUITEM "Ïîìîù &çà ïîìîùòà", MNID_HELP_HELPON - MENUITEM "Âèíàãè îò&ãîðå", MNID_HELP_HELPTOP - MENUITEM SEPARATOR - MENUITEM "&Èíôîðìàöèÿ...", MNID_HELP_ABOUT + MENUITEM "&Ñâåäåíèÿ...", MNID_HELP_ABOUT #ifdef WINELIB - MENUITEM "&Îòíîñíî WINE", MNID_HELP_WINE + MENUITEM "&Çà...", MNID_HELP_WINE #endif } } +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Óêàçàòåë" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER + PUSHBUTTON "&Äîáðå", IDOK, 40, 170, 50, 12 + PUSHBUTTON "&Îòêàç", IDCANCEL, 120, 170, 50, 12 +} + /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE { -STID_WINE_HELP, "WINE Ïîìîù" +STID_WINE_HELP, "Ïîìîù" STID_WHERROR, "ÃÐÅØÊÀ" STID_WARNING, "ÏÐÅÄÓÏÐÅÆÄÅÍÈÅ" -STID_INFO, "Èíôîðìàöèÿ" -STID_NOT_IMPLEMENTED, "Íå å ðåàëèçèðàíî" -STID_HLPFILE_ERROR_s, "Ãðåøêà ïðè ÷åòåíå íà ïîìîùíèÿ ôàéë `%s'" +STID_INFO, "Ñâåäåíèå" +STID_NOT_IMPLEMENTED, "Íå å ãîòîâî" +STID_HLPFILE_ERROR_s, "Ãðåøêà ïðè ÷åòåíå íà ïîìîùåí ôàéë `%s'" STID_CONTENTS, "&Ñúäúðæàíèå" -STID_SEARCH, "&Òúðñè" -STID_BACK, "&Íàçàä" -STID_HISTORY, "&Èñòîðèÿ" +STID_SEARCH, "&Òúðñåíå" +STID_BACK, "Íà&çàä" +STID_HISTORY, "&Äíåâíèê" STID_TOPICS, "&Òåìè" STID_ALL_FILES, "Âñè÷êè ôàéëîâå (*.*)" STID_HELP_FILES_HLP, "Ïîìîùíè ôàéëîâå (*.hlp)" -STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" +STID_FILE_NOT_FOUND_s "Íå íàìèðàì '%s'. Èñêàòå ëè äà ãî íàìåðèòå ñàìè?" } Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h Mon Feb 25 13:29:41 2008 @@ -176,7 +176,7 @@ { 8, 16, - "- áâà®©¢ çêâ ¥ ¬®¦¥ ¤ ¨§âà¨¥ ¯êà¢¨ï à §è¨à¥ ¤ï« ®â ¤¨áª ", + "- áâà®©¢ çêâ ¥ ¬®¦¥ ¤ ¨§âà¨¥ ¯êà¢¨ï à §è¨à¥ ¤ï« ®â ¤¨áª , ", TEXT_NORMAL }, { @@ -194,7 +194,7 @@ { 8, 19, - "- à®¢¥àª â ä ©«®¢ â ãà¥¤¡ ¢á¥ ¥ ¥ £®â®¢ .", + "- à®¢¥àª â ä ©«®¢ â ãà¥¤¡ ¢á¥ ®é¥ ¥ ¥ £®â®¢ .", TEXT_NORMAL }, { @@ -538,7 +538,7 @@ { 8, 14, - " ¢¨¤ ª®¬¯îâêà .", + " á¬¥ïâ¥ ¢¨¤ ª®¬¯îâêà .", TEXT_NORMAL }, { @@ -675,7 +675,7 @@ { 8, 14, - " ¢¨¤ ¥ªà .", + " á¬¥ïâ¥ ¢¨¤ ¥ªà .", TEXT_NORMAL }, { @@ -727,7 +727,7 @@ { 0, 0, - " ENTER = ¯à¥§ ¯ãáª ¥ ª®¬¯îâêà ", + " ENTER = à¥§ ¯ãáª ¥ ª®¬¯îâêà ", TEXT_STATUS }, { @@ -808,7 +808,7 @@ { 8, 11, - "\x07 §¯®«¢ ©â¥ áâà¥«ª¨â¥ § ¨§¡®à ®â á¯¨áêª .", + "\x07 §¯®«§¢ ©â¥ áâà¥«ª¨â¥ § ¨§¡®à ®â á¯¨áêª .", TEXT_NORMAL }, { @@ -860,7 +860,7 @@ { 6, 10, - " áâà®©ª â é¥ ä®à¬ â¨à ¤ï« . â¨á¥â¥ ENTER § ¯à®¤ê«¦ ¢ ¥.", + "ï«êâ é¥ ¡ê¤¥ ä®à¬ â¨à . â¨á¥â¥ ENTER § ¯à®¤ê«¦ ¢ ¥.", TEXT_NORMAL }, { @@ -1051,7 +1051,7 @@ { 8, 14, - " ¢¨¤ ª« ¢¨ âãà â .", + " á¬¥ïâ¥ ¢¨¤ ª« ¢¨ âãà â .", TEXT_NORMAL }, { @@ -1103,7 +1103,7 @@ { 8, 14, - " ª« ¢¨ âãà â ¯®¤à¥¤¡ .", + " á¬¥ïâ¥ ª« ¢¨ âãà â ¯®¤à¥¤¡ .", TEXT_NORMAL }, { @@ -1226,13 +1226,13 @@ { 8, 21, - "\x07 â¨á¥â¥ ESC § ¤ á¥ ®âª ¦¥â¥.", - TEXT_NORMAL - }, - { - 0, - 0, - " D = ¨§âà¨¢ ¥ ¤ï« , ESC = âª § F3 = §å®¤", + "\x07 â¨á¥â¥ ESC, § ¤ á¥ ®âª ¦¥â¥.", + TEXT_NORMAL + }, + { + 0, + 0, + " D = §âà¨¢ ¥ ¤ï« , ESC = âª § F3 = §å®¤", TEXT_STATUS }, { @@ -1316,7 +1316,7 @@ }, { //ERROR_WRITE_BOOT, - "Setup failed to install FAT bootcode on the system partition.", + "¥ãá¯¥è® á« £ ¥ ®§ ç ¢ è § ¯¨á (bootcode) § FAT ¢ á¨áâ¥¬¨ï ¤ï«.", "ENTER = à¥§ ¯ãáª ¥ ª®¬¯îâêà " }, { @@ -1404,22 +1404,22 @@ { //ERROR_INITIALIZE_REGISTRY, //There is something wrong with this line. - "Setup failed to set the initialize the registry.", + "¥ãá¯¥è® ®§ ç ¢ ¥ à¥£¨áâêà .", "ENTER = à¥§ ¯ãáª ¥ ª®¬¯îâêà " }, { //ERROR_INVALID_CABINET_INF, - "Cabinet has no valid inf file.\n", + "Cab ä ©«êâ ï¬ ¯à ¢¨«¥ inf ä ©«.\n", "ENTER = à¥§ ¯ãáª ¥ ª®¬¯îâêà " }, { //ERROR_CABINET_MISSING, - "Cabinet not found.\n", + "Cab ä ©«êâ ¥ ¥ ®âªà¨â.\n", "ENTER = à¥§ ¯ãáª ¥ ª®¬¯îâêà " }, { //ERROR_CABINET_SCRIPT, - "Cabinet has no setup script.\n", + "Cab ä ©«êâ ï¬ áâà®¥ç® ¯¨á ¨¥.\n", "ENTER = à¥§ ¯ãáª ¥ ª®¬¯îâêà " }, { @@ -1440,8 +1440,8 @@ }, { //ERROR_CABINET_SECTION, - "Setup failed to find the 'Directories' section\n" - "in the cabinet.\n", + " §¤¥«êâ 'Directories' ¥ ¡¥ ®âªà¨â\n" + "¢ cab ä ©« .\n", "ENTER = à¥§ ¯ãáª ¥ ª®¬¯îâêà " }, { @@ -1467,7 +1467,7 @@ }, { //ERROR_UPDATE_LOCALESETTINGS, - "Setup could not set the system locale.\n" + "¥ãá¯¥è® ãáâ ®¢ï¢ ¥ ¬¥áâ¨â¥ áâà®©ª¨.\n" "ENTER = à¥§ ¯ãáª ¥ ª®¬¯îâêà " }, { @@ -1580,115 +1580,115 @@ MUI_STRING bgBGStrings[] = { {STRING_PLEASEWAIT, - " Please wait..."}, + " ®ç ª ©â¥..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Install C = Create Partition F3 = Quit"}, + " ENTER = « £ ¥ C = ê§¤ ¢ ¥ ¤ï« F3 = §å®¤"}, {STRING_INSTALLDELETEPARTITION, - " ENTER = Install D = Delete Partition F3 = Quit"}, + " ENTER = « £ ¥ D = §âà¨¢ ¥ ¤ï« F3 = §å®¤"}, {STRING_PARTITIONSIZE, - "Size of new partition:"}, + " §¬¥à ®¢¨ï ¤ï«:"}, {STRING_CHOOSENEWPARTITION, - "You have chosen to create a new partition on"}, + "§¡à «¨ áâ¥ ¤ áê§¤ ¤¥â¥ ®¢ ¤ï« "}, {STRING_HDDSIZE, - "Please enter the size of the new partition in megabytes."}, + "ê¢¥¤¥â¥ à §¬¥à ®¢¨ï ¤ï« (¢ ¬¥£ ¡ ©â¨)."}, {STRING_CREATEPARTITION, - " ENTER = Create Partition ESC = Cancel F3 = Quit"}, + " ENTER = ê§¤ ¢ ¥ ¤ï« ESC = âª § F3 = §å®¤"}, {STRING_PARTFORMAT, - "This Partition will be formatted next."}, + "à¥¤áâ®¨ ä®à¬ â¨à ¥ ¤ï« ."}, {STRING_NONFORMATTEDPART, - "You chose to install ReactOS on a new or unformatted Partition."}, + "§¡à «¨ áâ¥ ¤ á«®¦¨â¥ ¥ ªâ ®¢ ¨«¨ ¥à §¯à¥¤¥«¥ ¤ï«."}, {STRING_INSTALLONPART, "Setup install ReactOS onto Partition"}, {STRING_CHECKINGPART, - "Setup is now checking the selected partition."}, + "¥ç¥ ¯à®¢¥àª ¨§¡à ¨ï ¤ï«."}, {STRING_QUITCONTINUE, - "F3= Quit ENTER = Continue"}, + "F3= §å®¤ ENTER = à®¤ê«¦ ¢ ¥"}, {STRING_REBOOTCOMPUTER, - "ENTER = Reboot computer"}, + "ENTER = à¥§ ¯ãáª ¥ ª®¬¯îâêà "}, {STRING_TXTSETUPFAILED, - "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, + "¥ ¡¥ ¬¥à¥ à §¤¥« '%S'\n¢ TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copying file: %S"}, + " \xB3 ¯¨á ä ©«: %S"}, {STRING_SETUPCOPYINGFILES, - "Setup is copying files..."}, + "¥ç¥ § ¯¨á¢ ¥ ä ©«®¢¥â¥..."}, {STRING_PAGEDMEM, - "Paged Memory"}, + "âà ¨à "}, {STRING_NONPAGEDMEM, - "Nonpaged Memory"}, + "¥áâà ¨à "}, {STRING_FREEMEM, - "Free Memory"}, + "¢®¡®¤ ¯ ¬¥â"}, {STRING_REGHIVEUPDATE, - " Updating registry hives..."}, + " áê¢à¥¬¥ï¢ ¥ à¥£¨áâêà¨â¥ à®¥¢¥..."}, {STRING_IMPORTFILE, - " Importing %S..."}, + " áï¥ %S..."}, {STRING_DISPLAYETTINGSUPDATE, - " Updating display registry settings..."}, + " áê¢à¥¬¥ï¢ ¥ à¥£¨áâà®¢¨â¥ áâà®©ª¨ ¥ªà ..."}, {STRING_LOCALESETTINGSUPDATE, - " Updating locale settings..."}, + " áê¢à¥¬¥ï¢ ¥ ¬¥áâ¨â¥ áâà®©ª¨..."}, {STRING_KEYBOARDSETTINGSUPDATE, - " Updating keyboard layout settings..."}, + " áê¢à¥¬¥ï¢ ¥ áâà®©ª¨â¥ ª« ¢¨ âãà¨â¥ ¯®¤à¥¤¡¨..."}, {STRING_CODEPAGEINFOUPDATE, - " Adding codepage information to registry..."}, + " ®¡ ¢ï¥ ¢ à¥£¨áâêà á¢¥¤¥¨ï § § ª®¢¨ï ¡®à..."}, {STRING_DONE, - " Done..."}, + " ®â®¢®..."}, {STRING_REBOOTCOMPUTER2, - " ENTER = Reboot computer"}, + " ENTER = à¥§ ¯ãáª ¥ ª®¬¯îâêà "}, {STRING_CONSOLEFAIL1, - "Unable to open the console\n\n"}, + "â¢ àï¥â® ª®§®« â ¥ ¥¢ê§¬®¦®\n\n"}, {STRING_CONSOLEFAIL2, - "The most common cause of this is using an USB keyboard\n"}, + "®¢ á¥ á«ãç¢ ©- ç¥áâ® ¯à¨ ã¯®âà¥¡ USB ª« ¢¨ âãà \n"}, {STRING_CONSOLEFAIL3, - "USB keyboards are not fully supported yet\n"}, + "®¤¤àê¦ª â USB ¥ ¢á¥ ®é¥ ¥¯ê« \n"}, {STRING_FORMATTINGDISK, - "Setup is formatting your disk"}, + "¥ç¥ ä®à¬ â¨à ¥ ¤¨áª "}, {STRING_CHECKINGDISK, - "Setup is checking your disk"}, + "¥ç¥ ¯à®¢¥àª ¤¨áª "}, {STRING_FORMATDISK1, - " Format partition as %S file system (quick format) "}, + " ®à¬ â¨à ¥ ¤ï« ª â® %S ä ©«®¢ ãà¥¤¡ (¡êà§® ä®à¬ â¨à ¥) "}, {STRING_FORMATDISK2, - " Format partition as %S file system "}, + " ®à¬ â¨à ¥ ¤ï« ª â® %S ä ©«®¢ ãà¥¤¡ "}, {STRING_KEEPFORMAT, - " Keep current file system (no changes) "}, + " ¯ §¢ ¥ ä ©«®¢ â ãà¥¤¡ (¡¥§ ¯à®¬¥¨) "}, {STRING_HDINFOPARTCREATE, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + "%I64u %s â¢êà¤ ¤¨áª %lu (§¢®¤=%hu, ¨ =%hu, =%hu) %wZ."}, {STRING_HDDINFOUNK1, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + "%I64u %s â¢êà¤ ¤¨áª %lu (§¢®¤=%hu, ¨ =%hu, =%hu)."}, {STRING_HDDINFOUNK2, - " %c%c Type %lu %I64u %s"}, + " %c%c ¢¨¤ %lu %I64u %s"}, {STRING_HDINFOPARTDELETE, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + " %I64u %s â¢êà¤ ¤¨áª %lu (§¢®¤=%hu, ¨ =%hu, =%hu) %wZ."}, {STRING_HDDINFOUNK3, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + " %I64u %s â¢êà¤ ¤¨áª %lu (§¢®¤=%hu, ¨ =%hu, =%hu)."}, {STRING_HDINFOPARTZEROED, - "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + "â¢êà¤ ¤¨áª %lu (%I64u %s), §¢®¤=%hu, ¨ =%hu, =%hu (%wZ)."}, {STRING_HDDINFOUNK4, - "%c%c Type %lu %I64u %s"}, + "%c%c ¢¨¤ %lu %I64u %s"}, {STRING_HDINFOPARTEXISTS, - "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + " â¢êà¤ ¤¨áª %lu (%I64u %s), §¢®¤=%hu, ¨ =%hu, =%hu (%wZ)."}, {STRING_HDDINFOUNK5, - "%c%c Type %-3u %6lu %s"}, + "%c%c ¢¨¤ %-3u %6lu %s"}, {STRING_HDINFOPARTSELECT, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, + "%6lu %s â¢êà¤ ¤¨áª %lu (§¢®¤=%hu, ¨ =%hu, =%hu) %S"}, {STRING_HDDINFOUNK6, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + "%6lu %s â¢êà¤ ¤¨áª %lu (§¢®¤=%hu, ¨ =%hu, =%hu)"}, {STRING_NEWPARTITION, - "Setup created a new partition on"}, + "¥ áê§¤ ¤¥ ®¢ ¤ï« "}, {STRING_UNPSPACE, - " Unpartitioned space %6lu %s"}, + " ¥à §¯à¥¤¥«¥® ¬ïáâ® %6lu %s"}, {STRING_MAXSIZE, - "MB (max. %lu MB)"}, + " (¤® %lu )"}, {STRING_UNFORMATTED, - "New (Unformatted)"}, + "®¢ (¥ä®à¬ â¨à )"}, {STRING_FORMATUNUSED, - "Unused"}, + "¥¨§¯®«§¢ "}, {STRING_FORMATUNKNOWN, - "Unknown"}, + "¥¨§¢¥áâ¥"}, {STRING_KB, - "KB"}, + ""}, {STRING_MB, - "MB"}, + ""}, {STRING_GB, - "GB"}, + ""}, {0, 0} }; Added: trunk/reactos/base/setup/vmwinst/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/bg… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/bg-BG.rc (added) +++ trunk/reactos/base/setup/vmwinst/lang/bg-BG.rc Mon Feb 25 13:29:41 2008 @@ -1,0 +1,131 @@ +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + +IDD_WELCOMEPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ñëàãàíå íà âèäåî âîäà÷" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "ÐåàêòÎÑ óñòàíîâè, ÷å ñòå ãî ïóñíàëè âúâ VMware(r).", -1, 100, 8, 160, 24 + LTEXT "Àêî èñêàòå äà ñëîæèòå SVGA âîäà÷à (driver) VMware(r), íàòèñíåòå Íàïðåä, â ïðîòèâåí ñëó÷àé íàòèñíåòå Îòêàç.", -1, 100, 140, 160, 24 +END + +IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ñëàãàíå íà âèäåî âîäà÷ (driver)" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "ÐåàêòÎÑ èäâà áåç SVGA âîäà÷à (driver) VMware(r).\n\nÇàòîâà, îòèäåòå âúâ VM â ìåíþòî íà ðàáîòíàòà âè óñòàíîâêà íà VMware(r) è èçáåðåòå Ñëîæè VMware ñðåäñòâàòà...\n\n\nÍàòèñíåòå Íàïðåä, çà äà ïðîäúëæèòå èëè Îòêàç, çà äà ïðåêðàòèòå ñëàãàíåòî íà SVGA âîäà÷.",-1,25,25,225,85 +END + +IDD_INSTALLING_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ñëàãàíå íà âèäåî âîäà÷ (driver)" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "{STATUS}",IDC_INSTALLINGSTATUS,25,68,225,8 + CONTROL "", IDC_INSTALLINGPROGRESS, "msctls_progress32", PBS_MARQUEE | WS_CHILD | WS_VISIBLE | WS_BORDER, 25, 80, 225, 8 +END + +IDD_CONFIG DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ñëàãàíå íà âèäåî âîäà÷ (driver)" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Âîäà÷úò (driver) VMware(r) SVGA áå ñëîæåí óñïåøíî. Èçáåðåòå ðàçäåëèòåëíà ñïîñîáíîñò íà åêðàíà:",-1,25,5,225,20 + PUSHBUTTON "640x480", 540, 25, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "800x600", 1400, 25, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1024x768", 1792, 25, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1152x864", 2016, 25, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x960", 2240, 110, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x1024", 2304, 110, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1400x1050", 2450, 110, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1600x1200", 2800, 110, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1792x1344", 3136, 195, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1856x1392", 3248, 195, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1920x1440", 3360, 195, 60, 50, 15, BS_AUTORADIOBUTTON + LTEXT "Èçáåðåòå êà÷åñòâî íà öâåòà:", -1, 25, 93, 225, 12 + COMBOBOX IDC_COLORQUALITY, 25, 105, 75, 80, CBS_DROPDOWNLIST | WS_TABSTOP +END + +IDD_INSTALLATION_FAILED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ñëàãàíå íà âèäåî âîäà÷ (driver)" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Ñëàãà÷úò íà ÐåàêòÎÑ íå óñïÿ äà ñëîæè âîäà÷à VMware(r) SVGA.\n\n\nÍàòèñíåòå Ïðèêëþ÷è çà äà ïðîäúëæèòå ñëàãàíåòî.",-1,25,25,225,85 +END + +IDD_CHOOSEACTION DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ñëàãàíå íà âèäåî âîäà÷ (driver)" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "SVGA âîäà÷úò VMware(r) âå÷å å ñëîæåí.\n\nÈçáåðåòå îò ñëåäíèòå âúçìîæíîñòè:",-1,25,5,225,30 + PUSHBUTTON "Íàñòðîéêè íà åêðàíà", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Èçïîëçâàíå íà äðóã ãðàôè÷åí âîäà÷ (driver)", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Ïðåìàõâàíå íà SVGA âîäà÷à VMware(r)", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON + LTEXT "Íàòèñíåòå Íàïðåä, çà äà ïðîäúëæèòå èëè Îòêàç, çà äà èçëåçåòå îò ñúâåòíèêà.", -1, 25, 93, 225, 19 +END + +IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ñëàãàíå íà âèäåî âîäà÷" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Èçáåðåòå ãðàôè÷íèÿ âîäà÷, êîéòî èñêàòå äà èçïîëçâàòå:",-1,25,25,225,15 + PUSHBUTTON "VGA ", IDC_VGA, 25, 40, 225, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "VBE âîäà÷ (SVGA) íà ÐåàêòÎÑ", IDC_VBE, 25, 55, 225, 15, BS_AUTORADIOBUTTON + LTEXT "Íàòèñíåòå Êðàé, çà äà ïðèêëþ÷èòå äåéñòâèåòî èëè Îòêàç, çà äà èçëåçåòå áåç äà ïðèëàãàòå ïðîìåíè.", -1, 25, 93, 225, 20 +END + +IDD_DOUNINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ñëàãàíå íà âèäåî âîäà÷" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Íàñòðîéêàòà íà ÐåàêòÎÑ ùå ïðåìàõíå SVGA âîäà÷à VMware(r)!!!\n\n\nÍàòèñíåòå Ïðèêëþ÷è, çà äà ïðåìàõíåòå âîäà÷à èëè Îòêàç, çà äà îñòàâèòå íåùàòà êàêòî ñà ñè.",-1,25,25,225,85 +END + +STRINGTABLE +BEGIN + IDS_WIZARD_NAME "Îòêðèò å VMware(r)" + IDS_FAILEDTOLOCATEDRIVERS "Íàñòðîéêàòà íà ÐåàêòÎÑ íå óñïÿ äà îòêðèå íóæíèòå ôàéëîâå.\nÏðîâåðåòå äàëè å ïîñòàâåí êîìïàêòíèÿò äèñê VMware(r) ñðåäñòâàòà." + IDS_FAILEDTOCOPYFILES "Íàñòðîéêàòà íà ÐåàêòÎÑ íå óñïÿ äà îòêðèå íóæíèòå ôàéëîâå.\nÏðîâåðåòå äàëè å ïîñòàâåí êîìïàêòíèÿò äèñê VMware(r) ñðåäñòâàòà.\n" + IDS_FAILEDTOACTIVATEDRIVER "Íåóñïåøíî çàäåéñòâàíå íà SVGA âîäà÷à VMware(r)!" + IDS_FAILEDTOSELVGADRIVER "Íåóñïåøíî çàäåéñòâàíå íà VGA âîäà÷à íà ReactOS!" + IDS_FAILEDTOSELVBEDRIVER "Íåóñïåøíî çàäåéñòâàíå íà VGA âîäà÷à íà ReactOS!" + IDS_UNINSTNOTICE "Ôàéëîâåòå íà SVGA âîäà÷à VMware(r) âñå îùå íå ñà èçòðèòè.\nÈòðèéòå ãè ðú÷íî ñëåä ïðåçàïóñêàíå íà óðåäáàòà." + IDS_FAILEDTOADDREGENTRIES "Íåóñïåõ ïðè ñúçäàâàíå íà ïîïúëíåíèÿ â ðåãèñòúðà çà SVGA âîäà÷à VMware(r)!" +END + +STRINGTABLE +BEGIN + 10001 "Íàé- íèñêî (8Á/Ò)" + 10002 "Ñðåäíî (16Á/Ò)" + 10003 "Íàé- âèñîêî (32Á/Ò)" +END + +STRINGTABLE +BEGIN + IDS_SEARCHINGFORCDROM "Òúðñåíå íà ÊÄ ñ VMware(r) Tools..." + IDS_COPYINGFILES "Çàïèñ íà ôàéëîâåòå..." + IDS_ENABLINGDRIVER "Âêëþ÷âàíå íà SVGA âîäà÷ VMware(r)..." +END + +STRINGTABLE +BEGIN + IDD_INSERT_VMWARE_TOOLSTITLE "Âúëøåáíèê çà ïîñòàâÿíåòî íà SVGA âîäà÷ VMware (r)" + IDD_INSERT_VMWARE_TOOLSSUBTITLE "Ïîñòàâåòå ÊÄ ñ VMware tool." + IDD_INSTALLING_VMWARE_TOOLSTITLE "Âúëøåáíèê çà ïîñòàâÿíåòî íà SVGA âîäà÷ VMware (r)" + IDD_INSTALLING_VMWARE_TOOLSSUBTITLE "Òúðñåíå è ïðåçàïèñ íà SVGA âîäà÷ VMware (r)." + IDD_CONFIGTITLE "Âúëøåáíèê çà ïîñòàâÿíåòî íà SVGA âîäà÷ VMware (r)" + IDD_CONFIGSUBTITLE "Èçáåðåòå ðàçäåëèòåëíà ñïîñîáíîñò." + IDD_INSTALLATION_FAILEDTITLE "Âúëøåáíèê çà ïîñòàâÿíåòî íà SVGA âîäà÷ VMware (r)" + IDD_INSTALLATION_FAILEDSUBTITLE "Íåóñïåøíî ïîñòàâÿíåòî âîäà÷ VMware (r) SVGA." + IDD_CHOOSEACTIONTITLE "Âúëøåáíèê çà ïîñòàâÿíåòî íà SVGA âîäà÷ VMware (r)" + IDD_CHOOSEACTIONSUBTITLE "Èçáåðåòå êàêâî äà íàïðàâèòå." + IDD_SELECTDRIVERTITLE "Âúëøåáíèê çà ïîñòàâÿíåòî íà SVGA âîäà÷ VMware (r)" + IDD_SELECTDRIVERSUBTITLE "Èçáîð íà âîäà÷." + IDD_DOUNINSTALLTITLE "Âúëøåáíèê çà ïîñòàâÿíåòî íà SVGA âîäà÷ VMware (r)" + IDD_DOUNINSTALLSUBTITLE "Ïðåìàõâàíå íà âîäà÷à." +END Propchange: trunk/reactos/base/setup/vmwinst/lang/bg-BG.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/setup/vmwinst/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/rsrc.rc… ============================================================================== --- trunk/reactos/base/setup/vmwinst/rsrc.rc (original) +++ trunk/reactos/base/setup/vmwinst/rsrc.rc Mon Feb 25 13:29:41 2008 @@ -12,6 +12,7 @@ * files. Note that you can and may override resources which also have * a neutral version. This is to get localized bitmaps for example. */ +#include "lang/bg-BG.rc" #include "lang/cs-CZ.rc" #include "lang/da-DK.rc" #include "lang/de-DE.rc" Added: trunk/reactos/dll/cpl/appwiz-new/lang/bg-Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/lang/bg… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/lang/bg-Bg.rc (added) +++ trunk/reactos/dll/cpl/appwiz-new/lang/bg-Bg.rc Mon Feb 25 13:29:41 2008 @@ -1,0 +1,199 @@ +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + +IDR_POPUP_APP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "Ïðå&ìàõâàíå", ID_APP_REMOVE + MENUITEM "&Ïðîìÿíà", ID_APP_MODIFY, GRAYED + END +END + +IDD_NETINSTALL DIALOGEX 0, 0, 242, 221 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ñëàãàíå îò ìðåæà" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "&Ñëàãàíå...", IDC_INSTALL, 150, 171, 85, 14 + LTEXT "&Ñëåäíèÿò ñîôòóåð ìîæå äà áúäå ñëîæåí îò ÐåàêòÎÑ. Çà äà ñëîæèòå ïðèëîæåíèå, èçáåðåòå ãî îò ñïèñúêà è íàòèñíåòå Ñëàãàíå.", IDC_NETTEXT, 40, 6, 195, 32 + LISTBOX IDC_NETPROGLIST, 7, 42, 228, 125, LBS_STANDARD | WS_TABSTOP + ICON IDI_APPICO, IDC_NETICON, 9, 10, 20, 20 +END + +IDD_CREATESHORTCUT DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ñúçäàâàíå íà ïðåïðàòêà" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Âúëøåáíèêúò ùå âè ïîìîãíå äà ñúçäàäåòå ïðåïðàòêè êúì ìåñòíè èëè ìðåæîâè ïðîãðàìè, ôàéëîâå, êîìïþòðè èëè àäðåñè â èíòåðíåò.", -1, 97, 7, 195, 28 + LTEXT "&Íàïèøåòå ìÿñòîòî íà ïðåäìåòà:", IDC_LOCATIONITEM, 98, 46, 196, 8 + EDITTEXT IDC_LOCITEMEDIT, 97, 58, 133, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Îáçîð...", IDC_LOCBROWSE, 233, 58, 60, 14 + LTEXT "Íàòèñíåòå Íàïðåä çà ïðîäúëæàâàíå.", -1, 97, 95, 198, 8 +END + +IDD_SELPROGFOLDER DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Èçáåðåòå ïàïêà çà ïðîãðàìàòà" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Ïàïêà, â êîÿòî äà áúäå ñëîæåíà ïðåïðàòêàòà:", -1, 100, 7, 193, 10 + CONTROL "", IDC_SELFOLDER, "SYSTREEVIEW32", WS_BORDER | WS_TABSTOP | 0x00000028, 100, 19, 193, 90 + PUSHBUTTON "Íîâà &ïàïêà...", IDC_NEWFOLDERBTN, 218, 116, 75, 14 + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT +END + +IDD_SELPROGTITLE DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Èçáåðåòå çàãëàâèå çà ïðèëîæåíèåòî" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Íàïèøåòå èìå çà ïðåïðàòêàòà:", -1, 100, 10, 194, 10 + EDITTEXT IDC_NAMESCEDIT, 100, 23, 194, 14, ES_AUTOHSCROLL + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Íàòèñíåòå Êðàé çà ñúçäàâàíå íà ïðåïðàòêà.", -1, 100, 61, 194, 8 +END + +IDD_SELPROGICON DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Èçáîð íà çíà÷å" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Èçáåðåòå çíà÷å çà ïðåïðàòêàòà:", -1, 100, 8, 195, 10 + LISTBOX IDC_SELICONLIST, 100, 20, 192, 130, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT +END + +IDD_INSTFROMCD DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ñëàãàíå íà ïðèëîæåíèå îò ôëîïè èëè ÊÄ óñòðîéñòâî" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "", IDC_HEADTEXT, 101, 7, 193, 28 + ICON 0, IDC_INSTFROMCDICON, 100, 60, 18, 20 + LTEXT "", IDC_INSTFROMCDTEXT, 123, 66, 146, 8 +END + +IDD_RUNINSTPROG DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ïóñêàíå íà ïðîãðàìàòà çà ñëàãàíå" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "", IDC_HEADTEXT, 101, 6, 195, 28 + LTEXT "&Îòâàðÿíå:", IDC_LOCATIONITEM, 100, 53, 195, 8 + EDITTEXT IDC_LOCITEMEDIT, 98, 64, 133, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Îáçîð...", IDC_LOCBROWSE, 234, 64, 60, 14 +END + +IDD_CHANGEUSEROPT DIALOG 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ïðîìÿíà íà ïîòðåáèòåëñêèòå âúçìîæíîñòè" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Ìîæåòå äà íàïðàâèòå òîâà ïðèëîæåíèå äîñòúïíî çà âñè÷êè ïîòðåáèòåëè.", 1012, 101, 5, 194, 40 + AUTORADIOBUTTON "Ñëàãàíå", IDC_INSTALLRB, 108, 51, 146, 14, BS_MULTILINE | WS_GROUP + AUTORADIOBUTTON "Èçïúëíÿâàíå", IDC_LOCATIONITEM, 108, 74, 146, 14, BS_MULTILINE | NOT WS_TABSTOP +END + +IDD_FINISHADMINST DIALOG 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ïðèêëþ÷âàíå íà óïðàâíè÷åñêîòî ñëàãàíå" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Êîãàòî íàòèñíåòå Ïðèêëþ÷è, ñúñòîÿíèåòî íà INI ôàéëîâåòå ùå áúäå âúçñòàíîâåíî.", IDC_HEADTEXT, 98, 7, 196, 40 +END + +IDD_AFTERINST DIALOG 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ñëåä ñëàãàíåòî" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Íàòèñíåòå Íàïðåä.", IDC_HEADTEXT, 98, 7, 197, 40 +END + +IDD_RUNINSTPROG2 DIALOG 0, 0, 250, 120 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ïóñêàíå íà ïðîãðàìàòà çà ñëàãàíå" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Óêàæåòå ìÿñòîòî íà ïðîãðàìàòà çà ìàõàíå.", IDC_UNINSTLOCTEXT, 9, 8, 235, 37 + LTEXT "&Ðåä óïðàâëåíèå íà ïðîãðàìàòà çà ìàõàíå:", IDC_LOCATIONITEM, 9, 57, 237, 8 + EDITTEXT IDC_LOCITEMEDIT, 7, 69, 165, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Îáçîð...", IDC_LOCBROWSE, 178, 69, 66, 14 + DEFPUSHBUTTON "Äîáðå", IDOK, 118, 100, 60, 14 + PUSHBUTTON "Îòêàç", IDCANCEL, 184, 100, 60, 14 +END + +IDD_WARNING DIALOG 20, 20, 255, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "ÏÐÅÄÓÏÐÅÆÄÅÍÈÅ" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_WARNINGICON, 8, 10, 20, 20 + LTEXT "Èìà è äðóãè ïîòðåáèòåëè, âëåçëè â êîìïþòúðà.", -1, 37, 8, 214, 10 + LTEXT "Àêî ìàõíåòå òîâà ïðèëîæåíèå, äîêàòî äðóã ãî èçïîëçâà, òî ìîæå è äà íå áúäå ïðåìàõíàòî íàïúëíî.", -1, 37, 23, 212, 22 + LTEXT "Çà äà ïðîìåíèòå èëè ìàõíåòå òîâà ïðèëîæåíèå, ïðåâêëþ÷åòå ñå è èçëåçòå îò âñåêè îò ïîòðåáèòåëèòå, ïðåäè äà ïðîäúëæèòå.", IDC_WARNINGTEXT, 37, 46, 212, 26 + PUSHBUTTON "&Ïðåâêëþ÷âàíå íà ïîòðåáèòåëÿ", IDC_SWITCHUSER, 20, 81, 110, 14 + PUSHBUTTON "Ïðî&äúëæàâàíå", IDOK, 125, 81, 60, 14 + PUSHBUTTON "Îòêàç", IDCANCEL, 189, 81, 60, 14 +END + +IDD_REMSHORTCUTS DIALOGEX 20, 20, 220, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ïðåìàõâàíå íà ïðåïðàòêè/ïàïêè" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Çà äà ïðåìàõíåòå ïðåäìåò îò ïóñêîâèÿ èçáîðíèê, íàòèñíåòå ïðåäìåòà è ñëåä òîâà Ïðåìàõâàíå.", IDC_UNINSTLOCTEXT, 10, 7, 204, 16 + CONTROL "", IDC_SELFOLDER, "SYSTREEVIEW32", WS_BORDER | WS_TABSTOP | 0x00000023, 10, 28, 200, 145 + PUSHBUTTON "Ïðå&ìàõâàíå", IDC_REMOVEBTN, 84, 182, 60, 14 + DEFPUSHBUTTON "Çàòâàðÿíå", IDOK, 151, 182, 60, 14 +END + +IDD_ADDLATER DIALOGEX 0, 0, 220, 160 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTERMOUSE | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Îòëîæåíî äîáàâÿíå" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ìîæåòå äà èçáåðåòå äàòà è âðåìå, íà êîèòî äà áúäå äîáàâåíà òàçè ïðîãðàíà. Íàïðèìåð, ìîæåòå äà íàñðî÷èòå òîâà çà âðåìå, êîãàòî íå ñòå íà êîìïþòúðà ñè.", IDC_UNINSTLOCTEXT, 7, 4, 208, 33 + AUTORADIOBUTTON "&Îòëîæåíî äîáàâÿíå íà ïðèëîæåíèå", IDC_ADDPROGLATER, 7, 47, 207, 10, WS_GROUP + CONTROL "Picker", 12368, "SYSDATETIMEPICK32", WS_BORDER | WS_TABSTOP | 0x0000000C, 29, 62, 107, 14 + AUTORADIOBUTTON "Äà &íå ñå äîáàâÿ ïðèëîæåíèåòî", IDC_NOTADDPROG, 7, 87, 208, 10 + DEFPUSHBUTTON "Äîáðå", IDOK, 89, 141, 60, 14, WS_GROUP + PUSHBUTTON "Îòêàç", IDCANCEL, 154, 141, 60, 14, NOT WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Äîáàâÿíå èëè ïðåìàõâàíå íà ïðîãðàìè" + IDS_CPLSYSTEMDESCRIPTION "Ñëàãàíå è ìàõàíå íà ïðîãðàìè è ñúñòàâêè íà ÐåàêòÎÑ." + IDS_UNABLEOPEN_UNINSTKEY "Îòâàðÿíåòî íà êëþ÷úò çà ïðåìàõâàíå å íåâúçìîæíî" + IDS_LIST_TITLE "Ñïèñúê" + IDS_SIZE_TITLE "Ðàçìåð (ÌÁ)" + IDS_LAST_USED "Ïîñëåäíà óïîòðåáà" + IDS_PROGANDUPDATES "Ïðèëîæåíèÿ è îáíîâëåíèÿ" + IDS_PROGRAMS_ONLY "Ñàìî ïðèëîæåíèÿ" + IDS_UPDATES_ONLY "Ñàìî îáíîâëåíèÿ" + IDS_WELCOME_TITLE "Ïîìîùíèêúò çà ñëàãàíå è ìàõàíå íà ïðîãðàìè âè ïðèâåòñòâà." + IDS_WELCOME_MSG "Èçáåðåòå ðàçäåë âëÿâî èëè èçáåðåòå ïðèëîæåíèå îò ñïèñúêà, çà äà ãî ïðåìàõíåòå èëè äà ïîëó÷èòå ñâåäåíèÿ." + IDS_SEARCH_TEXT "Òúðñåíå â ñïèñúêà" + IDS_REMOVE_BTN "Ïðå&ìàõâàíå" + IDS_MODIFY_BTN "&Ïðîìÿíà" + IDS_UNABLEREAD_UNINSTSTR "Ïðî÷èòàíåòî íà ïðåìàõâàùèÿ íèç å íåâúçìîæíî. Ïîïúëíåíèåòî å íåïðàâèëíî èëè å áèëî ñúçäàäåíî îò MSI ñëàãà÷." + IDS_INF_REG_OWNER "Âïèñàí ñîáñòâåíèê:" + IDS_INF_PRODUCT_ID "ÎÓ íà ïðîèçâåäåíèåòî:" + IDS_INF_PUBLISHER "Èçäàòåë:" + IDS_INF_VERSION "Âåðñèÿ:" + IDS_INF_CONTACT "Çà âðúçêà:" + IDS_INF_SUP_INFO "Ñâåäåíèÿòà çà ïîääðúæêàòà:" + IDS_INF_SUP_PHONE "Òåëåôîí íà ïîääðúæêàòà:" + IDS_INF_PRODUCT_UPD "Îáíîâÿâàíèÿ íà ïðîèçâåäåíèåòî:" + IDS_INF_README "Ïðî÷åòèÌå:" + IDS_INF_COMMENTS "Çàáåëåæêè:" + IDS_NO_INFORMATION "Íÿìà ñâåäåíèÿ çà òîâà ïðèëîæåíèå." +END Propchange: trunk/reactos/dll/cpl/appwiz-new/lang/bg-Bg.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/appwiz-new/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/rsrc.rc… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/rsrc.rc (original) +++ trunk/reactos/dll/cpl/appwiz-new/rsrc.rc Mon Feb 25 13:29:41 2008 @@ -1,6 +1,7 @@ #include "resource.h" #include <windows.h> +#include "lang/bg-BG.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" Modified: trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbgt/kbdbgt… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.c (original) +++ trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.c Mon Feb 25 13:29:41 2008 @@ -279,7 +279,7 @@ { '3', NOCAPS, {'3', '#', WCH_NONE, 0x2116, 0x2116} }, //3#¹¹ { '6', NOCAPS, {'6', '^', WCH_NONE, 0x20AC,0x20AC } }, //6^ { '7', NOCAPS, {'7', '&', WCH_NONE, 0xA7, 0xA7} }, //7&§§ - { VK_OEM_7, NOCAPS, {'\'','\"', WCH_NONE, 0x201e, 0x201d } }, //'" + { VK_OEM_7, NOCAPS, {'\'','\"', WCH_NONE, 0x201e, 0x201C } }, //'" { 0, 0 } };

1 0

[dreimer] 32474: 4 Spaces to tabs. The whole file uses tabs, so..
by dreimer＠svn.reactos.org 25 Feb '08

25 Feb '08

Author: dreimer Date: Mon Feb 25 12:48:07 2008 New Revision: 32474 URL: http://svn.reactos.org/svn/reactos?rev=32474&view=rev Log: 4 Spaces to tabs. The whole file uses tabs, so.. Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.rbui… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.rbuild (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.rbuild Mon Feb 25 12:48:07 2008 @@ -11,8 +11,8 @@ <library>advapi32</library> <library>win32ksys</library> <library>pseh</library> - <library>dxguid</library> - + <library>dxguid</library> + <directory name="include"> <pch>precomp.h</pch> </directory>

1 0

[tkreuzer] 32473: - Reference CursorIcon before deleting it - IntGetPaintMessage: Set MessageQueue->PaintCount to 0, if no dirty Window is found. Stops spamming the debuglog, once is enough. - UserGetDCEx: Check if a dce's hDC is valid, if not warn and create a new one. With our current code those hDCs should never get deleted, but this is also a hack, on Windows you can delete them. - Don't dump the stack backtrace twice in GDIOBJ_Xxx functions
by tkreuzer＠svn.reactos.org 25 Feb '08

25 Feb '08

Author: tkreuzer Date: Mon Feb 25 04:32:17 2008 New Revision: 32473 URL: http://svn.reactos.org/svn/reactos?rev=32473&view=rev Log: - Reference CursorIcon before deleting it - IntGetPaintMessage: Set MessageQueue->PaintCount to 0, if no dirty Window is found. Stops spamming the debuglog, once is enough. - UserGetDCEx: Check if a dce's hDC is valid, if not warn and create a new one. With our current code those hDCs should never get deleted, but this is also a hack, on Windows you can delete them. - Don't dump the stack backtrace twice in GDIOBJ_Xxx functions Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Mon Feb 25 04:32:17 2008 @@ -523,7 +523,7 @@ LIST_FOR_EACH_SAFE(CurIcon, tmp, &gCurIconList, CURICON_OBJECT, ListEntry) { -// UserReferenceObject(CurIcon); + UserReferenceObject(CurIcon); // if(NT_SUCCESS(UserReferenceObjectByPointer(Object, otCursorIcon))) { LIST_FOR_EACH(ProcessData, &CurIcon->ProcessList, CURICON_PROCESS, ListEntry) @@ -532,6 +532,7 @@ { RemoveEntryList(&CurIcon->ListEntry); IntDestroyCurIconObject(WinSta, CurIcon, TRUE); + CurIcon = NULL; break; } } @@ -539,7 +540,10 @@ // UserDereferenceObject(Object); } - + if (CurIcon) + { + UserDereferenceObject(CurIcon); + } } ObDereferenceObject(WinSta); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Mon Feb 25 04:32:17 2008 @@ -696,6 +696,8 @@ if (Message->hwnd == NULL) { DPRINT1("PAINTING BUG: Thread marked as containing dirty windows, but no dirty windows found!\n"); + /* Hack to stop spamming the debuglog ! */ + MessageQueue->PaintCount = 0; return FALSE; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Mon Feb 25 04:32:17 2008 @@ -506,6 +506,13 @@ return(NULL); } + if (!GDIOBJ_ValidateHandle(Dce->hDC, GDI_OBJECT_TYPE_DC)) + { + DPRINT1("FIXME: Got DCE with invalid hDC!\n"); + Dce->hDC = DceCreateDisplayDC(); + /* FIXME: Handle error */ + } + Dce->hwndCurrent = (Window ? Window->hSelf : NULL); Dce->DCXFlags = Flags | DCX_DCEBUSY; @@ -597,7 +604,7 @@ } if (!Hit) IntGdiDeleteDC(pdce->hDC, TRUE); - + if (pdce->hClipRgn && ! (pdce->DCXFlags & DCX_KEEPCLIPRGN)) { NtGdiDeleteObject(pdce->hClipRgn); @@ -762,7 +769,7 @@ } while (pDCE != FirstDce); } -HDC +HDC FASTCALL IntGetDC(PWINDOW_OBJECT Window) { @@ -811,7 +818,7 @@ KeEnterCriticalRegion(); do { - if (dce->hDC == hDc) + if (dce->hDC == hDc) { Hit = TRUE; break; @@ -821,7 +828,7 @@ } while (dce != FirstDce ); KeLeaveCriticalRegion(); - + if ( Hit && (dce->DCXFlags & DCX_DCEBUSY)) { nRet = DceReleaseDC(dce, EndPaint); Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Mon Feb 25 04:32:17 2008 @@ -330,7 +330,10 @@ DPRINT1("%s: Attempted to lock object 0x%x, something went wrong, typeinfo = 0x%x\n", Function, hObj, Entry->Type); } +#ifdef GDI_DEBUG + DPRINT1("-> called from:\n"); KeRosDumpStackFrames(NULL, 20); +#endif } ULONG @@ -952,11 +955,6 @@ * locking type mismatches. */ LockErrorDebugOutput(hObj, Entry, "GDIOBJ_LockObj"); - -#ifdef GDI_DEBUG - DPRINT1("-> called from:\n"); - KeRosDumpStackFrames(NULL, 20); -#endif } /* Unlock the handle table entry. */ @@ -1081,11 +1079,6 @@ * locking type mismatches. */ LockErrorDebugOutput(hObj, Entry, "GDIOBJ_ShareLockObj"); - -#ifdef GDI_DEBUG - DPRINT1("-> called from:\n"); - KeRosDumpStackFrames(NULL, 20); -#endif } /* Unlock the handle table entry. */

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