Module: wine Branch: master Commit: 6f4b74de5b5153cb6bd59fe253b1f83b65da5e3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f4b74de5b5153cb6bd59fe253...
Author: Michael Stefaniuc mstefani@redhat.de Date: Thu Jul 2 00:27:58 2009 +0200
sane.ds: Build language resource files separately.
Do not include them from an other rc file.
---
dlls/sane.ds/Makefile.in | 18 +++++++++++++++++- dlls/sane.ds/resource.h | 4 ++++ dlls/sane.ds/rsrc.rc | 44 -------------------------------------------- dlls/sane.ds/sane_Da.rc | 2 ++ dlls/sane.ds/sane_De.rc | 2 ++ dlls/sane.ds/sane_En.rc | 2 ++ dlls/sane.ds/sane_Es.rc | 5 +++-- dlls/sane.ds/sane_Fi.rc | 2 ++ dlls/sane.ds/sane_Fr.rc | 2 ++ dlls/sane.ds/sane_Ko.rc | 2 ++ dlls/sane.ds/sane_Lt.rc | 4 ++-- dlls/sane.ds/sane_Nl.rc | 2 ++ dlls/sane.ds/sane_No.rc | 2 ++ dlls/sane.ds/sane_Pl.rc | 2 ++ dlls/sane.ds/sane_Pt.rc | 2 ++ dlls/sane.ds/sane_Ro.rc | 4 ++-- dlls/sane.ds/sane_Ru.rc | 2 ++ dlls/sane.ds/sane_Si.rc | 4 ++-- dlls/sane.ds/sane_Sv.rc | 2 ++ dlls/sane.ds/sane_Zh.rc | 4 ++-- 20 files changed, 56 insertions(+), 55 deletions(-)
diff --git a/dlls/sane.ds/Makefile.in b/dlls/sane.ds/Makefile.in index d136594..e394939 100644 --- a/dlls/sane.ds/Makefile.in +++ b/dlls/sane.ds/Makefile.in @@ -15,7 +15,23 @@ C_SRCS = \ ui.c
RC_SRCS = \ - rsrc.rc + sane_Da.rc \ + sane_De.rc \ + sane_En.rc \ + sane_Es.rc \ + sane_Fi.rc \ + sane_Fr.rc \ + sane_Ko.rc \ + sane_Lt.rc \ + sane_Nl.rc \ + sane_No.rc \ + sane_Pl.rc \ + sane_Pt.rc \ + sane_Ro.rc \ + sane_Ru.rc \ + sane_Si.rc \ + sane_Sv.rc \ + sane_Zh.rc
@MAKE_DLL_RULES@
diff --git a/dlls/sane.ds/resource.h b/dlls/sane.ds/resource.h index abc2044..2454fbd 100644 --- a/dlls/sane.ds/resource.h +++ b/dlls/sane.ds/resource.h @@ -18,6 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include <windef.h> +#include <winbase.h> +#include <winuser.h> + #define IDD_DIALOG1 0x400
#define IDC_STATIC 0x401 diff --git a/dlls/sane.ds/rsrc.rc b/dlls/sane.ds/rsrc.rc deleted file mode 100644 index ac80eb9..0000000 --- a/dlls/sane.ds/rsrc.rc +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Top level resource file for Twain - * - * Copyright 2006 CodeWeavers, Aric Stewart - * - * 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 "resource.h" - -#include "sane_Da.rc" -#include "sane_De.rc" -#include "sane_En.rc" -#include "sane_Es.rc" -#include "sane_Fi.rc" -#include "sane_Fr.rc" -#include "sane_Ko.rc" -#include "sane_Lt.rc" -#include "sane_Nl.rc" -#include "sane_No.rc" -#include "sane_Pl.rc" -#include "sane_Pt.rc" -#include "sane_Ro.rc" -#include "sane_Ru.rc" -#include "sane_Si.rc" -#include "sane_Sv.rc" -#include "sane_Zh.rc" diff --git a/dlls/sane.ds/sane_Da.rc b/dlls/sane.ds/sane_Da.rc index 5a93ff1..98d89da 100644 --- a/dlls/sane.ds/sane_Da.rc +++ b/dlls/sane.ds/sane_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
IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_De.rc b/dlls/sane.ds/sane_De.rc index 172098e..a1be1e4 100644 --- a/dlls/sane.ds/sane_De.rc +++ b/dlls/sane.ds/sane_De.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_En.rc b/dlls/sane.ds/sane_En.rc index 3b58a0a..d0d56b8 100644 --- a/dlls/sane.ds/sane_En.rc +++ b/dlls/sane.ds/sane_En.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_Es.rc b/dlls/sane.ds/sane_Es.rc index 0f0b4cb..c65ebf9 100644 --- a/dlls/sane.ds/sane_Es.rc +++ b/dlls/sane.ds/sane_Es.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 "resource.h" + #pragma code_page(65001)
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -39,5 +42,3 @@ STRINGTABLE DISCARDABLE 5 "%" 6 "ns" } - -#pragma code_page(default) diff --git a/dlls/sane.ds/sane_Fi.rc b/dlls/sane.ds/sane_Fi.rc index 85a664b..329eb06 100644 --- a/dlls/sane.ds/sane_Fi.rc +++ b/dlls/sane.ds/sane_Fi.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h" + LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_Fr.rc b/dlls/sane.ds/sane_Fr.rc index b54153c..49b0747 100644 --- a/dlls/sane.ds/sane_Fr.rc +++ b/dlls/sane.ds/sane_Fr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_Ko.rc b/dlls/sane.ds/sane_Ko.rc index 980897a..4a145b2 100644 --- a/dlls/sane.ds/sane_Ko.rc +++ b/dlls/sane.ds/sane_Ko.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_Lt.rc b/dlls/sane.ds/sane_Lt.rc index c96eceb..0afe173 100644 --- a/dlls/sane.ds/sane_Lt.rc +++ b/dlls/sane.ds/sane_Lt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h" + /* UTF-8 */ #pragma code_page(65001)
@@ -41,5 +43,3 @@ STRINGTABLE DISCARDABLE 5 "%" 6 "ns" } - -#pragma code_page(default) diff --git a/dlls/sane.ds/sane_Nl.rc b/dlls/sane.ds/sane_Nl.rc index 66559ab..ded7061 100644 --- a/dlls/sane.ds/sane_Nl.rc +++ b/dlls/sane.ds/sane_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
IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_No.rc b/dlls/sane.ds/sane_No.rc index 4d89f06..1392788 100644 --- a/dlls/sane.ds/sane_No.rc +++ b/dlls/sane.ds/sane_No.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_Pl.rc b/dlls/sane.ds/sane_Pl.rc index 43a7e8b..344d0c7 100644 --- a/dlls/sane.ds/sane_Pl.rc +++ b/dlls/sane.ds/sane_Pl.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_Pt.rc b/dlls/sane.ds/sane_Pt.rc index 4f4ffea..9b0ff41 100644 --- a/dlls/sane.ds/sane_Pt.rc +++ b/dlls/sane.ds/sane_Pt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_Ro.rc b/dlls/sane.ds/sane_Ro.rc index 7199a61..dc02708 100644 --- a/dlls/sane.ds/sane_Ro.rc +++ b/dlls/sane.ds/sane_Ro.rc @@ -17,6 +17,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) @@ -39,5 +41,3 @@ STRINGTABLE DISCARDABLE 5 "%" 6 "ns" } - -#pragma code_page(default) diff --git a/dlls/sane.ds/sane_Ru.rc b/dlls/sane.ds/sane_Ru.rc index 58ee473..eefe277 100644 --- a/dlls/sane.ds/sane_Ru.rc +++ b/dlls/sane.ds/sane_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
IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_Si.rc b/dlls/sane.ds/sane_Si.rc index ad6b875..04e7c67 100644 --- a/dlls/sane.ds/sane_Si.rc +++ b/dlls/sane.ds/sane_Si.rc @@ -18,6 +18,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 @@ -40,5 +42,3 @@ STRINGTABLE DISCARDABLE 5 "%" 6 "ns" } - -#pragma code_page(default) diff --git a/dlls/sane.ds/sane_Sv.rc b/dlls/sane.ds/sane_Sv.rc index 90aab55..dee4f45 100644 --- a/dlls/sane.ds/sane_Sv.rc +++ b/dlls/sane.ds/sane_Sv.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_Zh.rc b/dlls/sane.ds/sane_Zh.rc index 955b6e1..2487a6a 100644 --- a/dlls/sane.ds/sane_Zh.rc +++ b/dlls/sane.ds/sane_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)
@@ -62,5 +64,3 @@ STRINGTABLE DISCARDABLE 5 "%" 6 "ns" } - -#pragma code_page(default)
-
Alexandre Julliard