https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4b479d19e6f7ba4bb9baad5121807097a96e8c18

commit 4b479d19e6f7ba4bb9baad5121807097a96e8c18
Author:     Kyle Katarn <[email protected]>
AuthorDate: Thu May 14 14:30:35 2020 +0200
Commit:     GitHub <[email protected]>
CommitDate: Thu May 14 14:30:35 2020 +0200

    [SERVMAN] Use the ShellAboutW API routine to display the about dialog 
(#2752)
---
 base/applications/mscutils/servman/CMakeLists.txt |  1 -
 base/applications/mscutils/servman/about.c        | 54 -----------------------
 base/applications/mscutils/servman/lang/bg-BG.rc  | 13 +-----
 base/applications/mscutils/servman/lang/cs-CZ.rc  | 13 +-----
 base/applications/mscutils/servman/lang/de-DE.rc  | 13 +-----
 base/applications/mscutils/servman/lang/el-GR.rc  | 13 +-----
 base/applications/mscutils/servman/lang/en-US.rc  | 13 +-----
 base/applications/mscutils/servman/lang/es-ES.rc  | 13 +-----
 base/applications/mscutils/servman/lang/fr-FR.rc  | 13 +-----
 base/applications/mscutils/servman/lang/he-IL.rc  | 13 +-----
 base/applications/mscutils/servman/lang/id-ID.rc  | 13 +-----
 base/applications/mscutils/servman/lang/it-IT.rc  | 13 +-----
 base/applications/mscutils/servman/lang/ja-JP.rc  | 13 +-----
 base/applications/mscutils/servman/lang/ko-KR.rc  | 13 +-----
 base/applications/mscutils/servman/lang/no-NO.rc  | 13 +-----
 base/applications/mscutils/servman/lang/pl-PL.rc  | 13 +-----
 base/applications/mscutils/servman/lang/ro-RO.rc  | 13 +-----
 base/applications/mscutils/servman/lang/ru-RU.rc  | 13 +-----
 base/applications/mscutils/servman/lang/sk-SK.rc  | 13 +-----
 base/applications/mscutils/servman/lang/sq-AL.rc  | 13 +-----
 base/applications/mscutils/servman/lang/sv-SE.rc  | 13 +-----
 base/applications/mscutils/servman/lang/th-TH.rc  | 13 +-----
 base/applications/mscutils/servman/lang/tr-TR.rc  | 13 +-----
 base/applications/mscutils/servman/lang/uk-UA.rc  | 13 +-----
 base/applications/mscutils/servman/lang/zh-CN.rc  | 13 +-----
 base/applications/mscutils/servman/lang/zh-TW.rc  | 13 +-----
 base/applications/mscutils/servman/mainwnd.c      | 19 +++++---
 base/applications/mscutils/servman/resource.h     |  6 +--
 28 files changed, 38 insertions(+), 354 deletions(-)

diff --git a/base/applications/mscutils/servman/CMakeLists.txt 
b/base/applications/mscutils/servman/CMakeLists.txt
index 1f96e0677df..24fbe8b4fa0 100644
--- a/base/applications/mscutils/servman/CMakeLists.txt
+++ b/base/applications/mscutils/servman/CMakeLists.txt
@@ -1,6 +1,5 @@
 
 list(APPEND SOURCE
-    about.c
     control.c
     create.c
     delete.c
diff --git a/base/applications/mscutils/servman/about.c 
b/base/applications/mscutils/servman/about.c
deleted file mode 100644
index 2f23db343f3..00000000000
--- a/base/applications/mscutils/servman/about.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * PROJECT:     ReactOS Services
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/mscutils/servman/about.c
- * PURPOSE:     About dialog box message handler
- * COPYRIGHT:   Copyright 2005-2007 Ged Murphy <[email protected]>
- *
- */
-
-#include "precomp.h"
-
-INT_PTR CALLBACK
-AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
-{
-    switch (message)
-    {
-    case WM_INITDIALOG:
-    {
-        HWND hLicenseEditWnd;
-
-        hLicenseEditWnd = GetDlgItem(hDlg,
-                                     IDC_LICENSE_EDIT);
-        if (hLicenseEditWnd)
-        {
-            LPWSTR lpString;
-
-            if (AllocAndLoadString(&lpString,
-                                   hInstance,
-                                   IDS_LICENSE))
-            {
-                SetWindowTextW(hLicenseEditWnd,
-                               lpString);
-
-                LocalFree(lpString);
-            }
-        }
-
-        return TRUE;
-    }
-
-    case WM_COMMAND:
-
-        if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL))
-        {
-            EndDialog(hDlg,
-                      LOWORD(wParam));
-            return TRUE;
-        }
-
-        break;
-    }
-
-    return FALSE;
-}
diff --git a/base/applications/mscutils/servman/lang/bg-BG.rc 
b/base/applications/mscutils/servman/lang/bg-BG.rc
index c19437e1089..daa9d7fc6de 100644
--- a/base/applications/mscutils/servman/lang/bg-BG.rc
+++ b/base/applications/mscutils/servman/lang/bg-BG.rc
@@ -68,17 +68,6 @@ BEGIN
     VK_F5, ID_REFRESH, VIRTKEY
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
-CAPTION "За управителя на устройствата"
-FONT 8, "MS Shell Dlg", 0, 0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-    LTEXT "Service Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy 
([email protected])", IDC_STATIC, 48, 7, 135, 40
-    PUSHBUTTON "Close", IDOK, 75, 162, 44, 15
-    ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
-    EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | 
WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
 IDD_DLG_GENERAL DIALOGEX 6, 6, 300, 225
 CAPTION "Общи"
 FONT 8, "MS Shell Dlg", 0, 0
@@ -262,7 +251,6 @@ BEGIN
     IDS_NUM_SERVICES "Брой услуги: %d"
     IDS_STOP_DEPENDS "При спирането на %s, ще спрат и следните услуги"
     IDS_NO_DEPENDS "<Без зависимости>"
-    IDS_LICENSE "This program is free software; you can redistribute it and/or 
modify it under the terms of the GNU General Public License as published by the 
Free Software Foundation; either version 2 of the License, or (at your option) 
any later version.\r\n\r\nThis program is distributed in the hope that it will 
be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of 
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General 
Public License for more det [...]
 END
 
 STRINGTABLE
@@ -331,6 +319,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPNAME "Управление на услугите на РеактОС"
+    IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy 
([email protected])"
 END
 
 STRINGTABLE
diff --git a/base/applications/mscutils/servman/lang/cs-CZ.rc 
b/base/applications/mscutils/servman/lang/cs-CZ.rc
index 8632cf698f0..d91887f80c7 100644
--- a/base/applications/mscutils/servman/lang/cs-CZ.rc
+++ b/base/applications/mscutils/servman/lang/cs-CZ.rc
@@ -68,17 +68,6 @@ BEGIN
     VK_F5, ID_REFRESH, VIRTKEY
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
-CAPTION "O správci služeb"
-FONT 8, "MS Shell Dlg", 0, 0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-    LTEXT "Správce služeb v0.8\nCopyright (C) 2005-2007\nGed Murphy 
([email protected])", IDC_STATIC, 48, 7, 135, 40
-    PUSHBUTTON "Zavřít", IDOK, 75, 162, 44, 15
-    ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
-    EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | 
WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
 IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232
 CAPTION "Obecné"
 FONT 8, "MS Shell Dlg", 0, 0
@@ -262,7 +251,6 @@ BEGIN
     IDS_NUM_SERVICES "Počet služeb: %d"
     IDS_STOP_DEPENDS "Zastavením %s dojde také k zastavení"
     IDS_NO_DEPENDS "<Žádné závislosti>"
-    IDS_LICENSE "This program is free software; you can redistribute it and/or 
modify it under the terms of the GNU General Public License as published by the 
Free Software Foundation; either version 2 of the License, or (at your option) 
any later version.\r\n\r\nThis program is distributed in the hope that it will 
be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of 
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General 
Public License for more det [...]
 END
 
 STRINGTABLE
@@ -331,6 +319,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPNAME "ReactOS Správce služeb"
+    IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy 
([email protected])"
 END
 
 STRINGTABLE
diff --git a/base/applications/mscutils/servman/lang/de-DE.rc 
b/base/applications/mscutils/servman/lang/de-DE.rc
index bb941ebd70f..e68d930600c 100644
--- a/base/applications/mscutils/servman/lang/de-DE.rc
+++ b/base/applications/mscutils/servman/lang/de-DE.rc
@@ -68,17 +68,6 @@ BEGIN
     VK_F5, ID_REFRESH, VIRTKEY
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
-CAPTION "Info über Dienst-Manager"
-FONT 8, "MS Shell Dlg", 0, 0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-    LTEXT "Dienst-Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy 
([email protected])", IDC_STATIC, 48, 7, 135, 40
-    PUSHBUTTON "Schließen", IDOK, 75, 162, 44, 15
-    ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
-    EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | 
WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
 IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232
 CAPTION "Allgemein"
 FONT 8, "MS Shell Dlg", 0, 0
@@ -262,7 +251,6 @@ BEGIN
     IDS_NUM_SERVICES "Anzahl der Dienste: %d"
     IDS_STOP_DEPENDS "Wenn %s beendet wird, werden diese Dienste ebenfalls 
beendet"
     IDS_NO_DEPENDS "<Keine Abhängigkeiten>"
-    IDS_LICENSE "Dieses Programm ist Freie Software: Sie können es unter den 
Bedingungen der GNU General Public License, wie von der Free Software 
Foundation, Version 2.1 der Lizenz oder (nach Ihrer Wahl) jeder neueren 
veröffentlichten Version, weiterverbreiten und/oder modifizieren.\r\n\r\nDieses 
Programm wird in der Hoffnung, dass es nützlich sein wird, aber OHNE JEDE 
GEWÄHRLEISTUNG, bereitgestellt; sogar ohne die implizite Gewährleistung der 
MARKTFÄHIGKEIT oder EIGNUNG FÜR EINEN BESTI [...]
 END
 
 STRINGTABLE
@@ -331,6 +319,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPNAME "ReactOS Dienst-Manager"
+    IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy 
([email protected])"
 END
 
 STRINGTABLE
diff --git a/base/applications/mscutils/servman/lang/el-GR.rc 
b/base/applications/mscutils/servman/lang/el-GR.rc
index 4eb8a250bec..c45e164f657 100644
--- a/base/applications/mscutils/servman/lang/el-GR.rc
+++ b/base/applications/mscutils/servman/lang/el-GR.rc
@@ -68,17 +68,6 @@ BEGIN
     VK_F5, ID_REFRESH, VIRTKEY
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
-CAPTION "Σχετικά με το Διαχειριστή Υπηρεσιών"
-FONT 8, "MS Shell Dlg", 0, 0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-    LTEXT "Διαχειριστής Υπηρεσιών v0.8\nCopyright (C) 2005-2007\nby Ged Murphy 
([email protected])", IDC_STATIC, 48, 7, 135, 40
-    PUSHBUTTON "Κλείσιμο", IDOK, 75, 162, 44, 15
-    ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
-    EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | 
WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
 IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232
 CAPTION "Γενικά"
 FONT 8, "MS Shell Dlg", 0, 0
@@ -262,7 +251,6 @@ BEGIN
     IDS_NUM_SERVICES "Num Services: %d"
     IDS_STOP_DEPENDS "When %s stops, these other services will also stop"
     IDS_NO_DEPENDS "<No Dependencies>"
-    IDS_LICENSE "This program is free software; you can redistribute it and/or 
modify it under the terms of the GNU General Public License as published by the 
Free Software Foundation; either version 2 of the License, or (at your option) 
any later version.\r\n\r\nThis program is distributed in the hope that it will 
be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of 
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General 
Public License for more det [...]
 END
 
 STRINGTABLE
@@ -331,6 +319,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPNAME "Διαχειριστής Υπηρεσιών του ReactOS"
+    IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy 
([email protected])"
 END
 
 STRINGTABLE
diff --git a/base/applications/mscutils/servman/lang/en-US.rc 
b/base/applications/mscutils/servman/lang/en-US.rc
index 272a73eb9f5..a2c75480908 100644
--- a/base/applications/mscutils/servman/lang/en-US.rc
+++ b/base/applications/mscutils/servman/lang/en-US.rc
@@ -68,17 +68,6 @@ BEGIN
     VK_F5, ID_REFRESH, VIRTKEY
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
-CAPTION "About Service Manager"
-FONT 8, "MS Shell Dlg", 0, 0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-    LTEXT "Service Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy 
([email protected])", IDC_STATIC, 48, 7, 135, 40
-    PUSHBUTTON "&Close", IDOK, 75, 162, 44, 15
-    ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
-    EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | 
WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
 IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0
@@ -262,7 +251,6 @@ BEGIN
     IDS_NUM_SERVICES "Num Services: %d"
     IDS_STOP_DEPENDS "When %s stops, these other services will also stop"
     IDS_NO_DEPENDS "<No Dependencies>"
-    IDS_LICENSE "This program is free software; you can redistribute it and/or 
modify it under the terms of the GNU General Public License as published by the 
Free Software Foundation; either version 2 of the License, or (at your option) 
any later version.\r\n\r\nThis program is distributed in the hope that it will 
be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of 
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General 
Public License for more det [...]
 END
 
 STRINGTABLE
@@ -331,6 +319,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPNAME "ReactOS Service Manager"
+    IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy 
([email protected])"
 END
 
 STRINGTABLE
diff --git a/base/applications/mscutils/servman/lang/es-ES.rc 
b/base/applications/mscutils/servman/lang/es-ES.rc
index 1bf14df0b79..891be8a07b0 100644
--- a/base/applications/mscutils/servman/lang/es-ES.rc
+++ b/base/applications/mscutils/servman/lang/es-ES.rc
@@ -71,17 +71,6 @@ BEGIN
     VK_F5, ID_REFRESH, VIRTKEY
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
-CAPTION "Acerca del Administrador de servicios"
-FONT 8, "MS Shell Dlg", 0, 0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-    LTEXT "Administrador de servicios v0.8\nCopyright (C) 2005-2007\ncreado 
por Ged Murphy ([email protected])", IDC_STATIC, 48, 7, 135, 40
-    PUSHBUTTON "Cerrar", IDOK, 75, 162, 44, 15
-    ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
-    EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | 
WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
 IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0
@@ -265,7 +254,6 @@ BEGIN
     IDS_NUM_SERVICES "Número de servicios: %d"
     IDS_STOP_DEPENDS "Cuando %s se detenga, estos otros servicios también se 
detendrán"
     IDS_NO_DEPENDS "<Sin dependencias>"
-    IDS_LICENSE "Este programa es software libre; puedes redistribuirlo y/o 
modificarlo bajo los términos de la GNU General Public License tal y como 
fueron publicados por la Free Software Foundation; ya sea la versión 2 de la 
Licencia, o (bajo tu discreción) cualquier versión posterior.\r\n\r\nEste 
programa se distribuye con el fin de ser útil, pero viene SIN NINGUNA GARANTÍA; 
sin tan siquiera la garantía implícita de COMERCIALIZACIÓN o la de IDONEIDAD 
PARA UN PROPÓSITO CONCRETO. Para m [...]
 END
 
 STRINGTABLE
@@ -334,6 +322,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPNAME "Administrador de servicios de ReactOS"
+    IDS_APPAUTHORS "Copyright (C) 2005-2007 creado por Ged Murphy 
([email protected])"
 END
 
 STRINGTABLE
diff --git a/base/applications/mscutils/servman/lang/fr-FR.rc 
b/base/applications/mscutils/servman/lang/fr-FR.rc
index 38cd92cfad9..91240f99ab6 100644
--- a/base/applications/mscutils/servman/lang/fr-FR.rc
+++ b/base/applications/mscutils/servman/lang/fr-FR.rc
@@ -68,17 +68,6 @@ BEGIN
     VK_F5, ID_REFRESH, VIRTKEY
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
-CAPTION "À Propos du gestionnaire de services"
-FONT 8, "MS Shell Dlg", 0, 0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-    LTEXT "Gestionnaire de services v0.8\nCopyright (C) 2005-2007\nby Ged 
Murphy ([email protected])", IDC_STATIC, 48, 7, 135, 40
-    PUSHBUTTON "Fermer", IDOK, 75, 162, 44, 15
-    ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
-    EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | 
WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
 IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232
 CAPTION "Général"
 FONT 8, "MS Shell Dlg", 0, 0
@@ -262,7 +251,6 @@ BEGIN
     IDS_NUM_SERVICES "Services : %d"
     IDS_STOP_DEPENDS "Quand %s s'arrêtera, les services suivants s'arrêteront 
également :"
     IDS_NO_DEPENDS "<Pas de dépendances>"
-    IDS_LICENSE "Ce programme est un logiciel libre ; vous pouvez le 
redistribuer et/ou le modifier tout en respectant les termes de la ""GNU 
General Public License"" publiée par la Free Software Foundation; dans sa 
version 2  (ou selon votre préférence) toute version ultérieure.\r\n\r\nCe 
programme est distribué dans l'espoir qu'il sera utile, cependant SANS GARANTIE 
D'AUCUNE SORTE; sans même une garantie implicite de COMMERCIABILITÉ ou DE 
CONFORMITÉ A UNE UTILISATION PARTICULIÈRE. \r\n [...]
 END
 
 STRINGTABLE
@@ -331,6 +319,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPNAME "Gestionnaire de Services ReactOS"
+    IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy 
([email protected])"
 END
 
 STRINGTABLE
diff --git a/base/applications/mscutils/servman/lang/he-IL.rc 
b/base/applications/mscutils/servman/lang/he-IL.rc
index af1c191532b..c20be705069 100644
--- a/base/applications/mscutils/servman/lang/he-IL.rc
+++ b/base/applications/mscutils/servman/lang/he-IL.rc
@@ -68,17 +68,6 @@ BEGIN
     VK_F5, ID_REFRESH, VIRTKEY
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
-CAPTION "אודות מנהל השירותים"
-FONT 8, "MS Shell Dlg", 0, 0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-    LTEXT "Service Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy 
([email protected])", IDC_STATIC, 48, 7, 135, 40
-    PUSHBUTTON "סגור", IDOK, 75, 162, 44, 15
-    ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
-    EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | 
WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
 IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232
 CAPTION "כללי"
 FONT 8, "MS Shell Dlg", 0, 0
@@ -262,7 +251,6 @@ BEGIN
     IDS_NUM_SERVICES "מספר השירותים: %d"
     IDS_STOP_DEPENDS "מתי ש %s יעצור, השירותים הללו גם יעצרו."
     IDS_NO_DEPENDS "<אין יחסי תלות>"
-    IDS_LICENSE "This program is free software; you can redistribute it and/or 
modify it under the terms of the GNU General Public License as published by the 
Free Software Foundation; either version 2 of the License, or (at your option) 
any later version.\r\n\r\nThis program is distributed in the hope that it will 
be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of 
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General 
Public License for more det [...]
 END
 
 STRINGTABLE
@@ -331,6 +319,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPNAME "מנהל השירותים של ReactOS"
+    IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy 
([email protected])"
 END
 
 STRINGTABLE
diff --git a/base/applications/mscutils/servman/lang/id-ID.rc 
b/base/applications/mscutils/servman/lang/id-ID.rc
index 22e9b39807f..53455e72512 100644
--- a/base/applications/mscutils/servman/lang/id-ID.rc
+++ b/base/applications/mscutils/servman/lang/id-ID.rc
@@ -68,17 +68,6 @@ BEGIN
     VK_F5, ID_REFRESH, VIRTKEY
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
-CAPTION "Tentang Manajer Layanan"
-FONT 8, "MS Shell Dlg", 0, 0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-    LTEXT "Manajer Layanan v0.8\nHak Cipta (C) 2005-2007\noleh Ged Murphy 
([email protected])", IDC_STATIC, 48, 7, 135, 40
-    PUSHBUTTON "Tutup", IDOK, 75, 162, 44, 15
-    ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
-    EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | 
WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
 IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232
 CAPTION "Umum"
 FONT 8, "MS Shell Dlg", 0, 0
@@ -262,7 +251,6 @@ BEGIN
     IDS_NUM_SERVICES "Jumlah Layanan: %d"
     IDS_STOP_DEPENDS "Ketika %s berhenti, layanan lain terkait juga akan 
berhenti"
     IDS_NO_DEPENDS "<No Dependencies>"
-    IDS_LICENSE "Program ini adalah software bebas; anda dapat 
mendistribusikan dan/atau mengubahnya di bawah term GNU General Public License 
seperti dipublikasikan oleh Free Software Foundation; baik Lisensi versi 2, 
atau (menurut opini anda) setiap versi berikutnya.\r\n\r\nProgram ini 
didistribusikan dengan harapan ia akan berguna, tetapi TANPA JAMINAN APAPUN; 
bahkan tanpa jaminan berarti dari MERCANTABILITAS atau KECUKUPAN UNTUK 
KEPERLUAN TERTENTU.  Lihat GNU General Public License un [...]
 END
 
 STRINGTABLE
@@ -331,6 +319,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPNAME "ReactOS Service Manager"
+    IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy 
([email protected])"
 END
 
 STRINGTABLE
diff --git a/base/applications/mscutils/servman/lang/it-IT.rc 
b/base/applications/mscutils/servman/lang/it-IT.rc
index 8e6b295f31f..a3a611e32df 100644
--- a/base/applications/mscutils/servman/lang/it-IT.rc
+++ b/base/applications/mscutils/servman/lang/it-IT.rc
@@ -68,17 +68,6 @@ BEGIN
     VK_F5, ID_REFRESH, VIRTKEY
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
-CAPTION "Informazioni su Gestione Servizi"
-FONT 8, "MS Shell Dlg", 0, 0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-    LTEXT "Gestione Servizi v0.8\nCopyright (C) 2005-2007\nby Ged Murphy 
([email protected])", IDC_STATIC, 48, 7, 135, 40
-    PUSHBUTTON "Chiudi", IDOK, 75, 162, 44, 15
-    ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
-    EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | 
WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
 IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232
 CAPTION "Generale"
 FONT 8, "MS Shell Dlg", 0, 0
@@ -262,7 +251,6 @@ BEGIN
     IDS_NUM_SERVICES "Numero Servizi: %d"
     IDS_STOP_DEPENDS "Quando %s si ferma, Questi altri sevizi si fermeranno"
     IDS_NO_DEPENDS "<Nessuna dipendenza>"
-    IDS_LICENSE "Questo programma è software libero; puoi distribuirlo e/o 
modificarlo nei termini di licenza di 'GNU General Public License' come 
pubblicata dalla 'Free Software Foundation'; entrambe le versioni 2 della 
Licenza, o (a vostra scelta) qualunque versione successiva.\r\n\r\nQuesto 
programma è distribuito con l'augurio che sia utile, ma PRIVO DI OGNI GARANZIA; 
privo anche della garanzia implicita di COMMERCIABILITÀ o UTILIZZABILITÀ PER 
UNO SPECIFICO USO. Vedi la 'GNU General  [...]
 END
 
 STRINGTABLE
@@ -331,6 +319,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPNAME "Gestione dei servizi di ReactOS"
+    IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy 
([email protected])"
 END
 
 STRINGTABLE
diff --git a/base/applications/mscutils/servman/lang/ja-JP.rc 
b/base/applications/mscutils/servman/lang/ja-JP.rc
index e21d46bdaab..03e57c14208 100644
--- a/base/applications/mscutils/servman/lang/ja-JP.rc
+++ b/base/applications/mscutils/servman/lang/ja-JP.rc
@@ -68,17 +68,6 @@ BEGIN
     VK_F5, ID_REFRESH, VIRTKEY
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
-CAPTION "サービス マネージャについて"
-FONT 9, "MS UI Gothic", 0, 0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-    LTEXT "サービス マネージャ v0.8\nCopyright (C) 2005-2007\nby Ged Murphy 
([email protected])", IDC_STATIC, 48, 7, 135, 40
-    PUSHBUTTON "閉じる", IDOK, 75, 162, 44, 15
-    ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
-    EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | 
WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
 IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232
 CAPTION "全般"
 FONT 9, "MS UI Gothic", 0, 0
@@ -262,7 +251,6 @@ BEGIN
     IDS_NUM_SERVICES "サービスの数: %d"
     IDS_STOP_DEPENDS "%s を停止する場合、これらのサービスも停止します"
     IDS_NO_DEPENDS "<依存関係なし>"
-    IDS_LICENSE "This program is free software; you can redistribute it and/or 
modify it under the terms of the GNU General Public License as published by the 
Free Software Foundation; either version 2 of the License, or (at your option) 
any later version.\r\n\r\nThis program is distributed in the hope that it will 
be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of 
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General 
Public License for more det [...]
 END
 
 STRINGTABLE
@@ -331,6 +319,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPNAME "ReactOS サービス マネージャ"
+    IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy 
([email protected])"
 END
 
 STRINGTABLE
diff --git a/base/applications/mscutils/servman/lang/ko-KR.rc 
b/base/applications/mscutils/servman/lang/ko-KR.rc
index 84036c6fe01..ec78f2ca640 100644
--- a/base/applications/mscutils/servman/lang/ko-KR.rc
+++ b/base/applications/mscutils/servman/lang/ko-KR.rc
@@ -70,17 +70,6 @@ BEGIN
     VK_F5, ID_REFRESH, VIRTKEY
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
-CAPTION "서비스 매니저에 대하여"
-FONT 9, "굴림", 0, 0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-    LTEXT "Service Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy 
([email protected])", IDC_STATIC, 48, 7, 135, 40
-    PUSHBUTTON "닫기", IDOK, 75, 162, 44, 15
-    ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
-    EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | 
WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
 IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232
 CAPTION "General"
 FONT 9, "굴림", 0, 0
@@ -264,7 +253,6 @@ BEGIN
     IDS_NUM_SERVICES "모든 서비스: %d"
     IDS_STOP_DEPENDS "When %s stops, these other services will also stop"
     IDS_NO_DEPENDS "<No Dependencies>"
-    IDS_LICENSE "This program is free software; you can redistribute it and/or 
modify it under the terms of the GNU General Public License as published by the 
Free Software Foundation; either version 2 of the License, or (at your option) 
any later version.\r\n\r\nThis program is distributed in the hope that it will 
be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of 
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General 
Public License for more det [...]
 END
 
 STRINGTABLE
@@ -333,6 +321,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPNAME "ReactOS 서비스 관리자"
+    IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy 
([email protected])"
 END
 
 STRINGTABLE
diff --git a/base/applications/mscutils/servman/lang/no-NO.rc 
b/base/applications/mscutils/servman/lang/no-NO.rc
index 851e88b05b1..3ccd4005f05 100644
--- a/base/applications/mscutils/servman/lang/no-NO.rc
+++ b/base/applications/mscutils/servman/lang/no-NO.rc
@@ -68,17 +68,6 @@ BEGIN
     VK_F5, ID_REFRESH, VIRTKEY
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
-CAPTION "Om Tjenestebehandler"
-FONT 8, "MS Shell Dlg", 0, 0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-    LTEXT "Tjenestebehandler v0.8\nCopyright (C) 2005-2007\nby Ged Murphy 
([email protected])", IDC_STATIC, 48, 7, 135, 40
-    PUSHBUTTON "Lukk", IDOK, 75, 162, 44, 15
-    ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
-    EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | 
WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
 IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232
 CAPTION "Generielt"
 FONT 8, "MS Shell Dlg", 0, 0
@@ -262,7 +251,6 @@ BEGIN
     IDS_NUM_SERVICES "Num tjeneste: %d"
     IDS_STOP_DEPENDS "When %s stops, these other services will also stop"
     IDS_NO_DEPENDS "<No Dependencies>"
-    IDS_LICENSE "Dette programmet er gratis programvare; du kan distribuere 
det og/eller endre det under betingelsene av GNU General Public License som er 
utgitt av Free Software Foundation;  version 2 av lisensen, eller (etter din 
mening) alle senere versjoner.\r\n\r\nDette programmet er utgitt i håp for at 
det skal kunne brukes, men DET ER INGEN GARANTIER; uten heller forutsatt 
garantier av SALGBARHET eller SIKKETHET FOR EN ENKELTHET FORMÅL.  Se på GNU 
General Public Lisensen for mere  [...]
 END
 
 STRINGTABLE
@@ -331,6 +319,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPNAME "ReactOS Tjenestebehandler"
+    IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy 
([email protected])"
 END
 
 STRINGTABLE
diff --git a/base/applications/mscutils/servman/lang/pl-PL.rc 
b/base/applications/mscutils/servman/lang/pl-PL.rc
index b96cce7d94a..eb33eecb4aa 100644
--- a/base/applications/mscutils/servman/lang/pl-PL.rc
+++ b/base/applications/mscutils/servman/lang/pl-PL.rc
@@ -78,17 +78,6 @@ BEGIN
     VK_F5, ID_REFRESH, VIRTKEY
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
-CAPTION "Menedżer usług - informacje"
-FONT 8, "MS Shell Dlg", 0, 0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-    LTEXT "Menedżer usług v0.8\nCopyright (C) 2005-2007\nby Ged Murphy 
([email protected])", IDC_STATIC, 48, 7, 135, 40
-    PUSHBUTTON "Zamknij", IDOK, 75, 162, 44, 15
-    ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
-    EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | 
WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
 IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 225
 CAPTION "Ogólny"
 FONT 8, "MS Shell Dlg", 0, 0
@@ -272,7 +261,6 @@ BEGIN
     IDS_NUM_SERVICES "Numer usługi: %d"
     IDS_STOP_DEPENDS "Kiedy %s się zatrzyma, inne usługi od niej zależne 
również się zatrzymają"
     IDS_NO_DEPENDS "<Brak zależności>"
-    IDS_LICENSE "Niniejszy program jest wolnym oprogramowaniem; możesz go 
rozprowadzać dalej i/lub modyfikować na warunkach Powszechnej Licencji 
Publicznej GNU, wydanej przez Fundację Wolnego Oprogramowania - według wersji 2 
tej Licencji lub (według twojego wyboru) którejś z późniejszych 
wersji.\r\n\r\nNiniejszy program rozpowszechniany jest z nadzieją, iż będzie on 
użyteczny - jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji 
PRZYDATNOŚCI HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚ [...]
 END
 
 STRINGTABLE
@@ -341,6 +329,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPNAME "Menedżer usług ReactOS"
+    IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy 
([email protected])"
 END
 
 STRINGTABLE
diff --git a/base/applications/mscutils/servman/lang/ro-RO.rc 
b/base/applications/mscutils/servman/lang/ro-RO.rc
index 6740bedbb66..0e90694b289 100644
--- a/base/applications/mscutils/servman/lang/ro-RO.rc
+++ b/base/applications/mscutils/servman/lang/ro-RO.rc
@@ -73,17 +73,6 @@ BEGIN
     VK_F5, ID_REFRESH, VIRTKEY
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
-CAPTION "Despre Gestionar de servicii"
-FONT 8, "MS Shell Dlg", 0, 0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-    LTEXT "Gestionar de servicii v0.8\nDrept de autor (C) 2005-2007\nde Ged 
Murphy ([email protected])\nTraducere de Petru Dimitriu", IDC_STATIC, 48, 
7, 135, 40
-    PUSHBUTTON "Î&nchide", IDOK, 75, 162, 44, 15
-    ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
-    EDITTEXT IDC_LICENSE_EDIT, 8, 54, 174, 97, WS_VISIBLE | WS_VSCROLL | 
WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
 IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232
 CAPTION "Generale"
 FONT 8, "MS Shell Dlg", 0, 0
@@ -267,7 +256,6 @@ BEGIN
     IDS_NUM_SERVICES "Nr. servicii: %d"
     IDS_STOP_DEPENDS "Dacă %s se oprește aceste procese se vor opri de 
asemenea."
     IDS_NO_DEPENDS "<Fără dependențe>"
-    IDS_LICENSE "Această aplicație este publică; fiind permisă modificarea 
și/sau (re)distribuția sa în termenii Licenței Publice Generale GNU publicată 
de Free Software Foundation; sau versiunea 2 a Licenței, sau (la alegere) a 
oricărei versiuni ulterioare.\r\n\r\nAceastă aplicație este distribuită doar în 
speranța de a fi utilă, FĂRĂ însă NICI O GARANȚIE; nici măcar cu garanția 
implicită a VANDABILITĂȚII sau a UTILITĂȚII ÎNTR-UN SCOP ANUME. Pentru mai 
multe detalii consultați Licența P [...]
 END
 
 STRINGTABLE
@@ -336,6 +324,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPNAME "Gestionar de servicii"
+    IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy 
([email protected])"
 END
 
 STRINGTABLE
diff --git a/base/applications/mscutils/servman/lang/ru-RU.rc 
b/base/applications/mscutils/servman/lang/ru-RU.rc
index 8f504b4d404..588e7866433 100644
--- a/base/applications/mscutils/servman/lang/ru-RU.rc
+++ b/base/applications/mscutils/servman/lang/ru-RU.rc
@@ -68,17 +68,6 @@ BEGIN
     VK_F5, ID_REFRESH, VIRTKEY
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
-CAPTION "О Диспетчере служб"
-FONT 8, "MS Shell Dlg", 0, 0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-    LTEXT "Диспетчер служб v0.8\nАвторское право (C) 2005-2007\nГед Мерфи 
([email protected])", IDC_STATIC, 48, 7, 135, 32
-    PUSHBUTTON "&Закрыть", IDOK, 75, 162, 44, 15
-    ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
-    EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | 
WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
 IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232
 CAPTION "Общие"
 FONT 8, "MS Shell Dlg", 0, 0
@@ -262,7 +251,6 @@ BEGIN
     IDS_NUM_SERVICES "Всего служб: %d"
     IDS_STOP_DEPENDS "После остановки %s, следующие службы тоже будут 
остановлены"
     IDS_NO_DEPENDS "<Нет зависимостей>"
-    IDS_LICENSE "Эта программа является свободным программным обеспечением; Вы 
можете распространять и/или изменять ее в соответствии с лицензией GNU General 
Public License версии 2 или более поздней, опубликованной Free Software 
Foundation.\r\n\r\nЭта программа распространяется с надеждой, что она может 
быть полезна, но БЕЗ ВСЯКОЙ ГАРАНТИИ; не подразумевается даже РАБОТОСПОСОБНОСТЬ 
или ПРИГОДНОСТЬ ДЛЯ ВЫПОЛНЕНИЯ НЕОБХОДИМЫХ ЗАДАЧ. См. GNU General Public 
License для получения дополнитель [...]
 END
 
 STRINGTABLE
@@ -331,6 +319,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPNAME "Диспетчер служб ReactOS"
+    IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy 
([email protected])"
 END
 
 STRINGTABLE
diff --git a/base/applications/mscutils/servman/lang/sk-SK.rc 
b/base/applications/mscutils/servman/lang/sk-SK.rc
index f5c88129fcf..c65f787b65a 100644
--- a/base/applications/mscutils/servman/lang/sk-SK.rc
+++ b/base/applications/mscutils/servman/lang/sk-SK.rc
@@ -73,17 +73,6 @@ BEGIN
     VK_F5, ID_REFRESH, VIRTKEY
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
-CAPTION "Čo je Manažér služieb"
-FONT 8, "MS Shell Dlg", 0, 0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-    LTEXT "Manažér služieb v0.8\nAutorské práva (C) 2005-2007\nod Ged Murphy 
([email protected])", IDC_STATIC, 48, 7, 135, 40
-    PUSHBUTTON "Zavrieť", IDOK, 75, 162, 44, 15
-    ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
-    EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | 
WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
 IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232
 CAPTION "Všeobecné"
 FONT 8, "MS Shell Dlg", 0, 0
@@ -267,7 +256,6 @@ BEGIN
     IDS_NUM_SERVICES "Počet služieb: %d"
     IDS_STOP_DEPENDS "When %s stops, these other services will also stop"
     IDS_NO_DEPENDS "<Žiadne závislosti>"
-    IDS_LICENSE "This program is free software; you can redistribute it and/or 
modify it under the terms of the GNU General Public License as published by the 
Free Software Foundation; either version 2 of the License, or (at your option) 
any later version.\r\n\r\nThis program is distributed in the hope that it will 
be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of 
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General 
Public License for more det [...]
 END
 
 STRINGTABLE
@@ -336,6 +324,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPNAME "Manažér služieb systému ReactOS"
+    IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy 
([email protected])"
 END
 
 STRINGTABLE
diff --git a/base/applications/mscutils/servman/lang/sq-AL.rc 
b/base/applications/mscutils/servman/lang/sq-AL.rc
index 4f9c936ed2e..6273d510ac8 100644
--- a/base/applications/mscutils/servman/lang/sq-AL.rc
+++ b/base/applications/mscutils/servman/lang/sq-AL.rc
@@ -73,17 +73,6 @@ BEGIN
     VK_F5, ID_REFRESH, VIRTKEY
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
-CAPTION "Rreth Menaxherit të Shërbimeve"
-FONT 8, "MS Shell Dlg", 0, 0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-    LTEXT "Menaxher Shërbimesh v0.8\nCopyright (C) 2005-2007\nnga Ged Murphy 
([email protected])", IDC_STATIC, 48, 7, 135, 40
-    PUSHBUTTON "Mbyll", IDOK, 75, 162, 44, 15
-    ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
-    EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | 
WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
 IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232
 CAPTION "Përgjithshëm"
 FONT 8, "MS Shell Dlg", 0, 0
@@ -267,7 +256,6 @@ BEGIN
     IDS_NUM_SERVICES "Num Shërbimit: %d"
     IDS_STOP_DEPENDS "Kur %s ndalon, keto shërbime te tjera do të ndalojnë 
gjithashtu"
     IDS_NO_DEPENDS "<Ska varës>"
-    IDS_LICENSE "Ky program është software falas; ju mund ta shpërndani dhe / 
ose modifikoni sipas kushteve të GNU General Public License të publikuar nga 
Fondacioni Free Software; sipas versionit 2 të Liçencës, ose (sipas opinionit 
tuaj) çdo versioni të mëvonshëm.\r\n\r\nKy program shpërndahet me shpresën që 
do t'ju jetë i dobishëm, por PA ASNJË GARANCI; madje edhe pa garancinë preçize 
të SHITJES apo PËRDORIMIT PËR NJË QËLLIM TË CAKTUAR. Shiko Liçencën Publike të 
Përgjithshme GNU për më [...]
 END
 
 STRINGTABLE
@@ -336,6 +324,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPNAME "Menaxhues i shërbimeve të ReactOS"
+    IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy 
([email protected])"
 END
 
 STRINGTABLE
diff --git a/base/applications/mscutils/servman/lang/sv-SE.rc 
b/base/applications/mscutils/servman/lang/sv-SE.rc
index 2cb32144080..a553372ec22 100644
--- a/base/applications/mscutils/servman/lang/sv-SE.rc
+++ b/base/applications/mscutils/servman/lang/sv-SE.rc
@@ -75,17 +75,6 @@ BEGIN
     VK_F5, ID_REFRESH, VIRTKEY
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
-CAPTION "Om Tjänster"
-FONT 8, "MS Shell Dlg", 0, 0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-    LTEXT "Tjänster v0.8\nCopyright (C) 2005-2007\nby Ged Murphy 
([email protected])", IDC_STATIC, 48, 7, 135, 40
-    PUSHBUTTON "Stäng", IDOK, 75, 162, 44, 15
-    ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
-    EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | 
WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
 IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232
 CAPTION "Allmännt"
 FONT 8, "MS Shell Dlg", 0, 0
@@ -269,7 +258,6 @@ BEGIN
     IDS_NUM_SERVICES "Num tjänster: %d"
     IDS_STOP_DEPENDS "När %s stoppas, kommer också dessa tjänster att stanna"
     IDS_NO_DEPENDS "<No Dependencies>"
-    IDS_LICENSE "Detta programmet är fri programvara; du kan distribuera det 
och/eller ändra det under villkoren enligt GNU General Public License som är 
utgivet av Free Software Foundation;  version 2, eller (om du så önskar) alla 
senare versioner.\r\n\r\nDette programmet er utgivet i hopp om att det skall 
kunne användas, men DET FINNS INGA GARANTIER; även utan underförstådd garanti 
om SÄLJBARHET eller LÄMPLIGHET FÖR ETT VISST ÄNDAMÅL.  Se på GNU General Public 
Licensen för mer detaljer [...]
 END
 
 STRINGTABLE
@@ -338,6 +326,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPNAME "ReactOS tjänster"
+    IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy 
([email protected])"
 END
 
 STRINGTABLE
diff --git a/base/applications/mscutils/servman/lang/th-TH.rc 
b/base/applications/mscutils/servman/lang/th-TH.rc
index 23706f70e6a..19fe4578963 100644
--- a/base/applications/mscutils/servman/lang/th-TH.rc
+++ b/base/applications/mscutils/servman/lang/th-TH.rc
@@ -76,17 +76,6 @@ BEGIN
     VK_F5, ID_REFRESH, VIRTKEY
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
-CAPTION "เกี่ยวกับการบริการจัดการ"
-FONT 8, "MS Shell Dlg", 0, 0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-    LTEXT "โปรแกรมการบริการจัดการ รุ่น 0.8\nลิขสิทธิ์ (C) 2005-2007\nโดย เก้ด 
เมอร์ฟี่ ([email protected])", IDC_STATIC, 48, 7, 135, 40
-    PUSHBUTTON "ปิด", IDOK, 75, 162, 44, 15
-    ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
-    EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | 
WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
 IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232
 CAPTION "ทั่วไป"
 FONT 8, "MS Shell Dlg", 0, 0
@@ -270,7 +259,6 @@ BEGIN
     IDS_NUM_SERVICES "Num Services: %d"
     IDS_STOP_DEPENDS "When %s stops, these other services will also stop"
     IDS_NO_DEPENDS "<No Dependencies>"
-    IDS_LICENSE "This program is free software; you can redistribute it and/or 
modify it under the terms of the GNU General Public License as published by the 
Free Software Foundation; either version 2 of the License, or (at your option) 
any later version.\r\n\r\nThis program is distributed in the hope that it will 
be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of 
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General 
Public License for more det [...]
 END
 
 STRINGTABLE
@@ -339,6 +327,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPNAME "ReactOS Service Manager"
+    IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy 
([email protected])"
 END
 
 STRINGTABLE
diff --git a/base/applications/mscutils/servman/lang/tr-TR.rc 
b/base/applications/mscutils/servman/lang/tr-TR.rc
index fad8766630b..3c4d5b2dcfa 100644
--- a/base/applications/mscutils/servman/lang/tr-TR.rc
+++ b/base/applications/mscutils/servman/lang/tr-TR.rc
@@ -70,17 +70,6 @@ BEGIN
     VK_F5, ID_REFRESH, VIRTKEY
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
-CAPTION "Himet Yöneticisi Üzerine"
-FONT 8, "MS Shell Dlg", 0, 0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-    LTEXT "Hizmet Yöneticisi - Sürüm: 0.8\nTelif Hakkı: 2005-2007\nGed Murphy 
([email protected]) ile.", IDC_STATIC, 48, 7, 135, 40
-    PUSHBUTTON "Tamam", IDOK, 75, 162, 44, 15
-    ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
-    EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | 
WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
 IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232
 CAPTION "Umûmî"
 FONT 8, "MS Shell Dlg", 0, 0
@@ -264,7 +253,6 @@ BEGIN
     IDS_NUM_SERVICES "Hizmet Sayısı: %d"
     IDS_STOP_DEPENDS "%s durduğunda bu hizmetler de duracaktır:"
     IDS_NO_DEPENDS "<Bağımlılık Yok>"
-    IDS_LICENSE "ÖNEMLİ: Aşağıdaki metin, özgün metnin resmî olmayan 
çevirisidir. Çeviri metniyle özgün metin arasında ayrım olabilir. Özgün metin, 
çeviri metninin altındadır.\r\n\r\n***\r\n\r\nBu izlence özgür yazılımdır; 
bunu, Özgür Yazılım Vakfı'nın yayımladığı GNU Umûmî Kamu Ruhsatı'nın, 2. 
sürümünün ya da daha sonraki bir sürümünün (Orası size bağlı.) şartları altında 
yeniden dağıtabilir veyâ değiştirebilirsiniz.\r\n\r\nBu izlence, kullanışlı 
olabileceği beklentisiyle dağıtılmıştır  [...]
 END
 
 STRINGTABLE
@@ -333,6 +321,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPNAME "Hizmet Yöneticisi"
+    IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy 
([email protected])"
 END
 
 STRINGTABLE
diff --git a/base/applications/mscutils/servman/lang/uk-UA.rc 
b/base/applications/mscutils/servman/lang/uk-UA.rc
index a4fe3d509f7..48626e4f20b 100644
--- a/base/applications/mscutils/servman/lang/uk-UA.rc
+++ b/base/applications/mscutils/servman/lang/uk-UA.rc
@@ -76,17 +76,6 @@ BEGIN
     VK_F5, ID_REFRESH, VIRTKEY
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
-CAPTION "Про програму ""Диспетчер керування службами"""
-FONT 8, "MS Shell Dlg", 0, 0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-    LTEXT "Диспетчер керування службами v0.8\nCopyright (C) 2005-2007\nby Ged 
Murphy ([email protected])", IDC_STATIC, 48, 7, 135, 40
-    PUSHBUTTON "Закрити", IDOK, 75, 162, 44, 15
-    ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
-    EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | 
WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
 IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232
 CAPTION "Загальні"
 FONT 8, "MS Shell Dlg", 0, 0
@@ -270,7 +259,6 @@ BEGIN
     IDS_NUM_SERVICES "Hомер служби: %d"
     IDS_STOP_DEPENDS "Коли %s зупинеться, наступні служби також буде зупинено"
     IDS_NO_DEPENDS "<No Dependencies>"
-    IDS_LICENSE "Це вільне програмне забезпечення; Ви можете розповсюджувати 
її та змінювати, дотримуючись умови Відкритої ліцензійної угоди GNU, 
опублікованої Фондом вільного програмного забезпечення; або редакції 2 Угоди, 
або будь-якої редакції, випущеної пізніше.\r\n\r\nЦя програма розповсюджується 
в надії на те, що вона виявиться корисною, але БЕЗ БУДЬ-ЯКИХ ГАРАНТІЙ, 
включаючи УЯВНОЮ ГАРАНТІЄЮ ЯКОСТІ або ПРИДАТНОСТІ для певних цілей. Подробиці 
містяться у Відкритій ліцензійній угоді  [...]
 END
 
 STRINGTABLE
@@ -339,6 +327,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPNAME "Диспетчер керування службами ReactOS"
+    IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy 
([email protected])"
 END
 
 STRINGTABLE
diff --git a/base/applications/mscutils/servman/lang/zh-CN.rc 
b/base/applications/mscutils/servman/lang/zh-CN.rc
index df562a2a091..c910aea0ae5 100644
--- a/base/applications/mscutils/servman/lang/zh-CN.rc
+++ b/base/applications/mscutils/servman/lang/zh-CN.rc
@@ -70,17 +70,6 @@ BEGIN
     VK_F5, ID_REFRESH, VIRTKEY
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
-CAPTION "关于服务管理器"
-FONT 9, "宋体", 0, 0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-    LTEXT "服务管理器 v0.8\n版权所有 (C) 2005-2007\n作者 Ged Murphy 
([email protected])", IDC_STATIC, 48, 7, 135, 40
-    PUSHBUTTON "关闭(&C)", IDOK, 75, 162, 44, 15
-    ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
-    EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | 
WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
 IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232
 CAPTION "常规"
 FONT 9, "宋体", 0, 0
@@ -264,7 +253,6 @@ BEGIN
     IDS_NUM_SERVICES "服务总数: %d"
     IDS_STOP_DEPENDS "当 %s 停止时,这些服务也将被停止"
     IDS_NO_DEPENDS "<无依赖>"
-    IDS_LICENSE "这个程序是自由软件;你可以在自由软件基金会(FSF)的 GNU LGPL 协议下重新发布或修改它;也适用于这个协议的版本 
2,或(在您看来)任何更新的版本。\r\n\r\n这个程序在希望其有用的愿望中发布,但没有任何保证;也不意味着性能保证或对某特定用途的适用性。请查看 GNU 
GPL 许可协议以了解更多细节。\r\n\r\n您应该已经收到了一份和这个程序一起的 GNU GPL 
协议的副本;如果没有,请写信给自由软件基金会(FSF):51 Franklin Street, Fifth Floor, Boston, MA 
02110-1301 USA."
 END
 
 STRINGTABLE
@@ -333,6 +321,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPNAME "ReactOS 服务管理器"
+    IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy 
([email protected])"
 END
 
 STRINGTABLE
diff --git a/base/applications/mscutils/servman/lang/zh-TW.rc 
b/base/applications/mscutils/servman/lang/zh-TW.rc
index 27ca6c40bd5..abf56cc0e21 100644
--- a/base/applications/mscutils/servman/lang/zh-TW.rc
+++ b/base/applications/mscutils/servman/lang/zh-TW.rc
@@ -70,17 +70,6 @@ BEGIN
     VK_F5, ID_REFRESH, VIRTKEY
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
-CAPTION "關於服務管理員"
-FONT 9, "新細明體", 0, 0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-    LTEXT "服務管理員 v0.8\n版權所有 (C) 2005-2007\n作者 Ged Murphy 
([email protected])", IDC_STATIC, 48, 7, 135, 40
-    PUSHBUTTON "關閉", IDOK, 75, 162, 44, 15
-    ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
-    EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | 
WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
 IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232
 CAPTION "普通"
 FONT 9, "新細明體", 0, 0
@@ -264,7 +253,6 @@ BEGIN
     IDS_NUM_SERVICES "服務總數: %d"
     IDS_STOP_DEPENDS "當 %s 停止時,這些服務也將被停止"
     IDS_NO_DEPENDS "<沒有依賴>"
-    IDS_LICENSE "這個程式是自由軟體;你可以在自由軟體基金會(FSF)的 GNU LGPL 協定下重新發佈或修改它;也適用于這個協定的版本 
2,或(在您看來)任何更新的版本。\r\n\r\n這個程式在希望其有用的願望中發佈,但沒有任何保證;也不意味著性能保證或對某特定用途的適用性。請查看 GNU 
GPL 授權合約以瞭解更多細節。\r\n\r\n您應該已經收到了一份和這個程式一起的 GNU GPL 
協定的副本;如果沒有,請寫信給自由軟體基金會(FSF):51 Franklin Street, Fifth Floor, Boston, MA 
02110-1301 USA."
 END
 
 STRINGTABLE
@@ -333,6 +321,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPNAME "ReactOS 服務管理員"
+    IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy 
([email protected])"
 END
 
 STRINGTABLE
diff --git a/base/applications/mscutils/servman/mainwnd.c 
b/base/applications/mscutils/servman/mainwnd.c
index 9358bd4c14f..02d4ff55232 100644
--- a/base/applications/mscutils/servman/mainwnd.c
+++ b/base/applications/mscutils/servman/mainwnd.c
@@ -10,6 +10,7 @@
 #include "precomp.h"
 
 #include <windowsx.h>
+#include <shellapi.h>
 
 static const WCHAR szMainWndClass[] = L"ServManWndClass";
 
@@ -23,7 +24,7 @@ static const TBBUTTON Buttons [] =
     /* Note: First item for a separator is its width in pixels */
     {15, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0},                             
     /* separator */
 
-    {TBICON_CREATE,  ID_CREATE,  TBSTATE_INDETERMINATE, BTNS_BUTTON, {0}, 0, 0 
},         /* create */
+    {TBICON_CREATE,  ID_CREATE,  TBSTATE_INDETERMINATE, BTNS_BUTTON, {0}, 0, 0 
},   /* create */
     {TBICON_DELETE,  ID_DELETE,  TBSTATE_INDETERMINATE, BTNS_BUTTON, {0}, 0, 0 
},   /* delete */
 
     {15, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0},                             
     /* separator */
@@ -374,7 +375,6 @@ InitMainWnd(PMAIN_WND_INFO Info)
     return TRUE;
 }
 
-
 static VOID
 MainWndCommand(PMAIN_WND_INFO Info,
                WORD CmdId,
@@ -382,6 +382,10 @@ MainWndCommand(PMAIN_WND_INFO Info,
 {
     UNREFERENCED_PARAMETER(hControl);
 
+    WCHAR szAppName[256];
+    WCHAR szAppAuthors[256];    
+    HICON hIcon;
+
     switch (CmdId)
     {
         case ID_PROP:
@@ -590,11 +594,12 @@ MainWndCommand(PMAIN_WND_INFO Info,
         break;
 
         case ID_ABOUT:
-            DialogBox(hInstance,
-                      MAKEINTRESOURCE(IDD_ABOUTBOX),
-                      Info->hMainWnd,
-                      AboutDialogProc);
-            SetFocus(Info->hListView);
+            LoadStringW(hInstance, IDS_APPNAME, szAppName, 
_countof(szAppName));
+            LoadStringW(hInstance, IDS_APPAUTHORS, szAppAuthors, 
_countof(szAppAuthors));
+            
+            hIcon = LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_SM_ICON));
+            ShellAboutW(Info->hMainWnd, szAppName, szAppAuthors, hIcon);
+            DestroyIcon(hIcon);
         break;
 
     }
diff --git a/base/applications/mscutils/servman/resource.h 
b/base/applications/mscutils/servman/resource.h
index 76f0e1e0e73..3277200005f 100644
--- a/base/applications/mscutils/servman/resource.h
+++ b/base/applications/mscutils/servman/resource.h
@@ -5,10 +5,8 @@
 #define IDA_SERVMAN 20
 
 /* about box info */
-#define IDD_ABOUTBOX     200
-#define IDC_LICENSE_EDIT 201
-#define IDS_APPNAME      202
-#define IDS_LICENSE      203
+#define IDS_APPAUTHORS   200
+#define IDS_APPNAME      201
 
 #define IDC_SERVLIST    1000
 #define IDC_STATUSBAR   1001

Reply via email to