[SECUR32_APITEST]: Add the beginnings of an apitest for secur32, based on code by Samuel Serapion & MSDN. What needs to be fixed here, is the client/server code to communicate the results back to the main test app being running. Work in progress.

svn path=/branches/sspi-bringup/; revision=75164

reactos/base/applications/calc/winmain.c

@@ -933,15 +933,18 @@ static INT_PTR CALLBACK DlgStatProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
     return FALSE;
 }
 
-static WPARAM idm_2_idc(int idm)
+static BOOL idm_2_idc(int idm, WPARAM *pIdc)
 {
     int x;
 
     for (x=0; x<SIZEOF(upd); x++) {
         if (upd[x].idm == idm)
-            break;
+        {
+            *pIdc = (WPARAM)(upd[x].idc);
+            return TRUE;
         }
-    return (WPARAM)(upd[x].idc);
+    }
+    return FALSE;
 }
 
 static void CopyMemToClipboard(void *ptr)
@@ -1408,8 +1411,15 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
         case IDM_VIEW_DWORD:
         case IDM_VIEW_WORD:
         case IDM_VIEW_BYTE:
-            SendMessage(hWnd, WM_COMMAND, idm_2_idc(LOWORD(wp)), 0);
+        {
+            WPARAM idc;
+            if(idm_2_idc(LOWORD(wp), &idc))
+            {
+                SendMessage(hWnd, WM_COMMAND, idc, 0);
                 return TRUE;
+            }
+            return FALSE;
+        }
         case IDM_EDIT_COPY:
             handle_copy_command(hWnd);
             return TRUE;

reactos/base/applications/clipbrd/clipbrd.rc

@@ -16,6 +16,9 @@ CLPFILE_ICON ICON "res/clpfile.ico"
 /* UTF-8 */
 #pragma code_page(65001)
 
+#ifdef LANGUAGE_CS_CZ
+    #include "lang/cs-CZ.rc"
+#endif
 #ifdef LANGUAGE_DE_DE
     #include "lang/de-DE.rc"
 #endif

reactos/base/applications/clipbrd/lang/cs-CZ.rc

@@ -0,0 +1,65 @@
+LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
+
+ID_ACCEL ACCELERATORS
+BEGIN
+    VK_DELETE, CMD_DELETE, VIRTKEY
+END
+
+MAIN_MENU MENU
+BEGIN
+    POPUP "&Soubor"
+    BEGIN
+        MENUITEM "&Otevřít...", CMD_OPEN
+        MENUITEM "&Uložit jako...", CMD_SAVE_AS
+        MENUITEM SEPARATOR
+        MENUITEM "&Konec", CMD_EXIT
+    END
+    POPUP "&Upravit"
+    BEGIN
+        MENUITEM "&Smazat\tDel", CMD_DELETE
+    END
+    POPUP "&Zobrazení"
+    BEGIN
+        MENUITEM "&Automaticky", CMD_AUTOMATIC
+    END
+    POPUP "&Nápověda"
+    BEGIN
+        MENUITEM "&Zobrazit nápovědu", CMD_HELP
+        MENUITEM SEPARATOR
+        MENUITEM "&O programu", CMD_ABOUT
+    END
+END
+
+STRINGTABLE
+BEGIN
+    STRING_CLIPBOARD "Prohlížeč schránky"
+    STRING_CLIPFILE  "Prvek schránky"
+    STRING_DELETE_MSG "Vymazat obsah stránky?"
+    STRING_DELETE_TITLE "Vymazat schránku"
+    STRING_FORMAT_NT "Soubory schránky systému ReactOS (*.clp)"
+    STRING_FORMAT_GEN "Soubory schránky (*.clp)"
+END
+
+STRINGTABLE
+BEGIN
+    STRING_CF_UNKNOWN "Neznámý formát"
+    STRING_CF_TEXT "Text"
+    STRING_CF_BITMAP "Bitmapa"
+    STRING_CF_OEMTEXT "Text OEM"
+    STRING_CF_UNICODETEXT "Text Unicode"
+    STRING_CF_DIB "DIB bitmapa"
+    STRING_CF_LOCALE "Data znakové sady"
+    STRING_CF_ENHMETAFILE "Rožířený soubor Metafile"
+    STRING_CF_METAFILEPICT "Metafile"
+    STRING_CF_PALETTE "Barevná paleta"
+    STRING_CF_DIBV5 "DIB bitmapa (Verze 5)"
+    STRING_CF_SYLK "Symbolický odkaz"
+    STRING_CF_DIF "Formát výměny dat"
+    STRING_CF_HDROP "Data přetažení"
+END
+
+STRINGTABLE
+BEGIN
+    ERROR_UNSUPPORTED_FORMAT "Schránka obsahuje data ve formátu, který není možné zobrazit."
+    ERROR_INVALID_FILE_FORMAT "Vybraný soubor není platný soubor schránky."
+END

reactos/base/applications/control/control.c

@@ -15,6 +15,7 @@
 #include <winuser.h>
 #include <winreg.h>
 #include <shellapi.h>
+#include <strsafe.h>
 
 #include "resource.h"
 
@@ -41,8 +42,8 @@ OpenShellFolder(LPWSTR lpFolderCLSID)
      * Open a shell folder using "explorer.exe". The passed CLSIDs
      * are all subfolders of the "Control Panel" shell folder.
      */
-    wcscpy(szParameters, L"/n,::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}");
-    wcscat(szParameters, lpFolderCLSID);
+    StringCbCopy(szParameters, sizeof(szParameters), L"/n,::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}");
+    StringCbCat(szParameters,sizeof(szParameters), lpFolderCLSID);
 
     return (INT_PTR)ShellExecuteW(NULL,
                                   L"open",

reactos/base/applications/dxdiag/lang/cs-CZ.rc

@@ -47,7 +47,7 @@ BEGIN
     EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 135, 10, WS_DISABLED
+    CHECKBOX "Zkontrolovat digitální podpisy WHQL", IDC_WHQL_SIGN_CHECK, 15, 170, 135, 10, WS_DISABLED
 END
 
 IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220
@@ -75,7 +75,7 @@ BEGIN
     RTEXT "Datum:", IDC_STATIC, 275, 30, 55, 10
     RTEXT "WHQL-Logo:", IDC_STATIC, 275, 40, 55, 10
     RTEXT "Mini-VDD:", IDC_STATIC, 275, 50, 55, 10
-    RTEXT " vvdddVDD:", IDC_STATIC, 275, 60, 55, 10
+    RTEXT "VDD:", IDC_STATIC, 275, 60, 55, 10
     RTEXT "Verze DDI:", IDC_STATIC, 275, 70, 55, 10
     EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
@@ -142,17 +142,17 @@ IDD_MUSIC_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    RTEXT "General MIDI DLS Collection:", IDC_STATIC, 0, 0, 100, 10
+    RTEXT "Obecná MIDI DLS kolekce:", IDC_STATIC, 0, 0, 100, 10
     EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85
-    GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70
-    LTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 17
+    GROUPBOX "Hudební porty", IDC_STATIC, 5, 10, 452, 85
+    GROUPBOX "Vlastnosti ReactX", IDC_STATIC, 5, 97, 452, 70
+    LTEXT "Výchozí akcelerace portu:", IDC_STATIC, 15, 120, 95, 17
     LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10
-    PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED
-    LTEXT "Test using this port:", IDC_STATIC, 180, 105, 100, 10
+    PUSHBUTTON "Zakázat", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED
+    LTEXT "Otestovat tento port:", IDC_STATIC, 180, 105, 100, 10
     LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED
-    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    PUSHBUTTON "Otestovat DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Poznámky", IDC_STATIC, 5, 170, 452, 50
     EDITTEXT IDC_MUSIC_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
@@ -175,11 +175,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Registrovaný poskytovatel služby DirectPlay", IDC_STATIC, 5, 0, 452, 75
     CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 55
-    GROUPBOX "Registered Lobbyable DirectPlay Applications", IDC_STATIC, 5, 77, 452, 55
-    GROUPBOX "ReactX Features", IDC_STATIC, 5, 133, 452, 35
-    PUSHBUTTON "DirectPlay Voice Options", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED
-    PUSHBUTTON "Test DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED
-    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    GROUPBOX "Registrováné aplikace s možností Lobby", IDC_STATIC, 5, 77, 452, 55
+    GROUPBOX "Vlastnosti ReactX", IDC_STATIC, 5, 133, 452, 35
+    PUSHBUTTON "Možnosti hlasu DirectPlay", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED
+    PUSHBUTTON "Otestovat DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Poznámky", IDC_STATIC, 5, 170, 452, 50
     EDITTEXT IDC_NETWORK_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
@@ -187,11 +187,11 @@ IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10
-    PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED
-    LTEXT "Displays additional system information", IDC_STATIC, 90, 23, 300, 10
-    PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED
-    LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 43, 300, 10
+    LTEXT "Stále nemůžete nalézt informace, které hledáte? Můžete vyzkoušet následující:", IDC_STATIC, 5, 0, 300, 10
+    PUSHBUTTON "Systémové informace", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED
+    LTEXT "Zobrazí další systémové informace", IDC_STATIC, 90, 23, 300, 10
+    PUSHBUTTON "Vynucení obnovovací frekvence", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED
+    LTEXT "Vynutí obnovovací frekvenci pro DirectDraw", IDC_STATIC, 90, 43, 300, 10
 END
 
 STRINGTABLE
@@ -248,12 +248,12 @@ BEGIN
     IDS_D3DTEST_DESCRIPTION "Spustí se test rozhraní Direct3D. Pokračovat?"
     IDS_D3DTEST_D3Dx "Tento test použije hardwarově akcelerované rozhraní Direct3D %u."
     IDS_OS_VERSION "%s %s (%d.%d, Build %d)"
-    IDS_DMUSIC_DESC "Description"
-    IDS_DMUSIC_TYPE "Type"
-    IDS_DMUSIC_KERNEL "Kernel Mode"
-    IDS_DMUSIC_IO "In/Out"
-    IDS_DMUSIC_DLS "Supports DLS"
-    IDS_DMUSIC_EXT "External"
-    IDS_DMUSIC_PORT "Default Port"
-    IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n"
+    IDS_DMUSIC_DESC "Popis"
+    IDS_DMUSIC_TYPE "Typ"
+    IDS_DMUSIC_KERNEL "Kernel mód"
+    IDS_DMUSIC_IO "I/O"
+    IDS_DMUSIC_DLS "Podporuje DLS"
+    IDS_DMUSIC_EXT "Externí"
+    IDS_DMUSIC_PORT "Výchozí port"
+    IDS_DDDISABLE_MSG "Tímto dojde k zakázání akcelerace DirectDraw na všech zobrazovacích zařízeních\n.Přejete si pokračovat?\n"
 END

reactos/base/applications/fontview/display.c

@@ -28,6 +28,9 @@
 #define SPACING1 8
 #define SPACING2 5
 
+extern INT g_NumFonts;
+extern WCHAR g_FontTitle[];
+
 const WCHAR g_szFontDisplayClassName[] = L"FontDisplayClass";
 LRESULT CALLBACK DisplayProc(HWND, UINT, WPARAM, LPARAM);
 
@@ -162,7 +165,7 @@ EnumFontFamProcW(
 }
 
 static LRESULT
-Display_SetTypeFace(HWND hwnd, PEXTLOGFONTW pExtLogFont)
+Display_SetTypeFace(HWND hwnd, PLOGFONTW pLogFont)
 {
 	DISPLAYDATA* pData;
 	TEXTMETRIC tm;
@@ -171,16 +174,21 @@ Display_SetTypeFace(HWND hwnd, PEXTLOGFONTW pExtLogFont)
 	SCROLLINFO si;
 	int i;
 	LOGFONTW logfont;
+	BOOL fOpenType;
+	BYTE Buffer[512];
+	LPOUTLINETEXTMETRICW pOTM = (LPOUTLINETEXTMETRICW)Buffer;
+	LPWSTR pch;
 
 	/* Set the new type face name */
 	pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA);
-	_snwprintf(pData->szTypeFaceName, LF_FULLFACESIZE, pExtLogFont->elfFullName);
+	lstrcpynW(pData->szTypeFaceName, pLogFont->lfFaceName,
+	          ARRAYSIZE(pData->szTypeFaceName));
 
 	/* Create the new fonts */
 	hDC = GetDC(hwnd);
 	DeleteObject(pData->hCharSetFont);
 
-	logfont = pExtLogFont->elfLogFont;
+	logfont = *pLogFont;
 	logfont.lfHeight = -MulDiv(16, GetDeviceCaps(GetDC(NULL), LOGPIXELSY), 72);
 	pData->hCharSetFont = CreateFontIndirectW(&logfont);
 
@@ -189,8 +197,19 @@ Display_SetTypeFace(HWND hwnd, PEXTLOGFONTW pExtLogFont)
 	GetTextMetrics(hDC, &tm);
 	if (tm.tmPitchAndFamily & TMPF_TRUETYPE)
 	{
-		BOOL fOpenType = FALSE;
+		if (GetOutlineTextMetricsW(hDC, sizeof(Buffer), pOTM))
+		{
+			LPBYTE pb = Buffer;
+			pb += (WORD)(DWORD_PTR)pOTM->otmpStyleName;
+			pch = (LPWSTR)pb;
+			if (*pch)
+			{
+				lstrcatW(pData->szTypeFaceName, L" ");
+				lstrcatW(pData->szTypeFaceName, pch);
+			}
+		}
 
+		fOpenType = FALSE;
 		EnumFontFamiliesExW(hDC, &logfont,
 			EnumFontFamProcW, (LPARAM)&fOpenType, 0);
 
@@ -234,12 +253,12 @@ Display_SetTypeFace(HWND hwnd, PEXTLOGFONTW pExtLogFont)
 }
 
 static LRESULT
-Display_SetString(HWND hwnd, LPARAM lParam)
+Display_SetString(HWND hwnd, LPCWSTR pszString)
 {
 	DISPLAYDATA* pData;
 
 	pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA);
-	_snwprintf(pData->szString, MAX_STRING, (WCHAR*)lParam);
+	lstrcpynW(pData->szString, pszString, ARRAYSIZE(pData->szString));
 
 	InvalidateRect(hwnd, NULL, TRUE);
 
@@ -252,11 +271,10 @@ Display_OnCreate(HWND hwnd)
 	DISPLAYDATA* pData;
 	const int nSizes[MAX_SIZES] = {8, 12, 18, 24, 36, 48, 60, 72};
 	int i;
-	EXTLOGFONTW ExtLogFont = {{50, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE,
+	LOGFONTW LogFont = {50, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE,
 	                    ANSI_CHARSET, OUT_DEFAULT_PRECIS,
 	                    CLIP_DEFAULT_PRECIS, PROOF_QUALITY,
-	                          DEFAULT_PITCH , L"Ms Shell Dlg"},
-	                          L"Ms Shell Dlg"};
+	                    DEFAULT_PITCH , L"MS Shell Dlg"};
 
 	/* Create data structure */
 	pData = malloc(sizeof(DISPLAYDATA));
@@ -270,13 +288,14 @@ Display_OnCreate(HWND hwnd)
 		pData->nSizes[i] = nSizes[i];
 	}
 
-	pData->hCaptionFont = CreateFontIndirectW(&ExtLogFont.elfLogFont);
-	ExtLogFont.elfLogFont.lfHeight = 12;
-	pData->hSizeFont = CreateFontIndirectW(&ExtLogFont.elfLogFont);
+	pData->hCaptionFont = CreateFontIndirectW(&LogFont);
+	LogFont.lfHeight = 12;
+	pData->hSizeFont = CreateFontIndirectW(&LogFont);
 
-	Display_SetString(hwnd, (LPARAM)L"Jackdaws love my big sphinx of quartz. 1234567890");
+	Display_SetString(hwnd,
+		L"Jackdaws love my big sphinx of quartz. 1234567890");
 
-	Display_SetTypeFace(hwnd, &ExtLogFont);
+	Display_SetTypeFace(hwnd, &LogFont);
 
 	return 0;
 }
@@ -520,10 +539,10 @@ DisplayProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 			return Display_OnVScroll(hwnd, wParam);
 
 		case FVM_SETTYPEFACE:
-			return Display_SetTypeFace(hwnd, (PEXTLOGFONTW)lParam);
+			return Display_SetTypeFace(hwnd, (PLOGFONTW)lParam);
 
 		case FVM_SETSTRING:
-			return Display_SetString(hwnd, lParam);
+			return Display_SetString(hwnd, (WCHAR *)lParam);
 
 		case WM_DESTROY:
 			return Display_OnDestroy(hwnd);

reactos/base/applications/fontview/fontview.c

@@ -4,6 +4,7 @@
  *  fontview.c
  *
  *  Copyright (C) 2007  Timo Kreuzer <timo <dot> kreuzer <at> reactos <dot> org>
+ *  Copyright (C) 2016-2017  Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
  *
  *  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
@@ -30,8 +31,11 @@
 #include "resource.h"
 
 HINSTANCE g_hInstance;
-EXTLOGFONTW g_ExtLogFontW;
+INT g_FontIndex = 0;
+INT g_NumFonts = 0;
+LOGFONTW g_LogFonts[64];
 LPCWSTR g_fileName;
+WCHAR g_FontTitle[1024] = L"";
 
 static const WCHAR g_szFontViewClassName[] = L"FontViewWClass";
 
@@ -93,6 +97,7 @@ WinMain (HINSTANCE hThisInstance,
          int nCmdShow)
 {
 	int argc;
+	INT i;
 	WCHAR** argv;
 	WCHAR szFileName[MAX_PATH] = L"";
 	DWORD dwSize;
@@ -118,10 +123,10 @@ WinMain (HINSTANCE hThisInstance,
 	if (argc < 2)
 	{
 		OPENFILENAMEW fontOpen;
-        WCHAR filter[MAX_PATH], dialogTitle[MAX_PATH];
+        WCHAR filter[MAX_PATH*2], dialogTitle[MAX_PATH];
 
-		LoadStringW(NULL, IDS_OPEN, dialogTitle, MAX_PATH);
-		LoadStringW(NULL, IDS_FILTER_LIST, filter, MAX_PATH);
+		LoadStringW(NULL, IDS_OPEN, dialogTitle, ARRAYSIZE(dialogTitle));
+		LoadStringW(NULL, IDS_FILTER_LIST, filter, ARRAYSIZE(filter));
 
 		/* Clears out any values of fontOpen before we use it */
 		ZeroMemory(&fontOpen, sizeof(fontOpen));
@@ -161,19 +166,31 @@ WinMain (HINSTANCE hThisInstance,
 	}
 
 	/* Get the font name */
-	dwSize = sizeof(g_ExtLogFontW.elfFullName);
-	if (!GetFontResourceInfoW(fileName, &dwSize, g_ExtLogFontW.elfFullName, 1))
+	dwSize = sizeof(g_LogFonts);
+	ZeroMemory(g_LogFonts, sizeof(g_LogFonts));
+	if (!GetFontResourceInfoW(fileName, &dwSize, g_LogFonts, 2))
+	{
+		ErrorMsgBox(0, IDS_ERROR_NOFONT, fileName);
+		return -1;
+	}
+	g_NumFonts = 0;
+	for (i = 0; i < ARRAYSIZE(g_LogFonts); ++i)
+	{
+		if (g_LogFonts[i].lfFaceName[0] == 0)
+			break;
+
+		++g_NumFonts;
+	}
+	if (g_NumFonts == 0)
 	{
 		ErrorMsgBox(0, IDS_ERROR_NOFONT, fileName);
 		return -1;
 	}
 
-	dwSize = sizeof(LOGFONTW);
-	if (!GetFontResourceInfoW(fileName, &dwSize, &g_ExtLogFontW.elfLogFont, 2))
-	{
-		ErrorMsgBox(0, IDS_ERROR_NOFONT, fileName);
-		return -1;
-	}
+	/* get font title */
+	dwSize = sizeof(g_FontTitle);
+	ZeroMemory(g_FontTitle, sizeof(g_FontTitle));
+	GetFontResourceInfoW(fileName, &dwSize, g_FontTitle, 1);
 
 	if (!Display_InitClass(hThisInstance))
 	{
@@ -206,7 +223,7 @@ WinMain (HINSTANCE hThisInstance,
 	hMainWnd = CreateWindowExW(
 				0,						/* Extended possibilities for variation */
 				g_szFontViewClassName,	/* Classname */
-				g_ExtLogFontW.elfFullName,/* Title Text */
+				g_FontTitle,			/* Title Text */
 				WS_OVERLAPPEDWINDOW,	/* default window */
 				CW_USEDEFAULT,			/* Windows decides the position */
 				CW_USEDEFAULT,			/* where the window ends up on the screen */
@@ -222,6 +239,8 @@ WinMain (HINSTANCE hThisInstance,
 	/* Main message loop */
 	while (GetMessage (&msg, NULL, 0, 0))
 	{
+		if (IsDialogMessage(hMainWnd, &msg))
+			continue;
 		TranslateMessage(&msg);
 		DispatchMessage(&msg);
 	}
@@ -237,7 +256,9 @@ MainWnd_OnCreate(HWND hwnd)
 	WCHAR szQuit[MAX_BUTTONNAME];
 	WCHAR szPrint[MAX_BUTTONNAME];
 	WCHAR szString[MAX_STRING];
-	HWND hDisplay, hButtonInstall, hButtonPrint;
+	WCHAR szPrevious[MAX_STRING];
+	WCHAR szNext[MAX_STRING];
+	HWND hDisplay, hButtonInstall, hButtonPrint, hButtonPrev, hButtonNext;
 
 	/* create the display window */
 	hDisplay = CreateWindowExW(
@@ -258,10 +279,6 @@ MainWnd_OnCreate(HWND hwnd)
 	LoadStringW(g_hInstance, IDS_STRING, szString, MAX_STRING);
 	SendMessage(hDisplay, FVM_SETSTRING, 0, (LPARAM)szString);
 
-	/* Init the display window with the font name */
-	SendMessage(hDisplay, FVM_SETTYPEFACE, 0, (LPARAM)&g_ExtLogFontW);
-	ShowWindow(hDisplay, SW_SHOWNORMAL);
-
 	/* Create the install button */
 	LoadStringW(g_hInstance, IDS_INSTALL, szQuit, MAX_BUTTONNAME);
 	hButtonInstall = CreateWindowExW(
@@ -298,6 +315,51 @@ MainWnd_OnCreate(HWND hwnd)
 			);
 	SendMessage(hButtonPrint, WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), (LPARAM)TRUE);
 
+	/* Create the previous button */
+	LoadStringW(g_hInstance, IDS_PREVIOUS, szPrevious, MAX_BUTTONNAME);
+	hButtonPrev = CreateWindowExW(
+				0,						/* Extended style */
+				L"button",				/* Classname */
+				szPrevious,				/* Title text */
+				WS_CHILD | WS_VISIBLE,	/* Window style */
+				450,					/* X-pos */
+				BUTTON_POS_Y,			/* Y-Pos */
+				BUTTON_WIDTH,			/* Width */
+				BUTTON_HEIGHT,			/* Height */
+				hwnd,					/* Parent */
+				(HMENU)IDC_PREV,		/* Identifier */
+				g_hInstance,			/* Program Instance handler */
+				NULL					/* Window Creation data */
+			);
+	SendMessage(hButtonPrev, WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), (LPARAM)TRUE);
+
+	/* Create the next button */
+	LoadStringW(g_hInstance, IDS_NEXT, szNext, MAX_BUTTONNAME);
+	hButtonNext = CreateWindowExW(
+				0,						/* Extended style */
+				L"button",				/* Classname */
+				szNext,					/* Title text */
+				WS_CHILD | WS_VISIBLE,	/* Window style */
+				450,					/* X-pos */
+				BUTTON_POS_Y,			/* Y-Pos */
+				BUTTON_WIDTH,			/* Width */
+				BUTTON_HEIGHT,			/* Height */
+				hwnd,					/* Parent */
+				(HMENU)IDC_NEXT,		/* Identifier */
+				g_hInstance,			/* Program Instance handler */
+				NULL					/* Window Creation data */
+			);
+	SendMessage(hButtonNext, WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), (LPARAM)TRUE);
+
+	EnableWindow(hButtonPrev, FALSE);
+	if (g_NumFonts <= 1)
+		EnableWindow(hButtonNext, FALSE);
+
+	/* Init the display window with the font name */
+	g_FontIndex = 0;
+	SendMessage(hDisplay, FVM_SETTYPEFACE, 0, (LPARAM)&g_LogFonts[g_FontIndex]);
+	ShowWindow(hDisplay, SW_SHOWNORMAL);
+
 	return 0;
 }
 
@@ -305,10 +367,36 @@ static LRESULT
 MainWnd_OnSize(HWND hwnd)
 {
 	RECT rc;
+	HWND hInstall, hPrint, hPrev, hNext, hDisplay;
+	HDWP hDWP;
 
 	GetClientRect(hwnd, &rc);
-	MoveWindow(GetDlgItem(hwnd, IDC_PRINT), rc.right - BUTTON_WIDTH - BUTTON_POS_X, BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, TRUE);
-	MoveWindow(GetDlgItem(hwnd, IDC_DISPLAY), 0, HEADER_SIZE, rc.right, rc.bottom - HEADER_SIZE, TRUE);
+
+	hDWP = BeginDeferWindowPos(5);
+
+	hInstall = GetDlgItem(hwnd, IDC_INSTALL);
+	if (hDWP)
+		hDWP = DeferWindowPos(hDWP, hInstall, NULL, BUTTON_POS_X, BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, SWP_NOZORDER);
+
+	hPrint = GetDlgItem(hwnd, IDC_PRINT);
+	if (hDWP)
+		hDWP = DeferWindowPos(hDWP, hPrint, NULL, BUTTON_POS_X + BUTTON_WIDTH + BUTTON_PADDING, BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, SWP_NOZORDER);
+
+	hPrev = GetDlgItem(hwnd, IDC_PREV);
+	if (hDWP)
+		hDWP = DeferWindowPos(hDWP, hPrev, NULL, rc.right - (BUTTON_WIDTH * 2 + BUTTON_PADDING + BUTTON_POS_X), BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, SWP_NOZORDER);
+
+	hNext = GetDlgItem(hwnd, IDC_NEXT);
+	if (hDWP)
+		hDWP = DeferWindowPos(hDWP, hNext, NULL, rc.right - (BUTTON_WIDTH + BUTTON_POS_X), BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, SWP_NOZORDER);
+
+	hDisplay = GetDlgItem(hwnd, IDC_DISPLAY);
+	if (hDWP)
+		hDWP = DeferWindowPos(hDWP, hDisplay, NULL, 0, HEADER_SIZE, rc.right, rc.bottom - HEADER_SIZE, SWP_NOZORDER);
+
+	EndDeferWindowPos(hDWP);
+
+	InvalidateRect(hwnd, NULL, TRUE);
 
 	return 0;
 }
@@ -349,6 +437,42 @@ MainWnd_OnInstall(HWND hwnd)
 	return 0;
 }
 
+static LRESULT
+MainWnd_OnPrev(HWND hwnd)
+{
+	HWND hDisplay;
+	if (g_FontIndex > 0)
+	{
+		--g_FontIndex;
+		EnableWindow(GetDlgItem(hwnd, IDC_NEXT), TRUE);
+		if (g_FontIndex == 0)
+			EnableWindow(GetDlgItem(hwnd, IDC_PREV), FALSE);
+
+		hDisplay = GetDlgItem(hwnd, IDC_DISPLAY);
+		SendMessage(hDisplay, FVM_SETTYPEFACE, 0, (LPARAM)&g_LogFonts[g_FontIndex]);
+		InvalidateRect(hDisplay, NULL, TRUE);
+	}
+	return 0;
+}
+
+static LRESULT
+MainWnd_OnNext(HWND hwnd)
+{
+	HWND hDisplay;
+	if (g_FontIndex + 1 < g_NumFonts)
+	{
+		++g_FontIndex;
+		EnableWindow(GetDlgItem(hwnd, IDC_PREV), TRUE);
+		if (g_FontIndex == g_NumFonts - 1)
+			EnableWindow(GetDlgItem(hwnd, IDC_NEXT), FALSE);
+
+		hDisplay = GetDlgItem(hwnd, IDC_DISPLAY);
+		SendMessage(hDisplay, FVM_SETTYPEFACE, 0, (LPARAM)&g_LogFonts[g_FontIndex]);
+		InvalidateRect(hDisplay, NULL, TRUE);
+	}
+	return 0;
+}
+
 LRESULT CALLBACK
 MainWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
@@ -368,11 +492,15 @@ MainWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 			{
 				case IDC_INSTALL:
 					return MainWnd_OnInstall(hwnd);
-					break;
 
 				case IDC_PRINT:
 					return Display_OnPrint(hwnd);
-					break;
+
+				case IDC_PREV:
+					return MainWnd_OnPrev(hwnd);
+
+				case IDC_NEXT:
+					return MainWnd_OnNext(hwnd);
 			}
 			break;
 

reactos/base/applications/fontview/fontview.h

@@ -8,11 +8,16 @@
 #define BUTTON_POS_Y 8
 #define BUTTON_WIDTH 72
 #define BUTTON_HEIGHT 21
+#define BUTTON_PADDING 8
 
 #define IDC_INSTALL 1001
 #define IDC_PRINT 1002
 #define IDC_DISPLAY 1003
+#define IDC_PREV 1004
+#define IDC_NEXT 1005
 
 LRESULT CALLBACK MainWndProc(HWND, UINT, WPARAM, LPARAM);
 
 BOOL LoadFont(LPWSTR lpCmdLine);
+
+extern INT g_FontIndex;

reactos/base/applications/fontview/lang/bg-BG.rc

@@ -2,7 +2,7 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
 BEGIN
-    IDS_INSTALL "Install"
+    IDS_INSTALL "&Install"
     IDS_PRINT "Печат"
     IDS_STRING "Абвгд ежзий клмно прсту фхцчш щъьюя. 1234567890"
     IDS_OPEN "Open Font..."
@@ -10,9 +10,12 @@ BEGIN
     IDS_ERROR_NOMEM "Няма достатъчно място за завършване на действието."
     IDS_ERROR_NOFONT "%1 не е редовен шрифтов файл."
     IDS_ERROR_NOCLASS "Неуспешно изпълнение на класа на прозореца."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 TrueType Font (*.ttf)\0*.ttf\0\
-OpenType Font (*.otf)\0*.otf\0\
-Font File (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 All Files (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

reactos/base/applications/fontview/lang/cs-CZ.rc

@@ -2,17 +2,20 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
 STRINGTABLE
 BEGIN
-    IDS_INSTALL "Nainstalovat"
-    IDS_PRINT "Tisk"
+    IDS_INSTALL "&Nainstalovat"
+    IDS_PRINT "&Tisk"
     IDS_STRING "Příliš žluťoučký kůň úpěl ďábelské ódy. 1234567890"
     IDS_OPEN "Otevřít soubor písma..."
     IDS_ERROR "Chyba"
     IDS_ERROR_NOMEM "K dokončení operace není dostatek paměti."
     IDS_ERROR_NOFONT "Soubor %1 není platným souborem písma."
     IDS_ERROR_NOCLASS "Inicializace okna aplikace selhala."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
-TrueType Font (*.ttf)\0*.ttf\0\
-OpenType Font (*.otf)\0*.otf\0\
-Font File (*.fon)\0*.fon\0\
-All Files (*.*)\0*.*\0"
+    IDS_FILTER_LIST "Podporované soubory písem (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
+Písmo TrueType (*.ttf)\0*.ttf\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+Písmo OpenType (*.otf)\0*.otf\0\
+Písmo Font (*.fon)\0*.fon\0\
+Všechny soubory (*.*)\0*.*\0"
+    IDS_PREVIOUS "< &Previous"
+    IDS_NEXT "&Next >"
 END

reactos/base/applications/fontview/lang/de-DE.rc

@@ -2,17 +2,20 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
 BEGIN
-    IDS_INSTALL "Installieren"
-    IDS_PRINT "Drucken"
+    IDS_INSTALL "&Installieren"
+    IDS_PRINT "&Drucken"
     IDS_STRING "Franz jagt im komplett verwahrlosten Taxi quer durch Bayern. 1234567890"
     IDS_OPEN "Schriftartendatei öffnen..."
     IDS_ERROR "Fehler"
     IDS_ERROR_NOMEM "Es steht nicht genügend Speicher zur Verfügung."
     IDS_ERROR_NOFONT "Die angegebene Datei %1 ist keine gültige Schriftartendatei."
     IDS_ERROR_NOCLASS "Fehler beim Initialisieren der Fensterklasse."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 TrueType Font (*.ttf)\0*.ttf\0\
-OpenType Font (*.otf)\0*.otf\0\
-Font File (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 All Files (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

reactos/base/applications/fontview/lang/en-US.rc

@@ -2,17 +2,20 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 STRINGTABLE
 BEGIN
-    IDS_INSTALL "Install"
-    IDS_PRINT "Print"
+    IDS_INSTALL "&Install"
+    IDS_PRINT "&Print"
     IDS_STRING "Jackdaws love my big sphinx of quartz. 1234567890"
     IDS_OPEN "Open Font..."
     IDS_ERROR "Error"
     IDS_ERROR_NOMEM "There's not enough memory to complete the operation."
     IDS_ERROR_NOFONT "The file %1 is not a valid font file."
     IDS_ERROR_NOCLASS "Could not initialize window class."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 TrueType Font (*.ttf)\0*.ttf\0\
-OpenType Font (*.otf)\0*.otf\0\
-Font File (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 All Files (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

reactos/base/applications/fontview/lang/es-ES.rc

@@ -4,17 +4,20 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 STRINGTABLE
 BEGIN
-    IDS_INSTALL "Instalar"
-    IDS_PRINT "Imprimir"
+    IDS_INSTALL "&Instalar"
+    IDS_PRINT "Im&primir"
     IDS_STRING "Jovencillo emponzoñado de whisky: ¡qué figurota exhibe! 1234567890"
     IDS_OPEN "Abrir fuente..."
     IDS_ERROR "Error"
     IDS_ERROR_NOMEM "No hay memoria suficiente para completar la operación."
     IDS_ERROR_NOFONT "El archivo %1 no es un archivo de fuente válido."
     IDS_ERROR_NOCLASS "No es posible iniciar la clase de ventana."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
-TrueType Font (*.ttf)\0*.ttf\0\
-OpenType Font (*.otf)\0*.otf\0\
-Font File (*.fon)\0*.fon\0\
-All Files (*.*)\0*.*\0"
+    IDS_FILTER_LIST "Todas las tipografías (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
+Tipografía TrueType (*.ttf)\0*.ttf\0\
+Colección de tipografías TrueType (*.ttc)\0*.ttc\0\
+Tipografía OpenType (*.otf;*.otc)\0*.otf;*.otc\0\
+Tipografía de mapa de bits (*.fon;*.fnt)\0*.fon;*.fnt\0\
+Todos los archivos (*.*)\0*.*\0"
+    IDS_PREVIOUS "< Ante&rior"
+    IDS_NEXT "Siguie&nte >"
 END

reactos/base/applications/fontview/lang/fr-FR.rc

@@ -2,17 +2,20 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 STRINGTABLE
 BEGIN
-    IDS_INSTALL "Installer"
-    IDS_PRINT "Imprimer"
+    IDS_INSTALL "&Installer"
+    IDS_PRINT "Im&primer"
     IDS_STRING "Voix ambiguë d'un cœur qui au zéphyr préfère les jattes de kiwis. 1234567890"
     IDS_OPEN "Ouvrir un fichier police..."
     IDS_ERROR "Erreur"
     IDS_ERROR_NOMEM "Mémoire insuffisante pour terminer l'opération."
-    IDS_ERROR_NOFONT "Le fichier %1 n'est pas un fichier police valide."
+    IDS_ERROR_NOFONT "Le fichier %1 n'est pas un fichier de polices valide."
     IDS_ERROR_NOCLASS "Impossible d'initialiser la classe de fenêtre."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "Toutes polices supportées (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 TrueType Font (*.ttf)\0*.ttf\0\
-OpenType Font (*.otf)\0*.otf\0\
-Font File (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
+Fichier de polices (*.fon;*.fnt)\0*.fon;*.fnt\0\
 All Files (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&récédent"
+    IDS_NEXT "Suiva&nt >"
 END

reactos/base/applications/fontview/lang/he-IL.rc

@@ -12,9 +12,12 @@ BEGIN
     IDS_ERROR_NOMEM "אין מספיק זיכרון כדי להשלים את הפעולה."
     IDS_ERROR_NOFONT "הקובץ %1 אינו קובץ גופנים חוקי."
     IDS_ERROR_NOCLASS "Could not initialize window class."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 TrueType Font (*.ttf)\0*.ttf\0\
-OpenType Font (*.otf)\0*.otf\0\
-Font File (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 All Files (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

reactos/base/applications/fontview/lang/it-IT.rc

@@ -2,17 +2,20 @@ LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
 BEGIN
-    IDS_INSTALL "Installa"
-    IDS_PRINT "Stampa"
+    IDS_INSTALL "&Installa"
+    IDS_PRINT "Stam&pa"
     IDS_STRING "Jackdaws love my big sphinx of quartz. 1234567890"
     IDS_OPEN "Apri Font..."
     IDS_ERROR "Errore"
     IDS_ERROR_NOMEM "Memoria insufficiente per completare l'operazione."
     IDS_ERROR_NOFONT "Il file% 1 non è un file di origine valido."
     IDS_ERROR_NOCLASS "Impossibile avviare la classe."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
-TrueType Font (*.ttf)\0*.ttf\0\
-OpenType Font (*.otf)\0*.otf\0\
-Font File (*.fon)\0*.fon\0\
+    IDS_FILTER_LIST "Tutti i font supportati (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
+Font TrueType (*.ttf)\0*.ttf\0\
+Collezione Font TrueType (*.ttc)\0*.ttc\0\
+Font OpenType (*.otf;*.otc)\0*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 All Files (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&recedente"
+    IDS_NEXT "Ava&nti >"
 END

reactos/base/applications/fontview/lang/lt-LT.rc

@@ -4,17 +4,20 @@ LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
 BEGIN
-    IDS_INSTALL "Install"
-    IDS_PRINT "Spausdinti"
+    IDS_INSTALL "&Install"
+    IDS_PRINT "&Spausdinti"
     IDS_STRING "ABCDEFGHIYJKLMNOPQRSTUVWXZ ąčęėįšųūž 1234567890"
     IDS_OPEN "Aatvira šriftas..."
     IDS_ERROR "Klaida"
     IDS_ERROR_NOMEM "Užduočiai užbaigti, nepakanka atminties."
     IDS_ERROR_NOFONT "%1 nėra teisinga šrifto byla."
     IDS_ERROR_NOCLASS "Nepavyko inicijuoti lango klasės."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 TrueType Font (*.ttf)\0*.ttf\0\
-OpenType Font (*.otf)\0*.otf\0\
-Font File (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 All Files (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

reactos/base/applications/fontview/lang/ms-MY.rc

@@ -4,17 +4,20 @@ LANGUAGE LANG_MALAY, SUBLANG_DEFAULT
 
 STRINGTABLE
 BEGIN
-    IDS_INSTALL "Memasang"
-    IDS_PRINT "Mencetak"
+    IDS_INSTALL "&Memasang"
+    IDS_PRINT "M&encetak"
     IDS_STRING "Jackdaws love my big sphinx of quartz. 1234567890"
     IDS_OPEN "Buka fon..."
     IDS_ERROR "Ralat"
     IDS_ERROR_NOMEM "Terdapat tidak cukup ingatan untuk melengkapkan operasi ini."
     IDS_ERROR_NOFONT "Fail %1 bukanlah fail fon yang sah."
     IDS_ERROR_NOCLASS "Tidak dapat mengawalkan kelas tetingkap."
-    IDS_FILTER_LIST "Semuanya disokong fon (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
-Fon TrueType (*.ttf)\0*.ttf\0\
-Fon OpenType (*.otf)\0*.otf\0\
-Fail fon (*.fon)\0*.fon\0\
-Semua fail (*.*)\0*.*\0"
+    IDS_FILTER_LIST "Semuanya disokong fon (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
+TrueType Font (*.ttf)\0*.ttf\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
+All Files (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

reactos/base/applications/fontview/lang/no-NO.rc

@@ -2,17 +2,20 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
 BEGIN
-    IDS_INSTALL "Install"
-    IDS_PRINT "Skriv"
+    IDS_INSTALL "&Install"
+    IDS_PRINT "&Skriv"
     IDS_STRING "Jackdaws love my big sphinx of quartz. 1234567890"
     IDS_OPEN "Open Font..."
     IDS_ERROR "Feil"
     IDS_ERROR_NOMEM "Det er ikke nok minne for å fullføre oppgaven."
     IDS_ERROR_NOFONT "Filen %1 er ikke et gyldig skriftfil."
     IDS_ERROR_NOCLASS "Kunne ikke initialise vindu klassen."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 TrueType Font (*.ttf)\0*.ttf\0\
-OpenType Font (*.otf)\0*.otf\0\
-Font File (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 All Files (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

reactos/base/applications/fontview/lang/pl-PL.rc

@@ -10,17 +10,20 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
 BEGIN
-    IDS_INSTALL "Instaluj"
-    IDS_PRINT "Drukuj"
+    IDS_INSTALL "&Instaluj"
+    IDS_PRINT "&Drukuj"
     IDS_STRING "Zażółć gęślą Jaźń żółwiątkiem. 1234567890. !@#$%^&*()_+=-/?"
     IDS_OPEN "Otwórz czcionkę..."
     IDS_ERROR "Błąd"
     IDS_ERROR_NOMEM "Brakuje pamięci do ukończenia tej operacji."
     IDS_ERROR_NOFONT "Plik %1 nie jest poprawnym plikiem czcionki."
     IDS_ERROR_NOCLASS "Nie udało się zainicjować klasy window."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 TrueType Font (*.ttf)\0*.ttf\0\
-OpenType Font (*.otf)\0*.otf\0\
-Font File (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 All Files (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

reactos/base/applications/fontview/lang/pt-BR.rc

@@ -4,17 +4,20 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
 STRINGTABLE
 BEGIN
-    IDS_INSTALL "Install"
-    IDS_PRINT "Imprimir"
+    IDS_INSTALL "&Install"
+    IDS_PRINT "Im&primir"
     IDS_STRING "Jackdaws ama minha grande esfinge de quartzo. 1234567890"
     IDS_OPEN "Open Font..."
     IDS_ERROR "Erro"
     IDS_ERROR_NOMEM "Não há memória suficiente para completar a operação."
     IDS_ERROR_NOFONT "O arquivo %1 não é um arquivo de fonte válida."
     IDS_ERROR_NOCLASS "Não foi possível inicializar a janela."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 TrueType Font (*.ttf)\0*.ttf\0\
-OpenType Font (*.otf)\0*.otf\0\
-Font File (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 All Files (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

reactos/base/applications/fontview/lang/ro-RO.rc

@@ -12,9 +12,12 @@ BEGIN
     IDS_ERROR_NOMEM "Nu e destulă memorie pentru a încheia operația."
     IDS_ERROR_NOFONT "Fișierul «%1» este un fișier font deteriorat."
     IDS_ERROR_NOCLASS "Clasa de ferestre nu a putut fi inițializată."
-    IDS_FILTER_LIST "Toate fonturile recunoscute (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "Toate fonturile recunoscute (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;.ttc;*.fon;*.otf;*.otc\0\
 Fonturi de tip TrueType (*.ttf)\0*.ttf\0\
-Fonturi de tip OpenType (*.otf)\0*.otf\0\
-Fișiere de tip Font (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+Fonturi de tip OpenType (*.otf;*.otc)\0*.otf;*.otc\0\
+Fișiere de tip Font (*.fon;*.fnt)\0*.fon;*.fnt\0\
 Orice fișier (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

reactos/base/applications/fontview/lang/ru-RU.rc

@@ -12,9 +12,12 @@ BEGIN
     IDS_ERROR_NOMEM "Недостаточно памяти для выполнения операции."
     IDS_ERROR_NOFONT "%1 не является корректным файлом шрифта."
     IDS_ERROR_NOCLASS "Невозможно инициализировать класс окна."
-    IDS_FILTER_LIST "Все поддерживаемые шрифты (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "Все поддерживаемые шрифты (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 TrueType шрифты (*.ttf)\0*.ttf\0\
-OpenType шрифты (*.otf)\0*.otf\0\
-Файлы шрифтов (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType шрифты (*.otf;*.otc)\0*.otf;*.otc\0\
+Файлы шрифтов (*.fon;*.fnt)\0*.fon;*.fnt\0\
 Все файлы (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

reactos/base/applications/fontview/lang/sk-SK.rc

@@ -15,9 +15,12 @@ BEGIN
     IDS_ERROR_NOMEM "Na vykonanie tejto operácie nie je dostatok voľnej pamäte."
     IDS_ERROR_NOFONT "Požadovaný súbor %1 nie je platným súborom písiem."
     IDS_ERROR_NOCLASS "Nepodarilo sa inicializovať triedu window."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 TrueType Font (*.ttf)\0*.ttf\0\
-OpenType Font (*.otf)\0*.otf\0\
-Font File (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 All Files (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

reactos/base/applications/fontview/lang/sq-AL.rc

@@ -6,17 +6,20 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
 BEGIN
-    IDS_INSTALL "Instalo"
-    IDS_PRINT "Printo"
+    IDS_INSTALL "&Instalo"
+    IDS_PRINT "&Printo"
     IDS_STRING "Jackdaws dashuron sphinxin tim të madh  prej kuartzi. 1234567890"
     IDS_OPEN "Hap fontin..."
     IDS_ERROR "Error"
     IDS_ERROR_NOMEM "Nuk ka memorie të mjaftueshme për të përfunduar operacionin."
     IDS_ERROR_NOFONT "Dokumenti %1 nuk është një font i vlefshem."
     IDS_ERROR_NOCLASS "Nuk mund të fillojë dritaren e klases."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 TrueType Font (*.ttf)\0*.ttf\0\
-OpenType Font (*.otf)\0*.otf\0\
-Font File (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 All Files (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

reactos/base/applications/fontview/lang/sv-SE.rc

@@ -9,17 +9,20 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 STRINGTABLE
 BEGIN
-    IDS_INSTALL "Install"
-    IDS_PRINT "Skriv ut"
+    IDS_INSTALL "&Install"
+    IDS_PRINT "&Skriv ut"
     IDS_STRING "Jackdaws love my big sphinx of quartz. 1234567890"
     IDS_OPEN "Open Font..."
     IDS_ERROR "Fel"
     IDS_ERROR_NOMEM "Det er inte nog minne för att slutföre operationen."
     IDS_ERROR_NOFONT "Filen %1 är inte en giltig typsnittsfil."
     IDS_ERROR_NOCLASS "Kunde inte initialisera Windows klassen."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 TrueType Font (*.ttf)\0*.ttf\0\
-OpenType Font (*.otf)\0*.otf\0\
-Font File (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 All Files (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

reactos/base/applications/fontview/lang/tr-TR.rc

@@ -3,17 +3,20 @@
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 STRINGTABLE
 BEGIN
-    IDS_INSTALL "Kur..."
-    IDS_PRINT "Yazdır..."
+    IDS_INSTALL "&Kur..."
+    IDS_PRINT "&Yazdır..."
     IDS_STRING "Küçük karga, benim büyük kuvars sfenksimi seviyor. 1234567890"
     IDS_OPEN "Yazı Tipi Aç..."
     IDS_ERROR "Yanlışlık"
     IDS_ERROR_NOMEM "Bu işlemi bitirmek için yeterli bellek yok."
     IDS_ERROR_NOFONT "%1 kütüğü, geçerli bir yazı tipi kütüğü değil."
     IDS_ERROR_NOCLASS "Pencere sınıfı başlatılamadı."
-    IDS_FILTER_LIST "Tüm Desteklenen Yazı Tipleri (*.ttf, *.fon, *.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "Tüm Desteklenen Yazı Tipleri (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 TrueType Yazı Tipi (*.ttf)\0*.ttf\0\
-OpenType Yazı Tipi (*.otf)\0*.otf\0\
-Yazı Tipi Kütüğü (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType Yazı Tipi (*.otf;*.otc)\0*.otf;*.otc\0\
+Yazı Tipi Kütüğü (*.fon;*.fnt)\0*.fon;*.fnt\0\
 Tüm Kütükler (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

reactos/base/applications/fontview/lang/uk-UA.rc

@@ -10,7 +10,7 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
 BEGIN
-    IDS_INSTALL "Install"
+    IDS_INSTALL "&Install"
     IDS_PRINT "Друк"
     IDS_STRING "Чуєш їх, доцю, га? Кумедна ж ти, прощайся без ґольфів! 1234567890"
     IDS_OPEN "Open Font..."
@@ -18,9 +18,12 @@ BEGIN
     IDS_ERROR_NOMEM "Недостатньо пам'яті для завершення операції."
     IDS_ERROR_NOFONT "Файл %1 не є коректним файлом шрифту."
     IDS_ERROR_NOCLASS "Неможливо ініціалізувати віконний клас."
-    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 TrueType Font (*.ttf)\0*.ttf\0\
-OpenType Font (*.otf)\0*.otf\0\
-Font File (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType Font (*.otf;*.otc)\0*.otf;*.otc\0\
+Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\
 All Files (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

reactos/base/applications/fontview/lang/zh-CN.rc

@@ -18,9 +18,12 @@ BEGIN
     IDS_ERROR_NOMEM "没有足够的内存来完成操作。"
     IDS_ERROR_NOFONT "％1不是一个有效的字体档案。"
     IDS_ERROR_NOCLASS "窗口无法初始化。"
-    IDS_FILTER_LIST "支持所有的字体 (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "支持所有的字体 (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 TrueType 字体 (*.ttf)\0*.ttf\0\
-OpenType 字体 (*.otf)\0*.otf\0\
-字体文件 (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType 字体 (*.otf;*.otc)\0*.otf;*.otc\0\
+字体文件 (*.fon;*.fnt)\0*.fon;*.fnt\0\
 所有文件 (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

reactos/base/applications/fontview/lang/zh-TW.rc

@@ -18,9 +18,12 @@ BEGIN
     IDS_ERROR_NOMEM "沒有足夠的記憶體來完成操作。"
     IDS_ERROR_NOFONT "%1 不是一個有效的字體檔案。"
     IDS_ERROR_NOCLASS "窗口無法初始化。"
-    IDS_FILTER_LIST "所有支援的字體 (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\
+    IDS_FILTER_LIST "所有支援的字體 (*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc)\0*.ttf;*.ttc;*.fon;*.fnt;*.otf;*.otc\0\
 TrueType 字體 (*.ttf)\0*.ttf\0\
-OpenType 字體 (*.otf)\0*.otf\0\
-字體檔 (*.fon)\0*.fon\0\
+TrueType Font Collection (*.ttc)\0*.ttc\0\
+OpenType 字體 (*.otf;*.otc)\0*.otf;*.otc\0\
+字體檔 (*.fon;*.fnt)\0*.fon;*.fnt\0\
 所有檔 (*.*)\0*.*\0"
+    IDS_PREVIOUS "< P&revious"
+    IDS_NEXT "&Next >"
 END

reactos/base/applications/fontview/resource.h

@@ -15,4 +15,7 @@
 #define IDS_CHARSUPPER   701
 #define IDS_SPECIALCHARS 702
 
+#define IDS_PREVIOUS   800
+#define IDS_NEXT       801
+
 #define IDI_TT 800

reactos/base/applications/games/solitaire/lang/cs-CZ.rc

@@ -22,7 +22,7 @@ BEGIN
     AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10
     AUTOCHECKBOX "Zobrazit č&as", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
     AUTOCHECKBOX "Stavový řád&ek", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
-    AUTOCHECKBOX "&Keep Score", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Ponechat skóre", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
     PUSHBUTTON "Storno", IDCANCEL, 101, 97, 50, 14
 END
@@ -57,8 +57,8 @@ BEGIN
     IDS_SOL_QUIT "Ukončit rozehranou hru?"
     IDS_SOL_WIN "Gratulujeme, zvítězili jste!!"
     IDS_SOL_DEAL "Rozdat znova?"
-    IDS_SOL_SCORE "Score: %d"
-    IDS_SOL_TIME "Time: %d"
+    IDS_SOL_SCORE "Skóre: %d"
+    IDS_SOL_TIME "Čas: %d"
 END
 
 /* Menus */

reactos/base/applications/games/spider/lang/cs-CZ.rc

@@ -0,0 +1,73 @@
+LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
+
+/* Dialogs */
+
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
+CAPTION "Zvolte rub karet"
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
+BEGIN
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Storno", IDCANCEL, 176, 165, 54, 14
+END
+
+IDD_DIFFICULTY DIALOGEX 100, 100, 106, 80
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
+CAPTION "Obtížnost"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    AUTORADIOBUTTON "Lehká: &Jedna barva", IDC_DIF_ONECOLOR, 8, 10, 80, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "Střední: &Dvě barvy", IDC_DIF_TWOCOLORS, 8, 23, 80, 10
+    AUTORADIOBUTTON "Težká: Č&tyři barvy", IDC_DIF_FOURCOLORS, 8, 36, 80, 10
+    DEFPUSHBUTTON "OK", IDOK, 8, 58, 40, 14
+    PUSHBUTTON "Storno", IDCANCEL, 58, 58, 40, 14
+END
+
+/* Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_SPI_NAME "Spider"
+    IDS_SPI_ABOUT "Spider Solitaire vytvořil Gregor Schneider\n\nCardLib verze 1.0"
+    IDS_SPI_QUIT "Ukončit hru?"
+    IDS_SPI_WIN "Gratulace k výhře!"
+    IDS_SPI_DEAL "Rozdat znovu?"
+END
+
+/* Menus */
+
+IDR_MENU1 MENU
+BEGIN
+    POPUP "&Hra"
+    BEGIN
+        MENUITEM "&Nová hra\tF2", IDM_GAME_NEW
+        MENUITEM SEPARATOR
+        MENUITEM "&Balíček...", IDM_GAME_DECK
+        MENUITEM SEPARATOR
+        MENUITEM "&Konec", IDM_GAME_EXIT
+    END
+    POPUP "&Nápověda"
+    BEGIN
+        MENUITEM "&Obsah\tF1", IDM_HELP_CONTENTS
+        MENUITEM "&O programu", IDM_HELP_ABOUT
+    END
+END
+
+/* Accelerator */
+IDR_ACCELERATOR1 ACCELERATORS
+BEGIN
+    VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT
+    VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT
+END

reactos/base/applications/games/spider/rsrc.rc

@@ -15,6 +15,9 @@ IDI_SPIDER ICON "spider.ico"
 #ifdef LANGUAGE_BG_BG
     #include "lang/bg-BG.rc"
 #endif
+#ifdef LANGUAGE_CS_CZ
+    #include "lang/cs-CZ.rc"
+#endif
 #ifdef LANGUAGE_DE_DE
     #include "lang/de-DE.rc"
 #endif

reactos/base/applications/games/spider/spider.cpp

@@ -163,7 +163,10 @@ CardImageWndProc(HWND hwnd,
                                                       GWL_USERDATA);
     static WNDPROC hOldProc = NULL;
 
-    if (!hOldProc && pCardBack)
+    if(!pCardBack)
+        return FALSE;
+
+    if (!hOldProc)
         hOldProc = pCardBack->hOldProc;
 
     switch (msg)
@@ -246,9 +249,10 @@ INT_PTR CALLBACK CardBackDlgProc(HWND hDlg,
         INT i, c;
         SIZE_T size = sizeof(CARDBACK) * NUM_CARDBACKS;
 
-        pCardBacks = (PCARDBACK)HeapAlloc(GetProcessHeap(),
-                                          0,
-                                          size);
+        pCardBacks = (PCARDBACK)HeapAlloc(GetProcessHeap(), 0, size);
+
+        if(!pCardBacks)
+            return FALSE;
 
         for (i = 0, c = CARDBACK_START; c <= CARDBACK_END; i++, c++)
         {

reactos/base/applications/kbswitch/kbswitch.c

@@ -492,6 +492,8 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
 
                     if (!ShellExecuteEx(&shInputDll))
                         MessageBox(hwnd, _T("Can't start input.dll"), NULL, MB_OK | MB_ICONERROR);
+
+                    return 0;
                 }
 
                 default:

reactos/base/applications/magnify/lang/cs-CZ.rc

@@ -0,0 +1,71 @@
+LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
+
+IDC_MAGNIFIER MENU
+BEGIN
+    POPUP "&Soubor"
+    BEGIN
+        MENUITEM "&Ukončit", IDM_EXIT
+        MENUITEM "&Možnosti", IDM_OPTIONS
+        MENUITEM SEPARATOR
+        MENUITEM "&O programu", IDM_ABOUT
+    END
+END
+
+IDC_MAGNIFIER ACCELERATORS
+BEGIN
+    "?", IDM_ABOUT, ASCII, ALT
+    "/", IDM_ABOUT, ASCII, ALT
+END
+
+IDD_ABOUTBOX DIALOGEX 22, 17, 220, 75
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_CAPTION | WS_SYSMENU
+CAPTION "O programu"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    ICON IDI_ICON, IDC_MYICON, 14, 9, 20, 20
+    LTEXT "Lupa verze 1.0", IDC_STATIC, 49, 10, 119, 8, SS_NOPREFIX
+    LTEXT "Copyright (C) 2007 Marc Piulachs (marc.piulachs@codexchange.net)", IDC_STATIC, 48, 24, 125, 22
+    PUSHBUTTON "OK", IDOK, 162, 48, 50, 14
+END
+
+IDD_DIALOGOPTIONS DIALOGEX 0, 0, 153, 182
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Nastavení Lupy"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    DEFPUSHBUTTON "OK", IDOK, 96, 161, 50, 14
+    PUSHBUTTON "&Nápověda", IDC_BUTTON_HELP, 38, 161, 50, 14
+    LTEXT "Úrověň &zvětšení:", IDC_STATIC, 6, 8, 68, 8
+    COMBOBOX IDC_ZOOM, 72, 6, 63, 66, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX "Sledování", IDC_STATIC, 7, 25, 139, 59
+    GROUPBOX "Zobrazení", IDC_STATIC, 7, 87, 139, 57
+    CONTROL "Sledovat &myš", IDC_FOLLOWMOUSECHECK, "Button",
+            BS_AUTOCHECKBOX | WS_TABSTOP, 18, 42, 114, 10
+    CONTROL "Sledovat &klávesnici", IDC_FOLLOWKEYBOARDCHECK, "Button",
+            BS_AUTOCHECKBOX | WS_TABSTOP, 18, 54, 114, 10
+    CONTROL "Sledovat ú&pravu textu", IDC_FOLLOWTEXTEDITINGCHECK, "Button",
+            BS_AUTOCHECKBOX | WS_TABSTOP, 18, 66, 114, 10
+    CONTROL "&Invertovat barvy", IDC_INVERTCOLORSCHECK, "Button",
+            BS_AUTOCHECKBOX | WS_TABSTOP, 18, 102, 114, 10
+    CONTROL "&Spustit minimalizované", IDC_STARTMINIMIZEDCHECK, "Button",
+            BS_AUTOCHECKBOX | WS_TABSTOP, 18, 114, 114, 10
+    CONTROL "&Zobrazit lupu", IDC_SHOWMAGNIFIERCHECK, "Button",
+            BS_AUTOCHECKBOX | WS_TABSTOP, 18, 126, 114, 10
+END
+
+IDD_WARNINGDIALOG DIALOGEX 0, 0, 250, 97
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
+CAPTION "ReactOS Lupa"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    DEFPUSHBUTTON "OK", IDOK, 193, 76, 50, 14
+    ICON IDI_ICON, IDC_STATIC, 7, 17, 20, 20
+    LTEXT "Program Lupa poskytuje základní funkčnost pro lehce zrakově postižené. Většina uživatelů s poškozeným zrakem bude pro každodenní použití potřebovat program s více funkcemi.", IDC_STATIC, 36, 7, 207, 33
+    CONTROL "Tuto zprávu již nezobrazovat", IDC_SHOWWARNINGCHECK, "Button",
+            BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10
+END
+
+STRINGTABLE
+BEGIN
+    IDS_APP_TITLE "Lupa"
+END

reactos/base/applications/magnify/magnify.rc

@@ -21,6 +21,9 @@ IDI_ICON ICON "res/magnify.ico"
 #ifdef LANGUAGE_BG_BG
     #include "lang/bg-BG.rc"
 #endif
+#ifdef LANGUAGE_CS_CZ
+    #include "lang/cs-CZ.rc"
+#endif
 #ifdef LANGUAGE_DE_DE
     #include "lang/de-DE.rc"
 #endif

reactos/base/applications/mmc/lang/cs-CZ.rc

@@ -9,7 +9,7 @@ IDM_CONSOLE_SMALL MENU
 BEGIN
     POPUP "&Soubor"
     BEGIN
-        MENUITEM "New\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Nový\tCtrl+N", IDM_FILE_NEW
         MENUITEM "&Otevřít...\tCtrl+O", IDM_FILE_OPEN
         MENUITEM SEPARATOR
         MENUITEM "Uk&ončit\tAlt+F4", IDM_FILE_EXIT
@@ -24,16 +24,16 @@ IDM_CONSOLE_LARGE MENU
 BEGIN
     POPUP "&Soubor"
     BEGIN
-        MENUITEM "New\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "Nový\tCtrl+N", IDM_FILE_NEW
         MENUITEM "&Otevřít...\tCtrl+O", IDM_FILE_OPEN
         MENUITEM "&Uložiť", IDM_FILE_SAVE
         MENUITEM "Uložit j&ako...", IDM_FILE_SAVEAS
         MENUITEM SEPARATOR
         MENUITEM "Uk&ončit\tAlt+F4", IDM_FILE_EXIT
     END
-    POPUP "&Windows"
+    POPUP "&Okna"
     BEGIN
-        MENUITEM "List", IDM_WINDOWS_LIST
+        MENUITEM "Seznam", IDM_WINDOWS_LIST
     END
     POPUP "&Nápověda"
     BEGIN

reactos/base/applications/mplay32/lang/cs-CZ.rc

@@ -49,14 +49,14 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_MODE_UNKNOWN "Unknown"
-    IDS_MODE_OPEN "Opened"
-    IDS_MODE_STOP "Stopped"
-    IDS_MODE_PLAY "Playing"
-    IDS_MODE_PAUSE "Paused"
-    IDS_MODE_RECORD "Recording"
-    IDS_MODE_SEEK "Seeking"
-    IDS_MODE_NOT_READY "Not ready"
+    IDS_MODE_UNKNOWN "Neznámý"
+    IDS_MODE_OPEN "Otevřeno"
+    IDS_MODE_STOP "Zastaveno"
+    IDS_MODE_PLAY "Přehrávání"
+    IDS_MODE_PAUSE "Pozastaveno"
+    IDS_MODE_RECORD "Záznam"
+    IDS_MODE_SEEK "Hledám"
+    IDS_MODE_NOT_READY "Nepřipraveno"
     IDS_ALL_TYPES_FILTER "Všechny podporované"
     IDS_TOOLTIP_PLAY "Přehrát"
     IDS_TOOLTIP_STOP "Zastavit"
@@ -65,7 +65,7 @@ BEGIN
     IDS_TOOLTIP_SEEKBACK "Posunout zpět"
     IDS_TOOLTIP_SEEKFORW "Posunout vpřed"
     IDS_TOOLTIP_FORWARD "Přeskočit vpřed"
-    IDS_TOOLTIP_PAUSE "Pause"
+    IDS_TOOLTIP_PAUSE "Pozastavit"
     IDS_APPTITLE "ReactOS Přehrávač multimédií"
     IDS_PLAY "Přehrát"
     IDS_DEFAULTMCIERRMSG "Pro tuto chybu není dostupný žádný popis."

reactos/base/applications/mscutils/devmgmt/about.c

@@ -1,7 +1,7 @@
 /*
  * PROJECT:     ReactOS Device Managment
  * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/mscutils/devmgmt/about.c
+ * FILE:        base/system/devmgmt/about.c
  * PURPOSE:     About dialog box message handler
  * COPYRIGHT:   Copyright 2006 Ged Murphy <gedmurphy@gmail.com>
  *

reactos/base/applications/mscutils/devmgmt/enumdevices.c

@@ -1,7 +1,7 @@
 /*
  * PROJECT:     ReactOS Device Managment
  * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/mscutils/devmgmt/enumdevices.c
+ * FILE:        base/system/devmgmt/enumdevices.c
  * PURPOSE:     Enumerates all devices on the local machine
  * COPYRIGHT:   Copyright 2006 Ged Murphy <gedmurphy@gmail.com>
  *
@@ -9,13 +9,10 @@
 
 #include "precomp.h"
 
-#include <cfgmgr32.h>
-#include <dll/devmgr/devmgr.h>
-#include <initguid.h>
-#include <devguid.h>
-
 static SP_CLASSIMAGELIST_DATA ImageListData;
+static HDEVINFO hDevInfo;
 
+DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
 
 VOID
 FreeDeviceStrings(HWND hTreeView)
@@ -94,6 +91,7 @@ OpenPropSheet(HWND hTreeView,
                             DPF_EXTENDED,
                             FALSE);
     }
+
 }
 
 
@@ -103,7 +101,7 @@ InsertIntoTreeView(HWND hTreeView,
                    LPTSTR lpLabel,
                    LPTSTR DeviceID,
                    INT DevImage,
-                   UINT OverlayImage)
+                   LONG DevProb)
 {
     TV_ITEM tvi;
     TV_INSERTSTRUCT tvins;
@@ -118,11 +116,15 @@ InsertIntoTreeView(HWND hTreeView,
     tvi.iImage = DevImage;
     tvi.iSelectedImage = DevImage;
 
-    if (OverlayImage != 0)
+    if (DevProb != 0)
     {
-        tvi.mask |= TVIF_STATE;
         tvi.stateMask = TVIS_OVERLAYMASK;
-        tvi.state = INDEXTOOVERLAYMASK(OverlayImage);
+
+        if (DevProb == CM_PROB_DISABLED)
+        {
+            /* FIXME: set the overlay icon */
+        }
+
     }
 
     tvins.item = tvi;
@@ -132,175 +134,142 @@ InsertIntoTreeView(HWND hTreeView,
 }
 
 
-static
-ULONG
-GetClassCount(VOID)
+static INT
+EnumDeviceClasses(INT ClassIndex,
+                  BOOL ShowHidden,
+                  LPTSTR DevClassName,
+                  LPTSTR DevClassDesc,
+                  BOOL *DevPresent,
+                  INT *ClassImage,
+                  BOOL *IsUnknown,
+                  BOOL *IsHidden)
 {
-    ULONG ulClassIndex;
     GUID ClassGuid;
-    CONFIGRET cr;
+    HKEY KeyClass;
+    TCHAR ClassName[MAX_CLASS_NAME_LEN];
+    DWORD RequiredSize = MAX_CLASS_NAME_LEN;
+    UINT Ret;
 
-    for (ulClassIndex = 0; ; ulClassIndex++)
-    {
-        cr = CM_Enumerate_Classes(ulClassIndex,
+    *DevPresent = FALSE;
+    *DevClassName = _T('\0');
+    *IsHidden = FALSE;
+
+    Ret = CM_Enumerate_Classes(ClassIndex,
                                &ClassGuid,
                                0);
-        if (cr == CR_NO_SUCH_VALUE)
-            return ulClassIndex;
-    }
-}
-
-
-static
-PDEVCLASS_ENTRY
-GetClassFromClassGuid(
-    PDEVCLASS_ENTRY pClassArray,
-    ULONG ulClassCount,
-    GUID *pGuid)
-{
-    PDEVCLASS_ENTRY pClass, pUnknownClass = NULL;
-    ULONG i;
-
-    for (i = 0; i < ulClassCount; i++)
+    if (Ret != CR_SUCCESS)
     {
-        pClass = &pClassArray[i];
-
-        if (IsEqualGUID(&pClass->ClassGuid, &GUID_DEVCLASS_UNKNOWN))
-            pUnknownClass = pClass;
-
-        if (IsEqualGUID(&pClass->ClassGuid, pGuid))
-            return pClass;
+        /* all classes enumerated */
+        if(Ret == CR_NO_SUCH_VALUE)
+        {
+            return -1;
         }
 
-    return pUnknownClass;
-}
-
-
-static
-VOID
-EnumDeviceClasses(
-    HWND hTreeView,
-    HTREEITEM hRoot,
-    PDEVCLASS_ENTRY pClassArray,
-    ULONG ClassCount)
-{
-    WCHAR ClassName[MAX_DEV_LEN];
-    WCHAR ClassDesc[MAX_DEV_LEN];
-    PDEVCLASS_ENTRY pClass;
-    ULONG ClassIndex;
-    DWORD dwSize;
-    LONG lSize;
-    HKEY hKey;
-    CONFIGRET cr;
-
-    for (ClassIndex = 0; ClassIndex < ClassCount; ClassIndex++)
+        if (Ret == CR_INVALID_DATA)
         {
-        pClass = &pClassArray[ClassIndex];
+            ; /*FIXME: what should we do here? */
+        }
 
-        cr = CM_Enumerate_Classes(ClassIndex,
-                                  &pClass->ClassGuid,
-                                  0);
-        if (cr == CR_NO_SUCH_VALUE)
-            return;
+        /* handle other errors... */
+    }
 
-        dwSize = MAX_CLASS_NAME_LEN;
-        if (!SetupDiClassNameFromGuid(&pClass->ClassGuid,
+    /* This case is special because these devices don't show up with normal class enumeration */
+    *IsUnknown = IsEqualGUID(&ClassGuid, &GUID_DEVCLASS_UNKNOWN);
+
+    if (ShowHidden == FALSE &&
+        (IsEqualGUID(&ClassGuid, &GUID_DEVCLASS_LEGACYDRIVER) ||
+         IsEqualGUID(&ClassGuid, &GUID_DEVCLASS_VOLUME)))
+        *IsHidden = TRUE;
+
+    if (SetupDiClassNameFromGuid(&ClassGuid,
                                  ClassName,
-                                      dwSize,
-                                      &dwSize))
+                                 RequiredSize,
+                                 &RequiredSize))
     {
-            ClassName[0] = _T('\0');
+        lstrcpy(DevClassName, ClassName);
     }
 
     if (!SetupDiGetClassImageIndex(&ImageListData,
-                                       &pClass->ClassGuid,
-                                       &pClass->ClassImage))
+                                   &ClassGuid,
+                                   ClassImage))
     {
         /* FIXME: can we do this?
          * Set the blank icon: IDI_SETUPAPI_BLANK = 41
          * it'll be image 24 in the imagelist */
-            pClass->ClassImage = 24;
+        *ClassImage = 24;
     }
 
-        hKey = SetupDiOpenClassRegKeyEx(&pClass->ClassGuid,
+    /* Get device info for all devices of a particular class */
+    hDevInfo = SetupDiGetClassDevs(*IsUnknown ? NULL : &ClassGuid,
+                                   NULL,
+                                   NULL,
+                                   DIGCF_PRESENT | (*IsUnknown ? DIGCF_ALLCLASSES : 0));
+    if (hDevInfo == INVALID_HANDLE_VALUE)
+    {
+        return 0;
+    }
+
+    KeyClass = SetupDiOpenClassRegKeyEx(&ClassGuid,
                                         MAXIMUM_ALLOWED,
                                         DIOCR_INSTALLER,
                                         NULL,
                                         0);
-        if (hKey != INVALID_HANDLE_VALUE)
+    if (KeyClass != INVALID_HANDLE_VALUE)
     {
-            lSize = MAX_DEV_LEN;
-            if (RegQueryValue(hKey,
+
+        LONG dwSize = MAX_DEV_LEN;
+
+        if (RegQueryValue(KeyClass,
                           NULL,
-                              ClassDesc,
-                              &lSize) != ERROR_SUCCESS)
+                          DevClassDesc,
+                          &dwSize) != ERROR_SUCCESS)
         {
-                ClassDesc[0] = _T('\0');
+            *DevClassDesc = _T('\0');
+        }
+    }
+    else
+    {
+        return 0;
     }
 
-            RegCloseKey(hKey);
-        }
+    *DevPresent = TRUE;
 
-        pClass->hItem = InsertIntoTreeView(hTreeView,
-                                           hRoot,
-                                           (ClassDesc[0] != _T('\0')) ? ClassDesc : ClassName,
-                                           NULL,
-                                           pClass->ClassImage,
-                                           0);
-    }
+    RegCloseKey(KeyClass);
+
+    return 0;
 }
 
 
-static
-VOID
-EnumDevices(
-    HWND hTreeView,
-    PDEVCLASS_ENTRY pClassArray,
-    ULONG ulClassCount,
-    BOOL bShowHidden)
+static LONG
+EnumDevices(INT index,
+            LPTSTR DeviceClassName,
+            LPTSTR DeviceName,
+            LPTSTR *DeviceID)
 {
-    HDEVINFO hDevInfo =  INVALID_HANDLE_VALUE;
     SP_DEVINFO_DATA DeviceInfoData;
-    ULONG Status, Problem;
-    DWORD DevIdSize;
-    TCHAR DeviceName[MAX_DEV_LEN];
-    DWORD DevIndex;
-    LPTSTR InstanceId;
-    PDEVCLASS_ENTRY pClass;
-    UINT OverlayImage;
     CONFIGRET cr;
+    ULONG Status, ProblemNumber;
+    DWORD DevIdSize;
 
+    *DeviceName = _T('\0');
+    *DeviceID = NULL;
 
-    /* Get device info for all devices of a particular class */
-    hDevInfo = SetupDiGetClassDevs(NULL,
-                                   NULL,
-                                   NULL,
-                                   DIGCF_PRESENT | DIGCF_ALLCLASSES);
-    if (hDevInfo == INVALID_HANDLE_VALUE)
-        return;
-
-    for (DevIndex = 0; ; DevIndex++)
-    {
     ZeroMemory(&DeviceInfoData, sizeof(SP_DEVINFO_DATA));
     DeviceInfoData.cbSize = sizeof(SP_DEVINFO_DATA);
 
-        InstanceId = NULL;
-        DeviceName[0] = _T('\0');
-        OverlayImage = 0;
-
     if (!SetupDiEnumDeviceInfo(hDevInfo,
-                                   DevIndex,
+                               index,
                                &DeviceInfoData))
-            break;
+    {
+        /* no such device */
+        return -1;
+    }
 
-        if (bShowHidden == FALSE &&
-            (IsEqualGUID(&DeviceInfoData.ClassGuid, &GUID_DEVCLASS_LEGACYDRIVER) ||
-             IsEqualGUID(&DeviceInfoData.ClassGuid, &GUID_DEVCLASS_VOLUME)))
-            continue;
-
-        pClass = GetClassFromClassGuid(pClassArray,
-                                       ulClassCount,
-                                       &DeviceInfoData.ClassGuid);
+    if (DeviceClassName == NULL && !IsEqualGUID(&DeviceInfoData.ClassGuid, &GUID_NULL))
+    {
+        /* we're looking for unknown devices and this isn't one */
+        return -2;
+    }
 
     /* get the device ID */
     if (!SetupDiGetDeviceInstanceId(hDevInfo,
@@ -311,38 +280,37 @@ EnumDevices(
     {
         if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
         {
-                InstanceId = (LPTSTR)HeapAlloc(GetProcessHeap(),
+            (*DeviceID) = (LPTSTR)HeapAlloc(GetProcessHeap(),
                                             0,
                                             DevIdSize * sizeof(TCHAR));
-                if (InstanceId != NULL)
+            if (*DeviceID)
             {
                 if (!SetupDiGetDeviceInstanceId(hDevInfo,
                                                 &DeviceInfoData,
-                                                    InstanceId,
+                                                *DeviceID,
                                                 DevIdSize,
                                                 NULL))
                 {
                     HeapFree(GetProcessHeap(),
                              0,
-                                 InstanceId);
-                        InstanceId = NULL;
+                             *DeviceID);
+                    *DeviceID = NULL;
                 }
             }
         }
     }
 
-        /* Skip the root device */
-        if (InstanceId != NULL &&
-            _tcscmp(InstanceId, _T("HTREE\\ROOT\\0")) == 0)
+    if (DeviceID != NULL &&
+        _tcscmp(*DeviceID, _T("HTREE\\ROOT\\0")) == 0)
     {
         HeapFree(GetProcessHeap(),
                  0,
-                     InstanceId);
-            InstanceId = NULL;
-            continue;
+                 *DeviceID);
+        *DeviceID = NULL;
+        return -1;
     }
 
-        /* Get the device's friendly name */
+    /* get the device's friendly name */
     if (!SetupDiGetDeviceRegistryProperty(hDevInfo,
                                           &DeviceInfoData,
                                           SPDRP_FRIENDLYNAME,
@@ -351,7 +319,7 @@ EnumDevices(
                                           MAX_DEV_LEN,
                                           NULL))
     {
-            /* If the friendly name fails, try the description instead */
+        /* if the friendly name fails, try the description instead */
         SetupDiGetDeviceRegistryProperty(hDevInfo,
                                          &DeviceInfoData,
                                          SPDRP_DEVICEDESC,
@@ -362,65 +330,16 @@ EnumDevices(
     }
 
     cr = CM_Get_DevNode_Status_Ex(&Status,
-                                      &Problem,
+                                  &ProblemNumber,
                                   DeviceInfoData.DevInst,
                                   0,
                                   NULL);
-        if ((cr == CR_SUCCESS) &&
-            (Status & DN_HAS_PROBLEM))
+    if (cr == CR_SUCCESS && (Status & DN_HAS_PROBLEM))
     {
-            if (Problem == CM_PROB_DISABLED ||
-                Problem == CM_PROB_HARDWARE_DISABLED)
-                OverlayImage = 2;
-            else
-                OverlayImage = 1;
+        return ProblemNumber;
     }
 
-        InsertIntoTreeView(hTreeView,
-                           pClass->hItem,
-                           DeviceName,
-                           InstanceId,
-                           pClass->ClassImage,
-                           OverlayImage);
-
-        if (OverlayImage != 0)
-        {
-             /* Expand the class if the device has a problem */
-             (void)TreeView_Expand(hTreeView,
-                                   pClass->hItem,
-                                   TVE_EXPAND);
-        }
-
-        pClass->bUsed = TRUE;
-    }
-
-    if (hDevInfo !=  INVALID_HANDLE_VALUE)
-        SetupDiDestroyDeviceInfoList(hDevInfo);
-}
-
-
-static
-VOID
-CleanupDeviceClasses(
-    HWND hTreeView,
-    PDEVCLASS_ENTRY pClassArray,
-    ULONG ulClassCount)
-{
-    PDEVCLASS_ENTRY pClass;
-    ULONG i;
-
-    for (i = 0; i < ulClassCount; i++)
-    {
-        pClass = &pClassArray[i];
-
-        if (pClass->bUsed == FALSE)
-            (void)TreeView_DeleteItem(hTreeView,
-                                      pClass->hItem);
-        else
-            (void)TreeView_SortChildren(hTreeView,
-                                        pClass->hItem,
-                                        0);
-    }
+    return 0;
 }
 
 
@@ -429,33 +348,105 @@ ListDevicesByType(HWND hTreeView,
                   HTREEITEM hRoot,
                   BOOL bShowHidden)
 {
-    PDEVCLASS_ENTRY pClassArray;
-    ULONG ulClassCount;
+    HTREEITEM hDevItem;
+    TCHAR DevName[MAX_DEV_LEN];
+    TCHAR DevDesc[MAX_DEV_LEN];
+    LPTSTR DeviceID = NULL;
+    BOOL DevExist = FALSE;
+    INT ClassRet;
+    INT index = 0;
+    INT DevImage;
+    BOOL IsUnknown = FALSE;
+    BOOL IsHidden = FALSE;
 
-    ulClassCount = GetClassCount();
+    do
+    {
+        ClassRet = EnumDeviceClasses(index,
+                                     bShowHidden,
+                                     DevName,
+                                     DevDesc,
+                                     &DevExist,
+                                     &DevImage,
+                                     &IsUnknown,
+                                     &IsHidden);
 
-    pClassArray = HeapAlloc(GetProcessHeap(),
-                            HEAP_ZERO_MEMORY,
-                            ulClassCount * sizeof(DEVCLASS_ENTRY));
-    if (pClassArray == NULL)
-        return;
+        if ((ClassRet != -1) && (DevExist) && !IsHidden)
+        {
+            TCHAR DeviceName[MAX_DEV_LEN];
+            INT DevIndex = 0;
+            LONG Ret;
 
-    EnumDeviceClasses(hTreeView,
+            if (DevDesc[0] != _T('\0'))
+            {
+                hDevItem = InsertIntoTreeView(hTreeView,
                                               hRoot,
-                      pClassArray,
-                      ulClassCount);
+                                              DevDesc,
+                                              NULL,
+                                              DevImage,
+                                              0);
+            }
+            else
+            {
+                hDevItem = InsertIntoTreeView(hTreeView,
+                                              hRoot,
+                                              DevName,
+                                              NULL,
+                                              DevImage,
+                                              0);
+            }
 
-    EnumDevices(hTreeView,
-                pClassArray,
-                ulClassCount,
-                bShowHidden);
+            do
+            {
+                Ret = EnumDevices(DevIndex,
+                                  IsUnknown ? NULL : DevName,
+                                  DeviceName,
+                                  &DeviceID);
+                if (Ret >= 0)
+                {
+                    InsertIntoTreeView(hTreeView,
+                                       hDevItem,
+                                       DeviceName,
+                                       DeviceID,
+                                       DevImage,
+                                       Ret);
+                    if (Ret != 0)
+                    {
+                        /* Expand the class if the device has a problem */
+                        (void)TreeView_Expand(hTreeView,
+                                              hDevItem,
+                                              TVE_EXPAND);
+                    }
+                }
 
-    CleanupDeviceClasses(hTreeView,
-                         pClassArray,
-                         ulClassCount);
+                DevIndex++;
 
-    if (pClassArray != NULL)
-        HeapFree(GetProcessHeap(), 0, pClassArray);
+            } while (Ret != -1);
+
+            /* kill InfoList initialized in EnumDeviceClasses */
+            if (hDevInfo)
+            {
+                SetupDiDestroyDeviceInfoList(hDevInfo);
+                hDevInfo = NULL;
+            }
+
+            /* don't insert classes with no devices */
+            if (!TreeView_GetChild(hTreeView,
+                                   hDevItem))
+            {
+                (void)TreeView_DeleteItem(hTreeView,
+                                          hDevItem);
+            }
+            else
+            {
+                (void)TreeView_SortChildren(hTreeView,
+                                            hDevItem,
+                                            0);
+            }
+        }
+
+        index++;
+
+    } while (ClassRet != -1);
 
     (void)TreeView_Expand(hTreeView,
                           hRoot,
@@ -651,16 +642,26 @@ HTREEITEM
 InitTreeView(HWND hTreeView)
 {
     HTREEITEM hRoot;
+    HBITMAP hComp;
     TCHAR ComputerName[MAX_PATH];
     DWORD dwSize = MAX_PATH;
     INT RootImage;
 
     (void)TreeView_DeleteAllItems(hTreeView);
 
-    /* Get the device image list */
+    /* get the device image List */
     ImageListData.cbSize = sizeof(ImageListData);
     SetupDiGetClassImageList(&ImageListData);
 
+    hComp = LoadBitmap(hInstance,
+                       MAKEINTRESOURCE(IDB_ROOT_IMAGE));
+
+    ImageList_Add(ImageListData.ImageList,
+                  hComp,
+                  NULL);
+
+    DeleteObject(hComp);
+
     (void)TreeView_SetImageList(hTreeView,
                                 ImageListData.ImageList,
                                 TVSIL_NORMAL);
@@ -671,12 +672,9 @@ InitTreeView(HWND hTreeView)
         ComputerName[0] = _T('\0');
     }
 
-    /* Get the image index of the computer class */
-    SetupDiGetClassImageIndex(&ImageListData,
-                              &GUID_DEVCLASS_COMPUTER,
-                              &RootImage);
+    RootImage = ImageList_GetImageCount(ImageListData.ImageList) - 1;
 
-    /* Insert the root item into the tree */
+    /* insert the root item into the tree */
     hRoot = InsertIntoTreeView(hTreeView,
                                NULL,
                                ComputerName,

reactos/base/applications/mscutils/devmgmt/lang/bg-BG.rc

@@ -1,4 +1,4 @@
-LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
+LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
 IDR_MAINMENU MENU
 BEGIN
@@ -40,23 +40,23 @@ BEGIN
   END
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
+IDD_ABOUTBOX DIALOGEX 22,16,190,182
 CAPTION "За управителя на устройствата"
-FONT 8, "MS Shell Dlg", 0, 0
+FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
-    LTEXT "Device Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 30
+  LTEXT "Device Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 26
   PUSHBUTTON "Close", IDOK, 75, 162, 44, 15
   ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30
   EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_TOOLTIP_PROP      "Свойства"
   IDS_TOOLTIP_REFRESH   "Опресняване"
@@ -65,7 +65,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_APPNAME "Управител на устройствата на РеактОС"
   IDS_HINT_BLANK        " "
@@ -74,6 +74,7 @@ BEGIN
   IDS_HINT_PROP         " Отваря лист за свойства за текущия избор."
   IDS_HINT_HELP         " Показва помощен прозорец."
   IDS_HINT_ABOUT        " За управителя на устрйствата на РеактОС."
+
   IDS_HINT_SYS_RESTORE  " Възстановява прозореца до обичайния му рамер."
   IDS_HINT_SYS_MOVE     " Премества прозореца."
   IDS_HINT_SYS_SIZE     " Преоразмерява прозореца."

reactos/base/applications/mscutils/devmgmt/lang/cs-CZ.rc

@@ -1,4 +1,4 @@
-LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
+LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
 IDR_MAINMENU MENU
 BEGIN
@@ -21,7 +21,7 @@ BEGIN
     MENUITEM "Prostředky podle typu",      IDC_RESBYTYPE, GRAYED
     MENUITEM "Prostředky podle připojení", IDC_RESBYCONN, GRAYED
     MENUITEM SEPARATOR
-        MENUITEM "Zobrazit skrytá zařízení", IDC_SHOWHIDDEN
+    MENUITEM "Show hidden devices",        IDC_SHOWHIDDEN
   END
   POPUP "Nápověda"
   BEGIN
@@ -40,9 +40,9 @@ BEGIN
   END
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
+IDD_ABOUTBOX DIALOGEX 22,16,190,182
 CAPTION "O Správci zařízení"
-FONT 8, "MS Shell Dlg", 0, 0
+FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
   LTEXT "Správce zařízení v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 30
@@ -51,12 +51,12 @@ BEGIN
   EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_TOOLTIP_PROP      "Vlastnosti"
   IDS_TOOLTIP_REFRESH   "Obnovit"
@@ -65,7 +65,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_APPNAME "ReactOS Správce zařízení"
   IDS_HINT_BLANK        " "
@@ -74,6 +74,7 @@ BEGIN
   IDS_HINT_PROP         " Zobrazit kartu vlastností pro vybranou položku."
   IDS_HINT_HELP         " Zobrazit nápovědu."
   IDS_HINT_ABOUT        " O ReactOS Správci zařízení."
+
   IDS_HINT_SYS_RESTORE  " Obnoví normální velikost okna."
   IDS_HINT_SYS_MOVE     " Přesune okno."
   IDS_HINT_SYS_SIZE     " Změní velikost okna."

reactos/base/applications/mscutils/devmgmt/lang/de-DE.rc

@@ -1,4 +1,4 @@
-LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 IDR_MAINMENU MENU
 BEGIN
@@ -40,9 +40,9 @@ BEGIN
   END
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
+IDD_ABOUTBOX DIALOGEX 22,16,190,182
 CAPTION "Über Geräte-Manager"
-FONT 8, "MS Shell Dlg", 0, 0
+FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
   LTEXT "Geräte-Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 26
@@ -51,12 +51,12 @@ BEGIN
   EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_LICENSE "Dieses Programm ist Freie Software: Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation, Version 2.1 der Lizenz oder (nach Ihrer Wahl) jeder neueren veröffentlichten Version, weiterverbreiten und/oder modifizieren.\r\n\r\nDieses Programm wird in der Hoffnung, dass es nützlich sein wird, aber OHNE JEDE GEWÄHRLEISTUNG, bereitgestellt; sogar ohne die implizite Gewährleistung der MARKTFÄHIGKEIT oder EIGNUNG FÜR EINEN BESTIMMTEN ZWECK.\r\n\r\nSie sollten eine Kopie der GNU General Public License zusammen mit diesem Programm erhalten haben. Wenn nicht, siehe <http://www.gnu.org/licenses/>."
+  IDS_LICENSE "Dieses Programm ist kostenlos; Sie können es frei verteilen mit od. ohne Änderungen unter der GNU Lesser General Public License, wie es von der Free Software Foundation veröffentlicht wurde; entweder Version 2.1 der Lizenz, oder eine spätere Version (ihrer Wahl).\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_TOOLTIP_PROP      "Eigenschaften"
   IDS_TOOLTIP_REFRESH   "Aktualisieren"
@@ -65,15 +65,16 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_APPNAME "ReactOS Geräte-Manager"
   IDS_HINT_BLANK        " "
   IDS_HINT_EXIT         " Das Programm beenden."
   IDS_HINT_REFRESH      " Die Service-Liste aktualisieren."
-    IDS_HINT_PROP " Eigenschaften für die aktuelle Auswahl anzeigen."
+  IDS_HINT_PROP         " Eigenschaften-Seite für die aktuelle Auswahl anzeigen."
   IDS_HINT_HELP         " Hilfe-Fenster anzeigen."
   IDS_HINT_ABOUT        " Über ReactOS Geräte-Manager."
+
   IDS_HINT_SYS_RESTORE  " Dieses Fenster auf normale Größe wiederherstellen."
   IDS_HINT_SYS_MOVE     " Dieses Fenster verschieben."
   IDS_HINT_SYS_SIZE     " Größe dieses Fensters ändern."

reactos/base/applications/mscutils/devmgmt/lang/el-GR.rc

@@ -1,4 +1,4 @@
-LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
+LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
 
 IDR_MAINMENU MENU
 BEGIN
@@ -40,9 +40,9 @@ BEGIN
   END
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
+IDD_ABOUTBOX DIALOGEX 22,16,190,182
 CAPTION "Σχετικά με η διαχείριση συσκεών"
-FONT 8, "MS Shell Dlg", 0, 0
+FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
   LTEXT "Device Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 26
@@ -51,12 +51,12 @@ BEGIN
   EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_TOOLTIP_PROP      "Ιδιότητες"
   IDS_TOOLTIP_REFRESH   "Ανανέωση"
@@ -65,7 +65,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_APPNAME "Διαχείριση Συσκευών του ReactOS"
   IDS_HINT_BLANK        " "
@@ -74,6 +74,7 @@ BEGIN
   IDS_HINT_PROP         " Άνοιγμα παραθύρου ιδιοτήτων για τη συγκεκριμένη επιλογή."
   IDS_HINT_HELP         " Εμφάνιση παραθύρου βοήθειας."
   IDS_HINT_ABOUT        " Σχετικά με τη Διαχείριση Συσκευών του ReactOS."
+
   IDS_HINT_SYS_RESTORE  " Επαναφέρει το παράθυρο αυτό στο κανονικο του μέγεθος."
   IDS_HINT_SYS_MOVE     " Μετακινεί αυτό το παράθυρο."
   IDS_HINT_SYS_SIZE     " Αλλάζει το μέγεθος αυτού του παραθύρου."

reactos/base/applications/mscutils/devmgmt/lang/en-US.rc

@@ -40,9 +40,9 @@ BEGIN
   END
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
+IDD_ABOUTBOX DIALOGEX 22,16,190,182
 CAPTION "About Device Manager"
-FONT 8, "MS Shell Dlg", 0, 0
+FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
   LTEXT "Device Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 30
@@ -51,12 +51,12 @@ BEGIN
   EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_TOOLTIP_PROP      "Properties"
   IDS_TOOLTIP_REFRESH   "Refresh"
@@ -65,7 +65,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_APPNAME "ReactOS Device Manager"
   IDS_HINT_BLANK        " "
@@ -74,6 +74,7 @@ BEGIN
   IDS_HINT_PROP         " Open property sheet for the current selection."
   IDS_HINT_HELP         " Display help window."
   IDS_HINT_ABOUT        " About ReactOS Device Manager."
+
   IDS_HINT_SYS_RESTORE  " Restores this window to normal size."
   IDS_HINT_SYS_MOVE     " Moves this window."
   IDS_HINT_SYS_SIZE     " Resizes this window."

reactos/base/applications/mscutils/devmgmt/lang/es-ES.rc

@@ -1,7 +1,6 @@
-/*
+/*
  * Spanish Language resource file
  * Traducido por: Javier Remacha 2007-12-21
- * Corregido por: Ismael Ferrera Morezuelas 2014-12-31
  */
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
@@ -27,7 +26,7 @@ BEGIN
     MENUITEM "Recursos por tipo",         IDC_RESBYTYPE, GRAYED
     MENUITEM "Recursos por conexión",     IDC_RESBYCONN, GRAYED
     MENUITEM SEPARATOR
-        MENUITEM "Mostrar dispositivos ocultos", IDC_SHOWHIDDEN
+    MENUITEM "Show hidden devices",       IDC_SHOWHIDDEN
   END
   POPUP "Ayuda"
   BEGIN
@@ -46,23 +45,23 @@ BEGIN
   END
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
-CAPTION "Acerca del Administrador de dispositivos"
-FONT 8, "MS Shell Dlg", 0, 0
+IDD_ABOUTBOX DIALOGEX 22,16,190,182
+CAPTION "Acerca del Gestor de Dispositivos"
+FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
-    LTEXT "Administrador de dispositivos v0.1\nCopyright (C) 2006\nCreado por Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 26
+  LTEXT "Gestor de Dispositivos v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 26
   PUSHBUTTON "Cerrar", IDOK, 75, 162, 44, 15
   ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30
   EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_LICENSE "Este programa es software libre; puedes redistribuirlo y/o modificarlo bajo los términos de la GNU General Public License tal y como fueron publicados por la Free Software Foundation; ya sea la versión 2 de la Licencia, o (bajo tu discreción) cualquier versión posterior.\r\n\r\nEste programa se distribuye con el fin de ser útil, pero viene SIN NINGUNA GARANTÍA; sin tan siquiera la garantía implícita de COMERCIALIZACIÓN o la de IDONEIDAD PARA UN PROPÓSITO CONCRETO. Para más información lee la GNU General Public License.\r\n\r\nDeberías de haber recibido una copia de la GNU General Public License con el programa; si no, puedes escribir a la Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 EE.UU."
+  IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_TOOLTIP_PROP      "Propiedades"
   IDS_TOOLTIP_REFRESH   "Actualizar"
@@ -71,19 +70,20 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_APPNAME "Administrador de dispositivos de ReactOS"
+  IDS_APPNAME "Gestor de Dispositivos de ReactOS"
   IDS_HINT_BLANK        " "
-    IDS_HINT_EXIT " Cierra el programa."
+  IDS_HINT_EXIT         " Cerrar el programa."
   IDS_HINT_REFRESH      " Actualizar la lista de servicios."
   IDS_HINT_PROP         " Abre la pestaña de propiedades de la selección actual."
   IDS_HINT_HELP         " Mostrar la ventana de ayuda."
-    IDS_HINT_ABOUT " Acerca del Administrador de dispositivos de ReactOS."
+  IDS_HINT_ABOUT        " Acerca del Gestor de Dispositivos de ReactOS."
+
   IDS_HINT_SYS_RESTORE  " Devuelve esta ventana al tamaño normal."
   IDS_HINT_SYS_MOVE     " Mueve esta ventana."
   IDS_HINT_SYS_SIZE     " Redimensiona esta ventana."
-    IDS_HINT_SYS_MINIMIZE " Contrae esta ventana en un icono."
-    IDS_HINT_SYS_MAXIMIZE " Expande esta ventana hasta ocupar la pantalla."
-    IDS_HINT_SYS_CLOSE " Cierra esta ventana."
+  IDS_HINT_SYS_MINIMIZE " Colapsa esta ventana a un icono."
+  IDS_HINT_SYS_MAXIMIZE " Expande esta ventana hasta llenar esta pantalla."
+  IDS_HINT_SYS_CLOSE    " Cerrar esta ventana."
 END

reactos/base/applications/mscutils/devmgmt/lang/fr-FR.rc

@@ -1,4 +1,4 @@
-LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
+LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 IDR_MAINMENU MENU
 BEGIN
@@ -40,9 +40,9 @@ BEGIN
   END
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
+IDD_ABOUTBOX DIALOGEX 22,16,190,182
 CAPTION "À propos du Gestionnaire de Périphériques"
-FONT 8, "MS Shell Dlg", 0, 0
+FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
   LTEXT "Gestionnaire de Périphériques v0.1\nCopyright (C) 2006\npar Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 26
@@ -51,12 +51,12 @@ BEGIN
   EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_LICENSE "Ce programme est un logiciel libre ; vous pouvez le redistribuer et/ou le modifier tout en respectant les termes de la ""GNU General Public License"" publiée par la Free Software Foundation; dans sa version 2  (ou selon votre préférence) toute version ultérieure.\r\n\r\nCe programme est distribué dans l'espoir qu'il sera utile, cependant SANS GARANTIE D'AUCUNE SORTE ; sans même une garantie implicite de COMMERCIABILITÉ ou DE CONFORMITÉ À UNE UTILISATION PARTICULIÈRE. \r\n\r\nVoir la Licence Publique Générale GNU pour plus de détails. Vous devriez avoir reçu un exemplaire de la Licence Publique Générale GNU avec ce programme ; si ce n'est pas le cas, écrivez à la Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_TOOLTIP_PROP      "Propriétés"
   IDS_TOOLTIP_REFRESH   "Actualiser"
@@ -65,7 +65,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_APPNAME "Gestionnaire de périphériques ReactOS"
   IDS_HINT_BLANK        " "
@@ -74,6 +74,7 @@ BEGIN
   IDS_HINT_PROP         " Ouvre la feuille de propriétés pour la sélection actuelle."
   IDS_HINT_HELP         " Affiche la fenêtre d'aide."
   IDS_HINT_ABOUT        " À propos du Gestionnaire de Périphériques de ReactOS."
+
   IDS_HINT_SYS_RESTORE  " Restaure cette fenêtre à sa taille normale."
   IDS_HINT_SYS_MOVE     " Déplace cette fenêtre."
   IDS_HINT_SYS_SIZE     " Redimensionne cette fenêtre."

reactos/base/applications/mscutils/devmgmt/lang/he-IL.rc

@@ -40,9 +40,9 @@ BEGIN
   END
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
+IDD_ABOUTBOX DIALOGEX 22,16,190,182
 CAPTION "אודות מנהל ההתקנים"
-FONT 8, "MS Shell Dlg", 0, 0
+FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
   LTEXT "Device Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 30
@@ -51,12 +51,12 @@ BEGIN
   EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_TOOLTIP_PROP      "מאפיינים"
   IDS_TOOLTIP_REFRESH   "רענן"
@@ -65,7 +65,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_APPNAME "מנהל ההתקנים של ReactOS"
   IDS_HINT_BLANK        " "
@@ -74,6 +74,7 @@ BEGIN
   IDS_HINT_PROP         " Open property sheet for the current selection."
   IDS_HINT_HELP         " מראה חלון עזרה."
   IDS_HINT_ABOUT        " אודות מנהל ההתקנים של ReactOS"
+
   IDS_HINT_SYS_RESTORE  " מחזיר את החלון לגודלו הרגיל"
   IDS_HINT_SYS_MOVE     " מזיז חלון זה"
   IDS_HINT_SYS_SIZE     " משנה גודל חלון זה"

reactos/base/applications/mscutils/devmgmt/lang/id-ID.rc

@@ -40,9 +40,9 @@ BEGIN
   END
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
+IDD_ABOUTBOX DIALOGEX 22,16,190,182
 CAPTION "Tentang Manajer Device"
-FONT 8, "MS Shell Dlg", 0, 0
+FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
   LTEXT "Manajer Device v0.1\nHak Cipta (C) 2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 26
@@ -51,12 +51,12 @@ BEGIN
   EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_LICENSE "Program ini adalah software bebas; anda dapat mendistribusikan dan/atau mengubahnya di bawah term GNU General Public License seperti dipublikasikan oleh Free Software Foundation; baik Lisensi versi 2, atau (menurut opini anda) setiap versi berikutnya.\r\n\r\nProgram ini didistribusikan dengan harapan ia akan berguna, tetapi TANPA JAMINAN APAPUN; bahkan tanpa jaminan berarti dari MERCANTABILITAS atau KECUKUPAN UNTUK KEPERLUAN TERTENTU.  Lihat GNU General Public License untuk lebih jelasnya.\r\n\r\nAnda seharusnya menerima duplikat GNU General Public License bersamaan dengan program ini; jika tidak, tulis ke Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_TOOLTIP_PROP      "Properti"
   IDS_TOOLTIP_REFRESH   "Segarkan"
@@ -65,7 +65,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_APPNAME "Manajer Device ReactOS"
   IDS_HINT_BLANK        " "
@@ -74,6 +74,7 @@ BEGIN
   IDS_HINT_PROP         " VBuka lembar properti untuk pilihan saat ini."
   IDS_HINT_HELP         " Menampilkan jendela bantuan."
   IDS_HINT_ABOUT        " Tentang Manajer Device ReactOS."
+
   IDS_HINT_SYS_RESTORE  " Menyimpan kembali jendela ini ke ukuran normal."
   IDS_HINT_SYS_MOVE     " Memindahkan jendela ini."
   IDS_HINT_SYS_SIZE     " Mengukur ulang jendela ini."

reactos/base/applications/mscutils/devmgmt/lang/it-IT.rc

@@ -1,4 +1,4 @@
-LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 IDR_MAINMENU MENU
 BEGIN
@@ -21,7 +21,7 @@ BEGIN
     MENUITEM "Risorse per tipo",            IDC_RESBYTYPE, GRAYED
     MENUITEM "Risorse per connessione",     IDC_RESBYCONN, GRAYED
     MENUITEM SEPARATOR
-        MENUITEM "Mostra periferiche nascoste", IDC_SHOWHIDDEN
+    MENUITEM "Show hidden devices",         IDC_SHOWHIDDEN
   END
   POPUP "Aiuto"
   BEGIN
@@ -40,23 +40,23 @@ BEGIN
   END
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
+IDD_ABOUTBOX DIALOGEX 22,16,190,182
 CAPTION "Informazioni su Gestione Dispositivi"
-FONT 8, "MS Shell Dlg", 0, 0
+FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
   LTEXT "Gestione dispositivi v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 26
-    PUSHBUTTON "Chiudi", IDOK, 75, 162, 44, 15
+  PUSHBUTTON "Close", IDOK, 75, 162, 44, 15
   ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30
   EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_LICENSE "Questo programma è software libero; puoi distribuirlo e/o modificarlo nei termini di licenza di 'GNU General Public License' come pubblicata dalla 'Free Software Foundation'; entrambe le versioni 2 della Licenza, o (a vostra scelta) qualunque versione successiva.\r\n\r\nQuesto programma è distribuito con l'augurio che sia utile, ma PRIVO DI OGNI GARANZIA; privo anche della garanzia implicita di COMMERCIABILITÀ o UTILIZZABILITÀ PER UNO SPECIFICO USO. Vedi la 'GNU General Public License' per ulteriori dettagli.\r\n\r\nVoi dovreste aver ricevuto una copia della 'GNU General Public License' assieme a questo programma; se non è cosi' scrivete a 'Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.."
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_TOOLTIP_PROP      "Proprietà"
   IDS_TOOLTIP_REFRESH   "Aggiorna"
@@ -65,7 +65,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_APPNAME "ReactOS: Gestione Dispositivi"
   IDS_HINT_BLANK        " "
@@ -74,6 +74,7 @@ BEGIN
   IDS_HINT_PROP         " Apri le proprietà per la selezione attuale."
   IDS_HINT_HELP         " Visualizza la finestra di aiuto."
   IDS_HINT_ABOUT        " Informazioni su Gestione dispositivi di ReactOS."
+
   IDS_HINT_SYS_RESTORE  " Ripristina la dimensione normale di questa finestra."
   IDS_HINT_SYS_MOVE     " Muove questa finestra."
   IDS_HINT_SYS_SIZE     " Cambia la dimensione di questa finestra."

reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc

@@ -40,9 +40,9 @@ BEGIN
   END
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
+IDD_ABOUTBOX DIALOGEX 22,16,190,182
 CAPTION "デバイス マネージャについて"
-FONT 9, "MS UI Gothic", 0, 0
+FONT 9, "MS UI Gothic",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
   LTEXT "デバイス マネージャ v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 30
@@ -51,12 +51,12 @@ BEGIN
   EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_TOOLTIP_PROP      "プロパティ"
   IDS_TOOLTIP_REFRESH   "更新"
@@ -65,7 +65,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_APPNAME "ReactOS デバイス マネージャ"
   IDS_HINT_BLANK        " "
@@ -74,6 +74,7 @@ BEGIN
   IDS_HINT_PROP         " 現在選択されているシートのプロパティを開きます。"
   IDS_HINT_HELP         " ヘルプ ウィンドウを表示します。"
   IDS_HINT_ABOUT        " ReactOS デバイス マネージャについて表示します。"
+
   IDS_HINT_SYS_RESTORE  " このウィンドウを通常の大きさに復元します。"
   IDS_HINT_SYS_MOVE     " このウィンドウを移動します。"
   IDS_HINT_SYS_SIZE     " このウィンドウの大きさを変更します。"

reactos/base/applications/mscutils/devmgmt/lang/ko-KR.rc

@@ -1,4 +1,6 @@
-/* Korean translation by manatails007(www.manatails007.org) */
+/*
+ * Korean translation by manatails007(www.manatails007.org)
+ */
 
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
@@ -42,9 +44,9 @@ BEGIN
   END
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
+IDD_ABOUTBOX DIALOGEX 22,16,190,182
 CAPTION "장치 관리자에 대하여"
-FONT 9, "MS Shell Dlg", 0, 0
+FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
   LTEXT "Device Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 30
@@ -53,12 +55,12 @@ BEGIN
   EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_TOOLTIP_PROP      "속성"
   IDS_TOOLTIP_REFRESH   "새로 고침"
@@ -67,7 +69,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_APPNAME "ReactOS 장치 관리자"
   IDS_HINT_BLANK        " "
@@ -76,6 +78,7 @@ BEGIN
   IDS_HINT_PROP         " 선택한 항목의 속성 창을 엽니다."
   IDS_HINT_HELP         " 도움말을 엽니다."
   IDS_HINT_ABOUT        " ReactOS 장치 관리자에 대해."
+
   IDS_HINT_SYS_RESTORE  " 이 창을 보통 크기로 맟춤니다."
   IDS_HINT_SYS_MOVE     " 창을 움직입니다."
   IDS_HINT_SYS_SIZE     " 창의 크기를 변경합니다."

reactos/base/applications/mscutils/devmgmt/lang/no-NO.rc

@@ -1,4 +1,4 @@
-LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
 
 IDR_MAINMENU MENU
 BEGIN
@@ -40,9 +40,9 @@ BEGIN
   END
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
+IDD_ABOUTBOX DIALOGEX 22,16,190,182
 CAPTION "Om Enhetsbehandler"
-FONT 8, "MS Shell Dlg", 0, 0
+FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
   LTEXT "Enhetsbehandler v0.1\nEnerett (C) 2006\nlaget av Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 30
@@ -51,12 +51,12 @@ BEGIN
   EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_LICENSE "Dette programmet er gratis programvare; du kan distribuere det og/eller endre det under betingelsene av GNU General Public License som er utgitt av Free Software Foundation;  version 2 av lisensen, eller (etter din mening) alle senere versjoner.\r\n\r\nDette programmet er utgitt i håp for at det skal kunne brukes, men DET ER INGEN GARANTIER; uten heller forutsatt garantier av SALGBARHET eller SIKKETHET FOR EN ENKELTHET FORMÅL.  Se på GNU General Public Lisensen for mere detaljer.\r\n\r\nDu skal ha motatt en kopi av GNU General Public Lisensen sammen med denne programmet; hvis du ikke har motatt det, skriv til Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_TOOLTIP_PROP      "Egenskaper"
   IDS_TOOLTIP_REFRESH   "Oppdater"
@@ -65,7 +65,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_APPNAME "ReactOS Enhetsbehandler"
   IDS_HINT_BLANK        " "
@@ -74,6 +74,7 @@ BEGIN
   IDS_HINT_PROP         " Open property sheet for the current selection."
   IDS_HINT_HELP         " Vis hjelp vinduet."
   IDS_HINT_ABOUT        " Om ReactOS Enhetsbehandler."
+
   IDS_HINT_SYS_RESTORE  " Gjenopprett dette vinduet til vanlig størrelse."
   IDS_HINT_SYS_MOVE     " Flytt dette vinduet."
   IDS_HINT_SYS_SIZE     " Endre størrelse på dette vinduet."

reactos/base/applications/mscutils/devmgmt/lang/pl-PL.rc

@@ -1,5 +1,5 @@
-/*
- *    Translated by xrogers
+/*
+ *         translated by xrogers
  *         xxrogers@users.sourceforge.net
  *         https://sourceforge.net/projects/reactospl
  *         UTF-8 conversion by Caemyr (May, 2011)
@@ -28,7 +28,7 @@ BEGIN
     MENUITEM "Zaso&by według typu",           IDC_RESBYTYPE, GRAYED
     MENUITEM "Za&soby według połączenia",     IDC_RESBYCONN, GRAYED
     MENUITEM SEPARATOR
-        MENUITEM "Pokaż ukryte urządzenia", IDC_SHOWHIDDEN
+    MENUITEM "Show hidden devices",           IDC_SHOWHIDDEN
   END
   POPUP "Pomo&c"
   BEGIN
@@ -47,9 +47,9 @@ BEGIN
   END
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
+IDD_ABOUTBOX DIALOGEX 22,16,190,182
 CAPTION "Menedżer urządzeń - informacje"
-FONT 8, "MS Shell Dlg", 0, 0
+FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
   LTEXT "Menedżer urządzeń v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 26
@@ -58,12 +58,12 @@ BEGIN
   EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_LICENSE "Niniejszy program jest wolnym oprogramowaniem; możesz go rozprowadzać dalej i/lub modyfikować na warunkach Powszechnej Licencji Publicznej GNU, wydanej przez Fundację Wolnego Oprogramowania - według wersji 2 tej Licencji lub (według twojego wyboru) którejś z późniejszych wersji.\r\n\r\nNiniejszy program rozpowszechniany jest z nadzieją, iż będzie on użyteczny - jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji PRZYDATNOŚCI HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ. W celu uzyskania bliższych informacji sięgnij do Powszechnej Licencji Publicznej GNU.\r\n\r\nZ pewnością wraz z niniejszym programem otrzymałeś też egzemplarz Powszechnej Licencji Publicznej GNU (GNU General Public License); jeśli nie - napisz do Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_TOOLTIP_PROP      "Właściwości"
   IDS_TOOLTIP_REFRESH   "Odśwież"
@@ -72,7 +72,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_APPNAME "Menedżer urządzeń ReactOS"
   IDS_HINT_BLANK        " "
@@ -81,6 +81,7 @@ BEGIN
   IDS_HINT_PROP         " Otwiera arkusz właściwości dla bieżącego zaznaczenia."
   IDS_HINT_HELP         " Otwiera pomoc."
   IDS_HINT_ABOUT        " Informacje o Menedżerze urządzeń ReactOS."
+
   IDS_HINT_SYS_RESTORE  " Przywraca okno do normalnych rozmiarów."
   IDS_HINT_SYS_MOVE     " Przesuwa to okno."
   IDS_HINT_SYS_SIZE     " Zmienia rozmiar tego okna."

reactos/base/applications/mscutils/devmgmt/lang/pt-BR.rc

@@ -42,9 +42,9 @@ BEGIN
   END
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
+IDD_ABOUTBOX DIALOGEX 22,16,190,182
 CAPTION "Sobre Gerenciador de Dispositivos"
-FONT 8, "MS Shell Dlg", 0, 0
+FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
   LTEXT "Gerenciador de Dispositivos v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 30
@@ -53,12 +53,12 @@ BEGIN
   EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_TOOLTIP_PROP      "Propriedades"
   IDS_TOOLTIP_REFRESH   "Atualizar"
@@ -67,7 +67,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_APPNAME "Gerenciador de Dispositivos ReactOS"
   IDS_HINT_BLANK        " "
@@ -76,6 +76,7 @@ BEGIN
   IDS_HINT_PROP         " Abre uma folha de propriedades para a seleção atual."
   IDS_HINT_HELP         " Exibe tela de ajuda."
   IDS_HINT_ABOUT        " Sobre Gerenciador de Dispositivos ReactOS."
+
   IDS_HINT_SYS_RESTORE  " Restaura esta janela ao tamanho normal."
   IDS_HINT_SYS_MOVE     " Move esta janela."
   IDS_HINT_SYS_SIZE     " Redimensiona esta janela."

reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc

@@ -1,8 +1,4 @@
-/*
- * Translators: Petru Dimitriu (petrimetri at gmail dot com)
- *              Ștefan Fulea (stefan dot fulea at mail dot md)
- */
-
+//2011.10.19 - Fulea Ștefan: minor changes
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 IDR_MAINMENU MENU
@@ -13,11 +9,11 @@ BEGIN
   END
   POPUP "A&cțiune"
   BEGIN
-        MENUITEM "I&mprimare", IDC_PRINT, GRAYED
+    MENUITEM "Im&primare",                    IDC_PRINT, GRAYED
     MENUITEM SEPARATOR
     MENUITEM "P&roprietăți",                  IDC_PROP, GRAYED
     MENUITEM SEPARATOR
-        MENUITEM "Aj&utor", IDC_PROGHELP, GRAYED
+    MENUITEM "&?",                            IDC_PROGHELP, GRAYED
   END
   POPUP "&Afișare"
   BEGIN
@@ -28,7 +24,7 @@ BEGIN
     MENUITEM SEPARATOR
     MENUITEM "Afișea&ză dispozitive ascunse", IDC_SHOWHIDDEN
   END
-    POPUP "Aj&utor"
+  POPUP "&?"
   BEGIN
     MENUITEM "&Manual…",                      IDC_PROGHELP
     MENUITEM "Despre…",                       IDC_ABOUT
@@ -45,9 +41,9 @@ BEGIN
   END
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
+IDD_ABOUTBOX DIALOGEX 22,16,190,182
 CAPTION "Despre Gestionarul de dispozitive"
-FONT 8, "MS Shell Dlg", 0, 0
+FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
   LTEXT       "Gestionar de dispozitive v0.1\nDrept de autor (C) 2006\nde Ged Murphy (gedmurphy@gmail.com)\nTraducere de Petru Dimitriu", IDC_STATIC, 48, 7, 130, 35
@@ -56,12 +52,12 @@ BEGIN
   EDITTEXT                 IDC_LICENSE_EDIT, 8, 47, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_LICENSE "Această aplicație este publică; fiind permisă modificarea și/sau (re)distribuția sa în termenii Licenței Publice Generale GNU publicată de Free Software Foundation; sau versiunea 2 a Licenței, sau (la alegere) a oricărei versiuni ulterioare.\r\n\r\nAceastă aplicație este distribuită doar în speranța de a fi utilă, FĂRĂ însă NICI O GARANȚIE; nici măcar cu garanția implicită a VANDABILITĂȚII sau a UTILITĂȚII ÎNTR-UN SCOP ANUME. Pentru mai multe detalii consultați Licența Publică Generală GNU.\r\n\r\nPuteți vedea această licență aici:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nDe asemenea puteți consulta traduceri neoficiale ale acestei licențe aici:\r\nhttp://www.gnu.org/licenses/translations.html"
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_TOOLTIP_PROP      "Proprietăți"
   IDS_TOOLTIP_REFRESH   "Împrospătare"
@@ -70,7 +66,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_APPNAME           "Gestionar de dispozitive ReactOS"
   IDS_HINT_BLANK        " "
@@ -79,6 +75,7 @@ BEGIN
   IDS_HINT_PROP         " Afișează tabel cu proprietăți pentru selecția curentă."
   IDS_HINT_HELP         " Afișează manualul de utilizare."
   IDS_HINT_ABOUT        " Despre Gestionarul de dispozitive."
+
   IDS_HINT_SYS_RESTORE  " Aduce fereastra la mărime normală."
   IDS_HINT_SYS_MOVE     " Mută fereastra."
   IDS_HINT_SYS_SIZE     " Redimensionează fereastra."

reactos/base/applications/mscutils/devmgmt/lang/ru-RU.rc

@@ -1,4 +1,4 @@
-/* Russian language resource file (Dmitry Chapyshev, 2007-06-10) */
+// Russian language resource file (Dmitry Chapyshev, 2007-06-10)
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
@@ -23,7 +23,7 @@ BEGIN
     MENUITEM "Ресурсы по типу",           IDC_RESBYTYPE, GRAYED
     MENUITEM "Ресурсы по подключению",    IDC_RESBYCONN, GRAYED
     MENUITEM SEPARATOR
-        MENUITEM "Показать скрытые устройства", IDC_SHOWHIDDEN
+    MENUITEM "Show hidden devices",       IDC_SHOWHIDDEN
   END
   POPUP "Справка"
   BEGIN
@@ -42,9 +42,9 @@ BEGIN
   END
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
+IDD_ABOUTBOX DIALOGEX 22,16,190,182
 CAPTION "О Диспетчере устройств"
-FONT 8, "MS Shell Dlg", 0, 0
+FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
   LTEXT "Диспетчер устройств v0.1\nCopyright (C) 2006\nот Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 30
@@ -53,12 +53,12 @@ BEGIN
   EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_LICENSE "Эта программа является свободно распространяемой; Вы можете распространять ее повторно и (или) изменять, соблюдая условия Открытого лицензионного соглашения GNU, опубликованного Фондом свободно распространяемого программного обеспечения; либо редакции 2 Соглашения, либо (на ваше усмотрение) любой редакции, выпущенной позже.\r\n\r\nЭта программа распространяется в надежде на то, что она окажется полезной, но БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ, включая подразумеваемую гарантию КАЧЕСТВА либо ПРИГОДНОСТИ ДЛЯ ОПРЕДЕЛЕННЫХ ЦЕЛЕЙ. Подробности содержатся в Открытом лицензионном соглашении GNU.\r\n\r\nВместе с этой программой должен распространяться экземпляр Открытого лицензионного соглашения GNU, если он отсутствует, сообщите об этом в Фонд свободно распространяемого программного обеспечения (Free Software Foundation, Inc.), 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_TOOLTIP_PROP      "Свойства"
   IDS_TOOLTIP_REFRESH   "Обновить"
@@ -67,7 +67,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_APPNAME "Диспетчер устройств ReactOS"
   IDS_HINT_BLANK        " "
@@ -75,8 +75,9 @@ BEGIN
   IDS_HINT_REFRESH      " Обновить список."
   IDS_HINT_PROP         " Открыть свойства для выбранного элемента."
   IDS_HINT_HELP         " Показать окно справки."
-    IDS_HINT_ABOUT " О Диспетчере устройств ReactOS."
-    IDS_HINT_SYS_RESTORE " Восстановить нормальный размер этого окна."
+  IDS_HINT_ABOUT        " О ReactOS Device Manager."
+
+  IDS_HINT_SYS_RESTORE  " Востановить нормальный размер этого окна."
   IDS_HINT_SYS_MOVE     " Переместить это окно."
   IDS_HINT_SYS_SIZE     " Изменить размер этого окна."
   IDS_HINT_SYS_MINIMIZE " Свернуть это окно в значок."

reactos/base/applications/mscutils/devmgmt/lang/sk-SK.rc

@@ -1,4 +1,4 @@
-/* TRANSLATOR:  Mário Kačmár /Mario Kacmar/ aka Kario (kario@szm.sk)
+/* TRANSLATOR:   Mário Kačmár /Mario Kacmar/ aka Kario (kario@szm.sk)
  * DATE OF TR.:  14-02-2008
  * LAST CHANGE:  29-08-2008
  */
@@ -45,9 +45,9 @@ BEGIN
   END
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
+IDD_ABOUTBOX DIALOGEX 22,16,190,182
 CAPTION "Čo je Správca zariadení"
-FONT 8, "MS Shell Dlg", 0, 0
+FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
   LTEXT "Správca zariadení v0.1\nCopyright (C) 2006\nod Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 30
@@ -56,12 +56,12 @@ BEGIN
   EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_LICENSE "Tento program je voľný softvér; môžete ho šíriť a/alebo modifikovať podľa podmienok GNU Všeobecnej verejnej licencie (GNU General Public License) ako bola zverejnená nadáciou Free Software Foundation; buď verzie 2 tejto licencie, alebo (podľa Vášho uváženia) niektorej neskoršej verzie.\r\n\r\nTento program je distribuovaný v nádeji, že bude užitočný, avšak BEZ AKEJKOĽVEK ZÁRUKY; rovnako bez záruky PREDAJNOSTI alebo VHODNOSTI PRE URČITÝ ÚČEL. Pre viac detailov si pozrite GNU Všeobecnú verejnú licenciu (GNU General Public License).\r\n\r\nKópiu Všeobecnej verejnej licencie GNU ste mali dostať spolu s týmto programom; ak nie, napíšte si o ňu na Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_TOOLTIP_PROP      "Vlastnosti"
   IDS_TOOLTIP_REFRESH   "Obnoviť"
@@ -70,7 +70,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_APPNAME "Správca zariadení systému ReactOS"
   IDS_HINT_BLANK        " "
@@ -79,6 +79,7 @@ BEGIN
   IDS_HINT_PROP         " Otvorí okno s vlastnosťami pre aktuálny výber."
   IDS_HINT_HELP         " Zobrazí okno pomocníka."
   IDS_HINT_ABOUT        " Čo je Správca zariadení systému ReactOS."
+
   IDS_HINT_SYS_RESTORE  " Obnoví okno na normálnu veľkosť."
   IDS_HINT_SYS_MOVE     " Premiestni okno."
   IDS_HINT_SYS_SIZE     " Zmení veľkosť okna."

reactos/base/applications/mscutils/devmgmt/lang/sq-AL.rc

@@ -1,87 +0,0 @@
-/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com) 
- * DATE OF TR:  29-11-2013
-*/
-
-LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
-
-IDR_MAINMENU MENU
-BEGIN
-    POPUP "&File"
-    BEGIN
-        MENUITEM "Dil", IDC_EXIT
-    END
-    POPUP "Veprim"
-    BEGIN
-        MENUITEM "Printo", IDC_PRINT, GRAYED
-        MENUITEM SEPARATOR
-        MENUITEM "Tipar", IDC_PROP, GRAYED
-        MENUITEM SEPARATOR
-        MENUITEM "Ndihmë", IDC_PROGHELP, GRAYED
-    END
-    POPUP "Vëzhgo"
-    BEGIN
-        MENUITEM "Pajisje nga tipi", IDC_DEVBYTYPE
-        MENUITEM "Pajisje nga lidhja", IDC_DEVBYCONN
-        MENUITEM "Burime nga tipi", IDC_RESBYTYPE, GRAYED
-        MENUITEM "Burime nga lidhja", IDC_RESBYCONN, GRAYED
-        MENUITEM SEPARATOR
-        MENUITEM "Shfaq pajisje te fshehura", IDC_SHOWHIDDEN
-    END
-    POPUP "Ndihmë"
-    BEGIN
-        MENUITEM "Ndihmë", IDC_PROGHELP
-        MENUITEM "Rreth", IDC_ABOUT
-    END
-END
-
-IDR_POPUP MENU
-BEGIN
-    POPUP "popup"
-    BEGIN
-        MENUITEM "Tipar", IDC_PROP, GRAYED
-        MENUITEM SEPARATOR
-        MENUITEM "Ndihmë", IDC_PROGHELP
-    END
-END
-
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
-CAPTION "Rreth Menaxhimit të pajisjeve"
-FONT 8, "MS Shell Dlg", 0, 0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-    LTEXT "Menaxhues pajisjesh v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 30
-    PUSHBUTTON "Close", IDOK, 75, 162, 44, 15
-    ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30
-    EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
-STRINGTABLE
-BEGIN
-    IDS_LICENSE "Ky program është software falas; ju mund ta shpërndani dhe / ose modifikoni sipas kushteve të GNU General Public License publikuar nga Free Software Foundation; sipas versionit 2 të Liçencës, ose (sipas opinionit tuaj) çdo versioni të mëvonshëm.\r\n\r\nKy program shpërndahet me shpresën që do t'ju jetë i dobishëm, por PA ASNJË GARANCI; madje edhe pa garancinë e shprehur të TREGTUESHMËRISË ose PËRSHTATJES PËR NJË QËLLIM TË CAKTUAR.  Shiko Liçencën Publike të Përgjithshme GNU për më shumë detaje.\r\n\r\nJu duhet të keni marrë një kopje të Liçensës së Përgjithshme Publike GNU së bashku me këtë program, e nëse jo, shkruani në Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.."
-END
-
-STRINGTABLE
-BEGIN
-    IDS_TOOLTIP_PROP "Tipar"
-    IDS_TOOLTIP_REFRESH "Rifresko"
-    IDS_TOOLTIP_HELP "Ndihmë"
-    IDS_TOOLTIP_EXIT "Dil"
-END
-
-/* Hints */
-STRINGTABLE
-BEGIN
-    IDS_APPNAME "Menaxhuesi i pajisjeve ReactOS"
-    IDS_HINT_BLANK " "
-    IDS_HINT_EXIT " Dil nga programi."
-    IDS_HINT_REFRESH " Rifresko listen e sherbimeve."
-    IDS_HINT_PROP " Hap tiparet e fletes për perzgjedhjen aktuale."
-    IDS_HINT_HELP " Shfaq dritaren e ndihmës."
-    IDS_HINT_ABOUT " Rreth menaxhusit të pajisjeve të ReactOS."
-    IDS_HINT_SYS_RESTORE " Kthe kete dritare ne mase normale."
-    IDS_HINT_SYS_MOVE " Leviz kete dritare."
-    IDS_HINT_SYS_SIZE " Ndryshon permasat e dritares."
-    IDS_HINT_SYS_MINIMIZE " Kthen kete dritare ne ikone."
-    IDS_HINT_SYS_MAXIMIZE " Zmadhon kete dritare ne permasa te ekranit."
-    IDS_HINT_SYS_CLOSE " Mbyll kete dritare."
-END

reactos/base/applications/mscutils/devmgmt/lang/sv-SE.rc

@@ -1,6 +1,6 @@
-/*
+/*
  * PROJECT:      ReactOS MSCUTILS
- * FILE:       base/applications/mscutils/devmgmt/lang/sv-SE.rc
+ * FILE:         base\applications\mscutils\devmgmt\lang\sv-SE.rc
  * PURPOSE:      Swedish resource file
  * TRANSLATOR:   Jaix Bly
  */
@@ -47,9 +47,9 @@ BEGIN
   END
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
+IDD_ABOUTBOX DIALOGEX 22,16,190,182
 CAPTION "Om Enhetshanteraren"
-FONT 8, "MS Shell Dlg", 0, 0
+FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
   LTEXT "Enhetshanteraren v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 30
@@ -58,12 +58,12 @@ BEGIN
   EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_LICENSE "Detta programmet är fri programvara; du kan distribuera det och/eller ändra det under villkoren enligt GNU General Public License som är utgivet av Free Software Foundation;  version 2, eller (om du så önskar) alla senare versioner.\r\n\r\nDette programmet er utgivet i hopp om att det skall kunne användas, men DET FINNS INGA GARANTIER; även utan underförstådd garanti om SÄLJBARHET eller LÄMPLIGHET FÖR ETT VISST ÄNDAMÅL.  Se på GNU General Public Licensen för mer detaljer.\r\n\r\nDu skall ha motagit en kopia av GNU General Public Licensen tillsammans med detta programmet; om du inte har fått det, skriv til Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_TOOLTIP_PROP      "Egenskaper"
   IDS_TOOLTIP_REFRESH   "Uppdater"
@@ -72,7 +72,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_APPNAME "ReactOS Enhetshanterare"
   IDS_HINT_BLANK        " "
@@ -81,6 +81,7 @@ BEGIN
   IDS_HINT_PROP         " Öppna egenskaper för markerat val."
   IDS_HINT_HELP         " Visa hjälpfönstret."
   IDS_HINT_ABOUT        " Om ReactOS Enhetshanterare."
+
   IDS_HINT_SYS_RESTORE  " Återställ detta fönstret till normal storlek."
   IDS_HINT_SYS_MOVE     " Flytta detta fönstret."
   IDS_HINT_SYS_SIZE     " Ändra storleken på detta fönstret."

reactos/base/applications/mscutils/devmgmt/lang/th-TH.rc

@@ -1,7 +1,7 @@
-/*
+/*
  * PROJECT:     ReactOS Device Management
  * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:      base/applications/mscutils/devmgmt/lang/th-TH.rc
+ * FILE:        base/applications/devmgmt/lang/th-TH.rc
  * PURPOSE:     Thai translation
  * COPYRIGHT:   Copyright 2007 Sumath Aowsakulsutthi
  */
@@ -48,9 +48,9 @@ BEGIN
   END
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
+IDD_ABOUTBOX DIALOGEX 22,16,190,182
 CAPTION "เกี่ยวกับการจัดการอุปกรณ์"
-FONT 8, "MS Shell Dlg", 0, 0
+FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
   LTEXT "Device Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 26
@@ -59,12 +59,12 @@ BEGIN
   EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_TOOLTIP_PROP      "คุณสมบัติ"
   IDS_TOOLTIP_REFRESH   "ฟื้นฟู"
@@ -73,7 +73,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_APPNAME "การจัดการอุปกรณ์ของ ReactOS"
   IDS_HINT_BLANK        " "
@@ -82,6 +82,7 @@ BEGIN
   IDS_HINT_PROP         " เปิดคุณสมบัติของแผ่นงานตามการเลือกในปัจจุบัน"
   IDS_HINT_HELP         " แสดงหน้าต่างช่วยเหลือ"
   IDS_HINT_ABOUT        " เกี่ยวกับการจัดการอุปกรณ์ของ ReactOS"
+
   IDS_HINT_SYS_RESTORE  " คืนสภาพของหน้าต่างนี้สู่ขนาดปกติ"
   IDS_HINT_SYS_MOVE     " ย้ายหน้าต่างนี้"
   IDS_HINT_SYS_SIZE     " เปลี่ยนขนาดหน้าต่างนี้"

reactos/base/applications/mscutils/devmgmt/lang/tr-TR.rc

@@ -1,85 +0,0 @@
-/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
-
-LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
-
-IDR_MAINMENU MENU
-BEGIN
-    POPUP "&Kütük"
-    BEGIN
-        MENUITEM "&Çıkış",                     IDC_EXIT
-    END
-    POPUP "&Eylem"
-    BEGIN
-        MENUITEM "&Yazdır",                    IDC_PRINT, GRAYED
-        MENUITEM SEPARATOR
-        MENUITEM "&Husûsiyetler",              IDC_PROP, GRAYED
-        MENUITEM SEPARATOR
-        MENUITEM "Y&ardım",                    IDC_PROGHELP, GRAYED
-    END
-    POPUP "&Görünüm"
-    BEGIN
-        MENUITEM "&Türe Göre Aygıtlar",        IDC_DEVBYTYPE
-        MENUITEM "&Bağlantıya Göre Aygıtlar",  IDC_DEVBYCONN
-        MENUITEM "T&üre Göre Kaynaklar",       IDC_RESBYTYPE, GRAYED
-        MENUITEM "B&ağlantıya Göre Kaynaklar", IDC_RESBYCONN, GRAYED
-        MENUITEM SEPARATOR
-        MENUITEM "&Gizli Aygıtları Göster",    IDC_SHOWHIDDEN
-    END
-    POPUP "&Yardım"
-    BEGIN
-        MENUITEM "&Yardım",                    IDC_PROGHELP
-        MENUITEM "&Üzerine...",                IDC_ABOUT
-    END
-END
-
-IDR_POPUP MENU
-BEGIN
-    POPUP "popup"
-    BEGIN
-        MENUITEM "&Husûsiyetler",              IDC_PROP, GRAYED
-        MENUITEM SEPARATOR
-        MENUITEM "&Yardım",                    IDC_PROGHELP
-    END
-END
-
-IDD_ABOUTBOX DIALOGEX 22,16,190,182
-CAPTION "Aygıt Yöneticisi Üzerine"
-FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-    LTEXT "Aygıt Yöneticisi - Sürüm: 0.1\nTelif Hakkı: 2006\nGed Murphy (gedmurphy@gmail.com) ile.", IDC_STATIC, 48, 7, 130, 30
-    PUSHBUTTON "Tamam", IDOK, 75, 162, 44, 15
-    ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30
-    EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
-STRINGTABLE
-BEGIN
-    IDS_LICENSE "ÖNEMLİ: Aşağıdaki metin, özgün metnin resmî olmayan çevirisidir. Çeviri metniyle özgün metin arasında ayrım olabilir. Özgün metin, çeviri metninin altındadır.\r\n\r\n***\r\n\r\nBu izlence özgür yazılımdır; bunu, Özgür Yazılım Vakfı'nın yayımladığı GNU Umûmî Kamu Ruhsatı'nın, 2. sürümünün ya da daha sonraki bir sürümünün (Orası size bağlı.) şartları altında yeniden dağıtabilir veyâ değiştirebilirsiniz.\r\n\r\nBu izlence, kullanışlı olabileceği beklentisiyle dağıtılmıştır ancak bu izlencenin HİÇBİR GÜVENCESİ YOKTUR, SATILABİLİRLİĞİN ve BELİRLİ BİR AMACA UYGUNLUĞUN demek istenilen güvencesi bile. Daha çok bilgi için GNU Umûmî Kamu Ruhsatı'na bakınız.\r\n\r\nBu izlenceyle birlikte GNU Umûmî Kamu Ruhsatı'nın bir kopyasını almış olmalısınız, eğer yoksa Özgür Yazılım Vakfı AŞ'ye (51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ABD) yazınız.\r\n\r\n***\r\n\r\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
-END
-
-STRINGTABLE
-BEGIN
-    IDS_TOOLTIP_PROP      "Husûsiyetler"
-    IDS_TOOLTIP_REFRESH   "Yenile"
-    IDS_TOOLTIP_HELP      "Yardım"
-    IDS_TOOLTIP_EXIT      "Çıkış"
-END
-
-/* Hints */
-STRINGTABLE
-BEGIN
-    IDS_APPNAME           "Aygıt Yöneticisi"
-    IDS_HINT_BLANK        " "
-    IDS_HINT_EXIT         " İzlenceden çıkar."
-    IDS_HINT_REFRESH      " Hizmet dizelgesini yeniler."
-    IDS_HINT_PROP         " Şimdiki seçilen için husûsiyet penceresini açar."
-    IDS_HINT_HELP         " Yardım penceresini görüntüler."
-    IDS_HINT_ABOUT        " Aygıt Yöneticisi üzerine."
-    IDS_HINT_SYS_RESTORE  " Bu pencereyi düzgülük boyutlarına döndürür."
-    IDS_HINT_SYS_MOVE     " Bu pencereyi devindirir."
-    IDS_HINT_SYS_SIZE     " Bu pencereyi yeniden boyutlandırır."
-    IDS_HINT_SYS_MINIMIZE " Bu pencereyi bir simgeye küçültür."
-    IDS_HINT_SYS_MAXIMIZE " Bu pencereyi, bu görüntülüğü kaplatana dek genişletir."
-    IDS_HINT_SYS_CLOSE    " Bu pencereyi kapatır."
-END

reactos/base/applications/mscutils/devmgmt/lang/uk-UA.rc

@@ -1,7 +1,7 @@
-/*
+/*
  * PROJECT:     ReactOS Device Management
  * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:       base/applications/mscutils/devmgmt/lang/uk-UA.rc
+ * FILE:        base/applications/devmgmt/lang/uk-UA.rc
  * PURPOSE:     Ukraianian Language File for devmgmt
  * TRANSLATOR:  Artem Reznikov
  */
@@ -48,9 +48,9 @@ BEGIN
   END
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
+IDD_ABOUTBOX DIALOGEX 22,16,190,182
 CAPTION "Про програму Диспетчер пристроїв"
-FONT 8, "MS Shell Dlg", 0, 0
+FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
   LTEXT "Диспетчер пристроїв v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 26
@@ -59,12 +59,12 @@ BEGIN
   EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_LICENSE "Це вільне програмне забезпечення; Ви можете розповсюджувати її та змінювати, дотримуючись умови Відкритої ліцензійної угоди GNU, опублікованої Фондом вільного програмного забезпечення; або редакції 2 Угоди, або будь-якої редакції, випущеної пізніше.\r\n\r\nЦя програма розповсюджується в надії на те, що вона виявиться корисною, але БЕЗ БУДЬ-ЯКИХ ГАРАНТІЙ, включаючи УЯВНОЮ ГАРАНТІЄЮ ЯКОСТІ або ПРИДАТНОСТІ для певних цілей. Подробиці містяться у Відкритій ліцензійній угоді GNU.\r\n\r\nРазом з цією програмою повинен поширюватися примірник Відкритої ліцензійної угоди GNU. Якщо він відсутній, повідомте про це в Фонд вільного програмного забезпечення (Free Software Foundation, Inc.), 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_TOOLTIP_PROP      "Властивості"
   IDS_TOOLTIP_REFRESH   "Оновити"
@@ -73,7 +73,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_APPNAME "Диспетчер пристроїв ReactOS"
   IDS_HINT_BLANK        " "
@@ -82,6 +82,7 @@ BEGIN
   IDS_HINT_PROP         " Відкрити властивості для вибраного елементу."
   IDS_HINT_HELP         " Показати вікно довідки."
   IDS_HINT_ABOUT        " Про Диспетчер пристроїв ReactOS."
+
   IDS_HINT_SYS_RESTORE  " Відновити вихідний розмір вікна."
   IDS_HINT_SYS_MOVE     " Змінити розташування вікна."
   IDS_HINT_SYS_SIZE     " Змінити розмір вікна."

reactos/base/applications/mscutils/devmgmt/lang/zh-CN.rc

@@ -1,4 +1,6 @@
-/* Translated by Song Fuchang (0xfc) <sfc_0@yahoo.com.cn> */
+/*
+ * Translated by Song Fuchang (0xfc) <sfc_0@yahoo.com.cn>
+ */
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
@@ -23,7 +25,7 @@ BEGIN
     MENUITEM "资源，按类型",              IDC_RESBYTYPE, GRAYED
     MENUITEM "资源，按连接",              IDC_RESBYCONN, GRAYED
     MENUITEM SEPARATOR
-        MENUITEM "显示隐藏的设备", IDC_SHOWHIDDEN
+    MENUITEM "Show hidden devices", IDC_SHOWHIDDEN
   END
   POPUP "帮助"
   BEGIN
@@ -42,9 +44,9 @@ BEGIN
   END
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
+IDD_ABOUTBOX DIALOGEX 22,16,190,182
 CAPTION "关于设备管理器"
-FONT 9, "MS Shell Dlg", 0, 0
+FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
   LTEXT "设备管理器 v0.1 版权所有 (C) 2006\n作者 Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 30
@@ -53,12 +55,12 @@ BEGIN
   EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+  IDS_LICENSE "这个程序是自由软件；你可以在自由软件基金会(FSF)的 GNU LGPL 协议下重新发布或修改它；也适用于这个协议的版本 2，或(在您看来)任何更新的版本。\r\n\r\n这个程序在希望其有用的愿望中发布，但没有任何保证；也不意味着性能保证或对某特定用途的适用性。请查看 GNU GPL 许可协议以了解更多细节。\r\n\r\n您应该已经收到了一份和这个程序一起的 GNU GPL 协议的副本；如果没有，请写信给自由软件基金会(FSF)：51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_TOOLTIP_PROP      "属性"
   IDS_TOOLTIP_REFRESH   "刷新"
@@ -67,7 +69,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_APPNAME "ReactOS 设备管理器"
   IDS_HINT_BLANK        " "
@@ -76,6 +78,7 @@ BEGIN
   IDS_HINT_PROP         " 为当前选择项打开属性页。"
   IDS_HINT_HELP         " 显示帮助窗口。"
   IDS_HINT_ABOUT        " 关于 ReactOS 设备管理器。"
+
   IDS_HINT_SYS_RESTORE  " 将窗口恢复到默认大小。"
   IDS_HINT_SYS_MOVE     " 移动这个窗口。"
   IDS_HINT_SYS_SIZE     " 更改这个窗口的大小。"

reactos/base/applications/mscutils/devmgmt/mainwnd.c

@@ -1,7 +1,7 @@
 /*
  * PROJECT:     ReactOS Device Managment
  * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/mscutils/devmgmt/mainwnd.c
+ * FILE:        base/system/devmgmt/mainwnd.c
  * PURPOSE:     Main window message handler
  * COPYRIGHT:   Copyright 2006 Ged Murphy <gedmurphy@gmail.com>
  *
@@ -9,8 +9,6 @@
 
 #include "precomp.h"
 
-#include <windowsx.h>
-
 static BOOL pCreateToolbar(PMAIN_WND_INFO Info);
 
 static const TCHAR szMainWndClass[] = TEXT("DevMgmtWndClass");
@@ -268,7 +266,7 @@ UpdateViewMenu(PMAIN_WND_INFO Info)
 
     CheckMenuItem(hMenu,
                   IDC_SHOWHIDDEN,
-                  MF_BYCOMMAND | (Info->bShowHidden ? MF_CHECKED : MF_UNCHECKED));
+                  MF_BYCOMMAND | (Info->bShowHidden) ? MF_CHECKED : MF_UNCHECKED);
 }
 
 
@@ -304,7 +302,7 @@ InitMainWnd(PMAIN_WND_INFO Info)
                                      0);
     SetMenuDefaultItem(Info->hShortcutMenu, IDC_PROP, FALSE);
 
-    /* create separate thread to emum devices */
+    /* create seperate thread to emum devices */
     DevEnumThread = CreateThread(NULL,
                                  0,
                                  DeviceEnumThread,
@@ -418,23 +416,6 @@ OnNotify(PMAIN_WND_INFO Info,
         }
         break;
 
-        case NM_RETURN:
-        {
-            HTREEITEM hSelected = TreeView_GetSelection(Info->hTreeView);
-            if (Info->Display == DevicesByType)
-            {
-                OpenPropSheet(Info->hTreeView, hSelected);
-            }
-            else if (Info->Display == DevicesByConnection)
-            {
-                if (hSelected != TreeView_GetRoot(Info->hTreeView))
-                {
-                    OpenPropSheet(Info->hTreeView, hSelected);
-                }
-            }    
-        }
-        break;
-        
         case NM_DBLCLK:
         {
             HTREEITEM hSelected = TreeView_GetSelection(Info->hTreeView);

reactos/base/applications/mscutils/devmgmt/misc.c

@@ -1,7 +1,7 @@
 /*
  * PROJECT:     ReactOS Device Managment
  * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/mscutils/devmgmt/misc.c
+ * FILE:        base/system/devmgmt/misc.c
  * PURPOSE:     miscallanous functions
  * COPYRIGHT:   Copyright 2006 Ged Murphy <gedmurphy@gmail.com>
  *

reactos/base/applications/mscutils/devmgmt/precomp.h

@@ -2,14 +2,18 @@
 #define __DEVMGMT_PRECOMP_H
 
 #include <stdarg.h>
-
 #include <windef.h>
 #include <winbase.h>
 #include <winuser.h>
 #include <winreg.h>
 #include <wingdi.h>
+#include <windowsx.h>
 #include <tchar.h>
 #include <setupapi.h>
+#include <cfgmgr32.h>
+#include <dll/devmgr/devmgr.h>
+#include <initguid.h>
+#include <devguid.h>
 
 #include "resource.h"
 
@@ -46,15 +50,6 @@ typedef struct _MAIN_WND_INFO
 } MAIN_WND_INFO, *PMAIN_WND_INFO;
 
 
-typedef struct _DEVCLASS_ENTRY
-{
-    GUID ClassGuid;
-    INT ClassImage;
-    BOOL bUsed;
-    HTREEITEM hItem;
-} DEVCLASS_ENTRY, *PDEVCLASS_ENTRY;
-
-
 INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 
 

reactos/base/applications/mscutils/devmgmt/rsrc.rc

@@ -1,20 +1,22 @@
-#include <windows.h>
-#include "resource.h"
-
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 IDI_MAIN_ICON   ICON    "res/computer.ico"
 IDB_ROOT_IMAGE  BITMAP  "res/root.bmp"
 
 /* main toolbar icons */
-IDB_TOOLBAR    BITMAP DISCARDABLE "res/toolbar.bmp"
+IDB_PROP    BITMAP DISCARDABLE "res/properties.bmp"
+IDB_REFRESH BITMAP DISCARDABLE "res/refresh.bmp"
+IDB_HELP    BITMAP DISCARDABLE "res/help.bmp"
+IDB_EXIT    BITMAP DISCARDABLE "res/exit.bmp"
 
 // UTF-8
 #pragma code_page(65001)
-
 #ifdef LANGUAGE_BG_BG
     #include "lang/bg-BG.rc"
 #endif
+#ifdef LANGUAGE_CS_CZ
+    #include "lang/cs-CZ.rc"
+#endif
 #ifdef LANGUAGE_DE_DE
     #include "lang/de-DE.rc"
 #endif
@@ -69,9 +71,6 @@ IDB_TOOLBAR    BITMAP DISCARDABLE "res/toolbar.bmp"
 #ifdef LANGUAGE_TH_TH
     #include "lang/th-TH.rc"
 #endif
-#ifdef LANGUAGE_TR_TR
-    #include "lang/tr-TR.rc"
-#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/uk-UA.rc"
 #endif

reactos/base/applications/mscutils/eventvwr/eventvwr.c

@@ -124,7 +124,6 @@ VOID FreeLogFilterList(VOID);
 
 ATOM MyRegisterClass(HINSTANCE);
 BOOL InitInstance(HINSTANCE, int);
-VOID ExitInstance(HINSTANCE);
 LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
 INT_PTR EventLogProperties(HINSTANCE, HWND, PEVENTLOGFILTER);
 INT_PTR CALLBACK EventDetails(HWND, UINT, WPARAM, LPARAM);
@@ -227,8 +226,6 @@ Cleanup:
     if (hStartStopEnumEvent)
         CloseHandle(hStartStopEnumEvent);
 
-    ExitInstance(hInstance);
-
 Quit:
     FreeLibrary(hRichEdit);
 
@@ -1091,9 +1088,10 @@ Quit:
     if (!Success)
     {
         if (pevlr->EventCategory != 0)
+        {
             StringCchPrintfW(CategoryName, MAX_PATH, L"(%lu)", pevlr->EventCategory);
-        else
-            LoadStringW(hInst, IDS_NONE, CategoryName, MAX_PATH);
+            Success = TRUE;
+        }
     }
 
     return Success;
@@ -1263,18 +1261,30 @@ GetEventType(IN WORD dwEventType,
 
 BOOL
 GetEventUserName(IN PEVENTLOGRECORD pelr,
+                 IN OUT PSID pLastSid,
                  OUT PWCHAR pszUser) // TODO: Add IN DWORD BufLen
 {
-    PSID pSid;
+    PSID pCurrentSid;
     PWSTR StringSid;
     WCHAR szName[1024];
     WCHAR szDomain[1024];
     SID_NAME_USE peUse;
     DWORD cchName = ARRAYSIZE(szName);
     DWORD cchDomain = ARRAYSIZE(szDomain);
+    BOOL Success;
 
     /* Point to the SID */
-    pSid = (PSID)((LPBYTE)pelr + pelr->UserSidOffset);
+    pCurrentSid = (PSID)((LPBYTE)pelr + pelr->UserSidOffset);
+
+    if (!IsValidSid(pCurrentSid))
+    {
+        pLastSid = NULL;
+        return FALSE;
+    }
+    else if (pLastSid && EqualSid(pLastSid, pCurrentSid))
+    {
+        return TRUE;
+    }
 
     /* User SID */
     if (pelr->UserSidLength > 0)
@@ -1286,7 +1296,7 @@ GetEventUserName(IN PEVENTLOGRECORD pelr,
          * 'pszUser', otherwise we return an error.
          */
         if (LookupAccountSidW(NULL, // FIXME: Use computer name? From the particular event?
-                              pSid,
+                              pCurrentSid,
                               szName,
                               &cchName,
                               szDomain,
@@ -1294,13 +1304,11 @@ GetEventUserName(IN PEVENTLOGRECORD pelr,
                               &peUse))
         {
             StringCchCopyW(pszUser, MAX_PATH, szName);
-            return TRUE;
+            Success = TRUE;
         }
-        else if (ConvertSidToStringSidW(pSid, &StringSid))
+        else if (ConvertSidToStringSidW(pCurrentSid, &StringSid))
         {
-            BOOL Success;
-
-            /* Copy the string only if the user-provided buffer is small enough */
+            /* Copy the string only if the user-provided buffer is big enough */
             if (wcslen(StringSid) + 1 <= MAX_PATH) // + 1 for NULL-terminator
             {
                 StringCchCopyW(pszUser, MAX_PATH, StringSid);
@@ -1314,12 +1322,12 @@ GetEventUserName(IN PEVENTLOGRECORD pelr,
 
             /* Free the allocated buffer */
             LocalFree(StringSid);
+        }
+    }
+
+    pLastSid = Success ? pCurrentSid : NULL;
 
     return Success;
-        }
-    }
-
-    return FALSE;
 }
 
 
@@ -1422,14 +1430,18 @@ EnumEventsThread(IN LPVOID lpParameter)
 
     ULONG LogIndex;
     HANDLE hEventLog;
-    PEVENTLOGRECORD pevlr, pevlrTmp = NULL;
-    DWORD dwRead, dwNeeded; // , dwThisRecord;
+    PEVENTLOGRECORD pEvlr;
+    PBYTE pEvlrEnd;
+    PBYTE pEvlrBuffer;
+    DWORD dwWanted, dwRead, dwNeeded, dwStatus = ERROR_SUCCESS;
     DWORD dwTotalRecords = 0, dwCurrentRecord = 0;
     DWORD dwFlags, dwMaxLength;
     size_t cchRemaining;
     LPWSTR lpszSourceName;
     LPWSTR lpszComputerName;
     BOOL bResult = TRUE; /* Read succeeded */
+    HANDLE hProcessHeap = GetProcessHeap();
+    PSID pLastSid = NULL;
 
     UINT uStep = 0, uStepAt = 0, uPos = 0;
 
@@ -1441,7 +1453,9 @@ EnumEventsThread(IN LPVOID lpParameter)
     WCHAR szEventTypeText[MAX_LOADSTRING];
     WCHAR szCategoryID[MAX_PATH];
     WCHAR szUsername[MAX_PATH];
+    WCHAR szNoUsername[MAX_PATH];
     WCHAR szCategory[MAX_PATH];
+    WCHAR szNoCategory[MAX_PATH];
     PWCHAR lpTitleTemplateEnd;
 
     SYSTEMTIME time;
@@ -1500,81 +1514,68 @@ EnumEventsThread(IN LPVOID lpParameter)
     }
 
     /* Set up the event records cache */
-    g_RecordPtrs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwTotalRecords * sizeof(*g_RecordPtrs));
+    g_RecordPtrs = HeapAlloc(hProcessHeap, HEAP_ZERO_MEMORY, dwTotalRecords * sizeof(*g_RecordPtrs));
     if (!g_RecordPtrs)
     {
         // ShowLastWin32Error();
-        goto Cleanup;
+        goto Quit;
     }
     g_TotalRecords = dwTotalRecords;
 
     if (WaitForSingleObject(hStopEnumEvent, 0) == WAIT_OBJECT_0)
         goto Quit;
 
+    LoadStringW(hInst, IDS_NOT_AVAILABLE, szNoUsername, ARRAYSIZE(szNoUsername));
+    LoadStringW(hInst, IDS_NONE, szNoCategory, ARRAYSIZE(szNoCategory));
+
     ProgressBar_SetRange(hwndStatusProgress, MAKELPARAM(0, 100));
     uStepAt = (dwTotalRecords / 100) + 1;
 
-    dwFlags = EVENTLOG_SEQUENTIAL_READ |
-             (NewestEventsFirst ? EVENTLOG_FORWARDS_READ
-                                : EVENTLOG_BACKWARDS_READ);
+    dwFlags = EVENTLOG_SEQUENTIAL_READ | (NewestEventsFirst ? EVENTLOG_FORWARDS_READ : EVENTLOG_BACKWARDS_READ);
 
-    while (dwCurrentRecord < dwTotalRecords)
-    {
-        //
-        // NOTE: We always allocate the minimum size for 1 record, and if
-        // the ReadEventLog call fails (it always will anyway), we reallocate
-        // the record pointer to be able to hold just 1 record, and then we
-        // redo that for each event.
-        // This is obviously not at all efficient (in terms of numbers of
-        // ReadEventLog calls), since ReadEventLog can fill the buffer with
-        // as many records they can fit completely in the buffer.
-        //
+    /* 0x7ffff is the maximum buffer size ReadEventLog will accept */
+    dwWanted = 0x7ffff;
+    pEvlr = HeapAlloc(hProcessHeap, 0, dwWanted);
 
-        pevlr = HeapAlloc(GetProcessHeap(), 0, sizeof(*pevlr));
-        if (!pevlr)
+    if (!pEvlr)
+        goto Quit;
+
+    while (dwStatus == ERROR_SUCCESS)
     {
-            /* Cannot allocate, just skip the event */
+        bResult =  ReadEventLogW(hEventLog, dwFlags, 0, pEvlr, dwWanted, &dwRead, &dwNeeded);
+        dwStatus = GetLastError();
+
+        if (!bResult && dwStatus == ERROR_INSUFFICIENT_BUFFER)
+        {
+            pEvlr = HeapReAlloc(hProcessHeap, 0, pEvlr, dwNeeded);
+            dwWanted = dwNeeded;
+
+            if (!pEvlr)
+                break;
+
+            bResult =  ReadEventLogW(hEventLog, dwFlags, 0, pEvlr, dwNeeded, &dwRead, &dwNeeded);
+
+            if (!bResult)
+                break;
+        }
+        else if (!bResult)
+        {
+            /* exit on other errors (ERROR_HANDLE_EOF) */
+            break;
+        }
+
+        pEvlrBuffer = (LPBYTE)pEvlr;
+        pEvlrEnd = pEvlrBuffer + dwRead;
+
+        while (pEvlrBuffer < pEvlrEnd)
+        {
+            PEVENTLOGRECORD pEvlrTmp = (PEVENTLOGRECORD)pEvlrBuffer;
+            PWSTR lpszUsername, lpszCategoryName;
             g_RecordPtrs[dwCurrentRecord] = NULL;
-            // --dwTotalRecords;
-            continue;
-        }
-        g_RecordPtrs[dwCurrentRecord] = pevlr;
 
-        bResult = ReadEventLogW(hEventLog,  // Event log handle
-                                dwFlags,    // Sequential read
-                                0,          // Ignored for sequential read
-                                pevlr,      // Pointer to buffer
-                                sizeof(*pevlr),   // Size of buffer
-                                &dwRead,    // Number of bytes read
-                                &dwNeeded); // Bytes in the next record
-        if (!bResult && (GetLastError () == ERROR_INSUFFICIENT_BUFFER))
-        {
-            pevlrTmp = HeapReAlloc(GetProcessHeap(), 0, pevlr, dwNeeded);
-            if (!pevlrTmp)
-            {
-                /* Cannot reallocate, just skip the event */
-                HeapFree(GetProcessHeap(), 0, pevlr);
-                g_RecordPtrs[dwCurrentRecord] = NULL;
-                // --dwTotalRecords;
-                continue;
-            }
-            pevlr = pevlrTmp;
-            g_RecordPtrs[dwCurrentRecord] = pevlr;
-
-            ReadEventLogW(hEventLog,  // event log handle
-                          dwFlags,    // read flags
-                          0,          // offset; default is 0
-                          pevlr,      // pointer to buffer
-                          dwNeeded,   // size of buffer
-                          &dwRead,    // number of bytes read
-                          &dwNeeded); // bytes in next record
-        }
-
-        while (dwRead > 0)
-        {
             // ProgressBar_StepIt(hwndStatusProgress);
             uStep++;
-            if(uStep % uStepAt == 0)
+            if (uStep % uStepAt == 0)
             {
                 ++uPos;
                 ProgressBar_SetPos(hwndStatusProgress, uPos);
@@ -1584,47 +1585,48 @@ EnumEventsThread(IN LPVOID lpParameter)
                 goto Quit;
 
             /* Filter by event type */
-            if (!FilterByType(EventLogFilter, pevlr))
+            if (!FilterByType(EventLogFilter, pEvlrTmp))
                 goto SkipEvent;
 
             /* Get the event source name and filter it */
-            lpszSourceName = (LPWSTR)((LPBYTE)pevlr + sizeof(EVENTLOGRECORD));
+            lpszSourceName = (LPWSTR)(pEvlrBuffer + sizeof(EVENTLOGRECORD));
             if (!FilterByString(EventLogFilter->Sources, lpszSourceName))
                 goto SkipEvent;
 
             /* Get the computer name and filter it */
-            lpszComputerName = (LPWSTR)((LPBYTE)pevlr + sizeof(EVENTLOGRECORD) + (wcslen(lpszSourceName) + 1) * sizeof(WCHAR));
+            lpszComputerName = (LPWSTR)((LPBYTE)pEvlrBuffer + sizeof(EVENTLOGRECORD) + (wcslen(lpszSourceName) + 1) * sizeof(WCHAR));
             if (!FilterByString(EventLogFilter->ComputerNames, lpszComputerName))
                 goto SkipEvent;
 
             /* Compute the event time */
-            EventTimeToSystemTime(pevlr->TimeWritten, &time);
+            EventTimeToSystemTime(pEvlrTmp->TimeWritten, &time);
             GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &time, NULL, szLocalDate, ARRAYSIZE(szLocalDate));
             GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &time, NULL, szLocalTime, ARRAYSIZE(szLocalTime));
 
-            LoadStringW(hInst, IDS_NOT_AVAILABLE, szUsername, ARRAYSIZE(szUsername));
-            LoadStringW(hInst, IDS_NONE, szCategory, ARRAYSIZE(szCategory));
-
             /* Get the username that generated the event, and filter it */
-            GetEventUserName(pevlr, szUsername);
-            if (!FilterByString(EventLogFilter->Users, szUsername))
+            lpszUsername = GetEventUserName(pEvlrTmp, pLastSid, szUsername) ? szUsername : szNoUsername;
+
+            if (!FilterByString(EventLogFilter->Users, lpszUsername))
                 goto SkipEvent;
 
             // TODO: Filter by event ID and category
+            GetEventType(pEvlrTmp->EventType, szEventTypeText);
 
-            GetEventType(pevlr->EventType, szEventTypeText);
-            GetEventCategory(EventLog->LogName, lpszSourceName, pevlr, szCategory);
+            lpszCategoryName = GetEventCategory(EventLog->LogName, lpszSourceName, pEvlrTmp, szCategory) ? szCategory : szNoCategory;
 
-            StringCbPrintfW(szEventID, sizeof(szEventID), L"%u", (pevlr->EventID & 0xFFFF));
-            StringCbPrintfW(szCategoryID, sizeof(szCategoryID), L"%u", pevlr->EventCategory);
+            StringCbPrintfW(szEventID, sizeof(szEventID), L"%u", (pEvlrTmp->EventID & 0xFFFF));
+            StringCbPrintfW(szCategoryID, sizeof(szCategoryID), L"%u", pEvlrTmp->EventCategory);
+
+            g_RecordPtrs[dwCurrentRecord] = HeapAlloc(hProcessHeap, 0, pEvlrTmp->Length);
+            RtlCopyMemory(g_RecordPtrs[dwCurrentRecord], pEvlrTmp, pEvlrTmp->Length);
 
             lviEventItem.mask = LVIF_IMAGE | LVIF_TEXT | LVIF_PARAM;
             lviEventItem.iItem = 0;
             lviEventItem.iSubItem = 0;
-            lviEventItem.lParam = (LPARAM)pevlr;
+            lviEventItem.lParam = (LPARAM)g_RecordPtrs[dwCurrentRecord];
             lviEventItem.pszText = szEventTypeText;
 
-            switch (pevlr->EventType)
+            switch (pEvlrTmp->EventType)
             {
                 case EVENTLOG_SUCCESS:
                 case EVENTLOG_INFORMATION_TYPE:
@@ -1653,21 +1655,22 @@ EnumEventsThread(IN LPVOID lpParameter)
             ListView_SetItemText(hwndListView, lviEventItem.iItem, 1, szLocalDate);
             ListView_SetItemText(hwndListView, lviEventItem.iItem, 2, szLocalTime);
             ListView_SetItemText(hwndListView, lviEventItem.iItem, 3, lpszSourceName);
-            ListView_SetItemText(hwndListView, lviEventItem.iItem, 4, szCategory);
+            ListView_SetItemText(hwndListView, lviEventItem.iItem, 4, lpszCategoryName);
             ListView_SetItemText(hwndListView, lviEventItem.iItem, 5, szEventID);
-            ListView_SetItemText(hwndListView, lviEventItem.iItem, 6, szUsername);
+            ListView_SetItemText(hwndListView, lviEventItem.iItem, 6, lpszUsername);
             ListView_SetItemText(hwndListView, lviEventItem.iItem, 7, lpszComputerName);
 
 SkipEvent:
-            dwRead -= pevlr->Length;
-            pevlr = (PEVENTLOGRECORD)((LPBYTE) pevlr + pevlr->Length);
-        }
-
+            pEvlrBuffer += pEvlrTmp->Length;
             dwCurrentRecord++;
         }
+    }
 
 Quit:
 
+    if (pEvlr)
+        HeapFree(hProcessHeap, 0, pEvlr);
+
     /* Close the event log */
     CloseEventLog(hEventLog);
 
@@ -2405,135 +2408,6 @@ FreeLogFilterList(VOID)
     return;
 }
 
-
-/*
- * ListView subclassing to handle WM_PAINT messages before and after they are
- * handled by the ListView window itself. We cannot use at this level the
- * custom-drawn notifications that are more suitable for drawing elements
- * inside the ListView.
- */
-static WNDPROC orgListViewWndProc = NULL;
-static BOOL IsLoading = FALSE;
-
-LRESULT CALLBACK
-ListViewWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-    switch (uMsg)
-    {
-        case LVM_PROGRESS:
-        {
-            /* TRUE: Create the dialog; FALSE: Destroy the dialog */
-            IsLoading = !!(BOOL)lParam;
-            return IsLoading;
-        }
-
-        case WM_PAINT:
-        {
-            /* This code is adapted from: http://www.codeproject.com/Articles/216/Indicating-an-empty-ListView */
-
-            int nItemCount;
-
-            PAINTSTRUCT ps;
-            HDC hDC;
-            HWND hwndHeader;
-            RECT rc, rcH;
-            COLORREF crTextOld, crTextBkOld;
-            NONCLIENTMETRICSW ncm;
-            HFONT hFont, hFontOld;
-            LPWSTR lpszString;
-
-            nItemCount = ListView_GetItemCount(hWnd);
-            if (!IsLoading && nItemCount > 0)
-                break;
-
-            /*
-             * NOTE:
-             * We could have used lpNMCustomDraw->nmcd.rc for the rectangle,
-             * but this one actually holds the rectangle of the list view
-             * that is being currently repainted, so that it can be smaller
-             * than the list view proper. This is especially true when using
-             * COMCTL32.DLL version <= 6.0 .
-             */
-
-            GetClientRect(hWnd, &rc);
-            hwndHeader = ListView_GetHeader(hWnd);
-            if (hwndHeader)
-            {
-                /* Note that we could also use Header_GetItemRect() */
-                GetClientRect(hwndHeader, &rcH);
-                rc.top += rcH.bottom;
-            }
-
-            /* Add some space between the top of the list view and the text */
-            rc.top += 10;
-
-            BeginPaint(hWnd, &ps);
-            /*
-             * NOTE: Using a secondary hDC (and not the ps.hdc) gives the strange
-             * property that the text is always recentered on the current view of
-             * the window, instead of being scrolled together with the contents of
-             * the list view...
-             */
-            // hDC = ps.hdc;
-            hDC = GetDC(hWnd);
-
-            /*
-             * NOTE: We could have kept lpNMCustomDraw->clrText and
-             * lpNMCustomDraw->clrTextBk, but they usually do not contain
-             * the correct default colors for the items / default text.
-             */
-            crTextOld =
-                SetTextColor(hDC, GetSysColor(COLOR_WINDOWTEXT));
-            crTextBkOld =
-                SetBkColor(hDC, GetSysColor(COLOR_WINDOW));
-
-            // FIXME: Cache the font?
-            ncm.cbSize = sizeof(ncm);
-            hFont = NULL;
-            if (SystemParametersInfoW(SPI_GETNONCLIENTMETRICS,
-                                      sizeof(ncm), &ncm, 0))
-            {
-                hFont = CreateFontIndirectW(&ncm.lfMessageFont);
-            }
-            if (!hFont)
-                hFont = GetStockFont(DEFAULT_GUI_FONT);
-
-            hFontOld = (HFONT)SelectObject(hDC, hFont);
-
-            FillRect(hDC, &rc, GetSysColorBrush(COLOR_WINDOW));
-
-            if (nItemCount <= 0)
-                lpszString = szEmptyList;
-            else // if (IsLoading)
-                lpszString = szLoadingWait;
-
-            DrawTextW(hDC,
-                      lpszString,
-                      -1,
-                      &rc,
-                      DT_CENTER | DT_WORDBREAK | DT_NOPREFIX | DT_NOCLIP);
-
-            SelectObject(hDC, hFontOld);
-            if (hFont)
-                DeleteObject(hFont);
-
-            SetBkColor(hDC, crTextBkOld);
-            SetTextColor(hDC, crTextOld);
-
-            ReleaseDC(hWnd, hDC);
-            EndPaint(hWnd, &ps);
-
-            break;
-        }
-
-        // case WM_ERASEBKGND:
-        //     break;
-    }
-
-    /* Continue with default message processing */
-    return CallWindowProcW(orgListViewWndProc, hWnd, uMsg, wParam, lParam);
-}
-
 BOOL
 InitInstance(HINSTANCE hInstance,
              int nCmdShow)
@@ -2748,11 +2622,6 @@ InitInstance(HINSTANCE hInstance,
     lvc.pszText = szTemp;
     ListView_InsertColumn(hwndListView, 7, &lvc);
 
-    /* Subclass the ListView */
-    // orgListViewWndProc = SubclassWindow(hwndListView, ListViewWndProc);
-    orgListViewWndProc = (WNDPROC)(LONG_PTR)GetWindowLongPtrW(hwndListView, GWLP_WNDPROC);
-    SetWindowLongPtrW(hwndListView, GWLP_WNDPROC, (LONG_PTR)ListViewWndProc);
-
     /* Initialize the save Dialog */
     ZeroMemory(&sfn, sizeof(sfn));
     ZeroMemory(szSaveFilter, sizeof(szSaveFilter));
@@ -2773,15 +2642,6 @@ InitInstance(HINSTANCE hInstance,
     return TRUE;
 }
 
-VOID
-ExitInstance(HINSTANCE hInstance)
-{
-    /* Restore the original ListView WndProc */
-    // SubclassWindow(hwndListView, orgListViewWndProc);
-    SetWindowLongPtrW(hwndListView, GWLP_WNDPROC, (LONG_PTR)orgListViewWndProc);
-    orgListViewWndProc = NULL;
-}
-
 VOID ResizeWnd(INT cx, INT cy)
 {
     HDWP hdwp;

reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc

@@ -4,28 +4,28 @@ IDM_EVENTVWR MENU
 BEGIN
     POPUP "&Protokol"
     BEGIN
-        MENUITEM "&Open...", IDM_OPEN_EVENTLOG
-        MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG
-        MENUITEM "&Close", IDM_CLOSE_EVENTLOG
+        MENUITEM "&Otevřít...", IDM_OPEN_EVENTLOG
+        MENUITEM "Uložit &Protokol jako...", IDM_SAVE_EVENTLOG
+        MENUITEM "&Zavřít", IDM_CLOSE_EVENTLOG
         MENUITEM SEPARATOR
         MENUITEM "&Odstranit události", IDM_CLEAR_EVENTS
-        MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG
-        MENUITEM "Log Se&ttings...", IDM_EVENTLOG_SETTINGS
+        MENUITEM "&Přejmenovat\tF2", IDM_RENAME_EVENTLOG
+        MENUITEM "Nastavení protokolování...", IDM_EVENTLOG_SETTINGS
         MENUITEM SEPARATOR
         MENUITEM "&Konec", IDM_EXIT
     END
     POPUP "&Zobrazit"
     BEGIN
-        MENUITEM "&Newest first", IDM_LIST_NEWEST
-        MENUITEM "&Oldest first", IDM_LIST_OLDEST
+        MENUITEM "&Od nejnovějšího", IDM_LIST_NEWEST
+        MENUITEM "Od &nejstaršího", IDM_LIST_OLDEST
         MENUITEM SEPARATOR
-        MENUITEM "&Details...\tEnter", IDM_EVENT_DETAILS
+        MENUITEM "&Podrobnosti...\tEnter", IDM_EVENT_DETAILS
         MENUITEM SEPARATOR
         MENUITEM "&Obnovit\tF5", IDM_REFRESH
     END
     POPUP "&Možnosti"
     BEGIN
-        MENUITEM "&Show event details view", IDM_SHOW_EVENT_DETAILS_VIEW
+        MENUITEM "&Zobrazit podrobnosti", IDM_SHOW_EVENT_DETAILS_VIEW
     END
     POPUP "&Nápověda"
     BEGIN
@@ -73,7 +73,7 @@ BEGIN
     LTEXT "&Uživatel:", IDC_STATIC, 8, 35, 36, 8
     EDITTEXT IDC_EVENTUSERSTATIC, 46, 35, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
     LTEXT "P&očítač:", IDC_STATIC, 8, 45, 36, 8
-    EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 52, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
 
     PUSHBUTTON "", IDC_PREVIOUS, 230, 5, 28, 14, BS_ICON
     PUSHBUTTON "", IDC_NEXT, 230, 21, 28, 14, BS_ICON
@@ -90,40 +90,40 @@ END
 
 IDD_LOGPROPERTIES_GENERAL DIALOGEX 0, 0, 252, 234
 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION
-CAPTION "General"
+CAPTION "Obecné"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "&Display name:", IDC_STATIC, 7, 9, 60, 8
+    LTEXT "&Zobrazovaný název:", IDC_STATIC, 7, 9, 60, 8
     EDITTEXT IDC_DISPLAYNAME, 67, 7, 178, 12, ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
-    LTEXT "&Log name:", IDC_STATIC, 7, 25, 60, 8
+    LTEXT "&Název protokolu:", IDC_STATIC, 7, 25, 60, 8
     EDITTEXT IDC_LOGNAME, 67, 23, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
-    LTEXT "Log &file:", IDC_STATIC, 7, 41, 60, 8
+    LTEXT "Soubor &protokolu:", IDC_STATIC, 7, 41, 60, 8
     EDITTEXT IDC_LOGFILE, 67, 39, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
-    LTEXT "Size:", IDC_STATIC, 7, 57, 60, 8
+    LTEXT "Velikost:", IDC_STATIC, 7, 57, 60, 8
     EDITTEXT IDC_SIZE_LABEL, 67, 57, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Created:", IDC_STATIC, 7, 69, 60, 8
+    LTEXT "Vytvořeno:", IDC_STATIC, 7, 69, 60, 8
     EDITTEXT IDC_CREATED_LABEL, 67, 69, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Modified:", IDC_STATIC, 7, 81, 60, 8
+    LTEXT "Změněno:", IDC_STATIC, 7, 81, 60, 8
     EDITTEXT IDC_MODIFIED_LABEL, 67, 81, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Accessed:", IDC_STATIC, 7, 93, 60, 8
+    LTEXT "Poslední přístup:", IDC_STATIC, 7, 93, 60, 8
     EDITTEXT IDC_ACCESSED_LABEL, 67, 93, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    GROUPBOX "Log size", IDC_STATIC, 7, 106, 238, 99
-    LTEXT "&Maximum log size:", IDC_STATIC, 17, 122, 58, 8
+    GROUPBOX "Velikost výpisu", IDC_STATIC, 7, 106, 238, 99
+    LTEXT "&Maximální velikost:", IDC_STATIC, 17, 122, 58, 8
     EDITTEXT IDC_EDIT_MAXLOGSIZE, 80, 119, 40, 14, ES_LEFT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_MAXLOGSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 119, 10, 14
     LTEXT "KB", IDC_STATIC, 130, 122, 20, 8
-    LTEXT "When maximum log size is reached:", IDC_STATIC, 17, 140, 219, 8
-    CONTROL "&Overwrite events as needed", IDC_OVERWRITE_AS_NEEDED, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 17, 155, 219, 10
-    CONTROL "O&verwrite events older than", IDC_OVERWRITE_OLDER_THAN, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 17, 168, 102, 10
+    LTEXT "Pokud je dosažena maximální velikost:", IDC_STATIC, 17, 140, 219, 8
+    CONTROL "&Přepsat události podle potřeby", IDC_OVERWRITE_AS_NEEDED, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 17, 155, 219, 10
+    CONTROL "Př&epsat události starší než", IDC_OVERWRITE_OLDER_THAN, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 17, 168, 102, 10
     EDITTEXT IDC_EDIT_EVENTS_AGE, 122, 165, 35, 14, ES_LEFT | ES_NUMBER | WS_GROUP
     CONTROL "", IDC_UPDOWN_EVENTS_AGE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 157, 165, 10, 14
-    LTEXT "days", IDC_STATIC, 162, 168, 20, 8
-    CONTROL "Do &not overwrite events\n(clear log manually)", IDC_NO_OVERWRITE, "Button", BS_AUTORADIOBUTTON | BS_MULTILINE | WS_GROUP | WS_TABSTOP, 17, 180, 143, 20
-    PUSHBUTTON "&Restore Defaults", IDC_RESTOREDEFAULTS, 166, 183, 70, 14
-    AUTOCHECKBOX "Using a lo&w-speed connection", IDC_LOW_SPEED_CONNECTION, 7, 217, 167, 10
-    PUSHBUTTON "&Clear Log", ID_CLEARLOG, 195, 213, 50, 14
+    LTEXT "dny", IDC_STATIC, 162, 168, 20, 8
+    CONTROL "&Nepřepisovat události\n(vyčistit protokol ručně)", IDC_NO_OVERWRITE, "Button", BS_AUTORADIOBUTTON | BS_MULTILINE | WS_GROUP | WS_TABSTOP, 17, 180, 143, 20
+    PUSHBUTTON "&Obnovit výchozí", IDC_RESTOREDEFAULTS, 166, 183, 70, 14
+    AUTOCHECKBOX "&Užívá pomalé připojení", IDC_LOW_SPEED_CONNECTION, 7, 217, 167, 10
+    PUSHBUTTON "&Vyčistit", ID_CLEARLOG, 195, 213, 50, 14
 END
 
 STRINGTABLE
@@ -133,10 +133,10 @@ BEGIN
     IDS_APP_TITLE_EX "%s - Protkol %s na \\\\"
     IDS_STATUS_MSG "Počet událostí v protokolu %s: %lu (listed: %lu)"
     IDS_LOADING_WAIT "Načítám protokol událostí. Prosím čekejte..."
-    IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log."
-    IDS_EVENTLOG_SYSTEM "System Logs"
-    IDS_EVENTLOG_APP "Application Logs"
-    IDS_EVENTLOG_USER "User Logs"
+    IDS_NO_ITEMS "Žádné události v tomto výpisu." // "No events in this log."
+    IDS_EVENTLOG_SYSTEM "Systémové protokoly"
+    IDS_EVENTLOG_APP "Protokoly aplikací"
+    IDS_EVENTLOG_USER "Uživatelské protokoly"
     IDS_EVENTSTRINGIDNOTFOUND "Popis ID události ( %lu ) zdroj ( %s ) nebyl nalezen. Místní počítač neobsahuje potřebné informace v registru nebo chybí DLL soubory pro zobrazení zpráv ze vzdáleného počítače.\n\nThe following information is part of the event:\n\n"
     IDS_CLEAREVENTS_MSG "Chcete tento protokol před odstraněním uložit?"
     IDS_SAVE_FILTER "Protokol událostí (*.evt)\0*.evt\0"
@@ -155,7 +155,7 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_BYTES_FORMAT "bytes" // "%s bytes"
+    IDS_BYTES_FORMAT "byty" // "%s bytes"
     // "%1!ls! (%2!ls! bytes)"
 END
 
@@ -173,15 +173,15 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_COPY "Event Type:     %s\r\n\
-Event Source:   %s\r\n\
-Event Category: %s\r\n\
-Event ID:       %s\r\n\
-Date:           %s\r\n\
-Time:           %s\r\n\
-User:           %s\r\n\
-Computer:       %s\r\n\
-Description:\r\n%s"
+    IDS_COPY "Typ události:     %s\r\n\
+Zdroj:     %s\r\n\
+Kategorie: %s\r\n\
+ID:        %s\r\n\
+Datum:     %s\r\n\
+Čas:       %s\r\n\
+Uživatel:  %s\r\n\
+Počítač:   %s\r\n\
+Popis:     \r\n%s"
 END
 
 STRINGTABLE

reactos/base/applications/mscutils/servman/lang/cs-CZ.rc

@@ -75,7 +75,7 @@ BEGIN
 END
 
 IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232
-CAPTION "General"
+CAPTION "Obecné"
 FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_GROUP | WS_TABSTOP
 BEGIN
@@ -102,52 +102,52 @@ BEGIN
 END
 
 IDD_LOGON DIALOGEX 6, 6, 253, 232
-CAPTION "Log On"
+CAPTION "Přihlášení"
 FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_GROUP | WS_TABSTOP
 BEGIN
-    LTEXT "Log on as:", IDC_STATIC, 7, 7, 238, 8
-    AUTORADIOBUTTON "&Local System account", IDC_LOGON_SYSTEMACCOUNT, 7, 22, 238, 10, BS_TOP | BS_MULTILINE | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "&This account:", IDC_LOGON_THISACCOUNT, 7, 52, 60, 10, BS_TOP | BS_MULTILINE | WS_CHILD | WS_VISIBLE
-    AUTOCHECKBOX "Allo&w service to interact with desktop", IDC_LOGON_INTERACTIVE, 18, 34, 227, 10, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP | BS_TOP | BS_MULTILINE
+    LTEXT "Přihlásit jako:", IDC_STATIC, 7, 7, 238, 8
+    AUTORADIOBUTTON "&Místní systémový účet", IDC_LOGON_SYSTEMACCOUNT, 7, 22, 238, 10, BS_TOP | BS_MULTILINE | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "&Tento účets:", IDC_LOGON_THISACCOUNT, 7, 52, 60, 10, BS_TOP | BS_MULTILINE | WS_CHILD | WS_VISIBLE
+    AUTOCHECKBOX "Povolit &aplikaci používat plochu", IDC_LOGON_INTERACTIVE, 18, 34, 227, 10, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP | BS_TOP | BS_MULTILINE
     EDITTEXT IDC_LOGON_ACCOUNTNAME, 72, 50, 103, 14, ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON "&Browse...", IDC_LOGON_SEARCH, 185, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    LTEXT "&Password:", IDC_LOGON_PW1TEXT, 18, 71, 33, 8, WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_GROUP
+    PUSHBUTTON "&Procházet...", IDC_LOGON_SEARCH, 185, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    LTEXT "&Heslo:", IDC_LOGON_PW1TEXT, 18, 71, 33, 8, WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_GROUP
     EDITTEXT IDC_LOGON_PASSWORD1, 72, 68, 104, 14, ES_LEFT | ES_PASSWORD | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
-    LTEXT "&Confirm password:", IDC_LOGON_PW2TEXT, 18, 84, 47, 18, WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_GROUP
+    LTEXT "P&otvrdit heslo:", IDC_LOGON_PW2TEXT, 18, 84, 47, 18, WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_GROUP
     EDITTEXT IDC_LOGON_PASSWORD2, 72, 86, 104, 14, ES_LEFT | ES_PASSWORD | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
-    LTEXT "You can enable or disable this service for the hardware profiles listed below:", IDC_STATIC, 7, 114, 210, 8, WS_CHILD | WS_VISIBLE | WS_GROUP
+    LTEXT "Tuto službu můžete povolit nebo zakázat pro nsáledující hardwarové profily:", IDC_STATIC, 7, 114, 210, 8, WS_CHILD | WS_VISIBLE | WS_GROUP
     CONTROL "", IDC_LOGON_HWPROFILE, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP, 7, 124, 238, 65
-    PUSHBUTTON "&Enable", IDC_LOGON_HWENABLE, 116, 197, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED
-    PUSHBUTTON "&Disable", IDC_LOGON_HWDISABLE, 185, 197, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED
+    PUSHBUTTON "Po&volit", IDC_LOGON_HWENABLE, 116, 197, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED
+    PUSHBUTTON "&Zakázat", IDC_LOGON_HWDISABLE, 185, 197, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED
 END
 
 IDD_RECOVERY DIALOGEX 6, 6, 253, 232
-CAPTION "Recovery"
+CAPTION "Obnovení"
 FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_GROUP | WS_TABSTOP
 BEGIN
-    LTEXT "Select the computer's response if this service fails.", IDC_STATIC, 7, 7, 238, 8
-    LTEXT "&First failure:", IDC_STATIC, 7, 24, 92, 8
+    LTEXT "Zvolte, co dělat v případě, že služba selže.", IDC_STATIC, 7, 7, 238, 8
+    LTEXT "&První selhání:", IDC_STATIC, 7, 24, 92, 8
     COMBOBOX IDC_FIRST_FAILURE, 104, 22, 141, 147, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
-    LTEXT "&Second failure:", IDC_STATIC, 7, 41, 92, 8
+    LTEXT "&Druhé selhání:", IDC_STATIC, 7, 41, 92, 8
     COMBOBOX IDC_SECOND_FAILURE, 104, 39, 141, 147, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
-    LTEXT "Subsequent failures:", IDC_STATIC, 7, 58, 92, 8
+    LTEXT "&Následná selhání:", IDC_STATIC, 7, 58, 92, 8
     COMBOBOX IDC_SUBSEQUENT_FAILURES, 104, 56, 141, 147, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
-    LTEXT "Reset fail c&ounter after:", IDC_STATIC, 7, 75, 72, 8
+    LTEXT "&Vymazat čítač selhání po:", IDC_STATIC, 7, 75, 72, 8
     EDITTEXT IDC_RESET_TIME, 104, 73, 40, 13, WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP | ES_LEFT | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT "days", IDC_STATIC, 150, 75, 95, 8
-    LTEXT "Restart ser&vice after:", IDC_RESTART_TEXT1, 7, 92, 92, 8
+    LTEXT "dnech", IDC_STATIC, 150, 75, 95, 8
+    LTEXT "Restartovat &službu po:", IDC_RESTART_TEXT1, 7, 92, 92, 8
     EDITTEXT IDC_RESTART_TIME, 104, 90, 40, 13, WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP | ES_LEFT | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT "minutes", IDC_RESTART_TEXT2, 150, 92, 95, 8
-    GROUPBOX "Run program", IDC_RUN_GROUPBOX, 7, 108, 238, 80
-    LTEXT "&Program:", IDC_RUN_TEXT1, 14, 121, 168, 8
+    LTEXT "minutách", IDC_RESTART_TEXT2, 150, 92, 95, 8
+    GROUPBOX "Spustit aplikaci", IDC_RUN_GROUPBOX, 7, 108, 238, 80
+    LTEXT "&Aplikace:", IDC_RUN_TEXT1, 14, 121, 168, 8
     EDITTEXT IDC_PROGRAM, 14, 131, 165, 14
-    PUSHBUTTON "&Browse...", IDC_BROWSE_PROGRAM, 180, 131, 58, 14
-    LTEXT "&Command line parameters:", IDC_RUN_TEXT2, 14, 155, 108, 8
+    PUSHBUTTON "&Procházet...", IDC_BROWSE_PROGRAM, 180, 131, 58, 14
+    LTEXT "Pa&rametry příkazového řádku:", IDC_RUN_TEXT2, 14, 155, 108, 8
     EDITTEXT IDC_PARAMETERS, 128, 152, 110, 14
-    AUTOCHECKBOX "Append fail count to &end of command line (/fail=%1%)", IDC_ADD_FAILCOUNT, 14, 171, 219, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_TOP | BS_MULTILINE
-    PUSHBUTTON "&Restart Computer Options...", IDC_RESTART_OPTIONS, 116, 197, 129, 14
+    AUTOCHECKBOX "Připojit počet selhání na &konec příkazu (/fail=%1%)", IDC_ADD_FAILCOUNT, 14, 171, 219, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_TOP | BS_MULTILINE
+    PUSHBUTTON "&Možnosti restartování počítače...", IDC_RESTART_OPTIONS, 116, 197, 129, 14
 END
 
 IDD_DLG_DEPEND DIALOGEX 6, 6, 253, 225
@@ -331,14 +331,14 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_NO_ACTION "Take no action"
-    IDS_RESTART_SERVICE "Restart the Service"
-    IDS_RUN_PROGRAM "Run a Program"
-    IDS_RESTART_COMPUTER "Restart the Computer"
+    IDS_NO_ACTION "Nevykonávat žádnou akci"
+    IDS_RESTART_SERVICE "Restartovat službu"
+    IDS_RUN_PROGRAM "Spustit aplikaci"
+    IDS_RESTART_COMPUTER "Restartovat počítač"
 END
 
 STRINGTABLE
 BEGIN
-    IDS_NOT_SAME_PASSWORD "The Passwords are not the same!"
-    IDS_INVALID_PASSWORD "Enter a valid Password!"
+    IDS_NOT_SAME_PASSWORD "Hesla nesouhlasí!"
+    IDS_INVALID_PASSWORD "Zadejte platné heslo!"
 END

reactos/base/applications/mspaint/lang/cs-CZ.rc

@@ -167,9 +167,9 @@ END
 IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 150
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
-CAPTION "Stretch and skew image"
+CAPTION "Roztáhnout a zkosit"
 BEGIN
-    GROUPBOX "Stretch", IDD_STRETCHSKEWGROUPSTRETCH, 6, 6, 158, 66
+    GROUPBOX "Roztáhnout", IDD_STRETCHSKEWGROUPSTRETCH, 6, 6, 158, 66
     ICON IDI_HORZSTRETCH, IDD_STRETCHSKEWICONHSTRETCH, 12, 18, 32, 32
     LTEXT "Vodorovně:", IDD_STRETCHSKEWTEXTHSTRETCH, 45, 24, 40, 10
     EDITTEXT IDD_STRETCHSKEWEDITHSTRETCH, 90, 23, 32, 12
@@ -178,15 +178,15 @@ BEGIN
     LTEXT "Svisle:", IDD_STRETCHSKEWTEXTVSTRETCH, 45, 49, 40, 10
     EDITTEXT IDD_STRETCHSKEWEDITVSTRETCH, 90, 48, 32, 12
     LTEXT "%", IDD_STRETCHSKEWTEXTVPERCENT, 125, 49, 15, 10
-    GROUPBOX "Skew", IDD_STRETCHSKEWGROUPSKEW, 6, 76, 158, 66
+    GROUPBOX "Zkosit", IDD_STRETCHSKEWGROUPSKEW, 6, 76, 158, 66
     ICON IDI_HORZSKEW, IDD_STRETCHSKEWICONHSKEW, 12, 88, 32, 32
     LTEXT "Vodorovně:", IDD_STRETCHSKEWTEXTHSKEW, 45, 94, 40, 10
     EDITTEXT IDD_STRETCHSKEWEDITHSKEW, 90, 93, 32, 12
-    LTEXT "degrees", IDD_STRETCHSKEWTEXTHDEG, 125, 94, 30, 10
+    LTEXT "stupně", IDD_STRETCHSKEWTEXTHDEG, 125, 94, 30, 10
     ICON IDI_VERTSKEW, IDD_STRETCHSKEWICONVSKEW, 12, 113, 32, 32
     LTEXT "Svisle:", IDD_STRETCHSKEWTEXTVSKEW, 45, 119, 40, 10
     EDITTEXT IDD_STRETCHSKEWEDITVSKEW, 90, 118, 32, 12
-    LTEXT "degrees", IDD_STRETCHSKEWTEXTVDEG, 125, 119, 30, 10
+    LTEXT "stupně", IDD_STRETCHSKEWTEXTVDEG, 125, 119, 30, 10
     DEFPUSHBUTTON "OK", IDOK, 170, 8, 48, 14
     PUSHBUTTON "Storno", IDCANCEL, 170, 24, 48, 14
 END
@@ -220,9 +220,9 @@ BEGIN
     IDS_ALLPICTUREFILES "All Picture Files"
     IDS_FILESIZE "%d bajtů"
     IDS_PRINTRES "%d x %d pixelů na metr"
-    IDS_INTNUMBERS "Please enter integral numbers only!"
-    IDS_PERCENTAGE "The percentage must be between 1 and 500."
-    IDS_ANGLE "The angle must be between -89 and 89."
-    IDS_LOADERRORTEXT "The file %s could not be loaded."
-    IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?"
+    IDS_INTNUMBERS "Zadávejte pouze celá čísla!"
+    IDS_PERCENTAGE "Měřítko musí být mezi 1 a 500."
+    IDS_ANGLE "Úhel musí být -89 a 89."
+    IDS_LOADERRORTEXT "Soubor %s nemohl být načten."
+    IDS_ENLARGEPROMPTTEXT "Obrázek ve schránce je větší než bitmapa.\nChcete bitmapu zvětšit?"
 END

reactos/base/applications/notepad/lang/cs-CZ.rc

@@ -32,7 +32,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Konec", CMD_EXIT
     END
-    POPUP "U&pravit"
+    POPUP "Upr&avit"
     BEGIN
         MENUITEM "&Zpět\tCtrl+Z", CMD_UNDO
         MENUITEM SEPARATOR
@@ -41,15 +41,15 @@ BEGIN
         MENUITEM "&Vložit\tCtrl+V", CMD_PASTE
         MENUITEM "&Smazat\tDel", CMD_DELETE
         MENUITEM SEPARATOR
-        MENUITEM "&Hledej\tCtrl+F", CMD_SEARCH
-        MENUITEM "&Najdi další\tF3", CMD_SEARCH_NEXT
-        MENUITEM "Replace...\tCtrl+H", CMD_REPLACE
-        MENUITEM "Go To...\tCtrl+G", CMD_GOTO
+        MENUITEM "&Najít\tCtrl+F", CMD_SEARCH
+        MENUITEM "Najít &další\tF3", CMD_SEARCH_NEXT
+        MENUITEM "Na&hradit...\tCtrl+H", CMD_REPLACE
+        MENUITEM "&Přejít...\tCtrl+G", CMD_GOTO
         MENUITEM SEPARATOR
-        MENUITEM "Vybrat vš&e\tCtrl+A", CMD_SELECT_ALL
-        MENUITEM "Č&as/Datum\tF5", CMD_TIME_DATE
+        MENUITEM "Vy&brat vše\tCtrl+A", CMD_SELECT_ALL
+        MENUITEM "Čas/Dat&um\tF5", CMD_TIME_DATE
     END
-    POPUP "F&ormát"
+    POPUP "&Formát"
     BEGIN
         MENUITEM "Zalo&mit dlouhé řádky", CMD_WRAP
         MENUITEM "&Písmo...", CMD_FONT
@@ -58,12 +58,12 @@ BEGIN
     BEGIN
         MENUITEM "&Stavový řádek", CMD_STATUSBAR
     END
-    POPUP "&Nápověda"
+    POPUP "Nápo&věda"
     BEGIN
-        MENUITEM "O&bsah", CMD_HELP_CONTENTS
+        MENUITEM "Zobrazit &nápovědu", CMD_HELP_CONTENTS
         MENUITEM SEPARATOR
         MENUITEM "&O programu...", CMD_ABOUT
-        MENUITEM "In&fo...", CMD_HELP_ABOUT_NOTEPAD
+        MENUITEM "&Informace...", CMD_HELP_ABOUT_NOTEPAD
     END
 END
 
@@ -71,37 +71,37 @@ END
 DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP
 FONT 8, "MS Shell Dlg"
-CAPTION "Page Setup"
+CAPTION "Nastavení stránky"
 BEGIN
-    GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX
+    GROUPBOX "Náhled", 0, 240, 6, 120, 153, BS_GROUPBOX
     CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80
     CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80
     CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4
-    GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX
-    LTEXT "&Size:", stc2, 16, 22, 36, 8
+    GROUPBOX "Papír", grp2, 8, 6, 224, 56, BS_GROUPBOX
+    LTEXT "&Velikost:", stc2, 16, 22, 36, 8
     COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
-    LTEXT "&Tray:", stc3, 16, 42, 36, 8
+    LTEXT "&Zásobník:", stc3, 16, 42, 36, 8
     COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
-    GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX
-    AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
-    AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
-    GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX
-    LTEXT "L&eft:", stc15, 88, 82, 30, 8
+    GROUPBOX "Otočení", grp1, 8, 66, 64, 56, BS_GROUPBOX
+    AUTORADIOBUTTON "Na &výšku", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
+    AUTORADIOBUTTON "&Na šířku", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
+    GROUPBOX "Ohraničení", grp4, 80, 66, 152, 56, BS_GROUPBOX
+    LTEXT "V&levo:", stc15, 88, 82, 30, 8
     EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
-    LTEXT "&Right:", stc16, 159, 82, 30, 8
+    LTEXT "V&pravo:", stc16, 159, 82, 30, 8
     EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
-    LTEXT "T&op:", stc17, 88, 102, 30, 8
+    LTEXT "&Nahoře:", stc17, 88, 102, 30, 8
     EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
-    LTEXT "&Bottom:", stc18, 159, 102, 30, 8
+    LTEXT "&Dole:", stc18, 159, 102, 30, 8
     EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
-    LTEXT "&Header:", 0x140, 8, 132, 40, 15
+    LTEXT "&Záhlaví:", 0x140, 8, 132, 40, 15
     EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "&Footer:", 0x142, 8, 149, 40, 15
+    LTEXT "Zá&patí:", 0x142, 8, 149, 40, 15
     EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
-    PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14
+    PUSHBUTTON "Nápověda", IDHELP, 8, 170, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON
-    PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14
-    PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14
+    PUSHBUTTON "Storno", IDCANCEL, 254, 170, 50, 14
+    PUSHBUTTON "&Tiskárna...", psh3, 310, 170, 50, 14
 END
 
 /* Dialog 'Encoding' */
@@ -120,7 +120,7 @@ END
 DIALOG_GOTO DIALOGEX 0, 0, 165, 50
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
-CAPTION "Jít na řádek"
+CAPTION "Přejít na řádek"
 BEGIN
     EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP
     LTEXT "Číslo řádku:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER
@@ -181,7 +181,7 @@ paměti."
     STRING_LF "Unix (LF)"
     STRING_CR "Mac (CR)"
     STRING_LINE_COLUMN "Řádek %d, sloupec %d"
-    STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly."
+    STRING_PRINTERROR "Soubor '%s' nebylo možné vytisknout.\n\nZkontrolujte, zda je tiskárna zapnutá a správně nastavená."
 
-    STRING_TEXT_DOCUMENT "Text Document"
+    STRING_TEXT_DOCUMENT "Textový dokument"
 END

reactos/base/applications/osk/lang/cs-CZ.rc

@@ -0,0 +1,128 @@
+/*
+ * PROJECT:         ReactOS Kernel
+ * LICENSE:         GPL - See COPYING in the top level directory
+ * FILE:            base/applications/osk/lang/cs-CZ.rc
+ * PURPOSE:         On screen keyboard (American resources).
+ * PROGRAMMERS:     Denis ROBERT
+ */
+
+LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
+
+MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164
+CAPTION "Klávesnice na obrazovce"
+FONT 8, "MS Shell Dlg"
+EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE
+BEGIN
+    PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,23,22
+    PUSHBUTTON      "F1",SCAN_CODE_112,48,3,23,22
+    PUSHBUTTON      "F2",SCAN_CODE_113,75,3,23,22
+    PUSHBUTTON      "F3",SCAN_CODE_114,101,3,23,22
+    PUSHBUTTON      "F4",SCAN_CODE_115,128,3,23,22
+    PUSHBUTTON      "F5",SCAN_CODE_116,173,3,23,22
+    PUSHBUTTON      "F6",SCAN_CODE_117,199,3,23,22
+    PUSHBUTTON      "F7",SCAN_CODE_118,225,3,23,22
+    PUSHBUTTON      "F8",SCAN_CODE_119,251,3,23,22
+    PUSHBUTTON      "F9",SCAN_CODE_120,296,3,23,22
+    PUSHBUTTON      "F10",SCAN_CODE_121,323,3,23,22
+    PUSHBUTTON      "F11",SCAN_CODE_122,350,3,23,22
+    PUSHBUTTON      "F12",SCAN_CODE_123,377,3,23,22
+    PUSHBUTTON      "Prn",SCAN_CODE_124,411,3,23,22
+    PUSHBUTTON      "Stop",SCAN_CODE_125,438,3,23,22
+    PUSHBUTTON      "Attn",SCAN_CODE_126,465,3,23,22
+    PUSHBUTTON      "`",SCAN_CODE_1,3,35,23,22
+    PUSHBUTTON      "1",SCAN_CODE_2,30,35,23,22
+    PUSHBUTTON      "2",SCAN_CODE_3,57,35,23,22
+    PUSHBUTTON      "3",SCAN_CODE_4,84,35,23,22
+    PUSHBUTTON      "4",SCAN_CODE_5,111,35,23,22
+    PUSHBUTTON      "5",SCAN_CODE_6,138,35,23,22
+    PUSHBUTTON      "6",SCAN_CODE_7,165,35,23,22
+    PUSHBUTTON      "7",SCAN_CODE_8,192,35,23,22
+    PUSHBUTTON      "8",SCAN_CODE_9,219,35,23,22
+    PUSHBUTTON      "9",SCAN_CODE_10,246,35,23,22
+    PUSHBUTTON      "0",SCAN_CODE_11,273,35,23,22
+    PUSHBUTTON      "-",SCAN_CODE_12,300,35,23,22
+    PUSHBUTTON      "=",SCAN_CODE_13,327,35,23,22
+    PUSHBUTTON      "<--",SCAN_CODE_15,354,35,47,22,BS_ICON
+    PUSHBUTTON      "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON
+    PUSHBUTTON      "Q",SCAN_CODE_17,42,61,23,22
+    PUSHBUTTON      "W",SCAN_CODE_18,69,61,23,22
+    PUSHBUTTON      "E",SCAN_CODE_19,96,61,23,22
+    PUSHBUTTON      "R",SCAN_CODE_20,123,61,23,22
+    PUSHBUTTON      "T",SCAN_CODE_21,150,61,23,22
+    PUSHBUTTON      "Y",SCAN_CODE_22,177,61,23,22
+    PUSHBUTTON      "U",SCAN_CODE_23,204,61,23,22
+    PUSHBUTTON      "I",SCAN_CODE_24,231,61,23,22
+    PUSHBUTTON      "O",SCAN_CODE_25,258,61,23,22
+    PUSHBUTTON      "P",SCAN_CODE_26,285,61,23,22
+    PUSHBUTTON      "[",SCAN_CODE_27,312,61,23,22
+    PUSHBUTTON      "]",SCAN_CODE_28,339,61,23,22
+    PUSHBUTTON      "\\",SCAN_CODE_29,366,61,35,22
+    PUSHBUTTON      "Caps Lock",SCAN_CODE_30,3,87,46,22,BS_ICON
+    PUSHBUTTON      "A",SCAN_CODE_31,53,87,23,22
+    PUSHBUTTON      "S",SCAN_CODE_32,80,87,23,22
+    PUSHBUTTON      "D",SCAN_CODE_33,107,87,23,22
+    PUSHBUTTON      "F",SCAN_CODE_34,134,87,23,22
+    PUSHBUTTON      "G",SCAN_CODE_35,161,87,23,22
+    PUSHBUTTON      "H",SCAN_CODE_36,188,87,23,22
+    PUSHBUTTON      "J",SCAN_CODE_37,215,87,23,22
+    PUSHBUTTON      "K",SCAN_CODE_38,242,87,23,22
+    PUSHBUTTON      "L",SCAN_CODE_39,269,87,23,22
+    PUSHBUTTON      ";",SCAN_CODE_40,296,87,23,22
+    PUSHBUTTON      "'",SCAN_CODE_41,323,87,23,22
+    PUSHBUTTON      "ret",SCAN_CODE_43,350,87,51,22,BS_ICON
+    PUSHBUTTON      "shift",SCAN_CODE_44,3,113,57,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+    PUSHBUTTON      "Z",SCAN_CODE_46,64,113,23,22
+    PUSHBUTTON      "X",SCAN_CODE_47,91,113,23,22
+    PUSHBUTTON      "C",SCAN_CODE_48,118,113,23,22
+    PUSHBUTTON      "V",SCAN_CODE_49,145,113,23,22
+    PUSHBUTTON      "B",SCAN_CODE_50,172,113,23,22
+    PUSHBUTTON      "N",SCAN_CODE_51,199,113,23,22
+    PUSHBUTTON      "M",SCAN_CODE_52,226,113,23,22
+    PUSHBUTTON      ",",SCAN_CODE_53,253,113,23,22
+    PUSHBUTTON      ".",SCAN_CODE_54,280,113,23,22
+    PUSHBUTTON      "/",SCAN_CODE_55,307,113,23,22
+    PUSHBUTTON      "shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+    PUSHBUTTON      "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
+    PUSHBUTTON      "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON
+    PUSHBUTTON      "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
+    PUSHBUTTON      "",SCAN_CODE_61,116,139,143,22
+    PUSHBUTTON      "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
+    PUSHBUTTON      "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON
+    PUSHBUTTON      "menu",SCAN_CODE_129,332,139,30,22,BS_ICON
+    PUSHBUTTON      "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
+    PUSHBUTTON      "ins",SCAN_CODE_75,411,35,23,22
+    PUSHBUTTON      "del",SCAN_CODE_76,411,61,23,22
+    PUSHBUTTON      "home",SCAN_CODE_80,438,35,23,22,BS_ICON
+    PUSHBUTTON      "end",SCAN_CODE_81,438,61,23,22
+    PUSHBUTTON      "pg up",SCAN_CODE_85,465,35,23,22,BS_ICON
+    PUSHBUTTON      "pg down",SCAN_CODE_86,465,61,23,22,BS_ICON
+    PUSHBUTTON      "<-",SCAN_CODE_79,411,139,23,22,BS_ICON
+    PUSHBUTTON      "^",SCAN_CODE_83,438,113,23,22,BS_ICON
+    PUSHBUTTON      "v",SCAN_CODE_84,438,139,23,22,BS_ICON
+    PUSHBUTTON      "->",SCAN_CODE_89,465,139,23,22,BS_ICON
+    PUSHBUTTON      "num",SCAN_CODE_90,500,35,23,22
+    PUSHBUTTON      "7",SCAN_CODE_91,500,61,23,22
+    PUSHBUTTON      "4",SCAN_CODE_92,500,87,23,22
+    PUSHBUTTON      "1",SCAN_CODE_93,500,113,23,22
+    PUSHBUTTON      "/",SCAN_CODE_95,527,35,23,22
+    PUSHBUTTON      "8",SCAN_CODE_96,527,61,23,22
+    PUSHBUTTON      "5",SCAN_CODE_97,527,87,23,22
+    PUSHBUTTON      "2",SCAN_CODE_98,527,113,23,22
+    PUSHBUTTON      "0",SCAN_CODE_99,500,139,50,22
+    PUSHBUTTON      "*",SCAN_CODE_100,554,35,23,22
+    PUSHBUTTON      "9",SCAN_CODE_101,554,61,23,22
+    PUSHBUTTON      "6",SCAN_CODE_102,554,87,23,22
+    PUSHBUTTON      "3",SCAN_CODE_103,554,113,23,22
+    PUSHBUTTON      ".",SCAN_CODE_104,554,139,23,22
+    PUSHBUTTON      "-",SCAN_CODE_105,581,35,23,22
+    PUSHBUTTON      "+",SCAN_CODE_106,581,61,23,48
+    PUSHBUTTON      "ent",SCAN_CODE_108,581,113,23,48
+    CTEXT           "Num",IDC_STATIC,510,4,21,8
+    CONTROL         "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,518,16,4,3
+    CTEXT           "Caps",IDC_STATIC,540,4,21,8
+    CONTROL         "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,548,16,4,3
+    CTEXT           "Scroll",IDC_STATIC,572,4,21,8
+    CONTROL         "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3
+END
+
+/* EOF */

reactos/base/applications/osk/rsrc.rc

@@ -46,6 +46,9 @@ IDI_BOTTOM    ICON "res/bottom.ico"
 #ifdef LANGUAGE_AR_DZ
     #include "lang/ar-DZ.rc"
 #endif
+#ifdef LANGUAGE_CS_CZ
+    #include "lang/cs-CZ.rc"
+#endif
 #ifdef LANGUAGE_DE_DE
     #include "lang/de-DE.rc"
 #endif

reactos/base/applications/regedit/clb/CMakeLists.txt

@@ -7,4 +7,4 @@ add_library(clb SHARED
     ${CMAKE_CURRENT_BINARY_DIR}/clb.def)
 
 set_module_type(clb win32dll UNICODE)
-add_importlibs(clb user32 gdi32 comctl32 kernel32 ntdll)
+add_importlibs(clb user32 comctl32 msvcrt kernel32 ntdll)

reactos/base/applications/regedit/lang/cs-CZ.rc

@@ -204,47 +204,47 @@ END
 
 IDD_EDIT_RESOURCE_LIST DIALOGEX 32, 24, 170, 120
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Resource List"
+CAPTION "Seznam prostředků"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_RESOURCE_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
             LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 150, 75
     DEFPUSHBUTTON "OK", IDOK, 27, 100, 50, 14
-    PUSHBUTTON "Show...", IDC_SHOW_RESOURCE, 93, 100, 50, 14, WS_DISABLED
+    PUSHBUTTON "Zobrazit...", IDC_SHOW_RESOURCE, 93, 100, 50, 14, WS_DISABLED
 END
 
 IDD_EDIT_RESOURCE DIALOGEX 6, 18, 281, 283
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Resources"
+CAPTION "Prostředky"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "DMA:", IDC_STATIC, 10, 5, 20, 8
     CONTROL "", IDC_DMA_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
             LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 15, 261, 31
-    LTEXT "Interrupt:", IDC_STATIC, 10, 48, 35, 8
+    LTEXT "Přerušení:", IDC_STATIC, 10, 48, 35, 8
     CONTROL "", IDC_IRQ_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
             LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 58, 261, 31
-    LTEXT "Memory:", IDC_STATIC, 10, 91, 32, 8
+    LTEXT "Paměť:", IDC_STATIC, 10, 91, 32, 8
     CONTROL "", IDC_MEMORY_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
             LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 101, 261, 31
     LTEXT "Port:", IDC_STATIC, 10, 134, 38, 8
     CONTROL "", IDC_PORT_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
             LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 144, 261, 31
-    LTEXT "Device specific data:", IDC_STATIC, 10, 177, 80, 8
+    LTEXT "Data zařízení:", IDC_STATIC, 10, 177, 80, 8
     CONTROL "", IDC_DEVICE_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
             LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 188, 261, 31
-    GROUPBOX "Usage", IDC_STATIC, 10, 219, 125, 39
-    LTEXT "Undetermined", IDC_UNDETERMINED, 18, 230, 46, 8, WS_DISABLED
-    LTEXT "Shared", IDC_SHARED, 18, 240, 48, 8, WS_DISABLED
-    LTEXT "Device exclusive", IDC_DEVICE_EXCLUSIVE, 72, 230, 58, 8, WS_DISABLED
-    LTEXT "Driver exclusive", IDC_DRIVER_EXCLUSIVE, 72, 240, 54, 8, WS_DISABLED
-    RTEXT "Interface Type:", IDC_STATIC, 144, 220, 58, 8
+    GROUPBOX "Použití", IDC_STATIC, 10, 219, 125, 39
+    LTEXT "Nezjištěno", IDC_UNDETERMINED, 18, 230, 46, 8, WS_DISABLED
+    LTEXT "Sdílené", IDC_SHARED, 18, 240, 48, 8, WS_DISABLED
+    LTEXT "Exkluzivní pro zařízení", IDC_DEVICE_EXCLUSIVE, 72, 230, 58, 8, WS_DISABLED
+    LTEXT "Exkluzivní pro ovladač", IDC_DRIVER_EXCLUSIVE, 72, 240, 54, 8, WS_DISABLED
+    RTEXT "Typ rozhraní:", IDC_STATIC, 144, 220, 58, 8
     LTEXT "", IDC_INTERFACETYPE, 205, 220, 66, 8
-    RTEXT "Bus Nummer:", IDC_STATIC, 151, 230, 51, 8
+    RTEXT "Číslo sběrnice:", IDC_STATIC, 151, 230, 51, 8
     LTEXT "", IDC_BUSNUMBER, 205, 230, 66, 8
-    RTEXT "Version:", IDC_STATIC, 151, 240, 51, 8
+    RTEXT "Verze:", IDC_STATIC, 151, 240, 51, 8
     LTEXT "", IDC_VERSION, 205, 240, 66, 8
-    RTEXT "Revision:", IDC_STATIC, 151, 250, 51, 8
+    RTEXT "Revize:", IDC_STATIC, 151, 250, 51, 8
     LTEXT "", IDC_REVISION, 205, 250, 66, 8
     DEFPUSHBUTTON "OK", IDOK, 92, 263, 40, 14
     PUSHBUTTON "&Data...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED
@@ -285,8 +285,8 @@ BEGIN
     ID_EDIT_NEW_DWORDVALUE "Přidá novou DWORD položku"
     ID_REGISTRY_IMPORTREGISTRYFILE "Importuje textový soubor do registru"
     ID_REGISTRY_EXPORTREGISTRYFILE "Exportuje všechny části registru do textového souboru"
-    ID_REGISTRY_LOADHIVE "Loads a hive file into the registry"
-    ID_REGISTRY_UNLOADHIVE "Unloads a hive from the registry"
+    ID_REGISTRY_LOADHIVE "Načte soubor podregistru"
+    ID_REGISTRY_UNLOADHIVE "Uvolní soubor podregistru"
     ID_REGISTRY_CONNECTNETWORKREGISTRY "Připojí se ke vzdálenému registru jiného počítače"
     ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Odpojí se od vzdálenému registru jiného počítače"
     ID_REGISTRY_PRINT "Vytiskne všechny části registru"
@@ -328,8 +328,8 @@ BEGIN
     IDS_ERR_DELETEVALUE "Nelze odstranit všechny vybrané položky!"
     IDS_ERR_RENVAL_CAPTION "Chyba při přejmenování položky"
     IDS_ERR_RENVAL_TOEMPTY "Nelze přejmenovat %s. Vybraná položka je prázdná. Vyzkoušejte jiný název."
-    IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration"
-    IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?"
+    IDS_QUERY_IMPORT_HIVE_CAPTION "Potvrďte obnovení klíče"
+    IDS_QUERY_IMPORT_HIVE_MSG "Klíč bude obnoven přes současně vybraný klíč.\nVšechny hodnoty a podklíče tohoto klíče budou smazány.\nChcete pokračovat?"
     IDS_NEW_KEY "Nový klíč #%d"
     IDS_NEW_VALUE "Nová hodnota #%d"
 END
@@ -343,8 +343,8 @@ BEGIN
     IDS_MY_COMPUTER "Tento počítač"
     IDS_IMPORT_REG_FILE "Importovat soubor registru"
     IDS_EXPORT_REG_FILE "Exportovat do souboru registru"
-    IDS_LOAD_HIVE "Load Hive"
-    IDS_UNLOAD_HIVE "Unload Hive"
+    IDS_LOAD_HIVE "Načíst podregistr"
+    IDS_UNLOAD_HIVE "Uvolnit podregistr"
     IDS_INVALID_DWORD "(Neplatná hodnota DWORD)"
 END
 
@@ -353,7 +353,7 @@ BEGIN
     IDS_FLT_REGFILE "Soubor registru"
     IDS_FLT_REGFILES "Soubory registru (*.reg)"
     IDS_FLT_REGFILES_FLT "*.reg"
-    IDS_FLT_HIVFILES "Registry Hive Files (*.*)"
+    IDS_FLT_HIVFILES "Soubory podregistru (*.*)"
     IDS_FLT_HIVFILES_FLT "*.*"
     IDS_FLT_REGEDIT4 "Soubory registru Win9x/NT4 (REGEDIT4) (*.reg)"
     IDS_FLT_REGEDIT4_FLT "*.reg"
@@ -402,40 +402,40 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_BUSNUMBER "Bus Number"
-    IDS_INTERFACE "Interface"
-    IDS_DMA_CHANNEL "Channel"
+    IDS_BUSNUMBER "Číslo sběrnice"
+    IDS_INTERFACE "Rozhrání"
+    IDS_DMA_CHANNEL "Kanál"
     IDS_DMA_PORT "Port"
-    IDS_INTERRUPT_VECTOR "Vector"
-    IDS_INTERRUPT_LEVEL "Level"
-    IDS_INTERRUPT_AFFINITY "Affinity"
-    IDS_INTERRUPT_TYPE "Type"
-    IDS_MEMORY_ADDRESS "Physical Address"
-    IDS_MEMORY_LENGTH "Length"
-    IDS_MEMORY_ACCESS "Access"
-    IDS_PORT_ADDRESS "Physical Address"
-    IDS_PORT_LENGTH "Length"
-    IDS_PORT_ACCESS "Access"
-    IDS_SPECIFIC_RESERVED1 "Reserved 1"
-    IDS_SPECIFIC_RESERVED2 "Reserved 2"
-    IDS_SPECIFIC_DATASIZE "Data Size"
+    IDS_INTERRUPT_VECTOR "Vektor"
+    IDS_INTERRUPT_LEVEL "Úroveň"
+    IDS_INTERRUPT_AFFINITY "Afinita"
+    IDS_INTERRUPT_TYPE "Typ"
+    IDS_MEMORY_ADDRESS "Fyzická adresa"
+    IDS_MEMORY_LENGTH "Délka"
+    IDS_MEMORY_ACCESS "Přístup"
+    IDS_PORT_ADDRESS "Fyzická adresa"
+    IDS_PORT_LENGTH "Délka"
+    IDS_PORT_ACCESS "Přístup"
+    IDS_SPECIFIC_RESERVED1 "Rezervováno 1"
+    IDS_SPECIFIC_RESERVED2 "Rezervováno 2"
+    IDS_SPECIFIC_DATASIZE "Velikost dat"
 END
 
 STRINGTABLE
 BEGIN
     IDS_PORT_PORT_IO "Port"
-    IDS_PORT_MEMORY_IO "Memory"
-    IDS_INTERRUPT_EDGE_SENSITIVE "Edge Sensitive"
-    IDS_INTERRUPT_LEVEL_SENSITIVE "Level Sensitive"
-    IDS_MEMORY_READ_ONLY "Read Only"
-    IDS_MEMORY_WRITE_ONLY "Write Only"
-    IDS_MEMORY_READ_WRITE "Read / Write"
+    IDS_PORT_MEMORY_IO "Paměť"
+    IDS_INTERRUPT_EDGE_SENSITIVE "Spouštěné hranou"
+    IDS_INTERRUPT_LEVEL_SENSITIVE "Spouštěné úrovní"
+    IDS_MEMORY_READ_ONLY "Jen pro čtení"
+    IDS_MEMORY_WRITE_ONLY "Jen pro zápis"
+    IDS_MEMORY_READ_WRITE "Čtení / Zápis"
 END
 
 STRINGTABLE
 BEGIN
-    IDS_BUS_UNDEFINED "Undefined"
-    IDS_BUS_INTERNAL "Internal"
+    IDS_BUS_UNDEFINED "Nedefinováno"
+    IDS_BUS_INTERNAL "Vnitřní"
     IDS_BUS_ISA "ISA"
     IDS_BUS_EISA "EISA"
     IDS_BUS_MICROCHANNEL "MicroChannel"
@@ -448,10 +448,10 @@ BEGIN
     IDS_BUS_MPIBUS "MPI-Bus"
     IDS_BUS_MPSABUS "MPSA-Bus"
     IDS_BUS_PROCESSORINTERNAL "Processor Internal"
-    IDS_BUS_INTERNALPOWERBUS "Internal Power Bus"
-    IDS_BUS_PNPISABUS "PnP-ISA Bus"
-    IDS_BUS_PNPBUS "PnP Bus"
-    IDS_BUS_UNKNOWNTYPE "Unknown Interface Type"
+    IDS_BUS_INTERNALPOWERBUS "Vnitřní napájecí sběrnice"
+    IDS_BUS_PNPISABUS "Sběrnice PnP-ISA"
+    IDS_BUS_PNPBUS "Sběrnice PnP"
+    IDS_BUS_UNKNOWNTYPE "Neznámý typ rozhraní"
 END
 
 /*****************************************************************/

reactos/base/applications/screensavers/3dtext/lang/cs-CZ.rc

@@ -0,0 +1,17 @@
+LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
+
+DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Nastavení spořiče obrazovky 3D Text"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    DEFPUSHBUTTON "OK", IDOK, 216, 7, 50, 14
+    PUSHBUTTON "Storno", IDCANCEL, 216, 24, 50, 14
+    EDITTEXT IDC_MESSAGE_TEXT, 18, 28, 122, 14, ES_AUTOHSCROLL
+    LTEXT "Vlastní text", IDC_STATIC, 18, 17, 65, 8
+END
+
+STRINGTABLE
+BEGIN
+    IDS_DESCRIPTION "Spořič obrazovky 3D Text"
+END

reactos/base/applications/screensavers/3dtext/rsrc.rc

@@ -19,12 +19,15 @@ IDI_ICON  ICON  DISCARDABLE  "res/icon_3dtext.ico"
 /* UTF-8 */
 #pragma code_page(65001)
 
-#ifdef LANGUAGE_DE_DE
-    #include "lang/de-DE.rc"
-#endif
 #ifdef LANGUAGE_BG_BG
     #include "lang/bg-BG.rc"
 #endif
+#ifdef LANGUAGE_CS_CZ
+    #include "lang/cs-CZ.rc"
+#endif
+#ifdef LANGUAGE_DE_DE
+    #include "lang/de-DE.rc"
+#endif
 #ifdef LANGUAGE_EL_GR
     #include "lang/el-GR.rc"
 #endif

reactos/base/applications/screensavers/logon/lang/cs-CZ.rc

@@ -0,0 +1,7 @@
+LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    IDS_DESCRIPTION "Spořič obrazovky Přihlášení"
+    IDS_TEXT "Žádná nastavení nejsou potřeba."
+END

reactos/base/applications/screensavers/logon/logon.rc

@@ -26,6 +26,9 @@ IDB_SERVER BITMAP "res/1.bmp"
 #ifdef LANGUAGE_BG_BG
     #include "lang/bg-BG.rc"
 #endif
+#ifdef LANGUAGE_CS_CZ
+    #include "lang/cs-CZ.rc"
+#endif
 #ifdef LANGUAGE_DE_DE
     #include "lang/de-DE.rc"
 #endif

reactos/base/applications/sndrec32/lang/cs-CZ.rc

@@ -30,35 +30,35 @@ BEGIN
         MENUITEM "Otevřít...", ID_FILE_OPEN
         MENUITEM "Uložit", ID_FILE_SAVE, GRAYED
         MENUITEM "Uložit jako...", ID_FILE_SAVEAS, GRAYED
-        MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED
-        MENUITEM "Properties", ID_FILE_PROPERTIES
+        MENUITEM "Obnovit...", ID_FILE_RESTORE, GRAYED
+        MENUITEM "Vlastnosti", ID_FILE_PROPERTIES
         MENUITEM SEPARATOR
         MENUITEM "Konec", ID_FILE_EXIT
     END
-    POPUP "&Edit"
+    POPUP "&Upravit"
     BEGIN
-        MENUITEM "&Copy", ID_EDIT_COPY
-        MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED
-        MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED
+        MENUITEM "&Kopírovat", ID_EDIT_COPY
+        MENUITEM "&Vložit", ID_EDIT_PASTE, GRAYED
+        MENUITEM "Vložit a &sloučit", ID_EDIT_PASTEMIX, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "&Insert File...", ID_EDIT_INSERTFILE
-        MENUITEM "&Mix with File...", ID_EDIT_MIXFILE
+        MENUITEM "V&ložit soubor...", ID_EDIT_INSERTFILE
+        MENUITEM "Sl&oučit se souborem...", ID_EDIT_MIXFILE
         MENUITEM SEPARATOR
-        MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED
-        MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED
+        MENUITEM "Odstranit &před současnou pozicí",ID_EDIT_DELETEBEFORE, GRAYED
+        MENUITEM "Odstranit &za současnou pozicí",ID_EDIT_DELETEAFTER, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS
+        MENUITEM "Vlas&tnosti zvuku", ID_EDIT_AUDIOPROPS
     END
-    POPUP "Effect&s"
+    POPUP "&Efekty"
     BEGIN
-        MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL
-        MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL
+        MENUITEM "&Zvýšit hlasitost (o 25%)", ID_EFFECTS_INCVOL
+        MENUITEM "&Snížit hlasitost", ID_EFFECTS_DECVOL
         MENUITEM SEPARATOR
-        MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD
-        MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD
+        MENUITEM "Z&rychlit(o 100%)", ID_EFFECTS_INCSPD
+        MENUITEM "Z&pomalit", ID_EFFECTS_DECSPD
         MENUITEM SEPARATOR
-        MENUITEM "&Add Echo", ID_EFFECTS_ECHO
-        MENUITEM "&Reverse", ID_EFFECTS_REVERSE
+        MENUITEM "&Přidat ozvěnu", ID_EFFECTS_ECHO
+        MENUITEM "&Pozpátku", ID_EFFECTS_REVERSE
     END
     POPUP "&?"
     BEGIN
@@ -76,7 +76,7 @@ STRINGTABLE
 BEGIN
     IDS_STRPOS "Pozice: %.2f s"
     IDS_STRDUR "Délka: %.2f s"
-    IDS_STRBUF "Buffer: %.2f kb"
+    IDS_STRBUF "Vyrovnávací paměť: %.2f kb"
     IDS_STRFMT "%.1f kHz %u bitů"
     IDS_STRMONO "mono"
     IDS_STRSTEREO "stereo"

reactos/base/applications/taskmgr/lang/cs-CZ.rc

@@ -411,7 +411,7 @@ BEGIN
     IDS_TAB_IOREADBYTES "I/O přečtené bajty"
     IDS_TAB_IOWRITESBYTES "I/O zapsané bajty"
     IDS_TAB_IOOTHERBYTES "I/O ostatní bajty"
-    IDS_TAB_COMMANDLINE "Command Line"
+    IDS_TAB_COMMANDLINE "Příkazový řádek"
     IDS_MENU_SELECTCOLUMNS "&Vybrat sloupce..."
     IDS_MENU_16BITTASK "&Zobrazit 16-bitové úlohy"
     IDS_MENU_WINDOWS "&Okna"

reactos/base/applications/wordpad/lang/cs-CZ.rc

@@ -0,0 +1,261 @@
+/*
+ * Copyright 2004 by Krzysztof Foltman
+ *
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
+
+IDM_MAINMENU MENU
+BEGIN
+    POPUP "&Soubor"
+    BEGIN
+        MENUITEM "&Nový...\tCtrl+N",      ID_FILE_NEW
+        MENUITEM "&Otevřít...\tCtrl+O",   ID_FILE_OPEN
+        MENUITEM "&Uložit\tCtrl+S",       ID_FILE_SAVE
+        MENUITEM "Uložit j&ako...",       ID_FILE_SAVEAS
+        MENUITEM SEPARATOR
+        MENUITEM "&Tisk...\tCtrl+P",      ID_PRINT
+        MENUITEM "&Náhled tisku",         ID_PREVIEW
+        MENUITEM "Nasta&vení stránky...", ID_PRINTSETUP
+        MENUITEM SEPARATOR
+        MENUITEM "U&končit",              ID_FILE_EXIT
+    END
+    POPUP "&Upravit"
+    BEGIN
+        MENUITEM "&Zpět\tCtrl+Z",               ID_EDIT_UNDO
+        MENUITEM "Z&novu\tCtrl+Y",              ID_EDIT_REDO
+        MENUITEM SEPARATOR
+        MENUITEM "&Vyjmout\tCtrl+X",            ID_EDIT_CUT
+        MENUITEM "&Kopírovat\tCtrl+C",          ID_EDIT_COPY
+        MENUITEM "V&ložit\tCtrl+V",             ID_EDIT_PASTE
+        MENUITEM "&Smazat\tDel",                ID_EDIT_CLEAR
+        MENUITEM "V&ybrat vše\tCtrl+A",         ID_EDIT_SELECTALL
+        MENUITEM SEPARATOR
+        MENUITEM "&Najít...\tCtrl+F",           ID_FIND
+        MENUITEM "Najít &další\tF3",            ID_FIND_NEXT
+        MENUITEM "Na&hradit...\tCtrl+H",        ID_REPLACE
+        MENUITEM SEPARATOR
+        MENUITEM "&Jen pro čtení",              ID_EDIT_READONLY
+        MENUITEM "Z&měněno",                    ID_EDIT_MODIFIED
+        MENUITEM SEPARATOR
+        POPUP "&Rozšířené"
+        BEGIN
+            MENUITEM "&Informace o výběru",         ID_EDIT_SELECTIONINFO
+            MENUITEM "F&ormát znaků",               ID_EDIT_CHARFORMAT
+            MENUITEM "Vý&chozí formát znaků",       ID_EDIT_DEFCHARFORMAT
+            MENUITEM "Formát o&dstavce",            ID_EDIT_PARAFORMAT
+            MENUITEM "Získat te&xt",                ID_EDIT_GETTEXT
+        END
+    END
+    POPUP "&Zobrazit"
+    BEGIN
+        MENUITEM "&Panel nástrojů",    ID_TOGGLE_TOOLBAR
+        MENUITEM "Panel &formátování", ID_TOGGLE_FORMATBAR
+        MENUITEM "P&ravítko",          ID_TOGGLE_RULER
+        MENUITEM "&Stavový řádek",     ID_TOGGLE_STATUSBAR
+        MENUITEM SEPARATOR
+        MENUITEM "&Možnosti...",       ID_VIEWPROPERTIES
+    END
+    POPUP "&Vložit"
+    BEGIN
+        MENUITEM "&Datum a čas...",  ID_DATETIME
+    END
+    POPUP "&Formát"
+    BEGIN
+        MENUITEM "&Písmo...",                    ID_FONTSETTINGS
+        MENUITEM "&Odrážky",                     ID_BULLET
+        MENUITEM "O&dstavec...",                 ID_PARAFORMAT
+        MENUITEM "&Tabulátor...",                ID_TABSTOPS
+        POPUP "Po&zadí"
+        BEGIN
+            MENUITEM "&Systém\tCtrl+1",         ID_BACK_1
+            MENUITEM "&Bledě žlutá\tCtrl+2",    ID_BACK_2
+        END
+    END
+    POPUP "&Nápověda"
+    BEGIN
+        MENUITEM "&O programu Wine Wordpad",      ID_ABOUT
+    END
+END
+
+IDM_POPUP MENU
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "&Vyjmout",            ID_EDIT_CUT
+        MENUITEM "&Kopírovat",          ID_EDIT_COPY
+        MENUITEM "V&ložit",             ID_EDIT_PASTE
+        MENUITEM SEPARATOR
+        MENUITEM "&Odrážky",            ID_BULLET
+        MENUITEM "&Odstavec...",        ID_PARAFORMAT
+    END
+END
+
+IDM_COLOR_POPUP MENU
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "Černá",        ID_COLOR_BLACK
+        MENUITEM "Vínová",       ID_COLOR_MAROON
+        MENUITEM "Zelená",       ID_COLOR_GREEN
+        MENUITEM "Olivová",      ID_COLOR_OLIVE
+        MENUITEM "Námořní modř", ID_COLOR_NAVY
+        MENUITEM "Fialová",      ID_COLOR_PURPLE
+        MENUITEM "Modrozelená",  ID_COLOR_TEAL
+        MENUITEM "Šedá",         ID_COLOR_GRAY
+        MENUITEM "Stříbrná",     ID_COLOR_SILVER
+        MENUITEM "Červená",      ID_COLOR_RED
+        MENUITEM "Limetková",    ID_COLOR_LIME
+        MENUITEM "Žlutá",        ID_COLOR_YELLOW
+        MENUITEM "Modrá",        ID_COLOR_BLUE
+        MENUITEM "Fuchsie",      ID_COLOR_FUCHSIA
+        MENUITEM "Voda",         ID_COLOR_AQUA
+        MENUITEM "Bílá",         ID_COLOR_WHITE
+        MENUITEM "Automaticky",  ID_COLOR_AUTOMATIC
+    END
+END
+
+STRINGTABLE
+BEGIN
+    STRING_ALL_FILES,              "Všechny dokumenty (*.*)"
+    STRING_TEXT_FILES_TXT,         "Textové dokumenty (*.txt)"
+    STRING_TEXT_FILES_UNICODE_TXT, "Textové dokumenty Unicode (*.txt)"
+    STRING_RICHTEXT_FILES_RTF,     "Formát Rich text (*.rtf)"
+    STRING_NEWFILE_RICHTEXT,       "Dokument Rich text"
+    STRING_NEWFILE_TXT,            "Textový dokument"
+    STRING_NEWFILE_TXT_UNICODE,    "Textový dokument Unicode"
+    STRING_PRINTER_FILES_PRN,      "Soubor tisku (*.prn)"
+END
+
+STRINGTABLE
+BEGIN
+    STRING_ALIGN_LEFT,            "Vlevo"
+    STRING_ALIGN_RIGHT,           "Vpravo"
+    STRING_ALIGN_CENTER,          "Na střed"
+END
+
+STRINGTABLE
+BEGIN
+    STRING_VIEWPROPS_TITLE,          "Možnosti"
+    STRING_VIEWPROPS_TEXT,           "Text"
+    STRING_VIEWPROPS_RICHTEXT,       "Rich text"
+END
+
+STRINGTABLE
+BEGIN
+    STRING_PREVIEW_PRINT,            "Tisk"
+    STRING_PREVIEW_NEXTPAGE,         "Další"
+    STRING_PREVIEW_PREVPAGE,         "Předchozí"
+    STRING_PREVIEW_TWOPAGES,         "Dvě strany"
+    STRING_PREVIEW_ONEPAGE,          "Jedna strana"
+    STRING_PREVIEW_ZOOMIN,           "Přiblížit"
+    STRING_PREVIEW_ZOOMOUT,          "Oddálit"
+    STRING_PREVIEW_CLOSE,            "Zavřít"
+    STRING_PREVIEW_PAGE,             "Strana"
+    STRING_PREVIEW_PAGES,            "Strany"
+    STRING_UNITS_CM,                 "cm"
+    STRING_UNITS_IN,                 "in"
+    STRING_UNITS_INCH,               "palec"
+    STRING_UNITS_PT,                 "pt"
+END
+
+STRINGTABLE
+BEGIN
+    STRING_DEFAULT_FILENAME,     "Dokument"
+    STRING_PROMPT_SAVE_CHANGES,  "Uložit změny do '%s'?"
+    STRING_SEARCH_FINISHED,      "Prohledávání dokumentu dokončeno."
+    STRING_LOAD_RICHED_FAILED,   "Knihovnu RichEdit se nepodařilo načíst."
+    STRING_SAVE_LOSEFORMATTING,  "Vybrali jste uložení jako obyčejný text, veškeré formátovaní bude ztraceno. Přejete si pokračovat?"
+    STRING_INVALID_NUMBER,       "Neplatný formát čísla."
+    STRING_OLE_STORAGE_NOT_SUPPORTED, "Dokumenty OLE storage nejsou podporovány."
+    STRING_WRITE_FAILED,              "Soubor nebylo možné uložit."
+    STRING_WRITE_ACCESS_DENIED,       "Nemáte přístup k ukládanému souboru."
+    STRING_OPEN_FAILED,               "Soubor nebylo možné otevřít."
+    STRING_OPEN_ACCESS_DENIED,        "Nemáte přistup k otevíranému souboru."
+    STRING_PRINTING_NOT_IMPLEMENTED,  "Podpora tisku zatím chybí."
+    STRING_MAX_TAB_STOPS,             "Není možné přidat více než 32 odražení."
+END
+
+IDD_DATETIME DIALOGEX 30, 20, 130, 80
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+CAPTION "Datum a čas"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT        "Dostupné formáty",-1,3,2,100,15
+    LISTBOX      IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY
+    DEFPUSHBUTTON "OK",IDOK,87,12,40,12
+    PUSHBUTTON   "Storno",IDCANCEL,87,26,40,12
+END
+
+IDD_NEWFILE DIALOGEX 30, 20, 140, 80
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+CAPTION "Nový"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT        "Typ nového dokumentu",-1,3,2,100,15
+    LISTBOX      IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT
+    DEFPUSHBUTTON "OK",IDOK,97,12,40,12
+    PUSHBUTTON   "Storno",IDCANCEL,97,26,40,12
+END
+
+IDD_PARAFORMAT DIALOGEX 30, 20, 220, 110
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+CAPTION "Formát odstavce"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Okraje", -1, 10, 10, 140, 68
+    LTEXT "Vlevo", -1, 15, 22, 60, 13
+    EDITTEXT IDC_PARA_LEFT, 75, 20, 65, 13
+    LTEXT "Vpravo", -1, 15, 40, 60, 13
+    EDITTEXT IDC_PARA_RIGHT, 75, 38, 65, 13
+    LTEXT "První řádek", -1, 15, 58, 60, 13
+    EDITTEXT IDC_PARA_FIRST, 75, 56, 65, 13
+    LTEXT "Zarovnání", -1, 15, 87, 60, 13
+    COMBOBOX IDC_PARA_ALIGN, 75, 85, 65, 60, CBS_DROPDOWNLIST
+    DEFPUSHBUTTON "OK", IDOK, 160, 15, 50, 15
+    PUSHBUTTON "Storno", IDCANCEL, 160, 33, 50, 15
+END
+
+IDD_TABSTOPS DIALOGEX 30, 20, 200, 110
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+CAPTION "Odražení"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Odražení", -1, 10, 10, 120, 90
+    COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
+    DEFPUSHBUTTON "&Přidat", ID_TAB_ADD, 20, 80, 45, 15
+    PUSHBUTTON "&Odebrat", ID_TAB_DEL, 72, 80, 45, 15
+    PUSHBUTTON "OK", IDOK, 135, 15, 58, 15
+    PUSHBUTTON "Storno", IDCANCEL, 135, 33, 58, 15
+    PUSHBUTTON "Odebrat &vše", ID_TAB_EMPTY, 135, 51, 58, 15
+END
+
+IDD_FORMATOPTS DIALOGEX 0, 0, 280, 110
+STYLE DS_SHELLFONT | DS_SYSMODAL
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Zalamování řádků", -1, 5, 10, 145, 85
+    RADIOBUTTON "&Nezalamovat", IDC_PAGEFMT_WN, 10, 25, 138, 15
+    RADIOBUTTON "Zalamovat podle &okna", IDC_PAGEFMT_WW, 10, 45, 138, 15
+    RADIOBUTTON "Zalamovat podle o&kraje", IDC_PAGEFMT_WM, 10, 65, 138, 15
+    GROUPBOX "Lišty nástroju", -1, 155, 10, 115, 85
+    CHECKBOX "&Lišta nástrojů", IDC_PAGEFMT_TB, 165, 20, 80, 15
+    CHECKBOX "Lišta &formátování", IDC_PAGEFMT_FB, 165, 38, 80, 15
+    CHECKBOX "&Pravítko", IDC_PAGEFMT_RU, 165, 56, 80, 15
+    CHECKBOX "&Stavový řádek", IDC_PAGEFMT_SB, 165, 74, 80, 15
+    LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0
+END

reactos/base/applications/wordpad/rsrc.rc

@@ -70,6 +70,11 @@ IDC_ZOOM CURSOR "res/zoom.cur"
 #include <reactos/manifest_exe.rc>
 
 /* UTF-8 */
+#pragma code_page(65001)
+
+#ifdef LANGUAGE_CS_CZ
+    #include "lang/cs-CZ.rc"
+#endif
 #ifdef LANGUAGE_DA_DK
     #include "lang/da-DK.rc"
 #endif

reactos/base/services/rpcss/service_main.c

@@ -82,9 +82,10 @@ ServiceMain(DWORD argc, LPWSTR argv[])
 
         WaitForSingleObject(exit_event, INFINITE);
 
+        RPCSS_Shutdown();
+
         ServiceStatus.dwCurrentState = SERVICE_STOPPED;
         SetServiceStatus(ServiceStatusHandle, &ServiceStatus);
-        RPCSS_Shutdown();
     }
 }
 

reactos/base/services/svchost/rpcsrv.c

@@ -98,7 +98,9 @@ RpcpAddInterface (
         wcscat(endpointName, IfName);
 
         /* Create a named pipe endpoint with this name */
-        rpcStatus = RpcServerUseProtseqEpW(L"ncacn_np", 10, endpointName, NULL);
+        rpcStatus = RpcServerUseProtseqEpW(L"ncacn_np",
+                                           RPC_C_PROTSEQ_MAX_REQS_DEFAULT,
+                                           endpointName, NULL);
         if ((rpcStatus != RPC_S_OK) && (rpcStatus != RPC_S_DUPLICATE_ENDPOINT))
         {
             /* We couldn't create it, or it already existed... */
@@ -106,7 +108,7 @@ RpcpAddInterface (
         }
         else
         {
-            /* It worked, register an interface on this endpoint now*/
+            /* It worked, register an interface on this endpoint now */
             rpcStatus = RpcServerRegisterIf(IfSpec, 0, 0);
         }
 

reactos/base/services/thmsvc/thmsvc.c

@@ -74,8 +74,8 @@ ServiceControlHandler(DWORD dwControl,
     {
         case SERVICE_CONTROL_STOP:
             TRACE("  SERVICE_CONTROL_STOP received\n");
-            UpdateServiceStatus(SERVICE_STOPPED);
             ThemeHooksRemove();
+            UpdateServiceStatus(SERVICE_STOPPED);
             return ERROR_SUCCESS;
 
         case SERVICE_CONTROL_PAUSE:

reactos/base/setup/reactos/lang/cs-CZ.rc

@@ -22,9 +22,9 @@ CAPTION "Instalace systému ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     AUTORADIOBUTTON "Nainstalovat systém ReactOS", IDC_INSTALL, 7, 7, 277, 10
-    LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25
+    LTEXT "Instalovat novou kopii systému ReactOS. Tato možnost odstraní Vaše soubory, nastavení a programy. Můžete provést úpravu disků a oddílů.", IDC_INSTALLTEXT, 18, 18, 269, 25
     AUTORADIOBUTTON "Opravit nebo aktualizovat již nainstalovaný systém ReactOS", IDC_UPDATE, 7, 50, 277, 10
-    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30
+    LTEXT "Aktualizovat nebo opravit kopii systémy ReactOS. Tato možnost zachová Vaše soubory, nastavení a programy. Tato možnost je dostupná pouze pokud je již na Vašem počítači systém ReactOS nainstalován.", IDC_UPDATETEXT, 18, 61, 269, 30
     LTEXT "Po klepnutí na Další bude možné nastavit zařízení.", IDC_STATIC, 7, 128, 297, 8
 END
 
@@ -131,7 +131,7 @@ BEGIN
     IDS_SUMMARYSUBTITLE "Výpis voleb instalace k ověření před tím, než začne instalace"
     IDS_ABORTSETUP "Systém ReactOS není na tomto počítači kompletně nainstalovaný. Pokud nyní ukončíte instalaci, bude ji pro nainstalování systému ReactOS nutné provést znova. Opravdu ukončit?"
     IDS_ABORTSETUP2 "Přerušit instalaci?"
-    IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue."
+    IDS_NO_TXTSETUP_SIF "Soubor 'txtsetup.sif' nenalezen.\nInstalace nemůže pokračovat.."
     IDS_CAPTION "Instalace systému ReactOS"
 END
 

reactos/base/setup/welcome/welcome.c

@@ -197,7 +197,7 @@ VOID TranslateEscapes(IN OUT LPTSTR lpString)
 }
 
 static BOOL
-LoadTopicsFromINI(LCID Locale, LPTSTR lpResPath)
+LoadLocalizedResourcesFromINI(LCID Locale, LPTSTR lpResPath)
 {
     DWORD dwRet;
     DWORD dwSize;
@@ -236,6 +236,8 @@ LoadTopicsFromINI(LCID Locale, LPTSTR lpResPath)
         return FALSE; // TODO: For localized resource, see the general function.
 
     /* Try to load the default localized strings */
+    GetPrivateProfileString(TEXT("Defaults"), TEXT("AppTitle"), TEXT("ReactOS Welcome") /* default */,
+                            szAppTitle, ARRAYSIZE(szAppTitle), szIniPath);
     if (!GetPrivateProfileString(TEXT("Defaults"), TEXT("DefaultTopicTitle"), NULL /* default */,
                                  szDefaultTitle, ARRAYSIZE(szDefaultTitle), szIniPath))
     {
@@ -325,7 +327,7 @@ LoadTopicsFromINI(LCID Locale, LPTSTR lpResPath)
 }
 
 static BOOL
-LoadTopics(LPTSTR lpResPath)
+LoadLocalizedResources(LPTSTR lpResPath)
 {
 #define MAX_NUMBER_INTERNAL_TOPICS  3
 
@@ -339,13 +341,15 @@ LoadTopics(LPTSTR lpResPath)
      * First, try to load the default internal (localized) strings.
      * They can be redefined by the localized INI files.
      */
+    if (!LoadString(hInstance, IDS_APPTITLE, szAppTitle, ARRAYSIZE(szAppTitle)))
+        StringCchCopy(szAppTitle, ARRAYSIZE(szAppTitle), TEXT("ReactOS Welcome"));
     if (!LoadString(hInstance, IDS_DEFAULTTOPICTITLE, szDefaultTitle, ARRAYSIZE(szDefaultTitle)))
         *szDefaultTitle = 0;
     if (!LoadString(hInstance, IDS_DEFAULTTOPICDESC, szDefaultDesc, ARRAYSIZE(szDefaultDesc)))
         *szDefaultDesc = 0;
 
-    /* Try to load the topics from INI file */
-    if (*lpResPath && LoadTopicsFromINI(LOCALE_USER_DEFAULT, lpResPath))
+    /* Try to load the resources from INI file */
+    if (*lpResPath && LoadLocalizedResourcesFromINI(LOCALE_USER_DEFAULT, lpResPath))
         return TRUE;
 
     /* We failed, fall back to internal (localized) resource */
@@ -381,7 +385,7 @@ LoadTopics(LPTSTR lpResPath)
 }
 
 static VOID
-FreeTopics(VOID)
+FreeResources(VOID)
 {
     if (!pTopics)
         return;
@@ -421,8 +425,8 @@ LoadConfiguration(VOID)
     /* Verify that the file exists, otherwise use the default configuration */
     if (GetFileAttributes(szIniPath) == INVALID_FILE_ATTRIBUTES)
     {
-        /* Use the default configuration and retrieve the default topics */
-        return LoadTopics(TEXT(""));
+        /* Use the default configuration and retrieve the default resources */
+        return LoadLocalizedResources(TEXT(""));
     }
 
     /* Load the settings from the INI configuration file */
@@ -435,9 +439,9 @@ LoadConfiguration(VOID)
         *szResPath = 0;
     }
 
-    /* Set the current directory to the one of this application, and retrieve the topics */
+    /* Set the current directory to the one of this application, and retrieve the resources */
     SetCurrentDirectory(szAppPath);
-    return LoadTopics(szResPath);
+    return LoadLocalizedResources(szResPath);
 }
 
 #if 0
@@ -556,10 +560,7 @@ _tWinMain(HINSTANCE hInst,
     rcRightPanel.left = rcLeftPanel.right;
     rcRightPanel.right = ulInnerWidth - 1;
 
-    if (!LoadString(hInstance, IDS_APPTITLE, szAppTitle, ARRAYSIZE(szAppTitle)))
-        StringCchCopy(szAppTitle, ARRAYSIZE(szAppTitle), TEXT("ReactOS Welcome"));
-
-    /* Load the configuration and the topics */
+    /* Load the configuration and the resources */
     LoadConfiguration();
 
     /* Create main window */
@@ -592,7 +593,7 @@ _tWinMain(HINSTANCE hInst,
     }
 
     /* Cleanup */
-    FreeTopics();
+    FreeResources();
 
     return msg.wParam;
 }