https://git.reactos.org/?p=reactos.git;a=commitdiff;h=abece16776ff3f1bb959c…
commit abece16776ff3f1bb959cb837f899fde8c4f5451
Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Thu Mar 9 00:13:48 2023 +0100
Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Thu Mar 9 00:13:59 2023 +0100
[WORDPAD][WRITE] Remove redundant pragma code_page(65001)...
... since this is done in the main RC file, from which the per-language
resource files are included.
---
base/applications/wordpad/lang/da-DK.rc | 2 --
base/applications/wordpad/lang/de-DE.rc | 2 --
base/applications/wordpad/lang/he-IL.rc | 3 ---
base/applications/wordpad/lang/it-IT.rc | 3 ---
base/applications/wordpad/lang/ja-JP.rc | 3 ---
base/applications/wordpad/lang/lt-LT.rc | 3 ---
base/applications/wordpad/lang/nl-NL.rc | 2 --
base/applications/wordpad/lang/no-NO.rc | 2 --
base/applications/wordpad/lang/pt-BR.rc | 2 --
base/applications/wordpad/lang/pt-PT.rc | 2 --
base/applications/wordpad/lang/ro-RO.rc | 2 --
base/applications/wordpad/lang/ru-RU.rc | 3 ---
base/applications/wordpad/lang/sl-SI.rc | 2 --
base/applications/wordpad/lang/sv-SE.rc | 2 --
base/applications/wordpad/lang/uk-UA.rc | 3 ---
base/applications/wordpad/lang/zh-CN.rc | 3 ---
base/applications/wordpad/lang/zh-TW.rc | 3 ---
base/applications/wordpad/rsrc.rc | 5 ++---
base/applications/write/lang/Bg.rc | 6 ------
base/applications/write/lang/De.rc | 2 --
base/applications/write/lang/Es.rc | 4 ----
base/applications/write/lang/Fr.rc | 2 --
base/applications/write/lang/It.rc | 3 ---
base/applications/write/lang/Ja.rc | 3 ---
base/applications/write/lang/Lt.rc | 3 ---
base/applications/write/lang/Ro.rc | 2 --
base/applications/write/lang/Ru.rc | 3 ---
base/applications/write/lang/Si.rc | 2 --
base/applications/write/lang/Sr.rc | 2 --
base/applications/write/lang/Uk.rc | 3 ---
base/applications/write/lang/Zh.rc | 3 ---
31 files changed, 2 insertions(+), 83 deletions(-)
diff --git a/base/applications/wordpad/lang/da-DK.rc
b/base/applications/wordpad/lang/da-DK.rc
index daf4ad2f438..4e40e9d991e 100644
--- a/base/applications/wordpad/lang/da-DK.rc
+++ b/base/applications/wordpad/lang/da-DK.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
IDM_MAINMENU MENU
diff --git a/base/applications/wordpad/lang/de-DE.rc
b/base/applications/wordpad/lang/de-DE.rc
index e31704a7d0e..9e256966672 100644
--- a/base/applications/wordpad/lang/de-DE.rc
+++ b/base/applications/wordpad/lang/de-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
IDM_MAINMENU MENU
diff --git a/base/applications/wordpad/lang/he-IL.rc
b/base/applications/wordpad/lang/he-IL.rc
index aed29115643..bffa05fbad2 100644
--- a/base/applications/wordpad/lang/he-IL.rc
+++ b/base/applications/wordpad/lang/he-IL.rc
@@ -18,9 +18,6 @@
* Translated by Baruch Rutman 2013
*/
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
IDM_MAINMENU MENU
diff --git a/base/applications/wordpad/lang/it-IT.rc
b/base/applications/wordpad/lang/it-IT.rc
index 942e02e5dac..bba8b0a008b 100644
--- a/base/applications/wordpad/lang/it-IT.rc
+++ b/base/applications/wordpad/lang/it-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
IDM_MAINMENU MENU
diff --git a/base/applications/wordpad/lang/ja-JP.rc
b/base/applications/wordpad/lang/ja-JP.rc
index 83932cb6837..d3e675e8874 100644
--- a/base/applications/wordpad/lang/ja-JP.rc
+++ b/base/applications/wordpad/lang/ja-JP.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
IDM_MAINMENU MENU
diff --git a/base/applications/wordpad/lang/lt-LT.rc
b/base/applications/wordpad/lang/lt-LT.rc
index e56a581857d..42facf9a258 100644
--- a/base/applications/wordpad/lang/lt-LT.rc
+++ b/base/applications/wordpad/lang/lt-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
IDM_MAINMENU MENU
diff --git a/base/applications/wordpad/lang/nl-NL.rc
b/base/applications/wordpad/lang/nl-NL.rc
index 5bf953c2c3e..7421f5f9f4e 100644
--- a/base/applications/wordpad/lang/nl-NL.rc
+++ b/base/applications/wordpad/lang/nl-NL.rc
@@ -17,8 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
IDM_MAINMENU MENU
diff --git a/base/applications/wordpad/lang/no-NO.rc
b/base/applications/wordpad/lang/no-NO.rc
index a764d952616..5d03829ac4f 100644
--- a/base/applications/wordpad/lang/no-NO.rc
+++ b/base/applications/wordpad/lang/no-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
IDM_MAINMENU MENU
diff --git a/base/applications/wordpad/lang/pt-BR.rc
b/base/applications/wordpad/lang/pt-BR.rc
index cb7a8c8a30f..c14518bafa0 100644
--- a/base/applications/wordpad/lang/pt-BR.rc
+++ b/base/applications/wordpad/lang/pt-BR.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
IDM_MAINMENU MENU
diff --git a/base/applications/wordpad/lang/pt-PT.rc
b/base/applications/wordpad/lang/pt-PT.rc
index c8fcf23fe29..6a5e42e1558 100644
--- a/base/applications/wordpad/lang/pt-PT.rc
+++ b/base/applications/wordpad/lang/pt-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
IDM_MAINMENU MENU
diff --git a/base/applications/wordpad/lang/ro-RO.rc
b/base/applications/wordpad/lang/ro-RO.rc
index d76e7728ef3..d8f35872429 100644
--- a/base/applications/wordpad/lang/ro-RO.rc
+++ b/base/applications/wordpad/lang/ro-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
IDM_MAINMENU MENU
diff --git a/base/applications/wordpad/lang/ru-RU.rc
b/base/applications/wordpad/lang/ru-RU.rc
index 682aa5e59bc..2c1ad795b5f 100644
--- a/base/applications/wordpad/lang/ru-RU.rc
+++ b/base/applications/wordpad/lang/ru-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
IDM_MAINMENU MENU
diff --git a/base/applications/wordpad/lang/sl-SI.rc
b/base/applications/wordpad/lang/sl-SI.rc
index 30b0d5d2ea3..d5cf804d7ee 100644
--- a/base/applications/wordpad/lang/sl-SI.rc
+++ b/base/applications/wordpad/lang/sl-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
IDM_MAINMENU MENU
diff --git a/base/applications/wordpad/lang/sv-SE.rc
b/base/applications/wordpad/lang/sv-SE.rc
index 198eb9aac4a..0fe176926a7 100644
--- a/base/applications/wordpad/lang/sv-SE.rc
+++ b/base/applications/wordpad/lang/sv-SE.rc
@@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#pragma code_page(65001)
-
LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
IDM_MAINMENU MENU
diff --git a/base/applications/wordpad/lang/uk-UA.rc
b/base/applications/wordpad/lang/uk-UA.rc
index 399c552c1c0..ecdc3338ad2 100644
--- a/base/applications/wordpad/lang/uk-UA.rc
+++ b/base/applications/wordpad/lang/uk-UA.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
IDM_MAINMENU MENU
diff --git a/base/applications/wordpad/lang/zh-CN.rc
b/base/applications/wordpad/lang/zh-CN.rc
index 007e06ced05..928962ce70a 100644
--- a/base/applications/wordpad/lang/zh-CN.rc
+++ b/base/applications/wordpad/lang/zh-CN.rc
@@ -20,9 +20,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
IDM_MAINMENU MENU
diff --git a/base/applications/wordpad/lang/zh-TW.rc
b/base/applications/wordpad/lang/zh-TW.rc
index 6f95571306a..b4491dae6b3 100644
--- a/base/applications/wordpad/lang/zh-TW.rc
+++ b/base/applications/wordpad/lang/zh-TW.rc
@@ -20,9 +20,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_TRADITIONAL
IDM_MAINMENU MENU
diff --git a/base/applications/wordpad/rsrc.rc b/base/applications/wordpad/rsrc.rc
index 42bd9eb4d31..56d20b73f5d 100644
--- a/base/applications/wordpad/rsrc.rc
+++ b/base/applications/wordpad/rsrc.rc
@@ -25,9 +25,10 @@
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS WordPad"
#define REACTOS_STR_INTERNAL_NAME "wordpad"
#define REACTOS_STR_ORIGINAL_FILENAME "wordpad.exe"
-
#include <reactos/version.rc>
+#include <reactos/manifest_exe.rc>
+
MAINACCELTABLE ACCELERATORS
BEGIN
"1", ID_BACK_1, VIRTKEY, CONTROL
@@ -67,8 +68,6 @@ IDI_RTFDOC ICON "res/document.ico"
/* @makedep: zoom.cur */
IDC_ZOOM CURSOR "res/zoom.cur"
-#include <reactos/manifest_exe.rc>
-
/* UTF-8 */
#pragma code_page(65001)
diff --git a/base/applications/write/lang/Bg.rc b/base/applications/write/lang/Bg.rc
index d89914cde38..23dcd6a95dd 100644
--- a/base/applications/write/lang/Bg.rc
+++ b/base/applications/write/lang/Bg.rc
@@ -22,14 +22,8 @@
/*
https://reactos.org/wiki/Bulgarian_translation */
/* LOCATION: \base\applications\write\lang */
-/* WARNING */
-/* Do NOT save this file with BOM */
-
#include "resources.h"
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/base/applications/write/lang/De.rc b/base/applications/write/lang/De.rc
index db175a02d56..a9535767bb6 100644
--- a/base/applications/write/lang/De.rc
+++ b/base/applications/write/lang/De.rc
@@ -19,8 +19,6 @@
#include "resources.h"
-#pragma code_page(65001)
-
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/base/applications/write/lang/Es.rc b/base/applications/write/lang/Es.rc
index 5c44eb9a5dc..9d97e2515f0 100644
--- a/base/applications/write/lang/Es.rc
+++ b/base/applications/write/lang/Es.rc
@@ -21,10 +21,6 @@
#include "resources.h"
-/*UTF-8*/
-#pragma code_page(65001)
-
-
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/base/applications/write/lang/Fr.rc b/base/applications/write/lang/Fr.rc
index a81dffda827..32acf284e71 100644
--- a/base/applications/write/lang/Fr.rc
+++ b/base/applications/write/lang/Fr.rc
@@ -20,8 +20,6 @@
#include "resources.h"
-#pragma code_page(65001)
-
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/base/applications/write/lang/It.rc b/base/applications/write/lang/It.rc
index b906a7906b8..7f16693d911 100644
--- a/base/applications/write/lang/It.rc
+++ b/base/applications/write/lang/It.rc
@@ -20,9 +20,6 @@
#include "resources.h"
-/*UTF-8*/
-#pragma code_page(65001)
-
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/base/applications/write/lang/Ja.rc b/base/applications/write/lang/Ja.rc
index 5c9a8259a97..9d5b77d48d2 100644
--- a/base/applications/write/lang/Ja.rc
+++ b/base/applications/write/lang/Ja.rc
@@ -20,9 +20,6 @@
#include "resources.h"
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/base/applications/write/lang/Lt.rc b/base/applications/write/lang/Lt.rc
index 5cef934fbc7..a826252ae5a 100644
--- a/base/applications/write/lang/Lt.rc
+++ b/base/applications/write/lang/Lt.rc
@@ -20,9 +20,6 @@
#include "resources.h"
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/base/applications/write/lang/Ro.rc b/base/applications/write/lang/Ro.rc
index f6a7b65665f..354310bb838 100644
--- a/base/applications/write/lang/Ro.rc
+++ b/base/applications/write/lang/Ro.rc
@@ -21,8 +21,6 @@
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
-#pragma code_page(65001)
-
STRINGTABLE
{
IDS_FAILED, "Execuția Wordpad a eșuat"
diff --git a/base/applications/write/lang/Ru.rc b/base/applications/write/lang/Ru.rc
index 008011f2720..32c24c283b2 100644
--- a/base/applications/write/lang/Ru.rc
+++ b/base/applications/write/lang/Ru.rc
@@ -20,9 +20,6 @@
#include "resources.h"
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/base/applications/write/lang/Si.rc b/base/applications/write/lang/Si.rc
index 9d3e5fe1520..ec779d8e65f 100644
--- a/base/applications/write/lang/Si.rc
+++ b/base/applications/write/lang/Si.rc
@@ -22,8 +22,6 @@
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
-#pragma code_page(65001)
-
STRINGTABLE
{
IDS_FAILED, "Zagon programa Wordpad ni uspel"
diff --git a/base/applications/write/lang/Sr.rc b/base/applications/write/lang/Sr.rc
index da4dae9fd4f..d04173dc4c9 100644
--- a/base/applications/write/lang/Sr.rc
+++ b/base/applications/write/lang/Sr.rc
@@ -21,8 +21,6 @@
#include "resources.h"
-#pragma code_page(65001)
-
LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC
STRINGTABLE
diff --git a/base/applications/write/lang/Uk.rc b/base/applications/write/lang/Uk.rc
index f922210e0e3..b1ab0c7bead 100644
--- a/base/applications/write/lang/Uk.rc
+++ b/base/applications/write/lang/Uk.rc
@@ -22,9 +22,6 @@
#include "resources.h"
-/* UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/base/applications/write/lang/Zh.rc b/base/applications/write/lang/Zh.rc
index c14a9ac9d9f..2463f43dfb1 100644
--- a/base/applications/write/lang/Zh.rc
+++ b/base/applications/write/lang/Zh.rc
@@ -21,9 +21,6 @@
#include "resources.h"
-/* Chinese text is encoded in UTF-8 */
-#pragma code_page(65001)
-
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
STRINGTABLE