[ros-diffs] [rnaumann] 71466: [CALC] Use ShellAbout for the about dialog in Calc. Patch by Jason Wendt. Thank You. - Addition by me: delete about.c as well as ROS_logo.bmp CORE-11346

Author: rnaumann
Date: Tue May 31 08:04:18 2016
New Revision: 71466

URL: http://svn.reactos.org/svn/reactos?rev=71466&view=rev
Log:
[CALC] Use ShellAbout for the about dialog in Calc. Patch by Jason Wendt. Thank You.
- Addition by me: delete about.c as well as ROS_logo.bmp CORE-11346

Removed:
    trunk/reactos/base/applications/calc/about.c
    trunk/reactos/base/applications/calc/res/ROS_logo.bmp
Modified:
    trunk/reactos/base/applications/calc/CMakeLists.txt
    trunk/reactos/base/applications/calc/calc.h
    trunk/reactos/base/applications/calc/lang/bg-BG.rc
    trunk/reactos/base/applications/calc/lang/cs-CZ.rc
    trunk/reactos/base/applications/calc/lang/de-DE.rc
    trunk/reactos/base/applications/calc/lang/el-GR.rc
    trunk/reactos/base/applications/calc/lang/en-US.rc
    trunk/reactos/base/applications/calc/lang/es-ES.rc
    trunk/reactos/base/applications/calc/lang/fr-FR.rc
    trunk/reactos/base/applications/calc/lang/he-IL.rc
    trunk/reactos/base/applications/calc/lang/hu-HU.rc
    trunk/reactos/base/applications/calc/lang/it-IT.rc
    trunk/reactos/base/applications/calc/lang/ja-JP.rc
    trunk/reactos/base/applications/calc/lang/ko-KR.rc
    trunk/reactos/base/applications/calc/lang/nl-NL.rc
    trunk/reactos/base/applications/calc/lang/no-NO.rc
    trunk/reactos/base/applications/calc/lang/pl-PL.rc
    trunk/reactos/base/applications/calc/lang/pt-BR.rc
    trunk/reactos/base/applications/calc/lang/ro-RO.rc
    trunk/reactos/base/applications/calc/lang/ru-RU.rc
    trunk/reactos/base/applications/calc/lang/sk-SK.rc
    trunk/reactos/base/applications/calc/lang/sq-AL.rc
    trunk/reactos/base/applications/calc/lang/sv-SE.rc
    trunk/reactos/base/applications/calc/lang/th-TH.rc
    trunk/reactos/base/applications/calc/lang/tr-TR.rc
    trunk/reactos/base/applications/calc/lang/uk-UA.rc
    trunk/reactos/base/applications/calc/lang/zh-CN.rc
    trunk/reactos/base/applications/calc/resource.h
    trunk/reactos/base/applications/calc/resource.rc
    trunk/reactos/base/applications/calc/winmain.c

Modified: trunk/reactos/base/applications/calc/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/CMa…
==============================================================================
--- trunk/reactos/base/applications/calc/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/CMakeLists.txt	[iso-8859-1] Tue May 31 08:04:18
2016
@@ -2,7 +2,6 @@
 add_definitions(-DDISABLE_HTMLHELP_SUPPORT=1)
 
 list(APPEND SOURCE
-    about.c
     convert.c
     function.c
     rpn.c
@@ -14,7 +13,7 @@
 add_rc_deps(resource.rc ${calc_rc_deps})
 add_executable(calc ${SOURCE} resource.rc)
 set_module_type(calc win32gui UNICODE)
-add_importlibs(calc advapi32 user32 gdi32 msvcrt kernel32)
+add_importlibs(calc advapi32 user32 shell32 gdi32 msvcrt kernel32)
 
 if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
     target_link_libraries(calc mingwex)

Removed: trunk/reactos/base/applications/calc/about.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/abo…
==============================================================================
--- trunk/reactos/base/applications/calc/about.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/about.c	(removed)
@@ -1,33 +0,0 @@
-#include "calc.h"
-
-#define MAX_LICENSE_SIZE 1000 // it's enought!
-
-INT_PTR CALLBACK AboutDlgProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
-{
-    TCHAR *license;
-
-    switch (msg) {
-    case WM_INITDIALOG:
-        license = (TCHAR *)alloca(MAX_LICENSE_SIZE*sizeof(TCHAR));
-        if (LoadString(calc.hInstance, IDS_STRING_LICENSE, license, MAX_LICENSE_SIZE))
-            SendDlgItemMessage(hWnd, IDC_EDIT_LICENSE, WM_SETTEXT, 0, (LPARAM)license);
-        /* Update software version */
-        SendDlgItemMessage(hWnd, IDC_TEXT_VERSION, WM_GETTEXT, (WPARAM)MAX_LICENSE_SIZE,
(LPARAM)license);
-        _tcscat(license, CALC_VERSION);
-        SendDlgItemMessage(hWnd, IDC_TEXT_VERSION, WM_SETTEXT, 0, (LPARAM)license);
-        return TRUE;
-    case WM_COMMAND:
-        switch (LOWORD(wp)) {
-        case IDOK:
-            EndDialog(hWnd, 0);
-            return TRUE;
-        }
-        break;
-
-    case WM_CLOSE:
-        EndDialog(hWnd, 0);
-        return 0;
-    }
-    return FALSE;
-}
-

Modified: trunk/reactos/base/applications/calc/calc.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/cal…
==============================================================================
--- trunk/reactos/base/applications/calc/calc.h	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/calc.h	[iso-8859-1] Tue May 31 08:04:18 2016
@@ -40,8 +40,6 @@
 #ifndef IDC_STATIC
 #define IDC_STATIC  ((DWORD)-1)
 #endif
-
-#define CALC_VERSION        TEXT("1.11")
 
 #define MAX_CALC_SIZE       256
 

Modified: trunk/reactos/base/applications/calc/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/bg-BG.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/bg-BG.rc	[iso-8859-1] Tue May 31 08:04:18
2016
@@ -296,22 +296,6 @@
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "За ReactOS Calc"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "Добре", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "Изчислителят на РеактОС", IDC_STATIC, 120, 12,
132, 8, SS_CENTERIMAGE
-    LTEXT "Версия:", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Написано от Carlo Bramini", IDC_STATIC, 120, 32, 132, 8,
SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Статистическа кутия"
@@ -419,9 +403,15 @@
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "ReactOS Calc is free software released under GNU GPL
license.\r\n\r\nYou can get a copy of GNU GPL license
here:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nYou can also get a translation of GNU
GPL license here:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Грешка"
     IDS_QUICKHELP "Бърза помощ"
+END
+
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "Изчислителят на РеактОС"
+    IDS_AUTHOR "Написано от Carlo Bramini"
 END
 
 /* Types of conversion */

Modified: trunk/reactos/base/applications/calc/lang/cs-CZ.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/cs-CZ.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/cs-CZ.rc	[iso-8859-1] Tue May 31 08:04:18
2016
@@ -295,22 +295,6 @@
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "O ReactOS Kalkulačce"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "ReactOS Kalkulačka", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Verze ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Autor: Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Statistické výpočty"
@@ -418,9 +402,15 @@
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "ReactOS kalkulačka je svobodný software vydaný pod
licencí GNU GPL.\r\n\r\nZde najdete znění GNU GPL
licence:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nZde také najdete překlad GNU GPL
licence:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Chyba"
     IDS_QUICKHELP "Rychlá nápověda"
+END
+
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "ReactOS Kalkulačka"
+    IDS_AUTHOR "Autor: Carlo Bramini"
 END
 
 /* Types of conversion */

Modified: trunk/reactos/base/applications/calc/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/de-DE.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/de-DE.rc	[iso-8859-1] Tue May 31 08:04:18
2016
@@ -290,22 +290,6 @@
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Über ReactOS Rechner"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "ReactOS Rechner", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Version ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Geschrieben von Carlo Bramini", IDC_STATIC, 120, 32, 132, 8,
SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Statistikbox"
@@ -413,9 +397,15 @@
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "ReactOS Rechner ist freie Software, herausgegeben unter der
GNU GPL Lizenz.\r\n\r\nSie können hier eine Kopie der GNU GPL Lizenz
erhalten:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nSie können hier auch eine
Übersetzung der GNU GPL Lizenz
erhalten:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Fehler"
     IDS_QUICKHELP "Schnellhilfe"
+END
+
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "ReactOS Rechner"
+    IDS_AUTHOR "Geschrieben von Carlo Bramini"
 END
 
 /* Konversionstypen */

Modified: trunk/reactos/base/applications/calc/lang/el-GR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/el-GR.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/el-GR.rc	[iso-8859-1] Tue May 31 08:04:18
2016
@@ -290,22 +290,6 @@
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Σχετικά..."
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "Αριθμομηχανή", IDC_STATIC, 120, 12, 132, 8,
SS_CENTERIMAGE
-    LTEXT "Έκδοση ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Από τον Carlo Bramini", IDC_STATIC, 120, 32, 132, 8,
SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Statistics box"
@@ -413,9 +397,15 @@
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "ReactOS Calc is free software released under GNU GPL
license.\r\n\r\nYou can get a copy of GNU GPL license
here:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nYou can also get a translation of GNU
GPL license here:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Σφάλμα"
     IDS_QUICKHELP "Quick help"
+END
+
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "Αριθμομηχανή"
+    IDS_AUTHOR "Από τον Carlo Bramini"
 END
 
 /* Types of conversion */

Modified: trunk/reactos/base/applications/calc/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/en-US.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/en-US.rc	[iso-8859-1] Tue May 31 08:04:18
2016
@@ -290,22 +290,6 @@
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "About ReactOS Calc"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "ReactOS Calculator", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Version ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Written by Carlo Bramini", IDC_STATIC, 120, 32, 132, 8,
SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Statistics box"
@@ -413,9 +397,15 @@
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "ReactOS Calc is free software released under GNU GPL
license.\r\n\r\nYou can get a copy of GNU GPL license
here:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nYou can also get a translation of GNU
GPL license here:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Error"
     IDS_QUICKHELP "Quick help"
+END
+
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "ReactOS Calculator"
+    IDS_AUTHOR "Written by Carlo Bramini"
 END
 
 /* Types of conversion */

Modified: trunk/reactos/base/applications/calc/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/es-ES.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/es-ES.rc	[iso-8859-1] Tue May 31 08:04:18
2016
@@ -296,22 +296,6 @@
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Acerca de la Calculadora de ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "Aceptar", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "Calculadora de ReactOS", IDC_STATIC, 120, 12, 132, 8,
SS_CENTERIMAGE
-    LTEXT "Versión ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Creada por Carlo Bramini", IDC_STATIC, 120, 32, 132, 8,
SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Cuadro de estadísticas"
@@ -419,16 +403,15 @@
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "La Calculadora de ReactOS es software libre realizado bajo
licencia GNU GPL.\r\n\
-	\r\n\
-	Puedes obtener una copia de la licencia GNU GPL aquí:\r\n\
-	http://www.gnu.org/licenses/gpl.html\r\n\
-	\r\n\
-	También puedes obtener una traducción de la licencia GNU GPL aquí:\r\n\
-	http://www.gnu.org/licenses/translations.html"
-	
     IDS_MATH_ERROR "Error"
     IDS_QUICKHELP "Ayuda rápida"
+END
+
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "Calculadora de ReactOS"
+    IDS_AUTHOR "Creada por Carlo Bramini"
 END
 
 /* Types of conversion */

Modified: trunk/reactos/base/applications/calc/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/fr-FR.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/fr-FR.rc	[iso-8859-1] Tue May 31 08:04:18
2016
@@ -290,22 +290,6 @@
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "À propos de la Calculatrice ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "Calculatrice ReactOS", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Version ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "par Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Statistiques"
@@ -413,9 +397,15 @@
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "Calculatrice ReactOS est un logiciel libre distribué sous
licence GNU GPL.\r\n\r\nVous pouvez obtenir une copie de la licence GNU GPL
ici:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nVous pouvez aussi obtenir une
traduction de la licence GNU GPL
ici:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Erreur"
     IDS_QUICKHELP "Aide rapide"
+END
+
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "Calculatrice ReactOS"
+    IDS_AUTHOR "par Carlo Bramini"
 END
 
 /* Types of conversion */

Modified: trunk/reactos/base/applications/calc/lang/he-IL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/he-IL.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/he-IL.rc	[iso-8859-1] Tue May 31 08:04:18
2016
@@ -292,22 +292,6 @@
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "אודות המחשבון ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "אישור", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "מחשבון ReactOS", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "גירסה ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "× ×›×ª×‘×” על ידי Carlo Bramini", IDC_STATIC, 120, 32, 132, 8,
SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "תיבת סטטיסטיקה"
@@ -415,9 +399,15 @@
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "ReactOS Calc is free software released under GNU GPL
license.\r\n\r\nYou can get a copy of GNU GPL license
here:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nYou can also get a translation of GNU
GPL license here:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "שגיאה"
     IDS_QUICKHELP "עזרה מהירה"
+END
+
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "מחשבון ReactOS"
+    IDS_AUTHOR "× ×›×ª×‘×” על ידי Carlo Bramini"
 END
 
 /* Types of conversion */

Modified: trunk/reactos/base/applications/calc/lang/hu-HU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/hu-HU.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/hu-HU.rc	[iso-8859-1] Tue May 31 08:04:18
2016
@@ -298,22 +298,6 @@
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "A ReactOS Számológépről"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "ReactOS Számológép", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Verzió ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Írta Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Statisztika"
@@ -421,9 +405,15 @@
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "A ReactOS Számológép a GNU GPL licenc alatt kiadott
szabad szoftver.\r\n\r\nA GNU GPL licenc egy másolatát innen szerezheted
be:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nValamint a GNU GPL licenc fordítását
innen szerezheted be:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Hiba"
     IDS_QUICKHELP "Gyors súgó"
+END
+
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "ReactOS Számológép"
+    IDS_AUTHOR "Írta Carlo Bramini"
 END
 
 /* Types of conversion */

Modified: trunk/reactos/base/applications/calc/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/it-IT.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/it-IT.rc	[iso-8859-1] Tue May 31 08:04:18
2016
@@ -290,22 +290,6 @@
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Informazioni su ReactOS Calc"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "Calcolatrice ReactOS", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Versione ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Scritto da Carlo Bramini", IDC_STATIC, 120, 32, 132, 8,
SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Finestra di statistica"
@@ -413,9 +397,15 @@
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "ReactOS Calc e` software libero rilasciato sotto licenza GNU
GPL.\r\n\r\nE` possibile ottenere una copia del testo della licenza GNU GPL
all'indirizzo:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nE` possibile ottenere
una traduzione del testo della licenza GNU GPL
all'indirizzo:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Errore"
     IDS_QUICKHELP "Guida rapida"
+END
+
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "Calcolatrice ReactOS"
+    IDS_AUTHOR "Scritto da Carlo Bramini"
 END
 
 /* Categorie per le conversioni */

Modified: trunk/reactos/base/applications/calc/lang/ja-JP.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/ja-JP.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/ja-JP.rc	[iso-8859-1] Tue May 31 08:04:18
2016
@@ -290,22 +290,6 @@
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS 電卓について"
-FONT 9, "MS UI Gothic"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "ReactOS 電卓", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Version ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Written by Carlo Bramini", IDC_STATIC, 120, 32, 132, 8,
SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Statistics box"
@@ -413,9 +397,15 @@
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "ReactOS 電卓はGNU GPLライセンスの元で提供されるフリーソフトウェアです。\r\n\r\nこちらでGNU
GPLライセンスのコピーを得ることができます:\r\nhttp://www…
GPLライセンスの翻訳を得ることができます:\r\nhttp://www.gn…
     IDS_MATH_ERROR "エラー"
     IDS_QUICKHELP "クイックヘルプ"
+END
+
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "ReactOS 電卓"
+    IDS_AUTHOR "Written by Carlo Bramini"
 END
 
 /* Types of conversion */

Modified: trunk/reactos/base/applications/calc/lang/ko-KR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/ko-KR.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/ko-KR.rc	[iso-8859-1] Tue May 31 08:04:18
2016
@@ -292,22 +292,6 @@
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS 계산기 ì •ë³´"
-FONT 9, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "ReactOS 계산기", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "ë²„ì ¼ ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Carlo Bramini에 의해 쓰여짐", IDC_STATIC, 120, 32, 132, 8,
SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Statistics box"
@@ -415,9 +399,15 @@
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "ReactOS Calc is free software released under GNU GPL
license.\r\n\r\nYou can get a copy of GNU GPL license
here:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nYou can also get a translation of GNU
GPL license here:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "에러"
     IDS_QUICKHELP "ë¹ ë¥¸ 도움말"
+END
+
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "ReactOS 계산기"
+    IDS_AUTHOR "Carlo Bramini에 의해 쓰여짐"
 END
 
 /* Types of conversion */

Modified: trunk/reactos/base/applications/calc/lang/nl-NL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/nl-NL.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/nl-NL.rc	[iso-8859-1] Tue May 31 08:04:18
2016
@@ -290,22 +290,6 @@
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Over ReactOS Rekenmachine"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "ReactOS Rekenmachine", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Versie", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Geschreven door: Carlo Bramini", IDC_STATIC, 120, 32, 132, 8,
SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Statistiek-venster"
@@ -413,9 +397,15 @@
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "De ReactOS Rekenmachine is free software gepubliceerd onder
de GNU GPL licentie.\r\n\r\nU kan een kopie van GNU GPL licentie hier
bezichtigen:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nU kan ook een vertaling van de
GNU GPL licentie hier bezichtigen:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Fout"
     IDS_QUICKHELP "Snelle hulp"
+END
+
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "ReactOS Rekenmachine"
+    IDS_AUTHOR "Geschreven door: Carlo Bramini"
 END
 
 /* Types of conversion */

Modified: trunk/reactos/base/applications/calc/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/no-NO.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/no-NO.rc	[iso-8859-1] Tue May 31 08:04:18
2016
@@ -290,22 +290,6 @@
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Om ReactOS Kalkulator"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "ReactOS Kalkulator", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Versjon ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Laget av Carlo Bramini", IDC_STATIC, 120, 32, 132, 8,
SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "statistikk boks"
@@ -413,9 +397,15 @@
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "ReactOS Kalkulator er gratis programvare utgitt under GNU
GPL lisensen.\r\n\r\nDu kan få en kopi av GNU GPL lisensen
her:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nDu kan også få en oversettelse av
GNU GPL lisensen her:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Feil"
     IDS_QUICKHELP "Rask hjelp"
+END
+
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "ReactOS Kalkulator"
+    IDS_AUTHOR "Laget av Carlo Bramini"
 END
 
 /* Types of conversion */

Modified: trunk/reactos/base/applications/calc/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/pl-PL.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/pl-PL.rc	[iso-8859-1] Tue May 31 08:04:18
2016
@@ -299,22 +299,6 @@
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "O Kalkulatorze ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "Kalkulator ReactOS", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Wersja ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Autorstwa: Carlo Bramini", IDC_STATIC, 120, 32, 132, 8,
SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Statystyka"
@@ -422,9 +406,15 @@
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "Kalkulator ReactOS jest darmowym programem, publikowanym
zgodnie z licencją GNU GPL.\r\n\r\nMożesz otrzymać kopię licencji GNU GPL
tutaj:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nTłumaczenie licencji GNU GPL
znajdziesz tutaj:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Błąd"
     IDS_QUICKHELP "Szybka pomoc"
+END
+
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "Kalkulator ReactOS"
+    IDS_AUTHOR "Autorstwa: Carlo Bramini"
 END
 
 /* Types of conversion */

Modified: trunk/reactos/base/applications/calc/lang/pt-BR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/pt-BR.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/pt-BR.rc	[iso-8859-1] Tue May 31 08:04:18
2016
@@ -292,22 +292,6 @@
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Sobre Calc ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "Calcuadora ReactOS", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Versão ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Escrita por Carlo Bramini", IDC_STATIC, 120, 32, 132, 8,
SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Caixa de estatísticas"
@@ -415,9 +399,15 @@
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "Calculadora ReactOS é um software livre lançado sobre a
licença GNU GPL.\r\nVocê pode adquirir uma cópia da licença GNU GPL no endereço
abaixo:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nVocê também pode adquirir uma
tradução da licença GNU GPL no endereço
abaixo:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Erro"
     IDS_QUICKHELP "Ajuda rápida"
+END
+
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "Calcuadora ReactOS"
+    IDS_AUTHOR "Escrita por Carlo Bramini"
 END
 
 /* Types of conversion */

Modified: trunk/reactos/base/applications/calc/lang/ro-RO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/ro-RO.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/ro-RO.rc	[iso-8859-1] Tue May 31 08:04:18
2016
@@ -295,22 +295,6 @@
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Despre Minicalculator"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "Î&nchide", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "Minicalculator ReactOS", IDC_STATIC, 120, 12, 132, 8,
SS_CENTERIMAGE
-    LTEXT "Versiune ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Scris de Carlo Bramini", IDC_STATIC, 120, 32, 132, 8,
SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Statistici"
@@ -418,9 +402,15 @@
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "Această aplicație este publică; fiind permisă
modificarea și/sau (re)distribuția sa în termenii Licenței Publice Generale GNU
publicată de Free Software Foundation; sau versiunea 2 a Licenței, sau (la alegere) a
oricărei versiuni ulterioare.\r\n\r\nAceastă aplicație este distribuită doar în
speranța de a fi utilă, FĂRĂ însă NICI O GARANȚIE; nici măcar cu garanția
implicită a VANDABILITĂȚII sau a UTILITĂȚII ÎNTR-UN SCOP ANUME. Pentru mai multe
detalii consultați Licența Publică Generală GNU.\r\n\r\nPuteți vedea această
licență aici:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nDe asemenea puteți
consulta traduceri neoficiale ale acestei licențe
aici:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Eroare"
     IDS_QUICKHELP "Manual"
+END
+
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "Minicalculator ReactOS"
+    IDS_AUTHOR "Scris de Carlo Bramini"
 END
 
 /* Types of conversion */

Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/ru-RU.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/ru-RU.rc	[iso-8859-1] Tue May 31 08:04:18
2016
@@ -290,22 +290,6 @@
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "О программе"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "Калькулятор ReactOS", IDC_STATIC, 120, 12, 132, 8,
SS_CENTERIMAGE
-    LTEXT "Версия ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Автор: Карло Брамини", IDC_STATIC, 120, 32, 132, 8,
SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Статистика"
@@ -413,9 +397,15 @@
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "Калькулятор ReactOS - свободное
программное обеспечение, распространяющееся по
лицензии GNU GPL.\r\n\r\nВы можете получить копию
лицензии GNU GPL
здесь:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nОзнакоми… c
переводом лицензии GNU GPL можно
здесь:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Ошибка"
     IDS_QUICKHELP "Быстрая справка"
+END
+
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "Калькулятор ReactOS"
+    IDS_AUTHOR "Автор: Карло Брамини"
 END
 
 /* Types of conversion */

Modified: trunk/reactos/base/applications/calc/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/sk-SK.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/sk-SK.rc	[iso-8859-1] Tue May 31 08:04:18
2016
@@ -297,22 +297,6 @@
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Čo je kalkulačka systému ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "Kalkulačka systému ReactOS", IDC_STATIC, 120, 12, 132, 8,
SS_CENTERIMAGE
-    LTEXT "Verzia ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Napísal Carlo Bramini", IDC_STATIC, 120, 32, 132, 8,
SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Å tatistika"
@@ -420,9 +404,15 @@
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "Kalkulačka systému ReactOS je voľný softvér vydaný pod
licenciou GNU GPL.\r\n\r\nKópiu licencie GNU GPL môžete získať
tu:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nRovnako môžete získať preklad
licencie GNU GPL tu:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Chyba"
     IDS_QUICKHELP "Rýchla pomoc"
+END
+
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "Kalkulačka systému ReactOS"
+    IDS_AUTHOR "Napísal Carlo Bramini"
 END
 
 /* Types of conversion */

Modified: trunk/reactos/base/applications/calc/lang/sq-AL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/sq-AL.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/sq-AL.rc	[iso-8859-1] Tue May 31 08:04:18
2016
@@ -294,22 +294,6 @@
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Informacione mbi Makine Llogaritje ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "ReactOS Makine Llogaritje", IDC_STATIC, 120, 12, 132, 8,
SS_CENTERIMAGE
-    LTEXT "Versioni ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "krijuar nga Carlo Bramini", IDC_STATIC, 120, 32, 132, 8,
SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Kutia e Statistikave"
@@ -417,9 +401,15 @@
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "Makina Llogaritese ReactOS eshte program falas i lanquar nen
liçensen GNU GPL.\r\n\r\nJu mund te merrni nje kopje te liçenses se GNU CPL
ketu:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nJu gjithashtu mund te merrni e
liçenses se GNU GPL ketu:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Error"
     IDS_QUICKHELP "Ndihmë e shpejtë"
+END
+
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "ReactOS Makine Llogaritje"
+    IDS_AUTHOR "krijuar nga Carlo Bramini"
 END
 
 /* Types of conversion */

Modified: trunk/reactos/base/applications/calc/lang/sv-SE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/sv-SE.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/sv-SE.rc	[iso-8859-1] Tue May 31 08:04:18
2016
@@ -297,22 +297,6 @@
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Om ReactOS Kalkylator"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "ReactOS Kalkylator", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Version ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Skriven av Carlo Bramini, Övers.: Jaix Bly", IDC_STATIC, 120, 32,
132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Statistik box"
@@ -420,9 +404,15 @@
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "ReactOS Kalkylator är gratis programvara utgivet under GNU
GPL licensen.\r\n\r\nDu kan få en kopia av GNU GPL licensen
här:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nDu kan också få en översättning
av GNU GPL lisensen här:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Fel"
     IDS_QUICKHELP "Snabb hjälp"
+END
+
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "ReactOS Kalkylator"
+    IDS_AUTHOR "Skriven av Carlo Bramini"
 END
 
 /* Types of conversion */

Modified: trunk/reactos/base/applications/calc/lang/th-TH.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/th-TH.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/th-TH.rc	[iso-8859-1] Tue May 31 08:04:18
2016
@@ -290,22 +290,6 @@
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "เกี่ยวกับ ReactOS Calc"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "ตกลง", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "เครื่องคิดเลข ReactOS", IDC_STATIC, 120,
12, 132, 8, SS_CENTERIMAGE
-    LTEXT "รุ่น ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Written by Carlo Bramini", IDC_STATIC, 120, 32, 132, 8,
SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "กล่องสถานะ"
@@ -413,9 +397,15 @@
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "ReactOS Calc is free software released under GNU GPL
license.\r\n\r\nYou can get a copy of GNU GPL license
here:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nYou can also get a translation of GNU
GPL license here:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "ผิดพลาด"
     IDS_QUICKHELP "สิ่งนี้คืออะไร ?"
+END
+
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "เครื่องคิดเลข ReactOS"
+    IDS_AUTHOR "Written by Carlo Bramini"
 END
 
 /* Types of conversion */

Modified: trunk/reactos/base/applications/calc/lang/tr-TR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/tr-TR.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/tr-TR.rc	[iso-8859-1] Tue May 31 08:04:18
2016
@@ -292,22 +292,6 @@
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Hesap Makinesi Üzerine"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "Tamam", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "Hesap Makinesi", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Sürüm: ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Carlo Bramini eliyle yapılmıştır.", IDC_STATIC, 120, 32, 132, 8,
SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Sayımlama Penceresi"
@@ -415,9 +399,15 @@
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "Hesap Makinesi, GNU GPL ruhsatıyla yayımlanan bir özgür
yazılımdır.\r\n\r\nGNU GPL ruhsatının bir kopyasını şuradan elde
edebilirsiniz:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nBir de GNU GPL ruhsatının
bir çevirisini şuradan elde
edebilirsiniz:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Yanlışlık"
     IDS_QUICKHELP "Hızlı Yardım"
+END
+
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "Hesap Makinesi"
+    IDS_AUTHOR "Carlo Bramini eliyle yapılmıştır."
 END
 
 /* Types of conversion */

Modified: trunk/reactos/base/applications/calc/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/uk-UA.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/uk-UA.rc	[iso-8859-1] Tue May 31 08:04:18
2016
@@ -298,22 +298,6 @@
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Про Калькулятор ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "Калькулятор ReactOS", IDC_STATIC, 120, 12, 132, 8,
SS_CENTERIMAGE
-    LTEXT "Версія ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Написав Карло Браміні", IDC_STATIC, 120, 32, 132,
8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Статистика"
@@ -421,9 +405,15 @@
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "Калькулятор ReactOS - вільне
програмне забезпечення, випущене за ліцензією GNU
GPL.\r\n\r\nВи можете отримати копію ліцензії GNU GPL
тут:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nВи можете також
отримати переклад ліцензії GNU GPL
тут:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Помилка"
     IDS_QUICKHELP "Швидка довідка"
+END
+
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "Калькулятор ReactOS"
+    IDS_AUTHOR "Написав Карло Браміні"
 END
 
 /* Types of conversion */

Modified: trunk/reactos/base/applications/calc/lang/zh-CN.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
==============================================================================
--- trunk/reactos/base/applications/calc/lang/zh-CN.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/lang/zh-CN.rc	[iso-8859-1] Tue May 31 08:04:18
2016
@@ -292,22 +292,6 @@
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "关于 ReactOS 计算器"
-FONT 9, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "确定", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "ReactOS 计算器", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "版本 ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "作者 Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "统计框"
@@ -415,9 +399,15 @@
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "ReactOS 计算器是在 GNU GPL
协议下发行的自由软件。\r\n\r\nä½ å¯ä»¥ä»Žè¿™å„¿å–å¾—ä¸€ä»½ GNU GPL
协议的副本：\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nä½ ä¹Ÿå¯ä»¥ä»Žè¿™å„¿å–å¾—å…¶ç¿»è¯‘ï¼š\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "错误"
     IDS_QUICKHELP "快速帮助"
+END
+
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "ReactOS 计算器"
+    IDS_AUTHOR "作者 Carlo Bramini"
 END
 
 /* Types of conversion */

Removed: trunk/reactos/base/applications/calc/res/ROS_logo.bmp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res…
==============================================================================
Binary file - no diff available.

Modified: trunk/reactos/base/applications/calc/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res…
==============================================================================
--- trunk/reactos/base/applications/calc/resource.h	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/resource.h	[iso-8859-1] Tue May 31 08:04:18 2016
@@ -1,17 +1,16 @@
 #pragma once
 
-#define IDS_STRING_LICENSE    1
+#define IDS_CALC_NAME         1
 #define IDS_MATH_ERROR        2
 #define IDS_QUICKHELP         3
+#define IDS_AUTHOR            4
 #define IDD_DIALOG_SCIENTIFIC 101
 #define IDD_DIALOG_STANDARD   102
-#define IDD_DIALOG_ABOUT      103
 #define IDD_DIALOG_STAT       104
 #define IDD_DIALOG_CONVERSION 105
 #define IDR_MENU_SCIENTIFIC_1 106
 #define IDR_MENU_SCIENTIFIC_2 107
 #define IDR_MENU_STANDARD     108
-#define IDB_BITMAP_ROS        109
 #define IDI_CALC_BIG          110
 #define IDI_CALC_SMALL        111
 #define IDC_RADIO_HEX         1002
@@ -88,7 +87,6 @@
 #define IDC_TEXT_OUTPUT       1074
 #define IDC_TEXT_PARENT       1075
 #define IDC_TEXT_MEMORY       1076
-#define IDC_EDIT_LICENSE      1078
 #define IDC_LIST_STAT         1079
 #define IDC_BUTTON_RET        1080
 #define IDC_BUTTON_LOAD       1081
@@ -98,7 +96,6 @@
 #define IDC_BUTTON_SQRT       1085
 #define IDC_BUTTON_PERCENT    1086
 #define IDC_BUTTON_CONVERT    1087
-#define IDC_TEXT_VERSION      1088
 #define IDC_BUTTON_FOCUS      1089
 #define IDC_COMBO_CATEGORY    1090
 #define IDC_COMBO_FROM        1091

Modified: trunk/reactos/base/applications/calc/resource.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res…
==============================================================================
--- trunk/reactos/base/applications/calc/resource.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/resource.rc	[iso-8859-1] Tue May 31 08:04:18
2016
@@ -21,9 +21,6 @@
 /* Icons */
 IDI_CALC_BIG ICON "res/calc.ico"
 IDI_CALC_SMALL ICON "res/calc_sm.ico"
-
-/* Bitmaps */
-IDB_BITMAP_ROS BITMAP "res/ROS_logo.bmp"
 
 #include <reactos/manifest_exe.rc>
 

Modified: trunk/reactos/base/applications/calc/winmain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/win…
==============================================================================
--- trunk/reactos/base/applications/calc/winmain.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/winmain.c	[iso-8859-1] Tue May 31 08:04:18 2016
@@ -3,6 +3,7 @@
 #include <winbase.h>
 #include <wingdi.h>
 #include <winreg.h>
+#include <shellapi.h>
 
 #define HTMLHELP_PATH(_pt)  TEXT("%systemroot%\\Help\\calc.chm::") TEXT(_pt)
 
@@ -1338,8 +1339,14 @@
             SetFocus(GetDlgItem(hWnd, IDC_BUTTON_FOCUS));
         switch (LOWORD(wp)) {
         case IDM_HELP_ABOUT:
-            DialogBox(calc.hInstance,MAKEINTRESOURCE(IDD_DIALOG_ABOUT), hWnd,
AboutDlgProc);
-            return TRUE;
+        {
+            TCHAR infotitle[100];
+            TCHAR infotext[200];
+            LoadString(calc.hInstance, IDS_CALC_NAME, infotitle, SIZEOF(infotitle));
+            LoadString(calc.hInstance, IDS_AUTHOR, infotext, SIZEOF(infotext));
+            ShellAbout(hWnd, infotitle, infotext, (HICON)LoadIcon(calc.hInstance,
MAKEINTRESOURCE(IDI_CALC_BIG)));
+            return TRUE;
+        }
         case IDM_HELP_HELP:
 #ifndef DISABLE_HTMLHELP_SUPPORT
             HtmlHelp(hWnd, HTMLHELP_PATH("/general_information.htm"),
HH_DISPLAY_TOPIC, (DWORD_PTR)NULL);