[akhaldi] 67985: [DEVMGMT_NEW] Revert r67976 as requested by Ged.

Author: akhaldi
Date: Mon Jun  1 09:25:46 2015
New Revision: 67985

URL: http://svn.reactos.org/svn/reactos?rev=67985&view=rev
Log:
[DEVMGMT_NEW] Revert r67976 as requested by Ged.

Added:
    trunk/reactos/base/applications/mscutils/devmgmt_new/Resource.h
      - copied unchanged from r67975,
trunk/reactos/base/applications/mscutils/devmgmt_new/Resource.h
    trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.exe.manifest
      - copied unchanged from r67975,
trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.exe.manifest
    trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.h
      - copied unchanged from r67975,
trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.h
    trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.sln
      - copied unchanged from r67975,
trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.sln
    trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.vcxproj
      - copied unchanged from r67975,
trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.vcxproj
    trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.vcxproj.filters
      - copied unchanged from r67975,
trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.vcxproj.filters
    trunk/reactos/base/applications/mscutils/devmgmt_new/rsrc.rc
      - copied unchanged from r67975,
trunk/reactos/base/applications/mscutils/devmgmt_new/rsrc.rc
    trunk/reactos/base/applications/mscutils/devmgmt_new/stdafx.cpp
      - copied unchanged from r67975,
trunk/reactos/base/applications/mscutils/devmgmt_new/stdafx.cpp
    trunk/reactos/base/applications/mscutils/devmgmt_new/stdafx.h
      - copied unchanged from r67975,
trunk/reactos/base/applications/mscutils/devmgmt_new/stdafx.h
    trunk/reactos/base/applications/mscutils/devmgmt_new/targetver.h
      - copied unchanged from r67975,
trunk/reactos/base/applications/mscutils/devmgmt_new/targetver.h
Removed:
    trunk/reactos/base/applications/mscutils/devmgmt_new/CMakeLists.txt
    trunk/reactos/base/applications/mscutils/devmgmt_new/resource.h
Modified:
    trunk/reactos/base/applications/mscutils/CMakeLists.txt
    trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp
    trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h
    trunk/reactos/base/applications/mscutils/devmgmt_new/Devices.cpp
    trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp
    trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.h
    trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.cpp
    trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.rc
    trunk/reactos/base/applications/mscutils/devmgmt_new/lang/bg-BG.rc
    trunk/reactos/base/applications/mscutils/devmgmt_new/lang/de-DE.rc
    trunk/reactos/base/applications/mscutils/devmgmt_new/lang/el-GR.rc
    trunk/reactos/base/applications/mscutils/devmgmt_new/lang/en-US.rc
    trunk/reactos/base/applications/mscutils/devmgmt_new/lang/es-ES.rc
    trunk/reactos/base/applications/mscutils/devmgmt_new/lang/fr-FR.rc
    trunk/reactos/base/applications/mscutils/devmgmt_new/lang/he-IL.rc
    trunk/reactos/base/applications/mscutils/devmgmt_new/lang/id-ID.rc
    trunk/reactos/base/applications/mscutils/devmgmt_new/lang/it-IT.rc
    trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ja-JP.rc
    trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ko-KR.rc
    trunk/reactos/base/applications/mscutils/devmgmt_new/lang/no-NO.rc
    trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pl-PL.rc
    trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pt-BR.rc
    trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ro-RO.rc
    trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ru-RU.rc
    trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sk-SK.rc
    trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sq-AL.rc
    trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sv-SE.rc
    trunk/reactos/base/applications/mscutils/devmgmt_new/lang/th-TH.rc
    trunk/reactos/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc
    trunk/reactos/base/applications/mscutils/devmgmt_new/lang/uk-UA.rc
    trunk/reactos/base/applications/mscutils/devmgmt_new/lang/zh-CN.rc

Modified: trunk/reactos/base/applications/mscutils/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mscutils/CMakeLists.txt	[iso-8859-1] Mon Jun  1
09:25:46 2015
@@ -1,5 +1,4 @@
 
 add_subdirectory(devmgmt)
-add_subdirectory(devmgmt_new)
 add_subdirectory(eventvwr)
 add_subdirectory(servman)

Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt_new/CMakeLists.txt	[iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/devmgmt_new/CMakeLists.txt	(removed)
@@ -1,19 +0,0 @@
-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)

Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp	[iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp	[iso-8859-1] Mon
Jun  1 09:25:46 2015
@@ -8,7 +8,8 @@
 */
 
 
-#include "precomp.h"
+#include "stdafx.h"
+#include "devmgmt.h"
 #include "DeviceView.h"
 
 
@@ -18,7 +19,6 @@
 #define CLASS_NAME_LEN      256
 #define CLASS_DESC_LEN      256
 
-extern "C"
 INT_PTR
 WINAPI
 DevicePropertiesExW(
@@ -191,7 +191,12 @@
     HANDLE hThread;
 
     /* Run on a new thread to keep the gui responsive */
-    hThread = CreateThread(NULL, 0, ListDevicesThread, this, 0, NULL);
+    hThread = (HANDLE)_beginthreadex(NULL,
+                                     0,
+                                     &ListDevicesThread,
+                                     this,
+                                     0,
+                                     NULL);
 
     if (hThread) CloseHandle(hThread);
 }
@@ -243,7 +248,7 @@
 
 /* PRIVATE METHODS ********************************************/
 
-DWORD CALLBACK CDeviceView::ListDevicesThread(PVOID Param)
+unsigned int __stdcall CDeviceView::ListDevicesThread(void *Param)
 {
     CDeviceView *This = (CDeviceView *)Param;
 
@@ -372,7 +377,7 @@
                                                       ClassDescription,
                                                       NULL,
                                                       ClassImage,
-                                                      OverlayImage);
+                                                      0);
 
                         /* Don't add it again */
                         AddedParent = TRUE;
@@ -471,6 +476,8 @@
     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;
@@ -510,7 +517,7 @@
                                           DeviceName,
                                           (LPARAM)DeviceId,
                                           ClassImage,
-                                          OverlayImage);
+                                          0);
 
 
             if (hDevItem)
@@ -563,7 +570,7 @@
                                             DeviceName,
                                             (LPARAM)DeviceId,
                                             ClassImage,
-                                            OverlayImage);
+                                            0);
             if (hDevItem)
             {
                 /* Check if this child has any children itself */

Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h	[iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h	[iso-8859-1] Mon Jun
 1 09:25:46 2015
@@ -81,7 +81,9 @@
     }
 
 private:
-    static DWORD CALLBACK ListDevicesThread(PVOID Param);
+    static unsigned int __stdcall ListDevicesThread(
+        void *Param
+        );
 
     BOOL ListDevicesByConnection(
         );

Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/Devices.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt_new/Devices.cpp	[iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/devmgmt_new/Devices.cpp	[iso-8859-1] Mon Jun 
1 09:25:46 2015
@@ -7,7 +7,8 @@
 *
 */
 
-#include "precomp.h"
+#include "stdafx.h"
+#include "devmgmt.h"
 #include "Devices.h"
 
 
@@ -66,7 +67,7 @@
     _Out_ PINT RootImageIndex
     )
 {
-    StringCbCopy(RootName, RootNameSize, m_RootName);
+    wcscpy_s(RootName, RootNameSize, m_RootName);
     *RootImageIndex = m_RootImageIndex;
 
     return TRUE;
@@ -324,7 +325,7 @@
     if (Success != ERROR_SUCCESS)
     {
         /* Use the class name as the description */
-        StringCbCopy(ClassDesc, ClassDescSize, ClassName);
+        wcscpy_s(ClassDesc, ClassDescSize, ClassName);
     }
 
     /* Get the image index for this class */
@@ -484,7 +485,7 @@
     if (bSuccess == FALSE && bUnknown == TRUE)
     {
         /* We add in our own text */
-        StringCbCopy(DeviceName, 256, L"Unknown device");
+        wcscpy_s(DeviceName, 256, L"Unknown device");
         bSuccess = TRUE;
     }
 
@@ -569,7 +570,7 @@
     if (ptr)
     {
         /* This must be an inf based descriptor, the desc is after the semi colon */
-        StringCbCopy(ResourceDescriptor, ResourceDescriptorSize, ++ptr);
+        wcscpy_s(ResourceDescriptor, ResourceDescriptorSize, ++ptr);
         dwError = ERROR_SUCCESS;
     }
     else
@@ -603,7 +604,7 @@
         /* Load the string from the dll */
         if (LoadStringW(hModule, ResourceId, ResString, 256))
         {
-            StringCbCopy(ResourceDescriptor, ResourceDescriptorSize, ResString);
+            wcscpy_s(ResourceDescriptor, ResourceDescriptorSize, ResString);
             dwError = ERROR_SUCCESS;
         }
         else

Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp	[iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp	[iso-8859-1] Mon
Jun  1 09:25:46 2015
@@ -7,7 +7,8 @@
 *
 */
 
-#include "precomp.h"
+#include "stdafx.h"
+#include "devmgmt.h"
 #include "MainWindow.h"
 
 
@@ -47,10 +48,10 @@
 /* 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";
@@ -66,6 +67,7 @@
 CMainWindow::Initialize(LPCTSTR lpCaption,
                         int nCmdShow)
 {
+    CAtlString szCaption;
     WNDCLASSEXW wc = {0};
 
     /* Store the show window value */
@@ -169,6 +171,7 @@
 CMainWindow::UpdateDevicesDisplay(ListDevices List)
 {
     UINT CheckId;
+    BOOL bSuccess;
 
     /* Set the new type*/
     m_DeviceView->SetDeviceListType(List);
@@ -184,7 +187,7 @@
     }
 
     /* Set the new check item */
-    CheckMenuRadioItem(m_hMenu,
+    bSuccess = CheckMenuRadioItem(m_hMenu,
                                   IDC_DEVBYTYPE,
                                   IDC_RESBYCONN,
                                   CheckId,
@@ -327,17 +330,17 @@
                                  IN HINSTANCE hInstance,
                                  IN UINT uID)
 {
-    WCHAR szMessage[4096];
+    CAtlString szMessage;
     BOOL bRet = FALSE;
 
     /* Load the string */
-    if (LoadStringW(hInstance, uID, szMessage, _countof(szMessage)))
+    if (szMessage.LoadStringW(hInstance, uID))
     {
         /* Send the message to the status bar */
         bRet = (BOOL)SendMessageW(hStatusBar,
                                   SB_SETTEXT,
                                   (WPARAM)PartId,
-                                  (LPARAM)szMessage);
+                                  (LPARAM)szMessage.GetBuffer());
     }
 
     return bRet;

Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.h	[iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.h	[iso-8859-1] Mon Jun
 1 09:25:46 2015
@@ -9,7 +9,7 @@
 
 class CMainWindow
 {
-    PCWSTR m_szMainWndClass;
+    CAtlString m_szMainWndClass;
     CDeviceView *m_DeviceView;
     HWND m_hMainWnd;
     HWND m_hStatusBar;

Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.cpp	[iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.cpp	[iso-8859-1] Mon Jun 
1 09:25:46 2015
@@ -1,4 +1,5 @@
-#include "precomp.h"
+#include "stdafx.h"
+#include "devmgmt.h"
 #include "MainWindow.h"
 
 HINSTANCE g_hInstance = NULL;
@@ -13,7 +14,7 @@
     CMainWindow MainWindow;
     INITCOMMONCONTROLSEX icex;
     HANDLE hMutex;
-    WCHAR szAppName[256];
+    CAtlString szAppName;
 
     int Ret = 1;
 
@@ -36,7 +37,7 @@
     InitCommonControlsEx(&icex);
 
     /* Load the application name */
-    if (LoadStringW(g_hInstance, IDS_APPNAME, szAppName, _countof(szAppName)))
+    if (szAppName.LoadStringW(g_hInstance, IDS_APPNAME))
     {
         /* Initialize the main window */
         if (MainWindow.Initialize(szAppName, nCmdShow))

Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
Binary files - no diff available.

Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/bg-BG.rc	[iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/bg-BG.rc	[iso-8859-1] Mon
Jun  1 09:25:46 2015
@@ -8,7 +8,6 @@
   END
   POPUP "Действие"
   BEGIN
-    MENUITEM "Scan for hardware changes",    IDC_REFRESH
     MENUITEM "Отпечатване",                   IDC_PRINT, GRAYED
     MENUITEM SEPARATOR
     MENUITEM "Свойства",              IDC_PROP, GRAYED
@@ -39,7 +38,7 @@
 FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
-  LTEXT "Device Manager v0.2\nCopyright (C) 2012\nby Ged Murphy
(gedmurphy(a)reactos.org)"quot;, IDC_STATIC, 48, 7, 130, 30
+  LTEXT "Device Manager v0.1\nCopyright (C) 2006\nby Ged Murphy
(gedmurphy(a)gmail.com)"quot;, 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
@@ -55,6 +54,7 @@
   IDS_TOOLTIP_PROP      "Свойства"
   IDS_TOOLTIP_REFRESH   "Опресняване"
   IDS_TOOLTIP_HELP      "Помощ"
+  IDS_TOOLTIP_EXIT      "Изход"
 END
 
 /* Hints */
@@ -68,11 +68,6 @@
   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     " Преоразмерява прозореца."

Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/de-DE.rc	[iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/de-DE.rc	[iso-8859-1] Mon
Jun  1 09:25:46 2015
@@ -8,19 +8,16 @@
   END
   POPUP "Aktion"
   BEGIN
-    MENUITEM "Nach Hardwareänderungen suchen", IDC_REFRESH
-    MENUITEM "Drucken",                        IDC_PRINT, GRAYED
+    MENUITEM "Drucken",                   IDC_PRINT, GRAYED
     MENUITEM SEPARATOR
     MENUITEM "Eigenschaften",                  IDC_PROP, GRAYED
   END
   POPUP "Ansicht"
   BEGIN
-    MENUITEM "Geräte nach Typ",                IDC_DEVBYTYPE
-    MENUITEM "Geräte nach Verbindung",         IDC_DEVBYCONN
-    MENUITEM "Ressourcen nach Typ",            IDC_RESBYTYPE, GRAYED
-    MENUITEM "Ressourcen nach Verbindung",     IDC_RESBYCONN, GRAYED
-    MENUITEM SEPARATOR
-    MENUITEM "Ausgeblendete Geräte anzeigen",  IDC_SHOWHIDDEN
+    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
   END
   POPUP "&?"
   BEGIN
@@ -41,7 +38,7 @@
 FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
-  LTEXT "Geräte-Manager v0.2\nCopyright (C) 2012\nby Ged Murphy
(gedmurphy(a)reactos.org)"quot;, IDC_STATIC, 48, 7, 130, 30
+  LTEXT "Geräte-Manager v0.1\nCopyright (C) 2006\nby Ged Murphy
(gedmurphy(a)gmail.com)"quot;, IDC_STATIC, 48, 7, 130, 26
   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
@@ -57,6 +54,7 @@
   IDS_TOOLTIP_PROP      "Eigenschaften"
   IDS_TOOLTIP_REFRESH   "Aktualisieren"
   IDS_TOOLTIP_HELP      "Hilfe"
+  IDS_TOOLTIP_EXIT      "Beenden"
 END
 
 /* Hints */
@@ -70,11 +68,6 @@
   IDS_HINT_HELP         " Hilfe-Fenster anzeigen."
   IDS_HINT_ABOUT        " Über ReactOS Geräte-Manager."
 
-  IDS_HINT_DEV_BY_TYPE  "Geräte nach Typ anzeigen"
-  IDS_HINT_DEV_BY_CONN  "Geräte nach Verbindung anzeigen"
-  IDS_HINT_RES_BY_TYPE  "Resourcen nach Typ anzeigen"
-  IDS_HINT_RES_BY_CONN  "Resourcen nach Verbindung anzeigen"
-
   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."

Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/el-GR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/el-GR.rc	[iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/el-GR.rc	[iso-8859-1] Mon
Jun  1 09:25:46 2015
@@ -8,19 +8,16 @@
   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
-    MENUITEM "Συσκευές ανά σύνδεση", IDC_DEVBYCONN
-    MENUITEM "Πηγές ανά τύπο",       IDC_RESBYTYPE, GRAYED
-    MENUITEM "Πηγές ανά σύνδεση",    IDC_RESBYCONN, GRAYED
-    MENUITEM SEPARATOR
-    MENUITEM "Show hidden devices",         IDC_SHOWHIDDEN
+    MENUITEM "Συσκευές ανά τύπο",    IDC_DEVBYTYPE, CHECKED
+    MENUITEM "Συσκευές ανά σύνδεση", IDC_STATIC, GRAYED
+    MENUITEM "Πηγές ανά τύπο",       IDC_STATIC, GRAYED
+    MENUITEM "Πηγές ανά σύνδεση",    IDC_STATIC, GRAYED
   END
   POPUP "Βοήθεια"
   BEGIN
@@ -41,7 +38,7 @@
 FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
-  LTEXT "Device Manager v0.2\nCopyright (C) 2012\nby Ged Murphy
(gedmurphy(a)reactos.org)"quot;, IDC_STATIC, 48, 7, 130, 30
+  LTEXT "Device Manager v0.1\nCopyright (C) 2006\nby Ged Murphy
(gedmurphy(a)gmail.com)"quot;, 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
@@ -57,6 +54,7 @@
   IDS_TOOLTIP_PROP      "Ιδιότητες"
   IDS_TOOLTIP_REFRESH   "Ανανέωση"
   IDS_TOOLTIP_HELP      "Βοήθεια"
+  IDS_TOOLTIP_EXIT      "Έξοδος"
 END
 
 /* Hints */
@@ -70,11 +68,6 @@
   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     " Αλλάζει το μέγεθος αυτού του παραθύρου."

Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/en-US.rc	[iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/en-US.rc	[iso-8859-1] Mon
Jun  1 09:25:46 2015
@@ -8,7 +8,7 @@
   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

Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/es-ES.rc	[iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/es-ES.rc	[iso-8859-1] Mon
Jun  1 09:25:46 2015
@@ -14,19 +14,16 @@
   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
-    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
+    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
   END
   POPUP "Ayuda"
   BEGIN
@@ -47,7 +44,7 @@
 FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
-  LTEXT "Administrador de dispositivos v0.2\nCopyright (C) 2012\nby Ged Murphy
(gedmurphy(a)reactos.org)"quot;, IDC_STATIC, 48, 7, 130, 30
+  LTEXT "Administrador de dispositivos v0.1\nCopyright (C) 2006\nCreado por Ged
Murphy (gedmurphy(a)gmail.com)"quot;, 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
@@ -63,6 +60,7 @@
   IDS_TOOLTIP_PROP      "Propiedades"
   IDS_TOOLTIP_REFRESH   "Actualizar"
   IDS_TOOLTIP_HELP      "Ayuda"
+  IDS_TOOLTIP_EXIT      "Salir"
 END
 
 /* Hints */
@@ -76,11 +74,6 @@
   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."

Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/fr-FR.rc	[iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/fr-FR.rc	[iso-8859-1] Mon
Jun  1 09:25:46 2015
@@ -8,19 +8,16 @@
   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
-    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
+    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
   END
   POPUP "Aide"
   BEGIN
@@ -41,7 +38,7 @@
 FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
-  LTEXT "Device Manager v0.2\nCopyright (C) 2012\nby Ged Murphy
(gedmurphy(a)reactos.org)"quot;, IDC_STATIC, 48, 7, 130, 30
+  LTEXT "Gestionnaire de Périphériques v0.1\nCopyright (C) 2006\npar Ged Murphy
(gedmurphy(a)gmail.com)"quot;, IDC_STATIC, 48, 7, 130, 26
   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
@@ -57,6 +54,7 @@
   IDS_TOOLTIP_PROP      "Propriétés"
   IDS_TOOLTIP_REFRESH   "Actualiser"
   IDS_TOOLTIP_HELP      "Aide"
+  IDS_TOOLTIP_EXIT      "Quitter"
 END
 
 /* Hints */
@@ -70,11 +68,6 @@
   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."

Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/he-IL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/he-IL.rc	[iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/he-IL.rc	[iso-8859-1] Mon
Jun  1 09:25:46 2015
@@ -8,19 +8,16 @@
   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
-    MENUITEM "×”×ª×§× ×™× לפי חיבור",   IDC_DEVBYCONN
-    MENUITEM "משאבים לפי סוג",     IDC_RESBYTYPE, GRAYED
-    MENUITEM "משאבים לפי חיבור",   IDC_RESBYCONN, GRAYED
-    MENUITEM SEPARATOR
-    MENUITEM "Show hidden devices",         IDC_SHOWHIDDEN
+    MENUITEM "×”×ª×§× ×™× לפי סוג",         IDC_DEVBYTYPE, CHECKED
+    MENUITEM "×”×ª×§× ×™× לפי חיבור",   IDC_STATIC, GRAYED
+    MENUITEM "משאבים לפי סוג",       IDC_STATIC, GRAYED
+    MENUITEM "משאבים לפי חיבור", IDC_STATIC, GRAYED
   END
   POPUP "עזרה"
   BEGIN
@@ -41,7 +38,7 @@
 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) 2012\nby Ged Murphy
(gedmurphy(a)reactos.org)"quot;, IDC_STATIC, 48, 7, 130, 30
+  LTEXT "Device Manager v0.1\nCopyright (C) 2006\nby Ged Murphy
(gedmurphy(a)gmail.com)"quot;, 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
@@ -57,6 +54,7 @@
   IDS_TOOLTIP_PROP      "×ž××¤×™×™× ×™×"
   IDS_TOOLTIP_REFRESH   "×¨×¢× ×Ÿ"
   IDS_TOOLTIP_HELP      "עזרה"
+  IDS_TOOLTIP_EXIT      "יציאה"
 END
 
 /* Hints */
@@ -70,11 +68,6 @@
   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."

Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/id-ID.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/id-ID.rc	[iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/id-ID.rc	[iso-8859-1] Mon
Jun  1 09:25:46 2015
@@ -8,19 +8,16 @@
   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
-    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
+    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
   END
   POPUP "Bantuan"
   BEGIN
@@ -41,7 +38,7 @@
 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) 2012\nby Ged Murphy
(gedmurphy(a)reactos.org)"quot;, IDC_STATIC, 48, 7, 130, 26
+  LTEXT "Manajer Device v0.1\nHak Cipta (C) 2006\nby Ged Murphy
(gedmurphy(a)gmail.com)"quot;, 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
@@ -57,6 +54,7 @@
   IDS_TOOLTIP_PROP      "Properti"
   IDS_TOOLTIP_REFRESH   "Segarkan"
   IDS_TOOLTIP_HELP      "Bantuan"
+  IDS_TOOLTIP_EXIT      "Keluar"
 END
 
 /* Hints */
@@ -70,11 +68,6 @@
   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."

Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/it-IT.rc	[iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/it-IT.rc	[iso-8859-1] Mon
Jun  1 09:25:46 2015
@@ -8,19 +8,16 @@
   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
-    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
+    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
   END
   POPUP "Aiuto"
   BEGIN
@@ -41,7 +38,7 @@
 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) 2012\nby Ged Murphy
(gedmurphy(a)reactos.org)"quot;, IDC_STATIC, 48, 7, 130, 26
+  LTEXT "Gestione dispositivi v0.1\nCopyright (C) 2006\nby Ged Murphy
(gedmurphy(a)gmail.com)"quot;, 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
@@ -57,6 +54,7 @@
   IDS_TOOLTIP_PROP      "Proprietà "
   IDS_TOOLTIP_REFRESH   "Aggiorna"
   IDS_TOOLTIP_HELP      "Aiuto"
+  IDS_TOOLTIP_EXIT      "Esci"
 END
 
 /* Hints */
@@ -70,11 +68,6 @@
   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."

Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ja-JP.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ja-JP.rc	[iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ja-JP.rc	[iso-8859-1] Mon
Jun  1 09:25:46 2015
@@ -8,19 +8,16 @@
   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
-    MENUITEM "デバイス (接続別)",      IDC_DEVBYCONN
-    MENUITEM "リソ\\ース (種類別)",      IDC_RESBYTYPE, GRAYED
-    MENUITEM "リソ\\ース (接続別)",      IDC_RESBYCONN, GRAYED
-    MENUITEM SEPARATOR
-    MENUITEM "Show hidden devices",         IDC_SHOWHIDDEN
+    MENUITEM "デバイス (種類別)",       IDC_DEVBYTYPE, CHECKED
+    MENUITEM "デバイス (接続別)",       IDC_STATIC, GRAYED
+    MENUITEM "リソ\ース (種類別)",      IDC_STATIC, GRAYED
+    MENUITEM "リソ\ース (接続別)",      IDC_STATIC, GRAYED
   END
   POPUP "ヘルプ"
   BEGIN
@@ -41,7 +38,7 @@
 FONT 9, "MS UI Gothic",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
-  LTEXT "デバイス マネージャ v0.1\nCopyright (C) 2012\nby Ged Murphy
(gedmurphy(a)reactos.org)"quot;, IDC_STATIC, 48, 7, 130, 30
+  LTEXT "デバイス マネージャ v0.1\nCopyright (C) 2006\nby Ged Murphy
(gedmurphy(a)gmail.com)"quot;, 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
@@ -57,6 +54,7 @@
   IDS_TOOLTIP_PROP      "プロパティ"
   IDS_TOOLTIP_REFRESH   "更新"
   IDS_TOOLTIP_HELP      "ヘルプ"
+  IDS_TOOLTIP_EXIT      "終了"
 END
 
 /* Hints */
@@ -67,13 +65,8 @@
   IDS_HINT_EXIT         " このプログラムを終了します。"
   IDS_HINT_REFRESH      " サービスのリストを更新します。"
   IDS_HINT_PROP         "
現在選択されているシートのプロパティを開きます。"
-  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_HELP         " ヘルプ ウィンドウを表\示します。"
+  IDS_HINT_ABOUT        " ReactOS デバイス
マネージャについて表\示します。"
 
   IDS_HINT_SYS_RESTORE  " このウィンドウを通常の大きさに復元します。"
   IDS_HINT_SYS_MOVE     " このウィンドウを移動します。"

Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ko-KR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ko-KR.rc	[iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ko-KR.rc	[iso-8859-1] Mon
Jun  1 09:25:46 2015
@@ -11,19 +11,16 @@
   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
-    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
+    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
   END
   POPUP "도움말"
   BEGIN
@@ -44,7 +41,7 @@
 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) 2012\nby Ged Murphy
(gedmurphy(a)reactos.org)"quot;, IDC_STATIC, 48, 7, 130, 30
+  LTEXT "Device Manager v0.1\nCopyright (C) 2006\nby Ged Murphy
(gedmurphy(a)gmail.com)"quot;, 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
@@ -60,6 +57,7 @@
   IDS_TOOLTIP_PROP      "속성"
   IDS_TOOLTIP_REFRESH   "새로 ê³ ì¹¨"
   IDS_TOOLTIP_HELP      "도움말"
+  IDS_TOOLTIP_EXIT      "종료"
 END
 
 /* Hints */
@@ -73,11 +71,6 @@
   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     " 창의 크기를 변경합니다."

Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/no-NO.rc	[iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/no-NO.rc	[iso-8859-1] Mon
Jun  1 09:25:46 2015
@@ -8,19 +8,16 @@
   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
-    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
+    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
   END
   POPUP "Hjelp"
   BEGIN
@@ -41,7 +38,7 @@
 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) 2012\nlaget av Ged Murphy
(gedmurphy(a)reactos.org)"quot;, IDC_STATIC, 48, 7, 130, 30
+  LTEXT "Enhetsbehandler v0.1\nEnerett (C) 2006\nlaget av Ged Murphy
(gedmurphy(a)gmail.com)"quot;, 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
@@ -57,6 +54,7 @@
   IDS_TOOLTIP_PROP      "Egenskaper"
   IDS_TOOLTIP_REFRESH   "Oppdater"
   IDS_TOOLTIP_HELP      "Hjelp"
+  IDS_TOOLTIP_EXIT      "Avslutt"
 END
 
 /* Hints */
@@ -70,11 +68,6 @@
   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."

Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pl-PL.rc	[iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pl-PL.rc	[iso-8859-1] Mon
Jun  1 09:25:46 2015
@@ -15,19 +15,16 @@
   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
-    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
+    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
   END
   POPUP "Pomo&c"
   BEGIN
@@ -48,7 +45,7 @@
 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) 2012\nby Ged Murphy (gedmurphy(a)reactos.org)"quot;, IDC_STATIC,
48, 7, 130, 26
+  LTEXT "Menedżer urządzeń v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)"quot;, 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
@@ -64,6 +61,7 @@
   IDS_TOOLTIP_PROP      "Właściwości"
   IDS_TOOLTIP_REFRESH   "Odśwież"
   IDS_TOOLTIP_HELP      "Pomoc"
+  IDS_TOOLTIP_EXIT      "Wyjście"
 END
 
 /* Hints */
@@ -77,11 +75,6 @@
   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."

Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pt-BR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pt-BR.rc	[iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pt-BR.rc	[iso-8859-1] Mon
Jun  1 09:25:46 2015
@@ -10,19 +10,16 @@
   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
-    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
+    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
   END
   POPUP "Ajuda"
   BEGIN
@@ -43,7 +40,7 @@
 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) 2012\nby Ged Murphy
(gedmurphy(a)reactos.org)"quot;, IDC_STATIC, 48, 7, 130, 30
+  LTEXT "Gerenciador de Dispositivos v0.1\nCopyright (C) 2006\nby Ged Murphy
(gedmurphy(a)gmail.com)"quot;, 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
@@ -59,6 +56,7 @@
   IDS_TOOLTIP_PROP      "Propriedades"
   IDS_TOOLTIP_REFRESH   "Atualizar"
   IDS_TOOLTIP_HELP      "Ajuda"
+  IDS_TOOLTIP_EXIT      "Sair"
 END
 
 /* Hints */
@@ -72,11 +70,6 @@
   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."

Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ro-RO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ro-RO.rc	[iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ro-RO.rc	[iso-8859-1] Mon
Jun  1 09:25:46 2015
@@ -9,19 +9,16 @@
   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
-    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
+    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
   END
   POPUP "Aj&utor"
   BEGIN
@@ -42,7 +39,7 @@
 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) 2012\nde Ged Murphy
(gedmurphy(a)reactos.org)\nTraducere de Petru Dimitriu", IDC_STATIC, 48, 7, 130, 35
+  LTEXT       "Gestionar de Dispozitive v0.1\nDrept de autor (C) 2006\nde Ged Murphy
(gedmurphy(a)gmail.com)\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
@@ -58,6 +55,7 @@
   IDS_TOOLTIP_PROP      "Proprietăți"
   IDS_TOOLTIP_REFRESH   "Împrospătare"
   IDS_TOOLTIP_HELP      "Manual de utilizare"
+  IDS_TOOLTIP_EXIT      "Ieșire"
 END
 
 /* Hints */
@@ -71,11 +69,6 @@
   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."

Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ru-RU.rc	[iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ru-RU.rc	[iso-8859-1] Mon
Jun  1 09:25:46 2015
@@ -10,19 +10,16 @@
   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
-    MENUITEM "Устройства по подключению",   
IDC_DEVBYCONN
-    MENUITEM "Ресурсы по типу",              IDC_RESBYTYPE,
GRAYED
-    MENUITEM "Ресурсы по подключению",       IDC_RESBYCONN,
GRAYED
-    MENUITEM SEPARATOR
-    MENUITEM "Show hidden devices",         IDC_SHOWHIDDEN
+    MENUITEM "Устройства по типу",         IDC_DEVBYTYPE,
CHECKED
+    MENUITEM "Устройства по подключению",   IDC_STATIC,
GRAYED
+    MENUITEM "Ресурсы по типу",       IDC_STATIC, GRAYED
+    MENUITEM "Ресурсы по подключению", IDC_STATIC, GRAYED
   END
   POPUP "Справка"
   BEGIN
@@ -43,7 +40,7 @@
 FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
-  LTEXT "Диспетчер устройств v0.1\nCopyright (C) 2012\nот Ged
Murphy (gedmurphy(a)reactos.org)"quot;, IDC_STATIC, 48, 7, 130, 30
+  LTEXT "Диспетчер устройств v0.1\nCopyright (C) 2006\nот Ged
Murphy (gedmurphy(a)gmail.com)"quot;, 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
@@ -59,6 +56,7 @@
   IDS_TOOLTIP_PROP      "Свойства"
   IDS_TOOLTIP_REFRESH   "Обновить"
   IDS_TOOLTIP_HELP      "Помощь"
+  IDS_TOOLTIP_EXIT      "Выход"
 END
 
 /* Hints */
@@ -72,11 +70,6 @@
   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     " Изменить размер этого окна."

Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sk-SK.rc	[iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sk-SK.rc	[iso-8859-1] Mon
Jun  1 09:25:46 2015
@@ -13,19 +13,16 @@
   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
-    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
+    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
   END
   POPUP "Pomocník"
   BEGIN
@@ -46,7 +43,7 @@
 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) 2012\nod Ged Murphy
(gedmurphy(a)reactos.org)"quot;, IDC_STATIC, 48, 7, 130, 30
+  LTEXT "Správca zariadení v0.1\nCopyright (C) 2006\nod Ged Murphy
(gedmurphy(a)gmail.com)"quot;, 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
@@ -62,6 +59,7 @@
   IDS_TOOLTIP_PROP      "Vlastnosti"
   IDS_TOOLTIP_REFRESH   "Obnoviť"
   IDS_TOOLTIP_HELP      "Pomocník"
+  IDS_TOOLTIP_EXIT      "Skončiť"
 END
 
 /* Hints */
@@ -75,11 +73,6 @@
   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."

Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sq-AL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sq-AL.rc	[iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sq-AL.rc	[iso-8859-1] Mon
Jun  1 09:25:46 2015
@@ -12,19 +12,16 @@
   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
-    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
+    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
   END
   POPUP "Ndihmë"
   BEGIN
@@ -45,7 +42,7 @@
 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) 2012\nby Ged Murphy
(gedmurphy(a)reactos.org)"quot;, IDC_STATIC, 48, 7, 130, 30
+  LTEXT "Menaxhues pajisjesh v0.1\nCopyright (C) 2006\nby Ged Murphy
(gedmurphy(a)gmail.com)"quot;, 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
@@ -61,6 +58,7 @@
   IDS_TOOLTIP_PROP      "Tipar"
   IDS_TOOLTIP_REFRESH   "Rifresko"
   IDS_TOOLTIP_HELP      "Ndihmë"
+  IDS_TOOLTIP_EXIT      "Dil"
 END
 
 /* Hints */
@@ -74,11 +72,6 @@
   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."

Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sv-SE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sv-SE.rc	[iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sv-SE.rc	[iso-8859-1] Mon
Jun  1 09:25:46 2015
@@ -14,19 +14,16 @@
   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
-    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
+    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
   END
   POPUP "Hjälp"
   BEGIN
@@ -47,7 +44,7 @@
 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) 2012\nby Ged Murphy
(gedmurphy(a)reactos.org)"quot;, IDC_STATIC, 48, 7, 130, 30
+  LTEXT "Enhetshanteraren v0.1\nCopyright (C) 2006\nby Ged Murphy
(gedmurphy(a)gmail.com)"quot;, 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
@@ -63,6 +60,7 @@
   IDS_TOOLTIP_PROP      "Egenskaper"
   IDS_TOOLTIP_REFRESH   "Uppdater"
   IDS_TOOLTIP_HELP      "Hjälp"
+  IDS_TOOLTIP_EXIT      "Avsluta"
 END
 
 /* Hints */
@@ -76,11 +74,6 @@
   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."

Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/th-TH.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/th-TH.rc	[iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/th-TH.rc	[iso-8859-1] Mon
Jun  1 09:25:46 2015
@@ -17,19 +17,16 @@
   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
-    MENUITEM
"อุปกรณ์แบ่งตามการเชื่อมต่อ",
   IDC_DEVBYCONN
-    MENUITEM "แหล่งข้อมูลตามประเภท",   
  IDC_RESBYTYPE, GRAYED 
-    MENUITEM
"แหล่งข้อมูลตามการเชื่อมต่อ",
   IDC_RESBYCONN, GRAYED 
-    MENUITEM SEPARATOR
-    MENUITEM "Show hidden devices",         IDC_SHOWHIDDEN
+    MENUITEM "อุปกรณ์แบ่งตามประเภท",   
     IDC_DEVBYTYPE, CHECKED
+    MENUITEM
"อุปกรณ์แบ่งตามการเชื่อมต่อ",
  IDC_STATIC, GRAYED
+    MENUITEM "แหล่งข้อมูลตามประเภท",   
     IDC_STATIC, GRAYED
+    MENUITEM
"แหล่งข้อมูลตามการเชื่อมต่อ",
  IDC_STATIC, GRAYED
   END
   POPUP "ช่วยเหลือ"
   BEGIN
@@ -50,7 +47,7 @@
 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) 2012\nby Ged Murphy
(gedmurphy(a)reactos.org)"quot;, IDC_STATIC, 48, 7, 130, 26
+  LTEXT "Device Manager v0.1\nCopyright (C) 2006\nby Ged Murphy
(gedmurphy(a)gmail.com)"quot;, 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
@@ -66,6 +63,7 @@
   IDS_TOOLTIP_PROP      "คุณสมบัติ"
   IDS_TOOLTIP_REFRESH   "ฟื้นฟู"
   IDS_TOOLTIP_HELP      "ช่วยเหลือ"
+  IDS_TOOLTIP_EXIT      "ออกจากโปรแกรม"
 END
 
 /* Hints */
@@ -79,11 +77,6 @@
   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     "
เปลี่ยนขนาดหน้าต่างนี้"

Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc	[iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc	[iso-8859-1] Mon
Jun  1 09:25:46 2015
@@ -10,17 +10,17 @@
     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
-        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 "&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 SEPARATOR
         MENUITEM "&Gizli Aygıtları Göster",            IDC_SHOWHIDDEN
     END
@@ -43,7 +43,7 @@
 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(a)reactos.org) ile.", IDC_STATIC, 48, 7, 130, 30
+    LTEXT "Aygıt Yöneticisi - Sürüm: 0.2\nTelif Hakkı: 2012\nGed Murphy
(gedmurphy(a)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

Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/uk-UA.rc	[iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/uk-UA.rc	[iso-8859-1] Mon
Jun  1 09:25:46 2015
@@ -16,19 +16,16 @@
   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
-    MENUITEM "Пристрої за підключенням",   
IDC_DEVBYCONN
-    MENUITEM "Ресурси за типом",            IDC_RESBYTYPE,
GRAYED
-    MENUITEM "Ресурси за підключенням",     IDC_RESBYCONN,
GRAYED
-    MENUITEM SEPARATOR
-    MENUITEM "Show hidden devices",         IDC_SHOWHIDDEN
+    MENUITEM "Пристрої за типом",       IDC_DEVBYTYPE, CHECKED
+    MENUITEM "Пристрої за підключенням",   IDC_STATIC,
GRAYED
+    MENUITEM "Ресурси за типом",        IDC_STATIC, GRAYED
+    MENUITEM "Ресурси за підключенням", IDC_STATIC,
GRAYED
   END
   POPUP "Довідка"
   BEGIN
@@ -49,7 +46,7 @@
 FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
-  LTEXT "Диспетчер пристроїв v0.1\nCopyright (C) 2012\nby Ged
Murphy (gedmurphy(a)reactos.org)"quot;, IDC_STATIC, 48, 7, 130, 26
+  LTEXT "Диспетчер пристроїв v0.1\nCopyright (C) 2006\nby Ged
Murphy (gedmurphy(a)gmail.com)"quot;, 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
@@ -65,6 +62,7 @@
   IDS_TOOLTIP_PROP      "Властивості"
   IDS_TOOLTIP_REFRESH   "Оновити"
   IDS_TOOLTIP_HELP      "Довідка"
+  IDS_TOOLTIP_EXIT      "Вихід"
 END
 
 /* Hints */
@@ -78,11 +76,6 @@
   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     " Змінити розмір вікна."

Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/zh-CN.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/zh-CN.rc	[iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/zh-CN.rc	[iso-8859-1] Mon
Jun  1 09:25:46 2015
@@ -12,19 +12,16 @@
   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
-    MENUITEM "设备，按连接",    IDC_DEVBYCONN
-    MENUITEM "资源，按类型",    IDC_RESBYTYPE, GRAYED
-    MENUITEM "资源，按连接",    IDC_RESBYCONN, GRAYED
-    MENUITEM SEPARATOR
-    MENUITEM "Show hidden devices",         IDC_SHOWHIDDEN
+    MENUITEM "设备，按类型",              IDC_DEVBYTYPE, CHECKED
+    MENUITEM "设备，按连接",              IDC_STATIC, GRAYED
+    MENUITEM "资源，按类型",              IDC_STATIC, GRAYED
+    MENUITEM "资源，按连接",              IDC_STATIC, GRAYED
   END
   POPUP "帮助"
   BEGIN
@@ -45,7 +42,7 @@
 FONT 9,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
-  LTEXT "设备管理器 v0.2\n版权所有 (C) 2012\n作者 Ged Murphy (gedmurphy(a)reactos.org)"quot;, IDC_STATIC, 48, 7, 130, 30
+  LTEXT "设备管理器 v0.1\版权所有 (C) 2006\n作者 Ged Murphy (gedmurphy(a)gmail.com)"quot;, 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
@@ -61,6 +58,7 @@
   IDS_TOOLTIP_PROP      "属性"
   IDS_TOOLTIP_REFRESH   "刷新"
   IDS_TOOLTIP_HELP      "帮助"
+  IDS_TOOLTIP_EXIT      "退出"
 END
 
 /* Hints */
@@ -74,11 +72,6 @@
   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     " 更改这个窗口的大小。"

Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt_new/resource.h	[iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/devmgmt_new/resource.h	(removed)
@@ -1,68 +0,0 @@
-#define IDC_STATIC          -1
-
-#define IDI_MAIN_ICON       50
-#define IDB_ROOT_IMAGE      51
-
-/* windows */
-#define IDC_TREEVIEW        1000
-#define IDC_TOOLBAR         1001
-#define IDC_STATUSBAR       1002
-
-/* commands */
-#define IDC_PROP             2000
-#define IDC_REFRESH          2001
-#define IDC_PRINT            2002
-#define IDC_EXIT             2003
-#define IDC_ABOUT            4031
-
-/* menus */
-#define IDR_MAINMENU        102
-#define IDR_POPUP           103
-#define IDC_DEVBYTYPE       104
-#define IDC_DEVBYCONN       105
-#define IDC_RESBYTYPE       106
-#define IDC_RESBYCONN       107
-#define IDC_SHOWHIDDEN      108
-
-/* tooltips */
-#define IDS_TOOLTIP_PROP    6000
-#define IDS_TOOLTIP_REFRESH 6001
-#define IDS_TOOLTIP_HELP    6002
-
-/* button bitmaps */
-#define IDB_PROP            10000
-#define IDB_REFRESH         10001
-
-/* toolbar buttons */
-#define TBICON_PROP         0
-#define TBICON_REFRESH      1
-#define TBICON_HELP         2
-
-/* about box info */
-#define IDD_ABOUTBOX        200
-#define IDC_LICENSE_EDIT    201
-#define IDS_APPNAME         202
-#define IDS_LICENSE         203
-
-
-/* menu hints */
-#define IDS_HINT_BLANK          20000
-#define IDS_HINT_REFRESH        20002
-#define IDS_HINT_PROP           20003
-#define IDS_HINT_HELP           20004
-#define IDS_HINT_ABOUT          20005
-#define IDS_HINT_EXIT           20006
-
-#define IDS_HINT_DEV_BY_TYPE    20020
-#define IDS_HINT_DEV_BY_CONN    20021
-#define IDS_HINT_RES_BY_TYPE    20022
-#define IDS_HINT_RES_BY_CONN    20023
-
-/* system menu hints */
-#define IDS_HINT_SYS_RESTORE    21001
-#define IDS_HINT_SYS_MOVE       21002
-#define IDS_HINT_SYS_SIZE       21003
-#define IDS_HINT_SYS_MINIMIZE   21004
-#define IDS_HINT_SYS_MAXIMIZE   21005
-#define IDS_HINT_SYS_CLOSE      21006
-