[reactos] 01/01: [BASE][DLL][ROSAPPS][SCREENSAVERS] Remove deprecated legacy Win16 resource attributes (#7567) - Ros-diffs

22 Dec 2024

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c544a5552892b6312e51…

commit 9c544a5552892b6312e51b4ba95e4afee0ed9406
Author:     Hermès Bélusca-Maïto &lt;hermes.belusca-maito(a)reactos.org&gt;
AuthorDate: Tue Dec 27 20:17:31 2022 +0100
Commit:     Hermès Bélusca-Maïto &lt;hermes.belusca-maito(a)reactos.org&gt;
CommitDate: Sun Dec 22 16:50:14 2024 +0100

    [BASE][DLL][ROSAPPS][SCREENSAVERS] Remove deprecated legacy Win16 resource attributes
(#7567)
    
    - Remove DISCARDABLE attribute.
    - Remove MOVEABLE attribute.
    
    See:
https://learn.microsoft.com/en-us/windows/win32/menurc/common-resource-attr…
    
    3rd-party module rosapps/lib/vfdlib is left unchanged.
---
 base/applications/calc/resource.rc                 |  2 +-
 base/applications/osk/lang/ar-DZ.rc                |  2 +-
 base/applications/osk/lang/cs-CZ.rc                |  2 +-
 base/applications/osk/lang/de-DE.rc                |  2 +-
 base/applications/osk/lang/en-GB.rc                |  2 +-
 base/applications/osk/lang/en-US.rc                |  2 +-
 base/applications/osk/lang/es-ES.rc                |  2 +-
 base/applications/osk/lang/et-EE.rc                |  2 +-
 base/applications/osk/lang/fr-CA.rc                |  2 +-
 base/applications/osk/lang/fr-FR.rc                |  2 +-
 base/applications/osk/lang/he-IL.rc                |  2 +-
 base/applications/osk/lang/id-ID.rc                |  2 +-
 base/applications/osk/lang/it-IT.rc                |  2 +-
 base/applications/osk/lang/pl-PL.rc                |  2 +-
 base/applications/osk/lang/pt-BR.rc                |  2 +-
 base/applications/osk/lang/pt-PT.rc                |  2 +-
 base/applications/osk/lang/ro-RO.rc                |  2 +-
 base/applications/osk/lang/ru-RU.rc                |  2 +-
 base/applications/osk/lang/tr-TR.rc                |  2 +-
 base/applications/osk/lang/zh-CN.rc                |  2 +-
 base/applications/osk/lang/zh-HK.rc                |  2 +-
 base/applications/osk/lang/zh-TW.rc                |  2 +-
 base/applications/screensavers/3dtext/rsrc.rc      |  2 +-
 base/applications/screensavers/logon/logon.rc      |  2 +-
 dll/win32/browseui/lang/bg-BG.rc                   |  2 +-
 dll/win32/browseui/lang/de-DE.rc                   |  2 +-
 dll/win32/browseui/lang/en-US.rc                   |  2 +-
 dll/win32/browseui/lang/es-ES.rc                   |  2 +-
 dll/win32/browseui/lang/et-EE.rc                   |  2 +-
 dll/win32/browseui/lang/eu-ES.rc                   |  2 +-
 dll/win32/browseui/lang/fr-FR.rc                   |  2 +-
 dll/win32/browseui/lang/he-IL.rc                   |  2 +-
 dll/win32/browseui/lang/hi-IN.rc                   |  2 +-
 dll/win32/browseui/lang/hu-HU.rc                   |  2 +-
 dll/win32/browseui/lang/id-ID.rc                   |  2 +-
 dll/win32/browseui/lang/it-IT.rc                   |  2 +-
 dll/win32/browseui/lang/ja-JP.rc                   |  2 +-
 dll/win32/browseui/lang/pl-PL.rc                   |  2 +-
 dll/win32/browseui/lang/pt-BR.rc                   |  2 +-
 dll/win32/browseui/lang/pt-PT.rc                   |  2 +-
 dll/win32/browseui/lang/ro-RO.rc                   |  2 +-
 dll/win32/browseui/lang/ru-RU.rc                   |  2 +-
 dll/win32/browseui/lang/sq-AL.rc                   |  2 +-
 dll/win32/browseui/lang/tr-TR.rc                   |  2 +-
 dll/win32/browseui/lang/uk-UA.rc                   |  2 +-
 dll/win32/browseui/lang/zh-CN.rc                   |  2 +-
 dll/win32/browseui/lang/zh-TW.rc                   |  2 +-
 dll/win32/devmgr/devmgr.rc                         |  2 +-
 dll/win32/devmgr/lang/bg-BG.rc                     |  9 ++++----
 dll/win32/devmgr/lang/cs-CZ.rc                     |  9 ++++----
 dll/win32/devmgr/lang/de-DE.rc                     |  9 ++++----
 dll/win32/devmgr/lang/el-GR.rc                     |  9 ++++----
 dll/win32/devmgr/lang/en-US.rc                     |  9 ++++----
 dll/win32/devmgr/lang/es-ES.rc                     |  9 ++++----
 dll/win32/devmgr/lang/et-EE.rc                     |  9 ++++----
 dll/win32/devmgr/lang/fr-FR.rc                     |  9 ++++----
 dll/win32/devmgr/lang/he-IL.rc                     |  9 ++++----
 dll/win32/devmgr/lang/hu-HU.rc                     |  9 ++++----
 dll/win32/devmgr/lang/id-ID.rc                     |  9 ++++----
 dll/win32/devmgr/lang/it-IT.rc                     |  9 ++++----
 dll/win32/devmgr/lang/ja-JP.rc                     |  9 ++++----
 dll/win32/devmgr/lang/no-NO.rc                     |  9 ++++----
 dll/win32/devmgr/lang/pl-PL.rc                     |  9 ++++----
 dll/win32/devmgr/lang/pt-BR.rc                     |  9 ++++----
 dll/win32/devmgr/lang/pt-PT.rc                     |  8 ++++----
 dll/win32/devmgr/lang/ro-RO.rc                     |  9 ++++----
 dll/win32/devmgr/lang/ru-RU.rc                     |  9 ++++----
 dll/win32/devmgr/lang/sk-SK.rc                     |  9 ++++----
 dll/win32/devmgr/lang/sq-AL.rc                     |  9 ++++----
 dll/win32/devmgr/lang/tr-TR.rc                     |  8 ++++----
 dll/win32/devmgr/lang/uk-UA.rc                     |  9 ++++----
 dll/win32/devmgr/lang/zh-CN.rc                     |  9 ++++----
 dll/win32/devmgr/lang/zh-HK.rc                     |  9 ++++----
 dll/win32/devmgr/lang/zh-TW.rc                     |  9 ++++----
 modules/rosapps/applications/notevil/notevil.rc    | 16 +++++++--------
 .../screensavers/blankscr/lang/bg-BG.rc            |  2 +-
 .../screensavers/blankscr/lang/de-DE.rc            |  2 +-
 .../screensavers/blankscr/lang/en-US.rc            |  2 +-
 .../screensavers/blankscr/lang/es-ES.rc            |  2 +-
 .../screensavers/blankscr/lang/fr-FR.rc            |  2 +-
 .../screensavers/blankscr/lang/it-IT.rc            |  2 +-
 .../screensavers/blankscr/lang/lt-LT.rc            |  2 +-
 .../screensavers/blankscr/lang/nl-NL.rc            |  2 +-
 .../screensavers/blankscr/lang/no-NO.rc            |  2 +-
 .../screensavers/blankscr/lang/pl-PL.rc            |  2 +-
 .../screensavers/blankscr/lang/ro-RO.rc            |  2 +-
 .../screensavers/blankscr/lang/ru-RU.rc            |  2 +-
 .../screensavers/blankscr/lang/sk-SK.rc            |  2 +-
 .../screensavers/blankscr/lang/tr-TR.rc            |  2 +-
 .../screensavers/blankscr/lang/uk-UA.rc            |  2 +-
 .../screensavers/blankscr/lang/zh-CN.rc            |  2 +-
 .../screensavers/blankscr/lang/zh-HK.rc            |  2 +-
 .../screensavers/blankscr/lang/zh-TW.rc            |  2 +-
 .../applications/screensavers/blankscr/scrnsave.rc |  8 ++++----
 .../screensavers/butterflies/butterflies.rc        |  6 +++---
 .../screensavers/butterflies/lang/bg-BG.rc         |  6 +++---
 .../screensavers/butterflies/lang/de-DE.rc         |  6 +++---
 .../screensavers/butterflies/lang/en-US.rc         |  6 +++---
 .../screensavers/butterflies/lang/es-ES.rc         |  6 +++---
 .../screensavers/butterflies/lang/fr-FR.rc         |  6 +++---
 .../screensavers/butterflies/lang/it-IT.rc         |  6 +++---
 .../screensavers/butterflies/lang/lt-LT.rc         |  6 +++---
 .../screensavers/butterflies/lang/no-NO.rc         |  6 +++---
 .../screensavers/butterflies/lang/pl-PL.rc         |  6 +++---
 .../screensavers/butterflies/lang/ro-RO.rc         |  6 +++---
 .../screensavers/butterflies/lang/ru-RU.rc         |  6 +++---
 .../screensavers/butterflies/lang/sk-SK.rc         |  6 +++---
 .../screensavers/butterflies/lang/tr-TR.rc         |  6 +++---
 .../screensavers/butterflies/lang/uk-UA.rc         |  6 +++---
 .../screensavers/butterflies/lang/zh-CN.rc         |  6 +++---
 .../screensavers/butterflies/lang/zh-HK.rc         |  6 +++---
 .../screensavers/butterflies/lang/zh-TW.rc         |  6 +++---
 .../applications/screensavers/circles/circles.rc   |  8 ++++----
 .../screensavers/circles/lang/de-DE.rc             |  2 +-
 .../screensavers/circles/lang/en-US.rc             |  2 +-
 .../screensavers/circles/lang/es-ES.rc             |  2 +-
 .../screensavers/circles/lang/fr-FR.rc             |  2 +-
 .../screensavers/circles/lang/it-IT.rc             |  2 +-
 .../screensavers/circles/lang/no-NO.rc             |  2 +-
 .../screensavers/circles/lang/pl-PL.rc             |  2 +-
 .../screensavers/circles/lang/ro-RO.rc             |  2 +-
 .../screensavers/circles/lang/ru-RU.rc             |  2 +-
 .../screensavers/circles/lang/sk-SK.rc             |  2 +-
 .../screensavers/circles/lang/tr-TR.rc             |  2 +-
 .../screensavers/circles/lang/uk-UA.rc             |  2 +-
 .../screensavers/circles/lang/zh-CN.rc             |  2 +-
 .../screensavers/circles/lang/zh-HK.rc             |  2 +-
 .../screensavers/circles/lang/zh-TW.rc             |  2 +-
 .../applications/screensavers/cylfrac/cylfrac.rc   |  8 ++++----
 .../screensavers/cylfrac/lang/bg-BG.rc             |  2 +-
 .../screensavers/cylfrac/lang/de-DE.rc             |  2 +-
 .../screensavers/cylfrac/lang/en-US.rc             |  2 +-
 .../screensavers/cylfrac/lang/es-ES.rc             |  2 +-
 .../screensavers/cylfrac/lang/fr-FR.rc             |  2 +-
 .../screensavers/cylfrac/lang/it-IT.rc             |  2 +-
 .../screensavers/cylfrac/lang/lt-LT.rc             |  2 +-
 .../screensavers/cylfrac/lang/nl-NL.rc             |  2 +-
 .../screensavers/cylfrac/lang/no-NO.rc             |  2 +-
 .../screensavers/cylfrac/lang/pl-PL.rc             |  2 +-
 .../screensavers/cylfrac/lang/ro-RO.rc             |  2 +-
 .../screensavers/cylfrac/lang/ru-RU.rc             |  2 +-
 .../screensavers/cylfrac/lang/sk-SK.rc             |  2 +-
 .../screensavers/cylfrac/lang/tr-TR.rc             |  2 +-
 .../screensavers/cylfrac/lang/uk-UA.rc             |  2 +-
 .../screensavers/cylfrac/lang/zh-CN.rc             |  2 +-
 .../screensavers/cylfrac/lang/zh-HK.rc             |  2 +-
 .../screensavers/cylfrac/lang/zh-TW.rc             |  2 +-
 .../applications/screensavers/matrix/lang/bg-BG.rc |  4 ++--
 .../applications/screensavers/matrix/lang/de-DE.rc |  4 ++--
 .../applications/screensavers/matrix/lang/en-US.rc |  4 ++--
 .../applications/screensavers/matrix/lang/es-ES.rc |  4 ++--
 .../applications/screensavers/matrix/lang/fr-FR.rc |  4 ++--
 .../applications/screensavers/matrix/lang/lt-LT.rc |  4 ++--
 .../applications/screensavers/matrix/lang/nl-NL.rc |  4 ++--
 .../applications/screensavers/matrix/lang/no-NO.rc |  4 ++--
 .../applications/screensavers/matrix/lang/pl-PL.rc |  4 ++--
 .../applications/screensavers/matrix/lang/ro-RO.rc |  4 ++--
 .../applications/screensavers/matrix/lang/ru-RU.rc |  4 ++--
 .../applications/screensavers/matrix/lang/sk-SK.rc |  4 ++--
 .../applications/screensavers/matrix/lang/th-TH.rc |  4 ++--
 .../applications/screensavers/matrix/lang/tr-TR.rc |  4 ++--
 .../applications/screensavers/matrix/lang/uk-UA.rc |  4 ++--
 .../applications/screensavers/matrix/lang/zh-CN.rc |  4 ++--
 .../applications/screensavers/matrix/lang/zh-HK.rc |  4 ++--
 .../applications/screensavers/matrix/lang/zh-TW.rc |  4 ++--
 .../applications/screensavers/matrix/rsrc.rc       |  6 +++---
 .../screensavers/mazescr/lang/de-DE.rc             |  6 +++---
 .../screensavers/mazescr/lang/en-US.rc             |  6 +++---
 .../screensavers/mazescr/lang/es-ES.rc             |  6 +++---
 .../screensavers/mazescr/lang/pl-PL.rc             |  6 +++---
 .../screensavers/mazescr/lang/ro-RO.rc             |  6 +++---
 .../screensavers/mazescr/lang/ru-RU.rc             |  6 +++---
 .../screensavers/mazescr/lang/tr-TR.rc             |  6 +++---
 .../screensavers/mazescr/lang/zh-CN.rc             |  6 +++---
 .../screensavers/mazescr/lang/zh-HK.rc             |  6 +++---
 .../screensavers/mazescr/lang/zh-TW.rc             |  6 +++---
 .../applications/screensavers/mazescr/maze.rc      |  8 ++++----
 .../screensavers/ssstars/lang/de-DE.rc             |  2 +-
 .../screensavers/ssstars/lang/en-US.rc             |  2 +-
 .../screensavers/ssstars/lang/es-ES.rc             |  2 +-
 .../screensavers/ssstars/lang/it-IT.rc             |  2 +-
 .../screensavers/ssstars/lang/pl-PL.rc             |  2 +-
 .../screensavers/ssstars/lang/ro-RO.rc             |  2 +-
 .../screensavers/ssstars/lang/ru-RU.rc             |  2 +-
 .../screensavers/ssstars/lang/tr-TR.rc             |  2 +-
 .../screensavers/ssstars/lang/zh-CN.rc             |  2 +-
 .../screensavers/ssstars/lang/zh-HK.rc             |  2 +-
 .../screensavers/ssstars/lang/zh-TW.rc             |  2 +-
 .../applications/screensavers/ssstars/resource.rc  |  7 +++----
 .../screensavers/starfield/lang/bg-BG.rc           |  2 +-
 .../screensavers/starfield/lang/de-DE.rc           |  2 +-
 .../screensavers/starfield/lang/en-US.rc           |  2 +-
 .../screensavers/starfield/lang/es-ES.rc           |  2 +-
 .../screensavers/starfield/lang/fr-FR.rc           |  2 +-
 .../screensavers/starfield/lang/it-IT.rc           |  2 +-
 .../screensavers/starfield/lang/lt-LT.rc           |  2 +-
 .../screensavers/starfield/lang/nl-NL.rc           |  2 +-
 .../screensavers/starfield/lang/no-NO.rc           |  2 +-
 .../screensavers/starfield/lang/pl-PL.rc           |  2 +-
 .../screensavers/starfield/lang/ro-RO.rc           |  2 +-
 .../screensavers/starfield/lang/sk-SK.rc           |  2 +-
 .../screensavers/starfield/lang/tr-TR.rc           |  2 +-
 .../screensavers/starfield/lang/uk-UA.rc           |  2 +-
 .../screensavers/starfield/lang/zh-CN.rc           |  2 +-
 .../screensavers/starfield/lang/zh-HK.rc           |  2 +-
 .../screensavers/starfield/lang/zh-TW.rc           |  2 +-
 .../screensavers/starfield/starfield.rc            |  8 ++++----
 modules/rosapps/applications/sysutils/ctm/ctm.rc   |  8 ++++----
 .../applications/sysutils/ctm/lang/de-DE.rc        |  4 ++--
 .../applications/sysutils/ctm/lang/el-GR.rc        |  4 ++--
 .../applications/sysutils/ctm/lang/en-US.rc        |  4 ++--
 .../applications/sysutils/ctm/lang/es-ES.rc        |  4 ++--
 .../applications/sysutils/ctm/lang/fr-FR.rc        |  4 ++--
 .../applications/sysutils/ctm/lang/no-NO.rc        |  4 ++--
 .../applications/sysutils/ctm/lang/pl-PL.rc        |  4 ++--
 .../applications/sysutils/ctm/lang/ro-RO.rc        |  6 ++----
 .../applications/sysutils/ctm/lang/ru-RU.rc        |  2 +-
 .../applications/sysutils/ctm/lang/uk-UA.rc        |  4 ++--
 .../applications/sysutils/ctm/lang/zh-TW.rc        |  2 +-
 .../applications/sysutils/systeminfo/lang/de-DE.rc |  2 +-
 .../applications/sysutils/systeminfo/lang/en-US.rc |  2 +-
 .../applications/sysutils/systeminfo/lang/es-ES.rc |  2 +-
 .../applications/sysutils/systeminfo/lang/fr-FR.rc |  2 +-
 .../applications/sysutils/systeminfo/lang/it-IT.rc |  2 +-
 .../applications/sysutils/systeminfo/lang/no-NO.rc |  2 +-
 .../applications/sysutils/systeminfo/lang/pl-PL.rc |  2 +-
 .../applications/sysutils/systeminfo/lang/ro-RO.rc |  2 +-
 .../applications/sysutils/systeminfo/lang/ru-RU.rc |  2 +-
 .../applications/sysutils/systeminfo/lang/sk-SK.rc |  2 +-
 .../applications/sysutils/systeminfo/lang/tr-TR.rc |  2 +-
 .../applications/sysutils/systeminfo/lang/uk-UA.rc |  2 +-
 .../applications/sysutils/systeminfo/lang/zh-CN.rc |  2 +-
 .../applications/sysutils/systeminfo/lang/zh-TW.rc |  2 +-
 modules/rosapps/demos/maze/maze.rc                 |  2 +-
 modules/rosapps/templates/dialog/dialog.rc         | 14 ++++++-------
 modules/rosapps/templates/mdi/mdi.rc               | 24 +++++++++++-----------
 .../rosapps/templates/old_wordpad/lang/bg-BG.rc    |  8 ++++----
 .../rosapps/templates/old_wordpad/lang/de-DE.rc    |  8 ++++----
 .../rosapps/templates/old_wordpad/lang/el-GR.rc    |  8 ++++----
 .../rosapps/templates/old_wordpad/lang/en-US.rc    |  8 ++++----
 .../rosapps/templates/old_wordpad/lang/fi-FI.rc    |  8 ++++----
 .../rosapps/templates/old_wordpad/lang/fr-FR.rc    |  8 ++++----
 .../rosapps/templates/old_wordpad/lang/it-IT.rc    |  8 ++++----
 .../rosapps/templates/old_wordpad/lang/nl-NL.rc    |  8 ++++----
 .../rosapps/templates/old_wordpad/lang/no-NO.rc    |  8 ++++----
 .../rosapps/templates/old_wordpad/lang/pl-PL.rc    |  8 ++++----
 .../rosapps/templates/old_wordpad/lang/ru-RU.rc    |  8 ++++----
 .../rosapps/templates/old_wordpad/lang/th-TH.rc    |  8 ++++----
 .../rosapps/templates/old_wordpad/lang/uk-UA.rc    |  8 ++++----
 .../rosapps/templates/old_wordpad/lang/zh-CN.rc    |  8 ++++----
 modules/rosapps/templates/old_wordpad/rsrc.rc      |  4 ++--
 251 files changed, 525 insertions(+), 504 deletions(-)

diff --git a/base/applications/calc/resource.rc b/base/applications/calc/resource.rc
index d756a6687fc..e09c4d9d2c5 100644
--- a/base/applications/calc/resource.rc
+++ b/base/applications/calc/resource.rc
@@ -28,7 +28,7 @@
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 /* Icons */
-IDI_CALC ICON DISCARDABLE "res/calc.ico"
+IDI_CALC ICON "res/calc.ico"
 
 /* Manifest */
 #include <reactos/manifest_exe.rc>
diff --git a/base/applications/osk/lang/ar-DZ.rc b/base/applications/osk/lang/ar-DZ.rc
index 458a7dd2645..cbffe396285 100644
--- a/base/applications/osk/lang/ar-DZ.rc
+++ b/base/applications/osk/lang/ar-DZ.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_ARABIC, SUBLANG_DEFAULT
 
-IDR_OSK_MENU MENU DISCARDABLE
+IDR_OSK_MENU MENU
 BEGIN
     POPUP "File"
     BEGIN
diff --git a/base/applications/osk/lang/cs-CZ.rc b/base/applications/osk/lang/cs-CZ.rc
index b6b45b3eb44..e45f2601ca0 100644
--- a/base/applications/osk/lang/cs-CZ.rc
+++ b/base/applications/osk/lang/cs-CZ.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
-IDR_OSK_MENU MENU DISCARDABLE
+IDR_OSK_MENU MENU
 BEGIN
     POPUP "File"
     BEGIN
diff --git a/base/applications/osk/lang/de-DE.rc b/base/applications/osk/lang/de-DE.rc
index 357de8326bc..12b5351c0c6 100644
--- a/base/applications/osk/lang/de-DE.rc
+++ b/base/applications/osk/lang/de-DE.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
-IDR_OSK_MENU MENU DISCARDABLE
+IDR_OSK_MENU MENU
 BEGIN
     POPUP "Datei"
     BEGIN
diff --git a/base/applications/osk/lang/en-GB.rc b/base/applications/osk/lang/en-GB.rc
index 7f9fd716a9b..ddbc7208904 100644
--- a/base/applications/osk/lang/en-GB.rc
+++ b/base/applications/osk/lang/en-GB.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
 
-IDR_OSK_MENU MENU DISCARDABLE
+IDR_OSK_MENU MENU
 BEGIN
     POPUP "File"
     BEGIN
diff --git a/base/applications/osk/lang/en-US.rc b/base/applications/osk/lang/en-US.rc
index 2a6f9c54331..2a03dcf8a68 100644
--- a/base/applications/osk/lang/en-US.rc
+++ b/base/applications/osk/lang/en-US.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
-IDR_OSK_MENU MENU DISCARDABLE
+IDR_OSK_MENU MENU
 BEGIN
     POPUP "File"
     BEGIN
diff --git a/base/applications/osk/lang/es-ES.rc b/base/applications/osk/lang/es-ES.rc
index 0b44094337d..0589661bb6f 100644
--- a/base/applications/osk/lang/es-ES.rc
+++ b/base/applications/osk/lang/es-ES.rc
@@ -10,7 +10,7 @@
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
-IDR_OSK_MENU MENU DISCARDABLE
+IDR_OSK_MENU MENU
 BEGIN
     POPUP "Archivo"
     BEGIN
diff --git a/base/applications/osk/lang/et-EE.rc b/base/applications/osk/lang/et-EE.rc
index 1d1e85110a2..91865d180fc 100644
--- a/base/applications/osk/lang/et-EE.rc
+++ b/base/applications/osk/lang/et-EE.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT
 
-IDR_OSK_MENU MENU DISCARDABLE
+IDR_OSK_MENU MENU
 BEGIN
     POPUP "File"
     BEGIN
diff --git a/base/applications/osk/lang/fr-CA.rc b/base/applications/osk/lang/fr-CA.rc
index 74801b5c33e..a735ddc1be2 100644
--- a/base/applications/osk/lang/fr-CA.rc
+++ b/base/applications/osk/lang/fr-CA.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_CANADIAN
 
-IDR_OSK_MENU MENU DISCARDABLE
+IDR_OSK_MENU MENU
 BEGIN
     POPUP "File"
     BEGIN
diff --git a/base/applications/osk/lang/fr-FR.rc b/base/applications/osk/lang/fr-FR.rc
index fecb5285be3..0119b1b035d 100644
--- a/base/applications/osk/lang/fr-FR.rc
+++ b/base/applications/osk/lang/fr-FR.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
-IDR_OSK_MENU MENU DISCARDABLE
+IDR_OSK_MENU MENU
 BEGIN
     POPUP "File"
     BEGIN
diff --git a/base/applications/osk/lang/he-IL.rc b/base/applications/osk/lang/he-IL.rc
index f831262f503..171541faf3a 100644
--- a/base/applications/osk/lang/he-IL.rc
+++ b/base/applications/osk/lang/he-IL.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 
-IDR_OSK_MENU MENU DISCARDABLE
+IDR_OSK_MENU MENU
 BEGIN
     POPUP "File"
     BEGIN
diff --git a/base/applications/osk/lang/id-ID.rc b/base/applications/osk/lang/id-ID.rc
index ae174e1705e..21ac9aebffd 100644
--- a/base/applications/osk/lang/id-ID.rc
+++ b/base/applications/osk/lang/id-ID.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT
 
-IDR_OSK_MENU MENU DISCARDABLE
+IDR_OSK_MENU MENU
 BEGIN
     POPUP "Be&rkas"
     BEGIN
diff --git a/base/applications/osk/lang/it-IT.rc b/base/applications/osk/lang/it-IT.rc
index 1f449cab0f4..199d71409cd 100644
--- a/base/applications/osk/lang/it-IT.rc
+++ b/base/applications/osk/lang/it-IT.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
-IDR_OSK_MENU MENU DISCARDABLE
+IDR_OSK_MENU MENU
 BEGIN
     POPUP "File"
     BEGIN
diff --git a/base/applications/osk/lang/pl-PL.rc b/base/applications/osk/lang/pl-PL.rc
index fb584a41db1..0eb01f95bd0 100644
--- a/base/applications/osk/lang/pl-PL.rc
+++ b/base/applications/osk/lang/pl-PL.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL
 
-IDR_OSK_MENU MENU DISCARDABLE
+IDR_OSK_MENU MENU
 BEGIN
     POPUP "Pl&ik"
     BEGIN
diff --git a/base/applications/osk/lang/pt-BR.rc b/base/applications/osk/lang/pt-BR.rc
index f49446e288f..c1e6b4ea211 100644
--- a/base/applications/osk/lang/pt-BR.rc
+++ b/base/applications/osk/lang/pt-BR.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
-IDR_OSK_MENU MENU DISCARDABLE
+IDR_OSK_MENU MENU
 BEGIN
     POPUP "Arquivo"
     BEGIN
diff --git a/base/applications/osk/lang/pt-PT.rc b/base/applications/osk/lang/pt-PT.rc
index 71b5c1511de..661b0e8d20b 100644
--- a/base/applications/osk/lang/pt-PT.rc
+++ b/base/applications/osk/lang/pt-PT.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
-IDR_OSK_MENU MENU DISCARDABLE
+IDR_OSK_MENU MENU
 BEGIN
     POPUP "Ficheiro"
     BEGIN
diff --git a/base/applications/osk/lang/ro-RO.rc b/base/applications/osk/lang/ro-RO.rc
index afbe9a5fbe9..1ae967695e2 100644
--- a/base/applications/osk/lang/ro-RO.rc
+++ b/base/applications/osk/lang/ro-RO.rc
@@ -9,7 +9,7 @@
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT
 
-IDR_OSK_MENU MENU DISCARDABLE
+IDR_OSK_MENU MENU
 BEGIN
     POPUP "&Fişier"
     BEGIN
diff --git a/base/applications/osk/lang/ru-RU.rc b/base/applications/osk/lang/ru-RU.rc
index 7befd7e17de..cde6662f10b 100644
--- a/base/applications/osk/lang/ru-RU.rc
+++ b/base/applications/osk/lang/ru-RU.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL
 
-IDR_OSK_MENU MENU DISCARDABLE
+IDR_OSK_MENU MENU
 BEGIN
     POPUP "Файл"
     BEGIN
diff --git a/base/applications/osk/lang/tr-TR.rc b/base/applications/osk/lang/tr-TR.rc
index ca27a1913b6..8769db40a7b 100644
--- a/base/applications/osk/lang/tr-TR.rc
+++ b/base/applications/osk/lang/tr-TR.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
-IDR_OSK_MENU MENU DISCARDABLE
+IDR_OSK_MENU MENU
 BEGIN
     POPUP "Dosya"
     BEGIN
diff --git a/base/applications/osk/lang/zh-CN.rc b/base/applications/osk/lang/zh-CN.rc
index 079b76f8f7a..58bad345027 100644
--- a/base/applications/osk/lang/zh-CN.rc
+++ b/base/applications/osk/lang/zh-CN.rc
@@ -12,7 +12,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
-IDR_OSK_MENU MENU DISCARDABLE
+IDR_OSK_MENU MENU
 BEGIN
     POPUP "文件"
     BEGIN
diff --git a/base/applications/osk/lang/zh-HK.rc b/base/applications/osk/lang/zh-HK.rc
index 21804221f95..b02047533e5 100644
--- a/base/applications/osk/lang/zh-HK.rc
+++ b/base/applications/osk/lang/zh-HK.rc
@@ -9,7 +9,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG
 
-IDR_OSK_MENU MENU DISCARDABLE
+IDR_OSK_MENU MENU
 BEGIN
     POPUP "檔案"
     BEGIN
diff --git a/base/applications/osk/lang/zh-TW.rc b/base/applications/osk/lang/zh-TW.rc
index 4ebb07cba09..ba0c24ed686 100644
--- a/base/applications/osk/lang/zh-TW.rc
+++ b/base/applications/osk/lang/zh-TW.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 
-IDR_OSK_MENU MENU DISCARDABLE
+IDR_OSK_MENU MENU
 BEGIN
     POPUP "檔案"
     BEGIN
diff --git a/base/applications/screensavers/3dtext/rsrc.rc
b/base/applications/screensavers/3dtext/rsrc.rc
index f0550ade8fe..1417b27763a 100644
--- a/base/applications/screensavers/3dtext/rsrc.rc
+++ b/base/applications/screensavers/3dtext/rsrc.rc
@@ -6,7 +6,7 @@
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
-IDI_ICON  ICON  DISCARDABLE  "res/icon_3dtext.ico"
+IDI_ICON ICON "res/icon_3dtext.ico"
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION  "OpenGL 3DText ScreenSaver"
diff --git a/base/applications/screensavers/logon/logon.rc
b/base/applications/screensavers/logon/logon.rc
index 710bb93ec0a..061340fd299 100644
--- a/base/applications/screensavers/logon/logon.rc
+++ b/base/applications/screensavers/logon/logon.rc
@@ -6,7 +6,7 @@
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
-IDI_ICON  ICON  DISCARDABLE  "res/icon_logon.ico"
+IDI_ICON ICON "res/icon_logon.ico"
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION  "ReactOS Logon ScreenSaver"
diff --git a/dll/win32/browseui/lang/bg-BG.rc b/dll/win32/browseui/lang/bg-BG.rc
index 37dbe925083..86e95224f7b 100644
--- a/dll/win32/browseui/lang/bg-BG.rc
+++ b/dll/win32/browseui/lang/bg-BG.rc
@@ -93,7 +93,7 @@ BEGIN
     MENUITEM "&Close Toolbar", IDM_BAND_CLOSE
 END
 
-IDM_POPUPMENU MENUEX DISCARDABLE
+IDM_POPUPMENU MENUEX
 BEGIN
     POPUP ""
     BEGIN
diff --git a/dll/win32/browseui/lang/de-DE.rc b/dll/win32/browseui/lang/de-DE.rc
index 825dc9b7962..754346eac2a 100644
--- a/dll/win32/browseui/lang/de-DE.rc
+++ b/dll/win32/browseui/lang/de-DE.rc
@@ -100,7 +100,7 @@ BEGIN
     MENUITEM "Symbolleiste schließen", IDM_BAND_CLOSE
 END
 
-IDM_POPUPMENU MENUEX DISCARDABLE
+IDM_POPUPMENU MENUEX
 BEGIN
     POPUP ""
     BEGIN
diff --git a/dll/win32/browseui/lang/en-US.rc b/dll/win32/browseui/lang/en-US.rc
index 64098afe576..b67218b1788 100644
--- a/dll/win32/browseui/lang/en-US.rc
+++ b/dll/win32/browseui/lang/en-US.rc
@@ -111,7 +111,7 @@ BEGIN
     MENUITEM "&Close Toolbar", IDM_BAND_CLOSE
 END
 
-IDM_POPUPMENU MENUEX DISCARDABLE
+IDM_POPUPMENU MENUEX
 BEGIN
     POPUP ""
     BEGIN
diff --git a/dll/win32/browseui/lang/es-ES.rc b/dll/win32/browseui/lang/es-ES.rc
index 567ff90a0bc..8c05bb82062 100644
--- a/dll/win32/browseui/lang/es-ES.rc
+++ b/dll/win32/browseui/lang/es-ES.rc
@@ -102,7 +102,7 @@ BEGIN
     MENUITEM "&Cerrar barra de herramientas", IDM_BAND_CLOSE
 END
 
-IDM_POPUPMENU MENUEX DISCARDABLE
+IDM_POPUPMENU MENUEX
 BEGIN
     POPUP ""
     BEGIN
diff --git a/dll/win32/browseui/lang/et-EE.rc b/dll/win32/browseui/lang/et-EE.rc
index 3cd0d001535..5ca6ab485de 100644
--- a/dll/win32/browseui/lang/et-EE.rc
+++ b/dll/win32/browseui/lang/et-EE.rc
@@ -100,7 +100,7 @@ BEGIN
     MENUITEM "&Sule tööriistariba", IDM_BAND_CLOSE
 END
 
-IDM_POPUPMENU MENUEX DISCARDABLE
+IDM_POPUPMENU MENUEX
 BEGIN
     POPUP ""
     BEGIN
diff --git a/dll/win32/browseui/lang/eu-ES.rc b/dll/win32/browseui/lang/eu-ES.rc
index 19aa87830de..503a1abe907 100644
--- a/dll/win32/browseui/lang/eu-ES.rc
+++ b/dll/win32/browseui/lang/eu-ES.rc
@@ -100,7 +100,7 @@ BEGIN
     MENUITEM "&Cerrar barra de herramientas", IDM_BAND_CLOSE
 END
 
-IDM_POPUPMENU MENUEX DISCARDABLE
+IDM_POPUPMENU MENUEX
 BEGIN
     POPUP ""
     BEGIN
diff --git a/dll/win32/browseui/lang/fr-FR.rc b/dll/win32/browseui/lang/fr-FR.rc
index 63dd8eb93b7..4a40987c50d 100644
--- a/dll/win32/browseui/lang/fr-FR.rc
+++ b/dll/win32/browseui/lang/fr-FR.rc
@@ -111,7 +111,7 @@ BEGIN
     MENUITEM "&Fermer la barre d'outils", IDM_BAND_CLOSE
 END
 
-IDM_POPUPMENU MENUEX DISCARDABLE
+IDM_POPUPMENU MENUEX
 BEGIN
     POPUP ""
     BEGIN
diff --git a/dll/win32/browseui/lang/he-IL.rc b/dll/win32/browseui/lang/he-IL.rc
index 30c0a9c8f5c..062f166c007 100644
--- a/dll/win32/browseui/lang/he-IL.rc
+++ b/dll/win32/browseui/lang/he-IL.rc
@@ -95,7 +95,7 @@ BEGIN
     MENUITEM "&Close Toolbar", IDM_BAND_CLOSE
 END
 
-IDM_POPUPMENU MENUEX DISCARDABLE
+IDM_POPUPMENU MENUEX
 BEGIN
     POPUP ""
     BEGIN
diff --git a/dll/win32/browseui/lang/hi-IN.rc b/dll/win32/browseui/lang/hi-IN.rc
index a26363efd33..d93d138dd71 100644
--- a/dll/win32/browseui/lang/hi-IN.rc
+++ b/dll/win32/browseui/lang/hi-IN.rc
@@ -93,7 +93,7 @@ BEGIN
     MENUITEM "टूलबार &बंद करें", IDM_BAND_CLOSE
 END
 
-IDM_POPUPMENU MENUEX DISCARDABLE
+IDM_POPUPMENU MENUEX
 BEGIN
     POPUP ""
     BEGIN
diff --git a/dll/win32/browseui/lang/hu-HU.rc b/dll/win32/browseui/lang/hu-HU.rc
index 463c43710a6..8448a3c5b3c 100644
--- a/dll/win32/browseui/lang/hu-HU.rc
+++ b/dll/win32/browseui/lang/hu-HU.rc
@@ -111,7 +111,7 @@ BEGIN
     MENUITEM "Az eszköztár &bezárása", IDM_BAND_CLOSE
 END
 
-IDM_POPUPMENU MENUEX DISCARDABLE
+IDM_POPUPMENU MENUEX
 BEGIN
     POPUP ""
     BEGIN
diff --git a/dll/win32/browseui/lang/id-ID.rc b/dll/win32/browseui/lang/id-ID.rc
index c1d397fd70f..9a9140a8d50 100644
--- a/dll/win32/browseui/lang/id-ID.rc
+++ b/dll/win32/browseui/lang/id-ID.rc
@@ -112,7 +112,7 @@ BEGIN
     MENUITEM "&Tutup Bilah Alat", IDM_BAND_CLOSE
 END
 
-IDM_POPUPMENU MENUEX DISCARDABLE
+IDM_POPUPMENU MENUEX
 BEGIN
     POPUP ""
     BEGIN
diff --git a/dll/win32/browseui/lang/it-IT.rc b/dll/win32/browseui/lang/it-IT.rc
index dd9c906df15..02def76b811 100644
--- a/dll/win32/browseui/lang/it-IT.rc
+++ b/dll/win32/browseui/lang/it-IT.rc
@@ -93,7 +93,7 @@ BEGIN
     MENUITEM "&Chiudi barra degli strumenti", IDM_BAND_CLOSE
 END
 
-IDM_POPUPMENU MENUEX DISCARDABLE
+IDM_POPUPMENU MENUEX
 BEGIN
     POPUP ""
     BEGIN
diff --git a/dll/win32/browseui/lang/ja-JP.rc b/dll/win32/browseui/lang/ja-JP.rc
index ea4f0583ea7..232cf3d2873 100644
--- a/dll/win32/browseui/lang/ja-JP.rc
+++ b/dll/win32/browseui/lang/ja-JP.rc
@@ -111,7 +111,7 @@ BEGIN
     MENUITEM "ツールバーを閉じる(&C)", IDM_BAND_CLOSE
 END
 
-IDM_POPUPMENU MENUEX DISCARDABLE
+IDM_POPUPMENU MENUEX
 BEGIN
     POPUP ""
     BEGIN
diff --git a/dll/win32/browseui/lang/pl-PL.rc b/dll/win32/browseui/lang/pl-PL.rc
index f7526430f54..e0775bc16e3 100644
--- a/dll/win32/browseui/lang/pl-PL.rc
+++ b/dll/win32/browseui/lang/pl-PL.rc
@@ -102,7 +102,7 @@ BEGIN
     MENUITEM "&Zamknij pasek narzędzi", IDM_BAND_CLOSE
 END
 
-IDM_POPUPMENU MENUEX DISCARDABLE
+IDM_POPUPMENU MENUEX
 BEGIN
     POPUP ""
     BEGIN
diff --git a/dll/win32/browseui/lang/pt-BR.rc b/dll/win32/browseui/lang/pt-BR.rc
index 1a49d763777..492b13149a5 100644
--- a/dll/win32/browseui/lang/pt-BR.rc
+++ b/dll/win32/browseui/lang/pt-BR.rc
@@ -95,7 +95,7 @@ BEGIN
     MENUITEM "&Close Toolbar", IDM_BAND_CLOSE
 END
 
-IDM_POPUPMENU MENUEX DISCARDABLE
+IDM_POPUPMENU MENUEX
 BEGIN
     POPUP ""
     BEGIN
diff --git a/dll/win32/browseui/lang/pt-PT.rc b/dll/win32/browseui/lang/pt-PT.rc
index 2e1cd2c708a..ff548d3061b 100644
--- a/dll/win32/browseui/lang/pt-PT.rc
+++ b/dll/win32/browseui/lang/pt-PT.rc
@@ -101,7 +101,7 @@ BEGIN
     MENUITEM "&Fechar barra de ferramentas", IDM_BAND_CLOSE
 END
 
-IDM_POPUPMENU MENUEX DISCARDABLE
+IDM_POPUPMENU MENUEX
 BEGIN
     POPUP ""
     BEGIN
diff --git a/dll/win32/browseui/lang/ro-RO.rc b/dll/win32/browseui/lang/ro-RO.rc
index 3ce2a8fa364..6066a75a76d 100644
--- a/dll/win32/browseui/lang/ro-RO.rc
+++ b/dll/win32/browseui/lang/ro-RO.rc
@@ -101,7 +101,7 @@ BEGIN
     MENUITEM "As&cunde bara de instrumente", IDM_BAND_CLOSE
 END
 
-IDM_POPUPMENU MENUEX DISCARDABLE
+IDM_POPUPMENU MENUEX
 BEGIN
     POPUP ""
     BEGIN
diff --git a/dll/win32/browseui/lang/ru-RU.rc b/dll/win32/browseui/lang/ru-RU.rc
index c4eeffd39e9..3adf8d0343a 100644
--- a/dll/win32/browseui/lang/ru-RU.rc
+++ b/dll/win32/browseui/lang/ru-RU.rc
@@ -102,7 +102,7 @@ BEGIN
     MENUITEM "&Закрыть панель инструментов", IDM_BAND_CLOSE
 END
 
-IDM_POPUPMENU MENUEX DISCARDABLE
+IDM_POPUPMENU MENUEX
 BEGIN
     POPUP ""
     BEGIN
diff --git a/dll/win32/browseui/lang/sq-AL.rc b/dll/win32/browseui/lang/sq-AL.rc
index 0298e254089..de25625bc38 100644
--- a/dll/win32/browseui/lang/sq-AL.rc
+++ b/dll/win32/browseui/lang/sq-AL.rc
@@ -112,7 +112,7 @@ BEGIN
     MENUITEM "&Close Toolbar", IDM_BAND_CLOSE
 END
 
-IDM_POPUPMENU MENUEX DISCARDABLE
+IDM_POPUPMENU MENUEX
 BEGIN
     POPUP ""
     BEGIN
diff --git a/dll/win32/browseui/lang/tr-TR.rc b/dll/win32/browseui/lang/tr-TR.rc
index 71039340ddd..8fd35da1e57 100644
--- a/dll/win32/browseui/lang/tr-TR.rc
+++ b/dll/win32/browseui/lang/tr-TR.rc
@@ -95,7 +95,7 @@ BEGIN
     MENUITEM "&Araç Çubuğunu Kapat", IDM_BAND_CLOSE
 END
 
-IDM_POPUPMENU MENUEX DISCARDABLE
+IDM_POPUPMENU MENUEX
 BEGIN
     POPUP ""
     BEGIN
diff --git a/dll/win32/browseui/lang/uk-UA.rc b/dll/win32/browseui/lang/uk-UA.rc
index a5dc172200c..8da603d91f5 100644
--- a/dll/win32/browseui/lang/uk-UA.rc
+++ b/dll/win32/browseui/lang/uk-UA.rc
@@ -101,7 +101,7 @@ BEGIN
     MENUITEM "&Закрити панель", IDM_BAND_CLOSE
 END
 
-IDM_POPUPMENU MENUEX DISCARDABLE
+IDM_POPUPMENU MENUEX
 BEGIN
     POPUP ""
     BEGIN
diff --git a/dll/win32/browseui/lang/zh-CN.rc b/dll/win32/browseui/lang/zh-CN.rc
index 86c1ca80181..51434d0c6af 100644
--- a/dll/win32/browseui/lang/zh-CN.rc
+++ b/dll/win32/browseui/lang/zh-CN.rc
@@ -115,7 +115,7 @@ BEGIN
     MENUITEM "关闭工具栏(&C)", IDM_BAND_CLOSE
 END
 
-IDM_POPUPMENU MENUEX DISCARDABLE
+IDM_POPUPMENU MENUEX
 BEGIN
     POPUP ""
     BEGIN
diff --git a/dll/win32/browseui/lang/zh-TW.rc b/dll/win32/browseui/lang/zh-TW.rc
index 15665202889..1c234785f1c 100644
--- a/dll/win32/browseui/lang/zh-TW.rc
+++ b/dll/win32/browseui/lang/zh-TW.rc
@@ -117,7 +117,7 @@ BEGIN
     MENUITEM "選擇工具列(&C)", IDM_BAND_CLOSE
 END
 
-IDM_POPUPMENU MENUEX DISCARDABLE
+IDM_POPUPMENU MENUEX
 BEGIN
     POPUP ""
     BEGIN
diff --git a/dll/win32/devmgr/devmgr.rc b/dll/win32/devmgr/devmgr.rc
index ac4f33ea7ec..c338d67878e 100644
--- a/dll/win32/devmgr/devmgr.rc
+++ b/dll/win32/devmgr/devmgr.rc
@@ -18,7 +18,7 @@ IDI_MAIN_ICON   ICON    "resources/computer.ico"
 IDB_ROOT_IMAGE  BITMAP  "resources/root.bmp"
 
 /* main toolbar icons */
-IDB_TOOLBAR    BITMAP DISCARDABLE "resources/toolbar.bmp"
+IDB_TOOLBAR     BITMAP  "resources/toolbar.bmp"
 
 
 /* UTF-8 */
diff --git a/dll/win32/devmgr/lang/bg-BG.rc b/dll/win32/devmgr/lang/bg-BG.rc
index 7fc1b01d60b..d421c69316c 100644
--- a/dll/win32/devmgr/lang/bg-BG.rc
+++ b/dll/win32/devmgr/lang/bg-BG.rc
@@ -286,14 +286,15 @@ BEGIN
 END
 
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_APPNAME               "ReactOS Device Manager"
   IDS_APP_AUTHORS           "Copyright 2015 Ged Murphy"
   IDS_CONFIRM_DISABLE       "Disabling this device will cause it to stop
functioning.\nDo you really want to disable it?"
   IDS_CONFIRM_UNINSTALL     "Warning: You are about to uninstall this device from
your system.\nDo you want to continue?"
 END
-STRINGTABLE DISCARDABLE
+
+STRINGTABLE
 BEGIN
   IDS_MENU_UPDATE           "Update driver software..."
   IDS_MENU_ENABLE           "Enable"
@@ -304,7 +305,7 @@ BEGIN
   IDS_MENU_PROPERTIES       "Properties"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_TOOLTIP_PROPERTIES    "Properties"
   IDS_TOOLTIP_SCAN          "Scan for hardware changes"
@@ -315,7 +316,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_HINT_BLANK        " "
   IDS_HINT_PROPERTIES   " Open property dialog for the current selection."
diff --git a/dll/win32/devmgr/lang/cs-CZ.rc b/dll/win32/devmgr/lang/cs-CZ.rc
index eac630946e4..2f0afd87efa 100644
--- a/dll/win32/devmgr/lang/cs-CZ.rc
+++ b/dll/win32/devmgr/lang/cs-CZ.rc
@@ -290,14 +290,15 @@ BEGIN
 END
 
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_APPNAME               "Správce zařízení ReactOS"
   IDS_APP_AUTHORS           "Copyright 2015 Ged Murphy"
   IDS_CONFIRM_DISABLE       "Zakázáním tohoto zařízení dojde k ukončení jeho
činnosti.\nOpravdu si jej přejete zakázat?"
   IDS_CONFIRM_UNINSTALL     "Varování: Chystáte se odebrat toto zařízení ze
systému.\nPřejete si pokračovat?"
 END
-STRINGTABLE DISCARDABLE
+
+STRINGTABLE
 BEGIN
   IDS_MENU_UPDATE           "Aktualizovat software ovladače..."
   IDS_MENU_ENABLE           "Povolit"
@@ -308,7 +309,7 @@ BEGIN
   IDS_MENU_PROPERTIES       "Vlastnosti"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_TOOLTIP_PROPERTIES    "Vlastnosti"
   IDS_TOOLTIP_SCAN          "Vyhledat změny hardwaru"
@@ -319,7 +320,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_HINT_BLANK        " "
   IDS_HINT_PROPERTIES   " Otevře seznam vlastností pro vybrané zařízení."
diff --git a/dll/win32/devmgr/lang/de-DE.rc b/dll/win32/devmgr/lang/de-DE.rc
index 1e341dcc2a0..4d9ab577215 100644
--- a/dll/win32/devmgr/lang/de-DE.rc
+++ b/dll/win32/devmgr/lang/de-DE.rc
@@ -286,14 +286,15 @@ BEGIN
 END
 
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_APPNAME               "ReactOS Geräte-Manager"
   IDS_APP_AUTHORS           "Copyright 2015 Ged Murphy"
   IDS_CONFIRM_DISABLE       "Dieses Gerät zu deaktivieren wird dessen Funktion
einstellen.\nWollen Sie es wirklich deaktivieren?"
   IDS_CONFIRM_UNINSTALL     "Warnung: Sie sind dabei, dieses Gerät
deinstallieren\nMöchten Sie den Vorgang fortsetzen?"
 END
-STRINGTABLE DISCARDABLE
+
+STRINGTABLE
 BEGIN
   IDS_MENU_UPDATE           "Treibersoftware aktualisieren ..."
   IDS_MENU_ENABLE           "Aktivieren"
@@ -304,7 +305,7 @@ BEGIN
   IDS_MENU_PROPERTIES       "Eigenschaften"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_TOOLTIP_PROPERTIES    "Eigenschaften"
   IDS_TOOLTIP_SCAN          "Nach geänderter Hardware suchen"
@@ -315,7 +316,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_HINT_BLANK        " "
   IDS_HINT_PROPERTIES   " Öffnet Eigenschaftsdialog für die aktuelle
Auswahl."
diff --git a/dll/win32/devmgr/lang/el-GR.rc b/dll/win32/devmgr/lang/el-GR.rc
index c6b70a7b3ae..8e1e00c476c 100644
--- a/dll/win32/devmgr/lang/el-GR.rc
+++ b/dll/win32/devmgr/lang/el-GR.rc
@@ -287,14 +287,15 @@ BEGIN
 END
 
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_APPNAME               "ReactOS Device Manager"
   IDS_APP_AUTHORS           "Copyright 2015 Ged Murphy"
   IDS_CONFIRM_DISABLE       "Disabling this device will cause it to stop
functioning.\nDo you really want to disable it?"
   IDS_CONFIRM_UNINSTALL     "Warning: You are about to uninstall this device from
your system.\nDo you want to continue?"
 END
-STRINGTABLE DISCARDABLE
+
+STRINGTABLE
 BEGIN
   IDS_MENU_UPDATE           "Update driver software..."
   IDS_MENU_ENABLE           "Enable"
@@ -305,7 +306,7 @@ BEGIN
   IDS_MENU_PROPERTIES       "Properties"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_TOOLTIP_PROPERTIES    "Properties"
   IDS_TOOLTIP_SCAN          "Scan for hardware changes"
@@ -316,7 +317,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_HINT_BLANK        " "
   IDS_HINT_PROPERTIES   " Open property dialog for the current selection."
diff --git a/dll/win32/devmgr/lang/en-US.rc b/dll/win32/devmgr/lang/en-US.rc
index c2da4b467ce..530d735a414 100644
--- a/dll/win32/devmgr/lang/en-US.rc
+++ b/dll/win32/devmgr/lang/en-US.rc
@@ -285,14 +285,15 @@ BEGIN
 END
 
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_APPNAME               "ReactOS Device Manager"
   IDS_APP_AUTHORS           "Copyright 2015 Ged Murphy"
   IDS_CONFIRM_DISABLE       "Disabling this device will cause it to stop
functioning.\nDo you really want to disable it?"
   IDS_CONFIRM_UNINSTALL     "Warning: You are about to uninstall this device from
your system.\nDo you want to continue?"
 END
-STRINGTABLE DISCARDABLE
+
+STRINGTABLE
 BEGIN
   IDS_MENU_UPDATE           "Update driver software..."
   IDS_MENU_ENABLE           "Enable"
@@ -303,7 +304,7 @@ BEGIN
   IDS_MENU_PROPERTIES       "Properties"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_TOOLTIP_PROPERTIES    "Properties"
   IDS_TOOLTIP_SCAN          "Scan for hardware changes"
@@ -314,7 +315,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_HINT_BLANK        " "
   IDS_HINT_PROPERTIES   " Open property dialog for the current selection."
diff --git a/dll/win32/devmgr/lang/es-ES.rc b/dll/win32/devmgr/lang/es-ES.rc
index 41b898b2dbb..3a9cf882a20 100644
--- a/dll/win32/devmgr/lang/es-ES.rc
+++ b/dll/win32/devmgr/lang/es-ES.rc
@@ -294,14 +294,15 @@ BEGIN
 END
 
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_APPNAME               "Administrador de dispositivos de ReactOS"
   IDS_APP_AUTHORS           "Copyright 2015 Ged Murphy"
   IDS_CONFIRM_DISABLE       "Deshabilitar este dispositivo hará que deje de
funcionar.\n¿Seguro que quiere deshabilitarlo?"
   IDS_CONFIRM_UNINSTALL     "Advertencia: Está a punto de desinstalar este
dispositivo de su equipo.\n¿Seguro que quiere continuar?"
 END
-STRINGTABLE DISCARDABLE
+
+STRINGTABLE
 BEGIN
   IDS_MENU_UPDATE           "Actualizar controladores..."
   IDS_MENU_ENABLE           "Habilitar"
@@ -312,7 +313,7 @@ BEGIN
   IDS_MENU_PROPERTIES       "Propiedades"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_TOOLTIP_PROPERTIES    "Propiedades"
   IDS_TOOLTIP_SCAN          "Buscar cambios de hardware"
@@ -323,7 +324,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_HINT_BLANK        " "
   IDS_HINT_PROPERTIES   " Abre el diálogo de propiedades para le selección
actual."
diff --git a/dll/win32/devmgr/lang/et-EE.rc b/dll/win32/devmgr/lang/et-EE.rc
index 85cb255a969..3759f9f2001 100644
--- a/dll/win32/devmgr/lang/et-EE.rc
+++ b/dll/win32/devmgr/lang/et-EE.rc
@@ -292,14 +292,15 @@ BEGIN
 END
 
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_APPNAME               "ReactOS Seadmehaldur"
   IDS_APP_AUTHORS           "Copyright 2015 Ged Murphy"
   IDS_CONFIRM_DISABLE       "Selle seadme keelamine põhjustab selle töötamise
lakkamise.\nKas soovite kindlasti seda keelata?"
   IDS_CONFIRM_UNINSTALL     "Hoiatus: Hakkate seda seadet süsteemist
desinstallima.\nKas soovite jätkata?"
 END
-STRINGTABLE DISCARDABLE
+
+STRINGTABLE
 BEGIN
   IDS_MENU_UPDATE           "Draiveritarkvara värskendamine..."
   IDS_MENU_ENABLE           "Luba"
@@ -310,7 +311,7 @@ BEGIN
   IDS_MENU_PROPERTIES       "Atribuudid"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_TOOLTIP_PROPERTIES    "Atribuudid"
   IDS_TOOLTIP_SCAN          "Otsi riistvaramuudatusi"
@@ -321,7 +322,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_HINT_BLANK        " "
   IDS_HINT_PROPERTIES   " Avab antud valike atribuudilehe."
diff --git a/dll/win32/devmgr/lang/fr-FR.rc b/dll/win32/devmgr/lang/fr-FR.rc
index ea9155328e2..8a8fe527477 100644
--- a/dll/win32/devmgr/lang/fr-FR.rc
+++ b/dll/win32/devmgr/lang/fr-FR.rc
@@ -286,14 +286,15 @@ BEGIN
 END
 
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_APPNAME               "Gestionnaire de périphériques ReactOS"
   IDS_APP_AUTHORS           "Copyright 2015 Ged Murphy"
   IDS_CONFIRM_DISABLE       "Désactiver ce périphérique va le rendre
inopérant.\nVoulez-vous réellement le désactiver ?"
   IDS_CONFIRM_UNINSTALL     "Attention : vous êtes sur le point de désinstaller ce
périphérique de votre système.\nVoulez-vous continuer ?"
 END
-STRINGTABLE DISCARDABLE
+
+STRINGTABLE
 BEGIN
   IDS_MENU_UPDATE           "Mettre le pilote logiciel à jour..."
   IDS_MENU_ENABLE           "Activer"
@@ -304,7 +305,7 @@ BEGIN
   IDS_MENU_PROPERTIES       "Propriétés"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_TOOLTIP_PROPERTIES    "Propriétés"
   IDS_TOOLTIP_SCAN          "Vérifier les changements de matériel"
@@ -315,7 +316,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_HINT_BLANK        " "
   IDS_HINT_PROPERTIES   " Ouvre les priopriétés pour la sélection actuelle."
diff --git a/dll/win32/devmgr/lang/he-IL.rc b/dll/win32/devmgr/lang/he-IL.rc
index 2c43c050c95..eca9c521c43 100644
--- a/dll/win32/devmgr/lang/he-IL.rc
+++ b/dll/win32/devmgr/lang/he-IL.rc
@@ -287,14 +287,15 @@ BEGIN
 END
 
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_APPNAME               "מנהל ההתקנים של ReactOS"
   IDS_APP_AUTHORS           "Copyright 2015 Ged Murphy"
   IDS_CONFIRM_DISABLE       "Disabling this device will cause it to stop
functioning.\nDo you really want to disable it?"
   IDS_CONFIRM_UNINSTALL     "Warning: You are about to uninstall this device from
your system.\nDo you want to continue?"
 END
-STRINGTABLE DISCARDABLE
+
+STRINGTABLE
 BEGIN
   IDS_MENU_UPDATE           "Update driver software..."
   IDS_MENU_ENABLE           "Enable"
@@ -305,7 +306,7 @@ BEGIN
   IDS_MENU_PROPERTIES       "Properties"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_TOOLTIP_PROPERTIES    "Properties"
   IDS_TOOLTIP_SCAN          "Scan for hardware changes"
@@ -316,7 +317,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_HINT_BLANK        " "
   IDS_HINT_PROPERTIES   " Open property dialog for the current selection."
diff --git a/dll/win32/devmgr/lang/hu-HU.rc b/dll/win32/devmgr/lang/hu-HU.rc
index ca3384c9a56..dbe9a9a9fcc 100644
--- a/dll/win32/devmgr/lang/hu-HU.rc
+++ b/dll/win32/devmgr/lang/hu-HU.rc
@@ -286,14 +286,15 @@ BEGIN
 END
 
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_APPNAME               "ReactOS Eszközkezelő"
   IDS_APP_AUTHORS           "Copyright 2015 Ged Murphy"
   IDS_CONFIRM_DISABLE       "Az eszköz letiltás után nem fog működni.\nBiztosan
letiltja?"
   IDS_CONFIRM_UNINSTALL     "Figyelem: arra készül hogy eltávolítsa ezt az eszközt a
rendszerből.\nFolytatni szeretné?"
 END
-STRINGTABLE DISCARDABLE
+
+STRINGTABLE
 BEGIN
   IDS_MENU_UPDATE           "Illesztőprogram frissítése..."
   IDS_MENU_ENABLE           "Engedélyezés"
@@ -304,7 +305,7 @@ BEGIN
   IDS_MENU_PROPERTIES       "Tulajdonságok"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_TOOLTIP_PROPERTIES    "Tulajdonságok"
   IDS_TOOLTIP_SCAN          "Hardverváltozások keresése"
@@ -315,7 +316,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_HINT_BLANK        " "
   IDS_HINT_PROPERTIES   " Az aktuális kijelölés tulajdonságainak megnyitása."
diff --git a/dll/win32/devmgr/lang/id-ID.rc b/dll/win32/devmgr/lang/id-ID.rc
index 6219a40f917..bc5cfe81b11 100644
--- a/dll/win32/devmgr/lang/id-ID.rc
+++ b/dll/win32/devmgr/lang/id-ID.rc
@@ -287,14 +287,15 @@ BEGIN
 END
 
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_APPNAME               "Manajer Perangkat ReactOS"
   IDS_APP_AUTHORS           "Copyright 2015 Ged Murphy"
   IDS_CONFIRM_DISABLE       "Mematikan perangkat ini akan menyebabkan
fungsionalitasnya berhenti.\nYakin ingin mematikannya?"
   IDS_CONFIRM_UNINSTALL     "Peringatan: Anda akan mencopot perangkat ini dari
sistem anda.\nIngin melanjutkan?"
 END
-STRINGTABLE DISCARDABLE
+
+STRINGTABLE
 BEGIN
   IDS_MENU_UPDATE           "Perbarui perangkat lunak driver..."
   IDS_MENU_ENABLE           "Hidupkan"
@@ -305,7 +306,7 @@ BEGIN
   IDS_MENU_PROPERTIES       "Properti"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_TOOLTIP_PROPERTIES    "Properti"
   IDS_TOOLTIP_SCAN          "Pindai perubahan perangkat keras"
@@ -316,7 +317,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_HINT_BLANK        " "
   IDS_HINT_PROPERTIES   " Buka dialog properti untuk pilihan saat ini."
diff --git a/dll/win32/devmgr/lang/it-IT.rc b/dll/win32/devmgr/lang/it-IT.rc
index 0d930cbf99a..5d58b412ce0 100644
--- a/dll/win32/devmgr/lang/it-IT.rc
+++ b/dll/win32/devmgr/lang/it-IT.rc
@@ -287,14 +287,15 @@ BEGIN
 END
 
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_APPNAME               "ReactOS Device Manager"
   IDS_APP_AUTHORS           "Copyright 2015 Ged Murphy"
   IDS_CONFIRM_DISABLE       "Disabling this device will cause it to stop
functioning.\nDo you really want to disable it?"
   IDS_CONFIRM_UNINSTALL     "Warning: You are about to uninstall this device from
your system.\nDo you want to continue?"
 END
-STRINGTABLE DISCARDABLE
+
+STRINGTABLE
 BEGIN
   IDS_MENU_UPDATE           "Update driver software..."
   IDS_MENU_ENABLE           "Enable"
@@ -305,7 +306,7 @@ BEGIN
   IDS_MENU_PROPERTIES       "Properties"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_TOOLTIP_PROPERTIES    "Properties"
   IDS_TOOLTIP_SCAN          "Scan for hardware changes"
@@ -316,7 +317,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_HINT_BLANK        " "
   IDS_HINT_PROPERTIES   " Open property dialog for the current selection."
diff --git a/dll/win32/devmgr/lang/ja-JP.rc b/dll/win32/devmgr/lang/ja-JP.rc
index da0477b9274..afbcbaf5eb6 100644
--- a/dll/win32/devmgr/lang/ja-JP.rc
+++ b/dll/win32/devmgr/lang/ja-JP.rc
@@ -285,14 +285,15 @@ BEGIN
 END
 
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_APPNAME               "ReactOS デバイス マネージャ"
   IDS_APP_AUTHORS           "Copyright 2015 Ged Murphy"
   IDS_CONFIRM_DISABLE       "このデバイスを無効にすると、機能が止まります。\nこれを本当に無効にしたいですか？"
   IDS_CONFIRM_UNINSTALL     "警告:
あなたのシステムからこのデバイスをアンインストールしようとしています。\n続行したいですか？"
 END
-STRINGTABLE DISCARDABLE
+
+STRINGTABLE
 BEGIN
   IDS_MENU_UPDATE           "ドライバ ソフトウェアを更新..."
   IDS_MENU_ENABLE           "有効にする"
@@ -303,7 +304,7 @@ BEGIN
   IDS_MENU_PROPERTIES       "プロパティ"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_TOOLTIP_PROPERTIES    "プロパティ"
   IDS_TOOLTIP_SCAN          "ハードウェアの変更をスキャン"
@@ -314,7 +315,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_HINT_BLANK        " "
   IDS_HINT_PROPERTIES   " 現在の選択に対するプロパティ ダイアログを開きます。"
diff --git a/dll/win32/devmgr/lang/no-NO.rc b/dll/win32/devmgr/lang/no-NO.rc
index b1bf6dfac0f..a0dc9ecfd61 100644
--- a/dll/win32/devmgr/lang/no-NO.rc
+++ b/dll/win32/devmgr/lang/no-NO.rc
@@ -287,14 +287,15 @@ BEGIN
 END
 
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_APPNAME               "ReactOS Device Manager"
   IDS_APP_AUTHORS           "Copyright 2015 Ged Murphy"
   IDS_CONFIRM_DISABLE       "Disabling this device will cause it to stop
functioning.\nDo you really want to disable it?"
   IDS_CONFIRM_UNINSTALL     "Warning: You are about to uninstall this device from
your system.\nDo you want to continue?"
 END
-STRINGTABLE DISCARDABLE
+
+STRINGTABLE
 BEGIN
   IDS_MENU_UPDATE           "Update driver software..."
   IDS_MENU_ENABLE           "Enable"
@@ -305,7 +306,7 @@ BEGIN
   IDS_MENU_PROPERTIES       "Properties"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_TOOLTIP_PROPERTIES    "Properties"
   IDS_TOOLTIP_SCAN          "Scan for hardware changes"
@@ -316,7 +317,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_HINT_BLANK        " "
   IDS_HINT_PROPERTIES   " Open property dialog for the current selection."
diff --git a/dll/win32/devmgr/lang/pl-PL.rc b/dll/win32/devmgr/lang/pl-PL.rc
index 551077f3365..0f5884eceb5 100644
--- a/dll/win32/devmgr/lang/pl-PL.rc
+++ b/dll/win32/devmgr/lang/pl-PL.rc
@@ -296,14 +296,15 @@ BEGIN
 END
 
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_APPNAME               "Menedźer urządzeń ReactOS"
   IDS_APP_AUTHORS           "Copyright 2015 Ged Murphy"
   IDS_CONFIRM_DISABLE       "Wyłączenie tego urządzenia spowoduje, że przestanie ono
funkcjonować.\nCzy na pewno chcesz je wyłączyć?"
   IDS_CONFIRM_UNINSTALL     "Ostrzeżenie: Urządzenie to zostanie zaraz odinstalowane
z systemu.\nCzy chcesz kontynuować?"
 END
-STRINGTABLE DISCARDABLE
+
+STRINGTABLE
 BEGIN
   IDS_MENU_UPDATE           "Aktualizuj sterownik..."
   IDS_MENU_ENABLE           "Włącz"
@@ -314,7 +315,7 @@ BEGIN
   IDS_MENU_PROPERTIES       "Właściwości"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_TOOLTIP_PROPERTIES    "Właściwości"
   IDS_TOOLTIP_SCAN          "Skanuj w poszukiwaniu zmian sprzętu"
@@ -325,7 +326,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_HINT_BLANK        " "
   IDS_HINT_PROPERTIES   " Otwiera okno dialogowe właściwiości dla bieżącego
zaznaczenia."
diff --git a/dll/win32/devmgr/lang/pt-BR.rc b/dll/win32/devmgr/lang/pt-BR.rc
index 9a827214a45..bfee5008759 100644
--- a/dll/win32/devmgr/lang/pt-BR.rc
+++ b/dll/win32/devmgr/lang/pt-BR.rc
@@ -287,14 +287,15 @@ BEGIN
 END
 
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_APPNAME               "ReactOS Device Manager"
   IDS_APP_AUTHORS           "Copyright 2015 Ged Murphy"
   IDS_CONFIRM_DISABLE       "Disabling this device will cause it to stop
functioning.\nDo you really want to disable it?"
   IDS_CONFIRM_UNINSTALL     "Warning: You are about to uninstall this device from
your system.\nDo you want to continue?"
 END
-STRINGTABLE DISCARDABLE
+
+STRINGTABLE
 BEGIN
   IDS_MENU_UPDATE           "Update driver software..."
   IDS_MENU_ENABLE           "Enable"
@@ -305,7 +306,7 @@ BEGIN
   IDS_MENU_PROPERTIES       "Properties"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_TOOLTIP_PROPERTIES    "Properties"
   IDS_TOOLTIP_SCAN          "Scan for hardware changes"
@@ -316,7 +317,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_HINT_BLANK        " "
   IDS_HINT_PROPERTIES   " Open property dialog for the current selection."
diff --git a/dll/win32/devmgr/lang/pt-PT.rc b/dll/win32/devmgr/lang/pt-PT.rc
index d1267d2022e..5cf2ca97c2b 100644
--- a/dll/win32/devmgr/lang/pt-PT.rc
+++ b/dll/win32/devmgr/lang/pt-PT.rc
@@ -285,7 +285,7 @@ BEGIN
     END
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_APPNAME               "ReactOS Gestor de dispositivos"
   IDS_APP_AUTHORS           "Copyright 2015 Ged Murphy"
@@ -293,7 +293,7 @@ BEGIN
   IDS_CONFIRM_UNINSTALL     "Aviso: Está prestes a desinstalar este dispositivo do
sistema.\nDeseja continuar?"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_MENU_UPDATE           "Actualizar software do controlador..."
   IDS_MENU_ENABLE           "Habilitar"
@@ -304,7 +304,7 @@ BEGIN
   IDS_MENU_PROPERTIES       "Propriedades"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_TOOLTIP_PROPERTIES    "Propriedades"
   IDS_TOOLTIP_SCAN          "Verificar alterações de hardware"
@@ -315,7 +315,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_HINT_BLANK        " "
   IDS_HINT_PROPERTIES   " Abrir a caixa de diálogo
""Propriedades"" para a selecção actual."
diff --git a/dll/win32/devmgr/lang/ro-RO.rc b/dll/win32/devmgr/lang/ro-RO.rc
index d18eeda4c88..fc2c4ac2b66 100644
--- a/dll/win32/devmgr/lang/ro-RO.rc
+++ b/dll/win32/devmgr/lang/ro-RO.rc
@@ -294,14 +294,15 @@ BEGIN
 END
 
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_APPNAME               "Manager de dispozitive"
   IDS_APP_AUTHORS           "Copyright 2015 Ged Murphy"
   IDS_CONFIRM_DISABLE       "Dezactivarea acestui dispozitiv va cauza oprirea
funcționării sale.\nSigur doriți dezactivarea sa?"
   IDS_CONFIRM_UNINSTALL     "Avertisment: Urmează să dezinstalați acest dispozitiv
din sistem.\nContinuați?"
 END
-STRINGTABLE DISCARDABLE
+
+STRINGTABLE
 BEGIN
   IDS_MENU_UPDATE           "Actualizare driver…"
   IDS_MENU_ENABLE           "Activare"
@@ -312,7 +313,7 @@ BEGIN
   IDS_MENU_PROPERTIES       "Proprietăți"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_TOOLTIP_PROPERTIES    "Proprietăți"
   IDS_TOOLTIP_SCAN          "Scanare configurație hardware"
@@ -323,7 +324,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_HINT_BLANK        " "
   IDS_HINT_PROPERTIES   " Inspectarea proprietăților pentru selecția
curentă."
diff --git a/dll/win32/devmgr/lang/ru-RU.rc b/dll/win32/devmgr/lang/ru-RU.rc
index 0b9feea8c0a..451b6951bba 100644
--- a/dll/win32/devmgr/lang/ru-RU.rc
+++ b/dll/win32/devmgr/lang/ru-RU.rc
@@ -287,14 +287,15 @@ BEGIN
 END
 
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_APPNAME               "Диспетчер устройств ReactOS"
   IDS_APP_AUTHORS           "Copyright 2015 Ged Murphy"
   IDS_CONFIRM_DISABLE       "Отключение устройства означает, что оно перестанет
работать.\nОтключить устройство?"
   IDS_CONFIRM_UNINSTALL     "Предупреждение: Сейчас устройство будет удалено из
системы.\nВы хотите продолжить?"
 END
-STRINGTABLE DISCARDABLE
+
+STRINGTABLE
 BEGIN
   IDS_MENU_UPDATE           "&Обновить драйвер..."
   IDS_MENU_ENABLE           "&Включить"
@@ -305,7 +306,7 @@ BEGIN
   IDS_MENU_PROPERTIES       "&Свойства"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_TOOLTIP_PROPERTIES    "Свойства"
   IDS_TOOLTIP_SCAN          "Обновить конфигурацию оборудования"
@@ -316,7 +317,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_HINT_BLANK        " "
   IDS_HINT_PROPERTIES   " Открытие страницы свойств для выделенного объекта."
diff --git a/dll/win32/devmgr/lang/sk-SK.rc b/dll/win32/devmgr/lang/sk-SK.rc
index 617fc5c0b26..c9366979efe 100644
--- a/dll/win32/devmgr/lang/sk-SK.rc
+++ b/dll/win32/devmgr/lang/sk-SK.rc
@@ -290,14 +290,15 @@ BEGIN
 END
 
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_APPNAME               "ReactOS Device Manager"
   IDS_APP_AUTHORS           "Copyright 2015 Ged Murphy"
   IDS_CONFIRM_DISABLE       "Disabling this device will cause it to stop
functioning.\nDo you really want to disable it?"
   IDS_CONFIRM_UNINSTALL     "Warning: You are about to uninstall this device from
your system.\nDo you want to continue?"
 END
-STRINGTABLE DISCARDABLE
+
+STRINGTABLE
 BEGIN
   IDS_MENU_UPDATE           "Update driver software..."
   IDS_MENU_ENABLE           "Enable"
@@ -308,7 +309,7 @@ BEGIN
   IDS_MENU_PROPERTIES       "Properties"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_TOOLTIP_PROPERTIES    "Properties"
   IDS_TOOLTIP_SCAN          "Scan for hardware changes"
@@ -319,7 +320,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_HINT_BLANK        " "
   IDS_HINT_PROPERTIES   " Open property dialog for the current selection."
diff --git a/dll/win32/devmgr/lang/sq-AL.rc b/dll/win32/devmgr/lang/sq-AL.rc
index ef2f22b9dfa..fa3724737d3 100644
--- a/dll/win32/devmgr/lang/sq-AL.rc
+++ b/dll/win32/devmgr/lang/sq-AL.rc
@@ -289,14 +289,15 @@ BEGIN
 END
 
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_APPNAME               "ReactOS Device Manager"
   IDS_APP_AUTHORS           "Copyright 2015 Ged Murphy"
   IDS_CONFIRM_DISABLE       "Disabling this device will cause it to stop
functioning.\nDo you really want to disable it?"
   IDS_CONFIRM_UNINSTALL     "Warning: You are about to uninstall this device from
your system.\nDo you want to continue?"
 END
-STRINGTABLE DISCARDABLE
+
+STRINGTABLE
 BEGIN
   IDS_MENU_UPDATE           "Update driver software..."
   IDS_MENU_ENABLE           "Enable"
@@ -307,7 +308,7 @@ BEGIN
   IDS_MENU_PROPERTIES       "Properties"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_TOOLTIP_PROPERTIES    "Properties"
   IDS_TOOLTIP_SCAN          "Scan for hardware changes"
@@ -318,7 +319,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_HINT_BLANK        " "
   IDS_HINT_PROPERTIES   " Open property dialog for the current selection."
diff --git a/dll/win32/devmgr/lang/tr-TR.rc b/dll/win32/devmgr/lang/tr-TR.rc
index 819c4e26d05..6ba85c66875 100644
--- a/dll/win32/devmgr/lang/tr-TR.rc
+++ b/dll/win32/devmgr/lang/tr-TR.rc
@@ -287,7 +287,7 @@ BEGIN
 END
 
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_APPNAME               "ReactOS Aygıt Yöneticisi"
   IDS_APP_AUTHORS           "Telif Hakkı: 2015 Ged Murphy"
@@ -295,7 +295,7 @@ BEGIN
   IDS_CONFIRM_UNINSTALL     "Uyarı: Bu aygıtı sisteminizden kaldırmak
üzeresiniz.\nDevam etmek istiyor musunuz?"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_MENU_UPDATE           "Sürücü Yazılımını Güncelleştir..."
   IDS_MENU_ENABLE           "Etkinleştir"
@@ -306,7 +306,7 @@ BEGIN
   IDS_MENU_PROPERTIES       "Özellikler"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_TOOLTIP_PROPERTIES    "Özellikler"
   IDS_TOOLTIP_SCAN          "Donanım Değişiklikleri İçin Tara"
@@ -317,7 +317,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_HINT_BLANK        " "
   IDS_HINT_PROPERTIES   " Şimdiki seçilen için özellik penceresini açar."
diff --git a/dll/win32/devmgr/lang/uk-UA.rc b/dll/win32/devmgr/lang/uk-UA.rc
index dd4c1f3f68f..c5ca33b935d 100644
--- a/dll/win32/devmgr/lang/uk-UA.rc
+++ b/dll/win32/devmgr/lang/uk-UA.rc
@@ -293,14 +293,15 @@ BEGIN
 END
 
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_APPNAME               "ReactOS Device Manager"
   IDS_APP_AUTHORS           "Copyright 2015 Ged Murphy"
   IDS_CONFIRM_DISABLE       "Disabling this device will cause it to stop
functioning.\nDo you really want to disable it?"
   IDS_CONFIRM_UNINSTALL     "Warning: You are about to uninstall this device from
your system.\nDo you want to continue?"
 END
-STRINGTABLE DISCARDABLE
+
+STRINGTABLE
 BEGIN
   IDS_MENU_UPDATE           "Update driver software..."
   IDS_MENU_ENABLE           "Enable"
@@ -311,7 +312,7 @@ BEGIN
   IDS_MENU_PROPERTIES       "Properties"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_TOOLTIP_PROPERTIES    "Properties"
   IDS_TOOLTIP_SCAN          "Scan for hardware changes"
@@ -322,7 +323,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_HINT_BLANK        " "
   IDS_HINT_PROPERTIES   " Open property dialog for the current selection."
diff --git a/dll/win32/devmgr/lang/zh-CN.rc b/dll/win32/devmgr/lang/zh-CN.rc
index 08a01628144..f1474bd936b 100644
--- a/dll/win32/devmgr/lang/zh-CN.rc
+++ b/dll/win32/devmgr/lang/zh-CN.rc
@@ -294,14 +294,15 @@ BEGIN
 END
 
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_APPNAME               "ReactOS 设备管理器"
   IDS_APP_AUTHORS           "Copyright 2015 Ged Murphy"
   IDS_CONFIRM_DISABLE       "禁用此设备会使其停止运行。\n你真的想要禁用它吗？"
   IDS_CONFIRM_UNINSTALL     "警告: 您将要从系统中卸载此设备。\n你想要继续吗？"
 END
-STRINGTABLE DISCARDABLE
+
+STRINGTABLE
 BEGIN
   IDS_MENU_UPDATE           "更新驱动程序软件..."
   IDS_MENU_ENABLE           "启用"
@@ -312,7 +313,7 @@ BEGIN
   IDS_MENU_PROPERTIES       "属性"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_TOOLTIP_PROPERTIES    "属性"
   IDS_TOOLTIP_SCAN          "扫描检测硬件改动"
@@ -323,7 +324,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_HINT_BLANK        " "
   IDS_HINT_PROPERTIES   " 当前所选内容的公开的属性对话框。"
diff --git a/dll/win32/devmgr/lang/zh-HK.rc b/dll/win32/devmgr/lang/zh-HK.rc
index 833da6c7e38..c8aae24c569 100644
--- a/dll/win32/devmgr/lang/zh-HK.rc
+++ b/dll/win32/devmgr/lang/zh-HK.rc
@@ -293,14 +293,15 @@ BEGIN
 END
 
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_APPNAME               "ReactOS 裝置管理員"
   IDS_APP_AUTHORS           "2015 Ged Murphy 版權所有"
   IDS_CONFIRM_DISABLE       "停用這個裝置會使其停止運作。\n你真的想要停用它嗎？"
   IDS_CONFIRM_UNINSTALL     "警告：您將要從系統中解除安裝這個裝置。\n你想要繼續嗎？"
 END
-STRINGTABLE DISCARDABLE
+
+STRINGTABLE
 BEGIN
   IDS_MENU_UPDATE           "更新驅動程式軟件..."
   IDS_MENU_ENABLE           "啟用"
@@ -311,7 +312,7 @@ BEGIN
   IDS_MENU_PROPERTIES       "內容"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_TOOLTIP_PROPERTIES    "內容"
   IDS_TOOLTIP_SCAN          "掃描硬件變更"
@@ -322,7 +323,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_HINT_BLANK        " "
   IDS_HINT_PROPERTIES   " 開啟目前選擇的內容對話方塊。"
diff --git a/dll/win32/devmgr/lang/zh-TW.rc b/dll/win32/devmgr/lang/zh-TW.rc
index f0565d556e8..f8e0eeea5db 100644
--- a/dll/win32/devmgr/lang/zh-TW.rc
+++ b/dll/win32/devmgr/lang/zh-TW.rc
@@ -293,14 +293,15 @@ BEGIN
 END
 
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_APPNAME               "ReactOS 裝置管理員"
   IDS_APP_AUTHORS           "2015 Ged Murphy 版權所有"
   IDS_CONFIRM_DISABLE       "停用這個裝置會使其停止運作。\n你真的想要停用它嗎？"
   IDS_CONFIRM_UNINSTALL     "警告：您將要從系統中解除安裝這個裝置。\n你想要繼續嗎？"
 END
-STRINGTABLE DISCARDABLE
+
+STRINGTABLE
 BEGIN
   IDS_MENU_UPDATE           "更新驅動程式軟體..."
   IDS_MENU_ENABLE           "啟用"
@@ -311,7 +312,7 @@ BEGIN
   IDS_MENU_PROPERTIES       "內容"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_TOOLTIP_PROPERTIES    "內容"
   IDS_TOOLTIP_SCAN          "掃描硬體變更"
@@ -322,7 +323,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_HINT_BLANK        " "
   IDS_HINT_PROPERTIES   " 開啟目前選擇的內容對話方塊。"
diff --git a/modules/rosapps/applications/notevil/notevil.rc
b/modules/rosapps/applications/notevil/notevil.rc
index cb36ff75b18..24840bd8324 100644
--- a/modules/rosapps/applications/notevil/notevil.rc
+++ b/modules/rosapps/applications/notevil/notevil.rc
@@ -24,7 +24,7 @@
 /* UTF-8 */
 #pragma code_page(65001)
 
-STRINGTABLE MOVEABLE
+STRINGTABLE
 BEGIN
     1,   "Aleksandar Andrejevic"
     2,   "Aleksey Bragin"
@@ -43,7 +43,7 @@ BEGIN
     15,  "Brandon Turner"
 END
 
-STRINGTABLE MOVEABLE
+STRINGTABLE
 BEGIN
     16,  "Brian Palmer"
     17,  "Cameron M. Gutman"
@@ -64,7 +64,7 @@ BEGIN
     32,  "Edijs Kolesnikovics"
 END
 
-STRINGTABLE MOVEABLE
+STRINGTABLE
 BEGIN
     33,  "Emanuele Aliberti"
     34,  "Eric Kohl"
@@ -83,7 +83,7 @@ BEGIN
     47,  "Guido de Jong"
 END
 
-STRINGTABLE MOVEABLE
+STRINGTABLE
 BEGIN
     48,  "Gunnar Andre' Dalsnes"
     49,  "Hans Kremer"
@@ -102,7 +102,7 @@ BEGIN
     62,  "Jeffrey Morlan"
 END
 
-STRINGTABLE MOVEABLE
+STRINGTABLE
 BEGIN
     63,  "Jens Collin"
     64,  "Jérôme Gardou"
@@ -123,7 +123,7 @@ BEGIN
     79,  "Marc Piulachs"
 END
 
-STRINGTABLE MOVEABLE
+STRINGTABLE
 BEGIN
     80,  "Mark Tempel"
     81,  "Mark Weaver"
@@ -142,7 +142,7 @@ BEGIN
     94,  "Neeraj Yadav"
 END
 
-STRINGTABLE MOVEABLE
+STRINGTABLE
 BEGIN
     95,  "Olaf Siejka"
     96,  "Oleg Dubinskij"
@@ -162,7 +162,7 @@ BEGIN
     110, "Samuel Serapión"
 END
 
-STRINGTABLE MOVEABLE
+STRINGTABLE
 BEGIN
     111, "Saveliy Tretiakov"
     112, "Sebastian Gasiorek"
diff --git a/modules/rosapps/applications/screensavers/blankscr/lang/bg-BG.rc
b/modules/rosapps/applications/screensavers/blankscr/lang/bg-BG.rc
index 3024d41f1bc..be118c30ed8 100644
--- a/modules/rosapps/applications/screensavers/blankscr/lang/bg-BG.rc
+++ b/modules/rosapps/applications/screensavers/blankscr/lang/bg-BG.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Blank"
     IDS_TEXT        "Няма възможност за настройки."
diff --git a/modules/rosapps/applications/screensavers/blankscr/lang/de-DE.rc
b/modules/rosapps/applications/screensavers/blankscr/lang/de-DE.rc
index 7c0d2452389..da90fbe1f7b 100644
--- a/modules/rosapps/applications/screensavers/blankscr/lang/de-DE.rc
+++ b/modules/rosapps/applications/screensavers/blankscr/lang/de-DE.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Schwarzer Bildschirm"
     IDS_TEXT        "Keine Einstellungen notwendig."
diff --git a/modules/rosapps/applications/screensavers/blankscr/lang/en-US.rc
b/modules/rosapps/applications/screensavers/blankscr/lang/en-US.rc
index 078bac53e8c..4cb31045a3b 100644
--- a/modules/rosapps/applications/screensavers/blankscr/lang/en-US.rc
+++ b/modules/rosapps/applications/screensavers/blankscr/lang/en-US.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Blank screen"
     IDS_TEXT        "No options need to be set."
diff --git a/modules/rosapps/applications/screensavers/blankscr/lang/es-ES.rc
b/modules/rosapps/applications/screensavers/blankscr/lang/es-ES.rc
index ffcd986707a..c28d25fb0cd 100644
--- a/modules/rosapps/applications/screensavers/blankscr/lang/es-ES.rc
+++ b/modules/rosapps/applications/screensavers/blankscr/lang/es-ES.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "En blanco"
     IDS_TEXT        "Ninguna opción necesita ser configurada."
diff --git a/modules/rosapps/applications/screensavers/blankscr/lang/fr-FR.rc
b/modules/rosapps/applications/screensavers/blankscr/lang/fr-FR.rc
index 71b013f1a1b..9af20ffaf1a 100644
--- a/modules/rosapps/applications/screensavers/blankscr/lang/fr-FR.rc
+++ b/modules/rosapps/applications/screensavers/blankscr/lang/fr-FR.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Vide"
     IDS_TEXT        "Il n'y a aucune option à définir."
diff --git a/modules/rosapps/applications/screensavers/blankscr/lang/it-IT.rc
b/modules/rosapps/applications/screensavers/blankscr/lang/it-IT.rc
index 0a2ff10a214..468b4775d81 100644
--- a/modules/rosapps/applications/screensavers/blankscr/lang/it-IT.rc
+++ b/modules/rosapps/applications/screensavers/blankscr/lang/it-IT.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Schermo nero"
     IDS_TEXT        "Non ci sono opzioni da impostare."
diff --git a/modules/rosapps/applications/screensavers/blankscr/lang/lt-LT.rc
b/modules/rosapps/applications/screensavers/blankscr/lang/lt-LT.rc
index 713e3c80b0c..ca91793ee39 100644
--- a/modules/rosapps/applications/screensavers/blankscr/lang/lt-LT.rc
+++ b/modules/rosapps/applications/screensavers/blankscr/lang/lt-LT.rc
@@ -9,7 +9,7 @@
 
 LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Tuščias"
     IDS_TEXT        "Nėra keičiamų parametrų."
diff --git a/modules/rosapps/applications/screensavers/blankscr/lang/nl-NL.rc
b/modules/rosapps/applications/screensavers/blankscr/lang/nl-NL.rc
index 6008bd7c4eb..dd765f8a125 100644
--- a/modules/rosapps/applications/screensavers/blankscr/lang/nl-NL.rc
+++ b/modules/rosapps/applications/screensavers/blankscr/lang/nl-NL.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Blank"
     IDS_TEXT        "Geen dingen om in te stellen."
diff --git a/modules/rosapps/applications/screensavers/blankscr/lang/no-NO.rc
b/modules/rosapps/applications/screensavers/blankscr/lang/no-NO.rc
index bd4eaa1a56e..99103e3375b 100644
--- a/modules/rosapps/applications/screensavers/blankscr/lang/no-NO.rc
+++ b/modules/rosapps/applications/screensavers/blankscr/lang/no-NO.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Tom skjerm"
     IDS_TEXT        "Ingen valg trenger å settes."
diff --git a/modules/rosapps/applications/screensavers/blankscr/lang/pl-PL.rc
b/modules/rosapps/applications/screensavers/blankscr/lang/pl-PL.rc
index 88ff617fb50..9f96672ef1f 100644
--- a/modules/rosapps/applications/screensavers/blankscr/lang/pl-PL.rc
+++ b/modules/rosapps/applications/screensavers/blankscr/lang/pl-PL.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Puste"
     IDS_TEXT        "Brak opcji do ustawiania."
diff --git a/modules/rosapps/applications/screensavers/blankscr/lang/ro-RO.rc
b/modules/rosapps/applications/screensavers/blankscr/lang/ro-RO.rc
index c0e34e20dbb..3623caa0b20 100644
--- a/modules/rosapps/applications/screensavers/blankscr/lang/ro-RO.rc
+++ b/modules/rosapps/applications/screensavers/blankscr/lang/ro-RO.rc
@@ -10,7 +10,7 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Ecran gol (animație de inactivitate)"
     IDS_TEXT        "Nu este necesară stabilirea de opțiuni."
diff --git a/modules/rosapps/applications/screensavers/blankscr/lang/ru-RU.rc
b/modules/rosapps/applications/screensavers/blankscr/lang/ru-RU.rc
index 7b7dd145ecd..0ccaa35eeee 100644
--- a/modules/rosapps/applications/screensavers/blankscr/lang/ru-RU.rc
+++ b/modules/rosapps/applications/screensavers/blankscr/lang/ru-RU.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Заставка ""Пустой экран"""
     IDS_TEXT        "Эта заставка не имеет настраиваемых параметров."
diff --git a/modules/rosapps/applications/screensavers/blankscr/lang/sk-SK.rc
b/modules/rosapps/applications/screensavers/blankscr/lang/sk-SK.rc
index ec1ae29a99c..abdbc5c4201 100644
--- a/modules/rosapps/applications/screensavers/blankscr/lang/sk-SK.rc
+++ b/modules/rosapps/applications/screensavers/blankscr/lang/sk-SK.rc
@@ -4,7 +4,7 @@
 
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Blank"
     IDS_TEXT        "Nie sú potrebné žiadne nastavenia."
diff --git a/modules/rosapps/applications/screensavers/blankscr/lang/tr-TR.rc
b/modules/rosapps/applications/screensavers/blankscr/lang/tr-TR.rc
index 52754a1681b..0e5904868c2 100644
--- a/modules/rosapps/applications/screensavers/blankscr/lang/tr-TR.rc
+++ b/modules/rosapps/applications/screensavers/blankscr/lang/tr-TR.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_TURKISH, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Boş ekran"
     IDS_TEXT        "Hiçbir seçeneğin ayarlanması gerekmez."
diff --git a/modules/rosapps/applications/screensavers/blankscr/lang/uk-UA.rc
b/modules/rosapps/applications/screensavers/blankscr/lang/uk-UA.rc
index bab25b297f5..69d0e92012d 100644
--- a/modules/rosapps/applications/screensavers/blankscr/lang/uk-UA.rc
+++ b/modules/rosapps/applications/screensavers/blankscr/lang/uk-UA.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Порожньо"
     IDS_TEXT        "Ця заставка не має налаштовуваних параметрів."
diff --git a/modules/rosapps/applications/screensavers/blankscr/lang/zh-CN.rc
b/modules/rosapps/applications/screensavers/blankscr/lang/zh-CN.rc
index 0fdae152b37..79ae6f45fc2 100644
--- a/modules/rosapps/applications/screensavers/blankscr/lang/zh-CN.rc
+++ b/modules/rosapps/applications/screensavers/blankscr/lang/zh-CN.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "空白屏幕"
     IDS_TEXT        "没有需要设置的选项。"
diff --git a/modules/rosapps/applications/screensavers/blankscr/lang/zh-HK.rc
b/modules/rosapps/applications/screensavers/blankscr/lang/zh-HK.rc
index eb3023298fb..a99425b4705 100644
--- a/modules/rosapps/applications/screensavers/blankscr/lang/zh-HK.rc
+++ b/modules/rosapps/applications/screensavers/blankscr/lang/zh-HK.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "空白螢幕"
     IDS_TEXT        "沒有可設定的選項。"
diff --git a/modules/rosapps/applications/screensavers/blankscr/lang/zh-TW.rc
b/modules/rosapps/applications/screensavers/blankscr/lang/zh-TW.rc
index 3458789197c..2de75773dda 100644
--- a/modules/rosapps/applications/screensavers/blankscr/lang/zh-TW.rc
+++ b/modules/rosapps/applications/screensavers/blankscr/lang/zh-TW.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "空白螢幕"
     IDS_TEXT        "沒有可設定的選項。"
diff --git a/modules/rosapps/applications/screensavers/blankscr/scrnsave.rc
b/modules/rosapps/applications/screensavers/blankscr/scrnsave.rc
index cb34fae774d..e843c42366e 100644
--- a/modules/rosapps/applications/screensavers/blankscr/scrnsave.rc
+++ b/modules/rosapps/applications/screensavers/blankscr/scrnsave.rc
@@ -4,12 +4,12 @@
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
-IDI_ICON  ICON  DISCARDABLE  "res/icon_blankscr.ico"
+IDI_ICON ICON "res/icon_blankscr.ico"
 
 #define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION    "ReactOS Default ScreenSaver\0"
-#define REACTOS_STR_INTERNAL_NAME       "scrnsave\0"
-#define REACTOS_STR_ORIGINAL_FILENAME   "scrnsave.scr\0"
+#define REACTOS_STR_FILE_DESCRIPTION    "ReactOS Default ScreenSaver"
+#define REACTOS_STR_INTERNAL_NAME       "scrnsave"
+#define REACTOS_STR_ORIGINAL_FILENAME   "scrnsave.scr"
 #include <reactos/version.rc>
 
 #include <reactos/manifest_exe.rc>
diff --git a/modules/rosapps/applications/screensavers/butterflies/butterflies.rc
b/modules/rosapps/applications/screensavers/butterflies/butterflies.rc
index 36962cc1012..943ea78bab5 100644
--- a/modules/rosapps/applications/screensavers/butterflies/butterflies.rc
+++ b/modules/rosapps/applications/screensavers/butterflies/butterflies.rc
@@ -4,9 +4,9 @@
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 #define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION    "Butterflies ScreenSaver\0"
-#define REACTOS_STR_INTERNAL_NAME       "butterflies\0"
-#define REACTOS_STR_ORIGINAL_FILENAME   "butterflies.scr\0"
+#define REACTOS_STR_FILE_DESCRIPTION    "Butterflies ScreenSaver"
+#define REACTOS_STR_INTERNAL_NAME       "butterflies"
+#define REACTOS_STR_ORIGINAL_FILENAME   "butterflies.scr"
 #include <reactos/version.rc>
 
 IDI_ICON         ICON     "res/icon_butterflies.ico"
diff --git a/modules/rosapps/applications/screensavers/butterflies/lang/bg-BG.rc
b/modules/rosapps/applications/screensavers/butterflies/lang/bg-BG.rc
index 57b3701914f..e56781d023f 100644
--- a/modules/rosapps/applications/screensavers/butterflies/lang/bg-BG.rc
+++ b/modules/rosapps/applications/screensavers/butterflies/lang/bg-BG.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
-IDD_DLG_SCREEN DIALOGEX DISCARDABLE  0, 0, 172, 57
+IDD_DLG_SCREEN DIALOGEX 0, 0, 172, 57
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Екранен предпазител с пеперуди"
 FONT 8, "MS Shell Dlg"
@@ -12,7 +12,7 @@ BEGIN
     PUSHBUTTON      "За",IDABOUT,115,35,50,14
 END
 
-IDD_DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 149, 79
+IDD_DLG_ABOUT DIALOGEX 0, 0, 149, 79
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "За"
 FONT 8, "MS Shell Dlg"
@@ -28,7 +28,7 @@ BEGIN
                     NOT WS_GROUP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Butterflies ScreenSaver"
 END
diff --git a/modules/rosapps/applications/screensavers/butterflies/lang/de-DE.rc
b/modules/rosapps/applications/screensavers/butterflies/lang/de-DE.rc
index 2a9cba82a3e..0207848b0bf 100644
--- a/modules/rosapps/applications/screensavers/butterflies/lang/de-DE.rc
+++ b/modules/rosapps/applications/screensavers/butterflies/lang/de-DE.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
-IDD_DLG_SCREEN DIALOGEX DISCARDABLE  0, 0, 172, 57
+IDD_DLG_SCREEN DIALOGEX 0, 0, 172, 57
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Schmetterlinge Einstellungen"
 FONT 8, "MS Shell Dlg"
@@ -12,7 +12,7 @@ BEGIN
     PUSHBUTTON      "Über",IDABOUT,115,35,50,14
 END
 
-IDD_DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 149, 79
+IDD_DLG_ABOUT DIALOGEX 0, 0, 149, 79
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Über"
 FONT 8, "MS Shell Dlg"
@@ -28,7 +28,7 @@ BEGIN
                     NOT WS_GROUP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Butterflies Bildschirmschoner"
 END
diff --git a/modules/rosapps/applications/screensavers/butterflies/lang/en-US.rc
b/modules/rosapps/applications/screensavers/butterflies/lang/en-US.rc
index 011607810e6..1724c4571ad 100644
--- a/modules/rosapps/applications/screensavers/butterflies/lang/en-US.rc
+++ b/modules/rosapps/applications/screensavers/butterflies/lang/en-US.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
-IDD_DLG_SCREEN DIALOGEX DISCARDABLE  0, 0, 172, 57
+IDD_DLG_SCREEN DIALOGEX 0, 0, 172, 57
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Butterflies ScreenSaver Settings"
 FONT 8, "MS Shell Dlg"
@@ -12,7 +12,7 @@ BEGIN
     PUSHBUTTON      "About",IDABOUT,115,35,50,14
 END
 
-IDD_DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 149, 79
+IDD_DLG_ABOUT DIALOGEX 0, 0, 149, 79
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About"
 FONT 8, "MS Shell Dlg"
@@ -28,7 +28,7 @@ BEGIN
                     NOT WS_GROUP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Butterflies ScreenSaver"
 END
diff --git a/modules/rosapps/applications/screensavers/butterflies/lang/es-ES.rc
b/modules/rosapps/applications/screensavers/butterflies/lang/es-ES.rc
index 03f19130b67..05fde1103b1 100644
--- a/modules/rosapps/applications/screensavers/butterflies/lang/es-ES.rc
+++ b/modules/rosapps/applications/screensavers/butterflies/lang/es-ES.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
-IDD_DLG_SCREEN DIALOGEX DISCARDABLE  0, 0, 172, 57
+IDD_DLG_SCREEN DIALOGEX 0, 0, 172, 57
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Configuración del Salvapantallas de Mariposas"
 FONT 8, "MS Shell Dlg"
@@ -12,7 +12,7 @@ BEGIN
     PUSHBUTTON      "Acerca de",IDABOUT,115,35,50,14
 END
 
-IDD_DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 149, 79
+IDD_DLG_ABOUT DIALOGEX 0, 0, 149, 79
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Acerca de"
 FONT 8, "MS Shell Dlg"
@@ -28,7 +28,7 @@ BEGIN
                     NOT WS_GROUP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Salvapantallas de Mariposas revoloteando"
 END
diff --git a/modules/rosapps/applications/screensavers/butterflies/lang/fr-FR.rc
b/modules/rosapps/applications/screensavers/butterflies/lang/fr-FR.rc
index 13f0998fee4..6332326bc54 100644
--- a/modules/rosapps/applications/screensavers/butterflies/lang/fr-FR.rc
+++ b/modules/rosapps/applications/screensavers/butterflies/lang/fr-FR.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
-IDD_DLG_SCREEN DIALOGEX DISCARDABLE  0, 0, 172, 57
+IDD_DLG_SCREEN DIALOGEX 0, 0, 172, 57
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Configuration de l'écran de veille de papillons"
 FONT 8, "MS Shell Dlg"
@@ -12,7 +12,7 @@ BEGIN
     PUSHBUTTON      "À propos de",IDABOUT,115,35,50,14
 END
 
-IDD_DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 149, 79
+IDD_DLG_ABOUT DIALOGEX 0, 0, 149, 79
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "À propos de"
 FONT 8, "MS Shell Dlg"
@@ -28,7 +28,7 @@ BEGIN
                     NOT WS_GROUP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Écran de veille de papillons"
 END
diff --git a/modules/rosapps/applications/screensavers/butterflies/lang/it-IT.rc
b/modules/rosapps/applications/screensavers/butterflies/lang/it-IT.rc
index 5e9b02ce71d..d4d7856fe1f 100644
--- a/modules/rosapps/applications/screensavers/butterflies/lang/it-IT.rc
+++ b/modules/rosapps/applications/screensavers/butterflies/lang/it-IT.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
-IDD_DLG_SCREEN DIALOGEX DISCARDABLE  0, 0, 172, 57
+IDD_DLG_SCREEN DIALOGEX 0, 0, 172, 57
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Impostazioni salvaschermo"
 FONT 8, "MS Shell Dlg"
@@ -12,7 +12,7 @@ BEGIN
     PUSHBUTTON      "Informazioni",IDABOUT,115,35,50,14
 END
 
-IDD_DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 149, 79
+IDD_DLG_ABOUT DIALOGEX 0, 0, 149, 79
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Informazioni"
 FONT 8, "MS Shell Dlg"
@@ -28,7 +28,7 @@ BEGIN
                     NOT WS_GROUP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Salvaschermo Farfalle"
 END
diff --git a/modules/rosapps/applications/screensavers/butterflies/lang/lt-LT.rc
b/modules/rosapps/applications/screensavers/butterflies/lang/lt-LT.rc
index 10380a7dffa..339779ff1d1 100644
--- a/modules/rosapps/applications/screensavers/butterflies/lang/lt-LT.rc
+++ b/modules/rosapps/applications/screensavers/butterflies/lang/lt-LT.rc
@@ -9,7 +9,7 @@
 
 LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
 
-IDD_DLG_SCREEN DIALOGEX DISCARDABLE  0, 0, 172, 57
+IDD_DLG_SCREEN DIALOGEX 0, 0, 172, 57
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Ekrano užsklandos nustatymai"
 FONT 8, "MS Shell Dlg"
@@ -21,7 +21,7 @@ BEGIN
     PUSHBUTTON      "Apie",IDABOUT,115,35,50,14
 END
 
-IDD_DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 149, 79
+IDD_DLG_ABOUT DIALOGEX 0, 0, 149, 79
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Apie"
 FONT 8, "MS Shell Dlg"
@@ -37,7 +37,7 @@ BEGIN
                     NOT WS_GROUP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Drugeliai"
 END
diff --git a/modules/rosapps/applications/screensavers/butterflies/lang/no-NO.rc
b/modules/rosapps/applications/screensavers/butterflies/lang/no-NO.rc
index a129375254a..9f5449e5b59 100644
--- a/modules/rosapps/applications/screensavers/butterflies/lang/no-NO.rc
+++ b/modules/rosapps/applications/screensavers/butterflies/lang/no-NO.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
 
-IDD_DLG_SCREEN DIALOGEX DISCARDABLE  0, 0, 172, 57
+IDD_DLG_SCREEN DIALOGEX 0, 0, 172, 57
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Sommerfugl skjermsparer innstilling"
 FONT 8, "MS Shell Dlg"
@@ -12,7 +12,7 @@ BEGIN
     PUSHBUTTON      "Om",IDABOUT,115,35,50,14
 END
 
-IDD_DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 149, 79
+IDD_DLG_ABOUT DIALOGEX 0, 0, 149, 79
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Om"
 FONT 8, "MS Shell Dlg"
@@ -28,7 +28,7 @@ BEGIN
                     NOT WS_GROUP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Sommerfugl skjermsparer"
 END
diff --git a/modules/rosapps/applications/screensavers/butterflies/lang/pl-PL.rc
b/modules/rosapps/applications/screensavers/butterflies/lang/pl-PL.rc
index 0d5eb4213e3..9fca4c61283 100644
--- a/modules/rosapps/applications/screensavers/butterflies/lang/pl-PL.rc
+++ b/modules/rosapps/applications/screensavers/butterflies/lang/pl-PL.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
-IDD_DLG_SCREEN DIALOGEX DISCARDABLE  0, 0, 172, 57
+IDD_DLG_SCREEN DIALOGEX 0, 0, 172, 57
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Ustawienia wygaszacza Motylki"
 FONT 8, "MS Shell Dlg"
@@ -19,7 +19,7 @@ BEGIN
     PUSHBUTTON      "O programie",IDABOUT,115,35,50,14
 END
 
-IDD_DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 149, 79
+IDD_DLG_ABOUT DIALOGEX 0, 0, 149, 79
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "O programie"
 FONT 8, "MS Shell Dlg"
@@ -35,7 +35,7 @@ BEGIN
                     NOT WS_GROUP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Motylki"
 END
diff --git a/modules/rosapps/applications/screensavers/butterflies/lang/ro-RO.rc
b/modules/rosapps/applications/screensavers/butterflies/lang/ro-RO.rc
index add5f7b6da7..890fe7edc42 100644
--- a/modules/rosapps/applications/screensavers/butterflies/lang/ro-RO.rc
+++ b/modules/rosapps/applications/screensavers/butterflies/lang/ro-RO.rc
@@ -10,7 +10,7 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)
 
-IDD_DLG_SCREEN DIALOGEX DISCARDABLE  0, 0, 172, 57
+IDD_DLG_SCREEN DIALOGEX 0, 0, 172, 57
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Oprțiuni animație de inactivitate Fluturi"
 FONT 8, "MS Shell Dlg"
@@ -22,7 +22,7 @@ BEGIN
     PUSHBUTTON      "&Despre…",IDABOUT,115,35,50,14
 END
 
-IDD_DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 149, 79
+IDD_DLG_ABOUT DIALOGEX 0, 0, 149, 79
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Despre"
 FONT 8, "MS Shell Dlg"
@@ -38,7 +38,7 @@ BEGIN
                     NOT WS_GROUP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Fluturi (animație de inactivitate)"
 END
diff --git a/modules/rosapps/applications/screensavers/butterflies/lang/ru-RU.rc
b/modules/rosapps/applications/screensavers/butterflies/lang/ru-RU.rc
index af14eab3c8a..daf636b8656 100644
--- a/modules/rosapps/applications/screensavers/butterflies/lang/ru-RU.rc
+++ b/modules/rosapps/applications/screensavers/butterflies/lang/ru-RU.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
-IDD_DLG_SCREEN DIALOGEX DISCARDABLE  0, 0, 172, 57
+IDD_DLG_SCREEN DIALOGEX 0, 0, 172, 57
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Параметры заставки ""Бабочки"""
 FONT 8, "MS Shell Dlg"
@@ -12,7 +12,7 @@ BEGIN
     PUSHBUTTON      "О программе",IDABOUT,115,35,50,14
 END
 
-IDD_DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 149, 79
+IDD_DLG_ABOUT DIALOGEX 0, 0, 149, 79
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION ""
 FONT 8, "MS Shell Dlg"
@@ -28,7 +28,7 @@ BEGIN
                     NOT WS_GROUP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Заставка ""Бабочки"""
 END
diff --git a/modules/rosapps/applications/screensavers/butterflies/lang/sk-SK.rc
b/modules/rosapps/applications/screensavers/butterflies/lang/sk-SK.rc
index 75df4308f3f..8677f487a2b 100644
--- a/modules/rosapps/applications/screensavers/butterflies/lang/sk-SK.rc
+++ b/modules/rosapps/applications/screensavers/butterflies/lang/sk-SK.rc
@@ -4,7 +4,7 @@
 
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 
-IDD_DLG_SCREEN DIALOGEX DISCARDABLE  0, 0, 172, 57
+IDD_DLG_SCREEN DIALOGEX 0, 0, 172, 57
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Nastavenie šetriča obrazovky Motýle"
 FONT 8, "MS Shell Dlg"
@@ -16,7 +16,7 @@ BEGIN
     PUSHBUTTON      "Čo je ...",IDABOUT,115,35,50,14
 END
 
-IDD_DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 149, 79
+IDD_DLG_ABOUT DIALOGEX 0, 0, 149, 79
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Čo je ..."
 FONT 8, "MS Shell Dlg"
@@ -32,7 +32,7 @@ BEGIN
                     NOT WS_GROUP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Motýle - šetrič obrazovky"
 END
diff --git a/modules/rosapps/applications/screensavers/butterflies/lang/tr-TR.rc
b/modules/rosapps/applications/screensavers/butterflies/lang/tr-TR.rc
index 44c5d9646aa..ad3355bc553 100644
--- a/modules/rosapps/applications/screensavers/butterflies/lang/tr-TR.rc
+++ b/modules/rosapps/applications/screensavers/butterflies/lang/tr-TR.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_TURKISH, SUBLANG_NEUTRAL
 
-IDD_DLG_SCREEN DIALOGEX DISCARDABLE  0, 0, 172, 57
+IDD_DLG_SCREEN DIALOGEX 0, 0, 172, 57
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Kelebekler Ekran Koruyucusu Ayarları"
 FONT 8, "MS Shell Dlg"
@@ -19,7 +19,7 @@ BEGIN
     PUSHBUTTON      "Hakkında",IDABOUT,115,35,50,14
 END
 
-IDD_DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 149, 79
+IDD_DLG_ABOUT DIALOGEX 0, 0, 149, 79
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Hakkında"
 FONT 8, "MS Shell Dlg"
@@ -35,7 +35,7 @@ BEGIN
                     NOT WS_GROUP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Kelebekler Ekran Koruyucusu"
 END
diff --git a/modules/rosapps/applications/screensavers/butterflies/lang/uk-UA.rc
b/modules/rosapps/applications/screensavers/butterflies/lang/uk-UA.rc
index 44a76d171ec..4cc84b6322e 100644
--- a/modules/rosapps/applications/screensavers/butterflies/lang/uk-UA.rc
+++ b/modules/rosapps/applications/screensavers/butterflies/lang/uk-UA.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
-IDD_DLG_SCREEN DIALOGEX DISCARDABLE  0, 0, 172, 57
+IDD_DLG_SCREEN DIALOGEX 0, 0, 172, 57
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Параметри заставки ""Метелики"""
 FONT 8, "MS Shell Dlg"
@@ -12,7 +12,7 @@ BEGIN
     PUSHBUTTON      "Про",IDABOUT,115,35,50,14
 END
 
-IDD_DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 149, 79
+IDD_DLG_ABOUT DIALOGEX 0, 0, 149, 79
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Про"
 FONT 8, "MS Shell Dlg"
@@ -28,7 +28,7 @@ BEGIN
                     NOT WS_GROUP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Заставка ""Метелики"""
 END
diff --git a/modules/rosapps/applications/screensavers/butterflies/lang/zh-CN.rc
b/modules/rosapps/applications/screensavers/butterflies/lang/zh-CN.rc
index ea949fd25af..07f4f2f8ad7 100644
--- a/modules/rosapps/applications/screensavers/butterflies/lang/zh-CN.rc
+++ b/modules/rosapps/applications/screensavers/butterflies/lang/zh-CN.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
-IDD_DLG_SCREEN DIALOGEX DISCARDABLE  0, 0, 172, 57
+IDD_DLG_SCREEN DIALOGEX 0, 0, 172, 57
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "蝴蝶屏幕保护程序设置"
 FONT 9, "宋体"
@@ -14,7 +14,7 @@ BEGIN
     PUSHBUTTON      "关于",IDABOUT,115,35,50,14
 END
 
-IDD_DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 149, 79
+IDD_DLG_ABOUT DIALOGEX 0, 0, 149, 79
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "关于"
 FONT 9, "宋体"
@@ -30,7 +30,7 @@ BEGIN
                     NOT WS_GROUP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "蝴蝶屏幕保护程序"
 END
diff --git a/modules/rosapps/applications/screensavers/butterflies/lang/zh-HK.rc
b/modules/rosapps/applications/screensavers/butterflies/lang/zh-HK.rc
index a22854e80b2..c7c95780b11 100644
--- a/modules/rosapps/applications/screensavers/butterflies/lang/zh-HK.rc
+++ b/modules/rosapps/applications/screensavers/butterflies/lang/zh-HK.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG
 
-IDD_DLG_SCREEN DIALOGEX DISCARDABLE  0, 0, 172, 57
+IDD_DLG_SCREEN DIALOGEX 0, 0, 172, 57
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "蝴蝶螢幕保護程式設定"
 FONT 9, "新細明體"
@@ -19,7 +19,7 @@ BEGIN
     PUSHBUTTON      "關於",IDABOUT,115,35,50,14
 END
 
-IDD_DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 149, 79
+IDD_DLG_ABOUT DIALOGEX 0, 0, 149, 79
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "關於"
 FONT 9, "新細明體"
@@ -35,7 +35,7 @@ BEGIN
                     NOT WS_GROUP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "蝴蝶螢幕保護程式"
 END
diff --git a/modules/rosapps/applications/screensavers/butterflies/lang/zh-TW.rc
b/modules/rosapps/applications/screensavers/butterflies/lang/zh-TW.rc
index 83d2ea00b19..3ee86ab4d86 100644
--- a/modules/rosapps/applications/screensavers/butterflies/lang/zh-TW.rc
+++ b/modules/rosapps/applications/screensavers/butterflies/lang/zh-TW.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 
-IDD_DLG_SCREEN DIALOGEX DISCARDABLE  0, 0, 172, 57
+IDD_DLG_SCREEN DIALOGEX 0, 0, 172, 57
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "蝴蝶螢幕保護程式設定"
 FONT 9, "新細明體"
@@ -19,7 +19,7 @@ BEGIN
     PUSHBUTTON      "關於",IDABOUT,115,35,50,14
 END
 
-IDD_DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 149, 79
+IDD_DLG_ABOUT DIALOGEX 0, 0, 149, 79
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "關於"
 FONT 9, "新細明體"
@@ -35,7 +35,7 @@ BEGIN
                     NOT WS_GROUP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "蝴蝶螢幕保護程式"
 END
diff --git a/modules/rosapps/applications/screensavers/circles/circles.rc
b/modules/rosapps/applications/screensavers/circles/circles.rc
index 6e858536e06..5b920a17799 100644
--- a/modules/rosapps/applications/screensavers/circles/circles.rc
+++ b/modules/rosapps/applications/screensavers/circles/circles.rc
@@ -4,12 +4,12 @@
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
-IDI_ICON  ICON  DISCARDABLE  "res/icon_circles.ico"
+IDI_ICON ICON "res/icon_circles.ico"
 
 #define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION    "Circles ScreenSaver\0"
-#define REACTOS_STR_INTERNAL_NAME       "circles\0"
-#define REACTOS_STR_ORIGINAL_FILENAME   "circles.scr\0"
+#define REACTOS_STR_FILE_DESCRIPTION    "Circles ScreenSaver"
+#define REACTOS_STR_INTERNAL_NAME       "circles"
+#define REACTOS_STR_ORIGINAL_FILENAME   "circles.scr"
 
 #include <reactos/version.rc>
 
diff --git a/modules/rosapps/applications/screensavers/circles/lang/de-DE.rc
b/modules/rosapps/applications/screensavers/circles/lang/de-DE.rc
index 227a74d17a4..fe404e28d03 100644
--- a/modules/rosapps/applications/screensavers/circles/lang/de-DE.rc
+++ b/modules/rosapps/applications/screensavers/circles/lang/de-DE.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Kreise"
     IDS_TEXT        "Keine Einstellungen notwendig."
diff --git a/modules/rosapps/applications/screensavers/circles/lang/en-US.rc
b/modules/rosapps/applications/screensavers/circles/lang/en-US.rc
index 231497fd03c..8d4c12e8600 100644
--- a/modules/rosapps/applications/screensavers/circles/lang/en-US.rc
+++ b/modules/rosapps/applications/screensavers/circles/lang/en-US.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Circles"
     IDS_TEXT        "No options need to be set."
diff --git a/modules/rosapps/applications/screensavers/circles/lang/es-ES.rc
b/modules/rosapps/applications/screensavers/circles/lang/es-ES.rc
index ac01f2a19d6..81a91e41a11 100644
--- a/modules/rosapps/applications/screensavers/circles/lang/es-ES.rc
+++ b/modules/rosapps/applications/screensavers/circles/lang/es-ES.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Círculos"
     IDS_TEXT        "Ninguna opción necesita ser configurada."
diff --git a/modules/rosapps/applications/screensavers/circles/lang/fr-FR.rc
b/modules/rosapps/applications/screensavers/circles/lang/fr-FR.rc
index 94130ba64e7..cae1f1e7252 100644
--- a/modules/rosapps/applications/screensavers/circles/lang/fr-FR.rc
+++ b/modules/rosapps/applications/screensavers/circles/lang/fr-FR.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Cercles"
     IDS_TEXT        "Il n'y a aucune option à définir."
diff --git a/modules/rosapps/applications/screensavers/circles/lang/it-IT.rc
b/modules/rosapps/applications/screensavers/circles/lang/it-IT.rc
index d497837f57b..9d3072711ec 100644
--- a/modules/rosapps/applications/screensavers/circles/lang/it-IT.rc
+++ b/modules/rosapps/applications/screensavers/circles/lang/it-IT.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Cerchi"
     IDS_TEXT        "Non ci sono opzioni da impostare."
diff --git a/modules/rosapps/applications/screensavers/circles/lang/no-NO.rc
b/modules/rosapps/applications/screensavers/circles/lang/no-NO.rc
index ff5e94109a3..efe8f9c6348 100644
--- a/modules/rosapps/applications/screensavers/circles/lang/no-NO.rc
+++ b/modules/rosapps/applications/screensavers/circles/lang/no-NO.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Sirkeler"
     IDS_TEXT        "Ingen valg trenges å settes."
diff --git a/modules/rosapps/applications/screensavers/circles/lang/pl-PL.rc
b/modules/rosapps/applications/screensavers/circles/lang/pl-PL.rc
index b4d8b1ad23d..20259c2db5c 100644
--- a/modules/rosapps/applications/screensavers/circles/lang/pl-PL.rc
+++ b/modules/rosapps/applications/screensavers/circles/lang/pl-PL.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Kółka"
     IDS_TEXT        "Brak opcji do ustawiania."
diff --git a/modules/rosapps/applications/screensavers/circles/lang/ro-RO.rc
b/modules/rosapps/applications/screensavers/circles/lang/ro-RO.rc
index 230556ad54d..3625ae6c5c7 100644
--- a/modules/rosapps/applications/screensavers/circles/lang/ro-RO.rc
+++ b/modules/rosapps/applications/screensavers/circles/lang/ro-RO.rc
@@ -10,7 +10,7 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Cercuri (animație de inactivitate)"
     IDS_TEXT        "Nu este necesară stabilirea de opțiuni."
diff --git a/modules/rosapps/applications/screensavers/circles/lang/ru-RU.rc
b/modules/rosapps/applications/screensavers/circles/lang/ru-RU.rc
index 17a01722b7c..0508119b383 100644
--- a/modules/rosapps/applications/screensavers/circles/lang/ru-RU.rc
+++ b/modules/rosapps/applications/screensavers/circles/lang/ru-RU.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Заставка ""Круги"""
     IDS_TEXT        "Эта заставка не имеет настраиваемых параметров."
diff --git a/modules/rosapps/applications/screensavers/circles/lang/sk-SK.rc
b/modules/rosapps/applications/screensavers/circles/lang/sk-SK.rc
index 40e6f120e64..2bfbd0f3ba8 100644
--- a/modules/rosapps/applications/screensavers/circles/lang/sk-SK.rc
+++ b/modules/rosapps/applications/screensavers/circles/lang/sk-SK.rc
@@ -4,7 +4,7 @@
 
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Kruhy"
     IDS_TEXT        "Nie sú potrebné žiadne nastavenia."
diff --git a/modules/rosapps/applications/screensavers/circles/lang/tr-TR.rc
b/modules/rosapps/applications/screensavers/circles/lang/tr-TR.rc
index 76b81e8be7d..c7e2b7fff29 100644
--- a/modules/rosapps/applications/screensavers/circles/lang/tr-TR.rc
+++ b/modules/rosapps/applications/screensavers/circles/lang/tr-TR.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_TURKISH, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Çemberler"
     IDS_TEXT        "Hiçbir seçeneğin ayarlanması gerekmez."
diff --git a/modules/rosapps/applications/screensavers/circles/lang/uk-UA.rc
b/modules/rosapps/applications/screensavers/circles/lang/uk-UA.rc
index 876a582fe76..72b6d917699 100644
--- a/modules/rosapps/applications/screensavers/circles/lang/uk-UA.rc
+++ b/modules/rosapps/applications/screensavers/circles/lang/uk-UA.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Заставка ""Кола"""
     IDS_TEXT        "Ця заставка не має налаштовуваних параметрів."
diff --git a/modules/rosapps/applications/screensavers/circles/lang/zh-CN.rc
b/modules/rosapps/applications/screensavers/circles/lang/zh-CN.rc
index 676df289c24..26a1386fd34 100644
--- a/modules/rosapps/applications/screensavers/circles/lang/zh-CN.rc
+++ b/modules/rosapps/applications/screensavers/circles/lang/zh-CN.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "圆圈"
     IDS_TEXT        "没有需要设置的选项。"
diff --git a/modules/rosapps/applications/screensavers/circles/lang/zh-HK.rc
b/modules/rosapps/applications/screensavers/circles/lang/zh-HK.rc
index bf08667dd85..e72c3a13caf 100644
--- a/modules/rosapps/applications/screensavers/circles/lang/zh-HK.rc
+++ b/modules/rosapps/applications/screensavers/circles/lang/zh-HK.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "圓形"
     IDS_TEXT        "沒有可設定的選項。"
diff --git a/modules/rosapps/applications/screensavers/circles/lang/zh-TW.rc
b/modules/rosapps/applications/screensavers/circles/lang/zh-TW.rc
index 19983968d78..42992555755 100644
--- a/modules/rosapps/applications/screensavers/circles/lang/zh-TW.rc
+++ b/modules/rosapps/applications/screensavers/circles/lang/zh-TW.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "圓形"
     IDS_TEXT        "沒有可設定的選項。"
diff --git a/modules/rosapps/applications/screensavers/cylfrac/cylfrac.rc
b/modules/rosapps/applications/screensavers/cylfrac/cylfrac.rc
index 4d481dbc743..95decd17185 100644
--- a/modules/rosapps/applications/screensavers/cylfrac/cylfrac.rc
+++ b/modules/rosapps/applications/screensavers/cylfrac/cylfrac.rc
@@ -4,12 +4,12 @@
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
-IDI_ICON  ICON  DISCARDABLE  "res/icon_cylfrac.ico"
+IDI_ICON ICON "res/icon_cylfrac.ico"
 
 #define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION    "Cylinders fractal ScreenSaver\0"
-#define REACTOS_STR_INTERNAL_NAME       "cylfrac\0"
-#define REACTOS_STR_ORIGINAL_FILENAME   "cylfrac.scr\0"
+#define REACTOS_STR_FILE_DESCRIPTION    "Cylinders fractal ScreenSaver"
+#define REACTOS_STR_INTERNAL_NAME       "cylfrac"
+#define REACTOS_STR_ORIGINAL_FILENAME   "cylfrac.scr"
 
 #include <reactos/version.rc>
 
diff --git a/modules/rosapps/applications/screensavers/cylfrac/lang/bg-BG.rc
b/modules/rosapps/applications/screensavers/cylfrac/lang/bg-BG.rc
index 41ff6b3336f..b9ff60aee58 100644
--- a/modules/rosapps/applications/screensavers/cylfrac/lang/bg-BG.rc
+++ b/modules/rosapps/applications/screensavers/cylfrac/lang/bg-BG.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Цилиндрични фрактали"
     IDS_TITLE       "За"
diff --git a/modules/rosapps/applications/screensavers/cylfrac/lang/de-DE.rc
b/modules/rosapps/applications/screensavers/cylfrac/lang/de-DE.rc
index 99b0cbf849c..841ef9b4cbf 100644
--- a/modules/rosapps/applications/screensavers/cylfrac/lang/de-DE.rc
+++ b/modules/rosapps/applications/screensavers/cylfrac/lang/de-DE.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Cylinders Fractal"
     IDS_TITLE       "Über"
diff --git a/modules/rosapps/applications/screensavers/cylfrac/lang/en-US.rc
b/modules/rosapps/applications/screensavers/cylfrac/lang/en-US.rc
index dbdfceaff80..f257d54b5f2 100644
--- a/modules/rosapps/applications/screensavers/cylfrac/lang/en-US.rc
+++ b/modules/rosapps/applications/screensavers/cylfrac/lang/en-US.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Cylinders fractal"
     IDS_TITLE       "About"
diff --git a/modules/rosapps/applications/screensavers/cylfrac/lang/es-ES.rc
b/modules/rosapps/applications/screensavers/cylfrac/lang/es-ES.rc
index 15d0fc36234..c94e8866c08 100644
--- a/modules/rosapps/applications/screensavers/cylfrac/lang/es-ES.rc
+++ b/modules/rosapps/applications/screensavers/cylfrac/lang/es-ES.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Cilindros fractales"
     IDS_TITLE       "Acerca de"
diff --git a/modules/rosapps/applications/screensavers/cylfrac/lang/fr-FR.rc
b/modules/rosapps/applications/screensavers/cylfrac/lang/fr-FR.rc
index c5a3ef84bfe..7d41feb4049 100644
--- a/modules/rosapps/applications/screensavers/cylfrac/lang/fr-FR.rc
+++ b/modules/rosapps/applications/screensavers/cylfrac/lang/fr-FR.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Fractale de cylindres"
     IDS_TITLE       "À propos de"
diff --git a/modules/rosapps/applications/screensavers/cylfrac/lang/it-IT.rc
b/modules/rosapps/applications/screensavers/cylfrac/lang/it-IT.rc
index 93a3c580624..a0735703ec9 100644
--- a/modules/rosapps/applications/screensavers/cylfrac/lang/it-IT.rc
+++ b/modules/rosapps/applications/screensavers/cylfrac/lang/it-IT.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Cilindri frattali"
     IDS_TITLE       "Informazioni"
diff --git a/modules/rosapps/applications/screensavers/cylfrac/lang/lt-LT.rc
b/modules/rosapps/applications/screensavers/cylfrac/lang/lt-LT.rc
index 6be189e584d..78ff23a3a9c 100644
--- a/modules/rosapps/applications/screensavers/cylfrac/lang/lt-LT.rc
+++ b/modules/rosapps/applications/screensavers/cylfrac/lang/lt-LT.rc
@@ -9,7 +9,7 @@
 
 LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Cilindrinis fraktalas"
     IDS_TITLE       "Apie"
diff --git a/modules/rosapps/applications/screensavers/cylfrac/lang/nl-NL.rc
b/modules/rosapps/applications/screensavers/cylfrac/lang/nl-NL.rc
index 5f3ccde36ee..ca0940c8330 100644
--- a/modules/rosapps/applications/screensavers/cylfrac/lang/nl-NL.rc
+++ b/modules/rosapps/applications/screensavers/cylfrac/lang/nl-NL.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Cylinders fractal"
     IDS_TITLE       "Informatie"
diff --git a/modules/rosapps/applications/screensavers/cylfrac/lang/no-NO.rc
b/modules/rosapps/applications/screensavers/cylfrac/lang/no-NO.rc
index 9f75d33207f..6d642cda6be 100644
--- a/modules/rosapps/applications/screensavers/cylfrac/lang/no-NO.rc
+++ b/modules/rosapps/applications/screensavers/cylfrac/lang/no-NO.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
    IDS_DESCRIPTION "Sylindere fraktal"
    IDS_TITLE       "Om"
diff --git a/modules/rosapps/applications/screensavers/cylfrac/lang/pl-PL.rc
b/modules/rosapps/applications/screensavers/cylfrac/lang/pl-PL.rc
index c9aca2a3af3..1b2e28a1e9f 100644
--- a/modules/rosapps/applications/screensavers/cylfrac/lang/pl-PL.rc
+++ b/modules/rosapps/applications/screensavers/cylfrac/lang/pl-PL.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Fraktale cylindryczne"
     IDS_TITLE       "O programie"
diff --git a/modules/rosapps/applications/screensavers/cylfrac/lang/ro-RO.rc
b/modules/rosapps/applications/screensavers/cylfrac/lang/ro-RO.rc
index 6b3c7f70971..3117f343c15 100644
--- a/modules/rosapps/applications/screensavers/cylfrac/lang/ro-RO.rc
+++ b/modules/rosapps/applications/screensavers/cylfrac/lang/ro-RO.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Fractal cilindri (animație de inactivitate)"
     IDS_TITLE       "Despre"
diff --git a/modules/rosapps/applications/screensavers/cylfrac/lang/ru-RU.rc
b/modules/rosapps/applications/screensavers/cylfrac/lang/ru-RU.rc
index e4aaac37f2c..b9fe58e7204 100644
--- a/modules/rosapps/applications/screensavers/cylfrac/lang/ru-RU.rc
+++ b/modules/rosapps/applications/screensavers/cylfrac/lang/ru-RU.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Заставка ""Cylinders fractal"""
     IDS_TITLE       "О программе"
diff --git a/modules/rosapps/applications/screensavers/cylfrac/lang/sk-SK.rc
b/modules/rosapps/applications/screensavers/cylfrac/lang/sk-SK.rc
index c51d15ec1c4..a069abe8e02 100644
--- a/modules/rosapps/applications/screensavers/cylfrac/lang/sk-SK.rc
+++ b/modules/rosapps/applications/screensavers/cylfrac/lang/sk-SK.rc
@@ -4,7 +4,7 @@
 
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Cylinders fractal"
     IDS_TITLE       "Čo je ..."
diff --git a/modules/rosapps/applications/screensavers/cylfrac/lang/tr-TR.rc
b/modules/rosapps/applications/screensavers/cylfrac/lang/tr-TR.rc
index 649531d309f..9ef096a4696 100644
--- a/modules/rosapps/applications/screensavers/cylfrac/lang/tr-TR.rc
+++ b/modules/rosapps/applications/screensavers/cylfrac/lang/tr-TR.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_TURKISH, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Silindirik Fractaller"
     IDS_TITLE       "Hakkında"
diff --git a/modules/rosapps/applications/screensavers/cylfrac/lang/uk-UA.rc
b/modules/rosapps/applications/screensavers/cylfrac/lang/uk-UA.rc
index 2f08a0f2ddd..10ec907ff48 100644
--- a/modules/rosapps/applications/screensavers/cylfrac/lang/uk-UA.rc
+++ b/modules/rosapps/applications/screensavers/cylfrac/lang/uk-UA.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Заставка ""Cylinders fractal"""
     IDS_TITLE       "Про"
diff --git a/modules/rosapps/applications/screensavers/cylfrac/lang/zh-CN.rc
b/modules/rosapps/applications/screensavers/cylfrac/lang/zh-CN.rc
index 585473ad4c9..86996b478d2 100644
--- a/modules/rosapps/applications/screensavers/cylfrac/lang/zh-CN.rc
+++ b/modules/rosapps/applications/screensavers/cylfrac/lang/zh-CN.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "圆筒形"
     IDS_TITLE       "关于"
diff --git a/modules/rosapps/applications/screensavers/cylfrac/lang/zh-HK.rc
b/modules/rosapps/applications/screensavers/cylfrac/lang/zh-HK.rc
index 33c68f79fd3..1a3f0bd3b9e 100644
--- a/modules/rosapps/applications/screensavers/cylfrac/lang/zh-HK.rc
+++ b/modules/rosapps/applications/screensavers/cylfrac/lang/zh-HK.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "分形圓筒"
     IDS_TITLE       "關於"
diff --git a/modules/rosapps/applications/screensavers/cylfrac/lang/zh-TW.rc
b/modules/rosapps/applications/screensavers/cylfrac/lang/zh-TW.rc
index 50586a2e98b..37c71e4a56f 100644
--- a/modules/rosapps/applications/screensavers/cylfrac/lang/zh-TW.rc
+++ b/modules/rosapps/applications/screensavers/cylfrac/lang/zh-TW.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "分形圓筒"
     IDS_TITLE       "關於"
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/bg-BG.rc
b/modules/rosapps/applications/screensavers/matrix/lang/bg-BG.rc
index 435f7f1a53e..94e6aacbf6a 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/bg-BG.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/bg-BG.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
-IDD_CONFIG DIALOGEX DISCARDABLE  0, 0, 340, 183
+IDD_CONFIG DIALOGEX 0, 0, 340, 183
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Настройка на екранен предпазител Matrix"
 FONT 8, "MS Shell Dlg"
@@ -47,7 +47,7 @@ BEGIN
                     158,75,18
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Екранен предпазител Matrix"
 END
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/de-DE.rc
b/modules/rosapps/applications/screensavers/matrix/lang/de-DE.rc
index 101e574cbb3..4bf36de9311 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/de-DE.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/de-DE.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
-IDD_CONFIG DIALOGEX DISCARDABLE  0, 0, 340, 183
+IDD_CONFIG DIALOGEX 0, 0, 340, 183
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Matrix Bildschirmschoner-Konfiguration"
 FONT 8, "MS Shell Dlg"
@@ -46,7 +46,7 @@ BEGIN
     CTEXT           "Matrix ScreenSaver www.catch22.org.uk",IDC_ABOUT,143T,143, 158,
75, 18
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Matrix Bildschirmschoner"
 END
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/en-US.rc
b/modules/rosapps/applications/screensavers/matrix/lang/en-US.rc
index 79a31619783..817083d04b9 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/en-US.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/en-US.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
-IDD_CONFIG DIALOGEX DISCARDABLE  0, 0, 340, 183
+IDD_CONFIG DIALOGEX 0, 0, 340, 183
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Matrix ScreenSaver Configuration"
 FONT 8, "MS Shell Dlg"
@@ -47,7 +47,7 @@ BEGIN
                     158,75,18
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Matrix ScreenSaver"
 END
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/es-ES.rc
b/modules/rosapps/applications/screensavers/matrix/lang/es-ES.rc
index 9652d2c55a6..4b37d9ea12e 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/es-ES.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/es-ES.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
-IDD_CONFIG DIALOGEX DISCARDABLE  0, 0, 340, 183
+IDD_CONFIG DIALOGEX 0, 0, 340, 183
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Configuración del Salvapantallas Matrix"
 FONT 8, "MS Shell Dlg"
@@ -47,7 +47,7 @@ BEGIN
                     158,75,18
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Salvapantallas Matrix"
 END
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/fr-FR.rc
b/modules/rosapps/applications/screensavers/matrix/lang/fr-FR.rc
index de8a38c478c..621077c0e32 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/fr-FR.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/fr-FR.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
-IDD_CONFIG DIALOGEX DISCARDABLE  0, 0, 340, 183
+IDD_CONFIG DIALOGEX 0, 0, 340, 183
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Configuration de l'écran de veille Matrix"
 FONT 8, "MS Shell Dlg"
@@ -47,7 +47,7 @@ BEGIN
                     158,75,18
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Écran de veille Matrix"
 END
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/lt-LT.rc
b/modules/rosapps/applications/screensavers/matrix/lang/lt-LT.rc
index 3e0208f4d6c..37c1f7bc63c 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/lt-LT.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/lt-LT.rc
@@ -11,7 +11,7 @@
 
 LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
 
-IDD_CONFIG DIALOGEX DISCARDABLE  0, 0, 340, 183
+IDD_CONFIG DIALOGEX 0, 0, 340, 183
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Ekrano užsklandos nustatymai"
 FONT 8, "MS Shell Dlg"
@@ -56,7 +56,7 @@ BEGIN
                     151,75,25
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Matrica"
 END
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/nl-NL.rc
b/modules/rosapps/applications/screensavers/matrix/lang/nl-NL.rc
index e2ba43ff3b8..9e2eb627543 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/nl-NL.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/nl-NL.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
-IDD_CONFIG DIALOGEX DISCARDABLE  0, 0, 340, 183
+IDD_CONFIG DIALOGEX 0, 0, 340, 183
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Matrix Schermbeveiliging Configuratie"
 FONT 8, "MS Shell Dlg"
@@ -47,7 +47,7 @@ BEGIN
                     158,75,18
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Matrix Schermbeveiliging"
 END
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/no-NO.rc
b/modules/rosapps/applications/screensavers/matrix/lang/no-NO.rc
index c16698ea559..ae9c9f9c74b 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/no-NO.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/no-NO.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
 
-IDD_CONFIG DIALOGEX DISCARDABLE  0, 0, 340, 183
+IDD_CONFIG DIALOGEX 0, 0, 340, 183
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Matrix Skjermsparer konfigurasjon"
 FONT 8, "MS Shell Dlg"
@@ -47,7 +47,7 @@ BEGIN
                     158,75,18
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Matrix Skjermsparer"
 END
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/pl-PL.rc
b/modules/rosapps/applications/screensavers/matrix/lang/pl-PL.rc
index b0b7e58aa6f..c7bfc2bdf16 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/pl-PL.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/pl-PL.rc
@@ -9,7 +9,7 @@
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
-IDD_CONFIG DIALOGEX DISCARDABLE  0, 0, 340, 183
+IDD_CONFIG DIALOGEX 0, 0, 340, 183
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Konfiguracja wygaszacza Matrix"
 FONT 8, "MS Shell Dlg"
@@ -54,7 +54,7 @@ BEGIN
                     158,75,18
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Matrix"
 END
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/ro-RO.rc
b/modules/rosapps/applications/screensavers/matrix/lang/ro-RO.rc
index 96f32047208..5c5b0e65fbd 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/ro-RO.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/ro-RO.rc
@@ -12,7 +12,7 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)
 
-IDD_CONFIG DIALOGEX DISCARDABLE  0, 0, 340, 183
+IDD_CONFIG DIALOGEX 0, 0, 340, 183
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Setări pentru economizorul de ecran Matrix"
 FONT 8, "MS Shell Dlg"
@@ -57,7 +57,7 @@ BEGIN
                     158,75,18
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Economizorul de ecran Matrix"
 END
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/ru-RU.rc
b/modules/rosapps/applications/screensavers/matrix/lang/ru-RU.rc
index 49a4c27a17f..e0223244c53 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/ru-RU.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/ru-RU.rc
@@ -10,7 +10,7 @@
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
-IDD_CONFIG DIALOGEX DISCARDABLE  0, 0, 340, 183
+IDD_CONFIG DIALOGEX 0, 0, 340, 183
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Параметры заставки ""Матрица"""
 FONT 8, "MS Shell Dlg"
@@ -55,7 +55,7 @@ BEGIN
                     158,75,18
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Заставка ""Матрица"""
 END
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/sk-SK.rc
b/modules/rosapps/applications/screensavers/matrix/lang/sk-SK.rc
index 96205f9e2c1..548bf67ee80 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/sk-SK.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/sk-SK.rc
@@ -10,7 +10,7 @@
 
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 
-IDD_CONFIG DIALOGEX DISCARDABLE  0, 0, 340, 183
+IDD_CONFIG DIALOGEX 0, 0, 340, 183
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Nastavenie šetriča obrazovky Matrix"
 FONT 8, "MS Shell Dlg"
@@ -55,7 +55,7 @@ BEGIN
     PUSHBUTTON      "Zrušiť",IDCANCEL,283,162,50,14
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Matrix - šetrič obrazovky"
 END
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/th-TH.rc
b/modules/rosapps/applications/screensavers/matrix/lang/th-TH.rc
index 58523fbe853..e81e5ef0c9e 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/th-TH.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/th-TH.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_THAI, SUBLANG_DEFAULT
 
-IDD_CONFIG DIALOGEX DISCARDABLE  0, 0, 340, 183
+IDD_CONFIG DIALOGEX 0, 0, 340, 183
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Matrix ScreenSaver Configuration"
 FONT 8, "MS Shell Dlg"
@@ -47,7 +47,7 @@ BEGIN
                     158,75,18
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Matrix ScreenSaver"
 END
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/tr-TR.rc
b/modules/rosapps/applications/screensavers/matrix/lang/tr-TR.rc
index 229a1e02a9f..9a302849061 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/tr-TR.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/tr-TR.rc
@@ -9,7 +9,7 @@
 
 LANGUAGE LANG_TURKISH, SUBLANG_NEUTRAL
 
-IDD_CONFIG DIALOGEX DISCARDABLE  0, 0, 340, 183
+IDD_CONFIG DIALOGEX  0, 0, 340, 183
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Matrix Ekran Koruyucusu Yapılandırması"
 FONT 8, "MS Shell Dlg"
@@ -54,7 +54,7 @@ BEGIN
                     158,75,18
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Matrix Ekran Koruyucu"
 END
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/uk-UA.rc
b/modules/rosapps/applications/screensavers/matrix/lang/uk-UA.rc
index b2b3089d08e..ce9bc2ea986 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/uk-UA.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/uk-UA.rc
@@ -10,7 +10,7 @@
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
-IDD_CONFIG DIALOGEX DISCARDABLE  0, 0, 340, 183
+IDD_CONFIG DIALOGEX 0, 0, 340, 183
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Параметри заставки ""Матриця"""
 FONT 8, "MS Shell Dlg"
@@ -55,7 +55,7 @@ BEGIN
                     158,75,18
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Заставка ""Матриця"""
 END
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/zh-CN.rc
b/modules/rosapps/applications/screensavers/matrix/lang/zh-CN.rc
index 8e2421ce379..4e3eb9b280c 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/zh-CN.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/zh-CN.rc
@@ -4,7 +4,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
-IDD_CONFIG DIALOGEX DISCARDABLE  0, 0, 340, 183
+IDD_CONFIG DIALOGEX 0, 0, 340, 183
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Matrix 屏幕保护程序配置"
 FONT 9, "宋体"
@@ -49,7 +49,7 @@ BEGIN
                     158,75,18
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Matrix 屏幕保护"
 END
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/zh-HK.rc
b/modules/rosapps/applications/screensavers/matrix/lang/zh-HK.rc
index c49e46b20a6..97c95dd45cf 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/zh-HK.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/zh-HK.rc
@@ -9,7 +9,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG
 
-IDD_CONFIG DIALOGEX DISCARDABLE  0, 0, 340, 183
+IDD_CONFIG DIALOGEX 0, 0, 340, 183
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "矩陣螢幕保護程式設定"
 FONT 9, "新細明體"
@@ -54,7 +54,7 @@ BEGIN
                     158,75,18
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "矩陣螢幕保護程式"
 END
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/zh-TW.rc
b/modules/rosapps/applications/screensavers/matrix/lang/zh-TW.rc
index d5cf0efd1c7..466c3d5c7ca 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/zh-TW.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/zh-TW.rc
@@ -9,7 +9,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 
-IDD_CONFIG DIALOGEX DISCARDABLE  0, 0, 340, 183
+IDD_CONFIG DIALOGEX 0, 0, 340, 183
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "矩陣螢幕保護程式設定"
 FONT 9, "新細明體"
@@ -54,7 +54,7 @@ BEGIN
                     158,75,18
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "矩陣螢幕保護程式"
 END
diff --git a/modules/rosapps/applications/screensavers/matrix/rsrc.rc
b/modules/rosapps/applications/screensavers/matrix/rsrc.rc
index 4873f85b923..ba3ca56db81 100644
--- a/modules/rosapps/applications/screensavers/matrix/rsrc.rc
+++ b/modules/rosapps/applications/screensavers/matrix/rsrc.rc
@@ -3,9 +3,9 @@
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
-IDB_BITMAP1      BITMAP  DISCARDABLE  "matrix.bmp"
-IDC_BLANKCURSOR  CURSOR  DISCARDABLE  "cursor1.cur"
-IDI_ICON1        ICON    DISCARDABLE  "icon1.ico"
+IDB_BITMAP1      BITMAP  "matrix.bmp"
+IDC_BLANKCURSOR  CURSOR  "cursor1.cur"
+IDI_ICON1        ICON    "icon1.ico"
 
 #include <reactos/manifest_exe.rc>
 
diff --git a/modules/rosapps/applications/screensavers/mazescr/lang/de-DE.rc
b/modules/rosapps/applications/screensavers/mazescr/lang/de-DE.rc
index cce0c41bb99..1da7a75e43c 100644
--- a/modules/rosapps/applications/screensavers/mazescr/lang/de-DE.rc
+++ b/modules/rosapps/applications/screensavers/mazescr/lang/de-DE.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
-IDD_DLG_SCREEN DIALOGEX DISCARDABLE  0, 0, 276, 112
+IDD_DLG_SCREEN DIALOGEX 0, 0, 276, 112
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Labyrinth Bildschirmschoner Einstellungen"
 FONT 8, "MS Shell Dlg"
@@ -22,7 +22,7 @@ BEGIN
     PUSHBUTTON      "Über",IDABOUT,167,91,50,14
 END
 
-IDD_DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 229, 121
+IDD_DLG_ABOUT DIALOGEX 0, 0, 229, 121
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Über"
 FONT 8, "MS Shell Dlg"
@@ -39,7 +39,7 @@ BEGIN
     DEFPUSHBUTTON   "OK",IDOK,87,100,56,14
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Labyrinth Bildschirmschoner"
 END
diff --git a/modules/rosapps/applications/screensavers/mazescr/lang/en-US.rc
b/modules/rosapps/applications/screensavers/mazescr/lang/en-US.rc
index a2adcbe48db..31653825a93 100644
--- a/modules/rosapps/applications/screensavers/mazescr/lang/en-US.rc
+++ b/modules/rosapps/applications/screensavers/mazescr/lang/en-US.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
-IDD_DLG_SCREEN DIALOGEX DISCARDABLE  0, 0, 276, 112
+IDD_DLG_SCREEN DIALOGEX 0, 0, 276, 112
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Maze ScreenSaver Settings"
 FONT 8, "MS Shell Dlg"
@@ -22,7 +22,7 @@ BEGIN
     PUSHBUTTON      "About",IDABOUT,167,91,50,14
 END
 
-IDD_DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 229, 121
+IDD_DLG_ABOUT DIALOGEX 0, 0, 229, 121
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About"
 FONT 8, "MS Shell Dlg"
@@ -39,7 +39,7 @@ BEGIN
     DEFPUSHBUTTON   "OK",IDOK,87,100,56,14
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Maze Screensaver"
 END
diff --git a/modules/rosapps/applications/screensavers/mazescr/lang/es-ES.rc
b/modules/rosapps/applications/screensavers/mazescr/lang/es-ES.rc
index f0b5003dfe7..01fd68da741 100644
--- a/modules/rosapps/applications/screensavers/mazescr/lang/es-ES.rc
+++ b/modules/rosapps/applications/screensavers/mazescr/lang/es-ES.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
-IDD_DLG_SCREEN DIALOGEX DISCARDABLE  0, 0, 276, 112
+IDD_DLG_SCREEN DIALOGEX 0, 0, 276, 112
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Configuración del Salvapantallas Maze"
 FONT 8, "MS Shell Dlg"
@@ -22,7 +22,7 @@ BEGIN
     PUSHBUTTON      "Acerca de",IDABOUT,167,91,50,14
 END
 
-IDD_DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 229, 121
+IDD_DLG_ABOUT DIALOGEX 0, 0, 229, 121
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Acerca de"
 FONT 8, "MS Shell Dlg"
@@ -39,7 +39,7 @@ BEGIN
     DEFPUSHBUTTON   "OK",IDOK,87,100,56,14
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Salvapantallas Maze"
 END
diff --git a/modules/rosapps/applications/screensavers/mazescr/lang/pl-PL.rc
b/modules/rosapps/applications/screensavers/mazescr/lang/pl-PL.rc
index b84fbb924fa..203c4cf3568 100644
--- a/modules/rosapps/applications/screensavers/mazescr/lang/pl-PL.rc
+++ b/modules/rosapps/applications/screensavers/mazescr/lang/pl-PL.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
-IDD_DLG_SCREEN DIALOGEX DISCARDABLE  0, 0, 276, 112
+IDD_DLG_SCREEN DIALOGEX 0, 0, 276, 112
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Ustawienia wygaszacza Maze"
 FONT 8, "MS Shell Dlg"
@@ -22,7 +22,7 @@ BEGIN
     PUSHBUTTON      "O wygaszaczu",IDABOUT,167,91,50,14
 END
 
-IDD_DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 229, 121
+IDD_DLG_ABOUT DIALOGEX 0, 0, 229, 121
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "O wygaszaczu"
 FONT 8, "MS Shell Dlg"
@@ -39,7 +39,7 @@ BEGIN
     DEFPUSHBUTTON   "OK",IDOK,87,100,56,14
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Wygaszacz Maze"
 END
diff --git a/modules/rosapps/applications/screensavers/mazescr/lang/ro-RO.rc
b/modules/rosapps/applications/screensavers/mazescr/lang/ro-RO.rc
index 8e898130f82..2dd10b9d67a 100644
--- a/modules/rosapps/applications/screensavers/mazescr/lang/ro-RO.rc
+++ b/modules/rosapps/applications/screensavers/mazescr/lang/ro-RO.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT
 
-IDD_DLG_SCREEN DIALOGEX DISCARDABLE  0, 0, 276, 112
+IDD_DLG_SCREEN DIALOGEX 0, 0, 276, 112
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Configurație animație de inactivitate „Labirint”"
 FONT 8, "MS Shell Dlg"
@@ -24,7 +24,7 @@ BEGIN
     PUSHBUTTON      "&Despre",IDABOUT,167,91,50,14
 END
 
-IDD_DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 229, 121
+IDD_DLG_ABOUT DIALOGEX 0, 0, 229, 121
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Despre"
 FONT 8, "MS Shell Dlg"
@@ -41,7 +41,7 @@ BEGIN
     DEFPUSHBUTTON   "Î&nchide",IDOK,87,100,56,14
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Labirint (animație de inactivitate)"
 END
diff --git a/modules/rosapps/applications/screensavers/mazescr/lang/ru-RU.rc
b/modules/rosapps/applications/screensavers/mazescr/lang/ru-RU.rc
index 8a5e7a4e2f2..0b68a180503 100644
--- a/modules/rosapps/applications/screensavers/mazescr/lang/ru-RU.rc
+++ b/modules/rosapps/applications/screensavers/mazescr/lang/ru-RU.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
-IDD_DLG_SCREEN DIALOGEX DISCARDABLE  0, 0, 276, 112
+IDD_DLG_SCREEN DIALOGEX 0, 0, 276, 112
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Maze ScreenSaver Settings"
 FONT 8, "MS Shell Dlg"
@@ -30,7 +30,7 @@ BEGIN
     PUSHBUTTON      "О программе",IDABOUT,167,91,50,14
 END
 
-IDD_DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 229, 121
+IDD_DLG_ABOUT DIALOGEX 0, 0, 229, 121
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "О заставке ""Лабиринт"""
 FONT 8, "MS Shell Dlg"
@@ -47,7 +47,7 @@ BEGIN
     DEFPUSHBUTTON   "OK",IDOK,87,100,56,14
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Заставка ""Лабиринт"""
 END
diff --git a/modules/rosapps/applications/screensavers/mazescr/lang/tr-TR.rc
b/modules/rosapps/applications/screensavers/mazescr/lang/tr-TR.rc
index 350b92c8892..999ab4bbaa4 100644
--- a/modules/rosapps/applications/screensavers/mazescr/lang/tr-TR.rc
+++ b/modules/rosapps/applications/screensavers/mazescr/lang/tr-TR.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_TURKISH, SUBLANG_NEUTRAL
 
-IDD_DLG_SCREEN DIALOGEX DISCARDABLE  0, 0, 276, 112
+IDD_DLG_SCREEN DIALOGEX 0, 0, 276, 112
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Labirent Ekran Koruyucusu Ayarları"
 FONT 8, "MS Shell Dlg"
@@ -29,7 +29,7 @@ BEGIN
     PUSHBUTTON      "Hakkında",IDABOUT,167,91,50,14
 END
 
-IDD_DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 229, 121
+IDD_DLG_ABOUT DIALOGEX 0, 0, 229, 121
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Hakkında"
 FONT 8, "MS Shell Dlg"
@@ -46,7 +46,7 @@ BEGIN
     DEFPUSHBUTTON   "OK",IDOK,87,100,56,14
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Labirent Ekran Koruyucusu"
 END
diff --git a/modules/rosapps/applications/screensavers/mazescr/lang/zh-CN.rc
b/modules/rosapps/applications/screensavers/mazescr/lang/zh-CN.rc
index c00d9bdca75..e4f4ba8be5e 100644
--- a/modules/rosapps/applications/screensavers/mazescr/lang/zh-CN.rc
+++ b/modules/rosapps/applications/screensavers/mazescr/lang/zh-CN.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
-IDD_DLG_SCREEN DIALOGEX DISCARDABLE  0, 0, 276, 112
+IDD_DLG_SCREEN DIALOGEX 0, 0, 276, 112
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "迷宫屏幕保护程序设置"
 FONT 9, "宋体"
@@ -24,7 +24,7 @@ BEGIN
     PUSHBUTTON      "关于",IDABOUT,167,91,50,14
 END
 
-IDD_DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 229, 121
+IDD_DLG_ABOUT DIALOGEX 0, 0, 229, 121
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "关于"
 FONT 9, "宋体"
@@ -41,7 +41,7 @@ BEGIN
     DEFPUSHBUTTON   "确定",IDOK,87,100,56,14
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "迷宫的屏幕保护程序"
 END
diff --git a/modules/rosapps/applications/screensavers/mazescr/lang/zh-HK.rc
b/modules/rosapps/applications/screensavers/mazescr/lang/zh-HK.rc
index 1fd38af03a3..f8a10a06619 100644
--- a/modules/rosapps/applications/screensavers/mazescr/lang/zh-HK.rc
+++ b/modules/rosapps/applications/screensavers/mazescr/lang/zh-HK.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG
 
-IDD_DLG_SCREEN DIALOGEX DISCARDABLE  0, 0, 276, 112
+IDD_DLG_SCREEN DIALOGEX 0, 0, 276, 112
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "迷宮螢幕保護程式設定"
 FONT 9, "新細明體"
@@ -29,7 +29,7 @@ BEGIN
     PUSHBUTTON      "關於",IDABOUT,167,91,50,14
 END
 
-IDD_DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 229, 121
+IDD_DLG_ABOUT DIALOGEX 0, 0, 229, 121
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "關於"
 FONT 9, "新細明體"
@@ -46,7 +46,7 @@ BEGIN
     DEFPUSHBUTTON   "確定",IDOK,87,100,56,14
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "迷宮螢幕保護程式"
 END
diff --git a/modules/rosapps/applications/screensavers/mazescr/lang/zh-TW.rc
b/modules/rosapps/applications/screensavers/mazescr/lang/zh-TW.rc
index 237ad523a70..b2bedc8849c 100644
--- a/modules/rosapps/applications/screensavers/mazescr/lang/zh-TW.rc
+++ b/modules/rosapps/applications/screensavers/mazescr/lang/zh-TW.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 
-IDD_DLG_SCREEN DIALOGEX DISCARDABLE  0, 0, 276, 112
+IDD_DLG_SCREEN DIALOGEX 0, 0, 276, 112
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "迷宮螢幕保護程式設定"
 FONT 9, "新細明體"
@@ -29,7 +29,7 @@ BEGIN
     PUSHBUTTON      "關於",IDABOUT,167,91,50,14
 END
 
-IDD_DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 229, 121
+IDD_DLG_ABOUT DIALOGEX 0, 0, 229, 121
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "關於"
 FONT 9, "新細明體"
@@ -46,7 +46,7 @@ BEGIN
     DEFPUSHBUTTON   "確定",IDOK,87,100,56,14
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "迷宮螢幕保護程式"
 END
diff --git a/modules/rosapps/applications/screensavers/mazescr/maze.rc
b/modules/rosapps/applications/screensavers/mazescr/maze.rc
index 087c5216d4d..bc7ba9d8287 100644
--- a/modules/rosapps/applications/screensavers/mazescr/maze.rc
+++ b/modules/rosapps/applications/screensavers/mazescr/maze.rc
@@ -3,12 +3,12 @@
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
-IDI_ICON  ICON  DISCARDABLE  "res/icon_mazescr.ico"
+IDI_ICON ICON "res/icon_mazescr.ico"
 
 #define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION    "Maze ScreenSaver\0"
-#define REACTOS_STR_INTERNAL_NAME       "Maze\0"
-#define REACTOS_STR_ORIGINAL_FILENAME   "mazescr.scr\0"
+#define REACTOS_STR_FILE_DESCRIPTION    "Maze ScreenSaver"
+#define REACTOS_STR_INTERNAL_NAME       "Maze"
+#define REACTOS_STR_ORIGINAL_FILENAME   "mazescr.scr"
 
 #include <reactos/version.rc>
 
diff --git a/modules/rosapps/applications/screensavers/ssstars/lang/de-DE.rc
b/modules/rosapps/applications/screensavers/ssstars/lang/de-DE.rc
index 3ac92d56d6b..d346de8c34c 100644
--- a/modules/rosapps/applications/screensavers/ssstars/lang/de-DE.rc
+++ b/modules/rosapps/applications/screensavers/ssstars/lang/de-DE.rc
@@ -41,7 +41,7 @@ END
 
 // String Tables
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Starfield"
     IDS_ROTATION_NONE       "Keine"
diff --git a/modules/rosapps/applications/screensavers/ssstars/lang/en-US.rc
b/modules/rosapps/applications/screensavers/ssstars/lang/en-US.rc
index a1658e2335d..b8cd9233964 100644
--- a/modules/rosapps/applications/screensavers/ssstars/lang/en-US.rc
+++ b/modules/rosapps/applications/screensavers/ssstars/lang/en-US.rc
@@ -41,7 +41,7 @@ END
 
 // String Tables
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Starfield"
     IDS_ROTATION_NONE       "None"
diff --git a/modules/rosapps/applications/screensavers/ssstars/lang/es-ES.rc
b/modules/rosapps/applications/screensavers/ssstars/lang/es-ES.rc
index c873e7b420d..cf62675831e 100644
--- a/modules/rosapps/applications/screensavers/ssstars/lang/es-ES.rc
+++ b/modules/rosapps/applications/screensavers/ssstars/lang/es-ES.rc
@@ -49,7 +49,7 @@ END
 
 // String Tables
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Starfield"
     IDS_ROTATION_NONE       "Ninguna"
diff --git a/modules/rosapps/applications/screensavers/ssstars/lang/it-IT.rc
b/modules/rosapps/applications/screensavers/ssstars/lang/it-IT.rc
index 56593997252..d9669032436 100644
--- a/modules/rosapps/applications/screensavers/ssstars/lang/it-IT.rc
+++ b/modules/rosapps/applications/screensavers/ssstars/lang/it-IT.rc
@@ -41,7 +41,7 @@ END
 
 // String Tables
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Campo stellare"
     IDS_ROTATION_NONE       "Nessuna"
diff --git a/modules/rosapps/applications/screensavers/ssstars/lang/pl-PL.rc
b/modules/rosapps/applications/screensavers/ssstars/lang/pl-PL.rc
index 6edb7277db2..b3e7552af8e 100644
--- a/modules/rosapps/applications/screensavers/ssstars/lang/pl-PL.rc
+++ b/modules/rosapps/applications/screensavers/ssstars/lang/pl-PL.rc
@@ -41,7 +41,7 @@ END
 
 // String Tables
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Gwiezdne pole"
     IDS_ROTATION_NONE       "brak"
diff --git a/modules/rosapps/applications/screensavers/ssstars/lang/ro-RO.rc
b/modules/rosapps/applications/screensavers/ssstars/lang/ro-RO.rc
index 37ebf55ebd6..a7ad0751f4b 100644
--- a/modules/rosapps/applications/screensavers/ssstars/lang/ro-RO.rc
+++ b/modules/rosapps/applications/screensavers/ssstars/lang/ro-RO.rc
@@ -49,7 +49,7 @@ END
 
 // String Tables
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Cer înstelat"
     IDS_ROTATION_NONE       "Niciuna"
diff --git a/modules/rosapps/applications/screensavers/ssstars/lang/ru-RU.rc
b/modules/rosapps/applications/screensavers/ssstars/lang/ru-RU.rc
index 75571c1d9e0..083df5c3f79 100644
--- a/modules/rosapps/applications/screensavers/ssstars/lang/ru-RU.rc
+++ b/modules/rosapps/applications/screensavers/ssstars/lang/ru-RU.rc
@@ -41,7 +41,7 @@ END
 
 // String Tables
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Звёздное поле"
     IDS_ROTATION_NONE       "Отсутствует"
diff --git a/modules/rosapps/applications/screensavers/ssstars/lang/tr-TR.rc
b/modules/rosapps/applications/screensavers/ssstars/lang/tr-TR.rc
index 8f13df29c8e..7761a060f26 100644
--- a/modules/rosapps/applications/screensavers/ssstars/lang/tr-TR.rc
+++ b/modules/rosapps/applications/screensavers/ssstars/lang/tr-TR.rc
@@ -48,7 +48,7 @@ END
 
 // String Tables
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "Starfield"
     IDS_ROTATION_NONE       "Hiçbiri"
diff --git a/modules/rosapps/applications/screensavers/ssstars/lang/zh-CN.rc
b/modules/rosapps/applications/screensavers/ssstars/lang/zh-CN.rc
index 4b188fde663..df09e0efa74 100644
--- a/modules/rosapps/applications/screensavers/ssstars/lang/zh-CN.rc
+++ b/modules/rosapps/applications/screensavers/ssstars/lang/zh-CN.rc
@@ -43,7 +43,7 @@ END
 
 // String Tables
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "星空"
     IDS_ROTATION_NONE       "无"
diff --git a/modules/rosapps/applications/screensavers/ssstars/lang/zh-HK.rc
b/modules/rosapps/applications/screensavers/ssstars/lang/zh-HK.rc
index e7ba222cadb..9ee94ad85ad 100644
--- a/modules/rosapps/applications/screensavers/ssstars/lang/zh-HK.rc
+++ b/modules/rosapps/applications/screensavers/ssstars/lang/zh-HK.rc
@@ -48,7 +48,7 @@ END
 
 // String Tables
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "恒星"
     IDS_ROTATION_NONE       "無"
diff --git a/modules/rosapps/applications/screensavers/ssstars/lang/zh-TW.rc
b/modules/rosapps/applications/screensavers/ssstars/lang/zh-TW.rc
index 879c8d15f08..20e7fcb49cf 100644
--- a/modules/rosapps/applications/screensavers/ssstars/lang/zh-TW.rc
+++ b/modules/rosapps/applications/screensavers/ssstars/lang/zh-TW.rc
@@ -48,7 +48,7 @@ END
 
 // String Tables
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION         "恒星"
     IDS_ROTATION_NONE       "無"
diff --git a/modules/rosapps/applications/screensavers/ssstars/resource.rc
b/modules/rosapps/applications/screensavers/ssstars/resource.rc
index aea361e3eca..78ee7984fce 100644
--- a/modules/rosapps/applications/screensavers/ssstars/resource.rc
+++ b/modules/rosapps/applications/screensavers/ssstars/resource.rc
@@ -32,12 +32,11 @@
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 // Icons
-IDI_STARFIELD           ICON    DISCARDABLE     "res/icon_stars.ico"
+IDI_STARFIELD   ICON    "res/icon_stars.ico"
 
 // Bitmap
-
-IDB_COSMOS              BITMAP  DISCARDABLE     "res/cosmicfractal.bmp"
-IDB_STAR                BITMAP  DISCARDABLE     "res/star.bmp"
+IDB_COSMOS      BITMAP  "res/cosmicfractal.bmp"
+IDB_STAR        BITMAP  "res/star.bmp"
 
 #include <reactos/manifest_exe.rc>
 
diff --git a/modules/rosapps/applications/screensavers/starfield/lang/bg-BG.rc
b/modules/rosapps/applications/screensavers/starfield/lang/bg-BG.rc
index cdde6415018..8f6c6099b4c 100644
--- a/modules/rosapps/applications/screensavers/starfield/lang/bg-BG.rc
+++ b/modules/rosapps/applications/screensavers/starfield/lang/bg-BG.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Екранен предпазител „Зведно поле”"
     IDS_TITLE       "За"
diff --git a/modules/rosapps/applications/screensavers/starfield/lang/de-DE.rc
b/modules/rosapps/applications/screensavers/starfield/lang/de-DE.rc
index 0581b8d298b..688c15d1a9b 100644
--- a/modules/rosapps/applications/screensavers/starfield/lang/de-DE.rc
+++ b/modules/rosapps/applications/screensavers/starfield/lang/de-DE.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Starfield Bildschirmschoner"
     IDS_TITLE       "Über"
diff --git a/modules/rosapps/applications/screensavers/starfield/lang/en-US.rc
b/modules/rosapps/applications/screensavers/starfield/lang/en-US.rc
index 1d2ad6d545d..0bfaebf9835 100644
--- a/modules/rosapps/applications/screensavers/starfield/lang/en-US.rc
+++ b/modules/rosapps/applications/screensavers/starfield/lang/en-US.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Starfield ScreenSaver"
     IDS_TITLE       "About"
diff --git a/modules/rosapps/applications/screensavers/starfield/lang/es-ES.rc
b/modules/rosapps/applications/screensavers/starfield/lang/es-ES.rc
index a68dbd08491..e138f24ad7b 100644
--- a/modules/rosapps/applications/screensavers/starfield/lang/es-ES.rc
+++ b/modules/rosapps/applications/screensavers/starfield/lang/es-ES.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Salvapantallas Campo de estrellas"
     IDS_TITLE       "Acerca de"
diff --git a/modules/rosapps/applications/screensavers/starfield/lang/fr-FR.rc
b/modules/rosapps/applications/screensavers/starfield/lang/fr-FR.rc
index 9440ea462df..aba28f7c45e 100644
--- a/modules/rosapps/applications/screensavers/starfield/lang/fr-FR.rc
+++ b/modules/rosapps/applications/screensavers/starfield/lang/fr-FR.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Écran de veille Champ d'étoile"
     IDS_TITLE       "À propos de"
diff --git a/modules/rosapps/applications/screensavers/starfield/lang/it-IT.rc
b/modules/rosapps/applications/screensavers/starfield/lang/it-IT.rc
index 51b00dd72f1..108d01c3d97 100644
--- a/modules/rosapps/applications/screensavers/starfield/lang/it-IT.rc
+++ b/modules/rosapps/applications/screensavers/starfield/lang/it-IT.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Salvaschermo Campo stellare"
     IDS_TITLE       "Informazioni"
diff --git a/modules/rosapps/applications/screensavers/starfield/lang/lt-LT.rc
b/modules/rosapps/applications/screensavers/starfield/lang/lt-LT.rc
index ad6d9b98c18..bbcbcf0dd9a 100644
--- a/modules/rosapps/applications/screensavers/starfield/lang/lt-LT.rc
+++ b/modules/rosapps/applications/screensavers/starfield/lang/lt-LT.rc
@@ -9,7 +9,7 @@
 
 LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Žvaigždžių laukas"
     IDS_TITLE       "Apie"
diff --git a/modules/rosapps/applications/screensavers/starfield/lang/nl-NL.rc
b/modules/rosapps/applications/screensavers/starfield/lang/nl-NL.rc
index 67e77c1e1bb..b49793f2149 100644
--- a/modules/rosapps/applications/screensavers/starfield/lang/nl-NL.rc
+++ b/modules/rosapps/applications/screensavers/starfield/lang/nl-NL.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Sterren Schermbeveiliging"
     IDS_TITLE       "Informatie"
diff --git a/modules/rosapps/applications/screensavers/starfield/lang/no-NO.rc
b/modules/rosapps/applications/screensavers/starfield/lang/no-NO.rc
index aab31683af0..64c37da7a13 100644
--- a/modules/rosapps/applications/screensavers/starfield/lang/no-NO.rc
+++ b/modules/rosapps/applications/screensavers/starfield/lang/no-NO.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Starfield Skjermsparer"
     IDS_TITLE       "Om"
diff --git a/modules/rosapps/applications/screensavers/starfield/lang/pl-PL.rc
b/modules/rosapps/applications/screensavers/starfield/lang/pl-PL.rc
index 3b4f09df426..ad243d1b307 100644
--- a/modules/rosapps/applications/screensavers/starfield/lang/pl-PL.rc
+++ b/modules/rosapps/applications/screensavers/starfield/lang/pl-PL.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Wygaszacz Gwiazdy"
     IDS_TITLE       "O programie"
diff --git a/modules/rosapps/applications/screensavers/starfield/lang/ro-RO.rc
b/modules/rosapps/applications/screensavers/starfield/lang/ro-RO.rc
index e1e5c2952b0..76f1dccd46e 100644
--- a/modules/rosapps/applications/screensavers/starfield/lang/ro-RO.rc
+++ b/modules/rosapps/applications/screensavers/starfield/lang/ro-RO.rc
@@ -10,7 +10,7 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Câmp de stele (animație de inactivitate)"
     IDS_TITLE       "Despre…"
diff --git a/modules/rosapps/applications/screensavers/starfield/lang/sk-SK.rc
b/modules/rosapps/applications/screensavers/starfield/lang/sk-SK.rc
index 30777798a45..98ea09d8ea7 100644
--- a/modules/rosapps/applications/screensavers/starfield/lang/sk-SK.rc
+++ b/modules/rosapps/applications/screensavers/starfield/lang/sk-SK.rc
@@ -4,7 +4,7 @@
 
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Hviezdne pole - šetrič obrazovky"
     IDS_TITLE       "Čo je ..."
diff --git a/modules/rosapps/applications/screensavers/starfield/lang/tr-TR.rc
b/modules/rosapps/applications/screensavers/starfield/lang/tr-TR.rc
index d4a27fd6e9d..2bee6fc2e6a 100644
--- a/modules/rosapps/applications/screensavers/starfield/lang/tr-TR.rc
+++ b/modules/rosapps/applications/screensavers/starfield/lang/tr-TR.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_TURKISH, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Starfield Ekran Koruyucu"
     IDS_TITLE       "Hakkında"
diff --git a/modules/rosapps/applications/screensavers/starfield/lang/uk-UA.rc
b/modules/rosapps/applications/screensavers/starfield/lang/uk-UA.rc
index beed22b4b88..0d9ff8388d2 100644
--- a/modules/rosapps/applications/screensavers/starfield/lang/uk-UA.rc
+++ b/modules/rosapps/applications/screensavers/starfield/lang/uk-UA.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "Заставка ""Зоряне поле"""
     IDS_TITLE       "Про"
diff --git a/modules/rosapps/applications/screensavers/starfield/lang/zh-CN.rc
b/modules/rosapps/applications/screensavers/starfield/lang/zh-CN.rc
index a26e4d2f0a0..0d2da2f3db4 100644
--- a/modules/rosapps/applications/screensavers/starfield/lang/zh-CN.rc
+++ b/modules/rosapps/applications/screensavers/starfield/lang/zh-CN.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "星空屏幕保护程序"
     IDS_TITLE       "关于"
diff --git a/modules/rosapps/applications/screensavers/starfield/lang/zh-HK.rc
b/modules/rosapps/applications/screensavers/starfield/lang/zh-HK.rc
index e1bd7253760..d0c95926a0b 100644
--- a/modules/rosapps/applications/screensavers/starfield/lang/zh-HK.rc
+++ b/modules/rosapps/applications/screensavers/starfield/lang/zh-HK.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "星空螢幕保護程式"
     IDS_TITLE       "關於"
diff --git a/modules/rosapps/applications/screensavers/starfield/lang/zh-TW.rc
b/modules/rosapps/applications/screensavers/starfield/lang/zh-TW.rc
index c0a3b70afb3..fc26fd17aaa 100644
--- a/modules/rosapps/applications/screensavers/starfield/lang/zh-TW.rc
+++ b/modules/rosapps/applications/screensavers/starfield/lang/zh-TW.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_DESCRIPTION "星空螢幕保護程式"
     IDS_TITLE       "關於"
diff --git a/modules/rosapps/applications/screensavers/starfield/starfield.rc
b/modules/rosapps/applications/screensavers/starfield/starfield.rc
index 01960d9058d..ed4a9d63976 100644
--- a/modules/rosapps/applications/screensavers/starfield/starfield.rc
+++ b/modules/rosapps/applications/screensavers/starfield/starfield.rc
@@ -4,12 +4,12 @@
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
-IDI_ICON  ICON  DISCARDABLE  "res/icon_starfield.ico"
+IDI_ICON ICON "res/icon_starfield.ico"
 
 #define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION    "ReactOS Starfield ScreenSaver\0"
-#define REACTOS_STR_INTERNAL_NAME       "starfield\0"
-#define REACTOS_STR_ORIGINAL_FILENAME   "starfield.scr\0"
+#define REACTOS_STR_FILE_DESCRIPTION    "ReactOS Starfield ScreenSaver"
+#define REACTOS_STR_INTERNAL_NAME       "starfield"
+#define REACTOS_STR_ORIGINAL_FILENAME   "starfield.scr"
 
 #include <reactos/version.rc>
 
diff --git a/modules/rosapps/applications/sysutils/ctm/ctm.rc
b/modules/rosapps/applications/sysutils/ctm/ctm.rc
index 3ba39784ae3..86323fbc8cc 100644
--- a/modules/rosapps/applications/sysutils/ctm/ctm.rc
+++ b/modules/rosapps/applications/sysutils/ctm/ctm.rc
@@ -2,10 +2,10 @@
 #include <windows.h>
 #include "resource.h"
 
-#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Console Task Manager\0"
-#define REACTOS_STR_INTERNAL_NAME	"ctm\0"
-#define REACTOS_STR_ORIGINAL_FILENAME	"ctm.exe\0"
-#define REACTOS_STR_ORIGINAL_COPYRIGHT	"2003, Aleksey Bragin\0"
+#define REACTOS_STR_FILE_DESCRIPTION    "ReactOS Console Task Manager"
+#define REACTOS_STR_INTERNAL_NAME       "ctm"
+#define REACTOS_STR_ORIGINAL_FILENAME   "ctm.exe"
+#define REACTOS_STR_ORIGINAL_COPYRIGHT  "2003, Aleksey Bragin"
 #include <reactos/version.rc>
 
 /* UTF-8 */
diff --git a/modules/rosapps/applications/sysutils/ctm/lang/de-DE.rc
b/modules/rosapps/applications/sysutils/ctm/lang/de-DE.rc
index 0704362d071..aa571cd91a8 100644
--- a/modules/rosapps/applications/sysutils/ctm/lang/de-DE.rc
+++ b/modules/rosapps/applications/sysutils/ctm/lang/de-DE.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
    IDS_APP_TITLE           "Console TaskManager von Aleksey Bragin
&lt;aleksey(a)reactos.org&gt;&quot;
 
@@ -11,7 +11,7 @@ BEGIN
    IDS_COLUMN_PID          "PID  "
    IDS_COLUMN_CPU          "CPU"
    IDS_COLUMN_MEM          "Speicher"
-   IDS_COLUMN_MEM_UNIT		"KB"
+   IDS_COLUMN_MEM_UNIT     "KB"
    IDS_COLUMN_PF           "Seitenfehler"
 
    IDS_IDLE_PROCESS        "Leerlaufprozess"
diff --git a/modules/rosapps/applications/sysutils/ctm/lang/el-GR.rc
b/modules/rosapps/applications/sysutils/ctm/lang/el-GR.rc
index 3c685af2c8d..1ec97a598f1 100644
--- a/modules/rosapps/applications/sysutils/ctm/lang/el-GR.rc
+++ b/modules/rosapps/applications/sysutils/ctm/lang/el-GR.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
    IDS_APP_TITLE           "Console TaskManager by Aleksey Bragin
&lt;aleksey(a)reactos.org&gt;&quot;
 
@@ -11,7 +11,7 @@ BEGIN
    IDS_COLUMN_PID          "PID  "
    IDS_COLUMN_CPU          "CPU"
    IDS_COLUMN_MEM          "Χρήση μνήμης"
-   IDS_COLUMN_MEM_UNIT		"KB"
+   IDS_COLUMN_MEM_UNIT     "KB"
    IDS_COLUMN_PF           "Page Faults"
 
    IDS_IDLE_PROCESS        "Αδρανής διαδικασία"
diff --git a/modules/rosapps/applications/sysutils/ctm/lang/en-US.rc
b/modules/rosapps/applications/sysutils/ctm/lang/en-US.rc
index d96b5c18dce..a7a0d299df1 100644
--- a/modules/rosapps/applications/sysutils/ctm/lang/en-US.rc
+++ b/modules/rosapps/applications/sysutils/ctm/lang/en-US.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
    IDS_APP_TITLE           "Console TaskManager by Aleksey Bragin
&lt;aleksey(a)reactos.org&gt;&quot;
 
@@ -11,7 +11,7 @@ BEGIN
    IDS_COLUMN_PID          "PID  "
    IDS_COLUMN_CPU          "CPU"
    IDS_COLUMN_MEM          "Mem Usage"
-   IDS_COLUMN_MEM_UNIT		"KB"
+   IDS_COLUMN_MEM_UNIT     "KB"
    IDS_COLUMN_PF           "Page Faults"
 
    IDS_IDLE_PROCESS        "System Idle Process"
diff --git a/modules/rosapps/applications/sysutils/ctm/lang/es-ES.rc
b/modules/rosapps/applications/sysutils/ctm/lang/es-ES.rc
index 2bfa1447b77..60001a0f8e4 100644
--- a/modules/rosapps/applications/sysutils/ctm/lang/es-ES.rc
+++ b/modules/rosapps/applications/sysutils/ctm/lang/es-ES.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
    IDS_APP_TITLE           "Administrador de tareas de la Consola por Aleksey Bragin
&lt;aleksey(a)reactos.org&gt;&quot;
 
@@ -11,7 +11,7 @@ BEGIN
    IDS_COLUMN_PID          "PID  "
    IDS_COLUMN_CPU          "CPU"
    IDS_COLUMN_MEM          "Uso Memor."
-   IDS_COLUMN_MEM_UNIT		"KB"
+   IDS_COLUMN_MEM_UNIT     "KB"
    IDS_COLUMN_PF           "Fallos de paginación"
 
    IDS_IDLE_PROCESS        "Proceso inactivo del sistema"
diff --git a/modules/rosapps/applications/sysutils/ctm/lang/fr-FR.rc
b/modules/rosapps/applications/sysutils/ctm/lang/fr-FR.rc
index 87203fe2ddf..86d87b9d723 100644
--- a/modules/rosapps/applications/sysutils/ctm/lang/fr-FR.rc
+++ b/modules/rosapps/applications/sysutils/ctm/lang/fr-FR.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
    IDS_APP_TITLE           "Console TaskManager par Aleksey Bragin
&lt;aleksey(a)reactos.org&gt;&quot;
 
@@ -11,7 +11,7 @@ BEGIN
    IDS_COLUMN_PID          "PID  "
    IDS_COLUMN_CPU          "CPU"
    IDS_COLUMN_MEM          "Util. mém"
-   IDS_COLUMN_MEM_UNIT		"KO"
+   IDS_COLUMN_MEM_UNIT     "KO"
    IDS_COLUMN_PF           "Défauts de page"
 
    IDS_IDLE_PROCESS        "Processus inactif du système"
diff --git a/modules/rosapps/applications/sysutils/ctm/lang/no-NO.rc
b/modules/rosapps/applications/sysutils/ctm/lang/no-NO.rc
index f18f06695a4..c94ea13c86b 100644
--- a/modules/rosapps/applications/sysutils/ctm/lang/no-NO.rc
+++ b/modules/rosapps/applications/sysutils/ctm/lang/no-NO.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
    IDS_APP_TITLE           "Konsoll oppgavebehandler av Aleksey Bragin
&lt;aleksey(a)reactos.org&gt;&quot;
 
@@ -11,7 +11,7 @@ BEGIN
    IDS_COLUMN_PID          "PID  "
    IDS_COLUMN_CPU          "Prosesor"
    IDS_COLUMN_MEM          "Minnebruk"
-   IDS_COLUMN_MEM_UNIT		"KB"
+   IDS_COLUMN_MEM_UNIT     "KB"
    IDS_COLUMN_PF           "Page Faults"
 
    IDS_IDLE_PROCESS        "System Idle Process"
diff --git a/modules/rosapps/applications/sysutils/ctm/lang/pl-PL.rc
b/modules/rosapps/applications/sysutils/ctm/lang/pl-PL.rc
index 1ea61476b40..ac15f56bdf6 100644
--- a/modules/rosapps/applications/sysutils/ctm/lang/pl-PL.rc
+++ b/modules/rosapps/applications/sysutils/ctm/lang/pl-PL.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
    IDS_APP_TITLE           "Console TaskManager by Aleksey Bragin
&lt;aleksey(a)reactos.org&gt;&quot;
 
@@ -11,7 +11,7 @@ BEGIN
    IDS_COLUMN_PID          "PID  "
    IDS_COLUMN_CPU          "CPU"
    IDS_COLUMN_MEM          "Użycie pamięci"
-   IDS_COLUMN_MEM_UNIT		"KB"
+   IDS_COLUMN_MEM_UNIT     "KB"
    IDS_COLUMN_PF           "Błędy strony"
 
    IDS_IDLE_PROCESS        "Proces bezczynności systemu"
diff --git a/modules/rosapps/applications/sysutils/ctm/lang/ro-RO.rc
b/modules/rosapps/applications/sysutils/ctm/lang/ro-RO.rc
index 708e1c71e33..cdc1bc1e522 100644
--- a/modules/rosapps/applications/sysutils/ctm/lang/ro-RO.rc
+++ b/modules/rosapps/applications/sysutils/ctm/lang/ro-RO.rc
@@ -8,9 +8,7 @@
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
-#pragma code_page(65001)
-
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
    IDS_APP_TITLE           "Gestionar de activități consolă v0.1 de Aleksey Bragin
&lt;aleksey(a)reactos.org&gt;&quot;
 
@@ -19,7 +17,7 @@ BEGIN
    IDS_COLUMN_PID          "IDP  "
    IDS_COLUMN_CPU          "UCP"
    IDS_COLUMN_MEM          "Uz memor."
-   IDS_COLUMN_MEM_UNIT		"ko"
+   IDS_COLUMN_MEM_UNIT     "ko"
    IDS_COLUMN_PF           "Er. de pag."
 
    IDS_IDLE_PROCESS        "Proces de inactivitate sistem"
diff --git a/modules/rosapps/applications/sysutils/ctm/lang/ru-RU.rc
b/modules/rosapps/applications/sysutils/ctm/lang/ru-RU.rc
index d21c59dde67..c98159041e8 100644
--- a/modules/rosapps/applications/sysutils/ctm/lang/ru-RU.rc
+++ b/modules/rosapps/applications/sysutils/ctm/lang/ru-RU.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
    IDS_APP_TITLE           "Консольный Диспетчер задач от Алексея Брагина
&lt;aleksey(a)reactos.org&gt;&quot;
 
diff --git a/modules/rosapps/applications/sysutils/ctm/lang/uk-UA.rc
b/modules/rosapps/applications/sysutils/ctm/lang/uk-UA.rc
index 0441acfb82b..856e7032e63 100644
--- a/modules/rosapps/applications/sysutils/ctm/lang/uk-UA.rc
+++ b/modules/rosapps/applications/sysutils/ctm/lang/uk-UA.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
    IDS_APP_TITLE           "Консольний Диспетчер завдань від Aleksey Bragin
&lt;aleksey(a)reactos.org&gt;&quot;
 
@@ -17,7 +17,7 @@ BEGIN
    IDS_COLUMN_PID          "PID  "
    IDS_COLUMN_CPU          "CPU"
    IDS_COLUMN_MEM          "Використання пам'яті"
-   IDS_COLUMN_MEM_UNIT		"KB"
+   IDS_COLUMN_MEM_UNIT     "KB"
    IDS_COLUMN_PF           "Помилок сторінки"
 
    IDS_IDLE_PROCESS        "Недіяння системи"
diff --git a/modules/rosapps/applications/sysutils/ctm/lang/zh-TW.rc
b/modules/rosapps/applications/sysutils/ctm/lang/zh-TW.rc
index ba074604436..f76fa04dd4b 100644
--- a/modules/rosapps/applications/sysutils/ctm/lang/zh-TW.rc
+++ b/modules/rosapps/applications/sysutils/ctm/lang/zh-TW.rc
@@ -2,7 +2,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
    IDS_APP_TITLE           "主控台工作管理員，由 Aleksey Bragin &lt;aleksey(a)reactos.org&gt;
開發"
 
diff --git a/modules/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc
b/modules/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc
index d6d37a98fe8..71e60e5bd70 100644
--- a/modules/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc
+++ b/modules/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
 
 IDS_USAGE, "SYSTEMINFO [/S System [/U Benutzername [/P [Passwort]]]] [/FO Format]
[/NH]\n\n\
diff --git a/modules/rosapps/applications/sysutils/systeminfo/lang/en-US.rc
b/modules/rosapps/applications/sysutils/systeminfo/lang/en-US.rc
index d603471ba8a..f1beb5a29d6 100644
--- a/modules/rosapps/applications/sysutils/systeminfo/lang/en-US.rc
+++ b/modules/rosapps/applications/sysutils/systeminfo/lang/en-US.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
 
 IDS_USAGE, "SYSTEMINFO [/S system [/U username [/P [password]]]] [/FO format]
[/NH]\n\n\
diff --git a/modules/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc
b/modules/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc
index d0a60d4f3eb..4b352a983bf 100644
--- a/modules/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc
+++ b/modules/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc
@@ -6,7 +6,7 @@
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
 
 IDS_USAGE, "SYSTEMINFO [/S sistema [/U usuario [/P [contraseña]]]] [/FO formato]
[/NH]\n\n\
diff --git a/modules/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc
b/modules/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc
index cc751f12f96..39586d24559 100644
--- a/modules/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc
+++ b/modules/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
 
 IDS_USAGE "SYSTEMINFO [/S système [/U utilisateur [/P [motdepasse]]]] [/FO format]
[/NH]\n\n\
diff --git a/modules/rosapps/applications/sysutils/systeminfo/lang/it-IT.rc
b/modules/rosapps/applications/sysutils/systeminfo/lang/it-IT.rc
index 400d1d2a4e6..1c4d0c4071d 100644
--- a/modules/rosapps/applications/sysutils/systeminfo/lang/it-IT.rc
+++ b/modules/rosapps/applications/sysutils/systeminfo/lang/it-IT.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
 
 IDS_USAGE, "SYSTEMINFO [/S sistema [/U nomeutente [/P [password]]]] [/FO formato]
[/NH]\n\n\
diff --git a/modules/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc
b/modules/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc
index 6d5370d3445..840bf5198f1 100644
--- a/modules/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc
+++ b/modules/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc
@@ -1,6 +1,6 @@
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
 
 IDS_USAGE, "SYSTEMINFO [/S system [/U brukernavn [/P [passord]]]] [/FO format]
[/NH]\n\n\
diff --git a/modules/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc
b/modules/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc
index 499684413d0..f1ba3279fe4 100644
--- a/modules/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc
+++ b/modules/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
 
 IDS_USAGE, "SYSTEMINFO [/S system [/U nazwa użytkownika [/P [hasło]]]] [/FO format]
[/NH]\n\n\
diff --git a/modules/rosapps/applications/sysutils/systeminfo/lang/ro-RO.rc
b/modules/rosapps/applications/sysutils/systeminfo/lang/ro-RO.rc
index cd5737604e0..647dcd090ab 100644
--- a/modules/rosapps/applications/sysutils/systeminfo/lang/ro-RO.rc
+++ b/modules/rosapps/applications/sysutils/systeminfo/lang/ro-RO.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
 
 IDS_USAGE, "SYSTEMINFO [/S sistem [/U nume [/P [parolă]]]] [/FO format] [/NH]\n\n\
diff --git a/modules/rosapps/applications/sysutils/systeminfo/lang/ru-RU.rc
b/modules/rosapps/applications/sysutils/systeminfo/lang/ru-RU.rc
index ffce71e3a40..5b53f1ee8e2 100644
--- a/modules/rosapps/applications/sysutils/systeminfo/lang/ru-RU.rc
+++ b/modules/rosapps/applications/sysutils/systeminfo/lang/ru-RU.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
 
 IDS_USAGE, "SYSTEMINFO [/S система [/U имяПользователя [/P [пароль]]]] [/FO формат]
[/NH]\n\n\
diff --git a/modules/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc
b/modules/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc
index 04163646ddb..0e45f8452f8 100644
--- a/modules/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc
+++ b/modules/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc
@@ -4,7 +4,7 @@
 
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
 
 IDS_USAGE, "SYSTEMINFO [/S syst‚m [/U pou§._meno [/P [heslo]]]] [/FO form t]
[/NH]\n\n\
diff --git a/modules/rosapps/applications/sysutils/systeminfo/lang/tr-TR.rc
b/modules/rosapps/applications/sysutils/systeminfo/lang/tr-TR.rc
index 19e4005ebbc..f3ca6797e32 100644
--- a/modules/rosapps/applications/sysutils/systeminfo/lang/tr-TR.rc
+++ b/modules/rosapps/applications/sysutils/systeminfo/lang/tr-TR.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_TURKISH, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
 
 IDS_USAGE, "SYSTEMINFO [/S sistem [/U kullanici_adi [/P [sifre]]]] [/FO format]
[/NH]\n\n\
diff --git a/modules/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc
b/modules/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc
index cae4845e492..a601bce2ea0 100644
--- a/modules/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc
+++ b/modules/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc
@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
 
 IDS_USAGE, "SYSTEMINFO [/S система [/U користувач [/P [пароль]]]] [/FO формат]
[/NH]\n\n\
diff --git a/modules/rosapps/applications/sysutils/systeminfo/lang/zh-CN.rc
b/modules/rosapps/applications/sysutils/systeminfo/lang/zh-CN.rc
index b11a359b250..a285d956020 100644
--- a/modules/rosapps/applications/sysutils/systeminfo/lang/zh-CN.rc
+++ b/modules/rosapps/applications/sysutils/systeminfo/lang/zh-CN.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
 
 IDS_USAGE, "SYSTEMINFO [/S system [/U username [/P [password]]]] [/FO format]
[/NH]\n\n\
diff --git a/modules/rosapps/applications/sysutils/systeminfo/lang/zh-TW.rc
b/modules/rosapps/applications/sysutils/systeminfo/lang/zh-TW.rc
index 8c8dac3e090..af26041ba88 100644
--- a/modules/rosapps/applications/sysutils/systeminfo/lang/zh-TW.rc
+++ b/modules/rosapps/applications/sysutils/systeminfo/lang/zh-TW.rc
@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
 
 IDS_USAGE, "SYSTEMINFO [/S system [/U username [/P [password]]]] [/FO format]
[/NH]\n\n\
diff --git a/modules/rosapps/demos/maze/maze.rc b/modules/rosapps/demos/maze/maze.rc
index c1614c45be1..da1dc87f9cb 100644
--- a/modules/rosapps/demos/maze/maze.rc
+++ b/modules/rosapps/demos/maze/maze.rc
@@ -6,7 +6,7 @@
 #define REACTOS_STR_ORIGINAL_FILENAME "maze.exe"
 #include <reactos/version.rc>
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     idsAppName              "Screen Saver.Maze"
 END
diff --git a/modules/rosapps/templates/dialog/dialog.rc
b/modules/rosapps/templates/dialog/dialog.rc
index e1eba836bcd..1c965a9533d 100644
--- a/modules/rosapps/templates/dialog/dialog.rc
+++ b/modules/rosapps/templates/dialog/dialog.rc
@@ -1,14 +1,14 @@
 #include <windows.h>
 #include "resource.h"
 
-#define REACTOS_STR_FILE_DESCRIPTION  "Tab Control Test\0"
-#define REACTOS_STR_INTERNAL_NAME	  "template_dialog\0"
-#define REACTOS_STR_ORIGINAL_FILENAME "template_dialog.exe\0"
+#define REACTOS_STR_FILE_DESCRIPTION  "Tab Control Test"
+#define REACTOS_STR_INTERNAL_NAME     "template_dialog"
+#define REACTOS_STR_ORIGINAL_FILENAME "template_dialog.exe"
 #include <reactos/version.rc>
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
-IDD_TABBED_DIALOG DIALOGEX DISCARDABLE  0, 0, 243, 230
+IDD_TABBED_DIALOG DIALOGEX 0, 0, 243, 230
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TabTest Dialog"
 FONT 8, "MS Shell Dlg"
@@ -18,7 +18,7 @@ BEGIN
     CONTROL        
"Tab1",IDC_TAB,"SysTabControl32",0x0,7,7,229,190
 END
 
-IDD_PAGE1 DIALOGEX DISCARDABLE  10, 20, 180, 144
+IDD_PAGE1 DIALOGEX 10, 20, 180, 144
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -27,7 +27,7 @@ BEGIN
                     LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PAGE2 DIALOGEX DISCARDABLE  10, 20, 180, 144
+IDD_PAGE2 DIALOGEX 10, 20, 180, 144
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -35,7 +35,7 @@ BEGIN
                     WS_TABSTOP,26,48,123,9
 END
 
-IDD_PAGE3 DIALOGEX DISCARDABLE  10, 20, 180, 144
+IDD_PAGE3 DIALOGEX 10, 20, 180, 144
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
diff --git a/modules/rosapps/templates/mdi/mdi.rc b/modules/rosapps/templates/mdi/mdi.rc
index 4b78b4c5967..7b6a1cb97e7 100644
--- a/modules/rosapps/templates/mdi/mdi.rc
+++ b/modules/rosapps/templates/mdi/mdi.rc
@@ -1,23 +1,23 @@
 #include "resource.h"
 #include <windows.h>
 
-#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS MDI Sample Application by Robert
Dickenson\0"
-#define REACTOS_STR_INTERNAL_NAME	"mdi\0"
-#define REACTOS_STR_ORIGINAL_FILENAME	"mdi.exe\0"
-#define REACTOS_STR_ORIGINAL_COPYRIGHT	"Copyright © 2002 Robert Dickenson\0"
+#define REACTOS_STR_FILE_DESCRIPTION    "ReactOS MDI Sample Application by Robert
Dickenson"
+#define REACTOS_STR_INTERNAL_NAME       "mdi"
+#define REACTOS_STR_ORIGINAL_FILENAME   "mdi.exe"
+#define REACTOS_STR_ORIGINAL_COPYRIGHT  "Copyright © 2002 Robert Dickenson"
 #include <reactos/version.rc>
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 /* Icons */
-IDI_MDI_APP	ICON    DISCARDABLE     "res/mdi.ico"
-IDI_SMALL	ICON    DISCARDABLE     "res/small.ico"
+IDI_MDI_APP ICON    "res/mdi.ico"
+IDI_SMALL   ICON    "res/small.ico"
 
 /* Bitmaps */
-IDB_TOOLBAR	BITMAP	DISCARDABLE     "res/toolbar.bmp"
-IDB_IMAGES	BITMAP  DISCARDABLE     "res/images.bmp"
+IDB_TOOLBAR BITMAP  "res/toolbar.bmp"
+IDB_IMAGES  BITMAP  "res/images.bmp"
 
-IDC_MDI_APP MENU DISCARDABLE
+IDC_MDI_APP MENU
 BEGIN
     POPUP "&File"
     BEGIN
@@ -59,7 +59,7 @@ BEGIN
     END
 END
 
-IDD_DIALOG1 DIALOGEX DISCARDABLE  0, 0, 186, 95
+IDD_DIALOG1 DIALOGEX 0, 0, 186, 95
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Dialog"
 FONT 8, "MS Shell Dlg"
@@ -68,7 +68,7 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,129,24,50,14
 END
 
-IDD_ABOUTBOX DIALOGEX DISCARDABLE  22, 17, 230, 75
+IDD_ABOUTBOX DIALOGEX 22, 17, 230, 75
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About"
 FONT 8, "MS Shell Dlg"
@@ -80,7 +80,7 @@ BEGIN
     DEFPUSHBUTTON   "OK",IDOK,195,6,30,11,WS_GROUP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
     IDS_APP_TITLE           "ReactOS Application"
 
diff --git a/modules/rosapps/templates/old_wordpad/lang/bg-BG.rc
b/modules/rosapps/templates/old_wordpad/lang/bg-BG.rc
index 3fcea1ed6be..00eb88eaba7 100644
--- a/modules/rosapps/templates/old_wordpad/lang/bg-BG.rc
+++ b/modules/rosapps/templates/old_wordpad/lang/bg-BG.rc
@@ -108,14 +108,14 @@ BEGIN
 END
 
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_LICENSE           "This program is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public License as published by the
Free Software Foundation; either version 2 of the License, or (at your option) any later
version.\r\n\r\nThis program 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 General Public License for  [...]
   IDS_DEFAULT_NAME      "Документ %1!u!"
   IDS_READY             " Готов."
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_DOC_TYPE_RICH_TEXT    "Обогатен словесен документ (RTF)"
   IDS_DOC_TYPE_UNICODE_TEXT "Словесен документ"
@@ -125,7 +125,7 @@ END
 
 
 /* Tooltips */
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_TOOLTIP_NEW       "Нов"
   IDS_TOOLTIP_OPEN      "Отваряне"
@@ -140,7 +140,7 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_HINT_BLANK        " "
   IDS_HINT_NEW          " Създава нов документ."
diff --git a/modules/rosapps/templates/old_wordpad/lang/de-DE.rc
b/modules/rosapps/templates/old_wordpad/lang/de-DE.rc
index a2c21b9ee1f..9cdb50b3c1f 100644
--- a/modules/rosapps/templates/old_wordpad/lang/de-DE.rc
+++ b/modules/rosapps/templates/old_wordpad/lang/de-DE.rc
@@ -108,14 +108,14 @@ BEGIN
 END
 
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_LICENSE           "Dieses Programm ist kostenlos; Sie können es frei verteilen
mit od. ohne Änderungen unter der GNU Lesser General Public License wie es von der Free
Software Foundation veröffentlicht wurde; entweder Version 2.1 der Lizenz, oder eine
spätere Version (ihrer Wahl).\r\n\r\nThis program 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 Gene [...]
   IDS_DEFAULT_NAME      "Dokument %1!u!"
   IDS_READY             " Fertig."
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_DOC_TYPE_RICH_TEXT    "Rich Text-Dokument"
   IDS_DOC_TYPE_UNICODE_TEXT "Text-Dokument"
@@ -125,7 +125,7 @@ END
 
 
 /* Tooltips */
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 BEGIN
   IDS_TOOLTIP_NEW       "Neu"
... 500 lines suppressed ...

    