[MSCTFIME] msctfime.rc turkish-sort

Addendum to 0.4.16-dev-79-g 17be785eef
[MSCTFIME] Add Turkish (tr-TR) translation (#7381 )
2025-10-06 08:22:58 +02:00 · 2024-09-28 21:41:16 +02:00 · 2024-09-28 21:24:09 +02:00 · 2024-09-28 21:23:28 +02:00 · 2024-09-28 21:20:32 +02:00 · 2024-09-28 18:28:15 +03:00
826 changed files with 34439 additions and 20262 deletions
--- a/base/applications/calc/convert.c
+++ b/base/applications/calc/convert.c
@@ -181,7 +181,7 @@ static const conv_t conv_CURRENCY[] = {
    DECLARE_CONV_UNIT(CURRENCY, LITHUANIAN_LITAS,   "$/3,45280", "$*3,45280")
    DECLARE_CONV_UNIT(CURRENCY, LUXEMBOURG_FRANC,   "$/40,3399", "$*40,3399")
    DECLARE_CONV_UNIT(CURRENCY, MALTESE_LIRA,       "$/0.42930", "$*0.42930")
-    DECLARE_CONV_UNIT(CURRENCY, PORTOGUESE_ESCUDO,  "$/200,482", "$*200,482")
+    DECLARE_CONV_UNIT(CURRENCY, PORTUGUESE_ESCUDO,  "$/200,482", "$*200,482")
    DECLARE_CONV_UNIT(CURRENCY, SLOVAK_KORUNA,      "$/30,126",  "$*30,126")
    DECLARE_CONV_UNIT(CURRENCY, SLOVENIAN_TOLAR,    "$/239,640", "$*239,640")
    DECLARE_CONV_UNIT(CURRENCY, SPANISH_PESETA,     "$/166,386", "$*166,386")
--- a/base/applications/calc/lang/bg-BG.rc
+++ b/base/applications/calc/lang/bg-BG.rc
@@ -1,7 +1,5 @@
 /* Превод на Български/ Bulgarian translation
 * https://reactos.org/wiki/Bulgarian_translation
- * FILE: base/applications/calc/lang/bg-BG.rc
- * Недовършен / Incomplete
 */

 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
@@ -10,15 +8,15 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Калкулатор за ReactOS"
+CAPTION "Калкулатор"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    CONTROL "Шстн", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
-    CONTROL "Дстн", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
-    CONTROL "Осм", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
-    CONTROL "Двоич", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10
+    AUTORADIOBUTTON "Шстн", IDC_RADIO_HEX, 8, 21, 30, 10
+    AUTORADIOBUTTON "Дстн", IDC_RADIO_DEC, 41, 21, 30, 10
+    AUTORADIOBUTTON "Осм", IDC_RADIO_OCT, 74, 21, 30, 10
+    AUTORADIOBUTTON "Двоич", IDC_RADIO_BIN, 107, 21, 30, 10
    GROUPBOX "", IDC_STATIC, 5, 34, 84, 20
    CONTROL "Обр", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10
    CONTROL "Хип", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -135,17 +133,13 @@ BEGIN
    PUSHBUTTON "Дроб", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    CONTROL "ЧДума", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 150, 21, 38, 10
-    CONTROL "ДДума", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 190, 21, 38, 10
-    CONTROL "Дума", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 230, 21, 38, 10
-    CONTROL "Байт", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 270, 21, 38, 10
-    CONTROL "Градуси", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
-    CONTROL "Радиани", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
-    CONTROL "Градиани", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10
+    AUTORADIOBUTTON "ЧДума", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "ДДума", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Дума", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Байт", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Градуси", IDC_RADIO_DEG, 150, 21, 45, 10
+    AUTORADIOBUTTON "Радиани", IDC_RADIO_RAD, 204, 21, 45, 10
+    AUTORADIOBUTTON "Градиани", IDC_RADIO_GRAD, 258, 21, 45, 10
    PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |
@@ -158,7 +152,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Калкулатор за ReactOS"
+CAPTION "Калкулатор"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -223,7 +217,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Калкулатор за ReactOS"
+CAPTION "Калкулатор"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -315,8 +309,8 @@ IDR_MENU_SCIENTIFIC_1 MENU
 BEGIN
    POPUP "&Обработка"
    BEGIN
-        MENUITEM "Запомняне\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Поставяне\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Запомняне\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Поставяне\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "Изглед"
    BEGIN
@@ -347,8 +341,8 @@ IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
    POPUP "&Обработка"
    BEGIN
-        MENUITEM "Запомняне\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Поставяне\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Запомняне\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Поставяне\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "Изглед"
    BEGIN
@@ -380,8 +374,8 @@ IDR_MENU_STANDARD MENU
 BEGIN
    POPUP "&Обработка"
    BEGIN
-        MENUITEM "Запомняне\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Поставяне\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Запомняне\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Поставяне\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "Изглед"
    BEGIN
@@ -510,7 +504,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Люксембургски франк"
    IDS_CURRENCY_MALTESE_LIRA "Малтийска лира"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO "Португалско ескудо"
+    IDS_CURRENCY_PORTUGUESE_ESCUDO "Португалско ескудо"
    IDS_CURRENCY_SLOVAK_KORUNA "Словашка крона"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Словенси толар"
    IDS_CURRENCY_SPANISH_PESETA "Испанска песета"
--- a/base/applications/calc/lang/cs-CZ.rc
+++ b/base/applications/calc/lang/cs-CZ.rc
@@ -1,6 +1,5 @@
-/* FILE:       base/applications/calc/lang/cs-CZ.rc
- * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com)
- * UPDATED:    2010-05-30
+/*
+ * TRANSLATOR: 2010 Radek Liska (Black_Fox) <radekliska@gmail.com>
 */

 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
@@ -9,15 +8,15 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS kalkulačka"
+CAPTION "Kalkulačka"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
-    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
-    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
-    CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10
+    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
+    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
+    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
+    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
    GROUPBOX "", IDC_STATIC, 5, 34, 84, 20
    CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10
    CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -134,17 +133,13 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 150, 21, 38, 10
-    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 190, 21, 38, 10
-    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 230, 21, 38, 10
-    CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 270, 21, 38, 10
-    CONTROL "Stupně", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
-    CONTROL "Radiány", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
-    CONTROL "Grady", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10
+    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Stupně", IDC_RADIO_DEG, 150, 21, 45, 10
+    AUTORADIOBUTTON "Radiány", IDC_RADIO_RAD, 204, 21, 45, 10
+    AUTORADIOBUTTON "Grady", IDC_RADIO_GRAD, 258, 21, 45, 10
    PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |
@@ -157,7 +152,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Kalkulačka"
+CAPTION "Kalkulačka"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -222,7 +217,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Kalkulačka"
+CAPTION "Kalkulačka"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -314,8 +309,8 @@ IDR_MENU_SCIENTIFIC_1 MENU
 BEGIN
    POPUP "Úpravy"
    BEGIN
-        MENUITEM "Kopírovat\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Vložit\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Kopírovat\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Vložit\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "Zobrazit"
    BEGIN
@@ -346,8 +341,8 @@ IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
    POPUP "Úpravy"
    BEGIN
-        MENUITEM "Kopírovat\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Vložit\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Kopírovat\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Vložit\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "Zobrazit"
    BEGIN
@@ -379,8 +374,8 @@ IDR_MENU_STANDARD MENU
 BEGIN
    POPUP "Úpravy"
    BEGIN
-        MENUITEM "Kopírovat\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Vložit\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Kopírovat\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Vložit\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "Zobrazit"
    BEGIN
@@ -509,7 +504,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Lucemburský frank"
    IDS_CURRENCY_MALTESE_LIRA "Maltská lira"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugalské escudo"
+    IDS_CURRENCY_PORTUGUESE_ESCUDO "Portugalské escudo"
    IDS_CURRENCY_SLOVAK_KORUNA "Slovenská koruna"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Slovinský tolar"
    IDS_CURRENCY_SPANISH_PESETA "Španělská peseta"
--- a/base/applications/calc/lang/de-DE.rc
+++ b/base/applications/calc/lang/de-DE.rc
@@ -4,15 +4,15 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Rechner"
+CAPTION "Rechner"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
-    CONTROL "Dez", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
-    CONTROL "Okt", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
-    CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10
+    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
+    AUTORADIOBUTTON "Dez", IDC_RADIO_DEC, 41, 21, 30, 10
+    AUTORADIOBUTTON "Okt", IDC_RADIO_OCT, 74, 21, 30, 10
+    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
    GROUPBOX "", IDC_STATIC, 5, 34, 84, 20
    CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10
    CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -129,17 +129,13 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 150, 21, 38, 10
-    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 190, 21, 38, 10
-    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 230, 21, 38, 10
-    CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 270, 21, 38, 10
-    CONTROL "Degree", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
-    CONTROL "Radiant", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
-    CONTROL "Grad", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10
+    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Degree", IDC_RADIO_DEG, 150, 21, 45, 10
+    AUTORADIOBUTTON "Radiant", IDC_RADIO_RAD, 204, 21, 45, 10
+    AUTORADIOBUTTON "Grad", IDC_RADIO_GRAD, 258, 21, 45, 10
    PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |
@@ -152,7 +148,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Rechner"
+CAPTION "Rechner"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -217,7 +213,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Rechner"
+CAPTION "Rechner"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -307,89 +303,89 @@ END

 IDR_MENU_SCIENTIFIC_1 MENU
 BEGIN
-    POPUP "Bearbeiten"
+    POPUP "&Bearbeiten"
    BEGIN
-        MENUITEM "Kopieren\tSTRG-C", IDM_EDIT_COPY
-        MENUITEM "Einfügen\tSTRG-V", IDM_EDIT_PASTE
+        MENUITEM "&Kopieren\tStrg-C", IDM_EDIT_COPY
+        MENUITEM "&Einfügen\tStrg-V", IDM_EDIT_PASTE
    END
-    POPUP "Ansicht"
+    POPUP "&Ansicht"
    BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD
-        MENUITEM "Wissenschaftlich", IDM_VIEW_SCIENTIFIC
-        MENUITEM "Konversion", IDM_VIEW_CONVERSION
+        MENUITEM "&Standard", IDM_VIEW_STANDARD
+        MENUITEM "&Wissenschaftlich", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Kon&version", IDM_VIEW_CONVERSION
        MENUITEM SEPARATOR
-        MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
-        MENUITEM "Dezimal\tF6", IDM_VIEW_DEC, CHECKED
-        MENUITEM "Oktal\tF7", IDM_VIEW_OCT, CHECKED
-        MENUITEM "Binär\tF8", IDM_VIEW_BIN, CHECKED
+        MENUITEM "&Hex\tF5", IDM_VIEW_HEX, CHECKED
+        MENUITEM "De&zimal\tF6", IDM_VIEW_DEC, CHECKED
+        MENUITEM "O&ktal\tF7", IDM_VIEW_OCT, CHECKED
+        MENUITEM "&Binär\tF8", IDM_VIEW_BIN, CHECKED
        MENUITEM SEPARATOR
-        MENUITEM "Degree\tF2", IDM_VIEW_DEG, CHECKED
-        MENUITEM "Radiant\tF3", IDM_VIEW_RAD, CHECKED
-        MENUITEM "Grad\tF4", IDM_VIEW_GRAD, CHECKED
+        MENUITEM "&Deg\tF2", IDM_VIEW_DEG, CHECKED
+        MENUITEM "&Rad\tF3", IDM_VIEW_RAD, CHECKED
+        MENUITEM "&Grad\tF4", IDM_VIEW_GRAD, CHECKED
        MENUITEM SEPARATOR
-        MENUITEM "Zifferngruppierung", IDM_VIEW_GROUP, CHECKED
+        MENUITEM "Zifferngr&uppierung", IDM_VIEW_GROUP, CHECKED
    END
-    POPUP "Hilfe"
+    POPUP "&?"
    BEGIN
-        MENUITEM "Hilfethemen", IDM_HELP_HELP
+        MENUITEM "&Hilfethemen", IDM_HELP_HELP
        MENUITEM SEPARATOR
-        MENUITEM "Info", IDM_HELP_ABOUT
+        MENUITEM "&Info", IDM_HELP_ABOUT
    END
 END

 IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
-    POPUP "Bearbeiten"
+    POPUP "&Bearbeiten"
    BEGIN
-        MENUITEM "Kopieren\tSTRG-C", IDM_EDIT_COPY
-        MENUITEM "Einfügen\tSTRG-V", IDM_EDIT_PASTE
+        MENUITEM "&Kopieren\tStrg-C", IDM_EDIT_COPY
+        MENUITEM "&Einfügen\tStrg-V", IDM_EDIT_PASTE
    END
-    POPUP "Ansicht"
+    POPUP "&Ansicht"
    BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD
-        MENUITEM "Wissenschaftlich", IDM_VIEW_SCIENTIFIC
-        MENUITEM "Konversion", IDM_VIEW_CONVERSION
+        MENUITEM "&Standard", IDM_VIEW_STANDARD
+        MENUITEM "&Wissenschaftlich", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Kon&version", IDM_VIEW_CONVERSION
        MENUITEM SEPARATOR
-        MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
-        MENUITEM "Dezimal\tF6", IDM_VIEW_DEC, CHECKED
-        MENUITEM "Oktal\tF7", IDM_VIEW_OCT, CHECKED
-        MENUITEM "Binär\tF8", IDM_VIEW_BIN, CHECKED
+        MENUITEM "&Hex\tF5", IDM_VIEW_HEX, CHECKED
+        MENUITEM "&Dezimal\tF6", IDM_VIEW_DEC, CHECKED
+        MENUITEM "O&ktal\tF7", IDM_VIEW_OCT, CHECKED
+        MENUITEM "Bi&när\tF8", IDM_VIEW_BIN, CHECKED
        MENUITEM SEPARATOR
-        MENUITEM "Qword\tF12", IDM_VIEW_QWORD, CHECKED
-        MENUITEM "Dword\tF2", IDM_VIEW_DWORD, CHECKED
-        MENUITEM "Word\tF3", IDM_VIEW_WORD, CHECKED
-        MENUITEM "Byte\tF4", IDM_VIEW_BYTE, CHECKED
+        MENUITEM "&Qword\tF12", IDM_VIEW_QWORD, CHECKED
+        MENUITEM "Dw&ord\tF2", IDM_VIEW_DWORD, CHECKED
+        MENUITEM "Wo&rd\tF3", IDM_VIEW_WORD, CHECKED
+        MENUITEM "&Byte\tF4", IDM_VIEW_BYTE, CHECKED
        MENUITEM SEPARATOR
-        MENUITEM "Zifferngruppierung", IDM_VIEW_GROUP, CHECKED
+        MENUITEM "Zifferngr&uppierung", IDM_VIEW_GROUP, CHECKED
    END
-    POPUP "Hilfe"
+    POPUP "&?"
    BEGIN
-        MENUITEM "Hilfethemen", IDM_HELP_HELP
+        MENUITEM "&Hilfethemen", IDM_HELP_HELP
        MENUITEM SEPARATOR
-        MENUITEM "Über ReactOS Rechner", IDM_HELP_ABOUT
+        MENUITEM "&Info", IDM_HELP_ABOUT
    END
 END

 IDR_MENU_STANDARD MENU
 BEGIN
-    POPUP "Bearbeiten"
+    POPUP "&Bearbeiten"
    BEGIN
-        MENUITEM "Kopieren\tSTRG-C", IDM_EDIT_COPY
-        MENUITEM "Einfügen\tSTRG-V", IDM_EDIT_PASTE
+        MENUITEM "&Kopieren\tStrg-C", IDM_EDIT_COPY
+        MENUITEM "&Einfügen\tStrg-V", IDM_EDIT_PASTE
    END
-    POPUP "Ansicht"
+    POPUP "&Ansicht"
    BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD
-        MENUITEM "Wissenschaftlich", IDM_VIEW_SCIENTIFIC
-        MENUITEM "Konversion", IDM_VIEW_CONVERSION
+        MENUITEM "&Standard", IDM_VIEW_STANDARD
+        MENUITEM "&Wissenschaftlich", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Kon&version", IDM_VIEW_CONVERSION
        MENUITEM SEPARATOR
-        MENUITEM "Zifferngruppierung", IDM_VIEW_GROUP, CHECKED
+        MENUITEM "Zifferngr&uppierung", IDM_VIEW_GROUP, CHECKED
    END
-    POPUP "Hilfe"
+    POPUP "&?"
    BEGIN
-        MENUITEM "Hilfethemen", IDM_HELP_HELP
+        MENUITEM "&Hilfethemen", IDM_HELP_HELP
        MENUITEM SEPARATOR
-        MENUITEM "Über ReactOS Rechner", IDM_HELP_ABOUT
+        MENUITEM "&Info", IDM_HELP_ABOUT
    END
 END

@@ -504,7 +500,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Luxemburgische Franc"
    IDS_CURRENCY_MALTESE_LIRA "Maltesische Lire"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugiesische Escudo"
+    IDS_CURRENCY_PORTUGUESE_ESCUDO "Portugiesische Escudo"
    IDS_CURRENCY_SLOVAK_KORUNA "Slowakische Krone"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenische Tolar"
    IDS_CURRENCY_SPANISH_PESETA "Spanische Peseta"
--- a/base/applications/calc/lang/el-GR.rc
+++ b/base/applications/calc/lang/el-GR.rc
@@ -9,10 +9,10 @@ MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
-    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
-    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
-    CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10
+    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
+    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
+    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
+    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
    GROUPBOX "", IDC_STATIC, 5, 34, 84, 20
    CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10
    CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -129,17 +129,13 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 150, 21, 38, 10
-    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 190, 21, 38, 10
-    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 230, 21, 38, 10
-    CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 270, 21, 38, 10
-    CONTROL "Βαθμοί", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
-    CONTROL "Μοίρες", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
-    CONTROL "Ακτίνια", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10
+    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Βαθμοί", IDC_RADIO_DEG, 150, 21, 45, 10
+    AUTORADIOBUTTON "Μοίρες", IDC_RADIO_RAD, 204, 21, 45, 10
+    AUTORADIOBUTTON "Ακτίνια", IDC_RADIO_GRAD, 258, 21, 45, 10
    PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |
@@ -309,8 +305,8 @@ IDR_MENU_SCIENTIFIC_1 MENU
 BEGIN
    POPUP "Επεξεργασία"
    BEGIN
-        MENUITEM "Αντιγραφή\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Επικόλληση\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Αντιγραφή\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Επικόλληση\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "View"
    BEGIN
@@ -341,8 +337,8 @@ IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
    POPUP "Επεξεργασία"
    BEGIN
-        MENUITEM "Αντιγραφή\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Επικόλληση\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Αντιγραφή\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Επικόλληση\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "View"
    BEGIN
@@ -374,8 +370,8 @@ IDR_MENU_STANDARD MENU
 BEGIN
    POPUP "Επεξεργασία"
    BEGIN
-        MENUITEM "Αντιγραφή\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Επικόλληση\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Αντιγραφή\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Επικόλληση\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "View"
    BEGIN
@@ -504,7 +500,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc"
    IDS_CURRENCY_MALTESE_LIRA "Μαλτέζικη λίρα"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO "Πορτογαλικό εσκούδο"
+    IDS_CURRENCY_PORTUGUESE_ESCUDO "Πορτογαλικό εσκούδο"
    IDS_CURRENCY_SLOVAK_KORUNA "Slovak koruna"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar"
    IDS_CURRENCY_SPANISH_PESETA "Ισπανική πεσέτα"
--- a/base/applications/calc/lang/en-US.rc
+++ b/base/applications/calc/lang/en-US.rc
@@ -4,15 +4,15 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Calculator"
+CAPTION "Calculator"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
-    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
-    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
-    CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10
+    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
+    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
+    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
+    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
    GROUPBOX "", IDC_STATIC, 5, 34, 84, 20
    CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10
    CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -129,17 +129,13 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 150, 21, 38, 10
-    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 190, 21, 38, 10
-    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 230, 21, 38, 10
-    CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 270, 21, 38, 10
-    CONTROL "Degrees", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
-    CONTROL "Radians", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
-    CONTROL "Gradians", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10
+    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Degrees", IDC_RADIO_DEG, 150, 21, 45, 10
+    AUTORADIOBUTTON "Radians", IDC_RADIO_RAD, 204, 21, 45, 10
+    AUTORADIOBUTTON "Gradians", IDC_RADIO_GRAD, 258, 21, 45, 10
    PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |
@@ -152,7 +148,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Calculator"
+CAPTION "Calculator"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -217,7 +213,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Calculator"
+CAPTION "Calculator"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -504,7 +500,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc"
    IDS_CURRENCY_MALTESE_LIRA "Maltese lira"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO "Portuguese escudo"
+    IDS_CURRENCY_PORTUGUESE_ESCUDO "Portuguese escudo"
    IDS_CURRENCY_SLOVAK_KORUNA "Slovak koruna"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar"
    IDS_CURRENCY_SPANISH_PESETA "Spanish peseta"
--- a/base/applications/calc/lang/es-ES.rc
+++ b/base/applications/calc/lang/es-ES.rc
@@ -10,15 +10,15 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculadora de ReactOS"
+CAPTION "Calculadora"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
-    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
-    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
-    CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10
+    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
+    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
+    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
+    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
    GROUPBOX "", IDC_STATIC, 5, 34, 84, 20
    CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10
    CONTROL "Hipotenusa", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 37, 41, 48, 10
@@ -135,17 +135,13 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 150, 21, 38, 10
-    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 190, 21, 38, 10
-    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 230, 21, 38, 10
-    CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 270, 21, 38, 10
-    CONTROL "Grados", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 151, 21, 45, 10
-    CONTROL "Radianes", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 198, 21, 45, 10
-    CONTROL "Gradianes", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 248, 21, 45, 10
+    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Grados", IDC_RADIO_DEG, 150, 21, 45, 10
+    AUTORADIOBUTTON "Radianes", IDC_RADIO_RAD, 204, 21, 45, 10
+    AUTORADIOBUTTON "Gradianes", IDC_RADIO_GRAD, 258, 21, 45, 10
    PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |
@@ -158,7 +154,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculadora de ReactOS"
+CAPTION "Calculadora"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -223,7 +219,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculadora de ReactOS"
+CAPTION "Calculadora"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -315,8 +311,8 @@ IDR_MENU_SCIENTIFIC_1 MENU
 BEGIN
    POPUP "Edición"
    BEGIN
-        MENUITEM "Copiar\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Pegar\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Copiar\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Pegar\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "Ver"
    BEGIN
@@ -347,8 +343,8 @@ IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
    POPUP "Edición"
    BEGIN
-        MENUITEM "Copiar\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Pegar\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Copiar\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Pegar\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "Ver"
    BEGIN
@@ -380,8 +376,8 @@ IDR_MENU_STANDARD MENU
 BEGIN
    POPUP "Edición"
    BEGIN
-        MENUITEM "Copiar\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Pegar\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Copiar\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Pegar\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "Ver"
    BEGIN
@@ -510,7 +506,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Franco luxemburgués"
    IDS_CURRENCY_MALTESE_LIRA "Lira maltesa"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo portugués"
+    IDS_CURRENCY_PORTUGUESE_ESCUDO "Escudo portugués"
    IDS_CURRENCY_SLOVAK_KORUNA "Corona eslovaca"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Tolar esloveno"
    IDS_CURRENCY_SPANISH_PESETA "Peseta española"
--- a/base/applications/calc/lang/fr-FR.rc
+++ b/base/applications/calc/lang/fr-FR.rc
@@ -4,15 +4,15 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculatrice ReactOS"
+CAPTION "Calculatrice"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
-    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
-    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
-    CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10
+    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
+    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
+    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
+    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
    GROUPBOX "", IDC_STATIC, 5, 34, 84, 20
    CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10
    CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -129,17 +129,13 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    CONTROL "Q-mot", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 150, 21, 38, 10
-    CONTROL "D-mot", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 190, 21, 38, 10
-    CONTROL "Mot", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 230, 21, 38, 10
-    CONTROL "Octet", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 270, 21, 38, 10
-    CONTROL "Degrés", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
-    CONTROL "Radians", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
-    CONTROL "Grades", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10
+    AUTORADIOBUTTON "Q-mot", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "D-mot", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Mot", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Octet", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Degrés", IDC_RADIO_DEG, 150, 21, 45, 10
+    AUTORADIOBUTTON "Radians", IDC_RADIO_RAD, 204, 21, 45, 10
+    AUTORADIOBUTTON "Grades", IDC_RADIO_GRAD, 258, 21, 45, 10
    PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |
@@ -152,7 +148,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculatrice ReactOS"
+CAPTION "Calculatrice"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -217,7 +213,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculatrice ReactOS"
+CAPTION "Calculatrice"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -309,8 +305,8 @@ IDR_MENU_SCIENTIFIC_1 MENU
 BEGIN
    POPUP "Édition"
    BEGIN
-        MENUITEM "Copier\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Coller\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Copier\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Coller\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "Affichage"
    BEGIN
@@ -341,8 +337,8 @@ IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
    POPUP "Édition"
    BEGIN
-        MENUITEM "Copier\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Coller\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Copier\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Coller\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "Affichage"
    BEGIN
@@ -374,8 +370,8 @@ IDR_MENU_STANDARD MENU
 BEGIN
    POPUP "Édition"
    BEGIN
-        MENUITEM "Copier\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Coller\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Copier\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Coller\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "Affichage"
    BEGIN
@@ -504,7 +500,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Franc luxembourgeois"
    IDS_CURRENCY_MALTESE_LIRA "Lire maltaise"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo portugaise"
+    IDS_CURRENCY_PORTUGUESE_ESCUDO "Escudo portugaise"
    IDS_CURRENCY_SLOVAK_KORUNA "Couronne slovaque"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Tolar slovène"
    IDS_CURRENCY_SPANISH_PESETA "Peseta espagnole"
--- a/base/applications/calc/lang/he-IL.rc
+++ b/base/applications/calc/lang/he-IL.rc
@@ -1,4 +1,4 @@
-/* Translated by Baruch Rutman */
+/* TRANSLATOR: Baruch Rutman */

 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT

@@ -7,15 +7,15 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_LAYOUTRTL
-CAPTION "מחשבון ReactOS"
+CAPTION "מחשבון"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 4 ,14, 141, 20
-    CONTROL "הקס", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 6, 21, 30, 10
-    CONTROL "עשרוני", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 36, 21, 34, 10
-    CONTROL "אוקטלי", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 73, 21, 37, 10
-    CONTROL "בינרי", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 113, 21, 30, 10
+    AUTORADIOBUTTON "הקס", IDC_RADIO_HEX, 6, 21, 30, 10
+    AUTORADIOBUTTON "עשרוני", IDC_RADIO_DEC, 36, 21, 34, 10
+    AUTORADIOBUTTON "אוקטלי", IDC_RADIO_OCT, 73, 21, 37, 10
+    AUTORADIOBUTTON "בינרי", IDC_RADIO_BIN, 113, 21, 30, 10
    GROUPBOX "", IDC_STATIC, 4, 34, 84, 20
    CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10
    CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -132,17 +132,13 @@ BEGIN
    PUSHBUTTON "A", IDC_BUTTON_A, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 150, 21, 38, 10
-    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 190, 21, 38, 10
-    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 230, 21, 38, 10
-    CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 270, 21, 38, 10
-    CONTROL "מעלות", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
-    CONTROL "רדיאנים", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
-    CONTROL "גרדיאנים", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10
+    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "מעלות", IDC_RADIO_DEG, 150, 21, 45, 10
+    AUTORADIOBUTTON "רדיאנים", IDC_RADIO_RAD, 204, 21, 45, 10
+    AUTORADIOBUTTON "גרדיאנים", IDC_RADIO_GRAD, 258, 21, 45, 10
    PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |
@@ -156,7 +152,7 @@ END
 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_LAYOUTRTL
-CAPTION "מחשבון ReactOS"
+CAPTION "מחשבון"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -222,7 +218,7 @@ END
 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_LAYOUTRTL
-CAPTION "מחשבון ReactOS"
+CAPTION "מחשבון"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -510,7 +506,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "פרנק לוקסמבורגי"
    IDS_CURRENCY_MALTESE_LIRA "לירה מלטזי"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO "אסקודו פורטגלי"
+    IDS_CURRENCY_PORTUGUESE_ESCUDO "אסקודו פורטגלי"
    IDS_CURRENCY_SLOVAK_KORUNA "קורונה סלובקית"
    IDS_CURRENCY_SLOVENIAN_TOLAR "טולר סלובני"
    IDS_CURRENCY_SPANISH_PESETA "פזטה ספרדית"
--- a/base/applications/calc/lang/hu-HU.rc
+++ b/base/applications/calc/lang/hu-HU.rc
@@ -1,9 +1,8 @@
 /*
 * PROJECT:    ReactOS Calculator
 * LICENSE:    GPL - See COPYING in the top level directory
- * FILE:       base/applications/calc/lang/hu-HU.rc
 * PURPOSE:    Hungarian Language File for ReactOS Calc
- * TRANSLATOR: Nagy Tibor (xnagytibor at gmail dot com)
+ * TRANSLATOR: Nagy Tibor <xnagytibor@gmail.com>
 */

 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
@@ -12,15 +11,15 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Számológép"
+CAPTION "Számológép"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
-    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
-    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
-    CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10
+    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
+    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
+    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
+    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
    GROUPBOX "", IDC_STATIC, 5, 34, 84, 20
    CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10
    CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -137,17 +136,13 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    CONTROL "Négyszó", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 150, 21, 38, 10
-    CONTROL "Duplaszó", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 190, 21, 38, 10
-    CONTROL "Szó", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 230, 21, 38, 10
-    CONTROL "Bájt", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 270, 21, 38, 10
-    CONTROL "Fok", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
-    CONTROL "Radián", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
-    CONTROL "Gradián", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10
+    AUTORADIOBUTTON "Négyszó", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Duplaszó", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Szó", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Bájt", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Fok", IDC_RADIO_DEG, 150, 21, 45, 10
+    AUTORADIOBUTTON "Radián", IDC_RADIO_RAD, 204, 21, 45, 10
+    AUTORADIOBUTTON "Gradián", IDC_RADIO_GRAD, 258, 21, 45, 10
    PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |
@@ -160,7 +155,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Számológép"
+CAPTION "Számológép"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -225,7 +220,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Számológép"
+CAPTION "Számológép"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -452,12 +447,12 @@ BEGIN
    IDS_AREA_ACRES_FRANCE "Acre (Franciaország)"
    IDS_AREA_ACRES_SCOTS "Acre (Skót)"
    IDS_AREA_ACRES_US "Acre (Egyesült Államok)"
-    IDS_AREA_ARES "Are" // ?
+    IDS_AREA_ARES "Are"
    IDS_AREA_CHOU "Chou"
    IDS_AREA_DANBO "Danbo"
    IDS_AREA_HECTARES "Hektár"
    IDS_AREA_JEONGBO "Jeongbo"
-    IDS_AREA_MORGEN_HUNGARY "Hold (Magyarország)" // ?
+    IDS_AREA_MORGEN_HUNGARY "Hold (Magyarország)"
    IDS_AREA_MU "Mu"
    IDS_AREA_PING "Ping"
    IDS_AREA_PYEONG "Pyeong"
@@ -465,19 +460,19 @@ BEGIN
    IDS_AREA_RAI "Rai"
    IDS_AREA_SE "Se"
    IDS_AREA_SQUARE_CENTIMETERS "Négyzetcentiméter"
-    IDS_AREA_SQUARE_CHR "Négyzetchr" // ?
-    IDS_AREA_SQUARE_FATHOMS "Négyzetöl" // Alt.: Négyszögöl
-    IDS_AREA_SQUARE_FATHOMS_HUNGARY "Négyzetöl (Magyarország)" // Alt.: Négyszögöl (Magyarország)
-    IDS_AREA_SQUARE_FEET "Négyzetláb" // Alt.: Négyszögláb
-    IDS_AREA_SQUARE_INCHES "Négyzethüvelyk" // Alt.: Négyszöghüvelyk
+    IDS_AREA_SQUARE_CHR "Négyzetchr"
+    IDS_AREA_SQUARE_FATHOMS "Négyzetöl"
+    IDS_AREA_SQUARE_FATHOMS_HUNGARY "Négyzetöl (Magyarország)"
+    IDS_AREA_SQUARE_FEET "Négyzetláb"
+    IDS_AREA_SQUARE_INCHES "Négyzethüvelyk"
    IDS_AREA_SQUARE_KILOMETERS "Négyzetkilométer"
-    IDS_AREA_SQUARE_LAR "Négyzetlar" // ?
+    IDS_AREA_SQUARE_LAR "Négyzetlar"
    IDS_AREA_SQUARE_METER "Négyzetméter"
    IDS_AREA_SQUARE_MILES "Négyzetmérföld"
    IDS_AREA_SQUARE_MILLIMETERS "Négyzetmilliméter"
-    IDS_AREA_SQUARE_SHAKU "Négyzetshaku" // ?
-    IDS_AREA_SQUARE_TSUEN "Négyzettsuen" // ?
-    IDS_AREA_SQUARE_VA "Négyzetva" // ?
+    IDS_AREA_SQUARE_SHAKU "Négyzetshaku"
+    IDS_AREA_SQUARE_TSUEN "Négyzettsuen"
+    IDS_AREA_SQUARE_VA "Négyzetva"
    IDS_AREA_SQUARE_YARD "Négyzetyard"
    IDS_AREA_TAN "Tan"
    IDS_AREA_TSUBO "Tsubo"
@@ -512,7 +507,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Luxemburgi frank"
    IDS_CURRENCY_MALTESE_LIRA "Máltai líra"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugál escudo"
+    IDS_CURRENCY_PORTUGUESE_ESCUDO "Portugál escudo"
    IDS_CURRENCY_SLOVAK_KORUNA "Szlovák korona"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Szlovén tolár"
    IDS_CURRENCY_SPANISH_PESETA "Spanyol pezeta"
--- a/base/applications/calc/lang/id-ID.rc
+++ b/base/applications/calc/lang/id-ID.rc
@@ -11,15 +11,15 @@ LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kalkulator ReactOS"
+CAPTION "Kalkulator"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
-    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
-    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
-    CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10
+    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
+    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
+    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
+    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
    GROUPBOX "", IDC_STATIC, 5, 34, 84, 20
    CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10
    CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -136,17 +136,13 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 150, 21, 38, 10
-    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 190, 21, 38, 10
-    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 230, 21, 38, 10
-    CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 270, 21, 38, 10
-    CONTROL "Derajat", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
-    CONTROL "Radian", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
-    CONTROL "Gradian", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10
+    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Derajat", IDC_RADIO_DEG, 150, 21, 45, 10
+    AUTORADIOBUTTON "Radian", IDC_RADIO_RAD, 204, 21, 45, 10
+    AUTORADIOBUTTON "Gradian", IDC_RADIO_GRAD, 258, 21, 45, 10
    PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |
@@ -159,7 +155,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kalkulator ReactOS"
+CAPTION "Kalkulator"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -224,7 +220,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kalkulator ReactOS"
+CAPTION "Kalkulator"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -511,7 +507,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Litas Lithuania"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Franc Luksemburg"
    IDS_CURRENCY_MALTESE_LIRA "Lira Malta"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo Portugis"
+    IDS_CURRENCY_PORTUGUESE_ESCUDO "Escudo Portugis"
    IDS_CURRENCY_SLOVAK_KORUNA "Koruna Slovakia"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Tolar Slovenia"
    IDS_CURRENCY_SPANISH_PESETA "Peseta Spanyol"
--- a/base/applications/calc/lang/it-IT.rc
+++ b/base/applications/calc/lang/it-IT.rc
@@ -4,15 +4,15 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calcolatrice ReactOS"
+CAPTION "Calcolatrice"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
-    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
-    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
-    CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10
+    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
+    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
+    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
+    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
    GROUPBOX "", IDC_STATIC, 5, 34, 84, 20
    CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10
    CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -129,17 +129,13 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 150, 21, 38, 10
-    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 190, 21, 38, 10
-    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 230, 21, 38, 10
-    CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 270, 21, 38, 10
-    CONTROL "Gradi", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
-    CONTROL "Radianti", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
-    CONTROL "Gradienti", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10
+    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Gradi", IDC_RADIO_DEG, 150, 21, 45, 10
+    AUTORADIOBUTTON "Radianti", IDC_RADIO_RAD, 204, 21, 45, 10
+    AUTORADIOBUTTON "Gradienti", IDC_RADIO_GRAD, 258, 21, 45, 10
    PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |
@@ -152,7 +148,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calcolatrice ReactOS"
+CAPTION "Calcolatrice"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -217,7 +213,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calcolatrice ReactOS"
+CAPTION "Calcolatrice"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -309,8 +305,8 @@ IDR_MENU_SCIENTIFIC_1 MENU
 BEGIN
    POPUP "Modifica"
    BEGIN
-        MENUITEM "Copia\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Incolla\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Copia\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Incolla\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "Visualizza"
    BEGIN
@@ -341,8 +337,8 @@ IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
    POPUP "Modifica"
    BEGIN
-        MENUITEM "Copia\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Incolla\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Copia\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Incolla\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "Visualizza"
    BEGIN
@@ -374,8 +370,8 @@ IDR_MENU_STANDARD MENU
 BEGIN
    POPUP "Modifica"
    BEGIN
-        MENUITEM "Copia\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Incolla\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Copia\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Incolla\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "Visualizza"
    BEGIN
@@ -504,7 +500,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Franco Lussemburghese"
    IDS_CURRENCY_MALTESE_LIRA "Lira maltese"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo portoghese"
+    IDS_CURRENCY_PORTUGUESE_ESCUDO "Escudo portoghese"
    IDS_CURRENCY_SLOVAK_KORUNA "Corona slovacca"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Tallero sloveno"
    IDS_CURRENCY_SPANISH_PESETA "Peseta spagnola"
--- a/base/applications/calc/lang/ja-JP.rc
+++ b/base/applications/calc/lang/ja-JP.rc
@@ -4,15 +4,15 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS 電卓"
+CAPTION "電卓"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 9, "MS UI Gothic", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    CONTROL "16進", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
-    CONTROL "10進", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
-    CONTROL "8進", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
-    CONTROL "2進", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10
+    AUTORADIOBUTTON "16進", IDC_RADIO_HEX, 8, 21, 30, 10
+    AUTORADIOBUTTON "10進", IDC_RADIO_DEC, 41, 21, 30, 10
+    AUTORADIOBUTTON "8進", IDC_RADIO_OCT, 74, 21, 30, 10
+    AUTORADIOBUTTON "2進", IDC_RADIO_BIN, 107, 21, 30, 10
    GROUPBOX "", IDC_STATIC, 5, 34, 84, 20
    CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10
    CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -129,17 +129,13 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 150, 21, 38, 10
-    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 190, 21, 38, 10
-    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 230, 21, 38, 10
-    CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 270, 21, 38, 10
-    CONTROL "Degrees", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
-    CONTROL "Radians", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
-    CONTROL "Gradians", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10
+    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Degrees", IDC_RADIO_DEG, 150, 21, 45, 10
+    AUTORADIOBUTTON "Radians", IDC_RADIO_RAD, 204, 21, 45, 10
+    AUTORADIOBUTTON "Gradians", IDC_RADIO_GRAD, 258, 21, 45, 10
    PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |
@@ -152,7 +148,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS 電卓"
+CAPTION "電卓"
 MENU IDR_MENU_STANDARD
 FONT 9, "MS UI Gothic", 0, 0, 0x1
 BEGIN
@@ -217,7 +213,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS 電卓"
+CAPTION "電卓"
 MENU IDR_MENU_STANDARD
 FONT 9, "MS UI Gothic"
 BEGIN
@@ -377,7 +373,7 @@ BEGIN
        MENUITEM "コピー(&C)\tCtrl+C", IDM_EDIT_COPY
        MENUITEM "貼り付け(&P)\tCtrl+V", IDM_EDIT_PASTE
    END
-    POPUP "表示"
+    POPUP "表示(&V)"
    BEGIN
        MENUITEM "標準(&T)", IDM_VIEW_STANDARD
        MENUITEM "関数電卓(&S)", IDM_VIEW_SCIENTIFIC
@@ -504,7 +500,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "ルクセンブルク フラン"
    IDS_CURRENCY_MALTESE_LIRA "マルタ リラ"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO "ポルトガル エスクード"
+    IDS_CURRENCY_PORTUGUESE_ESCUDO "ポルトガル エスクード"
    IDS_CURRENCY_SLOVAK_KORUNA "スロバキア コルナ"
    IDS_CURRENCY_SLOVENIAN_TOLAR "スロベニア tolar"
    IDS_CURRENCY_SPANISH_PESETA "スペイン ペセタ"
--- a/base/applications/calc/lang/ko-KR.rc
+++ b/base/applications/calc/lang/ko-KR.rc
@@ -6,15 +6,15 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS 계산기"
+CAPTION "계산기"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 9, "굴림", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
-    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
-    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
-    CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10
+    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
+    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
+    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
+    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
    GROUPBOX "", IDC_STATIC, 5, 34, 84, 20
    CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10
    CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -131,17 +131,13 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 150, 21, 38, 10
-    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 190, 21, 38, 10
-    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 230, 21, 38, 10
-    CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 270, 21, 38, 10
-    CONTROL "Degrees", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
-    CONTROL "Radians", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
-    CONTROL "Gradians", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10
+    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Degrees", IDC_RADIO_DEG, 150, 21, 45, 10
+    AUTORADIOBUTTON "Radians", IDC_RADIO_RAD, 204, 21, 45, 10
+    AUTORADIOBUTTON "Gradians", IDC_RADIO_GRAD, 258, 21, 45, 10
    PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |
@@ -154,7 +150,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS 계산기"
+CAPTION "계산기"
 MENU IDR_MENU_STANDARD
 FONT 9, "굴림", 0, 0, 0x1
 BEGIN
@@ -219,7 +215,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS 계산기 정보"
+CAPTION "계산기"
 MENU IDR_MENU_STANDARD
 FONT 9, "굴림"
 BEGIN
@@ -311,8 +307,8 @@ IDR_MENU_SCIENTIFIC_1 MENU
 BEGIN
    POPUP "편집"
    BEGIN
-        MENUITEM "복사\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "붙여넣기\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "복사\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "붙여넣기\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "보기"
    BEGIN
@@ -343,8 +339,8 @@ IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
    POPUP "편집"
    BEGIN
-        MENUITEM "복사\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "붙여넣기\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "복사\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "붙여넣기\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "보기"
    BEGIN
@@ -376,8 +372,8 @@ IDR_MENU_STANDARD MENU
 BEGIN
    POPUP "편집"
    BEGIN
-        MENUITEM "복사\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "붙여넣기\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "복사\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "붙여넣기\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "보기"
    BEGIN
@@ -506,7 +502,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc"
    IDS_CURRENCY_MALTESE_LIRA "Maltese lira"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo"
+    IDS_CURRENCY_PORTUGUESE_ESCUDO "Portuguese escudo"
    IDS_CURRENCY_SLOVAK_KORUNA "Slovak koruna"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar"
    IDS_CURRENCY_SPANISH_PESETA "Spanish peseta"
--- a/base/applications/calc/lang/nl-NL.rc
+++ b/base/applications/calc/lang/nl-NL.rc
@@ -4,15 +4,15 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Rekenmachine"
+CAPTION "Rekenmachine"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
-    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
-    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
-    CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10
+    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
+    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
+    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
+    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
    GROUPBOX "", IDC_STATIC, 5, 34, 84, 20
    CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10
    CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -129,17 +129,13 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 150, 21, 38, 10
-    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 190, 21, 38, 10
-    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 230, 21, 38, 10
-    CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 270, 21, 38, 10
-    CONTROL "Graden", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
-    CONTROL "Radialen", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
-    CONTROL "Gradiënten", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10
+    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Graden", IDC_RADIO_DEG, 150, 21, 45, 10
+    AUTORADIOBUTTON "Radialen", IDC_RADIO_RAD, 204, 21, 45, 10
+    AUTORADIOBUTTON "Gradiënten", IDC_RADIO_GRAD, 258, 21, 45, 10
    PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |
@@ -152,7 +148,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Rekenmachine"
+CAPTION "Rekenmachine"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -217,7 +213,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Rekenmachine"
+CAPTION "Rekenmachine"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -309,8 +305,8 @@ IDR_MENU_SCIENTIFIC_1 MENU
 BEGIN
    POPUP "Bewerken"
    BEGIN
-        MENUITEM "Kopiëren\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Plakken\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Kopiëren\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Plakken\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "Beeld"
    BEGIN
@@ -341,8 +337,8 @@ IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
    POPUP "Edit"
    BEGIN
-        MENUITEM "Kopiëren\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Plakken\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Kopiëren\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Plakken\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "Beeld"
    BEGIN
@@ -374,8 +370,8 @@ IDR_MENU_STANDARD MENU
 BEGIN
    POPUP "Edit"
    BEGIN
-        MENUITEM "Kopiëren\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Plakken\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Kopiëren\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Plakken\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "View"
    BEGIN
@@ -504,7 +500,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Luxemburgse franc"
    IDS_CURRENCY_MALTESE_LIRA "Maltese lira"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugese escudo"
+    IDS_CURRENCY_PORTUGUESE_ESCUDO "Portugese escudo"
    IDS_CURRENCY_SLOVAK_KORUNA "Slowaakse kroon"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Sloveense tolar"
    IDS_CURRENCY_SPANISH_PESETA "Spaanse peseta"
--- a/base/applications/calc/lang/no-NO.rc
+++ b/base/applications/calc/lang/no-NO.rc
@@ -4,15 +4,15 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Kalkulator"
+CAPTION "Kalkulator"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    CONTROL "Heks", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
-    CONTROL "Des", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
-    CONTROL "Okt", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
-    CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10
+    AUTORADIOBUTTON "Heks", IDC_RADIO_HEX, 8, 21, 30, 10
+    AUTORADIOBUTTON "Des", IDC_RADIO_DEC, 41, 21, 30, 10
+    AUTORADIOBUTTON "Okt", IDC_RADIO_OCT, 74, 21, 30, 10
+    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
    GROUPBOX "", IDC_STATIC, 5, 34, 84, 20
    CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10
    CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -129,17 +129,13 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 150, 21, 38, 10
-    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 190, 21, 38, 10
-    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 230, 21, 38, 10
-    CONTROL "Tegn", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 270, 21, 38, 10
-    CONTROL "Grader", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
-    CONTROL "Radianer", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
-    CONTROL "Gradienter", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10
+    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Tegn", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Grader", IDC_RADIO_DEG, 150, 21, 45, 10
+    AUTORADIOBUTTON "Radianer", IDC_RADIO_RAD, 204, 21, 45, 10
+    AUTORADIOBUTTON "Gradienter", IDC_RADIO_GRAD, 258, 21, 45, 10
    PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |
@@ -152,7 +148,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Kalkulator"
+CAPTION "Kalkulator"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -217,7 +213,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Kalkulator"
+CAPTION "Kalkulator"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -309,8 +305,8 @@ IDR_MENU_SCIENTIFIC_1 MENU
 BEGIN
    POPUP "Rediger"
    BEGIN
-        MENUITEM "Kopier\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Lim inn\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Kopier\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Lim inn\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "Vis"
    BEGIN
@@ -341,8 +337,8 @@ IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
    POPUP "Rediger"
    BEGIN
-        MENUITEM "Kopier\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Lim inn\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Kopier\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Lim inn\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "Vis"
    BEGIN
@@ -374,8 +370,8 @@ IDR_MENU_STANDARD MENU
 BEGIN
    POPUP "Rediger"
    BEGIN
-        MENUITEM "Kopier\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Lim inn\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Kopier\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Lim inn\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "Vis"
    BEGIN
@@ -504,7 +500,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc"
    IDS_CURRENCY_MALTESE_LIRA "Maltesisk lira"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO "Portogisisk escudo"
+    IDS_CURRENCY_PORTUGUESE_ESCUDO "Portugisisk escudo"
    IDS_CURRENCY_SLOVAK_KORUNA "Slovansk koruna"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenansk tolar"
    IDS_CURRENCY_SPANISH_PESETA "Spansk peseta"
--- a/base/applications/calc/lang/pl-PL.rc
+++ b/base/applications/calc/lang/pl-PL.rc
@@ -1,10 +1,8 @@
 /*
- *    Translated by Caemyr - Olaf Siejka (Feb, Jun 2008)
- *    Use ReactOS forum PM or IRC to contact me
- *    https://reactos.org
- *    IRC: irc.freenode.net #reactos-pl;
- *    Updated by Saibamen - Adam Stachowicz (saibamenppl@gmail.com) (Apr, 2011)
- *    UTF-8 conversion by Caemyr (May, 2011)
+ * Translated by Caemyr - Olaf Siejka 2008-2011
+ * Use ReactOS forum PM or IRC to contact me
+ * IRC: irc.freenode.net #reactos-pl;
+ * Updated by Saibamen - Adam Stachowicz <saibamenppl@gmail.com> 2011
 */

 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
@@ -13,15 +11,15 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kalkulator ReactOS"
+CAPTION "Kalkulator"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
-    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
-    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
-    CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10
+    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
+    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
+    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
+    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
    GROUPBOX "", IDC_STATIC, 5, 34, 84, 20
    CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10
    CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -138,17 +136,13 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 150, 21, 38, 10
-    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 190, 21, 38, 10
-    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 230, 21, 38, 10
-    CONTROL "Bajt", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 270, 21, 38, 10
-    CONTROL "Stopnie", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
-    CONTROL "Radiany", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
-    CONTROL "Gradusy", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10
+    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Bajt", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Stopnie", IDC_RADIO_DEG, 150, 21, 45, 10
+    AUTORADIOBUTTON "Radiany", IDC_RADIO_RAD, 204, 21, 45, 10
+    AUTORADIOBUTTON "Gradusy", IDC_RADIO_GRAD, 258, 21, 45, 10
    PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |
@@ -161,7 +155,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kalkulator ReactOS"
+CAPTION "Kalkulator"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -226,7 +220,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kalkulator ReactOS"
+CAPTION "Kalkulator"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -318,8 +312,8 @@ IDR_MENU_SCIENTIFIC_1 MENU
 BEGIN
    POPUP "Edycja"
    BEGIN
-        MENUITEM "Kopiuj\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Wklej\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Kopiuj\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Wklej\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "Wygląd"
    BEGIN
@@ -350,8 +344,8 @@ IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
    POPUP "Edycja"
    BEGIN
-        MENUITEM "Kopiuj\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Wklej\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Kopiuj\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Wklej\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "Wygląd"
    BEGIN
@@ -383,8 +377,8 @@ IDR_MENU_STANDARD MENU
 BEGIN
    POPUP "Edycja"
    BEGIN
-        MENUITEM "Kopiuj\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Wklej\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Kopiuj\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Wklej\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "Wygląd"
    BEGIN
@@ -513,7 +507,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Litewski lit"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Luksemburski frank"
    IDS_CURRENCY_MALTESE_LIRA "Maltańskie liry"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugalskie escudo"
+    IDS_CURRENCY_PORTUGUESE_ESCUDO "Portugalskie escudo"
    IDS_CURRENCY_SLOVAK_KORUNA "Słowacka korona"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Słoveński tolar"
    IDS_CURRENCY_SPANISH_PESETA "Hiszpańska peseta"
--- a/base/applications/calc/lang/pt-BR.rc
+++ b/base/applications/calc/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

@@ -6,15 +6,15 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculadora ReactOS"
+CAPTION "Calculadora"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
-    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
-    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
-    CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10
+    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
+    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
+    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
+    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
    GROUPBOX "", IDC_STATIC, 5, 34, 84, 20
    CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10
    CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -131,17 +131,13 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 150, 21, 38, 10
-    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 190, 21, 38, 10
-    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 230, 21, 38, 10
-    CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 270, 21, 38, 10
-    CONTROL "Graus", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
-    CONTROL "Radianos", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
-    CONTROL "Grados", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10
+    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Graus", IDC_RADIO_DEG, 150, 21, 45, 10
+    AUTORADIOBUTTON "Radianos", IDC_RADIO_RAD, 204, 21, 45, 10
+    AUTORADIOBUTTON "Grados", IDC_RADIO_GRAD, 258, 21, 45, 10
    PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |
@@ -154,7 +150,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculadora ReactOS"
+CAPTION "Calculadora"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -219,7 +215,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculadora ReactOS"
+CAPTION "Calculadora"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -506,7 +502,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Franco luxemburguês"
    IDS_CURRENCY_MALTESE_LIRA "Lira maltesa"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo português"
+    IDS_CURRENCY_PORTUGUESE_ESCUDO "Escudo português"
    IDS_CURRENCY_SLOVAK_KORUNA "Coroa eslovaca"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Tolar"
    IDS_CURRENCY_SPANISH_PESETA "Peseta"
--- a/base/applications/calc/lang/pt-PT.rc
+++ b/base/applications/calc/lang/pt-PT.rc
@@ -1,4 +1,4 @@
-/* Translation and UTF-8 Conversion by Gabriel Aguiar <fgygh5804@gmail.com,fgsoftwarestudio@gmail.com> (July, 2021) */
+/* TRANSLATOR: 2021 Gabriel Aguiar <fgygh5804@gmail.com,fgsoftwarestudio@gmail.com> */

 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL

@@ -6,15 +6,15 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculadora ReactOS"
+CAPTION "Calculadora"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
-    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
-    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
-    CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10
+    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
+    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
+    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
+    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
    GROUPBOX "", IDC_STATIC, 5, 34, 84, 20
    CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10
    CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -131,17 +131,13 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 150, 21, 38, 10
-    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 190, 21, 38, 10
-    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 230, 21, 38, 10
-    CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 270, 21, 38, 10
-    CONTROL "Graus", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
-    CONTROL "Radianos", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
-    CONTROL "Grados", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10
+    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Graus", IDC_RADIO_DEG, 150, 21, 45, 10
+    AUTORADIOBUTTON "Radianos", IDC_RADIO_RAD, 204, 21, 45, 10
+    AUTORADIOBUTTON "Grados", IDC_RADIO_GRAD, 258, 21, 45, 10
    PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |
@@ -154,7 +150,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculadora ReactOS"
+CAPTION "Calculadora"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -219,7 +215,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculadora ReactOS"
+CAPTION "Calculadora"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -506,7 +502,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Franco luxemburguês"
    IDS_CURRENCY_MALTESE_LIRA "Lira maltesa"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo português"
+    IDS_CURRENCY_PORTUGUESE_ESCUDO "Escudo português"
    IDS_CURRENCY_SLOVAK_KORUNA "Coroa eslovaca"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Tolar"
    IDS_CURRENCY_SPANISH_PESETA "Peseta"
--- a/base/applications/calc/lang/ro-RO.rc
+++ b/base/applications/calc/lang/ro-RO.rc
@@ -18,10 +18,10 @@ MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
-    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
-    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
-    CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10
+    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
+    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
+    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
+    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
    GROUPBOX "", IDC_STATIC, 5, 34, 84, 20
    CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10
    CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -138,17 +138,13 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    CONTROL "64 biți", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 150, 21, 38, 10
-    CONTROL "32 biți", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 190, 21, 38, 10
-    CONTROL "16 biți", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 230, 21, 38, 10
-    CONTROL "8 biți", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 270, 21, 38, 10
-    CONTROL "Grade", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
-    CONTROL "Radiani", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
-    CONTROL "Gradiani", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10
+    AUTORADIOBUTTON "64 biți", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "32 biți", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "16 biți", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "8 biți", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Grade", IDC_RADIO_DEG, 150, 21, 45, 10
+    AUTORADIOBUTTON "Radiani", IDC_RADIO_RAD, 204, 21, 45, 10
+    AUTORADIOBUTTON "Gradiani", IDC_RADIO_GRAD, 258, 21, 45, 10
    PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |
@@ -350,8 +346,8 @@ IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
    POPUP "&Editare"
    BEGIN
-        MENUITEM "&Copiere\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "&Lipire\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "&Copiere\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "&Lipire\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "&Vizualizare"
    BEGIN
@@ -383,8 +379,8 @@ IDR_MENU_STANDARD MENU
 BEGIN
    POPUP "&Editare"
    BEGIN
-        MENUITEM "&Copiere\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "&Lipire\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "&Copiere\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "&Lipire\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "&Vizualizare"
    BEGIN
@@ -513,7 +509,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Litas lituanian"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Franc luxemburghez"
    IDS_CURRENCY_MALTESE_LIRA "Litră malteză"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo portughez"
+    IDS_CURRENCY_PORTUGUESE_ESCUDO "Escudo portughez"
    IDS_CURRENCY_SLOVAK_KORUNA "Coroană slovacă"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Tolar sloven"
    IDS_CURRENCY_SPANISH_PESETA "Peseta spaniolă"
--- a/base/applications/calc/lang/ru-RU.rc
+++ b/base/applications/calc/lang/ru-RU.rc
@@ -9,10 +9,10 @@ MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
-    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
-    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
-    CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10
+    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
+    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
+    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
+    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
    GROUPBOX "", IDC_STATIC, 5, 34, 84, 20
    CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10
    CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -129,17 +129,13 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    CONTROL "8 байт", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 150, 21, 38, 10
-    CONTROL "4 байт", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 190, 21, 38, 10
-    CONTROL "2 байт", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 230, 21, 38, 10
-    CONTROL "1 байт", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 270, 21, 38, 10
-    CONTROL "Градусы", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
-    CONTROL "Радианы", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
-    CONTROL "Грады", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10
+    AUTORADIOBUTTON "8 байт", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "4 байт", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "2 байт", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "1 байт", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Градусы", IDC_RADIO_DEG, 150, 21, 45, 10
+    AUTORADIOBUTTON "Радианы", IDC_RADIO_RAD, 204, 21, 45, 10
+    AUTORADIOBUTTON "Грады", IDC_RADIO_GRAD, 258, 21, 45, 10
    PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |
@@ -309,8 +305,8 @@ IDR_MENU_SCIENTIFIC_1 MENU
 BEGIN
    POPUP "&Правка"
    BEGIN
-        MENUITEM "&Копировать\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Вст&авить\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "&Копировать\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Вст&авить\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "В&ид"
    BEGIN
@@ -341,8 +337,8 @@ IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
    POPUP "&Правка"
    BEGIN
-        MENUITEM "&Копировать\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Вст&авить\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "&Копировать\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Вст&авить\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "В&ид"
    BEGIN
@@ -374,8 +370,8 @@ IDR_MENU_STANDARD MENU
 BEGIN
    POPUP "&Правка"
    BEGIN
-        MENUITEM "&Копировать\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Вст&авить\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "&Копировать\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Вст&авить\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "В&ид"
    BEGIN
@@ -504,7 +500,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Литовский лит"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Люксембургский франк"
    IDS_CURRENCY_MALTESE_LIRA "Мальтийская лира"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO "Португальское эскудо"
+    IDS_CURRENCY_PORTUGUESE_ESCUDO "Португальское эскудо"
    IDS_CURRENCY_SLOVAK_KORUNA "Словацкая крона"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Словенский толар"
    IDS_CURRENCY_SPANISH_PESETA "Испанская песета"
--- a/base/applications/calc/lang/sk-SK.rc
+++ b/base/applications/calc/lang/sk-SK.rc
@@ -1,7 +1,4 @@
-/* TRANSLATOR : Mário Kačmár /Mario Kacmar/ aka Kario (kario@szm.sk)
- * DATE OF TR.: 30-01-2008
- * LAST CHANGE: 09-08-2011
- * ---------------------------------------
+/* TRANSLATOR: 2008-2011 Mário Kačmár /Mario Kacmar/ aka Kario <kario@szm.sk>
 * TODO: pridanie navigačných značiek "&" ?
 */

@@ -11,15 +8,15 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kalkulačka systému ReactOS"
+CAPTION "Kalkulačka"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
-    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
-    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
-    CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10
+    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
+    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
+    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
+    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
    GROUPBOX "", IDC_STATIC, 5, 34, 84, 20
    CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10
    CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -136,17 +133,13 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 150, 21, 38, 10
-    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 190, 21, 38, 10
-    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 230, 21, 38, 10
-    CONTROL "Bajt", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 270, 21, 38, 10
-    CONTROL "Stupne", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
-    CONTROL "Radiány", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
-    CONTROL "Grady", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10
+    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Bajt", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Stupne", IDC_RADIO_DEG, 150, 21, 45, 10
+    AUTORADIOBUTTON "Radiány", IDC_RADIO_RAD, 204, 21, 45, 10
+    AUTORADIOBUTTON "Grady", IDC_RADIO_GRAD, 258, 21, 45, 10
    PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |
@@ -159,7 +152,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kalkulačka systému ReactOS"
+CAPTION "Kalkulačka"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -224,7 +217,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kalkulačka systému ReactOS"
+CAPTION "Kalkulačka"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -316,8 +309,8 @@ IDR_MENU_SCIENTIFIC_1 MENU
 BEGIN
    POPUP "Úpravy"
    BEGIN
-        MENUITEM "Kopírovať\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Prilepiť\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Kopírovať\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Prilepiť\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "Zobraziť"
    BEGIN
@@ -348,8 +341,8 @@ IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
    POPUP "Úpravy"
    BEGIN
-        MENUITEM "Kopírovať\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Prilepiť\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Kopírovať\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Prilepiť\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "Zobraziť"
    BEGIN
@@ -381,8 +374,8 @@ IDR_MENU_STANDARD MENU
 BEGIN
    POPUP "Úpravy"
    BEGIN
-        MENUITEM "Kopírovať\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Prilepiť\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Kopírovať\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Prilepiť\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "Zobraziť"
    BEGIN
@@ -511,7 +504,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Luxemburský frank"
    IDS_CURRENCY_MALTESE_LIRA "Maltská líra"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugalské escudo"
+    IDS_CURRENCY_PORTUGUESE_ESCUDO "Portugalské escudo"
    IDS_CURRENCY_SLOVAK_KORUNA "Slovenská koruna"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Slovinský toliar"
    IDS_CURRENCY_SPANISH_PESETA "Španielska peseta"
--- a/base/applications/calc/lang/sq-AL.rc
+++ b/base/applications/calc/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
@@ -8,15 +7,15 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Makine Llogaritje"
+CAPTION "Makine Llogaritje"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
-    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
-    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
-    CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10
+    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
+    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
+    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
+    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
    GROUPBOX "", IDC_STATIC, 5, 34, 84, 20
    CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10
    CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -133,17 +132,13 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 150, 21, 38, 10
-    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 190, 21, 38, 10
-    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 230, 21, 38, 10
-    CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 270, 21, 38, 10
-    CONTROL "Degrees", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
-    CONTROL "Radians", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
-    CONTROL "Gradians", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10
+    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Degrees", IDC_RADIO_DEG, 150, 21, 45, 10
+    AUTORADIOBUTTON "Radians", IDC_RADIO_RAD, 204, 21, 45, 10
+    AUTORADIOBUTTON "Gradians", IDC_RADIO_GRAD, 258, 21, 45, 10
    PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |
@@ -156,7 +151,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Makine Llogaritje"
+CAPTION "Makine Llogaritje"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -221,7 +216,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Makine Llogaritje"
+CAPTION "Makine Llogaritje"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -508,7 +503,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc"
    IDS_CURRENCY_MALTESE_LIRA "Lira Maltese"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo Portugez"
+    IDS_CURRENCY_PORTUGUESE_ESCUDO "Escudo Portugez"
    IDS_CURRENCY_SLOVAK_KORUNA "Koruna Sllovake"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Tolari Slloven"
    IDS_CURRENCY_SPANISH_PESETA "Peseta Spanjolle"
--- a/base/applications/calc/lang/sv-SE.rc
+++ b/base/applications/calc/lang/sv-SE.rc
@@ -1,6 +1,5 @@
 /*
 * PROJECT:     ReactOS CALC
- * FILE:        base/applications/calc/lang/sv-SE.rc
 * PURPOSE:     Swedish resource file
 * Translation: Jaix Bly
 */
@@ -11,15 +10,15 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Kalkylator"
+CAPTION "Kalkylator"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
-    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
-    CONTROL "Okt", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
-    CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10
+    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
+    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
+    AUTORADIOBUTTON "Okt", IDC_RADIO_OCT, 74, 21, 30, 10
+    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
    GROUPBOX "", IDC_STATIC, 5, 34, 84, 20
    CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10
    CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -136,17 +135,13 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 150, 21, 38, 10
-    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 190, 21, 38, 10
-    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 230, 21, 38, 10
-    CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 270, 21, 38, 10
-    CONTROL "Grader", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
-    CONTROL "Radianer", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
-    CONTROL "Gradienter", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10
+    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Grader", IDC_RADIO_DEG, 150, 21, 45, 10
+    AUTORADIOBUTTON "Radianer", IDC_RADIO_RAD, 204, 21, 45, 10
+    AUTORADIOBUTTON "Gradienter", IDC_RADIO_GRAD, 258, 21, 45, 10
    PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |
@@ -159,7 +154,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Kalkylator"
+CAPTION "Kalkylator"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -224,7 +219,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Kalkylator"
+CAPTION "Kalkylator"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -316,8 +311,8 @@ IDR_MENU_SCIENTIFIC_1 MENU
 BEGIN
    POPUP "Redigera"
    BEGIN
-        MENUITEM "Kopiera\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Klistra in\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Kopiera\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Klistra in\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "Visa"
    BEGIN
@@ -348,8 +343,8 @@ IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
    POPUP "Redigera"
    BEGIN
-        MENUITEM "Kopiera\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Klistra in\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Kopiera\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Klistra in\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "Vis"
    BEGIN
@@ -381,8 +376,8 @@ IDR_MENU_STANDARD MENU
 BEGIN
    POPUP "Redigera"
    BEGIN
-        MENUITEM "Kopiera\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Klistra in\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Kopiera\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Klistra in\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "Visa"
    BEGIN
@@ -511,7 +506,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Litauenisk litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc"
    IDS_CURRENCY_MALTESE_LIRA "Maltesisk lire"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugisisk escudo"
+    IDS_CURRENCY_PORTUGUESE_ESCUDO "Portugisisk escudo"
    IDS_CURRENCY_SLOVAK_KORUNA "Slovakisk koruna"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Slovensk tolar"
    IDS_CURRENCY_SPANISH_PESETA "Spansk peseta"
--- a/base/applications/calc/lang/th-TH.rc
+++ b/base/applications/calc/lang/th-TH.rc
@@ -4,15 +4,15 @@ LANGUAGE LANG_THAI, SUBLANG_DEFAULT

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "เครื่องคิดเลข ReactOS"
+CAPTION "เครื่องคิดเลข"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    CONTROL "สิบหก", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
-    CONTROL "สิบ", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
-    CONTROL "แปด", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
-    CONTROL "สอง", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10
+    AUTORADIOBUTTON "สิบหก", IDC_RADIO_HEX, 8, 21, 30, 10
+    AUTORADIOBUTTON "สิบ", IDC_RADIO_DEC, 41, 21, 30, 10
+    AUTORADIOBUTTON "แปด", IDC_RADIO_OCT, 74, 21, 30, 10
+    AUTORADIOBUTTON "สอง", IDC_RADIO_BIN, 107, 21, 30, 10
    GROUPBOX "", IDC_STATIC, 5, 34, 84, 20
    CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10
    CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -129,17 +129,13 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    CONTROL "สี่เวิร์ด", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 150, 21, 38, 10
-    CONTROL "สองเวิร์ด", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 190, 21, 38, 10
-    CONTROL "เวิร์ด", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 230, 21, 38, 10
-    CONTROL "ไบต์", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 270, 21, 38, 10
-    CONTROL "องศา", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
-    CONTROL "เรเดียน", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
-    CONTROL "เกรเดียน", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10
+    AUTORADIOBUTTON "สี่เวิร์ด", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "สองเวิร์ด", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "เวิร์ด", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "ไบต", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "องศา", IDC_RADIO_DEG, 150, 21, 45, 10
+    AUTORADIOBUTTON "เกรเดียน", IDC_RADIO_RAD, 204, 21, 45, 10
+    AUTORADIOBUTTON "Gradians", IDC_RADIO_GRAD, 258, 21, 45, 10
    PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |
@@ -217,7 +213,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "เครื่องคิดเลข ReactOS"
+CAPTION "เครื่องคิดเลข"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -309,8 +305,8 @@ IDR_MENU_SCIENTIFIC_1 MENU
 BEGIN
    POPUP "แ&ก้ไข"
    BEGIN
-        MENUITEM "คัดลอก\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "วาง\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "คัดลอก\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "วาง\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "&มุมมอง"
    BEGIN
@@ -341,8 +337,8 @@ IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
    POPUP "แ&ก้ไข"
    BEGIN
-        MENUITEM "คัดลอก\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "วาง\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "คัดลอก\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "วาง\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "&มุมมอง"
    BEGIN
@@ -374,8 +370,8 @@ IDR_MENU_STANDARD MENU
 BEGIN
    POPUP "แ&ก้ไข"
    BEGIN
-        MENUITEM "คัดลอก\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "วาง\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "คัดลอก\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "วาง\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "&มุมมอง"
    BEGIN
@@ -504,7 +500,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc"
    IDS_CURRENCY_MALTESE_LIRA "Maltese lira"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo"
+    IDS_CURRENCY_PORTUGUESE_ESCUDO "Portuguese escudo"
    IDS_CURRENCY_SLOVAK_KORUNA "Slovak koruna"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar"
    IDS_CURRENCY_SPANISH_PESETA "Spanish peseta"
--- a/base/applications/calc/lang/tr-TR.rc
+++ b/base/applications/calc/lang/tr-TR.rc
@@ -1,6 +1,6 @@
 /* TRANSLATOR:
-2013-2014, 2016, 2019 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net),
-2021 Süleyman Poyraz (zaryob [dot] dev [at] gmail [dot] com)
+2013-2019 Erdem Ersoy (eersoy93) <erdemersoy@erdemersoy.net>
+2021 Süleyman Poyraz <zaryob.dev@gmail.com>
 */

 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
@@ -9,15 +9,15 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Hesap Makinesi"
+CAPTION "Hesap Makinesi"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    CONTROL "Onaltılık", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
-    CONTROL "Onluk", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
-    CONTROL "Sekizlik", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
-    CONTROL "İkilik", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10
+    AUTORADIOBUTTON "Onaltılık", IDC_RADIO_HEX, 8, 21, 30, 10
+    AUTORADIOBUTTON "Onluk", IDC_RADIO_DEC, 41, 21, 30, 10
+    AUTORADIOBUTTON "Sekizlik", IDC_RADIO_OCT, 74, 21, 30, 10
+    AUTORADIOBUTTON "İkilik", IDC_RADIO_BIN, 107, 21, 30, 10
    GROUPBOX "", IDC_STATIC, 5, 34, 84, 20
    CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10
    CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -134,17 +134,13 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 150, 21, 38, 10
-    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 190, 21, 38, 10
-    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 230, 21, 38, 10
-    CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 270, 21, 38, 10
-    CONTROL "Derece", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
-    CONTROL "Radian", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
-    CONTROL "Gradian", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10
+    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Derece", IDC_RADIO_DEG, 150, 21, 45, 10
+    AUTORADIOBUTTON "Radian", IDC_RADIO_RAD, 204, 21, 45, 10
+    AUTORADIOBUTTON "Gradian", IDC_RADIO_GRAD, 258, 21, 45, 10
    PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |
@@ -157,7 +153,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Hesap Makinesi"
+CAPTION "Hesap Makinesi"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -222,7 +218,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Hesap Makinesi"
+CAPTION "Hesap Makinesi"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -509,7 +505,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Litvanya litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Lüksemburg Frangı"
    IDS_CURRENCY_MALTESE_LIRA "Malta Lirası"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO "Portekiz Esküdosu"
+    IDS_CURRENCY_PORTUGUESE_ESCUDO "Portekiz Esküdosu"
    IDS_CURRENCY_SLOVAK_KORUNA "Slovak Korunası"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenya Toları"
    IDS_CURRENCY_SPANISH_PESETA "İspanyol Pesetası"
--- a/base/applications/calc/lang/uk-UA.rc
+++ b/base/applications/calc/lang/uk-UA.rc
@@ -1,8 +1,7 @@
 /*
- * PROJECT:     ReactOS Calculator
+ * PROJECT:     ReactOS Calc
 * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/calc/lang/uk-UA.rc
- * PURPOSE:     Ukraianian Language File for ReactOS Calc
+ * PURPOSE:     Ukrainian Language File
 * TRANSLATORS: Artem Reznikov & Sakara Yevhen
 */

@@ -12,15 +11,15 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Калькулятор ReactOS"
+CAPTION "Калькулятор"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
-    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
-    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
-    CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10
+    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
+    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
+    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
+    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
    GROUPBOX "", IDC_STATIC, 5, 34, 84, 20
    CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10
    CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -137,17 +136,13 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    CONTROL "8 байт", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 150, 21, 38, 10
-    CONTROL "4 байт", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 190, 21, 38, 10
-    CONTROL "2 байт", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 230, 21, 38, 10
-    CONTROL "1 байт", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 270, 21, 38, 10
-    CONTROL "Градуси", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
-    CONTROL "Радіани", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
-    CONTROL "Гради", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10
+    AUTORADIOBUTTON "8 байт", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "4 байт", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "2 байт", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "1 байт", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Градуси", IDC_RADIO_DEG, 150, 21, 45, 10
+    AUTORADIOBUTTON "Радіани", IDC_RADIO_RAD, 204, 21, 45, 10
+    AUTORADIOBUTTON "Гради", IDC_RADIO_GRAD, 258, 21, 45, 10
    PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |
@@ -160,7 +155,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Калькулятор ReactOS"
+CAPTION "Калькулятор"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -225,7 +220,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Калькулятор ReactOS"
+CAPTION "Калькулятор"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -317,8 +312,8 @@ IDR_MENU_SCIENTIFIC_1 MENU
 BEGIN
    POPUP "Правка"
    BEGIN
-        MENUITEM "Копіювати\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Вставити\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Копіювати\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Вставити\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "Вигляд"
    BEGIN
@@ -349,8 +344,8 @@ IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
    POPUP "Правка"
    BEGIN
-        MENUITEM "Копіювати\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Вставити\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Копіювати\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Вставити\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "Вигляд"
    BEGIN
@@ -382,8 +377,8 @@ IDR_MENU_STANDARD MENU
 BEGIN
    POPUP "Правка"
    BEGIN
-        MENUITEM "Копіювати\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Вставити\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "Копіювати\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "Вставити\tCtrl-V", IDM_EDIT_PASTE
    END
    POPUP "Вигляд"
    BEGIN
@@ -512,7 +507,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Люксембургський франк"
    IDS_CURRENCY_MALTESE_LIRA "Мальтийськая ліра"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO "Португальське ескудо"
+    IDS_CURRENCY_PORTUGUESE_ESCUDO "Португальське ескудо"
    IDS_CURRENCY_SLOVAK_KORUNA "Словацька крона"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Словенський толар"
    IDS_CURRENCY_SPANISH_PESETA "Іспанська песета"
--- a/base/applications/calc/lang/zh-CN.rc
+++ b/base/applications/calc/lang/zh-CN.rc
@@ -12,15 +12,15 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS 计算器"
+CAPTION "计算器"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 9, "宋体", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
-    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
-    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
-    CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10
+    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
+    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
+    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
+    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
    GROUPBOX "", IDC_STATIC, 5, 34, 84, 20
    CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10
    CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -137,17 +137,13 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    CONTROL "四字", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 150, 21, 38, 10
-    CONTROL "双字", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 190, 21, 38, 10
-    CONTROL "字", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 230, 21, 38, 10
-    CONTROL "字节", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 270, 21, 38, 10
-    CONTROL "角度", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
-    CONTROL "弧度", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
-    CONTROL "梯度", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10
+    AUTORADIOBUTTON "四字", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "双字", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "字", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "字节", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "角度", IDC_RADIO_DEG, 150, 21, 45, 10
+    AUTORADIOBUTTON "弧度", IDC_RADIO_RAD, 204, 21, 45, 10
+    AUTORADIOBUTTON "梯度", IDC_RADIO_GRAD, 258, 21, 45, 10
    PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |
@@ -160,7 +156,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS 计算器"
+CAPTION "计算器"
 MENU IDR_MENU_STANDARD
 FONT 9, "宋体", 0, 0, 0x1
 BEGIN
@@ -225,7 +221,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS 计算器"
+CAPTION "计算器"
 MENU IDR_MENU_STANDARD
 FONT 9, "宋体"
 BEGIN
@@ -512,7 +508,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "卢森堡法郎"
    IDS_CURRENCY_MALTESE_LIRA "马耳他里拉"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO "葡萄牙埃斯库多"
+    IDS_CURRENCY_PORTUGUESE_ESCUDO "葡萄牙埃斯库多"
    IDS_CURRENCY_SLOVAK_KORUNA "斯洛伐克克朗"
    IDS_CURRENCY_SLOVENIAN_TOLAR "斯洛文尼亚拖拉"
    IDS_CURRENCY_SPANISH_PESETA "西班牙比塞塔"
--- a/base/applications/calc/lang/zh-HK.rc
+++ b/base/applications/calc/lang/zh-HK.rc
@@ -12,15 +12,15 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS 計數機"
+CAPTION "計數機"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 9, "新細明體", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
-    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
-    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
-    CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10
+    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
+    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
+    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
+    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
    GROUPBOX "", IDC_STATIC, 5, 34, 84, 20
    CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10
    CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -137,17 +137,13 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 150, 21, 38, 10
-    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 190, 21, 38, 10
-    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 230, 21, 38, 10
-    CONTROL "位元組", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 270, 21, 38, 10
-    CONTROL "角度", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
-    CONTROL "弧度", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
-    CONTROL "梯度", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10
+    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "位元組", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "角度", IDC_RADIO_DEG, 150, 21, 45, 10
+    AUTORADIOBUTTON "弧度", IDC_RADIO_RAD, 204, 21, 45, 10
+    AUTORADIOBUTTON "梯度", IDC_RADIO_GRAD, 258, 21, 45, 10
    PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |
@@ -160,7 +156,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS 計數機"
+CAPTION "計數機"
 MENU IDR_MENU_STANDARD
 FONT 9, "新細明體", 0, 0, 0x1
 BEGIN
@@ -225,7 +221,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS 計數機"
+CAPTION "計數機"
 MENU IDR_MENU_STANDARD
 FONT 9, "新細明體"
 BEGIN
@@ -512,7 +508,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "拉脫維亞拉分"
    IDS_CURRENCY_LUXEMBOURG_FRANC "盧森堡法郎"
    IDS_CURRENCY_MALTESE_LIRA "馬爾他里拉"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO "葡萄牙埃斯庫多"
+    IDS_CURRENCY_PORTUGUESE_ESCUDO "葡萄牙埃斯庫多"
    IDS_CURRENCY_SLOVAK_KORUNA "斯洛伐克克朗"
    IDS_CURRENCY_SLOVENIAN_TOLAR "斯洛維尼亞拖拉"
    IDS_CURRENCY_SPANISH_PESETA "西班牙比塞塔"
--- a/base/applications/calc/lang/zh-TW.rc
+++ b/base/applications/calc/lang/zh-TW.rc
@@ -1,4 +1,4 @@
-// Traditional Chinese translation by 2021 Chan Chilung <eason066@gmail.com>
+// TRANSLATOR: 2021 Chan Chilung <eason066@gmail.com>

 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL

@@ -6,15 +6,15 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS 計算機"
+CAPTION "計算機"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 9, "新細明體", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
-    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
-    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
-    CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10
+    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
+    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
+    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
+    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
    GROUPBOX "", IDC_STATIC, 5, 34, 84, 20
    CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10
    CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -131,17 +131,13 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 150, 21, 38, 10
-    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 190, 21, 38, 10
-    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 230, 21, 38, 10
-    CONTROL "位元組", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
-            NOT WS_VISIBLE, 270, 21, 38, 10
-    CONTROL "角度", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
-    CONTROL "弧度", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
-    CONTROL "梯度", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10
+    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "位元組", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
+    AUTORADIOBUTTON "角度", IDC_RADIO_DEG, 150, 21, 45, 10
+    AUTORADIOBUTTON "弧度", IDC_RADIO_RAD, 204, 21, 45, 10
+    AUTORADIOBUTTON "梯度", IDC_RADIO_GRAD, 258, 21, 45, 10
    PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |
@@ -154,7 +150,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS 計算機"
+CAPTION "計算機"
 MENU IDR_MENU_STANDARD
 FONT 9, "新細明體", 0, 0, 0x1
 BEGIN
@@ -219,7 +215,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS 計算機"
+CAPTION "計算機"
 MENU IDR_MENU_STANDARD
 FONT 9, "新細明體"
 BEGIN
@@ -506,7 +502,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "拉脫維亞拉分"
    IDS_CURRENCY_LUXEMBOURG_FRANC "盧森堡法郎"
    IDS_CURRENCY_MALTESE_LIRA "馬爾他里拉"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO "葡萄牙埃斯庫多"
+    IDS_CURRENCY_PORTUGUESE_ESCUDO "葡萄牙埃斯庫多"
    IDS_CURRENCY_SLOVAK_KORUNA "斯洛伐克克朗"
    IDS_CURRENCY_SLOVENIAN_TOLAR "斯洛維尼亞拖拉"
    IDS_CURRENCY_SPANISH_PESETA "西班牙比塞塔"
--- a/base/applications/calc/resource.h
+++ b/base/applications/calc/resource.h
@@ -194,7 +194,7 @@
 #define IDS_CURRENCY_LITHUANIAN_LITAS   2414
 #define IDS_CURRENCY_LUXEMBOURG_FRANC   2415
 #define IDS_CURRENCY_MALTESE_LIRA       2416
-#define IDS_CURRENCY_PORTOGUESE_ESCUDO  2417
+#define IDS_CURRENCY_PORTUGUESE_ESCUDO  2417
 #define IDS_CURRENCY_SLOVAK_KORUNA      2418
 #define IDS_CURRENCY_SLOVENIAN_TOLAR    2419
 #define IDS_CURRENCY_SPANISH_PESETA     2420
--- a/base/applications/clipbrd/lang/ro-RO.rc
+++ b/base/applications/clipbrd/lang/ro-RO.rc
@@ -2,7 +2,7 @@
 * PROJECT:     ReactOS Clipboard
 * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
 * PURPOSE:     Romanian resource file
- * TRANSLATORS: Copyright 2011-2019 Ștefan Fulea <stefan.fulea@mail.com>
+ * TRANSLATORS: Copyright 2011-2018 Ștefan Fulea <stefan.fulea@mail.com>
 *              Copyright 2023-2024 Andrei Miloiu <miloiuandrei@gmail.com>
 */

@@ -18,23 +18,23 @@ BEGIN
    POPUP "&Fișier"
    BEGIN
        MENUITEM "&Deschidere…", CMD_OPEN
-        MENUITEM "S&alvare ca…", CMD_SAVE_AS
+        MENUITEM "&Salvare ca…", CMD_SAVE_AS
        MENUITEM SEPARATOR
        MENUITEM "I&eșire", CMD_EXIT
    END
    POPUP "&Editare"
    BEGIN
-        MENUITEM "Șt&ergere\tDel", CMD_DELETE
+        MENUITEM "Ș&tergere\tDel", CMD_DELETE
    END
    POPUP "&Afișare"
    BEGIN
-        MENUITEM "&Automată", CMD_AUTOMATIC
+        MENUITEM "A&utomată", CMD_AUTOMATIC
    END
-    POPUP "Aj&utor"
+    POPUP "A&jutor"
    BEGIN
-        MENUITEM "&Manual…", CMD_HELP
+        MENUITEM "Aj&utor", CMD_HELP
        MENUITEM SEPARATOR
-        MENUITEM "&Despre…", CMD_ABOUT
+        MENUITEM "&Despre", CMD_ABOUT
    END
 END

@@ -60,10 +60,10 @@ BEGIN
    STRING_CF_ENHMETAFILE "Metafișier îmbunătățit"
    STRING_CF_METAFILEPICT "Metafișier"
    STRING_CF_PALETTE "Paletă de culori"
-    STRING_CF_DIBV5 "Bitmap DIB (versiune 5)"
+    STRING_CF_DIBV5 "Bitmap DIB (versiunea 5)"
    STRING_CF_SYLK "Format de legătură simbolică"
-    STRING_CF_DIF "Format de transfer al datelor"
-    STRING_CF_HDROP "Abandon date"
+    STRING_CF_DIF "Format de schimb de date"
+    STRING_CF_HDROP "Ștergere a datelor"
 END

 STRINGTABLE
--- a/base/applications/dxdiag/ddtest.c
+++ b/base/applications/dxdiag/ddtest.c
@@ -1,9 +1,8 @@
 /*
 * PROJECT:     ReactX Diagnosis Application
 * LICENSE:     LGPL - See COPYING in the top level directory
- * FILE:        base/applications/dxdiag/ddtest.c
 * PURPOSE:     ReactX DirectDraw tests
- * COPYRIGHT:   Copyright 2008 Kamil Hornicek
+ * COPYRIGHT:   Copyright 2008 Kamil Horníček
 *
 */

--- a/base/applications/fontview/lang/cs-CZ.rc
+++ b/base/applications/fontview/lang/cs-CZ.rc
@@ -2,7 +2,7 @@
 * PROJECT:     ReactOS Font Viewer
 * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
 * PURPOSE:     Czech resource file
- * TRANSLATOR:  Copyright 2014-2017 Kamil Hornicek <kamil.hornicek@reactos.org>
+ * TRANSLATOR:  Copyright 2014-2017 Kamil Horníček <kamil.hornicek@reactos.org>
 */

 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
--- a/base/applications/games/winmine/lang/it-IT.rc
+++ b/base/applications/games/winmine/lang/it-IT.rc
@@ -14,7 +14,7 @@ BEGIN
        MENUITEM "&Nuovo\tF2", IDM_NEW
        MENUITEM SEPARATOR
        MENUITEM "&Contrassegna domanda", IDM_MARKQ
-        MENUITEM "Sound", IDM_SOUND
+        MENUITEM "Suono", IDM_SOUND
        MENUITEM SEPARATOR
        MENUITEM "&Principiante", IDM_BEGINNER
        MENUITEM "&Avanzato", IDM_ADVANCED
--- a/base/applications/magnify/lang/it-IT.rc
+++ b/base/applications/magnify/lang/it-IT.rc
@@ -7,7 +7,7 @@ BEGIN
        MENUITEM "E&sci", IDM_EXIT
        MENUITEM "&Opzioni", IDM_OPTIONS
        MENUITEM SEPARATOR
-        MENUITEM "&Informazioni su Magnifier", IDM_ABOUT
+        MENUITEM "&Informazioni su Lente d'ingrandimento", IDM_ABOUT
    END
 END

@@ -19,18 +19,18 @@ END

 IDD_ABOUTBOX DIALOGEX 22, 17, 220, 75
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_CAPTION | WS_SYSMENU
-CAPTION "Informazioni Magnifier"
+CAPTION "Informazioni su Lente d'ingrandimento"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
    ICON IDI_ICON, IDC_MYICON, 14, 9, 20, 20
-    LTEXT "Magnifier Versione 1.0", IDC_STATIC, 49, 10, 119, 8, SS_NOPREFIX
+    LTEXT "Lente d'ingrandimento Versione 1.0", IDC_STATIC, 49, 10, 119, 8, SS_NOPREFIX
    LTEXT "Copyright (C) 2007 Marc Piulachs (marc.piulachs@codexchange.net)", IDC_STATIC, 48, 24, 125, 22
    PUSHBUTTON "OK", IDOK, 162, 48, 50, 14
 END

 IDD_DIALOGOPTIONS DIALOGEX 0, 0, 153, 182
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Impostazioni di Magnifier"
+CAPTION "Impostazioni di Lente d'ingrandimento"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
    DEFPUSHBUTTON "Uscita", IDOK, 96, 161, 50, 14
@@ -55,12 +55,12 @@ END

 IDD_WARNINGDIALOG DIALOGEX 0, 0, 250, 97
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
-CAPTION "ReactOS Magnifier"
+CAPTION "Lente d'ingrandimento ReactOS"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
    DEFPUSHBUTTON "OK", IDOK, 193, 76, 50, 14
    ICON IDI_ICON, IDC_STATIC, 7, 17, 20, 20
-    LTEXT "Magnifier é stato realizzato per fornire un livello minimo di funzionalità agli utenti affetti da problemi visivi. La maggior parte di questi utenti avrà bisogno di un programma di utilità dotato di maggiori funzioni per l'uso quotidiano.", IDC_STATIC, 36, 7, 207, 33
+    LTEXT "Lente d'ingrandimento é stato realizzato per fornire un livello minimo di funzionalità agli utenti affetti da problemi visivi. La maggior parte di questi utenti avrà bisogno di un programma di utilità dotato di maggiori funzioni per l'uso quotidiano.", IDC_STATIC, 36, 7, 207, 33
    CONTROL "Non mostrare più questo messaggio", IDC_SHOWWARNINGCHECK, "Button",
            BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10
 END
--- a/base/applications/msconfig/lang/cs-CZ.rc
+++ b/base/applications/msconfig/lang/cs-CZ.rc
@@ -1,7 +1,7 @@
 /* FILE:       base/applications/msconfig/lang/cs-CZ.rc
 * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com)
 * UPDATED:    2009-08-03
- * THANKS TO:  Kamil Hornicek, who translated major part of this file
+ * THANKS TO:  Kamil Horníček, who translated major part of this file
 */

 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
--- a/base/applications/msconfig_new/lang/cs-CZ.rc
+++ b/base/applications/msconfig_new/lang/cs-CZ.rc
@@ -1,7 +1,7 @@
 /* FILE:       base/applications/msconfig/lang/cs-CZ.rc
 * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com)
 * UPDATED:    2009-08-03
- * THANKS TO:  Kamil Hornicek, who translated major part of this file
+ * THANKS TO:  Kamil Horníček, who translated major part of this file
 */

 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
--- a/base/applications/mscutils/eventvwr/lang/cs-CZ.rc
+++ b/base/applications/mscutils/eventvwr/lang/cs-CZ.rc
@@ -2,7 +2,7 @@
 * PROJECT:     ReactOS Event Log Viewer
 * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
 * PURPOSE:     Czech resource file
- * TRANSLATORS: Copyright 2014-2017 Kamil Hornicek <kamil.hornicek@reactos.org>
+ * TRANSLATORS: Copyright 2014-2017 Kamil Horníček <kamil.hornicek@reactos.org>
 */

 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
--- a/base/applications/mspaint/lang/cs-CZ.rc
+++ b/base/applications/mspaint/lang/cs-CZ.rc
@@ -3,7 +3,7 @@
 * LICENSE:     LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later)
 * PURPOSE:     Czech resource file
 * TRANSLATORS: Copyright 2009-2010 Radek Liška aka Black_Fox <radekliska@gmail.com>
- *              Copyright 2011 Kamil Hornicek <kamil.hornicek@reactos.org>
+ *              Copyright 2011 Kamil Horníček <kamil.hornicek@reactos.org>
 */

 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
--- a/base/applications/mspaint/lang/it-IT.rc
+++ b/base/applications/mspaint/lang/it-IT.rc
@@ -4,6 +4,7 @@
 * PURPOSE:     Italian resource file
 * TRANSLATORS: Copyright 2009 Gabriel Ilardi <gabrielilardi@hotmail.it>
 *              Copyright 2009-2010 Paolo Devoti <devotip@tiscali.it>
+ *              Copyright 2024 Gabriele Lo Re <gabrolr70@gmail.com>
 */

 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
@@ -14,26 +15,26 @@ ID_MENU MENU
 BEGIN
    POPUP "&File"
    BEGIN
-        MENUITEM "Nuovo\tCtrl+N", IDM_FILENEW
-        MENUITEM "Apri...\tCtrl+F12", IDM_FILEOPEN
-        MENUITEM "Salva\tMaiusc+F12", IDM_FILESAVE
-        MENUITEM "Sal&va con nome...", IDM_FILESAVEAS
+        MENUITEM "&Nuovo\tCtrl+N", IDM_FILENEW
+        MENUITEM "&Apri...\tCtrl+F12", IDM_FILEOPEN
+        MENUITEM "&Salva\tMaiusc+F12", IDM_FILESAVE
+        MENUITEM "Sa&lva con nome...", IDM_FILESAVEAS
        MENUITEM SEPARATOR
-        MENUITEM "From Scanner or Camera...", IDM_FILEFROMSCANNERORCAMERA
+        MENUITEM "Da Scanner o &fotocamera...", IDM_FILEFROMSCANNERORCAMERA
        MENUITEM SEPARATOR
-        MENUITEM "Page View", IDM_FILEPAGEVIEW
-        MENUITEM "Page Setup...", IDM_FILEPAGESETUP
-        MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT
+        MENUITEM "Anteprima &di stampa", IDM_FILEPAGEVIEW
+        MENUITEM "&Imposta pagina...", IDM_FILEPAGESETUP
+        MENUITEM "S&tampa...\tCtrl+P", IDM_FILEPRINT
        MENUITEM SEPARATOR
-        MENUITEM "Send...", IDM_FILESEND
+        MENUITEM "In&via...", IDM_FILESEND
        MENUITEM SEPARATOR
        MENUITEM "Imposta come sfondo (normale)", IDM_FILEASWALLPAPERPLANE
-        MENUITEM "Imposta come sfondo (centrata)", IDM_FILEASWALLPAPERCENTERED
-        MENUITEM "Imposta come sfondo (estesa)", IDM_FILEASWALLPAPERSTRETCHED
+        MENUITEM "Imp&osta come sfondo (centrato)", IDM_FILEASWALLPAPERCENTERED
+        MENUITEM "Imposta come sfondo (esteso)", IDM_FILEASWALLPAPERSTRETCHED
        MENUITEM SEPARATOR
-        MENUITEM "Most recently used file", IDM_FILEMOSTRECENTLYUSEDFILE, GRAYED
+        MENUITEM "File recenti", IDM_FILEMOSTRECENTLYUSEDFILE, GRAYED
        MENUITEM SEPARATOR
-        MENUITEM "E&sci\tAlt+F4", IDM_FILEEXIT
+        MENUITEM "&Esci\tAlt+F4", IDM_FILEEXIT
    END
    POPUP "&Modifica"
    BEGIN
@@ -44,22 +45,22 @@ BEGIN
        MENUITEM "&Copia\tCtrl+C", IDM_EDITCOPY
        MENUITEM "I&ncolla\tCtrl+V", IDM_EDITPASTE
        MENUITEM SEPARATOR
-        MENUITEM "Crop &selection", IDM_CROPSELECTION
-        MENUITEM "Cance&lla area selezionata\tCanc", IDM_EDITDELETESELECTION
+        MENUITEM "Ritaglia s&elezione", IDM_CROPSELECTION
+        MENUITEM "Cancella area sele&zionata\tCanc", IDM_EDITDELETESELECTION
        MENUITEM "&Inverte selezione", IDM_EDITINVERTSELECTION
-        MENUITEM "Sele&ziona tutto\tCtrl+A", IDM_EDITSELECTALL
+        MENUITEM "&Seleziona tutto\tCtrl+A", IDM_EDITSELECTALL
        MENUITEM SEPARATOR
-        MENUITEM "Copia &su...", IDM_EDITCOPYTO
+        MENUITEM "C&opia in...", IDM_EDITCOPYTO
        MENUITEM "Incolla &da...", IDM_EDITPASTEFROM
    END
    POPUP "&Visualizza"
    BEGIN
-        MENUITEM "Casella degli strumenti\tCtrl+T", IDM_VIEWTOOLBOX, CHECKED
-        MENUITEM "Tavolozza\tCtrl+L", IDM_VIEWCOLORPALETTE, CHECKED
-        MENUITEM "Barra di stato", IDM_VIEWSTATUSBAR, CHECKED
-        MENUITEM "Barra degli strumenti di testo", IDM_FORMATICONBAR, CHECKED, GRAYED
+        MENUITEM "&Casella degli strumenti\tCtrl+T", IDM_VIEWTOOLBOX, CHECKED
+        MENUITEM "Tav&olozza\tCtrl+L", IDM_VIEWCOLORPALETTE, CHECKED
+        MENUITEM "Barra di s&tato", IDM_VIEWSTATUSBAR, CHECKED
+        MENUITEM "B&arra degli strumenti di testo", IDM_FORMATICONBAR, CHECKED, GRAYED
        MENUITEM SEPARATOR
-        POPUP "Zoom"
+        POPUP "&Zoom"
        BEGIN
            POPUP "User defined"
            BEGIN
@@ -73,32 +74,32 @@ BEGIN
            END
            MENUITEM SEPARATOR
            MENUITEM "Mostra griglia\tCtrl+G", IDM_VIEWSHOWGRID
-            MENUITEM "Mostra miniature", IDM_VIEWSHOWMINIATURE
+            MENUITEM "Mostra anteprima", IDM_VIEWSHOWMINIATURE
        END
        MENUITEM "Visualizza a schermo intero\tCtrl+F", IDM_VIEWFULLSCREEN
    END
    POPUP "&Immagine"
    BEGIN
-        MENUITEM "Ca&povolgi/ruota...\tCtrl+R", IDM_IMAGEROTATEMIRROR
-        MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW
+        MENUITEM "&Capovolgi/ruota...\tCtrl+R", IDM_IMAGEROTATEMIRROR
+        MENUITEM "&Allunga/Inclina...\tCtrl+W", IDM_IMAGESTRETCHSKEW
        MENUITEM "&Ritaglia", IDM_IMAGECROP
        MENUITEM "&Inverti colori\tCtrl+I", IDM_IMAGEINVERTCOLORS
-        MENUITEM "&Attributi...\tCtrl+E", IDM_IMAGEATTRIBUTES
-        MENUITEM "&Cancella immagine\tCtrl+Maiusc+N", IDM_IMAGEDELETEIMAGE
+        MENUITEM "A&ttributi...\tCtrl+E", IDM_IMAGEATTRIBUTES
+        MENUITEM "Ca&ncella immagine\tCtrl+Maiusc+N", IDM_IMAGEDELETEIMAGE
        MENUITEM "&Opaco", IDM_IMAGEDRAWOPAQUE
    END
    POPUP "&Colori"
    BEGIN
-        MENUITEM "Modifica colori...", IDM_COLORSEDITPALETTE
+        MENUITEM "&Modifica colori...", IDM_COLORSEDITPALETTE
        MENUITEM SEPARATOR
-        MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE
+        MENUITEM "Tavolozza moderna", IDM_COLORSMODERNPALETTE
        MENUITEM "Old palette", IDM_COLORSOLDPALETTE
    END
    POPUP "&Aiuto"
    BEGIN
-        MENUITEM "Guida in linea", IDM_HELPHELPTOPICS
+        MENUITEM "&Guida in linea", IDM_HELPHELPTOPICS
        MENUITEM SEPARATOR
-        MENUITEM "Informazioni", IDM_HELPINFO
+        MENUITEM "&Informazioni su Paint", IDM_HELPINFO
    END
 END

@@ -108,17 +109,17 @@ BEGIN
    BEGIN
        MENUITEM "&Taglia\tCtrl+X", IDM_EDITCUT
        MENUITEM "&Copia\tCtrl+C", IDM_EDITCOPY
-        MENUITEM "I&ncolla\tCtrl+V", IDM_EDITPASTE
+        MENUITEM "&Incolla\tCtrl+V", IDM_EDITPASTE
        MENUITEM SEPARATOR
-        MENUITEM "Crop &selection", IDM_CROPSELECTION
-        MENUITEM "Cance&lla area selezionata\tCanc", IDM_EDITDELETESELECTION
-        MENUITEM "Sele&ziona tutto\tCtrl+A", IDM_EDITSELECTALL
+        MENUITEM "Ritaglia s&elezione", IDM_CROPSELECTION
+        MENUITEM "Cancella area sele&zionata\tCanc", IDM_EDITDELETESELECTION
+        MENUITEM "&Seleziona tutto\tCtrl+A", IDM_EDITSELECTALL
        MENUITEM SEPARATOR
-        MENUITEM "Copia &su...", IDM_EDITCOPYTO
+        MENUITEM "C&opia in...", IDM_EDITCOPYTO
        MENUITEM "Incolla &da...", IDM_EDITPASTEFROM
        MENUITEM SEPARATOR
-        MENUITEM "Ca&povolgi/ruota...\tCtrl+R", IDM_IMAGEROTATEMIRROR
-        MENUITEM "S&tretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW
+        MENUITEM "&Capovolgi/ruota...\tCtrl+R", IDM_IMAGEROTATEMIRROR
+        MENUITEM "&Allunga/Inclina...\tCtrl+W", IDM_IMAGESTRETCHSKEW
        MENUITEM "&Inverti colori\tCtrl+I", IDM_IMAGEINVERTCOLORS
    END
 END
@@ -196,9 +197,9 @@ END
 IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 150
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
-CAPTION "Stretch and skew image"
+CAPTION "Allunga e inclina l'immagine"
 BEGIN
-    GROUPBOX "Stretch", IDD_STRETCHSKEWGROUPSTRETCH, 6, 6, 158, 66
+    GROUPBOX "Allunga", IDD_STRETCHSKEWGROUPSTRETCH, 6, 6, 158, 66
    ICON IDI_HORZSTRETCH, IDD_STRETCHSKEWICONHSTRETCH, 12, 18, 32, 32
    LTEXT "Orizzontalmente:", IDD_STRETCHSKEWTEXTHSTRETCH, 45, 24, 40, 10
    EDITTEXT IDD_STRETCHSKEWEDITHSTRETCH, 90, 23, 32, 12
@@ -207,7 +208,7 @@ BEGIN
    LTEXT "Verticalmente:", IDD_STRETCHSKEWTEXTVSTRETCH, 45, 49, 40, 10
    EDITTEXT IDD_STRETCHSKEWEDITVSTRETCH, 90, 48, 32, 12
    LTEXT "%", IDD_STRETCHSKEWTEXTVPERCENT, 125, 49, 15, 10
-    GROUPBOX "Skew", IDD_STRETCHSKEWGROUPSKEW, 6, 76, 158, 66
+    GROUPBOX "Inclina", IDD_STRETCHSKEWGROUPSKEW, 6, 76, 158, 66
    ICON IDI_HORZSKEW, IDD_STRETCHSKEWICONHSKEW, 12, 88, 32, 32
    LTEXT "Orizzontalmente:", IDD_STRETCHSKEWTEXTHSKEW, 45, 94, 40, 10
    EDITTEXT IDD_STRETCHSKEWEDITHSKEW, 90, 93, 32, 12
@@ -236,8 +237,8 @@ BEGIN
    IDS_PROGRAMNAME "Paint"
    IDS_WINDOWTITLE "%s - Paint"
    IDS_INFOTITLE "Paint per ReactOS"
-    IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, see www.gnu.org)"
-    IDS_SAVEPROMPTTEXT "Volete salvare le modifiche a %s?"
+    IDS_INFOTEXT "Disponibile sotto licenza GNU Lesser General Public (LGPL, vedi www.gnu.org)"
+    IDS_SAVEPROMPTTEXT "Si vuole salvare le modifiche a %s?"
    IDS_DEFAULTFILENAME "SenzaNome"
    IDS_MINIATURETITLE "Miniature"
    IDS_TOOLTIP1 "Selezione libera"
@@ -256,21 +257,21 @@ BEGIN
    IDS_TOOLTIP14 "Poligono"
    IDS_TOOLTIP15 "Ellisse"
    IDS_TOOLTIP16 "Rettangolo arrotondato"
-    IDS_ALLFILES "All Files"
-    IDS_ALLPICTUREFILES "All Picture Files"
+    IDS_ALLFILES "Tutti i file"
+    IDS_ALLPICTUREFILES "Tutti i file immagine"
    IDS_FILESIZE "%d bytes"
    IDS_INTNUMBERS "Si prega di inserire solo numeri interi!"
    IDS_PERCENTAGE "La percentuale deve essere compresa tra 1 e 500."
    IDS_ANGLE "L'angolo deve essere compreso tra -89 e 89."
    IDS_LOADERRORTEXT "l file %s non può essere caricato."
-    IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?"
-    IDS_BOLD "Bold"
-    IDS_ITALIC "Italic"
-    IDS_UNDERLINE "Underline"
-    IDS_VERTICAL "Vertical"
+    IDS_ENLARGEPROMPTTEXT "L'immagine negli appunti è più grande della tela.\nLa si vuole allargare?"
+    IDS_BOLD "Grossivo"
+    IDS_ITALIC "Italico"
+    IDS_UNDERLINE "Sottolineato"
+    IDS_VERTICAL "Verticale"
    IDS_PRINTRES "%d x %d pixel/cm"
-    IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
-    IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
-    IDS_CANTSENDMAIL "Failed to send a mail."
-    IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?"
+    IDS_CANTPASTE "Impossibile incollare dagli appunti. Il formato dati è incorretto o non supportato."
+    IDS_SAVEERROR "Impossibile salvare la bitmap nel file:\n\n%s"
+    IDS_CANTSENDMAIL "Impossibile inviare l'email."
+    IDS_LOSECOLOR "Le informazioni sul colore saranno perse con quest'operazione. Sei sicuro di procedere?"
 END
--- a/base/applications/mspaint/lang/tr-TR.rc
+++ b/base/applications/mspaint/lang/tr-TR.rc
@@ -4,6 +4,7 @@
 * PURPOSE:     Turkish resource file
 * TRANSLATORS: Copyright 2013-2016, 2019 Erdem Ersoy (eersoy93) <erdemersoy@erdemersoy.net>
 *              Copyright 2021-2022 Süleyman Poyraz <zaryob.dev@gmail.com>
+ *              Copyright 2024 Mahir Gül <mahirgul@gmail.com>
 */

 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
@@ -269,8 +270,8 @@ BEGIN
    IDS_UNDERLINE "Altı Çizgili"
    IDS_VERTICAL "Düşey"
    IDS_PRINTRES "%d x %d pixel/cm"
-    IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported."
-    IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s"
-    IDS_CANTSENDMAIL "Failed to send a mail."
-    IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?"
+    IDS_CANTPASTE "Panodan yapıştırma işlemi başarısız oldu. Veri biçimi ya yanlış ya da desteklenmiyor."
+    IDS_SAVEERROR "Bit eşlemi dosyaya kaydedilemedi:\n\n%s"
+    IDS_CANTSENDMAIL "Posta gönderilemedi."
+    IDS_LOSECOLOR "Bu işlem sırasında renk bilgisi kaybolacaktır. Devam edeceğinizden emin misiniz?"
 END
--- a/base/applications/notepad/dialog.c
+++ b/base/applications/notepad/dialog.c
@@ -49,6 +49,7 @@ VOID ShowLastError(VOID)
    {
        LPTSTR lpMsgBuf = NULL;
        TCHAR szTitle[MAX_STRING_LEN];
+        TCHAR szFallback[42], *pszMessage = szFallback;

        LoadString(Globals.hInstance, STRING_ERROR, szTitle, _countof(szTitle));

@@ -60,7 +61,12 @@ VOID ShowLastError(VOID)
                      0,
                      NULL);

-        MessageBox(Globals.hMainWnd, lpMsgBuf, szTitle, MB_OK | MB_ICONERROR);
+        if (lpMsgBuf)
+            pszMessage = lpMsgBuf;
+        else
+            wsprintfW(szFallback, L"%d", error);
+
+        MessageBox(Globals.hMainWnd, pszMessage, szTitle, MB_OK | MB_ICONERROR);
        LocalFree(lpMsgBuf);
    }
 }
@@ -343,6 +349,7 @@ VOID DoOpenFile(LPCTSTR szFileName)
        return;

    WaitCursor(TRUE);
+    SetWindowText(Globals.hEdit, NULL);

    hFile = CreateFile(szFileName, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
                       OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
--- a/base/applications/notepad/lang/it-IT.rc
+++ b/base/applications/notepad/lang/it-IT.rc
@@ -25,7 +25,7 @@ BEGIN
    POPUP "&File"
    BEGIN
        MENUITEM "&Nuovo\tCtrl+N", CMD_NEW
-        MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW
+        MENUITEM "Nuova &finestra\tCtrl+Shift+N", CMD_NEW_WINDOW
        MENUITEM "&Apri...\tCtrl+O", CMD_OPEN
        MENUITEM "&Salva\tCtrl+S", CMD_SAVE
        MENUITEM "Sal&va con nome...", CMD_SAVE_AS
@@ -65,7 +65,7 @@ BEGIN
    BEGIN
        MENUITEM "&Guida in linea", CMD_HELP_CONTENTS
        MENUITEM SEPARATOR
-        MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD
+        MENUITEM "Informazioni &su Blocco note", CMD_HELP_ABOUT_NOTEPAD
    END
 END

@@ -135,7 +135,7 @@ CAPTION "Now printing"
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15
+    CTEXT "Inizio stampa...", IDC_PRINTING_STATUS, 5, 10, 150, 15
    CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15
    CTEXT "Pagina %u", IDC_PRINTING_PAGE, 5, 55, 150, 15
    PUSHBUTTON "Annulla", IDCANCEL, 50, 75, 60, 20
@@ -169,19 +169,19 @@ di memoria libera."
    STRING_UNICODE "Unicode"
    STRING_UNICODE_BE "Unicode (big endian)"
    STRING_UTF8 "UTF-8"
-    STRING_UTF8_BOM "UTF-8 with BOM"
+    STRING_UTF8_BOM "UTF-8 con BOM"
    STRING_CRLF "Windows (CR + LF)"
    STRING_LF "Unix (LF)"
    STRING_CR "Mac (CR)"
    STRING_LINE_COLUMN "Linea %d, colonna %d"
    STRING_PRINTERROR "Impossibile stampare il file '%s'.\n\nControllare che la stampante sia accesa e impostata correttamente."
    STRING_DEFAULTFONT "Lucida Console"
-    STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range."
-    STRING_NOWPRINTING "Now printing page..."
+    STRING_LINE_NUMBER_OUT_OF_RANGE "Numero di riga maggiore del numero totale di righe."
+    STRING_NOWPRINTING "Stampa in corso della pagina..."
    STRING_PRINTCANCELING "The print job is being canceled..."
    STRING_PRINTCOMPLETE "Printing is successfully done."
-    STRING_PRINTCANCELED "Printing has been canceled."
-    STRING_PRINTFAILED "Printing failed."
+    STRING_PRINTCANCELED "La stampa è stata annullata."
+    STRING_PRINTFAILED "Stampa fallita."

    STRING_TEXT_DOCUMENT "Documento di testo"
    STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n"
--- a/base/applications/notepad/main.c
+++ b/base/applications/notepad/main.c
@@ -557,10 +557,7 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE prev, LPTSTR cmdline, int sh
    MSG msg;
    HACCEL hAccel;
    WNDCLASSEX wndclass;
-    HMONITOR monitor;
-    MONITORINFO info;
-    INT x, y;
-    RECT rcIntersect;
+    WINDOWPLACEMENT wp;
    static const TCHAR className[] = _T("Notepad");
    static const TCHAR winName[] = _T("Notepad");

@@ -579,7 +576,7 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE prev, LPTSTR cmdline, int sh
    aFINDMSGSTRING = (ATOM)RegisterWindowMessage(FINDMSGSTRING);

    NOTEPAD_InitData(hInstance);
-    NOTEPAD_LoadSettingsFromRegistry();
+    NOTEPAD_LoadSettingsFromRegistry(&wp);

    ZeroMemory(&wndclass, sizeof(wndclass));
    wndclass.cbSize = sizeof(wndclass);
@@ -602,25 +599,14 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE prev, LPTSTR cmdline, int sh
        return 1;
    }

-    /* Setup windows */
-
-    monitor = MonitorFromRect(&Globals.main_rect, MONITOR_DEFAULTTOPRIMARY);
-    info.cbSize = sizeof(info);
-    GetMonitorInfoW(monitor, &info);
-
-    x = Globals.main_rect.left;
-    y = Globals.main_rect.top;
-    if (!IntersectRect(&rcIntersect, &Globals.main_rect, &info.rcWork))
-        x = y = CW_USEDEFAULT;
-
    /* Globals.hMainWnd will be set in WM_CREATE handling */
    CreateWindow(className,
                 winName,
                 WS_OVERLAPPEDWINDOW,
-                 x,
-                 y,
-                 Globals.main_rect.right - Globals.main_rect.left,
-                 Globals.main_rect.bottom - Globals.main_rect.top,
+                 CW_USEDEFAULT,
+                 CW_USEDEFAULT,
+                 CW_USEDEFAULT,
+                 CW_USEDEFAULT,
                 NULL,
                 NULL,
                 Globals.hInstance,
@@ -631,7 +617,17 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE prev, LPTSTR cmdline, int sh
        return 1;
    }

-    ShowWindow(Globals.hMainWnd, show);
+    /* Use the result of CW_USEDEFAULT if the data in the registry is not valid */
+    if (wp.rcNormalPosition.right == wp.rcNormalPosition.left)
+    {
+        GetWindowPlacement(Globals.hMainWnd, &wp);
+    }
+    /* Does the parent process want to force a show action? */
+    if (show != SW_SHOWDEFAULT)
+    {
+        wp.showCmd = show;
+    }
+    SetWindowPlacement(Globals.hMainWnd, &wp);
    UpdateWindow(Globals.hMainWnd);

    if (!HandleCommandLine(cmdline))
@@ -641,8 +637,8 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE prev, LPTSTR cmdline, int sh

    while (GetMessage(&msg, NULL, 0, 0))
    {
-        if (!TranslateAccelerator(Globals.hMainWnd, hAccel, &msg) &&
-            !IsDialogMessage(Globals.hFindReplaceDlg, &msg))
+        if ((!Globals.hFindReplaceDlg || !IsDialogMessage(Globals.hFindReplaceDlg, &msg)) &&
+            !TranslateAccelerator(Globals.hMainWnd, hAccel, &msg))
        {
            TranslateMessage(&msg);
            DispatchMessage(&msg);
--- a/base/applications/notepad/notepad.h
+++ b/base/applications/notepad/notepad.h
@@ -84,7 +84,6 @@ typedef struct

    FINDREPLACE find;
    WNDPROC EditProc;
-    RECT main_rect;
    BOOL bWasModified;
 } NOTEPAD_GLOBALS;

@@ -93,7 +92,7 @@ extern NOTEPAD_GLOBALS Globals;
 BOOL ReadText(HANDLE hFile, HLOCAL *phLocal, ENCODING *pencFile, EOLN *piEoln);
 BOOL WriteText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, ENCODING encFile, EOLN iEoln);

-void NOTEPAD_LoadSettingsFromRegistry(void);
+void NOTEPAD_LoadSettingsFromRegistry(PWINDOWPLACEMENT pWP);
 void NOTEPAD_SaveSettingsToRegistry(void);

 BOOL NOTEPAD_FindNext(FINDREPLACE *pFindReplace, BOOL bReplace, BOOL bShowAlert);
--- a/base/applications/notepad/settings.c
+++ b/base/applications/notepad/settings.c
@@ -102,12 +102,12 @@ static BOOL QueryString(HKEY hKey, LPCTSTR pszValueName, LPTSTR pszResult, DWORD
 *
 *  Load settings from registry HKCU\Software\Microsoft\Notepad.
 */
-void NOTEPAD_LoadSettingsFromRegistry(void)
+void NOTEPAD_LoadSettingsFromRegistry(PWINDOWPLACEMENT pWP)
 {
    HKEY hKey;
    HFONT hFont;
-    DWORD dwPointSize, cx, cy;
-    DWORD cxScreen = GetSystemMetrics(SM_CXSCREEN), cyScreen = GetSystemMetrics(SM_CYSCREEN);
+    DWORD dwPointSize;
+    DWORD x = CW_USEDEFAULT, y = CW_USEDEFAULT, cx = 0, cy = 0;

    /* Set the default values */
    Globals.bShowStatusBar = TRUE;
@@ -118,10 +118,6 @@ void NOTEPAD_LoadSettingsFromRegistry(void)
    dwPointSize = 100;
    Globals.lfFont.lfWeight = FW_NORMAL;
    Globals.lfFont.lfPitchAndFamily = FIXED_PITCH | FF_MODERN;
-    Globals.main_rect.left = CW_USEDEFAULT;
-    Globals.main_rect.top = CW_USEDEFAULT;
-    cx = min((cxScreen * 3) / 4, 640);
-    cy = min((cyScreen * 3) / 4, 480);

    /* FIXME: Globals.fSaveWindowPositions = FALSE; */
    /* FIXME: Globals.fMLE_is_broken = FALSE; */
@@ -154,8 +150,8 @@ void NOTEPAD_LoadSettingsFromRegistry(void)
        QueryDword(hKey, _T("iMarginRight"), (DWORD*)&Globals.lMargins.right);
        QueryDword(hKey, _T("iMarginBottom"), (DWORD*)&Globals.lMargins.bottom);

-        QueryDword(hKey, _T("iWindowPosX"), (DWORD*)&Globals.main_rect.left);
-        QueryDword(hKey, _T("iWindowPosY"), (DWORD*)&Globals.main_rect.top);
+        QueryDword(hKey, _T("iWindowPosX"), &x);
+        QueryDword(hKey, _T("iWindowPosY"), &y);
        QueryDword(hKey, _T("iWindowPosDX"), &cx);
        QueryDword(hKey, _T("iWindowPosDY"), &cy);

@@ -163,10 +159,23 @@ void NOTEPAD_LoadSettingsFromRegistry(void)
        QueryString(hKey, _T("replaceString"), Globals.szReplaceText, _countof(Globals.szReplaceText));
    }

-    Globals.lfFont.lfHeight = HeightFromPointSize(dwPointSize);
-    Globals.main_rect.right = Globals.main_rect.left + cx;
-    Globals.main_rect.bottom = Globals.main_rect.top + cy;
+    pWP->length = sizeof(*pWP);
+    pWP->flags = 0;
+    pWP->showCmd = SW_SHOWDEFAULT;
+    if (cy & 0x80000000)
+    {
+        cy &= ~0x80000000;
+        pWP->flags |= WPF_RESTORETOMAXIMIZED;
+        pWP->showCmd = SW_SHOWMAXIMIZED;
+    }
+    pWP->rcNormalPosition.left = x;
+    pWP->rcNormalPosition.right = x + cx;
+    pWP->rcNormalPosition.top = y;
+    pWP->rcNormalPosition.bottom = y + cy;
+    pWP->ptMaxPosition.x = x;
+    pWP->ptMaxPosition.y = y;

+    Globals.lfFont.lfHeight = HeightFromPointSize(dwPointSize);
    if (!hKey || !QueryString(hKey, _T("lfFaceName"),
                              Globals.lfFont.lfFaceName, _countof(Globals.lfFont.lfFaceName)))
    {
@@ -228,8 +237,18 @@ void NOTEPAD_SaveSettingsToRegistry(void)
 {
    HKEY hKey;
    DWORD dwDisposition;
+    WINDOWPLACEMENT wp;
+    UINT x, y, cx, cy;
+
+    wp.length = sizeof(wp);
+    GetWindowPlacement(Globals.hMainWnd, &wp);
+    x = wp.rcNormalPosition.left;
+    y = wp.rcNormalPosition.top;
+    cx = wp.rcNormalPosition.right - x;
+    cy = wp.rcNormalPosition.bottom - y;
+    if (wp.flags & WPF_RESTORETOMAXIMIZED)
+        cy |= 0x80000000;

-    GetWindowRect(Globals.hMainWnd, &Globals.main_rect);

    if (RegCreateKeyEx(HKEY_CURRENT_USER, s_szRegistryKey,
                       0, NULL, 0, KEY_SET_VALUE, NULL,
@@ -256,10 +275,10 @@ void NOTEPAD_SaveSettingsToRegistry(void)
        SaveDword(hKey, _T("iMarginTop"), Globals.lMargins.top);
        SaveDword(hKey, _T("iMarginRight"), Globals.lMargins.right);
        SaveDword(hKey, _T("iMarginBottom"), Globals.lMargins.bottom);
-        SaveDword(hKey, _T("iWindowPosX"), Globals.main_rect.left);
-        SaveDword(hKey, _T("iWindowPosY"), Globals.main_rect.top);
-        SaveDword(hKey, _T("iWindowPosDX"), Globals.main_rect.right - Globals.main_rect.left);
-        SaveDword(hKey, _T("iWindowPosDY"), Globals.main_rect.bottom - Globals.main_rect.top);
+        SaveDword(hKey, _T("iWindowPosX"), x);
+        SaveDword(hKey, _T("iWindowPosY"), y);
+        SaveDword(hKey, _T("iWindowPosDX"), cx);
+        SaveDword(hKey, _T("iWindowPosDY"), cy);
        SaveString(hKey, _T("searchString"), Globals.szFindText);
        SaveString(hKey, _T("replaceString"), Globals.szReplaceText);

--- a/base/applications/rapps/appview.cpp
+++ b/base/applications/rapps/appview.cpp
@@ -16,6 +16,50 @@ using namespace Gdiplus;
 HICON g_hDefaultPackageIcon = NULL;
 static int g_DefaultPackageIconILIdx = I_IMAGENONE;

+// **** Menu helpers ****
+
+BOOL
+DeleteMenuEx(
+    _In_ HMENU hMenu,
+    _In_ UINT  uPosition,
+    _In_ UINT  uFlags)
+{
+    INT pos;
+    MENUITEMINFOW mii = { sizeof(mii), MIIM_FTYPE, 0 };
+    bool bIsValidItem1, bIsValidItem2;
+    bool bIsSep1, bIsSep2;
+
+    if (uFlags & MF_BYPOSITION)
+        pos = (INT)uPosition;
+    else
+        pos = ::GetMenuPosFromID(hMenu, uPosition);
+    if (pos < 0)
+        return FALSE;
+
+    bIsValidItem1 = ((pos > 0) && ::GetMenuItemInfoW(hMenu, pos - 1, TRUE, &mii));
+    bIsSep1 = bIsValidItem1 && !!(mii.fType & MFT_SEPARATOR);
+
+    bIsValidItem2 = ::GetMenuItemInfoW(hMenu, pos + 1, TRUE, &mii);
+    bIsSep2 = bIsValidItem2 && !!(mii.fType & MFT_SEPARATOR);
+
+    if (bIsSep1 && !bIsSep2 && !bIsValidItem2)
+        pos = pos - 1; // Delete separator only if pos+1 has no item
+    else if (!bIsSep1 && bIsSep2 && !bIsValidItem1)
+        pos = pos + 1; // Delete separator only if pos-1 has no item
+    else if (bIsSep1 && bIsSep2)
+        pos = pos + 1;
+    else
+        pos = -1;
+
+    // Delete one of the separators if necessary
+    if (pos != -1)
+        ::DeleteMenu(hMenu, pos, MF_BYPOSITION);
+
+    // Finally, delete the menu item itself.
+    return ::DeleteMenu(hMenu, uPosition, uFlags);
+}
+// **** Menu helpers ****
+
 // **** CMainToolbar ****

 VOID
@@ -149,26 +193,28 @@ CMainToolbar::Create(HWND hwndParent)

    AddButtons(_countof(Buttons), Buttons);

-    /* Remember ideal width to use as a max width of buttons */
-    SIZE size;
-    GetIdealSize(FALSE, &size);
-    m_dButtonsWidthMax = size.cx;
+    /* Remember the ideal width to use as a max width of buttons */
+    UpdateMaxButtonsWidth();

    return m_hWnd;
 }

-VOID
-CMainToolbar::HideButtonCaption()
+void
+CMainToolbar::ShowButtonCaption(bool bShow)
 {
    DWORD dCurrentExStyle = (DWORD)SendMessageW(TB_GETEXTENDEDSTYLE, 0, 0);
-    SendMessageW(TB_SETEXTENDEDSTYLE, 0, dCurrentExStyle | TBSTYLE_EX_MIXEDBUTTONS);
+    if (bShow)
+        SendMessageW(TB_SETEXTENDEDSTYLE, 0, dCurrentExStyle & ~TBSTYLE_EX_MIXEDBUTTONS);
+    else
+        SendMessageW(TB_SETEXTENDEDSTYLE, 0, dCurrentExStyle | TBSTYLE_EX_MIXEDBUTTONS);
 }

-VOID
-CMainToolbar::ShowButtonCaption()
+void
+CMainToolbar::UpdateMaxButtonsWidth()
 {
-    DWORD dCurrentExStyle = (DWORD)SendMessageW(TB_GETEXTENDEDSTYLE, 0, 0);
-    SendMessageW(TB_SETEXTENDEDSTYLE, 0, dCurrentExStyle & ~TBSTYLE_EX_MIXEDBUTTONS);
+    SIZE size;
+    GetIdealSize(FALSE, &size);
+    m_dButtonsWidthMax = size.cx;
 }

 DWORD
@@ -267,21 +313,6 @@ CAppRichEdit::InsertTextWithString(UINT StringID, const CStringW &Text, DWORD Te
        LoadAndInsertText(StringID, Text, TextFlags);
    }
 }
-
-VOID
-CAppRichEdit::SetWelcomeText()
-{
-    CStringW szText;
-
-    szText.LoadStringW(IDS_WELCOME_TITLE);
-    SetText(szText, CFE_BOLD);
-
-    szText.LoadStringW(IDS_WELCOME_TEXT);
-    InsertText(szText, 0);
-
-    szText.LoadStringW(IDS_WELCOME_URL);
-    InsertText(szText, CFM_LINK);
-}
 // **** CAppRichEdit ****

 int
@@ -792,6 +823,11 @@ CAppInfoDisplay::ProcessWindowMessage(
            }
            break;
        }
+        case WM_SYSCOLORCHANGE:
+        {
+            RichEdit->SendMessageW(EM_SETBKGNDCOLOR, 0, GetSysColor(COLOR_BTNFACE));
+            break;
+        }
    }

    return FALSE;
@@ -934,12 +970,41 @@ CAppInfoDisplay::ShowAppInfo(CAppInfo *Info)
    Info->ShowAppInfo(RichEdit);
 }

-VOID
-CAppInfoDisplay::SetWelcomeText()
+void
+CAppInfoDisplay::SetWelcomeText(bool bAppwiz)
 {
+    CStringW szText;
+
    ScrnshotPrev->DisplayEmpty();
    ResizeChildren();
-    RichEdit->SetWelcomeText();
+
+    // Display the standard banner in normal mode, or
+    // the specific "Add/Remove Programs" in APPWIZ-mode.
+    if (!bAppwiz)
+    {
+        szText.LoadStringW(IDS_WELCOME_TITLE);
+        RichEdit->SetText(szText, CFE_BOLD);
+        RichEdit->InsertText(L"\n\n", 0);
+
+        szText.LoadStringW(IDS_WELCOME_TEXT);
+        RichEdit->InsertText(szText, 0);
+
+        szText.LoadStringW(IDS_WELCOME_URL);
+        RichEdit->InsertText(szText, CFM_LINK);
+    }
+    else
+    {
+        szText.LoadStringW(IDS_APPWIZ_TITLE);
+        RichEdit->SetText(szText, CFE_BOLD);
+        RichEdit->InsertText(L"\n\n", 0);
+
+        szText.LoadStringW(IDS_APPWIZ_TEXT1);
+        RichEdit->InsertText(szText, 0);
+        RichEdit->InsertText(L"\n", 0);
+
+        szText.LoadStringW(IDS_APPWIZ_TEXT2);
+        RichEdit->InsertText(szText, 0);
+    }
 }

 VOID
@@ -1108,19 +1173,11 @@ CAppsListView::SetWatermark(const CStringW &Text)
    m_Watermark = Text;
 }

-VOID
-CAppsListView::SetCheckboxesVisible(BOOL bIsVisible)
+void
+CAppsListView::ShowCheckboxes(bool bShow)
 {
-    if (bIsVisible)
-    {
-        SetExtendedListViewStyle(LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT);
-    }
-    else
-    {
-        SetExtendedListViewStyle(LVS_EX_FULLROWSELECT);
-    }
-
-    bHasCheckboxes = bIsVisible;
+    SetExtendedListViewStyle((bShow ? LVS_EX_CHECKBOXES : 0) | LVS_EX_FULLROWSELECT);
+    bHasCheckboxes = bShow;
 }

 VOID
@@ -1253,7 +1310,7 @@ CAppsListView::Create(HWND hwndParent)

    if (hwnd)
    {
-        SetCheckboxesVisible(FALSE);
+        ShowCheckboxes(false);
    }

 #pragma push_macro("SubclassWindow")
@@ -1354,16 +1411,18 @@ CAppsListView::SetDisplayAppType(APPLICATION_VIEW_TYPE AppType)

            /* Add columns to ListView */
            szText.LoadStringW(IDS_APP_NAME);
-            AddColumn(ColumnCount++, szText, 250, LVCFMT_LEFT);
+            AddColumn(ColumnCount++, szText, 368, LVCFMT_LEFT);

            szText.LoadStringW(IDS_APP_INST_VERSION);
            AddColumn(ColumnCount++, szText, 90, LVCFMT_RIGHT);

+#if 0 // This column is not currently useful for installed apps.
            szText.LoadStringW(IDS_APP_DESCRIPTION);
            AddColumn(ColumnCount++, szText, 300, LVCFMT_LEFT);
+#endif

-            // disable checkboxes
-            SetCheckboxesVisible(FALSE);
+            // Disable checkboxes
+            ShowCheckboxes(false);
            break;

        case AppViewTypeAvailableApps:
@@ -1378,8 +1437,8 @@ CAppsListView::SetDisplayAppType(APPLICATION_VIEW_TYPE AppType)
            szText.LoadStringW(IDS_APP_DESCRIPTION);
            AddColumn(ColumnCount++, szText, 300, LVCFMT_LEFT);

-            // enable checkboxes
-            SetCheckboxesVisible(TRUE);
+            // Enable checkboxes
+            ShowCheckboxes(true);
            break;

        default:
@@ -1485,6 +1544,41 @@ CApplicationView::ProcessWindowMessage(
            bSuccess &= CreateListView();
            bSuccess &= CreateAppInfoDisplay();

+            /* APPWIZ-mode: Remove the unneeded menu items and toolbar buttons */
+            if (m_MainWindow->m_bAppwizMode)
+            {
+                HMENU hMenu;
+
+                /* Delete the "Settings" item in the "File" sub-menu */
+                hMenu = ::GetSubMenu(m_MainWindow->GetMenu(), 0);
+                DeleteMenuEx(hMenu, ID_SETTINGS, MF_BYCOMMAND);
+
+                /* Remove the menu items: ID_INSTALL, ID_RESETDB */
+                hMenu = GetMenu();
+                DeleteMenuEx(hMenu, ID_INSTALL, MF_BYCOMMAND);
+                DeleteMenuEx(hMenu, ID_RESETDB, MF_BYCOMMAND);
+
+                /* Remove the toolbar buttons:
+                 * ID_INSTALL, ID_CHECK_ALL, ID_RESETDB
+                 * We only keep:
+                 * ID_UNINSTALL, ID_MODIFY, ID_REFRESH */
+                TBBUTTONINFO info = { sizeof(info), 0 };
+                int index;
+
+                index = m_Toolbar->GetButtonInfo(ID_INSTALL, &info);
+                if (index >= 0) m_Toolbar->DeleteButton(index);
+
+                index = m_Toolbar->GetButtonInfo(ID_CHECK_ALL, &info);
+                if (index >= 0) m_Toolbar->DeleteButton(index);
+
+                index = m_Toolbar->GetButtonInfo(ID_RESETDB, &info);
+                if (index >= 0) m_Toolbar->DeleteButton(index);
+
+                /* Update the ideal width to use as a max width of buttons */
+                m_Toolbar->UpdateMaxButtonsWidth();
+            }
+
+            /* Resize the toolbar */
            m_Toolbar->AutoSize();

            RECT rTop;
@@ -1569,15 +1663,6 @@ CApplicationView::ProcessWindowMessage(
                        }
                    }
                    break;
-
-                    case NM_RCLICK:
-                    {
-                        if (((LPNMLISTVIEW)lParam)->iItem != -1)
-                        {
-                            ShowPopupMenuEx(m_hWnd, m_hWnd, 0, ID_INSTALL);
-                        }
-                    }
-                    break;
                }
            }
            else if (pNotifyHeader->hwndFrom == m_Toolbar->GetWindow())
@@ -1596,7 +1681,7 @@ CApplicationView::ProcessWindowMessage(
        {
            /* Forward WM_SYSCOLORCHANGE to common controls */
            m_ListView->SendMessageW(WM_SYSCOLORCHANGE, wParam, lParam);
-            m_ListView->SendMessageW(EM_SETBKGNDCOLOR, 0, GetSysColor(COLOR_BTNFACE));
+            m_AppsInfo->SendMessageW(WM_SYSCOLORCHANGE, wParam, lParam);
            m_Toolbar->SendMessageW(WM_SYSCOLORCHANGE, wParam, lParam);
            m_ComboBox->SendMessageW(WM_SYSCOLORCHANGE, wParam, lParam);
        }
@@ -1613,6 +1698,30 @@ CApplicationView::ProcessWindowMessage(
            OnCommand(wParam, lParam);
        }
        break;
+
+        case WM_CONTEXTMENU:
+        {
+            bool kbd = -1 == (int)(INT_PTR)lParam;
+            if ((HWND)wParam == m_ListView->m_hWnd)
+            {
+                int item = m_ListView->GetNextItem(-1, LVNI_FOCUSED | LVNI_SELECTED);
+                if (item != -1)
+                {
+                    POINT *ppt = NULL, pt;
+                    if (kbd)
+                    {
+                        RECT r;
+                        ListView_GetItemRect((HWND)wParam, item, &r, LVIR_LABEL);
+                        pt.x = r.left + (r.right - r.left) / 2;
+                        pt.y = r.top + (r.bottom - r.top) / 2;
+                        ::ClientToScreen((HWND)wParam, ppt = &pt);
+                    }
+                    ShowPopupMenuEx(m_hWnd, m_hWnd, 0, ID_INSTALL, ppt);
+                    return TRUE;
+                }
+            }
+        }
+        break;
    }
    return FALSE;
 }
@@ -1708,7 +1817,7 @@ CApplicationView::OnSize(HWND hwnd, WPARAM wParam, LPARAM lParam)
    if (wParam == SIZE_MINIMIZED)
        return;

-    /* Size tool bar */
+    /* Resize the toolbar */
    m_Toolbar->AutoSize();

    /* Automatically hide captions */
@@ -1717,11 +1826,11 @@ CApplicationView::OnSize(HWND hwnd, WPARAM wParam, LPARAM lParam)

    if (dSearchbarMargin > dToolbarTreshold)
    {
-        m_Toolbar->ShowButtonCaption();
+        m_Toolbar->ShowButtonCaption(true);
    }
    else if (dSearchbarMargin < dToolbarTreshold)
    {
-        m_Toolbar->HideButtonCaption();
+        m_Toolbar->ShowButtonCaption(false);
    }

    RECT r = {0, 0, LOWORD(lParam), HIWORD(lParam)};
@@ -1897,9 +2006,10 @@ CApplicationView::Create(HWND hwndParent)
 {
    RECT r = {0, 0, 0, 0};

-    HMENU menu = GetSubMenu(LoadMenuW(hInst, MAKEINTRESOURCEW(IDR_APPLICATIONMENU)), 0);
+    // Pick the "Programs" sub-menu for building the context menu.
+    HMENU hMenu = ::GetSubMenu(m_MainWindow->GetMenu(), 1);

-    return CWindowImpl::Create(hwndParent, r, L"", WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_CLIPSIBLINGS, 0, menu);
+    return CWindowImpl::Create(hwndParent, r, L"", WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_CLIPSIBLINGS, 0, hMenu);
 }

 BOOL
@@ -1910,32 +2020,41 @@ CApplicationView::SetDisplayAppType(APPLICATION_VIEW_TYPE AppType)
        return FALSE;
    }
    ApplicationViewType = AppType;
-    m_AppsInfo->SetWelcomeText();
+    m_AppsInfo->SetWelcomeText(m_MainWindow->m_bAppwizMode);

    HMENU hMenu = ::GetMenu(m_hWnd);
    switch (AppType)
    {
        case AppViewTypeInstalledApps:
-            EnableMenuItem(hMenu, ID_REGREMOVE, MF_ENABLED);
+        {
            EnableMenuItem(hMenu, ID_INSTALL, MF_GRAYED);
            EnableMenuItem(hMenu, ID_UNINSTALL, MF_ENABLED);
            EnableMenuItem(hMenu, ID_MODIFY, MF_ENABLED);
+            EnableMenuItem(hMenu, ID_REGREMOVE, MF_ENABLED);

            m_Toolbar->SendMessageW(TB_ENABLEBUTTON, ID_INSTALL, FALSE);
            m_Toolbar->SendMessageW(TB_ENABLEBUTTON, ID_UNINSTALL, TRUE);
            m_Toolbar->SendMessageW(TB_ENABLEBUTTON, ID_MODIFY, TRUE);
+            m_Toolbar->SendMessageW(TB_ENABLEBUTTON, ID_CHECK_ALL, FALSE);
            break;
+        }

        case AppViewTypeAvailableApps:
-            EnableMenuItem(hMenu, ID_REGREMOVE, MF_GRAYED);
+        {
+            // We shouldn't get there in APPWIZ-mode.
+            ATLASSERT(!m_MainWindow->m_bAppwizMode);
+
            EnableMenuItem(hMenu, ID_INSTALL, MF_ENABLED);
            EnableMenuItem(hMenu, ID_UNINSTALL, MF_GRAYED);
            EnableMenuItem(hMenu, ID_MODIFY, MF_GRAYED);
+            EnableMenuItem(hMenu, ID_REGREMOVE, MF_GRAYED);

            m_Toolbar->SendMessageW(TB_ENABLEBUTTON, ID_INSTALL, TRUE);
            m_Toolbar->SendMessageW(TB_ENABLEBUTTON, ID_UNINSTALL, FALSE);
            m_Toolbar->SendMessageW(TB_ENABLEBUTTON, ID_MODIFY, FALSE);
+            m_Toolbar->SendMessageW(TB_ENABLEBUTTON, ID_CHECK_ALL, TRUE);
            break;
+        }
    }
    return TRUE;
 }
@@ -1980,6 +2099,41 @@ CApplicationView::AppendTabOrderWindow(int Direction, ATL::CSimpleArray<HWND> &T
    m_AppsInfo->AppendTabOrderWindow(Direction, TabOrderList);
 }

+VOID
+CApplicationView::GetRestoreListSelectionData(RESTORELISTSELECTION &Restore)
+{
+    LVITEMW &Item = Restore.Item;
+    Item.mask = LVIF_TEXT|LVIF_STATE;
+    Item.iItem = -1, Item.iSubItem = 0;
+    Item.stateMask = LVIS_FOCUSED|LVIS_SELECTED;
+    Item.pszText = Restore.Name, Item.cchTextMax = _countof(Restore.Name);
+
+    HWND hList = m_ListView ? m_ListView->m_hWnd : NULL;
+    if (hList)
+    {
+        Item.iItem = ListView_GetNextItem(hList, -1, LVNI_FOCUSED);
+        ListView_GetItem(hList, &Item);
+    }
+}
+
+VOID
+CApplicationView::RestoreListSelection(const RESTORELISTSELECTION &Restore)
+{
+    const LVITEMW &Item = Restore.Item;
+    int index = Item.iItem;
+    if (index != -1) // Was there a selected item?
+    {
+        LVFINDINFOW fi;
+        fi.flags = LVFI_STRING;
+        fi.psz = Item.pszText;
+        index = ListView_FindItem(m_ListView->m_hWnd, -1, &fi);
+    }
+    if (index != -1) // Is it still in the list?
+    {
+        ListView_SetItemState(m_ListView->m_hWnd, index, Item.state, Item.stateMask);
+    }
+}
+
 // this function is called when a item of listview get focus.
 // CallbackParam is the param passed to listview when adding the item (the one getting focus now).
 VOID
--- a/base/applications/rapps/gui.cpp
+++ b/base/applications/rapps/gui.cpp
@@ -82,7 +82,7 @@ CSideTreeView::~CSideTreeView()

 // **** CMainWindow ****

-CMainWindow::CMainWindow(CAppDB *db, BOOL bAppwiz) : m_ClientPanel(NULL), m_Db(db), bAppwizMode(bAppwiz), SelectedEnumType(ENUM_ALL_INSTALLED)
+CMainWindow::CMainWindow(CAppDB *db, BOOL bAppwiz) : m_ClientPanel(NULL), m_Db(db), m_bAppwizMode(bAppwiz), SelectedEnumType(ENUM_ALL_INSTALLED)
 {
 }

@@ -100,6 +100,10 @@ CMainWindow::InitCategoriesList()
    m_TreeView->AddCategory(hRootItemInstalled, IDS_APPLICATIONS, IDI_APPS);
    m_TreeView->AddCategory(hRootItemInstalled, IDS_UPDATES, IDI_APPUPD);

+    // Do not show any other categories in APPWIZ-mode.
+    if (m_bAppwizMode)
+        goto Finish;
+
    m_TreeView->AddCategory(TVI_ROOT, IDS_SELECTEDFORINST, IDI_SELECTEDFORINST);

    hRootItemAvailable = m_TreeView->AddCategory(TVI_ROOT, IDS_AVAILABLEFORINST, IDI_CATEGORY);
@@ -120,10 +124,12 @@ CMainWindow::InitCategoriesList()
    m_TreeView->AddCategory(hRootItemAvailable, IDS_CAT_THEMES, IDI_CAT_THEMES);
    m_TreeView->AddCategory(hRootItemAvailable, IDS_CAT_OTHER, IDI_CAT_OTHER);

+Finish:
    m_TreeView->SetImageList();
    m_TreeView->Expand(hRootItemInstalled, TVE_EXPAND);
-    m_TreeView->Expand(hRootItemAvailable, TVE_EXPAND);
-    m_TreeView->SelectItem(bAppwizMode ? hRootItemInstalled : hRootItemAvailable);
+    if (!m_bAppwizMode)
+        m_TreeView->Expand(hRootItemAvailable, TVE_EXPAND);
+    m_TreeView->SelectItem(m_bAppwizMode ? hRootItemInstalled : hRootItemAvailable);
 }

 BOOL
@@ -312,13 +318,13 @@ CMainWindow::ProcessWindowMessage(HWND hwnd, UINT Msg, WPARAM wParam, LPARAM lPa
        case WM_CREATE:
            if (!InitControls())
                ::PostMessageW(hwnd, WM_CLOSE, 0, 0);
+            ::PostMessageW(hwnd, DM_REPOSITION, 0, 0);
            break;

        case WM_DESTROY:
        {
-            ShowWindow(SW_HIDE);
+            hMainWnd = NULL;
            SaveSettings(hwnd, &SettingsInfo);
-
            FreeLogs();

            delete m_ClientPanel;
@@ -327,6 +333,19 @@ CMainWindow::ProcessWindowMessage(HWND hwnd, UINT Msg, WPARAM wParam, LPARAM lPa
            return 0;
        }

+        case WM_CLOSE:
+            ShowWindow(SW_HIDE);
+            return g_Busy;
+
+        case WM_NOTIFY_OPERATIONCOMPLETED:
+            if (!g_Busy && !IsWindowVisible())
+                SendMessage(WM_CLOSE, 0, 0);
+            break;
+
+        case DM_REPOSITION:
+            EmulateDialogReposition(hwnd); // We are not a real dialog, we need help from a real one
+            break;
+
        case WM_COMMAND:
            OnCommand(wParam, lParam);
            break;
@@ -337,6 +356,22 @@ CMainWindow::ProcessWindowMessage(HWND hwnd, UINT Msg, WPARAM wParam, LPARAM lPa

            switch (data->code)
            {
+                case TVN_ITEMEXPANDING:
+                {
+                    if (data->hwndFrom == m_TreeView->m_hWnd)
+                    {
+                        // APPWIZ-mode: forbid item collapse.
+                        // FIXME: Prevent collapse (COMCTL32 is buggy)
+                        // https://bugs.winehq.org/show_bug.cgi?id=53727
+                        if (m_bAppwizMode && (((LPNMTREEVIEW)lParam)->action & TVE_TOGGLE) == TVE_COLLAPSE)
+                        {
+                            theResult = TRUE;
+                            return TRUE; // Handled
+                        }
+                    }
+                    break;
+                }
+
                case TVN_SELCHANGED:
                {
                    if (data->hwndFrom == m_TreeView->m_hWnd)
@@ -586,8 +621,16 @@ CMainWindow::UpdateStatusBarText()
    if (m_StatusBar)
    {
        CStringW szBuffer;
+        szBuffer.Format(IDS_APPS_COUNT, m_ApplicationView->GetItemCount());
+
+        // Append the number of selected apps if not in APPWIZ-mode.
+        if (!m_bAppwizMode)
+        {
+            CStringW szBuffer2;
+            szBuffer2.Format(IDS_APPS_SELECT_COUNT, m_Selected.GetCount());
+            szBuffer += szBuffer2;
+        }

-        szBuffer.Format(IDS_APPS_COUNT, m_ApplicationView->GetItemCount(), m_Selected.GetCount());
        m_StatusBar->SetText(szBuffer);
    }
 }
@@ -612,6 +655,13 @@ CMainWindow::AddApplicationsToView(CAtlList<CAppInfo *> &List)
 VOID
 CMainWindow::UpdateApplicationsList(AppsCategories EnumType, BOOL bReload, BOOL bCheckAvailable)
 {
+    // Only installed applications should be enumerated in APPWIZ-mode.
+    if (m_bAppwizMode && !IsInstalledEnum(EnumType))
+    {
+        ATLASSERT(FALSE && "Should not be called in APPWIZ-mode");
+        return;
+    }
+
    bUpdating = TRUE;

    if (HCURSOR hCursor = LoadCursor(NULL, IDC_APPSTARTING))
@@ -624,9 +674,14 @@ CMainWindow::UpdateApplicationsList(AppsCategories EnumType, BOOL bReload, BOOL
    if (bCheckAvailable)
        CheckAvailable();

+    BOOL TryRestoreSelection = SelectedEnumType == EnumType;
    if (SelectedEnumType != EnumType)
        SelectedEnumType = EnumType;

+    CApplicationView::RESTORELISTSELECTION RestoreSelection;
+    if (TryRestoreSelection)
+        m_ApplicationView->GetRestoreListSelectionData(RestoreSelection);
+
    if (bReload)
        m_Selected.RemoveAll();

@@ -645,6 +700,9 @@ CMainWindow::UpdateApplicationsList(AppsCategories EnumType, BOOL bReload, BOOL
    }
    else if (IsAvailableEnum(EnumType))
    {
+        // We shouldn't get there in APPWIZ-mode.
+        ATLASSERT(!m_bAppwizMode);
+
        if (bReload)
            m_Db->UpdateAvailable();

@@ -667,6 +725,9 @@ CMainWindow::UpdateApplicationsList(AppsCategories EnumType, BOOL bReload, BOOL
    {
        ATLASSERT(0 && "This should be unreachable!");
    }
+
+    if (TryRestoreSelection)
+        m_ApplicationView->RestoreListSelection(RestoreSelection);
    m_ApplicationView->SetRedraw(TRUE);
    m_ApplicationView->RedrawWindow(0, 0, RDW_INVALIDATE | RDW_ALLCHILDREN); // force the child window to repaint
    UpdateStatusBarText();
@@ -701,8 +762,7 @@ CMainWindow::GetWndClassInfo()
 HWND
 CMainWindow::Create()
 {
-    CStringW szWindowName;
-    szWindowName.LoadStringW(IDS_APPTITLE);
+    const CStringW szWindowName(MAKEINTRESOURCEW(m_bAppwizMode ? IDS_APPWIZ_TITLE : IDS_APPTITLE));

    RECT r = {
        (SettingsInfo.bSaveWndPos ? SettingsInfo.Left : CW_USEDEFAULT),
--- a/base/applications/rapps/include/appview.h
+++ b/base/applications/rapps/include/appview.h
@@ -89,8 +89,6 @@ class CAppRichEdit : public CUiWindow<CRichEdit>
    LoadAndInsertText(UINT uStringID, DWORD StringFlags);
    VOID
    InsertTextWithString(UINT StringID, const CStringW &Text, DWORD TextFlags);
-    VOID
-    SetWelcomeText();
 };

 int
@@ -178,8 +176,8 @@ class CAppInfoDisplay : public CUiWindow<CWindowImpl<CAppInfoDisplay>>

    VOID
    ShowAppInfo(CAppInfo *Info);
-    VOID
-    SetWelcomeText();
+    void
+    SetWelcomeText(bool bAppwiz);
    VOID
    OnCommand(WPARAM wParam, LPARAM lParam);

@@ -195,7 +193,7 @@ class CAppsListView : public CUiWindow<CWindowImpl<CAppsListView, CListView>>
    };

    BOOL bIsAscending = TRUE;
-    BOOL bHasCheckboxes = FALSE;
+    bool bHasCheckboxes = false;

    INT ItemCount = 0;
    INT CheckedItemCount = 0;
@@ -224,8 +222,9 @@ class CAppsListView : public CUiWindow<CWindowImpl<CAppsListView, CListView>>

    VOID
    SetWatermark(const CStringW &Text);
-    VOID
-    SetCheckboxesVisible(BOOL bIsVisible);
+
+    void
+    ShowCheckboxes(bool bShow);

    VOID
    ColumnClick(LPNMLISTVIEW pnmv);
@@ -293,10 +292,11 @@ class CMainToolbar : public CUiWindow<CToolbar<>>
    HWND
    Create(HWND hwndParent);

-    VOID
-    HideButtonCaption();
-    VOID
-    ShowButtonCaption();
+    void
+    ShowButtonCaption(bool bShow);
+
+    void
+    UpdateMaxButtonsWidth();

    DWORD
    GetMaxButtonsWidth() const;
@@ -406,6 +406,15 @@ class CApplicationView : public CUiWindow<CWindowImpl<CApplicationView>>
    VOID
    AppendTabOrderWindow(int Direction, ATL::CSimpleArray<HWND> &TabOrderList);

+    struct RESTORELISTSELECTION {
+        LVITEMW Item;
+        WCHAR Name[MAX_PATH];
+    };
+    VOID
+    GetRestoreListSelectionData(RESTORELISTSELECTION &Restore);
+    VOID
+    RestoreListSelection(const RESTORELISTSELECTION &Restore);
+
    // this function is called when a item of listview get focus.
    // CallbackParam is the param passed to listview when adding the item (the one getting focus now).
    VOID
--- a/base/applications/rapps/include/gui.h
+++ b/base/applications/rapps/include/gui.h
@@ -52,12 +52,13 @@ class CMainWindow : public CWindowImpl<CMainWindow, CWindow, CFrameWinTraits>
    CUiWindow<CStatusBar> *m_StatusBar = NULL;

    CApplicationView *m_ApplicationView = NULL;
+    friend class CApplicationView;

    CAppDB *m_Db;
    CAtlList<CAppInfo *> m_Selected;

    BOOL bUpdating = FALSE;
-    BOOL bAppwizMode;
+    BOOL m_bAppwizMode;
    HTREEITEM hRootItemInstalled;

    CStringW szSearchPattern;
--- a/base/applications/rapps/include/misc.h
+++ b/base/applications/rapps/include/misc.h
@@ -29,7 +29,9 @@ ErrorFromHResult(HRESULT hr)
 VOID
 CopyTextToClipboard(LPCWSTR lpszText);
 VOID
-ShowPopupMenuEx(HWND hwnd, HWND hwndOwner, UINT MenuID, UINT DefaultItem);
+ShowPopupMenuEx(HWND hwnd, HWND hwndOwner, UINT MenuID, UINT DefaultItem, POINT *Point = NULL);
+VOID
+EmulateDialogReposition(HWND hwnd);
 BOOL
 StartProcess(const CStringW &Path, BOOL Wait);
 BOOL
--- a/base/applications/rapps/include/rapps.h
+++ b/base/applications/rapps/include/rapps.h
@@ -13,4 +13,8 @@
 #include "misc.h"
 #include "configparser.h"

+extern LONG g_Busy;
+
+#define WM_NOTIFY_OPERATIONCOMPLETED (WM_APP + 0)
+
 #endif /* _RAPPS_H */
--- a/base/applications/rapps/include/resource.h
+++ b/base/applications/rapps/include/resource.h
@@ -67,7 +67,6 @@
 /* Menus */
 #define IDR_MAINMENU             500
 #define IDR_LINKMENU             501
-#define IDR_APPLICATIONMENU      502

 /* Menu items */
 #define ID_EXIT                  550
@@ -88,40 +87,46 @@
 /* Messages */
 #define ID_ACTIVATE_APPWIZ       600

-/* Strings */
+/* Banners */
 #define IDS_APPTITLE             100
-#define IDS_SEARCH_TEXT          101
-#define IDS_APPS_COUNT           102
-#define IDS_WELCOME_TITLE        103
-#define IDS_WELCOME_TEXT         104
-#define IDS_WELCOME_URL          105
-#define IDS_INSTALLED            106
-#define IDS_AVAILABLEFORINST     107
-#define IDS_UPDATES              108
-#define IDS_APPLICATIONS         109
-#define IDS_CHOOSE_FOLDER_TEXT   110
-#define IDS_CHOOSE_FOLDER_ERROR  111
-#define IDS_URL_INVALID          112
-#define IDS_APP_REG_REMOVE       113
-#define IDS_INFORMATION          114
-#define IDS_UNABLE_TO_REMOVE     115
-#define IDS_UNABLE_TO_DOWNLOAD   116
-#define IDS_UNABLE_TO_DOWNLOAD2  117
-#define IDS_UNABLE_TO_QUERY_CERT 118
-#define IDS_INTEG_CHECK_TITLE    119
-#define IDS_INTEG_CHECK_FAIL     120
-#define IDS_INTERRUPTED_DOWNLOAD 121
-#define IDS_UNABLE_TO_WRITE      122
-#define IDS_INSTALL_SELECTED     123
-#define IDS_UNABLE_TO_INSTALL    124
-#define IDS_SELECTEDFORINST      125
-#define IDS_MISMATCH_CERT_INFO   126
-#define IDS_UNABLE_PATH          127
-#define IDS_APP_AUTHORS          128
-#define IDS_APP_DISPLAY_DETAILS  129
-#define IDS_APP_DISPLAY_LIST     130
-#define IDS_APP_DISPLAY_TILE     131
-#define IDS_NO_SEARCH_RESULTS    132
+#define IDS_APP_AUTHORS          101
+#define IDS_WELCOME_TITLE        102
+#define IDS_WELCOME_TEXT         103
+#define IDS_WELCOME_URL          104
+#define IDS_APPWIZ_TITLE         105
+#define IDS_APPWIZ_TEXT1         106
+#define IDS_APPWIZ_TEXT2         107
+
+/* Strings */
+#define IDS_SEARCH_TEXT          110
+#define IDS_APPS_COUNT           111
+#define IDS_APPS_SELECT_COUNT    112
+#define IDS_INSTALLED            113
+#define IDS_AVAILABLEFORINST     114
+#define IDS_UPDATES              115
+#define IDS_APPLICATIONS         116
+#define IDS_CHOOSE_FOLDER_TEXT   117
+#define IDS_CHOOSE_FOLDER_ERROR  118
+#define IDS_URL_INVALID          119
+#define IDS_APP_REG_REMOVE       120
+#define IDS_INFORMATION          121
+#define IDS_UNABLE_TO_REMOVE     122
+#define IDS_UNABLE_TO_DOWNLOAD   123
+#define IDS_UNABLE_TO_DOWNLOAD2  124
+#define IDS_UNABLE_TO_QUERY_CERT 125
+#define IDS_INTEG_CHECK_TITLE    126
+#define IDS_INTEG_CHECK_FAIL     127
+#define IDS_INTERRUPTED_DOWNLOAD 128
+#define IDS_UNABLE_TO_WRITE      129
+#define IDS_INSTALL_SELECTED     130
+#define IDS_UNABLE_TO_INSTALL    131
+#define IDS_SELECTEDFORINST      132
+#define IDS_MISMATCH_CERT_INFO   133
+#define IDS_UNABLE_PATH          134
+#define IDS_APP_DISPLAY_DETAILS  135
+#define IDS_APP_DISPLAY_LIST     136
+#define IDS_APP_DISPLAY_TILE     137
+#define IDS_NO_SEARCH_RESULTS    138

 /* Tooltips */
 #define IDS_TOOLTIP_INSTALL      200
--- a/base/applications/rapps/lang/bg-BG.rc
+++ b/base/applications/rapps/lang/bg-BG.rc
@@ -43,22 +43,6 @@ BEGIN
    END
 END

-IDR_APPLICATIONMENU MENU
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Слагане\tCtrl+Enter", ID_INSTALL
-        MENUITEM "&Махане\tCtrl+Del", ID_UNINSTALL
-        MENUITEM "&Промяна", ID_MODIFY
-        MENUITEM SEPARATOR
-        MENUITEM "Пр&емахване от регистъра", ID_REGREMOVE
-        MENUITEM SEPARATOR
-        MENUITEM "О&пресняване\tF5", ID_REFRESH
-        MENUITEM SEPARATOR
-        MENUITEM "Update Data&base\tCtrl+F5", ID_RESETDB
-    END
-END
-
 IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 254, 265
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Настройки"
@@ -188,11 +172,20 @@ STRINGTABLE
 BEGIN
    IDS_APPTITLE "Управителят за приложения на РеактОС"
    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
-    IDS_SEARCH_TEXT "Търсене"
-    IDS_APPS_COUNT "Брой приложения: %d; Selected: %d"
    IDS_WELCOME_TITLE "Управителят на приложенията на РеактОС ви приветства"
    IDS_WELCOME_TEXT "Изберете раздел от лявата страна, след което изберете приложение за слагане или премахване.\nСтраницата на РеактОС: "
    IDS_WELCOME_URL "https://reactos.org"
+
+    IDS_APPWIZ_TITLE "Add/Remove Programs"
+    IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system."
+    IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SEARCH_TEXT "Търсене…"
+    IDS_APPS_COUNT "Брой приложения: %d"
+    IDS_APPS_SELECT_COUNT "; Selected: %d"
    IDS_INSTALLED "Сложено"
    IDS_AVAILABLEFORINST "Налично за слагане"
    IDS_UPDATES "Обновления"
--- a/base/applications/rapps/lang/cs-CZ.rc
+++ b/base/applications/rapps/lang/cs-CZ.rc
@@ -2,7 +2,8 @@
 * PROJECT:     ReactOS Applications Manager
 * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
 * PURPOSE:     Czech resource file
- * TRANSLATOR:  Copyright 2014 Radek Liska aka Black_Fox <radekliska@gmail.com>
+ * TRANSLATORS: Copyright 2014 Radek Liška (Black_Fox) <radekliska@gmail.com>
+ *              Copyright 2024 Václav Zouzalík (Venca24) <vaclav.zouzalik@seznam.cz>
 */

 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
@@ -43,22 +44,6 @@ BEGIN
    END
 END

-IDR_APPLICATIONMENU MENU
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Instalovat\tCtrl+Enter", ID_INSTALL
-        MENUITEM "&Odinstalovat\tCtrl+Del", ID_UNINSTALL
-        MENUITEM "&Změnit", ID_MODIFY
-        MENUITEM SEPARATOR
-        MENUITEM "Odstranit z r&egistru", ID_REGREMOVE
-        MENUITEM SEPARATOR
-        MENUITEM "Ob&novit\tF5", ID_REFRESH
-        MENUITEM SEPARATOR
-        MENUITEM "Aktualizovat data&bázi\tCtrl+F5", ID_RESETDB
-    END
-END
-
 IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Nastavení"
@@ -73,9 +58,9 @@ BEGIN
    EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL
    PUSHBUTTON "&Procházet…", IDC_CHOOSE, 187, 85, 50, 14
    AUTOCHECKBOX "&Smazat instalátor programu po dokončení instalace", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
-    GROUPBOX "Software source", -1, 4, 118, 240, 46
-    AUTORADIOBUTTON "Use default", IDC_SOURCE_DEFAULT, 15, 132, 74, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "Specified source", IDC_USE_SOURCE, 15, 147, 74, 10
+    GROUPBOX "Zdroj softwaru", -1, 4, 118, 240, 46
+    AUTORADIOBUTTON "Použít výchozí", IDC_SOURCE_DEFAULT, 15, 132, 74, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "Vlastní zdroj", IDC_USE_SOURCE, 15, 147, 74, 10
    EDITTEXT IDC_SOURCE_URL, 97, 147, 140, 12, ES_AUTOHSCROLL | WS_DISABLED
    GROUPBOX "Proxy", -1, 4, 166, 240, 76
    AUTORADIOBUTTON "Systémové nastavení proxy", IDC_PROXY_DEFAULT, 15, 180, 210, 10, WS_GROUP | WS_TABSTOP
@@ -116,7 +101,7 @@ BEGIN
    IDS_TOOLTIP_INSTALL "Instalovat"
    IDS_TOOLTIP_UNINSTALL "Odinstalovat"
    IDS_TOOLTIP_MODIFY "Změnit"
-    IDS_TOOLTIP_SELECT_ALL "Select/Deselect All"
+    IDS_TOOLTIP_SELECT_ALL "Vybrat vše/Zrušit výběr"
    IDS_TOOLTIP_SETTINGS "Nastavení"
    IDS_TOOLTIP_REFRESH "Obnovit"
    IDS_TOOLTIP_UPDATE_DB "Aktualizovat databázi"
@@ -136,7 +121,7 @@ BEGIN
    IDS_INFO_DESCRIPTION "\nPopis: "
    IDS_INFO_PUBLISHER "\nVydavatel: "
    IDS_INFO_HELPLINK "\nInternetová pomoc: "
-    IDS_INFO_HELPPHONE "\nTelefonní pomoc: "
+    IDS_INFO_HELPPHONE "\nTelefonická pomoc: "
    IDS_INFO_README "\nReadme: "
    IDS_INFO_REGOWNER "\nRegistrovaný vlastník: "
    IDS_INFO_PRODUCTID "\nID produktu: "
@@ -149,19 +134,19 @@ BEGIN
    IDS_INFO_UNINSTALLSTR "\nOdinstalační řetězec: "
    IDS_INFO_MODIFYPATH "\nCesta úpravy: "
    IDS_INFO_INSTALLDATE "\nDatum instalace: "
-    IDS_AINFO_PACKAGE_NAME "\nPackage Name: "
+    IDS_AINFO_PACKAGE_NAME "\nNázev balíčku: "
 END

 STRINGTABLE
 BEGIN
    IDS_AINFO_VERSION "\nVerze: "
-    IDS_AINFO_AVAILABLEVERSION "\nAvailable Version: "
+    IDS_AINFO_AVAILABLEVERSION "\nDostupná verze: "
    IDS_AINFO_DESCRIPTION "\nPopis: "
    IDS_AINFO_SIZE "\nVelikost: "
    IDS_AINFO_URLSITE "\nDomovská stránka: "
-    IDS_AINFO_LICENSE "\nLicense: "
+    IDS_AINFO_LICENSE "\nLicence: "
    IDS_AINFO_URLDOWNLOAD "\nStažení: "
-    IDS_AINFO_LANGUAGES "\nLanguages: "
+    IDS_AINFO_LANGUAGES "\nJazyky: "
 END

 STRINGTABLE
@@ -181,56 +166,65 @@ BEGIN
    IDS_CAT_SCIENCE "Věda"
    IDS_CAT_TOOLS "Nástroje"
    IDS_CAT_VIDEO "Video"
-    IDS_CAT_THEMES "Themes"
+    IDS_CAT_THEMES "Vzhled"
 END

 STRINGTABLE
 BEGIN
    IDS_APPTITLE "ReactOS Správce aplikací"
    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
-    IDS_SEARCH_TEXT "Hledat…"
-    IDS_APPS_COUNT "Počet aplikací: %d; Selected: %d"
-    IDS_WELCOME_TITLE "Vítejte v ReactOS Správci aplikací!\n\n"
+    IDS_WELCOME_TITLE "Vítejte v ReactOS Správci aplikací!"
    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_APPWIZ_TITLE "Add/Remove Programs"
+    IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system."
+    IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SEARCH_TEXT "Hledat…"
+    IDS_APPS_COUNT "Počet aplikací: %d"
+    IDS_APPS_SELECT_COUNT "; Vybráno: %d"
    IDS_INSTALLED "Nainstalováno"
    IDS_AVAILABLEFORINST "Lze instalovat"
    IDS_UPDATES "Aktualizace"
    IDS_APPLICATIONS "Aplikace"
    IDS_CHOOSE_FOLDER_TEXT "Zvolte složku, do které se budou ukládat stažené soubory: "
    IDS_CHOOSE_FOLDER_ERROR "Zvolená složka neexistuje. Vytvořit?"
-    IDS_URL_INVALID "The URL you have specified is invalid or not supported. Please correct it!"
+    IDS_URL_INVALID "Vámi specifikovaná URL adresa není platná nebo není podporována. Prosím opravte ji!"
    IDS_APP_REG_REMOVE "Určitě odstranit data instalovaného programu z registru?"
    IDS_INFORMATION "Informace"
    IDS_UNABLE_TO_DOWNLOAD "Soubor se nepodařilo stáhnout! Adresa nenalezena!"
-    IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!"
+    IDS_UNABLE_TO_DOWNLOAD2 "Balíček se nepodařilo stáhnout! Zkontrolujte připojení k Internetu!"
    IDS_UNABLE_TO_REMOVE "Nepodařilo se odstranit data programu z registru!"
-    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 "Verifying package integrity…"
-    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_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?"
-    IDS_UNABLE_PATH "Incorrect path format."
-    IDS_APP_DISPLAY_DETAILS "Details"
-    IDS_APP_DISPLAY_LIST "List"
-    IDS_APP_DISPLAY_TILE "Tile"
-    IDS_NO_SEARCH_RESULTS "No search results"
+    IDS_UNABLE_TO_INSTALL "Nepodařilo se otevřít instalátor!"
+    IDS_UNABLE_TO_QUERY_CERT "Nepodařilo se získat informace o certifikátu.\n\nChcete přesto pokračovat?"
+    IDS_INTEG_CHECK_TITLE "Ověřuji integritu balíčku…"
+    IDS_INTEG_CHECK_FAIL "Balíček neprošel kontrolou integrity, mohl být poškozen nebo změněn během stahování. Nedoporučujeme spouštět tento program."
+    IDS_INTERRUPTED_DOWNLOAD "Stahování bylo přerušeno. Zkontrolujte připojení k Internetu."
+    IDS_UNABLE_TO_WRITE "Ukládání na disk se nepodařilo. Disk může být zaplněn."
+    IDS_INSTALL_SELECTED "Nainstalovat vybrané"
+    IDS_SELECTEDFORINST "Vybráno k instalaci"
+    IDS_MISMATCH_CERT_INFO "Neznámý certifikát:\nSubjekt: %s\nVydavatel: %s\nChcete i přesto pokračovat?"
+    IDS_UNABLE_PATH "Neplatný formát cesty."
+    IDS_APP_DISPLAY_DETAILS "Podrobnosti"
+    IDS_APP_DISPLAY_LIST "Seznam"
+    IDS_APP_DISPLAY_TILE "Dlaždice"
+    IDS_NO_SEARCH_RESULTS "Žádné výsledky"
 END

 STRINGTABLE
 BEGIN
-    IDS_STATUS_INSTALLED "Installed"
-    IDS_STATUS_NOTINSTALLED "Not installed"
-    IDS_STATUS_DOWNLOADED "Downloaded"
-    IDS_STATUS_UPDATE_AVAILABLE "Update available"
-    IDS_STATUS_DOWNLOADING "Downloading…"
-    IDS_STATUS_INSTALLING "Installing…"
-    IDS_STATUS_WAITING "Waiting to install…"
-    IDS_STATUS_FINISHED "Finished"
+    IDS_STATUS_INSTALLED "Nainstalováno"
+    IDS_STATUS_NOTINSTALLED "Nenainstalováno"
+    IDS_STATUS_DOWNLOADED "Staženo"
+    IDS_STATUS_UPDATE_AVAILABLE "Aktualizovatelné"
+    IDS_STATUS_DOWNLOADING "Stahuji…"
+    IDS_STATUS_INSTALLING "Instaluji…"
+    IDS_STATUS_WAITING "Čekám na instalaci…"
+    IDS_STATUS_FINISHED "Dokončeno"
 END

 STRINGTABLE
@@ -242,34 +236,34 @@ END

 STRINGTABLE
 BEGIN
-    IDS_LANGUAGE_AVAILABLE_TRANSLATION "Supports your language"
-    IDS_LANGUAGE_NO_TRANSLATION "Supports other languages"
-    IDS_LANGUAGE_ENGLISH_TRANSLATION "Supports English"
-    IDS_LANGUAGE_SINGLE "Single language"
-    IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d more)"
-    IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d available)"
+    IDS_LANGUAGE_AVAILABLE_TRANSLATION "Podporuje váš jazyk"
+    IDS_LANGUAGE_NO_TRANSLATION "Podporuje jiné jazyky"
+    IDS_LANGUAGE_ENGLISH_TRANSLATION "Podporuje angličtinu"
+    IDS_LANGUAGE_SINGLE "Jediný jazyk"
+    IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d dalších)"
+    IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d dalších)"
 END

 STRINGTABLE
 BEGIN
-    IDS_DL_DIALOG_DB_DISP "Applications Database"
-    IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database…"
-    IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)"
+    IDS_DL_DIALOG_DB_DISP "Databáze aplikací"
+    IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Aktualizuji databázi…"
+    IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Aktualizuji databázi… (Neoficiální zdroj)"
 END

 STRINGTABLE
 BEGIN
-    IDS_CMD_USAGE "Usage: "
-    IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n"
-    IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n"
-    IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n"
-    IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n"
-    IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n"
-    IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n"
-    IDS_CMD_PACKAGE_INFO "Information about package %1:\n"
+    IDS_CMD_USAGE "Použití: "
+    IDS_CMD_NEED_PACKAGE_NAME "Chyba: přepínač %1 očekává jeden nebo více názvů balíčků.\n"
+    IDS_CMD_NEED_FILE_NAME "Chyba: přepínač %1 očekává název souboru.\n"
+    IDS_CMD_NEED_PARAMS "Chyba: přepínač %1 očekává jeden nebo více parametrů.\n"
+    IDS_CMD_INVALID_OPTION "Chyba: Neznámý nebo neplatný přepínač příkazové řádky.\n"
+    IDS_CMD_FIND_RESULT_FOR "Najdi výsledek pro %1:\n"
+    IDS_CMD_PACKAGE_NOT_FOUND "Nepodařilo se najít balíček %1.\n"
+    IDS_CMD_PACKAGE_INFO "Informace o balíčku %1:\n"
 END

 STRINGTABLE
 BEGIN
-    IDS_INSTGEN_CONFIRMUNINST "Are you sure you want to uninstall %s?"
+    IDS_INSTGEN_CONFIRMUNINST "Opravdu chcete odinstalovat %s?"
 END
--- a/base/applications/rapps/lang/de-DE.rc
+++ b/base/applications/rapps/lang/de-DE.rc
@@ -46,22 +46,6 @@ BEGIN
    END
 END

-IDR_APPLICATIONMENU MENU
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Installieren\tCtrl+Enter", ID_INSTALL
-        MENUITEM "&Deinstallieren\tCtrl+Del", ID_UNINSTALL
-        MENUITEM "Ä&ndern", ID_MODIFY
-        MENUITEM SEPARATOR
-        MENUITEM "Aus R&egistry entfernen", ID_REGREMOVE
-        MENUITEM SEPARATOR
-        MENUITEM "Aktualisie&ren\tF5", ID_REFRESH
-        MENUITEM SEPARATOR
-        MENUITEM "Daten&bank aktualisieren\tCtrl+F5", ID_RESETDB
-    END
-END
-
 IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Einstellungen"
@@ -191,11 +175,20 @@ STRINGTABLE
 BEGIN
    IDS_APPTITLE "ReactOS-Anwendungsmanager"
    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
-    IDS_SEARCH_TEXT "Suche…"
-    IDS_APPS_COUNT "Anzahl der Anwendungen: %d, ausgewählt: %d"
-    IDS_WELCOME_TITLE "Willkommen im ReactOS-Anwendungsmanager!\n\n"
+    IDS_WELCOME_TITLE "Willkommen im ReactOS-Anwendungsmanager!"
    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_APPWIZ_TITLE "Add/Remove Programs"
+    IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system."
+    IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SEARCH_TEXT "Suche…"
+    IDS_APPS_COUNT "Anzahl der Anwendungen: %d"
+    IDS_APPS_SELECT_COUNT "; ausgewählt: %d"
    IDS_INSTALLED "Installiert"
    IDS_AVAILABLEFORINST "Zur Installation verfügbar"
    IDS_UPDATES "Aktualisierungen"
--- a/base/applications/rapps/lang/en-US.rc
+++ b/base/applications/rapps/lang/en-US.rc
@@ -46,22 +46,6 @@ BEGIN
    END
 END

-IDR_APPLICATIONMENU MENU
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Install\tCtrl+Enter", ID_INSTALL
-        MENUITEM "&Uninstall\tCtrl+Del", ID_UNINSTALL
-        MENUITEM "&Modify", ID_MODIFY
-        MENUITEM SEPARATOR
-        MENUITEM "R&emove from Registry", ID_REGREMOVE
-        MENUITEM SEPARATOR
-        MENUITEM "&Refresh\tF5", ID_REFRESH
-        MENUITEM SEPARATOR
-        MENUITEM "Update Data&base\tCtrl+F5", ID_RESETDB
-    END
-END
-
 IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Settings"
@@ -191,11 +175,20 @@ STRINGTABLE
 BEGIN
    IDS_APPTITLE "ReactOS Applications Manager"
    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
-    IDS_SEARCH_TEXT "Search…"
-    IDS_APPS_COUNT "Applications count: %d; Selected: %d"
-    IDS_WELCOME_TITLE "Welcome to ReactOS Applications Manager!\n\n"
+    IDS_WELCOME_TITLE "Welcome to ReactOS Applications Manager!"
    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_APPWIZ_TITLE "Add/Remove Programs"
+    IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system."
+    IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SEARCH_TEXT "Search…"
+    IDS_APPS_COUNT "Applications count: %d"
+    IDS_APPS_SELECT_COUNT "; Selected: %d"
    IDS_INSTALLED "Installed"
    IDS_AVAILABLEFORINST "Available for installation"
    IDS_UPDATES "Updates"
--- a/base/applications/rapps/lang/es-ES.rc
+++ b/base/applications/rapps/lang/es-ES.rc
@@ -45,22 +45,6 @@ BEGIN
    END
 END

-IDR_APPLICATIONMENU MENU
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Instalar\tCtrl+Intro", ID_INSTALL
-        MENUITEM "&Desinstalar\tCtrl+Supr", ID_UNINSTALL
-        MENUITEM "&Modificar", ID_MODIFY
-        MENUITEM SEPARATOR
-        MENUITEM "&Eliminar del Registro", ID_REGREMOVE
-        MENUITEM SEPARATOR
-        MENUITEM "&Recargar\tF5", ID_REFRESH
-        MENUITEM SEPARATOR
-        MENUITEM "&Actualizar listado desde Internet\tCtrl+F5", ID_RESETDB
-    END
-END
-
 IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Ajustes"
@@ -190,11 +174,20 @@ STRINGTABLE
 BEGIN
    IDS_APPTITLE "Administrador de aplicaciones de ReactOS"
    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
-    IDS_SEARCH_TEXT "Buscar…"
-    IDS_APPS_COUNT "Nº de aplicaciones: %d; Selecionadas: %d"
-    IDS_WELCOME_TITLE "Bienvenido al Administrador de aplicaciones de ReactOS.\n\n"
+    IDS_WELCOME_TITLE "Bienvenido al Administrador de aplicaciones de ReactOS."
    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_APPWIZ_TITLE "Add/Remove Programs"
+    IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system."
+    IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SEARCH_TEXT "Buscar…"
+    IDS_APPS_COUNT "Nº de aplicaciones: %d"
+    IDS_APPS_SELECT_COUNT "; Selecionadas: %d"
    IDS_INSTALLED "Instaladas"
    IDS_AVAILABLEFORINST "Disponible para su instalación"
    IDS_UPDATES "Actualizaciones"
--- a/base/applications/rapps/lang/et-EE.rc
+++ b/base/applications/rapps/lang/et-EE.rc
@@ -43,22 +43,6 @@ BEGIN
    END
 END

-IDR_APPLICATIONMENU MENU
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Installi\tCtrl+Enter", ID_INSTALL
-        MENUITEM "&Desinstalli\tCtrl+Del", ID_UNINSTALL
-        MENUITEM "&Muuda", ID_MODIFY
-        MENUITEM SEPARATOR
-        MENUITEM "&Eemalda registrist", ID_REGREMOVE
-        MENUITEM SEPARATOR
-        MENUITEM "&Värskenda\tF5", ID_REFRESH
-        MENUITEM SEPARATOR
-        MENUITEM "Uuenda andme&baasi\tCtrl+F5", ID_RESETDB
-    END
-END
-
 IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Sätted"
@@ -188,11 +172,20 @@ STRINGTABLE
 BEGIN
    IDS_APPTITLE "ReactOS'i Rakenduste Haldur"
    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
-    IDS_SEARCH_TEXT "Otsi…"
-    IDS_APPS_COUNT "Rakenduste arv: %d; Valitud: %d"
-    IDS_WELCOME_TITLE "Tere tulemast ReactOS'i Rakenduste Haldurisse!\n\n"
+    IDS_WELCOME_TITLE "Tere tulemast ReactOS'i Rakenduste Haldurisse!"
    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_APPWIZ_TITLE "Add/Remove Programs"
+    IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system."
+    IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SEARCH_TEXT "Otsi…"
+    IDS_APPS_COUNT "Rakenduste arv: %d"
+    IDS_APPS_SELECT_COUNT "; Valitud: %d"
    IDS_INSTALLED "Installitud"
    IDS_AVAILABLEFORINST "Installimiseks saadaval"
    IDS_UPDATES "Uuendused"
--- a/base/applications/rapps/lang/fr-FR.rc
+++ b/base/applications/rapps/lang/fr-FR.rc
@@ -46,22 +46,6 @@ BEGIN
    END
 END

-IDR_APPLICATIONMENU MENU
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Installer\tCtrl+Entrée", ID_INSTALL
-        MENUITEM "&Désinstaller\tCtrl+Suppr", ID_UNINSTALL
-        MENUITEM "&Modifier", ID_MODIFY
-        MENUITEM SEPARATOR
-        MENUITEM "&Supprimer du registre", ID_REGREMOVE
-        MENUITEM SEPARATOR
-        MENUITEM "&Rafraîchir\tF5", ID_REFRESH
-        MENUITEM SEPARATOR
-        MENUITEM "Mettre à jour la &base\tCtrl+F5", ID_RESETDB
-    END
-END
-
 IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Configuration"
@@ -191,11 +175,20 @@ STRINGTABLE
 BEGIN
    IDS_APPTITLE "Gestionnaire d'applications ReactOS"
    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
-    IDS_SEARCH_TEXT "Chercher…"
-    IDS_APPS_COUNT "Nombre d'applications : %d ; Sélectionnées : %d"
-    IDS_WELCOME_TITLE "Bienvenue dans ReactOS Applications Manager !\n\n"
+    IDS_WELCOME_TITLE "Bienvenue dans ReactOS Applications Manager !"
    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_APPWIZ_TITLE "Ajout/Suppression de programmes" // "Ajouter/Supprimer des Programmes"
+    IDS_APPWIZ_TEXT1 "Choisissez ""Applications"" ou ""Mises à jour"" pour voir la liste des programmes ou des mises à jour installés sur votre système."
+    IDS_APPWIZ_TEXT2 "Pour supprimer un programme, ou modifier ses composants installés, sélectionnez-le dans la liste et cliquez sur ""Désinstaller"" ou ""Modifier""."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SEARCH_TEXT "Chercher…"
+    IDS_APPS_COUNT "Nombre d'applications : %d"
+    IDS_APPS_SELECT_COUNT " ; Sélectionnées : %d"
    IDS_INSTALLED "Installé"
    IDS_AVAILABLEFORINST "Disponible pour installation"
    IDS_UPDATES "Mises à jour"
@@ -274,5 +267,5 @@ END

 STRINGTABLE
 BEGIN
-    IDS_INSTGEN_CONFIRMUNINST "Are you sure you want to uninstall %s?"
+    IDS_INSTGEN_CONFIRMUNINST "Êtes-vous sûr de vouloir désinstaller %s ?"
 END
--- a/base/applications/rapps/lang/he-IL.rc
+++ b/base/applications/rapps/lang/he-IL.rc
@@ -45,22 +45,6 @@ BEGIN
    END
 END

-IDR_APPLICATIONMENU MENU
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "התקנה\tCtrl+Enter", ID_INSTALL
-        MENUITEM "הסרה\tCtrl+Del", ID_UNINSTALL
-        MENUITEM "שינוי", ID_MODIFY
-        MENUITEM SEPARATOR
-        MENUITEM "הסרה מהרשום", ID_REGREMOVE
-        MENUITEM SEPARATOR
-        MENUITEM "רענן\tF5", ID_REFRESH
-        MENUITEM SEPARATOR
-        MENUITEM "עדכון מסד נתונים\tCtrl+F5", ID_RESETDB
-    END
-END
-
 IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_LAYOUTRTL
@@ -193,11 +177,20 @@ STRINGTABLE
 BEGIN
    IDS_APPTITLE "מנהל היישומים של ReactOS"
    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
-    IDS_SEARCH_TEXT "חיפוש…"
-    IDS_APPS_COUNT "ספירת יישומים: %d; Selected: %d"
-    IDS_WELCOME_TITLE "ברוכים הבאים למנהל היישומים של ReactOS!\n\n"
+    IDS_WELCOME_TITLE "ברוכים הבאים למנהל היישומים של ReactOS!"
    IDS_WELCOME_TEXT "בחר קטגוריה בצד שמאל, לאחר מכן בחר יישום להתקנה או להסרה.\nהאתר של ReactOS: "
    IDS_WELCOME_URL "https://reactos.org"
+
+    IDS_APPWIZ_TITLE "Add/Remove Programs"
+    IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system."
+    IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SEARCH_TEXT "חיפוש…"
+    IDS_APPS_COUNT "ספירת יישומים: %d"
+    IDS_APPS_SELECT_COUNT "; Selected: %d"
    IDS_INSTALLED "מותקן"
    IDS_AVAILABLEFORINST "זמין להתקנה"
    IDS_UPDATES "עדכונים"
--- a/base/applications/rapps/lang/hu-HU.rc
+++ b/base/applications/rapps/lang/hu-HU.rc
@@ -43,22 +43,6 @@ BEGIN
    END
 END

-IDR_APPLICATIONMENU MENU
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "Telep&ítés\tCtrl+Enter", ID_INSTALL
-        MENUITEM "Eltá&volítás\tCtrl+Del", ID_UNINSTALL
-        MENUITEM "&Módosítás", ID_MODIFY
-        MENUITEM SEPARATOR
-        MENUITEM "&Eltávolítás a registryből", ID_REGREMOVE
-        MENUITEM SEPARATOR
-        MENUITEM "F&rissítés\tF5", ID_REFRESH
-        MENUITEM SEPARATOR
-        MENUITEM "Adat&bázis frissítése\tCtrl+F5", ID_RESETDB
-    END
-END
-
 IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Beállítások"
@@ -188,11 +172,20 @@ STRINGTABLE
 BEGIN
    IDS_APPTITLE "ReactOS Alkalmazáskezelő"
    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
-    IDS_SEARCH_TEXT "Keresés…"
-    IDS_APPS_COUNT "Alkalmazások száma: %d; Kijelölve: %d"
-    IDS_WELCOME_TITLE "Üdvözöljük a ReactOS Alkalmazáskezelőben!\n\n"
+    IDS_WELCOME_TITLE "Üdvözöljük a ReactOS Alkalmazáskezelőben!"
    IDS_WELCOME_TEXT "Bal oldalon válasszon kategóriát, majd válasszon egy telepíteni vagy eltávolítani kívánt alkalmazást.\nReactOS weboldal: "
    IDS_WELCOME_URL "https://reactos.org"
+
+    IDS_APPWIZ_TITLE "Add/Remove Programs"
+    IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system."
+    IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SEARCH_TEXT "Keresés…"
+    IDS_APPS_COUNT "Alkalmazások száma: %d"
+    IDS_APPS_SELECT_COUNT "; Kijelölve: %d"
    IDS_INSTALLED "Telepített"
    IDS_AVAILABLEFORINST "Telepíthető alkalmazások"
    IDS_UPDATES "Frissítések"
--- a/base/applications/rapps/lang/id-ID.rc
+++ b/base/applications/rapps/lang/id-ID.rc
@@ -43,22 +43,6 @@ BEGIN
    END
 END

-IDR_APPLICATIONMENU MENU
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Pasang\tCtrl+Enter", ID_INSTALL
-        MENUITEM "&Bongkar\tCtrl+Del", ID_UNINSTALL
-        MENUITEM "&Ubah", ID_MODIFY
-        MENUITEM SEPARATOR
-        MENUITEM "Hapus dari R&egistri", ID_REGREMOVE
-        MENUITEM SEPARATOR
-        MENUITEM "Sega&rkan\tF5", ID_REFRESH
-        MENUITEM SEPARATOR
-        MENUITEM "Perbarui Data&base\tCtrl+F5", ID_RESETDB
-    END
-END
-
 IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Pengaturan"
@@ -188,11 +172,20 @@ STRINGTABLE
 BEGIN
    IDS_APPTITLE "Manajer Aplikasi ReactOS"
    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
-    IDS_SEARCH_TEXT "Cari…"
-    IDS_APPS_COUNT "Jumlah aplikasi: %d; Terpilih: %d"
-    IDS_WELCOME_TITLE "Selamat datang di Manajer Aplikasi ReactOS!\n\n"
+    IDS_WELCOME_TITLE "Selamat datang di Manajer Aplikasi ReactOS!"
    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_APPWIZ_TITLE "Add/Remove Programs"
+    IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system."
+    IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SEARCH_TEXT "Cari…"
+    IDS_APPS_COUNT "Jumlah aplikasi: %d"
+    IDS_APPS_SELECT_COUNT "; Terpilih: %d"
    IDS_INSTALLED "Terpasang"
    IDS_AVAILABLEFORINST "Tersedia untuk pemasangan"
    IDS_UPDATES "Pembaruan"
--- a/base/applications/rapps/lang/it-IT.rc
+++ b/base/applications/rapps/lang/it-IT.rc
@@ -27,7 +27,7 @@ BEGIN
        MENUITEM SEPARATOR
        MENUITEM "&Aggiorna\tF5", ID_REFRESH
        MENUITEM SEPARATOR
-        MENUITEM "Aggiorna Data&base", ID_RESETDB
+        MENUITEM "Aggiorna Data&base\tCtrl+F5", ID_RESETDB
    END
    POPUP "?"
    BEGIN
@@ -45,22 +45,6 @@ BEGIN
    END
 END

-IDR_APPLICATIONMENU MENU
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Installa\tCtrl+Enter", ID_INSTALL
-        MENUITEM "Rim&uovi\tCtrl+Del", ID_UNINSTALL
-        MENUITEM "&Modifica", ID_MODIFY
-        MENUITEM SEPARATOR
-        MENUITEM "Canc&ella dal registro", ID_REGREMOVE
-        MENUITEM SEPARATOR
-        MENUITEM "&Aggiorna\tF5", ID_REFRESH
-        MENUITEM SEPARATOR
-        MENUITEM "Aggiorna Data&base\tCtrl+F5", ID_RESETDB
-    END
-END
-
 IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Impostazioni"
@@ -190,11 +174,20 @@ STRINGTABLE
 BEGIN
    IDS_APPTITLE "ReactOS Gestione applicazioni"
    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
-    IDS_SEARCH_TEXT "Cerca…"
-    IDS_APPS_COUNT "Numero applicazioni: %d; Selezionate: %d"
-    IDS_WELCOME_TITLE "Benvenuto!\n\n"
+    IDS_WELCOME_TITLE "Benvenuto!"
    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_APPWIZ_TITLE "Add/Remove Programs"
+    IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system."
+    IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SEARCH_TEXT "Cerca…"
+    IDS_APPS_COUNT "Numero applicazioni: %d"
+    IDS_APPS_SELECT_COUNT "; Selezionate: %d"
    IDS_INSTALLED "Installato"
    IDS_AVAILABLEFORINST "Disponibile per l'installazione"
    IDS_UPDATES "Aggiornamenti"
--- a/base/applications/rapps/lang/ja-JP.rc
+++ b/base/applications/rapps/lang/ja-JP.rc
@@ -23,9 +23,9 @@ BEGIN
        MENUITEM "アンインストール(&U)\tCtrl+Del", ID_UNINSTALL
        MENUITEM "変更(&M)", ID_MODIFY
        MENUITEM SEPARATOR
-        MENUITEM "レジストリから削除(&E)\tF5", ID_REGREMOVE
+        MENUITEM "レジストリから削除(&E)", ID_REGREMOVE
        MENUITEM SEPARATOR
-        MENUITEM "更新(&R)", ID_REFRESH
+        MENUITEM "更新(&R)\tF5", ID_REFRESH
        MENUITEM SEPARATOR
        MENUITEM "データベースの更新(&B)\tCtrl+F5", ID_RESETDB
    END
@@ -45,22 +45,6 @@ BEGIN
    END
 END

-IDR_APPLICATIONMENU MENU
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "インストール(&I)\tCtrl+Enter", ID_INSTALL
-        MENUITEM "アンインストール(&U)\tCtrl+Del", ID_UNINSTALL
-        MENUITEM "変更(&M)", ID_MODIFY
-        MENUITEM SEPARATOR
-        MENUITEM "レジストリから削除(&E)\tF5", ID_REGREMOVE
-        MENUITEM SEPARATOR
-        MENUITEM "更新(&R)", ID_REFRESH
-        MENUITEM SEPARATOR
-        MENUITEM "データベースの更新(&B)\tCtrl+F5", ID_RESETDB
-    END
-END
-
 IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "設定"
@@ -190,11 +174,20 @@ STRINGTABLE
 BEGIN
    IDS_APPTITLE "ReactOS アプリ マネージャ"
    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
-    IDS_SEARCH_TEXT "検索..."
-    IDS_APPS_COUNT "アプリ数: %d; Selected: %d"
-    IDS_WELCOME_TITLE "ReactOS アプリ マネージャへようこそ!\n\n"
+    IDS_WELCOME_TITLE "ReactOS アプリ マネージャへようこそ!"
    IDS_WELCOME_TEXT "左側からカテゴリを選択し、インストールまたはアンインストールするアプリを選んでください。\nReactOS ウェブ サイト: "
    IDS_WELCOME_URL "https://reactos.org"
+
+    IDS_APPWIZ_TITLE "Add/Remove Programs"
+    IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system."
+    IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SEARCH_TEXT "検索..."
+    IDS_APPS_COUNT "アプリ数: %d"
+    IDS_APPS_SELECT_COUNT "; Selected: %d"
    IDS_INSTALLED "インストール済み"
    IDS_AVAILABLEFORINST "インストール可能"
    IDS_UPDATES "更新"
--- a/base/applications/rapps/lang/no-NO.rc
+++ b/base/applications/rapps/lang/no-NO.rc
@@ -43,22 +43,6 @@ BEGIN
    END
 END

-IDR_APPLICATIONMENU MENU
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Installere\tCtrl+Enter", ID_INSTALL
-        MENUITEM "&Avinstallere\tCtrl+Del", ID_UNINSTALL
-        MENUITEM "E&ndre", ID_MODIFY
-        MENUITEM SEPARATOR
-        MENUITEM "R&emove from Registry", ID_REGREMOVE
-        MENUITEM SEPARATOR
-        MENUITEM "Oppdate&r\tF5", ID_REFRESH
-        MENUITEM SEPARATOR
-        MENUITEM "Update Data&base\tCtrl+F5", ID_RESETDB
-    END
-END
-
 IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Settings"
@@ -188,11 +172,20 @@ STRINGTABLE
 BEGIN
    IDS_APPTITLE "ReactOS programbehandler"
    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
-    IDS_SEARCH_TEXT "Søk…"
-    IDS_APPS_COUNT "Program oppsummering: %d; Selected: %d"
-    IDS_WELCOME_TITLE "Velkommen til ReactOS programbehandler!\n\n"
+    IDS_WELCOME_TITLE "Velkommen til ReactOS programbehandler!"
    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_APPWIZ_TITLE "Add/Remove Programs"
+    IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system."
+    IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SEARCH_TEXT "Søk…"
+    IDS_APPS_COUNT "Program oppsummering: %d"
+    IDS_APPS_SELECT_COUNT "; Selected: %d"
    IDS_INSTALLED "Installert"
    IDS_AVAILABLEFORINST "Tilgjengelig for installasjon"
    IDS_UPDATES "Oppdateringer"
--- a/base/applications/rapps/lang/pl-PL.rc
+++ b/base/applications/rapps/lang/pl-PL.rc
@@ -45,22 +45,6 @@ BEGIN
    END
 END

-IDR_APPLICATIONMENU MENU
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Instaluj\tCtrl+Enter", ID_INSTALL
-        MENUITEM "Odinstal&uj\tCtrl+Del", ID_UNINSTALL
-        MENUITEM "&Modyfikuj", ID_MODIFY
-        MENUITEM SEPARATOR
-        MENUITEM "Usuń z r&ejestru", ID_REGREMOVE
-        MENUITEM SEPARATOR
-        MENUITEM "&Odśwież\tF5", ID_REFRESH
-        MENUITEM SEPARATOR
-        MENUITEM "Aktualizuj &bazę programów\tCtrl+F5", ID_RESETDB
-    END
-END
-
 IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Ustawienia"
@@ -190,11 +174,20 @@ STRINGTABLE
 BEGIN
    IDS_APPTITLE "Menedżer aplikacji ReactOS"
    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
-    IDS_SEARCH_TEXT "Szukaj…"
-    IDS_APPS_COUNT "Liczba aplikacji: %d; Wybranych: %d"
-    IDS_WELCOME_TITLE "Witamy w Menedżerze aplikacji ReactOS!\n\n"
+    IDS_WELCOME_TITLE "Witamy w Menedżerze aplikacji ReactOS!"
    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_APPWIZ_TITLE "Add/Remove Programs"
+    IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system."
+    IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SEARCH_TEXT "Szukaj…"
+    IDS_APPS_COUNT "Liczba aplikacji: %d"
+    IDS_APPS_SELECT_COUNT "; Wybranych: %d"
    IDS_INSTALLED "Zainstalowane"
    IDS_AVAILABLEFORINST "Dostępne"
    IDS_UPDATES "Uaktualnienia"
--- a/base/applications/rapps/lang/pt-BR.rc
+++ b/base/applications/rapps/lang/pt-BR.rc
@@ -17,7 +17,7 @@ BEGIN
    END
    POPUP "&Programas"
    BEGIN
-        MENUITEM "I&nstalar\tCtrl+Enter", ID_INSTALL
+        MENUITEM "&Instalar\tCtrl+Enter", ID_INSTALL
        MENUITEM "&Desinstalar\tCtrl+Del", ID_UNINSTALL
        MENUITEM "&Modificar", ID_MODIFY
        MENUITEM SEPARATOR
@@ -43,22 +43,6 @@ BEGIN
    END
 END

-IDR_APPLICATIONMENU MENU
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Instalar\tCtrl+Enter", ID_INSTALL
-        MENUITEM "&Desinstalar\tCtrl+Del", ID_UNINSTALL
-        MENUITEM "&Modificar", ID_MODIFY
-        MENUITEM SEPARATOR
-        MENUITEM "R&emover do Registro", ID_REGREMOVE
-        MENUITEM SEPARATOR
-        MENUITEM "Atualiza&r\tF5", ID_REFRESH
-        MENUITEM SEPARATOR
-        MENUITEM "Update Data&base\tCtrl+F5", ID_RESETDB
-    END
-END
-
 IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Configurações"
@@ -188,11 +172,20 @@ STRINGTABLE
 BEGIN
    IDS_APPTITLE "Central de Aplicativos ReactOS"
    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
-    IDS_SEARCH_TEXT "Procurar…"
-    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_TITLE "Bem-vindo(a) a Central de Aplicativos ReactOS!"
    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_APPWIZ_TITLE "Add/Remove Programs"
+    IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system."
+    IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SEARCH_TEXT "Procurar…"
+    IDS_APPS_COUNT "Número de aplicativos: %d"
+    IDS_APPS_SELECT_COUNT "; Selected: %d"
    IDS_INSTALLED "Instalado"
    IDS_AVAILABLEFORINST "Disponível para instalação"
    IDS_UPDATES "Atualizações"
--- a/base/applications/rapps/lang/pt-PT.rc
+++ b/base/applications/rapps/lang/pt-PT.rc
@@ -43,22 +43,6 @@ BEGIN
    END
 END

-IDR_APPLICATIONMENU MENU
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Instalar\tCtrl+Enter", ID_INSTALL
-        MENUITEM "&Desinstalar\tCtrl+Del", ID_UNINSTALL
-        MENUITEM "&Modificar", ID_MODIFY
-        MENUITEM SEPARATOR
-        MENUITEM "R&emover do Registo", ID_REGREMOVE
-        MENUITEM SEPARATOR
-        MENUITEM "Actualiza&r\tF5", ID_REFRESH
-        MENUITEM SEPARATOR
-        MENUITEM "Actualizar &Base de dados\tCtrl+F5", ID_RESETDB
-    END
-END
-
 IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Configurações"
@@ -188,11 +172,20 @@ STRINGTABLE
 BEGIN
    IDS_APPTITLE "Central de aplicações ReactOS"
    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
-    IDS_SEARCH_TEXT "Procurar…"
-    IDS_APPS_COUNT "Número de aplicações: %d; Seleccionadas: %d"
-    IDS_WELCOME_TITLE "Bem-vindo(a) à Central de aplicações ReactOS!\n\n"
+    IDS_WELCOME_TITLE "Bem-vindo(a) à Central de aplicações ReactOS!"
    IDS_WELCOME_TEXT "Escolha uma categoria à esquerda, de seguida escolha uma aplicação para instalar ou desinstalar.\nWeb Site ReactOS: "
    IDS_WELCOME_URL "https://reactos.org"
+
+    IDS_APPWIZ_TITLE "Add/Remove Programs"
+    IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system."
+    IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SEARCH_TEXT "Procurar…"
+    IDS_APPS_COUNT "Número de aplicações: %d"
+    IDS_APPS_SELECT_COUNT "; Seleccionadas: %d"
    IDS_INSTALLED "Instalado"
    IDS_AVAILABLEFORINST "Disponível para instalação"
    IDS_UPDATES "Actualizações"
--- a/base/applications/rapps/lang/ro-RO.rc
+++ b/base/applications/rapps/lang/ro-RO.rc
@@ -19,20 +19,20 @@ BEGIN
    END
    POPUP "&Programe"
    BEGIN
-        MENUITEM "&Instalează\tCtrl+Enter", ID_INSTALL
-        MENUITEM "&Dezinstalează\tCtrl+Del", ID_UNINSTALL
-        MENUITEM "&Modifică", ID_MODIFY
+        MENUITEM "&Instalare\tCtrl+Enter", ID_INSTALL
+        MENUITEM "&Dezinstalare\tCtrl+Del", ID_UNINSTALL
+        MENUITEM "&Modificare", ID_MODIFY
        MENUITEM SEPARATOR
-        MENUITEM "&Elimină din registru", ID_REGREMOVE
+        MENUITEM "&Eliminare din registru", ID_REGREMOVE
        MENUITEM SEPARATOR
-        MENUITEM "Împ&rospătează\tF5", ID_REFRESH
+        MENUITEM "Împ&rospătare\tF5", ID_REFRESH
        MENUITEM SEPARATOR
-        MENUITEM "Actualizează &baza de date\tCtrl+F5", ID_RESETDB
+        MENUITEM "&Actualizare baza de date\tCtrl+F5", ID_RESETDB
    END
    POPUP "Aj&utor"
    BEGIN
-        MENUITEM "&Manual…\tF1", ID_HELP, GRAYED
-        MENUITEM "&Despre…", ID_ABOUT
+        MENUITEM "&Ajutor\tF1", ID_HELP, GRAYED
+        MENUITEM "&Despre", ID_ABOUT
    END
 END

@@ -40,67 +40,51 @@ IDR_LINKMENU MENU
 BEGIN
    POPUP ""
    BEGIN
-        MENUITEM "&Deschide în navigator", ID_OPEN_LINK
-        MENUITEM "&Copiază în memorie", ID_COPY_LINK
-    END
-END
-
-IDR_APPLICATIONMENU MENU
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Instalează\tCtrl+Enter", ID_INSTALL
-        MENUITEM "&Dezinstalează\tCtrl+Del", ID_UNINSTALL
-        MENUITEM "&Modifică", ID_MODIFY
-        MENUITEM SEPARATOR
-        MENUITEM "&Elimină din registru", ID_REGREMOVE
-        MENUITEM SEPARATOR
-        MENUITEM "Împ&rospătează\tF5", ID_REFRESH
-        MENUITEM SEPARATOR
-        MENUITEM "Actualizează &baza de date\tCtrl+F5", ID_RESETDB
+        MENUITEM "&Deschidere a legăturii în navigator", ID_OPEN_LINK
+        MENUITEM "&Copiere a legăturii în clipboard", ID_COPY_LINK
    END
 END

 IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Preferințe"
+CAPTION "Setări"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Generale", -1, 4, 2, 240, 61
-    AUTOCHECKBOX "&Păstrează poziția ferestrei", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12
-    AUTOCHECKBOX "Actualizea&ză la pornire lista programelor disponibile", IDC_UPDATE_AVLIST, 15, 29, 222, 12
-    AUTOCHECKBOX "Menține j&urnal de instalare/dezinstalare a programelor", IDC_LOG_ENABLED, 15, 46, 219, 12
+    GROUPBOX "General", -1, 4, 2, 240, 61
+    AUTOCHECKBOX "&Salvare a poziției ferestrei", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12
+    AUTOCHECKBOX "&Actualizare la pornire a listei programelor disponibile", IDC_UPDATE_AVLIST, 15, 29, 222, 12
+    AUTOCHECKBOX "Menținere a j&urnalului de instalare/dezinstalare a programelor", IDC_LOG_ENABLED, 15, 46, 219, 12
    GROUPBOX "Descărcări", -1, 4, 65, 240, 51
    LTEXT "Folderul pentru descărcări:", -1, 16, 75, 100, 9
    EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL
-    PUSHBUTTON "Spe&cificare…", IDC_CHOOSE, 187, 85, 50, 14
-    AUTOCHECKBOX "Șt&erge aplicația de instalare după instalarea programului", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
+    PUSHBUTTON "&Răsfoire", IDC_CHOOSE, 187, 85, 50, 14
+    AUTOCHECKBOX "Se șterge de instalare &după instalarea programului", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
    GROUPBOX "Sursa programului", -1, 4, 118, 240, 46
-    AUTORADIOBUTTON "Folosește valorile implicite", IDC_SOURCE_DEFAULT, 15, 132, 121, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "Se folosesc valorile implicite", IDC_SOURCE_DEFAULT, 15, 132, 121, 10, WS_GROUP | WS_TABSTOP
    AUTORADIOBUTTON "Sursa specificată", IDC_USE_SOURCE, 15, 147, 74, 10
    EDITTEXT IDC_SOURCE_URL, 97, 147, 140, 12, ES_AUTOHSCROLL | WS_DISABLED
-    GROUPBOX "Mandatar", -1, 4, 166, 240, 76
-    AUTORADIOBUTTON "Configur&ația mandatar din sistem", IDC_PROXY_DEFAULT, 15, 180, 210, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "Di&rect (fără mandatar)", IDC_NO_PROXY, 15, 195, 210, 10
-    AUTORADIOBUTTON "Man&datar", IDC_USE_PROXY, 15, 210, 74, 10
+    GROUPBOX "Proxy", -1, 4, 166, 240, 76
+    AUTORADIOBUTTON "Setări proxy de sistem", IDC_PROXY_DEFAULT, 15, 180, 210, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "Direct (fără proxy)", IDC_NO_PROXY, 15, 195, 210, 10
+    AUTORADIOBUTTON "Proxy", IDC_USE_PROXY, 15, 210, 74, 10
    EDITTEXT IDC_PROXY_SERVER, 90, 210, 147, 12, ES_AUTOHSCROLL | WS_DISABLED
    LTEXT "excepție pentru", -1, 26, 226, 64, 10
    EDITTEXT IDC_NO_PROXY_FOR, 90, 225, 147, 12, ES_AUTOHSCROLL | WS_DISABLED
-    PUSHBUTTON "I&mplicite", IDC_DEFAULT_SETTINGS, 8, 245, 60, 14, WS_GROUP | WS_TABSTOP
-    DEFPUSHBUTTON "Confirmă", IDOK, 116, 245, 60, 14
-    PUSHBUTTON "Anulează", IDCANCEL, 181, 245, 60, 14
+    PUSHBUTTON "Implicit", IDC_DEFAULT_SETTINGS, 8, 245, 60, 14, WS_GROUP | WS_TABSTOP
+    DEFPUSHBUTTON "OK", IDOK, 116, 245, 60, 14
+    PUSHBUTTON "Revocare", IDCANCEL, 181, 245, 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 "Instalare aplicație"
+CAPTION "Instalare a aplicației"
 FONT 8, "MS Shell Dlg"
 BEGIN
    LTEXT "…", IDC_INSTALL_TEXT, 4, 5, 209, 35
-    AUTORADIOBUTTON "Instalea&ză de pe un disc (CD sau DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP
-    AUTORADIOBUTTON "&Descarcă și instalează", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP
-    DEFPUSHBUTTON "Confirmă", IDOK, 86, 78, 60, 14
-    PUSHBUTTON "Anulează", IDCANCEL, 150, 78, 60, 14
+    AUTORADIOBUTTON "&Instalare de pe un disc (CD sau DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP
+    AUTORADIOBUTTON "&Descărcare și instalare", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP
+    DEFPUSHBUTTON "OK", IDOK, 86, 78, 60, 14
+    PUSHBUTTON "Revocare", IDCANCEL, 150, 78, 60, 14
 END

 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220
@@ -110,18 +94,18 @@ FONT 8, "MS Shell Dlg"
 BEGIN
    CONTROL "", 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
-    PUSHBUTTON "Anulează", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "Revocare", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP
 END

 STRINGTABLE
 BEGIN
-    IDS_TOOLTIP_INSTALL "Instalează"
-    IDS_TOOLTIP_UNINSTALL "Dezinstalează"
-    IDS_TOOLTIP_MODIFY "Modifică"
-    IDS_TOOLTIP_SELECT_ALL "Selectează/Deselectează Toate"
+    IDS_TOOLTIP_INSTALL "Instalare"
+    IDS_TOOLTIP_UNINSTALL "Dezinstalare"
+    IDS_TOOLTIP_MODIFY "Modificare"
+    IDS_TOOLTIP_SELECT_ALL "Selectare/Deselectare Toate"
    IDS_TOOLTIP_SETTINGS "Preferințe"
-    IDS_TOOLTIP_REFRESH "Împrospătează"
-    IDS_TOOLTIP_UPDATE_DB "Actualizează baza de date"
+    IDS_TOOLTIP_REFRESH "Împrospătare"
+    IDS_TOOLTIP_UPDATE_DB "Actualizare baza de date"
    IDS_TOOLTIP_EXIT "Ieșire"
 END

@@ -188,13 +172,22 @@ END

 STRINGTABLE
 BEGIN
-    IDS_APPTITLE "Gestionar de programe"
+    IDS_APPTITLE "Managerul de aplicații ReactOS"
    IDS_APP_AUTHORS "Marcă înregistrată 2009 Dmitry Chapyshev"
-    IDS_SEARCH_TEXT "Căutare…"
-    IDS_APPS_COUNT "Numărul de programe: %d; Selectate: %d"
-    IDS_WELCOME_TITLE "Bun venit la gestionarul de programe ReactOS!\n\n"
+    IDS_WELCOME_TITLE "Bun venit la Managerul de aplicații ReactOS!"
    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_APPWIZ_TITLE "Add/Remove Programs"
+    IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system."
+    IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SEARCH_TEXT "Căutare…"
+    IDS_APPS_COUNT "Numărul de programe: %d"
+    IDS_APPS_SELECT_COUNT "; Selectate: %d"
    IDS_INSTALLED "Instalate"
    IDS_AVAILABLEFORINST "Disponibile pentru instalare"
    IDS_UPDATES "Actualizări"
@@ -208,12 +201,12 @@ BEGIN
    IDS_UNABLE_TO_DOWNLOAD2 "Pachetul nu se poate descărca! Verificați conexiunea de Internet!"
    IDS_UNABLE_TO_REMOVE "Datele de registru pentru acest program nu s-au putut elimina!"
    IDS_UNABLE_TO_INSTALL "Programul de instalare nu se poate executa!"
-    IDS_UNABLE_TO_QUERY_CERT "Regăsirea informații despre certificat a eșuat.\n\nVreți să continuați oricum?"
+    IDS_UNABLE_TO_QUERY_CERT "Imposibil de obținut informații despre certificat.\n\nContinuați oricum?"
    IDS_INTEG_CHECK_TITLE "Integritatea pachetului în verificare…"
-    IDS_INTEG_CHECK_FAIL "Pachetul nu a trecut de verificarea de integritate. Utilizarea programului nu este recomandată."
+    IDS_INTEG_CHECK_FAIL "Pachetul nu a trecut de verificarea de integritate. Nu se recomandă utilizarea programului."
    IDS_INTERRUPTED_DOWNLOAD "Descărcarea a fost întreruptă. Verificați conexiunea la Internet."
    IDS_UNABLE_TO_WRITE "Nu se poate scrie pe disc. Discul poate fi la capacitate maximă."
-    IDS_INSTALL_SELECTED "Instalează selecționate"
+    IDS_INSTALL_SELECTED "Instalare aplicații selectate"
    IDS_SELECTEDFORINST "Selectate pentru instalare"
    IDS_MISMATCH_CERT_INFO "Certificatul în uz este necunoscut:\nSubiect: %s\nEmitent: %s\nVreți să continuați oricum?"
    IDS_UNABLE_PATH "Formatul căii specificate nu este corect."
@@ -273,5 +266,5 @@ END

 STRINGTABLE
 BEGIN
-    IDS_INSTGEN_CONFIRMUNINST "Are you sure you want to uninstall %s?"
+    IDS_INSTGEN_CONFIRMUNINST "Sigur doriți să dezinstalați %s?"
 END
--- a/base/applications/rapps/lang/ru-RU.rc
+++ b/base/applications/rapps/lang/ru-RU.rc
@@ -48,22 +48,6 @@ BEGIN
    END
 END

-IDR_APPLICATIONMENU MENU
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "У&становить\tCtrl+Enter", ID_INSTALL
-        MENUITEM "&Удалить\tCtrl+Del", ID_UNINSTALL
-        MENUITEM "&Изменить", ID_MODIFY
-        MENUITEM SEPARATOR
-        MENUITEM "У&далить из реестра", ID_REGREMOVE
-        MENUITEM SEPARATOR
-        MENUITEM "&Обновить\tF5", ID_REFRESH
-        MENUITEM SEPARATOR
-        MENUITEM "Обновить &базу данных\tCtrl+F5", ID_RESETDB
-    END
-END
-
 IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Параметры"
@@ -193,11 +177,20 @@ STRINGTABLE
 BEGIN
    IDS_APPTITLE "Менеджер приложений ReactOS"
    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
-    IDS_SEARCH_TEXT "Поиск…"
-    IDS_APPS_COUNT "Количество приложений: %d; Выбрано: %d"
-    IDS_WELCOME_TITLE "Добро пожаловать в ""Менеджер приложений ReactOS""!\n\n"
+    IDS_WELCOME_TITLE "Добро пожаловать в ""Менеджер приложений ReactOS""!"
    IDS_WELCOME_TEXT "Выберите категорию слева и приложение для установки или удаления.\nСайт ReactOS: "
    IDS_WELCOME_URL "https://reactos.org"
+
+    IDS_APPWIZ_TITLE "Add/Remove Programs"
+    IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system."
+    IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SEARCH_TEXT "Поиск…"
+    IDS_APPS_COUNT "Количество приложений: %d"
+    IDS_APPS_SELECT_COUNT "; Выбрано: %d"
    IDS_INSTALLED "Установленные"
    IDS_AVAILABLEFORINST "Доступно для установки"
    IDS_UPDATES "Обновления"
--- a/base/applications/rapps/lang/sk-SK.rc
+++ b/base/applications/rapps/lang/sk-SK.rc
@@ -43,22 +43,6 @@ BEGIN
    END
 END

-IDR_APPLICATIONMENU MENU
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Inštalovať\tCtrl+Enter", ID_INSTALL
-        MENUITEM "O&dinštalovať\tCtrl+Del", ID_UNINSTALL
-        MENUITEM "Z&meniť", ID_MODIFY
-        MENUITEM SEPARATOR
-        MENUITEM "Odstrániť z R&egistrov", ID_REGREMOVE
-        MENUITEM SEPARATOR
-        MENUITEM "&Obnoviť\tF5", ID_REFRESH
-        MENUITEM SEPARATOR
-        MENUITEM "Update Data&base\tCtrl+F5", ID_RESETDB
-    END
-END
-
 IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Nastavenia"
@@ -188,11 +172,20 @@ STRINGTABLE
 BEGIN
    IDS_APPTITLE "Manažér aplikácií systému ReactOS"
    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
-    IDS_SEARCH_TEXT "Hľadať…"
-    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"
+    IDS_WELCOME_TITLE "Víta Vás Manažér aplikácií systému ReactOS!"
    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_APPWIZ_TITLE "Add/Remove Programs"
+    IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system."
+    IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SEARCH_TEXT "Hľadať…"
+    IDS_APPS_COUNT "Počet programov: %d"
+    IDS_APPS_SELECT_COUNT "; Selected: %d"
    IDS_INSTALLED "Nainštalované"
    IDS_AVAILABLEFORINST "Dostupné pre nainštalovanie"
    IDS_UPDATES "Aktualizácie"
--- a/base/applications/rapps/lang/sq-AL.rc
+++ b/base/applications/rapps/lang/sq-AL.rc
@@ -43,22 +43,6 @@ BEGIN
    END
 END

-IDR_APPLICATIONMENU MENU
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Instalo\tCtrl+Enter", ID_INSTALL
-        MENUITEM "&Uninstall\tCtrl+Del", ID_UNINSTALL
-        MENUITEM "&Modifiko", ID_MODIFY
-        MENUITEM SEPARATOR
-        MENUITEM "Hiq nga R&egjistri", ID_REGREMOVE
-        MENUITEM SEPARATOR
-        MENUITEM "&Rifresko\tF5", ID_REFRESH
-        MENUITEM SEPARATOR
-        MENUITEM "Update Data&base\tCtrl+F5", ID_RESETDB
-    END
-END
-
 IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Konfigurime"
@@ -188,11 +172,20 @@ STRINGTABLE
 BEGIN
    IDS_APPTITLE "ReactOS Applications Manager"
    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
-    IDS_SEARCH_TEXT "Kerko…"
-    IDS_APPS_COUNT "Numrimi Aplicacioneve: %d; Selected: %d"
-    IDS_WELCOME_TITLE "Mire Se Erdhe ne ReactOS Applications Manager!\n\n"
+    IDS_WELCOME_TITLE "Mire Se Erdhe ne ReactOS Applications Manager!"
    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_APPWIZ_TITLE "Add/Remove Programs"
+    IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system."
+    IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SEARCH_TEXT "Kerko…"
+    IDS_APPS_COUNT "Numrimi Aplicacioneve: %d"
+    IDS_APPS_SELECT_COUNT "; Selected: %d"
    IDS_INSTALLED "Instaluar"
    IDS_AVAILABLEFORINST "Te vlefshem per instalim"
    IDS_UPDATES "Updates"
--- a/base/applications/rapps/lang/sv-SE.rc
+++ b/base/applications/rapps/lang/sv-SE.rc
@@ -43,22 +43,6 @@ BEGIN
    END
 END

-IDR_APPLICATIONMENU MENU
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Installera\tCtrl+Enter", ID_INSTALL
-        MENUITEM "&Avinstallera\tCtrl+Del", ID_UNINSTALL
-        MENUITEM "&Ändra", ID_MODIFY
-        MENUITEM SEPARATOR
-        MENUITEM "Ta bort från R&egistret", ID_REGREMOVE
-        MENUITEM SEPARATOR
-        MENUITEM "Uppdate&ra\tF5", ID_REFRESH
-        MENUITEM SEPARATOR
-        MENUITEM "Update Data&base\tCtrl+F5", ID_RESETDB
-    END
-END
-
 IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Inställningar"
@@ -188,11 +172,20 @@ STRINGTABLE
 BEGIN
    IDS_APPTITLE "ReactOS programhanterare"
    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
-    IDS_SEARCH_TEXT "Sök…"
-    IDS_APPS_COUNT "Programantal: %d; Selected: %d"
-    IDS_WELCOME_TITLE "Välkommen till ReactOS programhanterare!\n\n"
+    IDS_WELCOME_TITLE "Välkommen till ReactOS programhanterare!"
    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_APPWIZ_TITLE "Add/Remove Programs"
+    IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system."
+    IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SEARCH_TEXT "Sök…"
+    IDS_APPS_COUNT "Programantal: %d"
+    IDS_APPS_SELECT_COUNT "; Selected: %d"
    IDS_INSTALLED "Installerat"
    IDS_AVAILABLEFORINST "Tillgängliga for installation"
    IDS_UPDATES "Uppdateringar"
--- a/base/applications/rapps/lang/tr-TR.rc
+++ b/base/applications/rapps/lang/tr-TR.rc
@@ -45,22 +45,6 @@ BEGIN
    END
 END

-IDR_APPLICATIONMENU MENU
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Kur\tCtrl+Enter", ID_INSTALL
-        MENUITEM "K&aldır\tCtrl+Del", ID_UNINSTALL
-        MENUITEM "&Değiştir", ID_MODIFY
-        MENUITEM SEPARATOR
-        MENUITEM "&Girdiyi Kayıt Defteri'nden Kaldır", ID_REGREMOVE
-        MENUITEM SEPARATOR
-        MENUITEM "&Yenile\tF5", ID_REFRESH
-        MENUITEM SEPARATOR
-        MENUITEM "Uygulama Veri Ta&banını Yenile\tCtrl+F5", ID_RESETDB
-    END
-END
-
 IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Ayarlar"
@@ -190,11 +174,20 @@ STRINGTABLE
 BEGIN
    IDS_APPTITLE "ReactOS Uygulama Yöneticisi"
    IDS_APP_AUTHORS "Telif Hakkı: 2009 Dmitry Chapyshev"
-    IDS_SEARCH_TEXT "Ara"
-    IDS_APPS_COUNT "Uygulama Sayısı: %d; Seçili: %d"
-    IDS_WELCOME_TITLE "ReactOS Uygulama Yöneticisi'ne hoş geldiniz.\n\n"
+    IDS_WELCOME_TITLE "ReactOS Uygulama Yöneticisi'ne hoş geldiniz."
    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_APPWIZ_TITLE "Add/Remove Programs"
+    IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system."
+    IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SEARCH_TEXT "Ara…"
+    IDS_APPS_COUNT "Uygulama Sayısı: %d"
+    IDS_APPS_SELECT_COUNT "; Seçili: %d"
    IDS_INSTALLED "Kurulanlar"
    IDS_AVAILABLEFORINST "Kurulabilir Uygulamalar"
    IDS_UPDATES "Güncelleştirmeler"
--- a/base/applications/rapps/lang/uk-UA.rc
+++ b/base/applications/rapps/lang/uk-UA.rc
@@ -46,22 +46,6 @@ BEGIN
    END
 END

-IDR_APPLICATIONMENU MENU
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&Встановити\tCtrl+Enter", ID_INSTALL
-        MENUITEM "В&идалити\tCtrl+Del", ID_UNINSTALL
-        MENUITEM "&Змінити", ID_MODIFY
-        MENUITEM SEPARATOR
-        MENUITEM "Вида&лити з реєстру", ID_REGREMOVE
-        MENUITEM SEPARATOR
-        MENUITEM "&Оновити\tF5", ID_REFRESH
-        MENUITEM SEPARATOR
-        MENUITEM "Оновити список &програм\tCtrl+F5", ID_RESETDB
-    END
-END
-
 IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Налаштування"
@@ -191,11 +175,20 @@ STRINGTABLE
 BEGIN
    IDS_APPTITLE "Менеджер додатків ReactOS"
    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
-    IDS_SEARCH_TEXT "Пошук…"
-    IDS_APPS_COUNT "Kількість додатків: %d; Обрано: %d"
-    IDS_WELCOME_TITLE "Ласкаво просимо в Менеджер додатків ReactOS!\n\n"
+    IDS_WELCOME_TITLE "Ласкаво просимо в Менеджер додатків ReactOS!"
    IDS_WELCOME_TEXT "Виберіть категорію зліва, а потім виберіть програми для встановлення чи видалення.\nСторінка ReactOS: "
    IDS_WELCOME_URL "https://reactos.org"
+
+    IDS_APPWIZ_TITLE "Add/Remove Programs"
+    IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system."
+    IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SEARCH_TEXT "Пошук…"
+    IDS_APPS_COUNT "Kількість додатків: %d"
+    IDS_APPS_SELECT_COUNT "; Обрано: %d"
    IDS_INSTALLED "Встановлені"
    IDS_AVAILABLEFORINST "Доступні для встановлення"
    IDS_UPDATES "Оновлення"
--- a/base/applications/rapps/lang/zh-CN.rc
+++ b/base/applications/rapps/lang/zh-CN.rc
@@ -47,22 +47,6 @@ BEGIN
    END
 END

-IDR_APPLICATIONMENU MENU
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "安装(&I)\tCtrl+Enter", ID_INSTALL
-        MENUITEM "卸载(&U)\tCtrl+Del", ID_UNINSTALL
-        MENUITEM "修改(&M)", ID_MODIFY
-        MENUITEM SEPARATOR
-        MENUITEM "从注册表删除(&E)", ID_REGREMOVE
-        MENUITEM SEPARATOR
-        MENUITEM "刷新(&R)\tF5", ID_REFRESH
-        MENUITEM SEPARATOR
-        MENUITEM "更新数据库(&B)\tCtrl+F5", ID_RESETDB
-    END
-END
-
 IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "设置"
@@ -192,11 +176,20 @@ STRINGTABLE
 BEGIN
    IDS_APPTITLE "ReactOS 程序管理器"
    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
-    IDS_SEARCH_TEXT "搜索…"
-    IDS_APPS_COUNT "程序数量：%d；已选：%d"
-    IDS_WELCOME_TITLE "欢迎使用 ReactOS 程序管理器！\n\n"
+    IDS_WELCOME_TITLE "欢迎使用 ReactOS 程序管理器！"
    IDS_WELCOME_TEXT "从左栏选择一个类别，然后选择要安装或卸载的程序。\nReactOS 网站："
    IDS_WELCOME_URL "https://reactos.org"
+
+    IDS_APPWIZ_TITLE "Add/Remove Programs"
+    IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system."
+    IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SEARCH_TEXT "搜索…"
+    IDS_APPS_COUNT "程序数量：%d"
+    IDS_APPS_SELECT_COUNT "；已选：%d"
    IDS_INSTALLED "已安装"
    IDS_AVAILABLEFORINST "可安装"
    IDS_UPDATES "更新"
--- a/base/applications/rapps/lang/zh-HK.rc
+++ b/base/applications/rapps/lang/zh-HK.rc
@@ -44,22 +44,6 @@ BEGIN
    END
 END

-IDR_APPLICATIONMENU MENU
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "安裝(&I)\tCtrl+Enter", ID_INSTALL
-        MENUITEM "解除安裝(&U)\tCtrl+Del", ID_UNINSTALL
-        MENUITEM "修改(&M)", ID_MODIFY
-        MENUITEM SEPARATOR
-        MENUITEM "從登錄檔刪除(&E)", ID_REGREMOVE
-        MENUITEM SEPARATOR
-        MENUITEM "重新整理(&R)\tF5", ID_REFRESH
-        MENUITEM SEPARATOR
-        MENUITEM "更新資料庫(&B)\tCtrl+F5", ID_RESETDB
-    END
-END
-
 IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "設定"
@@ -189,11 +173,20 @@ STRINGTABLE
 BEGIN
    IDS_APPTITLE "ReactOS 程式管理員"
    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
-    IDS_SEARCH_TEXT "搜尋..."
-    IDS_APPS_COUNT "程式數量：%d； 已選：%d"
-    IDS_WELCOME_TITLE "歡迎來到 ReactOS 程式管理員！\n\n"
+    IDS_WELCOME_TITLE "歡迎來到 ReactOS 程式管理員！"
    IDS_WELCOME_TEXT "從左側欄目選擇一個類別，然後選擇要安裝或解除安裝的程式。\nReactOS 網站︰"
    IDS_WELCOME_URL "https://reactos.org"
+
+    IDS_APPWIZ_TITLE "Add/Remove Programs"
+    IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system."
+    IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SEARCH_TEXT "搜尋..."
+    IDS_APPS_COUNT "程式數量：%d"
+    IDS_APPS_SELECT_COUNT "； 已選：%d"
    IDS_INSTALLED "已安裝"
    IDS_AVAILABLEFORINST "可安裝"
    IDS_UPDATES "更新"
--- a/base/applications/rapps/lang/zh-TW.rc
+++ b/base/applications/rapps/lang/zh-TW.rc
@@ -44,22 +44,6 @@ BEGIN
    END
 END

-IDR_APPLICATIONMENU MENU
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "安裝(&I)\tCtrl+Enter", ID_INSTALL
-        MENUITEM "解除安裝(&U)\tCtrl+Del", ID_UNINSTALL
-        MENUITEM "修改(&M)", ID_MODIFY
-        MENUITEM SEPARATOR
-        MENUITEM "從登錄檔刪除(&E)", ID_REGREMOVE
-        MENUITEM SEPARATOR
-        MENUITEM "重新整理(&R)\tF5", ID_REFRESH
-        MENUITEM SEPARATOR
-        MENUITEM "更新資料庫(&B)\tCtrl+F5", ID_RESETDB
-    END
-END
-
 IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "設定"
@@ -189,11 +173,20 @@ STRINGTABLE
 BEGIN
    IDS_APPTITLE "ReactOS 程式管理員"
    IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev"
-    IDS_SEARCH_TEXT "搜尋..."
-    IDS_APPS_COUNT "程式數量：%d； 已選：%d"
-    IDS_WELCOME_TITLE "歡迎來到 ReactOS 程式管理員！\n\n"
+    IDS_WELCOME_TITLE "歡迎來到 ReactOS 程式管理員！"
    IDS_WELCOME_TEXT "從左側欄目選擇一個類別，然後選擇要安裝或解除安裝的程式。\nReactOS 網站︰"
    IDS_WELCOME_URL "https://reactos.org"
+
+    IDS_APPWIZ_TITLE "Add/Remove Programs"
+    IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system."
+    IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SEARCH_TEXT "搜尋..."
+    IDS_APPS_COUNT "程式數量：%d"
+    IDS_APPS_SELECT_COUNT "； 已選：%d"
    IDS_INSTALLED "已安裝"
    IDS_AVAILABLEFORINST "可安裝"
    IDS_UPDATES "更新"
--- a/base/applications/rapps/loaddlg.cpp
+++ b/base/applications/rapps/loaddlg.cpp
@@ -470,6 +470,7 @@ CDownloadManager::DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM wParam, LPARAM lPa
    {
        case WM_INITDIALOG:
        {
+            g_Busy++;
            HICON hIconSm, hIconBg;
            CStringW szTempCaption;

@@ -557,6 +558,12 @@ CDownloadManager::DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM wParam, LPARAM lPa
            }
            return TRUE;

+        case WM_DESTROY:
+            g_Busy--;
+            if (hMainWnd)
+                PostMessage(hMainWnd, WM_NOTIFY_OPERATIONCOMPLETED, 0, 0);
+            return FALSE;
+
        default:
            return FALSE;
    }
--- a/base/applications/rapps/misc.cpp
+++ b/base/applications/rapps/misc.cpp
@@ -39,8 +39,33 @@ CopyTextToClipboard(LPCWSTR lpszText)
    CloseClipboard();
 }

+static INT_PTR CALLBACK
+NothingDlgProc(HWND hDlg, UINT uMsg, WPARAM, LPARAM)
+{
+    return uMsg == WM_CLOSE ? DestroyWindow(hDlg) : FALSE;
+}
+
 VOID
-ShowPopupMenuEx(HWND hwnd, HWND hwndOwner, UINT MenuID, UINT DefaultItem)
+EmulateDialogReposition(HWND hwnd)
+{
+    static const DWORD DlgTmpl[] = { WS_POPUP | WS_CAPTION | WS_SYSMENU, 0, 0, 0, 0, 0 };
+    HWND hDlg = CreateDialogIndirectW(NULL, (LPDLGTEMPLATE)DlgTmpl, NULL, NothingDlgProc);
+    if (hDlg)
+    {
+        RECT r;
+        GetWindowRect(hwnd, &r);
+        if (SetWindowPos(hDlg, hDlg, r.left, r.top, r.right - r.left, r.bottom - r.top, SWP_NOZORDER | SWP_NOACTIVATE))
+        {
+            SendMessage(hDlg, DM_REPOSITION, 0, 0);
+            if (GetWindowRect(hDlg, &r))
+                SetWindowPos(hwnd, hwnd, r.left, r.top, r.right - r.left, r.bottom - r.top, SWP_NOZORDER | SWP_NOACTIVATE);
+        }
+        SendMessage(hDlg, WM_CLOSE, 0, 0);
+    }
+}
+
+VOID
+ShowPopupMenuEx(HWND hwnd, HWND hwndOwner, UINT MenuID, UINT DefaultItem, POINT *Point)
 {
    HMENU hMenu = NULL;
    HMENU hPopupMenu;
@@ -68,10 +93,13 @@ ShowPopupMenuEx(HWND hwnd, HWND hwndOwner, UINT MenuID, UINT DefaultItem)
        SetMenuDefaultItem(hPopupMenu, DefaultItem, FALSE);
    }

-    GetCursorPos(&pt);
+    if (!Point)
+    {
+        GetCursorPos(Point = &pt);
+    }

    SetForegroundWindow(hwnd);
-    TrackPopupMenu(hPopupMenu, 0, pt.x, pt.y, 0, hwndOwner, NULL);
+    TrackPopupMenu(hPopupMenu, 0, Point->x, Point->y, 0, hwndOwner, NULL);

    if (hMenu)
    {
--- a/base/applications/rapps/settings.cpp
+++ b/base/applications/rapps/settings.cpp
@@ -8,6 +8,7 @@
 #include "rapps.h"
 #include "settings.h"

+#define SETTINGSSUBKEY L"Software\\ReactOS\\" RAPPS_NAME

 class SettingsField
 {
@@ -109,7 +110,7 @@ class SettingsFieldString : public SettingsField
    LPCWSTR m_RegName;     // key name in registery
 };

-void
+static void
 AddInfoFields(ATL::CAtlList<SettingsField *> &infoFields, SETTINGS_INFO &settings)
 {
    infoFields.AddTail(new SettingsFieldBool(&(settings.bSaveWndPos), L"bSaveWndPos"));
@@ -127,11 +128,9 @@ AddInfoFields(ATL::CAtlList<SettingsField *> &infoFields, SETTINGS_INFO &setting
    infoFields.AddTail(new SettingsFieldString((settings.szNoProxyFor), MAX_PATH, L"NoProxyFor"));
    infoFields.AddTail(new SettingsFieldBool(&(settings.bUseSource), L"bUseSource"));
    infoFields.AddTail(new SettingsFieldString((settings.szSourceURL), INTERNET_MAX_URL_LENGTH, L"SourceURL"));
-
-    return;
 }

-BOOL
+static BOOL
 SaveAllSettings(CRegKey &key, SETTINGS_INFO &settings)
 {
    BOOL bAllSuccess = TRUE;
@@ -153,10 +152,10 @@ SaveAllSettings(CRegKey &key, SETTINGS_INFO &settings)
    return bAllSuccess;
 }

-BOOL
+static BOOL
 LoadAllSettings(CRegKey &key, SETTINGS_INFO &settings)
 {
-    BOOL bAllSuccess = TRUE;
+    BOOL bLoadedAny = FALSE;
    ATL::CAtlList<SettingsField *> infoFields;

    AddInfoFields(infoFields, settings);
@@ -165,27 +164,18 @@ LoadAllSettings(CRegKey &key, SETTINGS_INFO &settings)
    while (InfoListPosition)
    {
        SettingsField *Info = infoFields.GetNext(InfoListPosition);
-        if (!Info->Load(key))
-        {
-            bAllSuccess = FALSE;
-            // TODO: error log
-        }
+        if (Info->Load(key))
+            bLoadedAny = TRUE;
+        //else
+        //  TODO: error log
        delete Info;
    }
-    return bAllSuccess;
+    return bLoadedAny;
 }

-VOID
-FillDefaultSettings(PSETTINGS_INFO pSettingsInfo)
+static void
+GetDefaultDownloadDirectory(CStringW &szDownloadDir)
 {
-    CStringW szDownloadDir;
-    ZeroMemory(pSettingsInfo, sizeof(SETTINGS_INFO));
-
-    pSettingsInfo->bSaveWndPos = TRUE;
-    pSettingsInfo->bUpdateAtStart = FALSE;
-    pSettingsInfo->bLogEnabled = TRUE;
-    pSettingsInfo->bUseSource = FALSE;
-
    if (FAILED(SHGetFolderPathW(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, szDownloadDir.GetBuffer(MAX_PATH))))
    {
        szDownloadDir.ReleaseBuffer();
@@ -201,29 +191,68 @@ FillDefaultSettings(PSETTINGS_INFO pSettingsInfo)

    PathAppendW(szDownloadDir.GetBuffer(MAX_PATH), L"\\RAPPS Downloads");
    szDownloadDir.ReleaseBuffer();
+}

-    CStringW::CopyChars(
-        pSettingsInfo->szDownloadDir, _countof(pSettingsInfo->szDownloadDir), szDownloadDir.GetString(),
-        szDownloadDir.GetLength() + 1);
+static VOID
+ValidateStringSettings(PSETTINGS_INFO pSettingsInfo)
+{
+    if (!pSettingsInfo->szDownloadDir[0])
+    {
+        CStringW szDownloadDir;
+        GetDefaultDownloadDirectory(szDownloadDir);

+        CStringW::CopyChars(pSettingsInfo->szDownloadDir, _countof(pSettingsInfo->szDownloadDir),
+                            szDownloadDir.GetString(), szDownloadDir.GetLength() + 1);
+    }
+}
+
+VOID
+FillDefaultSettings(PSETTINGS_INFO pSettingsInfo)
+{
+    ZeroMemory(pSettingsInfo, sizeof(*pSettingsInfo));
+
+    pSettingsInfo->bSaveWndPos = TRUE;
+    pSettingsInfo->bUpdateAtStart = FALSE;
+    pSettingsInfo->bLogEnabled = TRUE;
+    pSettingsInfo->bUseSource = FALSE;
    pSettingsInfo->bDelInstaller = FALSE;
    pSettingsInfo->Maximized = FALSE;
    pSettingsInfo->Left = CW_USEDEFAULT;
    pSettingsInfo->Top = CW_USEDEFAULT;
    pSettingsInfo->Width = 680;
    pSettingsInfo->Height = 450;
+
+    ValidateStringSettings(pSettingsInfo);
 }

 BOOL
 LoadSettings(PSETTINGS_INFO pSettingsInfo)
 {
+    BOOL bLoadedAny = FALSE;
+
+    FillDefaultSettings(pSettingsInfo);
+
    ATL::CRegKey RegKey;
-    if (RegKey.Open(HKEY_CURRENT_USER, L"Software\\ReactOS\\" RAPPS_NAME, KEY_READ) != ERROR_SUCCESS)
+    if (RegKey.Open(HKEY_CURRENT_USER, SETTINGSSUBKEY, KEY_READ) == ERROR_SUCCESS)
    {
-        return FALSE;
+        bLoadedAny = LoadAllSettings(RegKey, *pSettingsInfo);
    }

-    return LoadAllSettings(RegKey, *pSettingsInfo);
+    ValidateStringSettings(pSettingsInfo); // Handles the case where a REG_SZ is present but empty
+
+    if (!bLoadedAny)
+    {
+        // This the first launch, write at least one item so ParseCmdAndExecute() does not
+        // trigger another DB update in another process instance between now and SaveSettings().
+        ATL::CRegKey RegKey;
+        if (RegKey.Create(HKEY_CURRENT_USER, SETTINGSSUBKEY, NULL, REG_OPTION_NON_VOLATILE,
+                          KEY_WRITE, NULL, NULL) == ERROR_SUCCESS)
+        {
+            SettingsFieldBool field(&(pSettingsInfo->bUpdateAtStart), L"bUpdateAtStart");
+            field.Save(RegKey);
+        }
+    }
+    return bLoadedAny;
 }

 BOOL
@@ -245,8 +274,8 @@ SaveSettings(HWND hwnd, PSETTINGS_INFO pSettingsInfo)
            (wp.showCmd == SW_MAXIMIZE || (wp.showCmd == SW_SHOWMINIMIZED && (wp.flags & WPF_RESTORETOMAXIMIZED)));
    }

-    if (RegKey.Create(HKEY_CURRENT_USER, L"Software\\ReactOS\\" RAPPS_NAME, NULL,
-                      REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, NULL) != ERROR_SUCCESS)
+    if (RegKey.Create(HKEY_CURRENT_USER, SETTINGSSUBKEY, NULL, REG_OPTION_NON_VOLATILE,
+                      KEY_WRITE, NULL, NULL) != ERROR_SUCCESS)
    {
        return FALSE;
    }
--- a/base/applications/rapps/unattended.cpp
+++ b/base/applications/rapps/unattended.cpp
@@ -349,16 +349,17 @@ ParseCmdAndExecute(LPWSTR lpCmdLine, BOOL bIsFirstLaunch, int nCmdShow)
    if (argc == 1 || bAppwizMode) // RAPPS is launched without options or APPWIZ mode is requested
    {
        // Check whether the RAPPS MainWindow is already launched in another process
-        HANDLE hMutex;
+        CStringW szWindowText(MAKEINTRESOURCEW(bAppwizMode ? IDS_APPWIZ_TITLE : IDS_APPTITLE));
+        LPCWSTR pszMutex = bAppwizMode ? L"RAPPWIZ" : szWindowClass;

-        hMutex = CreateMutexW(NULL, FALSE, szWindowClass);
+        HANDLE hMutex = CreateMutexW(NULL, FALSE, pszMutex);
        if ((!hMutex) || (GetLastError() == ERROR_ALREADY_EXISTS))
        {
            /* If already started, find its window */
            HWND hWindow;
            for (int wait = 2500, inter = 250; wait > 0; wait -= inter)
            {
-                if ((hWindow = FindWindowW(szWindowClass, NULL)) != NULL)
+                if ((hWindow = FindWindowW(szWindowClass, szWindowText)) != NULL)
                    break;
                Sleep(inter);
            }
@@ -366,6 +367,7 @@ ParseCmdAndExecute(LPWSTR lpCmdLine, BOOL bIsFirstLaunch, int nCmdShow)
            if (hWindow)
            {
                /* Activate the window in the other instance */
+                ShowWindow(hWindow, SW_SHOW);
                SwitchToThisWindow(hWindow, TRUE);
                if (bAppwizMode)
                    PostMessage(hWindow, WM_COMMAND, ID_ACTIVATE_APPWIZ, 0);
@@ -376,6 +378,7 @@ ParseCmdAndExecute(LPWSTR lpCmdLine, BOOL bIsFirstLaunch, int nCmdShow)
                return FALSE;
            }
        }
+        szWindowText.Empty();

        CMainWindow wnd(&db, bAppwizMode);
        MainWindowLoop(&wnd, nCmdShow);
--- a/base/applications/rapps/winmain.cpp
+++ b/base/applications/rapps/winmain.cpp
@@ -14,6 +14,7 @@
 #include <conutils.h>

 LPCWSTR szWindowClass = L"ROSAPPMGR2";
+LONG g_Busy = 0;

 HWND hMainWnd;
 HINSTANCE hInst;
@@ -40,12 +41,7 @@ wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, INT nSh
    }

    hInst = hInstance;
-
    BOOL bIsFirstLaunch = !LoadSettings(&SettingsInfo);
-    if (bIsFirstLaunch)
-    {
-        FillDefaultSettings(&SettingsInfo);
-    }

    InitLogs();
    InitCommonControls();
--- a/base/applications/regedit/about.c
+++ b/base/applications/regedit/about.c
@@ -2,20 +2,7 @@
 * Regedit About Dialog Box
 *
 * Copyright (C) 2002 Robert Dickenson <robd@reactos.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later)
 */

 #include "regedit.h"
--- a/base/applications/regedit/childwnd.c
+++ b/base/applications/regedit/childwnd.c
@@ -3,20 +3,7 @@
 *
 * Copyright (C) 2002 Robert Dickenson <robd@reactos.org>
 * Copyright (C) 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later)
 */

 #include "regedit.h"
@@ -25,8 +12,8 @@

 ChildWnd* g_pChildWnd;
 static int last_split;
-HBITMAP SizingPattern = 0;
-HBRUSH  SizingBrush = 0;
+HBITMAP SizingPattern;
+HBRUSH  SizingBrush;
 WCHAR Suggestions[256];

 static HRESULT WINAPI DummyEnumStringsQI(LPVOID This, REFIID riid, void**ppv)
@@ -181,11 +168,8 @@ static void draw_splitbar(HWND hWnd, int x)
    ReleaseDC(hWnd, hdc);
 }

-/*******************************************************************************
- * finish_splitbar [internal]
- *
- * make the splitbar invisible and resize the windows
- * (helper for ChildWndProc)
+/**
+ * make the splitbar invisible and resize the windows (helper for ChildWndProc)
 */
 static void finish_splitbar(HWND hWnd, int x)
 {
@@ -291,7 +275,6 @@ static void SuggestKeys(HKEY hRootKey, LPCWSTR pszKeyPath, LPWSTR pszSuggestions
    }
 }

-
 LRESULT CALLBACK AddressBarProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
    WNDPROC oldwndproc;
@@ -374,15 +357,11 @@ UpdateAddress(HTREEITEM hItem, HKEY hRootKey, LPCWSTR pszPath, BOOL bSelectNone)
    }
 }

-/*******************************************************************************
- *
- *  FUNCTION: ChildWndProc(HWND, unsigned, WORD, LONG)
- *
- *  PURPOSE:  Processes messages for the child windows.
- *
- *  WM_COMMAND  - process the application menu
- *  WM_DESTROY  - post a quit message and return
+/**
+ * PURPOSE: Processes messages for the child windows.
 *
+ * WM_COMMAND - process the application menu
+ * WM_DESTROY - post a quit message and return
 */
 LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
--- a/base/applications/regedit/clb/clb.c
+++ b/base/applications/regedit/clb/clb.c
@@ -1,29 +1,8 @@
 /*
- * ReactOS Column List Box
- * Copyright (C) 2005 Thomas Weidenmueller
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-/*
- * PROJECT:         ReactOS Column List Box
- * FILE:            base/applications/regedit/clb/clb.c
- * PURPOSE:         Column List Box
- * PROGRAMMER:      Thomas Weidenmueller <w3seek@reactos.com>
- *
- * UPDATE HISTORY:
- *      10/29/2005  Created
+ * PROJECT:     ReactOS Column List Box
+ * LICENSE:     LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later)
+ * PURPOSE:     Column List Box
+ * COPYRIGHT:   Copyright 2005 Thomas Weidenmueller <w3seek@reactos.com>
 */
 #include <precomp.h>

@@ -94,7 +73,6 @@ ClbAddData(IN DWORD Unknown1,
    return 0;
 }

-
 /*
 * @unimplemented
 */
@@ -108,7 +86,6 @@ ClbSetColumnWidths(IN DWORD Unknown1,
    return 0;
 }

-
 /*
 * @unimplemented
 */
@@ -124,8 +101,7 @@ ClbWndProc(IN HWND hwnd,

    DPRINT1("ClbWndProc(0x%p, 0x%x, 0x%p, 0x%p)\n", hwnd, uMsg, wParam, lParam);

-    PrivData = (PCLB_PRIVATEDATA)GetWindowLongPtr(hwnd,
-               0);
+    PrivData = (PCLB_PRIVATEDATA)GetWindowLongPtr(hwnd, 0);
    if (PrivData == NULL && uMsg != WM_CREATE)
    {
        goto HandleDefMsg;
@@ -146,24 +122,18 @@ ClbWndProc(IN HWND hwnd,
        break;

    case WM_DESTROY:
-        HeapFree(GetProcessHeap(),
-                 0,
-                 PrivData);
+        HeapFree(GetProcessHeap(), 0, PrivData);
        break;

    default:
 HandleDefMsg:
-        Ret = DefWindowProc(hwnd,
-                            uMsg,
-                            wParam,
-                            lParam);
+        Ret = DefWindowProc(hwnd, uMsg, wParam, lParam);
        break;
    }

    return Ret;
 }

-
 static INT_PTR CALLBACK
 ClbpStyleDlgProc(IN HWND hwndDlg,
                 IN UINT uMsg,
@@ -181,15 +151,13 @@ ClbpStyleDlgProc(IN HWND hwndDlg,
        {
        case IDOK:
        case IDCANCEL:
-            EndDialog(hwndDlg,
-                      (INT_PTR)LOWORD(wParam));
+            EndDialog(hwndDlg, LOWORD(wParam));
            break;
        }
        break;

    case WM_CLOSE:
-        EndDialog(hwndDlg,
-                  IDCANCEL);
+        EndDialog(hwndDlg, IDCANCEL);
        break;

    case WM_INITDIALOG:
@@ -200,7 +168,6 @@ ClbpStyleDlgProc(IN HWND hwndDlg,
    return Ret;
 }

-
 /*
 * @implemented
 */
@@ -216,36 +183,32 @@ ClbStyleW(IN HWND hWndParent,
                          dwInitParam);
 }

-
 /*
 * @implemented
 */
 BOOL
 WINAPI
-CustomControlInfoW(OUT LPCUSTOM_CONTROL_INFO CustomControlInfo  OPTIONAL)
+CustomControlInfoW(OUT LPCUSTOM_CONTROL_INFO CustomControlInfo OPTIONAL)
 {
    if (CustomControlInfo != NULL)
    {
-        wcscpy(CustomControlInfo->ClassName,
-               ClbClassName);
+        wcscpy(CustomControlInfo->ClassName, ClbClassName);

        CustomControlInfo->Zero1 = 0;

-        wcscpy(CustomControlInfo->ClassName2,
-               ClbClassName);
+        wcscpy(CustomControlInfo->ClassName2, ClbClassName);

-        CustomControlInfo->Unknown1 = 0x60; /* FIXME - ??? */
-        CustomControlInfo->Unknown2 = 0x50; /* FIXME - ??? */
-        CustomControlInfo->Unknown3 = 0x50A10013; /* FIXME - ??? */
+        CustomControlInfo->Unknown1 = 0x60; // FIXME - ???
+        CustomControlInfo->Unknown2 = 0x50; // FIXME - ???
+        CustomControlInfo->Unknown3 = 0x50A10013; // FIXME - ???

        CustomControlInfo->Zero2 = 0;
        CustomControlInfo->Zero3 = 0;

-        CustomControlInfo->StylesCount = sizeof(ClbsSupportedStyles) / sizeof(ClbsSupportedStyles[0]);
+        CustomControlInfo->StylesCount = _countof(ClbsSupportedStyles);
        CustomControlInfo->SupportedStyles = ClbsSupportedStyles;

-        wcscpy(CustomControlInfo->Columns,
-               ClbColumns);
+        wcscpy(CustomControlInfo->Columns, ClbColumns);

        CustomControlInfo->ClbStyleW = ClbStyleW;

@@ -280,10 +243,9 @@ DllMain(IN HINSTANCE hinstDLL,
        ClbWndClass.lpfnWndProc = ClbWndProc;
        ClbWndClass.cbClsExtra = 0;
        ClbWndClass.cbWndExtra = sizeof(PCLB_PRIVATEDATA);
-        ClbWndClass.hInstance = hinstDLL,
-                    ClbWndClass.hIcon = NULL;
-        ClbWndClass.hCursor = LoadCursor(NULL,
-                                         (LPWSTR)IDC_ARROW);
+        ClbWndClass.hInstance = hinstDLL;
+        ClbWndClass.hIcon = NULL;
+        ClbWndClass.hCursor = LoadCursor(NULL, (LPWSTR)IDC_ARROW);
        ClbWndClass.hbrBackground = NULL;
        ClbWndClass.lpszMenuName = NULL;
        ClbWndClass.lpszClassName = ClbClassName;
@@ -301,8 +263,7 @@ DllMain(IN HINSTANCE hinstDLL,
        break;

    case DLL_PROCESS_DETACH:
-        UnregisterClass(ClbClassName,
-                        hinstDLL);
+        UnregisterClass(ClbClassName, hinstDLL);
        break;
    }
    return Ret;
--- a/base/applications/regedit/edit.c
+++ b/base/applications/regedit/edit.c
@@ -2,20 +2,7 @@
 * Registry editing UI functions.
 *
 * Copyright (C) 2003 Dimitrie O. Paun
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later)
 */

 #include "regedit.h"
@@ -163,7 +150,6 @@ INT_PTR CALLBACK modify_string_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, L
    return FALSE;
 }

-
 INT_PTR CALLBACK modify_multi_string_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
    WCHAR* valueData;
@@ -231,7 +217,6 @@ INT_PTR CALLBACK modify_multi_string_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wPa
    return FALSE;
 }

-
 LRESULT CALLBACK DwordEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
    WNDPROC oldwndproc;
@@ -243,7 +228,7 @@ LRESULT CALLBACK DwordEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPAR
    case WM_CHAR:
        if (dwordEditMode == EDIT_MODE_DEC)
        {
-            if (isdigit((int) wParam & 0xff) || iscntrl((int) wParam & 0xff))
+            if (isdigit((int)wParam & 0xff) || iscntrl((int)wParam & 0xff))
            {
                break;
            }
@@ -254,7 +239,7 @@ LRESULT CALLBACK DwordEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPAR
        }
        else if (dwordEditMode == EDIT_MODE_HEX)
        {
-            if (isxdigit((int) wParam & 0xff) || iscntrl((int) wParam & 0xff))
+            if (isxdigit((int)wParam & 0xff) || iscntrl((int)wParam & 0xff))
            {
                break;
            }
@@ -272,7 +257,6 @@ LRESULT CALLBACK DwordEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPAR
    return CallWindowProcW(oldwndproc, hwnd, uMsg, wParam, lParam);
 }

-
 INT_PTR CALLBACK modify_dword_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
    WNDPROC oldproc;
@@ -386,7 +370,6 @@ INT_PTR CALLBACK modify_dword_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP
    return FALSE;
 }

-
 INT_PTR CALLBACK modify_binary_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
    HWND hwndValue;
@@ -419,7 +402,7 @@ INT_PTR CALLBACK modify_binary_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, L
        case IDOK:
            if ((hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA)))
            {
-                len = (UINT) HexEdit_GetBufferSize(hwndValue);
+                len = (UINT)HexEdit_GetBufferSize(hwndValue);
                if (len > 0 && binValueData)
                    binValueData = HeapReAlloc(GetProcessHeap(), 0, binValueData, len);
                else
@@ -437,7 +420,6 @@ INT_PTR CALLBACK modify_binary_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, L
    return FALSE;
 }

-
 static BOOL CreateResourceColumns(HWND hwnd)
 {
    WCHAR szText[80];
@@ -661,7 +643,6 @@ GetInterfaceType(INTERFACE_TYPE InterfaceType,
 //    wcscpy(pBuffer, lpInterfaceType);
 }

-
 static VOID
 ParseResources(HWND hwnd)
 {
@@ -859,7 +840,6 @@ ParseResources(HWND hwnd)
    }
 }

-
 static BOOL
 OnResourceNotify(HWND hwndDlg, NMHDR *phdr)
 {
@@ -916,7 +896,6 @@ OnResourceNotify(HWND hwndDlg, NMHDR *phdr)
    return FALSE;
 }

-
 static INT_PTR CALLBACK modify_resource_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
    UNREFERENCED_PARAMETER(lParam);
@@ -1037,7 +1016,6 @@ OnResourceListNotify(HWND hwndDlg, NMHDR *phdr)
    return FALSE;
 }

-
 static INT_PTR CALLBACK modify_resource_list_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
    UNREFERENCED_PARAMETER(lParam);
@@ -1436,7 +1414,7 @@ static INT_PTR CALLBACK show_requirements_dma_dlgproc(HWND hwndDlg, UINT uMsg, W
        {
        case IDOK:
        case IDCANCEL:
-           EndDialog(hwndDlg, IDOK);
+            EndDialog(hwndDlg, IDOK);
            break;
        }
    }
@@ -1593,7 +1571,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKey, LPCWSTR valueName, BOOL EditBin)
        {
            if (stringValueData)
            {
-                lRet = RegSetValueExW(hKey, valueName, 0, type, (LPBYTE)stringValueData, (DWORD) (wcslen(stringValueData) + 1) * sizeof(WCHAR));
+                lRet = RegSetValueExW(hKey, valueName, 0, type, (LPBYTE)stringValueData, (DWORD)(wcslen(stringValueData) + 1) * sizeof(WCHAR));
            }
            else
            {
@@ -1697,7 +1675,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKey, LPCWSTR valueName, BOOL EditBin)
                    warning(hwnd, IDS_MULTI_SZ_EMPTY_STRING);
                }

-                lRet = RegSetValueExW(hKey, valueName, 0, type, (LPBYTE)lines, (DWORD) buflen);
+                lRet = RegSetValueExW(hKey, valueName, 0, type, (LPBYTE)lines, (DWORD)buflen);
                HeapFree(GetProcessHeap(), 0, lines);
            }
            else
@@ -1898,7 +1876,7 @@ static LONG CopyKey(HKEY hDestKey, LPCWSTR lpDestSubKey, HKEY hSrcKey, LPCWSTR l
    dwIndex = 0;
    do
    {
-        cbName = sizeof(szSubKey) / sizeof(szSubKey[0]);
+        cbName = ARRAY_SIZE(szSubKey);
        lResult = RegEnumKeyExW(hSrcKey, dwIndex++, szSubKey, &cbName, NULL, NULL, NULL, &ft);
        if (lResult == ERROR_SUCCESS)
        {
@@ -1913,8 +1891,8 @@ static LONG CopyKey(HKEY hDestKey, LPCWSTR lpDestSubKey, HKEY hSrcKey, LPCWSTR l
    dwIndex = 0;
    do
    {
-        cbName = sizeof(szValueName) / sizeof(szValueName[0]);
-        cbData = sizeof(szValueData) / sizeof(szValueData[0]);
+        cbName = ARRAY_SIZE(szValueName);
+        cbData = ARRAY_SIZE(szValueData);
        lResult = RegEnumValueW(hSrcKey, dwIndex++, szValueName, &cbName, NULL, &dwType, szValueData, &cbData);
        if (lResult == ERROR_SUCCESS)
        {
@@ -2005,7 +1983,7 @@ LONG RenameKey(HKEY hKey, LPCWSTR lpSubKey, LPCWSTR lpNewName)
    {
        s++;
        cbNewSubKey = (s - lpSubKey + wcslen(lpNewName) + 1) * sizeof(WCHAR);
-        lpNewSubKey = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, cbNewSubKey);
+        lpNewSubKey = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, cbNewSubKey);
        if (lpNewSubKey != NULL)
        {
            StringCbCopyNW(lpNewSubKey, cbNewSubKey, lpSubKey, (s - lpSubKey) * sizeof(WCHAR));
@@ -2072,7 +2050,7 @@ LONG QueryStringValue(HKEY hKey, LPCWSTR lpSubKey, LPCWSTR lpValueName, LPWSTR p
    }

    cbData = (dwBufferLen - 1) * sizeof(*pszBuffer);
-    lResult = RegQueryValueExW(hKey, lpValueName, NULL, &dwType, (LPBYTE) pszBuffer, &cbData);
+    lResult = RegQueryValueExW(hKey, lpValueName, NULL, &dwType, (LPBYTE)pszBuffer, &cbData);
    if (lResult != ERROR_SUCCESS)
        goto done;
    if (dwType != REG_SZ)
--- a/base/applications/regedit/error.c
+++ b/base/applications/regedit/error.c
@@ -3,20 +3,7 @@
 *
 * Copyright (C) 2010 Adam Kachwalla <geekdundee@gmail.com>
 * Copyright (C) 2012 Hermès Bélusca - Maïto <hermes.belusca@sfr.fr>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later)
 */

 #include "regedit.h"
--- a/base/applications/regedit/find.c
+++ b/base/applications/regedit/find.c
@@ -1,19 +1,7 @@
 /*
 * Regedit find dialog
 *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later)
 */

 #include "regedit.h"
@@ -543,7 +531,6 @@ success:
    return TRUE;
 }

-
 static DWORD GetFindFlags(void)
 {
    HKEY hKey;
--- a/base/applications/regedit/framewnd.c
+++ b/base/applications/regedit/framewnd.c
@@ -2,20 +2,7 @@
 * Regedit frame window
 *
 * Copyright (C) 2002 Robert Dickenson <robd@reactos.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later)
 */

 #include "regedit.h"
@@ -24,20 +11,10 @@
 #include <cderr.h>
 #include <objsel.h>

-/********************************************************************************
- * Global and Local Variables:
- */
-
 #define FAVORITES_MENU_POSITION 3
-
 static WCHAR s_szFavoritesRegKey[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Regedit\\Favorites";
-
 static BOOL bInMenuLoop = FALSE;        /* Tells us if we are in the menu loop */
-
 extern WCHAR Suggestions[256];
-/*******************************************************************************
- * Local module support methods
- */

 static UINT ErrorBox(HWND hWnd, UINT Error)
 {
@@ -70,8 +47,6 @@ static void resize_frame_client(HWND hWnd)
    resize_frame_rect(hWnd, &rect);
 }

-/********************************************************************************/
-
 static void OnInitMenu(HWND hWnd)
 {
    LONG lResult;
@@ -1193,7 +1168,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
                                                        ARRAY_SIZE(szComputerName));
                if (hRet == S_OK)
                {
-                    /* FIXME - connect to the registry */
+                    // FIXME - connect to the registry
                }

                FreeObjectPicker(ObjectPicker);
@@ -1363,14 +1338,6 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
    case ID_EDIT_PERMISSIONS:
        RegKeyEditPermissions(hWnd, hKeyRoot, NULL, keyPath);
        break;
-    case ID_REGISTRY_PRINTERSETUP:
-        //PRINTDLG pd;
-        //PrintDlg(&pd);
-        //PAGESETUPDLG psd;
-        //PageSetupDlg(&psd);
-        break;
-    case ID_REGISTRY_OPENLOCAL:
-        break;
    case ID_VIEW_REFRESH:
        RefreshTreeView(g_pChildWnd->hTreeWnd);
        keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot);
--- a/base/applications/regedit/hexedit.c
+++ b/base/applications/regedit/hexedit.c
@@ -2,20 +2,7 @@
 * Hex editor control
 *
 * Copyright (C) 2004 Thomas Weidenmueller <w3seek@reactos.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later)
 */

 #include "regedit.h"
--- a/base/applications/regedit/lang/bg-BG.rc
+++ b/base/applications/regedit/lang/bg-BG.rc
@@ -1,7 +1,5 @@
 /* Превод на Български/ Bulgarian translation */
 /* https://reactos.org/wiki/Bulgarian_translation */
-/* LOCATION: base/applications/regedit/lang */
-/* НЕДОВЪРШЕН/ INCOMPLETE */

 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT

@@ -71,18 +69,6 @@ END

 /* Menus */

-IDC_REGEDIT MENU
-BEGIN
-    POPUP "&Файл"
-    BEGIN
-        MENUITEM "Из&ход", ID_REGISTRY_EXIT
-    END
-    POPUP "Помо&щ"
-    BEGIN
-        MENUITEM "&За", ID_HELP_ABOUT
-    END
-END
-
 IDR_REGEDIT_MENU MENU
 BEGIN
    POPUP "&Файл"
@@ -214,7 +200,7 @@ END
 /* Dialogs */

 IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Промяна на низа"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -227,7 +213,7 @@ BEGIN
 END

 IDD_EDIT_MULTI_STRING DIALOGEX 32, 24, 252, 174
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Промяна на множествен низ"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -241,7 +227,7 @@ BEGIN
 END

 IDD_EDIT_BIN_DATA DIALOGEX 32, 24, 252, 174
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Промяна на двоична стойност"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -254,7 +240,7 @@ BEGIN
 END

 IDD_EDIT_DWORD DIALOGEX 32, 24, 252, 104
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Промяна на двойна дума"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -270,7 +256,7 @@ BEGIN
 END

 IDD_EDIT_RESOURCE_LIST DIALOGEX 32, 24, 170, 120
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Списък на ресурсите"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -281,7 +267,7 @@ BEGIN
 END

 IDD_EDIT_RESOURCE DIALOGEX 6, 18, 381, 283
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Ресурси"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -318,7 +304,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Requirements List"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -335,7 +321,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Port"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -358,7 +344,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Memory"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -381,7 +367,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Interrupt"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -400,7 +386,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "DMA"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -456,7 +442,7 @@ BEGIN
    ID_REGISTRY_CONNECTNETWORKREGISTRY "Свързва се с регистъра на далечен компютър"
    ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Разкача се от регистъра на отдалечен компютър"
    ID_REGISTRY_PRINT "Разпечатва регистъра или част от него"
-/*    ID_HELP_HELPTOPICS "Отваря помощта за регистърен обработчик" */
+//    ID_HELP_HELPTOPICS "Отваря помощта за регистърен обработчик"
    ID_HELP_ABOUT "Показва сведения за приложението, версия и възпроизводствени права"
 END

@@ -657,7 +643,7 @@ END
 /* Dialogs */

 IDD_EXPORTRANGE DIALOGEX 50, 50, 370, 50
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_BORDER
 FONT 8, "MS Shell Dlg"
 BEGIN
    GROUPBOX "Област за износ", IDC_STATIC, 2, 0, 366, 48
@@ -731,12 +717,3 @@ BEGIN
    DEFPUSHBUTTON "Отказ", IDCANCEL, 93, 29, 45, 14
    LTEXT "Претърсване на регистъра...", IDC_STATIC, 33, 12, 105, 8
 END
-
-/* String Table */
-/*
- *STRINGTABLE
- *BEGIN
- *    ID_HELP_HELPTOPICS "Отваря помощта за Регистърния обработчик."
- *    ID_HELP_ABOUT "Показва сведения за приложението, версията и възпроизводственото право."
- *END
- */
--- a/base/applications/regedit/lang/cs-CZ.rc
+++ b/base/applications/regedit/lang/cs-CZ.rc
@@ -66,18 +66,6 @@ END

 /* Menus */

-IDC_REGEDIT MENU
-BEGIN
-    POPUP "&Soubor"
-    BEGIN
-        MENUITEM "U&končit", ID_REGISTRY_EXIT
-    END
-    POPUP "&Nápověda"
-    BEGIN
-        MENUITEM "&O editoru registru", ID_HELP_ABOUT
-    END
-END
-
 IDR_REGEDIT_MENU MENU
 BEGIN
    POPUP "&Registry"
@@ -209,7 +197,7 @@ END
 /* Dialogs */

 IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Úprava řetězce"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -222,7 +210,7 @@ BEGIN
 END

 IDD_EDIT_MULTI_STRING DIALOGEX 32, 24, 252, 174
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Úprava více-řetězce"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -236,7 +224,7 @@ BEGIN
 END

 IDD_EDIT_BIN_DATA DIALOGEX 32, 24, 252, 174
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Úprava binární hodnoty"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -249,7 +237,7 @@ BEGIN
 END

 IDD_EDIT_DWORD DIALOGEX 32, 24, 252, 104
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Úprava DWORD"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -265,7 +253,7 @@ BEGIN
 END

 IDD_EDIT_RESOURCE_LIST DIALOGEX 32, 24, 170, 120
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Seznam prostředků"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -276,7 +264,7 @@ BEGIN
 END

 IDD_EDIT_RESOURCE DIALOGEX 6, 18, 281, 283
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Prostředky"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -313,7 +301,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Requirements List"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -330,7 +318,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Port"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -353,7 +341,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Memory"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -376,7 +364,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Interrupt"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -395,7 +383,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "DMA"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -451,7 +439,7 @@ BEGIN
    ID_REGISTRY_CONNECTNETWORKREGISTRY "Připojí se ke vzdálenému registru jiného počítače"
    ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Odpojí se od vzdálenému registru jiného počítače"
    ID_REGISTRY_PRINT "Vytiskne všechny části registru"
-/*    ID_HELP_HELPTOPICS "Otevře témata nápovědy pro editor registru" */
+//    ID_HELP_HELPTOPICS "Otevře nápovědu pro editor registru"
    ID_HELP_ABOUT "Zobrazí informace o aplikaci, verzi a copyright"
 END

@@ -652,7 +640,7 @@ END
 /* Dialogs */

 IDD_EXPORTRANGE DIALOGEX 50, 50, 370, 50
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_BORDER
 FONT 8, "MS Shell Dlg"
 BEGIN
    GROUPBOX "Rozsah exportu", IDC_STATIC, 2, 0, 366, 48
@@ -726,12 +714,3 @@ BEGIN
    DEFPUSHBUTTON "Storno", IDCANCEL, 93, 29, 45, 14
    LTEXT "Probíhá prohledávání registru...", IDC_STATIC, 33, 12, 83, 8
 END
-
-/* String Table */
-/*
- *STRINGTABLE
- *BEGIN
- *    ID_HELP_HELPTOPICS "Otevře nápovědu pro editor registru."
- *    ID_HELP_ABOUT "Zobrazí informace o aplikaci, verzi a copyright."
- *END
- */
--- a/base/applications/regedit/lang/de-DE.rc
+++ b/base/applications/regedit/lang/de-DE.rc
@@ -66,18 +66,6 @@ END

 /* Menus */

-IDC_REGEDIT MENU
-BEGIN
-    POPUP "&Datei"
-    BEGIN
-        MENUITEM "&Beenden", ID_REGISTRY_EXIT
-    END
-    POPUP "&Hilfe"
-    BEGIN
-        MENUITEM "Inf&o", ID_HELP_ABOUT
-    END
-END
-
 IDR_REGEDIT_MENU MENU
 BEGIN
    POPUP "&Datei"
@@ -209,7 +197,7 @@ END
 /* Dialogs */

 IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "String bearbeiten"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -222,7 +210,7 @@ BEGIN
 END

 IDD_EDIT_MULTI_STRING DIALOGEX 32, 24, 252, 174
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Multi-String bearbeiten"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -236,7 +224,7 @@ BEGIN
 END

 IDD_EDIT_BIN_DATA DIALOGEX 32, 24, 252, 174
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Binärwert bearbeiten"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -249,7 +237,7 @@ BEGIN
 END

 IDD_EDIT_DWORD DIALOGEX 32, 24, 252, 104
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "DWORD-Wert bearbeiten"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -265,7 +253,7 @@ BEGIN
 END

 IDD_EDIT_RESOURCE_LIST DIALOGEX 32, 24, 170, 120
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Liste der Ressourcen"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -276,7 +264,7 @@ BEGIN
 END

 IDD_EDIT_RESOURCE DIALOGEX 6, 18, 281, 283
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Ressourcen"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -313,7 +301,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Liste der Anforderungen"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -330,7 +318,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Port"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -353,7 +341,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Memory"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -376,7 +364,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Interrupt"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -395,7 +383,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "DMA"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -441,7 +429,7 @@ STRINGTABLE
 BEGIN
    ID_EDIT_MODIFY "Ändert die Daten eines Wertes"
    ID_EDIT_NEW_KEY "Fügt einen neuen Schlüssel hinzu"
-    ID_EDIT_NEW_STRINGVALUE "Fügt eine neue Zeichenkette hinzu "
+    ID_EDIT_NEW_STRINGVALUE "Fügt eine neue Zeichenkette hinzu"
    ID_EDIT_NEW_BINARYVALUE "Fügt einen neuen Binärwärt hinzu"
    ID_EDIT_NEW_DWORDVALUE "Fügt einen neuen DWORD-Wert hinzu"
    ID_REGISTRY_IMPORTREGISTRYFILE "Importiert eine Textddatei in die Registry"
@@ -451,8 +439,8 @@ BEGIN
    ID_REGISTRY_CONNECTNETWORKREGISTRY "Verbindet zu einer Registry eines Fremdcomputers"
    ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Trennt die Verbindung zu der Registry eines Fremdcomputers"
    ID_REGISTRY_PRINT "Druckt die gesamte Registry oder Teile davon aus"
-/*    ID_HELP_HELPTOPICS "Öffnet die Hilfe" */
-    ID_HELP_ABOUT "Zeigt Versions- und Copyright-Informationen an"
+//    ID_HELP_HELPTOPICS "Öffnet die Hilfe"
+    ID_HELP_ABOUT "Zeigt Programmname, Version und Copyright an"
 END

 STRINGTABLE
@@ -652,7 +640,7 @@ END
 /* Dialogs */

 IDD_EXPORTRANGE DIALOGEX 50, 50, 370, 50
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_BORDER
 FONT 8, "MS Shell Dlg"
 BEGIN
    GROUPBOX "Exportbereich", IDC_STATIC, 2, 0, 366, 48
@@ -726,12 +714,3 @@ BEGIN
    DEFPUSHBUTTON "Abbrechen", IDCANCEL, 93, 29, 45, 14
    LTEXT "Durchsuche die Registry...", IDC_STATIC, 33, 12, 85, 8
 END
-
-/* String Table */
-/*
- *STRINGTABLE
- *BEGIN
- *    ID_HELP_HELPTOPICS "Öffnet die Hilfe."
- *    ID_HELP_ABOUT "Zeigt Programmname, Version und Copyright an"
- *END
- */
--- a/base/applications/regedit/lang/el-GR.rc
+++ b/base/applications/regedit/lang/el-GR.rc
@@ -66,18 +66,6 @@ END

 /* Menus */

-IDC_REGEDIT MENU
-BEGIN
-    POPUP "&Αρχείο"
-    BEGIN
-        MENUITEM "Έ&ξοδος", ID_REGISTRY_EXIT
-    END
-    POPUP "&Βοήθεια"
-    BEGIN
-        MENUITEM "&Σχετικά", ID_HELP_ABOUT
-    END
-END
-
 IDR_REGEDIT_MENU MENU
 BEGIN
    POPUP "&Αρχείο"
@@ -209,7 +197,7 @@ END
 /* Dialogs */

 IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Επεξεργασία Αλφαρηθμητικού"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -222,7 +210,7 @@ BEGIN
 END

 IDD_EDIT_MULTI_STRING DIALOGEX 32, 24, 252, 174
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Επεξεργασία Multi-String"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -236,7 +224,7 @@ BEGIN
 END

 IDD_EDIT_BIN_DATA DIALOGEX 32, 24, 252, 174
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Επεξεργασία Δυαδικής Τιμής"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -249,7 +237,7 @@ BEGIN
 END

 IDD_EDIT_DWORD DIALOGEX 32, 24, 252, 104
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Επεξεργασία DWORD"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -265,7 +253,7 @@ BEGIN
 END

 IDD_EDIT_RESOURCE_LIST DIALOGEX 32, 24, 170, 120
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Resource List"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -276,7 +264,7 @@ BEGIN
 END

 IDD_EDIT_RESOURCE DIALOGEX 6, 18, 281, 283
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Resources"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -313,7 +301,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Requirements List"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -330,7 +318,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Port"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -353,7 +341,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Memory"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -376,7 +364,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Interrupt"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -395,7 +383,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "DMA"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -451,7 +439,7 @@ BEGIN
    ID_REGISTRY_CONNECTNETWORKREGISTRY "Συνδέεεται στη registry ενός απομακρυσμένου υπολογιστή"
    ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Αποσυνδέεεται από τη registry ενός απομακρυσμένου υπολογιστή"
    ID_REGISTRY_PRINT "Εκτυπώνει όλο το κομμάτι της registry"
-/*    ID_HELP_HELPTOPICS "Opens registry editor help" */
+//    ID_HELP_HELPTOPICS "Opens registry editor help"
    ID_HELP_ABOUT "Εμφανίζει τις πληροφορίες προγράμματος, τον αριθμό έκδοσης και τα δικαιώματα"
 END

@@ -652,7 +640,7 @@ END
 /* Dialogs */

 IDD_EXPORTRANGE DIALOGEX 50, 50, 370, 50
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_BORDER
 FONT 8, "MS Shell Dlg"
 BEGIN
    GROUPBOX "Export Range", IDC_STATIC, 2, 0, 366, 48
@@ -726,12 +714,3 @@ BEGIN
    DEFPUSHBUTTON "Ακύρωση", IDCANCEL, 93, 29, 45, 14
    LTEXT "Γίνεται αναζήτηση στη registry...", IDC_STATIC, 33, 12, 83, 8
 END
-
-/* String Table */
-/*
- *STRINGTABLE
- *BEGIN
- *    ID_HELP_HELPTOPICS "Opens Registry Editor Help."
- *    ID_HELP_ABOUT "Displays program information, version number, and copyright."
- *END
- */
--- a/base/applications/regedit/lang/en-US.rc
+++ b/base/applications/regedit/lang/en-US.rc
@@ -66,18 +66,6 @@ END

 /* Menus */

-IDC_REGEDIT MENU
-BEGIN
-    POPUP "&File"
-    BEGIN
-        MENUITEM "E&xit", ID_REGISTRY_EXIT
-    END
-    POPUP "&Help"
-    BEGIN
-        MENUITEM "&About", ID_HELP_ABOUT
-    END
-END
-
 IDR_REGEDIT_MENU MENU
 BEGIN
    POPUP "&File"
@@ -209,7 +197,7 @@ END
 /* Dialogs */

 IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Edit String"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -222,7 +210,7 @@ BEGIN
 END

 IDD_EDIT_MULTI_STRING DIALOGEX 32, 24, 252, 174
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Edit Multi-String"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -236,7 +224,7 @@ BEGIN
 END

 IDD_EDIT_BIN_DATA DIALOGEX 32, 24, 252, 174
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Edit Binary Value"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -249,7 +237,7 @@ BEGIN
 END

 IDD_EDIT_DWORD DIALOGEX 32, 24, 252, 104
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Edit DWORD"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -265,7 +253,7 @@ BEGIN
 END

 IDD_EDIT_RESOURCE_LIST DIALOGEX 32, 24, 170, 120
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Resource List"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -276,7 +264,7 @@ BEGIN
 END

 IDD_EDIT_RESOURCE DIALOGEX 6, 18, 281, 283
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Resources"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -313,7 +301,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Requirements List"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -330,7 +318,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Port"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -353,7 +341,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Memory"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -376,7 +364,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Interrupt"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -395,7 +383,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "DMA"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -451,7 +439,7 @@ BEGIN
    ID_REGISTRY_CONNECTNETWORKREGISTRY "Connects to a remote computer's registry"
    ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Disconnects from a remote computer's registry"
    ID_REGISTRY_PRINT "Prints all or part of the registry"
-/*    ID_HELP_HELPTOPICS "Opens registry editor help" */
+//    ID_HELP_HELPTOPICS "Opens registry editor help"
    ID_HELP_ABOUT "Displays program information, version number and copyright"
 END

@@ -652,7 +640,7 @@ END
 /* Dialogs */

 IDD_EXPORTRANGE DIALOGEX 50, 50, 370, 50
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_BORDER
 FONT 8, "MS Shell Dlg"
 BEGIN
    GROUPBOX "Export Range", IDC_STATIC, 2, 0, 366, 48
@@ -726,12 +714,3 @@ BEGIN
    DEFPUSHBUTTON "Cancel", IDCANCEL, 93, 29, 45, 14
    LTEXT "Searching the registry...", IDC_STATIC, 33, 12, 83, 8
 END
-
-/* String Table */
-/*
- *STRINGTABLE
- *BEGIN
- *    ID_HELP_HELPTOPICS "Opens Registry Editor Help."
- *    ID_HELP_ABOUT "Displays program information, version number, and copyright."
- *END
- */
--- a/base/applications/regedit/lang/es-ES.rc
+++ b/base/applications/regedit/lang/es-ES.rc
@@ -1,5 +1,5 @@
 /* Spanish Language resource file.
- * Translated by: ?? and Ismael Ferreras Morezuelas <2014-11-07> */
+ * TRANSLATOR: 2014 Ismael Ferreras Morezuelas */

 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL

@@ -69,18 +69,6 @@ END

 /* Menus */

-IDC_REGEDIT MENU
-BEGIN
-    POPUP "&Archivo"
-    BEGIN
-        MENUITEM "&Salir", ID_REGISTRY_EXIT
-    END
-    POPUP "Ay&uda"
-    BEGIN
-        MENUITEM "&Acerca de", ID_HELP_ABOUT
-    END
-END
-
 IDR_REGEDIT_MENU MENU
 BEGIN
    POPUP "&Archivo"
@@ -212,7 +200,7 @@ END
 /* Dialogs */

 IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Editar cadena"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -225,7 +213,7 @@ BEGIN
 END

 IDD_EDIT_MULTI_STRING DIALOGEX 32, 24, 252, 174
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Editar cadena múltiple"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -239,7 +227,7 @@ BEGIN
 END

 IDD_EDIT_BIN_DATA DIALOGEX 32, 24, 252, 174
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Editar valor binario"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -252,7 +240,7 @@ BEGIN
 END

 IDD_EDIT_DWORD DIALOGEX 32, 24, 252, 104
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Editar valor DWORD"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -268,7 +256,7 @@ BEGIN
 END

 IDD_EDIT_RESOURCE_LIST DIALOGEX 32, 24, 170, 120
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Lista de recursos"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -279,7 +267,7 @@ BEGIN
 END

 IDD_EDIT_RESOURCE DIALOGEX 6, 18, 281, 283
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Recursos"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -316,7 +304,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Requirements List"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -333,7 +321,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Port"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -356,7 +344,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Memory"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -379,7 +367,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Interrupt"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -398,7 +386,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "DMA"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -454,8 +442,8 @@ BEGIN
    ID_REGISTRY_CONNECTNETWORKREGISTRY "Se conecta al Registro de un ordenador remoto"
    ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Se desconecta del Registro de un ordenador remoto"
    ID_REGISTRY_PRINT "Imprime todo o parte del Registro"
-/*    ID_HELP_HELPTOPICS "Opens registry editor help" */
-    ID_HELP_ABOUT "Muestra información del programa, número de versión y derechos de autor"
+//    ID_HELP_HELPTOPICS "Abre la ayuda del Editor de registro"
+    ID_HELP_ABOUT "Despliega información del programa, versión y licencia"
 END

 STRINGTABLE
@@ -655,7 +643,7 @@ END
 /* Dialogs */

 IDD_EXPORTRANGE DIALOGEX 50, 50, 370, 50
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_BORDER
 FONT 8, "MS Shell Dlg"
 BEGIN
    GROUPBOX "Intervalo de exportación ", IDC_STATIC, 2, 0, 276, 48
@@ -705,7 +693,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
    DEFPUSHBUTTON "Buscar &siguiente", IDOK, 187, 7, 60, 14
    PUSHBUTTON "Cancelar", IDCANCEL, 187, 24, 60, 14
-    GROUPBOX "Buscar en ", IDC_STATIC, 7, 25, 63, 51
+    GROUPBOX "Buscar en", IDC_STATIC, 7, 25, 63, 51
    LTEXT "&Buscar:", IDC_STATIC, 7, 8, 30, 10
    EDITTEXT IDC_FINDWHAT, 40, 7, 142, 13, ES_AUTOHSCROLL
    CONTROL "&Claves", IDC_LOOKAT_KEYS, "Button", BS_AUTOCHECKBOX |
@@ -729,12 +717,3 @@ BEGIN
    DEFPUSHBUTTON "Cancelar", IDCANCEL, 93, 29, 45, 14
    LTEXT "Buscando en el Registro...", IDC_STATIC, 33, 12, 83, 8
 END
-
-/* String Table */
-/*
- *STRINGTABLE
- *BEGIN
- *    ID_HELP_HELPTOPICS "Abre la ayuda del Editor de registro."
- *    ID_HELP_ABOUT "Despliega información del programa, versión y licencia."
- *END
- */
--- a/base/applications/regedit/lang/fr-FR.rc
+++ b/base/applications/regedit/lang/fr-FR.rc
@@ -66,18 +66,6 @@ END

 /* Menus */

-IDC_REGEDIT MENU
-BEGIN
-    POPUP "&Fichier"
-    BEGIN
-        MENUITEM "&Quitter", ID_REGISTRY_EXIT
-    END
-    POPUP "&Aide"
-    BEGIN
-        MENUITEM "&À propos", ID_HELP_ABOUT
-    END
-END
-
 IDR_REGEDIT_MENU MENU
 BEGIN
    POPUP "&Fichier"
@@ -209,7 +197,7 @@ END
 /* Dialogs */

 IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Éditer la chaîne"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -222,7 +210,7 @@ BEGIN
 END

 IDD_EDIT_MULTI_STRING DIALOGEX 32, 24, 252, 174
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Éditer la chaîne multiple"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -236,7 +224,7 @@ BEGIN
 END

 IDD_EDIT_BIN_DATA DIALOGEX 32, 24, 252, 174
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Éditer la valeur binaire"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -249,7 +237,7 @@ BEGIN
 END

 IDD_EDIT_DWORD DIALOGEX 32, 24, 252, 104
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Éditer le mot double"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -265,7 +253,7 @@ BEGIN
 END

 IDD_EDIT_RESOURCE_LIST DIALOGEX 32, 24, 170, 120
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Liste des ressources"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -276,7 +264,7 @@ BEGIN
 END

 IDD_EDIT_RESOURCE DIALOGEX 6, 18, 281, 283
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Ressources"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -313,7 +301,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Requirements List"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -330,7 +318,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Port"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -353,7 +341,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Memory"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -376,7 +364,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Interrupt"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -395,7 +383,7 @@ BEGIN
 END

 IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "DMA"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -451,7 +439,7 @@ BEGIN
    ID_REGISTRY_CONNECTNETWORKREGISTRY "Connecte aux registres d'un ordinateur distant"
    ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Déconnecte des registres d'un ordinateur distant"
    ID_REGISTRY_PRINT "Imprime tout ou une partie des registres"
-/*    ID_HELP_HELPTOPICS "Ouvre l'aide de l'éditeur de registres" */
+//    ID_HELP_HELPTOPICS "Ouvre l'aide de l'éditeur de registres"
    ID_HELP_ABOUT "Affiche de l'information sur le programme, le numéro de version et le copyright"
 END

@@ -652,7 +640,7 @@ END
 /* Dialogs */

 IDD_EXPORTRANGE DIALOGEX 50, 50, 370, 50
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_BORDER
 FONT 8, "MS Shell Dlg"
 BEGIN
    GROUPBOX "Étendue de l'exportation", IDC_STATIC, 2, 0, 366, 48
@@ -726,12 +714,3 @@ BEGIN
    DEFPUSHBUTTON "Annuler", IDCANCEL, 93, 29, 45, 14
    LTEXT "Recherche dans le registre...", IDC_STATIC, 33, 12, 83, 8
 END
-
-/* String Table */
-/*
- *STRINGTABLE
- *BEGIN
- *    ID_HELP_HELPTOPICS "Ouvre l'aide de l'éditeur de registres."
- *    ID_HELP_ABOUT "Affiche de l'information sur le programme, le numéro de version et le copyright."
- *END
- */
--- a/Show More
+++ b/Show More