[TASKMGR] sv-SE.rc whoops typo

addendum to last commit
[TASKMGR] sv-SE.rc Add 2 more FIXMEs
2025-10-08 09:22:51 +02:00 · 2023-10-17 23:59:35 +02:00 · 2023-10-17 23:49:03 +02:00 · 2023-10-16 21:44:05 +02:00 · 2023-10-09 03:11:20 +02:00 · 2023-10-09 02:46:28 +02:00
59 changed files with 1470 additions and 1028 deletions
--- a/base/applications/mspaint/canvas.cpp
+++ b/base/applications/mspaint/canvas.cpp
@@ -180,7 +180,7 @@ VOID CCanvasWindow::DoDraw(HDC hDC, RECT& rcClient, RECT& rcPaint)
    ::DeleteDC(hdcMem0);
 }

-VOID CCanvasWindow::Update(HWND hwndFrom)
+VOID CCanvasWindow::updateScrollInfo()
 {
    CRect rcClient;
    GetClientRect(&rcClient);
@@ -214,7 +214,7 @@ VOID CCanvasWindow::Update(HWND hwndFrom)
 LRESULT CCanvasWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
 {
    if (m_hWnd)
-        Update(m_hWnd);
+        updateScrollInfo();

    return 0;
 }
@@ -245,7 +245,7 @@ VOID CCanvasWindow::OnHVScroll(WPARAM wParam, INT fnBar)
            break;
    }
    SetScrollInfo(fnBar, &si);
-    Update(m_hWnd);
+    updateScrollInfo();
    Invalidate(FALSE); // FIXME: Flicker
 }

@@ -627,7 +627,7 @@ LRESULT CCanvasWindow::OnLRButtonUp(BOOL bLeftButton, UINT nMsg, WPARAM wParam,

    m_hitCanvasSizeBox = HIT_NONE;
    toolsModel.resetTool(); // resets the point-buffer of the polygon and bezier functions
-    Update(NULL);
+    updateScrollInfo();
    Invalidate(TRUE);
    return 0;
 }
--- a/base/applications/mspaint/canvas.h
+++ b/base/applications/mspaint/canvas.h
@@ -42,7 +42,7 @@ public:

    VOID cancelDrawing();
    VOID finishDrawing();
-    VOID Update(HWND hwndFrom);
+    VOID updateScrollInfo();

    VOID ImageToCanvas(POINT& pt);
    VOID ImageToCanvas(RECT& rc);
--- a/base/applications/mspaint/dib.cpp
+++ b/base/applications/mspaint/dib.cpp
@@ -274,8 +274,14 @@ HBITMAP DoLoadImageFile(HWND hwnd, LPCWSTR name, BOOL fIsMainFile)
    CImageDx img;
    float xDpi = 0, yDpi = 0;
    HRESULT hr = img.LoadDx(name, &xDpi, &yDpi);
+    if (FAILED(hr) && fIsMainFile)
+    {
+        imageModel.ClearHistory();
+        hr = img.LoadDx(name, &xDpi, &yDpi);
+    }
    if (FAILED(hr))
    {
+        ATLTRACE("hr: 0x%08lX\n", hr);
        ShowError(IDS_LOADERRORTEXT, name);
        return NULL;
    }
--- a/base/applications/mspaint/history.cpp
+++ b/base/applications/mspaint/history.cpp
@@ -15,9 +15,13 @@ ImageModel imageModel;
 void ImageModel::NotifyImageChanged()
 {
    if (canvasWindow.IsWindow())
-        canvasWindow.Invalidate(FALSE);
+    {
+        canvasWindow.updateScrollInfo();
+        canvasWindow.Invalidate();
+    }
+
    if (miniature.IsWindow())
-        miniature.Invalidate(FALSE);
+        miniature.Invalidate();
 }

 ImageModel::ImageModel()
@@ -99,6 +103,15 @@ void ImageModel::ResetToPrevious()

 void ImageModel::ClearHistory()
 {
+    for (int i = 0; i < HISTORYSIZE; ++i)
+    {
+        if (m_hBms[i] && i != m_currInd)
+        {
+            ::DeleteObject(m_hBms[i]);
+            m_hBms[i] = NULL;
+        }
+    }
+
    m_undoSteps = 0;
    m_redoSteps = 0;
 }
--- a/base/applications/mspaint/mouse.cpp
+++ b/base/applications/mspaint/mouse.cpp
@@ -762,7 +762,8 @@ struct TextTool : ToolBase

    void OnFinishDraw() override
    {
-        if (textEditWindow.GetWindowTextLength() > 0)
+        if (::IsWindowVisible(textEditWindow) &&
+            textEditWindow.GetWindowTextLength() > 0)
        {
            imageModel.PushImageForUndo();
            draw(m_hdc);
--- a/base/applications/taskmgr/lang/bg-BG.rc
+++ b/base/applications/taskmgr/lang/bg-BG.rc
@@ -13,7 +13,7 @@ BEGIN
        MENUITEM "&Винаги отгоре", ID_OPTIONS_ALWAYSONTOP, CHECKED
        MENUITEM "С&маляване при употреба", ID_OPTIONS_MINIMIZEONUSE, CHECKED
        MENUITEM "&Скриване при смаляване", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED
-        MENUITEM "&Показване на 16-битово задачи", ID_OPTIONS_SHOW16BITTASKS, CHECKED
+        MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED
    END
    POPUP "Из&глед"
    BEGIN
@@ -26,18 +26,18 @@ BEGIN
            MENUITEM "&Задържане", ID_VIEW_UPDATESPEED_PAUSED
        END
        MENUITEM SEPARATOR
-        MENUITEM "&Големи значета", ID_VIEW_LARGE
-        MENUITEM "&Малки значета", ID_VIEW_SMALL
-        MENUITEM "&Подробен", ID_VIEW_DETAILS, CHECKED
-        MENUITEM "&Избор на стълбове...", ID_VIEW_SELECTCOLUMNS
-        POPUP "Дневник на &ЦПУ"
+        MENUITEM "", ID_VIEW_LARGE
+        MENUITEM "", ID_VIEW_SMALL
+        MENUITEM "", ID_VIEW_DETAILS, CHECKED
+        MENUITEM "", ID_VIEW_SELECTCOLUMNS
+        POPUP ""
        BEGIN
-            MENUITEM "&Една графика за всички ЦПУ", ID_VIEW_CPUHISTORY_ONEGRAPHALL
-            MENUITEM "По графика за &всеки ЦПУ", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
        END
-        MENUITEM "&Показване на времената на ядрото", ID_VIEW_SHOWKERNELTIMES
+        MENUITEM "", ID_VIEW_SHOWKERNELTIMES
    END
-    POPUP "&Прозорци"
+    POPUP ""
    BEGIN
        MENUITEM "Водоравно настелване", ID_WINDOWS_TILEHORIZONTALLY
        MENUITEM "&Отвесно настелване", ID_WINDOWS_TILEVERTICALLY
@@ -48,15 +48,15 @@ BEGIN
    END
    POPUP "Sh&ut Down"
    BEGIN
-        MENUITEM "Stand &By",                  ID_SHUTDOWN_STANDBY
-        MENUITEM "&Hibernate",                 ID_SHUTDOWN_HIBERNATE
-        MENUITEM "T&urn Off",                  ID_SHUTDOWN_POWEROFF
-        MENUITEM "&Restart",                   ID_SHUTDOWN_REBOOT
-        MENUITEM "&Log Off %s",                ID_SHUTDOWN_LOGOFF
-        MENUITEM "&Switch User\tWinKey+L",     ID_SHUTDOWN_SWITCHUSER, GRAYED
-        MENUITEM "Loc&k Computer\tWinKey+L",   ID_SHUTDOWN_LOCKCOMPUTER
-        MENUITEM "&Disconnect",                ID_SHUTDOWN_DISCONNECT, GRAYED
-        MENUITEM "&Eject Computer",            ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+        MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY
+        MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE
+        MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Restart", ID_SHUTDOWN_REBOOT
+        MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF
+        MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
    END
    POPUP "Помо&щ"
    BEGIN
@@ -78,7 +78,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT1 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Нова задача (Изпълнение...)", ID_FILE_NEW
        MENUITEM SEPARATOR
@@ -90,7 +90,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT2 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Превключване на", ID_APPLICATION_PAGE_SWITCHTO
        MENUITEM "Изваждане &отпред ", ID_WINDOWS_BRINGTOFRONT
@@ -108,7 +108,7 @@ END

 IDR_TRAY_POPUP MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Възстановяване", ID_RESTORE
        MENUITEM "&Затваряне", ID_FILE_EXIT
@@ -119,7 +119,7 @@ END

 IDR_PROCESS_PAGE_CONTEXT MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Прекратяването на действието", ID_PROCESS_PAGE_ENDPROCESS
        MENUITEM "&Прекратяването на дърво от действия", ID_PROCESS_PAGE_ENDPROCESSTREE
@@ -136,7 +136,7 @@ BEGIN
        END
        MENUITEM "Установяване на с&родство...", ID_PROCESS_PAGE_SETAFFINITY
        MENUITEM SEPARATOR
-        MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES
+        MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES
        MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION
    END
 END
@@ -152,14 +152,14 @@ CAPTION "Задачен управител"
 MENU IDR_TASKMANAGER
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
+    CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
 END

 IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
+    CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
            WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    PUSHBUTTON "&Прекратяване на задача", IDC_ENDTASK, 7, 189, 95, 14, WS_DISABLED
    PUSHBUTTON "Пре&включване на...", IDC_SWITCHTO, 102, 189, 75, 14, WS_DISABLED
@@ -170,7 +170,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
+    CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
            LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    CONTROL "&Показване на действията на всички потребители", IDC_SHOWALLPROCESSES, "Button",
            BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 190, 10
--- a/base/applications/taskmgr/lang/cs-CZ.rc
+++ b/base/applications/taskmgr/lang/cs-CZ.rc
@@ -13,7 +13,7 @@ BEGIN
        MENUITEM "&Vždy navrchu", ID_OPTIONS_ALWAYSONTOP, CHECKED
        MENUITEM "&Minimalizovat při použití", ID_OPTIONS_MINIMIZEONUSE, CHECKED
        MENUITEM "&Skrýt při minimalizaci", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED
-        MENUITEM "&Zobrazit 16-bitové úlohy", ID_OPTIONS_SHOW16BITTASKS, CHECKED
+        MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED
    END
    POPUP "&Zobrazit"
    BEGIN
@@ -26,18 +26,18 @@ BEGIN
            MENUITEM "&Zastavit", ID_VIEW_UPDATESPEED_PAUSED
        END
        MENUITEM SEPARATOR
-        MENUITEM "&Velké ikony", ID_VIEW_LARGE
-        MENUITEM "&Malé ikony", ID_VIEW_SMALL
-        MENUITEM "&Detaily", ID_VIEW_DETAILS, CHECKED
-        MENUITEM "&Vybrat sloupce...", ID_VIEW_SELECTCOLUMNS
-        POPUP "&Historie CPU"
+        MENUITEM "", ID_VIEW_LARGE
+        MENUITEM "", ID_VIEW_SMALL
+        MENUITEM "", ID_VIEW_DETAILS, CHECKED
+        MENUITEM "", ID_VIEW_SELECTCOLUMNS
+        POPUP ""
        BEGIN
-            MENUITEM "&Jeden graf, všechny procesory", ID_VIEW_CPUHISTORY_ONEGRAPHALL
-            MENUITEM "&Jeden graf, jeden procesor", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
        END
-        MENUITEM "&Zobrazit časy jádra", ID_VIEW_SHOWKERNELTIMES
+        MENUITEM "", ID_VIEW_SHOWKERNELTIMES
    END
-    POPUP "&Okna"
+    POPUP ""
    BEGIN
        MENUITEM "Vyrovnat &horizontálně", ID_WINDOWS_TILEHORIZONTALLY
        MENUITEM "Vyrovnat &vertikálně", ID_WINDOWS_TILEVERTICALLY
@@ -48,15 +48,15 @@ BEGIN
    END
    POPUP "Vy&pnout"
    BEGIN
-        MENUITEM "Režim &spánku",              ID_SHUTDOWN_STANDBY
-        MENUITEM "&Hibernace",                 ID_SHUTDOWN_HIBERNATE
-        MENUITEM "&Vypnout",                   ID_SHUTDOWN_POWEROFF
-        MENUITEM "&Restartovat",               ID_SHUTDOWN_REBOOT
-        MENUITEM "&Odhlásit uživatele %s",     ID_SHUTDOWN_LOGOFF
+        MENUITEM "Režim &spánku", ID_SHUTDOWN_STANDBY
+        MENUITEM "&Hibernace", ID_SHUTDOWN_HIBERNATE
+        MENUITEM "&Vypnout", ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Restartovat", ID_SHUTDOWN_REBOOT
+        MENUITEM "&Odhlásit uživatele %s", ID_SHUTDOWN_LOGOFF
        MENUITEM "&Přepnout uživatele\tWin+L", ID_SHUTDOWN_SWITCHUSER, GRAYED
-        MENUITEM "&Zamknout počítač\tWin+L",   ID_SHUTDOWN_LOCKCOMPUTER
-        MENUITEM "O&dpojit se",                ID_SHUTDOWN_DISCONNECT, GRAYED
-        MENUITEM "Vy&jmout počítač",           ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+        MENUITEM "&Zamknout počítač\tWin+L", ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "O&dpojit se", ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "Vy&jmout počítač", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
    END
    POPUP "&Nápověda"
    BEGIN
@@ -78,7 +78,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT1 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Nová úloha (Spustit...)", ID_FILE_NEW
        MENUITEM SEPARATOR
@@ -90,7 +90,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT2 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Přepnout do", ID_APPLICATION_PAGE_SWITCHTO
        MENUITEM "&Přenést do popředí", ID_WINDOWS_BRINGTOFRONT
@@ -108,7 +108,7 @@ END

 IDR_TRAY_POPUP MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Obnovit", ID_RESTORE
        MENUITEM "&Uzavřít", ID_FILE_EXIT
@@ -119,7 +119,7 @@ END

 IDR_PROCESS_PAGE_CONTEXT MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Ukončit proces", ID_PROCESS_PAGE_ENDPROCESS
        MENUITEM "Ukončit &strom procesu", ID_PROCESS_PAGE_ENDPROCESSTREE
@@ -136,7 +136,7 @@ BEGIN
        END
        MENUITEM "Nastavit &afinitu...", ID_PROCESS_PAGE_SETAFFINITY
        MENUITEM SEPARATOR
-        MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES
+        MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES
        MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION
    END
 END
@@ -152,14 +152,14 @@ CAPTION "Správce úloh"
 MENU IDR_TASKMANAGER
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
+    CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
 END

 IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
+    CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
            WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    PUSHBUTTON "&Ukončit úlohu", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED
    PUSHBUTTON "&Přepnout", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED
@@ -170,7 +170,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
+    CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
            LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    CONTROL "&Zobrazit procesy všech uživatelů", IDC_SHOWALLPROCESSES, "Button",
            BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 153, 10
--- a/base/applications/taskmgr/lang/da-DK.rc
+++ b/base/applications/taskmgr/lang/da-DK.rc
@@ -13,7 +13,7 @@ BEGIN
        MENUITEM "&Altid Øverst", ID_OPTIONS_ALWAYSONTOP, CHECKED
        MENUITEM "&Minimere Ved Brug", ID_OPTIONS_MINIMIZEONUSE, CHECKED
        MENUITEM "&Skjul Når Minimeret", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED
-        MENUITEM "&Vis 16-bit Opgaver", ID_OPTIONS_SHOW16BITTASKS, CHECKED
+        MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED
    END
    POPUP "&Vis"
    BEGIN
@@ -26,18 +26,18 @@ BEGIN
            MENUITEM "&Pauset", ID_VIEW_UPDATESPEED_PAUSED
        END
        MENUITEM SEPARATOR
-        MENUITEM "St&ore Ikoner", ID_VIEW_LARGE
-        MENUITEM "S&må Ikoner", ID_VIEW_SMALL
-        MENUITEM "&Detaljer", ID_VIEW_DETAILS, CHECKED
-        MENUITEM "&Vælg Kolonner...", ID_VIEW_SELECTCOLUMNS
-        POPUP "&CPU Historie"
+        MENUITEM "", ID_VIEW_LARGE
+        MENUITEM "", ID_VIEW_SMALL
+        MENUITEM "", ID_VIEW_DETAILS, CHECKED
+        MENUITEM "", ID_VIEW_SELECTCOLUMNS
+        POPUP ""
        BEGIN
-            MENUITEM "&En Graf, Alle CPUer", ID_VIEW_CPUHISTORY_ONEGRAPHALL
-            MENUITEM "En Graf &Pr CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
        END
-        MENUITEM "&Vis Kernel Tider", ID_VIEW_SHOWKERNELTIMES
+        MENUITEM "", ID_VIEW_SHOWKERNELTIMES
    END
-    POPUP "&Vinduer"
+    POPUP ""
    BEGIN
        MENUITEM "Tile &Horisontalt", ID_WINDOWS_TILEHORIZONTALLY
        MENUITEM "Tile &Verticalt", ID_WINDOWS_TILEVERTICALLY
@@ -48,15 +48,15 @@ BEGIN
    END
    POPUP "Sh&ut Down"
    BEGIN
-        MENUITEM "Stand &By",                  ID_SHUTDOWN_STANDBY
-        MENUITEM "&Hibernate",                 ID_SHUTDOWN_HIBERNATE
-        MENUITEM "T&urn Off",                  ID_SHUTDOWN_POWEROFF
-        MENUITEM "&Restart",                   ID_SHUTDOWN_REBOOT
-        MENUITEM "&Log Off %s",                ID_SHUTDOWN_LOGOFF
-        MENUITEM "&Switch User\tWinKey+L",     ID_SHUTDOWN_SWITCHUSER, GRAYED
-        MENUITEM "Loc&k Computer\tWinKey+L",   ID_SHUTDOWN_LOCKCOMPUTER
-        MENUITEM "&Disconnect",                ID_SHUTDOWN_DISCONNECT, GRAYED
-        MENUITEM "&Eject Computer",            ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+        MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY
+        MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE
+        MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Restart", ID_SHUTDOWN_REBOOT
+        MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF
+        MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
    END
    POPUP "&Hjælp"
    BEGIN
@@ -78,7 +78,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT1 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Ny Opgave (Kør...)", ID_FILE_NEW
        MENUITEM SEPARATOR
@@ -90,7 +90,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT2 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Skift Til", ID_APPLICATION_PAGE_SWITCHTO
        MENUITEM "&Bring til front", ID_WINDOWS_BRINGTOFRONT
@@ -108,7 +108,7 @@ END

 IDR_TRAY_POPUP MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Gendan", ID_RESTORE
        MENUITEM "&Luk", ID_FILE_EXIT
@@ -119,7 +119,7 @@ END

 IDR_PROCESS_PAGE_CONTEXT MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Afslut Process", ID_PROCESS_PAGE_ENDPROCESS
        MENUITEM "Afslut Process &Træ", ID_PROCESS_PAGE_ENDPROCESSTREE
@@ -136,7 +136,7 @@ BEGIN
        END
        MENUITEM "Sæt &Affinitet...", ID_PROCESS_PAGE_SETAFFINITY
        MENUITEM SEPARATOR
-        MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES
+        MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES
        MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION
    END
 END
@@ -152,14 +152,14 @@ CAPTION "Opgavestyring"
 MENU IDR_TASKMANAGER
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
+    CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
 END

 IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
+    CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
            WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    PUSHBUTTON "&Afslut Opgave", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED
    PUSHBUTTON "&Skift Til", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED
@@ -170,7 +170,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
+    CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
            LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    CONTROL "&Vis Processor fra alle brugere", IDC_SHOWALLPROCESSES, "Button",
            BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 111, 10
--- a/base/applications/taskmgr/lang/de-DE.rc
+++ b/base/applications/taskmgr/lang/de-DE.rc
@@ -15,7 +15,7 @@ BEGIN
        MENUITEM "&Immer im Vordergrund", ID_OPTIONS_ALWAYSONTOP, CHECKED
        MENUITEM "&Nach Programmstart minimieren", ID_OPTIONS_MINIMIZEONUSE, CHECKED
        MENUITEM "&Ausblenden, wenn minimiert", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED
-        MENUITEM "&16-Bit-Tasks anzeigen", ID_OPTIONS_SHOW16BITTASKS, CHECKED
+        MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED
    END
    POPUP "&Ansicht"
    BEGIN
@@ -28,18 +28,18 @@ BEGIN
            MENUITEM "Ang&ehalten", ID_VIEW_UPDATESPEED_PAUSED
        END
        MENUITEM SEPARATOR
-        MENUITEM "&Große Symbole", ID_VIEW_LARGE
-        MENUITEM "K&leine Symbole", ID_VIEW_SMALL
-        MENUITEM "&Details", ID_VIEW_DETAILS, CHECKED
-        MENUITEM "&Spalten auswählen...", ID_VIEW_SELECTCOLUMNS
-        POPUP "&CPU-Verlauf"
+        MENUITEM "", ID_VIEW_LARGE
+        MENUITEM "", ID_VIEW_SMALL
+        MENUITEM "", ID_VIEW_DETAILS, CHECKED
+        MENUITEM "", ID_VIEW_SELECTCOLUMNS
+        POPUP ""
        BEGIN
-            MENUITEM "&Alle CPUs in einem Diagramm", ID_VIEW_CPUHISTORY_ONEGRAPHALL
-            MENUITEM "&Ein Diagramm pro CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
        END
-        MENUITEM "K&ernel-Zeiten anzeigen", ID_VIEW_SHOWKERNELTIMES
+        MENUITEM "", ID_VIEW_SHOWKERNELTIMES
    END
-    POPUP "&Fenster"
+    POPUP ""
    BEGIN
        MENUITEM "&Untereinander", ID_WINDOWS_TILEHORIZONTALLY
        MENUITEM "&Nebeneinander", ID_WINDOWS_TILEVERTICALLY
@@ -80,7 +80,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT1 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Neuer Task (Ausführen...)", ID_FILE_NEW
        MENUITEM SEPARATOR
@@ -92,7 +92,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT2 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Wechseln zu", ID_APPLICATION_PAGE_SWITCHTO
        MENUITEM "&In Vordergrund", ID_WINDOWS_BRINGTOFRONT
@@ -110,7 +110,7 @@ END

 IDR_TRAY_POPUP MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Wiederherstellen", ID_RESTORE
        MENUITEM "S&chließen", ID_FILE_EXIT
@@ -121,7 +121,7 @@ END

 IDR_PROCESS_PAGE_CONTEXT MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Prozess beenden", ID_PROCESS_PAGE_ENDPROCESS
        MENUITEM "Pr&ozessstruktur beenden", ID_PROCESS_PAGE_ENDPROCESSTREE
@@ -154,14 +154,14 @@ CAPTION "Task-Manager"
 MENU IDR_TASKMANAGER
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
+    CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
 END

 IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
+    CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
            WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    PUSHBUTTON "&Task beenden", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED
    PUSHBUTTON "&Wechseln zu", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED
@@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
+    CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
            LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    CONTROL "Prozesse aller &Benutzer anzeigen", IDC_SHOWALLPROCESSES, "Button",
            BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 120, 10
@@ -285,7 +285,7 @@ BEGIN
    LTEXT "Wählen Sie die Spalten aus, die auf der Registerkarte Prozesse angezeigt werden sollen.", IDC_STATIC, 7, 7, 221, 17
    CONTROL "&Name", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 56, 10
    CONTROL "&PID (Prozess-ID)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 88, 10
-    CONTROL "&CPU %", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 80, 10
+    CONTROL "&CPU", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 80, 10
    CONTROL "CP&U-Zeit", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 48, 10
    CONTROL "&Speicherlast", IDC_MEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 72, 90, 10
    CONTROL "&Delta Speicherlast", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 120, 10
@@ -326,7 +326,7 @@ BEGIN
    ID_OPTIONS_ALWAYSONTOP "Task-Manager bleibt im Vordergrund, wenn nicht minimiert."
    ID_OPTIONS_MINIMIZEONUSE "Task-Manager wird minimiert, wenn ein SwitchTo-Vorgang durchgeführt wird."
    ID_OPTIONS_HIDEWHENMINIMIZED "Blendet den Task-Manager aus, wenn er minimiert ist."
-    ID_VIEW_REFRESH "Veranlasst den Task-Manager zur sofortigen Aktualisierung, unabhängig von der Geschwindigkeitseinstellung."
+    ID_VIEW_REFRESH "Veranlasst den Task-Manager zur sofortigen Aktualisierung."
    ID_VIEW_LARGE "Zeigt Tasks als große Symbole an."
    ID_VIEW_SMALL "Zeigt Tasks als kleine Symbole an."
    ID_VIEW_DETAILS "Zeigt Informationen über jeden Task an."
@@ -385,7 +385,7 @@ BEGIN
    IDS_TAB_PID "PID"
    IDS_TAB_USERNAME "Benutzername"
    IDS_TAB_SESSIONID "Sitzungskennung"
-    IDS_TAB_CPU "CPU %"
+    IDS_TAB_CPU "CPU"
    IDS_TAB_CPUTIME "CPU-Zeit"
    IDS_TAB_MEMUSAGE "Speicherlast"
    IDS_TAB_PEAKMEMUSAGE "Maximale Speicherlast"
--- a/base/applications/taskmgr/lang/el-GR.rc
+++ b/base/applications/taskmgr/lang/el-GR.rc
@@ -15,7 +15,7 @@ BEGIN
        MENUITEM "&Πάντα Μπροστά", ID_OPTIONS_ALWAYSONTOP, CHECKED
        MENUITEM "&Σμίκρυνση κατά τη Χρήση", ID_OPTIONS_MINIMIZEONUSE, CHECKED
        MENUITEM "&Απόκρυψη όταν είναι σε Σμίκρυνση", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED
-        MENUITEM "&Εμφάνιση 16-bit διεργασιών", ID_OPTIONS_SHOW16BITTASKS, CHECKED
+        MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED
    END
    POPUP "&Εμφάνιση"
    BEGIN
@@ -28,18 +28,18 @@ BEGIN
            MENUITEM "&Σε Διακοπή", ID_VIEW_UPDATESPEED_PAUSED
        END
        MENUITEM SEPARATOR
-        MENUITEM "Με&γάλα Εικονίδια", ID_VIEW_LARGE
-        MENUITEM "Μι&κρά Εικονίδια", ID_VIEW_SMALL
-        MENUITEM "&Λεπτομέρειες", ID_VIEW_DETAILS, CHECKED
-        MENUITEM "&Επιλογή Στηλών...", ID_VIEW_SELECTCOLUMNS
-        POPUP "&Ιστορικό Επεξεργαστή"
+        MENUITEM "", ID_VIEW_LARGE
+        MENUITEM "", ID_VIEW_SMALL
+        MENUITEM "", ID_VIEW_DETAILS, CHECKED
+        MENUITEM "", ID_VIEW_SELECTCOLUMNS
+        POPUP ""
        BEGIN
-            MENUITEM "&One Graph, All CPUs", ID_VIEW_CPUHISTORY_ONEGRAPHALL
-            MENUITEM "One Graph &Per CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
        END
-        MENUITEM "&Εμφάνιση Χρόνων Επεξεργαστή", ID_VIEW_SHOWKERNELTIMES
+        MENUITEM "", ID_VIEW_SHOWKERNELTIMES
    END
-    POPUP "&Παράθυρα"
+    POPUP ""
    BEGIN
        MENUITEM "Tile &Horizontally", ID_WINDOWS_TILEHORIZONTALLY
        MENUITEM "Tile &Vertically", ID_WINDOWS_TILEVERTICALLY
@@ -50,15 +50,15 @@ BEGIN
    END
    POPUP "Sh&ut Down"
    BEGIN
-        MENUITEM "Stand &By",                  ID_SHUTDOWN_STANDBY
-        MENUITEM "&Hibernate",                 ID_SHUTDOWN_HIBERNATE
-        MENUITEM "T&urn Off",                  ID_SHUTDOWN_POWEROFF
-        MENUITEM "&Restart",                   ID_SHUTDOWN_REBOOT
-        MENUITEM "&Log Off %s",                ID_SHUTDOWN_LOGOFF
-        MENUITEM "&Switch User\tWinKey+L",     ID_SHUTDOWN_SWITCHUSER, GRAYED
-        MENUITEM "Loc&k Computer\tWinKey+L",   ID_SHUTDOWN_LOCKCOMPUTER
-        MENUITEM "&Disconnect",                ID_SHUTDOWN_DISCONNECT, GRAYED
-        MENUITEM "&Eject Computer",            ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+        MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY
+        MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE
+        MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Restart", ID_SHUTDOWN_REBOOT
+        MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF
+        MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
    END
    POPUP "&Βοήθεια"
    BEGIN
@@ -80,7 +80,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT1 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&New Task (Run...)", ID_FILE_NEW
        MENUITEM SEPARATOR
@@ -92,7 +92,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT2 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Switch To", ID_APPLICATION_PAGE_SWITCHTO
        MENUITEM "&Bring To Front", ID_WINDOWS_BRINGTOFRONT
@@ -110,7 +110,7 @@ END

 IDR_TRAY_POPUP MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Restore", ID_RESTORE
        MENUITEM "&Close", ID_FILE_EXIT
@@ -121,13 +121,13 @@ END

 IDR_PROCESS_PAGE_CONTEXT MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&End Process", ID_PROCESS_PAGE_ENDPROCESS
        MENUITEM "End Process &Tree", ID_PROCESS_PAGE_ENDPROCESSTREE
        MENUITEM "&Debug", ID_PROCESS_PAGE_DEBUG
        MENUITEM SEPARATOR
-        POPUP "Set P&riority"
+        POPUP "Set &Priority"
        BEGIN
            MENUITEM "&Realtime", ID_PROCESS_PAGE_SETPRIORITY_REALTIME
            MENUITEM "&High", ID_PROCESS_PAGE_SETPRIORITY_HIGH
@@ -138,7 +138,7 @@ BEGIN
        END
        MENUITEM "Set &Affinity...", ID_PROCESS_PAGE_SETAFFINITY
        MENUITEM SEPARATOR
-        MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES
+        MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES
        MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION
    END
 END
@@ -154,14 +154,14 @@ CAPTION "Task Manager"
 MENU IDR_TASKMANAGER
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
+    CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
 END

 IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
+    CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
            WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    PUSHBUTTON "&End Task", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED
    PUSHBUTTON "&Switch To", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED
@@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
+    CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
            LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    CONTROL "&Show processes from all users", IDC_SHOWALLPROCESSES, "Button",
            BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 111, 10
--- a/base/applications/taskmgr/lang/en-US.rc
+++ b/base/applications/taskmgr/lang/en-US.rc
@@ -13,7 +13,7 @@ BEGIN
        MENUITEM "&Always On Top", ID_OPTIONS_ALWAYSONTOP, CHECKED
        MENUITEM "&Minimize On Use", ID_OPTIONS_MINIMIZEONUSE, CHECKED
        MENUITEM "&Hide When Minimized", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED
-        MENUITEM "&Show 16-bit tasks", ID_OPTIONS_SHOW16BITTASKS, CHECKED
+        MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED
    END
    POPUP "&View"
    BEGIN
@@ -26,18 +26,18 @@ BEGIN
            MENUITEM "&Paused", ID_VIEW_UPDATESPEED_PAUSED
        END
        MENUITEM SEPARATOR
-        MENUITEM "Lar&ge Icons", ID_VIEW_LARGE
-        MENUITEM "S&mall Icons", ID_VIEW_SMALL
-        MENUITEM "&Details", ID_VIEW_DETAILS, CHECKED
-        MENUITEM "&Select Columns...", ID_VIEW_SELECTCOLUMNS
-        POPUP "&CPU History"
+        MENUITEM "", ID_VIEW_LARGE
+        MENUITEM "", ID_VIEW_SMALL
+        MENUITEM "", ID_VIEW_DETAILS, CHECKED
+        MENUITEM "", ID_VIEW_SELECTCOLUMNS
+        POPUP ""
        BEGIN
-            MENUITEM "&One Graph, All CPUs", ID_VIEW_CPUHISTORY_ONEGRAPHALL
-            MENUITEM "One Graph &Per CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
        END
-        MENUITEM "&Show Kernel Times", ID_VIEW_SHOWKERNELTIMES
+        MENUITEM "", ID_VIEW_SHOWKERNELTIMES
    END
-    POPUP "&Windows"
+    POPUP ""
    BEGIN
        MENUITEM "Tile &Horizontally", ID_WINDOWS_TILEHORIZONTALLY
        MENUITEM "Tile &Vertically", ID_WINDOWS_TILEVERTICALLY
@@ -48,15 +48,15 @@ BEGIN
    END
    POPUP "Sh&ut Down"
    BEGIN
-        MENUITEM "Stand &By",                  ID_SHUTDOWN_STANDBY
-        MENUITEM "&Hibernate",                 ID_SHUTDOWN_HIBERNATE
-        MENUITEM "T&urn Off",                  ID_SHUTDOWN_POWEROFF
-        MENUITEM "&Restart",                   ID_SHUTDOWN_REBOOT
-        MENUITEM "&Log Off %s",                ID_SHUTDOWN_LOGOFF
-        MENUITEM "&Switch User\tWinKey+L",     ID_SHUTDOWN_SWITCHUSER, GRAYED
-        MENUITEM "Loc&k Computer\tWinKey+L",   ID_SHUTDOWN_LOCKCOMPUTER
-        MENUITEM "&Disconnect",                ID_SHUTDOWN_DISCONNECT, GRAYED
-        MENUITEM "&Eject Computer",            ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+        MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY
+        MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE
+        MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Restart", ID_SHUTDOWN_REBOOT
+        MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF
+        MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
    END
    POPUP "&Help"
    BEGIN
@@ -78,7 +78,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT1 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&New Task (Run...)", ID_FILE_NEW
        MENUITEM SEPARATOR
@@ -90,7 +90,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT2 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Switch To", ID_APPLICATION_PAGE_SWITCHTO
        MENUITEM "&Bring To Front", ID_WINDOWS_BRINGTOFRONT
@@ -108,7 +108,7 @@ END

 IDR_TRAY_POPUP MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Restore", ID_RESTORE
        MENUITEM "&Close", ID_FILE_EXIT
@@ -119,13 +119,13 @@ END

 IDR_PROCESS_PAGE_CONTEXT MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&End Process", ID_PROCESS_PAGE_ENDPROCESS
        MENUITEM "End Process &Tree", ID_PROCESS_PAGE_ENDPROCESSTREE
        MENUITEM "&Debug", ID_PROCESS_PAGE_DEBUG
        MENUITEM SEPARATOR
-        POPUP "Set P&riority"
+        POPUP "Set &Priority"
        BEGIN
            MENUITEM "&Realtime", ID_PROCESS_PAGE_SETPRIORITY_REALTIME
            MENUITEM "&High", ID_PROCESS_PAGE_SETPRIORITY_HIGH
@@ -136,13 +136,15 @@ BEGIN
        END
        MENUITEM "Set &Affinity...", ID_PROCESS_PAGE_SETAFFINITY
        MENUITEM SEPARATOR
-        MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES
+        MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES
        MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION
    END
 END

 /* Dialogs */

+/* TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened */
+
 IDD_TASKMGR_DIALOG DIALOGEX 0, 0, 264, 246
 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |
      WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
@@ -150,14 +152,14 @@ CAPTION "Task Manager"
 MENU IDR_TASKMANAGER
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
+    CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
 END

 IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
+    CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
            WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    PUSHBUTTON "&End Task", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED
    PUSHBUTTON "&Switch To", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED
@@ -168,7 +170,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
+    CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
            LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    CONTROL "&Show processes from all users", IDC_SHOWALLPROCESSES, "Button",
            BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 111, 10
--- a/base/applications/taskmgr/lang/es-ES.rc
+++ b/base/applications/taskmgr/lang/es-ES.rc
@@ -15,7 +15,7 @@ BEGIN
        MENUITEM "Siempre &visible", ID_OPTIONS_ALWAYSONTOP, CHECKED
        MENUITEM "&Minimizar al abrir", ID_OPTIONS_MINIMIZEONUSE, CHECKED
        MENUITEM "&Ocultar al estar minimizado", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED
-        MENUITEM "Mo&strar tareas de 16-bit", ID_OPTIONS_SHOW16BITTASKS, CHECKED
+        MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED
    END
    POPUP "&Ver"
    BEGIN
@@ -28,18 +28,18 @@ BEGIN
            MENUITEM "&Pausar", ID_VIEW_UPDATESPEED_PAUSED
        END
        MENUITEM SEPARATOR
-        MENUITEM "Iconos &grandes", ID_VIEW_LARGE
-        MENUITEM "Iconos &pequeños", ID_VIEW_SMALL
-        MENUITEM "&Detalles", ID_VIEW_DETAILS, CHECKED
-        MENUITEM "&Seleccionar columnas...", ID_VIEW_SELECTCOLUMNS
-        POPUP "Historial de &CPU"
+        MENUITEM "", ID_VIEW_LARGE
+        MENUITEM "", ID_VIEW_SMALL
+        MENUITEM "", ID_VIEW_DETAILS, CHECKED
+        MENUITEM "", ID_VIEW_SELECTCOLUMNS
+        POPUP ""
        BEGIN
-            MENUITEM "&Un gráfico de todas las CPU", ID_VIEW_CPUHISTORY_ONEGRAPHALL
-            MENUITEM "Un gráfico &por cada CPU",     ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
        END
        MENUITEM "&Mostrar cronología del kernel", ID_VIEW_SHOWKERNELTIMES
    END
-    POPUP "&Ventanas"
+    POPUP ""
    BEGIN
        MENUITEM "Mosaico &horizontal", ID_WINDOWS_TILEHORIZONTALLY
        MENUITEM "Mosaico &vertical", ID_WINDOWS_TILEVERTICALLY
@@ -50,15 +50,15 @@ BEGIN
    END
    POPUP "Apaga&r"
    BEGIN
-        MENUITEM "&Suspender",                 ID_SHUTDOWN_STANDBY
-        MENUITEM "&Hibernar",                  ID_SHUTDOWN_HIBERNATE
-        MENUITEM "&Apagar",                    ID_SHUTDOWN_POWEROFF
-        MENUITEM "&Reiniciar",                 ID_SHUTDOWN_REBOOT
-        MENUITEM "&Cerrar sesión de %s",       ID_SHUTDOWN_LOGOFF
-        MENUITEM "&Cambiar usuario\tWin+L", ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "&Suspender", ID_SHUTDOWN_STANDBY
+        MENUITEM "&Hibernar", ID_SHUTDOWN_HIBERNATE
+        MENUITEM "&Apagar", ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Reiniciar", ID_SHUTDOWN_REBOOT
+        MENUITEM "&Cerrar sesión de %s", ID_SHUTDOWN_LOGOFF //FIXME: accelerator collision
+        MENUITEM "&Cambiar usuario\tWin+L", ID_SHUTDOWN_SWITCHUSER, GRAYED //FIXME: accelerator collision
        MENUITEM "&Bloquear equipo\tWin+L", ID_SHUTDOWN_LOCKCOMPUTER
-        MENUITEM "&Desconectar",               ID_SHUTDOWN_DISCONNECT, GRAYED
-        MENUITEM "&Expulsar equipo",           ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+        MENUITEM "&Desconectar", ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "&Expulsar equipo", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
    END
    POPUP "Ay&uda"
    BEGIN
@@ -80,7 +80,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT1 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Nueva tarea (Ejecutar...)", ID_FILE_NEW
        MENUITEM SEPARATOR
@@ -92,7 +92,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT2 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Cambiar a", ID_APPLICATION_PAGE_SWITCHTO
        MENUITEM "&Traer al frente", ID_WINDOWS_BRINGTOFRONT
@@ -110,7 +110,7 @@ END

 IDR_TRAY_POPUP MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Restaurar", ID_RESTORE
        MENUITEM "&Cerrar", ID_FILE_EXIT
@@ -121,7 +121,7 @@ END

 IDR_PROCESS_PAGE_CONTEXT MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Terminar proceso", ID_PROCESS_PAGE_ENDPROCESS
        MENUITEM "Finalizar el ár&bol de procesos", ID_PROCESS_PAGE_ENDPROCESSTREE
@@ -138,7 +138,7 @@ BEGIN
        END
        MENUITEM "Establecer &afinidad...", ID_PROCESS_PAGE_SETAFFINITY
        MENUITEM SEPARATOR
-        MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES
+        MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES
        MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION
    END
 END
@@ -154,14 +154,14 @@ CAPTION "Administrador de tareas"
 MENU IDR_TASKMANAGER
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
+    CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
 END

 IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
+    CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
            WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    PUSHBUTTON "&Finalizar tarea", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED
    PUSHBUTTON "&Cambiar a", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED
@@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
+    CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
            LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    CONTROL "&Mostrar procesos de todos los usuarios", IDC_SHOWALLPROCESSES, "Button",
            BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 160, 10
@@ -275,37 +275,37 @@ BEGIN
    CONTROL "CPU 31", IDC_CPU31, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 175, 119, 41, 10
 END

-IDD_COLUMNS_DIALOG DIALOGEX 0, 0, 245, 199 // 0, 0, 195, 199
+IDD_COLUMNS_DIALOG DIALOGEX 0, 0, 245, 199
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Seleccionar columnas"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    DEFPUSHBUTTON "Aceptar", IDOK, 126, 178, 50, 14 // 84
-    PUSHBUTTON "Cancelar", IDCANCEL, 180, 178, 50, 14 // 138
-    LTEXT "Seleccione las columnas que aparecerán en la página de Procesos del Administrador de tareas.", IDC_STATIC, 7, 7, 221, 17 // 181
-    CONTROL "Nombre de ruta de la &imagen", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 105, 10 // 56
-    CONTROL "Identificador de proceso (&PID)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 120, 10 // 88
+    DEFPUSHBUTTON "Aceptar", IDOK, 126, 178, 50, 14
+    PUSHBUTTON "Cancelar", IDCANCEL, 180, 178, 50, 14
+    LTEXT "Seleccione las columnas que aparecerán en la página de Procesos del Administrador de tareas.", IDC_STATIC, 7, 7, 221, 17
+    CONTROL "Nombre de ruta de la &imagen", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 105, 10
+    CONTROL "Identificador de proceso (&PID)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 120, 10
    CONTROL "Uso de &CPU", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 53, 10
-    CONTROL "Ti&empo de CPU", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 65, 10 // 48
+    CONTROL "Ti&empo de CPU", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 65, 10
    CONTROL "Uso de &memoria", IDC_MEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 72, 63, 10
-    CONTROL "Di&ferencia de uso de memoria", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 120, 10 // 82
-    CONTROL "Uso má&ximo de la memoria", IDC_PEAKMEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 94, 120, 10 // 82
-    CONTROL "Err&ores de página", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 80, 10 // 53
-    CONTROL "O&bjetos de USUARIO", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 80, 10 // 62
-    CONTROL "Lecturas de E/S", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 70, 10 // 49
+    CONTROL "Di&ferencia de uso de memoria", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 120, 10
+    CONTROL "Uso má&ximo de la memoria", IDC_PEAKMEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 94, 120, 10
+    CONTROL "Err&ores de página", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 80, 10
+    CONTROL "O&bjetos de USUARIO", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 80, 10
+    CONTROL "Lecturas de E/S", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 70, 10
    CONTROL "Bytes de lectura de E/S", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 90, 10
-    CONTROL "I&d. de sesión", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 65, 10 // 50
-    CONTROL "&Nombre de usuario", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 75, 10 // 51
-    CONTROL "Diferencia de erro&res de página", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 28, 115, 10 // 107, 60
-    CONTROL "Tamaño de la memoria &virtual", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 39, 115, 10 // 107, 60
-    CONTROL "B&loque paginado", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 50, 67, 10 // 107, 53
-    CONTROL "Blo&que no paginado", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 61, 115, 10 // 107
-    CONTROL "P&rioridad base", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 72, 80, 10 // 107
-    CONTROL "&Recuento de identificadores", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 83, 105, 10 // 107
-    CONTROL "Nú&mero de subprocesos", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 94, 105, 10 // 107
-    CONTROL "Objetos &GDI", IDC_GDIOBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 105, 55, 10 // 107
-    CONTROL "Escrituras de E/S", IDC_IOWRITES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 116, 90, 10 // 107
-    CONTROL "Bytes de escritura de E/S", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 127, 105, 10 // 107
+    CONTROL "I&d. de sesión", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 65, 10
+    CONTROL "&Nombre de usuario", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 75, 10
+    CONTROL "Diferencia de erro&res de página", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 28, 115, 10
+    CONTROL "Tamaño de la memoria &virtual", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 39, 115, 10
+    CONTROL "B&loque paginado", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 50, 67, 10
+    CONTROL "Blo&que no paginado", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 61, 115, 10
+    CONTROL "P&rioridad base", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 72, 80, 10
+    CONTROL "&Recuento de identificadores", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 83, 105, 10
+    CONTROL "Nú&mero de subprocesos", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 94, 105, 10
+    CONTROL "Objetos &GDI", IDC_GDIOBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 105, 55, 10
+    CONTROL "Escrituras de E/S", IDC_IOWRITES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 116, 90, 10
+    CONTROL "Bytes de escritura de E/S", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 127, 105, 10
    CONTROL "Otros de E/S", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 138, 60, 10
    CONTROL "Otros bytes de E/S", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 149, 75, 10
    CONTROL "&Línea de comandos", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 160, 75, 10
--- a/base/applications/taskmgr/lang/et-EE.rc
+++ b/base/applications/taskmgr/lang/et-EE.rc
@@ -19,7 +19,7 @@ BEGIN
        MENUITEM "&Alati pealmiseks", ID_OPTIONS_ALWAYSONTOP, CHECKED
        MENUITEM "&Minimeeri kasutamisel", ID_OPTIONS_MINIMIZEONUSE, CHECKED
        MENUITEM "Minmeerimisel &peida", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED
-        MENUITEM "&Näita 16-bitiseid tegumeid", ID_OPTIONS_SHOW16BITTASKS, CHECKED
+        MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED
    END
    POPUP "&Vaade"
    BEGIN
@@ -32,18 +32,18 @@ BEGIN
            MENUITEM "&Peatatud", ID_VIEW_UPDATESPEED_PAUSED
        END
        MENUITEM SEPARATOR
-        MENUITEM "S&uured ikoonid", ID_VIEW_LARGE
-        MENUITEM "Vä&ikesed ikoonid", ID_VIEW_SMALL
-        MENUITEM "&Detailid", ID_VIEW_DETAILS, CHECKED
-        MENUITEM "Va&li veerud...", ID_VIEW_SELECTCOLUMNS
-        POPUP "&CPU Ajalugu"
+        MENUITEM "", ID_VIEW_LARGE
+        MENUITEM "", ID_VIEW_SMALL
+        MENUITEM "", ID_VIEW_DETAILS, CHECKED
+        MENUITEM "", ID_VIEW_SELECTCOLUMNS
+        POPUP ""
        BEGIN
-            MENUITEM "&Üks diagramm kõigile protsessoritele", ID_VIEW_CPUHISTORY_ONEGRAPHALL
-            MENUITEM "Üks diagramm protsessori kohta", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
        END
-        MENUITEM "&Kuva tuumaajad", ID_VIEW_SHOWKERNELTIMES
+        MENUITEM "", ID_VIEW_SHOWKERNELTIMES
    END
-    POPUP "&Aknad"
+    POPUP ""
    BEGIN
        MENUITEM "Paani &horisontaalselt", ID_WINDOWS_TILEHORIZONTALLY
        MENUITEM "Paani &vertikaalselt", ID_WINDOWS_TILEVERTICALLY
@@ -54,15 +54,15 @@ BEGIN
    END
    POPUP "S&ulgemine"
    BEGIN
-        MENUITEM "&Puhkerežiim",                  ID_SHUTDOWN_STANDBY
-        MENUITEM "&Talveuni",                 ID_SHUTDOWN_HIBERNATE
-        MENUITEM "Lül&ita välja",                  ID_SHUTDOWN_POWEROFF
-        MENUITEM "T&aaskäivita",                   ID_SHUTDOWN_REBOOT
-        MENUITEM "&Logi välja %s",                ID_SHUTDOWN_LOGOFF
-        MENUITEM "&Vaheta kasutajat\tWinKey+L",     ID_SHUTDOWN_SWITCHUSER, GRAYED
-        MENUITEM "Lu&kusta arvuti\tWinKey+L",   ID_SHUTDOWN_LOCKCOMPUTER
-        MENUITEM "Katkesta &ühendus",                ID_SHUTDOWN_DISCONNECT, GRAYED
-        MENUITEM "&Eemalda arvuti",            ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+        MENUITEM "&Puhkerežiim", ID_SHUTDOWN_STANDBY
+        MENUITEM "&Talveuni", ID_SHUTDOWN_HIBERNATE
+        MENUITEM "Lül&ita välja", ID_SHUTDOWN_POWEROFF
+        MENUITEM "T&aaskäivita", ID_SHUTDOWN_REBOOT
+        MENUITEM "&Logi välja %s", ID_SHUTDOWN_LOGOFF
+        MENUITEM "&Vaheta kasutajat\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "Lu&kusta arvuti\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "Katkesta &ühendus", ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "&Eemalda arvuti", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
    END
    POPUP "S&pikker"
    BEGIN
@@ -84,7 +84,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT1 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Uus tegum (käivita...)", ID_FILE_NEW
        MENUITEM SEPARATOR
@@ -96,7 +96,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT2 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Aktiveeri", ID_APPLICATION_PAGE_SWITCHTO
        MENUITEM "&Too kõige ette", ID_WINDOWS_BRINGTOFRONT
@@ -114,7 +114,7 @@ END

 IDR_TRAY_POPUP MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Taasta", ID_RESTORE
        MENUITEM "&Sule", ID_FILE_EXIT
@@ -125,7 +125,7 @@ END

 IDR_PROCESS_PAGE_CONTEXT MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Lõpeta protsess", ID_PROCESS_PAGE_ENDPROCESS
        MENUITEM "Lõpeta protsessi&puu", ID_PROCESS_PAGE_ENDPROCESSTREE
@@ -142,13 +142,15 @@ BEGIN
        END
        MENUITEM "Määra &ühtivus...", ID_PROCESS_PAGE_SETAFFINITY
        MENUITEM SEPARATOR
-        MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES
+        MENUITEM "Prop&erties", ID_PROCESS_PAGE_PROPERTIES
        MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION
    END
 END

 /* Dialogs */

+/* TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened */
+
 IDD_TASKMGR_DIALOG DIALOGEX 0, 0, 264, 246
 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |
      WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
@@ -156,14 +158,14 @@ CAPTION "Tegumihaldur"
 MENU IDR_TASKMANAGER
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
+    CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
 END

 IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
+    CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
            WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    PUSHBUTTON "&Lõpeta tegum", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED
    PUSHBUTTON "&Aktiveeri", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED
@@ -174,7 +176,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
+    CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
            LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    CONTROL "&Näita protsesse kõigilt kasutajatelt", IDC_SHOWALLPROCESSES, "Button",
            BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 111, 10
--- a/base/applications/taskmgr/lang/fr-FR.rc
+++ b/base/applications/taskmgr/lang/fr-FR.rc
@@ -15,7 +15,7 @@ BEGIN
        MENUITEM "&Toujours visible", ID_OPTIONS_ALWAYSONTOP, CHECKED
        MENUITEM "&Réduire à l'exécution", ID_OPTIONS_MINIMIZEONUSE, CHECKED
        MENUITEM "&Masquer l'icône réduite", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED
-        MENUITEM "Afficher les &tâches 16-bits", ID_OPTIONS_SHOW16BITTASKS, CHECKED
+        MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED
    END
    POPUP "&Affichage"
    BEGIN
@@ -28,18 +28,18 @@ BEGIN
            MENUITEM "&En pause", ID_VIEW_UPDATESPEED_PAUSED
        END
        MENUITEM SEPARATOR
-        MENUITEM "&Grandes icônes", ID_VIEW_LARGE
-        MENUITEM "&Petites icônes", ID_VIEW_SMALL
-        MENUITEM "&Détails", ID_VIEW_DETAILS, CHECKED
-        MENUITEM "&Sélectionner les colonnes...", ID_VIEW_SELECTCOLUMNS
-        POPUP "&Historique du processeur"
+        MENUITEM "", ID_VIEW_LARGE
+        MENUITEM "", ID_VIEW_SMALL
+        MENUITEM "", ID_VIEW_DETAILS, CHECKED
+        MENUITEM "", ID_VIEW_SELECTCOLUMNS
+        POPUP ""
        BEGIN
-            MENUITEM "&Un graphique pour tous les UC", ID_VIEW_CPUHISTORY_ONEGRAPHALL
-            MENUITEM "Un graphique &par UC", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
        END
-        MENUITEM "Aff&icher les temps du noyau", ID_VIEW_SHOWKERNELTIMES
+        MENUITEM "", ID_VIEW_SHOWKERNELTIMES
    END
-    POPUP "&Fenêtres"
+    POPUP ""
    BEGIN
        MENUITEM "Mosaïque &horizontale", ID_WINDOWS_TILEHORIZONTALLY
        MENUITEM "Mosaïque &verticale", ID_WINDOWS_TILEVERTICALLY
@@ -50,15 +50,15 @@ BEGIN
    END
    POPUP "É&teindre"
    BEGIN
-        MENUITEM "&Mettre en veille",                  ID_SHUTDOWN_STANDBY
-        MENUITEM "&Hiberner",                 ID_SHUTDOWN_HIBERNATE
-        MENUITEM "É&teindre",                  ID_SHUTDOWN_POWEROFF
-        MENUITEM "&Redémarrer",                   ID_SHUTDOWN_REBOOT
-        MENUITEM "&Femer la session %s",                ID_SHUTDOWN_LOGOFF
-        MENUITEM "&Changer d'utilisateur\tWinKey+L",     ID_SHUTDOWN_SWITCHUSER, GRAYED
-        MENUITEM "&Verrouiller l'ordinateur\tWinKey+L",   ID_SHUTDOWN_LOCKCOMPUTER
-        MENUITEM "&Déconnecter",                ID_SHUTDOWN_DISCONNECT, GRAYED
-        MENUITEM "Libér&er l'ordinateur de la station",            ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+        MENUITEM "&Mettre en veille", ID_SHUTDOWN_STANDBY
+        MENUITEM "&Hiberner", ID_SHUTDOWN_HIBERNATE
+        MENUITEM "É&teindre", ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Redémarrer", ID_SHUTDOWN_REBOOT
+        MENUITEM "&Femer la session %s", ID_SHUTDOWN_LOGOFF
+        MENUITEM "&Changer d'utilisateur\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "&Verrouiller l'ordinateur\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "&Déconnecter", ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "Libér&er l'ordinateur de la station", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
    END
    POPUP "&Aide"
    BEGIN
@@ -80,7 +80,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT1 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Nouvelle tâche (Exécuter...)", ID_FILE_NEW
        MENUITEM SEPARATOR
@@ -92,7 +92,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT2 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Basculer vers", ID_APPLICATION_PAGE_SWITCHTO
        MENUITEM "Mettre au &premier plan", ID_WINDOWS_BRINGTOFRONT
@@ -110,7 +110,7 @@ END

 IDR_TRAY_POPUP MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Restaurer", ID_RESTORE
        MENUITEM "&Fermer", ID_FILE_EXIT
@@ -121,7 +121,7 @@ END

 IDR_PROCESS_PAGE_CONTEXT MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Terminer le processus", ID_PROCESS_PAGE_ENDPROCESS
        MENUITEM "T&erminer l'arborescence du processus", ID_PROCESS_PAGE_ENDPROCESSTREE
@@ -154,14 +154,14 @@ CAPTION "Gestionnaire des tâches"
 MENU IDR_TASKMANAGER
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
+    CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
 END

 IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
+    CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
            WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    PUSHBUTTON "F&in de tâche", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED
    PUSHBUTTON "&Basculer vers", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED
@@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
+    CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
            LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    CONTROL "Aff&icher les processus de tous les utilisateurs", IDC_SHOWALLPROCESSES, "Button",
            BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 155, 10
--- a/base/applications/taskmgr/lang/he-IL.rc
+++ b/base/applications/taskmgr/lang/he-IL.rc
@@ -15,7 +15,7 @@ BEGIN
        MENUITEM "תמיד &עליון", ID_OPTIONS_ALWAYSONTOP, CHECKED
        MENUITEM "&מזער בעת שימוש", ID_OPTIONS_MINIMIZEONUSE, CHECKED
        MENUITEM "&הסתר בעת שימוש", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED
-        MENUITEM "הצג משימות של 16 &סיביות", ID_OPTIONS_SHOW16BITTASKS, CHECKED
+        MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED
    END
    POPUP "ת&צוגה"
    BEGIN
@@ -28,18 +28,18 @@ BEGIN
            MENUITEM "&מושהה", ID_VIEW_UPDATESPEED_PAUSED
        END
        MENUITEM SEPARATOR
-        MENUITEM "סמלים ג&דולים", ID_VIEW_LARGE
-        MENUITEM "סמלים ק&טנים", ID_VIEW_SMALL
-        MENUITEM "מ&אפיינים", ID_VIEW_DETAILS, CHECKED
-        MENUITEM "ב&חירת עמודות...", ID_VIEW_SELECTCOLUMNS
-        POPUP "&היסטורית מעבד"
+        MENUITEM "", ID_VIEW_LARGE
+        MENUITEM "", ID_VIEW_SMALL
+        MENUITEM "", ID_VIEW_DETAILS, CHECKED
+        MENUITEM "", ID_VIEW_SELECTCOLUMNS
+        POPUP ""
        BEGIN
-            MENUITEM "&עמודה אחת עבור כל המעבדים", ID_VIEW_CPUHISTORY_ONEGRAPHALL
-            MENUITEM "עמ&ודה אחת לכל מעבד", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
        END
-        MENUITEM "הראה זמני &ליבה", ID_VIEW_SHOWKERNELTIMES
+        MENUITEM "", ID_VIEW_SHOWKERNELTIMES
    END
-    POPUP "&חלונות"
+    POPUP ""
    BEGIN
        MENUITEM "חלונות מוערמים", ID_WINDOWS_TILEHORIZONTALLY
        MENUITEM "חלונות זה לצד זה", ID_WINDOWS_TILEVERTICALLY
@@ -50,15 +50,15 @@ BEGIN
    END
    POPUP "&כיבוי"
    BEGIN
-        MENUITEM "Stand &By",                  ID_SHUTDOWN_STANDBY
-        MENUITEM "&Hibernate",                 ID_SHUTDOWN_HIBERNATE
-        MENUITEM "T&urn Off",                  ID_SHUTDOWN_POWEROFF
-        MENUITEM "&Restart",                   ID_SHUTDOWN_REBOOT
-        MENUITEM "&Log Off %s",                ID_SHUTDOWN_LOGOFF
-        MENUITEM "&Switch User\tWinKey+L",     ID_SHUTDOWN_SWITCHUSER, GRAYED
-        MENUITEM "Loc&k Computer\tWinKey+L",   ID_SHUTDOWN_LOCKCOMPUTER
-        MENUITEM "&Disconnect",                ID_SHUTDOWN_DISCONNECT, GRAYED
-        MENUITEM "&Eject Computer",            ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+        MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY
+        MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE
+        MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Restart", ID_SHUTDOWN_REBOOT
+        MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF
+        MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
    END
    POPUP "&עזרה"
    BEGIN
@@ -80,7 +80,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT1 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "משימה &חדשה", ID_FILE_NEW
        MENUITEM SEPARATOR
@@ -92,7 +92,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT2 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&עבור אל", ID_APPLICATION_PAGE_SWITCHTO
        MENUITEM "ה&בא לפנים", ID_WINDOWS_BRINGTOFRONT
@@ -110,7 +110,7 @@ END

 IDR_TRAY_POPUP MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&שחזר", ID_RESTORE
        MENUITEM "&סגור", ID_FILE_EXIT
@@ -121,7 +121,7 @@ END

 IDR_PROCESS_PAGE_CONTEXT MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&סיים תהליך", ID_PROCESS_PAGE_ENDPROCESS
        MENUITEM "סיים &עץ תהליכים", ID_PROCESS_PAGE_ENDPROCESSTREE
@@ -138,7 +138,7 @@ BEGIN
        END
        MENUITEM "הגדרת &קירבה", ID_PROCESS_PAGE_SETAFFINITY
        MENUITEM SEPARATOR
-        MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES
+        MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES
        MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION
    END
 END
@@ -154,14 +154,14 @@ CAPTION "מנהל המשימות"
 MENU IDR_TASKMANAGER
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
+    CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
 END

 IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
+    CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
            WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    PUSHBUTTON "&סיים משימה", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED
    PUSHBUTTON "&עבור אל", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED
@@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
+    CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
            LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    CONTROL "&הראה תהליכים מכל המשתמשים", IDC_SHOWALLPROCESSES, "Button",
            BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 126, 10
--- a/base/applications/taskmgr/lang/hu-HU.rc
+++ b/base/applications/taskmgr/lang/hu-HU.rc
@@ -15,12 +15,12 @@ BEGIN
        MENUITEM "&Mindig látható", ID_OPTIONS_ALWAYSONTOP, CHECKED
        MENUITEM "&Indításkor kis méret", ID_OPTIONS_MINIMIZEONUSE, CHECKED
        MENUITEM "&Elrejtés kis méretnél", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED
-        MENUITEM "&16 bites feladatok megjelenítése", ID_OPTIONS_SHOW16BITTASKS, CHECKED
+        MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED
    END
    POPUP "&Nézet"
    BEGIN
-        MENUITEM "&Frissítés most", ID_VIEW_REFRESH
-        POPUP "&Frissítés gyakorisága"
+        MENUITEM "&Frissítés most", ID_VIEW_REFRESH //FIXME: accelerator collision
+        POPUP "&Frissítés gyakorisága" //FIXME: accelerator collision
        BEGIN
            MENUITEM "&Gyakran", ID_VIEW_UPDATESPEED_HIGH
            MENUITEM "&Normál", ID_VIEW_UPDATESPEED_NORMAL, CHECKED
@@ -28,18 +28,18 @@ BEGIN
            MENUITEM "&Felfüggesztve", ID_VIEW_UPDATESPEED_PAUSED
        END
        MENUITEM SEPARATOR
-        MENUITEM "&Nagy ikonok", ID_VIEW_LARGE
-        MENUITEM "&Kis ikonok", ID_VIEW_SMALL
-        MENUITEM "Rés&zletek", ID_VIEW_DETAILS, CHECKED
-        MENUITEM "&Oszlopok kiválasztása...", ID_VIEW_SELECTCOLUMNS
-        POPUP "&CPU használat"
+        MENUITEM "", ID_VIEW_LARGE
+        MENUITEM "", ID_VIEW_SMALL
+        MENUITEM "", ID_VIEW_DETAILS, CHECKED
+        MENUITEM "", ID_VIEW_SELECTCOLUMNS
+        POPUP ""
        BEGIN
-            MENUITEM "Minden CPU &egy grafikonon", ID_VIEW_CPUHISTORY_ONEGRAPHALL
-            MENUITEM "Külön grafikon &minden CPU-hoz", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
        END
-        MENUITEM "&Kernel idő megjelenítése", ID_VIEW_SHOWKERNELTIMES
+        MENUITEM "", ID_VIEW_SHOWKERNELTIMES
    END
-    POPUP "&Ablak"
+    POPUP ""
    BEGIN
        MENUITEM "&Vízszintes rendezés", ID_WINDOWS_TILEHORIZONTALLY
        MENUITEM "&Függőleges rendezés", ID_WINDOWS_TILEVERTICALLY
@@ -50,15 +50,15 @@ BEGIN
    END
    POPUP "&Leállítás"
    BEGIN
-        MENUITEM "Készen&léti állapot",            ID_SHUTDOWN_STANDBY
-        MENUITEM "&Hibernálás",                    ID_SHUTDOWN_HIBERNATE
-        MENUITEM "&Kikapcsolás",                   ID_SHUTDOWN_POWEROFF
-        MENUITEM "&Újraindítás",                   ID_SHUTDOWN_REBOOT
-        MENUITEM "Ki&jelentkezés - %s",            ID_SHUTDOWN_LOGOFF
-        MENUITEM "&Felhasználóváltás\tWinKey+L",   ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "Készen&léti állapot", ID_SHUTDOWN_STANDBY
+        MENUITEM "&Hibernálás", ID_SHUTDOWN_HIBERNATE
+        MENUITEM "&Kikapcsolás", ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Újraindítás", ID_SHUTDOWN_REBOOT
+        MENUITEM "Ki&jelentkezés - %s", ID_SHUTDOWN_LOGOFF
+        MENUITEM "&Felhasználóváltás\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED
        MENUITEM "Számítógép &zárolása\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER
-        MENUITEM "&Szétkapcsolódás",               ID_SHUTDOWN_DISCONNECT, GRAYED
-        MENUITEM "&Dokkolóról leválasztás",        ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+        MENUITEM "&Szétkapcsolódás", ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "&Dokkolóról leválasztás", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
    END
    POPUP "&Súgó"
    BEGIN
@@ -80,7 +80,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT1 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Új feladat (Futtatás...)", ID_FILE_NEW
        MENUITEM SEPARATOR
@@ -92,7 +92,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT2 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Váltás", ID_APPLICATION_PAGE_SWITCHTO
        MENUITEM "&Előtérbe helyezés", ID_WINDOWS_BRINGTOFRONT
@@ -110,7 +110,7 @@ END

 IDR_TRAY_POPUP MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Visszaállít", ID_RESTORE
        MENUITEM "&Bezárás", ID_FILE_EXIT
@@ -121,7 +121,7 @@ END

 IDR_PROCESS_PAGE_CONTEXT MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Folyamat befejezése", ID_PROCESS_PAGE_ENDPROCESS
        MENUITEM "Folyamat&struktúra leállítása", ID_PROCESS_PAGE_ENDPROCESSTREE
@@ -139,7 +139,7 @@ BEGIN
        MENUITEM "&Processzorok használata...", ID_PROCESS_PAGE_SETAFFINITY
        MENUITEM SEPARATOR
        MENUITEM "&Tulajdonságok", ID_PROCESS_PAGE_PROPERTIES
-        MENUITEM "Fájl &helyének megnyitása", ID_PROCESS_PAGE_OPENFILELOCATION
+        MENUITEM "Fájl h&elyének megnyitása", ID_PROCESS_PAGE_OPENFILELOCATION
    END
 END

@@ -154,14 +154,14 @@ CAPTION "Feladatkezelő"
 MENU IDR_TASKMANAGER
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
+    CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
 END

 IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
+    CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
            WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    PUSHBUTTON "Fela&dat befejezése", IDC_ENDTASK, 28, 188, 68, 14, WS_DISABLED
    PUSHBUTTON "&Váltás", IDC_SWITCHTO, 100, 188, 68, 14, WS_DISABLED
@@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
+    CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
            LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    CONTROL "Minden felhasználó folya&matait jelenítse meg", IDC_SHOWALLPROCESSES, "Button",
            BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 155, 10
@@ -283,32 +283,32 @@ BEGIN
    DEFPUSHBUTTON "OK", IDOK, 129, 178, 50, 14
    PUSHBUTTON "Mégse", IDCANCEL, 183, 178, 50, 14
    LTEXT "Válassza ki azokat az oszlopokat amelyeket szeretne látni a feladatkezelőben.", IDC_STATIC, 7, 7, 226, 17
-    CONTROL "&Program neve", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 56, 10
-    CONTROL "&PID (Folyamatazonosító)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 100, 10
+    CONTROL "&Program neve", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 56, 10 //FIXME: accelerator collision
+    CONTROL "&PID (Folyamatazonosító)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 100, 10 //FIXME: accelerator collision
    CONTROL "&CPU használat", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 100, 10
    CONTROL "CPU idő", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 48, 10
    CONTROL "&Memóriahasználat", IDC_MEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 72, 100, 10
-    CONTROL "Memóriahasználat &változása", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 110, 10
+    CONTROL "Memóriahasználat &változása", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 110, 10 //FIXME: accelerator collision
    CONTROL "Memóriahasználat &csúcsértéke", IDC_PEAKMEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 94, 110, 10
-    CONTROL "&Laphibák", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 53, 10
+    CONTROL "&Laphibák", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 53, 10 //FIXME: accelerator collision
    CONTROL "&USER objektumok", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 72, 10
    CONTROL "I/O olvasások", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 100, 10
    CONTROL "I/O olvasott bájtok", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 100, 10
    CONTROL "&Munkamenet-azonosító", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 100, 10
    CONTROL "&Felhasználónév", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 71, 10
    CONTROL "Lap&hibaszám változása", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 28, 110, 10
-    CONTROL "&Virtuális memória mérete", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 39, 110, 10
-    CONTROL "&Lapozható készlet", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 50, 110, 10
+    CONTROL "&Virtuális memória mérete", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 39, 110, 10 //FIXME: accelerator collision
+    CONTROL "&Lapozható készlet", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 50, 110, 10 //FIXME: accelerator collision
    CONTROL "&Nem lapozható készlet", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 61, 110, 10
-    CONTROL "&Prioritás", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 72, 55, 10
-    CONTROL "&Leírók száma", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 83, 59, 10
+    CONTROL "&Prioritás", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 72, 55, 10 //FIXME: accelerator collision
+    CONTROL "&Leírók száma", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 83, 59, 10 //FIXME: accelerator collision
    CONTROL "&Szálak száma", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 94, 59, 10
    CONTROL "GDI Objektumok", IDC_GDIOBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 105, 85, 10
    CONTROL "I/O írások", IDC_IOWRITES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 116, 49, 10
    CONTROL "I/O írott bájtok", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 127, 65, 10
    CONTROL "Egyéb I/O műveletek", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 138, 85, 10
    CONTROL "Egyéb I/O műveletek bájtjai", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 149, 110, 10
-    CONTROL "&Parancssor", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 160, 65, 10
+    CONTROL "&Parancssor", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 160, 65, 10 //FIXME: accelerator collision
 END

 /* String Tables */
--- a/base/applications/taskmgr/lang/id-ID.rc
+++ b/base/applications/taskmgr/lang/id-ID.rc
@@ -15,7 +15,7 @@ BEGIN
        MENUITEM "Sel&alu di atas", ID_OPTIONS_ALWAYSONTOP, CHECKED
        MENUITEM "Per&kecil Saat Digunakan", ID_OPTIONS_MINIMIZEONUSE, CHECKED
        MENUITEM "Se&mbunyikan Saat Diperkecil", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED
-        MENUITEM "&Tampilkan tugas 16-bit", ID_OPTIONS_SHOW16BITTASKS, CHECKED
+        MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED
    END
    POPUP "&Tampilan"
    BEGIN
@@ -28,18 +28,18 @@ BEGIN
            MENUITEM "&Jeda", ID_VIEW_UPDATESPEED_PAUSED
        END
        MENUITEM SEPARATOR
-        MENUITEM "Ikon &Besar", ID_VIEW_LARGE
-        MENUITEM "Ikon K&ecil", ID_VIEW_SMALL
-        MENUITEM "&Rinci", ID_VIEW_DETAILS, CHECKED
-        MENUITEM "&Pilih Kolom...", ID_VIEW_SELECTCOLUMNS
-        POPUP "Riwayat &CPU"
+        MENUITEM "", ID_VIEW_LARGE
+        MENUITEM "", ID_VIEW_SMALL
+        MENUITEM "", ID_VIEW_DETAILS, CHECKED
+        MENUITEM "", ID_VIEW_SELECTCOLUMNS
+        POPUP ""
        BEGIN
-            MENUITEM "&Satu Grafik Semua CPU", ID_VIEW_CPUHISTORY_ONEGRAPHALL
-            MENUITEM "Satu Grafik &Per CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
        END
-        MENUITEM "&Tampilkan Waktu Kernel", ID_VIEW_SHOWKERNELTIMES
+        MENUITEM "", ID_VIEW_SHOWKERNELTIMES
    END
-    POPUP "&Jendela"
+    POPUP ""
    BEGIN
        MENUITEM "Ubin secara &Horisontal", ID_WINDOWS_TILEHORIZONTALLY
        MENUITEM "Ubin secara &Vertikal", ID_WINDOWS_TILEVERTICALLY
@@ -80,7 +80,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT1 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Tugas Baru (Jalankan...)", ID_FILE_NEW
        MENUITEM SEPARATOR
@@ -92,7 +92,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT2 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "B&erpindah Ke", ID_APPLICATION_PAGE_SWITCHTO
        MENUITEM "&Bawa ke Depan", ID_WINDOWS_BRINGTOFRONT
@@ -110,7 +110,7 @@ END

 IDR_TRAY_POPUP MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Kembalikan", ID_RESTORE
        MENUITEM "&Tutup", ID_FILE_EXIT
@@ -121,7 +121,7 @@ END

 IDR_PROCESS_PAGE_CONTEXT MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Akhiri Proses", ID_PROCESS_PAGE_ENDPROCESS
        MENUITEM "A&khiri Pohon Proses", ID_PROCESS_PAGE_ENDPROCESSTREE
@@ -138,7 +138,7 @@ BEGIN
        END
        MENUITEM "Setel &Afinitas...", ID_PROCESS_PAGE_SETAFFINITY
        MENUITEM SEPARATOR
-        MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES
+        MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES
        MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION
    END
 END
@@ -154,14 +154,14 @@ CAPTION "Manajer Tugas"
 MENU IDR_TASKMANAGER
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
+    CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
 END

 IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
+    CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
            WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    PUSHBUTTON "&Akhiri Tugas", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED
    PUSHBUTTON "&Berpindah ke", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED
@@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
+    CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
            LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    CONTROL "&Tunjukkan proses dari semua pengguna", IDC_SHOWALLPROCESSES, "Button",
            BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 138, 10
@@ -302,7 +302,7 @@ BEGIN
    CONTROL "N&on-paged Pool", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 110, 61, 95, 10
    CONTROL "P&rioritas Dasar", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 110, 72, 95, 10
    CONTROL "&Jumlah Tuas", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 110, 83, 95, 10
-    CONTROL "&Jumlah U&tas", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 110, 94, 95, 10
+    CONTROL "Jumlah U&tas", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 110, 94, 95, 10
    CONTROL "Obyek GDI", IDC_GDIOBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 110, 105, 95, 10
    CONTROL "I/O Tulis", IDC_IOWRITES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 110, 116, 95, 10
    CONTROL "I/O Byte Tulis", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 110, 127, 95, 10
--- a/base/applications/taskmgr/lang/it-IT.rc
+++ b/base/applications/taskmgr/lang/it-IT.rc
@@ -13,7 +13,7 @@ BEGIN
        MENUITEM "&Sempre in primo piano", ID_OPTIONS_ALWAYSONTOP, CHECKED
        MENUITEM "&Riduci a icona in esecuzione", ID_OPTIONS_MINIMIZEONUSE, CHECKED
        MENUITEM "&Nascondi se ridotto a icona", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED
-        MENUITEM "&Mostra operazioni a 16 bit", ID_OPTIONS_SHOW16BITTASKS, CHECKED
+        MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED
    END
    POPUP "&Visualizza"
    BEGIN
@@ -26,18 +26,18 @@ BEGIN
            MENUITEM "&Pausa", ID_VIEW_UPDATESPEED_PAUSED
        END
        MENUITEM SEPARATOR
-        MENUITEM "Icone &Grandi", ID_VIEW_LARGE
-        MENUITEM "Icone &Piccole", ID_VIEW_SMALL
-        MENUITEM "&Dettagli", ID_VIEW_DETAILS, CHECKED
-        MENUITEM "&Seleziona colonne...", ID_VIEW_SELECTCOLUMNS
-        POPUP "&CPU"
+        MENUITEM "", ID_VIEW_LARGE
+        MENUITEM "", ID_VIEW_SMALL
+        MENUITEM "", ID_VIEW_DETAILS, CHECKED
+        MENUITEM "", ID_VIEW_SELECTCOLUMNS
+        POPUP ""
        BEGIN
-            MENUITEM "&Un grafico, Tutte le CPUs", ID_VIEW_CPUHISTORY_ONEGRAPHALL
-            MENUITEM "Un grafico &per CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
        END
-        MENUITEM "&Mostra Kernel Times", ID_VIEW_SHOWKERNELTIMES
+        MENUITEM "", ID_VIEW_SHOWKERNELTIMES
    END
-    POPUP "&Finestre"
+    POPUP ""
    BEGIN
        MENUITEM "Affianca &Orizontalmente", ID_WINDOWS_TILEHORIZONTALLY
        MENUITEM "Affianca &Verticalmente", ID_WINDOWS_TILEVERTICALLY
@@ -48,15 +48,15 @@ BEGIN
    END
    POPUP "Sh&ut Down"
    BEGIN
-        MENUITEM "Stand &By",                  ID_SHUTDOWN_STANDBY
-        MENUITEM "&Hibernate",                 ID_SHUTDOWN_HIBERNATE
-        MENUITEM "T&urn Off",                  ID_SHUTDOWN_POWEROFF
-        MENUITEM "&Restart",                   ID_SHUTDOWN_REBOOT
-        MENUITEM "&Log Off %s",                ID_SHUTDOWN_LOGOFF
-        MENUITEM "&Switch User\tWinKey+L",     ID_SHUTDOWN_SWITCHUSER, GRAYED
-        MENUITEM "Loc&k Computer\tWinKey+L",   ID_SHUTDOWN_LOCKCOMPUTER
-        MENUITEM "&Disconnect",                ID_SHUTDOWN_DISCONNECT, GRAYED
-        MENUITEM "&Eject Computer",            ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+        MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY
+        MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE
+        MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Restart", ID_SHUTDOWN_REBOOT
+        MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF
+        MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
    END
    POPUP "&Aiuto"
    BEGIN
@@ -78,7 +78,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT1 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Nuova operazione (Esegui...)", ID_FILE_NEW
        MENUITEM SEPARATOR
@@ -90,7 +90,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT2 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Passa a", ID_APPLICATION_PAGE_SWITCHTO
        MENUITEM "&Porta in primo piano", ID_WINDOWS_BRINGTOFRONT
@@ -108,7 +108,7 @@ END

 IDR_TRAY_POPUP MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Ripristina", ID_RESTORE
        MENUITEM "&Chiudi", ID_FILE_EXIT
@@ -119,7 +119,7 @@ END

 IDR_PROCESS_PAGE_CONTEXT MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Termina processo", ID_PROCESS_PAGE_ENDPROCESS
        MENUITEM "Termina processo e &Albero", ID_PROCESS_PAGE_ENDPROCESSTREE
@@ -136,7 +136,7 @@ BEGIN
        END
        MENUITEM "Definisci &Affinità...", ID_PROCESS_PAGE_SETAFFINITY
        MENUITEM SEPARATOR
-        MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES
+        MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES
        MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION
    END
 END
@@ -152,14 +152,14 @@ CAPTION "Task Manager"
 MENU IDR_TASKMANAGER
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
+    CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
 END

 IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
+    CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
            WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    PUSHBUTTON "&Termina processo", IDC_ENDTASK, 28, 188, 68, 14, WS_DISABLED
    PUSHBUTTON "&Passa a", IDC_SWITCHTO, 100, 188, 68, 14, WS_DISABLED
@@ -170,7 +170,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
+    CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
            LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    CONTROL "&Mostra i processi di tutti gli utenti", IDC_SHOWALLPROCESSES, "Button",
            BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 117, 10
--- a/base/applications/taskmgr/lang/ja-JP.rc
+++ b/base/applications/taskmgr/lang/ja-JP.rc
@@ -13,7 +13,7 @@ BEGIN
        MENUITEM "常に手前に表示(&A)", ID_OPTIONS_ALWAYSONTOP, CHECKED
        MENUITEM "未使用時に最小化(&M)", ID_OPTIONS_MINIMIZEONUSE, CHECKED
        MENUITEM "最小化時に隠す(&H)", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED
-        MENUITEM "16 ビット タスクの表示(&S)", ID_OPTIONS_SHOW16BITTASKS, CHECKED
+        MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED
    END
    POPUP "表示(&V)"
    BEGIN
@@ -26,18 +26,18 @@ BEGIN
            MENUITEM "一時停止(&P)", ID_VIEW_UPDATESPEED_PAUSED
        END
        MENUITEM SEPARATOR
-        MENUITEM "大きいアイコン(&G)", ID_VIEW_LARGE
-        MENUITEM "小さいアイコン(&M)", ID_VIEW_SMALL
-        MENUITEM "詳細(&D)", ID_VIEW_DETAILS, CHECKED
-        MENUITEM "列の選択(&S)...", ID_VIEW_SELECTCOLUMNS
-        POPUP "CPU の履歴(&C)"
+        MENUITEM "", ID_VIEW_LARGE
+        MENUITEM "", ID_VIEW_SMALL
+        MENUITEM "", ID_VIEW_DETAILS, CHECKED
+        MENUITEM "", ID_VIEW_SELECTCOLUMNS
+        POPUP ""
        BEGIN
-            MENUITEM "すべての CPU で 1 グラフ(&O)", ID_VIEW_CPUHISTORY_ONEGRAPHALL
-            MENUITEM "CPU ごとに 1 グラフ(&P)", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
        END
-        MENUITEM "カーネル時間を表示する(&S)", ID_VIEW_SHOWKERNELTIMES
+        MENUITEM "", ID_VIEW_SHOWKERNELTIMES
    END
-    POPUP "ウィンドウ(&W)"
+    POPUP ""
    BEGIN
        MENUITEM "上下に並べて表示(&H)", ID_WINDOWS_TILEHORIZONTALLY
        MENUITEM "左右に並べて表示(&V)", ID_WINDOWS_TILEVERTICALLY
@@ -48,15 +48,15 @@ BEGIN
    END
    POPUP "Sh&ut Down"
    BEGIN
-        MENUITEM "Stand &By",                  ID_SHUTDOWN_STANDBY
-        MENUITEM "&Hibernate",                 ID_SHUTDOWN_HIBERNATE
-        MENUITEM "T&urn Off",                  ID_SHUTDOWN_POWEROFF
-        MENUITEM "&Restart",                   ID_SHUTDOWN_REBOOT
-        MENUITEM "&Log Off %s",                ID_SHUTDOWN_LOGOFF
-        MENUITEM "&Switch User\tWinKey+L",     ID_SHUTDOWN_SWITCHUSER, GRAYED
-        MENUITEM "Loc&k Computer\tWinKey+L",   ID_SHUTDOWN_LOCKCOMPUTER
-        MENUITEM "&Disconnect",                ID_SHUTDOWN_DISCONNECT, GRAYED
-        MENUITEM "&Eject Computer",            ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+        MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY
+        MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE
+        MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Restart", ID_SHUTDOWN_REBOOT
+        MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF
+        MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
    END
    POPUP "ヘルプ(&H)"
    BEGIN
@@ -78,7 +78,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT1 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "新しいタスクの実行(&N)", ID_FILE_NEW
        MENUITEM SEPARATOR
@@ -90,7 +90,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT2 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "切り替え(&S)", ID_APPLICATION_PAGE_SWITCHTO
        MENUITEM "手前に表示(&B)", ID_WINDOWS_BRINGTOFRONT
@@ -108,7 +108,7 @@ END

 IDR_TRAY_POPUP MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "元のサイズに戻す(&R)", ID_RESTORE
        MENUITEM "閉じる(&C)", ID_FILE_EXIT
@@ -119,7 +119,7 @@ END

 IDR_PROCESS_PAGE_CONTEXT MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "プロセスの終了(&E)", ID_PROCESS_PAGE_ENDPROCESS
        MENUITEM "プロセス ツリーの終了(&T)", ID_PROCESS_PAGE_ENDPROCESSTREE
@@ -136,7 +136,7 @@ BEGIN
        END
        MENUITEM "関係の設定(&A)...", ID_PROCESS_PAGE_SETAFFINITY
        MENUITEM SEPARATOR
-        MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES
+        MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES
        MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION
    END
 END
@@ -152,14 +152,14 @@ CAPTION "タスク マネージャ"
 MENU IDR_TASKMANAGER
 FONT 9, "MS UI Gothic"
 BEGIN
-    CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
+    CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
 END

 IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "MS UI Gothic"
 BEGIN
-    CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
+    CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
            WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    PUSHBUTTON "タスクの終了(&E)", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED
    PUSHBUTTON "切り替え(&S)", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED
@@ -170,7 +170,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "MS UI Gothic"
 BEGIN
-    CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
+    CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
            LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    CONTROL "全ユーザーのプロセスを表示する(&S)", IDC_SHOWALLPROCESSES, "Button",
            BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 111, 10
--- a/base/applications/taskmgr/lang/ko-KR.rc
+++ b/base/applications/taskmgr/lang/ko-KR.rc
@@ -15,7 +15,7 @@ BEGIN
        MENUITEM "항상 위(&A)", ID_OPTIONS_ALWAYSONTOP, CHECKED
        MENUITEM "사용중일때 최소화(&M)", ID_OPTIONS_MINIMIZEONUSE, CHECKED
        MENUITEM "최소화일때 숨기기(&H)", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED
-        MENUITEM "16비트 작업 표시(&S)", ID_OPTIONS_SHOW16BITTASKS, CHECKED
+        MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED
    END
    POPUP "보기(&V)"
    BEGIN
@@ -28,18 +28,18 @@ BEGIN
            MENUITEM "일시 정지(&P)", ID_VIEW_UPDATESPEED_PAUSED
        END
        MENUITEM SEPARATOR
-        MENUITEM "큰 아이콘(&G)", ID_VIEW_LARGE
-        MENUITEM "작은 아이콘(&M)", ID_VIEW_SMALL
-        MENUITEM "자세히(&D)", ID_VIEW_DETAILS, CHECKED
-        MENUITEM "열 선택(&S)", ID_VIEW_SELECTCOLUMNS
-        POPUP "CPU 히스토리(&C)"
+        MENUITEM "", ID_VIEW_LARGE
+        MENUITEM "", ID_VIEW_SMALL
+        MENUITEM "", ID_VIEW_DETAILS, CHECKED
+        MENUITEM "", ID_VIEW_SELECTCOLUMNS
+        POPUP ""
        BEGIN
-            MENUITEM "그래프 하나, 모든 CPU(&O)", ID_VIEW_CPUHISTORY_ONEGRAPHALL
-            MENUITEM "CPU 하나 당 그래프 하나(&P)", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
        END
-        MENUITEM "커널 시간 보이기(&S)", ID_VIEW_SHOWKERNELTIMES
+        MENUITEM "", ID_VIEW_SHOWKERNELTIMES
    END
-    POPUP "윈도우(&S)"
+    POPUP ""
    BEGIN
        MENUITEM "가로 바둑판식 창 배열(&H)", ID_WINDOWS_TILEHORIZONTALLY
        MENUITEM "세로 바둑판식 창 배열(&V)", ID_WINDOWS_TILEVERTICALLY
@@ -50,15 +50,15 @@ BEGIN
    END
    POPUP "Sh&ut Down"
    BEGIN
-        MENUITEM "Stand &By",                  ID_SHUTDOWN_STANDBY
-        MENUITEM "&Hibernate",                 ID_SHUTDOWN_HIBERNATE
-        MENUITEM "T&urn Off",                  ID_SHUTDOWN_POWEROFF
-        MENUITEM "&Restart",                   ID_SHUTDOWN_REBOOT
-        MENUITEM "&Log Off %s",                ID_SHUTDOWN_LOGOFF
-        MENUITEM "&Switch User\tWinKey+L",     ID_SHUTDOWN_SWITCHUSER, GRAYED
-        MENUITEM "Loc&k Computer\tWinKey+L",   ID_SHUTDOWN_LOCKCOMPUTER
-        MENUITEM "&Disconnect",                ID_SHUTDOWN_DISCONNECT, GRAYED
-        MENUITEM "&Eject Computer",            ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+        MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY
+        MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE
+        MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Restart", ID_SHUTDOWN_REBOOT
+        MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF
+        MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
    END
    POPUP "도움말(&H)"
    BEGIN
@@ -80,7 +80,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT1 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "새 작업 (실행...)(&N)", ID_FILE_NEW
        MENUITEM SEPARATOR
@@ -92,7 +92,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT2 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "전환(&S)", ID_APPLICATION_PAGE_SWITCHTO
        MENUITEM "맨 앞으로 가져오기(&B)", ID_WINDOWS_BRINGTOFRONT
@@ -110,7 +110,7 @@ END

 IDR_TRAY_POPUP MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "복원(&R)", ID_RESTORE
        MENUITEM "닫기(&C)", ID_FILE_EXIT
@@ -121,7 +121,7 @@ END

 IDR_PROCESS_PAGE_CONTEXT MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "프로세스 종료(&E)", ID_PROCESS_PAGE_ENDPROCESS
        MENUITEM "프로세스 트리 종료(&T)", ID_PROCESS_PAGE_ENDPROCESSTREE
@@ -138,7 +138,7 @@ BEGIN
        END
        MENUITEM "선호도 설정(&A)", ID_PROCESS_PAGE_SETAFFINITY
        MENUITEM SEPARATOR
-        MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES
+        MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES
        MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION
    END
 END
@@ -154,14 +154,14 @@ CAPTION "작업 관리자"
 MENU IDR_TASKMANAGER
 FONT 9, "굴림"
 BEGIN
-    CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
+    CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
 END

 IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "굴림"
 BEGIN
-    CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
+    CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
            WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    PUSHBUTTON "작업 끝내기(&E)", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED
    PUSHBUTTON "전환(&S)", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED
@@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "굴림"
 BEGIN
-    CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
+    CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
            LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    CONTROL "모든 유저의 프로세스 보이기(&S)", IDC_SHOWALLPROCESSES, "Button",
            BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 120, 10
--- a/base/applications/taskmgr/lang/nl-NL.rc
+++ b/base/applications/taskmgr/lang/nl-NL.rc
@@ -11,11 +11,11 @@ BEGIN
    POPUP "&Opties"
    BEGIN
        MENUITEM "&Altijd op voorgrond", ID_OPTIONS_ALWAYSONTOP, CHECKED
-        MENUITEM "Minimaliseren &bij gebruik", ID_OPTIONS_MINIMIZEONUSE, CHECKED
+        MENUITEM "Minimaliseren &bij gebruik", ID_OPTIONS_MINIMIZEONUSE, CHECKED //FIXME: accelerator collision &b with IDS_MENU_16BITTASK
        MENUITEM "&Verbergen indien geminimaliseerd", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED
-        MENUITEM "16-&bits taken weergeven", ID_OPTIONS_SHOW16BITTASKS, CHECKED
+        MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED
    END
-    POPUP "&Beeld"
+    POPUP "B&eeld"
    BEGIN
        MENUITEM "&Nu vernieuwen", ID_VIEW_REFRESH
        POPUP "Bijwerk&snelheid"
@@ -26,18 +26,18 @@ BEGIN
            MENUITEM "&Onderbroken", ID_VIEW_UPDATESPEED_PAUSED
        END
        MENUITEM SEPARATOR
-        MENUITEM "&Grote pictogrammen", ID_VIEW_LARGE
-        MENUITEM "&Kleine pictogrammen", ID_VIEW_SMALL
-        MENUITEM "&Details", ID_VIEW_DETAILS, CHECKED
-        MENUITEM "&Kolommen selecteren...", ID_VIEW_SELECTCOLUMNS
-        POPUP "&Geschiedenis van CPU"
+        MENUITEM "", ID_VIEW_LARGE
+        MENUITEM "", ID_VIEW_SMALL
+        MENUITEM "", ID_VIEW_DETAILS, CHECKED
+        MENUITEM "", ID_VIEW_SELECTCOLUMNS
+        POPUP ""
        BEGIN
-            MENUITEM "&Eén grafiek, alle CPU's", ID_VIEW_CPUHISTORY_ONEGRAPHALL
-            MENUITEM "Eén grafiek &per CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
        END
-        MENUITEM "&Kerneltijden weergeven", ID_VIEW_SHOWKERNELTIMES
+        MENUITEM "", ID_VIEW_SHOWKERNELTIMES
    END
-    POPUP "&Vensters"
+    POPUP ""
    BEGIN
        MENUITEM "&Onder elkaar", ID_WINDOWS_TILEHORIZONTALLY
        MENUITEM "N&aast elkaar", ID_WINDOWS_TILEVERTICALLY
@@ -48,15 +48,15 @@ BEGIN
    END
    POPUP "Afsl&uiten"
    BEGIN
-        MENUITEM "Stand &By",                           ID_SHUTDOWN_STANDBY
-        MENUITEM "&Hibernate",                          ID_SHUTDOWN_HIBERNATE
-        MENUITEM "&Uitzetten",                          ID_SHUTDOWN_POWEROFF
-        MENUITEM "&Opnieuw Opstarten",                  ID_SHUTDOWN_REBOOT
-        MENUITEM "%s &afmelden",                        ID_SHUTDOWN_LOGOFF
-        MENUITEM "&Verander van gebruiker\tWinKey+L",   ID_SHUTDOWN_SWITCHUSER, GRAYED
-        MENUITEM "Loc&k Computer\tWinKey+L",            ID_SHUTDOWN_LOCKCOMPUTER
-        MENUITEM "&Disconnect",                         ID_SHUTDOWN_DISCONNECT, GRAYED
-        MENUITEM "&Eject Computer",                     ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+        MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY
+        MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE
+        MENUITEM "&Uitzetten", ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Opnieuw Opstarten", ID_SHUTDOWN_REBOOT
+        MENUITEM "%s &afmelden", ID_SHUTDOWN_LOGOFF
+        MENUITEM "&Verander van gebruiker\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
    END
    POPUP "&Help"
    BEGIN
@@ -78,7 +78,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT1 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Nieuwe taak (Uitvoeren...)", ID_FILE_NEW
        MENUITEM SEPARATOR
@@ -90,7 +90,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT2 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Activeren", ID_APPLICATION_PAGE_SWITCHTO
        MENUITEM "Naar &voorgrond", ID_WINDOWS_BRINGTOFRONT
@@ -108,7 +108,7 @@ END

 IDR_TRAY_POPUP MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Vorig formaat", ID_RESTORE
        MENUITEM "&Sluiten", ID_FILE_EXIT
@@ -119,13 +119,13 @@ END

 IDR_PROCESS_PAGE_CONTEXT MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
-        MENUITEM "&Proces beëindigen", ID_PROCESS_PAGE_ENDPROCESS
+        MENUITEM "Pro&ces beëindigen", ID_PROCESS_PAGE_ENDPROCESS
        MENUITEM "Process&tructuur beëindigen", ID_PROCESS_PAGE_ENDPROCESSTREE
        MENUITEM "&Fouten opsporen", ID_PROCESS_PAGE_DEBUG
        MENUITEM SEPARATOR
-        POPUP "P&rioriteit instellen"
+        POPUP "&Prioriteit instellen"
        BEGIN
            MENUITEM "&Realtime", ID_PROCESS_PAGE_SETPRIORITY_REALTIME
            MENUITEM "&Hoog", ID_PROCESS_PAGE_SETPRIORITY_HIGH
@@ -136,7 +136,7 @@ BEGIN
        END
        MENUITEM "&Affiniteit instellen...", ID_PROCESS_PAGE_SETAFFINITY
        MENUITEM SEPARATOR
-        MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES
+        MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES
        MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION
    END
 END
@@ -152,14 +152,14 @@ CAPTION "Taakbeheer"
 MENU IDR_TASKMANAGER
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
+    CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
 END

 IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
+    CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
            WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    PUSHBUTTON "Taa&k beëindigen", IDC_ENDTASK, 28, 188, 68, 14, WS_DISABLED
    PUSHBUTTON "&Activeren", IDC_SWITCHTO, 100, 188, 68, 14, WS_DISABLED
@@ -170,7 +170,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
+    CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
            LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    CONTROL "Processen van &alle gebruikers weergeven", IDC_SHOWALLPROCESSES, "Button",
            BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 151, 10
@@ -406,7 +406,7 @@ BEGIN
    IDS_TAB_IOOTHERBYTES "I/O: overige bytes"
    IDS_TAB_COMMANDLINE "Command Line"
    IDS_MENU_SELECTCOLUMNS "&Kolommen selecteren..."
-    IDS_MENU_16BITTASK "16-&bits taken weergeven"
+    IDS_MENU_16BITTASK "16-&bits taken weergeven" //FIXME: accelerator collision &b with ID_OPTIONS_MINIMIZEONUSE
    IDS_MENU_WINDOWS "&Vensters"
    IDS_MENU_LARGEICONS "&Grote pictogrammen"
    IDS_MENU_SMALLICONS "&Kleine pictogrammen"
--- a/base/applications/taskmgr/lang/no-NO.rc
+++ b/base/applications/taskmgr/lang/no-NO.rc
@@ -13,12 +13,12 @@ BEGIN
        MENUITEM "&Alltid øverst", ID_OPTIONS_ALWAYSONTOP, CHECKED
        MENUITEM "&Minimer ved bruk", ID_OPTIONS_MINIMIZEONUSE, CHECKED
        MENUITEM "&Skjul når Minimert", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED
-        MENUITEM "&Vis 16-bites oppgaver", ID_OPTIONS_SHOW16BITTASKS, CHECKED
+        MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED
    END
    POPUP "&Vis"
    BEGIN
-        MENUITEM "&Oppdater nå", ID_VIEW_REFRESH
-        POPUP "&Oppdateringshastighet"
+        MENUITEM "&Oppdater nå", ID_VIEW_REFRESH //FIXME: accelerator collision
+        POPUP "&Oppdateringshastighet" //FIXME: accelerator collision
        BEGIN
            MENUITEM "&Høy", ID_VIEW_UPDATESPEED_HIGH
            MENUITEM "&Normal", ID_VIEW_UPDATESPEED_NORMAL, CHECKED
@@ -26,18 +26,18 @@ BEGIN
            MENUITEM "&Midlertidig stanset", ID_VIEW_UPDATESPEED_PAUSED
        END
        MENUITEM SEPARATOR
-        MENUITEM "St&ore Ikoner", ID_VIEW_LARGE
-        MENUITEM "S&må Ikoner", ID_VIEW_SMALL
-        MENUITEM "&Detaljer", ID_VIEW_DETAILS, CHECKED
-        MENUITEM "&Velg tospaltet...", ID_VIEW_SELECTCOLUMNS
-        POPUP "&CPU Historie"
+        MENUITEM "", ID_VIEW_LARGE
+        MENUITEM "", ID_VIEW_SMALL
+        MENUITEM "", ID_VIEW_DETAILS, CHECKED
+        MENUITEM "", ID_VIEW_SELECTCOLUMNS
+        POPUP ""
        BEGIN
-            MENUITEM "&En graf, per CPU", ID_VIEW_CPUHISTORY_ONEGRAPHALL
-            MENUITEM "EN graf &per CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
        END
-        MENUITEM "&Vis Kjernetider", ID_VIEW_SHOWKERNELTIMES
+        MENUITEM "", ID_VIEW_SHOWKERNELTIMES
    END
-    POPUP "&Vindu"
+    POPUP ""
    BEGIN
        MENUITEM "Sorter &horisontalt", ID_WINDOWS_TILEHORIZONTALLY
        MENUITEM "Sorter &vertikalt", ID_WINDOWS_TILEVERTICALLY
@@ -48,15 +48,15 @@ BEGIN
    END
    POPUP "Sh&ut Down"
    BEGIN
-        MENUITEM "Stand &By",                  ID_SHUTDOWN_STANDBY
-        MENUITEM "&Hibernate",                 ID_SHUTDOWN_HIBERNATE
-        MENUITEM "T&urn Off",                  ID_SHUTDOWN_POWEROFF
-        MENUITEM "&Restart",                   ID_SHUTDOWN_REBOOT
-        MENUITEM "&Log Off %s",                ID_SHUTDOWN_LOGOFF
-        MENUITEM "&Switch User\tWinKey+L",     ID_SHUTDOWN_SWITCHUSER, GRAYED
-        MENUITEM "Loc&k Computer\tWinKey+L",   ID_SHUTDOWN_LOCKCOMPUTER
-        MENUITEM "&Disconnect",                ID_SHUTDOWN_DISCONNECT, GRAYED
-        MENUITEM "&Eject Computer",            ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+        MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY
+        MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE
+        MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Restart", ID_SHUTDOWN_REBOOT
+        MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF
+        MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
    END
    POPUP "&Hjelp"
    BEGIN
@@ -78,7 +78,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT1 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Ny oppgave (Kjør...)", ID_FILE_NEW
        MENUITEM SEPARATOR
@@ -90,7 +90,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT2 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Bytt til", ID_APPLICATION_PAGE_SWITCHTO
        MENUITEM "&Plasser lengst frem", ID_WINDOWS_BRINGTOFRONT
@@ -108,7 +108,7 @@ END

 IDR_TRAY_POPUP MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Få tilbake", ID_RESTORE
        MENUITEM "&Avslutt", ID_FILE_EXIT
@@ -119,7 +119,7 @@ END

 IDR_PROCESS_PAGE_CONTEXT MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Avslutt Prosess", ID_PROCESS_PAGE_ENDPROCESS
        MENUITEM "Avslutt Prosess&tre", ID_PROCESS_PAGE_ENDPROCESSTREE
@@ -136,7 +136,7 @@ BEGIN
        END
        MENUITEM "Sett &tiltrekning ...", ID_PROCESS_PAGE_SETAFFINITY
        MENUITEM SEPARATOR
-        MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES
+        MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES
        MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION
    END
 END
@@ -152,14 +152,14 @@ CAPTION "Oppgavebehandling"
 MENU IDR_TASKMANAGER
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
+    CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
 END

 IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
+    CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
            WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    PUSHBUTTON "&Avslutt oppgave", IDC_ENDTASK, 60, 189, 65, 14, WS_DISABLED
    PUSHBUTTON "&Bytt til", IDC_SWITCHTO, 129, 189, 53, 14, WS_DISABLED
@@ -170,7 +170,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
+    CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
            LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    CONTROL "&Vis prosesser fra alle brukere", IDC_SHOWALLPROCESSES, "Button",
            BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 111, 10
@@ -281,22 +281,22 @@ BEGIN
    DEFPUSHBUTTON "OK", IDOK, 84, 178, 50, 14
    PUSHBUTTON "Avbryt", IDCANCEL, 138, 178, 50, 14
    LTEXT "Velg kolonnene som skal vises på prosesssiden i Oppgavebehandling.", IDC_STATIC, 7, 7, 181, 17
-    CONTROL "&Bildenavn", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 56, 10
-    CONTROL "&PID (prosessidentifikator)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 93, 10
-    CONTROL "&Prosessorbruk", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 60, 10
-    CONTROL "Prosessorti&d", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 52, 10
-    CONTROL "&Minne brukt", IDC_MEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 72, 63, 10
-    CONTROL "Minne brukt &Delta", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 82, 10
+    CONTROL "&Bildenavn", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 56, 10 //FIXME: accelerator collision
+    CONTROL "&PID (prosessidentifikator)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 93, 10 //FIXME: accelerator collision
+    CONTROL "&Prosessorbruk", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 60, 10 //FIXME: accelerator collision
+    CONTROL "Prosessorti&d", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 52, 10 //FIXME: accelerator collision
+    CONTROL "&Minne brukt", IDC_MEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 72, 63, 10 //FIXME: accelerator collision
+    CONTROL "Minne brukt &Delta", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 82, 10 //FIXME: accelerator collision
    CONTROL "Ma&ks minne bruk", IDC_PEAKMEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 94, 82, 10
-    CONTROL "Side &mangeler", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 56, 10
-    CONTROL "&Bruker objekt", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 62, 10
+    CONTROL "Side &mangeler", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 56, 10 //FIXME: accelerator collision
+    CONTROL "&Bruker objekt", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 62, 10 //FIXME: accelerator collision
    CONTROL "I/O Lest", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 49, 10
    CONTROL "I/O skrevet", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 65, 10
    CONTROL "&Økt ID", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 50, 10
-    CONTROL "Bruker&navn", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 51, 10
-    CONTROL "Side &mangel Delta", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 28, 72, 10
+    CONTROL "Bruker&navn", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 51, 10 //FIXME: accelerator collision
+    CONTROL "Side &mangel Delta", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 28, 72, 10 //FIXME: accelerator collision
    CONTROL "&Virtuelt minne størrelse", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 39, 86, 10
-    CONTROL "Si&de innsats", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 50, 53, 10
+    CONTROL "Si&de innsats", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 50, 53, 10 //FIXME: accelerator collision
    CONTROL "I&ngen-side innsats", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 61, 72, 10
    CONTROL "Basisp&rioritet", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 72, 55, 10
    CONTROL "&Handle regne", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 83, 59, 10
--- a/base/applications/taskmgr/lang/pl-PL.rc
+++ b/base/applications/taskmgr/lang/pl-PL.rc
@@ -20,7 +20,7 @@ BEGIN
        MENUITEM "Za&wsze na wierzchu", ID_OPTIONS_ALWAYSONTOP, CHECKED
        MENUITEM "&Minimalizuj podczas użytkowania", ID_OPTIONS_MINIMIZEONUSE, CHECKED
        MENUITEM "&Ukryj, gdy zminimalizowane", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED
-        MENUITEM "Pokazuj 16-&bitowe zadania", ID_OPTIONS_SHOW16BITTASKS, CHECKED
+        MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED
    END
    POPUP "&Widok"
    BEGIN
@@ -33,18 +33,18 @@ BEGIN
            MENUITEM "&Wstrzymana", ID_VIEW_UPDATESPEED_PAUSED
        END
        MENUITEM SEPARATOR
-        MENUITEM "D&uże ikony", ID_VIEW_LARGE
-        MENUITEM "&Małe ikony", ID_VIEW_SMALL
-        MENUITEM "&Szczegóły", ID_VIEW_DETAILS, CHECKED
-        MENUITEM "Wybierz &kolumny...", ID_VIEW_SELECTCOLUMNS
-        POPUP "H&istoria użycia procesora CPU"
+        MENUITEM "", ID_VIEW_LARGE
+        MENUITEM "", ID_VIEW_SMALL
+        MENUITEM "", ID_VIEW_DETAILS, CHECKED
+        MENUITEM "", ID_VIEW_SELECTCOLUMNS
+        POPUP ""
        BEGIN
-            MENUITEM "Jeden &wykres dla wszystkich procesorów CPU", ID_VIEW_CPUHISTORY_ONEGRAPHALL
-            MENUITEM "Jeden w&ykres dla każdego procesora CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
        END
-        MENUITEM "Pokaż &czas jądra", ID_VIEW_SHOWKERNELTIMES
+        MENUITEM "", ID_VIEW_SHOWKERNELTIMES
    END
-    POPUP "O&kna"
+    POPUP ""
    BEGIN
        MENUITEM "&Sąsiadująco w poziomie", ID_WINDOWS_TILEHORIZONTALLY
        MENUITEM "Sąsi&adująco w pionie", ID_WINDOWS_TILEVERTICALLY
@@ -55,15 +55,15 @@ BEGIN
    END
    POPUP "&Zamknij"
    BEGIN
-        MENUITEM "Przejdź w &stan gotowości",           ID_SHUTDOWN_STANDBY
-        MENUITEM "&Hibernuj",                           ID_SHUTDOWN_HIBERNATE
-        MENUITEM "Wyłą&cz",                             ID_SHUTDOWN_POWEROFF
-        MENUITEM "&Uruchom ponownie",                   ID_SHUTDOWN_REBOOT
-        MENUITEM "&Wyloguj: %s",                        ID_SHUTDOWN_LOGOFF
-        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 ?
+        MENUITEM "Przejdź w &stan gotowości", ID_SHUTDOWN_STANDBY
+        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
+        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
    END
    POPUP "Pomo&c"
    BEGIN
@@ -85,7 +85,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT1 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Nowe zadanie (Uruchom...)", ID_FILE_NEW
        MENUITEM SEPARATOR
@@ -97,7 +97,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT2 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "P&rzełącz na", ID_APPLICATION_PAGE_SWITCHTO
        MENUITEM "&Przesuń na wierzch", ID_WINDOWS_BRINGTOFRONT
@@ -115,7 +115,7 @@ END

 IDR_TRAY_POPUP MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Przywróć", ID_RESTORE
        MENUITEM "&Zamknij", ID_FILE_EXIT
@@ -126,7 +126,7 @@ END

 IDR_PROCESS_PAGE_CONTEXT MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Zakończ proces", ID_PROCESS_PAGE_ENDPROCESS
        MENUITEM "Zamknij &drzewo procesów", ID_PROCESS_PAGE_ENDPROCESSTREE
@@ -143,7 +143,7 @@ BEGIN
        END
        MENUITEM "Ustaw &koligację...", ID_PROCESS_PAGE_SETAFFINITY
        MENUITEM SEPARATOR
-        MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES
+        MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES
        MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION
    END
 END
@@ -159,14 +159,14 @@ CAPTION "Menedżer zadań"
 MENU IDR_TASKMANAGER
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
+    CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
 END

 IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
+    CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
            WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    PUSHBUTTON "&Zakończ zadanie", IDC_ENDTASK, 39, 189, 65, 14, WS_DISABLED
    PUSHBUTTON "P&rzełącz na", IDC_SWITCHTO, 107, 189, 65, 14, WS_DISABLED
@@ -177,7 +177,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
+    CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
            LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    CONTROL "Po&każ procesy wszystkich użytkowników", IDC_SHOWALLPROCESSES, "Button",
            BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 153, 10
--- a/base/applications/taskmgr/lang/pt-BR.rc
+++ b/base/applications/taskmgr/lang/pt-BR.rc
@@ -13,7 +13,7 @@ BEGIN
        MENUITEM "&Sempre visível", ID_OPTIONS_ALWAYSONTOP, CHECKED
        MENUITEM "&Minimizar durante o uso", ID_OPTIONS_MINIMIZEONUSE, CHECKED
        MENUITEM "&Ocultar ao minimizar", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED
-        MENUITEM "&Exibir tarefas de 16-bit", ID_OPTIONS_SHOW16BITTASKS, CHECKED
+        MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED
    END
    POPUP "E&xibir"
    BEGIN
@@ -26,18 +26,18 @@ BEGIN
            MENUITEM "Em &pausa", ID_VIEW_UPDATESPEED_PAUSED
        END
        MENUITEM SEPARATOR
-        MENUITEM "Íco&nes grandes", ID_VIEW_LARGE
-        MENUITEM "Ícones &pequenos", ID_VIEW_SMALL
-        MENUITEM "Detal&hes", ID_VIEW_DETAILS, CHECKED
-        MENUITEM "&Selecionar colunas...", ID_VIEW_SELECTCOLUMNS
-        POPUP "&Historico do CPU"
+        MENUITEM "", ID_VIEW_LARGE
+        MENUITEM "", ID_VIEW_SMALL
+        MENUITEM "", ID_VIEW_DETAILS, CHECKED
+        MENUITEM "", ID_VIEW_SELECTCOLUMNS
+        POPUP ""
        BEGIN
-            MENUITEM "Um gráfico para &todas as CPUs", ID_VIEW_CPUHISTORY_ONEGRAPHALL
-            MENUITEM "Um gráfico &por CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
        END
-        MENUITEM "&Mostrar tempos do núcleo", ID_VIEW_SHOWKERNELTIMES
+        MENUITEM "", ID_VIEW_SHOWKERNELTIMES
    END
-    POPUP "&Janelas"
+    POPUP ""
    BEGIN
        MENUITEM "Lado a lado &horizontalmente", ID_WINDOWS_TILEHORIZONTALLY
        MENUITEM "Lado a lado &verticalmente", ID_WINDOWS_TILEVERTICALLY
@@ -48,15 +48,15 @@ BEGIN
    END
    POPUP "Sh&ut Down"
    BEGIN
-        MENUITEM "Stand &By",                  ID_SHUTDOWN_STANDBY
-        MENUITEM "&Hibernate",                 ID_SHUTDOWN_HIBERNATE
-        MENUITEM "T&urn Off",                  ID_SHUTDOWN_POWEROFF
-        MENUITEM "&Restart",                   ID_SHUTDOWN_REBOOT
-        MENUITEM "&Log Off %s",                ID_SHUTDOWN_LOGOFF
-        MENUITEM "&Switch User\tWinKey+L",     ID_SHUTDOWN_SWITCHUSER, GRAYED
-        MENUITEM "Loc&k Computer\tWinKey+L",   ID_SHUTDOWN_LOCKCOMPUTER
-        MENUITEM "&Disconnect",                ID_SHUTDOWN_DISCONNECT, GRAYED
-        MENUITEM "&Eject Computer",            ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+        MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY
+        MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE
+        MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Restart", ID_SHUTDOWN_REBOOT
+        MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF
+        MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
    END
    POPUP "Aj&uda"
    BEGIN
@@ -78,7 +78,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT1 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Executar nova tarefa...", ID_FILE_NEW
        MENUITEM SEPARATOR
@@ -90,7 +90,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT2 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "A&lternar para", ID_APPLICATION_PAGE_SWITCHTO
        MENUITEM "&Trazer para a frente", ID_WINDOWS_BRINGTOFRONT
@@ -108,7 +108,7 @@ END

 IDR_TRAY_POPUP MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Restaurar", ID_RESTORE
        MENUITEM "&Fechar", ID_FILE_EXIT
@@ -119,7 +119,7 @@ END

 IDR_PROCESS_PAGE_CONTEXT MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Finalizar processo", ID_PROCESS_PAGE_ENDPROCESS
        MENUITEM "F&inalizar árvore de processos", ID_PROCESS_PAGE_ENDPROCESSTREE
@@ -136,7 +136,7 @@ BEGIN
        END
        MENUITEM "Definir &afinidade...", ID_PROCESS_PAGE_SETAFFINITY
        MENUITEM SEPARATOR
-        MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES
+        MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES
        MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION
    END
 END
@@ -152,14 +152,14 @@ CAPTION "Gerenciador de tarefas"
 MENU IDR_TASKMANAGER
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
+    CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
 END

 IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
+    CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
            WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    PUSHBUTTON "&Finalizar tarefa", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED
    PUSHBUTTON "A&lternar para", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED
@@ -170,7 +170,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
+    CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
            LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    CONTROL "&Mostrar processos de todos os usuários", IDC_SHOWALLPROCESSES, "Button",
            BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 140, 10
--- a/base/applications/taskmgr/lang/pt-PT.rc
+++ b/base/applications/taskmgr/lang/pt-PT.rc
@@ -1,4 +1,4 @@
-/* Translation and UTF-8 Conversion by Gabriel Aguiar(fgsoftware1) <fgygh5804@gmail.com,fgsoftwarestudio@gmail.com> (July, 2021) */
+/* TRANSLATOR: 2021 Gabriel Aguiar <fgygh5804@gmail.com,fgsoftwarestudio@gmail.com> */

 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL

@@ -15,7 +15,7 @@ BEGIN
        MENUITEM "&Sempre visível", ID_OPTIONS_ALWAYSONTOP, CHECKED
        MENUITEM "&Minimizar durante utilização", ID_OPTIONS_MINIMIZEONUSE, CHECKED
        MENUITEM "&Ocultar ao minimizar", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED
-        MENUITEM "&Mostrar tarefas de 16-bit", ID_OPTIONS_SHOW16BITTASKS, CHECKED
+        MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED
    END
    POPUP "&Ver"
    BEGIN
@@ -28,18 +28,18 @@ BEGIN
            MENUITEM "Em &pausa", ID_VIEW_UPDATESPEED_PAUSED
        END
        MENUITEM SEPARATOR
-        MENUITEM "Íco&nes grandes", ID_VIEW_LARGE
-        MENUITEM "Ícones &pequenos", ID_VIEW_SMALL
-        MENUITEM "Detal&hes", ID_VIEW_DETAILS, CHECKED
-        MENUITEM "&Seleccionar colunas...", ID_VIEW_SELECTCOLUMNS
-        POPUP "&Histórico do CPU"
+        MENUITEM "", ID_VIEW_LARGE
+        MENUITEM "", ID_VIEW_SMALL
+        MENUITEM "", ID_VIEW_DETAILS, CHECKED
+        MENUITEM "", ID_VIEW_SELECTCOLUMNS
+        POPUP ""
        BEGIN
-            MENUITEM "Um gráfico para &todas as CPUs", ID_VIEW_CPUHISTORY_ONEGRAPHALL
-            MENUITEM "Um gráfico &por CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
        END
-        MENUITEM "&Mostrar tempos do núcleo", ID_VIEW_SHOWKERNELTIMES
+        MENUITEM "", ID_VIEW_SHOWKERNELTIMES
    END
-    POPUP "&Janelas"
+    POPUP ""
    BEGIN
        MENUITEM "Lado a lado &horizontalmente", ID_WINDOWS_TILEHORIZONTALLY
        MENUITEM "Lado a lado &verticalmente", ID_WINDOWS_TILEVERTICALLY
@@ -50,15 +50,15 @@ BEGIN
    END
    POPUP "&Desligar"
    BEGIN
-        MENUITEM "&Suspender",                 ID_SHUTDOWN_STANDBY
-        MENUITEM "&Hibernar",                  ID_SHUTDOWN_HIBERNATE
-        MENUITEM "&Desligar",                  ID_SHUTDOWN_POWEROFF
-        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
-        MENUITEM "&Ejectar",            ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+        MENUITEM "&Suspender", ID_SHUTDOWN_STANDBY
+        MENUITEM "&Hibernar", ID_SHUTDOWN_HIBERNATE
+        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
+        MENUITEM "&Ejectar", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
    END
    POPUP "Aj&uda"
    BEGIN
@@ -80,7 +80,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT1 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Executar nova tarefa...", ID_FILE_NEW
        MENUITEM SEPARATOR
@@ -92,7 +92,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT2 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "A&lternar para", ID_APPLICATION_PAGE_SWITCHTO
        MENUITEM "&Trazer para a frente", ID_WINDOWS_BRINGTOFRONT
@@ -110,7 +110,7 @@ END

 IDR_TRAY_POPUP MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Restaurar", ID_RESTORE
        MENUITEM "&Fechar", ID_FILE_EXIT
@@ -121,7 +121,7 @@ END

 IDR_PROCESS_PAGE_CONTEXT MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Finalizar processo", ID_PROCESS_PAGE_ENDPROCESS
        MENUITEM "F&inalizar árvore de processos", ID_PROCESS_PAGE_ENDPROCESSTREE
@@ -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
+        MENUITEM "Definir &afinidade...", ID_PROCESS_PAGE_SETAFFINITY //FIXME: accelerator collision
        MENUITEM SEPARATOR
-        MENUITEM "&Propriedades", ID_PROCESS_PAGE_PROPERTIES
-        MENUITEM "&Abrir localização do ficheiro", ID_PROCESS_PAGE_OPENFILELOCATION
+        MENUITEM "P&ropriedades", ID_PROCESS_PAGE_PROPERTIES
+        MENUITEM "&Abrir localização do ficheiro", ID_PROCESS_PAGE_OPENFILELOCATION //FIXME: accelerator collision
    END
 END

@@ -154,14 +154,14 @@ CAPTION "Gestor de tarefas"
 MENU IDR_TASKMANAGER
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
+    CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
 END

 IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
+    CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
            WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    PUSHBUTTON "&Terminar tarefa", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED
    PUSHBUTTON "A&lternar para", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED
@@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
+    CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
            LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    CONTROL "&Mostrar processos de todos os utilizadores", IDC_SHOWALLPROCESSES, "Button",
            BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 140, 10
@@ -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
+    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
+    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
@@ -18,7 +18,7 @@ BEGIN
        MENUITEM "Mereu &deasupra", ID_OPTIONS_ALWAYSONTOP, CHECKED
        MENUITEM "&Minimizează la comutare", ID_OPTIONS_MINIMIZEONUSE, CHECKED
        MENUITEM "&Ascunde la minimizare", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED
-        MENUITEM "Afișează activități pe 16 &biți", ID_OPTIONS_SHOW16BITTASKS, CHECKED
+        MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED
    END
    POPUP "&Afișare"
    BEGIN
@@ -31,18 +31,18 @@ BEGIN
            MENUITEM "St&agnantă", ID_VIEW_UPDATESPEED_PAUSED
        END
        MENUITEM SEPARATOR
-        MENUITEM "D&ale", ID_VIEW_LARGE
-        MENUITEM "&Pictograme", ID_VIEW_SMALL
-        MENUITEM "&Detalii", ID_VIEW_DETAILS, CHECKED
-        MENUITEM "Selectare &coloane…", ID_VIEW_SELECTCOLUMNS
-        POPUP    "Ist&oric procesor"
+        MENUITEM "", ID_VIEW_LARGE
+        MENUITEM "", ID_VIEW_SMALL
+        MENUITEM "", ID_VIEW_DETAILS, CHECKED
+        MENUITEM "", ID_VIEW_SELECTCOLUMNS
+        POPUP ""
        BEGIN
-            MENUITEM "Grafic general &comun", ID_VIEW_CPUHISTORY_ONEGRAPHALL
-            MENUITEM "Grafice indi&viduale", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
        END
-        MENUITEM "Afișea&ză timpi nucleu", ID_VIEW_SHOWKERNELTIMES
+        MENUITEM "", ID_VIEW_SHOWKERNELTIMES
    END
-    POPUP "Fe&restre"
+    POPUP ""
    BEGIN
        MENUITEM "Aranjări &orizontale", ID_WINDOWS_TILEHORIZONTALLY
        MENUITEM "Aranjări &verticale", ID_WINDOWS_TILEVERTICALLY
@@ -53,15 +53,15 @@ BEGIN
    END
    POPUP "Î&nchidere calculator"
    BEGIN
-        MENUITEM "Intră în starea de &veche",  ID_SHUTDOWN_STANDBY
-        MENUITEM "Intră în &hibernare",        ID_SHUTDOWN_HIBERNATE
-        MENUITEM "Î&nchide calculatorul",      ID_SHUTDOWN_POWEROFF
-        MENUITEM "&Repornește calculatorul",   ID_SHUTDOWN_REBOOT
-        MENUITEM "&Deautentifică-mă (%s)",     ID_SHUTDOWN_LOGOFF
+        MENUITEM "Intră în starea de &veche", ID_SHUTDOWN_STANDBY
+        MENUITEM "Intră în &hibernare", ID_SHUTDOWN_HIBERNATE
+        MENUITEM "Î&nchide calculatorul", ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Repornește calculatorul", ID_SHUTDOWN_REBOOT
+        MENUITEM "&Deautentifică-mă (%s)", ID_SHUTDOWN_LOGOFF
        MENUITEM "&Comută utilizator\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED
        MENUITEM "&Blochează calculatorul\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER
-        MENUITEM "Deconectea&ză",              ID_SHUTDOWN_DISCONNECT, GRAYED
-        MENUITEM "&Elimină calculator",         ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+        MENUITEM "Deconectea&ză", ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "&Elimină calculator", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
    END
    POPUP "Aj&utor"
    BEGIN
@@ -83,7 +83,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT1 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "Activitate nouă (E&xecutare…)", ID_FILE_NEW
        MENUITEM SEPARATOR
@@ -95,7 +95,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT2 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Comută la", ID_APPLICATION_PAGE_SWITCHTO
        MENUITEM "Ad&uce în prim-plan", ID_WINDOWS_BRINGTOFRONT
@@ -113,7 +113,7 @@ END

 IDR_TRAY_POPUP MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Restabilește", ID_RESTORE
        MENUITEM "Î&nchide", ID_FILE_EXIT
@@ -124,7 +124,7 @@ END

 IDR_PROCESS_PAGE_CONTEXT MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "Opr&ește procesul", ID_PROCESS_PAGE_ENDPROCESS
        MENUITEM "Oprește &arborele de procese", ID_PROCESS_PAGE_ENDPROCESSTREE
@@ -141,7 +141,7 @@ BEGIN
        END
        MENUITEM "A&finitate…", ID_PROCESS_PAGE_SETAFFINITY
        MENUITEM SEPARATOR
-        MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES
+        MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES
        MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION
    END
 END
@@ -157,14 +157,14 @@ CAPTION "Gestionar de activități"
 MENU IDR_TASKMANAGER
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
+    CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
 END

 IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
+    CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
            WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    PUSHBUTTON "Închid&e", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED
    PUSHBUTTON "&Comută la", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED
@@ -175,7 +175,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
+    CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
            LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    CONTROL "Afișea&ză procesele tuturor utilizatorilor", IDC_SHOWALLPROCESSES, "Button",
            BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 150, 10
--- a/base/applications/taskmgr/lang/ru-RU.rc
+++ b/base/applications/taskmgr/lang/ru-RU.rc
@@ -15,7 +15,7 @@ BEGIN
        MENUITEM "Пове&рх остальных окон", ID_OPTIONS_ALWAYSONTOP, CHECKED
        MENUITEM "&Сворачивать после обращения", ID_OPTIONS_MINIMIZEONUSE, CHECKED
        MENUITEM "С&крывать свернутое", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED
-        MENUITEM "&Отображать 16-разрядные задачи", ID_OPTIONS_SHOW16BITTASKS, CHECKED
+        MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED
    END
    POPUP "&Вид"
    BEGIN
@@ -28,18 +28,18 @@ BEGIN
            MENUITEM "&Приостановить", ID_VIEW_UPDATESPEED_PAUSED
        END
        MENUITEM SEPARATOR
-        MENUITEM "&Крупные значки", ID_VIEW_LARGE
-        MENUITEM "&Мелкие значки", ID_VIEW_SMALL
-        MENUITEM "&Таблица", ID_VIEW_DETAILS, CHECKED
-        MENUITEM "В&ыбрать столбцы...", ID_VIEW_SELECTCOLUMNS
-        POPUP "&Загрузка ЦП"
+        MENUITEM "", ID_VIEW_LARGE
+        MENUITEM "", ID_VIEW_SMALL
+        MENUITEM "", ID_VIEW_DETAILS, CHECKED
+        MENUITEM "", ID_VIEW_SELECTCOLUMNS
+        POPUP ""
        BEGIN
-            MENUITEM "&Один график на все ЦП", ID_VIEW_CPUHISTORY_ONEGRAPHALL
-            MENUITEM "&По графику на каждый ЦП", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
        END
-        MENUITEM "&Вывод времени ядра", ID_VIEW_SHOWKERNELTIMES
+        MENUITEM "", ID_VIEW_SHOWKERNELTIMES
    END
-    POPUP "&Окна"
+    POPUP ""
    BEGIN
        MENUITEM "С&верху вниз", ID_WINDOWS_TILEVERTICALLY
        MENUITEM "С&лева направо", ID_WINDOWS_TILEHORIZONTALLY
@@ -50,15 +50,15 @@ BEGIN
    END
    POPUP "Завер&шение работы"
    BEGIN
-        MENUITEM "Переход в &ждущий режим",       ID_SHUTDOWN_STANDBY
-        MENUITEM "Переход в &спящий режим",       ID_SHUTDOWN_HIBERNATE
-        MENUITEM "В&ыключение",                   ID_SHUTDOWN_POWEROFF
-        MENUITEM "&Перезагрузка",                 ID_SHUTDOWN_REBOOT
-        MENUITEM "&Завершение сеанса %s",         ID_SHUTDOWN_LOGOFF
+        MENUITEM "Переход в &ждущий режим", ID_SHUTDOWN_STANDBY
+        MENUITEM "Переход в &спящий режим", ID_SHUTDOWN_HIBERNATE
+        MENUITEM "В&ыключение", ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Перезагрузка", ID_SHUTDOWN_REBOOT
+        MENUITEM "&Завершение сеанса %s", ID_SHUTDOWN_LOGOFF
        MENUITEM "С&мена пользователя\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED
-        MENUITEM "Заб&локировать компьютер\tWinKey+L",      ID_SHUTDOWN_LOCKCOMPUTER
-        MENUITEM "&Отключить",                   ID_SHUTDOWN_DISCONNECT, GRAYED
-        MENUITEM "С&нять компьютер с док-станции",               ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+        MENUITEM "Заб&локировать компьютер\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "&Отключить", ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "С&нять компьютер с док-станции", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
    END
    POPUP "&Справка"
    BEGIN
@@ -80,7 +80,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT1 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Новая задача (Выполнить...)", ID_FILE_NEW
        MENUITEM SEPARATOR
@@ -92,7 +92,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT2 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Переключиться", ID_APPLICATION_PAGE_SWITCHTO
        MENUITEM "&На передний план", ID_WINDOWS_BRINGTOFRONT
@@ -110,7 +110,7 @@ END

 IDR_TRAY_POPUP MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Востановить", ID_RESTORE
        MENUITEM "&Закрыть", ID_FILE_EXIT
@@ -121,7 +121,7 @@ END

 IDR_PROCESS_PAGE_CONTEXT MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Завершить процесс", ID_PROCESS_PAGE_ENDPROCESS
        MENUITEM "Завершить &дерево процессов", ID_PROCESS_PAGE_ENDPROCESSTREE
@@ -154,14 +154,14 @@ CAPTION "Диспетчер задач"
 MENU IDR_TASKMANAGER
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
+    CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
 END

 IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
+    CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
            WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    PUSHBUTTON "Завершить &задачу", IDC_ENDTASK, 12, 189, 73, 14, WS_DISABLED
    PUSHBUTTON "&Переключиться", IDC_SWITCHTO, 89, 189, 73, 14, WS_DISABLED
@@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
+    CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
            LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    CONTROL "&Отображать процессы всех пользователей", IDC_SHOWALLPROCESSES, "Button",
            BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 158, 10
--- a/base/applications/taskmgr/lang/sk-SK.rc
+++ b/base/applications/taskmgr/lang/sk-SK.rc
@@ -15,7 +15,7 @@ BEGIN
        MENUITEM "&Vždy navrchu", ID_OPTIONS_ALWAYSONTOP, CHECKED
        MENUITEM "&Minimalizovať pri použití", ID_OPTIONS_MINIMIZEONUSE, CHECKED
        MENUITEM "&Skryť pri minimalizovaní", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED
-        MENUITEM "&Zobraziť 16-bitové úlohy", ID_OPTIONS_SHOW16BITTASKS, CHECKED
+        MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED
    END
    POPUP "&Zobraziť"
    BEGIN
@@ -28,18 +28,18 @@ BEGIN
            MENUITEM "&Pozastavené", ID_VIEW_UPDATESPEED_PAUSED
        END
        MENUITEM SEPARATOR
-        MENUITEM "&Veľké ikony", ID_VIEW_LARGE
-        MENUITEM "&Malé ikony", ID_VIEW_SMALL
-        MENUITEM "&Podrobnosti", ID_VIEW_DETAILS, CHECKED
-        MENUITEM "&Vybrať stĺpce...", ID_VIEW_SELECTCOLUMNS
-        POPUP "&História procesora"
+        MENUITEM "", ID_VIEW_LARGE
+        MENUITEM "", ID_VIEW_SMALL
+        MENUITEM "", ID_VIEW_DETAILS, CHECKED
+        MENUITEM "", ID_VIEW_SELECTCOLUMNS
+        POPUP ""
        BEGIN
-            MENUITEM "&Jeden graf pre všetky procesory", ID_VIEW_CPUHISTORY_ONEGRAPHALL
-            MENUITEM "Jeden graf pre &každý procesor", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
        END
-        MENUITEM "&Zobraziť časy jadra", ID_VIEW_SHOWKERNELTIMES
+        MENUITEM "", ID_VIEW_SHOWKERNELTIMES
    END
-    POPUP "&Okna"
+    POPUP ""
    BEGIN
        MENUITEM "&Pod seba", ID_WINDOWS_TILEHORIZONTALLY
        MENUITEM "&Vedľa seba", ID_WINDOWS_TILEVERTICALLY
@@ -50,15 +50,15 @@ BEGIN
    END
    POPUP "Sh&ut Down"
    BEGIN
-        MENUITEM "Stand &By",                  ID_SHUTDOWN_STANDBY
-        MENUITEM "&Hibernate",                 ID_SHUTDOWN_HIBERNATE
-        MENUITEM "T&urn Off",                  ID_SHUTDOWN_POWEROFF
-        MENUITEM "&Restart",                   ID_SHUTDOWN_REBOOT
-        MENUITEM "&Log Off %s",                ID_SHUTDOWN_LOGOFF
-        MENUITEM "&Switch User\tWinKey+L",     ID_SHUTDOWN_SWITCHUSER, GRAYED
-        MENUITEM "Loc&k Computer\tWinKey+L",   ID_SHUTDOWN_LOCKCOMPUTER
-        MENUITEM "&Disconnect",                ID_SHUTDOWN_DISCONNECT, GRAYED
-        MENUITEM "&Eject Computer",            ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+        MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY
+        MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE
+        MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Restart", ID_SHUTDOWN_REBOOT
+        MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF
+        MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
    END
    POPUP "&Pomocník"
    BEGIN
@@ -80,7 +80,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT1 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Nová úloha (Spustiť...)", ID_FILE_NEW
        MENUITEM SEPARATOR
@@ -92,7 +92,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT2 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "P&repnúť", ID_APPLICATION_PAGE_SWITCHTO
        MENUITEM "Presunúť d&opredu", ID_WINDOWS_BRINGTOFRONT
@@ -110,7 +110,7 @@ END

 IDR_TRAY_POPUP MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Obnoviť", ID_RESTORE
        MENUITEM "&Zavrieť", ID_FILE_EXIT
@@ -121,7 +121,7 @@ END

 IDR_PROCESS_PAGE_CONTEXT MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Ukončiť proces", ID_PROCESS_PAGE_ENDPROCESS
        MENUITEM "Ukončiť stro&m procesu", ID_PROCESS_PAGE_ENDPROCESSTREE
@@ -138,7 +138,7 @@ BEGIN
        END
        MENUITEM "Nastaviť &afinitu...", ID_PROCESS_PAGE_SETAFFINITY
        MENUITEM SEPARATOR
-        MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES
+        MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES
        MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION
    END
 END
@@ -154,14 +154,14 @@ CAPTION "Správca úloh systému"
 MENU IDR_TASKMANAGER
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
+    CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
 END

 IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
+    CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
            WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    PUSHBUTTON "Ukončiť úlo&hu", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED
    PUSHBUTTON "&Prepnúť", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED
@@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
+    CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
            LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    CONTROL "&Zobraziť procesy všetkých používateľov", IDC_SHOWALLPROCESSES, "Button",
            BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 144, 10
--- a/base/applications/taskmgr/lang/sq-AL.rc
+++ b/base/applications/taskmgr/lang/sq-AL.rc
@@ -16,7 +16,7 @@ BEGIN
        MENUITEM "Perhere lart", ID_OPTIONS_ALWAYSONTOP, CHECKED
        MENUITEM "&Minimizo ne perdorim", ID_OPTIONS_MINIMIZEONUSE, CHECKED
        MENUITEM "Fshehe gjate minimizimit", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED
-        MENUITEM "&Shfaq 16-bit detyre", ID_OPTIONS_SHOW16BITTASKS, CHECKED
+        MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED
    END
    POPUP "&Vezhgo"
    BEGIN
@@ -29,18 +29,18 @@ BEGIN
            MENUITEM "&Pushim", ID_VIEW_UPDATESPEED_PAUSED
        END
        MENUITEM SEPARATOR
-        MENUITEM "Ikona te medha", ID_VIEW_LARGE
-        MENUITEM "Ikona te vogla", ID_VIEW_SMALL
-        MENUITEM "&Detaje", ID_VIEW_DETAILS, CHECKED
-        MENUITEM "Perzgjedh kolone...", ID_VIEW_SELECTCOLUMNS
-        POPUP "&CPU Histori"
+        MENUITEM "", ID_VIEW_LARGE
+        MENUITEM "", ID_VIEW_SMALL
+        MENUITEM "", ID_VIEW_DETAILS, CHECKED
+        MENUITEM "", ID_VIEW_SELECTCOLUMNS
+        POPUP ""
        BEGIN
-            MENUITEM "Nje grafik, Te gjith CPUs", ID_VIEW_CPUHISTORY_ONEGRAPHALL
-            MENUITEM "Nje grafik &Per CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
        END
-        MENUITEM "&Shfaq oren e Kernelit", ID_VIEW_SHOWKERNELTIMES
+        MENUITEM "", ID_VIEW_SHOWKERNELTIMES
    END
-    POPUP "Dritare"
+    POPUP ""
    BEGIN
        MENUITEM "Shfaq &Horizontalisht", ID_WINDOWS_TILEHORIZONTALLY
        MENUITEM "Shfaq &Vertikalisht", ID_WINDOWS_TILEVERTICALLY
@@ -51,15 +51,15 @@ BEGIN
    END
    POPUP "Sh&ut Down"
    BEGIN
-        MENUITEM "Stand &By",                  ID_SHUTDOWN_STANDBY
-        MENUITEM "&Hibernate",                 ID_SHUTDOWN_HIBERNATE
-        MENUITEM "T&urn Off",                  ID_SHUTDOWN_POWEROFF
-        MENUITEM "&Restart",                   ID_SHUTDOWN_REBOOT
-        MENUITEM "&Log Off %s",                ID_SHUTDOWN_LOGOFF
-        MENUITEM "&Switch User\tWinKey+L",     ID_SHUTDOWN_SWITCHUSER, GRAYED
-        MENUITEM "Loc&k Computer\tWinKey+L",   ID_SHUTDOWN_LOCKCOMPUTER
-        MENUITEM "&Disconnect",                ID_SHUTDOWN_DISCONNECT, GRAYED
-        MENUITEM "&Eject Computer",            ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+        MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY
+        MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE
+        MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Restart", ID_SHUTDOWN_REBOOT
+        MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF
+        MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
    END
    POPUP "Ndihme"
    BEGIN
@@ -81,7 +81,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT1 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "Detyre e re (Run...)", ID_FILE_NEW
        MENUITEM SEPARATOR
@@ -93,7 +93,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT2 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "Ndrysho ne", ID_APPLICATION_PAGE_SWITCHTO
        MENUITEM "Sjelle para", ID_WINDOWS_BRINGTOFRONT
@@ -111,7 +111,7 @@ END

 IDR_TRAY_POPUP MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Restauro", ID_RESTORE
        MENUITEM "Mbyll", ID_FILE_EXIT
@@ -122,7 +122,7 @@ END

 IDR_PROCESS_PAGE_CONTEXT MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "Mbyll procesin", ID_PROCESS_PAGE_ENDPROCESS
        MENUITEM "Mbyll procesin &Tree", ID_PROCESS_PAGE_ENDPROCESSTREE
@@ -139,13 +139,15 @@ BEGIN
        END
        MENUITEM "Vendos prirje...", ID_PROCESS_PAGE_SETAFFINITY
        MENUITEM SEPARATOR
-        MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES
+        MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES
        MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION
    END
 END

 /* Dialogs */

+/* TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened */
+
 IDD_TASKMGR_DIALOG DIALOGEX 0, 0, 264, 246
 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |
      WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
@@ -153,14 +155,14 @@ CAPTION "Task Manager"
 MENU IDR_TASKMANAGER
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
+    CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
 END

 IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
+    CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
            WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    PUSHBUTTON "Mbyll", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED
    PUSHBUTTON "Kalo tek", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED
@@ -171,7 +173,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
+    CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
            LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    CONTROL "&Shfaq proceset nga te gjith perdoruesit", IDC_SHOWALLPROCESSES, "Button",
            BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 140, 10
@@ -430,7 +432,7 @@ BEGIN
    IDS_MSG_UNABLECHANGEPRIORITY "E pamundur ndryshimi i prioritetit"
    IDS_MSG_WARNINGCHANGEPRIORITY "KUJDES: Ndryshimi i klases se prioritetit te ketij procesi mund te\nsjell rrezultate te padeshirushme ne stabilitetin e sistemit. Jeni i sigurt\nper ndryshimin e klases se prioriteteve?"
    IDS_MSG_TRAYICONCPUUSAGE "Perdorimi i CPU: %d%%"
-    IDS_STATUS_MEMUSAGE "Perdorimi i  Mem: %s / %s (%d%%)"
+    IDS_STATUS_MEMUSAGE "Perdorimi i Mem: %s / %s (%d%%)"
    IDS_STATUS_CPUUSAGE "Perdorimi i CPU: %3d%%"
    IDS_STATUS_PROCESSES "Proceset: %d"
    IDS_NOT_RESPONDING "Nuk pergjigjet"
--- a/base/applications/taskmgr/lang/sv-SE.rc
+++ b/base/applications/taskmgr/lang/sv-SE.rc
@@ -4,18 +4,18 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL

 IDR_TASKMANAGER MENU
 BEGIN
-    POPUP "&Arkiv"
+    POPUP "&Arkiv" //FIXME: accelerator collision &A
    BEGIN
        MENUITEM "&Ny Aktivitet (Kör...)", ID_FILE_NEW
        MENUITEM SEPARATOR
        MENUITEM "&Avsluta Aktivitetshanteraren", ID_FILE_EXIT
    END
-    POPUP "&Alternativ"
+    POPUP "&Alternativ" //FIXME: accelerator collision &A
    BEGIN
        MENUITEM "&Alltid överst", ID_OPTIONS_ALWAYSONTOP, CHECKED
        MENUITEM "&Minimera vid användning", ID_OPTIONS_MINIMIZEONUSE, CHECKED
        MENUITEM "&Göm minimerad", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED
-        MENUITEM "&Visa 16-bitarsaktiviteter", ID_OPTIONS_SHOW16BITTASKS, CHECKED
+        MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED
    END
    POPUP "&Visa"
    BEGIN
@@ -28,18 +28,18 @@ BEGIN
            MENUITEM "&Fryst", ID_VIEW_UPDATESPEED_PAUSED
        END
        MENUITEM SEPARATOR
-        MENUITEM "&Stora ikoner", ID_VIEW_LARGE
-        MENUITEM "S&må ikoner", ID_VIEW_SMALL
-        MENUITEM "&Detaljer", ID_VIEW_DETAILS, CHECKED
-        MENUITEM "&Välj kolumner...", ID_VIEW_SELECTCOLUMNS
-        POPUP "&CPU Historik"
+        MENUITEM "", ID_VIEW_LARGE
+        MENUITEM "", ID_VIEW_SMALL
+        MENUITEM "", ID_VIEW_DETAILS, CHECKED
+        MENUITEM "", ID_VIEW_SELECTCOLUMNS
+        POPUP ""
        BEGIN
-            MENUITEM "En visare för &alla processorer", ID_VIEW_CPUHISTORY_ONEGRAPHALL
-            MENUITEM "&En visare per processor", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
        END
-        MENUITEM "&Visa kernel-tider", ID_VIEW_SHOWKERNELTIMES
+        MENUITEM "", ID_VIEW_SHOWKERNELTIMES
    END
-    POPUP "&Fönster"
+    POPUP ""
    BEGIN
        MENUITEM "Ordna &horizontellt", ID_WINDOWS_TILEHORIZONTALLY
        MENUITEM "Ordna &vertikalt", ID_WINDOWS_TILEVERTICALLY
@@ -50,15 +50,15 @@ BEGIN
    END
    POPUP "Sh&ut Down"
    BEGIN
-        MENUITEM "Stand &By",                  ID_SHUTDOWN_STANDBY
-        MENUITEM "&Hibernate",                 ID_SHUTDOWN_HIBERNATE
-        MENUITEM "T&urn Off",                  ID_SHUTDOWN_POWEROFF
-        MENUITEM "&Restart",                   ID_SHUTDOWN_REBOOT
-        MENUITEM "&Log Off %s",                ID_SHUTDOWN_LOGOFF
-        MENUITEM "&Switch User\tWinKey+L",     ID_SHUTDOWN_SWITCHUSER, GRAYED
-        MENUITEM "Loc&k Computer\tWinKey+L",   ID_SHUTDOWN_LOCKCOMPUTER
-        MENUITEM "&Disconnect",                ID_SHUTDOWN_DISCONNECT, GRAYED
-        MENUITEM "&Eject Computer",            ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+        MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY
+        MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE
+        MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Restart", ID_SHUTDOWN_REBOOT
+        MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF
+        MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
    END
    POPUP "&Hjälp"
    BEGIN
@@ -80,7 +80,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT1 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Ny aktivitet (Kör...)", ID_FILE_NEW
        MENUITEM SEPARATOR
@@ -92,7 +92,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT2 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Växla till", ID_APPLICATION_PAGE_SWITCHTO
        MENUITEM "&För till förgrunden", ID_WINDOWS_BRINGTOFRONT
@@ -110,7 +110,7 @@ END

 IDR_TRAY_POPUP MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Återställ", ID_RESTORE
        MENUITEM "&Stäng", ID_FILE_EXIT
@@ -121,7 +121,7 @@ END

 IDR_PROCESS_PAGE_CONTEXT MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Avsluta process", ID_PROCESS_PAGE_ENDPROCESS
        MENUITEM "Avsluta process&träd", ID_PROCESS_PAGE_ENDPROCESSTREE
@@ -138,7 +138,7 @@ BEGIN
        END
        MENUITEM "Välj &källa (FIXME)...", ID_PROCESS_PAGE_SETAFFINITY
        MENUITEM SEPARATOR
-        MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES
+        MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES
        MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION
    END
 END
@@ -154,14 +154,14 @@ CAPTION "Aktivitetshanteraren"
 MENU IDR_TASKMANAGER
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
+    CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
 END

 IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
+    CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
            WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    PUSHBUTTON "&Avsluta aktiviteten", IDC_ENDTASK, 34, 189, 83, 14, WS_DISABLED
    PUSHBUTTON "&Växla till", IDC_SWITCHTO, 120, 189, 53, 14, WS_DISABLED
@@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
+    CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
            LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    CONTROL "&Visa processer från alla användare", IDC_SHOWALLPROCESSES, "Button",
            BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 156, 10
--- a/base/applications/taskmgr/lang/tr-TR.rc
+++ b/base/applications/taskmgr/lang/tr-TR.rc
@@ -15,7 +15,7 @@ BEGIN
        MENUITEM "&Her Zaman Üstte", ID_OPTIONS_ALWAYSONTOP, CHECKED
        MENUITEM "&Kullanımda Simge Durumuna Küçült", ID_OPTIONS_MINIMIZEONUSE, CHECKED
        MENUITEM "&Simge Durumuna Küçültüldüğünde Gizle", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED
-        MENUITEM "16 &Bitlik Görevleri Göster", ID_OPTIONS_SHOW16BITTASKS, CHECKED
+        MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED
    END
    POPUP "&Görünüm"
    BEGIN
@@ -28,18 +28,18 @@ BEGIN
            MENUITEM "D&uraklatılmış", ID_VIEW_UPDATESPEED_PAUSED
        END
        MENUITEM SEPARATOR
-        MENUITEM "&Büyük Simgeler", ID_VIEW_LARGE
-        MENUITEM "&Küçük Simgeler", ID_VIEW_SMALL
-        MENUITEM "&Ayrıntılar", ID_VIEW_DETAILS, CHECKED
-        MENUITEM "&Sütunları Seç...", ID_VIEW_SELECTCOLUMNS
-        POPUP "&CPU Geçmişi"
+        MENUITEM "", ID_VIEW_LARGE
+        MENUITEM "", ID_VIEW_SMALL
+        MENUITEM "", ID_VIEW_DETAILS, CHECKED
+        MENUITEM "", ID_VIEW_SELECTCOLUMNS
+        POPUP ""
        BEGIN
-            MENUITEM "&Tek Grafik, Tüm CPU'lar", ID_VIEW_CPUHISTORY_ONEGRAPHALL
-            MENUITEM "&CPU Başına Bir Grafik", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
        END
-        MENUITEM "Ç&ekirdek Sürelerini Göster", ID_VIEW_SHOWKERNELTIMES
+        MENUITEM "", ID_VIEW_SHOWKERNELTIMES
    END
-    POPUP "&Pencereler"
+    POPUP ""
    BEGIN
        MENUITEM "&Yatay Olarak Döşe", ID_WINDOWS_TILEHORIZONTALLY
        MENUITEM "&Dikey Olarak Döşe", ID_WINDOWS_TILEVERTICALLY
@@ -50,15 +50,15 @@ BEGIN
    END
    POPUP "&Bilgisayarı Kapat"
    BEGIN
-        MENUITEM "&Uykuya Geçir",              ID_SHUTDOWN_STANDBY
-        MENUITEM "&Hazırda Beklet",            ID_SHUTDOWN_HIBERNATE
-        MENUITEM "&Kapat",                     ID_SHUTDOWN_POWEROFF
-        MENUITEM "&Yeniden Başlat",            ID_SHUTDOWN_REBOOT
-        MENUITEM """%s"" &Oturumunu Kapat",    ID_SHUTDOWN_LOGOFF
+        MENUITEM "&Uykuya Geçir", ID_SHUTDOWN_STANDBY
+        MENUITEM "&Hazırda Beklet", ID_SHUTDOWN_HIBERNATE
+        MENUITEM "&Kapat", ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Yeniden Başlat", ID_SHUTDOWN_REBOOT
+        MENUITEM """%s"" &Oturumunu Kapat", ID_SHUTDOWN_LOGOFF
        MENUITEM "Ku&llanıcı Değiştir\tROS+L", ID_SHUTDOWN_SWITCHUSER, GRAYED
        MENUITEM "&Bilgisayarı Kilitle\tROS+L", ID_SHUTDOWN_LOCKCOMPUTER
-        MENUITEM "B&ağlantıyı Kes",            ID_SHUTDOWN_DISCONNECT, GRAYED
-        MENUITEM "B&ilgisayarı Çıkar",         ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+        MENUITEM "B&ağlantıyı Kes", ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "B&ilgisayarı Çıkar", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
    END
    POPUP "&Yardım"
    BEGIN
@@ -80,7 +80,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT1 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Yeni Görev (Çalıştır...)", ID_FILE_NEW
        MENUITEM SEPARATOR
@@ -92,7 +92,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT2 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Geç", ID_APPLICATION_PAGE_SWITCHTO
        MENUITEM "&Öne Getir", ID_WINDOWS_BRINGTOFRONT
@@ -110,7 +110,7 @@ END

 IDR_TRAY_POPUP MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Eski Durumuna Getir", ID_RESTORE
        MENUITEM "&Kapat", ID_FILE_EXIT
@@ -121,7 +121,7 @@ END

 IDR_PROCESS_PAGE_CONTEXT MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&İşlemi Sonlandır", ID_PROCESS_PAGE_ENDPROCESS
        MENUITEM "İ&şlem Ağacını Sonlandır", ID_PROCESS_PAGE_ENDPROCESSTREE
@@ -138,13 +138,15 @@ BEGIN
        END
        MENUITEM "İ&lişkiyi Ayarla...", ID_PROCESS_PAGE_SETAFFINITY
        MENUITEM SEPARATOR
-        MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES
+        MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES
        MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION
    END
 END

 /* Dialogs */

+/* TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened */
+
 IDD_TASKMGR_DIALOG DIALOGEX 0, 0, 264, 246
 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |
      WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
@@ -152,14 +154,14 @@ CAPTION "Görev Yöneticisi"
 MENU IDR_TASKMANAGER
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
+    CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
 END

 IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
+    CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
            WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    PUSHBUTTON "G&örevi Sonlandır", IDC_ENDTASK, 60, 189, 68, 14, WS_DISABLED
    PUSHBUTTON "&Geç", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED
@@ -170,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
+    CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
            LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    CONTROL "&Tüm Kullanıcıların İşlemlerini Göster", IDC_SHOWALLPROCESSES, "Button",
            BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 140, 10
--- a/base/applications/taskmgr/lang/uk-UA.rc
+++ b/base/applications/taskmgr/lang/uk-UA.rc
@@ -13,7 +13,7 @@ BEGIN
        MENUITEM "&Поверх інших вікон", ID_OPTIONS_ALWAYSONTOP, CHECKED
        MENUITEM "&Згортати після звернення", ID_OPTIONS_MINIMIZEONUSE, CHECKED
        MENUITEM "При&ховувати згорнуте", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED
-        MENUITEM "&Відображати 16-розрядні завдання", ID_OPTIONS_SHOW16BITTASKS, CHECKED
+        MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED
    END
    POPUP "&Вигляд"
    BEGIN
@@ -26,18 +26,18 @@ BEGIN
            MENUITEM "&Призупинити", ID_VIEW_UPDATESPEED_PAUSED
        END
        MENUITEM SEPARATOR
-        MENUITEM "&Великі значки", ID_VIEW_LARGE
-        MENUITEM "&Дрібні значки", ID_VIEW_SMALL
-        MENUITEM "Д&етально", ID_VIEW_DETAILS, CHECKED
-        MENUITEM "В&ибрати стовпці...", ID_VIEW_SELECTCOLUMNS
-        POPUP "&Хронологія ЦП"
+        MENUITEM "", ID_VIEW_LARGE
+        MENUITEM "", ID_VIEW_SMALL
+        MENUITEM "", ID_VIEW_DETAILS, CHECKED
+        MENUITEM "", ID_VIEW_SELECTCOLUMNS
+        POPUP ""
        BEGIN
-            MENUITEM "&Один графік для всіх ЦП", ID_VIEW_CPUHISTORY_ONEGRAPHALL
-            MENUITEM "Окремий &графік для кожного ЦП", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
        END
-        MENUITEM "&Вивід часу ядра", ID_VIEW_SHOWKERNELTIMES
+        MENUITEM "", ID_VIEW_SHOWKERNELTIMES
    END
-    POPUP "В&ікна"
+    POPUP ""
    BEGIN
        MENUITEM "З&ліва направо", ID_WINDOWS_TILEHORIZONTALLY
        MENUITEM "Згори до&низу", ID_WINDOWS_TILEVERTICALLY
@@ -48,15 +48,15 @@ BEGIN
    END
    POPUP "&Завершення роботи"
    BEGIN
-        MENUITEM "Перехід до режиму &очікування",                  ID_SHUTDOWN_STANDBY
-        MENUITEM "Перехід до &сну",                 ID_SHUTDOWN_HIBERNATE
-        MENUITEM "Ви&мкнення",                  ID_SHUTDOWN_POWEROFF
-        MENUITEM "&Перезавантаження",                   ID_SHUTDOWN_REBOOT
-        MENUITEM "&Завершення сеансу %s",                ID_SHUTDOWN_LOGOFF
-        MENUITEM "Змінити &користувача\tWinKey+L",     ID_SHUTDOWN_SWITCHUSER, GRAYED
-        MENUITEM "За&блокувати комп'ютер\tWinKey+L",   ID_SHUTDOWN_LOCKCOMPUTER
-        MENUITEM "&Від'єднатися",                ID_SHUTDOWN_DISCONNECT, GRAYED
-        MENUITEM "Зняти комп'ютер з &док-станції",            ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+        MENUITEM "Перехід до режиму &очікування", ID_SHUTDOWN_STANDBY
+        MENUITEM "Перехід до &сну", ID_SHUTDOWN_HIBERNATE
+        MENUITEM "Ви&мкнення", ID_SHUTDOWN_POWEROFF
+        MENUITEM "&Перезавантаження", ID_SHUTDOWN_REBOOT
+        MENUITEM "&Завершення сеансу %s", ID_SHUTDOWN_LOGOFF
+        MENUITEM "Змінити &користувача\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "За&блокувати комп'ютер\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "&Від'єднатися", ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "Зняти комп'ютер з &док-станції", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
    END
    POPUP "&Довідка"
    BEGIN
@@ -78,7 +78,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT1 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Нове завдання (Виконати...)", ID_FILE_NEW
        MENUITEM SEPARATOR
@@ -90,7 +90,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT2 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "П&ереключитися", ID_APPLICATION_PAGE_SWITCHTO
        MENUITEM "На передні&й план", ID_WINDOWS_BRINGTOFRONT
@@ -108,7 +108,7 @@ END

 IDR_TRAY_POPUP MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Відновити", ID_RESTORE
        MENUITEM "&Закрити", ID_FILE_EXIT
@@ -119,7 +119,7 @@ END

 IDR_PROCESS_PAGE_CONTEXT MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "&Завершити процес", ID_PROCESS_PAGE_ENDPROCESS
        MENUITEM "Завершити &дерево процесів", ID_PROCESS_PAGE_ENDPROCESSTREE
@@ -136,7 +136,7 @@ BEGIN
        END
        MENUITEM "У&становити відповідність...", ID_PROCESS_PAGE_SETAFFINITY
        MENUITEM SEPARATOR
-        MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES
+        MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES
        MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION
    END
 END
@@ -152,14 +152,14 @@ CAPTION "Диспетчер завдань"
 MENU IDR_TASKMANAGER
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
+    CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
 END

 IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
+    CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
            WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    PUSHBUTTON "Зн&яти завдання", IDC_ENDTASK, 55, 189, 60, 14, WS_DISABLED
    PUSHBUTTON "П&ереключитися", IDC_SWITCHTO, 118, 189, 60, 14, WS_DISABLED
@@ -170,7 +170,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
+    CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
            LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    CONTROL "&Відображати процеси всіх користувачів", IDC_SHOWALLPROCESSES, "Button",
            BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 147, 10
--- a/base/applications/taskmgr/lang/zh-CN.rc
+++ b/base/applications/taskmgr/lang/zh-CN.rc
@@ -20,7 +20,7 @@ BEGIN
        MENUITEM "总在最前(&A)", ID_OPTIONS_ALWAYSONTOP, CHECKED
        MENUITEM "使用时自动最小化(&M)", ID_OPTIONS_MINIMIZEONUSE, CHECKED
        MENUITEM "最小化时隐藏(&H)", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED
-        MENUITEM "显示 16 位任务(&S)", ID_OPTIONS_SHOW16BITTASKS, CHECKED
+        MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED
    END
    POPUP "查看(&V)"
    BEGIN
@@ -33,18 +33,18 @@ BEGIN
            MENUITEM "暂停(&P)", ID_VIEW_UPDATESPEED_PAUSED
        END
        MENUITEM SEPARATOR
-        MENUITEM "大图标(&G)", ID_VIEW_LARGE
-        MENUITEM "小图标(&M)", ID_VIEW_SMALL
-        MENUITEM "详细信息(&D)", ID_VIEW_DETAILS, CHECKED
-        MENUITEM "选择列(&S)...", ID_VIEW_SELECTCOLUMNS
-        POPUP "CPU 记录(&C)"
+        MENUITEM "", ID_VIEW_LARGE
+        MENUITEM "", ID_VIEW_SMALL
+        MENUITEM "", ID_VIEW_DETAILS, CHECKED
+        MENUITEM "", ID_VIEW_SELECTCOLUMNS
+        POPUP ""
        BEGIN
-            MENUITEM "所有 CPU 一张图表(&O)", ID_VIEW_CPUHISTORY_ONEGRAPHALL
-            MENUITEM "每个 CPU 一张图表(&P)", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
        END
-        MENUITEM "显示内核时间(&S)", ID_VIEW_SHOWKERNELTIMES
+        MENUITEM "", ID_VIEW_SHOWKERNELTIMES
    END
-    POPUP "窗口(&W)"
+    POPUP ""
    BEGIN
        MENUITEM "横向平铺(&H)", ID_WINDOWS_TILEHORIZONTALLY
        MENUITEM "纵向平铺(&V)", ID_WINDOWS_TILEVERTICALLY
@@ -55,15 +55,15 @@ BEGIN
    END
    POPUP "关机(&U)"
    BEGIN
-        MENUITEM "待机(&B)",                  ID_SHUTDOWN_STANDBY
-        MENUITEM "休眠(&H)",                 ID_SHUTDOWN_HIBERNATE
-        MENUITEM "关闭电源(&U)",                  ID_SHUTDOWN_POWEROFF
-        MENUITEM "重新启动(&R)",                   ID_SHUTDOWN_REBOOT
-        MENUITEM "退出用户(&L) %s",                ID_SHUTDOWN_LOGOFF
-        MENUITEM "切换用户(&S)\tWinKey+L",     ID_SHUTDOWN_SWITCHUSER, GRAYED
-        MENUITEM "锁定计算机(&K)\tWinKey+L",   ID_SHUTDOWN_LOCKCOMPUTER
-        MENUITEM "断开连接(&D)",                ID_SHUTDOWN_DISCONNECT, GRAYED
-        MENUITEM "弹出计算机(&E)",            ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+        MENUITEM "待机(&B)", ID_SHUTDOWN_STANDBY
+        MENUITEM "休眠(&H)", ID_SHUTDOWN_HIBERNATE
+        MENUITEM "关闭电源(&U)", ID_SHUTDOWN_POWEROFF
+        MENUITEM "重新启动(&R)", ID_SHUTDOWN_REBOOT
+        MENUITEM "退出用户(&L) %s", ID_SHUTDOWN_LOGOFF
+        MENUITEM "切换用户(&S)\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "锁定计算机(&K)\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "断开连接(&D)", ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "弹出计算机(&E)", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
    END
    POPUP "帮助(&H)"
    BEGIN
@@ -85,7 +85,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT1 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "新建任务(运行...)(&N)", ID_FILE_NEW
        MENUITEM SEPARATOR
@@ -97,7 +97,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT2 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "切换至(&S)", ID_APPLICATION_PAGE_SWITCHTO
        MENUITEM "前置(&B)", ID_WINDOWS_BRINGTOFRONT
@@ -115,7 +115,7 @@ END

 IDR_TRAY_POPUP MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "还原(&R)", ID_RESTORE
        MENUITEM "关闭(&C)", ID_FILE_EXIT
@@ -126,7 +126,7 @@ END

 IDR_PROCESS_PAGE_CONTEXT MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "结束进程(&E)", ID_PROCESS_PAGE_ENDPROCESS
        MENUITEM "结束进程树(&T)", ID_PROCESS_PAGE_ENDPROCESSTREE
@@ -143,8 +143,8 @@ BEGIN
        END
        MENUITEM "关系设置(&A)...", ID_PROCESS_PAGE_SETAFFINITY
        MENUITEM SEPARATOR
-        MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES
-        MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION
+        MENUITEM "Properties(&R)", ID_PROCESS_PAGE_PROPERTIES
+        MENUITEM "Open File Location(&O)", ID_PROCESS_PAGE_OPENFILELOCATION
    END
 END

@@ -159,14 +159,14 @@ CAPTION "任务管理器"
 MENU IDR_TASKMANAGER
 FONT 9, "宋体"
 BEGIN
-    CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
+    CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
 END

 IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "宋体"
 BEGIN
-    CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
+    CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
            WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    PUSHBUTTON "结束任务(&E)", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED
    PUSHBUTTON "切换至(&S)", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED
@@ -177,7 +177,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "宋体"
 BEGIN
-    CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
+    CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
            LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    CONTROL "显示所有用户的进程(&S)", IDC_SHOWALLPROCESSES, "Button",
            BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 111, 10
@@ -430,7 +430,7 @@ BEGIN
    IDS_MSG_UNABLEDEBUGPROCESS "无法调试进程"
    IDS_MSG_WARNINGDEBUG "警告： 调试该进程可能会导致数据丢失。\n你确定想要附加调试器？"
    IDS_MSG_TASKMGRWARNING "任务管理器警告"
-    IDS_MSG_WARNINGTERMINATING "警告: 终止进程会导致意外的结果，包括丢失数据和系统不稳定。\n 在被终止前，这一进程将不会获得机会保存其状态或数据。\n 您确定想终止该进程吗？"
+    IDS_MSG_WARNINGTERMINATING "警告: 终止进程会导致意外的结果，包括丢失数据和系统不稳定。\n在被终止前，这一进程将不会获得机会保存其状态或数据。\n您确定想终止该进程吗？"
    IDS_MSG_UNABLETERMINATEPRO "无法终止进程"
    IDS_MSG_CLOSESYSTEMPROCESS "这是一个至关重要的系统进程。任务管理器不会结束这一进程。"
    IDS_MSG_UNABLECHANGEPRIORITY "无法更改优先级"
--- a/base/applications/taskmgr/lang/zh-HK.rc
+++ b/base/applications/taskmgr/lang/zh-HK.rc
@@ -21,7 +21,7 @@ BEGIN
        MENUITEM "前端顯示(&A)", ID_OPTIONS_ALWAYSONTOP, CHECKED
        MENUITEM "使用時自動最小化(&M)", ID_OPTIONS_MINIMIZEONUSE, CHECKED
        MENUITEM "最小化時隱藏(&H)", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED
-        MENUITEM "顯示 16 位元工作(&S)", ID_OPTIONS_SHOW16BITTASKS, CHECKED
+        MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED
    END
    POPUP "檢視(&V)"
    BEGIN
@@ -34,18 +34,18 @@ BEGIN
            MENUITEM "暫停(&P)", ID_VIEW_UPDATESPEED_PAUSED
        END
        MENUITEM SEPARATOR
-        MENUITEM "大圖示(&G)", ID_VIEW_LARGE
-        MENUITEM "小圖示(&M)", ID_VIEW_SMALL
-        MENUITEM "詳細資料(&D)", ID_VIEW_DETAILS, CHECKED
-        MENUITEM "選擇欄位(&S)...", ID_VIEW_SELECTCOLUMNS
-        POPUP "CPU 記錄(&C)"
+        MENUITEM "", ID_VIEW_LARGE
+        MENUITEM "", ID_VIEW_SMALL
+        MENUITEM "", ID_VIEW_DETAILS, CHECKED
+        MENUITEM "", ID_VIEW_SELECTCOLUMNS
+        POPUP ""
        BEGIN
-            MENUITEM "所有 CPU 處理成一個圖形(&O)", ID_VIEW_CPUHISTORY_ONEGRAPHALL
-            MENUITEM "每個 CPU 處理成一個圖形(&P)", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
        END
-        MENUITEM "顯示核心程式時間(&S)", ID_VIEW_SHOWKERNELTIMES
+        MENUITEM "", ID_VIEW_SHOWKERNELTIMES
    END
-    POPUP "窗口(&W)"
+    POPUP ""
    BEGIN
        MENUITEM "橫向平鋪(&H)", ID_WINDOWS_TILEHORIZONTALLY
        MENUITEM "縱向平鋪(&V)", ID_WINDOWS_TILEVERTICALLY
@@ -56,15 +56,15 @@ BEGIN
    END
    POPUP "關閉(&U)"
    BEGIN
-        MENUITEM "待機(&B)",                  ID_SHUTDOWN_STANDBY
-        MENUITEM "休眠(&H)",                 ID_SHUTDOWN_HIBERNATE
-        MENUITEM "關閉電源(&U)",                  ID_SHUTDOWN_POWEROFF
-        MENUITEM "重新啟動(&R)",                   ID_SHUTDOWN_REBOOT
-        MENUITEM "登出 %s (&L)",                ID_SHUTDOWN_LOGOFF
-        MENUITEM "切換使用者(&S)\tWinKey+L",     ID_SHUTDOWN_SWITCHUSER, GRAYED
-        MENUITEM "鎖定電腦(&K)\tWinKey+L",   ID_SHUTDOWN_LOCKCOMPUTER
-        MENUITEM "斷開連接(&D)",                ID_SHUTDOWN_DISCONNECT, GRAYED
-        MENUITEM "退出電腦(&E)",            ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+        MENUITEM "待機(&B)", ID_SHUTDOWN_STANDBY
+        MENUITEM "休眠(&H)", ID_SHUTDOWN_HIBERNATE
+        MENUITEM "關閉電源(&U)", ID_SHUTDOWN_POWEROFF
+        MENUITEM "重新啟動(&R)", ID_SHUTDOWN_REBOOT
+        MENUITEM "登出 %s (&L)", ID_SHUTDOWN_LOGOFF
+        MENUITEM "切換使用者(&S)\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "鎖定電腦(&K)\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "斷開連接(&D)", ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "退出電腦(&E)", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
    END
    POPUP "説明(&H)"
    BEGIN
@@ -86,7 +86,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT1 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "新工作（執行...）(&N)", ID_FILE_NEW
        MENUITEM SEPARATOR
@@ -98,7 +98,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT2 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "切換至(&S)", ID_APPLICATION_PAGE_SWITCHTO
        MENUITEM "前置(&B)", ID_WINDOWS_BRINGTOFRONT
@@ -116,7 +116,7 @@ END

 IDR_TRAY_POPUP MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "還原(&R)", ID_RESTORE
        MENUITEM "關閉(&C)", ID_FILE_EXIT
@@ -127,7 +127,7 @@ END

 IDR_PROCESS_PAGE_CONTEXT MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "結束處理程序(&E)", ID_PROCESS_PAGE_ENDPROCESS
        MENUITEM "結束處理程序樹狀目錄(&T)", ID_PROCESS_PAGE_ENDPROCESSTREE
@@ -144,8 +144,8 @@ BEGIN
        END
        MENUITEM "親和性設定(&A)...", ID_PROCESS_PAGE_SETAFFINITY
        MENUITEM SEPARATOR
-        MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES
-        MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION
+        MENUITEM "Properties(&R)", ID_PROCESS_PAGE_PROPERTIES
+        MENUITEM "Open File Location(&O)", ID_PROCESS_PAGE_OPENFILELOCATION
    END
 END

@@ -160,14 +160,14 @@ CAPTION "工作管理員"
 MENU IDR_TASKMANAGER
 FONT 9, "新細明體"
 BEGIN
-    CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
+    CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
 END

 IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "新細明體"
 BEGIN
-    CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
+    CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
            WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    PUSHBUTTON "結束工作(&E)", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED
    PUSHBUTTON "切換至(&S)", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED
@@ -178,7 +178,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "新細明體"
 BEGIN
-    CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
+    CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
            LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    CONTROL "顯示所有使用者的處理程序(&S)", IDC_SHOWALLPROCESSES, "Button",
            BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 111, 10
--- a/base/applications/taskmgr/lang/zh-TW.rc
+++ b/base/applications/taskmgr/lang/zh-TW.rc
@@ -21,7 +21,7 @@ BEGIN
        MENUITEM "前端顯示(&A)", ID_OPTIONS_ALWAYSONTOP, CHECKED
        MENUITEM "使用時自動最小化(&M)", ID_OPTIONS_MINIMIZEONUSE, CHECKED
        MENUITEM "最小化時隱藏(&H)", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED
-        MENUITEM "顯示 16 位元工作(&S)", ID_OPTIONS_SHOW16BITTASKS, CHECKED
+        MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED
    END
    POPUP "檢視(&V)"
    BEGIN
@@ -34,18 +34,18 @@ BEGIN
            MENUITEM "暫停(&P)", ID_VIEW_UPDATESPEED_PAUSED
        END
        MENUITEM SEPARATOR
-        MENUITEM "大圖示(&G)", ID_VIEW_LARGE
-        MENUITEM "小圖示(&M)", ID_VIEW_SMALL
-        MENUITEM "詳細資料(&D)", ID_VIEW_DETAILS, CHECKED
-        MENUITEM "選擇欄位(&S)...", ID_VIEW_SELECTCOLUMNS
-        POPUP "CPU 記錄(&C)"
+        MENUITEM "", ID_VIEW_LARGE
+        MENUITEM "", ID_VIEW_SMALL
+        MENUITEM "", ID_VIEW_DETAILS, CHECKED
+        MENUITEM "", ID_VIEW_SELECTCOLUMNS
+        POPUP ""
        BEGIN
-            MENUITEM "所有 CPU 處理成一個圖形(&O)", ID_VIEW_CPUHISTORY_ONEGRAPHALL
-            MENUITEM "每個 CPU 處理成一個圖形(&P)", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL
+            MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
        END
-        MENUITEM "顯示核心程式時間(&S)", ID_VIEW_SHOWKERNELTIMES
+        MENUITEM "", ID_VIEW_SHOWKERNELTIMES
    END
-    POPUP "視窗(&W)"
+    POPUP ""
    BEGIN
        MENUITEM "橫向平鋪(&H)", ID_WINDOWS_TILEHORIZONTALLY
        MENUITEM "縱向平鋪(&V)", ID_WINDOWS_TILEVERTICALLY
@@ -56,15 +56,15 @@ BEGIN
    END
    POPUP "關閉(&U)"
    BEGIN
-        MENUITEM "待機(&B)",                  ID_SHUTDOWN_STANDBY
-        MENUITEM "休眠(&H)",                 ID_SHUTDOWN_HIBERNATE
-        MENUITEM "關閉電源(&U)",                  ID_SHUTDOWN_POWEROFF
-        MENUITEM "重新啟動(&R)",                   ID_SHUTDOWN_REBOOT
-        MENUITEM "登出 %s (&L)",                ID_SHUTDOWN_LOGOFF
-        MENUITEM "切換使用者(&S)\tWinKey+L",     ID_SHUTDOWN_SWITCHUSER, GRAYED
-        MENUITEM "鎖定電腦(&K)\tWinKey+L",   ID_SHUTDOWN_LOCKCOMPUTER
-        MENUITEM "斷開連接(&D)",                ID_SHUTDOWN_DISCONNECT, GRAYED
-        MENUITEM "退出電腦(&E)",            ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
+        MENUITEM "待機(&B)", ID_SHUTDOWN_STANDBY
+        MENUITEM "休眠(&H)", ID_SHUTDOWN_HIBERNATE
+        MENUITEM "關閉電源(&U)", ID_SHUTDOWN_POWEROFF
+        MENUITEM "重新啟動(&R)", ID_SHUTDOWN_REBOOT
+        MENUITEM "登出 %s (&L)", ID_SHUTDOWN_LOGOFF
+        MENUITEM "切換使用者(&S)\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED
+        MENUITEM "鎖定電腦(&K)\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER
+        MENUITEM "斷開連接(&D)", ID_SHUTDOWN_DISCONNECT, GRAYED
+        MENUITEM "退出電腦(&E)", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
    END
    POPUP "說明(&H)"
    BEGIN
@@ -86,7 +86,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT1 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "執行新工作(&N)...", ID_FILE_NEW
        MENUITEM SEPARATOR
@@ -98,7 +98,7 @@ END

 IDR_APPLICATION_PAGE_CONTEXT2 MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "切換至(&S)", ID_APPLICATION_PAGE_SWITCHTO
        MENUITEM "前置(&B)", ID_WINDOWS_BRINGTOFRONT
@@ -116,7 +116,7 @@ END

 IDR_TRAY_POPUP MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "還原(&R)", ID_RESTORE
        MENUITEM "關閉(&C)", ID_FILE_EXIT
@@ -127,7 +127,7 @@ END

 IDR_PROCESS_PAGE_CONTEXT MENU
 BEGIN
-    POPUP "DUMMY"
+    POPUP ""
    BEGIN
        MENUITEM "結束處理程序(&E)", ID_PROCESS_PAGE_ENDPROCESS
        MENUITEM "結束處理程序樹狀目錄(&T)", ID_PROCESS_PAGE_ENDPROCESSTREE
@@ -144,8 +144,8 @@ BEGIN
        END
        MENUITEM "親和性設定(&A)...", ID_PROCESS_PAGE_SETAFFINITY
        MENUITEM SEPARATOR
-        MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES
-        MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION
+        MENUITEM "Properties(&R)", ID_PROCESS_PAGE_PROPERTIES
+        MENUITEM "Open File Location(&O)", ID_PROCESS_PAGE_OPENFILELOCATION
    END
 END

@@ -160,14 +160,14 @@ CAPTION "工作管理員"
 MENU IDR_TASKMANAGER
 FONT 9, "新細明體"
 BEGIN
-    CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
+    CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228
 END

 IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "新細明體"
 BEGIN
-    CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
+    CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS |
            WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    PUSHBUTTON "結束工作(&E)", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED
    PUSHBUTTON "切換至(&S)", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED
@@ -178,7 +178,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "新細明體"
 BEGIN
-    CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
+    CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
            LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177
    CONTROL "顯示所有使用者的處理程序(&S)", IDC_SHOWALLPROCESSES, "Button",
            BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 111, 10
--- a/dll/cpl/desk/advmon.c
+++ b/dll/cpl/desk/advmon.c
@@ -74,9 +74,6 @@ BuildAdvPropTitle(IDataObject *pdo, LPTSTR lpBuffer, DWORD dwBufferLen)
        LocalFree((HLOCAL)lpDisplayName);
 }

-
-typedef HPSXA (WINAPI * CPSEAE)(HKEY,LPCWSTR,UINT,IDataObject*);
-
 BOOL
 DisplayAdvancedSettings(HWND hWndParent, PDISPLAY_DEVICE_ENTRY DisplayDevice)
 {
@@ -86,10 +83,6 @@ DisplayAdvancedSettings(HWND hWndParent, PDISPLAY_DEVICE_ENTRY DisplayDevice)
    HPSXA hpsxaDev, hpsxaDisp;
    BOOL Ret;
    IDataObject *pdo;
-#ifdef _MSC_VER
-    HMODULE hShell32 = NULL;
-    CPSEAE msvc_SHCreatePropSheetExtArrayEx;
-#endif

    /* FIXME: Build the "%s and %s" caption string for the monitor and adapter name */
    szCaption[0] = _T('\0');
@@ -109,25 +102,13 @@ DisplayAdvancedSettings(HWND hWndParent, PDISPLAY_DEVICE_ENTRY DisplayDevice)
    if (pdo != NULL)
        BuildAdvPropTitle(pdo, szCaption, sizeof(szCaption) / sizeof(szCaption[0]));

-#ifdef _MSC_VER
-    hShell32 = LoadLibrary(_T("shell32.dll"));
-    if (hShell32 == NULL)
-        return FALSE;
-    msvc_SHCreatePropSheetExtArrayEx = (CPSEAE)GetProcAddress(hShell32, (LPCSTR)194);
-    hpsxaDev = msvc_SHCreatePropSheetExtArrayEx(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\Device"), MAX_ADVANCED_PAGES - psh.nPages, pdo);
-#else
    hpsxaDev = SHCreatePropSheetExtArrayEx(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\Device"), MAX_ADVANCED_PAGES - psh.nPages, pdo);
-#endif
    if (hpsxaDev != NULL)
-      SHAddFromPropSheetExtArray(hpsxaDev, PropSheetAddPage, (LPARAM)&psh);
+        SHAddFromPropSheetExtArray(hpsxaDev, PropSheetAddPage, (LPARAM)&psh);

-#ifdef _MSC_VER
-    hpsxaDisp = msvc_SHCreatePropSheetExtArrayEx(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\Display"), MAX_ADVANCED_PAGES - psh.nPages, pdo);
-#else
    hpsxaDisp = SHCreatePropSheetExtArrayEx(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\Display"), MAX_ADVANCED_PAGES - psh.nPages, pdo);
-#endif
    if (hpsxaDisp != NULL)
-      SHAddFromPropSheetExtArray(hpsxaDisp, PropSheetAddPage, (LPARAM)&psh);
+        SHAddFromPropSheetExtArray(hpsxaDisp, PropSheetAddPage, (LPARAM)&psh);

    Ret = (LONG)(PropertySheet(&psh) != -1);

@@ -139,9 +120,5 @@ DisplayAdvancedSettings(HWND hWndParent, PDISPLAY_DEVICE_ENTRY DisplayDevice)

    IDataObject_Release(pdo);

-#ifdef _MSC_VER
-    FreeLibrary(hShell32);
-#endif
-
    return Ret;
 }
--- a/dll/cpl/desk/desk.c
+++ b/dll/cpl/desk/desk.c
@@ -8,8 +8,11 @@
 */

 #include "desk.h"
+
 #include <shellapi.h>
 #include <cplext.h>
+#include <winnls.h>
+
 #include <debug.h>

 #define NUM_APPLETS    (1)
@@ -364,6 +367,7 @@ InstallScreenSaverA(
    IN UINT nCmdShow)
 {
    LPWSTR lpwString;
+    int nLength;

    if (!pszFile)
    {
@@ -371,16 +375,32 @@ InstallScreenSaverA(
        SetLastError(ERROR_INVALID_PARAMETER);
        return;
    }
-    DPRINT("InstallScreenSaver() Install from file %s\n", pszFile);
-    lpwString = pSetupMultiByteToUnicode(pszFile, 0);
+
+    /* Convert the string to unicode */
+    lpwString = NULL;
+    nLength = MultiByteToWideChar(CP_ACP, 0, pszFile, -1, NULL, 0);
+    if (nLength != 0)
+    {
+        lpwString = LocalAlloc(LMEM_FIXED, nLength * sizeof(WCHAR));
+        if (lpwString)
+        {
+            if (!MultiByteToWideChar(CP_ACP, 0, pszFile, -1, lpwString, nLength))
+            {
+                LocalFree(lpwString);
+                lpwString = NULL;
+            }
+        }
+    }
    if (!lpwString)
    {
        DPRINT("InstallScreenSaver() not enough memory to convert string to unicode\n");
-        SetLastError(ERROR_NOT_ENOUGH_MEMORY);
        return;
    }
+
+    /* Call the unicode function */
    InstallScreenSaverW(hWindow, hInstance, lpwString, nCmdShow);
-    MyFree(lpwString);
+
+    LocalFree(lpwString);
 }

 BOOL WINAPI
--- a/dll/cpl/desk/guid.c
+++ b/dll/cpl/desk/guid.c
@@ -1,6 +1,6 @@
 /* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */

-#define WIN32_NO_STATuS
+#define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H

--- a/dll/ntdll/include/ntdllp.h
+++ b/dll/ntdll/include/ntdllp.h
@@ -98,12 +98,14 @@ LdrpWalkImportDescriptor(IN LPWSTR DllPath OPTIONAL,


 /* ldrutils.c */
-NTSTATUS NTAPI
-LdrpGetProcedureAddress(IN PVOID BaseAddress,
-                        IN PANSI_STRING Name,
-                        IN ULONG Ordinal,
-                        OUT PVOID *ProcedureAddress,
-                        IN BOOLEAN ExecuteInit);
+NTSTATUS
+NTAPI
+LdrpGetProcedureAddress(
+    _In_ PVOID BaseAddress,
+    _In_opt_ _When_(Ordinal == 0, _Notnull_) PANSI_STRING Name,
+    _In_opt_ _When_(Name == NULL, _In_range_(>, 0)) ULONG Ordinal,
+    _Out_ PVOID *ProcedureAddress,
+    _In_ BOOLEAN ExecuteInit);

 PLDR_DATA_TABLE_ENTRY NTAPI
 LdrpAllocateDataTableEntry(IN PVOID BaseAddress);
--- a/dll/ntdll/ldr/ldrapi.c
+++ b/dll/ntdll/ldr/ldrapi.c
@@ -98,8 +98,9 @@ LdrpMakeCookie(VOID)
 */
 NTSTATUS
 NTAPI
-LdrUnlockLoaderLock(IN ULONG Flags,
-                    IN ULONG Cookie OPTIONAL)
+LdrUnlockLoaderLock(
+    _In_ ULONG Flags,
+    _In_opt_ ULONG Cookie)
 {
    NTSTATUS Status = STATUS_SUCCESS;

@@ -170,9 +171,10 @@ LdrUnlockLoaderLock(IN ULONG Flags,
 */
 NTSTATUS
 NTAPI
-LdrLockLoaderLock(IN ULONG Flags,
-                  OUT PULONG Disposition OPTIONAL,
-                  OUT PULONG_PTR Cookie OPTIONAL)
+LdrLockLoaderLock(
+    _In_ ULONG Flags,
+    _Out_opt_ PULONG Disposition,
+    _Out_opt_ PULONG_PTR Cookie)
 {
    NTSTATUS Status = STATUS_SUCCESS;
    BOOLEAN InInit = LdrpInLdrInit;
@@ -440,8 +442,9 @@ LdrLoadDll(IN PWSTR SearchPath OPTIONAL,
 */
 NTSTATUS
 NTAPI
-LdrFindEntryForAddress(PVOID Address,
-                       PLDR_DATA_TABLE_ENTRY *Module)
+LdrFindEntryForAddress(
+    _In_ PVOID Address,
+    _Out_ PLDR_DATA_TABLE_ENTRY *Module)
 {
    PLIST_ENTRY ListHead, NextEntry;
    PLDR_DATA_TABLE_ENTRY LdrEntry;
@@ -519,11 +522,12 @@ LdrFindEntryForAddress(PVOID Address,
 */
 NTSTATUS
 NTAPI
-LdrGetDllHandleEx(IN ULONG Flags,
-                  IN PWSTR DllPath OPTIONAL,
-                  IN PULONG DllCharacteristics OPTIONAL,
-                  IN PUNICODE_STRING DllName,
-                  OUT PVOID *DllHandle OPTIONAL)
+LdrGetDllHandleEx(
+    _In_ ULONG Flags,
+    _In_opt_ PWSTR DllPath,
+    _In_opt_ PULONG DllCharacteristics,
+    _In_ PUNICODE_STRING DllName,
+    _Out_opt_ PVOID *DllHandle)
 {
    NTSTATUS Status;
    PLDR_DATA_TABLE_ENTRY LdrEntry;
@@ -802,10 +806,11 @@ Quickie:
 */
 NTSTATUS
 NTAPI
-LdrGetDllHandle(IN PWSTR DllPath OPTIONAL,
-                IN PULONG DllCharacteristics OPTIONAL,
-                IN PUNICODE_STRING DllName,
-                OUT PVOID *DllHandle)
+LdrGetDllHandle(
+    _In_opt_ PWSTR DllPath,
+    _In_opt_ PULONG DllCharacteristics,
+    _In_ PUNICODE_STRING DllName,
+    _Out_ PVOID *DllHandle)
 {
    /* Call the newer API */
    return LdrGetDllHandleEx(LDR_GET_DLL_HANDLE_EX_UNCHANGED_REFCOUNT,
@@ -820,10 +825,11 @@ LdrGetDllHandle(IN PWSTR DllPath OPTIONAL,
 */
 NTSTATUS
 NTAPI
-LdrGetProcedureAddress(IN PVOID BaseAddress,
-                       IN PANSI_STRING Name,
-                       IN ULONG Ordinal,
-                       OUT PVOID *ProcedureAddress)
+LdrGetProcedureAddress(
+    _In_ PVOID BaseAddress,
+    _In_opt_ _When_(Ordinal == 0, _Notnull_) PANSI_STRING Name,
+    _In_opt_ _When_(Name == NULL, _In_range_(>, 0)) ULONG Ordinal,
+    _Out_ PVOID *ProcedureAddress)
 {
    /* Call the internal routine and tell it to execute DllInit */
    return LdrpGetProcedureAddress(BaseAddress, Name, Ordinal, ProcedureAddress, TRUE);
--- a/dll/ntdll/ldr/ldrutils.c
+++ b/dll/ntdll/ldr/ldrutils.c
@@ -2249,11 +2249,12 @@ lookinhash:

 NTSTATUS
 NTAPI
-LdrpGetProcedureAddress(IN PVOID BaseAddress,
-                        IN PANSI_STRING Name,
-                        IN ULONG Ordinal,
-                        OUT PVOID *ProcedureAddress,
-                        IN BOOLEAN ExecuteInit)
+LdrpGetProcedureAddress(
+    _In_ PVOID BaseAddress,
+    _In_opt_ _When_(Ordinal == 0, _Notnull_) PANSI_STRING Name,
+    _In_opt_ _When_(Name == NULL, _In_range_(>, 0)) ULONG Ordinal,
+    _Out_ PVOID *ProcedureAddress,
+    _In_ BOOLEAN ExecuteInit)
 {
    NTSTATUS Status = STATUS_SUCCESS;
    UCHAR ImportBuffer[64];
--- a/dll/shellext/shellbtrfs/guid.c
+++ b/dll/shellext/shellbtrfs/guid.c
@@ -1,6 +1,6 @@
 /* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */

-#define WIN32_NO_STATuS
+#define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H

--- a/dll/win32/netid/netid.c
+++ b/dll/win32/netid/netid.c
@@ -162,58 +162,22 @@ GetComputerNames(
 static BOOL
 IsUserAdmin(VOID)
 {
+    BOOL bIsAdmin;
    SID_IDENTIFIER_AUTHORITY Authority = {SECURITY_NT_AUTHORITY};
-    PSID pAdminsSid = NULL;
-    HANDLE hToken = NULL;
-    PTOKEN_GROUPS pGroups = NULL;
-    BOOL bIsAdmin = FALSE;
-    DWORD dwSize, i;
+    PSID pAdminsSid;

-    if (!AllocateAndInitializeSid(&Authority, 2, SECURITY_BUILTIN_DOMAIN_RID,
-                                  DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0,
+    if (!AllocateAndInitializeSid(&Authority, 2,
+                                  SECURITY_BUILTIN_DOMAIN_RID,
+                                  DOMAIN_ALIAS_RID_ADMINS,
+                                  0, 0, 0, 0, 0, 0,
                                  &pAdminsSid))
+    {
        return FALSE;
-
-    if (!OpenProcessToken(GetCurrentProcess(),
-                          TOKEN_QUERY,
-                          &hToken))
-        goto done;
-
-    if (GetTokenInformation(hToken, TokenGroups, NULL, 0, &dwSize) ||
-        GetLastError() != ERROR_INSUFFICIENT_BUFFER)
-    {
-        goto done;
    }

-    pGroups = HeapAlloc(GetProcessHeap(), 0, dwSize);
-    if (pGroups == NULL)
-        goto done;
-
-    if (!GetTokenInformation(hToken,
-                             TokenGroups,
-                             pGroups,
-                             dwSize,
-                             &dwSize))
-        goto done;
-
-    for (i = 0; i < pGroups->GroupCount; i++)
-    {
-        if (EqualSid(pGroups->Groups[i].Sid, pAdminsSid))
-        {
-            bIsAdmin = TRUE;
-            break;
-        }
-    }
-
-done:
-    if (pGroups != NULL)
-        HeapFree(GetProcessHeap(), 0, pGroups);
-
-    if (hToken != NULL)
-        CloseHandle(hToken);
-
-    if (pAdminsSid != NULL)
-        FreeSid(pAdminsSid);
+    if (!CheckTokenMembership(NULL, pAdminsSid, &bIsAdmin))
+        bIsAdmin = FALSE;
+    FreeSid(pAdminsSid);

    return bIsAdmin;
 }
--- a/dll/win32/verifier/verifier.c
+++ b/dll/win32/verifier/verifier.c
@@ -22,7 +22,13 @@ VOID NTAPI AVrfpNtdllHeapFreeCallback(PVOID AllocationBase, SIZE_T AllocationSiz
 // DPFLTR_VERIFIER_ID


-NTSTATUS NTAPI AVrfpLdrGetProcedureAddress(IN PVOID BaseAddress, IN PANSI_STRING Name, IN ULONG Ordinal, OUT PVOID *ProcedureAddress);
+NTSTATUS
+NTAPI
+AVrfpLdrGetProcedureAddress(
+    _In_ PVOID BaseAddress,
+    _In_opt_ _When_(Ordinal == 0, _Notnull_) PANSI_STRING Name,
+    _In_opt_ _When_(Name == NULL, _In_range_(>, 0)) ULONG Ordinal,
+    _Out_ PVOID *ProcedureAddress);

 static RTL_VERIFIER_THUNK_DESCRIPTOR AVrfpNtdllThunks[] =
 {
@@ -116,9 +122,18 @@ PVOID AVrfpFindReplacementThunk(PVOID Proc)
 }


-NTSTATUS NTAPI AVrfpLdrGetProcedureAddress(IN PVOID BaseAddress, IN PANSI_STRING Name, IN ULONG Ordinal, OUT PVOID *ProcedureAddress)
+NTSTATUS NTAPI
+AVrfpLdrGetProcedureAddress(
+    _In_ PVOID BaseAddress,
+    _In_opt_ _When_(Ordinal == 0, _Notnull_) PANSI_STRING Name,
+    _In_opt_ _When_(Name == NULL, _In_range_(>, 0)) ULONG Ordinal,
+    _Out_ PVOID *ProcedureAddress)
 {
-    NTSTATUS (NTAPI *oLdrGetProcedureAddress)(IN PVOID BaseAddress, IN PANSI_STRING Name, IN ULONG Ordinal, OUT PVOID *ProcedureAddress);
+    NTSTATUS(NTAPI *oLdrGetProcedureAddress)(
+        _In_ PVOID BaseAddress,
+        _In_opt_ _When_(Ordinal == 0, _Notnull_) PANSI_STRING Name,
+        _In_opt_ _When_(Name == NULL, _In_range_(>, 0)) ULONG Ordinal,
+        _Out_ PVOID *ProcedureAddress);
    NTSTATUS Status;
    PVOID Replacement;

--- a/drivers/ksfilter/ks/irp.c
+++ b/drivers/ksfilter/ks/irp.c
@@ -634,8 +634,7 @@ KsStreamIo(
    IoStack = IoGetNextIrpStackLocation(Irp);
    /* setup stack parameters */
    IoStack->FileObject = FileObject;
-    IoStack->Parameters.DeviceIoControl.InputBufferLength = Length;
-    IoStack->Parameters.DeviceIoControl.Type3InputBuffer = StreamHeaders;
+    IoStack->Parameters.DeviceIoControl.OutputBufferLength = Length;
    IoStack->Parameters.DeviceIoControl.IoControlCode = (Flags == KSSTREAM_READ ? IOCTL_KS_READ_STREAM : IOCTL_KS_WRITE_STREAM);

    if (CompletionRoutine)
--- a/drivers/network/tcpip/include/tags.h
+++ b/drivers/network/tcpip/include/tags.h
@@ -44,3 +44,4 @@
 #define KEY_VALUE_TAG 'vkCT'
 #define HEADER_TAG 'rhCT'
 #define REG_STR_TAG 'srCT'
+#define DEVICE_OBJ_SECURITY_TAG 'eSeD'
--- a/drivers/network/tcpip/tcpip/main.c
+++ b/drivers/network/tcpip/tcpip/main.c
@@ -10,6 +10,10 @@

 #include "precomp.h"

+#include <ntifs.h>
+#include <ndk/rtlfuncs.h>
+#include <ndk/obfuncs.h>
+
 #include <dispatch.h>
 #include <fileobjs.h>

@@ -556,6 +560,212 @@ TiDispatch(
    return IRPFinish(Irp, Status);
 }

+static
+NTSTATUS TiCreateSecurityDescriptor(
+    _Out_ PSECURITY_DESCRIPTOR *SecurityDescriptor)
+{
+    NTSTATUS Status;
+    SECURITY_DESCRIPTOR AbsSD;
+    ULONG DaclSize, RelSDSize = 0;
+    PSECURITY_DESCRIPTOR RelSD = NULL;
+    PACL Dacl = NULL;
+
+    /* Setup a SD */
+    Status = RtlCreateSecurityDescriptor(&AbsSD,
+                                         SECURITY_DESCRIPTOR_REVISION);
+    if (!NT_SUCCESS(Status))
+    {
+        TI_DbgPrint(MIN_TRACE, ("Failed to create the absolute SD (0x%X)\n", Status));
+        goto Quit;
+    }
+
+    /* Setup a DACL */
+    DaclSize = sizeof(ACL) +
+               sizeof(ACCESS_ALLOWED_ACE) + RtlLengthSid(SeExports->SeLocalSystemSid) +
+               sizeof(ACCESS_ALLOWED_ACE) + RtlLengthSid(SeExports->SeAliasAdminsSid) +
+               sizeof(ACCESS_ALLOWED_ACE) + RtlLengthSid(SeExports->SeNetworkServiceSid);
+    Dacl = ExAllocatePoolWithTag(PagedPool,
+                                 DaclSize,
+                                 DEVICE_OBJ_SECURITY_TAG);
+    if (Dacl == NULL)
+    {
+        TI_DbgPrint(MIN_TRACE, ("Failed to allocate buffer heap for a DACL\n"));
+        Status = STATUS_INSUFFICIENT_RESOURCES;
+        goto Quit;
+    }
+
+    Status = RtlCreateAcl(Dacl,
+                          DaclSize,
+                          ACL_REVISION);
+    if (!NT_SUCCESS(Status))
+    {
+        TI_DbgPrint(MIN_TRACE, ("Failed to create a DACL (0x%X)\n", Status));
+        goto Quit;
+    }
+
+    /* Setup access */
+    Status = RtlAddAccessAllowedAce(Dacl,
+                                    ACL_REVISION,
+                                    GENERIC_ALL,
+                                    SeExports->SeLocalSystemSid);
+    if (!NT_SUCCESS(Status))
+    {
+        TI_DbgPrint(MIN_TRACE, ("Failed to add access allowed ACE for System SID (0x%X)\n", Status));
+        goto Quit;
+    }
+
+    Status = RtlAddAccessAllowedAce(Dacl,
+                                    ACL_REVISION,
+                                    GENERIC_ALL,
+                                    SeExports->SeAliasAdminsSid);
+    if (!NT_SUCCESS(Status))
+    {
+        TI_DbgPrint(MIN_TRACE, ("Failed to add access allowed ACE for Admins SID (0x%X)\n", Status));
+        goto Quit;
+    }
+
+    Status = RtlAddAccessAllowedAce(Dacl,
+                                    ACL_REVISION,
+                                    GENERIC_ALL,
+                                    SeExports->SeNetworkServiceSid);
+    if (!NT_SUCCESS(Status))
+    {
+        TI_DbgPrint(MIN_TRACE, ("Failed to add access allowed ACE for Network Service SID (0x%X)\n", Status));
+        goto Quit;
+    }
+
+    /* Assign security data to SD */
+    Status = RtlSetDaclSecurityDescriptor(&AbsSD,
+                                          TRUE,
+                                          Dacl,
+                                          FALSE);
+    if (!NT_SUCCESS(Status))
+    {
+        TI_DbgPrint(MIN_TRACE, ("Failed to set DACL to security descriptor (0x%X)\n", Status));
+        goto Quit;
+    }
+
+    Status = RtlSetGroupSecurityDescriptor(&AbsSD,
+                                           SeExports->SeLocalSystemSid,
+                                           FALSE);
+    if (!NT_SUCCESS(Status))
+    {
+        TI_DbgPrint(MIN_TRACE, ("Failed to set group to security descriptor (0x%X)\n", Status));
+        goto Quit;
+    }
+
+    Status = RtlSetOwnerSecurityDescriptor(&AbsSD,
+                                           SeExports->SeAliasAdminsSid,
+                                           FALSE);
+    if (!NT_SUCCESS(Status))
+    {
+        TI_DbgPrint(MIN_TRACE, ("Failed to set owner to security descriptor (0x%X)\n", Status));
+        goto Quit;
+    }
+
+    /* Get the required buffer size for the self-relative SD */
+    Status = RtlAbsoluteToSelfRelativeSD(&AbsSD,
+                                         NULL,
+                                         &RelSDSize);
+    if (Status != STATUS_BUFFER_TOO_SMALL)
+    {
+        TI_DbgPrint(MIN_TRACE, ("Expected STATUS_BUFFER_TOO_SMALL but got something else (0x%X)\n", Status));
+        goto Quit;
+    }
+
+    RelSD = ExAllocatePoolWithTag(PagedPool,
+                                  RelSDSize,
+                                  DEVICE_OBJ_SECURITY_TAG);
+    if (RelSD == NULL)
+    {
+        TI_DbgPrint(MIN_TRACE, ("Failed to allocate buffer heap for relative SD\n"));
+        Status = STATUS_INSUFFICIENT_RESOURCES;
+        goto Quit;
+    }
+
+    /* Convert it now */
+    Status = RtlAbsoluteToSelfRelativeSD(&AbsSD,
+                                         RelSD,
+                                         &RelSDSize);
+    if (!NT_SUCCESS(Status))
+    {
+        TI_DbgPrint(MIN_TRACE, ("Failed to convert absolute SD into a relative SD (0x%X)\n", Status));
+        goto Quit;
+    }
+
+    /* Give the buffer to caller */
+    *SecurityDescriptor = RelSD;
+
+Quit:
+    if (!NT_SUCCESS(Status))
+    {
+        if (RelSD != NULL)
+        {
+            ExFreePoolWithTag(RelSD, DEVICE_OBJ_SECURITY_TAG);
+        }
+    }
+
+    if (Dacl != NULL)
+    {
+        ExFreePoolWithTag(Dacl, DEVICE_OBJ_SECURITY_TAG);
+    }
+
+    return Status;
+}
+
+static
+NTSTATUS TiSetupTcpDeviceSD(
+    _In_ PDEVICE_OBJECT DeviceObject)
+{
+    NTSTATUS Status;
+    PSECURITY_DESCRIPTOR Sd;
+    SECURITY_INFORMATION Info = OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION;
+
+    /* Obtain a security descriptor */
+    Status = TiCreateSecurityDescriptor(&Sd);
+    if (!NT_SUCCESS(Status))
+    {
+        TI_DbgPrint(MIN_TRACE, ("Failed to create a security descriptor for the device object\n"));
+        return Status;
+    }
+
+    /* Whack the new descriptor into the TCP device object */
+    Status = ObSetSecurityObjectByPointer(DeviceObject,
+                                          Info,
+                                          Sd);
+    if (!NT_SUCCESS(Status))
+    {
+        TI_DbgPrint(MIN_TRACE, ("Failed to set new security information to the device object\n"));
+    }
+
+    ExFreePoolWithTag(Sd, DEVICE_OBJ_SECURITY_TAG);
+    return Status;
+}
+
+static
+NTSTATUS TiSecurityStartup(
+    VOID)
+{
+    NTSTATUS Status;
+
+    /* Set security data for the TCP and IP device objects */
+    Status = TiSetupTcpDeviceSD(TCPDeviceObject);
+    if (!NT_SUCCESS(Status))
+    {
+        TI_DbgPrint(MIN_TRACE, ("Failed to set security data for TCP device object\n"));
+        return Status;
+    }
+
+    Status = TiSetupTcpDeviceSD(IPDeviceObject);
+    if (!NT_SUCCESS(Status))
+    {
+        TI_DbgPrint(MIN_TRACE, ("Failed to set security data for IP device object\n"));
+        return Status;
+    }
+
+    return STATUS_SUCCESS;
+}
+

 VOID NTAPI TiUnload(
  PDRIVER_OBJECT DriverObject)
@@ -761,6 +971,14 @@ DriverEntry(
        return Status;
    }

+    /* Initialize security */
+    Status = TiSecurityStartup();
+    if (!NT_SUCCESS(Status))
+    {
+        TiUnload(DriverObject);
+        return Status;
+    }
+
    /* Use direct I/O */
    IPDeviceObject->Flags    |= DO_DIRECT_IO;
    RawIPDeviceObject->Flags |= DO_DIRECT_IO;
--- a/modules/rostests/apitests/apphelp/apphelp_apitest.h
+++ b/modules/rostests/apitests/apphelp/apphelp_apitest.h
@@ -5,7 +5,6 @@
 extern "C" {
 #endif

-
 /* data.c */
 void test_create_db_imp(const WCHAR* name, int win10);
 DWORD test_get_db_size();
@@ -21,8 +20,10 @@ void silence_debug_output(void);        // Silence output if the environment var
 #define test_create_file    (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : test_create_file_imp
 #define test_create_ne      (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : test_create_ne_imp

+/* register.cpp */
+BOOL IsUserAdmin(VOID);

-static DWORD g_WinVersion;
+extern DWORD g_WinVersion;

 #define WINVER_ANY     0
 #define WINVER_WINXP   0x0501
@@ -42,7 +43,6 @@ typedef VOID* HSDB;
 typedef INT PATH_TYPE;


-
 #define SDB_MAX_SDBS 16
 #define SDB_MAX_EXES_VISTA 16
 #define SDB_MAX_LAYERS 8
@@ -50,8 +50,6 @@ typedef INT PATH_TYPE;

 #define SDBQUERYRESULT_EXPECTED_SIZE_VISTA    456

-
-
 typedef struct tagSDBQUERYRESULT_VISTA
 {
    TAGREF atrExes[SDB_MAX_EXES_VISTA];
@@ -67,7 +65,6 @@ typedef struct tagSDBQUERYRESULT_VISTA
    GUID   rgGuidDB[SDB_MAX_SDBS];
 } SDBQUERYRESULT_VISTA, *PSDBQUERYRESULT_VISTA;

-
 #define SDBQUERYRESULT_EXPECTED_SIZE_2k3    344

 #define SDB_MAX_EXES_2k3    4
@@ -86,16 +83,10 @@ typedef struct tagSDBQUERYRESULT_2k3
    GUID   rgGuidDB[SDB_MAX_SDBS];
 } SDBQUERYRESULT_2k3, *PSDBQUERYRESULT_2k3;

-
-
-
-
 C_ASSERT(sizeof(SDBQUERYRESULT_VISTA) == SDBQUERYRESULT_EXPECTED_SIZE_VISTA);
 C_ASSERT(sizeof(SDBQUERYRESULT_2k3) == SDBQUERYRESULT_EXPECTED_SIZE_2k3);


-
-
 #ifdef __cplusplus
 } // extern "C"
 #endif
--- a/modules/rostests/apitests/apphelp/data.c
+++ b/modules/rostests/apitests/apphelp/data.c
@@ -792,7 +792,7 @@ void test_create_db_imp(const WCHAR* name, int win10)
    }
 }

-static DWORD g_WinVersion;
+DWORD g_WinVersion;
 DWORD get_host_winver(void)
 {
    if (!g_WinVersion)
--- a/modules/rostests/apitests/apphelp/db.cpp
+++ b/modules/rostests/apitests/apphelp/db.cpp
@@ -1189,27 +1189,6 @@ static void test_is_testdb(PDB pdb)
    }
 }

-static BOOL IsUserAdmin()
-{
-    BOOL Result;
-    SID_IDENTIFIER_AUTHORITY NtAuthority = { SECURITY_NT_AUTHORITY };
-    PSID AdministratorsGroup;
-
-    Result = AllocateAndInitializeSid(&NtAuthority, 2,
-                                      SECURITY_BUILTIN_DOMAIN_RID,
-                                      DOMAIN_ALIAS_RID_ADMINS,
-                                      0, 0, 0, 0, 0, 0,
-                                      &AdministratorsGroup);
-    if (Result)
-    {
-        if (!CheckTokenMembership( NULL, AdministratorsGroup, &Result))
-            Result = FALSE;
-        FreeSid(AdministratorsGroup);
-    }
-
-    return Result;
-}
-

 template<typename SDBQUERYRESULT_T>
 static void check_adwExeFlags(DWORD adwExeFlags_0, SDBQUERYRESULT_T& query, const char* file, int line, size_t cur)
@@ -1599,8 +1578,6 @@ static void test_MatchApplicationsEx(void)
 }


-
-
 static void test_TagRef(void)
 {
    WCHAR tmpdir[MAX_PATH], dbpath[MAX_PATH];
--- a/modules/rostests/apitests/apphelp/register.cpp
+++ b/modules/rostests/apitests/apphelp/register.cpp
@@ -77,7 +77,8 @@ BOOL (WINAPI *pSdbRegisterDatabaseEx)(LPCWSTR pszDatabasePath, DWORD dwDatabaseT
 BOOL (WINAPI *pSdbUnregisterDatabase)(REFGUID pguidDB);


-BOOL IsUserAdmin()
+extern "C"
+BOOL IsUserAdmin(VOID)
 {
    BOOL Result;
    SID_IDENTIFIER_AUTHORITY NtAuthority = { SECURITY_NT_AUTHORITY };
@@ -90,7 +91,7 @@ BOOL IsUserAdmin()
                                      &AdministratorsGroup);
    if (Result)
    {
-        if (!CheckTokenMembership( NULL, AdministratorsGroup, &Result))
+        if (!CheckTokenMembership(NULL, AdministratorsGroup, &Result))
            Result = FALSE;
        FreeSid(AdministratorsGroup);
    }
--- a/modules/rostests/apitests/ntdll/CMakeLists.txt
+++ b/modules/rostests/apitests/ntdll/CMakeLists.txt
@@ -10,6 +10,7 @@ list(APPEND SOURCE
    load_notifications.c
    locale.c
    NtAcceptConnectPort.c
+    NtAccessCheck.c
    NtAccessCheckByType.c
    NtAccessCheckByTypeResultList.c
    NtAdjustGroupsToken.c
--- a/modules/rostests/apitests/ntdll/NtAccessCheck.c
+++ b/modules/rostests/apitests/ntdll/NtAccessCheck.c
@@ -0,0 +1,188 @@
+/*
+ * PROJECT:         ReactOS API tests
+ * LICENSE:         GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
+ * PURPOSE:         Tests for the NtAccessCheck API
+ * COPYRIGHT:       Copyright 2023 George Bișoc <george.bisoc@reactos.org>
+ */
+
+#include "precomp.h"
+
+static
+HANDLE
+GetToken(VOID)
+{
+    NTSTATUS Status;
+    HANDLE Token;
+    HANDLE DuplicatedToken;
+    OBJECT_ATTRIBUTES ObjectAttributes;
+    SECURITY_QUALITY_OF_SERVICE Sqos;
+
+    Status = NtOpenProcessToken(NtCurrentProcess(),
+                                TOKEN_QUERY | TOKEN_DUPLICATE,
+                                &Token);
+    if (!NT_SUCCESS(Status))
+    {
+        trace("Failed to get current process token (Status 0x%08lx)\n", Status);
+        return NULL;
+    }
+
+    Sqos.Length = sizeof(SECURITY_QUALITY_OF_SERVICE);
+    Sqos.ImpersonationLevel = SecurityImpersonation;
+    Sqos.ContextTrackingMode = 0;
+    Sqos.EffectiveOnly = FALSE;
+
+    InitializeObjectAttributes(&ObjectAttributes,
+                               NULL,
+                               0,
+                               NULL,
+                               NULL);
+    ObjectAttributes.SecurityQualityOfService = &Sqos;
+
+    Status = NtDuplicateToken(Token,
+                              TOKEN_QUERY | TOKEN_DUPLICATE,
+                              &ObjectAttributes,
+                              FALSE,
+                              TokenImpersonation,
+                              &DuplicatedToken);
+    if (!NT_SUCCESS(Status))
+    {
+        trace("Failed to duplicate token (Status 0x%08lx)\n", Status);
+        NtClose(Token);
+        return NULL;
+    }
+
+    return DuplicatedToken;
+}
+
+static
+VOID
+AccessCheckEmptyMappingTest(VOID)
+{
+    NTSTATUS Status;
+    NTSTATUS AccessStatus;
+    ACCESS_MASK GrantedAccess;
+    PPRIVILEGE_SET PrivilegeSet = NULL;
+    ULONG PrivilegeSetLength;
+    HANDLE Token = NULL;
+    PACL Dacl = NULL;
+    ULONG DaclSize;
+    SECURITY_DESCRIPTOR Sd;
+    PSID WorldSid = NULL;
+    static SID_IDENTIFIER_AUTHORITY WorldAuthority = {SECURITY_WORLD_SID_AUTHORITY};
+    static GENERIC_MAPPING EmptyMapping = {0, 0, 0, 0};
+
+    /* Allocate all the stuff we need */
+    PrivilegeSetLength = FIELD_OFFSET(PRIVILEGE_SET, Privilege[16]);
+    PrivilegeSet = RtlAllocateHeap(RtlGetProcessHeap(), 0, PrivilegeSetLength);
+    if (PrivilegeSet == NULL)
+    {
+        skip("Failed to allocate PrivilegeSet, skipping tests\n");
+        return;
+    }
+
+    Status = RtlAllocateAndInitializeSid(&WorldAuthority,
+                                         1,
+                                         SECURITY_WORLD_RID,
+                                         0,
+                                         0,
+                                         0,
+                                         0,
+                                         0,
+                                         0,
+                                         0,
+                                         &WorldSid);
+    if (!NT_SUCCESS(Status))
+    {
+        skip("Failed to create World SID, skipping tests\n");
+        goto Quit;
+    }
+
+    Token = GetToken();
+    if (Token == NULL)
+    {
+        skip("Failed to get token, skipping tests\n");
+        goto Quit;
+    }
+
+    Status = RtlCreateSecurityDescriptor(&Sd, SECURITY_DESCRIPTOR_REVISION);
+    if (!NT_SUCCESS(Status))
+    {
+        skip("Failed to create a security descriptor, skipping tests\n");
+        goto Quit;
+    }
+
+    DaclSize = sizeof(ACL) +
+               sizeof(ACCESS_ALLOWED_OBJECT_ACE) + RtlLengthSid(WorldSid);
+    Dacl = RtlAllocateHeap(RtlGetProcessHeap(),
+                           HEAP_ZERO_MEMORY,
+                           DaclSize);
+    if (Dacl == NULL)
+    {
+        skip("Failed to allocate memory for DACL, skipping tests\n");
+        goto Quit;
+    }
+
+    /* Setup a ACL and give full access to everyone */
+    Status = RtlCreateAcl(Dacl,
+                          DaclSize,
+                          ACL_REVISION);
+    if (!NT_SUCCESS(Status))
+    {
+        skip("Failed to create DACL, skipping tests\n");
+        goto Quit;
+    }
+
+    Status = RtlAddAccessAllowedAce(Dacl,
+                                    ACL_REVISION,
+                                    GENERIC_ALL,
+                                    WorldSid);
+    if (!NT_SUCCESS(Status))
+    {
+        skip("Failed to add allowed ACE for World SID, skipping tests\n");
+        goto Quit;
+    }
+
+    /* Setup the descriptor */
+    RtlSetGroupSecurityDescriptor(&Sd, WorldSid, FALSE);
+    RtlSetOwnerSecurityDescriptor(&Sd, WorldSid, FALSE);
+    RtlSetDaclSecurityDescriptor(&Sd, TRUE, Dacl, FALSE);
+
+    /* Do an access check with empty mapping */
+    Status = NtAccessCheck(&Sd,
+                           Token,
+                           MAXIMUM_ALLOWED,
+                           &EmptyMapping,
+                           PrivilegeSet,
+                           &PrivilegeSetLength,
+                           &GrantedAccess,
+                           &AccessStatus);
+    ok_hex(Status, STATUS_SUCCESS);
+    ok(AccessStatus == STATUS_SUCCESS, "Expected a success status but got 0x%08lx\n", AccessStatus);
+    trace("GrantedAccess == 0x%08lx\n", GrantedAccess);
+
+Quit:
+    if (Dacl)
+    {
+        RtlFreeHeap(RtlGetProcessHeap(), 0, Dacl);
+    }
+
+    if (Token)
+    {
+        NtClose(Token);
+    }
+
+    if (WorldSid)
+    {
+        RtlFreeSid(WorldSid);
+    }
+
+    if (PrivilegeSet)
+    {
+        RtlFreeHeap(RtlGetProcessHeap(), 0, PrivilegeSet);
+    }
+}
+
+START_TEST(NtAccessCheck)
+{
+    AccessCheckEmptyMappingTest();
+}
--- a/modules/rostests/apitests/ntdll/testlist.c
+++ b/modules/rostests/apitests/ntdll/testlist.c
@@ -6,6 +6,7 @@
 extern void func_LdrEnumResources(void);
 extern void func_load_notifications(void);
 extern void func_NtAcceptConnectPort(void);
+extern void func_NtAccessCheck(void);
 extern void func_NtAccessCheckByType(void);
 extern void func_NtAccessCheckByTypeResultList(void);
 extern void func_NtAdjustGroupsToken(void);
@@ -102,6 +103,7 @@ const struct test winetest_testlist[] =
    { "LdrEnumResources",               func_LdrEnumResources },
    { "load_notifications",             func_load_notifications },
    { "NtAcceptConnectPort",            func_NtAcceptConnectPort },
+    { "NtAccessCheck",                  func_NtAccessCheck },
    { "NtAccessCheckByType",            func_NtAccessCheckByType },
    { "NtAccessCheckByTypeResultList",  func_NtAccessCheckByTypeResultList },
    { "NtAdjustGroupsToken",            func_NtAdjustGroupsToken },
--- a/ntoskrnl/mm/i386/page.c
+++ b/ntoskrnl/mm/i386/page.c
@@ -637,6 +637,9 @@ MmCreateVirtualMappingUnsafeEx(
    PMMPTE PointerPte;
    MMPTE TempPte;
    ULONG_PTR Pte;
+#ifdef _M_AMD64
+    BOOLEAN LockReleased = FALSE;
+#endif

    DPRINT("MmCreateVirtualMappingUnsafe(%p, %p, %lu, %x)\n",
           Process, Address, flProtect, Page);
@@ -665,6 +668,15 @@ MmCreateVirtualMappingUnsafeEx(
        if (!MiSynchronizeSystemPde(MiAddressToPde(Address)))
            MiFillSystemPageDirectory(Address, PAGE_SIZE);
 #endif
+
+#ifdef _M_AMD64
+        /* This is a temporary hack, because we can incur a recursive page fault when accessing the PDE */
+        if (PsIdleProcess->AddressCreationLock.Owner == KeGetCurrentThread())
+        {
+            MmUnlockAddressSpace(MmGetKernelAddressSpace());
+            LockReleased = TRUE;
+        }
+#endif
    }
    else
    {
@@ -715,6 +727,15 @@ MmCreateVirtualMappingUnsafeEx(
        MiIncrementPageTableReferences(Address);
        MiUnlockProcessWorkingSetUnsafe(Process, PsGetCurrentThread());
    }
+#ifdef _M_AMD64
+    else
+    {
+        if (LockReleased)
+        {
+            MmLockAddressSpace(MmGetKernelAddressSpace());
+        }
+    }
+#endif

    return(STATUS_SUCCESS);
 }
--- a/ntoskrnl/se/accesschk.c
+++ b/ntoskrnl/se/accesschk.c
@@ -1058,6 +1058,34 @@ SepAccessCheckWorker(
        goto ReturnCommonStatus;
    }

+    /*
+     * HACK: Temporary hack that checks if the caller passed an empty
+     * generic mapping. In such cases we cannot mask out the remaining
+     * access rights without a proper mapping so the only option we
+     * can do is to check if the client is an administrator,
+     * since they are powerful users.
+     *
+     * See CORE-18576 for information.
+     */
+    if (GenericMapping->GenericRead == 0 &&
+        GenericMapping->GenericWrite == 0 &&
+        GenericMapping->GenericExecute == 0 &&
+        GenericMapping->GenericAll == 0)
+    {
+        if (SeTokenIsAdmin(Token))
+        {
+            /* Grant him access */
+            PreviouslyGrantedAccess |= RemainingAccess;
+            Status = STATUS_SUCCESS;
+            goto ReturnCommonStatus;
+        }
+
+        /* It's not an admin so bail out */
+        PreviouslyGrantedAccess = 0;
+        Status = STATUS_ACCESS_DENIED;
+        goto ReturnCommonStatus;
+    }
+
    /* Get the DACL */
    Status = RtlGetDaclSecurityDescriptor(SecurityDescriptor,
                                          &Present,
@@ -1146,7 +1174,7 @@ SepAccessCheckWorker(
            RemainingAccess &= ~(MAXIMUM_ALLOWED | AccessCheckRights.GrantedAccessRights);
            if (RemainingAccess != 0)
            {
-                DPRINT1("Failed to grant access rights. RemainingAccess = 0x%08lx  DesiredAccess = 0x%08lx\n", RemainingAccess, DesiredAccess);
+                DPRINT("Failed to grant access rights, access denied. RemainingAccess = 0x%08lx  DesiredAccess = 0x%08lx\n", RemainingAccess, DesiredAccess);
                PreviouslyGrantedAccess = 0;
                Status = STATUS_ACCESS_DENIED;
                goto ReturnCommonStatus;
@@ -1160,7 +1188,7 @@ SepAccessCheckWorker(
            }
            else
            {
-                DPRINT1("Failed to grant access rights. PreviouslyGrantedAccess == 0  DesiredAccess = %08lx\n", DesiredAccess);
+                DPRINT("Failed to grant access rights, access denied. PreviouslyGrantedAccess == 0  DesiredAccess = %08lx\n", DesiredAccess);
                Status = STATUS_ACCESS_DENIED;
            }

@@ -1189,7 +1217,7 @@ SepAccessCheckWorker(
            RemainingAccess &= ~(MAXIMUM_ALLOWED | GrantedRights);
            if (RemainingAccess != 0)
            {
-                DPRINT1("Failed to grant access rights to the whole object hierarchy list. RemainingAccess = 0x%08lx  DesiredAccess = 0x%08lx\n",
+                DPRINT("Failed to grant access rights to the whole object hierarchy list, access denied. RemainingAccess = 0x%08lx  DesiredAccess = 0x%08lx\n",
                    RemainingAccess, DesiredAccess);
                PreviouslyGrantedAccess = 0;
                Status = STATUS_ACCESS_DENIED;
@@ -1204,7 +1232,7 @@ SepAccessCheckWorker(
            }
            else
            {
-                DPRINT1("Failed to grant access rights to the whole object hierarchy list. PreviouslyGrantedAccess == 0  DesiredAccess = %08lx\n",
+                DPRINT("Failed to grant access rights to the whole object hierarchy list, access denied. PreviouslyGrantedAccess == 0  DesiredAccess = %08lx\n",
                    DesiredAccess);
                Status = STATUS_ACCESS_DENIED;
            }
@@ -1234,7 +1262,7 @@ SepAccessCheckWorker(
                    RemainingAccess = (~GrantedRights & WantedRights);
                    if (RemainingAccess != 0)
                    {
-                        DPRINT1("Failed to grant access rights at specific object at index %lu. RemainingAccess = 0x%08lx  DesiredAccess = 0x%08lx\n",
+                        DPRINT("Failed to grant access rights at specific object at index %lu, access denied. RemainingAccess = 0x%08lx  DesiredAccess = 0x%08lx\n",
                            ObjectTypeIndex, RemainingAccess, DesiredAccess);
                        AccessStatusList[ObjectTypeIndex] = STATUS_ACCESS_DENIED;
                    }
@@ -1246,7 +1274,7 @@ SepAccessCheckWorker(
                else
                {
                    /* No access is given */
-                    DPRINT1("Failed to grant access rights at specific object at index %lu. No access is given\n", ObjectTypeIndex);
+                    DPRINT("Failed to grant access rights at specific object at index %lu. No access is given\n", ObjectTypeIndex);
                    AccessStatusList[ObjectTypeIndex] = STATUS_ACCESS_DENIED;
                }

@@ -1296,7 +1324,7 @@ SepAccessCheckWorker(
        /* Fail if some rights have not been granted */
        if (AccessCheckRights.RemainingAccessRights != 0)
        {
-            DPRINT1("Failed to grant access rights. RemainingAccess = 0x%08lx  DesiredAccess = 0x%08lx\n", AccessCheckRights.RemainingAccessRights, DesiredAccess);
+            DPRINT("Failed to grant access rights, access denied. RemainingAccess = 0x%08lx  DesiredAccess = 0x%08lx\n", AccessCheckRights.RemainingAccessRights, DesiredAccess);
            PreviouslyGrantedAccess = 0;
            Status = STATUS_ACCESS_DENIED;
            goto ReturnCommonStatus;
@@ -1321,7 +1349,7 @@ SepAccessCheckWorker(

        if (!AccessIsGranted)
        {
-            DPRINT1("Failed to grant access rights to the whole object hierarchy list. DesiredAccess = 0x%08lx\n", DesiredAccess);
+            DPRINT("Failed to grant access rights to the whole object hierarchy list, access denied. DesiredAccess = 0x%08lx\n", DesiredAccess);
            PreviouslyGrantedAccess = 0;
            Status = STATUS_ACCESS_DENIED;
            goto ReturnCommonStatus;
@@ -1353,7 +1381,7 @@ SepAccessCheckWorker(
            /* Fail if some rights have not been granted */
            if (AccessCheckRights.RemainingAccessRights != 0)
            {
-                DPRINT1("Failed to grant access rights. RemainingAccess = 0x%08lx  DesiredAccess = 0x%08lx\n", AccessCheckRights.RemainingAccessRights, DesiredAccess);
+                DPRINT("Failed to grant access rights, access denied. RemainingAccess = 0x%08lx  DesiredAccess = 0x%08lx\n", AccessCheckRights.RemainingAccessRights, DesiredAccess);
                PreviouslyGrantedAccess = 0;
                Status = STATUS_ACCESS_DENIED;
                goto ReturnCommonStatus;
@@ -1382,7 +1410,7 @@ SepAccessCheckWorker(

            if (!AccessIsGranted)
            {
-                DPRINT1("Failed to grant access rights to the whole object hierarchy list. DesiredAccess = 0x%08lx\n", DesiredAccess);
+                DPRINT("Failed to grant access rights to the whole object hierarchy list, access denied. DesiredAccess = 0x%08lx\n", DesiredAccess);
                PreviouslyGrantedAccess = 0;
                Status = STATUS_ACCESS_DENIED;
                goto ReturnCommonStatus;
@@ -1396,7 +1424,7 @@ SepAccessCheckWorker(
    /* Fail if no rights have been granted */
    if (PreviouslyGrantedAccess == 0)
    {
-        DPRINT1("Failed to grant access rights. PreviouslyGrantedAccess == 0  DesiredAccess = %08lx\n", DesiredAccess);
+        DPRINT("Failed to grant access rights, access denied. PreviouslyGrantedAccess == 0  DesiredAccess = %08lx\n", DesiredAccess);
        Status = STATUS_ACCESS_DENIED;
        goto ReturnCommonStatus;
    }
--- a/ntoskrnl/se/token.c
+++ b/ntoskrnl/se/token.c
@@ -1784,12 +1784,14 @@ SepCreateSystemProcessToken(VOID)
    {
        {SeAliasAdminsSid, OwnerAttributes},
        {SeWorldSid, GroupAttributes},
-        {SeAuthenticatedUsersSid, GroupAttributes}
+        {SeAuthenticatedUsersSid, GroupAttributes},
+        {SeLocalSid, SE_GROUP_ENABLED} // HACK: Temporarily add the local group. See CORE-18250.
    };
    GroupsLength = sizeof(SID_AND_ATTRIBUTES) +
                   SeLengthSid(Groups[0].Sid) +
                   SeLengthSid(Groups[1].Sid) +
-                   SeLengthSid(Groups[2].Sid);
+                   SeLengthSid(Groups[2].Sid) +
+                   SeLengthSid(Groups[3].Sid); // HACK
    ASSERT(GroupsLength <= (sizeof(Groups) * sizeof(ULONG)));

    /* Setup the privileges */
--- a/sdk/include/ndk/ldrfuncs.h
+++ b/sdk/include/ndk/ldrfuncs.h
@@ -89,8 +89,8 @@ NTSTATUS
 NTAPI
 LdrGetProcedureAddress(
    _In_ PVOID BaseAddress,
-    _In_ PANSI_STRING Name,
-    _In_ ULONG Ordinal,
+    _In_opt_ _When_(Ordinal == 0, _Notnull_) PANSI_STRING Name,
+    _In_opt_ _When_(Name == NULL, _In_range_(>, 0)) ULONG Ordinal,
    _Out_ PVOID *ProcedureAddress
 );

--- a/sdk/include/ndk/umfuncs.h
+++ b/sdk/include/ndk/umfuncs.h
@@ -115,7 +115,7 @@ NTSTATUS
 NTAPI
 LdrGetDllHandle(
    _In_opt_ PWSTR DllPath,
-    _In_ PULONG DllCharacteristics,
+    _In_opt_ PULONG DllCharacteristics,
    _In_ PUNICODE_STRING DllName,
    _Out_ PVOID *DllHandle
 );
@@ -140,8 +140,8 @@ NTSTATUS
 NTAPI
 LdrGetProcedureAddress(
    _In_ PVOID BaseAddress,
-    _In_ PANSI_STRING Name,
-    _In_ ULONG Ordinal,
+    _In_opt_ _When_(Ordinal == 0, _Notnull_) PANSI_STRING Name,
+    _In_opt_ _When_(Name == NULL, _In_range_(>, 0)) ULONG Ordinal,
    _Out_ PVOID *ProcedureAddress
 );
Author	SHA1	Message	Date
Joachim Henze	ebf520feaf	[TASKMGR] sv-SE.rc whoops typo addendum to last commit	2023-10-17 23:59:35 +02:00
Joachim Henze	a4a6772606	[TASKMGR] sv-SE.rc Add 2 more FIXMEs	2023-10-17 23:49:03 +02:00
Joachim Henze	d531101af9	[TASKMGR] nl-NL.rc Add 2 more FIXMEs	2023-10-16 21:44:05 +02:00
Joachim Henze	33d39aab2c	[TASKMGR] hu-HU.rc Add 2 more FIXMEs	2023-10-09 03:11:20 +02:00
Joachim Henze	26b30f13ca	[TASKMGR] es-ES.rc Strip useless comments at the end of the line If you want to know how your master en-US.rc does look like today (and not 15years ago) then just compare to that!	2023-10-09 02:46:28 +02:00
Joachim Henze	e3bf9d92e5	[TASKMGR] es-ES.rc Add 2 more FIXMEs	2023-10-09 02:37:22 +02:00
Joachim Henze	e4dd1d3ed9	[TASKMGR] *.rc, make sure that warning is in all 30 langs, especially in en-US.rc which acts as a template often. We had it only in 26 of 30 rc files. That is the best solution until we can deduplicate that string.	2023-10-09 00:23:48 +02:00
Joachim Henze	b38a7a0d8f	[TASKMGR] pt-PT.rc padding was ok, but for consistency to en-US strip it; Add FIXMEs	2023-10-09 00:13:24 +02:00
Joachim Henze	ef3ba544e5	[TASKMGR] sv-SE.rc padding was ok, but for consistency to en-US strip it	2023-10-08 23:44:54 +02:00
Joachim Henze	01720da3c1	[TASKMGR] sq-AL.rc Fix a typo	2023-10-08 23:40:24 +02:00
Joachim Henze	144d7e96b6	[TASKMGR] sq-AL.rc padding was ok, but for consistency to en-US strip it	2023-10-08 23:35:11 +02:00
Joachim Henze	c75acb3f5d	[TASKMGR] sk-SK.rc padding was ok, but for consistency to en-US strip it	2023-10-08 23:23:37 +02:00
Joachim Henze	1f8aa6902f	[TASKMGR] pt-BR.rc padding was ok, but for consistency to en-US strip it	2023-10-08 23:00:48 +02:00
Joachim Henze	7f67c8e512	[TASKMGR] pl-PL.rc padding was ok, but for consistency to en-US strip it; Add FIXMEs	2023-10-08 22:51:27 +02:00
Joachim Henze	35251f53a2	[TASKMGR] no-NO.rc padding was ok, but for consistency to en-US strip it; Add FIXMEs	2023-10-08 22:35:44 +02:00
Joachim Henze	51c57e3f6a	[TASKMGR] nl-NL.rc padding was ok, but for consistency to en-US strip it	2023-10-08 22:26:29 +02:00
Joachim Henze	ff2623206b	[TASKMGR] ko-KR.rc padding was ok, but for consistency to en-US strip it	2023-10-08 22:15:29 +02:00
Joachim Henze	511d68f9ee	[TASKMGR] ja-JP.rc padding was ok, but for consistency to en-US strip it	2023-10-08 22:09:58 +02:00
Joachim Henze	bf4f696629	[TASKMGR] it-IT.rc padding was ok, but for consistency to en-US strip it	2023-10-08 22:05:09 +02:00
Joachim Henze	3a4488a3aa	[TASKMGR] hu-HU.rc padding was ok, but for consistency to en-US strip it; Add FIXMEs	2023-10-08 21:41:16 +02:00
Joachim Henze	cbef4cd30d	[TASKMGR] he-IL.rc padding was ok, but for consistency to en-US strip it	2023-10-08 21:26:26 +02:00
Joachim Henze	2486b33d60	[TASKMGR] el-GR.rc padding was ok, but for consistency to en-US strip it	2023-10-08 20:49:21 +02:00
Joachim Henze	2e1d4c3be7	[TASKMGR] da-DK.rc padding was ok, but for consistency to en-US strip it	2023-10-08 20:38:55 +02:00
Joachim Henze	88b9c10084	[TASKMGR] cs-CZ.rc padding was ok, but for consistency to en-US strip it	2023-10-08 20:07:02 +02:00
Joachim Henze	25f4246b51	[TASKMGR] bg-BG.rc padding was ok, but for consistency to en-US strip it	2023-10-08 20:03:25 +02:00
Joachim Henze	67724ae37d	[TASKMGR] en-US.rc padding, Rule out the source of the evil for other langs It was not wrong in en-US (before the translation), but it often is when other languages get translated on top of that. Stripping the padding here helps translators to touch less lines upon translations.	2023-10-08 17:47:54 +02:00
Joachim Henze	5958515460	[TASKMGR] tr-TR.rc Strip that improper padding here as well	2023-10-08 17:40:07 +02:00
Joachim Henze	c161fcef77	[TASKMGR] zh-TW.rc Strip the inconsistent padding here as well	2023-10-08 04:22:15 +02:00
Joachim Henze	19e3cfa4d2	[TASKMGR] id-ID.rc 2 accelerators in the same string is definitely wrong	2023-10-08 03:55:43 +02:00
Joachim Henze	115bd7253b	[TASKMGR] Forgot deduplicating the 16-bit-tasks-menu-entry except in de-DE where I did it already. Shrinks us further to 696.832.	2023-10-08 03:10:35 +02:00
Joachim Henze	16550b58b7	[TASKMGR] .rc Deduplicate dynamic menu strings Some of the Menu-controls are just dummies in the RC, because those controls are dynamically replaced at runtime based on which tab/propsheet is active in taskmgr. They are replaced by the IDS_MENU_ strings then. Deduplicating them has many advantages: 1.) It shrinks binary size: master taskmgr.exe RosBEWin2.2.2 GCC8.4.0dbg 708.608 -> 697.856 2.) Translators don't get lured into translating dead stuff, assuming they translated the menu properly, while in fact they did not. This is real. Happened even to me multiple times already, although I am actually aware of the design. 3.) Some of them were offsync already between the dummy and the real thing. 4.) It reduces diff between en-US and others. * Aside of that improve alignment in some languages rcs in the "Shutdown"-menu-section, * and improve a translation in de-DE, and zh-CN.	2023-10-08 02:56:39 +02:00
Joachim Henze	42c93e3cbb	[TASKMGR] .rc: Fix accelerator collisions &Priority <-> &Properties (#5758 ) We had collisions in many languages. For most languages (which are derived from en-US) we should use &Priority P&roperties We introduced the collisions during 0.4.15-dev'ing when MENUITEM ID_PROCESS_PAGE_PROPERTIES and MENUITEM ID_PROCESS_PAGE_OPENFILELOCATION were added. We verified Win7-en and Win2k3-en to behave as proposed in this PR (R for properties, P for priority). But french* Windows (I believe Hermes picture was from WinVista-fr or Win7-fr or Win10-fr maybe) does it differently. the existing de-DE also has been double-checked to exactly match MS with the accelerators in that menu.	2023-10-07 23:03:47 +00:00
Hermès Bélusca-Maïto	ce08851758	[DESK] Use MultiByteToWideChar instead of the private pSetupMultiByteToUnicode function (#5765 ) This avoids having desk.cpl depend on a private function that may change or disappear, and increase the probability of being able to use that CPL across different Windows versions. (Note: this pSetupMultiByteToUnicode was one of those whose name changed between Windows 2000 and XP+)	2023-10-07 22:17:58 +02:00
Hermès Bélusca-Maïto	e4608f7450	[DESK][SHELLBTRFS] Fix typo in WIN32_NO_STATUS	2023-10-07 22:15:12 +02:00
Hermès Bélusca-Maïto	d0b43a399f	[NETID] Simplify IsUserAdmin() helper implementation (#5763 ) Addendum to commit `8c4b0c914`. Base ourselves on pSetupIsUserAdmin() and other similar functions in our codebase. Note that what we are actually interested here, is whether the current thread runs with Administrator privileges. (As noticed by contributor 'whindsaks', "Not only is this code simpler, it now will correctly handle deny-only SIDs in the token!")	2023-10-07 21:52:36 +02:00
Timo Kreuzer	e685b25e35	[NTOS:MM/x64] Temporarily release AddressCreationLock in MmCreateVirtualMappingUnsafeEx This is a hack, because the kernel mode path can incur a recursive page fault with the AddressCreationLock acquired, which would lead to a recursive acquisition, once we do proper locking in MmAccessFault. To properly fix this the PDE must be made valid, similar to the user mode path, but that is not that simple...	2023-10-07 10:58:30 +03:00
Oleg Dubinskiy	d96b3cd45c	[KS] Fix bug in KsStreamIo (#4663 ) Properly set output buffer length in IO Stack Location of the current IRP, since it is passed to KsProbeStreamIrp when calling KsStreamIo, so it fails if the length isn't set properly. Don't set an input buffer length and the buffer itself, since it isn't passed anywhere, so setting it makes no sense. Moreover, MSDN says that for IOCTL_KS_READ/WRITE_STREAM, only output buffer (and its length) is needed to be set, but not an input one. So it indeed is more correct. It fixes buffer overflow in KsProbeStreamIrp when attempting to perform the streaming via KsStreamIo. I discovered this bug during my audio refactoring from PR #4660.	2023-10-06 12:36:09 +02:00
Hermès Bélusca-Maïto	2a5fd78f1b	[APPHELP_APITEST] Fix build, addendum to commit `a8755711b`	2023-10-05 21:32:38 +02:00
Hermès Bélusca-Maïto	a8755711b9	[APPHELP_APITEST] Deduplicate the IsUserAdmin() helper.	2023-10-05 20:58:57 +02:00
Hermès Bélusca-Maïto	f1cff6ef27	[DESK] Remove deprecated code. This mostly reverts commit `221f21c62` (r29328), that was a hack for building with MSVC. We can nowadays correctly link with the shell32 SHCreatePropSheetExtArrayEx() export.	2023-10-05 20:58:28 +02:00
Katayama Hirofumi MZ	1a90009bb9	[MSPAINT] Update scroll info on loading file (#5761 ) The scroll info was not updated when the file is loading. - Rename CCanvasWindow::Update as CCanvasWindow::updateScrollInfo. - Update scroll info on ImageModel::NotifyImageChanged. - Improve ImageModel::ClearHistory. CORE-19094	2023-10-05 20:01:41 +09:00
Katayama Hirofumi MZ	3579ea7888	[MSPAINT] Fix assertion failure on text tool (#5762 ) Kill the assertion failure on choosing text tool. Check whether textEditWindow is not null by using IsWindowVisible. CORE-19094	2023-10-05 19:51:36 +09:00
George Bișoc	d72025649b	[NTOS:SE] Mute the access denied DPRINTs They can be spammy. Also clarify these debug prints, because some people think that "failed to grant access rights" means there's something wrong in the core access check functions.	2023-10-04 18:04:30 +02:00
George Bișoc	09bfd96f3b	[NTOS:SE] HACK: Temporarily add the Local group SID to the system token Temporarily add the local group to the system token so that Virtualbox GA services can properly set up network drives for shared folders. What happens is that a security descriptor has a DACL with only one ACE that grants access to Local SID (presumably coming from Vbox?) but the client token is that of the service which is a SYSTEM token. Perhaps we are not impersonating the right user or whatever else. This is only a temporary placebo, until a proper solution is found. CORE-18250	2023-10-04 18:04:30 +02:00
George Bișoc	fefb1b7745	[NTDLL_APITEST] Write NtAccessCheck testcase that tests for empty generic mapping scenario See b79aadd50bb7d5d6f08532284941c0334514c477 for further information.	2023-10-04 18:04:29 +02:00
George Bișoc	4b4638dc55	[NTOS:SE] HACK: Temporarily grant access to the client if empty generic mapping was passed Certain apps such as AIM installer passes an empty generic mapping (this can be understood with their generic masks set to 0) and our code tries to map the access right from an ACE with the mapping provided by AccessCheck. This can lead to a bug where we would not be able to decode the generic right from an ACE as we need a proper generic mapping in order to do so. A mask right that is not decoded it cannot be used to mask out the remaining rights, further resulting into a denied access right. What Windows does instead is they are mapping the ACE's rights in another place, presumably when setting security data to an object, and they are using the generic mapping passed by the kernel. What we can do for the time being is to temporarily grant access to the client, but only if they are an administrator. CORE-18576	2023-10-04 18:04:29 +02:00
George Bișoc	95c104f29a	[TCPIP] Setup a security descriptor for the IP and TCP device objects Grant access to such objects to system, admins and network services.	2023-10-04 18:04:17 +02:00
Ratin Gao	be5c889cdf	[NTDLL:LDR] SAL improvements and fixes - Convert some notations to SAL2 - "Name" parameter in LdrGetProcedureAddress/LdrpGetProcedureAddress should be optional - "DllCharacteristics" parameter in LdrGetDllHandle should be optional	2023-10-04 12:26:18 +03:00