diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp
index 4d4f22196a8..3f1dc1d3c26 100644
--- a/base/applications/rapps/gui.cpp
+++ b/base/applications/rapps/gui.cpp
@@ -1,17 +1,13 @@
 /*
  * PROJECT:     ReactOS Applications Manager
  * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
- * FILE:        base/applications/rapps/gui.cpp
  * PURPOSE:     GUI classes for RAPPS
- * COPYRIGHT:   Copyright 2015 David Quintana           (gigaherz@gmail.com)
- *              Copyright 2017 Alexander Shaposhnikov   (sanchaez@reactos.org)
+ * COPYRIGHT:   Copyright 2015 David Quintana (gigaherz@gmail.com)
+ *              Copyright 2017 Alexander Shaposhnikov (sanchaez@reactos.org)
  */
 #include "rapps.h"
-
-#include "rapps.h"
 #include "rosui.h"
 #include "crichedit.h"
-
 #include <shlobj_undoc.h>
 #include <shlguid_undoc.h>
 
@@ -214,7 +210,6 @@ class CMainToolbar :
     WCHAR szInstallBtn[MAX_STR_LEN];
     WCHAR szUninstallBtn[MAX_STR_LEN];
     WCHAR szModifyBtn[MAX_STR_LEN];
-    WCHAR szSelectAll[MAX_STR_LEN];
 
     VOID AddImageToImageList(HIMAGELIST hImageList, UINT ImageIndex)
     {
@@ -252,7 +247,6 @@ class CMainToolbar :
         AddImageToImageList(hImageList, IDI_INSTALL);
         AddImageToImageList(hImageList, IDI_UNINSTALL);
         AddImageToImageList(hImageList, IDI_MODIFY);
-        AddImageToImageList(hImageList, IDI_CHECK_ALL);
         AddImageToImageList(hImageList, IDI_REFRESH);
         AddImageToImageList(hImageList, IDI_UPDATE_DB);
         AddImageToImageList(hImageList, IDI_SETTINGS);
@@ -310,19 +304,17 @@ public:
             {  0, ID_INSTALL,   TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, (INT_PTR) szInstallBtn      },
             {  1, ID_UNINSTALL, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, (INT_PTR) szUninstallBtn    },
             {  2, ID_MODIFY,    TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, (INT_PTR) szModifyBtn       },
-            {  3, ID_CHECK_ALL, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, (INT_PTR) szSelectAll       },
             { -1, 0,            TBSTATE_ENABLED, BTNS_SEP,                    { 0 }, 0, 0                           },
-            {  4, ID_REFRESH,   TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0                           },
-            {  5, ID_RESETDB,   TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0                           },
+            {  3, ID_REFRESH,   TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0                           },
+            {  4, ID_RESETDB,   TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0                           },
             { -1, 0,            TBSTATE_ENABLED, BTNS_SEP,                    { 0 }, 0, 0                           },
-            {  6, ID_SETTINGS,  TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0                           },
-            {  7, ID_EXIT,      TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0                           },
+            {  5, ID_SETTINGS,  TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0                           },
+            {  6, ID_EXIT,      TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0                           },
         };
 
-        LoadStringW(hInst, IDS_INSTALL, szInstallBtn, _countof(szInstallBtn));
-        LoadStringW(hInst, IDS_UNINSTALL, szUninstallBtn, _countof(szUninstallBtn));
-        LoadStringW(hInst, IDS_MODIFY, szModifyBtn, _countof(szModifyBtn));
-        LoadStringW(hInst, IDS_SELECT_ALL, szSelectAll, _countof(szSelectAll));
+        LoadStringW(hInst, IDS_TOOLTIP_INSTALL, szInstallBtn, _countof(szInstallBtn));
+        LoadStringW(hInst, IDS_TOOLTIP_UNINSTALL, szUninstallBtn, _countof(szUninstallBtn));
+        LoadStringW(hInst, IDS_TOOLTIP_MODIFY, szModifyBtn, _countof(szModifyBtn));
 
         m_hWnd = CreateWindowExW(0, TOOLBARCLASSNAMEW, NULL,
                                  WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | TBSTYLE_LIST,
@@ -387,35 +379,16 @@ class CAppsListView :
         INT iSubItem;
     };
 
-    BOOL bHasAllChecked;
     BOOL bIsAscending;
-    BOOL bHasCheckboxes;
-
     INT nLastHeaderID;
 
 public:
     CAppsListView() :
-        bHasAllChecked(FALSE),
         bIsAscending(TRUE),
-        bHasCheckboxes(FALSE),
         nLastHeaderID(-1)
     {
     }
 
-    VOID SetCheckboxesVisible(BOOL bIsVisible)
-    {
-        if (bIsVisible)
-        {
-            SetExtendedListViewStyle(LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT);
-        }
-        else
-        {
-            SetExtendedListViewStyle(LVS_EX_FULLROWSELECT);
-        }
-
-        bHasCheckboxes = bIsVisible;
-    }
-
     VOID ColumnClick(LPNMLISTVIEW pnmv)
     {
         HWND hHeader;
@@ -549,80 +522,9 @@ public:
         HMENU menu = GetSubMenu(LoadMenuW(hInst, MAKEINTRESOURCEW(IDR_APPLICATIONMENU)), 0);
 
         HWND hwnd = CListView::Create(hwndParent, r, NULL, style, WS_EX_CLIENTEDGE, menu);
-
-        if (hwnd)
-        {
-            SetCheckboxesVisible(FALSE);
-        }
-
         return hwnd;
     }
 
-    BOOL GetCheckState(INT item)
-    {
-        return (BOOL) (GetItemState(item, LVIS_STATEIMAGEMASK) >> 12) - 1;
-    }
-
-    VOID SetCheckState(INT item, BOOL fCheck)
-    {
-        if (bHasCheckboxes)
-        {
-            SetItemState(item, INDEXTOSTATEIMAGEMASK((fCheck) ? 2 : 1), LVIS_STATEIMAGEMASK);
-            SetSelected(item, fCheck);
-        }
-    }
-
-    VOID SetSelected(INT item, BOOL value)
-    {
-        if (item < 0)
-        {
-            for (INT i = 0; i >= 0; i = GetNextItem(i, LVNI_ALL))
-            {
-                CAvailableApplicationInfo* pAppInfo = (CAvailableApplicationInfo*) GetItemData(i);
-                if (pAppInfo)
-                {
-                    pAppInfo->m_IsSelected = value;
-                }
-            }
-        }
-        else
-        {
-            CAvailableApplicationInfo* pAppInfo = (CAvailableApplicationInfo*) GetItemData(item);
-            if (pAppInfo)
-            {
-                pAppInfo->m_IsSelected = value;
-            }
-        }
-    }
-
-    VOID CheckAll()
-    {
-        if (bHasCheckboxes)
-        {
-            bHasAllChecked = !bHasAllChecked;
-            SetCheckState(-1, bHasAllChecked);
-        }
-    }
-
-    ATL::CSimpleArray<CAvailableApplicationInfo> GetCheckedItems()
-    {
-        if (!bHasCheckboxes)
-        {
-            return ATL::CSimpleArray<CAvailableApplicationInfo>();
-        }
-
-        ATL::CSimpleArray<CAvailableApplicationInfo> list;
-        for (INT i = 0; i >= 0; i = GetNextItem(i, LVNI_ALL))
-        {
-            if (GetCheckState(i) != FALSE)
-            {
-                CAvailableApplicationInfo* pAppInfo = (CAvailableApplicationInfo*) GetItemData(i);
-                list.Add(*pAppInfo);
-            }
-        }
-        return list;
-    }
-
     CAvailableApplicationInfo* GetSelectedData()
     {
         INT item = GetSelectionMark();
@@ -767,9 +669,6 @@ private:
 
         szText.LoadStringW(IDS_APP_DESCRIPTION);
         m_ListView->AddColumn(3, szText, 300, LVCFMT_LEFT);
-
-        // Unnesesary since the list updates on every TreeView selection
-        // UpdateApplicationsList(ENUM_ALL_COMPONENTS);
     }
 
     HTREEITEM AddCategory(HTREEITEM hRootItem, UINT TextIndex, UINT IconIndex)
@@ -785,8 +684,6 @@ private:
         AddCategory(hRootItemInstalled, IDS_APPLICATIONS, IDI_APPS);
         AddCategory(hRootItemInstalled, IDS_UPDATES, IDI_APPUPD);
 
-        AddCategory(TVI_ROOT, IDS_SELECTEDFORINST, IDI_SELECTEDFORINST);
-
         hRootItemAvailable = AddCategory(TVI_ROOT, IDS_AVAILABLEFORINST, IDI_CATEGORY);
         AddCategory(hRootItemAvailable, IDS_CAT_AUDIO, IDI_CAT_AUDIO);
         AddCategory(hRootItemAvailable, IDS_CAT_VIDEO, IDI_CAT_VIDEO);
@@ -1050,7 +947,7 @@ private:
 
         case WM_NOTIFY:
         {
-            LPNMHDR data = (LPNMHDR) lParam;
+            LPNMHDR data = (LPNMHDR)lParam;
 
             switch (data->code)
             {
@@ -1135,10 +1032,6 @@ private:
                     case IDS_CAT_VIDEO:
                         UpdateApplicationsList(ENUM_CAT_VIDEO);
                         break;
-
-                    case IDS_SELECTEDFORINST:
-                        UpdateApplicationsList(ENUM_CAT_SELECTED);
-                        break;
                     }
                 }
 
@@ -1208,27 +1101,6 @@ private:
                         if (IsAvailableEnum(SelectedEnumType))
                             CAvailableAppView::ShowAvailableAppInfo(ItemIndex);
                     }
-                    /* Check if the item is checked */
-                    if ((pnic->uNewState & LVIS_STATEIMAGEMASK) && !bUpdating)
-                    {
-                        BOOL checked = m_ListView->GetCheckState(pnic->iItem);
-                        /* FIXME: HAX!
-                        - preventing decremention below zero as a safeguard for ReactOS
-                          In ReactOS this action is triggered whenever user changes *selection*, but should be only when *checkbox* state toggled
-                          Maybe LVIS_STATEIMAGEMASK is set incorrectly
-                        */
-                        nSelectedApps +=
-                            (checked)
-                            ? 1
-                            : ((nSelectedApps > 0)
-                               ? -1
-                               : 0);
-
-                        /* Update item's selection status */
-                        m_ListView->SetSelected(pnic->iItem, checked);
-
-                        UpdateStatusBarText();
-                    }
                 }
             }
             break;
@@ -1289,7 +1161,7 @@ private:
 
         case WM_SIZING:
         {
-            LPRECT pRect = (LPRECT) lParam;
+            LPRECT pRect = (LPRECT)lParam;
 
             if (pRect->right - pRect->left < 565)
                 pRect->right = pRect->left + 565;
@@ -1469,6 +1341,10 @@ private:
             PostMessageW(WM_CLOSE, 0, 0);
             break;
 
+        case ID_SEARCH:
+            ::SetFocus(m_SearchBar->m_hWnd);
+            break;
+
         case ID_INSTALL:
             if (IsAvailableEnum(SelectedEnumType))
             {
@@ -1481,7 +1357,6 @@ private:
                 {
                     UpdateApplicationsList(-1);
                 }
-
             }
             break;
 
@@ -1515,10 +1390,6 @@ private:
         case ID_ABOUT:
             ShowAboutDlg();
             break;
-
-        case ID_CHECK_ALL:
-            m_ListView->CheckAll();
-            break;
         }
     }
 
@@ -1613,7 +1484,6 @@ private:
 
         Index = ListViewAddItem(Info->m_Category, Index, Info->m_szName.GetString(), (LPARAM) Info);
         ListView_SetImageList(hListView, hImageListView, LVSIL_SMALL);
-
         ListView_SetItemText(hListView, Index, 1, const_cast<LPWSTR>(Info->m_szVersion.GetString()));
         ListView_SetItemText(hListView, Index, 2, const_cast<LPWSTR>(Info->m_szDesc.GetString()));
         ListView_SetCheckState(hListView, Index, Info->m_IsSelected);
@@ -1627,7 +1497,7 @@ private:
         {
             ATL::CStringW szBuffer;
 
-            szBuffer.Format(IDS_APPS_COUNT, m_ListView->GetItemCount(), nSelectedApps);
+            szBuffer.Format(IDS_APPS_COUNT, m_ListView->GetItemCount());
             m_StatusBar->SetText(szBuffer);
         }
     }
@@ -1668,11 +1538,6 @@ private:
 
         if (IsInstalledEnum(EnumType))
         {
-            if (!bWasInInstalled)
-            {
-                m_ListView->SetCheckboxesVisible(FALSE);
-            }
-
             HICON hIcon = (HICON) LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN));
             ImageList_AddIcon(hImageListView, hIcon);
             DestroyIcon(hIcon);
@@ -1683,11 +1548,6 @@ private:
         }
         else if (IsAvailableEnum(EnumType))
         {
-            if (bWasInInstalled)
-            {
-                m_ListView->SetCheckboxesVisible(TRUE);
-            }
-
             // Enum available applications
             m_AvailableApps.Enum(EnumType, s_EnumAvailableAppProc);
         }
diff --git a/base/applications/rapps/include/resource.h b/base/applications/rapps/include/resource.h
index 3f19c980fba..66e1aa62c83 100644
--- a/base/applications/rapps/include/resource.h
+++ b/base/applications/rapps/include/resource.h
@@ -12,8 +12,6 @@
 #define IDI_APPUPD               18
 #define IDI_CATEGORY             19
 #define IDI_UPDATE_DB            20
-#define IDI_CHECK_ALL            21
-#define IDI_SELECTEDFORINST      22
 
 /* Icons for categories */
 #define IDI_CAT_AUDIO            50
@@ -78,13 +76,11 @@
 #define ID_REGREMOVE             560
 #define ID_RESETDB               561
 #define ID_CHECK_ALL             562
+#define ID_SEARCH                563
 
 /* Strings */
 #define IDS_APPTITLE             100
 #define IDS_SEARCH_TEXT          101
-#define IDS_INSTALL              102
-#define IDS_UNINSTALL            103
-#define IDS_MODIFY               104
 #define IDS_APPS_COUNT           105
 #define IDS_WELCOME_TITLE        106
 #define IDS_WELCOME_TEXT         107
@@ -105,10 +101,7 @@
 #define IDS_INTEG_CHECK_FAIL     123
 #define IDS_INTERRUPTED_DOWNLOAD 124
 #define IDS_UNABLE_TO_WRITE      125
-#define IDS_SELECT_ALL           126
-#define IDS_INSTALL_SELECTED     127
 #define IDS_UNABLE_TO_INSTALL    128
-#define IDS_SELECTEDFORINST      129
 #define IDS_MISMATCH_CERT_INFO   130
 #define IDS_APP_AUTHORS          132
 
diff --git a/base/applications/rapps/lang/bg-BG.rc b/base/applications/rapps/lang/bg-BG.rc
index 87b90f3fedd..63ef436ea97 100644
--- a/base/applications/rapps/lang/bg-BG.rc
+++ b/base/applications/rapps/lang/bg-BG.rc
@@ -1,7 +1,3 @@
-/* Превод на Български/ Bulgarian translation */
-/* https://reactos.org/wiki/Bulgarian_translation */
-/* LOCATION: base/applications/rapps/lang */
-
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
 IDR_MAINMENU MENU
@@ -95,7 +91,7 @@ BEGIN
 END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
-STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
+STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE
 CAPTION "Сваляне %ls…"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -179,10 +175,7 @@ BEGIN
     IDS_APPTITLE "Управителят за приложения на РеактОС"
     IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Търсене"
-    IDS_INSTALL "Слагане"
-    IDS_UNINSTALL "Махане"
-    IDS_MODIFY "Промяна"
-    IDS_APPS_COUNT "Брой приложения: %d; Selected: %d"
+    IDS_APPS_COUNT "Брой приложения: %d"
     IDS_WELCOME_TITLE "Управителят на приложенията на РеактОС ви приветства"
     IDS_WELCOME_TEXT "Изберете раздел от лявата страна, след което изберете приложение за слагане или премахване.\nСтраницата на РеактОС: "
     IDS_WELCOME_URL "https://reactos.org"
@@ -203,9 +196,6 @@ BEGIN
     IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."
-    IDS_SELECT_ALL "Select/Deselect All"
-    IDS_INSTALL_SELECTED "Install Selected"
-    IDS_SELECTEDFORINST "Selected for installation"
     IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?"
 END
 
diff --git a/base/applications/rapps/lang/cs-CZ.rc b/base/applications/rapps/lang/cs-CZ.rc
index e3c440ce075..854d658f064 100644
--- a/base/applications/rapps/lang/cs-CZ.rc
+++ b/base/applications/rapps/lang/cs-CZ.rc
@@ -1,6 +1,5 @@
-/* FILE:       applications/rapps/lang/cs-CZ.rc
- * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com)
- * UPDATED:    2014-04-20
+/*
+ * TRANSLATOR: 2014 Radek Liska aka Black_Fox <radekliska@gmail.com>
  */
 
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
@@ -96,7 +95,7 @@ BEGIN
 END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
-STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
+STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE
 CAPTION "Stahování %ls…"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -180,10 +179,7 @@ BEGIN
     IDS_APPTITLE "ReactOS Správce aplikací"
     IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Hledat…"
-    IDS_INSTALL "Instalovat"
-    IDS_UNINSTALL "Odinstalovat"
-    IDS_MODIFY "Změnit"
-    IDS_APPS_COUNT "Počet aplikací: %d; Selected: %d"
+    IDS_APPS_COUNT "Počet aplikací: %d"
     IDS_WELCOME_TITLE "Vítejte v ReactOS Správci aplikací!\n\n"
     IDS_WELCOME_TEXT "Na levé straně zvolte kategorii, pak vpravo zvolte aplikaci, která bude nainstalována nebo odinstalována.\nWebová stránka ReactOS: "
     IDS_WELCOME_URL "https://reactos.org"
@@ -204,9 +200,6 @@ BEGIN
     IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."
-    IDS_SELECT_ALL "Select/Deselect All"
-    IDS_INSTALL_SELECTED "Install Selected"
-    IDS_SELECTEDFORINST "Selected for installation"
     IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?"
 END
 
diff --git a/base/applications/rapps/lang/de-DE.rc b/base/applications/rapps/lang/de-DE.rc
index d17e1a2de4e..bcf1a689085 100644
--- a/base/applications/rapps/lang/de-DE.rc
+++ b/base/applications/rapps/lang/de-DE.rc
@@ -91,7 +91,7 @@ BEGIN
 END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
-STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
+STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE
 CAPTION "Download von %ls…"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -175,10 +175,7 @@ BEGIN
     IDS_APPTITLE "ReactOS-Anwendungsmanager"
     IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Suche…"
-    IDS_INSTALL "Installieren"
-    IDS_UNINSTALL "Deinstallieren"
-    IDS_MODIFY "Ändern"
-    IDS_APPS_COUNT "Anzahl der Anwendungen: %d, ausgewählt: %d"
+    IDS_APPS_COUNT "Anzahl der Anwendungen: %d"
     IDS_WELCOME_TITLE "Willkommen im ReactOS-Anwendungsmanager!\n\n"
     IDS_WELCOME_TEXT "Wählen Sie links eine Kategorie und dann eine Anwendung um sie zu installieren oder zu deinstallieren.\nReactOS-Webseite: "
     IDS_WELCOME_URL "https://reactos.org"
@@ -190,19 +187,16 @@ BEGIN
     IDS_CHOOSE_FOLDER_ERROR "Sie haben ein nicht existierendes Verzeichnis angegeben! Neu anlegen?"
     IDS_APP_REG_REMOVE "Sind Sie sich sicher, dass Sie die Daten dieses Programms aus der Registry entfernen möchten?"
     IDS_INFORMATION "Informationen"
-    IDS_UNABLE_TO_DOWNLOAD "Paket konnte nicht geladen werden! Addresse wurde nicht gefunden!"
+    IDS_UNABLE_TO_DOWNLOAD "Paket konnte nicht geladen werden! Adresse wurde nicht gefunden!"
     IDS_UNABLE_TO_DOWNLOAD2 "Paket konnte nicht geladen werden! Prüfen Sie Ihre Internetverbindung!"
     IDS_UNABLE_TO_REMOVE "Konnte die Daten nicht aus der Registry löschen!"
     IDS_UNABLE_TO_INSTALL "Paket konnte nicht installiert werden!"
-    IDS_UNABLE_TO_QUERY_CERT "Unable to retrieve certificate info.\n\nDo you want to continue anyway?"
+    IDS_UNABLE_TO_QUERY_CERT "Zertifikatsinformationen können nicht abgerufen werden.\n\nMöchten Sie trotzdem fortfahren?"
     IDS_INTEG_CHECK_TITLE "Integritätsprüfung…"
     IDS_INTEG_CHECK_FAIL "Das Paket hat die Integritätsprüfung nicht bestanden. Mögliche Ursachen sind Übertragungsfehler, Datenbankfehler oder Manipulation durch einen Angreifer. Sie sollten die Software nicht ausführen."
     IDS_INTERRUPTED_DOWNLOAD "Übertragung unterbrochen. Prüfen Sie Ihre Internetverbindung!"
     IDS_UNABLE_TO_WRITE "Schreibfehler. Prüfen Sie die Kapazität des Datenträgers!"
-    IDS_SELECT_ALL "Alle/Keine"
-    IDS_INSTALL_SELECTED "Ausgewählte Installieren"
-    IDS_SELECTEDFORINST "Zur Installation ausgewählt"
-    IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?"
+    IDS_MISMATCH_CERT_INFO "Das verwendete Zertifikat ist unbekannt:\nTitel: %s\nAussteller: %s\nMöchten Sie trotzdem fortfahren?"
 END
 
 STRINGTABLE
diff --git a/base/applications/rapps/lang/en-US.rc b/base/applications/rapps/lang/en-US.rc
index 0ba927f8f62..23b414d0364 100644
--- a/base/applications/rapps/lang/en-US.rc
+++ b/base/applications/rapps/lang/en-US.rc
@@ -90,7 +90,7 @@ BEGIN
     PUSHBUTTON "Cancel", IDCANCEL, 150, 78, 60, 14
 END
 
-IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220
+IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE
 CAPTION "Downloading %ls…"
 FONT 8, "MS Shell Dlg"
@@ -175,10 +175,7 @@ BEGIN
     IDS_APPTITLE "ReactOS Applications Manager"
     IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Search…"
-    IDS_INSTALL "Install"
-    IDS_UNINSTALL "Uninstall"
-    IDS_MODIFY "Modify"
-    IDS_APPS_COUNT "Applications count: %d; Selected: %d"
+    IDS_APPS_COUNT "Applications count: %d"
     IDS_WELCOME_TITLE "Welcome to ReactOS Applications Manager!\n\n"
     IDS_WELCOME_TEXT "Choose a category on the left, then choose an application to install or uninstall.\nReactOS Web Site: "
     IDS_WELCOME_URL "https://reactos.org"
@@ -199,9 +196,6 @@ BEGIN
     IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."
-    IDS_SELECT_ALL "Select/Deselect All"
-    IDS_INSTALL_SELECTED "Install Selected"
-    IDS_SELECTEDFORINST "Selected for installation"
     IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?"
 END
 
diff --git a/base/applications/rapps/lang/es-ES.rc b/base/applications/rapps/lang/es-ES.rc
index a211cbb4ec5..fbf6ccc29d5 100644
--- a/base/applications/rapps/lang/es-ES.rc
+++ b/base/applications/rapps/lang/es-ES.rc
@@ -1,5 +1,5 @@
-/* Spanish Language resource file.
- * Translated by: ?? and Ismael Ferreras Morezuelas (Swyter) <2014-11-07> */
+/*
+ * TRANSLATOR: 2014 Ismael Ferreras Morezuelas (Swyter) */
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
@@ -94,12 +94,12 @@ BEGIN
 END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
-STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
+STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE
 CAPTION "Descargando %ls…"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12
-    EDITTEXT IDC_DOWNLOAD_STATUS, 10, 28, 200, 22, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_DISABLED | NOT WS_BORDER, 0
+    EDITTEXT IDC_DOWNLOAD_STATUS, 10, 28, 200, 22, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_DISABLED | NOT WS_BORDER
     PUSHBUTTON "Cancelar", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP
 END
 
@@ -178,10 +178,7 @@ BEGIN
     IDS_APPTITLE "Administrador de aplicaciones de ReactOS"
     IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Buscar…"
-    IDS_INSTALL "Instalar"
-    IDS_UNINSTALL "Desinstalar"
-    IDS_MODIFY "Modificar"
-    IDS_APPS_COUNT "Número de aplicaciones: %d; Selected: %d"
+    IDS_APPS_COUNT "Nº de aplicaciones: %d"
     IDS_WELCOME_TITLE "Bienvenido al Administrador de aplicaciones de ReactOS.\n\n"
     IDS_WELCOME_TEXT "Seleccione una categoría a la izquierda, para más tarde seleccionar la aplicación a instalar o desinstalar.\nWeb de ReactOS: "
     IDS_WELCOME_URL "https://reactos.org"
@@ -202,9 +199,6 @@ BEGIN
     IDS_INTEG_CHECK_FAIL "El paquete no ha pasado la comprobación de integridad, puede haber sido alterado o estar corrupto. No se recomienda ejecutarlo."
     IDS_INTERRUPTED_DOWNLOAD "Se ha interrumpido la descarga por un error de red. Comprueba la conexión a Internet."
     IDS_UNABLE_TO_WRITE "No se ha podido escribir en el disco duro, es posible que no quede espacio libre."
-    IDS_SELECT_ALL "Select/Deselect All"
-    IDS_INSTALL_SELECTED "Install Selected"
-    IDS_SELECTEDFORINST "Selected for installation"
     IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?"
 END
 
diff --git a/base/applications/rapps/lang/fr-FR.rc b/base/applications/rapps/lang/fr-FR.rc
index 3e71f0344f1..bf09d744fef 100644
--- a/base/applications/rapps/lang/fr-FR.rc
+++ b/base/applications/rapps/lang/fr-FR.rc
@@ -91,7 +91,7 @@ BEGIN
 END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
-STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
+STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE
 CAPTION "Téléchargement %ls…"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -175,10 +175,7 @@ BEGIN
     IDS_APPTITLE "ReactOS Applications Manager"
     IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Chercher…"
-    IDS_INSTALL "Installer"
-    IDS_UNINSTALL "Désinstaller"
-    IDS_MODIFY "Modifier"
-    IDS_APPS_COUNT "Nombre d'applications : %d ; Sélectionnées : %d"
+    IDS_APPS_COUNT "Nombre d'applications : %d"
     IDS_WELCOME_TITLE "Bienvenue dans ReactOS Applications Manager !\n\n"
     IDS_WELCOME_TEXT "Choisissez une catégorie à gauche, ensuite choisissez une application à installer ou désinstaller.\nSite internet de ReactOS : "
     IDS_WELCOME_URL "https://reactos.org"
@@ -199,9 +196,6 @@ BEGIN
     IDS_INTEG_CHECK_FAIL "Le contrôle d'intégrité du paquet a échoué, il se peut qu'il ait été corrompu ou altéré au cours du téléchargement. L'exécution du programme n'est pas recommandée."
     IDS_INTERRUPTED_DOWNLOAD "Le téléchargement a été interrompu. Vérifiez votre connexion à Internet."
     IDS_UNABLE_TO_WRITE "Impossible d'écrire sur le disque. Votre disque pourrait être plein."
-    IDS_SELECT_ALL "Sélectionner/Désélectionner tout"
-    IDS_INSTALL_SELECTED "Installer la sélection"
-    IDS_SELECTEDFORINST "Sélectionnées pour installation"
     IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?"
 END
 
diff --git a/base/applications/rapps/lang/he-IL.rc b/base/applications/rapps/lang/he-IL.rc
index ee73ace5bbd..0bb71d39466 100644
--- a/base/applications/rapps/lang/he-IL.rc
+++ b/base/applications/rapps/lang/he-IL.rc
@@ -1,4 +1,4 @@
-/* Translated by Baruch Rutman */
+/* TRANSLATOR: Baruch Rutman */
 
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 
@@ -33,8 +33,8 @@ IDR_LINKMENU MENU
 BEGIN
     POPUP "popup"
     BEGIN
-        MENUITEM "פתיחת הקישור בדפדפן", ID_OPEN_LINK
-        MENUITEM "העתקת הקישור", ID_COPY_LINK
+        MENUITEM "פתח קישור בדפדפן", ID_OPEN_LINK
+        MENUITEM "העתק קישור", ID_COPY_LINK
     END
 END
 
@@ -95,7 +95,7 @@ BEGIN
 END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
-STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
+STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE
 EXSTYLE WS_EX_LAYOUTRTL
 CAPTION "הורדה %ls…"
 FONT 8, "MS Shell Dlg"
@@ -128,7 +128,7 @@ BEGIN
     IDS_INFO_VERSION "\nגרסה: "
     IDS_INFO_DESCRIPTION "\nתאור: "
     IDS_INFO_PUBLISHER "\nמפרסם: "
-    IDS_INFO_HELPLINK "\nקקישור תמיכה: "
+    IDS_INFO_HELPLINK "\nקישור תמיכה: "
     IDS_INFO_HELPPHONE "\nטלפון תמיכה: "
     IDS_INFO_README "\nקרא אותי: "
     IDS_INFO_REGOWNER "\nבעלים רשומים: "
@@ -158,7 +158,7 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_CAT_AUDIO "צלילים"
+    IDS_CAT_AUDIO "שמע"
     IDS_CAT_DEVEL "פיתוח"
     IDS_CAT_DRIVERS "מנהלי התקנים"
     IDS_CAT_EDU "בידור"
@@ -169,7 +169,7 @@ BEGIN
     IDS_CAT_INTERNET "אינטרנט ורשת"
     IDS_CAT_LIBS "ספריות"
     IDS_CAT_OFFICE "משרד"
-    IDS_CAT_OTHER "אחרים"
+    IDS_CAT_OTHER "אחר"
     IDS_CAT_SCIENCE "מדע"
     IDS_CAT_TOOLS "כלים"
     IDS_CAT_VIDEO "וידאו"
@@ -180,10 +180,7 @@ BEGIN
     IDS_APPTITLE "מנהל היישומים של ReactOS"
     IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "חפש…"
-    IDS_INSTALL "התקנה"
-    IDS_UNINSTALL "הסרה"
-    IDS_MODIFY "שינוי"
-    IDS_APPS_COUNT "ספירת יישומים: %d; Selected: %d"
+    IDS_APPS_COUNT "ספירת יישומים: %d"
     IDS_WELCOME_TITLE "ברוכים הבאים למנהל היישומים של ReactOS!\n\n"
     IDS_WELCOME_TEXT "Choose a category on the left, then choose an application to install or uninstall.\nReactOS Web Site: "
     IDS_WELCOME_URL "https://reactos.org"
@@ -204,9 +201,6 @@ BEGIN
     IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."
-    IDS_SELECT_ALL "Select/Deselect All"
-    IDS_INSTALL_SELECTED "Install Selected"
-    IDS_SELECTEDFORINST "Selected for installation"
     IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?"
 END
 
@@ -219,7 +213,7 @@ BEGIN
     IDS_STATUS_DOWNLOADING "מוריד..."
     IDS_STATUS_INSTALLING "מתקין..."
     IDS_STATUS_WAITING "מחכה להתקנה..."
-    IDS_STATUS_FINISHED "הסתיים"
+    IDS_STATUS_FINISHED "סיים"
 END
 
 STRINGTABLE
diff --git a/base/applications/rapps/lang/it-IT.rc b/base/applications/rapps/lang/it-IT.rc
index 223a93352eb..4c2e5ce9301 100644
--- a/base/applications/rapps/lang/it-IT.rc
+++ b/base/applications/rapps/lang/it-IT.rc
@@ -91,7 +91,7 @@ BEGIN
 END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
-STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
+STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE
 CAPTION "Scaricamento in corso %ls…"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -175,10 +175,7 @@ BEGIN
     IDS_APPTITLE "ReactOS Gestione applicazioni"
     IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Cerca…"
-    IDS_INSTALL "Installa"
-    IDS_UNINSTALL "Rimuovi"
-    IDS_MODIFY "Modifica"
-    IDS_APPS_COUNT "Numero applicazioni: %d; Selezionate: %d"
+    IDS_APPS_COUNT "Numero applicazioni: %d"
     IDS_WELCOME_TITLE "Benvenuto!\n\n"
     IDS_WELCOME_TEXT "Scegliere una categoria a sinistra, poi scegliere una applicazione da installare o disinstallare.\nReactOS Web Site: "
     IDS_WELCOME_URL "https://reactos.org"
@@ -199,9 +196,6 @@ BEGIN
     IDS_INTEG_CHECK_FAIL "Il pacchetto non ha superato il controllo di integrità, potrebbe essere stato danneggiato o manomesso durante lo scaricamento. L'esecuzione del software non è raccomandata."
     IDS_INTERRUPTED_DOWNLOAD "Lo scaricamento è stato interrotto. Verificare la connessione a Internet."
     IDS_UNABLE_TO_WRITE "Impossibile scrivere su disco: lo spazio libero potrebbe essere esaurito."
-    IDS_SELECT_ALL "Seleziona/Deseleziona Tutte"
-    IDS_INSTALL_SELECTED "Installa le selezionate"
-    IDS_SELECTEDFORINST "Selezionate per l'installazione"
     IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?"
 END
 
diff --git a/base/applications/rapps/lang/ja-JP.rc b/base/applications/rapps/lang/ja-JP.rc
index 3fba6423360..28d9714eaa1 100644
--- a/base/applications/rapps/lang/ja-JP.rc
+++ b/base/applications/rapps/lang/ja-JP.rc
@@ -18,7 +18,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "更新(&R)", ID_REFRESH
         MENUITEM SEPARATOR
-        MENUITEM "アップデート データベース(&T)\tCtrl+F5", ID_RESETDB
+        MENUITEM "データベースの更新(&T)\tCtrl+F5", ID_RESETDB
     END
     POPUP "ヘルプ"
     BEGIN
@@ -48,7 +48,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "更新(&R)", ID_REFRESH
         MENUITEM SEPARATOR
-        MENUITEM "アップデート データベース(&T)\tCtrl+F5", ID_RESETDB
+        MENUITEM "データベースの更新(&T)\tCtrl+F5", ID_RESETDB
     END
 END
 
@@ -91,7 +91,7 @@ BEGIN
 END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
-STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
+STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE
 CAPTION "ダウンロード %ls…"
 FONT 9, "MS UI Gothic"
 BEGIN
@@ -107,7 +107,7 @@ BEGIN
     IDS_TOOLTIP_MODIFY      "変更"
     IDS_TOOLTIP_SETTINGS    "設定"
     IDS_TOOLTIP_REFRESH     "更新"
-    IDS_TOOLTIP_UPDATE_DB   "アップデート データベース"
+    IDS_TOOLTIP_UPDATE_DB   "データベースの更新"
     IDS_TOOLTIP_EXIT        "終了"
 END
 
@@ -129,7 +129,7 @@ BEGIN
     IDS_INFO_REGOWNER       "\n登録された所有者: "
     IDS_INFO_PRODUCTID      "\nプロダクトID: "
     IDS_INFO_CONTACT        "\n連絡先: "
-    IDS_INFO_UPDATEINFO     "\nアップデート情報: "
+    IDS_INFO_UPDATEINFO     "\n更新情報: "
     IDS_INFO_INFOABOUT      "\nこれに関する情報: "
     IDS_INFO_COMMENTS       "\nコメント: "
     IDS_INFO_INSTLOCATION   "\nインストール場所: "
@@ -172,20 +172,17 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_APPTITLE            "ReactOS アプリケーション マネージャ"
+    IDS_APPTITLE            "ReactOS アプリ マネージャ"
     IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT         "検索…"
-    IDS_INSTALL             "インストール"
-    IDS_UNINSTALL           "アンインストール"
-    IDS_MODIFY              "変更"
-    IDS_APPS_COUNT          "アプリケーション数: %d; Selected: %d"
-    IDS_WELCOME_TITLE       "ReactOS アプリケーション マネージャへようこそ!\n\n"
-    IDS_WELCOME_TEXT        "左側からカテゴリを選択し、インストール又はアンインストールするアプリケーションを選んでください。\nReactOS ウェブ サイト: "
+    IDS_APPS_COUNT          "アプリ数: %d"
+    IDS_WELCOME_TITLE       "ReactOS アプリ マネージャへようこそ!\n\n"
+    IDS_WELCOME_TEXT        "左側からカテゴリを選択し、インストールまたはアンインストールするアプリを選んでください。\nReactOS ウェブ サイト: "
     IDS_WELCOME_URL "https://reactos.org"
     IDS_INSTALLED           "インストール済み"
     IDS_AVAILABLEFORINST    "インストール可能"
-    IDS_UPDATES             "アップデート"
-    IDS_APPLICATIONS        "アプリケーション"
+    IDS_UPDATES             "更新"
+    IDS_APPLICATIONS        "アプリ"
     IDS_CHOOSE_FOLDER_TEXT  "プログラムのダウンロードに使用するフォルダを選択してください:"
     IDS_CHOOSE_FOLDER_ERROR "指定されたフォルダは存在しません!"
     IDS_APP_REG_REMOVE "レジストリからインストールされたプログラムに関するデータを削除してもよろしいですか?"
@@ -199,9 +196,6 @@ BEGIN
     IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."
-    IDS_SELECT_ALL "Select/Deselect All"
-    IDS_INSTALL_SELECTED "Install Selected"
-    IDS_SELECTEDFORINST "Selected for installation"
     IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?"
 END
 
diff --git a/base/applications/rapps/lang/no-NO.rc b/base/applications/rapps/lang/no-NO.rc
index 4514eba7753..0a1e6f3eb30 100644
--- a/base/applications/rapps/lang/no-NO.rc
+++ b/base/applications/rapps/lang/no-NO.rc
@@ -91,12 +91,12 @@ BEGIN
 END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
-STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
+STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE
 CAPTION "Lastet ned %ls…"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12
-    EDITTEXT IDC_DOWNLOAD_STATUS,  10, 28, 200, 22, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_DISABLED | NOT WS_BORDER
+    EDITTEXT IDC_DOWNLOAD_STATUS, 10, 28, 200, 22, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_DISABLED | NOT WS_BORDER
     PUSHBUTTON "Avbryt", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP
 END
 
@@ -174,10 +174,7 @@ BEGIN
     IDS_APPTITLE "ReactOS programbehandler"
     IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Søk…"
-    IDS_INSTALL "Installere"
-    IDS_UNINSTALL "Avinstallere"
-    IDS_MODIFY "Endre"
-    IDS_APPS_COUNT "Program oppsummering: %d; Selected: %d"
+    IDS_APPS_COUNT "Program oppsummering: %d"
     IDS_WELCOME_TITLE "Velkommen til ReactOS programbehandler!\n\n"
     IDS_WELCOME_TEXT "Velg en kategori til venstre, og velg et program for installere eller avinstallere programvaren.\nReactOS internettside: "
     IDS_WELCOME_URL "https://reactos.org"
@@ -198,9 +195,6 @@ BEGIN
     IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."
-    IDS_SELECT_ALL "Select/Deselect All"
-    IDS_INSTALL_SELECTED "Install Selected"
-    IDS_SELECTEDFORINST "Selected for installation"
     IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?"
 END
 
diff --git a/base/applications/rapps/lang/pl-PL.rc b/base/applications/rapps/lang/pl-PL.rc
index 1c3132e534d..371632793ea 100644
--- a/base/applications/rapps/lang/pl-PL.rc
+++ b/base/applications/rapps/lang/pl-PL.rc
@@ -1,9 +1,6 @@
 /*
- *    Translated by Caemyr - Olaf Siejka (Aug, 2009)
- *    Use ReactOS forum PM or IRC to contact me
- *    Updated by Saibamen - Adam Stachowicz (saibamenppl@gmail.com) (Apr, 2011)
- *    https://reactos.org
- *    IRC: irc.freenode.net #reactos-pl;
+ * TRANSLATORS: 2009 Olaf Siejka
+ *              2011 Adam Stachowicz <saibamenppl@gmail.com>
  */
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
@@ -98,8 +95,8 @@ BEGIN
     PUSHBUTTON "Anuluj", IDCANCEL, 150, 78, 60, 14
 END
 
-IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220
-STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
+IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
+STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE
 CAPTION "Pobierz %ls…"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -183,10 +180,7 @@ BEGIN
     IDS_APPTITLE "Menedżer aplikacji ReactOS"
     IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Szukaj…"
-    IDS_INSTALL "Instaluj"
-    IDS_UNINSTALL "Odinstaluj"
-    IDS_MODIFY "Modyfikuj"
-    IDS_APPS_COUNT "Licznik aplikacji: %d"
+    IDS_APPS_COUNT "Liczba aplikacji: %d"
     IDS_WELCOME_TITLE "Witamy w Menedżerze aplikacji ReactOS!\n\n"
     IDS_WELCOME_TEXT "Z listy po lewej wybierz kategorię, a następnie aplikację, by ją zainstalować lub odinstalować.\nStrona projektu ReactOS: "
     IDS_WELCOME_URL "https://reactos.org"
@@ -207,9 +201,6 @@ BEGIN
     IDS_INTEG_CHECK_FAIL "Pakiet nie przeszedł kontroli integralności, mógł zostać uszkodzony lub naruszony podczas pobierania. Uruchamianie tego programu nie jest zalecane."
     IDS_INTERRUPTED_DOWNLOAD "Pobieranie zostało przerwane. Sprawdź połączenie z siecią"
     IDS_UNABLE_TO_WRITE "Nie można zapisać na dysku. Dysk może być pełny."
-    IDS_SELECT_ALL "Zaznacz/Odznacz Wszystko"
-    IDS_INSTALL_SELECTED "Instaluj Zaznaczone"
-    IDS_SELECTEDFORINST "Wybrane do instalacji"
     IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?"
 END
 
diff --git a/base/applications/rapps/lang/pt-BR.rc b/base/applications/rapps/lang/pt-BR.rc
index 3cd793c8f03..97fdb16f465 100644
--- a/base/applications/rapps/lang/pt-BR.rc
+++ b/base/applications/rapps/lang/pt-BR.rc
@@ -1,4 +1,4 @@
-/* Translation and UTF-8 Conversion by mkbu95 <mkbu95@gmail.com> (August, 2011) */
+/* TRANSLATOR: 2011 mkbu95 <mkbu95@gmail.com> */
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
@@ -93,7 +93,7 @@ BEGIN
 END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
-STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
+STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE
 CAPTION "Download %ls…"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -177,10 +177,7 @@ BEGIN
     IDS_APPTITLE "Central de Aplicativos ReactOS"
     IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Procurar…"
-    IDS_INSTALL "Instalar"
-    IDS_UNINSTALL "Desinstalar"
-    IDS_MODIFY "Modificar"
-    IDS_APPS_COUNT "Número de aplicativos: %d; Selected: %d"
+    IDS_APPS_COUNT "Número de aplicativos: %d"
     IDS_WELCOME_TITLE "Bem-vindo(a) a Central de Aplicativos ReactOS!\n\n"
     IDS_WELCOME_TEXT "Escolha uma categoria à esquerda, então escolha um aplicativo para instalar ou desinstalar.\nWeb Site ReactOS: "
     IDS_WELCOME_URL "https://reactos.org"
@@ -201,9 +198,6 @@ BEGIN
     IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."
-    IDS_SELECT_ALL "Select/Deselect All"
-    IDS_INSTALL_SELECTED "Install Selected"
-    IDS_SELECTEDFORINST "Selected for installation"
     IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?"
 END
 
diff --git a/base/applications/rapps/lang/ro-RO.rc b/base/applications/rapps/lang/ro-RO.rc
index f1da7dff773..817d7b5890c 100644
--- a/base/applications/rapps/lang/ro-RO.rc
+++ b/base/applications/rapps/lang/ro-RO.rc
@@ -1,10 +1,6 @@
 /*
- * PROJECT: ReactOS Applications Manager (RAPPS)
- * FILE:    base/applications/rapps/lang/ro-RO.rc
- * PURPOSE: Romanian Translation for RAPPS
- * TRANSLATORS:
- *          Ștefan Fulea (stefan dot fulea at mail dot md)
- *          Bișoc George (fraizeraust99@gmail.com)
+ * TRANSLATORS: Stefan Fulea
+ *              George Bisoc
  */
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
@@ -100,7 +96,7 @@ BEGIN
 END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
-STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
+STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE
 CAPTION "În curs de descărcare %ls…"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -184,10 +180,7 @@ BEGIN
     IDS_APPTITLE "Gestionar de programe"
     IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Căutare…"
-    IDS_INSTALL "Instalează"
-    IDS_UNINSTALL "Dezinstalează"
-    IDS_MODIFY "Modifică"
-    IDS_APPS_COUNT "Numărul de programe: %d; Selectate: %d"
+    IDS_APPS_COUNT "Numărul de programe: %d"
     IDS_WELCOME_TITLE "Bun venit la gestionarul de programe ReactOS!\n\n"
     IDS_WELCOME_TEXT "Alegeți o categorie din stânga, apoi alegeți o aplicație pentru a o instala sau dezinstala.\nArdesa web ReactOS: "
     IDS_WELCOME_URL "https://reactos.org"
@@ -208,9 +201,6 @@ BEGIN
     IDS_INTEG_CHECK_FAIL "Pachetul nu a trecut de verificarea de integritate. Utilizarea programului nu este recomandată."
     IDS_INTERRUPTED_DOWNLOAD "Descărcarea a fost întreruptă. Verificați conexiunea la Internet."
     IDS_UNABLE_TO_WRITE "Eșec la scrierea pe disc. Una din cauze poate fi atingerea limitei de capacitate."
-    IDS_SELECT_ALL "Selectează/Deselectează Toate"
-    IDS_INSTALL_SELECTED "Instalează selecționate"
-    IDS_SELECTEDFORINST "Selectate pentru instalare"
     IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?"
 END
 
diff --git a/base/applications/rapps/lang/ru-RU.rc b/base/applications/rapps/lang/ru-RU.rc
index caa4a66eecf..639d85753fb 100644
--- a/base/applications/rapps/lang/ru-RU.rc
+++ b/base/applications/rapps/lang/ru-RU.rc
@@ -90,8 +90,8 @@ BEGIN
     PUSHBUTTON "Отмена", IDCANCEL, 150, 78, 60, 14
 END
 
-IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220
-STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_SYSMENU | WS_VISIBLE
+IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
+STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE
 CAPTION "Загрузка %ls…"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -175,10 +175,7 @@ BEGIN
     IDS_APPTITLE "Менеджер приложений ReactOS"
     IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Поиск…"
-    IDS_INSTALL "Установить"
-    IDS_UNINSTALL "Удалить"
-    IDS_MODIFY "Изменить"
-    IDS_APPS_COUNT "Количество приложений: %d; Выбрано: %d"
+    IDS_APPS_COUNT "Количество приложений: %d"
     IDS_WELCOME_TITLE "Добро пожаловать в ""Менеджер приложений ReactOS""!\n\n"
     IDS_WELCOME_TEXT "Выберите категорию слева и приложение для установки или удаления.\nСайт ReactOS: "
     IDS_WELCOME_URL "https://reactos.org"
@@ -199,9 +196,6 @@ BEGIN
     IDS_INTEG_CHECK_FAIL "Приложение не прошло проверку целостности, возможно оно было повреждено или подменено. Запуск приложения не рекомендуется."
     IDS_INTERRUPTED_DOWNLOAD "Загрузка была прервана. Проверьте подключение к сети Интернет."
     IDS_UNABLE_TO_WRITE "Не удалось записать данные на диск. Возможно, недостаточно свободного места на диске."
-    IDS_SELECT_ALL "Выбрать все"
-    IDS_INSTALL_SELECTED "Установить выбранное"
-    IDS_SELECTEDFORINST "Выбрано для установки"
     IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?"
 END
 
@@ -230,7 +224,7 @@ BEGIN
     IDS_LANGUAGE_NO_TRANSLATION "Доступно на других языках"
     IDS_LANGUAGE_ENGLISH_TRANSLATION "Доступно на Английском"
     IDS_LANGUAGE_SINGLE "Один язык"
-    IDS_LANGUAGE_MORE_PLACEHOLDER " (+еще %d )"
+    IDS_LANGUAGE_MORE_PLACEHOLDER " (+еще %d)"
     IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d доступно)"
 END
 
diff --git a/base/applications/rapps/lang/sk-SK.rc b/base/applications/rapps/lang/sk-SK.rc
index c5b6050e898..2d95c17db74 100644
--- a/base/applications/rapps/lang/sk-SK.rc
+++ b/base/applications/rapps/lang/sk-SK.rc
@@ -1,6 +1,4 @@
-/* TRANSLATOR : Mário Kačmár /Mario Kacmar/ aka Kario (kario@szm.sk)
- * DATE OF TR.: 29-08-2009
- * LAST CHANGE: 26-07-2010
+/* TRANSLATOR: 2009-2010 Mario Kacmar <kario@szm.sk>
  */
 
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
@@ -96,7 +94,7 @@ BEGIN
 END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
-STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
+STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE
 CAPTION "Sťahujem %ls…" // Stiahnuť ???
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -180,10 +178,7 @@ BEGIN
     IDS_APPTITLE "Manažér aplikácií systému ReactOS"
     IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Hľadať…"
-    IDS_INSTALL "Inštalovať"
-    IDS_UNINSTALL "Odinštalovať"
-    IDS_MODIFY "Zmeniť"
-    IDS_APPS_COUNT "Počet programov: %d; Selected: %d"
+    IDS_APPS_COUNT "Počet programov: %d"
     IDS_WELCOME_TITLE "Víta Vás Manažér aplikácií systému ReactOS!\n\n" // ReactOS Application Manager
     IDS_WELCOME_TEXT "Vyberte si kategóriu na ľavej strane, potom vyberte aplikáciu, ktorú chcete nainštalovať alebo odinštalovať.\nWebstránka projektu ReactOS: "
     IDS_WELCOME_URL "https://reactos.org"
@@ -204,9 +199,6 @@ BEGIN
     IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."
-    IDS_SELECT_ALL "Select/Deselect All"
-    IDS_INSTALL_SELECTED "Install Selected"
-    IDS_SELECTEDFORINST "Selected for installation"
     IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?"
 END
 
diff --git a/base/applications/rapps/lang/sq-AL.rc b/base/applications/rapps/lang/sq-AL.rc
index a99afd5420e..617d7dd3ef7 100644
--- a/base/applications/rapps/lang/sq-AL.rc
+++ b/base/applications/rapps/lang/sq-AL.rc
@@ -1,5 +1,4 @@
-/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
- * DATE OF TR:  29-11-2013
+/* TRANSLATOR: 2013 Ardit Dani (Ard1t) <ardit.dani@gmail.com>
 */
 
 LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
@@ -95,7 +94,7 @@ BEGIN
 END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
-STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
+STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE
 CAPTION "Shkarko %ls…"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -179,10 +178,7 @@ BEGIN
     IDS_APPTITLE "ReactOS Applications Manager"
     IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Kerko…"
-    IDS_INSTALL "Instalo"
-    IDS_UNINSTALL "Uninstall"
-    IDS_MODIFY "Modifiko"
-    IDS_APPS_COUNT "Numrimi Aplicacioneve: %d; Selected: %d"
+    IDS_APPS_COUNT "Numrimi Aplicacioneve: %d"
     IDS_WELCOME_TITLE "Mire Se Erdhe ne ReactOS Applications Manager!\n\n"
     IDS_WELCOME_TEXT "Zgjidh nje kategori ne te majte, pastaj zgjidh nje aplicacion per ta instaluar ose uninstall.\nReactOS Web Site: "
     IDS_WELCOME_URL "https://reactos.org"
@@ -203,9 +199,6 @@ BEGIN
     IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."
-    IDS_SELECT_ALL "Select/Deselect All"
-    IDS_INSTALL_SELECTED "Install Selected"
-    IDS_SELECTEDFORINST "Selected for installation"
     IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?"
 END
 
diff --git a/base/applications/rapps/lang/sv-SE.rc b/base/applications/rapps/lang/sv-SE.rc
index c7be8e23185..96a1a3e76f1 100644
--- a/base/applications/rapps/lang/sv-SE.rc
+++ b/base/applications/rapps/lang/sv-SE.rc
@@ -1,8 +1,5 @@
 /*
- * PROJECT:     ReactOS RAPPS
- * FILE:        base/applications/rapps/lang/sv-SE.rc
- * PURPOSE:     Swedish resource file
- * Translation: Jaix Bly
+ * TRANSLATOR: Jaix Bly
  */
 
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
@@ -98,7 +95,7 @@ BEGIN
 END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
-STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
+STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE
 CAPTION "Ladda ner %ls…"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -182,10 +179,7 @@ BEGIN
     IDS_APPTITLE "ReactOS programhanterare"
     IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Sök…"
-    IDS_INSTALL "Installera"
-    IDS_UNINSTALL "Avinstallera"
-    IDS_MODIFY "Ändra"
-    IDS_APPS_COUNT "Programantal: %d; Selected: %d"
+    IDS_APPS_COUNT "Programantal: %d"
     IDS_WELCOME_TITLE "Välkommen till ReactOS programhanterare!\n\n"
     IDS_WELCOME_TEXT "Välj en kategori till vänster, och sedan ett program för att installera eller avinstallera.\nReactOS Web sida: "
     IDS_WELCOME_URL "https://reactos.org"
@@ -206,9 +200,6 @@ BEGIN
     IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."
-    IDS_SELECT_ALL "Select/Deselect All"
-    IDS_INSTALL_SELECTED "Install Selected"
-    IDS_SELECTEDFORINST "Selected for installation"
     IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?"
 END
 
diff --git a/base/applications/rapps/lang/tr-TR.rc b/base/applications/rapps/lang/tr-TR.rc
index 11ba61c4814..d2f26259a4b 100644
--- a/base/applications/rapps/lang/tr-TR.rc
+++ b/base/applications/rapps/lang/tr-TR.rc
@@ -1,10 +1,10 @@
-/* TRANSLATOR: 2013-2016 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) */
+/* TRANSLATOR: 2013-2016 Erdem Ersoy <erdemersoy@erdemersoy.net> */
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 IDR_MAINMENU MENU
 BEGIN
-    POPUP "&Kütük"
+    POPUP "&Dosya"
     BEGIN
         MENUITEM "&Ayarlar…", ID_SETTINGS
         MENUITEM SEPARATOR
@@ -12,15 +12,15 @@ BEGIN
     END
     POPUP "Y&azılım"
     BEGIN
-        MENUITEM "&Kur\tDenetim+Giriş", ID_INSTALL
-        MENUITEM "K&aldır\tDenetim+Sil", ID_UNINSTALL
+        MENUITEM "&Kur\tCtrl+Enter", ID_INSTALL
+        MENUITEM "K&aldır\tCtrl+Del", ID_UNINSTALL
         MENUITEM "&Değiştir", ID_MODIFY
         MENUITEM SEPARATOR
-        MENUITEM "&Girişi Değer Defteri'nden Kaldır", ID_REGREMOVE
+        MENUITEM "&Girişi Kayıt Defteri'nden Kaldır", ID_REGREMOVE
         MENUITEM SEPARATOR
         MENUITEM "&Yenile\tF5", ID_REFRESH
         MENUITEM SEPARATOR
-        MENUITEM "Ya&zılım Veri Tabanını Yenile\tDenetim+F5", ID_RESETDB
+        MENUITEM "Ya&zılım Veri Tabanını Yenile\tCtrl+F5", ID_RESETDB
     END
     POPUP "&Yardım"
     BEGIN
@@ -34,7 +34,7 @@ BEGIN
     POPUP "popup"
     BEGIN
         MENUITEM "&Bağlantıyı Tarayıcıda Aç", ID_OPEN_LINK
-        MENUITEM "&Bağlantıyı Panoya Çoğalt", ID_COPY_LINK
+        MENUITEM "&Bağlantıyı Panoya Kopyala", ID_COPY_LINK
     END
 END
 
@@ -42,15 +42,15 @@ IDR_APPLICATIONMENU MENU
 BEGIN
     POPUP "popup"
     BEGIN
-        MENUITEM "&Kur\tDenetim+Giriş", ID_INSTALL
-        MENUITEM "K&aldır\tDenetim+Sil", ID_UNINSTALL
+        MENUITEM "&Kur\tCtrl+Enter", ID_INSTALL
+        MENUITEM "K&aldır\tCtrl+Del", ID_UNINSTALL
         MENUITEM "&Değiştir", ID_MODIFY
         MENUITEM SEPARATOR
-        MENUITEM "&Girişi Değer Defteri'nden Kaldır", ID_REGREMOVE
+        MENUITEM "&Girişi Kayıt Defteri'nden Kaldır", ID_REGREMOVE
         MENUITEM SEPARATOR
         MENUITEM "&Yenile\tF5", ID_REFRESH
         MENUITEM SEPARATOR
-        MENUITEM "Ya&zılım Veri Tabanını Yenile\tDenetim+F5", ID_RESETDB
+        MENUITEM "Ya&zılım Veri Tabanını Yenile\tCtrl+F5", ID_RESETDB
     END
 END
 
@@ -59,15 +59,15 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "Ayarlar"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Umûmî", -1, 4, 2, 240, 61
+    GROUPBOX "Genel", -1, 4, 2, 240, 61
     AUTOCHECKBOX "&Pencere Konumunu Sakla", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12
-    AUTOCHECKBOX "&Başlangıçta Erişilebilir İzlencelerin Dizelgesini Yenile", IDC_UPDATE_AVLIST, 15, 29, 222, 12
-    AUTOCHECKBOX "&İzlencelerin Kuruluşlarını ve Kaldırılışlarını Sakla", IDC_LOG_ENABLED, 15, 46, 219, 12
+    AUTOCHECKBOX "&Başlangıçta Erişilebilir Programların Listesini Yenile", IDC_UPDATE_AVLIST, 15, 29, 222, 12
+    AUTOCHECKBOX "P&rogramların Kurulma ve Kaldırma Günlüğünü Sakla", IDC_LOG_ENABLED, 15, 46, 219, 12
     GROUPBOX "İndirme", -1, 4, 65, 240, 51
     LTEXT "İndirme Dizini:", -1, 16, 75, 100, 9
     EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL
     PUSHBUTTON "&Seç", IDC_CHOOSE, 187, 85, 50, 14
-    AUTOCHECKBOX "&Kurulumdan Sonra İzlencenin Kurulum Kütüğünü Sil", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
+    AUTOCHECKBOX "&Kurulumdan Sonra Programın Kurulum Dosyasını Sil", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
     GROUPBOX "Vekil Sunucu", -1, 4, 116, 240, 76
     CONTROL "Dizge Vekil Sunucu Ayarları", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10
     CONTROL "Doğrudan (Vekil sunucu yok.)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10
@@ -75,25 +75,25 @@ BEGIN
     EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED
     LTEXT "Şunun İçin Vekil Sunucu Yok", -1, 27, 175, 64, 10
     EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED
-    PUSHBUTTON "Ön Tanımlılar", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14
+    PUSHBUTTON "Varsayılanlar", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14
     DEFPUSHBUTTON "Tamam", IDOK, 116, 195, 60, 14
     PUSHBUTTON "İptal", IDCANCEL, 181, 195, 60, 14
 END
 
 IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "İzlence Kurulumu"
+CAPTION "Program Kurulumu"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "…", IDC_INSTALL_TEXT, 4, 5, 209, 35
-    AUTORADIOBUTTON "&Bir Diskten (CD'den veyâ DVD'den) Kur", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP
+    AUTORADIOBUTTON "&Bir Diskten (CD'den veya DVD'den) Kur", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP
     AUTORADIOBUTTON "&İndir ve Kur", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP
     DEFPUSHBUTTON "Tamam", IDOK, 86, 78, 60, 14
     PUSHBUTTON "İptal", IDCANCEL, 150, 78, 60, 14
 END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
-STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
+STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE
 CAPTION "İndiriliyor %ls…"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -127,7 +127,7 @@ BEGIN
     IDS_INFO_PUBLISHER "\nYayımcısı: "
     IDS_INFO_HELPLINK "\nYardım Bağlantısı: "
     IDS_INFO_HELPPHONE "\nYardım Telefonu: "
-    IDS_INFO_README "\nBenioku Kütüğü: "
+    IDS_INFO_README "\nBenioku Dosyası: "
     IDS_INFO_REGOWNER "\nKayıtlı Olduğu Kullanıcısı: "
     IDS_INFO_PRODUCTID "\nÜrün Kimliği: "
     IDS_INFO_CONTACT "\nİletişim: "
@@ -136,9 +136,9 @@ BEGIN
     IDS_INFO_COMMENTS "\nYorumlar: "
     IDS_INFO_INSTLOCATION "\nKurulum Konumu: "
     IDS_INFO_INSTALLSRC "\nKurulum Kaynağı: "
-    IDS_INFO_UNINSTALLSTR "\nKaldırma Dizgisi: "
+    IDS_INFO_UNINSTALLSTR "\nKaldırma Dizesi: "
     IDS_INFO_MODIFYPATH "\nDeğiştirme Yolu: "
-    IDS_INFO_INSTALLDATE "\nKurulum Zamânı: "
+    IDS_INFO_INSTALLDATE "\nKurulum Zamanı: "
 END
 
 STRINGTABLE
@@ -148,7 +148,7 @@ BEGIN
     IDS_AINFO_DESCRIPTION "\nAçıklaması: "
     IDS_AINFO_SIZE "\nBüyüklüğü: "
     IDS_AINFO_URLSITE "\nAna Sayfası: "
-    IDS_AINFO_LICENSE "\nRuhsatı: "
+    IDS_AINFO_LICENSE "\nLisansı: "
     IDS_AINFO_URLDOWNLOAD "\nİndir: "
     IDS_AINFO_LANGUAGES "\nLanguages: "
 END
@@ -160,16 +160,16 @@ BEGIN
     IDS_CAT_DRIVERS "Sürücüler"
     IDS_CAT_EDU "Eğitim"
     IDS_CAT_ENGINEER "Mühendislik"
-    IDS_CAT_FINANCE "Mâlî"
+    IDS_CAT_FINANCE "Mali"
     IDS_CAT_GAMES "Oyun ve Eğlence"
     IDS_CAT_GRAPHICS "Çizge"
     IDS_CAT_INTERNET "Ağ"
     IDS_CAT_LIBS "Kitaplıklar"
-    IDS_CAT_OFFICE "Büro"
+    IDS_CAT_OFFICE "Ofis"
     IDS_CAT_OTHER "Başka"
     IDS_CAT_SCIENCE "Bilim"
     IDS_CAT_TOOLS "Araçlar"
-    IDS_CAT_VIDEO "Vidyo"
+    IDS_CAT_VIDEO "Video"
 END
 
 STRINGTABLE
@@ -177,33 +177,27 @@ BEGIN
     IDS_APPTITLE "ReactOS Uygulama Yöneticisi"
     IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Ara"
-    IDS_INSTALL "Kur"
-    IDS_UNINSTALL "Kaldır"
-    IDS_MODIFY "Değiştir"
-    IDS_APPS_COUNT "Uygulama Sayısı: %d; Selected: %d"
+    IDS_APPS_COUNT "Uygulama Sayısı: %d"
     IDS_WELCOME_TITLE "ReactOS Uygulama Yöneticisi'ne hoş geldiniz.\n\n"
-    IDS_WELCOME_TEXT "Solda bir ulam seçiniz, ardından kurmak ya da kaldırmak için bir uygulama seçiniz.\nReactOS'un Umûmî Ağ sitesi: "
+    IDS_WELCOME_TEXT "Solda bir ulam seçiniz, ardından kurmak ya da kaldırmak için bir uygulama seçiniz.\nReactOS'un İnternet sitesi: "
     IDS_WELCOME_URL "https://reactos.org"
     IDS_INSTALLED "Kurulanlar"
-    IDS_AVAILABLEFORINST "Kurulum İçin Bulunanlar"
-    IDS_UPDATES "Şimdikileştirmeler"
+    IDS_AVAILABLEFORINST "Kurulabilir Uygulamalar"
+    IDS_UPDATES "Güncelleştirmeler"
     IDS_APPLICATIONS "Uygulamalar"
     IDS_CHOOSE_FOLDER_TEXT "İndirilenlerin saklanacağı bir dizin seçiniz:"
     IDS_CHOOSE_FOLDER_ERROR "Belirttiğiniz dizin yok. Belirttiğiniz dizin oluşturulsun mu?"
-    IDS_APP_REG_REMOVE "Kurulan izlencenin girişini değer defterinden silmek istediğinizden emin misiniz?"
+    IDS_APP_REG_REMOVE "Kurulan programın girdiyi kayıt defterinden silmek istediğinizden emin misiniz?"
     IDS_INFORMATION "Bilgi"
     IDS_UNABLE_TO_DOWNLOAD "Paket indirilemez! Adres bulunamadı!"
-    IDS_UNABLE_TO_DOWNLOAD2 "Paket indirilemez! Umûmî Ağ bağlantınızı yoklayınız!"
-    IDS_UNABLE_TO_REMOVE "İzlencenin girişi değer defterinden silinemiyor."
+    IDS_UNABLE_TO_DOWNLOAD2 "Paket indirilemez! İnternet bağlantınızı yoklayınız!"
+    IDS_UNABLE_TO_REMOVE "Programın girişi kayıt defterinden silinemiyor."
     IDS_UNABLE_TO_INSTALL "Unable to open installer!"
     IDS_UNABLE_TO_QUERY_CERT "Unable to retrieve certificate info.\n\nDo you want to continue anyway?"
     IDS_INTEG_CHECK_TITLE "Paket bütünlüğü doğrulanıyor…"
-    IDS_INTEG_CHECK_FAIL "Paket bütünlük denetimini geçmedi, bozulmuş veyâ indirme esnâsında oynanmış olabilir. Yazılımı çalıştırmak önerilmez."
-    IDS_INTERRUPTED_DOWNLOAD "İndirme kesildi. Umûmî Ağ bağlantınızı denetleyiniz."
+    IDS_INTEG_CHECK_FAIL "Paket bütünlük denetimini geçmedi, bozulmuş veya indirme esnasında oynanmış olabilir. Yazılımı çalıştırmak önerilmez."
+    IDS_INTERRUPTED_DOWNLOAD "İndirme kesildi. İnternet bağlantınızı denetleyiniz."
     IDS_UNABLE_TO_WRITE "Diske yazılamıyor. Disk dolu olabilir."
-    IDS_SELECT_ALL "Select/Deselect All"
-    IDS_INSTALL_SELECTED "Install Selected"
-    IDS_SELECTEDFORINST "Selected for installation"
     IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?"
 END
 
diff --git a/base/applications/rapps/lang/uk-UA.rc b/base/applications/rapps/lang/uk-UA.rc
index f53d0564870..65d87a2aa3f 100644
--- a/base/applications/rapps/lang/uk-UA.rc
+++ b/base/applications/rapps/lang/uk-UA.rc
@@ -1,8 +1,5 @@
 /*
- * PROJECT:    ReactOS ReactOS Applications Manager
  * LICENSE:    GPL - See COPYING in the top level directory
- * FILE:       base/applications/rapps/lang/uk-UA.rc
- * PURPOSE:    Ukraianian Language File for ReactOS ReactOS Applications Manager
  * TRANSLATOR: Sakara Yevhen, Igor Paliychuk
  */
 
@@ -98,8 +95,8 @@ BEGIN
     PUSHBUTTON "Скасувати", IDCANCEL, 150, 78, 60, 14
 END
 
-IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220
-STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_SYSMENU | WS_VISIBLE
+IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
+STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE
 CAPTION "Завантаження %ls…"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -183,10 +180,7 @@ BEGIN
     IDS_APPTITLE "Менеджер додатків ReactOS"
     IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Пошук…"
-    IDS_INSTALL "Встановити"
-    IDS_UNINSTALL "Видалити"
-    IDS_MODIFY "Змінити"
-    IDS_APPS_COUNT "Kількість додатків: %d; Обрано: %d"
+    IDS_APPS_COUNT "Kількість додатків: %d"
     IDS_WELCOME_TITLE "Ласкаво просимо в Менеджер додатків ReactOS!\n\n"
     IDS_WELCOME_TEXT "Виберіть категорію зліва, а потім виберіть програми для встановлення чи видалення.\nСторінка ReactOS: "
     IDS_WELCOME_URL "https://reactos.org"
@@ -207,9 +201,6 @@ BEGIN
     IDS_INTEG_CHECK_FAIL "Додаток не пройшов перевірку цілістності, його молги пошкодити чи замінити. Запуск додатку не рекомендується."
     IDS_INTERRUPTED_DOWNLOAD "Завантаження перервано. Перевірте підключення до мережі Інтернет."
     IDS_UNABLE_TO_WRITE "Записк на диск неможливий. Можливо, на диску недостатньо містця."
-    IDS_SELECT_ALL "Вибрати все"
-    IDS_INSTALL_SELECTED "Встановити обране"
-    IDS_SELECTEDFORINST "Обрані для встановлення"
     IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?"
 END
 
diff --git a/base/applications/rapps/lang/zh-CN.rc b/base/applications/rapps/lang/zh-CN.rc
index 715f6b96ee5..4fe4583bd5b 100644
--- a/base/applications/rapps/lang/zh-CN.rc
+++ b/base/applications/rapps/lang/zh-CN.rc
@@ -1,5 +1,5 @@
-/* Translated by Song Fuchang (0xfc) <sfc_0@yahoo.com.cn> */
-/* Imporved by Li Keqing <auroracloud4096@gmail.com> */
+/* TRANSLATORS: Song Fuchang (0xfc) <sfc_0@yahoo.com.cn>
+ *              Li Keqing <auroracloud4096@gmail.com> */
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
 IDR_MAINMENU MENU
@@ -24,7 +24,7 @@ BEGIN
     END
     POPUP "帮助"
     BEGIN
-        MENUITEM "帮助内容\tF1", ID_HELP, GRAYED
+        MENUITEM "帮助\tF1", ID_HELP, GRAYED
         MENUITEM "关于", ID_ABOUT
     END
 END
@@ -64,13 +64,13 @@ BEGIN
     AUTOCHECKBOX "启动时更新可获得的程序列表(&U)", IDC_UPDATE_AVLIST, 15, 29, 222, 12
     AUTOCHECKBOX "将程序的安装和卸载记录到日志(&L)", IDC_LOG_ENABLED, 15, 46, 219, 12
     GROUPBOX "正在下载", -1, 4, 65, 240, 51
-    LTEXT "下载文件夹：", -1, 16, 75, 100, 9
+    LTEXT "下载文件夹: ", -1, 16, 75, 100, 9
     EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL
     PUSHBUTTON "选择(&C)", IDC_CHOOSE, 187, 85, 50, 14
     AUTOCHECKBOX "在安装完程序后删除安装程序(&D)", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
     GROUPBOX "代理服务器", -1, 4, 116, 240, 76
     CONTROL "系统代理设置", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10
-    CONTROL "直接 （无代理）", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10
+    CONTROL "直连 无代理）", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10
     CONTROL "代理服务器", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10
     EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED
     LTEXT "没有代理", -1, 27, 175, 64, 10
@@ -92,8 +92,8 @@ BEGIN
     PUSHBUTTON "取消", IDCANCEL, 150, 78, 60, 14
 END
 
-IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220
-STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
+IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
+STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE
 CAPTION "正在下载 %ls…"
 FONT 9, "宋体"
 BEGIN
@@ -122,34 +122,34 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_INFO_VERSION "版本："
-    IDS_INFO_DESCRIPTION "描述："
-    IDS_INFO_PUBLISHER "\n发布者："
-    IDS_INFO_HELPLINK "\n帮助链接："
-    IDS_INFO_HELPPHONE "\n帮助电话："
-    IDS_INFO_README "\n必读："
-    IDS_INFO_REGOWNER "\n注册所有者："
-    IDS_INFO_PRODUCTID "\n产品 ID："
-    IDS_INFO_CONTACT "\n联系方式："
-    IDS_INFO_UPDATEINFO "\n更新信息："
-    IDS_INFO_INFOABOUT "\n关于信息："
-    IDS_INFO_COMMENTS "\n注释："
-    IDS_INFO_INSTLOCATION "\n安装位置："
-    IDS_INFO_INSTALLSRC "\n安装源："
-    IDS_INFO_UNINSTALLSTR "\n卸载字符串："
-    IDS_INFO_MODIFYPATH "\n修改路径："
-    IDS_INFO_INSTALLDATE "\n安装日期："
+    IDS_INFO_VERSION "版本: "
+    IDS_INFO_DESCRIPTION "描述: "
+    IDS_INFO_PUBLISHER "\n发布者: "
+    IDS_INFO_HELPLINK "\n帮助链接: "
+    IDS_INFO_HELPPHONE "\n帮助电话: "
+    IDS_INFO_README "\n必讀: "
+    IDS_INFO_REGOWNER "\n注册所有者: "
+    IDS_INFO_PRODUCTID "\n产品 ID: "
+    IDS_INFO_CONTACT "\n联系方式: "
+    IDS_INFO_UPDATEINFO "\n更新信息: "
+    IDS_INFO_INFOABOUT "\n关于信息: "
+    IDS_INFO_COMMENTS "\n注释: "
+    IDS_INFO_INSTLOCATION "\n安装位置: "
+    IDS_INFO_INSTALLSRC "\n安装源: "
+    IDS_INFO_UNINSTALLSTR "\n卸载字符串: "
+    IDS_INFO_MODIFYPATH "\n修改路径: "
+    IDS_INFO_INSTALLDATE "\n安装日期: "
 END
 
 STRINGTABLE
 BEGIN
-    IDS_AINFO_VERSION "\n版本："
+    IDS_AINFO_VERSION "\n版本: "
     IDS_AINFO_AVAILABLEVERSION "\n可用版本: "
-    IDS_AINFO_DESCRIPTION "\n描述："
-    IDS_AINFO_SIZE "\n大小："
-    IDS_AINFO_URLSITE "\n主页："
-    IDS_AINFO_LICENSE "\n协议："
-    IDS_AINFO_URLDOWNLOAD "\n下载:"
+    IDS_AINFO_DESCRIPTION "\n描述: "
+    IDS_AINFO_SIZE "\n大小: "
+    IDS_AINFO_URLSITE "\n主页: "
+    IDS_AINFO_LICENSE "\n协议: "
+    IDS_AINFO_URLDOWNLOAD "\n下载: "
     IDS_AINFO_LANGUAGES "\n语言: "
 END
 
@@ -177,10 +177,7 @@ BEGIN
     IDS_APPTITLE "ReactOS 程序管理器"
     IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "搜索…"
-    IDS_INSTALL "安装"
-    IDS_UNINSTALL "卸载"
-    IDS_MODIFY "修改"
-    IDS_APPS_COUNT "程序数量：%d；已选：%d"
+    IDS_APPS_COUNT "程序数量：%d"
     IDS_WELCOME_TITLE "欢迎使用 ReactOS 程序管理器！\n\n"
     IDS_WELCOME_TEXT "从左栏选择一个类别，然后选择要安装或卸载的程序。\nReactOS 网站："
     IDS_WELCOME_URL "https://reactos.org"
@@ -188,7 +185,7 @@ BEGIN
     IDS_AVAILABLEFORINST "可安装"
     IDS_UPDATES "更新"
     IDS_APPLICATIONS "应用程序"
-    IDS_CHOOSE_FOLDER_TEXT "请选择用来保存下载文件的文件夹："
+    IDS_CHOOSE_FOLDER_TEXT "请选择用来保存下载文件的文件夹: "
     IDS_CHOOSE_FOLDER_ERROR "您选择的文件夹不存在。是否创建？"
     IDS_APP_REG_REMOVE "您确定要从注册表删除该程序的数据吗？"
     IDS_INFORMATION "信息"
@@ -196,15 +193,12 @@ BEGIN
     IDS_UNABLE_TO_DOWNLOAD2 "无法下载该软件包！请检查网络连接！"
     IDS_UNABLE_TO_REMOVE "无法从注册表删除该程序的数据！"
     IDS_UNABLE_TO_INSTALL "无法打开安装程序！"
-    IDS_UNABLE_TO_QUERY_CERT "Unable to retrieve certificate info.\n\nDo you want to continue anyway?"
+    IDS_UNABLE_TO_QUERY_CERT "无法获取证书信息。\n\n您是否仍然想继续？"
     IDS_INTEG_CHECK_TITLE "正在验证包完整性…"
     IDS_INTEG_CHECK_FAIL "这个包没有通过完整性验证，它可能在下载过程中损坏或被人为篡改了。不推荐运行这个程序。"
     IDS_INTERRUPTED_DOWNLOAD "下载中断。请检查网络连接。"
     IDS_UNABLE_TO_WRITE "无法写入磁盘。磁盘可能已满。"
-    IDS_SELECT_ALL "全选/全反选"
-    IDS_INSTALL_SELECTED "安装已选中的"
-    IDS_SELECTEDFORINST "Selected for installation"
-    IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?"
+    IDS_MISMATCH_CERT_INFO "所使用的证书未知:\n主题: %s\n发行方: %s\n是否仍要继续？"
 END
 
 STRINGTABLE
diff --git a/base/applications/rapps/lang/zh-TW.rc b/base/applications/rapps/lang/zh-TW.rc
index 01b0f7df629..f2f15ee0a9b 100644
--- a/base/applications/rapps/lang/zh-TW.rc
+++ b/base/applications/rapps/lang/zh-TW.rc
@@ -1,4 +1,4 @@
-/* Translated by Song Fuchang (0xfc) <sfc_0@yahoo.com.cn> */
+/* TRANSLATOR: Song Fuchang (0xfc) <sfc_0@yahoo.com.cn> */
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 
@@ -62,9 +62,9 @@ BEGIN
     GROUPBOX "普通", -1, 4, 2, 240, 61
     AUTOCHECKBOX "儲存視窗位置(&S)", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12
     AUTOCHECKBOX "啟動時更新可獲得的程式列表(&U)", IDC_UPDATE_AVLIST, 15, 29, 222, 12
-    AUTOCHECKBOX "將程式的安裝和解除安裝記錄到日誌(&L)", IDC_LOG_ENABLED, 15, 46, 219, 12
+    AUTOCHECKBOX "記錄程式的安裝和解除安裝過程(&L)", IDC_LOG_ENABLED, 15, 46, 219, 12
     GROUPBOX "正在下載", -1, 4, 65, 240, 51
-    LTEXT "下載資料夾：", -1, 16, 75, 100, 9
+    LTEXT "下載資料夾:", -1, 16, 75, 100, 9
     EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL
     PUSHBUTTON "選擇(&C)", IDC_CHOOSE, 187, 85, 50, 14
     AUTOCHECKBOX "在安裝完程式後刪除安裝程式(&D)", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
@@ -93,7 +93,7 @@ BEGIN
 END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
-STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
+STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE
 CAPTION "正在下載 %ls…"
 FONT 9, "新細明體"
 BEGIN
@@ -122,33 +122,33 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_INFO_VERSION "版本："
-    IDS_INFO_DESCRIPTION "描述："
-    IDS_INFO_PUBLISHER "\n釋出者："
-    IDS_INFO_HELPLINK "\n幫助連結："
-    IDS_INFO_HELPPHONE "\n幫助電話："
-    IDS_INFO_README "\n必讀："
-    IDS_INFO_REGOWNER "\n註冊所有者："
-    IDS_INFO_PRODUCTID "\n產品 ID："
-    IDS_INFO_CONTACT "\n聯繫方式："
-    IDS_INFO_UPDATEINFO "\n更新資訊："
-    IDS_INFO_INFOABOUT "\n關於資訊："
-    IDS_INFO_COMMENTS "\n註釋："
-    IDS_INFO_INSTLOCATION "\n安裝位置："
-    IDS_INFO_INSTALLSRC "\n安裝源："
-    IDS_INFO_UNINSTALLSTR "\n解除安裝字元串："
-    IDS_INFO_MODIFYPATH "\n修改路徑："
-    IDS_INFO_INSTALLDATE "\n安裝日期："
+    IDS_INFO_VERSION "版本:"
+    IDS_INFO_DESCRIPTION "描述:"
+    IDS_INFO_PUBLISHER "\n釋出者:"
+    IDS_INFO_HELPLINK "\n幫助連結:"
+    IDS_INFO_HELPPHONE "\n幫助電話:"
+    IDS_INFO_README "\n必讀:"
+    IDS_INFO_REGOWNER "\n註冊所有者:"
+    IDS_INFO_PRODUCTID "\n產品 ID:"
+    IDS_INFO_CONTACT "\n聯繫方式:"
+    IDS_INFO_UPDATEINFO "\n更新資訊:"
+    IDS_INFO_INFOABOUT "\n關於資訊:"
+    IDS_INFO_COMMENTS "\n註釋:"
+    IDS_INFO_INSTLOCATION "\n安裝位置:"
+    IDS_INFO_INSTALLSRC "\n安裝源:"
+    IDS_INFO_UNINSTALLSTR "\n解除安裝字元串:"
+    IDS_INFO_MODIFYPATH "\n修改路徑:"
+    IDS_INFO_INSTALLDATE "\n安裝日期:"
 END
 
 STRINGTABLE
 BEGIN
-    IDS_AINFO_VERSION "\n版本："
+    IDS_AINFO_VERSION "\n版本:"
     IDS_AINFO_AVAILABLEVERSION "\nAvailable Version: "
-    IDS_AINFO_DESCRIPTION "\n描述："
-    IDS_AINFO_SIZE "\n大小："
-    IDS_AINFO_URLSITE "\n主頁："
-    IDS_AINFO_LICENSE "\n協議："
+    IDS_AINFO_DESCRIPTION "\n描述:"
+    IDS_AINFO_SIZE "\n大小:"
+    IDS_AINFO_URLSITE "\n主頁:"
+    IDS_AINFO_LICENSE "\n協議:"
     IDS_AINFO_URLDOWNLOAD "\n下載:"
     IDS_AINFO_LANGUAGES "\nLanguages: "
 END
@@ -163,7 +163,7 @@ BEGIN
     IDS_CAT_FINANCE "經濟"
     IDS_CAT_GAMES "遊戲與娛樂"
     IDS_CAT_GRAPHICS "圖形"
-    IDS_CAT_INTERNET "Internet 與網路"
+    IDS_CAT_INTERNET "網際網路"
     IDS_CAT_LIBS "庫"
     IDS_CAT_OFFICE "辦公"
     IDS_CAT_OTHER "其他"
@@ -177,18 +177,15 @@ BEGIN
     IDS_APPTITLE "ReactOS 程式管理器"
     IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "搜索…"
-    IDS_INSTALL "安裝"
-    IDS_UNINSTALL "解除安裝"
-    IDS_MODIFY "修改"
-    IDS_APPS_COUNT "程式個數：%d; Selected: %d"
+    IDS_APPS_COUNT "程式個數:%d"
     IDS_WELCOME_TITLE "歡迎來到 ReactOS 程式管理器！\n\n"
-    IDS_WELCOME_TEXT "從左欄選擇一個類別，然後選擇要安裝或解除安裝的程式。\nReactOS 網站："
+    IDS_WELCOME_TEXT "從左欄選擇一個類別，然後選擇要安裝或解除安裝的程式。\nReactOS 網站:"
     IDS_WELCOME_URL "https://reactos.org"
     IDS_INSTALLED "已安裝"
     IDS_AVAILABLEFORINST "可安裝"
     IDS_UPDATES "更新"
     IDS_APPLICATIONS "應用程式"
-    IDS_CHOOSE_FOLDER_TEXT "請選擇用來儲存下載檔案的資料夾："
+    IDS_CHOOSE_FOLDER_TEXT "請選擇用來儲存下載檔案的資料夾:"
     IDS_CHOOSE_FOLDER_ERROR "您選擇的資料夾不存在。創建嗎？"
     IDS_APP_REG_REMOVE "您確定要從登錄檔刪除該程式的資料嗎？"
     IDS_INFORMATION "資訊"
@@ -201,9 +198,6 @@ BEGIN
     IDS_INTEG_CHECK_FAIL "包沒有通過完整性檢查，它可能已損壞，或者在下載過程中篡改。建議您不要運行該軟體。"
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."
-    IDS_SELECT_ALL "Select/Deselect All"
-    IDS_INSTALL_SELECTED "Install Selected"
-    IDS_SELECTEDFORINST "Selected for installation"
     IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?"
 END
 
diff --git a/base/applications/rapps/rapps.rc b/base/applications/rapps/rapps.rc
index 4d4c796c2e7..eaf7d0b6870 100644
--- a/base/applications/rapps/rapps.rc
+++ b/base/applications/rapps/rapps.rc
@@ -22,7 +22,6 @@ IDI_APPS ICON "res/apps.ico"
 IDI_APPUPD ICON "res/appupd.ico"
 IDI_CATEGORY ICON "res/cat.ico"
 IDI_UPDATE_DB ICON "res/updatedb.ico"
-IDI_CHECK_ALL ICON "res/select.ico"
 
 /* Categories */
 IDI_CAT_AUDIO ICON "res/cats/audio.ico"
@@ -40,7 +39,6 @@ IDI_CAT_OTHER ICON "res/cats/other.ico"
 IDI_CAT_SCIENCE ICON "res/cats/science.ico"
 IDI_CAT_TOOLS ICON "res/cats/tools.ico"
 IDI_CAT_VIDEO ICON "res/cats/video.ico"
-IDI_SELECTEDFORINST ICON "res/select.ico"
 
 /* Accelerators -- key bindings */
 HOTKEYS ACCELERATORS
@@ -50,6 +48,7 @@ HOTKEYS ACCELERATORS
   VK_F5,     ID_RESETDB,   CONTROL, VIRTKEY
   VK_DELETE, ID_UNINSTALL, CONTROL, VIRTKEY
   VK_RETURN, ID_INSTALL,   CONTROL, VIRTKEY
+  "F",       ID_SEARCH,    CONTROL, VIRTKEY
 }
 
 #include <reactos/manifest_exe.rc>
diff --git a/base/applications/rapps/res/select.ico b/base/applications/rapps/res/select.ico
deleted file mode 100644
index 5bac99ec948..00000000000
Binary files a/base/applications/rapps/res/select.ico and /dev/null differ