diff --git a/boost/boost/integer_traits.hpp b/boost/boost/integer_traits.hpp
index 54526907ce..2977346fa2 100644
--- a/boost/boost/integer_traits.hpp
+++ b/boost/boost/integer_traits.hpp
@@ -10,7 +10,7 @@
  * software for any purpose. It is provided "as is" without express or
  * implied warranty.
  *
- * $Id: integer_traits.hpp,v 1.19.4.1 2002/09/24 11:38:33 johnmaddock Exp $
+ * $Id: integer_traits.hpp,v 1.7 2002/10/15 17:51:34 larsbj Exp $
  *
  * Idea by Beman Dawes, Ed Brey, Steve Cleary, and Nathan Myers
  */
@@ -93,7 +93,7 @@ class integer_traits<wchar_t>
 #elif defined(__BORLANDC__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__BEOS__) && defined(__GNUC__))
     // No WCHAR_MIN and WCHAR_MAX, whar_t is short and unsigned:
     public detail::integer_traits_base<wchar_t, 0, 0xffff>
-#elif (defined(__sgi) && (!defined(__SGI_STL_PORT) || __SGI_STL_PORT < 0x400)) || (defined __APPLE__) || (defined(__FreeBSD__) && defined(__GNUC__)) || (defined(__hpux) && defined(__GNUC__) && (__GNUC__ == 3) && !defined(__SGI_STL_PORT))
+#elif (defined(__sgi) && (!defined(__SGI_STL_PORT) || __SGI_STL_PORT < 0x400)) || (defined __APPLE__) || (defined(__FreeBSD__) && defined(__GNUC__)) || (defined(__OpenBSD__) && defined(__GNUC__)) || (defined(__hpux) && defined(__GNUC__) && (__GNUC__ == 3) && !defined(__SGI_STL_PORT))
     // No WCHAR_MIN and WCHAR_MAX, wchar_t has the same range as int.
     //  - SGI MIPSpro with native library
     //  - gcc 3.x on HP-UX
diff --git a/boost/boost/regex/config.hpp b/boost/boost/regex/config.hpp
index 2f46159ff3..dd1cd37513 100644
--- a/boost/boost/regex/config.hpp
+++ b/boost/boost/regex/config.hpp
@@ -125,8 +125,10 @@
 // If there isn't good enough wide character support then there will
 // be no wide character regular expressions:
 //
-#if (defined(BOOST_NO_CWCHAR) || defined(BOOST_NO_CWCTYPE) || defined(BOOST_NO_STD_WSTRING)) && !defined(BOOST_NO_WREGEX)
-#  define BOOST_NO_WREGEX
+#if defined(BOOST_NO_CWCHAR) || defined(BOOST_NO_CWCTYPE) || defined(BOOST_NO_STD_WSTRING)
+#  ifndef BOOST_NO_WREGEX
+#    define BOOST_NO_WREGEX
+#  endif
 #else
 #  if defined(__sgi) && defined(__SGI_STL_PORT)
       // STLPort on IRIX is misconfigured: <cwctype> does not compile
diff --git a/boost/boost/regex/detail/regex_match.hpp b/boost/boost/regex/detail/regex_match.hpp
index a0e6b48ce1..7ddfa8360d 100644
--- a/boost/boost/regex/detail/regex_match.hpp
+++ b/boost/boost/regex/detail/regex_match.hpp
@@ -56,8 +56,10 @@ inline int string_compare(const std::basic_string<C,T,A>& s, const C* p)
 { return s.compare(p); }
 inline int string_compare(const std::string& s, const char* p)
 { return std::strcmp(s.c_str(), p); }
+# ifndef BOOST_NO_WREGEX
 inline int string_compare(const std::wstring& s, const wchar_t* p)
 { return std::wcscmp(s.c_str(), p); }
+# endif
 # define STR_COMP(s,p) string_compare(s,p)
 #endif
 
diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 2d3911e2fa..22c944e9d2 100644
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-10  Joćo Luis Meloni Assirati  <assirati@fma.if.usp.br>
+
+	* ui/QMathMatrixDialogBase.ui: Fix horizontal alignment tooltip
+
 2003-02-07  John Levon  <levon@movementarian.org>
 
 	* lyx_gui.C: delete lyxserver pipes (bug 865)
diff --git a/src/frontends/qt2/ui/QMathMatrixDialogBase.ui b/src/frontends/qt2/ui/QMathMatrixDialogBase.ui
index b996a1395c..c27ed15df6 100644
--- a/src/frontends/qt2/ui/QMathMatrixDialogBase.ui
+++ b/src/frontends/qt2/ui/QMathMatrixDialogBase.ui
@@ -377,7 +377,7 @@
                     </property>
                     <property>
                         <name>toolTip</name>
-                        <string>Horizontal alignment per column (t,c,b)</string>
+                        <string>Horizontal alignment per column (l,c,r)</string>
                     </property>
                 </widget>
                 <widget row="0"  column="1" >
diff --git a/status.13x b/status.13x
index 4239adef3a..f087abed61 100644
--- a/status.13x
+++ b/status.13x
@@ -27,6 +27,8 @@ What's new
 
 - new "polski" keymap, useful for entering Polish on a QWERTY keyboard
 
+- updated french translation of menus
+
 ** Bug fixes
 
 - fix bug where opening the tabular dialog would mark the document as