Ros-diffs July 2007

ros-diffs@reactos.org

20 participants
707 discussions

[cfinck] 27827: Ah, forgot this one :-(
by cfinck＠svn.reactos.org 26 Jul '07

26 Jul '07

Author: cfinck Date: Thu Jul 26 13:50:03 2007 New Revision: 27827 URL: http://svn.reactos.org/svn/reactos?rev=27827&view=rev Log: Ah, forgot this one :-( Modified: trunk/reactos/base/applications/screensavers/matrix/rsrc.rc Modified: trunk/reactos/base/applications/screensavers/matrix/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/rsrc.rc (original) +++ trunk/reactos/base/applications/screensavers/matrix/rsrc.rc Thu Jul 26 13:50:03 2007 @@ -8,4 +8,5 @@ #include "lang/de-DE.rc" #include "lang/fr-FR.rc" #include "lang/th-TH.rc" +#include "lang/sk-SK.rc" #include "lang/uk-UA.rc"

1 0

[cfinck] 27826: - Fix the mnemonic keys for the english translation and add a slovak translation (patch by Mario Kacmar, kario AT szm DOT sk) - Fix the mnemonic keys in the other translations myself - Fix the german configuration dialog See issue #2472 for more details.
by cfinck＠svn.reactos.org 26 Jul '07

26 Jul '07

Author: cfinck Date: Thu Jul 26 13:45:18 2007 New Revision: 27826 URL: http://svn.reactos.org/svn/reactos?rev=27826&view=rev Log: - Fix the mnemonic keys for the english translation and add a slovak translation (patch by Mario Kacmar, kario AT szm DOT sk) - Fix the mnemonic keys in the other translations myself - Fix the german configuration dialog See issue #2472 for more details. Added: trunk/reactos/base/applications/screensavers/matrix/lang/sk-SK.rc Modified: trunk/reactos/base/applications/screensavers/matrix/lang/bg-BG.rc trunk/reactos/base/applications/screensavers/matrix/lang/de-DE.rc trunk/reactos/base/applications/screensavers/matrix/lang/en-US.rc trunk/reactos/base/applications/screensavers/matrix/lang/fr-FR.rc trunk/reactos/base/applications/screensavers/matrix/lang/th-TH.rc trunk/reactos/base/applications/screensavers/matrix/lang/uk-UA.rc Modified: trunk/reactos/base/applications/screensavers/matrix/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/lang/bg-BG.rc (original) +++ trunk/reactos/base/applications/screensavers/matrix/lang/bg-BG.rc Thu Jul 26 13:45:18 2007 @@ -62,9 +62,9 @@ WS_TABSTOP,151,134,85,10 DEFPUSHBUTTON "Äîáðå",IDOK,222,162,50,14 PUSHBUTTON "Îòêàç",IDCANCEL,283,162,50,14 + LTEXT "&Èìå íà øðèôòà:",IDC_STATIC,151,118,38,8 COMBOBOX IDC_COMBO2,195,116,130,71,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "&Èìå íà øðèôòà:",IDC_STATIC,151,118,38,8 CONTROL "Ïîëó&÷åð øðèôò",IDC_BOLD,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,247,134,46,10 CTEXT "Åêðàíåí ïðåäïàçèòåë Matrix www.catch22.org.uk",IDC_ABOUT,140, Modified: trunk/reactos/base/applications/screensavers/matrix/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/screensavers/matrix/lang/de-DE.rc Thu Jul 26 13:45:18 2007 @@ -31,26 +31,26 @@ CAPTION "Matrix ScreenSaver Konfiguration" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Dekodierung&sgeschwindigkeit",IDC_STATIC,7,7,128,36 - LTEXT "Langsamer",IDC_STATIC,13,24,22,8 + GROUPBOX "Dekodierung&sgeschwindigkeit",IDC_STATIC,7,7,133,36 + LTEXT "Langsamer",IDC_STATIC,13,24,37,8 CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_AUTOTICKS | - TBS_BOTH | WS_TABSTOP,38,17,62,22 - LTEXT "Schneller",IDC_STATIC,104,24,20,8 - GROUPBOX "Cypher &Dichte",IDC_STATIC,7,50,128,36 - LTEXT "Weniger",IDC_STATIC,13,67,19,8 + TBS_BOTH | WS_TABSTOP,48,17,62,22 + LTEXT "Schneller",IDC_STATIC,105,24,30,8 + GROUPBOX "Cypher &Dichte",IDC_STATIC,7,50,133,36 + LTEXT "Weniger",IDC_STATIC,13,67,31,8 CONTROL "Slider1",IDC_SLIDER2,"msctls_trackbar32",TBS_AUTOTICKS | - TBS_BOTH | WS_TABSTOP,38,60,62,22 - LTEXT "Mehr",IDC_STATIC,104,67,23,8 - GROUPBOX "&Nachrichtengeschwindigkeit",IDC_MSGSPEEDGRP,7,93,127,36 - LTEXT "Langsamer",IDC_STATIC,13,110,22,8 + TBS_BOTH | WS_TABSTOP,48,60,62,22 + LTEXT "Mehr",IDC_STATIC,105,67,23,8 + GROUPBOX "&Nachrichtengeschwindigkeit",IDC_MSGSPEEDGRP,7,93,133,36 + LTEXT "Langsamer",IDC_STATIC,13,110,37,8 CONTROL "Slider3",IDC_SLIDER3,"msctls_trackbar32",TBS_AUTOTICKS | - TBS_BOTH | WS_TABSTOP,38,103,62,22 - LTEXT "Schneller",IDC_STATIC,104,110,22,8 - GROUPBOX "&Schriftgröße",IDC_STATIC,7,137,127,36 + TBS_BOTH | WS_TABSTOP,48,103,62,22 + LTEXT "Schneller",IDC_STATIC,105,110,30,8 + GROUPBOX "&Schriftgröße",IDC_STATIC,7,137,133,36 LTEXT "Kleiner",IDC_STATIC,13,153,24,8 CONTROL "Slider3",IDC_SLIDER4,"msctls_trackbar32",TBS_AUTOTICKS | - TBS_BOTH | WS_TABSTOP,38,146,62,22 - LTEXT "Größer",IDC_STATIC,104,153,25,8 + TBS_BOTH | WS_TABSTOP,48,146,62,22 + LTEXT "Größer",IDC_STATIC,105,153,25,8 GROUPBOX "Codierte Nachrichten",IDC_STATIC,145,7,188,142 COMBOBOX IDC_COMBO1,153,22,172,62,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP @@ -59,16 +59,15 @@ PUSHBUTTON "&Hinzufügen",IDC_ADD,280,41,44,18 PUSHBUTTON "&Entfernen",IDC_REMOVE,280,66,44,18 CONTROL "Nachrichten vermischen",IDC_RANDOM,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,151,134,85,10 + WS_TABSTOP,151,134,90,10 DEFPUSHBUTTON "OK",IDOK,222,162,50,14 PUSHBUTTON "Abbrechen",IDCANCEL,283,162,50,14 + LTEXT "&Schrift Name:",IDC_STATIC,151,118,38,8 COMBOBOX IDC_COMBO2,195,116,130,71,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "&Schrift Name:",IDC_STATIC,151,118,38,8 CONTROL "&Fette Schrift",IDC_BOLD,"Button",BS_AUTOCHECKBOX | - BS_MULTILINE | WS_TABSTOP,247,134,46,10 - CTEXT "Matrix ScreenSaver www.catch22.org.uk",IDC_ABOUT,140, - 158,75,18 + BS_MULTILINE | WS_TABSTOP,247,134,60,10 + CTEXT "Matrix ScreenSaver www.catch22.org.uk",IDC_ABOUT,143, 158, 75, 18 END Modified: trunk/reactos/base/applications/screensavers/matrix/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/lang/en-US.rc (original) +++ trunk/reactos/base/applications/screensavers/matrix/lang/en-US.rc Thu Jul 26 13:45:18 2007 @@ -51,20 +51,20 @@ CONTROL "Slider3",IDC_SLIDER4,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | WS_TABSTOP,38,146,62,22 LTEXT "Bigger",IDC_STATIC,104,153,25,8 - GROUPBOX "Coded Messages",IDC_STATIC,145,7,188,142 + GROUPBOX "&Coded Messages",IDC_STATIC,145,7,188,142 COMBOBOX IDC_COMBO1,153,22,172,62,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP CONTROL "",IDC_PREVIEW,"Static",SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | WS_GROUP,154,39,116,72 PUSHBUTTON "&Add",IDC_ADD,280,41,44,18 PUSHBUTTON "&Remove",IDC_REMOVE,280,66,44,18 - CONTROL "Randomize Messages",IDC_RANDOM,"Button",BS_AUTOCHECKBOX | + CONTROL "Ra&ndomize Messages",IDC_RANDOM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,151,134,85,10 DEFPUSHBUTTON "OK",IDOK,222,162,50,14 PUSHBUTTON "Cancel",IDCANCEL,283,162,50,14 + LTEXT "&Font Name:",IDC_STATIC,151,118,38,8 COMBOBOX IDC_COMBO2,195,116,130,71,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "&Font Name:",IDC_STATIC,151,118,38,8 CONTROL "&Bold Font",IDC_BOLD,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,247,134,46,10 CTEXT "Matrix ScreenSaver www.catch22.org.uk",IDC_ABOUT,140, Modified: trunk/reactos/base/applications/screensavers/matrix/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/screensavers/matrix/lang/fr-FR.rc Thu Jul 26 13:45:18 2007 @@ -62,9 +62,9 @@ WS_TABSTOP,151,134,85,10 DEFPUSHBUTTON "OK",IDOK,222,162,50,14 PUSHBUTTON "Annuler",IDCANCEL,283,162,50,14 + LTEXT "Nom de la police:",IDC_STATIC,151,118,38,8 COMBOBOX IDC_COMBO2,195,116,130,71,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Nom de la police:",IDC_STATIC,151,118,38,8 CONTROL "Gras",IDC_BOLD,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,247,134,46,10 CTEXT "Matrix ScreenSaver www.catch22.org.uk",IDC_ABOUT,140, Added: trunk/reactos/base/applications/screensavers/matrix/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/lang/sk-SK.rc (added) +++ trunk/reactos/base/applications/screensavers/matrix/lang/sk-SK.rc Thu Jul 26 13:45:18 2007 @@ -1,0 +1,175 @@ +/* + * PROJECT: Matrix ScreenSaver + * FILE: base/applications/screensavers\matrix\lang\ + * PURPOSE: Slovak Language File Matrix ScreenSaver + * TRANSLATOR: Kario (kario(a)szm.sk) + * DATE OF TR: 25-07-2007 + */ + +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// Slovak resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) +#ifdef _WIN32 +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT +#pragma code_page(1250) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_CONFIG DIALOG DISCARDABLE 0, 0, 340, 183 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Nastavenie etrièa obrazovky Matrix" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "&Rýchlos dekódovania",IDC_STATIC,7,7,128,36 + LTEXT "Pomaly",IDC_STATIC,13,24,24,8 + CONTROL "Posúvaè1",IDC_SLIDER1,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,17,62,22 + LTEXT "Rýchlo",IDC_STATIC,104,24,24,8 + GROUPBOX "&Zloitos ifry",IDC_STATIC,7,50,128,36 + LTEXT "Menia",IDC_STATIC,13,67,24,8 + CONTROL "Posúvaè2",IDC_SLIDER2,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,60,62,22 + LTEXT "Väèia",IDC_STATIC,101,67,24,8 + GROUPBOX "Rýchlos zobrazovanej &správy",IDC_MSGSPEEDGRP,7,93,127,36 + LTEXT "Pomaly",IDC_STATIC,13,110,24,8 + CONTROL "Posúvaè3",IDC_SLIDER3,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,103,62,22 + LTEXT "Rýchlo",IDC_STATIC,104,110,24,8 + GROUPBOX "&Ve¾kos písma",IDC_STATIC,7,137,127,36 + LTEXT "Menie",IDC_STATIC,13,153,24,8 + CONTROL "Posúvaè4",IDC_SLIDER4,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,146,62,22 + LTEXT "Väèie",IDC_STATIC,104,153,24,8 + GROUPBOX "&Kódované správy",IDC_STATIC,145,7,188,142 + COMBOBOX IDC_COMBO1,153,22,172,62,CBS_DROPDOWN | WS_VSCROLL | + WS_TABSTOP + CONTROL "",IDC_PREVIEW,"Static",SS_LEFTNOWORDWRAP | + SS_CENTERIMAGE | WS_GROUP,154,39,116,72 + PUSHBUTTON "Prid&a",IDC_ADD,280,41,44,18 + PUSHBUTTON "O&dstráni",IDC_REMOVE,280,66,44,18 + CONTROL "&Náhodné poradie správ",IDC_RANDOM,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,151,134,85,10 + DEFPUSHBUTTON "OK",IDOK,222,162,50,14 + PUSHBUTTON "Zrui",IDCANCEL,283,162,50,14 + LTEXT "Typ &písma:",IDC_STATIC,151,118,40,8 + COMBOBOX IDC_COMBO2,195,116,130,71,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + CONTROL "&Tuèné písmo",IDC_BOLD,"Button",BS_AUTOCHECKBOX | + BS_MULTILINE | WS_TABSTOP,247,134,55,10 + CTEXT "Matrix ScreenSaver www.catch22.org.uk",IDC_ABOUT,140, + 158,75,18 +END + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_CONFIG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 333 + TOPMARGIN, 7 + BOTTOMMARGIN, 176 + END +END +#endif // APSTUDIO_INVOKED + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Bitmap +// + +IDB_BITMAP1 BITMAP DISCARDABLE "matrix.bmp" + +///////////////////////////////////////////////////////////////////////////// +// +// Cursor +// + +IDC_BLANKCURSOR CURSOR DISCARDABLE "cursor1.cur" + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ICON1 ICON DISCARDABLE "icon1.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Matrix - etriè obrazovky" +END + +#endif // Slovak resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/applications/screensavers/matrix/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/lang/th-TH.rc (original) +++ trunk/reactos/base/applications/screensavers/matrix/lang/th-TH.rc Thu Jul 26 13:45:18 2007 @@ -62,9 +62,9 @@ WS_TABSTOP,151,134,85,10 DEFPUSHBUTTON "µ¡Å§",IDOK,222,162,50,14 PUSHBUTTON "Â¡àÅÔ¡",IDCANCEL,283,162,50,14 + LTEXT "&ª×èÍµÑÇÍÑ¡ÉÃ:",IDC_STATIC,151,118,38,8 COMBOBOX IDC_COMBO2,195,116,130,71,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "&ª×èÍµÑÇÍÑ¡ÉÃ:",IDC_STATIC,151,118,38,8 CONTROL "&µÑÇË¹Ò",IDC_BOLD,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,247,134,46,10 CTEXT "â»Ãá¡ÃÁÃÑ¡ÉÒË¹éÒ¨ÍáººàÁ·ÃÔ¡«ì www.catch22.org.uk",IDC_ABOUT,140, Modified: trunk/reactos/base/applications/screensavers/matrix/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/lang/uk-UA.rc (original) +++ trunk/reactos/base/applications/screensavers/matrix/lang/uk-UA.rc Thu Jul 26 13:45:18 2007 @@ -62,9 +62,9 @@ WS_TABSTOP,151,134,85,10 DEFPUSHBUTTON "OK",IDOK,222,162,50,14 PUSHBUTTON "Ñêàñóâàòè",IDCANCEL,283,162,50,14 + LTEXT "&²ì'ÿ øðèôòó:",IDC_STATIC,151,118,38,8 COMBOBOX IDC_COMBO2,195,116,130,71,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "&²ì'ÿ øðèôòó:",IDC_STATIC,151,118,38,8 CONTROL "Íàï³â&æèðíèé øðèôò",IDC_BOLD,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,247,134,46,10 CTEXT "Çàñòàâêà \"Ìàòðèöÿ\" www.catch22.org.uk",IDC_ABOUT,140,

1 0

[cfinck] 27825: Updated norwegian translation my Lars Martin Hambro (lars_martin4 AT hotmail DOT com) See issue #1741 for more details.
by cfinck＠svn.reactos.org 26 Jul '07

26 Jul '07

Author: cfinck Date: Thu Jul 26 13:15:25 2007 New Revision: 27825 URL: http://svn.reactos.org/svn/reactos?rev=27825&view=rev Log: Updated norwegian translation my Lars Martin Hambro (lars_martin4 AT hotmail DOT com) See issue #1741 for more details. Modified: trunk/reactos/base/shell/explorer/explorer-no.rc Modified: trunk/reactos/base/shell/explorer/explorer-no.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-no.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-no.rc Thu Jul 26 13:15:25 2007 @@ -104,7 +104,7 @@ BEGIN POPUP "&Fil" BEGIN - MENUITEM "&Utfør...", ID_EXECUTE + MENUITEM "&Kjør...", ID_EXECUTE MENUITEM SEPARATOR MENUITEM "&Avslutt", ID_FILE_EXIT END @@ -262,16 +262,16 @@ BEGIN LTEXT "Vennligst velg din foretrukne explorer bruker grensesnitt:", IDC_STATIC,7,7,160,8 - CONTROL "&SSDB (sammensatt dokument brukergrensesnitt)",IDC_MDI,"Button", + CONTROL "&FDG (Flerdokumentsgrensesnitt)",IDC_MDI,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,124,10 - CONTROL "&SDB (separat dokument brukergrensesnitt)",IDC_SDI,"Button", + CONTROL "&EDG (Ettdokumentsgrensesnitt)",IDC_SDI,"Button", BS_AUTORADIOBUTTON,7,62,118,10 CONTROL 170,IDC_STATIC,"Static",SS_BITMAP,145,23,15,13 CONTROL 171,IDC_STATIC,"Static",SS_BITMAP,145,57,15,13 CONTROL "Åpne undermapper i s&eparate vinduer", IDC_SEPARATE_SUBFOLDERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,90,135,10 - LTEXT "Denne innstillingen vil bli brukt som standard for alle explorer vinduer i fremtiden.", + LTEXT "Denne innstillingen vil bli brukt som standard for alle explorer-vinduer i fremtiden.", IDC_STATIC,7,111,174,22 DEFPUSHBUTTON "&OK",IDOK,29,136,50,14,WS_GROUP PUSHBUTTON "&Avbryt",IDCANCEL,106,136,50,14

1 0

[cfinck] 27824: Ukrainian translations by Artem Reznikov (temarez AT yandex DOT ru) See issue #2477 for more details.
by cfinck＠svn.reactos.org 26 Jul '07

26 Jul '07

Author: cfinck Date: Thu Jul 26 13:09:45 2007 New Revision: 27824 URL: http://svn.reactos.org/svn/reactos?rev=27824&view=rev Log: Ukrainian translations by Artem Reznikov (temarez AT yandex DOT ru) See issue #2477 for more details. Added: trunk/reactos/base/applications/screensavers/matrix/lang/uk-UA.rc trunk/reactos/base/applications/shutdown/lang/uk-UA.rc trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc trunk/reactos/dll/cpl/powercfg/lang/uk-UA.rc trunk/reactos/dll/win32/serialui/lang/uk-UA.rc trunk/rosapps/downloader/translations/uk.rc trunk/rosapps/fontview/lang/uk-UA.rc trunk/rosapps/imagesoft/lang/uk-UA.rc trunk/rosapps/magnify/lang/uk-UA.rc Modified: trunk/reactos/base/applications/screensavers/matrix/rsrc.rc trunk/reactos/base/applications/shutdown/rsrc.rc trunk/reactos/base/shell/explorer-new/explorer.rc trunk/reactos/dll/cpl/powercfg/powercfg.rc trunk/reactos/dll/cpl/timedate/lang/uk-UA.rc trunk/reactos/dll/win32/console/lang/uk-UA.rc trunk/reactos/dll/win32/devmgr/lang/uk-UA.rc trunk/reactos/dll/win32/serialui/serialui.rc trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc trunk/rosapps/downloader/rsrc.rc trunk/rosapps/fontview/fontview.rc trunk/rosapps/imagesoft/rsrc.rc trunk/rosapps/magnify/rsrc.rc Added: trunk/reactos/base/applications/screensavers/matrix/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/lang/uk-UA.rc (added) +++ trunk/reactos/base/applications/screensavers/matrix/lang/uk-UA.rc Thu Jul 26 13:09:45 2007 @@ -1,0 +1,167 @@ +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// Ukrainian resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) +#ifdef _WIN32 +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +#pragma code_page(1251) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_CONFIG DIALOG DISCARDABLE 0, 0, 340, 183 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ïàðàìåòðè çàñòàâêè ""Ìàòðèöÿ""" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "&Øâèäê³ñòü Decode",IDC_STATIC,7,7,128,36 + LTEXT "Íèæ÷å",IDC_STATIC,13,24,22,8 + CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,17,62,22 + LTEXT "Âèùå",IDC_STATIC,104,24,20,8 + GROUPBOX "&Ù³ëüí³ñòü øèôðó",IDC_STATIC,7,50,128,36 + LTEXT "Ìåíøå",IDC_STATIC,13,67,19,8 + CONTROL "Slider1",IDC_SLIDER2,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,60,62,22 + LTEXT "Á³ëüøå",IDC_STATIC,104,67,23,8 + GROUPBOX "Øâèäê³ñòü ïîêàçó &ïîâ³äîìëåííÿ",IDC_MSGSPEEDGRP,7,93,127,36 + LTEXT "Íèæ÷å",IDC_STATIC,13,110,22,8 + CONTROL "Slider3",IDC_SLIDER3,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,103,62,22 + LTEXT "Âèùå",IDC_STATIC,104,110,22,8 + GROUPBOX "&Ðîçì³ð øðèôòó",IDC_STATIC,7,137,127,36 + LTEXT "Ìåíøèé",IDC_STATIC,13,153,24,8 + CONTROL "Slider3",IDC_SLIDER4,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,146,62,22 + LTEXT "Á³ëüøèé",IDC_STATIC,104,153,25,8 + GROUPBOX "Çàêîäîâàí³ ïîâ³äîìëåííÿ",IDC_STATIC,145,7,188,142 + COMBOBOX IDC_COMBO1,153,22,172,62,CBS_DROPDOWN | WS_VSCROLL | + WS_TABSTOP + CONTROL "",IDC_PREVIEW,"Static",SS_LEFTNOWORDWRAP | + SS_CENTERIMAGE | WS_GROUP,154,39,116,72 + PUSHBUTTON "&Äîäàòè",IDC_ADD,280,41,44,18 + PUSHBUTTON "Â&èäàëèòè",IDC_REMOVE,280,66,44,18 + CONTROL "Çì³øàòè ïîâ³äîìëåííÿ",IDC_RANDOM,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,151,134,85,10 + DEFPUSHBUTTON "OK",IDOK,222,162,50,14 + PUSHBUTTON "Ñêàñóâàòè",IDCANCEL,283,162,50,14 + COMBOBOX IDC_COMBO2,195,116,130,71,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + LTEXT "&²ì'ÿ øðèôòó:",IDC_STATIC,151,118,38,8 + CONTROL "Íàï³â&æèðíèé øðèôò",IDC_BOLD,"Button",BS_AUTOCHECKBOX | + BS_MULTILINE | WS_TABSTOP,247,134,46,10 + CTEXT "Çàñòàâêà \"Ìàòðèöÿ\" www.catch22.org.uk",IDC_ABOUT,140, + 158,75,18 +END + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_CONFIG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 333 + TOPMARGIN, 7 + BOTTOMMARGIN, 176 + END +END +#endif // APSTUDIO_INVOKED + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Bitmap +// + +IDB_BITMAP1 BITMAP DISCARDABLE "matrix.bmp" + +///////////////////////////////////////////////////////////////////////////// +// +// Cursor +// + +IDC_BLANKCURSOR CURSOR DISCARDABLE "cursor1.cur" + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ICON1 ICON DISCARDABLE "icon1.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Çàñòàâêà ""Ìàòðèöÿ""" +END + +#endif // Ukrainian resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/applications/screensavers/matrix/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/rsrc.rc (original) +++ trunk/reactos/base/applications/screensavers/matrix/rsrc.rc Thu Jul 26 13:09:45 2007 @@ -8,4 +8,4 @@ #include "lang/de-DE.rc" #include "lang/fr-FR.rc" #include "lang/th-TH.rc" - +#include "lang/uk-UA.rc" Added: trunk/reactos/base/applications/shutdown/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/lang/uk-UA.rc (added) +++ trunk/reactos/base/applications/shutdown/lang/uk-UA.rc Thu Jul 26 13:09:45 2007 @@ -1,0 +1,22 @@ +/* + * PROJECT: ReactOS shutdown/logoff utility + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/shutdown/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for shutdown + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + +IDS_USAGE, "Âèêîðèñòàííÿ: shutdown [-?] [-l | -s | -r] [-f]\n\n\ + Áåç àðãóìåíò³â àáî -?\tÂ³äîáðàæåííÿ öüîãî ïîâ³äîìëåííÿ\n\ + -l\t\t\tÇàâåðøåííÿ ñåàíñó\n\ + -s\t\t\tÂèìêíåííÿ öüîãî êîìï'þòåðà\n\ + -r\t\t\tÏåðåçàâàíòàæåííÿ öüîãî êîìï'þòåðà\n\ + -f\t\t\tÏðèìóñîâå çàêðèòòÿ çàïóùåíèõ äîäàòê³â áåç ïîïåðåäæåíü\n\ + \t\t\tßêùî âè íå âêàçàëè ³íøèé ïàðàìåòð, òî öÿ îïö³ÿ îïö³ÿ\n\ + \t\t\tòàêîæ çàâåðøèòü ñåàíñ" +} Modified: trunk/reactos/base/applications/shutdown/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/rsrc.rc (original) +++ trunk/reactos/base/applications/shutdown/rsrc.rc Thu Jul 26 13:09:45 2007 @@ -7,3 +7,4 @@ #include "lang/nb-NO.rc" #include "lang/sk-SK.rc" #include "lang/ru-RU.rc" +#include "lang/uk-UA.rc" Modified: trunk/reactos/base/shell/explorer-new/explorer.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… ============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.rc (original) +++ trunk/reactos/base/shell/explorer-new/explorer.rc Thu Jul 26 13:09:45 2007 @@ -20,4 +20,4 @@ #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" - +#include "lang/uk-UA.rc" Added: trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc (added) +++ trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc Thu Jul 26 13:09:45 2007 @@ -1,0 +1,67 @@ +/* + * PROJECT: ReactOS Explorer + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/shell/explorer-new/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for ReactOS Explorer + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDM_TRAYWND MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Çàêð³ïèòè ïàíåëü çàâäàíü", ID_LOCKTASKBAR + MENUITEM "Â&ëàñòèâîñò³", ID_SHELL_CMD_PROPERTIES + END +END + +IDM_STARTMENU MENUEX DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + POPUP "&Ïðîãðàìè", IDM_PROGRAMS + BEGIN + MENUITEM "(ïóñòî)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "&Îáðàíå", IDM_FAVORITES + BEGIN + MENUITEM "(ïóñòî)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "Äî&êóìåíòè", IDM_DOCUMENTS + BEGIN + MENUITEM "(ïóñòî)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "Í&àñòðîéêà", IDM_SETTINGS + BEGIN + MENUITEM "Ï&àíåëü êåðóâàííÿ", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED + MENUITEM SEPARATOR + MENUITEM "&Áåçïåêà...", IDM_SECURITY, MFT_STRING, MFS_ENABLED + MENUITEM "&Ìåðåæí³ ï³äêëþ÷åííÿ", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED + MENUITEM "Ïð&èíòåðè é ôàêñè", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED + MENUITEM "Ïàíåëü &çàâäàíü ³ ìåíþ ""Ïóñê""", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED + END + POPUP "Ç&íàéòè", IDM_SEARCH + BEGIN + MENUITEM SEPARATOR + END + MENUITEM "&Äîâ³äêà òà ï³äòðèìêà", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED + MENUITEM "Çàïóñê ïðî&ãðàìè...", IDM_RUN, MFT_STRING, MFS_ENABLED + MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED + MENUITEM "Ñèí&õðîí³çóâàòè", IDM_SYNCHRONIZE, MFT_STRING, MFS_ENABLED + MENUITEM "Çàâåð&øåííÿ ñåàíñó %s...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED + MENUITEM "Â&³äêëþ÷èòè...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED + MENUITEM "Â³äñòèêóâàòè êîìï'&þòåð", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED + MENUITEM "&Çàâåðøåííÿ ðîáîòè...", IDM_SHUTDOWN, MFT_STRING, MFS_ENABLED + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_START "Ïóñê" + IDS_PROPERTIES "Â&ëàñòèâîñò³" + IDS_OPEN_ALL_USERS "&Âñ³ êîðèñòóâà÷³" + IDS_EXPLORE_ALL_USERS "&Îãëÿä Âñ³õ êîðèñòóâà÷³â" +END Added: trunk/reactos/dll/cpl/powercfg/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/uk-U… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/uk-UA.rc (added) +++ trunk/reactos/dll/cpl/powercfg/lang/uk-UA.rc Thu Jul 26 13:09:45 2007 @@ -1,0 +1,168 @@ +/* + * PROJECT: ReactOS Power Configuration Applet + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/cpl/powercfg/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for powercfg + * PROGRAMMERS: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDD_PROPPAGEPOWERSHEMES DIALOGEX 0, 0, 250, 220 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ñõåìè êåðóâàííÿ æèâëåííÿì" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7,7,28,22 + LTEXT "Âèáåð³òü ñõåìó êåðóâàííÿ æèâëåííÿì ³ç íàéá³ëüø ï³äõîæèìè äëÿ öüîãî êîìï'þòåðà ïàðàìåòðàìè. ßêùî çì³íèòè íèæ÷åíàâåäåí³ ïàðàìåòðè, âèáðàíà ñõåìà òàêîæ çì³íèòüñÿ.", + -1,45,13,194,36 + GROUPBOX "&Ñõåìè êåðóâàííÿ æèâëåííÿì", -1, 7,57,240,46 + COMBOBOX IDC_ENERGYLIST, 14,70,224,92, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Çáåðåãòè &ÿê...", -1, 100,85,75,15,WS_DISABLED + PUSHBUTTON "Â&èäàëèòè", -1, 180,85,55,15,WS_DISABLED + GROUPBOX "Íåìàº äàíèõ", IDC_GRPDETAIL, 7,108,240,105 + LTEXT "Ïðè æèâëåíí³:",IDC_SAT,15,120,60,10 + LTEXT "â³ä ìåðåæ³",IDC_SAC,100,120,45,15 + ICON IDI_AC, IDC_IAC, 75,115,25,15 + LTEXT "â³ä áàòàðåé",IDC_SDC,197,120,45,15 + ICON IDI_DC, IDC_IDC, 165,115,25,15 + LTEXT "Âèìêíåííÿ äèñï&ëåÿ:",IDC_MONITOR,15,145,80,10 + COMBOBOX IDC_MONITORACLIST, 100,140,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_MONITORDCLIST, 175,140,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&Âèìêíåííÿ äèñê³â:",IDC_DISK,15,160,80,10 + COMBOBOX IDC_DISKACLIST, 100,155,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DISKDCLIST, 175,155,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Ðå&æèì î÷³êóâàííÿ ÷åðåç:",IDC_STANDBY,15,180,80,10 + COMBOBOX IDC_STANDBYACLIST, 100,175,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_STANDBYDCLIST, 175,175,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Ñ&ïëÿ÷èé ðåæèì ÷åðåç:",IDC_HYBERNATE,15,195,80,10 + COMBOBOX IDC_HYBERNATEACLIST, 100,190,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HYBERNATEDCLIST, 175,190,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + +IDD_PROPPAGEALARMS DIALOG DISCARDABLE 0, 0, 250, 220 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ñèãíàë³çàö³ÿ" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ñèãíàë çíà÷íî¿ ðîçðÿäêè áàòàðåé",-1,10,15,235,95 + CONTROL "Ïîäàâàò&è ñèãíàë, ÿêùî ð³âåíü æèâëåííÿ äîñÿãàº:",IDC_ALARM1, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,25,180,15 + LTEXT "íåìàº äàíèõ",IDC_ALARMVALUE1,200,25,40,10 + LTEXT "0%",-1,20,40,15,15 + CONTROL "Slider1",IDC_ALARMBAR1,"msctls_trackbar32",TBS_HORZ | + TBS_AUTOTICKS | WS_TABSTOP,30,40,170,15 + LTEXT "100%",-1,215,40,25,10 + PUSHBUTTON "&Ä³ÿ...",-1,20,70,70,15,WS_DISABLED + LTEXT "Ñïîâ³ùåííÿ:",-1,95,70,50,10 + LTEXT "Íåìàº äàíèõ",IDC_ALARMMSG1,145,70,95,10 + LTEXT "Ä³ÿ:",-1,95,80,45,10 + LTEXT "Íåìàº äàíèõ",IDC_ALARMAKTION1,145,80,95,10 + LTEXT "Çàïóñê ïðîãðàìè:",-1,95,90,50,10 + LTEXT "Íåìàº äàíèõ",IDC_ALARMPROG1,150,90,40,10 + + GROUPBOX "Ñèãíàë êðèòè÷íî¿ ðîçðÿäêè áàòàðåé",-1,10,115,235,95 + CONTROL "Ïîäàâàòè &ñèãíàë, ÿêùî ð³âåíü æèâëåííÿ äîñÿãàº:",IDC_ALARM2, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,125,180,15 + LTEXT "íåìàº äàíèõ",IDC_ALARMVALUE2,200,125,40,10 + LTEXT "0%",-1,20,140,15,15 + CONTROL "Slider1",IDC_ALARMBAR2,"msctls_trackbar32",TBS_HORZ | + TBS_AUTOTICKS | WS_TABSTOP,30,140,170,15 + LTEXT "100%",-1,215,140,25,10 + PUSHBUTTON "&Ä³ÿ...",-1,20,170,70,15,WS_DISABLED + LTEXT "Ñïîâ³ùåííÿ:",-1,95,170,50,10 + LTEXT "Íåìàº äàíèõ",IDC_ALARMMSG2,145,170,95,10 + LTEXT "Ä³ÿ:",-1,95,180,45,10 + LTEXT "Íåìàº äàíèõ",IDC_ALARMAKTION2,145,180,95,10 + LTEXT "Çàïóñê ïðîãðàìè:",-1,95,190,50,10 + LTEXT "Íåìàº äàíèõ",IDC_ALARMPROG2,150,190,40,10 +END + +IDD_PROPPAGEADVANCED DIALOG DISCARDABLE 0, 0, 250, 220 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Äîäàòêîâî" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC,IDI_ACDC,5,5,20,20 + LTEXT "Âèáåð³òü áàæàí³ ïàðàìåòðè åíåðãîçáåðåæåííÿ.",-1,30,5,205,20 + GROUPBOX "Ïàðàìåòðè",-1,5,35,225,55 + CONTROL "Çà&âæäè ïîêàçóâàòè çíà÷îê íà ïàíåë³ çàâäàíü",IDC_SYSTRAYBATTERYMETER,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,15,45,200,10 + CONTROL "&Çàïèòóâàòè ïàðîëü ïðè âèõîä³ ç ðåæèìó î÷³êóâàííÿ",IDC_PASSWORDLOGON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,15,55,200,10 + CONTROL "Ç&ìåíøèòè ÿñêðàâ³ñòü ìîí³òîðà â ðàç³ æèâëåííÿ â³ä áàòàðåé.",IDC_VIDEODIMDISPLAY,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,15,65,200,10 + GROUPBOX "Êíîïêè æèâëåííÿ",-1,5,100,230,105 + LTEXT "&Ïðè çàêðèòò³ êðèøêè &ïîðòàòèâíîãî êîìï'þòåðà:", IDC_SLIDCLOSE,10,110,210,10 + COMBOBOX IDC_LIDCLOSE,10,120,220,90,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + LTEXT "Ïðè íàò&èñíåíí³ âèìèêà÷à æèâëåííÿ íà ìîºìó êîìï'þòåð³:", IDC_SPOWERBUTTON,10,135,210,10 + COMBOBOX IDC_POWERBUTTON,10,150,220,90,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + LTEXT "Ïðè íàòè&ñíåíí³ êíîïêè ïåðåõîäó äî ñïëÿ÷îãî ðåæèìó:", IDC_SSLEEPBUTTON,10,165,210,10 + COMBOBOX IDC_SLEEPBUTTON,10,180,220,90,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP +END + +IDD_PROPPAGEHIBERNATE DIALOG DISCARDABLE 0, 0, 250, 220 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ñïëÿ÷èé ðåæèì" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SCREEN,IDI_SCREEN,5,5,20,20 + LTEXT "Êîëè êîìï'þòåð ïåðåõîäèòü äî ñïëÿ÷îãî ðåæèìó, óâåñü âì³ñò ïàì'ÿò³ çàïèñóºòüñÿ íà æîðñòêèé äèñê ³ ðîáîòà çàâåðøóºòüñÿ. Âèõîäÿ÷è ç³ ñïëÿ÷îãî ðåæèìó, êîìï'þòåð ïîâåðòàºòüñÿ äî ïîïåðåäíüîãî ñòàíó. ", + -1,35,5,195,35 + GROUPBOX "Ñïëÿ÷èé ðåæèì",-1,5,45,235,25 + CONTROL "Äîçâîëèòè ñïëÿ÷èé &ðåæèì",IDC_HIBERNATEFILE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,10,55,210,10 + GROUPBOX "Ì³ñöå íà äèñêó äëÿ ñïëÿ÷îãî ðåæèìó",-1,5,80,240,60 + LTEXT "Äîñòóïíî íà äèñêó:",-1,10,90,100,10 + LTEXT "íåìàº äàíèõ",IDC_FREESPACE,120,90,70,10 + LTEXT "Äëÿ ñïëÿ÷îãî ðåæèìó ïîòð³áíî:",-1,10,100,115,10 + LTEXT "Íåìàº äàíèõ",IDC_SPACEFORHIBERNATEFILE,120,100,55,10 + LTEXT "Ïåðåä ïåðåâåäåííÿì êîìï'þòåðà äî ñïëÿ÷îãî ðåæèìó ñë³ä çâ³ëüíèòè ì³ñöå íà äèñêó. ",IDC_TOLESSFREESPACE,10,115,220,20 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME_1 "Åëåêòðîæèâëåííÿ" + IDS_CPLDESCRIPTION_1 "Íàñòðîéêà ïàðàìåòð³â åíåðãîçáåðåæåííÿ äëÿ êîìï'þòåðà." + IDS_PROCENT "%i%%" + IDS_SOUND "Çâóê" + IDS_TEXT "Òåêñò" + IDS_CONFIG1 "Íàñòðîéêà ñõåìè æèâëåííÿ ""%1""" + IDS_CONFIG2 "Äîäàòêîâà íàñòðîéêà äëÿ %1" + + IDS_SIZEBYTS "%i áàéò" + IDS_SIZEMB "%i ÌÁ" + + IDS_NOACTION "Íå ðîáèòè í³÷îãî" + + IDS_PowerActionNone1 "Ä³ÿ íå ïîòð³áíà" + IDS_PowerActionUnknown "Íåìàº äàíèõ" + IDS_PowerActionSleep "Ïåðåõ³ä äî î÷³êóâàííÿ" + IDS_PowerActionHibernate "Ïåðåõ³ä äî ñïëÿ÷îãî ðåæèìó" + IDS_PowerActionShutdown "Çàâåðøåííÿ ðîáîòè" + IDS_PowerActionRestart "Ïåðåçàâàíòàæåííÿ" + IDS_PowerActionShutdownOff "Çàâåðøåííÿ ðîáîòè ³ âèìêíåííÿ æèâëåííÿ" + IDS_PowerActionWarmEject "Çàïèòóâàòè, ùî ñë³ä çðîáèòè" + IDS_PowerActionNone2 "Â³äñóòíÿ" + + IDS_TIMEOUT1 "÷åðåç 1 õâ" + IDS_TIMEOUT2 "÷åðåç 2 õâ" + IDS_TIMEOUT3 "÷åðåç 3 õâ" + IDS_TIMEOUT4 "÷åðåç 5 õâ" + IDS_TIMEOUT5 "÷åðåç 10 õâ" + IDS_TIMEOUT6 "÷åðåç 15 õâ" + IDS_TIMEOUT7 "÷åðåç 20 õâ" + IDS_TIMEOUT8 "÷åðåç 25 õâ" + IDS_TIMEOUT9 "÷åðåç 30 õâ" + IDS_TIMEOUT10 "÷åðåç 45 mins" + IDS_TIMEOUT11 "÷åðåç 1 ãîäèíó" + IDS_TIMEOUT12 "÷åðåç 2 ãîäèíè" + IDS_TIMEOUT13 "÷åðåç 3 ãîäèíè" + IDS_TIMEOUT14 "÷åðåç 4 ãîäèíè" + IDS_TIMEOUT15 "÷åðåç 5 ãîäèí" + IDS_TIMEOUT16 "í³êîëè" +END + Modified: trunk/reactos/dll/cpl/powercfg/powercfg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.rc (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.rc Thu Jul 26 13:09:45 2007 @@ -24,4 +24,4 @@ #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/th-TH.rc" - +#include "lang/uk-UA.rc" Modified: trunk/reactos/dll/cpl/timedate/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/uk-U… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/uk-UA.rc Thu Jul 26 13:09:45 2007 @@ -1,7 +1,7 @@ /* * PROJECT: Timedate Control Panel Applet * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/cpl/timedate/Uk.rc + * FILE: dll/cpl/timedate/lang/uk-UA.rc * PURPOSE: Ukraianian Language File for Timedate Control Panel Applet * PROGRAMMERS: Artem Reznikov */ @@ -27,7 +27,9 @@ CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 144, 105, 90, 12 - LTEXT "", IDC_TIMEZONE, 4, 136, 241, 8 + LTEXT "", IDC_TIMEZONE, 6, 132, 242, 11 + CONTROL "", IDC_CLOCKWND, "ClockWndClass", + WS_CHILD | WS_VISIBLE, 138, 12, 102, 89 END @@ -38,8 +40,9 @@ BEGIN COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE AUTOCHECKBOX "Àâòîìàòè&÷íå ïåðåâåäåííÿ ãîäèííèêà íà ë³òíèé/çèìîâèé ÷àñ", - IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP + IDC_AUTODAYLIGHT, 6, 132, 242, 11, WS_VISIBLE | WS_GROUP | WS_TABSTOP END Modified: trunk/reactos/dll/win32/console/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/console/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/console/lang/uk-UA.rc Thu Jul 26 13:09:45 2007 @@ -15,14 +15,14 @@ CAPTION "Ïàðàìåòðè" FONT 8, "MS Shell Dlg" BEGIN -GROUPBOX "Ðîçì³ð êóðñîðà", -1, 15, 15, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP -CONTROL "&Ìàëåíüêèé", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 25, 90, 10 -CONTROL "&Ñåðåäí³é", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 40, 90, 10 -CONTROL "&Âåëèêèé", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 90, 10 +GROUPBOX "Ðîçì³ð êóðñîðó", -1, 15, 15, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP +CONTROL "&äð³áíèé", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 25, 90, 10 +CONTROL "&ñåðåäí³é", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 40, 90, 10 +CONTROL "&âåëèêèé", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 90, 10 GROUPBOX "Ïàðàìåòðè â³äîáðàæåííÿ", -1, 140, 15, 100, 70, WS_CHILD | WS_VISIBLE | WS_GROUP -CONTROL "Ó â³ê&í³", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 35, 70, 10 -CONTROL "Íà âåñü &åêðàí", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 50, 70, 10 -GROUPBOX "²ñòîð³ÿ êîìàíä:", -1, 15, 90, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP +CONTROL "Â&³êíî", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 35, 70, 10 +CONTROL "&Íà âåñü åêðàí", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 50, 70, 10 +GROUPBOX "Æóðíàë êîìàíä:", -1, 15, 90, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "&Ðîçì³ð áóôåðà", -1, 25, 100, 60, 15 EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 100, 30, 15, ES_RIGHT | WS_GROUP CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 100, 12, 12 @@ -33,8 +33,8 @@ GROUPBOX "Ïàðàìåòðè ðåäàãóâàííÿ", -1, 140, 90, 100, 70, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP -CHECKBOX "Ðåæèì &QuickEdit", IDC_CHECK_QUICK_EDIT, 150, 100, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP -CHECKBOX "Ðåæèì &âñòàâêè", IDC_CHECK_INSERT_MODE, 150, 120, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP +CHECKBOX "&Øâèäêå ðåäàãóâàííÿ", IDC_CHECK_QUICK_EDIT, 150, 100, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP +CHECKBOX "&Ðåæèì âñòàâëåííÿ", IDC_CHECK_INSERT_MODE, 150, 120, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP END IDD_PROPPAGEFONT DIALOGEX 0, 0, 250, 220 @@ -42,50 +42,50 @@ CAPTION "Øðèôò" FONT 8, "MS Shell Dlg" BEGIN -LTEXT "Window Preview", -1, 10, 7, 65, 10 -LTEXT "Size", -1, 130, 10, 30, 10 +LTEXT "Çðàçîê â³êíà", -1, 10, 7, 65, 10 +LTEXT "Ðîçì³ð", -1, 130, 10, 30, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 115, 70 LISTBOX IDC_LBOX_FONTS, 130, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL -LTEXT "&Font", -1, 10, 105, 35, 10 -CHECKBOX "&Bold fonts", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10 +LTEXT "&Øðèôò", -1, 10, 105, 35, 10 +CHECKBOX "&Æèðí³", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10 LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 50, LBS_DISABLENOSCROLL | WS_VSCROLL GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 10, 155, 200, 50 CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 95, 35 -LTEXT "Each character is:", -1, 130, 165, 75, 10 -LTEXT "screen pixel wide\nscreen pixel high", -1, 140, 180, 65, 20 +LTEXT "Êîæåí ñèìâîë:", -1, 130, 165, 75, 10 +LTEXT "ï³êñåë³â çàâøèðøêè\nï³êñåë³â çàââèøêè", -1, 140, 180, 65, 20 LTEXT "", IDC_FONT_SIZE_X, 125, 180, 10, 10 LTEXT "", IDC_FONT_SIZE_Y, 125, 188, 10, 10 END IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 250, 220 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION -CAPTION "Ðîçòàøóâàííÿ" +CAPTION "Ðîçêëàäêà" FONT 8, "MS Shell Dlg" BEGIN -LTEXT "Window Preview", -1, 10, 7, 65, 10 +LTEXT "Çðàçîê â³êíà", -1, 10, 7, 65, 10 CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 10, 20, 115, 70 -GROUPBOX "Screen Buffer Size", -1, 130, 15, 115, 40 -LTEXT "&Width:", -1, 135, 30, 25, 10 -LTEXT "&Height:", -1, 135, 40, 25, 10 +GROUPBOX "Ðîçì³ð áóôåðà åêðàíà", -1, 130, 15, 115, 40 +LTEXT "&Øèðèíà:", -1, 135, 30, 25, 10 +LTEXT "&Âèñîòà:", -1, 135, 40, 25, 10 EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 165, 30, 35, 10, ES_RIGHT | WS_GROUP CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 165, 40, 35, 10, ES_RIGHT | WS_GROUP CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -GROUPBOX "Window Size", -1, 130, 60, 115, 40 -LTEXT "&W&idth:", -1, 135, 70, 25, 10 -LTEXT "&H&eight:", -1, 135, 80, 25, 10 +GROUPBOX "Ðîçì³ð â³êíà", -1, 130, 60, 115, 40 +LTEXT "Øè&ðèíà:", -1, 135, 70, 25, 10 +LTEXT "Â&èñîòà:", -1, 135, 80, 25, 10 EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 165, 70, 35, 10, ES_RIGHT | WS_GROUP CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 165, 80, 35, 10, ES_RIGHT | WS_GROUP CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -GROUPBOX "Window Position", -1, 130, 105, 115, 55 -LTEXT "&Left:", -1, 135, 120, 25, 10 -LTEXT "&Top:", -1, 135, 130, 25, 10 +GROUPBOX "Ïîçèö³ÿ â³êíà", -1, 130, 105, 115, 55 +LTEXT "&Çë³âà:", -1, 135, 120, 25, 10 +LTEXT "Ç&ãîðè:", -1, 135, 130, 25, 10 EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 165, 120, 35, 10, ES_RIGHT | WS_GROUP CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 165, 130, 35, 10, ES_RIGHT | WS_GROUP CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -CHECKBOX "Let system &position window", IDC_CHECK_SYSTEM_POS_WINDOW, 135, 145, 100, 10 +CHECKBOX "&Àâòîìàòè÷íèé âèá³ð", IDC_CHECK_SYSTEM_POS_WINDOW, 135, 145, 100, 10 END IDD_PROPPAGECOLORS DIALOGEX 0, 0, 250, 220 @@ -93,18 +93,18 @@ CAPTION "Êîëüîðè" FONT 8, "MS Shell Dlg" BEGIN -CONTROL "Screen &Text", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 15, 90, 10 -CONTROL "Screen &Background", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 25, 90, 10 -CONTROL "&Popup Text", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 90, 10 -CONTROL "Pop&up Background", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 45, 90, 10 -GROUPBOX "Selected Color Values", -1, 120, 15, 90, 45 -LTEXT "&Red:", -1, 125, 25, 30, 10 +CONTROL "Ò&åêñò íà åêðàí³", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 15, 90, 10 +CONTROL "&Òëî åêðàíà", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 25, 90, 10 +CONTROL "Òå&êñò ñïëèâíîãî â³êíà", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 90, 10 +CONTROL "Ò&ëî ñïëèâíîãî â³êíà", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 45, 90, 10 +GROUPBOX "Çíà÷åííÿ âèáðàíèõ êîëüîð³â", -1, 120, 15, 90, 45 +LTEXT "&×åðâîíèé:", -1, 125, 25, 30, 10 EDITTEXT IDC_EDIT_COLOR_RED, 150, 25, 30, 10, ES_RIGHT | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 25, 30, 10 -LTEXT "&Green:", -1, 125, 35, 30, 10 +LTEXT "&Çåëåíèé:", -1, 125, 35, 30, 10 EDITTEXT IDC_EDIT_COLOR_GREEN, 150, 35, 30, 10, ES_RIGHT | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 35, 30, 10 -LTEXT "&Blue:", -1, 125, 45, 30, 10 +LTEXT "&Ñèí³é:", -1, 125, 45, 30, 10 EDITTEXT IDC_EDIT_COLOR_BLUE, 150, 45, 30, 10, ES_RIGHT | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 45, 30, 10 CONTROL "", IDC_STATIC_COLOR1, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 15, 90, 10, 10 @@ -123,9 +123,9 @@ CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 171, 90, 10, 10 CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 183, 90, 10, 10 CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 195, 90, 10, 10 -GROUPBOX "Selected Screen Colors", -1, 10, 110, 200, 40 +GROUPBOX "Âèáðàí³ êîëüîðè åêðàíà", -1, 10, 110, 200, 40 CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 120, 180, 20 -GROUPBOX "Selected Popup Colors", -1, 10, 155, 200, 40 +GROUPBOX "Âèáðàí³ ñïëèâí³ êîëüîðè", -1, 10, 155, 200, 40 CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 180, 20 END @@ -143,7 +143,7 @@ STRINGTABLE BEGIN IDS_CPLNAME "Êîíñîëü" - IDS_CPLDESCRIPTION "Íàñòðîéêà âëàñòèâîñòåé êîíñîë³." + IDS_CPLDESCRIPTION "Íàñòðîþâàííÿ âëàñòèâîñòåé êîíñîë³." IDS_APPLY_SHORTCUT_ALL "Çì³íà &ÿðëèêà, ÿêèé çàïóñòèâ öå â³êíî" IDS_SCREEN_TEXT "C:\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" IDS_RASTERFONTS "Ðàñòðîâ³ øðèôòè" Modified: trunk/reactos/dll/win32/devmgr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/uk-U… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/devmgr/lang/uk-UA.rc Thu Jul 26 13:09:45 2007 @@ -25,16 +25,17 @@ IDS_NODRIVERLOADED "Äëÿ öüîãî ïðèñòðîþ íå âñòàíîâëåí³ äðàéâåðè." IDS_DEVONPARENT "íà %1" IDS_TROUBLESHOOTDEV "&Óñóíåííÿ íåñïðàâíîñòåé..." - IDS_ENABLEDEV "&Ââ³ìêíóòè ïðèñòð³é" + IDS_ENABLEDEV "Ââ&³ìêíóòè ïðèñòð³é" IDS_REINSTALLDRV "&Ïåðåâñòàíîâèòè äðàéâåð" - IDS_PROPERTIES "P&roperties" - IDS_UPDATEDRV "U&pdate Driver..." - IDS_REBOOT "Restart &Computer..." - IDS_NOTAVAILABLE "Not available" - IDS_NOTDIGITALLYSIGNED "Not digitally signed" - IDS_NODRIVERS "No driver files are required or have been loaded for this device." + IDS_PROPERTIES "&Âëàñòèâîñò³" + IDS_UPDATEDRV "&Îíîâèòè äðàéâåð..." + IDS_REBOOT "Ïåðåçàâàíòàæèòè &êîìï'þòåð..." + IDS_NOTAVAILABLE "Íåäîñòóïíî" + IDS_NOTDIGITALLYSIGNED "Íåìàº öèôðîâîãî ï³äïèñó" + IDS_NODRIVERS "Ôàéëè äðàéâåð³â äëÿ öüîãî ïðèñòðîþ íå ïîòð³áí³ àáî íå áóëè çàâàíòàæåí³." END +/* error messages, source: http://www.z123.org/techsupport/medm.htm */ STRINGTABLE BEGIN IDS_DEV_NO_PROBLEM "Öåé ïðèñòð³é ïðàöþº íîðìàëüíî." @@ -115,7 +116,7 @@ IDD_DEVICEGENERAL DIALOG DISCARDABLE 0, 0, 252, 218 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" +CAPTION "Çàãàëüí³" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 @@ -135,41 +136,41 @@ IDD_DEVICEDRIVER DIALOG DISCARDABLE 0, 0, 252, 218 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Driver" +CAPTION "Äðàéâåð" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX - LTEXT "Driver provider:", -1, 37, 39, 60, 8, SS_NOPREFIX + LTEXT "Ïîñòà÷àëüíèê äðàéâåðà:", -1, 37, 39, 60, 8, SS_NOPREFIX EDITTEXT IDC_DRVPROVIDER, 100, 39, 146, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - LTEXT "Driver date:", -1, 37, 53, 60, 8, SS_NOPREFIX + LTEXT "Äàòà äðàéâåðà:", -1, 37, 53, 60, 8, SS_NOPREFIX EDITTEXT IDC_DRVDATE, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - LTEXT "Driver version:", -1, 37, 67, 60, 8, SS_NOPREFIX + LTEXT "Âåðñ³ÿ äðàéâåðà:", -1, 37, 67, 60, 8, SS_NOPREFIX EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - LTEXT "Digital Signer:", -1, 37, 81, 60, 8, SS_NOPREFIX + LTEXT "Öèôðîâèé ï³äïèñ:", -1, 37, 81, 60, 8, SS_NOPREFIX EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "&Driver Details...", IDC_DRIVERDETAILS, 7, 106, 70, 15 - LTEXT "To view details about the driver files.", -1, 91, 110, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Â³äîìîñò³...", IDC_DRIVERDETAILS, 7, 106, 70, 15 + LTEXT "Ïåðåãëÿä â³äîìîñòåé ïðî ôàéëè äðàéâåðà.", -1, 91, 110, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOG DISCARDABLE 0, 0, 224, 250 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME -CAPTION "Driver File Details" +CAPTION "Â³äîìîñò³ ïðî ôàéëè äðàéâåðà" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX - LTEXT "&Driver files:", -1, 7, 36, 204, 8 + LTEXT "&Ôàéëè äðàéâåðà:", -1, 7, 36, 204, 8 CONTROL "", IDC_DRIVERFILES, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 - LTEXT "Provider:", -1, 14, 134, 50, 8 + LTEXT "Ïîñòà÷àëüíèê:", -1, 14, 134, 50, 8 LTEXT "", IDC_FILEPROVIDER, 66, 134, 155, 8 - LTEXT "File version:", -1, 14, 150, 50, 8 + LTEXT "Âåðñ³ÿ ôàéëó:", -1, 14, 150, 50, 8 LTEXT "", IDC_FILEVERSION, 66, 150, 155, 8 - LTEXT "Copyright:", -1, 14, 166, 50, 8 + LTEXT "Àâòîðñüê³ ïðàâà:", -1, 14, 166, 50, 8 LTEXT "", IDC_FILECOPYRIGHT, 66, 166, 155, 8 - LTEXT "Digital Signer:", -1, 14, 182, 50, 8 + LTEXT "Öèôðîâèé ï³äïèñ:", -1, 14, 182, 50, 8 LTEXT "", IDC_DIGITALSIGNER, 66, 182, 155, 8 PUSHBUTTON "OK", IDOK, 167, 228, 50, 14 END Added: trunk/reactos/dll/win32/serialui/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/serialui/lang/uk-UA.rc (added) +++ trunk/reactos/dll/win32/serialui/lang/uk-UA.rc Thu Jul 26 13:09:45 2007 @@ -1,0 +1,49 @@ +/* + * PROJECT: ReactOS SerialUI DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/serialui/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for serialui + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE LOADONCALL DISCARDABLE +BEGIN + IDS_EVENPARITY, "Ïàðíà" + IDS_MARKPARITY, "Ìàðêåð" + IDS_NOPARITY, "Áåç ïåðåâ³ðêè" + IDS_ODDPARITY, "Íåïàðíà" + IDS_SPACEPARITY, "Ïðîá³ë" + + IDS_ONESTOPBIT, "1 ñòîïîâèé á³ò" + IDS_ONE5STOPBITS, "1,5 ñòîïîâèõ á³òà" + IDS_TWOSTOPBITS, "2 ñòîïîâèõ á³òà" + + IDS_FC_NO, "Íåìàº" + IDS_FC_CTSRTS, "Àïàðàòíå (CTS/RTS)" + IDS_FC_XONXOFF, "XON/XOFF" + + IDS_TITLE, "Âëàñòèâîñò³: %s" +END + +IDD_COMMDLG DIALOGEX 6,5,222,175 +FONT 8, "MS Shell Dlg" +STYLE 0x10C80080 +EXSTYLE 0x00000001 +BEGIN + CONTROL "",IDC_GRP1,"Button",0x50000007,6,5,210,146,0x00000000 + CONTROL "OK",IDC_OKBTN,"Button",0x50010000,98,156,56,13,0x00000000 + CONTROL "Ñêàñóâàòè",IDC_CANCELBTN,"Button",0x50010000,158,156,56,13,0x00000000 + CONTROL "Øâèäê³ñòü (á³ò/ñ):",IDC_STC1,"Static",0x50000000,24,31,42,9,0x00000000 + CONTROL "Á³òè äàíèõ:",IDC_STC2,"Static",0x50000000,24,53,42,9,0x00000000 + CONTROL "Ïàðí³ñòü:",IDC_STC3,"Static",0x50000000,24,73,42,9,0x00000000 + CONTROL "Ñòîïîâ³ á³òè:",IDC_STC4,"Static",0x50000000,24,96,42,9,0x00000000 + CONTROL "Êåðóâàííÿ ïîòîêîì:",IDC_STC5,"Static",0x50000000,24,120,42,9,0x00000000 + CONTROL "",IDC_BAUDRATE,"ComboBox",0x50210003,98,29,100,50,0x00000000 + CONTROL "",IDC_BYTESIZE,"ComboBox",0x50210003,98,49,100,50,0x00000000 + CONTROL "",IDC_PARITY,"ComboBox",0x50210003,98,72,100,50,0x00000000 + CONTROL "",IDC_STOPBITS,"ComboBox",0x50210003,98,94,100,50,0x00000000 + CONTROL "",IDC_FLOW,"ComboBox",0x50210003,98,116,100,50,0x00000000 +END + Modified: trunk/reactos/dll/win32/serialui/serialui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/serialu… ============================================================================== --- trunk/reactos/dll/win32/serialui/serialui.rc (original) +++ trunk/reactos/dll/win32/serialui/serialui.rc Thu Jul 26 13:09:45 2007 @@ -15,3 +15,4 @@ #include "lang/id-ID.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" +#include "lang/uk-UA.rc" Modified: trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc Thu Jul 26 13:09:45 2007 @@ -1,7 +1,7 @@ /* * PROJECT: System setup * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/syssetup/syssetup_Uk.rc + * FILE: dll/win32/syssetup/lang/uk-UA.rc * PURPOSE: Ukraianian Language File for syssetup * TRANSLATOR: Artem Reznikov */ @@ -165,7 +165,7 @@ STRINGTABLE BEGIN IDS_ACKTITLE "Ï³äòâåðäæåííÿ" - IDS_ACKSUBTITLE "The shoulders ReactOS stands on and license information" + IDS_ACKSUBTITLE "²íôîðìàö³ÿ ïðî ðîçðîáíèê³â ReactOS ³ ë³çåíç³éíà óãîäà" IDS_OWNERTITLE "Íàëàøòóâàííÿ ïðèíàëåæíîñò³ ïðîãðàì" IDS_OWNERSUBTITLE "Ö³ îñîáèñò³ â³äîìîñò³ âêàçóþòü íà ïðèíàëåæí³ñòü ïðîãðàì ReactOS." IDS_COMPUTERTITLE "²ì'ÿ êîìï'þòåðà òà ïàðîëü àäì³í³ñòðàòîðà" @@ -174,13 +174,13 @@ IDS_LOCALESUBTITLE "Âè ìîæåòå íàëàøòóâàòè ReactOS äëÿ ð³çíèõ ðåã³îí³â ³ ìîâ." IDS_DATETIMETITLE "Äàòà é ÷àñ" IDS_DATETIMESUBTITLE "Âñòàíîâèòè ïðàâèëüí³ äàòó ³ ÷àñ äëÿ Âàøîãî êîìï'þòåðà." - IDS_PROCESSTITLE "Process page title" - IDS_PROCESSSUBTITLE "Process page subtitle" -END - -STRINGTABLE -BEGIN - IDS_CMT_DOWNLOADER "Download and install various applications" + IDS_PROCESSTITLE "Ðåºñòðàö³ÿ êîìïîíåíò³â" + IDS_PROCESSSUBTITLE "Çà÷åêàéòå, áóäü ëàñêà..." +END + +STRINGTABLE +BEGIN + IDS_CMT_DOWNLOADER "Çàâàíòàæåííÿ ³ óñòàíîâêà ð³çíèõ äîäàòê³â" END STRINGTABLE @@ -193,14 +193,14 @@ IDS_CMT_REGEDIT "Çàïóñòèòè Ðåäàêòîð ðåºñòðà" IDS_CMT_WORDPAD "Çàïóñòèòè Ðåäàêòîð äîêóìåíò³â" IDS_CMT_SCREENSHOT "Çðîáèòè çí³ìîê åêðàíà" - IDS_CMT_DEVMGMT "Launch Device Manager" - IDS_CMT_SERVMAN "Launch Service Manager" + IDS_CMT_DEVMGMT "Çàïóñòèòè Äèñïåò÷åð ïðèñòðî¿â" + IDS_CMT_SERVMAN "Çàïóñòèòè Äèñïåò÷åð êåðóâàííÿ ñëóæáàìè" END STRINGTABLE BEGIN IDS_GAMES "²ãðè" - IDS_CMT_SOLITAIRE "Solitaire" + IDS_CMT_SOLITAIRE "Êîñèíêà" IDS_CMT_WINEMINE "Ñàïåð" END @@ -209,11 +209,11 @@ IDS_REACTOS_SETUP "Óñòàíîâêà ReactOS" IDS_UNKNOWN_ERROR "Íåâ³äîìà ïîìèëêà" IDS_REGISTERING_COMPONENTS "Ðåºñòðàö³ÿ êîìïîíåíò³â..." - IDS_LOADLIBRARY_FAILED "LoadLibrary failed: " - IDS_GETPROCADDR_FAILED "GetProcAddr failed: " - IDS_REGSVR_FAILED "DllRegisterServer failed: " - IDS_DLLINSTALL_FAILED "DllInstall failed: " - IDS_TIMEOUT "Timeout during registration" + IDS_LOADLIBRARY_FAILED "Ïîìèëêà LoadLibrary: " + IDS_GETPROCADDR_FAILED "Ïîìèëêà GetProcAddr: " + IDS_REGSVR_FAILED "Ïîìèëêà DllRegisterServer: " + IDS_DLLINSTALL_FAILED "Ïîìèëêà DllInstall: " + IDS_TIMEOUT "Òàéìàóò ï³ä ÷àñ ðåºñòðàö³¿" IDS_REASON_UNKNOWN "" END @@ -235,18 +235,18 @@ STRINGTABLE BEGIN - IDS_WZD_NAME "Setup cannot continue until you enter your name." - IDS_WZD_SETCOMPUTERNAME "Setup failed to set the computer name." - IDS_WZD_COMPUTERNAME "Setup cannot continue until you enter the name of your computer." - IDS_WZD_PASSWORDEMPTY "You must enter a password !" - IDS_WZD_PASSWORDMATCH "The passwords you entered do not match. Please enter the desired password again." - IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." - IDS_WZD_LOCALTIME "Setup was unable to set the local time." -END - -STRINGTABLE -BEGIN - IDS_STATUS_INSTALL_DEV "Installing devices..." + IDS_WZD_NAME "Äëÿ ïðîäîâæåííÿ óñòàíîâêè íåîáõ³äíî ââåñòè âàøå ³ì'ÿ." + IDS_WZD_SETCOMPUTERNAME "Ïðîãðàì³ ³íñòàëÿö³¿ íå âäàëîñÿ âñòàíîâèòè ³ì'ÿ êîìï'þòåðà." + IDS_WZD_COMPUTERNAME "Äëÿ ïðîäîâæåííÿ óñòàíîâêè íåîáõ³äíî ââåñòè ³ì'ÿ êîìï'þòåðà." + IDS_WZD_PASSWORDEMPTY "Âè ìàºòå ââåñòè ïàðîëü !" + IDS_WZD_PASSWORDMATCH "Ïàðîë³, ÿê³ âè ââåëè, íå ñï³âïàäàþòü. Áóäü ëàñêà ââåä³òü áàæàíèé ïàðîëü çíîâó." + IDS_WZD_PASSWORDCHAR "Ïàðîëü, ÿêèé âè ââåëè, ì³ñòèòü çàáîðîíåí³ ñèìâîëè. Áóäü ëàñêà ââåä³òü î÷èùåíèé ïàðîëü." + IDS_WZD_LOCALTIME "Ïðîãðàì³ ³íñòàëÿö³¿ íå âäàëîñÿ âñòàíîâèòè ì³ñöåâèé ÷àñ." +END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Óñòàíîâêà ïðèñòðî¿â..." END /* EOF */ Modified: trunk/rosapps/downloader/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/rsrc.rc?rev=278… ============================================================================== --- trunk/rosapps/downloader/rsrc.rc (original) +++ trunk/rosapps/downloader/rsrc.rc Thu Jul 26 13:09:45 2007 @@ -27,3 +27,4 @@ #include "translations/it.rc" #include "translations/es.rc" #include "translations/ru.rc" +#include "translations/uk.rc" Added: trunk/rosapps/downloader/translations/uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/translations/uk… ============================================================================== --- trunk/rosapps/downloader/translations/uk.rc (added) +++ trunk/rosapps/downloader/translations/uk.rc Thu Jul 26 13:09:45 2007 @@ -1,0 +1,43 @@ +/* + * PROJECT: ReactOS Downloader + * LICENSE: GPL - See COPYING in the top level directory + * FILE: rosapps/downloader/translations/uk.rc + * PURPOSE: Ukraianian Language File for Downloader + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDD_DOWNLOAD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Çàâàíòàæåííÿ..." +FONT 8, "MS Shell Dlg" +{ + CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 + LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +BEGIN + IDS_WINDOW_TITLE "Çàâàíòàæèòè ! - Çàâàíòàæóâà÷ ReactOS" + IDS_WELCOME_TITLE "Ëàñêàâî ïðîñèìî ó Çàâàíòàæóâà÷ ReactOS" + IDS_WELCOME "Áóäü ëàñêà âèáåð³òü êàòåãîð³þ çë³âà. Öå âåðñ³ÿ 1.0." + IDS_NO_APP_TITLE "Äîäàòîê íå âèáðàíèé" + IDS_NO_APP "Áóäü ëàñêà, âèáåð³òü äîäàòîê ïåðø í³æ íàòèñíóòè êíîïêó çàâàíòàæåííÿ. ßêùî Âàì ïîòð³áíà äîïîìîãà, íàòèñí³òü êíîïêó ç³ çíàêîì ïèòàííÿ ó âåðõíüîìó ïðàâîìó êóòêó." + IDS_UPDATE_TITLE "Îíîâèòè" + IDS_UPDATE "Âèáà÷òå, äàíà ìîæëèâ³ñòü ùå íåäîñòóïíà." + IDS_HELP_TITLE "Äîâ³äêà" + IDS_HELP "Âèáåð³òü êàòåãîð³þ çë³âà, ïîò³ì âèáåð³òü äîäàòîê ³ íàòèñí³òü êíîïêó çàâàíòàæåííÿ. Äëÿ îòðèìàííÿ ³íôîðìàö³¿ ïðî îíîâëåííÿ íàòèñí³òü êíîïêó ïîðÿä ç êíîïêîþ äîâ³äêè." + IDS_NO_APPS "Âèáà÷òå, â ö³é êàòåãîð³¿ ùå íåìàº äîäàòê³â. Âè ìîæåòå äîïîìîãòè ³ äîäàòè á³ëüøå äîäàòê³â." + IDS_CHOOSE_APP "Áóäü ëàñêà âèáåð³òü äîäàòîê." + IDS_CHOOSE_SUB "Áóäü ëàñêà âèáåð³òü ï³äêàòåãîð³þ." + IDS_CHOOSE_CATEGORY "Áóäü ëàñêà âèáåð³òü êàòåãîð³þ." + IDS_CHOOSE_BOTH "Áóäü ëàñêà âèáåð³òü ï³äêàòåãîð³þ àáî äîäàòîê." + IDS_XMLERROR_1 "Íå âäàëîñÿ çíàéòè ôàéë xml !" + IDS_XMLERROR_2 "Íå âäàëîñÿ îáðîáèòè ôàéë xml !" + IDS_DOWNLOAD_ERROR "Íåìîæëèâî çàâàíòàæèòè ôàéë.\nÁóäü ëàñêà ïåðåâ³ðòå âàøå ³íòåðíåò-ç'ºäíàííÿ." + IDS_VERSION "Âåðñ³ÿ: " + IDS_LICENCE "Ë³öåíç³ÿ: " + IDS_MAINTAINER "Âèðîáíèê: " +END Modified: trunk/rosapps/fontview/fontview.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/fontview.rc?rev=2… ============================================================================== --- trunk/rosapps/fontview/fontview.rc (original) +++ trunk/rosapps/fontview/fontview.rc Thu Jul 26 13:09:45 2007 @@ -1,9 +1,4 @@ - - -#include "lang/en-US.rc" -#include "lang/de-DE.rc" -#include "lang/ru-RU.rc" -#include "lang/fr-FR.rc" +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { @@ -11,3 +6,10 @@ IDS_CHARSUPPER, "ABCDEFGHIJKLMNOPQRSTUVMXYZ" IDS_SPECIALCHARS, "0123456789.:,;(*!?')" } + + +#include "lang/de-DE.rc" +#include "lang/en-US.rc" +#include "lang/fr-FR.rc" +#include "lang/ru-RU.rc" +#include "lang/uk-UA.rc" Added: trunk/rosapps/fontview/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/lang/uk-UA.rc?rev… ============================================================================== --- trunk/rosapps/fontview/lang/uk-UA.rc (added) +++ trunk/rosapps/fontview/lang/uk-UA.rc Thu Jul 26 13:09:45 2007 @@ -1,0 +1,26 @@ +/* + * PROJECT: ReactOS Font Viewer + * LICENSE: GPL - See COPYING in the top level directory + * FILE: rosapps/fontview/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for fontview + * TRANSLATOR: Artem Reznikov + */ + +#include "windows.h" +#include "../resource.h" + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_QUIT, "Âèõ³ä" + IDS_PRINT, "Äðóê" + IDS_STRING, "Jackdaws love my big sphinx of quartz. 1234567890" + IDS_ERROR, "Ïîìèëêà" + IDS_ERROR_NOMEM, "Íåäîñòàòíüî ïàì'ÿò³ äëÿ çàâåðøåííÿ îïåðàö³þ." + IDS_ERROR_NOFONT, "Ôàéë %1 íå º êîðåêòíèì ôàéëîì øðèôòó." + IDS_ERROR_NOCLASS, "Íåìîæëèâî ³í³ö³àë³çóâàòè â³êîííèé êëàñ." + IDS_ERROR_BADCMD, "Íå âêàçàíèé ôàéë øðèôòó.\nÑèíòàêñèñ:\n fontview.exe <ôàéë øðèôòó>" +} + + Added: trunk/rosapps/imagesoft/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/imagesoft/lang/uk-UA.rc?re… ============================================================================== --- trunk/rosapps/imagesoft/lang/uk-UA.rc (added) +++ trunk/rosapps/imagesoft/lang/uk-UA.rc Thu Jul 26 13:09:45 2007 @@ -1,0 +1,242 @@ +/* + * PROJECT: ReactOS ImageSoft + * LICENSE: GPL - See COPYING in the top level directory + * FILE: rosapps/imagesoft/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for ImageSoft + * TRANSLATOR: Rostislav Zabolotny, Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "ImageSoft" + IDS_VERSION "v0.1" +END + +IDR_MAINMENU MENU +BEGIN + POPUP "&Ôàéë" + BEGIN + MENUITEM "&Ñòâîðèòè...", ID_NEW + MENUITEM "&Â³äêðèòè...", ID_OPEN + MENUITEM SEPARATOR + MENUITEM "&Çàêðèòè\tCtrl+F4", ID_CLOSE, GRAYED + MENUITEM "Ç&àêðèòè âñå", ID_CLOSEALL,GRAYED + MENUITEM SEPARATOR + MENUITEM "Çá&åðåãòè", ID_SAVE, GRAYED + MENUITEM "Çáåðåãòè &ÿê...", ID_SAVEAS, GRAYED + MENUITEM SEPARATOR + MENUITEM "Ïîïå&ðåäí³é Ïåðåãëÿä",ID_PRINTPRE,GRAYED + MENUITEM "&Äðóêóâàòè...", ID_PRINT, GRAYED + MENUITEM SEPARATOR + MENUITEM "Â&ëàñòèâîñò³...", ID_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "Âè&³ä\tAlt+F4", ID_EXIT + END + POPUP "&Ïðàâêà" + BEGIN + MENUITEM "Ïîâåð&íóòè", ID_UNDO, GRAYED + MENUITEM "Ïî&âòîðèòè", ID_REDO, GRAYED + MENUITEM SEPARATOR + MENUITEM "Âèð³&çàòè", ID_CUT, GRAYED + MENUITEM "Êî&ï³þâàòè", ID_COPY, GRAYED + MENUITEM "Âñ&òàâèòè", ID_PASTE, GRAYED + MENUITEM "Âñòàâèòè íîâèì &ìàëþíêîì", ID_PASTENEWIMAGE, GRAYED + MENUITEM SEPARATOR + MENUITEM "Âèä³ëèòè &Âñå", ID_SELALL, GRAYED + END + POPUP "&Âèãëÿä" + BEGIN + MENUITEM "&²íñòðóìåíòè", ID_TOOLS + MENUITEM "&Êîëüîðè", ID_COLOR + MENUITEM "²ñ&òîð³ÿ", ID_HISTORY + MENUITEM "&Ðÿäîê ñòàíó", ID_STATUSBAR + END + POPUP "&Ðåäàãóâàííÿ" + BEGIN + MENUITEM "ßñêðàâ³ñòü...", ID_BRIGHTNESS + MENUITEM "Êîíòðàñò...", ID_CONTRAST + MENUITEM "Â³äò³íêè/Íàñè÷åííÿ...", -1, GRAYED + POPUP "Êîë³ð" + BEGIN + MENUITEM "×îðíî-á³ëèé" ID_BLACKANDWHITE + MENUITEM "Îáåðíóòè Êîëüîðè" ID_INVERTCOLORS + END + MENUITEM SEPARATOR + MENUITEM "Çàòåìíèòè", ID_BLUR + MENUITEM "Çðîáèòè Ð³çê³øå", ID_SHARPEN + MENUITEM "Çãëàäèòè êðà¿", -1, GRAYED + MENUITEM "Äîäàòè ò³íü", -1, GRAYED + MENUITEM SEPARATOR + MENUITEM "Ðîçì³ð ìàëþíêà...", -1, GRAYED + MENUITEM "Ðóõàòè", -1, GRAYED + MENUITEM "Â³äîáðàçèòè", -1, GRAYED + MENUITEM "Îáåðíóòè", -1, GRAYED + + END + POPUP "&Êîëüîðè" + BEGIN + MENUITEM "&Ðåäàãóâàòè êîëüîðè...", ID_EDITCOLOURS + END + POPUP "&Â³êíî" + BEGIN + MENUITEM "&Êàñêàäîì", ID_WINDOW_CASCADE + MENUITEM "Âèêëàñòè &Ãîðèçîíòàëüíî", ID_WINDOW_TILE_HORZ + MENUITEM "Âèêëàñòè &Âåðòèêàëüíî", ID_WINDOW_TILE_VERT + MENUITEM "Âïàðÿäêóâàòè &²êîíêè", ID_WINDOW_ARRANGE + MENUITEM SEPARATOR + MENUITEM "Íà&ñòóïíèé\tCtrl+F6", ID_WINDOW_NEXT + END + POPUP "&Äîâ³äêà" + BEGIN + MENUITEM "&Ïðî ðåäàêòîð...", ID_ABOUT + END +END + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + + MENUITEM SEPARATOR + + END +END + + +IDD_BRIGHTNESS DIALOGEX 6, 5, 193, 120 +CAPTION "ßñêðàâ³ñòü" +FONT 8,"MS Sans Serif", 0, 0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "", IDC_PICPREVIEW, 0, 1, 132, 96, SS_OWNERDRAW | SS_SUNKEN + LTEXT "Êîëüîðè:", IDC_STATIC, 135, 5, 36, 9 + GROUPBOX "", IDC_BRI_GROUP, 138 ,30, 50, 48 + CONTROL "Âñ³ (RGB)", IDC_BRI_FULL, "Button", BS_AUTORADIOBUTTON, 138, 18, 46, 9 + CONTROL "×åðâîíèé", IDC_BRI_RED, "Button", BS_AUTORADIOBUTTON, 142, 38, 42, 9 + CONTROL "Çåëåíèé", IDC_BRI_GREEN, "Button", BS_AUTORADIOBUTTON, 142, 51, 42, 9 + CONTROL "Áëàêèòíèé", IDC_BRI_BLUE, "Button", BS_AUTORADIOBUTTON, 142, 64, 42, 9 + EDITTEXT IDC_BRI_EDIT, 98, 103, 28, 13 + CONTROL "", IDC_BRI_TRACKBAR, "msctls_trackbar32", TBS_BOTH | TBS_NOTICKS | WS_TABSTOP, 2, 105, 90, 11 + PUSHBUTTON "OK", IDOK, 142, 88, 48, 13 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 142, 105, 48, 13 +END + +IDD_ABOUTBOX DIALOGEX 22,16,210,182 +CAPTION "Ïðî ImageSoft" +FONT 8,"MS Sans Serif",0,0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +//EXSTYLE WS_EX_LAYERED +BEGIN + LTEXT "ImageSoft v0.1\nCopyright (C) 2006\nThomas Weidenmueller (w3seek(a)reactos.org)\nGed Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 150, 36 + PUSHBUTTON "Çàêðèòè", IDOK, 75, 162, 44, 15 + ICON IDI_IMAGESOFTICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + + +IDD_IMAGE_PROP DIALOGEX 6, 5, 156, 163 +CAPTION "Âëàñòèâîñò³ çîáðàæåííÿ" +FONT 8,"MS Sans Serif",0,0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "Íàçâà:", IDC_STATIC, 12, 5, 38, 9 + EDITTEXT IDC_IMAGE_NAME_EDIT, 58, 3, 94, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Âëàñòèâîñò³ ïîëîòíà", IDC_STATIC, 4, 22, 148, 98 + LTEXT "Òèï ìàëþíêà:", IDC_STATIC, 12, 36, 42, 9 + CONTROL "", IDC_IMAGETYPE, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 35, 88, 54 + LTEXT "Øèðèíà:", IDC_STATIC, 12, 51, 42, 9 + EDITTEXT IDC_WIDTH_EDIT, 58, 49, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER + LTEXT "", IDC_WIDTH_STAT, 94, 51, 40, 9 + LTEXT "Âèñîòà:", IDC_STATIC, 12, 68, 42, 9 + EDITTEXT IDC_HEIGHT_EDIT, 58, 66, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER + LTEXT "", IDC_HEIGHT_STAT, 94, 68, 40, 9 + LTEXT "Ðîçä³ëüíà çäàòí³ñòü:", IDC_STATIC, 12, 84, 42, 9 + EDITTEXT IDC_RES_EDIT, 58, 83, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER + LTEXT "", IDC_RES_STAT, 94, 84, 40, 9 + LTEXT "Îäèíèö³:", IDC_STATIC, 12, 99, 42, 9 + CONTROL "", IDC_UNIT, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 99, 54, 50 + LTEXT "Ðîçì³ð ìàëþíêà:", IDC_STATIC, 12, 125, 42, 9 + LTEXT "", IDC_IMAGE_SIZE, 58, 125, 54, 9 + PUSHBUTTON "OK", IDOK, 50, 144, 48, 13 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 102, 144, 48, 13 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "Öÿ ïðîãðàìà íàëåæèòü äî áåçêîøòîâíîãî ïðîãðàìíîãî çàáåçïå÷åííÿ; Âè ìîæåòå ïîøèðþâàòè ÷è(³) çì³íþâàòè ¿¿ íà ïðàâàõ GNU Çàãàëüíîþ ïóáë³÷íîþ ë³öåíç³ºþ (GPL) îïóáë³êîâàíèìè Ôóíäàö³ºþ Áåçêîøòîâíîãî ïðîãðàìíîãî çàáåçïå÷åííÿ (Free Software Foundation); àáî äðóãîþ âåðñ³ºþ Ë³öåíç³¿, ÷è (íà Âàø âèá³ð) áóäü-ÿêîþ ³íøîþ âåðñ³ºþ.\r\n\r\nÖÿ ïðîãðàìà áóëà ñòâîðåíà ç íàä³ºþ ùî áóäå êîðèñíà, àëå ÁÅÇ ÁÓÄÜ-ßÊÈÕ ÃÀÐÀÍÒ²É; íàâ³òü áåç âêëþ÷åíèõ ãàðàíò³é ë³êâ³äíîñò³ ÷è ìîæëèâîñò³ ïðèñòîñóâàííÿ äî êîíêðåòíèõ âèìîã. Çà äåòàëüí³øîþ ³íôîðìàö³ºþ äèâ³òüñÿ GNU Çàãàëüíó ïóáë³÷íó ë³öåíç³þ.\r\n\r\nÊîï³þ GNU Çàãàëüíî¿ Ïóáë³÷íî¿ Ë³öåíç³¿ Âè ìàëè á îòðèìàòè ðàçîì ç ö³ºþ ïðîãðàìîþ; ÿêùî òàê íå ñòàëîñÿ, ïèø³òü Ôóíäàö³¿ Áåçêîøòîâíîãî Ïðîãðàìíîãî Çàáåçïå÷åííÿ: Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." + IDS_READY "Ãîòîâî" + IDS_TOOLBAR_STANDARD "Ñòàíäàðòíî" + IDS_TOOLBAR_TEST "Òåñò" + IDS_IMAGE_NAME "Ìàëþíîê %1!u!" + IDS_FLT_TOOLS "²íñòðóìåíòè" + IDS_FLT_COLORS "Êîëüîðè" + IDS_FLT_HISTORY "²ñòîð³ÿ" +END + +/* imageprop.c */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMAGE_MONOCHROME "Ìîíîõðîìíèé (1 á³ò)" + IDS_IMAGE_GREYSCALE "Â³äò³íêè ñ³ðîãî (8 á³ò)" + IDS_IMAGE_PALETTE "256 êîëüîð³â (8 á³ò)" + IDS_IMAGE_TRUECOLOR "Ñïðàâæí³ êîëüîðè (24 á³ò)" + + IDS_UNIT_PIXELS "Ï³êñåë³" + IDS_UNIT_CM "Ñì" + IDS_UNIT_INCHES "Äþéìè" + IDS_UNIT_DOTSCM "Òî÷îê íà Ñì" + IDS_UNIT_DPI "Òî÷îê íà Äþéì" + IDS_UNIT_KB "%d ÊÁ" + IDS_UNIT_MB "%d ÌÁ" +END + +/* Tooltips */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_NEW "Íîâèé" + IDS_TOOLTIP_OPEN "Â³äêðèòè" + IDS_TOOLTIP_SAVE "Çáåðåãòè" + IDS_TOOLTIP_PRINTPRE "Ïîïåðåäí³é ïåðåãëÿä" + IDS_TOOLTIP_PRINT "Äðóê" + IDS_TOOLTIP_CUT "Âèð³çàòè" + IDS_TOOLTIP_COPY "Êîï³þâàòè" + IDS_TOOLTIP_PASTE "Âñòàâèòè" + IDS_TOOLTIP_UNDO "Ñêàñóâàòè" + IDS_TOOLTIP_REDO "Ïîâòîðèòè" +END + + +/* Ï³äêàçêè */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HINT_BLANK " " + IDS_HINT_NEW " Ñòâîðþº íîâèé äîêóìåíò." + IDS_HINT_OPEN " Â³äêðèâàº ³ñíóþ÷èé äîêóìåíò." + IDS_HINT_CLOSE " Çàêðèâàº ïîòî÷íå â³êíî." + IDS_HINT_CLOSEALL " Çàêðèâàº âñ³ â³êíà." + IDS_HINT_SAVE " Çáåð³ãàº àêòèâíèé äîêóìåíò." + IDS_HINT_SAVEAS " Çáåð³ãàº ïîòî÷íèé äîêóìåíò ï³ä ³íøèì ³ìåíåì." + IDS_HINT_PRINTPRE " Ïåðåãëÿä äîêóìåíòà ïåðåä äðóêîì." + IDS_HINT_PRINT " Äðóêóº ïîòî÷íèé äîêóìåíò." + IDS_HINT_PROP " Ïîêàçóº âëàñòèâîñò³ ïîòî÷íîãî ìàëþíêà." + IDS_HINT_EXIT " Âèõîäèòü ç ö³º¿ ïðîãðàìè." + + IDS_HINT_TOOLS " Ïîêàçóº ÷è õîâàº ðóõîìå â³êîíöå ³íñòðóìåíò³â." + IDS_HINT_COLORS " Ïîêàçóº ÷è õîâàº ðóõîìå â³êîíöå êîëüîð³â." + IDS_HINT_HISTORY " Ïîêàçóº ÷è õîâàº ðóõîìå â³êîíöå ²ñòîð³¿." + IDS_HINT_STATUS " Ïîêàçóº ÷è õîâàº ðÿäîê ñòàíó." + + IDS_HINT_CASCADE " Âïîðÿäêîâóº â³êíà òàê, ùîá âîíè ïîñë³äîâíî íàêëàäàëèñÿ." + IDS_HINT_TILE_HORZ " Âïîðÿäêîâóº â³êíà ãîðèçîíòàëüíî òàê, ùîá çàãîëîâêè íå íàêëàäàëèñÿ." + IDS_HINT_TILE_VERT " Âïîðÿäêîâóº â³êíà âåðòèêàëüíî òàê, ùîá çàãîëîâêè íå íàêëàäàëèñÿ." + IDS_HINT_ARRANGE " Âïîðÿäêîâóº ³êîíêè çíèçó â³êíà." + IDS_HINT_NEXT " Àêòèâ³çóº íàñòóïíå â³êíî." + + IDS_HINT_SYS_RESTORE " Â³äíîâëþº âèõ³äí³ ðîçì³ðè â³êíà." + IDS_HINT_SYS_MOVE " Çì³íþº ðîçòàøóâàííÿ â³êíà" + IDS_HINT_SYS_SIZE " Çì³íþº ðîçì³ðè â³êíà." + IDS_HINT_SYS_MINIMIZE " Çãîðòàº â³êíî äî çíà÷êà." + IDS_HINT_SYS_MAXIMIZE " Ðîçãîðòàº â³êíî äî ðîçì³ð³â åêðàíà." +END Modified: trunk/rosapps/imagesoft/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/imagesoft/rsrc.rc?rev=2782… ============================================================================== --- trunk/rosapps/imagesoft/rsrc.rc (original) +++ trunk/rosapps/imagesoft/rsrc.rc Thu Jul 26 13:09:45 2007 @@ -1,5 +1,3 @@ - - #include <windows.h> #include "resource.h" @@ -16,3 +14,4 @@ #include "lang/nb-NO.rc" #include "lang/ru-RU.rc" #include "lang/th-TH.rc" +#include "lang/uk-UA.rc" Added: trunk/rosapps/magnify/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/uk-UA.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/uk-UA.rc (added) +++ trunk/rosapps/magnify/lang/uk-UA.rc Thu Jul 26 13:09:45 2007 @@ -1,0 +1,73 @@ +/* + * PROJECT: ReactOS Magnifier + * LICENSE: GPL - See COPYING in the top level directory + * FILE: rosapps/magnify/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for Magnifier + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDC_MAGNIFIER MENU +BEGIN + POPUP "&Ôàéë" + BEGIN + MENUITEM "Â&èõ³ä", IDM_EXIT + MENUITEM "Ï&àðàìåòðè", IDM_OPTIONS + MENUITEM SEPARATOR + MENUITEM "&Ïðî ïðîãðàìó ...", IDM_ABOUT + END +END + +IDC_MAGNIFIER ACCELERATORS +BEGIN + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +END + +IDD_ABOUTBOX DIALOGEX 22, 17, 220, 75 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_CAPTION | WS_SYSMENU +CAPTION "Ïðî ïðîãðàìó" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_ICON,IDC_MYICON,14,9,20,20 + LTEXT "Åêðàííà ëóïà Âåðñ³ÿ 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX + LTEXT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)",IDC_STATIC,48,24,125,22 + PUSHBUTTON "OK",IDOK,162,48,50,14 +END + +IDD_DIALOGOPTIONS DIALOGEX 0, 0, 153, 182 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ïàðàìåòðè åêðàííî¿ ëóïè" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "Âèõ³ä",IDOK,96,161,50,14 + PUSHBUTTON "Äîâ³äêà",IDOK,38,161,50,14 + LTEXT "Çá³ëüøåííÿ:",IDC_STATIC,6,12,68,8 + COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Â³äñòåæåííÿ",IDC_STATIC,7,25,139,59 + GROUPBOX "Ïîäàííÿ",IDC_STATIC,7,87,139,57 + CONTROL "Â³äñòåæóâàòè âêàç³âíèê ìèø³",IDC_FOLLOWMOUSECHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,42,114,10 + CONTROL "Â³äñòåæóâàòè ôîêóñ ââîäó",IDC_FOLLOWKEYBOARDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,54,114,10 + CONTROL "Â³äñòåæóâàòè ðåäàãóâàííÿ òåêñòó",IDC_FOLLOWTEXTEDITINGCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,66,114,10 + CONTROL "Îáåðíóòè êîëüîðè",IDC_INVERTCOLORSCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,102,114,10 + CONTROL "Çàïóñòèòè ó çãîðíóòîìó âèãëÿä³",IDC_STARTMINIMIZEDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,114,114,10 + CONTROL "Ïîêàçóâàòè â³êíî åêðàííî¿ ëóïè",IDC_SHOWMAGNIFIERCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,126,114,10 +END + +IDD_WARNINGDIALOG DIALOGEX 0, 0, 250, 97 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION +CAPTION "Åêðàííà ëóïà ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK",IDOK,193,76,50,14 + ICON IDI_ICON,IDC_STATIC,7,17,20,20 + LTEXT "Åêðàííà ëóïà íàäàº ëèøå ì³í³ìàëüíèé îáñÿã ìîæëèâîñòåé äëÿ ëþäåé ³ç ïîðóøåííÿì çîðó. Á³ëüøîñò³ òàêèõ êîðèñòóâà÷³â äîö³ëüíî çàñòîñîâóâàòè ñïåö³àëüí³ ïðîãðàìè ç á³ëüø øèðîêèìè ìîæëèâîñòÿìè.",IDC_STATIC,36,7,207,33 + CONTROL "Á³ëüøå íå ïîêàçóâàòè öå ïîâ³äîìëåííÿ",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10 +END + +STRINGTABLE +BEGIN + IDS_APP_TITLE "Åêðàííà ëóïà" + IDC_MAGNIFIER "MAGNIFIER" +END Modified: trunk/rosapps/magnify/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/rsrc.rc?rev=27824&… ============================================================================== --- trunk/rosapps/magnify/rsrc.rc (original) +++ trunk/rosapps/magnify/rsrc.rc Thu Jul 26 13:09:45 2007 @@ -2,3 +2,4 @@ #include "resource.h" #include "lang/en-US.rc" +#include "lang/uk-UA.rc"

1 0

[cfinck] 27823: Slovak translation for netid by Mario Kacmar (kario AT szm DOT sk)
by cfinck＠svn.reactos.org 26 Jul '07

26 Jul '07

Author: cfinck Date: Thu Jul 26 12:18:08 2007 New Revision: 27823 URL: http://svn.reactos.org/svn/reactos?rev=27823&view=rev Log: Slovak translation for netid by Mario Kacmar (kario AT szm DOT sk) Added: trunk/reactos/dll/win32/netid/lang/sk-SK.rc Modified: trunk/reactos/dll/win32/netid/netid.rc Added: trunk/reactos/dll/win32/netid/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/sk-SK… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/sk-SK.rc (added) +++ trunk/reactos/dll/win32/netid/lang/sk-SK.rc Thu Jul 26 12:18:08 2007 @@ -1,0 +1,28 @@ +/* + * FILE: dll/win32/netid/lang/sk-SK.rc + * PURPOSE: Slovak Language File for ReactOS Network ID + * TRANSLATOR: Kario <kario(a)szm.sk> + * DATE OF TR.: 25-07-2007 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, 256, 218 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Názov poèítaèa" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON + LTEXT "ReactOS pouije nasledujúce informácie pri identifikácii poèítaèa v sieti.", IDC_STATIC, 40, 5, 204, 20 + LTEXT "&Popis poèítaèa:", IDC_STATIC, 6, 40, 70, 9 + EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Úplný názov poèítaèa:", IDC_STATIC, 6, 68, 75, 9 + LTEXT "(Predvolený)", IDC_COMPUTERNAME, 98, 68, 144, 11 + LTEXT "Pracovná skupina:", IDC_WORKGROUPDOMAIN, 6, 84, 70, 9 + LTEXT "(prázdne)", IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 9 + LTEXT "Ak sa chcete pripoji pomocou Sprievodcu identifikáciou v sieti na doménu a vytvori lokálne pouívate¾ské konto, kliknite na tlaèidlo Sieová identifikácia.", IDC_STATIC, 6, 108, 160, 33 + PUSHBUTTON "&Sieová identifikácia", IDC_NETWORK_ID, 176, 114, 72, 15 + LTEXT "Ak chcete zmeni názov poèítaèa alebo sa pripoji na doménu, kliknite na tlaèidlo Zmeni.", IDC_STATIC, 6, 149, 160, 17 + PUSHBUTTON "Z&meni...",IDC_NETWORK_PROPERTY, 176, 149, 72, 15 + LTEXT "Poznámka: Identifikáciu poèítaèa môu zmeni len správcovia poèítaèa.", IDC_STATIC, 6, 179, 244, 9 +END Modified: trunk/reactos/dll/win32/netid/netid.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/netid.rc?r… ============================================================================== --- trunk/reactos/dll/win32/netid/netid.rc (original) +++ trunk/reactos/dll/win32/netid/netid.rc Thu Jul 26 12:18:08 2007 @@ -17,4 +17,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

[cfinck] 27822: Small fix in the slovak translation
by cfinck＠svn.reactos.org 26 Jul '07

26 Jul '07

Author: cfinck Date: Thu Jul 26 12:00:41 2007 New Revision: 27822 URL: http://svn.reactos.org/svn/reactos?rev=27822&view=rev Log: Small fix in the slovak translation Modified: trunk/reactos/base/applications/shutdown/lang/sk-SK.rc Modified: trunk/reactos/base/applications/shutdown/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/shutdown/lang/sk-SK.rc Thu Jul 26 12:00:41 2007 @@ -13,7 +13,7 @@ IDS_USAGE, "Pouitie: shutdown [-?] [-l | -s | -r] [-f]\n\n\ iadne argumenty\tZobrazí sa táto správa\n\ - -?\tZobrazí túto správu\n\ + -?\t\t\tZobrazí túto správu\n\ -l\t\t\tOdhlási pouívate¾a\n\ -s\t\t\tVypne poèítaè\n\ -r\t\t\tRetartuje poèítaè\n\

1 0

[cfinck] 27821: - Remove all the VS stuff from the english resource file and make it readable/editable/translateable - Remove some redundant resources - Fix some typos - Use RegisterClass instead of RegisterClassEx in the MyRegisterClass function: This way we don't need a resource for the small icon, but it works the same - Add a "rsrc.rc" file
by cfinck＠svn.reactos.org 26 Jul '07

26 Jul '07

Author: cfinck Date: Thu Jul 26 11:43:01 2007 New Revision: 27821 URL: http://svn.reactos.org/svn/reactos?rev=27821&view=rev Log: - Remove all the VS stuff from the english resource file and make it readable/editable/translateable - Remove some redundant resources - Fix some typos - Use RegisterClass instead of RegisterClassEx in the MyRegisterClass function: This way we don't need a resource for the small icon, but it works the same - Add a "rsrc.rc" file Added: trunk/rosapps/magnify/rsrc.rc Modified: trunk/rosapps/magnify/lang/en-US.rc trunk/rosapps/magnify/magnifier.c trunk/rosapps/magnify/magnify.rc trunk/rosapps/magnify/resource.h Modified: trunk/rosapps/magnify/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/en-US.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/en-US.rc (original) +++ trunk/rosapps/magnify/lang/en-US.rc Thu Jul 26 11:43:01 2007 @@ -1,62 +1,4 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Neutral resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU) -#ifdef _WIN32 -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON ICON "res/magnify.ico" -#endif // Neutral resources -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_MAGNIFIER ICON "res/Magnify.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// Menu -// IDC_MAGNIFIER MENU BEGIN @@ -69,33 +11,21 @@ END END - -///////////////////////////////////////////////////////////////////////////// -// -// Accelerator -// - IDC_MAGNIFIER ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT "/", IDM_ABOUT, ASCII, ALT END - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - IDD_ABOUTBOX DIALOGEX 22, 17, 220, 75 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_CAPTION | WS_SYSMENU CAPTION "About" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON IDI_MAGNIFIER,IDC_MYICON,14,9,20,20 + ICON IDI_ICON,IDC_MYICON,14,9,20,20 LTEXT "Magnifier Version 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX LTEXT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)",IDC_STATIC,48,24,125,22 - PUSHBUTTON "Ok",IDOK,162,48,50,14 + PUSHBUTTON "OK",IDOK,162,48,50,14 END IDD_DIALOGOPTIONS DIALOGEX 0, 0, 153, 182 @@ -105,12 +35,12 @@ BEGIN DEFPUSHBUTTON "Exit",IDOK,96,161,50,14 PUSHBUTTON "Help",IDOK,38,161,50,14 - LTEXT "Magnification level :",IDC_STATIC,6,12,68,8 + LTEXT "Magnification level:",IDC_STATIC,6,12,68,8 COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP GROUPBOX "Tracking",IDC_STATIC,7,25,139,59 GROUPBOX "Presentation",IDC_STATIC,7,87,139,57 CONTROL "Follow mouse cursor",IDC_FOLLOWMOUSECHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,42,114,10 - CONTROL "Follow keyboard focus",IDC_FOLOWKEYBOARDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,54,114,10 + CONTROL "Follow keyboard focus",IDC_FOLLOWKEYBOARDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,54,114,10 CONTROL "Follow text editing",IDC_FOLLOWTEXTEDITINGCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,66,114,10 CONTROL "Invert colors",IDC_INVERTCOLORSCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,102,114,10 CONTROL "Start Minimized",IDC_STARTMINIMIZEDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,114,114,10 @@ -123,91 +53,13 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "OK",IDOK,193,76,50,14 - ICON IDI_MAGNIFIER,IDC_STATIC,7,17,20,20 - LTEXT "Magnifier is intended to provide a minium level of funcionality for users with slight visual impairments. Most users with visual impairments will need a magnigication utility with higher funcionality for deily use.",IDC_STATIC,36,7,207,33 - CONTROL "Do not show this message again",IDC_SHOWWARNINGCHECK, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10 + ICON IDI_ICON,IDC_STATIC,7,17,20,20 + LTEXT "Magnifier is intended to provide a minimum level of functionality for users with slight visual impairments. Most users with visual impairments will need a magnification utility with higher funcionality for daily use.",IDC_STATIC,36,7,207,33 + CONTROL "Do not show this message again",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10 END - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO -BEGIN - IDD_DIALOGOPTIONS, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 146 - TOPMARGIN, 7 - BOTTOMMARGIN, 175 - END - - IDD_WARNINGDIALOG, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 243 - TOPMARGIN, 7 - BOTTOMMARGIN, 90 - END -END -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// STRINGTABLE BEGIN IDS_APP_TITLE "Magnifier" IDC_MAGNIFIER "MAGNIFIER" END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - Modified: trunk/rosapps/magnify/magnifier.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/magnifier.c?rev=27… ============================================================================== --- trunk/rosapps/magnify/magnifier.c (original) +++ trunk/rosapps/magnify/magnifier.c Thu Jul 26 11:43:01 2007 @@ -98,23 +98,20 @@ // ATOM MyRegisterClass(HINSTANCE hInstance) { - WNDCLASSEX wcex; - - wcex.cbSize = sizeof(WNDCLASSEX); - - wcex.style = CS_HREDRAW | CS_VREDRAW; - wcex.lpfnWndProc = WndProc; - wcex.cbClsExtra = 0; - wcex.cbWndExtra = 0; - wcex.hInstance = hInstance; - wcex.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MAGNIFIER)); - wcex.hCursor = LoadCursor(NULL, IDC_ARROW); - wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); - wcex.lpszMenuName = MAKEINTRESOURCE(IDC_MAGNIFIER); - wcex.lpszClassName = szWindowClass; - wcex.hIconSm = LoadIcon(wcex.hInstance, MAKEINTRESOURCE(IDI_SMALL)); - - return RegisterClassEx(&wcex); + WNDCLASS wc; + + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc = WndProc; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = hInstance; + wc.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_ICON)); + wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); + wc.lpszMenuName = MAKEINTRESOURCE(IDC_MAGNIFIER); + wc.lpszClassName = szWindowClass; + + return RegisterClass(&wc); } // @@ -463,7 +460,7 @@ SendDlgItemMessage(hDlg,IDC_FOLLOWMOUSECHECK,BM_SETCHECK , wParam ,0); if (bFollowFocus) - SendDlgItemMessage(hDlg,IDC_FOLOWKEYBOARDCHECK,BM_SETCHECK , wParam ,0); + SendDlgItemMessage(hDlg,IDC_FOLLOWKEYBOARDCHECK,BM_SETCHECK , wParam ,0); if (bFollowCaret) SendDlgItemMessage(hDlg,IDC_FOLLOWTEXTEDITINGCHECK,BM_SETCHECK , wParam ,0); @@ -513,8 +510,8 @@ case IDC_FOLLOWMOUSECHECK: bFollowMouse = IsDlgButtonChecked (hDlg, IDC_FOLLOWMOUSECHECK); break; - case IDC_FOLOWKEYBOARDCHECK: - bFollowFocus = IsDlgButtonChecked (hDlg, IDC_FOLOWKEYBOARDCHECK); + case IDC_FOLLOWKEYBOARDCHECK: + bFollowFocus = IsDlgButtonChecked (hDlg, IDC_FOLLOWKEYBOARDCHECK); break; case IDC_FOLLOWTEXTEDITINGCHECK: bFollowCaret = IsDlgButtonChecked (hDlg, IDC_FOLLOWTEXTEDITINGCHECK); Modified: trunk/rosapps/magnify/magnify.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/magnify.rc?rev=278… ============================================================================== --- trunk/rosapps/magnify/magnify.rc (original) +++ trunk/rosapps/magnify/magnify.rc Thu Jul 26 11:43:01 2007 @@ -1,6 +1,8 @@ #include <windows.h> #include <commctrl.h> #include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Magnifier\0" #define REACTOS_STR_INTERNAL_NAME "magnify\0" @@ -8,4 +10,6 @@ #include <reactos/version.rc> -#include "lang/en-US.rc" +IDI_ICON ICON "res/magnify.ico" + +#include "rsrc.rc" Modified: trunk/rosapps/magnify/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/resource.h?rev=278… ============================================================================== --- trunk/rosapps/magnify/resource.h (original) +++ trunk/rosapps/magnify/resource.h Thu Jul 26 11:43:01 2007 @@ -1,22 +1,19 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by Magnifier.rc -// -#define IDC_MYICON 2 +#define IDC_STATIC -1 + +#define IDI_ICON 101 #define IDD_MAGNIFIER_DIALOG 102 #define IDS_APP_TITLE 103 #define IDD_ABOUTBOX 103 #define IDM_ABOUT 104 #define IDM_EXIT 105 -#define IDI_MAGNIFIER 107 -#define IDI_SMALL 108 +#define IDC_MYICON 106 #define IDC_MAGNIFIER 109 #define IDR_MAINFRAME 128 #define IDD_DIALOGOPTIONS 129 #define IDD_WARNINGDIALOG 130 #define IDC_ZOOM 1000 #define IDC_CHECK1 1001 -#define IDC_FOLOWKEYBOARDCHECK 1002 +#define IDC_FOLLOWKEYBOARDCHECK 1002 #define IDC_FOLLOWTEXTEDITINGCHECK 1003 #define IDC_INVERTCOLORSCHECK 1004 #define IDC_STARTMINIMIZEDCHECK 1005 @@ -28,16 +25,3 @@ #define ID_FILE_OPTIONS 32771 #define ID_OPTIONS 32772 #define IDM_OPTIONS 32773 -#define IDC_STATIC -1 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NO_MFC 1 -#define _APS_NEXT_RESOURCE_VALUE 131 -#define _APS_NEXT_COMMAND_VALUE 32774 -#define _APS_NEXT_CONTROL_VALUE 1009 -#define _APS_NEXT_SYMED_VALUE 110 -#endif -#endif Added: trunk/rosapps/magnify/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/rsrc.rc?rev=27821&… ============================================================================== --- trunk/rosapps/magnify/rsrc.rc (added) +++ trunk/rosapps/magnify/rsrc.rc Thu Jul 26 11:43:01 2007 @@ -1,0 +1,4 @@ +#include <windows.h> +#include "resource.h" + +#include "lang/en-US.rc"

1 0

[cfinck] 27820: Fix some typos in the file names
by cfinck＠svn.reactos.org 26 Jul '07

26 Jul '07

1 0

[cfinck] 27819: Move the images from the old "template" directory to an own "wiki-images" directory. The "images" directory should be completely under control by the Wiki now.
by cfinck＠svn.reactos.org 26 Jul '07

26 Jul '07

Author: cfinck Date: Thu Jul 26 11:07:37 2007 New Revision: 27819 URL: http://svn.reactos.org/svn/reactos?rev=27819&view=rev Log: Move the images from the old "template" directory to an own "wiki-images" directory. The "images" directory should be completely under control by the Wiki now. Added: trunk/web/reactos.org/wiki-images/ - copied from r27818, trunk/web/reactos.org/htdocs/wiki/images/template/ Removed: trunk/web/reactos.org/htdocs/wiki/images/template/

1 0

[tkreuzer] 27818: gdiobjects patch: - stockmask and reuse counter are stored in the lower 16 bits of the typeinfo field in the entry, not in the upper 16 bits! - take care of this when trying to lock an object (compare upper 16 bits of handle with lower 16 bits of typeinfo field) - some variable renaming - remove code duplication by moving debugoutput to an extra function - move checking for expected object type to a different location, should be removed completely later Fixes possible crashes i
by tkreuzer＠svn.reactos.org 25 Jul '07

25 Jul '07

Author: tkreuzer Date: Thu Jul 26 02:39:14 2007 New Revision: 27818 URL: http://svn.reactos.org/svn/reactos?rev=27818&view=rev Log: gdiobjects patch: - stockmask and reuse counter are stored in the lower 16 bits of the typeinfo field in the entry, not in the upper 16 bits! - take care of this when trying to lock an object (compare upper 16 bits of handle with lower 16 bits of typeinfo field) - some variable renaming - remove code duplication by moving debugoutput to an extra function - move checking for expected object type to a different location, should be removed completely later Fixes possible crashes if messing around with deleted / reused objects. Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c 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 Thu Jul 26 02:39:14 2007 @@ -323,6 +323,33 @@ } #endif /* GDI_DEBUG */ + +static void FASTCALL +LockErrorDebugOutput(HGDIOBJ hObj, PGDI_TABLE_ENTRY Entry, LPSTR Function) +{ + if (Entry->KernelData == NULL) + { + DPRINT1("%s: Attempted to lock object 0x%x that is deleted!\n", Function, hObj); + } + else if (GDI_HANDLE_GET_REUSECNT(hObj) != GDI_ENTRY_GET_REUSECNT(Entry->Type)) + { + DPRINT1("%s: Attempted to lock object 0x%x, wrong reuse counter (Handle: 0x%x, Entry: 0x%x)\n", + Function, hObj, GDI_HANDLE_GET_REUSECNT(hObj), GDI_ENTRY_GET_REUSECNT(Entry->Type)); + } + else if (GDI_HANDLE_GET_TYPE(hObj) != GDI_HANDLE_GET_TYPE(Entry->Type)) + { + DPRINT1("%s: Attempted to lock object 0x%x, type mismatch (Handle: 0x%x, Entry: 0x%x)\n", + Function, hObj, GDI_HANDLE_GET_TYPE(hObj), GDI_HANDLE_GET_TYPE(Entry->Type)); + } + else + { + DPRINT1("%s: Attempted to lock object 0x%x, something went wrong, typeinfo = 0x%x\n", + Function, hObj, Entry->Type); + } + KeRosDumpStackFrames(NULL, 20); + +} + /*! * Allocate memory for GDI object and return handle to it. * @@ -384,7 +411,10 @@ RtlZeroMemory(ObjectBody, GetObjectSize(ObjectType)); - TypeInfo = (ObjectType & GDI_HANDLE_TYPE_MASK) | (ObjectType >> 16); + /* FIXME: On Windows the higher 16 bit of the type field don't always match + the type from the handle, it is probably a storage type + (type = pen, storage = brush) */ + TypeInfo = (ObjectType & GDI_HANDLE_TYPE_MASK) | (ObjectType >> GDI_ENTRY_UPPER_SHIFT); FreeEntry = InterlockedPopEntrySList(&HandleTable->FreeEntriesHead); if(FreeEntry != NULL) @@ -408,7 +438,7 @@ Entry->KernelData = ObjectBody; /* copy the reuse-counter */ - TypeInfo |= Entry->Type & GDI_HANDLE_REUSE_MASK; + TypeInfo |= Entry->Type & GDI_ENTRY_REUSE_MASK; /* we found a free entry, no need to exchange this field atomically since we're holding the lock */ @@ -426,7 +456,7 @@ { InterlockedIncrement(&W32Process->GDIObjects); } - Handle = (HGDIOBJ)((Index & 0xFFFF) | (TypeInfo & (GDI_HANDLE_TYPE_MASK | GDI_HANDLE_REUSE_MASK))); + Handle = (HGDIOBJ)((Index & 0xFFFF) | (TypeInfo << GDI_ENTRY_UPPER_SHIFT)); DPRINT("GDIOBJ_AllocObj: 0x%x ob: 0x%x\n", Handle, ObjectBody); return Handle; @@ -478,15 +508,15 @@ */ BOOL INTERNAL_CALL #ifdef GDI_DEBUG -GDIOBJ_FreeObjDbg(PGDI_HANDLE_TABLE HandleTable, const char* file, int line, HGDIOBJ hObj, DWORD ObjectType) +GDIOBJ_FreeObjDbg(PGDI_HANDLE_TABLE HandleTable, const char* file, int line, HGDIOBJ hObj, DWORD ExpectedType) #else /* !GDI_DEBUG */ -GDIOBJ_FreeObj(PGDI_HANDLE_TABLE HandleTable, HGDIOBJ hObj, DWORD ObjectType) +GDIOBJ_FreeObj(PGDI_HANDLE_TABLE HandleTable, HGDIOBJ hObj, DWORD ExpectedType) #endif /* GDI_DEBUG */ { PGDI_TABLE_ENTRY Entry; PPAGED_LOOKASIDE_LIST LookasideList; HANDLE ProcessId, LockedProcessId, PrevProcId; - LONG ExpectedType; + ULONG HandleType, HandleUpper; BOOL Silent; #ifdef GDI_DEBUG ULONG Attempts = 0; @@ -506,10 +536,21 @@ ProcessId = PsGetCurrentProcessId(); LockedProcessId = (HANDLE)((ULONG_PTR)ProcessId | 0x1); - Silent = (ObjectType & GDI_OBJECT_TYPE_SILENT); - ObjectType &= ~GDI_OBJECT_TYPE_SILENT; - - ExpectedType = ((ObjectType != GDI_OBJECT_TYPE_DONTCARE) ? ObjectType : 0); + Silent = (ExpectedType & GDI_OBJECT_TYPE_SILENT); + ExpectedType &= ~GDI_OBJECT_TYPE_SILENT; + + HandleType = GDI_HANDLE_GET_TYPE(hObj); + HandleUpper = GDI_HANDLE_GET_UPPER(hObj); + + /* Check if we have the requested type */ + if ( (ExpectedType != GDI_OBJECT_TYPE_DONTCARE && + HandleType != ExpectedType) || + HandleType == 0 ) + { + DPRINT1("Attempted to free object 0x%x of wrong type (Handle: 0x%x, expected: 0x%x)\n", + hObj, HandleType, ExpectedType); + return FALSE; + } Entry = GDI_HANDLE_GET_ENTRY(HandleTable, hObj); @@ -519,10 +560,8 @@ PrevProcId = InterlockedCompareExchangePointer(&Entry->ProcessId, LockedProcessId, ProcessId); if(PrevProcId == ProcessId) { - if(Entry->Type != 0 && Entry->KernelData != NULL && - (ExpectedType == 0 || ((Entry->Type << 16) == ExpectedType)) && - (Entry->Type & (GDI_HANDLE_TYPE_MASK | GDI_HANDLE_REUSE_MASK)) == - ((ULONG_PTR)hObj & (GDI_HANDLE_TYPE_MASK | GDI_HANDLE_REUSE_MASK))) + if( (Entry->KernelData != NULL) && + ((Entry->Type << GDI_ENTRY_UPPER_SHIFT) == HandleUpper) ) { PGDIOBJHDR GdiHdr; @@ -532,10 +571,9 @@ { BOOL Ret; PW32PROCESS W32Process = PsGetCurrentProcessWin32Process(); - ULONG Type = Entry->Type << 16; /* Clear the type field so when unlocking the handle it gets finally deleted and increment reuse counter */ - Entry->Type = ((Entry->Type >> GDI_HANDLE_REUSECNT_SHIFT) + 1) << GDI_HANDLE_REUSECNT_SHIFT; + Entry->Type = (Entry->Type + GDI_ENTRY_REUSE_INC) & GDI_ENTRY_REUSE_MASK; Entry->KernelData = NULL; /* unlock the handle slot */ @@ -551,10 +589,10 @@ } /* call the cleanup routine. */ - Ret = RunCleanupCallback(GDIHdrToBdy(GdiHdr), Type); + Ret = RunCleanupCallback(GDIHdrToBdy(GdiHdr), HandleType); /* Now it's time to free the memory */ - LookasideList = FindLookasideList(HandleTable, Type); + LookasideList = FindLookasideList(HandleTable, HandleType); if(LookasideList != NULL) { ExFreeToPagedLookasideList(LookasideList, GdiHdr); @@ -576,16 +614,7 @@ } else { - if((Entry->Type & ~GDI_HANDLE_REUSE_MASK) != 0) - { - DPRINT1("Attempted to delete object 0x%x, type mismatch (0x%x : 0x%x)\n", hObj, ObjectType, ExpectedType); - KeRosDumpStackFrames(NULL, 20); - } - else - { - DPRINT1("Attempted to delete object 0x%x which was already deleted!\n", hObj); - KeRosDumpStackFrames(NULL, 20); - } + LockErrorDebugOutput(hObj, Entry, "GDIOBJ_FreeObj"); (void)InterlockedExchangePointer(&Entry->ProcessId, PrevProcId); } } @@ -678,11 +707,11 @@ { HGDIOBJ ObjectHandle; - /* Create the object handle for the entry, the upper 16 bit of the + /* Create the object handle for the entry, the lower(!) 16 bit of the Type field includes the type of the object including the stock object flag - but since stock objects don't have a process id we can simply ignore this fact here. */ - ObjectHandle = (HGDIOBJ)(Index | (Entry->Type & 0xFFFF0000)); + ObjectHandle = (HGDIOBJ)(Index | (Entry->Type << GDI_ENTRY_UPPER_SHIFT)); if(GDIOBJ_FreeObj(HandleTable, ObjectHandle, GDI_OBJECT_TYPE_DONTCARE) && W32Process->GDIObjects == 0) @@ -712,30 +741,43 @@ * * \note Process can only get pointer to the objects it created or global objects. * - * \todo Get rid of the ObjectType parameter! + * \todo Get rid of the ExpectedType parameter! */ PGDIOBJ INTERNAL_CALL #ifdef GDI_DEBUG -GDIOBJ_LockObjDbg (PGDI_HANDLE_TABLE HandleTable, const char* file, int line, HGDIOBJ hObj, DWORD ObjectType) +GDIOBJ_LockObjDbg (PGDI_HANDLE_TABLE HandleTable, const char* file, int line, HGDIOBJ hObj, DWORD ExpectedType) #else /* !GDI_DEBUG */ -GDIOBJ_LockObj (PGDI_HANDLE_TABLE HandleTable, HGDIOBJ hObj, DWORD ObjectType) +GDIOBJ_LockObj (PGDI_HANDLE_TABLE HandleTable, HGDIOBJ hObj, DWORD ExpectedType) #endif /* GDI_DEBUG */ { USHORT HandleIndex; - PGDI_TABLE_ENTRY HandleEntry; + PGDI_TABLE_ENTRY Entry; HANDLE ProcessId, HandleProcessId, LockedProcessId, PrevProcId; PGDIOBJ Object = NULL; + ULONG HandleType, HandleUpper; HandleIndex = GDI_HANDLE_GET_INDEX(hObj); + HandleType = GDI_HANDLE_GET_TYPE(hObj); + HandleUpper = GDI_HANDLE_GET_UPPER(hObj); /* Check that the handle index is valid. */ if (HandleIndex >= GDI_HANDLE_COUNT) return NULL; - HandleEntry = &HandleTable->Entries[HandleIndex]; + Entry = &HandleTable->Entries[HandleIndex]; + + /* Check if we have the requested type */ + if ( (ExpectedType != GDI_OBJECT_TYPE_DONTCARE && + HandleType != ExpectedType) || + HandleType == 0 ) + { + DPRINT1("Attempted to lock object 0x%x of wrong type (Handle: 0x%x, requested: 0x%x)\n", + hObj, HandleType, ExpectedType); + return NULL; + } ProcessId = (HANDLE)((ULONG_PTR)PsGetCurrentProcessId() & ~1); - HandleProcessId = (HANDLE)((ULONG_PTR)HandleEntry->ProcessId & ~1); + HandleProcessId = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~1); /* Check for invalid owner. */ if (ProcessId != HandleProcessId && HandleProcessId != NULL) @@ -760,25 +802,21 @@ { /* Lock the handle table entry. */ LockedProcessId = (HANDLE)((ULONG_PTR)HandleProcessId | 0x1); - PrevProcId = InterlockedCompareExchangePointer(&HandleEntry->ProcessId, + PrevProcId = InterlockedCompareExchangePointer(&Entry->ProcessId, LockedProcessId, HandleProcessId); if (PrevProcId == HandleProcessId) { - LONG HandleType = HandleEntry->Type << 16; - /* * We're locking an object that belongs to our process or it's a * global object if HandleProcessId is 0 here. */ - /* FIXME: Check the upper 16-bits of handle number! */ - if (HandleType != 0 && HandleEntry->KernelData != NULL && - (ObjectType == GDI_OBJECT_TYPE_DONTCARE || - HandleType == ObjectType)) + if ( (Entry->KernelData != NULL) && + ((Entry->Type << GDI_ENTRY_UPPER_SHIFT) == HandleUpper) ) { - PGDIOBJHDR GdiHdr = GDIBdyToHdr(HandleEntry->KernelData); + PGDIOBJHDR GdiHdr = GDIBdyToHdr(Entry->KernelData); PETHREAD Thread = PsGetCurrentThread(); if (GdiHdr->Locks == 0) @@ -789,7 +827,7 @@ GdiHdr->lockfile = file; GdiHdr->lockline = line; #endif - Object = HandleEntry->KernelData; + Object = Entry->KernelData; } else { @@ -799,12 +837,12 @@ InterlockedDecrement((PLONG)&GdiHdr->Locks); /* Unlock the handle table entry. */ - (void)InterlockedExchangePointer(&HandleEntry->ProcessId, PrevProcId); + (void)InterlockedExchangePointer(&Entry->ProcessId, PrevProcId); DelayExecution(); continue; } - Object = HandleEntry->KernelData; + Object = Entry->KernelData; } } else @@ -813,26 +851,15 @@ * Debugging code. Report attempts to lock deleted handles and * locking type mismatches. */ - - if ((HandleType & ~GDI_HANDLE_REUSE_MASK) == 0) - { - DPRINT1("Attempted to lock object 0x%x that is deleted!\n", hObj); - KeRosDumpStackFrames(NULL, 20); - } - else - { - DPRINT1("Attempted to lock object 0x%x, type mismatch (0x%x : 0x%x)\n", - hObj, HandleType & ~GDI_HANDLE_REUSE_MASK, ObjectType & ~GDI_HANDLE_REUSE_MASK); - - KeRosDumpStackFrames(NULL, 20); - } + LockErrorDebugOutput(hObj, Entry, "GDIOBJ_LockObj"); + #ifdef GDI_DEBUG DPRINT1("-> called from %s:%i\n", file, line); #endif } /* Unlock the handle table entry. */ - (void)InterlockedExchangePointer(&HandleEntry->ProcessId, PrevProcId); + (void)InterlockedExchangePointer(&Entry->ProcessId, PrevProcId); break; } @@ -862,30 +889,43 @@ * * \note Process can only get pointer to the objects it created or global objects. * - * \todo Get rid of the ObjectType parameter! + * \todo Get rid of the ExpectedType parameter! */ PGDIOBJ INTERNAL_CALL #ifdef GDI_DEBUG -GDIOBJ_ShareLockObjDbg (PGDI_HANDLE_TABLE HandleTable, const char* file, int line, HGDIOBJ hObj, DWORD ObjectType) +GDIOBJ_ShareLockObjDbg (PGDI_HANDLE_TABLE HandleTable, const char* file, int line, HGDIOBJ hObj, DWORD ExpectedType) #else /* !GDI_DEBUG */ -GDIOBJ_ShareLockObj (PGDI_HANDLE_TABLE HandleTable, HGDIOBJ hObj, DWORD ObjectType) +GDIOBJ_ShareLockObj (PGDI_HANDLE_TABLE HandleTable, HGDIOBJ hObj, DWORD ExpectedType) #endif /* GDI_DEBUG */ { USHORT HandleIndex; - PGDI_TABLE_ENTRY HandleEntry; + PGDI_TABLE_ENTRY Entry; HANDLE ProcessId, HandleProcessId, LockedProcessId, PrevProcId; PGDIOBJ Object = NULL; + ULONG_PTR HandleType, HandleUpper; HandleIndex = GDI_HANDLE_GET_INDEX(hObj); + HandleType = GDI_HANDLE_GET_TYPE(hObj); + HandleUpper = GDI_HANDLE_GET_UPPER(hObj); /* Check that the handle index is valid. */ if (HandleIndex >= GDI_HANDLE_COUNT) return NULL; - HandleEntry = &HandleTable->Entries[HandleIndex]; + /* Check if we have the requested type */ + if ( (ExpectedType != GDI_OBJECT_TYPE_DONTCARE && + HandleType != ExpectedType) || + HandleType == 0 ) + { + DPRINT1("Attempted to lock object 0x%x of wrong type (Handle: 0x%x, requested: 0x%x)\n", + hObj, HandleType, ExpectedType); + return NULL; + } + + Entry = &HandleTable->Entries[HandleIndex]; ProcessId = (HANDLE)((ULONG_PTR)PsGetCurrentProcessId() & ~1); - HandleProcessId = (HANDLE)((ULONG_PTR)HandleEntry->ProcessId & ~1); + HandleProcessId = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~1); /* Check for invalid owner. */ if (ProcessId != HandleProcessId && HandleProcessId != NULL) @@ -910,25 +950,21 @@ { /* Lock the handle table entry. */ LockedProcessId = (HANDLE)((ULONG_PTR)HandleProcessId | 0x1); - PrevProcId = InterlockedCompareExchangePointer(&HandleEntry->ProcessId, + PrevProcId = InterlockedCompareExchangePointer(&Entry->ProcessId, LockedProcessId, HandleProcessId); if (PrevProcId == HandleProcessId) { - LONG HandleType = HandleEntry->Type << 16; - /* * We're locking an object that belongs to our process or it's a * global object if HandleProcessId is 0 here. */ - /* FIXME: Check the upper 16-bits of handle number! */ - if (HandleType != 0 && HandleEntry->KernelData != NULL && - (ObjectType == GDI_OBJECT_TYPE_DONTCARE || - HandleType == ObjectType)) + if ( (Entry->KernelData != NULL) && + (HandleUpper == (Entry->Type << GDI_ENTRY_UPPER_SHIFT)) ) { - PGDIOBJHDR GdiHdr = GDIBdyToHdr(HandleEntry->KernelData); + PGDIOBJHDR GdiHdr = GDIBdyToHdr(Entry->KernelData); #ifdef GDI_DEBUG if (InterlockedIncrement((PLONG)&GdiHdr->Locks) == 1) @@ -939,7 +975,7 @@ #else InterlockedIncrement((PLONG)&GdiHdr->Locks); #endif - Object = HandleEntry->KernelData; + Object = Entry->KernelData; } else { @@ -947,26 +983,15 @@ * Debugging code. Report attempts to lock deleted handles and * locking type mismatches. */ - - if ((HandleType & ~GDI_HANDLE_REUSE_MASK) == 0) - { - DPRINT1("Attempted to lock object 0x%x that is deleted!\n", hObj); - KeRosDumpStackFrames(NULL, 20); - } - else - { - DPRINT1("Attempted to lock object 0x%x, type mismatch (0x%x : 0x%x)\n", - hObj, HandleType & ~GDI_HANDLE_REUSE_MASK, ObjectType & ~GDI_HANDLE_REUSE_MASK); - - KeRosDumpStackFrames(NULL, 20); - } + LockErrorDebugOutput(hObj, Entry, "GDIOBJ_ShareLockObj"); + #ifdef GDI_DEBUG DPRINT1("-> called from %s:%i\n", file, line); #endif } /* Unlock the handle table entry. */ - (void)InterlockedExchangePointer(&HandleEntry->ProcessId, PrevProcId); + (void)InterlockedExchangePointer(&Entry->ProcessId, PrevProcId); break; } @@ -1069,14 +1094,16 @@ /* we're locking an object that belongs to our process. First calculate the new object type including the stock object flag and then try to exchange it.*/ + /* FIXME: On Windows the higher 16 bit of the type field don't always match + the type from the handle, it is probably a storage type + (type = pen, storage = brush) */ NewType = GDI_HANDLE_GET_TYPE(*hObj); - NewType |= NewType >> 16; - NewType |= (ULONG_PTR)(*hObj) & GDI_HANDLE_REUSE_MASK; + NewType |= GDI_HANDLE_GET_UPPER(*hObj) >> GDI_ENTRY_UPPER_SHIFT; /* This is the type that the object should have right now, save it */ OldType = NewType; - /* As the object should be a stock object, set it's flag, but only in the upper 16 bits */ - NewType |= GDI_HANDLE_STOCK_MASK; + /* As the object should be a stock object, set it's flag, but only in the lower 16 bits */ + NewType |= GDI_ENTRY_STOCK_MASK; /* Try to exchange the type field - but only if the old (previous type) matches! */ PrevType = InterlockedCompareExchange(&Entry->Type, NewType, OldType); @@ -1198,7 +1225,7 @@ { PETHREAD PrevThread; - if((Entry->Type & ~GDI_HANDLE_REUSE_MASK) != 0 && Entry->KernelData != NULL) + if((Entry->Type & ~GDI_ENTRY_REUSE_MASK) != 0 && Entry->KernelData != NULL) { PGDIOBJHDR GdiHdr = GDIBdyToHdr(Entry->KernelData); @@ -1334,7 +1361,7 @@ PETHREAD PrevThread; PGDIOBJHDR GdiHdr; - if((FromEntry->Type & ~GDI_HANDLE_REUSE_MASK) != 0 && FromEntry->KernelData != NULL) + if((FromEntry->Type & ~GDI_ENTRY_REUSE_MASK) != 0 && FromEntry->KernelData != NULL) { GdiHdr = GDIBdyToHdr(FromEntry->KernelData);

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
71
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2007