From 7dfba50bca2e8bf276837cc752cf3ec223106c59 Mon Sep 17 00:00:00 2001
From: Michael Stefaniuc <mstefani@redhat.de>
Date: Wed, 21 Jul 2010 23:50:43 +0200
Subject: [PATCH] comctl32: Remove the ignored common resource attributes.

---
 dlls/comctl32/comctl_Bg.rc  | 14 +++++++-------
 dlls/comctl32/comctl_Cs.rc  | 14 +++++++-------
 dlls/comctl32/comctl_Da.rc  | 14 +++++++-------
 dlls/comctl32/comctl_De.rc  | 14 +++++++-------
 dlls/comctl32/comctl_El.rc  | 14 +++++++-------
 dlls/comctl32/comctl_En.rc  | 14 +++++++-------
 dlls/comctl32/comctl_Eo.rc  | 14 +++++++-------
 dlls/comctl32/comctl_Es.rc  | 14 +++++++-------
 dlls/comctl32/comctl_Fr.rc  | 14 +++++++-------
 dlls/comctl32/comctl_Hu.rc  | 14 +++++++-------
 dlls/comctl32/comctl_It.rc  | 14 +++++++-------
 dlls/comctl32/comctl_Ja.rc  | 14 +++++++-------
 dlls/comctl32/comctl_Ko.rc  | 14 +++++++-------
 dlls/comctl32/comctl_Lt.rc  | 14 +++++++-------
 dlls/comctl32/comctl_Nl.rc  | 14 +++++++-------
 dlls/comctl32/comctl_No.rc  | 14 +++++++-------
 dlls/comctl32/comctl_Pl.rc  | 14 +++++++-------
 dlls/comctl32/comctl_Pt.rc  | 14 +++++++-------
 dlls/comctl32/comctl_Ro.rc  | 14 +++++++-------
 dlls/comctl32/comctl_Ru.rc  | 14 +++++++-------
 dlls/comctl32/comctl_Si.rc  | 14 +++++++-------
 dlls/comctl32/comctl_Sk.rc  | 14 +++++++-------
 dlls/comctl32/comctl_Sr.rc  | 28 ++++++++++++++--------------
 dlls/comctl32/comctl_Sv.rc  | 14 +++++++-------
 dlls/comctl32/comctl_Th.rc  | 14 +++++++-------
 dlls/comctl32/comctl_Tr.rc  | 14 +++++++-------
 dlls/comctl32/comctl_Uk.rc  | 14 +++++++-------
 dlls/comctl32/comctl_Zh.rc  | 28 ++++++++++++++--------------
 dlls/comctl32/rsrc.rc       | 30 +++++++++++++++---------------
 dlls/comctl32/tests/rsrc.rc | 12 ++++++------
 30 files changed, 231 insertions(+), 231 deletions(-)

diff --git a/dlls/comctl32/comctl_Bg.rc b/dlls/comctl32/comctl_Bg.rc
index 6c64f9ac0c8..a45bcd16f29 100644
--- a/dlls/comctl32/comctl_Bg.rc
+++ b/dlls/comctl32/comctl_Bg.rc
@@ -22,7 +22,7 @@
 
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "�������� �� %s"
 FONT 8, "MS Shell Dlg"
@@ -35,7 +35,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Wizard"
 FONT 8, "MS Shell Dlg"
@@ -51,7 +51,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 407, 125 /* 357 -> 407 ? */
+IDD_TBCUSTOMIZE DIALOG 10, 20, 407, 125 /* 357 -> 407 ? */
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "��������������� �� ������� � �����������"
 FONT 8, "MS Shell Dlg"
@@ -69,23 +69,23 @@ BEGIN
   LISTBOX       IDC_TOOLBARBTN_LBOX, 192,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP /* 182 -> 192 ? */
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_CLOSE    "�������"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDM_TODAY    "����:"
     IDM_GOTODAY  "��� �� ����"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_SEPARATOR "����������"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     HKY_NONE "����"
 }
diff --git a/dlls/comctl32/comctl_Cs.rc b/dlls/comctl32/comctl_Cs.rc
index e770e331e5c..d993c713a29 100644
--- a/dlls/comctl32/comctl_Cs.rc
+++ b/dlls/comctl32/comctl_Cs.rc
@@ -26,7 +26,7 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
 /* Czech strings in CP1250 */
 
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Vlastnosti %s"
 FONT 8, "MS Shell Dlg"
@@ -39,7 +39,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Pr�vodce"
 FONT 8, "MS Shell Dlg"
@@ -55,7 +55,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Nastaven� panelu"
 FONT 8, "MS Shell Dlg"
@@ -73,23 +73,23 @@ BEGIN
   LISTBOX       IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_CLOSE    "Zav��t"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDM_TODAY    "Dnes:"
     IDM_GOTODAY  "Jdi na dne�ek"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_SEPARATOR "Odd�lova�"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     HKY_NONE "��dn�"
 }
diff --git a/dlls/comctl32/comctl_Da.rc b/dlls/comctl32/comctl_Da.rc
index 07c177cf462..0dc1068f83b 100644
--- a/dlls/comctl32/comctl_Da.rc
+++ b/dlls/comctl32/comctl_Da.rc
@@ -23,7 +23,7 @@
 
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Egenskaber for %s"
 FONT 8, "MS Shell Dlg"
@@ -36,7 +36,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Guide"
 FONT 8, "MS Shell Dlg"
@@ -52,7 +52,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Tilpas Værktøjslinje"
 FONT 8, "MS Shell Dlg"
@@ -70,23 +70,23 @@ BEGIN
   LISTBOX       IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_CLOSE    "Luk"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDM_TODAY    "Idag:"
     IDM_GOTODAY  "Gå til i dag"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_SEPARATOR "Separator"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     HKY_NONE "Ingen"
 }
diff --git a/dlls/comctl32/comctl_De.rc b/dlls/comctl32/comctl_De.rc
index 87730c881f9..afb2a844c1e 100644
--- a/dlls/comctl32/comctl_De.rc
+++ b/dlls/comctl32/comctl_De.rc
@@ -22,28 +22,28 @@
 
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
      IDS_CLOSE    "Schließen"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
      IDM_TODAY    "Heute:"
      IDM_GOTODAY  "Gehe zu Heute"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_SEPARATOR "Trennzeichen"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     HKY_NONE "Keiner"
 }
 
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Eigenschaften für %s"
 FONT 8, "MS Shell Dlg"
@@ -56,7 +56,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Wizard"
 FONT 8, "MS Shell Dlg"
@@ -72,7 +72,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Toolbar einrichten"
 FONT 8, "MS Shell Dlg"
diff --git a/dlls/comctl32/comctl_El.rc b/dlls/comctl32/comctl_El.rc
index de08357270d..284b3a287c4 100644
--- a/dlls/comctl32/comctl_El.rc
+++ b/dlls/comctl32/comctl_El.rc
@@ -20,7 +20,7 @@
 
 LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
 
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "��������� ��� %s"
 FONT 8, "MS Shell Dlg"
@@ -33,7 +33,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "������"
 FONT 8, "MS Shell Dlg"
@@ -49,7 +49,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "��������������� ������ ���������"
 FONT 8, "MS Shell Dlg"
@@ -67,23 +67,23 @@ BEGIN
   LISTBOX       IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_CLOSE    "��������"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDM_TODAY    "������:"
     IDM_GOTODAY  "�������� ��� ��������"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_SEPARATOR "�����������"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     HKY_NONE "������"
 }
diff --git a/dlls/comctl32/comctl_En.rc b/dlls/comctl32/comctl_En.rc
index d8055e98f3f..c7ddc7a15c8 100644
--- a/dlls/comctl32/comctl_En.rc
+++ b/dlls/comctl32/comctl_En.rc
@@ -20,7 +20,7 @@
 
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Properties for %s"
 FONT 8, "MS Shell Dlg"
@@ -33,7 +33,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Wizard"
 FONT 8, "MS Shell Dlg"
@@ -49,7 +49,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Customize Toolbar"
 FONT 8, "MS Shell Dlg"
@@ -67,23 +67,23 @@ BEGIN
   LISTBOX       IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_CLOSE    "Close"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDM_TODAY    "Today:"
     IDM_GOTODAY  "Go to today"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_SEPARATOR "Separator"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     HKY_NONE "None"
 }
diff --git a/dlls/comctl32/comctl_Eo.rc b/dlls/comctl32/comctl_Eo.rc
index 59fe39ed8e8..ea5a776b399 100644
--- a/dlls/comctl32/comctl_Eo.rc
+++ b/dlls/comctl32/comctl_Eo.rc
@@ -20,7 +20,7 @@
 
 LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
 
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Ecoj la� %s"
 FONT 8, "MS Shell Dlg"
@@ -33,7 +33,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Estrita Proceduro"
 FONT 8, "MS Shell Dlg"
@@ -49,7 +49,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Agordu stangon de la iloj"
 FONT 8, "MS Shell Dlg"
@@ -67,23 +67,23 @@ BEGIN
   LISTBOX       IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_CLOSE    "Fermu"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDM_TODAY    "Hodia�:"
     IDM_GOTODAY  "Iru a la hodia�"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_SEPARATOR "Dividilo"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     HKY_NONE "Neniu"
 }
diff --git a/dlls/comctl32/comctl_Es.rc b/dlls/comctl32/comctl_Es.rc
index ce4621791f0..34e6f6c0a5d 100644
--- a/dlls/comctl32/comctl_Es.rc
+++ b/dlls/comctl32/comctl_Es.rc
@@ -20,7 +20,7 @@
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Propiedades de %s"
 FONT 8, "MS Shell Dlg"
@@ -33,7 +33,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Ayudante"
 FONT 8, "MS Shell Dlg"
@@ -49,7 +49,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Personalizar barra de herramientas"
 FONT 8, "MS Shell Dlg"
@@ -67,23 +67,23 @@ BEGIN
   LISTBOX       IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_CLOSE    "Cerrar"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDM_TODAY    "Hoy:"
     IDM_GOTODAY  "Ir a hoy"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_SEPARATOR "Separador"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     HKY_NONE "Ninguno"
 }
diff --git a/dlls/comctl32/comctl_Fr.rc b/dlls/comctl32/comctl_Fr.rc
index 6c766cf454d..fd8aa10eb49 100644
--- a/dlls/comctl32/comctl_Fr.rc
+++ b/dlls/comctl32/comctl_Fr.rc
@@ -27,7 +27,7 @@
 
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Propriétés pour %s"
 FONT 8, "MS Shell Dlg"
@@ -40,7 +40,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Assistant"
 FONT 8, "MS Shell Dlg"
@@ -56,7 +56,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Personnaliser la barre d'outils"
 FONT 8, "MS Shell Dlg"
@@ -74,23 +74,23 @@ BEGIN
   LISTBOX       IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_CLOSE    "Fermer"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDM_TODAY    "Aujourd'hui :"
     IDM_GOTODAY  "Aller à aujourd'hui"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_SEPARATOR "Séparateur"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     HKY_NONE "Aucun"
 }
diff --git a/dlls/comctl32/comctl_Hu.rc b/dlls/comctl32/comctl_Hu.rc
index 2ba1160efc1..87183c4038a 100644
--- a/dlls/comctl32/comctl_Hu.rc
+++ b/dlls/comctl32/comctl_Hu.rc
@@ -20,7 +20,7 @@
 
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Tulajdons�gok: %s"
 FONT 8, "MS Shell Dlg"
@@ -33,7 +33,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Var�zsl�"
 FONT 8, "MS Shell Dlg"
@@ -49,7 +49,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Eszk�zt�r testreszab�sa"
 FONT 8, "MS Shell Dlg"
@@ -67,23 +67,23 @@ BEGIN
   LISTBOX       IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_CLOSE    "Bez�r�s"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDM_TODAY    "Ma:"
     IDM_GOTODAY  "Ugr�s m�ra"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_SEPARATOR "Elv�laszt�"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     HKY_NONE "Nincs"
 }
diff --git a/dlls/comctl32/comctl_It.rc b/dlls/comctl32/comctl_It.rc
index 75bd9c19c4c..8253dab38ce 100644
--- a/dlls/comctl32/comctl_It.rc
+++ b/dlls/comctl32/comctl_It.rc
@@ -21,7 +21,7 @@
 
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Propriet� per %s"
 FONT 8, "MS Shell Dlg"
@@ -34,7 +34,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Procedura guidata"
 FONT 8, "MS Shell Dlg"
@@ -50,7 +50,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Personalizza la barra degli strumenti"
 FONT 8, "MS Shell Dlg"
@@ -68,23 +68,23 @@ BEGIN
   LISTBOX       IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_CLOSE    "Chiudi"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDM_TODAY    "Oggi:"
     IDM_GOTODAY  "Vai a oggi"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_SEPARATOR "Separatore"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     HKY_NONE "Nessuno"
 }
diff --git a/dlls/comctl32/comctl_Ja.rc b/dlls/comctl32/comctl_Ja.rc
index ce16f5a2f53..156a00f60d0 100644
--- a/dlls/comctl32/comctl_Ja.rc
+++ b/dlls/comctl32/comctl_Ja.rc
@@ -23,7 +23,7 @@
 
 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "%sのプロパティ"
 FONT 9, "MS Shell Dlg"
@@ -36,7 +36,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "ウィザード"
 FONT 9, "MS Shell Dlg"
@@ -52,7 +52,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ツールバーのカスタマイズ"
 FONT 9, "MS Shell Dlg"
@@ -70,23 +70,23 @@ BEGIN
   LISTBOX       IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_CLOSE    "閉じる"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDM_TODAY    "今日:"
     IDM_GOTODAY  "今日へ移動"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_SEPARATOR "区切り"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     HKY_NONE "なし"
 }
diff --git a/dlls/comctl32/comctl_Ko.rc b/dlls/comctl32/comctl_Ko.rc
index 4f9ec0aff25..31c625263bc 100644
--- a/dlls/comctl32/comctl_Ko.rc
+++ b/dlls/comctl32/comctl_Ko.rc
@@ -21,7 +21,7 @@
 
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "%s �Ӽ�"
 FONT 9, "MS Shell Dlg"
@@ -34,7 +34,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "������"
 FONT 9, "MS Shell Dlg"
@@ -50,7 +50,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "������ ����� ����"
 FONT 9, "MS Shell Dlg"
@@ -68,23 +68,23 @@ BEGIN
   LISTBOX       IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_CLOSE    "�ݱ�"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDM_TODAY    "����:"
     IDM_GOTODAY  "���÷� ����"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_SEPARATOR "���"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
    HKY_NONE "����"
 }
diff --git a/dlls/comctl32/comctl_Lt.rc b/dlls/comctl32/comctl_Lt.rc
index f5f329429cb..b723d223155 100644
--- a/dlls/comctl32/comctl_Lt.rc
+++ b/dlls/comctl32/comctl_Lt.rc
@@ -23,7 +23,7 @@
 
 LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
 
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "%s savybės"
 FONT 8, "MS Shell Dlg"
@@ -36,7 +36,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Vediklis"
 FONT 8, "MS Shell Dlg"
@@ -52,7 +52,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Tinkinti mygtukų juostą"
 FONT 8, "MS Shell Dlg"
@@ -70,23 +70,23 @@ BEGIN
   LISTBOX       IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_CLOSE    "Užverti"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDM_TODAY    "Šiandien:"
     IDM_GOTODAY  "Eiti į šiandien"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_SEPARATOR "Skirtukas"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     HKY_NONE "Joks"
 }
diff --git a/dlls/comctl32/comctl_Nl.rc b/dlls/comctl32/comctl_Nl.rc
index fe2bf7a9d4a..5e94680a2de 100644
--- a/dlls/comctl32/comctl_Nl.rc
+++ b/dlls/comctl32/comctl_Nl.rc
@@ -22,7 +22,7 @@
 
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Eigenschappen van %s"
 FONT 8, "MS Shell Dlg"
@@ -35,7 +35,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Assistent"
 FONT 8, "MS Shell Dlg"
@@ -51,7 +51,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Gereedschappenbalk aanpassen"
 FONT 8, "MS Shell Dlg"
@@ -69,23 +69,23 @@ BEGIN
   LISTBOX       IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_CLOSE    "Sluiten"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDM_TODAY    "Vandaag:"
     IDM_GOTODAY  "Ga naar vandaag"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_SEPARATOR "Scheidingsteken"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     HKY_NONE "Geen"
 }
diff --git a/dlls/comctl32/comctl_No.rc b/dlls/comctl32/comctl_No.rc
index 6361f048943..ada1a47c4ca 100644
--- a/dlls/comctl32/comctl_No.rc
+++ b/dlls/comctl32/comctl_No.rc
@@ -20,7 +20,7 @@
 
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Egenskaper for %s"
 FONT 8, "MS Shell Dlg"
@@ -33,7 +33,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Veiviser"
 FONT 8, "MS Shell Dlg"
@@ -49,7 +49,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Tilpass verkt�ylinje"
 FONT 8, "MS Shell Dlg"
@@ -67,23 +67,23 @@ BEGIN
   LISTBOX       IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_CLOSE    "Lukk"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDM_TODAY    "Idag:"
     IDM_GOTODAY  "G� til idag"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_SEPARATOR "Adskiller"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     HKY_NONE "Ingen"
 }
diff --git a/dlls/comctl32/comctl_Pl.rc b/dlls/comctl32/comctl_Pl.rc
index 12f13a63fa1..f3317e00e27 100644
--- a/dlls/comctl32/comctl_Pl.rc
+++ b/dlls/comctl32/comctl_Pl.rc
@@ -21,7 +21,7 @@
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "W�a�ciwo�ci %s"
 FONT 8, "MS Shell Dlg"
@@ -34,7 +34,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Kreator"
 FONT 8, "MS Shell Dlg"
@@ -50,7 +50,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Dostosowywanie paska narz�dzi"
 FONT 8, "MS Shell Dlg"
@@ -68,23 +68,23 @@ BEGIN
   LISTBOX       IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_CLOSE    "Zamknij"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDM_TODAY    "Dzi�:"
     IDM_GOTODAY  "Id� do dzi�"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_SEPARATOR "Odst�p"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     HKY_NONE "Brak"
 }
diff --git a/dlls/comctl32/comctl_Pt.rc b/dlls/comctl32/comctl_Pt.rc
index 914c4c22439..ca60a59f130 100644
--- a/dlls/comctl32/comctl_Pt.rc
+++ b/dlls/comctl32/comctl_Pt.rc
@@ -24,7 +24,7 @@
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Propriedades de %s"
 FONT 8, "MS Shell Dlg"
@@ -36,7 +36,7 @@ BEGIN
   CONTROL       "Separador",    IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
 END
 
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Assistente"
 FONT 8, "MS Shell Dlg"
@@ -51,7 +51,7 @@ BEGIN
   LTEXT	        "",        IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
 END
 
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Personalizar barra de ferramentas"
 FONT 8, "MS Shell Dlg"
@@ -69,23 +69,23 @@ BEGIN
   LISTBOX       IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_CLOSE    "Fechar"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDM_TODAY    "Hoje:"
     IDM_GOTODAY  "Ir para hoje"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_SEPARATOR "Separador"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     HKY_NONE "Nenhum"
 }
diff --git a/dlls/comctl32/comctl_Ro.rc b/dlls/comctl32/comctl_Ro.rc
index 497f626ee5b..fd6b1161ec8 100644
--- a/dlls/comctl32/comctl_Ro.rc
+++ b/dlls/comctl32/comctl_Ro.rc
@@ -23,7 +23,7 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)
 
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Proprietăți pentru %s"
 FONT 8, "MS Shell Dlg"
@@ -36,7 +36,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Expert"
 FONT 8, "MS Shell Dlg"
@@ -52,7 +52,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Personalizare toolbar"
 FONT 8, "MS Shell Dlg"
@@ -70,23 +70,23 @@ BEGIN
   LISTBOX       IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_CLOSE    "Închide"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDM_TODAY    "Azi:"
     IDM_GOTODAY  "Mergi la Azi"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_SEPARATOR "Separator"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     HKY_NONE "Nimic"
 }
diff --git a/dlls/comctl32/comctl_Ru.rc b/dlls/comctl32/comctl_Ru.rc
index e09817cf659..ce330609db4 100644
--- a/dlls/comctl32/comctl_Ru.rc
+++ b/dlls/comctl32/comctl_Ru.rc
@@ -25,7 +25,7 @@
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Свойства для %s"
 FONT 8, "MS Shell Dlg"
@@ -38,7 +38,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Мастер"
 FONT 8, "MS Shell Dlg"
@@ -54,7 +54,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Настройка панели инструментов"
 FONT 8, "MS Shell Dlg"
@@ -72,23 +72,23 @@ BEGIN
   LISTBOX       IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_CLOSE    "Закрыть"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDM_TODAY    "Сегодня:"
     IDM_GOTODAY  "Текущая дата"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_SEPARATOR "Разделитель"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     HKY_NONE "Нет"
 }
diff --git a/dlls/comctl32/comctl_Si.rc b/dlls/comctl32/comctl_Si.rc
index cc1053f18f6..9d1b1f22a62 100644
--- a/dlls/comctl32/comctl_Si.rc
+++ b/dlls/comctl32/comctl_Si.rc
@@ -22,7 +22,7 @@
 
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
 
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Lastnosti %s"
 FONT 8, "MS Shell Dlg"
@@ -35,7 +35,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Čarovnik"
 FONT 8, "MS Shell Dlg"
@@ -51,7 +51,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Prilagoditev orodne vrstice"
 FONT 8, "MS Shell Dlg"
@@ -69,23 +69,23 @@ BEGIN
   LISTBOX       IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_CLOSE    "Zapri"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDM_TODAY    "Danes:"
     IDM_GOTODAY  "Pojdi na danes"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_SEPARATOR "Ločilo"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     HKY_NONE "Brez"
 }
diff --git a/dlls/comctl32/comctl_Sk.rc b/dlls/comctl32/comctl_Sk.rc
index c543e376f30..4acd84c5ac5 100644
--- a/dlls/comctl32/comctl_Sk.rc
+++ b/dlls/comctl32/comctl_Sk.rc
@@ -23,7 +23,7 @@
 
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "%s - vlastnosti"
 FONT 8, "MS Shell Dlg"
@@ -36,7 +36,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Sprievodca"
 FONT 8, "MS Shell Dlg"
@@ -52,7 +52,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Prisp�sobenie panela n�strojov"
 FONT 8, "MS Shell Dlg"
@@ -70,23 +70,23 @@ BEGIN
   LISTBOX       IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_CLOSE    "Zavrie�"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDM_TODAY    "Dnes:"
     IDM_GOTODAY  "Cho� na dne�ok"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_SEPARATOR "Odde�ova�"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     HKY_NONE "�iadne"
 }
diff --git a/dlls/comctl32/comctl_Sr.rc b/dlls/comctl32/comctl_Sr.rc
index ecca9895d30..8681ecbe629 100644
--- a/dlls/comctl32/comctl_Sr.rc
+++ b/dlls/comctl32/comctl_Sr.rc
@@ -23,7 +23,7 @@
 
 LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN
 
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Detalji za %s"
 FONT 8, "MS Shell Dlg"
@@ -36,7 +36,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Čarobnjak"
 FONT 8, "MS Shell Dlg"
@@ -52,7 +52,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Podesi Toolbar"
 FONT 8, "MS Shell Dlg"
@@ -70,30 +70,30 @@ BEGIN
   LISTBOX       IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_CLOSE    "Zatvori"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDM_TODAY    "Danas:"
     IDM_GOTODAY  "Idi na danas"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_SEPARATOR "Odvajanje"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     HKY_NONE "Ništa"
 }
 
 LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC
 
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Детаљи за %s"
 FONT 8, "MS Shell Dlg"
@@ -106,7 +106,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Чаробњак"
 FONT 8, "MS Shell Dlg"
@@ -122,7 +122,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Подеси Тулбар"
 FONT 8, "MS Shell Dlg"
@@ -140,23 +140,23 @@ BEGIN
   LISTBOX       IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_CLOSE    "Затвори"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDM_TODAY    "Данас:"
     IDM_GOTODAY  "Иди на данас"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_SEPARATOR "Одвајање"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     HKY_NONE "Ништа"
 }
diff --git a/dlls/comctl32/comctl_Sv.rc b/dlls/comctl32/comctl_Sv.rc
index 18bfefc6635..e66b379217d 100644
--- a/dlls/comctl32/comctl_Sv.rc
+++ b/dlls/comctl32/comctl_Sv.rc
@@ -20,7 +20,7 @@
 
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Egenskaper f�r %s"
 FONT 8, "MS Shell Dlg"
@@ -33,7 +33,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Guide"
 FONT 8, "MS Shell Dlg"
@@ -49,7 +49,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Anpassa verktygsf�ltet"
 FONT 8, "MS Shell Dlg"
@@ -67,23 +67,23 @@ BEGIN
   LISTBOX       IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_CLOSE    "St�ng"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDM_TODAY    "Idag:"
     IDM_GOTODAY  "G� till idag"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_SEPARATOR "Separator"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     HKY_NONE "Ingen"
 }
diff --git a/dlls/comctl32/comctl_Th.rc b/dlls/comctl32/comctl_Th.rc
index ff1e1fa4feb..915ecf4df8d 100644
--- a/dlls/comctl32/comctl_Th.rc
+++ b/dlls/comctl32/comctl_Th.rc
@@ -20,7 +20,7 @@
 
 LANGUAGE LANG_THAI, SUBLANG_DEFAULT
 
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "�س���ѵԢͧ %s"
 FONT 8, "MS Shell Dlg"
@@ -33,7 +33,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Wizard"
 FONT 8, "MS Shell Dlg"
@@ -49,7 +49,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "��Ѻ��ᶺ����ͧ���"
 FONT 8, "MS Shell Dlg"
@@ -67,23 +67,23 @@ BEGIN
   LISTBOX       IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_CLOSE    "�մ"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDM_TODAY    "�ѹ���:"
     IDM_GOTODAY  "件֧�ѹ���"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_SEPARATOR "Separator"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     HKY_NONE "��������"
 }
diff --git a/dlls/comctl32/comctl_Tr.rc b/dlls/comctl32/comctl_Tr.rc
index cdc89ca0533..cda21936f5c 100644
--- a/dlls/comctl32/comctl_Tr.rc
+++ b/dlls/comctl32/comctl_Tr.rc
@@ -20,7 +20,7 @@
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "�zellikler: %s"
 FONT 8, "MS Shell Dlg"
@@ -33,7 +33,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Sihirbaz"
 FONT 8, "MS Shell Dlg"
@@ -49,7 +49,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Ara� �ubu�unu �zelle�tir"
 FONT 8, "MS Shell Dlg"
@@ -67,23 +67,23 @@ BEGIN
   LISTBOX       IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_CLOSE    "Kapat"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDM_TODAY    "Bug�n:"
     IDM_GOTODAY  "Bug�ne git"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_SEPARATOR "Ayra�"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     HKY_NONE "Hi�biri"
 }
diff --git a/dlls/comctl32/comctl_Uk.rc b/dlls/comctl32/comctl_Uk.rc
index 333eb779c91..3aa29f024f8 100644
--- a/dlls/comctl32/comctl_Uk.rc
+++ b/dlls/comctl32/comctl_Uk.rc
@@ -24,7 +24,7 @@
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "���������� ��� %s"
 FONT 8, "MS Shell Dlg"
@@ -37,7 +37,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "�������"
 FONT 8, "MS Shell Dlg"
@@ -53,7 +53,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "��������� ����� �����������"
 FONT 8, "MS Shell Dlg"
@@ -71,23 +71,23 @@ BEGIN
   LISTBOX       IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_CLOSE    "�������"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDM_TODAY    "��������:"
     IDM_GOTODAY  "������� ����"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_SEPARATOR "���������"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     HKY_NONE "����"
 }
diff --git a/dlls/comctl32/comctl_Zh.rc b/dlls/comctl32/comctl_Zh.rc
index 8919119cae9..63f22e7aa16 100644
--- a/dlls/comctl32/comctl_Zh.rc
+++ b/dlls/comctl32/comctl_Zh.rc
@@ -26,7 +26,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "属性 %s"
 FONT 9, "MS Shell Dlg"
@@ -39,7 +39,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "向导"
 FONT 9, "MS Shell Dlg"
@@ -55,7 +55,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "自定义工具栏"
 FONT 9, "MS Shell Dlg"
@@ -73,30 +73,30 @@ BEGIN
   LISTBOX       IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_CLOSE    "关闭"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDM_TODAY    "今天:"
     IDM_GOTODAY  "转到今天"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_SEPARATOR "分隔符"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     HKY_NONE "无"
 }
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+IDD_PROPSHEET DIALOG 0, 0, 220, 140
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "屬性 %s"
 FONT 9, "MS Shell Dlg"
@@ -109,7 +109,7 @@ BEGIN
 END
 
 
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+IDD_WIZARD DIALOG 0, 0, 290, 159
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "向導"
 FONT 9, "MS Shell Dlg"
@@ -125,7 +125,7 @@ BEGIN
 END
 
 
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "自定義工具欄"
 FONT 9, "MS Shell Dlg"
@@ -143,23 +143,23 @@ BEGIN
   LISTBOX       IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_CLOSE    "關閉"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDM_TODAY    "今天:"
     IDM_GOTODAY  "轉到今天"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     IDS_SEPARATOR "分隔符"
 }
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE
 {
     HKY_NONE "無"
 }
diff --git a/dlls/comctl32/rsrc.rc b/dlls/comctl32/rsrc.rc
index a8b3e965aa5..933e3670a35 100644
--- a/dlls/comctl32/rsrc.rc
+++ b/dlls/comctl32/rsrc.rc
@@ -33,46 +33,46 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #include "wine/wine_common_ver.rc"
 
 /* @makedep: idt_check.bmp */
-IDT_CHECK BITMAP LOADONCALL DISCARDABLE idt_check.bmp
+IDT_CHECK BITMAP idt_check.bmp
 
 /* @makedep: idb_std_small.bmp */
-IDB_STD_SMALL BITMAP LOADONCALL DISCARDABLE idb_std_small.bmp
+IDB_STD_SMALL BITMAP idb_std_small.bmp
 
 /* @makedep: idb_std_large.bmp */
-IDB_STD_LARGE BITMAP LOADONCALL DISCARDABLE idb_std_large.bmp
+IDB_STD_LARGE BITMAP idb_std_large.bmp
 
 /* @makedep: idb_view_small.bmp */
-IDB_VIEW_SMALL BITMAP LOADONCALL DISCARDABLE idb_view_small.bmp
+IDB_VIEW_SMALL BITMAP idb_view_small.bmp
 
 /* @makedep: idb_view_large.bmp */
-IDB_VIEW_LARGE BITMAP LOADONCALL MOVEABLE DISCARDABLE idb_view_large.bmp
+IDB_VIEW_LARGE BITMAP idb_view_large.bmp
 
 /* @makedep: idb_hist_small.bmp */
-IDB_HIST_SMALL BITMAP LOADONCALL DISCARDABLE idb_hist_small.bmp
+IDB_HIST_SMALL BITMAP idb_hist_small.bmp
 
 /* @makedep: idb_hist_large.bmp */
-IDB_HIST_LARGE BITMAP LOADONCALL DISCARDABLE idb_hist_large.bmp
+IDB_HIST_LARGE BITMAP idb_hist_large.bmp
 
 /* @makedep: idc_copy.cur */
-IDC_COPY CURSOR LOADONCALL DISCARDABLE idc_copy.cur
+IDC_COPY CURSOR idc_copy.cur
 
 /* @makedep: idc_divider.cur */
-IDC_DIVIDER CURSOR LOADONCALL DISCARDABLE idc_divider.cur
+IDC_DIVIDER CURSOR idc_divider.cur
 
 /* @makedep: idc_divideropen.cur */
-IDC_DIVIDEROPEN CURSOR LOADONCALL DISCARDABLE idc_divideropen.cur
+IDC_DIVIDEROPEN CURSOR idc_divideropen.cur
 
 /* @makedep: idc_movebutton.cur */
-IDC_MOVEBUTTON CURSOR LOADONCALL DISCARDABLE idc_movebutton.cur
+IDC_MOVEBUTTON CURSOR idc_movebutton.cur
 
 /* @makedep: idi_dragarrow.ico */
-IDI_DRAGARROW ICON LOADONCALL DISCARDABLE idi_dragarrow.ico
+IDI_DRAGARROW ICON idi_dragarrow.ico
 
 /* @makedep: idi_tt_info_sm.ico */
-IDI_TT_INFO_SM ICON LOADONCALL DISCARDABLE idi_tt_info_sm.ico
+IDI_TT_INFO_SM ICON idi_tt_info_sm.ico
 
 /* @makedep: idi_tt_warn_sm.ico */
-IDI_TT_WARN_SM ICON LOADONCALL DISCARDABLE idi_tt_warn_sm.ico
+IDI_TT_WARN_SM ICON idi_tt_warn_sm.ico
 
 /* @makedep: idi_tt_error_sm.ico */
-IDI_TT_ERROR_SM ICON LOADONCALL DISCARDABLE idi_tt_error_sm.ico
+IDI_TT_ERROR_SM ICON idi_tt_error_sm.ico
diff --git a/dlls/comctl32/tests/rsrc.rc b/dlls/comctl32/tests/rsrc.rc
index c817acd9f58..db76d582679 100644
--- a/dlls/comctl32/tests/rsrc.rc
+++ b/dlls/comctl32/tests/rsrc.rc
@@ -22,7 +22,7 @@
 #include "winuser.h"
 #include "resources.h"
 
-PROP_PAGE1 DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215
+PROP_PAGE1 DIALOG 5, 43, 227, 215
 STYLE  WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS | WS_VISIBLE
 CAPTION "Page1"
 FONT 8, "MS Shell Dlg"
@@ -30,7 +30,7 @@ FONT 8, "MS Shell Dlg"
  LTEXT "Test", -1, 10, 6, 100, 8
 }
 
-IDD_PROP_PAGE_INTRO DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215
+IDD_PROP_PAGE_INTRO DIALOG 5, 43, 227, 215
 STYLE  WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS | WS_VISIBLE
 CAPTION "Edit Control Page"
 FONT 8, "MS Shell Dlg"
@@ -38,7 +38,7 @@ FONT 8, "MS Shell Dlg"
     LTEXT "This is a test property sheet!", -1, 10, 6, 100, 8
 }
 
-IDD_PROP_PAGE_EDIT DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215
+IDD_PROP_PAGE_EDIT DIALOG 5, 43, 227, 215
 STYLE  WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS | WS_VISIBLE
 CAPTION "Edit Control Page"
 FONT 8, "MS Shell Dlg"
@@ -47,7 +47,7 @@ FONT 8, "MS Shell Dlg"
     EDITTEXT IDC_PS_EDIT2, 5, 160, 150, 28, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_MULTILINE
 }
 
-IDD_PROP_PAGE_RADIO DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215
+IDD_PROP_PAGE_RADIO DIALOG 5, 43, 227, 215
 STYLE  WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS | WS_VISIBLE
 CAPTION "Edit Control Page"
 FONT 8, "MS Shell Dlg"
@@ -56,7 +56,7 @@ FONT 8, "MS Shell Dlg"
     CONTROL "Radio2", IDC_PS_RADIO2, "Button", BS_AUTORADIOBUTTON, 20, 40, 39, 10
 }
 
-IDD_PROP_PAGE_EXIT DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215
+IDD_PROP_PAGE_EXIT DIALOG 5, 43, 227, 215
 STYLE  WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS | WS_VISIBLE
 CAPTION "Edit Control Page"
 FONT 8, "MS Shell Dlg"
@@ -80,7 +80,7 @@ IDB_BITMAP_128x15 BITMAP bmp128x15.bmp
 /* @makedep: bmp80x15.bmp */
 IDB_BITMAP_80x15 BITMAP bmp80x15.bmp
 
-IDD_PROP_PAGE_WITH_CUSTOM_DEFAULT_BUTTON DIALOG DISCARDABLE  5, 43, 227, 215
+IDD_PROP_PAGE_WITH_CUSTOM_DEFAULT_BUTTON DIALOG  5, 43, 227, 215
 STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Shell Dlg"
 {