Module: wine Branch: master Commit: 80f4a9b72a2478495e01bf9b2d80e75d8503427f URL: http://source.winehq.org/git/wine.git/?a=commit;h=80f4a9b72a2478495e01bf9b2d...
Author: Michael Stefaniuc mstefani@redhat.de Date: Thu Jul 2 00:33:47 2009 +0200
localui: Build language resource files separately.
Do not include them from an other rc file.
---
dlls/localui/Makefile.in | 18 +++++++++++++++++- dlls/localui/localui.h | 2 ++ dlls/localui/localui.rc | 21 --------------------- dlls/localui/ui_Da.rc | 2 ++ dlls/localui/ui_De.rc | 2 ++ dlls/localui/ui_En.rc | 2 ++ dlls/localui/ui_Fr.rc | 5 +++-- dlls/localui/ui_Ko.rc | 2 ++ dlls/localui/ui_Lt.rc | 4 ++-- dlls/localui/ui_Nl.rc | 2 ++ dlls/localui/ui_No.rc | 2 ++ dlls/localui/ui_Pl.rc | 2 ++ dlls/localui/ui_Pt.rc | 2 ++ dlls/localui/ui_Ro.rc | 4 ++-- dlls/localui/ui_Ru.rc | 2 ++ dlls/localui/ui_Si.rc | 4 ++-- dlls/localui/ui_Sv.rc | 2 ++ dlls/localui/ui_Zh.rc | 4 ++-- 18 files changed, 50 insertions(+), 32 deletions(-)
diff --git a/dlls/localui/Makefile.in b/dlls/localui/Makefile.in index 6a43906..75090a1 100644 --- a/dlls/localui/Makefile.in +++ b/dlls/localui/Makefile.in @@ -8,7 +8,23 @@ IMPORTS = winspool user32 kernel32 C_SRCS = \ localui.c
-RC_SRCS = localui.rc +RC_SRCS = \ + localui.rc \ + ui_Da.rc \ + ui_De.rc \ + ui_En.rc \ + ui_Fr.rc \ + ui_Ko.rc \ + ui_Lt.rc \ + ui_Nl.rc \ + ui_No.rc \ + ui_Pl.rc \ + ui_Pt.rc \ + ui_Ro.rc \ + ui_Ru.rc \ + ui_Si.rc \ + ui_Sv.rc \ + ui_Zh.rc
@MAKE_DLL_RULES@
diff --git a/dlls/localui/localui.h b/dlls/localui/localui.h index aa244bd..25424da 100644 --- a/dlls/localui/localui.h +++ b/dlls/localui/localui.h @@ -21,6 +21,8 @@ #ifndef __WINE_LOCALUI__ #define __WINE_LOCALUI__
+#include <windef.h> +#include <winuser.h>
/* ## Resource-ID ## */ #define ADDPORT_DIALOG 100 diff --git a/dlls/localui/localui.rc b/dlls/localui/localui.rc index 9963acb..cdf7bb4 100644 --- a/dlls/localui/localui.rc +++ b/dlls/localui/localui.rc @@ -19,10 +19,6 @@ * */
-#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winver.h" #include "localui.h"
#define WINE_FILENAME_STR "localui.dll" @@ -36,20 +32,3 @@ #define WINE_PRODUCTVERSION_STR "5.1.2600.2180"
#include "wine/wine_common_ver.rc" - - -#include "ui_Da.rc" -#include "ui_De.rc" -#include "ui_En.rc" -#include "ui_Fr.rc" -#include "ui_Ko.rc" -#include "ui_Lt.rc" -#include "ui_Nl.rc" -#include "ui_No.rc" -#include "ui_Pl.rc" -#include "ui_Pt.rc" -#include "ui_Ro.rc" -#include "ui_Ru.rc" -#include "ui_Si.rc" -#include "ui_Sv.rc" -#include "ui_Zh.rc" diff --git a/dlls/localui/ui_Da.rc b/dlls/localui/ui_Da.rc index 9729926..861ba8f 100644 --- a/dlls/localui/ui_Da.rc +++ b/dlls/localui/ui_Da.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "localui.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 diff --git a/dlls/localui/ui_De.rc b/dlls/localui/ui_De.rc index 2fe35fc..5f65a80 100644 --- a/dlls/localui/ui_De.rc +++ b/dlls/localui/ui_De.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "localui.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 diff --git a/dlls/localui/ui_En.rc b/dlls/localui/ui_En.rc index c2de626..5a21868 100644 --- a/dlls/localui/ui_En.rc +++ b/dlls/localui/ui_En.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "localui.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 diff --git a/dlls/localui/ui_Fr.rc b/dlls/localui/ui_Fr.rc index 261fa0b..70e4baf 100644 --- a/dlls/localui/ui_Fr.rc +++ b/dlls/localui/ui_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 "localui.h" + #pragma code_page(65001)
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL @@ -53,5 +56,3 @@ STRINGTABLE DISCARDABLE IDS_PORTEXISTS "Le port %s existe déjà" IDS_NOTHINGTOCONFIG "Ce port n'a pas d'options de configuration" } - -#pragma code_page(default) diff --git a/dlls/localui/ui_Ko.rc b/dlls/localui/ui_Ko.rc index 9a38030..d86b7ef 100644 --- a/dlls/localui/ui_Ko.rc +++ b/dlls/localui/ui_Ko.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "localui.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 diff --git a/dlls/localui/ui_Lt.rc b/dlls/localui/ui_Lt.rc index 660cea4..87997d0 100644 --- a/dlls/localui/ui_Lt.rc +++ b/dlls/localui/ui_Lt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "localui.h" + /* UTF-8 */ #pragma code_page(65001)
@@ -55,5 +57,3 @@ STRINGTABLE DISCARDABLE IDS_PORTEXISTS "Prievadas %s jau egzistuoja" IDS_NOTHINGTOCONFIG "Šis prievadas neturi parinkčių konfigūravimui" } - -#pragma code_page(default) diff --git a/dlls/localui/ui_Nl.rc b/dlls/localui/ui_Nl.rc index 59c58ff..21d7cc8 100644 --- a/dlls/localui/ui_Nl.rc +++ b/dlls/localui/ui_Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "localui.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 diff --git a/dlls/localui/ui_No.rc b/dlls/localui/ui_No.rc index 3a46bc8..8ed9e00 100644 --- a/dlls/localui/ui_No.rc +++ b/dlls/localui/ui_No.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "localui.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 diff --git a/dlls/localui/ui_Pl.rc b/dlls/localui/ui_Pl.rc index 74a5015..822763d 100644 --- a/dlls/localui/ui_Pl.rc +++ b/dlls/localui/ui_Pl.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "localui.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 diff --git a/dlls/localui/ui_Pt.rc b/dlls/localui/ui_Pt.rc index 7bad521..7f16848 100644 --- a/dlls/localui/ui_Pt.rc +++ b/dlls/localui/ui_Pt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "localui.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 diff --git a/dlls/localui/ui_Ro.rc b/dlls/localui/ui_Ro.rc index 43edfe6..a1b1c77 100644 --- a/dlls/localui/ui_Ro.rc +++ b/dlls/localui/ui_Ro.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "localui.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
#pragma code_page(65001) @@ -53,5 +55,3 @@ STRINGTABLE DISCARDABLE IDS_PORTEXISTS "Portul %s existsă deja" IDS_NOTHINGTOCONFIG "Acest port nu are opțiuni de configurat" } - -#pragma code_page(default) diff --git a/dlls/localui/ui_Ru.rc b/dlls/localui/ui_Ru.rc index 96e78f1..3402f37 100644 --- a/dlls/localui/ui_Ru.rc +++ b/dlls/localui/ui_Ru.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "localui.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 diff --git a/dlls/localui/ui_Si.rc b/dlls/localui/ui_Si.rc index 961a2e0..6810c7c 100644 --- a/dlls/localui/ui_Si.rc +++ b/dlls/localui/ui_Si.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "localui.h" + #pragma code_page(65001)
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -54,5 +56,3 @@ STRINGTABLE DISCARDABLE IDS_PORTEXISTS "Vrata z imenom %s že obstajajo" IDS_NOTHINGTOCONFIG "Ta vrata nimajo možnosti nastavitve" } - -#pragma code_page(default) diff --git a/dlls/localui/ui_Sv.rc b/dlls/localui/ui_Sv.rc index 3cd22fd..e137079 100644 --- a/dlls/localui/ui_Sv.rc +++ b/dlls/localui/ui_Sv.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "localui.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 diff --git a/dlls/localui/ui_Zh.rc b/dlls/localui/ui_Zh.rc index 197ac1d..f43dde9 100644 --- a/dlls/localui/ui_Zh.rc +++ b/dlls/localui/ui_Zh.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "localui.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001)
@@ -90,5 +92,3 @@ STRINGTABLE DISCARDABLE IDS_PORTEXISTS "端口 %s 已經存在" IDS_NOTHINGTOCONFIG "這個端口沒有可設定選項" } - -#pragma code_page(default)