Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[greatlrd] 20713: fix cmd build with MSVC 2005
by greatlrd＠svn.reactos.org 08 Jan '06

08 Jan '06

fix cmd build with MSVC 2005 Modified: trunk/reactos/subsys/system/cmd/precomp.h _____ Modified: trunk/reactos/subsys/system/cmd/precomp.h --- trunk/reactos/subsys/system/cmd/precomp.h 2006-01-08 13:54:06 UTC (rev 20712) +++ trunk/reactos/subsys/system/cmd/precomp.h 2006-01-08 15:22:56 UTC (rev 20713) @@ -1,5 +1,6 @@ #ifdef _MSC_VER #pragma warning ( disable : 4103 ) /* use #pragma pack to change alignment */ +#undef _CRT_SECURE_NO_DEPRECATE #define _CRT_SECURE_NO_DEPRECATE #endif//_MSC_VER

1 0

[royce] 20712: minor bugfix: sswprintf(L"%hs", "foo") was returning L"fff"
by royce＠svn.reactos.org 08 Jan '06

08 Jan '06

minor bugfix: sswprintf(L"%hs","foo") was returning L"fff" Modified: trunk/reactos/tools/ssprintf.cpp _____ Modified: trunk/reactos/tools/ssprintf.cpp --- trunk/reactos/tools/ssprintf.cpp 2006-01-08 12:55:06 UTC (rev 20711) +++ trunk/reactos/tools/ssprintf.cpp 2006-01-08 13:54:06 UTC (rev 20712) @@ -1263,7 +1263,7 @@ { wchar_t w; int mbcount; - mbcount = mbtowc(&w, sa, len-i); + mbcount = mbtowc(&w, sa+i, len-i); if (mbcount <= 0) break; f += w;

1 0

[ros-diffs] [fireball] 20711: Fix an error in struct initialization, remove some debug things.
by fireball＠svn.reactos.org 08 Jan '06

08 Jan '06

Fix an error in struct initialization, remove some debug things. Modified: branches/usb2_6/reactos/drivers/usb/miniport/linux/linux_wrapper.h Modified: branches/usb2_6/reactos/drivers/usb/miniport/usbuhci/uhci-hcd.c Modified: branches/usb2_6/reactos/drivers/usb/miniport/usbuhci/uhci.c _____ Modified: branches/usb2_6/reactos/drivers/usb/miniport/linux/linux_wrapper.h --- branches/usb2_6/reactos/drivers/usb/miniport/linux/linux_wrapper.h 2006-01-08 11:48:49 UTC (rev 20710) +++ branches/usb2_6/reactos/drivers/usb/miniport/linux/linux_wrapper.h 2006-01-08 12:55:06 UTC (rev 20711) @@ -399,7 +399,7 @@ #define IS_ERR_VALUE(x) unlikely((x) > (unsigned long)-1000L) static __inline long IS_ERR(const void *ptr) { - return IS_ERR_VALUE((unsigned long)ptr); + return (long)IS_ERR_VALUE((unsigned long)ptr); } _____ Modified: branches/usb2_6/reactos/drivers/usb/miniport/usbuhci/uhci-hcd.c --- branches/usb2_6/reactos/drivers/usb/miniport/usbuhci/uhci-hcd.c 2006-01-08 11:48:49 UTC (rev 20710) +++ branches/usb2_6/reactos/drivers/usb/miniport/usbuhci/uhci-hcd.c 2006-01-08 12:55:06 UTC (rev 20711) @@ -421,7 +421,6 @@ if (status & USBSTS_RD) { - DbgBreakPoint(); usb_hcd_poll_rh_status(hcd); } else { @@ -938,7 +937,7 @@ MODULE_DEVICE_TABLE(pci, uhci_pci_ids); struct pci_driver uhci_pci_driver = { - 0, + /* list_head*/ 0, 0, /*.name =*/ (char *)hcd_name, /*.id_table =*/ uhci_pci_ids, _____ Modified: branches/usb2_6/reactos/drivers/usb/miniport/usbuhci/uhci.c --- branches/usb2_6/reactos/drivers/usb/miniport/usbuhci/uhci.c 2006-01-08 11:48:49 UTC (rev 20710) +++ branches/usb2_6/reactos/drivers/usb/miniport/usbuhci/uhci.c 2006-01-08 12:55:06 UTC (rev 20711) @@ -36,7 +36,7 @@ strcpy(dev->dev.name, "UnivHCI PCI-USB Controller"); strcpy(dev->slot_name, "UHCD PCI Slot"); -DbgBreakPoint(); + /* Init the HCD. Probe will be called automatically, but will fail because id=NULL */ Status = uhci_hcd_init(); if (!NT_SUCCESS(Status))

1 0

[mbosma] 20710: Another german translation update by DJ_Smith from IRC (dj_smith_reactos(at)online(dot)de)
by mbosma＠svn.reactos.org 08 Jan '06

08 Jan '06

Another german translation update by DJ_Smith from IRC (dj_smith_reactos(at)online(dot)de) Modified: trunk/reactos/subsys/system/msconfig/De.rc _____ Modified: trunk/reactos/subsys/system/msconfig/De.rc --- trunk/reactos/subsys/system/msconfig/De.rc 2006-01-08 11:29:19 UTC (rev 20709) +++ trunk/reactos/subsys/system/msconfig/De.rc 2006-01-08 11:48:49 UTC (rev 20710) @@ -14,22 +14,22 @@ PUSHBUTTON "?&bernehmen", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END -IDD_TOOLS_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +IDD_STARTUP_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "Tahoma" BEGIN - CONTROL "List2",IDC_TOOLS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 134 - EDITTEXT IDC_TOOLS_CMDLINE, 1, 139, 360, 12, ES_READONLY - PUSHBUTTON "&Ausf³hren", IDC_BTN_RUN, 311, 155, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "List3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148 + PUSHBUTTON "Alle &aktivieren",IDC_BTN_STARTUP_ACTIVATE,223,155,66,14 + PUSHBUTTON "Alle &deaktivieren",IDC_BTN_STARTUP_DEACTIVATE,295,155,66,14 END -IDD_STARTUP_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +IDD_TOOLS_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "Tahoma" BEGIN - CONTROL "List3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148 - PUSHBUTTON "Alle &aktivieren",IDC_BTN_STARTUP_ACTIVATE,223,155,66,14 - PUSHBUTTON "Alle &deaktivieren",IDC_BTN_STARTUP_DEACTIVATE,295,155,66,14 + CONTROL "List2",IDC_TOOLS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 134 + EDITTEXT IDC_TOOLS_CMDLINE, 1, 139, 360, 12, ES_READONLY + PUSHBUTTON "&Ausf³hren", IDC_BTN_RUN, 311, 155, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END IDD_SERVICES_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 @@ -41,6 +41,65 @@ PUSHBUTTON "Alle &deaktivieren",IDC_BTN_SERVICES_DEACTIVATE,295,155,66,14 END +IDD_GENERAL_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + GROUPBOX "Systemstartauswahl", -1, 10, 10, 340, 150 + CONTROL "&Normaler Systemstart - Alle Gerõtetreiber und Dienste laden", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 210, 10 + CONTROL "&Diagnosesystemstart - Nur grundlegende Gerõte und Dienste laden", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 230, 10 + CONTROL "B&enutzerdefinierter Systemstart", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 120, 10 + CHECKBOX "D&atei SYSTEM.INI verarbeiten", IDC_CBX_SYSTEM_INI, 30, 80, 110, 10 + CHECKBOX "&Systemdienste laden", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 + CHECKBOX "S&ystemstartelemente laden", IDC_CBX_STARTUP_ITEM, 30, 110, 110, 10 +END + +IDD_FREELDR_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + CONTROL "", IDC_LIST_BOX, "ListBox", 0x50010141, 10, 10, 340, 50, 0x00000200 + PUSHBUTTON "&Alle Bootpfade ³berpr³fen", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 90, 12 + PUSHBUTTON "A&ls Standart", IDC_BTN_SET_DEFAULT_BOOT, 120, 65, 63, 12 + PUSHBUTTON "Nach &Oben", IDC_BTN_MOVE_UP_BOOT_OPTION, 203, 65, 63, 12 + PUSHBUTTON "Nach &Unten", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 286, 65, 63, 12 + GROUPBOX "Boot Optionen", -1, 10, 80, 250, 90 + CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10 + CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 50, 10 + CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 + CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 50, 10 + CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 + PUSHBUTTON "E&rweiterte Optionen...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 90, 12 + LTEXT "&Zeitlimit:", -1, 280, 90, 30, 10 + EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 10, ES_LEFT + LTEXT "Sek.", -1, 340, 90, 15, 10 +END + +IDD_FREELDR_ADVANCED_PAGE DIALOG DISCARDABLE 0, 0, 175, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + CHECKBOX "/&MAXMEM=", IDC_CBX_MAX_MEM, 10, 10, 50, 10 + EDITTEXT IDC_TXT_MAX_MEM, 80, 10, 60, 12 + CONTROL "",IDC_SCR_MAX_MEM, "msctls_updown32", 0x50000000, 140, 10, 11, 11 + CHECKBOX "/&NUMPROC=", IDC_CBX_NUM_PROC, 10, 25, 50, 10 + COMBOBOX IDC_DRP_NUM_PROC, 80, 25, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "/&PCILOCK", IDC_CBX_PCI_LOCK, 10, 40, 50, 10 + CHECKBOX "/P&ROFILE", IDC_CBX_PROFILE, 10, 55, 50, 10 + CHECKBOX "/&IRQ", IDC_CBX_IRQ, 10, 70, 40, 12 + EDITTEXT IDC_TXT_IRQ, 80, 70, 60, 12, ES_LEFT + CHECKBOX "/&DEBUG", IDC_CBX_DEBUG, 10, 85, 40, 10 + CHECKBOX "/D&EBUGPORT", IDC_CBX_DEBUG_PORT, 20, 100, 60, 10 + COMBOBOX IDC_DRP_DEBUG_PORT, 80, 100, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "/&BAUDRATE", IDC_CBX_BAUD_RATE, 20, 115, 50, 10 + COMBOBOX IDC_DRP_DRP_BAUD_RATE, 80, 115, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "/&CHANNEL", IDC_CBX_CHANNEL, 20, 130, 50, 10 + EDITTEXT IDC_TXT_CHANNEL, 80, 130, 60, 12, ES_LEFT + CONTROL "",IDC_SCR_CHANNEL, "msctls_updown32", 0x50000000, 140, 130, 11, 11 + PUSHBUTTON "OK", IDC_OK, 20, 160, 50, 12 + PUSHBUTTON "Abbrechen", IDC_CANCEL, 100, 160, 50, 12 +END + STRINGTABLE DISCARDABLE BEGIN IDS_MSCONFIG "Systemkonfigurationsprogramm" @@ -66,9 +125,8 @@ IDS_TOOLS_COLUMN_DESCR "Beschreibung" IDS_TOOLS_CMD_NAME "Konsole" - IDS_TOOLS_CMD_DESCR "Íffnet die Eingabeaufforderung." + IDS_TOOLS_CMD_DESCR "" IDS_TOOLS_CMD_CMD "cmd.exe" - IDS_TOOLS_CMD_PARAM "" IDS_TOOLS_INFO_NAME "Version" IDS_TOOLS_INFO_DESCR "Zeigt die installierte ReactOS Version an." @@ -95,4 +153,3 @@ IDS_SERVICES_YES "Ja" IDS_SERVICES_UNKNOWN "Unbekannt" END -

1 0

[mbosma] 20709: Speekix (speekix(at)gmail(dot)com): Italian language file for RosCMS (Bug 1252)
by mbosma＠svn.reactos.org 08 Jan '06

08 Jan '06

Speekix (speekix(at)gmail(dot)com): Italian language file for RosCMS (Bug 1252) Added: trunk/web/reactos.org/htdocs/roscms/inc/lang/it.php _____ Added: trunk/web/reactos.org/htdocs/roscms/inc/lang/it.php --- trunk/web/reactos.org/htdocs/roscms/inc/lang/it.php 2006-01-08 11:20:02 UTC (rev 20708) +++ trunk/web/reactos.org/htdocs/roscms/inc/lang/it.php 2006-01-08 11:29:19 UTC (rev 20709) @@ -0,0 +1,77 @@ +<?php + /* + RosCMS - ReactOS Content Management System + Copyright (C) 2005 Klemens Friedl <frik85(a)reactos.org> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + + +// +// The format of this file is ---> $roscms_langres['message'] = 'text'; +// + + +// Language settings +$roscms_langres['charset'] = 'utf-8'; +//$roscms_langres['charset'] = 'iso-8859-1'; +$roscms_langres['lang_code'] = 'IT'; + + +// main menu +$roscms_langres['Navigation'] = 'Navigazione'; +$roscms_langres['Home'] = 'Home'; +$roscms_langres['Dev'] = 'Sviluppo'; +$roscms_langres['Community'] = 'Community'; +$roscms_langres['Support'] = 'Supporto'; +$roscms_langres['myReactOS'] = 'myReactOS'; + +// Login bar: +$roscms_langres['Account'] = 'Account'; +$roscms_langres['Login'] = 'Login'; +$roscms_langres['Logout'] = 'Logout'; +$roscms_langres['Global_Login_System'] = 'Global Login System'; +$roscms_langres['Register_Account'] = 'Registerazione Account'; +$roscms_langres['Login_Nick'] = ' Nick: '; +$roscms_langres['LoginPwd'] = ' Pwd: '; + + +// myReactOS menu +$roscms_langres['User_Profil_Overview'] = 'Descrizione Profilo Utente'; +$roscms_langres['User_Profil'] = 'Profilo Utente'; +$roscms_langres['Overview'] = 'Descrizione'; +$roscms_langres['Login_System'] = 'Login System'; +$roscms_langres['Messages'] = 'Messaggi'; +$roscms_langres['Contacts'] = 'Contatti'; +$roscms_langres['Favorites'] = 'Preferiti'; +$roscms_langres['Documentation'] = 'Documentazione'; +$roscms_langres['Account_Edit'] = 'Impostazioni'; +$roscms_langres['Accountlist'] = 'Lista Utenti'; + + +// myReactOS Content +$roscms_langres['myReactOS_description'] = 'Un'interfaccia potente e facile da usare per gestire il tuo ReactOS homepage account.'; +$roscms_langres['Account_Information'] = 'Informazioni Account'; +$roscms_langres['Account_Information_description'] = 'Un riassunto delle informazioni sul tuo account ... &ltda supportare>'; + +// Right side bar: +$roscms_langres['Latest_Release'] = 'Ultime Release'; +$roscms_langres['myReactOS_Developer_Quotes'] = 'Citazioni degli sviluppatori'; + +// Error 404 +$roscms_langres['Page_not_found'] = 'Pagina non trovata'; + + +?> \ No newline at end of file

1 0

[cwittich] 20708: Ukrainian translations from temarez <temarez@yandex.ru> (Bug 1243)
by cwittich＠svn.reactos.org 08 Jan '06

08 Jan '06

Ukrainian translations from temarez <temarez(a)yandex.ru> (Bug 1243) Modified: trunk/reactos/lib/aclui/aclui.rc Added: trunk/reactos/lib/aclui/aclui_Uk.rc Added: trunk/reactos/lib/devmgr/Uk.rc Modified: trunk/reactos/lib/devmgr/devmgr.rc Modified: trunk/reactos/lib/mpr/mpr.rc Added: trunk/reactos/lib/mpr/mpr_Uk.rc Modified: trunk/reactos/lib/oleaut32/oleaut32.rc Added: trunk/reactos/lib/oleaut32/oleaut32_Uk.rc Added: trunk/reactos/lib/userenv/Uk.rc Modified: trunk/reactos/lib/userenv/userenv.rc Modified: trunk/reactos/lib/wininet/rsrc.rc Added: trunk/reactos/lib/wininet/wininet_Uk.rc Added: trunk/reactos/lib/winmm/winmm_Uk.rc Modified: trunk/reactos/lib/winmm/winmm_res.rc Added: trunk/reactos/subsys/system/explorer/explorer-uk.rc Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc Added: trunk/reactos/subsys/system/reactos/Uk.rc Modified: trunk/reactos/subsys/system/reactos/reactos.rc _____ Modified: trunk/reactos/lib/aclui/aclui.rc --- trunk/reactos/lib/aclui/aclui.rc 2006-01-08 10:23:23 UTC (rev 20707) +++ trunk/reactos/lib/aclui/aclui.rc 2006-01-08 11:20:02 UTC (rev 20708) @@ -19,3 +19,4 @@ #include "aclui_Es.rc" #include "aclui_Pl.rc" #include "aclui_Ru.rc" +#include "aclui_Uk.rc" _____ Added: trunk/reactos/lib/aclui/aclui_Uk.rc --- trunk/reactos/lib/aclui/aclui_Uk.rc 2006-01-08 10:23:23 UTC (rev 20707) +++ trunk/reactos/lib/aclui/aclui_Uk.rc 2006-01-08 11:20:02 UTC (rev 20708) @@ -0,0 +1,28 @@ +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDD_SECPAGE DIALOGEX 0, 0, 227, 215 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "?Õþ´ÕÛÓ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&?¾´Þ Óß¯ Û¯Þ±?¾ÔÓ¸?:", -1, 7, 7, 105, 8 + CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + PUSHBUTTON "&?¯õÓ?Þ...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 + PUSHBUTTON "?&ÞõÓÙÞ?Þ", IDC_REMOVE_PRINCIPAL, 170, 87, 50, 14 + LTEXT "", IDC_LABEL_PERMISSIONS_FOR, 7, 107, 105, 8, SS_LEFT | SS_NOPREFIX + LTEXT "?¯þÔ¯ÙÞ?Þ", IDC_LABEL_ALLOW, 135, 107, 32, 8, SS_CENTER + LTEXT "ÃÓß¯¯ÝÞ?Þ", IDC_LABEL_DENY, 176, 107, 32, 8, SS_CENTER + CONTROL "", IDC_ACE_CHECKLIST, "CHECKLIST_ACLUI", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 117, 213, 72, WS_EX_CLIENTEDGE + LTEXT "?Ù þÓÔõÓÝÝ ¯±¯ßÙÞÔÞ§ õ¯þÔ¯Ù?Ô Óß¯ ´ÓÓýÕ??Ô, ÝÓ?Þ±Ý??³ ?¯ õÓ?Û¯Ô¯.", IDC_LABEL_ADVANCED, 7, 194, 153, 16, SS_LEFT + PUSHBUTTON "?¯õ&Ó?Û¯Ô¯", IDC_ADVANCED, 165, 194, 55, 14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PSP_TITLE "?¯þÔ¯ÙÞ õÙ %1" + IDS_UNKNOWN "?ÕÔ?õ¯ýÞÚ" + IDS_SPECIAL_PERMISSIONS "?±¯ßÙÞÔ? õ¯þÔ¯ÙÞ" + IDS_PERMISSIONS_FOR "?¯þÔ¯ÙÞ õÙ %1" + IDS_PERMISSIONS "?¯þÔ¯ÙÞ" +} + Property changes on: trunk/reactos/lib/aclui/aclui_Uk.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/devmgr/Uk.rc --- trunk/reactos/lib/devmgr/Uk.rc 2006-01-08 10:23:23 UTC (rev 20707) +++ trunk/reactos/lib/devmgr/Uk.rc 2006-01-08 11:20:02 UTC (rev 20708) @@ -0,0 +1,113 @@ +// Ukrainian language resource file (Artem Reznikov, 2006-02-11) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_NAME "?ý' " + IDS_TYPE "ÊÞ´" + IDS_MANUFACTURER "?Þ¯ßÝÞÛ: %1" + IDS_LOCATION "ð¯þý?¨ÕÝÝ : %1" + IDS_STATUS "Ð?ÓÝ ´Þ±?¯?: %1" + IDS_UNKNOWN "?ÕÔ?õ¯ýÞÚ" + IDS_LOCATIONSTR "ð¯þý?¨ÕÝÝ %1!u! (%2)" + IDS_DEVCODE " (?¯õ %1!u!)" + IDS_ENABLEDEVICE "ÍÕÚ ´Þ±??Ú ÔÞÛ¯Þ±?¯Ô¾??³± (¾Ô?ýÛÝÕÝÞÚ)" + IDS_DISABLEDEVICE "ÍÕÚ ´Þ±??Ú ÝÕ ÔÞÛ¯Þ±?¯Ô¾??³± (ÔÞýÛÝÕÝÞÚ)" + IDS_UNKNOWNDEVICE "?ÕÔ?õ¯ýÞÚ ´Þ±??Ú" + IDS_NODRIVERLOADED "?Ù ÷³¯Ò¯ ´Þ±?¯? ÝÕ Ô±?ÓÝ¯ÔÙÕÝ? õÓÚÔÕÞ." + IDS_DEVONPARENT "ÝÓ %1" + IDS_TROUBLESHOOTDEV "&Ë±¾ÝÕÝÝ ÝÕ±´ÓÔÝ¯±?ÕÚ..." + IDS_ENABLEDEV "&?Ô?ýÛÝ¾?Þ ´Þ±??Ú" + IDS_REINSTALLDRV "&¤ÕÕÔ±?ÓÝ¯ÔÞ?Þ õÓÚÔÕ" +END + +STRINGTABLE +BEGIN + IDS_DEV_NO_PROBLEM "ÍÕÚ ´Þ±??Ú ´Ó÷?? Ý¯ýÓÙ³Ý¯." + IDS_DEV_NOT_CONFIGURED "CM_PROB_NOT_CONFIGURED" + IDS_DEV_OUT_OF_MEMORY "CM_PROB_DEVLOADER_FAILED" + IDS_DEV_ENTRY_IS_WRONG_TYPE "CM_PROB_ENTRY_IS_WRONG_TYPE" + IDS_DEV_LACKED_ARBITRATOR "CM_PROB_LACKED_ARBITRATOR" + IDS_DEV_BOOT_CONFIG_CONFLICT "CM_PROB_BOOT_CONFIG_CONFLICT" + IDS_DEV_FAILED_FILTER "CM_PROB_FAILED_FILTER" + IDS_DEV_DEVLOADER_NOT_FOUND "CM_PROB_DEVLOADER_NOT_FOUND" + IDS_DEV_INVALID_DATA "CM_PROB_INVALID_DATA" + IDS_DEV_FAILED_START "CM_PROB_FAILED_START" + IDS_DEV_LIAR "CM_PROB_LIAR" + IDS_DEV_NORMAL_CONFLICT "CM_PROB_NORMAL_CONFLICT" + IDS_DEV_NOT_VERIFIED "CM_PROB_NOT_VERIFIED" + IDS_DEV_NEED_RESTART "CM_PROB_NEED_RESTART" + IDS_DEV_REENUMERATION "CM_PROB_REENUMERATION" + IDS_DEV_PARTIAL_LOG_CONF "CM_PROB_PARTIAL_LOG_CONF" + IDS_DEV_UNKNOWN_RESOURCE "CM_PROB_UNKNOWN_RESOURCE" + IDS_DEV_REINSTALL "CM_PROB_REINSTALL" + IDS_DEV_REGISTRY "CM_PROB_REGISTRY" + IDS_DEV_WILL_BE_REMOVED "CM_PROB_WILL_BE_REMOVED" + IDS_DEV_DISABLED "CM_PROB_DISABLED" + IDS_DEV_DEVLOADER_NOT_READY "CM_PROB_DEVLOADER_NOT_READY" + IDS_DEV_DEVICE_NOT_THERE "CM_PROB_DEVICE_NOT_THERE" + IDS_DEV_MOVED "CM_PROB_MOVED" + IDS_DEV_TOO_EARLY "CM_PROB_TOO_EARLY" + IDS_DEV_NO_VALID_LOG_CONF "CM_PROB_NO_VALID_LOG_CONF" + IDS_DEV_FAILED_INSTALL "CM_PROB_FAILED_INSTALL" + IDS_DEV_HARDWARE_DISABLED "CM_PROB_HARDWARE_DISABLED" + IDS_DEV_CANT_SHARE_IRQ "CM_PROB_CANT_SHARE_IRQ" + IDS_DEV_FAILED_ADD "CM_PROB_FAILED_ADD" + IDS_DEV_DISABLED_SERVICE "CM_PROB_DISABLED_SERVICE" + IDS_DEV_TRANSLATION_FAILED "CM_PROB_TRANSLATION_FAILED" + IDS_DEV_NO_SOFTCONFIG "CM_PROB_NO_SOFTCONFIG" + IDS_DEV_BIOS_TABLE "CM_PROB_BIOS_TABLE" + IDS_DEV_IRQ_TRANSLATION_FAILED "CM_PROB_IRQ_TRANSLATION_FAILED" + IDS_DEV_FAILED_DRIVER_ENTRY "CM_PROB_FAILED_DRIVER_ENTRY" + IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "CM_PROB_DRIVER_FAILED_PRIOR_UNLOAD" + IDS_DEV_DRIVER_FAILED_LOAD "CM_PROB_DRIVER_FAILED_LOAD" + IDS_DEV_DRIVER_SERVICE_KEY_INVALID "CM_PROB_DRIVER_SERVICE_KEY_INVALID" + IDS_DEV_LEGACY_SERVICE_NO_DEVICES "CM_PROB_LEGACY_SERVICE_NO_DEVICES" + IDS_DEV_DUPLICATE_DEVICE "CM_PROB_DUPLICATE_DEVICE" + IDS_DEV_FAILED_POST_START "CM_PROB_FAILED_POST_START" + IDS_DEV_HALTED "CM_PROB_HALTED" + IDS_DEV_PHANTOM "CM_PROB_PHANTOM" + IDS_DEV_SYSTEM_SHUTDOWN "CM_PROB_SYSTEM_SHUTDOWN" + IDS_DEV_HELD_FOR_EJECT "CM_PROB_HELD_FOR_EJECT" + IDS_DEV_DRIVER_BLOCKED "CM_PROB_DRIVER_BLOCKED" + IDS_DEV_REGISTRY_TOO_LARGE "CM_PROB_REGISTRY_TOO_LARGE" + IDS_DEV_SETPROPERTIES_FAILED "CM_PROB_SETPROPERTIES_FAILED" +END + +IDD_HARDWARE DIALOG DISCARDABLE 0, 0, 300, 400 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | DS_SHELLFONT +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&¤Þ±?¯?:",IDC_DEVICES,7,6,196,10 + CONTROL "",IDC_LV_DEVICES,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,16,196,50 + GROUPBOX "?ÙÓ±?ÞÔ¯±?? ´Þ±?¯ ?",IDC_PROPERTIESGROUP,7,76,196,105 + LTEXT "",IDC_MANUFACTURER,14,88,183,10,SS_ENDELLIPSIS + LTEXT "",IDC_LOCATION,14,100,183,10,SS_ENDELLIPSIS + LTEXT "",IDC_STATUS,14,112,183,30 + PUSHBUTTON "&Ë±¾ÝÕÝÝ ÝÕ±´ÓÔÝ¯± ?ÕÚ...",IDC_TROUBLESHOOT,85,140,54,14, + BS_PUSHBUTTON | WS_CHILD | WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&?ÙÓ±?ÞÔ¯±??",IDC_PROPERTIES,146,140,50,14 +END + +IDD_DEVICEGENERAL DIALOG DISCARDABLE 0, 0, 252, 218 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "ÊÞ´ ´Þ±?¯?:", -1, 37, 39, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DEVTYPE, 100, 39, 146, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "?Þ¯ßÝÞÛ:", -1, 37, 53, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DEVMANUFACTURER, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "ð¯þý?¨ÕÝÝ :", -1, 37, 67, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DEVLOCATION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + GROUPBOX "Ð?ÓÝ ´Þ±?¯?", IDC_DEVSTATUSGROUP, 7, 83, 238, 100 + EDITTEXT IDC_DEVSTATUS, 14, 96, 224, 61, NOT WS_TABSTOP | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL + PUSHBUTTON "&Ë±¾ÝÕÝÝ ÝÕ±´ÓÔÝ¯±?ÕÚ...", IDC_DEVPROBLEM, 148, 163, 90, 15 + LTEXT "&?ÞÛ¯Þ±?ÓÝÝ ´Þ±?¯?:", IDC_DEVUSAGELABEL, 7, 188, 222, 8, WS_DISABLED + COMBOBOX IDC_DEVUSAGE, 7, 198, 239, 40, CBS_DROPDOWNLIST | WS_VSCROLL | WS_DISABLED +END Property changes on: trunk/reactos/lib/devmgr/Uk.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/devmgr/devmgr.rc --- trunk/reactos/lib/devmgr/devmgr.rc 2006-01-08 10:23:23 UTC (rev 20707) +++ trunk/reactos/lib/devmgr/devmgr.rc 2006-01-08 11:20:02 UTC (rev 20708) @@ -18,4 +18,5 @@ #include "Pl.rc" #include "De.rc" #include "Es.rc" +#include "Uk.rc" _____ Modified: trunk/reactos/lib/mpr/mpr.rc --- trunk/reactos/lib/mpr/mpr.rc 2006-01-08 10:23:23 UTC (rev 20707) +++ trunk/reactos/lib/mpr/mpr.rc 2006-01-08 11:20:02 UTC (rev 20708) @@ -39,3 +39,4 @@ #include "mpr_Ru.rc" #include "mpr_Sv.rc" #include "mpr_Hu.rc" +#include "mpr_Uk.rc" _____ Added: trunk/reactos/lib/mpr/mpr_Uk.rc --- trunk/reactos/lib/mpr/mpr_Uk.rc 2006-01-08 10:23:23 UTC (rev 20707) +++ trunk/reactos/lib/mpr/mpr_Uk.rc 2006-01-08 11:20:02 UTC (rev 20708) @@ -0,0 +1,46 @@ +/* + * MPR dll resources (Ukrainian) + * + * Copyright 2006 Artem Reznikov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "?± ?ÕÕµÓ" +} + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "?ÔÕõ??³ ?ÕÕµÝÞÚ ¤Ó¯Ù³" +FONT 8, "MS Shell Dlg" +{ + LTEXT "?¾õ³ ÙÓ±ÛÓ, ÔÔÕõ??³ ?Ó°? ?ý' ?Ó ´Ó¯Ù³:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "¤¯Û±?", -1, 40, 26, 50, 10 +/* LTEXT "Realm", -1, 40, 46, 50, 10 */ + LTEXT "?¯Þ±?¾ÔÓ¸", -1, 40, 66, 50, 10 + LTEXT "¤Ó¯Ù³", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&ÃßÕÕÒ?Þ ÷ÕÚ ´Ó¯Ù³ (ÝÕßÕþ´Õ¸Ý¯)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "ÐÛÓ±¾ÔÓ?Þ", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} Property changes on: trunk/reactos/lib/mpr/mpr_Uk.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/oleaut32/oleaut32.rc --- trunk/reactos/lib/oleaut32/oleaut32.rc 2006-01-08 10:23:23 UTC (rev 20707) +++ trunk/reactos/lib/oleaut32/oleaut32.rc 2006-01-08 11:20:02 UTC (rev 20708) @@ -42,6 +42,7 @@ #include "oleaut32_Ru.rc" #include "oleaut32_Sv.rc" #include "oleaut32_Th.rc" +#include "oleaut32_Uk.rc" /* * FIXME: _____ Added: trunk/reactos/lib/oleaut32/oleaut32_Uk.rc --- trunk/reactos/lib/oleaut32/oleaut32_Uk.rc 2006-01-08 10:23:23 UTC (rev 20707) +++ trunk/reactos/lib/oleaut32/oleaut32_Uk.rc 2006-01-08 11:20:02 UTC (rev 20708) @@ -0,0 +1,31 @@ +/* + * Ukrainian resources for oleaut32 + * + * Copyright 2006 Artem Reznikov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +STRINGTABLE LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_TRUE "?±?ÞÝÓ" + IDS_FALSE "?Õ´ÓÔõÓ" + IDS_YES "ÊÓÛ" + IDS_NO "??" + IDS_ON "?Ô?ýÛÝÕÝ¯" + IDS_OFF "?ÞýÛÝÕÝ¯" +} Property changes on: trunk/reactos/lib/oleaut32/oleaut32_Uk.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/userenv/Uk.rc --- trunk/reactos/lib/userenv/Uk.rc 2006-01-08 10:23:23 UTC (rev 20707) +++ trunk/reactos/lib/userenv/Uk.rc 2006-01-08 11:20:02 UTC (rev 20708) @@ -0,0 +1,47 @@ +/* + * Copyright 2006 Artem Reznikov + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" + IDS_APPDATA "Application Data" + IDS_DESKTOP "Desktop" + IDS_FAVORITES "?ÞßÓÝÕ" + IDS_STARTMENU "?¯Ù¯ÔÝÕ ýÕÝ?" + IDS_PROGRAMS "?¯Ù¯ÔÝÕ ýÕÝ?\\¤¯ÒÓýÞ" + IDS_ADMINTOOLS "?¯Ù¯ÔÝÕ ýÕÝ?\\¤¯ÒÓýÞ\\ÐÙ¾µß¯Ô?" + IDS_STARTUP "?¯Ù¯ÔÝÕ ýÕÝ?\\¤¯ÒÓýÞ\\?Ô?¯þÓ´¾±Û" + IDS_MYDOCUMENTS "?¯? õ¯Û¾ýÕÝ?Þ" + IDS_MYPICTURES "?¯? õ¯Û¾ýÕÝ?Þ\\?¯? ýÓÙ?ÝÛÞ" + IDS_MYMUSIC "?¯? õ¯Û¾ýÕÝ?Þ\\?¯ ý¾þÞÛÓ" + IDS_MYVIDEOS "?¯? õ¯Û¾ýÕÝ?Þ\\?¯? Ô?õÕ¯þÓ´Þ±Þ" + IDS_TEMPLATES "ÏÓßÙ¯ÝÞ" + IDS_RECENT "Recent" + IDS_SENDTO "??õ´ÓÔÞ?Þ" + IDS_PRINTHOOD "PrintHood" + IDS_NETHOOD "NetHood" + IDS_LOCALSETTINGS "Local Settings" + IDS_LOCALAPPDATA "Local Settings\\Application Data" + IDS_TEMP "Local Settings\\Temp" + IDS_CACHE "Local Settings\\Temporary Internet Files" + IDS_HISTORY "Local Settings\\History" + IDS_COOKIES "Cookies" + IDS_PROGRAMFILES "%SystemDrive%\\Program Files" +END Property changes on: trunk/reactos/lib/userenv/Uk.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/userenv/userenv.rc --- trunk/reactos/lib/userenv/userenv.rc 2006-01-08 10:23:23 UTC (rev 20707) +++ trunk/reactos/lib/userenv/userenv.rc 2006-01-08 11:20:02 UTC (rev 20708) @@ -47,4 +47,5 @@ #include "Sv.rc" #include "Ru.rc" #include "Es.rc" +#include "Uk.rc" _____ Modified: trunk/reactos/lib/wininet/rsrc.rc --- trunk/reactos/lib/wininet/rsrc.rc 2006-01-08 10:23:23 UTC (rev 20707) +++ trunk/reactos/lib/wininet/rsrc.rc 2006-01-08 11:20:02 UTC (rev 20708) @@ -53,3 +53,4 @@ #include "wininet_Ru.rc" #include "wininet_Si.rc" #include "wininet_Hu.rc" +#include "wininet_Uk.rc" _____ Added: trunk/reactos/lib/wininet/wininet_Uk.rc --- trunk/reactos/lib/wininet/wininet_Uk.rc 2006-01-08 10:23:23 UTC (rev 20707) +++ trunk/reactos/lib/wininet/wininet_Uk.rc 2006-01-08 11:20:02 UTC (rev 20708) @@ -0,0 +1,46 @@ +/* + * wininet.dll (Ukrainian resources) + * + * Copyright 2006 Artem Reznikov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "?ÔÕõ??³ ?ÕÕµÝÞÚ ¤Ó¯Ù³" +FONT 8, "MS Shell Dlg" +{ + LTEXT "?¾õ³ ÙÓ±ÛÓ, ÔÔÕõ??³ ?Ó°? ?ý' ?Ó ´Ó¯Ù³:", -1, 40, 6, 150, 15 + LTEXT "¤¯Û±?", -1, 40, 26, 50, 10 + LTEXT "Realm", -1, 40, 46, 50, 10 + LTEXT "?¯Þ±?¾ÔÓ¸", -1, 40, 66, 50, 10 + LTEXT "¤Ó¯Ù³", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&ÃßÕÕÒ?Þ ÷ÕÚ ´Ó¯Ù³ (ÝÕßÕþ´Õ¸Ý¯)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "ÐÛÓ±¾ÔÓ?Þ", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ + IDS_LANCONNECTION "¤?õÛÙ?¸ÕÝÝ ´¯ Ù¯ÛÓÙ³Ý?Ú ýÕÕµ?" +} Property changes on: trunk/reactos/lib/wininet/wininet_Uk.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/winmm/winmm_Uk.rc --- trunk/reactos/lib/winmm/winmm_Uk.rc 2006-01-08 10:23:23 UTC (rev 20707) +++ trunk/reactos/lib/winmm/winmm_Uk.rc 2006-01-08 11:20:02 UTC (rev 20708) @@ -0,0 +1,126 @@ +/* + * Copyright 2006 Artem Reznikov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +STRINGTABLE LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +BEGIN + +/* MMSYS errors */ +MMSYSERR_NOERROR, "ËÛÓþÓÝ¾ Û¯ýÓÝõ¾ ÔÞÛ¯ÝÓÝ¯." +MMSYSERR_ERROR, "?ÕÔ?õ¯ýÓ þ¯ÔÝ?°Ý ´¯ýÞÙÛÓ." +MMSYSERR_BADDEVICEID, "ËÛÓþÓÝ¯ Û¯õ ´Þ±?¯?, ÛÞÚ ÝÕ ÔÞÛ¯Þ±?¯ Ô¾??³± Ô ±Þ±?Õý?." +MMSYSERR_NOTENABLED, "?ÓÚÔÕ ÝÕ ´?õÛÙ?¸ÕÝÞÚ." +MMSYSERR_ALLOCATED, "ËÛÓþÓÝÞÚ ´Þ±??Ú ¾µÕ ÔÞÛ¯Þ±?¯Ô¾??³± . ÃÓ¸ÕÛÓÚ?Õ, ´¯ÛÞ Ô?Ý þÔ?Ù³ÝÞ?³± , ? ´¯Ô?¯??³ ±´¯ß¾." +MMSYSERR_INVALHANDLE, "ËÛÓþÓÝ¯ ÝÕ´ÓÔÞÙ³ÝÞÚ õÕ±ÛÞ´?¯ ´Þ±?¯ ?." +MMSYSERR_NODRIVER, "Ë ±Þ±?Õý? ÝÕýÓ? ¾±?ÓÝ¯ÔÙÕÝÞ§ õÓÚÔÕ?Ô !\n" +MMSYSERR_NOMEM, "?Õõ¯±?Ó?Ý³¯ ´Óý' ?? õÙ ÔÞÛ¯ÝÓÝÝ ÷³¯Ò¯ þÓÔõÓÝÝ . ÃÓÛÞÚ?Õ ¯õÞÝ Óß¯ õÕÛ?Ù³ÛÓ õ¯õÓ?Û?Ô ? ´¯Ô?¯??³ ±´¯ß¾." +MMSYSERR_NOTSUPPORTED, "Í ¶¾ÝÛ÷? ÝÕ ´?õ?Þý¾??³± . ÐÛ¯Þ±?ÓÚ?Õ± ¶¾ÝÛ÷??? Capabilities, ¨¯ß ¯õÕµÓ?Þ ±´Þ±¯Û ¶¾ÝÛ÷?Ú ? ´¯Ô?õ ¯ýÙÕÝ³, Û? ´?õ?Þý¾? õÓÚÔÕ." +MMSYSERR_BADERRNUM, "ËÛÓþÓÝÞÚ Ý¯ýÕ ´¯ýÞÙÛÞ ÝÕ ÔÞþÝÓ¸ÕÝÞÚ ¾ ±Þ±?Õý?." +MMSYSERR_INVALFLAG, "?¯ ±Þ±?ÕýÝ¯? ¶¾ÝÛ÷?? ´ÕÕõÓÝ¯ ÝÕ´ÓÔÞÙ³ÝÞÚ ´Ó´¯." +MMSYSERR_INVALPARAM, "?¯ ±Þ±?ÕýÝ¯? ¶¾ÝÛ÷?? ´ÕÕõÓÝ¯ ÝÕ´ÓÔÞÙ³ÝÞÚ ´ÓÓýÕ?." + +/* WAVE errors */ +WAVERR_BADFORMAT, "ËÛÓþÓÝÞÚ ¶¯ýÓ? ÝÕ ´?õ?Þý¾??³± , Óß¯ Ú¯Ò¯ ÝÕý¯µÙÞÔ¯ ´ÕÕ?Ô¯Þ?Þ. ÐÛ¯Þ±?ÓÚ?Õ± ¶¾ÝÛ÷??? Capabilities, ¨¯ß ¯õÕµÓ?Þ ±´Þ±¯Û ¶¯ýÓ??Ô, Û? ´?õ?Þý¾??³± ." +WAVERR_STILLPLAYING, "?Õý¯µÙÞÔ¯ ÔÞÛ¯ÝÓ?Þ ÷? ¯´ÕÓ÷?? ´?õ ¸Ó± Ô?õ?Ô¯ÕÝÝ õÓÝÞ§ ?þ Ý¯±? . Ã¾´ÞÝ??³ Ô?õ?Ô¯ÕÝÝ õÓÝÞ§ Óß¯ þÓ¸ÕÛÓÚ?Õ ÝÓ Ú¯Ò¯ þÓÛ?Ý¸ÕÝÝ ." +WAVERR_UNPREPARED, "ÃÓÒ¯Ù¯Ô¯Û þÔ¾Û¯þÓ´Þ±¾ ÝÕ ´?õÒ¯?¯ÔÓÝÞÚ. ÐÛ¯Þ±?ÓÚ?Õ± ¶¾ÝÛ÷??? Prepare, ¨¯ß ´?õÒ¯?¾ÔÓ?Þ Ú¯Ò¯, ? ´¯Ô?¯??³ ±´¯ß¾." +WAVERR_SYNC, "?Õý¯µÙÞÔ¯ Ô?õÛÞ?Þ ÷ÕÚ ´Þ±??Ú ßÕþ ÔÞÛ¯Þ±?ÓÝÝ ´Ó´¯÷ WAVE_ALLOWSYNC. Ë±?ÓÝ¯Ô??³ ÷ÕÚ ´Ó´¯Õ÷³ ? ´¯Ô?¯? ?³ ±´¯ß¾." + +/* MIDI errors */ +MIDIERR_UNPREPARED, "ÃÓÒ¯Ù¯Ô¯Û MIDI ÝÕ ´?õÒ¯?¯ÔÙÕÝÞÚ. ÐÛ¯Þ± ?ÓÚ?Õ± ¶¾ÝÛ÷??? Prepare, ¨¯ß ´?õÒ¯?¾ÔÓ?Þ Ú¯Ò¯, ? ´¯Ô?¯??³ ±´¯ß¾." +MIDIERR_STILLPLAYING, "?Õý¯µÙÞÔ¯ ÔÞÛ¯ÝÓ?Þ ÷? ¯´ÕÓ÷?? ´?õ ¸Ó± Ô?õ?Ô¯ÕÝÝ õÓÝÞ§ ?þ Ý¯±? . Ã¾´ÞÝ??³ Ô?õ?Ô¯ÕÝÝ õÓÝÞ§ Óß¯ þÓ¸ÕÛÓÚ?Õ ÝÓ Ú¯Ò¯ þÓÛ?Ý¸ÕÝÝ ." +MIDIERR_NOMAP, "?Õ þÝÓÚõÕÝ¯ ?ÓßÙÞ÷? ´Þ±?¯?Ô MIDI. ?¯µÙÞÔ¯, ÔÞÝÞÛÙÞ ´¯ßÙÕýÞ þ õÓÚÔÕ¯ý, Óß¯ ¶ÓÚÙ MIDIMAP.CFG ´¯°Û¯õµÕÝÞÚ Óß¯ Ô?õ±¾?Ý?Ú." +MIDIERR_NOTREADY, "¤¯? ´ÕÕõÓ? õÓÝ? õ¯ ´Þ±?¯?. ÃÓ¸ ÕÛÓÚ?Õ, ´¯ÛÞ õÓÝ? ÝÕ ß¾õ¾?³ ´ÕÕõÓÝ?, ? ´¯Ô?¯??³ ±´¯ß¾." +MIDIERR_NODEVICE, "¤¯?¯¸ÝÓ ÝÓ±?¯ÚÛÓ Ô?õ´¯Ô?õÝ¯±?? MIDI-´Þ±?¯?Ô ´¯±ÞÙÓ??³± ÝÓ ´Þ±??Ú, ÝÕ ¾±?ÓÝ¯ÔÙÕÝÞÚ ¾ ±Þ±?Õý?. Ãý?Ý? ?³ ´ÓÓýÕ?Þ þÓ õ¯´¯ý¯Ò¯? MIDI Mapper." +MIDIERR_INVALIDSETUP, "¤¯?¯¸ÝÓ ÝÓ±?¯ÚÛÓ MIDI ´¯°Û¯õµÕÝÓ. ÐÛ¯´ ??Ú?Õ ÔÞ§?õÝÞÚ ¶ÓÚÙ MIDIMAP.CFG õ¯ ´?õ´Ó´ÛÞ SYSTEM ´Ó´ÛÞ ReactOS ? ´¯Ô?¯ ??³ ±´¯ß¾." + +/* MCI errors */ +MCIERR_INVALID_DEVICE_ID, "?Õ´ÓÔÞÙ³ÝÞÚ Û¯õ ´Þ±?¯? MCI. ?ÞÛ¯Þ± ?ÓÚ?Õ Û¯õ, ÛÞÚ ß¾Ù¯ ´¯ÔÕÝ¾?¯ ´?±Ù Ô?õÛÞ?? ´Þ±?¯?." +MCIERR_UNRECOGNIZED_KEYWORD, "?ÓÚÔÕ ÝÕ ý¯µÕ ¯þ´?þÝÓ?Þ ÔÛÓþÓÝÞÚ ´ÓÓýÕ? Û¯ýÓÝõÞ." +MCIERR_UNRECOGNIZED_COMMAND, "?ÓÚÔÕ ÝÕ ý¯µÕ ¯þ´?þÝÓ?Þ ÔÛÓþÓÝ¾ Û¯ýÓÝõ¾." +MCIERR_HARDWARE, "?ÞÝÞÛÙÓ ´¯ßÙÕýÓ þ ´Þ±?¯?ý ý¾Ù³?ÞýÕõ? Ó. ¤ÕÕÛ¯ÝÓÚ?Õ± , ¨¯ ´Þ±??Ú ´Ó÷?? ´ÓÔÞÙ³Ý¯, Óß¯ þÔÕÝ??³± õ¯ Ú¯Ò¯ ÔÞ¯ßÝÞÛÓ." +MCIERR_INVALID_DEVICE_NAME, "ËÛÓþÓÝÞÚ ´Þ±??Ú ÝÕ Ô?õÛÞ?ÞÚ Óß¯ ÝÕ ¯þ´?þÝÓ??³± ?Ý?Õ¶ÕÚ±¯ý MCI." +MCIERR_OUT_OF_MEMORY, "?Õõ¯±?Ó?Ý³¯ ´Óý' ?? õÙ ÔÞÛ¯ÝÓÝÝ ÷³¯Ò¯ þÓÔõÓÝÝ . \nÃÓÛÞÚ?Õ ¯õÞÝ Óß¯ õÕÛ?Ù³ÛÓ õ¯õÓ?Û?Ô ? ´¯Ô?¯??³ ±´¯ß¾." +MCIERR_DEVICE_OPEN, "ÍÕ ?ý' ´Þ±?¯? ÔµÕ ÔÞÛ¯Þ±?¯Ô¾??³± õ¯õÓ?Û¯ý Û ´±ÕÔõ¯Ý?ý. ÃÓõÓÚ?Õ ¾Ý?ÛÓÙ³ÝÞÚ ´±ÕÔõ¯Ý?ý." +MCIERR_CANNOT_LOAD_DRIVER, "Ð?ÓÙÓ± ÝÕÔ?õ¯ýÓ ´¯ýÞÙÛÓ ´?õ ¸Ó± þÓÔÓÝ?ÓµÕÝÝ ÔÛÓþÓÝ¯Ò¯ õÓÚÔÕÓ ´Þ±?¯?." +MCIERR_MISSING_COMMAND_STRING, "?Õ ÔÛÓþÓÝÓ Û¯ýÓÝõÓ." +MCIERR_PARAM_OVERFLOW, "?¯ÔµÞÝÓ õÛÓ ÔÞÔ¯õ¾ ´ÕÕÔÞ¨¾? ¯þý? ß¾¶ÕÓ. Ãß?Ù³°?Õ ¯þý? ß¾¶ÕÓ." +MCIERR_MISSING_STRING_ARGUMENT, "ËÛÓþÓÝÓ Û¯ýÓÝõÓ ´¯?Õß¾? ?ÕÛ±?¯ÔÞÚ ´ÓÓýÕ?. ËÛÓµ??³ Ú¯Ò¯." +MCIERR_BAD_INTEGER, "ËÛÓþÓÝÕ ÷?ÙÕ ¸Þ±Ù¯ ÝÕ´ÞõÓ?ÝÕ õÙ ÷??? Û¯ýÓÝõÞ." +MCIERR_PARSER_INTERNAL, "?ÓÚÔÕ ´Þ±?¯? ´¯ÔÕÝ¾Ô þÝÓ¸ÕÝÝ ÝÕ´Þ´¾±?Þý¯Ò¯ ?Þ´¾. ÃÔÕÝ??³± õ¯ ÔÞ¯ßÝÞÛÓ ´Þ±?¯?, ¨¯ß ¯?ÞýÓ?Þ Ý¯ÔÞÚ õÓÚÔÕ." +MCIERR_DRIVER_INTERNAL, "?ÞÝÞÛÙÓ ´¯ßÙÕýÓ þ õÓÚÔÕ¯ý ´Þ±?¯?. ÃÔÕÝ??³± õ¯ ÔÞ¯ßÝÞÛÓ ´Þ±?¯?, ¨¯ß ¯?ÞýÓ?Þ Ý¯ÔÞÚ õÓÚÔÕ." +MCIERR_MISSING_PARAMETER, "ËÛÓþÓÝÓ Û¯ýÓÝõÓ ´¯?Õß¾? ´ÓÓýÕ?. ËÛÓµ ??³ Ú¯Ò¯." +MCIERR_UNSUPPORTED_FUNCTION, "¤Þ±??Ú MCI, ÛÞÚ ÔÞÛ¯Þ±?¯Ô¾??³± , ÝÕ ´?õ?Þý¾? ÔÛÓþÓÝ¾ Û¯ýÓÝõ¾." +MCIERR_FILE_NOT_FOUND, "?Õý¯µÙÞÔ¯ þÝÓÚ?Þ ÔÛÓþÓÝÞÚ ¶ÓÚÙ. ¤ÕÕÔ??Õ, ¸Þ ´ÓÔÞÙ³Ý¯ ÔÛÓþÓÝ? °Ù § ?Ó ?ý' ¶ÓÚÙ¾." +MCIERR_DEVICE_NOT_READY, "?ÓÚÔÕ ´Þ±?¯? ÝÕ Ò¯?¯ÔÞÚ." +MCIERR_INTERNAL, "Ð?ÓÙÓ± ´¯ýÞÙÛÓ ´?õ ¸Ó± ?Ý?÷?ÓÙ?þÓ÷?? MCI. Ð´¯ß¾Ú?Õ ´ÕÕþÓ´¾±?Þ?Þ ReactOS." +MCIERR_DRIVER, "?ÞÝÞÛÙÓ ´¯ßÙÕýÓ ?þ õÓÚÔÕ¯ý ´Þ±?¯?. ?ÓÚÔÕ ß¾Ô þÓÛÞ?ÞÚ. ?Õý¯µÙÞÔ¯ ¯?ÞýÓ?Þ Û¯õ ´¯ýÞÙÛÞ." +MCIERR_CANNOT_USE_ALL, "?Õý¯µÙÞÔ¯ ÔÞÛ¯Þ±?¯Ô¾ÔÓ?Þ ´ÓÓýÕ? 'all' (¾±?) Û ?ý' ´Þ±?¯? õÙ ÔÛÓþÓÝ¯? Û¯ýÓÝõÞ." +MCIERR_MULTIPLE, "Ð?ÓÙ¯± õÕÛ?Ù³ÛÓ ´¯ýÞÙ¯Û ÝÓ ?þÝÞ§ ´Þ± ?¯ §. ?¯ß ÔÞþÝÓ¸Þ?Þ õµÕÕÙ¯ ´¯ýÞÙ¯Û, ÔÞÛ¯ÝÓÚ?Õ ¯ÛÕý¯ Û¯µÝ¾ Û¯ýÓÝõ¾ õÙ Û¯µÝ¯Ò¯ ´Þ±?¯?." +MCIERR_EXTENSION_NOT_FOUND, "?Õý¯µÙÞÔ¯ ÔÞþÝÓ¸Þ?Þ ?Þ´ ´Þ±?¯? þÓ ÔÛÓþÓÝÞý ¯þ°ÞÕÝÝ ý ?ýÕÝ? ¶ÓÚÙ¾." +MCIERR_OUTOFRANGE, "ËÛÓþÓÝÞÚ ´ÓÓýÕ? ýÓ? ÝÕ´Þ´¾±?ÞýÕ þÝÓ¸ÕÝÝ õÙ ÔÛÓþÓÝ¯? Û¯ýÓÝõÞ." +MCIERR_FLAGS_NOT_COMPATIBLE, "ËÛÓþÓÝ? ´ÓÓýÕ?Þ ÝÕý¯µÙÞÔ¯ ÔÞÛ¯Þ±?¯Ô¾ ÔÓ?Þ ¯õÝ¯¸Ó±Ý¯." +MCIERR_FILE_NOT_SAVED, "?Õý¯µÙÞÔ¯ þßÕÕÒ?Þ ÔÛÓþÓÝÞÚ ¶ÓÚÙ. ¤ÕÕÛ¯ÝÓÚ?Õ± , ¨¯ ÝÓ õÞ±Û¾ õ¯±?Ó?Ý³¯ Ô?Ù³Ý¯Ò¯ ý?±÷ , Óß¯ ¨¯ Û¯ý´'? ?Õ ¨Õ ´?õÛÙ?¸ÕÝÞÚ õ¯ ýÕÕµ?." +MCIERR_DEVICE_TYPE_REQUIRED, "?Õý¯µÙÞÔ¯ þÝÓÚ?Þ ÔÛÓþÓÝÞÚ ´Þ±??Ú. ¤ÕÕÛ¯ÝÓÚ?Õ± , ¨¯ Ô?Ý ¾±?ÓÝ¯ÔÙÕÝÞÚ, Óß¯ ¨¯ ?ý' ´Þ±?¯? ÔÔÕõÕÝ¯ ´ÓÔÞÙ³Ý¯." +MCIERR_DEVICE_LOCKED, "ËÛÓþÓÝÞÚ ´Þ±??Ú þÓÓþ þÓÛÞÔÓ??³± . ÃÓ¸ÕÛÓÚ?Õ õÕÛ?Ù³ÛÓ ±ÕÛ¾Ýõ, Ó ´¯??ý ´¯Ô?¯??³ ±´¯ß¾." +MCIERR_DUPLICATE_ALIAS, "ËÛÓþÓÝÞÚ ´±ÕÔõ¯Ý?ý ¾µÕ ÔÞÛ¯Þ±?¯Ô¾??³± Ô ÷³¯ý¾ õ¯õÓ?Û¾. ÃÓõÓÚ?Õ ¾Ý?ÛÓÙ³ÝÞÚ ´±ÕÔõ¯Ý?ý." +MCIERR_BAD_CONSTANT, "ËÛÓþÓÝÞÚ ´ÓÓýÕ? ÝÕ´Þ´¾±?ÞýÞÚ õÙ ÷?? ? Û¯ýÓÝõÞ." +MCIERR_MUST_USE_SHAREABLE, "?ÓÚÔÕ ´Þ±?¯? ÔµÕ ÔÞÛ¯Þ±?¯Ô¾??³± . ?¯ß õ¯þÔ¯ÙÞ?Þ ±´?Ù³ÝÞÚ õ¯±?¾´ õ¯ õÓÚÔÕÓ, ÝÕ¯ß§?õÝ¯ ÔÞÛ¯Þ±?¯Ô¾ÔÓ?Þ ´ÓÓýÕ? 'shareable' ?þ Û¯µÝ¯? Û¯ýÓÝõ¯? 'open'." +MCIERR_MISSING_DEVICE_NAME, "?Ù ÔÛÓþÓÝ¯? Û¯ýÓÝõÞ ´¯??ßÕÝ ´±ÕÔõ¯Ý?ý Óß¯ ?ý' ¶ÓÚÙ¾, õÓÚÔÕÓ Óß¯ ´Þ±?¯?. ËÛÓµ??³ Ú¯Ò¯." +MCIERR_BAD_TIME_FORMAT, "ËÛÓþÓÝ¯ ÝÕÔ?ÝÕ þÝÓ¸ÕÝÝ õÙ ¶¯ýÓ?¾ ¸Ó±¾. ¤Þ´¾±?Þý? ¶¯ýÓ?Þ ÔÛÓþÓÝ? Ô õ¯Û¾ýÕÝ?Ó÷?? þ MCI." +MCIERR_NO_CLOSING_QUOTE, "¤Þ ÔÔ¯õ? þÝÓ¸ÕÝÝ ´ÓÓýÕ?Ó ß¾Ù¯ ´¯´¾¨ÕÝ¯ þÓÛÞÔÓ?¸ÞÚ þÝÓÛ ÙÓ´¯Û. ?ÔÕõ??³ Ú¯Ò¯." +MCIERR_DUPLICATE_FLAGS, "¤ÓÓýÕ? Óß¯ þÝÓ¸ÕÝÝ ÔÛÓþÓÝ? õÔ?¸?. ËÛÓµ??³ Ú¯Ò¯ ÙÞ°Õ ¯õÞÝ Óþ." +MCIERR_INVALID_FILE, "ËÛÓþÓÝÞÚ ¶ÓÚÙ ÝÕ ý¯µÕ ß¾?Þ Ô?õ?Ô¯ÕÝÞÚ ÝÓ ÔÞßÓÝ¯ý¾ ´Þ±?¯? MCI. ?¯µÙÞÔ¯, ¶ÓÚÙ ´¯°Û¯õµÕÝÞÚ, ýÓ? ÝÕ´Þ´¾±?ÞýÞÚ ¶¯ýÓ?." +MCIERR_NULL_PARAMETER_BLOCK, "?¯ ?Ý?Õ¶ÕÚ±¾ MCI ß¾Ù¯ ´ÕÕõÓÝ¯ ´¾±?ÞÚ ßÙ¯Û ´ÓÓýÕ??Ô." +MCIERR_UNNAMED_RESOURCE, "?Õý¯µÙÞÔ¯ þßÕÕÒ?Þ ¶ÓÚÙ ßÕþ ?ýÕÝ?. ?ÔÕõ ??³ ?ý' ¶ÓÚÙ¾." +MCIERR_NEW_REQUIRES_ALIAS, "?Û¨¯ ÔÞÛ¯Þ±?¯Ô¾??³± ´ÓÓýÕ? 'new', ÝÕ¯ß§?õÝ¯ ÔÛÓþÓ?Þ ´±ÕÔõ¯Ý?ý." +MCIERR_NOTIFY_ON_AUTO_OPEN, "¤Ó´¯ 'notify' ÝÕý¯µÙÞÔ¯ ÔÞÛ¯Þ±?¯Ô¾ ÔÓ?Þ õÙ ´Þ±?¯?Ô, Û? Ô?õÛÞÔÓ??³± ÓÔ?¯ýÓ?Þ¸Ý¯." +MCIERR_NO_ELEMENT_ALLOWED, "?Õý¯µÙÞÔ¯ ÔÞÛ¯Þ±?¯Ô¾ÔÓ?Þ ?ý' ¶ÓÚÙ¾ õÙ ÔÛÓþÓÝ¯Ò¯ ´Þ±?¯?." +MCIERR_NONAPPLICABLE_FUNCTION, "?Õý¯µÙÞÔ¯ ÔÞÛ¯ÝÓ?Þ Û¯ýÓÝõÞ ¾ ÔÛÓþÓÝ?Ú ´¯±Ù?õ¯ÔÝ¯±??. Ãý?Ý??³ ´¯±Ù?õ¯ÔÝ?±?³ Û¯ýÓÝõ ? ´¯Ô?¯??³ ±´¯ß¾." +MCIERR_ILLEGAL_FOR_AUTO_OPEN, "?Õý¯µÙÞÔ¯ ÔÞÛ¯ÝÓ?Þ ÔÛÓþÓÝ¾ Û¯ýÓÝõ¾ õÙ ´Þ±?¯?, ÛÞÚ Ô?õÛÞÔÓ??³± ÓÔ?¯ýÓ?Þ¸Ý¯. ÃÓ¸ÕÛÓÚ?Õ, ´¯ÛÞ ´Þ±??Ú ÝÕ ß¾õÕ þÓÛÞ?¯, ? ´¯Ô?¯??³ ±´¯ß¾." +MCIERR_FILENAME_REQUIRED, "?ý' ¶ÓÚÙ¾ ÝÕ´ÓÔÞÙ³ÝÕ. ¤ÕÕÛ¯ÝÓÚ?Õ± , ¨¯ õ¯ÔµÞÝÓ ?ýÕÝ? ¶ÓÚÙ¾ ÝÕ ´ÕÕÔÞ¨¾? 8 ±ÞýÔ¯Ù?Ô, ´?±Ù ÛÞ§ ±?¯??³ ÛÓ´ÛÓ Ú ¯þ°ÞÕÝÝ ." +MCIERR_EXTRA_CHARACTERS, "?Õý¯µÙÞÔ¯ ÔÔ¯õÞ?Þ õ¯õÓ?Û¯Ô? ±ÞýÔ¯ÙÞ ´?± Ù õÛÓ, þÓßÓÝ¯Ò¯ Ô ÙÓ´ÛÞ." +MCIERR_DEVICE_NOT_INSTALLED, "ËÛÓþÓÝÞÚ ´Þ±??Ú ÝÕ ¾±?ÓÝ¯ÔÙÕÝÞÚ ¾ ±Þ± ?Õý?. ÐÛ¯Þ±?ÓÚ?Õ±³ ´¾ÝÛ?¯ý ?ÓÚÔÕÞ Ô ¤ÓÝÕÙ? ÛÕ¾ÔÓÝÝ , ¨¯ß ¾±?ÓÝ¯ÔÞ?Þ ´Þ±??Ú." +MCIERR_GET_CD, "?Õý¯µÙÞÔ¯ ¯?ÞýÓ?Þ õ¯±?¾´ õ¯ ÔÛÓþÓÝ¯Ò¯ ¶ÓÚÙ¾ Óß¯ ´Þ±?¯? MCI. Ð´¯ß¾Ú?Õ þý?ÝÞ?Þ ÛÓ?ÓÙ¯Ò Óß¯ ´ÕÕþÓÔÓÝ?ÓµÞ?Þ Û¯ý´'??Õ." +MCIERR_SET_CD, "?Õý¯µÙÞÔ¯ ¯?ÞýÓ?Þ õ¯±?¾´ õ¯ ÔÛÓþÓÝ¯Ò¯ ¶ÓÚÙ¾ Óß¯ ´Þ±?¯? MCI, ?¯ý¾ ¨¯ õ¯õÓ?¯Û ÝÕ ý¯µÕ þý?ÝÞ?Þ ´Ó´Û¾." +MCIERR_SET_DRIVE, "?Õý¯µÙÞÔ¯ ¯?ÞýÓ?Þ õ¯±?¾´ õ¯ ÔÛÓþÓÝ¯Ò¯ ¶ÓÚÙ¾ Óß¯ ´Þ±?¯? MCI, ?¯ý¾ ¨¯ õ¯õÓ?¯Û ÝÕ ý¯µÕ þý?ÝÞ?Þ õÞ±Û." +MCIERR_DEVICE_LENGTH, "?¯ÔµÞÝÓ ?ýÕÝ? ´Þ±?¯? Óß¯ õÓÚÔÕÓ ÝÕ ý¯µÕ ´ÕÕÔÞ¨¾ÔÓ?Þ 79 ±ÞýÔ¯Ù?Ô." +MCIERR_DEVICE_ORD_LENGTH, "?¯ÔµÞÝÓ ?ýÕÝ? ´Þ±?¯? Óß¯ õÓÚÔÕÓ ÝÕ ý¯µÕ ´ÕÕÔÞ¨¾ÔÓ?Þ 69 ±ÞýÔ¯Ù?Ô." +MCIERR_NO_INTEGER, "ËÛÓþÓÝÓ Û¯ýÓÝõÓ ´¯?Õß¾? ÷?ÙÞÚ ´ÓÓýÕ? . ?ÔÕõ??³ Ú¯Ò¯." +MCIERR_WAVE_OUTPUTSINUSE, "Ë±? ´Þ±?¯?, Û? ý¯µ¾?³ Ô?õ?Ô¯?ÔÓ?Þ ¶ÓÚÙÞ ´¯?¯¸Ý¯Ò¯ ¶¯ýÓ?¾, þÓÓþ þÓÚÝ ??. ÃÓ¸ÕÛÓÚ?Õ, ´¯ÛÞ ´Þ±??Ú þÔ? Ù³ÝÞ?³± , ? ´¯Ô?¯??³ ±´¯ß¾." +MCIERR_WAVE_SETOUTPUTINUSE, "?Õý¯µÙÞÔ¯ ÔÔ?ýÛÝ¾?Þ ÕµÞý Ô?õ?Ô¯ÕÝÝ õÙ ´¯?¯¸Ý¯Ò¯ þÔ¾Û¯Ô¯Ò¯ ´Þ±?¯?, ?¯ý¾ ¨¯ Ô?Ý þÓÚÝ ?ÞÚ. ÃÓ¸ÕÛÓÚ?Õ, ´¯ÛÞ ´Þ±??Ú ÝÕ þÔ?Ù³ÝÞ?³± , ? ´¯Ô?¯??³ ±´¯ß¾." +MCIERR_WAVE_INPUTSINUSE, "Ë±? ´Þ±?¯?, Û? ý¯µ¾?³ þÓ´Þ±¾ÔÓ?Þ ¶ÓÚÙÞ ´¯?¯¸Ý¯Ò¯ ¶¯ýÓ?¾, þÓÓþ þÓÚÝ ??. ÃÓ¸ÕÛÓÚ?Õ, ´¯ÛÞ ´Þ±??Ú þÔ? Ù³ÝÞ?³± , ? ´¯Ô?¯??³ ±´¯ß¾." +MCIERR_WAVE_SETINPUTINUSE, "?Õý¯µÙÞÔ¯ ÔÔ?ýÛÝ¾?Þ ÕµÞý þÓ´Þ±¾ õÙ ´¯ ?¯¸Ý¯Ò¯ þÔ¾Û¯Ô¯Ò¯ ´Þ±?¯?, ?¯ý¾ ¨¯ Ô?Ý þÓÚÝ ?ÞÚ. ÃÓ¸ÕÛÓÚ?Õ, ´¯ÛÞ ´Þ±? ?Ú ÝÕ þÔ?Ù³ÝÞ?³± , ? ´¯Ô?¯??³ ±´¯ß¾." +MCIERR_WAVE_OUTPUTUNSPECIFIED, "?¯µÝÓ ÔÞÛ¯Þ±?¯Ô¾ÔÓ?Þ ß¾õ³- Û? ±¾ý?±Ý? ´Þ±?¯? Ô?õ?Ô¯ÕÝÝ þÔ¾Û¯ÔÞ§ ¶ÓÚÙ?Ô." +MCIERR_WAVE_INPUTUNSPECIFIED, "?¯µÝÓ ÔÞÛ¯Þ±?¯Ô¾ÔÓ?Þ ß¾õ³- Û? ±¾ý?±Ý? ´Þ±?¯? þÓ´Þ±¾ þÔ¾Û¯ÔÞ§ ¶ÓÚÙ?Ô." +MCIERR_WAVE_OUTPUTSUNSUITABLE, "?Õ ¾±?ÓÝ¯ÔÙÕÝ¯ µ¯õÝ¯Ò¯ ´Þ±?¯ ?, ÛÞÚ ý¯µÕ Ô?õ?Ô¯?ÔÓ?Þ ¶ÓÚÙÞ ´¯?¯¸Ý¯Ò¯ ¶¯ýÓ?¾. ÐÛ¯Þ±?ÓÚ?Õ±³ ´¾ÝÛ?¯ý ?ÓÚÔÕÞ, ¨¯ß ¾±?ÓÝ¯ÔÞ?Þ þÔ¾Û¯ÔÞÚ ´Þ±??Ú." +MCIERR_WAVE_SETOUTPUTUNSUITABLE,"¤Þ±??Ú, ÝÓ Û¯ý¾ ÔÞ ÝÓýÓÒÓ??Õ±³ Ô? õ?Ô¯Þ?Þ þÔ¾Û, ÝÕ ¯þ´?þÝÓ? ´¯?¯¸Ý¯Ò¯ ¶¯ýÓ?¾ ¶ÓÚÙ¾." +MCIERR_WAVE_INPUTSUNSUITABLE, "?Õ ¾±?ÓÝ¯ÔÙÕÝ¯ µ¯õÝ¯Ò¯ ´Þ±?¯?, ÛÞÚ ý¯µÕ þÓ´Þ±¾ÔÓ?Þ ¶ÓÚÙÞ ´¯?¯¸Ý¯Ò¯ ¶¯ýÓ?¾. ÐÛ¯Þ±?ÓÚ?Õ±³ ´¾ÝÛ?¯ý ?ÓÚÔÕÞ, ¨¯ß ¾±?ÓÝ¯ÔÞ?Þ þÔ¾Û¯ÔÞÚ ´Þ±??Ú." +MCIERR_WAVE_SETINPUTUNSUITABLE, "¤Þ±??Ú, ÝÓ Û¯ý¾ ÔÞ ÝÓýÓÒÓ??Õ± þÓ´Þ±Ó?Þ þÔ¾Û, ÝÕ ¯þ´?þÝÓ? ´¯?¯¸Ý¯Ò¯ ¶¯ýÓ?¾ ¶ÓÚÙ¾." +MCIERR_NO_WINDOW, "?ÕýÓ? Ô?ÛÝÓ ´ÕÕÒÙ õ¾." +MCIERR_CREATEWINDOW, "?Õý¯µÙÞÔ¯ ±?Ô¯Þ?Þ Óß¯ ÔÞÛ¯Þ±?Ó?Þ Ô?ÛÝ ¯." +MCIERR_FILE_READ, "?Õý¯µÙÞÔ¯ ´¯¸Þ?Ó?Þ ÔÛÓþÓÝÞÚ ¶ÓÚÙ. ¤ÕÕÛ¯ÝÓÚ?Õ± , ¨¯ ¶ÓÚÙ ÝÕ ÔÞõÓÙÕÝÞÚ, ? ´ÕÕÔ??Õ ´?õÛÙ?¸ÕÝÝ õ¯ õÞ±Û¾ Óß¯ ýÕÕµ?." +MCIERR_FILE_WRITE, "?Õý¯µÙÞÔ¯ þÓ´Þ±Ó?Þ õ¯ ÔÛÓþÓÝ¯Ò¯ ¶ÓÚÙ¾. ¤ÕÕÛ¯ÝÓÚ?Õ± , ¨¯ ÝÓ õÞ±Û¾ ? õ¯±?Ó?Ý³¯ Ô?Ù³Ý¯Ò¯ ´¯±?¯¾ ?Ó ¨¯ Û¯ý´'??Õ ¨Õ ´?õÛÙ?¸ÕÝÞÚ õ¯ ýÕÕµ?." +MCIERR_SEQ_DIV_INCOMPATIBLE, "È¯ýÓ?Þ ¸Ó±¾ ""ÔÛÓþ?ÔÝÞÛ ´?±Ý?"" ?Ó SMPTE ÔþÓ?ý¯ÔÞÛÙ?¸Ý?. ?Õý¯µÙÞÔ¯ ÔÞÛ¯Þ±?¯Ô¾ÔÓ?Þ ?§ ¯õÝ¯¸Ó±Ý¯." +MCIERR_SEQ_NOMIDIPRESENT, "Ë ±Þ±?Õý? ÝÕýÓ? ¾±?ÓÝ¯ÔÙÕÝÞ§ ´Þ±?¯?Ô MIDI. ÐÛ¯Þ±?ÓÚ?Õ±³ ´¾ÝÛ?¯ý ?ÓÚÔÕÞ Ô ¤ÓÝÕÙ? ÛÕ¾ÔÓÝÝ , ¨¯ß ¾±?ÓÝ¯ÔÞ?Þ õÓÚÔÕ MIDI." +MCIERR_SEQ_PORT_INUSE, "ËÛÓþÓÝÞÚ ´¯? MIDI ¾µÕ ÔÞÛ¯Þ±? ¯Ô¾??³± . ÃÓ¸ÕÛÓÚ?Õ, ´¯ÛÞ Ô?Ý þÔ?Ù³ÝÞ?³± , ? ´¯Ô?¯??³ ±´¯ß¾." +MCIERR_SEQ_PORT_MAPNODEVICE, "¤¯?¯¸ÝÓ ÝÓ±?¯ÚÛÓ Ô?õ´¯Ô?õÝ¯±?? MIDI-´Þ±?¯?Ô ´¯±ÞÙÓ??³± ÝÓ ´Þ±??Ú, ÝÕ ¾±?ÓÝ¯ÔÙÕÝÞÚ ¾ ±Þ±?Õý?. ÐÛ¯Þ±?ÓÚ?Õ±³ ´¾ÝÛ?¯ý MIDI Mapper Ô ¤ÓÝÕÙ? ÛÕ¾ÔÓÝÝ õÙ ÕõÓÒ¾ÔÓÝÝ ¾± ?ÓÝ¯Ô¯Û." +MCIERR_SEQ_PORT_MISCERROR, "Ð?ÓÙÓ± ´¯ýÞÙÛÓ ?þ ÔÛÓþÓÝÞý ´¯?¯ý." +MCIERR_SEQ_PORT_NONEXISTENT, "ËÛÓþÓÝÞÚ ´Þ±??Ú MIDI ÝÕ ¾±?ÓÝ¯ÔÙÕÝÞÚ ¾ ±Þ±?Õý?. ÐÛ¯Þ±?ÓÚ?Õ±³ ´¾ÝÛ?¯ý ?ÓÚÔÕÞ Ô ¤ÓÝÕÙ? ÛÕ¾ÔÓÝÝ , ¨¯ß ¾±?ÓÝ¯ ÔÞ?Þ ´Þ±??Ú MIDI." +MCIERR_SEQ_PORTUNSPECIFIED, "Ë ±Þ±?Õý? ÝÕ ¾ÛÓþÓÝÞÚ ´¯?¯¸ÝÞÚ ´¯? MIDI." +MCIERR_SEQ_TIMER, "Ë±? ?ÓÚýÕÞ ý¾Ù³?ÞýÕõ?Ó ÔÞÛ¯Þ±?¯Ô¾??³± ?Ý°ÞýÞ õ¯õÓ?ÛÓýÞ. ÃÓÛÞÚ?Õ ¯õÞÝ ?þ ÷Þ§ õ¯õÓ?Û?Ô ? ´¯Ô?¯??³ ±´¯ß¾." + +END Property changes on: trunk/reactos/lib/winmm/winmm_Uk.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/winmm/winmm_res.rc --- trunk/reactos/lib/winmm/winmm_res.rc 2006-01-08 10:23:23 UTC (rev 20707) +++ trunk/reactos/lib/winmm/winmm_res.rc 2006-01-08 11:20:02 UTC (rev 20708) @@ -42,6 +42,7 @@ #include "winmm_Si.rc" #include "winmm_Sk.rc" //#include "winmm_Hu.rc" +#include "winmm_Uk.rc" /* do not add NLS specific stuff below that line */ _____ Added: trunk/reactos/subsys/system/explorer/explorer-uk.rc --- trunk/reactos/subsys/system/explorer/explorer-uk.rc 2006-01-08 10:23:23 UTC (rev 20707) +++ trunk/reactos/subsys/system/explorer/explorer-uk.rc 2006-01-08 11:20:02 UTC (rev 20708) @@ -0,0 +1,399 @@ +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include <windows.h> + +/////////////////////////////////////////////////////////////////////// ////// +#undef APSTUDIO_READONLY_SYMBOLS + +/////////////////////////////////////////////////////////////////////// ////// +// Ukrainian resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_UKR) +#ifdef _WIN32 +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +#pragma code_page(1251) +#endif //_WIN32 + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDM_MDIFRAME MENU DISCARDABLE +BEGIN + POPUP "&ÈÓÚÙ" + BEGIN + MENUITEM "&?ÞÛ¯ÝÓ?Þ...", ID_EXECUTE + MENUITEM SEPARATOR + MENUITEM "?&Þ§?õ", ID_FILE_EXIT + END + POPUP "&?ÞÒÙ õ" + BEGIN + MENUITEM "&¤ÓÝÕÙ³ ?Ý±?¾ýÕÝ??Ô", ID_VIEW_TOOL_BAR + MENUITEM "&?¯õÓ?Û¯ÔÓ ´ÓÝÕÙ³", ID_VIEW_EXTRA_BAR + MENUITEM "?&Þ±ÛÞ", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&?ÞßÓÝÕ", ID_VIEW_SIDE_BAR + MENUITEM "&ð õ¯Û ±?ÓÝ¾", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&?Ý¯ÔÞ?Þ\tF5", ID_REFRESH + MENUITEM "¤¯ÔÝÞÚ &ÕÛÓÝ\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "SDI", ID_VIEW_SDI + END + POPUP "?&?ÛÝÓ" + BEGIN + MENUITEM "&?¯ÔÕ Ô?ÛÝ¯", ID_WINDOW_NEW + MENUITEM "&?Ó±ÛÓõ¯ý\tShift+F5", ID_WINDOW_CASCADE + MENUITEM "&?¯Þþ¯Ý?ÓÙ³Ý¯", ID_WINDOW_TILE_HORZ + MENUITEM "&?Õ?ÞÛÓÙ³Ý¯\tShift+F4", ID_WINDOW_TILE_VERT + MENUITEM "Ë´¯ õÛ¾ÔÓ?Þ ÓÔ?¯ýÓ?Þ¸Ý¯", ID_WINDOW_AUTOSORT + MENUITEM "Ë´¯ õÛ¾ÔÓ?Þ &þÝÓ¸ÛÞ", ID_WINDOW_ARRANGE + END + POPUP "&?Ý±?¾ýÕÝ?Þ" + BEGIN + MENUITEM "&?´÷??", ID_TOOLS_OPTIONS + END + POPUP "&?¯Ô?õÛÓ" + BEGIN + MENUITEM "&FAQ(ÎÓ¤Þ) ´¯ ¤¯Ô?õÝÞÛ¾...", ID_EXPLORER_FAQ + MENUITEM "¤¯ &¤¯Ô?õÝÞÛ...", ID_ABOUT_EXPLORER + MENUITEM "¤¯ &?Ð...", ID_ABOUT_WINDOWS + END +END + +IDM_DESKTOPBAR MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&?Ó±?¯ÚÛÞ...", ID_DESKTOPBAR_SETTINGS + MENUITEM "?&Þ±´Õ?¸Õ þÓÔõÓÝ³...", ID_TASKMGR + MENUITEM SEPARATOR + MENUITEM "&¤¯ ¤¯Ô?õÝÞÛ...", ID_ABOUT_EXPLORER + END +END + +IDM_VOLUME MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "?¾¸Ý?±?³", ID_TRAY_VOLUME + MENUITEM "&?ÙÓ±?ÞÔ¯±?? þÔ¾Û¾", ID_VOLUME_PROPERTIES + END +END + +IDM_NOTIFYAREA MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&??õ¯ßÓµÓ?Þ ´Þ§¯ÔÓÝ? þÝÓ¸ÛÞ", ID_SHOW_HIDDEN_ICONS + MENUITEM "??õ¯ßÓµÓ?Þ þÝÓ¸ÛÞ ÝÓ &ÛÝ¯´ÛÓ§", ID_SHOW_ICON_BUTTON + MENUITEM "&?&Ó±?¯ÚÛÓ ±´¯Ô?¨ÕÝ³...", ID_CONFIG_NOTIFYAREA + MENUITEM "&?Ó±?¯ÚÛÓ õÓ?Þ Ú ¸Ó±¾...", ID_CONFIG_TIME + MENUITEM SEPARATOR + MENUITEM "&¤¯ ¤¯Ô?õÝÞÛ...", ID_ABOUT_EXPLORER + END +END + +IDM_SDIFRAME MENU DISCARDABLE +BEGIN + POPUP "&ÈÓÚÙ" + BEGIN + MENUITEM "&?ÞÛ¯ÝÓ?Þ...", ID_EXECUTE + MENUITEM SEPARATOR + MENUITEM "?&Þ§?õ", ID_FILE_EXIT + END + POPUP "&?ÞÒÙ õ" + BEGIN + MENUITEM "&¤ÓÝÕÙ³ ?Ý±?¾ýÕÝ??Ô", ID_VIEW_TOOL_BAR + MENUITEM "&?ÞßÓÝÕ", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "&ð õ¯Û ±?ÓÝ¾", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&?Ý¯ÔÞ?Þ\tF5", ID_REFRESH + MENUITEM "¤¯ÔÝÞÚ &ÕÛÓÝ\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "&MDI", ID_VIEW_MDI + END + POPUP "&?Ý±?¾ýÕÝ?Þ" + BEGIN + MENUITEM "&?´÷??", ID_TOOLS_OPTIONS + END + POPUP "&?¯Ô?õÛÓ" + BEGIN + MENUITEM "&FAQ(ÎÓ¤Þ) ´¯ ¤¯Ô?õÝÞÛ¾...", ID_EXPLORER_FAQ + MENUITEM "¤¯ &¤¯Ô?õÝÞÛ...", ID_ABOUT_EXPLORER + MENUITEM "¤¯ &?Ð...", ID_ABOUT_WINDOWS + END +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// Dialog +// + +IDD_EXECUTE DIALOG DISCARDABLE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "?ÞÛ¯ÝÓ?Þ" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,150,10 + CONTROL "&?¯ýÓÝõÓ:",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, + 18,60,10 + EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL + CONTROL "As &Symbol",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3, + 45,71,12 + DEFPUSHBUTTON "&OK",1,158,6,47,14 + PUSHBUTTON "&ÐÛÓ±¾ÔÓ?Þ",2,158,23,47,14 + PUSHBUTTON "&?¯Ô?õÛÓ",254,158,43,47,14 +END + +IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "¤¯°¾Û ´¯ÒÓýÞ Ô ýÕÝ? ¤¾±Û" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "&È?Ù³?:",IDC_STATIC,7,9,18,8 + EDITTEXT IDC_FILTER,34,7,100,14,ES_AUTOHSCROLL + CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | + LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | + WS_TABSTOP,7,25,186,33 + PUSHBUTTON "&¤ÕÕÔ?Þ?Þ",IDC_CHECK_ENTRIES,143,7,50,14 +END + +IDD_DESKBAR_DESKTOP DIALOG DISCARDABLE 0, 0, 212, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "?ÙÓ±?ÞÔ¯±?? ¯ß¯¸¯Ò¯ ±?¯ÙÓ" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "?ßÕ??³ ÝÓÚß?Ù³° þ¾¸ÝÞÚ õÙ ÔÓ± ÓÙÒ¯Þ?ý ÔÞ?ÔÝ? ÔÓÝÝ þÝÓ¸Û?Ô:", + IDC_STATIC,7,7,166,8 + CONTROL "left/top dwn",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,25,46,44 + CONTROL "left/top right",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,25,46,44 + CONTROL "right/top left",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,25,46,44 + CONTROL "rig./top dwn",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,159,25,46,44 + CONTROL "left/bot. up",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,73,46,44 + CONTROL "left/bot. right",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,73,46,44 + CONTROL "right/bot. left",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,73,46,44 + CONTROL "rig./bot. dwn",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,159,73,46,44 + CONTROL "border down",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,121,46,44 + CONTROL "border H/V",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,121,46,44 + CONTROL "round about",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,121,46,44 + CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | + WS_TABSTOP,159,121,46,44 + CONTROL "??õ¯ßÓµÓ?Þ ?¯ýÕ &?Õ±? ?",ID_DESKTOP_VERSION,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 +END + +IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "?ÙÓ±?ÞÔ¯±?? ´ÓÝÕÙ? þÓÔõÓÝ³" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "??õ¯ßÓ&µÓ?Þ Ò¯õÞÝÝÞÛ",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,152,52,10 + CONTROL "¤Þ&§¯Ô¾ÔÓ?Þ ÝÕÔÞÛ¯Þ±?¯Ô¾ÔÓÝ? þÝÓ¸ÛÞ", + ID_HIDE_INACTIVE_ICONS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,174,111,10 + PUSHBUTTON "&Ð´¯Ô?¨ÕÝÝ ...",ID_CONFIG_NOTIFYAREA,153,173,50,14 +END + +IDD_DESKBAR_STARTMENU DIALOG DISCARDABLE 0, 0, 210, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "?ÙÓ±?ÞÔ¯±?? ýÕÝ? ¤¾±Û" +FONT 8, "MS Sans Serif" +BEGIN +END + +IDD_NOTIFYAREA DIALOGEX 0, 0, 208, 174 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "?¯Ý¶?Ò¾Ó÷? þÝÓ¸Û?Ô ±´¯Ô?¨ÕÝ³" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | + TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31 + LTEXT "&ÊÕÛ±? ¤?õÛÓþÛÞ:",IDC_LABEL1,7,44,40,8 + EDITTEXT IDC_NOTIFY_TOOLTIP,58,42,143,14,ES_AUTOHSCROLL + LTEXT "ÃÓÒ¯Ù¯Ô¯Û ?&?ÛÝÓ:",IDC_LABEL2,7,63,44,8 + EDITTEXT IDC_NOTIFY_TITLE,58,60,143,14,ES_AUTOHSCROLL + LTEXT "&ÏÙ § õ¯ ?¯õ¾Ù :",IDC_LABEL3,7,81,43,8 + EDITTEXT IDC_NOTIFY_MODULE,58,78,143,14,ES_AUTOHSCROLL + GROUPBOX "&ðÕµÞý ??õ¯ßÓµÕÝÝ ",IDC_LABEL4,7,96,157,28 + CONTROL "&´¯ ÛÓþÓ?Þ",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | + WS_TABSTOP,15,108,33,10 + CONTROL "&±§¯ ÔÓ?Þ",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON,66, + 108,29,10 + CONTROL "Ó&Ô?¯´Þ§¯ÔÓÝÝ ",IDC_NOTIFY_AUTOHIDE,"Button", + BS_AUTORADIOBUTTON,112,108,43,10 + ICON "",IDC_PICTURE,173,101,21,20 + LTEXT "&?±?ÓÝÝ þý?ÝÓ:",IDC_LABEL6,7,132,43,8 + EDITTEXT IDC_LAST_CHANGE,59,129,105,14,ES_AUTOHSCROLL | + ES_READONLY + CONTROL "´¯ÛÓ&þÓ?Þ ´Þ§¯ÔÓÝÕ",ID_SHOW_HIDDEN_ICONS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,154,56,10 + DEFPUSHBUTTON "&OK",IDOK,91,153,50,14,WS_GROUP + PUSHBUTTON "&ÐÛÓ±¾ÔÓ?Þ",IDCANCEL,151,153,50,14 +END + +IDD_MDI_SDI DIALOGEX 0, 0, 194, 157 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_APPWINDOW +CAPTION "?ßÕ??³ ÕµÞý Ô?Û¯Ý ¤¯Ô?õÝÞÛÓ" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "?ßÕ??³ ÝÓÚß?Ù³° þ¾¸ÝÞÚ õÙ ÔÓ± ?Ý?Õ¶ÕÚ± ´¯Ô? õÝÞÛÓ:", + IDC_STATIC,7,7,160,8 + CONTROL "&MDI (ßÓÒÓ?¯õ¯Û¾ýÕÝ?ÝÞÚ ?Ý?Õ¶ÕÚ ±)",IDC_MDI,"Button", + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,124,10 + CONTROL "&SDI (¯õÝ¯õ¯Û¾ýÕÝ?ÝÞÚ ?Ý?Õ¶ÕÚ ±)",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 "??õÛÞÔÓ?Þ ´?õ´Ó´ÛÞ Ô ¯&ÛÕýÞ§ Ô?ÛÝÓ§", + IDC_SEPARATE_SUBFOLDERS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,90,135,10 + LTEXT "Í? ÝÓ±?¯ÚÛÞ ß¾õ¾?³ ÔÞÛ¯Þ±?ÓÝ? Û þÝÓ¸ÕÝÝ þÓ þÓý¯Ô¸¾ÔÓÝÝ ý õÙ Ô±?§ Ô?Û¯Ý ´¯Ô?õÝÞÛÓ Ô ýÓÚß¾?Ý³¯ý¾.", + IDC_STATIC,7,111,174,22 + DEFPUSHBUTTON "&OK",IDOK,29,136,50,14,WS_GROUP + PUSHBUTTON "&ÐÛÓ±¾ÔÓ?Þ",IDCANCEL,106,136,50,14 +END + +IDD_ABOUT_EXPLORER DIALOG DISCARDABLE 0, 0, 199, 106 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "¤¯ ¤¯Ô?õÝÞÛ ReactOS" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "¤¯Ô?õÝÞÛ ReactOS",IDC_ROS_EXPLORER,91,13,104,11 + LTEXT "V 0.9",IDC_VERSION_TXT,91,27,104,8 + LTEXT "(c) 2003-2005 Martin Fuchs",IDC_STATIC,91,42,104,8 + LTEXT "",IDC_WIN_VERSION,91,58,98,22 + LTEXT "http://www.sky.franken.de/explorer/",IDC_WWW,17,84,129, + 8 + CONTROL "&OK",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP, + 154,90,38,12 +END + + +#ifdef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE MOVEABLE PURE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE MOVEABLE PURE +BEGIN + "#include <windows.h>\r\n" + "\0" +END + +3 TEXTINCLUDE MOVEABLE PURE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +/////////////////////////////////////////////////////////////////////// ////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TITLE "¤¯Ô?õÝÞÛ Reactos" + IDS_START "¤¾±Û" + IDS_LOGOFF "?Þ§?õ ?þ ±Þ±?ÕýÞ..." + IDS_SHUTDOWN "?ÞýÛÝÕÝÝ ..." + IDS_LAUNCH "?ÞÛ¯ÝÓ?Þ..." + IDS_START_HELP "?¯Ô?õÛÓ" + IDS_SEARCH_FILES "¤¯°¾Û..." + IDS_DOCUMENTS "?¯Û¾ýÕÝ?Þ" + IDS_FAVORITES "?ÞßÓÝÕ" + IDS_PROGRAMS "¤¯ÒÓýÞ" + IDS_SETTINGS "?Ó±?¯ÚÛÞ" + IDS_EXPLORE "?ÒÙ õ" + IDS_EMPTY "(¤¯¯µÝ³¯)" + IDS_RECENT "?ÕõÓÔÝ? õ¯Û¾ýÕÝ?Þ" + IDS_ADMIN "?õý?Ý?±?¾ÔÓÝÝ " +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STARTMENU "?ÕÝ? ¤¾±Û" + IDS_MINIMIZE_ALL "þÒ¯Ý¾?Þ Ô±? Ô?ÛÝÓ" + IDS_DESKTOP_NUM "ð¯ß¯¸ÞÚ Ð??Ù %d" + IDS_VOLUME "?¾¸Ý?±?³" + IDS_ITEMS_CUR "´¯?¯¸Ý? ÕÙÕýÕÝ?Þ" + IDS_ITEMS_CONFIGURED "Û¯Ý¶?Ò¾Ó÷? " + IDS_ITEMS_VISIBLE "ÔÞõÞýÞÚ" + IDS_ITEMS_HIDDEN "´Þ§¯ÔÓÝÞÚ" + IDS_NOTIFY_SHOW "´¯ÛÓþÓ?Þ" + IDS_NOTIFY_HIDE "±§¯ÔÓ?Þ" + IDS_NOTIFY_AUTOHIDE "ÓÔ?¯´Þ§¯ÔÓÝÝ " + IDS_SHOW_HIDDEN_ICONS "¤¯ÛÓþÓ?Þ ´Þ§¯ÔÓÝ? þÝÓ¸ÛÞ" + IDS_HIDE_ICONS "Ð§¯ÔÓ?Þ þÝÓ¸ÛÞ" + IDS_TERMINATE "ÃÓÔÕ°Þ?Þ ¯ß¯?¾ ¤¯Ô?õÝÞÛÓ" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NETWORK "?ÕÕµÓ" + IDS_CONNECTIONS "?ÕÕµÝ? ´?õÛÙ?¸ÕÝÝ " + IDS_DRIVES "?Þ±ÛÞ" + IDS_SEARCH_COMPUTER "¤¯°¾Û Û¯ý´Æ??ÕÓ..." + IDS_SETTINGS_MENU "?ÕÝ? ?Ó±?¯ÚÛÓ" + IDS_CONTROL_PANEL "¤ÓÝÕÙ³ ÛÕ¾ÔÓÝÝ " + IDS_PRINTERS "¤ÞÝ?ÕÞ" + IDS_BROWSE "?ÒÙ õ ¶ÓÚÙ?Ô" + IDS_SEARCH_PRG "¤¯°¾Û ´¯ÒÓýÞ..." + IDS_ALL_USERS "?±? Û¯Þ±?¾ÔÓ¸?\\" + IDS_SEARCH "¤¯°¾Û" + IDS_ABOUT_EXPLORER "&¤¯ ¤¯Ô?õÝÞÛ..." + IDS_LAUNCH_MANY_PROGRAMS + "?Þ ¯ßÓÙÞ ß?Ù³°Õ ¯õÝ??? ´¯ÒÓýÞ.\n?Þ Ô´ÕÔÝÕÝ?, ¨¯ §¯¸Õ?Õ þÓ´¾±?Þ?Þ ?§ Ô±??" + IDS_DESKTOPBAR_SETTINGS "?Ó±?¯ÚÛÞ ¯ß¯¸¯Ò¯ ±?¯ÙÓ" + IDS_DESKTOP "ð¯ß¯¸ÞÚ Ð??Ù" + IDS_TASKBAR "¤ÓÝÕÙ³ þÓÔõÓÝ³" +END + +#endif // Ukrainian resources +/////////////////////////////////////////////////////////////////////// ////// + + + +#ifndef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +/////////////////////////////////////////////////////////////////////// ////// +#endif // not APSTUDIO_INVOKED + Property changes on: trunk/reactos/subsys/system/explorer/explorer-uk.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc --- trunk/reactos/subsys/system/explorer/explorer_intres.rc 2006-01-08 10:23:23 UTC (rev 20707) +++ trunk/reactos/subsys/system/explorer/explorer_intres.rc 2006-01-08 11:20:02 UTC (rev 20708) @@ -117,6 +117,7 @@ "#include ""explorer-ru.rc""\r\n" "#include ""explorer-jp.rc""\r\n" "#include ""explorer-hu.rc""\r\n" + "#include ""explorer-uk.rc""\r\n" "\r\n" "#ifndef __WINDRES__\r\n" "#include ""explorer-cn.rc""\r\n" _____ Added: trunk/reactos/subsys/system/reactos/Uk.rc --- trunk/reactos/subsys/system/reactos/Uk.rc 2006-01-08 10:23:23 UTC (rev 20707) +++ trunk/reactos/subsys/system/reactos/Uk.rc 2006-01-08 11:20:02 UTC (rev 20708) @@ -0,0 +1,10 @@ +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +/* String Tables */ +STRINGTABLE DISCARDABLE [truncated at 1000 lines; 21 more skipped]

1 0

[ion] 20707: - userinit, usetup, vmwinst, welcome, winefile, winlogon, winver.
by ion＠svn.reactos.org 08 Jan '06

08 Jan '06

- userinit, usetup, vmwinst, welcome, winefile, winlogon, winver. Modified: trunk/reactos/subsys/system/userinit/userinit.c Modified: trunk/reactos/subsys/system/usetup/cabinet.c Modified: trunk/reactos/subsys/system/usetup/settings.c Modified: trunk/reactos/subsys/system/vmwinst/vmwinst.c Modified: trunk/reactos/subsys/system/winefile/winefile.c _____ Modified: trunk/reactos/subsys/system/userinit/userinit.c --- trunk/reactos/subsys/system/userinit/userinit.c 2006-01-08 10:19:21 UTC (rev 20706) +++ trunk/reactos/subsys/system/userinit/userinit.c 2006-01-08 10:23:23 UTC (rev 20707) @@ -26,6 +26,7 @@ #include <cfgmgr32.h> #include "resource.h" +#define CMP_MAGIC 0x01234567 /* GLOBALS ******************************************************************/ _____ Modified: trunk/reactos/subsys/system/usetup/cabinet.c --- trunk/reactos/subsys/system/usetup/cabinet.c 2006-01-08 10:19:21 UTC (rev 20706) +++ trunk/reactos/subsys/system/usetup/cabinet.c 2006-01-08 10:23:23 UTC (rev 20707) @@ -67,12 +67,12 @@ /* Needed by zlib, but we don't want the dependency on msvcrt.dll */ -void free(void* _ptr) +void __cdecl free(void* _ptr) { RtlFreeHeap(ProcessHeap, 0, _ptr); } -void* calloc(size_t _nmemb, size_t _size) +void* __cdecl calloc(size_t _nmemb, size_t _size) { return (void*)RtlAllocateHeap (ProcessHeap, HEAP_ZERO_MEMORY, _size); } _____ Modified: trunk/reactos/subsys/system/usetup/settings.c --- trunk/reactos/subsys/system/usetup/settings.c 2006-01-08 10:19:21 UTC (rev 20706) +++ trunk/reactos/subsys/system/usetup/settings.c 2006-01-08 10:23:23 UTC (rev 20707) @@ -505,6 +505,9 @@ PWCHAR ServiceName; ULONG StartValue; NTSTATUS Status; + WCHAR RegPath [255]; + PWCHAR Buffer; + ULONG Width, Hight, Bpp; DPRINT("ProcessDisplayRegistry() called\n"); @@ -546,16 +549,14 @@ } /* Set the resolution */ - WCHAR RegPath [255]; swprintf(RegPath, L"\\Registry\\Machine\\System\\CurrentControlSet\\Hardware Profiles\\Current\\System\\CurrentControlSet\\Services\\%s\\Device0", ServiceName); - PWCHAR Buffer; if (!InfGetDataField(Context, 4, &Buffer)) { DPRINT("InfGetDataField() failed\n"); return FALSE; } - ULONG Width = wcstoul(Buffer, NULL, 10); + Width = wcstoul(Buffer, NULL, 10); Status = RtlWriteRegistryValue(RTL_REGISTRY_ABSOLUTE, RegPath, L"DefaultSettings.XResolution", @@ -574,7 +575,7 @@ DPRINT("InfGetDataField() failed\n"); return FALSE; } - ULONG Hight = wcstoul(Buffer, 0, 0); + Hight = wcstoul(Buffer, 0, 0); Status = RtlWriteRegistryValue(RTL_REGISTRY_ABSOLUTE, RegPath, L"DefaultSettings.YResolution", @@ -592,7 +593,7 @@ DPRINT("InfGetDataField() failed\n"); return FALSE; } - ULONG Bpp = wcstoul(Buffer, 0, 0); + Bpp = wcstoul(Buffer, 0, 0); Status = RtlWriteRegistryValue(RTL_REGISTRY_ABSOLUTE, RegPath, L"DefaultSettings.BitsPerPel", _____ Modified: trunk/reactos/subsys/system/vmwinst/vmwinst.c --- trunk/reactos/subsys/system/vmwinst/vmwinst.c 2006-01-08 10:19:21 UTC (rev 20706) +++ trunk/reactos/subsys/system/vmwinst/vmwinst.c 2006-01-08 10:23:23 UTC (rev 20707) @@ -77,10 +77,15 @@ /* Try using a VMware I/O port. If not running in VMware this'll throw an exception! */ +#ifndef _MSC_VER __asm__ __volatile__("inl %%dx, %%eax" : "=a" (ver), "=b" (magic) : "0" (0x564d5868), "d" (0x5658), "c" (0xa)); +#else +#error PLEASE WRITE THIS IN ASSEMBLY +#endif + if(magic == 0x564d5868) { *Version = ver; @@ -485,6 +490,7 @@ LPARAM lParam ) { + LPNMHDR pnmh = (LPNMHDR)lParam; switch(uMsg) { case WM_NOTIFY: @@ -495,7 +501,6 @@ hwndControl = GetParent(hwndDlg); CenterWindow (hwndControl); - LPNMHDR pnmh = (LPNMHDR)lParam; switch(pnmh->code) { case PSN_SETACTIVE: @@ -822,6 +827,7 @@ LPARAM lParam ) { + LPNMHDR pnmh = (LPNMHDR)lParam; switch(uMsg) { case WM_INITDIALOG: @@ -860,7 +866,6 @@ hwndControl = GetParent(hwndDlg); CenterWindow (hwndControl); - LPNMHDR pnmh = (LPNMHDR)lParam; switch(pnmh->code) { case PSN_SETACTIVE: _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2006-01-08 10:19:21 UTC (rev 20706) +++ trunk/reactos/subsys/system/winefile/winefile.c 2006-01-08 10:23:23 UTC (rev 20707) @@ -1125,7 +1125,7 @@ } /* directories first... */ -static int compareType(const WIN32_FIND_DATA* fd1, const WIN32_FIND_DATA* fd2) +static int __cdecl compareType(const WIN32_FIND_DATA* fd1, const WIN32_FIND_DATA* fd2) { int order1 = fd1->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY? TO_DIR: TO_FILE; int order2 = fd2->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY? TO_DIR: TO_FILE; @@ -1140,7 +1140,7 @@ } -static int compareName(const void* arg1, const void* arg2) +static int __cdecl compareName(const void* arg1, const void* arg2) { const WIN32_FIND_DATA* fd1 = &(*(const Entry* const*)arg1)->data; const WIN32_FIND_DATA* fd2 = &(*(const Entry* const*)arg2)->data; @@ -1152,7 +1152,7 @@ return lstrcmpi(fd1->cFileName, fd2->cFileName); } -static int compareExt(const void* arg1, const void* arg2) +static int __cdecl compareExt(const void* arg1, const void* arg2) { const WIN32_FIND_DATA* fd1 = &(*(const Entry* const*)arg1)->data; const WIN32_FIND_DATA* fd2 = &(*(const Entry* const*)arg2)->data; @@ -1185,7 +1185,7 @@ return lstrcmpi(name1, name2); } -static int compareSize(const void* arg1, const void* arg2) +static int __cdecl compareSize(const void* arg1, const void* arg2) { const WIN32_FIND_DATA* fd1 = &(*(const Entry* const*)arg1)->data; const WIN32_FIND_DATA* fd2 = &(*(const Entry* const*)arg2)->data; @@ -1206,7 +1206,7 @@ return cmp<0? -1: cmp>0? 1: 0; } -static int compareDate(const void* arg1, const void* arg2) +static int __cdecl compareDate(const void* arg1, const void* arg2) { const WIN32_FIND_DATA* fd1 = &(*(const Entry* const*)arg1)->data; const WIN32_FIND_DATA* fd2 = &(*(const Entry* const*)arg2)->data; @@ -1219,7 +1219,7 @@ } -static int (*sortFunctions[])(const void* arg1, const void* arg2) = { +static int (__cdecl *sortFunctions[])(const void* arg1, const void* arg2) = { compareName, /* SORT_NAME */ compareExt, /* SORT_EXT */ compareSize, /* SORT_SIZE */

1 0

[ion] 20706: Thanks gge..
by ion＠svn.reactos.org 08 Jan '06

08 Jan '06

Thanks gge.. Modified: trunk/reactos/hal/hal/hal.c _____ Modified: trunk/reactos/hal/hal/hal.c --- trunk/reactos/hal/hal/hal.c 2006-01-08 10:14:14 UTC (rev 20705) +++ trunk/reactos/hal/hal/hal.c 2006-01-08 10:19:21 UTC (rev 20706) @@ -133,6 +133,7 @@ ULONG Unknown2) { UNIMPLEMENTED; + return NULL; }

1 0

[fireball] 20705: Merge r20642
by fireball＠svn.reactos.org 08 Jan '06

08 Jan '06

Merge r20642 Modified: branches/usb2_6/reactos/include/reactos/debug.h _____ Modified: branches/usb2_6/reactos/include/reactos/debug.h --- branches/usb2_6/reactos/include/reactos/debug.h 2006-01-08 10:09:23 UTC (rev 20704) +++ branches/usb2_6/reactos/include/reactos/debug.h 2006-01-08 10:14:14 UTC (rev 20705) @@ -82,7 +82,12 @@ #define CHECKPOINT do { DbgPrint("%s:%d\n",__FILE__,__LINE__); } while(0); #else - #ifdef __GNUC__ + #ifdef _MSC_VER + static __inline void DPRINT ( const char* fmt, ... ) + { + UNREFERENCED_PARAMETER(fmt); + } + #else #define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) #endif #define CHECKPOINT @@ -94,17 +99,18 @@ #else /* On non-debug builds, we never show these */ -#ifdef _MSC_VER -static __inline void DPRINT1 ( const char* fmt, ... ) -{ -} -static __inline void DPRINT ( const char* fmt, ... ) -{ -} -#else - #define DPRINT1(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) - #define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) -#endif + #ifdef _MSC_VER + static __inline void DPRINT1 ( const char* fmt, ... ) + { + } + static __inline void DPRINT ( const char* fmt, ... ) + { + } + #else + #define DPRINT1(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) + #define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) + #endif + #define CHECKPOINT1 #define CHECKPOINT #define UNIMPLEMENTED

1 0

[ion] 20704: - PCHify notepad and add missing header from regedit.
by ion＠svn.reactos.org 08 Jan '06

08 Jan '06

- PCHify notepad and add missing header from regedit. Modified: trunk/reactos/subsys/system/notepad/dialog.c Modified: trunk/reactos/subsys/system/notepad/license.c Modified: trunk/reactos/subsys/system/notepad/main.c Added: trunk/reactos/subsys/system/notepad/notepad.h Modified: trunk/reactos/subsys/system/notepad/notepad.xml Modified: trunk/reactos/subsys/system/notepad/settings.c Modified: trunk/reactos/subsys/system/notepad/text.c Added: trunk/reactos/subsys/system/regedit/regedit.h _____ Modified: trunk/reactos/subsys/system/notepad/dialog.c --- trunk/reactos/subsys/system/notepad/dialog.c 2006-01-08 10:05:37 UTC (rev 20703) +++ trunk/reactos/subsys/system/notepad/dialog.c 2006-01-08 10:09:23 UTC (rev 20704) @@ -20,21 +20,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define UNICODE -#define _UNICODE +#include <notepad.h> -#define _CRT_SECURE_NO_DEPRECATE - -#include <assert.h> -#include <stdio.h> -#include <windows.h> -#include <commdlg.h> -#include <tchar.h> - -#include "main.h" -#include "license.h" -#include "dialog.h" - static const WCHAR helpfileW[] = { 'n','o','t','e','p','a','d','.','h','l','p',0 }; static INT_PTR WINAPI DIALOG_PAGESETUP_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam); _____ Modified: trunk/reactos/subsys/system/notepad/license.c --- trunk/reactos/subsys/system/notepad/license.c 2006-01-08 10:05:37 UTC (rev 20703) +++ trunk/reactos/subsys/system/notepad/license.c 2006-01-08 10:09:23 UTC (rev 20704) @@ -18,14 +18,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <windows.h> -#include "license.h" +#include <notepad.h> VOID WineLicense(HWND Wnd) { /* FIXME: should load strings from resources */ LICENSE *License = &WineLicense_En; - MessageBox(Wnd, License->License, License->LicenseCaption, + MessageBoxA(Wnd, License->License, License->LicenseCaption, MB_ICONINFORMATION | MB_OK); } @@ -34,7 +33,7 @@ { /* FIXME: should load strings from resources */ LICENSE *License = &WineLicense_En; - MessageBox(Wnd, License->Warranty, License->WarrantyCaption, + MessageBoxA(Wnd, License->Warranty, License->WarrantyCaption, MB_ICONEXCLAMATION | MB_OK); } _____ Modified: trunk/reactos/subsys/system/notepad/main.c --- trunk/reactos/subsys/system/notepad/main.c 2006-01-08 10:05:37 UTC (rev 20703) +++ trunk/reactos/subsys/system/notepad/main.c 2006-01-08 10:09:23 UTC (rev 20704) @@ -22,19 +22,8 @@ * */ -#define UNICODE -#define _UNICODE +#include <notepad.h> -#define _CRT_SECURE_NO_DEPRECATE - -#include <windows.h> -#include <stdio.h> -#include <tchar.h> - -#include "main.h" -#include "dialog.h" -#include "notepad_res.h" - NOTEPAD_GLOBALS Globals; static ATOM aFINDMSGSTRING; _____ Added: trunk/reactos/subsys/system/notepad/notepad.h --- trunk/reactos/subsys/system/notepad/notepad.h 2006-01-08 10:05:37 UTC (rev 20703) +++ trunk/reactos/subsys/system/notepad/notepad.h 2006-01-08 10:09:23 UTC (rev 20704) @@ -0,0 +1,15 @@ +#define UNICODE +#define _UNICODE + +#define _CRT_SECURE_NO_DEPRECATE + +#include <assert.h> +#include <stdio.h> +#include <windows.h> +#include <commdlg.h> +#include <tchar.h> + +#include "main.h" +#include "license.h" +#include "dialog.h" + _____ Modified: trunk/reactos/subsys/system/notepad/notepad.xml --- trunk/reactos/subsys/system/notepad/notepad.xml 2006-01-08 10:05:37 UTC (rev 20703) +++ trunk/reactos/subsys/system/notepad/notepad.xml 2006-01-08 10:09:23 UTC (rev 20704) @@ -15,4 +15,5 @@ <file>text.c</file> <file>settings.c</file> <file>rsrc.rc</file> + <pch>notepad.h</pch> </module> _____ Modified: trunk/reactos/subsys/system/notepad/settings.c --- trunk/reactos/subsys/system/notepad/settings.c 2006-01-08 10:05:37 UTC (rev 20703) +++ trunk/reactos/subsys/system/notepad/settings.c 2006-01-08 10:09:23 UTC (rev 20704) @@ -20,17 +20,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define UNICODE -#define _UNICODE +#include <notepad.h> -#include <assert.h> -#include <stdio.h> -#include <windows.h> -#include <commdlg.h> -#include <tchar.h> - -#include "main.h" - static const TCHAR s_szRegistryKey[] = { 'S','o','f','t','w','a','r','e', '\\','M','i','c','r','o','s','o','f','t', '\\','N','o','t','e','p','a','d',0 }; _____ Modified: trunk/reactos/subsys/system/notepad/text.c --- trunk/reactos/subsys/system/notepad/text.c 2006-01-08 10:05:37 UTC (rev 20703) +++ trunk/reactos/subsys/system/notepad/text.c 2006-01-08 10:09:23 UTC (rev 20704) @@ -20,15 +20,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define UNICODE +#include <notepad.h> -#include <assert.h> -#include <stdio.h> -#include <windows.h> -#include <commdlg.h> - -#include "main.h" - static BOOL Append(LPWSTR *ppszText, DWORD *pdwTextLen, LPCWSTR pszAppendText, DWORD dwAppendLen) { LPWSTR pszNewText; _____ Added: trunk/reactos/subsys/system/regedit/regedit.h --- trunk/reactos/subsys/system/regedit/regedit.h 2006-01-08 10:05:37 UTC (rev 20703) +++ trunk/reactos/subsys/system/regedit/regedit.h 2006-01-08 10:09:23 UTC (rev 20704) @@ -0,0 +1,29 @@ +#ifndef _REGEDIT_H +#define _REGEDIT_H + +#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ +#include <windows.h> +#include <commctrl.h> +#include <shellapi.h> +#include <shlwapi.h> +#include <stdlib.h> +#include <tchar.h> +#include <process.h> +#include <stdio.h> +#include <limits.h> +#include <accctrl.h> +#include <objbase.h> +#include <basetyps.h> +#include <unknwn.h> +#include <aclui.h> +#include <commdlg.h> +#include <cderr.h> +#include <ole2.h> +#include <objbase.h> +#include <objsel.h> +#include <assert.h> +#include "main.h" +#include "regproc.h" +#include "hexedit.h" +#include "security.h" +#endif

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
59
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2006