Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

[fireball] 35243: - MmAdjustWorkingSetSize has 4 parameters, not 3.
by fireball＠svn.reactos.org 09 Aug '08

09 Aug '08

Author: fireball Date: Sat Aug 9 12:55:35 2008 New Revision: 35243 URL: http://svn.reactos.org/svn/reactos?rev=35243&view=rev Log: - MmAdjustWorkingSetSize has 4 parameters, not 3. Modified: trunk/reactos/ntoskrnl/mm/mm.c trunk/reactos/ntoskrnl/ntoskrnl_i386.def Modified: trunk/reactos/ntoskrnl/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mm.c?rev=35243… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mm.c [iso-8859-1] Sat Aug 9 12:55:35 2008 @@ -356,7 +356,8 @@ ULONG NTAPI MmAdjustWorkingSetSize (ULONG Unknown0, ULONG Unknown1, - ULONG Unknown2) + ULONG Unknown2, + ULONG Unknown3) { UNIMPLEMENTED; return (0); Modified: trunk/reactos/ntoskrnl/ntoskrnl_i386.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_i386.def… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] Sat Aug 9 12:55:35 2008 @@ -720,7 +720,7 @@ Mm64BitPhysicalAddress DATA MmAddPhysicalMemory@8 MmAddVerifierThunks@8 -MmAdjustWorkingSetSize@12 +MmAdjustWorkingSetSize@16 MmAdvanceMdl@8 MmAllocateContiguousMemory@12 MmAllocateContiguousMemorySpecifyCache@32

1 0

[gedmurphy] 35242: - Don't use LoadIcon, it's broken as it incorrectly calls LoadImage - This fixes the ugly treeview icons - *note, cursor/icon loading code needs revising
by gedmurphy＠svn.reactos.org 09 Aug '08

09 Aug '08

Author: gedmurphy Date: Sat Aug 9 11:40:43 2008 New Revision: 35242 URL: http://svn.reactos.org/svn/reactos?rev=35242&view=rev Log: - Don't use LoadIcon, it's broken as it incorrectly calls LoadImage - This fixes the ugly treeview icons - *note, cursor/icon loading code needs revising Modified: trunk/reactos/base/applications/regedit/treeview.c Modified: trunk/reactos/base/applications/regedit/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/treeview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/treeview.c [iso-8859-1] Sat Aug 9 11:40:43 2008 @@ -24,14 +24,12 @@ /* Image_Open, Image_Closed, and Image_Root - integer variables for indexes of the images. */ /* CX_ICON and CY_ICON - width and height of an icon. */ /* NUM_ICON - number of icons to add to the image list. */ -int Image_Open; -int Image_Closed; -int Image_Root; +static int Image_Open = 0; +static int Image_Closed = 0; +static int Image_Root = 0; static LPTSTR pathBuffer; -#define CX_ICON 16 -#define CY_ICON 16 #define NUM_ICONS 3 static BOOL get_item_path(HWND hwndTV, HTREEITEM hItem, HKEY* phKey, LPTSTR* pKeyPath, int* pPathLen, int* pMaxLen) @@ -415,24 +413,57 @@ HICON hico; /* handle to icon */ /* Create the image list. */ - if ((himl = ImageList_Create(CX_ICON, CY_ICON, - ILC_MASK|ILC_COLOR32, 0, NUM_ICONS)) == NULL) + if ((himl = ImageList_Create(GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), + ILC_MASK | ILC_COLOR32, + 0, + NUM_ICONS)) == NULL) + { return FALSE; + } /* Add the open file, closed file, and document bitmaps. */ - hico = LoadIcon(hInst, MAKEINTRESOURCE(IDI_OPEN_FILE)); - Image_Open = ImageList_AddIcon(himl, hico); - - hico = LoadIcon(hInst, MAKEINTRESOURCE(IDI_CLOSED_FILE)); - Image_Closed = ImageList_AddIcon(himl, hico); - - hico = LoadIcon(hInst, MAKEINTRESOURCE(IDI_ROOT)); - Image_Root = ImageList_AddIcon(himl, hico); + hico = LoadImage(hInst, + MAKEINTRESOURCE(IDI_OPEN_FILE), + IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), + 0); + if (hico) + { + Image_Open = ImageList_AddIcon(himl, hico); + DestroyIcon(hico); + } + + hico = LoadImage(hInst, + MAKEINTRESOURCE(IDI_CLOSED_FILE), + IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), + 0); + if (hico) + { + Image_Closed = ImageList_AddIcon(himl, hico); + DestroyIcon(hico); + } + + hico = LoadImage(hInst, + MAKEINTRESOURCE(IDI_ROOT), + IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), + 0); + if (hico) + { + Image_Root = ImageList_AddIcon(himl, hico); + DestroyIcon(hico); + } /* Fail if not all of the images were added. */ if (ImageList_GetImageCount(himl) < NUM_ICONS) { - return FALSE; + ImageList_Destroy(himl); + return FALSE; } /* Associate the image list with the tree view control. */

1 0

[dchapyshev] 35241: - Update Russian translation
by dchapyshev＠svn.reactos.org 09 Aug '08

09 Aug '08

Author: dchapyshev Date: Sat Aug 9 11:16:49 2008 New Revision: 35241 URL: http://svn.reactos.org/svn/reactos?rev=35241&view=rev Log: - Update Russian translation Modified: trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc trunk/reactos/base/shell/explorer/explorer-ru.rc trunk/reactos/base/system/expand/lang/ru-RU.rc trunk/reactos/dll/shellext/deskadp/lang/ru-RU.rc Modified: trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc [iso-8859-1] Sat Aug 9 11:16:49 2008 @@ -18,15 +18,15 @@ MENUITEM "", -1, MFT_SEPARATOR POPUP "&Ïðîãðàììû", IDM_PROGRAMS BEGIN - MENUITEM "(Ïóñòî)", -1, MFT_STRING, MFS_GRAYED + MENUITEM "(ïóñòî)", -1, MFT_STRING, MFS_GRAYED END POPUP "&Èçáðàííîå", IDM_FAVORITES BEGIN - MENUITEM "(Ïóñòî)", -1, MFT_STRING, MFS_GRAYED + MENUITEM "(ïóñòî)", -1, MFT_STRING, MFS_GRAYED END POPUP "&Äîêóìåíòû", IDM_DOCUMENTS BEGIN - MENUITEM "(Ïóñòî)", -1, MFT_STRING, MFS_GRAYED + MENUITEM "(ïóñòî)", -1, MFT_STRING, MFS_GRAYED END POPUP "&Íàñòðîéêè", IDM_SETTINGS BEGIN Modified: trunk/reactos/base/shell/explorer/explorer-ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-ru.rc [iso-8859-1] Sat Aug 9 11:16:49 2008 @@ -57,13 +57,13 @@ END POPUP "&Èíñòðóìåíòû" BEGIN - MENUITEM "&Íàñòðîéêà", ID_TOOLS_OPTIONS + MENUITEM "&Ïàðàìåòðû", ID_TOOLS_OPTIONS END POPUP "Ïî&ìîùü" BEGIN MENUITEM "&×àñòûå âîïðîñû ïî Ïðîâîäíèêó...", ID_EXPLORER_FAQ - MENUITEM "Î &Ïðîâîäíèêå", ID_ABOUT_EXPLORER - MENUITEM "Î &ReactOS", ID_ABOUT_WINDOWS + MENUITEM "Î &ïðîãðàììå...", ID_ABOUT_EXPLORER + MENUITEM "Î &ReactOS...", ID_ABOUT_WINDOWS END END @@ -71,10 +71,10 @@ BEGIN POPUP "" BEGIN - MENUITEM "&Íàñòðîéêè...", ID_DESKTOPBAR_SETTINGS + MENUITEM "&Ïàðàìåòðû...", ID_DESKTOPBAR_SETTINGS MENUITEM "&Äèñïåò÷åð çàäà÷", ID_TASKMGR MENUITEM SEPARATOR - MENUITEM "&Î Ïðîâîäíèêå", ID_ABOUT_EXPLORER + MENUITEM "&Î ïðîãðàììå...", ID_ABOUT_EXPLORER END END @@ -96,7 +96,7 @@ MENUITEM "&Íàñòðîéêà óâåäîìëåíèé...", ID_CONFIG_NOTIFYAREA MENUITEM "Íàñòðîéêà äàòû/&âðåìåíè", ID_CONFIG_TIME MENUITEM SEPARATOR - MENUITEM "&Î Ïðîâîäíèêå", ID_ABOUT_EXPLORER + MENUITEM "&Î ïðîãðàììå...", ID_ABOUT_EXPLORER END END @@ -120,13 +120,13 @@ END POPUP "&Èíñòðóìåíòû" BEGIN - MENUITEM "&Îïöèè", ID_TOOLS_OPTIONS + MENUITEM "&Ïàðàìåòðû", ID_TOOLS_OPTIONS END POPUP "&Ñïðàâêà" BEGIN MENUITEM "&×àñòûå âîïðîñû ïî Ïðîâîäíèêó...", ID_EXPLORER_FAQ - MENUITEM "Î &Ïðîâîäíèêå", ID_ABOUT_EXPLORER - MENUITEM "Î &ReactOS", ID_ABOUT_WINDOWS + MENUITEM "Î &Ïðîâîäíèêå...", ID_ABOUT_EXPLORER + MENUITEM "Î &ReactOS...", ID_ABOUT_WINDOWS END END @@ -169,7 +169,7 @@ IDD_DESKBAR_DESKTOP DIALOGEX DISCARDABLE 0, 0, 212, 194 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Ñâîéñòâà Ðàáî÷åãî ñòîëà" +CAPTION "Ñâîéñòâà: Ðàáî÷èé ñòîë" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Âûáåðèòå, íàèáîëåå ïðåäïî÷òèòåëüíûé äëÿ âàñ, \nñïîñîá âûðàâíèâàíèÿ çíà÷êîâ", @@ -339,7 +339,7 @@ IDS_PROGRAMS "Ïðîãðàììû" IDS_SETTINGS "Íàñòðîéêà" IDS_EXPLORE "Îáçîð" - IDS_EMPTY "(Ïóñòî)" + IDS_EMPTY "(ïóñòî)" IDS_RECENT "Íåäàâíèå äîêóìåíòû" IDS_ADMIN "Àäìèíèñòðèðîâàíèå" END Modified: trunk/reactos/base/system/expand/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/lang/ru… ============================================================================== --- trunk/reactos/base/system/expand/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/expand/lang/ru-RU.rc [iso-8859-1] Sat Aug 9 11:16:49 2008 @@ -5,7 +5,7 @@ BEGIN IDS_Copy, "Óòèëèòà ðàñïàêîâêè ôàéëîâ ReactOS, âåðñèÿ 1.0\n\ -Copyright Victor Schneider 1997\n\n\ +Àâòîðñêèå ïðàâà (ñ) Âèêòîð Øíåéäåð 1997\n\n\ Èñïîëüçîâàíèå: %s èñõîäíûé_ôàéë [âûõîäíîé_ôàéë]\n" IDS_FAILS "Íå óäàëîñü âûïîëíèòü LZCopy, âîçâðàùåíî: %ld\n" Modified: trunk/reactos/dll/shellext/deskadp/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/lang/ru-RU.rc [iso-8859-1] Sat Aug 9 11:16:49 2008 @@ -40,9 +40,9 @@ IDES_REFRESHRATEFMT "%d Ãö" IDS_4BPP "16 öâåòîâ" IDS_8BPP "256 öâåòîâ" - IDS_15BPP "High Color (15 áèò)" - IDS_16BPP "High Color (16 áèò)" - IDS_24BPP "True Color (24 áèòà)" - IDS_32BPP "True Color (32 áèòà)" + IDS_15BPP "Âûñîêîå (15 áèò)" + IDS_16BPP "Âûñîêîå (16 áèò)" + IDS_24BPP "Ñàìîå âûñîêîå (24 áèòà)" + IDS_32BPP "Ñàìîå âûñîêîå (32 áèòà)" END

1 0

[hpoussin] 35240: Add module linker flags after project flags, so project ones can be overridden
by hpoussin＠svn.reactos.org 09 Aug '08

09 Aug '08

Author: hpoussin Date: Sat Aug 9 11:01:20 2008 New Revision: 35240 URL: http://svn.reactos.org/svn/reactos?rev=35240&view=rev Log: Add module linker flags after project flags, so project ones can be overridden Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Sat Aug 9 11:01:20 2008 @@ -1937,7 +1937,8 @@ fprintf ( fMakefile, - "%s_LFLAGS += $(PROJECT_LFLAGS) -g\n", + "%s_LFLAGS := $(PROJECT_LFLAGS) -g $(%s_LFLAGS)\n", + module.name.c_str (), module.name.c_str () ); } else

1 0

[dchapyshev] 35239: - Fix typo
by dchapyshev＠svn.reactos.org 09 Aug '08

09 Aug '08

Author: dchapyshev Date: Sat Aug 9 10:59:08 2008 New Revision: 35239 URL: http://svn.reactos.org/svn/reactos?rev=35239&view=rev Log: - Fix typo Modified: trunk/reactos/dll/win32/msgina/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] Sat Aug 9 10:59:08 2008 @@ -15,7 +15,7 @@ CAPTION "Äîáðî ïîæàëîâàòü â ReactOS" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - LTEXT "Íàæèòå êëàâèøè Control-Alt-Delete...",IDC_STATIC, 29, 22, 144, 14 + LTEXT "Íàæìèòå êëàâèøè Control-Alt-Delete...",IDC_STATIC, 29, 22, 144, 14 END IDD_LOGGEDOUT_DLG DIALOGEX 0,0,275,147

1 0

[dchapyshev] 35238: - Update Russian translation
by dchapyshev＠svn.reactos.org 09 Aug '08

09 Aug '08

Author: dchapyshev Date: Sat Aug 9 10:56:18 2008 New Revision: 35238 URL: http://svn.reactos.org/svn/reactos?rev=35238&view=rev Log: - Update Russian translation Modified: trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc trunk/reactos/dll/win32/msgina/lang/ru-RU.rc trunk/reactos/dll/win32/userenv/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc [iso-8859-1] Sat Aug 9 10:56:18 2008 @@ -9,8 +9,8 @@ IDS_STATUS "Ñîñòîÿíèå óñòðîéñòâà: %1" IDS_UNKNOWN "Íåèçâåñòíî" IDS_LOCATIONSTR "Ðàçìåùåíèå %1!u! (%2)" - IDS_DEVCODE " (Êîä %1!u!)" - IDS_DEVCODE2 " (Êîä %2!u!)" + IDS_DEVCODE " (êîä %1!u!)" + IDS_DEVCODE2 " (êîä %2!u!)" IDS_ENABLEDEVICE "Ýòî óñòðîéñòâî èñïîëüçóåòñÿ (âêëþ÷åíî)" IDS_DISABLEDEVICE "Ýòî óñòðîéñòâî íå èñïîëüçóåòñÿ (âûêëþ÷åíî)" IDS_UNKNOWNDEVICE "Íåèçâåñòíîå óñòðîéñòâî" @@ -58,7 +58,7 @@ IDS_DEV_DISABLED "Ýòî óñòðîéñòâî íå çàïóùåíî." IDS_DEV_DISABLED2 "Ýòî óñòðîéñòâî îòêëþ÷åíî." IDS_DEV_DEVLOADER_NOT_READY "The loaders for this device cannot load the required drivers." - IDS_DEV_DEVLOADER_NOT_READY2 "This display adapter is functioning correctly." + IDS_DEV_DEVLOADER_NOT_READY2 "Ýòîò àäàïòåð ýêðàíà ôóíêöèîíèðóåò êîððåêòíî." IDS_DEV_DEVLOADER_NOT_READY3 "The loaders for this device cannot load the required drivers." IDS_DEV_DEVICE_NOT_THERE "This device is either not present, not working properly, or does not have all the drivers installed." IDS_DEV_MOVED "ReactOS is in the process of setting up this device." Modified: trunk/reactos/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] Sat Aug 9 10:56:18 2008 @@ -15,7 +15,7 @@ CAPTION "Äîáðî ïîæàëîâàòü â ReactOS" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - LTEXT "Íàæèòå êëàâèøè Control-Alt-Delete",IDC_STATIC,16,18,144,14 + LTEXT "Íàæèòå êëàâèøè Control-Alt-Delete...",IDC_STATIC, 29, 22, 144, 14 END IDD_LOGGEDOUT_DLG DIALOGEX 0,0,275,147 @@ -23,28 +23,28 @@ CAPTION "Âõîä" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - PUSHBUTTON "OK",IDOK,51,122,50,14,BS_DEFPUSHBUTTON - PUSHBUTTON "Îòìåíà",IDCANCEL,115,122,50,14 - PUSHBUTTON "Âûêëþ÷åíèå",IDC_SHUTDOWN,179,122,50,14 - LTEXT "Èìÿ ïîëüçîâàòåëÿ:",IDC_STATIC,36,75,40,8 - LTEXT "Ïàðîëü:",IDC_STATIC,36,93,42,8 + PUSHBUTTON "OK", IDOK, 47, 122, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "Îòìåíà", IDCANCEL, 109, 122, 50, 14 + PUSHBUTTON "Âûêëþ÷åíèå", IDC_SHUTDOWN, 171, 122, 58, 14 + RTEXT "Èìÿ ïîëüçîâàòåëÿ:", IDC_STATIC, 6, 75, 70, 8 + RTEXT "Ïàðîëü:", IDC_STATIC, 6, 93, 70, 8 EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD CONTROL "",IDC_ROSLOGO,"Static",SS_BLACKFRAME,7,7,261,51 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,247,116 +IDD_LOGGEDON_DLG DIALOGEX 0, 0, 284, 116 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU CAPTION "Áåçîïàñíîñòü" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - PUSHBUTTON "Îòìåíà",IDCANCEL,170,95,70,14 - PUSHBUTTON "Çàâåðøåíèå ñåàíñà",IDC_LOGOFF,90,76,70,14 - PUSHBUTTON "Âûêëþ÷åíèå",IDC_SHUTDOWN,170,76,70,14 - LTEXT "×òî íóæíî ñäåëàòü?",IDC_STATIC,86,53,87,8 - PUSHBUTTON "Çàáëîêèðîâàòü êîìïüþòåð",IDC_LOCK,10,76,70,14 - PUSHBUTTON "Äèñïåò÷åð çàäà÷",IDC_TASKMGR,90,95,70,14 - CONTROL "",IDC_ROSLOGO,"Static",SS_BLACKFRAME,7,7,230,38 + PUSHBUTTON "Îòìåíà", IDCANCEL, 206, 95, 70, 14 + PUSHBUTTON "Çàâåðøåíèå ñåàíñà", IDC_LOGOFF, 115, 76, 86, 14 + PUSHBUTTON "Âûêëþ÷åíèå",IDC_SHUTDOWN, 206, 76, 70, 14 + LTEXT "Âûáåðèòå íåîáõîäèìîå äåéñòâèå:", IDC_STATIC, 8, 59, 130, 8 + PUSHBUTTON "Çàáëîêèðîâàòü êîìïüþòåð", IDC_LOCK, 7, 76, 103, 14 + PUSHBUTTON "Äèñïåò÷åð çàäà÷",IDC_TASKMGR, 115, 95, 86, 14 + CONTROL "",IDC_ROSLOGO,"Static",SS_BLACKFRAME, 7, 7, 269, 38 END STRINGTABLE Modified: trunk/reactos/dll/win32/userenv/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/ru-RU.rc [iso-8859-1] Sat Aug 9 10:56:18 2008 @@ -22,7 +22,7 @@ BEGIN IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" IDS_APPDATA "Application Data" - IDS_DESKTOP "Desktop" + IDS_DESKTOP "Ðàáî÷èé ñòîë" IDS_FAVORITES "Èçáðàííîå" IDS_STARTMENU "Ãëàâíîå ìåíþ" IDS_PROGRAMS "Ãëàâíîå ìåíþ\\Ïðîãðàììû"

1 0

[cwittich] 35237: -implement opening source files -implement Firefox like Tab handling (closing with middle mouse button, context menu on right button)
by cwittich＠svn.reactos.org 09 Aug '08

09 Aug '08

Author: cwittich Date: Sat Aug 9 10:36:24 2008 New Revision: 35237 URL: http://svn.reactos.org/svn/reactos?rev=35237&view=rev Log: -implement opening source files -implement Firefox like Tab handling (closing with middle mouse button, context menu on right button) Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs trunk/tools/reactosdbg/RosDBG/MainWindow.cs trunk/tools/reactosdbg/RosDBG/MainWindow.resx trunk/tools/reactosdbg/RosDBG/SourceView.Designer.cs trunk/tools/reactosdbg/RosDBG/SourceView.cs trunk/tools/reactosdbg/RosDBG/SourceView.resx Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs [iso-8859-1] Sat Aug 9 10:36:24 2008 @@ -28,6 +28,7 @@ /// </summary> private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -36,6 +37,7 @@ this.connectSerialToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.connectPipeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.connectTCPIPToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); this.symbolDirectoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -59,7 +61,8 @@ this.WorkTabs = new System.Windows.Forms.TabControl(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.RunStatus = new System.Windows.Forms.ToolStripStatusLabel(); - this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); + this.contextMenuTabStrip = new System.Windows.Forms.ContextMenuStrip(this.components); + this.closeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); @@ -68,6 +71,7 @@ this.splitContainer2.Panel2.SuspendLayout(); this.splitContainer2.SuspendLayout(); this.statusStrip1.SuspendLayout(); + this.contextMenuTabStrip.SuspendLayout(); this.SuspendLayout(); // // splitContainer1 @@ -121,7 +125,6 @@ // // openSourceFileToolStripMenuItem // - this.openSourceFileToolStripMenuItem.Enabled = false; this.openSourceFileToolStripMenuItem.Name = "openSourceFileToolStripMenuItem"; this.openSourceFileToolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.openSourceFileToolStripMenuItem.Text = "Open Source File ..."; @@ -152,6 +155,11 @@ this.connectTCPIPToolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.connectTCPIPToolStripMenuItem.Text = "Connect TCP/IP ..."; this.connectTCPIPToolStripMenuItem.Click += new System.EventHandler(this.connectTCPIPToolStripMenuItem_Click); + // + // toolStripMenuItem1 + // + this.toolStripMenuItem1.Name = "toolStripMenuItem1"; + this.toolStripMenuItem1.Size = new System.Drawing.Size(172, 6); // // symbolDirectoryToolStripMenuItem // @@ -324,6 +332,7 @@ this.WorkTabs.SelectedIndex = 0; this.WorkTabs.Size = new System.Drawing.Size(529, 357); this.WorkTabs.TabIndex = 1; + this.WorkTabs.MouseClick += new System.Windows.Forms.MouseEventHandler(this.WorkTabs_MouseClick); // // statusStrip1 // @@ -340,10 +349,19 @@ this.RunStatus.Name = "RunStatus"; this.RunStatus.Size = new System.Drawing.Size(0, 17); // - // toolStripMenuItem1 - // - this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(172, 6); + // contextMenuTabStrip + // + this.contextMenuTabStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.closeToolStripMenuItem}); + this.contextMenuTabStrip.Name = "contextMenuTabStrip"; + this.contextMenuTabStrip.Size = new System.Drawing.Size(153, 48); + // + // closeToolStripMenuItem + // + this.closeToolStripMenuItem.Name = "closeToolStripMenuItem"; + this.closeToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.closeToolStripMenuItem.Text = "&Close"; + this.closeToolStripMenuItem.Click += new System.EventHandler(this.closeToolStripMenuItem_Click); // // MainWindow // @@ -366,6 +384,7 @@ this.splitContainer2.ResumeLayout(false); this.statusStrip1.ResumeLayout(false); this.statusStrip1.PerformLayout(); + this.contextMenuTabStrip.ResumeLayout(false); this.ResumeLayout(false); } @@ -404,6 +423,8 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1; + private System.Windows.Forms.ContextMenuStrip contextMenuTabStrip; + private System.Windows.Forms.ToolStripMenuItem closeToolStripMenuItem; } } Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] Sat Aug 9 10:36:24 2008 @@ -18,6 +18,7 @@ public partial class MainWindow : Form, IShell { + Point mMousePosition; bool mRunning; DebugConnection.Mode mConnectionMode; ulong mCurrentEip; @@ -50,18 +51,22 @@ void TryToDisplaySource() { if (mCurrentFile == null || mCurrentFile == "unknown") return; - string finalFileName = Path.Combine(mSourceRoot, mCurrentFile); + OpenSourceFile(Path.Combine(mSourceRoot, mCurrentFile)); + } + + private void OpenSourceFile(string FileName) + { SourceView theSourceView; - if (File.Exists(finalFileName)) - { - if (mSourceFiles.TryGetValue(finalFileName, out theSourceView)) + if (File.Exists(FileName)) + { + if (mSourceFiles.TryGetValue(FileName, out theSourceView)) Rehighlight(theSourceView); else { - theSourceView = new SourceView(); - mSourceFiles[finalFileName] = theSourceView; + theSourceView = new SourceView(Path.GetFileName(FileName)); + mSourceFiles[FileName] = theSourceView; AddTab(theSourceView); - theSourceView.SourceFile = finalFileName; + theSourceView.SourceFile = FileName; Rehighlight(theSourceView); } } @@ -268,10 +273,44 @@ OpenFileDialog fileDialog = new OpenFileDialog(); fileDialog.Filter = "Sourcefiles (*.c;*.cpp)|*.c;*.cpp"; if (fileDialog.ShowDialog() == DialogResult.OK) - { - Console.WriteLine("open sourcefile"); - } - } + OpenSourceFile(fileDialog.FileName); + } + + private void WorkTabs_MouseClick(object sender, MouseEventArgs e) + { + switch (e.Button) + { + case MouseButtons.Right: + contextMenuTabStrip.Show(WorkTabs.PointToScreen(e.Location)); + mMousePosition = e.Location; + break; + case MouseButtons.Middle: + SelectTabFromPosition(e.Location); + closeCurrentTabToolStripMenuItem_Click(this, null); + break; + default: + break; + } + } + + private void SelectTabFromPosition(Point Position) + { + for (int i = 0; i < WorkTabs.TabCount; i++) + { + if (WorkTabs.GetTabRect(i).Contains(Position)) + { + if (WorkTabs.SelectedIndex != i) + WorkTabs.SelectTab(i); + break; + } + } + } + + private void closeToolStripMenuItem_Click(object sender, EventArgs e) + { + SelectTabFromPosition(mMousePosition); + closeCurrentTabToolStripMenuItem_Click(this, null); + } } Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/MainWindow.resx [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/MainWindow.resx [iso-8859-1] Sat Aug 9 10:36:24 2008 @@ -123,4 +123,7 @@ <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>132, 17</value> </metadata> + <metadata name="contextMenuTabStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>248, 17</value> + </metadata> </root> Modified: trunk/tools/reactosdbg/RosDBG/SourceView.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/SourceView… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/SourceView.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/SourceView.Designer.cs [iso-8859-1] Sat Aug 9 10:36:24 2008 @@ -28,8 +28,36 @@ /// </summary> private void InitializeComponent() { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SourceView)); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.SourceCode = new System.Windows.Forms.RichTextBox(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.btnCopy = new System.Windows.Forms.ToolStripButton(); + this.btnBreakpoint = new System.Windows.Forms.ToolStripButton(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + this.toolStrip1.SuspendLayout(); this.SuspendLayout(); + // + // splitContainer1 + // + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + this.splitContainer1.Location = new System.Drawing.Point(0, 0); + this.splitContainer1.Name = "splitContainer1"; + this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.toolStrip1); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.SourceCode); + this.splitContainer1.Size = new System.Drawing.Size(497, 308); + this.splitContainer1.SplitterDistance = 25; + this.splitContainer1.TabIndex = 2; // // SourceCode // @@ -37,23 +65,67 @@ this.SourceCode.Location = new System.Drawing.Point(0, 0); this.SourceCode.Name = "SourceCode"; this.SourceCode.ReadOnly = true; - this.SourceCode.Size = new System.Drawing.Size(497, 308); - this.SourceCode.TabIndex = 0; + this.SourceCode.Size = new System.Drawing.Size(497, 279); + this.SourceCode.TabIndex = 3; this.SourceCode.Text = ""; + this.SourceCode.SelectionChanged += new System.EventHandler(this.SourceCode_SelectionChanged); + // + // toolStrip1 + // + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.btnCopy, + this.btnBreakpoint}); + this.toolStrip1.Location = new System.Drawing.Point(0, 0); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(497, 25); + this.toolStrip1.TabIndex = 0; + this.toolStrip1.Text = "toolStrip1"; + // + // btnCopy + // + this.btnCopy.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.btnCopy.Enabled = false; + this.btnCopy.Image = ((System.Drawing.Image)(resources.GetObject("btnCopy.Image"))); + this.btnCopy.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btnCopy.Name = "btnCopy"; + this.btnCopy.Size = new System.Drawing.Size(23, 22); + this.btnCopy.ToolTipText = "Copy"; + this.btnCopy.Click += new System.EventHandler(this.btnCopy_Click); + // + // btnBreakpoint + // + this.btnBreakpoint.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.btnBreakpoint.Enabled = false; + this.btnBreakpoint.Image = ((System.Drawing.Image)(resources.GetObject("btnBreakpoint.Image"))); + this.btnBreakpoint.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btnBreakpoint.Name = "btnBreakpoint"; + this.btnBreakpoint.Size = new System.Drawing.Size(23, 22); + this.btnBreakpoint.ToolTipText = "Set Breakpoint"; // // SourceView // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.SourceCode); + this.Controls.Add(this.splitContainer1); this.Name = "SourceView"; this.Size = new System.Drawing.Size(497, 308); + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel1.PerformLayout(); + this.splitContainer1.Panel2.ResumeLayout(false); + this.splitContainer1.ResumeLayout(false); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); this.ResumeLayout(false); } #endregion + private System.Windows.Forms.SplitContainer splitContainer1; + private System.Windows.Forms.ToolStrip toolStrip1; private System.Windows.Forms.RichTextBox SourceCode; + private System.Windows.Forms.ToolStripButton btnCopy; + private System.Windows.Forms.ToolStripButton btnBreakpoint; + } } Modified: trunk/tools/reactosdbg/RosDBG/SourceView.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/SourceView… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/SourceView.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/SourceView.cs [iso-8859-1] Sat Aug 9 10:36:24 2008 @@ -59,6 +59,12 @@ InitializeComponent(); } + public SourceView(string FileName) + { + InitializeComponent(); + this.Tag = FileName; + } + public void UpdateSourceCode() { SourceCode.Clear(); @@ -74,5 +80,15 @@ SourceCode.Text = "Could not load " + mSourceFile + ": " + ex.Message + "\n"; } } + + private void SourceCode_SelectionChanged(object sender, EventArgs e) + { + btnCopy.Enabled = (SourceCode.SelectionLength > 0); + } + + private void btnCopy_Click(object sender, EventArgs e) + { + Clipboard.SetText(SourceCode.SelectedText); + } } } Modified: trunk/tools/reactosdbg/RosDBG/SourceView.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/SourceView… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/SourceView.resx [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/SourceView.resx [iso-8859-1] Sat Aug 9 10:36:24 2008 @@ -117,4 +117,40 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> + <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>17, 17</value> + </metadata> + <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> + <data name="btnCopy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAehJREFUOE+t099L + U3EYx3H/lFKGZDdB7K6biDKlwCDxooJAk652oVddRYZBJjMWOJ0La5ayzc70RKSLlKlraTJzrl+TlkFu + MJUdnc7pZu92viPXFm1BPfC5+z6v7/N8D6ek5F9LnviIGmncL2Id8dInv+ZOt1z1V7banF+WYQ+NLY/R + VjccKYo4xvw5/am973T2v8Dp9nOhqaM4Yh2dE4AzANJb8AUV7lmeI00p2Cei2FxRHoxGMQytiVxqXz6W + M1Wf7NmfYGc3hbKRIBSJCSC/WgdW0F5xc7RxMouY7S5xrte9i35E4Ya0TPPDIP0vV38DmkwR5GmFw3XD + VNTKGcSY3lfdeyueZCUaZym0zvvgKuZnYQG0SSkR3+I6l/VhKuqecuj8IOU1jxCAuu92Irl/s84c4Krx + HXdtSzkTKJtJFr9t417YwCTNojl7PwsosQQfvkSY+xTC4/vK+JvPtPRmPu/1gRg6Y5iL7QHO3ZwXMUkz + aKq7soC2qp78NBvmBZBMrxeJJlkIbjHmVXBMrtE96KGs0pAB/lQNrdMC+PXmnxN02V9RelJfGKi95iK+ + s4d5yEuPYxbTkxlxs9pstE5x8MTtwkClzpl+bZtIeY0FzZkeyk53UnqqI93cxoHjtwoDRf+B/3XgB/HZ + 2qt308hsAAAAAElFTkSuQmCC +</value> + </data> + <data name="btnBreakpoint.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlNJREFUOE+10l9I + U1EcB3Bfe/MhCHzqoYeKIpD+WJi0kolUuAos2EgykjGa5eya0839uc47zf2rrc1tbW5NclKsQRIKKj4E + abFypW1amKvG1Mq5TMnyfrvXIJBs2kMHzsOPc36f3+F3fhkZ/2sNPuraccuhEfgcWkglF7f2BQKZ667V + rCGO+N0Ubtspem5cTbdayHF/K4Vgu0O6LsTb0kDPT5Bgq2PKCI+NxMKEZjkODfYcWBNxmZVz9KSBSaB+ + ARY12Nhra4BNJ4PHri9KizhNdUyCHl6rCpg0wmWSg2Ygt0WFr29JWHXSnrSAUS1erui6LgWdMMLWdAVL + DGhtJLAY06K+6lx0BeA2K+Uuswrsfhj0XKOIEiZRD7uhAovvmnBTI8Ti+0Y011zA/EQ9JKXHR34Dfp1u + g9emQfI1yRyS6HApIRPy8CPehO72y0hF5ei/K8aXNwq03yhDKlILEZ8bXvECn51SS/iHMD2ixOyYDFYl + DwsxCjNjaiRHZZiJSPE5QiAZlSIeEuH8idwnf/Sgzd5ILCPhSkw9K8fMKyVSo2rMRhT4OFyLxNBVJEKX + EO06DcHRff2rNtFhkt9hkQ8DQsQHyzHFJH0arsH0i2rEHpfh+b0C9Dnz6DOFu3tXBQIBQ2ZVCZdkkaEH + pxAK8OiXnSfp8P1jeOo/jAFfLrTi3G+Ss1zrX7+xrVmxkWmigkU6dPl0dwuH7nflodOcs1Rdmv298OB2 + EKX5WWnnQCHibqkrL64UFO0P5uzMWtizbRM4ezeP8AuynRXFnF1rjvK/XPgJ7YdwWhzybo4AAAAASUVO + RK5CYII= +</value> + </data> </root>

1 0

[dchapyshev] 35236: - Update Russian translation
by dchapyshev＠svn.reactos.org 09 Aug '08

09 Aug '08

Author: dchapyshev Date: Sat Aug 9 10:18:20 2008 New Revision: 35236 URL: http://svn.reactos.org/svn/reactos?rev=35236&view=rev Log: - Update Russian translation Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ru-RU.rc [iso-8859-1] Sat Aug 9 10:18:20 2008 @@ -231,20 +231,20 @@ IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Calculator" +CAPTION "Êàëüêóëÿòîð ReactOS" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Convert",IDC_BUTTON_CONVERT,35,105,76,17 + PUSHBUTTON "Êîíâåðòèðîâàòü",IDC_BUTTON_CONVERT,35,105,76,17 COMBOBOX IDC_COMBO_CATEGORY,4,31,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "Category:",IDC_STATIC,4,20,56,8 + LTEXT "Êàòåãîðèÿ:",IDC_STATIC,4,20,56,8 COMBOBOX IDC_COMBO_FROM,4,60,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "Convert from:",IDC_STATIC,4,49,56,8 + LTEXT "Êîíâåðòèðîâàòü èç:",IDC_STATIC,4,49,75,8 COMBOBOX IDC_COMBO_TO,4,87,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "Convert to:",IDC_STATIC,4,76,56,8 + LTEXT "Êîíâåðòèðîâàòü â:",IDC_STATIC,4,76,75,8 CONTROL "C",IDC_BUTTON_CANC,"Button",BS_OWNERDRAW | BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,276,24,40,17 CONTROL "CE",IDC_BUTTON_CE,"Button",BS_OWNERDRAW | BS_CENTER | @@ -444,256 +444,256 @@ // types of conversion STRINGTABLE DISCARDABLE BEGIN - IDS_CONV_AREA "Area" - IDS_CONV_CONSUMPTION "Consumption (engines)" - IDS_CONV_CURRENCY "Currencies" - IDS_CONV_ENERGY "Energy" - IDS_CONV_LENGTH "Lenghts" - IDS_CONV_POWER "Power" - IDS_CONV_PRESSURE "Pressure" - IDS_CONV_TEMPERATURE "Temperature" - IDS_CONV_VELOCITY "Velocity" - IDS_CONV_VOLUME "Volume" - IDS_CONV_WEIGHT "Weights" + IDS_CONV_AREA "Ïëîùàäü" + IDS_CONV_CONSUMPTION "Ðàñõîä òîïëèâà (äâèãàòåëè)" + IDS_CONV_CURRENCY "Âàëþòà" + IDS_CONV_ENERGY "Ýíåðãèÿ" + IDS_CONV_LENGTH "Äëèííà" + IDS_CONV_POWER "Ìîùíîñòü" + IDS_CONV_PRESSURE "Äàâëåíèå" + IDS_CONV_TEMPERATURE "Òåìïåðàòóðà" + IDS_CONV_VELOCITY "Ñêîðîñòü" + IDS_CONV_VOLUME "Îáúåì" + IDS_CONV_WEIGHT "Âåñ" END // TYPES OF AREAS STRINGTABLE DISCARDABLE BEGIN - IDS_AREA_ACRES "Acres" - IDS_AREA_ACRES_BRAZIL "Acres (Brazil)" - IDS_AREA_ACRES_FRANCE "Acres (France)" - IDS_AREA_ACRES_SCOTS "Acres (Scots)" - IDS_AREA_ACRES_US "Acres (US)" - IDS_AREA_ARES "Ares" - IDS_AREA_CHOU "Chou" - IDS_AREA_DANBO "Danbo" - IDS_AREA_HECTARES "Hectares" - IDS_AREA_JEONGBO "Jeongbo" - IDS_AREA_MORGEN_HUNGARY "Morgen (Hungary)" - IDS_AREA_MU "Mu" - IDS_AREA_PING "Ping" - IDS_AREA_PYEONG "Pyeong" - IDS_AREA_PYEONGBANGJA "Pyeongbangja" - IDS_AREA_RAI "Rai" - IDS_AREA_SE "Se" - IDS_AREA_SQUARE_CENTIMETERS "Square centimeters" - IDS_AREA_SQUARE_CHR "Square chr" - IDS_AREA_SQUARE_FATHOMS "Square fathoms" - IDS_AREA_SQUARE_FATHOMS_HUNGARY "Square fathoms (Hungary)" - IDS_AREA_SQUARE_FEET "Square feet" - IDS_AREA_SQUARE_INCHES "Square inches" - IDS_AREA_SQUARE_KILOMETERS "Square kilometers" - IDS_AREA_SQUARE_LAR "Square lar" - IDS_AREA_SQUARE_METER "Square meter" - IDS_AREA_SQUARE_MILES "Square miles" - IDS_AREA_SQUARE_MILLIMETERS "Square millimeters" - IDS_AREA_SQUARE_SHAKU "Square shaku" - IDS_AREA_SQUARE_TSUEN "Square tsuen" - IDS_AREA_SQUARE_VA "Square va" - IDS_AREA_SQUARE_YARD "Square yard" - IDS_AREA_TAN "Tan" - IDS_AREA_TSUBO "Tsubo" + IDS_AREA_ACRES "àêð" + IDS_AREA_ACRES_BRAZIL "àêð (áðàçèëüñêèé)" + IDS_AREA_ACRES_FRANCE "àêð (ôðàíöóçñêèé)" + IDS_AREA_ACRES_SCOTS "àêð (øîòëàíäñêèé)" + IDS_AREA_ACRES_US "àêð (ÑØÀ)" + IDS_AREA_ARES "àð" + IDS_AREA_CHOU "÷îó" + IDS_AREA_DANBO "äàìáî" + IDS_AREA_HECTARES "ãåêòàð" + IDS_AREA_JEONGBO "äæåíãáî" + IDS_AREA_MORGEN_HUNGARY "ìîðãåí (âåíãåðñêèé)" + IDS_AREA_MU "ìó" + IDS_AREA_PING "ïèí" + IDS_AREA_PYEONG "ï¸í" + IDS_AREA_PYEONGBANGJA "ï¸íáàíäæà" + IDS_AREA_RAI "ðàé" + IDS_AREA_SE "õýéõî ñÿêó" + IDS_AREA_SQUARE_CENTIMETERS "êâàäðàòíûé ñàíòèìåòð" + IDS_AREA_SQUARE_CHR "êâàäðàòíûé ÷à" + IDS_AREA_SQUARE_FATHOMS "êâàäðàòíûé ôàòîì" + IDS_AREA_SQUARE_FATHOMS_HUNGARY "êâàäðàòíûé ôàòîì (âåíãåðñêèé)" + IDS_AREA_SQUARE_FEET "êâàäðàòíûé ôóò" + IDS_AREA_SQUARE_INCHES "êâàäðàòíûé äþéì" + IDS_AREA_SQUARE_KILOMETERS "êâàäðàòíûé êèëîìåòð" + IDS_AREA_SQUARE_LAR "êâàäðàòíûé ëàð" + IDS_AREA_SQUARE_METER "êâàäðàòíûé ìåòð" + IDS_AREA_SQUARE_MILES "êâàäðàòíàÿ ìèëÿ" + IDS_AREA_SQUARE_MILLIMETERS "êâàäðàòíûé ìèëëèìåòð" + IDS_AREA_SQUARE_SHAKU "êâàäðàòíûé øàêó" + IDS_AREA_SQUARE_TSUEN "êâàäðàòíûé òñóýí" + IDS_AREA_SQUARE_VA "êâàäðàòíàÿ âà" + IDS_AREA_SQUARE_YARD "êâàäðàòíûé ÿðä" + IDS_AREA_TAN "òàí" + IDS_AREA_TSUBO "öóáî" END // TYPES OF COMSUMPTIONS STRINGTABLE DISCARDABLE BEGIN - IDS_CONSUMPTION_KM_PER_L "Kilometer/liter" - IDS_CONSUMPTION_L_PER_100_KM "Liters/100 kilometers" - IDS_CONSUMPTION_MILES_GALLON_UK "Miles/gallon (UK)" - IDS_CONSUMPTION_MILES_GALLON_US "Miles/gallon (US)" + IDS_CONSUMPTION_KM_PER_L "êèëîìåòð/ëèòð" + IDS_CONSUMPTION_L_PER_100_KM "ëèòðîâ/100 êèëîìåòðîâ" + IDS_CONSUMPTION_MILES_GALLON_UK "ìèëü/ãàëëîí (áðèòàíñêèé)" + IDS_CONSUMPTION_MILES_GALLON_US "ìèëü/ãàëëîí (ÑØÀ)" END // TYPES OF CURRENCIES STRINGTABLE DISCARDABLE BEGIN - IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling" - IDS_CURRENCY_BELGIAN_FRANC "Belgian franc" - IDS_CURRENCY_CYPRIOT_POUND "Cypriot pound" - IDS_CURRENCY_DEUTSCHE_MARK "Deutsche Mark" - IDS_CURRENCY_DUTCH_GUILDER "Dutch guilder" - IDS_CURRENCY_EURO "Euro" - IDS_CURRENCY_FINNISH_MARKKA "Finnish markka" - IDS_CURRENCY_FRENCH_FRANC "French franc" - IDS_CURRENCY_GREEK_DRACHMA "Greek Drachma" - IDS_CURRENCY_IRISH_POUND "Irish pound" - IDS_CURRENCY_ITALIAN_LIRA "Italian lira" - IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" - IDS_CURRENCY_MALTESE_LIRA "Maltese lira" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo" - IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar" - IDS_CURRENCY_SPANISH_PESETA "Spanish peseta" + IDS_CURRENCY_AUSTRIAN_SCHILLING "Àâñòðàëèéñêèé øèëëèíã" + IDS_CURRENCY_BELGIAN_FRANC "Áåëüãèéñêèé ôðàíê" + IDS_CURRENCY_CYPRIOT_POUND "Êèïðèîòñêèé ôóíò" + IDS_CURRENCY_DEUTSCHE_MARK "Íåìåöêàÿ ìàðêà" + IDS_CURRENCY_DUTCH_GUILDER "Ãîëëàíäñêèé ãóëüäåí" + IDS_CURRENCY_EURO "Åâðî" + IDS_CURRENCY_FINNISH_MARKKA "Ôèíñêàÿ ìàðêà" + IDS_CURRENCY_FRENCH_FRANC "Ôðàíöóçñêèé ôðàíê" + IDS_CURRENCY_GREEK_DRACHMA "Ãðå÷åñêàÿ äðàõìà" + IDS_CURRENCY_IRISH_POUND "Èðëàíäñêèé ôóíò" + IDS_CURRENCY_ITALIAN_LIRA "Èòàëüÿíñêàÿ ëèðà" + IDS_CURRENCY_LUXEMBOURG_FRANC "Ëþêñåìáóðãñêèé ôðàíê" + IDS_CURRENCY_MALTESE_LIRA "Ìàëüòèéñêàÿ ëèðà" + IDS_CURRENCY_PORTOGUESE_ESCUDO "Ïîðòóãàëüñêîå ýñêóäî" + IDS_CURRENCY_SLOVENIAN_TOLAR "Ñëîâåíñêèé òîëàð" + IDS_CURRENCY_SPANISH_PESETA "Èñïàíñêàÿ ïåñåòà" END // TYPES OF ENERGIES STRINGTABLE DISCARDABLE BEGIN - IDS_ENERGY_15_C_CALORIES "15 ^C calories" - IDS_ENERGY_ERGS "Ergs" - IDS_ENERGY_IT_CALORIES "International Table calories" - IDS_ENERGY_JOULES "Joules" - IDS_ENERGY_KILOJOULES "Kilojoules" - IDS_ENERGY_KILOWATT_HOURS "Kilowatt hours" - IDS_ENERGY_NUTRITION_CALORIES "Nutrition calories" - IDS_ENERGY_TH_CALORIES "Thermochemical calorie" + IDS_ENERGY_15_C_CALORIES "êàëîðèÿ ïàòíàäöàòèãðàäóñíàÿ" + IDS_ENERGY_ERGS "ýðã" + IDS_ENERGY_IT_CALORIES "êàëîðèÿ ìåæäóíàðîäíàÿ" + IDS_ENERGY_JOULES "äæîóëü" + IDS_ENERGY_KILOJOULES "êèëîäæîóëü" + IDS_ENERGY_KILOWATT_HOURS "êèëîâàòò-÷àñ" + IDS_ENERGY_NUTRITION_CALORIES "êàëîðèÿ ïèùåâàÿ" + IDS_ENERGY_TH_CALORIES "êàëîðèÿ òåðìîõèìè÷åñêàÿ" END // TYPES OF LENGTHS STRINGTABLE DISCARDABLE BEGIN - IDS_LENGTH_ANGSTROMS "Angstroms" - IDS_LENGTH_ASTRONOMILA_UNITS "Astronomila units" - IDS_LENGTH_BARLEYCORNS "Barleycorns" - IDS_LENGTH_CENTIMETERS "Centimeters" - IDS_LENGTH_CHAINS_UK "Chains (UK)" - IDS_LENGTH_CHI "Chi" - IDS_LENGTH_CHOU "Chou" - IDS_LENGTH_CHR "Chr" - IDS_LENGTH_CUN "Cun" - IDS_LENGTH_FATHOMS "Fathoms" - IDS_LENGTH_FATHOMS_HUNGARY "Fathoms (Hungary)" - IDS_LENGTH_FEET "Feet" - IDS_LENGTH_FURLONGS "Furlongs" - IDS_LENGTH_GAN "Gan" - IDS_LENGTH_HANDS "Hands" - IDS_LENGTH_HUNH "Hunh" - IDS_LENGTH_INCHES "Inches" - IDS_LENGTH_JA "Ja" - IDS_LENGTH_JEONG "Jeong" - IDS_LENGTH_KABIET "Kabiet" - IDS_LENGTH_KEN "Ken" - IDS_LENGTH_KEUB "Keub" - IDS_LENGTH_KILOMETERS "Kilometers" - IDS_LENGTH_LAR "Lar" - IDS_LENGTH_LIGHT_YEARS "Light years" - IDS_LENGTH_LINKS_UK "Links (UK)" - IDS_LENGTH_METERS "Meters" - IDS_LENGTH_MILES "Miles" - IDS_LENGTH_MILLIMETERS "Millimeters" - IDS_LENGTH_NAUTICAL_MILES "Nautical miles" - IDS_LENGTH_NIEU "Nieu" - IDS_LENGTH_PARSECS "Parsecs" - IDS_LENGTH_PICAS "Picas" - IDS_LENGTH_RI_JAPAN "Ri (Japan)" - IDS_LENGTH_RI_KOREA "Ri (Korea)" - IDS_LENGTH_SAWK "Sawk" - IDS_LENGTH_SEN "Sen" - IDS_LENGTH_SHAKU "Shaku" - IDS_LENGTH_SPAN "Span" - IDS_LENGTH_SUN "Sun" - IDS_LENGTH_TSUEN "Tsuen" - IDS_LENGTH_VA "Va" - IDS_LENGTH_YARDS "Yards" - IDS_LENGTH_YOTE "Yote" - IDS_LENGTH_ZHANG "Zhang" + IDS_LENGTH_ANGSTROMS "àíãñòðåì" + IDS_LENGTH_ASTRONOMILA_UNITS "àñòðîíîìè÷åñêàÿ åäåíèöà" + IDS_LENGTH_BARLEYCORNS "áàðëåéêîðí" + IDS_LENGTH_CENTIMETERS "ñàíòèìåòð" + IDS_LENGTH_CHAINS_UK "÷åéí (áðèòàíñêèé)" + IDS_LENGTH_CHI "÷è" + IDS_LENGTH_CHOU "÷îó" + IDS_LENGTH_CHR "÷à" + IDS_LENGTH_CUN "öóíü" + IDS_LENGTH_FATHOMS "ôàòîì" + IDS_LENGTH_FATHOMS_HUNGARY "ôàòîì (âåíãåðñêèé)" + IDS_LENGTH_FEET "ôóò" + IDS_LENGTH_FURLONGS "ôàðëîíã" + IDS_LENGTH_GAN "ãàíü" + IDS_LENGTH_HANDS "ëàäîíü" + IDS_LENGTH_HUNH "õàíõ" + IDS_LENGTH_INCHES "äþéì" + IDS_LENGTH_JA "ÿ" + IDS_LENGTH_JEONG "äæåîíã" + IDS_LENGTH_KABIET "êàáüåò" + IDS_LENGTH_KEN "êåí" + IDS_LENGTH_KEUB "êåóá" + IDS_LENGTH_KILOMETERS "êèëîìåòð" + IDS_LENGTH_LAR "ëàð" + IDS_LENGTH_LIGHT_YEARS "ñâåòîâîé ãîä" + IDS_LENGTH_LINKS_UK "ëèíê (áðèòàíñêèé)" + IDS_LENGTH_METERS "ìåòð" + IDS_LENGTH_MILES "ìèëÿ" + IDS_LENGTH_MILLIMETERS "ìèëëèìåòð" + IDS_LENGTH_NAUTICAL_MILES "ìîðñêàÿ ìèëÿ" + IDS_LENGTH_NIEU "íü¸" + IDS_LENGTH_PARSECS "ïàðñåê" + IDS_LENGTH_PICAS "ïèêà" + IDS_LENGTH_RI_JAPAN "ðè (ÿïîíñêàÿ)" + IDS_LENGTH_RI_KOREA "ðè (êîðåéñêàÿ)" + IDS_LENGTH_SAWK "ñîóê" + IDS_LENGTH_SEN "ñåí" + IDS_LENGTH_SHAKU "øàêó" + IDS_LENGTH_SPAN "ñïàí" + IDS_LENGTH_SUN "ñàí" + IDS_LENGTH_TSUEN "òñóýí" + IDS_LENGTH_VA "âà" + IDS_LENGTH_YARDS "ÿðä" + IDS_LENGTH_YOTE "éîóò" + IDS_LENGTH_ZHANG "÷æàí" END // TYPES OF POWERS STRINGTABLE DISCARDABLE BEGIN - IDS_POWER_HORSEPOWER "Horsepower" - IDS_POWER_KILOWATTS "Kilowatts" - IDS_POWER_MEGAWATTS "Megawatts" - IDS_POWER_WATTS "Watts" + IDS_POWER_HORSEPOWER "ëîøàäèííàÿ ñèëà" + IDS_POWER_KILOWATTS "êèëîâàòò" + IDS_POWER_MEGAWATTS "ìåãàâàòò" + IDS_POWER_WATTS "âàòò" END // TYPE OF PRESSURES STRINGTABLE DISCARDABLE BEGIN - IDS_PRESSURE_ATMOSPHERES "Atmospheres" - IDS_PRESSURE_BARS "Bars" - IDS_PRESSURE_MM_OF_MERCURY "Millimeters of mercury" - IDS_PRESSURE_PASCALS "Pascals" - IDS_PRESSURE_PSI "Pounds-force per square inch" + IDS_PRESSURE_ATMOSPHERES "àòìîñôåðà (ôèçè÷åñêàÿ)" + IDS_PRESSURE_BARS "áàð" + IDS_PRESSURE_MM_OF_MERCURY "ìèëëèìåòð ðòóòíîãî ñòîëáà" + IDS_PRESSURE_PASCALS "ïàñêàëü" + IDS_PRESSURE_PSI "ôóíò íà êâàäðàòíûé äþéì" END // TYPES OF TEMPERATURES STRINGTABLE DISCARDABLE BEGIN - IDS_TEMPERATURE_CELSIUS "Celsius" - IDS_TEMPERATURE_FAHRENHEIT "Fahrenheit" - IDS_TEMPERATURE_KELVIN "Kelvin" - IDS_TEMPERATURE_RANKINE "Rankine" + IDS_TEMPERATURE_CELSIUS "ãðàäóñ (ïî øêàëå Öåëüñèÿ)" + IDS_TEMPERATURE_FAHRENHEIT "ãðàäóñ (ïî øêàëå Ôàðåíãåéòà)" + IDS_TEMPERATURE_KELVIN "ãðàäóñ (ïî øêàëå Êåëüâèíà)" + IDS_TEMPERATURE_RANKINE "ãðàäóñ (ïî øêàëå Rankine)" END // TYPES OF VELOCITIES STRINGTABLE DISCARDABLE BEGIN - IDS_VELOCITY_FEET_HOUR "Feet/hour" - IDS_VELOCITY_KILOMETERS_HOUR "Kilometers/hour" - IDS_VELOCITY_KNOTS "Knots" - IDS_VELOCITY_MACH "Mach" - IDS_VELOCITY_METERS_SECOND "Meters/second" - IDS_VELOCITY_MILES_HOUR "Miles/hour" + IDS_VELOCITY_FEET_HOUR "ôóò â ÷àñ" + IDS_VELOCITY_KILOMETERS_HOUR "êèëîìåòð/÷àñ" + IDS_VELOCITY_KNOTS "óçåë" + IDS_VELOCITY_MACH "ìàõ" + IDS_VELOCITY_METERS_SECOND "ìåòð â ñåêóíäó" + IDS_VELOCITY_MILES_HOUR "ìèëü â ÷àñ" END // TYPES OF VOLUMES STRINGTABLE DISCARDABLE BEGIN - IDS_VOLUME_BARRELS_UK "Barrels (UK)" - IDS_VOLUME_BARRELS_OIL "Barrels oil" - IDS_VOLUME_BUN "Bun" - IDS_VOLUME_BUSHELS_UK "Bushels (UK)" - IDS_VOLUME_BUSHELS_US "Bushels (US)" - IDS_VOLUME_CUBIC_CENTIMETERS "Cubic centimeters" - IDS_VOLUME_CUBIC_FEET "Cubic feet" - IDS_VOLUME_CUBIC_INCHES "Cubic inches" - IDS_VOLUME_CUBIC_METERS "Cubic meters" - IDS_VOLUME_CUBIC_YARDS "Cubic yards" - IDS_VOLUME_DOE "Doe" - IDS_VOLUME_FLUID_OUNCES_UK "Fluid ounces (UK)" - IDS_VOLUME_FLUID_OUNCES_US "Fluid ounces (US)" - IDS_VOLUME_GALLONS_UK "Gallons (UK)" - IDS_VOLUME_GALLONS_DRY_US "Gallons, dry (US)" - IDS_VOLUME_GALLONS_LIQUID_US "Gallons, liquid (US)" - IDS_VOLUME_GOU "Gou" - IDS_VOLUME_HOP "Hop" - IDS_VOLUME_ICCE "Icce" - IDS_VOLUME_KWIAN "Kwian" - IDS_VOLUME_LITERS "Liters" - IDS_VOLUME_MAL "Mal" - IDS_VOLUME_MILLILITERS "Milliliters" - IDS_VOLUME_PINTS_UK "Pints (UK)" - IDS_VOLUME_PINTS_DRY_US "Pints, dry (US)" - IDS_VOLUME_PINTS_LIQUID_US "Pints, liquid (US)" - IDS_VOLUME_QUARTS_UK "Quarts (UK)" - IDS_VOLUME_QUARTS_DRY_US "Quarts, dry (US)" - IDS_VOLUME_QUARTS_LIQUID_US "Quarts, liquid (US)" - IDS_VOLUME_SEKI "Seki" - IDS_VOLUME_SYOU "Syou" - IDS_VOLUME_TANANLOUNG "Tananloung" - IDS_VOLUME_TANG "Tang" - IDS_VOLUME_TO "To" + IDS_VOLUME_BARRELS_UK "áàððåëü (áðèòàíñêèé)" + IDS_VOLUME_BARRELS_OIL "áàððåëü íåôòÿíîé" + IDS_VOLUME_BUN "áóí" + IDS_VOLUME_BUSHELS_UK "áóøåëü (áðèòàíñêèé)" + IDS_VOLUME_BUSHELS_US "áóøåëü (ÑØÀ)" + IDS_VOLUME_CUBIC_CENTIMETERS "êóáè÷åñêèé ñàíòèìåòð" + IDS_VOLUME_CUBIC_FEET "êóáè÷åñêèé ôóò" + IDS_VOLUME_CUBIC_INCHES "êóáè÷åñêèé äþéì" + IDS_VOLUME_CUBIC_METERS "êóáè÷åñêèé ìåòð" + IDS_VOLUME_CUBIC_YARDS "êóáè÷åñêèé ÿðä" + IDS_VOLUME_DOE "òî" + IDS_VOLUME_FLUID_OUNCES_UK "æèäêàÿ óíöèÿ (áðèòàíñêàÿ)" + IDS_VOLUME_FLUID_OUNCES_US "æèäêàÿ óíöèÿ (ÑØÀ)" + IDS_VOLUME_GALLONS_UK "ãàëëîí (áðèòàíñêèé)" + IDS_VOLUME_GALLONS_DRY_US "ãàëëîí (äëÿ æèäêîñòåé, ÑØÀ)" + IDS_VOLUME_GALLONS_LIQUID_US "ãàëëîí (äëÿ ñóõèõ âåùåñòâ, ÑØÀ)" + IDS_VOLUME_GOU "ãîó" + IDS_VOLUME_HOP "õîï" + IDS_VOLUME_ICCE "èêêý" + IDS_VOLUME_KWIAN "êâèàí" + IDS_VOLUME_LITERS "ëèòð" + IDS_VOLUME_MAL "ìàëü" + IDS_VOLUME_MILLILITERS "ìèëëèëèòð" + IDS_VOLUME_PINTS_UK "ïèíòà (áðèòàíñêàÿ)" + IDS_VOLUME_PINTS_DRY_US "ïèíòà (äëÿ æèäêîñòåé, ÑØÀ)" + IDS_VOLUME_PINTS_LIQUID_US "ïèíòà (äëÿ ñóõèõ âåùåñòâ, ÑØÀ)" + IDS_VOLUME_QUARTS_UK "êâàðòà (áðèòàíñêàÿ)" + IDS_VOLUME_QUARTS_DRY_US "êâàðòà (äëÿ æèäêîñòåé, ÑØÀ)" + IDS_VOLUME_QUARTS_LIQUID_US "êâàðòà (äëÿ ñóõèõ âåùåñòâ, ÑØÀ)" + IDS_VOLUME_SEKI "ñýêè" + IDS_VOLUME_SYOU "ñ¸" + IDS_VOLUME_TANANLOUNG "òàíàíëóíã" + IDS_VOLUME_TANG "òàí" + IDS_VOLUME_TO "òó" END // TYPES OF WEIGHTS STRINGTABLE DISCARDABLE BEGIN - IDS_WEIGHT_BAHT "Baht" - IDS_WEIGHT_CARATS "Carats" - IDS_WEIGHT_CHUNG "Chung" - IDS_WEIGHT_DON "Don" - IDS_WEIGHT_GEUN "Geun" - IDS_WEIGHT_GRAMS "Grams" - IDS_WEIGHT_GWAN "Gwan" - IDS_WEIGHT_HARB "Harb" - IDS_WEIGHT_JIN_CHINA "Jin (China)" - IDS_WEIGHT_JIN_TAIWAN "Jin (Taiwan)" - IDS_WEIGHT_KAN "Kan" - IDS_WEIGHT_KILOGRAMS "Kilograms" - IDS_WEIGHT_KIN "Kin" - IDS_WEIGHT_LIANG_CHINA "Liang (China)" - IDS_WEIGHT_LIANG_TAIWAN "Liang (Taiwan)" - IDS_WEIGHT_MONME "Monme" - IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Ounces, avoirdupois" - IDS_WEIGHT_OUNCES_TROY "Ounces, troy" - IDS_WEIGHT_POUNDS "Pounds" - IDS_WEIGHT_QUINTAL_METRIC "Quintal (metric)" - IDS_WEIGHT_SALOUNG "Saloung" - IDS_WEIGHT_STONES "Stones" - IDS_WEIGHT_TAMLUNG "Tamlung" - IDS_WEIGHT_TONNES "Tonnes" - IDS_WEIGHT_TONS_UK "Tons (UK)" - IDS_WEIGHT_TONS_US "Tons (US)" -END + IDS_WEIGHT_BAHT "áàò" + IDS_WEIGHT_CARATS "êàðàò" + IDS_WEIGHT_CHUNG "÷àíã" + IDS_WEIGHT_DON "äîí" + IDS_WEIGHT_GEUN "äæèí" + IDS_WEIGHT_GRAMS "ãðàìì" + IDS_WEIGHT_GWAN "êâàí" + IDS_WEIGHT_HARB "õàï" + IDS_WEIGHT_JIN_CHINA "äæèí (êèòàéñêèé)" + IDS_WEIGHT_JIN_TAIWAN "äæèí (òàéâàíü)" + IDS_WEIGHT_KAN "êàíí" + IDS_WEIGHT_KILOGRAMS "êèëîãðàìì" + IDS_WEIGHT_KIN "êûí" + IDS_WEIGHT_LIANG_CHINA "ëèàíã (êèòàéñêèé)" + IDS_WEIGHT_LIANG_TAIWAN "ëèàíã (òàéâàíü)" + IDS_WEIGHT_MONME "ìîíì" + IDS_WEIGHT_OUNCES_AVOIRDUPOIS "óíöèÿ (àìåðèêàíñêàÿ)" + IDS_WEIGHT_OUNCES_TROY "óíöèÿ (òðîéñêàÿ)" + IDS_WEIGHT_POUNDS "ôóíò" + IDS_WEIGHT_QUINTAL_METRIC "êâèíòàë (ìåòðè÷åñêèé)" + IDS_WEIGHT_SALOUNG "ñàëóíã" + IDS_WEIGHT_STONES "ñòîóí" + IDS_WEIGHT_TAMLUNG "òàìëóíã" + IDS_WEIGHT_TONNES "òîííà" + IDS_WEIGHT_TONS_UK "òîííà (UK)" + IDS_WEIGHT_TONS_US "òîííà (US)" +END

1 0

[hpoussin] 35235: Add missing APIENTRY
by hpoussin＠svn.reactos.org 09 Aug '08

09 Aug '08

Author: hpoussin Date: Sat Aug 9 09:47:13 2008 New Revision: 35235 URL: http://svn.reactos.org/svn/reactos?rev=35235&view=rev Log: Add missing APIENTRY Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/text.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Sat Aug 9 09:47:13 2008 @@ -3480,6 +3480,7 @@ * @implemented */ DHPDEV +APIENTRY NtGdiGetDhpdev( IN HDEV hdev) { Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] Sat Aug 9 09:47:13 2008 @@ -3346,6 +3346,7 @@ DWORD +APIENTRY NtGdiGetCharSet(HDC hDC) { PDC Dc; Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] Sat Aug 9 09:47:13 2008 @@ -1607,6 +1607,7 @@ * @unimplemented */ BOOL +APIENTRY NtGdiAddRemoteMMInstanceToDC( IN HDC hdc, IN DOWNLOADDESIGNVECTOR *pddv, @@ -2149,6 +2150,7 @@ * @unimplemented */ BOOL +APIENTRY NtGdiGetRealizationInfo( IN HDC hdc, OUT PREALIZATION_INFO pri, @@ -2268,6 +2270,7 @@ * @unimplemented */ DWORD +APIENTRY NtGdiGetFontUnicodeRanges( IN HDC hdc, OUT OPTIONAL LPGLYPHSET pgs)

1 0

[hpoussin] 35234: Add missing APIENTRY
by hpoussin＠svn.reactos.org 09 Aug '08

09 Aug '08

Author: hpoussin Date: Sat Aug 9 09:24:51 2008 New Revision: 35234 URL: http://svn.reactos.org/svn/reactos?rev=35234&view=rev Log: Add missing APIENTRY Modified: trunk/reactos/include/psdk/ntgdi.h Modified: trunk/reactos/include/psdk/ntgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntgdi.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/ntgdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntgdi.h [iso-8859-1] Sat Aug 9 09:24:51 2008 @@ -2843,6 +2843,7 @@ W32KAPI DWORD +APIENTRY NtGdiGetCharSet( IN HDC hdc ); @@ -2897,6 +2898,7 @@ #if (_WIN32_WINNT >= 0x0500) W32KAPI DWORD +APIENTRY NtGdiGetFontUnicodeRanges( IN HDC hdc, OUT OPTIONAL LPGLYPHSET pgs @@ -2906,6 +2908,7 @@ #ifdef LANGPACK W32KAPI BOOL +APIENTRY NtGdiGetRealizationInfo( IN HDC hdc, OUT PREALIZATION_INFO pri, @@ -2915,6 +2918,7 @@ W32KAPI BOOL +APIENTRY NtGdiAddRemoteMMInstanceToDC( IN HDC hdc, IN DOWNLOADDESIGNVECTOR *pddv, @@ -3518,6 +3522,7 @@ W32KAPI DHPDEV +APIENTRY NtGdiGetDhpdev( IN HDEV hdev );

1 0

← Newer
1
...
58
59
60
61
62
63
64
...
86
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 August 2008