Module: wine Branch: master Commit: eaa31f33d6c837a3cfea24d3b2bfb852640d692f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaa31f33d6c837a3cfea24d3b2...
Author: Michael Stefaniuc mstefani@redhat.de Date: Thu Jul 2 00:31:53 2009 +0200
wordpad: Build language resource files separately.
Do not include them from an other rc file.
---
programs/wordpad/Da.rc | 2 ++ programs/wordpad/De.rc | 4 ++-- programs/wordpad/En.rc | 2 ++ programs/wordpad/Fr.rc | 2 ++ programs/wordpad/Hu.rc | 2 ++ programs/wordpad/Ja.rc | 4 ++-- programs/wordpad/Ko.rc | 1 + programs/wordpad/Lt.rc | 4 ++-- programs/wordpad/Makefile.in | 20 +++++++++++++++++++- programs/wordpad/Nl.rc | 2 ++ programs/wordpad/No.rc | 2 ++ programs/wordpad/Pl.rc | 2 ++ programs/wordpad/Pt.rc | 2 ++ programs/wordpad/Ru.rc | 2 ++ programs/wordpad/Si.rc | 4 ++-- programs/wordpad/Sv.rc | 4 ++-- programs/wordpad/Tr.rc | 2 ++ programs/wordpad/Zh.rc | 4 ++-- programs/wordpad/rsrc.rc | 21 --------------------- programs/wordpad/wordpad.h | 3 +++ 20 files changed, 55 insertions(+), 34 deletions(-)
diff --git a/programs/wordpad/Da.rc b/programs/wordpad/Da.rc index d09e90f..3478946 100644 --- a/programs/wordpad/Da.rc +++ b/programs/wordpad/Da.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "wordpad.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
IDM_MAINMENU MENU DISCARDABLE diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc index a2fcceb..18181b2 100644 --- a/programs/wordpad/De.rc +++ b/programs/wordpad/De.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "wordpad.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
#pragma code_page(65001) @@ -244,5 +246,3 @@ BEGIN STRING_PRINTING_NOT_IMPLEMENTED, "Drucken ist nicht implementiert" STRING_MAX_TAB_STOPS, "Es können nur maximal 32 Tabstopps definiert werden." END - -#pragma code_page(default) diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc index dd099e1..3f8070c 100644 --- a/programs/wordpad/En.rc +++ b/programs/wordpad/En.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "wordpad.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
IDM_MAINMENU MENU DISCARDABLE diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc index 72f7c70..29c7758 100644 --- a/programs/wordpad/Fr.rc +++ b/programs/wordpad/Fr.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "wordpad.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
IDM_MAINMENU MENU DISCARDABLE diff --git a/programs/wordpad/Hu.rc b/programs/wordpad/Hu.rc index 94ceda5..74926e1 100644 --- a/programs/wordpad/Hu.rc +++ b/programs/wordpad/Hu.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "wordpad.h" + LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
IDM_MAINMENU MENU DISCARDABLE diff --git a/programs/wordpad/Ja.rc b/programs/wordpad/Ja.rc index 3049d8b..fc21c5a 100644 --- a/programs/wordpad/Ja.rc +++ b/programs/wordpad/Ja.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "wordpad.h" + /* UTF-8 */ #pragma code_page(65001)
@@ -245,5 +247,3 @@ BEGIN STRING_PRINTING_NOT_IMPLEMENTED, "プリントが実装されていません。" STRING_MAX_TAB_STOPS, "32以上なタブを追加できません。" END - -#pragma code_page(default) diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index 7bfaf00..5823585 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "wordpad.h"
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
diff --git a/programs/wordpad/Lt.rc b/programs/wordpad/Lt.rc index b95017f..91fbfca 100644 --- a/programs/wordpad/Lt.rc +++ b/programs/wordpad/Lt.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "wordpad.h" + /* UTF-8 */ #pragma code_page(65001)
@@ -245,5 +247,3 @@ BEGIN STRING_PRINTING_NOT_IMPLEMENTED, "Spausdinimas nerealizuotas" STRING_MAX_TAB_STOPS, "Negalima pridėti daugiau negu 32-jų tabuliavimo pozicijų." END - -#pragma code_page(default) diff --git a/programs/wordpad/Makefile.in b/programs/wordpad/Makefile.in index 461da31..e7f5b08 100644 --- a/programs/wordpad/Makefile.in +++ b/programs/wordpad/Makefile.in @@ -14,7 +14,25 @@ C_SRCS = \ registry.c \ wordpad.c
-RC_SRCS = rsrc.rc +RC_SRCS = \ + Da.rc \ + De.rc \ + En.rc \ + Fr.rc \ + Hu.rc \ + Ja.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ru.rc \ + Si.rc \ + Sv.rc \ + Tr.rc \ + Zh.rc \ + rsrc.rc
SVG_SRCS = wordpad.svg
diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc index c91e028..c9ce64a 100644 --- a/programs/wordpad/Nl.rc +++ b/programs/wordpad/Nl.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "wordpad.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
IDM_MAINMENU MENU DISCARDABLE diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc index 6261c6f..392b9d6 100644 --- a/programs/wordpad/No.rc +++ b/programs/wordpad/No.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "wordpad.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
IDM_MAINMENU MENU DISCARDABLE diff --git a/programs/wordpad/Pl.rc b/programs/wordpad/Pl.rc index 47ff1bd..ab72104 100644 --- a/programs/wordpad/Pl.rc +++ b/programs/wordpad/Pl.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "wordpad.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
IDM_MAINMENU MENU DISCARDABLE diff --git a/programs/wordpad/Pt.rc b/programs/wordpad/Pt.rc index b246c70..f8d7df2 100644 --- a/programs/wordpad/Pt.rc +++ b/programs/wordpad/Pt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "wordpad.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
IDM_MAINMENU MENU DISCARDABLE diff --git a/programs/wordpad/Ru.rc b/programs/wordpad/Ru.rc index e437199..6428f7b 100644 --- a/programs/wordpad/Ru.rc +++ b/programs/wordpad/Ru.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "wordpad.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
IDM_MAINMENU MENU DISCARDABLE diff --git a/programs/wordpad/Si.rc b/programs/wordpad/Si.rc index 5e34958..1b6d37f 100644 --- a/programs/wordpad/Si.rc +++ b/programs/wordpad/Si.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "wordpad.h" + #pragma code_page(65001)
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -245,5 +247,3 @@ BEGIN STRING_PRINTING_NOT_IMPLEMENTED, "Tiskanje (še) ni na voljo" STRING_MAX_TAB_STOPS, "Ne morem vstaviti več kot 32 položajev tabulatorja." END - -#pragma code_page(default) diff --git a/programs/wordpad/Sv.rc b/programs/wordpad/Sv.rc index 4bb2ae2..d94e6e3 100644 --- a/programs/wordpad/Sv.rc +++ b/programs/wordpad/Sv.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "wordpad.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
#pragma code_page(65001) @@ -244,5 +246,3 @@ BEGIN STRING_PRINTING_NOT_IMPLEMENTED, "Utskrift ej implementerat." STRING_MAX_TAB_STOPS, "Kan ej lägga till mer än 32 tabbstopp." END - -#pragma code_page(default) diff --git a/programs/wordpad/Tr.rc b/programs/wordpad/Tr.rc index 7df9a36..9229037 100644 --- a/programs/wordpad/Tr.rc +++ b/programs/wordpad/Tr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "wordpad.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
IDM_MAINMENU MENU DISCARDABLE diff --git a/programs/wordpad/Zh.rc b/programs/wordpad/Zh.rc index 5c11ab7..d8ceec4 100644 --- a/programs/wordpad/Zh.rc +++ b/programs/wordpad/Zh.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "wordpad.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001)
@@ -469,5 +471,3 @@ BEGIN STRING_OPEN_FAILED, "不能開啟檔案." STRING_OPEN_ACCESS_DENIED, "你沒有開啟檔案的權力." END - -#pragma code_page(default) diff --git a/programs/wordpad/rsrc.rc b/programs/wordpad/rsrc.rc index 1400fa5..ac159da 100644 --- a/programs/wordpad/rsrc.rc +++ b/programs/wordpad/rsrc.rc @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <windef.h> -#include <winuser.h> - #include "wordpad.h"
MAINACCELTABLE ACCELERATORS @@ -63,21 +60,3 @@ IDI_WRI ICON "wri.ico"
/* @makedep: txt.ico */ IDI_TXT ICON "txt.ico" - -#include "Da.rc" -#include "De.rc" -#include "En.rc" -#include "Fr.rc" -#include "Hu.rc" -#include "Ja.rc" -#include "Ko.rc" -#include "Lt.rc" -#include "Nl.rc" -#include "No.rc" -#include "Pl.rc" -#include "Pt.rc" -#include "Ru.rc" -#include "Si.rc" -#include "Sv.rc" -#include "Tr.rc" -#include "Zh.rc" diff --git a/programs/wordpad/wordpad.h b/programs/wordpad/wordpad.h index ece183f..6d3e64a 100644 --- a/programs/wordpad/wordpad.h +++ b/programs/wordpad/wordpad.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include <windef.h> +#include <winuser.h> + #define MAX_STRING_LEN 255
#define TWIPS_PER_INCH 1440