July 2009 - Wine-commits - list.winehq.org

Michael Stefaniuc : msi: Build language resource files separately.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 5234f1fd0a258171f7c734ccfb402866e1615e71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5234f1fd0a258171f7c734ccf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:33:53 2009 +0200 msi: Build language resource files separately. Do not include them from an other rc file. --- dlls/msi/Makefile.in | 26 +++++++++++++++++++++++++- dlls/msi/msi.rc | 32 -------------------------------- dlls/msi/msi_Bg.rc | 2 ++ dlls/msi/msi_Da.rc | 2 ++ dlls/msi/msi_De.rc | 4 ++-- dlls/msi/msi_En.rc | 2 ++ dlls/msi/msi_Eo.rc | 2 ++ dlls/msi/msi_Es.rc | 2 ++ dlls/msi/msi_Fi.rc | 2 ++ dlls/msi/msi_Fr.rc | 2 ++ dlls/msi/msi_Hu.rc | 2 ++ dlls/msi/msi_It.rc | 2 ++ dlls/msi/msi_Ko.rc | 2 ++ dlls/msi/msi_Lt.rc | 4 ++-- dlls/msi/msi_Nl.rc | 2 ++ dlls/msi/msi_No.rc | 2 ++ dlls/msi/msi_Pl.rc | 2 ++ dlls/msi/msi_Pt.rc | 2 ++ dlls/msi/msi_Ro.rc | 4 ++-- dlls/msi/msi_Ru.rc | 2 ++ dlls/msi/msi_Si.rc | 4 ++-- dlls/msi/msi_Sv.rc | 2 ++ dlls/msi/msi_Tr.rc | 2 ++ dlls/msi/msi_Zh.rc | 4 ++-- 24 files changed, 69 insertions(+), 43 deletions(-) diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index a3ae579..c259360 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -59,7 +59,31 @@ BISON_SRCS = \ cond.y \ sql.y -RC_SRCS = msi.rc +RC_SRCS = \ + msi.rc \ + msi_Bg.rc \ + msi_Da.rc \ + msi_De.rc \ + msi_En.rc \ + msi_Eo.rc \ + msi_Es.rc \ + msi_Fi.rc \ + msi_Fr.rc \ + msi_Hu.rc \ + msi_It.rc \ + msi_Ko.rc \ + msi_Lt.rc \ + msi_Nl.rc \ + msi_No.rc \ + msi_Pl.rc \ + msi_Pt.rc \ + msi_Ro.rc \ + msi_Ru.rc \ + msi_Si.rc \ + msi_Sv.rc \ + msi_Tr.rc \ + msi_Zh.rc \ + version.rc @MAKE_DLL_RULES@ diff --git a/dlls/msi/msi.rc b/dlls/msi/msi.rc index 89d524c..466269a 100644 --- a/dlls/msi/msi.rc +++ b/dlls/msi/msi.rc @@ -19,38 +19,6 @@ */ #include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -#include "version.rc" - -#include "msi_Bg.rc" -#include "msi_Da.rc" -#include "msi_De.rc" -#include "msi_En.rc" -#include "msi_Eo.rc" -#include "msi_Es.rc" -#include "msi_Fi.rc" -#include "msi_Fr.rc" -#include "msi_Hu.rc" -#include "msi_It.rc" -#include "msi_Ko.rc" -#include "msi_Lt.rc" -#include "msi_Nl.rc" -#include "msi_No.rc" -#include "msi_Pl.rc" -#include "msi_Pt.rc" -#include "msi_Ro.rc" -#include "msi_Ru.rc" -#include "msi_Si.rc" -#include "msi_Sv.rc" -#include "msi_Tr.rc" -#include "msi_Zh.rc" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: msiserver.tlb */ 1 TYPELIB LOADONCALL DISCARDABLE msiserver.tlb diff --git a/dlls/msi/msi_Bg.rc b/dlls/msi/msi_Bg.rc index 3f2b34a..d3b8ca8 100644 --- a/dlls/msi/msi_Bg.rc +++ b/dlls/msi/msi_Bg.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/msi/msi_Da.rc b/dlls/msi/msi_Da.rc index 0fd1af0..beee427 100644 --- a/dlls/msi/msi_Da.rc +++ b/dlls/msi/msi_Da.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/msi/msi_De.rc b/dlls/msi/msi_De.rc index 00649b6..e0cccf0 100644 --- a/dlls/msi/msi_De.rc +++ b/dlls/msi/msi_De.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -34,5 +36,3 @@ STRINGTABLE DISCARDABLE 14 "Feature von:" 15 "Wählen Sie das Verzeichnis aus, dass %s enthält." } - -#pragma code_page(default) diff --git a/dlls/msi/msi_En.rc b/dlls/msi/msi_En.rc index 55a6b22..74fc5c1 100644 --- a/dlls/msi/msi_En.rc +++ b/dlls/msi/msi_En.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/msi/msi_Eo.rc b/dlls/msi/msi_Eo.rc index e7ed2fa..7579bdc 100644 --- a/dlls/msi/msi_Eo.rc +++ b/dlls/msi/msi_Eo.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/msi/msi_Es.rc b/dlls/msi/msi_Es.rc index 94bfaf5..781be07 100644 --- a/dlls/msi/msi_Es.rc +++ b/dlls/msi/msi_Es.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/msi/msi_Fi.rc b/dlls/msi/msi_Fi.rc index 87ce328..17721aa 100644 --- a/dlls/msi/msi_Fi.rc +++ b/dlls/msi/msi_Fi.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/msi/msi_Fr.rc b/dlls/msi/msi_Fr.rc index 8b4b83f..a4cd0bc 100644 --- a/dlls/msi/msi_Fr.rc +++ b/dlls/msi/msi_Fr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/msi/msi_Hu.rc b/dlls/msi/msi_Hu.rc index ccefef7..21ba5cf 100644 --- a/dlls/msi/msi_Hu.rc +++ b/dlls/msi/msi_Hu.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/msi/msi_It.rc b/dlls/msi/msi_It.rc index 9e95245..9864806 100644 --- a/dlls/msi/msi_It.rc +++ b/dlls/msi/msi_It.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/msi/msi_Ko.rc b/dlls/msi/msi_Ko.rc index 2bca718..ca14253 100644 --- a/dlls/msi/msi_Ko.rc +++ b/dlls/msi/msi_Ko.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/msi/msi_Lt.rc b/dlls/msi/msi_Lt.rc index 769d2c0..1cf1c52 100644 --- a/dlls/msi/msi_Lt.rc +++ b/dlls/msi/msi_Lt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + /* UTF-8 */ #pragma code_page(65001) @@ -35,5 +37,3 @@ STRINGTABLE DISCARDABLE 14 "komponentas iš:" 15 "parinkite aplanką, kuris turi %s" } - -#pragma code_page(default) diff --git a/dlls/msi/msi_Nl.rc b/dlls/msi/msi_Nl.rc index 123b1c6..da30430 100644 --- a/dlls/msi/msi_Nl.rc +++ b/dlls/msi/msi_Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/msi/msi_No.rc b/dlls/msi/msi_No.rc index 3ab58bc..e885f5a 100644 --- a/dlls/msi/msi_No.rc +++ b/dlls/msi/msi_No.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE DISCARDABLE diff --git a/dlls/msi/msi_Pl.rc b/dlls/msi/msi_Pl.rc index 00eb535..c31311e 100644 --- a/dlls/msi/msi_Pl.rc +++ b/dlls/msi/msi_Pl.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/msi/msi_Pt.rc b/dlls/msi/msi_Pt.rc index 3d90f71..64ab163 100644 --- a/dlls/msi/msi_Pt.rc +++ b/dlls/msi/msi_Pt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN STRINGTABLE DISCARDABLE diff --git a/dlls/msi/msi_Ro.rc b/dlls/msi/msi_Ro.rc index a167d05..b877b42 100644 --- a/dlls/msi/msi_Ro.rc +++ b/dlls/msi/msi_Ro.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -33,5 +35,3 @@ STRINGTABLE DISCARDABLE 14 "caracteristică de la:" 15 "selectați fișierul care conține %s" } - -#pragma code_page(default) diff --git a/dlls/msi/msi_Ru.rc b/dlls/msi/msi_Ru.rc index 2646573..d63593e 100644 --- a/dlls/msi/msi_Ru.rc +++ b/dlls/msi/msi_Ru.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/msi/msi_Si.rc b/dlls/msi/msi_Si.rc index bf92697..7582339 100644 --- a/dlls/msi/msi_Si.rc +++ b/dlls/msi/msi_Si.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -34,5 +36,3 @@ STRINGTABLE DISCARDABLE 14 "funkcija z:" 15 "izberite mapo, ki vsebuje %s" } - -#pragma code_page(default) diff --git a/dlls/msi/msi_Sv.rc b/dlls/msi/msi_Sv.rc index dc1f2ed..47bf09b 100644 --- a/dlls/msi/msi_Sv.rc +++ b/dlls/msi/msi_Sv.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/msi/msi_Tr.rc b/dlls/msi/msi_Tr.rc index becd913..a8e0f36 100644 --- a/dlls/msi/msi_Tr.rc +++ b/dlls/msi/msi_Tr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/msi/msi_Zh.rc b/dlls/msi/msi_Zh.rc index 86620db..a6d5cd1 100644 --- a/dlls/msi/msi_Zh.rc +++ b/dlls/msi/msi_Zh.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -50,5 +52,3 @@ STRINGTABLE DISCARDABLE 14 "功能來自:" 15 "選擇包含 %s 的檔案夾" } - -#pragma code_page(default)

1 0

Michael Stefaniuc : winemine: Build language resource files separately.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 6667ef13414a477e1f9d9c3e082a08297e93894f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6667ef13414a477e1f9d9c3e0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:31:35 2009 +0200 winemine: Build language resource files separately. Do not include them from an other rc file. --- programs/winemine/Cs.rc | 2 ++ programs/winemine/Da.rc | 2 ++ programs/winemine/De.rc | 2 ++ programs/winemine/En.rc | 2 ++ programs/winemine/Es.rc | 2 ++ programs/winemine/Fi.rc | 2 ++ programs/winemine/Fr.rc | 2 ++ programs/winemine/It.rc | 2 ++ programs/winemine/Ja.rc | 4 ++-- programs/winemine/Ko.rc | 2 ++ programs/winemine/Lt.rc | 4 ++-- programs/winemine/Makefile.in | 23 ++++++++++++++++++++++- programs/winemine/Nl.rc | 2 ++ programs/winemine/No.rc | 2 ++ programs/winemine/Pl.rc | 2 ++ programs/winemine/Pt.rc | 2 ++ programs/winemine/Ro.rc | 4 ++-- programs/winemine/Ru.rc | 2 ++ programs/winemine/Si.rc | 4 ++-- programs/winemine/Tr.rc | 2 ++ programs/winemine/Zh.rc | 4 ++-- programs/winemine/resource.h | 2 ++ programs/winemine/rsrc.rc | 24 ------------------------ 23 files changed, 64 insertions(+), 35 deletions(-) diff --git a/programs/winemine/Cs.rc b/programs/winemine/Cs.rc index c4f3cc3..bfe9770 100644 --- a/programs/winemine/Cs.rc +++ b/programs/winemine/Cs.rc @@ -22,6 +22,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_CZECH, SUBLANG_DEFAULT /* Czech strings in CP1250 */ diff --git a/programs/winemine/Da.rc b/programs/winemine/Da.rc index 3e5631f..2027e76 100644 --- a/programs/winemine/Da.rc +++ b/programs/winemine/Da.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT STRINGTABLE { diff --git a/programs/winemine/De.rc b/programs/winemine/De.rc index d1066f9..a60dcc2 100644 --- a/programs/winemine/De.rc +++ b/programs/winemine/De.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE { diff --git a/programs/winemine/En.rc b/programs/winemine/En.rc index c0f2550..634a3e8 100644 --- a/programs/winemine/En.rc +++ b/programs/winemine/En.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE { diff --git a/programs/winemine/Es.rc b/programs/winemine/Es.rc index c36b522..0b08162 100644 --- a/programs/winemine/Es.rc +++ b/programs/winemine/Es.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE { diff --git a/programs/winemine/Fi.rc b/programs/winemine/Fi.rc index ceee603..6252d2c 100644 --- a/programs/winemine/Fi.rc +++ b/programs/winemine/Fi.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT STRINGTABLE { diff --git a/programs/winemine/Fr.rc b/programs/winemine/Fr.rc index e2a9372..fa7d5ec 100644 --- a/programs/winemine/Fr.rc +++ b/programs/winemine/Fr.rc @@ -22,6 +22,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE { diff --git a/programs/winemine/It.rc b/programs/winemine/It.rc index 3291bea..a799fa4 100644 --- a/programs/winemine/It.rc +++ b/programs/winemine/It.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE { diff --git a/programs/winemine/Ja.rc b/programs/winemine/Ja.rc index 28530ac..d4edbcb 100644 --- a/programs/winemine/Ja.rc +++ b/programs/winemine/Ja.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -93,5 +95,3 @@ CAPTION "盤面の変更" DEFPUSHBUTTON "OK", IDOK, 40, 30, 50, 15 PUSHBUTTON "Cancel", IDCANCEL, 40, 50, 50, 15 } - -#pragma code_page(default) diff --git a/programs/winemine/Ko.rc b/programs/winemine/Ko.rc index c27d6e3..bc532e9 100644 --- a/programs/winemine/Ko.rc +++ b/programs/winemine/Ko.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE { diff --git a/programs/winemine/Lt.rc b/programs/winemine/Lt.rc index 692717d..de09a45 100644 --- a/programs/winemine/Lt.rc +++ b/programs/winemine/Lt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -92,5 +94,3 @@ CAPTION "Pasirinktas žaidimas" DEFPUSHBUTTON "Gerai", IDOK, 40, 30, 50, 15 PUSHBUTTON "Atsisakyti", IDCANCEL, 40, 50, 50, 15 } - -#pragma code_page(default) diff --git a/programs/winemine/Makefile.in b/programs/winemine/Makefile.in index 64f8599..09adf9e 100644 --- a/programs/winemine/Makefile.in +++ b/programs/winemine/Makefile.in @@ -11,7 +11,28 @@ C_SRCS = \ dialog.c \ main.c -RC_SRCS = rsrc.rc +RC_SRCS = \ + Cs.rc \ + Da.rc \ + De.rc \ + En.rc \ + Es.rc \ + Fi.rc \ + Fr.rc \ + It.rc \ + Ja.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ro.rc \ + Ru.rc \ + Si.rc \ + Tr.rc \ + Zh.rc \ + rsrc.rc SVG_SRCS = winemine.svg diff --git a/programs/winemine/Nl.rc b/programs/winemine/Nl.rc index 6d0cf3c..18bbda6 100644 --- a/programs/winemine/Nl.rc +++ b/programs/winemine/Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE { diff --git a/programs/winemine/No.rc b/programs/winemine/No.rc index c3ab3d1..7e06eef 100644 --- a/programs/winemine/No.rc +++ b/programs/winemine/No.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE { diff --git a/programs/winemine/Pl.rc b/programs/winemine/Pl.rc index 2d924c5..7830eab 100644 --- a/programs/winemine/Pl.rc +++ b/programs/winemine/Pl.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE { diff --git a/programs/winemine/Pt.rc b/programs/winemine/Pt.rc index a8f581a..9c20abb 100644 --- a/programs/winemine/Pt.rc +++ b/programs/winemine/Pt.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN STRINGTABLE { diff --git a/programs/winemine/Ro.rc b/programs/winemine/Ro.rc index 9d601ae..af0ea37 100644 --- a/programs/winemine/Ro.rc +++ b/programs/winemine/Ro.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -91,5 +93,3 @@ CAPTION "Joc personalizat" DEFPUSHBUTTON "OK", IDOK, 40, 30, 50, 15 PUSHBUTTON "Renunţă", IDCANCEL, 40, 50, 50, 15 } - -#pragma code_page(default) diff --git a/programs/winemine/Ru.rc b/programs/winemine/Ru.rc index f13fd7e..e323e24 100644 --- a/programs/winemine/Ru.rc +++ b/programs/winemine/Ru.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE { diff --git a/programs/winemine/Si.rc b/programs/winemine/Si.rc index 77148c5..dab867a 100644 --- a/programs/winemine/Si.rc +++ b/programs/winemine/Si.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -91,5 +93,3 @@ CAPTION "Poljubna igra" DEFPUSHBUTTON "V redu", IDOK, 40, 30, 50, 15 PUSHBUTTON "Prekliči", IDCANCEL, 40, 50, 50, 15 } - -#pragma code_page(default) diff --git a/programs/winemine/Tr.rc b/programs/winemine/Tr.rc index b09f77d..174fbda 100644 --- a/programs/winemine/Tr.rc +++ b/programs/winemine/Tr.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE { diff --git a/programs/winemine/Zh.rc b/programs/winemine/Zh.rc index 99777c2..e28a204 100644 --- a/programs/winemine/Zh.rc +++ b/programs/winemine/Zh.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -162,5 +164,3 @@ CAPTION "自定義遊戲" DEFPUSHBUTTON "確定", IDOK, 40, 30, 50, 15 PUSHBUTTON "取消", IDCANCEL, 40, 50, 50, 15 } - -#pragma code_page(default) diff --git a/programs/winemine/resource.h b/programs/winemine/resource.h index 982c516..c3272a2 100644 --- a/programs/winemine/resource.h +++ b/programs/winemine/resource.h @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> +#include <winuser.h> #define ID_TIMER 1000 diff --git a/programs/winemine/rsrc.rc b/programs/winemine/rsrc.rc index 09f5cd3..ce5bcf9 100644 --- a/programs/winemine/rsrc.rc +++ b/programs/winemine/rsrc.rc @@ -19,32 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> -#include <winuser.h> - #include "resource.h" -#include "Cs.rc" -#include "Da.rc" -#include "De.rc" -#include "En.rc" -#include "Es.rc" -#include "Fi.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 "Ro.rc" -#include "Ru.rc" -#include "Si.rc" -#include "Tr.rc" -#include "Zh.rc" - LANGUAGE LANG_NEUTRAL,SUBLANG_NEUTRAL IDA_WINEMINE ACCELERATORS DISCARDABLE

1 0

Michael Stefaniuc : msvfw32: Build language resource files separately.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 4149385b93385d5b8167ec69463890b7aef2550f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4149385b93385d5b8167ec694… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:27:22 2009 +0200 msvfw32: Build language resource files separately. Do not include them from an other rc file. --- dlls/msvfw32/Makefile.in | 19 ++++++++++++++++++- dlls/msvfw32/msvfw32_Da.rc | 2 ++ dlls/msvfw32/msvfw32_De.rc | 2 ++ dlls/msvfw32/msvfw32_En.rc | 2 ++ dlls/msvfw32/msvfw32_Es.rc | 2 ++ dlls/msvfw32/msvfw32_Fr.rc | 2 ++ dlls/msvfw32/msvfw32_Hu.rc | 2 ++ dlls/msvfw32/msvfw32_Ko.rc | 2 ++ dlls/msvfw32/msvfw32_Lt.rc | 4 ++-- dlls/msvfw32/msvfw32_Nl.rc | 2 ++ dlls/msvfw32/msvfw32_No.rc | 2 ++ dlls/msvfw32/msvfw32_Pl.rc | 2 ++ dlls/msvfw32/msvfw32_Pt.rc | 2 ++ dlls/msvfw32/msvfw32_Ru.rc | 2 ++ dlls/msvfw32/msvfw32_Si.rc | 4 ++-- dlls/msvfw32/msvfw32_Sv.rc | 2 ++ dlls/msvfw32/msvfw32_Tr.rc | 2 ++ dlls/msvfw32/msvfw32_Zh.rc | 4 ++-- dlls/msvfw32/msvideo_private.h | 3 +++ dlls/msvfw32/rsrc.rc | 39 --------------------------------------- 20 files changed, 55 insertions(+), 46 deletions(-) diff --git a/dlls/msvfw32/Makefile.in b/dlls/msvfw32/Makefile.in index 8347fe8..4eb3b10 100644 --- a/dlls/msvfw32/Makefile.in +++ b/dlls/msvfw32/Makefile.in @@ -11,7 +11,24 @@ C_SRCS = \ msvideo_main.c \ drawdib.c -RC_SRCS = rsrc.rc +RC_SRCS = \ + msvfw32_Da.rc \ + msvfw32_De.rc \ + msvfw32_En.rc \ + msvfw32_Es.rc \ + msvfw32_Fr.rc \ + msvfw32_Hu.rc \ + msvfw32_Ko.rc \ + msvfw32_Lt.rc \ + msvfw32_Nl.rc \ + msvfw32_No.rc \ + msvfw32_Pl.rc \ + msvfw32_Pt.rc \ + msvfw32_Ru.rc \ + msvfw32_Si.rc \ + msvfw32_Sv.rc \ + msvfw32_Tr.rc \ + msvfw32_Zh.rc @MAKE_DLL_RULES@ diff --git a/dlls/msvfw32/msvfw32_Da.rc b/dlls/msvfw32/msvfw32_Da.rc index 32b5489..20d60e2 100644 --- a/dlls/msvfw32/msvfw32_Da.rc +++ b/dlls/msvfw32/msvfw32_Da.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_De.rc b/dlls/msvfw32/msvfw32_De.rc index 29b5f4b..ff822dd 100644 --- a/dlls/msvfw32/msvfw32_De.rc +++ b/dlls/msvfw32/msvfw32_De.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_En.rc b/dlls/msvfw32/msvfw32_En.rc index 1a563dd..f3ee735 100644 --- a/dlls/msvfw32/msvfw32_En.rc +++ b/dlls/msvfw32/msvfw32_En.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_Es.rc b/dlls/msvfw32/msvfw32_Es.rc index aa4d3f0..2745361 100644 --- a/dlls/msvfw32/msvfw32_Es.rc +++ b/dlls/msvfw32/msvfw32_Es.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_Fr.rc b/dlls/msvfw32/msvfw32_Fr.rc index 9318ee4..cd2c056 100644 --- a/dlls/msvfw32/msvfw32_Fr.rc +++ b/dlls/msvfw32/msvfw32_Fr.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_Hu.rc b/dlls/msvfw32/msvfw32_Hu.rc index aa0eefc..e77b67f 100644 --- a/dlls/msvfw32/msvfw32_Hu.rc +++ b/dlls/msvfw32/msvfw32_Hu.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_Ko.rc b/dlls/msvfw32/msvfw32_Ko.rc index 4d6527e..72e999d 100644 --- a/dlls/msvfw32/msvfw32_Ko.rc +++ b/dlls/msvfw32/msvfw32_Ko.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_Lt.rc b/dlls/msvfw32/msvfw32_Lt.rc index 21b9902..c7432d3 100644 --- a/dlls/msvfw32/msvfw32_Lt.rc +++ b/dlls/msvfw32/msvfw32_Lt.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + /* UTF-8 */ #pragma code_page(65001) @@ -52,5 +54,3 @@ STRINGTABLE DISCARDABLE { IDS_FULLFRAMES "Pilni kadrai (neglaudinti)" } - -#pragma code_page(default) diff --git a/dlls/msvfw32/msvfw32_Nl.rc b/dlls/msvfw32/msvfw32_Nl.rc index e1236f7..d82f860 100644 --- a/dlls/msvfw32/msvfw32_Nl.rc +++ b/dlls/msvfw32/msvfw32_Nl.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_No.rc b/dlls/msvfw32/msvfw32_No.rc index 41a24e3..eb07aed 100644 --- a/dlls/msvfw32/msvfw32_No.rc +++ b/dlls/msvfw32/msvfw32_No.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_Pl.rc b/dlls/msvfw32/msvfw32_Pl.rc index 53ee33c..cb5a9eb 100644 --- a/dlls/msvfw32/msvfw32_Pl.rc +++ b/dlls/msvfw32/msvfw32_Pl.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 207, 95 diff --git a/dlls/msvfw32/msvfw32_Pt.rc b/dlls/msvfw32/msvfw32_Pt.rc index 0640870..efd3119 100644 --- a/dlls/msvfw32/msvfw32_Pt.rc +++ b/dlls/msvfw32/msvfw32_Pt.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_Ru.rc b/dlls/msvfw32/msvfw32_Ru.rc index 96c8a81..5b42d19 100644 --- a/dlls/msvfw32/msvfw32_Ru.rc +++ b/dlls/msvfw32/msvfw32_Ru.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_Si.rc b/dlls/msvfw32/msvfw32_Si.rc index 05d1ba5..93fb175 100644 --- a/dlls/msvfw32/msvfw32_Si.rc +++ b/dlls/msvfw32/msvfw32_Si.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -51,5 +53,3 @@ STRINGTABLE DISCARDABLE { IDS_FULLFRAMES "Polne slike (nestisnjeno)" } - -#pragma code_page(default) diff --git a/dlls/msvfw32/msvfw32_Sv.rc b/dlls/msvfw32/msvfw32_Sv.rc index 68f5167..2461fce 100644 --- a/dlls/msvfw32/msvfw32_Sv.rc +++ b/dlls/msvfw32/msvfw32_Sv.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_Tr.rc b/dlls/msvfw32/msvfw32_Tr.rc index b9da7c2..0963509 100644 --- a/dlls/msvfw32/msvfw32_Tr.rc +++ b/dlls/msvfw32/msvfw32_Tr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_Zh.rc b/dlls/msvfw32/msvfw32_Zh.rc index 334fd69..3ff0fc0 100644 --- a/dlls/msvfw32/msvfw32_Zh.rc +++ b/dlls/msvfw32/msvfw32_Zh.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -88,5 +90,3 @@ STRINGTABLE DISCARDABLE { IDS_FULLFRAMES "全幀(未壓縮)" } - -#pragma code_page(default) diff --git a/dlls/msvfw32/msvideo_private.h b/dlls/msvfw32/msvideo_private.h index d6b2d19..ea0566b 100644 --- a/dlls/msvfw32/msvideo_private.h +++ b/dlls/msvfw32/msvideo_private.h @@ -19,6 +19,9 @@ #ifndef __WINE_MSVIDEO_PRIVATE_H #define __WINE_MSVIDEO_PRIVATE_H +#include <windef.h> +#include <winuser.h> + #define ICM_CHOOSE_COMPRESSOR 1 #define IDC_COMP_LIST 880 #define IDS_FULLFRAMES 901 diff --git a/dlls/msvfw32/rsrc.rc b/dlls/msvfw32/rsrc.rc deleted file mode 100644 index a24ab3c..0000000 --- a/dlls/msvfw32/rsrc.rc +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2005 Dmitry Timoshkov - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "windef.h" -#include "winuser.h" -#include "msvideo_private.h" - -#include "msvfw32_Da.rc" -#include "msvfw32_De.rc" -#include "msvfw32_En.rc" -#include "msvfw32_Es.rc" -#include "msvfw32_Fr.rc" -#include "msvfw32_Hu.rc" -#include "msvfw32_Ko.rc" -#include "msvfw32_Lt.rc" -#include "msvfw32_Nl.rc" -#include "msvfw32_No.rc" -#include "msvfw32_Pl.rc" -#include "msvfw32_Pt.rc" -#include "msvfw32_Ru.rc" -#include "msvfw32_Si.rc" -#include "msvfw32_Sv.rc" -#include "msvfw32_Tr.rc" -#include "msvfw32_Zh.rc"

1 0

Michael Stefaniuc : view: Build language resource files separately.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: c135e063c431aafdeb5a6f57ddf0d12341b3c74e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c135e063c431aafdeb5a6f57d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:30:31 2009 +0200 view: Build language resource files separately. Do not include them from an other rc file. --- programs/view/Cs.rc | 2 + programs/view/Da.rc | 2 + programs/view/De.rc | 2 + programs/view/En.rc | 2 + programs/view/Eo.rc | 2 + programs/view/Es.rc | 2 + programs/view/Fr.rc | 2 + programs/view/It.rc | 2 + programs/view/Ja.rc | 4 +- programs/view/Ko.rc | 2 + programs/view/Lt.rc | 4 +- programs/view/Makefile.in | 23 ++++++++++++++++++++- programs/view/Nl.rc | 2 + programs/view/No.rc | 2 + programs/view/Pl.rc | 2 + programs/view/Pt.rc | 2 + programs/view/Ro.rc | 4 +- programs/view/Ru.rc | 2 + programs/view/Si.rc | 4 +- programs/view/Sv.rc | 2 + programs/view/Tr.rc | 2 + programs/view/Zh.rc | 4 +- programs/view/resource.h | 2 + programs/view/viewrc.rc | 49 --------------------------------------------- 24 files changed, 66 insertions(+), 60 deletions(-) diff --git a/programs/view/Cs.rc b/programs/view/Cs.rc index ca34121..58ee9ca 100644 --- a/programs/view/Cs.rc +++ b/programs/view/Cs.rc @@ -22,6 +22,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_CZECH, SUBLANG_DEFAULT /* Czech strings in CP1250 */ diff --git a/programs/view/Da.rc b/programs/view/Da.rc index 91fd214..8996cf8 100644 --- a/programs/view/Da.rc +++ b/programs/view/Da.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT /* diff --git a/programs/view/De.rc b/programs/view/De.rc index 5e7cf31..b77fc82 100644 --- a/programs/view/De.rc +++ b/programs/view/De.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL /* diff --git a/programs/view/En.rc b/programs/view/En.rc index 042f303..b201290 100644 --- a/programs/view/En.rc +++ b/programs/view/En.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT /* diff --git a/programs/view/Eo.rc b/programs/view/Eo.rc index bcdeba7..bc61a8d 100644 --- a/programs/view/Eo.rc +++ b/programs/view/Eo.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT /* diff --git a/programs/view/Es.rc b/programs/view/Es.rc index f1b897d..e0f53f3 100644 --- a/programs/view/Es.rc +++ b/programs/view/Es.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL /* diff --git a/programs/view/Fr.rc b/programs/view/Fr.rc index b2ab0a4..786a63d 100644 --- a/programs/view/Fr.rc +++ b/programs/view/Fr.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL /* diff --git a/programs/view/It.rc b/programs/view/It.rc index 37747ce..0839c44 100644 --- a/programs/view/It.rc +++ b/programs/view/It.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL /* diff --git a/programs/view/Ja.rc b/programs/view/Ja.rc index 46c8e11..0b69216 100644 --- a/programs/view/Ja.rc +++ b/programs/view/Ja.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -72,5 +74,3 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "標準メタファイルビュアー" END - -#pragma code_page(default) diff --git a/programs/view/Ko.rc b/programs/view/Ko.rc index 5df207b..3451626 100644 --- a/programs/view/Ko.rc +++ b/programs/view/Ko.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT /* diff --git a/programs/view/Lt.rc b/programs/view/Lt.rc index cbce3bb..fdcf731 100644 --- a/programs/view/Lt.rc +++ b/programs/view/Lt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -71,5 +73,3 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Įprastinė metafailų žiūryklė" END - -#pragma code_page(default) diff --git a/programs/view/Makefile.in b/programs/view/Makefile.in index 134a2b4..ff34532 100644 --- a/programs/view/Makefile.in +++ b/programs/view/Makefile.in @@ -11,7 +11,28 @@ C_SRCS = \ view.c \ winmain.c -RC_SRCS = viewrc.rc +RC_SRCS = \ + Cs.rc \ + Da.rc \ + De.rc \ + En.rc \ + Eo.rc \ + Es.rc \ + Fr.rc \ + It.rc \ + Ja.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ro.rc \ + Ru.rc \ + Si.rc \ + Sv.rc \ + Tr.rc \ + Zh.rc @MAKE_PROG_RULES@ diff --git a/programs/view/Nl.rc b/programs/view/Nl.rc index 34a9d4f..623506b 100644 --- a/programs/view/Nl.rc +++ b/programs/view/Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL /* diff --git a/programs/view/No.rc b/programs/view/No.rc index e728966..4a18853 100644 --- a/programs/view/No.rc +++ b/programs/view/No.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL /* diff --git a/programs/view/Pl.rc b/programs/view/Pl.rc index 3f3e937..28828d8 100644 --- a/programs/view/Pl.rc +++ b/programs/view/Pl.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT /* diff --git a/programs/view/Pt.rc b/programs/view/Pt.rc index 47aab01..3003080 100644 --- a/programs/view/Pt.rc +++ b/programs/view/Pt.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* * * Menu diff --git a/programs/view/Ro.rc b/programs/view/Ro.rc index b03fe31..8c05f06 100644 --- a/programs/view/Ro.rc +++ b/programs/view/Ro.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -69,5 +71,3 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Vizualizator de fișiere metafile normale" END - -#pragma code_page(default) diff --git a/programs/view/Ru.rc b/programs/view/Ru.rc index cbdc28e..9d4d39e 100644 --- a/programs/view/Ru.rc +++ b/programs/view/Ru.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT /* diff --git a/programs/view/Si.rc b/programs/view/Si.rc index 8cb4988..8e6a0f2 100644 --- a/programs/view/Si.rc +++ b/programs/view/Si.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -70,5 +72,3 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Program za ogled Metafile slik" END - -#pragma code_page(default) diff --git a/programs/view/Sv.rc b/programs/view/Sv.rc index b1bb50d..2f7eea3 100644 --- a/programs/view/Sv.rc +++ b/programs/view/Sv.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL /* diff --git a/programs/view/Tr.rc b/programs/view/Tr.rc index 38ed849..3e6ea6f 100644 --- a/programs/view/Tr.rc +++ b/programs/view/Tr.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT /* diff --git a/programs/view/Zh.rc b/programs/view/Zh.rc index 84bd638..05067f8 100644 --- a/programs/view/Zh.rc +++ b/programs/view/Zh.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -120,5 +122,3 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "普通 Metafile 閱讀器" END - -#pragma code_page(default) diff --git a/programs/view/resource.h b/programs/view/resource.h index 619da49..7932687 100644 --- a/programs/view/resource.h +++ b/programs/view/resource.h @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> + #define IDS_DESCRIPTION 2 #define IDI_APPICON 101 #define IDM_EXIT 1000 diff --git a/programs/view/viewrc.rc b/programs/view/viewrc.rc deleted file mode 100644 index 6217cf6..0000000 --- a/programs/view/viewrc.rc +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 1998 Douglas Ridgway - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <windef.h> - -#include "resource.h" - -#include "Cs.rc" -#include "Da.rc" -#include "De.rc" -#include "En.rc" -#include "Eo.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 "Ro.rc" -#include "Ru.rc" -#include "Si.rc" -#include "Sv.rc" -#include "Tr.rc" -#include "Zh.rc" - -/* - * Icon - */ - -/*IDI_APPICON ICON DISCARDABLE "view.ico"*/

1 0

Michael Stefaniuc : credui: Build language resource files separately.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 6b6ff6afa4eae2df37b349c9244bc4abc60988e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b6ff6afa4eae2df37b349c92… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:33:27 2009 +0200 credui: Build language resource files separately. Do not include them from an other rc file. --- dlls/credui/Makefile.in | 19 ++++++++++++++++++- dlls/credui/credui.rc | 21 --------------------- dlls/credui/credui_Da.rc | 2 ++ dlls/credui/credui_De.rc | 2 ++ dlls/credui/credui_En.rc | 2 ++ dlls/credui/credui_Es.rc | 5 +++-- dlls/credui/credui_Fr.rc | 5 +++-- dlls/credui/credui_Ko.rc | 2 ++ dlls/credui/credui_Lt.rc | 4 ++-- dlls/credui/credui_Nl.rc | 2 ++ dlls/credui/credui_No.rc | 2 ++ dlls/credui/credui_Pl.rc | 2 ++ dlls/credui/credui_Pt.rc | 2 ++ dlls/credui/credui_Ro.rc | 4 ++-- dlls/credui/credui_Ru.rc | 2 ++ dlls/credui/credui_Si.rc | 4 ++-- dlls/credui/credui_Sv.rc | 2 ++ dlls/credui/credui_Zh.rc | 4 ++-- dlls/credui/credui_resources.h | 3 +++ 19 files changed, 55 insertions(+), 34 deletions(-) diff --git a/dlls/credui/Makefile.in b/dlls/credui/Makefile.in index c9d574f..f29278c 100644 --- a/dlls/credui/Makefile.in +++ b/dlls/credui/Makefile.in @@ -9,7 +9,24 @@ IMPORTS = comctl32 user32 advapi32 kernel32 C_SRCS = \ credui_main.c -RC_SRCS = credui.rc +RC_SRCS = \ + credui.rc \ + credui_Da.rc \ + credui_De.rc \ + credui_En.rc \ + credui_Es.rc \ + credui_Fr.rc \ + credui_Ko.rc \ + credui_Lt.rc \ + credui_Nl.rc \ + credui_No.rc \ + credui_Pl.rc \ + credui_Pt.rc \ + credui_Ro.rc \ + credui_Ru.rc \ + credui_Si.rc \ + credui_Sv.rc \ + credui_Zh.rc @MAKE_DLL_RULES@ diff --git a/dlls/credui/credui.rc b/dlls/credui/credui.rc index f66a942..0f16f00 100644 --- a/dlls/credui/credui.rc +++ b/dlls/credui/credui.rc @@ -18,28 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" #include "credui_resources.h" /* @makedep: banner.bmp */ IDB_BANNER BITMAP LOADONCALL DISCARDABLE banner.bmp - -#include "credui_Da.rc" -#include "credui_De.rc" -#include "credui_En.rc" -#include "credui_Es.rc" -#include "credui_Fr.rc" -#include "credui_Ko.rc" -#include "credui_Lt.rc" -#include "credui_Nl.rc" -#include "credui_No.rc" -#include "credui_Pl.rc" -#include "credui_Pt.rc" -#include "credui_Ro.rc" -#include "credui_Ru.rc" -#include "credui_Si.rc" -#include "credui_Sv.rc" -#include "credui_Zh.rc" diff --git a/dlls/credui/credui_Da.rc b/dlls/credui/credui_Da.rc index d5e7608..26ef991 100644 --- a/dlls/credui/credui_Da.rc +++ b/dlls/credui/credui_Da.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_De.rc b/dlls/credui/credui_De.rc index 7c197d6..9e72698 100644 --- a/dlls/credui/credui_De.rc +++ b/dlls/credui/credui_De.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_En.rc b/dlls/credui/credui_En.rc index 8e475bb..feb4afc 100644 --- a/dlls/credui/credui_En.rc +++ b/dlls/credui/credui_En.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_Es.rc b/dlls/credui/credui_Es.rc index 0a48b3f..8f71d5f 100644 --- a/dlls/credui/credui_Es.rc +++ b/dlls/credui/credui_Es.rc @@ -18,6 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" + #pragma code_page(65001) LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -50,5 +53,3 @@ STRINGTABLE DISCARDABLE IDS_CAPSLOCKONTITLE "Bloq Mayus está activado" IDS_CAPSLOCKON "El Bloq Mayus activado puede hacer que entre su contraseña incorrectamente.\n\nPulse la tecla Bloq Mayus de su teclado para desactivar Bloq Mayus antes\n de introducir su contraseña." } - -#pragma code_page(default) diff --git a/dlls/credui/credui_Fr.rc b/dlls/credui/credui_Fr.rc index fb7cd12..387a86d 100644 --- a/dlls/credui/credui_Fr.rc +++ b/dlls/credui/credui_Fr.rc @@ -17,6 +17,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "credui_resources.h" + #pragma code_page(65001) LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL @@ -49,5 +52,3 @@ STRINGTABLE DISCARDABLE IDS_CAPSLOCKONTITLE "VERR.MAJ est activé" IDS_CAPSLOCKON "Le verrouillage majuscule étant activé, cela pourrait provoquer une erreur lors de la saisie de votre mot de passe.\n\nAppuyez sur la touche VERR.MAJ de votre clavier afin de désactiver le verrouilage majuscule avant\nde saisir votre mot de passe." } - -#pragma code_page(default) diff --git a/dlls/credui/credui_Ko.rc b/dlls/credui/credui_Ko.rc index 62bd135..ab1f1ec 100644 --- a/dlls/credui/credui_Ko.rc +++ b/dlls/credui/credui_Ko.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_Lt.rc b/dlls/credui/credui_Lt.rc index 9ad3e4b..4eb6eba 100644 --- a/dlls/credui/credui_Lt.rc +++ b/dlls/credui/credui_Lt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + /* UTF-8 */ #pragma code_page(65001) @@ -51,5 +53,3 @@ STRINGTABLE DISCARDABLE IDS_CAPSLOCKONTITLE "Didžiųjų raidžių būsena įjungta" IDS_CAPSLOCKON "Kai įjungta didžiųjų raidžių būsena, savo slaptažodį galite įvesti neteisingai.\n\nPaspauskite didžiųjų raidžių klaviatūros klavišą didžiųjų raidžių būsenai išjungti\nprieš rinkdami savo slaptažodį." } - -#pragma code_page(default) diff --git a/dlls/credui/credui_Nl.rc b/dlls/credui/credui_Nl.rc index ed5c41e..575496c 100644 --- a/dlls/credui/credui_Nl.rc +++ b/dlls/credui/credui_Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_No.rc b/dlls/credui/credui_No.rc index cc09cd8..c47fec1 100644 --- a/dlls/credui/credui_No.rc +++ b/dlls/credui/credui_No.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_Pl.rc b/dlls/credui/credui_Pl.rc index 902ced6..e2fab5c 100644 --- a/dlls/credui/credui_Pl.rc +++ b/dlls/credui/credui_Pl.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_Pt.rc b/dlls/credui/credui_Pt.rc index 930fb43..2283e43 100644 --- a/dlls/credui/credui_Pt.rc +++ b/dlls/credui/credui_Pt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_Ro.rc b/dlls/credui/credui_Ro.rc index 3d3367e..29e9899 100644 --- a/dlls/credui/credui_Ro.rc +++ b/dlls/credui/credui_Ro.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -49,5 +51,3 @@ STRINGTABLE DISCARDABLE IDS_CAPSLOCKONTITLE "Tasta Caps Lock este activată" IDS_CAPSLOCKON "Cu tasta Caps Lock activată este foarte probabil că veți introduce parola greșit.\n\nInainte de a introduce parola apăsați tasta Caps Lock pentru a dezactiva scrierea cu majuscule." } - -#pragma code_page(default) diff --git a/dlls/credui/credui_Ru.rc b/dlls/credui/credui_Ru.rc index fce2c5f..a990525 100644 --- a/dlls/credui/credui_Ru.rc +++ b/dlls/credui/credui_Ru.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_Si.rc b/dlls/credui/credui_Si.rc index d2152ad..34915e6 100644 --- a/dlls/credui/credui_Si.rc +++ b/dlls/credui/credui_Si.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -50,5 +52,3 @@ STRINGTABLE DISCARDABLE IDS_CAPSLOCKONTITLE "Caps Lock je vključen" IDS_CAPSLOCKON "Vključen Caps Lock je lahko vzrok nepravilnega vnosa gesla.\n\nPritisnite tipko Caps Lock, s čimer ga izklopite\nin ponovno vnesite geslo." } - -#pragma code_page(default) diff --git a/dlls/credui/credui_Sv.rc b/dlls/credui/credui_Sv.rc index 453b7a3..a43c216 100644 --- a/dlls/credui/credui_Sv.rc +++ b/dlls/credui/credui_Sv.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_Zh.rc b/dlls/credui/credui_Zh.rc index 99294c7..041aecd 100644 --- a/dlls/credui/credui_Zh.rc +++ b/dlls/credui/credui_Zh.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -82,5 +84,3 @@ STRINGTABLE DISCARDABLE IDS_CAPSLOCKONTITLE "大寫鎖定開著" IDS_CAPSLOCKON "開著大寫鎖定可能導致你輸入錯誤的密碼." } - -#pragma code_page(default) diff --git a/dlls/credui/credui_resources.h b/dlls/credui/credui_resources.h index e5bd8ee..0a6ab72 100644 --- a/dlls/credui/credui_resources.h +++ b/dlls/credui/credui_resources.h @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> +#include <winuser.h> + #define IDD_CREDDIALOG 100 #define IDC_USERNAME 101 #define IDC_PASSWORD 102

1 0

Michael Stefaniuc : oledlg: Build language resource files separately.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 2d170ae85092d1a4a6b6f284a23cfbbbf3d2edbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d170ae85092d1a4a6b6f284a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:34:01 2009 +0200 oledlg: Build language resource files separately. Do not include them from an other rc file. --- dlls/oledlg/Makefile.in | 22 +++++++++++++++++- dlls/oledlg/oledlg_Cs.rc | 2 + dlls/oledlg/oledlg_Da.rc | 2 + dlls/oledlg/oledlg_De.rc | 2 + dlls/oledlg/oledlg_En.rc | 2 + dlls/oledlg/oledlg_Es.rc | 2 + dlls/oledlg/oledlg_Fr.rc | 1 + dlls/oledlg/oledlg_Hu.rc | 2 + dlls/oledlg/oledlg_It.rc | 2 + dlls/oledlg/oledlg_Ja.rc | 4 +- dlls/oledlg/oledlg_Ko.rc | 2 + dlls/oledlg/oledlg_Lt.rc | 4 +- dlls/oledlg/oledlg_Nl.rc | 2 + dlls/oledlg/oledlg_No.rc | 2 + dlls/oledlg/oledlg_Pl.rc | 2 + dlls/oledlg/oledlg_Pt.rc | 2 + dlls/oledlg/oledlg_Ru.rc | 2 + dlls/oledlg/oledlg_Si.rc | 4 +- dlls/oledlg/oledlg_Sv.rc | 2 + dlls/oledlg/oledlg_Tr.rc | 2 + dlls/oledlg/oledlg_Zh.rc | 4 +- dlls/oledlg/resource.h | 2 + dlls/oledlg/rsrc.rc | 55 ---------------------------------------------- 23 files changed, 62 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d170ae85092d1a4a6b6f…

1 0

Michael Stefaniuc : winhlp32: Build language resource files separately.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 99e179445c28d66eef37dea2317680bec7f42da2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99e179445c28d66eef37dea23… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:31:44 2009 +0200 winhlp32: Build language resource files separately. Do not include them from an other rc file. --- programs/winhlp32/Bg.rc | 2 ++ programs/winhlp32/Cs.rc | 2 ++ programs/winhlp32/Da.rc | 2 ++ programs/winhlp32/De.rc | 2 ++ programs/winhlp32/En.rc | 2 ++ programs/winhlp32/Eo.rc | 2 ++ programs/winhlp32/Es.rc | 2 ++ programs/winhlp32/Fi.rc | 2 ++ programs/winhlp32/Fr.rc | 2 ++ programs/winhlp32/Hu.rc | 2 ++ programs/winhlp32/It.rc | 2 ++ programs/winhlp32/Ja.rc | 4 ++-- programs/winhlp32/Ko.rc | 2 ++ programs/winhlp32/Lt.rc | 4 ++-- programs/winhlp32/Makefile.in | 29 ++++++++++++++++++++++++++++- programs/winhlp32/Nl.rc | 2 ++ programs/winhlp32/No.rc | 2 ++ programs/winhlp32/Pl.rc | 2 ++ programs/winhlp32/Pt.rc | 2 ++ programs/winhlp32/Rm.rc | 2 ++ programs/winhlp32/Ru.rc | 2 ++ programs/winhlp32/Si.rc | 4 ++-- programs/winhlp32/Sk.rc | 2 ++ programs/winhlp32/Sv.rc | 2 ++ programs/winhlp32/Tr.rc | 2 ++ programs/winhlp32/Wa.rc | 2 ++ programs/winhlp32/Zh.rc | 4 ++-- programs/winhlp32/rsrc.rc | 31 ------------------------------- programs/winhlp32/winhelp_res.h | 3 +++ 29 files changed, 83 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=99e179445c28d66eef37d…

1 0

Michael Stefaniuc : notepad: Build language resource files separately.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 8e2f63684bdfc59c835bfe9e071ae7633aa9dba9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e2f63684bdfc59c835bfe9e0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:29:04 2009 +0200 notepad: Build language resource files separately. Do not include them from an other rc file. --- programs/notepad/Bg.rc | 2 ++ programs/notepad/Cs.rc | 2 ++ programs/notepad/Da.rc | 2 ++ programs/notepad/De.rc | 2 ++ programs/notepad/En.rc | 2 ++ programs/notepad/Eo.rc | 2 ++ programs/notepad/Es.rc | 2 ++ programs/notepad/Fi.rc | 2 ++ programs/notepad/Fr.rc | 2 ++ programs/notepad/Hu.rc | 2 ++ programs/notepad/It.rc | 2 ++ programs/notepad/Ja.rc | 4 ++-- programs/notepad/Ko.rc | 2 ++ programs/notepad/Lt.rc | 3 ++- programs/notepad/Makefile.in | 29 ++++++++++++++++++++++++++++- programs/notepad/Nl.rc | 2 ++ programs/notepad/No.rc | 2 ++ programs/notepad/Pl.rc | 2 ++ programs/notepad/Pt.rc | 2 ++ programs/notepad/Ro.rc | 4 ++-- programs/notepad/Ru.rc | 2 ++ programs/notepad/Si.rc | 4 ++-- programs/notepad/Sv.rc | 2 ++ programs/notepad/Th.rc | 2 ++ programs/notepad/Tr.rc | 2 ++ programs/notepad/Wa.rc | 2 ++ programs/notepad/Zh.rc | 4 ++-- programs/notepad/notepad_res.h | 3 +++ programs/notepad/rsrc.rc | 33 --------------------------------- 29 files changed, 83 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e2f63684bdfc59c835bf…

1 0

Michael Stefaniuc : comctl32: Build language resource files separately.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 4796550808bb96eba43fc63d748c7d00e119861c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4796550808bb96eba43fc63d7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:33:18 2009 +0200 comctl32: Build language resource files separately. Do not include them from an other rc file. --- dlls/comctl32/Makefile.in | 29 ++++++++++++++++++++++++++++- dlls/comctl32/comctl_Bg.rc | 2 ++ dlls/comctl32/comctl_Cs.rc | 2 ++ dlls/comctl32/comctl_De.rc | 2 ++ dlls/comctl32/comctl_El.rc | 2 ++ dlls/comctl32/comctl_En.rc | 2 ++ dlls/comctl32/comctl_Eo.rc | 2 ++ dlls/comctl32/comctl_Es.rc | 2 ++ dlls/comctl32/comctl_Fr.rc | 2 ++ dlls/comctl32/comctl_Hu.rc | 2 ++ dlls/comctl32/comctl_It.rc | 2 ++ dlls/comctl32/comctl_Ja.rc | 4 ++-- dlls/comctl32/comctl_Ko.rc | 2 ++ dlls/comctl32/comctl_Lt.rc | 4 ++-- dlls/comctl32/comctl_Nl.rc | 2 ++ dlls/comctl32/comctl_No.rc | 2 ++ dlls/comctl32/comctl_Pl.rc | 2 ++ dlls/comctl32/comctl_Pt.rc | 2 ++ dlls/comctl32/comctl_Ro.rc | 4 ++-- dlls/comctl32/comctl_Ru.rc | 2 ++ dlls/comctl32/comctl_Si.rc | 4 ++-- dlls/comctl32/comctl_Sk.rc | 2 ++ dlls/comctl32/comctl_Sv.rc | 2 ++ dlls/comctl32/comctl_Th.rc | 2 ++ dlls/comctl32/comctl_Tr.rc | 2 ++ dlls/comctl32/comctl_Uk.rc | 2 ++ dlls/comctl32/comctl_Zh.rc | 4 ++-- dlls/comctl32/rsrc.rc | 40 ---------------------------------------- 28 files changed, 80 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4796550808bb96eba43fc…

1 0

Michael Stefaniuc : shlwapi: Build language resource files separately.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 5b9a7edaaf5cab7e85a99d19ba3f055f31652c64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b9a7edaaf5cab7e85a99d19b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:34:14 2009 +0200 shlwapi: Build language resource files separately. Do not include them from an other rc file. --- dlls/shlwapi/Makefile.in | 26 +++++++++++++++++++++- dlls/shlwapi/resource.h | 3 ++ dlls/shlwapi/shlwapi.rc | 51 -------------------------------------------- dlls/shlwapi/shlwapi_Da.rc | 2 + dlls/shlwapi/shlwapi_De.rc | 2 + dlls/shlwapi/shlwapi_En.rc | 2 + dlls/shlwapi/shlwapi_Eo.rc | 2 + dlls/shlwapi/shlwapi_Es.rc | 2 + dlls/shlwapi/shlwapi_Fi.rc | 2 + dlls/shlwapi/shlwapi_Fr.rc | 2 + dlls/shlwapi/shlwapi_Hu.rc | 2 + dlls/shlwapi/shlwapi_It.rc | 2 + dlls/shlwapi/shlwapi_Ja.rc | 4 +- dlls/shlwapi/shlwapi_Ko.rc | 2 + dlls/shlwapi/shlwapi_Lt.rc | 4 +- dlls/shlwapi/shlwapi_Nl.rc | 2 + dlls/shlwapi/shlwapi_No.rc | 2 + dlls/shlwapi/shlwapi_Pl.rc | 2 + dlls/shlwapi/shlwapi_Pt.rc | 2 + dlls/shlwapi/shlwapi_Ro.rc | 4 +- dlls/shlwapi/shlwapi_Ru.rc | 2 + dlls/shlwapi/shlwapi_Si.rc | 4 +- dlls/shlwapi/shlwapi_Sk.rc | 2 + dlls/shlwapi/shlwapi_Sv.rc | 2 + dlls/shlwapi/shlwapi_Tr.rc | 2 + dlls/shlwapi/shlwapi_Uk.rc | 2 + dlls/shlwapi/shlwapi_Zh.rc | 4 +- 27 files changed, 76 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b9a7edaaf5cab7e85a99…

1 0