From bf3287e7fea2e8dc862570f57c76374ecca9148c Mon Sep 17 00:00:00 2001 From: Robert Naumann Date: Tue, 31 May 2016 08:04:18 +0000 Subject: [PATCH] [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 svn path=/trunk/; revision=71466 --- reactos/base/applications/calc/CMakeLists.txt | 3 +- reactos/base/applications/calc/about.c | 33 ------------------ reactos/base/applications/calc/calc.h | 2 -- reactos/base/applications/calc/lang/bg-BG.rc | 24 ++++--------- reactos/base/applications/calc/lang/cs-CZ.rc | 24 ++++--------- reactos/base/applications/calc/lang/de-DE.rc | 24 ++++--------- reactos/base/applications/calc/lang/el-GR.rc | 24 ++++--------- reactos/base/applications/calc/lang/en-US.rc | 24 ++++--------- reactos/base/applications/calc/lang/es-ES.rc | 31 ++++------------ reactos/base/applications/calc/lang/fr-FR.rc | 24 ++++--------- reactos/base/applications/calc/lang/he-IL.rc | 24 ++++--------- reactos/base/applications/calc/lang/hu-HU.rc | 24 ++++--------- reactos/base/applications/calc/lang/it-IT.rc | 24 ++++--------- reactos/base/applications/calc/lang/ja-JP.rc | 24 ++++--------- reactos/base/applications/calc/lang/ko-KR.rc | 24 ++++--------- reactos/base/applications/calc/lang/nl-NL.rc | 24 ++++--------- reactos/base/applications/calc/lang/no-NO.rc | 24 ++++--------- reactos/base/applications/calc/lang/pl-PL.rc | 24 ++++--------- reactos/base/applications/calc/lang/pt-BR.rc | 24 ++++--------- reactos/base/applications/calc/lang/ro-RO.rc | 24 ++++--------- reactos/base/applications/calc/lang/ru-RU.rc | 24 ++++--------- reactos/base/applications/calc/lang/sk-SK.rc | 24 ++++--------- reactos/base/applications/calc/lang/sq-AL.rc | 24 ++++--------- reactos/base/applications/calc/lang/sv-SE.rc | 24 ++++--------- reactos/base/applications/calc/lang/th-TH.rc | 24 ++++--------- reactos/base/applications/calc/lang/tr-TR.rc | 24 ++++--------- reactos/base/applications/calc/lang/uk-UA.rc | 24 ++++--------- reactos/base/applications/calc/lang/zh-CN.rc | 24 ++++--------- .../base/applications/calc/res/ROS_logo.bmp | Bin 10166 -> 0 bytes reactos/base/applications/calc/resource.h | 7 ++-- reactos/base/applications/calc/resource.rc | 3 -- reactos/base/applications/calc/winmain.c | 9 ++++- 32 files changed, 186 insertions(+), 478 deletions(-) delete mode 100644 reactos/base/applications/calc/about.c delete mode 100644 reactos/base/applications/calc/res/ROS_logo.bmp diff --git a/reactos/base/applications/calc/CMakeLists.txt b/reactos/base/applications/calc/CMakeLists.txt index 04899dbeb80..d04e5ac3c06 100644 --- a/reactos/base/applications/calc/CMakeLists.txt +++ b/reactos/base/applications/calc/CMakeLists.txt @@ -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 @@ file(GLOB calc_rc_deps res/*.*) 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) diff --git a/reactos/base/applications/calc/about.c b/reactos/base/applications/calc/about.c deleted file mode 100644 index ae9b386c1f7..00000000000 --- a/reactos/base/applications/calc/about.c +++ /dev/null @@ -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; -} - diff --git a/reactos/base/applications/calc/calc.h b/reactos/base/applications/calc/calc.h index 64ee624cbc7..d1f23a2811d 100644 --- a/reactos/base/applications/calc/calc.h +++ b/reactos/base/applications/calc/calc.h @@ -41,8 +41,6 @@ #define IDC_STATIC ((DWORD)-1) #endif -#define CALC_VERSION TEXT("1.11") - #define MAX_CALC_SIZE 256 /*#define USE_KEYBOARD_HOOK*/ diff --git a/reactos/base/applications/calc/lang/bg-BG.rc b/reactos/base/applications/calc/lang/bg-BG.rc index 0c07c6c439d..926b2a94df4 100644 --- a/reactos/base/applications/calc/lang/bg-BG.rc +++ b/reactos/base/applications/calc/lang/bg-BG.rc @@ -296,22 +296,6 @@ BEGIN 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,11 +403,17 @@ END 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 */ STRINGTABLE BEGIN diff --git a/reactos/base/applications/calc/lang/cs-CZ.rc b/reactos/base/applications/calc/lang/cs-CZ.rc index 7b0031ad100..1f82002b75b 100644 --- a/reactos/base/applications/calc/lang/cs-CZ.rc +++ b/reactos/base/applications/calc/lang/cs-CZ.rc @@ -295,22 +295,6 @@ BEGIN 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,11 +402,17 @@ END 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 */ STRINGTABLE BEGIN diff --git a/reactos/base/applications/calc/lang/de-DE.rc b/reactos/base/applications/calc/lang/de-DE.rc index 5a9149bd955..20aa8e7b130 100644 --- a/reactos/base/applications/calc/lang/de-DE.rc +++ b/reactos/base/applications/calc/lang/de-DE.rc @@ -290,22 +290,6 @@ BEGIN 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,11 +397,17 @@ END 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 */ STRINGTABLE BEGIN diff --git a/reactos/base/applications/calc/lang/el-GR.rc b/reactos/base/applications/calc/lang/el-GR.rc index ba7b6975460..61959aebb71 100644 --- a/reactos/base/applications/calc/lang/el-GR.rc +++ b/reactos/base/applications/calc/lang/el-GR.rc @@ -290,22 +290,6 @@ BEGIN 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,11 +397,17 @@ END 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 */ STRINGTABLE BEGIN diff --git a/reactos/base/applications/calc/lang/en-US.rc b/reactos/base/applications/calc/lang/en-US.rc index ad2b1dabd69..bfcbb118f1e 100644 --- a/reactos/base/applications/calc/lang/en-US.rc +++ b/reactos/base/applications/calc/lang/en-US.rc @@ -290,22 +290,6 @@ BEGIN 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,11 +397,17 @@ END 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 */ STRINGTABLE BEGIN diff --git a/reactos/base/applications/calc/lang/es-ES.rc b/reactos/base/applications/calc/lang/es-ES.rc index 326483f77d8..ace76e9af33 100644 --- a/reactos/base/applications/calc/lang/es-ES.rc +++ b/reactos/base/applications/calc/lang/es-ES.rc @@ -296,22 +296,6 @@ BEGIN 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,18 +403,17 @@ END 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 */ STRINGTABLE BEGIN diff --git a/reactos/base/applications/calc/lang/fr-FR.rc b/reactos/base/applications/calc/lang/fr-FR.rc index 97ab52bf51a..586d95f4807 100644 --- a/reactos/base/applications/calc/lang/fr-FR.rc +++ b/reactos/base/applications/calc/lang/fr-FR.rc @@ -290,22 +290,6 @@ BEGIN 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,11 +397,17 @@ END 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 */ STRINGTABLE BEGIN diff --git a/reactos/base/applications/calc/lang/he-IL.rc b/reactos/base/applications/calc/lang/he-IL.rc index 365232fc7db..6041ad7b282 100644 --- a/reactos/base/applications/calc/lang/he-IL.rc +++ b/reactos/base/applications/calc/lang/he-IL.rc @@ -292,22 +292,6 @@ BEGIN 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,11 +399,17 @@ END 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 */ STRINGTABLE BEGIN diff --git a/reactos/base/applications/calc/lang/hu-HU.rc b/reactos/base/applications/calc/lang/hu-HU.rc index c6182abd68c..7f4f592a13f 100644 --- a/reactos/base/applications/calc/lang/hu-HU.rc +++ b/reactos/base/applications/calc/lang/hu-HU.rc @@ -298,22 +298,6 @@ BEGIN 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,11 +405,17 @@ END 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 */ STRINGTABLE BEGIN diff --git a/reactos/base/applications/calc/lang/it-IT.rc b/reactos/base/applications/calc/lang/it-IT.rc index 4f1a95a2c13..a1cb501bdc9 100644 --- a/reactos/base/applications/calc/lang/it-IT.rc +++ b/reactos/base/applications/calc/lang/it-IT.rc @@ -290,22 +290,6 @@ BEGIN 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,11 +397,17 @@ END 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 */ STRINGTABLE BEGIN diff --git a/reactos/base/applications/calc/lang/ja-JP.rc b/reactos/base/applications/calc/lang/ja-JP.rc index 734760f2215..bf23d6c17e6 100644 --- a/reactos/base/applications/calc/lang/ja-JP.rc +++ b/reactos/base/applications/calc/lang/ja-JP.rc @@ -290,22 +290,6 @@ BEGIN 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,11 +397,17 @@ END 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 "Written by Carlo Bramini" +END + /* Types of conversion */ STRINGTABLE BEGIN diff --git a/reactos/base/applications/calc/lang/ko-KR.rc b/reactos/base/applications/calc/lang/ko-KR.rc index adf598e7f24..29c9ca191f2 100644 --- a/reactos/base/applications/calc/lang/ko-KR.rc +++ b/reactos/base/applications/calc/lang/ko-KR.rc @@ -292,22 +292,6 @@ BEGIN 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,11 +399,17 @@ END 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 */ STRINGTABLE BEGIN diff --git a/reactos/base/applications/calc/lang/nl-NL.rc b/reactos/base/applications/calc/lang/nl-NL.rc index 3b17be99d32..1f64b1aa1a3 100644 --- a/reactos/base/applications/calc/lang/nl-NL.rc +++ b/reactos/base/applications/calc/lang/nl-NL.rc @@ -290,22 +290,6 @@ BEGIN 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,11 +397,17 @@ END 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 */ STRINGTABLE BEGIN diff --git a/reactos/base/applications/calc/lang/no-NO.rc b/reactos/base/applications/calc/lang/no-NO.rc index 9c25dfb6860..51f3fb20f81 100644 --- a/reactos/base/applications/calc/lang/no-NO.rc +++ b/reactos/base/applications/calc/lang/no-NO.rc @@ -290,22 +290,6 @@ BEGIN 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,11 +397,17 @@ END 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 */ STRINGTABLE BEGIN diff --git a/reactos/base/applications/calc/lang/pl-PL.rc b/reactos/base/applications/calc/lang/pl-PL.rc index ee2ebe3ecdf..c6521007b64 100644 --- a/reactos/base/applications/calc/lang/pl-PL.rc +++ b/reactos/base/applications/calc/lang/pl-PL.rc @@ -299,22 +299,6 @@ BEGIN 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,11 +406,17 @@ END 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 */ STRINGTABLE BEGIN diff --git a/reactos/base/applications/calc/lang/pt-BR.rc b/reactos/base/applications/calc/lang/pt-BR.rc index 8a402880c35..b45be846035 100644 --- a/reactos/base/applications/calc/lang/pt-BR.rc +++ b/reactos/base/applications/calc/lang/pt-BR.rc @@ -292,22 +292,6 @@ BEGIN 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,11 +399,17 @@ END 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 */ STRINGTABLE BEGIN diff --git a/reactos/base/applications/calc/lang/ro-RO.rc b/reactos/base/applications/calc/lang/ro-RO.rc index 1f573784912..b4ba38303d4 100644 --- a/reactos/base/applications/calc/lang/ro-RO.rc +++ b/reactos/base/applications/calc/lang/ro-RO.rc @@ -295,22 +295,6 @@ BEGIN 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,11 +402,17 @@ END 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 */ STRINGTABLE BEGIN diff --git a/reactos/base/applications/calc/lang/ru-RU.rc b/reactos/base/applications/calc/lang/ru-RU.rc index 8598a40d245..b310fa1bc8b 100644 --- a/reactos/base/applications/calc/lang/ru-RU.rc +++ b/reactos/base/applications/calc/lang/ru-RU.rc @@ -290,22 +290,6 @@ BEGIN 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,11 +397,17 @@ END 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 */ STRINGTABLE BEGIN diff --git a/reactos/base/applications/calc/lang/sk-SK.rc b/reactos/base/applications/calc/lang/sk-SK.rc index 0a6d8ea7a40..2a4a77b1247 100644 --- a/reactos/base/applications/calc/lang/sk-SK.rc +++ b/reactos/base/applications/calc/lang/sk-SK.rc @@ -297,22 +297,6 @@ BEGIN 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,11 +404,17 @@ END 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 */ STRINGTABLE BEGIN diff --git a/reactos/base/applications/calc/lang/sq-AL.rc b/reactos/base/applications/calc/lang/sq-AL.rc index 64cc8d3c924..c9e1c5f5a87 100644 --- a/reactos/base/applications/calc/lang/sq-AL.rc +++ b/reactos/base/applications/calc/lang/sq-AL.rc @@ -294,22 +294,6 @@ BEGIN 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,11 +401,17 @@ END 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 */ STRINGTABLE BEGIN diff --git a/reactos/base/applications/calc/lang/sv-SE.rc b/reactos/base/applications/calc/lang/sv-SE.rc index 600b440c53b..269cd01995b 100644 --- a/reactos/base/applications/calc/lang/sv-SE.rc +++ b/reactos/base/applications/calc/lang/sv-SE.rc @@ -297,22 +297,6 @@ BEGIN 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,11 +404,17 @@ END 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 */ STRINGTABLE BEGIN diff --git a/reactos/base/applications/calc/lang/th-TH.rc b/reactos/base/applications/calc/lang/th-TH.rc index a2457d61500..73e1f6a53df 100644 --- a/reactos/base/applications/calc/lang/th-TH.rc +++ b/reactos/base/applications/calc/lang/th-TH.rc @@ -290,22 +290,6 @@ BEGIN 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,11 +397,17 @@ END 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 */ STRINGTABLE BEGIN diff --git a/reactos/base/applications/calc/lang/tr-TR.rc b/reactos/base/applications/calc/lang/tr-TR.rc index a41414853fa..a13381933ca 100644 --- a/reactos/base/applications/calc/lang/tr-TR.rc +++ b/reactos/base/applications/calc/lang/tr-TR.rc @@ -292,22 +292,6 @@ BEGIN 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,11 +399,17 @@ END 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 */ STRINGTABLE BEGIN diff --git a/reactos/base/applications/calc/lang/uk-UA.rc b/reactos/base/applications/calc/lang/uk-UA.rc index 5eaaad20846..310055d6caf 100644 --- a/reactos/base/applications/calc/lang/uk-UA.rc +++ b/reactos/base/applications/calc/lang/uk-UA.rc @@ -298,22 +298,6 @@ BEGIN 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,11 +405,17 @@ END 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 */ STRINGTABLE BEGIN diff --git a/reactos/base/applications/calc/lang/zh-CN.rc b/reactos/base/applications/calc/lang/zh-CN.rc index b24dcb685d8..7d678c4b7e0 100644 --- a/reactos/base/applications/calc/lang/zh-CN.rc +++ b/reactos/base/applications/calc/lang/zh-CN.rc @@ -292,22 +292,6 @@ BEGIN 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,11 +399,17 @@ END 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 */ STRINGTABLE BEGIN diff --git a/reactos/base/applications/calc/res/ROS_logo.bmp b/reactos/base/applications/calc/res/ROS_logo.bmp deleted file mode 100644 index ef21ef99a935d1de1bce71d4568a7953d887478b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10166 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 diff --git a/reactos/base/applications/calc/resource.h b/reactos/base/applications/calc/resource.h index 8f0bb0be553..a1cbadea04d 100644 --- a/reactos/base/applications/calc/resource.h +++ b/reactos/base/applications/calc/resource.h @@ -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 diff --git a/reactos/base/applications/calc/resource.rc b/reactos/base/applications/calc/resource.rc index ce8b9e63b7f..7272276d592 100644 --- a/reactos/base/applications/calc/resource.rc +++ b/reactos/base/applications/calc/resource.rc @@ -22,9 +22,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL 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 /* UTF-8 */ diff --git a/reactos/base/applications/calc/winmain.c b/reactos/base/applications/calc/winmain.c index 5879c1ec985..5382ca77045 100644 --- a/reactos/base/applications/calc/winmain.c +++ b/reactos/base/applications/calc/winmain.c @@ -3,6 +3,7 @@ #include #include #include +#include #define HTMLHELP_PATH(_pt) TEXT("%systemroot%\\Help\\calc.chm::") TEXT(_pt) @@ -1338,8 +1339,14 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) SetFocus(GetDlgItem(hWnd, IDC_BUTTON_FOCUS)); switch (LOWORD(wp)) { case IDM_HELP_ABOUT: - DialogBox(calc.hInstance,MAKEINTRESOURCE(IDD_DIALOG_ABOUT), hWnd, AboutDlgProc); + { + 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);