[0.4.13][SYSDM] Restore the general tabs layout and soft localization update

Although the new layout that I committed in the previous commit
was favored by community ratings votes 8:0,
some devs still preferred the old layout with the bigger logo
because they liked the easteregg. So this commit restores
that.

But it syncs to that features latest&greatest implementation
we have in 0.4.15-dev-1685-gd0c237a instead of reverting the
previous commit to not unnecessarily have many bugs with it
that were still affecting the older releases beforehand.

Aside from the general tabs dialogs layout this commit does
also fix some minor issues in the translations for the oldest
branches in pl-PL, jp-JA, zh-CN and zh-TW.

And it fixes an x64 issue in general.c for 0.4.7 and 0.4.8.

diff --git a/boot/bootdata/readme.txt b/boot/bootdata/readme.txt
index cb8d109..cf8353a 100644 (file)
--- a/boot/bootdata/readme.txt
+++ b/boot/bootdata/readme.txt
@@ -1,6 +1,6 @@
 ========================
 ReactOS™ Version 0.4.x
-Updated January 20, 2021
+Updated August 31, 2016
 ========================
 
 1. What is ReactOS?
@@ -70,77 +70,8 @@ In addition, the ReactOS forum: https://reactos.org/forum/ may contain
 complementary, yet non-official, information.
 
 
-8. Authors and Credits
-----------------------
-
-Aleksandar Andrejevic
-Aleksey Bragin
-Alex Ionescu
-Alexander Shaposhnikov
-Amine Khaldi
-Andrew Greenwood
-Andrey Korotaev
-Art Yerkes
-Benedikt Freisen
-Brandon Turner
-Brian Palmer
-Cameron Gutman
-Casper Hornstrup
-Christoph von Wittich
-Colin Finck
-Daniel Reimer
-David Quintana
-David Welch
-Dmitry Chapyshev
-Emanuele Aliberti
-Eric Kohl
-Filip Navara
-Ged Murphy
-Gé van Geldorp
-Giannis Adamopoulos
-Gregor Anich
-Gregor Brunmar
-Gunnar Dalsnes
-Hermès Bélusca-Maïto
-Hervé Poussineau
-Jaix Bly
-James Tabor
-Jason Filby
-Jeffrey Morlan
-Jens Collin
-Jérôme Gardou
-Joachim Henze
-Johannes Anderwald
-Kamil Hornícek
-Katayama Hirofumi MZ
-KJK::Hyperion
-Klemens Friedl
-Maarten Bosma
-Magnus Olsen
-Marc Piulachs
-Mark Jansen
-Martin Fuchs
-Matthias Kupfer
-Michael Wirth
-Mike Nordell
-Mindflyer
-Nathan Woods
-Peter Hater
-Peter Ward
-Pierre Schweitzer
-Rex Jolliff
-Robert Dickenson
-Royce Mitchell III
-Saveliy Tretiakov
-Stanislav Motylkov
-Stefan Ginsberg
-Sylvain Petreolle
-Thomas Blümel
-Thomas Faber
-Timo Kreuzer
-Vadim Galyant
-Vizzini
-Wierd_W
-Z98
-
-Further thanks go to all Contributors and the Wine Team
+8. Authors
+----------
+
+This document was originally written by Jason Filby (jasonfilby@yahoo.com)
+and is now occasionally updated by various contributors.

diff --git a/dll/cpl/sysdm/general.c b/dll/cpl/sysdm/general.c
index df4d416..07b8c41 100644 (file)
--- a/dll/cpl/sysdm/general.c
+++ b/dll/cpl/sysdm/general.c
@@ -16,12 +16,15 @@
 #include <buildno.h>
 #include <strsafe.h>
 
+#define ANIM_STEP 2
+#define ANIM_TIME 50
+
 typedef struct _IMGINFO
 {
     HBITMAP hBitmap;
     INT cxSource;
     INT cySource;
-    INT iPLanes;
+    INT iPlanes;
     INT iBits;
 } IMGINFO, *PIMGINFO;
 
@@ -66,22 +69,22 @@ static VOID InitLogo(HWND hwndDlg)
     COLORREF *pBits;
     INT line, column;
 
+    if (hDC == NULL || hDCLogo == NULL || hDCMask == NULL)
+        goto Cleanup;
+
     ZeroMemory(pImgInfo, sizeof(*pImgInfo));
     ZeroMemory(&bmpi, sizeof(bmpi));
 
-    hLogo = (HBITMAP)LoadImage(hApplet, MAKEINTRESOURCE(IDB_ROSBMP), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
-    hMask = (HBITMAP)LoadImage(hApplet, MAKEINTRESOURCE(IDB_ROSMASK), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
+    hLogo = (HBITMAP)LoadImageW(hApplet, MAKEINTRESOURCEW(IDB_ROSBMP), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
+    hMask = (HBITMAP)LoadImageW(hApplet, MAKEINTRESOURCEW(IDB_ROSMASK), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
 
     if (hLogo != NULL && hMask != NULL)
     {
-        GetObject(hLogo, sizeof(BITMAP), &logoBitmap);
-        GetObject(hMask, sizeof(BITMAP), &maskBitmap);
-
-        if(logoBitmap.bmHeight != maskBitmap.bmHeight || logoBitmap.bmWidth != maskBitmap.bmWidth)
-            return;
+        GetObject(hLogo, sizeof(logoBitmap), &logoBitmap);
+        GetObject(hMask, sizeof(maskBitmap), &maskBitmap);
 
-        pImgInfo->cxSource = logoBitmap.bmWidth;
-        pImgInfo->cySource = logoBitmap.bmHeight;
+        if (logoBitmap.bmHeight != maskBitmap.bmHeight || logoBitmap.bmWidth != maskBitmap.bmWidth)
+            goto Cleanup;
 
         bmpi.bmiHeader.biSize = sizeof(BITMAPINFO);
         bmpi.bmiHeader.biWidth = logoBitmap.bmWidth;
@@ -91,17 +94,17 @@ static VOID InitLogo(HWND hwndDlg)
         bmpi.bmiHeader.biCompression = BI_RGB;
         bmpi.bmiHeader.biSizeImage = 4 * logoBitmap.bmWidth * logoBitmap.bmHeight;
 
+        /* Create a premultiplied bitmap */
         hAlphaLogo = CreateDIBSection(hDC, &bmpi, DIB_RGB_COLORS, (PVOID*)&pBits, 0, 0);
-
-        if(!hAlphaLogo)
-            return;
+        if (!hAlphaLogo)
+            goto Cleanup;
 
         SelectObject(hDCLogo, hLogo);
         SelectObject(hDCMask, hMask);
 
-        for(line = logoBitmap.bmHeight - 1; line >= 0; line--)
+        for (line = logoBitmap.bmHeight - 1; line >= 0; line--)
         {
-            for(column = 0; column < logoBitmap.bmWidth; column++)
+            for (column = 0; column < logoBitmap.bmWidth; column++)
             {
                 COLORREF alpha = GetPixel(hDCMask, column, line) & 0xFF;
                 COLORREF Color = GetPixel(hDCLogo, column, line);
@@ -111,28 +114,155 @@ static VOID InitLogo(HWND hwndDlg)
                 g = GetGValue(Color) * alpha / 255;
                 b = GetBValue(Color) * alpha / 255;
 
-                *pBits++ =  b | g << 8 | r << 16 | alpha << 24;
+                *pBits++ = b | (g << 8) | (r << 16) | (alpha << 24);
             }
-          }
-    }
-
-    pImgInfo->hBitmap = hAlphaLogo;
-    pImgInfo->cxSource = logoBitmap.bmWidth;
-    pImgInfo->cySource = logoBitmap.bmHeight;
-    pImgInfo->iBits = logoBitmap.bmBitsPixel;
-    pImgInfo->iPLanes = logoBitmap.bmPlanes;
+        }
 
-    DeleteObject(hLogo);
-    DeleteObject(hMask);
-    DeleteDC(hDCLogo);
-    DeleteDC(hDCMask);
+        pImgInfo->hBitmap = hAlphaLogo;
+        pImgInfo->cxSource = logoBitmap.bmWidth;
+        pImgInfo->cySource = logoBitmap.bmHeight;
+        pImgInfo->iBits = logoBitmap.bmBitsPixel;
+        pImgInfo->iPlanes = logoBitmap.bmPlanes;
+    }
 
+Cleanup:
+    if (hMask != NULL) DeleteObject(hMask);
+    if (hLogo != NULL) DeleteObject(hLogo);
+    if (hDCMask != NULL) DeleteDC(hDCMask);
+    if (hDCLogo != NULL) DeleteDC(hDCLogo);    
+    if (hDC != NULL) ReleaseDC(hwndDlg, hDC);
 }
 
 LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
+    static UINT timerid = 0, top = 0, offset;
+    static HBITMAP hCreditsBitmap;
+
     switch (uMsg)
     {
+        case WM_LBUTTONDBLCLK:
+            if (wParam & (MK_CONTROL | MK_SHIFT))
+            {
+                if (timerid == 0)
+                {
+                    HDC hCreditsDC, hLogoDC;
+                    HDC hDC = GetDC(NULL);
+                    HFONT hFont = NULL;
+                    NONCLIENTMETRICS ncm;
+                    RECT rcCredits;
+                    TCHAR szCredits[2048];
+                    INT iDevsHeight;
+
+                    if (hDC == NULL)
+                        goto Cleanup;
+
+                    top = 0;
+                    offset = 0;
+                    hCreditsDC = CreateCompatibleDC(hDC);
+                    hLogoDC = CreateCompatibleDC(hCreditsDC);
+
+                    if (hCreditsDC == NULL || hLogoDC == NULL)
+                        goto Cleanup;
+
+                    SetRect(&rcCredits, 0, 0, 0, 0);
+
+                    ncm.cbSize = sizeof(NONCLIENTMETRICS);
+                    SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &ncm, 0);
+
+                    hFont = CreateFontIndirect(&ncm.lfMessageFont);
+                    if (!hFont)
+                        goto Cleanup;
+                    SelectObject(hCreditsDC, hFont);
+
+                    LoadString(hApplet, IDS_DEVS, szCredits, sizeof(szCredits) / sizeof(TCHAR));
+                    DrawText(hCreditsDC, szCredits, -1, &rcCredits, DT_CALCRECT);
+
+                    iDevsHeight = rcCredits.bottom - rcCredits.top;
+
+                    hCreditsBitmap = CreateBitmap(pImgInfo->cxSource, (2 * pImgInfo->cySource) + iDevsHeight + 1, pImgInfo->iPlanes, pImgInfo->iBits, NULL);
+
+                    if (!hCreditsBitmap)
+                        goto Cleanup;
+
+                    SelectObject(hLogoDC, pImgInfo->hBitmap);
+                    SelectObject(hCreditsDC, hCreditsBitmap);
+
+                    offset += pImgInfo->cySource;
+
+                    SetRect(&rcCredits, 0, 0, pImgInfo->cxSource, (2 * pImgInfo->cySource) + iDevsHeight + 1);
+                    FillRect(hCreditsDC, &rcCredits, GetSysColorBrush(COLOR_3DFACE));
+
+                    SetRect(&rcCredits, 0, offset, pImgInfo->cxSource, offset + iDevsHeight + 1);
+                    SetBkMode(hCreditsDC, TRANSPARENT);
+
+                    OffsetRect(&rcCredits, 1, 1);
+                    SetTextColor(hCreditsDC, GetSysColor(COLOR_BTNSHADOW));
+                    DrawText(hCreditsDC, szCredits, -1, &rcCredits, DT_CENTER);
+
+                    OffsetRect(&rcCredits, -1, -1);
+                    SetTextColor(hCreditsDC, GetSysColor(COLOR_WINDOWTEXT));
+                    DrawText(hCreditsDC, szCredits, -1, &rcCredits, DT_CENTER);
+
+                    offset += iDevsHeight;
+
+                    AlphaBlend(hCreditsDC, 0, 0, pImgInfo->cxSource, pImgInfo->cySource, hLogoDC, 0,  0, pImgInfo->cxSource, pImgInfo->cySource, BlendFunc);
+                    AlphaBlend(hCreditsDC, 0, offset, pImgInfo->cxSource, pImgInfo->cySource, hLogoDC, 0,  0, pImgInfo->cxSource, pImgInfo->cySource, BlendFunc);
+
+                    timerid = SetTimer(hwnd, 1, ANIM_TIME, NULL);
+
+Cleanup:
+                    if (hFont != NULL) DeleteObject(hFont);
+                    if (hLogoDC != NULL) DeleteDC(hLogoDC);
+                    if (hCreditsDC != NULL) DeleteDC(hCreditsDC);
+                    if (hDC != NULL) ReleaseDC(NULL, hDC);
+                }
+            }
+            break;
+        case WM_LBUTTONDOWN:
+            if (timerid)
+            {
+                RECT rcCredits;
+                HDC hDC = GetDC(hwnd);
+                if (hDC != NULL)
+                {
+                    GetClientRect(hwnd, &rcCredits);
+                    SetRect(&rcCredits, 0, 0, rcCredits.right, pImgInfo->cySource);
+                    FillRect(hDC, &rcCredits, GetSysColorBrush(COLOR_3DFACE));
+                    ReleaseDC(hwnd, hDC);
+                }
+                KillTimer(hwnd, timerid);
+                if (hCreditsBitmap != NULL)
+                    DeleteObject(hCreditsBitmap);
+
+                InvalidateRect(hwnd, NULL, FALSE);
+                top = 0;
+                timerid = 0;
+            }
+            break;
+        case WM_TIMER:
+            top += ANIM_STEP;
+
+            if (top > offset)
+            {
+                RECT rcCredits;
+                HDC hDC = GetDC(hwnd);
+                if (hDC != NULL)
+                {
+                    GetClientRect(hwnd, &rcCredits);
+                    SetRect(&rcCredits, 0, 0, rcCredits.right, pImgInfo->cySource);
+                    FillRect(hDC, &rcCredits, GetSysColorBrush(COLOR_3DFACE));
+                    ReleaseDC(hwnd, hDC);
+                }
+                KillTimer(hwnd, timerid);
+                if (hCreditsBitmap != NULL)
+                    DeleteObject(hCreditsBitmap);
+
+                top = 0;
+                timerid = 0;
+            }
+
+            InvalidateRect(hwnd, NULL, FALSE);
+            break;
         case WM_PAINT:
         {
             PAINTSTRUCT PS;
@@ -149,9 +279,17 @@ LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
 
             if (hdcMem != NULL)
             {
-                SelectObject(hdcMem, pImgInfo->hBitmap);
-                /* FIXME: We should not rely on AlphaBlend and we should not import MSIMG32 solely for that function */
-                AlphaBlend(hdc, left, PS.rcPaint.top, pImgInfo->cxSource, pImgInfo->cySource, hdcMem, 0, 0, pImgInfo->cxSource, pImgInfo->cySource, BlendFunc);
+                if(timerid != 0)
+                {
+                    SelectObject(hdcMem, hCreditsBitmap);
+                    BitBlt(hdc, left, PS.rcPaint.top, PS.rcPaint.right - PS.rcPaint.left, PS.rcPaint.top + pImgInfo->cySource, hdcMem, 0, top, SRCCOPY);
+                }
+                else
+                {
+                    SelectObject(hdcMem, pImgInfo->hBitmap);
+                    AlphaBlend(hdc, left, PS.rcPaint.top, pImgInfo->cxSource, pImgInfo->cySource, hdcMem, 0, 0, pImgInfo->cxSource, pImgInfo->cySource, BlendFunc);
+                }
+
                 DeleteDC(hdcMem);
             }
 

diff --git a/dll/cpl/sysdm/lang/bg-BG.rc b/dll/cpl/sysdm/lang/bg-BG.rc
index 2012d94..c952412 100644 (file)
--- a/dll/cpl/sysdm/lang/bg-BG.rc
+++ b/dll/cpl/sysdm/lang/bg-BG.rc
@@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Общи"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111
-    LTEXT "Уредба:", IDC_STATIC, 114, 16, 80, 9
-    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9
-    LTEXT "Версия:", IDC_ROSVERSION, 120, 37, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9
-    LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9
-    LTEXT "", IDC_UPTIME, 120, 170, 116, 9
-    LTEXT "Машина:", IDC_STATIC, 114, 75, 44, 9
-    LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9
-    LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9
-    LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9
-    LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9
-    LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9
-    LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9
+    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
+    LTEXT "Уредба:", IDC_STATIC, 4, 116, 100, 9
+    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
+    LTEXT "Версия:", IDC_ROSVERSION, 10, 137, 131, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "System Uptime:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Машина:", IDC_STATIC, 124, 116, 100, 9
+    LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
+    LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
+    LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
+    LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9
+    LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9
+    LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9
     CONTROL "Посетете <A HREF=""https://reactos.org/"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10
     PUSHBUTTON "&Разрешителното", IDC_LICENCE, 170, 198, 78, 15
 END

diff --git a/dll/cpl/sysdm/lang/cs-CZ.rc b/dll/cpl/sysdm/lang/cs-CZ.rc
index 0a006d7..e7c7684 100644 (file)
--- a/dll/cpl/sysdm/lang/cs-CZ.rc
+++ b/dll/cpl/sysdm/lang/cs-CZ.rc
@@ -10,20 +10,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Obecné"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111
-    LTEXT "Systém:", IDC_STATIC, 114, 16, 80, 9
-    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9
-    LTEXT "Verze", IDC_ROSVERSION, 120, 37, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9
-    LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9
-    LTEXT "", IDC_UPTIME, 120, 170, 116, 9
-    LTEXT "Počítač:", IDC_STATIC, 114, 75, 44, 9
-    LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9
-    LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9
-    LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9
-    LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9
-    LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9
-    LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9
+    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
+    LTEXT "Systém:", IDC_STATIC, 4, 116, 100, 9
+    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
+    LTEXT "Verze", IDC_ROSVERSION, 10, 137, 116, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "System Uptime:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Počítač:", IDC_STATIC, 124, 116, 100, 9
+    LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
+    LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
+    LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
+    LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9
+    LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9
+    LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9
     CONTROL "Navštívit <A HREF=""https://reactos.org/"">stránku systému ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10
     PUSHBUTTON "Zobrazit &licenci...", IDC_LICENCE, 170, 198, 78, 15
 END

diff --git a/dll/cpl/sysdm/lang/da-DK.rc b/dll/cpl/sysdm/lang/da-DK.rc
index e063ea3..e0d3139 100644 (file)
--- a/dll/cpl/sysdm/lang/da-DK.rc
+++ b/dll/cpl/sysdm/lang/da-DK.rc
@@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Generelt"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111
-    LTEXT "Operativsystem:", IDC_STATIC, 114, 16, 80, 9
-    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9
-    LTEXT "Version", IDC_ROSVERSION, 120, 37, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9
-    LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9
-    LTEXT "", IDC_UPTIME, 120, 170, 116, 9
-    LTEXT "Machine:", IDC_STATIC, 114, 75, 44, 9
-    LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9
-    LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9
-    LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9
-    LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9
-    LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9
-    LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9
+    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
+    LTEXT "Operativsystem:", IDC_STATIC, 4, 116, 100, 9
+    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
+    LTEXT "Version", IDC_ROSVERSION, 10, 137, 116, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "System Uptime:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Machine:", IDC_STATIC, 124, 116, 100, 9
+    LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
+    LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
+    LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
+    LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9
+    LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9
+    LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9
     CONTROL "Visit the <A HREF=""https://reactos.org/"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10
     PUSHBUTTON "View &licence...", IDC_LICENCE, 170, 198, 78, 15
 END

diff --git a/dll/cpl/sysdm/lang/de-DE.rc b/dll/cpl/sysdm/lang/de-DE.rc
index 98c7e1e..5021753 100644 (file)
--- a/dll/cpl/sysdm/lang/de-DE.rc
+++ b/dll/cpl/sysdm/lang/de-DE.rc
@@ -14,20 +14,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Allgemein"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111
-    LTEXT "System:", IDC_STATIC, 114, 16, 80, 9
-    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9
-    LTEXT "Version", IDC_ROSVERSION, 120, 37, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9
-    LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9
-    LTEXT "", IDC_UPTIME, 120, 170, 116, 9
-    LTEXT "Computer:", IDC_STATIC, 114, 75, 44, 9
-    LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9
-    LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9
-    LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9
-    LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9
-    LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9
-    LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9
+    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
+    LTEXT "System:", IDC_STATIC, 4, 116, 100, 9
+    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
+    LTEXT "Version", IDC_ROSVERSION, 10, 137, 116, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "System Uptime:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Computer:", IDC_STATIC, 124, 116, 100, 9
+    LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
+    LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
+    LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
+    LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9
+    LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9
+    LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9
     CONTROL "<A HREF=""https://reactos.org/"">ReactOS-Homepage</A> besuchen", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10
     PUSHBUTTON "&Lizenz anzeigen...", IDC_LICENCE, 170, 198, 78, 15
 END

diff --git a/dll/cpl/sysdm/lang/el-GR.rc b/dll/cpl/sysdm/lang/el-GR.rc
index a7fdcb4..44ca60b 100644 (file)
--- a/dll/cpl/sysdm/lang/el-GR.rc
+++ b/dll/cpl/sysdm/lang/el-GR.rc
@@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Γενικά"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111
-    LTEXT "Σύστημα:", IDC_STATIC, 114, 16, 80, 9
-    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9
-    LTEXT "Έκδοση", IDC_ROSVERSION, 120, 37, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9
-    LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9
-    LTEXT "", IDC_UPTIME, 120, 170, 116, 9
-    LTEXT "Υπολογιστής:", IDC_STATIC, 114, 75, 44, 9
-    LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9
-    LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9
-    LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9
-    LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9
-    LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9
-    LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9
+    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
+    LTEXT "Σύστημα:", IDC_STATIC, 4, 116, 100, 9
+    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
+    LTEXT "Έκδοση", IDC_ROSVERSION, 10, 137, 116, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "System Uptime:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Υπολογιστής:", IDC_STATIC, 124, 116, 100, 9
+    LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
+    LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
+    LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
+    LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9
+    LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9
+    LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9
     CONTROL "Επισκευτείτε την <A HREF=""https://reactos.org/"">Ιστοσελίδα του ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10
     PUSHBUTTON "&Προβολή άδειας...", IDC_LICENCE, 170, 198, 78, 15
 END

diff --git a/dll/cpl/sysdm/lang/en-US.rc b/dll/cpl/sysdm/lang/en-US.rc
index 9fd1813..5362d55 100644 (file)
--- a/dll/cpl/sysdm/lang/en-US.rc
+++ b/dll/cpl/sysdm/lang/en-US.rc
@@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111
-    LTEXT "System:", IDC_STATIC, 114, 16, 80, 9
-    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9
-    LTEXT "Version", IDC_ROSVERSION, 120, 37, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9
-    LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9
-    LTEXT "", IDC_UPTIME, 120, 170, 116, 9
-    LTEXT "Machine:", IDC_STATIC, 114, 75, 44, 9
-    LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9
-    LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9
-    LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9
-    LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9
-    LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9
-    LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9
+    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
+    LTEXT "System:", IDC_STATIC, 4, 116, 100, 9
+    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
+    LTEXT "Version", IDC_ROSVERSION, 10, 137, 116, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "System Uptime:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Machine:", IDC_STATIC, 124, 116, 100, 9
+    LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
+    LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
+    LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
+    LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9
+    LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9
+    LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9
     CONTROL "Visit the <A HREF=""https://reactos.org/"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10
     PUSHBUTTON "View &license...", IDC_LICENCE, 170, 198, 78, 15
 END

diff --git a/dll/cpl/sysdm/lang/es-ES.rc b/dll/cpl/sysdm/lang/es-ES.rc
index 545c410..f93d1e8 100644 (file)
--- a/dll/cpl/sysdm/lang/es-ES.rc
+++ b/dll/cpl/sysdm/lang/es-ES.rc
@@ -7,20 +7,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111
-    LTEXT "Sistema operativo:", IDC_STATIC, 114, 16, 80, 9
-    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9
-    LTEXT "Versión", IDC_ROSVERSION, 120, 37, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9
-    LTEXT "Tiempo de operación:", IDC_STATIC, 114, 158, 95, 9
-    LTEXT "", IDC_UPTIME, 120, 170, 116, 9
-    LTEXT "Equipo:", IDC_STATIC, 114, 75, 44, 9
-    LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9
-    LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9
-    LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9
-    LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9
-    LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9
-    LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9
+    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
+    LTEXT "Sistema operativo:", IDC_STATIC, 4, 116, 100, 9
+    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
+    LTEXT "Versión", IDC_ROSVERSION, 10, 137, 116, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "Tiempo de operación:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Equipo:", IDC_STATIC, 124, 116, 100, 9
+    LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
+    LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
+    LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
+    LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9
+    LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9
+    LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9
     CONTROL "Visite la <A HREF=""https://reactos.org/"">página Web de ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10
     PUSHBUTTON "Ver &licencia...", IDC_LICENCE, 170, 198, 78, 15
 END

diff --git a/dll/cpl/sysdm/lang/fr-FR.rc b/dll/cpl/sysdm/lang/fr-FR.rc
index 14d0145..3f026c7 100644 (file)
--- a/dll/cpl/sysdm/lang/fr-FR.rc
+++ b/dll/cpl/sysdm/lang/fr-FR.rc
@@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Général"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111
-    LTEXT "Système d'exploitation :", IDC_STATIC, 114, 16, 80, 9
-    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9
-    LTEXT "Version", IDC_ROSVERSION, 120, 37, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9
-    LTEXT "Temps d'activité :", IDC_STATIC, 114, 158, 95, 9
-    LTEXT "", IDC_UPTIME, 120, 170, 116, 9
-    LTEXT "Machine:", IDC_STATIC, 114, 75, 44, 9
-    LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9
-    LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9
-    LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9
-    LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9
-    LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9
-    LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9
+    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
+    LTEXT "Système d'exploitation :", IDC_STATIC, 4, 116, 100, 9
+    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
+    LTEXT "Version", IDC_ROSVERSION, 10, 137, 116, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "Temps d'activité :", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Machine :", IDC_STATIC, 124, 116, 100, 9
+    LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
+    LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
+    LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
+    LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9
+    LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9
+    LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9
     CONTROL "Visiter la <A HREF=""https://reactos.org/"">page d'accueil ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10
     PUSHBUTTON "Voir la &licence...", IDC_LICENCE, 170, 198, 78, 15
 END

diff --git a/dll/cpl/sysdm/lang/he-IL.rc b/dll/cpl/sysdm/lang/he-IL.rc
index bb354e0..626dd2d 100644 (file)
--- a/dll/cpl/sysdm/lang/he-IL.rc
+++ b/dll/cpl/sysdm/lang/he-IL.rc
@@ -7,20 +7,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "כללי"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111
-    LTEXT "מערכת:", IDC_STATIC, 114, 16, 80, 9
-    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9
-    LTEXT "גרסה", IDC_ROSVERSION, 120, 37, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9
-    LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9
-    LTEXT "", IDC_UPTIME, 120, 170, 116, 9
-    LTEXT "מכונה:", IDC_STATIC, 114, 75, 44, 9
-    LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9
-    LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9
-    LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9
-    LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9
-    LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9
-    LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9
+    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
+    LTEXT "מערכת:", IDC_STATIC, 4, 116, 100, 9
+    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
+    LTEXT "גרסה", IDC_ROSVERSION, 10, 137, 116, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "System Uptime:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "מכונה:", IDC_STATIC, 124, 116, 100, 9
+    LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
+    LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
+    LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
+    LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9
+    LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9
+    LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9
     CONTROL "בקר את <A HREF=""https://reactos.org/"">דף הבית של ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10
     PUSHBUTTON "ראה רישיון...", IDC_LICENCE, 170, 198, 78, 15
 END

diff --git a/dll/cpl/sysdm/lang/hu-HU.rc b/dll/cpl/sysdm/lang/hu-HU.rc
index cf4cdcb..1e71af1 100644 (file)
--- a/dll/cpl/sysdm/lang/hu-HU.rc
+++ b/dll/cpl/sysdm/lang/hu-HU.rc
@@ -7,20 +7,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Általános"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111
-    LTEXT "Operációs rendszer:", IDC_STATIC, 114, 16, 80, 9
-    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9
-    LTEXT "Verzió", IDC_ROSVERSION, 120, 37, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9
-    LTEXT "Rendszer üzemidő:", IDC_STATIC, 114, 158, 95, 9
-    LTEXT "", IDC_UPTIME, 120, 170, 116, 9
-    LTEXT "Számítógép:", IDC_STATIC, 114, 75, 44, 9
-    LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9
-    LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9
-    LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9
-    LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9
-    LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9
-    LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9
+    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
+    LTEXT "Operációs rendszer:", IDC_STATIC, 4, 116, 100, 9
+    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
+    LTEXT "Verzió", IDC_ROSVERSION, 10, 137, 116, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "Rendszer üzemidő:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Számítógép:", IDC_STATIC, 124, 116, 100, 9
+    LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
+    LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
+    LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
+    LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9
+    LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9
+    LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9
     CONTROL "A <A HREF=""https://reactos.org/"">ReactOS honlapjának</A> meglátogatása", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10
     PUSHBUTTON "&Licenc megtekintése...", IDC_LICENCE, 166, 198, 82, 15
 END

diff --git a/dll/cpl/sysdm/lang/id-ID.rc b/dll/cpl/sysdm/lang/id-ID.rc
index 5c039a0..0b2fec4 100644 (file)
--- a/dll/cpl/sysdm/lang/id-ID.rc
+++ b/dll/cpl/sysdm/lang/id-ID.rc
@@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Umum"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111
-    LTEXT "Sistem:", IDC_STATIC, 114, 16, 80, 9
-    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9
-    LTEXT "Versi", IDC_ROSVERSION, 120, 37, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9
-    LTEXT "Waktu hidup sistem:", IDC_STATIC, 114, 158, 95, 9
-    LTEXT "", IDC_UPTIME, 120, 170, 116, 9
-    LTEXT "Mesin:", IDC_STATIC, 114, 75, 44, 9
-    LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9
-    LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9
-    LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9
-    LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9
-    LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9
-    LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9
+    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
+    LTEXT "Sistem:", IDC_STATIC, 4, 116, 100, 9
+    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
+    LTEXT "Versi", IDC_ROSVERSION, 10, 137, 116, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "Waktu hidup sistem:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Mesin:", IDC_STATIC, 124, 116, 100, 9
+    LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
+    LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
+    LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
+    LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9
+    LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9
+    LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9
     CONTROL "Kunjungi <A HREF=""https://reactos.org/"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10
     PUSHBUTTON "Lihat &lisensi...", IDC_LICENCE, 170, 198, 78, 15
 END

diff --git a/dll/cpl/sysdm/lang/it-IT.rc b/dll/cpl/sysdm/lang/it-IT.rc
index 59cb4d8..7993750 100644 (file)
--- a/dll/cpl/sysdm/lang/it-IT.rc
+++ b/dll/cpl/sysdm/lang/it-IT.rc
@@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Generale"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111
-    LTEXT "Sistema:", IDC_STATIC, 114, 16, 80, 9
-    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9
-    LTEXT "Versione", IDC_ROSVERSION, 120, 37, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9
-    LTEXT "Tempo di Avvio Sistema:", IDC_STATIC, 114, 158, 95, 9
-    LTEXT "", IDC_UPTIME, 120, 170, 116, 9
-    LTEXT "Macchina:", IDC_STATIC, 114, 75, 44, 9
-    LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9
-    LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9
-    LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9
-    LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9
-    LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9
-    LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9
+    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
+    LTEXT "Sistema:", IDC_STATIC, 4, 116, 100, 9
+    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
+    LTEXT "Versione", IDC_ROSVERSION, 10, 137, 116, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "Tempo di Avvio Sistema:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Macchina:", IDC_STATIC, 124, 116, 100, 9
+    LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
+    LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
+    LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
+    LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9
+    LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9
+    LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9
     CONTROL "Visita <A HREF=""https://reactos.org/"">ReactOS su internet</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10
     PUSHBUTTON "Vedi la licenza...", IDC_LICENCE, 170, 198, 78, 15
 END

diff --git a/dll/cpl/sysdm/lang/ja-JP.rc b/dll/cpl/sysdm/lang/ja-JP.rc
index 715ffe1..b7fc479 100644 (file)
--- a/dll/cpl/sysdm/lang/ja-JP.rc
+++ b/dll/cpl/sysdm/lang/ja-JP.rc
@@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "全般"
 FONT 9, "MS UI Gothic", 0, 0, 0x0
 BEGIN
-    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111
-    LTEXT "システム:", IDC_STATIC, 114, 16, 80, 9
-    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9
-    LTEXT "バージョン", IDC_ROSVERSION, 120, 37, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9
-    LTEXT "起動してからの時間:", IDC_STATIC, 114, 158, 95, 9
-    LTEXT "", IDC_UPTIME, 120, 170, 116, 9
-    LTEXT "マシン:", IDC_STATIC, 114, 75, 44, 9
-    LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9
-    LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9
-    LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9
-    LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9
-    LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9
-    LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9
+    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
+    LTEXT "システム:", IDC_STATIC, 4, 116, 100, 9
+    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
+    LTEXT "バージョン", IDC_ROSVERSION, 10, 137, 116, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "起動してからの時間:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "マシン:", IDC_STATIC, 124, 116, 100, 9
+    LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
+    LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
+    LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
+    LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9
+    LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9
+    LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9
     CONTROL "<A HREF=""https://reactos.org/"">ReactOS ホームページ</A>へ行く", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 150, 10
     PUSHBUTTON "ライセンスを表示(&L)...", IDC_LICENCE, 170, 198, 78, 15
 END

diff --git a/dll/cpl/sysdm/lang/nl-NL.rc b/dll/cpl/sysdm/lang/nl-NL.rc
index 02548b3..7526111 100644 (file)
--- a/dll/cpl/sysdm/lang/nl-NL.rc
+++ b/dll/cpl/sysdm/lang/nl-NL.rc
@@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Algemeen"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111
-    LTEXT "Besturingssysteem:", IDC_STATIC, 114, 16, 80, 9
-    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9
-    LTEXT "Versie", IDC_ROSVERSION, 120, 37, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9
-    LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9
-    LTEXT "", IDC_UPTIME, 120, 170, 116, 9
-    LTEXT "Machine:", IDC_STATIC, 114, 75, 44, 9
-    LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9
-    LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9
-    LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9
-    LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9
-    LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9
-    LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9
+    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
+    LTEXT "Besturingssysteem:", IDC_STATIC, 4, 116, 100, 9
+    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
+    LTEXT "Versie", IDC_ROSVERSION, 10, 137, 116, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "System Uptime:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Machine:", IDC_STATIC, 124, 116, 100, 9
+    LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
+    LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
+    LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
+    LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9
+    LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9
+    LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9
     CONTROL "Visit the <A HREF=""https://reactos.org/"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10
     PUSHBUTTON "View &licence...", IDC_LICENCE, 170, 198, 78, 15
 END

diff --git a/dll/cpl/sysdm/lang/no-NO.rc b/dll/cpl/sysdm/lang/no-NO.rc
index 987e991..c3f7604 100644 (file)
--- a/dll/cpl/sysdm/lang/no-NO.rc
+++ b/dll/cpl/sysdm/lang/no-NO.rc
@@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Generielt"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111
-    LTEXT "System:", IDC_STATIC, 114, 16, 80, 9
-    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9
-    LTEXT "Versjon", IDC_ROSVERSION, 120, 37, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9
-    LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9
-    LTEXT "", IDC_UPTIME, 120, 170, 116, 9
-    LTEXT "Maskin:", IDC_STATIC, 114, 75, 44, 9
-    LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9
-    LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9
-    LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9
-    LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9
-    LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9
-    LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9
+    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
+    LTEXT "System:", IDC_STATIC, 4, 116, 100, 9
+    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
+    LTEXT "Versjon", IDC_ROSVERSION, 10, 137, 116, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "System Uptime:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Maskin:", IDC_STATIC, 124, 116, 100, 9
+    LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
+    LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
+    LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
+    LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9
+    LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9
+    LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9
     CONTROL "Besøk <A HREF=""https://reactos.org/no/index.html"">ReactOS Hjemmesiden</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10
     PUSHBUTTON "Vis &lisensen...", IDC_LICENCE, 170, 198, 78, 15
 END

diff --git a/dll/cpl/sysdm/lang/pl-PL.rc b/dll/cpl/sysdm/lang/pl-PL.rc
index c823dc2..7bd68bc 100644 (file)
--- a/dll/cpl/sysdm/lang/pl-PL.rc
+++ b/dll/cpl/sysdm/lang/pl-PL.rc
@@ -14,20 +14,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Ogólne"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111
-    LTEXT "System:", IDC_STATIC, 114, 16, 80, 9
-    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9
-    LTEXT "Wersja", IDC_ROSVERSION, 120, 37, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9
-    LTEXT "Czas pracy systemu:", IDC_STATIC, 114, 158, 95, 9
-    LTEXT "", IDC_UPTIME, 120, 170, 116, 9
-    LTEXT "Komputer:", IDC_STATIC, 114, 75, 44, 9
-    LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9
-    LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9
-    LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9
-    LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9
-    LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9
-    LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9
+    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
+    LTEXT "System:", IDC_STATIC, 4, 116, 100, 9
+    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
+    LTEXT "Wersja", IDC_ROSVERSION, 10, 137, 116, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "Czas pracy systemu:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Komputer:", IDC_STATIC, 124, 116, 100, 9
+    LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
+    LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
+    LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
+    LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9
+    LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9
+    LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9
     CONTROL "Odwiedź <A HREF=""https://reactos.org/"">Stronę domową ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10
     PUSHBUTTON "Wyświetl &licencję...", IDC_LICENCE, 170, 198, 78, 15
 END
@@ -100,7 +100,7 @@ BEGIN
     GROUPBOX "Wybór profili sprzętu", IDC_STATIC, 7, 130, 240, 80
     LTEXT "Podczas uruchamiania ReactOS:", IDC_STATIC, 14, 142, 210, 8
     AUTORADIOBUTTON "&Czekaj na wybór profilu sprzętu przez użytkownika", IDC_HRDPROFWAIT, 14, 158, 175, 8, WS_GROUP
-    AUTORADIOBUTTON "&Wybierz &pierwszy profil na liście, jeżeli użytkownik nie wybierze \nprofilu w ciągu", IDC_HRDPROFSELECT, 14, 173, 215, 17, BS_MULTILINE
+    AUTORADIOBUTTON "&Wybierz &pierwszy profil na liście, jeżeli użytkownik nie wybierze\nprofilu w ciągu", IDC_HRDPROFSELECT, 14, 173, 215, 17, BS_MULTILINE
     LTEXT "s", IDC_STATIC, 65, 195, 35, 8
     EDITTEXT IDC_HRDPROFEDIT, 25, 193, 35, 12
     CONTROL "", IDC_HRDPROFUPDWN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT |

diff --git a/dll/cpl/sysdm/lang/pt-PT.rc b/dll/cpl/sysdm/lang/pt-PT.rc
index e117f4c..0d02d06 100644 (file)
--- a/dll/cpl/sysdm/lang/pt-PT.rc
+++ b/dll/cpl/sysdm/lang/pt-PT.rc
@@ -9,20 +9,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Geral"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111
-    LTEXT "Sistema:", IDC_STATIC, 114, 16, 80, 9
-    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9
-    LTEXT "Versão", IDC_ROSVERSION, 120, 37, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9
-    LTEXT "Ultima actualização:", IDC_STATIC, 114, 158, 95, 9
-    LTEXT "", IDC_UPTIME, 120, 170, 116, 9
-    LTEXT "Computador:", IDC_STATIC, 114, 75, 44, 9
-    LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9
-    LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9
-    LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9
-    LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9
-    LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9
-    LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9
+    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
+    LTEXT "Sistema:", IDC_STATIC, 4, 116, 100, 9
+    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
+    LTEXT "Versão", IDC_ROSVERSION, 10, 137, 120, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "Ultima actualização:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Computador:", IDC_STATIC, 135, 116, 100, 9
+    LTEXT "", IDC_MACHINELINE1, 140, 128, 118, 9
+    LTEXT "", IDC_MACHINELINE2, 140, 137, 118, 9
+    LTEXT "", IDC_MACHINELINE3, 140, 146, 118, 9
+    LTEXT "", IDC_MACHINELINE4, 140, 155, 118, 9
+    LTEXT "", IDC_MACHINELINE5, 140, 164, 118, 9
+    LTEXT "", IDC_MACHINELINE6, 140, 173, 118, 9
     CONTROL "Visite  <A HREF=""https://reactos.org/"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 159, 10
     PUSHBUTTON "Ver &licença...", IDC_LICENCE, 170, 198, 78, 15
 END

diff --git a/dll/cpl/sysdm/lang/ro-RO.rc b/dll/cpl/sysdm/lang/ro-RO.rc
index 49fc025..d2bf4ea 100644 (file)
--- a/dll/cpl/sysdm/lang/ro-RO.rc
+++ b/dll/cpl/sysdm/lang/ro-RO.rc
@@ -14,20 +14,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Generale"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111
-    LTEXT "Sistem:", IDC_STATIC, 114, 16, 80, 9
-    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9
-    LTEXT "Versiune", IDC_ROSVERSION, 120, 37, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9
-    LTEXT "Timp de operare:", IDC_STATIC, 114, 158, 95, 9
-    LTEXT "", IDC_UPTIME, 120, 170, 116, 9
-    LTEXT "Calculator:", IDC_STATIC, 114, 75, 44, 9
-    LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9
-    LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9
-    LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9
-    LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9
-    LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9
-    LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9
+    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
+    LTEXT "Sistem:", IDC_STATIC, 4, 116, 100, 9
+    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
+    LTEXT "Versiune", IDC_ROSVERSION, 10, 137, 116, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "Timp de operare:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Calculator:", IDC_STATIC, 124, 116, 100, 9
+    LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
+    LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
+    LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
+    LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9
+    LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9
+    LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9
     CONTROL "Vizitați<A HREF=""https://reactos.org/""> pagina web ReactOS </A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10
     PUSHBUTTON "&Licență…", IDC_LICENCE, 170, 198, 78, 15
 END

diff --git a/dll/cpl/sysdm/lang/ru-RU.rc b/dll/cpl/sysdm/lang/ru-RU.rc
index 77ea56e..5530887 100644 (file)
--- a/dll/cpl/sysdm/lang/ru-RU.rc
+++ b/dll/cpl/sysdm/lang/ru-RU.rc
@@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Общие"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111
-    LTEXT "Операционная система:", IDC_STATIC, 114, 16, 80, 9
-    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9
-    LTEXT "Версия", IDC_ROSVERSION, 120, 37, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9
-    LTEXT "Время работы системы:", IDC_STATIC, 114, 158, 95, 9
-    LTEXT "", IDC_UPTIME, 120, 170, 116, 9
-    LTEXT "Компьютер:", IDC_STATIC, 114, 75, 44, 9
-    LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9
-    LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9
-    LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9
-    LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9
-    LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9
-    LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9
+    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
+    LTEXT "Операционная система:", IDC_STATIC, 4, 116, 100, 9
+    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
+    LTEXT "Версия", IDC_ROSVERSION, 10, 137, 116, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "Время работы системы:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Компьютер:", IDC_STATIC, 124, 116, 100, 9
+    LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
+    LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
+    LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
+    LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9
+    LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9
+    LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9
     CONTROL "Посетите <A HREF=""https://reactos.org/"">домашнюю страницу ReactOS</A>.", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10
     PUSHBUTTON "&Лицензия...", IDC_LICENCE, 170, 198, 78, 15
 END

diff --git a/dll/cpl/sysdm/lang/sk-SK.rc b/dll/cpl/sysdm/lang/sk-SK.rc
index 18f1f45..ef3d16f 100644 (file)
--- a/dll/cpl/sysdm/lang/sk-SK.rc
+++ b/dll/cpl/sysdm/lang/sk-SK.rc
@@ -13,20 +13,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Všeobecné"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111
-    LTEXT "Systém:", IDC_STATIC, 114, 16, 80, 9
-    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9
-    LTEXT "Verzia", IDC_ROSVERSION, 120, 37, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9
-    LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9
-    LTEXT "", IDC_UPTIME, 120, 170, 116, 9
-    LTEXT "Počítač:", IDC_STATIC, 114, 75, 44, 9
-    LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9
-    LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9
-    LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9
-    LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9
-    LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9
-    LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9
+    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
+    LTEXT "Systém:", IDC_STATIC, 4, 116, 100, 9
+    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
+    LTEXT "Verzia", IDC_ROSVERSION, 10, 137, 116, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "System Uptime:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Počítač:", IDC_STATIC, 124, 116, 100, 9
+    LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
+    LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
+    LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
+    LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9
+    LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9
+    LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9
     CONTROL "Navštívte <A HREF=""https://reactos.org/"">domovskú stránku systému ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10
     PUSHBUTTON "Zobraziť &licenciu...", IDC_LICENCE, 170, 198, 78, 15
 END

diff --git a/dll/cpl/sysdm/lang/sq-AL.rc b/dll/cpl/sysdm/lang/sq-AL.rc
index 1ee41ee..a8a0c21 100644 (file)
--- a/dll/cpl/sysdm/lang/sq-AL.rc
+++ b/dll/cpl/sysdm/lang/sq-AL.rc
@@ -5,20 +5,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Përgjithshëm"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111
-    LTEXT "Sistemi:", IDC_STATIC, 114, 16, 80, 9
-    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9
-    LTEXT "Versioni", IDC_ROSVERSION, 120, 37, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9
-    LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9
-    LTEXT "", IDC_UPTIME, 120, 170, 116, 9
-    LTEXT "Makinë:", IDC_STATIC, 114, 75, 44, 9
-    LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9
-    LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9
-    LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9
-    LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9
-    LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9
-    LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9
+    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
+    LTEXT "Sistemi:", IDC_STATIC, 4, 116, 100, 9
+    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
+    LTEXT "Versioni", IDC_ROSVERSION, 10, 137, 116, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "System Uptime:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Makinë:", IDC_STATIC, 124, 116, 100, 9
+    LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
+    LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
+    LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
+    LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9
+    LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9
+    LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9
     CONTROL "Vizitoni <A HREF=""https://reactos.org/"">Faqeb ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10
     PUSHBUTTON "Shiko &licencës...", IDC_LICENCE, 170, 198, 78, 15
 END

diff --git a/dll/cpl/sysdm/lang/sv-SE.rc b/dll/cpl/sysdm/lang/sv-SE.rc
index 2bcd3eb..5925c3f 100644 (file)
--- a/dll/cpl/sysdm/lang/sv-SE.rc
+++ b/dll/cpl/sysdm/lang/sv-SE.rc
@@ -7,20 +7,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Allmänt"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111
-    LTEXT "Operativsystem:", IDC_STATIC, 114, 16, 80, 9
-    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9
-    LTEXT "Version", IDC_ROSVERSION, 120, 37, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9
-    LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9
-    LTEXT "", IDC_UPTIME, 120, 170, 116, 9
-    LTEXT "Dator:", IDC_STATIC, 114, 75, 44, 9
-    LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9
-    LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9
-    LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9
-    LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9
-    LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9
-    LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9
+    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
+    LTEXT "Operativsystem:", IDC_STATIC, 4, 116, 100, 9
+    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
+    LTEXT "Version", IDC_ROSVERSION, 10, 137, 116, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "System Uptime:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Dator:", IDC_STATIC, 124, 116, 100, 9
+    LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
+    LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
+    LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
+    LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9
+    LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9
+    LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9
     CONTROL "Besök <A HREF=""https://reactos.org/"">ReactOS hemsida</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10
     PUSHBUTTON "Visa &licens...", IDC_LICENCE, 170, 198, 78, 15
 END

diff --git a/dll/cpl/sysdm/lang/tr-TR.rc b/dll/cpl/sysdm/lang/tr-TR.rc
index f9a3ad6..93a43fe 100644 (file)
--- a/dll/cpl/sysdm/lang/tr-TR.rc
+++ b/dll/cpl/sysdm/lang/tr-TR.rc
@@ -7,20 +7,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Umûmî"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111
-    LTEXT "Sistem:", IDC_STATIC, 114, 16, 80, 9
-    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9
-    LTEXT "Sürüm:", IDC_ROSVERSION, 120, 37, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9
-    LTEXT "Sistem Çalışma Zamanı:", IDC_STATIC, 114, 158, 95, 9
-    LTEXT "", IDC_UPTIME, 120, 170, 116, 9
-    LTEXT "Makine:", IDC_STATIC, 114, 75, 44, 9
-    LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9
-    LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9
-    LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9
-    LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9
-    LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9
-    LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9
+    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
+    LTEXT "Sistem:", IDC_STATIC, 4, 116, 100, 9
+    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
+    LTEXT "Sürüm:", IDC_ROSVERSION, 10, 137, 116, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "Sistem Çalışma Zamanı:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Makine:", IDC_STATIC, 124, 116, 100, 9
+    LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
+    LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
+    LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
+    LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9
+    LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9
+    LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9
     CONTROL "<A HREF=""https://reactos.org/"">ReactOS Ana Sayfa</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10
     PUSHBUTTON "&Ruhsatı Göster...", IDC_LICENCE, 170, 198, 78, 15
 END

diff --git a/dll/cpl/sysdm/lang/uk-UA.rc b/dll/cpl/sysdm/lang/uk-UA.rc
index 50c9e9a..8e1ad12 100644 (file)
--- a/dll/cpl/sysdm/lang/uk-UA.rc
+++ b/dll/cpl/sysdm/lang/uk-UA.rc
@@ -13,20 +13,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Загальні"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111
-    LTEXT "Операційна система:", IDC_STATIC, 114, 16, 80, 9
-    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9
-    LTEXT "Версія", IDC_ROSVERSION, 120, 37, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9
-    LTEXT "System Uptime:", IDC_STATIC, 114, 158, 95, 9
-    LTEXT "", IDC_UPTIME, 120, 170, 116, 9
-    LTEXT "Комп'ютер:", IDC_STATIC, 114, 75, 44, 9
-    LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9
-    LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9
-    LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9
-    LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9
-    LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9
-    LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9
+    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
+    LTEXT "Операційна система:", IDC_STATIC, 4, 116, 100, 9
+    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
+    LTEXT "Версія", IDC_ROSVERSION, 10, 137, 116, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "System Uptime:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Комп'ютер:", IDC_STATIC, 124, 132, 100, 9
+    LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
+    LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
+    LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
+    LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9
+    LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9
+    LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9
     CONTROL "Відвідайте <A HREF=""https://reactos.org/"">домашню сторінку ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10
     PUSHBUTTON "&Ліцензія...", IDC_LICENCE, 170, 198, 78, 15
 END

diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc
index e0ebb85..113cc38 100644 (file)
--- a/dll/cpl/sysdm/lang/zh-CN.rc
+++ b/dll/cpl/sysdm/lang/zh-CN.rc
@@ -8,20 +8,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "常规"
 FONT 9, "宋体", 0, 0, 0x0
 BEGIN
-    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111
-    LTEXT "系统:", IDC_STATIC, 114, 16, 80, 9
-    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9
-    LTEXT "版本", IDC_ROSVERSION, 120, 37, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9
-    LTEXT "开机时间:", IDC_STATIC, 114, 158, 95, 9
-    LTEXT "", IDC_UPTIME, 120, 170, 116, 9
-    LTEXT "计算机:", IDC_STATIC, 114, 75, 44, 9
-    LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9
-    LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9
-    LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9
-    LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9
-    LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9
-    LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9
+    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
+    LTEXT "系统:", IDC_STATIC, 4, 116, 100, 9
+    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
+    LTEXT "版本", IDC_ROSVERSION, 10, 137, 116, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "开机时间:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "计算机:", IDC_STATIC, 124, 116, 100, 9
+    LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
+    LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
+    LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
+    LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9
+    LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9
+    LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9
     CONTROL "访问<A HREF=""https://reactos.org/"">ReactOS 主页</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10
     PUSHBUTTON "许可证(&L)...", IDC_LICENCE, 170, 198, 78, 15
 END

diff --git a/dll/cpl/sysdm/lang/zh-TW.rc b/dll/cpl/sysdm/lang/zh-TW.rc
index fb2cf1e..613ce9e 100644 (file)
--- a/dll/cpl/sysdm/lang/zh-TW.rc
+++ b/dll/cpl/sysdm/lang/zh-TW.rc
@@ -8,20 +8,20 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "一般"
 FONT 9, "新細明體", 0, 0, 0x0
 BEGIN
-    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 8, 18, 100, 111
-    LTEXT "系統:", IDC_STATIC, 114, 16, 80, 9
-    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 120, 28, 116, 9
-    LTEXT "版本", IDC_ROSVERSION, 120, 37, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 120, 46, 135, 9
-    LTEXT "系統啟動時間:", IDC_STATIC, 114, 158, 95, 9
-    LTEXT "", IDC_UPTIME, 120, 170, 116, 9
-    LTEXT "電腦:", IDC_STATIC, 114, 75, 44, 9
-    LTEXT "", IDC_MACHINELINE1, 120, 87, 118, 9
-    LTEXT "", IDC_MACHINELINE2, 120, 96, 118, 9
-    LTEXT "", IDC_MACHINELINE3, 120, 105, 118, 9
-    LTEXT "", IDC_MACHINELINE4, 120, 114, 118, 9
-    LTEXT "", IDC_MACHINELINE5, 120, 123, 118, 9
-    LTEXT "", IDC_MACHINELINE6, 120, 132, 118, 9
+    CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
+    LTEXT "系統:", IDC_STATIC, 4, 116, 100, 9
+    LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
+    LTEXT "版本", IDC_ROSVERSION, 10, 137, 116, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "系統啟動時間:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "電腦:", IDC_STATIC, 124, 116, 100, 9
+    LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
+    LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
+    LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
+    LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9
+    LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9
+    LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9
     CONTROL "請訪問<A HREF=""https://reactos.org/"">ReactOS 首頁</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10
     PUSHBUTTON "查看著作權信息(&L)...", IDC_LICENCE, 170, 198, 78, 15
 END

diff --git a/dll/cpl/sysdm/resource.h b/dll/cpl/sysdm/resource.h
index 256679c..93d2044 100644 (file)
--- a/dll/cpl/sysdm/resource.h
+++ b/dll/cpl/sysdm/resource.h
@@ -208,3 +208,5 @@
 #define IDC_LICENCEEDIT      1501
 #define RC_LICENSE           1502
 #define RTDATA               1503
+
+#define IDS_DEVS 2000

diff --git a/dll/cpl/sysdm/resources/rosbitmap.bmp b/dll/cpl/sysdm/resources/rosbitmap.bmp
index 10830dc..ee5891c 100644 (file)
Binary files a/dll/cpl/sysdm/resources/rosbitmap.bmp and b/dll/cpl/sysdm/resources/rosbitmap.bmp differ

diff --git a/dll/cpl/sysdm/resources/rosbitmap_mask.bmp b/dll/cpl/sysdm/resources/rosbitmap_mask.bmp
index 0b7d082..9e0ef21 100644 (file)
Binary files a/dll/cpl/sysdm/resources/rosbitmap_mask.bmp and b/dll/cpl/sysdm/resources/rosbitmap_mask.bmp differ

diff --git a/dll/cpl/sysdm/sysdm.rc b/dll/cpl/sysdm/sysdm.rc
index 5cd3021..88e03d6 100644 (file)
--- a/dll/cpl/sysdm/sysdm.rc
+++ b/dll/cpl/sysdm/sysdm.rc
@@ -29,6 +29,11 @@ RC_LICENSE RTDATA "resources/gpl.txt"
 /* UTF-8 */
 #pragma code_page(65001)
 
+STRINGTABLE
+BEGIN
+    IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes Anderwald\nKamil Hornícek\nKatayama Hirofumi MZ\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMark Jansen\nMatthias Kupfer\nMike Nordell\nPeter Hater\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStanislav Motylkov\nStefan Ginsberg\nSylvain Petreolle\nThomas Blümel\nThomas Faber\nTimo Kreuzer\nVadim Galyant\n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGé van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini\n\nRelease Engineers\n\nAmine Khaldi\nColin Finck\nJoachim Henze\nThomas Faber\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributors\nWine Team\n\n"
+END
+
 #ifdef LANGUAGE_BG_BG
     #include "lang/bg-BG.rc"
 #endif

diff --git a/sdk/include/reactos/buildno.h.cmake b/sdk/include/reactos/buildno.h.cmake
index 0dfc9f3..d94308d 100644 (file)
--- a/sdk/include/reactos/buildno.h.cmake
+++ b/sdk/include/reactos/buildno.h.cmake
@@ -9,6 +9,9 @@
 #define KERNEL_VERSION_RC           "@KERNEL_VERSION@\0"
 #define KERNEL_VERSION_STR          "@KERNEL_VERSION@"
 
+#define KERNEL_VERSION_REVISION_RC  "@REVISION@\0"
+#define KERNEL_VERSION_REVISION_STR "@REVISION@"
+
 #define KERNEL_VERSION_COMMIT_HASH  "@COMMIT_HASH@"
 
 #define REACTOS_DLL_VERSION_MAJOR   @REACTOS_DLL_VERSION_MAJOR@