https://git.reactos.org/?p=reactos.git;a=commitdiff;h=68a4cdd5ec2ae92098ada15ac61dcb0d0e12740c
commit 68a4cdd5ec2ae92098ada15ac61dcb0d0e12740c Author: Stanislav Motylkov <[email protected]> AuthorDate: Sat Aug 11 12:56:08 2018 +0300 Commit: Mark Jansen <[email protected]> CommitDate: Wed Aug 15 19:30:23 2018 +0200 [SYSDM] Use single string control for system version --- dll/cpl/sysdm/general.c | 35 +++++++++++++++++++++++++++++++++++ dll/cpl/sysdm/lang/bg-BG.rc | 3 +-- dll/cpl/sysdm/lang/cs-CZ.rc | 3 +-- dll/cpl/sysdm/lang/da-DK.rc | 3 +-- dll/cpl/sysdm/lang/de-DE.rc | 3 +-- dll/cpl/sysdm/lang/el-GR.rc | 3 +-- dll/cpl/sysdm/lang/en-US.rc | 3 +-- dll/cpl/sysdm/lang/es-ES.rc | 3 +-- dll/cpl/sysdm/lang/fr-FR.rc | 3 +-- dll/cpl/sysdm/lang/he-IL.rc | 3 +-- dll/cpl/sysdm/lang/hu-HU.rc | 3 +-- dll/cpl/sysdm/lang/id-ID.rc | 3 +-- dll/cpl/sysdm/lang/it-IT.rc | 3 +-- dll/cpl/sysdm/lang/ja-JP.rc | 3 +-- dll/cpl/sysdm/lang/nl-NL.rc | 3 +-- dll/cpl/sysdm/lang/no-NO.rc | 3 +-- dll/cpl/sysdm/lang/pl-PL.rc | 3 +-- dll/cpl/sysdm/lang/ro-RO.rc | 1 - dll/cpl/sysdm/lang/ru-RU.rc | 3 +-- dll/cpl/sysdm/lang/sk-SK.rc | 3 +-- dll/cpl/sysdm/lang/sq-AL.rc | 3 +-- dll/cpl/sysdm/lang/sv-SE.rc | 3 +-- dll/cpl/sysdm/lang/tr-TR.rc | 3 +-- dll/cpl/sysdm/lang/uk-UA.rc | 3 +-- dll/cpl/sysdm/lang/zh-CN.rc | 3 +-- dll/cpl/sysdm/lang/zh-TW.rc | 3 +-- dll/cpl/sysdm/resource.h | 1 + 27 files changed, 60 insertions(+), 49 deletions(-) diff --git a/dll/cpl/sysdm/general.c b/dll/cpl/sysdm/general.c index 2d89021d31..15eb70ba6e 100644 --- a/dll/cpl/sysdm/general.c +++ b/dll/cpl/sysdm/general.c @@ -13,6 +13,8 @@ #include <winnls.h> #include <powrprof.h> +#include <buildno.h> +#include <strsafe.h> #define ANIM_STEP 2 #define ANIM_TIME 50 @@ -498,6 +500,38 @@ static VOID GetSystemInformation(HWND hwnd) } } +static VOID GetSystemVersion(HWND hwnd) +{ + HWND hRosVersion; + SIZE_T lenStr, lenVersion; + PCWSTR pwszVersion = L" " TEXT(KERNEL_VERSION_RC); + PWSTR pwszStr; + + lenVersion = wcslen(pwszVersion); + if (lenVersion == 0) + { + return; + } + + hRosVersion = GetDlgItem(hwnd, IDC_ROSVERSION); + if (!hRosVersion) + { + return; + } + lenStr = GetWindowTextLengthW(hRosVersion); + lenStr += lenVersion + 1; + pwszStr = HeapAlloc(GetProcessHeap(), 0, lenStr * sizeof(WCHAR)); + if (!pwszStr) + { + return; + } + GetWindowText(hRosVersion, pwszStr, lenStr); + + StringCchCatW(pwszStr, lenStr, pwszVersion); + SetWindowText(hRosVersion, pwszStr); + + HeapFree(GetProcessHeap(), 0, pwszStr); +} /* Property page dialog callback */ INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) @@ -518,6 +552,7 @@ INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM InitLogo(hwndDlg); SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_ROSIMG), GWLP_WNDPROC, (LONG_PTR)RosImageProc); GetSystemInformation(hwndDlg); + GetSystemVersion(hwndDlg); break; case WM_DESTROY: diff --git a/dll/cpl/sysdm/lang/bg-BG.rc b/dll/cpl/sysdm/lang/bg-BG.rc index c1b4a3a448..f933438d46 100644 --- a/dll/cpl/sysdm/lang/bg-BG.rc +++ b/dll/cpl/sysdm/lang/bg-BG.rc @@ -8,8 +8,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "Уредба:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Версия:", IDC_STATIC, 10, 153, 40, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 45, 153, 91, 9 + LTEXT "Версия:", IDC_ROSVERSION, 10, 153, 131, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Машина:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/cs-CZ.rc b/dll/cpl/sysdm/lang/cs-CZ.rc index cf6b3ff668..297583710c 100644 --- a/dll/cpl/sysdm/lang/cs-CZ.rc +++ b/dll/cpl/sysdm/lang/cs-CZ.rc @@ -13,8 +13,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "Systém:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Verze ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Verze", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Počítač:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/da-DK.rc b/dll/cpl/sysdm/lang/da-DK.rc index ff5f2aa93a..a3e84ed59a 100644 --- a/dll/cpl/sysdm/lang/da-DK.rc +++ b/dll/cpl/sysdm/lang/da-DK.rc @@ -8,8 +8,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "Operativsystem:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Version ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Version", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Machine:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/de-DE.rc b/dll/cpl/sysdm/lang/de-DE.rc index 1dae3d9001..0817e098b8 100644 --- a/dll/cpl/sysdm/lang/de-DE.rc +++ b/dll/cpl/sysdm/lang/de-DE.rc @@ -17,8 +17,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "System:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Version ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Version", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Computer:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/el-GR.rc b/dll/cpl/sysdm/lang/el-GR.rc index cec79e143e..ae329f4603 100644 --- a/dll/cpl/sysdm/lang/el-GR.rc +++ b/dll/cpl/sysdm/lang/el-GR.rc @@ -8,8 +8,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "Σύστημα:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Έκδοση ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Έκδοση", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Υπολογιστής:", IDC_STATIC, 124, 132, 44, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/en-US.rc b/dll/cpl/sysdm/lang/en-US.rc index 22307dae60..73d1f26145 100644 --- a/dll/cpl/sysdm/lang/en-US.rc +++ b/dll/cpl/sysdm/lang/en-US.rc @@ -8,8 +8,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "System:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Version ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Version", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Machine:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/es-ES.rc b/dll/cpl/sysdm/lang/es-ES.rc index e18788a242..8bd8ae7105 100644 --- a/dll/cpl/sysdm/lang/es-ES.rc +++ b/dll/cpl/sysdm/lang/es-ES.rc @@ -10,8 +10,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "Sistema operativo:", IDC_STATIC, 4, 132, 80, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Versión ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Versión", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Equipo:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/fr-FR.rc b/dll/cpl/sysdm/lang/fr-FR.rc index a78be4d8bf..e7aa03aff7 100644 --- a/dll/cpl/sysdm/lang/fr-FR.rc +++ b/dll/cpl/sysdm/lang/fr-FR.rc @@ -8,8 +8,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "Système d'exploitation :", IDC_STATIC, 4, 132, 75, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Version ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Version", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Machine:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/he-IL.rc b/dll/cpl/sysdm/lang/he-IL.rc index d3291b7c41..2ddd54f91a 100644 --- a/dll/cpl/sysdm/lang/he-IL.rc +++ b/dll/cpl/sysdm/lang/he-IL.rc @@ -10,8 +10,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "מערכת:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "גרסה ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "גרסה", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "מכונה:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/hu-HU.rc b/dll/cpl/sysdm/lang/hu-HU.rc index ec2de62ddc..d5c9f9c22c 100644 --- a/dll/cpl/sysdm/lang/hu-HU.rc +++ b/dll/cpl/sysdm/lang/hu-HU.rc @@ -10,8 +10,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "Operációs rendszer:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Verzió ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Verzió", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Számítógép:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/id-ID.rc b/dll/cpl/sysdm/lang/id-ID.rc index 5c1d338e1f..42d092e797 100644 --- a/dll/cpl/sysdm/lang/id-ID.rc +++ b/dll/cpl/sysdm/lang/id-ID.rc @@ -8,8 +8,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "Sistem:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Versi ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Versi", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Mesin:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/it-IT.rc b/dll/cpl/sysdm/lang/it-IT.rc index e0265f9a3d..ebab7b2d0b 100644 --- a/dll/cpl/sysdm/lang/it-IT.rc +++ b/dll/cpl/sysdm/lang/it-IT.rc @@ -8,8 +8,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "Sistema:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Versione ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Versione", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Macchina:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/ja-JP.rc b/dll/cpl/sysdm/lang/ja-JP.rc index fcc78f6644..7c7abd9930 100644 --- a/dll/cpl/sysdm/lang/ja-JP.rc +++ b/dll/cpl/sysdm/lang/ja-JP.rc @@ -8,8 +8,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "システム:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Version ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Version", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "マシン:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/nl-NL.rc b/dll/cpl/sysdm/lang/nl-NL.rc index 56c3d3e3a1..b8198d7b0d 100644 --- a/dll/cpl/sysdm/lang/nl-NL.rc +++ b/dll/cpl/sysdm/lang/nl-NL.rc @@ -8,8 +8,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "Besturingssysteem:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Versie ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Versie", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Machine:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/no-NO.rc b/dll/cpl/sysdm/lang/no-NO.rc index 6d1de0a6ce..6ae0a523cf 100644 --- a/dll/cpl/sysdm/lang/no-NO.rc +++ b/dll/cpl/sysdm/lang/no-NO.rc @@ -8,8 +8,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "System:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Versjon ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Versjon", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Maskin:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/pl-PL.rc b/dll/cpl/sysdm/lang/pl-PL.rc index 09c72722ee..7dbbaf6e7b 100644 --- a/dll/cpl/sysdm/lang/pl-PL.rc +++ b/dll/cpl/sysdm/lang/pl-PL.rc @@ -17,8 +17,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "System:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Wersja ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Wersja", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Komputer:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/ro-RO.rc b/dll/cpl/sysdm/lang/ro-RO.rc index cf26027529..76f7188cbc 100644 --- a/dll/cpl/sysdm/lang/ro-RO.rc +++ b/dll/cpl/sysdm/lang/ro-RO.rc @@ -18,7 +18,6 @@ BEGIN LTEXT "Sistem:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 LTEXT "Versiune", IDC_STATIC, 10, 153, 30, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 40, 153, 91, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Calculator:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/ru-RU.rc b/dll/cpl/sysdm/lang/ru-RU.rc index 99f4b1d312..2ef6146826 100644 --- a/dll/cpl/sysdm/lang/ru-RU.rc +++ b/dll/cpl/sysdm/lang/ru-RU.rc @@ -8,8 +8,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "Операционная система:", IDC_STATIC, 4, 132, 87, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Версия ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Версия", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Компьютер:", IDC_STATIC, 124, 132, 40, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/sk-SK.rc b/dll/cpl/sysdm/lang/sk-SK.rc index fe3afc1e00..ee1b84fa70 100644 --- a/dll/cpl/sysdm/lang/sk-SK.rc +++ b/dll/cpl/sysdm/lang/sk-SK.rc @@ -16,8 +16,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "Systém:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Verzia ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 32, 153, 91, 9 + LTEXT "Verzia", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Počítač:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/sq-AL.rc b/dll/cpl/sysdm/lang/sq-AL.rc index 3324f93128..c42292a335 100644 --- a/dll/cpl/sysdm/lang/sq-AL.rc +++ b/dll/cpl/sysdm/lang/sq-AL.rc @@ -8,8 +8,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "Sistemi:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Versioni", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Versioni", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Makinë:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/sv-SE.rc b/dll/cpl/sysdm/lang/sv-SE.rc index 3adcbaa69c..1c2ce3bf57 100644 --- a/dll/cpl/sysdm/lang/sv-SE.rc +++ b/dll/cpl/sysdm/lang/sv-SE.rc @@ -10,8 +10,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "Operativsystem:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Version ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Version", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Dator:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/tr-TR.rc b/dll/cpl/sysdm/lang/tr-TR.rc index 52f9db671f..f4975a6258 100644 --- a/dll/cpl/sysdm/lang/tr-TR.rc +++ b/dll/cpl/sysdm/lang/tr-TR.rc @@ -10,8 +10,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "Dizge:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Sürüm:", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Sürüm:", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Makine:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/uk-UA.rc b/dll/cpl/sysdm/lang/uk-UA.rc index 3da2ef28e4..5a0677cfbe 100644 --- a/dll/cpl/sysdm/lang/uk-UA.rc +++ b/dll/cpl/sysdm/lang/uk-UA.rc @@ -16,8 +16,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "Операційна система:", IDC_STATIC, 4, 132, 82, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Версія ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Версія", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Комп'ютер:", IDC_STATIC, 124, 132, 36, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc index bad29cec55..3afea5ad8d 100644 --- a/dll/cpl/sysdm/lang/zh-CN.rc +++ b/dll/cpl/sysdm/lang/zh-CN.rc @@ -11,8 +11,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "系统:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "版本 ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "版本", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "计算机:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/zh-TW.rc b/dll/cpl/sysdm/lang/zh-TW.rc index 30e2abca4f..0b0b1c60e9 100644 --- a/dll/cpl/sysdm/lang/zh-TW.rc +++ b/dll/cpl/sysdm/lang/zh-TW.rc @@ -10,8 +10,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "系統:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "版本 ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "版本", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "計算機:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/resource.h b/dll/cpl/sysdm/resource.h index 0a574c2984..f752232bda 100644 --- a/dll/cpl/sysdm/resource.h +++ b/dll/cpl/sysdm/resource.h @@ -59,6 +59,7 @@ #define IDC_LICENCE 106 #define IDC_ROSIMG 107 #define IDC_ROSHOMEPAGE_LINK 108 +#define IDC_ROSVERSION 109 /* Propsheet - hardware */ #define IDD_PROPPAGEHARDWARE 300
