Sync to Wine-20050524:

Alexandre Julliard <julliard@winehq.org>
- Added rules for building import libraries in the individual dll
  makefiles, and added support for building a .def.a static import
  library too.
Vincent Beron <vberon@mecano.gme.usherb.ca>
- Use SUBLANG_NEUTRAL for French resources.

svn path=/trunk/; revision=15564

diff --git a/reactos/lib/oledlg/Makefile.in b/reactos/lib/oledlg/Makefile.in
index 77d14b2..e764d85 100644 (file)
--- a/reactos/lib/oledlg/Makefile.in
+++ b/reactos/lib/oledlg/Makefile.in
@@ -3,6 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@\r
 VPATH     = @srcdir@\r
 MODULE    = oledlg.dll\r
+IMPORTLIB = liboledlg.$(IMPLIBEXT)\r
 IMPORTS   = ole32 comdlg32 user32 advapi32 kernel32 ntdll\r
 \r
 C_SRCS = \\r

diff --git a/reactos/lib/oledlg/oledlg_Fr.rc b/reactos/lib/oledlg/oledlg_Fr.rc
index ed84aeb..a1d6797 100644 (file)
--- a/reactos/lib/oledlg/oledlg_Fr.rc
+++ b/reactos/lib/oledlg/oledlg_Fr.rc
@@ -20,7 +20,7 @@
  */\r
 \r
 \r
-LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT\r
+LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL\r
 \r
 UIINSERTOBJECT DIALOG DISCARDABLE  0, 0, 294, 151\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r