[reactos] 01/01: [SHLWAPI] Explicitly cast to "int*" the 3rd parameter of StrToIntExW calls (fix build)
by Hermès Bélusca-Maïto
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c19ebd0b0a2c4775b84ed…
commit c19ebd0b0a2c4775b84ed625ed09a53f63ad870c
Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Mon Dec 23 21:58:25 2024 +0100
Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Mon Dec 23 22:44:23 2024 +0100
[SHLWAPI] Explicitly cast to "int*" the 3rd parameter of StrToIntExW calls (fix build)
Fixes build error:
../src/dll/win32/shlwapi/ordinal.c:5417:63: error: passing argument 3 of 'StrToIntExW' from incompatible pointer type [-Werror=incompatible-pointer-types]
if (!StrToIntExW(V_BSTR(&vargTemp), STIF_SUPPORT_HEX, &V_I4(&variTemp)))
In file included from ../src/dll/win32/shlwapi/ordinal.c:45:
../src/sdk/include/psdk/shlwapi.h:1682:52: note: expected 'int *' but argument is of type 'LONG *' {aka 'long int *'}
BOOL WINAPI StrToIntExW(_In_ LPCWSTR, DWORD, _Out_ int*);
^~~~
---
dll/win32/shlwapi/ordinal.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dll/win32/shlwapi/ordinal.c b/dll/win32/shlwapi/ordinal.c
index f36cb6a6b66..3d506b0285e 100644
--- a/dll/win32/shlwapi/ordinal.c
+++ b/dll/win32/shlwapi/ordinal.c
@@ -5414,7 +5414,7 @@ HRESULT VariantChangeTypeForRead(_Inout_ VARIANTARG *pvarg, _In_ VARTYPE vt)
if (vt == VT_I1 || vt == VT_I2 || vt == VT_I4)
{
- if (!StrToIntExW(V_BSTR(&vargTemp), STIF_SUPPORT_HEX, &V_I4(&variTemp)))
+ if (!StrToIntExW(V_BSTR(&vargTemp), STIF_SUPPORT_HEX, (int*)&V_I4(&variTemp)))
goto DoDefault;
V_VT(&variTemp) = VT_INT;
@@ -5429,7 +5429,7 @@ HRESULT VariantChangeTypeForRead(_Inout_ VARIANTARG *pvarg, _In_ VARTYPE vt)
if (vt == VT_UI1 || vt == VT_UI2 || vt == VT_UI4)
{
- if (!StrToIntExW(V_BSTR(&vargTemp), STIF_SUPPORT_HEX, (LPINT)&V_UI4(&variTemp)))
+ if (!StrToIntExW(V_BSTR(&vargTemp), STIF_SUPPORT_HEX, (int*)&V_UI4(&variTemp)))
goto DoDefault;
V_VT(&variTemp) = VT_UINT;
@@ -5441,7 +5441,7 @@ HRESULT VariantChangeTypeForRead(_Inout_ VARIANTARG *pvarg, _In_ VARTYPE vt)
if (vt == VT_INT || vt == VT_UINT)
{
- if (!StrToIntExW(V_BSTR(&vargTemp), STIF_SUPPORT_HEX, &V_INT(&variTemp)))
+ if (!StrToIntExW(V_BSTR(&vargTemp), STIF_SUPPORT_HEX, (int*)&V_INT(&variTemp)))
goto DoDefault;
V_VT(&variTemp) = VT_UINT;
3 months, 1 week
- 1
- 0
[reactos] 01/01: [NEWDEV] Fix bad use of PropSheet_SetCurSelByID (#7574)
by Denis Robert
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6f60301d25a29583d3959…
commit 6f60301d25a29583d3959fc957aa6530b076ab41
Author: Denis Robert <denis.beru(a)hotmail.fr>
AuthorDate: Mon Dec 23 14:24:21 2024 +0100
Commit: GitHub <noreply(a)github.com>
CommitDate: Mon Dec 23 16:24:21 2024 +0300
[NEWDEV] Fix bad use of PropSheet_SetCurSelByID (#7574)
PropSheet_SetCurSelByID() was badly called in response of PSN_WIZBACK or
PSN_WIZNEXT notifications. See the reference on these notification codes:
https://learn.microsoft.com/en-us/windows/win32/controls/psn-wizback
> Returns 0 to allow the wizard to go to the previous page. Returns -1 to
> prevent the wizard from changing pages. To display a particular page,
> return its dialog resource identifier.
> (...)
> To set the return value, the dialog box procedure for the page must call
> the SetWindowLong function with the DWL_MSGRESULT value and return TRUE.
This bug sometimes causes the wrong page to appear (e.g. "Previous" in
IDD_NODRIVER should come back in IDD_CHSOURCE, but goes to IDD_WELCOME).
---
dll/win32/newdev/wizard.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/dll/win32/newdev/wizard.c b/dll/win32/newdev/wizard.c
index 3dd231a4013..5204bcdf5d2 100644
--- a/dll/win32/newdev/wizard.c
+++ b/dll/win32/newdev/wizard.c
@@ -545,9 +545,9 @@ WelcomeDlgProc(
if (SendDlgItemMessage(hwndDlg, IDC_RADIO_AUTO, BM_GETCHECK, (WPARAM)0, (LPARAM)0) == BST_CHECKED)
{
if (PrepareFoldersToScan(DevInstData, TRUE, FALSE, NULL))
- PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_SEARCHDRV);
+ SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, IDD_SEARCHDRV);
else
- PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_INSTALLFAILED);
+ SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, IDD_INSTALLFAILED);
}
return TRUE;
@@ -759,11 +759,11 @@ CHSourceDlgProc(
IsDlgButtonChecked(hwndDlg, IDC_CHECK_PATH),
GetDlgItem(hwndDlg, IDC_COMBO_PATH)))
{
- PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_SEARCHDRV);
+ SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, IDD_SEARCHDRV);
}
else
{
- PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_INSTALLFAILED);
+ SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, IDD_INSTALLFAILED);
}
}
else
@@ -1059,7 +1059,7 @@ NoDriverDlgProc(
hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL);
ShowWindow(hwndControl, SW_SHOW);
EnableWindow(hwndControl, TRUE);
- PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_CHSOURCE);
+ SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, IDD_CHSOURCE);
return TRUE;
case PSN_WIZFINISH:
3 months, 1 week
- 1
- 0
[reactos] 01/01: [NETSHELL] Handle DefView accelerators (#7572)
by Whindmar Saksit
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0743faf2e322071416d75…
commit 0743faf2e322071416d756ddac72ffdb0f3e31eb
Author: Whindmar Saksit <whindsaks(a)proton.me>
AuthorDate: Sun Dec 22 21:27:20 2024 +0100
Commit: GitHub <noreply(a)github.com>
CommitDate: Sun Dec 22 21:27:20 2024 +0100
[NETSHELL] Handle DefView accelerators (#7572)
CORE-18750
---
dll/shellext/netshell/shfldr_netconnect.cpp | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/dll/shellext/netshell/shfldr_netconnect.cpp b/dll/shellext/netshell/shfldr_netconnect.cpp
index 3c14b9672e9..f7358065054 100644
--- a/dll/shellext/netshell/shfldr_netconnect.cpp
+++ b/dll/shellext/netshell/shfldr_netconnect.cpp
@@ -641,6 +641,14 @@ HRESULT WINAPI CNetConUiObject::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi)
{
CmdId = IDS_NET_PROPERTIES;
}
+ else if ((UINT_PTR)lpcmi->lpVerb == FCIDM_SHVIEW_RENAME) // DefView accelerator
+ {
+ CmdId = IDS_NET_RENAME;
+ }
+ else if ((UINT_PTR)lpcmi->lpVerb == FCIDM_SHVIEW_PROPERTIES) // DefView accelerator
+ {
+ CmdId = IDS_NET_PROPERTIES;
+ }
else if (!IS_INTRESOURCE(lpcmi->lpVerb) || LOWORD(lpcmi->lpVerb) > 7)
{
FIXME("Got invalid command\n");
3 months, 1 week
- 1
- 0
[reactos] 02/02: [RESOURCES] Remove redundant #pragma code_page(), includes, etc.
by Hermès Bélusca-Maïto
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cc3672cb731ab9d49fc9a…
commit cc3672cb731ab9d49fc9a665bcbb996626e453e9
Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Sun Dec 22 16:49:16 2024 +0100
Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Sun Dec 22 18:39:26 2024 +0100
[RESOURCES] Remove redundant #pragma code_page(), includes, etc.
They are redundant when these are already present in the given module's
root resource file, from which the language-specific resource files are
being included.
---
base/applications/cmdutils/at/at.rc | 1 +
base/applications/cmdutils/fc/fc.rc | 4 +++-
base/applications/cmdutils/find/find.rc | 1 +
base/applications/cmdutils/help/help.rc | 1 +
base/applications/cmdutils/tasklist/tasklist.rc | 1 +
base/applications/cmdutils/tree/tree.rc | 1 +
base/applications/cmdutils/where/where.rc | 3 ++-
base/applications/network/dwnl/dwnl.rc | 1 +
base/applications/network/tracert/tracert.rc | 1 -
base/applications/osk/osk.rc | 6 ++++--
base/applications/regedit/clb/clb.rc | 1 -
base/system/services/services.rc | 1 -
dll/cpl/console/console.rc | 4 ++--
dll/cpl/inetcpl/inetcpl.rc | 1 -
dll/cpl/inetcpl/lang/He.rc | 2 --
dll/cpl/inetcpl/lang/Sr.rc | 2 --
dll/cpl/inetcpl/lang/cs-CZ.rc | 3 ---
dll/cpl/inetcpl/lang/de-DE.rc | 2 --
dll/cpl/inetcpl/lang/fr-FR.rc | 3 ---
dll/cpl/inetcpl/lang/it-IT.rc | 3 ---
dll/cpl/inetcpl/lang/ja-JP.rc | 3 ---
dll/cpl/inetcpl/lang/ko-KR.rc | 2 --
dll/cpl/inetcpl/lang/lt-LT.rc | 3 ---
dll/cpl/inetcpl/lang/pl-PL.rc | 3 ---
dll/cpl/inetcpl/lang/pt-BR.rc | 2 --
dll/cpl/inetcpl/lang/pt-PT.rc | 3 ---
dll/cpl/inetcpl/lang/ru-RU.rc | 3 ---
dll/cpl/inetcpl/lang/sv-SE.rc | 2 --
dll/cpl/inetcpl/lang/tr-TR.rc | 3 ---
dll/cpl/inetcpl/lang/uk-UA.rc | 3 ---
dll/shellext/mydocs/mydocs.rc | 10 +++++-----
dll/shellext/sendmail/sendmail.rc | 8 ++++----
dll/shellext/zipfldr/zipfldr.rc | 1 -
dll/win32/comdlg32/rsrc.rc | 3 ++-
dll/win32/credui/lang/credui_Da.rc | 2 --
dll/win32/credui/lang/credui_De.rc | 2 --
dll/win32/credui/lang/credui_Es.rc | 2 --
dll/win32/credui/lang/credui_Fr.rc | 2 --
dll/win32/credui/lang/credui_Hu.rc | 3 ---
dll/win32/credui/lang/credui_It.rc | 3 ---
dll/win32/credui/lang/credui_Lt.rc | 3 ---
dll/win32/credui/lang/credui_Pt.rc | 2 --
dll/win32/credui/lang/credui_Ro.rc | 2 --
dll/win32/credui/lang/credui_Ru.rc | 3 ---
dll/win32/credui/lang/credui_Si.rc | 2 --
dll/win32/credui/lang/credui_Uk.rc | 3 ---
dll/win32/credui/lang/credui_Zh.rc | 3 ---
dll/win32/cryptdlg/lang/cryptdlg_De.rc | 2 --
dll/win32/cryptdlg/lang/cryptdlg_Fr.rc | 3 ---
dll/win32/cryptdlg/lang/cryptdlg_Hu.rc | 3 ---
dll/win32/cryptdlg/lang/cryptdlg_It.rc | 3 ---
dll/win32/cryptdlg/lang/cryptdlg_Lt.rc | 3 ---
dll/win32/cryptdlg/lang/cryptdlg_No.rc | 2 --
dll/win32/cryptdlg/lang/cryptdlg_Pt.rc | 2 --
dll/win32/cryptdlg/lang/cryptdlg_Ro.rc | 3 ---
dll/win32/cryptdlg/lang/cryptdlg_Ru.rc | 3 ---
dll/win32/cryptdlg/lang/cryptdlg_Uk.rc | 3 ---
dll/win32/cryptdlg/lang/cryptdlg_Zh.rc | 3 ---
dll/win32/cryptui/lang/cryptui_Bg.rc | 2 --
dll/win32/cryptui/lang/cryptui_De.rc | 2 --
dll/win32/cryptui/lang/cryptui_En.rc | 2 --
dll/win32/cryptui/lang/cryptui_Fr.rc | 2 --
dll/win32/cryptui/lang/cryptui_He.rc | 2 --
dll/win32/cryptui/lang/cryptui_It.rc | 2 --
dll/win32/cryptui/lang/cryptui_Ko.rc | 2 --
dll/win32/cryptui/lang/cryptui_Lt.rc | 2 --
dll/win32/cryptui/lang/cryptui_Nl.rc | 2 --
dll/win32/cryptui/lang/cryptui_No.rc | 2 --
dll/win32/cryptui/lang/cryptui_Pl.rc | 2 --
dll/win32/cryptui/lang/cryptui_Pt.rc | 2 --
dll/win32/cryptui/lang/cryptui_Ro.rc | 2 --
dll/win32/cryptui/lang/cryptui_Ru.rc | 2 --
dll/win32/cryptui/lang/cryptui_Sq.rc | 2 --
dll/win32/cryptui/lang/cryptui_Tr.rc | 2 --
dll/win32/cryptui/lang/cryptui_Uk.rc | 2 --
dll/win32/cryptui/lang/cryptui_Zh.rc | 5 -----
dll/win32/hhctrl.ocx/lang/De.rc | 2 --
dll/win32/hhctrl.ocx/lang/Es.rc | 3 ---
dll/win32/hhctrl.ocx/lang/Fr.rc | 3 ---
dll/win32/hhctrl.ocx/lang/It.rc | 3 ---
dll/win32/hhctrl.ocx/lang/Ja.rc | 3 ---
dll/win32/hhctrl.ocx/lang/Lt.rc | 3 ---
dll/win32/hhctrl.ocx/lang/Pt.rc | 2 --
dll/win32/hhctrl.ocx/lang/Ro.rc | 2 --
dll/win32/hhctrl.ocx/lang/Ru.rc | 3 ---
dll/win32/hhctrl.ocx/lang/Si.rc | 2 --
dll/win32/hhctrl.ocx/lang/Uk.rc | 3 ---
dll/win32/hhctrl.ocx/lang/Zh.rc | 3 ---
dll/win32/iccvid/lang/iccvid_De.rc | 2 --
dll/win32/iccvid/lang/iccvid_Es.rc | 3 ---
dll/win32/iccvid/lang/iccvid_Fr.rc | 3 ---
dll/win32/iccvid/lang/iccvid_It.rc | 3 ---
dll/win32/iccvid/lang/iccvid_Ja.rc | 3 ---
dll/win32/iccvid/lang/iccvid_Lt.rc | 3 ---
dll/win32/iccvid/lang/iccvid_Ro.rc | 2 --
dll/win32/iccvid/lang/iccvid_Ru.rc | 3 ---
dll/win32/iccvid/lang/iccvid_Si.rc | 2 --
dll/win32/iccvid/lang/iccvid_Uk.rc | 3 ---
dll/win32/iccvid/lang/iccvid_Zh.rc | 3 ---
dll/win32/jscript/lang/jscript_Da.rc | 2 --
dll/win32/jscript/lang/jscript_De.rc | 2 --
dll/win32/jscript/lang/jscript_Es.rc | 3 ---
dll/win32/jscript/lang/jscript_Fr.rc | 3 ---
dll/win32/jscript/lang/jscript_Hu.rc | 3 ---
dll/win32/jscript/lang/jscript_It.rc | 3 ---
dll/win32/jscript/lang/jscript_Ja.rc | 3 ---
dll/win32/jscript/lang/jscript_Ko.rc | 3 ---
dll/win32/jscript/lang/jscript_Lt.rc | 3 ---
dll/win32/jscript/lang/jscript_Nl.rc | 2 --
dll/win32/jscript/lang/jscript_No.rc | 2 --
dll/win32/jscript/lang/jscript_Pt.rc | 2 --
dll/win32/jscript/lang/jscript_Ro.rc | 2 --
dll/win32/jscript/lang/jscript_Ru.rc | 3 ---
dll/win32/jscript/lang/jscript_Si.rc | 2 --
dll/win32/jscript/lang/jscript_Uk.rc | 3 ---
dll/win32/jscript/lang/jscript_Zh.rc | 3 ---
dll/win32/mapi32/lang/Es.rc | 3 ---
dll/win32/mapi32/lang/Fr.rc | 3 ---
dll/win32/mapi32/lang/Hu.rc | 3 ---
dll/win32/mapi32/lang/It.rc | 3 ---
dll/win32/mapi32/lang/Ja.rc | 3 ---
dll/win32/mapi32/lang/Ko.rc | 3 ---
dll/win32/mapi32/lang/Lt.rc | 3 ---
dll/win32/mapi32/lang/Nl.rc | 2 --
dll/win32/mapi32/lang/No.rc | 2 --
dll/win32/mapi32/lang/Pt.rc | 2 --
dll/win32/mapi32/lang/Ro.rc | 2 --
dll/win32/mapi32/lang/Ru.rc | 3 ---
dll/win32/mapi32/lang/Si.rc | 2 --
dll/win32/mapi32/lang/Uk.rc | 3 ---
dll/win32/mapi32/lang/Zh.rc | 3 ---
dll/win32/mapi32/version.rc | 1 -
dll/win32/mpr/lang/mpr_De.rc | 2 --
dll/win32/mpr/lang/mpr_Fr.rc | 3 ---
dll/win32/mpr/lang/mpr_Ja.rc | 3 ---
dll/win32/mpr/lang/mpr_Lt.rc | 3 ---
dll/win32/mpr/lang/mpr_Pt.rc | 2 --
dll/win32/mpr/lang/mpr_Ro.rc | 2 --
dll/win32/mpr/lang/mpr_Ru.rc | 3 ---
dll/win32/mpr/lang/mpr_Si.rc | 2 --
dll/win32/mpr/lang/mpr_Uk.rc | 3 ---
dll/win32/mpr/lang/mpr_Zh.rc | 3 ---
dll/win32/msacm32/lang/msacm_De.rc | 2 --
dll/win32/msacm32/lang/msacm_Fr.rc | 3 ---
dll/win32/msacm32/lang/msacm_He.rc | 3 ---
dll/win32/msacm32/lang/msacm_Ja.rc | 3 ---
dll/win32/msacm32/lang/msacm_Lt.rc | 3 ---
dll/win32/msacm32/lang/msacm_Pt.rc | 2 --
dll/win32/msacm32/lang/msacm_Ro.rc | 2 --
dll/win32/msacm32/lang/msacm_Ru.rc | 3 ---
dll/win32/msacm32/lang/msacm_Si.rc | 2 --
dll/win32/msacm32/lang/msacm_Uk.rc | 3 ---
dll/win32/msacm32/lang/msacm_Zh.rc | 3 ---
dll/win32/msacm32/msacm.rc | 1 -
dll/win32/mshtml/lang/Da.rc | 2 --
dll/win32/mshtml/lang/De.rc | 2 --
dll/win32/mshtml/lang/Fr.rc | 3 ---
dll/win32/mshtml/lang/Hu.rc | 3 ---
dll/win32/mshtml/lang/It.rc | 3 ---
dll/win32/mshtml/lang/Ja.rc | 3 ---
dll/win32/mshtml/lang/Lt.rc | 3 ---
dll/win32/mshtml/lang/No.rc | 2 --
dll/win32/mshtml/lang/Pt.rc | 2 --
dll/win32/mshtml/lang/Ro.rc | 2 --
dll/win32/mshtml/lang/Ru.rc | 3 ---
dll/win32/mshtml/lang/Si.rc | 2 --
dll/win32/mshtml/lang/Uk.rc | 3 ---
dll/win32/mshtml/lang/Zh.rc | 3 ---
dll/win32/msrle32/lang/msrle_Bg.rc | 2 --
dll/win32/msrle32/lang/msrle_Cs.rc | 2 --
dll/win32/msrle32/lang/msrle_Cy.rc | 4 ----
dll/win32/msrle32/lang/msrle_Da.rc | 2 --
dll/win32/msrle32/lang/msrle_De.rc | 4 ----
dll/win32/msrle32/lang/msrle_En.rc | 4 ----
dll/win32/msrle32/lang/msrle_Es.rc | 2 --
dll/win32/msrle32/lang/msrle_Fr.rc | 5 -----
dll/win32/msrle32/lang/msrle_He.rc | 4 ----
dll/win32/msrle32/lang/msrle_Hu.rc | 2 --
dll/win32/msrle32/lang/msrle_It.rc | 2 --
dll/win32/msrle32/lang/msrle_Ja.rc | 5 -----
dll/win32/msrle32/lang/msrle_Ko.rc | 2 --
dll/win32/msrle32/lang/msrle_Lt.rc | 5 -----
dll/win32/msrle32/lang/msrle_Nl.rc | 2 --
dll/win32/msrle32/lang/msrle_No.rc | 2 --
dll/win32/msrle32/lang/msrle_Pl.rc | 2 --
dll/win32/msrle32/lang/msrle_Pt.rc | 2 --
dll/win32/msrle32/lang/msrle_Ro.rc | 4 ----
dll/win32/msrle32/lang/msrle_Ru.rc | 5 -----
dll/win32/msrle32/lang/msrle_Si.rc | 4 ----
dll/win32/msrle32/lang/msrle_Sq.rc | 4 ----
dll/win32/msrle32/lang/msrle_Sv.rc | 2 --
dll/win32/msrle32/lang/msrle_Tr.rc | 2 --
dll/win32/msrle32/lang/msrle_Uk.rc | 5 -----
dll/win32/msrle32/lang/msrle_Zh.rc | 5 -----
dll/win32/msvfw32/lang/msvfw32_De.rc | 2 --
dll/win32/msvfw32/lang/msvfw32_Es.rc | 2 --
dll/win32/msvfw32/lang/msvfw32_Fr.rc | 3 ---
dll/win32/msvfw32/lang/msvfw32_It.rc | 3 ---
dll/win32/msvfw32/lang/msvfw32_Lt.rc | 3 ---
dll/win32/msvfw32/lang/msvfw32_Ro.rc | 2 --
dll/win32/msvfw32/lang/msvfw32_Ru.rc | 3 ---
dll/win32/msvfw32/lang/msvfw32_Si.rc | 2 --
dll/win32/msvfw32/lang/msvfw32_Uk.rc | 3 ---
dll/win32/msvfw32/lang/msvfw32_Zh.rc | 3 ---
dll/win32/msvfw32/rsrc.rc | 1 -
dll/win32/msvidc32/lang/msvidc32_De.rc | 2 --
dll/win32/msvidc32/lang/msvidc32_Es.rc | 3 ---
dll/win32/msvidc32/lang/msvidc32_Fr.rc | 3 ---
dll/win32/msvidc32/lang/msvidc32_It.rc | 3 ---
dll/win32/msvidc32/lang/msvidc32_Ja.rc | 3 ---
dll/win32/msvidc32/lang/msvidc32_Lt.rc | 3 ---
dll/win32/msvidc32/lang/msvidc32_Ro.rc | 2 --
dll/win32/msvidc32/lang/msvidc32_Ru.rc | 3 ---
dll/win32/msvidc32/lang/msvidc32_Si.rc | 2 --
dll/win32/msvidc32/lang/msvidc32_Uk.rc | 3 ---
dll/win32/msvidc32/lang/msvidc32_Zh.rc | 3 ---
dll/win32/netcfgx/netcfgx.rc | 6 +++---
dll/win32/oleacc/lang/oleacc_De.rc | 2 --
dll/win32/oleacc/lang/oleacc_Fr.rc | 3 ---
dll/win32/oleacc/lang/oleacc_Hu.rc | 3 ---
dll/win32/oleacc/lang/oleacc_It.rc | 3 ---
dll/win32/oleacc/lang/oleacc_Lt.rc | 3 ---
dll/win32/oleacc/lang/oleacc_No.rc | 3 ---
dll/win32/oleacc/lang/oleacc_Pt.rc | 2 --
dll/win32/oleacc/lang/oleacc_Ro.rc | 2 --
dll/win32/oleacc/lang/oleacc_Si.rc | 2 --
dll/win32/oleacc/lang/oleacc_Uk.rc | 3 ---
dll/win32/oleacc/lang/oleacc_Zh.rc | 3 ---
dll/win32/oleaut32/lang/oleaut32_De.rc | 2 --
dll/win32/oleaut32/lang/oleaut32_Lt.rc | 3 ---
dll/win32/oleaut32/lang/oleaut32_Ro.rc | 2 --
dll/win32/oleaut32/lang/oleaut32_Ru.rc | 3 ---
dll/win32/oleaut32/lang/oleaut32_Si.rc | 2 --
dll/win32/oleaut32/lang/oleaut32_Uk.rc | 3 ---
dll/win32/oleaut32/lang/oleaut32_Zh.rc | 3 ---
dll/win32/oledlg/lang/oledlg_De.rc | 2 --
dll/win32/oledlg/lang/oledlg_Fr.rc | 3 ---
dll/win32/oledlg/lang/oledlg_Hu.rc | 3 ---
dll/win32/oledlg/lang/oledlg_It.rc | 3 ---
dll/win32/oledlg/lang/oledlg_Ja.rc | 3 ---
dll/win32/oledlg/lang/oledlg_Lt.rc | 3 ---
dll/win32/oledlg/lang/oledlg_Nl.rc | 2 --
dll/win32/oledlg/lang/oledlg_Pt.rc | 2 --
dll/win32/oledlg/lang/oledlg_Ro.rc | 2 --
dll/win32/oledlg/lang/oledlg_Ru.rc | 3 ---
dll/win32/oledlg/lang/oledlg_Si.rc | 2 --
dll/win32/oledlg/lang/oledlg_Uk.rc | 3 ---
dll/win32/oledlg/lang/oledlg_Zh.rc | 3 ---
dll/win32/shlwapi/lang/de-DE.rc | 2 --
dll/win32/shlwapi/lang/fr-FR.rc | 3 ---
dll/win32/shlwapi/lang/hu-HU.rc | 3 ---
dll/win32/shlwapi/lang/ja-JP.rc | 3 ---
dll/win32/shlwapi/lang/lt-LT.rc | 3 ---
dll/win32/shlwapi/lang/pt-PT.rc | 2 --
dll/win32/shlwapi/lang/ro-RO.rc | 2 --
dll/win32/shlwapi/lang/ru-RU.rc | 3 ---
dll/win32/shlwapi/lang/sl-SI.rc | 2 --
dll/win32/shlwapi/lang/uk-UA.rc | 3 ---
dll/win32/shlwapi/lang/zh-CN.rc | 3 ---
dll/win32/shlwapi/lang/zh-TW.rc | 3 ---
dll/win32/themeui/themeui.rc | 1 +
dll/win32/wininet/lang/wininet_Da.rc | 2 --
dll/win32/wininet/lang/wininet_De.rc | 2 --
dll/win32/wininet/lang/wininet_Fr.rc | 3 ---
dll/win32/wininet/lang/wininet_He.rc | 2 --
dll/win32/wininet/lang/wininet_Hu.rc | 3 ---
dll/win32/wininet/lang/wininet_It.rc | 3 ---
dll/win32/wininet/lang/wininet_Ja.rc | 3 ---
dll/win32/wininet/lang/wininet_Ko.rc | 2 --
dll/win32/wininet/lang/wininet_Lt.rc | 3 ---
dll/win32/wininet/lang/wininet_Nl.rc | 2 --
dll/win32/wininet/lang/wininet_No.rc | 2 --
dll/win32/wininet/lang/wininet_Pt.rc | 2 --
dll/win32/wininet/lang/wininet_Ro.rc | 2 --
dll/win32/wininet/lang/wininet_Ru.rc | 3 ---
dll/win32/wininet/lang/wininet_Si.rc | 2 --
dll/win32/wininet/lang/wininet_Sr.rc | 2 --
dll/win32/wininet/lang/wininet_Uk.rc | 3 ---
dll/win32/wininet/lang/wininet_Zh.rc | 3 ---
dll/win32/winmm/lang/winmm_Br.rc | 4 +++-
dll/win32/winmm/lang/winmm_Cs.rc | 4 +++-
dll/win32/winmm/lang/winmm_De.rc | 4 +++-
dll/win32/winmm/lang/winmm_En.rc | 4 +++-
dll/win32/winmm/lang/winmm_Es.rc | 4 +++-
dll/win32/winmm/lang/winmm_Hu.rc | 4 +++-
dll/win32/winmm/lang/winmm_Id.rc | 3 ++-
dll/win32/winmm/lang/winmm_It.rc | 4 +++-
dll/win32/winmm/lang/winmm_Ja.rc | 4 +++-
dll/win32/winmm/lang/winmm_Nl.rc | 4 +++-
dll/win32/winmm/lang/winmm_No.rc | 4 +++-
dll/win32/winmm/lang/winmm_Pl.rc | 4 +++-
dll/win32/winmm/lang/winmm_Pt.rc | 4 +++-
dll/win32/winmm/lang/winmm_Ro.rc | 4 +++-
dll/win32/winmm/lang/winmm_Ru.rc | 10 ++++------
dll/win32/winmm/lang/winmm_Si.rc | 4 +++-
dll/win32/winmm/lang/winmm_Sk.rc | 4 +++-
dll/win32/winmm/lang/winmm_Sq.rc | 4 +++-
dll/win32/winmm/lang/winmm_Tr.rc | 4 +++-
dll/win32/winmm/lang/winmm_Uk.rc | 5 ++---
dll/win32/winmm/lang/winmm_Zh.rc | 11 +++++++----
dll/win32/wldap32/lang/wldap32_De.rc | 2 --
dll/win32/wldap32/lang/wldap32_Fr.rc | 3 ---
dll/win32/wldap32/lang/wldap32_Hu.rc | 3 ---
dll/win32/wldap32/lang/wldap32_It.rc | 3 ---
dll/win32/wldap32/lang/wldap32_Lt.rc | 3 ---
dll/win32/wldap32/lang/wldap32_Pt.rc | 2 --
dll/win32/wldap32/lang/wldap32_Ro.rc | 2 --
dll/win32/wldap32/lang/wldap32_Ru.rc | 3 ---
dll/win32/wldap32/lang/wldap32_Uk.rc | 3 ---
dll/win32/wldap32/lang/wldap32_Zh.rc | 3 ---
media/themes/Blackshade/blackshade.msstyles/blackshade.rc | 1 +
media/themes/Lautus/lautus.msstyles/lautus.rc | 1 +
media/themes/Lunar/lunar.msstyles/lunar.rc | 1 +
media/themes/Mizu/mizu.msstyles/mizu.rc | 1 +
media/themes/Modern/modern.msstyles/modern.rc | 3 ++-
.../rosapps/applications/screensavers/blankscr/lang/ro-RO.rc | 2 --
.../applications/screensavers/butterflies/lang/ro-RO.rc | 2 --
.../rosapps/applications/screensavers/circles/lang/ro-RO.rc | 2 --
.../rosapps/applications/screensavers/matrix/lang/bg-BG.rc | 1 -
.../rosapps/applications/screensavers/matrix/lang/de-DE.rc | 1 -
.../rosapps/applications/screensavers/matrix/lang/en-US.rc | 1 -
.../rosapps/applications/screensavers/matrix/lang/es-ES.rc | 1 -
.../rosapps/applications/screensavers/matrix/lang/fr-FR.rc | 1 -
.../rosapps/applications/screensavers/matrix/lang/lt-LT.rc | 2 --
.../rosapps/applications/screensavers/matrix/lang/nl-NL.rc | 1 -
.../rosapps/applications/screensavers/matrix/lang/no-NO.rc | 1 -
.../rosapps/applications/screensavers/matrix/lang/pl-PL.rc | 2 --
.../rosapps/applications/screensavers/matrix/lang/ro-RO.rc | 4 ----
.../rosapps/applications/screensavers/matrix/lang/ru-RU.rc | 2 --
.../rosapps/applications/screensavers/matrix/lang/sk-SK.rc | 2 --
.../rosapps/applications/screensavers/matrix/lang/th-TH.rc | 1 -
.../rosapps/applications/screensavers/matrix/lang/tr-TR.rc | 2 --
.../rosapps/applications/screensavers/matrix/lang/uk-UA.rc | 2 --
.../rosapps/applications/screensavers/matrix/lang/zh-CN.rc | 2 --
.../rosapps/applications/screensavers/matrix/lang/zh-HK.rc | 2 --
.../rosapps/applications/screensavers/matrix/lang/zh-TW.rc | 2 --
.../rosapps/applications/screensavers/starfield/lang/ro-RO.rc | 2 --
modules/rosapps/applications/sysutils/fontsub/fontsub_res.rc | 6 +++---
modules/rosapps/applications/sysutils/fontsub/lang/de-DE.rc | 3 ---
modules/rosapps/applications/sysutils/fontsub/lang/en-US.rc | 3 ---
modules/rosapps/applications/sysutils/fontsub/lang/es-ES.rc | 3 ---
modules/rosapps/applications/sysutils/fontsub/lang/ja-JP.rc | 3 ---
modules/rosapps/applications/sysutils/fontsub/lang/pl-PL.rc | 3 ---
modules/rosapps/applications/sysutils/fontsub/lang/ru-RU.rc | 3 ---
modules/rosapps/applications/sysutils/fontsub/lang/tr-TR.rc | 3 ---
modules/rosapps/applications/sysutils/fontsub/lang/zh-CN.rc | 3 ---
modules/rosapps/applications/sysutils/fontsub/lang/zh-HK.rc | 3 ---
modules/rosapps/applications/sysutils/fontsub/lang/zh-TW.rc | 3 ---
modules/rostests/apitests/imm32/resource.rc | 4 +++-
modules/rostests/winetests/GUI/WinetestsGUI.rc | 1 -
win32ss/printing/monitors/localmon/ui/lang/ui_De.rc | 2 --
win32ss/printing/monitors/localmon/ui/lang/ui_Es.rc | 2 --
win32ss/printing/monitors/localmon/ui/lang/ui_Fr.rc | 2 --
win32ss/printing/monitors/localmon/ui/lang/ui_Hu.rc | 3 ---
win32ss/printing/monitors/localmon/ui/lang/ui_It.rc | 3 ---
win32ss/printing/monitors/localmon/ui/lang/ui_Ja.rc | 3 ---
win32ss/printing/monitors/localmon/ui/lang/ui_Lt.rc | 3 ---
win32ss/printing/monitors/localmon/ui/lang/ui_Ro.rc | 2 --
win32ss/printing/monitors/localmon/ui/lang/ui_Ru.rc | 3 ---
win32ss/printing/monitors/localmon/ui/lang/ui_Si.rc | 2 --
win32ss/printing/monitors/localmon/ui/lang/ui_Uk.rc | 3 ---
win32ss/printing/monitors/localmon/ui/lang/ui_Zh.rc | 3 ---
362 files changed, 110 insertions(+), 867 deletions(-)
diff --git a/base/applications/cmdutils/at/at.rc b/base/applications/cmdutils/at/at.rc
index 364297c3f66..da29a956e24 100644
--- a/base/applications/cmdutils/at/at.rc
+++ b/base/applications/cmdutils/at/at.rc
@@ -9,6 +9,7 @@
/* UTF-8 */
#pragma code_page(65001)
+
#ifdef LANGUAGE_DE_DE
#include "lang/de-DE.rc"
#endif
diff --git a/base/applications/cmdutils/fc/fc.rc b/base/applications/cmdutils/fc/fc.rc
index d9199235b45..77890c55ad8 100644
--- a/base/applications/cmdutils/fc/fc.rc
+++ b/base/applications/cmdutils/fc/fc.rc
@@ -6,7 +6,9 @@
#define REACTOS_STR_ORIGINAL_FILENAME "fc.exe"
#include <reactos/version.rc>
-#pragma code_page(65001) /* UTF-8 */
+/* UTF-8 */
+#pragma code_page(65001)
+
#ifdef LANGUAGE_BG_BG
#include "lang/bg-BG.rc"
#endif
diff --git a/base/applications/cmdutils/find/find.rc b/base/applications/cmdutils/find/find.rc
index 71239582b07..b023b942a49 100644
--- a/base/applications/cmdutils/find/find.rc
+++ b/base/applications/cmdutils/find/find.rc
@@ -9,6 +9,7 @@
/* UTF-8 */
#pragma code_page(65001)
+
#ifdef LANGUAGE_BG_BG
#include "lang/bg-BG.rc"
#endif
diff --git a/base/applications/cmdutils/help/help.rc b/base/applications/cmdutils/help/help.rc
index e0b22790180..bde222b397f 100644
--- a/base/applications/cmdutils/help/help.rc
+++ b/base/applications/cmdutils/help/help.rc
@@ -12,6 +12,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
/* UTF-8 */
#pragma code_page(65001)
+
#ifdef LANGUAGE_DE_DE
#include "lang/de-DE.rc"
#endif
diff --git a/base/applications/cmdutils/tasklist/tasklist.rc b/base/applications/cmdutils/tasklist/tasklist.rc
index 7f85446d436..7a01c6003c9 100644
--- a/base/applications/cmdutils/tasklist/tasklist.rc
+++ b/base/applications/cmdutils/tasklist/tasklist.rc
@@ -9,6 +9,7 @@
/* UTF-8 */
#pragma code_page(65001)
+
#ifdef LANGUAGE_BG_BG
#include "lang/bg-BG.rc"
#endif
diff --git a/base/applications/cmdutils/tree/tree.rc b/base/applications/cmdutils/tree/tree.rc
index 63ce24f11b2..506578e6f63 100644
--- a/base/applications/cmdutils/tree/tree.rc
+++ b/base/applications/cmdutils/tree/tree.rc
@@ -11,6 +11,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
/* UTF-8 */
#pragma code_page(65001)
+
#ifdef LANGUAGE_DE_DE
#include "lang/de-DE.rc"
#endif
diff --git a/base/applications/cmdutils/where/where.rc b/base/applications/cmdutils/where/where.rc
index 115d90a45b6..919dc71a35d 100644
--- a/base/applications/cmdutils/where/where.rc
+++ b/base/applications/cmdutils/where/where.rc
@@ -6,7 +6,8 @@
#define REACTOS_STR_ORIGINAL_FILENAME "where.exe"
#include <reactos/version.rc>
-#pragma code_page(65001) /* UTF-8 */
+/* UTF-8 */
+#pragma code_page(65001)
#ifdef LANGUAGE_DE_DE
#include "lang/de-DE.rc"
diff --git a/base/applications/network/dwnl/dwnl.rc b/base/applications/network/dwnl/dwnl.rc
index 8047407d551..070a9b477b3 100644
--- a/base/applications/network/dwnl/dwnl.rc
+++ b/base/applications/network/dwnl/dwnl.rc
@@ -11,6 +11,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
/* UTF-8 */
#pragma code_page(65001)
+
#ifdef LANGUAGE_DE_DE
#include "lang/de-DE.rc"
#endif
diff --git a/base/applications/network/tracert/tracert.rc b/base/applications/network/tracert/tracert.rc
index a39998756f2..6d24085060e 100644
--- a/base/applications/network/tracert/tracert.rc
+++ b/base/applications/network/tracert/tracert.rc
@@ -7,7 +7,6 @@
#define REACTOS_STR_ORIGINAL_COPYRIGHT "Ged Murphy (gedmurphy(a)reactos.org)"
#include <reactos/version.rc>
-
/* UTF-8 */
#pragma code_page(65001)
diff --git a/base/applications/osk/osk.rc b/base/applications/osk/osk.rc
index a599e616184..307fc801c81 100644
--- a/base/applications/osk/osk.rc
+++ b/base/applications/osk/osk.rc
@@ -6,6 +6,7 @@
*/
/* INCLUDES ******************************************************************/
+
#include "precomp.h"
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS On Screen Keyboard"
@@ -17,7 +18,6 @@
IDI_OSK ICON "res/osk.ico"
IDI_SOUNDCLICK WAVE "res/click.wav"
-
IDI_BACK ICON "res/back.ico"
IDI_TAB ICON "res/tab.ico"
IDI_CAPS_LOCK ICON "res/caps_lock.ico"
@@ -35,8 +35,9 @@ IDI_BOTTOM ICON "res/bottom.ico"
#include <reactos/manifest_exe.rc>
-// UTF-8
+/* UTF-8 */
#pragma code_page(65001)
+
#ifdef LANGUAGE_AR_DZ
#include "lang/ar-DZ.rc"
#endif
@@ -100,4 +101,5 @@ IDI_BOTTOM ICON "res/bottom.ico"
#ifdef LANGUAGE_ZH_TW
#include "lang/zh-TW.rc"
#endif
+
/* EOF */
diff --git a/base/applications/regedit/clb/clb.rc b/base/applications/regedit/clb/clb.rc
index fa642311fb7..b6567cb7f57 100644
--- a/base/applications/regedit/clb/clb.rc
+++ b/base/applications/regedit/clb/clb.rc
@@ -12,7 +12,6 @@
#include <reactos/manifest_dll.rc>
-
/* UTF-8 */
#pragma code_page(65001)
diff --git a/base/system/services/services.rc b/base/system/services/services.rc
index 4b58c2a343a..e7c3cc7574f 100644
--- a/base/system/services/services.rc
+++ b/base/system/services/services.rc
@@ -8,7 +8,6 @@
#define REACTOS_STR_ORIGINAL_FILENAME "services.exe"
#include <reactos/version.rc>
-
/* UTF-8 */
#pragma code_page(65001)
diff --git a/dll/cpl/console/console.rc b/dll/cpl/console/console.rc
index 8143555c805..74e1f7b279c 100644
--- a/dll/cpl/console/console.rc
+++ b/dll/cpl/console/console.rc
@@ -12,6 +12,8 @@
#include "resource.h"
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
#define REACTOS_VERSION_DLL
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Control Panel Console Applet"
#define REACTOS_STR_INTERNAL_NAME "console"
@@ -22,8 +24,6 @@ IDC_CPLICON ICON "res/terminal.ico"
#include <reactos/manifest_hosted.rc>
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-
/* UTF-8 */
#pragma code_page(65001)
diff --git a/dll/cpl/inetcpl/inetcpl.rc b/dll/cpl/inetcpl/inetcpl.rc
index 23f939ca7e9..3c4218072af 100644
--- a/dll/cpl/inetcpl/inetcpl.rc
+++ b/dll/cpl/inetcpl/inetcpl.rc
@@ -21,7 +21,6 @@
#include "inetcpl.h"
-
#include <reactos/manifest_hosted.rc>
/* UTF-8 */
diff --git a/dll/cpl/inetcpl/lang/He.rc b/dll/cpl/inetcpl/lang/He.rc
index a320c602cd1..af905ea975b 100644
--- a/dll/cpl/inetcpl/lang/He.rc
+++ b/dll/cpl/inetcpl/lang/He.rc
@@ -22,8 +22,6 @@
*
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/cpl/inetcpl/lang/Sr.rc b/dll/cpl/inetcpl/lang/Sr.rc
index c205f51c019..ffa8e14b5c6 100644
--- a/dll/cpl/inetcpl/lang/Sr.rc
+++ b/dll/cpl/inetcpl/lang/Sr.rc
@@ -20,8 +20,6 @@
*
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC
STRINGTABLE
diff --git a/dll/cpl/inetcpl/lang/cs-CZ.rc b/dll/cpl/inetcpl/lang/cs-CZ.rc
index 411a5d56071..30bbcdcb629 100644
--- a/dll/cpl/inetcpl/lang/cs-CZ.rc
+++ b/dll/cpl/inetcpl/lang/cs-CZ.rc
@@ -3,9 +3,6 @@
* UPDATED: 2014-04-21
*/
- /* UTF-8 */
- #pragma code_page(65001)
-
LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/cpl/inetcpl/lang/de-DE.rc b/dll/cpl/inetcpl/lang/de-DE.rc
index 71307283826..bc9132464bb 100644
--- a/dll/cpl/inetcpl/lang/de-DE.rc
+++ b/dll/cpl/inetcpl/lang/de-DE.rc
@@ -19,8 +19,6 @@
*
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/cpl/inetcpl/lang/fr-FR.rc b/dll/cpl/inetcpl/lang/fr-FR.rc
index 7f3f169456c..b2d5a43314d 100644
--- a/dll/cpl/inetcpl/lang/fr-FR.rc
+++ b/dll/cpl/inetcpl/lang/fr-FR.rc
@@ -20,9 +20,6 @@
*
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/cpl/inetcpl/lang/it-IT.rc b/dll/cpl/inetcpl/lang/it-IT.rc
index 8193d19262e..c5db21ad75e 100644
--- a/dll/cpl/inetcpl/lang/it-IT.rc
+++ b/dll/cpl/inetcpl/lang/it-IT.rc
@@ -19,9 +19,6 @@
*
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/cpl/inetcpl/lang/ja-JP.rc b/dll/cpl/inetcpl/lang/ja-JP.rc
index c50a0ef068e..fdb15f7b1b3 100644
--- a/dll/cpl/inetcpl/lang/ja-JP.rc
+++ b/dll/cpl/inetcpl/lang/ja-JP.rc
@@ -20,9 +20,6 @@
*
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/cpl/inetcpl/lang/ko-KR.rc b/dll/cpl/inetcpl/lang/ko-KR.rc
index 3032ba5ced1..56200e37ae6 100644
--- a/dll/cpl/inetcpl/lang/ko-KR.rc
+++ b/dll/cpl/inetcpl/lang/ko-KR.rc
@@ -20,8 +20,6 @@
*
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/cpl/inetcpl/lang/lt-LT.rc b/dll/cpl/inetcpl/lang/lt-LT.rc
index d37d53cdf7d..2abd4e32eba 100644
--- a/dll/cpl/inetcpl/lang/lt-LT.rc
+++ b/dll/cpl/inetcpl/lang/lt-LT.rc
@@ -19,9 +19,6 @@
*
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/cpl/inetcpl/lang/pl-PL.rc b/dll/cpl/inetcpl/lang/pl-PL.rc
index dbb04c95e61..bfd6b32ebb7 100644
--- a/dll/cpl/inetcpl/lang/pl-PL.rc
+++ b/dll/cpl/inetcpl/lang/pl-PL.rc
@@ -19,9 +19,6 @@
*
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/cpl/inetcpl/lang/pt-BR.rc b/dll/cpl/inetcpl/lang/pt-BR.rc
index d8fc04bc5f2..71a4816e033 100644
--- a/dll/cpl/inetcpl/lang/pt-BR.rc
+++ b/dll/cpl/inetcpl/lang/pt-BR.rc
@@ -19,8 +19,6 @@
*
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
STRINGTABLE
diff --git a/dll/cpl/inetcpl/lang/pt-PT.rc b/dll/cpl/inetcpl/lang/pt-PT.rc
index 3b5c9191ca0..65f07cd267d 100644
--- a/dll/cpl/inetcpl/lang/pt-PT.rc
+++ b/dll/cpl/inetcpl/lang/pt-PT.rc
@@ -20,9 +20,6 @@
*
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/cpl/inetcpl/lang/ru-RU.rc b/dll/cpl/inetcpl/lang/ru-RU.rc
index 9a283ecc087..19b2870bda9 100644
--- a/dll/cpl/inetcpl/lang/ru-RU.rc
+++ b/dll/cpl/inetcpl/lang/ru-RU.rc
@@ -19,9 +19,6 @@
*
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/cpl/inetcpl/lang/sv-SE.rc b/dll/cpl/inetcpl/lang/sv-SE.rc
index 60887d9a7bf..fd6779cc7e1 100644
--- a/dll/cpl/inetcpl/lang/sv-SE.rc
+++ b/dll/cpl/inetcpl/lang/sv-SE.rc
@@ -19,8 +19,6 @@
*
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/cpl/inetcpl/lang/tr-TR.rc b/dll/cpl/inetcpl/lang/tr-TR.rc
index b8897f98a52..24025e35808 100644
--- a/dll/cpl/inetcpl/lang/tr-TR.rc
+++ b/dll/cpl/inetcpl/lang/tr-TR.rc
@@ -19,9 +19,6 @@
*
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_TURKISH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/cpl/inetcpl/lang/uk-UA.rc b/dll/cpl/inetcpl/lang/uk-UA.rc
index debac95408d..27925e9ec00 100644
--- a/dll/cpl/inetcpl/lang/uk-UA.rc
+++ b/dll/cpl/inetcpl/lang/uk-UA.rc
@@ -20,9 +20,6 @@
*
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/shellext/mydocs/mydocs.rc b/dll/shellext/mydocs/mydocs.rc
index ec24cb9414b..9a9aa19a3c1 100644
--- a/dll/shellext/mydocs/mydocs.rc
+++ b/dll/shellext/mydocs/mydocs.rc
@@ -9,18 +9,18 @@
#include <winuser.h>
#include "resource.h"
-#include "mydocs_version.rc"
-
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+#include "mydocs_version.rc"
+
100 ICON "../../win32/shell32/res/icons/235.ico" // IDI_SHELL_MY_DOCUMENTS
101 ICON "../../win32/shell32/res/icons/236.ico" // IDI_SHELL_MY_PICTURES
IDR_MYDOCS REGISTRY "res/mydocs.rgs"
+/* UTF-8 */
+#pragma code_page(65001)
+
#ifdef LANGUAGE_DE_DE
#include "lang/de-DE.rc"
#endif
diff --git a/dll/shellext/sendmail/sendmail.rc b/dll/shellext/sendmail/sendmail.rc
index 378b89f4445..c209b8c4f63 100644
--- a/dll/shellext/sendmail/sendmail.rc
+++ b/dll/shellext/sendmail/sendmail.rc
@@ -9,15 +9,15 @@
#include <winuser.h>
#include "resource.h"
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
#include "sendmail_version.rc"
+IDR_DESKLINK REGISTRY "res/desklink.rgs"
+
/* UTF-8 */
#pragma code_page(65001)
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-
-IDR_DESKLINK REGISTRY "res/desklink.rgs"
-
#ifdef LANGUAGE_DE_DE
#include "lang/de-DE.rc"
#endif
diff --git a/dll/shellext/zipfldr/zipfldr.rc b/dll/shellext/zipfldr/zipfldr.rc
index 83d736fefd4..8f6b7b9279c 100644
--- a/dll/shellext/zipfldr/zipfldr.rc
+++ b/dll/shellext/zipfldr/zipfldr.rc
@@ -22,7 +22,6 @@ IDR_ZIPFLDR REGISTRY "res/zipfldr.rgs"
/* UTF-8 */
#pragma code_page(65001)
-
#ifdef LANGUAGE_DE_DE
#include "lang/de-DE.rc"
#endif
diff --git a/dll/win32/comdlg32/rsrc.rc b/dll/win32/comdlg32/rsrc.rc
index efaec2a5024..3b589a7c67d 100644
--- a/dll/win32/comdlg32/rsrc.rc
+++ b/dll/win32/comdlg32/rsrc.rc
@@ -42,7 +42,8 @@
* get localized bitmaps for example.
*/
-#pragma code_page(65001) // UTF-8
+/* UTF-8 */
+#pragma code_page(65001)
#ifdef LANGUAGE_BG_BG
#include "lang/cdlg_Bg.rc"
diff --git a/dll/win32/credui/lang/credui_Da.rc b/dll/win32/credui/lang/credui_Da.rc
index 522037a4d35..fab8e914c51 100644
--- a/dll/win32/credui/lang/credui_Da.rc
+++ b/dll/win32/credui/lang/credui_Da.rc
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/credui/lang/credui_De.rc b/dll/win32/credui/lang/credui_De.rc
index a8177d8dfb7..ede8139eb8a 100644
--- a/dll/win32/credui/lang/credui_De.rc
+++ b/dll/win32/credui/lang/credui_De.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/credui/lang/credui_Es.rc b/dll/win32/credui/lang/credui_Es.rc
index fef58e72e20..087d5825aa4 100644
--- a/dll/win32/credui/lang/credui_Es.rc
+++ b/dll/win32/credui/lang/credui_Es.rc
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/credui/lang/credui_Fr.rc b/dll/win32/credui/lang/credui_Fr.rc
index e59b5f1c23f..3f5cf64c186 100644
--- a/dll/win32/credui/lang/credui_Fr.rc
+++ b/dll/win32/credui/lang/credui_Fr.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/credui/lang/credui_Hu.rc b/dll/win32/credui/lang/credui_Hu.rc
index d47d24b899c..7aadcd3e907 100644
--- a/dll/win32/credui/lang/credui_Hu.rc
+++ b/dll/win32/credui/lang/credui_Hu.rc
@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/credui/lang/credui_It.rc b/dll/win32/credui/lang/credui_It.rc
index 58891703254..961d7506668 100644
--- a/dll/win32/credui/lang/credui_It.rc
+++ b/dll/win32/credui/lang/credui_It.rc
@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/credui/lang/credui_Lt.rc b/dll/win32/credui/lang/credui_Lt.rc
index f6cc96ddfcb..cb0db4b4a49 100644
--- a/dll/win32/credui/lang/credui_Lt.rc
+++ b/dll/win32/credui/lang/credui_Lt.rc
@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/credui/lang/credui_Pt.rc b/dll/win32/credui/lang/credui_Pt.rc
index a5579fb1d1d..29cb751b38a 100644
--- a/dll/win32/credui/lang/credui_Pt.rc
+++ b/dll/win32/credui/lang/credui_Pt.rc
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
STRINGTABLE
diff --git a/dll/win32/credui/lang/credui_Ro.rc b/dll/win32/credui/lang/credui_Ro.rc
index f032f1ab510..941f8e349de 100644
--- a/dll/win32/credui/lang/credui_Ro.rc
+++ b/dll/win32/credui/lang/credui_Ro.rc
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/credui/lang/credui_Ru.rc b/dll/win32/credui/lang/credui_Ru.rc
index 504e2ad7546..6f319c57b4f 100644
--- a/dll/win32/credui/lang/credui_Ru.rc
+++ b/dll/win32/credui/lang/credui_Ru.rc
@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/credui/lang/credui_Si.rc b/dll/win32/credui/lang/credui_Si.rc
index 92041812a48..88d4570c425 100644
--- a/dll/win32/credui/lang/credui_Si.rc
+++ b/dll/win32/credui/lang/credui_Si.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/credui/lang/credui_Uk.rc b/dll/win32/credui/lang/credui_Uk.rc
index 50f7ed5a61c..a1dca8fd138 100644
--- a/dll/win32/credui/lang/credui_Uk.rc
+++ b/dll/win32/credui/lang/credui_Uk.rc
@@ -19,9 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/credui/lang/credui_Zh.rc b/dll/win32/credui/lang/credui_Zh.rc
index 6dc6e702920..277a7884910 100644
--- a/dll/win32/credui/lang/credui_Zh.rc
+++ b/dll/win32/credui/lang/credui_Zh.rc
@@ -21,9 +21,6 @@
* Copyright 2021 Chan Chilung <eason066(a)gmail.com>
*/
-/* Chinese text is encoded in UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
STRINGTABLE
diff --git a/dll/win32/cryptdlg/lang/cryptdlg_De.rc b/dll/win32/cryptdlg/lang/cryptdlg_De.rc
index 6550e199d53..5d543066a12 100644
--- a/dll/win32/cryptdlg/lang/cryptdlg_De.rc
+++ b/dll/win32/cryptdlg/lang/cryptdlg_De.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/cryptdlg/lang/cryptdlg_Fr.rc b/dll/win32/cryptdlg/lang/cryptdlg_Fr.rc
index 76b933f14c4..1ff68556bd6 100644
--- a/dll/win32/cryptdlg/lang/cryptdlg_Fr.rc
+++ b/dll/win32/cryptdlg/lang/cryptdlg_Fr.rc
@@ -19,9 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/cryptdlg/lang/cryptdlg_Hu.rc b/dll/win32/cryptdlg/lang/cryptdlg_Hu.rc
index 59860508291..8b62e041d0a 100644
--- a/dll/win32/cryptdlg/lang/cryptdlg_Hu.rc
+++ b/dll/win32/cryptdlg/lang/cryptdlg_Hu.rc
@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/cryptdlg/lang/cryptdlg_It.rc b/dll/win32/cryptdlg/lang/cryptdlg_It.rc
index 0c29429e66c..2786b4c4f2e 100644
--- a/dll/win32/cryptdlg/lang/cryptdlg_It.rc
+++ b/dll/win32/cryptdlg/lang/cryptdlg_It.rc
@@ -19,9 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/cryptdlg/lang/cryptdlg_Lt.rc b/dll/win32/cryptdlg/lang/cryptdlg_Lt.rc
index 9b38e5c9e0b..b856baf0778 100644
--- a/dll/win32/cryptdlg/lang/cryptdlg_Lt.rc
+++ b/dll/win32/cryptdlg/lang/cryptdlg_Lt.rc
@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/cryptdlg/lang/cryptdlg_No.rc b/dll/win32/cryptdlg/lang/cryptdlg_No.rc
index ae58f253204..3eaa6a74a1a 100644
--- a/dll/win32/cryptdlg/lang/cryptdlg_No.rc
+++ b/dll/win32/cryptdlg/lang/cryptdlg_No.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
STRINGTABLE
diff --git a/dll/win32/cryptdlg/lang/cryptdlg_Pt.rc b/dll/win32/cryptdlg/lang/cryptdlg_Pt.rc
index 81adca17db7..b7ac445c6a8 100644
--- a/dll/win32/cryptdlg/lang/cryptdlg_Pt.rc
+++ b/dll/win32/cryptdlg/lang/cryptdlg_Pt.rc
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
STRINGTABLE
diff --git a/dll/win32/cryptdlg/lang/cryptdlg_Ro.rc b/dll/win32/cryptdlg/lang/cryptdlg_Ro.rc
index 3c448e3bd8c..7b68be9e20b 100644
--- a/dll/win32/cryptdlg/lang/cryptdlg_Ro.rc
+++ b/dll/win32/cryptdlg/lang/cryptdlg_Ro.rc
@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/cryptdlg/lang/cryptdlg_Ru.rc b/dll/win32/cryptdlg/lang/cryptdlg_Ru.rc
index 0991cceb7a0..518d8d1c81b 100644
--- a/dll/win32/cryptdlg/lang/cryptdlg_Ru.rc
+++ b/dll/win32/cryptdlg/lang/cryptdlg_Ru.rc
@@ -19,9 +19,6 @@
*/
/* Russian language resource file by Kudratov Olimjon (olim98(a)bk.ru) */
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/cryptdlg/lang/cryptdlg_Uk.rc b/dll/win32/cryptdlg/lang/cryptdlg_Uk.rc
index 4248eb4c65e..acf86c6454c 100644
--- a/dll/win32/cryptdlg/lang/cryptdlg_Uk.rc
+++ b/dll/win32/cryptdlg/lang/cryptdlg_Uk.rc
@@ -19,9 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/cryptdlg/lang/cryptdlg_Zh.rc b/dll/win32/cryptdlg/lang/cryptdlg_Zh.rc
index 918c75b1152..815dfa75886 100644
--- a/dll/win32/cryptdlg/lang/cryptdlg_Zh.rc
+++ b/dll/win32/cryptdlg/lang/cryptdlg_Zh.rc
@@ -21,9 +21,6 @@
* Copyright 2021 Chan Chilung <eason066(a)gmail.com>
*/
-/* Chinese text is encoded in UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
STRINGTABLE
diff --git a/dll/win32/cryptui/lang/cryptui_Bg.rc b/dll/win32/cryptui/lang/cryptui_Bg.rc
index bdb5a2d404a..0a729195650 100644
--- a/dll/win32/cryptui/lang/cryptui_Bg.rc
+++ b/dll/win32/cryptui/lang/cryptui_Bg.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "cryptuires.h"
-
LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/cryptui/lang/cryptui_De.rc b/dll/win32/cryptui/lang/cryptui_De.rc
index 562f6f3ea89..b05f3d18307 100644
--- a/dll/win32/cryptui/lang/cryptui_De.rc
+++ b/dll/win32/cryptui/lang/cryptui_De.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "cryptuires.h"
-
LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/cryptui/lang/cryptui_En.rc b/dll/win32/cryptui/lang/cryptui_En.rc
index d20f90ba006..1e4d5cb6695 100644
--- a/dll/win32/cryptui/lang/cryptui_En.rc
+++ b/dll/win32/cryptui/lang/cryptui_En.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "cryptuires.h"
-
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/cryptui/lang/cryptui_Fr.rc b/dll/win32/cryptui/lang/cryptui_Fr.rc
index 57d074348fb..dada7f34074 100644
--- a/dll/win32/cryptui/lang/cryptui_Fr.rc
+++ b/dll/win32/cryptui/lang/cryptui_Fr.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "cryptuires.h"
-
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/cryptui/lang/cryptui_He.rc b/dll/win32/cryptui/lang/cryptui_He.rc
index 52ffd73ac4b..c875aeefcb6 100644
--- a/dll/win32/cryptui/lang/cryptui_He.rc
+++ b/dll/win32/cryptui/lang/cryptui_He.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "cryptuires.h"
-
LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/cryptui/lang/cryptui_It.rc b/dll/win32/cryptui/lang/cryptui_It.rc
index 5fd8333dc0c..841fcac7057 100644
--- a/dll/win32/cryptui/lang/cryptui_It.rc
+++ b/dll/win32/cryptui/lang/cryptui_It.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "cryptuires.h"
-
LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/cryptui/lang/cryptui_Ko.rc b/dll/win32/cryptui/lang/cryptui_Ko.rc
index 1298663d96e..2b1cda75b3f 100644
--- a/dll/win32/cryptui/lang/cryptui_Ko.rc
+++ b/dll/win32/cryptui/lang/cryptui_Ko.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "cryptuires.h"
-
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/cryptui/lang/cryptui_Lt.rc b/dll/win32/cryptui/lang/cryptui_Lt.rc
index 2cfb5ea4771..9b49dca869d 100644
--- a/dll/win32/cryptui/lang/cryptui_Lt.rc
+++ b/dll/win32/cryptui/lang/cryptui_Lt.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "cryptuires.h"
-
LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/cryptui/lang/cryptui_Nl.rc b/dll/win32/cryptui/lang/cryptui_Nl.rc
index bfb7d54677f..a5e7705e6ef 100644
--- a/dll/win32/cryptui/lang/cryptui_Nl.rc
+++ b/dll/win32/cryptui/lang/cryptui_Nl.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "cryptuires.h"
-
LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/cryptui/lang/cryptui_No.rc b/dll/win32/cryptui/lang/cryptui_No.rc
index 5ffbd880854..d773603891e 100644
--- a/dll/win32/cryptui/lang/cryptui_No.rc
+++ b/dll/win32/cryptui/lang/cryptui_No.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "cryptuires.h"
-
LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/cryptui/lang/cryptui_Pl.rc b/dll/win32/cryptui/lang/cryptui_Pl.rc
index cb0a3e19fe6..9a4e3bd67dd 100644
--- a/dll/win32/cryptui/lang/cryptui_Pl.rc
+++ b/dll/win32/cryptui/lang/cryptui_Pl.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "cryptuires.h"
-
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/cryptui/lang/cryptui_Pt.rc b/dll/win32/cryptui/lang/cryptui_Pt.rc
index d00f4301657..3da42cd6426 100644
--- a/dll/win32/cryptui/lang/cryptui_Pt.rc
+++ b/dll/win32/cryptui/lang/cryptui_Pt.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "cryptuires.h"
-
LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/cryptui/lang/cryptui_Ro.rc b/dll/win32/cryptui/lang/cryptui_Ro.rc
index 0d490f78b62..c4fa60015a3 100644
--- a/dll/win32/cryptui/lang/cryptui_Ro.rc
+++ b/dll/win32/cryptui/lang/cryptui_Ro.rc
@@ -22,8 +22,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "cryptuires.h"
-
LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/cryptui/lang/cryptui_Ru.rc b/dll/win32/cryptui/lang/cryptui_Ru.rc
index a7c71c2ab97..5bd0becef11 100644
--- a/dll/win32/cryptui/lang/cryptui_Ru.rc
+++ b/dll/win32/cryptui/lang/cryptui_Ru.rc
@@ -20,8 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "cryptuires.h"
-
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/cryptui/lang/cryptui_Sq.rc b/dll/win32/cryptui/lang/cryptui_Sq.rc
index 4051dee27dd..67dabbd0fa3 100644
--- a/dll/win32/cryptui/lang/cryptui_Sq.rc
+++ b/dll/win32/cryptui/lang/cryptui_Sq.rc
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "cryptuires.h"
-
LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/cryptui/lang/cryptui_Tr.rc b/dll/win32/cryptui/lang/cryptui_Tr.rc
index 7ff03ccc666..acdd95038bd 100644
--- a/dll/win32/cryptui/lang/cryptui_Tr.rc
+++ b/dll/win32/cryptui/lang/cryptui_Tr.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "cryptuires.h"
-
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/cryptui/lang/cryptui_Uk.rc b/dll/win32/cryptui/lang/cryptui_Uk.rc
index 3f95e2b8ce9..6c4166fafd2 100644
--- a/dll/win32/cryptui/lang/cryptui_Uk.rc
+++ b/dll/win32/cryptui/lang/cryptui_Uk.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "cryptuires.h"
-
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/cryptui/lang/cryptui_Zh.rc b/dll/win32/cryptui/lang/cryptui_Zh.rc
index 24f1089ff42..acc1bf434a3 100644
--- a/dll/win32/cryptui/lang/cryptui_Zh.rc
+++ b/dll/win32/cryptui/lang/cryptui_Zh.rc
@@ -21,11 +21,6 @@
* Copyright 2021 Chan Chilung <eason066(a)gmail.com>
*/
-#include "cryptuires.h"
-
-/* Chinese text is encoded in UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
STRINGTABLE
diff --git a/dll/win32/hhctrl.ocx/lang/De.rc b/dll/win32/hhctrl.ocx/lang/De.rc
index a88450e4bba..5e56c0c78ab 100644
--- a/dll/win32/hhctrl.ocx/lang/De.rc
+++ b/dll/win32/hhctrl.ocx/lang/De.rc
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/hhctrl.ocx/lang/Es.rc b/dll/win32/hhctrl.ocx/lang/Es.rc
index 879dae1e778..8dfd6e950e1 100644
--- a/dll/win32/hhctrl.ocx/lang/Es.rc
+++ b/dll/win32/hhctrl.ocx/lang/Es.rc
@@ -19,9 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/hhctrl.ocx/lang/Fr.rc b/dll/win32/hhctrl.ocx/lang/Fr.rc
index 8fb8de93d10..8bc687255e0 100644
--- a/dll/win32/hhctrl.ocx/lang/Fr.rc
+++ b/dll/win32/hhctrl.ocx/lang/Fr.rc
@@ -19,9 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/hhctrl.ocx/lang/It.rc b/dll/win32/hhctrl.ocx/lang/It.rc
index 5a934a5cca2..98660dd29ab 100644
--- a/dll/win32/hhctrl.ocx/lang/It.rc
+++ b/dll/win32/hhctrl.ocx/lang/It.rc
@@ -20,9 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/hhctrl.ocx/lang/Ja.rc b/dll/win32/hhctrl.ocx/lang/Ja.rc
index a359e8bed0c..8df2ff64cdc 100644
--- a/dll/win32/hhctrl.ocx/lang/Ja.rc
+++ b/dll/win32/hhctrl.ocx/lang/Ja.rc
@@ -20,9 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/hhctrl.ocx/lang/Lt.rc b/dll/win32/hhctrl.ocx/lang/Lt.rc
index c01d293968a..107728e5d75 100644
--- a/dll/win32/hhctrl.ocx/lang/Lt.rc
+++ b/dll/win32/hhctrl.ocx/lang/Lt.rc
@@ -19,9 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/hhctrl.ocx/lang/Pt.rc b/dll/win32/hhctrl.ocx/lang/Pt.rc
index 95550299352..8438b3171ab 100644
--- a/dll/win32/hhctrl.ocx/lang/Pt.rc
+++ b/dll/win32/hhctrl.ocx/lang/Pt.rc
@@ -20,8 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/hhctrl.ocx/lang/Ro.rc b/dll/win32/hhctrl.ocx/lang/Ro.rc
index 97555fc898a..2e3e63ba3b9 100644
--- a/dll/win32/hhctrl.ocx/lang/Ro.rc
+++ b/dll/win32/hhctrl.ocx/lang/Ro.rc
@@ -23,8 +23,6 @@
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
-#pragma code_page(65001)
-
STRINGTABLE
BEGIN
#ifdef __REACTOS__
diff --git a/dll/win32/hhctrl.ocx/lang/Ru.rc b/dll/win32/hhctrl.ocx/lang/Ru.rc
index 62cef188c06..742a83f210a 100644
--- a/dll/win32/hhctrl.ocx/lang/Ru.rc
+++ b/dll/win32/hhctrl.ocx/lang/Ru.rc
@@ -19,9 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/hhctrl.ocx/lang/Si.rc b/dll/win32/hhctrl.ocx/lang/Si.rc
index 9c62b7b77fc..155fe4ecdbe 100644
--- a/dll/win32/hhctrl.ocx/lang/Si.rc
+++ b/dll/win32/hhctrl.ocx/lang/Si.rc
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/hhctrl.ocx/lang/Uk.rc b/dll/win32/hhctrl.ocx/lang/Uk.rc
index 6bd8fe2650a..5d19e3e02b1 100644
--- a/dll/win32/hhctrl.ocx/lang/Uk.rc
+++ b/dll/win32/hhctrl.ocx/lang/Uk.rc
@@ -21,9 +21,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/hhctrl.ocx/lang/Zh.rc b/dll/win32/hhctrl.ocx/lang/Zh.rc
index cedf748a896..a885cc11693 100644
--- a/dll/win32/hhctrl.ocx/lang/Zh.rc
+++ b/dll/win32/hhctrl.ocx/lang/Zh.rc
@@ -19,9 +19,6 @@
* Copyright 2021-2022 Chan Chilung <eason066(a)gmail.com>
*/
-/* Chinese text is encoded in UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
STRINGTABLE
diff --git a/dll/win32/iccvid/lang/iccvid_De.rc b/dll/win32/iccvid/lang/iccvid_De.rc
index ed20fc7cbed..d757199e0a0 100644
--- a/dll/win32/iccvid/lang/iccvid_De.rc
+++ b/dll/win32/iccvid/lang/iccvid_De.rc
@@ -17,8 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/iccvid/lang/iccvid_Es.rc b/dll/win32/iccvid/lang/iccvid_Es.rc
index de6e94ea441..746995d3538 100644
--- a/dll/win32/iccvid/lang/iccvid_Es.rc
+++ b/dll/win32/iccvid/lang/iccvid_Es.rc
@@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/iccvid/lang/iccvid_Fr.rc b/dll/win32/iccvid/lang/iccvid_Fr.rc
index 5998b611ad5..9fc32549e75 100644
--- a/dll/win32/iccvid/lang/iccvid_Fr.rc
+++ b/dll/win32/iccvid/lang/iccvid_Fr.rc
@@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/iccvid/lang/iccvid_It.rc b/dll/win32/iccvid/lang/iccvid_It.rc
index f1d90385e79..33c63721fdc 100644
--- a/dll/win32/iccvid/lang/iccvid_It.rc
+++ b/dll/win32/iccvid/lang/iccvid_It.rc
@@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/iccvid/lang/iccvid_Ja.rc b/dll/win32/iccvid/lang/iccvid_Ja.rc
index 9b0bac197d9..d00995cd78b 100644
--- a/dll/win32/iccvid/lang/iccvid_Ja.rc
+++ b/dll/win32/iccvid/lang/iccvid_Ja.rc
@@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/iccvid/lang/iccvid_Lt.rc b/dll/win32/iccvid/lang/iccvid_Lt.rc
index a46b01caa1a..af8b0f7c2ae 100644
--- a/dll/win32/iccvid/lang/iccvid_Lt.rc
+++ b/dll/win32/iccvid/lang/iccvid_Lt.rc
@@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/iccvid/lang/iccvid_Ro.rc b/dll/win32/iccvid/lang/iccvid_Ro.rc
index 191539ef927..9d8f2d54401 100644
--- a/dll/win32/iccvid/lang/iccvid_Ro.rc
+++ b/dll/win32/iccvid/lang/iccvid_Ro.rc
@@ -17,8 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/iccvid/lang/iccvid_Ru.rc b/dll/win32/iccvid/lang/iccvid_Ru.rc
index 4909cf06408..333d709675c 100644
--- a/dll/win32/iccvid/lang/iccvid_Ru.rc
+++ b/dll/win32/iccvid/lang/iccvid_Ru.rc
@@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/iccvid/lang/iccvid_Si.rc b/dll/win32/iccvid/lang/iccvid_Si.rc
index f6a83251b8f..d10c613cf73 100644
--- a/dll/win32/iccvid/lang/iccvid_Si.rc
+++ b/dll/win32/iccvid/lang/iccvid_Si.rc
@@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/iccvid/lang/iccvid_Uk.rc b/dll/win32/iccvid/lang/iccvid_Uk.rc
index 33a3fab3642..7be4f6d6cb8 100644
--- a/dll/win32/iccvid/lang/iccvid_Uk.rc
+++ b/dll/win32/iccvid/lang/iccvid_Uk.rc
@@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/iccvid/lang/iccvid_Zh.rc b/dll/win32/iccvid/lang/iccvid_Zh.rc
index 96183a28c0c..4d0a2fbece0 100644
--- a/dll/win32/iccvid/lang/iccvid_Zh.rc
+++ b/dll/win32/iccvid/lang/iccvid_Zh.rc
@@ -21,9 +21,6 @@
* Copyright 2021 Chan Chilung <eason066(a)gmail.com>
*/
-/* Chinese text is encoded in UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
STRINGTABLE
diff --git a/dll/win32/jscript/lang/jscript_Da.rc b/dll/win32/jscript/lang/jscript_Da.rc
index 6f043fb9604..e373a0af9b6 100644
--- a/dll/win32/jscript/lang/jscript_Da.rc
+++ b/dll/win32/jscript/lang/jscript_Da.rc
@@ -17,8 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/jscript/lang/jscript_De.rc b/dll/win32/jscript/lang/jscript_De.rc
index 88751d4a8cf..967a39fcab4 100644
--- a/dll/win32/jscript/lang/jscript_De.rc
+++ b/dll/win32/jscript/lang/jscript_De.rc
@@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/jscript/lang/jscript_Es.rc b/dll/win32/jscript/lang/jscript_Es.rc
index 5ab0de96853..73cfe3b8f02 100644
--- a/dll/win32/jscript/lang/jscript_Es.rc
+++ b/dll/win32/jscript/lang/jscript_Es.rc
@@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/*UTF-8*/
-#pragma code_page(65001)
-
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/jscript/lang/jscript_Fr.rc b/dll/win32/jscript/lang/jscript_Fr.rc
index cf250f3ea5a..dc5abfde4df 100644
--- a/dll/win32/jscript/lang/jscript_Fr.rc
+++ b/dll/win32/jscript/lang/jscript_Fr.rc
@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/jscript/lang/jscript_Hu.rc b/dll/win32/jscript/lang/jscript_Hu.rc
index 3c2061a2882..401ccd9ca15 100644
--- a/dll/win32/jscript/lang/jscript_Hu.rc
+++ b/dll/win32/jscript/lang/jscript_Hu.rc
@@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/jscript/lang/jscript_It.rc b/dll/win32/jscript/lang/jscript_It.rc
index 52a11c1ba9b..23fa96588a9 100644
--- a/dll/win32/jscript/lang/jscript_It.rc
+++ b/dll/win32/jscript/lang/jscript_It.rc
@@ -17,9 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/jscript/lang/jscript_Ja.rc b/dll/win32/jscript/lang/jscript_Ja.rc
index 2e2c48f1c00..415eaee49e3 100644
--- a/dll/win32/jscript/lang/jscript_Ja.rc
+++ b/dll/win32/jscript/lang/jscript_Ja.rc
@@ -17,9 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/jscript/lang/jscript_Ko.rc b/dll/win32/jscript/lang/jscript_Ko.rc
index acd1747afea..59c39aadd3c 100644
--- a/dll/win32/jscript/lang/jscript_Ko.rc
+++ b/dll/win32/jscript/lang/jscript_Ko.rc
@@ -17,9 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/jscript/lang/jscript_Lt.rc b/dll/win32/jscript/lang/jscript_Lt.rc
index 8e77fef5dfb..b180923b213 100644
--- a/dll/win32/jscript/lang/jscript_Lt.rc
+++ b/dll/win32/jscript/lang/jscript_Lt.rc
@@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/jscript/lang/jscript_Nl.rc b/dll/win32/jscript/lang/jscript_Nl.rc
index 164d668d822..d4fef4621c6 100644
--- a/dll/win32/jscript/lang/jscript_Nl.rc
+++ b/dll/win32/jscript/lang/jscript_Nl.rc
@@ -18,8 +18,6 @@
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
-#pragma code_page(65001)
-
STRINGTABLE
{
IDS_TO_PRIMITIVE "Fout bij het omzetten van het object naar een primitief type"
diff --git a/dll/win32/jscript/lang/jscript_No.rc b/dll/win32/jscript/lang/jscript_No.rc
index 1273e889d88..1112371cfd9 100644
--- a/dll/win32/jscript/lang/jscript_No.rc
+++ b/dll/win32/jscript/lang/jscript_No.rc
@@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
STRINGTABLE
diff --git a/dll/win32/jscript/lang/jscript_Pt.rc b/dll/win32/jscript/lang/jscript_Pt.rc
index 26ce7ff9834..5016e05f403 100644
--- a/dll/win32/jscript/lang/jscript_Pt.rc
+++ b/dll/win32/jscript/lang/jscript_Pt.rc
@@ -17,8 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
STRINGTABLE
diff --git a/dll/win32/jscript/lang/jscript_Ro.rc b/dll/win32/jscript/lang/jscript_Ro.rc
index 40650c482f1..da3db3e404c 100644
--- a/dll/win32/jscript/lang/jscript_Ro.rc
+++ b/dll/win32/jscript/lang/jscript_Ro.rc
@@ -22,8 +22,6 @@
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
-#pragma code_page(65001)
-
STRINGTABLE
{
IDS_TO_PRIMITIVE "Eroare la convertirea obiectului la un tip primitiv"
diff --git a/dll/win32/jscript/lang/jscript_Ru.rc b/dll/win32/jscript/lang/jscript_Ru.rc
index c4e9d80f207..274e8a65968 100644
--- a/dll/win32/jscript/lang/jscript_Ru.rc
+++ b/dll/win32/jscript/lang/jscript_Ru.rc
@@ -17,9 +17,6 @@
*/
/* Russian language resource file by Kudratov Olimjon (olim98(a)bk.ru) */
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/jscript/lang/jscript_Si.rc b/dll/win32/jscript/lang/jscript_Si.rc
index 8368d6474d5..b49e212bb22 100644
--- a/dll/win32/jscript/lang/jscript_Si.rc
+++ b/dll/win32/jscript/lang/jscript_Si.rc
@@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/jscript/lang/jscript_Uk.rc b/dll/win32/jscript/lang/jscript_Uk.rc
index 677f773de3a..90eb8189736 100644
--- a/dll/win32/jscript/lang/jscript_Uk.rc
+++ b/dll/win32/jscript/lang/jscript_Uk.rc
@@ -17,9 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/jscript/lang/jscript_Zh.rc b/dll/win32/jscript/lang/jscript_Zh.rc
index 5e69793ae17..c2a11dc12a5 100644
--- a/dll/win32/jscript/lang/jscript_Zh.rc
+++ b/dll/win32/jscript/lang/jscript_Zh.rc
@@ -19,9 +19,6 @@
* Copyright 2021 Chan Chilung <eason066(a)gmail.com>
*/
-/* Chinese text is encoded in UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
STRINGTABLE
diff --git a/dll/win32/mapi32/lang/Es.rc b/dll/win32/mapi32/lang/Es.rc
index 22af69c0636..3c9ac28a994 100644
--- a/dll/win32/mapi32/lang/Es.rc
+++ b/dll/win32/mapi32/lang/Es.rc
@@ -19,9 +19,6 @@
*
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/mapi32/lang/Fr.rc b/dll/win32/mapi32/lang/Fr.rc
index e7a9296f3bd..5d9e7f4d25e 100644
--- a/dll/win32/mapi32/lang/Fr.rc
+++ b/dll/win32/mapi32/lang/Fr.rc
@@ -19,9 +19,6 @@
*
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/mapi32/lang/Hu.rc b/dll/win32/mapi32/lang/Hu.rc
index e275b269678..666f3fbfbfe 100644
--- a/dll/win32/mapi32/lang/Hu.rc
+++ b/dll/win32/mapi32/lang/Hu.rc
@@ -19,9 +19,6 @@
*
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/mapi32/lang/It.rc b/dll/win32/mapi32/lang/It.rc
index 0c74648b272..f97240b08fd 100644
--- a/dll/win32/mapi32/lang/It.rc
+++ b/dll/win32/mapi32/lang/It.rc
@@ -20,9 +20,6 @@
*
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/mapi32/lang/Ja.rc b/dll/win32/mapi32/lang/Ja.rc
index cd3fc55287b..fa686e1c111 100644
--- a/dll/win32/mapi32/lang/Ja.rc
+++ b/dll/win32/mapi32/lang/Ja.rc
@@ -20,9 +20,6 @@
*
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/mapi32/lang/Ko.rc b/dll/win32/mapi32/lang/Ko.rc
index e9796bf5a79..3ca3cc3ab45 100644
--- a/dll/win32/mapi32/lang/Ko.rc
+++ b/dll/win32/mapi32/lang/Ko.rc
@@ -20,9 +20,6 @@
*
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/mapi32/lang/Lt.rc b/dll/win32/mapi32/lang/Lt.rc
index 63b6e83a2f2..d1ebadd8b58 100644
--- a/dll/win32/mapi32/lang/Lt.rc
+++ b/dll/win32/mapi32/lang/Lt.rc
@@ -19,9 +19,6 @@
*
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/mapi32/lang/Nl.rc b/dll/win32/mapi32/lang/Nl.rc
index dda4221920d..b20a26ab00b 100644
--- a/dll/win32/mapi32/lang/Nl.rc
+++ b/dll/win32/mapi32/lang/Nl.rc
@@ -21,8 +21,6 @@
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
-#pragma code_page(65001)
-
STRINGTABLE
{
IDS_NO_MAPI_CLIENT, "Mail kan niet worden verstuurd aangezien er geen MAPI mail client is geïnstalleerd."
diff --git a/dll/win32/mapi32/lang/No.rc b/dll/win32/mapi32/lang/No.rc
index 63f64bd34da..4717564d454 100644
--- a/dll/win32/mapi32/lang/No.rc
+++ b/dll/win32/mapi32/lang/No.rc
@@ -19,8 +19,6 @@
*
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
STRINGTABLE
diff --git a/dll/win32/mapi32/lang/Pt.rc b/dll/win32/mapi32/lang/Pt.rc
index bc17797d8b2..2fcdc8b8018 100644
--- a/dll/win32/mapi32/lang/Pt.rc
+++ b/dll/win32/mapi32/lang/Pt.rc
@@ -20,8 +20,6 @@
*
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
STRINGTABLE
diff --git a/dll/win32/mapi32/lang/Ro.rc b/dll/win32/mapi32/lang/Ro.rc
index 56e81fe4cfe..b440c073f06 100644
--- a/dll/win32/mapi32/lang/Ro.rc
+++ b/dll/win32/mapi32/lang/Ro.rc
@@ -20,8 +20,6 @@
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
-#pragma code_page(65001)
-
STRINGTABLE
{
IDS_NO_MAPI_CLIENT, "Eroare la trimiterea emailului. Nu aveți un client de email MAPI instalat."
diff --git a/dll/win32/mapi32/lang/Ru.rc b/dll/win32/mapi32/lang/Ru.rc
index b4448fb1ad4..0675b5c41dc 100644
--- a/dll/win32/mapi32/lang/Ru.rc
+++ b/dll/win32/mapi32/lang/Ru.rc
@@ -19,9 +19,6 @@
*
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/mapi32/lang/Si.rc b/dll/win32/mapi32/lang/Si.rc
index 519958f1eff..110d47afc16 100644
--- a/dll/win32/mapi32/lang/Si.rc
+++ b/dll/win32/mapi32/lang/Si.rc
@@ -19,8 +19,6 @@
*
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/mapi32/lang/Uk.rc b/dll/win32/mapi32/lang/Uk.rc
index fa1a9edc434..5dcf7724b3c 100644
--- a/dll/win32/mapi32/lang/Uk.rc
+++ b/dll/win32/mapi32/lang/Uk.rc
@@ -20,9 +20,6 @@
*
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/mapi32/lang/Zh.rc b/dll/win32/mapi32/lang/Zh.rc
index 96a63d8dcb1..14a1b7a5de6 100644
--- a/dll/win32/mapi32/lang/Zh.rc
+++ b/dll/win32/mapi32/lang/Zh.rc
@@ -21,9 +21,6 @@
* Copyright 2021 Chan Chilung <eason066(a)gmail.com>
*/
-/* Chinese text is encoded in UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
STRINGTABLE
diff --git a/dll/win32/mapi32/version.rc b/dll/win32/mapi32/version.rc
index 61b67d3b575..65818f28efb 100644
--- a/dll/win32/mapi32/version.rc
+++ b/dll/win32/mapi32/version.rc
@@ -27,7 +27,6 @@
#include "wine/wine_common_ver.rc"
-
/* UTF-8 */
#pragma code_page(65001)
diff --git a/dll/win32/mpr/lang/mpr_De.rc b/dll/win32/mpr/lang/mpr_De.rc
index 93c2cf23ad0..14bac1864c1 100644
--- a/dll/win32/mpr/lang/mpr_De.rc
+++ b/dll/win32/mpr/lang/mpr_De.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/mpr/lang/mpr_Fr.rc b/dll/win32/mpr/lang/mpr_Fr.rc
index 539005a5413..45fb14844e0 100644
--- a/dll/win32/mpr/lang/mpr_Fr.rc
+++ b/dll/win32/mpr/lang/mpr_Fr.rc
@@ -19,9 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/mpr/lang/mpr_Ja.rc b/dll/win32/mpr/lang/mpr_Ja.rc
index a9c5c2e3c6e..20f11234e34 100644
--- a/dll/win32/mpr/lang/mpr_Ja.rc
+++ b/dll/win32/mpr/lang/mpr_Ja.rc
@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/mpr/lang/mpr_Lt.rc b/dll/win32/mpr/lang/mpr_Lt.rc
index 90e9e0a8193..f0e2c62043d 100644
--- a/dll/win32/mpr/lang/mpr_Lt.rc
+++ b/dll/win32/mpr/lang/mpr_Lt.rc
@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/mpr/lang/mpr_Pt.rc b/dll/win32/mpr/lang/mpr_Pt.rc
index 477b94304b3..23489175277 100644
--- a/dll/win32/mpr/lang/mpr_Pt.rc
+++ b/dll/win32/mpr/lang/mpr_Pt.rc
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/mpr/lang/mpr_Ro.rc b/dll/win32/mpr/lang/mpr_Ro.rc
index 0ff5ef7eef3..399c7ca8f7f 100644
--- a/dll/win32/mpr/lang/mpr_Ro.rc
+++ b/dll/win32/mpr/lang/mpr_Ro.rc
@@ -21,8 +21,6 @@
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
-#pragma code_page(65001)
-
STRINGTABLE
{
IDS_ENTIRENETWORK "Toată rețeaua"
diff --git a/dll/win32/mpr/lang/mpr_Ru.rc b/dll/win32/mpr/lang/mpr_Ru.rc
index 8b519fc6bbb..89a7901eec3 100644
--- a/dll/win32/mpr/lang/mpr_Ru.rc
+++ b/dll/win32/mpr/lang/mpr_Ru.rc
@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/mpr/lang/mpr_Si.rc b/dll/win32/mpr/lang/mpr_Si.rc
index 8cae253b72d..1367f6f1a10 100644
--- a/dll/win32/mpr/lang/mpr_Si.rc
+++ b/dll/win32/mpr/lang/mpr_Si.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/mpr/lang/mpr_Uk.rc b/dll/win32/mpr/lang/mpr_Uk.rc
index 73f731b0257..254bb9775a1 100644
--- a/dll/win32/mpr/lang/mpr_Uk.rc
+++ b/dll/win32/mpr/lang/mpr_Uk.rc
@@ -19,9 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/mpr/lang/mpr_Zh.rc b/dll/win32/mpr/lang/mpr_Zh.rc
index 301cfc385c8..00b507f6075 100644
--- a/dll/win32/mpr/lang/mpr_Zh.rc
+++ b/dll/win32/mpr/lang/mpr_Zh.rc
@@ -21,9 +21,6 @@
* Copyright 2021 Chan Chilung <eason066(a)gmail.com>
*/
-/* Chinese text is encoded in UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
STRINGTABLE
diff --git a/dll/win32/msacm32/lang/msacm_De.rc b/dll/win32/msacm32/lang/msacm_De.rc
index 2867b475a2d..27800552852 100644
--- a/dll/win32/msacm32/lang/msacm_De.rc
+++ b/dll/win32/msacm32/lang/msacm_De.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
DLG_ACMFORMATCHOOSE_ID DIALOGEX 10, 20, 225, 118
diff --git a/dll/win32/msacm32/lang/msacm_Fr.rc b/dll/win32/msacm32/lang/msacm_Fr.rc
index 8a243331f55..4221f532664 100644
--- a/dll/win32/msacm32/lang/msacm_Fr.rc
+++ b/dll/win32/msacm32/lang/msacm_Fr.rc
@@ -20,9 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
DLG_ACMFORMATCHOOSE_ID DIALOGEX 10, 20, 225, 118
diff --git a/dll/win32/msacm32/lang/msacm_He.rc b/dll/win32/msacm32/lang/msacm_He.rc
index cde2c469661..bc56636e75c 100644
--- a/dll/win32/msacm32/lang/msacm_He.rc
+++ b/dll/win32/msacm32/lang/msacm_He.rc
@@ -20,9 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
DLG_ACMFORMATCHOOSE_ID DIALOGEX 10, 20, 225, 118
diff --git a/dll/win32/msacm32/lang/msacm_Ja.rc b/dll/win32/msacm32/lang/msacm_Ja.rc
index ba727854e1b..26232d27cb1 100644
--- a/dll/win32/msacm32/lang/msacm_Ja.rc
+++ b/dll/win32/msacm32/lang/msacm_Ja.rc
@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
DLG_ACMFORMATCHOOSE_ID DIALOGEX 10, 20, 225, 118
diff --git a/dll/win32/msacm32/lang/msacm_Lt.rc b/dll/win32/msacm32/lang/msacm_Lt.rc
index 36fc328ce6b..76e04e37d26 100644
--- a/dll/win32/msacm32/lang/msacm_Lt.rc
+++ b/dll/win32/msacm32/lang/msacm_Lt.rc
@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
DLG_ACMFORMATCHOOSE_ID DIALOGEX 10, 20, 225, 118
diff --git a/dll/win32/msacm32/lang/msacm_Pt.rc b/dll/win32/msacm32/lang/msacm_Pt.rc
index 109847c2a83..57971d63709 100644
--- a/dll/win32/msacm32/lang/msacm_Pt.rc
+++ b/dll/win32/msacm32/lang/msacm_Pt.rc
@@ -20,8 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
DLG_ACMFORMATCHOOSE_ID DIALOGEX 10, 20, 225, 118
diff --git a/dll/win32/msacm32/lang/msacm_Ro.rc b/dll/win32/msacm32/lang/msacm_Ro.rc
index 9cf54e81054..d3ece4320a6 100644
--- a/dll/win32/msacm32/lang/msacm_Ro.rc
+++ b/dll/win32/msacm32/lang/msacm_Ro.rc
@@ -21,8 +21,6 @@
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
-#pragma code_page(65001)
-
DLG_ACMFORMATCHOOSE_ID DIALOGEX 10, 20, 225, 118
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Selectare sunet"
diff --git a/dll/win32/msacm32/lang/msacm_Ru.rc b/dll/win32/msacm32/lang/msacm_Ru.rc
index a4f0e6425ac..7192847f858 100644
--- a/dll/win32/msacm32/lang/msacm_Ru.rc
+++ b/dll/win32/msacm32/lang/msacm_Ru.rc
@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
DLG_ACMFORMATCHOOSE_ID DIALOGEX 10, 20, 225, 118
diff --git a/dll/win32/msacm32/lang/msacm_Si.rc b/dll/win32/msacm32/lang/msacm_Si.rc
index 376520aac6a..28c7e0d2322 100644
--- a/dll/win32/msacm32/lang/msacm_Si.rc
+++ b/dll/win32/msacm32/lang/msacm_Si.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
DLG_ACMFORMATCHOOSE_ID DIALOGEX 10, 20, 225, 118
diff --git a/dll/win32/msacm32/lang/msacm_Uk.rc b/dll/win32/msacm32/lang/msacm_Uk.rc
index 5c652a75bff..ca4c2115f77 100644
--- a/dll/win32/msacm32/lang/msacm_Uk.rc
+++ b/dll/win32/msacm32/lang/msacm_Uk.rc
@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
DLG_ACMFORMATCHOOSE_ID DIALOGEX 10, 20, 225, 118
diff --git a/dll/win32/msacm32/lang/msacm_Zh.rc b/dll/win32/msacm32/lang/msacm_Zh.rc
index 2ef255ce78b..32868f8986a 100644
--- a/dll/win32/msacm32/lang/msacm_Zh.rc
+++ b/dll/win32/msacm32/lang/msacm_Zh.rc
@@ -21,9 +21,6 @@
* Copyright 2021 Chan Chilung <eason066(a)gmail.com>
*/
-/* Chinese text is encoded in UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
DLG_ACMFORMATCHOOSE_ID DIALOGEX 10, 20, 225, 118
diff --git a/dll/win32/msacm32/msacm.rc b/dll/win32/msacm32/msacm.rc
index f72be33caca..0a27f54ac8d 100644
--- a/dll/win32/msacm32/msacm.rc
+++ b/dll/win32/msacm32/msacm.rc
@@ -20,7 +20,6 @@
#include "wineacm.h"
-
#include <reactos/manifest_dll.rc>
/* UTF-8 */
diff --git a/dll/win32/mshtml/lang/Da.rc b/dll/win32/mshtml/lang/Da.rc
index 93d8abc5ec7..47b9f3e3cd5 100644
--- a/dll/win32/mshtml/lang/Da.rc
+++ b/dll/win32/mshtml/lang/Da.rc
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/mshtml/lang/De.rc b/dll/win32/mshtml/lang/De.rc
index f5365879869..415e82d7ab0 100644
--- a/dll/win32/mshtml/lang/De.rc
+++ b/dll/win32/mshtml/lang/De.rc
@@ -20,8 +20,6 @@
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
-#pragma code_page(65001)
-
STRINGTABLE
{
IDS_STATUS_DONE "Fertig"
diff --git a/dll/win32/mshtml/lang/Fr.rc b/dll/win32/mshtml/lang/Fr.rc
index a02abf42d42..77b0274f82e 100644
--- a/dll/win32/mshtml/lang/Fr.rc
+++ b/dll/win32/mshtml/lang/Fr.rc
@@ -20,9 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/mshtml/lang/Hu.rc b/dll/win32/mshtml/lang/Hu.rc
index 990738b5c14..c94efbb1d68 100644
--- a/dll/win32/mshtml/lang/Hu.rc
+++ b/dll/win32/mshtml/lang/Hu.rc
@@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/mshtml/lang/It.rc b/dll/win32/mshtml/lang/It.rc
index 0e2c5a45d25..a9209e5b24f 100644
--- a/dll/win32/mshtml/lang/It.rc
+++ b/dll/win32/mshtml/lang/It.rc
@@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/*UTF-8*/
-#pragma code_page(65001)
-
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/mshtml/lang/Ja.rc b/dll/win32/mshtml/lang/Ja.rc
index caa4ac33d40..d9e61946969 100644
--- a/dll/win32/mshtml/lang/Ja.rc
+++ b/dll/win32/mshtml/lang/Ja.rc
@@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/mshtml/lang/Lt.rc b/dll/win32/mshtml/lang/Lt.rc
index 180b0cdeb36..96d8582dffe 100644
--- a/dll/win32/mshtml/lang/Lt.rc
+++ b/dll/win32/mshtml/lang/Lt.rc
@@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/mshtml/lang/No.rc b/dll/win32/mshtml/lang/No.rc
index 01202722706..b28229b7a1a 100644
--- a/dll/win32/mshtml/lang/No.rc
+++ b/dll/win32/mshtml/lang/No.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
STRINGTABLE
diff --git a/dll/win32/mshtml/lang/Pt.rc b/dll/win32/mshtml/lang/Pt.rc
index 52c28cd1aee..d9b9e2cab92 100644
--- a/dll/win32/mshtml/lang/Pt.rc
+++ b/dll/win32/mshtml/lang/Pt.rc
@@ -17,8 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
STRINGTABLE
diff --git a/dll/win32/mshtml/lang/Ro.rc b/dll/win32/mshtml/lang/Ro.rc
index 44dd4c11489..181e5b4c78e 100644
--- a/dll/win32/mshtml/lang/Ro.rc
+++ b/dll/win32/mshtml/lang/Ro.rc
@@ -21,8 +21,6 @@
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
-#pragma code_page(65001)
-
STRINGTABLE
{
IDS_STATUS_DONE "Finalizat"
diff --git a/dll/win32/mshtml/lang/Ru.rc b/dll/win32/mshtml/lang/Ru.rc
index 5f46c69784c..6ee3b082e85 100644
--- a/dll/win32/mshtml/lang/Ru.rc
+++ b/dll/win32/mshtml/lang/Ru.rc
@@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/mshtml/lang/Si.rc b/dll/win32/mshtml/lang/Si.rc
index 146503cafec..90797454655 100644
--- a/dll/win32/mshtml/lang/Si.rc
+++ b/dll/win32/mshtml/lang/Si.rc
@@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/mshtml/lang/Uk.rc b/dll/win32/mshtml/lang/Uk.rc
index 3376b10724e..0ae3acdcd16 100644
--- a/dll/win32/mshtml/lang/Uk.rc
+++ b/dll/win32/mshtml/lang/Uk.rc
@@ -17,9 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/mshtml/lang/Zh.rc b/dll/win32/mshtml/lang/Zh.rc
index 46e8bebb368..5bb65fe989e 100644
--- a/dll/win32/mshtml/lang/Zh.rc
+++ b/dll/win32/mshtml/lang/Zh.rc
@@ -22,9 +22,6 @@
* Copyright 2021 Chan Chilung <eason066(a)gmail.com>
*/
-/* Chinese text is encoded in UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
STRINGTABLE
diff --git a/dll/win32/msrle32/lang/msrle_Bg.rc b/dll/win32/msrle32/lang/msrle_Bg.rc
index ad3bc10aefa..3e0ec5a10ad 100644
--- a/dll/win32/msrle32/lang/msrle_Bg.rc
+++ b/dll/win32/msrle32/lang/msrle_Bg.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "msrle_private.h"
-
LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/msrle32/lang/msrle_Cs.rc b/dll/win32/msrle32/lang/msrle_Cs.rc
index 6fd321588c2..1ca1fba27ed 100644
--- a/dll/win32/msrle32/lang/msrle_Cs.rc
+++ b/dll/win32/msrle32/lang/msrle_Cs.rc
@@ -20,8 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "msrle_private.h"
-
LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
/* Czech strings in CP1250 */
diff --git a/dll/win32/msrle32/lang/msrle_Cy.rc b/dll/win32/msrle32/lang/msrle_Cy.rc
index 1794fd551c4..e13bc5db4d3 100644
--- a/dll/win32/msrle32/lang/msrle_Cy.rc
+++ b/dll/win32/msrle32/lang/msrle_Cy.rc
@@ -19,10 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "msrle_private.h"
-
-#pragma code_page(65001)
-
LANGUAGE LANG_WELSH, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/msrle32/lang/msrle_Da.rc b/dll/win32/msrle32/lang/msrle_Da.rc
index 6c4aba0c9f0..26d1ef0a3b2 100644
--- a/dll/win32/msrle32/lang/msrle_Da.rc
+++ b/dll/win32/msrle32/lang/msrle_Da.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "msrle_private.h"
-
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/msrle32/lang/msrle_De.rc b/dll/win32/msrle32/lang/msrle_De.rc
index 71dc2c2be02..2aef429d5b7 100644
--- a/dll/win32/msrle32/lang/msrle_De.rc
+++ b/dll/win32/msrle32/lang/msrle_De.rc
@@ -18,10 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "msrle_private.h"
-
-#pragma code_page(65001)
-
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/msrle32/lang/msrle_En.rc b/dll/win32/msrle32/lang/msrle_En.rc
index 2a3520769d0..69aaba87086 100644
--- a/dll/win32/msrle32/lang/msrle_En.rc
+++ b/dll/win32/msrle32/lang/msrle_En.rc
@@ -18,10 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "msrle_private.h"
-
-#pragma code_page(65001)
-
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/msrle32/lang/msrle_Es.rc b/dll/win32/msrle32/lang/msrle_Es.rc
index 1f5bbecf201..c2a66659b43 100644
--- a/dll/win32/msrle32/lang/msrle_Es.rc
+++ b/dll/win32/msrle32/lang/msrle_Es.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "msrle_private.h"
-
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/msrle32/lang/msrle_Fr.rc b/dll/win32/msrle32/lang/msrle_Fr.rc
index aa046c1d330..66830fdd502 100644
--- a/dll/win32/msrle32/lang/msrle_Fr.rc
+++ b/dll/win32/msrle32/lang/msrle_Fr.rc
@@ -18,11 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "msrle_private.h"
-
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/msrle32/lang/msrle_He.rc b/dll/win32/msrle32/lang/msrle_He.rc
index ff36acd14ca..69f958fd769 100644
--- a/dll/win32/msrle32/lang/msrle_He.rc
+++ b/dll/win32/msrle32/lang/msrle_He.rc
@@ -20,10 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "msrle_private.h"
-
-#pragma code_page(65001)
-
LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/msrle32/lang/msrle_Hu.rc b/dll/win32/msrle32/lang/msrle_Hu.rc
index 0e7876cecf1..29d558edee7 100644
--- a/dll/win32/msrle32/lang/msrle_Hu.rc
+++ b/dll/win32/msrle32/lang/msrle_Hu.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "msrle_private.h"
-
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/msrle32/lang/msrle_It.rc b/dll/win32/msrle32/lang/msrle_It.rc
index ebc30056d2b..d89990db618 100644
--- a/dll/win32/msrle32/lang/msrle_It.rc
+++ b/dll/win32/msrle32/lang/msrle_It.rc
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "msrle_private.h"
-
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/msrle32/lang/msrle_Ja.rc b/dll/win32/msrle32/lang/msrle_Ja.rc
index 804a8ac0396..b42ddccfadf 100644
--- a/dll/win32/msrle32/lang/msrle_Ja.rc
+++ b/dll/win32/msrle32/lang/msrle_Ja.rc
@@ -18,11 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "msrle_private.h"
-
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/msrle32/lang/msrle_Ko.rc b/dll/win32/msrle32/lang/msrle_Ko.rc
index c050da9580a..824795eadd1 100644
--- a/dll/win32/msrle32/lang/msrle_Ko.rc
+++ b/dll/win32/msrle32/lang/msrle_Ko.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "msrle_private.h"
-
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/msrle32/lang/msrle_Lt.rc b/dll/win32/msrle32/lang/msrle_Lt.rc
index f6e5e0c98e8..dff519a0f0c 100644
--- a/dll/win32/msrle32/lang/msrle_Lt.rc
+++ b/dll/win32/msrle32/lang/msrle_Lt.rc
@@ -18,11 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "msrle_private.h"
-
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/msrle32/lang/msrle_Nl.rc b/dll/win32/msrle32/lang/msrle_Nl.rc
index ae627ba8739..939d203294f 100644
--- a/dll/win32/msrle32/lang/msrle_Nl.rc
+++ b/dll/win32/msrle32/lang/msrle_Nl.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "msrle_private.h"
-
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/msrle32/lang/msrle_No.rc b/dll/win32/msrle32/lang/msrle_No.rc
index 0ce410f9403..fed4c9aae1d 100644
--- a/dll/win32/msrle32/lang/msrle_No.rc
+++ b/dll/win32/msrle32/lang/msrle_No.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "msrle_private.h"
-
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
STRINGTABLE
diff --git a/dll/win32/msrle32/lang/msrle_Pl.rc b/dll/win32/msrle32/lang/msrle_Pl.rc
index 8a5d995a542..d4fa19aed57 100644
--- a/dll/win32/msrle32/lang/msrle_Pl.rc
+++ b/dll/win32/msrle32/lang/msrle_Pl.rc
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "msrle_private.h"
-
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/msrle32/lang/msrle_Pt.rc b/dll/win32/msrle32/lang/msrle_Pt.rc
index 0bc8637166b..09a6e518246 100644
--- a/dll/win32/msrle32/lang/msrle_Pt.rc
+++ b/dll/win32/msrle32/lang/msrle_Pt.rc
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "msrle_private.h"
-
LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
STRINGTABLE
diff --git a/dll/win32/msrle32/lang/msrle_Ro.rc b/dll/win32/msrle32/lang/msrle_Ro.rc
index d0ac98670f3..119317f1c8b 100644
--- a/dll/win32/msrle32/lang/msrle_Ro.rc
+++ b/dll/win32/msrle32/lang/msrle_Ro.rc
@@ -17,12 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "msrle_private.h"
-
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
-#pragma code_page(65001)
-
STRINGTABLE
{
IDS_NAME "WINE-MS-RLE"
diff --git a/dll/win32/msrle32/lang/msrle_Ru.rc b/dll/win32/msrle32/lang/msrle_Ru.rc
index 456d7240018..f1c785b385f 100644
--- a/dll/win32/msrle32/lang/msrle_Ru.rc
+++ b/dll/win32/msrle32/lang/msrle_Ru.rc
@@ -18,11 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "msrle_private.h"
-
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/msrle32/lang/msrle_Si.rc b/dll/win32/msrle32/lang/msrle_Si.rc
index e99d6a1bb89..6073573331c 100644
--- a/dll/win32/msrle32/lang/msrle_Si.rc
+++ b/dll/win32/msrle32/lang/msrle_Si.rc
@@ -18,10 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "msrle_private.h"
-
-#pragma code_page(65001)
-
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/msrle32/lang/msrle_Sq.rc b/dll/win32/msrle32/lang/msrle_Sq.rc
index 9e8e287c9c3..f5dfc7ff448 100644
--- a/dll/win32/msrle32/lang/msrle_Sq.rc
+++ b/dll/win32/msrle32/lang/msrle_Sq.rc
@@ -18,10 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "msrle_private.h"
-
-#pragma code_page(65001)
-
LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/msrle32/lang/msrle_Sv.rc b/dll/win32/msrle32/lang/msrle_Sv.rc
index d6a4c17e6ec..6e447b87295 100644
--- a/dll/win32/msrle32/lang/msrle_Sv.rc
+++ b/dll/win32/msrle32/lang/msrle_Sv.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "msrle_private.h"
-
LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/msrle32/lang/msrle_Tr.rc b/dll/win32/msrle32/lang/msrle_Tr.rc
index 2e25db5bb1a..7405961b570 100644
--- a/dll/win32/msrle32/lang/msrle_Tr.rc
+++ b/dll/win32/msrle32/lang/msrle_Tr.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "msrle_private.h"
-
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/msrle32/lang/msrle_Uk.rc b/dll/win32/msrle32/lang/msrle_Uk.rc
index 1e12f4982be..8304269140e 100644
--- a/dll/win32/msrle32/lang/msrle_Uk.rc
+++ b/dll/win32/msrle32/lang/msrle_Uk.rc
@@ -19,11 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "msrle_private.h"
-
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/msrle32/lang/msrle_Zh.rc b/dll/win32/msrle32/lang/msrle_Zh.rc
index 3b4211e80cc..dabf53abf5e 100644
--- a/dll/win32/msrle32/lang/msrle_Zh.rc
+++ b/dll/win32/msrle32/lang/msrle_Zh.rc
@@ -21,11 +21,6 @@
* Copyright 2021 Chan Chilung <eason066(a)gmail.com>
*/
-#include "msrle_private.h"
-
-/* Chinese text is encoded in UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
STRINGTABLE
diff --git a/dll/win32/msvfw32/lang/msvfw32_De.rc b/dll/win32/msvfw32/lang/msvfw32_De.rc
index 3db4ad72ca9..334ebbec04d 100644
--- a/dll/win32/msvfw32/lang/msvfw32_De.rc
+++ b/dll/win32/msvfw32/lang/msvfw32_De.rc
@@ -17,8 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/msvfw32/lang/msvfw32_Es.rc b/dll/win32/msvfw32/lang/msvfw32_Es.rc
index d0bb9dafc40..6d11b237cf4 100644
--- a/dll/win32/msvfw32/lang/msvfw32_Es.rc
+++ b/dll/win32/msvfw32/lang/msvfw32_Es.rc
@@ -17,8 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/msvfw32/lang/msvfw32_Fr.rc b/dll/win32/msvfw32/lang/msvfw32_Fr.rc
index fd1a88872c0..66fbcd051e8 100644
--- a/dll/win32/msvfw32/lang/msvfw32_Fr.rc
+++ b/dll/win32/msvfw32/lang/msvfw32_Fr.rc
@@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/msvfw32/lang/msvfw32_It.rc b/dll/win32/msvfw32/lang/msvfw32_It.rc
index 9d5ba8bef04..84628f810b0 100644
--- a/dll/win32/msvfw32/lang/msvfw32_It.rc
+++ b/dll/win32/msvfw32/lang/msvfw32_It.rc
@@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/msvfw32/lang/msvfw32_Lt.rc b/dll/win32/msvfw32/lang/msvfw32_Lt.rc
index 4a652aa30fd..1695ef7edb4 100644
--- a/dll/win32/msvfw32/lang/msvfw32_Lt.rc
+++ b/dll/win32/msvfw32/lang/msvfw32_Lt.rc
@@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/msvfw32/lang/msvfw32_Ro.rc b/dll/win32/msvfw32/lang/msvfw32_Ro.rc
index 4f25829de03..d99ea12bcd8 100644
--- a/dll/win32/msvfw32/lang/msvfw32_Ro.rc
+++ b/dll/win32/msvfw32/lang/msvfw32_Ro.rc
@@ -20,8 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/msvfw32/lang/msvfw32_Ru.rc b/dll/win32/msvfw32/lang/msvfw32_Ru.rc
index 51924c89b4c..379a7c66424 100644
--- a/dll/win32/msvfw32/lang/msvfw32_Ru.rc
+++ b/dll/win32/msvfw32/lang/msvfw32_Ru.rc
@@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/msvfw32/lang/msvfw32_Si.rc b/dll/win32/msvfw32/lang/msvfw32_Si.rc
index f359a0ba872..64def77a231 100644
--- a/dll/win32/msvfw32/lang/msvfw32_Si.rc
+++ b/dll/win32/msvfw32/lang/msvfw32_Si.rc
@@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/msvfw32/lang/msvfw32_Uk.rc b/dll/win32/msvfw32/lang/msvfw32_Uk.rc
index a5b5efca955..62fa590eb00 100644
--- a/dll/win32/msvfw32/lang/msvfw32_Uk.rc
+++ b/dll/win32/msvfw32/lang/msvfw32_Uk.rc
@@ -17,9 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/msvfw32/lang/msvfw32_Zh.rc b/dll/win32/msvfw32/lang/msvfw32_Zh.rc
index add2432531f..deb7f610c92 100644
--- a/dll/win32/msvfw32/lang/msvfw32_Zh.rc
+++ b/dll/win32/msvfw32/lang/msvfw32_Zh.rc
@@ -21,9 +21,6 @@
* Copyright 2021 Chan Chilung <eason066(a)gmail.com>
*/
-/* Chinese text is encoded in UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
STRINGTABLE
diff --git a/dll/win32/msvfw32/rsrc.rc b/dll/win32/msvfw32/rsrc.rc
index 9f502c6da5f..460e9a0d03a 100644
--- a/dll/win32/msvfw32/rsrc.rc
+++ b/dll/win32/msvfw32/rsrc.rc
@@ -18,7 +18,6 @@
#include "msvideo_private.h"
-
#include <reactos/manifest_dll.rc>
/* UTF-8 */
diff --git a/dll/win32/msvidc32/lang/msvidc32_De.rc b/dll/win32/msvidc32/lang/msvidc32_De.rc
index 97dfddf95f3..5c5547aa9e9 100644
--- a/dll/win32/msvidc32/lang/msvidc32_De.rc
+++ b/dll/win32/msvidc32/lang/msvidc32_De.rc
@@ -17,8 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/msvidc32/lang/msvidc32_Es.rc b/dll/win32/msvidc32/lang/msvidc32_Es.rc
index 41a92ba7bbc..627c3e969f2 100644
--- a/dll/win32/msvidc32/lang/msvidc32_Es.rc
+++ b/dll/win32/msvidc32/lang/msvidc32_Es.rc
@@ -19,9 +19,6 @@
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
-/*UTF-8*/
-#pragma code_page(65001)
-
STRINGTABLE
{
IDS_NAME "MS-CRAM"
diff --git a/dll/win32/msvidc32/lang/msvidc32_Fr.rc b/dll/win32/msvidc32/lang/msvidc32_Fr.rc
index 76240b3dff8..9353151392b 100644
--- a/dll/win32/msvidc32/lang/msvidc32_Fr.rc
+++ b/dll/win32/msvidc32/lang/msvidc32_Fr.rc
@@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/msvidc32/lang/msvidc32_It.rc b/dll/win32/msvidc32/lang/msvidc32_It.rc
index 7c29524774e..9187fff9f43 100644
--- a/dll/win32/msvidc32/lang/msvidc32_It.rc
+++ b/dll/win32/msvidc32/lang/msvidc32_It.rc
@@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/msvidc32/lang/msvidc32_Ja.rc b/dll/win32/msvidc32/lang/msvidc32_Ja.rc
index 6ae1958e5c6..c97adb98fa3 100644
--- a/dll/win32/msvidc32/lang/msvidc32_Ja.rc
+++ b/dll/win32/msvidc32/lang/msvidc32_Ja.rc
@@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/msvidc32/lang/msvidc32_Lt.rc b/dll/win32/msvidc32/lang/msvidc32_Lt.rc
index 765cd9f13b7..f3ff97726b9 100644
--- a/dll/win32/msvidc32/lang/msvidc32_Lt.rc
+++ b/dll/win32/msvidc32/lang/msvidc32_Lt.rc
@@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/msvidc32/lang/msvidc32_Ro.rc b/dll/win32/msvidc32/lang/msvidc32_Ro.rc
index 656b0a7d173..c601a67e43d 100644
--- a/dll/win32/msvidc32/lang/msvidc32_Ro.rc
+++ b/dll/win32/msvidc32/lang/msvidc32_Ro.rc
@@ -17,8 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/msvidc32/lang/msvidc32_Ru.rc b/dll/win32/msvidc32/lang/msvidc32_Ru.rc
index dfd086574ac..4c06e53fc07 100644
--- a/dll/win32/msvidc32/lang/msvidc32_Ru.rc
+++ b/dll/win32/msvidc32/lang/msvidc32_Ru.rc
@@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/msvidc32/lang/msvidc32_Si.rc b/dll/win32/msvidc32/lang/msvidc32_Si.rc
index d721377ecd0..298ddd14603 100644
--- a/dll/win32/msvidc32/lang/msvidc32_Si.rc
+++ b/dll/win32/msvidc32/lang/msvidc32_Si.rc
@@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/msvidc32/lang/msvidc32_Uk.rc b/dll/win32/msvidc32/lang/msvidc32_Uk.rc
index c5b6764888f..2cc4ab5867d 100644
--- a/dll/win32/msvidc32/lang/msvidc32_Uk.rc
+++ b/dll/win32/msvidc32/lang/msvidc32_Uk.rc
@@ -17,9 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/msvidc32/lang/msvidc32_Zh.rc b/dll/win32/msvidc32/lang/msvidc32_Zh.rc
index b9c0e48ed5b..0ab97d494ac 100644
--- a/dll/win32/msvidc32/lang/msvidc32_Zh.rc
+++ b/dll/win32/msvidc32/lang/msvidc32_Zh.rc
@@ -19,9 +19,6 @@
* Copyright 2021 Chan Chilung <eason066(a)gmail.com>
*/
-/* Chinese text is encoded in UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
STRINGTABLE
diff --git a/dll/win32/netcfgx/netcfgx.rc b/dll/win32/netcfgx/netcfgx.rc
index a353624735e..b6d8f049d7f 100644
--- a/dll/win32/netcfgx/netcfgx.rc
+++ b/dll/win32/netcfgx/netcfgx.rc
@@ -17,12 +17,12 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
#include <reactos/manifest_dll.rc>
-/* UTF-8 */
-#pragma code_page(65001)
-
IDI_NETWORK ICON "res/network.ico"
IDI_INTERNET ICON "res/internet.ico"
+/* UTF-8 */
+#pragma code_page(65001)
+
#ifdef LANGUAGE_BG_BG
#include "lang/bg-BG.rc"
#endif
diff --git a/dll/win32/oleacc/lang/oleacc_De.rc b/dll/win32/oleacc/lang/oleacc_De.rc
index 44620ad3a94..3d7f4f653c7 100644
--- a/dll/win32/oleacc/lang/oleacc_De.rc
+++ b/dll/win32/oleacc/lang/oleacc_De.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/oleacc/lang/oleacc_Fr.rc b/dll/win32/oleacc/lang/oleacc_Fr.rc
index 65a0f2236d3..2e632e76c05 100644
--- a/dll/win32/oleacc/lang/oleacc_Fr.rc
+++ b/dll/win32/oleacc/lang/oleacc_Fr.rc
@@ -19,9 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/oleacc/lang/oleacc_Hu.rc b/dll/win32/oleacc/lang/oleacc_Hu.rc
index 5d50a9989ee..8680be38c1b 100644
--- a/dll/win32/oleacc/lang/oleacc_Hu.rc
+++ b/dll/win32/oleacc/lang/oleacc_Hu.rc
@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/oleacc/lang/oleacc_It.rc b/dll/win32/oleacc/lang/oleacc_It.rc
index 3f8d10db2bd..ae8a243a844 100644
--- a/dll/win32/oleacc/lang/oleacc_It.rc
+++ b/dll/win32/oleacc/lang/oleacc_It.rc
@@ -19,9 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/oleacc/lang/oleacc_Lt.rc b/dll/win32/oleacc/lang/oleacc_Lt.rc
index 60f4087cbac..c066d061815 100644
--- a/dll/win32/oleacc/lang/oleacc_Lt.rc
+++ b/dll/win32/oleacc/lang/oleacc_Lt.rc
@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/oleacc/lang/oleacc_No.rc b/dll/win32/oleacc/lang/oleacc_No.rc
index e05ae900c5b..caa7b516029 100644
--- a/dll/win32/oleacc/lang/oleacc_No.rc
+++ b/dll/win32/oleacc/lang/oleacc_No.rc
@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
STRINGTABLE
diff --git a/dll/win32/oleacc/lang/oleacc_Pt.rc b/dll/win32/oleacc/lang/oleacc_Pt.rc
index f09868a4214..fadfecc44ed 100644
--- a/dll/win32/oleacc/lang/oleacc_Pt.rc
+++ b/dll/win32/oleacc/lang/oleacc_Pt.rc
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
STRINGTABLE
diff --git a/dll/win32/oleacc/lang/oleacc_Ro.rc b/dll/win32/oleacc/lang/oleacc_Ro.rc
index b854f9df98d..32cbf257c69 100644
--- a/dll/win32/oleacc/lang/oleacc_Ro.rc
+++ b/dll/win32/oleacc/lang/oleacc_Ro.rc
@@ -21,8 +21,6 @@
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
-#pragma code_page(65001)
-
STRINGTABLE
{
0 "obiect necunoscut" /* undocumented */
diff --git a/dll/win32/oleacc/lang/oleacc_Si.rc b/dll/win32/oleacc/lang/oleacc_Si.rc
index cee2ab3a5cd..20ce8c7b50c 100644
--- a/dll/win32/oleacc/lang/oleacc_Si.rc
+++ b/dll/win32/oleacc/lang/oleacc_Si.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/oleacc/lang/oleacc_Uk.rc b/dll/win32/oleacc/lang/oleacc_Uk.rc
index 55da93f56da..1ea8cd0835a 100644
--- a/dll/win32/oleacc/lang/oleacc_Uk.rc
+++ b/dll/win32/oleacc/lang/oleacc_Uk.rc
@@ -20,9 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/oleacc/lang/oleacc_Zh.rc b/dll/win32/oleacc/lang/oleacc_Zh.rc
index 23d77a19366..9e110733e01 100644
--- a/dll/win32/oleacc/lang/oleacc_Zh.rc
+++ b/dll/win32/oleacc/lang/oleacc_Zh.rc
@@ -21,9 +21,6 @@
* Copyright 2021 Chan Chilung <eason066(a)gmail.com>
*/
-/* Chinese text is encoded in UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
STRINGTABLE
diff --git a/dll/win32/oleaut32/lang/oleaut32_De.rc b/dll/win32/oleaut32/lang/oleaut32_De.rc
index 73206c25a1d..12a96f62270 100644
--- a/dll/win32/oleaut32/lang/oleaut32_De.rc
+++ b/dll/win32/oleaut32/lang/oleaut32_De.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/oleaut32/lang/oleaut32_Lt.rc b/dll/win32/oleaut32/lang/oleaut32_Lt.rc
index 77bd64e5674..747bf7fc5e3 100644
--- a/dll/win32/oleaut32/lang/oleaut32_Lt.rc
+++ b/dll/win32/oleaut32/lang/oleaut32_Lt.rc
@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/oleaut32/lang/oleaut32_Ro.rc b/dll/win32/oleaut32/lang/oleaut32_Ro.rc
index 8f718833322..8ede4e8ca0c 100644
--- a/dll/win32/oleaut32/lang/oleaut32_Ro.rc
+++ b/dll/win32/oleaut32/lang/oleaut32_Ro.rc
@@ -19,8 +19,6 @@
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
-#pragma code_page(65001)
-
STRINGTABLE
{
IDS_TRUE "Adevărat"
diff --git a/dll/win32/oleaut32/lang/oleaut32_Ru.rc b/dll/win32/oleaut32/lang/oleaut32_Ru.rc
index e2f0161e511..245e40bf94d 100644
--- a/dll/win32/oleaut32/lang/oleaut32_Ru.rc
+++ b/dll/win32/oleaut32/lang/oleaut32_Ru.rc
@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/oleaut32/lang/oleaut32_Si.rc b/dll/win32/oleaut32/lang/oleaut32_Si.rc
index c0a4d23ec15..cd71fb0a39c 100644
--- a/dll/win32/oleaut32/lang/oleaut32_Si.rc
+++ b/dll/win32/oleaut32/lang/oleaut32_Si.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/oleaut32/lang/oleaut32_Uk.rc b/dll/win32/oleaut32/lang/oleaut32_Uk.rc
index 38b020c486b..db469803510 100644
--- a/dll/win32/oleaut32/lang/oleaut32_Uk.rc
+++ b/dll/win32/oleaut32/lang/oleaut32_Uk.rc
@@ -20,9 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/oleaut32/lang/oleaut32_Zh.rc b/dll/win32/oleaut32/lang/oleaut32_Zh.rc
index 0005e4cd43f..e9b9260c427 100644
--- a/dll/win32/oleaut32/lang/oleaut32_Zh.rc
+++ b/dll/win32/oleaut32/lang/oleaut32_Zh.rc
@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* Chinese text is encoded in UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
STRINGTABLE
diff --git a/dll/win32/oledlg/lang/oledlg_De.rc b/dll/win32/oledlg/lang/oledlg_De.rc
index bd99c1c33e2..385228fb5c3 100644
--- a/dll/win32/oledlg/lang/oledlg_De.rc
+++ b/dll/win32/oledlg/lang/oledlg_De.rc
@@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/oledlg/lang/oledlg_Fr.rc b/dll/win32/oledlg/lang/oledlg_Fr.rc
index 4f284de68a1..06ad4fc2044 100644
--- a/dll/win32/oledlg/lang/oledlg_Fr.rc
+++ b/dll/win32/oledlg/lang/oledlg_Fr.rc
@@ -20,9 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/oledlg/lang/oledlg_Hu.rc b/dll/win32/oledlg/lang/oledlg_Hu.rc
index a96bd727968..75e66af16a8 100644
--- a/dll/win32/oledlg/lang/oledlg_Hu.rc
+++ b/dll/win32/oledlg/lang/oledlg_Hu.rc
@@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/oledlg/lang/oledlg_It.rc b/dll/win32/oledlg/lang/oledlg_It.rc
index 9cdd49c61f8..dbd976013bd 100644
--- a/dll/win32/oledlg/lang/oledlg_It.rc
+++ b/dll/win32/oledlg/lang/oledlg_It.rc
@@ -17,9 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/oledlg/lang/oledlg_Ja.rc b/dll/win32/oledlg/lang/oledlg_Ja.rc
index bd18b9219ee..f33f1e830f5 100644
--- a/dll/win32/oledlg/lang/oledlg_Ja.rc
+++ b/dll/win32/oledlg/lang/oledlg_Ja.rc
@@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/oledlg/lang/oledlg_Lt.rc b/dll/win32/oledlg/lang/oledlg_Lt.rc
index bebe9ed51cc..d66681ed429 100644
--- a/dll/win32/oledlg/lang/oledlg_Lt.rc
+++ b/dll/win32/oledlg/lang/oledlg_Lt.rc
@@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/oledlg/lang/oledlg_Nl.rc b/dll/win32/oledlg/lang/oledlg_Nl.rc
index 968fe4f72a0..f6fdeff9a63 100644
--- a/dll/win32/oledlg/lang/oledlg_Nl.rc
+++ b/dll/win32/oledlg/lang/oledlg_Nl.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/oledlg/lang/oledlg_Pt.rc b/dll/win32/oledlg/lang/oledlg_Pt.rc
index 23dc29f5005..312b291f298 100644
--- a/dll/win32/oledlg/lang/oledlg_Pt.rc
+++ b/dll/win32/oledlg/lang/oledlg_Pt.rc
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
STRINGTABLE
diff --git a/dll/win32/oledlg/lang/oledlg_Ro.rc b/dll/win32/oledlg/lang/oledlg_Ro.rc
index e976733c9b3..2754d543447 100644
--- a/dll/win32/oledlg/lang/oledlg_Ro.rc
+++ b/dll/win32/oledlg/lang/oledlg_Ro.rc
@@ -20,8 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/oledlg/lang/oledlg_Ru.rc b/dll/win32/oledlg/lang/oledlg_Ru.rc
index a5224fc31aa..d9d4b015bc2 100644
--- a/dll/win32/oledlg/lang/oledlg_Ru.rc
+++ b/dll/win32/oledlg/lang/oledlg_Ru.rc
@@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/oledlg/lang/oledlg_Si.rc b/dll/win32/oledlg/lang/oledlg_Si.rc
index fe7bd07c305..91523179cde 100644
--- a/dll/win32/oledlg/lang/oledlg_Si.rc
+++ b/dll/win32/oledlg/lang/oledlg_Si.rc
@@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/oledlg/lang/oledlg_Uk.rc b/dll/win32/oledlg/lang/oledlg_Uk.rc
index 960841063b6..f504c56ef00 100644
--- a/dll/win32/oledlg/lang/oledlg_Uk.rc
+++ b/dll/win32/oledlg/lang/oledlg_Uk.rc
@@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/oledlg/lang/oledlg_Zh.rc b/dll/win32/oledlg/lang/oledlg_Zh.rc
index 4ef55df193b..0d6e33c5e53 100644
--- a/dll/win32/oledlg/lang/oledlg_Zh.rc
+++ b/dll/win32/oledlg/lang/oledlg_Zh.rc
@@ -19,9 +19,6 @@
* Copyright 2021 Chan Chilung <eason066(a)gmail.com>
*/
-/* Chinese text is encoded in UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
STRINGTABLE
diff --git a/dll/win32/shlwapi/lang/de-DE.rc b/dll/win32/shlwapi/lang/de-DE.rc
index 4dc8a1513dd..e84a4c75452 100644
--- a/dll/win32/shlwapi/lang/de-DE.rc
+++ b/dll/win32/shlwapi/lang/de-DE.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/shlwapi/lang/fr-FR.rc b/dll/win32/shlwapi/lang/fr-FR.rc
index b7b4d317e53..09b03678373 100644
--- a/dll/win32/shlwapi/lang/fr-FR.rc
+++ b/dll/win32/shlwapi/lang/fr-FR.rc
@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/shlwapi/lang/hu-HU.rc b/dll/win32/shlwapi/lang/hu-HU.rc
index 8fa7afa1db3..ccc262844d0 100644
--- a/dll/win32/shlwapi/lang/hu-HU.rc
+++ b/dll/win32/shlwapi/lang/hu-HU.rc
@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/shlwapi/lang/ja-JP.rc b/dll/win32/shlwapi/lang/ja-JP.rc
index 50388113a38..3a770caecba 100644
--- a/dll/win32/shlwapi/lang/ja-JP.rc
+++ b/dll/win32/shlwapi/lang/ja-JP.rc
@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/shlwapi/lang/lt-LT.rc b/dll/win32/shlwapi/lang/lt-LT.rc
index 717c17e9434..16502562dcc 100644
--- a/dll/win32/shlwapi/lang/lt-LT.rc
+++ b/dll/win32/shlwapi/lang/lt-LT.rc
@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/shlwapi/lang/pt-PT.rc b/dll/win32/shlwapi/lang/pt-PT.rc
index 242b0994dab..ed9e5bd24c3 100644
--- a/dll/win32/shlwapi/lang/pt-PT.rc
+++ b/dll/win32/shlwapi/lang/pt-PT.rc
@@ -20,8 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/shlwapi/lang/ro-RO.rc b/dll/win32/shlwapi/lang/ro-RO.rc
index d31911ba7ec..c9b7739414c 100644
--- a/dll/win32/shlwapi/lang/ro-RO.rc
+++ b/dll/win32/shlwapi/lang/ro-RO.rc
@@ -21,8 +21,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/shlwapi/lang/ru-RU.rc b/dll/win32/shlwapi/lang/ru-RU.rc
index 8e963a01672..1b1bdd0c699 100644
--- a/dll/win32/shlwapi/lang/ru-RU.rc
+++ b/dll/win32/shlwapi/lang/ru-RU.rc
@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/shlwapi/lang/sl-SI.rc b/dll/win32/shlwapi/lang/sl-SI.rc
index abcf7e6efc5..0e18cd09a44 100644
--- a/dll/win32/shlwapi/lang/sl-SI.rc
+++ b/dll/win32/shlwapi/lang/sl-SI.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/shlwapi/lang/uk-UA.rc b/dll/win32/shlwapi/lang/uk-UA.rc
index f4e190975bd..8cb3404c441 100644
--- a/dll/win32/shlwapi/lang/uk-UA.rc
+++ b/dll/win32/shlwapi/lang/uk-UA.rc
@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/shlwapi/lang/zh-CN.rc b/dll/win32/shlwapi/lang/zh-CN.rc
index 2d6f8d4e92c..cca4fc59454 100644
--- a/dll/win32/shlwapi/lang/zh-CN.rc
+++ b/dll/win32/shlwapi/lang/zh-CN.rc
@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* Chinese text is encoded in UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
STRINGTABLE
diff --git a/dll/win32/shlwapi/lang/zh-TW.rc b/dll/win32/shlwapi/lang/zh-TW.rc
index f63a05c64ca..1a774b18e82 100644
--- a/dll/win32/shlwapi/lang/zh-TW.rc
+++ b/dll/win32/shlwapi/lang/zh-TW.rc
@@ -21,9 +21,6 @@
* Copyright 2021 Chan Chilung <eason066(a)gmail.com>
*/
-/* Chinese text is encoded in UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
STRINGTABLE
diff --git a/dll/win32/themeui/themeui.rc b/dll/win32/themeui/themeui.rc
index 230cac724d4..a13fe55052e 100644
--- a/dll/win32/themeui/themeui.rc
+++ b/dll/win32/themeui/themeui.rc
@@ -13,6 +13,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
/* UTF-8 */
#pragma code_page(65001)
+
#ifdef LANGUAGE_CS_CZ
#include "lang/cs-CZ.rc"
#endif
diff --git a/dll/win32/wininet/lang/wininet_Da.rc b/dll/win32/wininet/lang/wininet_Da.rc
index 1411bfd1fcf..e857efdfade 100644
--- a/dll/win32/wininet/lang/wininet_Da.rc
+++ b/dll/win32/wininet/lang/wininet_Da.rc
@@ -17,8 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/wininet/lang/wininet_De.rc b/dll/win32/wininet/lang/wininet_De.rc
index eae9240f2c8..9f89bcd121e 100644
--- a/dll/win32/wininet/lang/wininet_De.rc
+++ b/dll/win32/wininet/lang/wininet_De.rc
@@ -17,8 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/wininet/lang/wininet_Fr.rc b/dll/win32/wininet/lang/wininet_Fr.rc
index 5e6adfd01a5..3679ff4d7e6 100644
--- a/dll/win32/wininet/lang/wininet_Fr.rc
+++ b/dll/win32/wininet/lang/wininet_Fr.rc
@@ -22,9 +22,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/wininet/lang/wininet_He.rc b/dll/win32/wininet/lang/wininet_He.rc
index a663f624fbb..5a606f45861 100644
--- a/dll/win32/wininet/lang/wininet_He.rc
+++ b/dll/win32/wininet/lang/wininet_He.rc
@@ -17,8 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/wininet/lang/wininet_Hu.rc b/dll/win32/wininet/lang/wininet_Hu.rc
index 0f7becb9ffc..67b4b580450 100644
--- a/dll/win32/wininet/lang/wininet_Hu.rc
+++ b/dll/win32/wininet/lang/wininet_Hu.rc
@@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/wininet/lang/wininet_It.rc b/dll/win32/wininet/lang/wininet_It.rc
index 859c1eb0842..1e84d85484b 100644
--- a/dll/win32/wininet/lang/wininet_It.rc
+++ b/dll/win32/wininet/lang/wininet_It.rc
@@ -19,9 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/wininet/lang/wininet_Ja.rc b/dll/win32/wininet/lang/wininet_Ja.rc
index a00db74a3a2..76307e748ed 100644
--- a/dll/win32/wininet/lang/wininet_Ja.rc
+++ b/dll/win32/wininet/lang/wininet_Ja.rc
@@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/wininet/lang/wininet_Ko.rc b/dll/win32/wininet/lang/wininet_Ko.rc
index 266143045a0..f12b6d495df 100644
--- a/dll/win32/wininet/lang/wininet_Ko.rc
+++ b/dll/win32/wininet/lang/wininet_Ko.rc
@@ -17,8 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/wininet/lang/wininet_Lt.rc b/dll/win32/wininet/lang/wininet_Lt.rc
index 1b7e8427970..316baf4ae78 100644
--- a/dll/win32/wininet/lang/wininet_Lt.rc
+++ b/dll/win32/wininet/lang/wininet_Lt.rc
@@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/wininet/lang/wininet_Nl.rc b/dll/win32/wininet/lang/wininet_Nl.rc
index 5f8c432495c..000cd8f75ca 100644
--- a/dll/win32/wininet/lang/wininet_Nl.rc
+++ b/dll/win32/wininet/lang/wininet_Nl.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/wininet/lang/wininet_No.rc b/dll/win32/wininet/lang/wininet_No.rc
index b0c3e2fc9e8..ed921f88256 100644
--- a/dll/win32/wininet/lang/wininet_No.rc
+++ b/dll/win32/wininet/lang/wininet_No.rc
@@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
STRINGTABLE
diff --git a/dll/win32/wininet/lang/wininet_Pt.rc b/dll/win32/wininet/lang/wininet_Pt.rc
index 83f2878151d..19be6402f9b 100644
--- a/dll/win32/wininet/lang/wininet_Pt.rc
+++ b/dll/win32/wininet/lang/wininet_Pt.rc
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
STRINGTABLE
diff --git a/dll/win32/wininet/lang/wininet_Ro.rc b/dll/win32/wininet/lang/wininet_Ro.rc
index 186e7724fed..5ac07610f20 100644
--- a/dll/win32/wininet/lang/wininet_Ro.rc
+++ b/dll/win32/wininet/lang/wininet_Ro.rc
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/wininet/lang/wininet_Ru.rc b/dll/win32/wininet/lang/wininet_Ru.rc
index 14b5363db93..5fe5709cbd8 100644
--- a/dll/win32/wininet/lang/wininet_Ru.rc
+++ b/dll/win32/wininet/lang/wininet_Ru.rc
@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/wininet/lang/wininet_Si.rc b/dll/win32/wininet/lang/wininet_Si.rc
index b70d7adbf1b..8a01513c5c7 100644
--- a/dll/win32/wininet/lang/wininet_Si.rc
+++ b/dll/win32/wininet/lang/wininet_Si.rc
@@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/wininet/lang/wininet_Sr.rc b/dll/win32/wininet/lang/wininet_Sr.rc
index 19ee56ac774..473e9636b65 100644
--- a/dll/win32/wininet/lang/wininet_Sr.rc
+++ b/dll/win32/wininet/lang/wininet_Sr.rc
@@ -17,8 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC
STRINGTABLE
diff --git a/dll/win32/wininet/lang/wininet_Uk.rc b/dll/win32/wininet/lang/wininet_Uk.rc
index 7aab43df6e6..3519902e335 100644
--- a/dll/win32/wininet/lang/wininet_Uk.rc
+++ b/dll/win32/wininet/lang/wininet_Uk.rc
@@ -19,9 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/wininet/lang/wininet_Zh.rc b/dll/win32/wininet/lang/wininet_Zh.rc
index 32db03edeff..3d4d81f2447 100644
--- a/dll/win32/wininet/lang/wininet_Zh.rc
+++ b/dll/win32/wininet/lang/wininet_Zh.rc
@@ -20,9 +20,6 @@
* Copyright 2021 Chan Chilung <eason066(a)gmail.com>
*/
-/* Chinese text is encoded in UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
STRINGTABLE
diff --git a/dll/win32/winmm/lang/winmm_Br.rc b/dll/win32/winmm/lang/winmm_Br.rc
index 9d09bef1c0c..59542df6967 100644
--- a/dll/win32/winmm/lang/winmm_Br.rc
+++ b/dll/win32/winmm/lang/winmm_Br.rc
@@ -17,7 +17,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-STRINGTABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
+STRINGTABLE
BEGIN
/* MMSYS errors */
diff --git a/dll/win32/winmm/lang/winmm_Cs.rc b/dll/win32/winmm/lang/winmm_Cs.rc
index da219c68b7d..b164619ec57 100644
--- a/dll/win32/winmm/lang/winmm_Cs.rc
+++ b/dll/win32/winmm/lang/winmm_Cs.rc
@@ -18,7 +18,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-STRINGTABLE LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
+LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
+
+STRINGTABLE
BEGIN
/* MMSYS errors */
diff --git a/dll/win32/winmm/lang/winmm_De.rc b/dll/win32/winmm/lang/winmm_De.rc
index 5fbcd5e26ee..1748b31cafc 100644
--- a/dll/win32/winmm/lang/winmm_De.rc
+++ b/dll/win32/winmm/lang/winmm_De.rc
@@ -16,7 +16,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
BEGIN
/* MMSYS errors */
diff --git a/dll/win32/winmm/lang/winmm_En.rc b/dll/win32/winmm/lang/winmm_En.rc
index 3fb0f7c8194..fb3dd8381b6 100644
--- a/dll/win32/winmm/lang/winmm_En.rc
+++ b/dll/win32/winmm/lang/winmm_En.rc
@@ -16,7 +16,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+STRINGTABLE
BEGIN
/* MMSYS errors */
diff --git a/dll/win32/winmm/lang/winmm_Es.rc b/dll/win32/winmm/lang/winmm_Es.rc
index 5308abdf222..7218f3d8ce9 100644
--- a/dll/win32/winmm/lang/winmm_Es.rc
+++ b/dll/win32/winmm/lang/winmm_Es.rc
@@ -17,7 +17,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
+LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
+
+STRINGTABLE
BEGIN
/* MMSYS errors */
diff --git a/dll/win32/winmm/lang/winmm_Hu.rc b/dll/win32/winmm/lang/winmm_Hu.rc
index 05cf8155a86..0e9e7dd9d8a 100644
--- a/dll/win32/winmm/lang/winmm_Hu.rc
+++ b/dll/win32/winmm/lang/winmm_Hu.rc
@@ -17,7 +17,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-STRINGTABLE LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
+LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
BEGIN
/* MMSYS errors */
diff --git a/dll/win32/winmm/lang/winmm_Id.rc b/dll/win32/winmm/lang/winmm_Id.rc
index de3560952c8..6cc8deb5d53 100644
--- a/dll/win32/winmm/lang/winmm_Id.rc
+++ b/dll/win32/winmm/lang/winmm_Id.rc
@@ -16,8 +16,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-STRINGTABLE LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT
+LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT
+STRINGTABLE
BEGIN
/* MMSYS errors */
diff --git a/dll/win32/winmm/lang/winmm_It.rc b/dll/win32/winmm/lang/winmm_It.rc
index c9cad247d78..c595c8328a1 100644
--- a/dll/win32/winmm/lang/winmm_It.rc
+++ b/dll/win32/winmm/lang/winmm_It.rc
@@ -17,7 +17,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-STRINGTABLE LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
BEGIN
/* MMSYS errors */
diff --git a/dll/win32/winmm/lang/winmm_Ja.rc b/dll/win32/winmm/lang/winmm_Ja.rc
index e208d91f0da..27a9da7542b 100644
--- a/dll/win32/winmm/lang/winmm_Ja.rc
+++ b/dll/win32/winmm/lang/winmm_Ja.rc
@@ -16,7 +16,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-STRINGTABLE LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+
+STRINGTABLE
BEGIN
/* MMSYS errors */
diff --git a/dll/win32/winmm/lang/winmm_Nl.rc b/dll/win32/winmm/lang/winmm_Nl.rc
index f8b6305da06..2d615c8ea1f 100644
--- a/dll/win32/winmm/lang/winmm_Nl.rc
+++ b/dll/win32/winmm/lang/winmm_Nl.rc
@@ -16,7 +16,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-STRINGTABLE LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
+LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
+
+STRINGTABLE
BEGIN
/* MMSYS errors */
diff --git a/dll/win32/winmm/lang/winmm_No.rc b/dll/win32/winmm/lang/winmm_No.rc
index 07c6cf9b7ec..1373fd48816 100644
--- a/dll/win32/winmm/lang/winmm_No.rc
+++ b/dll/win32/winmm/lang/winmm_No.rc
@@ -20,7 +20,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-STRINGTABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
BEGIN
/* MMSYS errors */
diff --git a/dll/win32/winmm/lang/winmm_Pl.rc b/dll/win32/winmm/lang/winmm_Pl.rc
index 1b707d57713..58aec5c81ef 100644
--- a/dll/win32/winmm/lang/winmm_Pl.rc
+++ b/dll/win32/winmm/lang/winmm_Pl.rc
@@ -16,7 +16,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-STRINGTABLE LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+
+STRINGTABLE
BEGIN
/* MMSYS errors */
diff --git a/dll/win32/winmm/lang/winmm_Pt.rc b/dll/win32/winmm/lang/winmm_Pt.rc
index 0daf89bc4fc..ad884b656e9 100644
--- a/dll/win32/winmm/lang/winmm_Pt.rc
+++ b/dll/win32/winmm/lang/winmm_Pt.rc
@@ -17,7 +17,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-STRINGTABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_PORTUGAL
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_PORTUGAL
+
+STRINGTABLE
BEGIN
/* MMSYS errors */
diff --git a/dll/win32/winmm/lang/winmm_Ro.rc b/dll/win32/winmm/lang/winmm_Ro.rc
index ca900da23bd..bd8cf965864 100644
--- a/dll/win32/winmm/lang/winmm_Ro.rc
+++ b/dll/win32/winmm/lang/winmm_Ro.rc
@@ -18,7 +18,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-STRINGTABLE LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
BEGIN
/* MMSYS errors */
diff --git a/dll/win32/winmm/lang/winmm_Ru.rc b/dll/win32/winmm/lang/winmm_Ru.rc
index 1a8eb1f11d3..9e717eb5d75 100644
--- a/dll/win32/winmm/lang/winmm_Ru.rc
+++ b/dll/win32/winmm/lang/winmm_Ru.rc
@@ -15,12 +15,12 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
+/* translation by Zahar Hodoley (mail: zaharh(a)mail.ru) */
-STRINGTABLE LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-BEGIN
+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+STRINGTABLE
+BEGIN
/* MMSYS errors */
MMSYSERR_NOERROR, "Нет ошибки."
@@ -127,5 +127,3 @@ MCIERR_SEQ_PORTUNSPECIFIED, "В системе не указан текущий
MCIERR_SEQ_TIMER, "Все таймеры мультимедиа используются другими приложениями. Закройте одно из этих приложений и попробуйте заново."
END
-
-/* translation by Zahar Hodoley (mail: zaharh(a)mail.ru) */
diff --git a/dll/win32/winmm/lang/winmm_Si.rc b/dll/win32/winmm/lang/winmm_Si.rc
index 3cfce8d6e18..b6a3ce9c22f 100644
--- a/dll/win32/winmm/lang/winmm_Si.rc
+++ b/dll/win32/winmm/lang/winmm_Si.rc
@@ -17,7 +17,9 @@
*
*/
-STRINGTABLE LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
+LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
BEGIN
/* MMSYS errors */
diff --git a/dll/win32/winmm/lang/winmm_Sk.rc b/dll/win32/winmm/lang/winmm_Sk.rc
index 85af82f4c1d..8ae469b6b44 100644
--- a/dll/win32/winmm/lang/winmm_Sk.rc
+++ b/dll/win32/winmm/lang/winmm_Sk.rc
@@ -16,7 +16,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-STRINGTABLE LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
+LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
+
+STRINGTABLE
BEGIN
/* MMSYS errors */
diff --git a/dll/win32/winmm/lang/winmm_Sq.rc b/dll/win32/winmm/lang/winmm_Sq.rc
index e173ec0858a..d1fb4d1de84 100644
--- a/dll/win32/winmm/lang/winmm_Sq.rc
+++ b/dll/win32/winmm/lang/winmm_Sq.rc
@@ -16,7 +16,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-STRINGTABLE LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
BEGIN
/* MMSYS errors */
diff --git a/dll/win32/winmm/lang/winmm_Tr.rc b/dll/win32/winmm/lang/winmm_Tr.rc
index d4e905daa6c..1a996918295 100644
--- a/dll/win32/winmm/lang/winmm_Tr.rc
+++ b/dll/win32/winmm/lang/winmm_Tr.rc
@@ -16,7 +16,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-STRINGTABLE LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
+LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
+
+STRINGTABLE
BEGIN
/* MMSYS errors */
diff --git a/dll/win32/winmm/lang/winmm_Uk.rc b/dll/win32/winmm/lang/winmm_Uk.rc
index df1c46fe429..58f58a184f0 100644
--- a/dll/win32/winmm/lang/winmm_Uk.rc
+++ b/dll/win32/winmm/lang/winmm_Uk.rc
@@ -16,10 +16,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
+LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
-STRINGTABLE LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
+STRINGTABLE
BEGIN
/* MMSYS errors */
diff --git a/dll/win32/winmm/lang/winmm_Zh.rc b/dll/win32/winmm/lang/winmm_Zh.rc
index 318d1fd1f9f..4e39d592d7c 100644
--- a/dll/win32/winmm/lang/winmm_Zh.rc
+++ b/dll/win32/winmm/lang/winmm_Zh.rc
@@ -19,10 +19,9 @@
* Copyright 2021 Chan Chilung <eason066(a)gmail.com>
*/
-/* Chinese text is encoded in UTF-8 */
-#pragma code_page(65001)
+LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
-STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
+STRINGTABLE
BEGIN
/* MMSYS errors */
@@ -128,9 +127,12 @@ MCIERR_SEQ_PORT_MISCERROR, "用指定的端口时出错。"
MCIERR_SEQ_PORT_NONEXISTENT, "在系统上没有安装指定的 MIDI 设备。使用控制面板中的驱动程序选项来安装一个 MIDI 设备。"
MCIERR_SEQ_PORTUNSPECIFIED, "系统没有指定当前 MIDI 端口。"
MCIERR_SEQ_TIMER, "所有多媒体定时器正在被其他应用程序使用。退出这些应用程序;然后，再试一次。"
+
END
-STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
+LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
+
+STRINGTABLE
BEGIN
/* MMSYS errors */
@@ -236,4 +238,5 @@ MCIERR_SEQ_PORT_MISCERROR, "指定的連接埠發生了錯誤。"
MCIERR_SEQ_PORT_NONEXISTENT, "指定的 MIDI 裝置未安裝到系統上。請使用控制臺中的「驅動程式」選項以安裝 MIDI 裝置。"
MCIERR_SEQ_PORTUNSPECIFIED, "系統尚未指定目前的 MIDI 連接埠。"
MCIERR_SEQ_TIMER, "所有多媒體計時器正被其他應用程式使用中。請結束其中某一個應用程式，然後再試一次。"
+
END
diff --git a/dll/win32/wldap32/lang/wldap32_De.rc b/dll/win32/wldap32/lang/wldap32_De.rc
index 5743b84d0b2..da90079942b 100644
--- a/dll/win32/wldap32/lang/wldap32_De.rc
+++ b/dll/win32/wldap32/lang/wldap32_De.rc
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/wldap32/lang/wldap32_Fr.rc b/dll/win32/wldap32/lang/wldap32_Fr.rc
index ff5d1a59c01..0c7c52a8c8e 100644
--- a/dll/win32/wldap32/lang/wldap32_Fr.rc
+++ b/dll/win32/wldap32/lang/wldap32_Fr.rc
@@ -19,9 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/wldap32/lang/wldap32_Hu.rc b/dll/win32/wldap32/lang/wldap32_Hu.rc
index deb45bd862e..ba4e63ded4b 100644
--- a/dll/win32/wldap32/lang/wldap32_Hu.rc
+++ b/dll/win32/wldap32/lang/wldap32_Hu.rc
@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/wldap32/lang/wldap32_It.rc b/dll/win32/wldap32/lang/wldap32_It.rc
index 6b032ab3c44..bf775f74831 100644
--- a/dll/win32/wldap32/lang/wldap32_It.rc
+++ b/dll/win32/wldap32/lang/wldap32_It.rc
@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/*UTF-8*/
-#pragma code_page(65001)
-
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/wldap32/lang/wldap32_Lt.rc b/dll/win32/wldap32/lang/wldap32_Lt.rc
index 8527c357bb6..a9fecbec256 100644
--- a/dll/win32/wldap32/lang/wldap32_Lt.rc
+++ b/dll/win32/wldap32/lang/wldap32_Lt.rc
@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/dll/win32/wldap32/lang/wldap32_Pt.rc b/dll/win32/wldap32/lang/wldap32_Pt.rc
index fd95c104af8..6015b533ee2 100644
--- a/dll/win32/wldap32/lang/wldap32_Pt.rc
+++ b/dll/win32/wldap32/lang/wldap32_Pt.rc
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
STRINGTABLE
diff --git a/dll/win32/wldap32/lang/wldap32_Ro.rc b/dll/win32/wldap32/lang/wldap32_Ro.rc
index fe05b0e6cea..c916b1a1a42 100644
--- a/dll/win32/wldap32/lang/wldap32_Ro.rc
+++ b/dll/win32/wldap32/lang/wldap32_Ro.rc
@@ -21,8 +21,6 @@
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
-#pragma code_page(65001)
-
STRINGTABLE
{
0 "Succes"
diff --git a/dll/win32/wldap32/lang/wldap32_Ru.rc b/dll/win32/wldap32/lang/wldap32_Ru.rc
index eeb2d612c8d..8032c26601f 100644
--- a/dll/win32/wldap32/lang/wldap32_Ru.rc
+++ b/dll/win32/wldap32/lang/wldap32_Ru.rc
@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/wldap32/lang/wldap32_Uk.rc b/dll/win32/wldap32/lang/wldap32_Uk.rc
index f5665acff24..678f20119bd 100644
--- a/dll/win32/wldap32/lang/wldap32_Uk.rc
+++ b/dll/win32/wldap32/lang/wldap32_Uk.rc
@@ -20,9 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/dll/win32/wldap32/lang/wldap32_Zh.rc b/dll/win32/wldap32/lang/wldap32_Zh.rc
index cc556548f18..e40d6b50178 100644
--- a/dll/win32/wldap32/lang/wldap32_Zh.rc
+++ b/dll/win32/wldap32/lang/wldap32_Zh.rc
@@ -21,9 +21,6 @@
* Copyright 2021 Chan Chilung <eason066(a)gmail.com>
*/
-/* Chinese text is encoded in UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
STRINGTABLE
diff --git a/media/themes/Blackshade/blackshade.msstyles/blackshade.rc b/media/themes/Blackshade/blackshade.msstyles/blackshade.rc
index cc2fbe0ef80..8aaff97d4be 100644
--- a/media/themes/Blackshade/blackshade.msstyles/blackshade.rc
+++ b/media/themes/Blackshade/blackshade.msstyles/blackshade.rc
@@ -181,6 +181,7 @@ NORMAL_IE_PERSONALBARMENU_BMP BITMAP "bitmaps/dummy.bmp"
NORMAL_NORMALGROUPCOLLAPSE_BMP BITMAP "bitmaps/dummy.bmp"
NORMAL_NORMALGROUPEXPAND_BMP BITMAP "bitmaps/dummy.bmp"
+/* UTF-8 */
#pragma code_page(65001)
#ifdef LANGUAGE_DE_DE
diff --git a/media/themes/Lautus/lautus.msstyles/lautus.rc b/media/themes/Lautus/lautus.msstyles/lautus.rc
index 0a464970291..304f7a381b4 100644
--- a/media/themes/Lautus/lautus.msstyles/lautus.rc
+++ b/media/themes/Lautus/lautus.msstyles/lautus.rc
@@ -197,6 +197,7 @@ NORMAL_IE_PERSONALBARMENU_BMP BITMAP "bitmaps/dummy.bmp"
NORMAL_NORMALGROUPCOLLAPSE_BMP BITMAP "bitmaps/dummy.bmp"
NORMAL_NORMALGROUPEXPAND_BMP BITMAP "bitmaps/dummy.bmp"
+/* UTF-8 */
#pragma code_page(65001)
#ifdef LANGUAGE_CS_CZ
diff --git a/media/themes/Lunar/lunar.msstyles/lunar.rc b/media/themes/Lunar/lunar.msstyles/lunar.rc
index 1b0236bf0b2..b9a91d6bf7e 100644
--- a/media/themes/Lunar/lunar.msstyles/lunar.rc
+++ b/media/themes/Lunar/lunar.msstyles/lunar.rc
@@ -176,6 +176,7 @@ NORMAL_IE_PERSONALBARMENU_BMP BITMAP "bitmaps/dummy.bmp"
NORMAL_NORMALGROUPCOLLAPSE_BMP BITMAP "bitmaps/dummy.bmp"
NORMAL_NORMALGROUPEXPAND_BMP BITMAP "bitmaps/dummy.bmp"
+/* UTF-8 */
#pragma code_page(65001)
#ifdef LANGUAGE_CS_CZ
diff --git a/media/themes/Mizu/mizu.msstyles/mizu.rc b/media/themes/Mizu/mizu.msstyles/mizu.rc
index db738797849..1522e96bc80 100644
--- a/media/themes/Mizu/mizu.msstyles/mizu.rc
+++ b/media/themes/Mizu/mizu.msstyles/mizu.rc
@@ -183,6 +183,7 @@ NORMAL_IE_PERSONALBARMENU_BMP BITMAP "bitmaps/dummy.bmp"
NORMAL_NORMALGROUPCOLLAPSE_BMP BITMAP "bitmaps/dummy.bmp"
NORMAL_NORMALGROUPEXPAND_BMP BITMAP "bitmaps/dummy.bmp"
+/* UTF-8 */
#pragma code_page(65001)
#ifdef LANGUAGE_CS_CZ
diff --git a/media/themes/Modern/modern.msstyles/modern.rc b/media/themes/Modern/modern.msstyles/modern.rc
index 166a8d8b617..d065c17ef91 100644
--- a/media/themes/Modern/modern.msstyles/modern.rc
+++ b/media/themes/Modern/modern.msstyles/modern.rc
@@ -406,8 +406,9 @@ DARK_TREEEXPANDCOLLAPSE15_BMP BITMAP "bitmaps/Dark/DARK_TREEEXPANDCOLLAPSE15.bm
DARK_TREEEXPANDCOLLAPSE_BMP BITMAP "bitmaps/Dark/DARK_TREEEXPANDCOLLAPSE.bmp"
DARK_USERTILEBACKGROUND_BMP BITMAP "bitmaps/Dark/DARK_USERTILEBACKGROUND.bmp"
-
+/* UTF-8 */
#pragma code_page(65001)
+
#ifdef LANGUAGE_CS_CZ
#include "lang/cs-CZ.rc"
#endif
diff --git a/modules/rosapps/applications/screensavers/blankscr/lang/ro-RO.rc b/modules/rosapps/applications/screensavers/blankscr/lang/ro-RO.rc
index 3623caa0b20..282c8f56810 100644
--- a/modules/rosapps/applications/screensavers/blankscr/lang/ro-RO.rc
+++ b/modules/rosapps/applications/screensavers/blankscr/lang/ro-RO.rc
@@ -8,8 +8,6 @@
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
-#pragma code_page(65001)
-
STRINGTABLE
BEGIN
IDS_DESCRIPTION "Ecran gol (animație de inactivitate)"
diff --git a/modules/rosapps/applications/screensavers/butterflies/lang/ro-RO.rc b/modules/rosapps/applications/screensavers/butterflies/lang/ro-RO.rc
index 890fe7edc42..6b546361fbb 100644
--- a/modules/rosapps/applications/screensavers/butterflies/lang/ro-RO.rc
+++ b/modules/rosapps/applications/screensavers/butterflies/lang/ro-RO.rc
@@ -8,8 +8,6 @@
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
-#pragma code_page(65001)
-
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"
diff --git a/modules/rosapps/applications/screensavers/circles/lang/ro-RO.rc b/modules/rosapps/applications/screensavers/circles/lang/ro-RO.rc
index 3625ae6c5c7..e1c6594102c 100644
--- a/modules/rosapps/applications/screensavers/circles/lang/ro-RO.rc
+++ b/modules/rosapps/applications/screensavers/circles/lang/ro-RO.rc
@@ -8,8 +8,6 @@
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
-#pragma code_page(65001)
-
STRINGTABLE
BEGIN
IDS_DESCRIPTION "Cercuri (animație de inactivitate)"
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/bg-BG.rc b/modules/rosapps/applications/screensavers/matrix/lang/bg-BG.rc
index 94e6aacbf6a..327a8388f79 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/bg-BG.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/bg-BG.rc
@@ -1,4 +1,3 @@
-#include "resource.h"
LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/de-DE.rc b/modules/rosapps/applications/screensavers/matrix/lang/de-DE.rc
index 4bf36de9311..2c92fafddd2 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/de-DE.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/de-DE.rc
@@ -1,4 +1,3 @@
-#include "resource.h"
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/en-US.rc b/modules/rosapps/applications/screensavers/matrix/lang/en-US.rc
index 817083d04b9..5af32c58a9a 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/en-US.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/en-US.rc
@@ -1,4 +1,3 @@
-#include "resource.h"
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/es-ES.rc b/modules/rosapps/applications/screensavers/matrix/lang/es-ES.rc
index 4b37d9ea12e..f9cfc3f8787 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/es-ES.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/es-ES.rc
@@ -1,4 +1,3 @@
-#include "resource.h"
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/fr-FR.rc b/modules/rosapps/applications/screensavers/matrix/lang/fr-FR.rc
index 621077c0e32..a2cf1e65434 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/fr-FR.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/fr-FR.rc
@@ -1,4 +1,3 @@
-#include "resource.h"
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/lt-LT.rc b/modules/rosapps/applications/screensavers/matrix/lang/lt-LT.rc
index 37c1f7bc63c..f8accdce481 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/lt-LT.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/lt-LT.rc
@@ -7,8 +7,6 @@
* DATE: 2007-12-02
*/
-#include "resource.h"
-
LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
IDD_CONFIG DIALOGEX 0, 0, 340, 183
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/nl-NL.rc b/modules/rosapps/applications/screensavers/matrix/lang/nl-NL.rc
index 9e2eb627543..bec66a70bf9 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/nl-NL.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/nl-NL.rc
@@ -1,4 +1,3 @@
-#include "resource.h"
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/no-NO.rc b/modules/rosapps/applications/screensavers/matrix/lang/no-NO.rc
index ae9c9f9c74b..41b3a1e8c80 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/no-NO.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/no-NO.rc
@@ -1,4 +1,3 @@
-#include "resource.h"
LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/pl-PL.rc b/modules/rosapps/applications/screensavers/matrix/lang/pl-PL.rc
index c7bfc2bdf16..860c44d3570 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/pl-PL.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/pl-PL.rc
@@ -1,5 +1,3 @@
-#include "resource.h"
-
/*
* translated by Caemyr - Olaf Siejka (Feb, 2008)
* Use ReactOS forum PM or IRC to contact me
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/ro-RO.rc b/modules/rosapps/applications/screensavers/matrix/lang/ro-RO.rc
index 5c5b0e65fbd..6310bcd183d 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/ro-RO.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/ro-RO.rc
@@ -6,12 +6,8 @@
* Copyright 2023-2024 Andrei Miloiu <miloiuandrei(a)gmail.com>
*/
-#include "resource.h"
-
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
-#pragma code_page(65001)
-
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"
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/ru-RU.rc b/modules/rosapps/applications/screensavers/matrix/lang/ru-RU.rc
index e0223244c53..d2f3b22d712 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/ru-RU.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/ru-RU.rc
@@ -6,8 +6,6 @@
* TRANSLATOR: Sergey Stopkin
*/
-#include "resource.h"
-
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
IDD_CONFIG DIALOGEX 0, 0, 340, 183
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/sk-SK.rc b/modules/rosapps/applications/screensavers/matrix/lang/sk-SK.rc
index 548bf67ee80..533fae27221 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/sk-SK.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/sk-SK.rc
@@ -6,8 +6,6 @@
* DATE OF TR: 25-07-2007
*/
-#include "resource.h"
-
LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
IDD_CONFIG DIALOGEX 0, 0, 340, 183
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/th-TH.rc b/modules/rosapps/applications/screensavers/matrix/lang/th-TH.rc
index e81e5ef0c9e..2d2e243bb76 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/th-TH.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/th-TH.rc
@@ -1,4 +1,3 @@
-#include "resource.h"
LANGUAGE LANG_THAI, SUBLANG_DEFAULT
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/tr-TR.rc b/modules/rosapps/applications/screensavers/matrix/lang/tr-TR.rc
index 9a302849061..ef95c6c0e4f 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/tr-TR.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/tr-TR.rc
@@ -5,8 +5,6 @@
* TRANSLATOR: Copyright 2022 Süleyman Poyraz <zaryob.dev(a)gmail.com>
*/
-#include "resource.h"
-
LANGUAGE LANG_TURKISH, SUBLANG_NEUTRAL
IDD_CONFIG DIALOGEX 0, 0, 340, 183
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/uk-UA.rc b/modules/rosapps/applications/screensavers/matrix/lang/uk-UA.rc
index ce9bc2ea986..b251f752599 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/uk-UA.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/uk-UA.rc
@@ -6,8 +6,6 @@
* TRANSLATOR: Artem Reznikov
*/
-#include "resource.h"
-
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
IDD_CONFIG DIALOGEX 0, 0, 340, 183
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/zh-CN.rc b/modules/rosapps/applications/screensavers/matrix/lang/zh-CN.rc
index 4e3eb9b280c..2ac9bc5f878 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/zh-CN.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/zh-CN.rc
@@ -1,7 +1,5 @@
/* Simplified Chinese translation by Henry Tang Ih 2015 (henrytang2(a)hotmail.com) */
-#include "resource.h"
-
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
IDD_CONFIG DIALOGEX 0, 0, 340, 183
diff --git a/modules/rosapps/applications/screensavers/matrix/lang/zh-HK.rc b/modules/rosapps/applications/screensavers/matrix/lang/zh-HK.rc
index 97c95dd45cf..037f4c94f4b 100644
--- a/modules/rosapps/applications/screensavers/matrix/lang/zh-HK.rc
+++ b/modules/rosapps/applications/screensavers/matrix/lang/zh-HK.rc
@@ -5,8 +5,6 @@
* TRANSLATORS: Copyright 2021 Chan Chilung <eason066(a)gmail.com>
*/
-#include "resource.h"
... 382 lines suppressed ...
3 months, 1 week
- 1
- 0
[reactos] 01/02: Merry Christmas time!
by Hermès Bélusca-Maïto
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=40f360445be03ff99f7d7…
commit 40f360445be03ff99f7d7eddb2be79c0d8d2a752
Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Sun Dec 22 18:38:34 2024 +0100
Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Sun Dec 22 18:38:34 2024 +0100
Merry Christmas time!
---
ntoskrnl/inbv/bootanim.c | 2 +-
ntoskrnl/inbv/bootanim.rc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ntoskrnl/inbv/bootanim.c b/ntoskrnl/inbv/bootanim.c
index bd93399ae59..e9fa08c51c8 100644
--- a/ntoskrnl/inbv/bootanim.c
+++ b/ntoskrnl/inbv/bootanim.c
@@ -32,7 +32,7 @@
* Enable this define for having fancy features
* in the boot and shutdown screens.
*/
-// #define REACTOS_FANCY_BOOT
+#define REACTOS_FANCY_BOOT
/*
* BitBltAligned() alignments
diff --git a/ntoskrnl/inbv/bootanim.rc b/ntoskrnl/inbv/bootanim.rc
index 202ba1088e2..df453891e47 100644
--- a/ntoskrnl/inbv/bootanim.rc
+++ b/ntoskrnl/inbv/bootanim.rc
@@ -23,7 +23,7 @@ IDB_SERVER_HEADER BITMAP "inbv/resources/hserver.bmp"
IDB_SERVER_FOOTER BITMAP "inbv/resources/fserver.bmp"
/* ReactOS additions */
-//IDB_LOGO_XMAS BITMAP "inbv/resources/logo_xmas.bmp"
+IDB_LOGO_XMAS BITMAP "inbv/resources/logo_xmas.bmp"
IDB_ROTATING_LINE BITMAP "inbv/resources/line.bmp"
IDB_PROGRESS_BAR BITMAP "inbv/resources/progress.bmp"
IDB_COPYRIGHT BITMAP "inbv/resources/copyright.bmp"
3 months, 1 week
- 1
- 0
[reactos] 01/01: [BASE][DLL][ROSAPPS][SCREENSAVERS] Remove deprecated legacy Win16 resource attributes (#7567)
by Hermès Bélusca-Maïto
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c544a5552892b6312e51…
commit 9c544a5552892b6312e51b4ba95e4afee0ed9406
Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Tue Dec 27 20:17:31 2022 +0100
Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
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,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 <aleksey(a)reactos.org>"
@@ -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 <aleksey(a)reactos.org>"
@@ -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 <aleksey(a)reactos.org>"
@@ -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 <aleksey(a)reactos.org>"
@@ -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 <aleksey(a)reactos.org>"
@@ -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 <aleksey(a)reactos.org>"
@@ -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 <aleksey(a)reactos.org>"
@@ -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 <aleksey(a)reactos.org>"
@@ -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 "Консольный Диспетчер задач от Алексея Брагина <aleksey(a)reactos.org>"
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 <aleksey(a)reactos.org>"
@@ -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 <aleksey(a)reactos.org> 開發"
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 ...
3 months, 1 week
- 1
- 0
[reactos] 01/01: [LSALIB][SECURE32][LSASRV] Improve the check for trusted/untrusted callers
by Eric Kohl
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ae7e375a4d5d907411317…
commit ae7e375a4d5d9074113172e3edede7c1759746a9
Author: Eric Kohl <eric.kohl(a)reactos.org>
AuthorDate: Sun Dec 22 11:15:37 2024 +0100
Commit: Eric Kohl <eric.kohl(a)reactos.org>
CommitDate: Sun Dec 22 11:15:37 2024 +0100
[LSALIB][SECURE32][LSASRV] Improve the check for trusted/untrusted callers
- A caller of LsaRegisterLogonProcess is a trusted caller if the calling process has got the Tcb privilege, otherwise it is an untrusted caller.
- A caller of LsaConnectUntrusted is always an untrusted caller.
- A caller of LsapOpenLsaPort is always a trusted caller.
---
dll/win32/lsasrv/authport.c | 20 +++++++++++++++++---
dll/win32/secur32/lsalpc.c | 4 ++--
sdk/include/reactos/subsys/lsass/lsass.h | 8 +++++++-
sdk/lib/lsalib/lsa.c | 1 +
4 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/dll/win32/lsasrv/authport.c b/dll/win32/lsasrv/authport.c
index e8140c0930f..f15faecbde1 100644
--- a/dll/win32/lsasrv/authport.c
+++ b/dll/win32/lsasrv/authport.c
@@ -135,10 +135,24 @@ LsapCheckLogonProcess(PLSA_API_MSG RequestMsg,
TRACE("New LogonContext: %p\n", Context);
Context->ClientProcessHandle = ProcessHandle;
- Context->TrustedCaller = RequestMsg->ConnectInfo.TrustedCaller;
- if (Context->TrustedCaller)
- Context->TrustedCaller = LsapIsTrustedClient(ProcessHandle);
+ switch (RequestMsg->ConnectInfo.TrustedCaller)
+ {
+ case NO:
+ Context->TrustedCaller = FALSE;
+ break;
+
+ case YES:
+ Context->TrustedCaller = TRUE;
+ break;
+
+ case CHECK:
+ default:
+ Context->TrustedCaller = LsapIsTrustedClient(ProcessHandle);
+ break;
+ }
+
+ TRACE("TrustedCaller: %u\n", Context->TrustedCaller);
*LogonContext = Context;
diff --git a/dll/win32/secur32/lsalpc.c b/dll/win32/secur32/lsalpc.c
index 131538103c3..1103e6f6f6b 100644
--- a/dll/win32/secur32/lsalpc.c
+++ b/dll/win32/secur32/lsalpc.c
@@ -74,7 +74,7 @@ LsapOpenLsaPort(VOID)
sizeof(ConnectInfo));
ConnectInfo.CreateContext = FALSE;
- ConnectInfo.TrustedCaller = TRUE;
+ ConnectInfo.TrustedCaller = YES;
ConnectInfoLength = sizeof(LSA_CONNECTION_INFO);
Status = NtConnectPort(&LsaPortHandle,
@@ -175,7 +175,7 @@ LsaConnectUntrusted(
ConnectInfoLength);
ConnectInfo.CreateContext = TRUE;
- ConnectInfo.TrustedCaller = FALSE;
+ ConnectInfo.TrustedCaller = NO;
Status = NtConnectPort(LsaHandle,
&PortName,
diff --git a/sdk/include/reactos/subsys/lsass/lsass.h b/sdk/include/reactos/subsys/lsass/lsass.h
index 5522b0ef85f..ad2df3ee2d9 100644
--- a/sdk/include/reactos/subsys/lsass/lsass.h
+++ b/sdk/include/reactos/subsys/lsass/lsass.h
@@ -27,6 +27,12 @@ typedef enum _LSA_API_NUMBER
LSASS_REQUEST_MAXIMUM
} LSA_API_NUMBER, *PLSA_API_NUMBER;
+typedef enum _LSA_TRUSTED_CALLER
+{
+ NO,
+ YES,
+ CHECK
+} LSA_TRUSTED_CALLER;
typedef struct _LSA_CONNECTION_INFO
{
@@ -35,7 +41,7 @@ typedef struct _LSA_CONNECTION_INFO
ULONG Length;
CHAR LogonProcessNameBuffer[LSASS_MAX_LOGON_PROCESS_NAME_LENGTH + 1];
BOOL CreateContext;
- BOOL TrustedCaller;
+ LSA_TRUSTED_CALLER TrustedCaller;
} LSA_CONNECTION_INFO, *PLSA_CONNECTION_INFO;
diff --git a/sdk/lib/lsalib/lsa.c b/sdk/lib/lsalib/lsa.c
index 95a02f41cd7..321797e066b 100644
--- a/sdk/lib/lsalib/lsa.c
+++ b/sdk/lib/lsalib/lsa.c
@@ -317,6 +317,7 @@ LsaRegisterLogonProcess(IN PLSA_STRING LogonProcessName,
ConnectInfo.Length = LogonProcessName->Length;
ConnectInfo.LogonProcessNameBuffer[ConnectInfo.Length] = ANSI_NULL;
ConnectInfo.CreateContext = TRUE;
+ ConnectInfo.TrustedCaller = CHECK;
Status = ZwConnectPort(LsaHandle,
&PortName,
3 months, 1 week
- 1
- 0
[reactos] 01/01: [WIN32K:NTUSER] Check for NULL desktop window in co_IntProcessMouseMessage
by Timo Kreuzer
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2d4c0b87b1eccecbdd220…
commit 2d4c0b87b1eccecbdd220ef9dea6512bbeb2fcd8
Author: Timo Kreuzer <timo.kreuzer(a)reactos.org>
AuthorDate: Tue Dec 10 17:26:00 2024 +0200
Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org>
CommitDate: Sun Dec 22 10:19:01 2024 +0200
[WIN32K:NTUSER] Check for NULL desktop window in co_IntProcessMouseMessage
---
win32ss/user/ntuser/msgqueue.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/win32ss/user/ntuser/msgqueue.c b/win32ss/user/ntuser/msgqueue.c
index 3a8b60704ff..13a3a106d7d 100644
--- a/win32ss/user/ntuser/msgqueue.c
+++ b/win32ss/user/ntuser/msgqueue.c
@@ -1487,6 +1487,12 @@ BOOL co_IntProcessMouseMessage(MSG* msg, BOOL* RemoveMessages, BOOL* NotForUs, L
pti = PsGetCurrentThreadWin32Thread();
pwndDesktop = UserGetDesktopWindow();
+ if (pwndDesktop == NULL)
+ {
+ ERR("No desktop window!\n");
+ return FALSE;
+ }
+
MessageQueue = pti->MessageQueue;
CurInfo = IntGetSysCursorInfo();
pwndMsg = ValidateHwndNoErr(msg->hwnd);
@@ -2001,7 +2007,7 @@ co_MsqPeekHardwareMessage(IN PTHREADINFO pti,
UpdateKeyStateFromMsg(MessageQueue, &msg);
AcceptMessage = co_IntProcessHardwareMessage(&msg, &Remove, &NotForUs, ExtraInfo, MsgFilterLow, MsgFilterHigh);
-
+
if (!NotForUs && (MsgFilterLow != 0 || MsgFilterHigh != 0))
{
/* Don't return message if not in range */
3 months, 1 week
- 1
- 0
[reactos] 01/01: [WKSSVC] Simplify NetrWkstaSetInfo
by Eric Kohl
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=216196a10d90b154f9f1c…
commit 216196a10d90b154f9f1c45001e1e25601c4b79b
Author: Eric Kohl <eric.kohl(a)reactos.org>
AuthorDate: Sat Dec 21 16:19:14 2024 +0100
Commit: Eric Kohl <eric.kohl(a)reactos.org>
CommitDate: Sat Dec 21 16:19:14 2024 +0100
[WKSSVC] Simplify NetrWkstaSetInfo
---
base/services/wkssvc/rpcserver.c | 78 ++++++++++++++++++++++------------------
1 file changed, 43 insertions(+), 35 deletions(-)
diff --git a/base/services/wkssvc/rpcserver.c b/base/services/wkssvc/rpcserver.c
index 703e35e6935..5088b48f6e9 100644
--- a/base/services/wkssvc/rpcserver.c
+++ b/base/services/wkssvc/rpcserver.c
@@ -243,6 +243,7 @@ NetrWkstaSetInfo(
LPWKSTA_INFO WkstaInfo,
unsigned long *ErrorParameter)
{
+ DWORD dwErrParam = 0;
DWORD dwResult = NERR_Success;
TRACE("NetrWkstaSetInfo(%lu %p %p)\n",
@@ -254,45 +255,50 @@ NetrWkstaSetInfo(
if (WkstaInfo->WkstaInfo502.wki502_keep_conn >= 1 && WkstaInfo->WkstaInfo502.wki502_keep_conn <= 65535)
{
WkstaInfo502.wki502_keep_conn = WkstaInfo->WkstaInfo502.wki502_keep_conn;
+ }
+ else
+ {
+ dwErrParam = WKSTA_KEEPCONN_PARMNUM;
+ dwResult = ERROR_INVALID_PARAMETER;
+ }
+ if (dwResult == NERR_Success)
+ {
if (WkstaInfo->WkstaInfo502.wki502_max_cmds >= 50 && WkstaInfo->WkstaInfo502.wki502_max_cmds <= 65535)
{
WkstaInfo502.wki502_max_cmds = WkstaInfo->WkstaInfo502.wki502_max_cmds;
+ }
+ else
+ {
+ dwErrParam = WKSTA_MAXCMDS_PARMNUM;
+ dwResult = ERROR_INVALID_PARAMETER;
+ }
+ }
- if (WkstaInfo->WkstaInfo502.wki502_sess_timeout >= 60 && WkstaInfo->WkstaInfo502.wki502_sess_timeout <= 65535)
- {
- WkstaInfo502.wki502_sess_timeout = WkstaInfo->WkstaInfo502.wki502_sess_timeout;
-
- if (WkstaInfo->WkstaInfo502.wki502_dormant_file_limit != 0)
- {
- WkstaInfo502.wki502_dormant_file_limit = WkstaInfo->WkstaInfo502.wki502_dormant_file_limit;
- }
- else
- {
- if (ErrorParameter)
- *ErrorParameter = WKSTA_DORMANTFILELIMIT_PARMNUM;
- dwResult = ERROR_INVALID_PARAMETER;
- }
- }
- else
- {
- if (ErrorParameter)
- *ErrorParameter = WKSTA_SESSTIMEOUT_PARMNUM;
- dwResult = ERROR_INVALID_PARAMETER;
- }
+ if (dwResult == NERR_Success)
+ {
+ if (WkstaInfo->WkstaInfo502.wki502_sess_timeout >= 60 && WkstaInfo->WkstaInfo502.wki502_sess_timeout <= 65535)
+ {
+ WkstaInfo502.wki502_sess_timeout = WkstaInfo->WkstaInfo502.wki502_sess_timeout;
}
else
{
- if (ErrorParameter)
- *ErrorParameter = WKSTA_MAXCMDS_PARMNUM;
+ dwErrParam = WKSTA_SESSTIMEOUT_PARMNUM;
dwResult = ERROR_INVALID_PARAMETER;
}
}
- else
+
+ if (dwResult == NERR_Success)
{
- if (ErrorParameter)
- *ErrorParameter = WKSTA_KEEPCONN_PARMNUM;
- dwResult = ERROR_INVALID_PARAMETER;
+ if (WkstaInfo->WkstaInfo502.wki502_dormant_file_limit != 0)
+ {
+ WkstaInfo502.wki502_dormant_file_limit = WkstaInfo->WkstaInfo502.wki502_dormant_file_limit;
+ }
+ else
+ {
+ dwErrParam = WKSTA_DORMANTFILELIMIT_PARMNUM;
+ dwResult = ERROR_INVALID_PARAMETER;
+ }
}
break;
@@ -303,8 +309,7 @@ NetrWkstaSetInfo(
}
else
{
- if (ErrorParameter)
- *ErrorParameter = WKSTA_KEEPCONN_PARMNUM;
+ dwErrParam = WKSTA_KEEPCONN_PARMNUM;
dwResult = ERROR_INVALID_PARAMETER;
}
break;
@@ -316,8 +321,7 @@ NetrWkstaSetInfo(
}
else
{
- if (ErrorParameter)
- *ErrorParameter = WKSTA_SESSTIMEOUT_PARMNUM;
+ dwErrParam = WKSTA_SESSTIMEOUT_PARMNUM;
dwResult = ERROR_INVALID_PARAMETER;
}
break;
@@ -329,23 +333,27 @@ NetrWkstaSetInfo(
}
else
{
- if (ErrorParameter)
- *ErrorParameter = WKSTA_DORMANTFILELIMIT_PARMNUM;
+ dwErrParam = WKSTA_DORMANTFILELIMIT_PARMNUM;
dwResult = ERROR_INVALID_PARAMETER;
}
break;
default:
- FIXME("Level %lu unimplemented\n", Level);
+ ERR("Invalid Level %lu\n", Level);
dwResult = ERROR_INVALID_LEVEL;
break;
}
/* Save the workstation in the registry */
if (dwResult == NERR_Success)
+ {
SaveWorkstationInfo(Level);
- /* FIXME: Notify the redirector */
+ /* FIXME: Notify the redirector */
+ }
+
+ if ((dwResult == ERROR_INVALID_PARAMETER) && (ErrorParameter != NULL))
+ *ErrorParameter = dwErrParam;
return dwResult;
}
3 months, 1 week
- 1
- 0
[reactos] 01/01: [WKSSVC] InitWorkstationInfo: Set data size before retrieving registry values
by Eric Kohl
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f06c4dcc6bd015d966cb0…
commit f06c4dcc6bd015d966cb0800a532319092124319
Author: Eric Kohl <eric.kohl(a)reactos.org>
AuthorDate: Sat Dec 21 15:28:43 2024 +0100
Commit: Eric Kohl <eric.kohl(a)reactos.org>
CommitDate: Sat Dec 21 15:28:43 2024 +0100
[WKSSVC] InitWorkstationInfo: Set data size before retrieving registry values
---
base/services/wkssvc/info.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/base/services/wkssvc/info.c b/base/services/wkssvc/info.c
index 98e90256ecd..e596ffe529c 100644
--- a/base/services/wkssvc/info.c
+++ b/base/services/wkssvc/info.c
@@ -326,6 +326,7 @@ InitWorkstationInfo(VOID)
else
WkstaInfo502.wki502_use_unlock_behind = 1;
+ dwSize = sizeof(dwValue);
dwError = RegQueryValueExW(hInfoKey,
L"UseCloseBehind",
0,
@@ -337,6 +338,7 @@ InitWorkstationInfo(VOID)
else
WkstaInfo502.wki502_use_close_behind = 1;
+ dwSize = sizeof(dwValue);
dwError = RegQueryValueExW(hInfoKey,
L"BufNamedPipes",
0,
@@ -348,6 +350,7 @@ InitWorkstationInfo(VOID)
else
WkstaInfo502.wki502_buf_named_pipes = 1;
+ dwSize = sizeof(dwValue);
dwError = RegQueryValueExW(hInfoKey,
L"UseLockReadUnlock",
0,
@@ -359,6 +362,7 @@ InitWorkstationInfo(VOID)
else
WkstaInfo502.wki502_use_lock_read_unlock = 1;
+ dwSize = sizeof(dwValue);
dwError = RegQueryValueExW(hInfoKey,
L"UtilizeNtCaching",
0,
@@ -370,6 +374,7 @@ InitWorkstationInfo(VOID)
else
WkstaInfo502.wki502_utilize_nt_caching = 1;
+ dwSize = sizeof(dwValue);
dwError = RegQueryValueExW(hInfoKey,
L"UseRawRead",
0,
@@ -381,6 +386,7 @@ InitWorkstationInfo(VOID)
else
WkstaInfo502.wki502_use_raw_read = 1;
+ dwSize = sizeof(dwValue);
dwError = RegQueryValueExW(hInfoKey,
L"UseRawWrite",
0,
@@ -392,6 +398,7 @@ InitWorkstationInfo(VOID)
else
WkstaInfo502.wki502_use_raw_write = 1;
+ dwSize = sizeof(dwValue);
dwError = RegQueryValueExW(hInfoKey,
L"UseWriteRawData",
0,
@@ -403,6 +410,7 @@ InitWorkstationInfo(VOID)
else
WkstaInfo502.wki502_use_write_raw_data = 0;
+ dwSize = sizeof(dwValue);
dwError = RegQueryValueExW(hInfoKey,
L"UseEncryption",
0,
@@ -414,6 +422,7 @@ InitWorkstationInfo(VOID)
else
WkstaInfo502.wki502_use_encryption = 1;
+ dwSize = sizeof(dwValue);
dwError = RegQueryValueExW(hInfoKey,
L"BufFilesDenyWrite",
0,
@@ -425,6 +434,7 @@ InitWorkstationInfo(VOID)
else
WkstaInfo502.wki502_buf_files_deny_write = 0;
+ dwSize = sizeof(dwValue);
dwError = RegQueryValueExW(hInfoKey,
L"BufReadOnlyFiles",
0,
@@ -436,6 +446,7 @@ InitWorkstationInfo(VOID)
else
WkstaInfo502.wki502_buf_read_only_files = 0;
+ dwSize = sizeof(dwValue);
dwError = RegQueryValueExW(hInfoKey,
L"ForceCoreCreateMode",
0,
@@ -447,6 +458,7 @@ InitWorkstationInfo(VOID)
else
WkstaInfo502.wki502_force_core_create_mode = 0;
+ dwSize = sizeof(dwValue);
dwError = RegQueryValueExW(hInfoKey,
L"Use512ByteMaxTransfer",
0,
3 months, 1 week
- 1
- 0