[NETSHELL] IDD_NETPROPERTIES must fit 640x480, add 3 missing accelerators

- adds 3 missing accelerators for zh-CN.rc, zh-HK.rc, zh-TW.rc for IDC_SHOWTASKBAR - shrinks the dialog in y to fit on a 640x480 screen, like the XPSP3 and 2k3sp2 dlgs do - for that some positions have to be slightly moved up (which cannot lead to text truncation here, guaranteed) - only 3 controls change in size: - IDC_COMPONENTSLIST gets 3 units smaller in height, but is still larger than in XPSP3/2k3sp2. So it is still large enough - IDC_NETCARDNAME shrinks a bit in width, but is still larger than in XPSP3/2k3sp2, so what fits there will also fit for us - pushbutton IDC_CONFIGURE is slightly increased in width for all languages because it looks better, except uk-UK.rc where it is slightly smaller now, but still large enough. We can use the same with here now as in all other rcs. - strip the lorem ipsum text from IDC_DESCRIPTION, which is never supposed to be displayed. That syncs all rcs in that line and slightly shrinks the binary size. - add a FIXME comment for a missing accelerator in sv-SE.rc *as a consequence all rcs do now use the exact same positions and sizes for all controls again, YIPPIE!* The only exception that the dlg had before from that rule, was the uk-UA.rc IDC_CONFIGURE was larger in x. But now that is not needed anymore.
2025-10-06 16:32:42 +02:00 · 2023-11-06 21:06:54 +01:00
556 changed files with 9957 additions and 16497 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -336,12 +336,14 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to
    add_subdirectory(sdk/include/reactos/mc)
    add_subdirectory(sdk/include/asm)

-    if(ARCH MATCHES "64$")
-        include(sdk/cmake/baseaddress64.cmake)  
-    elseif(NO_ROSSYM)
+    if(NO_ROSSYM)
        include(sdk/cmake/baseaddress_dwarf.cmake)
    elseif(MSVC)
-        include(sdk/cmake/baseaddress_msvc.cmake)
+        if (ARCH STREQUAL "amd64")
+            include(sdk/cmake/baseaddress_msvc_x64.cmake)
+        else()
+            include(sdk/cmake/baseaddress_msvc.cmake)
+        endif()
    else()
        include(sdk/cmake/baseaddress.cmake)
    endif()
--- a/base/applications/calc/calc.h
+++ b/base/applications/calc/calc.h
@@ -15,7 +15,6 @@
 #include <htmlhelp.h>
 #endif
 #include <limits.h>
-#include <strsafe.h>

 /* RESOURCES */
 #include "resource.h"
--- a/base/applications/calc/lang/ru-RU.rc
+++ b/base/applications/calc/lang/ru-RU.rc
@@ -429,8 +429,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
-    IDS_ANGLE_ARCMINUTES "Угловая минута"
-    IDS_ANGLE_ARCSECONDS "Угловая секунда"
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
    IDS_ANGLE_DEGREES "градус"
    IDS_ANGLE_GRADIANS "град"
    IDS_ANGLE_RADIANS "радиан"
--- a/base/applications/calc/utl_ieee.c
+++ b/base/applications/calc/utl_ieee.c
@@ -27,7 +27,7 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)

    switch (base) {
    case IDC_RADIO_HEX:
-        StringCchPrintf(buffer, size, _T("%I64X"), rpn->i);
+        _stprintf(buffer, _T("%I64X"), rpn->i);
        break;
    case IDC_RADIO_DEC:
 /*
@@ -40,11 +40,11 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
        /* calculate the width of integer number */
        width = (rpn->f==0) ? 1 : (int)log10(fabs(rpn->f))+1;
        if (calc.sci_out == TRUE || width > MAX_LD_WIDTH || width < -MAX_LD_WIDTH)
-            StringCchPrintf(buffer, size, _T("%#.*e"), MAX_LD_WIDTH-1, rpn->f);
+            _stprintf(buffer, _T("%#.*e"), MAX_LD_WIDTH-1, rpn->f);
        else {
            TCHAR *ptr, *dst;

-            StringCchPrintfEx(buffer, size, &ptr, NULL, 0, _T("%#*.*f"), width, ((MAX_LD_WIDTH-width-1)>=0) ? MAX_LD_WIDTH-width-1 : 0, rpn->f);
+            ptr = buffer + _stprintf(buffer, _T("%#*.*f"), width, ((MAX_LD_WIDTH-width-1)>=0) ? MAX_LD_WIDTH-width-1 : 0, rpn->f);
            /* format string ensures there is a '.': */
            dst = _tcschr(buffer, _T('.'));
            while (--ptr > dst)
@@ -61,7 +61,7 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
 #undef MAX_LD_WIDTH
        break;
    case IDC_RADIO_OCT:
-        StringCchPrintf(buffer, size, _T("%I64o"), rpn->i);
+        _stprintf(buffer, _T("%I64o"), rpn->i);
        break;
    case IDC_RADIO_BIN:
        if (rpn->i == 0) {
--- a/base/applications/calc/utl_mpfr.c
+++ b/base/applications/calc/utl_mpfr.c
@@ -107,7 +107,7 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
    }
    mpz_clear(zz);
    mpf_clear(ff);
-    StringCchPrintf(buffer, size, _T("%hs"), temp);
+    _sntprintf(buffer, SIZEOF(calc.buffer), _T("%hs"), temp);
 }

 void convert_text2number_2(calc_number_t *a)
--- a/base/applications/calc/winmain.c
+++ b/base/applications/calc/winmain.c
@@ -254,10 +254,10 @@ static void UpdateNumberIntl(void)
 {
    /* Get current user defaults */
    if (!GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, calc.sDecimal, SIZEOF(calc.sDecimal)))
-        StringCbCopy(calc.sDecimal, sizeof(calc.sDecimal), _T("."));
+        _tcscpy(calc.sDecimal, _T("."));

    if (!GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, calc.sThousand, SIZEOF(calc.sThousand)))
-        StringCbCopy(calc.sThousand, sizeof(calc.sThousand), _T(","));
+        _tcscpy(calc.sThousand, _T(","));

    /* get the string lengths */
    calc.sDecimal_len = _tcslen(calc.sDecimal);
@@ -342,7 +342,7 @@ static void save_config(void)
    switch (osvi.dwPlatformId) {
    case VER_PLATFORM_WIN32s:
    case VER_PLATFORM_WIN32_WINDOWS:
-        StringCbPrintf(buf, sizeof(buf), _T("%lu"), calc.layout);
+        _stprintf(buf, _T("%lu"), calc.layout);
        WriteProfileString(_T("SciCalc"), _T("layout"), buf);
        WriteProfileString(_T("SciCalc"), _T("UseSep"), (calc.usesep==TRUE) ? _T("1") : _T("0"));
        break;
@@ -496,16 +496,16 @@ static void update_lcd_display(HWND hwnd)
    TCHAR tmp[MAX_CALC_SIZE * 2 + 2];

    if (calc.buffer[0] == _T('\0'))
-        StringCbCopy(tmp, sizeof(tmp), _T("0"));
+        _tcscpy(tmp, _T("0"));
    else
-        StringCbCopy(tmp, sizeof(tmp), calc.buffer);
+        _tcscpy(tmp, calc.buffer);

    /* Add final '.' in decimal mode (if it's missing), but
     * only if it's a result: no append if it prints "ERROR".
     */
    if (calc.base == IDC_RADIO_DEC && !calc.is_nan) {
        if (_tcschr(tmp, _T('.')) == NULL)
-            StringCbCat(tmp, sizeof(tmp), _T("."));
+            _tcscat(tmp, _T("."));
    }
    /* if separator mode is on, let's add an additional space */
    if (calc.usesep && !calc.sci_in && !calc.sci_out && !calc.is_nan) {
@@ -573,14 +573,13 @@ static void update_parent_display(HWND hWnd)
    if (!n)
        str[0] = _T('\0');
    else
-        StringCbPrintf(str, sizeof(str), _T("(=%d"), n);
+        _stprintf(str,_T("(=%d"), n);
    SetDlgItemText(hWnd, IDC_TEXT_PARENT, str);
 }

 static void build_operand(HWND hwnd, DWORD idc)
 {
    unsigned int i = 0, n;
-    size_t cbPtr;

    if (idc == IDC_BUTTON_DOT) {
        /* if dot is the first char, it's added automatically */
@@ -618,14 +617,12 @@ static void build_operand(HWND hwnd, DWORD idc)
            if (idc != IDC_STATIC)
                calc.esp = (calc.esp * 10 + (key2code[i].key-'0')) % LOCAL_EXP_SIZE;
            if (calc.ptr == calc.buffer)
-                StringCbPrintf(calc.ptr, sizeof(calc.buffer), _T("0.e%+d"), calc.esp);
+                _stprintf(calc.ptr, _T("0.e%+d"), calc.esp);
            else {
                /* adds the dot at the end if the number has no decimal part */
                if (!_tcschr(calc.buffer, _T('.')))
                    *calc.ptr++ = _T('.');
-
-                cbPtr = sizeof(calc.buffer) - ((BYTE*)calc.ptr - (BYTE*)calc.buffer);
-                StringCbPrintf(calc.ptr, cbPtr, _T("e%+d"), calc.esp);
+                _stprintf(calc.ptr, _T("e%+d"), calc.esp);
            }
            update_lcd_display(hwnd);
            return;
@@ -640,11 +637,7 @@ static void build_operand(HWND hwnd, DWORD idc)
            return;
        break;
    }
-
-    cbPtr = sizeof(calc.buffer) - ((BYTE*)calc.ptr - (BYTE*)calc.buffer);
-    StringCbPrintfEx(calc.ptr, cbPtr, &calc.ptr, NULL, STRSAFE_FILL_ON_FAILURE,
-                     _T("%C"), key2code[i].key);
-
+    calc.ptr += _stprintf(calc.ptr, _T("%C"), key2code[i].key);
    update_lcd_display(hwnd);
 }

@@ -857,11 +850,11 @@ static void update_memory_flag(HWND hWnd, BOOL mem_flag)
    SetDlgItemText(hWnd, IDC_TEXT_MEMORY, mem_flag ? _T("M") : _T(""));
 }

-static void update_n_stats_items(HWND hWnd, TCHAR *buffer, size_t cbBuffer)
+static void update_n_stats_items(HWND hWnd, TCHAR *buffer)
 {
    unsigned int n = SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_GETCOUNT, 0, 0);

-    StringCbPrintf(buffer, cbBuffer, _T("n=%u"), n);
+    _stprintf(buffer, _T("n=%u"), n);
    SetDlgItemText(hWnd, IDC_TEXT_NITEMS, buffer);
 }

@@ -912,7 +905,7 @@ static char *ReadConversion(const char *formula)
    str[len+1] = ')';
    str[len+2] = '\0';

-    StringCbCopy(calc.source, sizeof(calc.source), (*calc.buffer == _T('\0')) ? _T("0") : calc.buffer);
+    _tcscpy(calc.source, (*calc.buffer == _T('\0')) ? _T("0") : calc.buffer);

    /* clear display content before proceeding */
    calc.ptr = calc.buffer;
@@ -949,13 +942,13 @@ static INT_PTR CALLBACK DlgStatProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
            if (n == LB_ERR)
                return TRUE;
            SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_DELETESTRING, (WPARAM)n, 0);
-            update_n_stats_items(hWnd, buffer, sizeof(buffer));
+            update_n_stats_items(hWnd, buffer);
            delete_stat_item(n);
            return TRUE;
        case IDC_BUTTON_CAD:
            SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_RESETCONTENT, 0, 0);
            clean_stat_list();
-            update_n_stats_items(hWnd, buffer, sizeof(buffer));
+            update_n_stats_items(hWnd, buffer);
            return TRUE;
        }
        break;
@@ -971,7 +964,7 @@ static INT_PTR CALLBACK DlgStatProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
                           buffer, SIZEOF(buffer),
                           ((statistic_t *)lp)->base);
        SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_ADDSTRING, 0, (LPARAM)buffer);
-        update_n_stats_items(hWnd, buffer, sizeof(buffer));
+        update_n_stats_items(hWnd, buffer);
        return TRUE;
    }
    return FALSE;
@@ -993,13 +986,11 @@ static void CopyMemToClipboard(void *ptr)
    if(OpenClipboard(NULL)) {
        HGLOBAL  clipbuffer;
        TCHAR   *buffer;
-        size_t cbBuffer;

        EmptyClipboard();
-        cbBuffer = (_tcslen(ptr) + 1) * sizeof(TCHAR);
-        clipbuffer = GlobalAlloc(GMEM_DDESHARE, cbBuffer);
+        clipbuffer = GlobalAlloc(GMEM_DDESHARE, (_tcslen(ptr)+1)*sizeof(TCHAR));
        buffer = (TCHAR *)GlobalLock(clipbuffer);
-        StringCbCopy(buffer, cbBuffer, ptr);
+        _tcscpy(buffer, ptr);
        GlobalUnlock(clipbuffer);
 #ifdef UNICODE
        SetClipboardData(CF_UNICODETEXT,clipbuffer);
@@ -1065,8 +1056,9 @@ static char *handle_sequence_input(HWND hwnd, sequence_t *seq)
        }
    } else
    if (ch == '$') {
-        StringCbCopyEx(calc.buffer, sizeof(calc.buffer), calc.source, &calc.ptr, NULL,
-                       STRSAFE_FILL_ON_FAILURE);
+        calc.ptr =
+        _tcscpy(calc.buffer, calc.source) +
+        _tcslen(calc.source);
    } else {
        for (x=0; x<SIZEOF(key2code); x++) {
            if (!(key2code[x].mask & BITMASK_IS_ASCII) ||
--- a/base/applications/charmap/lang/ru-RU.rc
+++ b/base/applications/charmap/lang/ru-RU.rc
@@ -54,5 +54,5 @@ BEGIN
    IDS_ABOUT "&О программе..."
    IDS_TITLE "Таблица символов"
    IDS_UNICODE "Unicode"
-    IDS_ALL "Все"
+    IDS_ALL "All"
 END
--- a/base/applications/clipbrd/lang/ro-RO.rc
+++ b/base/applications/clipbrd/lang/ro-RO.rc
@@ -1,11 +1,4 @@
-/*
- * PROJECT:     ReactOS Clipboard
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Romanian resource file
- * TRANSLATORS: Copyright 2011-2019 Ștefan Fulea <stefan.fulea@mail.com>
- *              Copyright 2023 Andrei Miloiu <miloiuandrei@gmail.com>
- */
-
+/* Translator: Ștefan Fulea (stefan dot fulea at mail dot com) */
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL

 ID_ACCEL ACCELERATORS
@@ -18,7 +11,7 @@ BEGIN
    POPUP "&Fișier"
    BEGIN
        MENUITEM "&Deschidere…", CMD_OPEN
-        MENUITEM "S&alvează ca…", CMD_SAVE_AS
+        MENUITEM "Păst&rare ca…", CMD_SAVE_AS
        MENUITEM SEPARATOR
        MENUITEM "I&eșire", CMD_EXIT
    END
--- a/base/applications/cmdutils/at/lang/ru-RU.rc
+++ b/base/applications/cmdutils/at/lang/ru-RU.rc
@@ -31,7 +31,7 @@ id                 Порядковый номер запланированно
    IDS_CONFIRM_YES "Y"
    IDS_CONFIRM_NO "N"

-    IDS_DELETE_ALL "Эта операция удалит все запланированные задачи.\n"
+    IDS_DELETE_ALL "This operation will delete all scheduled jobs.\n"
    IDS_NEW_JOB "Добавлено новое задание с ID = %lu\n"
    IDS_JOBS_LIST "Статус ID   День                     Время          Команда\n"
    IDS_NO_ENTRIES "В списке нет запланированных задач.\n"
--- a/base/applications/cmdutils/attrib/lang/ro-RO.rc
+++ b/base/applications/cmdutils/attrib/lang/ro-RO.rc
@@ -3,7 +3,6 @@
 * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
 * PURPOSE:     Romanian resource file
 * TRANSLATORS: Copyright 2011-2014 Ștefan Fulea <stefan.fulea@mail.com>
- *              Copyright 2023 Andrei Miloiu <miloiuandrei@gmail.com>
 */

 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
@@ -24,6 +23,6 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] fișier ...\n\
 Tastați ATTRIB fără argumente pentru afișarea atributelor pentru\n\
 toate fișierele.\n"
    STRING_CONSOLE_ERROR "Eroare necunoscută: %d\n"
-    STRING_FILE_NOT_FOUND "Fișierul nu a fost găsit - '%s'\n"
+    STRING_FILE_NOT_FOUND "File not found - '%s'\n"
    STRING_ERROR_INVALID_PARAM_FORMAT "Formatul argumentului este eronat - %s\n"
 END
--- a/base/applications/cmdutils/attrib/lang/ru-RU.rc
+++ b/base/applications/cmdutils/attrib/lang/ru-RU.rc
@@ -26,6 +26,6 @@ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] файл ...\n\
  /D  Обработка и файлов, и папок.\n\n\
 Команда ATTRIB без параметров выводит атрибуты всех файлов.\n"
    STRING_CONSOLE_ERROR "Неизвестная ошибка: %d\n"
-    STRING_FILE_NOT_FOUND "Файл не найден - '%s'\n"
+    STRING_FILE_NOT_FOUND "File not found - '%s'\n"
    STRING_ERROR_INVALID_PARAM_FORMAT "Неверный формат параметра - %s\n"
 END
--- a/base/applications/cmdutils/comp/lang/ru-RU.rc
+++ b/base/applications/cmdutils/comp/lang/ru-RU.rc
@@ -9,7 +9,7 @@ COMP [/L] [/A] [данные1] [данные2]\n\n\
  /A         Вывод различий в формате ASCII (по умолчанию: шестнадцатиричный).\n\
  /L         Вывод номеров строк, в которых обнаружены различия.\n"
    IDS_INVALIDSWITCH "Недопустимый ключ - /%c\n"
-    IDS_BADSYNTAX "Неверный формат командной строки\n"
+    IDS_BADSYNTAX "Не верный формат командной строки\n"
    IDS_FILEERROR "Не удалось найти/открыть файл: %s\n"
    IDS_COMPARING "Сравнение %s и %s...\n"
    IDS_FILESIZEERROR "Не удалось определить размер файла: %s\n"
--- a/base/applications/cmdutils/fc/lang/ru-RU.rc
+++ b/base/applications/cmdutils/fc/lang/ru-RU.rc
@@ -30,9 +30,9 @@ FC /B [диск1:][путь1]имя_файла1 [диск2:][путь2]имя_ф
    IDS_LONGER_THAN "FC: %ls длиннее, чем %ls\n"
    IDS_COMPARING "Сравнение файлов %ls и %ls\n"
    IDS_OUT_OF_MEMORY "FC: Недостаточно памяти\n"
-    IDS_CANNOT_READ "FC: Не удаётся прочитать %ls\n"
+    IDS_CANNOT_READ "FC: не удаётся прочитать %ls\n"
    IDS_INVALID_SWITCH "FC: Недопустимый ключ\n"
-    IDS_CANNOT_OPEN "FC: Не удаётся открыть %ls - файл либо папка не существует\n"
+    IDS_CANNOT_OPEN "FC: не удаётся открыть %ls - файл либо папка не существует\n"
    IDS_NEEDS_FILES "FC: Недостаточное количество имён файлов\n"
    IDS_CANT_USE_WILDCARD "Подстановочные знаки ('*' и '?') пока не поддерживаются\n"
    IDS_DIFFERENT "FC: Файлы %ls и %ls различны\n"
--- a/base/applications/cmdutils/find/lang/ro-RO.rc
+++ b/base/applications/cmdutils/find/lang/ro-RO.rc
@@ -1,9 +1,9 @@
 /*
- * PROJECT:     ReactOS Find Command
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Romanian resource file
- * TRANSLATORS: Copyright 2011-2019 Ștefan Fulea <stefan.fulea@mail.com>
- *              Copyright 2023 Andrei Miloiu <miloiuandrei@gmail.com>
+ * FILE:       base/applications/cmdutils/find/lang/ro-RO.rc
+ *             ReactOS Project (https://reactos.org)
+ * TRANSLATOR: Fulea Ștefan (PM on ReactOS Forum at fulea.stefan)
+ * CHANGE LOG: 2011-08-20  initial translation
+ *             2011-10-17  diacritics change, other minor changes
 */

 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
@@ -16,9 +16,8 @@ FIND [/V] [/C] [/N] [/I] [/OFF[LINE]] ""șir"" [fișier...]\n\
  /C         Numără liniile ce conțin șirul.\n\
  /N         Numără rândurile afișate, începând cu 1.\n\
  /I         Ignoră diferențele între majuscule și minuscule.\n\
-  /OFF[LINE] Nu omite fișierele care au configurate atributul\n\
-             offline (deconectat)."
+  /OFF[LINE] Do not skip files that have the offline attribute set."
    IDS_NO_SUCH_FILE "FIND: Fișierul «%s» nu există!\n"
    IDS_CANNOT_OPEN "FIND: Fișierul «%s» nu poate fi deschis!\n"
-    IDS_INVALID_SWITCH "FIND: Comutare nevalidă\n"
+    IDS_INVALID_SWITCH "FIND: Invalid switch\n"
 END
--- a/base/applications/cmdutils/find/lang/ru-RU.rc
+++ b/base/applications/cmdutils/find/lang/ru-RU.rc
@@ -8,11 +8,11 @@ FIND [/V] [/C] [/N] [/I] [/OFF[LINE]] ""строка"" [[диск:][путь]и
  /C         Вывод только общего числа строк, содержащих заданную строку.\n\
  /N         Вывод номеров отображаемых строк.\n\
  /I         Поиск без учета регистра символов.\n\
-  /OFF[LINE] Не пропускать файлы, у которых установлен атрибут offline.\n\
+  /OFF[LINE] Do not skip files that have the offline attribute set.\n\
  ""строка""   Искомая строка.\n\
  [диск:][путь]имя_файла\n\
             Один или несколько файлов, в которых выполняется поиск."
    IDS_NO_SUCH_FILE "FIND: %s: Файл не существует.\n"
    IDS_CANNOT_OPEN "FIND: %s: Невозможно открыть файл.\n"
-    IDS_INVALID_SWITCH "FIND: Недопустимый ключ\n"
+    IDS_INVALID_SWITCH "FIND: Invalid switch\n"
 END
--- a/base/applications/cmdutils/label/lang/ro-RO.rc
+++ b/base/applications/cmdutils/label/lang/ro-RO.rc
@@ -1,26 +1,20 @@
-/*
- * PROJECT:     ReactOS Label Command
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Romanian resource file
- * TRANSLATORS: Copyright 2011-2019 Ștefan Fulea <stefan.fulea@mail.com>
- *              Copyright 2023 Andrei Miloiu <miloiuandrei@gmail.com>
- */
+/* Translator: Ștefan Fulea (stefan dot fulea at mail dot com) */

 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL

 STRINGTABLE
 BEGIN
 //    STRING_LABEL_HELP "Afișează sau modifică eticheta unei unități (de stocare).\n\nLABEL [unitate:][etichetă]\n"
-    STRING_LABEL_HELP "Crează, schimbă sau șterge denumirea unui dispozitiv.\n\n\
-LABEL [dispozitiv:][denumire]\n\n\
-  dispozitiv:     Specifică litera unui dispozitiv.\n\
-  denumire        Specifică denumirea unui dispozitiv."
-    STRING_LABEL_TEXT1 "Volumul unității %c: este denumit ca %s\n"
-    STRING_LABEL_TEXT2 "Volumul unității %c: nu este denumit.\n"
+    STRING_LABEL_HELP "Creates, changes or deletes the volume label of a disk.\n\n\
+LABEL [drive:][label]\n\n\
+  drive:          Specifies the drive letter of a drive.\n\
+  label           Specifies the label of the drive."
+    STRING_LABEL_TEXT1 "Volumul unității %c: este etichetat ca %s\n"
+    STRING_LABEL_TEXT2 "Volumul unității %c: nu este etichetat.\n"
    STRING_LABEL_TEXT3 "Numărul de serie al volumului este %04X-%04X\n"
-    STRING_LABEL_TEXT4 "Introduceți denumirea unității (opțională, de 32 caractere), apoi ENTER "
-    STRING_LABEL_PROMPT "Ștergeți denumirea actuală a volumului (Da/Nu)? "
-    STRING_LABEL_OPTIONS "DaNu"
+    STRING_LABEL_TEXT4 "Introduceți eticheta unității (opțională, de 32 caractere), apoi ENTER "
+    STRING_LABEL_PROMPT "Delete current volume label (Y/N)? "
+    STRING_LABEL_OPTIONS "YN"
    STRING_ERROR_INVALID_DRIVE "Specificarea unității este eronată\n"
-    STRING_ERROR_INVALID_LABEL "Denumirea volumului e nevalidă\n"
+    STRING_ERROR_INVALID_LABEL "Invalid volume label\n"
 END
--- a/base/applications/cmdutils/more/lang/ro-RO.rc
+++ b/base/applications/cmdutils/more/lang/ro-RO.rc
@@ -1,65 +1,60 @@
 /*
- * PROJECT:     ReactOS More Command
- * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
- * PURPOSE:     Romanian resource file
- * TRANSLATORS: Copyright 2011-2019 Ștefan Fulea <stefan.fulea@mail.com>
- *              Copyright 2023 Andrei Miloiu <miloiuandrei@gmail.com>
+ * FILE:       base/applications/cmdutils/more/lang/ro-RO.rc
+ *             ReactOS Project (https://reactos.org)
+ * TRANSLATOR: Fulea Ștefan (PM on ReactOS Forum at fulea.stefan)
+ * CHANGE LOG: 2011-08-20  initial translation
+ *             2011-10-17  diacritics change, other minor changes
 */

 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL

 STRINGTABLE
 BEGIN
-    IDS_USAGE "Afișarea datelor pe ecran, pagină cu pagină.\n\
+    IDS_USAGE "Afișează date pe ecran, pagină-cu-pagină.\n\
 \n\
-MORE [/E [opțiuni]] < [dispozitiv:][cale]numele fișierului\n\
-command | MORE [/E [opțiuni]\n\
+MORE [/E [options]] < [drive:][path]filename\n\
+command | MORE [/E [options]]\n\
 \n\
-    [dispozitiv:][cale]numele fișierului  Un fișier al cărui conținut\n\
-                                          urmează să fie afișat.\n\
-    comandă                               O comandă a cărei ieșire\n\
-                                          urmează să fie afișată.\n\
+    [drive:][path]filename  A file whose contents are to be displayed.\n\
+    command                 A command whose output is to be displayed.\n\
 \n\
-Atunci când opțiunea Caracteristici extinse e activată,\n\
-următoarea formă este acceptată:\n\
-MORE [/E] [opțiuni] [fișiere]\n\
+When Extended Features are enabled, the following form is supported:\n\
+MORE [/E] [options] [files]\n\
 \n\
-Opțiuni:\n\
-    /E       Activarea opțiunii Caracteristici extinse.\n\
-    Stadiul implicit al Caracteristicilor extinse e controlat de setările\n\
-    implicite de registru pentru programul CMD.EXE. Pentru mai multe detalii\n\
-    legate de cum pot fi schimbate aceste setări, vedeți secțiunea\n\
-    ""Extensii de comenzi"" în secțiunea de ajutor a programului CMD.EXE.\n\
+Options:\n\
+    /E       Enable Extended Features.\n\
+    The default state of the Extended Features is controlled by the default\n\
+    registry settings for CMD.EXE. For more details on how to change these\n\
+    settings, see the section ""Command Extensions"" in CMD.EXE help.\n\
 \n\
-Atunci când opțiunea Caracteristici extinse e activată, sunt disponibile\n\
-următoarele opțiuni:\n\
-    /C       Curățarea ecranului înainte de a se afișa o pagină.\n\
-    /P       Extinderea caracterelor Form-Feed (de alimentare de formulare).\n\
-    /S       Reducerea liniilor goale succesive la o singură linie.\n\
-    /Tn      Extinderea tab-urilor la n spații (implicit: 8).\n\
+    When Extended Features are enabled, the following options are available:\n\
+    /C       Clear the screen before displaying a page.\n\
+    /P       Expand Form-Feed characters.\n\
+    /S       Shrink successive blank lines to a single line.\n\
+    /Tn      Expand tabs to n spaces (default: 8).\n\
 \n\
-    Aceste opțiuni pot fi specificate în variabila de mediu MORE.\n\
+    These options can be specified in the MORE environment variable.\n\
 \n\
-    +n       Începerea afișării primului fișier la linia n.\n\
-    fișiere  Lista fișierelor de afișat, separate prin spații libere.\n\
+    +n       Start displaying the first file at line n.\n\
+    files    List of files to display, separated by blanks.\n\
 \n\
-Atunci când opțiunea Caracteristici extinse e activată, sunt disponibile\n\
-următoarele comenzi la panoul ""-- Continuă --"":\n\
+When Extended Features are enabled, the following commands are available\n\
+at the ""-- Continue --"" prompt:\n\
 \n\
-    P n      Afișarea următoarelor n linii.\n\
-    S n      Omiterea următoarelor n linii.\n\
-    F        Afișarea următorului fișier.\n\
-    Q        Ieșire.\n\
-    =        Afișarea numărului de linie.\n\
-    ?        Afișarea liniei de ajutor.\n\
-    <Space>  Afișarea următoarei pagini.\n\
-    <Enter>  Afișarea următoari linii.\n"
+    P n      Display the next n lines.\n\
+    S n      Skip the next n lines.\n\
+    F        Display the next file.\n\
+    Q        Quit.\n\
+    =        Show the line number.\n\
+    ?        Show the help line.\n\
+    <Space>  Display the next page.\n\
+    <Enter>  Display the next line.\n"

-    IDS_BAD_FLAG "Argument nevalid - '%s'\n"
+    IDS_BAD_FLAG "Invalid argument - '%s'\n"
    IDS_FILE_ACCESS "Fișierul «%s» nu poate fi accesat!\n"
    IDS_CONTINUE_PROMPT  "-- Continuă%1%2%3 --%4"
    IDS_CONTINUE_PERCENT " (%d%%)"
-    IDS_CONTINUE_LINE_AT " [Linie: %d]"
-    IDS_CONTINUE_OPTIONS " [Opțiuni: psfq=<Space><Enter>]"
-    IDS_CONTINUE_LINES   " Linii: "
+    IDS_CONTINUE_LINE_AT " [Line: %d]"
+    IDS_CONTINUE_OPTIONS " [Options: psfq=<Space><Enter>]"
+    IDS_CONTINUE_LINES   " Lines: "
 END
--- a/base/applications/cmdutils/taskkill/lang/ro-RO.rc
+++ b/base/applications/cmdutils/taskkill/lang/ro-RO.rc
@@ -1,10 +1,4 @@
-/*
- * PROJECT:     ReactOS Taskkill Command
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Romanian resource file
- * TRANSLATORS: Copyright 2011-2019 Ștefan Fulea <stefan.fulea@mail.com>
- *              Copyright 2023 Andrei Miloiu <miloiuandrei@gmail.com>
- */
+/* Translator: Ștefan Fulea (stefan dot fulea at mail dot com) */

 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL

@@ -24,6 +18,6 @@ STRINGTABLE
    STRING_ENUM_FAILED, "Eroare: Procesele nu au putut fi enumerate.\n"
    STRING_TERMINATE_FAILED, "Eroare: Procesul «%1» nu poate fi oprit.\n"
    STRING_SELF_TERMINATION, "Eroare: Auto-terminarea nu este permisă.\n"
-    STRING_PARAM_TOO_MUCH, "Eroare: Sintaxă nevalidă. Opțiunea '%1' nu este permisă mai mult de '%2!d!' dată(dăți).\n"
-    STRING_INVALID_SYNTAX, "Eroare: Sintaxă nevalidă.\n"
+    STRING_PARAM_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n"
+    STRING_INVALID_SYNTAX, "Error: Invalid syntax.\n"
 }
--- a/base/applications/cmdutils/xcopy/lang/ru-RU.rc
+++ b/base/applications/cmdutils/xcopy/lang/ru-RU.rc
@@ -52,7 +52,7 @@ XCOPY источник [целевой_объект] [/I] [/S] [/Q] [/F] [/L] [/
 /A  Копирует только те файлы, для которых установлен атрибут ""архивный"".\n\
 /M  Копирует только те файлы, для которых установлен атрибут ""архивный"",\n\
      при этом атрибут удаляется.\n\
-[/K]  Копирует атрибуты файлов, без этого атрибуты не сохраняются.\n\
+[/K]  Copy file attributes, without this attributes are not preserved.\n\
 /D | /D:m-d-y Копирование файлов, измененных не ранее указанной даты.\n\
              Если дата не указана, заменяются только конечные файлы,\n\
              более старые, чем исходные.\n"
--- a/base/applications/dxdiag/lang/ro-RO.rc
+++ b/base/applications/dxdiag/lang/ro-RO.rc
@@ -1,9 +1,7 @@
 /*
- * PROJECT:     ReactOS DX Diagnostic
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Romanian resource file
- * TRANSLATORS: Copyright 2011-2019 Ștefan Fulea <stefan.fulea@mail.com>
- *              Copyright 2023 Andrei Miloiu <miloiuandrei@gmail.com>
+ * FILE:        base/applications/dxdiag/lang/ro-RO.rc
+ *              ReactOS Project (https://reactos.org)
+ * TRANSLATOR:  Ștefan Fulea (stefan dot fulea at mail dot com)
 */

 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
@@ -17,7 +15,7 @@ BEGIN
    CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250
    PUSHBUTTON "&Manual…", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED
    DEFPUSHBUTTON "&Următorul compartiment", IDC_BUTTON_NEXT, 187, 260, 120, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "S&alvare informații…", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED
+    PUSHBUTTON "&Păstrare informații…", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED
    PUSHBUTTON "Î&nchide", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END

@@ -25,7 +23,7 @@ IDD_SYSTEM_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Acest instrument oferă informații detaliate despre componentele ReactX și drivere instalate în sistem.", IDC_STATIC, 5, 0, 443, 17
+    LTEXT "Acest instrument oferă informații detaliate despre componentele ReactX și modulele-pilot instalate în sistem.", IDC_STATIC, 5, 0, 443, 17
    LTEXT "Dacă aveți la cunoștință careva probleme la o anumită categorie, mergeți la compartimentul corespunzător de mai sus. Altfel, puteți utiliza butonul „Următorul compartiment” de mai jos pentru a trece secvențial prin fiecare categorie.", IDC_STATIC, 5, 15, 443, 25
    GROUPBOX "Informații despre sistem", IDC_STATIC, 5, 35, 452, 150, SS_RIGHT
    LTEXT "Data/Ora curentă:", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT
--- a/base/applications/fltmc/lang/ro-RO.rc
+++ b/base/applications/fltmc/lang/ro-RO.rc
@@ -1,23 +1,17 @@
-/*
- * PROJECT:     ReactOS fltmc utility
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Romanian resource file
- * TRANSLATORS: Copyright 2011-2019 Ștefan Fulea <stefan.fulea@mail.com>
- *              Copyright 2023 Andrei Miloiu <miloiuandrei@gmail.com>
- */
+/* Translator: Ștefan Fulea (stefan dot fulea at mail dot com) */

 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL

 STRINGTABLE
 BEGIN
    IDS_USAGE "\nComenzi valide:\n\
-               load        Încarcă un driver de tip filtru\n\
-               unload      Descarcă un driver de tip filtru\n\
+               load        Încarcă un modul-pilot de tip filtru\n\
+               unload      Descarcă un modul-pilot de tip filtru\n\
               filters     Afișează filtrele înregistrate acum în sistem\n\n\
               volumes     Afișează toate volumele\n\n"

-    IDS_USAGE_LOAD      "Încarcă un driver de tip filtru\n"
-    IDS_USAGE_UNLOAD    "Descarcă un driver de tip filtru\n"
+    IDS_USAGE_LOAD      "Încarcă un modul-pilot de tip filtru\n"
+    IDS_USAGE_UNLOAD    "Descarcă un modul-pilot de tip filtru\n"
    IDS_USAGE_FILTERS   "Afișează toate filtrele înregistrate\n"
    IDS_USAGE_VOLUMES   "Afișează toate volumele\n"
 END
@@ -31,7 +25,7 @@ END

 STRINGTABLE
 BEGIN
-    IDS_ERROR_PRIV      "Eșec la instituirea dreptului de încărcare pentru driverul (0x%X)\n"
+    IDS_ERROR_PRIV      "Eșec la instituirea dreptului de încărcare pentru modulul-pilot (0x%X)\n"
    IDS_ERROR_FILTERS   "Eșec la afișarea filtrelor (0x%X)\n"
    IDS_ERROR_LOAD      "Eșec la încărcarea filtrului (0x%X)\n"
    IDS_ERROR_UNLOAD    "Eșec la descărcarea filtrului (0x%X)\n"
--- a/base/applications/fltmc/lang/ru-RU.rc
+++ b/base/applications/fltmc/lang/ru-RU.rc
@@ -11,7 +11,7 @@ BEGIN
    IDS_USAGE_LOAD      "Загружает драйвер фильтра\n"
    IDS_USAGE_UNLOAD    "Выгружает драйвер фильтра\n"
    IDS_USAGE_FILTERS   "Выводит список всех зарегистрированных фильтров\n"
-    IDS_USAGE_VOLUMES   "Выводит список всех томов\n"
+    IDS_USAGE_VOLUMES   "Lists all volumes\n"
 END

 STRINGTABLE
@@ -27,5 +27,5 @@ BEGIN
    IDS_ERROR_FILTERS   "Не удалось получить список фильтров (0x%X)\n"
    IDS_ERROR_LOAD      "Не удалось загрузить фильтр (0x%X)\n"
    IDS_ERROR_UNLOAD    "Не удалось выгрузить фильтр (0x%X)\n"
-    IDS_ERROR_VOLUMES   "Не удалось получить список томов (0x%X)\n"
+    IDS_ERROR_VOLUMES   "Failed to list the volumes (0x%X)\n"
 END
--- a/base/applications/games/solitaire/lang/ro-RO.rc
+++ b/base/applications/games/solitaire/lang/ro-RO.rc
@@ -4,7 +4,7 @@
 * PURPOSE:     Romanian resource file
 * TRANSLATORS: Copyright 2009 Petru Dimitriu <petrimetri@gmail.com>
 *              Copyright 2011-2018 Ștefan Fulea <stefan.fulea@mail.com>
- *              Copyright 2022-2023 Andrei Miloiu <miloiuandrei@gmail.com>
+ *              Copyright 2022 Andrei Miloiu <miloiuandrei@gmail.com>
 */

 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
@@ -25,7 +25,7 @@ BEGIN
    AUTORADIOBUTTON "Fă&ră", IDC_OPT_NOSCORE, 107, 45, 60, 10
    AUTOCHECKBOX "&Afișează timp", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
    AUTOCHECKBOX "&Bară de stare", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
-    AUTOCHECKBOX "Salvea&ză scorul", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Păstrează scorul", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
    DEFPUSHBUTTON "Con&firmă", IDOK, 35, 97, 50, 14
    PUSHBUTTON "A&nulează", IDCANCEL, 101, 97, 50, 14
 END
--- a/base/applications/magnify/lang/ro-RO.rc
+++ b/base/applications/magnify/lang/ro-RO.rc
@@ -1,10 +1,6 @@
 /*
- * PROJECT:     ReactOS Magnifier
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Romanian resource file
- * TRANSLATORS: Copyright 2011 Petru Dimitriu <petrimetri@gmail.com>
- *              Copyright 2011-2019 Ștefan Fulea <stefan.fulea@mail.com>
- *              Copyright 2023 Andrei Miloiu <miloiuandrei@gmail.com>
+ * Translators: Petru Dimitriu (petrimetri at gmail dot com)
+ *              Ștefan Fulea (stefan dot fulea at mail dot com)
 */

 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
@@ -39,7 +35,7 @@ END

 IDD_DIALOGOPTIONS DIALOGEX 0, 0, 153, 182
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Setările lupei"
+CAPTION "Configurare lupă"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
    DEFPUSHBUTTON "Î&nchide", IDOK, 96, 161, 50, 14
--- a/base/applications/mmc/lang/ro-RO.rc
+++ b/base/applications/mmc/lang/ro-RO.rc
@@ -28,8 +28,8 @@ BEGIN
    BEGIN
        MENUITEM "&Nou\tCtrl+N", IDM_FILE_NEW
        MENUITEM "&Deschide\tCtrl+O", IDM_FILE_OPEN
-        MENUITEM "S&alvează", IDM_FILE_SAVE
-        MENUITEM "Sal&vează ca…", IDM_FILE_SAVEAS
+        MENUITEM "&Păstrează", IDM_FILE_SAVE
+        MENUITEM "Păst&rare în…", IDM_FILE_SAVEAS
        MENUITEM SEPARATOR
        MENUITEM "I&eșire\tAlt+F4", IDM_FILE_EXIT
    END
--- a/base/applications/msconfig/lang/ro-RO.rc
+++ b/base/applications/msconfig/lang/ro-RO.rc
@@ -1,10 +1,4 @@
-/*
- * PROJECT:     ReactOS System Configuration Tool
- * LICENSE:     LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later)
- * PURPOSE:     Romanian resource file
- * TRANSLATORS: Copyright 2011-2019 Ștefan Fulea <stefan.fulea@mail.com>
- *              Copyright 2023 Andrei Miloiu <miloiuandrei@gmail.com>
- */
+/* Ștefan Fulea (stefan dot fulea at mail dot com) */

 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL

@@ -74,8 +68,8 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
    GROUPBOX "Moduri de pornire sistem", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT
-    CONTROL "Pornire n&ormală - încarcă toate serviciile și driverele", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10
-    CONTROL "Pornire de &diagnostic - încarcă doar driverele de bază", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10
+    CONTROL "Pornire n&ormală - încarcă toate serviciile și modulele-pilot", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10
+    CONTROL "Pornire de &diagnostic - încarcă doar modulele-pilot de bază", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10
    CONTROL "Pornire s&electivă", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10
    AUTOCHECKBOX "&Procesează fișierul SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10
    AUTOCHECKBOX "Încarcă se&rviciile de sistem", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10
--- a/base/applications/msconfig_new/lang/ro-RO.rc
+++ b/base/applications/msconfig_new/lang/ro-RO.rc
@@ -1,10 +1,4 @@
-/*
- * PROJECT:     ReactOS System Configuration Tool
- * LICENSE:     LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later)
- * PURPOSE:     Romanian resource file
- * TRANSLATORS: Copyright 2011-2019 Ștefan Fulea <stefan.fulea@mail.com>
- *              Copyright 2023 Andrei Miloiu <miloiuandrei@gmail.com>
- */
+/* Ștefan Fulea (stefan dot fulea at mail dot com) */

 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL

@@ -16,7 +10,7 @@ BEGIN
    ICON            IDI_APPICON, IDC_STATIC, 14, 14, 20, 20
    LTEXT           "Program de configurare al sistemului\nVersiune 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX
 //  "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n"
-    LTEXT           "Drept de autor (C) Echipa ReactOS 2005-2023\n\
+    LTEXT           "Drept de autor (C) Echipa ReactOS 2005-2015\n\
 Christoph von Wittich (Christoph@ApiViewer.de)\n\
 Gregor Schneider (Gregor.Schneider@reactos.org)\n\
 Hermès BÉLUSCA - MAÏTO (hermes.belusca@sfr.fr)",
@@ -40,8 +34,8 @@ BEGIN
    PUSHBUTTON      "Lansează &Restaurare sistem", IDC_BTN_SYSTEM_RESTORE_START, 146, 156, 124, 14
    PUSHBUTTON      "E&xtindere fișier…", IDC_BTN_FILE_EXTRACTION, 275, 156, 85, 14
    GROUPBOX        "Moduri de pornire sistem", IDC_STATIC, 5, 5, 356, 145
-    LTEXT           "Încarcă toate serviciile și driverele", IDC_STATIC, 25, 30, 322, 10
-    LTEXT           "Încarcă doar driverele de bază", IDC_STATIC, 25, 58, 322, 10
+    LTEXT           "Încarcă toate serviciile și modulele-pilot", IDC_STATIC, 25, 30, 322, 10
+    LTEXT           "Încarcă doar modulele-pilot de bază", IDC_STATIC, 25, 58, 322, 10
 END

 IDD_SYSTEM_PAGE DIALOGEX 0, 0, 366, 175
--- a/base/applications/mscutils/eventvwr/lang/ro-RO.rc
+++ b/base/applications/mscutils/eventvwr/lang/ro-RO.rc
@@ -4,7 +4,6 @@
 * PURPOSE:     Romanian resource file
 * TRANSLATORS: Copyright 2009 Petru Dimitriu <petrimetri@gmail.com>
 *              Copyright 2011-2018 Ștefan Fulea <stefan.fulea@mail.com>
- *              Copyright 2023 Andrei Miloiu <miloiuandrei@gmail.com>
 */

 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
@@ -14,12 +13,12 @@ BEGIN
    POPUP "&Jurnal"
    BEGIN
        MENUITEM "&Deschidere…", IDM_OPEN_EVENTLOG
-        MENUITEM "&Salvează jurnal de evenimente ca…", IDM_SAVE_EVENTLOG
+        MENUITEM "&Păstrare jurnal de evenimente ca…", IDM_SAVE_EVENTLOG
        MENUITEM "Î&nchide", IDM_CLOSE_EVENTLOG
        MENUITEM SEPARATOR
        MENUITEM "Înlăt&ură toate evenimentele", IDM_CLEAR_EVENTS
        MENUITEM "&Redenumire\tF2", IDM_RENAME_EVENTLOG
-        MENUITEM "&Setări pentru jurnal…", IDM_EVENTLOG_SETTINGS
+        MENUITEM "&Configurare jurnal…", IDM_EVENTLOG_SETTINGS
        MENUITEM SEPARATOR
        MENUITEM "I&eșire", IDM_EXIT
    END
@@ -37,7 +36,7 @@ BEGIN
        MENUITEM "Afișează detalii de e&venimente", IDM_EVENT_DETAILS_VIEW
        MENUITEM "Afișează linii de g&rilaj", IDM_LIST_GRID_LINES
        MENUITEM SEPARATOR
-        MENUITEM "&Salvează setările la ieșire", IDM_SAVE_SETTINGS
+        MENUITEM "&Păstrează configurația la ieșire", IDM_SAVE_SETTINGS
    END
    POPUP "Aj&utor"
    BEGIN
@@ -51,12 +50,12 @@ IDM_EVENTWR_CTX MENU
 BEGIN
    POPUP ""
    BEGIN
-        MENUITEM "&Deschide jurnalul de evenimente...", IDM_OPEN_EVENTLOG
-        MENUITEM "Salv&ează jurnalul de evenimente ca...", IDM_SAVE_EVENTLOG
+        MENUITEM "&Open Event Log...", IDM_OPEN_EVENTLOG
+        MENUITEM "&Save Event Log as...", IDM_SAVE_EVENTLOG
        MENUITEM SEPARATOR
-        MENUITEM "Șter&ge toate evenimentele", IDM_CLEAR_EVENTS
-        MENUITEM "&Redenumește\tF2", IDM_RENAME_EVENTLOG
-        MENUITEM "Setări de &jurnal...", IDM_EVENTLOG_SETTINGS
+        MENUITEM "&Clear all Events", IDM_CLEAR_EVENTS
+        MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG
+        MENUITEM "Log Se&ttings...", IDM_EVENTLOG_SETTINGS
    END
 END

@@ -130,7 +129,7 @@ BEGIN
    EDITTEXT IDC_CREATED_LABEL, 67, 69, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
    LTEXT "Modificat:", IDC_STATIC, 7, 81, 60, 8
    EDITTEXT IDC_MODIFIED_LABEL, 67, 81, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "Accesat:", IDC_STATIC, 7, 93, 60, 8
+    LTEXT "Accessat:", IDC_STATIC, 7, 93, 60, 8
    EDITTEXT IDC_ACCESSED_LABEL, 67, 93, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
    GROUPBOX "Dimensiune jurnal", IDC_STATIC, 7, 106, 238, 99
    LTEXT "Dimensiune ma&ximă pentru jurnal:", IDC_STATIC, 17, 122, 58, 8
@@ -164,7 +163,7 @@ BEGIN
    IDS_EVENTLOG_USER "Jurnale de utilizator"
    IDS_SAVE_FILTER "Jurnal de evenimente (*.evt)\0*.evt\0"
    IDS_CLEAREVENTS_MSG "Doriți păstrarea acestui jurnal de evenimente înainte de a-l închide?"
-    IDS_RESTOREDEFAULTS "Doriți să restaurați toate setările pentru acest jurnal la valorile lor implicite?"
+    IDS_RESTOREDEFAULTS "Do you want to restore all settings for this log to their default values?"
    IDS_EVENTSTRINGIDNOTFOUND "Descrierea evenimentului cu ID-ul ( %lu ) în sursa ( %s ) nu a fost găsită. Este posibil ca în calculatorul local să nu existe informațiile de registru necesare sau fișierele dll de mesaje să afișeze mesaje de la un calculator din rețea.\n\nInformații aferente evenimentului:\n\n"
 END

--- a/base/applications/mscutils/servman/lang/ro-RO.rc
+++ b/base/applications/mscutils/servman/lang/ro-RO.rc
@@ -1,10 +1,6 @@
 /*
- * PROJECT:     ReactOS Service Manager
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Romanian resource file
- * TRANSLATORS: Copyright 2011 Petru Dimitriu <petrimetri@gmail.com>
- *              Copyright 2011-2019 Ștefan Fulea <stefan.fulea@mail.com>
- *              Copyright 2023 Andrei Miloiu <miloiuandrei@gmail.com>
+ * Translators: Petru Dimitriu (petrimetri at gmail dot com)
+ *              Ștefan Fulea (stefan dot fulea at mail dot com)
 */

 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
@@ -137,7 +133,7 @@ BEGIN
    COMBOBOX IDC_SECOND_FAILURE, 104, 39, 141, 147, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
    LTEXT "Alt&e căderi:", IDC_STATIC, 7, 58, 92, 8
    COMBOBOX IDC_SUBSEQUENT_FAILURES, 104, 56, 141, 147, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
-    LTEXT "&Repornire contor după:", IDC_STATIC, 7, 75, 72, 8
+    LTEXT "&Ropornire contor după:", IDC_STATIC, 7, 75, 72, 8
    EDITTEXT IDC_RESET_TIME, 104, 73, 40, 13, WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP | ES_LEFT | ES_AUTOHSCROLL | ES_NUMBER
    LTEXT "zile", IDC_STATIC, 150, 75, 95, 8
    LTEXT "Repornire ser&viciu după:", IDC_RESTART_TEXT1, 7, 92, 92, 8
@@ -336,7 +332,7 @@ BEGIN
    IDS_NO_ACTION "Nici o acțiune"
    IDS_RESTART_SERVICE "Repornește serviciul"
    IDS_RUN_PROGRAM "Execută un program"
-    IDS_RESTART_COMPUTER "Repornește calculatorul"
+    IDS_RESTART_COMPUTER "Ropornește calculatorul"
 END

 STRINGTABLE
--- a/base/applications/mspaint/common.h
+++ b/base/applications/mspaint/common.h
@@ -49,11 +49,3 @@ BOOL OpenMailer(HWND hWnd, LPCWSTR pszPathName);

 #define DEG2RAD(degree) (((degree) * M_PI) / 180)
 #define RAD2DEG(radian) ((LONG)(((radian) * 180) / M_PI))
-
-template <typename T>
-inline void Swap(T& a, T& b)
-{
-    T tmp = a;
-    a = b;
-    b = tmp;
-}
--- a/base/applications/mspaint/dib.cpp
+++ b/base/applications/mspaint/dib.cpp
@@ -406,39 +406,6 @@ HBITMAP SkewDIB(HDC hDC1, HBITMAP hbm, INT nDegree, BOOL bVertical, BOOL bMono)
    return hbmNew;
 }

-HBITMAP getSubImage(HBITMAP hbmWhole, const RECT& rcPartial)
-{
-    CRect rc = rcPartial;
-    HBITMAP hbmPart = CreateDIBWithProperties(rc.Width(), rc.Height());
-    if (!hbmPart)
-        return NULL;
-
-    HDC hDC1 = ::CreateCompatibleDC(NULL);
-    HDC hDC2 = ::CreateCompatibleDC(NULL);
-    HGDIOBJ hbm1Old = ::SelectObject(hDC1, hbmWhole);
-    HGDIOBJ hbm2Old = ::SelectObject(hDC2, hbmPart);
-    ::BitBlt(hDC2, 0, 0, rc.Width(), rc.Height(), hDC1, rc.left, rc.top, SRCCOPY);
-    ::SelectObject(hDC1, hbm1Old);
-    ::SelectObject(hDC2, hbm2Old);
-    ::DeleteDC(hDC1);
-    ::DeleteDC(hDC2);
-    return hbmPart;
-}
-
-void putSubImage(HBITMAP hbmWhole, const RECT& rcPartial, HBITMAP hbmPart)
-{
-    CRect rc = rcPartial;
-    HDC hDC1 = ::CreateCompatibleDC(NULL);
-    HDC hDC2 = ::CreateCompatibleDC(NULL);
-    HGDIOBJ hbm1Old = ::SelectObject(hDC1, hbmWhole);
-    HGDIOBJ hbm2Old = ::SelectObject(hDC2, hbmPart);
-    ::BitBlt(hDC1, rc.left, rc.top, rc.Width(), rc.Height(), hDC2, 0, 0, SRCCOPY);
-    ::SelectObject(hDC1, hbm1Old);
-    ::SelectObject(hDC2, hbm2Old);
-    ::DeleteDC(hDC1);
-    ::DeleteDC(hDC2);
-}
-
 struct BITMAPINFODX : BITMAPINFO
 {
    RGBQUAD bmiColorsAdditional[256 - 1];
--- a/base/applications/mspaint/dib.h
+++ b/base/applications/mspaint/dib.h
@@ -44,5 +44,3 @@ float PpcmFromDpi(float dpi);
 HGLOBAL BitmapToClipboardDIB(HBITMAP hBitmap);
 HBITMAP BitmapFromClipboardDIB(HGLOBAL hGlobal);
 HBITMAP BitmapFromHEMF(HENHMETAFILE hEMF);
-HBITMAP getSubImage(HBITMAP hbmWhole, const RECT& rcPartial);
-void putSubImage(HBITMAP hbmWhole, const RECT& rcPartial, HBITMAP hbmPart);
--- a/base/applications/mspaint/fullscreen.cpp
+++ b/base/applications/mspaint/fullscreen.cpp
@@ -44,7 +44,7 @@ LRESULT CFullscreenWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL
    INT cyDest = imageModel.GetHeight();
    INT xDest = (rcWnd.right - rcWnd.left - cxDest) / 2;
    INT yDest = (rcWnd.bottom - rcWnd.top - cyDest) / 2;
-    ::BitBlt(hDC, xDest, yDest, cxDest, cyDest, imageModel.GetDC(), 0, 0, SRCCOPY);
+    BitBlt(hDC, xDest, yDest, cxDest, cyDest, imageModel.GetDC(), 0, 0, SRCCOPY);
    EndPaint(&ps);
    return 0;
 }
--- a/base/applications/mspaint/history.cpp
+++ b/base/applications/mspaint/history.cpp
@@ -12,14 +12,6 @@ ImageModel imageModel;

 /* FUNCTIONS ********************************************************/

-void IMAGE_PART::clear()
-{
-    ::DeleteObject(m_hbmImage);
-    m_hbmImage = NULL;
-    m_rcPart.SetRectEmpty();
-    m_bPartial = FALSE;
-}
-
 void ImageModel::NotifyImageChanged()
 {
    if (canvasWindow.IsWindow())
@@ -38,37 +30,23 @@ ImageModel::ImageModel()
    , m_undoSteps(0)
    , m_redoSteps(0)
 {
-    ZeroMemory(m_historyItems, sizeof(m_historyItems));
+    ZeroMemory(m_hBms, sizeof(m_hBms));

-    m_hbmMaster = CreateColorDIB(1, 1, RGB(255, 255, 255));
-    m_hbmOld = ::SelectObject(m_hDrawingDC, m_hbmMaster);
+    m_hBms[0] = CreateColorDIB(1, 1, RGB(255, 255, 255));
+    m_hbmOld = ::SelectObject(m_hDrawingDC, m_hBms[0]);

    g_imageSaved = TRUE;
 }

 ImageModel::~ImageModel()
 {
-    ::SelectObject(m_hDrawingDC, m_hbmOld); // De-select
    ::DeleteDC(m_hDrawingDC);
-    ::DeleteObject(m_hbmMaster);
-    ClearHistory();
-}

-void ImageModel::SwapPart()
-{
-    IMAGE_PART& part = m_historyItems[m_currInd];
-    if (!part.m_bPartial)
+    for (size_t i = 0; i < HISTORYSIZE; ++i)
    {
-        Swap(m_hbmMaster, part.m_hbmImage);
-        return;
+        if (m_hBms[i])
+            ::DeleteObject(m_hBms[i]);
    }
-
-    HBITMAP hbmMaster = LockBitmap();
-    HBITMAP hbmPart = getSubImage(hbmMaster, part.m_rcPart);
-    putSubImage(hbmMaster, part.m_rcPart, part.m_hbmImage);
-    ::DeleteObject(part.m_hbmImage);
-    part.m_hbmImage = hbmPart;
-    UnlockBitmap(hbmMaster);
 }

 void ImageModel::Undo(BOOL bClearRedo)
@@ -79,10 +57,9 @@ void ImageModel::Undo(BOOL bClearRedo)

    selectionModel.HideSelection();

-    m_currInd = (m_currInd + HISTORYSIZE - 1) % HISTORYSIZE; // Go previous
-    ATLASSERT(m_hbmMaster != NULL);
-    SwapPart();
-    ::SelectObject(m_hDrawingDC, m_hbmMaster); // Re-select
+    // Select previous item
+    m_currInd = (m_currInd + HISTORYSIZE - 1) % HISTORYSIZE;
+    ::SelectObject(m_hDrawingDC, m_hBms[m_currInd]);

    m_undoSteps--;
    if (bClearRedo)
@@ -101,10 +78,9 @@ void ImageModel::Redo()

    selectionModel.HideSelection();

-    ATLASSERT(m_hbmMaster != NULL);
-    SwapPart();
-    m_currInd = (m_currInd + 1) % HISTORYSIZE; // Go next
-    ::SelectObject(m_hDrawingDC, m_hbmMaster); // Re-select
+    // Select next item
+    m_currInd = (m_currInd + 1) % HISTORYSIZE;
+    ::SelectObject(m_hDrawingDC, m_hBms[m_currInd]);

    m_redoSteps--;
    if (m_undoSteps < HISTORYSIZE - 1)
@@ -117,7 +93,11 @@ void ImageModel::ClearHistory()
 {
    for (int i = 0; i < HISTORYSIZE; ++i)
    {
-        m_historyItems[i].clear();
+        if (m_hBms[i] && i != m_currInd)
+        {
+            ::DeleteObject(m_hBms[i]);
+            m_hBms[i] = NULL;
+        }
    }

    m_undoSteps = 0;
@@ -146,34 +126,11 @@ void ImageModel::PushImageForUndo(HBITMAP hbm)
        return;
    }

-    IMAGE_PART& part = m_historyItems[m_currInd];
-    part.clear();
-    part.m_hbmImage = m_hbmMaster;
-    m_hbmMaster = hbm;
-    ::SelectObject(m_hDrawingDC, m_hbmMaster); // Re-select
-
-    PushDone();
-}
-
-void ImageModel::PushImageForUndo(const RECT& rcPartial)
-{
-    ATLTRACE("%s: %d\n", __FUNCTION__, m_currInd);
-
-    IMAGE_PART& part = m_historyItems[m_currInd];
-    part.clear();
-    part.m_bPartial = TRUE;
-    part.m_rcPart = rcPartial;
-
-    HBITMAP hbmMaster = LockBitmap();
-    part.m_hbmImage = getSubImage(hbmMaster, rcPartial);
-    UnlockBitmap(hbmMaster);
-
-    PushDone();
-}
-
-void ImageModel::PushDone()
-{
-    m_currInd = (m_currInd + 1) % HISTORYSIZE; // Go next
+    // Go to the next item with an HBITMAP or current item
+    ::DeleteObject(m_hBms[(m_currInd + 1) % HISTORYSIZE]);
+    m_hBms[(m_currInd + 1) % HISTORYSIZE] = hbm;
+    m_currInd = (m_currInd + 1) % HISTORYSIZE;
+    ::SelectObject(m_hDrawingDC, m_hBms[m_currInd]);

    if (m_undoSteps < HISTORYSIZE - 1)
        m_undoSteps++;
@@ -191,29 +148,40 @@ void ImageModel::Crop(int nWidth, int nHeight, int nOffsetX, int nOffsetY)
    if (nHeight <= 0)
        nHeight = 1;

-    // Create a white HBITMAP
-    HBITMAP hbmNew = CreateColorDIB(nWidth, nHeight, RGB(255, 255, 255));
-    if (!hbmNew)
+    // Create an HBITMAP
+    HBITMAP hbmCropped = CreateDIBWithProperties(nWidth, nHeight);
+    if (!hbmCropped)
    {
        ShowOutOfMemory();
        return;
    }

-    // Put the master image as a sub-image
-    RECT rcPart = { -nOffsetX, -nOffsetY, GetWidth() - nOffsetX, GetHeight() - nOffsetY };
-    HBITMAP hbmOld = imageModel.LockBitmap();
-    putSubImage(hbmNew, rcPart, hbmOld);
-    imageModel.UnlockBitmap(hbmOld);
+    // Select the HBITMAP by memory DC
+    HDC hdcMem = ::CreateCompatibleDC(m_hDrawingDC);
+    HGDIOBJ hbmOld = ::SelectObject(hdcMem, hbmCropped);
+
+    // Fill background of the HBITMAP
+    RECT rcBack = { 0, 0, nWidth, nHeight };
+    HBRUSH hbrBack = ::CreateSolidBrush(paletteModel.GetBgColor());
+    ::FillRect(hdcMem, &rcBack, hbrBack);
+    ::DeleteObject(hbrBack);
+
+    // Copy the old content
+    ::BitBlt(hdcMem, -nOffsetX, -nOffsetY, GetWidth(), GetHeight(), m_hDrawingDC, 0, 0, SRCCOPY);
+
+    // Clean up
+    ::SelectObject(hdcMem, hbmOld);
+    ::DeleteDC(hdcMem);

    // Push it
-    PushImageForUndo(hbmNew);
+    PushImageForUndo(hbmCropped);

    NotifyImageChanged();
 }

 void ImageModel::SaveImage(LPCWSTR lpFileName)
 {
-    SaveDIBToFile(m_hbmMaster, lpFileName, TRUE);
+    SaveDIBToFile(m_hBms[m_currInd], lpFileName, TRUE);
 }

 BOOL ImageModel::IsImageSaved() const
@@ -229,17 +197,17 @@ void ImageModel::StretchSkew(int nStretchPercentX, int nStretchPercentY, int nSk
    INT newHeight = oldHeight * nStretchPercentY / 100;
    if (oldWidth != newWidth || oldHeight != newHeight)
    {
-        HBITMAP hbm0 = CopyDIBImage(m_hbmMaster, newWidth, newHeight);
+        HBITMAP hbm0 = CopyDIBImage(m_hBms[m_currInd], newWidth, newHeight);
        PushImageForUndo(hbm0);
    }
    if (nSkewDegX)
    {
-        HBITMAP hbm1 = SkewDIB(m_hDrawingDC, m_hbmMaster, nSkewDegX, FALSE);
+        HBITMAP hbm1 = SkewDIB(m_hDrawingDC, m_hBms[m_currInd], nSkewDegX, FALSE);
        PushImageForUndo(hbm1);
    }
    if (nSkewDegY)
    {
-        HBITMAP hbm2 = SkewDIB(m_hDrawingDC, m_hbmMaster, nSkewDegY, TRUE);
+        HBITMAP hbm2 = SkewDIB(m_hDrawingDC, m_hBms[m_currInd], nSkewDegY, TRUE);
        PushImageForUndo(hbm2);
    }
    NotifyImageChanged();
@@ -247,12 +215,12 @@ void ImageModel::StretchSkew(int nStretchPercentX, int nStretchPercentY, int nSk

 int ImageModel::GetWidth() const
 {
-    return GetDIBWidth(m_hbmMaster);
+    return GetDIBWidth(m_hBms[m_currInd]);
 }

 int ImageModel::GetHeight() const
 {
-    return GetDIBHeight(m_hbmMaster);
+    return GetDIBHeight(m_hBms[m_currInd]);
 }

 void ImageModel::InvertColors()
@@ -341,15 +309,15 @@ HBITMAP ImageModel::LockBitmap()
 {
    // NOTE: An app cannot select a bitmap into more than one device context at a time.
    ::SelectObject(m_hDrawingDC, m_hbmOld); // De-select
-    HBITMAP hbmLocked = m_hbmMaster;
-    m_hbmMaster = NULL;
+    HBITMAP hbmLocked = m_hBms[m_currInd];
+    m_hBms[m_currInd] = NULL;
    return hbmLocked;
 }

 void ImageModel::UnlockBitmap(HBITMAP hbmLocked)
 {
-    m_hbmMaster = hbmLocked;
-    m_hbmOld = ::SelectObject(m_hDrawingDC, m_hbmMaster); // Re-select
+    m_hBms[m_currInd] = hbmLocked;
+    m_hbmOld = ::SelectObject(m_hDrawingDC, hbmLocked); // Re-select
 }

 void ImageModel::SelectionClone(BOOL bUndoable)
--- a/base/applications/mspaint/history.h
+++ b/base/applications/mspaint/history.h
@@ -10,15 +10,6 @@
 /* HISTORYSIZE = number of possible undo-steps + 1 */
 #define HISTORYSIZE 11

-struct IMAGE_PART
-{
-    CRect m_rcPart;
-    HBITMAP m_hbmImage;
-    BOOL m_bPartial;
-
-    void clear();
-};
-
 class ImageModel
 {
 public:
@@ -30,7 +21,6 @@ public:
    BOOL CanRedo() const { return m_redoSteps > 0; }
    void PushImageForUndo();
    void PushImageForUndo(HBITMAP hbm);
-    void PushImageForUndo(const RECT& rcPartial);
    void Undo(BOOL bClearRedo = FALSE);
    void Redo(void);
    void ClearHistory(void);
@@ -55,13 +45,9 @@ public:

 protected:
    HDC m_hDrawingDC; // The device context for this class
-    HBITMAP m_hbmMaster; // The master bitmap
    int m_currInd; // The current index in m_hBms
    int m_undoSteps; // The undo-able count
    int m_redoSteps; // The redo-able count
-    IMAGE_PART m_historyItems[HISTORYSIZE]; // A ring buffer of IMAGE_PARTs
+    HBITMAP m_hBms[HISTORYSIZE]; // A rotation buffer of HBITMAPs
    HGDIOBJ m_hbmOld;
-
-    void SwapPart();
-    void PushDone();
 };
--- a/base/applications/mspaint/lang/ro-RO.rc
+++ b/base/applications/mspaint/lang/ro-RO.rc
@@ -17,8 +17,8 @@ BEGIN
    BEGIN
        MENUITEM "&Nou\tCtrl+N", IDM_FILENEW
        MENUITEM "&Deschidere...\tCtrl+O", IDM_FILEOPEN
-        MENUITEM "&Salvează\tCtrl+S", IDM_FILESAVE
-        MENUITEM "Salvea&ză ca...", IDM_FILESAVEAS
+        MENUITEM "&Păstrează\tCtrl+S", IDM_FILESAVE
+        MENUITEM "Păst&rare în...", IDM_FILESAVEAS
        MENUITEM SEPARATOR
        MENUITEM "Din aparat media...", IDM_FILEFROMSCANNERORCAMERA
        MENUITEM SEPARATOR
@@ -234,7 +234,7 @@ BEGIN
    IDS_WINDOWTITLE "%s - Pictare"
    IDS_INFOTITLE "Pictare pentru ReactOS"
    IDS_INFOTEXT "Disponibilă sub licența GNU Lesser General Public (vedeți www.gnu.org)"
-    IDS_SAVEPROMPTTEXT "Doriți salvarea modificărilor din %s?"
+    IDS_SAVEPROMPTTEXT "Doriți păstrarea modificărilor din %s?"
    IDS_DEFAULTFILENAME "Fără nume"
    IDS_MINIATURETITLE "Miniatură"
    IDS_TOOLTIP1 "Golire selecție"
@@ -267,7 +267,7 @@ BEGIN
    IDS_VERTICAL "Vertical"
    IDS_PRINTRES "%d x %d pixeli/cm"
    IDS_CANTPASTE "Nu a putut fi lipit din clipboard. Formatul de date este fie incorect, fie nesuportat."
-    IDS_SAVEERROR "Eșec în salvarea imaginii bitmap („hartă de biți”) în fișierul:\n\n%s"
+    IDS_SAVEERROR "Eșec în păstrarea imaginii bitmap („hartă de biți”) în fișierul:\n\n%s"
    IDS_CANTSENDMAIL "Eșec în trimiterea unei scrisori."
    IDS_LOSECOLOR "În această operațiune informațiile legate de culoare vor fi pierdute. Sigur veți continua?"
 END
--- a/base/applications/mspaint/mouse.cpp
+++ b/base/applications/mspaint/mouse.cpp
@@ -291,12 +291,7 @@ struct TwoPointDrawTool : ToolBase

    BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override
    {
-        CRect rcPartial(g_ptStart, g_ptEnd);
-        rcPartial.NormalizeRect();
-        SIZE size = toolsModel.GetToolSize();
-        rcPartial.InflateRect((size.cx + 1) / 2, (size.cy + 1) / 2);
-        imageModel.PushImageForUndo(rcPartial);
-
+        imageModel.PushImageForUndo();
        OnDrawOverlayOnImage(m_hdc);
        m_bDrawing = FALSE;
        imageModel.NotifyImageChanged();
@@ -659,7 +654,7 @@ struct AirBrushTool : SmoothDrawTool
    void draw(BOOL bLeftButton, LONG x, LONG y) override
    {
        COLORREF rgb = bLeftButton ? m_fg : m_bg;
-        Airbrush(m_hdc, x, y, rgb, toolsModel.GetAirBrushRadius());
+        Airbrush(m_hdc, x, y, rgb, toolsModel.GetAirBrushWidth());
    }

    void OnSpecialTweak(BOOL bMinus) override
--- a/base/applications/mspaint/registry.cpp
+++ b/base/applications/mspaint/registry.cpp
@@ -264,7 +264,11 @@ void RegistrySettings::SetMostRecentFile(LPCWSTR szPathName)
            iFound = i;

        if (iFound >= 0)
-            Swap(strFiles[i], strFiles[i - 1]);
+        {
+            CStringW tmp = strFiles[i];
+            strFiles[i] = strFiles[i - 1];
+            strFiles[i - 1] = tmp;
+        }
    }

    // If szPathName is not the first item in strFiles, insert it at the top of the list
--- a/base/applications/mspaint/selectionmodel.cpp
+++ b/base/applications/mspaint/selectionmodel.cpp
@@ -157,10 +157,14 @@ HBITMAP SelectionModel::GetSelectionContents()
    if (m_hbmColor)
        return CopyDIBImage(m_hbmColor, m_rc.Width(), m_rc.Height());

-    HBITMAP hbmWhole = imageModel.LockBitmap();
-    HBITMAP hbmPart = getSubImage(hbmWhole, m_rc);
-    imageModel.UnlockBitmap(hbmWhole);
-    return hbmPart;
+    HDC hMemDC = ::CreateCompatibleDC(NULL);
+    HBITMAP hBitmap = CreateColorDIB(m_rc.Width(), m_rc.Height(), RGB(255, 255, 255));
+    HGDIOBJ hbmOld = ::SelectObject(hMemDC, hBitmap);
+    ::BitBlt(hMemDC, 0, 0, m_rc.Width(), m_rc.Height(), imageModel.GetDC(), m_rc.left, m_rc.top, SRCCOPY);
+    ::SelectObject(hMemDC, hbmOld);
+    ::DeleteDC(hMemDC);
+
+    return hBitmap;
 }

 BOOL SelectionModel::IsLanded() const
--- a/base/applications/mspaint/toolsettings.cpp
+++ b/base/applications/mspaint/toolsettings.cpp
@@ -219,7 +219,7 @@ VOID CToolSettingsWindow::drawAirBrush(HDC hdc, LPCRECT prc)
        RECT& rc = rects[i];
        INT x = (rc.left + rc.right) / 2;
        INT y = (rc.top + rc.bottom) / 2;
-        BOOL bHigh = (s_AirRadius[i] == toolsModel.GetAirBrushRadius());
+        BOOL bHigh = (s_AirRadius[i] == toolsModel.GetAirBrushWidth());
        if (bHigh)
        {
            ::FillRect(hdc, &rc, ::GetSysColorBrush(COLOR_HIGHLIGHT));
@@ -438,7 +438,7 @@ LRESULT CToolSettingsWindow::OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lPar
        case TOOL_AIRBRUSH:
            iItem = getAirBrushRects(rects, &rect1, &pt);
            if (iItem != -1)
-                toolsModel.SetAirBrushRadius(s_AirRadius[iItem]);
+                toolsModel.SetAirBrushWidth(s_AirRadius[iItem]);
            break;
        case TOOL_LINE:
        case TOOL_BEZIER:
--- a/base/applications/mspaint/toolsmodel.cpp
+++ b/base/applications/mspaint/toolsmodel.cpp
@@ -18,7 +18,7 @@ ToolsModel::ToolsModel()
    m_shapeStyle = 0;
    m_brushStyle = BrushStyleRound;
    m_oldActiveTool = m_activeTool = TOOL_PEN;
-    m_airBrushRadius = 5;
+    m_airBrushWidth = 5;
    m_rubberRadius = 4;
    m_transpBg = FALSE;
    m_zoom = 1000;
@@ -99,8 +99,8 @@ void ToolsModel::MakeBrushThickerOrThinner(BOOL bThinner)

 void ToolsModel::MakeAirBrushThickerOrThinner(BOOL bThinner)
 {
-    INT thickness = GetAirBrushRadius();
-    SetAirBrushRadius(bThinner ? max(1, thickness - 1) : (thickness + 1));
+    INT thickness = GetAirBrushWidth();
+    SetAirBrushWidth(bThinner ? max(1, thickness - 1) : (thickness + 1));
 }

 void ToolsModel::MakeRubberThickerOrThinner(BOOL bThinner)
@@ -180,14 +180,14 @@ void ToolsModel::SetActiveTool(TOOLTYPE nActiveTool)
    NotifyToolChanged();
 }

-INT ToolsModel::GetAirBrushRadius() const
+int ToolsModel::GetAirBrushWidth() const
 {
-    return m_airBrushRadius;
+    return m_airBrushWidth;
 }

-void ToolsModel::SetAirBrushRadius(INT nAirBrushRadius)
+void ToolsModel::SetAirBrushWidth(int nAirBrushWidth)
 {
-    m_airBrushRadius = nAirBrushRadius;
+    m_airBrushWidth = nAirBrushWidth;
    NotifyToolSettingsChanged();
 }

@@ -202,47 +202,6 @@ void ToolsModel::SetRubberRadius(int nRubberRadius)
    NotifyToolSettingsChanged();
 }

-SIZE ToolsModel::GetToolSize() const
-{
-    SIZE size;
-    switch (m_activeTool)
-    {
-        case TOOL_FREESEL:
-        case TOOL_RECTSEL:
-        case TOOL_COLOR:
-        case TOOL_ZOOM:
-        case TOOL_TEXT:
-        case TOOL_FILL:
-            size.cx = size.cy = 1;
-            break;
-        case TOOL_LINE:
-        case TOOL_BEZIER:
-        case TOOL_RECT:
-        case TOOL_RRECT:
-        case TOOL_SHAPE:
-        case TOOL_ELLIPSE:
-            size.cx = size.cy = GetLineWidth();
-            break;
-        case TOOL_AIRBRUSH:
-            size.cx = size.cy = GetAirBrushRadius() * 2;
-            break;
-        case TOOL_RUBBER:
-            size.cx = size.cy = GetRubberRadius() * 2;
-            break;
-        case TOOL_BRUSH:
-            size.cx = size.cy = GetBrushWidth();
-            break;
-        case TOOL_PEN:
-            size.cx = size.cy = GetPenWidth();
-            break;
-    }
-    if (size.cx < 1)
-        size.cx = 1;
-    if (size.cy < 1)
-        size.cy = 1;
-    return size;
-}
-
 BOOL ToolsModel::IsBackgroundTransparent() const
 {
    return m_transpBg;
--- a/base/applications/mspaint/toolsmodel.h
+++ b/base/applications/mspaint/toolsmodel.h
@@ -80,7 +80,7 @@ private:
    BrushStyle m_brushStyle;
    TOOLTYPE m_activeTool;
    TOOLTYPE m_oldActiveTool;
-    INT m_airBrushRadius;
+    int m_airBrushWidth;
    int m_rubberRadius;
    BOOL m_transpBg;
    int m_zoom;
@@ -116,16 +116,14 @@ public:
    TOOLTYPE GetOldActiveTool() const;
    void SetActiveTool(TOOLTYPE nActiveTool);

-    INT GetAirBrushRadius() const;
-    void SetAirBrushRadius(INT nAirBrushRadius);
+    int GetAirBrushWidth() const;
+    void SetAirBrushWidth(int nAirBrushWidth);
    void MakeAirBrushThickerOrThinner(BOOL bThinner);

    int GetRubberRadius() const;
    void SetRubberRadius(int nRubberRadius);
    void MakeRubberThickerOrThinner(BOOL bThinner);

-    SIZE GetToolSize() const;
-
    BOOL IsBackgroundTransparent() const;
    void SetBackgroundTransparent(BOOL bTransparent);

--- a/base/applications/mstsc/lang/ro-RO.rc
+++ b/base/applications/mstsc/lang/ro-RO.rc
@@ -15,16 +15,16 @@ BEGIN
    GROUPBOX "Preferințe de conectare", IDC_STATIC, 7, 7, 228, 89
    GROUPBOX "Gestiune conexiuni", IDC_STATIC, 7, 103, 228, 65
    ICON "", IDC_LOGONICON, 15, 19, 20, 20
-    LTEXT "Introduceți adresa unui server.", IDC_STATIC, 47, 24, 121, 8
-    LTEXT "Server:", IDC_STATIC, 47, 41, 35, 8
+    LTEXT "Introduceți adresa unui servitor.", IDC_STATIC, 47, 24, 121, 8
+    LTEXT "Servitor:", IDC_STATIC, 47, 41, 35, 8
    LTEXT "Nume utilizator:", IDC_STATIC, 47, 58, 58, 8
    COMBOBOX IDC_SERVERCOMBO, 101, 39, 119, 13, CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
    EDITTEXT IDC_NAMEEDIT, 101, 55, 119, 14, WS_TABSTOP | ES_AUTOHSCROLL
-    PUSHBUTTON "S&alvează", IDC_SAVE, 57, 139, 50, 14
-    PUSHBUTTON "Sal&vează ca…", IDC_SAVEAS, 112, 139, 60, 14
+    PUSHBUTTON "&Păstrează", IDC_SAVE, 57, 139, 50, 14
+    PUSHBUTTON "Păst&rare în…", IDC_SAVEAS, 112, 139, 60, 14
    PUSHBUTTON "&Deschidere…", IDC_OPEN, 177, 139, 50, 14
    ICON "", IDC_CONNICON, 16, 114, 20, 20
-    LTEXT "Puteți salva setările curente de conectare sau puteți deschide o configurație existentă.", IDC_STATIC, 50, 115, 172, 20
+    LTEXT "Puteți păstra preferințele curente de conectare sau puteți deschide preferințe existente.", IDC_STATIC, 50, 115, 172, 20
 END

 IDD_DISPLAY DIALOGEX 0, 0, 242, 175
@@ -39,7 +39,7 @@ BEGIN
    CONTROL "", IDC_GEOSLIDER, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 56, 42, 124, 17
    COMBOBOX IDC_BPPCOMBO, 56, 102, 128, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
    CONTROL "", IDC_COLORIMAGE, "Static", SS_OWNERDRAW | SS_SUNKEN, 56, 121, 127, 10
-    LTEXT "Notă: Această preferință poate fi sau nu compatibilă cu setările calculatorului gazdă. Preferințele incompatibile vor fi ignorate.", IDC_STATIC, 56, 138, 155, 27
+    LTEXT "Notă: Această preferință poate fi sau nu compatibilă cu configurația calculatorului gazdă. Preferințele incompatibile vor fi ignorate.", IDC_STATIC, 56, 138, 155, 27
    LTEXT "Mică", IDC_STATIC, 35, 42, 15, 8
    LTEXT "Mare", IDC_STATIC, 189, 42, 17, 8
    LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 62, 120, 10, SS_CENTER
--- a/base/applications/notepad/lang/ro-RO.rc
+++ b/base/applications/notepad/lang/ro-RO.rc
@@ -36,8 +36,8 @@ BEGIN
        MENUITEM "&Nou\tCtrl+N", CMD_NEW
        MENUITEM "Fereastră &nouă\tCtrl+Shift+N", CMD_NEW_WINDOW
        MENUITEM "&Deschidere…\tCtrl+O", CMD_OPEN
-        MENUITEM "S&alvează\tCtrl+S", CMD_SAVE
-        MENUITEM "Sal&vare în…", CMD_SAVE_AS
+        MENUITEM "&Păstrează\tCtrl+S", CMD_SAVE
+        MENUITEM "Păst&rare în…", CMD_SAVE_AS
        MENUITEM SEPARATOR
        MENUITEM "&Configurare pagină…", CMD_PAGE_SETUP
        MENUITEM "I&mprimare…\tCtrl+P", CMD_PRINT
@@ -158,7 +158,7 @@ BEGIN
    STRING_ERROR "EROARE"
    STRING_WARNING "ATENȚIONARE"
    STRING_INFO "Informație"
-    STRING_UNTITLED "Fără titlu"
+    STRING_UNTITLED "Neintitulat"
    STRING_ALL_FILES "Orice fișier (*.*)"
    STRING_TEXT_FILES_TXT "Fișiere text (*.txt)"
    STRING_TOOLARGE "Fișierul „%s” este prea mare.\n\
--- a/base/applications/rapps/appview.cpp
+++ b/base/applications/rapps/appview.cpp
@@ -1289,23 +1289,23 @@ CAppsListView::AddApplication(CAppInfo *AppInfo, BOOL InitialCheckState)
        /* Load icon from registry */
        HICON hIcon = NULL;
        CStringW szIconPath;
-        int IconIndex;
        if (AppInfo->RetrieveIcon(szIconPath))
        {
-            IconIndex = PathParseIconLocationW(szIconPath.GetBuffer());
-            szIconPath.ReleaseBuffer();
+            PathParseIconLocationW((LPWSTR)szIconPath.GetString());

-            ExtractIconExW(szIconPath.GetString(), IconIndex, &hIcon, NULL, 1);
+            /* Load only the 1st icon from the application executable,
+             * because all apps provide the executables which have the main icon
+             * as 1st in the index , so we don't need other icons here */
+            hIcon = ExtractIconW(hInst, szIconPath.GetString(), 0);
        }

-        /* Use the default icon if none were found in the file, or if it is not supported (returned 1) */
-        if (!hIcon || (hIcon == (HICON)1))
+        if (!hIcon)
        {
            /* Load default icon */
            hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN));
        }

-        IconIndex = ImageList_AddIcon(m_hImageListView, hIcon);
+        int IconIndex = ImageList_AddIcon(m_hImageListView, hIcon);
        DestroyIcon(hIcon);

        int Index = AddItem(ItemCount, IconIndex, AppInfo->szDisplayName, (LPARAM)AppInfo);
--- a/base/applications/regedit/lang/ro-RO.rc
+++ b/base/applications/regedit/lang/ro-RO.rc
@@ -309,7 +309,7 @@ BEGIN
    LTEXT "Nedeterminată", IDC_UNDETERMINED, 18, 230, 50, 8, WS_DISABLED
    LTEXT "Partajată", IDC_SHARED, 18, 240, 48, 8, WS_DISABLED
    LTEXT "Dispozitiv, exclusivă", IDC_DEVICE_EXCLUSIVE, 75, 230, 74, 8, WS_DISABLED
-    LTEXT "Driver, exclusivă", IDC_DRIVER_EXCLUSIVE, 75, 240, 74, 8, WS_DISABLED
+    LTEXT "Modul-pilot, exclusivă", IDC_DRIVER_EXCLUSIVE, 75, 240, 74, 8, WS_DISABLED
    RTEXT "Tip interfață:", IDC_STATIC, 158, 220, 57, 8
    LTEXT "", IDC_INTERFACETYPE, 218, 220, 66, 8
    RTEXT "Număr magistrală:", IDC_STATIC, 155, 230, 60, 8
--- a/base/applications/sndrec32/lang/ro-RO.rc
+++ b/base/applications/sndrec32/lang/ro-RO.rc
@@ -1,10 +1,4 @@
-/*
- * PROJECT:     ReactOS Sound Recorder
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Romanian resource file
- * TRANSLATORS: Copyright 2011-2019 Ștefan Fulea <stefan.fulea@mail.com>
- *              Copyright 2023 Andrei Miloiu <miloiuandrei@gmail.com>
- */
+/* Translator: Ștefan Fulea (stefan dot fulea at mail dot com) */

 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL

@@ -20,8 +14,8 @@ BEGIN
    BEGIN
        MENUITEM "&Nou", ID_FILE_NEW
        MENUITEM "&Deschidere…", ID_FILE_OPEN
-        MENUITEM "S&alvează", ID_FILE_SAVE, GRAYED
-        MENUITEM "Sal&vează ca…", ID_FILE_SAVEAS, GRAYED
+        MENUITEM "&Păstrează", ID_FILE_SAVE, GRAYED
+        MENUITEM "Păst&rare în…", ID_FILE_SAVEAS, GRAYED
        MENUITEM "Re&constituire…", ID_FILE_RESTORE, GRAYED
        MENUITEM "Pr&oprietăți…", ID_FILE_PROPERTIES
        MENUITEM SEPARATOR
--- a/base/applications/taskmgr/lang/bg-BG.rc
+++ b/base/applications/taskmgr/lang/bg-BG.rc
@@ -183,45 +183,45 @@ FONT 8, "MS Shell Dlg"
 BEGIN
    GROUPBOX "Заетост на ЦПУ", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Заета памет", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
-    GROUPBOX "Общо", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Заделена памет (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Действителна памет (K)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Памет на ядрото (K)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Общо", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Заделена памет (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Действителна памет (K)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Памет на ядрото (K)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT
    LTEXT "Описатели", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8
-    LTEXT "Нишки", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8
-    LTEXT "Действия", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8
-    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Нишки", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8
+    LTEXT "Действия", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8
+    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Общо", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8
-    LTEXT "Ограничение", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER
-    LTEXT "Върхово", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8
-    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Общо", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 45, 8
+    LTEXT "Ограничение", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 45, 8, NOT WS_BORDER
+    LTEXT "Върхово", IDS_COMMIT_CHARGE_PEAK, 12, 193, 45, 8
+    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Общо", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8
-    LTEXT "Налична", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8
-    LTEXT "Системен склад", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8
-    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Общо", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8
+    LTEXT "Налична", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 60, 8
+    LTEXT "Системен склад", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 60, 8
+    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 190, 149, 43, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Общо", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8
-    LTEXT "Странирана", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8
-    LTEXT "Нестранирана", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8
-    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Общо", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8
+    LTEXT "Странирана", IDS_KERNEL_MEMORY_PAGED, 137, 184, 50, 8
+    LTEXT "Нестранирана", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 50, 8
+    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
    GROUPBOX "Дневник на ЦПУ", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Дневник на паметта", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT
--- a/base/applications/taskmgr/lang/cs-CZ.rc
+++ b/base/applications/taskmgr/lang/cs-CZ.rc
@@ -183,45 +183,45 @@ FONT 8, "MS Shell Dlg"
 BEGIN
    GROUPBOX "Využití CPU", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Využití RAM", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
-    GROUPBOX "Celkem", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Využití paměti (kB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Fyzická paměť (kB)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Paměť jádra (kB)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    LTEXT "Popisovače", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8
-    LTEXT "Vlákna", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8
-    LTEXT "Procesy", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8
-    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    GROUPBOX "Celkem", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Využití paměti (kB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Fyzická paměť (kB)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Paměť jádra (kB)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    LTEXT "Popisovače", IDS_TOTALS_HANDLE_COUNT, 12, 131, 49, 8
+    LTEXT "Vlákna", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8
+    LTEXT "Procesy", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8
+    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Celkem", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8
-    LTEXT "Limit", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER
-    LTEXT "Špička", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8
-    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Celkem", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8
+    LTEXT "Limit", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 15, 8, NOT WS_BORDER
+    LTEXT "Špička", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8
+    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Celkem", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8
-    LTEXT "Dostupná", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8
-    LTEXT "Mezipaměť", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8
-    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Celkem", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8
+    LTEXT "Dostupná", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 30, 8
+    LTEXT "Mezipaměť", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 80, 8
+    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Celkem", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8
-    LTEXT "Stránkováno", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8
-    LTEXT "Nestránkováno", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8
-    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Celkem", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8
+    LTEXT "Stránkováno", IDS_KERNEL_MEMORY_PAGED, 137, 184, 80, 8
+    LTEXT "Nestránkováno", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 80, 8
+    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
    GROUPBOX "Historie využití CPU", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Historie využití paměti", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT
--- a/base/applications/taskmgr/lang/da-DK.rc
+++ b/base/applications/taskmgr/lang/da-DK.rc
@@ -182,49 +182,49 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
    GROUPBOX "CPU Forbrug", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT
-    GROUPBOX "MEM Forbrug", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
-    GROUPBOX "Ialt", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Aftaget Forbrug (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Fysisk Hukommelse (K)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Kernel Hukommelse (K)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    LTEXT "Håndtag", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8
-    LTEXT "Tråde", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8
-    LTEXT "Processor", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8
-    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    GROUPBOX "Hukommelse Forbrug", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
+    GROUPBOX "Ialt", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Aftaget Forbrug (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Fysisk Hukommelse (K)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Kernel Hukommelse (K)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    LTEXT "Håndtag", IDS_TOTALS_HANDLE_COUNT, 12, 131, 27, 8
+    LTEXT "Tråde", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8
+    LTEXT "Processor", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8
+    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Ialt", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8
-    LTEXT "Begrænsning", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER
-    LTEXT "Top", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8
-    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Ialt", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 35, 8
+    LTEXT "Begrænsning", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 45, 8, NOT WS_BORDER
+    LTEXT "Top", IDS_COMMIT_CHARGE_PEAK, 12, 193, 35, 8
+    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Ialt", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8
-    LTEXT "Tilgængelig", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8
-    LTEXT "System Cache", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8
-    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Ialt", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8
+    LTEXT "Tilgængelig", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 45, 8
+    LTEXT "System Cache", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 45, 8
+    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Ialt", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8
-    LTEXT "Allokeret", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8
-    LTEXT "Ikke Allokeret", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8
-    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Ialt", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8
+    LTEXT "Allokeret", IDS_KERNEL_MEMORY_PAGED, 137, 184, 45, 8
+    LTEXT "Ikke Allokeret", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 45, 8
+    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
    GROUPBOX "CPU Usage History", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT
-    GROUPBOX "MEM Hukommelses Forbrug Historik", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Hukommelses Forbrug Historik", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT
    PUSHBUTTON "CPU Forbrug Visning", IDC_CPU_USAGE_GRAPH, 12, 17, 47, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE
    PUSHBUTTON "Hukommelses Forbrug Visning", IDC_MEM_USAGE_GRAPH, 12, 75, 47, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE
    PUSHBUTTON "CPU Forbrug Historik", IDC_CPU_USAGE_HISTORY_GRAPH, 81, 17, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE
--- a/base/applications/taskmgr/lang/de-DE.rc
+++ b/base/applications/taskmgr/lang/de-DE.rc
@@ -1,4 +1,4 @@
-// COPYRIGHT: Klemens Friedl
+/* TRANSLATOR: Klemens Friedl */

 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL

@@ -185,45 +185,45 @@ FONT 8, "MS Shell Dlg"
 BEGIN
    GROUPBOX "CPU-Last", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Speicher-Last", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
-    GROUPBOX "Insgesamt", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Zugesicherter Speicher (KB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Physikalischer Speicher (KB)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Kernel-Speicher (KB)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    LTEXT "Handles", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8
-    LTEXT "Threads", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8
-    LTEXT "Prozesse", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8
-    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    GROUPBOX "Insgesamt", IDC_TOTALS_FRAME, 5, 122, 117, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Zugesicherter Speicher (KB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 117, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Physikalischer Speicher (KB)", IDC_PHYSICAL_MEMORY_FRAME, 126, 122, 117, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Kernel-Speicher (KB)", IDC_KERNEL_MEMORY_FRAME, 126, 166, 117, 39, 0, WS_EX_TRANSPARENT
+    LTEXT "Handles", IDS_TOTALS_HANDLE_COUNT, 12, 131, 27, 8
+    LTEXT "Threads", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8
+    LTEXT "Prozesse", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8
+    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 71, 131, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_THREAD_COUNT, 71, 140, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 71, 149, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Insgesamt", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8
-    LTEXT "Grenzwert", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER
-    LTEXT "Maximalwert", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8
-    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Insgesamt", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 50, 8
+    LTEXT "Grenzwert", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 50, 8, NOT WS_BORDER
+    LTEXT "Maximalwert", IDS_COMMIT_CHARGE_PEAK, 12, 193, 50, 8
+    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 71, 174, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 71, 184, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 71, 193, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Insgesamt", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8
-    LTEXT "Verfügbar", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8
-    LTEXT "Systemcache", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8
-    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Insgesamt", IDS_PHYSICAL_MEMORY_TOTAL, 133, 131, 50, 8
+    LTEXT "Verfügbar", IDS_PHYSICAL_MEMORY_AVAILABLE, 133, 140, 50, 8
+    LTEXT "Systemcache", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 133, 149, 46, 8
+    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Insgesamt", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8
-    LTEXT "Ausgelagert", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8
-    LTEXT "Nicht ausgelagert", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8
-    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Insgesamt", IDS_KERNEL_MEMORY_TOTAL, 133, 174, 50, 8
+    LTEXT "Ausgelagert", IDS_KERNEL_MEMORY_PAGED, 133, 184, 50, 8
+    LTEXT "Nicht ausgelagert", IDS_KERNEL_MEMORY_NONPAGED, 133, 193, 60, 8
+    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
    GROUPBOX "CPU-Lastverlauf", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Speicher-Lastverlauf", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT
--- a/base/applications/taskmgr/lang/el-GR.rc
+++ b/base/applications/taskmgr/lang/el-GR.rc
@@ -1,4 +1,4 @@
-// COPYRIGHT: Dj Apal
+/* TRANSLATOR: Dj Apal */

 LANGUAGE LANG_GREEK, SUBLANG_DEFAULT

@@ -185,45 +185,45 @@ FONT 8, "MS Shell Dlg"
 BEGIN
    GROUPBOX "CPU Usage", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "MEM Usage", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
-    GROUPBOX "Totals", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Commit Charge (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Physical Memory (K)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Kernel Memory (K)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    LTEXT "Handles", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8
-    LTEXT "Threads", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8
-    LTEXT "Processes", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8
-    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    GROUPBOX "Totals", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Commit Charge (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Physical Memory (K)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Kernel Memory (K)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    LTEXT "Handles", IDS_TOTALS_HANDLE_COUNT, 12, 131, 27, 8
+    LTEXT "Threads", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8
+    LTEXT "Processes", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8
+    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Total", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8
-    LTEXT "Limit", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER
-    LTEXT "Peak", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8
-    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Total", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8
+    LTEXT "Limit", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 15, 8, NOT WS_BORDER
+    LTEXT "Peak", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8
+    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Total", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8
-    LTEXT "Available", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8
-    LTEXT "System Cache", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8
-    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Total", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8
+    LTEXT "Available", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 30, 8
+    LTEXT "System Cache", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 46, 8
+    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Total", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8
-    LTEXT "Paged", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8
-    LTEXT "Nonpaged", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8
-    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Total", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8
+    LTEXT "Paged", IDS_KERNEL_MEMORY_PAGED, 137, 184, 21, 8
+    LTEXT "Nonpaged", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 34, 8
+    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
    GROUPBOX "CPU Usage History", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Memory Usage History", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT
--- a/base/applications/taskmgr/lang/en-US.rc
+++ b/base/applications/taskmgr/lang/en-US.rc
@@ -183,45 +183,45 @@ FONT 8, "MS Shell Dlg"
 BEGIN
    GROUPBOX "CPU Usage", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "MEM Usage", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
-    GROUPBOX "Totals", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Commit Charge (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Physical Memory (K)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Kernel Memory (K)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    LTEXT "Handles", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8
-    LTEXT "Threads", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8
-    LTEXT "Processes", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8
-    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    GROUPBOX "Totals", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Commit Charge (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Physical Memory (K)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Kernel Memory (K)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    LTEXT "Handles", IDS_TOTALS_HANDLE_COUNT, 12, 131, 27, 8
+    LTEXT "Threads", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8
+    LTEXT "Processes", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8
+    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Total", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8
-    LTEXT "Limit", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER
-    LTEXT "Peak", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8
-    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Total", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8
+    LTEXT "Limit", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 15, 8, NOT WS_BORDER
+    LTEXT "Peak", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8
+    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Total", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8
-    LTEXT "Available", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8
-    LTEXT "System Cache", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8
-    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Total", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8
+    LTEXT "Available", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 30, 8
+    LTEXT "System Cache", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 46, 8
+    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Total", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8
-    LTEXT "Paged", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8
-    LTEXT "Nonpaged", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8
-    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Total", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8
+    LTEXT "Paged", IDS_KERNEL_MEMORY_PAGED, 137, 184, 21, 8
+    LTEXT "Nonpaged", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 34, 8
+    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
    GROUPBOX "CPU Usage History", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Memory Usage History", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT
--- a/base/applications/taskmgr/lang/es-ES.rc
+++ b/base/applications/taskmgr/lang/es-ES.rc
@@ -1,4 +1,4 @@
-// COPYRIGHT: Carlos Garcia Gomez, Samuel Serapión, Ismael Ferreras Morezuelas (Swyter)
+/* TRANSLATORS: Carlos Garcia Gomez, Samuel Serapión, Ismael Ferreras Morezuelas (Swyter) */

 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL

@@ -185,45 +185,45 @@ FONT 8, "MS Shell Dlg"
 BEGIN
    GROUPBOX "Uso de CPU", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Memoria", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
-    GROUPBOX "Sistema", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Carga de transacciones (KB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Memoria física (KB)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Memoria del kernel (KB)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    LTEXT "Identificadores", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8
-    LTEXT "Subprocesos", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8
-    LTEXT "Procesos", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8
-    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    GROUPBOX "Sistema", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Carga de transacciones (KB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Memoria física (KB)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Memoria del kernel (KB)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    LTEXT "Identificadores", IDS_TOTALS_HANDLE_COUNT, 12, 131, 50, 8
+    LTEXT "Subprocesos", IDS_TOTALS_THREAD_COUNT, 12, 140, 40, 8
+    LTEXT "Procesos", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8
+    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Total", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8
-    LTEXT "Límite", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER
-    LTEXT "Máximo", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8
-    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Total", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8
+    LTEXT "Límite", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 30, 8, NOT WS_BORDER
+    LTEXT "Máximo", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8
+    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Total", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8
-    LTEXT "Disponible", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8
-    LTEXT "En caché", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8
-    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Total", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8
+    LTEXT "Disponible", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 35, 8
+    LTEXT "En caché", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 85, 8
+    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Total", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8
-    LTEXT "Paginado", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8
-    LTEXT "No paginado", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8
-    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Total", IDS_KERNEL_MEMORY_TOTAL, 137, 175, 27, 8
+    LTEXT "Paginado", IDS_KERNEL_MEMORY_PAGED, 137, 184, 30, 8
+    LTEXT "No paginado", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 40, 8
+    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
    GROUPBOX "Historial de uso de CPU", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Historial de uso de memoria física", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT
@@ -241,16 +241,16 @@ BEGIN
    DEFPUSHBUTTON "Aceptar", IDOK, 120, 133, 50, 14
    PUSHBUTTON "Cancelar", IDCANCEL, 174, 133, 50, 14
    LTEXT "El ajuste de afinidad de procesador controla las CPU en las que el proceso tendrá permiso para ejecutarse.", IDC_STATIC, 5, 5, 220, 16
-    CONTROL "CPU 0", IDC_CPU0, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 11, 28, 37, 10
-    CONTROL "CPU 1", IDC_CPU1, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 11, 41, 37, 10
-    CONTROL "CPU 2", IDC_CPU2, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 11, 54, 37, 10
-    CONTROL "CPU 3", IDC_CPU3, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 11, 67, 37, 10
-    CONTROL "CPU 4", IDC_CPU4, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 11, 80, 37, 10
-    CONTROL "CPU 5", IDC_CPU5, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 11, 93, 37, 10
-    CONTROL "CPU 6", IDC_CPU6, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 11, 106, 37, 10
-    CONTROL "CPU 7", IDC_CPU7, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 11, 119, 37, 10
-    CONTROL "CPU 8", IDC_CPU8, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 61, 28, 37, 10
-    CONTROL "CPU 9", IDC_CPU9, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 61, 41, 37, 10
+    CONTROL "CPU 0",  IDC_CPU0,  "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 11, 28, 37, 10
+    CONTROL "CPU 1",  IDC_CPU1,  "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 11, 41, 37, 10
+    CONTROL "CPU 2",  IDC_CPU2,  "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 11, 54, 37, 10
+    CONTROL "CPU 3",  IDC_CPU3,  "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 11, 67, 37, 10
+    CONTROL "CPU 4",  IDC_CPU4,  "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 11, 80, 37, 10
+    CONTROL "CPU 5",  IDC_CPU5,  "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 11, 93, 37, 10
+    CONTROL "CPU 6",  IDC_CPU6,  "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 11, 106, 37, 10
+    CONTROL "CPU 7",  IDC_CPU7,  "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 11, 119, 37, 10
+    CONTROL "CPU 8",  IDC_CPU8,  "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 61, 28, 37, 10
+    CONTROL "CPU 9",  IDC_CPU9,  "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 61, 41, 37, 10
    CONTROL "CPU 10", IDC_CPU10, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 61, 54, 41, 10
    CONTROL "CPU 11", IDC_CPU11, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 61, 67, 41, 10
    CONTROL "CPU 12", IDC_CPU12, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 61, 80, 41, 10
--- a/base/applications/taskmgr/lang/et-EE.rc
+++ b/base/applications/taskmgr/lang/et-EE.rc
@@ -189,45 +189,45 @@ FONT 8, "MS Shell Dlg"
 BEGIN
    GROUPBOX "CPU hõivatus", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Füüisline mälu", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
-    GROUPBOX "Kokkuvõte", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Hõivatud mälu (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Füüsiline mälu (K)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Tuumamälu (K)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    LTEXT "Sangu", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8
-    LTEXT "Lõimi", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8
-    LTEXT "Protsesse", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8
-    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    GROUPBOX "Kokkuvõte", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Hõivatud mälu (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Füüsiline mälu (K)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Tuumamälu (K)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    LTEXT "Sangu", IDS_TOTALS_HANDLE_COUNT, 12, 131, 27, 8
+    LTEXT "Lõimi", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8
+    LTEXT "Protsesse", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8
+    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Kokku", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8
-    LTEXT "Limiit", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER
-    LTEXT "Tipp", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8
-    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Kokku", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8
+    LTEXT "Limiit", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 15, 8, NOT WS_BORDER
+    LTEXT "Tipp", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8
+    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Kokku", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8
-    LTEXT "Saadaval", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8
-    LTEXT "Vahemälus", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8
-    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Kokku", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8
+    LTEXT "Saadaval", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 30, 8
+    LTEXT "Vahemälus", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 46, 8
+    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Kokku", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8
-    LTEXT "Saalitud", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8
-    LTEXT "Saalimata", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8
-    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Kokku", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8
+    LTEXT "Saalitud", IDS_KERNEL_MEMORY_PAGED, 137, 184, 21, 8
+    LTEXT "Saalimata", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 34, 8
+    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
    GROUPBOX "CPU hõivatuse ajalugu", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Füüsilise mälu hõivatuse ajalugu", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT
--- a/base/applications/taskmgr/lang/fr-FR.rc
+++ b/base/applications/taskmgr/lang/fr-FR.rc
@@ -1,4 +1,4 @@
-// COPYRIGHT: Benoit Plante (aka cmoibenlepro)
+/* TRANSLATOR: Benoit Plante (aka cmoibenlepro) */

 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL

@@ -183,47 +183,47 @@ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "UC utilisée", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Mémoire utilisée", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
-    GROUPBOX "Totaux", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Charge dédiée (Ko)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Mémoire physique (Ko)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Mémoire noyau (Ko)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    LTEXT "Handles", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8
-    LTEXT "Threads", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8
-    LTEXT "Processus", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8
-    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    GROUPBOX "Util. de l'UC", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Util. de la mémoire", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
+    GROUPBOX "Totaux", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Charge dédiée (Ko)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Mémoire physique (Ko)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Mémoire noyau (Ko)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    LTEXT "Handles", IDS_TOTALS_HANDLE_COUNT, 12, 131, 53, 8
+    LTEXT "Threads", IDS_TOTALS_THREAD_COUNT, 12, 140, 53, 8
+    LTEXT "Processus", IDS_TOTALS_PROCESS_COUNT, 12, 149, 53, 8
+    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Total", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8
-    LTEXT "Limite", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER
-    LTEXT "Pic", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8
-    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Total", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 53, 8
+    LTEXT "Limite", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 53, 8, NOT WS_BORDER
+    LTEXT "Pic", IDS_COMMIT_CHARGE_PEAK, 12, 193, 53, 8
+    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Total", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8
-    LTEXT "Disponible", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8
-    LTEXT "Cache système", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8
-    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Total", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 48, 8
+    LTEXT "Disponible", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 48, 8
+    LTEXT "Cache système", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 48, 8
+    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Total", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8
-    LTEXT "Paginée", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8
-    LTEXT "Non paginée", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8
-    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Total", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 48, 8
+    LTEXT "Paginée", IDS_KERNEL_MEMORY_PAGED, 137, 184, 48, 8
+    LTEXT "Non paginée", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 48, 8
+    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
    GROUPBOX "Historique de l'utilisation de l'UC", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Historique d'utilisation de la mémoire", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT
--- a/base/applications/taskmgr/lang/he-IL.rc
+++ b/base/applications/taskmgr/lang/he-IL.rc
@@ -1,4 +1,4 @@
-// COPYRIGHT: Baruch Rutman (peterooch), Shy Zedaka
+/* TRANSLATORS: Baruch Rutman (peterooch), Shy Zedaka */

 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT

@@ -185,45 +185,45 @@ FONT 8, "MS Shell Dlg"
 BEGIN
    GROUPBOX "שימוש במעבד", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "שימוש בזיכרון", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
-    GROUPBOX "סך הכל", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Commit Charge (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "זיכרון פיזי (K)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "זיכרון ליבה (K)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    LTEXT "מזהים יחודיים", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8
-    LTEXT "תהליכי משנה", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8
-    LTEXT "תהליכים", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8
-    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    GROUPBOX "סך הכל", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Commit Charge (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "זיכרון פיזי (K)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "זיכרון ליבה (K)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    LTEXT "מזהים יחודיים", IDS_TOTALS_HANDLE_COUNT, 12, 131, 27, 8
+    LTEXT "תהליכי משנה", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8
+    LTEXT "תהליכים", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8
+    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "סה""כ", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8
-    LTEXT "הגבלה", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER
-    LTEXT "שיא", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8
-    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "סה""כ", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8
+    LTEXT "הגבלה", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 27, 8, NOT WS_BORDER
+    LTEXT "שיא", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8
+    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "סך הכל", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8
-    LTEXT "זמין", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8
-    LTEXT "מטמון המערכת", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8
-    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "סך הכל", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8
+    LTEXT "זמין", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 30, 8
+    LTEXT "מטמון המערכת", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 46, 8
+    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "סך הכל", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8
-    LTEXT "Paged", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8 //FIXME: Shorten the string. "מאגר בקובץ ההחלפה" is too long. Do NOT shorten the numbers!
-    LTEXT "Nonpaged", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8 //FIXME: Shorten the string. "מאגר שלא בקובץ ההחלפה" is too long. Do NOT shorten the numbers!
-    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "סך הכל", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8
+    LTEXT "מאגר בקובץ ההחלפה", IDS_KERNEL_MEMORY_PAGED, 137, 184, 21, 8
+    LTEXT "מאגר שלא בקובץ ההחלפה", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 34, 8
+    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
    GROUPBOX "היסטורית שימוש במעבד", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "היסטורית שימוש בזיכרון", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT
--- a/base/applications/taskmgr/lang/hu-HU.rc
+++ b/base/applications/taskmgr/lang/hu-HU.rc
@@ -1,4 +1,4 @@
-// COPYRIGHT: Robert Horvath <talley@cubeclub.hu>
+/* TRANSLATOR: Robert Horvath <talley@cubeclub.hu> */

 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT

@@ -184,46 +184,46 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
    GROUPBOX "CPU használat", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Memória", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
-    GROUPBOX "Összesítés", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Lefoglalt memória (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Fizikai memória (K)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Kernel memória (K)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    LTEXT "Leírók", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8
-    LTEXT "Szálak", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8
-    LTEXT "Folyamatok", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8
-    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    GROUPBOX "Memóriahasználat", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
+    GROUPBOX "Összesítés", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Lefoglalt memória (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Fizikai memória (K)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Kernel memória (K)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    LTEXT "Leírók", IDS_TOTALS_HANDLE_COUNT, 12, 131, 35, 8
+    LTEXT "Szálak", IDS_TOTALS_THREAD_COUNT, 12, 140, 45, 8
+    LTEXT "Folyamatok száma", IDS_TOTALS_PROCESS_COUNT, 12, 149, 45, 8
+    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Összesen", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8
-    LTEXT "Korlát", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER
-    LTEXT "Csúcsérték", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8
-    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Összesen", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 45, 8
+    LTEXT "Korlát", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 35, 8, NOT WS_BORDER
+    LTEXT "Csúcsérték", IDS_COMMIT_CHARGE_PEAK, 12, 193, 45, 8
+    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Összesen", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8
-    LTEXT "Elérhető", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8
-    LTEXT "Rendszer gyorsítótár", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8
-    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Összesen", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 45, 8
+    LTEXT "Elérhető", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 45, 8
+    LTEXT "Rendszer gyorsítótár", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 67, 8
+    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 205, 149, 28, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Összesen", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8
-    LTEXT "Lapozható", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8
-    LTEXT "Nem lapozható", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8
-    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Összesen", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 45, 8
+    LTEXT "Lapozóállományban", IDS_KERNEL_MEMORY_PAGED, 137, 184, 62, 8
+    LTEXT "Nem lapozható", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 50, 8
+    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 200, 184, 33, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
    GROUPBOX "CPU használat", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Memória használat", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT
--- a/base/applications/taskmgr/lang/id-ID.rc
+++ b/base/applications/taskmgr/lang/id-ID.rc
@@ -1,4 +1,4 @@
-// COPYRIGHT: Zaenal Mutaqin <ade999@gmail.com>, Mas Ahmad Muhammad <m.charly81@gmail.com>
+/* TRANSLATORS: Zaenal Mutaqin <ade999@gmail.com> and Mas Ahmad Muhammad <m.charly81@gmail.com> */

 LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT

@@ -185,45 +185,45 @@ FONT 8, "MS Shell Dlg"
 BEGIN
    GROUPBOX "Pemakaian CPU", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Pemakaian MEM", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
-    GROUPBOX "Total", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Biaya Komit (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Memori Fisik (K)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Memori Kernel (K)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    LTEXT "Tuas", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8
-    LTEXT "Utas", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8
-    LTEXT "Proses", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8
-    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    GROUPBOX "Total", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Biaya Komit (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Memori Fisik (K)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Memori Kernel (K)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    LTEXT "Tuas", IDS_TOTALS_HANDLE_COUNT, 12, 131, 27, 8
+    LTEXT "Utas", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8
+    LTEXT "Proses", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8
+    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Total", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8
-    LTEXT "Batas", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER
-    LTEXT "Puncak", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8
-    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Total", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8
+    LTEXT "Batas", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 27, 8, NOT WS_BORDER
+    LTEXT "Puncak", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8
+    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Total", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8
-    LTEXT "Tersedia", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8
-    LTEXT "Tembolok Sistem", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8
-    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Total", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8
+    LTEXT "Tersedia", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 30, 8
+    LTEXT "Tembolok Sistem", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 46, 8
+    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Total", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8
-    LTEXT "Paged", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8
-    LTEXT "Nonpaged", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8
-    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Total", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8
+    LTEXT "Paged", IDS_KERNEL_MEMORY_PAGED, 137, 184, 21, 8
+    LTEXT "Nonpaged", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 34, 8
+    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
    GROUPBOX "Riwayat Pemakaian CPU", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Riwayat Pemakaian MEM", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT
--- a/base/applications/taskmgr/lang/it-IT.rc
+++ b/base/applications/taskmgr/lang/it-IT.rc
@@ -183,45 +183,45 @@ FONT 8, "MS Shell Dlg"
 BEGIN
    GROUPBOX "Uso CPU", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Uso MEM", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
-    GROUPBOX "Totali", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Carico scritture (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Memoria fisica (K)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Memoria del Kernel (K)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    LTEXT "Handle", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8
-    LTEXT "Thread", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8
-    LTEXT "Processi", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8
-    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    GROUPBOX "Totali", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Carico scritture (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Memoria fisica (K)", IDC_PHYSICAL_MEMORY_FRAME, 126, 122, 116, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Memoria del Kernel (K)", IDC_KERNEL_MEMORY_FRAME, 126, 166, 116, 39, 0, WS_EX_TRANSPARENT
+    LTEXT "Handle", IDS_TOTALS_HANDLE_COUNT, 12, 131, 27, 8
+    LTEXT "Thread", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8
+    LTEXT "Processi", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8
+    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Totale", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8
-    LTEXT "Limite", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER
-    LTEXT "Picco", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8
-    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Totale", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8
+    LTEXT "Limite", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 21, 8, NOT WS_BORDER
+    LTEXT "Picco", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8
+    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Totale", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8
-    LTEXT "Disponibile", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8
-    LTEXT "Cache sistema", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8
-    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Totale", IDS_PHYSICAL_MEMORY_TOTAL, 132, 131, 27, 8
+    LTEXT "Disponibile", IDS_PHYSICAL_MEMORY_AVAILABLE, 132, 140, 35, 8
+    LTEXT "Cache sistema", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 132, 149, 52, 8
+    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Totale", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8
-    LTEXT "Paginata", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8
-    LTEXT "Non paginata", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8
-    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Totale", IDS_KERNEL_MEMORY_TOTAL, 132, 174, 27, 8
+    LTEXT "Paginata", IDS_KERNEL_MEMORY_PAGED, 132, 184, 31, 8
+    LTEXT "Non paginata", IDS_KERNEL_MEMORY_NONPAGED, 132, 193, 48, 8
+    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
    GROUPBOX "Storico uso CPU", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Storico uso Memoria", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT
--- a/base/applications/taskmgr/lang/ja-JP.rc
+++ b/base/applications/taskmgr/lang/ja-JP.rc
@@ -183,45 +183,45 @@ FONT 9, "MS UI Gothic"
 BEGIN
    GROUPBOX "CPU 使用率", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "メモリ使用量", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
-    GROUPBOX "合計", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "コミット チャージ (KB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "物理メモリ (KB)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "カーネル メモリ (KB)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    LTEXT "ハンドル", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8
-    LTEXT "スレッド", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8
-    LTEXT "プロセス", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8
-    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    GROUPBOX "合計", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "コミット チャージ (KB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "物理メモリ (KB)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "カーネル メモリ (KB)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    LTEXT "ハンドル", IDS_TOTALS_HANDLE_COUNT, 12, 131, 27, 8
+    LTEXT "スレッド", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8
+    LTEXT "プロセス", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8
+    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "合計", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8
-    LTEXT "制限値", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER
-    LTEXT "最大値", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8
-    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "合計", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8
+    LTEXT "制限値", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 15, 8, NOT WS_BORDER
+    LTEXT "最大値", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8
+    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "合計", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8
-    LTEXT "利用可能", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8
-    LTEXT "システム キャッシュ", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8
-    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "合計", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8
+    LTEXT "利用可能", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 30, 8
+    LTEXT "システム キャッシュ", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 46, 8
+    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "合計", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8
-    LTEXT "ページ", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8
-    LTEXT "非ページ", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8
-    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "合計", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8
+    LTEXT "ページ", IDS_KERNEL_MEMORY_PAGED, 137, 184, 21, 8
+    LTEXT "非ページ", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 34, 8
+    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
    GROUPBOX "CPU 使用率の履歴", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "メモリ使用量の履歴", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT
--- a/base/applications/taskmgr/lang/ko-KR.rc
+++ b/base/applications/taskmgr/lang/ko-KR.rc
@@ -1,4 +1,4 @@
-// COPYRIGHT: Seungju Kim
+/* TRANSLATOR: Seungju Kim */

 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT

@@ -185,45 +185,45 @@ FONT 9, "굴림"
 BEGIN
    GROUPBOX "CPU 사용", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "메모리 사용", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
-    GROUPBOX "합계", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "할당된 메모리 (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "물리적 메모리 (K)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "커널 메모리 (K)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    LTEXT "핸들", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8
-    LTEXT "쓰레드", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8
-    LTEXT "프로세스", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8
-    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    GROUPBOX "합계", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "할당된 메모리 (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "물리적 메모리 (K)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "커널 메모리 (K)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    LTEXT "핸들", IDS_TOTALS_HANDLE_COUNT, 12, 131, 27, 8
+    LTEXT "쓰레드", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8
+    LTEXT "프로세스", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8
+    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "합계", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8
-    LTEXT "한계", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER
-    LTEXT "최고", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8
-    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "합계", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8
+    LTEXT "한계", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 15, 8, NOT WS_BORDER
+    LTEXT "최고", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8
+    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "합계", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8
-    LTEXT "사용 가능", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8
-    LTEXT "시스템 캐시", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8
-    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "합계", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8
+    LTEXT "사용 가능", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 30, 8
+    LTEXT "시스템 캐시", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 46, 8
+    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "합계", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8
-    LTEXT "페이지됨", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8
-    LTEXT "페이지 안됨", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8
-    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "합계", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8
+    LTEXT "페이지됨", IDS_KERNEL_MEMORY_PAGED, 137, 184, 21, 8
+    LTEXT "페이지 안됨", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 34, 8
+    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
    GROUPBOX "CPU 사용 기록", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "메모리 사용 기록", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT
--- a/base/applications/taskmgr/lang/nl-NL.rc
+++ b/base/applications/taskmgr/lang/nl-NL.rc
@@ -183,45 +183,45 @@ FONT 8, "MS Shell Dlg"
 BEGIN
    GROUPBOX "CPU", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Wisselbestand", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
-    GROUPBOX "Totalen", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Geheugengebruik (kB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Fysiek geheugen (kB)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Kernelgeheugen (kB)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    LTEXT "Ingangen", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8
-    LTEXT "Threads", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8
-    LTEXT "Processen", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8
-    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    GROUPBOX "Totalen", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Geheugengebruik (kB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Fysiek geheugen (kB)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 126, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Kernelgeheugen (kB)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 126, 39, 0, WS_EX_TRANSPARENT
+    LTEXT "Ingangen", IDS_TOTALS_HANDLE_COUNT, 12, 131, 37, 8
+    LTEXT "Threads", IDS_TOTALS_THREAD_COUNT, 12, 140, 37, 8
+    LTEXT "Processen", IDS_TOTALS_PROCESS_COUNT, 12, 149, 37, 8
+    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Totaal", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8
-    LTEXT "Limiet", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER
-    LTEXT "Piek", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8
-    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Totaal", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 37, 8
+    LTEXT "Limiet", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 37, 8, NOT WS_BORDER
+    LTEXT "Piek", IDS_COMMIT_CHARGE_PEAK, 12, 193, 37, 8
+    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Totaal", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8
-    LTEXT "Beschikbaar", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8
-    LTEXT "Systeemcache", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8
-    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Totaal", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 46, 8
+    LTEXT "Beschikbaar", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 46, 8
+    LTEXT "Systeemcache", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 46, 8
+    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 205, 131, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 205, 140, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 205, 149, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Totaal", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8
-    LTEXT "In wisselbestand", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8
-    LTEXT "N. wisselbestand", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8
-    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Totaal", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 85, 8
+    LTEXT "In wisselbestand", IDS_KERNEL_MEMORY_PAGED, 137, 184, 85, 8
+    LTEXT "Niet in wisselbestand", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 85, 8
+    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 205, 174, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 205, 184, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 205, 193, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
    GROUPBOX "Geschiedenis van CPU gebruik", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Geschiedenis van wisselbestandsgebruik", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT
--- a/base/applications/taskmgr/lang/no-NO.rc
+++ b/base/applications/taskmgr/lang/no-NO.rc
@@ -181,47 +181,47 @@ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Prosessorbruk", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Prosessorbruk", IDC_CPU_USAGE_FRAME, 5, 5, 70, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Minnebruk", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
-    GROUPBOX "Totalt", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Tildelt minne (kb)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Fysisk minne (kb)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Kjerne minne (kb)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    LTEXT "Referanser", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8
-    LTEXT "Tråder", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8
-    LTEXT "Prosesser", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8
-    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    GROUPBOX "Totalt", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Tildelt minne (kb)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Fysisk minne (kb)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Kjerne minne (kb)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    LTEXT "Referanser", IDS_TOTALS_HANDLE_COUNT, 12, 131, 50, 8
+    LTEXT "Tråder", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8
+    LTEXT "Prosesser", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8
+    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Totalt", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8
-    LTEXT "Begrensninger", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER
-    LTEXT "Topp", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8
-    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Totalt", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8
+    LTEXT "Begrensninger", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 50, 8, NOT WS_BORDER
+    LTEXT "Topp", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8
+    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Totalt", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8
-    LTEXT "Tilgjengelig", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8
-    LTEXT "Systembuffer", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8
-    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Totalt", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8
+    LTEXT "Tilgjengelig", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 40, 8
+    LTEXT "Systembuffer", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 46, 8
+    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 187, 131, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 187, 140, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 187, 149, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Totalt", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8
-    LTEXT "Sidevekslet", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8
-    LTEXT "Ikke sidevekslet", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8
-    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Totalt", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8
+    LTEXT "Sidevekslet", IDS_KERNEL_MEMORY_PAGED, 137, 184, 54, 8
+    LTEXT "Ikke sidevekslet", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 85, 8
+    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 187, 174, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 187, 184, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 187, 193, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
    GROUPBOX "Logg for bruk av prosessor", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Logg for bruk av fysisk minne", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT
--- a/base/applications/taskmgr/lang/pl-PL.rc
+++ b/base/applications/taskmgr/lang/pl-PL.rc
@@ -1,7 +1,9 @@
-// COPYRIGHT: xrogers <xxrogers@users.sourceforge.net>
-//            2011 Caemyr
-//            2014 Adam Stachowicz <saibamenppl@gmail.com>
-// https://sourceforge.net/projects/reactospl
+/*
+ * TRANSLATOR: xrogers <xxrogers@users.sourceforge.net>
+ * https://sourceforge.net/projects/reactospl
+ * UTF-8 conversion by Caemyr (May, 2011)
+ * Updated by Saibamen - Adam Stachowicz <saibamenppl@gmail.com> (August, 2014)
+ */

 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT

@@ -57,11 +59,11 @@ BEGIN
        MENUITEM "&Hibernuj", ID_SHUTDOWN_HIBERNATE
        MENUITEM "Wyłą&cz", ID_SHUTDOWN_POWEROFF
        MENUITEM "&Uruchom ponownie", ID_SHUTDOWN_REBOOT
-        MENUITEM "&Wyloguj: %s", ID_SHUTDOWN_LOGOFF //FIXME: accelerator collision &W
+        MENUITEM "&Wyloguj: %s", ID_SHUTDOWN_LOGOFF //FIXME: accelerator collision
        MENUITEM "&Przełącz użytkownika\tLogo Win+L", ID_SHUTDOWN_SWITCHUSER, GRAYED
        MENUITEM "&Zablokuj komputer\tLogo Win+L", ID_SHUTDOWN_LOCKCOMPUTER
        MENUITEM "&Rozłącz", ID_SHUTDOWN_DISCONNECT, GRAYED
-        MENUITEM "&Wysuń komputer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED //FIXME: accelerator collision &W
+        MENUITEM "&Wysuń komputer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED //FIXME: accelerator collision
    END
    POPUP "Pomo&c"
    BEGIN
@@ -186,50 +188,50 @@ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Użycie CPU", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Użycie MEM", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
-    GROUPBOX "Sumy", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Pamięć zadeklarowana (KB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Pamięć fizyczna (KB)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Pamięć jądra (KB)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    LTEXT "Dojścia", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8
-    LTEXT "Wątki", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8
-    LTEXT "Procesy", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8
-    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    GROUPBOX "Użycie procesora", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Użycie pliku stronicowania", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
+    GROUPBOX "Sumy", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Pamięć zadeklarowana (KB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Pamięć fizyczna (KB)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Pamięć jądra (KB)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    LTEXT "Dojścia", IDS_TOTALS_HANDLE_COUNT, 12, 131, 27, 8
+    LTEXT "Wątki", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8
+    LTEXT "Procesy", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8
+    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Razem", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8
-    LTEXT "Limit", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER
-    LTEXT "Szczyt", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8
-    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Razem", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8
+    LTEXT "Limit", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 15, 8, NOT WS_BORDER
+    LTEXT "Szczyt", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8
+    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Razem", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8
-    LTEXT "Dostępne", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8
-    LTEXT "Bufor systemu", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8
-    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Razem", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8
+    LTEXT "Dostępne", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 30, 8
+    LTEXT "Bufor systemu", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 80, 8
+    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Razem", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8
-    LTEXT "Stronicowana", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8
-    LTEXT "Niestronicowana", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8
-    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Razem", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8
+    LTEXT "Stronicowana", IDS_KERNEL_MEMORY_PAGED, 137, 184, 70, 8
+    LTEXT "Niestronicowana", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 80, 8
+    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 195, 193, 38, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
    GROUPBOX "Historia użycia procesora CPU", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Historia uzycia pliku stronicowania MEM", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Historia uzycia pliku stronicowania", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT
    PUSHBUTTON "Wyświetl użycie procesora", IDC_CPU_USAGE_GRAPH, 12, 17, 47, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE
    PUSHBUTTON "Wyświetl zużycie pamięci", IDC_MEM_USAGE_GRAPH, 12, 75, 47, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE
    PUSHBUTTON "Historia użycia procesora", IDC_CPU_USAGE_HISTORY_GRAPH, 81, 17, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE
--- a/base/applications/taskmgr/lang/pt-BR.rc
+++ b/base/applications/taskmgr/lang/pt-BR.rc
@@ -183,45 +183,45 @@ FONT 8, "MS Shell Dlg"
 BEGIN
    GROUPBOX "Uso de CPU", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Uso de MEM", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
-    GROUPBOX "Totais", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Carga comprometida (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Memória física(K)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Memória usada pelo núcleo (K)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    LTEXT "Identificadores", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8
-    LTEXT "Segmentos", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8
-    LTEXT "Processos", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8
-    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    GROUPBOX "Totais", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Carga comprometida (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Memória física(K)", IDC_PHYSICAL_MEMORY_FRAME, 122, 122, 120, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Memória usada pelo núcleo (K)", IDC_KERNEL_MEMORY_FRAME, 122, 166, 120, 39, 0, WS_EX_TRANSPARENT
+    LTEXT "Identificadores", IDS_TOTALS_HANDLE_COUNT, 12, 131, 47, 8
+    LTEXT "Segmentos", IDS_TOTALS_THREAD_COUNT, 12, 140, 36, 8
+    LTEXT "Processos", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8
+    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Total", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8
-    LTEXT "Limite", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER
-    LTEXT "Pico", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8
-    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Total", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8
+    LTEXT "Limite", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 19, 8, NOT WS_BORDER
+    LTEXT "Pico", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8
+    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Total", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8
-    LTEXT "Disponível", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8
-    LTEXT "Cache do Sistema", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8
-    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Total", IDS_PHYSICAL_MEMORY_TOTAL, 126, 131, 27, 8
+    LTEXT "Disponível", IDS_PHYSICAL_MEMORY_AVAILABLE, 126, 140, 36, 8
+    LTEXT "Cache do Sistema", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 126, 149, 57, 8
+    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Total", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8
-    LTEXT "Paginada", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8
-    LTEXT "Não paginada", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8
-    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Total", IDS_KERNEL_MEMORY_TOTAL, 126, 174, 27, 8
+    LTEXT "Paginada", IDS_KERNEL_MEMORY_PAGED, 126, 184, 30, 8
+    LTEXT "Não paginada", IDS_KERNEL_MEMORY_NONPAGED, 126, 193, 45, 8
+    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
    GROUPBOX "Histórico de uso de CPU", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Histórico de uso de Memoria", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT
--- a/base/applications/taskmgr/lang/pt-PT.rc
+++ b/base/applications/taskmgr/lang/pt-PT.rc
@@ -1,4 +1,4 @@
-// COPYRIGHT: 2021 Gabriel Aguiar <fgygh5804@gmail.com,fgsoftwarestudio@gmail.com>
+/* TRANSLATOR: 2021 Gabriel Aguiar <fgygh5804@gmail.com,fgsoftwarestudio@gmail.com> */

 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL

@@ -52,12 +52,12 @@ BEGIN
    BEGIN
        MENUITEM "&Suspender", ID_SHUTDOWN_STANDBY
        MENUITEM "&Hibernar", ID_SHUTDOWN_HIBERNATE
-        MENUITEM "&Desligar", ID_SHUTDOWN_POWEROFF //FIXME: accelerator collision &D
+        MENUITEM "&Desligar", ID_SHUTDOWN_POWEROFF //FIXME: accelerator collision
        MENUITEM "&Reiniciar", ID_SHUTDOWN_REBOOT
        MENUITEM "&Terminar sessão %s", ID_SHUTDOWN_LOGOFF
        MENUITEM "&Mudar de utilizador\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED
        MENUITEM "&Bloquear\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER
-        MENUITEM "&Desligar", ID_SHUTDOWN_DISCONNECT, GRAYED //FIXME: accelerator collision &D
+        MENUITEM "&Desligar", ID_SHUTDOWN_DISCONNECT, GRAYED //FIXME: accelerator collision
        MENUITEM "&Ejectar", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
    END
    POPUP "Aj&uda"
@@ -136,10 +136,10 @@ BEGIN
            MENUITEM "Abai&xo do normal", ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL
            MENUITEM "&Baixa", ID_PROCESS_PAGE_SETPRIORITY_LOW
        END
-        MENUITEM "Definir &afinidade...", ID_PROCESS_PAGE_SETAFFINITY //FIXME: accelerator collision &A
+        MENUITEM "Definir &afinidade...", ID_PROCESS_PAGE_SETAFFINITY //FIXME: accelerator collision
        MENUITEM SEPARATOR
        MENUITEM "P&ropriedades", ID_PROCESS_PAGE_PROPERTIES
-        MENUITEM "&Abrir localização do ficheiro", ID_PROCESS_PAGE_OPENFILELOCATION //FIXME: accelerator collision &A
+        MENUITEM "&Abrir localização do ficheiro", ID_PROCESS_PAGE_OPENFILELOCATION //FIXME: accelerator collision
    END
 END

@@ -185,45 +185,45 @@ FONT 8, "MS Shell Dlg"
 BEGIN
    GROUPBOX "Uso de CPU", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Uso de MEM", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
-    GROUPBOX "Totais", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Carga comprometida (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Memória física(K)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Memória usada pelo núcleo (K)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    LTEXT "Identificadores", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8
-    LTEXT "Segmentos", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8
-    LTEXT "Processos", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8
-    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    GROUPBOX "Totais", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Carga comprometida (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Memória física(K)", IDC_PHYSICAL_MEMORY_FRAME, 122, 122, 120, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Memória usada pelo núcleo (K)", IDC_KERNEL_MEMORY_FRAME, 122, 166, 120, 39, 0, WS_EX_TRANSPARENT
+    LTEXT "Identificadores", IDS_TOTALS_HANDLE_COUNT, 12, 131, 47, 8
+    LTEXT "Segmentos", IDS_TOTALS_THREAD_COUNT, 12, 140, 36, 8
+    LTEXT "Processos", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8
+    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Total", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8
-    LTEXT "Limite", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER
-    LTEXT "Pico", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8
-    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Total", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8
+    LTEXT "Limite", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 19, 8, NOT WS_BORDER
+    LTEXT "Pico", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8
+    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Total", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8
-    LTEXT "Disponível", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8
-    LTEXT "Cache do Sistema", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8
-    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Total", IDS_PHYSICAL_MEMORY_TOTAL, 126, 131, 27, 8
+    LTEXT "Disponível", IDS_PHYSICAL_MEMORY_AVAILABLE, 126, 140, 36, 8
+    LTEXT "Cache do Sistema", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 126, 149, 57, 8
+    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Total", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8
-    LTEXT "Paginada", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8
-    LTEXT "Não paginada", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8
-    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Total", IDS_KERNEL_MEMORY_TOTAL, 126, 174, 27, 8
+    LTEXT "Paginada", IDS_KERNEL_MEMORY_PAGED, 126, 184, 30, 8
+    LTEXT "Não paginada", IDS_KERNEL_MEMORY_NONPAGED, 126, 193, 45, 8
+    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
    GROUPBOX "Histórico de uso de CPU", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Histórico de uso de Memoria", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT
@@ -285,7 +285,7 @@ BEGIN
    LTEXT "Seleccione as colunas que aparecerão na página de processos do 'Gestor de tarefas.", IDC_STATIC, 7, 7, 181, 17
    CONTROL "Nome da ima&gem", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 66, 10
    CONTROL "&Identificação do processo (PID)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 113, 10
-    CONTROL "&Uso de CPU", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 53, 10 //FIXME: accelerator collision &U
+    CONTROL "&Uso de CPU", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 53, 10 //FIXME: accelerator collision
    CONTROL "&Tempo de CPU", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 61, 10
    CONTROL "U&so de memória", IDC_MEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 72, 63, 10
    CONTROL "Inter&valo de uso de memória", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 110, 10
@@ -295,7 +295,7 @@ BEGIN
    CONTROL "Leituras de E/S", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 61, 10
    CONTROL "Bytes de leitura de E/S", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 86, 10
    CONTROL "Ide&ntificação de sessão", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 90, 10
-    CONTROL "Nome de &utilizador", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 65, 10 //FIXME: accelerator collision &U
+    CONTROL "Nome de &utilizador", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 65, 10 //FIXME: accelerator collision
    CONTROL "Intervalo de fal&has de página", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 28, 110, 10
    CONTROL "Tamanho da &memória virtual", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 39, 110, 10
    CONTROL "&Reserva de memória paginável", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 50, 110, 10
--- a/base/applications/taskmgr/lang/ro-RO.rc
+++ b/base/applications/taskmgr/lang/ro-RO.rc
@@ -1,5 +1,7 @@
-// COPYRIGHT: Petru Dimitriu <petrimetri@gmail.com>
-//            Ștefan Fulea <stefan.fulea@mail.com>
+/*
+ * TRANSLATORS: Petru Dimitriu <petrimetri@gmail.com>
+ *              Ștefan Fulea <stefan.fulea@mail.com>
+ */

 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL

@@ -186,45 +188,45 @@ FONT 8, "MS Shell Dlg"
 BEGIN
    GROUPBOX "Uz procesor", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Uz memorie", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
-    GROUPBOX "Totale", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Memorie încărcată (ko)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Memorie fizică (ko)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Memorie nucleu (ko)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    LTEXT "Id. de gestiune", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8
-    LTEXT "Fire de execuție", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8
-    LTEXT "Procese", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8
-    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    GROUPBOX "Totale", IDC_TOTALS_FRAME, 5, 122, 121, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Memorie încărcată (ko)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 121, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Memorie fizică (ko)", IDC_PHYSICAL_MEMORY_FRAME, 136, 122, 106, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Memorie nucleu (ko)", IDC_KERNEL_MEMORY_FRAME, 136, 166, 106, 39, 0, WS_EX_TRANSPARENT
+    LTEXT "Id. de gestiune", IDS_TOTALS_HANDLE_COUNT, 12, 131, 125, 8
+    LTEXT "Fire de execuție", IDS_TOTALS_THREAD_COUNT, 12, 140, 100, 8
+    LTEXT "Procese", IDS_TOTALS_PROCESS_COUNT, 12, 149, 100, 8
+    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 75, 131, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_THREAD_COUNT, 75, 140, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 75, 149, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Actuală", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8
-    LTEXT "Posibilă", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER
-    LTEXT "Atinsă", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8
-    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Actuală", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 100, 8
+    LTEXT "Posibilă", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 100, 8, NOT WS_BORDER
+    LTEXT "Atinsă", IDS_COMMIT_CHARGE_PEAK, 12, 193, 100, 8
+    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 75, 174, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 75, 184, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 75, 193, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Totală", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8
-    LTEXT "Disponbilă", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8
-    LTEXT "Tampon", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8
-    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Totală", IDS_PHYSICAL_MEMORY_TOTAL, 142, 131, 100, 8
+    LTEXT "Disponbilă", IDS_PHYSICAL_MEMORY_AVAILABLE, 142, 140, 100, 8
+    LTEXT "Tampon", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 142, 149, 100, 8
+    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 190, 131, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 190, 140, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 190, 149, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Totală", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8
-    LTEXT "Paginată", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8
-    LTEXT "Nepaginată", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8
-    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Totală", IDS_KERNEL_MEMORY_TOTAL, 142, 174, 100, 8
+    LTEXT "Paginată", IDS_KERNEL_MEMORY_PAGED, 142, 184, 100, 8
+    LTEXT "Nepaginată", IDS_KERNEL_MEMORY_NONPAGED, 142, 193, 100, 8
+    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 190, 174, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 190, 184, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 190, 193, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
    GROUPBOX "Istoricul încărcăturii de procesor", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Istoricul încărcăturii de memorie", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT
--- a/base/applications/taskmgr/lang/ru-RU.rc
+++ b/base/applications/taskmgr/lang/ru-RU.rc
@@ -1,4 +1,4 @@
-// COPYRIGHT: Dmitry Chapyshev, 2007, Kudratov Olimjon <olim98@bk.ru>
+/* TRANSLATORS: Dmitry Chapyshev, 2007-06-10, Kudratov Olimjon <olim98@bk.ru> */

 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT

@@ -184,46 +184,46 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
    GROUPBOX "Загрузка ЦП", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Память", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
-    GROUPBOX "Всего", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Выделение памяти (КБ)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Физическая память (КБ)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Память ядра (КБ)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Файл подкачки", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
+    GROUPBOX "Всего", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Выделение памяти (КБ)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Физическая память (КБ)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Память ядра (КБ)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT
    LTEXT "Дескрипторов", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8
-    LTEXT "Потоков", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8
-    LTEXT "Процессов", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8
-    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Потоков", IDS_TOTALS_THREAD_COUNT, 12, 140, 30, 8
+    LTEXT "Процессов", IDS_TOTALS_PROCESS_COUNT, 12, 149, 36, 8
+    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Всего", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8
-    LTEXT "Предел", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER
-    LTEXT "Пик", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8
-    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Всего", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8
+    LTEXT "Предел", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 27, 8, NOT WS_BORDER
+    LTEXT "Пик", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8
+    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Всего", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8
-    LTEXT "Доступно", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8
-    LTEXT "Системный кэш", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8
-    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Всего", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8
+    LTEXT "Доступно", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 33, 8
+    LTEXT "Системный кэш", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 80, 8
+    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 184, 131, 49, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 190, 149, 43, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Всего", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8
-    LTEXT "Выгружаемая", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8
-    LTEXT "Невыгружаемая", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8
-    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Всего", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8
+    LTEXT "Выгружаемая", IDS_KERNEL_MEMORY_PAGED, 137, 184, 50, 8
+    LTEXT "Невыгружаемая", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 80, 8
+    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 195, 174, 41, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 195, 184, 41, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 195, 194, 41, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
    GROUPBOX "Хронология загрузки ЦП", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Хронология использования файла подкачки", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT
--- a/base/applications/taskmgr/lang/sk-SK.rc
+++ b/base/applications/taskmgr/lang/sk-SK.rc
@@ -1,4 +1,4 @@
-// COPYRIGHT: 2007 Kario <kario@szm.sk>
+/* TRANSLATOR: 2007 Kario <kario@szm.sk> */

 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT

@@ -185,45 +185,45 @@ FONT 8, "MS Shell Dlg"
 BEGIN
    GROUPBOX "Procesor", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Stránkovanie", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
-    GROUPBOX "Súčty", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Využitie pamäte (kB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Fyzická pamäť (kB)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Pamäť jadra (kB)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    LTEXT "Popisovače", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8
-    LTEXT "Vlákna", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8
-    LTEXT "Procesy", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8
-    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    GROUPBOX "Súčty", IDC_TOTALS_FRAME, 5, 122, 89, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Využitie pamäte (kB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 89, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Fyzická pamäť (kB)", IDC_PHYSICAL_MEMORY_FRAME, 99, 122, 143, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Pamäť jadra (kB)", IDC_KERNEL_MEMORY_FRAME, 99, 166, 143, 39, 0, WS_EX_TRANSPARENT
+    LTEXT "Popisovače", IDS_TOTALS_HANDLE_COUNT, 12, 131, 40, 8
+    LTEXT "Vlákna", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8
+    LTEXT "Procesy", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8
+    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 54, 131, 36, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_THREAD_COUNT, 54, 140, 36, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 54, 149, 36, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Celkovo", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8
-    LTEXT "Limit", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER
-    LTEXT "Maximum", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8
-    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Celkovo", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8
+    LTEXT "Limit", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 15, 8, NOT WS_BORDER
+    LTEXT "Maximum", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8
+    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 50, 174, 40, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 50, 184, 40, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 50, 193, 40, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Celkovo", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8
-    LTEXT "K dispozícii", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8
-    LTEXT "Vyrovnáv. pamäť", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8
-    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Celkovo", IDS_PHYSICAL_MEMORY_TOTAL, 104, 131, 27, 8
+    LTEXT "K dispozícii", IDS_PHYSICAL_MEMORY_AVAILABLE, 104, 140, 40, 8
+    LTEXT "Vyrovnáv. pamäť systému", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 104, 149, 90, 8
+    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 196, 131, 40, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 196, 140, 40, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 196, 149, 40, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Celkovo", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8
-    LTEXT "Stránkovaná", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8
-    LTEXT "Nestránkovaná", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8
-    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Celkovo", IDS_KERNEL_MEMORY_TOTAL, 104, 174, 27, 8
+    LTEXT "Stránkovaná", IDS_KERNEL_MEMORY_PAGED, 104, 184, 52, 8
+    LTEXT "Nestránkovaná", IDS_KERNEL_MEMORY_NONPAGED, 104, 193, 52, 8
+    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 196, 174, 40, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 196, 184, 40, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 196, 193, 40, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
    GROUPBOX "História využitia procesora", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "História využitia stránkovacieho súboru", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT
--- a/base/applications/taskmgr/lang/sq-AL.rc
+++ b/base/applications/taskmgr/lang/sq-AL.rc
@@ -1,4 +1,5 @@
-// COPYRIGHT: 2013 Ardit Dani (Ard1t) <ardit.dani@gmail.com>
+/* TRANSLATOR: 2013 Ardit Dani (Ard1t) <ardit.dani@gmail.com>
+*/

 LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL

@@ -185,45 +186,45 @@ FONT 8, "MS Shell Dlg"
 BEGIN
    GROUPBOX "Perdorimi i CPU", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Perdorimi i MEM", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
-    GROUPBOX "Totale", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Vendos Drejtimin (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Memoria Fizike (K)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Memoria e Kernelit (K)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    LTEXT "Trajton", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8
-    LTEXT "Temat", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8
-    LTEXT "proceset", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8
-    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    GROUPBOX "Totale", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Vendos Drejtimin (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Memoria Fizike (K)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Memoria e Kernelit (K)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    LTEXT "Trajton", IDS_TOTALS_HANDLE_COUNT, 12, 131, 27, 8
+    LTEXT "Temat", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8
+    LTEXT "proceset", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8
+    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Totali", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8
-    LTEXT "Limiti", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER
-    LTEXT "Shiko", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8
-    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Totali", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8
+    LTEXT "Limiti", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 15, 8, NOT WS_BORDER
+    LTEXT "Shiko", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8
+    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Totali", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8
-    LTEXT "N'dispozicion", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8
-    LTEXT "Kafazi Sistemit", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8
-    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Totali", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8
+    LTEXT "N'dispozicion", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 46, 8
+    LTEXT "Kafazi Sistemit", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 46, 8
+    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Totali", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8
-    LTEXT "Numerizim", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8
-    LTEXT "Jo te numerizume", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8
-    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Totali", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 46, 8
+    LTEXT "Numerizim", IDS_KERNEL_MEMORY_PAGED, 137, 184, 46, 8
+    LTEXT "Jo te numerizume", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 56, 8
+    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 195, 193, 38, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
    GROUPBOX "Historia e perdorimit CPU", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Historia e perdorimit Memories", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT
--- a/base/applications/taskmgr/lang/sv-SE.rc
+++ b/base/applications/taskmgr/lang/sv-SE.rc
@@ -1,4 +1,4 @@
-// COPYRIGHT: David Nordenberg
+/* TRANSLATOR: David Nordenberg */

 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL

@@ -185,45 +185,45 @@ FONT 8, "MS Shell Dlg"
 BEGIN
    GROUPBOX "Processoranv.", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Minnesanv.", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
-    GROUPBOX "Totalt", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Upptaget minne (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Fysiskt minne (K)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Kernel minne (K)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    LTEXT "Referenser", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8
-    LTEXT "Trådar", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8
-    LTEXT "Processer", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8
-    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    GROUPBOX "Totalt", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Upptaget minne (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Fysiskt minne (K)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Kernel minne (K)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    LTEXT "Referenser", IDS_TOTALS_HANDLE_COUNT, 12, 131, 41, 8
+    LTEXT "Trådar", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8
+    LTEXT "Processer", IDS_TOTALS_PROCESS_COUNT, 12, 149, 36, 8
+    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Totalt", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8
-    LTEXT "Gräns", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER
-    LTEXT "Topp", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8
-    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Totalt", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8
+    LTEXT "Gräns", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 21, 8, NOT WS_BORDER
+    LTEXT "Topp", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8
+    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Totalt", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8
-    LTEXT "Tillgängligt", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8
-    LTEXT "System Cache", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8
-    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Totalt", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8
+    LTEXT "Tillgängligt", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 46, 8
+    LTEXT "System Cache", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 46, 8
+    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Totalt", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8
-    LTEXT "Fysiskt / virtuellt", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8
-    LTEXT "Fysiskt", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8
-    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Totalt", IDS_KERNEL_MEMORY_TOTAL, 137, 175, 27, 8
+    LTEXT "Fysiskt / virtuellt", IDS_KERNEL_MEMORY_PAGED, 137, 184, 56, 8
+    LTEXT "Fysiskt", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 44, 8
+    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 190, 184, 43, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
    GROUPBOX "Processorhistorik", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Minneshistorik", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT
--- a/base/applications/taskmgr/lang/tr-TR.rc
+++ b/base/applications/taskmgr/lang/tr-TR.rc
@@ -1,4 +1,4 @@
-// COPYRIGHT: 2013-2019 Erdem Ersoy
+/* TRANSLATOR: 2013-2019 Erdem Ersoy (eersoy93) <erdemersoy@erdemersoy.net> */

 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

@@ -185,45 +185,45 @@ FONT 8, "MS Shell Dlg"
 BEGIN
    GROUPBOX "CPU Kullanımı", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Bellek Kullanımı", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
-    GROUPBOX "Toplam", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Ayrılmış Bellek (KB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Fiziksel Bellek (KB)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Çekirdek Belleği (KB)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    LTEXT "İşleçler", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8
-    LTEXT "İş Parçacıkları", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8
-    LTEXT "İşlemler", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8
-    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    GROUPBOX "Toplam", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Ayrılmış Bellek (KB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Fiziksel Bellek (KB)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Çekirdek Belleği (KB)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    LTEXT "İşleçler", IDS_TOTALS_HANDLE_COUNT, 12, 131, 45, 8
+    LTEXT "İş Parçacıkları", IDS_TOTALS_THREAD_COUNT, 12, 140, 45, 8
+    LTEXT "İşlemler", IDS_TOTALS_PROCESS_COUNT, 12, 149, 45, 8
+    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Toplam", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8
-    LTEXT "Sınır", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER
-    LTEXT "En Yüksek", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8
-    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Toplam", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 45, 8
+    LTEXT "Sınır", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 45, 8, NOT WS_BORDER
+    LTEXT "En Yüksek", IDS_COMMIT_CHARGE_PEAK, 12, 193, 45, 8
+    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Toplam", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8
-    LTEXT "Kullanılabilir", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8
-    LTEXT "Sistem Ön Belleği", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8
-    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Toplam", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 45, 8
+    LTEXT "Kullanılabilir", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 45, 8
+    LTEXT "Sistem Ön Belleği", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 51, 8
+    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 190, 149, 43, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Toplam", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8
-    LTEXT "Sayfalanmış", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8
-    LTEXT "Sayfalanmamış", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8
-    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Toplam", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 45, 8
+    LTEXT "Sayfalanmış", IDS_KERNEL_MEMORY_PAGED, 137, 184, 45, 8
+    LTEXT "Sayfalanmamış", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 50, 8
+    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
    GROUPBOX "CPU Kullanım Geçmişi", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Bellek Kullanım Geçmişi", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT
--- a/base/applications/taskmgr/lang/uk-UA.rc
+++ b/base/applications/taskmgr/lang/uk-UA.rc
@@ -181,47 +181,47 @@ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "ЦП", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Пам'ять", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
-    GROUPBOX "Усього", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Виділення пам'яті (КБ)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Фізична пам'ять (КБ)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "Пам'ять ядра (КБ)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    LTEXT "Дескрипторів", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8
-    LTEXT "Потоків", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8
-    LTEXT "Процесів", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8
-    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    GROUPBOX "Викорис. ЦП", IDC_CPU_USAGE_FRAME, 5, 5, 62, 54, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Викорис. пам'яті", IDC_MEM_USAGE_FRAME, 5, 63, 62, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
+    GROUPBOX "Усього", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Виділення пам'яті (КБ)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Фізична пам'ять (КБ)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "Пам'ять ядра (КБ)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    LTEXT "Дескрипторів", IDS_TOTALS_HANDLE_COUNT, 12, 131, 47, 8
+    LTEXT "Потоків", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8
+    LTEXT "Процесів", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8
+    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Усього", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8
-    LTEXT "Межа", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER
-    LTEXT "Пік", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8
-    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Усього", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8
+    LTEXT "Межа", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 18, 8, NOT WS_BORDER
+    LTEXT "Пік", IDS_COMMIT_CHARGE_PEAK, 12, 193, 18, 8
+    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Усього", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8
-    LTEXT "Доступно", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8
-    LTEXT "Системний кеш", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8
-    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Усього", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8
+    LTEXT "Доступно", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 32, 8
+    LTEXT "Системний кеш", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 53, 8
+    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 188, 131, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 188, 140, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 188, 149, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "Усього", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8
-    LTEXT "Сторінка", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8
-    LTEXT "Неповторний", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8
-    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "Усього", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8
+    LTEXT "Вивантажувана", IDS_KERNEL_MEMORY_PAGED, 137, 184, 53, 8
+    LTEXT "Невивантажувана", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 63, 8
+    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 198, 174, 35, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 198, 184, 35, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 200, 193, 33, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
    GROUPBOX "Хронологія використання ЦП", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "Хронологія використання пам'яті", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT
--- a/base/applications/taskmgr/lang/zh-CN.rc
+++ b/base/applications/taskmgr/lang/zh-CN.rc
@@ -1,5 +1,9 @@
-// COPYRIGHT: 2008 zhangbing <e_zb@21cn.com, ezb@mail.gywb.cn>
-//            Wexpo Lyu <laosb@lasteam.net>
+/*
+ * (Simplified Chinese resources)
+ * (简体中文资源)
+ * by zhangbing 2008 <e_zb@21cn.com, ezb@mail.gywb.cn>
+ * Improved by Wexpo Lyu <laosb@lasteam.net>
+ */

 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED

@@ -186,45 +190,45 @@ FONT 9, "宋体"
 BEGIN
    GROUPBOX "CPU 使用情况显示", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "页面文件使用率", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
-    GROUPBOX "总数", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "提交开销(K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "物理内存(K)", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "核心内存(K)", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    LTEXT "句柄数", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8
-    LTEXT "线程数", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8
-    LTEXT "进程数", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8
-    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    GROUPBOX "总数", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "提交开销(K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "物理内存(K)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "核心内存(K)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    LTEXT "句柄数", IDS_TOTALS_HANDLE_COUNT, 12, 131, 27, 8
+    LTEXT "线程数", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8
+    LTEXT "进程数", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8
+    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "总数", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8
-    LTEXT "限制", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER
-    LTEXT "峰值", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8
-    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "总数", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8
+    LTEXT "限制", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 25, 8, NOT WS_BORDER
+    LTEXT "峰值", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8
+    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "总数", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8
-    LTEXT "可用数", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8
-    LTEXT "系统缓存", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8
-    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "总数", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8
+    LTEXT "可用数", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 30, 8
+    LTEXT "系统缓存", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 46, 8
+    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "总数", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8
-    LTEXT "分页数", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8
-    LTEXT "未分页", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8
-    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "总数", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8
+    LTEXT "分页数", IDS_KERNEL_MEMORY_PAGED, 137, 184, 28, 8
+    LTEXT "未分页", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 34, 8
+    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
    GROUPBOX "CPU 使用记录", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "内存使用记录", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT
--- a/base/applications/taskmgr/lang/zh-HK.rc
+++ b/base/applications/taskmgr/lang/zh-HK.rc
@@ -191,45 +191,45 @@ FONT 9, "新細明體"
 BEGIN
    GROUPBOX "CPU 使用情況顯示", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "PF 使用率", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
-    GROUPBOX "總數", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "認可負載（K）", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "實體記憶體（K）", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "核心記憶體（K）", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    LTEXT "控制代碼數", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8
-    LTEXT "執行緒數", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8
-    LTEXT "處理程序數", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8
-    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    GROUPBOX "總數", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "認可負載（K）", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "實體記憶體（K）", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "核心記憶體（K）", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    LTEXT "控制代碼數", IDS_TOTALS_HANDLE_COUNT, 12, 131, 27, 8
+    LTEXT "執行緒數", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8
+    LTEXT "處理程序數", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8
+    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "總數", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8
-    LTEXT "限制", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER
-    LTEXT "峰值", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8
-    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "總數", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8
+    LTEXT "限制", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 25, 8, NOT WS_BORDER
+    LTEXT "峰值", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8
+    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "總數", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8
-    LTEXT "可用數", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8
-    LTEXT "系统快取", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8
-    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "總數", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8
+    LTEXT "可用數", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 30, 8
+    LTEXT "系统快取", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 46, 8
+    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "總數", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8
-    LTEXT "分頁數", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8
-    LTEXT "未分頁", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8
-    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "總數", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8
+    LTEXT "分頁數", IDS_KERNEL_MEMORY_PAGED, 137, 184, 28, 8
+    LTEXT "未分頁", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 34, 8
+    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
    GROUPBOX "CPU 使用記錄", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "記憶體使用記錄", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT
--- a/base/applications/taskmgr/lang/zh-TW.rc
+++ b/base/applications/taskmgr/lang/zh-TW.rc
@@ -191,45 +191,45 @@ FONT 9, "新細明體"
 BEGIN
    GROUPBOX "CPU 使用情況顯示", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "PF 使用率", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT
-    GROUPBOX "總數", IDC_TOTALS_FRAME, 5, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "認可負載（K）", IDC_COMMIT_CHARGE_FRAME, 5, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "實體記憶體（K）", IDC_PHYSICAL_MEMORY_FRAME, 128, 122, 114, 39, 0, WS_EX_TRANSPARENT
-    GROUPBOX "核心記憶體（K）", IDC_KERNEL_MEMORY_FRAME, 128, 166, 114, 39, 0, WS_EX_TRANSPARENT
-    LTEXT "控制代碼數", IDS_TOTALS_HANDLE_COUNT, 12, 131, 57, 8
-    LTEXT "執行緒數", IDS_TOTALS_THREAD_COUNT, 12, 140, 57, 8
-    LTEXT "處理程序數", IDS_TOTALS_PROCESS_COUNT, 12, 149, 57, 8
-    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 69, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    GROUPBOX "總數", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "認可負載（K）", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "實體記憶體（K）", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT
+    GROUPBOX "核心記憶體（K）", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT
+    LTEXT "控制代碼數", IDS_TOTALS_HANDLE_COUNT, 12, 131, 27, 8
+    LTEXT "執行緒數", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8
+    LTEXT "處理程序數", IDS_TOTALS_PROCESS_COUNT, 12, 149, 34, 8
+    EDITTEXT IDC_TOTALS_HANDLE_COUNT, 65, 131, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_THREAD_COUNT, 69, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_THREAD_COUNT, 65, 140, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 69, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_TOTALS_PROCESS_COUNT, 65, 149, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "總數", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 57, 8
-    LTEXT "限制", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 57, 8, NOT WS_BORDER
-    LTEXT "峰值", IDS_COMMIT_CHARGE_PEAK, 12, 193, 57, 8
-    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 69, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "總數", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 27, 8
+    LTEXT "限制", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 25, 8, NOT WS_BORDER
+    LTEXT "峰值", IDS_COMMIT_CHARGE_PEAK, 12, 193, 34, 8
+    EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 65, 174, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 69, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 65, 184, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 69, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_COMMIT_CHARGE_PEAK, 65, 193, 45, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "總數", IDS_PHYSICAL_MEMORY_TOTAL, 134, 131, 57, 8
-    LTEXT "可用數", IDS_PHYSICAL_MEMORY_AVAILABLE, 134, 140, 57, 8
-    LTEXT "系统快取", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 134, 149, 57, 8
-    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "總數", IDS_PHYSICAL_MEMORY_TOTAL, 137, 131, 27, 8
+    LTEXT "可用數", IDS_PHYSICAL_MEMORY_AVAILABLE, 137, 140, 30, 8
+    LTEXT "系统快取", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 137, 149, 46, 8
+    EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 185, 131, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 185, 140, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 185, 149, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    LTEXT "總數", IDS_KERNEL_MEMORY_TOTAL, 134, 174, 57, 8
-    LTEXT "分頁數", IDS_KERNEL_MEMORY_PAGED, 134, 184, 57, 8
-    LTEXT "未分頁", IDS_KERNEL_MEMORY_NONPAGED, 134, 193, 57, 8
-    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 45, 8, ES_RIGHT | ES_READONLY |
+    LTEXT "總數", IDS_KERNEL_MEMORY_TOTAL, 137, 174, 27, 8
+    LTEXT "分頁數", IDS_KERNEL_MEMORY_PAGED, 137, 184, 28, 8
+    LTEXT "未分頁", IDS_KERNEL_MEMORY_NONPAGED, 137, 193, 34, 8
+    EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 185, 174, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_PAGED, 185, 184, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 45, 8, ES_RIGHT | ES_READONLY |
+    EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY |
             ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
    GROUPBOX "CPU 使用記錄", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT
    GROUPBOX "記憶體使用記錄", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT
--- a/base/applications/utilman/umandlg/process.c
+++ b/base/applications/utilman/umandlg/process.c
@@ -84,7 +84,7 @@ BOOL IsProcessRunning(IN LPCWSTR lpszProcessName)
    hProcess = OpenProcess(SYNCHRONIZE, FALSE, dwProcessID);
    if (!hProcess)
    {
-        DPRINT("IsProcessRunning(): Failed to open the process! (Error: %lu)\n", GetLastError());
+        DPRINT("IsProcessRunning(): Failed to open the process! (Error: %lu)", GetLastError());
        return FALSE;
    }

@@ -211,7 +211,7 @@ BOOL CloseProcess(IN LPCWSTR lpszProcessName)
    hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, dwProcessID);
    if (!hProcess)
    {
-        DPRINT("CloseProcess(): Failed to open the process for termination! (Error: %lu)\n", GetLastError());
+        DPRINT("CloseProcess(): Failed to open the process for termination! (Error: %lu)", GetLastError());
        return FALSE;
    }

--- a/base/applications/wordpad/lang/ro-RO.rc
+++ b/base/applications/wordpad/lang/ro-RO.rc
@@ -1,13 +1,8 @@
 /*
- * PROJECT:     ReactOS Wordpad
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Romanian resource file
- * TRANSLATORS: Copyright 2004 Krzysztof Foltman
- *              Copyright 2010 Claudia Cotună
- *              Copyright 2010 Michael Stefaniuc
- *              Copyright 2011 Ștefan Fulea <stefan.fulea@mail.com>
- *              Copyright 2023 Andrei Miloiu <miloiuandrei@gmail.com>
- *
+ * Copyright 2004 Krzysztof Foltman
+ * Copyright 2010 Claudia Cotună
+ *                Michael Stefaniuc
+ *           2011 Ștefan Fulea
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -32,8 +27,8 @@ BEGIN
    BEGIN
        MENUITEM "&Nou…\tCtrl+N",            ID_FILE_NEW
        MENUITEM "&Deschidere…\tCtrl+O",     ID_FILE_OPEN
-        MENUITEM "S&alvează\tCtrl+S",        ID_FILE_SAVE
-        MENUITEM "Salvea&ză ca…",            ID_FILE_SAVEAS
+        MENUITEM "&Pătrează\tCtrl+S",        ID_FILE_SAVE
+        MENUITEM "Păst&rare în…",            ID_FILE_SAVEAS
        MENUITEM SEPARATOR
        MENUITEM "I&mprimare…\tCtrl+P",      ID_PRINT
        MENUITEM "Pre&vizionare imprimare…", ID_PREVIEW
@@ -183,13 +178,13 @@ END
 STRINGTABLE
 BEGIN
    STRING_DEFAULT_FILENAME,     "Document"
-    STRING_PROMPT_SAVE_CHANGES,  "Salvați modificările la „%s”?"
+    STRING_PROMPT_SAVE_CHANGES,  "Păstrați modificările la „%s”?"
    STRING_SEARCH_FINISHED,      "Căutarea în document a fost finalizată."
    STRING_LOAD_RICHED_FAILED,   "Biblioteca RichEdit nu a putut fi încărcată."
    STRING_SAVE_LOSEFORMATTING,  "Ați ales să salvați în formatul de text simplu, care va pierde formatarea. Sigur doriți să continuați?"
    STRING_INVALID_NUMBER,       "Formatul de număr nu este valid."
    STRING_OLE_STORAGE_NOT_SUPPORTED, "Documentele de depozitare OLE nu sunt suportate."
-    STRING_WRITE_FAILED,              "Fișierul nu a putut fi salvat."
+    STRING_WRITE_FAILED,              "Fișierul nu a putut fi păstrat."
    STRING_WRITE_ACCESS_DENIED,       "Nu aveți permisiunea să salvați fișierul."
    STRING_OPEN_FAILED,               "Fișierul nu a putut fi deschis."
    STRING_OPEN_ACCESS_DENIED,        "Nu aveți permisiunea de a deschide fișierul."
--- a/base/setup/lib/bootsup.c
+++ b/base/setup/lib/bootsup.c
@@ -73,7 +73,7 @@ CreateFreeLoaderReactOSEntries(
    /* ReactOS */
    // BootEntry->BootEntryKey = MAKESTRKEY(L"ReactOS");
    BootEntry->FriendlyName = L"\"ReactOS\"";
-    Options->OsLoadOptions  = L"/FASTDETECT";
+    Options->OsLoadOptions  = NULL; // L"";
    AddBootStoreEntry(BootStoreHandle, BootEntry, MAKESTRKEY(L"ReactOS"));

    /* ReactOS_Debug */
--- a/base/setup/lib/errorcode.h
+++ b/base/setup/lib/errorcode.h
@@ -32,6 +32,7 @@ typedef enum _ERROR_NUMBER
    ERROR_LOAD_KBLAYOUT,
    ERROR_WARN_PARTITION,
    ERROR_NEW_PARTITION,
+    ERROR_DELETE_SPACE,
    ERROR_INSTALL_BOOTCODE,
    ERROR_NO_FLOPPY,
    ERROR_UPDATE_KBSETTINGS,
--- a/base/setup/lib/install.c
+++ b/base/setup/lib/install.c
@@ -655,7 +655,7 @@ PrepareCopyInfFile(
            if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_COLLISION)
            {
                INF_FreeData(DirKeyValue);
-                DPRINT1("Creating directory '%S' failed: Status = 0x%08lx\n", PathBuffer, Status);
+                DPRINT("Creating directory '%S' failed: Status = 0x%08lx", PathBuffer, Status);
                pSetupData->LastErrorNumber = ERROR_CREATE_DIR;
                if (pSetupData->ErrorRoutine)
                    pSetupData->ErrorRoutine(pSetupData, PathBuffer);
--- a/base/setup/lib/setuplib.c
+++ b/base/setup/lib/setuplib.c
@@ -833,7 +833,7 @@ InitializeSetup(
                                &pSetupData->SourceRootDir);
        if (!NT_SUCCESS(Status))
        {
-            DPRINT1("GetSourcePaths() failed (Status 0x%08lx)\n", Status);
+            DPRINT1("GetSourcePaths() failed (Status 0x%08lx)", Status);
            return ERROR_NO_SOURCE_DRIVE;
        }
        /*
@@ -850,7 +850,7 @@ InitializeSetup(
        Error = LoadSetupInf(pSetupData);
        if (Error != ERROR_SUCCESS)
        {
-            DPRINT1("LoadSetupInf() failed (Error 0x%lx)\n", Error);
+            DPRINT1("LoadSetupInf() failed (Error 0x%lx)", Error);
            return Error;
        }
        DPRINT1("SourcePath (2): '%wZ'\n", &pSetupData->SourcePath);
--- a/base/setup/lib/utils/partlist.c
+++ b/base/setup/lib/utils/partlist.c
@@ -1882,7 +1882,7 @@ CreatePartitionList(VOID)
                                      &ReturnSize);
    if (!NT_SUCCESS(Status))
    {
-        DPRINT1("NtQuerySystemInformation() failed, Status 0x%08lx\n", Status);
+        DPRINT1("NtQuerySystemInformation() failed, Status 0x%08lx", Status);
        RtlFreeHeap(ProcessHeap, 0, List);
        return NULL;
    }
--- a/base/setup/usetup/lang/bg-BG.h
+++ b/base/setup/usetup/lang/bg-BG.h
@@ -1952,6 +1952,13 @@ MUI_ERROR bgBGErrorEntries[] =
        "  * \215\240\342\250\341\255\245\342\245 \252\253\240\242\250\350, \247\240 \244\240 \257\340\256\244\352\253\246\250\342\245.",
        NULL
    },
+    {
+        // ERROR_DELETE_SPACE,
+        "\215\245 \254\256\246\245\342\245 \247\240 \250\247\342\340\250\245\342\245 \255\245\247\240\244\245\253\245\255\256\342\256 \244\250\341\252\256\242\256 \254\357\341\342\256!\n"
+        "\n"
+        "  * \215\240\342\250\341\255\245\342\245 \252\253\240\242\250\350, \247\240 \244\240 \257\340\256\244\352\253\246\250\342\245.",
+        NULL
+    },
    {
        // ERROR_INSTALL_BOOTCODE,
        //"Setup failed to install the FAT bootcode on the system partition.",
--- a/base/setup/usetup/lang/bn-BD.h
+++ b/base/setup/usetup/lang/bn-BD.h
@@ -1928,6 +1928,13 @@ MUI_ERROR bnBDErrorEntries[] =
        "  * Press any key to continue.",
        NULL
    },
+    {
+        // ERROR_DELETE_SPACE,
+        "You cannot delete unpartitioned disk space!\n"
+        "\n"
+        "  * Press any key to continue.",
+        NULL
+    },
    {
        // ERROR_INSTALL_BOOTCODE,
        "Setup failed to install the %S bootcode on the system partition.",
--- a/base/setup/usetup/lang/cs-CZ.h
+++ b/base/setup/usetup/lang/cs-CZ.h
@@ -1936,6 +1936,13 @@ MUI_ERROR csCZErrorEntries[] =
        "  * Pokra\237ujte stisknut\241m libovoln\202 kl\240vesy.",
        NULL
    },
+    {
+        // ERROR_DELETE_SPACE,
+        "Nelze vymazat m\241sto na disku, kter\202 nepat\375\241 \247\240dn\202mu odd\241lu!\n"
+        "\n"
+        "  * Pokra\237ujte stisknut\241m libovoln\202 kl\240vesy.",
+        NULL
+    },
    {
        // ERROR_INSTALL_BOOTCODE,
        "Nepoda\375ilo se nainstalovat %S zavad\330\237 na syst\202mov\354 odd\241l.",
--- a/base/setup/usetup/lang/da-DK.h
+++ b/base/setup/usetup/lang/da-DK.h
@@ -1937,6 +1937,13 @@ MUI_ERROR daDKErrorEntries[] =
        "  * Tryk p\206 en vilk\206rligtast for at forts\221tte.",
        NULL
    },
+    {
+        // ERROR_DELETE_SPACE,
+        "Du kan ikke slette upartitionernet diskplads!\n"
+        "\n"
+        "  * Tryk p\206 en vilk\206rligtast for at forts\221tte.",
+        NULL
+    },
    {
        // ERROR_INSTALL_BOOTCODE,
        "Installationen kunne ikke installere %S-startkode p\206 systempartitionen.",
--- a/base/setup/usetup/lang/de-DE.h
+++ b/base/setup/usetup/lang/de-DE.h
@@ -1937,6 +1937,13 @@ MUI_ERROR deDEErrorEntries[] =
        "  * * Eine beliebige Taste zum Fortsetzen dr\201cken.",
        NULL
    },
+    {
+        // ERROR_DELETE_SPACE,
+        "Sie k\224nnen unpartitionierten Speicher nicht l\224schen!\n"
+        "\n"
+        "  * Eine beliebige Taste zum Fortsetzen dr\201cken.",
+        NULL
+    },
    {
        // ERROR_INSTALL_BOOTCODE,
        "Der %S-Bootcode konnte nicht auf der Partition installiert werden.",
--- a/base/setup/usetup/lang/el-GR.h
+++ b/base/setup/usetup/lang/el-GR.h
@@ -1958,6 +1958,13 @@ MUI_ERROR elGRErrorEntries[] =
        "  * \217\230\253\343\251\253\234 \246\247\246\240\246\233\343\247\246\253\234 \247\242\343\241\253\250\246 \232\240\230 \244\230 \251\254\244\234\256\345\251\234\253\234.",
        NULL
    },
+    {
+        // ERROR_DELETE_SPACE,
+        "\203\234 \243\247\246\250\234\345\253\234 \244\230 \233\240\230\232\250\341\257\234\253\234 \342\244\230\244 \243\236 \233\240\230\243\246\250\255\340\243\342\244\246 \256\351\250\246 \233\345\251\241\246\254!\n"
+        "\n"
+        "  * \217\230\253\343\251\253\234 \246\247\246\240\246\233\343\247\246\253\234 \247\242\343\241\253\250\246 \232\240\230 \244\230 \251\254\244\234\256\345\251\234\253\234.",
+        NULL
+    },
    {
        // ERROR_INSTALL_BOOTCODE,
        "Setup failed to install the %S bootcode on the system partition.",
--- a/base/setup/usetup/lang/en-US.h
+++ b/base/setup/usetup/lang/en-US.h
@@ -1928,6 +1928,13 @@ MUI_ERROR enUSErrorEntries[] =
        "  * Press any key to continue.",
        NULL
    },
+    {
+        // ERROR_DELETE_SPACE,
+        "You cannot delete unpartitioned disk space!\n"
+        "\n"
+        "  * Press any key to continue.",
+        NULL
+    },
    {
        // ERROR_INSTALL_BOOTCODE,
        "Setup failed to install the %S bootcode on the system partition.",
--- a/base/setup/usetup/lang/es-ES.h
+++ b/base/setup/usetup/lang/es-ES.h
@@ -1941,6 +1941,13 @@ MUI_ERROR esESErrorEntries[] =
        "  * Pulse cualquier tecla para continuar.",
        NULL
    },
+    {
+        // ERROR_DELETE_SPACE,
+        "\255No se puede eliminar un espacio de disco sin particionar!\n"
+        "\n"
+        "  * Pulse cualquier tecla para continuar.",
+        NULL
+    },
    {
        // ERROR_INSTALL_BOOTCODE,
        "El instalador fall\242 al instalar el c\242digo de arranque %S en la partici\242n del sistema.",
--- a/base/setup/usetup/lang/et-EE.h
+++ b/base/setup/usetup/lang/et-EE.h
@@ -1931,6 +1931,13 @@ MUI_ERROR etEEErrorEntries[] =
        "  * Vajuta mis tahes klahvi, et j\204tkata.",
        NULL
    },
+    {
+        // ERROR_DELETE_SPACE,
+        "Partitsioneerimata kettaruumi ei saa kustutada!\n"
+        "\n"
+        "  * Vajuta mis tahes klahvi, et j\204tkata.",
+        NULL
+    },
    {
        // ERROR_INSTALL_BOOTCODE,
        "S\201steemikettale ei \344nnestunud paigaldada %S alglaadimiskoodi.",
--- a/base/setup/usetup/lang/eu-ES.h
+++ b/base/setup/usetup/lang/eu-ES.h
@@ -1936,6 +1936,13 @@ MUI_ERROR euESErrorEntries[] =
        "  * Sakatu tekla bat jarraitzeko.",
        NULL
    },
+    {
+        // ERROR_DELETE_SPACE,
+        "Ez ahal duzu diskoaren ez-partiziotatu ezpazioa ezabatzeko!\n"
+        "\n"
+        "  * Sakatu tekla bat jarraitzeko.",
+        NULL
+    },
    {
        // ERROR_INSTALL_BOOTCODE,
        "Instalazioa huts egin du bootcode instalatzeko %S sistemaren partizioan.",
--- a/base/setup/usetup/lang/fr-FR.h
+++ b/base/setup/usetup/lang/fr-FR.h
@@ -1965,6 +1965,13 @@ MUI_ERROR frFRErrorEntries[] =
        "  * Appuyer sur une touche pour continuer.",
        NULL
    },
+    {
+        // ERROR_DELETE_SPACE,
+        "Vous ne pouvez supprimer de l'espace disque non partitionn\202!\n"
+        "\n"
+        "  * Appuyer sur une touche pour continuer.",
+        NULL
+    },
    {
        // ERROR_INSTALL_BOOTCODE,
        "Echec de l'installation du code de d\202marrage %S sur la partition syst\212me.",
--- a/base/setup/usetup/lang/he-IL.h
+++ b/base/setup/usetup/lang/he-IL.h
@@ -1931,6 +1931,13 @@ MUI_ERROR heILErrorEntries[] =
        ".\212\211\231\216\204\214 \211\203\213 \231\227\216 \214\222 \225\207\214 *  ",
        NULL
    },
+    {
+        // ERROR_DELETE_SPACE,
+        "!\204\226\227\205\216 \200\214\231 \227\221\211\203 \207\210\231 \227\205\207\216\214 \217\232\211\220 \200\214\n"
+        "\n"
+        ".\212\211\231\216\204\214 \211\203\213 \231\227\216 \214\222 \225\207\214 *  ",
+        NULL
+    },
    {
        // ERROR_INSTALL_BOOTCODE,
        ".\232\213\230\222\216\204 \232\226\211\207\216 \214\222 %S \230\205\201\222 \214\205\207\232\200 \203\205\227 \232\220\227\232\204\201 \204\231\214\213\220 \204\220\227\232\204\204 \232\211\220\213\232",
--- a/base/setup/usetup/lang/hr-HR.h
+++ b/base/setup/usetup/lang/hr-HR.h
@@ -1959,6 +1959,13 @@ MUI_ERROR hrHRErrorEntries[] =
        "  * Pritisnite bilo koju tipku za nastavak.",
        NULL
    },
+    {
+        // ERROR_DELETE_SPACE,
+        "Ne mo\247ete obriati neparticionirani diskovni prostor!\n"
+        "\n"
+        "  * Pritisnite bilo koju tipku za nastavak.",
+        NULL
+    },
    {
        // ERROR_INSTALL_BOOTCODE,
        "Instalacijski program je neuspje\347no instalirao %S bootcode na sistemsku particiju.",
--- a/base/setup/usetup/lang/hu-HU.h
+++ b/base/setup/usetup/lang/hu-HU.h
@@ -1829,6 +1829,13 @@ MUI_ERROR huHUErrorEntries[] =
        "  * Nyomjon meg egy gombot a folytat\240shoz.",
        NULL
    },
+    {
+        // ERROR_DELETE_SPACE,
+        "Nem tud t\224r\224lni particion\240latlan lemezter\201letet!\n"
+        "\n"
+        "  * Nyomjon meg egy gombot a folytat\240shoz.",
+        NULL
+    },
    {
        // ERROR_INSTALL_BOOTCODE,
        "Nem siker\201lt a %S bootcode telep\241t\202se a rendszerpart\241ci\242ra.",
--- a/base/setup/usetup/lang/id-ID.h
+++ b/base/setup/usetup/lang/id-ID.h
@@ -1935,6 +1935,13 @@ MUI_ERROR idIDErrorEntries[] =
        "  * Tekan tombol apapun untuk lanjut.",
        NULL
    },
+    {
+        // ERROR_DELETE_SPACE,
+        "Anda tidak dapat menghapus ukuran cakram yang belum dipartisi!\n"
+        "\n"
+        "  * Tekan tombol apapun untuk lanjut.",
+        NULL
+    },
    {
        // ERROR_INSTALL_BOOTCODE,
        "Penyetelan gagal memasang bootcode %S pada partisi sistem.",
--- a/base/setup/usetup/lang/it-IT.h
+++ b/base/setup/usetup/lang/it-IT.h
@@ -1942,6 +1942,13 @@ MUI_ERROR itITErrorEntries[] =
        "  * Premere un tasto qualsiasi per continuare.",
        NULL
    },
+    {
+        // ERROR_DELETE_SPACE,
+        "Non si pu\x95 cancellare spazio in un disco non partizionato!\n"
+        "\n"
+        "  * Premere un tasto qualsiasi per continuare.",
+        NULL
+    },
    {
        // ERROR_INSTALL_BOOTCODE,
        "Impossibile installare il bootcode %S nella partizione di sistema.",
--- a/Show More
+++ b/Show More