Module: wine Branch: master Commit: 465cf35522ebf7f08433a419ffb7b05b8bd5382d URL: http://source.winehq.org/git/wine.git/?a=commit;h=465cf35522ebf7f08433a419ff...
Author: Michael Stefaniuc mstefani@redhat.de Date: Thu Jul 2 00:28:45 2009 +0200
cmdlgtst: Build language resource files separately.
Do not include them from an other rc file.
---
programs/cmdlgtst/Cs.rc | 2 ++ programs/cmdlgtst/Da.rc | 2 ++ programs/cmdlgtst/De.rc | 2 ++ programs/cmdlgtst/En.rc | 2 ++ programs/cmdlgtst/Es.rc | 2 ++ programs/cmdlgtst/Fr.rc | 2 ++ programs/cmdlgtst/It.rc | 2 ++ programs/cmdlgtst/Ja.rc | 4 ++-- programs/cmdlgtst/Ko.rc | 2 ++ programs/cmdlgtst/Lt.rc | 4 ++-- programs/cmdlgtst/Makefile.in | 21 ++++++++++++++++++++- programs/cmdlgtst/Nl.rc | 2 ++ programs/cmdlgtst/No.rc | 2 ++ programs/cmdlgtst/Pl.rc | 2 ++ programs/cmdlgtst/Pt.rc | 2 ++ programs/cmdlgtst/Ru.rc | 2 ++ programs/cmdlgtst/Si.rc | 4 ++-- programs/cmdlgtst/Sv.rc | 2 ++ programs/cmdlgtst/Tr.rc | 2 ++ programs/cmdlgtst/cmdlgr.rc | 25 ------------------------- programs/cmdlgtst/cmdlgtst.h | 4 ++++ 21 files changed, 60 insertions(+), 32 deletions(-)
diff --git a/programs/cmdlgtst/Cs.rc b/programs/cmdlgtst/Cs.rc index d6bb383..6e8ed2f 100644 --- a/programs/cmdlgtst/Cs.rc +++ b/programs/cmdlgtst/Cs.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "cmdlgtst.h" + LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
/* Czech strings in CP1250 */ diff --git a/programs/cmdlgtst/Da.rc b/programs/cmdlgtst/Da.rc index 99bd0fe..9d73888 100644 --- a/programs/cmdlgtst/Da.rc +++ b/programs/cmdlgtst/Da.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "cmdlgtst.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/De.rc b/programs/cmdlgtst/De.rc index f8e7d0e..e22f362 100644 --- a/programs/cmdlgtst/De.rc +++ b/programs/cmdlgtst/De.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "cmdlgtst.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/En.rc b/programs/cmdlgtst/En.rc index 5d73c57..839a917 100644 --- a/programs/cmdlgtst/En.rc +++ b/programs/cmdlgtst/En.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "cmdlgtst.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/Es.rc b/programs/cmdlgtst/Es.rc index 04ef2bb..94d221c 100644 --- a/programs/cmdlgtst/Es.rc +++ b/programs/cmdlgtst/Es.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "cmdlgtst.h" + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/Fr.rc b/programs/cmdlgtst/Fr.rc index 680d6a8..e782424 100644 --- a/programs/cmdlgtst/Fr.rc +++ b/programs/cmdlgtst/Fr.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "cmdlgtst.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/It.rc b/programs/cmdlgtst/It.rc index c5c860c..1bc2e46 100644 --- a/programs/cmdlgtst/It.rc +++ b/programs/cmdlgtst/It.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "cmdlgtst.h" + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
/* diff --git a/programs/cmdlgtst/Ja.rc b/programs/cmdlgtst/Ja.rc index fb73bfa..92ccddb 100644 --- a/programs/cmdlgtst/Ja.rc +++ b/programs/cmdlgtst/Ja.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "cmdlgtst.h" + /* UTF-8 */ #pragma code_page(65001)
@@ -296,5 +298,3 @@ BEGIN PUSHBUTTON "キャンセル", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "プリンタ(&R)...", psh3, 184, 220, 48, 14 END - -#pragma code_page(default) diff --git a/programs/cmdlgtst/Ko.rc b/programs/cmdlgtst/Ko.rc index 314ba9b..7d099f7 100644 --- a/programs/cmdlgtst/Ko.rc +++ b/programs/cmdlgtst/Ko.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "cmdlgtst.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/Lt.rc b/programs/cmdlgtst/Lt.rc index 9c8ad58..a6d7e83 100644 --- a/programs/cmdlgtst/Lt.rc +++ b/programs/cmdlgtst/Lt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "cmdlgtst.h" + /* UTF-8 */ #pragma code_page(65001)
@@ -296,5 +298,3 @@ BEGIN PUSHBUTTON "Atsisakyti", IDCANCEL, 116, 220, 50, 14 PUSHBUTTON "S&pausdintuvas...", psh3, 171, 220, 61, 14 END - -#pragma code_page(default) diff --git a/programs/cmdlgtst/Makefile.in b/programs/cmdlgtst/Makefile.in index 15409a8..1c6fdce 100644 --- a/programs/cmdlgtst/Makefile.in +++ b/programs/cmdlgtst/Makefile.in @@ -9,7 +9,26 @@ IMPORTS = comdlg32 user32 gdi32 kernel32 C_SRCS = \ cmdlgtst.c
-RC_SRCS = cmdlgr.rc +RC_SRCS = \ + Cs.rc \ + Da.rc \ + De.rc \ + En.rc \ + Es.rc \ + Fr.rc \ + It.rc \ + Ja.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ru.rc \ + Si.rc \ + Sv.rc \ + Tr.rc \ + cmdlgr.rc
@MAKE_PROG_RULES@
diff --git a/programs/cmdlgtst/Nl.rc b/programs/cmdlgtst/Nl.rc index 0b9d135..245794d 100644 --- a/programs/cmdlgtst/Nl.rc +++ b/programs/cmdlgtst/Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "cmdlgtst.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/No.rc b/programs/cmdlgtst/No.rc index 7d96a2d..d1e7b3b 100644 --- a/programs/cmdlgtst/No.rc +++ b/programs/cmdlgtst/No.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "cmdlgtst.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/Pl.rc b/programs/cmdlgtst/Pl.rc index 3123c2c..090e1f4 100644 --- a/programs/cmdlgtst/Pl.rc +++ b/programs/cmdlgtst/Pl.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "cmdlgtst.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/Pt.rc b/programs/cmdlgtst/Pt.rc index 38e783e..4bb06f4 100644 --- a/programs/cmdlgtst/Pt.rc +++ b/programs/cmdlgtst/Pt.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "cmdlgtst.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/Ru.rc b/programs/cmdlgtst/Ru.rc index a438b24..e3d7c2b 100644 --- a/programs/cmdlgtst/Ru.rc +++ b/programs/cmdlgtst/Ru.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "cmdlgtst.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/Si.rc b/programs/cmdlgtst/Si.rc index e080da3..f7c02f3 100644 --- a/programs/cmdlgtst/Si.rc +++ b/programs/cmdlgtst/Si.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "cmdlgtst.h" + #pragma code_page(65001)
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -295,5 +297,3 @@ BEGIN PUSHBUTTON "Prekliči", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "&Tiskalnik ...", psh3, 184, 220, 48, 14 END - -#pragma code_page(default) diff --git a/programs/cmdlgtst/Sv.rc b/programs/cmdlgtst/Sv.rc index 3ec66f2..c5c42dd 100644 --- a/programs/cmdlgtst/Sv.rc +++ b/programs/cmdlgtst/Sv.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "cmdlgtst.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/Tr.rc b/programs/cmdlgtst/Tr.rc index 94b6d50..c892470 100644 --- a/programs/cmdlgtst/Tr.rc +++ b/programs/cmdlgtst/Tr.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "cmdlgtst.h" + /* FIXME: to be completed */
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT diff --git a/programs/cmdlgtst/cmdlgr.rc b/programs/cmdlgtst/cmdlgr.rc index 3f9eecc..bbeabf7 100644 --- a/programs/cmdlgtst/cmdlgr.rc +++ b/programs/cmdlgtst/cmdlgr.rc @@ -18,32 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <windef.h> -#include <winuser.h> -#include <dlgs.h> - #include "cmdlgtst.h"
-#include "Cs.rc" -#include "Da.rc" -#include "De.rc" -#include "En.rc" -#include "Es.rc" -#include "Fr.rc" -#include "It.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" - -LANGUAGE LANG_NEUTRAL,SUBLANG_NEUTRAL - /* @makedep: about.ico */ AboutIcon ICON about.ico diff --git a/programs/cmdlgtst/cmdlgtst.h b/programs/cmdlgtst/cmdlgtst.h index b096eb9..58b2992 100644 --- a/programs/cmdlgtst/cmdlgtst.h +++ b/programs/cmdlgtst/cmdlgtst.h @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include <windef.h> +#include <winuser.h> +#include <dlgs.h> + #define CM_U_COLOR 105 #define CM_U_SAVE 104 #define CM_U_OPEN 107