Michael Stefaniuc : gphoto2.ds: Build language resource files separately.
Alexandre Julliard
julliard at winehq.org
Wed Jul 1 09:28:10 CDT 2009
Module: wine
Branch: master
Commit: f894164d9fafc065479fb0f28c821c5c4fc2e0db
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f894164d9fafc065479fb0f28c821c5c4fc2e0db
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Wed Jul 1 10:16:08 2009 +0200
gphoto2.ds: Build language resource files separately.
Do not include them from an other rc file.
---
dlls/gphoto2.ds/Makefile.in | 16 ++++++++++++++-
dlls/gphoto2.ds/gphoto2_Da.rc | 2 +
dlls/gphoto2.ds/gphoto2_De.rc | 2 +
dlls/gphoto2.ds/gphoto2_En.rc | 2 +
dlls/gphoto2.ds/gphoto2_Es.rc | 5 ++-
dlls/gphoto2.ds/gphoto2_Fr.rc | 2 +
dlls/gphoto2.ds/gphoto2_Ko.rc | 2 +
dlls/gphoto2.ds/gphoto2_Lt.rc | 4 +-
dlls/gphoto2.ds/gphoto2_Nl.rc | 2 +
dlls/gphoto2.ds/gphoto2_No.rc | 2 +
dlls/gphoto2.ds/gphoto2_Pl.rc | 2 +
dlls/gphoto2.ds/gphoto2_Pt.rc | 2 +
dlls/gphoto2.ds/gphoto2_Ru.rc | 2 +
dlls/gphoto2.ds/gphoto2_Si.rc | 4 +-
dlls/gphoto2.ds/gphoto2_Sv.rc | 2 +
dlls/gphoto2.ds/gphoto2_Zh.rc | 4 +-
dlls/gphoto2.ds/resource.h | 5 ++++
dlls/gphoto2.ds/rsrc.rc | 43 -----------------------------------------
18 files changed, 51 insertions(+), 52 deletions(-)
diff --git a/dlls/gphoto2.ds/Makefile.in b/dlls/gphoto2.ds/Makefile.in
index 5e45e8e..3c1b3be 100644
--- a/dlls/gphoto2.ds/Makefile.in
+++ b/dlls/gphoto2.ds/Makefile.in
@@ -14,7 +14,21 @@ C_SRCS = \
ui.c
RC_SRCS = \
- rsrc.rc
+ gphoto2_Da.rc \
+ gphoto2_De.rc \
+ gphoto2_En.rc \
+ gphoto2_Es.rc \
+ gphoto2_Fr.rc \
+ gphoto2_Ko.rc \
+ gphoto2_Lt.rc \
+ gphoto2_Nl.rc \
+ gphoto2_No.rc \
+ gphoto2_Pl.rc \
+ gphoto2_Pt.rc \
+ gphoto2_Ru.rc \
+ gphoto2_Si.rc \
+ gphoto2_Sv.rc \
+ gphoto2_Zh.rc
@MAKE_DLL_RULES@
diff --git a/dlls/gphoto2.ds/gphoto2_Da.rc b/dlls/gphoto2.ds/gphoto2_Da.rc
index e8ef872..8859398 100644
--- a/dlls/gphoto2.ds/gphoto2_Da.rc
+++ b/dlls/gphoto2.ds/gphoto2_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_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273
diff --git a/dlls/gphoto2.ds/gphoto2_De.rc b/dlls/gphoto2.ds/gphoto2_De.rc
index ee17d6f..94ad6e2 100644
--- a/dlls/gphoto2.ds/gphoto2_De.rc
+++ b/dlls/gphoto2.ds/gphoto2_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_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273
diff --git a/dlls/gphoto2.ds/gphoto2_En.rc b/dlls/gphoto2.ds/gphoto2_En.rc
index 5b48650..37577e8 100644
--- a/dlls/gphoto2.ds/gphoto2_En.rc
+++ b/dlls/gphoto2.ds/gphoto2_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_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273
diff --git a/dlls/gphoto2.ds/gphoto2_Es.rc b/dlls/gphoto2.ds/gphoto2_Es.rc
index 99fc7d8..3f377fd 100644
--- a/dlls/gphoto2.ds/gphoto2_Es.rc
+++ b/dlls/gphoto2.ds/gphoto2_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 "resource.h"
+
#pragma code_page(65001)
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
@@ -55,5 +58,3 @@ BEGIN
LTEXT "Conectando a la cámara... Por favor espere",IDC_STATIC,128,58,
116,8
END
-
-#pragma code_page(default)
diff --git a/dlls/gphoto2.ds/gphoto2_Fr.rc b/dlls/gphoto2.ds/gphoto2_Fr.rc
index bd52e23..3d5d6d5 100644
--- a/dlls/gphoto2.ds/gphoto2_Fr.rc
+++ b/dlls/gphoto2.ds/gphoto2_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_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273
diff --git a/dlls/gphoto2.ds/gphoto2_Ko.rc b/dlls/gphoto2.ds/gphoto2_Ko.rc
index 2a61cff..8ea0a19 100644
--- a/dlls/gphoto2.ds/gphoto2_Ko.rc
+++ b/dlls/gphoto2.ds/gphoto2_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_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273
diff --git a/dlls/gphoto2.ds/gphoto2_Lt.rc b/dlls/gphoto2.ds/gphoto2_Lt.rc
index de2a525..c87dd77 100644
--- a/dlls/gphoto2.ds/gphoto2_Lt.rc
+++ b/dlls/gphoto2.ds/gphoto2_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)
@@ -56,5 +58,3 @@ BEGIN
LTEXT "Jungiamasi prie kameros... Prašome palaukti",IDC_STATIC,124,58,
140,8
END
-
-#pragma code_page(default)
diff --git a/dlls/gphoto2.ds/gphoto2_Nl.rc b/dlls/gphoto2.ds/gphoto2_Nl.rc
index 9527467..83acb70 100644
--- a/dlls/gphoto2.ds/gphoto2_Nl.rc
+++ b/dlls/gphoto2.ds/gphoto2_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_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273
diff --git a/dlls/gphoto2.ds/gphoto2_No.rc b/dlls/gphoto2.ds/gphoto2_No.rc
index b3cb0d8..7cc0176 100644
--- a/dlls/gphoto2.ds/gphoto2_No.rc
+++ b/dlls/gphoto2.ds/gphoto2_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_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273
diff --git a/dlls/gphoto2.ds/gphoto2_Pl.rc b/dlls/gphoto2.ds/gphoto2_Pl.rc
index 3c98599..4177328 100644
--- a/dlls/gphoto2.ds/gphoto2_Pl.rc
+++ b/dlls/gphoto2.ds/gphoto2_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_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273
diff --git a/dlls/gphoto2.ds/gphoto2_Pt.rc b/dlls/gphoto2.ds/gphoto2_Pt.rc
index fc4194e..c89d6ba 100644
--- a/dlls/gphoto2.ds/gphoto2_Pt.rc
+++ b/dlls/gphoto2.ds/gphoto2_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_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273
diff --git a/dlls/gphoto2.ds/gphoto2_Ru.rc b/dlls/gphoto2.ds/gphoto2_Ru.rc
index 891e116..ad03a35 100644
--- a/dlls/gphoto2.ds/gphoto2_Ru.rc
+++ b/dlls/gphoto2.ds/gphoto2_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_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273
diff --git a/dlls/gphoto2.ds/gphoto2_Si.rc b/dlls/gphoto2.ds/gphoto2_Si.rc
index 87d969f..2f1179d 100644
--- a/dlls/gphoto2.ds/gphoto2_Si.rc
+++ b/dlls/gphoto2.ds/gphoto2_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
@@ -54,5 +56,3 @@ BEGIN
LTEXT "Povezujem se s kamero ... Prosim, počakajte",IDC_STATIC,128,58,
116,8
END
-
-#pragma code_page(default)
diff --git a/dlls/gphoto2.ds/gphoto2_Sv.rc b/dlls/gphoto2.ds/gphoto2_Sv.rc
index 6ba9827..c7a3772 100644
--- a/dlls/gphoto2.ds/gphoto2_Sv.rc
+++ b/dlls/gphoto2.ds/gphoto2_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_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273
diff --git a/dlls/gphoto2.ds/gphoto2_Zh.rc b/dlls/gphoto2.ds/gphoto2_Zh.rc
index abd0f38..dfc758a 100644
--- a/dlls/gphoto2.ds/gphoto2_Zh.rc
+++ b/dlls/gphoto2.ds/gphoto2_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)
@@ -92,5 +94,3 @@ BEGIN
LTEXT "正在連接照相機... 請稍候",IDC_STATIC,128,58,
116,8
END
-
-#pragma code_page(default)
diff --git a/dlls/gphoto2.ds/resource.h b/dlls/gphoto2.ds/resource.h
index a13915a..8f2fe63 100644
--- a/dlls/gphoto2.ds/resource.h
+++ b/dlls/gphoto2.ds/resource.h
@@ -18,6 +18,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include <windef.h>
+#include <winbase.h>
+#include <winuser.h>
+#include <commctrl.h>
+
#define IDD_DIALOG1 0x400
#define IDD_CAMERAUI 0x401
#define IDD_CONNECTING 0x402
diff --git a/dlls/gphoto2.ds/rsrc.rc b/dlls/gphoto2.ds/rsrc.rc
deleted file mode 100644
index 7746785..0000000
--- a/dlls/gphoto2.ds/rsrc.rc
+++ /dev/null
@@ -1,43 +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 "commctrl.h"
-
-#include "resource.h"
-
-#include "gphoto2_Da.rc"
-#include "gphoto2_De.rc"
-#include "gphoto2_En.rc"
-#include "gphoto2_Es.rc"
-#include "gphoto2_Fr.rc"
-#include "gphoto2_Ko.rc"
-#include "gphoto2_Lt.rc"
-#include "gphoto2_Nl.rc"
-#include "gphoto2_No.rc"
-#include "gphoto2_Pl.rc"
-#include "gphoto2_Pt.rc"
-#include "gphoto2_Ru.rc"
-#include "gphoto2_Si.rc"
-#include "gphoto2_Sv.rc"
-#include "gphoto2_Zh.rc"
More information about the wine-cvs
mailing list