[DEVMGMT_NEW]

At the request of Christoph von Wittich, bring devmgmt_new into the build. * Created CMakeLists.txt and added to parent folder. * Removed some references to CAtlString that were not needed and are not implemented in our headers. * Fixed build with gcc. * Spread all the changes done to the english resources to the other languages. Many languages now contain untranslated strings that will need to be fixed. Note that I made no effort to fix any bugs or improve any features. The app comes as-is, except it now builds with rosbe. svn path=/trunk/; revision=67976
2024-08-23 19:58:25 +00:00 · 2015-05-30 19:53:44 +00:00 · 2015-05-30 19:53:44 +00:00 · 481667de41
parent 2bf0f53d8a
commit 481667de41
43 changed files with 350 additions and 500 deletions
--- a/reactos/base/applications/mscutils/CMakeLists.txt
+++ b/reactos/base/applications/mscutils/CMakeLists.txt
@ -1,4 +1,5 @@

 add_subdirectory(devmgmt)
+add_subdirectory(devmgmt_new)
 add_subdirectory(eventvwr)
 add_subdirectory(servman)
--- a/reactos/base/applications/mscutils/devmgmt_new/CMakeLists.txt
+++ b/reactos/base/applications/mscutils/devmgmt_new/CMakeLists.txt
@ -0,0 +1,19 @@
+project(DEVMGMT_NEW)
+
+set_cpp(WITH_RUNTIME)
+
+include_directories(${REACTOS_SOURCE_DIR}/lib/atl)
+
+list(APPEND SOURCE
+    Devices.cpp
+    DeviceView.cpp
+    devmgmt.cpp
+    MainWindow.cpp
+    precomp.h)
+
+add_executable(devmgmt_new ${SOURCE} devmgmt.rc)
+target_link_libraries(devmgmt_new uuid atlnew wine)
+set_module_type(devmgmt_new win32gui UNICODE)
+add_importlibs(devmgmt_new setupapi gdi32 user32 comctl32 advapi32 ole32 devmgr msvcrt uxtheme kernel32)
+add_pch(devmgmt_new precomp.h SOURCE)
+add_cd_file(TARGET devmgmt_new DESTINATION reactos/system32 FOR all)
--- a/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp
+++ b/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp
@ -8,8 +8,7 @@
 */


-#include "stdafx.h"
-#include "devmgmt.h"
+#include "precomp.h"
 #include "DeviceView.h"


@ -19,6 +18,7 @@
 #define CLASS_NAME_LEN      256
 #define CLASS_DESC_LEN      256

+extern "C"
 INT_PTR
 WINAPI
 DevicePropertiesExW(
@ -127,12 +127,7 @@ CDeviceView::Refresh()
    HANDLE hThread;

    /* Run on a new thread to keep the gui responsive */
-    hThread = (HANDLE)_beginthreadex(NULL,
-                                     0,
-                                     &ListDevicesThread,
-                                     this,
-                                     0,
-                                     NULL);
+    hThread = CreateThread(NULL, 0, ListDevicesThread, this, 0, NULL);

    if (hThread) CloseHandle(hThread);
 }
@ -184,7 +179,7 @@ CDeviceView::SetFocus()

 /* PRIVATE METHODS ********************************************/

-unsigned int __stdcall CDeviceView::ListDevicesThread(void *Param)
+DWORD CALLBACK CDeviceView::ListDevicesThread(PVOID Param)
 {
    CDeviceView *This = (CDeviceView *)Param;

@ -313,7 +308,7 @@ CDeviceView::ListDevicesByType()
                                                      ClassDescription,
                                                      NULL,
                                                      ClassImage,
-                                                      0);
+                                                      OverlayImage);

                        /* Don't add it again */
                        AddedParent = TRUE;
@ -412,8 +407,6 @@ CDeviceView::RecurseChildDevices(
    WCHAR DeviceName[DEVICE_NAME_LEN];
    LPTSTR DeviceId = NULL;
    INT ClassImage;
-    BOOL IsUnknown = FALSE;
-    BOOL IsHidden = FALSE;
    ULONG DeviceStatus = 0;
    ULONG ProblemNumber = 0;
    UINT OverlayImage = 0;
@ -453,7 +446,7 @@ CDeviceView::RecurseChildDevices(
                                          DeviceName,
                                          (LPARAM)DeviceId,
                                          ClassImage,
-                                          0);
+                                          OverlayImage);


            if (hDevItem)
@ -506,7 +499,7 @@ CDeviceView::RecurseChildDevices(
                                            DeviceName,
                                            (LPARAM)DeviceId,
                                            ClassImage,
-                                            0);
+                                            OverlayImage);
            if (hDevItem)
            {
                /* Check if this child has any children itself */
--- a/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h
+++ b/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h
@ -56,9 +56,7 @@ public:
    }

 private:
-    static unsigned int __stdcall ListDevicesThread(
-        void *Param
-        );
+    static DWORD CALLBACK ListDevicesThread(PVOID Param);

    BOOL ListDevicesByConnection(
        );
--- a/reactos/base/applications/mscutils/devmgmt_new/Devices.cpp
+++ b/reactos/base/applications/mscutils/devmgmt_new/Devices.cpp
@ -7,8 +7,7 @@
 *
 */

-#include "stdafx.h"
-#include "devmgmt.h"
+#include "precomp.h"
 #include "Devices.h"


@ -67,7 +66,7 @@ CDevices::GetDeviceTreeRoot(
    _Out_ PINT RootImageIndex
    )
 {
-    wcscpy_s(RootName, RootNameSize, m_RootName);
+    StringCbCopy(RootName, RootNameSize, m_RootName);
    *RootImageIndex = m_RootImageIndex;

    return TRUE;
@ -325,7 +324,7 @@ CDevices::EnumClasses(
    if (Success != ERROR_SUCCESS)
    {
        /* Use the class name as the description */
-        wcscpy_s(ClassDesc, ClassDescSize, ClassName);
+        StringCbCopy(ClassDesc, ClassDescSize, ClassName);
    }

    /* Get the image index for this class */
@ -485,7 +484,7 @@ CDevices::EnumDevicesForClass(
    if (bSuccess == FALSE && bUnknown == TRUE)
    {
        /* We add in our own text */
-        wcscpy_s(DeviceName, 256, L"Unknown device");
+        StringCbCopy(DeviceName, 256, L"Unknown device");
        bSuccess = TRUE;
    }

@ -570,7 +569,7 @@ CDevices::ConvertResourceDescriptorToString(
    if (ptr)
    {
        /* This must be an inf based descriptor, the desc is after the semi colon */
-        wcscpy_s(ResourceDescriptor, ResourceDescriptorSize, ++ptr);
+        StringCbCopy(ResourceDescriptor, ResourceDescriptorSize, ++ptr);
        dwError = ERROR_SUCCESS;
    }
    else
@ -604,7 +603,7 @@ CDevices::ConvertResourceDescriptorToString(
        /* Load the string from the dll */
        if (LoadStringW(hModule, ResourceId, ResString, 256))
        {
-            wcscpy_s(ResourceDescriptor, ResourceDescriptorSize, ResString);
+            StringCbCopy(ResourceDescriptor, ResourceDescriptorSize, ResString);
            dwError = ERROR_SUCCESS;
        }
        else
--- a/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp
+++ b/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp
@ -7,8 +7,7 @@
 *
 */

-#include "stdafx.h"
-#include "devmgmt.h"
+#include "precomp.h"
 #include "MainWindow.h"


@ -48,10 +47,10 @@ static const MENU_HINT SystemMenuHintTable[] =
 /* PUBLIC METHODS **********************************************/

 CMainWindow::CMainWindow(void) :
-    m_ToolbarhImageList(NULL),
    m_hMainWnd(NULL),
    m_hStatusBar(NULL),
    m_hToolBar(NULL),
+    m_ToolbarhImageList(NULL),
    m_CmdShow(0)
 {
    m_szMainWndClass = L"DevMgmtWndClass";
@ -67,7 +66,6 @@ BOOL
 CMainWindow::Initialize(LPCTSTR lpCaption,
                        int nCmdShow)
 {
-    CAtlString szCaption;
    WNDCLASSEXW wc = {0};

    /* Store the show window value */
@ -171,7 +169,6 @@ BOOL
 CMainWindow::UpdateDevicesDisplay(ListDevices List)
 {
    UINT CheckId;
-    BOOL bSuccess;

    /* Set the new type*/
    m_DeviceView->SetDeviceListType(List);
@ -187,7 +184,7 @@ CMainWindow::UpdateDevicesDisplay(ListDevices List)
    }

    /* Set the new check item */
-    bSuccess = CheckMenuRadioItem(m_hMenu,
+    CheckMenuRadioItem(m_hMenu,
                                  IDC_DEVBYTYPE,
                                  IDC_RESBYCONN,
                                  CheckId,
@ -330,17 +327,17 @@ CMainWindow::StatusBarLoadString(IN HWND hStatusBar,
                                 IN HINSTANCE hInstance,
                                 IN UINT uID)
 {
-    CAtlString szMessage;
+    WCHAR szMessage[4096];
    BOOL bRet = FALSE;

    /* Load the string */
-    if (szMessage.LoadStringW(hInstance, uID))
+    if (LoadStringW(hInstance, uID, szMessage, _countof(szMessage)))
    {
        /* Send the message to the status bar */
        bRet = (BOOL)SendMessageW(hStatusBar,
                                  SB_SETTEXT,
                                  (WPARAM)PartId,
-                                  (LPARAM)szMessage.GetBuffer());
+                                  (LPARAM)szMessage);
    }

    return bRet;
--- a/reactos/base/applications/mscutils/devmgmt_new/MainWindow.h
+++ b/reactos/base/applications/mscutils/devmgmt_new/MainWindow.h
@ -9,7 +9,7 @@ typedef struct _MENU_HINT

 class CMainWindow
 {
-    CAtlString m_szMainWndClass;
+    PCWSTR m_szMainWndClass;
    CDeviceView *m_DeviceView;
    HWND m_hMainWnd;
    HWND m_hStatusBar;
--- a/reactos/base/applications/mscutils/devmgmt_new/devmgmt.cpp
+++ b/reactos/base/applications/mscutils/devmgmt_new/devmgmt.cpp
@ -1,5 +1,4 @@
-#include "stdafx.h"
-#include "devmgmt.h"
+#include "precomp.h"
 #include "MainWindow.h"

 HINSTANCE g_hInstance = NULL;
@ -14,7 +13,7 @@ wWinMain(HINSTANCE hThisInstance,
    CMainWindow MainWindow;
    INITCOMMONCONTROLSEX icex;
    HANDLE hMutex;
-    CAtlString szAppName;
+    WCHAR szAppName[256];

    int Ret = 1;

@ -37,7 +36,7 @@ wWinMain(HINSTANCE hThisInstance,
    InitCommonControlsEx(&icex);

    /* Load the application name */
-    if (szAppName.LoadStringW(g_hInstance, IDS_APPNAME))
+    if (LoadStringW(g_hInstance, IDS_APPNAME, szAppName, _countof(szAppName)))
    {
        /* Initialize the main window */
        if (MainWindow.Initialize(szAppName, nCmdShow))
--- a/reactos/base/applications/mscutils/devmgmt_new/devmgmt.exe.manifest
+++ b/reactos/base/applications/mscutils/devmgmt_new/devmgmt.exe.manifest
@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly
-  xmlns="urn:schemas-microsoft-com:asm.v1"
-  manifestVersion="1.0">
-<assemblyIdentity
-    name="ReactOS.Apps.devmgmt"
-    processorArchitecture="*"
-    version="1.0.0.0"
-    type="win32"/>
-<description>ReactOS Device Manager</description>
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            processorArchitecture="*"
-            publicKeyToken="6595b64144ccf1df"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-</assembly>
-
--- a/reactos/base/applications/mscutils/devmgmt_new/devmgmt.h
+++ b/reactos/base/applications/mscutils/devmgmt_new/devmgmt.h
@ -1,9 +0,0 @@
-#pragma once
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#pragma once
-#include "resource.h"
-
-extern HINSTANCE g_hInstance;
-extern HANDLE ProcessHeap;
-
--- a/reactos/base/applications/mscutils/devmgmt_new/devmgmt.rc
+++ b/reactos/base/applications/mscutils/devmgmt_new/devmgmt.rc
--- a/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.sln
+++ b/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.sln
@ -1,24 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30501.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "devmgmt_new", "devmgmt_new.vcxproj", "{47B3358F-E7C3-4D02-9310-68813B9292E0}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{47B3358F-E7C3-4D02-9310-68813B9292E0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{47B3358F-E7C3-4D02-9310-68813B9292E0}.Debug|Win32.Build.0 = Debug|Win32
-		{47B3358F-E7C3-4D02-9310-68813B9292E0}.Debug|Win32.Deploy.0 = Debug|Win32
-		{47B3358F-E7C3-4D02-9310-68813B9292E0}.Release|Win32.ActiveCfg = Release|Win32
-		{47B3358F-E7C3-4D02-9310-68813B9292E0}.Release|Win32.Build.0 = Release|Win32
-		{47B3358F-E7C3-4D02-9310-68813B9292E0}.Release|Win32.Deploy.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
--- a/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.vcxproj
+++ b/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.vcxproj
@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{47B3358F-E7C3-4D02-9310-68813B9292E0}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>devmgmt_new</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120_xp</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120_xp</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>UxTheme.lib;comctl32.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <ResourceCompile>
-      <PreprocessorDefinitions>LANGUAGE_EN_US;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>UxTheme.lib;comctl32.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="Devices.cpp" />
-    <ClCompile Include="DeviceView.cpp" />
-    <ClCompile Include="devmgmt.cpp" />
-    <ClCompile Include="MainWindow.cpp" />
-    <ClCompile Include="stdafx.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Devices.h" />
-    <ClInclude Include="DeviceView.h" />
-    <ClInclude Include="devmgmt.h" />
-    <ClInclude Include="MainWindow.h" />
-    <ClInclude Include="Resource.h" />
-    <ClInclude Include="stdafx.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="devmgmt.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
--- a/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.vcxproj.filters
+++ b/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.vcxproj.filters
@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Devices.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DeviceView.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="devmgmt.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MainWindow.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="stdafx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Devices.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DeviceView.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="devmgmt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MainWindow.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="stdafx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="devmgmt.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
--- a/reactos/base/applications/mscutils/devmgmt_new/lang/bg-BG.rc
+++ b/reactos/base/applications/mscutils/devmgmt_new/lang/bg-BG.rc
@ -8,6 +8,7 @@ BEGIN
  END
  POPUP "Действие"
  BEGIN
+    MENUITEM "Scan for hardware changes",    IDC_REFRESH
    MENUITEM "Отпечатване",                   IDC_PRINT, GRAYED
    MENUITEM SEPARATOR
    MENUITEM "Свойства",              IDC_PROP, GRAYED
@ -38,7 +39,7 @@ CAPTION "За управителя на устройствата"
 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
+  LTEXT "Device Manager v0.2\nCopyright (C) 2012\nby Ged Murphy (gedmurphy@reactos.org)", 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
@ -54,7 +55,6 @@ BEGIN
  IDS_TOOLTIP_PROP      "Свойства"
  IDS_TOOLTIP_REFRESH   "Опресняване"
  IDS_TOOLTIP_HELP      "Помощ"
-  IDS_TOOLTIP_EXIT      "Изход"
 END

 /* Hints */
@ -68,6 +68,11 @@ BEGIN
  IDS_HINT_HELP         " Показва помощен прозорец."
  IDS_HINT_ABOUT        " За управителя на устрйствата на РеактОС."

+  IDS_HINT_DEV_BY_TYPE  "Displays devices by hardware type"
+  IDS_HINT_DEV_BY_CONN  "Displays devices by connection"
+  IDS_HINT_RES_BY_TYPE  "Diaplays resources by type"
+  IDS_HINT_RES_BY_CONN  "Displays resources by connection type"
+
  IDS_HINT_SYS_RESTORE  " Възстановява прозореца до обичайния му рамер."
  IDS_HINT_SYS_MOVE     " Премества прозореца."
  IDS_HINT_SYS_SIZE     " Преоразмерява прозореца."
--- a/reactos/base/applications/mscutils/devmgmt_new/lang/de-DE.rc
+++ b/reactos/base/applications/mscutils/devmgmt_new/lang/de-DE.rc
@ -8,16 +8,19 @@ BEGIN
  END
  POPUP "Aktion"
  BEGIN
+    MENUITEM "Scan for hardware changes",    IDC_REFRESH
    MENUITEM "Drucken",                   IDC_PRINT, GRAYED
    MENUITEM SEPARATOR
    MENUITEM "Eigenschaften",              IDC_PROP, GRAYED
  END
  POPUP "Ansicht"
  BEGIN
-    MENUITEM "Geräte nach Typ",         IDC_DEVBYTYPE, CHECKED
-    MENUITEM "Geräte nach Verbindung",   IDC_STATIC, GRAYED
-    MENUITEM "Resourcen nach Typ",       IDC_STATIC, GRAYED
-    MENUITEM "Resourcen nach Verbindung", IDC_STATIC, GRAYED
+    MENUITEM "Geräte nach Typ",              IDC_DEVBYTYPE
+    MENUITEM "Geräte nach Verbindung",       IDC_DEVBYCONN
+    MENUITEM "Resourcen nach Typ",           IDC_RESBYTYPE, GRAYED
+    MENUITEM "Resourcen nach Verbindung",    IDC_RESBYCONN, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "Show hidden devices",         IDC_SHOWHIDDEN
  END
  POPUP "&?"
  BEGIN
@ -38,7 +41,7 @@ CAPTION "Über Geräte-Manager"
 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
+  LTEXT "Geräte-Manager v0.2\nCopyright (C) 2012\nby Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 130, 30
  PUSHBUTTON "Schließen", 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
@ -54,7 +57,6 @@ BEGIN
  IDS_TOOLTIP_PROP      "Eigenschaften"
  IDS_TOOLTIP_REFRESH   "Aktualisieren"
  IDS_TOOLTIP_HELP      "Hilfe"
-  IDS_TOOLTIP_EXIT      "Beenden"
 END

 /* Hints */
@ -68,6 +70,11 @@ BEGIN
  IDS_HINT_HELP         " Hilfe-Fenster anzeigen."
  IDS_HINT_ABOUT        " Über ReactOS Geräte-Manager."

+  IDS_HINT_DEV_BY_TYPE  "Displays devices by hardware type"
+  IDS_HINT_DEV_BY_CONN  "Displays devices by connection"
+  IDS_HINT_RES_BY_TYPE  "Diaplays resources by type"
+  IDS_HINT_RES_BY_CONN  "Displays resources by connection type"
+
  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."
--- a/reactos/base/applications/mscutils/devmgmt_new/lang/el-GR.rc
+++ b/reactos/base/applications/mscutils/devmgmt_new/lang/el-GR.rc
@ -8,16 +8,19 @@ BEGIN
  END
  POPUP "Ενέργεια"
  BEGIN
+    MENUITEM "Scan for hardware changes",    IDC_REFRESH
    MENUITEM "Εκτύπωση",             IDC_PRINT, GRAYED
    MENUITEM SEPARATOR
    MENUITEM "Ιδιότητες",            IDC_PROP, GRAYED
  END
  POPUP "Εμφάνιση"
  BEGIN
-    MENUITEM "Συσκευές ανά τύπο",    IDC_DEVBYTYPE, CHECKED
-    MENUITEM "Συσκευές ανά σύνδεση", IDC_STATIC, GRAYED
-    MENUITEM "Πηγές ανά τύπο",       IDC_STATIC, GRAYED
-    MENUITEM "Πηγές ανά σύνδεση",    IDC_STATIC, GRAYED
+    MENUITEM "Συσκευές ανά τύπο",    IDC_DEVBYTYPE
+    MENUITEM "Συσκευές ανά σύνδεση", IDC_DEVBYCONN
+    MENUITEM "Πηγές ανά τύπο",       IDC_RESBYTYPE, GRAYED
+    MENUITEM "Πηγές ανά σύνδεση",    IDC_RESBYCONN, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "Show hidden devices",         IDC_SHOWHIDDEN
  END
  POPUP "Βοήθεια"
  BEGIN
@ -38,7 +41,7 @@ CAPTION "Σχετικά με η διαχείριση συσκεών"
 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
+  LTEXT "Device Manager v0.2\nCopyright (C) 2012\nby Ged Murphy (gedmurphy@reactos.org)", 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
@ -54,7 +57,6 @@ BEGIN
  IDS_TOOLTIP_PROP      "Ιδιότητες"
  IDS_TOOLTIP_REFRESH   "Ανανέωση"
  IDS_TOOLTIP_HELP      "Βοήθεια"
-  IDS_TOOLTIP_EXIT      "Έξοδος"
 END

 /* Hints */
@ -68,6 +70,11 @@ BEGIN
  IDS_HINT_HELP         " Εμφάνιση παραθύρου βοήθειας."
  IDS_HINT_ABOUT        " Σχετικά με τη Διαχείριση Συσκευών του ReactOS."

+  IDS_HINT_DEV_BY_TYPE  "Displays devices by hardware type"
+  IDS_HINT_DEV_BY_CONN  "Displays devices by connection"
+  IDS_HINT_RES_BY_TYPE  "Diaplays resources by type"
+  IDS_HINT_RES_BY_CONN  "Displays resources by connection type"
+
  IDS_HINT_SYS_RESTORE  " Επαναφέρει το παράθυρο αυτό στο κανονικο του μέγεθος."
  IDS_HINT_SYS_MOVE     " Μετακινεί αυτό το παράθυρο."
  IDS_HINT_SYS_SIZE     " Αλλάζει το μέγεθος αυτού του παραθύρου."
--- a/reactos/base/applications/mscutils/devmgmt_new/lang/en-US.rc
+++ b/reactos/base/applications/mscutils/devmgmt_new/lang/en-US.rc
@ -8,7 +8,7 @@ BEGIN
  END
  POPUP "Action"
  BEGIN
-    MENUITEM "Scan for hardware changes"    IDC_REFRESH
+    MENUITEM "Scan for hardware changes",    IDC_REFRESH
    MENUITEM "Print",                       IDC_PRINT, GRAYED
    MENUITEM SEPARATOR
    MENUITEM "Properties",                  IDC_PROP, GRAYED
--- a/reactos/base/applications/mscutils/devmgmt_new/lang/es-ES.rc
+++ b/reactos/base/applications/mscutils/devmgmt_new/lang/es-ES.rc
@ -14,16 +14,19 @@ BEGIN
  END
  POPUP "Acción"
  BEGIN
+    MENUITEM "Scan for hardware changes",    IDC_REFRESH
    MENUITEM "Imprimir",                   IDC_PRINT, GRAYED
    MENUITEM SEPARATOR
    MENUITEM "Propiedades",              IDC_PROP, GRAYED
  END
  POPUP "Ver"
  BEGIN
-    MENUITEM "Dispositivos por tipo",         IDC_DEVBYTYPE, CHECKED
-    MENUITEM "Dispositivos por conexión",   IDC_STATIC, GRAYED
-    MENUITEM "Recursos por tipo",       IDC_STATIC, GRAYED
-    MENUITEM "Recursos por conexión", IDC_STATIC, GRAYED
+    MENUITEM "Dispositivos por tipo",     IDC_DEVBYTYPE
+    MENUITEM "Dispositivos por conexión", IDC_DEVBYCONN
+    MENUITEM "Recursos por tipo",         IDC_RESBYTYPE, GRAYED
+    MENUITEM "Recursos por conexión",     IDC_RESBYCONN, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "Show hidden devices",         IDC_SHOWHIDDEN
  END
  POPUP "Ayuda"
  BEGIN
@ -44,7 +47,7 @@ CAPTION "Acerca del Administrador 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 "Administrador de dispositivos v0.2\nCopyright (C) 2012\nby Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 130, 30
  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
@ -60,7 +63,6 @@ BEGIN
  IDS_TOOLTIP_PROP      "Propiedades"
  IDS_TOOLTIP_REFRESH   "Actualizar"
  IDS_TOOLTIP_HELP      "Ayuda"
-  IDS_TOOLTIP_EXIT      "Salir"
 END

 /* Hints */
@ -74,6 +76,11 @@ BEGIN
  IDS_HINT_HELP         " Mostrar la ventana de ayuda."
  IDS_HINT_ABOUT        " Acerca del Administrador de dispositivos de ReactOS."

+  IDS_HINT_DEV_BY_TYPE  "Displays devices by hardware type"
+  IDS_HINT_DEV_BY_CONN  "Displays devices by connection"
+  IDS_HINT_RES_BY_TYPE  "Diaplays resources by type"
+  IDS_HINT_RES_BY_CONN  "Displays resources by connection type"
+
  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."
--- a/reactos/base/applications/mscutils/devmgmt_new/lang/fr-FR.rc
+++ b/reactos/base/applications/mscutils/devmgmt_new/lang/fr-FR.rc
@ -8,16 +8,19 @@ BEGIN
  END
  POPUP "Action"
  BEGIN
+    MENUITEM "Scan for hardware changes",    IDC_REFRESH
    MENUITEM "Imprimer",                   IDC_PRINT, GRAYED
    MENUITEM SEPARATOR
    MENUITEM "Propriétés",              IDC_PROP, GRAYED
  END
  POPUP "Affichage"
  BEGIN
-    MENUITEM "Périphériques par type",         IDC_DEVBYTYPE, CHECKED
-    MENUITEM "Périphériques par connexion",   IDC_STATIC, GRAYED
-    MENUITEM "Ressources par type",       IDC_STATIC, GRAYED
-    MENUITEM "Ressources par connexion", IDC_STATIC, GRAYED
+    MENUITEM "Périphériques par type",        IDC_DEVBYTYPE
+    MENUITEM "Périphériques par connexion",   IDC_DEVBYCONN
+    MENUITEM "Ressources par type",           IDC_RESBYTYPE, GRAYED
+    MENUITEM "Ressources par connexion",      IDC_RESBYCONN, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "Show hidden devices",         IDC_SHOWHIDDEN
  END
  POPUP "Aide"
  BEGIN
@ -38,7 +41,7 @@ CAPTION "À propos du Gestionnaire de Périphériques"
 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
+  LTEXT "Device Manager v0.2\nCopyright (C) 2012\nby Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 130, 30
  PUSHBUTTON "Fermer", 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
@ -54,7 +57,6 @@ BEGIN
  IDS_TOOLTIP_PROP      "Propriétés"
  IDS_TOOLTIP_REFRESH   "Actualiser"
  IDS_TOOLTIP_HELP      "Aide"
-  IDS_TOOLTIP_EXIT      "Quitter"
 END

 /* Hints */
@ -68,6 +70,11 @@ BEGIN
  IDS_HINT_HELP         " Affiche la fenêtre d'aide."
  IDS_HINT_ABOUT        " À propos du Gestionnaire de Périphériques de ReactOS."

+  IDS_HINT_DEV_BY_TYPE  "Displays devices by hardware type"
+  IDS_HINT_DEV_BY_CONN  "Displays devices by connection"
+  IDS_HINT_RES_BY_TYPE  "Diaplays resources by type"
+  IDS_HINT_RES_BY_CONN  "Displays resources by connection type"
+
  IDS_HINT_SYS_RESTORE  " Restaure cette fenêtre à sa taille normale."
  IDS_HINT_SYS_MOVE     " Bouge cette fenêtre."
  IDS_HINT_SYS_SIZE     " Redimensionne cette fenêtre."
--- a/reactos/base/applications/mscutils/devmgmt_new/lang/he-IL.rc
+++ b/reactos/base/applications/mscutils/devmgmt_new/lang/he-IL.rc
@ -8,16 +8,19 @@ BEGIN
  END
  POPUP "פעולות"
  BEGIN
+    MENUITEM "Scan for hardware changes",    IDC_REFRESH
    MENUITEM "הדפס",                   IDC_PRINT, GRAYED
    MENUITEM SEPARATOR
    MENUITEM "מאפיינים",              IDC_PROP, GRAYED
  END
  POPUP "תצוגה"
  BEGIN
-    MENUITEM "התקנים לפי סוג",         IDC_DEVBYTYPE, CHECKED
-    MENUITEM "התקנים לפי חיבור",   IDC_STATIC, GRAYED
-    MENUITEM "משאבים לפי סוג",       IDC_STATIC, GRAYED
-    MENUITEM "משאבים לפי חיבור", IDC_STATIC, GRAYED
+    MENUITEM "התקנים לפי סוג",     IDC_DEVBYTYPE
+    MENUITEM "התקנים לפי חיבור",   IDC_DEVBYCONN
+    MENUITEM "משאבים לפי סוג",     IDC_RESBYTYPE, GRAYED
+    MENUITEM "משאבים לפי חיבור",   IDC_RESBYCONN, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "Show hidden devices",         IDC_SHOWHIDDEN
  END
  POPUP "עזרה"
  BEGIN
@ -38,7 +41,7 @@ CAPTION "אודות מנהל ההתקנים"
 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) 2012\nby Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 130, 30
  PUSHBUTTON "סגור", 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
@ -54,7 +57,6 @@ BEGIN
  IDS_TOOLTIP_PROP      "מאפיינים"
  IDS_TOOLTIP_REFRESH   "רענן"
  IDS_TOOLTIP_HELP      "עזרה"
-  IDS_TOOLTIP_EXIT      "יציאה"
 END

 /* Hints */
@ -68,6 +70,11 @@ BEGIN
  IDS_HINT_HELP         " Display help window."
  IDS_HINT_ABOUT        " אודות מנהל ההתקנים של ReactOS"

+  IDS_HINT_DEV_BY_TYPE  "Displays devices by hardware type"
+  IDS_HINT_DEV_BY_CONN  "Displays devices by connection"
+  IDS_HINT_RES_BY_TYPE  "Diaplays resources by type"
+  IDS_HINT_RES_BY_CONN  "Displays resources by connection type"
+
  IDS_HINT_SYS_RESTORE  " Restores this window to normal size."
  IDS_HINT_SYS_MOVE     " Moves this window."
  IDS_HINT_SYS_SIZE     " Resizes this window."
--- a/reactos/base/applications/mscutils/devmgmt_new/lang/id-ID.rc
+++ b/reactos/base/applications/mscutils/devmgmt_new/lang/id-ID.rc
@ -8,16 +8,19 @@ BEGIN
  END
  POPUP "Aksi"
  BEGIN
+    MENUITEM "Scan for hardware changes",    IDC_REFRESH
    MENUITEM "Cetak",                   IDC_PRINT, GRAYED
    MENUITEM SEPARATOR
    MENUITEM "Properti",                IDC_PROP, GRAYED
  END
  POPUP "Lihat"
  BEGIN
-    MENUITEM "Device dengan tipe",      IDC_DEVBYTYPE, CHECKED
-    MENUITEM "Device dengan koneksi",   IDC_STATIC, GRAYED
-    MENUITEM "Resource dengan tipe",    IDC_STATIC, GRAYED
-    MENUITEM "Resource dengan koneksi", IDC_STATIC, GRAYED
+    MENUITEM "Device dengan tipe",         IDC_DEVBYTYPE
+    MENUITEM "Device dengan koneksi",      IDC_DEVBYCONN
+    MENUITEM "Resource dengan tipe",       IDC_RESBYTYPE, GRAYED
+    MENUITEM "Resource dengan koneksi",    IDC_RESBYCONN, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "Show hidden devices",         IDC_SHOWHIDDEN
  END
  POPUP "Bantuan"
  BEGIN
@ -38,7 +41,7 @@ CAPTION "Tentang Manajer Device"
 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
+  LTEXT "Manajer Device v0.1\nHak Cipta (C) 2012\nby Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 130, 26
  PUSHBUTTON "Tutup", 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
@ -54,7 +57,6 @@ BEGIN
  IDS_TOOLTIP_PROP      "Properti"
  IDS_TOOLTIP_REFRESH   "Segarkan"
  IDS_TOOLTIP_HELP      "Bantuan"
-  IDS_TOOLTIP_EXIT      "Keluar"
 END

 /* Hints */
@ -68,6 +70,11 @@ BEGIN
  IDS_HINT_HELP         " Menampilkan jendela bantuan."
  IDS_HINT_ABOUT        " Tentang Manajer Device ReactOS."

+  IDS_HINT_DEV_BY_TYPE  "Displays devices by hardware type"
+  IDS_HINT_DEV_BY_CONN  "Displays devices by connection"
+  IDS_HINT_RES_BY_TYPE  "Diaplays resources by type"
+  IDS_HINT_RES_BY_CONN  "Displays resources by connection type"
+
  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."
--- a/reactos/base/applications/mscutils/devmgmt_new/lang/it-IT.rc
+++ b/reactos/base/applications/mscutils/devmgmt_new/lang/it-IT.rc
@ -8,16 +8,19 @@ BEGIN
  END
  POPUP "Azioni"
  BEGIN
+    MENUITEM "Scan for hardware changes",    IDC_REFRESH
    MENUITEM "Stampa",                      IDC_PRINT, GRAYED
    MENUITEM SEPARATOR
    MENUITEM "Proprietà",                   IDC_PROP, GRAYED
  END
  POPUP "Visualizza"
  BEGIN
-    MENUITEM "Dispositivi per tipo",        IDC_DEVBYTYPE, CHECKED
-    MENUITEM "Dispositivi per connessione", IDC_STATIC, GRAYED
-    MENUITEM "Risorse per tipo",            IDC_STATIC, GRAYED
-    MENUITEM "Risorse per connessione",     IDC_STATIC, GRAYED
+    MENUITEM "Dispositivi per tipo",           IDC_DEVBYTYPE
+    MENUITEM "Dispositivi per connessione",    IDC_DEVBYCONN
+    MENUITEM "Risorse per tipo",               IDC_RESBYTYPE, GRAYED
+    MENUITEM "Risorse per connessione",        IDC_RESBYCONN, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "Show hidden devices",         IDC_SHOWHIDDEN
  END
  POPUP "Aiuto"
  BEGIN
@ -38,7 +41,7 @@ CAPTION "Informazioni su Gestione Dispositivi"
 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
+  LTEXT "Gestione dispositivi v0.1\nCopyright (C) 2012\nby Ged Murphy (gedmurphy@reactos.org)", 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
@ -54,7 +57,6 @@ BEGIN
  IDS_TOOLTIP_PROP      "Proprietà"
  IDS_TOOLTIP_REFRESH   "Aggiorna"
  IDS_TOOLTIP_HELP      "Aiuto"
-  IDS_TOOLTIP_EXIT      "Esci"
 END

 /* Hints */
@ -68,6 +70,11 @@ BEGIN
  IDS_HINT_HELP         " Visualizza la finestra di aiuto."
  IDS_HINT_ABOUT        " Informazioni su Gestione dispositivi di ReactOS."

+  IDS_HINT_DEV_BY_TYPE  "Displays devices by hardware type"
+  IDS_HINT_DEV_BY_CONN  "Displays devices by connection"
+  IDS_HINT_RES_BY_TYPE  "Diaplays resources by type"
+  IDS_HINT_RES_BY_CONN  "Displays resources by connection type"
+
  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."
--- a/reactos/base/applications/mscutils/devmgmt_new/lang/ja-JP.rc
+++ b/reactos/base/applications/mscutils/devmgmt_new/lang/ja-JP.rc
@ -8,16 +8,19 @@ BEGIN
  END
  POPUP "操作"
  BEGIN
+    MENUITEM "Scan for hardware changes",    IDC_REFRESH
    MENUITEM "印刷",                    IDC_PRINT, GRAYED
    MENUITEM SEPARATOR
    MENUITEM "プロパティ",              IDC_PROP, GRAYED
  END
-  POPUP "表\示"
+  POPUP "表\\示"
  BEGIN
-    MENUITEM "デバイス (種類別)",       IDC_DEVBYTYPE, CHECKED
-    MENUITEM "デバイス (接続別)",       IDC_STATIC, GRAYED
-    MENUITEM "リソ\ース (種類別)",      IDC_STATIC, GRAYED
-    MENUITEM "リソ\ース (接続別)",      IDC_STATIC, GRAYED
+    MENUITEM "デバイス (種類別)",      IDC_DEVBYTYPE
+    MENUITEM "デバイス (接続別)",      IDC_DEVBYCONN
+    MENUITEM "リソ\\ース (種類別)",      IDC_RESBYTYPE, GRAYED
+    MENUITEM "リソ\\ース (接続別)",      IDC_RESBYCONN, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "Show hidden devices",         IDC_SHOWHIDDEN
  END
  POPUP "ヘルプ"
  BEGIN
@ -38,7 +41,7 @@ CAPTION "デバイス マネージャについて"
 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
+  LTEXT "デバイス マネージャ v0.1\nCopyright (C) 2012\nby Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 130, 30
  PUSHBUTTON "閉じる", 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
@ -54,7 +57,6 @@ BEGIN
  IDS_TOOLTIP_PROP      "プロパティ"
  IDS_TOOLTIP_REFRESH   "更新"
  IDS_TOOLTIP_HELP      "ヘルプ"
-  IDS_TOOLTIP_EXIT      "終了"
 END

 /* Hints */
@ -65,8 +67,13 @@ BEGIN
  IDS_HINT_EXIT         " このプログラムを終了します。"
  IDS_HINT_REFRESH      " サービスのリストを更新します。"
  IDS_HINT_PROP         " 現在選択されているシートのプロパティを開きます。"
-  IDS_HINT_HELP         " ヘルプ ウィンドウを表\示します。"
-  IDS_HINT_ABOUT        " ReactOS デバイス マネージャについて表\示します。"
+  IDS_HINT_HELP         " ヘルプ ウィンドウを表\\示します。"
+  IDS_HINT_ABOUT        " ReactOS デバイス マネージャについて表\\示します。"
+
+  IDS_HINT_DEV_BY_TYPE  "Displays devices by hardware type"
+  IDS_HINT_DEV_BY_CONN  "Displays devices by connection"
+  IDS_HINT_RES_BY_TYPE  "Diaplays resources by type"
+  IDS_HINT_RES_BY_CONN  "Displays resources by connection type"

  IDS_HINT_SYS_RESTORE  " このウィンドウを通常の大きさに復元します。"
  IDS_HINT_SYS_MOVE     " このウィンドウを移動します。"
--- a/reactos/base/applications/mscutils/devmgmt_new/lang/ko-KR.rc
+++ b/reactos/base/applications/mscutils/devmgmt_new/lang/ko-KR.rc
@ -11,16 +11,19 @@ BEGIN
  END
  POPUP "액션"
  BEGIN
+    MENUITEM "Scan for hardware changes",    IDC_REFRESH
    MENUITEM "프린트",                   IDC_PRINT, GRAYED
    MENUITEM SEPARATOR
    MENUITEM "속성",              IDC_PROP, GRAYED
  END
  POPUP "보기"
  BEGIN
-    MENUITEM "Devices by type",         IDC_DEVBYTYPE, CHECKED
-    MENUITEM "Devices by connection",   IDC_STATIC, GRAYED
-    MENUITEM "Resources by type",       IDC_STATIC, GRAYED
-    MENUITEM "Resources by connection", IDC_STATIC, GRAYED
+    MENUITEM "Devices by type",            IDC_DEVBYTYPE
+    MENUITEM "Devices by connection",      IDC_DEVBYCONN
+    MENUITEM "Resources by type",          IDC_RESBYTYPE, GRAYED
+    MENUITEM "Resources by connection",    IDC_RESBYCONN, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "Show hidden devices",         IDC_SHOWHIDDEN
  END
  POPUP "도움말"
  BEGIN
@ -41,7 +44,7 @@ CAPTION "장치 관리자에 대하여"
 FONT 9,"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) 2012\nby Ged Murphy (gedmurphy@reactos.org)", 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
@ -57,7 +60,6 @@ BEGIN
  IDS_TOOLTIP_PROP      "속성"
  IDS_TOOLTIP_REFRESH   "새로 고침"
  IDS_TOOLTIP_HELP      "도움말"
-  IDS_TOOLTIP_EXIT      "종료"
 END

 /* Hints */
@ -71,6 +73,11 @@ BEGIN
  IDS_HINT_HELP         " 도움말을 엽니다."
  IDS_HINT_ABOUT        " ReactOS 장치 관리자에 대해."

+  IDS_HINT_DEV_BY_TYPE  "Displays devices by hardware type"
+  IDS_HINT_DEV_BY_CONN  "Displays devices by connection"
+  IDS_HINT_RES_BY_TYPE  "Diaplays resources by type"
+  IDS_HINT_RES_BY_CONN  "Displays resources by connection type"
+
  IDS_HINT_SYS_RESTORE  " 이 창을 보통 크기로 맟춤니다."
  IDS_HINT_SYS_MOVE     " 창을 움직입니다."
  IDS_HINT_SYS_SIZE     " 창의 크기를 변경합니다."
--- a/reactos/base/applications/mscutils/devmgmt_new/lang/no-NO.rc
+++ b/reactos/base/applications/mscutils/devmgmt_new/lang/no-NO.rc
@ -8,16 +8,19 @@ BEGIN
  END
  POPUP "Handling"
  BEGIN
+    MENUITEM "Scan for hardware changes",    IDC_REFRESH
    MENUITEM "Skriv ut",                   IDC_PRINT, GRAYED
    MENUITEM SEPARATOR
    MENUITEM "Egenskaper",              IDC_PROP, GRAYED
  END
  POPUP "Vis"
  BEGIN
-    MENUITEM "Enheter etter type",         IDC_DEVBYTYPE, CHECKED
-    MENUITEM "Enheter etter tilkobling",   IDC_STATIC, GRAYED
-    MENUITEM "Ressurser etter type",       IDC_STATIC, GRAYED
-    MENUITEM "Ressurser etter tilkobling", IDC_STATIC, GRAYED
+    MENUITEM "Enheter etter type",            IDC_DEVBYTYPE
+    MENUITEM "Enheter etter tilkobling",      IDC_DEVBYCONN
+    MENUITEM "Ressurser etter type",          IDC_RESBYTYPE, GRAYED
+    MENUITEM "Ressurser etter tilkobling",    IDC_RESBYCONN, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "Show hidden devices",         IDC_SHOWHIDDEN
  END
  POPUP "Hjelp"
  BEGIN
@ -38,7 +41,7 @@ CAPTION "Om Enhetsbehandler"
 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
+  LTEXT "Enhetsbehandler v0.1\nEnerett (C) 2012\nlaget av Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 130, 30
  PUSHBUTTON "Lukk", 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
@ -54,7 +57,6 @@ BEGIN
  IDS_TOOLTIP_PROP      "Egenskaper"
  IDS_TOOLTIP_REFRESH   "Oppdater"
  IDS_TOOLTIP_HELP      "Hjelp"
-  IDS_TOOLTIP_EXIT      "Avslutt"
 END

 /* Hints */
@ -68,6 +70,11 @@ BEGIN
  IDS_HINT_HELP         " Vis hjelp vinduet."
  IDS_HINT_ABOUT        " Om ReactOS Enhetsbehandler."

+  IDS_HINT_DEV_BY_TYPE  "Displays devices by hardware type"
+  IDS_HINT_DEV_BY_CONN  "Displays devices by connection"
+  IDS_HINT_RES_BY_TYPE  "Diaplays resources by type"
+  IDS_HINT_RES_BY_CONN  "Displays resources by connection type"
+
  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."
--- a/reactos/base/applications/mscutils/devmgmt_new/lang/pl-PL.rc
+++ b/reactos/base/applications/mscutils/devmgmt_new/lang/pl-PL.rc
@ -15,16 +15,19 @@ BEGIN
  END
  POPUP "&Akcja"
  BEGIN
+    MENUITEM "Scan for hardware changes",    IDC_REFRESH
    MENUITEM "&Drukuj",                   IDC_PRINT, GRAYED
    MENUITEM SEPARATOR
    MENUITEM "&Właściwości",              IDC_PROP, GRAYED
  END
  POPUP "&Widok"
  BEGIN
-    MENUITEM "Urządzenia w&edług typu",         IDC_DEVBYTYPE, CHECKED
-    MENUITEM "Ur&ządzenia według połączenia",   IDC_STATIC, GRAYED
-    MENUITEM "Zaso&by według typu",       IDC_STATIC, GRAYED
-    MENUITEM "Za&soby według połączenia", IDC_STATIC, GRAYED
+    MENUITEM "Urządzenia w&edług typu",          IDC_DEVBYTYPE
+    MENUITEM "Ur&ządzenia według połączenia",    IDC_DEVBYCONN
+    MENUITEM "Zaso&by według typu",              IDC_RESBYTYPE, GRAYED
+    MENUITEM "Za&soby według połączenia",        IDC_RESBYCONN, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "Show hidden devices",         IDC_SHOWHIDDEN
  END
  POPUP "Pomo&c"
  BEGIN
@ -45,7 +48,7 @@ CAPTION "Menedżer urządzeń - informacje"
 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
+  LTEXT "Menedżer urządzeń v0.1\nCopyright (C) 2012\nby Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 130, 26
  PUSHBUTTON "Zamknij", 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
@ -61,7 +64,6 @@ BEGIN
  IDS_TOOLTIP_PROP      "Właściwości"
  IDS_TOOLTIP_REFRESH   "Odśwież"
  IDS_TOOLTIP_HELP      "Pomoc"
-  IDS_TOOLTIP_EXIT      "Wyjście"
 END

 /* Hints */
@ -75,6 +77,11 @@ BEGIN
  IDS_HINT_HELP         " Otwiera pomoc."
  IDS_HINT_ABOUT        " Informacje o Menedżerze urządzeń ReactOS."

+  IDS_HINT_DEV_BY_TYPE  "Displays devices by hardware type"
+  IDS_HINT_DEV_BY_CONN  "Displays devices by connection"
+  IDS_HINT_RES_BY_TYPE  "Diaplays resources by type"
+  IDS_HINT_RES_BY_CONN  "Displays resources by connection type"
+
  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."
--- a/reactos/base/applications/mscutils/devmgmt_new/lang/pt-BR.rc
+++ b/reactos/base/applications/mscutils/devmgmt_new/lang/pt-BR.rc
@ -10,16 +10,19 @@ BEGIN
  END
  POPUP "Ação"
  BEGIN
+    MENUITEM "Scan for hardware changes",    IDC_REFRESH
    MENUITEM "Imprimir",                   IDC_PRINT, GRAYED
    MENUITEM SEPARATOR
    MENUITEM "Propriedades",              IDC_PROP, GRAYED
  END
  POPUP "Visualizar"
  BEGIN
-    MENUITEM "Dispositivos por tipo",         IDC_DEVBYTYPE, CHECKED
-    MENUITEM "Dispositivos por conexão",   IDC_STATIC, GRAYED
-    MENUITEM "Recursos por tipo",       IDC_STATIC, GRAYED
-    MENUITEM "Recursos por conexão", IDC_STATIC, GRAYED
+    MENUITEM "Dispositivos por tipo",       IDC_DEVBYTYPE
+    MENUITEM "Dispositivos por conexão",    IDC_DEVBYCONN
+    MENUITEM "Recursos por tipo",           IDC_RESBYTYPE, GRAYED
+    MENUITEM "Recursos por conexão",        IDC_RESBYCONN, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "Show hidden devices",         IDC_SHOWHIDDEN
  END
  POPUP "Ajuda"
  BEGIN
@ -40,7 +43,7 @@ CAPTION "Sobre Gerenciador de Dispositivos"
 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
+  LTEXT "Gerenciador de Dispositivos v0.1\nCopyright (C) 2012\nby Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 130, 30
  PUSHBUTTON "Fechar", 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
@ -56,7 +59,6 @@ BEGIN
  IDS_TOOLTIP_PROP      "Propriedades"
  IDS_TOOLTIP_REFRESH   "Atualizar"
  IDS_TOOLTIP_HELP      "Ajuda"
-  IDS_TOOLTIP_EXIT      "Sair"
 END

 /* Hints */
@ -70,6 +72,11 @@ BEGIN
  IDS_HINT_HELP         " Exibe tela de ajuda."
  IDS_HINT_ABOUT        " Sobre Gerenciador de Dispositivos ReactOS."

+  IDS_HINT_DEV_BY_TYPE  "Displays devices by hardware type"
+  IDS_HINT_DEV_BY_CONN  "Displays devices by connection"
+  IDS_HINT_RES_BY_TYPE  "Diaplays resources by type"
+  IDS_HINT_RES_BY_CONN  "Displays resources by connection type"
+
  IDS_HINT_SYS_RESTORE  " Restaura esta janela ao tamanho normal."
  IDS_HINT_SYS_MOVE     " Move esta janela."
  IDS_HINT_SYS_SIZE     " Redimensiona esta janela."
--- a/reactos/base/applications/mscutils/devmgmt_new/lang/ro-RO.rc
+++ b/reactos/base/applications/mscutils/devmgmt_new/lang/ro-RO.rc
@ -9,16 +9,19 @@ BEGIN
  END
  POPUP "A&cțiune"
  BEGIN
+    MENUITEM "Scan for hardware changes",    IDC_REFRESH
    MENUITEM "Im&primare",                    IDC_PRINT, GRAYED
    MENUITEM SEPARATOR
    MENUITEM "P&roprietăți",                  IDC_PROP, GRAYED
  END
  POPUP "&Afișare"
  BEGIN
-    MENUITEM "Dispozitive după &tip",         IDC_DEVBYTYPE, CHECKED
-    MENUITEM "Dispozitive după &conexiune",   IDC_STATIC, GRAYED
-    MENUITEM "Resurse după t&ip",             IDC_STATIC, GRAYED
-    MENUITEM "Resurse după c&onexiune",       IDC_STATIC, GRAYED
+    MENUITEM "Dispozitive după &tip",          IDC_DEVBYTYPE
+    MENUITEM "Dispozitive după &conexiune",    IDC_DEVBYCONN
+    MENUITEM "Resurse după t&ip",              IDC_RESBYTYPE, GRAYED
+    MENUITEM "Resurse după c&onexiune",        IDC_RESBYCONN, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "Show hidden devices",         IDC_SHOWHIDDEN
  END
  POPUP "Aj&utor"
  BEGIN
@ -39,7 +42,7 @@ CAPTION "Despre Gestionarul de dispozitive"
 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
+  LTEXT       "Gestionar de Dispozitive v0.1\nDrept de autor (C) 2012\nde Ged Murphy (gedmurphy@reactos.org)\nTraducere de Petru Dimitriu", IDC_STATIC, 48, 7, 130, 35
  PUSHBUTTON  "Î&nchide", IDOK, 75, 162, 44, 15
  ICON                    IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30
  EDITTEXT                IDC_LICENSE_EDIT, 8, 47, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
@ -55,7 +58,6 @@ BEGIN
  IDS_TOOLTIP_PROP      "Proprietăți"
  IDS_TOOLTIP_REFRESH   "Împrospătare"
  IDS_TOOLTIP_HELP      "Manual de utilizare"
-  IDS_TOOLTIP_EXIT      "Ieșire"
 END

 /* Hints */
@ -69,6 +71,11 @@ BEGIN
  IDS_HINT_HELP         " Afișează manualul de utilizare."
  IDS_HINT_ABOUT        " Despre Gestionarul de dispozitive."

+  IDS_HINT_DEV_BY_TYPE  "Displays devices by hardware type"
+  IDS_HINT_DEV_BY_CONN  "Displays devices by connection"
+  IDS_HINT_RES_BY_TYPE  "Diaplays resources by type"
+  IDS_HINT_RES_BY_CONN  "Displays resources by connection type"
+
  IDS_HINT_SYS_RESTORE  " Aduce fereastra la mărime normală."
  IDS_HINT_SYS_MOVE     " Mută fereastra."
  IDS_HINT_SYS_SIZE     " Redimensionează fereastra."
--- a/reactos/base/applications/mscutils/devmgmt_new/lang/ru-RU.rc
+++ b/reactos/base/applications/mscutils/devmgmt_new/lang/ru-RU.rc
@ -10,16 +10,19 @@ BEGIN
  END
  POPUP "Действие"
  BEGIN
+    MENUITEM "Scan for hardware changes",    IDC_REFRESH
    MENUITEM "Печать",                   IDC_PRINT, GRAYED
    MENUITEM SEPARATOR
    MENUITEM "Свойства",              IDC_PROP, GRAYED
  END
  POPUP "Вид"
  BEGIN
-    MENUITEM "Устройства по типу",         IDC_DEVBYTYPE, CHECKED
-    MENUITEM "Устройства по подключению",   IDC_STATIC, GRAYED
-    MENUITEM "Ресурсы по типу",       IDC_STATIC, GRAYED
-    MENUITEM "Ресурсы по подключению", IDC_STATIC, GRAYED
+    MENUITEM "Устройства по типу",           IDC_DEVBYTYPE
+    MENUITEM "Устройства по подключению",    IDC_DEVBYCONN
+    MENUITEM "Ресурсы по типу",              IDC_RESBYTYPE, GRAYED
+    MENUITEM "Ресурсы по подключению",       IDC_RESBYCONN, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "Show hidden devices",         IDC_SHOWHIDDEN
  END
  POPUP "Справка"
  BEGIN
@ -40,7 +43,7 @@ CAPTION "О Диспетчере устройств"
 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
+  LTEXT "Диспетчер устройств v0.1\nCopyright (C) 2012\nот Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 130, 30
  PUSHBUTTON "Закрыть", 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
@ -56,7 +59,6 @@ BEGIN
  IDS_TOOLTIP_PROP      "Свойства"
  IDS_TOOLTIP_REFRESH   "Обновить"
  IDS_TOOLTIP_HELP      "Помощь"
-  IDS_TOOLTIP_EXIT      "Выход"
 END

 /* Hints */
@ -70,6 +72,11 @@ BEGIN
  IDS_HINT_HELP         " Показать окно справки."
  IDS_HINT_ABOUT        " О ReactOS Device Manager."

+  IDS_HINT_DEV_BY_TYPE  "Displays devices by hardware type"
+  IDS_HINT_DEV_BY_CONN  "Displays devices by connection"
+  IDS_HINT_RES_BY_TYPE  "Diaplays resources by type"
+  IDS_HINT_RES_BY_CONN  "Displays resources by connection type"
+
  IDS_HINT_SYS_RESTORE  " Востановить нормальный размер этого окна."
  IDS_HINT_SYS_MOVE     " Переместить это окно."
  IDS_HINT_SYS_SIZE     " Изменить размер этого окна."
--- a/reactos/base/applications/mscutils/devmgmt_new/lang/sk-SK.rc
+++ b/reactos/base/applications/mscutils/devmgmt_new/lang/sk-SK.rc
@ -13,16 +13,19 @@ BEGIN
  END
  POPUP "Akcia"
  BEGIN
+    MENUITEM "Scan for hardware changes",    IDC_REFRESH
    MENUITEM "Tlačiť",                   IDC_PRINT, GRAYED
    MENUITEM SEPARATOR
    MENUITEM "Vlastnosti",              IDC_PROP, GRAYED
  END
  POPUP "Zobraziť"
  BEGIN
-    MENUITEM "Zariadenia podľa typu",         IDC_DEVBYTYPE, CHECKED
-    MENUITEM "Zariadenia podľa pripojenia",   IDC_STATIC, GRAYED
-    MENUITEM "Prostriedky podľa typu",       IDC_STATIC, GRAYED
-    MENUITEM "Prostriedky podľa pripojenia", IDC_STATIC, GRAYED
+    MENUITEM "Zariadenia podľa typu",           IDC_DEVBYTYPE
+    MENUITEM "Zariadenia podľa pripojenia",     IDC_DEVBYCONN
+    MENUITEM "Prostriedky podľa typu",          IDC_RESBYTYPE, GRAYED
+    MENUITEM "Prostriedky podľa pripojenia",    IDC_RESBYCONN, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "Show hidden devices",         IDC_SHOWHIDDEN
  END
  POPUP "Pomocník"
  BEGIN
@ -43,7 +46,7 @@ CAPTION "Čo je Správca zariadení"
 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
+  LTEXT "Správca zariadení v0.1\nCopyright (C) 2012\nod Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 130, 30
  PUSHBUTTON "Zavrieť", 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
@ -59,7 +62,6 @@ BEGIN
  IDS_TOOLTIP_PROP      "Vlastnosti"
  IDS_TOOLTIP_REFRESH   "Obnoviť"
  IDS_TOOLTIP_HELP      "Pomocník"
-  IDS_TOOLTIP_EXIT      "Skončiť"
 END

 /* Hints */
@ -73,6 +75,11 @@ BEGIN
  IDS_HINT_HELP         " Zobrazí okno pomocníka."
  IDS_HINT_ABOUT        " Čo je Správca zariadení systému ReactOS."

+  IDS_HINT_DEV_BY_TYPE  "Displays devices by hardware type"
+  IDS_HINT_DEV_BY_CONN  "Displays devices by connection"
+  IDS_HINT_RES_BY_TYPE  "Diaplays resources by type"
+  IDS_HINT_RES_BY_CONN  "Displays resources by connection type"
+
  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."
--- a/reactos/base/applications/mscutils/devmgmt_new/lang/sq-AL.rc
+++ b/reactos/base/applications/mscutils/devmgmt_new/lang/sq-AL.rc
@ -12,16 +12,19 @@ BEGIN
  END
  POPUP "Veprim"
  BEGIN
+    MENUITEM "Scan for hardware changes",    IDC_REFRESH
    MENUITEM "Printo",                   IDC_PRINT, GRAYED
    MENUITEM SEPARATOR
    MENUITEM "Tipar",              IDC_PROP, GRAYED
  END
  POPUP "Vëzhgo"
  BEGIN
-    MENUITEM "Pajisje nga tipi",         IDC_DEVBYTYPE, CHECKED
-    MENUITEM "Pajisje nga lidhja",   IDC_STATIC, GRAYED
-    MENUITEM "Burime nga tipi",       IDC_STATIC, GRAYED
-    MENUITEM "Burime nga lidhja", IDC_STATIC, GRAYED
+    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 "Show hidden devices",         IDC_SHOWHIDDEN
  END
  POPUP "Ndihmë"
  BEGIN
@ -42,7 +45,7 @@ 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
+  LTEXT "Menaxhues pajisjesh v0.1\nCopyright (C) 2012\nby Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 130, 30
  PUSHBUTTON "Mbyll", 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
@ -58,7 +61,6 @@ BEGIN
  IDS_TOOLTIP_PROP      "Tipar"
  IDS_TOOLTIP_REFRESH   "Rifresko"
  IDS_TOOLTIP_HELP      "Ndihmë"
-  IDS_TOOLTIP_EXIT      "Dil"
 END

 /* Hints */
@ -72,6 +74,11 @@ BEGIN
  IDS_HINT_HELP         " Shfaq dritaren e ndihmës."
  IDS_HINT_ABOUT        " Rreth menaxhusit të pajisjeve të ReactOS."

+  IDS_HINT_DEV_BY_TYPE  "Displays devices by hardware type"
+  IDS_HINT_DEV_BY_CONN  "Displays devices by connection"
+  IDS_HINT_RES_BY_TYPE  "Diaplays resources by type"
+  IDS_HINT_RES_BY_CONN  "Displays resources by connection type"
+
  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."
--- a/reactos/base/applications/mscutils/devmgmt_new/lang/sv-SE.rc
+++ b/reactos/base/applications/mscutils/devmgmt_new/lang/sv-SE.rc
@ -14,16 +14,19 @@ BEGIN
  END
  POPUP "Åtgärd"
  BEGIN
+    MENUITEM "Scan for hardware changes",    IDC_REFRESH
    MENUITEM "Skriv ut",                   IDC_PRINT, GRAYED
    MENUITEM SEPARATOR
    MENUITEM "Egenskaper",              IDC_PROP, GRAYED
  END
  POPUP "Visa"
  BEGIN
-    MENUITEM "Enheter efter typ",         IDC_DEVBYTYPE, CHECKED
-    MENUITEM "Enheter efter koppling",   IDC_STATIC, GRAYED
-    MENUITEM "Resurcer efter typ",       IDC_STATIC, GRAYED
-    MENUITEM "Resurcer efter koppling", IDC_STATIC, GRAYED
+    MENUITEM "Enheter efter typ",          IDC_DEVBYTYPE
+    MENUITEM "Enheter efter koppling",     IDC_DEVBYCONN
+    MENUITEM "Resurcer efter typ",         IDC_RESBYTYPE, GRAYED
+    MENUITEM "Resurcer efter koppling",    IDC_RESBYCONN, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "Show hidden devices",         IDC_SHOWHIDDEN
  END
  POPUP "Hjälp"
  BEGIN
@ -44,7 +47,7 @@ CAPTION "Om Enhetshanteraren"
 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
+  LTEXT "Enhetshanteraren v0.1\nCopyright (C) 2012\nby Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 130, 30
  PUSHBUTTON "Stäng", 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
@ -60,7 +63,6 @@ BEGIN
  IDS_TOOLTIP_PROP      "Egenskaper"
  IDS_TOOLTIP_REFRESH   "Uppdater"
  IDS_TOOLTIP_HELP      "Hjälp"
-  IDS_TOOLTIP_EXIT      "Avsluta"
 END

 /* Hints */
@ -74,6 +76,11 @@ BEGIN
  IDS_HINT_HELP         " Visa hjälpfönstret."
  IDS_HINT_ABOUT        " Om ReactOS Enhetshanterare."

+  IDS_HINT_DEV_BY_TYPE  "Displays devices by hardware type"
+  IDS_HINT_DEV_BY_CONN  "Displays devices by connection"
+  IDS_HINT_RES_BY_TYPE  "Diaplays resources by type"
+  IDS_HINT_RES_BY_CONN  "Displays resources by connection type"
+
  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."
--- a/reactos/base/applications/mscutils/devmgmt_new/lang/th-TH.rc
+++ b/reactos/base/applications/mscutils/devmgmt_new/lang/th-TH.rc
@ -17,16 +17,19 @@ BEGIN
  END
  POPUP "เริ่มทำ"
  BEGIN
+    MENUITEM "Scan for hardware changes",    IDC_REFRESH
    MENUITEM "พิมพ์",                        IDC_PRINT, GRAYED
    MENUITEM SEPARATOR
    MENUITEM "คุณสมบัติ",                    IDC_PROP, GRAYED
  END
  POPUP "มุมมอง"
  BEGIN
-    MENUITEM "อุปกรณ์แบ่งตามประเภท",         IDC_DEVBYTYPE, CHECKED
-    MENUITEM "อุปกรณ์แบ่งตามการเชื่อมต่อ",   IDC_STATIC, GRAYED
-    MENUITEM "แหล่งข้อมูลตามประเภท",         IDC_STATIC, GRAYED
-    MENUITEM "แหล่งข้อมูลตามการเชื่อมต่อ",   IDC_STATIC, GRAYED
+    MENUITEM "อุปกรณ์แบ่งตามประเภท",      IDC_DEVBYTYPE
+    MENUITEM "อุปกรณ์แบ่งตามการเชื่อมต่อ",    IDC_DEVBYCONN
+    MENUITEM "แหล่งข้อมูลตามประเภท",      IDC_RESBYTYPE, GRAYED 
+    MENUITEM "แหล่งข้อมูลตามการเชื่อมต่อ",    IDC_RESBYCONN, GRAYED 
+    MENUITEM SEPARATOR
+    MENUITEM "Show hidden devices",         IDC_SHOWHIDDEN
  END
  POPUP "ช่วยเหลือ"
  BEGIN
@ -47,7 +50,7 @@ CAPTION "เกี่ยวกับการจัดการอุปกร
 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
+  LTEXT "Device Manager v0.1\nCopyright (C) 2012\nby Ged Murphy (gedmurphy@reactos.org)", 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
@ -63,7 +66,6 @@ BEGIN
  IDS_TOOLTIP_PROP      "คุณสมบัติ"
  IDS_TOOLTIP_REFRESH   "ฟื้นฟู"
  IDS_TOOLTIP_HELP      "ช่วยเหลือ"
-  IDS_TOOLTIP_EXIT      "ออกจากโปรแกรม"
 END

 /* Hints */
@ -77,6 +79,11 @@ BEGIN
  IDS_HINT_HELP         " แสดงหน้าต่างช่วยเหลือ"
  IDS_HINT_ABOUT        " เกี่ยวกับการจัดการอุปกรณ์ของ ReactOS"

+  IDS_HINT_DEV_BY_TYPE  "Displays devices by hardware type"
+  IDS_HINT_DEV_BY_CONN  "Displays devices by connection"
+  IDS_HINT_RES_BY_TYPE  "Diaplays resources by type"
+  IDS_HINT_RES_BY_CONN  "Displays resources by connection type"
+
  IDS_HINT_SYS_RESTORE  " คืนสภาพของหน้าต่างนี้สู่ขนาดปกติ"
  IDS_HINT_SYS_MOVE     " ย้ายหน้าต่างนี้"
  IDS_HINT_SYS_SIZE     " เปลี่ยนขนาดหน้าต่างนี้"
--- a/reactos/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc
+++ b/reactos/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc
@ -10,17 +10,17 @@ BEGIN
    END
    POPUP "&Eylem"
    BEGIN
-        MENUITEM "&Donanım Değişiklikleri İçin Tara"   IDC_REFRESH
+        MENUITEM "&Donanım Değişiklikleri İçin Tara",   IDC_REFRESH
        MENUITEM "&Yazdır",                            IDC_PRINT, GRAYED
        MENUITEM SEPARATOR
        MENUITEM "&Husûsiyetler",                      IDC_PROP, GRAYED
        END
    POPUP "&Görünüm"
    BEGIN
-        MENUITEM "&Türe Göre Aygıtlar",                IDC_DEVBYTYPE, CHECKED
-        MENUITEM "&Bağlantıya Göre Aygıtlar",          IDC_STATIC, GRAYED
-        MENUITEM "T&üre Göre Kaynaklar",               IDC_STATIC, GRAYED
-        MENUITEM "B&ağlantıya Göre Kaynaklar",         IDC_STATIC, GRAYED
+        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
@ -43,7 +43,7 @@ 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.2\nTelif Hakkı: 2012\nGed Murphy (gedmurphy@gmail.com) ile.", IDC_STATIC, 48, 7, 130, 30
+    LTEXT "Aygıt Yöneticisi - Sürüm: 0.2\nTelif Hakkı: 2012\nGed Murphy (gedmurphy@reactos.org) 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
--- a/reactos/base/applications/mscutils/devmgmt_new/lang/uk-UA.rc
+++ b/reactos/base/applications/mscutils/devmgmt_new/lang/uk-UA.rc
@ -16,16 +16,19 @@ BEGIN
  END
  POPUP "Дія"
  BEGIN
+    MENUITEM "Scan for hardware changes",    IDC_REFRESH
    MENUITEM "Друк",                    IDC_PRINT, GRAYED
    MENUITEM SEPARATOR
    MENUITEM "Властивості",             IDC_PROP, GRAYED
  END
  POPUP "Вигляд"
  BEGIN
-    MENUITEM "Пристрої за типом",       IDC_DEVBYTYPE, CHECKED
-    MENUITEM "Пристрої за підключенням",   IDC_STATIC, GRAYED
-    MENUITEM "Ресурси за типом",        IDC_STATIC, GRAYED
-    MENUITEM "Ресурси за підключенням", IDC_STATIC, GRAYED
+    MENUITEM "Пристрої за типом",           IDC_DEVBYTYPE
+    MENUITEM "Пристрої за підключенням",    IDC_DEVBYCONN
+    MENUITEM "Ресурси за типом",            IDC_RESBYTYPE, GRAYED
+    MENUITEM "Ресурси за підключенням",     IDC_RESBYCONN, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "Show hidden devices",         IDC_SHOWHIDDEN
  END
  POPUP "Довідка"
  BEGIN
@ -46,7 +49,7 @@ CAPTION "Про програму Диспетчер пристроїв"
 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
+  LTEXT "Диспетчер пристроїв v0.1\nCopyright (C) 2012\nby Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 130, 26
  PUSHBUTTON "Закрити", 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
@ -62,7 +65,6 @@ BEGIN
  IDS_TOOLTIP_PROP      "Властивості"
  IDS_TOOLTIP_REFRESH   "Оновити"
  IDS_TOOLTIP_HELP      "Довідка"
-  IDS_TOOLTIP_EXIT      "Вихід"
 END

 /* Hints */
@ -76,6 +78,11 @@ BEGIN
  IDS_HINT_HELP         " Показати вікно довідки."
  IDS_HINT_ABOUT        " Про Диспетчер пристроїв ReactOS."

+  IDS_HINT_DEV_BY_TYPE  "Displays devices by hardware type"
+  IDS_HINT_DEV_BY_CONN  "Displays devices by connection"
+  IDS_HINT_RES_BY_TYPE  "Diaplays resources by type"
+  IDS_HINT_RES_BY_CONN  "Displays resources by connection type"
+
  IDS_HINT_SYS_RESTORE  " Відновити вихідний розмір вікна."
  IDS_HINT_SYS_MOVE     " Змінити розташування вікна."
  IDS_HINT_SYS_SIZE     " Змінити розмір вікна."
--- a/reactos/base/applications/mscutils/devmgmt_new/lang/zh-CN.rc
+++ b/reactos/base/applications/mscutils/devmgmt_new/lang/zh-CN.rc
@ -12,16 +12,19 @@ BEGIN
  END
  POPUP "动作"
  BEGIN
+    MENUITEM "Scan for hardware changes",    IDC_REFRESH
    MENUITEM "打印",                     IDC_PRINT, GRAYED
    MENUITEM SEPARATOR
    MENUITEM "属性",                     IDC_PROP, GRAYED
  END
  POPUP "查看"
  BEGIN
-    MENUITEM "设备，按类型",              IDC_DEVBYTYPE, CHECKED
-    MENUITEM "设备，按连接",              IDC_STATIC, GRAYED
-    MENUITEM "资源，按类型",              IDC_STATIC, GRAYED
-    MENUITEM "资源，按连接",              IDC_STATIC, GRAYED
+    MENUITEM "设备，按类型",    IDC_DEVBYTYPE
+    MENUITEM "设备，按连接",    IDC_DEVBYCONN
+    MENUITEM "资源，按类型",    IDC_RESBYTYPE, GRAYED
+    MENUITEM "资源，按连接",    IDC_RESBYCONN, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "Show hidden devices",         IDC_SHOWHIDDEN
  END
  POPUP "帮助"
  BEGIN
@ -42,7 +45,7 @@ CAPTION "关于设备管理器"
 FONT 9,"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
+  LTEXT "设备管理器 v0.2\n版权所有 (C) 2012\n作者 Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 130, 30
  PUSHBUTTON "关闭", 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
@ -58,7 +61,6 @@ BEGIN
  IDS_TOOLTIP_PROP      "属性"
  IDS_TOOLTIP_REFRESH   "刷新"
  IDS_TOOLTIP_HELP      "帮助"
-  IDS_TOOLTIP_EXIT      "退出"
 END

 /* Hints */
@ -72,6 +74,11 @@ BEGIN
  IDS_HINT_HELP         " 显示帮助窗口。"
  IDS_HINT_ABOUT        " 关于 ReactOS 设备管理器。"

+  IDS_HINT_DEV_BY_TYPE  "Displays devices by hardware type"
+  IDS_HINT_DEV_BY_CONN  "Displays devices by connection"
+  IDS_HINT_RES_BY_TYPE  "Diaplays resources by type"
+  IDS_HINT_RES_BY_CONN  "Displays resources by connection type"
+
  IDS_HINT_SYS_RESTORE  " 将窗口恢复到默认大小。"
  IDS_HINT_SYS_MOVE     " 移动这个窗口。"
  IDS_HINT_SYS_SIZE     " 更改这个窗口的大小。"
--- a/reactos/base/applications/mscutils/devmgmt_new/precomp.h
+++ b/reactos/base/applications/mscutils/devmgmt_new/precomp.h
@ -0,0 +1,29 @@
+#pragma once
+
+#include <stdio.h>
+#include <tchar.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define COBJMACROS
+
+#include <windows.h>
+#include <windowsx.h>
+
+#include <setupapi.h>
+#include <cfgmgr32.h>
+#include <commctrl.h>
+#include <Uxtheme.h>
+#include <Cfgmgr32.h>
+#include <devguid.h>
+
+#include <atlbase.h>
+
+#include <strsafe.h>
+
+#include "resource.h"
+
+extern HINSTANCE g_hInstance;
+extern HANDLE ProcessHeap;
--- a/reactos/base/applications/mscutils/devmgmt_new/resource.h
+++ b/reactos/base/applications/mscutils/devmgmt_new/resource.h
--- a/reactos/base/applications/mscutils/devmgmt_new/rsrc.rc
+++ b/reactos/base/applications/mscutils/devmgmt_new/rsrc.rc
@ -1,83 +0,0 @@
-#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_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_DE_DE
-    #include "lang/de-DE.rc"
-#endif
-#ifdef LANGUAGE_EL_GR
-    #include "lang/el-GR.rc"
-#endif
-#ifdef LANGUAGE_EN_US
-    #include "lang/en-US.rc"
-#endif
-#ifdef LANGUAGE_ES_ES
-    #include "lang/es-ES.rc"
-#endif
-#ifdef LANGUAGE_FR_FR
-    #include "lang/fr-FR.rc"
-#endif
-#ifdef LANGUAGE_HE_IL
-    #include "lang/he-IL.rc"
-#endif
-#ifdef LANGUAGE_ID_ID
-    #include "lang/id-ID.rc"
-#endif
-#ifdef LANGUAGE_IT_IT
-    #include "lang/it-IT.rc"
-#endif
-#ifdef LANGUAGE_JA_JP
-    #include "lang/ja-JP.rc"
-#endif
-#ifdef LANGUAGE_KO_KR
-    #include "lang/ko-KR.rc"
-#endif
-#ifdef LANGUAGE_NB_NO
-    #include "lang/no-NO.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "lang/pl-PL.rc"
-#endif
-#ifdef LANGUAGE_PT_BR
-    #include "lang/pt-BR.rc"
-#endif
-#ifdef LANGUAGE_RO_RO
-    #include "lang/ro-RO.rc"
-#endif
-#ifdef LANGUAGE_RU_RU
-    #include "lang/ru-RU.rc"
-#endif
-#ifdef LANGUAGE_SK_SK
-    #include "lang/sk-SK.rc"
-#endif
-#ifdef LANGUAGE_SV_SE
-    #include "lang/sv-SE.rc"
-#endif
-#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
-#ifdef LANGUAGE_ZH_CN
-    #include "lang/zh-CN.rc"
-#endif
--- a/reactos/base/applications/mscutils/devmgmt_new/stdafx.cpp
+++ b/reactos/base/applications/mscutils/devmgmt_new/stdafx.cpp
@ -1 +0,0 @@
-#include "stdafx.h"
--- a/reactos/base/applications/mscutils/devmgmt_new/stdafx.h
+++ b/reactos/base/applications/mscutils/devmgmt_new/stdafx.h
@ -1,16 +0,0 @@
-#pragma once
-
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
-#include <windowsx.h>
-#include <setupapi.h>
-#include <cfgmgr32.h>
-#include <commctrl.h>
-#include <Uxtheme.h>
-#include <Cfgmgr32.h>
-#include <devguid.h>
-
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS      // some CString constructors will be explicit
-
-#include <atlbase.h>
-#include <atlstr.h>
--- a/reactos/base/applications/mscutils/devmgmt_new/targetver.h
+++ b/reactos/base/applications/mscutils/devmgmt_new/targetver.h
@ -1,8 +0,0 @@
-#pragma once
-
-// Including SDKDDKVer.h defines the highest available Windows platform.
-
-// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
-// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
-
-#include <SDKDDKVer.h>