diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp
index 65209073ce6..c1e2d997d9b 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>
 
@@ -371,10 +367,10 @@ public:
             {  7, 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));
+        LoadStringW(hInst, IDS_TOOLTIP_SELECT_ALL, szSelectAll, _countof(szSelectAll));
 
         m_hWnd = CreateWindowExW(0, TOOLBARCLASSNAMEW, NULL,
                                  WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | TBSTYLE_LIST,
@@ -797,9 +793,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);
     }
 
     VOID InitCategoriesList()
@@ -1152,7 +1145,7 @@ private:
 
         case WM_NOTIFY:
         {
-            LPNMHDR data = (LPNMHDR) lParam;
+            LPNMHDR data = (LPNMHDR)lParam;
 
             switch (data->code)
             {
@@ -1389,7 +1382,7 @@ private:
 
         case WM_SIZING:
         {
-            LPRECT pRect = (LPRECT) lParam;
+            LPRECT pRect = (LPRECT)lParam;
 
             if (pRect->right - pRect->left < 565)
                 pRect->right = pRect->left + 565;
@@ -1586,7 +1579,6 @@ private:
                 {
                     UpdateApplicationsList(-1);
                 }
-
             }
             break;
 
@@ -1913,8 +1905,7 @@ VOID ShowMainWindow(INT nShowCmd)
     {
         if (!TranslateAcceleratorW(hMainWnd, KeyBrd, &Msg))
         {
-            if (Msg.message == WM_CHAR &&
-                Msg.wParam == VK_TAB)
+            if (Msg.message == WM_CHAR && Msg.wParam == VK_TAB)
             {
                 // Move backwards if shift is held down
                 int direction = (GetKeyState(VK_SHIFT) & 0x8000) ? -1 : 1;
diff --git a/base/applications/rapps/include/resource.h b/base/applications/rapps/include/resource.h
index 91c79139324..8a5d7dea6d4 100644
--- a/base/applications/rapps/include/resource.h
+++ b/base/applications/rapps/include/resource.h
@@ -84,9 +84,6 @@
 /* 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
@@ -107,7 +104,6 @@
 #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
@@ -118,10 +114,11 @@
 #define IDS_TOOLTIP_INSTALL      200
 #define IDS_TOOLTIP_UNINSTALL    201
 #define IDS_TOOLTIP_MODIFY       202
-#define IDS_TOOLTIP_SETTINGS     203
-#define IDS_TOOLTIP_REFRESH      204
-#define IDS_TOOLTIP_EXIT         205
-#define IDS_TOOLTIP_UPDATE_DB    206
+#define IDS_TOOLTIP_SELECT_ALL   203
+#define IDS_TOOLTIP_SETTINGS     204
+#define IDS_TOOLTIP_REFRESH      205
+#define IDS_TOOLTIP_EXIT         206
+#define IDS_TOOLTIP_UPDATE_DB    207
 
 /* Columns info */
 #define IDS_APP_NAME             250
diff --git a/base/applications/rapps/lang/bg-BG.rc b/base/applications/rapps/lang/bg-BG.rc
index addde8c2805..eb9ad6eb596 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
@@ -109,6 +105,7 @@ BEGIN
     IDS_TOOLTIP_INSTALL "Слагане"
     IDS_TOOLTIP_UNINSTALL "Махане"
     IDS_TOOLTIP_MODIFY "Промяна"
+    IDS_TOOLTIP_SELECT_ALL "Select/Deselect All"
     IDS_TOOLTIP_SETTINGS "Настройки"
     IDS_TOOLTIP_REFRESH "Опресняване"
     IDS_TOOLTIP_UPDATE_DB "Update Database"
@@ -180,13 +177,10 @@ 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_WELCOME_TITLE "Управителят на приложенията на РеактОС ви приветства"
     IDS_WELCOME_TEXT "Изберете раздел от лявата страна, след което изберете приложение за слагане или премахване.\nСтраницата на РеактОС: "
-    IDS_WELCOME_URL "https://reactos.org/"
+    IDS_WELCOME_URL "https://reactos.org"
     IDS_INSTALLED "Сложено"
     IDS_AVAILABLEFORINST "Налично за слагане"
     IDS_UPDATES "Обновления"
@@ -204,7 +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?"
diff --git a/base/applications/rapps/lang/cs-CZ.rc b/base/applications/rapps/lang/cs-CZ.rc
index 47ff8a6992c..2d1497d1451 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
@@ -110,6 +109,7 @@ BEGIN
     IDS_TOOLTIP_INSTALL "Instalovat"
     IDS_TOOLTIP_UNINSTALL "Odinstalovat"
     IDS_TOOLTIP_MODIFY "Změnit"
+    IDS_TOOLTIP_SELECT_ALL "Select/Deselect All"
     IDS_TOOLTIP_SETTINGS "Nastavení"
     IDS_TOOLTIP_REFRESH "Obnovit"
     IDS_TOOLTIP_UPDATE_DB "Aktualizovat databázi"
@@ -181,13 +181,10 @@ 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_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/"
+    IDS_WELCOME_URL "https://reactos.org"
     IDS_INSTALLED "Nainstalováno"
     IDS_AVAILABLEFORINST "Lze instalovat"
     IDS_UPDATES "Aktualizace"
@@ -205,7 +202,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?"
diff --git a/base/applications/rapps/lang/de-DE.rc b/base/applications/rapps/lang/de-DE.rc
index a6d4fbe4046..9ff2041d7c6 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
@@ -105,6 +105,7 @@ BEGIN
     IDS_TOOLTIP_INSTALL "Installieren"
     IDS_TOOLTIP_UNINSTALL "Deinstallieren"
     IDS_TOOLTIP_MODIFY "Ändern"
+    IDS_TOOLTIP_SELECT_ALL "Alle/Keine"
     IDS_TOOLTIP_SETTINGS "Einstellungen"
     IDS_TOOLTIP_REFRESH "Aktualisieren"
     IDS_TOOLTIP_UPDATE_DB "Datenbank aktualisieren"
@@ -176,13 +177,10 @@ 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_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/"
+    IDS_WELCOME_URL "https://reactos.org"
     IDS_INSTALLED "Installiert"
     IDS_AVAILABLEFORINST "Zur Installation verfügbar"
     IDS_UPDATES "Aktualisierungen"
@@ -191,19 +189,18 @@ 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 c91fc38749a..d0e592cca79 100644
--- a/base/applications/rapps/lang/en-US.rc
+++ b/base/applications/rapps/lang/en-US.rc
@@ -105,6 +105,7 @@ BEGIN
     IDS_TOOLTIP_INSTALL "Install"
     IDS_TOOLTIP_UNINSTALL "Uninstall"
     IDS_TOOLTIP_MODIFY "Modify"
+    IDS_TOOLTIP_SELECT_ALL "Select/Deselect All"
     IDS_TOOLTIP_SETTINGS "Settings"
     IDS_TOOLTIP_REFRESH "Refresh"
     IDS_TOOLTIP_UPDATE_DB "Update Database"
@@ -176,13 +177,10 @@ 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_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/"
+    IDS_WELCOME_URL "https://reactos.org"
     IDS_INSTALLED "Installed"
     IDS_AVAILABLEFORINST "Available for installation"
     IDS_UPDATES "Updates"
@@ -200,7 +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?"
diff --git a/base/applications/rapps/lang/es-ES.rc b/base/applications/rapps/lang/es-ES.rc
index 0f15be877fc..49723c86911 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> and Julen Urizar Compains 2020-04-14 */
+/*
+ * TRANSLATORS: 2014 Ismael Ferreras Morezuelas (Swyter), 2020 Julen Urizar Compains */
 
 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
 
@@ -108,6 +108,7 @@ BEGIN
     IDS_TOOLTIP_INSTALL "Instalar"
     IDS_TOOLTIP_UNINSTALL "Desinstalar"
     IDS_TOOLTIP_MODIFY "Modificar"
+    IDS_TOOLTIP_SELECT_ALL "Selecccionar/Deseleccionar todo"
     IDS_TOOLTIP_SETTINGS "Ajustes"
     IDS_TOOLTIP_REFRESH "Recargar"
     IDS_TOOLTIP_UPDATE_DB "Actualizar el listado desde Internet"
@@ -179,13 +180,10 @@ 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º de aplicaciones: %d; Selecionadas: %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/"
+    IDS_WELCOME_URL "https://reactos.org"
     IDS_INSTALLED "Instaladas"
     IDS_AVAILABLEFORINST "Disponible para su instalación"
     IDS_UPDATES "Actualizaciones"
@@ -203,7 +201,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. Compruebe 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 "Selecccionar/Deseleccionar todo"
     IDS_INSTALL_SELECTED "Instalar selección"
     IDS_SELECTEDFORINST "Seleccionados para instalar"
     IDS_MISMATCH_CERT_INFO "El certificado que usa es desconocido:\nSujeto: %s\nEmisor: %s\n¿Quiere continuar a pesar de ello?"
diff --git a/base/applications/rapps/lang/et-EE.rc b/base/applications/rapps/lang/et-EE.rc
index fde19f5fc76..4aea07ea35b 100644
--- a/base/applications/rapps/lang/et-EE.rc
+++ b/base/applications/rapps/lang/et-EE.rc
@@ -1,9 +1,6 @@
 /*
- * PROJECT:     RAPPS for ReactOS
  * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
- * FILE:        base/applications/rapps/lang/et-EE.rc
- * PURPOSE:     Estonian Language resource file
- * TRANSLATOR:  Joann Mõndresku (joannmondresku at gmail dot com)
+ * TRANSLATOR:  Joann Mõndresku <joannmondresku@gmail.com>
  */
 
 LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT
@@ -113,6 +110,7 @@ BEGIN
     IDS_TOOLTIP_INSTALL "Installi"
     IDS_TOOLTIP_UNINSTALL "Desinstalli"
     IDS_TOOLTIP_MODIFY "Muuda"
+    IDS_TOOLTIP_SELECT_ALL "Vali/Tühista kõik"
     IDS_TOOLTIP_SETTINGS "Sätted"
     IDS_TOOLTIP_REFRESH "Värskenda"
     IDS_TOOLTIP_UPDATE_DB "Uuenda andmebaasi"
@@ -184,13 +182,10 @@ BEGIN
     IDS_APPTITLE "ReactOS'i Rakenduste Haldur"
     IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Otsi…"
-    IDS_INSTALL "Installi"
-    IDS_UNINSTALL "Desinstalli"
-    IDS_MODIFY "Muuda"
     IDS_APPS_COUNT "Rakenduste arv: %d; Valitud: %d"
     IDS_WELCOME_TITLE "Tere tulemast ReactOS'i Rakenduste Haldurisse!\n\n"
     IDS_WELCOME_TEXT "Vali vasakult teema, siis vali paremalt rakendusi mida soovid installida või desinstallida.\nReactOS'i veebileht: "
-    IDS_WELCOME_URL "https://reactos.org/"
+    IDS_WELCOME_URL "https://reactos.org"
     IDS_INSTALLED "Installitud"
     IDS_AVAILABLEFORINST "Installimiseks saadaval"
     IDS_UPDATES "Uuendused"
@@ -208,7 +203,6 @@ BEGIN
     IDS_INTEG_CHECK_FAIL "Pakend ei läbinud tervikluse testi, pakend võib olla vigane või omavoliliselt muudetud olla keset allalaadimist. Tarkvara kasutamist ei ole soovitatud."
     IDS_INTERRUPTED_DOWNLOAD "Allalaadimist katkestati. Kontrolli interneti ühendust."
     IDS_UNABLE_TO_WRITE "Kettale kirjutamine ebaõnnetus. Ketas võib täis olla."
-    IDS_SELECT_ALL "Vali/Tühista kõik"
     IDS_INSTALL_SELECTED "Installi valitud"
     IDS_SELECTEDFORINST "Installimiseks valitud"
     IDS_MISMATCH_CERT_INFO "Kasutatud sertifikaat on tundmatu:\nSubject: %s\nIssuer: %s\nKas soovid siiski jätkata?"
diff --git a/base/applications/rapps/lang/fr-FR.rc b/base/applications/rapps/lang/fr-FR.rc
index d516b15acdb..1c9b03661b1 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
@@ -105,6 +105,7 @@ BEGIN
     IDS_TOOLTIP_INSTALL "Installer"
     IDS_TOOLTIP_UNINSTALL "Désinstaller"
     IDS_TOOLTIP_MODIFY "Modifier"
+    IDS_TOOLTIP_SELECT_ALL "Sélectionner/Désélectionner tout"
     IDS_TOOLTIP_SETTINGS "Configuration"
     IDS_TOOLTIP_REFRESH "Rafraîchir"
     IDS_TOOLTIP_UPDATE_DB "Mettre à jour la base"
@@ -176,13 +177,10 @@ 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_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/"
+    IDS_WELCOME_URL "https://reactos.org"
     IDS_INSTALLED "Installé"
     IDS_AVAILABLEFORINST "Disponible pour installation"
     IDS_UPDATES "Mises à jour"
@@ -200,7 +198,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?"
diff --git a/base/applications/rapps/lang/he-IL.rc b/base/applications/rapps/lang/he-IL.rc
index f80ee7e3c6e..b2b8c9afbc7 100644
--- a/base/applications/rapps/lang/he-IL.rc
+++ b/base/applications/rapps/lang/he-IL.rc
@@ -1,5 +1,4 @@
-/* Translated by Baruch Rutman, additional translations by Shy Zedaka */
-
+/* TRANSLATORS: Baruch Rutman, Shy Zedaka */
 
 LANGUAGE LANG_HEBREW, 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
 EXSTYLE WS_EX_LAYOUTRTL
 CAPTION "הורדה %ls…"
 FONT 8, "MS Shell Dlg"
@@ -111,6 +110,7 @@ BEGIN
     IDS_TOOLTIP_INSTALL "התקנה"
     IDS_TOOLTIP_UNINSTALL "הסרה"
     IDS_TOOLTIP_MODIFY "שינוי"
+    IDS_TOOLTIP_SELECT_ALL "Select/Deselect All"
     IDS_TOOLTIP_SETTINGS "הגדרות"
     IDS_TOOLTIP_REFRESH "רענון"
     IDS_TOOLTIP_UPDATE_DB "עדכון מסד נתונים"
@@ -182,13 +182,10 @@ 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_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/"
+    IDS_WELCOME_URL "https://reactos.org"
     IDS_INSTALLED "מותקן"
     IDS_AVAILABLEFORINST "זמין להתקנה"
     IDS_UPDATES "עדכונים"
@@ -206,7 +203,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?"
diff --git a/base/applications/rapps/lang/id-ID.rc b/base/applications/rapps/lang/id-ID.rc
index 7717f675f7a..4287b44246d 100644
--- a/base/applications/rapps/lang/id-ID.rc
+++ b/base/applications/rapps/lang/id-ID.rc
@@ -105,6 +105,7 @@ BEGIN
     IDS_TOOLTIP_INSTALL "Pasang"
     IDS_TOOLTIP_UNINSTALL "Bongkar"
     IDS_TOOLTIP_MODIFY "Ubah"
+    IDS_TOOLTIP_SELECT_ALL "Pilih Semua/Balik"
     IDS_TOOLTIP_SETTINGS "Pengaturan"
     IDS_TOOLTIP_REFRESH "Segarkan"
     IDS_TOOLTIP_UPDATE_DB "Perbarui Database"
@@ -176,13 +177,10 @@ BEGIN
     IDS_APPTITLE "Manajer Aplikasi ReactOS"
     IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
     IDS_SEARCH_TEXT "Cari…"
-    IDS_INSTALL "Pasang"
-    IDS_UNINSTALL "Bongkar"
-    IDS_MODIFY "Ubah"
     IDS_APPS_COUNT "Jumlah aplikasi: %d; Terpilih: %d"
     IDS_WELCOME_TITLE "Selamat datang di Manajer Aplikasi ReactOS!\n\n"
     IDS_WELCOME_TEXT "pilih kategori di sisi kiri, kemudian pilih aplikasi untuk dipasang atau dibongkar.\nSitus Web ReactOS: "
-    IDS_WELCOME_URL "https://reactos.org/"
+    IDS_WELCOME_URL "https://reactos.org"
     IDS_INSTALLED "Terpasang"
     IDS_AVAILABLEFORINST "Tersedia untuk pemasangan"
     IDS_UPDATES "Pembaruan"
@@ -200,7 +198,6 @@ BEGIN
     IDS_INTEG_CHECK_FAIL "Paket tersebut tidak lulus pemeriksaan integritas, bisa jadi rusak atau terkena gangguan ketika mengunduh. Menjalankan perangkat lunak ini tidak disarankan."
     IDS_INTERRUPTED_DOWNLOAD "Pengunduhan terganggu. Mengecek sambungan ke internet."
     IDS_UNABLE_TO_WRITE "Tidak bisa menulis ke cakram. Cakram mungkin penuh."
-    IDS_SELECT_ALL "Pilih Semua/Balik"
     IDS_INSTALL_SELECTED "Pasang terpilih"
     IDS_SELECTEDFORINST "dipilih untuk pemasangan"
     IDS_MISMATCH_CERT_INFO "Sertifikat yang dipakai tidak dikenal:\nSubyek: %s\nIssuer: %s\nYakin ingin lanjut?"
diff --git a/base/applications/rapps/lang/it-IT.rc b/base/applications/rapps/lang/it-IT.rc
index b3dcdc4c79a..054a8ee81a1 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
@@ -105,6 +105,7 @@ BEGIN
     IDS_TOOLTIP_INSTALL "Installa"
     IDS_TOOLTIP_UNINSTALL "Rimuovi"
     IDS_TOOLTIP_MODIFY "Modifica"
+    IDS_TOOLTIP_SELECT_ALL "Seleziona/Deseleziona Tutte"
     IDS_TOOLTIP_SETTINGS "Impostazioni"
     IDS_TOOLTIP_REFRESH "Aggiorna"
     IDS_TOOLTIP_UPDATE_DB "Aggiorna Database"
@@ -176,13 +177,10 @@ 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_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/"
+    IDS_WELCOME_URL "https://reactos.org"
     IDS_INSTALLED "Installato"
     IDS_AVAILABLEFORINST "Disponibile per l'installazione"
     IDS_UPDATES "Aggiornamenti"
@@ -200,7 +198,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 "Il certificato in uso è sconosciuto:\nSoggetto: %s\nEmittente: %s\nVuoi continuare comunque?"
diff --git a/base/applications/rapps/lang/ja-JP.rc b/base/applications/rapps/lang/ja-JP.rc
index 9ab32e27c4f..f7e4d25d525 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
@@ -105,9 +105,10 @@ BEGIN
     IDS_TOOLTIP_INSTALL     "インストール"
     IDS_TOOLTIP_UNINSTALL   "アンインストール"
     IDS_TOOLTIP_MODIFY      "変更"
+    IDS_TOOLTIP_SELECT_ALL  "すべて選択/非選択"
     IDS_TOOLTIP_SETTINGS    "設定"
     IDS_TOOLTIP_REFRESH     "更新"
-    IDS_TOOLTIP_UPDATE_DB   "アップデート データベース"
+    IDS_TOOLTIP_UPDATE_DB   "データベースの更新"
     IDS_TOOLTIP_EXIT        "終了"
 END
 
@@ -129,7 +130,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インストール場所: "
@@ -173,20 +174,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_WELCOME_URL "https://reactos.org/"
+    IDS_APPS_COUNT          "アプリ数: %d; Selected: %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 "レジストリからインストールされたプログラムに関するデータを削除してもよろしいですか?"
@@ -200,7 +198,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 "証明書は未知のものです:\nSubject: %s\nIssuer: %s\nそれでも続けますか？"
diff --git a/base/applications/rapps/lang/no-NO.rc b/base/applications/rapps/lang/no-NO.rc
index f015d9e0ee0..a60eb7a79b7 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
 
@@ -105,6 +105,7 @@ BEGIN
     IDS_TOOLTIP_INSTALL "Installere"
     IDS_TOOLTIP_UNINSTALL "Avinstallere"
     IDS_TOOLTIP_MODIFY "Rediger"
+    IDS_TOOLTIP_SELECT_ALL "Select/Deselect All"
     IDS_TOOLTIP_SETTINGS "Innstillinger"
     IDS_TOOLTIP_REFRESH "Oppdatere"
     IDS_TOOLTIP_UPDATE_DB "Update Database"
@@ -176,13 +177,10 @@ 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_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/"
+    IDS_WELCOME_URL "https://reactos.org"
     IDS_INSTALLED "Installert"
     IDS_AVAILABLEFORINST "Tilgjengelig for installasjon"
     IDS_UPDATES "Oppdateringer"
@@ -200,7 +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?"
diff --git a/base/applications/rapps/lang/pl-PL.rc b/base/applications/rapps/lang/pl-PL.rc
index 6191e7b9120..ba6adb77603 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
@@ -99,7 +96,7 @@ BEGIN
 END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220
-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 "Pobierz %ls…"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -113,6 +110,7 @@ BEGIN
     IDS_TOOLTIP_INSTALL "Instaluj"
     IDS_TOOLTIP_UNINSTALL "Odinstaluj"
     IDS_TOOLTIP_MODIFY "Modyfikuj"
+    IDS_TOOLTIP_SELECT_ALL "Zaznacz/Odznacz Wszystko"
     IDS_TOOLTIP_SETTINGS "Ustawienia"
     IDS_TOOLTIP_REFRESH "Odśwież"
     IDS_TOOLTIP_UPDATE_DB "Aktualizuj bazę programów"
@@ -184,13 +182,10 @@ 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; Wybranych: %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/"
+    IDS_WELCOME_URL "https://reactos.org"
     IDS_INSTALLED "Zainstalowane"
     IDS_AVAILABLEFORINST "Dostępne"
     IDS_UPDATES "Uaktualnienia"
@@ -208,7 +203,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 "Użyty certyfikat jest nieznany:\nSubject: %s\nIssuer: %s\nCzy chcesz mimo to kontynuować?"
diff --git a/base/applications/rapps/lang/pt-BR.rc b/base/applications/rapps/lang/pt-BR.rc
index 1464b299c76..c7efe50fb8f 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_PORTUGUESE_BRAZILIAN
 
@@ -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
@@ -107,6 +107,7 @@ BEGIN
     IDS_TOOLTIP_INSTALL "Instalar"
     IDS_TOOLTIP_UNINSTALL "Desinstalar"
     IDS_TOOLTIP_MODIFY "Modificar"
+    IDS_TOOLTIP_SELECT_ALL "Select/Deselect All"
     IDS_TOOLTIP_SETTINGS "Configurações"
     IDS_TOOLTIP_REFRESH "Atualizar"
     IDS_TOOLTIP_UPDATE_DB "Update Database"
@@ -178,13 +179,10 @@ 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_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/"
+    IDS_WELCOME_URL "https://reactos.org"
     IDS_INSTALLED "Instalado"
     IDS_AVAILABLEFORINST "Disponível para instalação"
     IDS_UPDATES "Atualizações"
@@ -202,7 +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?"
diff --git a/base/applications/rapps/lang/pt-PT.rc b/base/applications/rapps/lang/pt-PT.rc
index d8d54ee8b23..255e9aa6ed0 100644
--- a/base/applications/rapps/lang/pt-PT.rc
+++ b/base/applications/rapps/lang/pt-PT.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
 
@@ -6,7 +6,7 @@ IDR_MAINMENU MENU
 BEGIN
     POPUP "&Arquivo"
     BEGIN
-        MENUITEM "Confi&gurações", ID_SETTINGS
+        MENUITEM "&Definições", ID_SETTINGS
         MENUITEM SEPARATOR
         MENUITEM "Sa&ir", ID_EXIT
     END
@@ -16,7 +16,7 @@ BEGIN
         MENUITEM "&Desinstalar\tCtrl+Del", ID_UNINSTALL
         MENUITEM "&Modificar", ID_MODIFY
         MENUITEM SEPARATOR
-        MENUITEM "&Remover do Registro", ID_REGREMOVE
+        MENUITEM "&Remover do Registo", ID_REGREMOVE
         MENUITEM SEPARATOR
         MENUITEM "&Actualizar\tF5", ID_REFRESH
         MENUITEM SEPARATOR
@@ -46,7 +46,7 @@ BEGIN
         MENUITEM "&Desinstalar\tCtrl+Del", ID_UNINSTALL
         MENUITEM "&Modificar", ID_MODIFY
         MENUITEM SEPARATOR
-        MENUITEM "&Remover do Registro", ID_REGREMOVE
+        MENUITEM "&Remover do Registo", ID_REGREMOVE
         MENUITEM SEPARATOR
         MENUITEM "&Actualizar\tF5", ID_REFRESH
         MENUITEM SEPARATOR
@@ -61,7 +61,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Geral", -1, 4, 2, 240, 61
     AUTOCHECKBOX "&Salvar posição da janela", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12
-    AUTOCHECKBOX "&Actualizar esta lista de programas ao iniciar", IDC_UPDATE_AVLIST, 15, 29, 222, 12
+    AUTOCHECKBOX "&Actualizar a lista de programas ao iniciar", IDC_UPDATE_AVLIST, 15, 29, 222, 12
     AUTOCHECKBOX "&Registo de instalação e remoção de programas", IDC_LOG_ENABLED, 15, 46, 219, 12
     GROUPBOX "A carregar", -1, 4, 65, 240, 51
     LTEXT "Pasta de download:", -1, 16, 75, 100, 9
@@ -86,14 +86,14 @@ CAPTION "Instalação do programa"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "…", IDC_INSTALL_TEXT, 4, 5, 209, 35
-    AUTORADIOBUTTON "&Instalar com uma mídia (CD ou DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP
+    AUTORADIOBUTTON "&Instalar de (CD ou DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP
     AUTORADIOBUTTON "&Carregar e instalar", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 86, 78, 60, 14
     PUSHBUTTON "Cancelar", 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 "Download %ls…"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -107,7 +107,8 @@ BEGIN
     IDS_TOOLTIP_INSTALL "Instalar"
     IDS_TOOLTIP_UNINSTALL "Desinstalar"
     IDS_TOOLTIP_MODIFY "Modificar"
-    IDS_TOOLTIP_SETTINGS "Configurações"
+    IDS_TOOLTIP_SELECT_ALL "Select/Deselect todos"
+    IDS_TOOLTIP_SETTINGS "Definições"
     IDS_TOOLTIP_REFRESH "Actualizar"
     IDS_TOOLTIP_UPDATE_DB "Actualizar Database"
     IDS_TOOLTIP_EXIT "Sair"
@@ -178,13 +179,10 @@ 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; Seleccionados: %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/"
+    IDS_WELCOME_URL "https://reactos.org"
     IDS_INSTALLED "Instalado"
     IDS_AVAILABLEFORINST "Disponível para instalação"
     IDS_UPDATES "Actualizações"
@@ -202,7 +200,6 @@ BEGIN
     IDS_INTEG_CHECK_FAIL "O pacote não passou na verificação de integridade, pode ter sido corrompido ou adulterado durante o download. A execução do software não é recomendada."
     IDS_INTERRUPTED_DOWNLOAD "O download foi interrompido. Verifique a ligação com a Internet."
     IDS_UNABLE_TO_WRITE "Não é possível gravar no disco. O disco pode estar cheio."
-    IDS_SELECT_ALL "Select/Deselect todos"
     IDS_INSTALL_SELECTED "Instalar selecção"
     IDS_SELECTEDFORINST "Seleccionados para instalação"
     IDS_MISMATCH_CERT_INFO "O certificado usado é desconhecido:\nAssunto: %s\nIssuer: %s\nDeseja continuar mesmo assim?"
diff --git a/base/applications/rapps/lang/ro-RO.rc b/base/applications/rapps/lang/ro-RO.rc
index 48760d8b40c..6f91366c9ce 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 com)
- *          Bișoc George (fraizeraust99 at gmail dot com)
+ * TRANSLATORS: Stefan Fulea <stefan.fulea@mail.com>
+ *              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
@@ -114,6 +110,7 @@ BEGIN
     IDS_TOOLTIP_INSTALL "Instalează"
     IDS_TOOLTIP_UNINSTALL "Dezinstalează"
     IDS_TOOLTIP_MODIFY "Modifică"
+    IDS_TOOLTIP_SELECT_ALL "Selectează/Deselectează Toate"
     IDS_TOOLTIP_SETTINGS "Preferințe"
     IDS_TOOLTIP_REFRESH "Împrospătează"
     IDS_TOOLTIP_UPDATE_DB "Actualizează baza de date"
@@ -185,13 +182,10 @@ 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_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/"
+    IDS_WELCOME_URL "https://reactos.org"
     IDS_INSTALLED "Instalate"
     IDS_AVAILABLEFORINST "Disponibile pentru instalare"
     IDS_UPDATES "Actualizări"
@@ -209,7 +203,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 "Certificatul în uz este necunoscut:\nSubiect: %s\nEmitent: %s\nVreți să continuați oricum?"
diff --git a/base/applications/rapps/lang/ru-RU.rc b/base/applications/rapps/lang/ru-RU.rc
index a796bbad158..8976b2632ba 100644
--- a/base/applications/rapps/lang/ru-RU.rc
+++ b/base/applications/rapps/lang/ru-RU.rc
@@ -91,7 +91,7 @@ BEGIN
 END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220
-STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_SYSMENU | WS_VISIBLE
+STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE
 CAPTION "Загрузка %ls…"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -105,6 +105,7 @@ BEGIN
     IDS_TOOLTIP_INSTALL "Установить"
     IDS_TOOLTIP_UNINSTALL "Удалить"
     IDS_TOOLTIP_MODIFY "Изменить"
+    IDS_TOOLTIP_SELECT_ALL "Выбрать все"
     IDS_TOOLTIP_SETTINGS "Параметры"
     IDS_TOOLTIP_REFRESH "Обновить"
     IDS_TOOLTIP_UPDATE_DB "Обновить базу данных"
@@ -176,13 +177,10 @@ 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_WELCOME_TITLE "Добро пожаловать в ""Менеджер приложений ReactOS""!\n\n"
     IDS_WELCOME_TEXT "Выберите категорию слева и приложение для установки или удаления.\nСайт ReactOS: "
-    IDS_WELCOME_URL "https://reactos.org/"
+    IDS_WELCOME_URL "https://reactos.org"
     IDS_INSTALLED "Установленные"
     IDS_AVAILABLEFORINST "Доступно для установки"
     IDS_UPDATES "Обновления"
@@ -200,7 +198,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 "Используемый сертификат не опознан:\nНазначение: %s\nВыдан: %s\nВы хотите продолжить в любом случае?"
@@ -231,7 +228,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 2d685c7daa7..7a055876b7a 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
@@ -110,6 +108,7 @@ BEGIN
     IDS_TOOLTIP_INSTALL "Inštalovať"
     IDS_TOOLTIP_UNINSTALL "Odinštalovať"
     IDS_TOOLTIP_MODIFY "Zmeniť"
+    IDS_TOOLTIP_SELECT_ALL "Select/Deselect All"
     IDS_TOOLTIP_SETTINGS "Nastavenia"
     IDS_TOOLTIP_REFRESH "Obnoviť"
     IDS_TOOLTIP_UPDATE_DB "Update Database"
@@ -181,13 +180,10 @@ 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_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/"
+    IDS_WELCOME_URL "https://reactos.org"
     IDS_INSTALLED "Nainštalované"
     IDS_AVAILABLEFORINST "Dostupné pre nainštalovanie"
     IDS_UPDATES "Aktualizácie"
@@ -205,7 +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?"
diff --git a/base/applications/rapps/lang/sq-AL.rc b/base/applications/rapps/lang/sq-AL.rc
index 2ca8b8af787..b02a2dfbcd0 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
@@ -109,6 +108,7 @@ BEGIN
     IDS_TOOLTIP_INSTALL "Instalo"
     IDS_TOOLTIP_UNINSTALL "Uninstall"
     IDS_TOOLTIP_MODIFY "Modifiko"
+    IDS_TOOLTIP_SELECT_ALL "Select/Deselect All"
     IDS_TOOLTIP_SETTINGS "Konfigurime"
     IDS_TOOLTIP_REFRESH "Rifresko"
     IDS_TOOLTIP_UPDATE_DB "Update Database"
@@ -180,13 +180,10 @@ 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_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/"
+    IDS_WELCOME_URL "https://reactos.org"
     IDS_INSTALLED "Instaluar"
     IDS_AVAILABLEFORINST "Te vlefshem per instalim"
     IDS_UPDATES "Updates"
@@ -204,7 +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?"
diff --git a/base/applications/rapps/lang/sv-SE.rc b/base/applications/rapps/lang/sv-SE.rc
index e4a4595007f..4eaf75e4bb5 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
@@ -112,6 +109,7 @@ BEGIN
     IDS_TOOLTIP_INSTALL "Installera"
     IDS_TOOLTIP_UNINSTALL "Avinstallera"
     IDS_TOOLTIP_MODIFY "Redigera"
+    IDS_TOOLTIP_SELECT_ALL "Select/Deselect All"
     IDS_TOOLTIP_SETTINGS "Inställingar"
     IDS_TOOLTIP_REFRESH "Uppdatera"
     IDS_TOOLTIP_UPDATE_DB "Update Database"
@@ -183,13 +181,10 @@ 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_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/"
+    IDS_WELCOME_URL "https://reactos.org"
     IDS_INSTALLED "Installerat"
     IDS_AVAILABLEFORINST "Tillgängliga for installation"
     IDS_UPDATES "Uppdateringar"
@@ -207,7 +202,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?"
diff --git a/base/applications/rapps/lang/tr-TR.rc b/base/applications/rapps/lang/tr-TR.rc
index 65a322b212c..bb28c12b8e2 100644
--- a/base/applications/rapps/lang/tr-TR.rc
+++ b/base/applications/rapps/lang/tr-TR.rc
@@ -1,4 +1,4 @@
-/* TRANSLATORS: 2013-2016 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net), 2018 Ercan Ersoy (ercanersoy) (ercanersoy [at] ercanersoy [dot] net) */
+/* TRANSLATORS: 2013-2016 Erdem Ersoy <erdemersoy@erdemersoy.net>, 2018 Ercan Ersoy <ercanersoy@ercanersoy.net> */
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
@@ -12,8 +12,8 @@ BEGIN
     END
     POPUP "Y&azılım"
     BEGIN
-        MENUITEM "&Kur\tCtrl+Giriş", ID_INSTALL
-        MENUITEM "K&aldır\tCtrl+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 Kayıt Defteri'nden Kaldır", ID_REGREMOVE
@@ -42,8 +42,8 @@ IDR_APPLICATIONMENU MENU
 BEGIN
     POPUP "popup"
     BEGIN
-        MENUITEM "&Kur\tCtrl+Giriş", ID_INSTALL
-        MENUITEM "K&aldır\tCtrl+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 Kayıt Defteri'nden Kaldır", ID_REGREMOVE
@@ -62,7 +62,7 @@ BEGIN
     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 Programların Listesini Yenile", IDC_UPDATE_AVLIST, 15, 29, 222, 12
-    AUTOCHECKBOX "&Programların Kuruluşlarını ve Kaldırılışlarını Sakla", IDC_LOG_ENABLED, 15, 46, 219, 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
@@ -75,7 +75,7 @@ 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
@@ -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 "İndiriliyor %ls…"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -107,6 +107,7 @@ BEGIN
     IDS_TOOLTIP_INSTALL "Kur"
     IDS_TOOLTIP_UNINSTALL "Kaldır"
     IDS_TOOLTIP_MODIFY "Değiştir"
+    IDS_TOOLTIP_SELECT_ALL "Tümünü Seç/Seçileni Kaldır"
     IDS_TOOLTIP_SETTINGS "Ayarlar"
     IDS_TOOLTIP_REFRESH "Yenile"
     IDS_TOOLTIP_UPDATE_DB "Yazılım Veri Tabanını Yenile"
@@ -136,7 +137,7 @@ BEGIN
     IDS_INFO_COMMENTS "\nYorumlar: "
     IDS_INFO_INSTLOCATION "\nKurulum Konumu: "
     IDS_INFO_INSTALLSRC "\nKurulum Kaynağı: "
-    IDS_INFO_UNINSTALLSTR "\nKaldırma Sözcesi: "
+    IDS_INFO_UNINSTALLSTR "\nKaldırma Dizesi: "
     IDS_INFO_MODIFYPATH "\nDeğiştirme Yolu: "
     IDS_INFO_INSTALLDATE "\nKurulum Zamanı: "
 END
@@ -165,7 +166,7 @@ BEGIN
     IDS_CAT_GRAPHICS "Grafik"
     IDS_CAT_INTERNET "Ağ"
     IDS_CAT_LIBS "Kitaplıklar"
-    IDS_CAT_OFFICE "Büro"
+    IDS_CAT_OFFICE "Ofis"
     IDS_CAT_OTHER "Diğer"
     IDS_CAT_SCIENCE "Bilim"
     IDS_CAT_TOOLS "Araçlar"
@@ -178,20 +179,17 @@ 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; Seçili: %d"
     IDS_WELCOME_TITLE "ReactOS Uygulama Yöneticisi'ne hoş geldiniz.\n\n"
     IDS_WELCOME_TEXT "Solda bir kategori 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_WELCOME_URL "https://reactos.org"
     IDS_INSTALLED "Kurulanlar"
-    IDS_AVAILABLEFORINST "Kurulum İçin Bulunanlar"
+    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 programın 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! İnternet bağlantınızı yoklayınız!"
@@ -202,7 +200,6 @@ BEGIN
     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 "Tümünü Seç/Seçileni Kaldır"
     IDS_INSTALL_SELECTED "Seçileni Kur"
     IDS_SELECTEDFORINST "Kurulum için seçildi"
     IDS_MISMATCH_CERT_INFO "Kullanılan sertifika bilimmiyor:\nAçıklama: %s\nSertifikayı Veren: %s\nYine de sürdürmek istiyor musunuz?"
diff --git a/base/applications/rapps/lang/uk-UA.rc b/base/applications/rapps/lang/uk-UA.rc
index 9897b6aa0e4..d12797ead7d 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, Yaroslav Kibysh
  */
 
@@ -99,7 +96,7 @@ BEGIN
 END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220
-STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_SYSMENU | WS_VISIBLE
+STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE
 CAPTION "Завантаження %ls…"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -113,6 +110,7 @@ BEGIN
     IDS_TOOLTIP_INSTALL "Встановити"
     IDS_TOOLTIP_UNINSTALL "Видалити"
     IDS_TOOLTIP_MODIFY "Змінити"
+    IDS_TOOLTIP_SELECT_ALL "Вибрати все"
     IDS_TOOLTIP_SETTINGS "Налаштування"
     IDS_TOOLTIP_REFRESH "Оновити"
     IDS_TOOLTIP_UPDATE_DB "Оновити список програм"
@@ -184,13 +182,10 @@ 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_WELCOME_TITLE "Ласкаво просимо в Менеджер додатків ReactOS!\n\n"
     IDS_WELCOME_TEXT "Виберіть категорію зліва, а потім виберіть програми для встановлення чи видалення.\nСторінка ReactOS: "
-    IDS_WELCOME_URL "https://reactos.org/"
+    IDS_WELCOME_URL "https://reactos.org"
     IDS_INSTALLED "Встановлені"
     IDS_AVAILABLEFORINST "Доступні для встановлення"
     IDS_UPDATES "Оновлення"
@@ -208,7 +203,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?"
diff --git a/base/applications/rapps/lang/zh-CN.rc b/base/applications/rapps/lang/zh-CN.rc
index ba5784b312f..7e1dc5a2134 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>, Luo Yufan (njlyf2011@hotmail.com) */
+/* TRANSLATORS: Song Fuchang (0xfc) <sfc_0@yahoo.com.cn>
+ *              Li Keqing <auroracloud4096@gmail.com>, Luke Luo <njlyf2011@hotmail.com> */
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
 IDR_MAINMENU MENU
@@ -70,7 +70,7 @@ BEGIN
     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
@@ -93,7 +93,7 @@ BEGIN
 END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220
-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
@@ -107,6 +107,7 @@ BEGIN
     IDS_TOOLTIP_INSTALL "安装"
     IDS_TOOLTIP_UNINSTALL "卸载"
     IDS_TOOLTIP_MODIFY "修改"
+    IDS_TOOLTIP_SELECT_ALL "全选/全反选"
     IDS_TOOLTIP_SETTINGS "设置"
     IDS_TOOLTIP_REFRESH "刷新"
     IDS_TOOLTIP_UPDATE_DB "更新数据库"
@@ -178,13 +179,10 @@ 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_WELCOME_TITLE "欢迎使用 ReactOS 程序管理器！\n\n"
     IDS_WELCOME_TEXT "从左栏选择一个类别，然后选择要安装或卸载的程序。\nReactOS 网站："
-    IDS_WELCOME_URL "https://reactos.org/"
+    IDS_WELCOME_URL "https://reactos.org"
     IDS_INSTALLED "已安装"
     IDS_AVAILABLEFORINST "可安装"
     IDS_UPDATES "更新"
@@ -202,10 +200,9 @@ BEGIN
     IDS_INTEG_CHECK_FAIL "这个包没有通过完整性验证，它可能在下载过程中损坏或被人为篡改了。不推荐运行这个程序。"
     IDS_INTERRUPTED_DOWNLOAD "下载中断。请检查网络连接。"
     IDS_UNABLE_TO_WRITE "无法写入磁盘。磁盘可能已满。"
-    IDS_SELECT_ALL "全选/全反选"
     IDS_INSTALL_SELECTED "安装已选中的"
     IDS_SELECTEDFORINST "选中以安装"
-    IDS_MISMATCH_CERT_INFO "所使用的证书未知:\n主题: %s\n发行方: %s\n您是否仍然想继续？"
+    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 61a7e8ca874..7073e68447a 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,7 +62,7 @@ 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
     EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL
@@ -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
@@ -107,6 +107,7 @@ BEGIN
     IDS_TOOLTIP_INSTALL "安裝"
     IDS_TOOLTIP_UNINSTALL "解除安裝"
     IDS_TOOLTIP_MODIFY "修改"
+    IDS_TOOLTIP_SELECT_ALL "Select/Deselect All"
     IDS_TOOLTIP_SETTINGS "設定"
     IDS_TOOLTIP_REFRESH "重新整理"
     IDS_TOOLTIP_UPDATE_DB "更新資料庫"
@@ -163,7 +164,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 "其他"
@@ -178,13 +179,10 @@ 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_WELCOME_TITLE "歡迎來到 ReactOS 程式管理員！\n\n"
     IDS_WELCOME_TEXT "從左欄選擇一個類別，然後選擇要安裝或解除安裝的程式。\nReactOS 網站:"
-    IDS_WELCOME_URL "https://reactos.org/"
+    IDS_WELCOME_URL "https://reactos.org"
     IDS_INSTALLED "已安裝"
     IDS_AVAILABLEFORINST "可安裝"
     IDS_UPDATES "更新"
@@ -202,7 +200,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?"