[0.4.10][RAPPS] Pick some simplifications from master up to 0.4.15-dev-3726-gc262020...

As the dialog simply displays the copyright names and nothing particular it makes sense to use ShellAboutW() instead.

Several fixes ported back:
0.4.15-dev-3726-g c262020016f637c8a158a43db443e0ebc071d2f8 README CORE-18018
0.4.15-dev-3724-g 3a7c0d82d2fd4f1413cf0ed50eedad52b107d491 size fallback part 1 CORE-18018
0.4.15-dev-3569-g b5a6357d932ea6cc4e3198bb4ad1956b6a235f0c available.h/.cpp Strip 3 useless functions
0.4.15-dev-384-g 393a2c42fec59341271a53d4f87c253a13aabf9c CDPath in README
0.4.15-dev-227-g a6084d7440c260eb0ecb352f3b20f8c3a89162a2 ShellAbout() (#2751)
and some whitespace corrections, especially in cabinet.cpp

diff --git a/base/applications/rapps/CMakeLists.txt b/base/applications/rapps/CMakeLists.txt
index ce8ba3a..1e43f3b 100644 (file)
--- a/base/applications/rapps/CMakeLists.txt
+++ b/base/applications/rapps/CMakeLists.txt
@@ -7,7 +7,6 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/cryptlib)
 include_directories(include)
 
 list(APPEND SOURCE
-    aboutdlg.cpp
     available.cpp
     cabinet.cpp
     gui.cpp

diff --git a/base/applications/rapps/README.ENG b/base/applications/rapps/README.ENG
index 208f0cf..1449792 100644 (file)
--- a/base/applications/rapps/README.ENG
+++ b/base/applications/rapps/README.ENG
@@ -49,11 +49,10 @@ File format overview:
   Version = 1.1.1
   License = GPL
   Description = Shortish description giving some additional background information about what it does.
-  Size = 10 MB
+  SizeBytes = 1594881
   Category = 5
   URLSite = https://example.org/
   URLDownload = https://ftp.example.org/pub/installer.exe
-  CDPath = ; Path in the local filesystem
 
   [Section.0419] ; 0419 - for Russian language
   Description = Description in Russian language

diff --git a/base/applications/rapps/README.RUS b/base/applications/rapps/README.RUS
index e81dabd..2cb9a7b 100644 (file)
--- a/base/applications/rapps/README.RUS
+++ b/base/applications/rapps/README.RUS
@@ -1,4 +1,4 @@
-For more information for RAPPS, see: https://www.reactos.org/wiki/RAPPS
+For more information for RAPPS, see: https://reactos.org/wiki/RAPPS
 
 ÄÎÁÀÂËÅÍÈÅ ÇÀÃÐÓÆÀÅÌÛÕ ÏÐÎÃÐÀÌÌ
 
@@ -17,11 +17,10 @@ RegName = 
 Version = 1.1.1 ; Òåêñòîâîå ïîëå ñ âåðñèåé
 License = Íàçâàíèå ëèöåíçèè ; Òåêñòîâîå ïîëå
 Description = Îïèñàíèå ïðîãðàììû ; Òåêòñîâîå ïîëå
-Size = Ðàçìåð ïðîãðàììû ; Òåêñòîâîå ïîëå
+SizeBytes = 1594881
 Category = 5 ; Öèôðîâîå ïîëå ñ êàòåãîðèåé
 URLSite = http://www.site.com/ ; Òåêñòîâîå ïîëå. Ññûëêà íà ñàéò ïðîãðàììû
 URLDownload = http://ftp.site.com/pub/installer.exe ; Òåêñòîâîå ïîëå. Ññûëêà äëÿ ñêà÷èâàíèÿ
-CDPath = ; Ïîêà íå èñïîëüçóåòñÿ
 
 [Section.0419] ; Ñåêöèÿ äëÿ ðóññêîãî ÿçûêà
 Description = Îïèñàíèå íà ðóññêîì ÿçûêå

diff --git a/base/applications/rapps/aboutdlg.cpp b/base/applications/rapps/aboutdlg.cpp
deleted file mode 100644 (file)
index 0758009..0000000
--- a/base/applications/rapps/aboutdlg.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * PROJECT:     ReactOS Applications Manager
- * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
- * FILE:        base/applications/rapps/aboutdlg.cpp
- * PURPOSE:     About Dialog
- * COPYRIGHT:   Copyright 2009 Dmitry Chapyshev      (dmitry@reactos.org)
- *              Copyright 2017 Alexander Shaposhikov (sanchaez@reactos.org)
- */
-#include "rapps.h"
-
-static INT_PTR CALLBACK AboutDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam)
-{
-    if ((Msg == WM_COMMAND) &&
-        (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL))
-    {
-        return EndDialog(hDlg, LOWORD(wParam));
-    }
-
-    return FALSE;
-}
-
-VOID ShowAboutDialog()
-{
-    DialogBoxW(hInst,
-               MAKEINTRESOURCEW(IDD_ABOUT_DIALOG),
-               hMainWnd,
-               AboutDlgProc);
-}

diff --git a/base/applications/rapps/available.cpp b/base/applications/rapps/available.cpp
index c6ee68f..a6107e6 100644 (file)
--- a/base/applications/rapps/available.cpp
+++ b/base/applications/rapps/available.cpp
@@ -52,7 +52,6 @@ VOID CAvailableApplicationInfo::RetrieveGeneralInfo()
     GetString(L"License", m_szLicense);
     GetString(L"Description", m_szDesc);
     GetString(L"URLSite", m_szUrlSite);
-    GetString(L"CDPath", m_szCDPath);
     GetString(L"Language", m_szRegName);
     GetString(L"SHA1", m_szSHA1);
 
@@ -148,12 +147,8 @@ VOID CAvailableApplicationInfo::RetrieveSize()
     INT iSizeBytes;
 
     if (!m_Parser->GetInt(L"SizeBytes", iSizeBytes))
-    {
-        // fall back to "Size" string
-        GetString(L"Size", m_szSize);
         return;
-    }
- 
+
     StrFormatByteSizeW(iSizeBytes, m_szSize.GetBuffer(MAX_PATH), MAX_PATH);
     m_szSize.ReleaseBuffer();
 }
@@ -302,7 +297,7 @@ BOOL CAvailableApps::UpdateAppsDB()
 
     CDownloadManager::DownloadApplicationsDB(APPLICATION_DATABASE_URL);
 
-    if (!ExtractFilesFromCab(m_Strings.szCabName, 
+    if (!ExtractFilesFromCab(m_Strings.szCabName,
                              m_Strings.szCabDir,
                              m_Strings.szAppsPath))
     {
@@ -440,19 +435,4 @@ ATL::CSimpleArray<CAvailableApplicationInfo> CAvailableApps::GetSelected() const
     }
     return result;
 }
-
-const ATL::CStringW& CAvailableApps::GetFolderPath() const
-{
-    return m_Strings.szPath;
-}
-
-const ATL::CStringW& CAvailableApps::GetAppPath() const
-{
-    return m_Strings.szAppsPath;
-}
-
-const ATL::CStringW& CAvailableApps::GetCabPath() const
-{
-    return m_Strings.szCabPath;
-}
 // CAvailableApps

diff --git a/base/applications/rapps/cabinet.cpp b/base/applications/rapps/cabinet.cpp
index 11b301e..b5e08a5 100644 (file)
--- a/base/applications/rapps/cabinet.cpp
+++ b/base/applications/rapps/cabinet.cpp
@@ -3,7 +3,7 @@
 * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
 * FILE:        base/applications/rapps/cabinet.cpp
 * PURPOSE:     Cabinet extraction using FDI API
-* COPYRIGHT:   Copyright 2018 Alexander Shaposhnikov     (sanchaez@reactos.org)            
+* COPYRIGHT:   Copyright 2018 Alexander Shaposhnikov     (sanchaez@reactos.org)
 */
 #include "rapps.h"
 
@@ -12,7 +12,7 @@
 
 /*
  * HACK: treat any input strings as Unicode (UTF-8)
- * cabinet.dll lacks any sort of a Unicode API, but FCI/FDI 
+ * cabinet.dll lacks any sort of a Unicode API, but FCI/FDI
  * provide an ability to use user-defined callbacks for any file or memory
  * operations. This flexibility and the magic power of C/C++ casting allows
  * us to treat input as we please.
@@ -66,7 +66,7 @@ inline BOOL MultiByteToWide(const CStringA& szSource,
                                     NULL);
     if (!sz)
         return FALSE;
-        
+
     // do the actual conversion
     sz = MultiByteToWideChar(CP_UTF8,
                                 0,
@@ -191,7 +191,7 @@ FNFDINOTIFY(fnNotify)
         WideToMultiByte(szNewFileName, szFilePathUTF8, CP_UTF8);
 
         // Copy file
-        iResult = fnFileOpen((LPSTR) szFilePathUTF8.GetString(), 
+        iResult = fnFileOpen((LPSTR) szFilePathUTF8.GetString(),
                              _O_WRONLY | _O_CREAT,
                              0);
     }
@@ -230,14 +230,14 @@ FNFDINOTIFY(fnNotify)
 
 /* cabinet.dll FDI function pointers */
 
-typedef HFDI(*fnFDICreate)(PFNALLOC, 
-                           PFNFREE, 
-                           PFNOPEN, 
-                           PFNREAD, 
+typedef HFDI(*fnFDICreate)(PFNALLOC,
+                           PFNFREE,
+                           PFNOPEN,
+                           PFNREAD,
                            PFNWRITE,
-                           PFNCLOSE, 
-                           PFNSEEK, 
-                           int, 
+                           PFNCLOSE,
+                           PFNSEEK,
+                           int,
                            PERF);
 
 typedef BOOL(*fnFDICopy)(HFDI,
@@ -250,12 +250,12 @@ typedef BOOL(*fnFDICopy)(HFDI,
 
 typedef BOOL(*fnFDIDestroy)(HFDI);
 
-/* 
- * Extraction function 
+/*
+ * Extraction function
  * TODO: require only a full path to the cab as an argument
  */
-BOOL ExtractFilesFromCab(const ATL::CStringW& szCabName, 
-                         const ATL::CStringW& szCabDir, 
+BOOL ExtractFilesFromCab(const ATL::CStringW& szCabName,
+                         const ATL::CStringW& szCabDir,
                          const ATL::CStringW& szOutputDir)
 {
     HINSTANCE hCabinetDll;
@@ -267,7 +267,7 @@ BOOL ExtractFilesFromCab(const ATL::CStringW& szCabName,
     fnFDIDestroy pfnFDIDestroy;
     BOOL bResult;
 
-    // Load cabinet.dll and extract needed functions 
+    // Load cabinet.dll and extract needed functions
     hCabinetDll = LoadLibraryW(L"cabinet.dll");
 
     if (!hCabinetDll)
@@ -304,7 +304,7 @@ BOOL ExtractFilesFromCab(const ATL::CStringW& szCabName,
 
     // Create output dir
     bResult = CreateDirectoryW(szOutputDir, NULL);
-    
+
     if (bResult || GetLastError() == ERROR_ALREADY_EXISTS)
     {
         // Convert wide strings to UTF-8

diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp
index b85e5fa..bd1521f 100644 (file)
--- a/base/applications/rapps/gui.cpp
+++ b/base/applications/rapps/gui.cpp
@@ -1369,6 +1369,19 @@ private:
         }
     }
 
+    VOID ShowAboutDlg()
+    {
+        ATL::CStringW szApp;
+        ATL::CStringW szAuthors;
+        HICON hIcon;
+
+        szApp.LoadStringW(IDS_APPTITLE);
+        szAuthors.LoadStringW(IDS_APP_AUTHORS);
+        hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN));
+        ShellAboutW(m_hWnd, szApp, szAuthors, hIcon);
+        DestroyIcon(hIcon);
+    }
+
     VOID OnCommand(WPARAM wParam, LPARAM lParam)
     {
         WORD wCommand = LOWORD(wParam);
@@ -1505,7 +1518,7 @@ private:
             break;
 
         case ID_ABOUT:
-            ShowAboutDialog();
+            ShowAboutDlg();
             break;
 
         case ID_CHECK_ALL:

diff --git a/base/applications/rapps/include/available.h b/base/applications/rapps/include/available.h
index c0b0f20..862c52f 100644 (file)
--- a/base/applications/rapps/include/available.h
+++ b/base/applications/rapps/include/available.h
@@ -35,7 +35,6 @@ struct CAvailableApplicationInfo
     ATL::CStringW m_szSize;
     ATL::CStringW m_szUrlSite;
     ATL::CStringW m_szUrlDownload;
-    ATL::CStringW m_szCDPath;
     ATL::CSimpleArray<LCID> m_LanguageLCIDs;
 
     // Caching mechanism related entries
@@ -111,8 +110,4 @@ public:
     CAvailableApplicationInfo* FindInfo(const ATL::CStringW& szAppName) const;
     ATL::CSimpleArray<CAvailableApplicationInfo> FindInfoList(const ATL::CSimpleArray<ATL::CStringW> &arrAppsNames) const;
     ATL::CSimpleArray<CAvailableApplicationInfo> GetSelected() const;
-
-    const ATL::CStringW& GetFolderPath() const;
-    const ATL::CStringW& GetAppPath() const;
-    const ATL::CStringW& GetCabPath() const;
 };

diff --git a/base/applications/rapps/include/dialogs.h b/base/applications/rapps/include/dialogs.h
index 69e0764..730343e 100644 (file)
--- a/base/applications/rapps/include/dialogs.h
+++ b/base/applications/rapps/include/dialogs.h
@@ -36,5 +36,3 @@ public:
 // Settings dialog (settingsdlg.cpp)
 VOID CreateSettingsDlg(HWND hwnd);
 
-// About dialog (aboutdlg.cpp)
-VOID ShowAboutDialog();

diff --git a/base/applications/rapps/include/resource.h b/base/applications/rapps/include/resource.h
index fcd1502..5c67c43 100644 (file)
--- a/base/applications/rapps/include/resource.h
+++ b/base/applications/rapps/include/resource.h
@@ -58,7 +58,6 @@
 #define IDD_SETTINGS_DIALOG      300
 #define IDD_INSTALL_DIALOG       301
 #define IDD_DOWNLOAD_DIALOG      302
-#define IDD_ABOUT_DIALOG         303
 
 /* Menus */
 #define IDR_MAINMENU             500
@@ -112,6 +111,7 @@
 #define IDS_UNABLE_TO_INSTALL    128
 #define IDS_SELECTEDFORINST      129
 #define IDS_MISMATCH_CERT_INFO   130
+#define IDS_APP_AUTHORS          132
 
 /* Tooltips */
 #define IDS_TOOLTIP_INSTALL      200

diff --git a/base/applications/rapps/lang/bg-BG.rc b/base/applications/rapps/lang/bg-BG.rc
index 3fbb5f4..4d9de8b 100644 (file)
--- a/base/applications/rapps/lang/bg-BG.rc
+++ b/base/applications/rapps/lang/bg-BG.rc
@@ -104,16 +104,6 @@ BEGIN
     PUSHBUTTON "Отказ", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP
 END
 
-IDD_ABOUT_DIALOG DIALOGEX 22, 16, 210, 66
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-CAPTION "За"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30
-    LTEXT "Управителят за приложожения на РеактОС\nВъзпроизводствени права (C) 2009\nДмитрий Чапъйшев (dmitry@reactos.org)", IDC_STATIC, 48, 7, 150, 39
-    DEFPUSHBUTTON "Затваряне", IDOK, 133, 46, 50, 14
-END
-
 STRINGTABLE
 BEGIN
     IDS_TOOLTIP_INSTALL "Слагане"
@@ -187,6 +177,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPTITLE "Управителят за приложения на РеактОС"
+    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Търсене"
     IDS_INSTALL "Слагане"
     IDS_UNINSTALL "Махане"

diff --git a/base/applications/rapps/lang/cs-CZ.rc b/base/applications/rapps/lang/cs-CZ.rc
index 21eef64..598915b 100644 (file)
--- a/base/applications/rapps/lang/cs-CZ.rc
+++ b/base/applications/rapps/lang/cs-CZ.rc
@@ -105,16 +105,6 @@ BEGIN
     PUSHBUTTON "Storno", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP
 END
 
-IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-CAPTION "O programu"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30
-    LTEXT "ReactOS Správce aplikací\nCopyright (C) 2009\nDmitry Chapyshev (dmitry@reactos.org)", IDC_STATIC, 48, 7, 130, 39
-    DEFPUSHBUTTON "Zavřít", IDOK, 133, 46, 50, 14
-END
-
 STRINGTABLE
 BEGIN
     IDS_TOOLTIP_INSTALL "Instalovat"
@@ -188,6 +178,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPTITLE "ReactOS Správce aplikací"
+    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Hledat…"
     IDS_INSTALL "Instalovat"
     IDS_UNINSTALL "Odinstalovat"

diff --git a/base/applications/rapps/lang/de-DE.rc b/base/applications/rapps/lang/de-DE.rc
index 749f3eb..f4efa3a 100644 (file)
--- a/base/applications/rapps/lang/de-DE.rc
+++ b/base/applications/rapps/lang/de-DE.rc
@@ -100,16 +100,6 @@ BEGIN
     PUSHBUTTON "Abbrechen", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP
 END
 
-IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-CAPTION "Über"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30
-    LTEXT "ReactOS-Anwendungsmanager\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry@reactos.org)", IDC_STATIC, 48, 7, 130, 39
-    DEFPUSHBUTTON "Schließen", IDOK, 133, 46, 50, 14
-END
-
 STRINGTABLE
 BEGIN
     IDS_TOOLTIP_INSTALL "Installieren"
@@ -183,6 +173,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPTITLE "ReactOS-Anwendungsmanager"
+    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Suche…"
     IDS_INSTALL "Installieren"
     IDS_UNINSTALL "Deinstallieren"

diff --git a/base/applications/rapps/lang/en-US.rc b/base/applications/rapps/lang/en-US.rc
index 50f2ab1..11db7a9 100644 (file)
--- a/base/applications/rapps/lang/en-US.rc
+++ b/base/applications/rapps/lang/en-US.rc
@@ -100,16 +100,6 @@ BEGIN
     PUSHBUTTON "Cancel", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP
 END
 
-IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-CAPTION "About"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30
-    LTEXT "ReactOS Applications Manager\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry@reactos.org)", IDC_STATIC, 48, 7, 130, 39
-    DEFPUSHBUTTON "Close", IDOK, 133, 46, 50, 14
-END
-
 STRINGTABLE
 BEGIN
     IDS_TOOLTIP_INSTALL "Install"
@@ -183,6 +173,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPTITLE "ReactOS Applications Manager"
+    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Search…"
     IDS_INSTALL "Install"
     IDS_UNINSTALL "Uninstall"

diff --git a/base/applications/rapps/lang/es-ES.rc b/base/applications/rapps/lang/es-ES.rc
index 1a2e5e0..5017dde 100644 (file)
--- a/base/applications/rapps/lang/es-ES.rc
+++ b/base/applications/rapps/lang/es-ES.rc
@@ -103,16 +103,6 @@ BEGIN
     PUSHBUTTON "Cancelar", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP
 END
 
-IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-CAPTION "Acerca de"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30
-    LTEXT "Administrador de aplicaciones de ReactOS\nCopyright (C) 2009\nCreado por Dmitry Chapyshev (dmitry@reactos.org)", IDC_STATIC, 48, 7, 130, 39
-    DEFPUSHBUTTON "Cerrar", IDOK, 133, 46, 50, 14
-END
-
 STRINGTABLE
 BEGIN
     IDS_TOOLTIP_INSTALL "Instalar"
@@ -186,6 +176,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPTITLE "Administrador de aplicaciones de ReactOS"
+    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Buscar…"
     IDS_INSTALL "Instalar"
     IDS_UNINSTALL "Desinstalar"

diff --git a/base/applications/rapps/lang/fr-FR.rc b/base/applications/rapps/lang/fr-FR.rc
index 6ed35f5..cb22711 100644 (file)
--- a/base/applications/rapps/lang/fr-FR.rc
+++ b/base/applications/rapps/lang/fr-FR.rc
@@ -100,16 +100,6 @@ BEGIN
     PUSHBUTTON "Annuler", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP
 END
 
-IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-CAPTION "À propos"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30
-    LTEXT "ReactOS Applications Manager\nCopyright (C) 2009\npar Dmitry Chapyshev (dmitry@reactos.org)", IDC_STATIC, 48, 7, 130, 39
-    DEFPUSHBUTTON "Fermer", IDOK, 133, 46, 50, 14
-END
-
 STRINGTABLE
 BEGIN
     IDS_TOOLTIP_INSTALL "Installer"
@@ -183,6 +173,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPTITLE "ReactOS Applications Manager"
+    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Chercher…"
     IDS_INSTALL "Installer"
     IDS_UNINSTALL "Désinstaller"

diff --git a/base/applications/rapps/lang/he-IL.rc b/base/applications/rapps/lang/he-IL.rc
index 6eb11e7..4fd6748 100644 (file)
--- a/base/applications/rapps/lang/he-IL.rc
+++ b/base/applications/rapps/lang/he-IL.rc
@@ -105,17 +105,6 @@ BEGIN
     PUSHBUTTON "ביטול", IDCANCEL, 83, 53, 50, 15, WS_GROUP | WS_TABSTOP
 END
 
-IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-EXSTYLE WS_EX_LAYOUTRTL
-CAPTION "אודות"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30
-    LTEXT "ReactOS Applications Manager\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry@reactos.org)", IDC_STATIC, 48, 7, 130, 39
-    DEFPUSHBUTTON "סגירה", IDOK, 133, 46, 50, 14
-END
-
 STRINGTABLE
 BEGIN
     IDS_TOOLTIP_INSTALL "התקנה"
@@ -189,6 +178,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPTITLE "מנהל היישומים של ReactOS"
+    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "חפש…"
     IDS_INSTALL "התקנה"
     IDS_UNINSTALL "הסרה"

diff --git a/base/applications/rapps/lang/it-IT.rc b/base/applications/rapps/lang/it-IT.rc
index 689efdf..0e931ea 100644 (file)
--- a/base/applications/rapps/lang/it-IT.rc
+++ b/base/applications/rapps/lang/it-IT.rc
@@ -100,16 +100,6 @@ BEGIN
     PUSHBUTTON "Annulla", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP
 END
 
-IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-CAPTION "Informazioni"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30
-    LTEXT "Gestione applicazioni di ReactOS \nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry@reactos.org)", IDC_STATIC, 48, 7, 130, 39
-    DEFPUSHBUTTON "Chiudi", IDOK, 133, 46, 50, 14
-END
-
 STRINGTABLE
 BEGIN
     IDS_TOOLTIP_INSTALL "Installa"
@@ -183,6 +173,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPTITLE "ReactOS Gestione applicazioni"
+    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Cerca…"
     IDS_INSTALL "Installa"
     IDS_UNINSTALL "Rimuovi"

diff --git a/base/applications/rapps/lang/ja-JP.rc b/base/applications/rapps/lang/ja-JP.rc
index 227e07f..2322619 100644 (file)
--- a/base/applications/rapps/lang/ja-JP.rc
+++ b/base/applications/rapps/lang/ja-JP.rc
@@ -100,16 +100,6 @@ BEGIN
     PUSHBUTTON "キャンセル", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP
 END
 
-IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-CAPTION "バージョン情報"
-FONT 9, "MS UI Gothic"
-BEGIN
-    ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30
-    LTEXT "ReactOS アプリケーション マネージャ\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry@reactos.org)", IDC_STATIC, 48, 7, 130, 39
-    DEFPUSHBUTTON "閉じる", IDOK, 133, 46, 50, 14
-END
-
 STRINGTABLE
 BEGIN
     IDS_TOOLTIP_INSTALL     "インストール"
@@ -183,6 +173,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPTITLE            "ReactOS アプリケーション マネージャ"
+    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT         "検索…"
     IDS_INSTALL             "インストール"
     IDS_UNINSTALL           "アンインストール"

diff --git a/base/applications/rapps/lang/no-NO.rc b/base/applications/rapps/lang/no-NO.rc
index c2d7a48..b9bbde5 100644 (file)
--- a/base/applications/rapps/lang/no-NO.rc
+++ b/base/applications/rapps/lang/no-NO.rc
@@ -100,16 +100,6 @@ BEGIN
     PUSHBUTTON "Avbryt", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP
 END
 
-IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-CAPTION "Om"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30
-    LTEXT "ReactOS Programbehandler\nEnerett (C) 2009\nav Dmitry Chapyshev (dmitry@reactos.org)", IDC_STATIC, 48, 7, 130, 39
-    DEFPUSHBUTTON "Lukk", IDOK, 133, 46, 50, 14
-END
-
 STRINGTABLE
 BEGIN
     IDS_TOOLTIP_INSTALL "Installere"
@@ -182,6 +172,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPTITLE "ReactOS programbehandler"
+    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Søk…"
     IDS_INSTALL "Installere"
     IDS_UNINSTALL "Avinstallere"

diff --git a/base/applications/rapps/lang/pl-PL.rc b/base/applications/rapps/lang/pl-PL.rc
index 787e8e8..c79ebe2 100644 (file)
--- a/base/applications/rapps/lang/pl-PL.rc
+++ b/base/applications/rapps/lang/pl-PL.rc
@@ -108,16 +108,6 @@ BEGIN
     PUSHBUTTON "Anuluj", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP
 END
 
-IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-CAPTION "O programie"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30
-    LTEXT "Menedżer aplikacji ReactOS\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry@reactos.org)", IDC_STATIC, 48, 7, 130, 39
-    DEFPUSHBUTTON "Zamknij", IDOK, 133, 46, 50, 14
-END
-
 STRINGTABLE
 BEGIN
     IDS_TOOLTIP_INSTALL "Instaluj"
@@ -191,6 +181,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPTITLE "Menedżer aplikacji ReactOS"
+    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Szukaj…"
     IDS_INSTALL "Instaluj"
     IDS_UNINSTALL "Odinstaluj"

diff --git a/base/applications/rapps/lang/pt-BR.rc b/base/applications/rapps/lang/pt-BR.rc
index f4f1ffd..e150b82 100644 (file)
--- a/base/applications/rapps/lang/pt-BR.rc
+++ b/base/applications/rapps/lang/pt-BR.rc
@@ -102,16 +102,6 @@ BEGIN
     PUSHBUTTON "Cancelar", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP
 END
 
-IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-CAPTION "Sobre"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30
-    LTEXT "Central de Aplicativos ReactOS\nCopyright (C) 2009\npor Dmitry Chapyshev (dmitry@reactos.org)", IDC_STATIC, 48, 7, 130, 39
-    DEFPUSHBUTTON "Fechar", IDOK, 133, 46, 50, 14
-END
-
 STRINGTABLE
 BEGIN
     IDS_TOOLTIP_INSTALL "Instalar"
@@ -185,6 +175,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPTITLE "Central de Aplicativos ReactOS"
+    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Procurar…"
     IDS_INSTALL "Instalar"
     IDS_UNINSTALL "Desinstalar"

diff --git a/base/applications/rapps/lang/ro-RO.rc b/base/applications/rapps/lang/ro-RO.rc
index 0654ca7..85b6eae 100644 (file)
--- a/base/applications/rapps/lang/ro-RO.rc
+++ b/base/applications/rapps/lang/ro-RO.rc
@@ -109,16 +109,6 @@ BEGIN
     PUSHBUTTON "A&nulează", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP
 END
 
-IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-CAPTION "Despre gestionarul de programe"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30
-    LTEXT "Gestionar de programe ReactOS\nDrept de autor (C) 2009\nde către Dmitry Chapyshev (dmitry@reactos.org)", IDC_STATIC, 48, 7, 130, 39
-    DEFPUSHBUTTON "Î&nchide", IDOK, 133, 46, 50, 14
-END
-
 STRINGTABLE
 BEGIN
     IDS_TOOLTIP_INSTALL "Instalează"
@@ -192,6 +182,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPTITLE "Gestionar de programe"
+    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Căutare…"
     IDS_INSTALL "Instalează"
     IDS_UNINSTALL "Dezinstalează"

diff --git a/base/applications/rapps/lang/ru-RU.rc b/base/applications/rapps/lang/ru-RU.rc
index 9a631a3..f692e8d 100644 (file)
--- a/base/applications/rapps/lang/ru-RU.rc
+++ b/base/applications/rapps/lang/ru-RU.rc
@@ -100,16 +100,6 @@ BEGIN
     PUSHBUTTON "Отмена", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP
 END
 
-IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-CAPTION "О программе"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30
-    LTEXT "Менеджер приложений ReactOS\nАвторские права (C) 2009\nДмитрий Чапышев (dmitry@reactos.org)", IDC_STATIC, 48, 7, 130, 39
-    DEFPUSHBUTTON "Закрыть", IDOK, 133, 46, 50, 14
-END
-
 STRINGTABLE
 BEGIN
     IDS_TOOLTIP_INSTALL "Установить"
@@ -183,6 +173,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPTITLE "Менеджер приложений ReactOS"
+    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Поиск…"
     IDS_INSTALL "Установить"
     IDS_UNINSTALL "Удалить"

diff --git a/base/applications/rapps/lang/sk-SK.rc b/base/applications/rapps/lang/sk-SK.rc
index 4eaa41a..eb865eb 100644 (file)
--- a/base/applications/rapps/lang/sk-SK.rc
+++ b/base/applications/rapps/lang/sk-SK.rc
@@ -105,16 +105,6 @@ BEGIN
     PUSHBUTTON "Zrušiť", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP
 END
 
-IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-CAPTION "Čo je Manažér aplikácií systému ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30
-    LTEXT "Manažér aplikácií systému ReactOS\nAutorské práva (C) 2009\nod Dmitry Chapyshev (dmitry@reactos.org)\nPreklad: Mário Kačmár (kario@szm.sk)", IDC_STATIC, 48, 7, 130, 39
-    DEFPUSHBUTTON "Zavrieť", IDOK, 133, 46, 50, 14
-END
-
 STRINGTABLE
 BEGIN
     IDS_TOOLTIP_INSTALL "Inštalovať"
@@ -188,6 +178,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPTITLE "Manažér aplikácií systému ReactOS"
+    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Hľadať…"
     IDS_INSTALL "Inštalovať"
     IDS_UNINSTALL "Odinštalovať"

diff --git a/base/applications/rapps/lang/sq-AL.rc b/base/applications/rapps/lang/sq-AL.rc
index 8e2e338..8d6a836 100644 (file)
--- a/base/applications/rapps/lang/sq-AL.rc
+++ b/base/applications/rapps/lang/sq-AL.rc
@@ -104,16 +104,6 @@ BEGIN
     PUSHBUTTON "Anulo", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP
 END
 
-IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-CAPTION "Rreth"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30
-    LTEXT "ReactOS Applications Manager\nCopyright (C) 2009\nnga Dmitry Chapyshev (dmitry@reactos.org)", IDC_STATIC, 48, 7, 130, 39
-    DEFPUSHBUTTON "Close", IDOK, 133, 46, 50, 14
-END
-
 STRINGTABLE
 BEGIN
     IDS_TOOLTIP_INSTALL "Instalo"
@@ -187,6 +177,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPTITLE "ReactOS Applications Manager"
+    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Kerko…"
     IDS_INSTALL "Instalo"
     IDS_UNINSTALL "Uninstall"

diff --git a/base/applications/rapps/lang/sv-SE.rc b/base/applications/rapps/lang/sv-SE.rc
index 56f06fe..dbc7aab 100644 (file)
--- a/base/applications/rapps/lang/sv-SE.rc
+++ b/base/applications/rapps/lang/sv-SE.rc
@@ -107,16 +107,6 @@ BEGIN
     PUSHBUTTON "Avbryt", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP
 END
 
-IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-CAPTION "Om"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30
-    LTEXT "ReactOS Programhanterare\nCopyright (C) 2009\nav Dmitry Chapyshev (dmitry@reactos.org)", IDC_STATIC, 48, 7, 130, 39
-    DEFPUSHBUTTON "Stäng", IDOK, 133, 46, 50, 14
-END
-
 STRINGTABLE
 BEGIN
     IDS_TOOLTIP_INSTALL "Installera"
@@ -190,6 +180,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPTITLE "ReactOS programhanterare"
+    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Sök…"
     IDS_INSTALL "Installera"
     IDS_UNINSTALL "Avinstallera"

diff --git a/base/applications/rapps/lang/tr-TR.rc b/base/applications/rapps/lang/tr-TR.rc
index a46e0a9..4ec359c 100644 (file)
--- a/base/applications/rapps/lang/tr-TR.rc
+++ b/base/applications/rapps/lang/tr-TR.rc
@@ -102,16 +102,6 @@ BEGIN
     PUSHBUTTON "İptal", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP
 END
 
-IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-CAPTION "Üzerine"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30
-    LTEXT "ReactOS Uygulama Yöneticisi\nTelif Hakkı: 2009\nDmitry Chapyshev (dmitry@reactos.org) ile.", IDC_STATIC, 48, 7, 130, 39
-    DEFPUSHBUTTON "Tamam", IDOK, 133, 46, 50, 14
-END
-
 STRINGTABLE
 BEGIN
     IDS_TOOLTIP_INSTALL "Kur"
@@ -185,6 +175,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPTITLE "ReactOS Uygulama Yöneticisi"
+    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Ara"
     IDS_INSTALL "Kur"
     IDS_UNINSTALL "Kaldır"

diff --git a/base/applications/rapps/lang/uk-UA.rc b/base/applications/rapps/lang/uk-UA.rc
index 08788f7..cedec8c 100644 (file)
--- a/base/applications/rapps/lang/uk-UA.rc
+++ b/base/applications/rapps/lang/uk-UA.rc
@@ -108,16 +108,6 @@ BEGIN
     PUSHBUTTON "Скасувати", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP
 END
 
-IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-CAPTION "Про програму…"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30
-    LTEXT "Менеджер додатків ReactOS\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry@reactos.org)", IDC_STATIC, 48, 7, 130, 39
-    DEFPUSHBUTTON "Закрити", IDOK, 133, 46, 50, 14
-END
-
 STRINGTABLE
 BEGIN
     IDS_TOOLTIP_INSTALL "Встановити"
@@ -191,6 +181,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPTITLE "Менеджер додатків ReactOS"
+    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Пошук…"
     IDS_INSTALL "Встановити"
     IDS_UNINSTALL "Видалити"

diff --git a/base/applications/rapps/lang/zh-CN.rc b/base/applications/rapps/lang/zh-CN.rc
index 9d452ae..328b88f 100644 (file)
--- a/base/applications/rapps/lang/zh-CN.rc
+++ b/base/applications/rapps/lang/zh-CN.rc
@@ -102,16 +102,6 @@ BEGIN
     PUSHBUTTON "取消", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP
 END
 
-IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-CAPTION "关于"
-FONT 9, "宋体"
-BEGIN
-    ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30
-    LTEXT "ReactOS 程序管理器\n版权所有 (C) 2009\n作者 Dmitry Chapyshev (dmitry@reactos.org)", IDC_STATIC, 48, 7, 130, 39
-    DEFPUSHBUTTON "关闭", IDOK, 133, 46, 50, 14
-END
-
 STRINGTABLE
 BEGIN
     IDS_TOOLTIP_INSTALL "安装"
@@ -185,6 +175,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPTITLE "ReactOS 程序管理器"
+    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "搜索…"
     IDS_INSTALL "安装"
     IDS_UNINSTALL "卸载"

diff --git a/base/applications/rapps/lang/zh-TW.rc b/base/applications/rapps/lang/zh-TW.rc
index fa7ef74..be423b5 100644 (file)
--- a/base/applications/rapps/lang/zh-TW.rc
+++ b/base/applications/rapps/lang/zh-TW.rc
@@ -102,16 +102,6 @@ BEGIN
     PUSHBUTTON "取消", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP
 END
 
-IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-CAPTION "關於"
-FONT 9, "新細明體"
-BEGIN
-    ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30
-    LTEXT "ReactOS 程式管理器 版權所有 (C) 2009\n作者 Dmitry Chapyshev (dmitry@reactos.org)", IDC_STATIC, 48, 7, 130, 39
-    DEFPUSHBUTTON "關閉", IDOK, 133, 46, 50, 14
-END
-
 STRINGTABLE
 BEGIN
     IDS_TOOLTIP_INSTALL "安裝"
@@ -185,6 +175,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPTITLE "ReactOS 程式管理器"
+    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "搜索…"
     IDS_INSTALL "安裝"
     IDS_UNINSTALL "解除安裝"