oledlg: Build language resource files separately.
Michael Stefaniuc
mstefani at redhat.de
Wed Jul 1 17:34:01 CDT 2009
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(-)
delete mode 100644 dlls/oledlg/rsrc.rc
diff --git a/dlls/oledlg/Makefile.in b/dlls/oledlg/Makefile.in
index 73f079b..e60e150 100644
--- a/dlls/oledlg/Makefile.in
+++ b/dlls/oledlg/Makefile.in
@@ -11,7 +11,27 @@ C_SRCS = \
oledlg_main.c \
pastespl.c
-RC_SRCS = rsrc.rc
+RC_SRCS = \
+ oledlg_Cs.rc \
+ oledlg_Da.rc \
+ oledlg_De.rc \
+ oledlg_En.rc \
+ oledlg_Es.rc \
+ oledlg_Fr.rc \
+ oledlg_Hu.rc \
+ oledlg_It.rc \
+ oledlg_Ja.rc \
+ oledlg_Ko.rc \
+ oledlg_Lt.rc \
+ oledlg_Nl.rc \
+ oledlg_No.rc \
+ oledlg_Pl.rc \
+ oledlg_Pt.rc \
+ oledlg_Ru.rc \
+ oledlg_Si.rc \
+ oledlg_Sv.rc \
+ oledlg_Tr.rc \
+ oledlg_Zh.rc
@MAKE_DLL_RULES@
diff --git a/dlls/oledlg/oledlg_Cs.rc b/dlls/oledlg/oledlg_Cs.rc
index 4271a76..1cf0385 100644
--- a/dlls/oledlg/oledlg_Cs.rc
+++ b/dlls/oledlg/oledlg_Cs.rc
@@ -19,6 +19,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/dlls/oledlg/oledlg_Da.rc b/dlls/oledlg/oledlg_Da.rc
index d1ef069..852733a 100644
--- a/dlls/oledlg/oledlg_Da.rc
+++ b/dlls/oledlg/oledlg_Da.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151
diff --git a/dlls/oledlg/oledlg_De.rc b/dlls/oledlg/oledlg_De.rc
index b2ae5fa..a4c155a 100644
--- a/dlls/oledlg/oledlg_De.rc
+++ b/dlls/oledlg/oledlg_De.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151
diff --git a/dlls/oledlg/oledlg_En.rc b/dlls/oledlg/oledlg_En.rc
index 5b89a25..5dd5be4 100644
--- a/dlls/oledlg/oledlg_En.rc
+++ b/dlls/oledlg/oledlg_En.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151
diff --git a/dlls/oledlg/oledlg_Es.rc b/dlls/oledlg/oledlg_Es.rc
index 44d8d92..74f8c08 100644
--- a/dlls/oledlg/oledlg_Es.rc
+++ b/dlls/oledlg/oledlg_Es.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151
diff --git a/dlls/oledlg/oledlg_Fr.rc b/dlls/oledlg/oledlg_Fr.rc
index 41654cb..5bbffb2 100644
--- a/dlls/oledlg/oledlg_Fr.rc
+++ b/dlls/oledlg/oledlg_Fr.rc
@@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
diff --git a/dlls/oledlg/oledlg_Hu.rc b/dlls/oledlg/oledlg_Hu.rc
index 58cc088..30bd8e0 100644
--- a/dlls/oledlg/oledlg_Hu.rc
+++ b/dlls/oledlg/oledlg_Hu.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151
diff --git a/dlls/oledlg/oledlg_It.rc b/dlls/oledlg/oledlg_It.rc
index 2a23abd..91e43b2 100644
--- a/dlls/oledlg/oledlg_It.rc
+++ b/dlls/oledlg/oledlg_It.rc
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151
diff --git a/dlls/oledlg/oledlg_Ja.rc b/dlls/oledlg/oledlg_Ja.rc
index d753022..0029ff3 100644
--- a/dlls/oledlg/oledlg_Ja.rc
+++ b/dlls/oledlg/oledlg_Ja.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
/* UTF-8 */
#pragma code_page(65001)
@@ -56,5 +58,3 @@ STRINGTABLE DISCARDABLE
IDS_NOTOLEMOD "ファイルã¯æœ‰åŠ¹ãªOLEモジュールã§ã¯ãªã„よã†ã§ã™ã€‚OLEコントãƒãƒ¼ãƒ«ã‚’登録ã§ãã¾ã›ã‚“。"
IDS_NOTOLEMODCAPTION "コントãƒãƒ¼ãƒ«ã‚’è¿½åŠ "
}
-
-#pragma code_page(default)
diff --git a/dlls/oledlg/oledlg_Ko.rc b/dlls/oledlg/oledlg_Ko.rc
index 32a4930..7e0ae7e 100644
--- a/dlls/oledlg/oledlg_Ko.rc
+++ b/dlls/oledlg/oledlg_Ko.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151
diff --git a/dlls/oledlg/oledlg_Lt.rc b/dlls/oledlg/oledlg_Lt.rc
index d2e239b..e8ac5f7 100644
--- a/dlls/oledlg/oledlg_Lt.rc
+++ b/dlls/oledlg/oledlg_Lt.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
/* UTF-8 */
#pragma code_page(65001)
@@ -96,5 +98,3 @@ STRINGTABLE DISCARDABLE
IDS_PS_UNKNOWN_SRC "Nežinomas šaltinis"
IDS_PS_UNKNOWN_APP "programa, kuri jį sukūrė"
}
-
-#pragma code_page(default)
diff --git a/dlls/oledlg/oledlg_Nl.rc b/dlls/oledlg/oledlg_Nl.rc
index 27b0e74..58a63da 100644
--- a/dlls/oledlg/oledlg_Nl.rc
+++ b/dlls/oledlg/oledlg_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
UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151
diff --git a/dlls/oledlg/oledlg_No.rc b/dlls/oledlg/oledlg_No.rc
index 4e04114..5657d49 100644
--- a/dlls/oledlg/oledlg_No.rc
+++ b/dlls/oledlg/oledlg_No.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151
diff --git a/dlls/oledlg/oledlg_Pl.rc b/dlls/oledlg/oledlg_Pl.rc
index 1777dcb..079a2b9 100644
--- a/dlls/oledlg/oledlg_Pl.rc
+++ b/dlls/oledlg/oledlg_Pl.rc
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 310, 151
diff --git a/dlls/oledlg/oledlg_Pt.rc b/dlls/oledlg/oledlg_Pt.rc
index 69cd06a..1ab7a02 100644
--- a/dlls/oledlg/oledlg_Pt.rc
+++ b/dlls/oledlg/oledlg_Pt.rc
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151
diff --git a/dlls/oledlg/oledlg_Ru.rc b/dlls/oledlg/oledlg_Ru.rc
index 10453ef..be02080 100644
--- a/dlls/oledlg/oledlg_Ru.rc
+++ b/dlls/oledlg/oledlg_Ru.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151
diff --git a/dlls/oledlg/oledlg_Si.rc b/dlls/oledlg/oledlg_Si.rc
index 04e0eb3..0f737af 100644
--- a/dlls/oledlg/oledlg_Si.rc
+++ b/dlls/oledlg/oledlg_Si.rc
@@ -16,6 +16,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
@@ -95,5 +97,3 @@ STRINGTABLE DISCARDABLE
IDS_PS_UNKNOWN_SRC "Neznan vir"
IDS_PS_UNKNOWN_APP "Neznan program"
}
-
-#pragma code_page(default)
diff --git a/dlls/oledlg/oledlg_Sv.rc b/dlls/oledlg/oledlg_Sv.rc
index c775f46..6a38d90 100644
--- a/dlls/oledlg/oledlg_Sv.rc
+++ b/dlls/oledlg/oledlg_Sv.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151
diff --git a/dlls/oledlg/oledlg_Tr.rc b/dlls/oledlg/oledlg_Tr.rc
index 8a96fe4..7e68c00 100644
--- a/dlls/oledlg/oledlg_Tr.rc
+++ b/dlls/oledlg/oledlg_Tr.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151
diff --git a/dlls/oledlg/oledlg_Zh.rc b/dlls/oledlg/oledlg_Zh.rc
index 2f2daed..40aac0b 100644
--- a/dlls/oledlg/oledlg_Zh.rc
+++ b/dlls/oledlg/oledlg_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)
@@ -176,5 +178,3 @@ STRINGTABLE DISCARDABLE
IDS_PS_UNKNOWN_SRC "ä¸æ˜Žä¾†æº"
IDS_PS_UNKNOWN_APP "ä¸æ˜Žæ‡‰ç”¨ç¨‹å¼"
}
-
-#pragma code_page(default)
diff --git a/dlls/oledlg/resource.h b/dlls/oledlg/resource.h
index 518f7ba..13ca052 100644
--- a/dlls/oledlg/resource.h
+++ b/dlls/oledlg/resource.h
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include <oledlg.h>
+
#define IDS_RESULTOBJDESC 101
#define IDS_RESULTFILEOBJDESC 102
#define IDS_BROWSE 103
diff --git a/dlls/oledlg/rsrc.rc b/dlls/oledlg/rsrc.rc
deleted file mode 100644
index ee433af..0000000
--- a/dlls/oledlg/rsrc.rc
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Top level resource file for OLE Dialogs
- *
- * Copyright 2003 Ulrich Czekalla for CodeWeavers
- *
- * 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 "winbase.h"
-#include "winuser.h"
-#include "winnls.h"
-#include "oledlg.h"
-
-#include "resource.h"
-
-/*
- * Everything specific to any language goes
- * in one of the specific files.
- * Note that you can and may override resources
- * which also have a neutral version. This is to
- * get localized bitmaps for example.
- */
-#include "oledlg_Cs.rc"
-#include "oledlg_Da.rc"
-#include "oledlg_De.rc"
-#include "oledlg_En.rc"
-#include "oledlg_Es.rc"
-#include "oledlg_Fr.rc"
-#include "oledlg_Hu.rc"
-#include "oledlg_It.rc"
-#include "oledlg_Ja.rc"
-#include "oledlg_Ko.rc"
-#include "oledlg_Lt.rc"
-#include "oledlg_Nl.rc"
-#include "oledlg_No.rc"
-#include "oledlg_Pl.rc"
-#include "oledlg_Pt.rc"
-#include "oledlg_Ru.rc"
-#include "oledlg_Si.rc"
-#include "oledlg_Sv.rc"
-#include "oledlg_Tr.rc"
-#include "oledlg_Zh.rc"
--
1.6.3.3
More information about the wine-patches
mailing list