MWS_SRX644: migrate branch mws_srx644 -> HEAD

266 files changed, 19628 insertions, 17545 deletions

diff --git a/svx/source/accessibility/AccessibleContextBase.cxx b/svx/source/accessibility/AccessibleContextBase.cxx
index 2903ebe51a58..1b241c435e7b 100644
--- a/svx/source/accessibility/AccessibleContextBase.cxx
+++ b/svx/source/accessibility/AccessibleContextBase.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleContextBase.cxx,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: thb $ $Date: 2002-11-29 17:56:47 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -86,6 +86,9 @@
 #ifndef _UTL_ACCESSIBLERELATIONSETHELPER_HXX_
 #include <unotools/accessiblerelationsethelper.hxx>
 #endif
+#ifndef COMPHELPER_ACCESSIBLE_EVENT_NOTIFIER
+#include <comphelper/accessibleeventnotifier.hxx>
+#endif
 
 #ifndef _RTL_UUID_H_
 #include <rtl/uuid.h>
@@ -119,7 +122,8 @@ AccessibleContextBase::AccessibleContextBase (
         mxStateSet (NULL),
         mxRelationSet (NULL),
         mxParent(rxParent),
-        maRole(aRole)
+        maRole(aRole),
+        mnClientId(0)
 {
     // Create the state set.
     ::utl::AccessibleStateSetHelper* pStateSet  = new ::utl::AccessibleStateSetHelper ();
@@ -284,7 +288,7 @@ sal_Int32 SAL_CALL
 */
 uno::Reference<XAccessible> SAL_CALL
     AccessibleContextBase::getAccessibleChild (long nIndex)
-    throw (::com::sun::star::uno::RuntimeException)
+    throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
 {
     ThrowIfDisposed ();
     throw lang::IndexOutOfBoundsException (
@@ -484,14 +488,19 @@ void SAL_CALL
         const uno::Reference<XAccessibleEventListener >& rxListener)
     throw (uno::RuntimeException)
 {
-    if (rBHelper.bDisposed || rBHelper.bInDispose)
-    {
-        uno::Reference<uno::XInterface> x ((lang::XComponent *)this, uno::UNO_QUERY);
-        rxListener->disposing (lang::EventObject (x));
-    }
-    else
+    if (rxListener.is())
     {
-        rBHelper.addListener (::getCppuType (&rxListener), rxListener);
+        if (rBHelper.bDisposed || rBHelper.bInDispose)
+        {
+            uno::Reference<uno::XInterface> x ((lang::XComponent *)this, uno::UNO_QUERY);
+            rxListener->disposing (lang::EventObject (x));
+        }
+        else
+        {
+            if (!mnClientId)
+                mnClientId = comphelper::AccessibleEventNotifier::registerClient( );
+            comphelper::AccessibleEventNotifier::addEventListener( mnClientId, rxListener );
+        }
     }
 }
 
@@ -504,7 +513,19 @@ void SAL_CALL
     throw (uno::RuntimeException)
 {
     ThrowIfDisposed ();
-    rBHelper.removeListener (::getCppuType(&rxListener), rxListener);
+    if (rxListener.is())
+    {
+        sal_Int32 nListenerCount = comphelper::AccessibleEventNotifier::removeEventListener( mnClientId, rxListener );
+        if ( !nListenerCount )
+        {
+            // no listeners anymore
+            // -> revoke ourself. This may lead to the notifier thread dying (if we were the last client),
+            // and at least to us not firing any events anymore, in case somebody calls
+            // NotifyAccessibleEvent, again
+            comphelper::AccessibleEventNotifier::revokeClient( mnClientId );
+            mnClientId = 0;
+        }
+    }
 }
 
 
@@ -597,6 +618,15 @@ uno::Sequence<sal_Int8> SAL_CALL
 void SAL_CALL AccessibleContextBase::disposing (void)
 {
     SetState (AccessibleStateType::DEFUNC);
+
+    ::osl::MutexGuard aGuard (maMutex);
+
+    // Send a disposing to all listeners.
+    if ( mnClientId )
+    {
+        comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( mnClientId, *this );
+        mnClientId =  0;
+    }
 }
 
 
@@ -681,41 +711,8 @@ void AccessibleContextBase::CommitChange (
 
 void AccessibleContextBase::FireEvent (const AccessibleEventObject& aEvent)
 {
-    // Iterate over all listeners that are registered as accessibility event
-    // listeners and notify them of the specified event.
-    OSL_TRACE ("FireEvent %d", aEvent.EventId);
-    ::cppu::OInterfaceContainerHelper *pContainer = rBHelper.getContainer(
-        ::getCppuType((const uno::Reference<XAccessibleEventListener>*)0));
-    if (pContainer != NULL)
-    {
-        ::cppu::OInterfaceIteratorHelper I (*pContainer);
-        while (I.hasMoreElements())
-        {
-            Reference<XAccessibleEventListener> xListener =
-                static_cast<XAccessibleEventListener*>(I.next());
-
-            try
-            {
-                xListener->notifyEvent (aEvent);
-            }
-            catch (lang::DisposedException e)
-            {
-                // DisposedExceptions from the listener might indicate a
-                // broken connection to a different environment.
-
-                OSL_ENSURE(e.Context.is(), "caught dispose exception with empty Context field");
-                // If the exception stems from the listener then remove it
-                // from the list of listeners.  If the Context field of the
-                // exception is empty this is interpreted to indicate the
-                // listener as well.
-                if (e.Context == xListener
-                    || !e.Context.is())
-                    rBHelper.removeListener (::getCppuType(&xListener), xListener);
-            }
-            // Other events are not caught at the moment.  Might change in
-            // the future if there is demand to do so.
-        }
-    }
+    if (mnClientId)
+        comphelper::AccessibleEventNotifier::addEvent( mnClientId, aEvent );
 }
 
 
@@ -742,4 +739,10 @@ sal_Bool AccessibleContextBase::IsDisposed (void)
 
 
 
+void AccessibleContextBase::SetAccessibleRole( sal_Int16 _nRole )
+{
+    maRole = _nRole;
+}
+
+
 } // end of namespace accessibility
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index f860e0bd002b..65a0747f79ae 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleControlShape.cxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: fs $ $Date: 2002-09-23 13:12:11 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,12 +74,21 @@
 #ifndef _DRAFTS_COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLEEVENTID_HPP_
 #include <drafts/com/sun/star/accessibility/AccessibleEventId.hpp>
 #endif
+#ifndef _DRAFTS_COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLESTATETYPE_HPP_
+#include <drafts/com/sun/star/accessibility/AccessibleStateType.hpp>
+#endif
+#ifndef _COM_SUN_STAR_FORM_FORMCOMPONENTTYPE_HPP_
+#include <com/sun/star/form/FormComponentType.hpp>
+#endif
 #ifndef _COM_SUN_STAR_REFLECTION_XPROXYFACTORY_HPP_
 #include <com/sun/star/reflection/XProxyFactory.hpp>
 #endif
 #ifndef _COMPHELPER_PROCESSFACTORY_HXX_
 #include <comphelper/processfactory.hxx>
 #endif
+#ifndef _UTL_ACCESSIBLESTATESETHELPER_HXX_
+#include <unotools/accessiblestatesethelper.hxx>
+#endif
 #ifndef _SVDOUNO_HXX
 #include "svdouno.hxx"
 #endif
@@ -92,35 +101,111 @@
 #ifndef _SVX_ACCESSIBILITY_SVX_SHAPE_TYPES_HXX
 #include "SvxShapeTypes.hxx"
 #endif
+#ifndef SVX_ACCESSIBLE_WRAPPER_HXX
+#include "accessiblewrapper.hxx"
+#endif
 #include "svdstr.hrc"
 #include <algorithm>
 
-using namespace accessibility;
-using namespace ::rtl;
-using namespace ::com::sun::star;
+using namespace ::comphelper;
+using namespace ::accessibility;
 using namespace ::drafts::com::sun::star::accessibility;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::reflection::XProxyFactory;
-using ::com::sun::star::uno::XAggregation;
-using ::com::sun::star::lang::XComponent;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::awt;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::util;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::reflection;
+using namespace ::com::sun::star::drawing;
+
+//--------------------------------------------------------------------
+namespace
+{
+    //................................................................
+    const ::rtl::OUString& lcl_getNamePropertyName( )
+    {
+        static ::rtl::OUString s_sNamePropertyName( RTL_CONSTASCII_USTRINGPARAM( "Name" ) );
+        return s_sNamePropertyName;
+    }
+    //................................................................
+    const ::rtl::OUString& lcl_getDescPropertyName( )
+    {
+        static ::rtl::OUString s_sDescPropertyDesc( RTL_CONSTASCII_USTRINGPARAM( "HelpText" ) );
+        return s_sDescPropertyDesc;
+    }
+    //................................................................
+    const ::rtl::OUString& lcl_getLabelPropertyName( )
+    {
+        static ::rtl::OUString s_sLabelPropertyLabel( RTL_CONSTASCII_USTRINGPARAM( "Label" ) );
+        return s_sLabelPropertyLabel;
+    }
+    //................................................................
+    // return the property which should be used as AccessibleName
+    const ::rtl::OUString& lcl_getPreferredAccNameProperty( const Reference< XPropertySetInfo >& _rxPSI )
+    {
+        if ( _rxPSI.is() && _rxPSI->hasPropertyByName( lcl_getLabelPropertyName() ) )
+            return lcl_getLabelPropertyName();
+        else
+            return lcl_getNamePropertyName();
+    }
+
+    //................................................................
+    // determines whether or not a state which belongs to the inner context needs to be forwarded to the "composed"
+    // context
+    sal_Bool    isComposedState( const sal_Int16 _nState )
+    {
+        return  (   ( AccessibleStateType::INVALID != _nState )
+                &&  ( AccessibleStateType::DEFUNC != _nState )
+                &&  ( AccessibleStateType::ICONIFIED != _nState )
+                &&  ( AccessibleStateType::RESIZABLE != _nState )
+                &&  ( AccessibleStateType::SELECTABLE != _nState )
+                &&  ( AccessibleStateType::SHOWING != _nState )
+                &&  ( AccessibleStateType::MANAGES_DESCENDANT != _nState )
+                &&  ( AccessibleStateType::VISIBLE != _nState )
+                );
+    }
+
+    //................................................................
+    /** determines whether the given control is in alive mode
+    */
+    inline  sal_Bool    isAliveMode( const Reference< XControl >& _rxControl )
+    {
+        OSL_PRECOND( _rxControl.is(), "AccessibleControlShape::isAliveMode: invalid control" );
+        return _rxControl.is() && !_rxControl->isDesignMode();
+    }
+}
 
-//=====  internal  ============================================================
+//=============================================================================
+//= AccessibleControlShape
+//=============================================================================
 
+//-----------------------------------------------------------------------------
 AccessibleControlShape::AccessibleControlShape (
     const AccessibleShapeInfo& rShapeInfo,
     const AccessibleShapeTreeInfo& rShapeTreeInfo)
     :      AccessibleShape (rShapeInfo, rShapeTreeInfo)
-    ,   mbListeningForName( sal_False )
-    ,   mbListeningForDesc( sal_False )
-    ,   mbDisposeNativeContext( sal_False )
+    ,   m_bListeningForName( sal_False )
+    ,   m_bListeningForDesc( sal_False )
+    ,   m_bDisposeNativeContext( sal_False )
+    ,   m_bMultiplexingStates( sal_False )
+    ,   m_pChildManager( new OWrappedAccessibleChildrenManager( getProcessServiceFactory() ) )
 {
-}
-
-
+    m_pChildManager = new OWrappedAccessibleChildrenManager( getProcessServiceFactory() );
+    m_pChildManager->acquire();
 
+    osl_incrementInterlockedCount( &m_refCount );
+    {
+        m_pChildManager->setOwningAccessible( this );
+    }
+    osl_decrementInterlockedCount( &m_refCount );
+}
 
+//-----------------------------------------------------------------------------
 AccessibleControlShape::~AccessibleControlShape (void)
 {
+    m_pChildManager->release();
+    m_pChildManager = NULL;
+
     if ( m_xControlContextProxy.is() )
         m_xControlContextProxy->setDelegator( NULL );
     m_xControlContextProxy.clear();
@@ -128,7 +213,7 @@ AccessibleControlShape::~AccessibleControlShape (void)
         // ourself) to this proxy, and thus delete it
 }
 
-//=============================================================================
+//-----------------------------------------------------------------------------
 SdrObject* AccessibleControlShape::getSdrObject() const
 {
     return GetSdrObjectFromXShape (mxShape);
@@ -175,19 +260,41 @@ void AccessibleControlShape::Init()
 
         if ( pViewWindow && pUnoObjectImpl )
         {
+            // .................................................................
             // get the context of the control - it will be our "inner" context
-            m_xControlModes = m_xControlModes.query( pUnoObjectImpl->GetUnoControl( pViewWindow ) );
-            Reference< XAccessible > xControlAccessible( m_xControlModes, uno::UNO_QUERY );
+            m_xUnoControl = pUnoObjectImpl->GetUnoControl( pViewWindow );
+            Reference< XModeChangeBroadcaster > xControlModes( m_xUnoControl, UNO_QUERY );
+            Reference< XAccessible > xControlAccessible( xControlModes, UNO_QUERY );
             Reference< XAccessibleContext > xNativeControlContext;
             if ( xControlAccessible.is() )
                 xNativeControlContext = xControlAccessible->getAccessibleContext();
             OSL_ENSURE( xNativeControlContext.is(), "AccessibleControlShape::Init: no AccessibleContext for the control!" );
+            m_aControlContext = WeakReference< XAccessibleContext >( xNativeControlContext );
+
+            // .................................................................
+            // add as listener to the context - we want to multiplex some states
+            if ( isAliveMode( m_xUnoControl ) && xNativeControlContext.is() )
+            {   // (but only in alive mode)
+                startStateMultiplexing( );
+            }
 
-            // get a proxy for this context
+            // now that we have all information about our control, do some adjustments
+            adjustAccessibleRole();
+            initializeComposedState();
+
+            // some initialization for our child manager, which is used in alive mode only
+            if ( isAliveMode( m_xUnoControl ) )
+            {
+                Reference< XAccessibleStateSet > xStates( getAccessibleStateSet( ) );
+                OSL_ENSURE( xStates.is(), "AccessibleControlShape::AccessibleControlShape: no inner state set!" );
+                m_pChildManager->setTransientChildren( !xStates.is() || xStates->contains( AccessibleStateType::MANAGES_DESCENDANT ) );
+            }
+
+            // .................................................................
+            // finally, aggregate a proxy for the control context
             // first a factory for the proxy
             Reference< XProxyFactory > xFactory;
-            xFactory = xFactory.query( ::comphelper::createProcessComponent(
-                ::rtl::OUString::createFromAscii( "com.sun.star.reflection.ProxyFactory" ) ) );
+            xFactory = xFactory.query( createProcessComponent( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.reflection.ProxyFactory" ) ) ) );
             OSL_ENSURE( xFactory.is(), "AccessibleControlShape::Init: could not create a proxy factory!" );
             // then the proxy itself
             if ( xFactory.is() && xNativeControlContext.is() )
@@ -204,46 +311,52 @@ void AccessibleControlShape::Init()
                 }
                 osl_decrementInterlockedCount( &m_refCount );
 
-                mbDisposeNativeContext = sal_True;
+                m_bDisposeNativeContext = sal_True;
 
                 // Finally, we need to add ourself as mode listener to the control. In case the mode switches,
                 // we need to dispose ourself.
-                m_xControlModes->addModeChangeListener( this );
+                xControlModes->addModeChangeListener( this );
             }
         }
     }
-    catch( const uno::Exception& )
+    catch( const Exception& )
     {
         OSL_ENSURE( sal_False, "AccessibleControlShape::Init: could not \"aggregate\" the controls XAccessibleContext!" );
     }
 }
 
-//=====  XAccessible  =========================================================
-
-Reference<XAccessibleContext> SAL_CALL
-    AccessibleControlShape::getAccessibleContext (void)
-    throw (::com::sun::star::uno::RuntimeException)
+//-----------------------------------------------------------------------------
+Reference< XAccessibleContext > SAL_CALL AccessibleControlShape::getAccessibleContext(void) throw (RuntimeException)
 {
     return AccessibleShape::getAccessibleContext ();
 }
 
 
-//=====  XServiceInfo  ========================================================
-
-::rtl::OUString SAL_CALL
-    AccessibleControlShape::getImplementationName (void)
-    throw (::com::sun::star::uno::RuntimeException)
+//-----------------------------------------------------------------------------
+void SAL_CALL AccessibleControlShape::grabFocus(void)  throw (RuntimeException)
 {
-    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleControlShape"));
+    if ( !isAliveMode( m_xUnoControl ) )
+    {
+        // in design mode, we simply forward the request to the base class
+        AccessibleShape::grabFocus();
+    }
+    else
+    {
+        Reference< XWindow > xWindow( m_xUnoControl, UNO_QUERY );
+        OSL_ENSURE( xWindow.is(), "AccessibleControlShape::grabFocus: invalid control!" );
+        if ( xWindow.is() )
+            xWindow->setFocus();
+    }
 }
 
+//-----------------------------------------------------------------------------
+::rtl::OUString SAL_CALL AccessibleControlShape::getImplementationName(void) throw (RuntimeException)
+{
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.accessibility.AccessibleControlShape" ) );
+}
 
-
-
-/// Set this object's name if is different to the current name.
-::rtl::OUString
-    AccessibleControlShape::CreateAccessibleBaseName (void)
-    throw (::com::sun::star::uno::RuntimeException)
+//-----------------------------------------------------------------------------
+::rtl::OUString AccessibleControlShape::CreateAccessibleBaseName(void) throw (RuntimeException)
 {
     ::rtl::OUString sName;
 
@@ -255,7 +368,7 @@ Reference<XAccessibleContext> SAL_CALL
             break;
         default:
             sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("UnknownAccessibleControlShape"));
-            uno::Reference<drawing::XShapeDescriptor> xDescriptor (mxShape, uno::UNO_QUERY);
+            Reference< XShapeDescriptor > xDescriptor (mxShape, UNO_QUERY);
             if (xDescriptor.is())
                 sName += ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM(": "))
                     + xDescriptor->getShapeType();
@@ -268,26 +381,9 @@ Reference<XAccessibleContext> SAL_CALL
 
 
 //--------------------------------------------------------------------
-namespace
-{
-    //................................................................
-    const ::rtl::OUString& lcl_getNamePropertyName( )
-    {
-        static ::rtl::OUString s_sNamePropertyName( RTL_CONSTASCII_USTRINGPARAM( "Name" ) );
-        return s_sNamePropertyName;
-    }
-    //................................................................
-    const ::rtl::OUString& lcl_getDescPropertyName( )
-    {
-        static ::rtl::OUString s_sDescPropertyDesc( RTL_CONSTASCII_USTRINGPARAM( "HelpText" ) );
-        return s_sDescPropertyDesc;
-    }
-}
-
-//--------------------------------------------------------------------
 ::rtl::OUString
     AccessibleControlShape::CreateAccessibleDescription (void)
-    throw (::com::sun::star::uno::RuntimeException)
+    throw (RuntimeException)
 {
     DescriptionGenerator aDG (mxShape);
     ShapeTypeId nShapeType = ShapeTypeHandler::Instance().GetTypeId (mxShape);
@@ -300,22 +396,22 @@ namespace
             if ( !sDesc.getLength() )
             {   // no -> use the default
                 aDG.Initialize (STR_ObjNameSingulUno);
-                aDG.AddProperty (OUString::createFromAscii ("ControlBackground"),
+                aDG.AddProperty (::rtl::OUString::createFromAscii ("ControlBackground"),
                     DescriptionGenerator::COLOR,
-                    OUString());
-                aDG.AddProperty (OUString::createFromAscii ("ControlBorder"),
+                    ::rtl::OUString());
+                aDG.AddProperty (::rtl::OUString::createFromAscii ("ControlBorder"),
                     DescriptionGenerator::INTEGER,
-                    OUString());
+                    ::rtl::OUString());
             }
             // ensure that we are listening to the Name property
-            mbListeningForDesc = ensureListeningState( mbListeningForDesc, sal_True, lcl_getDescPropertyName() );
+            m_bListeningForDesc = ensureListeningState( m_bListeningForDesc, sal_True, lcl_getDescPropertyName() );
         }
         break;
 
         default:
             aDG.Initialize (::rtl::OUString::createFromAscii (
                 "Unknown accessible control shape"));
-            uno::Reference<drawing::XShapeDescriptor> xDescriptor (mxShape, uno::UNO_QUERY);
+            Reference< XShapeDescriptor > xDescriptor (mxShape, UNO_QUERY);
             if (xDescriptor.is())
             {
                 aDG.AppendString (::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("service name=")));
@@ -331,12 +427,14 @@ IMPLEMENT_FORWARD_REFCOUNT( AccessibleControlShape, AccessibleShape )
 IMPLEMENT_GET_IMPLEMENTATION_ID( AccessibleControlShape )
 
 //--------------------------------------------------------------------
-void SAL_CALL AccessibleControlShape::propertyChange( const beans::PropertyChangeEvent& _rEvent ) throw (uno::RuntimeException)
+void SAL_CALL AccessibleControlShape::propertyChange( const PropertyChangeEvent& _rEvent ) throw (RuntimeException)
 {
     ::osl::MutexGuard aGuard( maMutex );
 
     // check if it is the name or the description
-    if ( _rEvent.PropertyName.equals( lcl_getNamePropertyName() ) )
+    if  (   _rEvent.PropertyName.equals( lcl_getNamePropertyName() )
+        ||  _rEvent.PropertyName.equals( lcl_getLabelPropertyName( ) )
+        )
     {
         SetAccessibleName (CreateAccessibleName());
     }
@@ -353,9 +451,9 @@ void SAL_CALL AccessibleControlShape::propertyChange( const beans::PropertyChang
 }
 
 //--------------------------------------------------------------------
-uno::Any SAL_CALL AccessibleControlShape::queryInterface( const uno::Type& _rType ) throw (uno::RuntimeException)
+Any SAL_CALL AccessibleControlShape::queryInterface( const Type& _rType ) throw (RuntimeException)
 {
-    uno::Any aReturn = AccessibleShape::queryInterface( _rType );
+    Any aReturn = AccessibleShape::queryInterface( _rType );
     if ( !aReturn.hasValue() )
     {
         aReturn = AccessibleControlShape_Base::queryInterface( _rType );
@@ -366,24 +464,24 @@ uno::Any SAL_CALL AccessibleControlShape::queryInterface( const uno::Type& _rTyp
 }
 
 //--------------------------------------------------------------------
-uno::Sequence< uno::Type > SAL_CALL AccessibleControlShape::getTypes() throw (uno::RuntimeException)
+Sequence< Type > SAL_CALL AccessibleControlShape::getTypes() throw (RuntimeException)
 {
-    uno::Sequence< uno::Type > aShapeTypes = AccessibleShape::getTypes();
-    uno::Sequence< uno::Type > aOwnTypes = AccessibleControlShape_Base::getTypes();
+    Sequence< Type > aShapeTypes = AccessibleShape::getTypes();
+    Sequence< Type > aOwnTypes = AccessibleControlShape_Base::getTypes();
 
-    uno::Sequence< uno::Type > aAggregateTypes;
-    Reference< lang::XTypeProvider > xAggTypes;
-    if ( ::comphelper::query_aggregation( m_xControlContextProxy, xAggTypes ) )
+    Sequence< Type > aAggregateTypes;
+    Reference< XTypeProvider > xAggTypes;
+    if ( query_aggregation( m_xControlContextProxy, xAggTypes ) )
         aAggregateTypes = xAggTypes->getTypes();
 
-    uno::Sequence< uno::Type > aAllTypes = ::comphelper::concatSequences( aShapeTypes, aOwnTypes, aAggregateTypes );
+    Sequence< Type > aAllTypes = concatSequences( aShapeTypes, aOwnTypes, aAggregateTypes );
 
     // remove duplicates
-    uno::Type* pBegin = aAllTypes.getArray();
-    uno::Type* pEnd = pBegin + aAllTypes.getLength();
+    Type* pBegin = aAllTypes.getArray();
+    Type* pEnd = pBegin + aAllTypes.getLength();
     while ( pBegin != pEnd )
     {
-        uno::Type aThisRoundType = *pBegin;
+        Type aThisRoundType = *pBegin;
         if ( ++pBegin != pEnd )
         {
             pEnd = ::std::remove( pBegin, pEnd, aThisRoundType );
@@ -397,17 +495,53 @@ uno::Sequence< uno::Type > SAL_CALL AccessibleControlShape::getTypes() throw (un
 }
 
 //--------------------------------------------------------------------
-void SAL_CALL AccessibleControlShape::modeChanged( const util::ModeChangeEvent& _rSource ) throw (uno::RuntimeException)
+void SAL_CALL AccessibleControlShape::notifyEvent( const AccessibleEventObject& _rEvent ) throw (RuntimeException)
+{
+    if ( AccessibleEventId::ACCESSIBLE_STATE_EVENT == _rEvent.EventId )
+    {
+        // multiplex this change
+        sal_Int16 nLostState( 0 ), nGainedState( 0 );
+        _rEvent.OldValue >>= nLostState;
+        _rEvent.NewValue >>= nGainedState;
+
+        // don't multiplex states which the inner context is not resposible for
+        if  ( isComposedState( nLostState ) )
+            AccessibleShape::ResetState( nLostState );
+
+        if  ( isComposedState( nGainedState ) )
+            AccessibleShape::SetState( nGainedState );
+    }
+    else
+    {
+        AccessibleEventObject aTranslatedEvent( _rEvent );
+
+        {
+            ::osl::MutexGuard aGuard( maMutex );
+
+            // see if any of these notifications affect our child manager
+            m_pChildManager->handleChildNotification( _rEvent );
+
+            aTranslatedEvent.Source = *this;
+            m_pChildManager->translateAccessibleEvent( _rEvent, aTranslatedEvent );
+        }
+
+        FireEvent( aTranslatedEvent );
+    }
+}
+
+//--------------------------------------------------------------------
+void SAL_CALL AccessibleControlShape::modeChanged( const ModeChangeEvent& _rSource ) throw (RuntimeException)
 {
     // did it come from our inner context (the real one, not it's proxy!)?
     OSL_TRACE ("AccessibleControlShape::modeChanged");
-    if ( _rSource.Source == m_xControlModes )
+    Reference< XControl > xSource( _rSource.Source, UNO_QUERY );    // for faster compare
+    if ( xSource.get() == m_xUnoControl.get() )
     {
         // If our "pseudo-aggregated" inner context does not live anymore,
         // we don't want to live, too.  This is accomplished by asking our
         // parent to replace this object with a new one.  Disposing this
-        // object and sending notifications about the replacement are the
-        // task of our parent.
+        // object and sending notifications about the replacement are in
+        // the responsibility of our parent.
         OSL_VERIFY( mpParent->ReplaceChild ( this, mxShape, mnIndex, maShapeTreeInfo ) );
     }
 #ifdef _DEBUG
@@ -417,7 +551,7 @@ void SAL_CALL AccessibleControlShape::modeChanged( const util::ModeChangeEvent&
 }
 
 //--------------------------------------------------------------------
-void SAL_CALL AccessibleControlShape::disposing (const lang::EventObject& _rSource) throw (uno::RuntimeException)
+void SAL_CALL AccessibleControlShape::disposing (const EventObject& _rSource) throw (RuntimeException)
 {
     AccessibleShape::disposing( _rSource );
 }
@@ -433,16 +567,18 @@ sal_Bool AccessibleControlShape::ensureListeningState(
 
     try
     {
-        if ( !mxModelPropsMeta.is() || mxModelPropsMeta->hasPropertyByName( _rPropertyName ) )
+        if ( !m_xModelPropsMeta.is() || m_xModelPropsMeta->hasPropertyByName( _rPropertyName ) )
         {
             // add or revoke as listener
             if ( _bNeedNewListening )
-                mxControlModel->addPropertyChangeListener( _rPropertyName, static_cast< beans::XPropertyChangeListener* >( this ) );
+                m_xControlModel->addPropertyChangeListener( _rPropertyName, static_cast< XPropertyChangeListener* >( this ) );
             else
-                mxControlModel->removePropertyChangeListener( _rPropertyName, static_cast< beans::XPropertyChangeListener* >( this ) );
+                m_xControlModel->removePropertyChangeListener( _rPropertyName, static_cast< XPropertyChangeListener* >( this ) );
         }
+        else
+            OSL_ENSURE( sal_False, "AccessibleControlShape::ensureListeningState: this property does not exist at this model!" );
     }
-    catch( const uno::Exception& e )
+    catch( const Exception& e )
     {
         e;  // make compiler happy
         OSL_ENSURE( sal_False, "AccessibleControlShape::ensureListeningState: could not change the listening state!" );
@@ -452,17 +588,74 @@ sal_Bool AccessibleControlShape::ensureListeningState(
 }
 
 //--------------------------------------------------------------------
-::rtl::OUString AccessibleControlShape::CreateAccessibleName (void) throw (uno::RuntimeException)
+sal_Int32 SAL_CALL AccessibleControlShape::getAccessibleChildCount( ) throw(RuntimeException)
+{
+    if ( !isAliveMode( m_xUnoControl ) )
+        // no special action required when in design mode
+        return AccessibleShape::getAccessibleChildCount( );
+    else
+    {
+        // in alive mode, we have the full control over our children - they are determined by the children
+        // of the context of our UNO control
+        Reference< XAccessibleContext > xControlContext( m_aControlContext );
+        OSL_ENSURE( xControlContext.is(), "AccessibleControlShape::getAccessibleChildCount: control context already dead! How this!" );
+        return xControlContext.is() ? xControlContext->getAccessibleChildCount() : 0;
+    }
+}
+
+//--------------------------------------------------------------------
+Reference< XAccessible > SAL_CALL AccessibleControlShape::getAccessibleChild( sal_Int32 i ) throw(IndexOutOfBoundsException, RuntimeException)
+{
+    Reference< XAccessible > xChild;
+    if ( !isAliveMode( m_xUnoControl ) )
+    {
+        // no special action required when in design mode - let the base class handle this
+        xChild = AccessibleShape::getAccessibleChild( i );
+    }
+    else
+    {
+        // in alive mode, we have the full control over our children - they are determined by the children
+        // of the context of our UNO control
+
+        Reference< XAccessibleContext > xControlContext( m_aControlContext );
+        OSL_ENSURE( xControlContext.is(), "AccessibleControlShape::getAccessibleChildCount: control context already dead! How this!" );
+        if ( xControlContext.is() )
+        {
+            Reference< XAccessible > xInnerChild( xControlContext->getAccessibleChild( i ) );
+            OSL_ENSURE( xInnerChild.is(), "AccessibleControlShape::getAccessibleChild: control context returned nonsense!" );
+            if ( xInnerChild.is() )
+            {
+                // we need to wrap this inner child into an own implementation
+                xChild = m_pChildManager->getAccessibleWrapperFor( xInnerChild );
+            }
+        }
+    }
+    return xChild;
+}
+
+//--------------------------------------------------------------------
+Reference< XAccessibleRelationSet > SAL_CALL AccessibleControlShape::getAccessibleRelationSet(  ) throw (RuntimeException)
 {
-    // check if we can obtain the "Name" property from the model
-    ::rtl::OUString sName( getControlModelStringProperty( lcl_getNamePropertyName() ) );
+    // TODO
+    return AccessibleShape::getAccessibleRelationSet( );
+}
+
+//--------------------------------------------------------------------
+::rtl::OUString AccessibleControlShape::CreateAccessibleName (void) throw (RuntimeException)
+{
+    ensureControlModelAccess();
+
+    // check if we can obtain the "Name" resp. "Label" property from the model
+    const ::rtl::OUString& rAccNameProperty = lcl_getPreferredAccNameProperty( m_xModelPropsMeta );
+
+    ::rtl::OUString sName( getControlModelStringProperty( rAccNameProperty ) );
     if ( !sName.getLength() )
     {   // no -> use the default
         sName = AccessibleShape::CreateAccessibleName();
     }
 
     // now that somebody first asked us for our name, ensure that we are listening to name changes on the model
-    mbListeningForName = ensureListeningState( mbListeningForName, sal_True, lcl_getNamePropertyName() );
+    m_bListeningForName = ensureListeningState( m_bListeningForName, sal_True, lcl_getPreferredAccNameProperty( m_xModelPropsMeta ) );
 
     return sName;
 }
@@ -471,31 +664,39 @@ sal_Bool AccessibleControlShape::ensureListeningState(
 void SAL_CALL AccessibleControlShape::disposing (void)
 {
     // ensure we're not listening
-    mbListeningForName = ensureListeningState( mbListeningForName, sal_False, lcl_getNamePropertyName() );
-    mbListeningForDesc = ensureListeningState( mbListeningForDesc, sal_False, lcl_getDescPropertyName() );
+    m_bListeningForName = ensureListeningState( m_bListeningForName, sal_False, lcl_getPreferredAccNameProperty( m_xModelPropsMeta ) );
+    m_bListeningForDesc = ensureListeningState( m_bListeningForDesc, sal_False, lcl_getDescPropertyName() );
+
+    if ( m_bMultiplexingStates )
+        stopStateMultiplexing( );
+
+    // dispose the child cache/map
+    m_pChildManager->dispose();
 
     // release the model
-    mxControlModel.clear();
-    mxModelPropsMeta.clear();
+    m_xControlModel.clear();
+    m_xModelPropsMeta.clear();
+    m_aControlContext = WeakReference< XAccessibleContext >();
 
     // forward the disposel to our inner context
-    if ( mbDisposeNativeContext )
+    if ( m_bDisposeNativeContext )
     {
         // don't listen for mode changes anymore
-        OSL_ENSURE( m_xControlModes.is(), "AccessibleControlShape::disposing: don't have an mode broadcaster anymore!" );
-        if ( m_xControlModes.is() )
-            m_xControlModes->removeModeChangeListener( this );
+        Reference< XModeChangeBroadcaster > xControlModes( m_xUnoControl, UNO_QUERY );
+        OSL_ENSURE( xControlModes.is(), "AccessibleControlShape::disposing: don't have an mode broadcaster anymore!" );
+        if ( xControlModes.is() )
+            xControlModes->removeModeChangeListener( this );
 
         Reference< XComponent > xInnerComponent;
-        if ( ::comphelper::query_aggregation( m_xControlContextProxy, xInnerComponent ) )
+        if ( query_aggregation( m_xControlContextProxy, xInnerComponent ) )
             xInnerComponent->dispose();
         // do _not_ clear m_xControlContextProxy! This has to be done in the dtor for correct ref-count handling
 
         // no need to dispose the proxy/inner context anymore
-        mbDisposeNativeContext = sal_False;
+        m_bDisposeNativeContext = sal_False;
     }
 
-    m_xControlModes.clear();
+    m_xUnoControl.clear();
 
     // let the base do it's stuff
     AccessibleShape::disposing();
@@ -504,25 +705,62 @@ void SAL_CALL AccessibleControlShape::disposing (void)
 //--------------------------------------------------------------------
 sal_Bool AccessibleControlShape::ensureControlModelAccess() SAL_THROW(())
 {
-    if ( mxControlModel.is() )
+    if ( m_xControlModel.is() )
         return sal_True;
 
     try
     {
-        Reference< drawing::XControlShape > xShape( mxShape, uno::UNO_QUERY );
+        Reference< XControlShape > xShape( mxShape, UNO_QUERY );
         if ( xShape.is() )
-            mxControlModel = mxControlModel.query( xShape->getControl() );
+            m_xControlModel = m_xControlModel.query( xShape->getControl() );
 
-        if ( mxControlModel.is() )
-            mxModelPropsMeta = mxControlModel->getPropertySetInfo();
+        if ( m_xControlModel.is() )
+            m_xModelPropsMeta = m_xControlModel->getPropertySetInfo();
     }
-    catch( const uno::Exception& e )
+    catch( const Exception& e )
     {
         e;  // make compiler happy
         OSL_ENSURE( sal_False, "AccessibleControlShape::ensureControlModelAccess: caught an exception!" );
     }
 
-    return mxControlModel.is();
+    return m_xControlModel.is();
+}
+
+//--------------------------------------------------------------------
+void AccessibleControlShape::startStateMultiplexing()
+{
+    OSL_PRECOND( !m_bMultiplexingStates, "AccessibleControlShape::startStateMultiplexing: already multiplexing!" );
+
+#ifdef _DEBUG
+    // we should have a control, and it should be in alive mode
+    OSL_PRECOND( isAliveMode( m_xUnoControl ),
+        "AccessibleControlShape::startStateMultiplexing: should be done in alive mode only!" );
+#endif
+    // we should have the native context of the control
+    Reference< XAccessibleEventBroadcaster > xBroadcaster( m_aControlContext.get(), UNO_QUERY );
+    OSL_ENSURE( xBroadcaster.is(), "AccessibleControlShape::startStateMultiplexing: no AccessibleEventBroadcaster on the native context!" );
+
+    if ( xBroadcaster.is() )
+    {
+        xBroadcaster->addEventListener( this );
+        m_bMultiplexingStates = sal_True;
+    }
+}
+
+//--------------------------------------------------------------------
+void AccessibleControlShape::stopStateMultiplexing()
+{
+    OSL_PRECOND( m_bMultiplexingStates, "AccessibleControlShape::stopStateMultiplexing: not multiplexing!" );
+
+    // we should have the native context of the control
+    Reference< XAccessibleEventBroadcaster > xBroadcaster( m_aControlContext.get(), UNO_QUERY );
+    OSL_ENSURE( xBroadcaster.is(), "AccessibleControlShape::stopStateMultiplexing: no AccessibleEventBroadcaster on the native context!" );
+
+    if ( xBroadcaster.is() )
+    {
+        xBroadcaster->removeEventListener( this );
+        m_bMultiplexingStates = sal_False;
+    }
 }
 
 //--------------------------------------------------------------------
@@ -531,18 +769,95 @@ sal_Bool AccessibleControlShape::ensureControlModelAccess() SAL_THROW(())
     ::rtl::OUString sReturn;
     try
     {
-        if ( const_cast< AccessibleControlShape* >( this ) ->ensureControlModelAccess() )
+        if ( const_cast< AccessibleControlShape* >( this )->ensureControlModelAccess() )
         {
-            if ( !mxModelPropsMeta.is() ||  mxModelPropsMeta->hasPropertyByName( _rPropertyName ) )
+            if ( !m_xModelPropsMeta.is() || m_xModelPropsMeta->hasPropertyByName( _rPropertyName ) )
                 // ask only if a) the control does not have a PropertySetInfo object or b) it has, and the
                 // property in question is available
-                mxControlModel->getPropertyValue( _rPropertyName ) >>= sReturn;
+                m_xControlModel->getPropertyValue( _rPropertyName ) >>= sReturn;
         }
     }
-    catch( const uno::Exception& )
+    catch( const Exception& )
     {
         OSL_ENSURE( sal_False, "OAccessibleControlContext::getModelStringProperty: caught an exception!" );
     }
     return sReturn;
 }
 
+//--------------------------------------------------------------------
+void AccessibleControlShape::adjustAccessibleRole( )
+{
+    // if we're in design mode, we are a simple SHAPE, in alive mode, we use the role of our inner context
+    if ( !isAliveMode( m_xUnoControl ) )
+        return;
+
+    // we're in alive mode -> determine the role of the inner context
+    Reference< XAccessibleContext > xNativeContext( m_aControlContext );
+    OSL_PRECOND( xNativeContext.is(), "AccessibleControlShape::adjustAccessibleRole: no inner context!" );
+    if ( xNativeContext.is() )
+        SetAccessibleRole( xNativeContext->getAccessibleRole( ) );
+}
+
+#ifdef DBG_UTIL
+//--------------------------------------------------------------------
+sal_Bool AccessibleControlShape::SetState( sal_Int16 _nState )
+{
+    OSL_ENSURE( !isAliveMode( m_xUnoControl ) || !isComposedState( _nState ),
+        "AccessibleControlShape::SetState: a state which should be determined by the control context is set from outside!" );
+    return AccessibleShape::SetState( _nState );
+}
+#endif // DBG_UTIL
+
+//--------------------------------------------------------------------
+void AccessibleControlShape::initializeComposedState()
+{
+    if ( !isAliveMode( m_xUnoControl ) )
+        // no action necessary for design mode
+        return;
+
+    // get our own state set implementation
+    ::utl::AccessibleStateSetHelper* pComposedStates =
+        static_cast< ::utl::AccessibleStateSetHelper* >( mxStateSet.get() );
+    OSL_PRECOND( pComposedStates,
+        "AccessibleControlShape::initializeComposedState: no composed set!" );
+
+    // we need to reset some states of the composed set, because the either do not apply
+    // for controls in alive mode, or are in the responsibility of the UNO-control, anyway
+    pComposedStates->RemoveState( AccessibleStateType::ENABLED );       // this is controlled by the UNO-control
+    pComposedStates->RemoveState( AccessibleStateType::FOCUSABLE );     // this is controlled by the UNO-control
+    pComposedStates->RemoveState( AccessibleStateType::SELECTABLE );    // this does not hold for an alive UNO-control
+#ifdef _DEBUG
+    // now, only states which are not in the responsibility of the UNO control should be part of this state set
+    {
+        Sequence< sal_Int16 > aInitStates = pComposedStates->getStates();
+        for ( sal_Int32 i=0; i<aInitStates.getLength(); ++i )
+            OSL_ENSURE( !isComposedState( aInitStates.getConstArray()[i] ),
+                "AccessibleControlShape::initializeComposedState: invalid initial composed state (should be controlled by the UNO-control)!" );
+    }
+#endif
+
+    // get my inner context
+    Reference< XAccessibleContext > xInnerContext( m_aControlContext );
+    OSL_PRECOND( xInnerContext.is(), "AccessibleControlShape::initializeComposedState: no inner context!" );
+    if ( xInnerContext.is() )
+    {
+        // get all states of the inner context
+        Reference< XAccessibleStateSet > xInnerStates( xInnerContext->getAccessibleStateSet() );
+        OSL_ENSURE( xInnerStates.is(), "AccessibleControlShape::initializeComposedState: no inner states!" );
+        Sequence< sal_Int16 > aInnerStates;
+        if ( xInnerStates.is() )
+            aInnerStates = xInnerStates->getStates();
+
+        // look which one are to be propagated to the composed context
+        const sal_Int16* pStates = aInnerStates.getConstArray();
+        const sal_Int16* pStatesEnd = pStates + aInnerStates.getLength();
+        for ( ; pStates != pStatesEnd; ++pStates )
+        {
+            if ( isComposedState( *pStates ) && !pComposedStates->contains( *pStates ) )
+            {
+                pComposedStates->AddState( *pStates );
+            }
+        }
+    }
+}
+
diff --git a/svx/source/accessibility/AccessibleEditableTextPara.cxx b/svx/source/accessibility/AccessibleEditableTextPara.cxx
index 354693a4dec2..389b41e47c63 100644
--- a/svx/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/svx/source/accessibility/AccessibleEditableTextPara.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleEditableTextPara.cxx,v $
  *
- *  $Revision: 1.32 $
+ *  $Revision: 1.33 $
  *
- *  last change: $Author: thb $ $Date: 2002-12-10 15:24:54 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -119,6 +119,10 @@
 #include <drafts/com/sun/star/accessibility/AccessibleEventId.hpp>
 #endif
 
+#ifndef COMPHELPER_ACCESSIBLE_EVENT_NOTIFIER
+#include <comphelper/accessibleeventnotifier.hxx>
+#endif
+
 #ifndef _UTL_ACCESSIBLESTATESETHELPER_HXX_
 #include <unotools/accessiblestatesethelper.hxx>
 #endif
@@ -154,6 +158,9 @@
 #endif
 
 #include "accessibility.hrc"
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include <svtools/colorcfg.hxx>
+#endif
 
 
 using namespace ::com::sun::star;
@@ -168,6 +175,7 @@ using namespace ::drafts::com::sun::star::accessibility;
 
 namespace accessibility
 {
+    DBG_NAME( AccessibleEditableTextPara )
 
     AccessibleEditableTextPara::AccessibleEditableTextPara( const uno::Reference< XAccessible >& rParent ) :
         mnParagraphIndex( 0 ),
@@ -175,31 +183,63 @@ namespace accessibility
         mpEditSource( NULL ),
         maEEOffset( 0, 0 ),
         mxParent( rParent ),
-        maStateListeners( maMutex )
-    {
-        // Create the state set.
-        ::utl::AccessibleStateSetHelper* pStateSet  = new ::utl::AccessibleStateSetHelper ();
-        mxStateSet = pStateSet;
+        // well, that's strictly (UNO) exception safe, though not
+        // really robust. We rely on the fact that this member is
+        // constructed last, and that the constructor body catches
+        // exceptions, thus no chance for exceptions once the Id is
+        // fetched. Nevertheless, normally should employ RAII here...
+        mnNotifierClientId(::comphelper::AccessibleEventNotifier::registerClient())
+    {
+#ifdef DBG_UTIL
+        DBG_CTOR( AccessibleEditableTextPara, NULL );
+        OSL_TRACE( "AccessibleEditableTextPara received ID: %d\n", mnNotifierClientId );
+#endif
 
-        // these are always on
-        pStateSet->AddState( AccessibleStateType::MULTILINE );
-        pStateSet->AddState( AccessibleStateType::FOCUSABLE );
-        pStateSet->AddState( AccessibleStateType::VISIBLE );
-        pStateSet->AddState( AccessibleStateType::SHOWING );
-        pStateSet->AddState( AccessibleStateType::ENABLED );
+        try
+        {
+            // Create the state set.
+            ::utl::AccessibleStateSetHelper* pStateSet  = new ::utl::AccessibleStateSetHelper ();
+            mxStateSet = pStateSet;
+
+            // these are always on
+            pStateSet->AddState( AccessibleStateType::MULTILINE );
+            pStateSet->AddState( AccessibleStateType::FOCUSABLE );
+            pStateSet->AddState( AccessibleStateType::VISIBLE );
+            pStateSet->AddState( AccessibleStateType::SHOWING );
+            pStateSet->AddState( AccessibleStateType::ENABLED );
+        }
+        catch( const uno::Exception& ) {}
     }
 
     AccessibleEditableTextPara::~AccessibleEditableTextPara()
     {
+        DBG_DTOR( AccessibleEditableTextPara, NULL );
+
+        // sign off from event notifier
+        if( getNotifierClientId() != -1 )
+        {
+            try
+            {
+                ::comphelper::AccessibleEventNotifier::revokeClient( getNotifierClientId() );
+#ifdef DBG_UTIL
+                OSL_TRACE( "AccessibleEditableTextPara revoked ID: %d\n", mnNotifierClientId );
+#endif
+            }
+            catch( const uno::Exception& ) {}
+        }
     }
 
     ::rtl::OUString AccessibleEditableTextPara::implGetText()
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         return GetTextRange( 0, GetTextLen() );
     }
 
     ::com::sun::star::lang::Locale AccessibleEditableTextPara::implGetLocale()
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         lang::Locale        aLocale;
 
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -211,6 +251,8 @@ namespace accessibility
 
     void AccessibleEditableTextPara::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex )
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         USHORT nStart, nEnd;
 
         if( GetSelection( nStart, nEnd ) )
@@ -228,12 +270,16 @@ namespace accessibility
 
     void AccessibleEditableTextPara::implGetParagraphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex )
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         rBoundary.startPos = 0;
         rBoundary.endPos = GetTextLen();
     }
 
     void AccessibleEditableTextPara::implGetLineBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex )
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         SvxTextForwarder&   rCacheTF = GetTextForwarder();
         sal_Int32           nParaIndex = GetParagraphIndex();
 
@@ -262,27 +308,30 @@ namespace accessibility
         rBoundary.endPos = nTextLen;
     }
 
+    int AccessibleEditableTextPara::getNotifierClientId() const
+    {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
+        return mnNotifierClientId;
+    }
+
     void AccessibleEditableTextPara::SetIndexInParent( sal_Int32 nIndex )
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         mnIndexInParent = nIndex;
     }
 
     sal_Int32 AccessibleEditableTextPara::GetIndexInParent() const
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         return mnIndexInParent;
     }
 
     void AccessibleEditableTextPara::SetParagraphIndex( sal_Int32 nIndex )
     {
-        uno::Any aOldDesc;
-        uno::Any aOldName;
-
-        try
-        {
-            aOldDesc <<= getAccessibleDescription();
-            aOldName <<= getAccessibleName();
-        }
-        catch( const uno::Exception& ) {} // optional behaviour
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
 
         sal_Int32 nOldIndex = mnParagraphIndex;
 
@@ -296,6 +345,15 @@ namespace accessibility
         {
             if( nOldIndex != nIndex )
             {
+                uno::Any aOldDesc;
+                uno::Any aOldName;
+
+                try
+                {
+                    aOldDesc <<= getAccessibleDescription();
+                    aOldName <<= getAccessibleName();
+                }
+                catch( const uno::Exception& ) {} // optional behaviour
                 // index and therefore description changed
                 FireEvent( AccessibleEventId::ACCESSIBLE_DESCRIPTION_EVENT, uno::makeAny( getAccessibleDescription() ), aOldDesc );
                 FireEvent( AccessibleEventId::ACCESSIBLE_NAME_EVENT, uno::makeAny( getAccessibleName() ), aOldName );
@@ -306,28 +364,42 @@ namespace accessibility
 
     sal_Int32 AccessibleEditableTextPara::GetParagraphIndex() const SAL_THROW((uno::RuntimeException))
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         return mnParagraphIndex;
     }
 
     void AccessibleEditableTextPara::Dispose()
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         // notify listeners
-        try
+        if( getNotifierClientId() != -1 )
         {
-            uno::Reference < XAccessibleContext > xThis = getAccessibleContext();
+            try
+            {
+                uno::Reference < XAccessibleContext > xThis = getAccessibleContext();
 
-            lang::EventObject aEvent (xThis);
-            maStateListeners.disposeAndClear( aEvent );
+                // #106234# Delegate to EventNotifier
+                ::comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( getNotifierClientId(),
+                                                                                    xThis );
+#ifdef DBG_UTIL
+                OSL_TRACE( "Disposed ID: %d\n", mnNotifierClientId );
+#endif
+            }
+            catch( const uno::Exception& ) {}
         }
-        catch( const uno::Exception& ) {}
 
         // drop all references
         mxParent = NULL;
+        mnNotifierClientId = -1;
         mpEditSource = NULL;
     }
 
     void AccessibleEditableTextPara::SetEditSource( SvxEditSourceAdapter* pEditSource )
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         SvxEditSource* pOldEditSource = mpEditSource;
 
         mpEditSource = pEditSource;
@@ -350,28 +422,37 @@ namespace accessibility
 
     ESelection AccessibleEditableTextPara::MakeSelection( sal_Int32 nStartEEIndex, sal_Int32 nEndEEIndex )
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         // check overflow
         DBG_ASSERT(nStartEEIndex >= 0 && nStartEEIndex <= USHRT_MAX &&
                    nEndEEIndex >= 0 && nEndEEIndex <= USHRT_MAX &&
                    GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
                    "AccessibleEditableTextPara::MakeSelection: index value overflow");
 
-        return ESelection( static_cast< USHORT >( GetParagraphIndex() ), static_cast< USHORT >( nStartEEIndex ),
-                           static_cast< USHORT >( GetParagraphIndex() ), static_cast< USHORT >( nEndEEIndex ) );
+        USHORT nParaIndex = static_cast< USHORT >( GetParagraphIndex() );
+        return ESelection( nParaIndex, static_cast< USHORT >( nStartEEIndex ),
+                           nParaIndex, static_cast< USHORT >( nEndEEIndex ) );
     }
 
     ESelection AccessibleEditableTextPara::MakeSelection( sal_Int32 nEEIndex )
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         return MakeSelection( nEEIndex, nEEIndex+1 );
     }
 
     ESelection AccessibleEditableTextPara::MakeCursor( sal_Int32 nEEIndex )
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         return MakeSelection( nEEIndex, nEEIndex );
     }
 
     void AccessibleEditableTextPara::CheckIndex( sal_Int32 nIndex ) SAL_THROW((lang::IndexOutOfBoundsException, uno::RuntimeException))
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         if( nIndex < 0 || nIndex >= getCharacterCount() )
             throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleEditableTextPara: character index out of bounds")),
                                                   uno::Reference< uno::XInterface >
@@ -380,6 +461,8 @@ namespace accessibility
 
     void AccessibleEditableTextPara::CheckPosition( sal_Int32 nIndex ) SAL_THROW((lang::IndexOutOfBoundsException, uno::RuntimeException))
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         if( nIndex < 0 || nIndex > getCharacterCount() )
             throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleEditableTextPara: character position out of bounds")),
                                                   uno::Reference< uno::XInterface >
@@ -388,12 +471,16 @@ namespace accessibility
 
     void AccessibleEditableTextPara::CheckRange( sal_Int32 nStart, sal_Int32 nEnd ) SAL_THROW((lang::IndexOutOfBoundsException, uno::RuntimeException))
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         CheckPosition( nStart );
         CheckPosition( nEnd );
     }
 
     sal_Bool AccessibleEditableTextPara::GetSelection( USHORT& nStartPos, USHORT& nEndPos ) SAL_THROW((uno::RuntimeException))
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ESelection aSelection;
         USHORT nPara = static_cast< USHORT > ( GetParagraphIndex() );
         if( !GetEditViewForwarder().GetSelection( aSelection ) )
@@ -437,26 +524,36 @@ namespace accessibility
 
     String AccessibleEditableTextPara::GetText( sal_Int32 nIndex ) SAL_THROW((uno::RuntimeException))
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         return GetTextForwarder().GetText( MakeSelection(nIndex) );
     }
 
     String AccessibleEditableTextPara::GetTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) SAL_THROW((uno::RuntimeException))
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         return GetTextForwarder().GetText( MakeSelection(nStartIndex, nEndIndex) );
     }
 
     USHORT AccessibleEditableTextPara::GetTextLen() const SAL_THROW((uno::RuntimeException))
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         return GetTextForwarder().GetTextLen( static_cast< USHORT >( GetParagraphIndex() ) );
     }
 
     sal_Bool AccessibleEditableTextPara::IsVisible() const
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         return mpEditSource ? sal_True : sal_False ;
     }
 
     uno::Reference< XAccessibleText > AccessibleEditableTextPara::GetParaInterface( sal_Int32 nIndex )
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         uno::Reference< XAccessible > xParent = getAccessibleParent();
         if( xParent.is() )
         {
@@ -474,6 +571,8 @@ namespace accessibility
 
     SvxEditSourceAdapter& AccessibleEditableTextPara::GetEditSource() const SAL_THROW((uno::RuntimeException))
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         if( mpEditSource )
             return *mpEditSource;
         else
@@ -485,6 +584,8 @@ namespace accessibility
 
     SvxAccessibleTextAdapter& AccessibleEditableTextPara::GetTextForwarder() const SAL_THROW((uno::RuntimeException))
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         SvxEditSourceAdapter& rEditSource = GetEditSource();
         SvxAccessibleTextAdapter* pTextForwarder = rEditSource.GetTextForwarderAdapter();
 
@@ -505,6 +606,8 @@ namespace accessibility
 
     SvxViewForwarder& AccessibleEditableTextPara::GetViewForwarder() const SAL_THROW((uno::RuntimeException))
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         SvxEditSource& rEditSource = GetEditSource();
         SvxViewForwarder* pViewForwarder = rEditSource.GetViewForwarder();
 
@@ -527,6 +630,8 @@ namespace accessibility
 
     SvxAccessibleTextEditViewAdapter& AccessibleEditableTextPara::GetEditViewForwarder( sal_Bool bCreate ) const SAL_THROW((uno::RuntimeException))
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         SvxEditSourceAdapter& rEditSource = GetEditSource();
         SvxAccessibleTextEditViewAdapter* pTextEditViewForwarder = rEditSource.GetEditViewForwarderAdapter( bCreate );
 
@@ -563,6 +668,8 @@ namespace accessibility
 
     sal_Bool AccessibleEditableTextPara::HaveEditView() const
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         SvxEditSource& rEditSource = GetEditSource();
         SvxEditViewForwarder* pViewForwarder = rEditSource.GetEditViewForwarder();
 
@@ -577,6 +684,8 @@ namespace accessibility
 
     sal_Bool AccessibleEditableTextPara::HaveChildren()
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
                    "AccessibleEditableTextPara::HaveChildren: paragraph index value overflow");
 
@@ -585,6 +694,8 @@ namespace accessibility
 
     sal_Bool AccessibleEditableTextPara::IsActive() const SAL_THROW((uno::RuntimeException))
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         SvxEditSource& rEditSource = GetEditSource();
         SvxEditViewForwarder* pViewForwarder = rEditSource.GetEditViewForwarder();
 
@@ -606,11 +717,15 @@ namespace accessibility
 
     const Point& AccessibleEditableTextPara::GetEEOffset() const
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         return maEEOffset;
     }
 
     void AccessibleEditableTextPara::SetEEOffset( const Point& rOffset )
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         WeakBullet::HardRefType aChild( maImageBullet.get() );
         if( aChild.is() )
             aChild->SetEEOffset(rOffset);
@@ -620,6 +735,8 @@ namespace accessibility
 
     void AccessibleEditableTextPara::FireEvent(const sal_Int16 nEventId, const uno::Any& rNewValue, const uno::Any& rOldValue) const
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         uno::Reference < XAccessibleContext > xThis( const_cast< AccessibleEditableTextPara* > (this)->getAccessibleContext() );
 
         AccessibleEventObject aEvent(xThis, nEventId, rNewValue, rOldValue);
@@ -628,53 +745,30 @@ namespace accessibility
         if( nEventId == AccessibleStateType::FOCUSED )
             vcl::unohelper::NotifyAccessibleStateEventGlobally( aEvent );
 
-        // no locking necessary, OInterfaceIteratorHelper copies listeners if someone removes/adds in between
-        ::cppu::OInterfaceIteratorHelper aIter( const_cast< AccessibleEditableTextPara* >(this)->maStateListeners );
-        while( aIter.hasMoreElements() )
-        {
-            uno::Reference < XAccessibleEventListener > xListener( aIter.next(), uno::UNO_QUERY );
-
-            if( xListener.is() )
-            {
-                try
-                {
-                    xListener->notifyEvent (aEvent);
-                }
-                catch( const lang::DisposedException& e )
-                {
-                    // DisposedExceptions from the listener might indicate a
-                    // broken connection to a different environment.
-
-                    OSL_ENSURE(e.Context.is(), "AccessibleEditableTextPara::FireEvent: caught dispose exception with empty Context field");
-                    // If the exception stems from the listener then remove it
-                    // from the list of listeners.  If the Context field of the
-                    // exception is empty this is interpreted to indicate the
-                    // listener as well.
-                    if (e.Context == xListener
-                        || !e.Context.is())
-                        aIter.remove();
-                }
-                catch( const uno::Exception& e )
-                {
-                    DBG_WARNING1("AccessibleEditableTextPara::FireEvent: exception %s from listener",
-                                 ::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_DONTKNOW ).getStr() );
-                }
-            }
-        }
+        // #106234# Delegate to EventNotifier
+        if( getNotifierClientId() != -1 )
+            ::comphelper::AccessibleEventNotifier::addEvent( getNotifierClientId(),
+                                                             aEvent );
     }
 
     void AccessibleEditableTextPara::GotPropertyEvent( const uno::Any& rNewValue, const sal_Int16 nEventId ) const
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         FireEvent( nEventId, rNewValue );
     }
 
     void AccessibleEditableTextPara::LostPropertyEvent( const uno::Any& rOldValue, const sal_Int16 nEventId ) const
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         FireEvent( nEventId, uno::Any(), rOldValue );
     }
 
     bool AccessibleEditableTextPara::HasState( const sal_Int16 nStateId )
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
         if( pStateSet != NULL )
             return pStateSet->contains(nStateId) ? true : false;
@@ -684,6 +778,8 @@ namespace accessibility
 
     void AccessibleEditableTextPara::SetState( const sal_Int16 nStateId )
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
         if( pStateSet != NULL &&
             !pStateSet->contains(nStateId) )
@@ -695,6 +791,8 @@ namespace accessibility
 
     void AccessibleEditableTextPara::UnSetState( const sal_Int16 nStateId )
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
         if( pStateSet != NULL &&
             pStateSet->contains(nStateId) )
@@ -706,6 +804,8 @@ namespace accessibility
 
     sal_Bool AccessibleEditableTextPara::GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, sal_Int32 nIndex )
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         DBG_ASSERT(nIndex >= 0 && nIndex <= USHRT_MAX,
                    "AccessibleEditableTextPara::GetAttributeRun: index value overflow");
 
@@ -717,6 +817,8 @@ namespace accessibility
 
     uno::Any SAL_CALL AccessibleEditableTextPara::queryInterface (const uno::Type & rType) throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         uno::Any aRet;
 
         // must provide XAccesibleText by hand, since it comes publicly inherited by XAccessibleEditableText
@@ -741,6 +843,8 @@ namespace accessibility
     // XAccessible
     uno::Reference< XAccessibleContext > SAL_CALL AccessibleEditableTextPara::getAccessibleContext() throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         // We implement the XAccessibleContext interface in the same object
         return uno::Reference< XAccessibleContext > ( this );
     }
@@ -748,6 +852,8 @@ namespace accessibility
     // XAccessibleContext
     sal_Int32 SAL_CALL AccessibleEditableTextPara::getAccessibleChildCount() throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         return HaveChildren() ? 1 : 0;
@@ -755,6 +861,8 @@ namespace accessibility
 
     uno::Reference< XAccessible > SAL_CALL AccessibleEditableTextPara::getAccessibleChild( sal_Int32 i ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         if( !HaveChildren() )
@@ -794,6 +902,8 @@ namespace accessibility
 
     uno::Reference< XAccessible > SAL_CALL AccessibleEditableTextPara::getAccessibleParent() throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         DBG_ASSERT(mxParent.is() || HasState(AccessibleStateType::DEFUNC),
                    "AccessibleEditableTextPara::getAccessibleParent: no frontend set, did somebody forgot to call AccessibleTextHelper::SetEventSource()?");
 
@@ -802,16 +912,22 @@ namespace accessibility
 
     sal_Int32 SAL_CALL AccessibleEditableTextPara::getAccessibleIndexInParent() throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         return mnIndexInParent;
     }
 
     sal_Int16 SAL_CALL AccessibleEditableTextPara::getAccessibleRole() throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         return AccessibleRole::PARAGRAPH;
     }
 
     ::rtl::OUString SAL_CALL AccessibleEditableTextPara::getAccessibleDescription() throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         // append first 40 characters from text, or first line, if shorter
@@ -857,6 +973,8 @@ namespace accessibility
 
     ::rtl::OUString SAL_CALL AccessibleEditableTextPara::getAccessibleName() throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         // throws if defunc
@@ -873,12 +991,16 @@ namespace accessibility
 
     uno::Reference< XAccessibleRelationSet > SAL_CALL AccessibleEditableTextPara::getAccessibleRelationSet() throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         // no relations, therefore empty
         return uno::Reference< XAccessibleRelationSet >();
     }
 
     uno::Reference< XAccessibleStateSet > SAL_CALL AccessibleEditableTextPara::getAccessibleStateSet() throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         // Create a copy of the state set and return it.
@@ -892,6 +1014,8 @@ namespace accessibility
 
     lang::Locale SAL_CALL AccessibleEditableTextPara::getLocale() throw (IllegalAccessibleComponentStateException, uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         return implGetLocale();
@@ -899,17 +1023,25 @@ namespace accessibility
 
     void SAL_CALL AccessibleEditableTextPara::addEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException)
     {
-        maStateListeners.addInterface( xListener );
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
+        if( getNotifierClientId() != -1 )
+            ::comphelper::AccessibleEventNotifier::addEventListener( getNotifierClientId(), xListener );
     }
 
     void SAL_CALL AccessibleEditableTextPara::removeEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException)
     {
-        maStateListeners.removeInterface( xListener );
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
+        if( getNotifierClientId() != -1 )
+            ::comphelper::AccessibleEventNotifier::removeEventListener( getNotifierClientId(), xListener );
     }
 
     // XAccessibleComponent
     sal_Bool SAL_CALL AccessibleEditableTextPara::contains( const awt::Point& aTmpPoint ) throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -924,6 +1056,8 @@ namespace accessibility
 
     uno::Reference< XAccessible > SAL_CALL AccessibleEditableTextPara::getAccessibleAt( const awt::Point& _aPoint ) throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         if( HaveChildren() )
@@ -957,6 +1091,8 @@ namespace accessibility
 
     awt::Rectangle SAL_CALL AccessibleEditableTextPara::getBounds() throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -981,6 +1117,8 @@ namespace accessibility
 
     awt::Point SAL_CALL AccessibleEditableTextPara::getLocation(  ) throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         awt::Rectangle aRect = getBounds();
@@ -990,6 +1128,8 @@ namespace accessibility
 
     awt::Point SAL_CALL AccessibleEditableTextPara::getLocationOnScreen(  ) throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         // relate us to parent
@@ -1015,6 +1155,8 @@ namespace accessibility
 
     awt::Size SAL_CALL AccessibleEditableTextPara::getSize(  ) throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         awt::Rectangle aRect = getBounds();
@@ -1024,19 +1166,26 @@ namespace accessibility
 
     void SAL_CALL AccessibleEditableTextPara::grabFocus(  ) throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         // set cursor to this paragraph
         setSelection(0,0);
     }
 
     sal_Int32 SAL_CALL AccessibleEditableTextPara::getForeground(  ) throw (::com::sun::star::uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         // #104444# Added to XAccessibleComponent interface
-        UINT32 nColor = Application::GetSettings().GetStyleSettings().GetWindowTextColor().GetColor();
+        svtools::ColorConfig aColorConfig;
+        UINT32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor;
         return static_cast<sal_Int32>(nColor);
     }
 
     sal_Int32 SAL_CALL AccessibleEditableTextPara::getBackground(  ) throw (::com::sun::star::uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         // #104444# Added to XAccessibleComponent interface
         Color aColor( Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor() );
 
@@ -1049,6 +1198,8 @@ namespace accessibility
     // XAccessibleText
     sal_Int32 SAL_CALL AccessibleEditableTextPara::getCaretPosition() throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         if( !HaveEditView() )
@@ -1068,11 +1219,15 @@ namespace accessibility
 
     sal_Bool SAL_CALL AccessibleEditableTextPara::setCaretPosition( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         return setSelection(nIndex, nIndex);
     }
 
     sal_Unicode SAL_CALL AccessibleEditableTextPara::getCharacter( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1083,6 +1238,8 @@ namespace accessibility
 
     uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleEditableTextPara::getCharacterAttributes( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         SvxAccessibleTextAdapter& rCacheTF = GetTextForwarder();
@@ -1130,6 +1287,8 @@ namespace accessibility
 
     awt::Rectangle SAL_CALL AccessibleEditableTextPara::getCharacterBounds( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1159,6 +1318,8 @@ namespace accessibility
 
     sal_Int32 SAL_CALL AccessibleEditableTextPara::getCharacterCount() throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1169,6 +1330,8 @@ namespace accessibility
 
     sal_Int32 SAL_CALL AccessibleEditableTextPara::getIndexAtPoint( const awt::Point& rPoint ) throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         USHORT nPara, nIndex;
@@ -1214,6 +1377,8 @@ namespace accessibility
 
     ::rtl::OUString SAL_CALL AccessibleEditableTextPara::getSelectedText() throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1227,6 +1392,8 @@ namespace accessibility
 
     sal_Int32 SAL_CALL AccessibleEditableTextPara::getSelectionStart() throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1240,6 +1407,8 @@ namespace accessibility
 
     sal_Int32 SAL_CALL AccessibleEditableTextPara::getSelectionEnd() throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1253,6 +1422,8 @@ namespace accessibility
 
     sal_Bool SAL_CALL AccessibleEditableTextPara::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1273,6 +1444,8 @@ namespace accessibility
 
     ::rtl::OUString SAL_CALL AccessibleEditableTextPara::getText() throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1283,6 +1456,8 @@ namespace accessibility
 
     ::rtl::OUString SAL_CALL AccessibleEditableTextPara::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1293,6 +1468,8 @@ namespace accessibility
 
     ::rtl::OUString SAL_CALL AccessibleEditableTextPara::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1337,6 +1514,8 @@ namespace accessibility
 
     ::rtl::OUString SAL_CALL AccessibleEditableTextPara::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1393,6 +1572,8 @@ namespace accessibility
 
     ::rtl::OUString SAL_CALL AccessibleEditableTextPara::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1447,6 +1628,8 @@ namespace accessibility
 
     sal_Bool SAL_CALL AccessibleEditableTextPara::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         try
@@ -1479,6 +1662,8 @@ namespace accessibility
     // XAccessibleEditableText
     sal_Bool SAL_CALL AccessibleEditableTextPara::cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         try
@@ -1507,6 +1692,8 @@ namespace accessibility
 
     sal_Bool SAL_CALL AccessibleEditableTextPara::pasteText( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         try
@@ -1535,6 +1722,8 @@ namespace accessibility
 
     sal_Bool SAL_CALL AccessibleEditableTextPara::deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         try
@@ -1565,6 +1754,8 @@ namespace accessibility
 
     sal_Bool SAL_CALL AccessibleEditableTextPara::insertText( const ::rtl::OUString& sText, sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         try
@@ -1597,6 +1788,8 @@ namespace accessibility
 
     sal_Bool SAL_CALL AccessibleEditableTextPara::replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const ::rtl::OUString& sReplacement ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         try
@@ -1629,6 +1822,8 @@ namespace accessibility
 
     sal_Bool SAL_CALL AccessibleEditableTextPara::setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const uno::Sequence< beans::PropertyValue >& aAttributeSet ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         try
@@ -1686,6 +1881,8 @@ namespace accessibility
 
     sal_Bool SAL_CALL AccessibleEditableTextPara::setText( const ::rtl::OUString& sText ) throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         return replaceText(0, getCharacterCount(), sText);
@@ -1694,11 +1891,15 @@ namespace accessibility
     // XServiceInfo
     ::rtl::OUString SAL_CALL AccessibleEditableTextPara::getImplementationName (void) throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("AccessibleEditableTextPara"));
     }
 
     sal_Bool SAL_CALL AccessibleEditableTextPara::supportsService (const ::rtl::OUString& sServiceName) throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         //  Iterate over all supported service names and return true if on of them
         //  matches the given name.
         uno::Sequence< ::rtl::OUString> aSupportedServices (
@@ -1711,6 +1912,8 @@ namespace accessibility
 
     uno::Sequence< ::rtl::OUString> SAL_CALL AccessibleEditableTextPara::getSupportedServiceNames (void) throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         const ::rtl::OUString sServiceName( getServiceName() );
         return uno::Sequence< ::rtl::OUString > (&sServiceName, 1);
     }
@@ -1718,6 +1921,8 @@ namespace accessibility
     // XServiceName
     ::rtl::OUString SAL_CALL AccessibleEditableTextPara::getServiceName (void) throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
         // #105185# Using correct service now
         return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("drafts.com.sun.star.accessibility.AccessibleParagraphView"));
     }
diff --git a/svx/source/accessibility/AccessibleEditableTextPara.hxx b/svx/source/accessibility/AccessibleEditableTextPara.hxx
index 9b89445b34c9..2d2ccce4f44f 100644
--- a/svx/source/accessibility/AccessibleEditableTextPara.hxx
+++ b/svx/source/accessibility/AccessibleEditableTextPara.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleEditableTextPara.hxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: thb $ $Date: 2002-12-10 15:24:54 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -129,7 +129,6 @@
 
 namespace accessibility
 {
-
     typedef ::cppu::WeakImplHelper6< ::drafts::com::sun::star::accessibility::XAccessible,
                                      ::drafts::com::sun::star::accessibility::XAccessibleContext,
                                      ::drafts::com::sun::star::accessibility::XAccessibleComponent,
@@ -376,6 +375,8 @@ namespace accessibility
          */
         sal_Bool IsVisible() const;
 
+        int getNotifierClientId() const;
+
         // retrieve text interface for given paragraph index
         ::com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessibleText > GetParaInterface( sal_Int32 nIndex );
 
@@ -433,13 +434,11 @@ namespace accessibility
         // the current state set (updated from SetState/UnSetState and guarded by solar mutex)
         ::com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessibleStateSet > mxStateSet;
 
-        mutable osl::Mutex  maMutex;
-
         /// The shape we're the accessible for (unguarded)
         ::com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessible > mxParent;
 
         /// Our listeners (guarded by maMutex)
-        ::cppu::OInterfaceContainerHelper maStateListeners;
+        int mnNotifierClientId;
     };
 
 } // end of namespace accessibility
diff --git a/svx/source/accessibility/AccessibleImageBullet.cxx b/svx/source/accessibility/AccessibleImageBullet.cxx
index 8224ee38257c..0999db537d9e 100644
--- a/svx/source/accessibility/AccessibleImageBullet.cxx
+++ b/svx/source/accessibility/AccessibleImageBullet.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleImageBullet.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: thb $ $Date: 2002-12-10 15:24:55 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -103,6 +103,10 @@
 #include <drafts/com/sun/star/accessibility/AccessibleEventId.hpp>
 #endif
 
+#ifndef COMPHELPER_ACCESSIBLE_EVENT_NOTIFIER
+#include <comphelper/accessibleeventnotifier.hxx>
+#endif
+
 #ifndef _UTL_ACCESSIBLESTATESETHELPER_HXX_
 #include <unotools/accessiblestatesethelper.hxx>
 #endif
@@ -127,6 +131,9 @@
 #include "editeng.hxx"
 #include "outliner.hxx"
 #include "accessibility.hrc"
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include <svtools/colorcfg.hxx>
+#endif
 
 
 using namespace ::com::sun::star;
@@ -134,6 +141,7 @@ using namespace ::drafts::com::sun::star::accessibility;
 
 namespace accessibility
 {
+    DBG_NAME( AccessibleImageBullet )
 
     AccessibleImageBullet::AccessibleImageBullet ( const uno::Reference< XAccessible >& rParent ) :
         mnParagraphIndex( 0 ),
@@ -141,40 +149,76 @@ namespace accessibility
         mpEditSource( NULL ),
         maEEOffset( 0, 0 ),
         mxParent( rParent ),
-        maStateListeners( maMutex )
-    {
-        // Create the state set.
-        ::utl::AccessibleStateSetHelper* pStateSet  = new ::utl::AccessibleStateSetHelper ();
-        mxStateSet = pStateSet;
+        // well, that's strictly (UNO) exception safe, though not
+        // really robust. We rely on the fact that this member is
+        // constructed last, and that the constructor body catches
+        // exceptions, thus no chance for exceptions once the Id is
+        // fetched. Nevertheless, normally should employ RAII here...
+        mnNotifierClientId(::comphelper::AccessibleEventNotifier::registerClient())
+    {
+#ifdef DBG_UTIL
+        DBG_CTOR( AccessibleImageBullet, NULL );
+        OSL_TRACE( "Received ID: %d", mnNotifierClientId );
+#endif
 
-        // these are always on
-        pStateSet->AddState( AccessibleStateType::VISIBLE );
-        pStateSet->AddState( AccessibleStateType::SHOWING );
-        pStateSet->AddState( AccessibleStateType::ENABLED );
+        try
+        {
+            // Create the state set.
+            ::utl::AccessibleStateSetHelper* pStateSet  = new ::utl::AccessibleStateSetHelper ();
+            mxStateSet = pStateSet;
+
+            // these are always on
+            pStateSet->AddState( AccessibleStateType::VISIBLE );
+            pStateSet->AddState( AccessibleStateType::SHOWING );
+            pStateSet->AddState( AccessibleStateType::ENABLED );
+        }
+        catch( const uno::Exception& ) {}
     }
 
     AccessibleImageBullet::~AccessibleImageBullet()
     {
+        DBG_DTOR( AccessibleImageBullet, NULL );
+
+        // sign off from event notifier
+        if( getNotifierClientId() != -1 )
+        {
+            try
+            {
+                ::comphelper::AccessibleEventNotifier::revokeClient( getNotifierClientId() );
+#ifdef DBG_UTIL
+                OSL_TRACE( "AccessibleImageBullet revoked ID: %d\n", mnNotifierClientId );
+#endif
+            }
+            catch( const uno::Exception& ) {}
+        }
     }
 
     uno::Any SAL_CALL AccessibleImageBullet::queryInterface (const uno::Type & rType) throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         return AccessibleImageBulletInterfaceBase::queryInterface(rType);
     }
 
     uno::Reference< XAccessibleContext > SAL_CALL AccessibleImageBullet::getAccessibleContext(  ) throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         // We implement the XAccessibleContext interface in the same object
         return uno::Reference< XAccessibleContext > ( this );
     }
 
     sal_Int32 SAL_CALL  AccessibleImageBullet::getAccessibleChildCount() throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         return 0;
     }
 
     uno::Reference< XAccessible > SAL_CALL  AccessibleImageBullet::getAccessibleChild( sal_Int32 i ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No childs available")),
                                               uno::Reference< uno::XInterface >
                                               ( static_cast< ::cppu::OWeakObject* > (this) ) ); // static_cast: disambiguate hierarchy
@@ -182,21 +226,29 @@ namespace accessibility
 
     uno::Reference< XAccessible > SAL_CALL  AccessibleImageBullet::getAccessibleParent() throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         return mxParent;
     }
 
     sal_Int32 SAL_CALL  AccessibleImageBullet::getAccessibleIndexInParent() throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         return mnIndexInParent;
     }
 
     sal_Int16 SAL_CALL  AccessibleImageBullet::getAccessibleRole() throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         return AccessibleRole::GRAPHIC;
     }
 
     ::rtl::OUString SAL_CALL  AccessibleImageBullet::getAccessibleDescription() throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         // throws if defunc
@@ -213,6 +265,8 @@ namespace accessibility
 
     ::rtl::OUString SAL_CALL  AccessibleImageBullet::getAccessibleName() throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         // throws if defunc
@@ -229,12 +283,16 @@ namespace accessibility
 
     uno::Reference< XAccessibleRelationSet > SAL_CALL AccessibleImageBullet::getAccessibleRelationSet() throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         // no relations, therefore empty
         return uno::Reference< XAccessibleRelationSet >();
     }
 
     uno::Reference< XAccessibleStateSet > SAL_CALL AccessibleImageBullet::getAccessibleStateSet() throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         // Create a copy of the state set and return it.
@@ -248,6 +306,8 @@ namespace accessibility
 
     lang::Locale SAL_CALL AccessibleImageBullet::getLocale() throw (IllegalAccessibleComponentStateException, uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         lang::Locale        aLocale;
@@ -261,16 +321,24 @@ namespace accessibility
 
     void SAL_CALL AccessibleImageBullet::addEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException)
     {
-        maStateListeners.addInterface( xListener );
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
+        if( getNotifierClientId() != -1 )
+            ::comphelper::AccessibleEventNotifier::addEventListener( getNotifierClientId(), xListener );
     }
 
     void SAL_CALL AccessibleImageBullet::removeEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException)
     {
-        maStateListeners.removeInterface( xListener );
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
+        if( getNotifierClientId() != -1 )
+            ::comphelper::AccessibleEventNotifier::removeEventListener( getNotifierClientId(), xListener );
     }
 
     sal_Bool SAL_CALL AccessibleImageBullet::contains( const awt::Point& rPoint ) throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -285,12 +353,16 @@ namespace accessibility
 
     uno::Reference< XAccessible > SAL_CALL AccessibleImageBullet::getAccessibleAt( const awt::Point& aPoint ) throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         // as we have no children, empty reference
         return uno::Reference< XAccessible >();
     }
 
     awt::Rectangle SAL_CALL AccessibleImageBullet::getBounds(  ) throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -328,6 +400,8 @@ namespace accessibility
 
     awt::Point SAL_CALL AccessibleImageBullet::getLocation(  ) throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         awt::Rectangle aRect = getBounds();
@@ -337,6 +411,8 @@ namespace accessibility
 
     awt::Point SAL_CALL AccessibleImageBullet::getLocationOnScreen(  ) throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         // relate us to parent
@@ -362,6 +438,8 @@ namespace accessibility
 
     awt::Size SAL_CALL AccessibleImageBullet::getSize(  ) throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         awt::Rectangle aRect = getBounds();
@@ -371,6 +449,8 @@ namespace accessibility
 
     void SAL_CALL AccessibleImageBullet::grabFocus(  ) throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Not focusable")),
                                     uno::Reference< uno::XInterface >
                                     ( static_cast< XAccessible* > (this) ) );   // disambiguate hierarchy
@@ -378,13 +458,18 @@ namespace accessibility
 
     sal_Int32 SAL_CALL AccessibleImageBullet::getForeground(  ) throw (::com::sun::star::uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         // #104444# Added to XAccessibleComponent interface
-        UINT32 nColor = Application::GetSettings().GetStyleSettings().GetWindowTextColor().GetColor();
+        svtools::ColorConfig aColorConfig;
+        UINT32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor;
         return static_cast<sal_Int32>(nColor);
     }
 
     sal_Int32 SAL_CALL AccessibleImageBullet::getBackground(  ) throw (::com::sun::star::uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         // #104444# Added to XAccessibleComponent interface
         Color aColor( Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor() );
 
@@ -396,11 +481,15 @@ namespace accessibility
 
     ::rtl::OUString SAL_CALL AccessibleImageBullet::getImplementationName (void) throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("AccessibleImageBullet"));
     }
 
     sal_Bool SAL_CALL AccessibleImageBullet::supportsService (const ::rtl::OUString& sServiceName) throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         //  Iterate over all supported service names and return true if on of them
         //  matches the given name.
         uno::Sequence< ::rtl::OUString> aSupportedServices (
@@ -413,32 +502,71 @@ namespace accessibility
 
     uno::Sequence< ::rtl::OUString> SAL_CALL AccessibleImageBullet::getSupportedServiceNames (void) throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         const ::rtl::OUString sServiceName (RTL_CONSTASCII_USTRINGPARAM ("drafts.com.sun.star.accessibility.AccessibleContext"));
         return uno::Sequence< ::rtl::OUString > (&sServiceName, 1);
     }
 
     ::rtl::OUString SAL_CALL AccessibleImageBullet::getServiceName (void) throw (uno::RuntimeException)
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("drafts.com.sun.star.accessibility.AccessibleContext"));
     }
 
     void AccessibleImageBullet::SetIndexInParent( sal_Int32 nIndex )
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         mnIndexInParent = nIndex;
     }
 
     sal_Int32 AccessibleImageBullet::GetIndexInParent() const
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         return mnIndexInParent;
     }
 
     void AccessibleImageBullet::SetEEOffset( const Point& rOffset )
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         maEEOffset = rOffset;
     }
 
+    void AccessibleImageBullet::Dispose()
+    {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
+        // notify listeners
+        if( getNotifierClientId() != -1 )
+        {
+            try
+            {
+                uno::Reference < XAccessibleContext > xThis = getAccessibleContext();
+
+                // #106234# Delegate to EventNotifier
+                ::comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( getNotifierClientId(),
+                                                                                    xThis );
+#ifdef DBG_UTIL
+                OSL_TRACE( "AccessibleImageBullet disposed ID: %d", mnNotifierClientId );
+#endif
+            }
+            catch( const uno::Exception& ) {}
+        }
+
+        // drop all references
+        mxParent = NULL;
+        mnNotifierClientId = -1;
+        mpEditSource = NULL;
+    }
+
     void AccessibleImageBullet::SetEditSource( SvxEditSource* pEditSource )
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         SvxEditSource* pOldEditSource = mpEditSource;
 
         mpEditSource = pEditSource;
@@ -451,74 +579,41 @@ namespace accessibility
             SetState( AccessibleStateType::INVALID );
             SetState( AccessibleStateType::DEFUNC );
 
-            // notify listeners
-            try
-            {
-                uno::Reference < XAccessibleContext > xThis = getAccessibleContext();
-
-                lang::EventObject aEvent (xThis);
-                maStateListeners.disposeAndClear( aEvent );
-            }
-            catch( const uno::Exception& ) {}
-
-            // drop all references
-            mxParent = NULL;
+            Dispose();
         }
     }
 
     void AccessibleImageBullet::FireEvent(const sal_Int16 nEventId, const uno::Any& rNewValue, const uno::Any& rOldValue ) const
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         uno::Reference < XAccessibleContext > xThis( const_cast< AccessibleImageBullet* > (this)->getAccessibleContext() );
 
         AccessibleEventObject aEvent(xThis, nEventId, rNewValue, rOldValue);
 
-        // no locking necessary, OInterfaceIteratorHelper copies listeners if someone removes/adds in between
-        ::cppu::OInterfaceIteratorHelper aIter( const_cast< AccessibleImageBullet* >(this)->maStateListeners );
-        while( aIter.hasMoreElements() )
-        {
-            uno::Reference < XAccessibleEventListener > xListener( aIter.next(), uno::UNO_QUERY );
-
-            if( xListener.is() )
-            {
-                try
-                {
-                    xListener->notifyEvent (aEvent);
-                }
-                catch( const lang::DisposedException& e )
-                {
-                    // DisposedExceptions from the listener might indicate a
-                    // broken connection to a different environment.
-
-                    OSL_ENSURE(e.Context.is(), "AccessibleImageBullet::FireEvent: caught dispose exception with empty Context field");
-                    // If the exception stems from the listener then remove it
-                    // from the list of listeners.  If the Context field of the
-                    // exception is empty this is interpreted to indicate the
-                    // listener as well.
-                    if (e.Context == xListener
-                        || !e.Context.is())
-                        aIter.remove();
-                }
-                catch( const uno::Exception& e )
-                {
-                    DBG_WARNING1("AccessibleImageBullet::FireEvent: exception %s from listener",
-                                 ::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_DONTKNOW ).getStr() );
-                }
-            }
-        }
+        // #106234# Delegate to EventNotifier
+        ::comphelper::AccessibleEventNotifier::addEvent( getNotifierClientId(),
+                                                         aEvent );
     }
 
     void AccessibleImageBullet::GotPropertyEvent( const uno::Any& rNewValue, const sal_Int16 nEventId ) const
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         FireEvent( nEventId, rNewValue );
     }
 
     void AccessibleImageBullet::LostPropertyEvent( const uno::Any& rOldValue, const sal_Int16 nEventId ) const
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         FireEvent( nEventId, uno::Any(), rOldValue );
     }
 
     void AccessibleImageBullet::SetState( const sal_Int16 nStateId )
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
         if( pStateSet != NULL &&
             !pStateSet->contains(nStateId) )
@@ -530,6 +625,8 @@ namespace accessibility
 
     void AccessibleImageBullet::UnSetState( const sal_Int16 nStateId )
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
         if( pStateSet != NULL &&
             pStateSet->contains(nStateId) )
@@ -539,8 +636,17 @@ namespace accessibility
         }
     }
 
+    int AccessibleImageBullet::getNotifierClientId() const
+    {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
+        return mnNotifierClientId;
+    }
+
     void AccessibleImageBullet::SetParagraphIndex( sal_Int32 nIndex )
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         uno::Any aOldDesc;
         uno::Any aOldName;
 
@@ -569,11 +675,15 @@ namespace accessibility
 
     sal_Int32 AccessibleImageBullet::GetParagraphIndex() const SAL_THROW((uno::RuntimeException))
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         return mnParagraphIndex;
     }
 
     SvxEditSource& AccessibleImageBullet::GetEditSource() const SAL_THROW((uno::RuntimeException))
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         if( mpEditSource )
             return *mpEditSource;
         else
@@ -585,6 +695,8 @@ namespace accessibility
 
     SvxTextForwarder& AccessibleImageBullet::GetTextForwarder() const SAL_THROW((uno::RuntimeException))
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         SvxEditSource& rEditSource = GetEditSource();
         SvxTextForwarder* pTextForwarder = rEditSource.GetTextForwarder();
 
@@ -605,6 +717,8 @@ namespace accessibility
 
     SvxViewForwarder& AccessibleImageBullet::GetViewForwarder() const SAL_THROW((uno::RuntimeException))
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         SvxEditSource& rEditSource = GetEditSource();
         SvxViewForwarder* pViewForwarder = rEditSource.GetViewForwarder();
 
@@ -627,6 +741,8 @@ namespace accessibility
 
     const Point& AccessibleImageBullet::GetEEOffset() const
     {
+        DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
         return maEEOffset;
     }
 
diff --git a/svx/source/accessibility/AccessibleImageBullet.hxx b/svx/source/accessibility/AccessibleImageBullet.hxx
index f3e7ab614ff1..c92de737dda3 100644
--- a/svx/source/accessibility/AccessibleImageBullet.hxx
+++ b/svx/source/accessibility/AccessibleImageBullet.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleImageBullet.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: thb $ $Date: 2002-12-10 15:24:55 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -112,7 +112,6 @@
 
 namespace accessibility
 {
-
     typedef ::cppu::WeakImplHelper5< ::drafts::com::sun::star::accessibility::XAccessible,
                                      ::drafts::com::sun::star::accessibility::XAccessibleContext,
                                      ::drafts::com::sun::star::accessibility::XAccessibleComponent,
@@ -209,6 +208,12 @@ namespace accessibility
          */
         void SetEditSource( SvxEditSource* pEditSource );
 
+        /** Dispose this object
+
+            Notifies and deregisters the listeners, drops all references.
+         */
+        void Dispose();
+
         /** Set the current paragraph number
 
             @attention This method does not lock the SolarMutex,
@@ -246,6 +251,8 @@ namespace accessibility
 
         SvxEditSource& GetEditSource() const SAL_THROW((::com::sun::star::uno::RuntimeException));
 
+        int getNotifierClientId() const;
+
         /** Query the SvxTextForwarder for EditEngine access.
 
             @attention This method does not lock the SolarMutex,
@@ -287,7 +294,7 @@ namespace accessibility
         ::com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessible > mxParent;
 
         /// Our listeners (guarded by maMutex)
-        ::cppu::OInterfaceContainerHelper maStateListeners;
+        int mnNotifierClientId;
     };
 
 } // end of namespace accessibility
diff --git a/svx/source/accessibility/AccessibleParaManager.cxx b/svx/source/accessibility/AccessibleParaManager.cxx
index d5f77e81f292..59c699f73c45 100644
--- a/svx/source/accessibility/AccessibleParaManager.cxx
+++ b/svx/source/accessibility/AccessibleParaManager.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleParaManager.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: thb $ $Date: 2002-07-24 16:19:17 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -126,6 +126,9 @@ namespace accessibility
             Release( nNumParas, maChildren.size() );
 
         maChildren.resize( nNumParas );
+
+        if( mnFocusedChild >= nNumParas )
+            mnFocusedChild = -1;
     }
 
     sal_uInt32 AccessibleParaManager::GetNum() const
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index 63c39f95fded..bd04a3309961 100755
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleShape.cxx,v $
  *
- *  $Revision: 1.38 $
+ *  $Revision: 1.39 $
  *
- *  last change: $Author: thb $ $Date: 2002-11-29 17:56:48 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -131,6 +131,7 @@
 #ifndef _UTL_ACCESSIBLESTATESETHELPER_HXX_
 #include <unotools/accessiblestatesethelper.hxx>
 #endif
+#include "svdview.hxx"
 
 using namespace ::rtl;
 using namespace ::com::sun::star;
@@ -150,8 +151,10 @@ AccessibleShape::AccessibleShape (
       maShapeTreeInfo (rShapeTreeInfo),
       mnIndex (rShapeInfo.mnIndex),
       mpText (NULL),
-      mpParent (rShapeInfo.mpChildrenManager)
+      mpParent (rShapeInfo.mpChildrenManager),
+      m_nIndexInParent(-1)
 {
+    m_pShape = GetSdrObjectFromXShape(mxShape);
 }
 
 
@@ -186,11 +189,6 @@ void AccessibleShape::Init (void)
     if (mpChildrenManager != NULL)
         mpChildrenManager->Update();
 
-    // Register at shape as dispose listener.
-    Reference<lang::XComponent> xComponent (mxShape, uno::UNO_QUERY);
-    if (xComponent.is())
-        xComponent->addEventListener (this);
-
     // Register at model as document::XEventListener.
     if (maShapeTreeInfo.GetModelBroadcaster().is())
         maShapeTreeInfo.GetModelBroadcaster()->addEventListener (
@@ -238,14 +236,11 @@ void AccessibleShape::UpdateStates (void)
             {
                 try
                 {
-                    uno::Any aValue = xSet->getPropertyValue (
-                        OUString::createFromAscii ("FillStyle"));
                     drawing::FillStyle aFillStyle;
-                    aValue >>= aFillStyle;
-                    if (aFillStyle == drawing::FillStyle_SOLID)
-                        bShapeIsOpaque = true;
+                    bShapeIsOpaque =  ( xSet->getPropertyValue (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FillStyle"))) >>= aFillStyle)
+                                        && aFillStyle == drawing::FillStyle_SOLID;
                 }
-                catch (::com::sun::star::beans::UnknownPropertyException)
+                catch (::com::sun::star::beans::UnknownPropertyException&)
                 {
                     // Ignore.
                 }
@@ -259,29 +254,38 @@ void AccessibleShape::UpdateStates (void)
 
     // Set the selected state.
     bool bShapeIsSelected = false;
-    Reference<view::XSelectionSupplier> xSelectionSupplier (
-        maShapeTreeInfo.GetController(), uno::UNO_QUERY);
-    if (xSelectionSupplier.is())
+    // XXX fix_me this has to be done with an extra interface later on
+    if ( m_pShape && maShapeTreeInfo.GetSdrView() )
     {
-        Reference<drawing::XShape> xSelectedShape (
-            xSelectionSupplier->getSelection(), uno::UNO_QUERY);
-        if (xSelectedShape.is() && xSelectedShape == mxShape)
-            bShapeIsSelected = true;
-        else
-        {
-            Reference<container::XIndexAccess> xSelectedShapes (
-                xSelectionSupplier->getSelection(), uno::UNO_QUERY);
-            if( xSelectedShapes.is() )
-            {
-                for (sal_Int32 i=0,nCount=xSelectedShapes->getCount();
-                     i<nCount && !bShapeIsSelected; i++)
-                {
-                    if (xSelectedShapes->getByIndex(i) == mxShape)
-                        bShapeIsSelected = true;
-                }
-            }
-        }
+        bShapeIsSelected = maShapeTreeInfo.GetSdrView()->IsObjMarked(m_pShape) == TRUE;
     }
+
+
+//  Reference<view::XSelectionSupplier> xSelectionSupplier ( maShapeTreeInfo.GetController(), uno::UNO_QUERY);
+//    if ( xSelectionSupplier.is() )
+//    {
+//      uno::Any aSelection(xSelectionSupplier->getSelection());
+//        Reference<drawing::XShape> xSelectedShape;
+//      aSelection >>= xSelectedShape;
+//        if ( xSelectedShape.is() && xSelectedShape.get() == mxShape.get() )
+//            bShapeIsSelected = true;
+//        else
+//        {
+//            Reference<container::XIndexAccess> xSelectedShapes;
+//          aSelection >>= xSelectedShapes;
+//          if ( xSelectedShapes.is() )
+//          {
+//              for (sal_Int32 i=0,nCount=xSelectedShapes->getCount();
+//                   i<nCount && !bShapeIsSelected; ++i)
+//              {
+//                  xSelectedShapes->getByIndex(i) >>= xSelectedShape;
+//                  bShapeIsSelected = xSelectedShape.get() == mxShape.get();
+//              }
+//          }
+//        }
+//  }
+
+
     if (bShapeIsSelected)
         pStateSet->AddState (AccessibleStateType::SELECTED);
     else
@@ -361,8 +365,8 @@ sal_Bool AccessibleShape::GetState (sal_Int16 aState)
     group or scene shapes and the paragraphs of text.
 */
 sal_Int32 SAL_CALL
-       AccessibleShape::getAccessibleChildCount (void)
-    throw ()
+       AccessibleShape::getAccessibleChildCount ()
+    throw (::com::sun::star::uno::RuntimeException)
 {
     ThrowIfDisposed ();
     sal_Int32 nChildCount = 0;
@@ -385,7 +389,7 @@ sal_Int32 SAL_CALL
 */
 uno::Reference<XAccessible> SAL_CALL
     AccessibleShape::getAccessibleChild (sal_Int32 nIndex)
-    throw (::com::sun::star::uno::RuntimeException)
+    throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
 {
     ThrowIfDisposed ();
 
@@ -507,128 +511,134 @@ uno::Reference<XAccessible > SAL_CALL
 awt::Rectangle SAL_CALL AccessibleShape::getBounds (void)
     throw (::com::sun::star::uno::RuntimeException)
 {
-    ThrowIfDisposed ();
+    ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+    ::osl::MutexGuard aGuard (maMutex);
 
-    static const OUString sBoundRectName (
-        RTL_CONSTASCII_USTRINGPARAM("BoundRect"));
-    static const OUString sAnchorPositionName (
-        RTL_CONSTASCII_USTRINGPARAM("AnchorPosition"));
+    ThrowIfDisposed ();
     awt::Rectangle aBoundingBox;
-
-    // Get the shape's bounding box in internal coordinates (in 100th of
-    // mm).  Use the property BoundRect.  Only if that is not supported ask
-    // the shape for its position and size directly.
-    Reference<beans::XPropertySet> xSet (mxShape, uno::UNO_QUERY);
-    Reference<beans::XPropertySetInfo> xSetInfo;
-    bool bFoundBoundRect = false;
-    if (xSet.is())
+    if ( mxShape.is() )
     {
-        xSetInfo = xSet->getPropertySetInfo ();
-        if (xSetInfo.is())
+
+        static const OUString sBoundRectName (
+            RTL_CONSTASCII_USTRINGPARAM("BoundRect"));
+        static const OUString sAnchorPositionName (
+            RTL_CONSTASCII_USTRINGPARAM("AnchorPosition"));
+
+        // Get the shape's bounding box in internal coordinates (in 100th of
+        // mm).  Use the property BoundRect.  Only if that is not supported ask
+        // the shape for its position and size directly.
+        Reference<beans::XPropertySet> xSet (mxShape, uno::UNO_QUERY);
+        Reference<beans::XPropertySetInfo> xSetInfo;
+        bool bFoundBoundRect = false;
+        if (xSet.is())
         {
-            if (xSetInfo->hasPropertyByName (sBoundRectName))
+            xSetInfo = xSet->getPropertySetInfo ();
+            if (xSetInfo.is())
             {
-                try
-                {
-                    uno::Any aValue = xSet->getPropertyValue (sBoundRectName);
-                    aValue >>= aBoundingBox;
-                    bFoundBoundRect = true;
-                }
-                catch (beans::UnknownPropertyException e)
+                if (xSetInfo->hasPropertyByName (sBoundRectName))
                 {
-                    // Handled below (bFoundBoundRect stays false).
+                    try
+                    {
+                        uno::Any aValue = xSet->getPropertyValue (sBoundRectName);
+                        aValue >>= aBoundingBox;
+                        bFoundBoundRect = true;
+                    }
+                    catch (beans::UnknownPropertyException e)
+                    {
+                        // Handled below (bFoundBoundRect stays false).
+                    }
                 }
+                else
+                    OSL_TRACE (" no property BoundRect");
             }
-            else
-                OSL_TRACE (" no property BoundRect");
         }
-    }
 
-    // Fallback when there is no BoundRect Property.
-    if ( ! bFoundBoundRect)
-    {
-        awt::Point aPosition (mxShape->getPosition());
-        awt::Size aSize (mxShape->getSize());
-        aBoundingBox = awt::Rectangle (
-            aPosition.X, aPosition.Y,
-            aSize.Width, aSize.Height);
-
-        // While BoundRects have absolute positions, the position returned
-        // by XPosition::getPosition is relative.  Get the anchor position
-        // (usually not (0,0) for Writer shapes).
-        if (xSetInfo.is())
+        // Fallback when there is no BoundRect Property.
+        if ( ! bFoundBoundRect )
         {
-            if (xSetInfo->hasPropertyByName (sAnchorPositionName))
+            awt::Point aPosition (mxShape->getPosition());
+            awt::Size aSize (mxShape->getSize());
+            aBoundingBox = awt::Rectangle (
+                aPosition.X, aPosition.Y,
+                aSize.Width, aSize.Height);
+
+            // While BoundRects have absolute positions, the position returned
+            // by XPosition::getPosition is relative.  Get the anchor position
+            // (usually not (0,0) for Writer shapes).
+            if (xSetInfo.is())
             {
-                uno::Any aPos = xSet->getPropertyValue (sAnchorPositionName);
-                awt::Point aAnchorPosition;
-                aPos >>= aAnchorPosition;
-                aBoundingBox.X += aAnchorPosition.X;
-                aBoundingBox.Y += aAnchorPosition.Y;
+                if (xSetInfo->hasPropertyByName (sAnchorPositionName))
+                {
+                    uno::Any aPos = xSet->getPropertyValue (sAnchorPositionName);
+                    awt::Point aAnchorPosition;
+                    aPos >>= aAnchorPosition;
+                    aBoundingBox.X += aAnchorPosition.X;
+                    aBoundingBox.Y += aAnchorPosition.Y;
+                }
             }
         }
-    }
-
-    // Transform coordinates from internal to pixel.
-    if (maShapeTreeInfo.GetViewForwarder() == NULL)
-        throw uno::RuntimeException (::rtl::OUString (
-            RTL_CONSTASCII_USTRINGPARAM(
-                "AccessibleShape has no valid view forwarder")),
-            static_cast<uno::XWeak*>(this));
-    ::Size aPixelSize = maShapeTreeInfo.GetViewForwarder()->LogicToPixel (
-        ::Size (aBoundingBox.Width, aBoundingBox.Height));
-    ::Point aPixelPosition = maShapeTreeInfo.GetViewForwarder()->LogicToPixel (
-        ::Point (aBoundingBox.X, aBoundingBox.Y));
 
-    // Clip the shape's bounding box with the bounding box of its parent.
-    Reference<XAccessibleComponent> xParentComponent (
-        getAccessibleParent(), uno::UNO_QUERY);
-    if (xParentComponent.is())
-    {
-        // Make the coordinates relative to the parent.
-        awt::Point aParentLocation (xParentComponent->getLocationOnScreen());
-        int x = aPixelPosition.getX() - aParentLocation.X;
-        int y = aPixelPosition.getY() - aParentLocation.Y;
-
-        /*        //  The following block is a workarround for bug #99889# (property
-        //  BoundRect returnes coordinates relative to document window
-        //  instead of absolute coordinates for shapes in Writer).  Has to
-        //  be removed as soon as bug is fixed.
-
-        // Use a non-null anchor position as flag that the shape is in a
-        // Writer document.
-        if (xSetInfo.is())
-            if (xSetInfo->hasPropertyByName (sAnchorPositionName))
-            {
-                uno::Any aPos = xSet->getPropertyValue (sAnchorPositionName);
-                awt::Point aAnchorPosition;
-                aPos >>= aAnchorPosition;
-                if (aAnchorPosition.X > 0)
+        // Transform coordinates from internal to pixel.
+        if (maShapeTreeInfo.GetViewForwarder() == NULL)
+            throw uno::RuntimeException (::rtl::OUString (
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "AccessibleShape has no valid view forwarder")),
+                static_cast<uno::XWeak*>(this));
+        ::Size aPixelSize = maShapeTreeInfo.GetViewForwarder()->LogicToPixel (
+            ::Size (aBoundingBox.Width, aBoundingBox.Height));
+        ::Point aPixelPosition = maShapeTreeInfo.GetViewForwarder()->LogicToPixel (
+            ::Point (aBoundingBox.X, aBoundingBox.Y));
+
+        // Clip the shape's bounding box with the bounding box of its parent.
+        Reference<XAccessibleComponent> xParentComponent (
+            getAccessibleParent(), uno::UNO_QUERY);
+        if (xParentComponent.is())
+        {
+            // Make the coordinates relative to the parent.
+            awt::Point aParentLocation (xParentComponent->getLocationOnScreen());
+            int x = aPixelPosition.getX() - aParentLocation.X;
+            int y = aPixelPosition.getY() - aParentLocation.Y;
+
+            /*        //  The following block is a workarround for bug #99889# (property
+            //  BoundRect returnes coordinates relative to document window
+            //  instead of absolute coordinates for shapes in Writer).  Has to
+            //  be removed as soon as bug is fixed.
+
+            // Use a non-null anchor position as flag that the shape is in a
+            // Writer document.
+            if (xSetInfo.is())
+                if (xSetInfo->hasPropertyByName (sAnchorPositionName))
                 {
-                    x = aPixelPosition.getX();
-                    y = aPixelPosition.getY();
+                    uno::Any aPos = xSet->getPropertyValue (sAnchorPositionName);
+                    awt::Point aAnchorPosition;
+                    aPos >>= aAnchorPosition;
+                    if (aAnchorPosition.X > 0)
+                    {
+                        x = aPixelPosition.getX();
+                        y = aPixelPosition.getY();
+                    }
                 }
-            }
-        //  End of workarround.
-        */
-        // Clip with parent (with coordinates relative to itself).
-        ::Rectangle aBBox (
-            x, y, x + aPixelSize.getWidth(), y + aPixelSize.getHeight());
-        awt::Size aParentSize (xParentComponent->getSize());
-        ::Rectangle aParentBBox (0,0, aParentSize.Width, aParentSize.Height);
-        aBBox = aBBox.GetIntersection (aParentBBox);
-        aBoundingBox = awt::Rectangle (
-            aBBox.getX(),
-            aBBox.getY(),
-            aBBox.getWidth(),
-            aBBox.getHeight());
-    }
-    else
-    {
-        OSL_TRACE ("parent does not support component");
-        aBoundingBox = awt::Rectangle (
-            aPixelPosition.getX(), aPixelPosition.getY(),
-            aPixelSize.getWidth(), aPixelSize.getHeight());
+            //  End of workarround.
+            */
+            // Clip with parent (with coordinates relative to itself).
+            ::Rectangle aBBox (
+                x, y, x + aPixelSize.getWidth(), y + aPixelSize.getHeight());
+            awt::Size aParentSize (xParentComponent->getSize());
+            ::Rectangle aParentBBox (0,0, aParentSize.Width, aParentSize.Height);
+            aBBox = aBBox.GetIntersection (aParentBBox);
+            aBoundingBox = awt::Rectangle (
+                aBBox.getX(),
+                aBBox.getY(),
+                aBBox.getWidth(),
+                aBBox.getHeight());
+        }
+        else
+        {
+            OSL_TRACE ("parent does not support component");
+            aBoundingBox = awt::Rectangle (
+                aPixelPosition.getX(), aPixelPosition.getY(),
+                aPixelSize.getWidth(), aPixelSize.getHeight());
+        }
     }
 
     return aBoundingBox;
@@ -818,7 +828,6 @@ void SAL_CALL
     AccessibleShape::getImplementationName (void)
     throw (::com::sun::star::uno::RuntimeException)
 {
-    ThrowIfDisposed ();
     return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleShape"));
 }
 
@@ -891,36 +900,22 @@ uno::Sequence<uno::Type> SAL_CALL
 
 //=====  lang::XEventListener  ================================================
 
+/** Disposing calls are accepted only from the model: Just reset the
+    reference to the model in the shape tree info.  Otherwise this object
+    remains functional.
+*/
 void SAL_CALL
     AccessibleShape::disposing (const lang::EventObject& aEvent)
     throw (uno::RuntimeException)
 {
+    ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+    ::osl::MutexGuard aGuard (maMutex);
+
     try
     {
-        OSL_TRACE ("AccessibleShape::disposing");
-
-        if (aEvent.Source == mxShape)
-        {
-            uno::Reference<beans::XPropertySet> xShapeProperties (
-                mxShape, uno::UNO_QUERY);
-            SetState (AccessibleStateType::DEFUNC);
-            mxShape = NULL;
-
-            // Release the child containers.
-            if (mpChildrenManager != NULL)
-            {
-                delete mpChildrenManager;
-                mpChildrenManager = NULL;
-            }
-            if (mpText != NULL)
-            {
-                mpText->Dispose();
-                delete mpText;
-                mpText = NULL;
-            }
-        }
-        else if (aEvent.Source ==  maShapeTreeInfo.GetModelBroadcaster())
+        if (aEvent.Source ==  maShapeTreeInfo.GetModelBroadcaster())
         {
+            ::osl::MutexGuard aGuard (maMutex);
             // Remove reference to model broadcaster to allow it to pass
             // away.
             maShapeTreeInfo.SetModelBroadcaster(NULL);
@@ -948,7 +943,7 @@ void SAL_CALL
     // First check if the event is for us.
     uno::Reference<drawing::XShape> xShape (
         rEventObject.Source, uno::UNO_QUERY);
-    if (xShape == mxShape)
+    if ( xShape.get() == mxShape.get() )
     {
         if (rEventObject.EventName.equals (sShapeModified))
         {
@@ -1268,7 +1263,8 @@ uno::Reference< drawing::XShape > AccessibleShape::GetXShape()
 // protected
 void AccessibleShape::disposing (void)
 {
-    OSL_TRACE ("AccessibleShape::disposing()");
+    ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+    ::osl::MutexGuard aGuard (maMutex);
 
     // Make sure to send an event that this object looses the focus in the
     // case that it has the focus.
@@ -1309,7 +1305,18 @@ void AccessibleShape::disposing (void)
     AccessibleContextBase::dispose ();
 }
 
+sal_Int32 SAL_CALL
+       AccessibleShape::getAccessibleIndexInParent (void)
+    throw (::com::sun::star::uno::RuntimeException)
+{
+    ThrowIfDisposed ();
+    //  Use a simple but slow solution for now.  Optimize later.
 
+    sal_Int32 nIndex = m_nIndexInParent;
+    if ( -1 == nIndex )
+        nIndex = AccessibleContextBase::getAccessibleIndexInParent();
+    return nIndex;
+}
 
 
 
diff --git a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx
index 7f835d426d17..f4ce9cfa495a 100644
--- a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx
+++ b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleShapeTreeInfo.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: af $ $Date: 2002-06-07 14:51:14 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -109,12 +109,15 @@ AccessibleShapeTreeInfo::AccessibleShapeTreeInfo (const AccessibleShapeTreeInfo&
 
 AccessibleShapeTreeInfo& AccessibleShapeTreeInfo::operator= (const AccessibleShapeTreeInfo& rInfo)
 {
-    mxDocumentWindow = rInfo.mxDocumentWindow;
-    mxModelBroadcaster = rInfo.mxModelBroadcaster;
-    mpView = rInfo.mpView;
-    mxController = rInfo.mxController,
-    mpWindow = rInfo.mpWindow;
-    mpViewForwarder = rInfo.mpViewForwarder;
+    if ( this != &rInfo )
+    {
+        mxDocumentWindow = rInfo.mxDocumentWindow;
+        mxModelBroadcaster = rInfo.mxModelBroadcaster;
+        mpView = rInfo.mpView;
+        mxController = rInfo.mxController,
+        mpWindow = rInfo.mpWindow;
+        mpViewForwarder = rInfo.mpViewForwarder;
+    }
     return *this;
 }
 
diff --git a/svx/source/accessibility/AccessibleStaticTextBase.cxx b/svx/source/accessibility/AccessibleStaticTextBase.cxx
index 771bb25db25c..ab369167840e 100644
--- a/svx/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/svx/source/accessibility/AccessibleStaticTextBase.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleStaticTextBase.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: thb $ $Date: 2002-11-15 13:12:52 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -154,6 +154,8 @@ namespace accessibility
     //
     //------------------------------------------------------------------------
 
+    DBG_NAME( AccessibleStaticTextBase_Impl );
+
     /** AccessibleStaticTextBase_Impl
 
         This class implements the AccessibleStaticTextBase
@@ -171,17 +173,38 @@ namespace accessibility
         AccessibleStaticTextBase_Impl();
         ~AccessibleStaticTextBase_Impl();
 
-        SvxEditSourceAdapter& GetEditSource() const SAL_THROW((uno::RuntimeException)) { return maEditSource; }
+        SvxEditSourceAdapter& GetEditSource() const SAL_THROW((uno::RuntimeException))
+        {
+            DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
+
+            return maEditSource;
+        }
         void SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((uno::RuntimeException));
 
-        void SetEventSource( const uno::Reference< XAccessible >& rInterface ) { mxThis = rInterface; }
-        uno::Reference< XAccessible > GetEventSource() const { return mxThis; }
+        void SetEventSource( const uno::Reference< XAccessible >& rInterface )
+        {
+            DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
+
+            mxThis = rInterface;
+        }
+        uno::Reference< XAccessible > GetEventSource() const
+        {
+            DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
+
+            return mxThis;
+        }
 
         void SetOffset( const Point& );
-        Point GetOffset() const { ::osl::MutexGuard aGuard( maMutex ); Point aPoint( maOffset ); return aPoint; }
+        Point GetOffset() const
+        {
+            DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
+
+            ::osl::MutexGuard aGuard( maMutex ); Point aPoint( maOffset );
+            return aPoint;
+        }
 
         void UpdateChildren();
-        void Dispose() { mxThis = NULL; }
+        void Dispose();
 
 #ifdef DBG_UTIL
         void CheckInvariants() const;
@@ -189,8 +212,18 @@ namespace accessibility
 
         AccessibleEditableTextPara& GetParagraph( sal_Int32 nPara ) const;
         sal_Int32                   GetParagraphCount() const;
-        EPosition                   Index2Internal( sal_Int32 nFlatIndex ) const { return ImpCalcInternal( nFlatIndex, false); }
-        EPosition                   Range2Internal( sal_Int32 nFlatIndex ) const { return ImpCalcInternal( nFlatIndex, true); }
+        EPosition                   Index2Internal( sal_Int32 nFlatIndex ) const
+        {
+            DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
+
+            return ImpCalcInternal( nFlatIndex, false );
+        }
+        EPosition                   Range2Internal( sal_Int32 nFlatIndex ) const
+        {
+            DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
+
+            return ImpCalcInternal( nFlatIndex, true );
+        }
         sal_Bool                    SetSelection( sal_Int32 nStartPara, sal_Int32 nStartIndex,
                                                   sal_Int32 nEndPara, sal_Int32 nEndIndex );
         sal_Bool                    CopyText( sal_Int32 nStartPara, sal_Int32 nStartIndex,
@@ -206,7 +239,9 @@ namespace accessibility
         uno::Reference< XAccessible > mxThis;
 
         // implements our functionality, we're just an adapter (guarded by solar mutex)
-        mutable AccessibleEditableTextPara maTextParagraph;
+        mutable AccessibleEditableTextPara* mpTextParagraph;
+
+        uno::Reference< XAccessible > mxParagraph;
 
         // a wrapper for the text forwarders (guarded by solar mutex)
         mutable SvxEditSourceAdapter maEditSource;
@@ -227,37 +262,44 @@ namespace accessibility
 
     AccessibleStaticTextBase_Impl::AccessibleStaticTextBase_Impl() :
         mxThis( NULL ),
-        maTextParagraph( NULL ),
+        mpTextParagraph( new AccessibleEditableTextPara(NULL) ),
+        mxParagraph( mpTextParagraph ),
         maEditSource(),
         maMutex(),
         maOffset(0,0)
     {
+        DBG_CTOR( AccessibleStaticTextBase_Impl, NULL );
+
         // TODO: this is still somewhat of a hack, all the more since
         // now the maTextParagraph has an empty parent reference set
-
-        // prevent automatic release of member variable
-        maTextParagraph.acquire();
     }
 
     AccessibleStaticTextBase_Impl::~AccessibleStaticTextBase_Impl()
     {
+        DBG_DTOR( AccessibleStaticTextBase_Impl, NULL );
     }
 
     void AccessibleStaticTextBase_Impl::SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((uno::RuntimeException))
     {
+        DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
+
         maEditSource.SetEditSource( pEditSource );
-        maTextParagraph.SetEditSource( &maEditSource );
+        if( mpTextParagraph )
+            mpTextParagraph->SetEditSource( &maEditSource );
     }
 
     void AccessibleStaticTextBase_Impl::SetOffset( const Point& rPoint )
     {
+        DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
+
         // guard against non-atomic access to maOffset data structure
         {
             ::osl::MutexGuard aGuard( maMutex );
             maOffset = rPoint;
         }
 
-        maTextParagraph.SetEEOffset( rPoint );
+        if( mpTextParagraph )
+            mpTextParagraph->SetEEOffset( rPoint );
 
         // in all cases, check visibility afterwards.
         UpdateChildren();
@@ -265,9 +307,25 @@ namespace accessibility
 
     void AccessibleStaticTextBase_Impl::UpdateChildren()
     {
+        DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
+
         // currently no children
     }
 
+    void AccessibleStaticTextBase_Impl::Dispose()
+    {
+        DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
+
+        // we're the owner of the paragraph, so destroy it, too
+        if( mpTextParagraph )
+            mpTextParagraph->Dispose();
+
+        // drop references
+        mxParagraph = NULL;
+        mxThis = NULL;
+        mpTextParagraph = NULL;
+    }
+
 #ifdef DBG_UTIL
     void AccessibleStaticTextBase_Impl::CheckInvariants() const
     {
@@ -277,20 +335,33 @@ namespace accessibility
 
     AccessibleEditableTextPara& AccessibleStaticTextBase_Impl::GetParagraph( sal_Int32 nPara ) const
     {
+        DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
+
+        if( !mpTextParagraph )
+            throw lang::DisposedException (
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("object has been already disposed")), mxThis );
+
         // TODO: Have a differnt method on AccessibleEditableTextPara
         // that does not care about state changes
-        maTextParagraph.SetParagraphIndex( nPara );
+        mpTextParagraph->SetParagraphIndex( nPara );
 
-        return maTextParagraph;
+        return *mpTextParagraph;
     }
 
     sal_Int32 AccessibleStaticTextBase_Impl::GetParagraphCount() const
     {
-        return maTextParagraph.GetTextForwarder().GetParagraphCount();
+        DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
+
+        if( !mpTextParagraph )
+            return 0;
+        else
+            return mpTextParagraph->GetTextForwarder().GetParagraphCount();
     }
 
     EPosition AccessibleStaticTextBase_Impl::ImpCalcInternal( sal_Int32 nFlatIndex, bool bExclusive ) const
     {
+        DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
+
         if( nFlatIndex < 0 )
             throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleStaticTextBase_Impl::Index2Internal: character index out of bounds")),
                                                   mxThis);
@@ -332,9 +403,14 @@ namespace accessibility
     sal_Bool AccessibleStaticTextBase_Impl::SetSelection( sal_Int32 nStartPara, sal_Int32 nStartIndex,
                                                           sal_Int32 nEndPara, sal_Int32 nEndIndex )
     {
+        DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
+
+        if( !mpTextParagraph )
+            return sal_False;
+
         try
         {
-            SvxEditViewForwarder& rCacheVF = maTextParagraph.GetEditViewForwarder( sal_True );
+            SvxEditViewForwarder& rCacheVF = mpTextParagraph->GetEditViewForwarder( sal_True );
             return rCacheVF.SetSelection( MakeSelection(nStartPara, nStartIndex, nEndPara, nEndIndex) );
         }
         catch( const uno::RuntimeException& )
@@ -346,10 +422,15 @@ namespace accessibility
     sal_Bool AccessibleStaticTextBase_Impl::CopyText( sal_Int32 nStartPara, sal_Int32 nStartIndex,
                                                       sal_Int32 nEndPara, sal_Int32 nEndIndex )
     {
+        DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
+
+        if( !mpTextParagraph )
+            return sal_False;
+
         try
         {
-            SvxEditViewForwarder& rCacheVF = maTextParagraph.GetEditViewForwarder( sal_True );
-            SvxTextForwarder& rCacheTF = maTextParagraph.GetTextForwarder();    // MUST be after GetEditViewForwarder(), see method docs
+            SvxEditViewForwarder& rCacheVF = mpTextParagraph->GetEditViewForwarder( sal_True );
+            SvxTextForwarder& rCacheTF = mpTextParagraph->GetTextForwarder();   // MUST be after GetEditViewForwarder(), see method docs
             sal_Bool aRetVal;
 
             // save current selection
@@ -704,7 +785,15 @@ namespace accessibility
 
         if( AccessibleTextType::PARAGRAPH == aTextType )
         {
-            return mpImpl->GetParagraph( aPos.nPara ).getText();
+            // #106393# Special casing one behind last paragraph
+            if( aPos.nIndex == mpImpl->GetParagraph( aPos.nPara ).getCharacterCount() )
+            {
+                return ::rtl::OUString();
+            }
+            else
+            {
+                return mpImpl->GetParagraph( aPos.nPara ).getText();
+            }
         }
         else
         {
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index e49bf55a7995..5c1d0913dbb1 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleTextHelper.cxx,v $
  *
- *  $Revision: 1.31 $
+ *  $Revision: 1.32 $
  *
- *  last change: $Author: thb $ $Date: 2002-12-12 12:36:51 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -136,6 +136,10 @@
 #include <drafts/com/sun/star/accessibility/AccessibleStateType.hpp>
 #endif
 
+#ifndef COMPHELPER_ACCESSIBLE_EVENT_NOTIFIER
+#include <comphelper/accessibleeventnotifier.hxx>
+#endif
+
 #ifndef _UTL_ACCESSIBLESTATESETHELPER_HXX_
 #include <unotools/accessiblestatesethelper.hxx>
 #endif
@@ -192,6 +196,8 @@ namespace accessibility
 //
 //------------------------------------------------------------------------
 
+    DBG_NAME( AccessibleTextHelper_Impl )
+
     class AccessibleTextHelper_Impl : public SfxListener
     {
 
@@ -215,15 +221,29 @@ namespace accessibility
         SvxEditSourceAdapter& GetEditSource() const SAL_THROW((uno::RuntimeException));
         void SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((uno::RuntimeException));
 
-        void SetEventSource( const uno::Reference< XAccessible >& rInterface ) { mxFrontEnd = rInterface; }
-        uno::Reference< XAccessible > GetEventSource() const { return mxFrontEnd; }
+        void SetEventSource( const uno::Reference< XAccessible >& rInterface )
+        {
+            DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+            mxFrontEnd = rInterface;
+        }
+        uno::Reference< XAccessible > GetEventSource() const
+        {
+            DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+            return mxFrontEnd;
+        }
 
         void SetOffset( const Point& );
-        Point GetOffset() const { ::osl::MutexGuard aGuard( maMutex ); Point aPoint( maOffset ); return aPoint; }
+        Point GetOffset() const
+        {
+            DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+            ::osl::MutexGuard aGuard( maMutex ); Point aPoint( maOffset );
+            return aPoint;
+        }
 
         void SetStartIndex( sal_Int32 nOffset );
         sal_Int32 GetStartIndex() const
         {
+            DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
             // Strictly correct only with locked solar mutex, // but
             // here we rely on the fact that sal_Int32 access is
             // atomic
@@ -274,6 +294,8 @@ namespace accessibility
 
         virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
+        int getNotifierClientId() const { return mnNotifierClientId; }
+
         // lock solar mutex before
         SvxTextForwarder& GetTextForwarder() const SAL_THROW((uno::RuntimeException));
         // lock solar mutex before
@@ -321,14 +343,13 @@ namespace accessibility
         // whether we (this object) has the focus set (guarded by solar mutex)
         sal_Bool mbThisHasFocus;
 
-        // must be before maStateListeners, has to live longer
         mutable ::osl::Mutex maMutex;
 
         /// our current offset to the containing shape/cell (guarded by maMutex)
         Point maOffset;
 
-        // handles our event listeners (guarded by maMutex)
-        ::cppu::OInterfaceContainerHelper maStateListeners;
+        /// client Id from AccessibleEventNotifier
+        int mnNotifierClientId;
 
     };
 
@@ -349,16 +370,30 @@ namespace accessibility
         mbGroupHasFocus( sal_False ),
         mbThisHasFocus( sal_False ),
         maOffset(0,0),
-        maStateListeners( maMutex )
+        // well, that's strictly exception safe, though not really
+        // robust. We rely on the fact that this member is constructed
+        // last, and that the constructor body is empty, thus no
+        // chance for exceptions once the Id is fetched. Nevertheless,
+        // normally should employ RAII here...
+        mnNotifierClientId(::comphelper::AccessibleEventNotifier::registerClient())
     {
+        DBG_CTOR( AccessibleTextHelper_Impl, NULL );
+
+#ifdef DBG_UTIL
+        OSL_TRACE( "AccessibleTextHelper_Impl received ID: %d", mnNotifierClientId );
+#endif
     }
 
     AccessibleTextHelper_Impl::~AccessibleTextHelper_Impl()
     {
+        DBG_DTOR( AccessibleTextHelper_Impl, NULL );
+
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         try
         {
+            // call Dispose here, too, since we've some resources not
+            // automatically freed otherwise
             Dispose();
         }
         catch( const uno::Exception& ) {}
@@ -366,6 +401,8 @@ namespace accessibility
 
     SvxTextForwarder& AccessibleTextHelper_Impl::GetTextForwarder() const SAL_THROW((uno::RuntimeException))
     {
+        DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
         if( !maEditSource.IsValid() )
             throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown edit source")), mxFrontEnd);
 
@@ -382,6 +419,8 @@ namespace accessibility
 
     SvxViewForwarder& AccessibleTextHelper_Impl::GetViewForwarder() const SAL_THROW((uno::RuntimeException))
     {
+        DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
         if( !maEditSource.IsValid() )
             throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown edit source")), mxFrontEnd);
 
@@ -398,6 +437,8 @@ namespace accessibility
 
     SvxEditViewForwarder& AccessibleTextHelper_Impl::GetEditViewForwarder( sal_Bool bCreate ) const SAL_THROW((uno::RuntimeException))
     {
+        DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
         if( !maEditSource.IsValid() )
             throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown edit source")), mxFrontEnd);
 
@@ -424,6 +465,8 @@ namespace accessibility
 
     SvxEditSourceAdapter& AccessibleTextHelper_Impl::GetEditSource() const SAL_THROW((uno::RuntimeException))
     {
+        DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
         if( maEditSource.IsValid() )
             return maEditSource;
         else
@@ -432,6 +475,8 @@ namespace accessibility
 
     sal_Bool AccessibleTextHelper_Impl::IsSelected() const
     {
+        DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
         sal_Bool bRet = sal_False;
 
         try
@@ -460,6 +505,8 @@ namespace accessibility
 
     void AccessibleTextHelper_Impl::SetStartIndex( sal_Int32 nOffset )
     {
+        DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
         sal_Int32 nOldOffset( mnStartIndex );
 
         mnStartIndex = nOffset;
@@ -476,6 +523,8 @@ namespace accessibility
 
     void AccessibleTextHelper_Impl::SetChildFocus( sal_Int32 nChild, sal_Bool bHaveFocus ) SAL_THROW((::com::sun::star::uno::RuntimeException))
     {
+        DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
         if( bHaveFocus )
         {
             if( mbThisHasFocus )
@@ -501,6 +550,8 @@ namespace accessibility
 
     void AccessibleTextHelper_Impl::ChangeChildFocus( sal_Int32 nNewChild ) SAL_THROW((::com::sun::star::uno::RuntimeException))
     {
+        DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
         if( mbThisHasFocus )
             SetShapeFocus( sal_False );
 
@@ -512,6 +563,8 @@ namespace accessibility
 
     void AccessibleTextHelper_Impl::SetShapeFocus( sal_Bool bHaveFocus ) SAL_THROW((::com::sun::star::uno::RuntimeException))
     {
+        DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
         sal_Bool bOldFocus( mbThisHasFocus );
 
         mbThisHasFocus = bHaveFocus;
@@ -533,6 +586,8 @@ namespace accessibility
 
     void AccessibleTextHelper_Impl::SetFocus( sal_Bool bHaveFocus ) SAL_THROW((::com::sun::star::uno::RuntimeException))
     {
+        DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
         sal_Bool bOldFocus( mbGroupHasFocus );
 
         mbGroupHasFocus = bHaveFocus;
@@ -558,6 +613,8 @@ namespace accessibility
 
     sal_Bool AccessibleTextHelper_Impl::HaveFocus() SAL_THROW((::com::sun::star::uno::RuntimeException))
     {
+        DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
         // No locking of solar mutex here, since we rely on the fact
         // that sal_Bool access is atomic
         return mbThisHasFocus;
@@ -565,6 +622,8 @@ namespace accessibility
 
     sal_Bool AccessibleTextHelper_Impl::IsActive() const SAL_THROW((uno::RuntimeException))
     {
+        DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
         try
         {
             SvxEditSource& rEditSource = GetEditSource();
@@ -586,17 +645,22 @@ namespace accessibility
 
     void AccessibleTextHelper_Impl::UpdateSelection()
     {
+        DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
         try
         {
             ESelection aSelection;
             if( GetEditViewForwarder().GetSelection( aSelection ) )
             {
-                if( !maLastSelection.IsEqual( aSelection ) )
+                if( !maLastSelection.IsEqual( aSelection ) &&
+                    aSelection.nEndPara < maParaManager.GetNum() )
                 {
                     // #103998# Not that important, changed from assertion to trace
                     if( mbThisHasFocus )
                         DBG_TRACE("AccessibleTextHelper_Impl::UpdateSelection(): Parent has focus!");
 
+                    USHORT nParas( static_cast< USHORT >( GetTextForwarder().GetParagraphCount() ) );
+
                     // notify all affected paragraphs (TODO: may be suboptimal,
                     // since some paragraphs might stay selected)
                     if( maLastSelection.nStartPara != EE_PARA_NOT_FOUND )
@@ -606,11 +670,14 @@ namespace accessibility
                         if( mbGroupHasFocus &&
                             maLastSelection.nEndPara != aSelection.nEndPara )
                         {
-                            maParaManager.FireEvent( maLastSelection.nEndPara,
-                                                     maLastSelection.nEndPara+1,
-                                                     AccessibleEventId::ACCESSIBLE_CARET_EVENT,
-                                                     uno::makeAny(static_cast<sal_Int32>(-1)),
-                                                     uno::makeAny(static_cast<sal_Int32>(maLastSelection.nEndPos)) );
+                            if( maLastSelection.nEndPara < maParaManager.GetNum() )
+                            {
+                                maParaManager.FireEvent( ::std::min( maLastSelection.nEndPara, nParas ),
+                                                         ::std::min( maLastSelection.nEndPara, nParas )+1,
+                                                         AccessibleEventId::ACCESSIBLE_CARET_EVENT,
+                                                         uno::makeAny(static_cast<sal_Int32>(-1)),
+                                                         uno::makeAny(static_cast<sal_Int32>(maLastSelection.nEndPos)) );
+                            }
 
                             ChangeChildFocus( aSelection.nEndPara );
 
@@ -639,6 +706,53 @@ namespace accessibility
                     DBG_TRACE5("AccessibleTextHelper_Impl::UpdateSelection(): caret changed, Object: %d, New pos: %d, Old pos: %d, New para: %d, Old para: %d",
                                this, aSelection.nEndPos, maLastSelection.nEndPos, aSelection.nEndPara, maLastSelection.nEndPara);
 
+                    // #107037# notify selection change
+                    if( maLastSelection.nStartPara == EE_PARA_NOT_FOUND )
+                    {
+                        // last selection is undefined
+                        if( aSelection.nStartPos != aSelection.nEndPos ||
+                            aSelection.nStartPara != aSelection.nEndPara )
+                        {
+                            // selection was undefined, now is on
+                            maParaManager.FireEvent( aSelection.nStartPara,
+                                                     aSelection.nEndPara+1,
+                                                     AccessibleEventId::ACCESSIBLE_SELECTION_EVENT );
+                        }
+                    }
+                    else
+                    {
+                        // last selection is valid
+                        if( (maLastSelection.nStartPos != maLastSelection.nEndPos ||
+                             maLastSelection.nStartPara != maLastSelection.nEndPara) &&
+                            (aSelection.nStartPos == aSelection.nEndPos &&
+                             aSelection.nStartPara == aSelection.nEndPara) )
+                        {
+                            // selection was on, now is empty
+                            maParaManager.FireEvent( ::std::min( maLastSelection.nStartPara, nParas ),
+                                                     ::std::min( maLastSelection.nEndPara, nParas )+1,
+                                                     AccessibleEventId::ACCESSIBLE_SELECTION_EVENT );
+                        }
+                        else if( (maLastSelection.nStartPos == maLastSelection.nEndPos &&
+                                  maLastSelection.nStartPara == maLastSelection.nEndPara) &&
+                                 (aSelection.nStartPos != aSelection.nEndPos ||
+                                  aSelection.nStartPara != aSelection.nEndPara) )
+                        {
+                            // selection was empty, now is on
+                            maParaManager.FireEvent( aSelection.nStartPara,
+                                                     aSelection.nEndPara+1,
+                                                     AccessibleEventId::ACCESSIBLE_SELECTION_EVENT );
+                        }
+                        else
+                        {
+                            // selection was on, now is different
+                            maParaManager.FireEvent( ::std::min(aSelection.nStartPara,
+                                                                ::std::min( maLastSelection.nStartPara, nParas )),
+                                                     ::std::max( aSelection.nEndPara,
+                                                                 static_cast< USHORT >( ::std::min( maLastSelection.nEndPara, nParas )+1 ) ),
+                                                     AccessibleEventId::ACCESSIBLE_SELECTION_EVENT );
+                        }
+                    }
+
                     maLastSelection = aSelection;
                 }
             }
@@ -649,6 +763,8 @@ namespace accessibility
 
     void AccessibleTextHelper_Impl::ShutdownEditSource() SAL_THROW((uno::RuntimeException))
     {
+        DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
         // This should only be called with solar mutex locked, i.e. from the main office thread
 
         // This here is somewhat clumsy: As soon as our children have
@@ -674,6 +790,8 @@ namespace accessibility
 
     void AccessibleTextHelper_Impl::SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((uno::RuntimeException))
     {
+        DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
         // This should only be called with solar mutex locked, i.e. from the main office thread
 
         // shutdown old edit source
@@ -696,6 +814,8 @@ namespace accessibility
 
     void AccessibleTextHelper_Impl::SetOffset( const Point& rPoint )
     {
+        DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
         // guard against non-atomic access to maOffset data structure
         {
             ::osl::MutexGuard aGuard( maMutex );
@@ -711,6 +831,8 @@ namespace accessibility
 
     void AccessibleTextHelper_Impl::UpdateVisibleChildren( bool bBroadcastEvents )
     {
+        DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
         try
         {
             SvxTextForwarder& rCacheTF = GetTextForwarder();
@@ -838,6 +960,8 @@ namespace accessibility
 
     void AccessibleTextHelper_Impl::UpdateBoundRect()
     {
+        DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
         // send ACCESSIBLE_BOUNDRECT_EVENT to affected children
         AccessibleTextHelper_UpdateChildBounds aFunctor( *this );
         ::std::transform( maParaManager.begin(), maParaManager.end(), maParaManager.begin(), aFunctor );
@@ -874,6 +998,8 @@ namespace accessibility
 
     void AccessibleTextHelper_Impl::ParagraphsMoved( sal_Int32 nFirst, sal_Int32 nMiddle, sal_Int32 nLast )
     {
+        DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
         const sal_Int32 nParas = GetTextForwarder().GetParagraphCount();
 
         /* rotate paragraphs
@@ -1020,6 +1146,8 @@ namespace accessibility
 
     void AccessibleTextHelper_Impl::ProcessQueue()
     {
+        DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
         // inspect queue for paragraph insert/remove events. If there
         // is exactly _one_ of those in the queue, and the number of
         // paragraphs has changed by exactly one, use that event to
@@ -1270,6 +1398,8 @@ namespace accessibility
 
     void AccessibleTextHelper_Impl::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
     {
+        DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
         // precondition: solar mutex locked
         DBG_TESTSOLARMUTEX();
 
@@ -1390,8 +1520,29 @@ namespace accessibility
 
     void AccessibleTextHelper_Impl::Dispose()
     {
-        // dispose children
-        maParaManager.Dispose();
+        DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
+        if( getNotifierClientId() != -1 )
+        {
+            try
+            {
+                // #106234# Unregister from EventNotifier
+                ::comphelper::AccessibleEventNotifier::revokeClient( getNotifierClientId() );
+#ifdef DBG_UTIL
+                OSL_TRACE( "AccessibleTextHelper_Impl disposed ID: %d", mnNotifierClientId );
+#endif
+            }
+            catch( const uno::Exception& ) {}
+
+            mnNotifierClientId = -1;
+        }
+
+        try
+        {
+            // dispose children
+            maParaManager.Dispose();
+        }
+        catch( const uno::Exception& ) {}
 
         // quit listen on stale edit source
         if( maEditSource.IsValid() )
@@ -1404,6 +1555,8 @@ namespace accessibility
 
     void AccessibleTextHelper_Impl::FireEvent( const sal_Int16 nEventId, const uno::Any& rNewValue, const uno::Any& rOldValue ) const
     {
+        DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
         // -- object locked --
         ::osl::ClearableMutexGuard aGuard( maMutex );
 
@@ -1416,8 +1569,10 @@ namespace accessibility
         else
             aEvent = AccessibleEventObject(uno::Reference< uno::XInterface >(), nEventId, rNewValue, rOldValue);
 
-        // no locking necessary, OInterfaceIteratorHelper copies listeners if someone removes/adds in between
-        // Further locking, actually, might lead to deadlocks, since we're calling out of this object
+        // no locking necessary, FireEvent internally copies listeners
+        // if someone removes/adds in between Further locking,
+        // actually, might lead to deadlocks, since we're calling out
+        // of this object
         aGuard.clear();
         // -- until here --
 
@@ -1426,55 +1581,29 @@ namespace accessibility
 
     void AccessibleTextHelper_Impl::FireEvent( const AccessibleEventObject& rEvent ) const
     {
-        // no locking necessary, OInterfaceIteratorHelper copies listeners if someone removes/adds in between
-        // Further locking, actually, might lead to deadlocks, since we're calling out of this object
-        ::cppu::OInterfaceIteratorHelper aIter( const_cast< AccessibleTextHelper_Impl* >(this)->maStateListeners );
+        DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
 
         // #102261# Call global queue for focus events
         if( rEvent.EventId == AccessibleStateType::FOCUSED )
             vcl::unohelper::NotifyAccessibleStateEventGlobally( rEvent );
 
-        while( aIter.hasMoreElements() )
-        {
-            uno::Reference < XAccessibleEventListener > xListener( aIter.next(), uno::UNO_QUERY );
-
-            if( xListener.is() )
-            {
-                try
-                {
-                    xListener->notifyEvent (rEvent);
-                }
-                catch( const lang::DisposedException& e )
-                {
-                    // DisposedExceptions from the listener might indicate a
-                    // broken connection to a different environment.
-
-                    OSL_ENSURE(e.Context.is(), "AccessibleTextHelper::FireEvent: caught dispose exception with empty Context field");
-                    // If the exception stems from the listener then remove it
-                    // from the list of listeners.  If the Context field of the
-                    // exception is empty this is interpreted to indicate the
-                    // listener as well.
-                    if (e.Context == xListener
-                        || !e.Context.is())
-                        aIter.remove();
-                }
-                catch( const uno::Exception& e )
-                {
-                    DBG_WARNING1("AccessibleTextHelper::FireEvent: exception %s from listener",
-                                 ::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_DONTKNOW ).getStr() );
-                }
-            }
-        }
+        // #106234# Delegate to EventNotifier
+        ::comphelper::AccessibleEventNotifier::addEvent( getNotifierClientId(),
+                                                         rEvent );
     }
 
     // XAccessibleContext
     sal_Int32 SAL_CALL AccessibleTextHelper_Impl::getAccessibleChildCount() SAL_THROW((uno::RuntimeException))
     {
+        DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
         return mnLastVisibleChild - mnFirstVisibleChild + 1;
     }
 
     uno::Reference< XAccessible > SAL_CALL AccessibleTextHelper_Impl::getAccessibleChild( sal_Int32 i ) SAL_THROW((lang::IndexOutOfBoundsException, uno::RuntimeException))
     {
+        DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
         i -= GetStartIndex();
 
         if( 0 > i || i >= getAccessibleChildCount() ||
@@ -1493,16 +1622,24 @@ namespace accessibility
 
     void SAL_CALL AccessibleTextHelper_Impl::addEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) SAL_THROW((uno::RuntimeException))
     {
-        maStateListeners.addInterface( xListener );
+        DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
+        if( getNotifierClientId() != -1 )
+            ::comphelper::AccessibleEventNotifier::addEventListener( getNotifierClientId(), xListener );
     }
 
     void SAL_CALL AccessibleTextHelper_Impl::removeEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) SAL_THROW((uno::RuntimeException))
     {
-        maStateListeners.removeInterface( xListener );
+        DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
+        if( getNotifierClientId() != -1 )
+            ::comphelper::AccessibleEventNotifier::removeEventListener( getNotifierClientId(), xListener );
     }
 
     uno::Reference< XAccessible > SAL_CALL AccessibleTextHelper_Impl::getAccessibleAt( const awt::Point& _aPoint ) SAL_THROW((uno::RuntimeException))
     {
+        DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
         // make given position relative
         if( !mxFrontEnd.is() )
             throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleTextHelper_Impl::getAccessibleAt: frontend invalid")), mxFrontEnd );
diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx
index 34b423170b4c..d7499f563317 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ChildrenManagerImpl.cxx,v $
  *
- *  $Revision: 1.25 $
+ *  $Revision: 1.26 $
  *
- *  last change: $Author: af $ $Date: 2002-12-04 13:00:42 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,6 +73,12 @@
 #ifndef _COM_SUN_STAR_VIEW_XSELECTIONSUPPLIER_HPP_
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #endif
+#ifndef _COMPHELPER_UNO3_HXX_
+#include <comphelper/uno3.hxx>
+#endif
+#ifndef _COM_SUN_STAR_CONTAINER_XCHILD_HPP_
+#include <com/sun/star/container/XChild.hpp>
+#endif
 
 #include <rtl/ustring.hxx>
 #include <tools/debug.hxx>
@@ -84,6 +90,17 @@ using ::com::sun::star::uno::Reference;
 
 namespace accessibility {
 
+namespace
+{
+void adjustIndexInParentOfShapes(ChildDescriptorListType& _rList)
+{
+    ChildDescriptorListType::iterator aEnd = _rList.end();
+    sal_Int32 i=0;
+    for ( ChildDescriptorListType::iterator aIter = _rList.begin(); aIter != aEnd; ++aIter,++i)
+        aIter->setIndexAtAccessibleShape(i);
+}
+}
+
 //=====  AccessibleChildrenManager  ===========================================
 
 ChildrenManagerImpl::ChildrenManagerImpl (
@@ -97,9 +114,9 @@ ChildrenManagerImpl::ChildrenManagerImpl (
       mxShapeList (rxShapeList),
       mxParent (rxParent),
       maShapeTreeInfo (rShapeTreeInfo),
-      mrContext (rContext)
+      mrContext (rContext),
+      mnNewNameIndex(1)
 {
-    OSL_TRACE ("creating new children manager with %d children", rxShapeList->getCount());
 }
 
 
@@ -154,7 +171,7 @@ uno::Reference<XAccessible>
                 "no accessible child with index ") + nIndex,
             mxParent);
 
-    return GetChild (maVisibleChildren[nIndex]);
+    return GetChild (maVisibleChildren[nIndex],nIndex);
 }
 
 
@@ -164,7 +181,7 @@ uno::Reference<XAccessible>
     yet in the cache.
 */
 uno::Reference<XAccessible>
-    ChildrenManagerImpl::GetChild (ChildDescriptor& rChildDescriptor)
+    ChildrenManagerImpl::GetChild (ChildDescriptor& rChildDescriptor,sal_Int32 _nIndex)
     throw (::com::sun::star::uno::RuntimeException)
 {
     if ( ! rChildDescriptor.mxAccessibleShape.is())
@@ -181,15 +198,19 @@ uno::Reference<XAccessible>
                     AccessibleShapeInfo (
                         rChildDescriptor.mxShape,
                         mxParent,
-                        this),
+                        this,
+                        mnNewNameIndex++),
                     maShapeTreeInfo);
             rChildDescriptor.mxAccessibleShape = uno::Reference<XAccessible> (
                 static_cast<uno::XWeak*>(pShape),
                 uno::UNO_QUERY);
             // Now that there is a reference to the new accessible shape we
             // can safely call its Init() method.
-            if (pShape != NULL)
+            if ( pShape != NULL )
+            {
                 pShape->Init();
+                pShape->setIndexInParent(_nIndex);
+            }
         }
     }
 
@@ -203,10 +224,10 @@ uno::Reference<XAccessible>
     ChildrenManagerImpl::GetChild (const uno::Reference<drawing::XShape>& xShape)
     throw (uno::RuntimeException)
 {
-    ChildDescriptorListType::iterator I;
-    for (I=maVisibleChildren.begin(); I!=maVisibleChildren.end(); I++)
+    ChildDescriptorListType::iterator I, aEnd = maVisibleChildren.end();
+    for (I = maVisibleChildren.begin(); I != aEnd; ++I)
     {
-        if (I->mxShape == xShape)
+        if ( I->mxShape.get() == xShape.get() )
             return I->mxAccessibleShape;
     }
     return uno::Reference<XAccessible> ();
@@ -243,22 +264,25 @@ void ChildrenManagerImpl::Update (bool bCreateNewObjectsOnDemand)
     // shapes from the current list into the new list.
     MergeAccessibilityInformation (aNewChildList);
 
-    // 4. If the visible area has changed then send events that signal a
+    // 4. Replace the current list of visible shapes with the new one.  Do
+    // the same with the visible area.
+    {
+        ::osl::MutexGuard aGuard (maMutex);
+        adjustIndexInParentOfShapes(aNewChildList);
+        maVisibleChildren = aNewChildList;
+        maVisibleArea = aVisibleArea;
+    }
+
+    // 5. If the visible area has changed then send events that signal a
     // change of their bounding boxes for all shapes that are members of
     // both the current and the new list of visible shapes.
     if (maVisibleArea != aVisibleArea)
         SendVisibleAreaEvents (aNewChildList);
 
-    // 5. If children have to be created immediately and not on demand then
+    // 6. If children have to be created immediately and not on demand then
     // create the missing accessible objects now.
     if ( ! bCreateNewObjectsOnDemand)
         CreateAccessibilityObjects (aNewChildList);
-
-    // 6. Replace the current list of visible shapes with the new one.  Do
-    // the same with the visible area.
-    ::osl::MutexGuard aGuard (maMutex);
-    maVisibleChildren = aNewChildList;
-    maVisibleArea = aVisibleArea;
 }
 
 
@@ -274,8 +298,8 @@ void ChildrenManagerImpl::CreateListOfVisibleShapes (
     Rectangle aVisibleArea = maShapeTreeInfo.GetViewForwarder()->GetVisibleArea();
 
     // Add the visible shapes for wich the accessible objects already exist.
-    AccessibleShapeList::iterator I;
-    for (I=maAccessibleShapes.begin(); I!=maAccessibleShapes.end(); ++I)
+    AccessibleShapeList::iterator I,aEnd = maAccessibleShapes.end();
+    for (I=maAccessibleShapes.begin(); I != aEnd; ++I)
     {
         if (I->is())
         {
@@ -298,18 +322,25 @@ void ChildrenManagerImpl::CreateListOfVisibleShapes (
     if (xShapeAccess.is())
     {
         sal_Int32 nShapeCount = xShapeAccess->getCount();
-        for (sal_Int32 i=0; i<nShapeCount; i++)
+        raDescriptorList.reserve( nShapeCount );
+        awt::Point aPos;
+        awt::Size aSize;
+        Rectangle aBoundingBox;
+        uno::Reference<drawing::XShape> xShape;
+        for (sal_Int32 i=0; i<nShapeCount; ++i)
         {
-            uno::Reference<drawing::XShape> xShape;
             xShapeAccess->getByIndex(i) >>= xShape;
-            Rectangle aBoundingBox (
-                xShape->getPosition().X,
-                xShape->getPosition().Y,
-                xShape->getPosition().X + xShape->getSize().Width,
-                xShape->getPosition().Y + xShape->getSize().Height);
+            aPos = xShape->getPosition();
+            aSize = xShape->getSize();
+
+            aBoundingBox.nLeft = aPos.X;
+            aBoundingBox.nTop = aPos.Y;
+            aBoundingBox.nRight = aPos.X + aSize.Width;
+            aBoundingBox.nBottom = aPos.Y + aSize.Height;
+
             // Insert shape if it is visible, i.e. its bounding box overlaps
             // the visible area.
-            if (aBoundingBox.IsOver (aVisibleArea))
+            if ( aBoundingBox.IsOver (aVisibleArea) )
                 raDescriptorList.push_back (ChildDescriptor (xShape));
         }
     }
@@ -324,30 +355,13 @@ void ChildrenManagerImpl::RemoveNonVisibleChildren (
     // Iterate over list of formerly visible children and remove those that
     // are not visible anymore, i.e. member of the new list of visible
     // children.
-    ChildDescriptorListType::iterator I;
-    for (I=maVisibleChildren.begin(); I!=maVisibleChildren.end(); I++)
+    ChildDescriptorListType::iterator I, aEnd = maVisibleChildren.end();
+    for (I=maVisibleChildren.begin(); I != aEnd; ++I)
     {
-        if (find (raNewChildList.begin(), raNewChildList.end(), *I) == raNewChildList.end())
+        if (::std::find(raNewChildList.begin(), raNewChildList.end(), *I) == raNewChildList.end())
         {
-            if (I->mxAccessibleShape.is())
-            {
-                // Send event that the shape has been removed.
-                uno::Any aOldValue;
-                aOldValue <<= I->mxAccessibleShape;
-                mrContext.CommitChange (
-                    AccessibleEventId::ACCESSIBLE_CHILD_EVENT,
-                    uno::Any(),
-                    aOldValue);
-
-                // Dispose and remove the object.
-                if (I->mxShape.is())
-                {
-                    Reference<lang::XComponent> xComponent (I->mxAccessibleShape, uno::UNO_QUERY);
-                    if (xComponent.is())
-                        xComponent->dispose ();
-                    I->mxAccessibleShape = NULL;
-                }
-            }
+            UnregisterAsDisposeListener (I->mxShape);
+            I->disposeAccessibleObject (mrContext);
         }
     }
 }
@@ -359,19 +373,22 @@ void ChildrenManagerImpl::MergeAccessibilityInformation (
     ChildDescriptorListType& raNewChildList)
 {
     ChildDescriptorListType::iterator aOldChildDescriptor;
-    ChildDescriptorListType::iterator I;
-    for (I=raNewChildList.begin(); I!=raNewChildList.end(); I++)
+    ChildDescriptorListType::iterator I, aEnd = raNewChildList.end();
+    for (I=raNewChildList.begin(); I != aEnd; ++I)
     {
         aOldChildDescriptor = find (maVisibleChildren.begin(), maVisibleChildren.end(), *I);
 
         // Copy accessible shape if that exists in the old descriptor.
+        bool bRegistrationIsNecessary = true;
         if (aOldChildDescriptor != maVisibleChildren.end())
             if (aOldChildDescriptor->mxAccessibleShape.is())
             {
                 I->mxAccessibleShape = aOldChildDescriptor->mxAccessibleShape;
-                //                I->mpAccessibleShape = aOldChildDescriptor->mpAccessibleShape;
                 I->mbCreateEventPending = false;
+                bRegistrationIsNecessary = false;
             }
+        if (bRegistrationIsNecessary)
+            RegisterAsDisposeListener (I->mxShape);
     }
 }
 
@@ -381,8 +398,8 @@ void ChildrenManagerImpl::MergeAccessibilityInformation (
 void ChildrenManagerImpl::SendVisibleAreaEvents (
     ChildDescriptorListType& raNewChildList)
 {
-    ChildDescriptorListType::iterator I;
-    for (I=raNewChildList.begin(); I!=raNewChildList.end(); I++)
+    ChildDescriptorListType::iterator I,aEnd = raNewChildList.end();
+    for (I=raNewChildList.begin(); I != aEnd; ++I)
     {
         // Tell shape of changed visible area.  To do this, fake a
         // change of the view forwarder.  (Actually we usually get here
@@ -401,20 +418,19 @@ void ChildrenManagerImpl::SendVisibleAreaEvents (
 void ChildrenManagerImpl::CreateAccessibilityObjects (
     ChildDescriptorListType& raNewChildList)
 {
-    ChildDescriptorListType::iterator I;
-    for (I=raNewChildList.begin(); I!=raNewChildList.end(); I++)
+    ChildDescriptorListType::iterator I, aEnd = raNewChildList.end();
+    sal_Int32 nPos = 0;
+    for ( I = raNewChildList.begin(); I != aEnd; ++I,++nPos)
     {
         // Create the associated accessible object when the flag says so and
         // it does not yet exist.
-        if ( ! I->mxAccessibleShape.is())
-            GetChild (*I);
-        if (I->mxAccessibleShape.is() && I->mbCreateEventPending)
+        if ( ! I->mxAccessibleShape.is() )
+            GetChild (*I,nPos);
+        if ( I->mxAccessibleShape.is() && I->mbCreateEventPending )
         {
-            uno::Any aNewShape;
-            aNewShape <<= I->mxAccessibleShape;
             mrContext.CommitChange (
                 AccessibleEventId::ACCESSIBLE_CHILD_EVENT,
-                aNewShape,
+                uno::makeAny(I->mxAccessibleShape),
                 uno::Any());
         }
     }
@@ -431,28 +447,40 @@ void ChildrenManagerImpl::AddShape (const Reference<drawing::XShape>& rxShape)
 
         // Test visibility of the shape.
         Rectangle aVisibleArea = maShapeTreeInfo.GetViewForwarder()->GetVisibleArea();
+        awt::Point aPos = rxShape->getPosition();
+        awt::Size aSize = rxShape->getSize();
+
         Rectangle aBoundingBox (
-            rxShape->getPosition().X,
-            rxShape->getPosition().Y,
-            rxShape->getPosition().X + rxShape->getSize().Width,
-            rxShape->getPosition().Y + rxShape->getSize().Height);
-        if (aBoundingBox.IsOver (aVisibleArea))
+            aPos.X,
+            aPos.Y,
+            aPos.X + aSize.Width,
+            aPos.Y + aSize.Height);
+        // Add the shape only when it belongs to the list of shapes stored
+        // in mxShapeList (which is either a page or a group shape).
+        Reference<container::XChild> xChild (rxShape, uno::UNO_QUERY);
+        if (xChild.is())
         {
-            // Add shape to list of visible shapes.
-            maVisibleChildren.push_back (ChildDescriptor (rxShape));
-
-            // Create accessibility object.
-            ChildDescriptorListType::iterator I (maVisibleChildren.end());
-            GetChild (*--I);
-
-            // Inform listeners about new child.
-            uno::Any aNewShape;
-            aNewShape <<= I->mxAccessibleShape;
-            aGuard.clear();
-            mrContext.CommitChange (
-                AccessibleEventId::ACCESSIBLE_CHILD_EVENT,
-                aNewShape,
-                uno::Any());
+            Reference<drawing::XShapes> xParent (xChild->getParent(), uno::UNO_QUERY);
+            if (xParent == mxShapeList)
+                if (aBoundingBox.IsOver (aVisibleArea))
+                {
+                    // Add shape to list of visible shapes.
+                    maVisibleChildren.push_back (ChildDescriptor (rxShape));
+
+                    // Create accessibility object.
+                    ChildDescriptor& rDescriptor = maVisibleChildren.back();
+                    GetChild (rDescriptor, maVisibleChildren.size()-1);
+
+                    // Inform listeners about new child.
+                    uno::Any aNewShape;
+                    aNewShape <<= rDescriptor.mxAccessibleShape;
+                    aGuard.clear();
+                    mrContext.CommitChange (
+                        AccessibleEventId::ACCESSIBLE_CHILD_EVENT,
+                        aNewShape,
+                        uno::Any());
+                    RegisterAsDisposeListener (rDescriptor.mxShape);
+                }
         }
     }
 }
@@ -473,23 +501,19 @@ void ChildrenManagerImpl::RemoveShape (const Reference<drawing::XShape>& rxShape
         if (I != maVisibleChildren.end())
         {
             // Remove descriptor from that list.
-            maVisibleChildren.erase (I);
             Reference<XAccessible> xAccessibleShape (I->mxAccessibleShape);
             I->mxAccessibleShape = NULL;
+            maVisibleChildren.erase (I);
 
-            // Send event that the shape has been removed.
-            uno::Any aOldValue;
-            aOldValue <<= xAccessibleShape;
-            aGuard.clear();
-            mrContext.CommitChange (
-                AccessibleEventId::ACCESSIBLE_CHILD_EVENT,
-                uno::Any(),
-                aOldValue);
+            adjustIndexInParentOfShapes(maVisibleChildren);
 
-            // Dispose and remove the object.
-            Reference<lang::XComponent> xComponent (xAccessibleShape, uno::UNO_QUERY);
-            //            if (xComponent.is())
-                //                xComponent->dispose ();
+            UnregisterAsDisposeListener (I->mxShape);
+            // Dispose the accessible object.
+            I->disposeAccessibleObject (mrContext);
+
+            // Now we can safely remove the child descriptor and thus
+            // invalidate the iterator.
+            maVisibleChildren.erase (I);
         }
     }
 }
@@ -519,33 +543,16 @@ void ChildrenManagerImpl::ClearAccessibleShapeList (void)
 {
     // Clear the list of visible accessible objects.  Objects not created on
     // demand for XShapes are treated below.
-    ChildDescriptorListType::iterator I;
-    for (I=maVisibleChildren.begin(); I!=maVisibleChildren.end(); I++)
-        if (I->mxAccessibleShape.is() && I->mxShape.is())
-        {
-            uno::Any aShape;
-            aShape <<= I->mxAccessibleShape;
-            mrContext.CommitChange (
-                AccessibleEventId::ACCESSIBLE_CHILD_EVENT,
-                uno::Any(),
-                aShape);
-
-            // Dispose the object.
-            Reference<lang::XComponent> xComponent (
-                I->mxAccessibleShape, uno::UNO_QUERY);
-            if (xComponent.is())
-                xComponent->dispose ();
-
-            // Reset the reference to the accessible object in any case.  If
-            // it has not been disposed above it will be soon.
-            I->mxAccessibleShape = NULL;
-        }
+    ChildDescriptorListType::iterator I,aEnd = maVisibleChildren.end();
+    for (I=maVisibleChildren.begin(); I != aEnd; ++I)
+        if ( I->mxAccessibleShape.is() && I->mxShape.is() )
+            I->disposeAccessibleObject(mrContext);
     maVisibleChildren.clear ();
 
 
     // Dispose all objects in the accessible shape list.
-    AccessibleShapeList::iterator J;
-    for (J=maAccessibleShapes.begin(); J!=maAccessibleShapes.end(); J++)
+    AccessibleShapeList::iterator J,aEnd2 = maAccessibleShapes.end();
+    for (J=maAccessibleShapes.begin(); J != aEnd2; ++J)
         if (J->is())
         {
             mrContext.CommitChange (
@@ -554,9 +561,7 @@ void ChildrenManagerImpl::ClearAccessibleShapeList (void)
                 uno::makeAny (*J));
 
             // Dispose the object.
-            Reference<lang::XComponent> xComponent (*J, uno::UNO_QUERY);
-            if (xComponent.is())
-                xComponent->dispose ();
+            ::comphelper::disposeComponent(*J);
         }
     maAccessibleShapes.clear ();
 }
@@ -635,6 +640,23 @@ void SAL_CALL
     {
         maShapeTreeInfo.SetController (NULL);
     }
+
+    // Handle disposing UNO shapes.
+    else
+    {
+        Reference<drawing::XShape> xShape (rEventObject.Source, uno::UNO_QUERY);
+
+        // Find the descriptor for the given shape.
+        ChildDescriptorListType::iterator I (
+            find (maVisibleChildren.begin(), maVisibleChildren.end(),
+                ChildDescriptor (xShape)));
+        if (I != maVisibleChildren.end())
+        {
+            // Clear the descriptor.
+            I->disposeAccessibleObject (mrContext);
+            I->mxShape = NULL;
+        }
+    }
 }
 
 
@@ -679,8 +701,6 @@ void  SAL_CALL
 
 void SAL_CALL ChildrenManagerImpl::disposing (void)
 {
-    OSL_TRACE ("ChildrenManagerImpl::disposing()");
-
     // Remove from broadcasters.
     Reference<view::XSelectionSupplier> xSelectionSupplier (
         maShapeTreeInfo.GetController(), uno::UNO_QUERY);
@@ -704,7 +724,8 @@ long int ChildrenManagerImpl::GetChildIndex (const ::com::sun::star::uno::Refere
     throw (::com::sun::star::uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard (maMutex);
-    for (unsigned long i=0; i<maVisibleChildren.size(); i++)
+    sal_Int32 nCount = maVisibleChildren.size();
+    for (sal_Int32 i=0; i < nCount; ++i)
     {
         // Is this equality comparison valid?
         if (maVisibleChildren[i].mxAccessibleShape == xChild)
@@ -727,9 +748,10 @@ void ChildrenManagerImpl::ViewForwarderChanged (ChangeType aChangeType,
     else
     {
         ::osl::MutexGuard aGuard (maMutex);
-        for (unsigned long i=0; i<maVisibleChildren.size(); i++)
+        ChildDescriptorListType::iterator I, aEnd = maVisibleChildren.end();
+        for (I=maVisibleChildren.begin(); I != aEnd; ++I)
         {
-            AccessibleShape* pShape = maVisibleChildren[i].GetAccessibleShape();
+            AccessibleShape* pShape = I->GetAccessibleShape();
             if (pShape != NULL)
                 pShape->ViewForwarderChanged (aChangeType, pViewForwarder);
         }
@@ -764,8 +786,8 @@ sal_Bool ChildrenManagerImpl::ReplaceChild (
     // it.  Otherwise the child to replace is either not in the list or has
     // not ye been created (and is therefore not in the list, too) and a
     // replacement is not necessary.
-    ChildDescriptorListType::iterator I;
-    for (I=maVisibleChildren.begin(); I!=maVisibleChildren.end(); I++)
+    ChildDescriptorListType::iterator I,aEnd = maVisibleChildren.end();
+    for (I=maVisibleChildren.begin(); I != aEnd; ++I)
     {
         if (I->GetAccessibleShape() == pCurrentChild)
         {
@@ -829,8 +851,8 @@ void ChildrenManagerImpl::UpdateSelection (void)
     AccessibleShape* pCurrentlyFocusedShape = NULL;
     AccessibleShape* pNewFocusedShape = NULL;
 
-    ChildDescriptorListType::iterator I;
-    for (I=maVisibleChildren.begin(); I!=maVisibleChildren.end(); I++)
+    ChildDescriptorListType::iterator I, aEnd = maVisibleChildren.end();
+    for (I=maVisibleChildren.begin(); I != aEnd; ++I)
     {
         AccessibleShape* pAccessibleShape = I->GetAccessibleShape();
         if (I->mxAccessibleShape.is() && I->mxShape.is() && pAccessibleShape!=NULL)
@@ -889,6 +911,29 @@ void ChildrenManagerImpl::UpdateSelection (void)
             pNewFocusedShape->SetState (AccessibleStateType::FOCUSED);
     }
 }
+// -----------------------------------------------------------------------------
+
+
+void ChildrenManagerImpl::RegisterAsDisposeListener (
+    const Reference<drawing::XShape>& xShape)
+{
+    Reference<lang::XComponent> xComponent (xShape, uno::UNO_QUERY);
+    if (xComponent.is())
+        xComponent->addEventListener (
+            static_cast<document::XEventListener*>(this));
+}
+
+
+
+
+void ChildrenManagerImpl::UnregisterAsDisposeListener (
+    const Reference<drawing::XShape>& xShape)
+{
+    Reference<lang::XComponent> xComponent (xShape, uno::UNO_QUERY);
+    if (xComponent.is())
+        xComponent->removeEventListener (
+            static_cast<document::XEventListener*>(this));
+}
 
 
 
@@ -917,42 +962,48 @@ ChildDescriptor::ChildDescriptor (const Reference<XAccessible>& rxAccessibleShap
 
 
 
-AccessibleShape* ChildDescriptor::GetAccessibleShape (void) const
+ChildDescriptor::~ChildDescriptor (void)
 {
-    return static_cast<AccessibleShape*> (mxAccessibleShape.get());
 }
 
 
 
 
-/** Compare two child descriptors.  Take into account that a child
-    descriptor may be based on a UNO shape or, already, on an accessible
-    shape.
- */
-bool ChildDescriptor::operator == (const ChildDescriptor& aDescriptor)
+AccessibleShape* ChildDescriptor::GetAccessibleShape (void) const
 {
-    if (mxShape.get() == aDescriptor.mxShape.get())
-        if (mxShape.is())
-            return true;
-        else if (mxAccessibleShape.get() == aDescriptor.mxAccessibleShape.get())
-            return true;
-
-    return false;
+    return static_cast<AccessibleShape*> (mxAccessibleShape.get());
+}
+// -----------------------------------------------------------------------------
+void ChildDescriptor::setIndexAtAccessibleShape(sal_Int32 _nIndex)
+{
+    AccessibleShape* pShape = GetAccessibleShape();
+    if ( pShape )
+        pShape->setIndexInParent(_nIndex);
 }
+// -----------------------------------------------------------------------------
 
 
 
 
-/** The ordering defined by this operator is only used in order to be able
-    to put child descriptors in some STL containers.  The ordering itself is
-    not so important, its 'features' are not used.
-*/
-bool ChildDescriptor::operator < (const ChildDescriptor& aDescriptor)
+void ChildDescriptor::disposeAccessibleObject (AccessibleContextBase& rParent)
 {
-    if (mxShape.get() < aDescriptor.mxShape.get())
-        return true;
-    else
-        return false;
+    if (mxAccessibleShape.is())
+    {
+        // Send event that the shape has been removed.
+        uno::Any aOldValue;
+        aOldValue <<= mxAccessibleShape;
+        rParent.CommitChange (
+            AccessibleEventId::ACCESSIBLE_CHILD_EVENT,
+            uno::Any(),
+            aOldValue);
+
+        // Dispose and remove the object.
+        Reference<lang::XComponent> xComponent (mxAccessibleShape, uno::UNO_QUERY);
+        if (xComponent.is())
+            xComponent->dispose ();
+
+        mxAccessibleShape = NULL;
+    }
 }
 
 
diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx
index ac3896179260..648cfc8f6de9 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.hxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ChildrenManagerImpl.hxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: af $ $Date: 2002-12-04 13:01:07 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -105,6 +105,7 @@ namespace accessibility {
 class AccessibleShape;
 
 class ChildDescriptor; // See below for declaration.
+typedef ::std::vector<ChildDescriptor> ChildDescriptorListType;
 
 // Re-using MutexOwner class defined in AccessibleContextBase.hxx
 
@@ -131,6 +132,10 @@ class ChildDescriptor; // See below for declaration.
     shapes is taken from the view forwarder.  Thus, to signal a change of
     the visible area call <member>ViewForwarderChanged</member>.</p>
 
+    <p>The children manager adds itself as disposing() listener at every UNO
+    shape it creates an accessible object for so that when the UNO shape
+    passes away it can dispose() the associated accessible object.</p>
+
     @see ChildrenManager
 */
 class ChildrenManagerImpl
@@ -204,6 +209,8 @@ public:
         @param aChildDescriptor
             This object contains references to the original shape and its
             associated accessible object.
+        @param  _nIndex
+            The index which will be used in getAccessibleIndexInParent of the accessible shape.
         @return
             Returns a reference to the requested accessible child.  This
             reference is empty if it has not been possible to create the
@@ -211,7 +218,7 @@ public:
     */
     ::com::sun::star::uno::Reference<
             ::drafts::com::sun::star::accessibility::XAccessible>
-        GetChild (ChildDescriptor& aChildDescriptor)
+        GetChild (ChildDescriptor& aChildDescriptor,sal_Int32 _nIndex)
         throw (::com::sun::star::uno::RuntimeException);
 
     /** Return the requested accessible child given a shape.  This method
@@ -352,7 +359,6 @@ protected:
         between updates (i.e. complete rebuilds of the list) and allows a
         fast (constant time) access to its elements for given indices.</p>
     */
-    typedef ::std::vector<ChildDescriptor> ChildDescriptorListType;
     ChildDescriptorListType maVisibleChildren;
 
     /** The original list of UNO shapes.  The visible shapes are inserted
@@ -407,6 +413,12 @@ protected:
         throw (::com::sun::star::uno::RuntimeException);
 
 private:
+    /** Names of new accessible objects are disambiguated with this index.
+        It gets increased every time a new object is created and (at the
+        moment) never reset.
+    */
+    sal_Int32 mnNewNameIndex;
+
     // Don't use the copy constructor or the assignment operator.  They are
     // not implemented (and are not intended to be).
     ChildrenManagerImpl (const ChildrenManagerImpl&);
@@ -470,6 +482,22 @@ private:
     */
     void RemoveShape (const ::com::sun::star::uno::Reference<
         ::com::sun::star::drawing::XShape>& xShape);
+
+    /** Add the children manager as dispose listener at the given shape so
+        that the associated accessible object can be disposed when the shape
+        is disposed.
+        @param xShape
+            Register at this shape as dispose listener.
+    */
+    void RegisterAsDisposeListener (const ::com::sun::star::uno::Reference<
+        ::com::sun::star::drawing::XShape>& xShape);
+
+    /** Remove the children manager as dispose listener at the given shape
+        @param xShape
+            Unregister at this shape as dispose listener.
+    */
+    void UnregisterAsDisposeListener (const ::com::sun::star::uno::Reference<
+        ::com::sun::star::drawing::XShape>& xShape);
 };
 
 
@@ -509,6 +537,12 @@ public:
     */
     AccessibleShape* GetAccessibleShape (void) const;
 
+    /** set the index _nIndex at the accessible shape
+        @param  _nIndex
+            The new index in parent.
+    */
+    void setIndexAtAccessibleShape(sal_Int32 _nIndex);
+
     /** This flag is set during the visibility calculation and indicates
         that at one time in this process an event is sent that informs the
         listners of the creation of a new accessible object.  This flags is
@@ -529,9 +563,33 @@ public:
     explicit ChildDescriptor (const ::com::sun::star::uno::Reference<
         ::drafts::com::sun::star::accessibility::XAccessible>& rxAccessibleShape);
 
+    ~ChildDescriptor (void);
 
-    bool operator == (const ChildDescriptor& aDescriptor);
-    bool operator < (const ChildDescriptor& aDescriptor);
+    /** Dispose the accessible object of this descriptor.  If that object
+        does not exist then do nothing.
+        @param rParent
+            The parent of the accessible object to dispose.  A child event
+            is sent in its name.
+    */
+    void disposeAccessibleObject (AccessibleContextBase& rParent);
+
+    /** Compare two child descriptors.  Take into account that a child
+        descriptor may be based on a UNO shape or, already, on an accessible
+        shape.
+    */
+    inline bool operator == (const ChildDescriptor& aDescriptor)
+    {
+        return (this == &aDescriptor || (mxShape.get() == aDescriptor.mxShape.get() ) && ( mxShape.is() || mxAccessibleShape.get() == aDescriptor.mxAccessibleShape.get()));
+    }
+
+    /** The ordering defined by this operator is only used in order to be able
+        to put child descriptors in some STL containers.  The ordering itself is
+        not so important, its 'features' are not used.
+    */
+    inline bool operator < (const ChildDescriptor& aDescriptor)
+    {
+        return (mxShape.get() < aDescriptor.mxShape.get());
+    }
 
 };
 
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index ea903d318c02..33a67510f816 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: GraphCtlAccessibleContext.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: af $ $Date: 2002-10-23 09:45:49 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -104,6 +104,15 @@
 #ifndef _SFXSMPLHINT_HXX
 #include <svtools/smplhint.hxx>
 #endif
+#ifndef _TOOLKIT_HELPER_CONVERT_HXX_
+#include <toolkit/helper/convert.hxx>
+#endif
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include <svtools/colorcfg.hxx>
+#endif
+#ifndef COMPHELPER_ACCESSIBLE_EVENT_NOTIFIER
+#include <comphelper/accessibleeventnotifier.hxx>
+#endif
 
 //===== local includes ========================================================
 
@@ -160,7 +169,8 @@ SvxGraphCtrlAccessibleContext::SvxGraphCtrlAccessibleContext(
     SvxGraphCtrlAccessibleContext_Base( m_aMutex ),
     mxParent( rxParent ),
     mpControl( &rRepr ),
-    mbDisposed( sal_False )
+    mbDisposed( sal_False ),
+    mnClientId( 0 )
 {
     mpModel = mpControl->GetSdrModel();
     mpPage = (SdrPage*)mpModel->GetPage( 0 );
@@ -382,18 +392,8 @@ void SvxGraphCtrlAccessibleContext::CommitChange (
 /** sends an AccessibleEventObject to all added XAccessibleEventListeners */
 void SvxGraphCtrlAccessibleContext::FireEvent (const AccessibleEventObject& aEvent)
 {
-    AccessibleEventListenerListType::iterator I;
-
-    for (I=mxAccessibleEventListeners.begin(); I!=mxAccessibleEventListeners.end(); I++)
-    {
-        if ((*I).is())
-        {
-            OSL_TRACE ("Fireing event.");
-            (*I)->notifyEvent (aEvent);
-        }
-        else
-            OSL_TRACE ("listener invalid.");
-    }
+    if (mnClientId)
+        comphelper::AccessibleEventNotifier::addEvent( mnClientId, aEvent );
 }
 
 //-----------------------------------------------------------------------------
@@ -526,13 +526,12 @@ lang::Locale SAL_CALL SvxGraphCtrlAccessibleContext::getLocale( void ) throw( Il
 void SAL_CALL SvxGraphCtrlAccessibleContext::addEventListener( const Reference< XAccessibleEventListener >& xListener )
     throw( RuntimeException )
 {
-    OGuard aGuard( Application::GetSolarMutex() );
-
-    if( xListener.is() )
+    if (xListener.is())
     {
-           mxAccessibleEventListeners.insert (
-            mxAccessibleEventListeners.begin(),
-            xListener);
+        OGuard aGuard( Application::GetSolarMutex() );
+        if (!mnClientId)
+            mnClientId = comphelper::AccessibleEventNotifier::registerClient( );
+        comphelper::AccessibleEventNotifier::addEventListener( mnClientId, xListener );
     }
 }
 
@@ -541,10 +540,21 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::addEventListener( const Reference<
 void SAL_CALL SvxGraphCtrlAccessibleContext::removeEventListener( const Reference< XAccessibleEventListener >& xListener )
     throw( RuntimeException )
 {
-    OGuard aGuard( Application::GetSolarMutex() );
+    if (xListener.is())
+    {
+        OGuard aGuard( Application::GetSolarMutex() );
 
-    if( xListener.is() )
-        mxAccessibleEventListeners.erase (xListener);
+        sal_Int32 nListenerCount = comphelper::AccessibleEventNotifier::removeEventListener( mnClientId, xListener );
+        if ( !nListenerCount )
+        {
+            // no listeners anymore
+            // -> revoke ourself. This may lead to the notifier thread dying (if we were the last client),
+            // and at least to us not firing any events anymore, in case somebody calls
+            // NotifyAccessibleEvent, again
+            comphelper::AccessibleEventNotifier::revokeClient( mnClientId );
+            mnClientId = 0;
+        }
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -604,7 +614,8 @@ Any SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleKeyBinding() throw( Run
 sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getForeground (void)
     throw (::com::sun::star::uno::RuntimeException)
 {
-    UINT32 nColor = Application::GetSettings().GetStyleSettings().GetWindowTextColor().GetColor();
+    svtools::ColorConfig aColorConfig;
+    UINT32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor;
     return static_cast<sal_Int32>(nColor);
 }
 
@@ -651,8 +662,8 @@ Sequence< OUString > SAL_CALL SvxGraphCtrlAccessibleContext::getSupportedService
 {
     Sequence< OUString > aSNs( 2 );
 
-    aSNs[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "drafts.com.sun.star.accessibility.AccessibleContext" ) );
-    aSNs[1] = OUString( RTL_CONSTASCII_USTRINGPARAM( "drafts.com.sun.star.accessibility.AccessibleComponent" ) );
+    aSNs[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "drafts.com.sun.star.accessibility.Accessible" ) );
+    aSNs[1] = OUString( RTL_CONSTASCII_USTRINGPARAM( "drafts.com.sun.star.accessibility.AccessibleContext" ) );
 
     return aSNs;
 }
@@ -824,64 +835,39 @@ void SvxGraphCtrlAccessibleContext::setDescription( const OUString& rDescr )
 
 void SAL_CALL SvxGraphCtrlAccessibleContext::disposing()
 {
-    {
-        OGuard aGuard( Application::GetSolarMutex() );
-
-        if( mbDisposed )
-            return;
-
-        mbDisposed = sal_True;
-
-        mpControl = NULL;       // object dies with representation
-        mpView = NULL;
-        mpPage = NULL;
+    OGuard aGuard( Application::GetSolarMutex() );
 
-        {
-            ShapesMapType::iterator I;
+    if( mbDisposed )
+        return;
 
-            for (I=mxShapes.begin(); I!=mxShapes.end(); I++)
-            {
-                XAccessible* pAcc = (*I).second;
-                Reference< XComponent > xComp( pAcc, UNO_QUERY );
-                if( xComp.is() )
-                    xComp->dispose();
+    mbDisposed = sal_True;
 
-                (*I).second->release();
-            }
+    mpControl = NULL;       // object dies with representation
+    mpView = NULL;
+    mpPage = NULL;
 
-            mxShapes.clear();
-        }
+    {
+        ShapesMapType::iterator I;
 
+        for (I=mxShapes.begin(); I!=mxShapes.end(); I++)
         {
+            XAccessible* pAcc = (*I).second;
+            Reference< XComponent > xComp( pAcc, UNO_QUERY );
+            if( xComp.is() )
+                xComp->dispose();
 
-            lang::EventObject   aEvent;
-            aEvent.Source = static_cast< cppu::OWeakObject* >( this );
-
-            EventListenerListType::iterator I;
-
-            for (I=mxEventListeners.begin(); I!=mxEventListeners.end(); I++)
-            {
-                if ((*I).is())
-                {
-                    OSL_TRACE ("Fireing event.");
-                    try
-                    {
-                        (*I)->disposing( aEvent );
-                    }
-                    catch ( RuntimeException & )
-                    {
-                        // be robust, if e.g. a remote bridge has disposed already.
-                        // there is no way, to delegate the error to the caller :o(.
-                    }
-                }
-                else
-                    OSL_TRACE ("listener invalid.");
-            }
+            (*I).second->release();
         }
 
+        mxShapes.clear();
     }
 
-    CommitChange( AccessibleEventId::ACCESSIBLE_STATE_EVENT, Any(), Any() );
+    // Send a disposing to all listeners.
+    if ( mnClientId )
+    {
+        comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( mnClientId, *this );
+        mnClientId =  0;
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -894,21 +880,38 @@ Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBoxOnScreen( void ) throw( R
         throw DisposedException();
 
     return Rectangle(
-        mpControl->GetParent()->OutputToAbsoluteScreenPixel(
+        mpControl->GetAccessibleParentWindow()->OutputToAbsoluteScreenPixel(
             mpControl->GetPosPixel() ),
         mpControl->GetSizePixel() );
 }
 
 //-----------------------------------------------------------------------------
 
+/** Calculate the relative coordinates of the bounding box as difference
+    between the absolute coordinates of the bounding boxes of this control
+    and its parent in the accessibility tree.
+*/
 Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBox( void ) throw( RuntimeException )
 {
     OGuard aGuard( Application::GetSolarMutex() );
 
-    if( NULL == mpControl )
+    Rectangle aBounds ( 0, 0, 0, 0 );
+
+    Window* pWindow = mpControl;
+    if (pWindow != NULL)
+    {
+        aBounds = pWindow->GetWindowExtentsRelative (NULL);
+        Window* pParent = pWindow->GetAccessibleParentWindow();
+        if (pParent != NULL)
+        {
+            Rectangle aParentRect = pParent->GetWindowExtentsRelative (NULL);
+            aBounds -= aParentRect.TopLeft();
+        }
+    }
+    else
         throw DisposedException();
 
-    return Rectangle( mpControl->GetPosPixel(), mpControl->GetSizePixel() );
+    return aBounds;
 }
 
 //-----------------------------------------------------------------------------
diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx
index 1bca3f8da045..0a62f5c5ab81 100755
--- a/svx/source/accessibility/ShapeTypeHandler.cxx
+++ b/svx/source/accessibility/ShapeTypeHandler.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ShapeTypeHandler.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: af $ $Date: 2002-06-27 12:06:13 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -132,8 +132,8 @@ ShapeTypeId ShapeTypeHandler::GetTypeId (const OUString& aServiceName) const
     tServiceNameToSlotId::iterator I (maServiceNameToSlotId.find (aServiceName));
     if (I != maServiceNameToSlotId.end())
     {
-        long nSlotId = maServiceNameToSlotId[aServiceName];
-        return maShapeTypeDescriptorList[nSlotId].mnShapeTypeId;
+        //  long nSlotId = maServiceNameToSlotId[aServiceName];
+        return maShapeTypeDescriptorList[I->second].mnShapeTypeId;
     }
     else
         return -1;
@@ -274,7 +274,7 @@ long ShapeTypeHandler::GetSlotId (const OUString& aServiceName) const
 {
     tServiceNameToSlotId::iterator I (maServiceNameToSlotId.find (aServiceName));
     if (I != maServiceNameToSlotId.end())
-        return maServiceNameToSlotId[aServiceName];
+        return I->second;
     else
         return 0;
 }
diff --git a/svx/source/accessibility/accessibility.src b/svx/source/accessibility/accessibility.src
index 939699c1d903..071196ca90a4 100644
--- a/svx/source/accessibility/accessibility.src
+++ b/svx/source/accessibility/accessibility.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: accessibility.src,v $
  *
- *  $Revision: 1.23 $
+ *  $Revision: 1.24 $
  *
- *  last change: $Author: kz $ $Date: 2002-12-05 10:23:11 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -96,18 +96,18 @@ String RID_SVXSTR_A11Y_TEXT_COLOR
     Text[ russian ] = "text color";
     Text[ greek ] = "text color";
     Text[ dutch ] = "text color";
-    Text[ french ] = "Couleur du texte";
-    Text[ spanish ] = "Color de texto";
+    Text[ french ] = "Couleur de police";
+    Text[ spanish ] = "Color de fuente";
     Text[ finnish ] = "text color";
-    Text[ italian ] = "Colore testo";
+    Text[ italian ] = "Colore carattere";
     Text[ danish ] = "text color";
-    Text[ swedish ] = "Textf�rg";
+    Text[ swedish ] = "Teckenf�rg";
     Text[ polish ] = "text color";
     Text[ portuguese_brazilian ] = "Cor da Fonte";
-    Text[ japanese ] = "テキストの色";
-    Text[ korean ] = "텍스트 색상";
+    Text[ japanese ] = "フォントの色";
+    Text[ korean ] = "글꼴 색상";
     Text[ chinese_simplified ] = "文字颜色";
-    Text[ chinese_traditional ] = "文字顏色";
+    Text[ chinese_traditional ] = "字型顏色";
     Text[ turkish ] = "text color";
     Text[ arabic ] = "text color";
     Text[ catalan ] = "Color del text";
@@ -131,7 +131,7 @@ String RID_SVXSTR_A11Y_BACKGROUND_COLOR
     Text[ polish ] = "background color";
     Text[ portuguese_brazilian ] = "background color";
     Text[ japanese ] = "背景色";
-    Text[ korean ] = "배경색";
+    Text[ korean ] = "배경 색상";
     Text[ chinese_simplified ] = "背景颜色";
     Text[ chinese_traditional ] = "背景顔色";
     Text[ turkish ] = "background color";
@@ -341,7 +341,7 @@ String RID_SVXSTR_A11Y_AND
     Text[ polish ] = "and";
     Text[ portuguese_brazilian ] = "and";
     Text[ japanese ] = "および";
-    Text[ korean ] = "기타 대상";
+    Text[ korean ] = "와(과)";
     Text[ chinese_simplified ] = "和";
     Text[ chinese_traditional ] = "和";
     Text[ turkish ] = "and";
@@ -370,7 +370,7 @@ String RID_SVXSTR_RECTCTL_ACC_CORN_NAME
     Text[ polish ] = "Corner control";
     Text[ portuguese_brazilian ] = "Corner control";
     Text[ japanese ] = "コーナーコントロール";
-    Text[ korean ] = "코너 조정";
+    Text[ korean ] = "모서리 컨트롤";
     Text[ chinese_simplified ] = "角控制";
     Text[ chinese_traditional ] = "角控制項";
     Text[ turkish ] = "Corner control";
@@ -422,7 +422,7 @@ String RID_SVXSTR_RECTCTL_ACC_ANGL_NAME
     Text[ polish ] = "Angle control";
     Text[ portuguese_brazilian ] = "Angle control";
     Text[ japanese ] = "アングルコントロール";
-    Text[ korean ] = "각도 조정";
+    Text[ korean ] = "각도 컨트롤";
     Text[ chinese_simplified ] = "角度控制";
     Text[ chinese_traditional ] = "角度控制項";
     Text[ turkish ] = "Angle control";
@@ -501,7 +501,7 @@ String RID_SVXSTR_RECTCTL_ACC_CHLD_MT
     Text[ polish ] = "Top middle";
     Text[ portuguese_brazilian ] = "Top middle";
     Text[ japanese ] = "中央上";
-    Text[ korean ] = "중간 위";
+    Text[ korean ] = "위 가운데";
     Text[ chinese_simplified ] = "中上";
     Text[ chinese_traditional ] = "中上";
     Text[ turkish ] = "Top middle";
@@ -579,7 +579,7 @@ String RID_SVXSTR_RECTCTL_ACC_CHLD_MM
     Text[ polish ] = "Center";
     Text[ portuguese_brazilian ] = "Center";
     Text[ japanese ] = "中央";
-    Text[ korean ] = "중간";
+    Text[ korean ] = "가운데";
     Text[ chinese_simplified ] = "中";
     Text[ chinese_traditional ] = "中";
     Text[ turkish ] = "Center";
@@ -657,7 +657,7 @@ String RID_SVXSTR_RECTCTL_ACC_CHLD_MB
     Text[ polish ] = "Bottom middle";
     Text[ portuguese_brazilian ] = "Bottom middle";
     Text[ japanese ] = "中央下";
-    Text[ korean ] = "중간 아래";
+    Text[ korean ] = "아래 가운데";
     Text[ chinese_simplified ] = "中下";
     Text[ chinese_traditional ] = "中下";
     Text[ turkish ] = "Bottom middle";
@@ -919,7 +919,7 @@ String RID_SVXSTR_GRAPHCTRL_ACC_NAME
     Text[ polish ] = "Graph control";
     Text[ portuguese_brazilian ] = "Graph control";
     Text[ japanese ] = "輪郭コントロール";
-    Text[ korean ] = "윤곽 조정";
+    Text[ korean ] = "윤곽 컨트롤";
     Text[ chinese_simplified ] = "轮廓控制";
     Text[ chinese_traditional ] = "輪廓控製項";
     Text[ turkish ] = "Graph control";
@@ -1026,7 +1026,7 @@ String RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION
     Text[ polish ] = "Image bullet in paragraph: $(ARG)";
     Text[ portuguese_brazilian ] = "Image bullet in paragraph: $(ARG)";
     Text[ japanese ] = "段落の箇条書きシンボル: $(ARG)";
-    Text[ korean ] = "단락 내 글머리기호 이미지: $(ARG)";
+    Text[ korean ] = "단락 내 글머리 기호 이미지: $(ARG)";
     Text[ chinese_simplified ] = "段落之中的图形式项目符号：$(ARG)";
     Text[ chinese_traditional ] = "段落之中的圖形項目符號：$(ARG)";
     Text[ turkish ] = "Image bullet in paragraph: $(ARG)";
@@ -1053,7 +1053,7 @@ String RID_SVXSTR_A11Y_IMAGEBULLET_NAME
     Text[ polish ] = "Image bullet";
     Text[ portuguese_brazilian ] = "Image bullet";
     Text[ japanese ] = "箇条書きシンボル";
-    Text[ korean ] = "글머리기호 이미지";
+    Text[ korean ] = "글머리 기호 이미지";
     Text[ chinese_simplified ] = "图形式的项目符号";
     Text[ chinese_traditional ] = "圖形式的項目符號";
     Text[ turkish ] = "Image bullet";
@@ -1080,7 +1080,7 @@ String RID_SVXSTR_CHARACTER_SELECTION
     Text[ polish ] = "Special character selection";
     Text[ portuguese_brazilian ] = "Special character selection";
     Text[ japanese ] = "記号と特殊文字の選択";
-    Text[ korean ] = "특수 문자 선택";
+    Text[ korean ] = "특수문자 선택";
     Text[ chinese_simplified ] = "选择特殊字符";
     Text[ chinese_traditional ] = "選擇特殊字元";
     Text[ turkish ] = "Special character selection";
@@ -1107,7 +1107,7 @@ String RID_SVXSTR_CHAR_SEL_DESC
     Text[ polish ] = "Select special characters in this area.";
     Text[ portuguese_brazilian ] = "Select special characters in this area.";
     Text[ japanese ] = "この範囲で記号と特殊文字を選択します。";
-    Text[ korean ] = "이 영역에서 특수 문자를 선택하십시오.";
+    Text[ korean ] = "이 영역에서 특수문자를 선택하십시오.";
     Text[ chinese_simplified ] = "在这个区域内选择特殊字符。";
     Text[ chinese_traditional ] = "在這個區域選擇特殊字元。";
     Text[ turkish ] = "Select special characters in this area.";
@@ -1144,3 +1144,8 @@ String RID_SVXSTR_CHARACTER_CODE
     Text[ thai ] = "Character code ";
 };
 
+
+
+
+
+
diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx
index 1b07d1a36a0a..e1a45f81ea00 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: charmapacc.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: sab $ $Date: 2002-11-15 09:50:54 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -758,7 +758,7 @@ sal_Int16 SAL_CALL SvxShowCharSetItemAcc::getAccessibleRole()
         c_Shifted >>= 4;
     }
     if( c < 256 )
-        sprintf( buf+6, " (%d)", c );
+        snprintf( buf+6, 10, " (%d)", c );
     sDescription.AppendAscii(buf);
 
     return sDescription;
diff --git a/svx/source/accessibility/makefile.mk b/svx/source/accessibility/makefile.mk
index 87c4c16cee8c..42ecde44c232 100755
--- a/svx/source/accessibility/makefile.mk
+++ b/svx/source/accessibility/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.16 $
+#   $Revision: 1.17 $
 #
-#   last change: $Author: thb $ $Date: 2002-12-12 12:36:51 $
+#   last change: $Author: hr $ $Date: 2003-03-27 15:00:34 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -99,6 +99,7 @@ CXXFILES =								\
     ShapeTypeHandler.cxx				\
     SvxShapeTypes.cxx					\
     AccessibleControlShape.cxx			\
+    accessiblewrapper.cxx
 
 SLOFILES =	\
     $(SLO)$/charmapacc.obj						\
@@ -123,7 +124,8 @@ SLOFILES =	\
     $(SLO)$/AccessibleImageBullet.obj			\
     $(SLO)$/ShapeTypeHandler.obj				\
     $(SLO)$/SvxShapeTypes.obj					\
-    $(SLO)$/AccessibleControlShape.obj
+    $(SLO)$/AccessibleControlShape.obj			\
+    $(SLO)$/accessiblewrapper.obj
 
 SRS2NAME = accessibility
 SRC2FILES = accessibility.src
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index a57284db8092..cc115dec06ef 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svxrectctaccessiblecontext.cxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: os $ $Date: 2002-10-29 15:18:43 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -118,6 +118,9 @@
 #ifndef _SVX_DIALMGR_HXX
 #include <dialmgr.hxx>
 #endif
+#ifndef COMPHELPER_ACCESSIBLE_EVENT_NOTIFIER
+#include <comphelper/accessibleeventnotifier.hxx>
+#endif
 
 
 using namespace ::cppu;
@@ -224,9 +227,9 @@ SvxRectCtlAccessibleContext::SvxRectCtlAccessibleContext(
     SvxRectCtlAccessibleContext_Base( m_aMutex ),
     mxParent( rxParent ),
     mpRepr( &rRepr ),
-    mpEventListeners( NULL ),
     mnSelectedChild( NOCHILDSELECTED ),
-    mbAngleMode( rRepr.GetNumOfChilds() == 8 )
+    mbAngleMode( rRepr.GetNumOfChilds() == 8 ),
+    mnClientId( 0 )
 {
     DBG_CTOR( SvxRectCtlAccessibleContext, NULL );
 
@@ -491,23 +494,33 @@ lang::Locale SAL_CALL SvxRectCtlAccessibleContext::getLocale( void ) throw( Ille
 void SAL_CALL SvxRectCtlAccessibleContext::addEventListener( const Reference< XAccessibleEventListener >& xListener )
     throw( RuntimeException )
 {
-    if( xListener.is() )
+    if (xListener.is())
     {
         ::osl::MutexGuard   aGuard( m_aMutex );
-
-        if( !mpEventListeners )
-            mpEventListeners = new cppu::OInterfaceContainerHelper( m_aMutex );
-
-        mpEventListeners->addInterface( xListener );
+        if (!mnClientId)
+            mnClientId = comphelper::AccessibleEventNotifier::registerClient( );
+        comphelper::AccessibleEventNotifier::addEventListener( mnClientId, xListener );
     }
 }
 
 void SAL_CALL SvxRectCtlAccessibleContext::removeEventListener( const Reference< XAccessibleEventListener >& xListener )
     throw( RuntimeException )
 {
-    ::osl::MutexGuard   aGuard( m_aMutex );
-    if( xListener.is() && mpEventListeners )
-        mpEventListeners->removeInterface( xListener );
+    if (xListener.is())
+    {
+        ::osl::MutexGuard   aGuard( m_aMutex );
+
+        sal_Int32 nListenerCount = comphelper::AccessibleEventNotifier::removeEventListener( mnClientId, xListener );
+        if ( !nListenerCount )
+        {
+            // no listeners anymore
+            // -> revoke ourself. This may lead to the notifier thread dying (if we were the last client),
+            // and at least to us not firing any events anymore, in case somebody calls
+            // NotifyAccessibleEvent, again
+            comphelper::AccessibleEventNotifier::revokeClient( mnClientId );
+            mnClientId = 0;
+        }
+    }
 }
 
 void SAL_CALL SvxRectCtlAccessibleContext::addFocusListener( const Reference< awt::XFocusListener >& xListener )
@@ -767,39 +780,8 @@ void SvxRectCtlAccessibleContext::setDescription( const OUString& rDescr )
 
 void SvxRectCtlAccessibleContext::CommitChange( const AccessibleEventObject& rEvent )
 {
-    ::osl::ClearableMutexGuard  aGuard( m_aMutex );
-    if( mpEventListeners )
-    {
-        //  Call all listeners.
-        Sequence< Reference< XInterface > > aListeners = mpEventListeners->getElements();
-
-        aGuard.clear();
-
-        sal_uInt32                          nLength( aListeners.getLength() );
-        if( nLength )
-        {
-            const Reference< XInterface >*  pInterfaces = aListeners.getConstArray();
-            sal_uInt32                      i = nLength;
-
-            while( i )
-            {   // double while because of performance lack of try-catch in loop
-                try
-                {
-                    while( i )
-                    {
-                        ( static_cast< XAccessibleEventListener* >( pInterfaces->get() ) )->notifyEvent( rEvent );
-                        --i;
-                        ++pInterfaces;
-                    }
-                }
-                catch( RuntimeException& )
-                {
-                    --i;
-                    ++pInterfaces;
-                }
-            }
-        }
-    }
+    if (mnClientId)
+        comphelper::AccessibleEventNotifier::addEvent( mnClientId, rEvent );
 }
 
 void SAL_CALL SvxRectCtlAccessibleContext::disposing()
@@ -826,23 +808,14 @@ void SAL_CALL SvxRectCtlAccessibleContext::disposing()
             mpChilds = NULL;
         }
 
-        const Reference< XInterface >   xSource( *this );
-        Any                             aDefunc;
-        aDefunc <<= AccessibleStateType::DEFUNC;
-        CommitChange( AccessibleEventObject( xSource, AccessibleEventId::ACCESSIBLE_STATE_EVENT, Any(), aDefunc ) );
-
         {
             ::osl::MutexGuard   aGuard( m_aMutex );
 
-            if( mpEventListeners )
+            // Send a disposing to all listeners.
+            if ( mnClientId )
             {
-                lang::EventObject   aEvent;
-                aEvent.Source = static_cast< cppu::OWeakObject* >( this );
-
-                mpEventListeners->disposeAndClear( aEvent );
-                delete mpEventListeners;
-
-                mpEventListeners = NULL;
+                comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( mnClientId, *this );
+                mnClientId =  0;
             }
 
             mxParent = Reference< XAccessible >();
@@ -909,11 +882,11 @@ SvxRectCtlChildAccessibleContext::SvxRectCtlChildAccessibleContext(
     mxParent(rxParent),
     mrParentWindow( rParentWindow ),
     mpBoundingBox( new Rectangle( rBoundingBox ) ),
-    mpEventListeners( NULL ),
     msName( rName ),
     msDescription( rDescription ),
     mbIsChecked( sal_False ),
-    mnIndexInParent( nIndexInParent )
+    mnIndexInParent( nIndexInParent ),
+    mnClientId( 0 )
 {
     DBG_CTOR( SvxRectCtlChildAccessibleContext, NULL );
 }
@@ -923,20 +896,11 @@ SvxRectCtlChildAccessibleContext::~SvxRectCtlChildAccessibleContext()
 {
     DBG_DTOR( SvxRectCtlChildAccessibleContext, NULL );
 
-    osl_incrementInterlockedCount( &m_refCount );
-        // prevent to enter this a second time
-
-    if( mpEventListeners )
+    if( IsAlive() )
     {
-        lang::EventObject aEvent;
-        aEvent.Source = static_cast< cppu::OWeakObject* >( this );
-
-        mpEventListeners->disposeAndClear( aEvent );
-        delete mpEventListeners;
-        mpEventListeners = NULL;
+        osl_incrementInterlockedCount( &m_refCount );
+        dispose();      // set mpRepr = NULL & release all childs
     }
-
-    delete mpBoundingBox;
 }
 
 //=====  XAccessible  =========================================================
@@ -1130,12 +1094,12 @@ lang::Locale SAL_CALL SvxRectCtlChildAccessibleContext::getLocale( void ) throw(
 void SAL_CALL SvxRectCtlChildAccessibleContext::addEventListener( const Reference< XAccessibleEventListener >& xListener )
     throw( RuntimeException )
 {
-    ::osl::MutexGuard   aGuard( maMutex );
-    if( xListener.is() )
+    if (xListener.is())
     {
-        if( !mpEventListeners )
-            mpEventListeners = new cppu::OInterfaceContainerHelper( maMutex );
-        mpEventListeners->addInterface( xListener );
+        ::osl::MutexGuard   aGuard( maMutex );
+        if (!mnClientId)
+            mnClientId = comphelper::AccessibleEventNotifier::registerClient( );
+        comphelper::AccessibleEventNotifier::addEventListener( mnClientId, xListener );
     }
 }
 
@@ -1145,9 +1109,21 @@ void SAL_CALL SvxRectCtlChildAccessibleContext::addEventListener( const Referenc
 void SAL_CALL SvxRectCtlChildAccessibleContext::removeEventListener( const Reference< XAccessibleEventListener >& xListener )
     throw( RuntimeException )
 {
-    ::osl::MutexGuard   aGuard( maMutex );
-    if( xListener.is() && mpEventListeners )
-        mpEventListeners->removeInterface( xListener );
+    if (xListener.is())
+    {
+        ::osl::MutexGuard   aGuard( maMutex );
+
+        sal_Int32 nListenerCount = comphelper::AccessibleEventNotifier::removeEventListener( mnClientId, xListener );
+        if ( !nListenerCount )
+        {
+            // no listeners anymore
+            // -> revoke ourself. This may lead to the notifier thread dying (if we were the last client),
+            // and at least to us not firing any events anymore, in case somebody calls
+            // NotifyAccessibleEvent, again
+            comphelper::AccessibleEventNotifier::revokeClient( mnClientId );
+            mnClientId = 0;
+        }
+    }
 }
 
 //=====  XAccessibleValue  ================================================
@@ -1230,27 +1206,26 @@ Sequence< sal_Int8 > SAL_CALL SvxRectCtlChildAccessibleContext::getImplementatio
 
 void SvxRectCtlChildAccessibleContext::CommitChange( const AccessibleEventObject& rEvent )
 {
-    ::osl::ClearableMutexGuard  aGuard( maMutex );
-    if( mpEventListeners )
-    {
-        //  Call all listeners.
-        Sequence< Reference< XInterface > > aListeners = mpEventListeners->getElements();
+    if (mnClientId)
+        comphelper::AccessibleEventNotifier::addEvent( mnClientId, rEvent );
+}
 
-        aGuard.clear();
+void SAL_CALL SvxRectCtlChildAccessibleContext::disposing()
+{
+    if( !rBHelper.bDisposed )
+    {
+        ::osl::MutexGuard   aGuard( maMutex );
 
-        sal_uInt32                                          nLength = aListeners.getLength();
-        if( nLength )
+        // Send a disposing to all listeners.
+        if ( mnClientId )
         {
-            const Reference< XInterface >*      pInterfaces = aListeners.getConstArray();
-            try
-            {
-                for( sal_uInt32 i = nLength ; i ; --i, ++pInterfaces )
-                    ( static_cast< XAccessibleEventListener* >( pInterfaces->get() ) )->notifyEvent( rEvent );
-            }
-            catch( RuntimeException& )
-            {
-            }
+            comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( mnClientId, *this );
+            mnClientId =  0;
         }
+
+        mxParent = Reference< XAccessible >();
+
+        delete mpBoundingBox;
     }
 }
 
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 94936f38cb35..ca8b5e24b220 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: _bmpmask.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: cl $ $Date: 2002-07-09 09:24:59 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -510,6 +510,8 @@ SvxBmpMask::SvxBmpMask( SfxBindings *pBindinx,
     aCbx4.SetClickHdl( LINK( pData, MaskData, CbxHdl ) );
     aCbxTrans.SetClickHdl( LINK( pData, MaskData, CbxTransHdl ) );
 
+    SetAccessibleNames ();
+
     aLbColor1.SetGetFocusHdl( LINK( pData, MaskData, FocusLbHdl ) );
     aLbColor2.SetGetFocusHdl( LINK( pData, MaskData, FocusLbHdl ) );
     aLbColor3.SetGetFocusHdl( LINK( pData, MaskData, FocusLbHdl ) );
@@ -1259,3 +1261,28 @@ void SvxBmpMask::ApplyStyle()
     aTbxPipette.SetItemImage( TBI_PIPETTE, bHighContrast ? maImgPipetteH : maImgPipette );
 }
 
+
+/** Set an accessible name for the source color check boxes.  Without this
+    the lengthy description is read.
+*/
+void SvxBmpMask::SetAccessibleNames (void)
+{
+    String sSourceColor (BMP_RESID( RID_SVXDLG_BMPMASK_STR_SOURCECOLOR));
+    String sSourceColorN;
+
+    sSourceColorN = sSourceColor;
+    sSourceColorN.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 1"));
+    aCbx1.SetAccessibleName (sSourceColorN);
+
+    sSourceColorN = sSourceColor;
+    sSourceColorN.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 2"));
+    aCbx2.SetAccessibleName (sSourceColorN);
+
+    sSourceColorN = sSourceColor;
+    sSourceColorN.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 3"));
+    aCbx3.SetAccessibleName (sSourceColorN);
+
+    sSourceColorN = sSourceColor;
+    sSourceColorN.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 4"));
+    aCbx4.SetAccessibleName (sSourceColorN);
+}
diff --git a/svx/source/dialog/align.cxx b/svx/source/dialog/align.cxx
index 271c4715f0ef..948d2cf32ae0 100644
--- a/svx/source/dialog/align.cxx
+++ b/svx/source/dialog/align.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: align.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: nn $ $Date: 2002-09-26 14:13:43 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -282,10 +282,10 @@ void SvxAlignmentTabPage::Reset( const SfxItemSet& rCoreAttrs )
 {
     const SfxPoolItem* pItem;
 
-    USHORT nPos = ALIGNDLG_HORALIGN_STD;
     pItem = GetUniqueItem( rCoreAttrs, SID_ATTR_ALIGN_HOR_JUSTIFY );
     if ( pItem )
     {
+        USHORT nPos = ALIGNDLG_HORALIGN_STD;
         switch ( (SvxCellHorJustify)
             ( (const SvxHorJustifyItem*)pItem )->GetValue() )
         {
@@ -294,8 +294,10 @@ void SvxAlignmentTabPage::Reset( const SfxItemSet& rCoreAttrs )
             case SVX_HOR_JUSTIFY_RIGHT:     nPos = ALIGNDLG_HORALIGN_RIGHT;     break;
             case SVX_HOR_JUSTIFY_BLOCK:     nPos = ALIGNDLG_HORALIGN_BLOCK;     break;
         }
+        aLbHorAlign.SelectEntryPos( nPos );
     }
-    aLbHorAlign.SelectEntryPos( nPos );
+    else
+        aLbHorAlign.SetNoSelection();
 
     pItem = GetUniqueItem( rCoreAttrs, SID_ATTR_ALIGN_INDENT );
     if ( pItem )
@@ -308,10 +310,10 @@ void SvxAlignmentTabPage::Reset( const SfxItemSet& rCoreAttrs )
     else
         aEdIndent.SetText( String() );
 
-    nPos = ALIGNDLG_VERALIGN_STD;
     pItem = GetUniqueItem( rCoreAttrs, SID_ATTR_ALIGN_VER_JUSTIFY );
     if ( pItem )
     {
+        USHORT nPos = ALIGNDLG_VERALIGN_STD;
         switch ( (SvxCellVerJustify)
                     ( (const SvxVerJustifyItem*)pItem )->GetValue() )
         {
@@ -319,19 +321,20 @@ void SvxAlignmentTabPage::Reset( const SfxItemSet& rCoreAttrs )
             case SVX_VER_JUSTIFY_CENTER:    nPos = ALIGNDLG_VERALIGN_MID;       break;
             case SVX_VER_JUSTIFY_BOTTOM:    nPos = ALIGNDLG_VERALIGN_BOTTOM;    break;
         }
+        aLbVerAlign.SelectEntryPos( nPos );
     }
-    aLbVerAlign.SelectEntryPos( nPos );
+    else
+        aLbVerAlign.SetNoSelection();
 
     pItem = GetUniqueItem( rCoreAttrs, SID_ATTR_ALIGN_ORIENTATION );
-    aWinOrient.SetDegrees(0);
-    aWinOrient.SetStackedTxt(FALSE);
+    aWinOrient.SetNoDegrees();
     if ( pItem )
     {
         switch ( (SvxCellOrientation)
                     ( (const SvxOrientationItem*)pItem )->GetValue() )
         {
             case SVX_ORIENTATION_STANDARD:
-                    pItem = GetItem( rCoreAttrs, SID_ATTR_ALIGN_DEGREES );
+                    pItem = GetUniqueItem( rCoreAttrs, SID_ATTR_ALIGN_DEGREES );
                     if(pItem)
                     {
                         aWinOrient.SetDegrees(
@@ -447,6 +450,7 @@ BOOL SvxAlignmentTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
     USHORT              nWhich;
     TriState            eState;
     const SfxPoolItem*  pOld            = 0;
+    bool                bSelected       = false;
 
     // Horizontale Ausrichtung
     nWhich = GetWhich( SID_ATTR_ALIGN_HOR_JUSTIFY );
@@ -460,12 +464,14 @@ BOOL SvxAlignmentTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
         case ALIGNDLG_HORALIGN_RIGHT:   nTmp = SVX_HOR_JUSTIFY_RIGHT;       break;
         case ALIGNDLG_HORALIGN_BLOCK:   nTmp = SVX_HOR_JUSTIFY_BLOCK;       break;
     }
-    DBG_ASSERT( (USHRT_MAX != nTmp) || !aLbHorAlign.IsEnabled(), "no button checked" );
+    bSelected = aLbHorAlign.GetSelectEntryCount() > 0;
+    pOld = GetUniqueItem( rOldSet, SID_ATTR_ALIGN_HOR_JUSTIFY );
+
+    DBG_ASSERT( !bSelected || (USHRT_MAX != nTmp) || !aLbHorAlign.IsEnabled(), "no button checked" );
         // if aLbHorAlign is disabled SetFlags was called with the WBA_NO_HORIZONTAL flag set
         // 67977 - 30.07.99 - FS
-    pOld = GetOldItem( rCoreAttrs, SID_ATTR_ALIGN_HOR_JUSTIFY );
 
-    if ( !pOld || ( (const SvxHorJustifyItem*)pOld )->GetValue() != nTmp )
+    if ( bSelected && (!pOld || (((const SvxHorJustifyItem*)pOld)->GetValue() != nTmp)) )
     {
         rCoreAttrs.Put( SvxHorJustifyItem( (SvxCellHorJustify)nTmp, nWhich ) );
         bAttrsChanged |= TRUE;
@@ -496,12 +502,14 @@ BOOL SvxAlignmentTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
         case ALIGNDLG_VERALIGN_MID:     nTmp = SVX_VER_JUSTIFY_CENTER;      break;
         case ALIGNDLG_VERALIGN_BOTTOM:  nTmp = SVX_VER_JUSTIFY_BOTTOM;      break;
     }
-    DBG_ASSERT( (USHRT_MAX != nTmp) || !aLbVerAlign.IsEnabled(), "no button checked" );
+    bSelected = aLbHorAlign.GetSelectEntryCount() > 0;
+    pOld = GetUniqueItem( rOldSet, SID_ATTR_ALIGN_VER_JUSTIFY );
+
+    DBG_ASSERT( !bSelected || (USHRT_MAX != nTmp) || !aLbVerAlign.IsEnabled(), "no button checked" );
         // if aLbVerAlign is disabled SetFlags was called with the WBA_NO_VERTICAL flag set
         // 67977 - 30.07.99 - FS
-    pOld = GetOldItem( rCoreAttrs, SID_ATTR_ALIGN_VER_JUSTIFY );
 
-    if ( !pOld || ( (const SvxVerJustifyItem*)pOld )->GetValue() != nTmp )
+    if ( bSelected && (!pOld || (((const SvxVerJustifyItem*)pOld )->GetValue() != nTmp)) )
     {
         rCoreAttrs.Put( SvxVerJustifyItem( (SvxCellVerJustify)nTmp, nWhich ) );
         bAttrsChanged |= TRUE;
@@ -509,43 +517,46 @@ BOOL SvxAlignmentTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
     else if ( rOldSet.GetItemState( nWhich, FALSE ) == SFX_ITEM_DEFAULT )
         rCoreAttrs.ClearItem( nWhich );
 
-    // Schreibrichtung
-    nWhich = GetWhich( SID_ATTR_ALIGN_ORIENTATION );
+    if ( aWinOrient.HasDegrees() )
+    {
+        // Schreibrichtung
+        nWhich = GetWhich( SID_ATTR_ALIGN_ORIENTATION );
 
-    nTmp = SVX_ORIENTATION_STANDARD;
+        nTmp = SVX_ORIENTATION_STANDARD;
 
-    if ( aWinOrient.IsStackedTxt() )
-        nTmp = SVX_ORIENTATION_STACKED;
-    else if ( aWinOrient.GetDegrees()==90 )
-        nTmp = SVX_ORIENTATION_BOTTOMTOP;
-    else if ( aWinOrient.GetDegrees()==270 )
-        nTmp = SVX_ORIENTATION_TOPBOTTOM;
+        if ( aWinOrient.IsStackedTxt() )
+            nTmp = SVX_ORIENTATION_STACKED;
+        else if ( aWinOrient.GetDegrees()==90 )
+            nTmp = SVX_ORIENTATION_BOTTOMTOP;
+        else if ( aWinOrient.GetDegrees()==270 )
+            nTmp = SVX_ORIENTATION_TOPBOTTOM;
 
-    pOld = GetOldItem( rCoreAttrs, SID_ATTR_ALIGN_ORIENTATION );
+        pOld = GetUniqueItem( rOldSet, SID_ATTR_ALIGN_ORIENTATION );
 
-    if ( !pOld || ( (const SvxOrientationItem*)pOld )->GetValue() != nTmp )
-    {
-        rCoreAttrs.Put(
-            SvxOrientationItem( (SvxCellOrientation)nTmp, nWhich ) );
-        bAttrsChanged |= TRUE;
-    }
-    else if ( rOldSet.GetItemState( nWhich, FALSE ) == SFX_ITEM_DEFAULT )
-        rCoreAttrs.ClearItem( nWhich );
+        if ( !pOld || ( (const SvxOrientationItem*)pOld )->GetValue() != nTmp )
+        {
+            rCoreAttrs.Put(
+                SvxOrientationItem( (SvxCellOrientation)nTmp, nWhich ) );
+            bAttrsChanged |= TRUE;
+        }
+        else if ( rOldSet.GetItemState( nWhich, FALSE ) == SFX_ITEM_DEFAULT )
+            rCoreAttrs.ClearItem( nWhich );
 
-    // Schreibwinkel
-    nWhich = GetWhich( SID_ATTR_ALIGN_DEGREES );
+        // Schreibwinkel
+        nWhich = GetWhich( SID_ATTR_ALIGN_DEGREES );
 
-    long nDegrees=aWinOrient.GetDegrees()*100L;
+        long nDegrees=aWinOrient.GetDegrees()*100L;
 
-    pOld = GetOldItem( rCoreAttrs, SID_ATTR_ALIGN_DEGREES );
+        pOld = GetUniqueItem( rOldSet, SID_ATTR_ALIGN_DEGREES );
 
-    if ( !pOld || ( (const SfxInt32Item*)pOld )->GetValue() != nDegrees )
-    {
-        rCoreAttrs.Put(SfxInt32Item( nWhich,nDegrees) );
-        bAttrsChanged |= TRUE;
+        if ( !pOld || ( (const SfxInt32Item*)pOld )->GetValue() != nDegrees )
+        {
+            rCoreAttrs.Put(SfxInt32Item( nWhich,nDegrees) );
+            bAttrsChanged |= TRUE;
+        }
+        else if ( rOldSet.GetItemState( nWhich, FALSE ) == SFX_ITEM_DEFAULT )
+            rCoreAttrs.ClearItem( nWhich );
     }
-    else if ( rOldSet.GetItemState( nWhich, FALSE ) == SFX_ITEM_DEFAULT )
-        rCoreAttrs.ClearItem( nWhich );
 
     // Bezugskante
 
@@ -572,8 +583,8 @@ BOOL SvxAlignmentTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
     eState = aBtnAsianVert.GetState();
     pOld = GetOldItem( rCoreAttrs, SID_ATTR_ALIGN_ASIANVERTICAL );
 
-    if ( !pOld || ( (const SfxBoolItem*)pOld )->GetValue()
-                  != ( eState == STATE_CHECK ) )
+    if ( !pOld || (((const SfxBoolItem*)pOld )->GetValue() != (eState == STATE_CHECK)) ||
+        (aBtnAsianVert.IsTriStateEnabled() && (eState != STATE_DONTKNOW)) ) // changed from "don't care"
     {
         rCoreAttrs.Put( SfxBoolItem( nWhich, (eState == STATE_CHECK) ) );
         bAttrsChanged = TRUE;
@@ -582,34 +593,40 @@ BOOL SvxAlignmentTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
         rCoreAttrs.ClearItem( nWhich );
 
     // Abst"ande zum Zellinhalt
-    nWhich = GetWhich( SID_ATTR_ALIGN_MARGIN );
-    SvxMarginItem aMargin(
-        (INT16)aEdLeftSpace.Denormalize(
-            aEdLeftSpace.GetValue( FUNIT_TWIP ) ),
-        (INT16)aEdTopSpace.Denormalize(
-            aEdTopSpace.GetValue( FUNIT_TWIP ) ),
-        (INT16)aEdRightSpace.Denormalize(
-            aEdRightSpace.GetValue( FUNIT_TWIP ) ),
-        (INT16)aEdBottomSpace.Denormalize(
-            aEdBottomSpace.GetValue( FUNIT_TWIP ) ),
-        nWhich );
-    pOld = GetOldItem( rCoreAttrs, SID_ATTR_ALIGN_MARGIN );
-
-    if ( !pOld || !( *(const SvxMarginItem*)pOld == aMargin ) )
-    {
-        rCoreAttrs.Put( aMargin );
-        bAttrsChanged |= TRUE;
+
+    // #106224# all edits empty: do nothing
+    if( aEdLeftSpace.GetText().Len() || aEdRightSpace.GetText().Len() ||
+        aEdTopSpace.GetText().Len() || aEdBottomSpace.GetText().Len() )
+    {
+        nWhich = GetWhich( SID_ATTR_ALIGN_MARGIN );
+        SvxMarginItem aMargin(
+            (INT16)aEdLeftSpace.Denormalize(
+                aEdLeftSpace.GetValue( FUNIT_TWIP ) ),
+            (INT16)aEdTopSpace.Denormalize(
+                aEdTopSpace.GetValue( FUNIT_TWIP ) ),
+            (INT16)aEdRightSpace.Denormalize(
+                aEdRightSpace.GetValue( FUNIT_TWIP ) ),
+            (INT16)aEdBottomSpace.Denormalize(
+                aEdBottomSpace.GetValue( FUNIT_TWIP ) ),
+            nWhich );
+        pOld = GetOldItem( rCoreAttrs, SID_ATTR_ALIGN_MARGIN );
+
+        if ( !pOld || !( *(const SvxMarginItem*)pOld == aMargin ) )
+        {
+            rCoreAttrs.Put( aMargin );
+            bAttrsChanged |= TRUE;
+        }
+        else if ( rOldSet.GetItemState( nWhich, FALSE ) == SFX_ITEM_DEFAULT )
+            rCoreAttrs.ClearItem( nWhich );
     }
-    else if ( rOldSet.GetItemState( nWhich, FALSE ) == SFX_ITEM_DEFAULT )
-        rCoreAttrs.ClearItem( nWhich );
 
     // Zeilenumbruch
     nWhich = GetWhich( SID_ATTR_ALIGN_LINEBREAK );
     eState = aBtnWrap.GetState();
     pOld = GetOldItem( rCoreAttrs, SID_ATTR_ALIGN_LINEBREAK );
 
-    if ( !pOld || ( (const SfxBoolItem*)pOld )->GetValue()
-                  != ( eState == STATE_CHECK ) )
+    if( !pOld || (((const SfxBoolItem*)pOld )->GetValue() != (eState == STATE_CHECK)) ||
+        (aBtnWrap.IsTriStateEnabled() && (eState != STATE_DONTKNOW)) ) // changed from "don't care"
     {
         rCoreAttrs.Put( SfxBoolItem( nWhich, (eState == STATE_CHECK) ) );
         bAttrsChanged = TRUE;
@@ -622,8 +639,8 @@ BOOL SvxAlignmentTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
     eState = aBtnHyphen.GetState();
     pOld = GetOldItem( rCoreAttrs, SID_ATTR_ALIGN_HYPHENATION );
 
-    if ( !pOld || ( (const SfxBoolItem*)pOld )->GetValue()
-                  != ( eState == STATE_CHECK ) )
+    if ( !pOld || (((const SfxBoolItem*)pOld )->GetValue() != (eState == STATE_CHECK)) ||
+        (aBtnHyphen.IsTriStateEnabled() && (eState != STATE_DONTKNOW)) ) // changed from "don't care"
     {
         rCoreAttrs.Put( SfxBoolItem( nWhich, (eState == STATE_CHECK) ) );
         bAttrsChanged = TRUE;
@@ -635,7 +652,7 @@ BOOL SvxAlignmentTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
     nWhich = GetWhich( SID_ATTR_FRAMEDIRECTION );
     pOld = GetUniqueItem( rOldSet, SID_ATTR_FRAMEDIRECTION );
     SvxFrameDirection eDir = aLbFrameDir.GetSelectEntryValue();
-    BOOL bSelected = aLbFrameDir.GetSelectEntryCount() > 0;
+    bSelected = aLbFrameDir.GetSelectEntryCount() > 0;
 
     if( bSelected && (!pOld || (((const SvxFrameDirectionItem*)pOld)->GetValue() != eDir)) )
     {
diff --git a/svx/source/dialog/align.src b/svx/source/dialog/align.src
index 59b919ced3ee..f2ffaa4845ce 100644
--- a/svx/source/dialog/align.src
+++ b/svx/source/dialog/align.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: align.src,v $
  *
- *  $Revision: 1.40 $
+ *  $Revision: 1.41 $
  *
- *  last change: $Author: kz $ $Date: 2002-09-18 19:22:05 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -127,7 +127,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
         Text[ portuguese ] = "H~orizontal";
         Text[ russian ] = "�� �����������";
         Text[ greek ] = "���������";
-        Text[ dutch ] = "~Horizontaal";
+        Text[ dutch ] = "Hori~zontaal";
         Text[ french ] = "H~orizontal";
         Text[ spanish ] = "~Horizontal";
         Text[ finnish ] = "Vaaka~taso";
@@ -137,7 +137,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
         Text[ polish ] = "Poziomo";
         Text[ portuguese_brazilian ] = "H~orizontal";
         Text[ japanese ] = "横(~Z)";
-        Text[ korean ] = "수평으로(~Z)";
+        Text[ korean ] = "가로(~Z)";
         Text[ chinese_simplified ] = "水平(~Z)";
         Text[ chinese_traditional ] = "水平(~Z)";
         Text[ turkish ] = "Yatay";
@@ -194,10 +194,10 @@ TabPage RID_SVXPAGE_ALIGNMENT
         };
         StringList [ russian ] =
         {
-            < "��������" ; ALIGNDLG_HORALIGN_STD ; > ;
-            < "�����" ; ALIGNDLG_HORALIGN_LEFT ; > ;
+            < "�� ���������" ; ALIGNDLG_HORALIGN_STD ; > ;
+            < "�� ������ ����" ; ALIGNDLG_HORALIGN_LEFT ; > ;
             < "�� ������" ; ALIGNDLG_HORALIGN_CENTER ; > ;
-            < "������" ; ALIGNDLG_HORALIGN_RIGHT ; > ;
+            < "�� ������� ����" ; ALIGNDLG_HORALIGN_RIGHT ; > ;
             < "�� ������" ; ALIGNDLG_HORALIGN_BLOCK ; > ;
         };
         StringList [ greek ] =
@@ -211,9 +211,9 @@ TabPage RID_SVXPAGE_ALIGNMENT
         StringList [ dutch ] =
         {
             < "Standaard" ; ALIGNDLG_HORALIGN_STD ; > ;
-            < "Links  " ; ALIGNDLG_HORALIGN_LEFT ; > ;
+            < "Links" ; ALIGNDLG_HORALIGN_LEFT ; > ;
             < "Gecentreerd" ; ALIGNDLG_HORALIGN_CENTER ; > ;
-            < "Rechts  " ; ALIGNDLG_HORALIGN_RIGHT ; > ;
+            < "Rechts" ; ALIGNDLG_HORALIGN_RIGHT ; > ;
             < "Blok" ; ALIGNDLG_HORALIGN_BLOCK ; > ;
         };
         StringList [ french ] =
@@ -234,7 +234,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
         };
         StringList [ finnish ] =
         {
-            < "Oletusarvo" ; ALIGNDLG_HORALIGN_STD ; > ;
+            < "Oletus" ; ALIGNDLG_HORALIGN_STD ; > ;
             < "Vasen" ; ALIGNDLG_HORALIGN_LEFT ; > ;
             < "Keskell�" ; ALIGNDLG_HORALIGN_CENTER ; > ;
             < "Oikea" ; ALIGNDLG_HORALIGN_RIGHT ; > ;
@@ -290,11 +290,11 @@ TabPage RID_SVXPAGE_ALIGNMENT
         };
         StringList [ korean ] =
         {
-            < "표준" ; ALIGNDLG_HORALIGN_STD ; > ;
+            < "기본값" ; ALIGNDLG_HORALIGN_STD ; > ;
             < "왼쪽" ; ALIGNDLG_HORALIGN_LEFT ; > ;
             < "가운데" ; ALIGNDLG_HORALIGN_CENTER ; > ;
             < "오른쪽" ; ALIGNDLG_HORALIGN_RIGHT ; > ;
-            < "블록" ; ALIGNDLG_HORALIGN_BLOCK ; > ;
+            < "양쪽 맞춤" ; ALIGNDLG_HORALIGN_BLOCK ; > ;
         };
         StringList [ chinese_simplified ] =
         {
@@ -310,7 +310,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
             < "向左" ; ALIGNDLG_HORALIGN_LEFT ; > ;
             < "置中" ; ALIGNDLG_HORALIGN_CENTER ; > ;
             < "向右" ; ALIGNDLG_HORALIGN_RIGHT ; > ;
-            < "两端对齐" ; ALIGNDLG_HORALIGN_BLOCK ; > ;
+            < "左右對齊" ; ALIGNDLG_HORALIGN_BLOCK ; > ;
         };
         StringList [ turkish ] =
         {
@@ -396,9 +396,9 @@ TabPage RID_SVXPAGE_ALIGNMENT
         Text [ ENGLISH ] = "~Vertical" ;
         Text[ english_us ] = "~Vertical";
         Text[ portuguese ] = "~Vertical";
-        Text[ russian ] = "�� ���������";
+        Text[ russian ] = "�� �����~����";
         Text[ greek ] = "~Vertical";
-        Text[ dutch ] = "~Verticaal";
+        Text[ dutch ] = "Ver~ticaal";
         Text[ french ] = "Vertical";
         Text[ spanish ] = "~Vertical";
         Text[ finnish ] = "~Pystytaso";
@@ -460,10 +460,10 @@ TabPage RID_SVXPAGE_ALIGNMENT
         };
         StringList [ russian ] =
         {
-            < "��������" ; ALIGNDLG_VERALIGN_STD ; > ;
-            < "������" ; ALIGNDLG_VERALIGN_TOP ; > ;
+            < "�� ���������" ; ALIGNDLG_VERALIGN_STD ; > ;
+            < "�� �������� ����" ; ALIGNDLG_VERALIGN_TOP ; > ;
             < "�� ��������" ; ALIGNDLG_VERALIGN_MID ; > ;
-            < "�����" ; ALIGNDLG_VERALIGN_BOTTOM ; > ;
+            < "�� ������� ����" ; ALIGNDLG_VERALIGN_BOTTOM ; > ;
         };
         StringList [ greek ] =
         {
@@ -483,7 +483,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
         {
             < "Standard" ; ALIGNDLG_VERALIGN_STD ; > ;
             < "En haut" ; ALIGNDLG_VERALIGN_TOP ; > ;
-            < "Milieu" ; ALIGNDLG_VERALIGN_MID ; > ;
+            < "Centre" ; ALIGNDLG_VERALIGN_MID ; > ;
             < "En bas" ; ALIGNDLG_VERALIGN_BOTTOM ; > ;
         };
         StringList [ spanish ] =
@@ -495,9 +495,9 @@ TabPage RID_SVXPAGE_ALIGNMENT
         };
         StringList [ finnish ] =
         {
-            < "Oletusarvo" ; ALIGNDLG_VERALIGN_STD ; > ;
+            < "Oletus" ; ALIGNDLG_VERALIGN_STD ; > ;
             < "Yl�reuna" ; ALIGNDLG_VERALIGN_TOP ; > ;
-            < "Keskikohta" ; ALIGNDLG_VERALIGN_MID ; > ;
+            < "Keskelle" ; ALIGNDLG_VERALIGN_MID ; > ;
             < "Alareuna" ; ALIGNDLG_VERALIGN_BOTTOM ; > ;
         };
         StringList [ italian ] =
@@ -544,7 +544,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
         };
         StringList [ korean ] =
         {
-            < "기본" ; ALIGNDLG_VERALIGN_STD ; > ;
+            < "기본값" ; ALIGNDLG_VERALIGN_STD ; > ;
             < "위" ; ALIGNDLG_VERALIGN_TOP ; > ;
             < "가운데" ; ALIGNDLG_VERALIGN_MID ; > ;
             < "아래" ; ALIGNDLG_VERALIGN_BOTTOM ; > ;
@@ -604,13 +604,13 @@ TabPage RID_SVXPAGE_ALIGNMENT
         Text [ portuguese ] = "Orienta��o" ;
         Text [ finnish ] = "Tekstin suunta" ;
         Text [ danish ] = "Skriveretning" ;
-        Text [ french ] = "Orientation" ;
+        Text [ french ] = "Orientation du texte" ;
         Text [ swedish ] = "Skrivriktning" ;
         Text [ dutch ] = "Schrijfrichting" ;
         Text [ spanish ] = "Direcci�n de escritura" ;
         Text [ english_us ] = "Text direction" ;
         Text[ chinese_simplified ] = "书写方向";
-        Text[ russian ] = "����������� ������";
+        Text[ russian ] = "����������� ������";
         Text[ polish ] = "Kierunek pisania";
         Text[ japanese ] = "文字の方向";
         Text[ chinese_traditional ] = "書寫方向";
@@ -651,14 +651,14 @@ TabPage RID_SVXPAGE_ALIGNMENT
         Text[ language_user1 ] = " ";
         Text[ english_us ] = "De~grees";
         Text[ portuguese ] = "~Graus";
-        Text[ russian ] = "����";
+        Text[ russian ] = "�������";
         Text[ greek ] = "���~���";
-        Text[ dutch ] = "Gra~den";
+        Text[ dutch ] = "Ho~ek";
         Text[ french ] = "Angle";
         Text[ spanish ] = "~�ngulo";
-        Text[ finnish ] = "~Asteet";
+        Text[ finnish ] = "A~steet";
         Text[ italian ] = "~Gradi";
-        Text[ danish ] = "~Vinkel";
+        Text[ danish ] = "V~inkel";
         Text[ swedish ] = "~Vinkel";
         Text[ polish ] = "K�t";
         Text[ portuguese_brazilian ] = "Gra~d";
@@ -694,7 +694,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
         Text [ italian ] = "Bordo di ri~ferimento" ;
         Text [ spanish ] = "~Aristas de referencia" ;
         Text [ french ] = "Bord de r�f�rence" ;
-        Text [ dutch ] = "~Invalshoek" ;
+        Text [ dutch ] = "I~nvalshoek" ;
         Text [ portuguese ] = "A~resta de refer�ncia" ;
         Text[ chinese_simplified ] = "引用边(~F)";
         Text[ russian ] = "���� ������";
@@ -702,14 +702,14 @@ TabPage RID_SVXPAGE_ALIGNMENT
         Text[ japanese ] = "基準になる縁(~F)";
         Text[ chinese_traditional ] = "參照邊(~F)";
         Text[ arabic ] = "������ ������";
-        Text[ dutch ] = "~Invalshoek";
+        Text[ dutch ] = "I~nvalshoek";
         Text[ chinese_simplified ] = "引用边(~F)";
         Text[ greek ] = "���� ��������";
         Text[ korean ] = "기준 모서리(~F)";
         Text[ turkish ] = "Referans ~kenar�";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Vores de refer�ncia";
-        Text[ finnish ] = "~Viitteen reuna";
+        Text[ finnish ] = "Viittee~n reuna";
         Text[ thai ] = "ขอบการ~อ้างอิง";
     };
     Control CTR_BORDER_LOCK
@@ -741,7 +741,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
         Text[ polish ] = "Use ~Asian vertical layout mode";
         Text[ portuguese_brazilian ] = "Use ~Asian vertical layout mode";
         Text[ japanese ] = "日本語縦書きレイアウトモードの使用";
-        Text[ korean ] = "아시아 형식의 세로 쓰기 레이아웃 모드 사용 ";
+        Text[ korean ] = "세로 쓰기 모드 사용 ";
         Text[ chinese_simplified ] = "使用中日韩竖写模式";
         Text[ chinese_traditional ] = "使用中日韓直書模式(~A)";
         Text[ turkish ] = "Use ~Asian vertical layout mode";
@@ -767,7 +767,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
         Text [ spanish ] = "Distancia a la cuadr�cula" ;
         Text [ english_us ] = "Spacing to grid lines" ;
         Text[ chinese_simplified ] = "至网格线的距离";
-        Text[ russian ] = "���������� �� ����� �����";
+        Text[ russian ] = "���������� �� ����� �����";
         Text[ polish ] = "Odst�p od linii siatki";
         Text[ japanese ] = "グリッド線までの間隔";
         Text[ chinese_traditional ] = "至網格線的距離";
@@ -775,7 +775,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
         Text[ dutch ] = "Afstand tot rasterlijnen";
         Text[ chinese_simplified ] = "至网格线的距离";
         Text[ greek ] = "�������� ��� ������� ���������";
-        Text[ korean ] = "괘선과의 간격";
+        Text[ korean ] = "눈금선과의 간격";
         Text[ turkish ] = "K�lavuz �izgilere uzakl�k";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Espai a la quadr�cula";
@@ -792,7 +792,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
         Text [ portuguese_brazilian ] = "E~squerda" ;
         Text [ portuguese ] = "E~squerda" ;
         Text [ finnish ] = "~Vasen" ;
-        Text [ danish ] = "Venstre" ;
+        Text [ danish ] = "~Venstre" ;
         Text [ french ] = "� gauche" ;
         Text [ swedish ] = "V~�nster" ;
         Text [ dutch ] = "~Links" ;
@@ -837,15 +837,15 @@ TabPage RID_SVXPAGE_ALIGNMENT
         Text [ italian ] = "A ~destra" ;
         Text [ portuguese_brazilian ] = "Dir~eita" ;
         Text [ portuguese ] = "Dir~eita" ;
-        Text [ finnish ] = "Oikea" ;
-        Text [ danish ] = "H�jre" ;
+        Text [ finnish ] = "Oik~ea" ;
+        Text [ danish ] = "H�~jre" ;
         Text [ french ] = "� droite" ;
         Text [ swedish ] = "H~�ger" ;
         Text [ dutch ] = "~Rechts" ;
         Text [ spanish ] = "Derecha" ;
         Text [ english_us ] = "Right" ;
         Text[ chinese_simplified ] = "向右";
-        Text[ russian ] = "������";
+        Text[ russian ] = "�~�����";
         Text[ polish ] = "Z prawej";
         Text[ japanese ] = "右";
         Text[ chinese_traditional ] = "向右";
@@ -883,8 +883,8 @@ TabPage RID_SVXPAGE_ALIGNMENT
         Text [ italian ] = "In alto" ;
         Text [ portuguese_brazilian ] = "To~po" ;
         Text [ portuguese ] = "Em ~cima" ;
-        Text [ finnish ] = "~Yl�osa" ;
-        Text [ danish ] = "�verst" ;
+        Text [ finnish ] = "~Yl�reuna" ;
+        Text [ danish ] = "�v~erst" ;
         Text [ french ] = "En haut" ;
         Text [ swedish ] = "U~ppe" ;
         Text [ dutch ] = "~Boven" ;
@@ -929,7 +929,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
         Text [ italian ] = "In basso" ;
         Text [ portuguese_brazilian ] = "Bas~e" ;
         Text [ portuguese ] = "Em ~baixo" ;
-        Text [ finnish ] = "~Alaosa" ;
+        Text [ finnish ] = "Alare~una" ;
         Text [ danish ] = "Nederst" ;
         Text [ french ] = "En bas" ;
         Text [ swedish ] = "N~ere" ;
@@ -937,7 +937,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
         Text [ spanish ] = "Abaj~o" ;
         Text [ english_us ] = "Botto~m" ;
         Text[ chinese_simplified ] = "向下(~M)";
-        Text[ russian ] = "�����";
+        Text[ russian ] = "�����";
         Text[ polish ] = "W dole";
         Text[ japanese ] = "下(~M)";
         Text[ chinese_traditional ] = "向下(~M)";
@@ -971,25 +971,25 @@ TabPage RID_SVXPAGE_ALIGNMENT
         Size = MAP_APPFONT ( 248 , 8 ) ;
         Text = "Eigenschaften" ;
         Text [ English ] = "Text Flow" ;
-        Text [ english_us ] = "Text flow" ;
-        Text [ swedish ] = "Textfl�de" ;
+        Text [ english_us ] = "Properties" ;
+        Text [ swedish ] = "Egenskaper" ;
         Text [ danish ] = "Tekstretning" ;
-        Text [ italian ] = "Testo" ;
-        Text [ spanish ] = "Flujo de texto" ;
-        Text [ french ] = "Encha�nements" ;
+        Text [ italian ] = "Propriet?" ;
+        Text [ spanish ] = "Propiedades" ;
+        Text [ french ] = "Propri�t�s" ;
         Text [ dutch ] = "Tekstverloop" ;
         Text [ portuguese_brazilian ] = "Textflu�" ;
         Text [ portuguese ] = "Fluxo de texto" ;
-        Text[ chinese_simplified ] = "换行和分页";
-        Text[ russian ] = "��������� �� ��������";
+        Text[ chinese_simplified ] = "属性";
+        Text[ russian ] = "�� ��������";
         Text[ polish ] = "Tekst";
-        Text[ japanese ] = "体裁";
-        Text[ chinese_traditional ] = "換行和分頁";
+        Text[ japanese ] = "属性";
+        Text[ chinese_traditional ] = "屬性";
         Text[ arabic ] = "������ ����";
         Text[ dutch ] = "Tekstverloop";
-        Text[ chinese_simplified ] = "换行和分页";
+        Text[ chinese_simplified ] = "属性";
         Text[ greek ] = "��� ��������";
-        Text[ korean ] = "텍스트 흐름";
+        Text[ korean ] = "등록 정보";
         Text[ turkish ] = "Metin ak���";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Flux del text";
@@ -1012,19 +1012,19 @@ TabPage RID_SVXPAGE_ALIGNMENT
         Text [ danish ] = "Linjeskift" ;
         Text [ french ] = "Renvoi � la ligne automatique" ;
         Text [ swedish ] = "Automatisk rad~brytning" ;
-        Text [ dutch ] = "~Regelafbreking" ;
+        Text [ dutch ] = "Re~gelafbreking" ;
         Text [ spanish ] = "Salto de ~l�nea autom�tico" ;
         Text [ english_us ] = "Automatic ~line break" ;
         Text[ chinese_simplified ] = "自动换行";
-        Text[ russian ] = "������ ������";
+        Text[ russian ] = "���������� �� ������";
         Text[ polish ] = "Podzia� wierszy";
         Text[ japanese ] = "自動的に折り返す";
         Text[ chinese_traditional ] = "自動換行";
         Text[ arabic ] = "���� ����";
-        Text[ dutch ] = "~Regelafbreking";
+        Text[ dutch ] = "Re~gelafbreking";
         Text[ chinese_simplified ] = "自动换行";
         Text[ greek ] = "������ �������";
-        Text[ korean ] = "자동 단락";
+        Text[ korean ] = "자동 줄 바꿈";
         Text[ turkish ] = "Sat�r son~u";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Salt de ~l�nia";
@@ -1038,7 +1038,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
         Text [ ENGLISH ] = "Hyphenation active" ;
         Text[ english_us ] = "Hyphenation active";
         Text[ portuguese ] = "Divis�o sil�bica activa";
-        Text[ russian ] = "����������� ��������� (�������)";
+        Text[ russian ] = "���������� �� ������";
         Text[ greek ] = "Hyphenation active";
         Text[ dutch ] = "~Woordafbreking actief";
         Text[ french ] = "Coupure des mots active";
@@ -1069,18 +1069,18 @@ TabPage RID_SVXPAGE_ALIGNMENT
         Text[ russian ] = "Te~xt flow";
         Text[ greek ] = "Te~xt flow";
         Text[ dutch ] = "Te~xt flow";
-        Text[ french ] = "Te~xt flow";
-        Text[ spanish ] = "Te~xt flow";
+        Text[ french ] = "Encha�nements";
+        Text[ spanish ] = "~Flujo de texto";
         Text[ finnish ] = "Te~xt flow";
-        Text[ italian ] = "Te~xt flow";
+        Text[ italian ] = "Flusso di testo";
         Text[ danish ] = "Te~xt flow";
-        Text[ swedish ] = "Te~xt flow";
+        Text[ swedish ] = "Te~xtfl�de";
         Text[ polish ] = "Te~xt flow";
         Text[ portuguese_brazilian ] = "Te~xt flow";
-        Text[ japanese ] = "Te~xt flow";
-        Text[ korean ] = "Te~xt flow";
-        Text[ chinese_simplified ] = "Te~xt flow";
-        Text[ chinese_traditional ] = "Te~xt flow";
+        Text[ japanese ] = "体裁(~X)";
+        Text[ korean ] = "텍스트 흐름";
+        Text[ chinese_simplified ] = "换行和分页";
+        Text[ chinese_traditional ] = "換行和分頁(~X)";
         Text[ turkish ] = "Te~xt flow";
         Text[ arabic ] = "Te~xt flow";
         Text[ catalan ] = "Te~xt flow";
@@ -1131,7 +1131,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
         Text [ dutch ] = "Inhoud uitbreiden vanaf onderkant cel." ;
         Text [ portuguese ] = "Expans�o do texto a partir do canto inferior da c�lula." ;
         Text[ chinese_simplified ] = "文字从单元格下边缘延伸。";
-        Text[ russian ] = "���������� ������ �� ������� ����� ������.";
+        Text[ russian ] = "���������� ������ �� ������� ����� ������";
         Text[ polish ] = "Rozci�gni�cie tekstu od dolnej kraw�dzi kom�rki.";
         Text[ japanese ] = "セルの下縁を基準に傾ける";
         Text[ language_user1 ] = " ";
@@ -1160,7 +1160,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
         Text [ dutch ] = "Inhoud uitbreiden vanaf bovenkant cel." ;
         Text [ portuguese ] = "Expans�o do texto a partir do canto superior da c�lula." ;
         Text[ chinese_simplified ] = "文字从单元格上边缘扩展。";
-        Text[ russian ] = "���������� ������ �� �������� ����� ������.";
+        Text[ russian ] = "���������� ������ �� �������� ����� ������";
         Text[ polish ] = "Rozci�gni�cie tekstu od g�rnej kraw�dzi kom�rki.";
         Text[ japanese ] = "セルの上縁を基準に傾ける";
         Text[ language_user1 ] = " ";
@@ -1169,7 +1169,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
         Text[ dutch ] = "Inhoud uitbreiden vanaf bovenkant cel.";
         Text[ chinese_simplified ] = "文字从单元格上边缘扩展。";
         Text[ greek ] = "���������� �������� ��� ���� ���� ������.";
-        Text[ korean ] = "셀 윗테두리에서 부터 텍스트 확장";
+        Text[ korean ] = "셀 위 테두리에서부터 텍스트 확장";
         Text[ turkish ] = "H�cre �st kenar�ndan metin geni�lemesi.";
         Text[ catalan ] = "Expansi� del text a partir de la vora superior de la cel.la.";
         Text[ finnish ] = "Tekstin laajennus solun yl�reunasta";
@@ -1189,7 +1189,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
         Text [ dutch ] = "Inhoud uitbreiden alleen binnen cel." ;
         Text [ portuguese ] = "Expans�o do texto apenas dentro da c�lula." ;
         Text[ chinese_simplified ] = "文字只在单元格内扩展。";
-        Text[ russian ] = "���������� ������ ������ ������ ������.";
+        Text[ russian ] = "���������� ������ ������ ������";
         Text[ polish ] = "Rozci�gni�cie tekstu tylko wewn�trz kom�rki.";
         Text[ japanese ] = "セル内でのみ傾ける";
         Text[ language_user1 ] = " ";
@@ -1222,3 +1222,8 @@ TabPage RID_SVXPAGE_ALIGNMENT
  // ********************************************************************** EOF
 
 
+
+
+
+
+
diff --git a/svx/source/dialog/backgrnd.src b/svx/source/dialog/backgrnd.src
index f47ffdd10667..8e122af0d227 100644
--- a/svx/source/dialog/backgrnd.src
+++ b/svx/source/dialog/backgrnd.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: backgrnd.src,v $
  *
- *  $Revision: 1.27 $
+ *  $Revision: 1.28 $
  *
- *  last change: $Author: os $ $Date: 2002-08-16 12:59:20 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:43 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,7 +77,7 @@
     text [ portuguese_brazilian ] = "unverkn?fte Grafik" ; \
     text [ portuguese ] = "Imagem n�o ligada" ; \
     text[ chinese_simplified ] = "未链接的图形";  \
-    text[ russian ] = "����������� �������";    \
+    text[ russian ] = "����������� ����������� ������"; \
     text[ polish ] = "Nie po��czona grafika";   \
     text[ japanese ] = "リンクされていない図";    \
     text[ chinese_traditional ] = "未連結的圖形"; \
@@ -87,7 +87,7 @@
     text[ turkish ] = "Ba�lant�s�z grafik"; \
     text[ language_user1 ] = " ";   \
     text[ finnish ] = "Linkitt�m�t�n kuva"; \
-    text[ catalan ] = "Imagen no vinculada";    \
+    text[ catalan ] = "Imatge no enlla�ada";    \
     text[ thai ] = "กราฟิคที่ไม่เชื่อมโยง";
 
  // pragma ----------------------------------------------------------------
@@ -135,11 +135,11 @@ TabPage RID_SVXPAGE_BACKGROUND
         Text[ chinese_traditional ] = "當作(~S)";
         Text[ arabic ] = "��";
         Text[ greek ] = "��";
-        Text[ korean ] = "양식(~S)";
+        Text[ korean ] = "형식(~S)";
         Text[ turkish ] = "~Artalan";
         Text[ language_user1 ] = " ";
-        Text[ finnish ] = "~Nimell?";
-        Text[ catalan ] = "~Como";
+        Text[ finnish ] = "T~�ytt�";
+        Text[ catalan ] = "C~om a";
         Text[ thai ] = "เป็~น";
     };
     ListBox LB_SELECTOR
@@ -212,7 +212,7 @@ TabPage RID_SVXPAGE_BACKGROUND
     StringList [ russian ] =
     {
             < "����" ; Default ; > ;
-        < "�������" ; Default ; > ;
+        < "����������� ������" ; Default ; > ;
     };
     StringList [ polish ] =
     {
@@ -262,7 +262,7 @@ TabPage RID_SVXPAGE_BACKGROUND
     StringList [ catalan ] =
     {
             < "Color" ; Default ; > ;
-        < "Imagen" ; Default ; > ;
+        < "Imatge" ; Default ; > ;
     };
     StringList [ thai ] =
     {
@@ -295,11 +295,11 @@ TabPage RID_SVXPAGE_BACKGROUND
         Text[ chinese_traditional ] = "用於(~O)";
         Text[ arabic ] = "��";
         Text[ greek ] = "���";
-        Text[ korean ] = "대상(~O)";
+        Text[ korean ] = "용도(~O)";
         Text[ turkish ] = "He~def";
         Text[ language_user1 ] = " ";
         Text[ finnish ] = "~Kohde";
-        Text[ catalan ] = "Pa~ra";
+        Text[ catalan ] = "P~er a";
         Text[ thai ] = "สำ~หรับ";
     };
     ListBox LB_TBL_BOX
@@ -421,7 +421,7 @@ TabPage RID_SVXPAGE_BACKGROUND
     {
             < "셀" ; > ;
         < "행" ; > ;
-        < "시트" ; > ;
+        < "표" ; > ;
     };
     StringList [ turkish ] =
     {
@@ -443,9 +443,9 @@ TabPage RID_SVXPAGE_BACKGROUND
     };
     StringList [ catalan ] =
     {
-            < "Celda" ; > ;
+            < "Cel.la" ; > ;
         < "Fila" ; > ;
-        < "Tabla" ; > ;
+        < "Taula" ; > ;
     };
     StringList [ thai ] =
     {
@@ -524,7 +524,7 @@ TabPage RID_SVXPAGE_BACKGROUND
     StringList [ russian ] =
     {
             < "�����" ; > ;
-        < "����" ; > ;
+        < "������" ; > ;
     };
     StringList [ polish ] =
     {
@@ -573,8 +573,8 @@ TabPage RID_SVXPAGE_BACKGROUND
     };
     StringList [ catalan ] =
     {
-            < "P�rrafo" ; > ;
-        < "Car�cter" ; > ;
+            < "Par�graf" ; > ;
+        < "Car�cter" ; > ;
     };
     StringList [ thai ] =
     {
@@ -623,10 +623,10 @@ TabPage RID_SVXPAGE_BACKGROUND
         Text[ chinese_traditional ] = "背景顏色";
         Text[ arabic ] = "��� �������";
         Text[ greek ] = "����� ������";
-        Text[ korean ] = "배경색상";
+        Text[ korean ] = "배경 색상";
         Text[ turkish ] = "Artalan rengi";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Background color";
+        Text[ catalan ] = "Color del fons";
         Text[ thai ] = "สีพื้นหลัง";
     };
     Window WIN_PREVIEW1
@@ -643,6 +643,26 @@ TabPage RID_SVXPAGE_BACKGROUND
         Size = MAP_APPFONT ( 50 , 8) ;
         Text = "~Transparenz" ;
         Text [ english_us ] = "~Transparency" ;
+        Text[ portuguese ] = "~Transparency";
+        Text[ russian ] = "~Transparency";
+        Text[ greek ] = "~Transparency";
+        Text[ dutch ] = "~Transparency";
+        Text[ french ] = "Transparence";
+        Text[ spanish ] = "Tran~sparencia";
+        Text[ finnish ] = "~Transparency";
+        Text[ italian ] = "Trasparenza";
+        Text[ danish ] = "~Transparency";
+        Text[ swedish ] = "~Transparens";
+        Text[ polish ] = "~Transparency";
+        Text[ portuguese_brazilian ] = "~Transparency";
+        Text[ japanese ] = "透過性";
+        Text[ korean ] = "투명화";
+        Text[ chinese_simplified ] = "透明(~T)";
+        Text[ chinese_traditional ] = "透明(~T)";
+        Text[ turkish ] = "~Transparency";
+        Text[ arabic ] = "~Transparency";
+        Text[ catalan ] = "~Transparency";
+        Text[ thai ] = "~Transparency";
     };
     MetricField MF_COL_TRANS
     {
@@ -689,7 +709,7 @@ TabPage RID_SVXPAGE_BACKGROUND
         Text[ turkish ] = "Dosya";
         Text[ language_user1 ] = " ";
         Text[ finnish ] = "Tiedosto";
-        Text[ catalan ] = "File";
+        Text[ catalan ] = "Fitxer";
         Text[ thai ] = "แฟ้ม";
     };
     PushButton BTN_BROWSE
@@ -704,12 +724,12 @@ TabPage RID_SVXPAGE_BACKGROUND
         Text [ swedish ] = "~V�lj ut..." ;
         Text [ danish ] = "Gennemse..." ;
         Text [ italian ] = "~Sfoglia..." ;
-        Text [ spanish ] = "Seleccio~nar..." ;
+        Text [ spanish ] = "~Buscar..." ;
         Text [ french ] = "~Parcourir..." ;
-        Text [ dutch ] = "~Doorzoeken..." ;
+        Text [ dutch ] = "Bla~deren..." ;
         Text [ portuguese ] = "~Pesquisar..." ;
         Text[ chinese_simplified ] = "浏览(~B)...";
-        Text[ russian ] = "�������...";
+        Text[ russian ] = "�����...";
         Text[ polish ] = "Przegl�d~aj...";
         Text[ japanese ] = "選択(~B)...";
         Text[ chinese_traditional ] = "瀏覽(~B)...";
@@ -718,8 +738,8 @@ TabPage RID_SVXPAGE_BACKGROUND
         Text[ korean ] = "선택(~B)...";
         Text[ turkish ] = "Se�...";
         Text[ language_user1 ] = " ";
-        Text[ finnish ] = "~Selaa";
-        Text[ catalan ] = "Seleccio~nar...";
+        Text[ finnish ] = "Sel~aa...";
+        Text[ catalan ] = "~Navega...";
         Text[ thai ] = "เ~รียกดู...";
     };
     CheckBox BTN_LINK
@@ -739,7 +759,7 @@ TabPage RID_SVXPAGE_BACKGROUND
         Text [ portuguese_brazilian ] = "~Verkn?fen" ;
         Text [ portuguese ] = "~Liga��o" ;
         Text[ chinese_simplified ] = "链接(~L)";
-        Text[ russian ] = "�������";
+        Text[ russian ] = "����� � ������";
         Text[ polish ] = "Po~��cz";
         Text[ japanese ] = "リンク(~L)";
         Text[ chinese_traditional ] = "捷徑(~L)";
@@ -748,8 +768,8 @@ TabPage RID_SVXPAGE_BACKGROUND
         Text[ korean ] = "연결(~L)";
         Text[ turkish ] = "Ba�la";
         Text[ language_user1 ] = " ";
-        Text[ finnish ] = "~Linkki";
-        Text[ catalan ] = "~Vincular";
+        Text[ finnish ] = "~Linkit�";
+        Text[ catalan ] = "~Enlla�a";
         Text[ thai ] = "เ~ชื่อมโยง";
     };
     FixedText FT_FILE
@@ -785,7 +805,7 @@ TabPage RID_SVXPAGE_BACKGROUND
         Text[ korean ] = "유형";
         Text[ turkish ] = "T�r";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Type";
+        Text[ catalan ] = "Tipus";
         Text[ finnish ] = "Tyyppi";
         Text[ thai ] = "ชนิด";
     };
@@ -815,8 +835,8 @@ TabPage RID_SVXPAGE_BACKGROUND
         Text[ korean ] = "위치(~P)";
         Text[ turkish ] = "O~rtala";
         Text[ language_user1 ] = " ";
-        Text[ finnish ] = "~Sijainti";
-        Text[ catalan ] = "~Posici�n";
+        Text[ finnish ] = "S~ijainti";
+        Text[ catalan ] = "~Posici�";
         Text[ thai ] = "~ตำแหน่ง";
     };
     RadioButton BTN_AREA
@@ -843,11 +863,11 @@ TabPage RID_SVXPAGE_BACKGROUND
         Text[ chinese_traditional ] = "平面(~E)";
         Text[ arabic ] = "�����";
         Text[ greek ] = "���������";
-        Text[ korean ] = "영역(~E)";
+        Text[ korean ] = "면(~E)";
         Text[ turkish ] = "Ser";
         Text[ language_user1 ] = " ";
         Text[ finnish ] = "~Alue";
-        Text[ catalan ] = "~�rea";
+        Text[ catalan ] = "~�rea";
         Text[ thai ] = "พื้น~ที่";
     };
     RadioButton BTN_TILE
@@ -876,8 +896,8 @@ TabPage RID_SVXPAGE_BACKGROUND
         Text[ korean ] = "바둑판식(~T)";
         Text[ turkish ] = "~D��e";
         Text[ language_user1 ] = " ";
-        Text[ finnish ] = "~Vierekk?in";
-        Text[ catalan ] = "~Mosaico";
+        Text[ finnish ] = "Vi~erekk�in";
+        Text[ catalan ] = "~Mosaic";
         Text[ thai ] = "~ซ้อนทับ";
     };
     Control WND_POSITION
@@ -896,6 +916,26 @@ TabPage RID_SVXPAGE_BACKGROUND
         Size = MAP_APPFONT ( 153 , 8) ;
         Text = "Transparenz" ;
         Text [ english_us ] = "Transparency" ;
+        Text[ portuguese ] = "Transparency";
+        Text[ russian ] = "Transparency";
+        Text[ greek ] = "Transparency";
+        Text[ dutch ] = "Transparency";
+        Text[ french ] = "Transparence";
+        Text[ spanish ] = "Transparencia";
+        Text[ finnish ] = "Transparency";
+        Text[ italian ] = "Trasparenza";
+        Text[ danish ] = "Transparency";
+        Text[ swedish ] = "Transparens";
+        Text[ polish ] = "Transparency";
+        Text[ portuguese_brazilian ] = "Transparency";
+        Text[ japanese ] = "透過性";
+        Text[ korean ] = "투명화";
+        Text[ chinese_simplified ] = "透明";
+        Text[ chinese_traditional ] = "透明";
+        Text[ turkish ] = "Transparency";
+        Text[ arabic ] = "Transparency";
+        Text[ catalan ] = "Transparency";
+        Text[ thai ] = "Transparency";
     };
     MetricField MF_GRAPH_TRANS
     {
@@ -936,7 +976,7 @@ TabPage RID_SVXPAGE_BACKGROUND
         Text [ portuguese ] = "~Previsualizar" ;
         Text [ portuguese_brazilian ] = "V~orschau" ;
         Text[ chinese_simplified ] = "预览(~V)";
-        Text[ russian ] = "��������";
+        Text[ russian ] = "��������������� ��������";
         Text[ polish ] = "P~odgl�d";
         Text[ japanese ] = "プレビュー(~V)";
         Text[ chinese_traditional ] = "預覽(~V)";
@@ -947,14 +987,14 @@ TabPage RID_SVXPAGE_BACKGROUND
         Text [ portuguese_brazilian ] = "V~orschau" ;
         Text [ portuguese ] = "~Previsualizar" ;
         Text[ chinese_simplified ] = "预览(~V)";
-        Text[ russian ] = "��������";
+        Text[ russian ] = "��������������� ��������";
         Text[ polish ] = "P~odgl�d";
         Text[ japanese ] = "プレビュー(~V)";
         Text[ chinese_traditional ] = "預覽(~V)";
         Text[ arabic ] = "������";
         Text[ language_user1 ] = " ";
         Text[ finnish ] = "Esi~katselu";
-        Text[ catalan ] = "Previsuali~zaci�n";
+        Text[ catalan ] = "Previsualit~zaci�";
         Text[ thai ] = "แสดงตั~วอย่าง";
     };
     String STR_BROWSE
@@ -971,17 +1011,17 @@ TabPage RID_SVXPAGE_BACKGROUND
         Text [ portuguese_brazilian ] = "Grafik suchen" ;
         Text [ portuguese ] = "Localizar imagem" ;
         Text[ chinese_simplified ] = "搜寻图形";
-        Text[ russian ] = "����� �������";
+        Text[ russian ] = "����� ����������� �������";
         Text[ polish ] = "Szukaj grafiki";
         Text[ japanese ] = "図を検索";
         Text[ chinese_traditional ] = "搜尋圖形";
         Text[ arabic ] = "����� �� ���";
         Text[ greek ] = "��������� ��������";
-        Text[ korean ] = "그래픽 찾기";
+        Text[ korean ] = "그림 찾기";
         Text[ turkish ] = "Grafik bul";
         Text[ language_user1 ] = " ";
-        Text[ finnish ] = "Etsi kuvat";
-        Text[ catalan ] = "Buscar imagen";
+        Text[ finnish ] = "Etsi grafiikka";
+        Text[ catalan ] = "Cerca imatge";
         Text[ thai ] = "หากราฟิค";
     };
     String STR_UNLINKED
@@ -998,9 +1038,24 @@ TabPage RID_SVXPAGE_BACKGROUND
     Text[ korean ] = "배경";
     Text[ turkish ] = "Artalan";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Fondo";
+    Text[ catalan ] = "Fons";
     Text[ thai ] = "พื้นหลัง";
 };
  // ********************************************************************** EOF
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svx/source/dialog/bbdlg.src b/svx/source/dialog/bbdlg.src
index d6a5633a8208..05cf2d964647 100644
--- a/svx/source/dialog/bbdlg.src
+++ b/svx/source/dialog/bbdlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: bbdlg.src,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: kz $ $Date: 2001-11-16 22:34:32 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:44 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,7 +74,7 @@ TabDialog RID_SVXDLG_BBDLG
     Text [ italian ] = "Bordo / Sfondo" ;
     Text [ portuguese_brazilian ] = "Margem / Fundo" ;
     Text [ portuguese ] = "Contorno/Plano de fundo" ;
-    Text [ finnish ] = "Reuna/tausta" ;
+    Text [ finnish ] = "Reuna / tausta" ;
     Text [ danish ] = "Ramme / Baggrund" ;
     Text [ french ] = "Bordure / Arri�re-plan" ;
     Text [ swedish ] = "Inramning/ Bakgrund" ;
@@ -104,7 +104,7 @@ TabDialog RID_SVXDLG_BBDLG
                 Text [ french ] = "Bordure" ;
                 Text [ swedish ] = "Inramning" ;
                 Text [ dutch ] = "Omranding" ;
-                Text [ spanish ] = "Borde" ;
+                Text [ spanish ] = "Bordes" ;
                 Text [ english_us ] = "Borders" ;
                 Text[ chinese_simplified ] = "边框";
                 Text[ russian ] = "����������";
@@ -116,7 +116,8 @@ TabDialog RID_SVXDLG_BBDLG
                 Text[ korean ] = "테두리";
                 Text[ turkish ] = "Kenarl�k";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Borde";
+                Text[ catalan ] = "Vores";
+                Text[ thai ] = "เส้นขอบ";
             };
             PageItem
             {
@@ -144,7 +145,8 @@ TabDialog RID_SVXDLG_BBDLG
                 Text[ korean ] = "배경";
                 Text[ turkish ] = "Artalan";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Fondo";
+                Text[ catalan ] = "Fons";
+                Text[ thai ] = "พื้นหลัง";
             };
         };
     };
@@ -158,7 +160,8 @@ TabDialog RID_SVXDLG_BBDLG
     Text[ korean ] = "테두리 / 배경";
     Text[ turkish ] = "Kenarl�k / Artalan";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Bordes / Fondo";
+    Text[ catalan ] = "Vora / Fons";
+    Text[ thai ] = "เส้นขอบ / พื้นหลัง";
 };
  // ********************************************************************** EOF
 
@@ -168,3 +171,6 @@ TabDialog RID_SVXDLG_BBDLG
 
 
 
+
+
+
diff --git a/svx/source/dialog/bmpmask.hrc b/svx/source/dialog/bmpmask.hrc
index b7a32a3d2d63..7a99679e3083 100644
--- a/svx/source/dialog/bmpmask.hrc
+++ b/svx/source/dialog/bmpmask.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: bmpmask.hrc,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: cl $ $Date: 2002-07-09 09:25:00 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:45 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -60,6 +60,7 @@
  ************************************************************************/
 #define RID_SVXDLG_BMPMASK              (RID_SVX_BMPMASK_START)
 #define RID_SVXDLG_BMPMASK_STR_TRANSP   (RID_SVX_BMPMASK_START + 1)
+#define RID_SVXDLG_BMPMASK_STR_SOURCECOLOR  (RID_SVX_BMPMASK_START + 2)
 
 #define GRP_Q 1
 #define CTR_PIPETTE 1
diff --git a/svx/source/dialog/bmpmask.src b/svx/source/dialog/bmpmask.src
index 08e8a70e0a1b..2d95007088f2 100644
--- a/svx/source/dialog/bmpmask.src
+++ b/svx/source/dialog/bmpmask.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: bmpmask.src,v $
  *
- *  $Revision: 1.35 $
+ *  $Revision: 1.36 $
  *
- *  last change: $Author: kz $ $Date: 2002-11-27 16:33:06 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:45 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -136,7 +136,7 @@ DockingWindow RID_SVXDLG_BMPMASK
         Text[ chinese_traditional ] = "源顏色";
         Text[ arabic ] = "����� ������";
         Text[ greek ] = "������ �����";
-        Text[ korean ] = "소스 색상";
+        Text[ korean ] = "원본 색상";
         Text[ turkish ] = "Kaynak renk";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Color font";
@@ -194,7 +194,7 @@ DockingWindow RID_SVXDLG_BMPMASK
         Text[ chinese_traditional ] = "替代成...";
         Text[ arabic ] = "������� ��...";
         Text[ greek ] = "������������� ��...";
-        Text[ korean ] = "바꿀 색상...";
+        Text[ korean ] = "바꾸기...";
         Text[ turkish ] = "Yeni renk...";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Reempla�a amb...";
@@ -545,6 +545,23 @@ String RID_SVXDLG_BMPMASK_STR_TRANSP
     Text[ thai ] = "โปร่งแสง";
 };
 
+String RID_SVXDLG_BMPMASK_STR_SOURCECOLOR
+{
+    // This string is used by the eyedropper dialog to denote a color in an image
+    // that will be replaced by another color.
+    Text = "Quellfarbe";
+    Text [ ENGLISH ] = "Source Color";
+    Text[ english_us ] = "Source Color";
+    Text[ french ] = "Source Color";
+    Text[ spanish ] = "Source Color";
+    Text[ italian ] = "Source Color";
+    Text[ swedish ] = "Source Color";
+    Text[ japanese ] = "Source Color";
+    Text[ korean ] = "Source Color";
+    Text[ chinese_simplified ] = "Source Color";
+    Text[ chinese_traditional ] = "Source Color";
+};
+
  // ********************************************************************** EOF
 
 
@@ -559,3 +576,8 @@ String RID_SVXDLG_BMPMASK_STR_TRANSP
 
 
 
+
+
+
+
+
diff --git a/svx/source/dialog/border.cxx b/svx/source/dialog/border.cxx
index 398b6a7bbe24..406019828b1c 100644
--- a/svx/source/dialog/border.cxx
+++ b/svx/source/dialog/border.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: border.cxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: pb $ $Date: 2002-11-26 10:11:32 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:45 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -602,53 +602,24 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet )
         SvxLineStruct   aDefStyle;
         List            aList;
 
-        if ( aFrameSel.GetLine(SVX_FRMSELLINE_TOP).GetState() == SVX_FRMLINESTATE_SHOW )
-        {
-            aList.Insert( &(aFrameSel.GetLine(SVX_FRMSELLINE_TOP)) );
-            aFrameSel.SelectLine( SVX_FRMSELLINE_TOP );
-        }
-        else
-            aFrameSel.SelectLine( SVX_FRMSELLINE_TOP, FALSE );
-
-        if ( aFrameSel.GetLine(SVX_FRMSELLINE_BOTTOM).GetState() == SVX_FRMLINESTATE_SHOW )
-        {
-            aList.Insert( &(aFrameSel.GetLine(SVX_FRMSELLINE_BOTTOM)) );
-            aFrameSel.SelectLine( SVX_FRMSELLINE_BOTTOM );
-        }
-        else
-            aFrameSel.SelectLine( SVX_FRMSELLINE_BOTTOM, FALSE );
+        SvxFrameSelectorLine eTypes[] = {   SVX_FRMSELLINE_TOP,
+                                            SVX_FRMSELLINE_BOTTOM,
+                                            SVX_FRMSELLINE_LEFT,
+                                            SVX_FRMSELLINE_RIGHT,
+                                            SVX_FRMSELLINE_HOR,
+                                            SVX_FRMSELLINE_VER
+                                        };
 
-        if ( aFrameSel.GetLine(SVX_FRMSELLINE_LEFT).GetState() == SVX_FRMLINESTATE_SHOW )
+        for (sal_Int32 i=0; i < sizeof(eTypes)/sizeof(SvxFrameSelectorLine); ++i)
         {
-            aList.Insert( &(aFrameSel.GetLine(SVX_FRMSELLINE_LEFT)) );
-            aFrameSel.SelectLine( SVX_FRMSELLINE_LEFT );
-        }
-        else
-            aFrameSel.SelectLine( SVX_FRMSELLINE_LEFT, FALSE );
-
-        if ( aFrameSel.GetLine(SVX_FRMSELLINE_RIGHT).GetState() == SVX_FRMLINESTATE_SHOW )
-        {
-            aList.Insert( &(aFrameSel.GetLine(SVX_FRMSELLINE_RIGHT)) );
-            aFrameSel.SelectLine( SVX_FRMSELLINE_RIGHT );
-        }
-        else
-            aFrameSel.SelectLine( SVX_FRMSELLINE_RIGHT, FALSE );
-
-        if ( aFrameSel.GetLine(SVX_FRMSELLINE_HOR).GetState() == SVX_FRMLINESTATE_SHOW )
-        {
-            aList.Insert( &(aFrameSel.GetLine(SVX_FRMSELLINE_HOR)) );
-            aFrameSel.SelectLine( SVX_FRMSELLINE_HOR );
-        }
-        else
-            aFrameSel.SelectLine( SVX_FRMSELLINE_HOR, FALSE );
-
-        if ( aFrameSel.GetLine(SVX_FRMSELLINE_VER).GetState() == SVX_FRMLINESTATE_SHOW )
-        {
-            aList.Insert( &(aFrameSel.GetLine(SVX_FRMSELLINE_VER)) );
-            aFrameSel.SelectLine( SVX_FRMSELLINE_VER );
+            if ( aFrameSel.GetLine(eTypes[i]).GetState() == SVX_FRMLINESTATE_SHOW )
+            {
+                aList.Insert( &(aFrameSel.GetLine(eTypes[i])) );
+                aFrameSel.SelectLine( eTypes[i] );
+            }
+            else
+                aFrameSel.SelectLine( eTypes[i], FALSE );
         }
-        else
-            aFrameSel.SelectLine( SVX_FRMSELLINE_VER, FALSE );
 
         if ( aList.Count() > 0 )
         {
@@ -860,7 +831,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet )
             if(!bIsTableBorder && 0 == (nHtmlMode & HTMLMODE_FULL_ABS_POS) &&
                 SFX_ITEM_AVAILABLE > rSet.GetItemState(GetWhich( SID_ATTR_PARA_LINESPACE )))
             {
-                for( USHORT i = nLBCount - 1; i > LINESTYLE_HTML_MAX; i--)
+                for( USHORT i = nLBCount - 1; i > LINESTYLE_HTML_MAX; --i)
                     aLbLineStyle.RemoveEntry(i);
             }
 
@@ -938,32 +909,34 @@ BOOL SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
     //------------------
     // Umrandung aussen:
     //------------------
-    pCoreLine = &aCoreLine;
-    SetCoreLine_Impl( &aFrameSel.GetLine(SVX_FRMSELLINE_LEFT), pCoreLine );
-    aBoxItem.SetLine( pCoreLine, BOX_LINE_LEFT );
-
-    pCoreLine = &aCoreLine;
-    SetCoreLine_Impl( &aFrameSel.GetLine(SVX_FRMSELLINE_RIGHT), pCoreLine );
-    aBoxItem.SetLine( pCoreLine, BOX_LINE_RIGHT );
-
-    pCoreLine = &aCoreLine;
-    SetCoreLine_Impl( &aFrameSel.GetLine(SVX_FRMSELLINE_TOP), pCoreLine );
-    aBoxItem.SetLine( pCoreLine, BOX_LINE_TOP );
-
-    pCoreLine = &aCoreLine;
-    SetCoreLine_Impl( &aFrameSel.GetLine(SVX_FRMSELLINE_BOTTOM), pCoreLine );
-    aBoxItem.SetLine( pCoreLine, BOX_LINE_BOTTOM );
+    typedef ::std::pair<SvxFrameSelectorLine,USHORT> TBorderPair;
+    TBorderPair eTypes1[] = {
+                                TBorderPair(SVX_FRMSELLINE_TOP,BOX_LINE_TOP),
+                                TBorderPair(SVX_FRMSELLINE_BOTTOM,BOX_LINE_BOTTOM),
+                                TBorderPair(SVX_FRMSELLINE_LEFT,BOX_LINE_LEFT),
+                                TBorderPair(SVX_FRMSELLINE_RIGHT,BOX_LINE_RIGHT),
+                            };
+
+    for (sal_Int32 i=0; i < sizeof(eTypes1)/sizeof(TBorderPair); ++i)
+    {
+        pCoreLine = &aCoreLine;
+        SetCoreLine_Impl( &aFrameSel.GetLine(eTypes1[i].first), pCoreLine );
+        aBoxItem.SetLine( pCoreLine, eTypes1[i].second );
+    }
 
     //--------------------------------
     // Umrandung hor/ver und TableFlag
     //--------------------------------
-    pCoreLine = &aCoreLine;
-    SetCoreLine_Impl( &aFrameSel.GetLine(SVX_FRMSELLINE_HOR), pCoreLine );
-    aBoxInfoItem.SetLine( pCoreLine, BOXINFO_LINE_HORI );
-
-    pCoreLine = &aCoreLine;
-    SetCoreLine_Impl( &aFrameSel.GetLine(SVX_FRMSELLINE_VER), pCoreLine );
-    aBoxInfoItem.SetLine( pCoreLine, BOXINFO_LINE_VERT );
+    TBorderPair eTypes2[] = {
+                                TBorderPair(SVX_FRMSELLINE_HOR,BOXINFO_LINE_HORI),
+                                TBorderPair(SVX_FRMSELLINE_VER,BOXINFO_LINE_VERT)
+                            };
+    for (sal_Int32 j=0; j < sizeof(eTypes2)/sizeof(TBorderPair); ++j)
+    {
+        pCoreLine = &aCoreLine;
+        SetCoreLine_Impl( &aFrameSel.GetLine(eTypes2[j].first), pCoreLine );
+        aBoxInfoItem.SetLine( pCoreLine, eTypes2[j].second );
+    }
 
     aBoxInfoItem.SetTable( bIsTableBorder );
 
@@ -1181,15 +1154,19 @@ IMPL_LINK( SvxBorderTabPage, SelPreHdl_Impl, void *, EMPTYARG )
         {
 
             aFrameSel.HideLines();
-            aFrameSel.GetLine(SVX_FRMSELLINE_LEFT)  .SetState( SVX_FRMLINESTATE_SHOW );
-            aFrameSel.GetLine(SVX_FRMSELLINE_RIGHT) .SetState( SVX_FRMLINESTATE_SHOW );
-            aFrameSel.GetLine(SVX_FRMSELLINE_TOP)   .SetState( SVX_FRMLINESTATE_SHOW );
-            aFrameSel.GetLine(SVX_FRMSELLINE_BOTTOM).SetState( SVX_FRMLINESTATE_SHOW );
-            aFrameSel.SelectLine( SVX_FRMSELLINE_NONE );
-            aFrameSel.SelectLine( SVX_FRMSELLINE_LEFT );
-            aFrameSel.SelectLine( SVX_FRMSELLINE_RIGHT );
-            aFrameSel.SelectLine( SVX_FRMSELLINE_TOP );
-            aFrameSel.SelectLine( SVX_FRMSELLINE_BOTTOM );
+            static const SvxFrameSelectorLine eTypes[] = {  SVX_FRMSELLINE_NONE,
+                                                            SVX_FRMSELLINE_TOP,
+                                                            SVX_FRMSELLINE_BOTTOM,
+                                                            SVX_FRMSELLINE_LEFT,
+                                                            SVX_FRMSELLINE_RIGHT
+                                                        };
+
+            sal_Int32 i;
+            for (i=1; i < sizeof(eTypes)/sizeof(SvxFrameSelectorLine); ++i)
+                aFrameSel.GetLine(eTypes[i])  .SetState( SVX_FRMLINESTATE_SHOW );
+
+            for (i=0; i < sizeof(eTypes)/sizeof(SvxFrameSelectorLine); ++i)
+                aFrameSel.SelectLine( eTypes[i] );
         }
         break;
 
@@ -1198,17 +1175,19 @@ IMPL_LINK( SvxBorderTabPage, SelPreHdl_Impl, void *, EMPTYARG )
             if ( bIsTableBorder ) // aussen/horizontal
             {
                 aFrameSel.HideLines();
-                aFrameSel.GetLine(SVX_FRMSELLINE_LEFT)  .SetState( SVX_FRMLINESTATE_SHOW );
-                aFrameSel.GetLine(SVX_FRMSELLINE_RIGHT) .SetState( SVX_FRMLINESTATE_SHOW );
-                aFrameSel.GetLine(SVX_FRMSELLINE_TOP)   .SetState( SVX_FRMLINESTATE_SHOW );
-                aFrameSel.GetLine(SVX_FRMSELLINE_BOTTOM).SetState( SVX_FRMLINESTATE_SHOW );
-                aFrameSel.GetLine(SVX_FRMSELLINE_HOR)   .SetState( SVX_FRMLINESTATE_SHOW );
-                aFrameSel.SelectLine( SVX_FRMSELLINE_NONE );
-                aFrameSel.SelectLine( SVX_FRMSELLINE_LEFT );
-                aFrameSel.SelectLine( SVX_FRMSELLINE_RIGHT );
-                aFrameSel.SelectLine( SVX_FRMSELLINE_TOP );
-                aFrameSel.SelectLine( SVX_FRMSELLINE_BOTTOM );
-                aFrameSel.SelectLine( SVX_FRMSELLINE_HOR );
+                static const SvxFrameSelectorLine eTypes[] = {  SVX_FRMSELLINE_NONE,
+                                                                SVX_FRMSELLINE_TOP,
+                                                                SVX_FRMSELLINE_BOTTOM,
+                                                                SVX_FRMSELLINE_LEFT,
+                                                                SVX_FRMSELLINE_RIGHT,
+                                                                SVX_FRMSELLINE_HOR
+                                                            };
+
+                sal_Int32 i;
+                for (i=1; i < sizeof(eTypes)/sizeof(SvxFrameSelectorLine); ++i)
+                    aFrameSel.GetLine(eTypes[i])  .SetState( SVX_FRMLINESTATE_SHOW );
+                for (i=0; i < sizeof(eTypes)/sizeof(SvxFrameSelectorLine); ++i)
+                    aFrameSel.SelectLine( eTypes[i] );
             }
             else // links/rechts
             {
@@ -1227,19 +1206,20 @@ IMPL_LINK( SvxBorderTabPage, SelPreHdl_Impl, void *, EMPTYARG )
             if ( bIsTableBorder ) // aussen/hor./ver.
             {
                 aFrameSel.HideLines();
-                aFrameSel.GetLine(SVX_FRMSELLINE_LEFT)  .SetState( SVX_FRMLINESTATE_SHOW );
-                aFrameSel.GetLine(SVX_FRMSELLINE_RIGHT) .SetState( SVX_FRMLINESTATE_SHOW );
-                aFrameSel.GetLine(SVX_FRMSELLINE_TOP)   .SetState( SVX_FRMLINESTATE_SHOW );
-                aFrameSel.GetLine(SVX_FRMSELLINE_BOTTOM).SetState( SVX_FRMLINESTATE_SHOW );
-                aFrameSel.GetLine(SVX_FRMSELLINE_HOR)   .SetState( SVX_FRMLINESTATE_SHOW );
-                aFrameSel.GetLine(SVX_FRMSELLINE_VER)   .SetState( SVX_FRMLINESTATE_SHOW );
-                aFrameSel.SelectLine( SVX_FRMSELLINE_NONE );
-                aFrameSel.SelectLine( SVX_FRMSELLINE_LEFT );
-                aFrameSel.SelectLine( SVX_FRMSELLINE_RIGHT );
-                aFrameSel.SelectLine( SVX_FRMSELLINE_TOP );
-                aFrameSel.SelectLine( SVX_FRMSELLINE_BOTTOM );
-                aFrameSel.SelectLine( SVX_FRMSELLINE_HOR );
-                aFrameSel.SelectLine( SVX_FRMSELLINE_VER );
+                static const SvxFrameSelectorLine eTypes[] = {  SVX_FRMSELLINE_NONE,
+                                                                SVX_FRMSELLINE_TOP,
+                                                                SVX_FRMSELLINE_BOTTOM,
+                                                                SVX_FRMSELLINE_LEFT,
+                                                                SVX_FRMSELLINE_RIGHT,
+                                                                SVX_FRMSELLINE_HOR,
+                                                                SVX_FRMSELLINE_VER
+                                                            };
+
+                sal_Int32 i;
+                for (i=1; i < sizeof(eTypes)/sizeof(SvxFrameSelectorLine); ++i)
+                    aFrameSel.GetLine(eTypes[i])  .SetState( SVX_FRMLINESTATE_SHOW );
+                for (i=0; i < sizeof(eTypes)/sizeof(SvxFrameSelectorLine); ++i)
+                    aFrameSel.SelectLine( eTypes[i] );
             }
             else // oben/unten
             {
diff --git a/svx/source/dialog/border.src b/svx/source/dialog/border.src
index 450ce9650290..6eac25f6e595 100644
--- a/svx/source/dialog/border.src
+++ b/svx/source/dialog/border.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: border.src,v $
  *
- *  $Revision: 1.42 $
+ *  $Revision: 1.43 $
  *
- *  last change: $Author: kz $ $Date: 2002-12-09 10:01:01 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -83,7 +83,7 @@ TabPage RID_SVXPAGE_BORDER
     Text [ french ] = "Bordure" ;
     Text [ swedish ] = "Inramning" ;
     Text [ dutch ] = "Omranding" ;
-    Text [ spanish ] = "Borde" ;
+    Text [ spanish ] = "Bordes" ;
     Text [ english_us ] = "Borders" ;
     Text[ chinese_simplified ] = "边框";
     Text[ russian ] = "����������";
@@ -119,7 +119,7 @@ TabPage RID_SVXPAGE_BORDER
         Text[ chinese_traditional ] = "線條排序";
         Text[ arabic ] = "����";
         Text[ greek ] = "������� �������";
-        Text[ korean ] = "외곽선 미리보기";
+        Text[ korean ] = "선 배치";
         Text[ turkish ] = "�er�eve";
         Text[ language_user1 ] = "EM6A; EM6April01: Found in Text doc under Format - Page - Borders tab.";
         Text[ catalan ] = "Marc";
@@ -144,7 +144,7 @@ TabPage RID_SVXPAGE_BORDER
         Text[ polish ] = "~Default";
         Text[ portuguese_brazilian ] = "~Default";
         Text[ japanese ] = "標準";
-        Text[ korean ] = "표준";
+        Text[ korean ] = "기본값";
         Text[ chinese_simplified ] = "标准(~D)";
         Text[ chinese_traditional ] = "標準(~D)";
         Text[ turkish ] = "~Default";
@@ -250,7 +250,7 @@ TabPage RID_SVXPAGE_BORDER
         Text[ polish ] = "St~yle";
         Text[ portuguese_brazilian ] = "St~yle";
         Text[ japanese ] = "スタイル";
-        Text[ korean ] = "유형";
+        Text[ korean ] = "스타일 ";
         Text[ chinese_simplified ] = "风格(~Y)";
         Text[ chinese_traditional ] = "風格";
         Text[ turkish ] = "St~yle";
@@ -528,7 +528,7 @@ TabPage RID_SVXPAGE_BORDER
         Text[ polish ] = "Odst�p od zawarto�ci";
         Text[ portuguese_brazilian ] = "Settings";
         Text[ japanese ] = "内容までの間隔";
-        Text[ korean ] = "내용에 대한 간격";
+        Text[ korean ] = "내용과의 간격";
         Text[ chinese_simplified ] = "至内容的距离";
         Text[ chinese_traditional ] = "至內文的距離";
         Text[ arabic ] = "������� ��� ���������";
@@ -644,7 +644,7 @@ TabPage RID_SVXPAGE_BORDER
         Text[ chinese_traditional ] = "顏色(~O)";
         Text[ arabic ] = "�����";
         Text[ greek ] = "�����";
-        Text[ korean ] = "색(~O)";
+        Text[ korean ] = "색상(~O)";
         Text[ turkish ] = "Re~nk";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "C~olor";
@@ -682,7 +682,7 @@ TabPage RID_SVXPAGE_BORDER
         Text[ chinese_traditional ] = "陰影";
         Text[ arabic ] = "����";
         Text[ greek ] = "����";
-        Text[ korean ] = "음영";
+        Text[ korean ] = "그림자 스타일";
         Text[ turkish ] = "G�lge";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Estil de l'ombra";
@@ -748,22 +748,22 @@ String RID_SVXSTR_TABLE_PRESET_NONE
     Text [ english_us ] = "Set No Borders" ;
     Text[ portuguese ] = "Set No Borders";
     Text[ russian ] = "Set No Borders";
-    Text[ spanish ] = "Set No Borders";
-    Text[ italian ] = "Set No Borders";
-    Text[ swedish ] = "Set No Borders";
+    Text[ spanish ] = "Sin bordes";
+    Text[ italian ] = "Non impostare bordi";
+    Text[ swedish ] = "Ingen inramning";
     Text[ polish ] = "Set No Borders";
     Text[ portuguese_brazilian ] = "Set No Borders";
-    Text[ japanese ] = "Set No Borders";
-    Text[ korean ] = "Set No Borders";
+    Text[ japanese ] = "枠線なしを設定";
+    Text[ korean ] = "테두리 표시하지 않음";
     Text[ turkish ] = "Set No Borders";
     Text[ thai ] = "Set No Borders";
     Text[ greek ] = "Set No Borders";
     Text[ dutch ] = "Set No Borders";
-    Text[ french ] = "Set No Borders";
+    Text[ french ] = "Sans bordure";
     Text[ finnish ] = "Set No Borders";
     Text[ danish ] = "Set No Borders";
-    Text[ chinese_simplified ] = "Set No Borders";
-    Text[ chinese_traditional ] = "Set No Borders";
+    Text[ chinese_simplified ] = "不采用边框";
+    Text[ chinese_traditional ] = "設定沒有邊框";
     Text[ arabic ] = "Set No Borders";
     Text[ catalan ] = "Set No Borders";
 };
@@ -773,22 +773,22 @@ String RID_SVXSTR_TABLE_PRESET_ONLYOUTER
     Text [ english_us ] = "Set Outer Border Only" ;
     Text[ portuguese ] = "Set Outer Border Only";
     Text[ russian ] = "Set Outer Border Only";
-    Text[ spanish ] = "Set Outer Border Only";
-    Text[ italian ] = "Set Outer Border Only";
-    Text[ swedish ] = "Set Outer Border Only";
+    Text[ spanish ] = "S�lo borde exterior";
+    Text[ italian ] = "Imposta solo bordi esterni";
+    Text[ swedish ] = "Bara yttre inramning";
     Text[ polish ] = "Set Outer Border Only";
     Text[ portuguese_brazilian ] = "Set Outer Border Only";
-    Text[ japanese ] = "Set Outer Border Only";
-    Text[ korean ] = "Set Outer Border Only";
+    Text[ japanese ] = "外枠のみを設定";
+    Text[ korean ] = "바깥쪽 테두리만 표시";
     Text[ turkish ] = "Set Outer Border Only";
     Text[ thai ] = "Set Outer Border Only";
     Text[ greek ] = "Set Outer Border Only";
     Text[ dutch ] = "Set Outer Border Only";
-    Text[ french ] = "Set Outer Border Only";
+    Text[ french ] = "Bordure ext�rieure";
     Text[ finnish ] = "Set Outer Border Only";
     Text[ danish ] = "Set Outer Border Only";
-    Text[ chinese_simplified ] = "Set Outer Border Only";
-    Text[ chinese_traditional ] = "Set Outer Border Only";
+    Text[ chinese_simplified ] = "仅采用外边框";
+    Text[ chinese_traditional ] = "僅設定外側邊框";
     Text[ arabic ] = "Set Outer Border Only";
     Text[ catalan ] = "Set Outer Border Only";
 };
@@ -798,22 +798,22 @@ String RID_SVXSTR_TABLE_PRESET_OUTERHORI
     Text [ english_us ] = "Set Outer Border and Horizontal Lines" ;
     Text[ portuguese ] = "Set Outer Border and Horizontal Lines";
     Text[ russian ] = "Set Outer Border and Horizontal Lines";
-    Text[ spanish ] = "Set Outer Border and Horizontal Lines";
-    Text[ italian ] = "Set Outer Border and Horizontal Lines";
-    Text[ swedish ] = "Set Outer Border and Horizontal Lines";
+    Text[ spanish ] = "Borde exterior y l�neas horizontales";
+    Text[ italian ] = "Imposta bordo esterno e righe orizzontali";
+    Text[ swedish ] = "Yttre inramning och horisontella linjer";
     Text[ polish ] = "Set Outer Border and Horizontal Lines";
     Text[ portuguese_brazilian ] = "Set Outer Border and Horizontal Lines";
-    Text[ japanese ] = "Set Outer Border and Horizontal Lines";
-    Text[ korean ] = "Set Outer Border and Horizontal Lines";
+    Text[ japanese ] = "外枠と横線を設定";
+    Text[ korean ] = "바깥쪽 테두리와 가로줄만 표시";
     Text[ turkish ] = "Set Outer Border and Horizontal Lines";
     Text[ thai ] = "Set Outer Border and Horizontal Lines";
     Text[ greek ] = "Set Outer Border and Horizontal Lines";
     Text[ dutch ] = "Set Outer Border and Horizontal Lines";
-    Text[ french ] = "Set Outer Border and Horizontal Lines";
+    Text[ french ] = "Bordure ext�rieure et lignes horizontales";
     Text[ finnish ] = "Set Outer Border and Horizontal Lines";
     Text[ danish ] = "Set Outer Border and Horizontal Lines";
-    Text[ chinese_simplified ] = "Set Outer Border and Horizontal Lines";
-    Text[ chinese_traditional ] = "Set Outer Border and Horizontal Lines";
+    Text[ chinese_simplified ] = "采用边框和水平线";
+    Text[ chinese_traditional ] = "設定外側邊框和水平線";
     Text[ arabic ] = "Set Outer Border and Horizontal Lines";
     Text[ catalan ] = "Set Outer Border and Horizontal Lines";
 };
@@ -823,22 +823,22 @@ String RID_SVXSTR_TABLE_PRESET_OUTERALL
     Text [ english_us ] = "Set Outer Border and All Inner Lines" ;
     Text[ portuguese ] = "Set Outer Border and All Inner Lines";
     Text[ russian ] = "Set Outer Border and All Inner Lines";
-    Text[ spanish ] = "Set Outer Border and All Inner Lines";
-    Text[ italian ] = "Set Outer Border and All Inner Lines";
-    Text[ swedish ] = "Set Outer Border and All Inner Lines";
+    Text[ spanish ] = "Borde exterior y todas las l�neas interiores ";
+    Text[ italian ] = "Imposta bordo esterno e tutte le righe interne";
+    Text[ swedish ] = "Yttre inramning och alla inre linjer";
     Text[ polish ] = "Set Outer Border and All Inner Lines";
     Text[ portuguese_brazilian ] = "Set Outer Border and All Inner Lines";
-    Text[ japanese ] = "Set Outer Border and All Inner Lines";
-    Text[ korean ] = "Set Outer Border and All Inner Lines";
+    Text[ japanese ] = "外枠と表内のすべての線を設定";
+    Text[ korean ] = "바깥쪽 테두리 및 모든 안쪽 줄 표시";
     Text[ turkish ] = "Set Outer Border and All Inner Lines";
     Text[ thai ] = "Set Outer Border and All Inner Lines";
     Text[ greek ] = "Set Outer Border and All Inner Lines";
     Text[ dutch ] = "Set Outer Border and All Inner Lines";
-    Text[ french ] = "Set Outer Border and All Inner Lines";
+    Text[ french ] = "Bordure ext�rieure et totalit� des lignes int�rieures";
     Text[ finnish ] = "Set Outer Border and All Inner Lines";
     Text[ danish ] = "Set Outer Border and All Inner Lines";
-    Text[ chinese_simplified ] = "Set Outer Border and All Inner Lines";
-    Text[ chinese_traditional ] = "Set Outer Border and All Inner Lines";
+    Text[ chinese_simplified ] = "采用外边框和全部内框线";
+    Text[ chinese_traditional ] = "設定外側邊框和所有內側線";
     Text[ arabic ] = "Set Outer Border and All Inner Lines";
     Text[ catalan ] = "Set Outer Border and All Inner Lines";
 };
@@ -848,22 +848,22 @@ String RID_SVXSTR_TABLE_PRESET_OUTERINNER
     Text [ english_us ] = "Set Outer Border Without Changing Inner Lines" ;
     Text[ portuguese ] = "Set Outer Border Without Changing Inner Lines";
     Text[ russian ] = "Set Outer Border Without Changing Inner Lines";
-    Text[ spanish ] = "Set Outer Border Without Changing Inner Lines";
-    Text[ italian ] = "Set Outer Border Without Changing Inner Lines";
-    Text[ swedish ] = "Set Outer Border Without Changing Inner Lines";
+    Text[ spanish ] = "Borde exterior sin modificaci�n de las l�neas interiores";
+    Text[ italian ] = "Imposta il bordo esterno senza modificare le righe interne";
+    Text[ swedish ] = "Rita yttre inramning utan att �ndra inre linjer";
     Text[ polish ] = "Set Outer Border Without Changing Inner Lines";
     Text[ portuguese_brazilian ] = "Set Outer Border Without Changing Inner Lines";
-    Text[ japanese ] = "Set Outer Border Without Changing Inner Lines";
-    Text[ korean ] = "Set Outer Border Without Changing Inner Lines";
+    Text[ japanese ] = "表内の線を変更せず、外枠線を設定";
+    Text[ korean ] = "안쪽 줄은 변경하지 않고 바깥쪽 테두리를 표시";
     Text[ turkish ] = "Set Outer Border Without Changing Inner Lines";
     Text[ thai ] = "Set Outer Border Without Changing Inner Lines";
     Text[ greek ] = "Set Outer Border Without Changing Inner Lines";
     Text[ dutch ] = "Set Outer Border Without Changing Inner Lines";
-    Text[ french ] = "Set Outer Border Without Changing Inner Lines";
+    Text[ french ] = "Bordure ext�rieure sans modification des lignes int�rieures";
     Text[ finnish ] = "Set Outer Border Without Changing Inner Lines";
     Text[ danish ] = "Set Outer Border Without Changing Inner Lines";
-    Text[ chinese_simplified ] = "Set Outer Border Without Changing Inner Lines";
-    Text[ chinese_traditional ] = "Set Outer Border Without Changing Inner Lines";
+    Text[ chinese_simplified ] = "采用外边框，不改动内框线";
+    Text[ chinese_traditional ] = "設定外側邊框但不變更內側線";
     Text[ arabic ] = "Set Outer Border Without Changing Inner Lines";
     Text[ catalan ] = "Set Outer Border Without Changing Inner Lines";
 };
@@ -873,22 +873,22 @@ String RID_SVXSTR_PARA_PRESET_NONE
     Text [ english_us ] = "Set No Border" ;
     Text[ portuguese ] = "Set No Border";
     Text[ russian ] = "Set No Border";
-    Text[ spanish ] = "Set No Border";
-    Text[ italian ] = "Set No Border";
-    Text[ swedish ] = "Set No Border";
+    Text[ spanish ] = "Sin borde";
+    Text[ italian ] = "Non impostare bordo";
+    Text[ swedish ] = "Ingen inramning";
     Text[ polish ] = "Set No Border";
     Text[ portuguese_brazilian ] = "Set No Border";
-    Text[ japanese ] = "Set No Border";
-    Text[ korean ] = "Set No Border";
+    Text[ japanese ] = "枠線なしを設定";
+    Text[ korean ] = "테두리 표시하지 않음";
     Text[ turkish ] = "Set No Border";
     Text[ thai ] = "Set No Border";
     Text[ greek ] = "Set No Border";
     Text[ dutch ] = "Set No Border";
-    Text[ french ] = "Set No Border";
+    Text[ french ] = "Sans bordure";
     Text[ finnish ] = "Set No Border";
     Text[ danish ] = "Set No Border";
-    Text[ chinese_simplified ] = "Set No Border";
-    Text[ chinese_traditional ] = "Set No Border";
+    Text[ chinese_simplified ] = "不采用边框";
+    Text[ chinese_traditional ] = "設定沒有邊框";
     Text[ arabic ] = "Set No Border";
     Text[ catalan ] = "Set No Border";
 };
@@ -898,22 +898,22 @@ String RID_SVXSTR_PARA_PRESET_ALL
     Text [ english_us ] = "Set All Four Borders" ;
     Text[ portuguese ] = "Set All Four Borders";
     Text[ russian ] = "Set All Four Borders";
-    Text[ spanish ] = "Set All Four Borders";
-    Text[ italian ] = "Set All Four Borders";
-    Text[ swedish ] = "Set All Four Borders";
+    Text[ spanish ] = "Los cuatro bordes";
+    Text[ italian ] = "Imposta tutti e quattro i bordi";
+    Text[ swedish ] = "Komplett inramning";
     Text[ polish ] = "Set All Four Borders";
     Text[ portuguese_brazilian ] = "Set All Four Borders";
-    Text[ japanese ] = "Set All Four Borders";
-    Text[ korean ] = "Set All Four Borders";
+    Text[ japanese ] = "四辺の枠線を設定";
+    Text[ korean ] = "테두리의 네면을 모두 표시";
     Text[ turkish ] = "Set All Four Borders";
     Text[ thai ] = "Set All Four Borders";
     Text[ greek ] = "Set All Four Borders";
     Text[ dutch ] = "Set All Four Borders";
-    Text[ french ] = "Set All Four Borders";
+    Text[ french ] = "Bordure compl�te";
     Text[ finnish ] = "Set All Four Borders";
     Text[ danish ] = "Set All Four Borders";
-    Text[ chinese_simplified ] = "Set All Four Borders";
-    Text[ chinese_traditional ] = "Set All Four Borders";
+    Text[ chinese_simplified ] = "采用全部的边框";
+    Text[ chinese_traditional ] = "設定所有四邊邊框";
     Text[ arabic ] = "Set All Four Borders";
     Text[ catalan ] = "Set All Four Borders";
 };
@@ -923,22 +923,22 @@ String RID_SVXSTR_PARA_PRESET_LEFTRIGHT
     Text [ english_us ] = "Set Left and Right Borders Only" ;
     Text[ portuguese ] = "Set Left and Right Borders Only";
     Text[ russian ] = "Set Left and Right Borders Only";
-    Text[ spanish ] = "Set Left and Right Borders Only";
-    Text[ italian ] = "Set Left and Right Borders Only";
-    Text[ swedish ] = "Set Left and Right Borders Only";
+    Text[ spanish ] = "S�lo borde derecho e izquierdo";
+    Text[ italian ] = "Imposta solo il bordo sinistro e destro";
+    Text[ swedish ] = "Rita bara h�ger och v�nster kant";
     Text[ polish ] = "Set Left and Right Borders Only";
     Text[ portuguese_brazilian ] = "Set Left and Right Borders Only";
-    Text[ japanese ] = "Set Left and Right Borders Only";
-    Text[ korean ] = "Set Left and Right Borders Only";
+    Text[ japanese ] = "左右の外枠線を設定";
+    Text[ korean ] = "왼쪽과 오른쪽의 테두리만 표시";
     Text[ turkish ] = "Set Left and Right Borders Only";
     Text[ thai ] = "Set Left and Right Borders Only";
     Text[ greek ] = "Set Left and Right Borders Only";
     Text[ dutch ] = "Set Left and Right Borders Only";
-    Text[ french ] = "Set Left and Right Borders Only";
+    Text[ french ] = "Bordure gauche et droite";
     Text[ finnish ] = "Set Left and Right Borders Only";
     Text[ danish ] = "Set Left and Right Borders Only";
-    Text[ chinese_simplified ] = "Set Left and Right Borders Only";
-    Text[ chinese_traditional ] = "Set Left and Right Borders Only";
+    Text[ chinese_simplified ] = "仅采用左右边框";
+    Text[ chinese_traditional ] = "僅設定左側和右側邊框";
     Text[ arabic ] = "Set Left and Right Borders Only";
     Text[ catalan ] = "Set Left and Right Borders Only";
 };
@@ -948,22 +948,22 @@ String RID_SVXSTR_PARA_PRESET_TOPBOTTOM
     Text [ english_us ] = "Set Top and Bottom Borders Only" ;
     Text[ portuguese ] = "Set Top and Bottom Borders Only";
     Text[ russian ] = "Set Top and Bottom Borders Only";
-    Text[ spanish ] = "Set Top and Bottom Borders Only";
-    Text[ italian ] = "Set Top and Bottom Borders Only";
-    Text[ swedish ] = "Set Top and Bottom Borders Only";
+    Text[ spanish ] = "S�lo borde inferior y superior ";
+    Text[ italian ] = "Imposta il bordo superiore ed inferiore";
+    Text[ swedish ] = "Rita bara �vre och nedre kant";
     Text[ polish ] = "Set Top and Bottom Borders Only";
     Text[ portuguese_brazilian ] = "Set Top and Bottom Borders Only";
-    Text[ japanese ] = "Set Top and Bottom Borders Only";
-    Text[ korean ] = "Set Top and Bottom Borders Only";
+    Text[ japanese ] = "上下の外枠線を設定";
+    Text[ korean ] = "맨위와 맨아래의 테두리만 표시";
     Text[ turkish ] = "Set Top and Bottom Borders Only";
     Text[ thai ] = "Set Top and Bottom Borders Only";
     Text[ greek ] = "Set Top and Bottom Borders Only";
     Text[ dutch ] = "Set Top and Bottom Borders Only";
-    Text[ french ] = "Set Top and Bottom Borders Only";
+    Text[ french ] = "Bordure sup�rieure et inf�rieure";
     Text[ finnish ] = "Set Top and Bottom Borders Only";
     Text[ danish ] = "Set Top and Bottom Borders Only";
-    Text[ chinese_simplified ] = "Set Top and Bottom Borders Only";
-    Text[ chinese_traditional ] = "Set Top and Bottom Borders Only";
+    Text[ chinese_simplified ] = "仅采用上下边框";
+    Text[ chinese_traditional ] = "僅設定上方和下方邊框";
     Text[ arabic ] = "Set Top and Bottom Borders Only";
     Text[ catalan ] = "Set Top and Bottom Borders Only";
 };
@@ -973,22 +973,22 @@ String RID_SVXSTR_PARA_PRESET_ONLYLEFT
     Text [ english_us ] = "Set Left Border Only" ;
     Text[ portuguese ] = "Set Left Border Only";
     Text[ russian ] = "Set Left Border Only";
-    Text[ spanish ] = "Set Left Border Only";
-    Text[ italian ] = "Set Left Border Only";
-    Text[ swedish ] = "Set Left Border Only";
+    Text[ spanish ] = "S�lo borde izquierdo";
+    Text[ italian ] = "Imposta solo il margine sinistro";
+    Text[ swedish ] = "Bara v�nster kant";
     Text[ polish ] = "Set Left Border Only";
     Text[ portuguese_brazilian ] = "Set Left Border Only";
-    Text[ japanese ] = "Set Left Border Only";
-    Text[ korean ] = "Set Left Border Only";
+    Text[ japanese ] = "左外枠を設定";
+    Text[ korean ] = "왼쪽 테두리만 표시";
     Text[ turkish ] = "Set Left Border Only";
     Text[ thai ] = "Set Left Border Only";
     Text[ greek ] = "Set Left Border Only";
     Text[ dutch ] = "Set Left Border Only";
-    Text[ french ] = "Set Left Border Only";
+    Text[ french ] = "Bordure gauche";
     Text[ finnish ] = "Set Left Border Only";
     Text[ danish ] = "Set Left Border Only";
-    Text[ chinese_simplified ] = "Set Left Border Only";
-    Text[ chinese_traditional ] = "Set Left Border Only";
+    Text[ chinese_simplified ] = "仅采用左边框";
+    Text[ chinese_traditional ] = "僅設定左側邊框";
     Text[ arabic ] = "Set Left Border Only";
     Text[ catalan ] = "Set Left Border Only";
 };
@@ -998,22 +998,22 @@ String RID_SVXSTR_SHADOW_STYLE_NONE
     Text [ english_us ] = "No Shadow" ;
     Text[ portuguese ] = "No Shadow";
     Text[ russian ] = "No Shadow";
-    Text[ spanish ] = "No Shadow";
-    Text[ italian ] = "No Shadow";
-    Text[ swedish ] = "No Shadow";
+    Text[ spanish ] = "Sin sombra";
+    Text[ italian ] = "Nessuna ombreggiatura";
+    Text[ swedish ] = "Ingen skugga";
     Text[ polish ] = "No Shadow";
     Text[ portuguese_brazilian ] = "No Shadow";
-    Text[ japanese ] = "No Shadow";
-    Text[ korean ] = "No Shadow";
+    Text[ japanese ] = "影なし";
+    Text[ korean ] = "그림자 없음";
     Text[ turkish ] = "No Shadow";
     Text[ thai ] = "No Shadow";
     Text[ greek ] = "No Shadow";
     Text[ dutch ] = "No Shadow";
-    Text[ french ] = "No Shadow";
+    Text[ french ] = "Sans ombre";
     Text[ finnish ] = "No Shadow";
     Text[ danish ] = "No Shadow";
-    Text[ chinese_simplified ] = "No Shadow";
-    Text[ chinese_traditional ] = "No Shadow";
+    Text[ chinese_simplified ] = "不带阴影";
+    Text[ chinese_traditional ] = "不帶陰影";
     Text[ arabic ] = "No Shadow";
     Text[ catalan ] = "No Shadow";
 };
@@ -1023,22 +1023,22 @@ String RID_SVXSTR_SHADOW_STYLE_BOTTOMRIGHT
     Text [ english_us ] = "Cast Shadow to Bottom Right" ;
     Text[ portuguese ] = "Cast Shadow to Bottom Right";
     Text[ russian ] = "Cast Shadow to Bottom Right";
-    Text[ spanish ] = "Cast Shadow to Bottom Right";
-    Text[ italian ] = "Cast Shadow to Bottom Right";
-    Text[ swedish ] = "Cast Shadow to Bottom Right";
+    Text[ spanish ] = "Proyectar sombra hacia abajo y a la derecha";
+    Text[ italian ] = "Ombreggiatura in basso verso destra";
+    Text[ swedish ] = "Kasta skugga ned�t �t h�ger";
     Text[ polish ] = "Cast Shadow to Bottom Right";
     Text[ portuguese_brazilian ] = "Cast Shadow to Bottom Right";
-    Text[ japanese ] = "Cast Shadow to Bottom Right";
-    Text[ korean ] = "Cast Shadow to Bottom Right";
+    Text[ japanese ] = "右下に影を付ける";
+    Text[ korean ] = "오른쪽 아래 방향으로 그림자 효과내기";
     Text[ turkish ] = "Cast Shadow to Bottom Right";
     Text[ thai ] = "Cast Shadow to Bottom Right";
     Text[ greek ] = "Cast Shadow to Bottom Right";
     Text[ dutch ] = "Cast Shadow to Bottom Right";
-    Text[ french ] = "Cast Shadow to Bottom Right";
+    Text[ french ] = "Projection de l'ombre en bas � droite";
     Text[ finnish ] = "Cast Shadow to Bottom Right";
     Text[ danish ] = "Cast Shadow to Bottom Right";
-    Text[ chinese_simplified ] = "Cast Shadow to Bottom Right";
-    Text[ chinese_traditional ] = "Cast Shadow to Bottom Right";
+    Text[ chinese_simplified ] = "阴影投向右下";
+    Text[ chinese_traditional ] = "右下方加上陰影";
     Text[ arabic ] = "Cast Shadow to Bottom Right";
     Text[ catalan ] = "Cast Shadow to Bottom Right";
 };
@@ -1048,22 +1048,22 @@ String RID_SVXSTR_SHADOW_STYLE_TOPRIGHT
     Text [ english_us ] = "Cast Shadow to Top Right" ;
     Text[ portuguese ] = "Cast Shadow to Top Right";
     Text[ russian ] = "Cast Shadow to Top Right";
-    Text[ spanish ] = "Cast Shadow to Top Right";
-    Text[ italian ] = "Cast Shadow to Top Right";
-    Text[ swedish ] = "Cast Shadow to Top Right";
+    Text[ spanish ] = "Proyectar sombra hacia arriba y a la derecha";
+    Text[ italian ] = "Ombreggiatura in alto verso destra";
+    Text[ swedish ] = "Kasta skugga upp�t �t h�ger";
     Text[ polish ] = "Cast Shadow to Top Right";
     Text[ portuguese_brazilian ] = "Cast Shadow to Top Right";
-    Text[ japanese ] = "Cast Shadow to Top Right";
-    Text[ korean ] = "Cast Shadow to Top Right";
+    Text[ japanese ] = "右上に影を付ける";
+    Text[ korean ] = "오른쪽 위 방향으로 그림자 효과내기";
     Text[ turkish ] = "Cast Shadow to Top Right";
     Text[ thai ] = "Cast Shadow to Top Right";
     Text[ greek ] = "Cast Shadow to Top Right";
     Text[ dutch ] = "Cast Shadow to Top Right";
-    Text[ french ] = "Cast Shadow to Top Right";
+    Text[ french ] = "Projection de l'ombre en haut � droite";
     Text[ finnish ] = "Cast Shadow to Top Right";
     Text[ danish ] = "Cast Shadow to Top Right";
-    Text[ chinese_simplified ] = "Cast Shadow to Top Right";
-    Text[ chinese_traditional ] = "Cast Shadow to Top Right";
+    Text[ chinese_simplified ] = "阴影投向右上";
+    Text[ chinese_traditional ] = "右上方加上陰影";
     Text[ arabic ] = "Cast Shadow to Top Right";
     Text[ catalan ] = "Cast Shadow to Top Right";
 };
@@ -1073,22 +1073,22 @@ String RID_SVXSTR_SHADOW_STYLE_BOTTOMLEFT
     Text [ english_us ] = "Cast Shadow to Bottom Left" ;
     Text[ portuguese ] = "Cast Shadow to Bottom Left";
     Text[ russian ] = "Cast Shadow to Bottom Left";
-    Text[ spanish ] = "Cast Shadow to Bottom Left";
-    Text[ italian ] = "Cast Shadow to Bottom Left";
-    Text[ swedish ] = "Cast Shadow to Bottom Left";
+    Text[ spanish ] = "Proyectar sombra hacia abajo y a la izquierda";
+    Text[ italian ] = "Ombreggiatura in basso verso sinistra";
+    Text[ swedish ] = "Kasta skugga ned�t �t v�nster";
     Text[ polish ] = "Cast Shadow to Bottom Left";
     Text[ portuguese_brazilian ] = "Cast Shadow to Bottom Left";
-    Text[ japanese ] = "Cast Shadow to Bottom Left";
-    Text[ korean ] = "Cast Shadow to Bottom Left";
+    Text[ japanese ] = "左下に影を付ける";
+    Text[ korean ] = "왼쪽 아래 방향으로 그림자 효과내기";
     Text[ turkish ] = "Cast Shadow to Bottom Left";
     Text[ thai ] = "Cast Shadow to Bottom Left";
     Text[ greek ] = "Cast Shadow to Bottom Left";
     Text[ dutch ] = "Cast Shadow to Bottom Left";
-    Text[ french ] = "Cast Shadow to Bottom Left";
+    Text[ french ] = "Projection de l'ombre en bas � gauche";
     Text[ finnish ] = "Cast Shadow to Bottom Left";
     Text[ danish ] = "Cast Shadow to Bottom Left";
-    Text[ chinese_simplified ] = "Cast Shadow to Bottom Left";
-    Text[ chinese_traditional ] = "Cast Shadow to Bottom Left";
+    Text[ chinese_simplified ] = "阴影投向左上";
+    Text[ chinese_traditional ] = "左下方加上陰影";
     Text[ arabic ] = "Cast Shadow to Bottom Left";
     Text[ catalan ] = "Cast Shadow to Bottom Left";
 };
@@ -1098,24 +1098,29 @@ String RID_SVXSTR_SHADOW_STYLE_TOPLEFT
     Text [ english_us ] = "Cast Shadow to Top Left" ;
     Text[ portuguese ] = "Cast Shadow to Top Left";
     Text[ russian ] = "Cast Shadow to Top Left";
-    Text[ spanish ] = "Cast Shadow to Top Left";
-    Text[ italian ] = "Cast Shadow to Top Left";
-    Text[ swedish ] = "Cast Shadow to Top Left";
+    Text[ spanish ] = "Proyectar sombra hacia arriba y a la izquierda";
+    Text[ italian ] = "Ombreggiatura in alto verso sinistra";
+    Text[ swedish ] = "Kasta skugga upp�t �t v�nster";
     Text[ polish ] = "Cast Shadow to Top Left";
     Text[ portuguese_brazilian ] = "Cast Shadow to Top Left";
-    Text[ japanese ] = "Cast Shadow to Top Left";
-    Text[ korean ] = "Cast Shadow to Top Left";
+    Text[ japanese ] = "右上に影を付ける";
+    Text[ korean ] = "왼쪽 위 방향으로 그림자 효과내기";
     Text[ turkish ] = "Cast Shadow to Top Left";
     Text[ thai ] = "Cast Shadow to Top Left";
     Text[ greek ] = "Cast Shadow to Top Left";
     Text[ dutch ] = "Cast Shadow to Top Left";
-    Text[ french ] = "Cast Shadow to Top Left";
+    Text[ french ] = "Projection de l'ombre en haut � gauche";
     Text[ finnish ] = "Cast Shadow to Top Left";
     Text[ danish ] = "Cast Shadow to Top Left";
-    Text[ chinese_simplified ] = "Cast Shadow to Top Left";
-    Text[ chinese_traditional ] = "Cast Shadow to Top Left";
+    Text[ chinese_simplified ] = "阴影投向左上";
+    Text[ chinese_traditional ] = "左上方加上陰影";
     Text[ arabic ] = "Cast Shadow to Top Left";
     Text[ catalan ] = "Cast Shadow to Top Left";
 };
 
 // **********************************************************************
+
+
+
+
+
diff --git a/svx/source/dialog/chardlg.cxx b/svx/source/dialog/chardlg.cxx
index 03299265b7cf..58805cb0ec3c 100644
--- a/svx/source/dialog/chardlg.cxx
+++ b/svx/source/dialog/chardlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: chardlg.cxx,v $
  *
- *  $Revision: 1.75 $
+ *  $Revision: 1.76 $
  *
- *  last change: $Author: iha $ $Date: 2002-11-28 19:19:40 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -3431,7 +3431,15 @@ void SvxCharPositionPage::Reset( const SfxItemSet& rSet )
         }
         else
         {
-            m_a0degRB.Check( TRUE );
+            if( eState == SFX_ITEM_DONTCARE )
+            {
+                m_a0degRB.Check( FALSE );
+                m_a90degRB.Check( FALSE );
+                m_a270degRB.Check( FALSE );
+            }
+            else
+                m_a0degRB.Check( TRUE );
+
             m_aFitToLineCB.Check( FALSE );
         }
         m_aFitToLineCB.SetClickHdl( aOldLink );
diff --git a/svx/source/dialog/chardlg.src b/svx/source/dialog/chardlg.src
index f41ad783530b..958cdfbda237 100644
--- a/svx/source/dialog/chardlg.src
+++ b/svx/source/dialog/chardlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: chardlg.src,v $
  *
- *  $Revision: 1.62 $
+ *  $Revision: 1.63 $
  *
- *  last change: $Author: os $ $Date: 2002-10-09 12:54:15 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -108,9 +108,9 @@ TabPage RID_SVXPAGE_CHAR_NAME
         Text = "Schriftart f�r westlichen Text";
         Text [ english_us ] = "Western text font";
         Text[ portuguese ] = "Tipo de letra para texto ocidental";
-        Text[ russian ] = "��� ������ ��� ��������� ������";
+        Text[ russian ] = "����� ��������� ������";
         Text[ greek ] = "������������� ��� ������ �������";
-        Text[ dutch ] = "Lettertype voor westelijke tekst";
+        Text[ dutch ] = "Lettertype voor westerse tekst";
         Text[ french ] = "Police pour texte occidental";
         Text[ spanish ] = "Fuente para texto occidental";
         Text[ italian ] = "Tipo di carattere occidentale";
@@ -119,7 +119,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
         Text[ polish ] = "Czcionka tekstu zachodniego";
         Text[ portuguese_brazilian ] = "Schriftart f? westlichen Text";
         Text[ japanese ] = "英数字用フォント";
-        Text[ korean ] = "알파벳";
+        Text[ korean ] = "서양권 언어 글꼴";
         Text[ chinese_simplified ] = "适用于西文的字体";
         Text[ chinese_traditional ] = "西文字型";
         Text[ turkish ] = "Schriftart f�r westlichen Text";
@@ -136,7 +136,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
         Text [ ENGLISH ] = "~Font";
         Text [ english_us ] = "Font";
         Text[ portuguese ] = "~Tipo de letra";
-        Text[ russian ] = "��� ������";
+        Text[ russian ] = "�����";
         Text[ greek ] = "��������~�����";
         Text[ dutch ] = "~Lettertype";
         Text[ french ] = "Police";
@@ -153,7 +153,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
         Text[ turkish ] = "Font";
         Text[ arabic ] = "��� ����";
         Text[ catalan ] = "Tipus de lletra";
-        Text[ finnish ] = "Fontti";
+        Text[ finnish ] = "Fo~ntti";
         Text[ thai ] = "ตัวอักษร";
     };
     FixedText FT_WEST_NAME_NOCJK
@@ -164,7 +164,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
         Text [ ENGLISH ] = "~Font";
         Text [ english_us ] = "~Font";
         Text[ portuguese ] = "~Tipo de letra";
-        Text[ russian ] = "��� ������";
+        Text[ russian ] = "�����";
         Text[ greek ] = "��������~�����";
         Text[ dutch ] = "~Lettertype";
         Text[ french ] = "Police";
@@ -210,7 +210,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
         Text[ portuguese ] = "Estilo";
         Text[ russian ] = "����������";
         Text[ greek ] = "�����";
-        Text[ dutch ] = "~Type";
+        Text[ dutch ] = "T~ype";
         Text[ french ] = "Style";
         Text[ spanish ] = "Estilo";
         Text[ italian ] = "Stile";
@@ -219,13 +219,13 @@ TabPage RID_SVXPAGE_CHAR_NAME
         Text[ polish ] = "Styl";
         Text[ portuguese_brazilian ] = "Type";
         Text[ japanese ] = "スタイル(~T)";
-        Text[ korean ] = "유형(~T)";
+        Text[ korean ] = "스타일(~T)";
         Text[ chinese_simplified ] = "字体形状(~T)";
         Text[ chinese_traditional ] = "字型形狀(~T)";
         Text[ turkish ] = "Type";
         Text[ arabic ] = "��� ����";
         Text[ catalan ] = "~Tipografia";
-        Text[ finnish ] = "~Kirjasinlaji";
+        Text[ finnish ] = "K~irjasinlaji";
         Text[ thai ] = "~รูปร่างของตัวพิมพ์";
     };
     FixedText FT_WEST_STYLE_NOCJK
@@ -253,7 +253,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
         Text[ turkish ] = "Type";
         Text[ arabic ] = "��� ����";
         Text[ catalan ] = "Estil";
-        Text[ finnish ] = "~Fonttityyppi";
+        Text[ finnish ] = "Kir~jasinlaji";
         Text[ thai ] = "~รูปร่างของตัวพิมพ์";
     };
     ComboBox LB_WEST_STYLE
@@ -279,10 +279,10 @@ TabPage RID_SVXPAGE_CHAR_NAME
         };
         StringList [ language_user1 ] =
         {
-            "Normal" ;
-            "Kursiv" ;
+            "Norm; Normal" ;
+            "Kurs; Kurs; Kursiv" ;
             "Fett" ;
-            "Fett Kursiv" ;
+            "Fett; Fett; Fett Kursiv" ;
         };
         StringList [ portuguese ] =
         {
@@ -370,9 +370,9 @@ TabPage RID_SVXPAGE_CHAR_NAME
         };
         StringList [ korean ] =
         {
-            "보통" ;
+            "표준" ;
             "이탤릭체" ;
-            "굵은" ;
+            "굵게" ;
             "이탤릭체 (굵게)" ;
         };
         StringList [ chinese_simplified ] =
@@ -413,9 +413,9 @@ TabPage RID_SVXPAGE_CHAR_NAME
         StringList [ finnish ] =
         {
             "Normaali" ;
-            "Kursivointi" ;
-            "Lihavointi" ;
-            "Lihavointi ja kursivointi" ;
+            "Kursivoitu" ;
+            "Lihavoitu" ;
+            "Lihavoitu ja kursivoitu" ;
         };
     StringList [ thai ] =
     {
@@ -448,10 +448,10 @@ TabPage RID_SVXPAGE_CHAR_NAME
         };
         StringList [ language_user1 ] =
         {
-            "Normal" ;
-            "Kursiv" ;
+            "Norm; Normal" ;
+            "Kurs; Kursiv" ;
             "Fett" ;
-            "Fett Kursiv" ;
+            "Fett; Fett Kursiv" ;
         };
         StringList [ portuguese ] =
         {
@@ -539,7 +539,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
         };
         StringList [ korean ] =
         {
-            "보통" ;
+            "표준" ;
             "이탤릭체" ;
             "굵게" ;
             "이탤릭체(굵게)" ;
@@ -582,9 +582,9 @@ TabPage RID_SVXPAGE_CHAR_NAME
         StringList [ finnish ] =
         {
             "Normaali" ;
-            "Kursivointi" ;
-            "Lihavointi" ;
-            "Lihavointi ja kursivointi" ;
+            "Kursivoitu" ;
+            "Lihavoitu" ;
+            "Lihavoitu ja kursivoitu" ;
         };
     StringList [ thai ] =
     {
@@ -604,7 +604,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
         Text[ portuguese ] = "~Tamanho";
         Text[ russian ] = "������";
         Text[ greek ] = "�������";
-        Text[ dutch ] = "L~ettergrootte";
+        Text[ dutch ] = "Lette~rgrootte";
         Text[ french ] = "Taille";
         Text[ spanish ] = "Tama�o";
         Text[ italian ] = "~Dimensione";
@@ -630,9 +630,9 @@ TabPage RID_SVXPAGE_CHAR_NAME
         Text [ ENGLISH ] = "~Size";
         Text [ english_us ] = "Size";
         Text[ portuguese ] = "~Tamanho";
-        Text[ russian ] = "������";
+        Text[ russian ] = "���~���";
         Text[ greek ] = "�������";
-        Text[ dutch ] = "L~ettergrootte";
+        Text[ dutch ] = "Lette~rgrootte";
         Text[ french ] = "Taille";
         Text[ spanish ] = "Tama�o";
         Text[ italian ] = "~Dimensione";
@@ -718,7 +718,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
         Text[ turkish ] = "Language";
         Text[ arabic ] = "�����";
         Text[ catalan ] = "Idioma";
-        Text[ finnish ] = "~Kieli";
+        Text[ finnish ] = "Ki~eli";
         Text[ thai ] = "~ภาษา";
     };
     ListBox LB_WEST_LANG
@@ -746,7 +746,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
         Text = "Schriftart f�r asiatischen Text";
         Text [ english_us ] = "Asian text font";
         Text[ portuguese ] = "Tipo de letra para texto asi�tico";
-        Text[ russian ] = "��� ������ ��� ���������� ������";
+        Text[ russian ] = "����� ���������� ������";
         Text[ greek ] = "������������� ��� �������� �������";
         Text[ dutch ] = "Lettertype voor Aziatische tekst";
         Text[ french ] = "Police pour texte asiatique";
@@ -757,7 +757,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
         Text[ polish ] = "Czcionka tekstu azjatyckiego";
         Text[ portuguese_brazilian ] = "Schriftart f? asiatischen Text";
         Text[ japanese ] = "日本語用フォント";
-        Text[ korean ] = "아시아 문자";
+        Text[ korean ] = "한글 글꼴";
         Text[ chinese_simplified ] = "中日韩字体";
         Text[ chinese_traditional ] = "中日韓字型";
         Text[ turkish ] = "Schriftart f�r asiatischen Text";
@@ -774,13 +774,13 @@ TabPage RID_SVXPAGE_CHAR_NAME
         Text [ ENGLISH ] = "F~ont";
         Text [ english_us ] = "Font";
         Text[ portuguese ] = "Ti~po de letra";
-        Text[ russian ] = "��� ������";
+        Text[ russian ] = "�����";
         Text[ greek ] = "����������~���";
         Text[ dutch ] = "L~ettertype";
         Text[ french ] = "Police";
         Text[ spanish ] = "Fuente";
         Text[ italian ] = "Tipo di carattere";
-        Text[ danish ] = "Sk~rifttype";
+        Text[ danish ] = "Skriftt~ype";
         Text[ swedish ] = "Tec~kensnitt";
         Text[ polish ] = "Czcionka";
         Text[ portuguese_brazilian ] = "Font";
@@ -821,13 +821,13 @@ TabPage RID_SVXPAGE_CHAR_NAME
         Text[ polish ] = "Styl";
         Text[ portuguese_brazilian ] = "Type";
         Text[ japanese ] = "スタイル(~Y)";
-        Text[ korean ] = "유형(~Y)";
+        Text[ korean ] = "글꼴 유형(~Y)";
         Text[ chinese_simplified ] = "字体形状(~Y)";
         Text[ chinese_traditional ] = "字型形狀(~Y)";
         Text[ turkish ] = "Type";
         Text[ arabic ] = "��� ����";
         Text[ catalan ] = "T~ipografia";
-        Text[ finnish ] = "~Kirjasinlaji";
+        Text[ finnish ] = "K~irjasinlaji";
         Text[ thai ] = "รู~ปร่างของตัวพิมพ์";
     };
     ComboBox LB_EAST_STYLE
@@ -853,10 +853,10 @@ TabPage RID_SVXPAGE_CHAR_NAME
         };
         StringList [ language_user1 ] =
         {
-            "Normal" ;
-            "Kursiv" ;
+            "Norm; Normal" ;
+            "Kurs; Kursiv" ;
             "Fett" ;
-            "Fett Kursiv" ;
+            "Fett; Fett Kursiv" ;
         };
         StringList [ portuguese ] =
         {
@@ -944,9 +944,9 @@ TabPage RID_SVXPAGE_CHAR_NAME
         };
         StringList [ korean ] =
         {
-            "보통" ;
+            "표준" ;
             "이탤릭체" ;
-            "굵은" ;
+            "굵게" ;
             "이탤릭체 (굵게)" ;
         };
         StringList [ chinese_simplified ] =
@@ -987,9 +987,9 @@ TabPage RID_SVXPAGE_CHAR_NAME
         StringList [ finnish ] =
         {
             "Normaali" ;
-            "Kursivointi" ;
-            "Lihavointi" ;
-            "Lihavointi ja kursivointi" ;
+            "Kursivoitu" ;
+            "Lihavoitu" ;
+            "Lihavoitu ja kursivoitu" ;
         };
     StringList [ thai ] =
     {
@@ -1009,11 +1009,11 @@ TabPage RID_SVXPAGE_CHAR_NAME
         Text[ portuguese ] = "~Tamanho";
         Text[ russian ] = "������";
         Text[ greek ] = "�������";
-        Text[ dutch ] = "~Lettergrootte";
+        Text[ dutch ] = "Letter~grootte";
         Text[ french ] = "Taille";
         Text[ spanish ] = "Tama�o";
         Text[ italian ] = "~Dimensione";
-        Text[ danish ] = "Skri~ftgrad";
+        Text[ danish ] = "Skrift~grad";
         Text[ swedish ] = "Teckens~torlek";
         Text[ polish ] = "Rozmiar";
         Text[ portuguese_brazilian ] = "Size";
@@ -1049,7 +1049,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
         Text[ french ] = "Langue";
         Text[ spanish ] = "Idioma";
         Text[ italian ] = "Lingua";
-        Text[ danish ] = "S~prog";
+        Text[ danish ] = "Spr~og";
         Text[ swedish ] = "Sp~r�k";
         Text[ polish ] = "J�zyk";
         Text[ portuguese_brazilian ] = "Language";
@@ -1081,7 +1081,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
         Text[ russian ] = "Complex script font";
         Text[ greek ] = "Complex script font";
         Text[ dutch ] = "Complex script font";
-        Text[ french ] = "Police pour CTL";
+        Text[ french ] = "Police pour scripts complexes";
         Text[ spanish ] = "Fuente CTL";
         Text[ finnish ] = "Complex script font";
         Text[ italian ] = "Carattere per script complessi";
@@ -1090,7 +1090,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
         Text[ polish ] = "Complex script font";
         Text[ portuguese_brazilian ] = "Complex script font";
         Text[ japanese ] = "複合文字言語用フォント";
-        Text[ korean ] = "CTL용 글꼴";
+        Text[ korean ] = "복합 문자 언어용(CTL) 글꼴";
         Text[ chinese_simplified ] = "适用于复杂的文字版式的字型";
         Text[ chinese_traditional ] = "適用于複雜的文字版式的字型";
         Text[ turkish ] = "Complex script font";
@@ -1153,7 +1153,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
         Text[ polish ] = "Styl";
         Text[ portuguese_brazilian ] = "Type";
         Text[ japanese ] = "スタイル(~Y)";
-        Text[ korean ] = "유형(~Y)";
+        Text[ korean ] = "스타일(~Y)";
         Text[ chinese_simplified ] = "字体形状(~Y)";
         Text[ chinese_traditional ] = "字型形狀(~Y)";
         Text[ turkish ] = "Type";
@@ -1185,10 +1185,10 @@ TabPage RID_SVXPAGE_CHAR_NAME
         };
         StringList [ language_user1 ] =
         {
-            "Normal" ;
-            "Kursiv" ;
+            "Norm; Normal" ;
+            "Kurs; Kursiv" ;
             "Fett" ;
-            "Fett Kursiv" ;
+            "Fett; Fett Kursiv" ;
         };
         StringList [ portuguese ] =
         {
@@ -1230,7 +1230,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
             "Normal" ;
             "Cursiva" ;
             "Negrita" ;
-            "Cursiva negrita" ;
+            "Negrita cursiva " ;
         };
         StringList [ italian ] =
         {
@@ -1262,10 +1262,10 @@ TabPage RID_SVXPAGE_CHAR_NAME
         };
         StringList [ portuguese_brazilian ] =
         {
-            "Normal" ;
-            "Kursiv" ;
-            "Fett" ;
-            "Fett Kursiv" ;
+            "Padr�o" ;
+            "It�lico" ;
+            "Negrito" ;
+            "It�lico negrito" ;
         };
         StringList [ japanese ] =
         {
@@ -1276,7 +1276,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
         };
         StringList [ korean ] =
         {
-            "표준" ;
+            "보통" ;
             "이탤릭체" ;
             "굵게" ;
             "이탤릭체 (굵게)" ;
@@ -1408,7 +1408,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     {
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 129 ) ;
-        Size = MAP_APPFONT ( 248 , 39 ) ;
+        Size = MAP_APPFONT ( 248 , 37 ) ;
         Text = "Beispiel";
         Text [ english_us ] = "Example";
         Text[ portuguese ] = "Exemplo";
@@ -1434,8 +1434,9 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     FixedText FT_CHAR_FONTTYPE
     {
-        Pos = MAP_APPFONT ( 6 , 171  ) ;
-        Size = MAP_APPFONT ( 248 , 10 ) ;
+        Pos = MAP_APPFONT ( 6 , 168 ) ;
+        Size = MAP_APPFONT ( 248 , 16 ) ;
+        WordBreak = TRUE ;
     };
     FixedLine FL_COLOR2
     {
@@ -1486,7 +1487,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
         Text[ polish ] = "Kolor";
         Text[ portuguese_brazilian ] = "Font ~Color";
         Text[ japanese ] = "フォントの色(~C)";
-        Text[ korean ] = "글꼴(~C)";
+        Text[ korean ] = "글꼴 색상(~C)";
         Text[ chinese_simplified ] = "字体颜色(~C)";
         Text[ chinese_traditional ] = "字型顏色(~C)";
         Text[ turkish ] = "Font ~Color";
@@ -1505,7 +1506,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     String STR_CHARNAME_NOSTYLE
     {
-        Text[language_user1] = "PB: %s wird ersetzt durch fett oder kursiv";
+        Text[language_user1] = "PB: ; PB: %s wird ersetzt durch fett oder kursiv";
         Text = "Nicht %s";
         Text[ english_us ] = "No %s";
         Text[ portuguese ] = "Sem %s";
@@ -1572,7 +1573,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         Text [ ENGLISH ] = "~Underlining" ;
         Text [ english_us ] = "Underlining" ;
         Text[ portuguese ] = "~Sublinhado";
-        Text[ russian ] = "�������������";
+        Text[ russian ] = "���~����������";
         Text[ greek ] = "~�����������";
         Text[ dutch ] = "~Onderstrepen";
         Text[ french ] = "~Soulignage";
@@ -1585,11 +1586,11 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         Text[ japanese ] = "下線";
         Text[ korean ] = "밑줄";
         Text[ chinese_simplified ] = "下划线";
-        Text[ chinese_traditional ] = "下划線";
+        Text[ chinese_traditional ] = "下劃線";
         Text[ turkish ] = "Underlining";
         Text[ arabic ] = "�� ����";
         Text[ catalan ] = "Subratllat";
-        Text[ finnish ] = "Alleviivaus";
+        Text[ finnish ] = "Allev~iivaus";
         Text[ thai ] = "ขีดเส้นใต้";
     };
     ListBox LB_UNDERLINE
@@ -1641,23 +1642,23 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         };
         StringList [ language_user1 ] =
         {
-            < "(Ohne)" ; CHRDLG_UNDERLINE_NONE ; > ;
-            < "Einfach" ; CHRDLG_UNDERLINE_SINGLE ; > ;
-            < "Doppelt" ; CHRDLG_UNDERLINE_DOUBLE ; > ;
+            < "(Ohn; (Ohne)" ; CHRDLG_UNDERLINE_NONE ; > ;
+            < "Einf; Einfach" ; CHRDLG_UNDERLINE_SINGLE ; > ;
+            < "Dopp; Doppelt" ; CHRDLG_UNDERLINE_DOUBLE ; > ;
             < "Fett"; CHRDLG_UNDERLINE_BOLD; > ;
-            < "Punktiert" ; CHRDLG_UNDERLINE_DOTTED ; > ;
-            < "Punktiert fett" ; CHRDLG_UNDERLINE_BOLDDOTTED; > ;
-            < "Strich"; CHRDLG_UNDERLINE_DASH; > ;
-            < "Strich fett"; CHRDLG_UNDERLINE_BOLDDASH; > ;
-            < "Strich lang"; CHRDLG_UNDERLINE_LONGDASH; > ;
-            < "Strich fett lang"; CHRDLG_UNDERLINE_BOLDLONGDASH; > ;
-            < "Punkt Strich"; CHRDLG_UNDERLINE_DASHDOT; > ;
-            < "Punkt Strich fett"; CHRDLG_UNDERLINE_BOLDDASHDOT; > ;
-            < "Punkt Punkt Strich"; CHRDLG_UNDERLINE_DASHDOTDOT; > ;
-            < "Punkt Punkt Strich fett"; CHRDLG_UNDERLINE_BOLDDASHDOTDOT; > ;
-            < "Welle"; CHRDLG_UNDERLINE_WAVE; > ;
-            < "Welle fett"; CHRDLG_UNDERLINE_BOLDWAVE; > ;
-            < "Welle doppelt"; CHRDLG_UNDERLINE_DOUBLEWAVE; > ;
+            < "Punk; Punktiert" ; CHRDLG_UNDERLINE_DOTTED ; > ;
+            < "Punk; Punktiert fett" ; CHRDLG_UNDERLINE_BOLDDOTTED; > ;
+            < "Stri; Strich"; CHRDLG_UNDERLINE_DASH; > ;
+            < "Stri; Strich fett"; CHRDLG_UNDERLINE_BOLDDASH; > ;
+            < "Stri; Strich lang"; CHRDLG_UNDERLINE_LONGDASH; > ;
+            < "Stri; Strich fett lang"; CHRDLG_UNDERLINE_BOLDLONGDASH; > ;
+            < "Punk; Punkt Strich"; CHRDLG_UNDERLINE_DASHDOT; > ;
+            < "Punk; Punkt Strich fett"; CHRDLG_UNDERLINE_BOLDDASHDOT; > ;
+            < "Punk; Punkt Punkt Strich"; CHRDLG_UNDERLINE_DASHDOTDOT; > ;
+            < "Punk; Punkt Punkt Strich fett"; CHRDLG_UNDERLINE_BOLDDASHDOTDOT; > ;
+            < "Well; Welle"; CHRDLG_UNDERLINE_WAVE; > ;
+            < "Well; Welle fett"; CHRDLG_UNDERLINE_BOLDWAVE; > ;
+            < "Well; Welle doppelt"; CHRDLG_UNDERLINE_DOUBLEWAVE; > ;
         };
         StringList [ portuguese ] =
         {
@@ -1681,20 +1682,20 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         };
         StringList [ russian ] =
         {
-            < "(���)" ; CHRDLG_UNDERLINE_NONE ; > ;
+            < "(���)" ; CHRDLG_UNDERLINE_NONE ; > ;
             < "�������" ; CHRDLG_UNDERLINE_SINGLE ; > ;
             < "�������" ; CHRDLG_UNDERLINE_DOUBLE ; > ;
             < "������"; CHRDLG_UNDERLINE_BOLD; > ;
             < "�������" ; CHRDLG_UNDERLINE_DOTTED ; > ;
             < "������� (������)" ; CHRDLG_UNDERLINE_BOLDDOTTED; > ;
-            < "������"; CHRDLG_UNDERLINE_DASH; > ;
+            < "�����"; CHRDLG_UNDERLINE_DASH; > ;
             < "����� (������)"; CHRDLG_UNDERLINE_BOLDDASH; > ;
-            < "����� (�������)"; CHRDLG_UNDERLINE_LONGDASH; > ;
-            < "����� (�������, ������)"; CHRDLG_UNDERLINE_BOLDLONGDASH; > ;
-            < "����� �����"; CHRDLG_UNDERLINE_DASHDOT; > ;
-            < "����� ����� (������)"; CHRDLG_UNDERLINE_BOLDDASHDOT; > ;
-            < "����� ����� �����"; CHRDLG_UNDERLINE_DASHDOTDOT; > ;
-            < "����� ����� ����� (������)"; CHRDLG_UNDERLINE_BOLDDASHDOTDOT; > ;
+            < "������� �����"; CHRDLG_UNDERLINE_LONGDASH; > ;
+            < "������� ����� (������)"; CHRDLG_UNDERLINE_BOLDLONGDASH; > ;
+            < "������������"; CHRDLG_UNDERLINE_DASHDOT; > ;
+            < "������������ (������)"; CHRDLG_UNDERLINE_BOLDDASHDOT; > ;
+            < "������������ � 2 �������"; CHRDLG_UNDERLINE_DASHDOTDOT; > ;
+            < "������������ � 2 ������� (������)"; CHRDLG_UNDERLINE_BOLDDASHDOTDOT; > ;
             < "�����"; CHRDLG_UNDERLINE_WAVE; > ;
             < "����� (������)"; CHRDLG_UNDERLINE_BOLDWAVE; > ;
             < "������� �����"; CHRDLG_UNDERLINE_DOUBLEWAVE; > ;
@@ -1902,22 +1903,22 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         StringList [ korean ] =
         {
             < "(없음)" ; CHRDLG_UNDERLINE_NONE ; > ;
-            < "보통" ; CHRDLG_UNDERLINE_SINGLE ; > ;
+            < "단일선" ; CHRDLG_UNDERLINE_SINGLE ; > ;
             < "이중" ; CHRDLG_UNDERLINE_DOUBLE ; > ;
             < "굵게"; CHRDLG_UNDERLINE_BOLD; > ;
             < "점" ; CHRDLG_UNDERLINE_DOTTED ; > ;
             < "점(굵게)" ; CHRDLG_UNDERLINE_BOLDDOTTED; > ;
-            < "선"; CHRDLG_UNDERLINE_DASH; > ;
-            < "선(굵게)"; CHRDLG_UNDERLINE_BOLDDASH; > ;
-            < "긴 선"; CHRDLG_UNDERLINE_LONGDASH; > ;
-            < "긴 선(굵게)"; CHRDLG_UNDERLINE_BOLDLONGDASH; > ;
+            < "파선"; CHRDLG_UNDERLINE_DASH; > ;
+            < "파선(굵게)"; CHRDLG_UNDERLINE_BOLDDASH; > ;
+            < "긴 파선"; CHRDLG_UNDERLINE_LONGDASH; > ;
+            < "긴 파선(굵게)"; CHRDLG_UNDERLINE_BOLDLONGDASH; > ;
             < "일점 쇄선"; CHRDLG_UNDERLINE_DASHDOT; > ;
             < "일점 쇄선(굵게)"; CHRDLG_UNDERLINE_BOLDDASHDOT; > ;
             < "이점 쇄선"; CHRDLG_UNDERLINE_DASHDOTDOT; > ;
             < "이점 쇄선(굵게)"; CHRDLG_UNDERLINE_BOLDDASHDOTDOT; > ;
-            < "반복 기호"; CHRDLG_UNDERLINE_WAVE; > ;
-            < "반복 기호(굵게)"; CHRDLG_UNDERLINE_BOLDWAVE; > ;
-            < "반복 기호(이중)"; CHRDLG_UNDERLINE_DOUBLEWAVE; > ;
+            < "파선"; CHRDLG_UNDERLINE_WAVE; > ;
+            < "파선(굵게)"; CHRDLG_UNDERLINE_BOLDWAVE; > ;
+            < "이중 파선"; CHRDLG_UNDERLINE_DOUBLEWAVE; > ;
         };
         StringList [ chinese_simplified ] =
         {
@@ -1947,10 +1948,10 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
             < "粗體"; CHRDLG_UNDERLINE_BOLD; > ;
             < "點線" ; CHRDLG_UNDERLINE_DOTTED ; > ;
             < "點線粗體" ; CHRDLG_UNDERLINE_BOLDDOTTED; > ;
-            < "划線"; CHRDLG_UNDERLINE_DASH; > ;
-            < "划線粗體"; CHRDLG_UNDERLINE_BOLDDASH; > ;
-            < "長划線"; CHRDLG_UNDERLINE_LONGDASH; > ;
-            < "划線粗長體"; CHRDLG_UNDERLINE_BOLDLONGDASH; > ;
+            < "劃線"; CHRDLG_UNDERLINE_DASH; > ;
+            < "劃線粗體"; CHRDLG_UNDERLINE_BOLDDASH; > ;
+            < "長劃線"; CHRDLG_UNDERLINE_LONGDASH; > ;
+            < "劃線粗長體"; CHRDLG_UNDERLINE_BOLDLONGDASH; > ;
             < "點劃線"; CHRDLG_UNDERLINE_DASHDOT; > ;
             < "點劃線粗體"; CHRDLG_UNDERLINE_BOLDDASHDOT; > ;
             < "雙點劃線"; CHRDLG_UNDERLINE_DASHDOTDOT; > ;
@@ -2022,22 +2023,22 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         StringList [ finnish ] =
         {
             < "(Ilman)" ; CHRDLG_UNDERLINE_NONE ; > ;
-            < "Yksitt�inen" ; CHRDLG_UNDERLINE_SINGLE ; > ;
+            < "Riviv�li 1" ; CHRDLG_UNDERLINE_SINGLE ; > ;
             < "Kaksinkertainen" ; CHRDLG_UNDERLINE_DOUBLE ; > ;
-            < "Lihavointi"; CHRDLG_UNDERLINE_BOLD; > ;
+            < "Lihavoitu"; CHRDLG_UNDERLINE_BOLD; > ;
             < "Pisteet" ; CHRDLG_UNDERLINE_DOTTED ; > ;
-            < "Pisteet (lihavointi)" ; CHRDLG_UNDERLINE_BOLDDOTTED; > ;
-            < "V�liviiva"; CHRDLG_UNDERLINE_DASH; > ;
-            < "V�liviiva (lihavointi)"; CHRDLG_UNDERLINE_BOLDDASH; > ;
-            < "Pitk� ajatusviiva"; CHRDLG_UNDERLINE_LONGDASH; > ;
-            < "Pitk� ajatusviiva (lihavointi)"; CHRDLG_UNDERLINE_BOLDLONGDASH; > ;
-            < "Piste-viiva"; CHRDLG_UNDERLINE_DASHDOT; > ;
-            < "Piste-viiva (lihavointi)"; CHRDLG_UNDERLINE_BOLDDASHDOT; > ;
-            < "Piste-piste-viiva"; CHRDLG_UNDERLINE_DASHDOTDOT; > ;
-            < "Piste-piste-viiva (lihavointi)"; CHRDLG_UNDERLINE_BOLDDASHDOTDOT; > ;
-            < "Aaltoviiva"; CHRDLG_UNDERLINE_WAVE; > ;
-            < "Aaltoviiva (lihavointi)"; CHRDLG_UNDERLINE_BOLDWAVE; > ;
-            < "Kaksinkertainen aaltoviiva"; CHRDLG_UNDERLINE_DOUBLEWAVE; > ;
+            < "Pisteet (lihavoitu)" ; CHRDLG_UNDERLINE_BOLDDOTTED; > ;
+            < "Katkoviiva"; CHRDLG_UNDERLINE_DASH; > ;
+            < "Katkoviiva (lihavoitu)"; CHRDLG_UNDERLINE_BOLDDASH; > ;
+            < "Pitk� katkoviiva"; CHRDLG_UNDERLINE_LONGDASH; > ;
+            < "pitk� katkoviiva (lihavoitu)"; CHRDLG_UNDERLINE_BOLDLONGDASH; > ;
+            < "Pistekatkoviiva"; CHRDLG_UNDERLINE_DASHDOT; > ;
+            < "Pistekatkoviiva (lihavoitu)"; CHRDLG_UNDERLINE_BOLDDASHDOT; > ;
+            < "Piste piste viiva"; CHRDLG_UNDERLINE_DASHDOTDOT; > ;
+            < "Piste piste viiva (lihavoitu)"; CHRDLG_UNDERLINE_BOLDDASHDOTDOT; > ;
+            < "Aalto"; CHRDLG_UNDERLINE_WAVE; > ;
+            < "Aalto (lihavoitu)"; CHRDLG_UNDERLINE_BOLDWAVE; > ;
+            < "Kaksinkertainen aalto"; CHRDLG_UNDERLINE_DOUBLEWAVE; > ;
         };
     StringList [ thai ] =
     {
@@ -2074,12 +2075,12 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         Text[ french ] = "Couleur";
         Text[ spanish ] = "Color";
         Text[ italian ] = "Colore";
-        Text[ danish ] = "~Farve";
+        Text[ danish ] = "Far~ve";
         Text[ swedish ] = "~F�rg";
         Text[ polish ] = "Kolor";
         Text[ portuguese_brazilian ] = "Color";
         Text[ japanese ] = "色";
-        Text[ korean ] = "색";
+        Text[ korean ] = "색상";
         Text[ chinese_simplified ] = "颜色";
         Text[ chinese_traditional ] = "顏色";
         Text[ turkish ] = "Color";
@@ -2151,12 +2152,12 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         };
         StringList [ language_user1 ] =
         {
-            < "(Ohne)" ; CHRDLG_STRIKEOUT_NONE ; > ;
-            < "Einfach" ; CHRDLG_STRIKEOUT_SINGLE ; > ;
-            < "Doppelt" ; CHRDLG_STRIKEOUT_DOUBLE ; > ;
+            < "(Ohn; (Ohne)" ; CHRDLG_STRIKEOUT_NONE ; > ;
+            < "Einf; Einfach" ; CHRDLG_STRIKEOUT_SINGLE ; > ;
+            < "Dopp; Doppelt" ; CHRDLG_STRIKEOUT_DOUBLE ; > ;
             < "Fett" ; CHRDLG_STRIKEOUT_BOLD ; > ;
-            < "Mit /" ; CHRDLG_STRIKEOUT_SLASH ; > ;
-            < "Mit X" ; CHRDLG_STRIKEOUT_X ; > ;
+            < "Mit ; Mit /" ; CHRDLG_STRIKEOUT_SLASH ; > ;
+            < "Mit ; Mit X" ; CHRDLG_STRIKEOUT_X ; > ;
         };
         StringList [ portuguese ] =
         {
@@ -2169,12 +2170,12 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         };
         StringList [ russian ] =
         {
-            < "(���)" ; CHRDLG_STRIKEOUT_NONE ; > ;
+            < "(���)" ; CHRDLG_STRIKEOUT_NONE ; > ;
             < "�������" ; CHRDLG_STRIKEOUT_SINGLE ; > ;
             < "�������" ; CHRDLG_STRIKEOUT_DOUBLE ; > ;
             < "������" ; CHRDLG_STRIKEOUT_BOLD ; > ;
-            < "� /" ; CHRDLG_STRIKEOUT_SLASH ; > ;
-            < "� X" ; CHRDLG_STRIKEOUT_X ; > ;
+            < "��������: /" ; CHRDLG_STRIKEOUT_SLASH ; > ;
+            < "��������: X" ; CHRDLG_STRIKEOUT_X ; > ;
         };
         StringList [ greek ] =
         {
@@ -2269,11 +2270,11 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         StringList [ korean ] =
         {
             < "(없음)" ; CHRDLG_STRIKEOUT_NONE ; > ;
-            < "보통" ; CHRDLG_STRIKEOUT_SINGLE ; > ;
+            < "단일선" ; CHRDLG_STRIKEOUT_SINGLE ; > ;
             < "이중" ; CHRDLG_STRIKEOUT_DOUBLE ; > ;
-            < "굵은" ; CHRDLG_STRIKEOUT_BOLD ; > ;
-            < "함께 /" ; CHRDLG_STRIKEOUT_SLASH ; > ;
-            < "함께 X" ; CHRDLG_STRIKEOUT_X ; > ;
+            < "굵게" ; CHRDLG_STRIKEOUT_BOLD ; > ;
+            < "/ 로" ; CHRDLG_STRIKEOUT_SLASH ; > ;
+            < "X 로" ; CHRDLG_STRIKEOUT_X ; > ;
         };
         StringList [ chinese_simplified ] =
         {
@@ -2323,11 +2324,11 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         StringList [ finnish ] =
         {
             < "(Ilman)" ; CHRDLG_STRIKEOUT_NONE ; > ;
-            < "Yksitt�inen" ; CHRDLG_STRIKEOUT_SINGLE ; > ;
+            < "Riviv�li 1" ; CHRDLG_STRIKEOUT_SINGLE ; > ;
             < "Kaksinkertainen" ; CHRDLG_STRIKEOUT_DOUBLE ; > ;
-            < "Lihavointi" ; CHRDLG_STRIKEOUT_BOLD ; > ;
-            < "Kenoviivoilla" ; CHRDLG_STRIKEOUT_SLASH ; > ;
-            < "X-kirjaimilla" ; CHRDLG_STRIKEOUT_X ; > ;
+            < "Lihavoitu" ; CHRDLG_STRIKEOUT_BOLD ; > ;
+            < "Sek� /" ; CHRDLG_STRIKEOUT_SLASH ; > ;
+            < "X:n kanssa" ; CHRDLG_STRIKEOUT_X ; > ;
         };
     StringList [ thai ] =
     {
@@ -2359,13 +2360,13 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         Text[ polish ] = "Tylko s�owa";
         Text[ portuguese_brazilian ] = "Individual words";
         Text[ japanese ] = "単語ごとにする(~W)";
-        Text[ korean ] = "단어씩(~W)";
+        Text[ korean ] = "한 단어 마다(~W)";
         Text[ chinese_simplified ] = "逐字(~W)";
         Text[ chinese_traditional ] = "逐字(~W)";
         Text[ turkish ] = "Individual words";
         Text[ arabic ] = "������� ���";
         Text[ catalan ] = "~Paraules individuals";
-        Text[ finnish ] = "~Yksitt�iset sanat";
+        Text[ finnish ] = "Yksitt�iset ~sanat";
         Text[ thai ] = "~คำเฉพาะ";
     };
     FixedText FT_EMPHASIS
@@ -2382,18 +2383,18 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         Text[ french ] = "Caract�res d'a~ccentuation";
         Text[ spanish ] = "Caracteres de acentuaci�n";
         Text[ italian ] = "Carattere di accentua~zione";
-        Text[ danish ] = "~Fremh�vningstegn";
+        Text[ danish ] = "Fre~mh�vningstegn";
         Text[ swedish ] = "~Betoningstecken";
         Text[ polish ] = "Znak intonacji";
         Text[ portuguese_brazilian ] = "Emphasis character";
         Text[ japanese ] = "強調に用いる記号(~H)";
-        Text[ korean ] = "강세 글꼴(~H)";
+        Text[ korean ] = "강조 표시(~H)";
         Text[ chinese_simplified ] = "重音符(~H)";
         Text[ chinese_traditional ] = "重音符號(~H)";
         Text[ turkish ] = "Emphasis character";
         Text[ arabic ] = "���� �����";
         Text[ catalan ] = "Car�cter ~emf�tic";
-        Text[ finnish ] = "~Korostusmerkki";
+        Text[ finnish ] = "Korostus~merkki";
         Text[ thai ] = "เครื่องหมายเ~น้น";
     };
     ListBox LB_EMPHASIS
@@ -2421,11 +2422,11 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         };
         StringList [ language_user1 ] =
         {
-            < "(ohne)" ; default ; > ;
-            < "Punkt" ; default ; > ;
-            < "Kreis" ; default ; > ;
-            < "Scheibe" ; default ; > ;
-            < "Akzent" ; default ; > ;
+            < "(ohn; (ohne)" ; default ; > ;
+            < "Punk; Punkt" ; default ; > ;
+            < "Krei; Kreis" ; default ; > ;
+            < "Sche; Scheibe" ; default ; > ;
+            < "Akze; Akzent" ; default ; > ;
         };
         StringList [ english_us ] =
         {
@@ -2445,9 +2446,9 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         };
         StringList [ russian ] =
         {
-            < "(���)" ; default ; > ;
+            < "(���)" ; default ; > ;
             < "�����" ; default ; > ;
-            < "������" ; default ; > ;
+            < "����" ; default ; > ;
             < "����" ; default ; > ;
             < "������" ; default ; > ;
         };
@@ -2465,7 +2466,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
             < "Punt" ; default ; > ;
             < "Cirkel" ; default ; > ;
             < "Schijf" ; default ; > ;
-            < "Accent  " ; default ; > ;
+            < "Accent" ; default ; > ;
         };
         StringList [ french ] =
         {
@@ -2581,8 +2582,8 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         };
         StringList [ finnish ] =
         {
-            < "(Ei mit��n)" ; default ; > ;
-            < "Pilkku" ; default ; > ;
+            < "(ilman)" ; default ; > ;
+            < "Piste" ; default ; > ;
             < "Ympyr�" ; default ; > ;
             < "Levy" ; default ; > ;
             < "Aksentti" ; default ; > ;
@@ -2604,7 +2605,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         Text [ ENGLISH ] = "~Position" ;
         Text [ english_us ] = "Position" ;
         Text[ portuguese ] = "~Posi��o";
-        Text[ russian ] = "�������";
+        Text[ russian ] = "���������";
         Text[ greek ] = "����";
         Text[ dutch ] = "~Positie";
         Text[ french ] = "Position";
@@ -2643,8 +2644,8 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         };
         StringList [ language_user1 ] =
         {
-            < "�ber Text" ; CHRDLG_POSITION_OVER ; > ;
-            < "Unter Text" ; CHRDLG_POSITION_UNDER ; > ;
+            < "�be; �ber Text" ; CHRDLG_POSITION_OVER ; > ;
+            < "Unte; Unter Text" ; CHRDLG_POSITION_UNDER ; > ;
         };
         StringList [ portuguese ] =
         {
@@ -2791,7 +2792,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         Text [ ENGLISH ] = "~Effects" ;
         Text [ english_us ] = "Effects" ;
         Text[ portuguese ] = "~Efeitos";
-        Text[ russian ] = "������� ���������";
+        Text[ russian ] = "�������";
         Text[ greek ] = "���";
         Text[ dutch ] = "~Effecten";
         Text[ french ] = "~Attributs";
@@ -2842,11 +2843,11 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         };
         StringList [ language_user1 ] =
         {
-            < "Keine" ; Default ; > ;
-            < "Versalien" ; Default ; > ;
-            < "Gemeine" ; Default ; > ;
-            < "Titelschrift" ; Default ; > ;
-            < "Kapit?lchen" ; Default ; > ;
+            < "Kein; Keine" ; Default ; > ;
+            < "Vers; Versalien" ; Default ; > ;
+            < "Geme; Gemeine" ; Default ; > ;
+            < "Tite; Titelschrift" ; Default ; > ;
+            < "Kapi; Kapit?lchen" ; Default ; > ;
         };
         StringList [ portuguese ] =
         {
@@ -2858,10 +2859,10 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         };
         StringList [ russian ] =
         {
-            < "(���)" ; Default ; > ;
+            < "(���)" ; Default ; > ;
             < "���������" ; Default ; > ;
             < "��������" ; Default ; > ;
-            < "��������� �����" ; Default ; > ;
+            < "���������" ; Default ; > ;
             < "��������" ; Default ; > ;
         };
         StringList [ greek ] =
@@ -2877,7 +2878,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
             < "(Zonder)" ; Default ; > ;
             < "Hoofdletters" ; Default ; > ;
             < "Kleine letters" ; Default ; > ;
-            < "Titel" ; Default ; > ;
+            < "Lettertype titel" ; Default ; > ;
             < "Klein-kapitaal" ; Default ; > ;
         };
         StringList [ french ] =
@@ -2946,7 +2947,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         };
         StringList [ korean ] =
         {
-            < "없음" ; Default ; > ;
+            < "(없음)" ; Default ; > ;
             < "대문자" ; Default ; > ;
             < "소문자" ; Default ; > ;
             < "제목" ; Default ; > ;
@@ -2994,11 +2995,11 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         };
         StringList [ finnish ] =
         {
-            < "Ei mit��n" ; Default ; > ;
+            < "(ilman)" ; Default ; > ;
             < "Isot kirjaimet" ; Default ; > ;
             < "Pienet kirjaimet" ; Default ; > ;
             < "Otsikko" ; Default ; > ;
-            < "Pienet alkukirjaimet" ; Default ; > ;
+            < "Kapiteelikirjaimet" ; Default ; > ;
         };
     StringList [ thai ] =
     {
@@ -3017,7 +3018,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         Text [ ENGLISH ] = "~Relief" ;
         Text[ english_us ] = "~Relief";
         Text[ portuguese ] = "~Relevo";
-        Text[ russian ] = "������";
+        Text[ russian ] = "���~���";
         Text[ greek ] = "A�������";
         Text[ dutch ] = "~Reli�f";
         Text[ french ] = "Relief";
@@ -3056,9 +3057,9 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         };
         StringList [ language_user1 ] =
         {
-            < "Keine" ; Default ; > ;
-            < "Erhaben" ; Default ; > ;
-            < "Vertieft" ; Default ; > ;
+            < "Kein; Keine" ; Default ; > ;
+            < "Erha; Erhaben" ; Default ; > ;
+            < "Vert; Vertieft" ; Default ; > ;
         };
         StringList [ english_us ] =
         {
@@ -3074,7 +3075,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         };
         StringList [ russian ] =
         {
-            < "(���)" ; Default ; > ;
+            < "(���)" ; Default ; > ;
             < "��������" ; Default ; > ;
             < "����������" ; Default ; > ;
         };
@@ -3100,7 +3101,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         {
             < "(Ninguno)" ; Default ; > ;
             < "Saliente" ; Default ; > ;
-            < "Ahondado" ; Default ; > ;
+            < "Grabado" ; Default ; > ;
         };
         StringList [ italian ] =
         {
@@ -3140,9 +3141,9 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         };
         StringList [ korean ] =
         {
-            < "없음" ; Default ; > ;
-            < "돌출" ; Default ; > ;
-            < "홈" ; Default ; > ;
+            < "(없음)" ; Default ; > ;
+            < "돌출 효과" ; Default ; > ;
+            < "오목 효과" ; Default ; > ;
         };
         StringList [ chinese_simplified ] =
         {
@@ -3176,8 +3177,8 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         };
         StringList [ finnish ] =
         {
-            < "Ei mit��n" ; Default ; > ;
-            < "Kohokuvioitu" ; Default ; > ;
+            < "(ilman)" ; Default ; > ;
+            < "Korkokuva" ; Default ; > ;
             < "Kaiverrettu" ; Default ; > ;
         };
     StringList [ thai ] =
@@ -3206,7 +3207,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         Text[ polish ] = "Kontur";
         Text[ portuguese_brazilian ] = "Outline";
         Text[ japanese ] = "中抜き";
-        Text[ korean ] = "윤곽";
+        Text[ korean ] = "외곽선";
         Text[ chinese_simplified ] = "轮廓";
         Text[ chinese_traditional ] = "輪廓";
         Text[ turkish ] = "Outline";
@@ -3234,16 +3235,16 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         Text[ polish ] = "Cie�";
         Text[ portuguese_brazilian ] = "Shadow";
         Text[ japanese ] = "影";
-        Text[ korean ] = "음영";
+        Text[ korean ] = "그림자";
         Text[ chinese_simplified ] = "阴影";
         Text[ chinese_traditional ] = "陰影";
         Text[ turkish ] = "Shadow";
         Text[ arabic ] = "��";
         Text[ catalan ] = "Ombra";
-        Text[ finnish ] = "Varjo ";
+        Text[ finnish ] = "Varjo";
         Text[ thai ] = "แรเงา";
     };
-    CheckBox CB_BLINKING
+    TriStateBox CB_BLINKING
     {
         Pos = MAP_APPFONT ( 166 , 92 ) ;
         Size = MAP_APPFONT ( 82 , 10 ) ;
@@ -3256,14 +3257,14 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         Text[ greek ] = "��� �~���";
         Text[ dutch ] = "~Knipperend";
         Text[ french ] = "Clignotant";
-        Text[ spanish ] = "Intermitente";
+        Text[ spanish ] = "~Intermitente";
         Text[ italian ] = "La~mpeggiante";
         Text[ danish ] = "B~linkende";
         Text[ swedish ] = "B~linkande";
         Text[ polish ] = "Miganie";
         Text[ portuguese_brazilian ] = "Blinking";
         Text[ japanese ] = "点滅(~B)";
-        Text[ korean ] = "점멸(~B)";
+        Text[ korean ] = "깜박임 효과(~B)";
         Text[ chinese_simplified ] = "闪动的(~B)";
         Text[ chinese_traditional ] = "閃動(~B)";
         Text[ turkish ] = "Blinking";
@@ -3276,7 +3277,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     {
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 129 ) ;
-        Size = MAP_APPFONT ( 248 , 39 ) ;
+        Size = MAP_APPFONT ( 248 , 37 ) ;
         Text = "Beispiel";
         Text [ english_us ] = "Example";
         Text[ portuguese ] = "Exemplo";
@@ -3302,8 +3303,9 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     FixedText FT_EFFECTS_FONTTYPE
     {
-        Pos = MAP_APPFONT ( 6 , 171  ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
+        Pos = MAP_APPFONT ( 6 , 168 ) ;
+        Size = MAP_APPFONT ( 248 , 16 ) ;
+        WordBreak = TRUE ;
     };
     String STR_EFFECTS_CAPITALS
     {
@@ -3360,9 +3362,9 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         Text = "Titelschrift";
         Text [ english_us ] = "Title" ;
         Text[ portuguese ] = "Caracteres do t�tulo";
-        Text[ russian ] = "��������� �����";
+        Text[ russian ] = "���������";
         Text[ greek ] = "������";
-        Text[ dutch ] = "Titel";
+        Text[ dutch ] = "Lettertype titel";
         Text[ french ] = "Caract�res du titre";
         Text[ spanish ] = "T�tulo";
         Text[ italian ] = "Titolo";
@@ -3402,7 +3404,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         Text[ turkish ] = "Small Capitals";
         Text[ arabic ] = "��� ����� ����";
         Text[ catalan ] = "Maj�scules petites";
-        Text[ finnish ] = "Pienet alkukirjaimet";
+        Text[ finnish ] = "Kapiteelikirjaimet";
         Text[ thai ] = "ตัวพิมพ์เล็ก";
     };
     String STR_EFFECTS_OUTLINE
@@ -3421,7 +3423,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         Text[ polish ] = "Kontur";
         Text[ portuguese_brazilian ] = "Outline";
         Text[ japanese ] = "中抜き";
-        Text[ korean ] = "윤곽";
+        Text[ korean ] = "외곽선";
         Text[ chinese_simplified ] = "轮廓";
         Text[ chinese_traditional ] = "輪廓";
         Text[ turkish ] = "Outline";
@@ -3446,13 +3448,13 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         Text[ polish ] = "Cie�";
         Text[ portuguese_brazilian ] = "Shadow";
         Text[ japanese ] = "影";
-        Text[ korean ] = "음영";
+        Text[ korean ] = "그림자";
         Text[ chinese_simplified ] = "阴影";
         Text[ chinese_traditional ] = "陰影";
         Text[ turkish ] = "Shadow";
         Text[ arabic ] = "��";
         Text[ catalan ] = "Ombra";
-        Text[ finnish ] = "Varjo ";
+        Text[ finnish ] = "Va~rjo";
         Text[ thai ] = "แรเงา";
     };
     String STR_EFFECTS_BLINKING
@@ -3471,7 +3473,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         Text[ polish ] = "Miganie";
         Text[ portuguese_brazilian ] = "Blinking";
         Text[ japanese ] = "点滅";
-        Text[ korean ] = "점멸";
+        Text[ korean ] = "깜박임 효과";
         Text[ chinese_simplified ] = "闪动的";
         Text[ chinese_traditional ] = "閃動";
         Text[ turkish ] = "Blinking";
@@ -3522,7 +3524,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
         Text = "Position";
         Text [ english_us ] = "Position" ;
         Text[ portuguese ] = "Posi��o";
-        Text[ russian ] = "���������";
+        Text[ russian ] = "�������� �� ������";
         Text[ greek ] = "����";
         Text[ dutch ] = "Positie";
         Text[ french ] = "Position";
@@ -3551,9 +3553,9 @@ TabPage RID_SVXPAGE_CHAR_POSITION
         Text [ english_us ] = "Superscript" ;
         TabStop = TRUE;
         Text[ portuguese ] = "S~uperior � linha";
-        Text[ russian ] = "������� ������";
+        Text[ russian ] = "�����";
         Text[ greek ] = "�������";
-        Text[ dutch ] = "S~upercript";
+        Text[ dutch ] = "S~uperscript";
         Text[ french ] = "Exposant";
         Text[ spanish ] = "Super�ndice";
         Text[ italian ] = "~Apice";
@@ -3568,7 +3570,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
         Text[ turkish ] = "Super";
         Text[ arabic ] = "�����";
         Text[ catalan ] = "Super�ndex";
-        Text[ finnish ] = "Yl�puolella";
+        Text[ finnish ] = "Yl�indeksi";
         Text[ thai ] = "ตัวยก";
     };
     RadioButton RB_NORMALPOS
@@ -3580,9 +3582,9 @@ TabPage RID_SVXPAGE_CHAR_POSITION
         Text [ english_us ] = "Normal" ;
         TabStop = TRUE;
         Text[ portuguese ] = "~Normal";
-        Text[ russian ] = "��������";
+        Text[ russian ] = "���";
         Text[ greek ] = "��~������";
-        Text[ dutch ] = "~Normal";
+        Text[ dutch ] = "Sta~ndaard";
         Text[ french ] = "~Normal";
         Text[ spanish ] = "Normal";
         Text[ italian ] = "Normale";
@@ -3609,9 +3611,9 @@ TabPage RID_SVXPAGE_CHAR_POSITION
         Text [ english_us ] = "Subscript" ;
         TabStop = TRUE;
         Text[ portuguese ] = "A~baixo";
-        Text[ russian ] = "������ ������";
+        Text[ russian ] = "����";
         Text[ greek ] = "����~���";
-        Text[ dutch ] = "S~ub";
+        Text[ dutch ] = "Su~b";
         Text[ french ] = "~Indice";
         Text[ spanish ] = "Sub�ndice";
         Text[ italian ] = "P~edice";
@@ -3626,7 +3628,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
         Text[ turkish ] = "Sub";
         Text[ arabic ] = "�����";
         Text[ catalan ] = "Sub�ndex";
-        Text[ finnish ] = "Alapuolella";
+        Text[ finnish ] = "Alaindeksi";
         Text[ thai ] = "ตัวห้อย";
     };
     FixedText FT_HIGHLOW
@@ -3637,9 +3639,9 @@ TabPage RID_SVXPAGE_CHAR_POSITION
         Text [ ENGLISH ] = "~Raise/lower by" ;
         Text [ english_us ] = "~Raise/lower by" ;
         Text[ portuguese ] = "~Superior/Inferior em";
-        Text[ russian ] = "����/���� ��";
+        Text[ russian ] = "�������� ��";
         Text[ greek ] = "����/���� ����";
-        Text[ dutch ] = "S~upercript/subscript met";
+        Text[ dutch ] = "~Superscript/subscript met";
         Text[ french ] = "Exposant/indice �";
         Text[ spanish ] = "Super/sub�ndice";
         Text[ italian ] = "Apice/Pedice di";
@@ -3648,13 +3650,13 @@ TabPage RID_SVXPAGE_CHAR_POSITION
         Text[ polish ] = "Ind.gr./Ind.dln. przy";
         Text[ portuguese_brazilian ] = "Raise/lower by";
         Text[ japanese ] = "上/下の割合(~R)";
-        Text[ korean ] = "높게/낮게, 정도(~R)";
+        Text[ korean ] = "올림/내림 설정(~R)";
         Text[ chinese_simplified ] = "上升/下降值(~R)";
         Text[ chinese_traditional ] = "上昇/下降值(~R)";
         Text[ turkish ] = "Raise/lower by";
         Text[ arabic ] = "�����/����� ������";
         Text[ catalan ] = "Augment/disminuci� de";
-        Text[ finnish ] = "Nosta/laske";
+        Text[ finnish ] = "~Nosta / laske";
         Text[ thai ] = "~ขึ้น/ลงโดย";
     };
     MetricField ED_HIGHLOW
@@ -3684,7 +3686,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
         Text[ portuguese ] = "A~utom�tico";
         Text[ russian ] = "�������������";
         Text[ greek ] = "�~�������";
-        Text[ dutch ] = "A~utomatisch";
+        Text[ dutch ] = "Au~tomatisch";
         Text[ french ] = "Automatique";
         Text[ spanish ] = "Autom�tico";
         Text[ italian ] = "A~utomatico";
@@ -3710,7 +3712,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
         Text [ ENGLISH ] = "R~elative font size" ;
         Text [ english_us ] = "Relative font size" ;
         Text[ portuguese ] = "Ta~manho relativo";
-        Text[ russian ] = "������ �����.";
+        Text[ russian ] = "������ ������";
         Text[ greek ] = "������� ��������~������ �������";
         Text[ dutch ] = "~Relatieve schriftgrootte";
         Text[ french ] = "~Taille relative";
@@ -3721,7 +3723,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
         Text[ polish ] = "Wzgl. rozm. czcionki";
         Text[ portuguese_brazilian ] = "Relative font size";
         Text[ japanese ] = "相対フォントサイズ";
-        Text[ korean ] = "글꼴 크기, 상대적";
+        Text[ korean ] = "글꼴 크기에 비례하여";
         Text[ chinese_simplified ] = "相对的字体大小";
         Text[ chinese_traditional ] = "相對的字型大小";
         Text[ turkish ] = "Relative font size";
@@ -3764,7 +3766,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
         Text[ polish ] = "Rotacja / Skalowanie";
         Text[ portuguese_brazilian ] = "Rotation / scaling";
         Text[ japanese ] = "回転と倍率";
-        Text[ korean ] = "회전 / 배율";
+        Text[ korean ] = "회전 및 배율";
         Text[ chinese_simplified ] = "旋转/显示比例";
         Text[ chinese_traditional ] = "旋轉/顯示比例";
         Text[ turkish ] = "Rotation / scaling";
@@ -3791,13 +3793,13 @@ TabPage RID_SVXPAGE_CHAR_POSITION
         Text[ polish ] = "Skalowanie";
         Text[ portuguese_brazilian ] = "Scaling";
         Text[ japanese ] = "倍率";
-        Text[ korean ] = "배율";
+        Text[ korean ] = "장평";
         Text[ chinese_simplified ] = "显示比例";
         Text[ chinese_traditional ] = "顯示比例";
         Text[ turkish ] = "Scaling";
         Text[ arabic ] = "Scaling";
         Text[ catalan ] = "Redimensionament";
-        Text[ finnish ] = "Skaalataan";
+        Text[ finnish ] = "Skaalaus";
         Text[ thai ] = "สเกล";
     };
     RadioButton RB_0_DEG
@@ -3826,7 +3828,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
         Text[ turkish ] = "0 degree";
         Text[ arabic ] = "0 ����";
         Text[ catalan ] = "0 graus";
-        Text[ finnish ] = "0 astetta";
+        Text[ finnish ] = "~0 astetta";
         Text[ thai ] = "~0 องศา";
     };
     RadioButton RB_90_DEG
@@ -3855,7 +3857,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
         Text[ turkish ] = "90 degree";
         Text[ arabic ] = "90 ����";
         Text[ catalan ] = "90 graus";
-        Text[ finnish ] = "90 astetta";
+        Text[ finnish ] = "~90 astetta";
         Text[ thai ] = "~90 องศา";
     };
     RadioButton RB_270_DEG
@@ -3884,7 +3886,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
         Text[ turkish ] = "270 degree";
         Text[ arabic ] = "270 ����";
         Text[ catalan ] = "270 graus";
-        Text[ finnish ] = "270 astetta";
+        Text[ finnish ] = "~270 astetta";
         Text[ thai ] = "~270 องศา";
     };
     CheckBox CB_FIT_TO_LINE
@@ -3900,20 +3902,20 @@ TabPage RID_SVXPAGE_CHAR_POSITION
         Text[ greek ] = "���������� �� ���� �� �����";
         Text[ dutch ] = "A~anpassen aan regel";
         Text[ french ] = "Adapter � la ligne";
-        Text[ spanish ] = "Ajustar a fila";
+        Text[ spanish ] = "~Ajustar a la l�nea";
         Text[ italian ] = "Adatta alla riga";
         Text[ danish ] = "Tilpas til ~linje";
         Text[ swedish ] = "Anpassa till ~rad";
         Text[ polish ] = "Dopasuj do wiersza";
         Text[ portuguese_brazilian ] = "Fit to line";
         Text[ japanese ] = "行に合わせる";
-        Text[ korean ] = "줄에 맞추기";
+        Text[ korean ] = "줄에 맞춤";
         Text[ chinese_simplified ] = "和行对齐";
         Text[ chinese_traditional ] = "和行對齊";
         Text[ turkish ] = "Fit to line";
         Text[ arabic ] = "������ �����";
         Text[ catalan ] = "Ajusta a fila";
-        Text[ finnish ] = "Sovita riviin";
+        Text[ finnish ] = "Sovita riville";
         Text[ thai ] = "จัดพอดีบรรทัด";
     };
     FixedText FT_SCALE_WIDTH
@@ -3926,7 +3928,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
         Text[ portuguese ] = "E~scalar largura";
         Text[ russian ] = "������� ������";
         Text[ greek ] = "��������� �������";
-        Text[ dutch ] = "~Breedte scaleren";
+        Text[ dutch ] = "~Breedte op schaal brengen";
         Text[ french ] = "Graduer la largeur";
         Text[ spanish ] = "Tama�o del ancho";
         Text[ italian ] = "Scala larghezza";
@@ -3935,13 +3937,13 @@ TabPage RID_SVXPAGE_CHAR_POSITION
         Text[ polish ] = "Skaluj szeroko��";
         Text[ portuguese_brazilian ] = "Scale width";
         Text[ japanese ] = "幅の倍率(~W)";
-        Text[ korean ] = "폭 배율(~W)";
+        Text[ korean ] = "너비 배율 조정(~W)";
         Text[ chinese_simplified ] = "宽度显示比例(~W)";
         Text[ chinese_traditional ] = "寬度顯示比例(~W)";
         Text[ turkish ] = "Scale width";
         Text[ arabic ] = "����� �����";
         Text[ catalan ] = "Amplada de l'escala";
-        Text[ finnish ] = "Skaalaa leveys";
+        Text[ finnish ] = "Skaalaa ~leveys";
         Text[ thai ] = "สเกลความ~กว้าง";
     };
     MetricField MF_SCALE_WIDTH
@@ -3969,7 +3971,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
         Text[ portuguese ] = "Espa�amento";
         Text[ russian ] = "��������";
         Text[ greek ] = "��������";
-        Text[ dutch ] = "Spati�ring";
+        Text[ dutch ] = "Kerning";
         Text[ french ] = "Espacement";
         Text[ spanish ] = "Espacios";
         Text[ italian ] = "Spaziatura";
@@ -3978,13 +3980,13 @@ TabPage RID_SVXPAGE_CHAR_POSITION
         Text[ polish ] = "Odst�py";
         Text[ portuguese_brazilian ] = "Spacing";
         Text[ japanese ] = "文字間隔";
-        Text[ korean ] = "간격";
+        Text[ korean ] = "자간";
         Text[ chinese_simplified ] = "间隔";
         Text[ chinese_traditional ] = "間隔";
         Text[ turkish ] = "Spacing";
         Text[ arabic ] = "����� ������";
         Text[ catalan ] = "Espaiat";
-        Text[ finnish ] = "Objektiv�lit";
+        Text[ finnish ] = "V�lit";
         Text[ thai ] = "ระยะห่าง";
     };
     ListBox LB_KERNING2
@@ -4007,9 +4009,9 @@ TabPage RID_SVXPAGE_CHAR_POSITION
         };
         StringList [ language_user1 ] =
         {
-            < "Standard" ; Default ; > ;
-            < "Gesperrt" ; Default ; > ;
-            < "Schmal" ; Default ; > ;
+            < "Stan; Standard" ; Default ; > ;
+            < "Gesp; Gesperrt" ; Default ; > ;
+            < "Schm; Schmal" ; Default ; > ;
         };
         StringList [ portuguese ] =
         {
@@ -4019,7 +4021,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
         };
         StringList [ russian ] =
         {
-            < "��������" ; Default ; > ;
+            < "�������" ; Default ; > ;
             < "�����������" ; Default ; > ;
             < "�����������" ; Default ; > ;
         };
@@ -4085,8 +4087,8 @@ TabPage RID_SVXPAGE_CHAR_POSITION
         };
         StringList [ korean ] =
         {
-            < "기본" ; Default ; > ;
-            < "장평" ; Default ; > ;
+            < "기본값" ; Default ; > ;
+            < "넓게" ; Default ; > ;
             < "좁게" ; Default ; > ;
         };
         StringList [ chinese_simplified ] =
@@ -4121,7 +4123,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
         };
         StringList [ finnish ] =
         {
-            < "Oletusarvo" ; Default ; > ;
+            < "Oletus" ; Default ; > ;
             < "Laajennettu" ; Default ; > ;
             < "Tiivistetty" ; Default ; > ;
         };
@@ -4158,7 +4160,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
         Text[ turkish ] = "by";
         Text[ arabic ] = "������";
         Text[ catalan ] = "per";
-        Text[ finnish ] = "/";
+        Text[ finnish ] = "~et�isyys";
         Text[ thai ] = "โด~ย";
     };
     MetricField ED_KERNING2
@@ -4183,9 +4185,9 @@ TabPage RID_SVXPAGE_CHAR_POSITION
         Text [ english_us ] = "~Pair kerning" ;
         TabStop = TRUE;
         Text[ portuguese ] = "~Kerning de pares";
-        Text[ russian ] = "~�������� �������";
+        Text[ russian ] = "~������ �������";
         Text[ greek ] = "������������� ��� �����";
-        Text[ dutch ] = "~Paarwijze Kerning";
+        Text[ dutch ] = "~Paarsgewijze kerning";
         Text[ french ] = "~Cr�nage pair";
         Text[ spanish ] = "~Ajuste par entre caracteres";
         Text[ italian ] = "Crenatura caratteri a coppia";
@@ -4194,13 +4196,13 @@ TabPage RID_SVXPAGE_CHAR_POSITION
         Text[ polish ] = "Kerning w parze";
         Text[ portuguese_brazilian ] = "~Pair kerning";
         Text[ japanese ] = "文字組みのカーニング(~P)";
-        Text[ korean ] = "커닝, 쌍(~P)";
+        Text[ korean ] = "글꼴 커닝(~P)";
         Text[ chinese_simplified ] = "字母间隔相等(~P)";
         Text[ chinese_traditional ] = "字母間隔相等(~P)";
         Text[ turkish ] = "~Pair kerning";
         Text[ arabic ] = "����� ���� ����";
         Text[ catalan ] = "Interlletratge ~parell";
-        Text[ finnish ] = "~Parilimitys";
+        Text[ finnish ] = "~Pariv�listys";
         Text[ thai ] = "ปรับระยะห่าง~คู่";
     };
     Window WIN_POS_PREVIEW
@@ -4209,7 +4211,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
         Text [ english_us ] = "Example" ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 129 ) ;
-        Size = MAP_APPFONT ( 248 , 39 ) ;
+        Size = MAP_APPFONT ( 248 , 37 ) ;
         Text[ portuguese ] = "Exemplo";
         Text[ russian ] = "������";
         Text[ greek ] = "����������";
@@ -4233,8 +4235,9 @@ TabPage RID_SVXPAGE_CHAR_POSITION
     };
     FixedText FT_POS_FONTTYPE
     {
-        Pos = MAP_APPFONT ( 6 , 171  ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
+        Pos = MAP_APPFONT ( 6 , 168 ) ;
+        Size = MAP_APPFONT ( 248 , 16 ) ;
+        WordBreak = TRUE ;
     };
 };
 
@@ -4261,7 +4264,7 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
         Text[ polish ] = "Dwa wiersze";
         Text[ portuguese_brazilian ] = "Two lines";
         Text[ japanese ] = "2行使い";
-        Text[ korean ] = "두 행";
+        Text[ korean ] = "2줄";
         Text[ chinese_simplified ] = "双行";
         Text[ chinese_traditional ] = "雙行";
         Text[ turkish ] = "Two lines";
@@ -4279,7 +4282,7 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
         Text [ english_us ] = "~Write in double lines" ;
         TabStop = TRUE;
         Text[ portuguese ] = "~Linhas duplas";
-        Text[ russian ] = "��� ������ � �����";
+        Text[ russian ] = "����� � ��� ������";
         Text[ greek ] = "~�������� �������";
         Text[ dutch ] = "T~wee regels per rij";
         Text[ french ] = "~Deux lignes en une pour l'�criture";
@@ -4290,13 +4293,13 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
         Text[ polish ] = "Pisz w dw�ch wierszach";
         Text[ portuguese_brazilian ] = "Two lines each line";
         Text[ japanese ] = "1行を2行使いにする(~W)";
-        Text[ korean ] = "매 행당 두 행 쓰기(~W)";
+        Text[ korean ] = "두 줄을 한 줄 높이로 쓰기(~W)";
         Text[ chinese_simplified ] = "用一行的空间输入两行字(~W)";
         Text[ chinese_traditional ] = "用一行的空間輸入兩行字(~W)";
         Text[ turkish ] = "Two lines each line";
         Text[ arabic ] = "������� �� �����";
         Text[ catalan ] = "Dos l�nies per rengla";
-        Text[ finnish ] = "~K�yt� kaksoisviivoja";
+        Text[ finnish ] = "K�yt� ~kaksoisviivoja";
         Text[ thai ] = "เ~ขียนในบรรทัดคู่";
     };
     FixedLine FL_ENCLOSE
@@ -4306,7 +4309,7 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
         Text = "Einschlie�ende Zeichen";
         Text [ english_us ] = "Enclosing character" ;
         Text[ portuguese ] = "Caracteres de inclus�o";
-        Text[ russian ] = "���������� �����";
+        Text[ russian ] = "����������� �������";
         Text[ greek ] = "�������������� ����������";
         Text[ dutch ] = "Omhullend teken";
         Text[ french ] = "Caract�res d'encadrement";
@@ -4317,7 +4320,7 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
         Text[ polish ] = "Znaki wiod�ce i ko�cowe";
         Text[ portuguese_brazilian ] = "Enclose character";
         Text[ japanese ] = "かっこ記号";
-        Text[ korean ] = "원 문자";
+        Text[ korean ] = "원문자";
         Text[ chinese_simplified ] = "带括号的字符";
         Text[ chinese_traditional ] = "帶括號的字元";
         Text[ turkish ] = "Enclose character";
@@ -4333,7 +4336,7 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
         Text = "A~nfangszeichen";
         Text [ english_us ] = "I~nitial character" ;
         Text[ portuguese ] = "Car�cter i~nicial";
-        Text[ russian ] = "��������� �����";
+        Text[ russian ] = "��������� ������";
         Text[ greek ] = "������� ����������";
         Text[ dutch ] = "~Eerste teken";
         Text[ french ] = "Caract�re de ~d�but";
@@ -4379,12 +4382,12 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
         };
         StringList [ language_user1 ] =
         {
-            < "(Keines)" ; CHRDLG_ENCLOSE_NONE ; > ;
+            < "(Kei; (Keines)" ; CHRDLG_ENCLOSE_NONE ; > ;
             < "(" ; CHRDLG_ENCLOSE_ROUND ; > ;
             < "[" ; CHRDLG_ENCLOSE_SQUARE ; > ;
             < "<" ; CHRDLG_ENCLOSE_POINTED ; > ;
             < "{" ; CHRDLG_ENCLOSE_CURVED ; > ;
-            < "Weitere Zeichen..." ; CHRDLG_ENCLOSE_SPECIAL_CHAR ; > ;
+            < "Weit; Weitere Zeichen..." ; CHRDLG_ENCLOSE_SPECIAL_CHAR ; > ;
         };
         StringList [ portuguese ] =
         {
@@ -4397,12 +4400,12 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
         };
         StringList [ russian ] =
         {
-            < "(���)" ; CHRDLG_ENCLOSE_NONE ; > ;
+            < "(���)" ; CHRDLG_ENCLOSE_NONE ; > ;
             < "(" ; CHRDLG_ENCLOSE_ROUND ; > ;
             < "[" ; CHRDLG_ENCLOSE_SQUARE ; > ;
             < "<" ; CHRDLG_ENCLOSE_POINTED ; > ;
             < "{" ; CHRDLG_ENCLOSE_CURVED ; > ;
-            < "������ �����..." ; CHRDLG_ENCLOSE_SPECIAL_CHAR ; > ;
+            < "������ �������..." ; CHRDLG_ENCLOSE_SPECIAL_CHAR ; > ;
         };
         StringList [ greek ] =
         {
@@ -4555,7 +4558,7 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
             < "[" ; CHRDLG_ENCLOSE_SQUARE ; > ;
             < "<" ; CHRDLG_ENCLOSE_POINTED ; > ;
             < "{" ; CHRDLG_ENCLOSE_CURVED ; > ;
-            < "Muut merkit" ; CHRDLG_ENCLOSE_SPECIAL_CHAR ; > ;
+            < "Muut merkit..." ; CHRDLG_ENCLOSE_SPECIAL_CHAR ; > ;
         };
     StringList [ thai ] =
     {
@@ -4569,7 +4572,7 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
         Text = "~Endzeichen";
         Text [ english_us ] = "Final charact~er" ;
         Text[ portuguese ] = "Car�cter ~final";
-        Text[ russian ] = "�������� �����";
+        Text[ russian ] = "�������� ������";
         Text[ greek ] = "�~������ ����������";
         Text[ dutch ] = "~Laatste teken";
         Text[ french ] = "Caract�re de ~fin";
@@ -4615,12 +4618,12 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
         };
         StringList [ language_user1 ] =
         {
-            < "(Keines)" ; CHRDLG_ENCLOSE_NONE ; > ;
+            < "(Kei; (Keines)" ; CHRDLG_ENCLOSE_NONE ; > ;
             < ")" ; CHRDLG_ENCLOSE_ROUND ; > ;
             < "]" ; CHRDLG_ENCLOSE_SQUARE ; > ;
             < ">" ; CHRDLG_ENCLOSE_POINTED ; > ;
             < "}" ; CHRDLG_ENCLOSE_CURVED ; > ;
-            < "Weitere Zeichen..." ; CHRDLG_ENCLOSE_SPECIAL_CHAR ; > ;
+            < "Weit; Weitere Zeichen..." ; CHRDLG_ENCLOSE_SPECIAL_CHAR ; > ;
         };
         StringList [ portuguese ] =
         {
@@ -4633,12 +4636,12 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
         };
         StringList [ russian ] =
         {
-            < "(���)" ; CHRDLG_ENCLOSE_NONE ; > ;
+            < "(���)" ; CHRDLG_ENCLOSE_NONE ; > ;
             < ")" ; CHRDLG_ENCLOSE_ROUND ; > ;
             < "]" ; CHRDLG_ENCLOSE_SQUARE ; > ;
             < ">" ; CHRDLG_ENCLOSE_POINTED ; > ;
             < "}" ; CHRDLG_ENCLOSE_CURVED ; > ;
-            < "������ �����..." ; CHRDLG_ENCLOSE_SPECIAL_CHAR ; > ;
+            < "������ �������..." ; CHRDLG_ENCLOSE_SPECIAL_CHAR ; > ;
         };
         StringList [ greek ] =
         {
@@ -4791,7 +4794,7 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
             < "]" ; CHRDLG_ENCLOSE_SQUARE ; > ;
             < ">" ; CHRDLG_ENCLOSE_POINTED ; > ;
             < "}" ; CHRDLG_ENCLOSE_CURVED ; > ;
-            < "Muut merkit" ; CHRDLG_ENCLOSE_SPECIAL_CHAR ; > ;
+            < "Muut merkit..." ; CHRDLG_ENCLOSE_SPECIAL_CHAR ; > ;
         };
     StringList [ thai ] =
     {
@@ -4802,7 +4805,7 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
     {
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 129 ) ;
-        Size = MAP_APPFONT ( 248 , 39 ) ;
+        Size = MAP_APPFONT ( 248 , 37 ) ;
         Text = "Beispiel";
         Text [ english_us ] = "Example" ;
         Text[ portuguese ] = "Exemplo";
@@ -4828,11 +4831,17 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
     };
     FixedText FT_TWOLINES_FONTTYPE
     {
-        Pos = MAP_APPFONT ( 6 , 171 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
+        Pos = MAP_APPFONT ( 6 , 168 ) ;
+        Size = MAP_APPFONT ( 248 , 16 ) ;
+        WordBreak = TRUE ;
         Hide = TRUE;
     };
 };
 
  // ********************************************************************** EOF
 
+
+
+
+
+
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index db2bdf2286c9..094d43f0b3de 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: charmap.cxx,v $
  *
- *  $Revision: 1.27 $
+ *  $Revision: 1.28 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-30 10:35:49 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -91,6 +91,10 @@
 #endif
 #pragma hdrstop
 
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include <svtools/colorcfg.hxx>
+#endif
+
 #include <rtl/textenc.h>
 #include <ucsubset.hxx>
 
@@ -133,8 +137,8 @@ protected:
     virtual void    Paint( const Rectangle& );
 
 private:
-    long            nY;
-    BOOL            bCenter;
+    long            mnY;
+    BOOL            mbCenter;
 
 };
 
@@ -471,14 +475,14 @@ void SvxShowCharSet::DeSelect()
 }
 // -----------------------------------------------------------------------
 
-void SvxShowCharSet::DrawChars_Impl( int n1, int n2)
+void SvxShowCharSet::DrawChars_Impl( int n1, int n2 )
 {
     if( n1 > LastInView() || n2 < FirstInView() )
         return;
 
     Size aOutputSize = GetOutputSizePixel();
-    if( aVscrollSB.IsVisible())
-        aOutputSize.setWidth( aOutputSize.Width() - SBWIDTH);
+    if( aVscrollSB.IsVisible() )
+        aOutputSize.setWidth( aOutputSize.Width() - SBWIDTH );
 
     int i;
     for ( i = 1; i < COLUMN_COUNT; ++i )
@@ -487,25 +491,58 @@ void SvxShowCharSet::DrawChars_Impl( int n1, int n2)
         DrawLine( Point( 0, nY * i ), Point( aOutputSize.Width(), nY * i ) );
 
     const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
-    Color aWindowTextColor( rStyleSettings.GetWindowTextColor() );
+    svtools::ColorConfig aColorConfig;
+    Color aWindowTextColor( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor );
     Color aHighlightColor( rStyleSettings.GetHighlightColor() );
     Color aHighlightTextColor( rStyleSettings.GetHighlightTextColor() );
     Color aFaceColor( rStyleSettings.GetFaceColor() );
     Color aLightColor( rStyleSettings.GetLightColor() );
     Color aShadowColor( rStyleSettings.GetShadowColor() );
 
-    for ( i = n1; i <= n2; ++i)
+    for( i = n1; i <= n2; ++i )
     {
         Point pix = MapIndexToPixel( i );
         int x = pix.X();
         int y = pix.Y();
 
-        String aCharStr( MapIndexToUnicode( maFontCharMap, i ) );
-        int tx = x + ( nX - GetTextWidth(aCharStr) ) / 2;
+        sal_Unicode cChar = MapIndexToUnicode( maFontCharMap, i );
+        String aCharStr( cChar );
+        int nTextWidth = GetTextWidth(aCharStr);
+        int tx = x + ( nX - nTextWidth ) / 2;
         int ty = y + ( nY - GetTextHeight() ) / 2;
         Point aPointTxTy( tx, ty );
-        Color aTextCol = GetTextColor();
 
+        // adjust position before it gets out of bounds
+        Rectangle aBoundRect;
+        if( GetTextBoundRect( aBoundRect, aCharStr ) )
+        {
+            // zero advance width glyphs gets centered to middle
+            if( !nTextWidth )
+            {
+                aPointTxTy.X() = x - aBoundRect.Left();
+                aPointTxTy.X() += (nX - aBoundRect.GetWidth()) / 2;
+            }
+
+            aBoundRect += aPointTxTy;
+
+            // shift back vertically if needed
+            int nYLDelta = aBoundRect.Top() - y;
+            int nYHDelta = (y + nY) - aBoundRect.Bottom();
+            if( nYLDelta < 0 )
+                aPointTxTy.Y() -= nYLDelta;
+            else if( nYHDelta <= 0 )
+                aPointTxTy.Y() += nYHDelta - 1;
+
+            // shift back horizontally if needed
+            int nXLDelta = aBoundRect.Left() - x;
+            int nXHDelta = (x + nX) - aBoundRect.Right();
+            if( nXLDelta < 0 )
+                aPointTxTy.X() -= nXLDelta;
+            else if( nXHDelta <= 0 )
+                aPointTxTy.X() += nXHDelta - 1;
+        }
+
+        Color aTextCol = GetTextColor();
         if ( i != nSelectedIndex )
         {
             SetTextColor( aWindowTextColor );
@@ -555,7 +592,8 @@ void SvxShowCharSet::InitSettings( BOOL bForeground, BOOL bBackground )
 
     if ( bForeground )
     {
-        Color aTextColor = rStyleSettings.GetWindowTextColor();
+        svtools::ColorConfig aColorConfig;
+        Color aTextColor( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor );
 
         if ( IsControlForeground() )
             aTextColor = GetControlForeground();
@@ -813,9 +851,9 @@ sal_Int32 SvxShowCharSet::getMaxCharCount() const
 }
 // class SvxShowText =====================================================
 
-SvxShowText::SvxShowText( Window* pParent, const ResId& rResId, BOOL _bCenter )
+SvxShowText::SvxShowText( Window* pParent, const ResId& rResId, BOOL bCenter )
 :   Control( pParent, rResId ),
-    bCenter( _bCenter)
+    mbCenter( bCenter)
 {}
 
 // -----------------------------------------------------------------------
@@ -823,12 +861,50 @@ SvxShowText::SvxShowText( Window* pParent, const ResId& rResId, BOOL _bCenter )
 void SvxShowText::Paint( const Rectangle& )
 {
     Color aTextCol = GetTextColor();
-    SetTextColor( Application::GetSettings().GetStyleSettings().GetWindowTextColor() );
 
-    String aText = GetText();
-    Point aPoint( bCenter? ( GetOutputSizePixel().Width() - GetTextWidth( aText ) ) / 2 : 2, nY );
-    DrawText( aPoint, aText );
+    svtools::ColorConfig aColorConfig;
+    Color aWindowTextColor( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor );
+    SetTextColor( aWindowTextColor );
+
+    const String aText = GetText();
+    const Size aSize = GetOutputSizePixel();
+    Point aPoint( 2, mnY );
 
+    // adjust position before it gets out of bounds
+    Rectangle aBoundRect;
+    if( !GetTextBoundRect( aBoundRect, aText ) )
+        aPoint.X() = (aSize.Width() - GetTextWidth( aText )) / 2;
+    else
+    {
+        aBoundRect += aPoint;
+
+        // shift back vertically if needed
+        int nYLDelta = aBoundRect.Top();
+        int nYHDelta = aSize.Height() - aBoundRect.Bottom();
+        if( nYLDelta < 0 )
+            aPoint.Y() -= nYLDelta;
+        else if( nYHDelta <= 0 )
+            aPoint.Y() += nYHDelta - 1;
+
+        if( mbCenter )
+        {
+            // move left point so that glyph is in middle of cell
+            aPoint.X() = -aBoundRect.Left();
+            aPoint.X() += (aSize.Width() - aBoundRect.GetWidth()) / 2;
+        }
+        else
+        {
+            // shift back horizontally if needed
+            int nXLDelta = aBoundRect.Left();
+            int nXHDelta = aSize.Width() - aBoundRect.Right();
+            if( nXLDelta < 0 )
+                aPoint.X() -= nXLDelta;
+            else if( nXHDelta <= 0 )
+                aPoint.X() += nXHDelta - 1;
+        }
+    }
+
+    DrawText( aPoint, aText );
     SetTextColor( aTextCol );
 }
 
@@ -840,10 +916,10 @@ void SvxShowText::SetFont( const Font& rFont )
     Font aFont = rFont;
     aFont.SetWeight( WEIGHT_NORMAL );
     aFont.SetAlign( ALIGN_TOP );
-    aFont.SetSize( PixelToLogic( Size( 0, nWinHeight-6 ) ) );
+    aFont.SetSize( PixelToLogic( Size( 0, (nWinHeight*3)/4 ) ) );
     aFont.SetTransparent( TRUE );
     Control::SetFont( aFont );
-    nY = ( nWinHeight - GetTextHeight() ) / 2;
+    mnY = ( nWinHeight - GetTextHeight() ) / 2;
 
     Invalidate();
 }
@@ -1170,7 +1246,7 @@ IMPL_LINK( SvxCharMapData, CharHighlightHdl, Control *, EMPTYARG )
     if ( bSelect )
     {
         // no sprintf or hex-formatter around :-(
-        char buf[16] = "0x0000";
+        char buf[16] = "U+0000";
         sal_Unicode c_Shifted = c;
         for( int i = 0; i < 4; ++i )
         {
@@ -1179,7 +1255,7 @@ IMPL_LINK( SvxCharMapData, CharHighlightHdl, Control *, EMPTYARG )
             c_Shifted >>= 4;
         }
         if( c < 256 )
-            sprintf( buf+6, " (%d)", c );
+            snprintf( buf+6, 10, " (%d)", c );
         aTemp = String::CreateFromAscii( buf );
     }
     aCharCodeText.SetText( aTemp );
diff --git a/svx/source/dialog/charmap.src b/svx/source/dialog/charmap.src
index 1794317c5c16..99ead3642551 100644
--- a/svx/source/dialog/charmap.src
+++ b/svx/source/dialog/charmap.src
@@ -2,8 +2,8 @@
  *
  *  $RCSfile: charmap.src,v $
  *
- *  $Revision: 1.43 $
- *  last change: $Author: kz $ $Date: 2002-02-04 10:56:25 $
+ *  $Revision: 1.44 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -81,7 +81,7 @@ ModalDialog RID_SVXDLG_CHARMAP
     Text[ spanish ] = "S�mbolos";
     Text[ english_us ] = "Special Characters";
     Text[ chinese_simplified ] = "特殊字符";
-    Text[ russian ] = "����������� �������";
+    Text[ russian ] = "����� �������";
     Text[ polish ] = "Znaki specjalne";
     Text[ japanese ] = "記号と特殊文字";
     Text[ chinese_traditional ] = "特殊字元";
@@ -127,7 +127,8 @@ ModalDialog RID_SVXDLG_CHARMAP
         Text[ korean ] = "글꼴(~F)";
         Text[ turkish ] = "~Yaz�tipi";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Fuente";
+        Text[ catalan ] = "~Lletra";
+        Text[ thai ] = "~ตัวอักษร";
     };
     ListBox LB_FONT
     {
@@ -145,24 +146,25 @@ ModalDialog RID_SVXDLG_CHARMAP
         Text [ ENGLISH ] = "~Subset" ;
         Text[ english_us ] = "~Subset";
         Text[ portuguese ] = "~Subconjunto";
-        Text[ russian ] = "~����� ��������";
+        Text[ russian ] = "����� ��������";
         Text[ greek ] = "�������";
         Text[ dutch ] = "~Bereik";
-        Text[ french ] = "~Sous-ensemble";
+        Text[ french ] = "Sous-ensemble";
         Text[ spanish ] = "~�rea";
         Text[ italian ] = "Set ~caratt.";
-        Text[ danish ] = "~Subset";
+        Text[ danish ] = "~Omr�de";
         Text[ swedish ] = "~Omr�de";
         Text[ polish ] = "~Obszar";
         Text[ portuguese_brazilian ] = "~Subset";
         Text[ japanese ] = "種類(~S)";
-        Text[ korean ] = "범위(~S)";
+        Text[ korean ] = "종류(~S)";
         Text[ chinese_simplified ] = "子集(~S)";
         Text[ chinese_traditional ] = "子集(~S)";
         Text[ turkish ] = "~Subset";
         Text[ arabic ] = "������ �����";
-        Text[ catalan ] = "~�rea";
-        Text[ finnish ] = "~Alijoukko";
+        Text[ catalan ] = "~Subconjunt";
+        Text[ finnish ] = "~Osajoukko";
+        Text[ thai ] = "~สับเซต";
     };
     ListBox LB_SUBSET
     {
@@ -188,7 +190,7 @@ ModalDialog RID_SVXDLG_CHARMAP
         Text[ spanish ] = "Car�cter:";
         Text[ english_us ] = "Characters:";
         Text[ chinese_simplified ] = "字符：";
-        Text[ russian ] = "�����:";
+        Text[ russian ] = "�������:";
         Text[ polish ] = "Znaki:";
         Text[ japanese ] = "文字:";
         Text[ chinese_traditional ] = "字元：";
@@ -197,8 +199,9 @@ ModalDialog RID_SVXDLG_CHARMAP
         Text[ korean ] = "문자:";
         Text[ turkish ] = "Karakter:";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Car�cter:";
+        Text[ catalan ] = "Car�cter:";
         Text[ finnish ] = "Merkit:";
+        Text[ thai ] = "ตัวอักขระ:";
     };
 /*
     Edit CT_SHOWTEXT
@@ -257,10 +260,10 @@ ModalDialog RID_SVXDLG_CHARMAP
         Text[ portuguese_brazilian ] = "~Apagar";
         Text[ portuguese ] = "E~liminar";
         Text[ danish ] = "Slet";
-        Text[ french ] = "~Supprimer";
+        Text[ french ] = "Supprimer";
         Text[ swedish ] = "~Radera";
         Text[ dutch ] = "~Wissen";
-        Text[ spanish ] = "~Eliminar";
+        Text[ spanish ] = "~Borrar";
         Text[ english_us ] = "~Delete";
         Text[ chinese_simplified ] = "删除(~D)";
         Text[ russian ] = "�������";
@@ -272,15 +275,17 @@ ModalDialog RID_SVXDLG_CHARMAP
         Text[ korean ] = "삭제(~D)";
         Text[ turkish ] = "~Sil";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Eliminar";
+        Text[ catalan ] = "Su~primeix";
         Text[ finnish ] = "~Poista";
+        Text[ thai ] = "~ลบ";
     };
     Text[ greek ] = "������� ����������";
-    Text[ korean ] = "특수기호";
+    Text[ korean ] = "기호 및 특수문자";
     Text[ turkish ] = "�zel karakter";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "S�mbolos";
-    Text[ finnish ] = "Erikoismerkit";
+    Text[ catalan ] = "S�mbols";
+    Text[ finnish ] = "Erikoismerkki";
+    Text[ thai ] = "ตัวอักขระพิเศษ";
 };
 
 /*
@@ -302,18 +307,19 @@ String RID_SUBSETSTR_BASIC_LATIN
         Text[ french ] = "Latin de base";
         Text[ spanish ] = "Lat�n b�sico";
         Text[ italian ] = "Latino di base";
-        Text[ danish ] = "Basic Latin";
+        Text[ danish ] = "Basis Latin";
         Text[ swedish ] = "Latin (standard)";
         Text[ polish ] = "�aci�ski podstawowy";
         Text[ portuguese_brazilian ] = "Basic Latin";
         Text[ japanese ] = "基本ラテン文字";
-        Text[ korean ] = "라틴어 (기본)";
+        Text[ korean ] = "기본 라틴어";
         Text[ chinese_simplified ] = "基本拉丁文";
         Text[ chinese_traditional ] = "基本拉丁文";
         Text[ turkish ] = "Basic Latin";
         Text[ arabic ] = "������ �����";
-        Text[ catalan ] = "Lat�n b�sico";
-        Text[ finnish ] = "Latina (perus)";
+        Text[ catalan ] = "Llat� b�sic";
+        Text[ finnish ] = "Latina (perusteet)";
+        Text[ thai ] = "ภาษาลาตินพื้นฐาน";
     };
 String RID_SUBSETSTR_LATIN_1
 {
@@ -321,7 +327,7 @@ String RID_SUBSETSTR_LATIN_1
     Text [ ENGLISH ] = "Latin-1" ;
     Text[ english_us ] = "Latin-1";
         Text[ portuguese ] = "Latim-1";
-        Text[ russian ] = "���������� Latin-1";
+        Text[ russian ] = "���������-1";
         Text[ greek ] = "��������-1";
         Text[ dutch ] = "Latijn-1";
         Text[ french ] = "Latin-1";
@@ -332,13 +338,14 @@ String RID_SUBSETSTR_LATIN_1
         Text[ polish ] = "�aci�ski-1";
         Text[ portuguese_brazilian ] = "Latin-1";
         Text[ japanese ] = "ラテン文字 1";
-        Text[ korean ] = "라틴-1";
+        Text[ korean ] = "라틴어-1";
         Text[ chinese_simplified ] = "拉丁文-1";
         Text[ chinese_traditional ] = "拉丁文-1";
         Text[ turkish ] = "Latin-1";
         Text[ arabic ] = "������-1";
-        Text[ catalan ] = "Lat�n-1";
+        Text[ catalan ] = "Llat�-1";
         Text[ finnish ] = "Latina-1";
+        Text[ thai ] = "ภาษาลาติน-1";
     };
 String RID_SUBSETSTR_LATIN_EXTENDED_A
 {
@@ -352,18 +359,19 @@ String RID_SUBSETSTR_LATIN_EXTENDED_A
         Text[ french ] = "Latin �tendu-A";
         Text[ spanish ] = "Lat�n ampliado A";
         Text[ italian ] = "Latino esteso A";
-        Text[ danish ] = "Latin Extended-A";
+        Text[ danish ] = "Latin Udvidet-A";
         Text[ swedish ] = "Ut�kat latin A";
         Text[ polish ] = "�aci�ski rozszerzony-A";
         Text[ portuguese_brazilian ] = "Latin Extended-A";
         Text[ japanese ] = "ラテン拡張文字 A";
-        Text[ korean ] = "라틴어,  확장-A";
+        Text[ korean ] = "라틴어 확장-A";
         Text[ chinese_simplified ] = "拉丁文扩充 A";
         Text[ chinese_traditional ] = "拉丁文擴充-A";
         Text[ turkish ] = "Latin Extended-A";
         Text[ arabic ] = "������ �����A-";
-        Text[ catalan ] = "Lat�n ampliado A";
+        Text[ catalan ] = "Llat� ampliat A";
         Text[ finnish ] = "Latina (laajennus A)";
+        Text[ thai ] = "ขยายภาษาลาตินA";
     };
 String RID_SUBSETSTR_LATIN_EXTENDED_B
 {
@@ -377,18 +385,19 @@ String RID_SUBSETSTR_LATIN_EXTENDED_B
         Text[ french ] = "Latin �tendu-B";
         Text[ spanish ] = "Lat�n ampliado B";
         Text[ italian ] = "Latino esteso B";
-        Text[ danish ] = "Latin Extended-B";
+        Text[ danish ] = "Latin Udvidet-B";
         Text[ swedish ] = "Ut�kat latin B";
         Text[ polish ] = "�aci�ski rozszerzony-B";
         Text[ portuguese_brazilian ] = "Latin Extended-B";
         Text[ japanese ] = "ラテン拡張文字 B";
-        Text[ korean ] = "라틴어, 확장-B";
+        Text[ korean ] = "라틴어 확장 B";
         Text[ chinese_simplified ] = "拉丁文扩充 B";
         Text[ chinese_traditional ] = "拉丁文擴充-B";
         Text[ turkish ] = "Latin Extended-B";
         Text[ arabic ] = "������ �����B-";
-        Text[ catalan ] = "Lat�n ampliado B";
+        Text[ catalan ] = "Llat� ampliat B";
         Text[ finnish ] = "Latina (laajennus B)";
+        Text[ thai ] = "ขยายภาษาลาตินB";
     };
 String RID_SUBSETSTR_IPA_EXTENSIONS
 {
@@ -402,7 +411,7 @@ String RID_SUBSETSTR_IPA_EXTENSIONS
         Text[ french ] = "Extensions IPA";
         Text[ spanish ] = "Ampliaciones fon�ticas";
         Text[ italian ] = "Estensioni fonetiche";
-        Text[ danish ] = "IPA Extensions";
+        Text[ danish ] = "Lydskrift Udvidelser";
         Text[ swedish ] = "IPA-ut�kningar";
         Text[ polish ] = "Rozszerzenia IPA";
         Text[ portuguese_brazilian ] = "IPA Extensions";
@@ -412,8 +421,9 @@ String RID_SUBSETSTR_IPA_EXTENSIONS
         Text[ chinese_traditional ] = "國際音標";
         Text[ turkish ] = "IPA Extensions";
         Text[ arabic ] = "������IPA ";
-        Text[ catalan ] = "Ampliaciones fon�ticas";
+        Text[ catalan ] = "Extensions de l'IPA";
         Text[ finnish ] = "IPA-laajennukset";
+        Text[ thai ] = "ส่วนขยาย IPA ";
     };
 String RID_SUBSETSTR_SPACING_MODIFIERS
 {
@@ -421,13 +431,13 @@ String RID_SUBSETSTR_SPACING_MODIFIERS
     Text [ ENGLISH ] = "Spacing Modifier Letters" ;
     Text[ english_us ] = "Spacing Modifier Letters";
         Text[ portuguese ] = "Caracteres de modifica��o do espa�amento";
-        Text[ russian ] = "���������� �������";
+        Text[ russian ] = "������� ��������� �������";
         Text[ greek ] = "���������� ��������� �����������";
         Text[ dutch ] = "Modificerende letters";
         Text[ french ] = "Lettres du modificateur d'espacement";
         Text[ spanish ] = "Caracteres modificadores de espacios";
         Text[ italian ] = "Caratteri modificatori di spazio";
-        Text[ danish ] = "Spacing Modifier Letters";
+        Text[ danish ] = "Spacing Modifier-tegn";
         Text[ swedish ] = "Avst�nds�ndrande tecken";
         Text[ polish ] = "Litery modyfikuj�ce odst�py";
         Text[ portuguese_brazilian ] = "Spacing Modifier Letters";
@@ -437,8 +447,9 @@ String RID_SUBSETSTR_SPACING_MODIFIERS
         Text[ chinese_traditional ] = "間隔修飾字元";
         Text[ turkish ] = "Spacing Modifier Letters";
         Text[ arabic ] = "���� ����� ��������";
-        Text[ catalan ] = "Caracteres modificadores de espacios";
+        Text[ catalan ] = "Lletres modificadores d'espaiat";
         Text[ finnish ] = "V�limerkityksen muokkauskirjaimet";
+        Text[ thai ] = "ระยะห่างตัวดัดแปลงแก้ไขอักษร";
     };
 String RID_SUBSETSTR_COMB_DIACRITICAL
 {
@@ -452,7 +463,7 @@ String RID_SUBSETSTR_COMB_DIACRITICAL
         Text[ french ] = "Marques diacritiques jonctives";
         Text[ spanish ] = "Combinaci�n de caracteres diacr�ticos";
         Text[ italian ] = "Caratteri diacritici di combinazione";
-        Text[ danish ] = "Combining Diacritical Marks";
+        Text[ danish ] = "Kombinerende diakritiske tegn";
         Text[ swedish ] = "Kombinerade diakritiska tecken";
         Text[ polish ] = "��cz�ce znaki diakrytyczne";
         Text[ portuguese_brazilian ] = "Combining Diacritical Marks";
@@ -462,8 +473,9 @@ String RID_SUBSETSTR_COMB_DIACRITICAL
         Text[ chinese_traditional ] = "組合式符號";
         Text[ turkish ] = "Combining Diacritical Marks";
         Text[ arabic ] = "�� ������ �������";
-        Text[ catalan ] = "Combinaci�n de caracteres diacr�ticos";
+        Text[ catalan ] = "Combinaci� de car�cters diacr�tics";
         Text[ finnish ] = "Yhdist�v�t diakriittiset merkit";
+        Text[ thai ] = "เชื่อมเครื่องหมายการออกเสียง";
     };
 String RID_SUBSETSTR_BASIC_GREEK
 {
@@ -477,18 +489,19 @@ String RID_SUBSETSTR_BASIC_GREEK
         Text[ french ] = "Grec de base";
         Text[ spanish ] = "Griego b�sico";
         Text[ italian ] = "Greco di base";
-        Text[ danish ] = "Basic Greek";
+        Text[ danish ] = "Basis Gr�sk";
         Text[ swedish ] = "Grekisk (standard)";
         Text[ polish ] = "Grecki podstawowy";
         Text[ portuguese_brazilian ] = "Basic Greek";
         Text[ japanese ] = "基本ギリシャ文字";
-        Text[ korean ] = "그리스어 (기본)";
+        Text[ korean ] = "기본 그리스어";
         Text[ chinese_simplified ] = "基本希腊语";
         Text[ chinese_traditional ] = "基本希腊語";
         Text[ turkish ] = "Basic Greek";
         Text[ arabic ] = "������ �����";
-        Text[ catalan ] = "Griego b�sico";
+        Text[ catalan ] = "Grec b�sic";
         Text[ finnish ] = "kreikka (perusteet)";
+        Text[ thai ] = "ภาษากรีกพื้นฐาน";
     };
 String RID_SUBSETSTR_GREEK_SYMS_COPTIC
 {
@@ -502,7 +515,7 @@ String RID_SUBSETSTR_GREEK_SYMS_COPTIC
         Text[ french ] = "Symboles grecs et coptes";
         Text[ spanish ] = "S�mbolos griegos y copto";
         Text[ italian ] = "Simboli greci e copti";
-        Text[ danish ] = "Greek Symbols And Coptic";
+        Text[ danish ] = "Gr�ske symboler og koptisk";
         Text[ swedish ] = "Grekiska symboler och koptiska";
         Text[ polish ] = "Symbole greckie i koptyjskie";
         Text[ portuguese_brazilian ] = "Greek Symbols And Coptic";
@@ -512,8 +525,9 @@ String RID_SUBSETSTR_GREEK_SYMS_COPTIC
         Text[ chinese_traditional ] = "希腊符號和埃及古語";
         Text[ turkish ] = "Greek Symbols And Coptic";
         Text[ arabic ] = "���� ������� �����";
-        Text[ catalan ] = "S�mbolos griegos y copto";
+        Text[ catalan ] = "S�mbols grecs i coptes";
         Text[ finnish ] = "kreikkalaiset ja koptiset merkit";
+        Text[ thai ] = "สัญลักษณ์ภาษากรีกและเกี่ยวกับชาวอียิปต์โบราณ";
     };
 String RID_SUBSETSTR_CYRILLIC
 {
@@ -527,7 +541,7 @@ String RID_SUBSETSTR_CYRILLIC
         Text[ french ] = "Cyrillique";
         Text[ spanish ] = "Cir�lico";
         Text[ italian ] = "Cirillico";
-        Text[ danish ] = "Cyrillic";
+        Text[ danish ] = "Kyrillisk";
         Text[ swedish ] = "Kyrillisk";
         Text[ polish ] = "Cyrylica";
         Text[ portuguese_brazilian ] = "Cyrillic";
@@ -537,8 +551,9 @@ String RID_SUBSETSTR_CYRILLIC
         Text[ chinese_traditional ] = "西里爾語";
         Text[ turkish ] = "Cyrillic";
         Text[ arabic ] = "������";
-        Text[ catalan ] = "Cir�lico";
+        Text[ catalan ] = "Cir�l.lic";
         Text[ finnish ] = "kyrillinen";
+        Text[ thai ] = "ตัวอักขระของซิริล";
     };
 String RID_SUBSETSTR_ARMENIAN
 {
@@ -548,11 +563,11 @@ String RID_SUBSETSTR_ARMENIAN
         Text[ portuguese ] = "Arm�nio";
         Text[ russian ] = "���������";
         Text[ greek ] = "��������";
-        Text[ dutch ] = "Armenieens";
+        Text[ dutch ] = "Armeens";
         Text[ french ] = "Arm�nien";
         Text[ spanish ] = "Armenio";
         Text[ italian ] = "Armeno";
-        Text[ danish ] = "Armenian";
+        Text[ danish ] = "Armensk";
         Text[ swedish ] = "Armenisk";
         Text[ polish ] = "Arme�ski";
         Text[ portuguese_brazilian ] = "Armenian";
@@ -562,8 +577,9 @@ String RID_SUBSETSTR_ARMENIAN
         Text[ chinese_traditional ] = "亞美尼亞語";
         Text[ turkish ] = "Armenian";
         Text[ arabic ] = "�����";
-        Text[ catalan ] = "Armenio";
+        Text[ catalan ] = "Armeni";
         Text[ finnish ] = "armenia";
+        Text[ thai ] = "ภาษาอามีเนีย";
     };
 String RID_SUBSETSTR_HEBREW_EXTENDED
 {
@@ -577,18 +593,19 @@ String RID_SUBSETSTR_HEBREW_EXTENDED
         Text[ french ] = "H�breu de base";
         Text[ spanish ] = "Hebreo b�sico";
         Text[ italian ] = "Ebraico di base";
-        Text[ danish ] = "Basic Hebrew";
+        Text[ danish ] = "Basis Hebraisk";
         Text[ swedish ] = "Hebreisk (standard)";
         Text[ polish ] = "Hebrajski podstawowy";
         Text[ portuguese_brazilian ] = "Basic Hebrew";
         Text[ japanese ] = "基本ヘブライ文字";
-        Text[ korean ] = "히브리어(기본)";
+        Text[ korean ] = "기본 히브리어";
         Text[ chinese_simplified ] = "基本希伯来语";
         Text[ chinese_traditional ] = "基本希伯來語";
         Text[ turkish ] = "Basic Hebrew";
         Text[ arabic ] = "���� �����";
-        Text[ catalan ] = "Hebreo b�sico";
+        Text[ catalan ] = "Hebreu b�sic";
         Text[ finnish ] = "heprea (perusteet)";
+        Text[ thai ] = "ภาษาฮิบรูพื้นฐาน";
     };
 String RID_SUBSETSTR_BASIC_HEBREW
 {
@@ -602,7 +619,7 @@ String RID_SUBSETSTR_BASIC_HEBREW
         Text[ french ] = "H�breu �tendu";
         Text[ spanish ] = "Hebreo ampliado";
         Text[ italian ] = "Ebraico esteso";
-        Text[ danish ] = "Hebrew Extended";
+        Text[ danish ] = "Udvidet Hebraisk";
         Text[ swedish ] = "Hebreisk (ut�kad)";
         Text[ polish ] = "Hebrajski rozszerzony";
         Text[ portuguese_brazilian ] = "Hebrew Extended";
@@ -612,8 +629,9 @@ String RID_SUBSETSTR_BASIC_HEBREW
         Text[ chinese_traditional ] = "希伯來語擴充";
         Text[ turkish ] = "Hebrew Extended";
         Text[ arabic ] = "���� �����";
-        Text[ catalan ] = "Hebreo ampliado";
+        Text[ catalan ] = "Hebreu ampliat";
         Text[ finnish ] = "heprea (laajennettu)";
+        Text[ thai ] = "ขยายภาษาฮิบรู";
     };
 String RID_SUBSETSTR_BASIC_ARABIC
 {
@@ -627,18 +645,19 @@ String RID_SUBSETSTR_BASIC_ARABIC
         Text[ french ] = "Arabe de base";
         Text[ spanish ] = "�rabe b�sico";
         Text[ italian ] = "Arabo di base";
-        Text[ danish ] = "Basic Arabic";
+        Text[ danish ] = "Basis Arabisk";
         Text[ swedish ] = "Arabisk (standard)";
         Text[ polish ] = "Arabski podstawowy";
         Text[ portuguese_brazilian ] = "Basic Arabic";
         Text[ japanese ] = "基本アラビア文字";
-        Text[ korean ] = "아랍어(기본)";
+        Text[ korean ] = "기본 아랍어";
         Text[ chinese_simplified ] = "基本阿拉伯语";
         Text[ chinese_traditional ] = "基本阿拉伯語";
         Text[ turkish ] = "Basic Arabic";
         Text[ arabic ] = "���� �����";
-        Text[ catalan ] = "Arabe b�sico";
+        Text[ catalan ] = "�rab b�sic";
         Text[ finnish ] = "arabia (perusteet)";
+        Text[ thai ] = "ภาษาอาราบิกพื้นฐาน";
     };
 String RID_SUBSETSTR_ARABIC_EXTENDED
 {
@@ -652,7 +671,7 @@ String RID_SUBSETSTR_ARABIC_EXTENDED
         Text[ french ] = "Arabe �tendu";
         Text[ spanish ] = "Arabe ampliado";
         Text[ italian ] = "Arabo esteso";
-        Text[ danish ] = "Arabic Extended";
+        Text[ danish ] = "Udvidet Arabisk";
         Text[ swedish ] = "Arabisk (ut�kad)";
         Text[ polish ] = "Arabski roszerzony";
         Text[ portuguese_brazilian ] = "Arabic Extended";
@@ -663,8 +682,9 @@ String RID_SUBSETSTR_ARABIC_EXTENDED
         Text[ chinese_traditional ] = "阿拉伯語擴充";
         Text[ turkish ] = "Arabic Extended";
         Text[ arabic ] = "���� �����";
-        Text[ catalan ] = "Arabe ampliado";
+        Text[ catalan ] = "�rab ampliat";
         Text[ finnish ] = "arabia (laajennettu)";
+        Text[ thai ] = "ขยายภาษาอาราบิก";
     };
 String RID_SUBSETSTR_DEVANAGARI
 {
@@ -690,6 +710,7 @@ String RID_SUBSETSTR_DEVANAGARI
         Text[ arabic ] = "����������";
         Text[ catalan ] = "Devanagari";
         Text[ finnish ] = "devanagari";
+        Text[ thai ] = "ภาษาเดวานาการี";
     };
 String RID_SUBSETSTR_BENGALI
 {
@@ -703,7 +724,7 @@ String RID_SUBSETSTR_BENGALI
         Text[ french ] = "Bengali";
         Text[ spanish ] = "Bengal�";
         Text[ italian ] = "Bengalese";
-        Text[ danish ] = "Bengali";
+        Text[ danish ] = "Bengalsk";
         Text[ swedish ] = "Bengali";
         Text[ polish ] = "Bengalski";
         Text[ portuguese_brazilian ] = "Bengali";
@@ -715,6 +736,7 @@ String RID_SUBSETSTR_BENGALI
         Text[ arabic ] = "������";
         Text[ catalan ] = "Bengal�";
         Text[ finnish ] = "bengali";
+        Text[ thai ] = "ภาษาเบงกาลี";
     };
 String RID_SUBSETSTR_GURMUKHI
 {
@@ -740,6 +762,7 @@ String RID_SUBSETSTR_GURMUKHI
         Text[ arabic ] = "�������";
         Text[ catalan ] = "Gurmukhi";
         Text[ finnish ] = "gurmukhi";
+        Text[ thai ] = "ภาษาเกอมูคิ";
     };
 String RID_SUBSETSTR_GUJARATI
 {
@@ -765,6 +788,7 @@ String RID_SUBSETSTR_GUJARATI
         Text[ arabic ] = "��������";
         Text[ catalan ] = "Gujarati";
         Text[ finnish ] = "gujarati";
+        Text[ thai ] = "ภาษากูจาราติ";
     };
 String RID_SUBSETSTR_ORIYA
 {
@@ -790,6 +814,7 @@ String RID_SUBSETSTR_ORIYA
         Text[ arabic ] = "�����";
         Text[ catalan ] = "Oriya";
         Text[ finnish ] = "orija";
+        Text[ thai ] = "ภาษาโอริยา";
     };
 String RID_SUBSETSTR_TAMIL
 {
@@ -803,7 +828,7 @@ String RID_SUBSETSTR_TAMIL
         Text[ french ] = "Tamoul";
         Text[ spanish ] = "Tamil";
         Text[ italian ] = "Tamil";
-        Text[ danish ] = "Tamil";
+        Text[ danish ] = "Tamilsk";
         Text[ swedish ] = "Tamil";
         Text[ polish ] = "Tamilski";
         Text[ portuguese_brazilian ] = "Tamil";
@@ -815,6 +840,7 @@ String RID_SUBSETSTR_TAMIL
         Text[ arabic ] = "�����";
         Text[ catalan ] = "Tamil";
         Text[ finnish ] = "tamili";
+        Text[ thai ] = "ภาษาทมิฬ";
     };
 String RID_SUBSETSTR_TELUGU
 {
@@ -841,6 +867,7 @@ String RID_SUBSETSTR_TELUGU
         Text[ arabic ] = "������";
         Text[ catalan ] = "Telugu";
         Text[ finnish ] = "telugu";
+        Text[ thai ] = "ภาษาเทลูกู";
     };
 String RID_SUBSETSTR_KANNADA
 {
@@ -859,13 +886,14 @@ String RID_SUBSETSTR_KANNADA
         Text[ polish ] = "Kannada";
         Text[ portuguese_brazilian ] = "Kannada";
         Text[ japanese ] = "カンナダ";
-        Text[ korean ] = "캐나다어";
+        Text[ korean ] = "카나다어";
         Text[ chinese_simplified ] = "(印度)卡纳达语";
         Text[ chinese_traditional ] = "印度的卡納達語";
         Text[ turkish ] = "Kannada";
         Text[ arabic ] = "������";
         Text[ catalan ] = "Kannada";
-        Text[ finnish ] = "kannada";
+        Text[ finnish ] = "kashmir";
+        Text[ thai ] = "ภาษากันนาดา";
     };
 String RID_SUBSETSTR_MALAYALAM
 {
@@ -879,7 +907,7 @@ String RID_SUBSETSTR_MALAYALAM
         Text[ french ] = "Malayalam";
         Text[ spanish ] = "Malasio";
         Text[ italian ] = "Malayalam";
-        Text[ danish ] = "Malayalam";
+        Text[ danish ] = "Malaysisk";
         Text[ swedish ] = "Malajiska";
         Text[ polish ] = "Malajski";
         Text[ portuguese_brazilian ] = "Malayalam";
@@ -889,8 +917,9 @@ String RID_SUBSETSTR_MALAYALAM
         Text[ chinese_traditional ] = "印度西南部的Dravidian語的方言";
         Text[ turkish ] = "Malayalam";
         Text[ arabic ] = "���������";
-        Text[ catalan ] = "Malayalam";
+        Text[ catalan ] = "Malaialam";
         Text[ finnish ] = "malayalam";
+        Text[ thai ] = "ภาษามาลายาลัม";
     };
 String RID_SUBSETSTR_THAI
 {
@@ -904,18 +933,19 @@ String RID_SUBSETSTR_THAI
         Text[ french ] = "Tha�";
         Text[ spanish ] = "Tailand�s";
         Text[ italian ] = "Thai";
-        Text[ danish ] = "Thai";
+        Text[ danish ] = "Thailandsk";
         Text[ swedish ] = "Thail�ndsk";
         Text[ polish ] = "Tajski";
         Text[ portuguese_brazilian ] = "Thai";
         Text[ japanese ] = "タイ";
-        Text[ korean ] = "타이랜드어";
+        Text[ korean ] = "태국어";
         Text[ chinese_simplified ] = "泰语";
         Text[ chinese_traditional ] = "泰語";
         Text[ turkish ] = "Thai";
         Text[ arabic ] = "�������";
-        Text[ catalan ] = "Tailand�s";
+        Text[ catalan ] = "Tai";
         Text[ finnish ] = "thai";
+        Text[ thai ] = "ภาษาไทย";
     };
 String RID_SUBSETSTR_LAO
 {
@@ -929,7 +959,7 @@ String RID_SUBSETSTR_LAO
         Text[ french ] = "Laotien";
         Text[ spanish ] = "Laosiano";
         Text[ italian ] = "Lao";
-        Text[ danish ] = "Lao";
+        Text[ danish ] = "Laotisk";
         Text[ swedish ] = "Laotisk";
         Text[ polish ] = "Laota�ski";
         Text[ portuguese_brazilian ] = "Lao";
@@ -939,8 +969,9 @@ String RID_SUBSETSTR_LAO
         Text[ chinese_traditional ] = "老撾語";
         Text[ turkish ] = "Lao";
         Text[ arabic ] = "�������";
-        Text[ catalan ] = "Laosiano";
+        Text[ catalan ] = "Laos";
         Text[ finnish ] = "lao";
+        Text[ thai ] = "ภาษาลาว";
     };
 String RID_SUBSETSTR_BASIC_GEORGIAN
 {
@@ -954,18 +985,19 @@ String RID_SUBSETSTR_BASIC_GEORGIAN
         Text[ french ] = "G�orgien de base";
         Text[ spanish ] = "Georgiano b�sico";
         Text[ italian ] = "Georgiano di base";
-        Text[ danish ] = "Basic Georgian";
+        Text[ danish ] = "Basis Georgisk";
         Text[ swedish ] = "Georgisk (standard)";
         Text[ polish ] = "Gruzi�ski podstawowy";
         Text[ portuguese_brazilian ] = "Basic Georgian";
         Text[ japanese ] = "基本 グルジア文字";
-        Text[ korean ] = "그루지아어 (기본)";
+        Text[ korean ] = "기본 그루지아어";
         Text[ chinese_simplified ] = "基本格鲁吉亚语";
         Text[ chinese_traditional ] = "基本格魯吉亞語";
         Text[ turkish ] = "Basic Georgian";
         Text[ arabic ] = "�������� ��������";
-        Text[ catalan ] = "Georgiano b�sico";
+        Text[ catalan ] = "Georgi� b�sic";
         Text[ finnish ] = "georgia (perusteet)";
+        Text[ thai ] = "ภาษาจอร์เจียพื้นฐาน";
     };
 String RID_SUBSETSTR_GEORGIAN_EXTENDED
 {
@@ -977,9 +1009,9 @@ String RID_SUBSETSTR_GEORGIAN_EXTENDED
         Text[ greek ] = "��������� ����������";
         Text[ dutch ] = "Georgisch - uitgebreid";
         Text[ french ] = "G�orgien �tendu";
-        Text[ spanish ] = "Georgiano extendido";
+        Text[ spanish ] = "Georgiano ampliado";
         Text[ italian ] = "Georgiano esteso";
-        Text[ danish ] = "Georgian Extended";
+        Text[ danish ] = "Udvidet Georgisk";
         Text[ swedish ] = "Georgisk (standard)";
         Text[ polish ] = "Gruzi�ski rozszerzony";
         Text[ portuguese_brazilian ] = "Georgian Extended";
@@ -989,8 +1021,9 @@ String RID_SUBSETSTR_GEORGIAN_EXTENDED
         Text[ chinese_traditional ] = "格魯吉亞語擴充";
         Text[ turkish ] = "Georgian Extended";
         Text[ arabic ] = "�������� ��������";
-        Text[ catalan ] = "Georgiano extendido";
+        Text[ catalan ] = "Georgi� ampliat";
         Text[ finnish ] = "georgia (laajennettu)";
+        Text[ thai ] = "ภาษาจอร์เจียเพิ่มเติม";
     };
 String RID_SUBSETSTR_HANGUL_JAMO
 {
@@ -1016,6 +1049,7 @@ String RID_SUBSETSTR_HANGUL_JAMO
         Text[ arabic ] = "������ ����";
         Text[ catalan ] = "Hangul Jamo";
         Text[ finnish ] = "hangul jamo";
+        Text[ thai ] = "ภาษาฮังกุลจาโม";
     };
 String RID_SUBSETSTR_LATIN_EXTENDED_ADDS
 {
@@ -1027,9 +1061,9 @@ String RID_SUBSETSTR_LATIN_EXTENDED_ADDS
         Text[ greek ] = "�������� ���������� ��������";
         Text[ dutch ] = "Latin uitgebreid extra";
         Text[ french ] = "Latin �tendu additionnel";
-        Text[ spanish ] = "Lat�n extendido adicional";
+        Text[ spanish ] = "Lat�n ampliado adicional";
         Text[ italian ] = "Latino esteso addizionale";
-        Text[ danish ] = "Latin Extended Additional";
+        Text[ danish ] = "Latin Udvidede tilf�jelser";
         Text[ swedish ] = "Ut�kat latin till�gg";
         Text[ polish ] = "�aci�ski rozszerzony dodatkowy";
         Text[ portuguese_brazilian ] = "Latin Extended Additional";
@@ -1039,8 +1073,9 @@ String RID_SUBSETSTR_LATIN_EXTENDED_ADDS
         Text[ chinese_traditional ] = "拉丁文擴充附加";
         Text[ turkish ] = "Latin Extended Additional";
         Text[ arabic ] = "������ ����� �����";
-        Text[ catalan ] = "Lat�n extendido adicional";
+        Text[ catalan ] = "Llat� ampliat addicional";
         Text[ finnish ] = "latina (lis�laajennus)";
+        Text[ thai ] = "ส่วนเพิ่มภาษาลาติน";
     };
 String RID_SUBSETSTR_GREEK_EXTENDED
 {
@@ -1054,7 +1089,7 @@ String RID_SUBSETSTR_GREEK_EXTENDED
         Text[ french ] = "Grec �tendu";
         Text[ spanish ] = "Griego ampliado";
         Text[ italian ] = "Greco esteso";
-        Text[ danish ] = "Greek Extended";
+        Text[ danish ] = "Udvidet Gr�sk";
         Text[ swedish ] = "Grekisk (ut�kad)";
         Text[ polish ] = "Grecki rozszerzony";
         Text[ portuguese_brazilian ] = "Greek Extended";
@@ -1064,8 +1099,9 @@ String RID_SUBSETSTR_GREEK_EXTENDED
         Text[ chinese_traditional ] = "希腊語擴充";
         Text[ turkish ] = "Greek Extended";
         Text[ arabic ] = "������ �����";
-        Text[ catalan ] = "Griego ampliado";
+        Text[ catalan ] = "Grec ampliat";
         Text[ finnish ] = "kreikka (laajennettu)";
+        Text[ thai ] = "ภาษากรีกเพิ่มเติม";
     };
 String RID_SUBSETSTR_GENERAL_PUNCTUATION
 {
@@ -1079,32 +1115,33 @@ String RID_SUBSETSTR_GENERAL_PUNCTUATION
         Text[ french ] = "Ponctuation g�n�rale";
         Text[ spanish ] = "Puntuaci�n general";
         Text[ italian ] = "Punteggiatura generale";
-        Text[ danish ] = "General Punctuation";
+        Text[ danish ] = "Generel tegns�tning";
         Text[ swedish ] = "Allm�n interpunktion";
         Text[ polish ] = "Og�lna interpunkcja";
         Text[ portuguese_brazilian ] = "General Punctuation";
         Text[ japanese ] = "普通の句読点";
-        Text[ korean ] = "일반 구두법";
+        Text[ korean ] = "일반 문장부호";
         Text[ chinese_simplified ] = "普通的标点符号";
         Text[ chinese_traditional ] = "普通的標點符號";
         Text[ turkish ] = "General Punctuation";
         Text[ arabic ] = "������ ����� ����";
-        Text[ catalan ] = "Puntuaci�n general";
+        Text[ catalan ] = "Puntuaci� general";
         Text[ finnish ] = "Yleinen v�limerkitys";
+        Text[ thai ] = "เครื่องหมายวรรคตอนทั่วไป";
     };
 String RID_SUBSETSTR_SUB_SUPER_SCRIPTS
 {
     Text = "Hoch- und Tiefstellungen" ;
     Text [ ENGLISH ] = "Superscripts And Subscripts" ;
-    Text[ english_us ] = "Superscripts And Subscripts";
+    Text[ english_us ] = "Superscripts and Subscripts";
         Text[ portuguese ] = "Superior � linha e inferior � linha";
         Text[ russian ] = "������� � ������ �������";
         Text[ greek ] = "������� ��� �������";
         Text[ dutch ] = "Superscripts en subscripts";
         Text[ french ] = "Exposants et indices";
-        Text[ spanish ] = "Super y sub�ndices";
+        Text[ spanish ] = "Sub�ndices y super�ndices";
         Text[ italian ] = "Apice e pedice";
-        Text[ danish ] = "Superscripts And Subscripts";
+        Text[ danish ] = "H�vet og s�nket skrift";
         Text[ swedish ] = "Upph�jda och neds�nkta tecken";
         Text[ polish ] = "Indeksy dolne i g�rne";
         Text[ portuguese_brazilian ] = "Superscripts And Subscripts";
@@ -1114,8 +1151,9 @@ String RID_SUBSETSTR_SUB_SUPER_SCRIPTS
         Text[ chinese_traditional ] = "上標和下標";
         Text[ turkish ] = "Superscripts And Subscripts";
         Text[ arabic ] = "����� ������";
-        Text[ catalan ] = "Super y sub�ndices";
+        Text[ catalan ] = "Super i sub�ndexs";
         Text[ finnish ] = "Yl�- ja alaindeksit";
+        Text[ thai ] = "ตัวยกและตัวห้อย";
     };
 String RID_SUBSETSTR_CURRENCY_SYMBOLS
 {
@@ -1129,18 +1167,19 @@ String RID_SUBSETSTR_CURRENCY_SYMBOLS
         Text[ french ] = "Symboles mon�taires";
         Text[ spanish ] = "S�mbolos de monedas";
         Text[ italian ] = "Simboli di valute";
-        Text[ danish ] = "Currency Symbols";
+        Text[ danish ] = "Valutasymboler";
         Text[ swedish ] = "Valutasymboler";
         Text[ polish ] = "Symbole waluty";
         Text[ portuguese_brazilian ] = "Currency Symbols";
         Text[ japanese ] = "通貨記号";
-        Text[ korean ] = "화폐 기호";
+        Text[ korean ] = "통화 기호";
         Text[ chinese_simplified ] = "货币符号";
         Text[ chinese_traditional ] = "貨幣符號";
         Text[ turkish ] = "Currency Symbols";
         Text[ arabic ] = "���� ������";
-        Text[ catalan ] = "S�mbolos de monedas";
+        Text[ catalan ] = "S�mbols de monedes";
         Text[ finnish ] = "Valuuttasymbolit";
+        Text[ thai ] = "สัญลักษณ์สกุลเงิน";
     };
 String RID_SUBSETSTR_COMB_DIACRITIC_SYMS
 {
@@ -1148,13 +1187,13 @@ String RID_SUBSETSTR_COMB_DIACRITIC_SYMS
     Text [ ENGLISH ] = "Combining Diacritical Marks For Symbols" ;
     Text[ english_us ] = "Combining Diacritical Symbols";
         Text[ portuguese ] = "A combinar s�mbolos diacr�ticos";
-        Text[ russian ] = "��������������� �������������� �����";
+        Text[ russian ] = "��������������� �������������� �������";
         Text[ greek ] = "������������ ���������� �������";
         Text[ dutch ] = "Gecombineerde diakritische tekens";
         Text[ french ] = "Signes diacritiques jonctifs";
         Text[ spanish ] = "Combinaci�n de s�mbolos diacr�ticos";
         Text[ italian ] = "Simboli diacritici di combinazione";
-        Text[ danish ] = "Combining Diacritical Marks For Symbols";
+        Text[ danish ] = "Kombinerende diakritiske symboler";
         Text[ swedish ] = "Kombinerade diakritiska symboler";
         Text[ polish ] = "Diakrytyczne ��cz�ce (symbole)";
         Text[ portuguese_brazilian ] = "Combining Diacritical Marks For Symbols";
@@ -1164,8 +1203,9 @@ String RID_SUBSETSTR_COMB_DIACRITIC_SYMS
         Text[ chinese_traditional ] = "組合式符號";
         Text[ turkish ] = "Combining Diacritical Marks For Symbols";
         Text[ arabic ] = "�� ������ ������� ������";
-        Text[ catalan ] = "Combinaci�n de s�mbolos diacr�ticos";
+        Text[ catalan ] = "Combinaci� de s�mbols diacr�tics";
         Text[ finnish ] = "Yhdist�v�t diakriittiset merkit";
+        Text[ thai ] = "เชื่อมสัญลักษณ์การออกเสียง";
     };
 String RID_SUBSETSTR_LETTERLIKE_SYMBOLS
 {
@@ -1175,11 +1215,11 @@ String RID_SUBSETSTR_LETTERLIKE_SYMBOLS
         Text[ portuguese ] = "S�mbolos tipo letras";
         Text[ russian ] = "������������� �������";
         Text[ greek ] = "������� ���������";
-        Text[ dutch ] = "Letterachtige symbolen";
+        Text[ dutch ] = "Lettersymbolen";
         Text[ french ] = "Symboles Letterlike";
         Text[ spanish ] = "S�mbolos tipo carta";
         Text[ italian ] = "Simboli delle lettere";
-        Text[ danish ] = "Letterlike Symbols";
+        Text[ danish ] = "Bogstavsymboler";
         Text[ swedish ] = "Bokstavsliknande symboler";
         Text[ polish ] = "Symbole literopodobne";
         Text[ portuguese_brazilian ] = "Letterlike Symbols";
@@ -1189,8 +1229,9 @@ String RID_SUBSETSTR_LETTERLIKE_SYMBOLS
         Text[ chinese_traditional ] = "似字母符號";
         Text[ turkish ] = "Letterlike Symbols";
         Text[ arabic ] = "���� �������";
-        Text[ catalan ] = "S�mbolos tipo carta";
+        Text[ catalan ] = "S�mbols tipus carta";
         Text[ finnish ] = "Kirjainsymbolit";
+        Text[ thai ] = "สัญลักษณ์คล้ายตัวอักษร";
     };
 String RID_SUBSETSTR_NUMBER_FORMS
 {
@@ -1204,7 +1245,7 @@ String RID_SUBSETSTR_NUMBER_FORMS
         Text[ french ] = "Symboles de nombres";
         Text[ spanish ] = "S�mbolos num�ricos";
         Text[ italian ] = "Simboli numerici";
-        Text[ danish ] = "Number Forms";
+        Text[ danish ] = "Talsymboler";
         Text[ swedish ] = "Siffersymboler";
         Text[ polish ] = "Formy liczb";
         Text[ portuguese_brazilian ] = "Number Forms";
@@ -1214,8 +1255,9 @@ String RID_SUBSETSTR_NUMBER_FORMS
         Text[ chinese_traditional ] = "數字符號";
         Text[ turkish ] = "Number Forms";
         Text[ arabic ] = "����� �����";
-        Text[ catalan ] = "S�mbolos num�ricos";
-        Text[ finnish ] = "Numeromuodot";
+        Text[ catalan ] = "S�mbols num�rics";
+        Text[ finnish ] = "Lukumuodot";
+        Text[ thai ] = "แบบตัวเลข";
     };
 String RID_SUBSETSTR_ARROWS
 {
@@ -1229,7 +1271,7 @@ String RID_SUBSETSTR_ARROWS
         Text[ french ] = "Fl�ches";
         Text[ spanish ] = "Flechas";
         Text[ italian ] = "Frecce";
-        Text[ danish ] = "Arrows";
+        Text[ danish ] = "Pilesymboler";
         Text[ swedish ] = "Pilsymboler";
         Text[ polish ] = "Strza�ki";
         Text[ portuguese_brazilian ] = "Arrows";
@@ -1239,8 +1281,9 @@ String RID_SUBSETSTR_ARROWS
         Text[ chinese_traditional ] = "箭頭符號";
         Text[ turkish ] = "Arrows";
         Text[ arabic ] = "����";
-        Text[ catalan ] = "Flechas";
+        Text[ catalan ] = "Fletxes";
         Text[ finnish ] = "Nuolet";
+        Text[ thai ] = "ลูกศร";
     };
 String RID_SUBSETSTR_MATH_OPERATORS
 {
@@ -1250,11 +1293,11 @@ String RID_SUBSETSTR_MATH_OPERATORS
         Text[ portuguese ] = "Operadores matem�ticos";
         Text[ russian ] = "�������������� ���������";
         Text[ greek ] = "����������� ����������";
-        Text[ dutch ] = "Wiskundige symbolen";
+        Text[ dutch ] = "Wiskundige operatoren";
         Text[ french ] = "Op�rateurs math�matiques";
         Text[ spanish ] = "Operadores matem�ticos";
         Text[ italian ] = "Operatori matematici";
-        Text[ danish ] = "Mathematical Operators";
+        Text[ danish ] = "Matematiske operatorer";
         Text[ swedish ] = "Matematiska operatorer";
         Text[ polish ] = "Operatory matematyczne";
         Text[ portuguese_brazilian ] = "Mathematical Operators";
@@ -1264,8 +1307,9 @@ String RID_SUBSETSTR_MATH_OPERATORS
         Text[ chinese_traditional ] = "數學運算符號";
         Text[ turkish ] = "Mathematical Operators";
         Text[ arabic ] = "����� ����� ������";
-        Text[ catalan ] = "Operadores matem�ticos";
+        Text[ catalan ] = "Operadors matem�tics";
         Text[ finnish ] = "Matemaattiset operaattorit";
+        Text[ thai ] = "ตัวปฏิบัติการทางคณิตศาสตร์";
     };
 String RID_SUBSETSTR_MISC_TECHNICAL
 {
@@ -1276,11 +1320,11 @@ String RID_SUBSETSTR_MISC_TECHNICAL
         Text[ portuguese ] = "Caracteres t�cnicos v�rios";
         Text[ russian ] = "������������� ����������� �������";
         Text[ greek ] = "�������� �������� ����������";
-        Text[ dutch ] = "Diverse technisch";
+        Text[ dutch ] = "Diverse technische tekens";
         Text[ french ] = "Divers technique";
         Text[ spanish ] = "Diversos caracteres t�cnicos";
         Text[ italian ] = "Tecnici misti";
-        Text[ danish ] = "Miscellaneous Technical";
+        Text[ danish ] = "Forskellige tekniske tegn";
         Text[ swedish ] = "Blandade tekniska tecken";
         Text[ polish ] = "R�ne techniczne";
         Text[ portuguese_brazilian ] = "Miscellaneous Technical";
@@ -1290,8 +1334,9 @@ String RID_SUBSETSTR_MISC_TECHNICAL
         Text[ chinese_traditional ] = "各式技術符號";
         Text[ turkish ] = "Miscellaneous Technical";
         Text[ arabic ] = "���� ����� ������";
-        Text[ catalan ] = "Diversos caracteres t�cnicos";
+        Text[ catalan ] = "Diversos car�cters t�cnics";
         Text[ finnish ] = "Sekalaiset tekniset merkit";
+        Text[ thai ] = "เทคนิคเบ็ดเตล็ด";
     };
 String RID_SUBSETSTR_CONTROL_PICTURES
 {
@@ -1305,18 +1350,19 @@ String RID_SUBSETSTR_CONTROL_PICTURES
         Text[ french ] = "Pictogrammes de commande";
         Text[ spanish ] = "S�mbolos del teclado";
         Text[ italian ] = "Simboli tastiera";
-        Text[ danish ] = "Control Pictures";
+        Text[ danish ] = "Tastatursymboler";
         Text[ swedish ] = "Tangentbordssymboler";
         Text[ polish ] = "Symbole klawiaturowe";
         Text[ portuguese_brazilian ] = "Control Pictures";
         Text[ japanese ] = "キーボード記号";
-        Text[ korean ] = "키보드  기호";
+        Text[ korean ] = "그림 컨트롤";
         Text[ chinese_simplified ] = "键盘符号";
         Text[ chinese_traditional ] = "控制符號";
         Text[ turkish ] = "Control Pictures";
         Text[ arabic ] = "������ ������";
-        Text[ catalan ] = "S�mbolos del teclado";
+        Text[ catalan ] = "Imatges de control";
         Text[ finnish ] = "Ohjauskuvat";
+        Text[ thai ] = "ควบคุมรูปภาพ";
     };
 String RID_SUBSETSTR_OPTICAL_CHAR_REC
 {
@@ -1324,13 +1370,13 @@ String RID_SUBSETSTR_OPTICAL_CHAR_REC
     Text [ ENGLISH ] = "Optical Character Recognition" ;
     Text[ english_us ] = "Optical Character Recognition";
         Text[ portuguese ] = "Reconhecimento �ptico de caracteres";
-        Text[ russian ] = "���������� ������������� ��������";
+        Text[ russian ] = "���������� ������������� �������";
         Text[ greek ] = "���������� ����������� ��� �������";
         Text[ dutch ] = "Optische tekenherkenning";
         Text[ french ] = "Reconnaissance optique de caract�res";
         Text[ spanish ] = "Caracteres legibles por m�quina";
         Text[ italian ] = "Riconoscimento ottico dei caratteri";
-        Text[ danish ] = "Optical Character Recognition";
+        Text[ danish ] = "Maskinl�sbare tegn";
         Text[ swedish ] = "Optisk teckenl�sning";
         Text[ polish ] = "Optyczne rozpoznawanie znak�w";
         Text[ portuguese_brazilian ] = "Optical Character Recognition";
@@ -1340,8 +1386,9 @@ String RID_SUBSETSTR_OPTICAL_CHAR_REC
         Text[ chinese_traditional ] = "可供光學系統識別的字元";
         Text[ turkish ] = "Optical Character Recognition";
         Text[ arabic ] = "���� ���� ��� �����";
-        Text[ catalan ] = "Caracteres legibles por m�quina";
-        Text[ finnish ] = "Optinen merkkitunnistus";
+        Text[ catalan ] = "Car�cters llegibles per m�quina";
+        Text[ finnish ] = "Optinen merkkientunnistaminen";
+        Text[ thai ] = "จดจำตัวอักขระทางตา";
     };
 String RID_SUBSETSTR_ENCLOSED_ALPHANUM
 {
@@ -1349,24 +1396,25 @@ String RID_SUBSETSTR_ENCLOSED_ALPHANUM
     Text [ ENGLISH ] = "Enclosed Alphanumerics" ;
     Text[ english_us ] = "Enclosed Alphanumerics";
         Text[ portuguese ] = "Caracteres alfanum�ricos inclusos";
-        Text[ russian ] = "���������� ���������-�������� �������";
+        Text[ russian ] = "����������� ���������-�������� �������";
         Text[ greek ] = "�������������� ����������";
         Text[ dutch ] = "Ingesloten tekens";
         Text[ french ] = "Alphanum�riques encercl�s";
         Text[ spanish ] = "Caracteres incluidos";
         Text[ italian ] = "Alfanumerici inclusi";
-        Text[ danish ] = "Enclosed Alphanumerics";
+        Text[ danish ] = "Tegn med bolle omkring";
         Text[ swedish ] = "Omslutna alfanumeriska tecken";
         Text[ polish ] = "Znaki otoczone";
         Text[ portuguese_brazilian ] = "Enclosed Alphanumerics";
         Text[ japanese ] = "囲み文字";
-        Text[ korean ] = "원문자 (알파벳)";
+        Text[ korean ] = "원문자";
         Text[ chinese_simplified ] = "带括号的字母数字";
         Text[ chinese_traditional ] = "帶括號的字符";
         Text[ turkish ] = "Enclosed Alphanumerics";
         Text[ arabic ] = "����� ���� �� �����";
-        Text[ catalan ] = "Caracteres incluidos";
+        Text[ catalan ] = "Car�cters inclosos";
         Text[ finnish ] = "Sis�lletyt aakkosnumeeriset merkit";
+        Text[ thai ] = "ตัวเลขหนังสือที่ล้อมรอบ";
     };
 String RID_SUBSETSTR_BOX_DRAWING
 {
@@ -1374,24 +1422,25 @@ String RID_SUBSETSTR_BOX_DRAWING
     Text [ ENGLISH ] = "Box Drawing" ;
     Text[ english_us ] = "Box Drawing";
         Text[ portuguese ] = "Desenho de caixa";
-        Text[ russian ] = "�������� ���������������";
+        Text[ russian ] = "������� ������";
         Text[ greek ] = "���������� ��������";
         Text[ dutch ] = "Vakken";
         Text[ french ] = "Bo�te de dessin";
         Text[ spanish ] = "S�mbolos de marco";
         Text[ italian ] = "Disegno caselle";
-        Text[ danish ] = "Box Drawing";
+        Text[ danish ] = "Indramningssymboler";
         Text[ swedish ] = "Ramelement";
         Text[ polish ] = "Elementy ramek";
         Text[ portuguese_brazilian ] = "Box Drawing";
         Text[ japanese ] = "罫線素片";
-        Text[ korean ] = "상자 그림";
+        Text[ korean ] = "상자 그리기";
         Text[ chinese_simplified ] = "制表符";
         Text[ chinese_traditional ] = "區塊元件";
         Text[ turkish ] = "Box Drawing";
         Text[ arabic ] = "��� ����";
-        Text[ catalan ] = "S�mbolos de marco";
+        Text[ catalan ] = "Dibuix del quadre";
         Text[ finnish ] = "Ruutupiirros";
+        Text[ thai ] = "กล่องวาดรูป";
     };
 String RID_SUBSETSTR_BLOCK_ELEMENTS
 {
@@ -1405,7 +1454,7 @@ String RID_SUBSETSTR_BLOCK_ELEMENTS
         Text[ french ] = "Pav�s";
         Text[ spanish ] = "S�mbolos de bloque";
         Text[ italian ] = "Blocchi";
-        Text[ danish ] = "Block Elements";
+        Text[ danish ] = "Bloksymboler";
         Text[ swedish ] = "Blocksymboler";
         Text[ polish ] = "Elementy blokowe";
         Text[ portuguese_brazilian ] = "Block Elements";
@@ -1415,8 +1464,9 @@ String RID_SUBSETSTR_BLOCK_ELEMENTS
         Text[ chinese_traditional ] = "區塊元件";
         Text[ turkish ] = "Block Elements";
         Text[ arabic ] = "����� ������";
-        Text[ catalan ] = "S�mbolos de bloque";
+        Text[ catalan ] = "Elements de bloc";
         Text[ finnish ] = "Lohko-osat";
+        Text[ thai ] = "องค์ประกอบบล็อค";
     };
 String RID_SUBSETSTR_GEOMETRIC_SHAPES
 {
@@ -1426,11 +1476,11 @@ String RID_SUBSETSTR_GEOMETRIC_SHAPES
         Text[ portuguese ] = "Formas geom�tricas";
         Text[ russian ] = "�������������� ������";
         Text[ greek ] = "���������� �������";
-        Text[ dutch ] = "Geometrische vormen";
+        Text[ dutch ] = "Meetkundige symbolen";
         Text[ french ] = "Formes g�om�triques";
         Text[ spanish ] = "S�mbolos geom�tricos";
         Text[ italian ] = "Simboli geometrici";
-        Text[ danish ] = "Geometric Shapes";
+        Text[ danish ] = "Geometriske symboler";
         Text[ swedish ] = "Geometriska symboler";
         Text[ polish ] = "Kszta�ty geometryczne";
         Text[ portuguese_brazilian ] = "Geometric Shapes";
@@ -1440,8 +1490,9 @@ String RID_SUBSETSTR_GEOMETRIC_SHAPES
         Text[ chinese_traditional ] = "几何形";
         Text[ turkish ] = "Geometric Shapes";
         Text[ arabic ] = "����� ������";
-        Text[ catalan ] = "S�mbolos geom�tricos";
+        Text[ catalan ] = "S�mbols geom�trics";
         Text[ finnish ] = "Geometriset muodot";
+        Text[ thai ] = "รูปร่างทรงเรขาคณิต";
     };
 String RID_SUBSETSTR_MISC_DINGBATS
 {
@@ -1455,7 +1506,7 @@ String RID_SUBSETSTR_MISC_DINGBATS
         Text[ french ] = "Symboles divers";
         Text[ spanish ] = "Diversos s�mbolos";
         Text[ italian ] = "Simboli";
-        Text[ danish ] = "Miscellaneous Symbols";
+        Text[ danish ] = "Forskellige symboler";
         Text[ swedish ] = "Diverse symboler";
         Text[ polish ] = "R�ne";
         Text[ portuguese_brazilian ] = "Miscellaneous Symbols";
@@ -1466,8 +1517,9 @@ String RID_SUBSETSTR_MISC_DINGBATS
         Text[ chinese_traditional ] = "混合什錦符號";
         Text[ turkish ] = "Miscellaneous Symbols";
         Text[ arabic ] = "���� ������";
-        Text[ catalan ] = "Diversos s�mbolos";
+        Text[ catalan ] = "Diversos s�mbols";
         Text[ finnish ] = "Sekalaiset symbolit";
+        Text[ thai ] = "สัญลักษณ์เบ็ดเตล็ด";
     };
 String RID_SUBSETSTR_DINGBATS
 {
@@ -1475,7 +1527,7 @@ String RID_SUBSETSTR_DINGBATS
     Text [ ENGLISH ] = "Dingbats" ;
     Text[ english_us ] = "Dingbats";
         Text[ portuguese ] = "Dingbats";
-        Text[ russian ] = "����� Dingbat";
+        Text[ russian ] = "����������� �����";
         Text[ greek ] = "Dingbats";
         Text[ dutch ] = "Dingbats";
         Text[ french ] = "Dingbats";
@@ -1494,6 +1546,7 @@ String RID_SUBSETSTR_DINGBATS
         Text[ arabic ] = "Dingbats";
         Text[ catalan ] = "Dingbats";
         Text[ finnish ] = "Dingbat-leikkeet";
+        Text[ thai ] = "ภาษาดิงแบท";
     };
 String RID_SUBSETSTR_CJK_SYMS_PUNCTUATION
 {
@@ -1507,18 +1560,19 @@ String RID_SUBSETSTR_CJK_SYMS_PUNCTUATION
         Text[ french ] = "Ponctuation et symboles CJC";
         Text[ spanish ] = "S�mbolos y puntuaci�n CJK";
         Text[ italian ] = "Simboli e punteggiatura CJK";
-        Text[ danish ] = "CJK Symbols And Punctuation";
+        Text[ danish ] = "CJK-symboler og tegns�tning";
         Text[ swedish ] = "CJK - symboler och skiljetecken";
         Text[ polish ] = "Symbole i znaki przestankowe CJK";
         Text[ portuguese_brazilian ] = "CJK Symbols And Punctuation";
         Text[ japanese ] = "CJK用の記号と句読点";
-        Text[ korean ] = "CJK 기호와 구두점";
+        Text[ korean ] = "CJK 기호와 문장 부호";
         Text[ chinese_simplified ] = "中日韩符号和标点";
         Text[ chinese_traditional ] = "中日韓符號和標點";
         Text[ turkish ] = "CJK Symbols And Punctuation";
         Text[ arabic ] = "���� ������� ����� ����� �������� ������";
-        Text[ catalan ] = "S�mbolos y puntuaci�n CJK";
+        Text[ catalan ] = "S�mbols i puntuaci� CJK";
         Text[ finnish ] = "CJK-merkit ja -v�limerkitys";
+        Text[ thai ] = "สัญลักษณ์และเครื่องหมายวรรคตอน CJK ";
     };
 String RID_SUBSETSTR_HIRAGANA
 {
@@ -1544,6 +1598,7 @@ String RID_SUBSETSTR_HIRAGANA
         Text[ arabic ] = "��������";
         Text[ catalan ] = "Hiragana";
         Text[ finnish ] = "hiragana";
+        Text[ thai ] = "ฮิรากานะ";
     };
 String RID_SUBSETSTR_KATAKANA
 {
@@ -1562,13 +1617,14 @@ String RID_SUBSETSTR_KATAKANA
         Text[ polish ] = "Katakana";
         Text[ portuguese_brazilian ] = "Katakana";
         Text[ japanese ] = "カタカナ";
-        Text[ korean ] = "가다가나";
+        Text[ korean ] = "가타카나";
         Text[ chinese_simplified ] = "片假名";
         Text[ chinese_traditional ] = "片假名";
         Text[ turkish ] = "Katakana";
         Text[ arabic ] = "��������";
         Text[ catalan ] = "Katakana";
         Text[ finnish ] = "katakana";
+        Text[ thai ] = "คาตากานะ";
     };
 String RID_SUBSETSTR_BOPOMOFO
 {
@@ -1594,6 +1650,7 @@ String RID_SUBSETSTR_BOPOMOFO
         Text[ arabic ] = "��������";
         Text[ catalan ] = "Bopomofo";
         Text[ finnish ] = "bopomofo";
+        Text[ thai ] = "ภาษาโบโพโมโฟ";
     };
 String RID_SUBSETSTR_HANGUL_COMPAT_JAMO
 {
@@ -1607,7 +1664,7 @@ String RID_SUBSETSTR_HANGUL_COMPAT_JAMO
         Text[ french ] = "Hangul compatible Jamo";
         Text[ spanish ] = "Jamo compatible con Hangul";
         Text[ italian ] = "Hangul compatibile con Jamo";
-        Text[ danish ] = "Hangul Compatibility Jamo";
+        Text[ danish ] = "Hangul kompatibel Jamo";
         Text[ swedish ] = "Hangul-kompatibilitet Jamo";
         Text[ polish ] = "Jambo zgodne z Hangul";
         Text[ portuguese_brazilian ] = "Hangul Compatibility Jamo";
@@ -1617,8 +1674,9 @@ String RID_SUBSETSTR_HANGUL_COMPAT_JAMO
         Text[ chinese_traditional ] = "韓文兼容 Jamo";
         Text[ turkish ] = "Hangul Compatibility Jamo";
         Text[ arabic ] = "����� ������ �� ����";
-        Text[ catalan ] = "Jamo compatible con Hangul";
+        Text[ catalan ] = "Jamo amb compatibilitat Hangul";
         Text[ finnish ] = "hangul-yhteensopiva jamo";
+        Text[ thai ] = "ความเข้ากันได้ของภาษาฮังกุลจาโม";
     };
 String RID_SUBSETSTR_CJK_MISC
 {
@@ -1632,7 +1690,7 @@ String RID_SUBSETSTR_CJK_MISC
         Text[ french ] = "CJC divers";
         Text[ spanish ] = "Diversos caracteres CJK";
         Text[ italian ] = "Caratteri CJK";
-        Text[ danish ] = "CJK Miscellaneous";
+        Text[ danish ] = "Forskellige CJK-tegn";
         Text[ swedish ] = "Diverse CJK-tecken";
         Text[ polish ] = "R�ne znaki CJK";
         Text[ portuguese_brazilian ] = "CJK Miscellaneous";
@@ -1642,8 +1700,9 @@ String RID_SUBSETSTR_CJK_MISC
         Text[ chinese_traditional ] = "中日韓混合字元";
         Text[ turkish ] = "CJK Miscellaneous";
         Text[ arabic ] = "������� ����� �������� ������";
-        Text[ catalan ] = "Diversos caracteres CJK";
+        Text[ catalan ] = "CJK: diversos";
         Text[ finnish ] = "Sekalaiset CJK-merkit";
+        Text[ thai ] = "เบ็ดเตล็ด CJK ";
     };
 String RID_SUBSETSTR_ENCLOSED_CJK_LETTERS
 {
@@ -1651,24 +1710,25 @@ String RID_SUBSETSTR_ENCLOSED_CJK_LETTERS
     Text [ ENGLISH ] = "Enclosed CJK Letters And Months" ;
     Text[ english_us ] = "Enclosed CJK Letters And Months";
         Text[ portuguese ] = "Caracteres e meses CJK inclusos";
-        Text[ russian ] = "�������������� CJK-������� � ������";
+        Text[ russian ] = "����������� ������� CJK � ������";
         Text[ greek ] = "�������������� ���������� CJK ��� �����";
         Text[ dutch ] = "Ingesloten CJK-letters & maanden";
         Text[ french ] = "Mois & lettres CJC encercl�s";
         Text[ spanish ] = "Caracteres y meses incluidos en CJK";
         Text[ italian ] = "Caratteri e mesi CJK inclusi";
-        Text[ danish ] = "Enclosed CJK Letters And Months";
+        Text[ danish ] = "CJK-tegn og -m�neder med bolle omkring";
         Text[ swedish ] = "Omslutna CJK-bokstav och -m�nad";
         Text[ polish ] = "Otoczone CJK litery i miesi�ce";
         Text[ portuguese_brazilian ] = "Enclosed CJK Letters And Months";
         Text[ japanese ] = "囲みCJK用文字・月";
-        Text[ korean ] = "CJK 문자와 월, 원문자";
+        Text[ korean ] = "CJK용 원문자 및 월";
         Text[ chinese_simplified ] = "带括号的中日韩字符和月份";
         Text[ chinese_traditional ] = "帶括號的中日韓字元和月份";
         Text[ turkish ] = "Enclosed CJK Letters And Months";
         Text[ arabic ] = "���� ����� ����� �������� ������ �� �����";
-        Text[ catalan ] = "Caracteres y meses incluidos en CJK";
+        Text[ catalan ] = "Car�cters i mesos inclosos en CJK";
         Text[ finnish ] = "Sis�llytetyt CJK-kirjaimet ja kuukaudet";
+        Text[ thai ] = "ตัวอักษรและเดือนที่ล้อมรอบ CJK ";
     };
 String RID_SUBSETSTR_CJK_COMPATIBILITY
 {
@@ -1683,7 +1743,7 @@ String RID_SUBSETSTR_CJK_COMPATIBILITY
         Text[ french ] = "Compatibilit� CJC";
         Text[ spanish ] = "Compatibilidad CJK";
         Text[ italian ] = "Compatibilit� CJK";
-        Text[ danish ] = "CJK Compatibility";
+        Text[ danish ] = "CJK-kompatibilitet";
         Text[ swedish ] = "CJK kompatibilitet";
         Text[ polish ] = "Kompatybilno�� z CJK";
         Text[ portuguese_brazilian ] = "CJK Compatibility";
@@ -1693,8 +1753,9 @@ String RID_SUBSETSTR_CJK_COMPATIBILITY
         Text[ chinese_traditional ] = "中日韓相容";
         Text[ turkish ] = "CJK Compatibility";
         Text[ arabic ] = "����� ������� ���������� ��������";
-        Text[ catalan ] = "Compatibilidad CJK";
+        Text[ catalan ] = "Compatibilitat amb CJK";
         Text[ finnish ] = "CJK-yhteensopivuus";
+        Text[ thai ] = "ความเข้ากันได้ของ CJK ";
     };
 String RID_SUBSETSTR_HANGUL
 {
@@ -1720,6 +1781,7 @@ String RID_SUBSETSTR_HANGUL
         Text[ arabic ] = "Hangul";
         Text[ catalan ] = "Hangul";
         Text[ finnish ] = "hangul";
+        Text[ thai ] = "ภาษาฮังกุล";
     };
 String RID_SUBSETSTR_CJK_UNIFIED_IDGRAPH
 {
@@ -1733,7 +1795,7 @@ String RID_SUBSETSTR_CJK_UNIFIED_IDGRAPH
         Text[ french ] = "Id�ogrammes unifi�s CJC";
         Text[ spanish ] = "Ideogramas CJK unificados";
         Text[ italian ] = "Ideogramma CJK unificato";
-        Text[ danish ] = "CJK Unified Ideographs";
+        Text[ danish ] = "Standardiserede CJK-ideogrammer";
         Text[ swedish ] = "Enhetliga CJK-ideogram";
         Text[ polish ] = "Ujednolicone ideogramy CJK";
         Text[ portuguese_brazilian ] = "CJK Unified Ideographs";
@@ -1743,8 +1805,9 @@ String RID_SUBSETSTR_CJK_UNIFIED_IDGRAPH
         Text[ chinese_traditional ] = "中日韓統一漢字";
         Text[ turkish ] = "CJK Unified Ideographs";
         Text[ arabic ] = "��������� ���� ���� ������� �����";
-        Text[ catalan ] = "Ideogramas CJK unificados";
+        Text[ catalan ] = "Ideogrames unificats CJK";
         Text[ finnish ] = "Yhdistetyt CJK-symbolit";
+        Text[ thai ] = "เครื่องหมายแสดงความหมายที่มีเอกภาพของ CJK ";
     };
 String RID_SUBSETSTR_CJK_EXT_A_UNIFIED_IDGRAPH
 {
@@ -1758,7 +1821,7 @@ String RID_SUBSETSTR_CJK_EXT_A_UNIFIED_IDGRAPH
         Text[ french ] = "Id�ogrammes unifi�s CJC extension-A";
         Text[ spanish ] = "Ideogramas CJK unificados extensi�n A";
         Text[ italian ] = "Ideogramma CJK unificato estensione A";
-        Text[ danish ] = "CJK Unified Ideographs Extension-A";
+        Text[ danish ] = "Standardiserede CJK-ideogrammer Udvidelse-A";
         Text[ swedish ] = "Enhetliga CJK-ideogram ut�kning-A";
         Text[ polish ] = "Ujednolicony ideogram CJK rozszerzenie-A";
         Text[ portuguese_brazilian ] = "CJK Unified Ideographs Extension-A";
@@ -1768,8 +1831,9 @@ String RID_SUBSETSTR_CJK_EXT_A_UNIFIED_IDGRAPH
         Text[ chinese_traditional ] = "中日韓統一漢字擴充-A";
         Text[ turkish ] = "CJK Unified Ideographs Extension-A";
         Text[ arabic ] = "��������� ���� ���� ������� ������ ����A-";
-        Text[ catalan ] = "Ideogramas CJK unificados extensi�n A";
+        Text[ catalan ] = "Ideogrames CJK unificats extensi� A";
         Text[ finnish ] = "Yhdistetyt CJK-symbolit (laajennus A)";
+        Text[ thai ] = "ส่วนขยายเครื่องหมายที่แสดงความหมายที่มีเอกภาพของ CJK -A";
     };
 String RID_SUBSETSTR_PRIVATE_USE_AREA
 {
@@ -1779,11 +1843,11 @@ String RID_SUBSETSTR_PRIVATE_USE_AREA
         Text[ portuguese ] = "�rea de utiliza��o privada";
         Text[ russian ] = "��� �������� �������������";
         Text[ greek ] = "������� ���������� ��� �� ����� ��� ����������";
-        Text[ dutch ] = "Priv�gebruik";
+        Text[ dutch ] = "Priv�-gebruik";
         Text[ french ] = "Zone � usage priv�";
         Text[ spanish ] = "S�mbolos espec�ficos de fuentes";
         Text[ italian ] = "Area uso privato";
-        Text[ danish ] = "Private Use Area";
+        Text[ danish ] = "Tegns�tspecifikke symboler";
         Text[ swedish ] = "Symboler specifika f. teckenupps�ttningar";
         Text[ polish ] = "Symbole specyficzne dla zbioru znak�w";
         Text[ portuguese_brazilian ] = "Private Use Area";
@@ -1793,8 +1857,9 @@ String RID_SUBSETSTR_PRIVATE_USE_AREA
         Text[ chinese_traditional ] = "專用區域";
         Text[ turkish ] = "Private Use Area";
         Text[ arabic ] = "����� ������� ���";
-        Text[ catalan ] = "S�mbolos espec�ficos de fuentes";
+        Text[ catalan ] = "�rea d'�s privat";
         Text[ finnish ] = "Henkil�kohtainen alue";
+        Text[ thai ] = "พื้นที่ใช้ส่วนตัว";
     };
 String RID_SUBSETSTR_CJK_COMPAT_IDGRAPHS
 {
@@ -1808,7 +1873,7 @@ String RID_SUBSETSTR_CJK_COMPAT_IDGRAPHS
         Text[ french ] = "Id�ogrammes compatibles CJC";
         Text[ spanish ] = "Ideogramas de compatibilidad CJK";
         Text[ italian ] = "Ideogrammi compatibili CJK";
-        Text[ danish ] = "CJK Compatibility Ideographs";
+        Text[ danish ] = "CJK-kompatible ideogrammer";
         Text[ swedish ] = "CJK - kompatibilitetsideogram";
         Text[ polish ] = "Ideogramy zgodne z CJK";
         Text[ portuguese_brazilian ] = "CJK Compatibility Ideographs";
@@ -1818,8 +1883,9 @@ String RID_SUBSETSTR_CJK_COMPAT_IDGRAPHS
         Text[ chinese_traditional ] = "中日韓相容字元";
         Text[ turkish ] = "CJK Compatibility Ideographs";
         Text[ arabic ] = "����� ��������� ������� ���������� ��������";
-        Text[ catalan ] = "Ideogramas de compatibilidad CJK";
+        Text[ catalan ] = "Ideogrames de compatibilitat amb CJK";
         Text[ finnish ] = "CJK-yhteensopivuussymbolit";
+        Text[ thai ] = "ความเข้ากันได้ของเครื่องหมายที่แสดงความหมาย CJK ";
     };
 String RID_SUBSETSTR_ALPHA_PRESENTATION
 {
@@ -1833,18 +1899,19 @@ String RID_SUBSETSTR_ALPHA_PRESENTATION
         Text[ french ] = "Formes de pr�sentation alphab�tiques";
         Text[ spanish ] = "Formas de presentaci�n alfab�ticas";
         Text[ italian ] = "Forme di presentazione alfabetiche";
-        Text[ danish ] = "Alphabetic Presentation Forms";
+        Text[ danish ] = "Alfabetiske pr�sentationsformer";
         Text[ swedish ] = "Alfabetiska presentationsformat";
         Text[ polish ] = "Fromy prezentacji alfabetycznej";
         Text[ portuguese_brazilian ] = "Alphabetic Presentation Forms";
         Text[ japanese ] = "アルファベット表示形";
-        Text[ korean ] = "알파벳 프리젠테이션 형식";
+        Text[ korean ] = "알파벳 프레젠테이션 형식";
         Text[ chinese_simplified ] = "字母的演示形式";
         Text[ chinese_traditional ] = "字母演示圖樣";
         Text[ turkish ] = "Alphabetic Presentation Forms";
         Text[ arabic ] = "����� ���� ������� ������";
-        Text[ catalan ] = "Formas de presentaci�n alfab�ticas";
+        Text[ catalan ] = "Formes de presentaci� alfab�tiques";
         Text[ finnish ] = "Aakkostetut esityslomakkeet";
+        Text[ thai ] = "แบบฟอร์มการนำเสนอเรียงตามตัวอักษร";
     };
 String RID_SUBSETSTR_ARABIC_PRESENT_A
 {
@@ -1859,18 +1926,19 @@ String RID_SUBSETSTR_ARABIC_PRESENT_A
         Text[ spanish ] = "Formas A de presentaci�n �rabe";
         Text[ italian ] = "Forme di presentazione arabe A";
 
-        Text[ danish ] = "Arabic Presentation Forms-A";
+        Text[ danish ] = "Arabiske pr�sentationsformer-A";
         Text[ swedish ] = "Arabiskt presentationsformat-A";
         Text[ polish ] = "Arabskie formy prezentacyjne-A";
         Text[ portuguese_brazilian ] = "Arabic Presentation Forms-A";
         Text[ japanese ] = "アラビア表示形 A";
-        Text[ korean ] = "아랍어 프리젠테이션 유형-A";
+        Text[ korean ] = "아랍어 프레젠테이션 형식-A";
         Text[ chinese_simplified ] = "阿拉伯演示形式 A";
         Text[ chinese_traditional ] = "阿拉伯演示圖樣-A";
         Text[ turkish ] = "Arabic Presentation Forms-A";
         Text[ arabic ] = "����� ���� ������� �����-A";
-        Text[ catalan ] = "Formas A de presentaci�n �rabe";
+        Text[ catalan ] = "Formes A de presentaci� �rab";
         Text[ finnish ] = "Arabiankieliset esityslomakkeet - A";
+        Text[ thai ] = "แบบฟอร์มการนำเสนอภาษาอารบิก-A";
     };
 String RID_SUBSETSTR_COMBINING_HALF_MARKS
 {
@@ -1884,7 +1952,7 @@ String RID_SUBSETSTR_COMBINING_HALF_MARKS
         Text[ french ] = "Demi-signes jonctifs";
         Text[ spanish ] = "Combinaci�n de medias marcas";
         Text[ italian ] = "Mezze marche di combinazione";
-        Text[ danish ] = "Combining Half Marks";
+        Text[ danish ] = "Kombinerende halvm�rker";
         Text[ swedish ] = "Kombinerar halva markeringar";
         Text[ polish ] = "��cz�ce p�znaczniki";
         Text[ portuguese_brazilian ] = "Combining Half Marks";
@@ -1894,8 +1962,9 @@ String RID_SUBSETSTR_COMBINING_HALF_MARKS
         Text[ chinese_traditional ] = "對應的符號";
         Text[ turkish ] = "Combining Half Marks";
         Text[ arabic ] = "�� ��� ��������";
-        Text[ catalan ] = "Combinaci�n de medias marcas";
+        Text[ catalan ] = "Combinaci� de miges marques";
         Text[ finnish ] = "Puolimerkkien yhdist�minen";
+        Text[ thai ] = "การเชื่อมเครื่องหมายครึ่ง";
     };
 String RID_SUBSETSTR_CJK_COMPAT_FORMS
 {
@@ -1909,7 +1978,7 @@ String RID_SUBSETSTR_CJK_COMPAT_FORMS
         Text[ french ] = "Formes compatibles CJC";
         Text[ spanish ] = "Formas de compatibilidad CJK";
         Text[ italian ] = "Forme compatibili CJK";
-        Text[ danish ] = "CJK Compatibility Forms";
+        Text[ danish ] = "CJK-kompatibilitetsformer";
         Text[ swedish ] = "CJK - kompatibilitetsformat";
         Text[ polish ] = "Formy zgodno�ci CJK";
         Text[ portuguese_brazilian ] = "CJK Compatibility Forms";
@@ -1919,8 +1988,9 @@ String RID_SUBSETSTR_CJK_COMPAT_FORMS
         Text[ chinese_traditional ] = "中日韓相容圖樣";
         Text[ turkish ] = "CJK Compatibility Forms";
         Text[ arabic ] = "����� ����� ������� ���������� ��������";
-        Text[ catalan ] = "Formas de compatibilidad CJK";
+        Text[ catalan ] = "Formes de compatibilitat amb CJK";
         Text[ finnish ] = "CJK-yhteensopivuuslomakkeet";
+        Text[ thai ] = "แบบฟอร์มที่เข้ากันได้ของ CJK ";
     };
 String RID_SUBSETSTR_SMALL_FORM_VARIANTS
 {
@@ -1934,19 +2004,20 @@ String RID_SUBSETSTR_SMALL_FORM_VARIANTS
         Text[ french ] = "Petites variantes de formes";
         Text[ spanish ] = "Variantes de peque�as formas";
         Text[ italian ] = "Piccole varianti di forma";
-        Text[ danish ] = "Small Form Variants";
+        Text[ danish ] = "Sm� formvarianter";
         Text[ swedish ] = "Sm� formatvarianter";
         Text[ polish ] = "Warianty ma�ych form";
         Text[ portuguese_brazilian ] = "Small Form Variants";
         Text[ japanese ] = "小字形";
 
-        Text[ korean ] = "작은 형식　변형";
+        Text[ korean ] = "소형 문자";
         Text[ chinese_simplified ] = "小写变体";
         Text[ chinese_traditional ] = "小寫變體";
         Text[ turkish ] = "Small Form Variants";
         Text[ arabic ] = "������� ����� ����";
-        Text[ catalan ] = "Variantes de peque�as formas";
+        Text[ catalan ] = "Variants petites del formulari";
         Text[ finnish ] = "Pienimuotoiset";
+        Text[ thai ] = "ตัวแปรของแบบฟอร์มเล็ก";
     };
 String RID_SUBSETSTR_ARABIC_PRESENT_B
 {
@@ -1960,18 +2031,19 @@ String RID_SUBSETSTR_ARABIC_PRESENT_B
         Text[ french ] = "Formes-B de pr�sentation arabe";
         Text[ spanish ] = "Formas B de presentaci�n �rabe";
         Text[ italian ] = "Forme di presentazione arabe B";
-        Text[ danish ] = "Arabic Presentation Forms-B";
+        Text[ danish ] = "Arabiske pr�sentationsformer-B";
         Text[ swedish ] = "Arabiskt presentationsformat-B";
         Text[ polish ] = "Arabskie formy prezenacyjne-B";
         Text[ portuguese_brazilian ] = "Arabic Presentation Forms-B";
         Text[ japanese ] = "アラビア表示形 B";
-        Text[ korean ] = "아랍어 프리젠테이션 유형-B";
+        Text[ korean ] = "아랍어 프레젠테이션 형식-B";
         Text[ chinese_simplified ] = "阿拉伯演示形式 B";
         Text[ chinese_traditional ] = "阿拉伯演示圖樣-B";
         Text[ turkish ] = "Arabic Presentation Forms-B";
         Text[ arabic ] = "����� ���� ������� �����-B";
-        Text[ catalan ] = "Formas B de presentaci�n �rabe";
+        Text[ catalan ] = "Formes B de presentaci� �rab";
         Text[ finnish ] = "Arabiankieliset esityslomakkeet - B";
+        Text[ thai ] = "แบบฟอร์มการนำเสนอภาษาอารบิก-B";
     };
 String RID_SUBSETSTR_HALFW_FULLW_FORMS
 {
@@ -1979,24 +2051,25 @@ String RID_SUBSETSTR_HALFW_FULLW_FORMS
     Text [ ENGLISH ] = "Halfwidth And Fullwidth Forms" ;
     Text[ english_us ] = "Half-width and Full-width Forms";
         Text[ portuguese ] = "Formas de meia-largura e largura normal";
-        Text[ russian ] = "����� ���������� � ������ ������";
+        Text[ russian ] = "����������� � ������ ������� ����";
         Text[ greek ] = "������� ��� ���-������� ������";
         Text[ dutch ] = "Halve en volledige breedte";
         Text[ french ] = "Formes de demi et pleine chasse";
         Text[ spanish ] = "Formas anchas y medio anchas";
         Text[ italian ] = "Forme di spessore pieno/ridotto";
-        Text[ danish ] = "Halfwidth And Fullwidth Forms";
+        Text[ danish ] = "Halvbrede og brede former";
         Text[ swedish ] = "Halv- och helbreda format";
         Text[ polish ] = "Formy szerokie i p�szerokie";
         Text[ portuguese_brazilian ] = "Halfwidth And Fullwidth Forms";
         Text[ japanese ] = "半角形・全角形";
-        Text[ korean ] = "반 폭과 전폭 형식";
+        Text[ korean ] = "반자 및 전자 형식";
         Text[ chinese_simplified ] = "半形和全形字符";
         Text[ chinese_traditional ] = "半形和全形";
         Text[ turkish ] = "Halfwidth And Fullwidth Forms";
         Text[ arabic ] = "����� ���� ����� ����� ���� ����";
-        Text[ catalan ] = "Formas anchas y medio anchas";
+        Text[ catalan ] = "Formularis d'amplada mitja i total";
         Text[ finnish ] = "Puolileve�t ja t�ysleve�t lomakkeet";
+        Text[ thai ] = "แบบฟอร์มที่มีความกว้างครึ่งหนึ่งและความกว้างเต็ม";
     };
 String RID_SUBSETSTR_SPECIALS
 {
@@ -2010,7 +2083,7 @@ String RID_SUBSETSTR_SPECIALS
         Text[ french ] = "Symboles sp�ciaux";
         Text[ spanish ] = "S�mbolos especiales";
         Text[ italian ] = "Simboli speciali";
-        Text[ danish ] = "Specials";
+        Text[ danish ] = "Specielle symboler";
         Text[ swedish ] = "Speciella symboler";
         Text[ polish ] = "Znaki specjalne";
         Text[ portuguese_brazilian ] = "Specials";
@@ -2020,8 +2093,9 @@ String RID_SUBSETSTR_SPECIALS
         Text[ chinese_traditional ] = "特殊字元";
         Text[ turkish ] = "Specials";
         Text[ arabic ] = "���� ����";
-        Text[ catalan ] = "S�mbolos especiales";
+        Text[ catalan ] = "Especials";
         Text[ finnish ] = "Erikoiset";
+        Text[ thai ] = "ความพิเศษ";
     };
 String RID_SUBSETSTR_HANGUL_GA
 {
@@ -2047,6 +2121,7 @@ String RID_SUBSETSTR_HANGUL_GA
         Text[ arabic ] = "Hangul Ga";
         Text[ catalan ] = "Hangul Ga";
         Text[ finnish ] = "hangul ga";
+        Text[ thai ] = "ภาษาฮังกุลกา";
     };
 String RID_SUBSETSTR_HANGUL_NA
 {
@@ -2072,6 +2147,7 @@ String RID_SUBSETSTR_HANGUL_NA
         Text[ arabic ] = "Hangul Na";
         Text[ catalan ] = "Hangul Na";
         Text[ finnish ] = "hangul na";
+        Text[ thai ] = "ภาษาฮังกุลนา";
     };
 String RID_SUBSETSTR_HANGUL_DA
 {
@@ -2097,6 +2173,7 @@ String RID_SUBSETSTR_HANGUL_DA
         Text[ arabic ] = "Hangul Da";
         Text[ catalan ] = "Hangul Da";
         Text[ finnish ] = "hangul da";
+        Text[ thai ] = "ภาษาฮังกุลดา";
     };
 String RID_SUBSETSTR_HANGUL_RA
 {
@@ -2122,6 +2199,7 @@ String RID_SUBSETSTR_HANGUL_RA
         Text[ arabic ] = "Hangul Ra";
         Text[ catalan ] = "Hangul Ra";
         Text[ finnish ] = "hangul ra";
+        Text[ thai ] = "ภาษาฮังกุลรา";
     };
 String RID_SUBSETSTR_HANGUL_MA
 {
@@ -2147,6 +2225,7 @@ String RID_SUBSETSTR_HANGUL_MA
         Text[ arabic ] = "Hangul Ma";
         Text[ catalan ] = "Hangul Ma";
         Text[ finnish ] = "hangul ma";
+        Text[ thai ] = "ภาษาฮังกุลมา";
     };
 String RID_SUBSETSTR_HANGUL_BA
 {
@@ -2172,6 +2251,7 @@ String RID_SUBSETSTR_HANGUL_BA
         Text[ arabic ] = "Hangul Ba";
         Text[ catalan ] = "Hangul Ba";
         Text[ finnish ] = "hangul ba";
+        Text[ thai ] = "ภาษาฮังกุลบา";
     };
 String RID_SUBSETSTR_HANGUL_SA
 {
@@ -2197,6 +2277,7 @@ String RID_SUBSETSTR_HANGUL_SA
         Text[ arabic ] = "Hangul Sa";
         Text[ catalan ] = "Hangul Sa";
         Text[ finnish ] = "hangul sa";
+        Text[ thai ] = "ภาษาฮังกุลซา";
     };
 String RID_SUBSETSTR_HANGUL_AH
 {
@@ -2222,6 +2303,7 @@ String RID_SUBSETSTR_HANGUL_AH
         Text[ arabic ] = "Hangul Ah";
         Text[ catalan ] = "Hangul Ah";
         Text[ finnish ] = "hangul ah";
+        Text[ thai ] = "ภาษาฮังกุลอาห์";
     };
 String RID_SUBSETSTR_HANGUL_JA
 {
@@ -2247,6 +2329,7 @@ String RID_SUBSETSTR_HANGUL_JA
         Text[ arabic ] = "Hangul Ja";
         Text[ catalan ] = "Hangul Ja";
         Text[ finnish ] = "hangul ja";
+        Text[ thai ] = "ภาษาฮังกุลจา";
     };
 String RID_SUBSETSTR_HANGUL_CHA
 {
@@ -2272,6 +2355,7 @@ String RID_SUBSETSTR_HANGUL_CHA
         Text[ arabic ] = "Hangul Cha";
         Text[ catalan ] = "Hangul Cha";
         Text[ finnish ] = "hangul cha";
+        Text[ thai ] = "ภาษาฮังกุลชา";
     };
 String RID_SUBSETSTR_HANGUL_KA
 {
@@ -2290,13 +2374,14 @@ String RID_SUBSETSTR_HANGUL_KA
         Text[ polish ] = "Hangul Ka";
         Text[ portuguese_brazilian ] = "Hangul Ka";
         Text[ japanese ] = "ハングル Ka";
-        Text[ korean ] = "한글 가";
+        Text[ korean ] = "한글 카";
         Text[ chinese_simplified ] = "韩文 Ka";
         Text[ chinese_traditional ] = "韓文 Ka";
         Text[ turkish ] = "Hangul Ka";
         Text[ arabic ] = "Hangul Ka";
         Text[ catalan ] = "Hangul Ka";
         Text[ finnish ] = "hangul ka";
+        Text[ thai ] = "ภาษาฮังกุลคา";
     };
 String RID_SUBSETSTR_HANGUL_TA
 {
@@ -2322,6 +2407,7 @@ String RID_SUBSETSTR_HANGUL_TA
         Text[ arabic ] = "Hangul Ta";
         Text[ catalan ] = "Hangul Ta";
         Text[ finnish ] = "hangul ta";
+        Text[ thai ] = "ภาษาฮังกุลทา";
     };
 String RID_SUBSETSTR_HANGUL_PA
 {
@@ -2347,6 +2433,7 @@ String RID_SUBSETSTR_HANGUL_PA
         Text[ arabic ] = "Hangul Pa";
         Text[ catalan ] = "Hangul Pa";
         Text[ finnish ] = "hangul pa";
+        Text[ thai ] = "ภาษาฮังกุลพา";
     };
 String RID_SUBSETSTR_HANGUL_HA
 {
@@ -2372,6 +2459,7 @@ String RID_SUBSETSTR_HANGUL_HA
         Text[ arabic ] = "Hangul Ha";
         Text[ catalan ] = "Hangul Ha";
         Text[ finnish ] = "hangul ha";
+        Text[ thai ] = "ภาษาฮังกุลฮา";
     };
 String RID_SUBSETSTR_YI
 {
@@ -2379,7 +2467,7 @@ String RID_SUBSETSTR_YI
     Text [ ENGLISH ] = "Yi" ;
     Text[ english_us ] = "Yi";
         Text[ portuguese ] = "Yi";
-        Text[ russian ] = "����� Yi";
+        Text[ russian ] = "Yi";
         Text[ greek ] = "Yi";
         Text[ dutch ] = "Yi";
         Text[ french ] = "Yi";
@@ -2397,6 +2485,7 @@ String RID_SUBSETSTR_YI
         Text[ arabic ] = "Yi";
         Text[ catalan ] = "Yi";
         Text[ finnish ] = "yi";
+        Text[ thai ] = "ภาษายิ";
     };
 String RID_SUBSETSTR_SINHALA
 {
@@ -2422,6 +2511,7 @@ String RID_SUBSETSTR_SINHALA
         Text[ arabic ] = "�������";
         Text[ catalan ] = "Sinhala";
         Text[ finnish ] = "sinhala";
+        Text[ thai ] = "ภาษาซินฮาลา";
     };
 String RID_SUBSETSTR_TIBETAN
 {
@@ -2435,7 +2525,7 @@ String RID_SUBSETSTR_TIBETAN
         Text[ french ] = "Tib�tain";
         Text[ spanish ] = "Tibetano";
         Text[ italian ] = "Tibetano";
-        Text[ danish ] = "Tibetan";
+        Text[ danish ] = "Tibetansk";
         Text[ swedish ] = "Tibetansk";
         Text[ polish ] = "Tybeta�ski";
         Text[ portuguese_brazilian ] = "Tibetan";
@@ -2445,8 +2535,9 @@ String RID_SUBSETSTR_TIBETAN
         Text[ chinese_traditional ] = "藏語";
         Text[ turkish ] = "Tibetan";
         Text[ arabic ] = "��������";
-        Text[ catalan ] = "Tibetano";
+        Text[ catalan ] = "Tibet�";
         Text[ finnish ] = "tiibet";
+        Text[ thai ] = "ภาษาธิเบต";
     };
 String RID_SUBSETSTR_MYANMAR
 {
@@ -2465,13 +2556,14 @@ String RID_SUBSETSTR_MYANMAR
         Text[ polish ] = "Myanmar";
         Text[ portuguese_brazilian ] = "Myanmar";
         Text[ japanese ] = "ミャンマー";
-        Text[ korean ] = "미얀마어";
+        Text[ korean ] = "미얀마";
         Text[ chinese_simplified ] = "缅甸语";
         Text[ chinese_traditional ] = "緬甸語";
         Text[ turkish ] = "Myanmar";
         Text[ arabic ] = "�������";
-        Text[ catalan ] = "Birmano";
+        Text[ catalan ] = "Myanmar";
         Text[ finnish ] = "myanmar";
+        Text[ thai ] = "ภาษาพม่า";
     };
 String RID_SUBSETSTR_KHMER
 {
@@ -2497,6 +2589,7 @@ String RID_SUBSETSTR_KHMER
         Text[ arabic ] = "��������";
         Text[ catalan ] = "Khmer";
         Text[ finnish ] = "khmeeri";
+        Text[ thai ] = "ภาษาเขมร";
     };
 String RID_SUBSETSTR_OGHAM
 {
@@ -2522,6 +2615,7 @@ String RID_SUBSETSTR_OGHAM
         Text[ arabic ] = "��������";
         Text[ catalan ] = "Ogham";
         Text[ finnish ] = "ogham";
+        Text[ thai ] = "ภาษาออกแฮม";
     };
 String RID_SUBSETSTR_RUNIC
 {
@@ -2529,13 +2623,13 @@ String RID_SUBSETSTR_RUNIC
     Text [ ENGLISH ] = "Runic" ;
     Text[ english_us ] = "Runic";
         Text[ portuguese ] = "R�nico";
-        Text[ russian ] = "���������� �������";
+        Text[ russian ] = "����������";
         Text[ greek ] = "�������";
         Text[ dutch ] = "Runen";
         Text[ french ] = "Runique";
         Text[ spanish ] = "R�nico";
         Text[ italian ] = "Runico";
-        Text[ danish ] = "Runic";
+        Text[ danish ] = "Runer";
         Text[ swedish ] = "Runor";
         Text[ polish ] = "Runy";
         Text[ portuguese_brazilian ] = "Runic";
@@ -2545,8 +2639,9 @@ String RID_SUBSETSTR_RUNIC
         Text[ chinese_traditional ] = "古代北歐文字";
         Text[ turkish ] = "Runic";
         Text[ arabic ] = "����";
-        Text[ catalan ] = "R�nico";
+        Text[ catalan ] = "R�nic";
         Text[ finnish ] = "riimukirjoitus";
+        Text[ thai ] = "ภาษารูนิก";
     };
 String RID_SUBSETSTR_SYRIAC
 {
@@ -2560,7 +2655,7 @@ String RID_SUBSETSTR_SYRIAC
         Text[ french ] = "Syriaque";
         Text[ spanish ] = "Sirio";
         Text[ italian ] = "Siriano";
-        Text[ danish ] = "Syriac";
+        Text[ danish ] = "Syrisk";
         Text[ swedish ] = "Syriska";
         Text[ polish ] = "Syryjski";
         Text[ portuguese_brazilian ] = "Syriac";
@@ -2570,8 +2665,9 @@ String RID_SUBSETSTR_SYRIAC
         Text[ chinese_traditional ] = "古代敘利亞語";
         Text[ turkish ] = "Syriac";
         Text[ arabic ] = "���������";
-        Text[ catalan ] = "Sirio";
+        Text[ catalan ] = "Siri";
         Text[ finnish ] = "syyria";
+        Text[ thai ] = "ภาษาซีเรีย";
     };
 String RID_SUBSETSTR_THAANA
 {
@@ -2579,7 +2675,7 @@ String RID_SUBSETSTR_THAANA
     Text [ ENGLISH ] = "Thaana" ;
     Text[ english_us ] = "Thaana";
         Text[ portuguese ] = "Thaana";
-        Text[ russian ] = "����� Thaana";
+        Text[ russian ] = "Thaana";
         Text[ greek ] = "Thaana";
         Text[ dutch ] = "Thaana";
         Text[ french ] = "Thaana";
@@ -2597,6 +2693,7 @@ String RID_SUBSETSTR_THAANA
         Text[ arabic ] = "����";
         Text[ catalan ] = "Thaana";
         Text[ finnish ] = "thaana";
+        Text[ thai ] = "ภาษาธานา";
     };
 String RID_SUBSETSTR_ETHIOPIC
 {
@@ -2610,7 +2707,7 @@ String RID_SUBSETSTR_ETHIOPIC
         Text[ french ] = "�thiopien";
         Text[ spanish ] = "Et�ope";
         Text[ italian ] = "Etiopico";
-        Text[ danish ] = "Ethiopic";
+        Text[ danish ] = "Etiopisk";
         Text[ swedish ] = "Etiopiska";
         Text[ polish ] = "Etiopski";
         Text[ portuguese_brazilian ] = "Ethiopic";
@@ -2620,8 +2717,9 @@ String RID_SUBSETSTR_ETHIOPIC
         Text[ chinese_traditional ] = "衣索比亞語";
         Text[ turkish ] = "Ethiopic";
         Text[ arabic ] = "�������";
-        Text[ catalan ] = "Et�ope";
+        Text[ catalan ] = "Et�op";
         Text[ finnish ] = "etiopia";
+        Text[ thai ] = "ภาษาเอธิโอเปีย";
     };
 String RID_SUBSETSTR_CHEROKEE
 {
@@ -2630,7 +2728,7 @@ String RID_SUBSETSTR_CHEROKEE
 
     Text[ english_us ] = "Cherokee";
         Text[ portuguese ] = "Cherokee";
-        Text[ russian ] = "������������ �������� ������";
+        Text[ russian ] = "������";
         Text[ greek ] = "Cherokee";
         Text[ dutch ] = "Cherokee";
         Text[ french ] = "Cherokee";
@@ -2646,8 +2744,9 @@ String RID_SUBSETSTR_CHEROKEE
         Text[ chinese_traditional ] = "查拉几族土人語";
         Text[ turkish ] = "Cherokee";
         Text[ arabic ] = "������";
-        Text[ catalan ] = "Cheroque";
+        Text[ catalan ] = "Xerokee";
         Text[ finnish ] = "cherokee";
+        Text[ thai ] = "ภาษาเชโรกี";
     };
 String RID_SUBSETSTR_CANADIAN_ABORIGINAL
 {
@@ -2657,11 +2756,11 @@ String RID_SUBSETSTR_CANADIAN_ABORIGINAL
         Text[ portuguese ] = "S�labas aut�ctones canadianas";
         Text[ russian ] = "����� ��������� ����������";
         Text[ greek ] = "����������� �������� Aborigin";
-        Text[ dutch ] = "Canadese Aboriginal lettergrepen";
+        Text[ dutch ] = "Canadese Aboriginal-lettergrepen";
         Text[ french ] = "Syllabaires autochtones canadiens";
         Text[ spanish ] = "S�labas abor�genes canadienses";
         Text[ italian ] = "Sillabe delle lingue autoctone canadesi";
-        Text[ danish ] = "Canadian Aboriginal Syllables";
+        Text[ danish ] = "Canadiske urindbyggerstavelser";
         Text[ swedish ] = "Kanadensiska aboriginstavelser";
         Text[ polish ] = "Kanadyjskie sylaby aborygen�w";
         Text[ portuguese_brazilian ] = "Canadian Aboriginal Syllables";
@@ -2671,8 +2770,9 @@ String RID_SUBSETSTR_CANADIAN_ABORIGINAL
         Text[ chinese_traditional ] = "加拿大土著人的語言字母";
         Text[ turkish ] = "Canadian Aboriginal Syllables";
         Text[ arabic ] = "����� ������� ����������";
-        Text[ catalan ] = "S�labas abor�genes canadienses";
+        Text[ catalan ] = "S�l.labes abor�gens canadenques";
         Text[ finnish ] = "Kanadan alkuper�iskansojen kirjainmerkit";
+        Text[ thai ] = "พยางค์ภาษาอะบอริจินแคนาดา";
     };
 String RID_SUBSETSTR_MONGOLIAN
 {
@@ -2686,7 +2786,7 @@ String RID_SUBSETSTR_MONGOLIAN
         Text[ french ] = "Mongol";
         Text[ spanish ] = "Mogol";
         Text[ italian ] = "Mongolo";
-        Text[ danish ] = "Mongolian";
+        Text[ danish ] = "Mongolsk";
         Text[ swedish ] = "Mongoliska";
         Text[ polish ] = "Mongolski";
         Text[ portuguese_brazilian ] = "Mongolian";
@@ -2696,8 +2796,9 @@ String RID_SUBSETSTR_MONGOLIAN
         Text[ chinese_traditional ] = "蒙古語";
         Text[ turkish ] = "Mongolian";
         Text[ arabic ] = "��������";
-        Text[ catalan ] = "Mogol";
+        Text[ catalan ] = "Mongol";
         Text[ finnish ] = "mongolia";
+        Text[ thai ] = "ภาษามองโกเลีย";
     };
 };
 
@@ -2710,3 +2811,8 @@ String RID_SUBSETSTR_MONGOLIAN
 
 
 
+
+
+
+
+
diff --git a/svx/source/dialog/connect.src b/svx/source/dialog/connect.src
index 243db24b5886..1f3fc4b22056 100644
--- a/svx/source/dialog/connect.src
+++ b/svx/source/dialog/connect.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: connect.src,v $
  *
- *  $Revision: 1.22 $
+ *  $Revision: 1.23 $
  *
- *  last change: $Author: kz $ $Date: 2001-11-16 22:52:25 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -95,7 +95,7 @@ TabPage RID_SVXPAGE_CONNECTION
         Text [ danish ] = "Type" ;
         Text [ italian ] = "~Tipo" ;
         Text [ spanish ] = "~Tipo" ;
-        Text [ french ] = "~Type" ;
+        Text [ french ] = "Type" ;
         Text [ dutch ] = "~Type" ;
         Text [ portuguese ] = "~Tipo" ;
         Text[ chinese_simplified ] = "类型(~T)";
@@ -108,8 +108,9 @@ TabPage RID_SVXPAGE_CONNECTION
         Text[ korean ] = "형태(~T)";
         Text[ turkish ] = "~Tip";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Tipo";
+        Text[ catalan ] = "~Tipus";
         Text[ finnish ] = "~Tyyppi";
+        Text[ thai ] = "~ชนิด";
     };
     ListBox LB_TYPE
     {
@@ -135,17 +136,18 @@ TabPage RID_SVXPAGE_CONNECTION
         Text [ dutch ] = "Lijnopvulling" ;
         Text [ portuguese ] = "Transposi��o de linhas" ;
         Text[ chinese_simplified ] = "线偏离";
-        Text[ russian ] = "�������� �����";
+        Text[ russian ] = "������ �����";
         Text[ polish ] = "Przesuni�cie linii";
         Text[ japanese ] = "線のずれ";
         Text[ chinese_traditional ] = "線偏離";
         Text[ arabic ] = "����� ������";
         Text[ greek ] = "���������� �������";
-        Text[ korean ] = "선 빗김";
+        Text[ korean ] = "휘인 선";
         Text[ turkish ] = "�izgi e�rili�i";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Desplazamiento de l�neas";
-        Text[ finnish ] = "Viivan viistotus";
+        Text[ catalan ] = "Despla�ament de l�nies";
+        Text[ finnish ] = "Viivanosien viistoudet";
+        Text[ thai ] = "บรรทัดเฉ";
     };
     FixedText FT_LINE_1
     {
@@ -172,8 +174,9 @@ TabPage RID_SVXPAGE_CONNECTION
         Text[ korean ] = "선1";
         Text[ turkish ] = "�izgi ~1";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "L�nea ~1";
-        Text[ finnish ] = "Rivi ~1";
+        Text[ catalan ] = "L�nia ~1";
+        Text[ finnish ] = "Viivanosa ~1";
+        Text[ thai ] = "Line ~1";
     };
     MetricField MTR_FLD_LINE_1
     {
@@ -216,8 +219,9 @@ TabPage RID_SVXPAGE_CONNECTION
         Text[ korean ] = "선2";
         Text[ turkish ] = "�izgi ~2";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "L�nea ~2";
-        Text[ finnish ] = "Rivi ~2";
+        Text[ catalan ] = "L�nia ~2";
+        Text[ finnish ] = "Viivanosa ~2";
+        Text[ thai ] = "Line ~2";
     };
     MetricField MTR_FLD_LINE_2
     {
@@ -260,8 +264,9 @@ TabPage RID_SVXPAGE_CONNECTION
         Text[ korean ] = "선3";
         Text[ turkish ] = "�izgi ~3";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "L�nea~3";
-        Text[ finnish ] = "Rivi ~3";
+        Text[ catalan ] = "L�nia ~3";
+        Text[ finnish ] = "Viivanosa ~3";
+        Text[ thai ] = "Line ~3";
     };
     MetricField MTR_FLD_LINE_3
     {
@@ -290,12 +295,12 @@ TabPage RID_SVXPAGE_CONNECTION
         Text [ swedish ] = "Linjeavst�nd" ;
         Text [ danish ] = "Linjeafstand" ;
         Text [ italian ] = "Distanza tra le linee" ;
-        Text [ spanish ] = "Distancia entre l�neas" ;
+        Text [ spanish ] = "Interlineado" ;
         Text [ french ] = "�cart entre les lignes" ;
         Text [ dutch ] = "Lijnafstand" ;
         Text [ portuguese ] = "Intervalo entre linhas" ;
         Text[ chinese_simplified ] = "线间隔";
-        Text[ russian ] = "���������� ����� �������";
+        Text[ russian ] = "�������� ����� �������";
         Text[ polish ] = "Odst�py mi�dzy liniami";
         Text[ japanese ] = "線間隔";
         Text[ chinese_traditional ] = "線間隔";
@@ -304,8 +309,9 @@ TabPage RID_SVXPAGE_CONNECTION
         Text[ korean ] = "선 간격";
         Text[ turkish ] = "�izgi aral���";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Distancia entre l�neas";
-        Text[ finnish ] = "Line spacing";
+        Text[ catalan ] = "Dist�ncia entre l�nies";
+        Text[ finnish ] = "Viivan v�lit";
+        Text[ thai ] = "ระยะห่างบรรทัด";
     };
     FixedText FT_HORZ_1
     {
@@ -315,9 +321,9 @@ TabPage RID_SVXPAGE_CONNECTION
         Text [ ENGLISH ] = "Start h~orizontal" ;
         Text [ english_us ] = "~Begin horizontal" ;
         Text [ portuguese_brazilian ] = "H~orizontal 1" ;
-        Text [ swedish ] = "Start ~horisontell" ;
+        Text [ swedish ] = "Start h~orisontellt" ;
         Text [ danish ] = "Start vandret" ;
-        Text [ italian ] = "Inizio o~rizzontale" ;
+        Text [ italian ] = "Inizio ~orizzontale" ;
         Text [ spanish ] = "Comienzo h~orizontal" ;
         Text [ french ] = "D�but h~orizontal" ;
         Text [ dutch ] = "Begin h~orizontaal" ;
@@ -332,8 +338,9 @@ TabPage RID_SVXPAGE_CONNECTION
         Text[ korean ] = "가로선 시작(~B)";
         Text[ turkish ] = "Ba�� ~yatay";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Comienzo h~orizontal";
-        Text[ finnish ] = "~Aloita vaakasuunnassa";
+        Text[ catalan ] = "Inici h~oritzontal";
+        Text[ finnish ] = "Alussa, ~vaakasuuntaan";
+        Text[ thai ] = "~Begin horizontal";
     };
     MetricField MTR_FLD_HORZ_1
     {
@@ -359,7 +366,7 @@ TabPage RID_SVXPAGE_CONNECTION
         Text [ ENGLISH ] = "End ho~rizontal" ;
         Text [ english_us ] = "End ~horizontal" ;
         Text [ portuguese_brazilian ] = "Ho~rizontal 2" ;
-        Text [ swedish ] = "Slut h~orisontellt" ;
+        Text [ swedish ] = "Slut ho~risontellt" ;
         Text [ danish ] = "Slut vandret" ;
         Text [ italian ] = "Fine o~rizzontale" ;
         Text [ spanish ] = "Final hori~zontal" ;
@@ -376,8 +383,9 @@ TabPage RID_SVXPAGE_CONNECTION
         Text[ korean ] = "가로선 끝(~H)";
         Text[ turkish ] = "Sonu ya~tay";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Final hori~zontal";
-        Text[ finnish ] = "~Vaakalopetus";
+        Text[ catalan ] = "Fi ~horitzontal";
+        Text[ finnish ] = "~Lopussa, vaa~kasuuntaan";
+        Text[ thai ] = "End ~horizontal";
     };
     MetricField MTR_FLD_HORZ_2
     {
@@ -403,7 +411,7 @@ TabPage RID_SVXPAGE_CONNECTION
         Text [ ENGLISH ] = "Start ~vertical" ;
         Text [ english_us ] = "Begin ~vertical" ;
         Text [ portuguese_brazilian ] = "~Vertikal 1" ;
-        Text [ swedish ] = "Start ~vertikal" ;
+        Text [ swedish ] = "Start ~vertikalt" ;
         Text [ danish ] = "Start lodret" ;
         Text [ italian ] = "Inizio ~verticale" ;
         Text [ spanish ] = "Comienzo ~vertical" ;
@@ -411,7 +419,7 @@ TabPage RID_SVXPAGE_CONNECTION
         Text [ dutch ] = "Begin ~verticaal" ;
         Text [ portuguese ] = "In�cio ~vertical" ;
         Text[ chinese_simplified ] = "起始部分是垂直方向(~V)";
-        Text[ russian ] = "������ �����������";
+        Text[ russian ] = "��~���� �����������";
         Text[ polish ] = "Pocz�tek pionowo";
         Text[ japanese ] = "縦線の始点(~V)";
         Text[ chinese_traditional ] = "起始方向是垂直方向(~V)";
@@ -420,8 +428,9 @@ TabPage RID_SVXPAGE_CONNECTION
         Text[ korean ] = "세로선 시작(~V)";
         Text[ turkish ] = "Ba�� ~dikey";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Comienzo ~vertical";
-        Text[ finnish ] = "Aloita ~pystysuunnassa";
+        Text[ catalan ] = "Inici ~vertical";
+        Text[ finnish ] = "Alussa, ~pystysuuntaan";
+        Text[ thai ] = "Begin ~vertical";
     };
     MetricField MTR_FLD_VERT_1
     {
@@ -449,7 +458,7 @@ TabPage RID_SVXPAGE_CONNECTION
         Text [ portuguese_brazilian ] = "V~ertikal 2" ;
         Text [ swedish ] = "Slut v~ertikalt" ;
         Text [ danish ] = "Slut lodret" ;
-        Text [ italian ] = "Fine v~erticale" ;
+        Text [ italian ] = "~Fine verticale" ;
         Text [ spanish ] = "Final v~ertical" ;
         Text [ french ] = "Fin v~erticale" ;
         Text [ dutch ] = "Einde v~erticaal" ;
@@ -464,8 +473,9 @@ TabPage RID_SVXPAGE_CONNECTION
         Text[ korean ] = "세로선 끝(~E)";
         Text[ turkish ] = "Sonu d~ikey";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Final v~ertical";
-        Text[ finnish ] = "~Pystylopetus";
+        Text[ catalan ] = "~Fi vertical";
+        Text[ finnish ] = "Lopussa, pyst~ysuuntaan";
+        Text[ thai ] = "~End vertical";
     };
     MetricField MTR_FLD_VERT_2
     {
@@ -492,38 +502,40 @@ TabPage RID_SVXPAGE_CONNECTION
         QuickHelpText = "Vorschau" ;
         QuickHelpText [ ENGLISH ] = "Preview" ;
         QuickHelpText[ english_us ] = "Preview";
-        QuickHelpText[ portuguese ] = "Visualizar!";
+        QuickHelpText[ portuguese ] = "Visualizar";
         QuickHelpText[ russian ] = "��������";
         QuickHelpText[ greek ] = "Preview";
         QuickHelpText[ dutch ] = "Voorbeeld";
         QuickHelpText[ french ] = "Aper�u";
         QuickHelpText[ spanish ] = "Previsualizaci�n";
-        QuickHelpText[ finnish ] = "Preview";
+        QuickHelpText[ finnish ] = "Esikatselu";
         QuickHelpText[ italian ] = "Anteprima";
         QuickHelpText[ danish ] = "Preview";
         QuickHelpText[ swedish ] = "F�rhandsvisning";
         QuickHelpText[ polish ] = "Podgl�d";
         QuickHelpText[ portuguese_brazilian ] = "Preview";
-        QuickHelpText[ japanese ] = "ﾌﾟﾚﾋﾞｭｰ";
-        QuickHelpText[ korean ] = "미리보기!";
+        QuickHelpText[ japanese ] = "プレビュー";
+        QuickHelpText[ korean ] = "미리보기";
         QuickHelpText[ chinese_simplified ] = "预视";
         QuickHelpText[ chinese_traditional ] = "預覽";
         QuickHelpText[ turkish ] = "Preview";
         QuickHelpText[ arabic ] = "Preview";
-        QuickHelpText[ catalan ] = "Preview";
+        QuickHelpText[ catalan ] = "Previsualitza";
+        QuickHelpText[ thai ] = "Preview";
     };
     Text[ chinese_simplified ] = "连接符";
-    Text[ russian ] = "�������������� ������� �����";
+    Text[ russian ] = "�������������� �����";
     Text[ polish ] = "��cznik";
-    Text[ japanese ] = "ｺﾈｸﾀ";
+    Text[ japanese ] = "コネクタ";
     Text[ chinese_traditional ] = "連接符";
     Text[ arabic ] = "������";
     Text[ greek ] = "�������";
-    Text[ korean ] = "연결선";
+    Text[ korean ] = "연결자";
     Text[ turkish ] = "Ba�lay�c�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Conector";
-    Text[ finnish ] = "Liitin";
+    Text[ catalan ] = "Connector";
+    Text[ finnish ] = "Yhdysviiva";
+    Text[ thai ] = "ตัวเชื่อมต่อ";
 };
  // ******************************************************************* EOF
 
@@ -538,3 +550,10 @@ TabPage RID_SVXPAGE_CONNECTION
 
 
 
+
+
+
+
+
+
+
diff --git a/svx/source/dialog/contdlg.src b/svx/source/dialog/contdlg.src
index 0b569f16f00f..8a264f5ca608 100644
--- a/svx/source/dialog/contdlg.src
+++ b/svx/source/dialog/contdlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: contdlg.src,v $
  *
- *  $Revision: 1.26 $
+ *  $Revision: 1.27 $
  *
- *  last change: $Author: kz $ $Date: 2002-11-27 16:56:53 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -98,7 +98,7 @@ FloatingWindow RID_SVXDLG_CONTOUR
                 Text [ swedish ] = "Tilldela" ;
                 Text [ danish ] = "Tildel" ;
                 Text [ italian ] = "Assegna" ;
-                Text [ spanish ] = "Asignar" ;
+                Text [ spanish ] = "Aplicar" ;
                 Text [ french ] = "Assigner" ;
                 Text [ dutch ] = "Toewijzen" ;
                 Text[ chinese_simplified ] = "指定";
@@ -208,7 +208,7 @@ FloatingWindow RID_SVXDLG_CONTOUR
                 Text[ chinese_traditional ] = "矩形";
                 Text[ arabic ] = "������";
                 Text[ greek ] = "���������";
-                Text[ korean ] = "사각형";
+                Text[ korean ] = "직사각형";
                 Text[ turkish ] = "Dikd�rtgen";
                 Text[ language_user1 ] = " ";
                 Text[ catalan ] = "Rectangle";
@@ -312,7 +312,7 @@ FloatingWindow RID_SVXDLG_CONTOUR
                 Text [ french ] = "�diter des points" ;
                 Text [ swedish ] = "Redigera punkter" ;
                 Text [ dutch ] = "Punten bewerken" ;
-                Text [ spanish ] = "Modificar puntos" ;
+                Text [ spanish ] = "Editar puntos" ;
                 Text [ english_us ] = "Edit Points" ;
                 AutoCheck = TRUE ;
                 Text[ chinese_simplified ] = "编辑接点";
@@ -407,7 +407,7 @@ FloatingWindow RID_SVXDLG_CONTOUR
                 Text [ french ] = "Supprimer des points" ;
                 Text [ swedish ] = "Radera punkter" ;
                 Text [ dutch ] = "Punten verwijderen" ;
-                Text [ spanish ] = "Eliminar puntos" ;
+                Text [ spanish ] = "Borrar puntos" ;
                 Text [ english_us ] = "Delete Points" ;
                 Text[ chinese_simplified ] = "删除接点";
                 Text[ russian ] = "������� ����";
@@ -448,7 +448,7 @@ FloatingWindow RID_SVXDLG_CONTOUR
                 Text[ chinese_traditional ] = "自動輪廓";
                 Text[ arabic ] = "�� ����� ������";
                 Text[ greek ] = "��������������";
-                Text[ korean ] = "자동 외형선";
+                Text[ korean ] = "자동 윤곽";
                 Text[ turkish ] = "Otomatik kontur";
                 Text[ language_user1 ] = " ";
                 Text[ catalan ] = "Contorn autom�tic";
@@ -514,7 +514,7 @@ FloatingWindow RID_SVXDLG_CONTOUR
                 Text[ chinese_traditional ] = "恢復撤消指令";
                 Text[ arabic ] = "����� ";
                 Text[ greek ] = "��������� ";
-                Text[ korean ] = "복원";
+                Text[ korean ] = "다시 실행";
                 Text[ turkish ] = "Yinele ";
                 Text[ language_user1 ] = " ";
                 Text[ catalan ] = "Restaurar  ";
@@ -736,7 +736,7 @@ String STR_CONTOURDLG_WORKPLACE
     Text [ swedish ] = "Definition av ett nytt arbetsomr�de\nleder till att konturen raderas.\nVill du forts�tta �nd�?" ;
     Text [ danish ] = "Hvis du definerer et nyt arbejdsomr�de\nbliver konturen slettet.\nEr du sikker p� at du vil forts�tte?" ;
     Text [ italian ] = "L'impostazione di una nuova area di lavoro\ncauser� la cancellazione del contorno.\nVolete proseguire?" ;
-    Text [ spanish ] = "Al establecer una nueva �rea de trabajo\nse eliminar� el contorno.\n�Desea realmente continuar?" ;
+    Text [ spanish ] = "Al establecer una nueva �rea de trabajo\nse borrar� el contorno.\n�Desea realmente continuar?" ;
     Text [ french ] = "Assigner une nouvelle zone de travail\nsupprime le contour.\nSouhaitez-vous continuer ?" ;
     Text [ dutch ] = "Door het vastleggen van een nieuw werkbereik \nwordt de contour gewist.\nWilt u werkelijk doorgaan?" ;
     Text [ portuguese ] = "Ao definir uma nova �rea de\ntrabalho eliminar� o contorno.\nDeseja continuar?" ;
@@ -747,7 +747,7 @@ String STR_CONTOURDLG_WORKPLACE
     Text[ chinese_traditional ] = "定義一個新的編輯區域會清除輪廓。\n您真要繼續？";
     Text[ arabic ] = "����� ����� ��� ����� ���\n���� ��� ��� ���� �������. \n�� ���� �������� ������";
     Text[ greek ] = "� ������� ���� ���� �������� ��������\n���� �� ���������� �� �������� ��� �������������.\n������ ���������� �� ����������;";
-    Text[ korean ] = "새 작업 영역을 설정하면\n윤곽이 삭제됩니다.\n그래도 계속하겠습니까?";
+    Text[ korean ] = "새 작업 영역을 설정하면\n윤곽이 삭제됩니다.\n그래도 계속하시겠습니까?";
     Text[ turkish ] = "Yeni bir �al��ma alan� belirlenmesi durumunda\nkontur silinecek.\nDevam etmek istiyor musunuz?";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "En establir una nova �rea de treball\ns'eliminar� el contorn.\nVoleu continuar realment?";
@@ -776,7 +776,7 @@ String STR_CONTOURDLG_LINKED
     Text[ chinese_traditional ] = "這個圖形是和文件連結的。您要取消這個連結﹐編輯這個圖形？";
     Text[ arabic ] = "��� ������ ������ ��������. �� ���� ����� �������� ��� ����� �� ����� �����ɿ";
     Text[ greek ] = "�� ������� ���� ����� ����������� �� �� �������. ������ �� ���������� � ������� ��� �� ������������ �� �������;";
-    Text[ korean ] = "이 그래픽은 문서에 연결되어 있습니다. 편집하기 위해 그래픽 연결을 해제하겠습니까?";
+    Text[ korean ] = "이 그림은 문서에 연결되어 있습니다. 편집하기 위해 그림 연결을 해제하시겠습니까?";
     Text[ turkish ] = "Bu grafik, belge ile ba�lant�l�. Grafi�i d�zenlemek i�in bu ba�lant�y� kald�rmak istiyor musunuz?";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Aquesta imatge est� enlla�ada al document. Voleu desfer l'enlla� per editar la imatge?";
@@ -789,3 +789,8 @@ String STR_CONTOURDLG_LINKED
 
 
 
+
+
+
+
+
diff --git a/svx/source/dialog/ctredlin.src b/svx/source/dialog/ctredlin.src
index 9f93df4d80ca..43a4f62ccbd0 100644
--- a/svx/source/dialog/ctredlin.src
+++ b/svx/source/dialog/ctredlin.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ctredlin.src,v $
  *
- *  $Revision: 1.35 $
+ *  $Revision: 1.36 $
  *
- *  last change: $Author: kz $ $Date: 2002-11-27 16:30:57 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -302,12 +302,12 @@ TabPage SID_REDLIN_FILTER_PAGE
     };
     StringList [ korean ] =
     {
-            < "다음 이전" ; Default ; > ;
-        < "다음 부터" ; Default ; > ;
+            < "다음 시점까지" ; Default ; > ;
+        < "다음 시점부터" ; Default ; > ;
         < "다음 날짜 내" ; Default ; > ;
         < "다음 날짜 이외" ; Default ; > ;
         < "다음 날짜 사이" ; Default ; > ;
-        < "저장할 때부터" ; Default ; > ;
+        < "최종 저장 이후" ; Default ; > ;
     };
     StringList [ turkish ] =
     {
@@ -451,7 +451,7 @@ TabPage SID_REDLIN_FILTER_PAGE
         Text[ chinese_traditional ] = "和";
         Text[ arabic ] = "�";
         Text[ greek ] = "���";
-        Text[ korean ] = "그리고";
+        Text[ korean ] = "와(과)";
         Text[ turkish ] = "~ile";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "i";
@@ -589,7 +589,7 @@ TabPage SID_REDLIN_FILTER_PAGE
         Text [ dutch ] = "~Bereik" ;
         Text [ portuguese ] = "Intervalo" ;
         Text[ chinese_simplified ] = "区域(~R)";
-        Text[ russian ] = "�������";
+        Text[ russian ] = "��������";
         Text[ polish ] = "Zakres";
         Text[ japanese ] = "範囲(~R)";
         Text[ chinese_traditional ] = "區域(~R)";
@@ -631,7 +631,7 @@ TabPage SID_REDLIN_FILTER_PAGE
         Text[ chinese_traditional ] = "動作(~C)";
         Text[ arabic ] = "�������";
         Text[ greek ] = "��������";
-        Text[ korean ] = "수행(~C)";
+        Text[ korean ] = "작동(~C)";
         Text[ turkish ] = "�~�lem";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Acci�";
@@ -813,7 +813,7 @@ TabPage SID_REDLIN_VIEW_PAGE
         Text[ chinese_traditional ] = "接受(~A)";
         Text[ arabic ] = "����";
         Text[ greek ] = "~�������";
-        Text[ korean ] = "수락(~A)";
+        Text[ korean ] = "동의(~A)";
         Text[ turkish ] = "~Kabul et";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Accepto";
@@ -833,7 +833,7 @@ TabPage SID_REDLIN_VIEW_PAGE
         Text [ danish ] = "Forkast" ;
         Text [ italian ] = "~Rifiuta" ;
         Text [ spanish ] = "~Rechazar" ;
-        Text [ french ] = "~Refuser" ;
+        Text [ french ] = "~Rejeter" ;
         Text [ dutch ] = "V~erwerpen" ;
         Text [ portuguese ] = "~Rejeitar" ;
         Text[ chinese_simplified ] = "拒绝(~R)";
@@ -873,7 +873,7 @@ TabPage SID_REDLIN_VIEW_PAGE
         Text[ chinese_traditional ] = "全部接受(~C)";
         Text[ arabic ] = "���� ����";
         Text[ greek ] = "�����~�� ����";
-        Text[ korean ] = "모두 수락(~C)";
+        Text[ korean ] = "모두 동의(~C)";
         Text[ turkish ] = "~T�m�n� kabul et";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Ho a~ccepto tot";
@@ -893,7 +893,7 @@ TabPage SID_REDLIN_VIEW_PAGE
         Text [ danish ] = "Forkast alle" ;
         Text [ italian ] = "Rifiuta tutto" ;
         Text [ spanish ] = "Rechazar todo" ;
-        Text [ french ] = "Tout r~efuser" ;
+        Text [ french ] = "Tout rejeter" ;
         Text [ dutch ] = "Alle ver~werpen" ;
         Text [ portuguese ] = "Rejeitar ~tudo" ;
         Text[ chinese_simplified ] = "全部拒绝(~E)";
@@ -935,7 +935,7 @@ TabPage SID_REDLIN_VIEW_PAGE
         Text[ chinese_traditional ] = "復原";
         Text[ arabic ] = "�����";
         Text[ greek ] = "��������";
-        Text[ korean ] = "실행취소";
+        Text[ korean ] = "실행 취소";
         Text[ turkish ] = "~Geri al";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Desf�s";
@@ -962,7 +962,7 @@ TabPage SID_REDLIN_VIEW_PAGE
         Text[ chinese_traditional ] = "動作";
         Text[ arabic ] = "�������";
         Text[ greek ] = "��������";
-        Text[ korean ] = "수행";
+        Text[ korean ] = "작동";
         Text[ turkish ] = "��lem";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Acci�";
@@ -1091,3 +1091,8 @@ TabPage SID_REDLIN_VIEW_PAGE
 
 
 
+
+
+
+
+
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index 031bcef58c40..9ffd2f971100 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgctl3d.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: cl $ $Date: 2002-02-21 14:35:58 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -154,6 +154,10 @@ Svx3DPreviewControl::~Svx3DPreviewControl()
 \************************************************************************/
 void Svx3DPreviewControl::Construct()
 {
+    // Do never mirror the preview window.  This explicitly includes right
+    // to left writing environments.
+    EnableRTL (FALSE);
+
     SetMapMode( MAP_100TH_MM );
 
     // Model
@@ -379,6 +383,10 @@ SvxRectCtl3D::SvxRectCtl3D( Window* pParent,
                         nRadius( nCircle)
 
 {
+    // Do never mirror the preview window.  This explicitly includes right
+    // to left writing environments.
+    EnableRTL (FALSE);
+
     SetMapMode( MAP_100TH_MM );
     SetBackground( Wallpaper( Color( COL_LIGHTGRAY ) ) );
 
@@ -1053,6 +1061,10 @@ SvxLightPrevievCtl3D::SvxLightPrevievCtl3D( Window* pParent, WinBits nStyle )
 
 void SvxLightPrevievCtl3D::Init()
 {
+    // Do never mirror the preview window.  This explicitly includes right
+    // to left writing environments.
+    EnableRTL (FALSE);
+
     // Lokale Parameter fuellen
     eSelectedLight = Base3DLightNone;
     fObjectRadius = 1.414;
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index b8664fb9d3d2..2f4873c1ea42 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgctrl.cxx,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: aw $ $Date: 2002-11-07 12:31:06 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -91,6 +91,10 @@
 #include <vcl/hatch.hxx>
 #endif
 
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include <svtools/colorcfg.hxx>
+#endif
+
 #include "svxrectctaccessiblecontext.hxx"
 
 #ifndef _COM_SUN_STAR_LANG_XUNOTUNNEL_HPP_
@@ -204,6 +208,7 @@ void SvxRectCtl::InitBitmap( void )
         delete pBitmap;
 
     const StyleSettings&    rStyles = Application::GetSettings().GetStyleSettings();
+    svtools::ColorConfig aColorConfig;
 
     pBitmap = new Bitmap( SVX_RES( RID_SVXCTRL_RECTBTNS ) );
 
@@ -224,7 +229,7 @@ void SvxRectCtl::InitBitmap( void )
     pColorAry2[2] = rStyles.GetLightColor();
     pColorAry2[3] = rStyles.GetShadowColor();
     pColorAry2[4] = rStyles.GetDarkShadowColor();
-    pColorAry2[5] = rStyles.GetWindowTextColor();
+    pColorAry2[5] = Color( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor );
     pColorAry2[6] = rStyles.GetDialogColor();
 
 #ifdef DBG_UTIL
@@ -255,7 +260,8 @@ void SvxRectCtl::InitSettings( BOOL bForeground, BOOL bBackground )
 
     if( bForeground )
     {
-        Color aTextColor = rStyleSettings.GetWindowTextColor();
+        svtools::ColorConfig aColorConfig;
+        Color aTextColor( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor );
 
         if ( IsControlForeground() )
             aTextColor = GetControlForeground();
@@ -1952,7 +1958,8 @@ void SvxXLinePreview::InitSettings( BOOL bForeground, BOOL bBackground )
 
     if ( bForeground )
     {
-        Color aTextColor = rStyleSettings.GetWindowTextColor();
+        svtools::ColorConfig aColorConfig;
+        Color aTextColor( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor );
 
         if ( IsControlForeground() )
             aTextColor = GetControlForeground();
@@ -2053,7 +2060,8 @@ void SvxXRectPreview::InitSettings( BOOL bForeground, BOOL bBackground )
 
     if ( bForeground )
     {
-        Color aTextColor = rStyleSettings.GetWindowTextColor();
+        svtools::ColorConfig aColorConfig;
+        Color aTextColor( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor );
 
         if ( IsControlForeground() )
             aTextColor = GetControlForeground();
@@ -2144,7 +2152,8 @@ void SvxXShadowPreview::InitSettings( BOOL bForeground, BOOL bBackground )
 
     if ( bForeground )
     {
-        Color aTextColor = rStyleSettings.GetWindowTextColor();
+        svtools::ColorConfig aColorConfig;
+        Color aTextColor( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor );
 
         if ( IsControlForeground() )
             aTextColor = GetControlForeground();
diff --git a/svx/source/dialog/dlgname.src b/svx/source/dialog/dlgname.src
index f85ee260133b..e4b487b5f8eb 100644
--- a/svx/source/dialog/dlgname.src
+++ b/svx/source/dialog/dlgname.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgname.src,v $
  *
- *  $Revision: 1.1.1.9 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: kz $ $Date: 2001-11-16 22:59:10 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -127,7 +127,8 @@ ModalDialog RID_SVXDLG_NAME
     Text[ korean ] = "이름";
     Text[ turkish ] = "Ad";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Nombre";
+    Text[ catalan ] = "Nom";
+    Text[ thai ] = "ชื่อ";
 };
  // RID_SVXDLG_MESSBOX -------------------------------------------------------
 ModalDialog RID_SVXDLG_MESSBOX
@@ -171,3 +172,6 @@ ModalDialog RID_SVXDLG_MESSBOX
 
 
 
+
+
+
diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx
index 4f8193db865c..126598251ce9 100644
--- a/svx/source/dialog/dlgutil.cxx
+++ b/svx/source/dialog/dlgutil.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgutil.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: sj $ $Date: 2001-10-16 09:29:42 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -100,7 +100,7 @@ String GetDicInfoStr( const String& rName, const USHORT nLang, const BOOL bNeg )
 {
     INetURLObject aURLObj;
     aURLObj.SetSmartProtocol( INET_PROT_FILE );
-    aURLObj.SetSmartURL( rName );
+    aURLObj.SetSmartURL( rName, INetURLObject::ENCODE_ALL );
     String aTmp( aURLObj.GetBase() );
     aTmp += sal_Unicode( ' ' );
 
diff --git a/svx/source/dialog/dstribut.src b/svx/source/dialog/dstribut.src
index 113fd7564888..c9506dcf4016 100644
--- a/svx/source/dialog/dstribut.src
+++ b/svx/source/dialog/dstribut.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dstribut.src,v $
  *
- *  $Revision: 1.22 $
+ *  $Revision: 1.23 $
  *
- *  last change: $Author: cl $ $Date: 2002-06-06 11:43:18 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -99,8 +99,9 @@ TabPage RID_SVXPAGE_DISTRIBUTE
         Text[ chinese_traditional ] = "水平";
         Text[ arabic ] = "����";
         Text[ turkish ] = "Yatay";
-        Text[ catalan ] = "Horizontal";
+        Text[ catalan ] = "Horitzontal";
         Text[ finnish ] = "Vaakataso";
+        Text[ thai ] = "แนวนอน";
     };
 
     RadioButton BTN_HOR_NONE
@@ -111,14 +112,14 @@ TabPage RID_SVXPAGE_DISTRIBUTE
         Text [ ENGLISH ] = "~None" ;
         Text [ ENGLISH_US ] = "~None" ;
         Text[ portuguese ] = "~Nenhuma";
-        Text[ russian ] = "���";
+        Text[ russian ] = "���";
         Text[ greek ] = "������";
         Text[ dutch ] = "~Geen";
         Text[ french ] = "Aucun(e)";
         Text[ spanish ] = "Ninguno";
         Text[ italian ] = "Senza";
-        Text[ danish ] = "Ingen";
-        Text[ swedish ] = "~Ingen";
+        Text[ danish ] = "~Ingen";
+        Text[ swedish ] = "In~gen";
         Text[ polish ] = "Brak";
         Text[ portuguese_brazilian ] = "None";
         Text[ japanese ] = "なし(~N)";
@@ -127,8 +128,9 @@ TabPage RID_SVXPAGE_DISTRIBUTE
         Text[ chinese_traditional ] = "無(~N)";
         Text[ arabic ] = "����";
         Text[ turkish ] = "Yok";
-        Text[ catalan ] = "Ninguno";
+        Text[ catalan ] = "Cap";
         Text[ finnish ] = "Ei mit��n";
+        Text[ thai ] = "ไ~ม่มี";
     };
 
     RadioButton BTN_HOR_LEFT
@@ -145,7 +147,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
         Text[ french ] = "� gauche";
         Text[ spanish ] = "Izquierda";
         Text[ italian ] = "A sinistra";
-        Text[ danish ] = "Venstre";
+        Text[ danish ] = "~Venstre";
         Text[ swedish ] = "~V�nster";
         Text[ polish ] = "Z lewej";
         Text[ portuguese_brazilian ] = "Left";
@@ -155,8 +157,9 @@ TabPage RID_SVXPAGE_DISTRIBUTE
         Text[ chinese_traditional ] = "左(~L)";
         Text[ arabic ] = "����";
         Text[ turkish ] = "Sol";
-        Text[ catalan ] = "Izquierda";
+        Text[ catalan ] = "Esquerra";
         Text[ finnish ] = "Vasen";
+        Text[ thai ] = "~ซ้าย";
     };
 
     RadioButton BTN_HOR_CENTER
@@ -170,10 +173,10 @@ TabPage RID_SVXPAGE_DISTRIBUTE
         Text[ russian ] = "� ������";
         Text[ greek ] = "������";
         Text[ dutch ] = "Midden";
-        Text[ french ] = "Milieu";
+        Text[ french ] = "Centre";
         Text[ spanish ] = "Centrado";
         Text[ italian ] = "Al centro";
-        Text[ danish ] = "Midte";
+        Text[ danish ] = "~Centreret";
         Text[ swedish ] = "~Mitten";
         Text[ polish ] = "Po�rodku";
         Text[ portuguese_brazilian ] = "Center";
@@ -183,8 +186,9 @@ TabPage RID_SVXPAGE_DISTRIBUTE
         Text[ chinese_traditional ] = "中心(~C)";
         Text[ arabic ] = "���";
         Text[ turkish ] = "Orta";
-        Text[ catalan ] = "Centro";
-        Text[ finnish ] = "Keskell�";
+        Text[ catalan ] = "Centre";
+        Text[ finnish ] = "Keskit�";
+        Text[ thai ] = "~ตรงกลาง";
     };
 
     RadioButton BTN_HOR_DISTANCE
@@ -201,7 +205,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
         Text[ french ] = "�cart";
         Text[ spanish ] = "Espacio";
         Text[ italian ] = "Distanza";
-        Text[ danish ] = "Afstand";
+        Text[ danish ] = "~Afstand";
         Text[ swedish ] = "~Avst�nd";
         Text[ polish ] = "Odst�p";
         Text[ portuguese_brazilian ] = "Distance";
@@ -211,8 +215,9 @@ TabPage RID_SVXPAGE_DISTRIBUTE
         Text[ chinese_traditional ] = "間隔(~S)";
         Text[ arabic ] = "�������";
         Text[ turkish ] = "Aral�k";
-        Text[ catalan ] = "Espacio";
-        Text[ finnish ] = "Objektiv�lit";
+        Text[ catalan ] = "Espaiat";
+        Text[ finnish ] = "V�lit";
+        Text[ thai ] = "~ระยะห่าง";
     };
 
     RadioButton BTN_HOR_RIGHT
@@ -229,7 +234,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
         Text[ french ] = "� droite";
         Text[ spanish ] = "Derecha";
         Text[ italian ] = "A destra";
-        Text[ danish ] = "H�jre";
+        Text[ danish ] = "H~�jre";
         Text[ swedish ] = "H�ge~r";
         Text[ polish ] = "Z prawej";
         Text[ portuguese_brazilian ] = "Right";
@@ -239,8 +244,9 @@ TabPage RID_SVXPAGE_DISTRIBUTE
         Text[ chinese_traditional ] = "右(~R)";
         Text[ arabic ] = "����";
         Text[ turkish ] = "Sa�";
-        Text[ catalan ] = "Derecha";
+        Text[ catalan ] = "Dreta";
         Text[ finnish ] = "Oikea";
+        Text[ thai ] = "~ขวา";
     };
 
     FixedImage IMG_HOR_LOW {
@@ -309,6 +315,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
         Text[ turkish ] = "Dikey";
         Text[ catalan ] = "Vertical";
         Text[ finnish ] = "Pystytaso";
+        Text[ thai ] = "แนวตั้ง";
     };
 
     RadioButton BTN_VER_NONE
@@ -319,13 +326,13 @@ TabPage RID_SVXPAGE_DISTRIBUTE
         Text [ ENGLISH ] = "N~one" ;
         Text [ ENGLISH_US ] = "N~one" ;
         Text[ portuguese ] = "~Nenhuma";
-        Text[ russian ] = "���";
+        Text[ russian ] = "���";
         Text[ greek ] = "������";
         Text[ dutch ] = "~Geen";
         Text[ french ] = "Aucun(e)";
         Text[ spanish ] = "Ninguno";
         Text[ italian ] = "Senza";
-        Text[ danish ] = "Ingen";
+        Text[ danish ] = "Ing~en";
         Text[ swedish ] = "Ing~en";
         Text[ polish ] = "Brak";
         Text[ portuguese_brazilian ] = "None";
@@ -335,8 +342,9 @@ TabPage RID_SVXPAGE_DISTRIBUTE
         Text[ chinese_traditional ] = "無(~O)";
         Text[ arabic ] = "����";
         Text[ turkish ] = "Yok";
-        Text[ catalan ] = "Ninguno";
+        Text[ catalan ] = "Cap";
         Text[ finnish ] = "Ei mit��n";
+        Text[ thai ] = "ไม่~มี";
     };
 
     RadioButton BTN_VER_TOP
@@ -353,7 +361,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
         Text[ french ] = "En haut";
         Text[ spanish ] = "Arriba";
         Text[ italian ] = "In alto";
-        Text[ danish ] = "Oppe";
+        Text[ danish ] = "T~op";
         Text[ swedish ] = "~Uppe";
         Text[ polish ] = "U g�ry";
         Text[ portuguese_brazilian ] = "Top";
@@ -363,8 +371,9 @@ TabPage RID_SVXPAGE_DISTRIBUTE
         Text[ chinese_traditional ] = "上(~T)";
         Text[ arabic ] = "����";
         Text[ turkish ] = "�st";
-        Text[ catalan ] = "Arriba";
-        Text[ finnish ] = "Yl�osa";
+        Text[ catalan ] = "Superior";
+        Text[ finnish ] = "Yl�reuna";
+        Text[ thai ] = "~บน";
     };
 
     RadioButton BTN_VER_CENTER
@@ -378,10 +387,10 @@ TabPage RID_SVXPAGE_DISTRIBUTE
         Text[ russian ] = "� ������";
         Text[ greek ] = "������";
         Text[ dutch ] = "~Midden";
-        Text[ french ] = "Milieu";
+        Text[ french ] = "Centre";
         Text[ spanish ] = "Centrado";
         Text[ italian ] = "Al centro";
-        Text[ danish ] = "Midte";
+        Text[ danish ] = "Ce~ntreret";
         Text[ swedish ] = "M~itten";
         Text[ polish ] = "Po�rodku";
         Text[ portuguese_brazilian ] = "Center";
@@ -391,8 +400,9 @@ TabPage RID_SVXPAGE_DISTRIBUTE
         Text[ chinese_traditional ] = "中心(~E)";
         Text[ arabic ] = "���";
         Text[ turkish ] = "Orta";
-        Text[ catalan ] = "Centro";
-        Text[ finnish ] = "Keskell�";
+        Text[ catalan ] = "Centre";
+        Text[ finnish ] = "Keskit�";
+        Text[ thai ] = "ต~รงกลาง";
     };
 
     RadioButton BTN_VER_DISTANCE
@@ -409,7 +419,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
         Text[ french ] = "�cart";
         Text[ spanish ] = "Espacio";
         Text[ italian ] = "Distanza";
-        Text[ danish ] = "Afstand";
+        Text[ danish ] = "A~fstand";
         Text[ swedish ] = "Av~st�nd";
         Text[ polish ] = "Odst�p";
         Text[ portuguese_brazilian ] = "Distance";
@@ -419,8 +429,9 @@ TabPage RID_SVXPAGE_DISTRIBUTE
         Text[ chinese_traditional ] = "間隔(~P)";
         Text[ arabic ] = "�������";
         Text[ turkish ] = "Aral�k";
-        Text[ catalan ] = "Espacio";
-        Text[ finnish ] = "Objektiv�lit";
+        Text[ catalan ] = "Espaiat";
+        Text[ finnish ] = "V�lit";
+        Text[ thai ] = "ระ~ยะห่าง";
     };
 
     RadioButton BTN_VER_BOTTOM
@@ -437,7 +448,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
         Text[ french ] = "En bas";
         Text[ spanish ] = "Abajo";
         Text[ italian ] = "In basso";
-        Text[ danish ] = "Nede";
+        Text[ danish ] = "~Bund";
         Text[ swedish ] = "~Nere";
         Text[ polish ] = "Na dole";
         Text[ portuguese_brazilian ] = "Bottom";
@@ -447,8 +458,9 @@ TabPage RID_SVXPAGE_DISTRIBUTE
         Text[ chinese_traditional ] = "下(~B)";
         Text[ arabic ] = "����";
         Text[ turkish ] = "Alt";
-        Text[ catalan ] = "Abajo";
-        Text[ finnish ] = "Alaosa";
+        Text[ catalan ] = "Part inferior";
+        Text[ finnish ] = "Alareuna";
+        Text[ thai ] = "~ล่าง";
     };
 
     FixedImage IMG_VER_HIGH {
@@ -508,8 +520,9 @@ TabPage RID_SVXPAGE_DISTRIBUTE
     Text[ chinese_traditional ] = "分布";
     Text[ arabic ] = "�����";
     Text[ turkish ] = "Da��l�m";
-    Text[ catalan ] = "Distribuci�n";
+    Text[ catalan ] = "Distribuci�";
     Text[ finnish ] = "Jakauma";
+    Text[ thai ] = "การแจกแจง";
 
     Image IMG_HOR_LOW_H
     {
@@ -558,6 +571,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
         ImageBitmap = Bitmap { File = "dstv_low_h.bmp" ; };
         MaskColor = STD_MASKCOLOR ;
     };
+
 };
 
 // ********************************************************************** EOF
@@ -574,3 +588,8 @@ TabPage RID_SVXPAGE_DISTRIBUTE
 
 
 
+
+
+
+
+
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index f3721093c35f..830cebc2fe5a 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fntctrl.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: oj $ $Date: 2002-08-13 08:42:03 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -103,6 +103,10 @@
 
 #pragma hdrstop
 
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include <svtools/colorcfg.hxx>
+#endif
+
 #include "fntctrl.hxx"
 #include "dialogs.hrc"
 #define TEXT_WIDTH  20
@@ -457,7 +461,8 @@ void SvxFontPrevWindow::InitSettings( BOOL bForeground, BOOL bBackground )
 
     if ( bForeground )
     {
-        Color aTextColor = rStyleSettings.GetWindowTextColor();
+        svtools::ColorConfig aColorConfig;
+        Color aTextColor( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor );
 
         if ( IsControlForeground() )
             aTextColor = GetControlForeground();
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 7fd3a158a1dc..4d93237c76ac 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fontwork.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: aw $ $Date: 2002-11-14 14:51:57 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -467,17 +467,22 @@ void SvxFontWorkDialog::SetStyle_Impl(const XFormTextStyleItem* pItem)
         }
         aTbxStyle.Enable();
 
+        // Make sure that there is allways exactly one checked toolbox item.
         if ( pItem->GetValue() == XFT_NONE )
         {
             aTbxStyle.CheckItem(TBI_STYLE_ROTATE, FALSE);
             aTbxStyle.CheckItem(TBI_STYLE_UPRIGHT, FALSE);
             aTbxStyle.CheckItem(TBI_STYLE_SLANTX, FALSE);
             aTbxStyle.CheckItem(TBI_STYLE_SLANTY, FALSE);
+
+            aTbxStyle.CheckItem(TBI_STYLE_OFF, TRUE);
         }
         else
+        {
             aTbxStyle.CheckItem(TBI_STYLE_OFF, FALSE);
+            aTbxStyle.CheckItem(nId);
+        }
 
-        aTbxStyle.CheckItem(nId);
         nLastStyleTbxId = nId;
     }
     else
@@ -788,7 +793,12 @@ IMPL_LINK( SvxFontWorkDialog, SelectStyleHdl_Impl, void *, EMPTYARG )
 {
     USHORT nId = aTbxStyle.GetCurItemId();
 
-    if ( nId != nLastStyleTbxId )
+    // Execute this block when a different toolbox item has been clicked or
+    // when the off item has been clicked.  The later is necessary to
+    // override the toolbox behaviour of unchecking the item after second
+    // click on it: One of the items has to be checked at all times (when
+    // enabled that is.)
+    if (nId == TBI_STYLE_OFF || nId != nLastStyleTbxId )
     {
         XFormTextStyle eStyle = XFT_NONE;
 
diff --git a/svx/source/dialog/fontwork.src b/svx/source/dialog/fontwork.src
index 96f8ef914c11..f83ab4fbb0e4 100644
--- a/svx/source/dialog/fontwork.src
+++ b/svx/source/dialog/fontwork.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fontwork.src,v $
  *
- *  $Revision: 1.26 $
+ *  $Revision: 1.27 $
  *
- *  last change: $Author: ka $ $Date: 2002-05-22 10:37:15 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -84,15 +84,14 @@ DockingWindow RID_SVXDLG_FONTWORK
     Text [ dutch ] = "FontWork" ;
     Text [ spanish ] = "FontWork" ;
     Text [ danish ] = "FontWork" ;
-    Text [ swedish ] = "FontWork" ;
+    Text [ swedish ] = "Fontwork" ;
     Text [ finnish ] = "Fonttity�" ;
-    Text [ english_us ] = "FontWork" ;
+    Text [ english_us ] = "Fontwork" ;
     Moveable = TRUE ;
     Zoomable = TRUE ;
     Closeable = TRUE ;
     Dockable = TRUE ;
     EnableResizing = TRUE ;
-    DialogControl = TRUE ;
     Control VS_FORMS
     {
         HelpId = HID_FONTWORK_CTL_FORMS ;
@@ -105,7 +104,6 @@ DockingWindow RID_SVXDLG_FONTWORK
     {
         SVLook = TRUE ;
         Pos = MAP_APPFONT ( 6 , 41 ) ;
-        TabStop = TRUE ;
         ItemList =
         {
             ToolBoxItem
@@ -134,8 +132,8 @@ DockingWindow RID_SVXDLG_FONTWORK
                 Text[ korean ] = "해제";
                 Text[ turkish ] = "Kapal�";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Desactivado";
-                Text[ finnish ] = "Off";
+                Text[ catalan ] = "Desactivat";
+                Text[ finnish ] = "Poissa k�yt�st�";
                 Text[ thai ] = "ปิด";
             };
             ToolBoxItem
@@ -169,7 +167,7 @@ DockingWindow RID_SVXDLG_FONTWORK
                 Text[ korean ] = "회전";
                 Text[ turkish ] = "�evir";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Rodar";
+                Text[ catalan ] = "Gira";
                 Text[ finnish ] = "Kierr�";
                 Text[ thai ] = "หมุน";
             };
@@ -200,7 +198,7 @@ DockingWindow RID_SVXDLG_FONTWORK
                 Text[ korean ] = "똑바로";
                 Text[ turkish ] = "Dik";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Derecho";
+                Text[ catalan ] = "Dret";
                 Text[ finnish ] = "Pystyss�";
                 Text[ thai ] = "ตั้งตรง";
             };
@@ -231,7 +229,7 @@ DockingWindow RID_SVXDLG_FONTWORK
                 Text[ korean ] = "수평으로 기울기";
                 Text[ turkish ] = "Yatay e�im";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Inclinar horizontalmente";
+                Text[ catalan ] = "Inclina horitzontalment";
                 Text[ finnish ] = "Kallista vaakasuunnassa";
                 Text[ thai ] = "แนวนอนเอียง";
             };
@@ -262,7 +260,7 @@ DockingWindow RID_SVXDLG_FONTWORK
                 Text[ korean ] = "수직으로 기울기";
                 Text[ turkish ] = "Dikey e�im";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Inclinar verticalmente";
+                Text[ catalan ] = "Inclina verticalment";
                 Text[ finnish ] = "Kallista pystysuunnassa";
                 Text[ thai ] = "แนวตั้งเอียง";
             };
@@ -272,7 +270,6 @@ DockingWindow RID_SVXDLG_FONTWORK
     {
         SVLook = TRUE ;
         Pos = MAP_APPFONT ( 6 , 63 ) ;
-        TabStop = TRUE ;
         ItemList =
         {
             ToolBoxItem
@@ -293,7 +290,7 @@ DockingWindow RID_SVXDLG_FONTWORK
                 Text [ portuguese ] = "Orienta��o" ;
                 Text [ portuguese_brazilian ] = "Laufrichtung" ;
                 Text[ chinese_simplified ] = "方向";
-                Text[ russian ] = "�����������";
+                Text[ russian ] = "����������";
                 Text[ polish ] = "Orientacja";
                 Text[ japanese ] = "方向";
                 Text[ chinese_traditional ] = "方向";
@@ -302,7 +299,7 @@ DockingWindow RID_SVXDLG_FONTWORK
                 Text[ korean ] = "방향";
                 Text[ turkish ] = "Metin y�n�";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Orientaci�n";
+                Text[ catalan ] = "Orientaci�";
                 Text[ finnish ] = "Suunta";
                 Text[ thai ] = "การวางแนว";
             };
@@ -316,13 +313,15 @@ DockingWindow RID_SVXDLG_FONTWORK
                 RadioCheck = TRUE ;
                 Identifier = TBI_ADJUST_LEFT ;
                 HelpId = HID_FONTWORK_TBI_ADJUST_LEFT ;
+                /* ### ACHTUNG: Neuer Text in Resource? Linksb�ndig : Linksb�ndig */
+                /* ### ACHTUNG: Neuer Text in Resource? Linksb�ndig : Linksb�ndig */
                 Text = "Linksb�ndig" ;
                 Text [ ENGLISH ] = "Left aligned" ;
                 Text [ dutch ] = "Links uitgelijnd" ;
                 Text [ english_us ] = "Align Left" ;
                 Text [ italian ] = "Allineato a sinistra" ;
                 Text [ spanish ] = "Alinear a la izquierda" ;
-                Text [ french ] = "Align� � gauche" ;
+                Text [ french ] = "Aligner � gauche" ;
                 Text [ swedish ] = "V�nsterjusterat" ;
                 Text [ danish ] = "Venstrejusteret" ;
                 Text [ portuguese ] = "� esquerda" ;
@@ -334,10 +333,10 @@ DockingWindow RID_SVXDLG_FONTWORK
                 Text[ chinese_traditional ] = "向左對齊";
                 Text[ arabic ] = "������ ��� ������";
                 Text[ greek ] = "�������� ��������";
-                Text[ korean ] = "왼쪽 배열";
+                Text[ korean ] = "왼쪽 맞춤";
                 Text[ turkish ] = "Sola hizala";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Alineado a la izquierda";
+                Text[ catalan ] = "Alinea a l'esquerra";
                 Text[ finnish ] = "Tasaa vasemmalle";
                 Text[ thai ] = "ชิดซ้าย";
             };
@@ -368,7 +367,7 @@ DockingWindow RID_SVXDLG_FONTWORK
                 Text[ korean ] = "가운데";
                 Text[ turkish ] = "Ortala";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Centrado";
+                Text[ catalan ] = "Centre";
                 Text[ finnish ] = "Keskell�";
                 Text[ thai ] = "ตรงกลาง";
             };
@@ -378,12 +377,14 @@ DockingWindow RID_SVXDLG_FONTWORK
                 RadioCheck = TRUE ;
                 Identifier = TBI_ADJUST_RIGHT ;
                 HelpId = HID_FONTWORK_TBI_ADJUST_RIGHT ;
+                /* ### ACHTUNG: Neuer Text in Resource? Rechtsb�ndig : Rechtsb�ndig */
+                /* ### ACHTUNG: Neuer Text in Resource? Rechtsb�ndig : Rechtsb�ndig */
                 Text = "Rechtsb�ndig" ;
                 Text [ ENGLISH ] = "Right aligned" ;
                 Text [ english_us ] = "Align Right" ;
                 Text [ italian ] = "Allineato a destra" ;
                 Text [ spanish ] = "Alinear a la derecha" ;
-                Text [ french ] = "Align� � droite" ;
+                Text [ french ] = "Aligner � droite" ;
                 Text [ dutch ] = "Rechtslijnend" ;
                 Text [ swedish ] = "H�gerjusterat" ;
                 Text [ danish ] = "H�jrejusteret" ;
@@ -396,10 +397,10 @@ DockingWindow RID_SVXDLG_FONTWORK
                 Text[ chinese_traditional ] = "向右對齊";
                 Text[ arabic ] = "������ ��� ������";
                 Text[ greek ] = "�������� �����";
-                Text[ korean ] = "오른쪽 배열";
+                Text[ korean ] = "오른쪽 맞춤";
                 Text[ turkish ] = "Sa�a hizala";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Alinear a la derecha";
+                Text[ catalan ] = "Alinea a la dreta";
                 Text[ finnish ] = "Tasaa oikealle";
                 Text[ thai ] = "ชิดขวา";
             };
@@ -409,12 +410,14 @@ DockingWindow RID_SVXDLG_FONTWORK
                 RadioCheck = TRUE ;
                 Identifier = TBI_ADJUST_AUTOSIZE ;
                 HelpId = HID_FONTWORK_TBI_ADJUST_AUTOSIZE ;
+                /* ### ACHTUNG: Neuer Text in Resource? Auto-Textgr��e : Auto-Textgr��e */
+                /* ### ACHTUNG: Neuer Text in Resource? Auto-Textgr��e : Auto-Textgr��e */
                 Text = "Auto-Textgr��e" ;
                 Text [ ENGLISH ] = "Autosize" ;
                 Text [ dutch ] = "AutoTekstgrootte" ;
                 Text [ english_us ] = "AutoSize Text" ;
                 Text [ italian ] = "Dimensione testo automatico" ;
-                Text [ spanish ] = "Tama�o autom�tico de texto" ;
+                Text [ spanish ] = "Texto - Tama�o autom�tico" ;
                 Text [ french ] = "Taille du texte adapt�e" ;
                 Text [ swedish ] = "AutoTextstorlek" ;
                 Text [ danish ] = "AutoTekstst�rrelse" ;
@@ -430,7 +433,7 @@ DockingWindow RID_SVXDLG_FONTWORK
                 Text[ korean ] = "자동텍스트 크기";
                 Text[ turkish ] = "Otomatik metin boyu";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Tama�o autom�tico de texto";
+                Text[ catalan ] = "Mida autom�tica del text";
                 Text[ finnish ] = "Automaattinen tekstin koon m��ritys";
                 Text[ thai ] = "ขนาดข้อความอัตโนมัติ";
             };
@@ -477,10 +480,10 @@ DockingWindow RID_SVXDLG_FONTWORK
         QuickHelpText[ chinese_traditional ] = "間隔";
         QuickHelpText[ arabic ] = "�������";
         QuickHelpText[ greek ] = "��������";
-        QuickHelpText[ korean ] = "간격";
+        QuickHelpText[ korean ] = "거리";
         CustomUnitText[ language_user1 ] = " ";
         QuickHelpText[ turkish ] = "Abstand";
-        QuickHelpText[ catalan ] = "Distancia";
+        QuickHelpText[ catalan ] = "Dist�ncia";
         QuickHelpText[ finnish ] = "Et�isyys";
         QuickHelpText[ thai ] = "Distance";
     };
@@ -525,7 +528,7 @@ DockingWindow RID_SVXDLG_FONTWORK
         QuickHelpText[ korean ] = "들여쓰기";
         CustomUnitText[ language_user1 ] = " ";
         QuickHelpText[ turkish ] = "Einzug";
-        QuickHelpText[ catalan ] = "Sangr�a";
+        QuickHelpText[ catalan ] = "Sangria";
         QuickHelpText[ finnish ] = "Sisenn�";
         QuickHelpText[ thai ] = "Indent";
     };
@@ -533,7 +536,6 @@ DockingWindow RID_SVXDLG_FONTWORK
     {
         SVLook = TRUE ;
         Pos = MAP_APPFONT ( 6 , 122 ) ;
-        TabStop = TRUE ;
         ItemList =
         {
             ToolBoxItem
@@ -563,7 +565,7 @@ DockingWindow RID_SVXDLG_FONTWORK
                 Text[ korean ] = "윤곽";
                 Text[ turkish ] = "Kontur";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Contorno";
+                Text[ catalan ] = "Contorn";
                 Text[ finnish ] = "��riviiva";
                 Text[ thai ] = "เส้นแสดงรูปร่าง";
             };
@@ -585,16 +587,16 @@ DockingWindow RID_SVXDLG_FONTWORK
                 Text [ portuguese ] = "Contorno de caracteres" ;
                 Text [ portuguese_brazilian ] = "Buchstabenumrandung" ;
                 Text[ chinese_simplified ] = "字母轮廓";
-                Text[ russian ] = "������� ����";
+                Text[ russian ] = "������ ������";
                 Text[ polish ] = "Obramowanie liter";
                 Text[ japanese ] = "文字の輪郭";
                 Text[ chinese_traditional ] = "字母輪廓";
                 Text[ arabic ] = "���� ������ �������";
                 Text[ greek ] = "���������� ����������";
-                Text[ korean ] = "텍스트 테두리！";
+                Text[ korean ] = "문자 윤곽";
                 Text[ turkish ] = "Metin konturu";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Contorno de caracteres";
+                Text[ catalan ] = "Contorn del text";
                 Text[ finnish ] = "Tekstin ��riviiva";
                 Text[ thai ] = "เส้นแสดงรูปร่างข้อความ";
             };
@@ -620,16 +622,16 @@ DockingWindow RID_SVXDLG_FONTWORK
                 Text [ portuguese ] = "Desactivar" ;
                 Text [ portuguese_brazilian ] = "Aus" ;
                 Text[ chinese_simplified ] = "取消阴影";
-                Text[ russian ] = "����.";
+                Text[ russian ] = "��� ����";
                 Text[ polish ] = "Wy��cz";
                 Text[ japanese ] = "影なし";
                 Text[ chinese_traditional ] = "不使用";
                 Text[ arabic ] = "�����";
                 Text[ greek ] = "��������������";
-                Text[ korean ] = "해제";
+                Text[ korean ] = "그림자 없음";
                 Text[ turkish ] = "Kapal�";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Sin sombra";
+                Text[ catalan ] = "Sense ombra";
                 Text[ finnish ] = "Ei varjoa";
                 Text[ thai ] = "ไม่แรเงา";
             };
@@ -682,16 +684,16 @@ DockingWindow RID_SVXDLG_FONTWORK
                 Text [ portuguese ] = "Inclinar" ;
                 Text [ portuguese_brazilian ] = "Kippen" ;
                 Text[ chinese_simplified ] = "倾斜";
-                Text[ russian ] = "�������������";
+                Text[ russian ] = "������";
                 Text[ polish ] = "Przerzu�";
                 Text[ japanese ] = "斜投影";
                 Text[ chinese_traditional ] = "傾斜";
                 Text[ arabic ] = "�����";
                 Text[ greek ] = "��������";
-                Text[ korean ] = "기울이기";
+                Text[ korean ] = "기울기";
                 Text[ turkish ] = "E�im";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Inclinar";
+                Text[ catalan ] = "Inclina";
                 Text[ finnish ] = "Kallista";
                 Text[ thai ] = "เอียง";
             };
@@ -726,7 +728,7 @@ DockingWindow RID_SVXDLG_FONTWORK
         CustomUnitText [ spanish ] = "Grados" ;
         CustomUnitText [ danish ] = "grader" ;
         CustomUnitText [ swedish ] = " grader" ;
-        CustomUnitText [ finnish ] = " asteet" ;
+        CustomUnitText [ finnish ] = "  astetta" ;
         CustomUnitText [ english_us ] = " degrees" ;
         First = -5000000 ;
         Last = 5000000 ;
@@ -743,12 +745,12 @@ DockingWindow RID_SVXDLG_FONTWORK
         QuickHelpText [ portuguese_brazilian ] = "Abstand X" ;
         QuickHelpText [ swedish ] = "Avst�nd X" ;
         CustomUnitText[ chinese_simplified ] = "度";
-        CustomUnitText[ russian ] = "������";
+        CustomUnitText[ russian ] = " ��������";
         CustomUnitText[ polish ] = "Stopie�";
         CustomUnitText[ japanese ] = "度";
         CustomUnitText[ chinese_traditional ] = "度";
         CustomUnitText[ arabic ] = "����/�����";
-        QuickHelpText[ russian ] = "�������� X";
+        QuickHelpText[ russian ] = "���������� X";
         QuickHelpText[ polish ] = "Abstand X";
         QuickHelpText[ japanese ] = "間隔 X";
         QuickHelpText[ chinese_simplified ] = "间隔 X";
@@ -757,11 +759,11 @@ DockingWindow RID_SVXDLG_FONTWORK
         CustomUnitText[ greek ] = "������";
         CustomUnitText[ korean ] = "도";
         QuickHelpText[ greek ] = "Distance X";
-        QuickHelpText[ korean ] = "간격 X";
+        QuickHelpText[ korean ] = "거리 X";
         CustomUnitText[ turkish ] = "Derece";
         CustomUnitText[ language_user1 ] = " ";
         QuickHelpText[ turkish ] = "Abstand X";
-        CustomUnitText[ catalan ] = "Grados";
+        CustomUnitText[ catalan ] = " graus";
         QuickHelpText[ catalan ] = "Distancia X";
         QuickHelpText[ finnish ] = "Et�isyys X";
         CustomUnitText[ thai ] = " องศา";
@@ -822,7 +824,7 @@ DockingWindow RID_SVXDLG_FONTWORK
         CustomUnitText[ greek ] = "%";
         CustomUnitText[ korean ] = "%";
         QuickHelpText[ greek ] = "�������� Y";
-        QuickHelpText[ korean ] = "간격 Y";
+        QuickHelpText[ korean ] = "거리 Y";
         CustomUnitText[ turkish ] = "%";
         CustomUnitText[ language_user1 ] = " ";
         QuickHelpText[ turkish ] = "Abstand Y";
@@ -839,7 +841,6 @@ DockingWindow RID_SVXDLG_FONTWORK
         Pos = MAP_APPFONT ( 6 , 174 ) ;
         Size = MAP_APPFONT ( 71 , 60 ) ;
         DropDown = TRUE ;
-        TabStop = TRUE ;
         QuickHelpText = "Schattenfarbe" ;
         QuickHelpText [ portuguese ] = "Cor da sombra" ;
         QuickHelpText [ english_us ] = "Shadow Color" ;
@@ -911,22 +912,22 @@ DockingWindow RID_SVXDLG_FONTWORK
         QuickHelpText[ chinese_traditional ] = "陰影顏色";
         QuickHelpText[ arabic ] = "��� ����";
         QuickHelpText[ greek ] = "Shadow Color";
-        QuickHelpText[ korean ] = "음영색";
+        QuickHelpText[ korean ] = "그림자 색상";
         Text[ greek ] = "����� �����";
         Text[ language_user1 ] = " ";
         QuickHelpText[ turkish ] = "Schattenfarbe";
-        QuickHelpText[ catalan ] = "Color sombra";
+        QuickHelpText[ catalan ] = "Color ombra";
         QuickHelpText[ finnish ] = "Varjon v�ri";
         QuickHelpText[ thai ] = "Shadow Color";
     };
     Text[ chinese_simplified ] = "美工字体";
-    Text[ russian ] = "FontWork";
+    Text[ russian ] = "�������";
     Text[ polish ] = "FontWork";
     Text[ japanese ] = "フォントワーク";
     Text[ chinese_traditional ] = "美術字型";
     Text[ arabic ] = "FontWork";
     Text[ greek ] = "FontWork";
-    Text[ korean ] = "FontWork";
+    Text[ korean ] = "폰트워크";
     Text[ turkish ] = "FontWork";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "FontWork";
@@ -1099,7 +1100,7 @@ String RID_SVXSTR_FONTWORK_FORM1
     Text[ korean ] = "위쪽 반원";
     Text[ turkish ] = "�st yar�m daire";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Semic�rculo superior";
+    Text[ catalan ] = "Semicercle superior";
     Text[ thai ] = "ครึ่งวงกลมบน";
 };
 String RID_SVXSTR_FONTWORK_FORM2
@@ -1127,7 +1128,7 @@ String RID_SVXSTR_FONTWORK_FORM2
     Text[ korean ] = "아래쪽 반원";
     Text[ turkish ] = "Alt yar�m daire";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Semic�rculo inferior";
+    Text[ catalan ] = "Semicercle inferior";
     Text[ thai ] = "ครึ่งวงกลมล่าง";
 };
 String RID_SVXSTR_FONTWORK_FORM3
@@ -1155,7 +1156,7 @@ String RID_SVXSTR_FONTWORK_FORM3
     Text[ korean ] = "왼쪽 반원";
     Text[ turkish ] = "Sol yar�m daire";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Semic�rculo izquierdo";
+    Text[ catalan ] = "Semicercle esquerre";
     Text[ thai ] = "ครึ่งวงกลมซ้าย";
 };
 String RID_SVXSTR_FONTWORK_FORM4
@@ -1183,7 +1184,7 @@ String RID_SVXSTR_FONTWORK_FORM4
     Text[ korean ] = "오른쪽 반원";
     Text[ turkish ] = "Sa� yar�m daire";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Semic�rculo derecho";
+    Text[ catalan ] = "Semicercle dret";
     Text[ thai ] = "ครึ่งวงกลมขวา";
 };
 String RID_SVXSTR_FONTWORK_FORM5
@@ -1211,7 +1212,7 @@ String RID_SVXSTR_FONTWORK_FORM5
     Text[ korean ] = "위쪽 원호";
     Text[ turkish ] = "�st yay";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Arco superior de c�rculo";
+    Text[ catalan ] = "Arc superior";
     Text[ thai ] = "ส่วนโค้งของวงกลมบน";
 };
 String RID_SVXSTR_FONTWORK_FORM6
@@ -1239,7 +1240,7 @@ String RID_SVXSTR_FONTWORK_FORM6
     Text[ korean ] = "아래쪽 원호";
     Text[ turkish ] = "Alt yay";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Arco inferior de c�rculo";
+    Text[ catalan ] = "Arc inferior";
     Text[ thai ] = "ส่วนโค้งของวงกลมล่าง";
 };
 String RID_SVXSTR_FONTWORK_FORM7
@@ -1251,7 +1252,7 @@ String RID_SVXSTR_FONTWORK_FORM7
     Text [ portuguese_brazilian ] = "Left arc" ;
     Text [ portuguese ] = "Arco esquerdo" ;
     Text [ french ] = "Arc gauche" ;
-    Text [ dutch ] = "Linker boog" ;
+    Text [ dutch ] = "Linkerboog" ;
     Text [ spanish ] = "Arco izquierdo de c�rculo" ;
     Text [ danish ] = "Venstre bue" ;
     Text [ swedish ] = "V�nster cirkelb�ge" ;
@@ -1267,7 +1268,7 @@ String RID_SVXSTR_FONTWORK_FORM7
     Text[ korean ] = "왼쪽 원호";
     Text[ turkish ] = "Sol yay";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Arco izquierdo de c�rculo";
+    Text[ catalan ] = "Arc esquerre";
     Text[ thai ] = "ส่วนโค้งของวงกลมซ้าย";
 };
 String RID_SVXSTR_FONTWORK_FORM8
@@ -1279,7 +1280,7 @@ String RID_SVXSTR_FONTWORK_FORM8
     Text [ portuguese_brazilian ] = "Right arc" ;
     Text [ portuguese ] = "Arco direito" ;
     Text [ french ] = "Arc droit" ;
-    Text [ dutch ] = "Rechter boog" ;
+    Text [ dutch ] = "Rechterboog" ;
     Text [ spanish ] = "Arco derecho de c�rculo" ;
     Text [ danish ] = "H�jre bue" ;
     Text [ swedish ] = "H�ger cirkelb�ge" ;
@@ -1295,7 +1296,7 @@ String RID_SVXSTR_FONTWORK_FORM8
     Text[ korean ] = "오른쪽 원호";
     Text[ turkish ] = "Sa� yay";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Arco derecho de c�rculo";
+    Text[ catalan ] = "Arc dret";
     Text[ thai ] = "ส่วนโค้งของวงกลมขวา";
 };
 String RID_SVXSTR_FONTWORK_FORM9
@@ -1323,7 +1324,7 @@ String RID_SVXSTR_FONTWORK_FORM9
     Text[ korean ] = "열린 원";
     Text[ turkish ] = "A��k daire";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Circulo abierto";
+    Text[ catalan ] = "Cercle obert";
     Text[ thai ] = "เปิดวงกลม";
 };
 String RID_SVXSTR_FONTWORK_FORM10
@@ -1351,7 +1352,7 @@ String RID_SVXSTR_FONTWORK_FORM10
     Text[ korean ] = "닫힌 원";
     Text[ turkish ] = "Kapal� daire";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "C�rculo cerrado";
+    Text[ catalan ] = "Cercle tancat";
     Text[ thai ] = "ปิดวงกลม";
 };
 String RID_SVXSTR_FONTWORK_FORM11
@@ -1379,7 +1380,7 @@ String RID_SVXSTR_FONTWORK_FORM11
     Text[ korean ] = "닫힌 원 II";
     Text[ turkish ] = "Kapal� daire II";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "C�rculo cerrado II";
+    Text[ catalan ] = "Cercle tancat II";
     Text[ thai ] = "ปิดวงกลม II";
 };
 String RID_SVXSTR_FONTWORK_FORM12
@@ -1407,34 +1408,39 @@ String RID_SVXSTR_FONTWORK_FORM12
     Text[ korean ] = "수직 열린 원";
     Text[ turkish ] = "Dikey a��k daire";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "C�rculo abierto vertical";
+    Text[ catalan ] = "Cercle obert vertical";
     Text[ thai ] = "เปิดวงกลมแนวตั้ง";
 };
 String RID_SVXSTR_FONTWORK_UNDOCREATE
 {
     Text = "FontWork-Objekt erzeugen" ;
     Text [ ENGLISH ] = "create FontWork object" ;
-    Text [ english_us ] = "Create FontWork object" ;
+    Text [ english_us ] = "Create Fontwork object" ;
     Text [ italian ] = "Crea un oggetto FontWork" ;
     Text [ spanish ] = "Crear objeto FontWork" ;
     Text [ french ] = "Cr�er un objet FontWork" ;
     Text [ dutch ] = "FontWork-object maken" ;
-    Text [ swedish ] = "Skapa FontWork-objekt" ;
+    Text [ swedish ] = "Skapa Fontwork-objekt" ;
     Text [ danish ] = "Opret FontWork-objekt" ;
     Text [ portuguese_brazilian ] = "FontWork-Objekt erzeugen" ;
     Text [ portuguese ] = "Criar objecto FontWork" ;
     Text[ chinese_simplified ] = "生成美工字体对象";
-    Text[ russian ] = "������� ������ FontWork";
+    Text[ russian ] = "������� ������";
     Text[ polish ] = "Utw�rz obiekt FontWork";
     Text[ japanese ] = "フォントワーク オブジェクトの作成";
     Text[ chinese_traditional ] = "產生美術字型物件";
     Text[ arabic ] = "����� ���� FontWork";
     Text[ greek ] = "���������� ������������ FontWork";
-    Text[ korean ] = "FontWork 개체 생성";
+    Text[ korean ] = "폰트워크 개체 만들기";
     Text[ turkish ] = "FontWork nesnesi olu�tur";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Crear objeto FontWork";
-    Text[ finnish ] = "Luo fonttity�objekti";
+    Text[ catalan ] = "Crea un objecte FontWork";
+    Text[ finnish ] = "Luo Fonttity�objekti";
     Text[ thai ] = "สร้างวัตถตัวอักษรที่ใช้งาน";
 };
  // ********************************************************************** EOF
+
+
+
+
+
diff --git a/svx/source/dialog/frmdirlbox.src b/svx/source/dialog/frmdirlbox.src
index a228b54ef10e..73e9d252cee2 100644
--- a/svx/source/dialog/frmdirlbox.src
+++ b/svx/source/dialog/frmdirlbox.src
@@ -2,8 +2,8 @@
  *
  *  $RCSfile: frmdirlbox.src,v $
  *
- *  $Revision: 1.2 $
- *  last change: $Author: kz $ $Date: 2002-09-18 19:20:45 $
+ *  $Revision: 1.3 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,18 +71,18 @@ String RID_SVXSTR_FRAMEDIR_LTR
     Text[ russian ] = "Left-to-right";
     Text[ greek ] = "Left-to-right";
     Text[ dutch ] = "Left-to-right";
-    Text[ french ] = "Left-to-right";
-    Text[ spanish ] = "Left-to-right";
+    Text[ french ] = "De gauche � droite";
+    Text[ spanish ] = "De izquierda a derecha";
     Text[ finnish ] = "Left-to-right";
-    Text[ italian ] = "Left-to-right";
+    Text[ italian ] = "Da sinistra a destra";
     Text[ danish ] = "Left-to-right";
-    Text[ swedish ] = "Left-to-right";
+    Text[ swedish ] = "V�nster-till-h�ger";
     Text[ polish ] = "Left-to-right";
     Text[ portuguese_brazilian ] = "Left-to-right";
-    Text[ japanese ] = "Left-to-right";
-    Text[ korean ] = "Left-to-right";
-    Text[ chinese_simplified ] = "Left-to-right";
-    Text[ chinese_traditional ] = "Left-to-right";
+    Text[ japanese ] = "左から右へ";
+    Text[ korean ] = "왼쪽에서 오른쪽으로";
+    Text[ chinese_simplified ] = "从左向右";
+    Text[ chinese_traditional ] = "從左向右";
     Text[ turkish ] = "Left-to-right";
     Text[ arabic ] = "Left-to-right";
     Text[ catalan ] = "Left-to-right";
@@ -98,18 +98,18 @@ String RID_SVXSTR_FRAMEDIR_RTL
     Text[ russian ] = "Right-to-left";
     Text[ greek ] = "Right-to-left";
     Text[ dutch ] = "Right-to-left";
-    Text[ french ] = "Right-to-left";
-    Text[ spanish ] = "Right-to-left";
+    Text[ french ] = "De droite � gauche";
+    Text[ spanish ] = "De derecha a izquierda";
     Text[ finnish ] = "Right-to-left";
-    Text[ italian ] = "Right-to-left";
+    Text[ italian ] = "Da destra a sinistra";
     Text[ danish ] = "Right-to-left";
-    Text[ swedish ] = "Right-to-left";
+    Text[ swedish ] = "H�ger-till-v�nster";
     Text[ polish ] = "Right-to-left";
     Text[ portuguese_brazilian ] = "Right-to-left";
-    Text[ japanese ] = "Right-to-left";
-    Text[ korean ] = "Right-to-left";
-    Text[ chinese_simplified ] = "Right-to-left";
-    Text[ chinese_traditional ] = "Right-to-left";
+    Text[ japanese ] = "右から左へ";
+    Text[ korean ] = "오른쪽에서 왼쪽으로";
+    Text[ chinese_simplified ] = "从右向左";
+    Text[ chinese_traditional ] = "從右向左";
     Text[ turkish ] = "Right-to-left";
     Text[ arabic ] = "Right-to-left";
     Text[ catalan ] = "Right-to-left";
@@ -125,18 +125,18 @@ String RID_SVXSTR_FRAMEDIR_SUPER
     Text[ russian ] = "Use superordinate object settings";
     Text[ greek ] = "Use superordinate object settings";
     Text[ dutch ] = "Use superordinate object settings";
-    Text[ french ] = "Use superordinate object settings";
-    Text[ spanish ] = "Use superordinate object settings";
+    Text[ french ] = "Utiliser les param�tres de l'objet sup�rieur";
+    Text[ spanish ] = "Utilizar la configuraci�n del objeto superior";
     Text[ finnish ] = "Use superordinate object settings";
-    Text[ italian ] = "Use superordinate object settings";
+    Text[ italian ] = "Usa le impostazioni dell'oggetto superiore";
     Text[ danish ] = "Use superordinate object settings";
-    Text[ swedish ] = "Use superordinate object settings";
+    Text[ swedish ] = "Anv�nd det �verordnade objektets inst�llningar";
     Text[ polish ] = "Use superordinate object settings";
     Text[ portuguese_brazilian ] = "Use superordinate object settings";
-    Text[ japanese ] = "Use superordinate object settings";
-    Text[ korean ] = "Use superordinate object settings";
-    Text[ chinese_simplified ] = "Use superordinate object settings";
-    Text[ chinese_traditional ] = "Use superordinate object settings";
+    Text[ japanese ] = "周りのテキストの文字方向に合わせる";
+    Text[ korean ] = "문자 방향의 상위 설정을 사용";
+    Text[ chinese_simplified ] = "沿用现有的文字方向的设定";
+    Text[ chinese_traditional ] = "沿用現有的文字方向的設定";
     Text[ turkish ] = "Use superordinate object settings";
     Text[ arabic ] = "Use superordinate object settings";
     Text[ catalan ] = "Use superordinate object settings";
@@ -154,18 +154,18 @@ String RID_SVXSTR_PAGEDIR_LTR_HORI
     Text[ russian ] = "Left-to-right (horizontal)";
     Text[ greek ] = "Left-to-right (horizontal)";
     Text[ dutch ] = "Left-to-right (horizontal)";
-    Text[ french ] = "Left-to-right (horizontal)";
-    Text[ spanish ] = "Left-to-right (horizontal)";
+    Text[ french ] = "De gauche � droite (horizontal)";
+    Text[ spanish ] = "De izquierda a derecha (horizontal)";
     Text[ finnish ] = "Left-to-right (horizontal)";
-    Text[ italian ] = "Left-to-right (horizontal)";
+    Text[ italian ] = "Da sinistra a destra (orizzontale)";
     Text[ danish ] = "Left-to-right (horizontal)";
-    Text[ swedish ] = "Left-to-right (horizontal)";
+    Text[ swedish ] = "V�nster-till-h�ger (horisontellt)";
     Text[ polish ] = "Left-to-right (horizontal)";
     Text[ portuguese_brazilian ] = "Left-to-right (horizontal)";
-    Text[ japanese ] = "Left-to-right (horizontal)";
-    Text[ korean ] = "Left-to-right (horizontal)";
-    Text[ chinese_simplified ] = "Left-to-right (horizontal)";
-    Text[ chinese_traditional ] = "Left-to-right (horizontal)";
+    Text[ japanese ] = "左から右へ(横書き)";
+    Text[ korean ] = "왼쪽에서 오른쪽으로 (가로)";
+    Text[ chinese_simplified ] = "从左向右(横写)";
+    Text[ chinese_traditional ] = "從左向右(橫書)";
     Text[ turkish ] = "Left-to-right (horizontal)";
     Text[ arabic ] = "Left-to-right (horizontal)";
     Text[ catalan ] = "Left-to-right (horizontal)";
@@ -181,18 +181,18 @@ String RID_SVXSTR_PAGEDIR_RTL_HORI
     Text[ russian ] = "Right-to-left (horizontal)";
     Text[ greek ] = "Right-to-left (horizontal)";
     Text[ dutch ] = "Right-to-left (horizontal)";
-    Text[ french ] = "Right-to-left (horizontal)";
-    Text[ spanish ] = "Right-to-left (horizontal)";
+    Text[ french ] = "De droite � gauche (horizontal)";
+    Text[ spanish ] = "De derecha a izquierda (horizontal)";
     Text[ finnish ] = "Right-to-left (horizontal)";
-    Text[ italian ] = "Right-to-left (horizontal)";
+    Text[ italian ] = "Da destra a sinistra (orizzontale)";
     Text[ danish ] = "Right-to-left (horizontal)";
-    Text[ swedish ] = "Right-to-left (horizontal)";
+    Text[ swedish ] = "H�ger-till-v�nster (horisontellt)";
     Text[ polish ] = "Right-to-left (horizontal)";
     Text[ portuguese_brazilian ] = "Right-to-left (horizontal)";
-    Text[ japanese ] = "Right-to-left (horizontal)";
-    Text[ korean ] = "Right-to-left (horizontal)";
-    Text[ chinese_simplified ] = "Right-to-left (horizontal)";
-    Text[ chinese_traditional ] = "Right-to-left (horizontal)";
+    Text[ japanese ] = "右から左へ(横書き)";
+    Text[ korean ] = "오른쪽에서 왼쪽으로 (가로)";
+    Text[ chinese_simplified ] = "从右向左(横写)";
+    Text[ chinese_traditional ] = "從右向左(橫書)";
     Text[ turkish ] = "Right-to-left (horizontal)";
     Text[ arabic ] = "Right-to-left (horizontal)";
     Text[ catalan ] = "Right-to-left (horizontal)";
@@ -208,18 +208,18 @@ String RID_SVXSTR_PAGEDIR_RTL_VERT
     Text[ russian ] = "Right-to-left (vertical)";
     Text[ greek ] = "Right-to-left (vertical)";
     Text[ dutch ] = "Right-to-left (vertical)";
-    Text[ french ] = "Right-to-left (vertical)";
-    Text[ spanish ] = "Right-to-left (vertical)";
+    Text[ french ] = "De droite � gauche (vertical)";
+    Text[ spanish ] = "De derecha a izquierda (vertical)";
     Text[ finnish ] = "Right-to-left (vertical)";
-    Text[ italian ] = "Right-to-left (vertical)";
+    Text[ italian ] = "Da destra a sinistra (verticale)";
     Text[ danish ] = "Right-to-left (vertical)";
-    Text[ swedish ] = "Right-to-left (vertical)";
+    Text[ swedish ] = "H�ger-till-v�nster (vertikalt)";
     Text[ polish ] = "Right-to-left (vertical)";
     Text[ portuguese_brazilian ] = "Right-to-left (vertical)";
-    Text[ japanese ] = "Right-to-left (vertical)";
-    Text[ korean ] = "Right-to-left (vertical)";
-    Text[ chinese_simplified ] = "Right-to-left (vertical)";
-    Text[ chinese_traditional ] = "Right-to-left (vertical)";
+    Text[ japanese ] = "右から左へ(縦書き)";
+    Text[ korean ] = "오른쪽에서 왼쪽으로 (세로)";
+    Text[ chinese_simplified ] = "从右向左(竖写)";
+    Text[ chinese_traditional ] = "從右向左(直書)";
     Text[ turkish ] = "Right-to-left (vertical)";
     Text[ arabic ] = "Right-to-left (vertical)";
     Text[ catalan ] = "Right-to-left (vertical)";
@@ -235,18 +235,18 @@ String RID_SVXSTR_PAGEDIR_LTR_VERT
     Text[ russian ] = "Left-to-right (vertical)";
     Text[ greek ] = "Left-to-right (vertical)";
     Text[ dutch ] = "Left-to-right (vertical)";
-    Text[ french ] = "Left-to-right (vertical)";
-    Text[ spanish ] = "Left-to-right (vertical)";
+    Text[ french ] = "De gauche � droite (vertical)";
+    Text[ spanish ] = "De izquierda a derecha (vertical)";
     Text[ finnish ] = "Left-to-right (vertical)";
-    Text[ italian ] = "Left-to-right (vertical)";
+    Text[ italian ] = "Da sinistra a destra (verticale)";
     Text[ danish ] = "Left-to-right (vertical)";
-    Text[ swedish ] = "Left-to-right (vertical)";
+    Text[ swedish ] = "V�nster-till-h�ger (vertikalt)";
     Text[ polish ] = "Left-to-right (vertical)";
     Text[ portuguese_brazilian ] = "Left-to-right (vertical)";
-    Text[ japanese ] = "Left-to-right (vertical)";
-    Text[ korean ] = "Left-to-right (vertical)";
-    Text[ chinese_simplified ] = "Left-to-right (vertical)";
-    Text[ chinese_traditional ] = "Left-to-right (vertical)";
+    Text[ japanese ] = "左から右へ(縦書き)";
+    Text[ korean ] = "왼쪽에서 오른쪽으로 (세로)";
+    Text[ chinese_simplified ] = "从左向右(竖写)";
+    Text[ chinese_traditional ] = "從左向右(直書)";
     Text[ turkish ] = "Left-to-right (vertical)";
     Text[ arabic ] = "Left-to-right (vertical)";
     Text[ catalan ] = "Left-to-right (vertical)";
@@ -255,3 +255,8 @@ String RID_SVXSTR_PAGEDIR_LTR_VERT
 
 // ----------------------------------------------------------------------------
 
+
+
+
+
+
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index c22a1f11e4d2..f486640f9512 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: frmsel.cxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: os $ $Date: 2002-10-29 14:35:41 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -954,6 +954,7 @@ SvxFrameSelector::SvxFrameSelector( Window* pParent,
         bIsClicked      ( FALSE ),
         pImpl           ( new SvxFrameSelector_Impl( this ) )
 {
+    EnableRTL( false ); // #107808# don't mirror the mouse handling
 }
 /* -----------------------------01.02.2002 16:47------------------------------
 
@@ -1853,7 +1854,12 @@ void SvxFrameSelector::MouseButtonUp( const MouseEvent& rMEvt )
      * o Click auf die gleiche Linie -> Toggle SHOW/HIDE/DONT_CARE
      */
 
+    BOOL bWasSelected = IsAnyLineSelected_Impl();
     GrabFocus();
+    if ( !bWasSelected )
+        pImpl->aTopLine.bIsSelected = FALSE;
+
+
     if ( rMEvt.IsLeft() )
     {
         Point aBtnUpPos( rMEvt.GetPosPixel() );
@@ -1864,36 +1870,24 @@ void SvxFrameSelector::MouseButtonUp( const MouseEvent& rMEvt )
 
             // wenn Linien auf DontCare sind, muessen diese auf HIDE
             // gesetzt werden (ausser der aktuellen Linie)
-
-            if ( pImpl->aLeftLine.aState == SVX_FRMLINESTATE_DONT_CARE &&
-                 !pImpl->aSpotLeft.IsInside( aBtnUpPos ) )
-            {
-                pImpl->aLeftLine.SetStyle( SvxFrameLine::NO_LINE );
-            }
-            if ( pImpl->aRightLine.aState == SVX_FRMLINESTATE_DONT_CARE &&
-                 !pImpl->aSpotRight.IsInside( aBtnUpPos ) )
-            {
-                pImpl->aRightLine.SetStyle( SvxFrameLine::NO_LINE );
-            }
-            if ( pImpl->aTopLine.aState == SVX_FRMLINESTATE_DONT_CARE &&
-                 !pImpl->aSpotTop.IsInside( aBtnUpPos ) )
-            {
-                pImpl->aTopLine.SetStyle( SvxFrameLine::NO_LINE );
-            }
-            if ( pImpl->aBottomLine.aState == SVX_FRMLINESTATE_DONT_CARE &&
-                 !pImpl->aSpotBottom.IsInside( aBtnUpPos ) )
+            typedef ::std::pair<SvxFrameLine*,Rectangle*> TOuterPair;
+            TOuterPair eTypes[] =   {
+                                        TOuterPair(&pImpl->aLeftLine,&pImpl->aSpotLeft),
+                                        TOuterPair(&pImpl->aRightLine,&pImpl->aSpotRight),
+                                        TOuterPair(&pImpl->aTopLine,&pImpl->aSpotTop),
+                                        TOuterPair(&pImpl->aBottomLine,&pImpl->aSpotBottom),
+                                        TOuterPair(&pImpl->aVerLine,&pImpl->aSpotVer),
+                                        TOuterPair(&pImpl->aHorLine,&pImpl->aSpotHor)
+                                    };
+
+            for (sal_Int32 i=0; i < sizeof(eTypes)/sizeof(TOuterPair); ++i)
             {
-                pImpl->aBottomLine.SetStyle( SvxFrameLine::NO_LINE );
-            }
-            if ( pImpl->aVerLine.aState == SVX_FRMLINESTATE_DONT_CARE &&
-                 !pImpl->aSpotVer.IsInside( aBtnUpPos ) )
-            {
-                pImpl->aVerLine.SetStyle( SvxFrameLine::NO_LINE );
-            }
-            if ( pImpl->aHorLine.aState == SVX_FRMLINESTATE_DONT_CARE &&
-                 !pImpl->aSpotHor.IsInside( aBtnUpPos ) )
-            {
-                pImpl->aHorLine.SetStyle( SvxFrameLine::NO_LINE );
+
+                if ( eTypes[i].first->aState == SVX_FRMLINESTATE_DONT_CARE &&
+                     !eTypes[i].second->IsInside( aBtnUpPos ) )
+                {
+                    eTypes[i].first->SetStyle( SvxFrameLine::NO_LINE );
+                }
             }
         }
 
@@ -2126,10 +2120,14 @@ void SvxFrameSelector::ToggleOneLine(SvxFrameLine &aCurLine)
     if (aCurLine.GetState() == SVX_FRMLINESTATE_HIDE)
     {
         aCurLine.SetState(SVX_FRMLINESTATE_SHOW);
+        //  aCurLine.aStyle = SvxFrameLine::THIN_LINE;
+        aCurLine.SetStyle( pImpl->aCurLineStyle );
+        aCurLine.aColor = pImpl->aCurLineCol;
     }
     else if (aCurLine.GetState() == SVX_FRMLINESTATE_SHOW)
     {
         aCurLine.SetState(SVX_FRMLINESTATE_HIDE);
+        aCurLine.SetStyle( SvxFrameLine::NO_LINE );
     }
     // No need to handle SVX_FRMLINESTATE_DONT_CARE
     // else
@@ -2139,7 +2137,7 @@ void SvxFrameSelector::ToggleOneLine(SvxFrameLine &aCurLine)
 
 void SvxFrameSelector::ToggleAllSelectedLines()
 {
-    SvxFrameSelectorLine eRet = SVX_FRMSELLINE_NONE;
+
     if( pImpl->aTopLine.bIsSelected )    ToggleOneLine(pImpl->aTopLine);
     if( pImpl->aLeftLine.bIsSelected )   ToggleOneLine(pImpl->aLeftLine);
     if( pImpl->aRightLine.bIsSelected )  ToggleOneLine(pImpl->aRightLine);
diff --git a/svx/source/dialog/frmsel.src b/svx/source/dialog/frmsel.src
index b249cbbbc225..13dbc13553b5 100644
--- a/svx/source/dialog/frmsel.src
+++ b/svx/source/dialog/frmsel.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: frmsel.src,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: kz $ $Date: 2002-06-10 15:15:10 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -488,7 +488,7 @@ Resource RID_SVXSTR_BORDER_CONTROL
         < "위쪽 테두리" ; 3; > ;
         < "아래쪽 테두리" ; 4; > ;
         < "수평 테두리" ; 5; > ;
-        < "수직 테두리" ; 6; > ;
+        < "수직 테두리선" ; 6; > ;
     };
     ItemList [ chinese_simplified ] =
     {
@@ -553,3 +553,8 @@ Resource RID_SVXSTR_BORDER_CONTROL
     };
 };
 
+
+
+
+
+
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index 7a0586212ffb..77455922841a 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: graphctl.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: thb $ $Date: 2002-09-30 15:15:22 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,8 +74,8 @@
 #ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
 #include <svtools/syslocale.hxx>
 #endif
-#ifndef _TOOLS_SOLMATH_HXX
-#include <tools/solmath.hxx>
+#ifndef INCLUDED_RTL_MATH_HXX
+#include <rtl/math.hxx>
 #endif
 
 #ifndef _UNOTOOLS_LOCALEDATAWRAPPER_HXX
@@ -905,9 +905,10 @@ void GraphCtrl::SetObjKind( const SdrObjKind _eObjKind )
 
 String GraphCtrl::GetStringFromDouble( const double& rDouble )
 {
-    String aStr;
-    sal_Unicode cSep = SvtSysLocale().GetLocaleData().getNumDecimalSep().GetChar(0);
-    SolarMath::DoubleToString( aStr, rDouble, 'F', 2, cSep );
+    sal_Unicode cSep =
+        SvtSysLocale().GetLocaleData().getNumDecimalSep().GetChar(0);
+    String aStr( ::rtl::math::doubleToUString( rDouble,
+                rtl_math_StringFormat_F, 2, cSep ));
     return aStr;
 }
 
diff --git a/svx/source/dialog/grfflt.src b/svx/source/dialog/grfflt.src
index df1ea8b621b2..9aa5025c7c1e 100644
--- a/svx/source/dialog/grfflt.src
+++ b/svx/source/dialog/grfflt.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: grfflt.src,v $
  *
- *  $Revision: 1.33 $
+ *  $Revision: 1.34 $
  *
- *  last change: $Author: ka $ $Date: 2002-04-26 09:19:53 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -92,11 +92,11 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC
     Text[ chinese_simplified ] = "镶嵌";
     Text[ russian ] = "�������";
     Text[ polish ] = "Mozaika";
-    Text[ japanese ] = "ﾓｻﾞｲｸ";
+    Text[ japanese ] = "モザイク";
     Text[ chinese_simplified ] = "镶嵌";
     Text[ russian ] = "�������";
     Text[ polish ] = "Mozaika";
-    Text[ japanese ] = "ﾓｻﾞｲｸ";
+    Text[ japanese ] = "モザイク";
     Text[ chinese_traditional ] = "鑲嵌";
     Text[ arabic ] = "�������";
     Text[ greek ] = "�������";
@@ -118,18 +118,19 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC
         Text[ french ] = "Param�tres";
         Text[ spanish ] = "Par�metros";
         Text[ italian ] = "Parametri";
-        Text[ danish ] = "Parametre";
+        Text[ danish ] = "Parameter";
         Text[ swedish ] = "Parametrar";
         Text[ polish ] = "Parametry";
         Text[ portuguese_brazilian ] = "Parameter";
-        Text[ japanese ] = "ﾊﾟﾗﾒｰﾀ";
-        Text[ korean ] = "파라미터";
+        Text[ japanese ] = "パラメータ";
+        Text[ korean ] = "매개 변수";
         Text[ chinese_simplified ] = "参数";
         Text[ chinese_traditional ] = "參數";
         Text[ turkish ] = "Parametre";
         Text[ arabic ] = "��������";
-        Text[ catalan ] = "Par�metros";
+        Text[ catalan ] = "Par�metres";
         Text[ finnish ] = "Parametrit";
+        Text[ thai ] = "พารามิเตอร์";
     };
     Control CTL_PREVIEW
     {
@@ -147,8 +148,8 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC
         Text[ italian ] = "Larghezza" ;
         Text[ portuguese_brazilian ] = "~Largura" ;
         Text[ portuguese ] = "~Largura" ;
-        Text[ finnish ] = "~Leveys" ;
-        Text[ danish ] = "Bredde" ;
+        Text[ finnish ] = "Leve~ys" ;
+        Text[ danish ] = "~Bredde" ;
         Text[ french ] = "Largeur" ;
         Text[ swedish ] = "~Bredd" ;
         Text[ dutch ] = "~Breedte" ;
@@ -164,7 +165,8 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC
         Text[ korean ] = "너비(~W)";
         Text[ turkish ] = "Geni�lik";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "A~ncho";
+        Text[ catalan ] = "~Amplada";
+        Text[ thai ] = "ความ~กว้าง";
     };
 #define MA_Y1   MA_Y0 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
     MetricField DLG_FILTERMOSAIC_MTR_WIDTH
@@ -195,8 +197,8 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC
         Text[ italian ] = "Altezza" ;
         Text[ portuguese_brazilian ] = "~Altura" ;
         Text[ portuguese ] = "~Altura" ;
-        Text[ finnish ] = "K~orkeus" ;
-        Text[ danish ] = "H�jde" ;
+        Text[ finnish ] = "~Korkeus" ;
+        Text[ danish ] = "H~�jde" ;
         Text[ french ] = "Hauteur" ;
         Text[ swedish ] = "~H�jd" ;
         Text[ dutch ] = "~Hoogte" ;
@@ -212,7 +214,8 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC
         Text[ korean ] = "높이(~E)";
         Text[ turkish ] = "Y�ksek.";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "A~ltura";
+        Text[ catalan ] = "A~l�ada";
+        Text[ thai ] = "ความสู~ง";
     };
 #define MA_Y3   MA_Y2 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
     MetricField DLG_FILTERMOSAIC_MTR_HEIGHT
@@ -242,13 +245,13 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC
         Text[ ENGLISH ] = "~Enhance edges" ;
         Text[ english_us ] = "E~nhance edges" ;
         Text[ portuguese ] = "~Destacar arestas";
-        Text[ russian ] = "~�������� �������";
+        Text[ russian ] = "~�������� ����";
         Text[ greek ] = "���������� �~����";
-        Text[ dutch ] = "~Kanten accentueren";
+        Text[ dutch ] = "~Randen accentueren";
         Text[ french ] = "Mise en �vidence des ~ar�tes";
         Text[ spanish ] = "~Resaltar aristas";
         Text[ italian ] = "E~videnzia gli angoli";
-        Text[ danish ] = "Fremh�v kanter";
+        Text[ danish ] = "Fremh�v ~kanter";
         Text[ swedish ] = "Framh�v ~kanter";
         Text[ polish ] = "Wyr�nij kraw�dzie";
         Text[ portuguese_brazilian ] = "~Enhance edges";
@@ -258,8 +261,9 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC
         Text[ chinese_traditional ] = "突出顯示邊角(~N)";
         Text[ turkish ] = "~Enhance edges";
         Text[ arabic ] = "����� ������";
-        Text[ catalan ] = "~Resaltar aristas";
+        Text[ catalan ] = "~Resalta arestes";
         Text[ finnish ] = "K~orosta reunoja";
+        Text[ thai ] = "ขอบสูง~ขึ้น";
     };
     OKButton BTN_OK
     {
@@ -280,7 +284,8 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC
         Size = MAP_APPFONT ( 50, 14 ) ;
         TabStop = TRUE ;
     };
-    Text[ catalan ] = "Mosaico";
+    Text[ catalan ] = "Mosaic";
+    Text[ thai ] = "โมเสส";
 };
 
 // ----------------------
@@ -311,11 +316,11 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE
     Text[ chinese_simplified ] = "曝光";
     Text[ russian ] = "�����������";
     Text[ polish ] = "Solaryzacja";
-    Text[ japanese ] = "ｿﾗﾘｾﾞｰｼｮﾝ";
+    Text[ japanese ] = "ソラリゼーション";
     Text[ chinese_traditional ] = "曝光";
     Text[ arabic ] = "�������";
     Text[ greek ] = "������ ��� ���";
-    Text[ korean ] = "솔라러리제이션";
+    Text[ korean ] = "솔라리제이션";
     Text[ turkish ] = "Y�ksek pozlama";
     Text[ language_user1 ] = " ";
 
@@ -333,18 +338,19 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE
         Text[ french ] = "Param�tres";
         Text[ spanish ] = "Par�metros";
         Text[ italian ] = "Parametri";
-        Text[ danish ] = "Parametre";
+        Text[ danish ] = "Parameter";
         Text[ swedish ] = "Parametrar";
         Text[ polish ] = "Parametry";
         Text[ portuguese_brazilian ] = "Parameter";
-        Text[ japanese ] = "ﾊﾟﾗﾒｰﾀ";
-        Text[ korean ] = "파라미터";
+        Text[ japanese ] = "パラメータ";
+        Text[ korean ] = "매개 변수";
         Text[ chinese_simplified ] = "参数";
         Text[ chinese_traditional ] = "參數";
         Text[ turkish ] = "Parametre";
         Text[ arabic ] = "��������";
-        Text[ catalan ] = "Par�metros";
+        Text[ catalan ] = "Par�metres";
         Text[ finnish ] = "Parametrit";
+        Text[ thai ] = "พารามิเตอร์";
     };
     Control CTL_PREVIEW
     {
@@ -363,7 +369,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE
         Text[ portuguese_brazilian ] = "Limite" ;
         Text[ portuguese ] = "~Valor limite" ;
         Text[ finnish ] = "Raja-~arvo" ;
-        Text[ danish ] = "T�rskelv�rdi" ;
+        Text[ danish ] = "~T�rskelv�rdi" ;
         Text[ french ] = "~Valeur de seuil" ;
         Text[ swedish ] = "Tr�~skelv�rde" ;
         Text[ dutch ] = "~Drempelwaarde" ;
@@ -379,7 +385,8 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE
         Text[ korean ] = "임계값(~V)";
         Text[ turkish ] = "E�ik de�er";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Valor ~umbral";
+        Text[ catalan ] = "~Valor llindar";
+        Text[ thai ] = "~ค่าเข้าใกล้";
     };
 #define MA_Y6   MA_Y5 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
     MetricField DLG_FILTERSOLARIZE_MTR_THRESHOLD
@@ -409,8 +416,8 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE
         Text[ italian ] = "Inverti" ;
         Text[ portuguese_brazilian ] = "Inverter" ;
         Text[ portuguese ] = "~Inverter" ;
-        Text[ finnish ] = "~K��nn�" ;
-        Text[ danish ] = "Inverter" ;
+        Text[ finnish ] = "Muunna ~k��nteiseksi" ;
+        Text[ danish ] = "~Inverter" ;
         Text[ french ] = "~Invertir" ;
         Text[ swedish ] = "~Invertera" ;
         Text[ dutch ] = "~Diapositief" ;
@@ -426,7 +433,8 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE
         Text[ korean ] = "반전(~I)";
         Text[ turkish ] = "Tersine �evir";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "I~nvertir";
+        Text[ catalan ] = "~Inverteix";
+        Text[ thai ] = "~สลับ";
     };
     OKButton BTN_OK
     {
@@ -447,7 +455,8 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE
         Size = MAP_APPFONT ( 50, 14 ) ;
         TabStop = TRUE ;
     };
-    Text[ catalan ] = "Solarizaci�n";
+    Text[ catalan ] = "Solaritzaci�";
+    Text[ thai ] = "ตากแดด";
 };
 
 // ----------------------
@@ -468,8 +477,8 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SEPIA
     Text[ italian ] = "Invecchiamento" ;
     Text[ portuguese_brazilian ] = "Idade" ;
     Text[ portuguese ] = "Envelhecimento" ;
-    Text[ finnish ] = "Ik��ntynyt" ;
-    Text[ danish ] = "�ldning" ;
+    Text[ finnish ] = "Ik��ntyminen" ;
+    Text[ danish ] = "Sepia" ;
     Text[ french ] = "Vieillissement" ;
     Text[ swedish ] = "�ldrande" ;
     Text[ dutch ] = "Ouder maken" ;
@@ -478,13 +487,13 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SEPIA
     Text[ chinese_simplified ] = "时效";
     Text[ russian ] = "��������";
     Text[ polish ] = "Efekt starzenia";
-    Text[ japanese ] = "ｴｲｼﾞﾝｸﾞ";
+    Text[ japanese ] = "エイジング";
     Text[ chinese_traditional ] = "時效";
     Text[ arabic ] = "�������";
     Text[ dutch ] = "Ouder maken";
     Text[ chinese_simplified ] = "时效";
     Text[ greek ] = "�������";
-    Text[ korean ] = "낡음효과";
+    Text[ korean ] = "낡음 효과";
     Text[ turkish ] = "Eskitme";
 
     FixedLine FL_PARAMETER
@@ -501,18 +510,19 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SEPIA
         Text[ french ] = "Param�tre";
         Text[ spanish ] = "Par�metros";
         Text[ italian ] = "Parametri";
-        Text[ danish ] = "Parametre";
+        Text[ danish ] = "Parameter";
         Text[ swedish ] = "Parametrar";
         Text[ polish ] = "Parametry";
         Text[ portuguese_brazilian ] = "Parameter";
-        Text[ japanese ] = "ﾊﾟﾗﾒｰﾀ";
-        Text[ korean ] = "파라미터";
+        Text[ japanese ] = "パラメータ";
+        Text[ korean ] = "매개 변수";
         Text[ chinese_simplified ] = "参数";
         Text[ chinese_traditional ] = "參數";
         Text[ turkish ] = "Parametre";
         Text[ arabic ] = "�������";
-        Text[ catalan ] = "Par�metros";
+        Text[ catalan ] = "Par�metres";
         Text[ finnish ] = "Parametrit";
+        Text[ thai ] = "พารามิเตอร์";
     };
     Control CTL_PREVIEW
     {
@@ -531,24 +541,25 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SEPIA
         Text[ portuguese_brazilian ] = "Valor de envelhecimento" ;
         Text[ portuguese ] = "Grau de envelhecimento" ;
         Text[ finnish ] = "Ik��ntymisaste" ;
-        Text[ danish ] = "�ldningsgrad" ;
+        Text[ danish ] = "Sepiagrad" ;
         Text[ french ] = "Degr� de vieillissement" ;
         Text[ swedish ] = "�ldringsgrad" ;
         Text[ dutch ] = "Mate van veroudering" ;
-        Text[ spanish ] = "Grado de envejecim." ;
+        Text[ spanish ] = "Grado de envejecimiento" ;
         Text[ english_us ] = "Aging degree" ;
         Text[ chinese_simplified ] = "时效度";
         Text[ russian ] = "������� ��������";
         Text[ polish ] = "Stopie� efektu starzenia";
-        Text[ japanese ] = "ｴｲｼﾞﾝｸﾞ度合";
+        Text[ japanese ] = "エイジング度合";
         Text[ chinese_traditional ] = "時效度";
         Text[ arabic ] = "���� �������";
         Text[ dutch ] = "Mate van veroudering";
         Text[ chinese_simplified ] = "时效度";
         Text[ greek ] = "������ ��������";
-        Text[ korean ] = "낡음효과 정도";
+        Text[ korean ] = "낡음 효과 정도";
         Text[ turkish ] = "Eskitme derecesi";
-        Text[ catalan ] = "Grado de envejecim.";
+        Text[ catalan ] = "Grau d'envelliment";
+        Text[ thai ] = "ระดับการตรวจสอบเวลา";
     };
 #define MA_Y9   MA_Y8 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
     MetricField DLG_FILTERSEPIA_MTR_SEPIA
@@ -588,7 +599,8 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SEPIA
         Size = MAP_APPFONT ( 50, 14 ) ;
         TabStop = TRUE ;
     };
-    Text[ catalan ] = "Envejecimiento";
+    Text[ catalan ] = "Envelliment";
+    Text[ thai ] = "ตรวจสอบเวลา";
 };
 
 // --------------------
@@ -609,7 +621,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_POSTER
     Text[ italian ] = "Poster" ;
     Text[ portuguese_brazilian ] = "Transformar em poster" ;
     Text[ portuguese ] = "Poster" ;
-    Text[ finnish ] = "Tee julisteeksi" ;
+    Text[ finnish ] = "V�rien v�hennys" ;
     Text[ danish ] = "Plakat" ;
     Text[ french ] = "Poster" ;
     Text[ swedish ] = "Poster" ;
@@ -619,7 +631,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_POSTER
     Text[ chinese_simplified ] = "海报";
     Text[ russian ] = "������";
     Text[ polish ] = "Plakat";
-    Text[ japanese ] = "ﾎﾟｽﾀｰ";
+    Text[ japanese ] = "ポスター";
     Text[ chinese_traditional ] = "海報";
     Text[ arabic ] = "�����";
     Text[ greek ] = "�����";
@@ -640,18 +652,19 @@ ModalDialog RID_SVX_GRFFILTER_DLG_POSTER
         Text[ french ] = "Param�tre";
         Text[ spanish ] = "Par�metros";
         Text[ italian ] = "Parametri";
-        Text[ danish ] = "Parametre";
+        Text[ danish ] = "Parameter";
         Text[ swedish ] = "Parametrar";
         Text[ polish ] = "Parametry";
         Text[ portuguese_brazilian ] = "Parameter";
-        Text[ japanese ] = "ﾊﾟﾗﾒｰﾀ";
-        Text[ korean ] = "파라미터";
+        Text[ japanese ] = "パラメータ";
+        Text[ korean ] = "매개 변수";
         Text[ chinese_simplified ] = "参数";
         Text[ chinese_traditional ] = "參數";
         Text[ turkish ] = "Parametre";
         Text[ arabic ] = "�������";
-        Text[ catalan ] = "Par�metros";
+        Text[ catalan ] = "Par�metres";
         Text[ finnish ] = "Parametrit";
+        Text[ thai ] = "พารามิเตอร์";
     };
     Control CTL_PREVIEW
     {
@@ -669,7 +682,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_POSTER
         Text[ italian ] = "Colori posterizz." ;
         Text[ portuguese_brazilian ] = "Cores do poster" ;
         Text[ portuguese ] = "Cores do poster" ;
-        Text[ finnish ] = "Julisteen v�rit" ;
+        Text[ finnish ] = "V�rien m��r�" ;
         Text[ danish ] = "Plakatfarver" ;
         Text[ french ] = "Couleurs du poster" ;
         Text[ swedish ] = "Posterf�rger" ;
@@ -679,13 +692,14 @@ ModalDialog RID_SVX_GRFFILTER_DLG_POSTER
         Text[ chinese_simplified ] = "海报颜色";
         Text[ russian ] = "����� �������";
         Text[ polish ] = "Kolory plakatu";
-        Text[ japanese ] = "ﾎﾟｽﾀｰｶﾗｰ";
-        Text[ chinese_traditional ] = "海報顔色";
+        Text[ japanese ] = "ポスターカラー";
+        Text[ chinese_traditional ] = "海報顏色";
         Text[ arabic ] = "����� �������";
         Text[ greek ] = "������� ������";
         Text[ korean ] = "포스터 색상";
         Text[ turkish ] = "Afi� renkleri";
-        Text[ catalan ] = "Colores del p�ster";
+        Text[ catalan ] = "Colors del p�ster";
+        Text[ thai ] = "สีโปสเตอร์";
     };
 #define MA_Y11  MA_Y10 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
     NumericField DLG_FILTERPOSTER_NUM_POSTER
@@ -722,7 +736,8 @@ ModalDialog RID_SVX_GRFFILTER_DLG_POSTER
         Size = MAP_APPFONT ( 50, 14 ) ;
         TabStop = TRUE ;
     };
-    Text[ catalan ] = "P�ster";
+    Text[ catalan ] = "Redueix la gamma de colors";
+    Text[ thai ] = "ทำเป็นโปสเตอร์";
 };
 
 // --------------------
@@ -759,7 +774,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_EMBOSS
     Text[ chinese_simplified ] = "浮雕";
     Text[ russian ] = "������";
     Text[ polish ] = "Uwypuklenie";
-    Text[ japanese ] = "ﾚﾘｰﾌ";
+    Text[ japanese ] = "レリーフ";
     Text[ chinese_traditional ] = "浮雕";
     Text[ arabic ] = "���";
     Text[ greek ] = "A�������";
@@ -781,18 +796,19 @@ ModalDialog RID_SVX_GRFFILTER_DLG_EMBOSS
         Text[ french ] = "Param�tre";
         Text[ spanish ] = "Par�metros";
         Text[ italian ] = "Parametri";
-        Text[ danish ] = "Parametre";
+        Text[ danish ] = "Parameter";
         Text[ swedish ] = "Parametrar";
         Text[ polish ] = "Parametry";
         Text[ portuguese_brazilian ] = "Parameter";
-        Text[ japanese ] = "ﾊﾟﾗﾒｰﾀ";
-        Text[ korean ] = "파라미터";
+        Text[ japanese ] = "パラメータ";
+        Text[ korean ] = "매개 변수";
         Text[ chinese_simplified ] = "参数";
         Text[ chinese_traditional ] = "參數";
         Text[ turkish ] = "Parametre";
         Text[ arabic ] = "�������";
-        Text[ catalan ] = "Par�metros";
+        Text[ catalan ] = "Par�metres";
         Text[ finnish ] = "Parametrit";
+        Text[ thai ] = "พารามิเตอร์";
     };
     Control CTL_PREVIEW
     {
@@ -826,7 +842,8 @@ ModalDialog RID_SVX_GRFFILTER_DLG_EMBOSS
         Text[ greek ] = "��������� �����";
         Text[ korean ] = "광원";
         Text[ turkish ] = "I��k kayna��";
-        Text[ catalan ] = "Fuente de luz";
+        Text[ catalan ] = "Font de llum";
+        Text[ thai ] = "แหล่งความสว่าง";
     };
 #define MA_Y13  MA_Y12 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
     Control DLG_FILTEREMBOSS_CTL_LIGHT
@@ -856,7 +873,8 @@ ModalDialog RID_SVX_GRFFILTER_DLG_EMBOSS
         Size = MAP_APPFONT ( 50, 14 ) ;
         TabStop = TRUE ;
     };
-    Text[ catalan ] = "Relieve";
+    Text[ catalan ] = "Relleu";
+    Text[ thai ] = "นูน";
 };
 
 
@@ -870,3 +888,8 @@ ModalDialog RID_SVX_GRFFILTER_DLG_EMBOSS
 
 
 
+
+
+
+
+
diff --git a/svx/source/dialog/grfpage.src b/svx/source/dialog/grfpage.src
index fede9b3374db..4a9d84547c0e 100644
--- a/svx/source/dialog/grfpage.src
+++ b/svx/source/dialog/grfpage.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: grfpage.src,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: kz $ $Date: 2001-07-26 22:29:08 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -92,17 +92,18 @@ TabPage RID_SVXPAGE_GRFCROP
         Text [ danish ] = "Besk�r" ;
         Text [ portuguese_brazilian ] = "Zuschneiden" ;
         Text [ portuguese ] = "Recortar" ;
-        Text[ chinese_simplified ] = "�ü�";
-        Text[ russian ] = "���������";
+        Text[ chinese_simplified ] = "裁剪";
+        Text[ russian ] = "�����������";
         Text[ polish ] = "Przytnij";
-        Text[ japanese ] = "���ݸ�";
-        Text[ chinese_traditional ] = "����";
+        Text[ japanese ] = "トリミング";
+        Text[ chinese_traditional ] = "裁剪";
         Text[ arabic ] = "������";
         Text[ greek ] = "����������";
-        Text[ korean ] = "�ٵ��";
+        Text[ korean ] = "다듬기";
         Text[ turkish ] = "K�rp";
-        Text[ catalan ] = "Recortar";
+        Text[ catalan ] = "Retalla";
         Text[ finnish ] = "Rajaa";
+        Text[ thai ] = "ครอบตัด";
     };
     FixedText FT_LEFT
     {
@@ -112,24 +113,25 @@ TabPage RID_SVXPAGE_GRFCROP
         Text [ ENGLISH ] = "~Left" ;
         Text [ dutch ] = "~Links" ;
         Text [ english_us ] = "~Left" ;
-        Text [ italian ] = "~Sinistra" ;
+        Text [ italian ] = "Sinistra" ;
         Text [ spanish ] = "~Izquierda" ;
-        Text [ french ] = "� ~gauche" ;
+        Text [ french ] = "� gauche" ;
         Text [ swedish ] = "~V�nster" ;
         Text [ danish ] = "Venstre" ;
         Text [ portuguese_brazilian ] = "~Links" ;
         Text [ portuguese ] = "~Esquerda" ;
-        Text[ chinese_simplified ] = "��(~L)";
+        Text[ chinese_simplified ] = "左(~L)";
         Text[ russian ] = "�����";
         Text[ polish ] = "Z lewej";
-        Text[ japanese ] = "��(~L)";
-        Text[ chinese_traditional ] = "��(~L)";
+        Text[ japanese ] = "左(~L)";
+        Text[ chinese_traditional ] = "左(~L)";
         Text[ arabic ] = "������";
         Text[ greek ] = "��������";
-        Text[ korean ] = "����(~L)";
+        Text[ korean ] = "왼쪽(~L)";
         Text[ turkish ] = "So~l";
-        Text[ catalan ] = "~Izquierda";
-        Text[ finnish ] = "~Vasen:";
+        Text[ catalan ] = "~Esquerra";
+        Text[ finnish ] = "~Vasen";
+        Text[ thai ] = "~ซ้าย";
     };
     MetricField MF_LEFT
     {
@@ -158,24 +160,25 @@ TabPage RID_SVXPAGE_GRFCROP
         Text [ ENGLISH ] = "Right" ;
         Text [ english_us ] = "~Right" ;
         Text [ italian ] = "Destra" ;
-        Text [ spanish ] = "~Derecha" ;
-        Text [ french ] = "� ~droite" ;
+        Text [ spanish ] = "Derecha" ;
+        Text [ french ] = "� droite" ;
         Text [ dutch ] = "~Rechts" ;
         Text [ swedish ] = "H�ge~r" ;
         Text [ danish ] = "H�jre" ;
         Text [ portuguese_brazilian ] = "Rechts" ;
         Text [ portuguese ] = "~Direita" ;
-        Text[ chinese_simplified ] = "��(~R)";
+        Text[ chinese_simplified ] = "右(~R)";
         Text[ russian ] = "������";
         Text[ polish ] = "Z prawej";
-        Text[ japanese ] = "�E(~R)";
-        Text[ chinese_traditional ] = "�k(~R)";
+        Text[ japanese ] = "右(~R)";
+        Text[ chinese_traditional ] = "右(~R)";
         Text[ arabic ] = "������";
         Text[ greek ] = "�����";
-        Text[ korean ] = "������(~R)";
+        Text[ korean ] = "오른쪽(~R)";
         Text[ turkish ] = "S~a�";
-        Text[ catalan ] = "~Derecha";
+        Text[ catalan ] = "~Dreta";
         Text[ finnish ] = "~Oikea";
+        Text[ thai ] = "~ขวา";
     };
     MetricField MF_RIGHT
     {
@@ -202,24 +205,25 @@ TabPage RID_SVXPAGE_GRFCROP
         Text [ ENGLISH ] = "Top" ;
         Text [ english_us ] = "~Top" ;
         Text [ italian ] = "Sopra" ;
-        Text [ spanish ] = "~Arriba" ;
+        Text [ spanish ] = "Arriba" ;
         Text [ french ] = "En haut" ;
         Text [ dutch ] = "~Boven" ;
         Text [ swedish ] = "~Uppe" ;
         Text [ danish ] = "�verst" ;
         Text [ portuguese_brazilian ] = "Oben" ;
         Text [ portuguese ] = "Em ~cima" ;
-        Text[ chinese_simplified ] = "��(~T)";
+        Text[ chinese_simplified ] = "上(~T)";
         Text[ russian ] = "������";
         Text[ polish ] = "Na g�rze";
-        Text[ japanese ] = "��(~T)";
-        Text[ chinese_traditional ] = "�W(~T)";
+        Text[ japanese ] = "上(~T)";
+        Text[ chinese_traditional ] = "上(~T)";
         Text[ arabic ] = "����";
         Text[ greek ] = "����";
-        Text[ korean ] = "��(~T)";
+        Text[ korean ] = "위(~T)";
         Text[ turkish ] = "�~st";
-        Text[ catalan ] = "~Arriba";
-        Text[ finnish ] = "~Yl�osa";
+        Text[ catalan ] = "Part ~superior";
+        Text[ finnish ] = "~Yl�reuna";
+        Text[ thai ] = "~บน";
     };
     MetricField MF_TOP
     {
@@ -250,22 +254,23 @@ TabPage RID_SVXPAGE_GRFCROP
         Text [ english_us ] = "~Bottom" ;
         Text [ italian ] = "Sotto" ;
         Text [ spanish ] = "A~bajo" ;
-        Text [ french ] = "En ~bas" ;
+        Text [ french ] = "En bas" ;
         Text [ swedish ] = "~Nere" ;
         Text [ danish ] = "Nederst" ;
         Text [ portuguese ] = "Em ~baixo" ;
         Text [ portuguese_brazilian ] = "Unten" ;
-        Text[ chinese_simplified ] = "��(~B)";
+        Text[ chinese_simplified ] = "下(~B)";
         Text[ russian ] = "�����";
         Text[ polish ] = "Na dole";
-        Text[ japanese ] = "��(~B)";
-        Text[ chinese_traditional ] = "�U(~B)";
+        Text[ japanese ] = "下(~B)";
+        Text[ chinese_traditional ] = "下(~B)";
         Text[ arabic ] = "����";
         Text[ greek ] = "����";
-        Text[ korean ] = "�Ʒ�(~B)";
+        Text[ korean ] = "아래(~B)";
         Text[ turkish ] = "A~lt";
-        Text[ catalan ] = "A~bajo";
-        Text[ finnish ] = "~Alaosa";
+        Text[ catalan ] = "Part ~inferior";
+        Text[ finnish ] = "~Alareuna";
+        Text[ thai ] = "~ล่าง";
     };
     MetricField MF_BOTTOM
     {
@@ -292,24 +297,25 @@ TabPage RID_SVXPAGE_GRFCROP
         Text [ ENGLISH ] = "Keep image si~ze" ;
         Text [ english_us ] = "Keep image si~ze" ;
         Text [ italian ] = "Mantieni dimensione" ;
-        Text [ spanish ] = "~Mantener el tama�o" ;
+        Text [ spanish ] = "~Conservar el tama�o de la imagen" ;
         Text [ french ] = "Conserver la taille de l'image" ;
         Text [ dutch ] = "M~et behoud van grootte" ;
         Text [ swedish ] = "Bibeh�ll bilds~torlek" ;
-        Text [ danish ] = "Bevar st�rrelse" ;
+        Text [ danish ] = "Bevar billedst~�rrelse" ;
         Text [ portuguese_brazilian ] = "Gr?e beibehalten" ;
         Text [ portuguese ] = "~Manter tamanho" ;
-        Text[ chinese_simplified ] = "���ֻ����С(~Z)";
-        Text[ russian ] = "��������� ������ ��������";
+        Text[ chinese_simplified ] = "保持画面大小(~Z)";
+        Text[ russian ] = "��������� ������ ~��������";
         Text[ polish ] = "Za~chowaj rozmiar obrazu";
-        Text[ japanese ] = "�摜���ޕێ�(~Z)";
-        Text[ chinese_traditional ] = "�O���e���j�p(~Z)";
+        Text[ japanese ] = "画像サイズ保持(~Z)";
+        Text[ chinese_traditional ] = "保持畫面大小(~Z)";
         Text[ arabic ] = "�������� ������";
         Text[ greek ] = "���~������ ��������";
-        Text[ korean ] = "ũ�� ����(~Z)";
+        Text[ korean ] = "이미지 크기 유지(~Z)";
         Text[ turkish ] = "Boyutu kor~u";
-        Text[ catalan ] = "~Mantener el tama�o";
-        Text[ finnish ] = "S�ilyt� ko~ko";
+        Text[ catalan ] = "Conserva la mi~da";
+        Text[ finnish ] = "S�ilyt� kuvan ko~ko";
+        Text[ thai ] = "รักษาข~นาดภาพ";
     };
     RadioButton RB_ZOOMCONST
     {
@@ -320,24 +326,25 @@ TabPage RID_SVXPAGE_GRFCROP
         Text [ ENGLISH ] = "Keep ~scale" ;
         Text [ english_us ] = "Keep ~scale" ;
         Text [ italian ] = "Mantieni scala" ;
-        Text [ spanish ] = "Mantener la ~escala" ;
+        Text [ spanish ] = "Conservar la ~escala" ;
         Text [ french ] = "Conserver l'�chelle" ;
-        Text [ dutch ] = "~Met behoud van scalering" ;
+        Text [ dutch ] = "~Met behoud van schaal (maatstaf)" ;
         Text [ swedish ] = "Bibeh�ll ~skalning" ;
-        Text [ danish ] = "Bevar m�lestok" ;
+        Text [ danish ] = "Bevar ~skalering" ;
         Text [ portuguese_brazilian ] = "Ma?stab beibehalten" ;
         Text [ portuguese ] = "Manter ~escala" ;
-        Text[ chinese_simplified ] = "������ʾ����(~S)";
+        Text[ chinese_simplified ] = "保持显示比例(~S)";
         Text[ russian ] = "��������� �������";
         Text[ polish ] = "Zachowaj s~kal�";
-        Text[ japanese ] = "�{���ێ�(~S)";
-        Text[ chinese_traditional ] = "�O����ܤ��(~S)";
+        Text[ japanese ] = "倍率保持(~S)";
+        Text[ chinese_traditional ] = "保持顯示比例(~S)";
         Text[ arabic ] = "�������� ��������";
         Text[ greek ] = "��������� ���~�����";
-        Text[ korean ] = "���� ����(~S)";
+        Text[ korean ] = "배율 유지(~S)";
         Text[ turkish ] = "~Orant�y� koru";
-        Text[ catalan ] = "Mantener la ~escala";
+        Text[ catalan ] = "Conserva l'~escala";
         Text[ finnish ] = "S�ilyt� ~skaala";
+        Text[ thai ] = "รักษาส~เกล";
     };
     Window WN_BSP
     {
@@ -355,22 +362,23 @@ TabPage RID_SVXPAGE_GRFCROP
         Text [ italian ] = "Scala" ;
         Text [ spanish ] = "Escala" ;
         Text [ french ] = "�chelle" ;
-        Text [ dutch ] = "Scalering" ;
+        Text [ dutch ] = "Op schaal brengen" ;
         Text [ swedish ] = "Skalning" ;
-        Text [ danish ] = "M�lestok" ;
+        Text [ danish ] = "Skalering" ;
         Text [ portuguese_brazilian ] = "Ma?stab" ;
         Text [ portuguese ] = "Escala" ;
-        Text[ chinese_simplified ] = "��ʾ����";
+        Text[ chinese_simplified ] = "显示比例";
         Text[ russian ] = "�������";
         Text[ polish ] = "Skala";
-        Text[ japanese ] = "�\\���{��";
-        Text[ chinese_traditional ] = "��ܤ��";
+        Text[ japanese ] = "表示倍率";
+        Text[ chinese_traditional ] = "顯示比例";
         Text[ arabic ] = "�����/�����";
         Text[ greek ] = "�������";
-        Text[ korean ] = "����";
+        Text[ korean ] = "배율";
         Text[ turkish ] = "�l�ek";
         Text[ catalan ] = "Escala";
         Text[ finnish ] = "Skaalaa";
+        Text[ thai ] = "สเกล";
     };
     FixedText FT_WIDTHZOOM
     {
@@ -380,26 +388,27 @@ TabPage RID_SVXPAGE_GRFCROP
         Text = "Bre~ite" ;
         Text [ ENGLISH ] = "W~idth" ;
         Text [ norwegian ] = "~Bredde" ;
-        Text [ italian ] = "Largh." ;
+        Text [ italian ] = "Larghezza" ;
         Text [ portuguese_brazilian ] = "~Largura" ;
         Text [ portuguese ] = "~Largura" ;
         Text [ finnish ] = "~Leveys" ;
         Text [ danish ] = "Bredde" ;
-        Text [ french ] = "~Largeur" ;
+        Text [ french ] = "Largeur" ;
         Text [ swedish ] = "Br~edd" ;
         Text [ dutch ] = "B~reedte" ;
-        Text [ spanish ] = "A~ncho" ;
+        Text [ spanish ] = "Ancho" ;
         Text [ english_us ] = "~Width" ;
-        Text[ chinese_simplified ] = "����(~W)";
+        Text[ chinese_simplified ] = "宽度(~W)";
         Text[ russian ] = "������";
         Text[ polish ] = "Szer.";
-        Text[ japanese ] = "��(~W)";
-        Text[ chinese_traditional ] = "�e��(~W)";
+        Text[ japanese ] = "幅(~W)";
+        Text[ chinese_traditional ] = "寬度(~W)";
         Text[ arabic ] = "�����";
         Text[ greek ] = "������";
-        Text[ korean ] = "�ʺ�(~W)";
+        Text[ korean ] = "너비(~W)";
         Text[ turkish ] = "G~eni�lik";
-        Text[ catalan ] = "A~ncho";
+        Text[ catalan ] = "~Amplada";
+        Text[ thai ] = "ความ~กว้าง";
     };
     MetricField MF_WIDTHZOOM
     {
@@ -433,22 +442,23 @@ TabPage RID_SVXPAGE_GRFCROP
         Text [ portuguese ] = "A~ltura" ;
         Text [ finnish ] = "K~orkeus" ;
         Text [ danish ] = "H�jde" ;
-        Text [ french ] = "~Hauteur" ;
+        Text [ french ] = "Hauteur" ;
         Text [ swedish ] = "H~�jd" ;
         Text [ dutch ] = "H~oogte" ;
         Text [ spanish ] = "A~ltura" ;
         Text [ english_us ] = "H~eight" ;
         Left = TRUE ;
-        Text[ chinese_simplified ] = "�߶�(~E)";
+        Text[ chinese_simplified ] = "高度(~E)";
         Text[ russian ] = "������";
         Text[ polish ] = "Wys.";
-        Text[ japanese ] = "����(~E)";
-        Text[ chinese_traditional ] = "��(~E)";
+        Text[ japanese ] = "高さ(~E)";
+        Text[ chinese_traditional ] = "高(~E)";
         Text[ arabic ] = "��������";
         Text[ greek ] = "����";
-        Text[ korean ] = "����(~E)";
+        Text[ korean ] = "높이(~E)";
         Text[ turkish ] = "Y~�kseklik";
-        Text[ catalan ] = "A~ltura";
+        Text[ catalan ] = "A~l�ada";
+        Text[ thai ] = "ความสู~ง";
     };
     MetricField MF_HEIGHTZOOM
     {
@@ -479,23 +489,24 @@ TabPage RID_SVXPAGE_GRFCROP
         Text [ italian ] = "Dimensione" ;
         Text [ portuguese_brazilian ] = "Tamanho" ;
         Text [ portuguese ] = "Tamanho" ;
-        Text [ finnish ] = "Koko" ;
-        Text [ danish ] = "St�rrelse" ;
+        Text [ finnish ] = "Kuvan koko" ;
+        Text [ danish ] = "Billedst�rrelse" ;
         Text [ french ] = "Taille de l'image" ;
         Text [ swedish ] = "Bildstorlek" ;
-        Text [ dutch ] = "Grootte van de afbeelding" ;
+        Text [ dutch ] = "Afbeeldingsgrootte" ;
         Text [ spanish ] = "Tama�o de la imagen" ;
         Text [ english_us ] = "Image size" ;
-        Text[ chinese_simplified ] = "ͼ���С";
-        Text[ russian ] = "������ �������";
+        Text[ chinese_simplified ] = "图像大小";
+        Text[ russian ] = "������ ��������";
         Text[ polish ] = "Rozmiar obrazu";
-        Text[ japanese ] = "�摜����";
-        Text[ chinese_traditional ] = "�v���j�p";
+        Text[ japanese ] = "画像サイズ";
+        Text[ chinese_traditional ] = "影像大小";
         Text[ arabic ] = "�����";
         Text[ greek ] = "�������";
-        Text[ korean ] = "ũ��";
+        Text[ korean ] = "이미지 크기";
         Text[ turkish ] = "Boyut";
-        Text[ catalan ] = "Tama�o";
+        Text[ catalan ] = "Mida";
+        Text[ thai ] = "ขนาดภาพ";
     };
     FixedText FT_WIDTH
     {
@@ -505,26 +516,27 @@ TabPage RID_SVXPAGE_GRFCROP
         Text = "~Breite" ;
         Text [ ENGLISH ] = "~Width" ;
         Text [ norwegian ] = "~Bredde" ;
-        Text [ italian ] = "~Largh." ;
+        Text [ italian ] = "Larghezza" ;
         Text [ portuguese_brazilian ] = "~Largura" ;
         Text [ portuguese ] = "~Largura" ;
         Text [ finnish ] = "~Leveys" ;
         Text [ danish ] = "Bredde" ;
-        Text [ french ] = "La~rgeur" ;
+        Text [ french ] = "Largeur" ;
         Text [ swedish ] = "~Bredd" ;
         Text [ dutch ] = "B~reedte" ;
-        Text [ spanish ] = "A~ncho" ;
+        Text [ spanish ] = "Ancho" ;
         Text [ english_us ] = "~Width" ;
-        Text[ chinese_simplified ] = "����(~W)";
+        Text[ chinese_simplified ] = "宽度(~W)";
         Text[ russian ] = "������";
         Text[ polish ] = "Szer.";
-        Text[ japanese ] = "��(~W)";
-        Text[ chinese_traditional ] = "�e��(~W)";
+        Text[ japanese ] = "幅(~W)";
+        Text[ chinese_traditional ] = "寬度(~W)";
         Text[ arabic ] = "�����";
         Text[ greek ] = "������";
-        Text[ korean ] = "�ʺ�(~W)";
+        Text[ korean ] = "너비(~W)";
         Text[ turkish ] = "~Geni�lik";
-        Text[ catalan ] = "A~ncho";
+        Text[ catalan ] = "~Amplada";
+        Text[ thai ] = "ความ~กว้าง";
     };
     MetricField MF_WIDTH
     {
@@ -537,11 +549,11 @@ TabPage RID_SVXPAGE_GRFCROP
         Repeat = TRUE ;
         Spin = TRUE ;
         Minimum = 5 ;
-        Maximum = 9999 ;
+        Maximum = 20000 ;
         DecimalDigits = 2 ;
         Unit = FUNIT_CM ;
         First = 5 ;
-        Last = 9999 ;
+        Last = 20000 ;
         SpinSize = 10 ;
     };
     FixedText FT_HEIGHT
@@ -557,21 +569,22 @@ TabPage RID_SVXPAGE_GRFCROP
         Text [ portuguese ] = "A~ltura" ;
         Text [ finnish ] = "K~orkeus" ;
         Text [ danish ] = "H�jde" ;
-        Text [ french ] = "Hau~teur" ;
+        Text [ french ] = "Hauteur" ;
         Text [ swedish ] = "H�j~d" ;
         Text [ dutch ] = "H~oogte" ;
         Text [ spanish ] = "A~ltura" ;
         Text [ english_us ] = "H~eight" ;
-        Text[ chinese_simplified ] = "�߶�(~E)";
+        Text[ chinese_simplified ] = "高度(~E)";
         Text[ russian ] = "������";
         Text[ polish ] = "Wys.";
-        Text[ japanese ] = "����(~E)";
-        Text[ chinese_traditional ] = "����(~E)";
+        Text[ japanese ] = "高さ(~E)";
+        Text[ chinese_traditional ] = "高度(~E)";
         Text[ arabic ] = "��������";
         Text[ greek ] = "����";
-        Text[ korean ] = "����(~E)";
+        Text[ korean ] = "높이(~E)";
         Text[ turkish ] = "~Y�kseklik";
-        Text[ catalan ] = "A~ltura";
+        Text[ catalan ] = "A~l�ada";
+        Text[ thai ] = "ความสู~ง";
     };
     MetricField MF_HEIGHT
     {
@@ -583,11 +596,11 @@ TabPage RID_SVXPAGE_GRFCROP
         Repeat = TRUE ;
         Spin = TRUE ;
         Minimum = 5 ;
-        Maximum = 9999 ;
+        Maximum = 20000 ;
         DecimalDigits = 2 ;
         Unit = FUNIT_CM ;
         First = 5 ;
-        Last = 9999 ;
+        Last = 20000 ;
         SpinSize = 10 ;
     };
     FixedText FT_ORIG_SIZE
@@ -606,22 +619,23 @@ TabPage RID_SVXPAGE_GRFCROP
         Text [ italian ] = "Dimens. ori~ginale" ;
         Text [ spanish ] = "Tama�o ori~ginal" ;
         Text [ french ] = "Taille d'~origine" ;
-        Text [ dutch ] = "~Originele grootte" ;
+        Text [ dutch ] = "Re�le gr~ootte" ;
         Text [ swedish ] = "Ori~ginalstorlek" ;
-        Text [ danish ] = "Oprindelig st�rrelse" ;
+        Text [ danish ] = "Oprindelig st." ;
         Text [ portuguese_brazilian ] = "Originalgr?e" ;
         Text [ portuguese ] = "Tamanho ~original" ;
-        Text[ chinese_simplified ] = "ԭ����С(~O)";
+        Text[ chinese_simplified ] = "原件大小(~O)";
         Text[ russian ] = "�������� ������";
         Text[ polish ] = "~Rozmiar oryginalny";
-        Text[ japanese ] = "���̻���(~O)";
-        Text[ chinese_traditional ] = "���j�p(~O)";
+        Text[ japanese ] = "オリジナルサイズ(~O)";
+        Text[ chinese_traditional ] = "原件大小(~O)";
         Text[ arabic ] = "����� ������";
         Text[ greek ] = "������ ��~�����";
-        Text[ korean ] = "���� ũ��(~O)";
+        Text[ korean ] = "원래 크기(~O)";
         Text[ turkish ] = "�~lk boyut";
-        Text[ catalan ] = "Tama�o ori~ginal";
+        Text[ catalan ] = "Mida ~original";
         Text[ finnish ] = "~Alkuper�inen koko";
+        Text[ thai ] = "ขนาด~ต้นฉบับ";
     };
 };
 
@@ -631,3 +645,15 @@ TabPage RID_SVXPAGE_GRFCROP
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svx/source/dialog/hdft.src b/svx/source/dialog/hdft.src
index b777c8b11519..e9a6817360c6 100644
--- a/svx/source/dialog/hdft.src
+++ b/svx/source/dialog/hdft.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hdft.src,v $
  *
- *  $Revision: 1.39 $
+ *  $Revision: 1.40 $
  *
- *  last change: $Author: os $ $Date: 2002-08-26 11:32:11 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,15 +71,15 @@
         Text [ italian ] = "Margine sinistro" ;                             \
         Text [ portuguese_brazilian ] = "~Cabe?alho da Margem Esquerda" ;   \
         Text [ portuguese ] = "Margem ~esquerda" ;                          \
-        Text [ finnish ] = "~Vasen marginaali" ;                            \
+        Text [ finnish ] = "~Vasen reunus" ;                            \
         Text [ danish ] = "~Venstre margen" ;                                \
         Text [ french ] = "Marge ~gauche" ;                                  \
         Text [ swedish ] = "~V�nstermarginal" ;                             \
-        Text [ dutch ] = "~Linker marge" ;                                  \
+        Text [ dutch ] = "~Linkermarge" ;                                  \
         Text [ spanish ] = "Margen ~izquierdo" ;                            \
         Text [ english_us ] = "~Left margin" ;                              \
         Text[ chinese_simplified ] = "左边距(~L)";                 \
-        Text[ russian ] = "���� �����";                                     \
+        Text[ russian ] = "����� ����";                                     \
         Text[ polish ] = "Lewy margines";                                   \
         Text[ japanese ] = "左余白(~L)";                                 \
         Text[ chinese_traditional ] = "左邊框(~L)";                      \
@@ -98,15 +98,15 @@
         Text [ italian ] = "~Margine destro" ;                              \
         Text [ portuguese_brazilian ] = "Margem Direita Cabe?alho" ;        \
         Text [ portuguese ] = "Margem ~direita" ;                           \
-        Text [ finnish ] = "~Oikea marginaali" ;                            \
+        Text [ finnish ] = "Oi~kea reunus" ;                            \
         Text [ danish ] = "H�jre ~margen" ;                                  \
         Text [ french ] = "Marge ~droite" ;                                  \
         Text [ swedish ] = "H�ge~rmarginal" ;                               \
-        Text [ dutch ] = "~Rechter marge" ;                                 \
+        Text [ dutch ] = "~Rechtermarge" ;                                 \
         Text [ spanish ] = "Margen ~derecho" ;                              \
         Text [ english_us ] = "R~ight margin" ;                             \
         Text[ chinese_simplified ] = "右边距(~I)";                 \
-        Text[ russian ] = "���� ������";                                    \
+        Text[ russian ] = "������ ����";                                    \
         Text[ polish ] = "Prawy margines";                                  \
         Text[ japanese ] = "右余白(~I)";                                 \
         Text[ chinese_traditional ] = "右邊框(~I)";                      \
@@ -130,7 +130,7 @@ TabPage RID_SVXPAGE_HEADER
     Text [ italian ] = "Intestazione" ;
     Text [ portuguese_brazilian ] = "Cabe?alho" ;
     Text [ portuguese ] = "Cabe�alho" ;
-    Text [ finnish ] = "Yl�otsikko" ;
+    Text [ finnish ] = "Yl�tunniste" ;
     Text [ danish ] = "Sidehoved" ;
     Text [ french ] = "En-t�te" ;
     Text [ swedish ] = "Sidhuvud" ;
@@ -148,15 +148,15 @@ TabPage RID_SVXPAGE_HEADER
         Text [ italian ] = "Attiva riga d'intesta~zione" ;
         Text [ portuguese_brazilian ] = "Cabe?alho, ~com dist?ncia" ;
         Text [ portuguese ] = "Activar ~cabe�alho" ;
-        Text [ finnish ] = "~Otsikko p��ll�" ;
+        Text [ finnish ] = "~Yl�tunniste k�yt�ss�" ;
         Text [ danish ] = "Aktiver sidehoved" ;
         Text [ french ] = "Activer l'~en-t�te " ;
         Text [ swedish ] = "~Sidhuvud p�" ;
-        Text [ dutch ] = "~Koptekst inschakelen" ;
+        Text [ dutch ] = "~Koptekst activeren" ;
         Text [ spanish ] = "~Activar encabezamiento" ;
         Text [ english_us ] = "Hea~der on" ;
         Text[ chinese_simplified ] = "显示页眉(~D)";
-        Text[ russian ] = "���. �������� �����������";
+        Text[ russian ] = "���. ���~���� ����������";
         Text[ polish ] = "~W��cz nag��wek";
         Text[ japanese ] = "ヘッダを付ける(~D)";
         Text[ chinese_traditional ] = "顯示頁首(~D)";
@@ -178,7 +178,7 @@ TabPage RID_SVXPAGE_HEADER
         Text [ italian ] = "~Contenuto uguale destra/sinistra" ;
         Text [ portuguese_brazilian ] = "Mesmo ~conte?o esquerda/direita" ;
         Text [ portuguese ] = "Mesmo ~conte�do esquerda/direita" ;
-        Text [ finnish ] = "~Sama sis�lt� vasemmalla/oikealla" ;
+        Text [ finnish ] = "~Sama sis�lt� vasemmalla ja oikealla" ;
         Text [ danish ] = "Ens indhold venstre/h�jre" ;
         Text [ french ] = "~Contenu identique gauche/droite" ;
         Text [ swedish ] = "Samma ~inneh�ll till h�ger/v�nster" ;
@@ -251,7 +251,7 @@ TabPage RID_SVXPAGE_HEADER
         Text [ English ] = "~Distance" ;
         Text [ english_us ] = "~Spacing" ;
         Text [ portuguese_brazilian ] = "~H?e" ;
-        Text [ swedish ] = "~Avst�nd" ;
+        Text [ swedish ] = "A~vst�nd" ;
         Text [ danish ] = "Afstand" ;
         Text [ italian ] = "Distanza" ;
         Text [ spanish ] = "Espacio" ;
@@ -269,7 +269,7 @@ TabPage RID_SVXPAGE_HEADER
         Text[ turkish ] = "U~zakl�k";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Espaiat";
-        Text[ finnish ] = "~Objektiv�lit";
+        Text[ finnish ] = "V�l~it";
         Text[ thai ] = "~ระยะห่าง";
     };
     MetricField ED_DIST
@@ -293,7 +293,27 @@ TabPage RID_SVXPAGE_HEADER
         Size = MAP_APPFONT ( 152 , 10 ) ;
         Hide = TRUE;
         Text = "D~ynamischen Abstand verwenden" ;
-        Text [ english_us ] = "Use D~ynamic spacing" ;
+        Text [ english_us ] = "Use d~ynamic spacing" ;
+        Text[ portuguese ] = "Use D~ynamic spacing";
+        Text[ russian ] = "Use D~ynamic spacing";
+        Text[ greek ] = "Use D~ynamic spacing";
+        Text[ dutch ] = "Use D~ynamic spacing";
+        Text[ french ] = "Utilisation de l'espacement dynamique";
+        Text[ spanish ] = "Utilizar espacio d~in�mico";
+        Text[ finnish ] = "Use D~ynamic spacing";
+        Text[ italian ] = "Usa spaziatura dinamica";
+        Text[ danish ] = "Use D~ynamic spacing";
+        Text[ swedish ] = "Anv�nd d~ynamiskt avst�nd";
+        Text[ polish ] = "Use D~ynamic spacing";
+        Text[ portuguese_brazilian ] = "Use D~ynamic spacing";
+        Text[ japanese ] = "自動最適文字間隔を使用する";
+        Text[ korean ] = "동적 문자 간격 사용";
+        Text[ chinese_simplified ] = "使用自动最佳调整的间隔";
+        Text[ chinese_traditional ] = "使用自動最適調整的間隔";
+        Text[ turkish ] = "Use D~ynamic spacing";
+        Text[ arabic ] = "Use D~ynamic spacing";
+        Text[ catalan ] = "Use D~ynamic spacing";
+        Text[ thai ] = "Use D~ynamic spacing";
     };
     FixedText FT_HEIGHT
     {
@@ -308,7 +328,7 @@ TabPage RID_SVXPAGE_HEADER
         Text [ italian ] = "Altezza" ;
         Text [ spanish ] = "A~ltura" ;
         Text [ french ] = "Hauteur" ;
-        Text [ dutch ] = "~Hoogte" ;
+        Text [ dutch ] = "Hoo~gte" ;
         Text [ portuguese ] = "~Altura" ;
         Text[ chinese_simplified ] = "高度(~H)";
         Text[ russian ] = "������";
@@ -367,7 +387,7 @@ TabPage RID_SVXPAGE_HEADER
         Text[ turkish ] = "Y�ksekli�i oto~matik olarak ayarla";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Adap~taci� din�mica de l'al�ada";
-        Text[ finnish ] = "~Automaattinen korkeuden sovitus";
+        Text[ finnish ] = "A~utomaattinen korkeuden sovitus";
         Text[ thai ] = "จัดความสูงพอดี~อัตโนมัติ";
     };
     FixedLine FL_FRAME
@@ -380,7 +400,7 @@ TabPage RID_SVXPAGE_HEADER
         Text [ italian ] = "Intestazione" ;
         Text [ portuguese_brazilian ] = "Cabe?alho" ;
         Text [ portuguese ] = "Cabe�alho" ;
-        Text [ finnish ] = "Yl�otsikko" ;
+        Text [ finnish ] = "Yl�tunniste" ;
         Text [ danish ] = "Sidehoved" ;
         Text [ french ] = "En-t�te" ;
         Text [ swedish ] = "Sidhuvud" ;
@@ -423,7 +443,7 @@ TabPage RID_SVXPAGE_HEADER
         Text [ spanish ] = "~Opciones..." ;
         Text [ english_us ] = "~More..." ;
         Text[ chinese_simplified ] = "其他(~M)...";
-        Text[ russian ] = "����������...";
+        Text[ russian ] = "�������������";
         Text[ polish ] = "Dodatki...";
         Text[ japanese ] = "詳細(~M)...";
         Text[ chinese_traditional ] = "其他(~M)...";
@@ -459,7 +479,7 @@ TabPage RID_SVXPAGE_FOOTER
     Text [ italian ] = "Pi� di pagina" ;
     Text [ portuguese_brazilian ] = "Rodap?" ;
     Text [ portuguese ] = "Rodap�" ;
-    Text [ finnish ] = "Alaselite" ;
+    Text [ finnish ] = "Alatunniste" ;
     Text [ danish ] = "Sidefod" ;
     Text [ french ] = "Pied de page" ;
     Text [ swedish ] = "Sidfot" ;
@@ -477,21 +497,21 @@ TabPage RID_SVXPAGE_FOOTER
         Text [ italian ] = "~Attiva pi� di pagina" ;
         Text [ portuguese_brazilian ] = "~Rodap? com dist?ncia" ;
         Text [ portuguese ] = "Activar ~rodap�" ;
-        Text [ finnish ] = "~Alaselite k�yt�ss�" ;
+        Text [ finnish ] = "Alatunniste k~�yt�ss�" ;
         Text [ danish ] = "Aktiver sidefod" ;
         Text [ french ] = "~Activer le pied de page" ;
         Text [ swedish ] = "Sid~fot p�" ;
-        Text [ dutch ] = "~Voettekst inschakelen" ;
+        Text [ dutch ] = "Vo~ettekst activeren" ;
         Text [ spanish ] = "~Activar pie de p�gina" ;
         Text [ english_us ] = "~Footer on" ;
         Text[ chinese_simplified ] = "显示页脚(~F)";
-        Text[ russian ] = "���. ������ ����������";
+        Text[ russian ] = "���. ��~���� ����������";
         Text[ polish ] = "W��cz stopk�";
         Text[ japanese ] = "フッタを付ける(~F)";
         Text[ chinese_traditional ] = "顯示頁尾(~F)";
         Text[ arabic ] = "����� ����� ������";
         Text[ greek ] = "������������ ���������";
-        Text[ korean ] = "바닥글 삽입(~F)";
+        Text[ korean ] = "바닥글 표시(~F)";
         Text[ turkish ] = "A~ltbilgi olu�tur";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Activa el peu de p�gina";
@@ -507,7 +527,7 @@ TabPage RID_SVXPAGE_FOOTER
         Text [ italian ] = "~Contenuto uguale destra/sinistra" ;
         Text [ portuguese_brazilian ] = "Mesmo ~conte?o esquerda/direita" ;
         Text [ portuguese ] = "Mesmo ~conte�do esquerda/direita" ;
-        Text [ finnish ] = "~Sama sis�lt� vasemmalla/oikealla" ;
+        Text [ finnish ] = "~Sama sis�lt� vasemmalla ja oikealla" ;
         Text [ danish ] = "Ens indhold venstre/h�jre" ;
         Text [ french ] = "~Contenu identique gauche/droite" ;
         Text [ swedish ] = "Samma ~inneh�ll till h�ger/v�nster" ;
@@ -597,7 +617,7 @@ TabPage RID_SVXPAGE_FOOTER
         Text[ turkish ] = "~Uzakl�k";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Espaiat";
-        Text[ finnish ] = "~Objektiv�lit";
+        Text[ finnish ] = "V�l~it";
         Text[ thai ] = "~ระยะห่าง";
     };
     MetricField ED_DIST
@@ -621,7 +641,27 @@ TabPage RID_SVXPAGE_FOOTER
         Size = MAP_APPFONT ( 152 , 10 ) ;
         Hide = TRUE;
         Text = "D~ynamischen Abstand verwenden" ;
-        Text [ english_us ] = "Use D~ynamic spacing" ;
+        Text [ english_us ] = "Use d~ynamic spacing" ;
+        Text[ portuguese ] = "Use D~ynamic spacing";
+        Text[ russian ] = "Use D~ynamic spacing";
+        Text[ greek ] = "Use D~ynamic spacing";
+        Text[ dutch ] = "Use D~ynamic spacing";
+        Text[ french ] = "Utilisation de l'espacement dynamique";
+        Text[ spanish ] = "Utilizar espacio d~in�mico";
+        Text[ finnish ] = "Use D~ynamic spacing";
+        Text[ italian ] = "Usa spaziatura dinamica";
+        Text[ danish ] = "Use D~ynamic spacing";
+        Text[ swedish ] = "Anv�nd d~ynamiskt avst�nd";
+        Text[ polish ] = "Use D~ynamic spacing";
+        Text[ portuguese_brazilian ] = "Use D~ynamic spacing";
+        Text[ japanese ] = "自動最適文字間隔を使用する";
+        Text[ korean ] = "동적 문자 간격 사용";
+        Text[ chinese_simplified ] = "使用自动最佳调整的间隔";
+        Text[ chinese_traditional ] = "使用自動最適調整的間隔";
+        Text[ turkish ] = "Use D~ynamic spacing";
+        Text[ arabic ] = "Use D~ynamic spacing";
+        Text[ catalan ] = "Use D~ynamic spacing";
+        Text[ thai ] = "Use D~ynamic spacing";
     };
     FixedText FT_HEIGHT
     {
@@ -637,7 +677,7 @@ TabPage RID_SVXPAGE_FOOTER
         Text [ italian ] = "Altezza" ;
         Text [ spanish ] = "A~ltura" ;
         Text [ french ] = "Hauteur" ;
-        Text [ dutch ] = "~Hoogte" ;
+        Text [ dutch ] = "Hoo~gte" ;
         Text [ portuguese ] = "~Altura" ;
         Text[ chinese_simplified ] = "高度(~H)";
         Text[ russian ] = "������";
@@ -680,7 +720,7 @@ TabPage RID_SVXPAGE_FOOTER
         Text [ italian ] = "Adatta altezza din~amicamente" ;
         Text [ portuguese_brazilian ] = "Rodap? din?mica da ~altura" ;
         Text [ portuguese ] = "Ajuste din�mico da altura" ;
-        Text [ finnish ] = "~Automaattinen korkeuden sovitus" ;
+        Text [ finnish ] = "A~utomaattinen korkeuden sovitus" ;
         Text [ danish ] = "Juster h�jde dynamisk" ;
         Text [ french ] = "Adaptation dynamique de la hauteur" ;
         Text [ swedish ] = "An~passa h�jd dynamiskt" ;
@@ -711,7 +751,7 @@ TabPage RID_SVXPAGE_FOOTER
         Text [ italian ] = "Pi� di pagina" ;
         Text [ portuguese_brazilian ] = "Rodap?" ;
         Text [ portuguese ] = "Rodap�" ;
-        Text [ finnish ] = "Alaselite" ;
+        Text [ finnish ] = "Alatunniste" ;
         Text [ danish ] = "Sidefod" ;
         Text [ french ] = "Pied de page" ;
         Text [ swedish ] = "Sidfot" ;
@@ -754,7 +794,7 @@ TabPage RID_SVXPAGE_FOOTER
         Text [ spanish ] = "~Opciones..." ;
         Text [ english_us ] = "~More..." ;
         Text[ chinese_simplified ] = "其他(~M)...";
-        Text[ russian ] = "����������...";
+        Text[ russian ] = "�������������";
         Text[ polish ] = "Dodatki...";
         Text[ japanese ] = "詳細(~M)...";
         Text[ chinese_traditional ] = "其他(~M)...";
@@ -789,21 +829,21 @@ QueryBox RID_SVXQBX_DELETE_HEADFOOT
     Message [ italian ] = "Disattivando l'intestazione o il pi� di pagina il testo esistente verr� cancellato.\nVolete cancellare il contenuto?" ;
     Message [ portuguese_brazilian ] = "Desativar o cabe?alho ou o rodap? apagar seu conte?o.\nTem certeza que deseja apagar este texto?" ;
     Message [ portuguese ] = "Ao desactivar o cabe�alho ou o rodap� apaga o respectivo conte�do.\nDeseja realmente eliminar o texto?" ;
-    Message [ finnish ] = "Yl�otsikoiden tai alaselitteiden poistaminen poistaa sis�ll�n.\nPoistetaanko teksti?" ;
+    Message [ finnish ] = "Yl�- tai alatunnisteiden poistaminen poistaa sis�ll�n.\nPoistetaanko teksti?" ;
     Message [ danish ] = "Deaktivering af sidehoveder eller sidef�dder sletter det aktuelle indhold.\nSkal indholdet slettes?" ;
     Message [ french ] = "La d�sactivation de l'en-t�te ou du pied de page en supprime le contenu.\n�tes-vous s�r de vouloir supprimer ce texte ?" ;
     Message [ swedish ] = "Om du deaktiverar sidhuvuden eller sidf�tter raderas inneh�llet. \nVill du radera inneh�llet?" ;
     Message [ dutch ] = "Als u de kop- of voettekst uitschakelt, wordt de inhoud ervan verwijderd.\nWeet u zeker dat u de inhoud wilt verwijderen?" ;
-    Message [ spanish ] = "Al desactivar el encabezamiento o pie de p�gina se eliminar� su contenido.\n�Desea eliminarlo?" ;
+    Message [ spanish ] = "Al desactivar un encabezamiento o pie de p�gina se borrar� su contenido.\n�Desea borrar este texto?" ;
     Message [ english_us ] = "Removing headers or footers deletes the contents.\nDo you want to delete this text?" ;
     Message[ chinese_simplified ] = "不用页眉和页脚功能就会删除现存的文字。\n要删除这些文字？";
-    Message[ russian ] = "���������� ������������ ������� �������� ���������� ������.\n�� ������ ������� ����������?";
+    Message[ russian ] = "���������� ������������ ������� �������� �� ����������.\n������� ���� �����?";
     Message[ polish ] = "Wy��czenie stopki i nag��wka spowoduje usuni�cie zawarto�ci. \nUsun�� zawarto��?";
     Message[ japanese ] = "ヘッダまたはフッタの機能をオフにすると、そこにある内容も削除されます。\n削除してもいいですか。";
     Message[ chinese_traditional ] = "不採用頁首或頁尾就會刪除已現有的文字。\n要刪除這些文字？";
     Message[ arabic ] = "����� ���/ ����� ������ ��� ���� ��� ��� ��������.\n�� ���� ������ ��� ��������ʿ";
     Message[ greek ] = "�� ��� �������������� ��� ��������� � ��� ������������ ����������� �� ������� �����������.\n������ �� ��������� �� �����������;";
-    Message[ korean ] = "머리글이나 바닥글을 없애면 기존의 텍스트가 삭제됩니다.\n내용을 삭제하겠습니까?";
+    Message[ korean ] = "머리글이나 바닥글을 없애면 내용도 삭제됩니다.\n삭제하겠습니까?";
     Message[ turkish ] = "�stbilgi ve altbilginin kald�r�lmas� ile mevcut metin silinecek.\n��eri�i silmek istiyor musunuz?";
     Message[ language_user1 ] = " ";
     Message[ catalan ] = "Si desactiveu el encap�alament o el peu de p�gina en perdreu el seu contingut.\nVoleu eliminar-lo?";
@@ -824,3 +864,8 @@ QueryBox RID_SVXQBX_DELETE_HEADFOOT
 
 
 
+
+
+
+
+
diff --git a/svx/source/dialog/hldocntp.cxx b/svx/source/dialog/hldocntp.cxx
index 03e5c5a4c494..0c7eb8e778ca 100644
--- a/svx/source/dialog/hldocntp.cxx
+++ b/svx/source/dialog/hldocntp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hldocntp.cxx,v $
  *
- *  $Revision: 1.22 $
+ *  $Revision: 1.23 $
  *
- *  last change: $Author: iha $ $Date: 2002-10-15 11:54:23 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -315,6 +315,9 @@ void SvxHyperlinkNewDocTp::FillDocumentList ()
         // Insert into listbox
         if ( aDocumentUrl.getLength() )
         {
+            if ( aDocumentUrl.equalsAscii( "private:factory/simpress?slot=10425" ) )                // SJ: #106216# do not start
+                aDocumentUrl = String( RTL_CONSTASCII_USTRINGPARAM( "private:factory/simpress" ) ); // the AutoPilot for impress
+
             const SfxObjectFactory* pFactory = SfxObjectFactory::GetFactory ( aDocumentUrl );
             if ( pFactory )
             {
@@ -483,17 +486,19 @@ void SvxHyperlinkNewDocTp::DoApply ()
                                                                            &aFrame, &aReferer, 0L );
 
                     // save new doc
-                    const SfxViewFrameItem *pItem = PTR_CAST( SfxViewFrameItem, pReturn );
-                    pViewFrame = pItem->GetFrame();
-                    if (pViewFrame)
+                    const SfxViewFrameItem *pItem = PTR_CAST( SfxViewFrameItem, pReturn );  // SJ: pReturn is NULL if the Hyperlink
+                    if ( pItem )                                                            // creation is cancelled #106216#
                     {
-                        //SfxViewFrame *pViewFrame = pFrame->GetCurrentViewFrame();
-                        SfxStringItem aNewName( SID_FILE_NAME, aURL.GetMainURL( INetURLObject::NO_DECODE ) );
-
-                        pViewFrame->GetDispatcher()->Execute( SID_SAVEASDOC,
-                                                              SFX_CALLMODE_SYNCHRON,
-                                                              &aNewName, 0L );
-
+                        pViewFrame = pItem->GetFrame();
+                        if (pViewFrame)
+                        {
+                            //SfxViewFrame *pViewFrame = pFrame->GetCurrentViewFrame();
+                            SfxStringItem aNewName( SID_FILE_NAME, aURL.GetMainURL( INetURLObject::NO_DECODE ) );
+
+                            pViewFrame->GetDispatcher()->Execute( SID_SAVEASDOC,
+                                                                  SFX_CALLMODE_SYNCHRON,
+                                                                  &aNewName, 0L );
+                        }
                     }
                 }
 
diff --git a/svx/source/dialog/hldoctp.cxx b/svx/source/dialog/hldoctp.cxx
index 525221599ae2..39118d0df21f 100644
--- a/svx/source/dialog/hldoctp.cxx
+++ b/svx/source/dialog/hldoctp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hldoctp.cxx,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: fs $ $Date: 2002-11-14 10:07:02 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,7 +74,8 @@
 sal_Char __READONLY_DATA sHash[]                = "#";
 sal_Char __READONLY_DATA sFileScheme[]          = INET_FILE_SCHEME;
 sal_Char __READONLY_DATA sPortalFileScheme[]    = "vnd.sun.star.wfs://";
-sal_Char __READONLY_DATA sNewsSRVScheme[] = INET_NEWS_SRV_SCHEME;
+sal_Char __READONLY_DATA sNewsSRVScheme[] = "news://";
+    // TODO news:// is nonsense
 sal_Char __READONLY_DATA sHTTPScheme[]    = INET_HTTP_SCHEME;
 
 /*************************************************************************
diff --git a/svx/source/dialog/hlmailtp.cxx b/svx/source/dialog/hlmailtp.cxx
index 7ee7bbbd32b2..495a89afebf8 100644
--- a/svx/source/dialog/hlmailtp.cxx
+++ b/svx/source/dialog/hlmailtp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hlmailtp.cxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: iha $ $Date: 2002-12-12 18:16:03 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -209,12 +209,13 @@ String SvxHyperlinkMailTp::CreateAbsoluteURL() const
     String aStrURL = maCbbReceiver.GetText();
     String aScheme = GetSchemeFromURL(aStrURL);
 
-    INetURLObject aURL(aStrURL,GetSmartProtocolFromButtons());
+    INetURLObject aURL(aStrURL);
 
     if( aURL.GetProtocol() == INET_PROT_NOT_VALID )
     {
-        aURL.SetSmartProtocol( GetSmartProtocolFromButtons() );
-        aURL.SetSmartURL(aStrURL);
+        aURL.ConcatData(GetSmartProtocolFromButtons(), String(), String(),
+                        String(), 0, maCbbReceiver.GetText(),
+                        INetURLObject::ENCODE_ALL);
 
         if( aURL.GetProtocol() == INET_PROT_NOT_VALID
             && aScheme.Len() == 0 )
diff --git a/svx/source/dialog/hlmarkwn.src b/svx/source/dialog/hlmarkwn.src
index 4d49a3d87863..82983e89a421 100644
--- a/svx/source/dialog/hlmarkwn.src
+++ b/svx/source/dialog/hlmarkwn.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hlmarkwn.src,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: kz $ $Date: 2002-11-27 16:31:53 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -151,7 +151,7 @@ ModalDialog RID_SVXFLOAT_HYPERLINK_MARKWND
     Text[ russian ] = "���� � ���������";
     Text[ greek ] = "������ ���������� ��� �������";
     Text[ dutch ] = "Doel in document";
-    Text[ french ] = "Cible � l'int�rieur du document";
+    Text[ french ] = "Cible dans le document";
     Text[ spanish ] = "Destino en documento";
     Text[ italian ] = "Destinazione nel documento";
     Text[ danish ] = "M�l i dokumentet";
@@ -159,7 +159,7 @@ ModalDialog RID_SVXFLOAT_HYPERLINK_MARKWND
     Text[ polish ] = "Cel w dokumencie";
     Text[ portuguese_brazilian ] = "Target in document";
     Text[ japanese ] = "ドキュメントにあるターゲット";
-    Text[ korean ] = "문서 내 대상";
+    Text[ korean ] = "문서 내 연결 대상";
     Text[ chinese_simplified ] = "文档中的连接目标";
     Text[ chinese_traditional ] = "文件內的連結目標";
     Text[ arabic ] = "����� �� �������";
@@ -222,3 +222,5 @@ String RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN
     Text[ finnish ] = "Asiakirjan avaaminen ei onnistunut.";
     Text[ thai ] = "ไม่สามารถเปิดเอกสารได้";
 };
+
+
diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx
index 1ac39e4cb4ca..48574fa82f13 100644
--- a/svx/source/dialog/hyperdlg.cxx
+++ b/svx/source/dialog/hyperdlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hyperdlg.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: iha $ $Date: 2002-12-03 13:36:45 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -220,7 +220,7 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings)
     pEntry->SetQuickHelpText( SVX_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP ) );
 
     // all tab pages set -> create mnemonics
-    CreateIconTextAutoMnemonics();
+    //  CreateIconTextAutoMnemonics();  #99671# not useful, because this is not what user expects when using mnemonics on the pages
 
     // create itemset for tabpages
     mpItemSet = new SfxItemSet( SFX_APP()->GetPool(), SID_HYPERLINK_GETLINK,
@@ -416,7 +416,8 @@ USHORT SvxHpLinkDlg::SetPage ( SvxHyperlinkItem* pItem )
             nPageId = RID_SVXPAGE_HYPERLINK_MAIL;
             break;
         default :
-            sal_Char const sNewsSrvScheme[] = INET_NEWS_SRV_SCHEME;
+            sal_Char const sNewsSrvScheme[] = "news://";
+                // TODO news:// is nonsense
 
             if ( aStrURL.SearchAscii( sNewsSrvScheme ) == 0 )
                 nPageId = RID_SVXPAGE_HYPERLINK_DOCUMENT;
diff --git a/svx/source/dialog/hyperdlg.src b/svx/source/dialog/hyperdlg.src
index f20197bf502c..0b4620bc5c1b 100644
--- a/svx/source/dialog/hyperdlg.src
+++ b/svx/source/dialog/hyperdlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hyperdlg.src,v $
  *
- *  $Revision: 1.59 $
+ *  $Revision: 1.60 $
  *
- *  last change: $Author: kz $ $Date: 2002-11-27 17:10:20 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -120,7 +120,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
         Text[ polish ] = "Rodzaj hiper��cza";
         Text[ portuguese_brazilian ] = "Link Typ";
         Text[ japanese ] = "ハイパーリンクの種類";
-        Text[ korean ] = "하이퍼링크의 종류";
+        Text[ korean ] = "하이퍼링크 유형";
         Text[ chinese_simplified ] = "超链接的类型";
         Text[ chinese_traditional ] = "捷徑類型";
         Text[ arabic ] = "��� �������� �������";
@@ -252,7 +252,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
         Text[ greek ] = "����� ��������";
         Text[ dutch ] = "~Loginnaam";
         Text[ french ] = "~Login";
-        Text[ spanish ] = "~Login";
+        Text[ spanish ] = "~Nombre de registro";
         Text[ italian ] = "~Login";
         Text[ danish ] = "Loginnavn";
         Text[ swedish ] = "~Loginnamn";
@@ -293,7 +293,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
         Text[ polish ] = "Has�o";
         Text[ portuguese_brazilian ] = "~Password";
         Text[ japanese ] = "パスワード(~P)";
-        Text[ korean ] = "패스워드(~P)";
+        Text[ korean ] = "암호(~P)";
         Text[ chinese_simplified ] = "密码(~P)";
         Text[ chinese_traditional ] = "密碼(~P)";
         Text[ arabic ] = "���� ����";
@@ -361,7 +361,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
         QuickHelpText[ greek ] = "��������� ��������� ����������� WWW";
         QuickHelpText[ dutch ] = "WWW-browser";
         QuickHelpText[ french ] = "Navigateur Web";
-        QuickHelpText[ spanish ] = "Navegador";
+        QuickHelpText[ spanish ] = "Navegador Web";
         QuickHelpText[ italian ] = "Browser Web";
         QuickHelpText[ danish ] = "WWW-browser";
         QuickHelpText[ swedish ] = "Webbl�sare";
@@ -383,6 +383,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
         Text[ swedish ] = "Webbl�sare";
         Text[ japanese ] = "WWWブラウザ";
         Text[ chinese_simplified ] = "万维网浏览器";
+        Text[ spanish ] = "Navegador Web";
     };
     Image IMG_BROWSE_HC
     {
@@ -480,7 +481,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
         Text[ greek ] = "~�������";
         Text[ dutch ] = "F~rame";
         Text[ french ] = "F~rame";
-        Text[ spanish ] = "F~rame";
+        Text[ spanish ] = "~Marco";
         Text[ italian ] = "F~rame";
         Text[ danish ] = "Frame";
         Text[ swedish ] = "~Ram";
@@ -524,7 +525,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
         Text[ polish ] = "Forma";
         Text[ portuguese_brazilian ] = "F~orm";
         Text[ japanese ] = "フォーム(~O)";
-        Text[ korean ] = "양식(~O)";
+        Text[ korean ] = "방식(~O)";
         Text[ chinese_simplified ] = "方式(~O)";
         Text[ chinese_traditional ] = "方式(~O)";
         Text[ arabic ] = "�����";
@@ -859,18 +860,18 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL
         Text [ ENGLISH ] = "~EMail";
         Text[ english_us ] = "~E-mail";
         Text[ portuguese ] = "~E-mail";
-        Text[ russian ] = "��.�����";
+        Text[ russian ] = "��. �����";
         Text[ greek ] = "EMail";
         Text[ dutch ] = "~E-mail";
         Text[ french ] = "~E-mail";
-        Text[ spanish ] = "E-mail";
+        Text[ spanish ] = "~Correo-e";
         Text[ italian ] = "~eMail";
         Text[ danish ] = "E-mail";
         Text[ swedish ] = "~E-post";
         Text[ polish ] = "~e-mail";
         Text[ portuguese_brazilian ] = "~EMail";
         Text[ japanese ] = "~E-mail";
-        Text[ korean ] = "~E-mail";
+        Text[ korean ] = "~전자메일";
         Text[ chinese_simplified ] = "电子邮件(~E)";
         Text[ chinese_traditional ] = "電子郵件(~E)";
         Text[ arabic ] = "���� ��������";
@@ -1000,7 +1001,7 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL
         QuickHelpText[ polish ] = "�r�d�a danych...";
         QuickHelpText[ portuguese_brazilian ] = "Adressbook";
         QuickHelpText[ japanese ] = "データソース...";
-        QuickHelpText[ korean ] = "주소록";
+        QuickHelpText[ korean ] = "데이터 원본...";
         QuickHelpText[ chinese_simplified ] = "数据源";
         QuickHelpText[ chinese_traditional ] = "資料源...";
         QuickHelpText[ turkish ] = "Adressbuch";
@@ -1008,7 +1009,7 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL
         QuickHelpText[ catalan ] = "Libreta de direccions";
         QuickHelpText[ finnish ] = "Osoitekirja";
         Text[ english_us ] = "Data Sources...";
-        Text[ korean ] = "데이터 원본";
+        Text[ korean ] = "데이터 원본...";
         Text[ chinese_traditional ] = "資料源...";
         Text[ french ] = "Sources de donn�es...";
         Text[ spanish ] = "Fuentes de datos...";
@@ -1063,7 +1064,7 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL
         Text[ greek ] = "~�������";
         Text[ dutch ] = "F~rame";
         Text[ french ] = "F~rame";
-        Text[ spanish ] = "F~rame";
+        Text[ spanish ] = "~Marco";
         Text[ italian ] = "F~rame";
         Text[ danish ] = "Frame";
         Text[ swedish ] = "~Ram";
@@ -1107,7 +1108,7 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL
         Text[ polish ] = "Forma";
         Text[ portuguese_brazilian ] = "F~orm";
         Text[ japanese ] = "フォーム(~O)";
-        Text[ korean ] = "양식(~O)";
+        Text[ korean ] = "방식(~O)";
         Text[ chinese_simplified ] = "方式(~O)";
         Text[ chinese_traditional ] = "方式(~O)";
         Text[ arabic ] = "�����";
@@ -1265,7 +1266,7 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL
         Text[ polish ] = "Tekst";
         Text[ portuguese_brazilian ] = "In~dication";
         Text[ japanese ] = "文字列(~X)";
-        Text[ korean ] = "텍스트(~X)";
+        Text[ korean ] = "문자열(~X)";
         Text[ chinese_simplified ] = "提示文字(~X)";
         Text[ chinese_traditional ] = "文字(~X)";
         Text[ arabic ] = "����";
@@ -1526,7 +1527,7 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT
         Text[ russian ] = "���� � ���������";
         Text[ greek ] = "������ ���������� ��� �������";
         Text[ dutch ] = "Doel in document";
-        Text[ french ] = "Cible � l'int�rieur du document";
+        Text[ french ] = "Cible dans le document";
         Text[ spanish ] = "Destino en el documento";
         Text[ italian ] = "Destinazione nel documento";
         Text[ danish ] = "M�l i dokumentet";
@@ -1534,7 +1535,7 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT
         Text[ polish ] = "Cel w dokumencie";
         Text[ portuguese_brazilian ] = "Target inside the document";
         Text[ japanese ] = "ドキュメントにあるターゲット";
-        Text[ korean ] = "문서내 대상";
+        Text[ korean ] = "문서 내 연결 대상";
         Text[ chinese_simplified ] = "文档中的连接目标";
         Text[ chinese_traditional ] = "文件內的連結目標";
         Text[ arabic ] = "����� �� �������";
@@ -1725,7 +1726,7 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT
         Text[ greek ] = "~�������";
         Text[ dutch ] = "F~rame";
         Text[ french ] = "F~rame";
-        Text[ spanish ] = "F~rame";
+        Text[ spanish ] = "~Marco";
         Text[ italian ] = "F~rame";
         Text[ danish ] = "Frame";
         Text[ swedish ] = "~Ram";
@@ -1769,7 +1770,7 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT
         Text[ polish ] = "Forma";
         Text[ portuguese_brazilian ] = "F~orm";
         Text[ japanese ] = "フォーム(~O)";
-        Text[ korean ] = "양식(~O)";
+        Text[ korean ] = "방식(~O)";
         Text[ chinese_simplified ] = "方式(~O)";
         Text[ chinese_traditional ] = "方式(~O)";
         Text[ arabic ] = "�����";
@@ -2079,7 +2080,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT
         Text[ greek ] = "���������� ��������";
         Text[ dutch ] = "Nieuw document";
         Text[ french ] = "Nouveau document";
-        Text[ spanish ] = "Nuevo documento";
+        Text[ spanish ] = "Documento nuevo";
         Text[ italian ] = "Nuovo documento";
         Text[ danish ] = "Nyt dokument";
         Text[ swedish ] = "Nytt dokument";
@@ -2316,7 +2317,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT
         Text[ greek ] = "~�������";
         Text[ dutch ] = "F~rame";
         Text[ french ] = "F~rame";
-        Text[ spanish ] = "F~rame";
+        Text[ spanish ] = "~Marco";
         Text[ italian ] = "F~rame";
         Text[ danish ] = "Frame";
         Text[ swedish ] = "~Ram";
@@ -2360,7 +2361,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT
         Text[ polish ] = "Forma";
         Text[ portuguese_brazilian ] = "F~orm";
         Text[ japanese ] = "フォーム(~O)";
-        Text[ korean ] = "양식(~O)";
+        Text[ korean ] = "방식(~O)";
         Text[ chinese_simplified ] = "方式(~O)";
         Text[ chinese_traditional ] = "方式(~O)";
         Text[ arabic ] = "�����";
@@ -2736,7 +2737,7 @@ String RID_SVXSTR_HYPDLG_MACROACT1
     Text[ polish ] = "Mysz nad obiektem";
     Text[ portuguese_brazilian ] = "Mouse over object";
     Text[ japanese ] = "オブジェクト用マウス";
-    Text[ korean ] = "마우스를 개체위에";
+    Text[ korean ] = "마우스를 개체 위에";
     Text[ chinese_simplified ] = "鼠标在对象之上";
     Text[ chinese_traditional ] = "鼠標在物件之上";
     Text[ arabic ] = "������ ��� ������";
@@ -2762,7 +2763,7 @@ String RID_SVXSTR_HYPDLG_MACROACT2
     Text[ polish ] = "Wykonaj hiper��cze";
     Text[ portuguese_brazilian ] = "Release hyperlink";
     Text[ japanese ] = "ハイパーリンクを解除";
-    Text[ korean ] = "하이퍼링크 실행";
+    Text[ korean ] = "하이퍼링크 트리거";
     Text[ chinese_simplified ] = "执行超链接";
     Text[ chinese_traditional ] = "執行超連結";
     Text[ arabic ] = "����� �������� �������";
@@ -2918,7 +2919,7 @@ String RID_SVXSTR_HYPERDLG_HLMAILTP_HELP
     Text[ swedish ] = "H�r kan du skapa en hyperl�nk till en e-postadress eller diskussionsgrupp.";
     Text[ polish ] = "This is where you create a hyperlink to an e-mail address or newsgroup.";
     Text[ japanese ] = "E-mail アドレスまたはニュースグループにハイパーリンクを作成します。";
-    Text[ korean ] = "전자 우편 또는 뉴스 그룹으로 하이퍼링크를 만드십시오.";
+    Text[ korean ] = "전자 메일 또는 뉴스그룹으로 하이퍼링크를 만드십시오.";
     Text[ chinese_simplified ] = "建立一个电子邮件地址的或新闻小组的超链接。";
     Text[ chinese_traditional ] = "建立一個電子郵件地址的或新聞群組的超連結。";
     Text[ turkish ] = "This is where you create a hyperlink to an e-mail address or newsgroup.";
@@ -2984,7 +2985,7 @@ String RID_SVXSTR_HYPERDLG_HLDOCNTP
     Text[ greek ] = "���������� ��������";
     Text[ dutch ] = "Nieuw document";
     Text[ french ] = "Nouveau document";
-    Text[ spanish ] = "Nuevo documento";
+    Text[ spanish ] = "Documento nuevo";
     Text[ italian ] = "Nuovo doc.";
     Text[ danish ] = "Nyt dokument";
     Text[ swedish ] = "Nytt dokument";
@@ -3009,7 +3010,7 @@ String RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP
     Text[ greek ] = "This is where you create a new document to which the new link points.";
     Text[ dutch ] = "This is where you create a new document to which the new link points.";
     Text[ french ] = "Cr�ez un nouveau document sur lequel le nouveau lien pointera.";
-    Text[ spanish ] = "Crea un documento nuevo al que el nuevo hiperenlace referir�. ";
+    Text[ spanish ] = "Crea un documento nuevo al que refiere el hiperenlace. ";
     Text[ finnish ] = "This is where you create a new document to which the new link points.";
     Text[ italian ] = "Crea un documento a cui fa riferimento l'hyperlink.";
     Text[ danish ] = "This is where you create a new document to which the new link points.";
@@ -3069,7 +3070,7 @@ String RID_SVXSTR_HYPERDLG_FROM_TEXT
     Text [ polish ] = "Tekst" ;
     Text [ portuguese_brazilian ] = "Text" ;
     Text [ japanese ] = "文字列" ;
-    Text [ korean ] = "텍스트" ;
+    Text [ korean ] = "문자열" ;
     Text [ chinese_simplified ] = "文字" ;
     Text [ chinese_traditional ] = "文字" ;
     Text [ arabic ] = "��" ;
@@ -3101,7 +3102,7 @@ String RID_SVXSTR_HYPERDLG_QUERYOVERWRITE
     Text[ dutch ] = "Het bestand bestaat reeds. Overschrijven?";
     Text[ chinese_simplified ] = "这个文件已经存在。要改写它?";
     Text[ greek ] = "�� ������ ���� ������� ���. �� ��������������;";
-    Text[ korean ] = "파일이 이미 있습니다. 대체하시겠습니까?";
+    Text[ korean ] = "이 파일은 이미 있습니다. 겹쳐쓰시겠습니까?";
     Text[ turkish ] = "Dosya zaten mevcut. �zerine yaz�ls�n m�?";
     Text[ finnish ] = "Tiedosto on jo olemassa. Korvataanko?";
     Text[ catalan ] = "El fitxer ja existeix. Voleu sobreescriure'l?";
@@ -3156,3 +3157,8 @@ Image RID_SVXBMP_HLDOCNTP_H
     MASKCOLOR
 };
 
+
+
+
+
+
diff --git a/svx/source/dialog/hyphen.src b/svx/source/dialog/hyphen.src
index d25cae82b427..d1403dba9274 100644
--- a/svx/source/dialog/hyphen.src
+++ b/svx/source/dialog/hyphen.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hyphen.src,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: kz $ $Date: 2001-07-26 22:33:06 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -117,24 +117,25 @@ ModalDialog RID_SVXDLG_HYPHENATE
         TEXT [ italian ] = "Parola" ;
         TEXT [ portuguese_brazilian ] = "Palavra" ;
         TEXT [ portuguese ] = "Pa~lavra" ;
-        TEXT [ finnish ] = "Sana" ;
-        TEXT [ danish ] = "Ord" ;
+        TEXT [ finnish ] = "~Sana" ;
+        TEXT [ danish ] = "~Ord" ;
         TEXT [ french ] = "Mot" ;
         TEXT [ swedish ] = "~Ord" ;
         TEXT [ dutch ] = "W~oord" ;
         TEXT [ spanish ] = "Palabra" ;
         TEXT [ english_us ] = "~Word" ;
-        TEXT[ chinese_simplified ] = "��(~W)";
+        TEXT[ chinese_simplified ] = "字(~W)";
         TEXT[ russian ] = "�����";
         TEXT[ polish ] = "S�owo";
-        TEXT[ japanese ] = "�P��(~W)";
-        TEXT[ chinese_traditional ] = "�r(~W)";
+        TEXT[ japanese ] = "単語(~W)";
+        TEXT[ chinese_traditional ] = "字(~W)";
         TEXT[ arabic ] = "������";
         TEXT[ greek ] = "����";
-        TEXT[ korean ] = "�ܾ�(~W)";
+        TEXT[ korean ] = "단어(~W)";
         TEXT[ turkish ] = "S�zc�k";
         TEXT[ language_user1 ] = " ";
-        TEXT[ catalan ] = "Palabra";
+        TEXT[ catalan ] = "Paraula";
+        TEXT[ thai ] = "~คำ";
     };
     PushButton BTN_HYPH_CONTINUE
     {
@@ -146,24 +147,25 @@ ModalDialog RID_SVXDLG_HYPHENATE
         TABSTOP = TRUE ;
         Text [ dutch ] = "~Verder" ;
         Text [ italian ] = "Avanti" ;
-        Text [ spanish ] = "~Continuar" ;
-        Text [ french ] = "~Suivant" ;
+        Text [ spanish ] = "Continuar" ;
+        Text [ french ] = "Suivant" ;
         Text [ swedish ] = "~N�sta" ;
         Text [ danish ] = "N�ste" ;
         Text [ portuguese ] = "~Continuar" ;
         Text [ portuguese_brazilian ] = "~Weiter" ;
-        Text[ chinese_simplified ] = "����(~N)";
+        Text[ chinese_simplified ] = "继续(~N)";
         Text[ russian ] = "�����";
         Text[ polish ] = "Dalej";
-        Text[ japanese ] = "����(~N)";
-        Text[ chinese_traditional ] = "�~��(~N)";
+        Text[ japanese ] = "次へ(~N)";
+        Text[ chinese_traditional ] = "繼續(~N)";
         Text[ arabic ] = "������";
         Text[ greek ] = "�������";
-        Text[ korean ] = "���(~N)";
+        Text[ korean ] = "다음(~N)";
         Text[ turkish ] = "~Sonraki";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Siguiente";
+        Text[ catalan ] = "~Seg�ent";
         Text[ finnish ] = "~Seuraava";
+        Text[ thai ] = "~ถัดไป";
     };
     PushButton BTN_HYPH_DELETE
     {
@@ -172,28 +174,29 @@ ModalDialog RID_SVXDLG_HYPHENATE
         TEXT = "~Entfernen" ;
         TEXT [ English ] = "~Erase" ;
         TEXT [ norwegian ] = "~Erase" ;
-        TEXT [ italian ] = "~Rimuovi" ;
+        TEXT [ italian ] = "Ri~muovi" ;
         TEXT [ portuguese_brazilian ] = "~Apagar" ;
         TEXT [ portuguese ] = "~Remover" ;
         TEXT [ finnish ] = "~Poista" ;
         TEXT [ danish ] = "Fjern" ;
-        TEXT [ french ] = "~Supprimer" ;
+        TEXT [ french ] = "Supprimer" ;
         TEXT [ swedish ] = "Ta ~bort" ;
         TEXT [ dutch ] = "Ver~wijderen" ;
-        TEXT [ spanish ] = "~Eliminar" ;
+        TEXT [ spanish ] = "~Borrar" ;
         TEXT [ english_us ] = "~Remove" ;
         TABSTOP = TRUE ;
-        TEXT[ chinese_simplified ] = "ɾ��(~R)";
-        TEXT[ russian ] = "������";
+        TEXT[ chinese_simplified ] = "删除(~R)";
+        TEXT[ russian ] = "�������";
         TEXT[ polish ] = "Usu�";
-        TEXT[ japanese ] = "�폜(~R)";
-        TEXT[ chinese_traditional ] = "�R��(~R)";
+        TEXT[ japanese ] = "削除(~R)";
+        TEXT[ chinese_traditional ] = "刪除(~R)";
         TEXT[ arabic ] = "�����";
         TEXT[ greek ] = "��������";
-        TEXT[ korean ] = "����(~R)";
+        TEXT[ korean ] = "제거(~R)";
         TEXT[ turkish ] = "~Kald�r";
         TEXT[ language_user1 ] = " ";
-        TEXT[ catalan ] = "~Eliminar";
+        TEXT[ catalan ] = "~Suprimeix";
+        TEXT[ thai ] = "เ~อาออก";
     };
     OKButton BTN_HYPH_CUT
     {
@@ -214,17 +217,18 @@ ModalDialog RID_SVXDLG_HYPHENATE
         TEXT [ english_us ] = "~Hyphenate" ;
         TABSTOP = TRUE ;
         DEFBUTTON = TRUE ;
-        TEXT[ chinese_simplified ] = "���ַ�(~H)";
+        TEXT[ chinese_simplified ] = "连字符(~H)";
         TEXT[ russian ] = "���������";
         TEXT[ polish ] = "Podziel";
-        TEXT[ japanese ] = "������(~H)";
-        TEXT[ chinese_traditional ] = "�s�r��(~H)";
+        TEXT[ japanese ] = "分ける(~H)";
+        TEXT[ chinese_traditional ] = "連字符(~H)";
         TEXT[ arabic ] = "��� �������";
         TEXT[ greek ] = "�����������";
-        TEXT[ korean ] = "������ �ֱ�(~H)";
+        TEXT[ korean ] = "하이픈 넣기(~H)";
         TEXT[ turkish ] = "~Ay�r";
         TEXT[ language_user1 ] = " ";
-        TEXT[ catalan ] = "~Dividir";
+        TEXT[ catalan ] = "~Parteix els mots";
+        TEXT[ thai ] = "ใส่~ยัติภังค์";
     };
     CancelButton BTN_HYPH_CANCEL
     {
@@ -238,17 +242,18 @@ ModalDialog RID_SVXDLG_HYPHENATE
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TABSTOP = TRUE ;
     };
-    Text[ chinese_simplified ] = "���ַ�";
+    Text[ chinese_simplified ] = "连字符";
     Text[ russian ] = "����������� ���������";
     Text[ polish ] = "Dzielenie wyraz�w";
-    Text[ japanese ] = "ʲ�Ȱ���";
-    Text[ chinese_traditional ] = "�s�r��";
+    Text[ japanese ] = "ハイフネーション";
+    Text[ chinese_traditional ] = "連字符";
     Text[ arabic ] = "��� �������";
     Text[ greek ] = "�����������";
-    Text[ korean ] = "������ �ֱ�";
+    Text[ korean ] = "하이픈 넣기";
     Text[ turkish ] = "Heceleme";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Separaci�n sil�bica";
+    Text[ catalan ] = "Separaci� en s�l.labes";
+    Text[ thai ] = "ใส่ยัติภังค์";
 };
  // ******************************************************************* EOF
 
@@ -256,3 +261,15 @@ ModalDialog RID_SVXDLG_HYPHENATE
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svx/source/dialog/hyprlink.src b/svx/source/dialog/hyprlink.src
index 277972d788aa..52590f957aec 100644
--- a/svx/source/dialog/hyprlink.src
+++ b/svx/source/dialog/hyprlink.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hyprlink.src,v $
  *
- *  $Revision: 1.22 $
+ *  $Revision: 1.23 $
  *
- *  last change: $Author: kz $ $Date: 2001-11-16 23:26:53 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -108,8 +108,9 @@ DockingWindow RID_SVXDLG_HYPERLINK
         QuickHelpText[ korean ] = "URL 이름";
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ turkish ] = "Name der URL";
-        QuickHelpText[ catalan ] = "Nombre de la URL";
-        QuickHelpText[ finnish ] = "URL-nimi!";
+        QuickHelpText[ catalan ] = "Nom de la URL";
+        QuickHelpText[ finnish ] = "URL-nimi";
+        QuickHelpText[ thai ] = "URL Name";
     };
     FixedText FT_URL
     {
@@ -138,6 +139,7 @@ DockingWindow RID_SVXDLG_HYPERLINK
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "URL:";
         Text[ finnish ] = "URL:";
+        Text[ thai ] = "URL:";
     };
     ComboBox CB_URL
     {
@@ -162,7 +164,7 @@ DockingWindow RID_SVXDLG_HYPERLINK
         QuickHelpText[ russian ] = "���������� URL ���������";
         QuickHelpText[ danish ] = "Samleboks til Internet URL";
         QuickHelpText[ polish ] = "Skrzynka zbiorcza dla URL Internetu";
-        QuickHelpText[ japanese ] = "ｲﾝﾀｰﾈｯﾄURLの収集ﾎﾞｯｸｽ";
+        QuickHelpText[ japanese ] = "インターネットURLの収集ボックス";
         QuickHelpText[ chinese_simplified ] = "国际互联网 URL 地址栏";
         QuickHelpText[ chinese_traditional ] = "Internet URL 位址列";
         QuickHelpText[ arabic ] = "�������� URLs ����� ���";
@@ -170,8 +172,9 @@ DockingWindow RID_SVXDLG_HYPERLINK
         QuickHelpText[ korean ] = "인터넷 URL";
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ turkish ] = "Sammelbox f�r Internet-URLs";
-        QuickHelpText[ catalan ] = "URLs de Internet";
-        QuickHelpText[ finnish ] = "Internetin URL-osoitteet!";
+        QuickHelpText[ catalan ] = "URLs d'Internet";
+        QuickHelpText[ finnish ] = "Internetin URL-osoitteet";
+        QuickHelpText[ thai ] = "Internet URLs";
     };
     ToolBox TB
     {
@@ -186,7 +189,7 @@ DockingWindow RID_SVXDLG_HYPERLINK
                 Disable = TRUE ;
                 Text = "Link" ;
                 Text [ English ] = "Link" ;
-                Text [ dutch ] = "Link" ;
+                Text [ dutch ] = "Koppeling" ;
                 Text [ english_us ] = "Hyperlink" ;
                 Text [ italian ] = "Link" ;
                 Text [ spanish ] = "Hiperenlace" ;
@@ -198,15 +201,16 @@ DockingWindow RID_SVXDLG_HYPERLINK
                 Text[ chinese_simplified ] = "超链接";
                 Text[ russian ] = "�����������";
                 Text[ polish ] = "��cze";
-                Text[ japanese ] = "ﾘﾝｸ";
+                Text[ japanese ] = "リンク";
                 Text[ chinese_traditional ] = "超連結";
                 Text[ arabic ] = "������";
                 Text[ language_user1 ] = " ";
                 Text[ greek ] = "����-�������";
                 Text[ korean ] = "하이퍼링크";
                 Text[ turkish ] = "Hyperlink";
-                Text[ catalan ] = "Hiperenlace";
+                Text[ catalan ] = "Hiperenlla�";
                 Text[ finnish ] = "Hyperlinkki";
+                Text[ thai ] = "เชื่อมโยงหลายมิติ";
             };
             ToolBoxItem
             {
@@ -227,7 +231,7 @@ DockingWindow RID_SVXDLG_HYPERLINK
                 Text[ chinese_simplified ] = "书签";
                 Text[ russian ] = "��������";
                 Text[ polish ] = "Zak�adka";
-                Text[ japanese ] = "ﾌﾞｯｸﾏｰｸ";
+                Text[ japanese ] = "ブックマーク";
                 Text[ chinese_traditional ] = "書籤";
                 Text[ arabic ] = "����� ������";
                 Text[ greek ] = "�������������";
@@ -235,7 +239,8 @@ DockingWindow RID_SVXDLG_HYPERLINK
                 Text[ turkish ] = "Yer i�areti";
                 Text[ language_user1 ] = " ";
                 Text[ catalan ] = "Marcador";
-                Text[ finnish ] = "Kirjanmerkit";
+                Text[ finnish ] = "Kirjanmerkki";
+                Text[ thai ] = "ที่คั่น";
             };
             ToolBoxItem
             {
@@ -263,8 +268,9 @@ DockingWindow RID_SVXDLG_HYPERLINK
                 Text[ korean ] = "검색";
                 Text[ turkish ] = "Ara";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Buscar";
+                Text[ catalan ] = "Cerca";
                 Text[ finnish ] = "Etsi";
+                Text[ thai ] = "ค้นหา";
             };
         };
     };
@@ -280,15 +286,16 @@ DockingWindow RID_SVXDLG_HYPERLINK
     Text[ chinese_simplified ] = "插入超链接";
     Text[ russian ] = "�������� �����������";
     Text[ polish ] = "Wstaw hiper��cze";
-    Text[ japanese ] = "ﾊｲﾊﾟｰﾘﾝｸの挿入";
+    Text[ japanese ] = "ハイパーリンクの挿入";
     Text[ chinese_traditional ] = "插入超連結";
     Text[ arabic ] = "����� ������ �����";
     Text[ greek ] = "�������� ����-��������";
     Text[ korean ] = "하이퍼링크 삽입";
     Text[ turkish ] = "Hyperlink ekle";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Insertar hiperenlace";
-    Text[ finnish ] = "Lis?? hyperlinkki";
+    Text[ catalan ] = "Insereix hiperenlla�";
+    Text[ finnish ] = "Lis�� hyperlinkki";
+    Text[ thai ] = "แทรกการเชื่อมโยงหลายมิติ";
 };
  // PopupMenu -------------------------------------------------------------
 Menu RID_SVXMN_HYPERLINK
@@ -312,22 +319,23 @@ Menu RID_SVXMN_HYPERLINK
             Text[ chinese_simplified ] = "当作文字";
             Text[ russian ] = "��� �����";
             Text[ polish ] = "Jako tekst";
-            Text[ japanese ] = "ﾃｷｽﾄとして";
+            Text[ japanese ] = "テキストとして";
             Text[ chinese_traditional ] = "當作文字";
             Text[ arabic ] = "���";
             Text[ greek ] = "�� ~�������";
             Text[ korean ] = "텍스트로";
             Text[ turkish ] = "Metin olarak";
             Text[ language_user1 ] = " ";
-            Text[ catalan ] = "Como ~texto";
-            Text[ finnish ] = "Tekstin?";
+            Text[ catalan ] = "Com a text";
+            Text[ finnish ] = "Tekstin�";
+            Text[ thai ] = "เป็นข้อความ";
         };
         MenuItem
         {
             Identifier = MN_BUTTON ;
             Text = "Als ~Button" ;
             Text [ English ] = "As ~button" ;
-            Text [ dutch ] = "Als ~button" ;
+            Text [ dutch ] = "Als ~knop" ;
             Text [ english_us ] = "As ~Button" ;
             Text [ italian ] = "Come ~pulsante" ;
             Text [ spanish ] = "Como ~bot�n" ;
@@ -338,7 +346,7 @@ Menu RID_SVXMN_HYPERLINK
             Text [ portuguese_brazilian ] = "Als ~Button" ;
             Text[ russian ] = "��� ������";
             Text[ polish ] = "Jako klawisz";
-            Text[ japanese ] = "ﾎﾞﾀﾝとして(~B)";
+            Text[ japanese ] = "ボタン(~B)";
             Text[ chinese_simplified ] = "当作按钮(~B)";
             Text[ chinese_traditional ] = "當作按鈕(~B)";
             Text[ arabic ] = "������";
@@ -346,8 +354,9 @@ Menu RID_SVXMN_HYPERLINK
             Text[ korean ] = "버튼으로(~B)";
             Text[ turkish ] = "D��me olarak";
             Text[ language_user1 ] = " ";
-            Text[ catalan ] = "Como ~bot�n";
+            Text[ catalan ] = "Com a ~bot�";
             Text[ finnish ] = "~Painikkeena";
+            Text[ thai ] = "เป็น~ปุ่ม";
         };
     };
 };
@@ -370,17 +379,18 @@ QueryBox RID_SVXQB_NOCONNECT
     Message [ portuguese_brazilian ] = "Die URL kann erst nach Aufbau einer Verbindung gepr?t werden.\nSoll die Verbindung aufgebaut werden?" ;
     Message [ portuguese ] = "O URL pode apenas ser verificado depois de  efectuar uma liga��o.\nDeseja inici�-la?" ;
     Message[ chinese_simplified ] = "只有在建立连接后才能确定这个 URL 是否正确。\n您要现在建立连接吗？";
-    Message[ russian ] = "��������� URL �������� ������ ����� �����������.n���������� �����������?";
+    Message[ russian ] = "��������� URL �������� ������ ����� ����������.\n���������� ����������?";
     Message[ polish ] = "URL mo�e zosta� sprawdzony dopiero po ustanowieniu po��czenia.\nCzy utworzy� po��czenie?";
-    Message[ japanese ] = "このURLは接続設定後にしかﾃｽﾄできません。\n接続を設定しますか?";
+    Message[ japanese ] = "この URL は接続できてからでしか確認できません。\n接続しますか。";
     Message[ chinese_traditional ] = "只有在建立連線後才能確定這個 URL 是否正確。\n您要現在連線到 Internet﹖";
     Message[ arabic ] = "�� ���� ��� ������� (URL)� ��� ��� ����� �������.\n�� ���� ����� �������";
     Message[ greek ] = "� ������� ����� ��� URL ����� ������� �� ����� ���� ��� �������.\n������ �� ����������;";
-    Message[ korean ] = "이 URL은 접속이 이루어진 후에야 검사할 수 있습니다. 접속하시겠습니까?";
+    Message[ korean ] = "이 URL은 접속이 이루어진 후에야 검사할 수 있습니다. 접속하겠습니까?";
     Message[ turkish ] = "Bu URL ba�lant� kurulduktan sonra kontrol edilebilir.\nBa�lant� kurulsun mu?";
     Message[ language_user1 ] = " ";
-    Message[ catalan ] = "La URL solo puede ser verificada despu�s de haberse establecido una conexi�n.\n�Desea establecer la conexi�n?";
-    Message[ finnish ] = "T?m? URL-osoite voidaan testata vasta, kun yhteys on muodostettu. Muodostetaanko yhteys?";
+    Message[ catalan ] = "La URL nom�s es pot verificar despr�s d'establir-se una connexi�.\nVoleu establir la connexi�?";
+    Message[ finnish ] = "T�m� URL-osoite voidaan testata vasta, kun yhteys on muodostettu. Muodostetaanko yhteys?";
+    Message[ thai ] = "สามารถพิสูจน์ URL นี้เท่านั้นหลังจากทำการเชื่อมต่อ สร้างการเชื่อมต่อหรือไม่?";
 };
 QueryBox RID_SVXQB_DONTEXIST
 {
@@ -400,17 +410,18 @@ QueryBox RID_SVXQB_DONTEXIST
     Message [ portuguese_brazilian ] = "Die URL existiert nicht.\nSoll sie trotzdem eingef?t werden?" ;
     Message [ portuguese ] = "O URL n�o existe.\nDeseja inseri-lo?" ;
     Message[ chinese_simplified ] = "这个 URL 不存在。\n您还是要加入它？";
-    Message[ russian ] = "���� URL �� ����������.\n��� ����� ��������?";
+    Message[ russian ] = "URL �� ����������.\n��������, �������� �� ���?";
     Message[ polish ] = "URL nie istnieje.\nCzy ma on zosta� mimo to wstawiony?";
-    Message[ japanese ] = "このURLは存在しません。\nそれでも挿入しますか?";
+    Message[ japanese ] = "この URL は存在しません。\nそれでも挿入しますか。";
     Message[ chinese_traditional ] = "這個 URL 不存在。\n您還是要加入它﹖";
     Message[ arabic ] = "��� ��� URL ��� �����.\n�� ���� ������ ��� ����� �� ��߿";
     Message[ greek ] = "�� URL ��� �������.\n������ �� �������� ��� ��� ����;";
-    Message[ korean ] = "이 URL은 존재하지 않습니다.그래도 삽입하시겠습니까?";
+    Message[ korean ] = "이 URL은 없습니다. 그래도 삽입하시겠습니까?";
     Message[ turkish ] = "Bu URL mevcut de�il.\nYine de URL'yi eklemek istiyor musunuz?";
     Message[ language_user1 ] = " ";
-    Message[ catalan ] = "La URL no existe.\n�Desea insertarla de todas formas?";
-    Message[ finnish ] = "URL-osoitetta ei ole olemassa. Lis?t??nk?kuitenkin?";
+    Message[ catalan ] = "Aquest URL no existeix. Voleu inserir-lo de totes maneres?";
+    Message[ finnish ] = "URL-osoitetta ei ole olemassa. Lis�t��nk� kuitenkin?";
+    Message[ thai ] = "ไม่มี URL นี้อยู่  แทรกหรือไม่?";
 };
 
 
@@ -423,3 +434,6 @@ QueryBox RID_SVXQB_DONTEXIST
 
 
 
+
+
+
diff --git a/svx/source/dialog/iconcdlg.cxx b/svx/source/dialog/iconcdlg.cxx
index 5cda01105453..b4772436d463 100644
--- a/svx/source/dialog/iconcdlg.cxx
+++ b/svx/source/dialog/iconcdlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: iconcdlg.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: pb $ $Date: 2002-06-21 07:01:36 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -397,7 +397,7 @@ IconChoiceDialog ::~IconChoiceDialog ()
     // save configuration at INI-Manager
     // and remove pages
     SvtViewOptions aTabDlgOpt( E_TABDIALOG, String::CreateFromInt32( nResId ) );
-    aTabDlgOpt.SetWindowState( ::rtl::OUString::createFromAscii( GetWindowState().GetBuffer() ) );
+    aTabDlgOpt.SetWindowState( ::rtl::OUString::createFromAscii( GetWindowState((WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)).GetBuffer() ) );
     aTabDlgOpt.SetPageID( mnCurrentPageId );
 
     const ULONG nCount = maPageList.Count();
@@ -1440,91 +1440,9 @@ void IconChoiceDialog::FocusOnIcon( USHORT nId )
 
 // -----------------------------------------------------------------------
 
-long IconChoiceDialog::PreNotify( NotifyEvent& rNEvt )
-{
-    const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
-
-    DBG_ASSERT( rNEvt.GetType() != EVENT_KEYINPUT || ( rNEvt.GetType() == EVENT_KEYINPUT && pKEvt ),
-                    "-IconChoiceDialog::PreNotify(): no KeyEvent for key event?!" );
-
-    if( rNEvt.GetType() == EVENT_KEYINPUT && pKEvt->GetKeyCode().IsMod2() && pKEvt->GetCharCode() )
-    {   // catch only <ALT><something> for mnemonic-handling
-        long nRet = 0;
-
-        if( HasChildPathFocus() )
-        {   // focus is somewhere in the dialog
-            if( maIconCtrl.HasChildPathFocus() && maIconCtrl.HandleShortCutKey( *pKEvt ) )
-                nRet = 1;
-            else
-                nRet = ModalDialog::PreNotify( rNEvt );
-
-/*          TRY OF AN IMPLEMENTATION FOR 'CLEAN' HANDLING OF MNEMONICS... doesn't work at mark <---------
-                because Notify() is only handled on first page!
-            const Window*   pActFocusedWin = Application::GetFocusWindow();     // first get actual focused window
-
-            DBG_ASSERT( GetTabPage( GetCurPageId() ), "-IconChoiceDialog::PreNotify(): current page is null!" );
-
-#ifdef DBG_UTIL
-            ULONG           nNotified =
-#endif
-            GetTabPage( GetCurPageId() )->Notify( rNEvt );<---------    // try to handle key input in actual page
-
-            if( pActFocusedWin == Application::GetFocusWindow() )
-            {   // key not handled or only one mnemonic available for a control wich already has focus
-                //  -> ignore result of Notify() and give the icon select control a chance
-                if( maIconCtrl.HandleShortCutKey( *pKEvt ) )
-                {
-                    nRet = 1;
-                }
-            }
-            else
-            {   // key was handled -> try to detect overrun in mnemonic handling of dialog
-                DBG_ASSERT( nNotified != 0, "*IconChoiceDialog::PreNotify(): focus changed but nothing done in Notify()!?" );
-
-                nRet = 1;       // no matter what happens afterwards, the key was handled
-
-                Window*                 pActWin = Application::GetFocusWindow();    //->GetWindow( WINDOW_PREV );
-                DBG_ASSERT( IsChild( pActWin ), "*IconChoiceDialog::PreNotify(): this is not my child!" );
-
-                xub_Unicode             cMnem = pKEvt->GetCharCode();
-                UINT32                  nMnemCnt = 0;
-                const vcl::I18nHelper&  rI18nHelper = Application::GetSettings().GetUILocaleI18nHelper();
-
-                while( pActWin )
-                {
-                    switch( pActWin->GetType() )
-                    {
-                        case WINDOW_FIXEDTEXT:
-                        case WINDOW_RADIOBUTTON:
-                        case WINDOW_CHECKBOX:
-                        case WINDOW_TRISTATEBOX:
-                        case WINDOW_PUSHBUTTON:
-                            if( rI18nHelper.MatchMnemonic( pActWin->GetText(), cMnem ) )
-                                nMnemCnt++;
-                            break;
-                    }
-
-                    pActWin = pActWin->GetWindow( WINDOW_PREV );
-                }
-
-                DBG_ASSERT( nMnemCnt, "+IconChoiceDialog::PreNotify(): no matching fixed text before focused control!" );
-
-                if( nMnemCnt < 2 )
-                    // now the only possible scenario: handling of mnemonics wrapped at the end of childs
-                    maIconCtrl.HandleShortCutKey( *pKEvt );
-            }*/
-        }
-
-        return nRet;
-    }
-    else
-        return ModalDialog::PreNotify( rNEvt );
-}
-
-// -----------------------------------------------------------------------
-
 void IconChoiceDialog::CreateIconTextAutoMnemonics( void )
 {
+    // !!!!!!! this might be done by IconChoice control -> SvtIconChoiceCtrl::CreateAutoMnemonics() !!!!!!!
     MnemonicGenerator   aMnemonicGenerator;
     const ULONG         nEntryCount = maIconCtrl.GetEntryCount();
     ULONG               i;
diff --git a/svx/source/dialog/iconcdlg.src b/svx/source/dialog/iconcdlg.src
index b0989e6f697b..e41c52aa01f8 100644
--- a/svx/source/dialog/iconcdlg.src
+++ b/svx/source/dialog/iconcdlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: iconcdlg.src,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: kz $ $Date: 2001-07-26 22:34:22 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,24 +69,34 @@ String RID_SVXSTR_ICONCHOICEDLG_RESETBUT
     Text[ russian ] = "�����";
     Text[ greek ] = "~����";
     Text[ dutch ] = "~Vorige";
-    Text[ french ] = "~Pr�c�dent";
+    Text[ french ] = "Pr�c�dent";
     Text[ spanish ] = "~Regresar";
     Text[ italian ] = "Indietro";
     Text[ danish ] = "Tilbage";
     Text[ swedish ] = "~Tillbaka";
     Text[ polish ] = "Wstecz";
     Text[ portuguese_brazilian ] = "Reset";
-    Text[ japanese ] = "�߂�(~B)";
-    Text[ korean ] = "�ڷ�(~B)";
-    Text[ chinese_simplified ] = "����(~B)";
-    Text[ chinese_traditional ] = "��^(~B)";
+    Text[ japanese ] = "戻る(~B)";
+    Text[ korean ] = "뒤로(~B)";
+    Text[ chinese_simplified ] = "还原(~B)";
+    Text[ chinese_traditional ] = "復原(~B)";
     Text[ arabic ] = "������";
     Text[ turkish ] = "Geri";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Ante~rior";
+    Text[ catalan ] = "~Enrere";
     Text[ finnish ] = "~Edellinen";
+    Text[ thai ] = "~กลับไป";
 };
 
 
 
 
+
+
+
+
+
+
+
+
+
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 081a71d3e956..cd5977e06389 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: imapdlg.cxx,v $
  *
- *  $Revision: 1.21 $
+ *  $Revision: 1.22 $
  *
- *  last change: $Author: fs $ $Date: 2002-11-14 10:07:02 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -710,6 +710,8 @@ void SvxIMapDlg::DoOpen()
 
             delete pIStm;
         }
+
+        pIMapWnd->Invalidate();
     }
 }
 
diff --git a/svx/source/dialog/imapdlg.src b/svx/source/dialog/imapdlg.src
index eec489561c50..a041886c99ea 100644
--- a/svx/source/dialog/imapdlg.src
+++ b/svx/source/dialog/imapdlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: imapdlg.src,v $
  *
- *  $Revision: 1.36 $
+ *  $Revision: 1.37 $
  *
- *  last change: $Author: kz $ $Date: 2002-11-27 17:02:32 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -92,7 +92,7 @@ ModelessDialog RID_SVXDLG_IMAP
                 Text [ ENGLISH ] = "Apply" ;
                 Text [ english_us ] = "Apply" ;
                 Text [ italian ] = "Assegna" ;
-                Text [ spanish ] = "Asignar" ;
+                Text [ spanish ] = "Aplicar" ;
                 Text [ french ] = "Assigner" ;
                 Text [ dutch ] = "Toewijzen" ;
                 Text [ swedish ] = "Tilldela" ;
@@ -231,7 +231,7 @@ ModelessDialog RID_SVXDLG_IMAP
                 Text[ chinese_traditional ] = "長方形";
                 Text[ arabic ] = "������";
                 Text[ greek ] = "���������";
-                Text[ korean ] = "사각형";
+                Text[ korean ] = "직사각형";
                 Text[ turkish ] = "Dikd�rtgen";
                 Text[ language_user1 ] = " ";
                 Text[ catalan ] = "Rectangle";
@@ -349,7 +349,7 @@ ModelessDialog RID_SVXDLG_IMAP
                 Text [ french ] = "�diter des points" ;
                 Text [ swedish ] = "Redigera punkter" ;
                 Text [ dutch ] = "Punten bewerken" ;
-                Text [ spanish ] = "Modificar puntos" ;
+                Text [ spanish ] = "Editar puntos" ;
                 Text [ english_us ] = "Edit Points" ;
                 AutoCheck = TRUE ;
                 Text[ chinese_simplified ] = "编辑接点";
@@ -359,7 +359,7 @@ ModelessDialog RID_SVXDLG_IMAP
                 Text[ chinese_traditional ] = "編輯接點";
                 Text[ arabic ] = "����� ������";
                 Text[ greek ] = "����������� �������";
-                Text[ korean ] = "항목 편집";
+                Text[ korean ] = "점 편집";
                 Text[ turkish ] = "Noktalar� d�zenle";
                 Text[ language_user1 ] = " ";
                 Text[ catalan ] = "Edita els punts";
@@ -448,7 +448,7 @@ ModelessDialog RID_SVXDLG_IMAP
                 Text [ french ] = "Supprimer des points" ;
                 Text [ swedish ] = "Radera punkter" ;
                 Text [ dutch ] = "Punten verwijderen" ;
-                Text [ spanish ] = "Eliminar puntos" ;
+                Text [ spanish ] = "Borrar puntos" ;
                 Text [ english_us ] = "Delete Points" ;
                 Text[ chinese_simplified ] = "删除点";
                 Text[ russian ] = "������� ����";
@@ -519,7 +519,7 @@ ModelessDialog RID_SVXDLG_IMAP
                 Text[ chinese_traditional ] = "恢復 ";
                 Text[ arabic ] = "�����";
                 Text[ greek ] = "��������� ";
-                Text[ korean ] = "되돌리기 ";
+                Text[ korean ] = "다시 실행";
                 Text[ turkish ] = "Yinele ";
                 Text[ language_user1 ] = " ";
                 Text[ catalan ] = "Restaura  ";
@@ -610,7 +610,7 @@ ModelessDialog RID_SVXDLG_IMAP
                 Text[ chinese_traditional ] = "屬性...";
                 Text[ arabic ] = "...�����";
                 Text[ greek ] = "���������...";
-                Text[ korean ] = "등록정보...";
+                Text[ korean ] = "등록 정보...";
                 Text[ turkish ] = "�zellikler...";
                 Text[ language_user1 ] = " ";
                 Text[ catalan ] = "Propietats...";
@@ -715,7 +715,7 @@ ModelessDialog RID_SVXDLG_IMAP
     Text [ swedish ] = "Image map-redigerare" ;
     Text [ danish ] = "ImageMap-redigering" ;
     Text [ italian ] = "Editor ImageMap" ;
-    Text [ spanish ] = "Editor de ImageMap" ;
+    Text [ spanish ] = "Editor de Image Map" ;
     Text [ french ] = "�diteur d'Image Map" ;
     Text [ dutch ] = "ImageMap-editor" ;
     Text [ portuguese ] = "Mapa de imagens Editor" ;
@@ -903,7 +903,7 @@ Menu RID_SVXMN_IMAP
             Text [ french ] = "~Disposition" ;
             Text [ swedish ] = "~Placering" ;
             Text [ dutch ] = "~Positie" ;
-            Text [ spanish ] = "Posici�n" ;
+            Text [ spanish ] = "~Disposici�n" ;
             Text [ english_us ] = "Arrange" ;
             SubMenu = Menu
             {
@@ -961,7 +961,7 @@ Menu RID_SVXMN_IMAP
                         Text[ chinese_traditional ] = "上移一層(~F)";
                         Text[ arabic ] = "����� ������";
                         Text[ greek ] = "�~������� ��� ������� ������";
-                        Text[ korean ] = "계속해서 앞으로(~F)";
+                        Text[ korean ] = "앞으로 이동(~F)";
                         Text[ turkish ] = "Bir �ne getir";
                         Text[ language_user1 ] = " ";
                         Text[ catalan ] = "Porta ~m�s endavant";
@@ -990,7 +990,7 @@ Menu RID_SVXMN_IMAP
                         Text[ chinese_traditional ] = "下移一層(~W)";
                         Text[ arabic ] = "����� �����";
                         Text[ greek ] = "~�������� ����";
-                        Text[ korean ] = "계속해서 뒤로(~W)";
+                        Text[ korean ] = "뒤로 이동(~W)";
                         Text[ turkish ] = "Bir alta g�nder";
                         Text[ language_user1 ] = " ";
                         Text[ catalan ] = "Envia cap ~enrere";
@@ -1034,7 +1034,7 @@ Menu RID_SVXMN_IMAP
             Text[ chinese_traditional ] = "排序";
             Text[ arabic ] = "�����";
             Text[ greek ] = "~�����������";
-            Text[ korean ] = "배열";
+            Text[ korean ] = "배치";
             Text[ turkish ] = "S�ralama";
             Text[ language_user1 ] = " ";
             Text[ catalan ] = "Organitza";
@@ -1091,7 +1091,7 @@ Menu RID_SVXMN_IMAP
             Text [ french ] = "~Supprimer" ;
             Text [ swedish ] = "~Radera" ;
             Text [ dutch ] = "~Wissen" ;
-            Text [ spanish ] = "~Eliminar" ;
+            Text [ spanish ] = "~Borrar" ;
             Text [ english_us ] = "~Delete" ;
             /* ### ACHTUNG: Neuer Text in Resource? Die Selektion l�schen : Die Selektion l�schen */
             Text[ chinese_simplified ] = "删除(~D)";
@@ -1142,7 +1142,7 @@ ModalDialog RID_SVXDLG_IMAPURL
         Text [ portuguese_brazilian ] = "Alternativtext:" ;
         Text [ portuguese ] = "Te~xto facultativo" ;
         Text[ chinese_simplified ] = "替代文字(~T)";
-        Text[ russian ] = "������� ������";
+        Text[ russian ] = "�����";
         Text[ polish ] = "Tekst opcjonalny:";
         Text[ japanese ] = "代用テキスト(~T)";
         Text[ chinese_traditional ] = "替代文字(~T)";
@@ -1179,7 +1179,7 @@ ModalDialog RID_SVXDLG_IMAPURL
         Text [ portuguese_brazilian ] = "URL:" ;
         Text [ portuguese ] = "~URL" ;
         Text[ chinese_simplified ] = "~URL";
-        Text[ russian ] = "URL";
+        Text[ russian ] = "����� URL";
         Text[ polish ] = "URL";
         Text[ japanese ] = "~URL";
         Text[ chinese_traditional ] = "~URL";
@@ -1253,12 +1253,12 @@ ModalDialog RID_SVXDLG_IMAPURL
         Text [ swedish ] = "~Ram" ;
         Text [ danish ] = "~Frame" ;
         Text [ italian ] = "Frame" ;
-        Text [ spanish ] = "Frame" ;
+        Text [ spanish ] = "~Marco" ;
         Text [ french ] = "Frame" ;
         Text [ dutch ] = "~Frame" ;
         Text [ portuguese ] = "~Frame" ;
         Text[ chinese_simplified ] = "框对象(~R)";
-        Text[ russian ] = "����";
+        Text[ russian ] = "�����";
         Text[ polish ] = "Ramka";
         Text[ japanese ] = "フレーム(~R)";
         Text[ chinese_traditional ] = "訊框(~R)";
@@ -1347,7 +1347,7 @@ String STR_IMAPDLG_SAVE
     Text[ chinese_traditional ] = "影像映射已經被變更。\n您要儲存變更？";
     Text[ arabic ] = "�� ����� ���� ������ .\n�� ���� ��� ��������ʿ";
     Text [ italian ] = "L'ImageMap � stata cambiata.\nSalvare le modifiche?" ;
-    Text [ spanish ] = "Se ha modificado el ImageMap.\n�Desea guardar los cambios?" ;
+    Text [ spanish ] = "Image Map se ha modificado.\n�Desea guardar las modificaciones?" ;
     Text [ french ] = "L'Image Map a �t� modifi�e.\nEnregistrer les modifications?" ;
     Text [ dutch ] = "De ImageMap is gewijzigd.\nWilt u de wijzigingen opslaan?" ;
     /* ### ACHTUNG: Neuer Text in Resource? Die ImageMap wurde ge�ndert.\nSollen die �nderungen gespeichert werden? : Die ImageMap wurde ge�ndert.\nSollen die �nderungen gespeichert werden? */
@@ -1375,7 +1375,7 @@ String STR_IMAPDLG_MODIFY
     Text [ swedish ] = "Image map har �ndrats.\nSkall �ndringarna �vertas?" ;
     Text [ danish ] = "ImageMap er blevet �ndret.\nSkal �ndringerne overtages?" ;
     Text [ italian ] = "La ImageMap � stata cambiata.\nAccettare le modifiche?" ;
-    Text [ spanish ] = "Se ha modificado el ImageMap.\n�Desea guardar las modificaciones?" ;
+    Text [ spanish ] = "Image Map se ha modificado.\n�Desea guardar las modificaciones?" ;
     Text [ french ] = "L'Image Map a �t� modifi�e.\nAppliquer les modifications ?" ;
     Text [ dutch ] = "De ImageMap is gewijzigd.\nWilt u de wijzigingen overnemen?" ;
     Text [ portuguese_brazilian ] = "Die ImageMap wurde ge?ndert.\nSollen die ?nderungen ?ernommen werden?" ;
@@ -1395,3 +1395,8 @@ String STR_IMAPDLG_MODIFY
     Text[ thai ] = "ดัดแปลงแก้ไขภาพแผนที่แล้ว\nคุณต้องการบันทึกการเปลี่ยนแปลงหรือไม่?";
 };
 /******************************************************************************/
+
+
+
+
+
diff --git a/svx/source/dialog/impgrf.src b/svx/source/dialog/impgrf.src
index c8f1458db4f4..4ee6ffd88f78 100644
--- a/svx/source/dialog/impgrf.src
+++ b/svx/source/dialog/impgrf.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: impgrf.src,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: kz $ $Date: 2001-07-13 21:59:51 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,18 +77,19 @@ String RID_SVXSTR_ALL_FILES
     Text [ danish ] = "<Alle filer>" ;
     Text [ portuguese ] = "<Ficheiros todos>" ;
     Text [ portuguese_brazilian ] = "<Alle Dateien>" ;
-    Text[ chinese_simplified ] = "<���еĸ�ʽ>";
+    Text[ chinese_simplified ] = "<所有的文件>";
     Text[ russian ] = "<��� �����>";
     Text[ polish ] = "<Wszystkie pliki>";
-    Text[ japanese ] = "<���ׂĂ�̧��>";
-    Text[ chinese_traditional ] = "<�Ҧ����榡>";
+    Text[ japanese ] = "<すべてのファイル>";
+    Text[ chinese_traditional ] = "<所有的檔案>";
     Text[ arabic ] = "<�� �������>";
     Text[ greek ] = "<��� �� ������>";
-    Text[ korean ] = "<��� ����>";
+    Text[ korean ] = "<모든 파일>";
     Text[ turkish ] = "<T�m dosyalar>";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "<Todos los archivos>";
+    Text[ catalan ] = "<Tots els fitxers>";
     Text[ finnish ] = "<Kaikki tiedostot>";
+    Text[ thai ] = "<แฟ้มทั้งหมด>";
 };
 Resource RID_SVXRES_IMPORTGRAPHIC
 {
@@ -104,20 +105,21 @@ Resource RID_SVXRES_IMPORTGRAPHIC
         Text [ danish ] = "<Alle formater>" ;
         Text [ french ] = "<Tous les formats>" ;
         Text [ swedish ] = "<Alla format>" ;
-        Text [ dutch ] = "<Alle formaten>" ;
+        Text [ dutch ] = "<Alle indelingen>" ;
         Text [ spanish ] = "<Todos los formatos>" ;
         Text [ english_us ] = "<All formats>" ;
-        Text[ chinese_simplified ] = "<���еĸ�ʽ>";
+        Text[ chinese_simplified ] = "<所有的格式>";
         Text[ russian ] = "<��� �������>";
         Text[ polish ] = "<Wszystkie formaty>";
-        Text[ japanese ] = "<���ׂĂ̏���>";
-        Text[ chinese_traditional ] = "<�Ҧ����榡>";
+        Text[ japanese ] = "<すべての書式>";
+        Text[ chinese_traditional ] = "<所有的格式>";
         Text[ arabic ] = "<�� ���������>";
         Text[ greek ] = "<���� �� ������>";
-        Text[ korean ] = "<��� ����>";
+        Text[ korean ] = "<모든 서식>";
         Text[ turkish ] = "<T�m formatlar>";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "<Todos los formatos>";
+        Text[ catalan ] = "<Tots els formats>";
+        Text[ thai ] = "<รูปแบบทั้งหมด>";
     };
     String STR_UNKNOWN_FORMAT
     {
@@ -131,20 +133,21 @@ Resource RID_SVXRES_IMPORTGRAPHIC
         Text [ danish ] = "Ukendt filformat!" ;
         Text [ french ] = "Format de fichier inconnu !" ;
         Text [ swedish ] = "Ok�nt filformat!" ;
-        Text [ dutch ] = "Onbekend bestandsformaat!" ;
+        Text [ dutch ] = "Onbekende bestandsindeling!" ;
         Text [ spanish ] = "�Formato de archivo desconocido!" ;
         Text [ english_us ] = "Unknown file format!" ;
-        Text[ chinese_simplified ] = "�ļ���ʽ����";
+        Text[ chinese_simplified ] = "文件格式不明";
         Text[ russian ] = "����������� ������ �����!";
         Text[ polish ] = "Nieznany format pliku!";
-        Text[ japanese ] = "�s����̧�ُ����B";
-        Text[ chinese_traditional ] = "�ɮ׮榡����";
+        Text[ japanese ] = "不明なファイル書式。";
+        Text[ chinese_traditional ] = "檔案格式不明";
         Text[ arabic ] = "����� ��� ��� �����!";
         Text[ greek ] = "������� ����� �������!";
-        Text[ korean ] = "�˷��� ���� ���� ���� ����!";
+        Text[ korean ] = "알 수 없는 파일 서식";
         Text[ turkish ] = "Bilinmeyen dosya format�!";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "�Formato de archivo desconocido!";
+        Text[ catalan ] = "El format del fitxer �s desconegut!";
+        Text[ thai ] = "ไม่รู้จักรูปแบบแฟ้ม!";
     };
     String STR_PATH_NOT_FOUND1
     {
@@ -154,24 +157,25 @@ Resource RID_SVXRES_IMPORTGRAPHIC
         Text [ italian ] = "La cartella '" ;
         Text [ portuguese_brazilian ] = "O diret?io" ;
         Text [ portuguese ] = "O direct�rio '" ;
-        Text [ finnish ] = "Hakemisto '" ;
+        Text [ finnish ] = "Hakemistoa" ;
         Text [ danish ] = "Biblioteket '" ;
         Text [ french ] = "Le r�pertoire '" ;
         Text [ swedish ] = "Katalogen '" ;
         Text [ dutch ] = "Map '" ;
         Text [ spanish ] = "El directorio '" ;
         Text [ english_us ] = "The directory '" ;
-        Text[ chinese_simplified ] = "���Ŀ¼ '";
+        Text[ chinese_simplified ] = "这个目录 '";
         Text[ russian ] = "������� '";
         Text[ polish ] = "Katalog";
-        Text[ japanese ] = "�ިڸ��'";
-        Text[ chinese_traditional ] = "�o�ӥؿ� '";
+        Text[ japanese ] = "ディレクトリ'";
+        Text[ chinese_traditional ] = "這個目錄<";
         Text[ arabic ] = "������ '";
         Text[ greek ] = "� ��������� '";
-        Text[ korean ] = "���丮 '";
+        Text[ korean ] = "디렉토리 '";
         Text[ turkish ] = "Dizin '";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "El directorio '";
+        Text[ catalan ] = "El directori ";
+        Text[ thai ] = "ไดเร็กทอรี่ '";
     };
     String STR_PATH_NOT_FOUND2
     {
@@ -181,24 +185,25 @@ Resource RID_SVXRES_IMPORTGRAPHIC
         Text [ italian ] = "' non esiste." ;
         Text [ portuguese_brazilian ] = "' n?o existe." ;
         Text [ portuguese ] = "' n�o existe." ;
-        Text [ finnish ] = "' ei ole" ;
+        Text [ finnish ] = "' ei ole olemassa." ;
         Text [ danish ] = "' findes ikke." ;
         Text [ french ] = "' n'existe pas." ;
         Text [ swedish ] = "' finns inte." ;
         Text [ dutch ] = "' bestaat niet." ;
         Text [ spanish ] = "' no existe." ;
         Text [ english_us ] = "' does not exist" ;
-        Text[ chinese_simplified ] = "' �����ڡ�";
-        Text[ russian ] = "' �� ����������.";
+        Text[ chinese_simplified ] = "' 不存在。";
+        Text[ russian ] = " �� ����������";
         Text[ polish ] = "nie istnieje.";
-        Text[ japanese ] = "'�͑��݂��܂���B";
-        Text[ chinese_traditional ] = "' ���s�b�C";
+        Text[ japanese ] = "'は存在しません。";
+        Text[ chinese_traditional ] = ">不存在。";
         Text[ arabic ] = "' ��� �����";
         Text[ greek ] = "' ��� �������.";
-        Text[ korean ] = "' ��(��) �����ϴ�.";
+        Text[ korean ] = "' 가(이) 없습니다.";
         Text[ turkish ] = "' mevcut de�il.";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "' no existe.";
+        Text[ catalan ] = " no existeix";
+        Text[ thai ] = "' ไม่มีอยู่";
     };
     String STR_FLT_BMP
     {
@@ -224,24 +229,25 @@ Resource RID_SVXRES_IMPORTGRAPHIC
         TEXT [ italian ] = "Impossibile aprire il file grafico" ;
         TEXT [ portuguese_brazilian ] = "N?o consigo abrir arquivo gr?fico" ;
         TEXT [ portuguese ] = "Imposs�vel abrir ficheiro gr�fico" ;
-        TEXT [ finnish ] = "Grafiikkatiedostoa ei voi avata" ;
+        TEXT [ finnish ] = "Grafiikkatiedostoa ei voi avata." ;
         TEXT [ danish ] = "Det er ikke muligt at �bne grafikfilen" ;
-        TEXT [ french ] = "Ouverture du fichier graphique impossible" ;
+        TEXT [ french ] = "Impossible d'ouvrir le fichier graphique !" ;
         TEXT [ swedish ] = "Grafikfil kan inte �ppnas" ;
         TEXT [ dutch ] = "Grafisch bestand kan niet worden geopend" ;
         TEXT [ spanish ] = "No es posible abrir el archivo gr�fico" ;
         TEXT [ english_us ] = "Graphics file cannot be opened" ;
-        TEXT[ chinese_simplified ] = "�޷���ͼ���ļ�";
+        TEXT[ chinese_simplified ] = "无法打开图形文件";
         TEXT[ russian ] = "������� ����������� ���� �� �������";
         TEXT[ polish ] = "Pliku graficznego nie mo�na otworzy�";
-        TEXT[ japanese ] = "�摜̧�ق��J���܂���B";
-        TEXT[ chinese_traditional ] = "�L�k�}�ҹϧ��ɮ�";
+        TEXT[ japanese ] = "画像ファイルを開けません。";
+        TEXT[ chinese_traditional ] = "無法開啟圖形檔案";
         TEXT[ arabic ] = "�� ���� ��� ��� ��������";
         TEXT[ greek ] = "�� ������ �������� ��� ����� ������� �� ��������";
-        TEXT[ korean ] = "�׷��������� �� �� �����ϴ�";
+        TEXT[ korean ] = "그림 파일을 열 수 없습니다.";
         TEXT[ turkish ] = "Grafik dosyas� a��lam�yor";
         TEXT[ language_user1 ] = " ";
-        TEXT[ catalan ] = "No es posible abrir el archivo gr�fico";
+        TEXT[ catalan ] = "No �s possible obrir el fitxer gr�fic";
+        TEXT[ thai ] = "ไม่สามารถเปิดแฟ้มกราฟิคได้";
     };
     String STR_GRFILTER_IOERROR
     {
@@ -251,24 +257,25 @@ Resource RID_SVXRES_IMPORTGRAPHIC
         TEXT [ italian ] = "Impossibile leggere il file grafico" ;
         TEXT [ portuguese_brazilian ] = "N?o consigo ler arquivo gr?fico" ;
         TEXT [ portuguese ] = "Imposs�vel ler ficheiro gr�fico" ;
-        TEXT [ finnish ] = "Grafiikkatiedostoa ei voi lukea" ;
+        TEXT [ finnish ] = "Grafiikkatiedostoa ei voi lukea." ;
         TEXT [ danish ] = "Det er ikke muligt at l�se grafikfilen" ;
-        TEXT [ french ] = "Lecture du fichier graphique impossible" ;
+        TEXT [ french ] = "Impossible de lire le fichier graphique !" ;
         TEXT [ swedish ] = "Grafikfil kan inte l�sas" ;
         TEXT [ dutch ] = "Grafisch bestand is onleesbaar" ;
         TEXT [ spanish ] = "No es posible leer el archivo gr�fico" ;
         TEXT [ english_us ] = "Graphics file cannot be read" ;
-        TEXT[ chinese_simplified ] = "�޷�����ͼ���ļ�";
+        TEXT[ chinese_simplified ] = "无法读出图形文件";
         TEXT[ russian ] = "��������� ����������� ���� �� �������";
         TEXT[ polish ] = "Pliku graficznego nie mo�na otworzy�";
-        TEXT[ japanese ] = "�摜̧�ق͓ǂ߂܂���B";
-        TEXT[ chinese_traditional ] = "�L�kŪ�X�ϧ��ɮ�";
+        TEXT[ japanese ] = "画像ファイルは読めません。";
+        TEXT[ chinese_traditional ] = "無法讀出圖形檔案";
         TEXT[ arabic ] = "�� ���� ����� ��� ��������";
         TEXT[ greek ] = "� �������� ��� ������� �������� ��� ����� ������";
-        TEXT[ korean ] = "�׷��������� ���� �� �����ϴ�";
+        TEXT[ korean ] = "그림 파일을 읽을 수 없습니다.";
         TEXT[ turkish ] = "Grafik dosyas� okunam�yor";
         TEXT[ language_user1 ] = " ";
-        TEXT[ catalan ] = "No es posible leer el archivo gr�fico";
+        TEXT[ catalan ] = "No �s possible llegir el fitxer gr�fic";
+        TEXT[ thai ] = "ไม่สามารถอ่านแฟ้มกราฟิคได้";
     };
     String STR_GRFILTER_FORMATERROR
     {
@@ -282,20 +289,21 @@ Resource RID_SVXRES_IMPORTGRAPHIC
         TEXT [ danish ] = "Ukendt grafikformat" ;
         TEXT [ french ] = "Format d'image inconnu" ;
         TEXT [ swedish ] = "Ok�nt grafikformat" ;
-        TEXT [ dutch ] = "Onbekend grafisch formaat" ;
+        TEXT [ dutch ] = "Onbekende grafische-bestandsindeling" ;
         TEXT [ spanish ] = "Formato de imagen desconocido" ;
         TEXT [ english_us ] = "Unknown graphics format" ;
-        TEXT[ chinese_simplified ] = "������ͼ�θ�ʽ";
+        TEXT[ chinese_simplified ] = "不明的图形格式";
         TEXT[ russian ] = "����������� ����������� ������";
         TEXT[ polish ] = "Nieznany format graficzny";
-        TEXT[ japanese ] = "�s���Ȑ}�̏���";
-        TEXT[ chinese_traditional ] = "�������ϧή榡";
+        TEXT[ japanese ] = "不明な図の書式";
+        TEXT[ chinese_traditional ] = "不明的圖形格式";
         TEXT[ arabic ] = "����� ������ ��� �����";
         TEXT[ greek ] = "������� ����� ��������";
-        TEXT[ korean ] = "�˷��� ���� ���� �׷��ȼ���";
+        TEXT[ korean ] = "알 수 없는 그림 서식";
         TEXT[ turkish ] = "Bilinmeyen grafik format�";
         TEXT[ language_user1 ] = " ";
-        TEXT[ catalan ] = "Formato de imagen desconocido";
+        TEXT[ catalan ] = "El format de la imatge �s desconegut";
+        TEXT[ thai ] = "ไม่รู้จักรูปแบบกราฟิค";
     };
     String STR_GRFILTER_VERSIONERROR
     {
@@ -305,24 +313,25 @@ Resource RID_SVXRES_IMPORTGRAPHIC
         TEXT [ italian ] = "Versione del file grafico non supportata" ;
         TEXT [ portuguese_brazilian ] = "Vers?o de arquivo gr?fico n?o suportada" ;
         TEXT [ portuguese ] = "Vers�o do ficheiro gr�fico n�o tem suporte" ;
-        TEXT [ finnish ] = "Grafiikkatiedoston versiota ei tueta" ;
+        TEXT [ finnish ] = "Grafiikkatiedoston versiota ei tueta." ;
         TEXT [ danish ] = "Grafikfilens version underst�ttes ikke" ;
         TEXT [ french ] = "Version du fichier graphique non support�e" ;
         TEXT [ swedish ] = "Grafikfilens version st�ds inte" ;
         TEXT [ dutch ] = "Deze versie van het grafisch bestand wordt niet ondersteund" ;
-        TEXT [ spanish ] = "No se apoya la versi�n del archivo gr�fico" ;
+        TEXT [ spanish ] = "No se admite la versi�n del archivo gr�fico" ;
         TEXT [ english_us ] = "Cannot support version of graphic file" ;
-        TEXT[ chinese_simplified ] = "��֧�����ͼ���ļ��汾";
+        TEXT[ chinese_simplified ] = "不支持这个图形文件版本";
         TEXT[ russian ] = "������ ������������ ����� �� ��������������";
         TEXT[ polish ] = "Wersja pliku graficznego nie b�dzie obs�ugiwana";
-        TEXT[ japanese ] = "�摜̧�ق��ް�ޮ݂���߰Ă���Ă��܂���B";
-        TEXT[ chinese_traditional ] = "������o�ӹϧ��ɮת���";
+        TEXT[ japanese ] = "画像ファイルのバージョンがサポートされていません。";
+        TEXT[ chinese_traditional ] = "不支持這個圖形檔案版本";
         TEXT[ arabic ] = "�� ��� ��� ����� ��� ��������";
         TEXT[ greek ] = "��� ������������� � ������ ����� ��� �������� �������.";
-        TEXT[ korean ] = "�׷��������� ������ �������� ����";
+        TEXT[ korean ] = "그래픽 파일의 버전이 지원되지 않습니다";
         TEXT[ turkish ] = "Grafik dosyas�n�n s�r�m� desteklenmiyor";
         TEXT[ language_user1 ] = " ";
-        TEXT[ catalan ] = "No se apoya la versi�n del archivo gr�fico";
+        TEXT[ catalan ] = "No se suporta aquesta versi� del fitxer gr�fic";
+        TEXT[ thai ] = "ไม่สนับสนุนเวอร์ชั่นของแฟ้มกราฟิค";
     };
     String STR_GRFILTER_FILTERERROR
     {
@@ -332,24 +341,25 @@ Resource RID_SVXRES_IMPORTGRAPHIC
         TEXT [ italian ] = "Filtro grafico non trovato" ;
         TEXT [ portuguese_brazilian ] = "Filtro gr?fico n?o encontrado" ;
         TEXT [ portuguese ] = "Filtro gr�fico n�o encontrado" ;
-        TEXT [ finnish ] = "Grafiikkasuodatinta ei l�ytynyt" ;
+        TEXT [ finnish ] = "Grafiikkasuodatinta ei l�ytynyt." ;
         TEXT [ danish ] = "Grafikfilter blev ikke fundet" ;
         TEXT [ french ] = "Filtre graphique introuvable" ;
         TEXT [ swedish ] = "Grafikfilter hittades inte" ;
-        TEXT [ dutch ] = "Grafische filter niet gevonden" ;
+        TEXT [ dutch ] = "Afbeeldingsfilter niet gevonden" ;
         TEXT [ spanish ] = "No se encontr� el filtro de im�genes" ;
         TEXT [ english_us ] = "Graphics filter not found" ;
-        TEXT[ chinese_simplified ] = "û���ҵ�ͼ�ι�����";
+        TEXT[ chinese_simplified ] = "没有找到图形过滤器";
         TEXT[ russian ] = "����������� ������ �� ������";
         TEXT[ polish ] = "Filtru graficznego nie znaleziono";
-        TEXT[ japanese ] = "�摜̨���͌��‚���܂���B";
-        TEXT[ chinese_traditional ] = "�S�����ϧιL�o��";
+        TEXT[ japanese ] = "画像フィルタは見つかりません。";
+        TEXT[ chinese_traditional ] = "沒有找到圖形過濾器";
         TEXT[ arabic ] = "���� ������ ��� ���� ��������";
         TEXT[ greek ] = "�� ������ �������� ��� �������";
-        TEXT[ korean ] = "�׷������͸� ã�� ������";
+        TEXT[ korean ] = "그래픽 필터를 찾지 못했습니다.";
         TEXT[ turkish ] = "Grafik filtresi bulunamad�";
         TEXT[ language_user1 ] = " ";
-        TEXT[ catalan ] = "No se encontr� el filtro de im�genes";
+        TEXT[ catalan ] = "No s'ha trobat el filtre d'imatges";
+        TEXT[ thai ] = "ไม่พบตัวกรองกราฟิค";
     };
     String STR_GRFILTER_TOOBIG
     {
@@ -359,24 +369,25 @@ Resource RID_SVXRES_IMPORTGRAPHIC
         TEXT [ italian ] = "Memoria insufficiente per inserire l'immagine" ;
         TEXT [ portuguese_brazilian ] = "Mem?ia insuficiente para inserir o gr?fico" ;
         TEXT [ portuguese ] = "Mem�ria insuficiente para inserir a imagem." ;
-        TEXT [ finnish ] = "Muisti ei riit� kuvan lis��miseen" ;
+        TEXT [ finnish ] = "Muisti ei riit� kuvan lis��miseen." ;
         TEXT [ danish ] = "Ikke tilstr�kkelig hukommelse til at inds�tte grafik" ;
         TEXT [ french ] = "M�moire insuffisante pour l'insertion de l'image" ;
         TEXT [ swedish ] = "Inte tillr�ckligt med minne f�r att infoga grafiken" ;
         TEXT [ dutch ] = "Niet genoeg geheugen voor invoegen van grafische afbeelding." ;
         TEXT [ spanish ] = "No hay suficiente memoria para insertar la imagen" ;
         TEXT [ english_us ] = "Not enough memory to insert graphic" ;
-        TEXT[ chinese_simplified ] = "�ڴ治�㣬�޷�����ͼ��";
-        TEXT[ russian ] = "������������ ������ ��� ������� �������";
+        TEXT[ chinese_simplified ] = "内存不足，无法插入图形";
+        TEXT[ russian ] = "������������ ������ ��� ������� ������������ �������";
         TEXT[ polish ] = "Brakuje pami�ci do wstawienia grafiki";
-        TEXT[ japanese ] = "�}��}������ɂ́A��ؗe�ʂ��s�\\���ł��B";
-        TEXT[ chinese_traditional ] = "�O���餣���M�L�k���J�ϧ�";
+        TEXT[ japanese ] = "図の挿入に必要なディスク空き容量がありません。";
+        TEXT[ chinese_traditional ] = "記憶體不足﹐無法插入圖形";
         TEXT[ arabic ] = "�� ���� ����� ����� ������ �����";
         TEXT[ greek ] = "��� ������� ������ ����� ��� ��� �������� ��� ��������";
-        TEXT[ korean ] = "�׷��� ������ ���� �޸𸮰� �����մϴ�";
+        TEXT[ korean ] = "메모리가 부족하여 그래픽을 삽입할 수 없습니다";
         TEXT[ turkish ] = "Grafi�in eklenmesi i�in yeterli bellek mevcut de�il";
         TEXT[ language_user1 ] = " ";
-        TEXT[ catalan ] = "No hay suficiente memoria para insertar la imagen";
+        TEXT[ catalan ] = "No hi ha prou mem�ria per poder inserir aquesta imatge";
+        TEXT[ thai ] = "หน่วยความจำไม่พอที่จะแทรกกราฟิค";
     };
     String STR_PROPERTIES
     {
@@ -386,51 +397,53 @@ Resource RID_SVXRES_IMPORTGRAPHIC
         Text [ italian ] = "~Propriet�..." ;
         Text [ portuguese_brazilian ] = "~Propriedades..." ;
         Text [ portuguese ] = "~Propriedades..." ;
-        Text [ finnish ] = "~Ominaisuudet" ;
+        Text [ finnish ] = "~Ominaisuudet..." ;
         Text [ danish ] = "Egenskaber..." ;
-        Text [ french ] = "~Propri�t�s..." ;
+        Text [ french ] = "Propri�t�s..." ;
         Text [ swedish ] = "~Egenskaper..." ;
         Text [ dutch ] = "Eigens~chappen..." ;
         Text [ spanish ] = "Prop~iedades..." ;
         Text [ english_us ] = "~Properties..." ;
-        Text[ chinese_simplified ] = "����(~P)...";
+        Text[ chinese_simplified ] = "属性(~P)...";
         Text[ russian ] = "��������...";
         Text[ polish ] = "W�a�ciwo�ci...";
-        Text[ japanese ] = "�����è(~P)...";
-        Text[ chinese_traditional ] = "�ݩ�(~P)...";
+        Text[ japanese ] = "プロパティ(~P)...";
+        Text[ chinese_traditional ] = "屬性(~P)...";
         Text[ arabic ] = "�����...";
         Text[ greek ] = "���������...";
-        Text[ korean ] = "�������(~P)...";
+        Text[ korean ] = "등록 정보(~P)...";
         Text[ turkish ] = "~�zellikler...";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Prop~iedades...";
+        Text[ catalan ] = "~Propietats...";
+        Text[ thai ] = "~คุณสมบัติ...";
     };
     String STR_HOME
     {
         Text = "~Standard" ;
         Text [ English ] = "H~ome" ;
         Text [ norwegian ] = "H~ome" ;
-        Text [ italian ] = "~Standard" ;
+        Text [ italian ] = "Standard" ;
         Text [ portuguese_brazilian ] = "C~asa" ;
         Text [ portuguese ] = "~Padr�o" ;
         Text [ finnish ] = "Vakio" ;
         Text [ danish ] = "Standard" ;
-        Text [ french ] = "~Standard" ;
+        Text [ french ] = "Standard" ;
         Text [ swedish ] = "~Standard" ;
         Text [ dutch ] = "~Standaard" ;
         Text [ spanish ] = "~Predeterminado" ;
         Text [ english_us ] = "Standard" ;
-        Text[ chinese_simplified ] = "��׼(~O)";
+        Text[ chinese_simplified ] = "标准";
         Text[ russian ] = "��������";
         Text[ polish ] = "Domy�lnie";
-        Text[ japanese ] = "�W��(~O)";
-        Text[ chinese_traditional ] = "�з�(~O)";
+        Text[ japanese ] = "標準";
+        Text[ chinese_traditional ] = "標準";
         Text[ arabic ] = "�����";
         Text[ greek ] = "����������";
-        Text[ korean ] = "�⺻";
+        Text[ korean ] = "기본";
         Text[ turkish ] = "~Standart";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Predeterminado";
+        Text[ catalan ] = "~Predeterminat";
+        Text[ thai ] = "มาตรฐาน";
     };
     String STR_LINK
     {
@@ -447,17 +460,18 @@ Resource RID_SVXRES_IMPORTGRAPHIC
         Text [ dutch ] = "~Koppelen" ;
         Text [ spanish ] = "~Vincular" ;
         Text [ english_us ] = "~Link" ;
-        Text[ chinese_simplified ] = "����(~L)";
+        Text[ chinese_simplified ] = "链接(~L)";
         Text[ russian ] = "�������";
         Text[ polish ] = "Po��cz";
-        Text[ japanese ] = "�ݸ(~L)";
-        Text[ chinese_traditional ] = "�s��(~L)";
+        Text[ japanese ] = "リンク(~L)";
+        Text[ chinese_traditional ] = "連結(~L)";
         Text[ arabic ] = "���";
         Text[ greek ] = "�������";
-        Text[ korean ] = "����(~L)";
+        Text[ korean ] = "연결(~L)";
         Text[ turkish ] = "~Ba�lant� olu�tur";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Vincular";
+        Text[ catalan ] = "~Enlla�a";
+        Text[ thai ] = "เ~ชื่อมโยง";
     };
     String STR_PREVIEW
     {
@@ -467,24 +481,25 @@ Resource RID_SVXRES_IMPORTGRAPHIC
         Text [ italian ] = "Ante~prima" ;
         Text [ portuguese_brazilian ] = "Ex~aminar" ;
         Text [ portuguese ] = "~Visualizar" ;
-        Text [ finnish ] = "~Esikatselu" ;
+        Text [ finnish ] = "Esi~katselu" ;
         Text [ danish ] = "Eksempel" ;
         Text [ french ] = "A~per�u" ;
         Text [ swedish ] = "~F�rhandsvisning" ;
         Text [ dutch ] = "~Voorbeeld" ;
         Text [ spanish ] = "~Previsualizaci�n" ;
         Text [ english_us ] = "Pr~eview" ;
-        Text[ chinese_simplified ] = "Ԥ��(~E)";
+        Text[ chinese_simplified ] = "预览(~E)";
         Text[ russian ] = "��������";
         Text[ polish ] = "Podgl�d";
-        Text[ japanese ] = "����ޭ�(~E)";
-        Text[ chinese_traditional ] = "�w��(~E)";
+        Text[ japanese ] = "プレビュー(~E)";
+        Text[ chinese_traditional ] = "預覽(~E)";
         Text[ arabic ] = "������";
         Text[ greek ] = "�������������";
-        Text[ korean ] = "�̸� ����(~E)";
+        Text[ korean ] = "미리보기(~E)";
         Text[ turkish ] = "�~nizleme";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Previsualizaci�n";
+        Text[ catalan ] = "~Previsualitzaci�";
+        Text[ thai ] = "แส~ดงตัวอย่าง";
     };
     String STR_FILTER
     {
@@ -499,18 +514,19 @@ Resource RID_SVXRES_IMPORTGRAPHIC
         Text [ danish ] = "Filter..." ;
         Text [ portuguese_brazilian ] = "~Filter..." ;
         Text [ portuguese ] = "~Filtro..." ;
-        Text[ chinese_simplified ] = "ɸѡ(~F)...";
+        Text[ chinese_simplified ] = "筛选(~F)...";
         Text[ russian ] = "������...";
         Text[ polish ] = "Filtr...";
-        Text[ japanese ] = "̨��(~F)...";
-        Text[ chinese_traditional ] = "�z��(~F)...";
+        Text[ japanese ] = "フィルタ(~F)...";
+        Text[ chinese_traditional ] = "篩選(~F)...";
         Text[ arabic ] = "����...";
         Text[ greek ] = "������...";
-        Text[ korean ] = "����(~F)...";
+        Text[ korean ] = "필터(~F)...";
         Text[ turkish ] = "Fi~ltre...";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Filtro...";
-        Text[ finnish ] = "~Suodata";
+        Text[ catalan ] = "~Filtre...";
+        Text[ finnish ] = "~Suodatus...";
+        Text[ thai ] = "~ตัวกรอง...";
     };
 };
  // ********************************************************************** EOF
@@ -518,3 +534,15 @@ Resource RID_SVXRES_IMPORTGRAPHIC
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svx/source/dialog/labdlg.src b/svx/source/dialog/labdlg.src
index 5b58d3419bfc..ecb8a413bd25 100644
--- a/svx/source/dialog/labdlg.src
+++ b/svx/source/dialog/labdlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: labdlg.src,v $
  *
- *  $Revision: 1.20 $
+ *  $Revision: 1.21 $
  *
- *  last change: $Author: kz $ $Date: 2002-11-27 17:03:27 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:00:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -371,7 +371,7 @@ TabPage RID_SVXPAGE_CAPTION
         Text [ dutch ] = "~Aansluiting" ;
         Text [ english_us ] = "~Extension" ;
         Text [ italian ] = "Inizio linea" ;
-        Text [ spanish ] = "~Salida" ;
+        Text [ spanish ] = "~Extensi�n" ;
         Text [ french ] = "~Extension" ;
         Text [ swedish ] = "F�ste" ;
         Text [ danish ] = "Tilh�ftning" ;
@@ -614,7 +614,7 @@ TabPage RID_SVXPAGE_CAPTION
         Text[ chinese_traditional ] = "數值(~B)";
         Text[ arabic ] = "������";
         Text[ greek ] = "����";
-        Text[ korean ] = "만큼(~B)";
+        Text[ korean ] = "배율(~B)";
         Text[ turkish ] = "~De�er";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Per";
@@ -821,7 +821,7 @@ TabPage RID_SVXPAGE_CAPTION
         Text[ chinese_traditional ] = "單連角形線";
         Text[ arabic ] = "�� ���� �� ����� �����";
         Text[ greek ] = "������ �������� ��� �����";
-        Text[ korean ] = "각진 선을 한번 꺾음";
+        Text[ korean ] = "구부러진 단일 연결선";
         Text[ turkish ] = "Tek a��l� �izgi";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "L�nia angular amb nom�s un angle";
@@ -848,7 +848,7 @@ TabPage RID_SVXPAGE_CAPTION
         Text[ chinese_traditional ] = "雙連角形線";
         Text[ arabic ] = "�� ����� �������";
         Text[ greek ] = "������ - 2 ������";
-        Text[ korean ] = "각진 선을 두번 꺾음";
+        Text[ korean ] = "이중 각진 선";
         Text[ turkish ] = "�ift a��l� �izgi";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "L�nia angular amb dos angles";
@@ -1004,7 +1004,7 @@ TabDialog RID_SVXDLG_CAPTION
                 Text[ chinese_traditional ] = "位置和大小";
                 Text[ arabic ] = "������ ������";
                 Text[ greek ] = "���� ��� �������";
-                Text[ korean ] = "위치와 크기";
+                Text[ korean ] = "위치 및 크기";
                 Text[ turkish ] = "Konum ve boyut";
                 Text[ language_user1 ] = " ";
                 Text[ catalan ] = "Posici�n y tama�o";
@@ -1057,3 +1057,8 @@ TabDialog RID_SVXDLG_CAPTION
 };
  // ********************************************************************** EOF
 
+
+
+
+
+
diff --git a/svx/source/dialog/language.src b/svx/source/dialog/language.src
index b7c97a130db2..599448fff93c 100644
--- a/svx/source/dialog/language.src
+++ b/svx/source/dialog/language.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: language.src,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: kz $ $Date: 2001-07-14 03:19:48 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:00 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,26 +73,36 @@ String RID_SVXSTR_LANGUAGE_ALL
     Text [ italian ] = "[Tutte]" ;
     Text [ portuguese_brazilian ] = "[Tudo]" ;
     Text [ portuguese ] = "[Todas]" ;
-    Text [ finnish ] = "All" ;
-    Text [ danish ] = "Alle" ;
+    Text [ finnish ] = "[Kaikki]" ;
+    Text [ danish ] = "[Alle]" ;
     Text [ french ] = "[Toutes]" ;
     Text [ swedish ] = "[Alla]" ;
-    Text [ dutch ] = "[Alle]  " ;
+    Text [ dutch ] = "[Alle]" ;
     Text [ spanish ] = "Todos" ;
     Text [ english_us ] = "[All]" ;
-    Text[ chinese_simplified ] = "[ȫ��]";
+    Text[ chinese_simplified ] = "[全部]";
     Text[ russian ] = "[���]";
     Text[ polish ] = "[Wszystkie]";
-    Text[ japanese ] = "[���ׂ�]";
+    Text[ japanese ] = "[すべて]";
     Text[ greek ] = "[���]";
-    Text[ korean ] = "���";
-    Text[ chinese_traditional ] = "[����]";
+    Text[ korean ] = "모두";
+    Text[ chinese_traditional ] = "[全部]";
     Text[ arabic ] = "[����]";
     Text[ turkish ] = "[T�m�]";
-    Text[ catalan ] = "Todas";
+    Text[ catalan ] = "[Tots]";
+    Text[ thai ] = "[ทั้งหมด]";
 };
 
  // ********************************************************************** EOF
 
 
 
+
+
+
+
+
+
+
+
+
diff --git a/svx/source/dialog/lingu.src b/svx/source/dialog/lingu.src
index 00aa2201ea60..f323d53fdfb7 100644
--- a/svx/source/dialog/lingu.src
+++ b/svx/source/dialog/lingu.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: lingu.src,v $
  *
- *  $Revision: 1.21 $
+ *  $Revision: 1.22 $
  *
- *  last change: $Author: kz $ $Date: 2001-07-14 03:21:01 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:00 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,21 +77,22 @@ QueryBox RID_SVXQB_THESAURUS
     MESSAGE [ finnish ] = "T�m� sana esiintyy v�ltett�vien sanojen luettelossa. Avataanko synonyymisanasto?" ;
     MESSAGE [ danish ] = "Undg� venligst dette ord! Vil du bruge synonymordbogen?" ;
     MESSAGE [ french ] = "Evitez l'utilisation de ce mot ! Lancer le dictionnaire des synonymes ?" ;
-    MESSAGE [ swedish ] = "Undvik det h�r ordet! Starta synonymordbok?" ;
+    MESSAGE [ swedish ] = "Undvik det h�r ordet! Starta synonymordlista?" ;
     MESSAGE [ dutch ] = "Dit woord is niet zo geschikt. Thesaurus starten?" ;
-    MESSAGE [ spanish ] = "�Evite por favor esta palabra! �Desea iniciar la b�squeda de sin�nimos?" ;
+    MESSAGE [ spanish ] = "�Evite esta palabra! �Desea iniciar la b�squeda de sin�nimos?" ;
     MESSAGE [ english_us ] = "This word appears in the list of words you want to avoid. Start thesaurus?" ;
-    MESSAGE[ chinese_simplified ] = "Ӧ�ñ���ʹ������֣���Ҫ�����ʵ䣿";
-    MESSAGE[ russian ] = "��� ����� ���������� ��������! ��������� ��������?";
+    MESSAGE[ chinese_simplified ] = "应该避免使用这个字！您要启动同义词词典？";
+    MESSAGE[ russian ] = "��� ����� ������� � ������ ����, ������� ���������� ��������. ��������� ��������?";
     MESSAGE[ polish ] = "Prosz� unika� tego s�owa! W��czy� Tezaurus?";
-    MESSAGE[ japanese ] = "���̒P��͔����ĉ�����!�@�ތꎫ�T���N�����܂���?";
-    MESSAGE[ chinese_traditional ] = "�z�����קK�ϥγo�Ӧr�T�n�Ұʵ���H";
+    MESSAGE[ japanese ] = "この単語の使用は避けてください。類義語辞典を開始しますか。";
+    MESSAGE[ chinese_traditional ] = "您應該避免使用這個字﹗要啟動同義詞詞典？";
     MESSAGE[ arabic ] = "��� ���� ���� ������� ��� ������! �� ���� ��� ����� ����� ��������ʿ";
     MESSAGE[ greek ] = "� ���� ���� ������ �� ����� ��� ������ �� ���������! �� ��������� � �������� ������;";
-    MESSAGE[ korean ] = "�� �ܾ�� ȸ�Ǵܾ� ��Ͽ� �ֽ��ϴ�. ���Ǿ� ������ �����ұ��?";
+    MESSAGE[ korean ] = "이 단어는 부적합 단어 목록에 있습니다. 동의어 사전을 시작할까요?";
     MESSAGE[ turkish ] = "Bu s�zc��� kullanmaktan ka��nmal�s�n�z! E� anlaml�lar s�zl��� ba�lat�ls�n m�?";
     MESSAGE[ language_user1 ] = " ";
-    MESSAGE[ catalan ] = "�Evite por favor esta palabra! �Desea iniciar la b�squeda de sin�nimos?";
+    MESSAGE[ catalan ] = "Aquesta paraula apareix a la llista de paraules que voleu evitar. Voleu iniciar el tesaurus?";
+    MESSAGE[ thai ] = "คำนี้ปรากฏในรายการคำที่คุณต้องการเลี่ยง เริ่มอรรถาภิธานหรือไม่?";
 };
 QueryBox RID_SVXQB_CONTINUE
 {
@@ -107,22 +108,23 @@ QueryBox RID_SVXQB_CONTINUE
     MESSAGE [ portuguese ] = "Deseja continuar com a verifica��o no in�cio do documento?" ;
     MESSAGE [ finnish ] = "Jatketaanko tarkistusta asiakirjan alusta?" ;
     MESSAGE [ danish ] = "Vil du forts�tte kontrollen fra dokumentets begyndelse?" ;
-    MESSAGE [ french ] = "Voulez-vous continuer la v�rification depuis le d�but du document?" ;
+    MESSAGE [ french ] = "Continuer la v�rification au d�but du document ?" ;
     MESSAGE [ swedish ] = "Forts�tta kontroll i b�rjan p� dokumentet?" ;
-    MESSAGE [ dutch ] = "Controle aan het begin van het document voortzetten ?" ;
+    MESSAGE [ dutch ] = "Controle aan het begin van het document voortzetten?" ;
     MESSAGE [ spanish ] = "�Desea continuar la revisi�n desde el inicio del documento?" ;
     MESSAGE [ english_us ] = "Continue checking at beginning of document?" ;
-    MESSAGE[ chinese_simplified ] = "���ĵ����˼�����Ѱ��";
+    MESSAGE[ chinese_simplified ] = "从文档开端继续搜寻？";
     MESSAGE[ russian ] = "���������� �������� � ������ ���������?";
     MESSAGE[ polish ] = "Kontuynuowa� sprawdzanie na pocz�tku dokumentu?";
-    MESSAGE[ japanese ] = "�޷���Ă̎n�߂ɖ߂��������𑱍s���܂����H";
-    MESSAGE[ chinese_traditional ] = "�q���_�l��m�~��j�M�H";
+    MESSAGE[ japanese ] = "ドキュメントの始めに戻ってチェックを続行しますか？";
+    MESSAGE[ chinese_traditional ] = "從文件起始位置繼續搜尋？";
     MESSAGE[ arabic ] = "�� ���� ������ ������� ��� ����� ������Ͽ";
     MESSAGE[ greek ] = "�� ���������� � ������� ��� ��� ���� ��� ��������;";
-    MESSAGE[ korean ] = "���� ó������ �˻縦 ����ұ��?";
+    MESSAGE[ korean ] = "문서 처음부터 검사를 계속하겠습니까?";
     MESSAGE[ turkish ] = "Denetlemeye, belge ba��nda devam edilsin mi?";
     MESSAGE[ language_user1 ] = " ";
-    MESSAGE[ catalan ] = "�Desea continuar la revisi�n desde el inicio del documento?";
+    MESSAGE[ catalan ] = "Voleu continuar verificant des del principi del document?";
+    MESSAGE[ thai ] = "ทำการตวรสอบต่อที่จุดเริ่มต้นเอกสารหรือไม่?";
 };
 QueryBox RID_SVXQB_BW_CONTINUE
 {
@@ -141,18 +143,19 @@ QueryBox RID_SVXQB_BW_CONTINUE
     Message [ danish ] = "Vil du forts�tte kontrollen fra dokumentets slutning?" ;
     Message [ portuguese ] = "Continuar a verifica��o no fim do documento?" ;
     Message [ portuguese_brazilian ] = "?berpr?ung am Ende des Dokumentes fortsetzen?" ;
-    Message[ chinese_simplified ] = "���ĵ�β�˼�����Ѱ��";
+    Message[ chinese_simplified ] = "从文档的结束位置继续搜寻？";
     Message[ russian ] = "���������� �������� � ����� ���������?";
     Message[ polish ] = "Kontynuowa� sprawdzanie na ko�cu dokumentu?";
-    Message[ japanese ] = "�޷���Ė��ɖ߂��������𑱍s���܂����H";
-    Message[ chinese_traditional ] = "�q�������~��j�M�H";
+    Message[ japanese ] = "ドキュメント末に戻ってチェックを続行しますか？";
+    Message[ chinese_traditional ] = "從文件的結束位置繼續搜尋？";
     Message[ arabic ] = "�� ���� ������ ������� ��� ����� ������Ͽ";
     Message[ greek ] = "�� ���������� � ������� ��� �� ����� ��� ��������;";
-    Message[ korean ] = "���� ������ �˻縦 ����ұ��?";
+    Message[ korean ] = "문서 끝에서부터 검사를 계속하겠습니까?";
     Message[ turkish ] = "Denetlemeye, belge sonunda devam edilsin mi?";
     Message[ language_user1 ] = " ";
-    Message[ catalan ] = "�Desea continuar la revisi�n al final del documento?";
+    Message[ catalan ] = "Voleu continuar verificant des del final del document?";
     Message[ finnish ] = "Jatketaanko tarkistusta asiakirjan lopusta?";
+    Message[ thai ] = "ทำการตรวจสอบต่อที่ส่วนท้ายเอกสารหรือไม่?";
 };
 QueryBox RID_SVXQB_BODYTEXT
 {
@@ -170,21 +173,22 @@ QueryBox RID_SVXQB_BODYTEXT
     MESSAGE [ finnish ] = "Haluatko tarkistaa p��tekstin?" ;
     MESSAGE [ danish ] = "Vil du kontrollere br�dteksten?" ;
     MESSAGE [ french ] = "Voulez-vous v�rifier le texte principal ?" ;
-    MESSAGE [ swedish ] = "Vill Du kontrollera huvudtexten?" ;
+    MESSAGE [ swedish ] = "Vill du kontrollera huvudtexten?" ;
     MESSAGE [ dutch ] = "Wilt u de hoofdtekst controleren?" ;
     MESSAGE [ spanish ] = "�Desea verificar el texto principal?" ;
     MESSAGE [ english_us ] = "Do you want to check the main text?" ;
-    MESSAGE[ chinese_simplified ] = "����Ҫ���������";
-    MESSAGE[ russian ] = "�� ������ ��������� �������� �����?";
+    MESSAGE[ chinese_simplified ] = "您想要检查正文吗？";
+    MESSAGE[ russian ] = "��������� �������� �����?";
     MESSAGE[ polish ] = "Czy chcesz sprawdzi� tekst g��wny?";
-    MESSAGE[ japanese ] = "Ҳ�÷�Ă��������܂����H";
-    MESSAGE[ chinese_traditional ] = "�z�Q�n�ˬd����H";
+    MESSAGE[ japanese ] = "メインテキストをチェックしますか？";
+    MESSAGE[ chinese_traditional ] = "您想要檢查內文？";
     MESSAGE[ arabic ] = "�� ���� ������� �� ���� ��������";
     MESSAGE[ greek ] = "������ �� ����� ������� ��� ������ ��������;";
-    MESSAGE[ korean ] = "�� �ؽ�Ʈ�� �˻��Ͻðڽ��ϱ�?";
+    MESSAGE[ korean ] = "주 텍스트를 검사하겠습니까?";
     MESSAGE[ turkish ] = "Ana metni denetlemek istiyor musunuz?";
     MESSAGE[ language_user1 ] = " ";
-    MESSAGE[ catalan ] = "�Desea verificar el texto principal?";
+    MESSAGE[ catalan ] = "Voleu verificar el text principal?";
+    MESSAGE[ thai ] = "คุณต้องการตรวจสอบข้อความหลักหรือไม่?";
 };
 QueryBox RID_SVXQB_SPECIAL
 {
@@ -201,21 +205,22 @@ QueryBox RID_SVXQB_SPECIAL
     MESSAGE [ finnish ] = "Tarkistetaanko erityisalueet?" ;
     MESSAGE [ danish ] = "Vil du kontrollere s�romr�derne?" ;
     MESSAGE [ french ] = "Voulez-vous v�rifier les zones sp�ciales?" ;
-    MESSAGE [ swedish ] = "Vill Du kontrollera specialomr�den?" ;
+    MESSAGE [ swedish ] = "Vill du kontrollera specialomr�den?" ;
     MESSAGE [ dutch ] = "Wilt u de speciale bereiken controleren?" ;
     MESSAGE [ spanish ] = "�Desea verificar las �reas especiales?" ;
     MESSAGE [ english_us ] = "Do you want check the special regions?" ;
-    MESSAGE[ chinese_simplified ] = "��Ҫ�������������";
+    MESSAGE[ chinese_simplified ] = "您要检查特殊区域吗？";
     MESSAGE[ russian ] = "��������� ����������� �������?";
     MESSAGE[ polish ] = "Sprawdza� obszary specjalne?";
-    MESSAGE[ japanese ] = "���ʔ͈͂��������܂����B";
-    MESSAGE[ chinese_traditional ] = "�ˬd�S���ϰ�H";
+    MESSAGE[ japanese ] = "特別範囲をチェックしますか。";
+    MESSAGE[ chinese_traditional ] = "檢查特殊區域？";
     MESSAGE[ arabic ] = "�� ���� ������� �� ������� �����ɿ";
     MESSAGE[ greek ] = "������ �� ����� ������� ��� ������� ��������;";
-    MESSAGE[ korean ] = "Ư�� ������ �˻��Ͻðڽ��ϱ�?";
+    MESSAGE[ korean ] = "특수 영역을 검사하겠습니까?";
     MESSAGE[ turkish ] = "�zel b�l�mler denetlensin mi?";
     MESSAGE[ language_user1 ] = " ";
-    MESSAGE[ catalan ] = "�Desea verificar las �reas especiales?";
+    MESSAGE[ catalan ] = "Voleu verificar les regions especials?";
+    MESSAGE[ thai ] = "คุณต้องการตรวจสอบส่วนพิเศษหรือไม่?";
 };
 QueryBox RID_SVXQB_SPECIAL_FORCED
 {
@@ -236,17 +241,18 @@ QueryBox RID_SVXQB_SPECIAL_FORCED
     MESSAGE [ dutch ] = "De functie 'Speciale bereiken controleren' is uitgeschakeld. Controle toch uitvoeren?" ;
     MESSAGE [ spanish ] = "La verificaci�n de las �reas especiales est� desactivada, �Desea verificar de todas maneras?" ;
     MESSAGE [ english_us ] = "Check special regions is deactivated. Check anyway?" ;
-    MESSAGE[ chinese_simplified ] = "�Ѿ��ر���������ļ�鹦�ܣ�������Ҫִ�м�飿";
-    MESSAGE[ russian ] = "�������� ����������� �������� ���������. ��� ����� ���������?";
+    MESSAGE[ chinese_simplified ] = "已经关闭特殊区域的检查功能，您还是要执行检查？";
+    MESSAGE[ russian ] = "�������� ����������� �������� ���������. ���������, �������� �� ���?";
     MESSAGE[ polish ] = "Sprawdzanie obszar�w specjalnych jest wy��czone. Mimo to sprawdza�?";
-    MESSAGE[ japanese ] = "���ʔ͈͂��������̂ɂȂ��Ă��܂��B����ł��������܂����B";
-    MESSAGE[ chinese_traditional ] = "�w�g�����ˬd�S���ϰ�M�z�٬O�n�����ˬd�H";
+    MESSAGE[ japanese ] = "特別範囲のチェックがオフになっています。それでもチェックしますか。";
+    MESSAGE[ chinese_traditional ] = "已經關閉檢查特殊區域﹐您還是要執行檢查？";
     MESSAGE[ arabic ] = "����� ������� ������ ��� ���. �� ���� ������� ������ �� ��߿";
     MESSAGE[ greek ] = "� ������� ������� �������� ����� �����������������. ������ �� ����� � ������� ������ ����;";
-    MESSAGE[ korean ] = "Ư������ �˻簡 ��Ȱ�������Դϴ�. �׷��� �˻��ұ��?";
+    MESSAGE[ korean ] = "특수영역 검사가 비활성 상태입니다. 그래도 검사할까요?";
     MESSAGE[ turkish ] = "�zel b�l�m denetleme etkin de�il, yine de denetlensin mi?";
     MESSAGE[ language_user1 ] = " ";
-    MESSAGE[ catalan ] = "La verificaci�n de las �reas especiales est� desactivada, �Desea verificar de todas maneras?";
+    MESSAGE[ catalan ] = "La verificaci� de les �rees especials est� desactivada, Voleu verificar de totes maneres?";
+    MESSAGE[ thai ] = "ตรวจสอบส่วนพิเศษที่ไม่ถูกใช้งาน ตรวจสอบหรือไม่?";
 };
  // Strings ---------------------------------------------------------------
 String RID_SVXSTR_HMSTATUS_OK
@@ -264,17 +270,18 @@ String RID_SVXSTR_HMSTATUS_OK
     Text [ dutch ] = "Dit woord is correct geschreven" ;
     Text [ spanish ] = "La palabra est� escrita correctamente" ;
     Text [ english_us ] = "The word is spelled correctly" ;
-    Text[ chinese_simplified ] = "����ֵ�д����ȷ";
-    Text[ russian ] = "��� ����� �������� ���������";
+    Text[ chinese_simplified ] = "这个字的写法正确";
+    Text[ russian ] = "����� �������� ���������";
     Text[ polish ] = "S�owo jest napisane poprawnie";
-    Text[ japanese ] = "���̒P��̽��ق͐��m�ł��B";
-    Text[ chinese_traditional ] = "�o�Ӧr���g�k���T";
+    Text[ japanese ] = "この単語のスペルは正確です。";
+    Text[ chinese_traditional ] = "這個字的寫法正確";
     Text[ arabic ] = "������ ������ ���� ����";
     Text[ greek ] = "� ���������� ����� �����";
-    Text[ korean ] = "�ܾ��� ������� ��Ȯ�մϴ�";
+    Text[ korean ] = "단어의 맞춤법이 정확합니다";
     Text[ turkish ] = "S�zc���n imlas� do�ru";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "La palabra est� escrita correctamente";
+    Text[ catalan ] = "La paraula est� escrita correctament";
+    Text[ thai ] = "สะกดคำถูกต้อง";
 };
 String RID_SVXSTR_HMSTATUS_DONTUSE
 {
@@ -291,17 +298,18 @@ String RID_SVXSTR_HMSTATUS_DONTUSE
     Text [ dutch ] = "Vermijd het gebruik van dit woord" ;
     Text [ spanish ] = "Deber�a evitar esta palabra" ;
     Text [ english_us ] = "Avoid using this word" ;
-    Text[ chinese_simplified ] = "��������Ҫʹ�������";
-    Text[ russian ] = "��� ����� ���������� ��������";
+    Text[ chinese_simplified ] = "建议您不要使用这个字";
+    Text[ russian ] = "�������� ������������� ����� �����";
     Text[ polish ] = "Prosz� unika� tego s�owa";
-    Text[ japanese ] = "���̒P��̎g�p�͔����Ă��������B";
-    Text[ chinese_traditional ] = "��ij�z���n�ϥγo�Ӧr";
+    Text[ japanese ] = "この単語の使用は避けてください。";
+    Text[ chinese_traditional ] = "建議您不要使用這個字";
     Text[ arabic ] = "��� ���� ���� ������� ��� ������";
     Text[ greek ] = "����� ����������� �� ���������� � ����� ����� ��� �����";
-    Text[ korean ] = "�� �ܾ� ����� ���Ͻʽÿ�";
+    Text[ korean ] = "이 단어는 가급적 사용하지 마십시오";
     Text[ turkish ] = "Bu s�zc��� kullanmaktan ka��nmal�s�n�z";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Deber�a evitar esta palabra";
+    Text[ catalan ] = "Haur�eu d'evitar aquesta paraula";
+    Text[ thai ] = "หลีกเลี่ยงการใช้คำนี้";
 };
 String RID_SVXSTR_HMSTATUS_WRONG
 {
@@ -316,19 +324,20 @@ String RID_SVXSTR_HMSTATUS_WRONG
     Text [ french ] = "Mot inconnu" ;
     Text [ swedish ] = "Ok�nt ord." ;
     Text [ dutch ] = "Onbekend woord." ;
-    Text [ spanish ] = "Palabra desconocida." ;
+    Text [ spanish ] = "Palabra desconocida" ;
     Text [ english_us ] = "Unknown word." ;
-    Text[ chinese_simplified ] = "����ֲ�����";
-    Text[ russian ] = "��� ����� ���������.";
+    Text[ chinese_simplified ] = "这个字不明。";
+    Text[ russian ] = "����������� �����.";
     Text[ polish ] = "Nieznane s�owo.";
-    Text[ japanese ] = "���̒P��͕s���ł��B";
-    Text[ chinese_traditional ] = "�o�Ӧr�����C";
+    Text[ japanese ] = "この単語は不明です。";
+    Text[ chinese_traditional ] = "這個字不明。";
     Text[ arabic ] = "������ ��� ������.";
     Text[ greek ] = "� ���� ����� �������.";
-    Text[ korean ] = "�˷��� ���� ���� �ܾ��Դϴ�.";
+    Text[ korean ] = "알 수 없는 단어입니다.";
     Text[ turkish ] = "S�zc�k bilinmiyor.";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Palabra desconocida.";
+    Text[ language_user1 ] = "Der Punkt am Ende des Satzes sieht im Dialog nicht sehr sch�n aus (jcm)";
+    Text[ catalan ] = "Paraula desconeguda.";
+    Text[ thai ] = "คำที่ไม่รู้จัก";
 };
 String RID_SVXSTR_HMSTATUS_CAPERROR
 {
@@ -344,20 +353,21 @@ String RID_SVXSTR_HMSTATUS_CAPERROR
     Text [ danish ] = "Retskrivningsfejl store/sm� bogstaver" ;
     Text [ french ] = "Erreur majuscule/minuscule" ;
     Text [ swedish ] = "Fel anv�ndning av versaler" ;
-    Text [ dutch ] = "Fout bij gebruik hoofdletter/kleine letters" ;
+    Text [ dutch ] = "Fout bij gebruik hoofdletters/kleine letters" ;
     Text [ spanish ] = "Error de may�sculas/min�sculas" ;
     Text [ english_us ] = "Capitalization error" ;
-    Text[ chinese_simplified ] = "��ĸ��Сд - ����";
-    Text[ russian ] = "������ � ��������� ��������� � �������� ����";
+    Text[ chinese_simplified ] = "字母大小写 - 错误";
+    Text[ russian ] = "������ ��������� ��������� � �������� ����";
     Text[ polish ] = "B��dy w pisowni du�ych i ma�ych liter";
-    Text[ japanese ] = "�啶��/�������̴װ";
-    Text[ chinese_traditional ] = "�r���j�p�g���~";
+    Text[ japanese ] = "大文字と小文字のエラー";
+    Text[ chinese_traditional ] = "字母大小寫錯誤";
     Text[ arabic ] = "��� �� ������� ����� �����/�����";
     Text[ greek ] = "������ ������ (����-��������)";
-    Text[ korean ] = "��/�ҹ��� ����";
+    Text[ korean ] = "대/소문자 오류";
     Text[ turkish ] = "B�y�k /k���k harf hatas�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Error de may�sculas/min�sculas";
+    Text[ catalan ] = "Error de maj�scules/min�scules";
+    Text[ thai ] = "ทำให้เป็นตัวพิมพ์ใหญ่ผิดพลาด";
 };
 String RID_SVXSTR_HMSTATUS_INVALID_LANG
 {
@@ -369,20 +379,21 @@ String RID_SVXSTR_HMSTATUS_INVALID_LANG
     Text[ greek ] = "� ������ ��� �������������";
     Text[ dutch ] = "Taal wordt niet ondersteund";
     Text[ french ] = "Cette langue n'est pas support�e";
-    Text[ spanish ] = "No se apoya este idioma";
+    Text[ spanish ] = "No se admite este idioma";
     Text[ italian ] = "La lingua non viene supportata";
     Text[ danish ] = "Sproget underst�ttes ikke";
     Text[ swedish ] = "Spr�ket g�r inte att anv�nda";
     Text[ polish ] = "J�zyk nie jest obs�ugiwany";
     Text[ portuguese_brazilian ] = "Language is not supported";
-    Text[ japanese ] = "����͎x������܂���";
-    Text[ korean ] = "�� �������� ����";
-    Text[ chinese_simplified ] = "��֧�����Թ���";
-    Text[ chinese_traditional ] = "�y�������䴩";
+    Text[ japanese ] = "言語は支援されません";
+    Text[ korean ] = "언어가 지원되지 않음";
+    Text[ chinese_simplified ] = "不支持语言功能";
+    Text[ chinese_traditional ] = "語言不受支援";
     Text[ arabic ] = "�� ��� ��� ��� �����";
     Text[ turkish ] = "Dil desteklenmiyor.";
-    Text[ catalan ] = "No se apoya este idioma";
+    Text[ catalan ] = "Aquest idioma no se suporta";
     Text[ finnish ] = "Kielt� ei tueta";
+    Text[ thai ] = "ไม่สนับสนุนภาษา";
 };
 String RID_SVXSTR_HMERR_CHECKINSTALL
 {
@@ -397,21 +408,22 @@ String RID_SVXSTR_HMERR_CHECKINSTALL
     TEXT [ finnish ] = "ei ole k�ytett�viss� oikeinkirjoituksen tarkistusta varten\nTarkista asennetut osat ja asenna haluttu kieli\n" ;
     TEXT [ danish ] = "st�r ikke til r�dighed for stavekontrollen.\nKontroller venligst din installation og installer i\ngivet fald det �nskede sprog" ;
     TEXT [ french ] = "n'est pas disponible pour la v�rification. Veuillez v�rifier l'installation et installer, le cas �ch�ant, la langue souhait�e" ;
-    TEXT [ swedish ] = "�r inte tillg�nglig f�r stavningskontroll\nKontrollera Din installation och installera\neventuellt �nskat spr�k" ;
+    TEXT [ swedish ] = " �r inte tillg�nglig f�r stavningskontroll\nKontrollera din installation och installera\neventuellt �nskat spr�k" ;
     TEXT [ dutch ] = "is niet beschikbaar voor spellingcontrole\nControleer uw installatie en installeer\neventueel de gewenste taal." ;
     TEXT [ spanish ] = "no est� disponible para la revisi�n ortogr�fica.\nRevise su instalaci�n e instale,\nsi es necesario, el idioma deseado" ;
     TEXT [ english_us ] = "is not available for spellchecking\nPlease check your installation and install the desired language\n" ;
-    TEXT[ chinese_simplified ] = " �޷��ṩƴд��鹦�ܡ����鰲װ�ij������б�Ҫ��������װҪʹ�õ����԰汾��";
-    TEXT[ russian ] = "��� �������� ����������. \n���������, ����������, ���� ����������� � � ������ �������������\n������������ �������� ����";
+    TEXT[ chinese_simplified ] = " 无法提供拼写检查功能。请检查安装的程序，如有必要，请您安装要使用的语言版本。";
+    TEXT[ russian ] = "���������� ��� �������� ����������\n��������� ��������� �, � ������ �������������,\n���������� ��������� ����";
     TEXT[ polish ] = "jest niedost�pne do sprawdzania. \nProsz� sprawdzi� instalacj� i zainstalowa� \n ewentualnie potrzebny j�zyk.";
-    TEXT[ japanese ] = "�ͽ��������Ɏg�p�ł��܂���B\n��۸��т̲ݽİق���������\n�ꍇ�ɂ���Ă͂���]�̌����ݽİق��Ă��������B";
-    TEXT[ chinese_traditional ] = " �L�k���ѫ��g�ˬd�\\��C\n���ˬd�w�˪��{���M�Y�����n�M\n�бz�w�˭n�ϥΪ��y�������C";
+    TEXT[ japanese ] = "はスペルチェックに使用できません。\nプログラムのインストールをチェックして\n必要ならばその言語をインストールしてください。";
+    TEXT[ chinese_traditional ] = " 無法提供拼寫檢查功能。\n請檢查安裝的程式﹐若有必要﹐\n請您安裝要使用的語言版本。";
     TEXT[ arabic ] = "��� ������ ������� ��������. \n������ ��� ������� ����� �ߡ ������ ����� �������ɡ ��� ��� �����";
     TEXT[ greek ] = "��� ����� ���������� ��� ��� ������. \n�������� ������� ��� ����������� ���, �� ���������, \n��������� ��� ����������� ��� ������� ��� �����? ";
-    TEXT[ korean ] = " ����� �˻縦 �̿��� �� �����ϴ�. \n ������� ��ġ ���¸� ������ ����, \n�ʿ�� �䱸�Ǵ� �� ��ġ�Ͻʽÿ�.";
+    TEXT[ korean ] = " 맞춤법 검사를 사용할 수 없습니다. \n 사용자의 설치 상태를 점검한 다음\n필요할 경우 사용할 언어를 설치하십시오.";
     TEXT[ turkish ] = "denetlenemiyor. \nKurulumunuzu kontrol edip gerekirse\nistenen dili y�kleyin.";
     TEXT[ language_user1 ] = " ";
-    TEXT[ catalan ] = "no est� disponible para la revisi�n ortogr�fica.\nRevise su instalaci�n e instale,\nsi es necesario, el idioma deseado";
+    TEXT[ catalan ] = "no est� disponible per fer la revisi� ortogr�fica.\nReviseu la instal.laci� i instal.leu,\nsi �s necessari, l'idioma desitjat.";
+    TEXT[ thai ] = "ใช้ไม่ได้สำหรับการตรวจสอบการสะกด\nกรุณาตรวจสอบการติดตั้งของคุณและติดตั้งภาษา\nที่ต้องการ";
 };
 String RID_SVXSTR_HMERR_ADDWORD
 {
@@ -426,21 +438,22 @@ String RID_SVXSTR_HMERR_ADDWORD
     Text [ finnish ] = "Sanaa ei voitu lis�t� sanastoon" ;
     Text [ danish ] = "Det var ikke muligt at tilf�je dette ord til ordbogen." ;
     Text [ french ] = "Impossible d'ajouter ce mot au dictionnaire" ;
-    Text [ swedish ] = "Det gick inte att l�gga in ordet i ordboken." ;
+    Text [ swedish ] = "Det gick inte att l�gga in ordet i ordlistan." ;
     Text [ dutch ] = "Woord kan niet in woordenboek worden opgenomen" ;
     Text [ spanish ] = "No se pudo a�adir la palabra al diccionario." ;
     Text [ english_us ] = "The word could not be added to dictionary" ;
-    Text[ chinese_simplified ] = "�޷���¼����֡�";
-    Text[ russian ] = "�������� ��� ����� � ������� ����������.";
+    Text[ chinese_simplified ] = "无法收录这个字。";
+    Text[ russian ] = "���������� �������� ����� � �������";
     Text[ polish ] = "To s�owo nie mog�o zosta� wpisane do s�ownika.";
-    Text[ japanese ] = "���̒P��͎����ɉ������܂���B";
-    Text[ chinese_traditional ] = "�L�k�����o�Ӧr�C";
+    Text[ japanese ] = "この単語は辞書に加えられません。";
+    Text[ chinese_traditional ] = "無法收錄這個字。";
     Text[ arabic ] = "���� ����� ������ ��� �������.";
     Text[ greek ] = "��� ���� ������� �� ����������� � ���� ��� ������";
-    Text[ korean ] = "�ܾ ������ �߰����� ���߽��ϴ�.";
+    Text[ korean ] = "단어를 사전에 추가하지 못했습니다.";
     Text[ turkish ] = "S�zc�k, s�zl��e eklenemedi.";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "No se pudo a�adir la palabra al diccionario.";
+    Text[ catalan ] = "La paraula no s'ha pogut afegir al diccionari";
+    Text[ thai ] = "ไม่สามารถเพิ่มคำในพจนานุกรมได้";
 };
 String RID_SVXSTR_HMERR_HYPH
 {
@@ -459,17 +472,18 @@ String RID_SVXSTR_HMERR_HYPH
     TEXT [ dutch ] = "Afbrekingshulp is niet beschikbaar" ;
     TEXT [ spanish ] = "No est� disponible la separaci�n sil�bica" ;
     TEXT [ english_us ] = "Hyphenation not available" ;
-    TEXT[ chinese_simplified ] = "���ַ�������";
-    TEXT[ russian ] = "������ � ����������� ��������� ����������";
+    TEXT[ chinese_simplified ] = "连字符不存在";
+    TEXT[ russian ] = "���������� ����������� ���������";
     TEXT[ polish ] = "Dzielenie wyraz�w nie jest mo�liwe";
-    TEXT[ japanese ] = "ʲ�Ȱ��݂��g�p�ł��܂���B";
-    TEXT[ chinese_traditional ] = "�s�r�Ť��s�b";
+    TEXT[ japanese ] = "ハイフネーションが使用できません。";
+    TEXT[ chinese_traditional ] = "連字符不存在";
     TEXT[ arabic ] = "������ ��� ������� ��� ������";
     TEXT[ greek ] = "� ������� ����������� ��� ����� ���������";
-    TEXT[ korean ] = "������ ��� �Ұ���";
+    TEXT[ korean ] = "하이픈 사용 불가능";
     TEXT[ turkish ] = "Heceleme kullan�lam�yor";
     TEXT[ language_user1 ] = " ";
-    TEXT[ catalan ] = "No est� disponible la separaci�n sil�bica";
+    TEXT[ catalan ] = "No est� disponible la separaci� per s�l.labes";
+    TEXT[ thai ] = "ใช้ยัติภังค์ไม่ได้";
 };
 String RID_SVXSTR_HMERR_THESAURUS
 {
@@ -484,21 +498,22 @@ String RID_SVXSTR_HMERR_THESAURUS
     TEXT [ finnish ] = "Valitulle kielelle ei ole k�ytett�viss� synonyymisanastoa. \nTarkista asennetut osat ja asenna haluttu kieli\n" ;
     TEXT [ danish ] = "Synonymordbogen st�r ikke til r�dighed for det angivne sprog.\nKontroller venligst din installation og installer i\ngivet fald det �nskede sprog" ;
     TEXT [ french ] = "Aucun dictionnaire des synonymes n'est disponible pour la langue s�lectionn�e.\nVeuillez v�rifiez l'installation et installer\nle cas �ch�ant la langue concern�e." ;
-    TEXT [ swedish ] = "Ingen synonymordbok �r tillg�nglig f�r det inst�llda spr�ket. \nKontrollera Din installation och installera\neventuellt �nskat spr�k." ;
+    TEXT [ swedish ] = "Ingen synonymordlista �r tillg�nglig f�r det inst�llda spr�ket. \nKontrollera din installation och installera\neventuellt �nskat spr�k." ;
     TEXT [ dutch ] = "Voor de ingestelde taal is geen Thesaurus beschikbaar. \nControleer uw installatie en\ninstalleer eventueel de gewenste taal." ;
     TEXT [ spanish ] = "No existe un diccionario de sin�nimos para el idioma seleccionado. \nCompruebe por favor su instalaci�n\n e instale, si es necesario, el idioma deseado" ;
     TEXT [ english_us ] = "No thesaurus is available for the selected language. \nPlease check your installation and install the desired language\n" ;
-    TEXT[ chinese_simplified ] = "���趨������û�и��Ӵʵ书�ܡ�\n�������İ�װ����\n���б�Ҫ��������װҪʹ�õ����԰汾��";
-    TEXT[ russian ] = "�������� ��� ���������� ����� �� ��������. \n���������, ����������, ���� ����������� � � ������ �������������\n������������� �������� ����";
+    TEXT[ chinese_simplified ] = "您设定的语言没有附加同义词词典功能。\n请您检查的安装程序。\n如有必要，请您安装要使用的语言版本。";
+    TEXT[ russian ] = "�� �������� �������� ��� ���������� �����. \n��������� ��������� �, � ������ �������������,\n���������� ��������� ����";
     TEXT[ polish ] = "Tezaurus jest niedost�pny dla wybranego j�zyka. \nProsz� sprawdzi� instalacj� i zainstalowa� \newentualnie potrzebny j�zyk.";
-    TEXT[ japanese ] = "�I����������ŗތꎫ�T�͎g�p�ł��܂���B\n��۸��т̲ݽİق��������āA\n�K�v�Ȃ�΁A��]�̌����ݽİق��Ă��������B";
-    TEXT[ chinese_traditional ] = "�z�]�w���y�������S�����[����\\��C\n�бz�ˬd�w�˪��{���C\n�Y�����n�M�бz�w�˭n�ϥΪ��y�������C";
+    TEXT[ japanese ] = "選択した言語で類語辞典は使用できません。\nプログラムのインストールをチェックして、\n必要ならば、希望の言語をインストールしてください。";
+    TEXT[ chinese_traditional ] = "您設定的語言版本沒有附加同義詞詞典功能。\n請您檢查安裝的程式。\n若有必要﹐請您安裝要使用的語言版本。";
     TEXT[ arabic ] = "�� ���� ����� ������� ���� ���� �� �������. \n������ ��� ������� ����� �ߡ\n�� ������ ����� ����� �������ɡ ��� ��� �����";
     TEXT[ greek ] = "��� ������� ���������� �������� ������ ��� ��� ���������� \n������. �������� ������� ��� ����������� ���, �� ���������,\n ��������� ��� ���� ";
-    TEXT[ korean ] = "������ �� ���� ���Ǿ������ ����� �� �����ϴ�. \n��ġ ���¸� ������ ���� \n�ʿ��ϴٸ� ���ϴ� �� ��ġ�Ͻʽÿ�.";
+    TEXT[ korean ] = "설정된 언어에 대한 동의어 사전을 사용할 수 없습니다. \n설치 상태를 점검한 다음 \n필요할 경우 사용할 언어를 설치하십시오.";
     TEXT[ turkish ] = "Ayarlanan dil i�in e� anlaml�lar s�zl��� mevcut de�il. \nKurulumunuzu kontrol edip gerekirse\nistenen dili y�kleyin.";
     TEXT[ language_user1 ] = " ";
-    TEXT[ catalan ] = "No existe un diccionario de sin�nimos para el idioma seleccionado. \nCompruebe por favor su instalaci�n\n e instale, si es necesario, el idioma deseado";
+    TEXT[ catalan ] = "No hi ha cap diccionari de sin�nims per aquest idioma.\nComproveu la instal.laci�\ni instal.leu, si �s necessari, l'idioma desitjat.";
+    TEXT[ thai ] = "ไม่มีอรรถาภิธานที่ใช้ได้สำหรับภาษาที่เลือก \nกรุณาตรวจสอบการติดตั้งของคุณและติดตั้งภาษา\nที่ต้องการ";
 };
 String RID_SVXSTR_DIC_ERR_UNKNOWN
 {
@@ -506,24 +521,25 @@ String RID_SVXSTR_DIC_ERR_UNKNOWN
     Text [ ENGLISH ] = "Failed to add word to dictionary\n for an unknown reason." ;
     Text[ english_us ] = "Word cannot be added to dictionary\ndue to unknown reason.";
     Text[ portuguese ] = "Foi imposs�vel adicionar a palavra ao\ndicion�rio por raz�es desconhecidas.";
-    Text[ russian ] = "�� ����������� �������� �������\n��� ����� � ������� ����������.";
+    Text[ russian ] = "���������� �������� � ������� \n�� ����������� ��������.";
     Text[ greek ] = "��� ���� ������� �� �������� � ���� ��� ������\n for an unknown reason.";
-    Text[ dutch ] = "Om onbekende redenen kon het woord\nniet worden opgenomen in het woordenboek.";
+    Text[ dutch ] = "Om onbekende redenen kan het woord\nniet worden opgenomen in het woordenboek.";
     Text[ french ] = "Pour une raison inconnue,\n il a �t� impossible d'ins�rer le mot dans le dictionnaire.";
     Text[ spanish ] = "No se puede recoger en el diccionario la\npalabra debido a una raz�n desconocida.";
     Text[ italian ] = "Non � stato possibile inserire la parola nel dizionario.\nErrore sconosciuto.";
     Text[ danish ] = "Det var af en ukendt grund ikke muligt\nat tilf�je ordet til ordbogen.";
-    Text[ swedish ] = "Ordet kunde av ok�nd anledning\ninte tas upp i ordboken.";
+    Text[ swedish ] = "Ordet kunde av ok�nd anledning\ninte tas upp i ordlistan.";
     Text[ polish ] = "Z nieznanej przyczyny\nwyrazu nie mo�na by�o przej�� do s�ownika.";
     Text[ portuguese_brazilian ] = "Failed to add word to dictionary\n for an unknown reason.";
-    Text[ japanese ] = "�P��͌������s���Ȃ܂�\n�����ɒlj��ł��܂���ł����B";
-    Text[ korean ] = "�� �ܾ�� �˷����� ���� ������ ����\n������ �߰��� �� �������ϴ�.";
-    Text[ chinese_simplified ] = "������޷����ӵ��ʵ���ȥ,ԭ������";
-    Text[ chinese_traditional ] = "�r��L�k�����o�Ӧr�A��]�����C";
+    Text[ japanese ] = "単語は原因が不明なまま\n辞書に追加できませんでした。";
+    Text[ korean ] = "알 수 없는 단어이므로\n사전에 추가하지 못했습니다.";
+    Text[ chinese_simplified ] = "这个字无法添加到词典中去,原因不明。";
+    Text[ chinese_traditional ] = "字典無法收錄這個字，原因不明。";
     Text[ arabic ] = "���� ����� ������ ��� �������\n���� ��� �����.";
     Text[ turkish ] = "S�zc�k bilinmeyen bir nedenden dolay�\ns�zl��e eklenemedi.";
-    Text[ catalan ] = "No se puede recoger en el diccionario la\npalabra debido a una raz�n desconocida.";
+    Text[ catalan ] = "No es pot recollir en el diccionari la\nparaula degut a un error desconegut.";
     Text[ finnish ] = "Sanan lis��minen sanastoon ei onnistu\ntuntemattoman virheen vuoksi.";
+    Text[ thai ] = "ไม่สามารถเพิ่มคำในพจนานุกรมได้\nเนื่องจากเหตุผลที่ไม่รู้จัก";
 };
 String RID_SVXSTR_DIC_ERR_FULL
 {
@@ -531,24 +547,25 @@ String RID_SVXSTR_DIC_ERR_FULL
     Text [ ENGLISH ] = "The dictionary is already full." ;
     Text[ english_us ] = "The dictionary is already full.";
     Text[ portuguese ] = "O dicion�rio j� est� cheio!";
-    Text[ russian ] = "���� ������� ��� ��������.";
+    Text[ russian ] = "������� ��� ��������.";
     Text[ greek ] = "��� ������� ����� ��� ������� ��� ������.";
     Text[ dutch ] = "Woordenboek is vol";
     Text[ french ] = "Le dictionnaire est plein !";
     Text[ spanish ] = "El diccionario est� lleno.";
     Text[ italian ] = "Il dizionario � pino.";
     Text[ danish ] = "Ordbogen er allerede fuld.";
-    Text[ swedish ] = "Ordboken �r redan full.";
+    Text[ swedish ] = "Ordlistan �r redan full.";
     Text[ polish ] = "S�ownik jest przepe�niony.";
     Text[ portuguese_brazilian ] = "The dictionary is already full.";
-    Text[ japanese ] = "�����͂��łɂ����ς��ł��B";
-    Text[ korean ] = "������ �̹� �� �� �ֽ��ϴ�.";
-    Text[ chinese_simplified ] = "�ʵ�������";
-    Text[ chinese_traditional ] = "�r��w���C";
+    Text[ japanese ] = "辞書はすでにいっぱいです。";
+    Text[ korean ] = "사전이 이미 다 찼습니다.";
+    Text[ chinese_simplified ] = "词典已满。";
+    Text[ chinese_traditional ] = "字典已滿。";
     Text[ arabic ] = "������� ����� ������.";
     Text[ turkish ] = "S�zl�k doldu.";
-    Text[ catalan ] = "El diccionario est� lleno.";
+    Text[ catalan ] = "El diccionari est� ple.";
     Text[ finnish ] = "Sanasto on jo t�ynn�.";
+    Text[ thai ] = "พจนานุกรมเต็มแล้ว";
 };
 String RID_SVXSTR_DIC_ERR_READONLY
 {
@@ -556,24 +573,25 @@ String RID_SVXSTR_DIC_ERR_READONLY
     Text [ ENGLISH ] = "The dictionary is readonly." ;
     Text[ english_us ] = "The dictionary is read-only.";
     Text[ portuguese ] = "O dicion�rio � s� de leitura.";
-    Text[ russian ] = "���� ������� ������������ ������ ��� ������.";
+    Text[ russian ] = "������� ������ ��� ������.";
     Text[ greek ] = "�� ������ ����� ���� ��� ��������.";
-    Text[ dutch ] = "Woordenboek is schrijfbeveiligd.";
+    Text[ dutch ] = "Woordenboek is alleen-lezen.";
     Text[ french ] = "Le dictionnaire est en lecture seule !";
     Text[ spanish ] = "El diccionario es solo de lectura.";
     Text[ italian ] = "Il dizionario � a sola lettura.";
     Text[ danish ] = "Ordbogen er skrivebeskyttet.";
-    Text[ swedish ] = "Ordboken �r skrivskyddad.";
+    Text[ swedish ] = "Ordlistan �r skrivskyddad.";
     Text[ polish ] = "S�ownik jest tylko do odczytu.";
     Text[ portuguese_brazilian ] = "The dictionary is readonly.";
-    Text[ japanese ] = "�����͓ǂݎ���p�ł��B";
-    Text[ korean ] = "������ �б������Դϴ�.";
-    Text[ chinese_simplified ] = "����ʵ��Ƿ���д��(ֻ����ȡ)��";
-    Text[ chinese_traditional ] = "�r��O��Ū���C";
+    Text[ japanese ] = "辞書は読み取り専用です。";
+    Text[ korean ] = "사전이 읽기 전용입니다.";
+    Text[ chinese_simplified ] = "这个词典是防改写的。";
+    Text[ chinese_traditional ] = "字典是唯讀的。";
     Text[ arabic ] = "������� ���� �� �������.";
     Text[ turkish ] = "S�zl�k yazmaya kar�� korumal�d�r.";
-    Text[ catalan ] = "El diccionario es solo de lectura.";
+    Text[ catalan ] = "El diccionari �s de nom�s lectura.";
     Text[ finnish ] = "Sanasto on vain luku -muotoa.";
+    Text[ thai ] = "พจนานุกรมเป็นแบบอ่านได้อย่างเดียว";
 };
 
  // ********************************************************************** EOF
@@ -582,3 +600,20 @@ String RID_SVXSTR_DIC_ERR_READONLY
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svx/source/dialog/measure.src b/svx/source/dialog/measure.src
index 06b542584522..2b438224b790 100644
--- a/svx/source/dialog/measure.src
+++ b/svx/source/dialog/measure.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: measure.src,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: cl $ $Date: 2002-10-09 15:49:04 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -93,22 +93,23 @@ TabPage RID_SVXPAGE_MEASURE
         Text[ portuguese ] = "Linha";
         Text[ russian ] = "�����";
         Text[ greek ] = "Line";
-        Text[ dutch ] = "Line";
+        Text[ dutch ] = "Lijn";
         Text[ french ] = "Ligne";
         Text[ spanish ] = "L�nea";
-        Text[ finnish ] = "Line";
+        Text[ finnish ] = "Viiva";
         Text[ italian ] = "Linea";
-        Text[ danish ] = "Line";
+        Text[ danish ] = "Linje";
         Text[ swedish ] = "Linje";
         Text[ polish ] = "Lina";
         Text[ portuguese_brazilian ] = "Line";
-        Text[ japanese ] = "��";
-        Text[ korean ] = "��";
-        Text[ chinese_simplified ] = "����";
-        Text[ chinese_traditional ] = "�u��";
+        Text[ japanese ] = "線";
+        Text[ korean ] = "선";
+        Text[ chinese_simplified ] = "线条";
+        Text[ chinese_traditional ] = "線條";
         Text[ turkish ] = "Line";
         Text[ arabic ] = "Line";
-        Text[ catalan ] = "Line";
+        Text[ catalan ] = "L�nia";
+        Text[ thai ] = "บรรทัด";
     };
     FixedText FT_LINE_DIST
     {
@@ -125,18 +126,19 @@ TabPage RID_SVXPAGE_MEASURE
         Text [ danish ] = "Linjeafstand" ;
         Text [ portuguese_brazilian ] = "L~iniendistanz" ;
         Text [ portuguese ] = "~Espa�o entre linhas" ;
-        Text[ chinese_simplified ] = "�������(~D)";
-        Text[ russian ] = "���������� ����� �������";
+        Text[ chinese_simplified ] = "线条间隔(~D)";
+        Text[ russian ] = "������~���� �� �����";
         Text[ polish ] = "Odleg�o�� linii pomocniczych";
-        Text[ japanese ] = "���̊Ԋu(~D)";
-        Text[ chinese_traditional ] = "�u�����j(~D)";
+        Text[ japanese ] = "線の間隔(~D)";
+        Text[ chinese_traditional ] = "線條間隔(~D)";
         Text[ arabic ] = "���� ����";
         Text[ greek ] = "�������� ������ �������";
-        Text[ korean ] = "�� ����(~D)";
+        Text[ korean ] = "선 간격(~D)";
         Text[ turkish ] = "~Nesneye uzakl�k";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "D~istancia entre l�neas";
-        Text[ finnish ] = "~Rivien et�isyys";
+        Text[ catalan ] = "D~ist�ncia entre l�nies";
+        Text[ finnish ] = "Janan et�isyys kohteesta";
+        Text[ thai ] = "~ระยะบรรทัด";
     };
     MetricField MTR_LINE_DIST
     {
@@ -166,21 +168,22 @@ TabPage RID_SVXPAGE_MEASURE
         Text [ french ] = "D~�passement des rep�res" ;
         Text [ dutch ] = "Hulplijn ~overhangend" ;
         Text [ swedish ] = "Hj�lplinje~�verh�ng" ;
-        Text [ danish ] = "Hj�lpelinjeoverh�ng" ;
+        Text [ danish ] = "H~j�lpelinjeoverh�ng" ;
         Text [ portuguese_brazilian ] = "Hilfslinien~?erhang" ;
         Text [ portuguese ] = "Linhas auxiliares real�adas" ;
-        Text[ chinese_simplified ] = "�������ӳ�(~O)";
-        Text[ russian ] = "������ ������������ �����";
+        Text[ chinese_simplified ] = "辅助线延长(~O)";
+        Text[ russian ] = "�~�����";
         Text[ polish ] = "Nawis linii pomocniczych";
-        Text[ japanese ] = "�⏕���̒���o��(~O)";
-        Text[ chinese_traditional ] = "���U�u����(~O)";
+        Text[ japanese ] = "補助線の張り出し(~O)";
+        Text[ chinese_traditional ] = "輔助線延長(~O)";
         Text[ arabic ] = "������� �� ���� ��������";
         Text[ greek ] = "����~���� ���������� �������";
-        Text[ korean ] = "�ȳ��� ����(~O)";
+        Text[ korean ] = "안내선 돌출(~O)";
         Text[ turkish ] = "K�lavuz �izgi ~ta�mas�";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Gu�as ~sobresalientes";
-        Text[ finnish ] = "~Ohjain yl�puolella";
+        Text[ catalan ] = "Guia ~sobresortint";
+        Text[ finnish ] = "Jananp��n yl�ulkonema";
+        Text[ thai ] = "คำแนะนำที่~ยื่นออกมา";
     };
     MetricField MTR_FLD_HELPLINE_OVERHANG
     {
@@ -210,21 +213,22 @@ TabPage RID_SVXPAGE_MEASURE
         Text [ french ] = "~�cart des rep�res" ;
         Text [ dutch ] = "Afstand ~hulplijnen" ;
         Text [ swedish ] = "Hj�lplinjeavst�n~d" ;
-        Text [ danish ] = "Hj�lpelinjeafstand" ;
+        Text [ danish ] = "Hj�lpelinjea~fstand" ;
         Text [ portuguese_brazilian ] = "Hilfslinien~distanz" ;
         Text [ portuguese ] = "Esp. entre linhas auxiliares" ;
-        Text[ chinese_simplified ] = "�����߼��(~G)";
-        Text[ russian ] = "���������� ����� ������������� �������";
+        Text[ chinese_simplified ] = "辅助线间隔(~G)";
+        Text[ russian ] = "�� ����������";
         Text[ polish ] = "Odleg�o�� linii pomocniczych";
-        Text[ japanese ] = "�⏕���̋���(~G)";
-        Text[ chinese_traditional ] = "���U�u���j(~G)";
+        Text[ japanese ] = "補助線の距離(~G)";
+        Text[ chinese_traditional ] = "輔助線間隔(~G)";
         Text[ arabic ] = "���� ���� ��������";
         Text[ greek ] = "�������� ���������� �������";
-        Text[ korean ] = "�ȳ��� ����(~G)";
+        Text[ korean ] = "안내선 거리(~G)";
         Text[ turkish ] = "K�lavuz �izgi uzakl~���";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Distancia entre gu�as";
-        Text[ finnish ] = "~Ohjainet�isyys";
+        Text[ catalan ] = "~Dist�ncia entre guies";
+        Text[ finnish ] = "Janan- ja nuolenp��n rako";
+        Text[ thai ] = "ระยะ~คำแนะนำ";
     };
     MetricField MTR_FLD_HELPLINE_DIST
     {
@@ -249,26 +253,27 @@ TabPage RID_SVXPAGE_MEASURE
         Text = "~Linke Hilfslinie" ;
         Text [ ENGLISH ] = "~Left helpline" ;
         Text [ english_us ] = "~Left guide" ;
-        Text [ italian ] = "Linea ausiliaria sinitra" ;
+        Text [ italian ] = "~Linea ausiliaria sinistra" ;
         Text [ spanish ] = "L�nea auxiliar i~zquierda" ;
         Text [ french ] = "Rep�re ~gauche" ;
-        Text [ dutch ] = "Linker h~ulplijn" ;
+        Text [ dutch ] = "Linkerh~ulplijn" ;
         Text [ swedish ] = "V�nster hj�lp~linje" ;
         Text [ danish ] = "Venstre hj�lpelinje" ;
         Text [ portuguese_brazilian ] = "~Linke Hilfslinie" ;
         Text [ portuguese ] = "Guia ~esquerda" ;
-        Text[ chinese_simplified ] = "������(~L)";
-        Text[ russian ] = "����� ������������ �����";
+        Text[ chinese_simplified ] = "左辅助线(~L)";
+        Text[ russian ] = "����� ������������";
         Text[ polish ] = "Lewa linia pomocnicza";
-        Text[ japanese ] = "���̕⏕��(~L)";
-        Text[ chinese_traditional ] = "�����U�u(~L)";
+        Text[ japanese ] = "左の補助線(~L)";
+        Text[ chinese_traditional ] = "左輔助線(~L)";
         Text[ arabic ] = "���� ������� ������";
         Text[ greek ] = "�������� ��������� ������";
-        Text[ korean ] = "���� �ȳ���(~L)";
+        Text[ korean ] = "왼쪽 안내선(~L)";
         Text[ turkish ] = "~Sol k�lavuz �izgi";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "L�nea auxiliar i~zquierda";
-        Text[ finnish ] = "~Vasen ohjain";
+        Text[ catalan ] = "Guia ~esquerra";
+        Text[ finnish ] = "Vas. jananp��n pituus";
+        Text[ thai ] = "คำแนะนำด้าน~ซ้าย";
     };
     MetricField MTR_FLD_HELPLINE1_LEN
     {
@@ -295,24 +300,25 @@ TabPage RID_SVXPAGE_MEASURE
         Text [ english_us ] = "~Right guide" ;
         Text [ italian ] = "Linea ausiliaria destra" ;
         Text [ spanish ] = "L�nea au~xiliar derecha" ;
-        Text [ french ] = "Rep�re ~droit" ;
-        Text [ dutch ] = "~Rechter hulplijn" ;
+        Text [ french ] = "Rep�re droit" ;
+        Text [ dutch ] = "~Rechterhulplijn" ;
         Text [ swedish ] = "H�ge~r hj�lplinje" ;
-        Text [ danish ] = "H�jre hj�lpelinje" ;
+        Text [ danish ] = "H�jre hj�l~pelinje" ;
         Text [ portuguese_brazilian ] = "~Rechte Hilfslinie" ;
         Text [ portuguese ] = "Guia ~direita" ;
-        Text[ chinese_simplified ] = "�Ҹ�����(~R)";
-        Text[ russian ] = "������ ������������ �����";
+        Text[ chinese_simplified ] = "右辅助线(~R)";
+        Text[ russian ] = "�~����� ������������";
         Text[ polish ] = "Prawa linia pomocnicza";
-        Text[ japanese ] = "�E�̕⏕��(~R)";
-        Text[ chinese_traditional ] = "�k���U�u(~R)";
+        Text[ japanese ] = "右の補助線(~R)";
+        Text[ chinese_traditional ] = "右輔助線(~R)";
         Text[ arabic ] = "���� ������� ������";
         Text[ greek ] = "����� ��������� ������";
-        Text[ korean ] = "������ �ȳ���(~R)";
+        Text[ korean ] = "오른쪽 안내선(~R)";
         Text[ turkish ] = "Sa~� k�lavuz �izgi";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "L�nea au~xiliar derecha";
-        Text[ finnish ] = "~Oikea ohjain";
+        Text[ catalan ] = "Guia ~dreta";
+        Text[ finnish ] = "Oik. jananp��n pituus";
+        Text[ thai ] = "คำแนะนำด้าน~ขวา";
     };
     MetricField MTR_FLD_HELPLINE2_LEN
     {
@@ -339,25 +345,25 @@ TabPage RID_SVXPAGE_MEASURE
         Text [ ENGLISH ] = "Measure ~below reference edge" ;
         Text[ english_us ] = "Measure ~below object";
         Text[ portuguese ] = "Linha de medida abaixo do objecto";
-        Text[ russian ] = "����� ������� ��� ��������";
+        Text[ russian ] = "������ ��� ��������";
         Text[ greek ] = "�������� ���� ���";
-        Text[ dutch ] = "~Weergave onder";
-        Text[ french ] = "Afficher ~en dessous";
-        Text[ spanish ] = "L�nea de tama�o ~debajo del objeto";
-        Text[ finnish ] = "~Viitereunan alapuolella";
+        Text[ dutch ] = "~Meetlat onder het object";
+        Text[ french ] = "Ligne de cote ~sous l'objet";
+        Text[ spanish ] = "L�nea de tama�o debajo del objeto";
+        Text[ finnish ] = "Mittayksikk� objektin alapuolella";
         Text[ italian ] = "Linea di quotatura sotto l'oggetto";
-        Text[ danish ] = "Vis nedenfor";
+        Text[ danish ] = "M�lelinje u~nder objektet";
         Text[ swedish ] = "M�ttlinje ~nedanf�r objekt";
         Text[ polish ] = "Linia wymiarowa pod obiektem";
         Text[ portuguese_brazilian ] = "Anzeige ~unterhalb";
-        Text[ japanese ] = "��޼ު�ĉ����ɐ��@���̕\\��(~B)";
-        Text[ korean ] = "��� �Ʒ��� ǥ��(~B)";
-        Text[ chinese_simplified ] = "�ߴ�������ʾ�ڶ����·�(~B)";
-        Text[ chinese_traditional ] = "�ؤo�u����ܦb����U��(~B)";
+        Text[ japanese ] = "オブジェクト下方に寸法線の表示(~B)";
+        Text[ korean ] = "개체 아래 방향에 치수선 표시(~B)";
+        Text[ chinese_simplified ] = "定量线条显示在对象下方(~B)";
+        Text[ chinese_traditional ] = "尺寸線條顯示在物件下方(~B)";
         Text[ turkish ] = "Altta ~g�r�nt�le";
         Text[ arabic ] = "����� ������ �������";
-        Text[ catalan ] = "Mostrar ~abajo";
-        Text[ language_user1 ] = " ";
+        Text[ catalan ] = "Mostra ~avall";
+        Text[ thai ] = "มาตรวัดใ~ต้วัตถุ";
     };
     FixedText FT_DECIMALPLACES
     {
@@ -367,6 +373,26 @@ TabPage RID_SVXPAGE_MEASURE
         Text = "Nachkommastellen" ;
         Text [ ENGLISH ] = "Decimal places" ;
         Text [ english_us ] = "Decimal places" ;
+        Text[ portuguese ] = "Decimal places";
+        Text[ russian ] = "Decimal places";
+        Text[ greek ] = "Decimal places";
+        Text[ dutch ] = "Decimal places";
+        Text[ french ] = "D�cimales";
+        Text[ spanish ] = "Decimales";
+        Text[ finnish ] = "Decimal places";
+        Text[ italian ] = "Posizioni decimali";
+        Text[ danish ] = "Decimal places";
+        Text[ swedish ] = "Antal decimaler";
+        Text[ polish ] = "Decimal places";
+        Text[ portuguese_brazilian ] = "Decimal places";
+        Text[ japanese ] = "小数点以下の桁数";
+        Text[ korean ] = "소수점 이하 자릿수";
+        Text[ chinese_simplified ] = "小数点位数";
+        Text[ chinese_traditional ] = "小數點位數";
+        Text[ turkish ] = "Decimal places";
+        Text[ arabic ] = "Decimal places";
+        Text[ catalan ] = "Decimal places";
+        Text[ thai ] = "Decimal places";
     };
     MetricField MTR_FLD_DECIMALPLACES
     {
@@ -396,24 +422,25 @@ TabPage RID_SVXPAGE_MEASURE
         Text [ ENGLISH ] = "Legend" ;
         Text[ english_us ] = "Legend";
         Text[ portuguese ] = "Legenda";
-        Text[ russian ] = "�������";
+        Text[ russian ] = "�������";
         Text[ greek ] = "Legend";
-        Text[ dutch ] = "Legend";
+        Text[ dutch ] = "Titel";
         Text[ french ] = "�tiquette";
         Text[ spanish ] = "Etiqueta";
-        Text[ finnish ] = "Legend";
+        Text[ finnish ] = "Selite";
         Text[ italian ] = "Dicitura";
-        Text[ danish ] = "Legend";
+        Text[ danish ] = "Etiket";
         Text[ swedish ] = "Etikett";
         Text[ polish ] = "Etykieta";
         Text[ portuguese_brazilian ] = "Legend";
-        Text[ japanese ] = "����";
-        Text[ korean ] = "��";
-        Text[ chinese_simplified ] = "��ǩ";
-        Text[ chinese_traditional ] = "����";
+        Text[ japanese ] = "ラベル";
+        Text[ korean ] = "레이블";
+        Text[ chinese_simplified ] = "标签";
+        Text[ chinese_traditional ] = "標籤";
         Text[ turkish ] = "Legend";
         Text[ arabic ] = "Legend";
-        Text[ catalan ] = "Legend";
+        Text[ catalan ] = "Llegenda";
+        Text[ thai ] = "คำอธิบาย";
     };
     FixedText FT_POSITION
     {
@@ -421,27 +448,28 @@ TabPage RID_SVXPAGE_MEASURE
         Size = MAP_APPFONT ( 110 , 8 ) ;
         Text = "~Textposition" ;
         Text [ ENGLISH ] = "Text position" ;
-        Text [ dutch ] = "Tekstpositie" ;
+        Text [ dutch ] = "~Tekstpositie" ;
         Text [ english_us ] = "~Text position" ;
         Text [ italian ] = "Posizione testo" ;
         Text [ spanish ] = "Posici�n del texto" ;
         Text [ french ] = "Position du ~texte" ;
         Text [ swedish ] = "~Textposition" ;
-        Text [ danish ] = "Tekstplacering" ;
+        Text [ danish ] = "Te~kstplacering" ;
         Text [ portuguese_brazilian ] = "Textposition" ;
         Text [ portuguese ] = "~Posi��o do texto" ;
-        Text[ chinese_simplified ] = "�����(~T)";
-        Text[ russian ] = "��������� ������";
+        Text[ chinese_simplified ] = "文字位置(~T)";
+        Text[ russian ] = "������������ ������";
         Text[ polish ] = "Pozycja tekstu";
-        Text[ japanese ] = "÷�Ă̈ʒu(~T)";
-        Text[ chinese_traditional ] = "��r��m(~T)";
+        Text[ japanese ] = "テキストの位置(~T)";
+        Text[ chinese_traditional ] = "文字位置(~T)";
         Text[ arabic ] = "���� ����";
         Text[ greek ] = "���� ��������";
-        Text[ korean ] = "�ؽ�Ʈ ��ġ(~T)";
+        Text[ korean ] = "텍스트 위치(~T)";
         Text[ turkish ] = "Metin konumu";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Posici�n del texto";
+        Text[ catalan ] = "Posici� del texto";
         Text[ finnish ] = "Tekstin sijainti";
+        Text[ thai ] = "ตำแหน่ง~ข้อความ";
     };
     Control CTL_POSITION
     {
@@ -460,25 +488,26 @@ TabPage RID_SVXPAGE_MEASURE
         Text [ ENGLISH ] = "~Automatic vertical" ;
         Text [ english_us ] = "~AutoVertical" ;
         Text[ portuguese ] = "~Vertical autom.";
-        Text[ russian ] = "~�����. �����������";
+        Text[ russian ] = "~����������� (����)";
         Text[ greek ] = "��������� ����������";
         Text[ dutch ] = "~Automatisch verticaal";
         Text[ french ] = "Automatiquement ~vertical";
         Text[ spanish ] = "~Vertical autom�ticamente";
-        Text[ italian ] = "Verticale ~autom.";
-        Text[ danish ] = "Automatisk lodret";
+        Text[ italian ] = "Verticale ~automaticamente";
+        Text[ danish ] = "Automatisk ~lodret";
         Text[ swedish ] = "Automatiskt ~vertikal";
         Text[ polish ] = "Automatycznie pionowo";
         Text[ portuguese_brazilian ] = "~Automatic vertical";
-        Text[ japanese ] = "�����I�ɏc������(~A)";
-        Text[ korean ] = "����, �ڵ�(~A)";
-        Text[ chinese_simplified ] = "�Զ���ֱ(~A)";
-        Text[ chinese_traditional ] = "�۰ʫ���(~A)";
+        Text[ japanese ] = "自動的に縦方向へ(~A)";
+        Text[ korean ] = "자동 수직(~A)";
+        Text[ chinese_simplified ] = "自动垂直(~A)";
+        Text[ chinese_traditional ] = "自動垂直(~A)";
         Text[ arabic ] = "����� ��������";
         Text[ turkish ] = "~Otomatik dikey";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Vertical autom�ticamente";
-        Text[ finnish ] = "~Automaattinen pystysuunta";
+        Text[ catalan ] = "~Vertical autom�ticament";
+        Text[ finnish ] = "Automaattinen pystysuunta";
+        Text[ thai ] = "แนวตั้ง~อัตโนมัติ";
     };
     TriStateBox TSB_AUTOPOSH
     {
@@ -489,25 +518,26 @@ TabPage RID_SVXPAGE_MEASURE
         Text [ ENGLISH ] = "~Automatic horizontal" ;
         Text [ english_us ] = "A~utoHorizontal" ;
         Text[ portuguese ] = "~Horizontal autom.";
-        Text[ russian ] = "�����. �������������";
+        Text[ russian ] = "������������� (����)";
         Text[ greek ] = "��������� ���������";
         Text[ dutch ] = "~Automatisch horizontaal";
         Text[ french ] = "Automatiquement ~horizontal";
         Text[ spanish ] = "~Horizontal autom�ticamente";
-        Text[ italian ] = "~Orizzontale automat.";
-        Text[ danish ] = "Automatisk vandret";
+        Text[ italian ] = "~Orizzontale automaticamente";
+        Text[ danish ] = "Automatisk ~vandret";
         Text[ swedish ] = "Automatiskt h~orisontell";
         Text[ polish ] = "Automatycznie poziomo";
         Text[ portuguese_brazilian ] = "~Automatic horizontal";
-        Text[ japanese ] = "�����I�ɉ�������(~U)";
-        Text[ korean ] = "����, �ڵ�(~U)";
-        Text[ chinese_simplified ] = "�Զ�ˮƽ(~U)";
-        Text[ chinese_traditional ] = "�۰ʤ���(~U)";
+        Text[ japanese ] = "自動的に横方向へ(~U)";
+        Text[ korean ] = "자동 수평(~U)";
+        Text[ chinese_simplified ] = "自动水平(~U)";
+        Text[ chinese_traditional ] = "自動水平(~U)";
         Text[ arabic ] = "���� ��������";
         Text[ turkish ] = "O~tomatik yatay";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Horizontal autom�ticamente";
-        Text[ finnish ] = "~Automaattinen vaakataso";
+        Text[ catalan ] = "~Horitzontal autom�ticament";
+        Text[ finnish ] = "Automaattinen vaakasuunta";
+        Text[ thai ] = "แนวนอนอั~ตโนมัติ";
     };
     TriStateBox TSB_SHOW_UNIT
     {
@@ -516,27 +546,28 @@ TabPage RID_SVXPAGE_MEASURE
         TabStop = TRUE ;
         Text = "~Einheit anzeigen" ;
         Text [ ENGLISH ] = "Show ~Metric" ;
-        Text [ dutch ] = "Weergave ~metriek" ;
+        Text [ dutch ] = "~Eenheid weergeven" ;
         Text [ english_us ] = "Show ~meas. units" ;
         Text [ italian ] = "~Mostra unit� misura" ;
         Text [ spanish ] = "~Mostrar unidad" ;
         Text [ french ] = "Afficher l'~unit�" ;
         Text [ swedish ] = "Visa ~enhet" ;
-        Text [ danish ] = "Vis metrik" ;
+        Text [ danish ] = "Vis ~enhed" ;
         Text [ portuguese ] = "Mostrar ~unidade" ;
         Text [ portuguese_brazilian ] = "~Metrik anzeigen" ;
-        Text[ chinese_simplified ] = "��ʾ�ߴ絥λ(~M)";
-        Text[ russian ] = "�������� ������� �����.";
+        Text[ chinese_simplified ] = "显示定量单位(~M)";
+        Text[ russian ] = "�������� ��. ���.";
         Text[ polish ] = "Poka� jednostk� miary";
-        Text[ japanese ] = "�P�ʂ�\\��(~M)";
-        Text[ chinese_traditional ] = "��ܤؤo���(~M)";
+        Text[ japanese ] = "単位を表示(~M)";
+        Text[ chinese_traditional ] = "顯示定量單位(~M)";
         Text[ arabic ] = "����� ����� ������";
         Text[ greek ] = "�������� ������� ��������";
-        Text[ korean ] = "���� ��Ÿ����(~M)";
+        Text[ korean ] = "단위 표시(~M)";
         Text[ turkish ] = "~�l��m birimlerini g�r�nt�le";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Mostrar m�trica";
-        Text[ finnish ] = "~N�yt� mittayksik�t";
+        Text[ catalan ] = "Mostra les unitats de ~mesura";
+        Text[ finnish ] = "N�yt� mittayksik�:";
+        Text[ thai ] = "แสดงหน่วย~มาตรวัด";
     };
     ListBox LB_UNIT
     {
@@ -558,23 +589,23 @@ TabPage RID_SVXPAGE_MEASURE
         Text[ portuguese ] = "~Paralelo � linha";
         Text[ russian ] = "����������� �����";
         Text[ greek ] = "��������� �������";
-        Text[ dutch ] = "Weergave ~parallel";
-        Text[ french ] = "Affichage parall�le";
+        Text[ dutch ] = "~Parallel met hulplijn";
+        Text[ french ] = "~Parall�le au rep�re";
         Text[ spanish ] = "Paralela a l�nea auxiliar";
-        Text[ finnish ] = "~Samansuuntainen";
+        Text[ finnish ] = "Viivan suuntaisesti";
         Text[ italian ] = "~Parallela alla griglia";
-        Text[ danish ] = "Vis parallelt";
+        Text[ danish ] = "~Parallelt med hj�lpelinje";
         Text[ swedish ] = "~Parallell med hj�lplinje";
         Text[ polish ] = "R�wnolegle do linii pomocniczej";
         Text[ portuguese_brazilian ] = "Anzeige ~parallel";
-        Text[ japanese ] = "���@���ƕ��s�ɕ\\��(~P)";
-        Text[ korean ] = "ĸ���� �ȳ����� �������� (~P)";
-        Text[ chinese_simplified ] = "��ǩ�͸�����ƽ��(~P)";
-        Text[ chinese_traditional ] = "���ҩM���U�u����(~P)";
+        Text[ japanese ] = "寸法線と平行に表示(~P)";
+        Text[ korean ] = "안내선과 평행으로 표시(~P)";
+        Text[ chinese_simplified ] = "标签和辅助线平行(~P)";
+        Text[ chinese_traditional ] = "標籤和輔助線平行(~P)";
         Text[ turkish ] = "Paralel ~g�r�nt�le";
         Text[ arabic ] = "����� ������ ��������";
-        Text[ catalan ] = "M~ostrar paralelamente";
-        Text[ language_user1 ] = " ";
+        Text[ catalan ] = "M~ostra paral.lelament";
+        Text[ thai ] = "~ขนานกับบรรทัด";
     };
     Control CTL_PREVIEW
     {
@@ -596,31 +627,33 @@ TabPage RID_SVXPAGE_MEASURE
         Text [ dutch ] = "Automatisch" ;
         Text [ portuguese_brazilian ] = "Automatisch" ;
         Text [ portuguese ] = "Automaticamente" ;
-        Text[ chinese_simplified ] = "�Զ�";
+        Text[ chinese_simplified ] = "自动";
         Text[ russian ] = "�������������";
         Text[ polish ] = "Automatycznie";
-        Text[ japanese ] = "����";
-        Text[ chinese_traditional ] = "�۰�";
+        Text[ japanese ] = "自動";
+        Text[ chinese_traditional ] = "自動";
         Text[ arabic ] = "������";
         Text[ greek ] = "��������";
-        Text[ korean ] = "�ڵ�";
+        Text[ korean ] = "자동";
         Text[ turkish ] = "Otomatik";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Autom�tico";
+        Text[ catalan ] = "Autom�tic";
         Text[ finnish ] = "Automaattinen";
+        Text[ thai ] = "อัตโนมัติ";
     };
-    Text[ chinese_simplified ] = "���ߴ�";
-    Text[ russian ] = "�������";
+    Text[ chinese_simplified ] = "定尺寸";
+    Text[ russian ] = "��������� �����";
     Text[ polish ] = "Wymiary";
-    Text[ japanese ] = "���@�̋L��";
-    Text[ chinese_traditional ] = "�w�ؤo";
+    Text[ japanese ] = "寸法の記入";
+    Text[ chinese_traditional ] = "定尺寸";
     Text[ arabic ] = "������";
     Text[ greek ] = "���������������";
-    Text[ korean ] = "ġ��";
+    Text[ korean ] = "치수";
     Text[ turkish ] = "Boyutlar";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Dimensiones";
+    Text[ catalan ] = "Mides";
     Text[ finnish ] = "Mitoitus";
+    Text[ thai ] = "มีมิติ";
 };
  // ********************************************************************** EOF
 
@@ -629,3 +662,20 @@ TabPage RID_SVXPAGE_MEASURE
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svx/source/dialog/numfmt.cxx b/svx/source/dialog/numfmt.cxx
index 8b71b68f1ac7..1b134e209626 100644
--- a/svx/source/dialog/numfmt.cxx
+++ b/svx/source/dialog/numfmt.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: numfmt.cxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: os $ $Date: 2002-11-19 07:24:58 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -85,6 +85,10 @@
 #define _SVSTDARR_STRINGSDTOR
 #include <svtools/svstdarr.hxx>
 
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include <svtools/colorcfg.hxx>
+#endif
+
 #define _SVX_NUMFMT_CXX
 
 #include "dialogs.hrc"
@@ -177,7 +181,9 @@ void SvxNumberPreviewImpl::NotifyChange( const String& rPrevStr,
                                          const Color* pColor )
 {
     aPrevStr = rPrevStr;
-    aPrevCol = pColor ? *pColor : GetSettings().GetStyleSettings().GetWindowTextColor();
+    svtools::ColorConfig aColorConfig;
+    Color aWindowTextColor( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor );
+    aPrevCol = pColor ? *pColor : aWindowTextColor;
     Invalidate();
     Update();
 }
@@ -216,7 +222,8 @@ void SvxNumberPreviewImpl::InitSettings( BOOL bForeground, BOOL bBackground )
 
     if ( bForeground )
     {
-        Color aTextColor = rStyleSettings.GetWindowTextColor();
+        svtools::ColorConfig aColorConfig;
+        Color aTextColor( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor );
 
         if ( IsControlForeground() )
             aTextColor = GetControlForeground();
@@ -662,6 +669,14 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet )
     if(SFX_ITEM_SET == eState)
          pAutoEntryAttr = (const SfxBoolItem*)
                       GetItem( rSet, SID_ATTR_NUMBERFORMAT_ADD_AUTO );
+    // no_NO is an alias for nb_NO and normally isn't listed, we need it for
+    // backwards compatibility, but only if the format passed is of
+    // LanguageType no_NO.
+    if ( eLangType == LANGUAGE_NORWEGIAN )
+    {
+        aLbLanguage.RemoveLanguage( eLangType );    // in case we're already called
+        aLbLanguage.InsertLanguage( eLangType );
+    }
     aLbLanguage.SelectLanguage( eLangType );
     if(pAutoEntryAttr)
         AddAutomaticLanguage_Impl(eLangType, pAutoEntryAttr->GetValue());
diff --git a/svx/source/dialog/numfmt.src b/svx/source/dialog/numfmt.src
index c3e3078b10d9..e9f402e9f958 100644
--- a/svx/source/dialog/numfmt.src
+++ b/svx/source/dialog/numfmt.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: numfmt.src,v $
  *
- *  $Revision: 1.36 $
+ *  $Revision: 1.37 $
  *
- *  last change: $Author: kz $ $Date: 2002-12-09 09:57:23 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -107,7 +107,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
         Text[ chinese_traditional ] = "分類(~C)";
         Text[ arabic ] = "�����";
         Text[ greek ] = "���������";
-        Text[ korean ] = "범주(~C)";
+        Text[ korean ] = "분류(~C)";
         Text[ turkish ] = "~Kategori";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Categoria";
@@ -405,7 +405,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
                 < "모두" ; Default ; > ;
             < "사용자 정의" ; Default ; > ;
             < "수" ; Default ; > ;
-            < "퍼센트" ; Default ; > ;
+            < "백분율" ; Default ; > ;
             < "통화" ; Default ; > ;
             < "날짜" ; Default ; > ;
             < "시간" ; Default ; > ;
@@ -593,7 +593,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
         };
         StringList [ spanish ] =
         {
-                < "Autom�tico" ; Default ; > ;
+                < "Autom�ticamente" ; Default ; > ;
         };
         StringList [ italian ] =
         {
@@ -637,7 +637,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
         };
         StringList [ korean ] =
         {
-                < "자동으로" ; Default ; > ;
+                < "자동" ; Default ; > ;
         };
         StringList [ turkish ] =
         {
@@ -690,7 +690,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
         Text[ chinese_traditional ] = "小數點位數(~D)";
         Text[ arabic ] = "������� �������";
         Text[ greek ] = "���~����� �����";
-        Text[ korean ] = "소수점 이하 자리(~D)";
+        Text[ korean ] = "소수점 이하 자릿수(~D)";
         Text[ turkish ] = "~Ondal�k haneler";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Nombre de ~decimals";
@@ -768,7 +768,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
         Text [ french ] = "~Nbres n�g. en rouge" ;
         Text [ swedish ] = "Negativa v�rden i ~r�tt" ;
         Text [ dutch ] = "~Negatieve getallen rood" ;
-        Text [ spanish ] = "~Negativo en rojo" ;
+        Text [ spanish ] = "~N�m. negativos en rojo" ;
         Text [ english_us ] = "~Negative numbers red" ;
         Text[ chinese_simplified ] = "用红色显示负值(~N)";
         Text[ russian ] = "������������� ����� �������";
@@ -801,7 +801,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
         Text [ spanish ] = "~Separador de miles" ;
         Text [ english_us ] = "~Thousands separator" ;
         Text[ chinese_simplified ] = "千位点(~T)";
-        Text[ russian ] = "���������� ��������";
+        Text[ russian ] = "���������� �����~���";
         Text[ polish ] = "Separator tysi�czny";
         Text[ japanese ] = "千単位の桁区切り(~T)";
         Text[ chinese_traditional ] = "千位點(~T)";
@@ -901,7 +901,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
         Text[ polish ] = "Format �r�d�owy";
         Text[ portuguese_brazilian ] = "So~urce format";
         Text[ japanese ] = "ソース書式(~U)";
-        Text[ korean ] = "소스 형식(~U)";
+        Text[ korean ] = "원본 서식(~U)";
         Text[ chinese_simplified ] = "原始格式(~U)";
         Text[ chinese_traditional ] = "原始格式(~U)";
         Text[ turkish ] = "So~urce format";
@@ -969,7 +969,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
         QuickHelpText [ french ] = "Supprimer" ;
         QuickHelpText [ swedish ] = "Ta bort" ;
         QuickHelpText [ dutch ] = "Verwijderen" ;
-        QuickHelpText [ spanish ] = "Eliminar" ;
+        QuickHelpText [ spanish ] = "Borrar" ;
         QuickHelpText [ english_us ] = "Remove" ;
          // ### ACHTUNG: Neuer Text in Resource? Zahlenformat l�schen : Zahlenformat l�schen
         QuickHelpText[ russian ] = "������";
@@ -1011,7 +1011,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
         QuickHelpText[ chinese_traditional ] = "變更評語";
         QuickHelpText[ arabic ] = "����� �������";
         QuickHelpText[ greek ] = "����������� �������";
-        QuickHelpText[ korean ] = "주석 편집";
+        QuickHelpText[ korean ] = "설명 편집";
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ language_user1 ] = " ";
@@ -1078,22 +1078,22 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
         Text [english_us] = "Automatic";
         Text[ portuguese ] = "Automatic";
         Text[ russian ] = "Automatic";
-        Text[ spanish ] = "Automatic";
-        Text[ italian ] = "Automatic";
-        Text[ swedish ] = "Automatic";
+        Text[ spanish ] = "Autom�tico";
+        Text[ italian ] = "In modo automatico";
+        Text[ swedish ] = "Automatiskt";
         Text[ polish ] = "Automatic";
         Text[ portuguese_brazilian ] = "Automatic";
-        Text[ japanese ] = "Automatic";
-        Text[ korean ] = "Automatic";
+        Text[ japanese ] = "自動";
+        Text[ korean ] = "자동";
         Text[ turkish ] = "Automatic";
         Text[ thai ] = "Automatic";
         Text[ greek ] = "Automatic";
         Text[ dutch ] = "Automatic";
-        Text[ french ] = "Automatic";
+        Text[ french ] = "Automatique";
         Text[ finnish ] = "Automatic";
         Text[ danish ] = "Automatic";
-        Text[ chinese_simplified ] = "Automatic";
-        Text[ chinese_traditional ] = "Automatic";
+        Text[ chinese_simplified ] = "自动";
+        Text[ chinese_traditional ] = "自動";
         Text[ arabic ] = "Automatic";
         Text[ catalan ] = "Automatic";
     };
@@ -1105,7 +1105,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
     Text[ chinese_traditional ] = "數字格式";
     Text[ arabic ] = "����� �������";
     Text[ greek ] = "����� �������";
-    Text[ korean ] = "숫자 형식";
+    Text[ korean ] = "숫자 표기 형식";
     Text[ turkish ] = "Say� format�";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Format num�ric";
@@ -1120,3 +1120,8 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
 
 
 
+
+
+
+
+
diff --git a/svx/source/dialog/numpages.cxx b/svx/source/dialog/numpages.cxx
index 4a772a61b474..2e109e8b6b09 100644
--- a/svx/source/dialog/numpages.cxx
+++ b/svx/source/dialog/numpages.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: numpages.cxx,v $
  *
- *  $Revision: 1.34 $
+ *  $Revision: 1.35 $
  *
- *  last change: $Author: os $ $Date: 2002-11-21 09:29:11 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1561,7 +1561,7 @@ IMPL_LINK(SvxBitmapPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG)
                 aFmt.SetCharFmtName( sNumCharFmtName );
 
                 Graphic aGraphic;
-                if(GalleryExplorer::GetGraphicObj( String::CreateFromAscii("Bullets"), nIdx, &aGraphic))
+                if(GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, nIdx, &aGraphic))
                 {
                     Size aSize = SvxNumberFormat::GetGraphicSizeMM100(&aGraphic);
                     SvxFrameVertOrient eOrient = SVX_VERT_LINE_CENTER;
@@ -1609,11 +1609,10 @@ SvxBmpNumValueSet::SvxBmpNumValueSet( Window* pParent, const ResId& rResId/*, co
 
     SvxNumValueSet( pParent, rResId, NUM_PAGETYPE_BMP ),
 //    rStrList    ( rStrNames ),
-    sBullets(String::CreateFromAscii("Bullets")),
     bGrfNotFound( FALSE )
 
 {
-    GalleryExplorer::BeginLocking(sBullets);
+    GalleryExplorer::BeginLocking(GALLERY_THEME_BULLETS);
     SetStyle( GetStyle() | WB_VSCROLL );
     SetLineCount( 3 );
     aFormatTimer.SetTimeout(300);
@@ -1626,7 +1625,7 @@ SvxBmpNumValueSet::SvxBmpNumValueSet( Window* pParent, const ResId& rResId/*, co
 
  SvxBmpNumValueSet::~SvxBmpNumValueSet()
 {
-    GalleryExplorer::EndLocking(sBullets);
+    GalleryExplorer::EndLocking(GALLERY_THEME_BULLETS);
     aFormatTimer.Stop();
 }
 /*-----------------13.02.97 09.41-------------------
@@ -1646,7 +1645,7 @@ void    SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
     Size aSize(nRectHeight/8, nRectHeight/8);
 
     Graphic aGraphic;
-    if(!GalleryExplorer::GetGraphicObj( sBullets, nItemId - 1,
+    if(!GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, nItemId - 1,
                         &aGraphic, NULL))
     {
         bGrfNotFound = TRUE;
@@ -2660,7 +2659,7 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton )
     {
         aGrfName = *((String*)aGrfNames.GetObject( nItemId - MN_GALLERY_ENTRY));
         Graphic aGraphic;
-        if(GalleryExplorer::GetGraphicObj( String::CreateFromAscii("Bullets"), nItemId - MN_GALLERY_ENTRY, &aGraphic))
+        if(GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, nItemId - MN_GALLERY_ENTRY, &aGraphic))
         {
             aSize = SvxNumberFormat::GetGraphicSizeMM100(&aGraphic);
             bSucc = sal_True;
@@ -2739,8 +2738,7 @@ IMPL_LINK( SvxNumOptionsTabPage, PopupActivateHdl_Impl, Menu *, pMenu )
             pPopup->RemoveItem( pPopup->GetItemPos( NUM_NO_GRAPHIC ));
             String aEmptyStr;
             SfxObjectShell *pDocSh = SfxObjectShell::Current();
-            String sBullets(String::CreateFromAscii("Bullets"));
-            GalleryExplorer::BeginLocking(sBullets);
+            GalleryExplorer::BeginLocking(GALLERY_THEME_BULLETS);
 
             for(USHORT i = 0; i < aGrfNames.Count(); i++)
             {
@@ -2749,7 +2747,7 @@ IMPL_LINK( SvxNumOptionsTabPage, PopupActivateHdl_Impl, Menu *, pMenu )
                 INetURLObject aObj(sGrfName);
                 if(aObj.GetProtocol() == INET_PROT_FILE)
                     sGrfName = aObj.PathToFileName();
-                if(GalleryExplorer::GetGraphicObj( String::CreateFromAscii("Bullets"), i, &aGraphic))
+                if(GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, i, &aGraphic))
                 {
                     Bitmap aBitmap(aGraphic.GetBitmap());
                     Size aSize(aBitmap.GetSizePixel());
@@ -2773,7 +2771,7 @@ IMPL_LINK( SvxNumOptionsTabPage, PopupActivateHdl_Impl, Menu *, pMenu )
                         MN_GALLERY_ENTRY + i, sGrfName, aImage );
                 }
             }
-            GalleryExplorer::EndLocking(sBullets);
+            GalleryExplorer::EndLocking(GALLERY_THEME_BULLETS);
         }
         LeaveWait();
     }
@@ -3051,7 +3049,9 @@ USHORT lcl_DrawBullet(VirtualDevice* pVDev,
     aFont.SetSize(aTmpSize);
     aFont.SetTransparent(TRUE);
     Color aBulletColor = rFmt.GetBulletColor();
-    if(aBulletColor == pVDev->GetFillColor())
+    if(aBulletColor.GetColor() == COL_AUTO)
+        aBulletColor = Color(pVDev->GetFillColor().IsDark() ? COL_WHITE : COL_BLACK);
+    else if(aBulletColor == pVDev->GetFillColor())
         aBulletColor.Invert();
     aFont.SetColor(aBulletColor);
     pVDev->SetFont( aFont );
@@ -3172,7 +3172,9 @@ void    SvxNumberingPreview::Paint( const Rectangle& rRect )
                     Font aSaveFont = pVDev->GetFont();
                     Font aColorFont(aSaveFont);
                     Color aTmpBulletColor = rFmt.GetBulletColor();
-                    if(aBackColor == aTmpBulletColor)
+                    if(aTmpBulletColor.GetColor() == COL_AUTO)
+                        aTmpBulletColor = Color(aBackColor.IsDark() ? COL_WHITE : COL_BLACK);
+                    else if(aTmpBulletColor == aBackColor)
                         aTmpBulletColor.Invert();
                     aColorFont.SetColor(aTmpBulletColor);
                     pVDev->SetFont(aColorFont);
@@ -3228,7 +3230,9 @@ void    SvxNumberingPreview::Paint( const Rectangle& rRect )
                 {
                     Font aColorFont(aStdFont);
                     Color aTmpBulletColor = rFmt.GetBulletColor();
-                    if(aBackColor == aTmpBulletColor)
+                    if(aTmpBulletColor.GetColor() == COL_AUTO)
+                        aTmpBulletColor = Color(aBackColor.IsDark() ? COL_WHITE : COL_BLACK);
+                    else if(aTmpBulletColor == aBackColor)
                         aTmpBulletColor.Invert();
                     aColorFont.SetColor(aTmpBulletColor);
                     pVDev->SetFont(aColorFont);
diff --git a/svx/source/dialog/numpages.src b/svx/source/dialog/numpages.src
index a03b93505ce2..1312026ce51f 100644
--- a/svx/source/dialog/numpages.src
+++ b/svx/source/dialog/numpages.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: numpages.src,v $
  *
- *  $Revision: 1.46 $
+ *  $Revision: 1.47 $
  *
- *  last change: $Author: kz $ $Date: 2003-02-27 13:30:51 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -81,7 +81,7 @@ TabPage RID_SVXPAGE_PICK_BULLET
         Text = "Auswahl" ;
         Text [ ENGLISH ] = "Selection" ;
         Text [ english_us ] = "Selection" ;
-        Text [ portuguese_brazilian ] = "Sele��o" ;
+        Text [ portuguese_brazilian ] = "Auswahl" ;
         Text [ swedish ] = "Urval" ;
         Text [ danish ] = "Udvalg" ;
         Text [ italian ] = "Selezione" ;
@@ -91,7 +91,7 @@ TabPage RID_SVXPAGE_PICK_BULLET
         Text [ portuguese ] = "Selec��o" ;
         Text[ chinese_simplified ] = "选择";
         Text[ russian ] = "�����";
-        Text[ polish ] = "Wyb�r";
+        Text[ polish ] = "Selekcja";
         Text[ japanese ] = "選択";
         Text[ chinese_traditional ] = "選擇";
         Text[ arabic ] = "�����";
@@ -99,8 +99,9 @@ TabPage RID_SVXPAGE_PICK_BULLET
         Text[ korean ] = "선택";
         Text[ turkish ] = "Se�im";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Seleccioneu";
+        Text[ catalan ] = "Selecci�";
         Text[ finnish ] = "Valinta";
+        Text[ thai ] = "เลือก";
     };
     Control VS_VALUES
     {
@@ -127,7 +128,7 @@ TabPage RID_SVXPAGE_PICK_SINGLE_NUM
         Text = "Auswahl" ;
         Text [ ENGLISH ] = "Selection" ;
         Text [ english_us ] = "Selection" ;
-        Text [ portuguese_brazilian ] = "Sele��o" ;
+        Text [ portuguese_brazilian ] = "Auswahl" ;
         Text [ swedish ] = "Urval" ;
         Text [ danish ] = "Udvalg" ;
         Text [ italian ] = "Selezione" ;
@@ -137,7 +138,7 @@ TabPage RID_SVXPAGE_PICK_SINGLE_NUM
         Text [ portuguese ] = "Selec��o" ;
         Text[ chinese_simplified ] = "选择";
         Text[ russian ] = "�����";
-        Text[ polish ] = "Wyb�r";
+        Text[ polish ] = "Selekcja";
         Text[ japanese ] = "選択";
         Text[ chinese_traditional ] = "選擇";
         Text[ arabic ] = "�����";
@@ -145,8 +146,9 @@ TabPage RID_SVXPAGE_PICK_SINGLE_NUM
         Text[ korean ] = "선택";
         Text[ turkish ] = "Se�im";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Seleccioneu";
+        Text[ catalan ] = "Selecci�";
         Text[ finnish ] = "Valinta";
+        Text[ thai ] = "เลือก";
     };
     Control VS_VALUES
     {
@@ -173,7 +175,7 @@ TabPage RID_SVXPAGE_PICK_NUM
         Text = "Auswahl" ;
         Text [ ENGLISH ] = "Selection" ;
         Text [ english_us ] = "Selection" ;
-        Text [ portuguese_brazilian ] = "Sele��o" ;
+        Text [ portuguese_brazilian ] = "Auswahl" ;
         Text [ swedish ] = "Urval" ;
         Text [ danish ] = "Udvalg" ;
         Text [ italian ] = "Selezione" ;
@@ -183,7 +185,7 @@ TabPage RID_SVXPAGE_PICK_NUM
         Text [ portuguese ] = "Selec��o" ;
         Text[ chinese_simplified ] = "选择";
         Text[ russian ] = "�����";
-        Text[ polish ] = "Wyb�r";
+        Text[ polish ] = "Selekcja";
         Text[ japanese ] = "選択";
         Text[ chinese_traditional ] = "選擇";
         Text[ arabic ] = "�����";
@@ -191,8 +193,9 @@ TabPage RID_SVXPAGE_PICK_NUM
         Text[ korean ] = "선택";
         Text[ turkish ] = "Se�im";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Seleccioneu";
+        Text[ catalan ] = "Selecci�";
         Text[ finnish ] = "Valinta";
+        Text[ thai ] = "เลือก";
     };
     Control VS_VALUES
     {
@@ -220,7 +223,7 @@ TabPage RID_SVXPAGE_PICK_BMP
         Text [ ENGLISH ] = "Selection" ;
         Text [ portuguese ] = "Selec��o" ;
         Text [ english_us ] = "Selection" ;
-        Text [ portuguese_brazilian ] = "Sele��o" ;
+        Text [ portuguese_brazilian ] = "Auswahl" ;
         Text [ swedish ] = "Urval" ;
         Text [ danish ] = "Udvalg" ;
         Text [ italian ] = "Selezione" ;
@@ -229,7 +232,7 @@ TabPage RID_SVXPAGE_PICK_BMP
         Text [ dutch ] = "Selectie" ;
         Text[ chinese_simplified ] = "选择";
         Text[ russian ] = "�����";
-        Text[ polish ] = "Wyb�r";
+        Text[ polish ] = "Selekcja";
         Text[ japanese ] = "選択";
         Text[ chinese_traditional ] = "選擇";
         Text[ arabic ] = "�����";
@@ -237,8 +240,9 @@ TabPage RID_SVXPAGE_PICK_BMP
         Text[ korean ] = "선택";
         Text[ turkish ] = "Se�im";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Seleccioneu";
+        Text[ catalan ] = "Selecci�";
         Text[ finnish ] = "Valinta";
+        Text[ thai ] = "เลือก";
     };
     Control VS_VALUES
     {
@@ -264,17 +268,18 @@ TabPage RID_SVXPAGE_PICK_BMP
         Text[ italian ] = "Collega ~immagini";
         Text[ danish ] = "K�d grafik";
         Text[ swedish ] = "~L�nka grafik";
-        Text[ polish ] = "~Do��cz grafik�";
-        Text[ portuguese_brazilian ] = "~Vincular imagens";
+        Text[ polish ] = "P~o��czy� grafiki";
+        Text[ portuguese_brazilian ] = "~Link bitmaps";
         Text[ japanese ] = "図をリンクする(~L)";
-        Text[ korean ] = "그래픽 연결(~L)";
+        Text[ korean ] = "그림 연결(~L)";
         Text[ chinese_simplified ] = "链接图形(~L)";
         Text[ chinese_traditional ] = "連結圖形(~L)";
         Text[ arabic ] = "��� �����";
         Text[ turkish ] = "Grafi�e ba�lant� olu�tur";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Vincular im�genes";
+        Text[ catalan ] = "~Enlla�a imatges";
         Text[ finnish ] = "~Linkit� grafiikka";
+        Text[ thai ] = "เ~ชื่อมโยงกราฟิค";
     };
     FixedText FT_ERROR
     {
@@ -284,7 +289,7 @@ TabPage RID_SVXPAGE_PICK_BMP
         Text [ English ] = "Thera are no bitmaps in the Gallery theme 'Bullets'." ;
         Text [ portuguese ] = "N�o existem imagens no tema 'Marcas' da Gallery." ;
         Text [ english_us ] = "The Gallery theme 'Bullets' is empty (no graphics)." ;
-        Text [ portuguese_brazilian ] = "N�o h� imagens no tema 'Bullets' da Galeria." ;
+        Text [ portuguese_brazilian ] = "Es sind keine Grafiken im Gallery-Thema 'Bullets' vorhanden." ;
         Text [ swedish ] = "Det finns ingen grafik i Gallery-temat 'Punkter'." ;
         Text [ danish ] = "Der findes ingen grafik i Gallery-emnet 'Punkttegn'." ;
         Text [ italian ] = "Nella gallery con argomento 'Punti' non ci sono immagini." ;
@@ -295,16 +300,17 @@ TabPage RID_SVXPAGE_PICK_BMP
         WordBreak = TRUE ;
         Text[ chinese_simplified ] = "画廊主题'项目符号'内没有图形。";
         Text[ russian ] = "���� ������� '�������' ����� (��� ����������� ��������).";
-        Text[ polish ] = "Temat Galerii 'Znaki wypunktowania' jest pusty (nie ma w nim �adnych grafik).";
+        Text[ polish ] = "Nie znaleziono grafik w temacie galerii 'Wypunktowanie'.";
         Text[ japanese ] = "ギャラリテーマの「箇条書きシンボル」には図はありません。";
         Text[ chinese_traditional ] = "畫廊主題[項目符號]內沒有圖形。";
         Text[ arabic ] = "�� ���� ��� ��� �� ����� �������� 'Bullets'.";
         Text[ greek ] = "��� �������� ������� ��� ������� �� ���� '��������'.";
-        Text[ korean ] = "갤러리 주제 '글머리 기호'에 그래픽이 없습니다.";
+        Text[ korean ] = "갤러리 주제 [글머리 기호]에 그림이 없습니다.";
         Text[ turkish ] = "'Madde i�aretleri' galeri konusu alt�nda grafik mevcut de�il.";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "No hay im�genes en el tema 'Bullets' de la Galer�a.";
+        Text[ catalan ] = "No hi ha imatges en el tema 'Bullets' de la Galeria.";
         Text[ finnish ] = "Galleriateema Luettelomerkit on tyhj� (ei kuvia).";
+        Text[ thai ] = "แบบคลังภาพ 'สัญลักษณ์แสดงหัวข้อย่อย' ไม่มีอยู่ (ไม่มีกราฟิค)";
     };
 };
 /**************************************************************************/
@@ -342,10 +348,11 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text[ chinese_traditional ] = "級";
         Text[ arabic ] = "�������";
         Text[ greek ] = "�������";
-        Text[ korean ] = "단계";
+        Text[ korean ] = "수준";
         Text[ turkish ] = "D�zey";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Nivel";
+        Text[ catalan ] = "Nivell";
+        Text[ thai ] = "ระดับ";
     };
     MultiListBox LB_LEVEL
     {
@@ -369,7 +376,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text [ dutch ] = "Formaat" ;
         Text [ swedish ] = "Format" ;
         Text [ danish ] = "Format" ;
-        Text [ portuguese_brazilian ] = "Formato" ;
+        Text [ portuguese_brazilian ] = "Format" ;
         Text [ portuguese ] = "Formato" ;
         Text[ chinese_simplified ] = "格式";
         Text[ russian ] = "������";
@@ -381,8 +388,9 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text[ korean ] = "서식";
         Text[ turkish ] = "Format";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Formata";
+        Text[ catalan ] = "Format";
         Text[ finnish ] = "Muotoilu";
+        Text[ thai ] = "รูปแบบ";
     };
     FixedText FT_FMT
     {
@@ -397,11 +405,11 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text [ spanish ] = "Nu~meraci�n" ;
         Text [ french ] = "Num�rotation" ;
         Text [ dutch ] = "~Nummering" ;
-        Text [ portuguese_brazilian ] = "~Numera��o" ;
+        Text [ portuguese_brazilian ] = "~Numerierung" ;
         Text [ portuguese ] = "~Numera��o" ;
         Text[ chinese_simplified ] = "编号(~N)";
         Text[ russian ] = "���������";
-        Text[ polish ] = "~Numeracja";
+        Text[ polish ] = "Numeracja";
         Text[ japanese ] = "番号付け(~N)";
         Text[ chinese_traditional ] = "編號(~N)";
         Text[ arabic ] = "�������";
@@ -409,8 +417,9 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text[ korean ] = "번호 매기기(~N)";
         Text[ turkish ] = "Numaralama";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Nu~meraci�n";
+        Text[ catalan ] = "Nu~meraci�";
         Text[ finnish ] = "~Numerointi";
+        Text[ thai ] = "~ลำดับตัวเลข";
     };
     ListBox LB_FMT
     {
@@ -590,30 +599,30 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         StringList [ polish ] =
         {
             < "1,2,3, ..." ;                4/*SVX_NUM_ARABIC              */; > ;
-            < "A, B, C, ... " ;                 0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
-            < "a, b, c, ..." ;              1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
-            < "I, II, III, ... " ;          2/*SVX_NUM_ROMAN_UPPER         */; > ;
-            < "i, ii, iii, ... " ;          3/*SVX_NUM_ROMAN_LOWER         */; > ;
-            < "A, .., AA, .., AAA, ... " ;  9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
+            < "A,B,C, ..." ;                0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
+            < "a,b,c, ..." ;                1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
+            < "I,II,III, ..." ;         2/*SVX_NUM_ROMAN_UPPER         */; > ;
+            < "i,ii,iii, ..." ;             3/*SVX_NUM_ROMAN_LOWER         */; > ;
+            < "A, .., AA, ..,AAA, ..." ;    9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
             < "a, .., aa, .., aaa, ..." ;  10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
-            < "Znak wypunktowania" ;                    6/*SVX_NUM_CHAR_SPECIAL        */; > ;
+            < "Znaki wypunktowania" ;                   6/*SVX_NUM_CHAR_SPECIAL        */; > ;
             < "Grafika" ;                   8/*SVX_NUM_BITMAP              */; > ;
-            < "Do��czone grafiki" ;             0x88/*SVX_NUM_BITMAP|0x80      */; > ;
+            < "Grafika po��czona" ;             0x88/*SVX_NUM_BITMAP|0x80      */; > ;
             < "Brak" ;                      5/*SVX_NUM_NUMBER_NONE         */; > ;
         };
         StringList [ portuguese_brazilian ] =
         {
-            < "1, 2, 3, ..." ;              4/*SVX_NUM_ARABIC              */; > ;
-            < "A, B, C, ..." ;              0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
-            < "a, b, c, ..." ;              1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
-            < "I, II, III, ..." ;           2/*SVX_NUM_ROMAN_UPPER         */; > ;
-            < "i, ii, iii, ..." ;           3/*SVX_NUM_ROMAN_LOWER         */; > ;
-            < "A, .., AA, .., AAA, ..." ;   9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
-            < "a, .., aa, .., aaa, ..." ;  10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
-            < "Marcador" ;                  6/*SVX_NUM_CHAR_SPECIAL        */; > ;
-            < "Imagem" ;                    8/*SVX_NUM_BITMAP              */; > ;
-            < "Imagem vinculada" ;          0x88/*SVX_NUM_BITMAP|0x80      */; > ;
-            < "Nenhuma" ;                       5/*SVX_NUM_NUMBER_NONE         */; > ;
+            < "A, B, C, ..." ;              4/*SVX_NUM_ARABIC              */; > ;
+            < "a, b, c, ..." ;              0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
+            < "I, II, III, ..." ;               1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
+            < "i, ii, iii, ..." ;           2/*SVX_NUM_ROMAN_UPPER         */; > ;
+            < "1, 2, 3, ..." ;          3/*SVX_NUM_ROMAN_LOWER         */; > ;
+            < "Keine" ;     9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
+            < "Bullet" ;  10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
+            < "Grafik" ;                    6/*SVX_NUM_CHAR_SPECIAL        */; > ;
+            < "A, .., AA, .., AAA, ..." ;                   8/*SVX_NUM_BITMAP              */; > ;
+            < "a, .., aa, .., aaa, ..." ;           0x88/*SVX_NUM_BITMAP|0x80      */; > ;
+            < "Keine" ;                     5/*SVX_NUM_NUMBER_NONE         */; > ;
         };
         StringList [ japanese ] =
         {
@@ -639,8 +648,8 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
             < "없음" ;    9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
             < "a, .., aa, .., aaa, ..." ;  10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
             < "글머리 기호" ;                  6/*SVX_NUM_CHAR_SPECIAL        */; > ;
-            < "그래픽" ;                     8/*SVX_NUM_BITMAP              */; > ;
-            < "그래픽 연결됨" ;           0x88/*SVX_NUM_BITMAP|0x80      */; > ;
+            < "그림" ;                    8/*SVX_NUM_BITMAP              */; > ;
+            < "그림 연결" ;             0x88/*SVX_NUM_BITMAP|0x80      */; > ;
             < "없음" ;                        5/*SVX_NUM_NUMBER_NONE         */; > ;
         };
         StringList [ chinese_simplified ] =
@@ -715,16 +724,16 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         };
         StringList [ catalan ] =
         {
-            < "1, 2, 3, ..." ;              4/*SVX_NUM_ARABIC              */; > ;
-            < "A, B, C, ..." ;              0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
-            < "a, b, c, ..." ;              1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
-            < "I, II, III, ..." ;           2/*SVX_NUM_ROMAN_UPPER         */; > ;
-            < "i, ii, iii, ..." ;           3/*SVX_NUM_ROMAN_LOWER         */; > ;
-            < "A, .., AA, .., AAA, ..." ;   9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
-            < "a, .., aa, .., aaa, ..." ;  10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
-            < "Vi�eta" ;                    6/*SVX_NUM_CHAR_SPECIAL        */; > ;
-            < "Gr�fics" ;                   8/*SVX_NUM_BITMAP              */; > ;
-            < "Imagen vinculada" ;          0x88/*SVX_NUM_BITMAP|0x80      */; > ;
+            < "1, 2, 3... " ;               4/*SVX_NUM_ARABIC              */; > ;
+            < "A, B, C... " ;               0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
+            < "a, b, c..." ;                1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
+            < "I, II, III... " ;            2/*SVX_NUM_ROMAN_UPPER         */; > ;
+            < "i, ii, iii... " ;            3/*SVX_NUM_ROMAN_LOWER         */; > ;
+            < "A..., AA..., AAA... " ;  9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
+            < "a..., aa..., aaa..." ;  10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
+            < "Pic" ;                   6/*SVX_NUM_CHAR_SPECIAL        */; > ;
+            < "Imatge" ;                    8/*SVX_NUM_BITMAP              */; > ;
+            < "Imatge enlla�ada" ;          0x88/*SVX_NUM_BITMAP|0x80      */; > ;
             < "Cap" ;                       5/*SVX_NUM_NUMBER_NONE         */; > ;
         };
         StringList [ finnish ] =
@@ -741,6 +750,20 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
             < "Linkitetyt kuvat" ;          0x88/*SVX_NUM_BITMAP|0x80      */; > ;
             < "Ei mit��n" ;                     5/*SVX_NUM_NUMBER_NONE         */; > ;
         };
+    StringList [ thai ] =
+    {
+         < "1, 2, 3, ..." ;                 4/*SVX_NUM_ARABIC              */; > ;
+        < "A, B, C, ..." ;              0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
+        < "a, b, c, ..." ;              1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
+        < "I, II, III, ..." ;           2/*SVX_NUM_ROMAN_UPPER         */; > ;
+        < "i, ii, iii, ..." ;           3/*SVX_NUM_ROMAN_LOWER         */; > ;
+        < "A, .., AA, .., AAA, ..." ;   9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
+        < "a, .., aa, .., aaa, ..." ;  10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
+        < "๑, ๒, ๓, ..." ;                    6/*SVX_NUM_CHAR_SPECIAL        */; > ;
+        < "ก, ข, ค, ..." ;                    8/*SVX_NUM_BITMAP              */; > ;
+        < "ก, .., กก, .., กกก, ..." ;           0x88/*SVX_NUM_BITMAP|0x80      */; > ;
+        < "สัญลักษณ์แสดงหัวข้อย่อย" ;                     5/*SVX_NUM_NUMBER_NONE         */; > ;
+    };
     };
     FixedText FT_PREFIX
     {
@@ -767,10 +790,11 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text[ chinese_traditional ] = "之前";
         Text[ arabic ] = "��� �������";
         Text[ greek ] = "���� ���";
-        Text[ korean ] = "전에";
+        Text[ korean ] = "번호 앞";
         Text[ turkish ] = "Ba��na ekle:";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Delante";
+        Text[ catalan ] = "Abans de";
+        Text[ thai ] = "ก่อน";
     };
     Edit ED_PREFIX
     {
@@ -789,7 +813,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text [ ENGLISH ] = "~After" ;
         Text [ norwegian ] = "Bak" ;
         Text [ italian ] = "~Dietro" ;
-        Text [ portuguese_brazilian ] = "Depois" ;
+        Text [ portuguese_brazilian ] = "Atr?s" ;
         Text [ portuguese ] = "A~tr�s" ;
         Text [ finnish ] = "J�lkeen" ;
         Text [ danish ] = "Efter" ;
@@ -801,15 +825,16 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Left = TRUE ;
         Text[ chinese_simplified ] = "编号后";
         Text[ russian ] = "�����";
-        Text[ polish ] = "~Za";
+        Text[ polish ] = "Za";
         Text[ japanese ] = "番号後";
         Text[ chinese_traditional ] = "之後";
         Text[ arabic ] = "��� �������";
         Text[ greek ] = "���� ���";
-        Text[ korean ] = "후에";
+        Text[ korean ] = "번호 뒤";
         Text[ turkish ] = "Sonuna ekle:";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "D~etr�s";
+        Text[ catalan ] = "D~arrere";
+        Text[ thai ] = "หลังจาก";
     };
     Edit ED_SUFFIX
     {
@@ -830,23 +855,24 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text [ swedish ] = "Teckenf~ormatmall" ;
         Text [ danish ] = "Te~gntypografi" ;
         Text [ italian ] = "Modello di carattere:" ;
-        Text [ spanish ] = "Es~tilo de car�cter:" ;
+        Text [ spanish ] = "Es~tilo de caracteres:" ;
         Text [ french ] = "Style de caract�res" ;
         Text [ dutch ] = "~Tekenopmaakprofiel" ;
-        Text [ portuguese_brazilian ] = "~Estilo de caracteres" ;
+        Text [ portuguese_brazilian ] = "Zeichenv~orlage" ;
         Text [ portuguese ] = "~Estilo de caracteres" ;
         Text[ chinese_simplified ] = "字符样式(~C)";
         Text[ russian ] = "����� �������";
-        Text[ polish ] = "~Styl znaku";
+        Text[ polish ] = "Styl znaku:";
         Text[ japanese ] = "文字スタイル(~C)";
         Text[ chinese_traditional ] = "字元樣式(~C)";
         Text[ arabic ] = "��� ������:";
         Text[ greek ] = "���� ����������:";
-        Text[ korean ] = "문자 템플릿(~C)";
+        Text[ korean ] = "문자 스타일(~C)";
         Text[ turkish ] = "Karakter �ablonu:";
         Text[ language_user1 ] = "All \"Vorlage\"/Styles are always written with capital S. 10.5.00EM";
-        Text[ catalan ] = "Es~tilo de car�cter:";
+        Text[ catalan ] = "Es~til de car�cter:";
         Text[ finnish ] = "~Merkkityyli";
+        Text[ thai ] = "ลักษณะ~ตัวอักขระ";
     };
     ListBox LB_CHARFMT
     {
@@ -863,7 +889,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text [ ENGLISH ] = "Co~lor" ;
         Hide = TRUE;
         Text[ italian ] = "Colore";
-        Text[ portuguese_brazilian ] = "Cor";
+        Text[ portuguese_brazilian ] = "~Color:";
         Text[ portuguese ] = "~Cor";
         Text[ danish ] = "~Farve";
         Text[ french ] = "Couleur";
@@ -881,8 +907,9 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text[ korean ] = "색상";
         Text[ turkish ] = "Renk:";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Color:";
+        Text[ catalan ] = "Color:";
         Text[ finnish ] = "V�ri";
+        Text[ thai ] = "สี";
     };
     ListBox LB_BUL_COLOR
     {
@@ -900,7 +927,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text [ ENGLISH ] = "R~elatize size" ;
         Hide = TRUE;
         Text[ italian ] = "Dimensione relativa";
-        Text[ portuguese_brazilian ] = "~Tamanho relativo";
+        Text[ portuguese_brazilian ] = "~Relatize size:";
         Text[ portuguese ] = "~Tamanho relativo";
         Text[ danish ] = "~Relativ st�rrelse";
         Text[ french ] = "Taille relative";
@@ -910,16 +937,17 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text[ english_us ] = "~Relative size";
         Text[ chinese_simplified ] = "相对的大小(~R)";
         Text[ russian ] = "�������. ������";
-        Text[ polish ] = "~Rozmiar wzgl�dny";
+        Text[ polish ] = "Rozmiar wzgl�dny";
         Text[ japanese ] = "相対的なサイズ(~R)";
         Text[ chinese_traditional ] = "相對的大小(~R)";
         Text[ arabic ] = ":��� ����";
         Text[ greek ] = "������� �������:";
-        Text[ korean ] = "상대적 크기(~R)";
+        Text[ korean ] = "기준 크기(~R)";
         Text[ turkish ] = "Orant�l� boyut:";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Tama�o relativo:";
+        Text[ catalan ] = "Mida ~relativa:";
         Text[ finnish ] = "~Suhteellinen koko:";
+        Text[ thai ] = "ขนาด~สัมพัทธ์";
     };
     MetricField MF_BUL_REL_SIZE
     {
@@ -945,7 +973,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text [ ENGLISH ] = "Sh~ow sublevels" ;
         Text [ norwegian ] = "~Fullstendig" ;
         Text [ italian ] = "~Completa" ;
-        Text [ portuguese_brazilian ] = "Co~mpleto" ;
+        Text [ portuguese_brazilian ] = "~Completar" ;
         Text [ portuguese ] = "Co~mpleto" ;
         Text [ finnish ] = "N�yt� alitasot" ;
         Text [ danish ] = "F~uldst�ndig" ;
@@ -956,15 +984,16 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text [ english_us ] = "Show sublevels" ;
         Text[ chinese_simplified ] = "完整";
         Text[ russian ] = "��� ������";
-        Text[ polish ] = "Poka� podpoziomy";
+        Text[ polish ] = "Wszystkie poziomy";
         Text[ japanese ] = "総レベル数";
         Text[ chinese_traditional ] = "完整";
         Text[ arabic ] = "����";
         Text[ greek ] = "������������";
-        Text[ korean ] = "전체";
+        Text[ korean ] = "모든 하위 수준 표시";
         Text[ turkish ] = "T�m d�zeyler";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Completo";
+        Text[ catalan ] = "Mostra els subnivells";
+        Text[ thai ] = "แสดงระดับย่อย";
     };
     NumericField NF_ALL_LEVEL
     {
@@ -989,7 +1018,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text [ ENGLISH ] = "S~tart at" ;
         Text [ norwegian ] = "~Start p�" ;
         Text [ italian ] = "~Comincia con" ;
-        Text [ portuguese_brazilian ] = "~Come�ar em" ;
+        Text [ portuguese_brazilian ] = "~Come?ar em" ;
         Text [ portuguese ] = "~Come�ar em" ;
         Text [ finnish ] = "Aloita kohdasta" ;
         Text [ danish ] = "Be~gyndelse ved" ;
@@ -1006,10 +1035,11 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text[ chinese_traditional ] = "開始從";
         Text[ arabic ] = "��� ������� ��";
         Text[ greek ] = "���� ���������";
-        Text[ korean ] = "에서 시작";
+        Text[ korean ] = "시작 번호";
         Text[ turkish ] = "Ba�lang��";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "E~mpezar en";
+        Text[ catalan ] = "Inicia a";
+        Text[ thai ] = "เริ่มที่";
     };
     NumericField ED_START
     {
@@ -1035,7 +1065,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text [ English ] = "Show sym~bol" ;
         Hide = TRUE;
         Text[ italian ] = "Mostra simbolo";
-        Text[ portuguese_brazilian ] = "~Mostrar s�mbolo";
+        Text[ portuguese_brazilian ] = "~Show symbol";
         Text[ portuguese ] = "~Mostrar s�mbolo";
         Text[ danish ] = "Vis symbol";
         Text[ french ] = "~Afficher le symbole";
@@ -1053,8 +1083,9 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text[ korean ] = "기호 표시";
         Text[ turkish ] = "Simgeyi g�r�nt�le";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Mostrar s�mbolo";
+        Text[ catalan ] = "~Mostra el s�mbol";
         Text[ finnish ] = "N�yt� symboli";
+        Text[ thai ] = "แสดงสัญลักษณ์";
     };
     FixedText FT_ALIGN
     {
@@ -1065,7 +1096,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text [ english_us ] = "~Alignment" ;
         Hide = TRUE;
         Text[ italian ] = "Allineamento";
-        Text[ portuguese_brazilian ] = "~Alinhamento";
+        Text[ portuguese_brazilian ] = "~Alignment";
         Text[ portuguese ] = "~Alinhamento";
         Text[ danish ] = "Justering";
         Text[ french ] = "Alignement";
@@ -1074,7 +1105,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text[ spanish ] = "~Alineaci�n";
         Text[ chinese_simplified ] = "对齐(~A)";
         Text[ russian ] = "������������";
-        Text[ polish ] = "~Wyr�wnanie";
+        Text[ polish ] = "Wyr�wnanie";
         Text[ japanese ] = "配置(~A)";
         Text[ chinese_traditional ] = "對齊(~A)";
         Text[ arabic ] = "������";
@@ -1082,8 +1113,9 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text[ korean ] = "맞춤(~A)";
         Text[ turkish ] = "Hizalama";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Alineaci�n";
+        Text[ catalan ] = "~Alineament";
         Text[ finnish ] = "~Tasaus";
+        Text[ thai ] = "~จัดตำแหน่ง";
     };
     ListBox LB_ALIGN
     {
@@ -1112,9 +1144,9 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         };
         stringlist [ portuguese_brazilian ] =
         {
-            < "Esquerda" ; > ;
-            < "Centrado" ; > ;
-            < "Direita" ; > ;
+            < "Links" ; > ;
+            < "Zentriert" ; > ;
+            < "Rechts" ; > ;
         };
         stringlist [ swedish ] =
         {
@@ -1178,8 +1210,8 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         };
         StringList [ polish ] =
         {
-            < "Z lewej" ; > ;
-            < "Po�rodku" ; > ;
+            < "Z lewej strony" ; > ;
+            < "Do �rodka" ; > ;
             < "Z prawej strony" ; > ;
         };
         StringList [ japanese ] =
@@ -1230,6 +1262,12 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
             < "Keskitetty" ; > ;
             < "Oikea" ; > ;
         };
+    StringList [ thai ] =
+    {
+         < "ซ้าย" ; > ;
+        < "ตรงกลาง" ; > ;
+        < "ขวา" ; > ;
+    };
     };
     String STR_BULLET
     {
@@ -1237,7 +1275,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text [ ENGLISH ] = "~Character" ;
         Text [ norwegian ] = "Character" ;
         Text [ italian ] = "Ca~rattere" ;
-        Text [ portuguese_brazilian ] = "Caracter" ;
+        Text [ portuguese_brazilian ] = "Caractere" ;
         Text [ portuguese ] = "~Car�cter" ;
         Text [ finnish ] = "Merkki" ;
         Text [ danish ] = "Tegn" ;
@@ -1249,14 +1287,15 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text[ chinese_simplified ] = "字符";
         Text[ russian ] = "�������";
         Text[ polish ] = "Znak";
-        Text[ japanese ] = "文字";
+        Text[ japanese ] = "記号";
         Text[ chinese_traditional ] = "字元";
         Text[ arabic ] = "���";
         Text[ greek ] = "����������";
-        Text[ korean ] = "문자";
+        Text[ korean ] = "기호 및 문자";
         Text[ turkish ] = "Karakter";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "C~ar�cter";
+        Text[ catalan ] = "C~ar�cter";
+        Text[ thai ] = "ตัวอักขระ";
     };
     PushButton PB_BULLET
     {
@@ -1274,7 +1313,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text = "Grafik" ;
         Text [ English ] = "Graphic" ;
         Text [ english_us ] = "Graphics" ;
-        Text [ portuguese_brazilian ] = "Imagem" ;
+        Text [ portuguese_brazilian ] = "Grafik" ;
         Text [ swedish ] = "Grafik" ;
         Text [ danish ] = "Grafik" ;
         Text [ italian ] = "Immagine" ;
@@ -1289,11 +1328,12 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text[ chinese_traditional ] = "圖形";
         Text[ arabic ] = "����";
         Text[ greek ] = "�������";
-        Text[ korean ] = "그래픽";
+        Text[ korean ] = "그림";
         Text[ turkish ] = "Grafik";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Gr�fics";
+        Text[ catalan ] = "Imatge";
         Text[ finnish ] = "Grafiikka";
+        Text[ thai ] = "กราฟิค";
     };
     MenuButton MB_BITMAP
     {
@@ -1315,7 +1355,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
                      //                    HelpID = HID_NUM_NAMED_NUMS ;
                     Text [ portuguese ] = "Do ficheiro..." ;
                     Text [ english_us ] = "From file..." ;
-                    Text [ portuguese_brazilian ] = "Do arquivo..." ;
+                    Text [ portuguese_brazilian ] = "Aus Datei..." ;
                     Text [ swedish ] = "Fr�n fil..." ;
                     Text [ danish ] = "Fra fil..." ;
                     Text [ italian ] = "Dal file..." ;
@@ -1329,11 +1369,12 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
                     Text[ chinese_traditional ] = "從檔案...";
                     Text[ arabic ] = "...�� ���";
                     Text[ greek ] = "��� ������...";
-                    Text[ korean ] = "...파일로부터";
+                    Text[ korean ] = "파일로부터...";
                     Text[ turkish ] = "Dosyadan...";
                     Text[ language_user1 ] = " ";
-                    Text[ catalan ] = "De archivo...";
+                    Text[ catalan ] = "Des d'un fitxer...";
                     Text[ finnish ] = "Tiedostosta...";
+                    Text[ thai ] = "จากแฟ้ม...";
                 };
                 MenuItem
                 {
@@ -1352,19 +1393,20 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
                     Text[ danish ] = "Gallery";
                     Text[ swedish ] = "Gallery";
                     Text[ polish ] = "Galeria";
-                    Text[ portuguese_brazilian ] = "Galeria";
+                    Text[ portuguese_brazilian ] = "Gallery";
                     Text[ japanese ] = "ギャラリ";
                     Text[ korean ] = "갤러리";
                     Text[ chinese_simplified ] = "画廊";
                     Text[ chinese_traditional ] = "畫廊";
                     Text[ turkish ] = "Galeri";
                     Text[ arabic ] = "��������";
-                    Text[ catalan ] = "Gallery";
+                    Text[ catalan ] = "Galeria";
+                    Text[ thai ] = "แกลลอรี่";
                 };
             };
         };
         Text [ english_us ] = "Select..." ;
-        Text [ portuguese_brazilian ] = "Selecionar..." ;
+        Text [ portuguese_brazilian ] = "Aus~wahl..." ;
         Text [ swedish ] = "~Urval..." ;
         Text [ danish ] = "V�lg..." ;
         Text [ italian ] = "Scelta..." ;
@@ -1374,16 +1416,17 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text [ portuguese ] = "~Seleccionar..." ;
         Text[ chinese_simplified ] = "选择...";
         Text[ russian ] = "�����...";
-        Text[ polish ] = "Wybierz...";
+        Text[ polish ] = "Wyb�r...";
         Text[ japanese ] = "選択...";
         Text[ chinese_traditional ] = "選擇...";
         Text[ arabic ] = "...�����";
         Text[ greek ] = "�����~��...";
-        Text[ korean ] = "...선택";
+        Text[ korean ] = "선택...";
         Text[ turkish ] = "Se�im...";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Selec~ci�n...";
+        Text[ catalan ] = "Selecciona...";
         Text[ finnish ] = "Valitse...";
+        Text[ thai ] = "เลือก...";
     };
     FixedText FT_SIZE
     {
@@ -1393,7 +1436,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text = "~Breite" ;
         Text [ English ] = "~Width" ;
         Text [ english_us ] = "Width" ;
-        Text [ portuguese_brazilian ] = "Largura" ;
+        Text [ portuguese_brazilian ] = "~Breite" ;
         Text [ swedish ] = "~Bredd" ;
         Text [ danish ] = "Bredde" ;
         Text [ italian ] = "Larghezza" ;
@@ -1403,7 +1446,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text [ portuguese ] = "~Largura" ;
         Text[ chinese_simplified ] = "宽度";
         Text[ russian ] = "������";
-        Text[ polish ] = "Szeroko��";
+        Text[ polish ] = "Szer.";
         Text[ japanese ] = "幅";
         Text[ chinese_traditional ] = "寬度";
         Text[ arabic ] = "�����";
@@ -1411,8 +1454,9 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text[ korean ] = "너비";
         Text[ turkish ] = "Geni�lik";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Amplada";
+        Text[ catalan ] = "Amplada";
         Text[ finnish ] = "Leveys";
+        Text[ thai ] = "ความกว้าง";
     };
     MetricField MF_WIDTH
     {
@@ -1441,7 +1485,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text = "H~�he" ;
         Text [ English ] = "Hei~ght" ;
         Text [ english_us ] = "Height" ;
-        Text [ portuguese_brazilian ] = "Altura" ;
+        Text [ portuguese_brazilian ] = "~H?e" ;
         Text [ swedish ] = "H~�jd" ;
         Text [ danish ] = "H~�jde" ;
         Text [ italian ] = "Altezza" ;
@@ -1459,8 +1503,9 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text[ korean ] = "높이";
         Text[ turkish ] = "Y�kseklik";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Al�ada";
+        Text[ catalan ] = "A~l�ada";
         Text[ finnish ] = "Korkeus";
+        Text[ thai ] = "ความสูง";
     };
     MetricField MF_HEIGHT
     {
@@ -1489,26 +1534,27 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text = "Abg~leich" ;
         Text [ English ] = "~Keep ratio" ;
         Text [ english_us ] = "Keep ratio" ;
-        Text [ portuguese_brazilian ] = "Manter aspecto" ;
+        Text [ portuguese_brazilian ] = "Abgleich" ;
         Text [ swedish ] = "Anpassa ~proportionellt" ;
         Text [ danish ] = "Proportional" ;
         Text [ italian ] = "Sin~cronizza" ;
-        Text [ spanish ] = "~Sincronizaci�n" ;
+        Text [ spanish ] = "Proporcional" ;
         Text [ french ] = "Proportionnel" ;
         Text [ dutch ] = "~Synchroniseren" ;
         Text [ portuguese ] = "Pr~oporcional" ;
         Text[ chinese_simplified ] = "同步化";
         Text[ russian ] = "���������������";
-        Text[ polish ] = "Zachowaj proporcje";
+        Text[ polish ] = "Synchronizacja";
         Text[ japanese ] = "調整";
         Text[ chinese_traditional ] = "同步化";
         Text[ arabic ] = "�����";
         Text[ greek ] = "���~������";
-        Text[ korean ] = "자동 맞춤";
+        Text[ korean ] = "비율을 균등하게 조정";
         Text[ turkish ] = "Orant�l�";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Sincronizaci�n";
+        Text[ catalan ] = "~Sincronitzaci�";
         Text[ finnish ] = "S�ilyt� suhde";
+        Text[ thai ] = "รักษาอัตราส่วน";
     };
     FixedText FT_ORIENT
     {
@@ -1518,7 +1564,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text = "A~usrichtung" ;
         Text [ English ] = "Align~ment" ;
         Text [ english_us ] = "Alignment" ;
-        Text [ portuguese_brazilian ] = "Alinhamento" ;
+        Text [ portuguese_brazilian ] = "Ausrichtung" ;
         Text [ swedish ] = "~Justering" ;
         Text [ danish ] = "Justering" ;
         Text [ italian ] = "Allineamento" ;
@@ -1533,11 +1579,12 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text[ chinese_traditional ] = "對齊";
         Text[ arabic ] = "������";
         Text[ greek ] = "~���������������";
-        Text[ korean ] = "방향";
+        Text[ korean ] = "맞춤";
         Text[ turkish ] = "Hizalama";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Orientaci�n";
+        Text[ catalan ] = "Alineament";
         Text[ finnish ] = "Tasaus";
+        Text[ thai ] = "จัดตำแหน่ง";
     };
     ListBox LB_ORIENT
     {
@@ -1585,15 +1632,15 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         };
         stringlist [ portuguese_brazilian ] =
         {
-            < "Acima da linha de refer�ncia" ; > ;
-            < "Centro da linha de refer�ncia" ; > ;
-            < "Abaixo da linha de refer�ncia" ; > ;
-            < "Topo do caracter" ; > ;
-            < "Centro do caracter" ; > ;
-            < "Base do caracter" ; > ;
-            < "Topo da linha" ; > ;
-            < "Centro da linha" ; > ;
-            < "Base da linha" ; > ;
+            < "Basis oben" ; > ;
+            < "Basis zentriert" ; > ;
+            < "Basis unten" ; > ;
+            < "Zeichen oben" ; > ;
+            < "Zeichen zentriert" ; > ;
+            < "Zeichen unten" ; > ;
+            < "Zeile oben" ; > ;
+            < "Zeile zentriert" ; > ;
+            < "Zeile unten" ; > ;
         };
         stringlist [ swedish ] =
         {
@@ -1639,9 +1686,9 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
             < "Car�cter arriba" ; > ;
             < "Car�cter centrado" ; > ;
             < "Car�cter abajo" ; > ;
-            < "L�nea superior" ; > ;
-            < "L�nea centro" ; > ;
-            < "L�nea inferior" ; > ;
+            < "L�nea arriba" ; > ;
+            < "L�nea centrada" ; > ;
+            < "L�nea abajo" ; > ;
         };
         stringlist [ french ] =
         {
@@ -1651,9 +1698,9 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
             < "D�calage haut" ; > ;
             < "Caract�re centr�" ; > ;
             < "D�calage bas" ; > ;
-            < "Ligne sup�rieure" ; > ;
+            < "Ligne en haut" ; > ;
             < "Ligne centr�e" ; > ;
-            < "Ligne inf�rieure" ; > ;
+            < "Ligne en bas" ; > ;
         };
         stringlist [ dutch ] =
         {
@@ -1717,15 +1764,15 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         };
         StringList [ polish ] =
         {
-            < "G�ra linii odniesienia" ; > ;
-            < "�rodek linii odniesienia" ; > ;
-            < "D� linii odniesienia" ; > ;
-            < "G�ra znaku" ; > ;
-            < "�rodek znaku" ; > ;
-            < "D� znaku" ; > ;
-            < "G�ra wiersza" ; > ;
-            < "�rodek wiersza" ; > ;
-            < "D� wiersza" ; > ;
+            < "Linia odniesienia w g�rze" ; > ;
+            < "Wy�rodkowana linia odniesienia" ; > ;
+            < "Linia odniesienia w dole" ; > ;
+            < "Znak w g�rze" ; > ;
+            < "Wy�rodkuj znaki" ; > ;
+            < "Znak w dole" ; > ;
+            < "Wiersz w g�rze" ; > ;
+            < "Wy�rodkuj wiersz" ; > ;
+            < "Wiersz w dole" ; > ;
         };
         StringList [ japanese ] =
         {
@@ -1777,15 +1824,15 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         };
         StringList [ korean ] =
         {
-            < "기준, 위" ; > ;
-            < "기준, 가운데" ; > ;
-            < "기준, 아래" ; > ;
-            < "문자, 위" ; > ;
-            < "문자, 가운데" ; > ;
+            < "기준선의 위" ; > ;
+            < "기준선 가운데" ; > ;
+            < "기준선의 아래" ; > ;
+            < "문자 위" ; > ;
+            < "문자 가운데" ; > ;
             < "문자, 아래" ; > ;
-            < "행, 위" ; > ;
-            < "행, 가운데" ; > ;
-            < "행, 아래" ; > ;
+            < "줄 위" ; > ;
+            < "줄 가운데" ; > ;
+            < "줄 아래" ; > ;
         };
         StringList [ turkish ] =
         {
@@ -1801,15 +1848,15 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         };
         StringList [ catalan ] =
         {
-            < "Encima de l�nea de refefencia" ; > ;
-            < "Centro de l�nea de referencia" ; > ;
-            < "Debajo de l�nea de referencia" ; > ;
-            < "Car�cter arriba" ; > ;
-            < "Car�cter centrado" ; > ;
-            < "Car�cter abajo" ; > ;
-            < "L�nea superior" ; > ;
-            < "L�nea centro" ; > ;
-            < "L�nea inferior" ; > ;
+            < "M�s amunt de la l�nia de refer�ncia" ; > ;
+            < "Al centre de la l�nia de refer�ncia" ; > ;
+            < "M�s avall de la l�nia de refer�ncia" ; > ;
+            < "Car�cter amunt" ; > ;
+            < "Car�cter centrat" ; > ;
+            < "Car�cter avall" ; > ;
+            < "L�nia superior" ; > ;
+            < "L�nia central" ; > ;
+            < "L�nia inferior" ; > ;
         };
         StringList [ finnish ] =
         {
@@ -1823,6 +1870,18 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
             < "Viivan keskikohta" ; > ;
             < "Viivan alareuna" ; > ;
         };
+    StringList [ thai ] =
+    {
+         < "ด้านบนของบรรทัดหลัก" ; > ;
+        < "ตรงกลางของบรรทัดหลัก" ; > ;
+        < "ด้านล่างของบรรทัดหลัก" ; > ;
+        < "ด้านบนของตัวอักขระ" ; > ;
+        < "ตรงกลางของตัวอักขระ" ; > ;
+        < "ด้านล่างของตัวอักขระ" ; > ;
+        < "ด้านบนของบรรทัด" ; > ;
+        < "ตรงกลางของบรรทัด" ; > ;
+        < "ด้านล่างของบรรทัด" ; > ;
+    };
     };
     FixedLine FL_SAME_LEVEL
     {
@@ -1831,7 +1890,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text = "Alle Ebenen" ;
         Text [ ENGLISH ] = "All levels" ;
         Text [ english_us ] = "All levels" ;
-        Text [ portuguese_brazilian ] = "Todos os n�veis" ;
+        Text [ portuguese_brazilian ] = "Alle Ebenen" ;
         Text [ swedish ] = "Alla niv�er" ;
         Text [ danish ] = "Alle niveauer" ;
         Text [ italian ] = "Tutti i livelli" ;
@@ -1849,8 +1908,9 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text[ korean ] = "모든 수준";
         Text[ turkish ] = "T�m d�zeyler";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Todos los niveles";
+        Text[ catalan ] = "Tots els nivells";
         Text[ finnish ] = "Kaikki tasot";
+        Text[ thai ] = "ระดับทั้งหมด";
     };
     CheckBox CB_SAME_LEVEL
     {
@@ -1859,7 +1919,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text = "~Fortlaufende Nu~mmerierung" ;
         Text [ ENGLISH ] = "Continuous n~umbering" ;
         Text [ english_us ] = "~Consecutive numbering" ;
-        Text [ portuguese_brazilian ] = "Numera��o c~ont�nua" ;
+        Text [ portuguese_brazilian ] = "~Fortlaufende Numerierung" ;
         Text [ swedish ] = "Fort~l�pande numrering" ;
         Text [ danish ] = "~Fortl�bende nu~mmerering" ;
         Text [ italian ] = "~Numerazione continua" ;
@@ -1869,7 +1929,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text [ portuguese ] = "Numera��o c~ont�nua" ;
         Text[ chinese_simplified ] = "连续编号(~C)";
         Text[ russian ] = "���������������� ���������";
-        Text[ polish ] = "Numeracja ~ci�g�a";
+        Text[ polish ] = "~Kontynuacja poprzedniej numeracji";
         Text[ japanese ] = "通し番号(~C)";
         Text[ chinese_traditional ] = "連續編號(~C)";
         Text[ arabic ] = "������� ���� ������";
@@ -1877,8 +1937,9 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text[ korean ] = "연속 번호 매기기(~C)";
         Text[ turkish ] = "S�rekli numaralama";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Numeraci�n c~onsecutiva";
+        Text[ catalan ] = "Numeraci� c~onsecutiva";
         Text[ finnish ] = "~Jatkuva numerointi";
+        Text[ thai ] = "ลำดับตัวเลขแบบ~ต่อกัน";
     };
     Window WIN_PREVIEW
     {
@@ -1900,16 +1961,17 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
         Text[ italian ] = "La cartella 'Bullets' della Gallery � vuota.";
         Text[ danish ] = "Der findes ingen grafik i Gallery-emnet 'Punkttegn'.";
         Text[ swedish ] = "Det finns ingen grafik i Gallery-temat 'Punkter'.";
-        Text[ polish ] = "Temat Galerii 'Znaki wypunktowania' jest pusty (nie ma w nim �adnych grafik).";
-        Text[ portuguese_brazilian ] = "N�o h� imagens no tema 'Bullets' da Galeria.";
-        Text[ japanese ] = "ギャラリテーマ「箇条書き記号」に図はありません。";
-        Text[ korean ] = "갤러리 주제 '글머리 기호'에 그래픽이 없습니다.";
+        Text[ polish ] = "Brak grafik w temacie Galerii 'Znaki wypunktowania'.";
+        Text[ portuguese_brazilian ] = "Thera are no bitmaps in the Gallery theme 'Bullets'.";
+        Text[ japanese ] = "ギャラリテーマ「箇条書きシンボル」に図はありません。";
+        Text[ korean ] = "갤러리 주제 [글머리 기호]에 그림이 없습니다.";
         Text[ chinese_simplified ] = "画廊文件‘项目符号’内不存在图形。";
         Text[ chinese_traditional ] = "畫廊主題[項目符號]中沒有圖形。";
         Text[ turkish ] = "Thera are no bitmaps in the Gallery theme 'Bullets'.";
         Text[ arabic ] = "�� ���� ��� ��� �� ����� �������� 'Bullets'.";
-        Text[ catalan ] = "No existen im�genes en el tema 'Vi�etas' de la Gallery.";
+        Text[ catalan ] = "No hi ha imatges en el tema 'Bullets' de la Galeria.";
         Text[ finnish ] = "Galleriateemassa Luettelomerkit ei ole kuvia.";
+        Text[ thai ] = "ไม่มีกราฟิคใน'สัญลักษณ์แสดงหัวข้อย่อย' ชุดคลังภาพ";
     };
 
 };
@@ -1948,10 +2010,11 @@ TabPage RID_SVXPAGE_NUM_POSITION
         Text[ chinese_traditional ] = "級";
         Text[ arabic ] = "�������";
         Text[ greek ] = "�������";
-        Text[ korean ] = "차원";
+        Text[ korean ] = "수준";
         Text[ turkish ] = "D�zey";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Nivel";
+        Text[ catalan ] = "Nivell";
+        Text[ thai ] = "ระดับ";
     };
     MultiListBox LB_LEVEL
     {
@@ -1976,7 +2039,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
         Text [ dutch ] = "Positie en afstand" ;
         Text [ swedish ] = "Position och avst�nd" ;
         Text [ danish ] = "Placering og afstand" ;
-        Text [ portuguese_brazilian ] = "Posi��o e espa�amento" ;
+        Text [ portuguese_brazilian ] = "Position" ;
         Text [ portuguese ] = "Posi��o e espa�amento" ;
         Text[ chinese_simplified ] = "位置和间隔";
         Text[ russian ] = "��������� � ��������";
@@ -1985,11 +2048,12 @@ TabPage RID_SVXPAGE_NUM_POSITION
         Text[ chinese_traditional ] = "位置和間隔";
         Text[ arabic ] = "������ ��������";
         Text[ greek ] = "���� ��� ��������";
-        Text[ korean ] = "위치와 간격";
+        Text[ korean ] = "위치 및 간격";
         Text[ language_user1 ] = " ";
         Text[ turkish ] = "Konum ve aral�k";
-        Text[ catalan ] = "Posici�n y espacio";
+        Text[ catalan ] = "Posici� i espai";
         Text[ finnish ] = "Sijainti ja v�lit";
+        Text[ thai ] = "ตำแหน่งและระยะห่าง";
     };
     FixedText FT_BORDERDIST
     {
@@ -2004,11 +2068,11 @@ TabPage RID_SVXPAGE_NUM_POSITION
         Text [ spanish ] = "~Sangr�a" ;
         Text [ french ] = "Retrait" ;
         Text [ dutch ] = "In~springing" ;
-        Text [ portuguese_brazilian ] = "Avan�o" ;
+        Text [ portuguese_brazilian ] = "Ab~stand Text <-> Rand" ;
         Text [ portuguese ] = "A~van�o" ;
         Text[ chinese_simplified ] = "缩进";
         Text[ russian ] = "������";
-        Text[ polish ] = "Wci�cie";
+        Text[ polish ] = "Wci�cie pierwsz. wiersza";
         Text[ japanese ] = "インデント";
         Text[ chinese_traditional ] = "縮排";
         Text[ arabic ] = "������� ��� ������";
@@ -2016,8 +2080,9 @@ TabPage RID_SVXPAGE_NUM_POSITION
         Text[ korean ] = "들여쓰기";
         Text[ turkish ] = "Girinti";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Sangr�a";
+        Text[ catalan ] = "Sagnat";
         Text[ finnish ] = "Sisenn�";
+        Text[ thai ] = "ระยะเยื้อง";
     };
     CheckBox CB_RELATIVE
     {
@@ -2027,7 +2092,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
         Text [ ENGLISH ] = "Relati~ve" ;
         Text [ portuguese ] = "~Relativo" ;
         Text [ english_us ] = "Relati~ve" ;
-        Text [ portuguese_brazilian ] = "~Relativo" ;
+        Text [ portuguese_brazilian ] = "Relati~v" ;
         Text [ swedish ] = "Relati~vt" ;
         Text [ danish ] = "Relativ" ;
         Text [ italian ] = "Relativo" ;
@@ -2041,11 +2106,12 @@ TabPage RID_SVXPAGE_NUM_POSITION
         Text[ chinese_traditional ] = "相對的(~V)";
         Text[ arabic ] = "����";
         Text[ greek ] = "�������";
-        Text[ korean ] = "상대적(~V)";
+        Text[ korean ] = "비례하여(~V)";
         Text[ turkish ] = "G�receli";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Relati~vo";
+        Text[ catalan ] = "Relati~u";
         Text[ finnish ] = "~Suhteellinen";
+        Text[ thai ] = "สัมพั~ทธ์";
     };
     MetricField MF_BORDERDIST
     {
@@ -2078,7 +2144,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
         Text [ spanish ] = "~Distancia al texto" ;
         Text [ french ] = "�cart du texte" ;
         Text [ dutch ] = "Afstand tot ~tekst" ;
-        Text [ portuguese_brazilian ] = "Dist�ncia do ~texto" ;
+        Text [ portuguese_brazilian ] = "Einr~?kung" ;
         Text [ portuguese ] = "Dist�ncia do ~texto" ;
         Text[ chinese_simplified ] = "至文字的距离";
         Text[ russian ] = "���������� �� ������";
@@ -2087,11 +2153,12 @@ TabPage RID_SVXPAGE_NUM_POSITION
         Text[ chinese_traditional ] = "至文字的距离";
         Text[ arabic ] = "������� ��� ����";
         Text[ greek ] = "�������� ��� ~�������";
-        Text[ korean ] = "텍스트에 대한 간격";
+        Text[ korean ] = "텍스트와의 간격";
         Text[ turkish ] = "Metin uzakl���";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Distancia al texto";
+        Text[ catalan ] = "Espaiat al text";
         Text[ finnish ] = "V�lit tekstiin";
+        Text[ thai ] = "ระยะห่างถึงข้อความ";
     };
     MetricField MF_INDENT
     {
@@ -2124,20 +2191,21 @@ TabPage RID_SVXPAGE_NUM_POSITION
         Text [ spanish ] = "Distancia m�nima n�mero <-> texto" ;
         Text [ french ] = "�cart ~minimum num�rotation <-> texte" ;
         Text [ dutch ] = "~Minimale afstand nummer <-> tekst" ;
-        Text [ portuguese_brazilian ] = "~Dist�ncia m�nima texto <-> numera��o" ;
+        Text [ portuguese_brazilian ] = "Abstand Te~xt <-> Numerierung" ;
         Text [ portuguese ] = "~Dist�ncia m�nima texto <-> numera��o" ;
         Text[ chinese_simplified ] = "编号和正文之间的最少间隔";
         Text[ russian ] = "���. ���������� ����� <-> �����";
-        Text[ polish ] = "Minim~alny odst�p numeracja <-> tekst";
+        Text[ polish ] = "Minimalny odst�p numeracja <-> tekst";
         Text[ japanese ] = "番号とテキストの最小間隔";
         Text[ chinese_traditional ] = "編號和內文之間的最少間隔";
         Text[ arabic ] = "��� ����� ��� ����� <-> ����";
         Text[ greek ] = "�������� �������� ����~��� <-> �������";
-        Text[ korean ] = "최소 간격,  번호 <-> 텍스트";
+        Text[ korean ] = "번호와 텍스트의 최소 간격";
         Text[ turkish ] = "Asgari aral�k: Numara <-> Metin";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Distancia m�nima n�mero <-> texto";
+        Text[ catalan ] = "Dist�ncia m�nima n�mero <-> text";
         Text[ finnish ] = "Numeroinnin ja tekstin v�lill� v�hint��n";
+        Text[ thai ] = "ลำดับระยะห่างน้อยที่สุด <-> ข้อความ";
     };
     MetricField MF_NUMDIST
     {
@@ -2167,10 +2235,10 @@ TabPage RID_SVXPAGE_NUM_POSITION
         Text [ swedish ] = "Justering av numrering" ;
         Text [ danish ] = "Justering af nummerering" ;
         Text [ italian ] = "~Allineamento della numerazione" ;
-        Text [ spanish ] = "~Alineaci�n de numeraci�n" ;
+        Text [ spanish ] = "~Alineaci�n de la numeraci�n" ;
         Text [ french ] = "~Alignement de la num�rotation" ;
         Text [ dutch ] = "~Uitlijning van nummering" ;
-        Text [ portuguese_brazilian ] = "A~linhamento da numera��o" ;
+        Text [ portuguese_brazilian ] = "Ausri~chtung der Numerierung" ;
         Text [ portuguese ] = "A~linhamento da numera��o" ;
         Text[ chinese_simplified ] = "编号对齐(~U)";
         Text[ russian ] = "������������ ���������";
@@ -2182,8 +2250,9 @@ TabPage RID_SVXPAGE_NUM_POSITION
         Text[ korean ] = "번호 매기기 맞춤(~U)";
         Text[ turkish ] = "Numara hizalama";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Alineaci�n de numeraci�n";
+        Text[ catalan ] = "~Alineament de numeraci�";
         Text[ finnish ] = "Numeroiden ~tasaus";
+        Text[ thai ] = "จัด~ลำดับตัวเลข";
     };
     ListBox LB_ALIGN
     {
@@ -2211,9 +2280,9 @@ TabPage RID_SVXPAGE_NUM_POSITION
         };
         stringlist [ portuguese_brazilian ] =
         {
-            < "Esquerda" ; > ;
-            < "Centrado" ; > ;
-            < "Direita" ; > ;
+            < "Links" ; > ;
+            < "Zentriert" ; > ;
+            < "Rechts" ; > ;
         };
         stringlist [ swedish ] =
         {
@@ -2277,7 +2346,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
         };
         StringList [ polish ] =
         {
-            < "Do lewej" ; > ;
+            < "Z lewej strony" ; > ;
             < "Do �rodka" ; > ;
             < "Do prawej" ; > ;
         };
@@ -2329,6 +2398,12 @@ TabPage RID_SVXPAGE_NUM_POSITION
             < "Keskitetty" ; > ;
             < "Oikea" ; > ;
         };
+    StringList [ thai ] =
+    {
+         < "ซ้าย" ; > ;
+        < "ตรงกลาง" ; > ;
+        < "ขวา" ; > ;
+    };
     };
     PushButton PB_STANDARD
     {
@@ -2337,7 +2412,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
         Text = "~Standard" ;
         Text [ ENGLISH ] = "~Default" ;
         Text [ english_us ] = "Default" ;
-        Text [ portuguese_brazilian ] = "Padr�o" ;
+        Text [ portuguese_brazilian ] = "~Standard" ;
         Text [ swedish ] = "S~tandard" ;
         Text [ danish ] = "Standard" ;
         Text [ italian ] = "~Standard" ;
@@ -2352,11 +2427,12 @@ TabPage RID_SVXPAGE_NUM_POSITION
         Text[ chinese_traditional ] = "標準";
         Text[ arabic ] = "�����";
         Text[ greek ] = "����������";
-        Text[ korean ] = "기본 값";
+        Text[ korean ] = "기본값";
         Text[ turkish ] = "Standart";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Est�ndard";
+        Text[ catalan ] = "Per defecte";
         Text[ finnish ] = "Oletus";
+        Text[ thai ] = "ค่าเริ่มต้น";
     };
     Window WIN_PREVIEW
     {
@@ -2372,7 +2448,7 @@ String RID_STR_EDIT_GRAPHIC
     Text [ English ] = "Link to" ;
     Text [ norwegian ] = "Link to" ;
     Text [ italian ] = "Collega" ;
-    Text [ portuguese_brazilian ] = "Vincular" ;
+    Text [ portuguese_brazilian ] = "Liga??o com" ;
     Text [ portuguese ] = "Ligar" ;
     Text [ finnish ] = "Linkki" ;
     Text [ danish ] = "K�d" ;
@@ -2383,7 +2459,7 @@ String RID_STR_EDIT_GRAPHIC
     Text [ english_us ] = "Link" ;
     Text[ chinese_simplified ] = "链接";
     Text[ russian ] = "����� � ������";
-    Text[ polish ] = "Do��cz";
+    Text[ polish ] = "Po��cz";
     Text[ japanese ] = "リンク";
     Text[ chinese_traditional ] = "捷徑";
     Text[ arabic ] = "���";
@@ -2391,7 +2467,8 @@ String RID_STR_EDIT_GRAPHIC
     Text[ korean ] = "연결";
     Text[ turkish ] = "Ba�lant� olu�tur";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Vincular";
+    Text[ catalan ] = "Enlla�a";
+    Text[ thai ] = "เชื่อมโยง";
 };
 String RID_STR_FULLNUMS_1 { Text = "1.|1.1|a)|61589|61589" ; };
 String RID_STR_FULLNUMS_2 { Text = "1.|a)|61589|61589|61589" ; };
@@ -2418,3 +2495,7 @@ String RID_STR_FULLNUMS_7_HTML { Text = "I.|I.|I|I.|I." ; };
 
 
 
+
+
+
+
diff --git a/svx/source/dialog/opengrf.cxx b/svx/source/dialog/opengrf.cxx
index b409ae3b3fb3..a52083788bee 100644
--- a/svx/source/dialog/opengrf.cxx
+++ b/svx/source/dialog/opengrf.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: opengrf.cxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: obo $ $Date: 2002-11-06 11:02:44 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -30,7 +30,7 @@
  *
  *  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., 59 Temple Place, Suite 330,  Boston,
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
  *
@@ -185,23 +185,23 @@ struct SvxOpenGrf_Impl
 {
     SvxOpenGrf_Impl         ();
 
-    sfx2::FileDialogHelper                  maFileDlg;
-    Reference < XFilePickerControlAccess >  mxCtrlAcc;
+    sfx2::FileDialogHelper                  aFileDlg;
+    Reference < XFilePickerControlAccess >  xCtrlAcc;
 };
 
 
 SvxOpenGrf_Impl::SvxOpenGrf_Impl() :
-    maFileDlg(SFXWB_GRAPHIC)
+    aFileDlg(SFXWB_GRAPHIC)
 {
-    Reference < XFilePicker > xFP = maFileDlg.GetFilePicker();
-    mxCtrlAcc = Reference < XFilePickerControlAccess >(xFP, UNO_QUERY);
+    Reference < XFilePicker > xFP = aFileDlg.GetFilePicker();
+    xCtrlAcc = Reference < XFilePickerControlAccess >(xFP, UNO_QUERY);
 }
 
 
 SvxOpenGraphicDialog::SvxOpenGraphicDialog( const String& rTitle ) :
     mpImpl( new SvxOpenGrf_Impl )
 {
-    mpImpl->maFileDlg.SetTitle(rTitle);
+    mpImpl->aFileDlg.SetTitle(rTitle);
 }
 
 
@@ -212,13 +212,13 @@ SvxOpenGraphicDialog::~SvxOpenGraphicDialog()
 
 GraphicFilter* GetGrfFilter();
 
-ErrCode SvxOpenGraphicDialog::Execute()
+short SvxOpenGraphicDialog::Execute()
 {
     USHORT  nImpRet;
     BOOL    bQuitLoop(FALSE);
 
     while( bQuitLoop == FALSE &&
-           mpImpl->maFileDlg.Execute() == ERRCODE_NONE )
+           mpImpl->aFileDlg.Execute() == ERRCODE_NONE )
     {
         if( GetPath().Len() )
         {
@@ -283,13 +283,13 @@ ErrCode SvxOpenGraphicDialog::Execute()
     }
 
     // cancel
-    return ERRCODE_ABORT;
+    return -1;
 }
 
 
 void SvxOpenGraphicDialog::SetPath( const String& rPath )
 {
-    mpImpl->maFileDlg.SetDisplayDirectory(rPath);
+    mpImpl->aFileDlg.SetDisplayDirectory(rPath);
 }
 
 void SvxOpenGraphicDialog::SetPath( const String& rPath, sal_Bool bLinkState )
@@ -301,11 +301,11 @@ void SvxOpenGraphicDialog::SetPath( const String& rPath, sal_Bool bLinkState )
 
 void SvxOpenGraphicDialog::EnableLink( sal_Bool  state  )
 {
-    if( mpImpl->mxCtrlAcc.is() )
+    if( mpImpl->xCtrlAcc.is() )
     {
         try
         {
-            mpImpl->mxCtrlAcc->enableControl( ExtendedFilePickerElementIds::CHECKBOX_LINK, state );
+            mpImpl->xCtrlAcc->enableControl( ExtendedFilePickerElementIds::CHECKBOX_LINK, state );
         }
         catch(IllegalArgumentException)
         {
@@ -319,12 +319,12 @@ void SvxOpenGraphicDialog::EnableLink( sal_Bool  state  )
 
 void SvxOpenGraphicDialog::AsLink(sal_Bool  bState)
 {
-    if( mpImpl->mxCtrlAcc.is() )
+    if( mpImpl->xCtrlAcc.is() )
     {
         try
         {
             Any aAny; aAny <<= bState;
-            mpImpl->mxCtrlAcc->setValue( ExtendedFilePickerElementIds::CHECKBOX_LINK, 0, aAny );
+            mpImpl->xCtrlAcc->setValue( ExtendedFilePickerElementIds::CHECKBOX_LINK, 0, aAny );
         }
         catch(IllegalArgumentException)
         {
@@ -340,9 +340,9 @@ sal_Bool SvxOpenGraphicDialog::IsAsLink() const
 {
     try
     {
-        if( mpImpl->mxCtrlAcc.is() )
+        if( mpImpl->xCtrlAcc.is() )
         {
-            Any aVal = mpImpl->mxCtrlAcc->getValue( ExtendedFilePickerElementIds::CHECKBOX_LINK, 0 );
+            Any aVal = mpImpl->xCtrlAcc->getValue( ExtendedFilePickerElementIds::CHECKBOX_LINK, 0 );
             DBG_ASSERT(aVal.hasValue(), "Value CBX_INSERT_AS_LINK not found")
             return aVal.hasValue() ? *(sal_Bool*) aVal.getValue() : sal_False;
         }
@@ -358,35 +358,35 @@ sal_Bool SvxOpenGraphicDialog::IsAsLink() const
 }
 
 
-ErrCode SvxOpenGraphicDialog::GetGraphic(Graphic& rGraphic) const
+int SvxOpenGraphicDialog::GetGraphic(Graphic& rGraphic) const
 {
-    return mpImpl->maFileDlg.GetGraphic(rGraphic);
+    return mpImpl->aFileDlg.GetGraphic(rGraphic);
 }
 
 
 String SvxOpenGraphicDialog::GetPath() const
 {
-    return mpImpl->maFileDlg.GetPath();
+    return mpImpl->aFileDlg.GetPath();
 }
 
 
 String SvxOpenGraphicDialog::GetCurrentFilter() const
 {
-    return mpImpl->maFileDlg.GetCurrentFilter();
+    return mpImpl->aFileDlg.GetCurrentFilter();
 }
 
 
 void SvxOpenGraphicDialog::SetCurrentFilter(const String&   rStr)
 {
-    mpImpl->maFileDlg.SetCurrentFilter(rStr);
+    mpImpl->aFileDlg.SetCurrentFilter(rStr);
 }
 
 void SvxOpenGraphicDialog::SetControlHelpIds( const INT16* _pControlId, const INT32* _pHelpId )
 {
-    mpImpl->maFileDlg.SetControlHelpIds( _pControlId, _pHelpId );
+    mpImpl->aFileDlg.SetControlHelpIds( _pControlId, _pHelpId );
 }
 
 void SvxOpenGraphicDialog::SetDialogHelpId( const INT32 _nHelpId )
 {
-    mpImpl->maFileDlg.SetDialogHelpId( _nHelpId );
+    mpImpl->aFileDlg.SetDialogHelpId( _nHelpId );
 }
diff --git a/svx/source/dialog/page.src b/svx/source/dialog/page.src
index f78d185a1f12..7ee91defca34 100644
--- a/svx/source/dialog/page.src
+++ b/svx/source/dialog/page.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: page.src,v $
  *
- *  $Revision: 1.55 $
+ *  $Revision: 1.56 $
  *
- *  last change: $Author: rt $ $Date: 2002-12-05 10:23:03 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -334,18 +334,18 @@ TabPage RID_SVXPAGE_PAGE
         Text[ russian ] = "����������� ������";
         Text[ greek ] = "~Text flow";
         Text[ dutch ] = "~Tekstverloop";
-        Text[ french ] = "Encha�nements";
-        Text[ spanish ] = "Flujo de texto";
+        Text[ french ] = "Orientation du texte";
+        Text[ spanish ] = "~Direcci�n de escritura";
         Text[ finnish ] = "~Tekstin suunta";
         Text[ italian ] = "Testo";
         Text[ danish ] = "~Tekstretning";
-        Text[ swedish ] = "Textriktning";
+        Text[ swedish ] = "Te~xtriktning";
         Text[ polish ] = "~Text flow";
         Text[ portuguese_brazilian ] = "~Text flow";
-        Text[ japanese ] = "文字方向";
+        Text[ japanese ] = "文字方向(~T)";
         Text[ korean ] = "텍스트 방향";
         Text[ chinese_simplified ] = "文字方向";
-        Text[ chinese_traditional ] = "文字方向";
+        Text[ chinese_traditional ] = "文字方向(~T)";
         Text[ turkish ] = "~Text flow";
         Text[ arabic ] = "~Text flow";
         Text[ catalan ] = "~Text flow";
@@ -373,7 +373,7 @@ TabPage RID_SVXPAGE_PAGE
         Text[ greek ] = "��~���� �������";
         Text[ dutch ] = "~Papierlade";
         Text[ french ] = "Source du papier";
-        Text[ spanish ] = "~Origen del papel";
+        Text[ spanish ] = "~Bandeja de alimentaci�n";
         Text[ finnish ] = "Paperi~lokero";
         Text[ italian ] = "Ca~ssetto";
         Text[ danish ] = "~Papirkilde";
@@ -416,7 +416,7 @@ TabPage RID_SVXPAGE_PAGE
         Text[ polish ] = "Marginesy strony";
         Text[ portuguese_brazilian ] = "Margens";
         Text[ japanese ] = "余白";
-        Text[ korean ] = "측면 여백";
+        Text[ korean ] = "페이지 여백";
         Text[ chinese_simplified ] = "边距";
         Text[ chinese_traditional ] = "頁面邊距";
         Text[ turkish ] = "Marjlar";
@@ -488,7 +488,7 @@ TabPage RID_SVXPAGE_PAGE
         Text [ english_us ] = "~Right" ;
         Left = TRUE ;
         Text[ chinese_simplified ] = "右(~R)";
-        Text[ russian ] = "������";
+        Text[ russian ] = "�~�����";
         Text[ polish ] = "Z prawej";
         Text[ japanese ] = "右(~R)";
         Text[ chinese_traditional ] = "向右(~R)";
@@ -662,7 +662,7 @@ TabPage RID_SVXPAGE_PAGE
         Text[ chinese_traditional ] = "頁面版式";
         Text[ arabic ] = "����� ������";
         Text[ greek ] = "������� �������";
-        Text[ korean ] = "페이지 레이아웃";
+        Text[ korean ] = "페이지 모양";
         Text[ turkish ] = "Sayfa d�zeni";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Disseny de p�gina";
@@ -735,7 +735,7 @@ TabPage RID_SVXPAGE_PAGE
             < "Pages de droite et de gauche" ; Default ; > ;
             < "Pages en vis-�-vis" ; Default ; > ;
             < "Pages de droite" ; Default ; > ;
-            < "Page de gauche" ; Default ; > ;
+            < "Pages de gauche" ; Default ; > ;
         };
         StringList [ swedish ] =
         {
@@ -869,7 +869,7 @@ TabPage RID_SVXPAGE_PAGE
         Text[ polish ] = "For~mat";
         Text[ portuguese_brazilian ] = "For~mat";
         Text[ japanese ] = "番号付け(~M)";
-        Text[ korean ] = "형식(~M)";
+        Text[ korean ] = "번호 매기기(~M)";
         Text[ chinese_simplified ] = "格式(~M)";
         Text[ chinese_traditional ] = "格式(~M)";
         Text[ turkish ] = "For~mats�z";
@@ -1223,7 +1223,7 @@ TabPage RID_SVXPAGE_PAGE
         Text[ polish ] = "Dopasuj obiekt do formatu papieru";
         Text[ portuguese_brazilian ] = "~Fit to size";
         Text[ japanese ] = "オブジェクトを用紙サイズに合わせる(~F)";
-        Text[ korean ] = "용지 형식에 개체 맞추기(~F)";
+        Text[ korean ] = "용지 형식에 개체 맞춤(~F)";
         Text[ chinese_simplified ] = "对象按页面格式作调整(~F)";
         Text[ chinese_traditional ] = "物件使用頁面格式(~F)";
         Text[ turkish ] = "~Boya g�re ayarla";
@@ -1255,7 +1255,7 @@ TabPage RID_SVXPAGE_PAGE
         Text[ chinese_traditional ] = "正反頁的行距相等";
         Text[ arabic ] = "�����";
         Text[ greek ] = "~������������";
-        Text[ korean ] = "등록 확인";
+        Text[ korean ] = "인쇄할 때 가늠 맞춤 ";
         Text[ turkish ] = "�al�~�t�r";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Activa";
@@ -1285,7 +1285,7 @@ TabPage RID_SVXPAGE_PAGE
         Text[ chinese_traditional ] = "參照文段落樣式(~S)";
         Text[ arabic ] = "��� ���� �����";
         Text[ greek ] = "���~���� ���������� ��������";
-        Text[ korean ] = "참조 템플릿(~S)";
+        Text[ korean ] = "참조 스타일(~S)";
         Text[ turkish ] = "Referans par~agraf bi�imi";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Estil de ~ref�rencia";
@@ -1322,7 +1322,7 @@ TabPage RID_SVXPAGE_PAGE
         Text[ chinese_traditional ] = "向內(~N)";
         Text[ arabic ] = "����";
         Text[ greek ] = "���������";
-        Text[ korean ] = "안(~N)";
+        Text[ korean ] = "내부(~N)";
         Text[ turkish ] = "�~�";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "I~nterior";
@@ -1349,7 +1349,7 @@ TabPage RID_SVXPAGE_PAGE
         Text[ chinese_traditional ] = "向外(~U)";
         Text[ arabic ] = "����";
         Text[ greek ] = "���������";
-        Text[ korean ] = "밖(~U)";
+        Text[ korean ] = "외부(~U)";
         Text[ turkish ] = "D~��";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "E~xterior";
@@ -1376,7 +1376,7 @@ TabPage RID_SVXPAGE_PAGE
         Text[ chinese_traditional ] = "您的頁邊設定有誤﹐頁邊不在列印範圍之內。\n\n您還是要接受這個設定？";
         Text[ arabic ] = "��� ������� ������� ���� ���� �������.\n\n�� ���� ����� ��� ��������� ��� ����� �� ��߿";
         Text[ greek ] = "�� ��������� ��� ���������� ����� ����� ��� �������� ���������.\n\n������ �� ����������� �� ��������� ������ ����;";
-        Text[ korean ] = "여백 설정이 인쇄 범위를 벗어났습니다.\n\n그래도 이 설정을 적용하겠습니까?";
+        Text[ korean ] = "여백 설정이 인쇄 범위를 벗어났습니다.\n\n그래도 이 설정을 적용하시겠습니까?";
         Text[ turkish ] = "Marj ayarlar�n�z, yazd�rma aral���n�n d���nda.\n\nBu ayarlar� yine de uygulamak istiyor musunuz?";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Amb aquesta definici�, els marges queden fora de l'�rea d'impressi�.\n\nVoleu aplicar aquesta definici� de marges?";
@@ -1901,7 +1901,7 @@ StringArray RID_SVXSTRARY_PAPERSIZE_STD
         < "B4 (JIS)" ; PAPERSIZE_B4_JIS ; > ;
         < "B5 (JIS)" ; PAPERSIZE_B5_JIS ; > ;
         < "B6 (JIS)" ; PAPERSIZE_B6_JIS ; > ;
-        < "Letter" ; PAPERSIZE_LETTER ; > ;
+        < "Carta" ; PAPERSIZE_LETTER ; > ;
         < "Legal" ; PAPERSIZE_LEGAL ; > ;
         < "Tabloid" ; PAPERSIZE_TABLOID ; > ;
         < "Usuario" ; PAPERSIZE_USER ; > ;
@@ -2138,12 +2138,12 @@ StringArray RID_SVXSTRARY_PAPERSIZE_STD
         < "B4 (ISO)" ; PAPERSIZE_B4 ; > ;
         < "B5 (ISO)" ; PAPERSIZE_B5 ; > ;
         < "B6 (ISO)" ; PAPERSIZE_B6 ; > ;
-        < "B4 (JIS)l" ; PAPERSIZE_B4_JIS ; > ;
+        < "B4 (JIS)" ; PAPERSIZE_B4_JIS ; > ;
         < "B5 (JIS)" ; PAPERSIZE_B5_JIS ; > ;
         < "B6 (JIS)" ; PAPERSIZE_B6_JIS ; > ;
         < "편지" ; PAPERSIZE_LETTER ; > ;
-        < "리갈" ; PAPERSIZE_LEGAL ; > ;
-        < "타블로이드" ; PAPERSIZE_TABLOID ; > ;
+        < "Legal" ; PAPERSIZE_LEGAL ; > ;
+        < "Tabloid" ; PAPERSIZE_TABLOID ; > ;
         < "사용자" ; PAPERSIZE_USER ; > ;
         < "C4" ; PAPERSIZE_C4 ; > ;
         < "C5" ; PAPERSIZE_C5 ; > ;
@@ -2505,7 +2505,7 @@ StringArray RID_SVXSTRARY_PAPERSIZE_DRAW
         < "Letter" ; PAPERSIZE_LETTER ; > ;
         < "Legal" ; PAPERSIZE_LEGAL ; > ;
         < "Tabloid" ; PAPERSIZE_TABLOID ; > ;
-        < "������������" ; PAPERSIZE_USER ; > ;
+        < "����������������" ; PAPERSIZE_USER ; > ;
         < "C4" ; PAPERSIZE_C4 ; > ;
         < "C5" ; PAPERSIZE_C5 ; > ;
         < "C6" ; PAPERSIZE_C6 ; > ;
@@ -2618,7 +2618,7 @@ StringArray RID_SVXSTRARY_PAPERSIZE_DRAW
         < "B4 (JIS)" ; PAPERSIZE_B4_JIS ; > ;
         < "B5 (JIS)" ; PAPERSIZE_B5_JIS ; > ;
         < "B6 (JIS)" ; PAPERSIZE_B6_JIS ; > ;
-        < "Letter" ; PAPERSIZE_LETTER ; > ;
+        < "Carta" ; PAPERSIZE_LETTER ; > ;
         < "Legal" ; PAPERSIZE_LEGAL ; > ;
         < "Tabloid" ; PAPERSIZE_TABLOID ; > ;
         < "Usuario" ; PAPERSIZE_USER ; > ;
@@ -2850,9 +2850,9 @@ StringArray RID_SVXSTRARY_PAPERSIZE_DRAW
         < "B4 (JIS)" ; PAPERSIZE_B4_JIS ; > ;
         < "B5 (JIS)" ; PAPERSIZE_B5_JIS ; > ;
         < "B6 (JIS)" ; PAPERSIZE_B6_JIS ; > ;
-        < "레터" ; PAPERSIZE_LETTER ; > ;
-        < "리갈" ; PAPERSIZE_LEGAL ; > ;
-        < "타블로이드" ; PAPERSIZE_TABLOID ; > ;
+        < "편지" ; PAPERSIZE_LETTER ; > ;
+        < "Legal" ; PAPERSIZE_LEGAL ; > ;
+        < "Tabloid" ; PAPERSIZE_TABLOID ; > ;
         < "사용자" ; PAPERSIZE_USER ; > ;
         < "C4" ; PAPERSIZE_C4 ; > ;
         < "C5" ; PAPERSIZE_C5 ; > ;
@@ -3053,7 +3053,7 @@ String RID_SVXSTR_PAPERBIN
     Text [ french ] = "Bac" ;
     Text [ swedish ] = "Fack" ;
     Text [ dutch ] = "Papierlade" ;
-    Text [ spanish ] = "Origen del papel" ;
+    Text [ spanish ] = "Bandeja de alimentaci�n" ;
     Text [ english_us ] = "Paper tray" ;
     Text[ chinese_simplified ] = "纸张来源";
     Text[ russian ] = "������ ������";
@@ -3062,7 +3062,7 @@ String RID_SVXSTR_PAPERBIN
     Text[ chinese_traditional ] = "紙張來源";
     Text[ arabic ] = "��� �����";
     Text[ greek ] = "������ �������";
-    Text[ korean ] = "용지 공급";
+    Text[ korean ] = "용지 공급함";
     Text[ turkish ] = "Ka��t kayna��";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Font del paper";
@@ -3098,3 +3098,8 @@ String RID_SVXSTR_PAPERBIN_SETTINGS
 
 
 
+
+
+
+
+
diff --git a/svx/source/dialog/paragrph.src b/svx/source/dialog/paragrph.src
index c31b4924e652..2112735d3b65 100644
--- a/svx/source/dialog/paragrph.src
+++ b/svx/source/dialog/paragrph.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: paragrph.src,v $
  *
- *  $Revision: 1.66 $
+ *  $Revision: 1.67 $
  *
- *  last change: $Author: kz $ $Date: 2002-12-09 09:58:22 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -285,21 +285,21 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
         Text [ english ] = "Bef~ore paragraph" ;
         Text [ english_us ] = "Before paragraph" ;
         Text[ portuguese ] = "~Superior";
-        Text[ russian ] = "������";
+        Text[ russian ] = "����~��";
         Text[ greek ] = "����";
         Text[ dutch ] = "~Boven";
-        Text[ french ] = "Avant le texte";
-        Text[ spanish ] = "~Antes del texto";
+        Text[ french ] = "Avant le paragraphe";
+        Text[ spanish ] = "Antes del p�rrafo";
         Text[ finnish ] = "~Yl�reuna";
         Text[ italian ] = "Precede il testo";
         Text[ danish ] = "Foroven";
-        Text[ swedish ] = "F�re text";
+        Text[ swedish ] = "F�re stycke";
         Text[ polish ] = "Od g�ry";
         Text[ portuguese_brazilian ] = "P~ara o topo";
-        Text[ japanese ] = "テキストの前";
-        Text[ korean ] = "텍스트 앞";
+        Text[ japanese ] = "段落の前";
+        Text[ korean ] = "단락 앞";
         Text[ chinese_simplified ] = "在文字之前";
-        Text[ chinese_traditional ] = "在文字之前";
+        Text[ chinese_traditional ] = "在段落之前";
         Text[ turkish ] = "~�st";
         Text[ arabic ] = "����";
         Text[ thai ] = "~บน";
@@ -550,7 +550,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
             < "1行" ; Default ; > ;
         < "1.5行" ; Default ; > ;
         < "2行" ; Default ; > ;
-        < "均等" ; Default ; > ;
+        < "比率" ; Default ; > ;
         < "最小" ; Default ; > ;
         < "行間余白" ; Default ; > ;
     };
@@ -588,7 +588,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
         < "2 줄" ; Default ; > ;
         < "비례" ; Default ; > ;
         < "최소" ; Default ; > ;
-        < "행간 여백" ; Default ; > ;
+        < "줄 사이 여분 공백" ; Default ; > ;
     };
     StringList [ turkish ] =
     {
@@ -674,11 +674,11 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
         Text[ chinese_simplified ] = "由";
         Text[ russian ] = "��";
         Text[ polish ] = "z";
-        Text[ japanese ] = "調整 ";
+        Text[ japanese ] = "数値 (~V)";
         Text[ chinese_traditional ] = "由";
         Text[ arabic ] = "������";
         Text[ greek ] = "���";
-        Text[ korean ] = "의";
+        Text[ korean ] = "수치";
         Text[ turkish ] = "De~�.";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "de";
@@ -745,7 +745,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
         Text[ chinese_traditional ] = "行距";
         Text[ arabic ] = "����� ������";
         Text[ greek ] = "��������";
-        Text[ korean ] = "줄간격";
+        Text[ korean ] = "줄 간격";
         Text[ turkish ] = "Sat�r aral���";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Interlineat";
@@ -766,7 +766,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
         Hide = TRUE ;
         Text [ english_us ] = "A~ctivate" ;
         Text [ italian ] = "~Considera" ;
-        Text [ spanish ] = "Con~siderar" ;
+        Text [ spanish ] = "~Activar" ;
         Text [ french ] = "Activer" ;
         Text [ dutch ] = "~Activeren" ;
         Text [ swedish ] = "~Ta h�nsyn till" ;
@@ -810,7 +810,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
         Text[ chinese_traditional ] = "正反頁的行距相等";
         Text[ arabic ] = "��������";
         Text[ greek ] = "����������� ��������";
-        Text[ korean ] = "등록 확인";
+        Text[ korean ] = "가늠 맞춤";
         Text[ turkish ] = "E�it sat�r y�ksekli�i";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Conforme al registre";
@@ -825,7 +825,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
     Text[ chinese_traditional ] = "縮排和間隔";
     Text[ arabic ] = "������� ��������";
     Text[ greek ] = "������ ��� ����������";
-    Text[ korean ] = "들여쓰기와 간격";
+    Text[ korean ] = "들여쓰기 및 간격";
     Text[ turkish ] = "Girinti ve Aral�klar";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Sagnats i espaiats";
@@ -958,7 +958,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
         Text [ spanish ] = "Centrado" ;
         Text [ english_us ] = "~Center" ;
         Text[ chinese_simplified ] = "居中(~C)";
-        Text[ russian ] = "�� ������";
+        Text[ russian ] = "�� ~������";
         Text[ polish ] = "Do �rodka";
         Text[ japanese ] = "中央揃え(~C)";
         Text[ chinese_traditional ] = "置中(~C)";
@@ -988,7 +988,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
         Text [ spanish ] = "~Justificado" ;
         Text [ english_us ] = "Justified" ;
         Text[ chinese_simplified ] = "左右对齐";
-        Text[ russian ] = "�� ������";
+        Text[ russian ] = "�� ~������";
         Text[ polish ] = "Do lewej i praw~ej";
         Text[ japanese ] = "両端揃え";
         Text[ chinese_traditional ] = "左右對齊";
@@ -1004,7 +1004,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
     {
         Text = "Lin~ks/Oben" ;
         Text [ english_us ] = "~Left/Top" ;
-        Text[ korean ] = "왼쪽/위";
+        Text[ korean ] = "왼쪽/위 맞춤";
         Text[ chinese_traditional ] = "向左/向上";
         Text[ french ] = "� gauche/En haut";
         Text[ spanish ] = "~A la izquierda/Arriba";
@@ -1026,7 +1026,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
     {
         Text = "Rech~ts/Unten" ;
         Text [ english_us ] = "Righ~t/Bottom" ;
-        Text[ korean ] = "오른쪽/아래";
+        Text[ korean ] = "오른쪽/아래 맞춤";
         Text[ chinese_traditional ] = "向右/向下";
         Text[ french ] = "� droite/En bas";
         Text[ spanish ] = "~A la derecha/Abajo";
@@ -1242,7 +1242,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
         Text [ dutch ] = "Elk ~woord afzonderlijk verbreden" ;
         Text [ portuguese ] = "Expandir uma s� ~palavra" ;
         Text[ chinese_simplified ] = "拉长单个字(~E)";
-        Text[ russian ] = "��������� ��������� �����";
+        Text[ russian ] = "������~��� ��������� �����";
         Text[ polish ] = "Rozci�gnij pojedyncze ~s�owo";
         Text[ japanese ] = "単語を引き伸ばす(~E)";
         Text[ chinese_traditional ] = "拉長單個字型(~E)";
@@ -1276,7 +1276,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
         Text[ polish ] = "~Snap to text grid (if active)";
         Text[ portuguese_brazilian ] = "~Snap to text grid (if active)";
         Text[ japanese ] = "文字罫線に合わせる (オンのとき)";
-        Text[ korean ] = "텍스트 그리드선에 정렬 (활성시)";
+        Text[ korean ] = "텍스트 그리드로 맞춤(활성시)";
         Text[ chinese_simplified ] = "和文字格子线对齐(如使用格子线)";
         Text[ chinese_traditional ] = "和文字格子線對齊(如有使用格子線)";
         Text[ turkish ] = "~Snap to text grid (if active)";
@@ -1340,7 +1340,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
         Text[ polish ] = "~Alignment";
         Text[ portuguese_brazilian ] = "~Alignment";
         Text[ japanese ] = "文字の配置";
-        Text[ korean ] = "정렬";
+        Text[ korean ] = "맞춤";
         Text[ chinese_simplified ] = "对齐";
         Text[ chinese_traditional ] = "對齊";
         Text[ turkish ] = "~Alignment";
@@ -1588,8 +1588,8 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
         Text[ russian ] = "Text ~direction";
         Text[ greek ] = "Text ~direction";
         Text[ dutch ] = "Text ~direction";
-        Text[ french ] = "Encha�nements";
-        Text[ spanish ] = "~Direcci�n del texto";
+        Text[ french ] = "Orientation du texte";
+        Text[ spanish ] = "~Direcci�n de escritura";
         Text[ finnish ] = "Text ~direction";
         Text[ italian ] = "Direzione testo";
         Text[ danish ] = "Text ~direction";
@@ -1654,7 +1654,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
         Text [ dutch ] = "Auto~matisch" ;
         Text [ english_us ] = "A~utomatically" ;
         Text [ italian ] = "Auto~matico" ;
-        Text [ spanish ] = "Autom�tico" ;
+        Text [ spanish ] = "~Autom�ticamente" ;
         Text [ french ] = "Automatique" ;
         Text [ swedish ] = "Auto~matisk" ;
         Text [ danish ] = "Automatisk" ;
@@ -1698,25 +1698,25 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
         Text = "Zeichen am Zeilen~ende" ;
         Text [ ENGLISH ] = "Chars" ;
         Text [ norwegian ] = "Tegn" ;
-        Text [ italian ] = "caratteri a fine riga" ;
+        Text [ italian ] = "Caratteri a fine riga" ;
         Text [ portuguese_brazilian ] = "Caracteres" ;
         Text [ portuguese ] = "caracteres no fim da linha" ;
         Text [ finnish ] = "Merkkej� rivin lopussa" ;
         Text [ danish ] = "tegn ved linjens slutning" ;
-        Text [ french ] = "caract�res en fin de ligne" ;
+        Text [ french ] = "Caract�res en fin de ligne" ;
         Text [ swedish ] = "tecken i slutet av raden" ;
         Text [ dutch ] = "tekens aan regeleinde" ;
-        Text [ spanish ] = "caracteres al final de la l�nea" ;
+        Text [ spanish ] = "~Caracteres al final de la l�nea" ;
         Text [ english_us ] = "C~haracters at line end" ;
         Left = TRUE ;
-        Text[ chinese_simplified ] = "行末字符";
+        Text[ chinese_simplified ] = "字符留位于行末";
         Text[ russian ] = "�������� � ����� ������";
         Text[ polish ] = "znak�w na ko�cu wiersza";
-        Text[ japanese ] = "文字以上残す";
-        Text[ chinese_traditional ] = "行末文字";
+        Text[ japanese ] = "文字以上残す(行末)(~H)";
+        Text[ chinese_traditional ] = "字元留位於行末(~H)";
         Text[ arabic ] = "���� �� ����� �����";
         Text[ greek ] = "���������� ��� ����� ��� �������";
-        Text[ korean ] = "줄 마지막 부분(~A)";
+        Text[ korean ] = "줄 마지막 문자(~A)";
         Text[ turkish ] = "sat�rsonu karakteri";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "car�cter al final de la l�nia";
@@ -1746,25 +1746,25 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
         Text = "Zeichen am Zeilen~anfang" ;
         Text [ ENGLISH ] = "Chars" ;
         Text [ norwegian ] = "Tegn" ;
-        Text [ italian ] = "caratteri ad inizio riga" ;
+        Text [ italian ] = "Caratteri ad inizio riga" ;
         Text [ portuguese_brazilian ] = "Caracteres" ;
         Text [ portuguese ] = "Caracteres no in�cio da linha" ;
         Text [ finnish ] = "Merkkej� rivin alussa" ;
         Text [ danish ] = "tegn ved linjens begyndelse" ;
-        Text [ french ] = "caract�res en d�but de ligne" ;
+        Text [ french ] = "Caract�res en d�but de ligne" ;
         Text [ swedish ] = "tecken i b�rjan av raden" ;
         Text [ dutch ] = "tekens aan regelbegin" ;
-        Text [ spanish ] = "caracteres al comienzo de la l�nea" ;
+        Text [ spanish ] = "Caracteres al comienzo de la l�nea" ;
         Text [ english_us ] = "Cha~racters at line begin" ;
         Left = TRUE ;
-        Text[ chinese_simplified ] = "行首字符";
+        Text[ chinese_simplified ] = "字符留位于行首";
         Text[ russian ] = "�������� � ������ ������";
         Text[ polish ] = "znak�w na pocz�tku wiersza";
-        Text[ japanese ] = "文字以上残す";
-        Text[ chinese_traditional ] = "行首文字";
+        Text[ japanese ] = "文字以上残す(行頭)(~R)";
+        Text[ chinese_traditional ] = "字元留位於行首(~R)";
         Text[ arabic ] = "���� �� ����� �����";
         Text[ greek ] = "���������� ���� ���� ��� �������";
-        Text[ korean ] = "줄 시작부분에 있는 문자";
+        Text[ korean ] = "줄 시작 문자";
         Text[ turkish ] = "sat�rba�� karakteri";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "car�cter al comen�ament de la l�nia";
@@ -1784,18 +1784,18 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
         Text [ finnish ] = "Per~�kk�isten tavuviivojen enimm�ism��r�" ;
         Text [ danish ] = "Maksimalt antal orddelinger i r�kke" ;
         Text [ french ] = "Nombre maximal de coupures cons�cutives" ;
-        Text [ swedish ] = "H~�gsta antal bindestreck efter varandra" ;
+        Text [ swedish ] = "h~�gsta antal bindestreck efter varandra" ;
         Text [ dutch ] = "~Max. aantal opeenvolgende scheidingstekens" ;
-        Text [ spanish ] = "Cantidad m�xima de guiones consecutivos" ;
+        Text [ spanish ] = "~N�mero m�ximo de guiones consecutivos" ;
         Text [ english_us ] = "~Maximum number of consecutive hyphens" ;
         Text[ chinese_simplified ] = "最多连续使用的连字符数目(~M)";
         Text[ russian ] = "������������ ���������� ���������������� ������������";
         Text[ polish ] = "maksymalnie nast�puj�ce po sobie miejsca podzia�u";
         Text[ japanese ] = "ハイフネーション行の最高連続数(~M)";
-        Text[ chinese_traditional ] = "最多連續使用的連字符數目(~M)";
+        Text[ chinese_traditional ] = "最多連續使用的連字號數目(~M)";
         Text[ arabic ] = "����� ������ ������ ����� ����������";
         Text[ greek ] = "�������� ������� ���������� ���~��� �����������";
-        Text[ korean ] = "최대 연속 하이픈 수(~M)";
+        Text[ korean ] = "하이픈이 연속으로 삽입될 수 있는 최대 수(~M)";
         Text[ turkish ] = "Azami ard���k ay�rma i�areti sa~y�s�";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Quantitat m�xima de ~guions consecutius";
@@ -1910,7 +1910,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
         Text [ english_us ] = "Enable" ;
         Group = TRUE ;
         Text[ chinese_simplified ] = "允许";
-        Text[ russian ] = "������";
+        Text[ russian ] = "��~����";
         Text[ polish ] = "Podzia~�";
         Text[ japanese ] = "使用する";
         Text[ chinese_traditional ] = "允許";
@@ -1949,10 +1949,10 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
         Text[ danish ] = "T~ype";
         Text[ swedish ] = "T~yp";
         Text[ polish ] = "T~ype";
-        Text[ japanese ] = "種類";
+        Text[ japanese ] = "種類(~T)";
         Text[ korean ] = "유형";
         Text[ chinese_simplified ] = "类型";
-        Text[ chinese_traditional ] = "類型";
+        Text[ chinese_traditional ] = "類型(~T)";
         Text[ turkish ] = "T~ype";
         Text[ arabic ] = "T~ype";
         Text[ catalan ] = "~Tipus";
@@ -2148,8 +2148,8 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
     };
     StringList [ korean ] =
     {
-         < "이전" ; 0; > ;
-        < "이후" ; 1; > ;
+         < "앞" ; 0; > ;
+        < "뒤" ; 1; > ;
     };
     StringList [ chinese_traditional ] =
     {
@@ -2208,7 +2208,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
         Text[ chinese_traditional ] = "使用頁面樣式(~Y)";
         Text[ arabic ] = "���� ����";
         Text[ greek ] = "�� ������� �������";
-        Text[ korean ] = "페이지 스타일과 함께(~Y)";
+        Text[ korean ] = "페이지 스타일 사용(~Y)";
         Text[ turkish ] = "Sayfa bi�iml~i";
         Text[ language_user1 ] = "All \"Vorlagen\" /Styles are written with a capital S.10.5.00EM";
         Text[ catalan ] = "A~mb estil de p�gina";
@@ -2291,7 +2291,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
         Text[ chinese_traditional ] = "段落不分隔(~D)";
         Text[ arabic ] = "��� ����� ������";
         Text[ greek ] = "�� �� �������� � ����������";
-        Text[ korean ] = "단락 나누지 않기(~D)";
+        Text[ korean ] = "단락 나누지 않음(~D)";
         Text[ turkish ] = "Paragraf� ~b�lme";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Mant� les ~l�nies juntes";
@@ -2321,7 +2321,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
         Text[ chinese_traditional ] = "段落不分開(~K)";
         Text[ arabic ] = "����� �������";
         Text[ greek ] = "���~������ ���������� ����";
-        Text[ korean ] = "단락들을 같은 페이지에(~K)";
+        Text[ korean ] = "현재 단락과 다음 단락을 같은 페이지에 배치(~K)";
         Text[ turkish ] = "Paragra~flar� birlikte tut";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Mant� els par�gra~fs junts";
@@ -2338,7 +2338,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
         Text[ language_user1 ] = " ";
         Text[ english_us ] = "~Orphan control";
         Text[ portuguese ] = "Controlo de linhas ~vi�vas";
-        Text[ russian ] = "��� ��������� ������� �����";
+        Text[ russian ] = "��� ��~������� ������� �����";
         Text[ greek ] = "������� �������";
         Text[ dutch ] = "Z~wevende regels: weduwen";
         Text[ french ] = "Traitement des orphelines";
@@ -2509,7 +2509,7 @@ TabPage RID_SVXPAGE_PARA_ASIAN
     Text [ English ] = "Asian typography" ;
     Text[ english_us ] = "Asian Typography";
     Text[ portuguese ] = "Tipografia asi�tica";
-    Text[ russian ] = "��������� ������������ ��������";
+    Text[ russian ] = "��������� ������������ ��������";
     Text[ greek ] = "�������� ����������";
     Text[ dutch ] = "Aziatische typografie";
     Text[ french ] = "Typographie asiatique";
@@ -2520,7 +2520,7 @@ TabPage RID_SVXPAGE_PARA_ASIAN
     Text[ polish ] = "Typografia azjatycka";
     Text[ portuguese_brazilian ] = "Asian typography";
     Text[ japanese ] = "日本語文の体裁";
-    Text[ korean ] = "아시아어 타이포그래피";
+    Text[ korean ] = "한글 입력 체계";
     Text[ chinese_simplified ] = "中日韩文字";
     Text[ chinese_traditional ] = "中日韓文字";
     Text[ turkish ] = "Asian typography";
@@ -2548,7 +2548,7 @@ TabPage RID_SVXPAGE_PARA_ASIAN
         Text[ polish ] = "Podzia� wiersza";
         Text[ portuguese_brazilian ] = "Options";
         Text[ japanese ] = "改行時の処理";
-        Text[ korean ] = "행 바꾸기";
+        Text[ korean ] = "줄 바꿈";
         Text[ chinese_simplified ] = "换行";
         Text[ chinese_traditional ] = "換行";
         Text[ turkish ] = "Options";
@@ -2569,14 +2569,14 @@ TabPage RID_SVXPAGE_PARA_ASIAN
         Text[ greek ] = "�� ������ ����� � ~����� ��� �� ������������� ���������� ���� ���� ��� ��� ����� ��� ������";
         Text[ dutch ] = "~Lijst met verboden tekens aan regelbegin en -einde toepassen";
         Text[ french ] = "Tenir compte de la ~liste des caract�res interdits en d�but et en fin de ligne";
-        Text[ spanish ] = "Considerar lista de caracteres no aceptables a comienzo y fin de l�nea.";
+        Text[ spanish ] = "Aplicar lista de caracteres no permitidos a comienzo y fin de l�nea.";
         Text[ italian ] = "Considera elenco dei caratteri non ammessi all'inizio e fine della riga.";
         Text[ danish ] = "Tag hensyn til ~liste over forbudte tegn ved linjestart og -slutning";
         Text[ swedish ] = "Anv�nd ~lista med f�rbjudna tecken i b�rjan och slutet av rader";
         Text[ polish ] = "Uwzgl�dnij list� znak�w niedozwolonych na pocz�tku i na ko�cu wiersza";
         Text[ portuguese_brazilian ] = "Apply list of forbidden characters at line end and line start";
         Text[ japanese ] = "行頭および行末の禁則文字のリストで禁則処理を行う";
-        Text[ korean ] = "행 시작/끝부분에서 금지되는 문자의 목록을 적용";
+        Text[ korean ] = "줄 시작과 끝 부분에 금칙 문자의 목록을 적용";
         Text[ chinese_simplified ] = "顾及行首行末禁止使用字符的列单";
         Text[ chinese_traditional ] = "顧及行首行末禁止使用字元的清單";
         Text[ turkish ] = "Apply list of forbidden characters at line end and line start";
@@ -2593,7 +2593,7 @@ TabPage RID_SVXPAGE_PARA_ASIAN
         Text [ ENGLISH ] = "Allow break inside of words in latin text" ;
         Text[ english_us ] = "Allow ~breaks in words in Latin text";
         Text[ portuguese ] = "Permitir ~divis�o de palavras em texto com caracteres latinos";
-        Text[ russian ] = "��������� ������ ������ ���� ���������� ������";
+        Text[ russian ] = "��������� ������ ������ ���� ���������� ������";
         Text[ greek ] = "�� ���~������ � ������ �������� ����� ��� ������ ��� ��������� ��������";
         Text[ dutch ] = "~Woordafbreking binnen woorden in Latijnse tekst toestaan";
         Text[ french ] = "Autoriser la ~coupure en milieu de mot pour le texte en caract�res latins";
@@ -2604,7 +2604,7 @@ TabPage RID_SVXPAGE_PARA_ASIAN
         Text[ polish ] = "Dopu�� podzia� wyraz�w w tek�cie napisanym literami �aci�skimi";
         Text[ portuguese_brazilian ] = "Allow break inside of words in latin text";
         Text[ japanese ] = "英単語の途中で改行する(~B)";
-        Text[ korean ] = "라틴어 텍스트 단어에서 워드랩 허용(~B)";
+        Text[ korean ] = "영단어 사이에서 나누기 허용(~B)";
         Text[ chinese_simplified ] = "允许西文之中的字词换行分开(~B)";
         Text[ chinese_traditional ] = "允許西文之中的字詞換行分開(~B)";
         Text[ turkish ] = "Allow break inside of words in latin text";
@@ -2621,7 +2621,7 @@ TabPage RID_SVXPAGE_PARA_ASIAN
         Text [ ENGLISH ] = "Hanging punctuation" ;
         Text[ english_us ] = "Allow hanging punctuation";
         Text[ portuguese ] = "Permitir pontua��o negativa";
-        Text[ russian ] = "��������� ������� ����������";
+        Text[ russian ] = "��������� ������� ����������";
         Text[ greek ] = "�� ��~�������� ����������� ������ ������";
         Text[ dutch ] = "Ha~ngende interpunctie toestaan";
         Text[ french ] = "Autoriser la ponctuation en retrait";
@@ -2632,7 +2632,7 @@ TabPage RID_SVXPAGE_PARA_ASIAN
         Text[ polish ] = "Dopu�� sieroty i wdowy";
         Text[ portuguese_brazilian ] = "Hanging punctuation";
         Text[ japanese ] = "句読点のぶら下げを行う";
-        Text[ korean ] = "구두점 허용";
+        Text[ korean ] = "문장 부호 끌어 맞춤";
         Text[ chinese_simplified ] = "允许行末附加标点符号";
         Text[ chinese_traditional ] = "行末附加標點符號";
         Text[ turkish ] = "Hanging punctuation";
@@ -2660,7 +2660,7 @@ TabPage RID_SVXPAGE_PARA_ASIAN
         Text[ polish ] = "Odst�py mi�dzy znakami";
         Text[ portuguese_brazilian ] = "Character distance";
         Text[ japanese ] = "文字間隔の調整";
-        Text[ korean ] = "문자 간격 조정";
+        Text[ korean ] = "문자 간격";
         Text[ chinese_simplified ] = "字符间隔";
         Text[ chinese_traditional ] = "字元間隔";
         Text[ turkish ] = "Character distance";
@@ -2677,7 +2677,7 @@ TabPage RID_SVXPAGE_PARA_ASIAN
         Text [ ENGLISH ] = "Allow punctuation at line start" ;
         Text[ english_us ] = "Allow punctuation at line start";
         Text[ portuguese ] = "Permitir pontua��o no in�cio de linha para compress�o";
-        Text[ russian ] = "��������� ���������� � ������ ������";
+        Text[ russian ] = "��������� ���������� � ������ ������";
         Text[ greek ] = "~�� ��������� � �������� ��� ������� ������ ���� ���� ��� ������";
         Text[ dutch ] = "I~nterpunctie ter comprimering aan regelbegin toestaan";
         Text[ french ] = "Autoriser la po~nctuation en d�but de ligne pour compression";
@@ -2716,7 +2716,7 @@ TabPage RID_SVXPAGE_PARA_ASIAN
         Text[ polish ] = "Ustaw odst�p mi�dzy tekstem azjatyckim, �aci�skim i z�o�onym";
         Text[ portuguese_brazilian ] = "Apply distance between asian, latin and complex text";
         Text[ japanese ] = "アジア諸国語、西洋諸国語、および複合文字言語の間の間隔を調整する";
-        Text[ korean ] = "아시아어, 라틴어 및 혼합 텍스트에서 간격 적용";
+        Text[ korean ] = "한글, 영어 및 복합 문자 언어 사이에 간격을 적용";
         Text[ chinese_simplified ] = "在中日韩文字和西文及混合文字之间加入空格";
         Text[ chinese_traditional ] = "在中日韓文字和西文及混合文字之間加入空格";
         Text[ turkish ] = "Apply distance between asian, latin and complex text";
@@ -2744,7 +2744,7 @@ TabPage RID_SVXPAGE_PARA_ASIAN
         Text[ polish ] = "Dopasuj automatycznie odst�p mi�dzy tekstem azjatyckim a liczbami";
         Text[ portuguese_brazilian ] = "Automatically adjust distance between asian text and numbers";
         Text[ japanese ] = "日本語と数字の文字間隔を自動調整";
-        Text[ korean ] = "아시아어 텍스트와 숫자 사이 간격 자동 조정";
+        Text[ korean ] = "한글과 숫자 사이의 간격을 자동으로 조정";
         Text[ chinese_simplified ] = "自动调整中日韩文字和数字之间的间隔";
         Text[ chinese_traditional ] = "自動調整中日韓文字和數字之間的間隔";
         Text[ turkish ] = "Automatically adjust distance between asian text and numbers";
@@ -2757,3 +2757,8 @@ TabPage RID_SVXPAGE_PARA_ASIAN
 
 // ********************************************************************** EOF
 
+
+
+
+
+
diff --git a/svx/source/dialog/passwd.src b/svx/source/dialog/passwd.src
index 76a60db3801e..e142ec108c21 100644
--- a/svx/source/dialog/passwd.src
+++ b/svx/source/dialog/passwd.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: passwd.src,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: tbe $ $Date: 2001-12-20 10:13:22 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -86,7 +86,7 @@ ModalDialog RID_SVXDLG_PASSWORD
         Text [ french ] = "Mot de passe" ;
         Text [ dutch ] = "~Wachtwoord" ;
         Text [ swedish ] = "~L�senord" ;
-        Text [ danish ] = "Adgangskode" ;
+        Text [ danish ] = "~Adgangskode" ;
         Text [ portuguese_brazilian ] = "~Pa?wort" ;
         Text [ portuguese ] = "~Senha" ;
         Text[ chinese_simplified ] = "密码(~P)";
@@ -96,11 +96,12 @@ ModalDialog RID_SVXDLG_PASSWORD
         Text[ chinese_traditional ] = "密碼(~P)";
         Text[ arabic ] = "���� ����";
         Text[ greek ] = "������� ���������";
-        Text[ korean ] = "패스워드(~P)";
+        Text[ korean ] = "암호(~P)";
         Text[ turkish ] = "�if~re";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Contrase�a";
+        Text[ catalan ] = "~Contrasenya";
         Text[ finnish ] = "~Salasana";
+        Text[ thai ] = "~รหัสผ่าน";
     };
     Edit ED_OLD_PASSWD
     {
@@ -121,7 +122,7 @@ ModalDialog RID_SVXDLG_PASSWORD
         Text [ french ] = "Ancien" ;
         Text [ dutch ] = "Oud wachtwoord" ;
         Text [ swedish ] = "Gammalt l�senord" ;
-        Text [ danish ] = "Gammel" ;
+        Text [ danish ] = "Gammel adgangskode" ;
         Text [ portuguese_brazilian ] = "Alt" ;
         Text [ portuguese ] = "Antiga" ;
         Text[ chinese_simplified ] = "旧密码";
@@ -131,11 +132,12 @@ ModalDialog RID_SVXDLG_PASSWORD
         Text[ chinese_traditional ] = "舊密碼";
         Text[ arabic ] = "�����";
         Text[ greek ] = "�����";
-        Text[ korean ] = "이전 패스워드";
+        Text[ korean ] = "이전 암호";
         Text[ turkish ] = "Eski";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Anterior";
         Text[ finnish ] = "Vanha salasana";
+        Text[ thai ] = "รหัสผ่านเก่า";
     };
     FixedText FT_NEW_PASSWD
     {
@@ -149,7 +151,7 @@ ModalDialog RID_SVXDLG_PASSWORD
         Text [ french ] = "Mot de passe" ;
         Text [ dutch ] = "W~achtwoord" ;
         Text [ swedish ] = "L�s~enord" ;
-        Text [ danish ] = "Adgangskode" ;
+        Text [ danish ] = "A~dgangskode" ;
         Text [ portuguese_brazilian ] = "Pa~?wort" ;
         Text [ portuguese ] = "~Senha" ;
         Text[ chinese_simplified ] = "密码(~S)";
@@ -159,11 +161,12 @@ ModalDialog RID_SVXDLG_PASSWORD
         Text[ chinese_traditional ] = "密碼(~S)";
         Text[ arabic ] = "���� ����";
         Text[ greek ] = "������� ���������";
-        Text[ korean ] = "패스워드(~S)";
+        Text[ korean ] = "암호(~S)";
         Text[ turkish ] = "~�ifre";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Co~ntrase�a";
+        Text[ catalan ] = "Co~ntrasenya";
         Text[ finnish ] = "~Salasana";
+        Text[ thai ] = "รหั~สผ่าน";
     };
     Edit ED_NEW_PASSWD
     {
@@ -187,7 +190,7 @@ ModalDialog RID_SVXDLG_PASSWORD
         Text[ spanish ] = "~Repetir";
         Text[ finnish ] = "~Vahvista";
         Text[ italian ] = "Ripeti";
-        Text[ danish ] = "Gentag";
+        Text[ danish ] = "~Bekr�ft";
         Text[ swedish ] = "~Bekr�fta";
         Text[ polish ] = "Potwierd�";
         Text[ portuguese_brazilian ] = "~Wiederholen";
@@ -197,7 +200,8 @@ ModalDialog RID_SVXDLG_PASSWORD
         Text[ chinese_traditional ] = "確認(~R)";
         Text[ turkish ] = "~Yinele";
         Text[ arabic ] = "�����";
-        Text[ catalan ] = "~Repetir";
+        Text[ catalan ] = "~Repeteix";
+        Text[ thai ] = "ยื~นยัน";
     };
     Edit ED_REPEAT_PASSWD
     {
@@ -214,11 +218,11 @@ ModalDialog RID_SVXDLG_PASSWORD
         Text [ English ] = "New password" ;
         Text [ english_us ] = "New password" ;
         Text [ italian ] = "Nuova password" ;
-        Text [ spanish ] = "Nueva" ;
+        Text [ spanish ] = "Contrase�a nueva" ;
         Text [ french ] = "Nouveau" ;
         Text [ dutch ] = "Nieuw wachtwoord" ;
         Text [ swedish ] = "Nytt l�senord" ;
-        Text [ danish ] = "Ny" ;
+        Text [ danish ] = "Ny adgangskode" ;
         Text [ portuguese_brazilian ] = "Neu" ;
         Text [ portuguese ] = "Nova" ;
         Text[ chinese_simplified ] = "新密码";
@@ -228,11 +232,12 @@ ModalDialog RID_SVXDLG_PASSWORD
         Text[ chinese_traditional ] = "新密碼";
         Text[ arabic ] = "�����";
         Text[ greek ] = "����";
-        Text[ korean ] = "새 패스워드";
+        Text[ korean ] = "새 암호";
         Text[ turkish ] = "Yeni";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Nueva";
+        Text[ catalan ] = "Nova";
         Text[ finnish ] = "Uusi salasana";
+        Text[ thai ] = "รหัสผ่านใหม่";
     };
     OKButton BTN_PASSWD_OK
     {
@@ -271,11 +276,12 @@ ModalDialog RID_SVXDLG_PASSWORD
         Text[ chinese_traditional ] = "密碼無效";
         Text[ arabic ] = "���� �� ��� �����";
         Text[ greek ] = "������ ������� ���������";
-        Text[ korean ] = "유효하지 않은 패스워드";
+        Text[ korean ] = "암호가 잘못되었습니다.";
         Text[ turkish ] = "Ge�ersiz �ifre";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Contrase�a no v�lida";
+        Text[ catalan ] = "La contrasenya no �s correcta";
         Text[ finnish ] = "Virheellinen salasana";
+        Text[ thai ] = "รหัสผ่านไม่ถูกต้อง";
     };
     String STR_ERR_REPEAT_PASSWD
     {
@@ -287,7 +293,7 @@ ModalDialog RID_SVXDLG_PASSWORD
         Text [ spanish ] = "Las contrase�as no coinciden" ;
         Text [ french ] = "Les mots de passe ne concordent pas." ;
         Text [ swedish ] = "L�senord st�mmer inte �verens" ;
-        Text [ danish ] = "Adgangskode passer ikke" ;
+        Text [ danish ] = "Adgangskoder stemmer ikke overens" ;
         Text [ portuguese ] = "As senhas n�o combinam." ;
         Text [ portuguese_brazilian ] = "Pa?w?ter stimmen nicht ?erein" ;
         Text[ chinese_simplified ] = "密码不一致";
@@ -297,19 +303,20 @@ ModalDialog RID_SVXDLG_PASSWORD
         Text[ chinese_traditional ] = "密碼無效";
         Text[ arabic ] = "����� ���� ��� �������";
         Text[ greek ] = "�� ������� ��������� ��� ����������";
-        Text[ korean ] = "패스워드가 일치하지 않음";
+        Text[ korean ] = "암호가 일치하지 않습니다.";
         Text[ turkish ] = "�ifreler ayn� de�il";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Las contrase�as no coinciden";
+        Text[ catalan ] = "Les contrasenyes no coincideixen";
         Text[ finnish ] = "Salasanat eiv�t vastaa toisiaan";
+        Text[ thai ] = "รหัสผ่านไม่ตรงกัน";
     };
     Text [ english_us ] = "Change Password" ;
     Text [ italian ] = "Cambia password" ;
-    Text [ spanish ] = "Modificar contrase�a" ;
+    Text [ spanish ] = "Cambiar contrase�a" ;
     Text [ french ] = "Modification du mot de passe" ;
-    Text [ dutch ] = "Wachtwoord veranderen" ;
+    Text [ dutch ] = "Wachtwoord wijzigen" ;
     Text [ swedish ] = "�ndra l�senord" ;
-    Text [ danish ] = "Modificer adgangskode" ;
+    Text [ danish ] = "Rediger adgangskode" ;
     Text [ portuguese_brazilian ] = "Pa?wort ?ndern" ;
     Text [ portuguese ] = "Modificar senha" ;
     Text[ chinese_simplified ] = "更改密码";
@@ -319,10 +326,30 @@ ModalDialog RID_SVXDLG_PASSWORD
     Text[ chinese_traditional ] = "變更密碼";
     Text[ arabic ] = "����� ���� ����";
     Text[ greek ] = "������ ������� ���������";
-    Text[ korean ] = "패스워드 변경";
+    Text[ korean ] = "암호 변경";
     Text[ turkish ] = "�ifre de�i�tirme";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Modificar contrase�a";
+    Text[ catalan ] = "Canvia la contrasenya";
     Text[ finnish ] = "Muuta salasana";
+    Text[ thai ] = "เปลี่ยนรหัสผ่าน";
 };
  // ********************************************************************** EOF
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svx/source/dialog/postdlg.src b/svx/source/dialog/postdlg.src
index 75efbaaf7505..fb729ac5b9e1 100644
--- a/svx/source/dialog/postdlg.src
+++ b/svx/source/dialog/postdlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: postdlg.src,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: os $ $Date: 2002-06-21 14:36:25 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,7 +77,7 @@ ModalDialog RID_SVXDLG_POSTIT
     Text [ italian ] = "Nota" ;
     Text [ portuguese_brazilian ] = "Observa??o" ;
     Text [ portuguese ] = "Observa��o" ;
-    Text [ finnish ] = "Huomautus:" ;
+    Text [ finnish ] = "Huomautus" ;
     Text [ danish ] = "Note" ;
     Text [ french ] = "Note" ;
     Text [ swedish ] = "Anteckning" ;
@@ -95,7 +95,7 @@ ModalDialog RID_SVXDLG_POSTIT
         Text [ italian ] = "Autore" ;
         Text [ portuguese_brazilian ] = "Autor" ;
         Text [ portuguese ] = "Autor" ;
-        Text [ finnish ] = "Laatija" ;
+        Text [ finnish ] = "Tekij�" ;
         Text [ danish ] = "Forfatter" ;
         Text [ french ] = "Auteur" ;
         Text [ swedish ] = "F�rfattare" ;
@@ -112,7 +112,7 @@ ModalDialog RID_SVXDLG_POSTIT
         Text[ greek ] = "���������";
         Text[ korean ] = "작성자";
         Text[ turkish ] = "Yazan";
-        Text[ catalan ] = "Remitent";
+        Text[ catalan ] = "Autor";
         Text[ thai ] = "ผู้เขียน";
     };
     FixedText FT_LASTEDIT
@@ -148,7 +148,7 @@ ModalDialog RID_SVXDLG_POSTIT
         Text[ greek ] = "�������";
         Text[ korean ] = "텍스트(~T)";
         Text[ turkish ] = "~Metin";
-        Text[ catalan ] = "Te~xto";
+        Text[ catalan ] = "~Text";
         Text[ thai ] = "~ข้อความ";
     };
     MultiLineEdit ED_EDIT
@@ -179,7 +179,7 @@ ModalDialog RID_SVXDLG_POSTIT
         Text [ spanish ] = "Contenido" ;
         Text [ english_us ] = "Contents" ;
         Text[ chinese_simplified ] = "内容";
-        Text[ russian ] = "����������";
+        Text[ russian ] = "����������";
         Text[ polish ] = "Zawarto��";
         Text[ japanese ] = "内容";
         Text[ chinese_traditional ] = "內容";
@@ -187,7 +187,7 @@ ModalDialog RID_SVXDLG_POSTIT
         Text[ greek ] = "�����������";
         Text[ korean ] = "내용";
         Text[ turkish ] = "��erik";
-        Text[ catalan ] = "Contenido";
+        Text[ catalan ] = "Contingut";
         Text[ thai ] = "เนื้อหา";
     };
     OKButton BTN_POST_OK
@@ -224,6 +224,27 @@ ModalDialog RID_SVXDLG_POSTIT
         Size = MAP_APPFONT ( 60 , 8 ) ;
         Text = "E~inf�gen" ;
         Text [ English ] = "~Insert" ;
+        Text[ english_us ] = "~Insert";
+        Text[ portuguese ] = "~Insert";
+        Text[ russian ] = "~Insert";
+        Text[ greek ] = "~Insert";
+        Text[ dutch ] = "~Insert";
+        Text[ french ] = "Ins�rer";
+        Text[ spanish ] = "In~sertar";
+        Text[ finnish ] = "~Insert";
+        Text[ italian ] = "~Incolla";
+        Text[ danish ] = "~Insert";
+        Text[ swedish ] = "~Infoga";
+        Text[ polish ] = "~Insert";
+        Text[ japanese ] = "挿入";
+        Text[ korean ] = "삽입";
+        Text[ chinese_simplified ] = "插入";
+        Text[ chinese_traditional ] = "插入(~I)";
+        Text[ turkish ] = "~Insert";
+        Text[ arabic ] = "~Insert";
+        Text[ catalan ] = "~Enganxa";
+        Text[ thai ] = "~วาง";
+        Text[ portuguese_brazilian ] = "Co~lar";
     };
     PushButton BTN_AUTHOR
     {
@@ -232,14 +253,14 @@ ModalDialog RID_SVXDLG_POSTIT
         Text = "Autor" ;
         Text [ ENGLISH ] = "Author" ;
         Text [ norwegian ] = "Forfatter" ;
-        Text [ italian ] = "Autore" ;
-        Text [ portuguese_brazilian ] = "Autor" ;
-        Text [ portuguese ] = "Autor" ;
-        Text [ finnish ] = "Laatija" ;
+        Text [ italian ] = "Mittente" ;
+        Text [ portuguese_brazilian ] = "~Autor" ;
+        Text [ portuguese ] = "~Autor" ;
+        Text [ finnish ] = "Tekij�" ;
         Text [ danish ] = "Forfatter" ;
         Text [ french ] = "Auteur" ;
         Text [ swedish ] = "Skapad av" ;
-        Text [ dutch ] = "Auteur" ;
+        Text [ dutch ] = "~Auteur" ;
         Text [ spanish ] = "Autor" ;
         Text [ english_us ] = "Author" ;
         Text[ chinese_simplified ] = "作者";
@@ -249,10 +270,10 @@ ModalDialog RID_SVXDLG_POSTIT
         Text[ chinese_traditional ] = "作者";
         Text[ arabic ] = "������";
         Text[ greek ] = "���������";
-        Text[ korean ] = "작성�)";
-        Text[ turkish ] = "Yazan";
-        Text[ catalan ] = "Autor";
-        Text[ thai ] = "ผู้เขียน";
+        Text[ korean ] = "작성자(~A)";
+        Text[ turkish ] = "~Yazan";
+        Text[ catalan ] = "~Autor";
+        Text[ thai ] = "~ผู้เขียน";
     };
      // lokale Strings
     String STR_NOTIZ_EDIT
@@ -271,7 +292,7 @@ ModalDialog RID_SVXDLG_POSTIT
         Text [ spanish ] = "Editar nota" ;
         Text [ english_us ] = "Edit Note" ;
         Text[ chinese_simplified ] = "编辑备注";
-        Text[ russian ] = "������ ����������";
+        Text[ russian ] = "������ ����������";
         Text[ polish ] = "Edytuj notatk�";
         Text[ japanese ] = "コメントの編集";
         Text[ chinese_traditional ] = "編輯備註";
@@ -279,7 +300,7 @@ ModalDialog RID_SVXDLG_POSTIT
         Text[ greek ] = "����������� ���������";
         Text[ korean ] = "메모 편집";
         Text[ turkish ] = "Notu d�zenle";
-        Text[ catalan ] = "Editar nota";
+        Text[ catalan ] = "Edita la nota";
         Text[ thai ] = "แก้ไขบันทึกย่อ";
     };
     String STR_NOTIZ_INSERT
@@ -300,7 +321,7 @@ ModalDialog RID_SVXDLG_POSTIT
         Text [ spanish ] = "Insertar nota" ;
         Text [ english_us ] = "Insert note" ;
         Text[ chinese_simplified ] = "插入备注";
-        Text[ russian ] = "�������� �������";
+        Text[ russian ] = "�������� ����������";
         Text[ polish ] = "Wstaw notatk�";
         Text[ japanese ] = "コメントの挿入";
         Text[ chinese_traditional ] = "插入備註";
@@ -308,11 +329,11 @@ ModalDialog RID_SVXDLG_POSTIT
         Text[ greek ] = "�������� ���������";
         Text[ korean ] = "메모 삽입";
         Text[ turkish ] = "Not ekle";
-        Text[ catalan ] = "Insertar nota";
+        Text[ catalan ] = "Insereix una nota";
         Text[ thai ] = "แทรกบันทึกย่อ";
     };
     Text[ chinese_simplified ] = "备注";
-    Text[ russian ] = "�������";
+    Text[ russian ] = "����������";
     Text[ polish ] = "Notatka";
     Text[ japanese ] = "メモ";
     Text[ chinese_traditional ] = "備註";
@@ -326,3 +347,14 @@ ModalDialog RID_SVXDLG_POSTIT
  // ********************************************************************** EOF
 
 
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svx/source/dialog/prtqry.src b/svx/source/dialog/prtqry.src
index 515cb7973bc0..7243cecb1246 100644
--- a/svx/source/dialog/prtqry.src
+++ b/svx/source/dialog/prtqry.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: prtqry.src,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: kz $ $Date: 2001-07-14 03:29:39 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,20 +72,21 @@ String RID_SVXSTR_QRY_PRINT_TITLE
     Text[ danish ] = "Udskriv det markerede";
     Text[ french ] = "Imprimer la s�lection";
     Text[ swedish ] = "Skriv ut markering";
-    Text[ dutch ] = "Afdrukken van de selectie";
+    Text[ dutch ] = "Selectie afdrukken";
     Text[ spanish ] = "Imprimir la selecci�n";
     Text[ english_us ] = "Printing selection";
-    Text[ chinese_simplified ] = "��ӡѡ�еIJ���";
+    Text[ chinese_simplified ] = "打印选中的部分";
     Text[ russian ] = "������ ����������� ���������";
     Text[ polish ] = "Drukuj zaznaczony obszar";
-    Text[ japanese ] = "�I�����������̈��";
-    Text[ chinese_traditional ] = "�C�L�������";
+    Text[ japanese ] = "選択した部分の印刷";
+    Text[ chinese_traditional ] = "列印選取部份";
     Text[ arabic ] = "����� �������";
     Text[ greek ] = "�������� ��������";
-    Text[ korean ] = "������ ���� �μ�";
+    Text[ korean ] = "선택한 범위 인쇄";
     Text[ turkish ] = "Se�ilen aral�k yazd�r�l�yor";
-    Text[ catalan ] = "Imprimir la selecci�n";
+    Text[ catalan ] = "Imprimeix la selecci�";
     Text[ finnish ] = "Tulostusvalinta";
+    Text[ thai ] = "กำลังพิมพ์ส่วนที่เลือก";
 };
 String RID_SVXSTR_QRY_PRINT_MSG
 {
@@ -96,21 +97,22 @@ String RID_SVXSTR_QRY_PRINT_MSG
     Text[ portuguese ] = "Deseja imprimir a selec��o ou o documento inteiro?";
     Text[ danish ] = "Vil du udskrive det markerede eller hele dokumentet?";
     Text[ french ] = "Souhaitez vous imprimer uniquement la s�lection ou bien le document entier ?";
-    Text[ swedish ] = "Vill Du skriva ut det markerade eller hela dokumentet?";
+    Text[ swedish ] = "Vill du skriva ut det markerade eller hela dokumentet?";
     Text[ dutch ] = "Wilt u de selectie of het hele document afdrukken?";
     Text[ spanish ] = "�Desea imprimir solo la selecci�n o todo el documento?";
     Text[ english_us ] = "Do you want to print the selection or the entire document?";
-    Text[ chinese_simplified ] = "��Ҫ��ӡѡ�еIJ��ֻ���Ҫ��ӡ�����ĵ���";
-    Text[ russian ] = "�� ������ ���������� ���� �������� ��� ������ ����������� ��������?";
+    Text[ chinese_simplified ] = "要打印选中的部分还是要打印整个文档？";
+    Text[ russian ] = "�� ������ ���������� ���� �������� ��� ������ ���������� ��������?";
     Text[ polish ] = "Czy wydrukowa� tylko zaznaczony obszar, czy ca�y dokument?";
-    Text[ japanese ] = "����͑I�����������ɂ��܂����A�޷���đS�̂��܂����H";
-    Text[ chinese_traditional ] = "�n�C�L����������٬O�n�C�L��Ӥ��H";
+    Text[ japanese ] = "印刷は選択した部分にしますか、ドキュメント全体しますか？";
+    Text[ chinese_traditional ] = "要列印選取的部份還是要列印整個文件？";
     Text[ arabic ] = "�� ���� ����� ������� ��ء �� ������� ������";
     Text[ greek ] = "������ �� ���������� ��� ���������� ������� � �������� �� �������;";
-    Text[ korean ] = "������ ���� �Ǵ� ���� ��ü�� �μ��Ͻðڽ��ϱ�?";
+    Text[ korean ] = "선택한 범위 또는 문서 전체를 인쇄하겠습니까?";
     Text[ turkish ] = "Se�ilen aral�k ya da belgenin t�m� m� yazd�r�ls�n?";
-    Text[ catalan ] = "�Desea imprimir solo la selecci�n o todo el documento?";
+    Text[ catalan ] = "Voleu imprimir nom�s la selecci� o tot el document?";
     Text[ finnish ] = "Haluatko tulostaa vain valinnan vai koko asiakirjan?";
+    Text[ thai ] = "คุณต้องการพิมพ์ส่วนที่เลือกหรือทั้งเอกสาร?";
 };
 String RID_SVXSTR_QRY_PRINT_ALL
 {
@@ -125,17 +127,18 @@ String RID_SVXSTR_QRY_PRINT_ALL
     Text[ dutch ] = "~Alles";
     Text[ spanish ] = "~Todo";
     Text[ english_us ] = "~All";
-    Text[ chinese_simplified ] = "ȫ��(~A)";
+    Text[ chinese_simplified ] = "全部(~A)";
     Text[ russian ] = "���";
     Text[ polish ] = "Wszystko";
-    Text[ japanese ] = "���ׂ�(~A)";
-    Text[ chinese_traditional ] = "����(~A)";
+    Text[ japanese ] = "すべて(~A)";
+    Text[ chinese_traditional ] = "全部(~A)";
     Text[ arabic ] = "����";
     Text[ greek ] = "��~�";
-    Text[ korean ] = "��ü(~A)";
+    Text[ korean ] = "모두(~A)";
     Text[ turkish ] = "~T�m�";
-    Text[ catalan ] = "~Todo";
+    Text[ catalan ] = "~Tot";
     Text[ finnish ] = "~Kaikki";
+    Text[ thai ] = "~ทั้งหมด";
 };
 String RID_SVXSTR_QRY_PRINT_SELECTION
 {
@@ -150,17 +153,26 @@ String RID_SVXSTR_QRY_PRINT_SELECTION
     Text[ dutch ] = "~Selectie";
     Text[ spanish ] = "Sele~cci�n";
     Text[ english_us ] = "~Selection";
-    Text[ chinese_simplified ] = "ѡ��(~S)";
+    Text[ chinese_simplified ] = "选中(~S)";
     Text[ russian ] = "���������";
     Text[ polish ] = "Selekcja";
-    Text[ japanese ] = "�I��͈�(~S)";
-    Text[ chinese_traditional ] = "���(~S)";
+    Text[ japanese ] = "選択範囲(~S)";
+    Text[ chinese_traditional ] = "選取(~S)";
     Text[ arabic ] = "�������";
     Text[ greek ] = "�������";
-    Text[ korean ] = "������ ����(~S)";
+    Text[ korean ] = "선택한 범위(~S)";
     Text[ turkish ] = "~Se�ilen aral�k";
-    Text[ catalan ] = "Sele~cci�n";
-    Text[ finnish ] = "~Valinta";
+    Text[ catalan ] = "~Selecci�";
+    Text[ finnish ] = "V~alinta";
+    Text[ thai ] = "ส่วนที่เ~ลือก";
 };
 
 
+
+
+
+
+
+
+
+
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 7da1d8241d9c..dd28355baf8f 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: rubydialog.cxx,v $
  *
- *  $Revision: 1.21 $
+ *  $Revision: 1.22 $
  *
- *  last change: $Author: os $ $Date: 2002-09-04 10:55:00 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -119,6 +119,10 @@
 #include <cppuhelper/implbase1.hxx>
 #endif
 
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include <svtools/colorcfg.hxx>
+#endif
+
 using namespace com::sun::star::uno;
 using namespace com::sun::star::frame;
 using namespace com::sun::star::text;
@@ -851,8 +855,11 @@ void SvxRubyDialog::AssertOneEntry()
 void SvxRubyDialog::UpdateColors( void )
 {
     const StyleSettings&    rStyleSettings = GetSettings().GetStyleSettings();
+    svtools::ColorConfig        aColorConfig;
+
     Font                    aFnt( aPreviewWin.GetFont() );
-    Color                   aNewTextCol( rStyleSettings.GetWindowTextColor() );
+
+    Color                   aNewTextCol( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor );
     Color                   aNewFillCol( rStyleSettings.GetWindowColor() );
 
     if( aNewFillCol != aFnt.GetFillColor() || aNewTextCol != aFnt.GetColor() )
diff --git a/svx/source/dialog/rubydialog.src b/svx/source/dialog/rubydialog.src
index 36cfc8734f8c..3baa86293550 100644
--- a/svx/source/dialog/rubydialog.src
+++ b/svx/source/dialog/rubydialog.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: rubydialog.src,v $
  *
- *  $Revision: 1.28 $
+ *  $Revision: 1.29 $
  *
- *  last change: $Author: os $ $Date: 2002-08-19 09:02:07 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -83,7 +83,7 @@ ModelessDialog RID_SVXDLG_RUBY
         Text [ ENGLISH ] = "Auto detection" ;
         Text[ english_us ] = "Automatic detection";
         Text[ portuguese ] = "Reconhecimento autom�tico";
-        Text[ russian ] = "�������������� �����������";
+        Text[ russian ] = "�������������� �������������";
         Text[ greek ] = "�������� ����������";
         Text[ dutch ] = "Automatische herkenning";
         Text[ french ] = "D�tection automatique";
@@ -115,14 +115,14 @@ ModelessDialog RID_SVXDLG_RUBY
         Text[ greek ] = "������ �������";
         Text[ dutch ] = "~Basistekst";
         Text[ french ] = "Texte de ~base";
-        Text[ spanish ] = "Texto base";
+        Text[ spanish ] = "~Texto de base";
         Text[ italian ] = "Testo base";
         Text[ danish ] = "~Basistekst";
         Text[ swedish ] = "~Bastext";
         Text[ polish ] = "Tekst podstawowy";
         Text[ portuguese_brazilian ] = "Basis text";
         Text[ japanese ] = "対象文字列";
-        Text[ korean ] = "기본 텍스트";
+        Text[ korean ] = "대상 문자열";
         Text[ chinese_simplified ] = "主文字";
         Text[ chinese_traditional ] = "主文字";
         Text[ turkish ] = "Basis text";
@@ -139,18 +139,18 @@ ModelessDialog RID_SVXDLG_RUBY
         Text [English] = "Ruby text";
         Text[ english_us ] = "Ruby text";
         Text[ portuguese ] = "Texto ~Ruby";
-        Text[ russian ] = "��������������";
+        Text[ russian ] = "����� ������������";
         Text[ greek ] = "������� Ruby";
         Text[ dutch ] = "~Ruby-tekst";
         Text[ french ] = "Texte ~Ruby";
-        Text[ spanish ] = "Texto ruby";
+        Text[ spanish ] = "~Texto Ruby";
         Text[ italian ] = "Testo Ruby";
         Text[ danish ] = "~Fonetisk tekst";
         Text[ swedish ] = "~Ruby-text";
         Text[ polish ] = "Tekst Ruby";
         Text[ portuguese_brazilian ] = "Ruby text";
         Text[ japanese ] = "ルビ文字";
-        Text[ korean ] = "윗주 텍스트";
+        Text[ korean ] = "덧말 문자";
         Text[ chinese_simplified ] = "拼音或注音符号";
         Text[ chinese_traditional ] = "注音字元";
         Text[ turkish ] = "Ruby text";
@@ -223,7 +223,7 @@ ModelessDialog RID_SVXDLG_RUBY
         Text [ ENGLISH ] = "Adjust" ;
         Text[ english_us ] = "Alignment";
         Text[ portuguese ] = "~Alinhamento";
-        Text[ russian ] = "������������";
+        Text[ russian ] = "����������.";
         Text[ greek ] = "��������";
         Text[ dutch ] = "~Uitlijning";
         Text[ french ] = "Alignement";
@@ -307,9 +307,9 @@ ModelessDialog RID_SVXDLG_RUBY
     };
     StringList [ dutch ] =
     {
-            "Links  " ;
+            "Links" ;
             "Gecentreerd" ;
-            "Rechts  " ;
+            "Rechts" ;
             "0 1 0" ;
             "1 2 1" ;
     };
@@ -450,9 +450,9 @@ ModelessDialog RID_SVXDLG_RUBY
         Text [ ENGLISH ] = "Position" ;
         Text[ english_us ] = "Position";
         Text[ portuguese ] = "~Posi��o";
-        Text[ russian ] = "�������";
+        Text[ russian ] = "���������";
         Text[ greek ] = "Position";
-        Text[ dutch ] = "~Position";
+        Text[ dutch ] = "~Positie";
         Text[ french ] = "Position";
         Text[ spanish ] = "Posici�n";
         Text[ finnish ] = "Sijainti";
@@ -563,7 +563,7 @@ ModelessDialog RID_SVXDLG_RUBY
     };
     StringList [ korean ] =
     {
-        "위에" ;
+        "위" ;
         "아래" ;
     };
     StringList [ chinese_simplified ] =
@@ -605,18 +605,18 @@ ModelessDialog RID_SVXDLG_RUBY
         Text [ ENGLISH ] = "Character style for ruby text" ;
         Text[ english_us ] = "Character Style for ruby text";
         Text[ portuguese ] = "Estilo de ~caracteres para texto Ruby";
-        Text[ russian ] = "����� ������ ������ ��������������";
+        Text[ russian ] = "����� �������� ������������";
         Text[ greek ] = "���� ���������� ��� ������� 'Ruby'";
         Text[ dutch ] = "~Tekensjabloon voor Ruby-text";
         Text[ french ] = "Style de ~caract�res pour le texte Ruby";
-        Text[ spanish ] = "Estilo de car�cter para texto ruby";
+        Text[ spanish ] = "~Estilo de car�cter para el texto Ruby";
         Text[ italian ] = "Stile del carattere per testo Ruby";
         Text[ danish ] = "~Tegntypografi for fonetisk tekst";
         Text[ swedish ] = "~Teckenformatmall f�r ruby-text";
         Text[ polish ] = "Styl znak�w tekstu Ruby";
         Text[ portuguese_brazilian ] = "Character style for ruby text";
         Text[ japanese ] = "ルビ用文字スタイル";
-        Text[ korean ] = "루비 스타일";
+        Text[ korean ] = "덧말 문자용 스타일";
         Text[ chinese_simplified ] = "拼音或注音符号的字符样式";
         Text[ chinese_traditional ] = "注音字元的樣式";
         Text[ turkish ] = "Character style for ruby text";
@@ -641,7 +641,7 @@ ModelessDialog RID_SVXDLG_RUBY
         Text [ ENGLISH ] = "Stylist" ;
         Text[ english_us ] = "Stylist";
         Text[ portuguese ] = "E~stilista";
-        Text[ russian ] = "�������";
+        Text[ russian ] = "������ ������";
         Text[ greek ] = "���������";
         Text[ dutch ] = "~Stylist";
         Text[ french ] = "St~yliste";
@@ -669,7 +669,7 @@ ModelessDialog RID_SVXDLG_RUBY
         Text [ ENGLISH ] = "Preview:" ;
         Text[ english_us ] = "Preview:";
         Text[ portuguese ] = "Visualizar:";
-        Text[ russian ] = "��������:";
+        Text[ russian ] = "��������������� ��������:";
         Text[ greek ] = "�������������:";
         Text[ dutch ] = "Voorbeeld:";
         Text[ french ] = "Aper�u :";
@@ -704,11 +704,11 @@ ModelessDialog RID_SVXDLG_RUBY
         Text [ ENGLISH ] = "Apply" ;
         Text[ english_us ] = "~Apply";
         Text[ portuguese ] = "Ap~licar";
-        Text[ russian ] = "�������";
+        Text[ russian ] = "���������";
         Text[ greek ] = "��������";
         Text[ dutch ] = "~Overnemen";
         Text[ french ] = "Appliquer";
-        Text[ spanish ] = "Aplicar";
+        Text[ spanish ] = "~Aplicar";
         Text[ italian ] = "Applica";
         Text[ danish ] = "~Anvend";
         Text[ swedish ] = "~Anv�nd";
@@ -721,7 +721,7 @@ ModelessDialog RID_SVXDLG_RUBY
         Text[ turkish ] = "Apply";
         Text[ arabic ] = "�����";
         Text[ catalan ] = "Aplica";
-        Text[ finnish ] = "~K�yt�";
+        Text[ finnish ] = "K�~yt�";
         Text[ thai ] = "ใ~ช้";
     };
     PushButton PB_CLOSE
@@ -759,7 +759,7 @@ ModelessDialog RID_SVXDLG_RUBY
     };
     Text[ english_us ] = "Ruby";
     Text[ portuguese ] = "Ruby";
-    Text[ russian ] = "��������������";
+    Text[ russian ] = "������������";
     Text[ greek ] = "��������� ���������� ��������";
     Text[ dutch ] = "Ruby";
     Text[ french ] = "Ruby";
@@ -770,14 +770,31 @@ ModelessDialog RID_SVXDLG_RUBY
     Text[ polish ] = "Ruby";
     Text[ portuguese_brazilian ] = "Ruby";
     Text[ japanese ] = "ルビ";
-    Text[ korean ] = "윗주 달기";
+    Text[ korean ] = "덧말 넣기";
     Text[ chinese_simplified ] = "拼音和注音符号";
     Text[ chinese_traditional ] = "注音";
     Text[ turkish ] = "Ruby";
     Text[ arabic ] = "���� ����";
     Text[ catalan ] = "Car�cter fon�tic guia";
-    Text[ finnish ] = "Ruby";
+    Text[ finnish ] = "Ruby-teksti";
     Text[ thai ] = "ตัวพิมพ์ขนาดเล็ก";
 };
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svx/source/dialog/ruler.src b/svx/source/dialog/ruler.src
index 6287eba224b1..d4f0223c9f87 100644
--- a/svx/source/dialog/ruler.src
+++ b/svx/source/dialog/ruler.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ruler.src,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: kz $ $Date: 2001-07-14 03:31:56 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -80,18 +80,19 @@ Menu RID_SVXMN_RULER
             Text [ danish ] = "Millimeter" ;
             Text [ portuguese ] = "Mil�metro" ;
             Text [ portuguese_brazilian ] = "Millimeter" ;
-            Text[ chinese_simplified ] = "����";
+            Text[ chinese_simplified ] = "毫米";
             Text[ russian ] = "����������";
             Text[ polish ] = "Milimetr";
-            Text[ japanese ] = "��Ұ��";
-            Text[ chinese_traditional ] = "�@��";
+            Text[ japanese ] = "ミリメートル";
+            Text[ chinese_traditional ] = "毫米";
             Text[ arabic ] = "�������";
             Text[ greek ] = "��������";
-            Text[ korean ] = "�����";
+            Text[ korean ] = "밀리미터";
             Text[ turkish ] = "Milimetre";
             Text[ language_user1 ] = " ";
-            Text[ catalan ] = "Mil�metros";
+            Text[ catalan ] = "Milimetres";
             Text[ finnish ] = "Millimetri";
+            Text[ thai ] = "มิลลิเมตร";
         };
         MenuItem
         {
@@ -110,17 +111,18 @@ Menu RID_SVXMN_RULER
             Text [ dutch ] = "Centimeter" ;
             Text [ spanish ] = "Cent�metro" ;
             Text [ english_us ] = "Centimeter" ;
-            Text[ chinese_simplified ] = "����";
+            Text[ chinese_simplified ] = "厘米";
             Text[ russian ] = "����������";
             Text[ polish ] = "Centymetr";
-            Text[ japanese ] = "���Ұ��";
-            Text[ chinese_traditional ] = "����";
+            Text[ japanese ] = "センチメートル";
+            Text[ chinese_traditional ] = "厘米";
             Text[ arabic ] = "�������";
             Text[ greek ] = "��������";
-            Text[ korean ] = "��Ƽ����";
+            Text[ korean ] = "센티미터";
             Text[ turkish ] = "Santimetre";
             Text[ language_user1 ] = " ";
-            Text[ catalan ] = "Cent�metro";
+            Text[ catalan ] = "Cent�metres";
+            Text[ thai ] = "เซนติเมตร";
         };
         MenuItem
         {
@@ -137,18 +139,19 @@ Menu RID_SVXMN_RULER
             Text [ danish ] = "Meter" ;
             Text [ portuguese ] = "Metro" ;
             Text [ portuguese_brazilian ] = "Meter" ;
-            Text[ chinese_simplified ] = "��";
+            Text[ chinese_simplified ] = "米";
             Text[ russian ] = "�����";
             Text[ polish ] = "Metr";
-            Text[ japanese ] = "Ұ��";
-            Text[ chinese_traditional ] = "��";
+            Text[ japanese ] = "メートル";
+            Text[ chinese_traditional ] = "米";
             Text[ arabic ] = "���";
             Text[ greek ] = "�����";
-            Text[ korean ] = "����";
+            Text[ korean ] = "미터";
             Text[ turkish ] = "Metre";
             Text[ language_user1 ] = " ";
-            Text[ catalan ] = "Metro";
+            Text[ catalan ] = "Metres";
             Text[ finnish ] = "Metri";
+            Text[ thai ] = "เมตร";
         };
         MenuItem
         {
@@ -165,18 +168,19 @@ Menu RID_SVXMN_RULER
             Text [ danish ] = "Kilometer" ;
             Text [ portuguese ] = "Quil�metro" ;
             Text [ portuguese_brazilian ] = "Kilometer" ;
-            Text[ chinese_simplified ] = "����";
+            Text[ chinese_simplified ] = "公里";
             Text[ russian ] = "���������";
             Text[ polish ] = "Kilometr";
-            Text[ japanese ] = "��Ұ��";
-            Text[ chinese_traditional ] = "����";
+            Text[ japanese ] = "キロメートル";
+            Text[ chinese_traditional ] = "公里";
             Text[ arabic ] = "�������";
             Text[ greek ] = "����������";
-            Text[ korean ] = "ų�ι���";
+            Text[ korean ] = "킬로미터";
             Text[ turkish ] = "Kilometre";
             Text[ language_user1 ] = " ";
-            Text[ catalan ] = "Kil�metro";
+            Text[ catalan ] = "Kil�metres";
             Text[ finnish ] = "Kilometri";
+            Text[ thai ] = "กิโลเมตร";
         };
         MenuItem
         {
@@ -184,7 +188,7 @@ Menu RID_SVXMN_RULER
             Checkable = TRUE ;
             Text = "Zoll" ;
             Text [ English ] = "Inch" ;
-            Text [ dutch ] = "Inch" ;
+            Text [ dutch ] = "Duim" ;
             Text [ english_us ] = "Inch" ;
             Text [ italian ] = "Pollice" ;
             Text [ spanish ] = "Pulgadas" ;
@@ -193,18 +197,19 @@ Menu RID_SVXMN_RULER
             Text [ danish ] = "Tommer" ;
             Text [ portuguese ] = "Polegada" ;
             Text [ portuguese_brazilian ] = "Zoll" ;
-            Text[ chinese_simplified ] = "Ӣ��";
+            Text[ chinese_simplified ] = "英寸";
             Text[ russian ] = "�����";
             Text[ polish ] = "Cal";
-            Text[ japanese ] = "���";
-            Text[ chinese_traditional ] = "�^�T";
+            Text[ japanese ] = "インチ";
+            Text[ chinese_traditional ] = "英吋";
             Text[ arabic ] = "����";
             Text[ greek ] = "�����";
-            Text[ korean ] = "��ġ";
+            Text[ korean ] = "인치";
             Text[ turkish ] = "In�";
             Text[ language_user1 ] = " ";
-            Text[ catalan ] = "Pulgadas";
+            Text[ catalan ] = "Polzades";
             Text[ finnish ] = "Tuuma";
+            Text[ thai ] = "นิ้ว";
         };
         MenuItem
         {
@@ -223,18 +228,19 @@ Menu RID_SVXMN_RULER
             Text [ danish ] = "Fod" ;
             Text [ portuguese ] = "P�s" ;
             Text [ portuguese_brazilian ] = "Fu?" ;
-            Text[ chinese_simplified ] = "Ӣ��";
+            Text[ chinese_simplified ] = "英尺";
             Text[ russian ] = "����";
             Text[ polish ] = "Stopa";
-            Text[ japanese ] = "̨��";
-            Text[ chinese_traditional ] = "�^��";
+            Text[ japanese ] = "フィート";
+            Text[ chinese_traditional ] = "英尺";
             Text[ arabic ] = "���";
             Text[ greek ] = "����";
-            Text[ korean ] = "��Ʈ";
+            Text[ korean ] = "피트";
             Text[ turkish ] = "Ft";
             Text[ language_user1 ] = " ";
-            Text[ catalan ] = "Pie";
+            Text[ catalan ] = "Peus";
             Text[ finnish ] = "Jalka";
+            Text[ thai ] = "ฟุต";
         };
         MenuItem
         {
@@ -251,18 +257,19 @@ Menu RID_SVXMN_RULER
             Text [ danish ] = "Mil" ;
             Text [ portuguese ] = "Milhas" ;
             Text [ portuguese_brazilian ] = "Meilen" ;
-            Text[ chinese_simplified ] = "Ӣ��";
+            Text[ chinese_simplified ] = "英里";
             Text[ russian ] = "����";
             Text[ polish ] = "Mile";
-            Text[ japanese ] = "ϲ�";
-            Text[ chinese_traditional ] = "�^��";
+            Text[ japanese ] = "マイル";
+            Text[ chinese_traditional ] = "英里";
             Text[ arabic ] = "�����";
             Text[ greek ] = "�����";
-            Text[ korean ] = "����";
+            Text[ korean ] = "마일";
             Text[ turkish ] = "Mil";
             Text[ language_user1 ] = " ";
-            Text[ catalan ] = "Millas";
-            Text[ finnish ] = "Mailia";
+            Text[ catalan ] = "Milles";
+            Text[ finnish ] = "Mailit";
+            Text[ thai ] = "ไมล์";
         };
         MenuItem
         {
@@ -281,17 +288,18 @@ Menu RID_SVXMN_RULER
             Text [ dutch ] = "Punt" ;
             Text [ spanish ] = "Punto" ;
             Text [ english_us ] = "Point" ;
-            Text[ chinese_simplified ] = "��";
+            Text[ chinese_simplified ] = "点";
             Text[ russian ] = "�����";
             Text[ polish ] = "Punkt";
-            Text[ japanese ] = "�߲��";
-            Text[ chinese_traditional ] = "�I";
+            Text[ japanese ] = "ポイント";
+            Text[ chinese_traditional ] = "點";
             Text[ arabic ] = "����";
             Text[ greek ] = "������";
-            Text[ korean ] = "��";
+            Text[ korean ] = "점";
             Text[ turkish ] = "Nokta";
             Text[ language_user1 ] = " ";
-            Text[ catalan ] = "Punto";
+            Text[ catalan ] = "Punt";
+            Text[ thai ] = "พ้อยท์";
         };
         MenuItem
         {
@@ -316,17 +324,18 @@ String RID_SVXSTR_RULER_TAB_LEFT
     TEXT [ dutch ] = "Links" ;
     TEXT [ spanish ] = "Izquierda" ;
     TEXT [ english_us ] = "Left" ;
-    TEXT[ chinese_simplified ] = "��";
+    TEXT[ chinese_simplified ] = "左";
     TEXT[ russian ] = "�����";
     TEXT[ polish ] = "Z lewej";
-    TEXT[ japanese ] = "������";
-    TEXT[ chinese_traditional ] = "��";
+    TEXT[ japanese ] = "左揃え";
+    TEXT[ chinese_traditional ] = "左";
     TEXT[ arabic ] = "����";
     TEXT[ greek ] = "��������";
-    TEXT[ korean ] = "����";
+    TEXT[ korean ] = "왼쪽";
     TEXT[ turkish ] = "Sol";
     TEXT[ language_user1 ] = " ";
-    TEXT[ catalan ] = "Izquierda";
+    TEXT[ catalan ] = "Esquerra";
+    TEXT[ thai ] = "ซ้าย";
 };
 String RID_SVXSTR_RULER_TAB_RIGHT
 {
@@ -343,17 +352,18 @@ String RID_SVXSTR_RULER_TAB_RIGHT
     TEXT [ dutch ] = "Rechts" ;
     TEXT [ spanish ] = "Derecha" ;
     TEXT [ english_us ] = "Right" ;
-    TEXT[ chinese_simplified ] = "����";
+    TEXT[ chinese_simplified ] = "向右";
     TEXT[ russian ] = "������";
     TEXT[ polish ] = "Z prawej";
-    TEXT[ japanese ] = "�E����";
-    TEXT[ chinese_traditional ] = "�V�k";
+    TEXT[ japanese ] = "右揃え";
+    TEXT[ chinese_traditional ] = "向右";
     TEXT[ arabic ] = "����";
     TEXT[ greek ] = "�����";
-    TEXT[ korean ] = "������";
+    TEXT[ korean ] = "오른쪽";
     TEXT[ turkish ] = "Sa�";
     TEXT[ language_user1 ] = " ";
-    TEXT[ catalan ] = "Derecha";
+    TEXT[ catalan ] = "Dreta";
+    TEXT[ thai ] = "ขวา";
 };
 String RID_SVXSTR_RULER_TAB_DECIMAL
 {
@@ -370,17 +380,18 @@ String RID_SVXSTR_RULER_TAB_DECIMAL
     TEXT [ dutch ] = "Decimaal" ;
     TEXT [ spanish ] = "Decimal" ;
     TEXT [ english_us ] = "Decimal" ;
-    TEXT[ chinese_simplified ] = "ʮ��λ��";
+    TEXT[ chinese_simplified ] = "十进制";
     TEXT[ russian ] = "����������";
     TEXT[ polish ] = "Dziesi�tny";
-    TEXT[ japanese ] = "�����_����";
-    TEXT[ chinese_traditional ] = "�Q�i�쪺";
+    TEXT[ japanese ] = "小数点揃え";
+    TEXT[ chinese_traditional ] = "十進位";
     TEXT[ arabic ] = "����";
     TEXT[ greek ] = "��������";
-    TEXT[ korean ] = "�Ҽ�";
+    TEXT[ korean ] = "소수점";
     TEXT[ turkish ] = "Ondal�k";
     TEXT[ language_user1 ] = " ";
     TEXT[ catalan ] = "Decimal";
+    TEXT[ thai ] = "ทศนิยม";
 };
 String RID_SVXSTR_RULER_TAB_CENTER
 {
@@ -390,24 +401,38 @@ String RID_SVXSTR_RULER_TAB_CENTER
     TEXT [ italian ] = "Centrato" ;
     TEXT [ portuguese_brazilian ] = "Centralizado" ;
     TEXT [ portuguese ] = "Centrado" ;
-    TEXT [ finnish ] = "Keskit�" ;
+    TEXT [ finnish ] = "Keskell�" ;
     TEXT [ danish ] = "Centreret" ;
     TEXT [ french ] = "Centr�" ;
     TEXT [ swedish ] = "Centrerat" ;
     TEXT [ dutch ] = "Gecentreerd" ;
     TEXT [ spanish ] = "Centrado" ;
     TEXT [ english_us ] = "Center" ;
-    TEXT[ chinese_simplified ] = "����";
+    TEXT[ chinese_simplified ] = "居中";
     TEXT[ russian ] = "�� ������";
-    TEXT[ polish ] = "Wy�rodkuj";
-    TEXT[ japanese ] = "��������";
-    TEXT[ chinese_traditional ] = "�m��";
+    TEXT[ polish ] = "Do �rodka";
+    TEXT[ japanese ] = "中央揃え";
+    TEXT[ chinese_traditional ] = "置中";
     TEXT[ arabic ] = "�����";
     TEXT[ greek ] = "�������������";
-    TEXT[ korean ] = "���";
+    TEXT[ korean ] = "가운데";
     TEXT[ turkish ] = "Orta";
     TEXT[ language_user1 ] = " ";
-    TEXT[ catalan ] = "Centrado";
+    TEXT[ catalan ] = "Centre";
+    TEXT[ thai ] = "ตรงกลาง";
 };
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src
index 92bc7c047cb9..ae2d97a8368f 100644
--- a/svx/source/dialog/sdstring.src
+++ b/svx/source/dialog/sdstring.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sdstring.src,v $
  *
- *  $Revision: 1.29 $
+ *  $Revision: 1.30 $
  *
- *  last change: $Author: kz $ $Date: 2001-07-14 20:30:26 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -80,17 +80,18 @@ String RID_SVXSTR_SOLID
     Text [ dutch ] = "Doorlopend" ;
     Text [ spanish ] = "Continuo" ;
     Text [ english_us ] = "Continuous" ;
-    Text[ chinese_simplified ] = "������";
+    Text[ chinese_simplified ] = "连续的";
     Text[ russian ] = "��������";
     Text[ polish ] = "Ci�g�y";
-    Text[ japanese ] = "����";
-    Text[ chinese_traditional ] = "����";
+    Text[ japanese ] = "実線";
+    Text[ chinese_traditional ] = "持續的";
     Text[ arabic ] = "������";
     Text[ greek ] = "����������";
-    Text[ korean ] = "�Ϲ�";
+    Text[ korean ] = "계속";
     Text[ turkish ] = "S�rekli";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Continuo";
+    Text[ catalan ] = "Continu";
+    Text[ thai ] = "ต่อเนื่อง";
 };
 String RID_SVXSTR_GRADIENT
 {
@@ -100,24 +101,25 @@ String RID_SVXSTR_GRADIENT
     Text [ italian ] = "Sfumatura" ;
     Text [ portuguese_brazilian ] = "D?grad?" ;
     Text [ portuguese ] = "Grada��o" ;
-    Text [ finnish ] = "S�vytys" ;
+    Text [ finnish ] = "Liukuv�rj�ys" ;
     Text [ danish ] = "Farvegraduering" ;
     Text [ french ] = "D�grad�" ;
     Text [ swedish ] = "F�rggradient" ;
-    Text [ dutch ] = "Kleurverloop" ;
-    Text [ spanish ] = "Gradiente de color" ;
+    Text [ dutch ] = "Kleurovergangen" ;
+    Text [ spanish ] = "Gradiente" ;
     Text [ english_us ] = "Gradient" ;
-    Text[ chinese_simplified ] = "��ɫͼ��";
-    Text[ russian ] = "�����������";
+    Text[ chinese_simplified ] = "彩色图案";
+    Text[ russian ] = "��������";
     Text[ polish ] = "Gradient";
-    Text[ japanese ] = "����ް���";
-    Text[ chinese_traditional ] = "�m��Ϯ�";
+    Text[ japanese ] = "グラデーション";
+    Text[ chinese_traditional ] = "彩色圖案";
     Text[ arabic ] = "���� �����";
     Text[ greek ] = "���������� ��������";
-    Text[ korean ] = "�׶��̼�";
+    Text[ korean ] = "그라디언트";
     Text[ turkish ] = "Gradyan";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Gradiente de color";
+    Text[ catalan ] = "Gradient de color";
+    Text[ thai ] = "ไล่ระดับสี";
 };
 String RID_SVXSTR_DESC_GRADIENT
 {
@@ -130,23 +132,24 @@ String RID_SVXSTR_DESC_GRADIENT
     Text [ portuguese_brazilian ] = "Please insert a Name for the Gradient:" ;
     Text [ portuguese ] = "Introduza aqui um nome para a grada��o:" ;
     Text [ french ] = "Saisissez un nom pour le d�grad� :" ;
-    Text [ dutch ] = "Typ hier een naam voor het kleurverloop:" ;
-    Text [ spanish ] = "Inserte aqu� el nombre para el gradiente:" ;
+    Text [ dutch ] = "Typ hier een naam voor de kleurovergangen:" ;
+    Text [ spanish ] = "Introduzca aqu� un nombre para el gradiente:" ;
     Text [ danish ] = "Indtast venligst et navn til farvegradueringen:" ;
     Text [ swedish ] = "Mata in ett namn f�r f�rggradienten h�r:" ;
-    Text [ finnish ] = "Kirjoita s�vytyksen nimi:" ;
+    Text [ finnish ] = "Kirjoita liukuv�rj�yksen nimi:" ;
     Text [ english_us ] = "Please enter a name for the gradient:" ;
-    Text[ chinese_simplified ] = "�����ڴ�Ϊ�µIJ�ɫͼ������һ�����ƣ�";
-    Text[ russian ] = "�������, ����������, ���� �������� ����� �����������:";
+    Text[ chinese_simplified ] = "请您在此为新的彩色图案输入一个名称：";
+    Text[ russian ] = "������� �������� ���������:";
     Text[ polish ] = "Podaj nazw� gradientu:";
-    Text[ japanese ] = "����ް��݂̖��O�������ɓ��͂��Ă��������F";
-    Text[ chinese_traditional ] = "�бz�b�����s���m��Ϯ׿�J�@�ӦW�١G";
+    Text[ japanese ] = "グラデーションの名前をここに入力してください：";
+    Text[ chinese_traditional ] = "請在這裡輸入一個新的彩色圖案名稱：";
     Text[ arabic ] = "������ ����� ��� ����� ����� ���:";
     Text[ greek ] = "�������� �������� �� ����� ��� ��� ���������� ��� ��������:";
-    Text[ korean ] = "���⿡ �׶��̼��� �̸��� �Է��Ͻʽÿ�:";
+    Text[ korean ] = "여기에 그라디언트의 이름을 입력하십시오:";
     Text[ turkish ] = "Gradyan i�in bir ad girin:";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Inserte aqu� el nombre para el gradiente:";
+    Text[ catalan ] = "Inseriu aqu� el nom pel gradient:";
+    Text[ thai ] = "กรุณาใส่ชื่อเพื่อไล่ระดับสี:";
 };
 String RID_SVXSTR_DEL_GRADIENT
 {
@@ -158,24 +161,25 @@ String RID_SVXSTR_DEL_GRADIENT
     Text [ italian ] = "Elimina sfumatura" ;
     Text [ portuguese_brazilian ] = "Apagar D?grad?" ;
     Text [ portuguese ] = "Eliminar grada��o" ;
-    Text [ finnish ] = "Poista s�vytys" ;
+    Text [ finnish ] = "Poista liukuv�rj�ys" ;
     Text [ danish ] = "Slet farvegradueringen" ;
     Text [ french ] = "Supprimer le d�grad�" ;
     Text [ swedish ] = "Radera f�rggradient" ;
-    Text [ dutch ] = "Kleurverloop wissen" ;
-    Text [ spanish ] = "Eliminar gradiente de color" ;
+    Text [ dutch ] = "Kleurovergangen wissen" ;
+    Text [ spanish ] = "Borrar gradiente de color" ;
     Text [ english_us ] = "Delete gradient" ;
-    Text[ chinese_simplified ] = "ɾ����ɫͼ��";
-    Text[ russian ] = "������� �����������";
+    Text[ chinese_simplified ] = "删除彩色图案";
+    Text[ russian ] = "������� ��������";
     Text[ polish ] = "Usu� gradient";
-    Text[ japanese ] = "����ް��݂̍폜";
-    Text[ chinese_traditional ] = "�R���m��Ϯ�";
+    Text[ japanese ] = "グラデーションの削除";
+    Text[ chinese_traditional ] = "刪除彩色圖案";
     Text[ arabic ] = "��� ���� �����";
     Text[ greek ] = "�������� ���������� ��������";
-    Text[ korean ] = "�׶��̼� ����";
+    Text[ korean ] = "그라디언트 삭제";
     Text[ turkish ] = "Gradyan� sil";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Eliminar gradiente de color";
+    Text[ catalan ] = "Suprimeix el gradient de color";
+    Text[ thai ] = "ลบการไล่ระดับสี";
 };
 String RID_SVXSTR_ASK_DEL_GRADIENT
 {
@@ -187,24 +191,25 @@ String RID_SVXSTR_ASK_DEL_GRADIENT
     Text [ italian ] = "Eliminare la sfumatura?" ;
     Text [ portuguese_brazilian ] = "Deseja apagar o D?grad??" ;
     Text [ portuguese ] = "Deseja realmente eliminar a grada��o?" ;
-    Text [ finnish ] = "Haluatko poistaa s�vytyksen?" ;
+    Text [ finnish ] = "Haluatko poistaa liukuv�rj�yksen?" ;
     Text [ danish ] = "Er du sikker p�, at du vil slette farvegradueringen?" ;
     Text [ french ] = "Voulez-vous supprimer le d�grad� ?" ;
     Text [ swedish ] = "Skall f�rggradienten verkligen raderas?" ;
-    Text [ dutch ] = "Wilt u het kleurverloop werkelijk wissen?" ;
-    Text [ spanish ] = "�Desea realmente eliminar el gradiente de color?" ;
+    Text [ dutch ] = "Wilt u de kleurovergangen werkelijk wissen?" ;
+    Text [ spanish ] = "�Desea realmente borrar el gradiente de color?" ;
     Text [ english_us ] = "Do you want to delete the gradient?" ;
-    Text[ chinese_simplified ] = "��Ҫɾ�������ɫͼ����";
-    Text[ russian ] = "�� ������������� ������ ������� ��� �����������?";
+    Text[ chinese_simplified ] = "真要删除这个彩色图案吗？";
+    Text[ russian ] = "������� ��������?";
     Text[ polish ] = "Czy chcesz na pewno usun�� gradient?";
-    Text[ japanese ] = "���̸���ް��݂��폜���Ă��܂��܂��񂩁B";
-    Text[ chinese_traditional ] = "�z�u�n�R���o�ӱm��ϮסH";
+    Text[ japanese ] = "このグラデーションを削除してかまいませんか。";
+    Text[ chinese_traditional ] = "真要刪除這個彩色圖案？";
     Text[ arabic ] = "�� ���� ������ ��� ���� �����";
     Text[ greek ] = "������ ���������� �� ����� �������� ��� ����������� ��������;";
-    Text[ korean ] = "�׶��̼��� ������ �����Ͻðڽ��ϱ�?";
+    Text[ korean ] = "그라디언트를 정말로 삭제하겠습니까?";
     Text[ turkish ] = "Gradyan ger�ekten silinsin mi?";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "�Desea realmente eliminar el gradiente de color?";
+    Text[ catalan ] = "Voleu realment suprimir el gradient de color?";
+    Text[ thai ] = "คุณต้องการลบการไล่ระดับสีหรือไม่?";
 };
 String RID_SVXSTR_ASK_CHANGE_GRADIENT
 {
@@ -216,24 +221,25 @@ String RID_SVXSTR_ASK_CHANGE_GRADIENT
     Text [ italian ] = "La sfumatura � stata modificata ma non cambiata \nPotete cambiare la sfumatura selezionata \no aggiungerne una nuova." ;
     Text [ portuguese_brazilian ] = "O D?grad? foi modificado sem Gravar? \nMude o D?grad? selecionado ou acrescente um novo D?grad?." ;
     Text [ portuguese ] = "A grada��o da cor foi modificada e n�o guardada.\nPoder� modificar a grada��o seleccionada\nou adicionar uma nova." ;
-    Text [ finnish ] = "S�vytyst� ei tallennettu muokkauksen j�lkeen. \nMuokkaa valittua s�vytyst� tai lis�� uusi s�vytys." ;
+    Text [ finnish ] = "Liukuv�rj�yst� ei tallennettu muutoksen j�lkeen. \nMuuta valittua liukuv�rj�yst� tai lis�� uusi liukuv�rj�ys." ;
     Text [ danish ] = "Farvegradueringen er blevet �ndret, men ikke gemt. \nDu kan �ndre den markerede farvegraduering \neller tilf�je en ny." ;
     Text [ french ] = "Le d�grad� a �t� modifi� sans avoir �t� sauvegard�.\nVous pouvez modifier le d�grad� s�lectionn� ou en ajouter un nouveau." ;
     Text [ swedish ] = "F�rggradienten �ndrades utan att sparas.\nDu kan �ndra den markerade f�rggradienten\neller l�gga till en ny." ;
-    Text [ dutch ] = "In het kleurverloop werden wijzigingen aangebracht en niet opgeslagen. \\U kunt het geselecteerde kleurverloop wijzigen \nof een nieuw kleurverloop toevoegen." ;
+    Text [ dutch ] = "In de kleurovergangen zijn wijzigingen aangebracht en niet opgeslagen. \\U kunt de geselecteerde kleurovergangen wijzigen \nof nieuwe kleurovergangen toevoegen." ;
     Text [ spanish ] = "El gradiente de color ha sido modificado sin guardar.\nPuede modificarlo\no a�adir uno nuevo." ;
     Text [ english_us ] = "The gradient was modified without saving. \nModify the selected gradient or add a new gradient." ;
-    Text[ chinese_simplified ] = "�����ɫͼ���Ѿ����ģ����ǻ�û�б��档\n���ܹ�����ѡ�еIJ�ɫͼ��\n��������һ���µIJ�ɫͼ����";
-    Text[ russian ] = "����������� ���� ��������. �� �� ���������. \n�� ������ �������� ��������� \n��� �������� ����� �����������.";
+    Text[ chinese_simplified ] = "这个彩色图案已经更改，但是还没有保存。\n您能够更改选中的彩色图案\n或者新增一个新的彩色图案。";
+    Text[ russian ] = "�������� ��� ������� ��� ����������. \n�������� ��������� \n��� �������� ����� ��������.";
     Text[ polish ] = "Gradient zosta� zmieniony i nie zapisany. \nMo�esz zmieni� zaznaczony gradient \nlub doda� nowy gradient.";
-    Text[ japanese ] = "����ް��݂��ύX����ĕۑ�����Ă��܂���B\n�I����������ް��݂̕ύX�܂���\n�V��������ް��݂̒lj����ł��܂��B";
-    Text[ chinese_traditional ] = "�o�ӱm��Ϯפw�g�ܧ�M���O�|���x�s�C\n�z����ܧ������m��Ϯ�\n�Ϊ̼W�[�@�ӷs���m��ϮסC";
+    Text[ japanese ] = "グラデーションが変更されて保存されていません。\n選択したグラデーションの変更または\n新しいグラデーションの追加ができます。";
+    Text[ chinese_traditional ] = "這個彩色圖案已經變更﹐但是尚未儲存。\n您能夠變更選取的彩色圖案\n或者增加一個新的彩色圖案。";
     Text[ arabic ] = "�� ��� ��� ���� ����� ��� ������. \n����� ����� ���� ����� ������ \n�� ����� ���� ��� ����.";
     Text[ greek ] = "� ���������� ��� �������� ������������� ��� ��� ������������. \n�������� �� �������� ��� ���������� ���������� �������� \n� �� ���������� � ";
-    Text[ korean ] = "�׶��̼��� ����Ǿ����� ������� �ʾҽ��ϴ�.\n���õ� �׶��̼��� �����ϰų� \n�� �׶��̼��� �߰��� �� �ֽ��ϴ�.";
+    Text[ korean ] = "그라디언트가 변경되었으나 저장되지 않았습니다.\n선택된 그라디언트를 변경하거나 \n새 그라디언트를 추가할 수 있습니다.";
     Text[ turkish ] = "Gradyan de�i�tirildi ancak kaydedilmedi.\nSe�ili gradyan� de�i�tirebilir ya da\nyeni bir gradyan ekleyebilirsiniz.";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "El gradiente de color ha sido modificado sin guardar.\nPuede modificarlo\no a�adir uno nuevo.";
+    Text[ catalan ] = "El gradient de color s'ha modificat sense desar-lo.\nPodeu modificar-lo\no afegir-ne un de nou.";
+    Text[ thai ] = "ดัดแปลงแก้ไขการไล่ระดับสีโดยไม่มีการบันทึก \nดัดแปลงแก้ไขการไล่ระดับสีที่เลือกหรือเพิ่มการไล่ระดับสีใหม่";
 };
 String RID_SVXSTR_BITMAP
 {
@@ -241,7 +247,7 @@ String RID_SVXSTR_BITMAP
     Text [ ENGLISH ] = "Bitmap" ;
     Text [ english_us ] = "Bitmap" ;
     Text[ portuguese ] = "Bitmap";
-    Text[ russian ] = "Bitmap";
+    Text[ russian ] = "�����";
     Text[ greek ] = "Bitmap";
     Text[ dutch ] = "Bitmap";
     Text[ french ] = "Bitmap";
@@ -252,13 +258,14 @@ String RID_SVXSTR_BITMAP
     Text[ swedish ] = "Bitmap";
     Text[ polish ] = "Mapa bitowa";
     Text[ portuguese_brazilian ] = "Bitmap";
-    Text[ japanese ] = "�ޯ�ϯ��";
-    Text[ korean ] = "��Ʈ��";
-    Text[ chinese_simplified ] = "λͼ";
-    Text[ chinese_traditional ] = "�I�}��";
+    Text[ japanese ] = "ビットマップ";
+    Text[ korean ] = "비트맵";
+    Text[ chinese_simplified ] = "位图";
+    Text[ chinese_traditional ] = "點陣圖";
     Text[ turkish ] = "Bit e�lem";
     Text[ arabic ] = "���� �����";
-    Text[ catalan ] = "Bitmap";
+    Text[ catalan ] = "Mapa de bits";
+    Text[ thai ] = "บิทแม็ป";
 };
 String RID_SVXSTR_DESC_NEW_BITMAP
 {
@@ -272,22 +279,23 @@ String RID_SVXSTR_DESC_NEW_BITMAP
     Text [ portuguese ] = "Por favor introduza um nome para o mapa de bits:" ;
     Text [ french ] = "Saisissez un nom pour le bitmap :" ;
     Text [ dutch ] = "Typ hier een naam voor de bitmap:" ;
-    Text [ spanish ] = "Inserte aqu� el nombre para la bitmap:" ;
+    Text [ spanish ] = "Introduzca aqu� un nombre para la bitmap:" ;
     Text [ danish ] = "Indtast venligst et navn til denne bitmap:" ;
     Text [ swedish ] = "Ange ett namn f�r bitmappen:" ;
     Text [ finnish ] = "Kirjoita bittikartan nimi:" ;
     Text [ english_us ] = "Please enter a name for the bitmap:" ;
-    Text[ chinese_simplified ] = "�����ڴ�Ϊ�µ�λͼ����һ�����ƣ�";
-    Text[ russian ] = "�������, ����������, ��� ������ bitmap:";
+    Text[ chinese_simplified ] = "请您在此为新的位图输入一个名称：";
+    Text[ russian ] = "������� ��� ������:";
     Text[ polish ] = "Podaj nazw� mapy bitowej:";
-    Text[ japanese ] = "�ޯ�ϯ�߂̖��O�������ɓ��͂��Ă��������F";
-    Text[ chinese_traditional ] = "�бz�b�����s����Ͽ�J�@�ӦW�١G";
+    Text[ japanese ] = "ビットマップの名前をここに入力してください：";
+    Text[ chinese_traditional ] = "請您在此為新的位圖輸入一個名稱：";
     Text[ arabic ] = "������ ����� ��� ������ ������� ���:";
     Text[ greek ] = "�������� �������� ��� ����� ��� �� �itmap:";
-    Text[ korean ] = "���⿡ ��Ʈ���� �̸��� �Է��Ͻʽÿ�:";
+    Text[ korean ] = "여기에 비트맵의 이름을 입력하십시오:";
     Text[ turkish ] = "Bit e�lem i�in bir ad girin:";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Inserte aqu� el nombre para la bitmap:";
+    Text[ catalan ] = "Inseriu aqu� el nom pel mapa de bits:";
+    Text[ thai ] = "กรุณาใส่ชื่อบิทแม็ป:";
 };
 String RID_SVXSTR_DESC_EXT_BITMAP
 {
@@ -304,19 +312,20 @@ String RID_SVXSTR_DESC_EXT_BITMAP
     Text [ french ] = "Saisissez un nom pour le bitmap externe :" ;
     Text [ swedish ] = "Ange namn f�r extern bitmap:" ;
     Text [ dutch ] = "Typ hier een naam voor de externe bitmap:" ;
-    Text [ spanish ] = "Inserte aqu� el nombre para la bitmap externa:" ;
+    Text [ spanish ] = "Introduzca aqu� un nombre para la bitmap externa:" ;
     Text [ english_us ] = "Please enter a name for the external bitmap:" ;
-    Text[ chinese_simplified ] = "�����ڴ�Ϊ�µ�����λͼ����һ������:";
-    Text[ russian ] = "�������, ����������, ��� ������ bitmap :";
+    Text[ chinese_simplified ] = "请您在此为新的外来位图输入一个名称:";
+    Text[ russian ] = "������� ��� �������� ������:";
     Text[ polish ] = "Podaj nazw� zewn�trznej mapy bitowej:";
-    Text[ japanese ] = "�O���ޯ�ϯ�߂̖��O�������ɓ��͂��Ă��������F";
-    Text[ chinese_traditional ] = "�бz�b�����s���~���I�}�Ͽ�J�@�ӦW�١G";
+    Text[ japanese ] = "外部ビットマップの名前をここに入力してください：";
+    Text[ chinese_traditional ] = "請您在此為新的外來點陣圖輸入一個名稱：";
     Text[ arabic ] = "������ ����� ��� ������ ������� �������� ���:";
     Text[ greek ] = "�������� �������� ��� ����� ��� �� ��������� �itmap:";
-    Text[ korean ] = "���⿡ �ܺ� ��Ʈ���� �̸��� �Է��Ͻʽÿ�:";
+    Text[ korean ] = "여기에 외부 비트맵의 이름을 입력하십시오:";
     Text[ turkish ] = "D�� bit e�lem i�in bir ad girin:";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Inserte aqu� el nombre para la bitmap externa:";
+    Text[ catalan ] = "Inseriu aqu� el nom pel mapa de bits extern:";
+    Text[ thai ] = "กรุณาใส่ชื่อบิทแม็ปภายนอก:";
 };
 String RID_SVXSTR_DEL_BITMAP
 {
@@ -333,19 +342,20 @@ String RID_SVXSTR_DEL_BITMAP
     Text [ french ] = "Supprimer le bitmap" ;
     Text [ swedish ] = "Radera bitmap" ;
     Text [ dutch ] = "Bitmap wissen" ;
-    Text [ spanish ] = "Eliminar bitmap" ;
+    Text [ spanish ] = "Borrar bitmap" ;
     Text [ english_us ] = "Delete bitmap" ;
-    Text[ chinese_simplified ] = "ɾ��λͼ";
-    Text[ russian ] = "������� bitmap";
+    Text[ chinese_simplified ] = "删除位图";
+    Text[ russian ] = "������� �����";
     Text[ polish ] = "Usu� map� bitow�";
-    Text[ japanese ] = "�ޯ�ϯ�߂̍폜";
-    Text[ chinese_traditional ] = "�R���I�}��";
+    Text[ japanese ] = "ビットマップの削除";
+    Text[ chinese_traditional ] = "刪除點陣圖";
     Text[ arabic ] = "��� ������ �������";
     Text[ greek ] = "�������� bitmap";
-    Text[ korean ] = "��Ʈ�� ����";
+    Text[ korean ] = "비트맵 삭제";
     Text[ turkish ] = "Bit e�lemi sil";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Eliminar bitmap";
+    Text[ catalan ] = "Suprimeix el mapa de bits";
+    Text[ thai ] = "ลบบิทแม็ป";
 };
 String RID_SVXSTR_ASK_DEL_BITMAP
 {
@@ -362,19 +372,20 @@ String RID_SVXSTR_ASK_DEL_BITMAP
     Text [ french ] = "Confirmez-vous la suppression du bitmap ?" ;
     Text [ swedish ] = "Skall bitmappen verkligen raderas?" ;
     Text [ dutch ] = "Wilt u de bitmap werkelijk verwijderen?" ;
-    Text [ spanish ] = "�Desea realmente eliminar el bitmap?" ;
+    Text [ spanish ] = "�Desea realmente borrar el bitmap?" ;
     Text [ english_us ] = "Are you sure you want to delete the bitmap?" ;
-    Text[ chinese_simplified ] = "��Ҫɾ�����λͼ��";
-    Text[ russian ] = "�� ������������� ������ ������� ���� bitmap?";
+    Text[ chinese_simplified ] = "真要删除这个位图吗？";
+    Text[ russian ] = "�� ������������� ������ ������� ���� �����?";
     Text[ polish ] = "Czy chcesz na pewno usun�� map� bitow�?";
-    Text[ japanese ] = "�����ޯ�ϯ�߂��폜���Ă��܂��܂��񂩁B";
-    Text[ chinese_traditional ] = "�z�u�n�R���o���I�}�ϡH";
+    Text[ japanese ] = "このビットマップを削除してかまいませんか。";
+    Text[ chinese_traditional ] = "您真要刪除這個點陣圖？";
     Text[ arabic ] = "�� ���� ������ ��� ������ ������ɿ";
     Text[ greek ] = "������ ���������� �� ���������� �� Bitmap;";
-    Text[ korean ] = "��Ʈ���� ������ �����Ͻðڽ��ϱ�?";
+    Text[ korean ] = "비트맵을 정말로 삭제하겠습니까?";
     Text[ turkish ] = "Bit e�lem ger�ekten silinsin mi?";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "�Desea realmente eliminar el bitmap?";
+    Text[ catalan ] = "Esteu segur que voleu suprimir el mapa de bits?";
+    Text[ thai ] = "คุณแน่ใจหรือไม่ที่ต้องการลบบิทแม็ป?";
 };
 String RID_SVXSTR_ASK_CHANGE_BITMAP
 {
@@ -386,24 +397,25 @@ String RID_SVXSTR_ASK_CHANGE_BITMAP
     Text [ italian ] = "La bitmap � stata modificata ma non salvata \nPotete cambiare la bitmap selezionata \no naggiungerne una nuova." ;
     Text [ portuguese_brazilian ] = "O Bitmap foi modificado sem Gravar? \nMude o Bitmap selecionado ou acrescente um novo Bitmap." ;
     Text [ portuguese ] = "O bitmap foi alterado e n�o guardado? \nPoder� modificar o bitmap seleccionado \nou adicionar um novo." ;
-    Text [ finnish ] = "Bittikarttaa on muokattu ilman tallennusta. \nMuokkaa valittua bittikarttaa tai lis�� uusi bittikartta." ;
+    Text [ finnish ] = "Bittikarttaa ei tallennettu muutoksen j�lkeen. \nMuuta valittua bittikarttaa tai lis�� uusi bittikartta." ;
     Text [ danish ] = "Denne bitmap er blevet �ndret, men ikke gemt. \nDu kan �ndre den markerede bitmap\n eller tilf�je en ny." ;
     Text [ french ] = "Le bitmap a �t� modifi� sans avoir �t� sauvegard�.\nVous pouvez modifier le bitmap s�lectionn� ou en ajouter un nouveau." ;
     Text [ swedish ] = "Bitmappen �ndrades utan att sparas. \nDu kan �ndra den markerade bitmappen\neller l�gga till en ny." ;
-    Text [ dutch ] = "In de bitmap werden wijzigingen aangebracht en niet opgeslagen. \nU kunt de geselecteerde bitmap wijzigen \nof een nieuwe bitmap toevoegen." ;
+    Text [ dutch ] = "In de bitmap zijn wijzigingen aangebracht en niet opgeslagen. \nU kunt de geselecteerde bitmap wijzigen \nof een nieuwe bitmap toevoegen." ;
     Text [ spanish ] = "El bitmap ha sido modificado sin guardar.\nPuede modificar el bitmap seleccionado\no a�adir uno nuevo." ;
     Text [ english_us ] = "The bitmap was modified without saving. \nModify the selected bitmap or add a new bitmap." ;
-    Text[ chinese_simplified ] = "���λͼ��ʽ�Ѿ����ģ�����û�б��档 \n���ܹ�����ѡ�е�λͼ\n��������һ����λͼ��";
-    Text[ russian ] = "Bitmap ��� �������, �� �� ��������. \n�� ������ �������� ��������� \n��� �������� ����� bitmap.";
+    Text[ chinese_simplified ] = "这个位图样式已经更改，但是没有保存。 \n您能够更改选中的位图\n或者新增一个新位图。";
+    Text[ russian ] = "����� ��� ������� ��� ����������. \n�������� ��������� \n��� �������� ����� �����.";
     Text[ polish ] = "Mapa bitowa zosta�a zmieniona i nie zapisana. \nMo�esz zmieni� zaznaczon� map� bitow� \nlub doda� now� map� bitow�.";
-    Text[ japanese ] = "�ޯ�ϯ�߂��ύX����ĕۑ�����Ă��܂���B\n�I�������ޯ�ϯ�߂̕ύX�܂���\n�V�����ޯ�ϯ�߂̒lj����ł��܂��B";
-    Text[ chinese_traditional ] = "�o���I�}�Ϫ��˦��w�g�ܧ�M���O�|���x�s�C \n�z����ܧ������I�}��\n�Ϊ̼W�[�@�ӷs���I�}�ϡC";
+    Text[ japanese ] = "ビットマップが変更されて保存されていません。\n選択したビットマップの変更または\n新しいビットマップの追加ができます。";
+    Text[ chinese_traditional ] = "這個點陣圖的樣式已經變更﹐但是尚未儲存。 \n您能夠變更選取的點陣圖\n或者增加一個新的點陣圖。";
     Text[ arabic ] = "�� ����� ������ ������� ��� ��� ����� ���.\n����� ����� ������ ������� ������ɡ\n�� ����� ���� ����� �����.";
     Text[ greek ] = "�� bitmap ������������� ����� �� ����� ����������. \n�������� �� �������� ��� ���������� bitmap \n� �� ���������� ��� ��������� bitmap.";
-    Text[ korean ] = "��Ʈ���� ����Ǿ����� ������� �ʾҽ��ϴ�. \n���õ� ��Ʈ���� �����ϰų� \n�� ��Ʈ���� �߰��� �� �ֽ��ϴ�.";
+    Text[ korean ] = "비트맵이 변경되었으나 저장되지 않았습니다. \n선택된 비트맵을 변경하거나 \n새 비트맵을 추가할 수 있습니다.";
     Text[ turkish ] = "Bit e�lem de�i�tirildi ancak kaydedilmedi.\nSe�ili bit e�lemi de�i�tirebilir ya da\nyeni bir bit e�lem ekleyebilirsiniz.";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "El bitmap ha sido modificado sin guardar.\nPuede modificar el bitmap seleccionado\no a�adir uno nuevo.";
+    Text[ catalan ] = "El mapa de bits s'ha modificat sense haver-lo desat. \nModifica el mapa de bits seleccionat o afegeix un nou mapa de bits.";
+    Text[ thai ] = "ดัดแปลงแก้ไขบิทแม็ปโดยไม่มีการบันทึก \nดัดแปลงแก้ไขบิทแม็ปที่เลือกหรือเพิ่มบิทแม็ปใหม่";
 };
 String RID_SVXSTR_LINESTYLE
 {
@@ -420,17 +432,18 @@ String RID_SVXSTR_LINESTYLE
     Text [ dutch ] = "Lijntype" ;
     Text [ spanish ] = "Estilo de l�nea" ;
     Text [ english_us ] = "Line Style" ;
-    Text[ chinese_simplified ] = "����ʽ��";
+    Text[ chinese_simplified ] = "线条式样";
     Text[ russian ] = "����� �����";
     Text[ polish ] = "Styl linii";
-    Text[ japanese ] = "������";
-    Text[ chinese_traditional ] = "�u������";
+    Text[ japanese ] = "線スタイル";
+    Text[ chinese_traditional ] = "線條式樣";
     Text[ arabic ] = "��� ����";
     Text[ greek ] = "���� �������";
-    Text[ korean ] = "�� ����";
+    Text[ korean ] = "선 스타일";
     Text[ turkish ] = "�izgi bi�imi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Estilo de l�nea";
+    Text[ catalan ] = "Estil de l�nia";
+    Text[ thai ] = "ลักษณะเส้น";
 };
 String RID_SVXSTR_DESC_LINESTYLE
 {
@@ -444,22 +457,23 @@ String RID_SVXSTR_DESC_LINESTYLE
     Text [ portuguese ] = "Por favor introduza um nome para o estilo de linha:" ;
     Text [ french ] = "Saisissez un nom pour le style de ligne :" ;
     Text [ dutch ] = "Typ hier een naam voor het nieuwe lijntype:" ;
-    Text [ spanish ] = "Inserte aqu� el nombre para el estilo de l�nea:" ;
+    Text [ spanish ] = "Inserte el nombre del estilo de l�nea:" ;
     Text [ danish ] = "Indtast venligst et navn til den nye stregtype:" ;
     Text [ swedish ] = "Mata in namnet f�r linjestilen h�r:" ;
     Text [ finnish ] = "Kirjoita viivatyylin nimi:" ;
     Text [ english_us ] = "Please enter a name for the line style:" ;
-    Text[ chinese_simplified ] = "�����ڴ�Ϊ�µ�����ʽ������һ�����ƣ�";
-    Text[ russian ] = "�������, ����������, ���� �������� ������ ����� �����:";
+    Text[ chinese_simplified ] = "请您在此为新的线条式样输入一个名称：";
+    Text[ russian ] = "������� �������� ����� �����:";
     Text[ polish ] = "Wpisz tutaj nazw� dla nowego stylu linii:";
-    Text[ japanese ] = "�����ق̖��O�������ɓ��͂��Ă��������F";
-    Text[ chinese_traditional ] = "�Цb�����s���u�����˿�J�@�ӦW�١G";
+    Text[ japanese ] = "線スタイルの名前をここに入力してください：";
+    Text[ chinese_traditional ] = "請在此為新的線條式樣輸入一個名稱：";
     Text[ arabic ] = "������ ����� ��� ��� ���� ���:";
     Text[ greek ] = "�������� �������� ��� ����� ��� �� ���� �������:";
-    Text[ korean ] = "���⿡ �� �� ������ �̸��� �Է��Ͻʽÿ�:";
+    Text[ korean ] = "여기에 새 선 스타일의 이름을 입력하십시오:";
     Text[ turkish ] = "�izgi bi�imi i�in bir ad girin:";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Inserte aqu� el nombre para el estilo de l�nea:";
+    Text[ catalan ] = "Inseriu aqu� el nom per l'estil de l�nia:";
+    Text[ thai ] = "กรุณ่ใส่ชื่อลักษณะเส้น:";
 };
 String RID_SVXSTR_DEL_LINESTYLE
 {
@@ -471,24 +485,25 @@ String RID_SVXSTR_DEL_LINESTYLE
     Text [ italian ] = "Cancella stile linea" ;
     Text [ portuguese_brazilian ] = "Apagar Estilo de linha:" ;
     Text [ portuguese ] = "Eliminar estilo de linha" ;
-    Text [ finnish ] = "Poista viivan tyyli" ;
+    Text [ finnish ] = "Poista viivatyyli" ;
     Text [ danish ] = "Slet stregtype" ;
     Text [ french ] = "Supprimer le style de ligne" ;
     Text [ swedish ] = "Radera linjestil" ;
     Text [ dutch ] = "Lijntype wissen" ;
-    Text [ spanish ] = "Eliminar estilo de l�nea" ;
+    Text [ spanish ] = "Borrar estilo de l�nea" ;
     Text [ english_us ] = "Delete line style" ;
-    Text[ chinese_simplified ] = "ɾ������ʽ��";
+    Text[ chinese_simplified ] = "删除线条式样";
     Text[ russian ] = "������� ����� �����";
     Text[ polish ] = "Usu� styl linii";
-    Text[ japanese ] = "�����ق̍폜";
-    Text[ chinese_traditional ] = "�R���u������";
+    Text[ japanese ] = "線スタイルの削除";
+    Text[ chinese_traditional ] = "刪除線條式樣";
     Text[ arabic ] = "��� ��� ����";
     Text[ greek ] = "�������� ���� �������";
-    Text[ korean ] = "�� ���� ����";
+    Text[ korean ] = "선 스타일 삭제";
     Text[ turkish ] = "�izgi bi�imini sil";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Eliminar estilo de l�nea";
+    Text[ catalan ] = "Suprimeix l'estil de l�nia";
+    Text[ thai ] = "ลบลักษณะเส้น";
 };
 String RID_SVXSTR_ASK_DEL_LINESTYLE
 {
@@ -505,19 +520,20 @@ String RID_SVXSTR_ASK_DEL_LINESTYLE
     Text [ french ] = "Voulez-vous supprimer le style de ligne ?" ;
     Text [ swedish ] = "Skall linjestilen verkligen raderas?" ;
     Text [ dutch ] = "Wilt u het lijntype werkelijk wissen?" ;
-    Text [ spanish ] = "�Desea realmente eliminar el estilo de l�nea?" ;
+    Text [ spanish ] = "�Desea realmente borrar el estilo de l�nea?" ;
     Text [ english_us ] = "Do you want to delete the line style?" ;
-    Text[ chinese_simplified ] = "��Ҫɾ���������ʽ����";
-    Text[ russian ] = "�� ������������� ������ ������� ��� ����� �����?";
+    Text[ chinese_simplified ] = "真要删除这个线条式样？";
+    Text[ russian ] = "������� ����� �����?";
     Text[ polish ] = "Czy styl linii ma na pewno zosta� usuni�ty?";
-    Text[ japanese ] = "���̐����ق�{���ɍ폜���܂����B";
-    Text[ chinese_traditional ] = "�u�n�R���o�ӽu�����ˡH";
+    Text[ japanese ] = "この線スタイルを本当に削除しますか。";
+    Text[ chinese_traditional ] = "真要刪除這個線條式樣？";
     Text[ arabic ] = "�� ���� ������ ��� ��� ���ؿ";
     Text[ greek ] = "������ ������� �� ��������� �� ���� �������;";
-    Text[ korean ] = "�� ������ ������ �����Ͻðڽ��ϱ�?";
+    Text[ korean ] = "선 스타일을 삭제하시겠습니까?";
     Text[ turkish ] = "�izgi bi�imi ger�ekten silinsin mi?";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "�Desea realmente eliminar el estilo de l�nea?";
+    Text[ catalan ] = "Voleu realment suprimir l'estil de l�nia?";
+    Text[ thai ] = "คุณต้องการลบลักษณะเส้นหรือไม่?";
 };
 String RID_SVXSTR_ASK_CHANGE_LINESTYLE
 {
@@ -529,24 +545,25 @@ String RID_SVXSTR_ASK_CHANGE_LINESTYLE
     Text [ italian ] = "Lo stile � stato modificato ma non salvato.\nPotetecambiare lo stile selezionato\\o aggiungerne uno nuovo." ;
     Text [ portuguese_brazilian ] = "O Estilo de linha foi modificado sem Gravar? \nMude o Estilo de linha selecionado ou acrescente um novo Estilo de linha." ;
     Text [ portuguese ] = "O fim de linha foi modificado e n�o guardado.\nPoder� modificar o fim de linha seleccionado\nou adicionar um novo." ;
-    Text [ finnish ] = "Viivatyyli� on muokattu ilman tallennusta. \nMuokkaa valittua viivatyyli� tai lis�� uusi viivatyyli." ;
+    Text [ finnish ] = "Viivatyyli� ei tallennettu muutoksen j�lkeen. \nMuuta valittua viivatyyli� tai lis�� uusi viivatyyli." ;
     Text [ danish ] = "Stregtypen er blevet �ndret, men ikke gemt. \nDu kan �ndre den markerede stregtype \neller tilf�je en ny." ;
     Text [ french ] = "Le style de ligne a �t� modifi� sans avoir �t� sauvegard�. \nVous pouvez modifiez le style de ligne s�lectionn� ou en ajouter un nouveau." ;
     Text [ swedish ] = "Linjestilen �ndrades utan att sparas.\nDu kan �ndra den markerade linjestilen eller\nl�gga till en ny." ;
-    Text [ dutch ] = "In het lijntype werden wijzigingen aangebracht die niet werden opgeslagen \nU kunt het geselecteerde lijntype wijzigen \nof een nieuw lijntype toevoegen." ;
-    Text [ spanish ] = "El estilo de l�nea ha sido modificado sin guardar.\nPuede modificar el estilo de l�nea seleccionado\no a�adir uno nuevo." ;
+    Text [ dutch ] = "In het lijntype zijn wijzigingen aangebracht die niet zijn opgeslagen \nU kunt het geselecteerde lijntype wijzigen \nof een nieuw lijntype toevoegen." ;
+    Text [ spanish ] = "El estilo de l�nea se modific� sin guardar.\nPuede modificar el estilo de l�nea seleccionado\no a�adir uno nuevo." ;
     Text [ english_us ] = "The line style was modified without saving. \nModify the selected line style or add a new line style." ;
-    Text[ chinese_simplified ] = "�������ʽ���Ѿ����ģ�����û�б��档 \n���ܹ�����ѡ�е�����ʽ��\n��������һ������ʽ����";
-    Text[ russian ] = "����� ����� ��� �������, �� �� ��������. \n�� ������ �������� ���������\n��� �������� ����� ����� �����.";
+    Text[ chinese_simplified ] = "这个线条式样已经更改，但是没有保存。 \n您能够更改选中的线条式样\n或者新增一个线条式样。";
+    Text[ russian ] = "����� ����� ��� ������� ��� ����������. \n�������� ���������\n��� �������� ����� ����� �����.";
     Text[ polish ] = "Styl linii zosta� zmieniony i nie zapisany. \nMo�esz zmieni� zaznaczony styl linii \nlub doda� nowy styl linii.";
-    Text[ japanese ] = "���̽��ق��ύX����ĕۑ�����Ă��܂���B\n�I���������̽��ق̕ύX�܂���\n�V�������̽��ق̒lj����ł��܂��B";
-    Text[ chinese_traditional ] = "�o�ӽu�����ˤw�g�ܧ�M���O�|���x�s�C \n�z����ܧ������u������\n�Ϊ̼W�[�@�ӷs���u�����ˡC";
+    Text[ japanese ] = "線スタイルが変更されて保存されていません。\n選択した線スタイルの変更\nまたは新しい線スタイルの追加ができます。";
+    Text[ chinese_traditional ] = "這個線條式樣已經變更﹐但是尚未儲存。 \n您能夠變更選取的線條式樣\n或者增加一個新的線條式樣。";
     Text[ arabic ] = "�� ����� ��� ���� ��� ��� ���� ���.\n����� ����� ��� ���� �����ϡ\n�� ����� ��� �� ����.";
     Text[ greek ] = "�� ���� ������� ������������� ����� �� ����� ����������. \n�������� �� �������� �� ���������� ���� \n� �� ���������� ��� ��������� ���� ���� ";
-    Text[ korean ] = "�� ������ ����Ǿ����� ������� �ʾҽ��ϴ�.\n���õ� �� ������ �����ϰų� \n�� �� ������ �߰��� �� �ֽ��ϴ�.";
+    Text[ korean ] = "선 스타일이 변경되었지만 저장되지 않았습니다.\n선택한 선 스타일을 변경하거나 새로운 선 스타일을 추가할 수 있습니다.";
     Text[ turkish ] = "�izgi bi�imi de�i�tirildi ancak kaydedilmedi. \nSe�ili �izgi bi�imini de�i�tirebilir ya da \nyeni bir �izgi bi�imi ekleyebilirsiniz.";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "El estilo de l�nea ha sido modificado sin guardar.\nPuede modificar el estilo de l�nea seleccionado\no a�adir uno nuevo.";
+    Text[ catalan ] = "L'estil de l�nia s'ha modificat sense desar-lo.\nPodeu modificar l'estil de l�nia seleccionat\no afegir-ne un de nou.";
+    Text[ thai ] = "ดัดแปลงแก้ไขลักษณะเส้นโดยไม่มีการบันทึก \nดัดแปลงแก้ไขลักษณะเส้นที่เลือกหรือเพิ่มลักษณะเส้นใหม่";
 };
 String RID_SVXSTR_INVISIBLE
 {
@@ -563,17 +580,18 @@ String RID_SVXSTR_INVISIBLE
     Text [ dutch ] = "Onzichtbaar" ;
     Text [ spanish ] = "Invisible" ;
     Text [ english_us ] = "Invisible" ;
-    Text[ chinese_simplified ] = "�����";
-    Text[ russian ] = "���������";
+    Text[ chinese_simplified ] = "隐入的";
+    Text[ russian ] = "����������";
     Text[ polish ] = "Niewidoczny";
-    Text[ japanese ] = "��\\��";
-    Text[ chinese_traditional ] = "���J��";
+    Text[ japanese ] = "透明";
+    Text[ chinese_traditional ] = "隱入的";
     Text[ arabic ] = "��� ����";
     Text[ greek ] = "�� �����";
-    Text[ korean ] = "������ �ʰ�";
+    Text[ korean ] = "숨김";
     Text[ turkish ] = "Gizle";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Invisible";
+    Text[ thai ] = "มองไม่เห็น";
 };
 String RID_SVXSTR_COLOR
 {
@@ -590,17 +608,18 @@ String RID_SVXSTR_COLOR
     Text [ dutch ] = "Kleur" ;
     Text [ spanish ] = "Color" ;
     Text [ english_us ] = "Color" ;
-    Text[ chinese_simplified ] = "��ɫ";
+    Text[ chinese_simplified ] = "颜色";
     Text[ russian ] = "����";
     Text[ polish ] = "Kolor";
-    Text[ japanese ] = "�F";
-    Text[ chinese_traditional ] = "�C��";
+    Text[ japanese ] = "色";
+    Text[ chinese_traditional ] = "顏色";
     Text[ arabic ] = "�����";
     Text[ greek ] = "�����";
-    Text[ korean ] = "����";
+    Text[ korean ] = "색상";
     Text[ turkish ] = "Renk";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Color";
+    Text[ thai ] = "สี";
 };
 String RID_SVXSTR_HATCH
 {
@@ -617,17 +636,18 @@ String RID_SVXSTR_HATCH
     Text [ dutch ] = "Arcering" ;
     Text [ spanish ] = "Trama" ;
     Text [ english_us ] = "Hatching" ;
-    Text[ chinese_simplified ] = "��Ӱ��";
+    Text[ chinese_simplified ] = "阴影线";
     Text[ russian ] = "���������";
     Text[ polish ] = "Kreskowanie";
-    Text[ japanese ] = "ʯ�ݸ�";
-    Text[ chinese_traditional ] = "���v�u";
+    Text[ japanese ] = "ハッチング";
+    Text[ chinese_traditional ] = "陰影線";
     Text[ arabic ] = "���";
     Text[ greek ] = "����������";
-    Text[ korean ] = "��Ī";
+    Text[ korean ] = "해칭";
     Text[ turkish ] = "Tarama";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Trama";
+    Text[ catalan ] = "Ombreig";
+    Text[ thai ] = "แรเงา";
 };
 String RID_SVXSTR_DESC_HATCH
 {
@@ -641,22 +661,23 @@ String RID_SVXSTR_DESC_HATCH
     Text [ portuguese ] = "Indique o nome para o tracejado:" ;
     Text [ french ] = "Saisissez un nom pour la hachure :" ;
     Text [ dutch ] = "Typ hier een naam voor de arcering:" ;
-    Text [ spanish ] = "Inserte aqu� el nombre para la trama:" ;
+    Text [ spanish ] = "Introduzca aqu� un nombre para la trama:" ;
     Text [ danish ] = "Indtast venligst et navn til skraveringen:" ;
     Text [ swedish ] = "Mata in namnet f�r skrafferingen h�r:" ;
     Text [ finnish ] = "Kirjoita viivoituksen nimi:" ;
     Text [ english_us ] = "Please enter a name for the hatching:" ;
-    Text[ chinese_simplified ] = "�����ڴ�Ϊ�µ���Ӱ����һ������:";
-    Text[ russian ] = "�������, ����������, ���� �������� ����� ���������:";
+    Text[ chinese_simplified ] = "请您在此为新的阴影输入一个名称:";
+    Text[ russian ] = "������� �������� ����� ���������:";
     Text[ polish ] = "Wpisz nazw� dla kreskowania:";
-    Text[ japanese ] = "ʯ�ݸނ̖��O�������ɓ��͂��Ă��������F";
-    Text[ chinese_traditional ] = "�бz�b�����s�����v�u��J�@�ӦW�١G";
+    Text[ japanese ] = "ハッチングの名前をここに入力してください：";
+    Text[ chinese_traditional ] = "請您在此為新的陰影線輸入一個名稱：";
     Text[ arabic ] = "������ ����� ��� ����� ���:";
     Text[ greek ] = "�������� �������� ��� ����� ��� �� ����������:";
-    Text[ korean ] = "���⿡ ��Ī�� �̸��� �Է��Ͻʽÿ�:";
+    Text[ korean ] = "해칭의 이름을 입력하십시오:";
     Text[ turkish ] = "Tarama i�in bir ad girin:";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Inserte aqu� el nombre para la trama:";
+    Text[ catalan ] = "Inseriu aqu� el nom per l'ombreig:";
+    Text[ thai ] = "กรุณาใส่ชื่อการแรเงา:";
 };
 String RID_SVXSTR_DEL_HATCH
 {
@@ -673,19 +694,20 @@ String RID_SVXSTR_DEL_HATCH
     Text [ french ] = "Supprimer les hachures" ;
     Text [ swedish ] = "Radera skraffering" ;
     Text [ dutch ] = "Arcering verwijderen" ;
-    Text [ spanish ] = "Eliminar trama" ;
+    Text [ spanish ] = "Borrar trama" ;
     Text [ english_us ] = "Delete hatching" ;
-    Text[ chinese_simplified ] = "ɾ����Ӱ";
+    Text[ chinese_simplified ] = "删除阴影";
     Text[ russian ] = "������� ���������";
     Text[ polish ] = "Usu� kreskowanie";
-    Text[ japanese ] = "ʯ�ݸނ̍폜";
-    Text[ chinese_traditional ] = "�R�����v�u";
+    Text[ japanese ] = "ハッチングの削除";
+    Text[ chinese_traditional ] = "刪除陰影線";
     Text[ arabic ] = "��� �����";
     Text[ greek ] = "�������� �����������";
-    Text[ korean ] = "��Ī ����";
+    Text[ korean ] = "해칭 삭제";
     Text[ turkish ] = "Taramay� sil";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Eliminar trama";
+    Text[ catalan ] = "Suprimeix l'ombreig";
+    Text[ thai ] = "ลบการแรเงา";
 };
 String RID_SVXSTR_ASK_DEL_HATCH
 {
@@ -700,21 +722,22 @@ String RID_SVXSTR_ASK_DEL_HATCH
     Text [ finnish ] = "Haluatko poistaa viivoituksen?" ;
     Text [ danish ] = "Er du sikker p�, at du vil slette skraveringen?" ;
     Text [ french ] = "Voulez-vous supprimer les hachures ?" ;
-    Text [ swedish ] = "Vill Du verkligen radera skraffering?" ;
+    Text [ swedish ] = "Vill du verkligen radera skrafferingen?" ;
     Text [ dutch ] = "Wilt u de arcering werkelijk verwijderen?" ;
-    Text [ spanish ] = "�Desea realmente eliminar el entramado?" ;
+    Text [ spanish ] = "�Desea realmente borrar el entramado?" ;
     Text [ english_us ] = "Do you want to delete the hatching?" ;
-    Text[ chinese_simplified ] = "��Ҫɾ�������Ӱ��";
-    Text[ russian ] = "�� ������������� ������ ������� ��� ���������?";
+    Text[ chinese_simplified ] = "真要删除这个阴影吗？";
+    Text[ russian ] = "������� ���������?";
     Text[ polish ] = "Czy na pewno usun�� kreskowanie?";
-    Text[ japanese ] = "����ʯ�ݸނ��폜���Ă��܂��܂��񂩁B";
-    Text[ chinese_traditional ] = "�z�u�n�R���o�ӳ��v�u�H";
+    Text[ japanese ] = "このハッチングを削除してかまいませんか。";
+    Text[ chinese_traditional ] = "您真要刪除這個陰影線？";
     Text[ arabic ] = "�� ���� ������ ��� ����Կ";
     Text[ greek ] = "������ �� ��������� � ����������;";
-    Text[ korean ] = "��Ī�� ������ �����Ͻðڽ��ϱ�?";
+    Text[ korean ] = "해칭을 정말로 삭제하겠습니까?";
     Text[ turkish ] = "Tarama ger�ekten silinsin mi?";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "�Desea realmente eliminar el entramado?";
+    Text[ catalan ] = "Voleu suprimir l'ombreig?";
+    Text[ thai ] = "คุณต้องการลบการแรเงาหรือไม่?";
 };
 String RID_SVXSTR_ASK_CHANGE_HATCH
 {
@@ -726,24 +749,25 @@ String RID_SVXSTR_ASK_CHANGE_HATCH
     Text [ italian ] = "Il tratteggio � stato modificato ma non salvato \nPotete cambiare il tratteggio selezionato \noppure aggiungerne uno nuovo." ;
     Text [ portuguese_brazilian ] = "The tra?o de sombreado foi modificado sem Gravar? \nMude o tra?o de sombreado selecionado ou acrescente um novo tra?o de sombreado." ;
     Text [ portuguese ] = "Tracejado foi alterado e n�o guardado.\nPoder� alterar o tracejado seleccionado\nou adicionar um novo." ;
-    Text [ finnish ] = "Viivoitustyyppi� on muokattu ilman tallennusta. \nMuokkaa valittua viivoitustyyppi� tai lis�� uusi viivoitustyyppi." ;
+    Text [ finnish ] = "Viivoitustyyppi� on muutettu ilman tallennusta. \nMuuta valittua viivoitustyyppi� tai lis�� uusi viivoitustyyppi." ;
     Text [ danish ] = "Skraveringen er blevet �ndret, men ikke gemt. \nDu kan �ndre den markerede skravering\n eller tilf�je en ny." ;
     Text [ french ] = "Les hachures ont �t� modifi�es sans avoir �t� sauvegard�es. \nVous pouvez modifier les hachures s�lectionn�es ou en ajouter de nouvelles." ;
     Text [ swedish ] = "Skrafferingen �ndrades utan att sparas.\nDu kan �ndra den markerade skrafferingen eller\nl�gga till en ny." ;
-    Text [ dutch ] = "In de arcering werden wijzigingen aangebracht en niet opgeslagen. \nU kunt de geselecteerde arcering wijzigen \nof een nieuwe arcering toevoegen." ;
+    Text [ dutch ] = "In de arcering zijn wijzigingen aangebracht en niet opgeslagen. \nU kunt de geselecteerde arcering wijzigen \nof een nieuwe arcering toevoegen." ;
     Text [ spanish ] = "La trama ha sido modificada sin guardar.\nPuede modificar la trama seleccionada\no a�adir una nueva." ;
     Text [ english_us ] = "The hatching type was modified but not saved. \nModify the selected hatching type or add a new hatching type." ;
-    Text[ chinese_simplified ] = "�����Ӱ�Ѿ����ģ�����û�б��档 \n���ܹ�����ѡ�е���Ӱ\n��������һ���µ���Ӱ��";
-    Text[ russian ] = "��������� ���� ��������, �� �� ���������. \n�� ������ �������� ��������� ��������� \n��� �������� ����� ���������.";
+    Text[ chinese_simplified ] = "这个阴影已经更改，但是没有保存。 \n您能够更改选中的阴影\n或者新增一个新的阴影。";
+    Text[ russian ] = "��� ��������� ��� ������� ��� ����������. \n�������� ��������� ��������� \n��� �������� ����� ���������.";
     Text[ polish ] = "Kreskowanie zosta�o zmienione i nie zapisane. \nMo�esz zmieni� zaznaczone kreskowanie \ni lub doda� nowe kreskowanie.";
-    Text[ japanese ] = "ʯ�ݸނ��ύX����ĕۑ�����Ă��܂���B\n�I������ʯ�ݸނ̕ύX�܂���\n�V����ʯ�ݸނ̒lj����ł��܂��B";
-    Text[ chinese_traditional ] = "�o�ӳ��v�w�g�ܧ�M���O�|���x�s�C \n�z����ܧ��������v\n�Ϊ̼W�[�@�ӷs�����v�C";
+    Text[ japanese ] = "ハッチングが変更されて保存されていません。\n選択したハッチングの変更または\n新しいハッチングの追加ができます。";
+    Text[ chinese_traditional ] = "這個陰影已經變更﹐但是尚未儲存。 \n您能夠變更選取的陰影\n或者增加一個新的陰影。";
     Text[ arabic ] = "�� ����� ����� ��� ��� ���� ���.\n����� ����� ����� �����ϡ\n�� ����� ��� ����.";
     Text[ greek ] = "� ���������� ������������� ����� �� ����� ����������. \n�������� �� �������� ��� ���������� ���������� \n� �� ���������� ��� ��������� ���� ";
-    Text[ korean ] = "��Ī�� ����Ǿ����� ������� �ʾҽ��ϴ�. \n���õ� ��Ī�� �����ϰų� \n�� ��Ī�� �߰��� �� �ֽ��ϴ�.";
+    Text[ korean ] = "해칭이 변경되었으나 저장되지 않았습니다. \n선택된 해칭을 변경하거나 \n새 해칭을 추가할 수 있습니다.";
     Text[ turkish ] = "Tarama de�i�tirildi ancak kaydedilmedi.\nSe�ili deseni de�i�tirebilir ya da\nyeni bir tarama ekleyebilirsiniz.";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "La trama ha sido modificada sin guardar.\nPuede modificar la trama seleccionada\no a�adir una nueva.";
+    Text[ catalan ] = "El tipus d'ombreig s'ha modificat sense haver-lo desat. \nModifica el tipus d'ombreig seleccionat o afegeix un nou tipus d'ombreig.";
+    Text[ thai ] = "ดัดแปลงแก้ไขชนิดการแรเงาแต่ไม่บันทึก \nดัดแปลงแก้ไขชนิดการแรเงาที่เลือกหรือเพิ่มชนิดการแรเงาใหม่";
 };
 String RID_SVXSTR_CHANGE
 {
@@ -755,24 +779,25 @@ String RID_SVXSTR_CHANGE
     Text [ italian ] = "Modifica" ;
     Text [ portuguese_brazilian ] = "Modificar" ;
     Text [ portuguese ] = "Modificar" ;
-    Text [ finnish ] = "Muokkaa" ;
+    Text [ finnish ] = "Muuta" ;
     Text [ danish ] = "Modificer" ;
     Text [ french ] = "Modifier" ;
     Text [ swedish ] = "�ndra" ;
     Text [ dutch ] = "Wijzigen" ;
     Text [ spanish ] = "Modificar" ;
     Text [ english_us ] = "Modify" ;
-    Text[ chinese_simplified ] = "�޸�";
+    Text[ chinese_simplified ] = "修改";
     Text[ russian ] = "��������";
     Text[ polish ] = "Modyfikuj";
-    Text[ japanese ] = "�ύX";
-    Text[ chinese_traditional ] = "�ק�";
+    Text[ japanese ] = "変更";
+    Text[ chinese_traditional ] = "修改";
     Text[ arabic ] = "�����";
     Text[ greek ] = "�����������";
-    Text[ korean ] = "����";
+    Text[ korean ] = "변경";
     Text[ turkish ] = "De�i�tir";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Modificar";
+    Text[ catalan ] = "Modifica";
+    Text[ thai ] = "ดัดแปลงแก้ไข";
 };
 String RID_SVXSTR_ADD
 {
@@ -791,17 +816,18 @@ String RID_SVXSTR_ADD
     Text [ dutch ] = "Toevoegen" ;
     Text [ spanish ] = "A�adir" ;
     Text [ english_us ] = "Add" ;
-    Text[ chinese_simplified ] = "����";
+    Text[ chinese_simplified ] = "新增";
     Text[ russian ] = "��������";
     Text[ polish ] = "Dodaj";
-    Text[ japanese ] = "�lj�";
-    Text[ chinese_traditional ] = "�s�W";
+    Text[ japanese ] = "追加";
+    Text[ chinese_traditional ] = "新增";
     Text[ arabic ] = "�����";
     Text[ greek ] = "��������";
-    Text[ korean ] = "�߰�";
+    Text[ korean ] = "추가";
     Text[ turkish ] = "Ekle";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "A�adir";
+    Text[ catalan ] = "Afegeix";
+    Text[ thai ] = "เพิ่ม";
 };
 String RID_SVXSTR_DESC_COLOR
 {
@@ -818,19 +844,20 @@ String RID_SVXSTR_DESC_COLOR
     Text [ french ] = "Saisissez un nom pour la nouvelle couleur :" ;
     Text [ swedish ] = "Ange namn f�r den nya f�rgen:" ;
     Text [ dutch ] = "Typ hier een naam voor de nieuwe kleur:" ;
-    Text [ spanish ] = "Inserte aqu� el nombre para el nuevo color:" ;
+    Text [ spanish ] = "Inserte aqu� el nombre del nuevo color:" ;
     Text [ english_us ] = "Please enter a name for the new color:" ;
-    Text[ chinese_simplified ] = "�����ڴ�Ϊ�µ���ɫ����һ�����ƣ�";
-    Text[ russian ] = "�������, ����������, ���� �������� ������ �����:";
+    Text[ chinese_simplified ] = "请您在此为新的颜色输入一个名称：";
+    Text[ russian ] = "������� �������� ������ �����:";
     Text[ polish ] = "Wpisz nazw� nowego koloru:";
-    Text[ japanese ] = "�V�����F�̖��O����͂��Ă�������:";
-    Text[ chinese_traditional ] = "�бz�b�����s���C���J�@�ӦW�١G";
+    Text[ japanese ] = "新しい色の名前を入力してください:";
+    Text[ chinese_traditional ] = "請在這裡輸入一個新顏色的名稱：";
     Text[ arabic ] = "������ ����� ��� ����� ������ ���:";
     Text[ greek ] = "�������� �������� �� ����� ��� ���� ��������:";
-    Text[ korean ] = "���⿡��  ���ο� ������ �̸��� �Է��Ͻʽÿ�:";
+    Text[ korean ] = "여기에서 새로운 색상의 이름을 입력하십시오:";
     Text[ turkish ] = "Yeni rengin ad�n� girin:";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Inserte aqu� el nombre para el nuevo color:";
+    Text[ catalan ] = "Inseriu aqu� el nom pel nou color:";
+    Text[ thai ] = "กรุณาใส่ชื่อสีใหม่:";
 };
 String RID_SVXSTR_DEL_COLOR
 {
@@ -847,19 +874,20 @@ String RID_SVXSTR_DEL_COLOR
     Text [ french ] = "Supprimer la couleur" ;
     Text [ swedish ] = "Radera f�rg" ;
     Text [ dutch ] = "Kleur verwijderen" ;
-    Text [ spanish ] = "Eliminar color" ;
+    Text [ spanish ] = "Borrar color" ;
     Text [ english_us ] = "Delete color" ;
-    Text[ chinese_simplified ] = "ɾ����ɫ";
+    Text[ chinese_simplified ] = "删除颜色";
     Text[ russian ] = "������� ����";
     Text[ polish ] = "Usu� kolor";
-    Text[ japanese ] = "�F�̍폜";
-    Text[ chinese_traditional ] = "�R���C��";
+    Text[ japanese ] = "色の削除";
+    Text[ chinese_traditional ] = "刪除顏色";
     Text[ arabic ] = "��� �����";
     Text[ greek ] = "�������� ��������";
-    Text[ korean ] = "�� ����";
+    Text[ korean ] = "색상 삭제";
     Text[ turkish ] = "Rengi sil";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Eliminar color";
+    Text[ catalan ] = "Suprimeix el color";
+    Text[ thai ] = "ลบสี";
 };
 String RID_SVXSTR_ASK_DEL_COLOR
 {
@@ -874,21 +902,22 @@ String RID_SVXSTR_ASK_DEL_COLOR
     Text [ finnish ] = "Haluatko poistaa v�rin?" ;
     Text [ danish ] = "Er du sikker p�, at du vil slette farven?" ;
     Text [ french ] = "Voulez-vous supprimer la couleur ?" ;
-    Text [ swedish ] = "Vill Du verkligen radera f�rgen?" ;
+    Text [ swedish ] = "Vill du verkligen radera f�rgen?" ;
     Text [ dutch ] = "Wilt u de kleur werkelijk wissen?" ;
-    Text [ spanish ] = "�Desea realmente eliminar el color?" ;
+    Text [ spanish ] = "�Desea realmente borrar el color?" ;
     Text [ english_us ] = "Do you want to delete the color?" ;
-    Text[ chinese_simplified ] = "��Ҫɾ�������ɫ��";
+    Text[ chinese_simplified ] = "真要删除这个颜色吗？";
     Text[ russian ] = "�� ������������� ������ ������� ���� ����?";
     Text[ polish ] = "Czy chcesz na pewno usun�� kolor?";
-    Text[ japanese ] = "���̐F���폜���Ă��܂��܂��񂩁B";
-    Text[ chinese_traditional ] = "�z�u�n�R���o���C��H";
+    Text[ japanese ] = "この色を削除してかまいませんか。";
+    Text[ chinese_traditional ] = "您真要刪除這個顏色？";
     Text[ arabic ] = "�� ���� ������ ��� �����";
     Text[ greek ] = "������ ������� �� ��������� �� �����;";
-    Text[ korean ] = "���� ������ �����Ͻðڽ��ϱ�?";
+    Text[ korean ] = "색을 정말로 삭제하겠습니까?";
     Text[ turkish ] = "Renk ger�ekten silinsin mi?";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "�Desea realmente eliminar el color?";
+    Text[ catalan ] = "Voleu suprimir el color?";
+    Text[ thai ] = "คุณต้องการลบสีหรือไม่?";
 };
 String RID_SVXSTR_ASK_CHANGE_COLOR
 {
@@ -900,24 +929,25 @@ String RID_SVXSTR_ASK_CHANGE_COLOR
     Text [ italian ] = "Il colore � stato modificato ma non salvato.\nPotete cambiare il colore selezionato \no aggiungerne\n uno nuovo." ;
     Text [ portuguese_brazilian ] = "A Cor foi modificada sem Gravar? \nMude a Cor selecionada ou acrescente uma nova Cor." ;
     Text [ portuguese ] = "A cor foi modificada e n�o guardada? \nPoder� modificar a cor seleccionada\nou adicionar uma nova." ;
-    Text [ finnish ] = "V�ri� on muokattu tallentamatta.\nMuokkaa valittua v�ri� tai lis�� uusi v�ri." ;
+    Text [ finnish ] = "V�ri� on muutettu tallentamatta.\nMuuta valittua v�ri� tai lis�� uusi v�ri." ;
     Text [ danish ] = "Farven er blevet �ndret, men ikke gemt. \nDu kan �ndre den markerede farve\n eller tilf�je en ny." ;
     Text [ french ] = "La couleur a �t� modifi�e sans avoir �t� sauvegard�e.\nVous pouvez modifier la couleur s�lectionn�e ou en ajouter une nouvelle." ;
     Text [ swedish ] = "F�rgen �ndrades utan att sparas.\nDu kan �ndra den markerade f�rgen\neller l�gga till en ny." ;
-    Text [ dutch ] = "In de kleur werden wijzigingen aangebracht en niet opgeslagen. \nU kunt de geselecteerde kleur wijzigen \nof een nieuwe kleur toevoegen." ;
+    Text [ dutch ] = "In de kleur zijn wijzigingen aangebracht en niet opgeslagen. \nU kunt de geselecteerde kleur wijzigen \nof een nieuwe kleur toevoegen." ;
     Text [ spanish ] = "El color ha sido modificado sin guardar.\nPuede modificar el color seleccionado\no a�adir uno nuevo." ;
     Text [ english_us ] = "The color was modified without saving.\nModify the selected color or add a new color." ;
-    Text[ chinese_simplified ] = "�����ɫ�Ѿ����ģ�����û�б��档 \n���ܹ�����ѡ�е���ɫ\n��������һ������ɫ��";
-    Text[ russian ] = "���� ��� �������, �� �� ��������. \n�� ������ �������� ��������� \n��� �������� ����� ����.";
+    Text[ chinese_simplified ] = "这个颜色已经更改，但是没有保存。 \n您能够更改选中的颜色\n或者新增一个新颜色。";
+    Text[ russian ] = "���� ��� ������� ��� ����������. \n�������� ��������� \n��� �������� ����� ����.";
     Text[ polish ] = "Kolor zosta� zmieniony i nie zapisany. \nMo�esz zmieni� zaznaczony kolor \nlub doda� nowy kolor.";
-    Text[ japanese ] = "�F���ύX����ĕۑ�����Ă��܂���B\n�I�������F�̕ύX�܂���\n�V�����F�̒lj����ł��܂��B";
-    Text[ chinese_traditional ] = "�o���C��w�g�ܧ�M���O�|���x�s�C \n�z����ܧ������C��\n�Ϊ̼W�[�@�ӷs���C��C";
+    Text[ japanese ] = "色が変更されて保存されていません。\n選択した色の変更または\n新しい色の追加ができます。";
+    Text[ chinese_traditional ] = "已經變更這個顏色﹐但是尚未儲存。 \n您能夠變更選取的顏色\n或者增加一個新的顏色。";
     Text[ arabic ] = "�� ����� ����� ��� ��� ���� ���.\n����� ����� ����� �����ϡ\n�� ����� ��� ����.";
     Text[ greek ] = "�� ����� ������������� ����� �� ����� ����������. \n�������� �� �������� �� ���������� ����� \n� �� ���������� ��� ��������� �����.";
-    Text[ korean ] = "������ ����Ǿ�����  ������� �ʾҽ��ϴ�.\n���õ� ���� �����ϰų� \n���ο� ���� �߰��� �� �ֽ��ϴ�.";
+    Text[ korean ] = "색상이 변경되었지만 저장되지 않았습니다.\n선택된 색을 변경하거나 \n새로운 색을 추가할 수 있습니다.";
     Text[ turkish ] = "Renk de�i�tirildi ancak kaydedilmedi.\nSe�ili rengi de�i�tirebilir ya da\nyeni bir renk ekleyebilirsiniz.";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "El color ha sido modificado sin guardar.\nPuede modificar el color seleccionado\no a�adir uno nuevo.";
+    Text[ catalan ] = "El color s'ha modificat sense haver-lo desat. \nModifica el color seleccionat o afegeix un nou color.";
+    Text[ thai ] = "ดัดแปลงแก้ไขสีโดยไม่มีการบันทึก\nดัดแปลงแก้ไขสีที่เลือกหรือเพิ่มสีใหม่";
 };
 String RID_SVXSTR_TABLE
 {
@@ -934,17 +964,18 @@ String RID_SVXSTR_TABLE
     Text [ dutch ] = "Tabel" ;
     Text [ spanish ] = "Tabla" ;
     Text [ english_us ] = "Table" ;
-    Text[ chinese_simplified ] = "����";
+    Text[ chinese_simplified ] = "表格";
     Text[ russian ] = "�������";
     Text[ polish ] = "Tabela";
-    Text[ japanese ] = "�\\";
-    Text[ chinese_traditional ] = "����";
+    Text[ japanese ] = "表";
+    Text[ chinese_traditional ] = "表格";
     Text[ arabic ] = "����";
     Text[ greek ] = "�������";
-    Text[ korean ] = "���̺�";
+    Text[ korean ] = "표";
     Text[ turkish ] = "Tablo";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Tabla";
+    Text[ catalan ] = "Taula";
+    Text[ thai ] = "ตาราง";
 };
 String RID_SVXSTR_WRITE_DATA_ERROR
 {
@@ -955,23 +986,24 @@ String RID_SVXSTR_WRITE_DATA_ERROR
     Text [ portuguese_brazilian ] = "The file couldn't be saved!" ;
     Text [ portuguese ] = "Foi imposs�vel guardar o ficheiro!" ;
     Text [ french ] = "Impossible de sauvegarder ce fichier." ;
-    Text [ dutch ] = "Het bestand kon niet worden opgeslagen!" ;
+    Text [ dutch ] = "Het bestand kan niet worden opgeslagen!" ;
     Text [ spanish ] = "�No se pudo guardar el archivo!" ;
     Text [ danish ] = "Det var ikke muligt at gemme filen!" ;
     Text [ swedish ] = "Det gick inte att spara filen!" ;
-    Text [ finnish ] = "Tiedostoa ei voitu tallentaa." ;
+    Text [ finnish ] = "Tiedoston tallentaminen ei onnistunut." ;
     Text [ english_us ] = "The file could not be saved!" ;
-    Text[ chinese_simplified ] = "�޷���������ļ���";
-    Text[ russian ] = "��������� ���� �� �������!";
+    Text[ chinese_simplified ] = "无法保存这个文件！";
+    Text[ russian ] = "���������� ��������� ����!";
     Text[ polish ] = "Plik nie m�g� zosta� zapisany!";
-    Text[ japanese ] = "̧�ق͕ۑ��ł��܂���ł����B";
-    Text[ chinese_traditional ] = "�L�k�x�s�o���ɮסI";
+    Text[ japanese ] = "ファイルは保存できませんでした。";
+    Text[ chinese_traditional ] = "無法儲存這個檔案！";
     Text[ arabic ] = "���� ��� �����!";
     Text[ greek ] = "��� ���� ������ � ���������� ��� �������!";
-    Text[ korean ] = "������ �������� ���߽��ϴ�!";
+    Text[ korean ] = "파일을 저장하지 못했습니다.";
     Text[ turkish ] = "Dosya kaydedilemedi!";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "�No se pudo guardar el archivo!";
+    Text[ catalan ] = "El fitxer no es pot desar!";
+    Text[ thai ] = "ไม่สามารถบันทึกแฟ้มได้!";
 };
 String RID_SVXSTR_READ_DATA_ERROR
 {
@@ -981,24 +1013,25 @@ String RID_SVXSTR_READ_DATA_ERROR
     Text [ italian ] = "Impossibile caricare il file!" ;
     Text [ portuguese_brazilian ] = "O arquivo n?o pode ser carregado!" ;
     Text [ portuguese ] = "Foi imposs�vel carregar o ficheiro!" ;
-    Text [ finnish ] = "Tiedostoa ei l�ytynyt." ;
+    Text [ finnish ] = "Tiedoston lataaminen ei onnistunut." ;
     Text [ danish ] = "Det var ikke muligt at indl�se filen!" ;
     Text [ french ] = "Impossible de charger le fichier !" ;
     Text [ swedish ] = "Det gick inte att ladda filen!" ;
-    Text [ dutch ] = "Het bestand kon niet worden geladen!" ;
+    Text [ dutch ] = "Het bestand kan niet worden geladen!" ;
     Text [ spanish ] = "�No se pudo cargar el archivo!" ;
     Text [ english_us ] = "The file could not be loaded!" ;
-    Text[ chinese_simplified ] = "�޷�װ������ļ���";
-    Text[ russian ] = "��������� ���� ���� �� �������!";
+    Text[ chinese_simplified ] = "无法装入这个文件！";
+    Text[ russian ] = "���������� ��������� ����!";
     Text[ polish ] = "Plik nie m�g� zosta� za�adowany!";
-    Text[ japanese ] = "̧�ق͓ǂݍ��݂ł��܂���ł����B";
-    Text[ chinese_traditional ] = "�L�k���J�o���ɮסI";
+    Text[ japanese ] = "ファイルは読み込みできませんでした。";
+    Text[ chinese_traditional ] = "無法載入這個檔案！";
     Text[ arabic ] = "���� ����� �����!";
     Text[ greek ] = "��� ���� ������� �� �������� �� ������!";
-    Text[ korean ] = "������ �ε����� ���߽��ϴ�!";
+    Text[ korean ] = "파일을 로드하지 못했습니다.";
     Text[ turkish ] = "Dosya y�klenemedi!";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "�No se pudo cargar el archivo!";
+    Text[ catalan ] = "El fitxer no es pot carregar!";
+    Text[ thai ] = "ไม่สามารถโหลดแฟ้มได้!";
 };
 String RID_SVXSTR_WARN_TABLE_OVERWRITE
 {
@@ -1010,24 +1043,25 @@ String RID_SVXSTR_WARN_TABLE_OVERWRITE
     Text [ italian ] = "La tabella � stata modificata senza salvare. \nSalvare la tabella?" ;
     Text [ portuguese_brazilian ] = "A tabela foi modificada sem gravar. Gostaria de gravar a tabela?" ;
     Text [ portuguese ] = "A tabela foi modificada e n�o guardada.\nGuardar agora?" ;
-    Text [ finnish ] = "Luetteloa on muokattu ilman tallennusta. Haluatko tallentaa luettelon nyt?" ;
+    Text [ finnish ] = "Luetteloa on muutettu ilman tallennusta. Haluatko tallentaa luettelon nyt?" ;
     Text [ danish ] = "Tabellen er blevet �ndret, men ikke gemt.\nVil du gemme tabellen nu?" ;
     Text [ french ] = "La table a �t� modifi�e sans avoir �t� enregistr�e. Voulez-vous enregistrer la table ?" ;
-    Text [ swedish ] = "Tabellen �ndrades utan att sparas. \nVill Du spara tabellen?" ;
-    Text [ dutch ] = "In de tabel werden wijzigingen aangebracht en niet opgeslagen. \nWilt u de tabel opslaan?" ;
+    Text [ swedish ] = "Tabellen �ndrades utan att sparas. \nVill du spara tabellen?" ;
+    Text [ dutch ] = "In de tabel zijn wijzigingen aangebracht en niet opgeslagen. \nWilt u de tabel opslaan?" ;
     Text [ spanish ] = "La tabla ha sido modificada sin guardar.\n�Desea guardarla?" ;
     Text [ english_us ] = "The list was modified without saving. Would you like to save the list now?" ;
-    Text[ chinese_simplified ] = "��������Ѿ������ģ�����û�б����档 \n��Ҫ�������������";
-    Text[ russian ] = "������� ���� ��������, �� �� ���������. \n��������� ������� ������?";
+    Text[ chinese_simplified ] = "这个表格已经被更改，但是没有被保存。 \n您要保存这个表格吗？";
+    Text[ russian ] = "������� ���� �������� ��� ����������. \n��������� �������?";
     Text[ polish ] = "Tabela zosta�a zmieniona i nie jest zapisana. \nCzy tabela ma by� zapisana?";
-    Text[ japanese ] = "�\\�̕ύX������ۑ�����Ă��܂���B\n�\\��ۑ����܂����B";
-    Text[ chinese_traditional ] = "�o�Ӫ���w�g�ܧ�M���O�|���x�s�C \n�z�n�x�s�o�Ӫ���H";
+    Text[ japanese ] = "表の変更があり保存されていません。\n表を保存しますか。";
+    Text[ chinese_traditional ] = "這個表格已經變更﹐但是尚未儲存。 \n您要儲存這個表格？";
     Text[ arabic ] = "�� ����� ������ ��� ��� ���� ���.\n�� ���� ��� ������ ����";
     Text[ greek ] = "� ����� ������������� ��� ��� ������������.\n������ �� ��� ������������ ����;";
-    Text[ korean ] = "���̺��� ����Ǿ����� ������� �ʾҽ��ϴ�. \n���̺��� �����ұ��?";
+    Text[ korean ] = "표가 변경되었으나 저장되지 않았습니다. \n표를 저장하시겠습니까?";
     Text[ turkish ] = "Tablo de�i�tirildi ancak kaydedilmedi. Tablo \n kaydedilsin mi?";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "La tabla ha sido modificada sin guardar.\n�Desea guardarla?";
+    Text[ catalan ] = "La llista s'ha modificat sense haver-la desat. Voleu desar la llista ara?";
+    Text[ thai ] = "ดัดแปลงแก้ไขรายการโดยไม่มีการบันทึก  คุณต้องการบันทึกรายการตอนนี้หรือไม่?";
 };
 String RID_SVXSTR_WARN_NAME_DUPLICATE
 {
@@ -1040,21 +1074,22 @@ String RID_SVXSTR_WARN_NAME_DUPLICATE
     Text [ finnish ] = "M��ritetty nimi on jo k�yt�ss�. \nValitse jokin muu nimi." ;
     Text [ danish ] = "Det navn, du har indtastet, eksisterer allerede.\nIndtast venligst et andet navn." ;
     Text [ french ] = "Le nom que vous avez saisi existe d�j�. \nVeuillez en saisir un autre." ;
-    Text [ swedish ] = "Namnet Du valde finns redan. \nV�lj ett annat namn." ;
+    Text [ swedish ] = "Namnet du valde finns redan. \nV�lj ett annat namn." ;
     Text [ dutch ] = "De door u gekozen naam bestaat reeds. \nKies een andere naam." ;
     Text [ spanish ] = "Este nombre ya existe. \nIntroduzca otro nombre por favor." ;
     Text [ english_us ] = "The name you have entered already exists. \nPlease choose another name." ;
-    Text[ chinese_simplified ] = "������������Ѿ����ڡ�\n��������һ�����������ơ�";
-    Text[ russian ] = "��������� ���� ��� ��� �������. \n�������, ����������, ������ ���.";
+    Text[ chinese_simplified ] = "您输入的名称已经存在。\n请您输入一个其他的名称。";
+    Text[ russian ] = "��������� ��� ��� ����������. \n������� ������ ���.";
     Text[ polish ] = "Wpisana przez ciebie nazwa ju� istnieje.\nWpisz inn� nazw�.";
-    Text[ japanese ] = "���͂������O�͂��łɂ���܂��B\n�ʂ̖��O����͂��Ă��������B";
-    Text[ chinese_traditional ] = "�z��J���W�٤w�g�s�b�C\n�бz��J�@�Ө�L���W�١C";
+    Text[ japanese ] = "入力した名前はすでにあります。\n別の名前を入力してください。";
+    Text[ chinese_traditional ] = "您輸入的名稱已經存在。\n請您輸入一個其他的名稱。";
     Text[ arabic ] = "����� ���� ��� ������� ����� ������.\n������ ����� ��� ����.";
     Text[ greek ] = "�� ����� ��� �������� ������� ���. \n�������� �������� ������ ���� �����.";
-    Text[ korean ] = "�Է��� �̸��� �̹� �ֽ��ϴ�. \n�ٸ� �̸��� �Է��Ͻʽÿ�.";
+    Text[ korean ] = "입력한 이름이 이미 있습니다. \n다른 이름을 입력하십시오.";
     Text[ turkish ] = "Girdi�iniz ad zaten mevcut. Yeni bir \nad girin.";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Este nombre ya existe. \nIntroduzca otro nombre por favor.";
+    Text[ catalan ] = "Aquest nom ja existeix. \nIntrodu�u un altre nom.";
+    Text[ thai ] = "ชื่อที่คุณใส่มีอยู่แล้ว \nกรุณาเลือกชื่ออื่น";
 };
 String RID_SVXSTR_LINEEND
 {
@@ -1069,19 +1104,20 @@ String RID_SVXSTR_LINEEND
     Text [ french ] = "Extr�mit� de ligne" ;
     Text [ swedish ] = "Linjeslut" ;
     Text [ dutch ] = "Lijnuiteinde" ;
-    Text [ spanish ] = "Fin de l�nea" ;
+    Text [ spanish ] = "Fines de l�nea" ;
     Text [ english_us ] = "Arrowheads" ;
-    Text[ chinese_simplified ] = "������ͷ";
-    Text[ russian ] = "����� �����";
+    Text[ chinese_simplified ] = "线条箭头";
+    Text[ russian ] = "����� �������";
     Text[ polish ] = "Ko�c�wki linii";
-    Text[ japanese ] = "���̏I�_";
-    Text[ chinese_traditional ] = "�u���b�Y";
+    Text[ japanese ] = "線の終点";
+    Text[ chinese_traditional ] = "線條箭頭";
     Text[ arabic ] = "����� ����";
     Text[ greek ] = "����� �������";
-    Text[ korean ] = "�� ��";
+    Text[ korean ] = "화살표 모양";
     Text[ turkish ] = "�izgi ucu";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Fin de l�nea";
+    Text[ catalan ] = "Extrems de la fletxa";
+    Text[ thai ] = "หัวลูกศร";
 };
 String RID_SVXSTR_DESC_LINEEND
 {
@@ -1096,21 +1132,22 @@ String RID_SVXSTR_DESC_LINEEND
     Text [ finnish ] = "Kirjoita uuden nuolenk�rjen nimi:" ;
     Text [ danish ] = "Indtast venligst et navn til den nye piltype:" ;
     Text [ french ] = "Saisissez un nom pour la nouvelle extr�mit� de ligne :" ;
-    Text [ swedish ] = "Ange namn f�r nya linjeslutet:" ;
-    Text [ dutch ] = "Typ hier een naam voor het nieuwe lijnuiteinde:" ;
-    Text [ spanish ] = "Inserte aqu� el nombre para el nuevo fin de l�nea:" ;
+    Text [ swedish ] = "Ange ett namn f�r det nya linjeslutet:" ;
+    Text [ dutch ] = "Typ hier een naam voor de nieuwe lijnuiteinde:" ;
+    Text [ spanish ] = "Introduzca aqu� un nombre para el nuevo fin de l�nea:" ;
     Text [ english_us ] = "Please enter a name for the new arrowhead:" ;
-    Text[ chinese_simplified ] = "�����ڴ�Ϊ�µ�������ͷ����һ������:";
-    Text[ russian ] = "�������, ����������, ���� �������� ������ ����� �����:";
+    Text[ chinese_simplified ] = "请您在此为新的线条箭头输入一个名称:";
+    Text[ russian ] = "������� �������� ����� ��������� �������:";
     Text[ polish ] = "Podaj nazw� dla nowych ko�c�wek linii:";
-    Text[ japanese ] = "�V�������[�̖��O�������ɓ��͂��Ă��������F";
-    Text[ chinese_traditional ] = "�Цb�����s�u���b�Y��J�@�ӦW�١G";
+    Text[ japanese ] = "新しい線端の名前をここに入力してください：";
+    Text[ chinese_traditional ] = "請在此為新線條箭頭輸入一個名稱：";
     Text[ arabic ] = "������ ����� ��� ������� ������� ���� ���:";
     Text[ greek ] = "�������� �������� ��� ����� ��� �� ��� ����� ��� �������:";
-    Text[ korean ] = "���⿡ �� �� �� �̸��� �Է��Ͻʽÿ�:";
+    Text[ korean ] = "여기에 새 화살표의 이름을 입력하십시오:";
     Text[ turkish ] = "Yeni �izgi ucu i�in bir ad girin:";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Inserte aqu� el nombre para el nuevo fin de l�nea:";
+    Text[ catalan ] = "Inseriu aqu� el nom pel nou fi de l�nia:";
+    Text[ thai ] = "กรุณาใส่ชื่อหัวลูกศรใหม่:";
 };
 String RID_SVXSTR_DEL_LINEEND
 {
@@ -1127,19 +1164,20 @@ String RID_SVXSTR_DEL_LINEEND
     Text [ french ] = "Supprimer les extr�mit�s" ;
     Text [ swedish ] = "Radera linjeslut" ;
     Text [ dutch ] = "Lijnuiteinde verwijderen" ;
-    Text [ spanish ] = "Eliminar fin de l�nea" ;
+    Text [ spanish ] = "Borrar fin de l�nea" ;
     Text [ english_us ] = "Delete line ends" ;
-    Text[ chinese_simplified ] = "ɾ��������ͷ";
-    Text[ russian ] = "������� ����� �����";
+    Text[ chinese_simplified ] = "删除线条箭头";
+    Text[ russian ] = "������� ����� �����";
     Text[ polish ] = "Usu� ko�c�wki linii";
-    Text[ japanese ] = "���[�̍폜";
-    Text[ chinese_traditional ] = "�R���u���b�Y";
+    Text[ japanese ] = "線端の削除";
+    Text[ chinese_traditional ] = "刪除線條箭頭";
     Text[ arabic ] = "��� ������ ������";
     Text[ greek ] = "�������� ������ �������";
-    Text[ korean ] = "�� �� ����";
+    Text[ korean ] = "선 끝 삭제";
     Text[ turkish ] = "�izgi ucunu sil";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Eliminar fin de l�nea";
+    Text[ catalan ] = "Suprimeix el fi de l�nia";
+    Text[ thai ] = "ลบส่วนท้ายของบรรทัด";
 };
 String RID_SVXSTR_ASK_DEL_LINEEND
 {
@@ -1154,21 +1192,22 @@ String RID_SVXSTR_ASK_DEL_LINEEND
     Text [ finnish ] = "Haluatko poistaa nuolenk�rjen?" ;
     Text [ danish ] = "Er du sikker p�, at du vil slette piltypen?" ;
     Text [ french ] = "Voulez-vous supprimer l'extr�mit� de la ligne ?" ;
-    Text [ swedish ] = "Vill Du verkligen radera linjeslutet?" ;
+    Text [ swedish ] = "Vill du verkligen radera linjeslutet?" ;
     Text [ dutch ] = "Wilt u het lijnuiteinde werkelijk wissen?" ;
-    Text [ spanish ] = "�Desea realmente eliminar el final de l�nea?" ;
+    Text [ spanish ] = "�Desea realmente borrar el final de l�nea?" ;
     Text [ english_us ] = "Do you want to delete the arrowhead?" ;
-    Text[ chinese_simplified ] = "��Ҫɾ�����������ͷ��";
-    Text[ russian ] = "�� ������������� ������ ������� ���� ��� ����� �����?";
+    Text[ chinese_simplified ] = "真要删除这个线条箭头？";
+    Text[ russian ] = "������� ��������� �������?";
     Text[ polish ] = "Czy chcesz na pewno usun�� ko�c�wki linii?";
-    Text[ japanese ] = "���̐��[���폜���Ă��܂��܂��񂩁B";
-    Text[ chinese_traditional ] = "�z�u�n�R���o�ӽu���b�Y�H";
+    Text[ japanese ] = "この線端を削除してかまいませんか。";
+    Text[ chinese_traditional ] = "您真要刪除這個線條箭頭？";
     Text[ arabic ] = "�� ���� ������ ��� ����� ���ؿ";
     Text[ greek ] = "������ ���������� �� ��������� �� ����� ��� �������;";
-    Text[ korean ] = "�� ���� ������ �����Ͻðڽ��ϱ�?";
+    Text[ korean ] = "화살표를 정말로 삭제하시겠습니까?";
     Text[ turkish ] = "�izgi ucu ger�ekten silinsin mi?";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "�Desea realmente eliminar el final de l�nea?";
+    Text[ catalan ] = "Voleu suprimir l'extrem de la fletxa?";
+    Text[ thai ] = "คุณต้องการลบหัวลูกศรหรือไม่?";
 };
 String RID_SVXSTR_ASK_CHANGE_LINEEND
 {
@@ -1176,27 +1215,28 @@ String RID_SVXSTR_ASK_CHANGE_LINEEND
     /* ### ACHTUNG: Neuer Text in Resource? Das Linienende wurde ge�ndert und nicht gesichert. \nM�chten Sie das Linienende jetzt sichern? : Das Linienende wurde ge�ndert und nicht gesichert. \nM�chten Sie das Linienende jetzt sichern? */
     Text = "Das Linienende wurde ge�ndert und nicht gesichert. \nM�chten Sie das Linienende jetzt sichern?" ;
     Text [ ENGLISH ] = "The line end was modified without Save? \nWould you like to save the line end now?" ;
-    Text [ dutch ] = "In het lijnuiteinde werden wijzigingen aangebracht en niet opgeslagen.\nWilt u het einde van de lijn nu opslaan?" ;
+    Text [ dutch ] = "In het lijnuiteinde zijn wijzigingen aangebracht en niet opgeslagen.\nWilt u het einde van de lijn nu opslaan?" ;
     Text [ english_us ] = "The arrowhead was modified without saving.\nWould you like to save the arrowhead now?" ;
     Text [ italian ] = "L'estremit� della linea � stata modificata ma non salvata \nSalvarla adesso?" ;
     Text [ spanish ] = "El final de l�nea ha sido modificado pero no guardado. \n�Desea guardar ahora el final de l�nea?" ;
     Text [ french ] = "L'extr�mit� de la ligne a �t� modifi�e sans avoir �t� sauvegard�e.\nVoulez-vous la sauvegarder maintenant ?" ;
-    Text [ swedish ] = "Linjeslutet �ndrades utan att sparas.\nVill Du spara det nu?" ;
+    Text [ swedish ] = "Linjeslutet �ndrades utan att sparas.\nVill du spara det nu?" ;
     Text [ danish ] = "Piltypen er blevet �ndret, men ikke gemt. \nDu kan �ndre den markerede pil\n eller tilf�je en ny." ;
     Text [ portuguese ] = "O fim de linha foi modificado e n�o guardado.\nGuardar agora?" ;
     Text [ portuguese_brazilian ] = "Das Linienende wurde ge?ndert und nicht gesichert. \nM?hten Sie das Linienende jetzt sichern?" ;
-    Text[ chinese_simplified ] = "���������ͷ�Ѿ����ģ�����û�б��档\n��Ҫ���ڱ������������ͷ��";
-    Text[ russian ] = "����� ����� ��� �������, �� �� ��������. \n�� ������ ������ ��������� ����� �����?";
+    Text[ chinese_simplified ] = "这个线条箭头已经更改，但是没有保存。\n您要现在保存这个线条箭头？";
+    Text[ russian ] = "��������� ������� ���� �������� ��� ����������. \n��������� ��������� �������?";
     Text[ polish ] = "Ko�c�wki linii zosta�y zmienione i nie zapisane. \nCzy chcesz zmieni� teraz ko�c�wki linii?";
-    Text[ japanese ] = "���[���ύX����ĕۑ�����Ă��܂���B\n���̐��[���������ۑ����܂����B";
-    Text[ chinese_traditional ] = "�o�ӽu���b�Y�w�g�ܧ�M���O�|���x�s�C\n�z�n�{�b�x�s�o�ӽu���b�Y�H";
+    Text[ japanese ] = "線端が変更されて保存されていません。\nこの線端を今すぐ保存しますか。";
+    Text[ chinese_traditional ] = "這個線條箭頭已經變更﹐但是尚未儲存。\n您要現在儲存這個線條箭頭？";
     Text[ arabic ] = "�� ����� ����� ���� ��� ��� ����� ���.\n�� ���� ��� ����� ���� ����";
     Text[ greek ] = "�� ����� ������� ������������� ��� ��� ������������.\n������ �� �� ������������ ����;";
-    Text[ korean ] = "���� ���� ����Ǿ����� ������� �ʾҽ��ϴ� .\n���� �� ���� �����Ͻðڽ��ϱ�?";
+    Text[ korean ] = "화살표가 변경되었으나 저장되지 않았습니다.\n화살표를 저장하시겠습니까?";
     Text[ turkish ] = "�izgi ucu de�i�tirildi ancak kaydedilmedi.\n�izgi ucunu �imdi kaydetmek istiyor musunuz?";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "El final de l�nea ha sido modificado pero no guardado. \n�Desea guardar ahora el final de l�nea?";
-    Text[ finnish ] = "Nuolenk�rke� on muokattu ilman tallennusta.\nHaluatko tallentaa nuolenk�rjen nyt?";
+    Text[ catalan ] = "L'extrem de la fletxa s'ha modificat sense haver-lo desat.\nVoleu desar l'extrem de la fletxa ara?";
+    Text[ finnish ] = "Nuolenk�rke� on muutettu ilman tallennusta.\nHaluatko tallentaa nuolenk�rjen nyt?";
+    Text[ thai ] = "ดัดแปลงแก้ไขหัวลูกศรโดยไม่มีการบันทึก\nคุณต้องการบันทึกหัวลูกศรตอนนี้หรือไม่?";
 };
 String RID_SVXSTR_CLOSE
 {
@@ -1215,17 +1255,18 @@ String RID_SVXSTR_CLOSE
     Text [ dutch ] = "Sluiten" ;
     Text [ spanish ] = "Cerrar" ;
     Text [ english_us ] = "Close" ;
-    Text[ chinese_simplified ] = "�ر�";
+    Text[ chinese_simplified ] = "关闭";
     Text[ russian ] = "�������";
     Text[ polish ] = "Zamknij";
-    Text[ japanese ] = "�‚���";
-    Text[ chinese_traditional ] = "����";
+    Text[ japanese ] = "閉じる";
+    Text[ chinese_traditional ] = "關閉";
     Text[ arabic ] = "�����";
     Text[ greek ] = "��������";
-    Text[ korean ] = "�ݱ�";
+    Text[ korean ] = "닫기";
     Text[ turkish ] = "Kapat";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Cerrar";
+    Text[ catalan ] = "Tanca";
+    Text[ thai ] = "ปิด";
 };
 String RID_SVXSTR_BLACK
 {
@@ -1242,17 +1283,18 @@ String RID_SVXSTR_BLACK
     Text [ swedish ] = "Svart" ;
     Text [ finnish ] = "Musta" ;
     Text [ english_us ] = "Black" ;
-    Text[ chinese_simplified ] = "��ɫ";
+    Text[ chinese_simplified ] = "黑色";
     Text[ russian ] = "������";
     Text[ polish ] = "Czarny";
-    Text[ japanese ] = "��";
-    Text[ chinese_traditional ] = "�¦�";
+    Text[ japanese ] = "黒";
+    Text[ chinese_traditional ] = "黑色";
     Text[ arabic ] = "����";
     Text[ greek ] = "�����";
-    Text[ korean ] = "������";
+    Text[ korean ] = "검은색";
     Text[ turkish ] = "Siyah";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Negro";
+    Text[ catalan ] = "Negre";
+    Text[ thai ] = "ดำ";
 };
 String RID_SVXSTR_BLUE
 {
@@ -1269,17 +1311,18 @@ String RID_SVXSTR_BLUE
     Text [ swedish ] = "Bl�tt" ;
     Text [ finnish ] = "Sininen" ;
     Text [ english_us ] = "Blue" ;
-    Text[ chinese_simplified ] = "��ɫ";
+    Text[ chinese_simplified ] = "蓝色";
     Text[ russian ] = "�����";
     Text[ polish ] = "Niebieski";
-    Text[ japanese ] = "��";
-    Text[ chinese_traditional ] = "�Ŧ�";
+    Text[ japanese ] = "青";
+    Text[ chinese_traditional ] = "藍色";
     Text[ arabic ] = "����";
     Text[ greek ] = "����";
-    Text[ korean ] = "û��";
+    Text[ korean ] = "청색";
     Text[ turkish ] = "Mavi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Azul";
+    Text[ catalan ] = "Blau";
+    Text[ thai ] = "น้ำเงิน";
 };
 String RID_SVXSTR_GREEN
 {
@@ -1298,17 +1341,18 @@ String RID_SVXSTR_GREEN
     Text [ swedish ] = "Gr�nt" ;
     Text [ finnish ] = "Vihre�" ;
     Text [ english_us ] = "Green" ;
-    Text[ chinese_simplified ] = "��ɫ";
+    Text[ chinese_simplified ] = "绿色";
     Text[ russian ] = "�������";
     Text[ polish ] = "Zielony";
-    Text[ japanese ] = "��";
-    Text[ chinese_traditional ] = "���";
+    Text[ japanese ] = "緑";
+    Text[ chinese_traditional ] = "綠色";
     Text[ arabic ] = "����";
     Text[ greek ] = "�������";
-    Text[ korean ] = "���";
+    Text[ korean ] = "녹색";
     Text[ turkish ] = "Ye�il";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Verde";
+    Text[ catalan ] = "Verd";
+    Text[ thai ] = "เขียว";
 };
 String RID_SVXSTR_CYAN
 {
@@ -1327,17 +1371,18 @@ String RID_SVXSTR_CYAN
     Text [ swedish ] = "Turkost" ;
     Text [ finnish ] = "Turkoosi" ;
     Text [ english_us ] = "Turquoise" ;
-    Text[ chinese_simplified ] = "����ɫ";
+    Text[ chinese_simplified ] = "蓝绿色";
     Text[ russian ] = "���������";
     Text[ polish ] = "Turkusowy";
-    Text[ japanese ] = "�—�";
-    Text[ chinese_traditional ] = "�ťɦ�";
+    Text[ japanese ] = "青緑";
+    Text[ chinese_traditional ] = "藍玉色";
     Text[ arabic ] = "������";
     Text[ greek ] = "���������";
-    Text[ korean ] = "û�ϻ�";
+    Text[ korean ] = "청록색";
     Text[ turkish ] = "Turkuaz";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Turquesa";
+    Text[ thai ] = "ฟ้า";
 };
 String RID_SVXSTR_RED
 {
@@ -1354,17 +1399,18 @@ String RID_SVXSTR_RED
     Text [ swedish ] = "R�tt" ;
     Text [ finnish ] = "Punainen" ;
     Text [ english_us ] = "Red" ;
-    Text[ chinese_simplified ] = "��ɫ";
+    Text[ chinese_simplified ] = "红色";
     Text[ russian ] = "�������";
     Text[ polish ] = "Czerwony";
-    Text[ japanese ] = "��";
-    Text[ chinese_traditional ] = "����";
+    Text[ japanese ] = "赤";
+    Text[ chinese_traditional ] = "紅色";
     Text[ arabic ] = "����";
     Text[ greek ] = "�������";
-    Text[ korean ] = "����";
+    Text[ korean ] = "적색";
     Text[ turkish ] = "K�rm�z�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Rojo";
+    Text[ catalan ] = "Vermell";
+    Text[ thai ] = "แดง";
 };
 String RID_SVXSTR_MAGENTA
 {
@@ -1380,19 +1426,20 @@ String RID_SVXSTR_MAGENTA
     Text [ spanish ] = "Magenta" ;
     Text [ danish ] = "Magenta" ;
     Text [ swedish ] = "Magenta" ;
-    Text [ finnish ] = "Purppura" ;
+    Text [ finnish ] = "Magenta" ;
     Text [ english_us ] = "Magenta" ;
-    Text[ chinese_simplified ] = "�Ϻ�ɫ";
-    Text[ russian ] = "�������";
+    Text[ chinese_simplified ] = "紫红色";
+    Text[ russian ] = "���������";
     Text[ polish ] = "Purpurowy";
-    Text[ japanese ] = "Ͼ���";
-    Text[ chinese_traditional ] = "������";
+    Text[ japanese ] = "マゼンタ";
+    Text[ chinese_traditional ] = "紫紅色";
     Text[ arabic ] = "�������";
     Text[ greek ] = "��������";
-    Text[ korean ] = "��ȫ��";
+    Text[ korean ] = "선홍색";
     Text[ turkish ] = "Mor";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Magenta";
+    Text[ thai ] = "ม่วง";
 };
 String RID_SVXSTR_BROWN
 {
@@ -1409,17 +1456,18 @@ String RID_SVXSTR_BROWN
     Text [ swedish ] = "Brunt" ;
     Text [ finnish ] = "Ruskea" ;
     Text [ english_us ] = "Brown" ;
-    Text[ chinese_simplified ] = "��ɫ";
+    Text[ chinese_simplified ] = "棕色";
     Text[ russian ] = "����������";
     Text[ polish ] = "Br�zowy";
-    Text[ japanese ] = "���F";
-    Text[ chinese_traditional ] = "�Ħ�";
+    Text[ japanese ] = "茶色";
+    Text[ chinese_traditional ] = "棕色";
     Text[ arabic ] = "���";
     Text[ greek ] = "����";
-    Text[ korean ] = "����";
+    Text[ korean ] = "갈색";
     Text[ turkish ] = "Kahverengi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Marr�n";
+    Text[ catalan ] = "Marr�";
+    Text[ thai ] = "น้ำตาล";
 };
 String RID_SVXSTR_GREY
 {
@@ -1436,17 +1484,18 @@ String RID_SVXSTR_GREY
     Text [ swedish ] = "Gr�tt" ;
     Text [ finnish ] = "Harmaa" ;
     Text [ english_us ] = "Gray" ;
-    Text[ chinese_simplified ] = "��ɫ";
+    Text[ chinese_simplified ] = "灰色";
     Text[ russian ] = "�����";
     Text[ polish ] = "Szary";
-    Text[ japanese ] = "�D�F";
-    Text[ chinese_traditional ] = "�Ǧ�";
+    Text[ japanese ] = "灰色";
+    Text[ chinese_traditional ] = "灰色";
     Text[ arabic ] = "�����";
     Text[ greek ] = "����";
-    Text[ korean ] = "ȸ��";
+    Text[ korean ] = "회색";
     Text[ turkish ] = "Gri";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Gris";
+    Text[ thai ] = "เทา";
 };
 String RID_SVXSTR_LIGHTGREY
 {
@@ -1461,19 +1510,20 @@ String RID_SVXSTR_LIGHTGREY
     Text [ spanish ] = "Gris claro" ;
     Text [ danish ] = "Lysegr�" ;
     Text [ swedish ] = "Ljusgr�tt" ;
-    Text [ finnish ] = "Vaaleanharmaa" ;
+    Text [ finnish ] = "Kirkas harmaa" ;
     Text [ english_us ] = "Light gray" ;
-    Text[ chinese_simplified ] = "dz��ɫ";
+    Text[ chinese_simplified ] = "浅灰色";
     Text[ russian ] = "������-�����";
     Text[ polish ] = "Jasnoszary";
-    Text[ japanese ] = "���邢�D�F";
-    Text[ chinese_traditional ] = "�L�Ǧ�";
+    Text[ japanese ] = "明るい灰色";
+    Text[ chinese_traditional ] = "淺灰色";
     Text[ arabic ] = "����� ����";
     Text[ greek ] = "������� ����";
-    Text[ korean ] = "���� ȸ��";
+    Text[ korean ] = "밝은 회색";
     Text[ turkish ] = "A��k gri";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Gris claro";
+    Text[ catalan ] = "Gris clar";
+    Text[ thai ] = "เทาอ่อน";
 };
 String RID_SVXSTR_LIGHTBLUE
 {
@@ -1488,19 +1538,20 @@ String RID_SVXSTR_LIGHTBLUE
     Text [ spanish ] = "Azul claro" ;
     Text [ danish ] = "Lysebl�" ;
     Text [ swedish ] = "Ljusbl�tt" ;
-    Text [ finnish ] = "Vaaleansininen" ;
+    Text [ finnish ] = "Kirkas sininen" ;
     Text [ english_us ] = "Light blue" ;
-    Text[ chinese_simplified ] = "dz��ɫ";
+    Text[ chinese_simplified ] = "浅蓝色";
     Text[ russian ] = "������-�����";
     Text[ polish ] = "Jasnoniebieski";
-    Text[ japanese ] = "���邢��";
-    Text[ chinese_traditional ] = "�L�Ŧ�";
+    Text[ japanese ] = "明るい青";
+    Text[ chinese_traditional ] = "淺藍色";
     Text[ arabic ] = "���� ����";
     Text[ greek ] = "������� ����";
-    Text[ korean ] = "���� û��";
+    Text[ korean ] = "밝은 청색";
     Text[ turkish ] = "A��k mavi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Azul claro";
+    Text[ catalan ] = "Blau clar";
+    Text[ thai ] = "น้ำเงินอ่อน";
 };
 String RID_SVXSTR_LIGHTGREEN
 {
@@ -1517,19 +1568,20 @@ String RID_SVXSTR_LIGHTGREEN
     Text [ spanish ] = "Verde claro" ;
     Text [ danish ] = "Lysegr�n" ;
     Text [ swedish ] = "Ljusgr�nt" ;
-    Text [ finnish ] = "Vaaleanvihre�" ;
+    Text [ finnish ] = "Kirkas vihre�" ;
     Text [ english_us ] = "Light green" ;
-    Text[ chinese_simplified ] = "dz��ɫ";
+    Text[ chinese_simplified ] = "浅绿色";
     Text[ russian ] = "������-�������";
     Text[ polish ] = "Jasnozielony";
-    Text[ japanese ] = "���邢��";
-    Text[ chinese_traditional ] = "�L���";
+    Text[ japanese ] = "明るい緑";
+    Text[ chinese_traditional ] = "淺綠色";
     Text[ arabic ] = "���� ����";
     Text[ greek ] = "������� �������";
-    Text[ korean ] = "���� ���";
+    Text[ korean ] = "밝은 녹색";
     Text[ turkish ] = "A��k ye�il";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Verde claro";
+    Text[ catalan ] = "Verd clar";
+    Text[ thai ] = "เขียวอ่อน";
 };
 String RID_SVXSTR_LIGHTCYAN
 {
@@ -1546,19 +1598,20 @@ String RID_SVXSTR_LIGHTCYAN
     Text [ spanish ] = "Turquesa claro" ;
     Text [ danish ] = "Lys turkis" ;
     Text [ swedish ] = "Ljusturkost" ;
-    Text [ finnish ] = "Vaalea syaani" ;
+    Text [ finnish ] = "Kirkas syaani" ;
     Text [ english_us ] = "Light cyan" ;
-    Text[ chinese_simplified ] = "dz����ɫ";
+    Text[ chinese_simplified ] = "浅蓝绿色";
     Text[ russian ] = "������-���������";
     Text[ polish ] = "Jasnoturkusowy";
-    Text[ japanese ] = "���邢�—�";
-    Text[ chinese_traditional ] = "�L�ź��";
+    Text[ japanese ] = "明るい青緑";
+    Text[ chinese_traditional ] = "淺藍綠色";
     Text[ arabic ] = "������ ����";
     Text[ greek ] = "������� �����";
-    Text[ korean ] = "���� û�ϻ�";
+    Text[ korean ] = "밝은 청록색";
     Text[ turkish ] = "A��k turkuaz";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Turquesa claro";
+    Text[ catalan ] = "Cian clar";
+    Text[ thai ] = "ฟ้าอ่อน";
 };
 String RID_SVXSTR_LIGHTRED
 {
@@ -1573,19 +1626,20 @@ String RID_SVXSTR_LIGHTRED
     Text [ spanish ] = "Rojo claro" ;
     Text [ danish ] = "Lys r�d" ;
     Text [ swedish ] = "Ljusr�tt" ;
-    Text [ finnish ] = "Vaalea punainen" ;
+    Text [ finnish ] = "Kirkas punainen" ;
     Text [ english_us ] = "Light red" ;
-    Text[ chinese_simplified ] = "dz��ɫ";
+    Text[ chinese_simplified ] = "浅红色";
     Text[ russian ] = "������-�������";
     Text[ polish ] = "Jasnoczerwony";
-    Text[ japanese ] = "���邢��";
-    Text[ chinese_traditional ] = "�L����";
+    Text[ japanese ] = "明るい赤";
+    Text[ chinese_traditional ] = "淺紅色";
     Text[ arabic ] = "���� ����";
     Text[ greek ] = "������� �������";
-    Text[ korean ] = "���� ����";
+    Text[ korean ] = "밝은 적색";
     Text[ turkish ] = "A��k k�rm�z�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Rojo claro";
+    Text[ catalan ] = "Vermell clar";
+    Text[ thai ] = "แดงอ่อน";
 };
 String RID_SVXSTR_LIGHTMAGENTA
 {
@@ -1601,19 +1655,20 @@ String RID_SVXSTR_LIGHTMAGENTA
     Text [ spanish ] = "Magenta claro" ;
     Text [ danish ] = "Lys magenta" ;
     Text [ swedish ] = "Ljus magenta" ;
-    Text [ finnish ] = "Vaalea purppura" ;
+    Text [ finnish ] = "Kirkas magenta" ;
     Text [ english_us ] = "Light magenta" ;
-    Text[ chinese_simplified ] = "dz�Ϻ�ɫ";
-    Text[ russian ] = "������-�������";
+    Text[ chinese_simplified ] = "浅紫红色";
+    Text[ russian ] = "������-���������";
     Text[ polish ] = "Jasnopurpurowy";
-    Text[ japanese ] = "���邢Ͼ���";
-    Text[ chinese_traditional ] = "�L������";
+    Text[ japanese ] = "明るいマゼンタ";
+    Text[ chinese_traditional ] = "淺紫紅色";
     Text[ arabic ] = "������� ����";
     Text[ greek ] = "������� ��������";
-    Text[ korean ] = "���� ��ȫ��";
+    Text[ korean ] = "밝은 선홍색";
     Text[ turkish ] = "Eflatun";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Magenta claro";
+    Text[ catalan ] = "Magenta clar";
+    Text[ thai ] = "ม่วงอ่อน";
 };
 String RID_SVXSTR_YELLOW
 {
@@ -1630,17 +1685,18 @@ String RID_SVXSTR_YELLOW
     Text [ swedish ] = "Gult" ;
     Text [ finnish ] = "Keltainen" ;
     Text [ english_us ] = "Yellow" ;
-    Text[ chinese_simplified ] = "��ɫ";
+    Text[ chinese_simplified ] = "黄色";
     Text[ russian ] = "������";
     Text[ polish ] = "��ty";
-    Text[ japanese ] = "���F";
-    Text[ chinese_traditional ] = "����";
+    Text[ japanese ] = "黄色";
+    Text[ chinese_traditional ] = "黃色";
     Text[ arabic ] = "����";
     Text[ greek ] = "�������";
-    Text[ korean ] = "Ȳ��";
+    Text[ korean ] = "황색";
     Text[ turkish ] = "Sar�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Amarillo";
+    Text[ catalan ] = "Groc";
+    Text[ thai ] = "เหลือง";
 };
 String RID_SVXSTR_WHITE
 {
@@ -1659,17 +1715,18 @@ String RID_SVXSTR_WHITE
     Text [ swedish ] = "Vitt" ;
     Text [ finnish ] = "Valkoinen" ;
     Text [ english_us ] = "White" ;
-    Text[ chinese_simplified ] = "��ɫ";
+    Text[ chinese_simplified ] = "白色";
     Text[ russian ] = "�����";
     Text[ polish ] = "Bia�y";
-    Text[ japanese ] = "��";
-    Text[ chinese_traditional ] = "�զ�";
+    Text[ japanese ] = "白";
+    Text[ chinese_traditional ] = "白色";
     Text[ arabic ] = "����";
     Text[ greek ] = "�����";
-    Text[ korean ] = "���";
+    Text[ korean ] = "흰색";
     Text[ turkish ] = "Beyaz";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Blanco";
+    Text[ catalan ] = "Blanc";
+    Text[ thai ] = "ขาว";
 };
 String RID_SVXSTR_BLUEGREY
 {
@@ -1686,17 +1743,18 @@ String RID_SVXSTR_BLUEGREY
     Text [ swedish ] = "Bl�gr�tt" ;
     Text [ finnish ] = "Siniharmaa" ;
     Text [ english_us ] = "Blue gray" ;
-    Text[ chinese_simplified ] = "����ɫ";
+    Text[ chinese_simplified ] = "蓝灰色";
     Text[ russian ] = "����-�����";
     Text[ polish ] = "B��kitnoszary";
-    Text[ japanese ] = "�ŠD�F";
-    Text[ chinese_traditional ] = "�ŦǦ�";
+    Text[ japanese ] = "青灰色";
+    Text[ chinese_traditional ] = "藍灰色";
     Text[ arabic ] = "����� ����";
     Text[ greek ] = "����-����";
-    Text[ korean ] = "ȸû��";
+    Text[ korean ] = "회청색";
     Text[ turkish ] = "Mavi-gri";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Gris azulado";
+    Text[ catalan ] = "Gris blav�s";
+    Text[ thai ] = "น้ำเงินเทา";
 };
 String RID_SVXSTR_ORANGE
 {
@@ -1713,17 +1771,18 @@ String RID_SVXSTR_ORANGE
     Text [ swedish ] = "Orange" ;
     Text [ finnish ] = "Oranssi" ;
     Text [ english_us ] = "Orange" ;
-    Text[ chinese_simplified ] = "��ɫ";
+    Text[ chinese_simplified ] = "橙色";
     Text[ russian ] = "���������";
     Text[ polish ] = "Pomara�czowy";
-    Text[ japanese ] = "��F";
-    Text[ chinese_traditional ] = "�ܦ�";
+    Text[ japanese ] = "橙色";
+    Text[ chinese_traditional ] = "桔色";
     Text[ arabic ] = "�������";
     Text[ greek ] = "���������";
-    Text[ korean ] = "��Ȳ��";
+    Text[ korean ] = "주황색";
     Text[ turkish ] = "Turuncu";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Naranja";
+    Text[ catalan ] = "Taronja";
+    Text[ thai ] = "ส้ม";
 };
 String RID_SVXSTR_ARROW
 {
@@ -1740,17 +1799,18 @@ String RID_SVXSTR_ARROW
     Text [ swedish ] = "Pil" ;
     Text [ finnish ] = "Nuoli" ;
     Text [ english_us ] = "Arrow" ;
-    Text[ chinese_simplified ] = "��ͷ";
+    Text[ chinese_simplified ] = "箭头";
     Text[ russian ] = "�������";
     Text[ polish ] = "Strza�ka";
-    Text[ japanese ] = "���";
-    Text[ chinese_traditional ] = "�b�Y";
+    Text[ japanese ] = "矢印";
+    Text[ chinese_traditional ] = "箭頭";
     Text[ arabic ] = "���";
     Text[ greek ] = "�����";
-    Text[ korean ] = "ȭ��ǥ";
+    Text[ korean ] = "화살표";
     Text[ turkish ] = "Ok";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Flecha";
+    Text[ catalan ] = "Fletxa";
+    Text[ thai ] = "ลูกศร";
 };
 String RID_SVXSTR_SQUARE
 {
@@ -1767,17 +1827,18 @@ String RID_SVXSTR_SQUARE
     Text [ swedish ] = "Kvadrat" ;
     Text [ finnish ] = "Neli�" ;
     Text [ english_us ] = "Square" ;
-    Text[ chinese_simplified ] = "������";
+    Text[ chinese_simplified ] = "正方形";
     Text[ russian ] = "�������";
     Text[ polish ] = "Kwadrat";
-    Text[ japanese ] = "�����`";
-    Text[ chinese_traditional ] = "�����";
+    Text[ japanese ] = "正方形";
+    Text[ chinese_traditional ] = "正方形";
     Text[ arabic ] = "����";
     Text[ greek ] = "���������";
-    Text[ korean ] = "���簢��";
+    Text[ korean ] = "정사각형";
     Text[ turkish ] = "Kare";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Cuadrado";
+    Text[ catalan ] = "Quadrat";
+    Text[ thai ] = "สี่เหลี่ยมจัตุรัส";
 };
 String RID_SVXSTR_CIRCLE
 {
@@ -1794,17 +1855,18 @@ String RID_SVXSTR_CIRCLE
     Text [ swedish ] = "Cirkel" ;
     Text [ finnish ] = "Ympyr�" ;
     Text [ english_us ] = "Circle" ;
-    Text[ chinese_simplified ] = "Բ";
+    Text[ chinese_simplified ] = "圆";
     Text[ russian ] = "����";
     Text[ polish ] = "Ko�o";
-    Text[ japanese ] = "�~";
-    Text[ chinese_traditional ] = "���";
+    Text[ japanese ] = "円";
+    Text[ chinese_traditional ] = "圓形";
     Text[ arabic ] = "�����";
     Text[ greek ] = "������";
-    Text[ korean ] = "��";
+    Text[ korean ] = "원";
     Text[ turkish ] = "Daire";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "C�rculo";
+    Text[ catalan ] = "Cercle";
+    Text[ thai ] = "วงกลม";
 };
 String RID_SVXSTR_NONE
 {
@@ -1815,22 +1877,23 @@ String RID_SVXSTR_NONE
     Text [ spanish ] = "- sin -" ;
     Text [ french ] = "- aucun(e)-" ;
     Text [ dutch ] = "- geen -" ;
-    Text [ swedish ] = "- ingen -" ;
+    Text [ swedish ] = "- inget -" ;
     Text [ danish ] = "- ingen -" ;
     Text [ portuguese ] = "- nenhum -" ;
     Text [ portuguese_brazilian ] = "- kein -" ;
-    Text[ chinese_simplified ] = "- �� -";
-    Text[ russian ] = "- ��� -";
+    Text[ chinese_simplified ] = "- 无 -";
+    Text[ russian ] = "- ��� -";
     Text[ polish ] = "- brak -";
-    Text[ japanese ] = "- �Ȃ� -";
-    Text[ chinese_traditional ] = "- �L -";
+    Text[ japanese ] = "- なし -";
+    Text[ chinese_traditional ] = "- 無 -";
     Text[ arabic ] = "- ���� -";
     Text[ greek ] = "- ������ -";
-    Text[ korean ] = "- ���� -";
+    Text[ korean ] = "- 없음 -";
     Text[ turkish ] = "- yok -";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "- sin -";
-    Text[ finnish ] = "- Ei mit��n -";
+    Text[ catalan ] = "- cap -";
+    Text[ finnish ] = "- ei mit��n -";
+    Text[ thai ] = "- ไม่มี -";
 };
 String RID_SVXSTR_TRANSPARENCE
 {
@@ -1845,18 +1908,19 @@ String RID_SVXSTR_TRANSPARENCE
     Text [ danish ] = "Transparens" ;
     Text [ portuguese ] = "Transpar�ncia" ;
     Text [ portuguese_brazilian ] = "Transparenz" ;
-    Text[ chinese_simplified ] = "͸��";
+    Text[ chinese_simplified ] = "透明";
     Text[ russian ] = "������������";
     Text[ polish ] = "Prze�roczysto��";
-    Text[ japanese ] = "���ߐ�";
-    Text[ chinese_traditional ] = "�z��";
+    Text[ japanese ] = "透過性";
+    Text[ chinese_traditional ] = "透明";
     Text[ arabic ] = "�����";
     Text[ greek ] = "���������";
-    Text[ korean ] = "����";
+    Text[ korean ] = "투명";
     Text[ turkish ] = "Saydaml�k";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Transparencia";
+    Text[ catalan ] = "Transpar�ncia";
     Text[ finnish ] = "L�pin�kyvyys";
+    Text[ thai ] = "โปร่งแสง";
 };
 String RID_SVXSTR_CENTERED
 {
@@ -1871,18 +1935,19 @@ String RID_SVXSTR_CENTERED
     Text [ danish ] = "Centreret" ;
     Text [ portuguese ] = "Centrado" ;
     Text [ portuguese_brazilian ] = "Zentriert" ;
-    Text[ chinese_simplified ] = "����";
+    Text[ chinese_simplified ] = "居中";
     Text[ russian ] = "�� ������";
     Text[ polish ] = "Do �rodka";
-    Text[ japanese ] = "��������";
-    Text[ chinese_traditional ] = "�m��";
+    Text[ japanese ] = "中央揃え";
+    Text[ chinese_traditional ] = "置中";
     Text[ arabic ] = "�����";
     Text[ greek ] = "�������������";
-    Text[ korean ] = "���";
+    Text[ korean ] = "가운데";
     Text[ turkish ] = "Ortala";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Centrado";
+    Text[ catalan ] = "Centrat";
     Text[ finnish ] = "Keskitetty";
+    Text[ thai ] = "ศูนย์กลาง";
 };
 String RID_SVXSTR_NOTCENTERED
 {
@@ -1897,18 +1962,19 @@ String RID_SVXSTR_NOTCENTERED
     Text [ danish ] = "Ikke centreret" ;
     Text [ portuguese ] = "N�o centrado" ;
     Text [ portuguese_brazilian ] = "Nicht Zentriert" ;
-    Text[ chinese_simplified ] = "������";
+    Text[ chinese_simplified ] = "不居中";
     Text[ russian ] = "�� �� ������";
     Text[ polish ] = "Nie wy�rodkowany";
-    Text[ japanese ] = "���������łȂ�";
-    Text[ chinese_traditional ] = "���m��";
+    Text[ japanese ] = "中央揃えでない";
+    Text[ chinese_traditional ] = "不置中";
     Text[ arabic ] = "��� ����";
     Text[ greek ] = "��� �������������";
-    Text[ korean ] = "����� ������ ����";
+    Text[ korean ] = "가운데 맞추지 않음";
     Text[ turkish ] = "Ortalanmam��";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Sin centrar";
+    Text[ catalan ] = "No centrat";
     Text[ finnish ] = "Ei keskitetty";
+    Text[ thai ] = "ไม่อยู่ตรงศูนย์กลาง";
 };
 String RID_SVXSTR_GRAFMODE_STANDARD
 {
@@ -1916,24 +1982,25 @@ String RID_SVXSTR_GRAFMODE_STANDARD
     Text[ english ] = "Standard";
     Text[ english_us ] = "Default";
     Text[ portuguese ] = "Padr�o";
-    Text[ russian ] = "��������";
+    Text[ russian ] = "�� ���������";
     Text[ greek ] = "����������";
     Text[ dutch ] = "Standaard";
-    Text[ french ] = "Par d�faut";
+    Text[ french ] = "Standard";
     Text[ spanish ] = "Predeterminado";
     Text[ italian ] = "Standard";
     Text[ danish ] = "Standard";
     Text[ swedish ] = "Standard";
     Text[ polish ] = "Domy�lnie";
     Text[ portuguese_brazilian ] = "Padr?o";
-    Text[ japanese ] = "�W��";
-    Text[ korean ] = "�⺻";
-    Text[ chinese_simplified ] = "��׼";
-    Text[ chinese_traditional ] = "�з�";
+    Text[ japanese ] = "標準";
+    Text[ korean ] = "기본값";
+    Text[ chinese_simplified ] = "标准";
+    Text[ chinese_traditional ] = "標準";
     Text[ arabic ] = "�����";
     Text[ turkish ] = "Standart";
-    Text[ catalan ] = "Predeterminado";
-    Text[ finnish ] = "Oletusarvo";
+    Text[ catalan ] = "Per defecte";
+    Text[ finnish ] = "Oletus";
+    Text[ thai ] = "ค่าเริ่มต้น";
 };
 String RID_SVXSTR_GRAFMODE_GREYS
 {
@@ -1951,15 +2018,16 @@ String RID_SVXSTR_GRAFMODE_GREYS
     Text[ swedish ] = "Gr�skalor";
     Text[ polish ] = "Odcienie szaro�ci";
     Text[ portuguese_brazilian ] = "Greyscales";
-    Text[ japanese ] = "��ڰ����";
-    Text[ korean ] = "ȸ����";
-    Text[ chinese_simplified ] = "�Ҷ�";
-    Text[ chinese_traditional ] = "�Ƕ�";
+    Text[ japanese ] = "グレースケール";
+    Text[ korean ] = "회색조";
+    Text[ chinese_simplified ] = "灰度";
+    Text[ chinese_traditional ] = "灰階";
     Text[ arabic ] = "����� �������";
     Text[ turkish ] = "Gri tonlama";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Escala de grises";
+    Text[ catalan ] = "Escala de grisos";
     Text[ finnish ] = "Harmaas�vy";
+    Text[ thai ] = "สเกลสีเทา";
 };
 String RID_SVXSTR_GRAFMODE_MONO
 {
@@ -1971,20 +2039,21 @@ String RID_SVXSTR_GRAFMODE_MONO
     Text[ greek ] = "�����/�����";
     Text[ dutch ] = "Zwart-wit";
     Text[ french ] = "Noir/Blanc";
-    Text[ spanish ] = "Blanco/Negro";
+    Text[ spanish ] = "Blanco y Negro";
     Text[ italian ] = "Bianco/Nero";
     Text[ danish ] = "Sort-hvid";
     Text[ swedish ] = "Svartvitt";
     Text[ polish ] = "Czarno-bia�y";
     Text[ portuguese_brazilian ] = "Black/White";
-    Text[ japanese ] = "����";
-    Text[ korean ] = "��/ ��";
-    Text[ chinese_simplified ] = "��/��";
-    Text[ chinese_traditional ] = "�¥�";
+    Text[ japanese ] = "白黒";
+    Text[ korean ] = "흑/ 백";
+    Text[ chinese_simplified ] = "黑/白";
+    Text[ chinese_traditional ] = "黑白";
     Text[ arabic ] = "����/����";
     Text[ turkish ] = "Siyah/Beyaz";
-    Text[ catalan ] = "Blanco/Negro";
+    Text[ catalan ] = "Negre/Blanc";
     Text[ finnish ] = "Mustavalkoinen";
+    Text[ thai ] = "ดำ/ขาว";
 };
 String RID_SVXSTR_GRAFMODE_WATERMARK
 {
@@ -1996,20 +2065,21 @@ String RID_SVXSTR_GRAFMODE_WATERMARK
     Text[ greek ] = "���������";
     Text[ dutch ] = "Watermerk";
     Text[ french ] = "Filigrane";
-    Text[ spanish ] = "Marca de agua";
+    Text[ spanish ] = "Filigrana";
     Text[ italian ] = "Filigrana";
     Text[ danish ] = "Vandm�rke";
     Text[ swedish ] = "Vattenm�rke";
     Text[ polish ] = "Znak wodny";
     Text[ portuguese_brazilian ] = "Watermark";
-    Text[ japanese ] = "������";
-    Text[ korean ] = "���� ����";
-    Text[ chinese_simplified ] = "ˮӡ";
-    Text[ chinese_traditional ] = "����";
+    Text[ japanese ] = "透かし";
+    Text[ korean ] = "워터마크";
+    Text[ chinese_simplified ] = "水印";
+    Text[ chinese_traditional ] = "平滑";
     Text[ arabic ] = "����� �����";
     Text[ turkish ] = "Filigran";
-    Text[ catalan ] = "Marca de agua";
+    Text[ catalan ] = "Marca d'aigua";
     Text[ finnish ] = "Vesileima";
+    Text[ thai ] = "ลายน้ำ";
 };
 String STR_INSERT_VIDEO_EXTFILTER_IVF
 {
@@ -2028,13 +2098,14 @@ String STR_INSERT_VIDEO_EXTFILTER_IVF
     Text[ polish ] = "Intel Indeo Video (*.ivf)";
     Text[ portuguese_brazilian ] = "Intel Indeo Video (*.ivf)";
     Text[ japanese ] = "Intel Indeo Video (*.ivf)";
-    Text[ korean ] = "Intel ��� (*.ivf)";
+    Text[ korean ] = "Intel 인데오 (*.ivf)";
     Text[ chinese_simplified ] = "Intel Indeo Video (*.ivf)";
     Text[ chinese_traditional ] = "Intel Indeo Video (*.ivf)";
     Text[ arabic ] = "Intel Indeo Video (*.ivf)";
     Text[ turkish ] = "Intel Indeo Video (*.ivf)";
     Text[ catalan ] = "Intel Indeo Video (*.ivf)";
     Text[ finnish ] = "Intel Indeo Video (*.ivf)";
+    Text[ thai ] = "Intel Indeo Video (*.ivf)";
 };
 
 String STR_INSERT_VIDEO_EXTFILTER_AVI
@@ -2054,13 +2125,14 @@ String STR_INSERT_VIDEO_EXTFILTER_AVI
     Text[ polish ] = "Video dla Windows (*.avi)";
     Text[ portuguese_brazilian ] = "Video for Windows (*.avi)";
     Text[ japanese ] = "Video for Windows (*.avi)";
-    Text[ korean ] = "������� ������(*.avi)";
+    Text[ korean ] = "윈도우용 동영상(*.avi)";
     Text[ chinese_simplified ] = "Video for Windows (*.avi)";
     Text[ chinese_traditional ] = "Video for Windows (*.avi)";
     Text[ arabic ] = "����� �� (*.avi) Windows";
     Text[ turkish ] = "Video for Windows (*.avi)";
-    Text[ catalan ] = "V�deo para Windows (*.avi)";
+    Text[ catalan ] = "V�deo per Windows (*.avi)";
     Text[ finnish ] = "Video for Windows (*.avi)";
+    Text[ thai ] = "วิดีโอสำหรับวินโดวส์ (*.avi)";
 };
 
 String STR_INSERT_VIDEO_EXTFILTER_MOV
@@ -2080,13 +2152,14 @@ String STR_INSERT_VIDEO_EXTFILTER_MOV
     Text[ polish ] = "QuickTime Movie (*.mov)";
     Text[ portuguese_brazilian ] = "QuickTime Movie (*.mov)";
     Text[ japanese ] = "QuickTime Movie (*.mov)";
-    Text[ korean ] = "��Ÿ�� ������(*.mov)";
+    Text[ korean ] = "퀵타임 동영상(*.mov)";
     Text[ chinese_simplified ] = "QuickTime Movie (*.mov)";
     Text[ chinese_traditional ] = "QuickTime Movie (*.mov)";
     Text[ arabic ] = "QuickTime Movie (*.mov)";
     Text[ turkish ] = "QuickTime Movie (*.mov)";
     Text[ catalan ] = "QuickTime Movie (*.mov)";
     Text[ finnish ] = "QuickTime Movie (*.mov)";
+    Text[ thai ] = "QuickTime Movie (*.mov)";
 };
 
 String STR_INSERT_VIDEO_EXTFILTER_MPEG
@@ -2106,13 +2179,14 @@ String STR_INSERT_VIDEO_EXTFILTER_MPEG
     Text[ polish ] = "MPEG - Motion Pictures Experts Group (*.mpe;*.mpeg;*.mpg)";
     Text[ portuguese_brazilian ] = "MPEG - Motion Pictures Experts Group (*.mpe;*.mpeg;*.mpg)";
     Text[ japanese ] = "MPEG - Motion Pictures Experts Group (*.mpe;*.mpeg;*.mpg)";
-    Text[ korean ] = "MPEG - ������ ǥ��ȭ �׷�(*.mpe;*.mpeg;*.mpg)";
+    Text[ korean ] = "MPEG - 동영상 표준화 그룹(*.mpe;*.mpeg;*.mpg)";
     Text[ chinese_simplified ] = "MPEG - Motion Pictures Experts Group (*.mpe;*.mpeg;*.mpg)";
     Text[ chinese_traditional ] = "MPEG - Motion Pictures Experts Group (*.mpe;*.mpeg;*.mpg)";
     Text[ arabic ] = "MPEG - Motion Pictures Experts Group (*.mpe;*.mpeg;*.mpg)";
     Text[ turkish ] = "MPEG - Motion Pictures Experts Group (*.mpe;*.mpeg;*.mpg)";
     Text[ catalan ] = "MPEG - Motion Pictures Experts Group (*.mpe;*.mpeg;*.mpg)";
     Text[ finnish ] = "MPEG - Motion Pictures Experts Group (*.mpe;*.mpeg;*.mpg)";
+    Text[ thai ] = "MPEG - Motion Pictures Experts Group (*.mpe;*.mpeg;*.mpg)";
 };
 
 String STR_EXTFILTER_ALL
@@ -2131,14 +2205,15 @@ String STR_EXTFILTER_ALL
     Text[ swedish ] = "<Alla>";
     Text[ polish ] = "<Wszystkie>";
     Text[ portuguese_brazilian ] = "<All>";
-    Text[ japanese ] = "<���ׂ�>";
-    Text[ korean ] = "<���>";
-    Text[ chinese_simplified ] = "<ȫ��>";
-    Text[ chinese_traditional ] = "<����>";
+    Text[ japanese ] = "<すべて>";
+    Text[ korean ] = "<모두>";
+    Text[ chinese_simplified ] = "<全部>";
+    Text[ chinese_traditional ] = "<全部>";
     Text[ arabic ] = "<����>";
     Text[ turkish ] = "<T�m�>";
-    Text[ catalan ] = "<Todos>";
+    Text[ catalan ] = "<tots>";
     Text[ finnish ] = "<Kaikki>";
+    Text[ thai ] = "<ทั้งหมด>";
 };
 
 String STR_INSERT_SOUND_TITLE
@@ -2157,15 +2232,16 @@ String STR_INSERT_SOUND_TITLE
     Text[ swedish ] = "Infoga ljud";
     Text[ polish ] = "Wstaw d�wi�k";
     Text[ portuguese_brazilian ] = "Insert sound";
-    Text[ japanese ] = "����ނ̑}��";
-    Text[ korean ] = "���� ����";
-    Text[ chinese_simplified ] = "��������";
-    Text[ chinese_traditional ] = "���J�n��";
+    Text[ japanese ] = "サウンドの挿入";
+    Text[ korean ] = "사운드 삽입";
+    Text[ chinese_simplified ] = "插入声音";
+    Text[ chinese_traditional ] = "插入聲音";
     Text[ arabic ] = "����� ���";
     Text[ turkish ] = "Ses ekle";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Insertar sonido";
+    Text[ catalan ] = "Insereix un so";
     Text[ finnish ] = "Lis�� ��ni";
+    Text[ thai ] = "แทรกเสียง";
 };
 
 String STR_INSERT_VIDEO_TITLE
@@ -2184,14 +2260,15 @@ String STR_INSERT_VIDEO_TITLE
     Text[ swedish ] = "Infoga video";
     Text[ polish ] = "Wstaw video";
     Text[ portuguese_brazilian ] = "Insert video";
-    Text[ japanese ] = "���޵�̑}��";
-    Text[ korean ] = "���� ����";
-    Text[ chinese_simplified ] = "����¼��";
-    Text[ chinese_traditional ] = "���J�v��";
+    Text[ japanese ] = "ビデオの挿入";
+    Text[ korean ] = "비디오 삽입";
+    Text[ chinese_simplified ] = "插入影视";
+    Text[ chinese_traditional ] = "插入影視";
     Text[ arabic ] = "����� �����";
     Text[ turkish ] = "Film ekle";
-    Text[ catalan ] = "Insertar v�deo";
+    Text[ catalan ] = "Insereix v�deo";
     Text[ finnish ] = "Lis�� videokuva";
+    Text[ thai ] = "แทรกวีดีโอ";
 };
 
 
@@ -2213,14 +2290,15 @@ String RID_SVXSTR_VIOLET
     Text[ swedish ] = "Lila";
     Text[ polish ] = "Filolet";
     Text[ portuguese_brazilian ] = "Violet";
-    Text[ japanese ] = "��";
-    Text[ korean ] = "�����";
-    Text[ chinese_simplified ] = "��ɫ";
-    Text[ chinese_traditional ] = "����";
+    Text[ japanese ] = "紫";
+    Text[ korean ] = "보라색";
+    Text[ chinese_simplified ] = "紫色";
+    Text[ chinese_traditional ] = "紫色";
     Text[ arabic ] = "������";
     Text[ turkish ] = "Menek�e";
     Text[ catalan ] = "Violeta";
     Text[ finnish ] = "Violetti";
+    Text[ thai ] = "ม่วง";
 };
 
 String RID_SVXSTR_BORDEAUX
@@ -2239,14 +2317,15 @@ String RID_SVXSTR_BORDEAUX
     Text[ swedish ] = "Bordeaux";
     Text[ polish ] = "Bordowy";
     Text[ portuguese_brazilian ] = "Bordeaux";
-    Text[ japanese ] = "����";
-    Text[ korean ] = "������";
-    Text[ chinese_simplified ] = "���ɫ";
-    Text[ chinese_traditional ] = "�`����";
+    Text[ japanese ] = "えんじ";
+    Text[ korean ] = "보르도";
+    Text[ chinese_simplified ] = "深红色";
+    Text[ chinese_traditional ] = "深紅色";
     Text[ arabic ] = "���� ����";
     Text[ turkish ] = "Bordo";
-    Text[ catalan ] = "Burdeos";
+    Text[ catalan ] = "Burdeus";
     Text[ finnish ] = "Bordeaux";
+    Text[ thai ] = "บอร์โด";
 };
 
 String RID_SVXSTR_PALE_YELLOW
@@ -2255,7 +2334,7 @@ String RID_SVXSTR_PALE_YELLOW
     Text [ english_us ] = "Pale yellow";
     Text [ ENGLISH ] = "Pale yellow";
     Text[ portuguese ] = "Amarelo-claro";
-    Text[ russian ] = "������-������";
+    Text[ russian ] = "������-������";
     Text[ greek ] = "���� �������";
     Text[ dutch ] = "Geel pastel";
     Text[ french ] = "Jaune p�le";
@@ -2265,14 +2344,15 @@ String RID_SVXSTR_PALE_YELLOW
     Text[ swedish ] = "Blekgul";
     Text[ polish ] = "Blado��ty";
     Text[ portuguese_brazilian ] = "Pale yellow";
-    Text[ japanese ] = "�W���F";
-    Text[ korean ] = "��Ȳ��";
-    Text[ chinese_simplified ] = "dz��ɫ";
-    Text[ chinese_traditional ] = "�L����";
+    Text[ japanese ] = "淡黄色";
+    Text[ korean ] = "담황색";
+    Text[ chinese_simplified ] = "浅黄色";
+    Text[ chinese_traditional ] = "淺黃色";
     Text[ arabic ] = "���� ����";
     Text[ turkish ] = "Solgun sar�";
-    Text[ catalan ] = "Amarillo pastel";
+    Text[ catalan ] = "Groc pastel";
     Text[ finnish ] = "Vaaleankeltainen";
+    Text[ thai ] = "เหลืองซีด";
 };
 
 String RID_SVXSTR_PALE_GREEN
@@ -2281,7 +2361,7 @@ String RID_SVXSTR_PALE_GREEN
     Text [ english_us ] = "Pale green";
     Text [ ENGLISH ] = "Pale green";
     Text[ portuguese ] = "Verde-claro";
-    Text[ russian ] = "������-�������";
+    Text[ russian ] = "������-�������";
     Text[ greek ] = "���� �������";
     Text[ dutch ] = "Groen pastel";
     Text[ french ] = "Vert p�le";
@@ -2291,14 +2371,15 @@ String RID_SVXSTR_PALE_GREEN
     Text[ swedish ] = "Blekgr�n";
     Text[ polish ] = "Bladozielony";
     Text[ portuguese_brazilian ] = "Pale green";
-    Text[ japanese ] = "�W��";
-    Text[ korean ] = "����";
-    Text[ chinese_simplified ] = "����ɫ";
-    Text[ chinese_traditional ] = "�L���";
+    Text[ japanese ] = "淡緑";
+    Text[ korean ] = "담녹색";
+    Text[ chinese_simplified ] = "淡绿色";
+    Text[ chinese_traditional ] = "淺綠色";
     Text[ arabic ] = "���� ����";
     Text[ turkish ] = "Solgun ye�il";
-    Text[ catalan ] = "Verde pastel";
+    Text[ catalan ] = "Verd pastel";
     Text[ finnish ] = "Vaaleanvihre�";
+    Text[ thai ] = "เขียวซีด";
 };
 
 String RID_SVXSTR_DKVIOLET
@@ -2309,7 +2390,7 @@ String RID_SVXSTR_DKVIOLET
     Text[ portuguese ] = "Violeta escuro";
     Text[ russian ] = "�����-����������";
     Text[ greek ] = "������ �������";
-    Text[ dutch ] = "Donker lila";
+    Text[ dutch ] = "Donkepaars";
     Text[ french ] = "Violet fonc�";
     Text[ spanish ] = "Violeta oscuro";
     Text[ italian ] = "Lilla scuro";
@@ -2317,14 +2398,15 @@ String RID_SVXSTR_DKVIOLET
     Text[ swedish ] = "M�rklila";
     Text[ polish ] = "Ciemny filolet";
     Text[ portuguese_brazilian ] = "Dark violet";
-    Text[ japanese ] = "�Z��";
-    Text[ korean ] = "�������";
-    Text[ chinese_simplified ] = "����ɫ";
-    Text[ chinese_traditional ] = "�`����";
+    Text[ japanese ] = "濃紫";
+    Text[ korean ] = "진보라색";
+    Text[ chinese_simplified ] = "深紫色";
+    Text[ chinese_traditional ] = "深紫色";
     Text[ arabic ] = "������ ����";
     Text[ turkish ] = "Koyu lila";
-    Text[ catalan ] = "Violeta oscuro";
+    Text[ catalan ] = "Violeta fosc";
     Text[ finnish ] = "Tummanvioletti";
+    Text[ thai ] = "ม่วงเข้ม";
 };
 
 String RID_SVXSTR_SALMON
@@ -2343,14 +2425,15 @@ String RID_SVXSTR_SALMON
     Text[ swedish ] = "Lax";
     Text[ polish ] = "�ososiowy";
     Text[ portuguese_brazilian ] = "Salmon";
-    Text[ japanese ] = "������ݸ";
-    Text[ korean ] = "���� ���";
-    Text[ chinese_simplified ] = "�Ⱥ�ɫ";
-    Text[ chinese_traditional ] = "������";
+    Text[ japanese ] = "サーモンピンク";
+    Text[ korean ] = "연어 살색";
+    Text[ chinese_simplified ] = "橙红色";
+    Text[ chinese_traditional ] = "橙紅色";
     Text[ arabic ] = "������";
     Text[ turkish ] = "Somon";
-    Text[ catalan ] = "Salm�n";
+    Text[ catalan ] = "Salm�";
     Text[ finnish ] = "Lohisuomu";
+    Text[ thai ] = "ชมพู";
 };
 
 String RID_SVXSTR_SEABLUE
@@ -2361,7 +2444,7 @@ String RID_SVXSTR_SEABLUE
     Text[ portuguese ] = "Azul marinho";
     Text[ russian ] = "������� �����";
     Text[ greek ] = "�������";
-    Text[ dutch ] = "Zeeblauw";
+    Text[ dutch ] = "Azuurblauw";
     Text[ french ] = "Azur";
     Text[ spanish ] = "Azul marino";
     Text[ italian ] = "Blu mare";
@@ -2369,14 +2452,15 @@ String RID_SVXSTR_SEABLUE
     Text[ swedish ] = "Havsbl�";
     Text[ polish ] = "Lazurowy";
     Text[ portuguese_brazilian ] = "Sea blue";
-    Text[ japanese ] = "�C�̐�";
-    Text[ korean ] = "��û��";
-    Text[ chinese_simplified ] = "����ɫ";
-    Text[ chinese_traditional ] = "������";
+    Text[ japanese ] = "海の青";
+    Text[ korean ] = "심청색";
+    Text[ chinese_simplified ] = "湖蓝色";
+    Text[ chinese_traditional ] = "海水藍";
     Text[ arabic ] = "���� ����";
     Text[ turkish ] = "Deniz mavisi";
-    Text[ catalan ] = "Azul marino";
+    Text[ catalan ] = "Blau mar�";
     Text[ finnish ] = "Merensininen";
+    Text[ thai ] = "น้ำเงินทะเล";
 };
 
 String RID_SVXSTR_COLOR_SUN
@@ -2400,12 +2484,13 @@ String RID_SVXSTR_COLOR_SUN
     Text[ japanese ] = "Sun";
     Text[ korean ] = "Sun";
     Text[ chinese_simplified ] = "Sun";
-    Text[ chinese_traditional ] = "������";
+    Text[ chinese_traditional ] = "Sun";
     Text[ arabic ] = "Sun";
     Text[ turkish ] = "Sun";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Sun";
     Text[ finnish ] = "Aurinko";
+    Text[ thai ] = "ซัน";
 };
 
 String RID_SVXSTR_TBLAFMT_3D
@@ -2414,7 +2499,7 @@ String RID_SVXSTR_TBLAFMT_3D
     Text [ ENGLISH ] = "3D";
     Text[ english_us ] = "3D";
     Text[ portuguese ] = "3D";
-    Text[ russian ] = "3-�";
+    Text[ russian ] = "����������";
     Text[ greek ] = "3�";
     Text[ dutch ] = "3D";
     Text[ french ] = "3D";
@@ -2425,14 +2510,15 @@ String RID_SVXSTR_TBLAFMT_3D
     Text[ polish ] = "3-W";
     Text[ portuguese_brazilian ] = "3D";
     Text[ japanese ] = "3D";
-    Text[ korean ] = "3��";
-    Text[ chinese_simplified ] = "3 ά";
+    Text[ korean ] = "3Ｄ";
+    Text[ chinese_simplified ] = "3 维";
     Text[ chinese_traditional ] = "3D";
     Text[ arabic ] = "����� �������";
     Text[ turkish ] = "3B";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "3D";
-    Text[ finnish ] = "Kolmiulotteisuus";
+    Text[ finnish ] = "Kolmiulotteinen";
+    Text[ thai ] = "3มิติ";
 };
 String RID_SVXSTR_TBLAFMT_BLACK1
 {
@@ -2450,15 +2536,16 @@ String RID_SVXSTR_TBLAFMT_BLACK1
     Text[ swedish ] = "Svart 1";
     Text[ polish ] = "Czarny 1";
     Text[ portuguese_brazilian ] = "Black 1";
-    Text[ japanese ] = "�� 1";
-    Text[ korean ] = "������ 1";
-    Text[ chinese_simplified ] = "��ɫ 1";
-    Text[ chinese_traditional ] = "�¦� 1";
+    Text[ japanese ] = "黒 1";
+    Text[ korean ] = "검은색 1";
+    Text[ chinese_simplified ] = "黑色 1";
+    Text[ chinese_traditional ] = "黑色 1";
     Text[ arabic ] = "���� 1";
     Text[ turkish ] = "Siyah 1";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Negro 1";
+    Text[ catalan ] = "Negre 1";
     Text[ finnish ] = "Musta 1";
+    Text[ thai ] = "ดำ 1";
 };
 String RID_SVXSTR_TBLAFMT_BLACK2
 {
@@ -2476,15 +2563,16 @@ String RID_SVXSTR_TBLAFMT_BLACK2
     Text[ swedish ] = "Svart 2";
     Text[ polish ] = "Czarny 2";
     Text[ portuguese_brazilian ] = "Black 2";
-    Text[ japanese ] = "�� 2";
-    Text[ korean ] = "������ 2";
-    Text[ chinese_simplified ] = "��ɫ 2";
-    Text[ chinese_traditional ] = "�¦� 2";
+    Text[ japanese ] = "黒 2";
+    Text[ korean ] = "검은색 2";
+    Text[ chinese_simplified ] = "黑色 2";
+    Text[ chinese_traditional ] = "黑色 2";
     Text[ arabic ] = "���� 2";
     Text[ turkish ] = "Siyah 2";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Negro 2";
+    Text[ catalan ] = "Negre 2";
     Text[ finnish ] = "Musta 2";
+    Text[ thai ] = "ดำ 2";
 };
 String RID_SVXSTR_TBLAFMT_BLUE
 {
@@ -2502,14 +2590,15 @@ String RID_SVXSTR_TBLAFMT_BLUE
     Text[ swedish ] = "Bl�tt";
     Text[ polish ] = "Niebieski";
     Text[ portuguese_brazilian ] = "Blue";
-    Text[ japanese ] = "��";
-    Text[ korean ] = "û��";
-    Text[ chinese_simplified ] = "��ɫ";
-    Text[ chinese_traditional ] = "�Ŧ�";
+    Text[ japanese ] = "青";
+    Text[ korean ] = "청색";
+    Text[ chinese_simplified ] = "蓝色";
+    Text[ chinese_traditional ] = "藍色";
     Text[ arabic ] = "����";
     Text[ turkish ] = "Mavi";
-    Text[ catalan ] = "Azul";
+    Text[ catalan ] = "Blau";
     Text[ finnish ] = "Sininen";
+    Text[ thai ] = "น้ำเงิน";
 };
 String RID_SVXSTR_TBLAFMT_BROWN
 {
@@ -2527,14 +2616,15 @@ String RID_SVXSTR_TBLAFMT_BROWN
     Text[ swedish ] = "Brunt";
     Text[ polish ] = "Br�zowy";
     Text[ portuguese_brazilian ] = "Brown";
-    Text[ japanese ] = "���F";
-    Text[ korean ] = "����";
-    Text[ chinese_simplified ] = "��ɫ";
-    Text[ chinese_traditional ] = "�Ħ�";
+    Text[ japanese ] = "茶色";
+    Text[ korean ] = "갈색";
+    Text[ chinese_simplified ] = "棕色";
+    Text[ chinese_traditional ] = "棕色";
     Text[ arabic ] = "���";
     Text[ turkish ] = "Kahverengi";
-    Text[ catalan ] = "Marr�n";
+    Text[ catalan ] = "Marr�";
     Text[ finnish ] = "Ruskea";
+    Text[ thai ] = "น้ำตาล";
 };
 String RID_SVXSTR_TBLAFMT_CURRENCY
 {
@@ -2552,14 +2642,15 @@ String RID_SVXSTR_TBLAFMT_CURRENCY
     Text[ swedish ] = "Valuta";
     Text[ polish ] = "Waluta";
     Text[ portuguese_brazilian ] = "Currency";
-    Text[ japanese ] = "�ʉ�";
-    Text[ korean ] = "��ȭ";
-    Text[ chinese_simplified ] = "����";
-    Text[ chinese_traditional ] = "�f��";
+    Text[ japanese ] = "通貨";
+    Text[ korean ] = "통화";
+    Text[ chinese_simplified ] = "货币";
+    Text[ chinese_traditional ] = "貨幣";
     Text[ arabic ] = "������";
     Text[ turkish ] = "Para birimi";
     Text[ catalan ] = "Moneda";
     Text[ finnish ] = "Valuutta";
+    Text[ thai ] = "สกุลเงิน";
 };
 String RID_SVXSTR_TBLAFMT_CURRENCY_3D
 {
@@ -2567,7 +2658,7 @@ String RID_SVXSTR_TBLAFMT_CURRENCY_3D
     Text [ ENGLISH ] = "Currency 3D";
     Text[ english_us ] = "Currency 3D";
     Text[ portuguese ] = "Moeda 3D";
-    Text[ russian ] = "������ 3-�";
+    Text[ russian ] = "���������� ������";
     Text[ greek ] = "������� 3�";
     Text[ dutch ] = "Valuta 3D";
     Text[ french ] = "Monnaie 3D";
@@ -2577,14 +2668,15 @@ String RID_SVXSTR_TBLAFMT_CURRENCY_3D
     Text[ swedish ] = "Valuta 3D";
     Text[ polish ] = "Waluta 3-W";
     Text[ portuguese_brazilian ] = "Currency 3D";
-    Text[ japanese ] = "�ʉ� 3D";
-    Text[ korean ] = "��ȭ 3��!";
-    Text[ chinese_simplified ] = "���� 3 ά";
-    Text[ chinese_traditional ] = "�f�� 3D";
+    Text[ japanese ] = "通貨 3D";
+    Text[ korean ] = "통화 3Ｄ";
+    Text[ chinese_simplified ] = "货币 3 维";
+    Text[ chinese_traditional ] = "貨幣 3D";
     Text[ arabic ] = "���� ������ �������";
     Text[ turkish ] = "Para birimi 3B";
     Text[ catalan ] = "Moneda 3D";
     Text[ finnish ] = "Valuutta kolmiulotteisena";
+    Text[ thai ] = "สกุลเงิน 3มิติ";
 };
 String RID_SVXSTR_TBLAFMT_CURRENCY_GRAY
 {
@@ -2602,14 +2694,15 @@ String RID_SVXSTR_TBLAFMT_CURRENCY_GRAY
     Text[ swedish ] = "Valuta gr�tt";
     Text[ polish ] = "Waluta Szara";
     Text[ portuguese_brazilian ] = "Currency Gray";
-    Text[ japanese ] = "�ʉ� �D�F";
-    Text[ korean ] = "��ȭ ȸ��";
-    Text[ chinese_simplified ] = "���� ��ɫ";
-    Text[ chinese_traditional ] = "�f�� �Ǧ�";
+    Text[ japanese ] = "通貨 灰色";
+    Text[ korean ] = "통화 회색";
+    Text[ chinese_simplified ] = "货币 灰色";
+    Text[ chinese_traditional ] = "貨幣 灰色";
     Text[ arabic ] = "���� ������";
     Text[ turkish ] = "Para birimi gri";
-    Text[ catalan ] = "Moneda gris";
+    Text[ catalan ] = "Gris moneda";
     Text[ finnish ] = "Valuutta harmaana";
+    Text[ thai ] = "สกุลเงินสีเทา";
 };
 String RID_SVXSTR_TBLAFMT_CURRENCY_LAVENDER
 {
@@ -2627,14 +2720,15 @@ String RID_SVXSTR_TBLAFMT_CURRENCY_LAVENDER
     Text[ swedish ] = "Valuta syrenlila";
     Text[ polish ] = "Waluta Fioletowa";
     Text[ portuguese_brazilian ] = "Currency Lavender";
-    Text[ japanese ] = "�ʉ� �����ް";
-    Text[ korean ] = "��ȭ ���ڻ�";
-    Text[ chinese_simplified ] = "���� ����ɫ";
-    Text[ chinese_traditional ] = "�f�� �H����";
+    Text[ japanese ] = "通貨 ラベンダー";
+    Text[ korean ] = "통화 담자색";
+    Text[ chinese_simplified ] = "货币 淡紫色";
+    Text[ chinese_traditional ] = "貨幣 淡紫色";
     Text[ arabic ] = "���� �������� ����";
     Text[ turkish ] = "Para birimi eflatun";
-    Text[ catalan ] = "Moneda lavanda";
-    Text[ finnish ] = "Valuutta laventerina";
+    Text[ catalan ] = "Lavanda Moneda";
+    Text[ finnish ] = "Valuutta laventelinvihre�n�";
+    Text[ thai ] = "สกุลเงินสีม่วงอ่อน";
 };
 String RID_SVXSTR_TBLAFMT_CURRENCY_TURQUOISE
 {
@@ -2652,14 +2746,15 @@ String RID_SVXSTR_TBLAFMT_CURRENCY_TURQUOISE
     Text[ swedish ] = "Valuta turkost";
     Text[ polish ] = "Waluta Turkusowa";
     Text[ portuguese_brazilian ] = "Currency Turquoise";
-    Text[ japanese ] = "�ʉ� �—�";
-    Text[ korean ] = "��ȭ û����";
-    Text[ chinese_simplified ] = "���� ����ɫ";
-    Text[ chinese_traditional ] = "�f�� �ťɦ�";
+    Text[ japanese ] = "通貨 青緑";
+    Text[ korean ] = "통화 청옥색";
+    Text[ chinese_simplified ] = "货币 蓝玉色";
+    Text[ chinese_traditional ] = "貨幣 藍玉色";
     Text[ arabic ] = "���� ������";
     Text[ turkish ] = "Para birimi turkuaz";
-    Text[ catalan ] = "Moneda turquesa";
+    Text[ catalan ] = "Turquesa moneda";
     Text[ finnish ] = "Valuutta turkoosina";
+    Text[ thai ] = "สกุลเงินสีน้ำเงินทะเล";
 };
 String RID_SVXSTR_TBLAFMT_GRAY
 {
@@ -2677,14 +2772,15 @@ String RID_SVXSTR_TBLAFMT_GRAY
     Text[ swedish ] = "Gr�tt";
     Text[ polish ] = "Szary";
     Text[ portuguese_brazilian ] = "Gray";
-    Text[ japanese ] = "�D�F";
-    Text[ korean ] = "ȸ��";
-    Text[ chinese_simplified ] = "��ɫ";
-    Text[ chinese_traditional ] = "�Ǧ�";
+    Text[ japanese ] = "灰色";
+    Text[ korean ] = "회색";
+    Text[ chinese_simplified ] = "灰色";
+    Text[ chinese_traditional ] = "灰色";
     Text[ arabic ] = "�����";
     Text[ turkish ] = "Gri";
     Text[ catalan ] = "Gris";
     Text[ finnish ] = "Harmaa";
+    Text[ thai ] = "เทา";
 };
 String RID_SVXSTR_TBLAFMT_GREEN
 {
@@ -2702,14 +2798,15 @@ String RID_SVXSTR_TBLAFMT_GREEN
     Text[ swedish ] = "Gr�nt";
     Text[ polish ] = "Zielony";
     Text[ portuguese_brazilian ] = "Green";
-    Text[ japanese ] = "��";
-    Text[ korean ] = "���";
-    Text[ chinese_simplified ] = "��ɫ";
-    Text[ chinese_traditional ] = "���";
+    Text[ japanese ] = "緑";
+    Text[ korean ] = "녹색";
+    Text[ chinese_simplified ] = "绿色";
+    Text[ chinese_traditional ] = "綠色";
     Text[ arabic ] = "����";
     Text[ turkish ] = "Ye�il";
-    Text[ catalan ] = "Verde";
+    Text[ catalan ] = "Verd";
     Text[ finnish ] = "Vihre�";
+    Text[ thai ] = "เขียว";
 };
 String RID_SVXSTR_TBLAFMT_LAVENDER
 {
@@ -2727,14 +2824,15 @@ String RID_SVXSTR_TBLAFMT_LAVENDER
     Text[ swedish ] = "Syrenlila";
     Text[ polish ] = "Fioletowy";
     Text[ portuguese_brazilian ] = "Lavender";
-    Text[ japanese ] = "�����ް";
-    Text[ korean ] = "���ڻ�";
-    Text[ chinese_simplified ] = "����ɫ";
-    Text[ chinese_traditional ] = "�H����";
+    Text[ japanese ] = "ラベンダー";
+    Text[ korean ] = "담자색";
+    Text[ chinese_simplified ] = "淡紫色";
+    Text[ chinese_traditional ] = "淡紫色";
     Text[ arabic ] = "������� ����";
     Text[ turkish ] = "Eflatun";
     Text[ catalan ] = "Lavanda";
-    Text[ finnish ] = "Laventeri";
+    Text[ finnish ] = "Laventelinvihre�";
+    Text[ thai ] = "ม่วงอ่อน";
 };
 String RID_SVXSTR_TBLAFMT_RED
 {
@@ -2752,14 +2850,15 @@ String RID_SVXSTR_TBLAFMT_RED
     Text[ swedish ] = "R�tt";
     Text[ polish ] = "Czerwony";
     Text[ portuguese_brazilian ] = "Red";
-    Text[ japanese ] = "��";
-    Text[ korean ] = "����";
-    Text[ chinese_simplified ] = "��ɫ";
-    Text[ chinese_traditional ] = "����";
+    Text[ japanese ] = "赤";
+    Text[ korean ] = "적색";
+    Text[ chinese_simplified ] = "红色";
+    Text[ chinese_traditional ] = "紅色";
     Text[ arabic ] = "����";
     Text[ turkish ] = "K�rm�z�";
-    Text[ catalan ] = "Rojo";
+    Text[ catalan ] = "Vermell";
     Text[ finnish ] = "Punainen";
+    Text[ thai ] = "แดง";
 };
 String RID_SVXSTR_TBLAFMT_TURQUOISE
 {
@@ -2777,14 +2876,15 @@ String RID_SVXSTR_TBLAFMT_TURQUOISE
     Text[ swedish ] = "Turkost";
     Text[ polish ] = "Turkusowy";
     Text[ portuguese_brazilian ] = "Turquoise";
-    Text[ japanese ] = "�—�";
-    Text[ korean ] = "û�ϻ�";
-    Text[ chinese_simplified ] = "����ɫ";
-    Text[ chinese_traditional ] = "�ťɦ�";
+    Text[ japanese ] = "青緑";
+    Text[ korean ] = "청록색";
+    Text[ chinese_simplified ] = "蓝玉色";
+    Text[ chinese_traditional ] = "藍玉色";
     Text[ arabic ] = "������";
     Text[ turkish ] = "Turkuaz";
     Text[ catalan ] = "Turquesa";
     Text[ finnish ] = "Turkoosi";
+    Text[ thai ] = "น้ำเงินทะเล";
 };
 String RID_SVXSTR_TBLAFMT_YELLOW
 {
@@ -2802,14 +2902,15 @@ String RID_SVXSTR_TBLAFMT_YELLOW
     Text[ swedish ] = "Gult";
     Text[ polish ] = "��ty";
     Text[ portuguese_brazilian ] = "Yellow";
-    Text[ japanese ] = "���F";
-    Text[ korean ] = "Ȳ��";
-    Text[ chinese_simplified ] = "��ɫ";
-    Text[ chinese_traditional ] = "����";
+    Text[ japanese ] = "黄色";
+    Text[ korean ] = "황색";
+    Text[ chinese_simplified ] = "黄色";
+    Text[ chinese_traditional ] = "黃色";
     Text[ arabic ] = "����";
     Text[ turkish ] = "Sar�";
-    Text[ catalan ] = "Amarillo";
+    Text[ catalan ] = "Groc";
     Text[ finnish ] = "Keltainen";
+    Text[ thai ] = "เหลือง";
 };
 
 String RID_SVXSTR_LINEJOINT_MIDDLE
@@ -2818,7 +2919,7 @@ String RID_SVXSTR_LINEJOINT_MIDDLE
     Text[ ENGLISH ] = "Line joint middle";
     Text[ english_us ] = "Line joint averaged";
     Text[ portuguese ] = "Jun��o de linhas; mediana";
-    Text[ russian ] = "�������������� ������� �����";
+    Text[ russian ] = "����������� ������� �����";
     Text[ greek ] = "������ ��������� (����� ����)";
     Text[ dutch ] = "Samenkomende lijnen, gemiddelde";
     Text[ french ] = "Jointure de lignes, moyenn�e";
@@ -2828,14 +2929,15 @@ String RID_SVXSTR_LINEJOINT_MIDDLE
     Text[ swedish ] = "Linje�verg�ng, medelv�rde";
     Text[ polish ] = "Wy�rodkowane po��czenie linii";
     Text[ portuguese_brazilian ] = "Line joint middle";
-    Text[ japanese ] = "���̌p���� �ϕ�";
-    Text[ korean ] = "�� ���� �߰�";
-    Text[ chinese_simplified ] = "ƽ��ֵ�������Ӻ�";
-    Text[ chinese_traditional ] = "�����ȫ��u�����X";
+    Text[ japanese ] = "線の継ぎ目 均分";
+    Text[ korean ] = "선 이음 평균";
+    Text[ chinese_simplified ] = "平均值型线条接合";
+    Text[ chinese_traditional ] = "平均值型線條接合";
     Text[ arabic ] = "���� ���� ������";
     Text[ turkish ] = "Ortalanm�� �izgi ge�i�i";
-    Text[ catalan ] = "Juntas de l�nea, media";
+    Text[ catalan ] = "Mitjana de juntes de l�nia";
     Text[ finnish ] = "Keskim��r�inen viivaliitos";
+    Text[ thai ] = "จุดบรรจบกันของบรรทัดโดยเฉลี่ย";
 };
 String RID_SVXSTR_LINEJOINT_BEVEL
 {
@@ -2843,7 +2945,7 @@ String RID_SVXSTR_LINEJOINT_BEVEL
     Text[ ENGLISH ] = "Line joint bevel";
     Text[ english_us ] = "Line joint bevel";
     Text[ portuguese ] = "Jun��o de linhas, conjugada";
-    Text[ russian ] = "��������� ������� �����";
+    Text[ russian ] = "��������� ������� �����";
     Text[ greek ] = "������ ��������� (�������)";
     Text[ dutch ] = "Samenkomende lijnen, verbonden";
     Text[ french ] = "Jointure de lignes, conjugu�e";
@@ -2853,14 +2955,15 @@ String RID_SVXSTR_LINEJOINT_BEVEL
     Text[ swedish ] = "Linje�verg�ng, f�rbunden";
     Text[ polish ] = "Powi�zane po��czenie linii";
     Text[ portuguese_brazilian ] = "Line joint bevel";
-    Text[ japanese ] = "���̌p���� �Ίp";
-    Text[ korean ] = "�� ����, �ϳ��� ����";
-    Text[ chinese_simplified ] = "�����������Ӻ�";
-    Text[ chinese_traditional ] = "�p�����u�����X";
+    Text[ japanese ] = "線の継ぎ目 斜角";
+    Text[ korean ] = "선 이음 빗면";
+    Text[ chinese_simplified ] = "联结型线条接合";
+    Text[ chinese_traditional ] = "聯結型線條接合";
     Text[ arabic ] = "���� ���� �����";
     Text[ turkish ] = "Birle�tirilmi� �izgi ge�i�i";
-    Text[ catalan ] = "Junta de l�neas unida";
+    Text[ catalan ] = "Junta de l�nies unida";
     Text[ finnish ] = "Viisto viivaliitos";
+    Text[ thai ] = "จุดบรรจบกันของบรรทัดบาก";
 };
 String RID_SVXSTR_LINEJOINT_MITER
 {
@@ -2868,7 +2971,7 @@ String RID_SVXSTR_LINEJOINT_MITER
     Text[ ENGLISH ] = "Line joint miter";
     Text[ english_us ] = "Line joint miter";
     Text[ portuguese ] = "Jun��o de linhas, secante";
-    Text[ russian ] = "����������� ������� �����";
+    Text[ russian ] = "���������� ����� ��� 45 ��������";
     Text[ greek ] = "������ ��������� (����)";
     Text[ dutch ] = "Samenkomende lijnen, snijdend";
     Text[ french ] = "Jointure de lignes, s�cante";
@@ -2878,14 +2981,15 @@ String RID_SVXSTR_LINEJOINT_MITER
     Text[ swedish ] = "Linje�verg�ng, klippt";
     Text[ polish ] = "Przeci�te po��czenie linii";
     Text[ portuguese_brazilian ] = "Line joint miter";
-    Text[ japanese ] = "���̌p���� ����";
-    Text[ korean ] = "�� ����, �������� ����";
-    Text[ chinese_simplified ] = "�����������Ӻ�";
-    Text[ chinese_traditional ] = "�ű����u�����X";
+    Text[ japanese ] = "線の継ぎ目 交差";
+    Text[ korean ] = "선 이음 교차";
+    Text[ chinese_simplified ] = "剪接型线条接合";
+    Text[ chinese_traditional ] = "剪接型線條接合";
     Text[ arabic ] = "���� ���� �������";
     Text[ turkish ] = "�izgi kesi�me noktas�";
-    Text[ catalan ] = "Junta de l�neas cortada";
+    Text[ catalan ] = "Junta de l�nies tallada";
     Text[ finnish ] = "Kanttiviivaliitos";
+    Text[ thai ] = "เส้นบรรจบกันเป็นมุม 45 องศา";
 };
 String RID_SVXSTR_LINEJOINT_ROUND
 {
@@ -2893,7 +2997,7 @@ String RID_SVXSTR_LINEJOINT_ROUND
     Text[ ENGLISH ] = "Line joint round";
     Text[ english_us ] = "Line joint round";
     Text[ portuguese ] = "Jun��o de linhas, redonda";
-    Text[ russian ] = "������������ ������� �����";
+    Text[ russian ] = "����������� ���������� �����";
     Text[ greek ] = "������ ��������� (���������)";
     Text[ dutch ] = "Samenkomende lijnen, rond";
     Text[ french ] = "Jointure de lignes, ronde";
@@ -2903,14 +3007,15 @@ String RID_SVXSTR_LINEJOINT_ROUND
     Text[ swedish ] = "Linje�verg�ng, rund";
     Text[ polish ] = "Okr�g�e po��czenie linii";
     Text[ portuguese_brazilian ] = "Line joint round";
-    Text[ japanese ] = "���̌p���� �ۂ�";
-    Text[ korean ] = "�� ����, �ձ۰�";
-    Text[ chinese_simplified ] = "Բ�������Ӻ�";
-    Text[ chinese_traditional ] = "��νu�����X";
+    Text[ japanese ] = "線の継ぎ目 丸く";
+    Text[ korean ] = "선 이음 둥글게";
+    Text[ chinese_simplified ] = "圆形线条接合";
+    Text[ chinese_traditional ] = "圓形線條接合";
     Text[ arabic ] = "���� ���ء ������";
     Text[ turkish ] = "Yuvarlak �izgi ge�i�i";
-    Text[ catalan ] = "Junta de l�neas redonda";
+    Text[ catalan ] = "Junta de l�nies rodonda";
     Text[ finnish ] = "Py�re� viivaliitos";
+    Text[ thai ] = "รอบจุดบรรจบกันของบรรทัด";
 };
 
 String RID_SVXSTR_GRFILTER_OPENERROR
@@ -2921,24 +3026,25 @@ String RID_SVXSTR_GRFILTER_OPENERROR
     TEXT [ italian ] = "Impossibile aprire il file grafico" ;
     TEXT [ portuguese_brazilian ] = "N?o consigo abrir arquivo gr?fico" ;
     TEXT [ portuguese ] = "Imposs�vel abrir ficheiro gr�fico" ;
-    TEXT [ finnish ] = "Grafiikkatiedostoa ei voi avata" ;
-    TEXT [ danish ] = "Det er ikke muligt at �bne grafikfilen" ;
+    TEXT [ finnish ] = "Grafiikkatiedostoa ei voi avata." ;
+    TEXT [ danish ] = "Grafikfil kan ikke �bnes" ;
     TEXT [ french ] = "Impossible d'ouvrir le fichier graphique" ;
     TEXT [ swedish ] = "Det g�r inte att �ppna grafikfilen" ;
-    TEXT [ dutch ] = "Grafisch bestand kan niet worden geopend" ;
+    TEXT [ dutch ] = "Afbeeldingsbestand kan niet worden geopend" ;
     TEXT [ spanish ] = "No es posible abrir el archivo gr�fico" ;
     TEXT [ english_us ] = "Graphics file cannot be opened" ;
-    TEXT[ chinese_simplified ] = "�޷���ͼ���ļ�";
-    TEXT[ russian ] = "������� ����������� ���� �� �������";
+    TEXT[ chinese_simplified ] = "无法打开图形文件";
+    TEXT[ russian ] = "���������� ������� ����������� ����";
     TEXT[ polish ] = "Pliku graficznego nie mo�na otworzy�";
-    TEXT[ japanese ] = "�摜̧�ق͊J���܂���B";
-    TEXT[ chinese_traditional ] = "�L�k�}�ҹϧ��ɮ�";
+    TEXT[ japanese ] = "画像ファイルは開けません。";
+    TEXT[ chinese_traditional ] = "無法開啟圖形檔案";
     TEXT[ arabic ] = "�� ���� ��� ��� ��������";
     TEXT[ greek ] = "�� ������ �������� ��� ����� ������� �� ��������";
-    TEXT[ korean ] = "�׷��������� �� �� �����ϴ�";
+    TEXT[ korean ] = "그림 파일을 열 수 없습니다.";
     TEXT[ turkish ] = "Grafik dosyas� a��lam�yor";
     TEXT[ language_user1 ] = " ";
-    TEXT[ catalan ] = "No es posible abrir el archivo gr�fico";
+    TEXT[ catalan ] = "No es pot obrir el fitxer gr�fic";
+    TEXT[ thai ] = "ไม่สามารถเปิดแฟ้มกราฟิคได้";
 };
 String RID_SVXSTR_GRFILTER_IOERROR
 {
@@ -2948,24 +3054,25 @@ String RID_SVXSTR_GRFILTER_IOERROR
     TEXT [ italian ] = "Impossibile leggere il file grafico" ;
     TEXT [ portuguese_brazilian ] = "N?o consigo ler arquivo gr?fico" ;
     TEXT [ portuguese ] = "Imposs�vel ler o ficheiro gr�fico" ;
-    TEXT [ finnish ] = "Grafiikkatiedostoa ei voi lukea" ;
-    TEXT [ danish ] = "Det er ikke muligt at l�se grafikfilen" ;
+    TEXT [ finnish ] = "Grafiikkatiedostoa ei voi lukea." ;
+    TEXT [ danish ] = "Grafikfil kan ikke l�ses" ;
     TEXT [ french ] = "Impossible de lire le fichier graphique" ;
     TEXT [ swedish ] = "Det g�r inte att l�sa grafikfil" ;
-    TEXT [ dutch ] = "Grafisch bestand is onleesbaar" ;
+    TEXT [ dutch ] = "Afbeeldingsbestand is onleesbaar" ;
     TEXT [ spanish ] = "No es posible leer el archivo gr�fico" ;
     TEXT [ english_us ] = "Graphics file cannot be read" ;
-    TEXT[ chinese_simplified ] = "�޷�����ͼ���ļ�";
-    TEXT[ russian ] = "��������� ����������� ���� �� �������";
+    TEXT[ chinese_simplified ] = "无法读出图形文件";
+    TEXT[ russian ] = "���������� ��������� ����������� ����";
     TEXT[ polish ] = "Pliku graficznego nie mo�na otworzy�";
-    TEXT[ japanese ] = "�摜̧�ق͓ǂݎ��܂���B";
-    TEXT[ chinese_traditional ] = "�L�kŪ�X�ϧ��ɮ�";
+    TEXT[ japanese ] = "画像ファイルは読み取れません。";
+    TEXT[ chinese_traditional ] = "無法讀出圖形檔案";
     TEXT[ arabic ] = "�� ���� ����� ��� ��������";
     TEXT[ greek ] = "� �������� ��� ������� �������� ��� ����� ������";
-    TEXT[ korean ] = "�׷��������� ���� �� �����ϴ�";
+    TEXT[ korean ] = "그림 파일을 읽을 수 없습니다.";
     TEXT[ turkish ] = "Grafik dosyas� okunam�yor";
     TEXT[ language_user1 ] = " ";
-    TEXT[ catalan ] = "No es posible leer el archivo gr�fico";
+    TEXT[ catalan ] = "No es pot llegir el fitxer gr�fic";
+    TEXT[ thai ] = "ไม่สามารถอ่านแฟ้มกราฟิคได้";
 };
 String RID_SVXSTR_GRFILTER_FORMATERROR
 {
@@ -2979,20 +3086,21 @@ String RID_SVXSTR_GRFILTER_FORMATERROR
     TEXT [ danish ] = "Ukendt grafikformat" ;
     TEXT [ french ] = "Format d'image inconnu" ;
     TEXT [ swedish ] = "Ok�nt grafikformat" ;
-    TEXT [ dutch ] = "Onbekend grafisch formaat" ;
+    TEXT [ dutch ] = "Onbekend afbeeldingsformaat" ;
     TEXT [ spanish ] = "Formato de imagen desconocido" ;
     TEXT [ english_us ] = "Unknown graphics format" ;
-    TEXT[ chinese_simplified ] = "������ͼ�θ�ʽ";
+    TEXT[ chinese_simplified ] = "不明的图形格式";
     TEXT[ russian ] = "����������� ����������� ������";
     TEXT[ polish ] = "Nieznany format graficzny";
-    TEXT[ japanese ] = "�s���Ȑ}�̏���";
-    TEXT[ chinese_traditional ] = "�������ϧή榡";
+    TEXT[ japanese ] = "不明な図の書式";
+    TEXT[ chinese_traditional ] = "不明的圖形格式";
     TEXT[ arabic ] = "����� ������ ��� �����";
     TEXT[ greek ] = "������� ����� ��������";
-    TEXT[ korean ] = "�˷��� ���� ���� �׷��ȼ���";
+    TEXT[ korean ] = "알 수 없는 그림 서식";
     TEXT[ turkish ] = "Bilinmeyen grafik format�";
     TEXT[ language_user1 ] = " ";
-    TEXT[ catalan ] = "Formato de imagen desconocido";
+    TEXT[ catalan ] = "Format d'imatge desconegut";
+    TEXT[ thai ] = "ไม่รู้จักรูปแบบกราฟิค";
 };
 String RID_SVXSTR_GRFILTER_VERSIONERROR
 {
@@ -3002,24 +3110,25 @@ String RID_SVXSTR_GRFILTER_VERSIONERROR
     TEXT [ italian ] = "Versione del file grafico non supportata" ;
     TEXT [ portuguese_brazilian ] = "Vers?o de arquivo gr?fico n?o suportada" ;
     TEXT [ portuguese ] = "Vers�o do ficheiro gr�fico n�o tem suporte" ;
-    TEXT [ finnish ] = "Grafiikkatiedoston versiota ei tueta" ;
-    TEXT [ danish ] = "Grafikfilens version underst�ttes ikke" ;
+    TEXT [ finnish ] = "Grafiikkatiedoston versiota ei tueta." ;
+    TEXT [ danish ] = "Grafikfilens version supporteres ikke" ;
     TEXT [ french ] = "Version du fichier graphique non support�e" ;
     TEXT [ swedish ] = "Grafikfilens version st�ds inte" ;
-    TEXT [ dutch ] = "Deze versie van het grafisch bestand wordt niet ondersteund" ;
-    TEXT [ spanish ] = "No se apoya la versi�n del archivo gr�fico" ;
+    TEXT [ dutch ] = "Deze versie van het afbeeldingsbestand wordt niet ondersteund" ;
+    TEXT [ spanish ] = "Esta versi�n del archivo gr�fico no se admite." ;
     TEXT [ english_us ] = "This version of the graphics file is not supported" ;
-    TEXT[ chinese_simplified ] = "��֧�����ͼ���ļ��汾";
-    TEXT[ russian ] = "������ ������������ ����� �� ��������������";
+    TEXT[ chinese_simplified ] = "不支持这个图形文件版本";
+    TEXT[ russian ] = "�� �������������� ��� ������ ������������ �����";
     TEXT[ polish ] = "Wersja pliku graficznego nie jest obs�ugiwana";
-    TEXT[ japanese ] = "�摜̧�ق��ް�ޮ݂ͻ�߰Ă���܂���B";
-    TEXT[ chinese_traditional ] = "������o�ӹϧ��ɮת���";
+    TEXT[ japanese ] = "画像ファイルのバージョンはサポートされません。";
+    TEXT[ chinese_traditional ] = "不支持這個圖形檔案版本";
     TEXT[ arabic ] = "�� ��� ��� ����� ��� ��������";
     TEXT[ greek ] = "��� ������������� � ������ ����� ��� �������� �������.";
-    TEXT[ korean ] = "�׷��������� ������ �������� ����";
+    TEXT[ korean ] = "그림 파일의 이 버전은 지원되지 않습니다.";
     TEXT[ turkish ] = "Grafik dosyas�n�n s�r�m� desteklenmiyor";
     TEXT[ language_user1 ] = " ";
-    TEXT[ catalan ] = "No se apoya la versi�n del archivo gr�fico";
+    TEXT[ catalan ] = "No se suporta la versi� del fitxer gr�fic";
+    TEXT[ thai ] = "ไม่สนับสนุนเวอร์ชั่นของแฟ้มกราฟิค";
 };
 String RID_SVXSTR_GRFILTER_FILTERERROR
 {
@@ -3029,24 +3138,25 @@ String RID_SVXSTR_GRFILTER_FILTERERROR
     TEXT [ italian ] = "Filtro grafico non trovato" ;
     TEXT [ portuguese_brazilian ] = "Filtro gr?fico n?o encontrado" ;
     TEXT [ portuguese ] = "Filtro gr�fico n�o encontrado" ;
-    TEXT [ finnish ] = "Grafiikkasuodatinta ei l�ytynyt" ;
-    TEXT [ danish ] = "Grafikfilter blev ikke fundet" ;
-    TEXT [ french ] = "Filtre d'image non d�tect�" ;
+    TEXT [ finnish ] = "Grafiikkasuodatinta ei l�ytynyt." ;
+    TEXT [ danish ] = "Grafikfilter ikke fundet" ;
+    TEXT [ french ] = "Filtre graphique introuvable" ;
     TEXT [ swedish ] = "Grafikfilter hittades inte" ;
-    TEXT [ dutch ] = "Grafische filter niet gevonden" ;
+    TEXT [ dutch ] = "Afbeeldingsfilter niet gevonden" ;
     TEXT [ spanish ] = "No se encontr� el filtro de im�genes" ;
     TEXT [ english_us ] = "Graphics filter not found" ;
-    TEXT[ chinese_simplified ] = "û���ҵ�ͼ�ι�����";
-    TEXT[ russian ] = "����������� ������ �� ������";
+    TEXT[ chinese_simplified ] = "没有找到图形过滤器";
+    TEXT[ russian ] = "�� ������ ������ ����������� ��������";
     TEXT[ polish ] = "Filtru graficznego nie znaleziono";
-    TEXT[ japanese ] = "�摜̨���͌��‚���܂���B";
-    TEXT[ chinese_traditional ] = "�S�����ϧιL�o��";
+    TEXT[ japanese ] = "画像フィルタは見つかりません。";
+    TEXT[ chinese_traditional ] = "沒有找到圖形過濾器";
     TEXT[ arabic ] = "���� ������ ��� ���� ��������";
     TEXT[ greek ] = "�� ������ �������� ��� �������";
-    TEXT[ korean ] = "�׷������͸� ã�� ������";
+    TEXT[ korean ] = "그래픽 필터를 찾지 못했습니다.";
     TEXT[ turkish ] = "Grafik filtresi bulunamad�";
     TEXT[ language_user1 ] = " ";
-    TEXT[ catalan ] = "No se encontr� el filtro de im�genes";
+    TEXT[ catalan ] = "No s'ha trobat el filtre d'imatges";
+    TEXT[ thai ] = "ไม่พบตัวกรองกราฟิค";
 };
 String RID_SVXSTR_GRFILTER_TOOBIG
 {
@@ -3056,24 +3166,25 @@ String RID_SVXSTR_GRFILTER_TOOBIG
     TEXT [ italian ] = "Memoria insufficiente per inserire l'immagine" ;
     TEXT [ portuguese_brazilian ] = "Mem?ia insuficiente para inserir o gr?fico" ;
     TEXT [ portuguese ] = "Mem�ria insuficiente para inserir a imagem." ;
-    TEXT [ finnish ] = "Muisti ei riit� kuvan lis��miseen" ;
-    TEXT [ danish ] = "Ikke tilstr�kkelig hukommelse til at inds�tte grafik" ;
+    TEXT [ finnish ] = "Muisti ei riit� kuvan lis��miseen." ;
+    TEXT [ danish ] = "Ikke tilstr�kkelig hukommelse til inds�tning af grafik" ;
     TEXT [ french ] = "M�moire insuffisante pour l'insertion de l'image" ;
     TEXT [ swedish ] = "Inte tillr�ckligt med minne f�r att infoga grafik" ;
-    TEXT [ dutch ] = "Niet genoeg geheugen voor invoegen van grafische afbeelding." ;
+    TEXT [ dutch ] = "Niet genoeg geheugen voor het invoegen van de afbeelding" ;
     TEXT [ spanish ] = "No hay suficiente memoria para insertar la imagen" ;
     TEXT [ english_us ] = "Not enough memory to insert graphic" ;
-    TEXT[ chinese_simplified ] = "�ڴ治�㣬�޷�����ͼ��";
-    TEXT[ russian ] = "������������ ������ ��� ������� �������";
+    TEXT[ chinese_simplified ] = "内存不足，无法插入图形";
+    TEXT[ russian ] = "������������ ������ ��� ������� ������������ �������";
     TEXT[ polish ] = "Brakuje pami�ci potrzebnej do wstawienia grafiki";
-    TEXT[ japanese ] = "�}��}������ɂ́A��ؗe�ʂ��s�\\���ł��B";
-    TEXT[ chinese_traditional ] = "�O���餣���M�L�k���J�ϧ�";
+    TEXT[ japanese ] = "図の挿入に必要なディスク空き容量がありません。";
+    TEXT[ chinese_traditional ] = "記憶體不足﹐無法插入圖形";
     TEXT[ arabic ] = "�� ���� ����� ����� ������ �����";
     TEXT[ greek ] = "��� ������� ������ ����� ��� ��� �������� ��� ��������";
-    TEXT[ korean ] = "�׷��� ������ ���� �޸𸮰� �����մϴ�";
+    TEXT[ korean ] = "메모리가 부족하여 그래픽 삽입을 삽입할 수 없습니다.";
     TEXT[ turkish ] = "Grafi�in eklenmesi i�in yeterli bellek mevcut de�il";
     TEXT[ language_user1 ] = " ";
-    TEXT[ catalan ] = "No hay suficiente memoria para insertar la imagen";
+    TEXT[ catalan ] = "No hi ha prou mem�ria per inserir la imatge";
+    TEXT[ thai ] = "หน่วยความจำไม่พอในการแทรกกราฟิค";
 };
 
 
@@ -3276,9 +3387,9 @@ String RID_SVXSTR_GRDT0
     Text [ ENGLISH ] = "Gradient";
     Text[ english_us ] = "Gradient";
     Text[ portuguese ] = "Grada��o";
-    Text[ russian ] = "�����������";
+    Text[ russian ] = "��������";
     Text[ greek ] = "���������� ��������";
-    Text[ dutch ] = "Kleurverloop";
+    Text[ dutch ] = "Kleurovergangen";
     Text[ french ] = "D�grad�";
     Text[ spanish ] = "Gradiente";
     Text[ italian ] = "Sfumatura";
@@ -3286,14 +3397,15 @@ String RID_SVXSTR_GRDT0
     Text[ swedish ] = "F�rggradient";
     Text[ polish ] = "Gradient";
     Text[ portuguese_brazilian ] = "Gradient";
-    Text[ japanese ] = "����ް���";
-    Text[ korean ] = "�׶��̼�";
-    Text[ chinese_simplified ] = "��ɫͼ��";
-    Text[ chinese_traditional ] = "�m��Ϯ�";
+    Text[ japanese ] = "グラデーション";
+    Text[ korean ] = "그라디언트";
+    Text[ chinese_simplified ] = "彩色图案";
+    Text[ chinese_traditional ] = "彩色圖案";
     Text[ arabic ] = "���� �����";
     Text[ turkish ] = "Gradyan";
-    Text[ catalan ] = "Gradiente";
-    Text[ finnish ] = "Gradientti";
+    Text[ catalan ] = "Gradient";
+    Text[ finnish ] = "Liukuv�rj�ys";
+    Text[ thai ] = "ไล่ระดับสี";
 };
 String RID_SVXSTR_GRDT1
 {
@@ -3301,7 +3413,7 @@ String RID_SVXSTR_GRDT1
     Text [ ENGLISH ] = "Linear blue/white";
     Text[ english_us ] = "Linear blue/white";
     Text[ portuguese ] = "Linear azul/branco";
-    Text[ russian ] = "��������: �����/�����";
+    Text[ russian ] = "��������: �����/�����";
     Text[ greek ] = "�������� ����/�����";
     Text[ dutch ] = "Lineair blauw/wit";
     Text[ french ] = "Lin�aire bleu/blanc";
@@ -3311,14 +3423,15 @@ String RID_SVXSTR_GRDT1
     Text[ swedish ] = "Linj�r bl�tt/vitt";
     Text[ polish ] = "Linearny niebieski/bia�y";
     Text[ portuguese_brazilian ] = "Linear blue/white";
-    Text[ japanese ] = "���� ��/��";
-    Text[ korean ] = "���� û��/���";
-    Text[ chinese_simplified ] = "���� ��/��";
-    Text[ chinese_traditional ] = "�u����/��";
+    Text[ japanese ] = "線状 青/白";
+    Text[ korean ] = "선형 청색/흰색";
+    Text[ chinese_simplified ] = "线性 蓝/白";
+    Text[ chinese_traditional ] = "線條藍/白";
     Text[ arabic ] = "��� ����/����";
     Text[ turkish ] = "Do�rusal mavi/beyaz";
-    Text[ catalan ] = "Lineal azul/blanco";
+    Text[ catalan ] = "Blau/blanc lineal";
     Text[ finnish ] = "Lineaarinen sininen/valkoinen";
+    Text[ thai ] = "เส้นสีน้ำเงิน/ขาว";
 };
 String RID_SVXSTR_GRDT2
 {
@@ -3326,7 +3439,7 @@ String RID_SVXSTR_GRDT2
     Text [ ENGLISH ] = "Linear magenta/green";
     Text[ english_us ] = "Linear magenta/green";
     Text[ portuguese ] = "Linear violeta/verde";
-    Text[ russian ] = "��������: ����������/�������";
+    Text[ russian ] = "��������: ���������/�������";
     Text[ greek ] = "�������� ������./�������";
     Text[ dutch ] = "Lineair violet/groen";
     Text[ french ] = "Lin�aire violet/vert";
@@ -3336,14 +3449,15 @@ String RID_SVXSTR_GRDT2
     Text[ swedish ] = "Linj�r violett/gr�nt";
     Text[ polish ] = "Linearny fioletowy/zielony";
     Text[ portuguese_brazilian ] = "Linear magenta/green";
-    Text[ japanese ] = "���� ��/��";
-    Text[ korean ] = "���� �����/���";
-    Text[ chinese_simplified ] = "���� ��/��";
-    Text[ chinese_traditional ] = "�u��������/���";
+    Text[ japanese ] = "線状 紫/緑";
+    Text[ korean ] = "선형 보라색/녹색";
+    Text[ chinese_simplified ] = "线性 紫/绿";
+    Text[ chinese_traditional ] = "線條紅紫色/綠色";
     Text[ arabic ] = "��� �������/����";
     Text[ turkish ] = "Do�rusal menek�e/ye�il";
-    Text[ catalan ] = "Lineal magenta/verde";
-    Text[ finnish ] = "Lineaarinen purppura/vihre�";
+    Text[ catalan ] = "Magenta/verd lineal";
+    Text[ finnish ] = "Lineaarinen magenta/vihre�";
+    Text[ thai ] = "เส้นสีม่วง/เขียว";
 };
 String RID_SVXSTR_GRDT3
 {
@@ -3351,7 +3465,7 @@ String RID_SVXSTR_GRDT3
     Text [ ENGLISH ] = "Linear yellow/brown";
     Text[ english_us ] = "Linear yellow/brown";
     Text[ portuguese ] = "Linear amarelo/castanho";
-    Text[ russian ] = "��������: ������/����������";
+    Text[ russian ] = "��������: ������/����������";
     Text[ greek ] = "�������� �������/����";
     Text[ dutch ] = "Lineair geel/bruin";
     Text[ french ] = "Lin�aire jaune/marron";
@@ -3361,14 +3475,15 @@ String RID_SVXSTR_GRDT3
     Text[ swedish ] = "Linj�r gult/brunt";
     Text[ polish ] = "Linearny ��ty/br�zowy";
     Text[ portuguese_brazilian ] = "Linear yellow/brown";
-    Text[ japanese ] = "���� ���F/���F";
-    Text[ korean ] = "���� Ȳ��/����";
-    Text[ chinese_simplified ] = "���� ��/��ɫ";
-    Text[ chinese_traditional ] = "�u������/�Ħ�";
+    Text[ japanese ] = "線状 黄色/茶色";
+    Text[ korean ] = "선형 황색/갈색";
+    Text[ chinese_simplified ] = "线性 黄/棕色";
+    Text[ chinese_traditional ] = "線條黃色/棕色";
     Text[ arabic ] = "��� ����/���";
     Text[ turkish ] = "Do�rusal sar�/kahverengi";
-    Text[ catalan ] = "Lineal amarillo/marr�n";
+    Text[ catalan ] = "Marr�/groc lineal";
     Text[ finnish ] = "Lineaarinen keltainen/ruskea";
+    Text[ thai ] = "เส้นสีเหลือง/น้ำตาล";
 };
 String RID_SVXSTR_GRDT4
 {
@@ -3376,7 +3491,7 @@ String RID_SVXSTR_GRDT4
     Text [ ENGLISH ] = "Radial green/black";
     Text[ english_us ] = "Radial green/black";
     Text[ portuguese ] = "Radial verde/preto";
-    Text[ russian ] = "��������: �������/������";
+    Text[ russian ] = "����������: �������/������";
     Text[ greek ] = "�������� �������/�����";
     Text[ dutch ] = "Radiaal groen/zwart";
     Text[ french ] = "Radial vert/noir";
@@ -3386,14 +3501,15 @@ String RID_SVXSTR_GRDT4
     Text[ swedish ] = "Radiellt gr�nt/svart";
     Text[ polish ] = "Radialny zielony/czarny";
     Text[ portuguese_brazilian ] = "Radial green/black";
-    Text[ japanese ] = "���ˏ� ��/��";
-    Text[ korean ] = "����� ���/������";
-    Text[ chinese_simplified ] = "���� ��/��";
-    Text[ chinese_traditional ] = "���u�����/�¦�";
+    Text[ japanese ] = "放射状 緑/黒";
+    Text[ korean ] = "방사형 녹색/검은색";
+    Text[ chinese_simplified ] = "径向 绿/黑";
+    Text[ chinese_traditional ] = "光線狀綠色/黑色";
     Text[ arabic ] = "����� ����/����";
     Text[ turkish ] = "Radyal ye�il/siyah";
-    Text[ catalan ] = "Radial verde/negro";
+    Text[ catalan ] = "Radial verd/negre";
     Text[ finnish ] = "S�teitt�inen vihre�/musta";
+    Text[ thai ] = "รัศมีสีเขียว/ดำ";
 };
 String RID_SVXSTR_GRDT5
 {
@@ -3401,7 +3517,7 @@ String RID_SVXSTR_GRDT5
     Text [ ENGLISH ] = "Radial red/yellow";
     Text[ english_us ] = "Radial red/yellow";
     Text[ portuguese ] = "Radial vermelho/amarelo";
-    Text[ russian ] = "��������: �������/������";
+    Text[ russian ] = "����������: �������/������";
     Text[ greek ] = "�������� �������/�������";
     Text[ dutch ] = "Radiaal rood/geel";
     Text[ french ] = "Radial rouge/jaune";
@@ -3411,14 +3527,15 @@ String RID_SVXSTR_GRDT5
     Text[ swedish ] = "Radiellt r�tt/gult";
     Text[ polish ] = "Radialny czerwony/��ty";
     Text[ portuguese_brazilian ] = "Radial red/yellow";
-    Text[ japanese ] = "���ˏ� ��/���F";
-    Text[ korean ] = "����� ����/Ȳ��";
-    Text[ chinese_simplified ] = "���� ��/��";
-    Text[ chinese_traditional ] = "���u������/����";
+    Text[ japanese ] = "放射状 赤/黄色";
+    Text[ korean ] = "방사형 적색/황색";
+    Text[ chinese_simplified ] = "径向 红/黄";
+    Text[ chinese_traditional ] = "光線狀紅色/黃色";
     Text[ arabic ] = "����� ����/����";
     Text[ turkish ] = "Radyal k�rm�z�/sar�";
-    Text[ catalan ] = "Radial rojo/amarillo";
+    Text[ catalan ] = "Radial vermell/groc";
     Text[ finnish ] = "S�teitt�inen punainen/keltainen";
+    Text[ thai ] = "รัศมีสีแดง/เหลือง";
 };
 String RID_SVXSTR_GRDT6
 {
@@ -3426,7 +3543,7 @@ String RID_SVXSTR_GRDT6
     Text [ ENGLISH ] = "Rectangular red/white";
     Text[ english_us ] = "Rectangular red/white";
     Text[ portuguese ] = "Rectangular vermelho/branco";
-    Text[ russian ] = "�������������: �������/�����";
+    Text[ russian ] = "�������������: �������/�����";
     Text[ greek ] = "��������� �������/�����";
     Text[ dutch ] = "Rechthoek rood/wit";
     Text[ french ] = "Rectangulaire rouge/blanc";
@@ -3436,14 +3553,15 @@ String RID_SVXSTR_GRDT6
     Text[ swedish ] = "Rektangul�r r�tt/vitt";
     Text[ polish ] = "Prostok�t czerwony/bia�y";
     Text[ portuguese_brazilian ] = "Rectangular red/white";
-    Text[ japanese ] = "�����` ��/��";
-    Text[ korean ] = "���簢�� ����/���";
-    Text[ chinese_simplified ] = "���� ��/��";
-    Text[ chinese_traditional ] = "�x�ά���/�զ�";
+    Text[ japanese ] = "長方形 赤/白";
+    Text[ korean ] = "직사각형 적색/흰색";
+    Text[ chinese_simplified ] = "矩形 红/白";
+    Text[ chinese_traditional ] = "矩形紅色/白色";
     Text[ arabic ] = "������ ����/����";
     Text[ turkish ] = "Dikd�rtgen k�rm�z�/beyaz";
-    Text[ catalan ] = "Rectangular rojo/blanco";
+    Text[ catalan ] = "Rectangular vermell/blanc";
     Text[ finnish ] = "Suorakulmio punainen/valkoinen";
+    Text[ thai ] = "สีเหลี่ยมสีแดง/ขาว";
 };
 String RID_SVXSTR_GRDT7
 {
@@ -3451,7 +3569,7 @@ String RID_SVXSTR_GRDT7
     Text [ ENGLISH ] = "Square yellow/white";
     Text[ english_us ] = "Square yellow/white";
     Text[ portuguese ] = "Quadrado amarelo/branco";
-    Text[ russian ] = "����������: ������/�����";
+    Text[ russian ] = "����������: ������/�����";
     Text[ greek ] = "��������� �������/�����";
     Text[ dutch ] = "Vierkant geel/wit";
     Text[ french ] = "Carr� jaune/blanc";
@@ -3461,14 +3579,15 @@ String RID_SVXSTR_GRDT7
     Text[ swedish ] = "Kvadratisk gult/vitt";
     Text[ polish ] = "Kwadratowe ��te/bia�e";
     Text[ portuguese_brazilian ] = "Square yellow/white";
-    Text[ japanese ] = "�����` ���F/��";
-    Text[ korean ] = "���簢�� Ȳ��/���";
-    Text[ chinese_simplified ] = "������ ��/��";
-    Text[ chinese_traditional ] = "����ζ���/�զ�";
+    Text[ japanese ] = "正方形 黄色/白";
+    Text[ korean ] = "정사각형 황색/흰색";
+    Text[ chinese_simplified ] = "正方形 黄/白";
+    Text[ chinese_traditional ] = "正方形黃色/白色";
     Text[ arabic ] = "���� ����/����";
     Text[ turkish ] = "Kare sar�/beyaz";
-    Text[ catalan ] = "Cuadrado amarillo/blanco";
+    Text[ catalan ] = "Quadrat groc/blanc";
     Text[ finnish ] = "Neli� keltainen/valkoinen";
+    Text[ thai ] = "สีเหลี่ยมจัตุรัสสีเหลือง/ขาว";
 };
 String RID_SVXSTR_GRDT8
 {
@@ -3476,7 +3595,7 @@ String RID_SVXSTR_GRDT8
     Text [ ENGLISH ] = "Ellipsoid blue gray/light blue";
     Text[ english_us ] = "Ellipsoid blue gray/light blue";
     Text[ portuguese ] = "Elipsoidal cinzento azulado/azul-claro";
-    Text[ russian ] = "������������: ����-�������/�������";
+    Text[ russian ] = "������������: ����-�������/�������";
     Text[ greek ] = "������. ����-����/���� �����.";
     Text[ dutch ] = "Ellips grijsblauw/lichtblauw";
     Text[ french ] = "Ellipso�de gris bleu/bleu clair";
@@ -3486,14 +3605,15 @@ String RID_SVXSTR_GRDT8
     Text[ swedish ] = "Ellipsoid bl�gr�/ljusbl�";
     Text[ polish ] = "Elips. niebiesko-szary/jasnoniebieski";
     Text[ portuguese_brazilian ] = "Ellipsoid blue gray/light blue";
-    Text[ japanese ] = "�ȉ~�� �ŠD�F/���邢��";
-    Text[ korean ] = "Ÿ���� ȸû��/���� û��";
-    Text[ chinese_simplified ] = "��Բ�� ����/dz��";
-    Text[ chinese_traditional ] = "����ŦǦ�/�L�Ǧ�";
+    Text[ japanese ] = "楕円体 青灰色/明るい青";
+    Text[ korean ] = "타원형 회청색/밝은 청색";
+    Text[ chinese_simplified ] = "椭圆体 蓝灰/浅蓝";
+    Text[ chinese_traditional ] = "橢圓藍灰色/淺灰色";
     Text[ arabic ] = "����� ����� ����/���� ����";
     Text[ turkish ] = "Elipsoid mavi gri/a��k mavi";
-    Text[ catalan ] = "Elipsoide azul gris/azul claro";
-    Text[ finnish ] = "Ellipsoidi siniharmaa/vaaleansininen";
+    Text[ catalan ] = "Elipsoide blau gris/blau clar";
+    Text[ finnish ] = "Ellipsoidi siniharmaa/kirkas sininen";
+    Text[ thai ] = "วงรีสีน้ำเงินเทา/น้ำเงินอ่อน";
 };
 String RID_SVXSTR_GRDT9
 {
@@ -3501,7 +3621,7 @@ String RID_SVXSTR_GRDT9
     Text [ ENGLISH ] = "Axial light red/white";
     Text[ english_us ] = "Axial light red/white";
     Text[ portuguese ] = "Axial vermelho-claro/branco";
-    Text[ russian ] = "������: ������-�������/�����";
+    Text[ russian ] = "������: ������-�������/�����";
     Text[ greek ] = "������� �����/������� �����.";
     Text[ dutch ] = "Axiaal lichtrood/wit";
     Text[ french ] = "Axial rouge clair/blanc";
@@ -3511,14 +3631,15 @@ String RID_SVXSTR_GRDT9
     Text[ swedish ] = "Axialt ljusr�tt/vitt";
     Text[ polish ] = "Osiowy jasnoczerw./bia�y";
     Text[ portuguese_brazilian ] = "Axial light red/white";
-    Text[ japanese ] = "���� ���邢��/��";
-    Text[ korean ] = "�� ���� ����/���";
-    Text[ chinese_simplified ] = "���� dz��/��";
-    Text[ chinese_traditional ] = "�b�V�L����/�զ�";
+    Text[ japanese ] = "軸状 明るい赤/白";
+    Text[ korean ] = "축 밝은 적색/흰색";
+    Text[ chinese_simplified ] = "轴向 浅红/白";
+    Text[ chinese_traditional ] = "軸向淺紅色/白色";
     Text[ arabic ] = "����� ���� ����/����";
     Text[ turkish ] = "Eksen a��k k�rm�z�/beyaz";
-    Text[ catalan ] = "Axial rojo claro/blanco";
+    Text[ catalan ] = "Llum axial vermella/blanca";
     Text[ finnish ] = "Akselivalaistus punainen/valkoinen";
+    Text[ thai ] = "แกนสีแดงอ่อน/ขาว";
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -3598,14 +3719,15 @@ String RID_SVXSTR_HATCH0
     Text[ swedish ] = "Svart 45 grader vid";
     Text[ polish ] = "Czarny 45 stopni, rozci�gni�ty";
     Text[ portuguese_brazilian ] = "Black 45 Degrees Wide";
-    Text[ japanese ] = "�� 45�x ���L";
-    Text[ korean ] = "������ 45�� ����";
-    Text[ chinese_simplified ] = "��ɫ 45 ��(����)";
-    Text[ chinese_traditional ] = "�¦� 45 �׼e";
+    Text[ japanese ] = "黒 45度 幅広";
+    Text[ korean ] = "검은색 45도 넓이";
+    Text[ chinese_simplified ] = "黑色 45 度(宽距)";
+    Text[ chinese_traditional ] = "黑色 45 度寬";
     Text[ arabic ] = "���� 45 ���� ����";
     Text[ turkish ] = "Siyah 45 derece geni�";
-    Text[ catalan ] = "Negro 45 grados ancho";
+    Text[ catalan ] = "Negre d'ample 45 graus";
     Text[ finnish ] = "Musta 45 astetta leve�";
+    Text[ thai ] = "กว้าง  45 องศาสีดำ";
 };
 String RID_SVXSTR_HATCH1
 {
@@ -3623,14 +3745,15 @@ String RID_SVXSTR_HATCH1
     Text[ swedish ] = "Svart 45 grader";
     Text[ polish ] = "Czarny 45 stopni";
     Text[ portuguese_brazilian ] = "Black 45 Degrees";
-    Text[ japanese ] = "�� 45�x";
-    Text[ korean ] = "������ 45��";
-    Text[ chinese_simplified ] = "��ɫ 45 ��";
-    Text[ chinese_traditional ] = "�¦� 45 ��";
+    Text[ japanese ] = "黒 45度";
+    Text[ korean ] = "검은색 45도";
+    Text[ chinese_simplified ] = "黑色 45 度";
+    Text[ chinese_traditional ] = "黑色 45 度";
     Text[ arabic ] = "���� 45 ����";
     Text[ turkish ] = "Siyah 45 derece";
-    Text[ catalan ] = "Negro 45 grados";
+    Text[ catalan ] = "Negre 45 graus";
     Text[ finnish ] = "Musta 45 astetta";
+    Text[ thai ] = " 45 องศาสีดำ";
 };
 String RID_SVXSTR_HATCH2
 {
@@ -3648,14 +3771,15 @@ String RID_SVXSTR_HATCH2
     Text[ swedish ] = "Svart -45 grader";
     Text[ polish ] = "Czarny -45 stopni";
     Text[ portuguese_brazilian ] = "Black -45 Degrees";
-    Text[ japanese ] = "�� -45�x";
-    Text[ korean ] = "������ 45 ��";
-    Text[ chinese_simplified ] = "��ɫ -45 ��";
-    Text[ chinese_traditional ] = "�¦� -45 ��";
+    Text[ japanese ] = "黒 -45度";
+    Text[ korean ] = "검은색 45 도";
+    Text[ chinese_simplified ] = "黑色 -45 度";
+    Text[ chinese_traditional ] = "黑色 -45 度";
     Text[ arabic ] = "���� -45 ����";
     Text[ turkish ] = "Siyah -45 derece";
-    Text[ catalan ] = "Negro -45 grados";
+    Text[ catalan ] = "Negre -45 graus";
     Text[ finnish ] = "Musta -45 astetta";
+    Text[ thai ] = "สีดำ -45 องศา";
 };
 String RID_SVXSTR_HATCH3
 {
@@ -3673,14 +3797,15 @@ String RID_SVXSTR_HATCH3
     Text[ swedish ] = "Svart 90 grader";
     Text[ polish ] = "Czarny 90 stopni";
     Text[ portuguese_brazilian ] = "Black 90 Degrees";
-    Text[ japanese ] = "�� 90�x";
-    Text[ korean ] = "������ 90 ��";
-    Text[ chinese_simplified ] = "��ɫ 90 ��";
-    Text[ chinese_traditional ] = "�¦� 90 ��";
+    Text[ japanese ] = "黒 90度";
+    Text[ korean ] = "검은색 90 도";
+    Text[ chinese_simplified ] = "黑色 90 度";
+    Text[ chinese_traditional ] = "黑色 90 度";
     Text[ arabic ] = "���� 90 ����";
     Text[ turkish ] = "Siyah 90 derece";
-    Text[ catalan ] = "Negro 90 grados";
+    Text[ catalan ] = "Negre 90 graus";
     Text[ finnish ] = "Musta 90 astetta";
+    Text[ thai ] = "90 องศาสีดำ";
 };
 String RID_SVXSTR_HATCH4
 {
@@ -3688,9 +3813,9 @@ String RID_SVXSTR_HATCH4
     Text [ ENGLISH ] = "Red Crossed 45 Degrees";
     Text [ english_us ] = "Red crossed 45 degrees";
     Text[ portuguese ] = "Vermelho cruzado 45 graus";
-    Text[ russian ] = "������� ���� 45 ��������";
+    Text[ russian ] = "������� ������������ 45 ��������";
     Text[ greek ] = "������� ������ 45 ������";
-    Text[ dutch ] = "Rood gekruisd 45 graden";
+    Text[ dutch ] = "Rood gekruist 45 graden";
     Text[ french ] = "Rouge double inclin� 45 degr�s";
     Text[ spanish ] = "Rojo red 45 grados";
     Text[ italian ] = "Rosso a rete 45 gradi";
@@ -3698,14 +3823,15 @@ String RID_SVXSTR_HATCH4
     Text[ swedish ] = "R�tt n�t 45 grader";
     Text[ polish ] = "Czerw. siatka 45 stopni";
     Text[ portuguese_brazilian ] = "Red Crossed 45 Degrees";
-    Text[ japanese ] = "�� �� 45�x";
-    Text[ korean ] = "���� ��Ʈ 45��";
-    Text[ chinese_simplified ] = "��ɫ������ 45 ��";
-    Text[ chinese_traditional ] = "������ 45 ��";
+    Text[ japanese ] = "赤 縞 45度";
+    Text[ korean ] = "적색 네트 45도";
+    Text[ chinese_simplified ] = "红色网格线 45 度";
+    Text[ chinese_traditional ] = "紅網狀 45 度";
     Text[ arabic ] = "���� ���� 45 ����";
     Text[ turkish ] = "K�rm�z� �zgaral� 45 derece";
-    Text[ catalan ] = "Rojo red 45 grados";
+    Text[ catalan ] = "Vermell encreuat 45 graus";
     Text[ finnish ] = "Punainen ristiss� 45 astetta";
+    Text[ thai ] = "45 องศาขวางสีแดง";
 };
 String RID_SVXSTR_HATCH5
 {
@@ -3713,9 +3839,9 @@ String RID_SVXSTR_HATCH5
     Text [ ENGLISH ] = "Red Crossed 0 Degrees";
     Text [ english_us ] = "Red crossed 0 degrees";
     Text[ portuguese ] = "Vermelho cruzado 0 graus";
-    Text[ russian ] = "������� ���� 0 ��������";
+    Text[ russian ] = "������� ������������ 0 ��������";
     Text[ greek ] = "������� ������ 0 ������";
-    Text[ dutch ] = "Rood gekruisd 0 graden";
+    Text[ dutch ] = "Rood gekruist 0 graden";
     Text[ french ] = "Rouge double inclin� 0 degr�";
     Text[ spanish ] = "Rojo red 0 grados";
     Text[ italian ] = "Rosso a rete 0 gradi";
@@ -3723,14 +3849,15 @@ String RID_SVXSTR_HATCH5
     Text[ swedish ] = "R�tt n�t 0 grader";
     Text[ polish ] = "Czerw. siatka 0 stopni";
     Text[ portuguese_brazilian ] = "Red Crossed 0 Degrees";
-    Text[ japanese ] = "�� �� 0�x";
-    Text[ korean ] = "���� ��Ʈ 0��";
-    Text[ chinese_simplified ] = "��ɫ������ 0 ��";
-    Text[ chinese_traditional ] = "���� 0 ��";
+    Text[ japanese ] = "赤 縞 0度";
+    Text[ korean ] = "적색 네트 0도";
+    Text[ chinese_simplified ] = "红色网格线 0 度";
+    Text[ chinese_traditional ] = "紅網 0 度";
     Text[ arabic ] = "���� ���� 0 ����";
     Text[ turkish ] = "K�rm�z� �zgaral� 0 derece";
-    Text[ catalan ] = "Rojo red 0 grados";
+    Text[ catalan ] = "Vermell encreuat 0 graus";
     Text[ finnish ] = "Punainen ristiss� 0 astetta";
+    Text[ thai ] = " 0 องศาขวางสีแดง";
 };
 String RID_SVXSTR_HATCH6
 {
@@ -3738,9 +3865,9 @@ String RID_SVXSTR_HATCH6
     Text [ ENGLISH ] = "Blue Crossed 45 Degrees";
     Text [ english_us ] = "Blue crossed 45 degrees";
     Text[ portuguese ] = "Azul cruzado 45 graus";
-    Text[ russian ] = "����� ���� 45 ��������";
+    Text[ russian ] = "����� ������������ 45 ��������";
     Text[ greek ] = "���� ������ 45 ������";
-    Text[ dutch ] = "Blauw gekruisd 45 graden";
+    Text[ dutch ] = "Blauw gekruist 45 graden";
     Text[ french ] = "Bleu double inclin� 45 degr�s";
     Text[ spanish ] = "Azul red 45 grados";
     Text[ italian ] = "Blu a rete 45 gradi";
@@ -3748,14 +3875,15 @@ String RID_SVXSTR_HATCH6
     Text[ swedish ] = "Bl�tt n�t 45 grader";
     Text[ polish ] = "Nieb. siatka 45 stopni";
     Text[ portuguese_brazilian ] = "Blue Crossed 45 Degrees";
-    Text[ japanese ] = "�� �� 45�x";
-    Text[ korean ] = "û�� ��Ʈ 45��";
-    Text[ chinese_simplified ] = "��ɫ������ 45 ��";
-    Text[ chinese_traditional ] = "�ź� 45 ��";
+    Text[ japanese ] = "青 縞 45度";
+    Text[ korean ] = "청색 네트 45도";
+    Text[ chinese_simplified ] = "蓝色网格线 45 度";
+    Text[ chinese_traditional ] = "藍網 45 度";
     Text[ arabic ] = "���� ���� 45 ����";
     Text[ turkish ] = "Mavi �zgaral� 45 derece";
-    Text[ catalan ] = "Azul red 45 grados";
+    Text[ catalan ] = "Blau encreuat 45 graus";
     Text[ finnish ] = "Sininen ristiss� 45 astetta";
+    Text[ thai ] = " 45 องศาขวางสีน้ำเงิน";
 };
 String RID_SVXSTR_HATCH7
 {
@@ -3763,9 +3891,9 @@ String RID_SVXSTR_HATCH7
     Text [ ENGLISH ] = "Blue Crossed 0 Degrees";
     Text [ english_us ] = "Blue crossed 0 degrees";
     Text[ portuguese ] = "Azul cruzado 0 graus";
-    Text[ russian ] = "����� ���� 0 ��������";
+    Text[ russian ] = "����� ������������ 0 ��������";
     Text[ greek ] = "���� ������ 0 ������";
-    Text[ dutch ] = "Bauw gekruisd 0 graden";
+    Text[ dutch ] = "Bauw gekruist 0 graden";
     Text[ french ] = "Bleu double inclin� 0 degr�";
     Text[ spanish ] = "Azul red 0 grados";
     Text[ italian ] = "Blu a rete 0 gradi";
@@ -3773,14 +3901,15 @@ String RID_SVXSTR_HATCH7
     Text[ swedish ] = "Bl�tt n�t 0 grader";
     Text[ polish ] = "Nieb. siatka 0 stopni";
     Text[ portuguese_brazilian ] = "Blue Crossed 0 Degrees";
-    Text[ japanese ] = "�� �� 0�x";
-    Text[ korean ] = "û�� ��Ʈ 0��";
-    Text[ chinese_simplified ] = "��ɫ������ 0 ��";
-    Text[ chinese_traditional ] = "�ź� 0 ��";
+    Text[ japanese ] = "青 縞 0度";
+    Text[ korean ] = "청색 네트 0도";
+    Text[ chinese_simplified ] = "蓝色网格线 0 度";
+    Text[ chinese_traditional ] = "藍網 0 度";
     Text[ arabic ] = "���� ���� 0 ����";
     Text[ turkish ] = "Mavi �zgaral� 0 derece";
-    Text[ catalan ] = "Azul red 0 grados";
+    Text[ catalan ] = "Blau encreuat 0 graus";
     Text[ finnish ] = "Sininen ristiss� 0 astetta";
+    Text[ thai ] = " 0 องศาขวางสีน้ำเงิน";
 };
 String RID_SVXSTR_HATCH8
 {
@@ -3788,9 +3917,9 @@ String RID_SVXSTR_HATCH8
     Text [ ENGLISH ] = "Blue Triple 90 Degrees";
     Text [ english_us ] = "Blue triple 90 degrees";
     Text[ portuguese ] = "Azul cruzado triplo 90 graus";
-    Text[ russian ] = "����� ������� ���� 90 ��������";
+    Text[ russian ] = "����� ������� 90 ��������";
     Text[ greek ] = "���� ������ 90 ������";
-    Text[ dutch ] = "Blauw drievoudig gekruisd 90 graden";
+    Text[ dutch ] = "Blauw drievoudig gekruist 90 graden";
     Text[ french ] = "Bleu triple inclin� 90 degr�s";
     Text[ spanish ] = "Azul red triple 90 grados";
     Text[ italian ] = "Blu tripla rete 90 gradi";
@@ -3798,14 +3927,15 @@ String RID_SVXSTR_HATCH8
     Text[ swedish ] = "Bl�tt trippeln�t 90 grader";
     Text[ polish ] = "Nieb. potr�jna siatka 90 stopni";
     Text[ portuguese_brazilian ] = "Blue Triple 90 Degrees";
-    Text[ japanese ] = "�� 3�{�� 90�x";
-    Text[ korean ] = "û�� 3�߳�Ʈ 90��";
-    Text[ chinese_simplified ] = "��ɫ���������� 90 ��";
-    Text[ chinese_traditional ] = "�Ŧ�T�� 90 ��";
+    Text[ japanese ] = "青 3本縞 90度";
+    Text[ korean ] = "청색 3중네트 90도";
+    Text[ chinese_simplified ] = "蓝色三重网格线 90 度";
+    Text[ chinese_traditional ] = "藍色三網 90 度";
     Text[ arabic ] = "���� ���� ������ 90 ����";
     Text[ turkish ] = "Mavi 3'l� �zgaral� 90 derece";
-    Text[ catalan ] = "Azul red triple 90 grados";
+    Text[ catalan ] = "Blau triple 90 graus";
     Text[ finnish ] = "Sininen kolminkertainen 90 astetta";
+    Text[ thai ] = " 90 องศาสามอันสีน้ำเงิน";
 };
 String RID_SVXSTR_HATCH9
 {
@@ -3823,14 +3953,15 @@ String RID_SVXSTR_HATCH9
     Text[ swedish ] = "Svart 0 grader";
     Text[ polish ] = "Czarny 0 stopni";
     Text[ portuguese_brazilian ] = "Black 0 Degrees";
-    Text[ japanese ] = "�� 0�x";
-    Text[ korean ] = "������ 0��";
-    Text[ chinese_simplified ] = "��ɫ 0 ��";
-    Text[ chinese_traditional ] = "�¦� 0 ��";
+    Text[ japanese ] = "黒 0度";
+    Text[ korean ] = "검은색 0도";
+    Text[ chinese_simplified ] = "黑色 0 度";
+    Text[ chinese_traditional ] = "黑色 0 度";
     Text[ arabic ] = "���� 0 ����";
     Text[ turkish ] = "Siyah 0 derece";
-    Text[ catalan ] = "Negro 0 grados";
+    Text[ catalan ] = "Negre 0 graus";
     Text[ finnish ] = "Musta 0 astetta";
+    Text[ thai ] = "0 องศาสีดำ";
 };
 String RID_SVXSTR_HATCH10
 {
@@ -3847,17 +3978,18 @@ String RID_SVXSTR_HATCH10
     Text [ dutch ] = "Arcering" ;
     Text [ spanish ] = "Trama" ;
     Text [ english_us ] = "Hatching" ;
-    Text[ chinese_simplified ] = "��Ӱ��";
+    Text[ chinese_simplified ] = "阴影线";
     Text[ russian ] = "���������";
     Text[ polish ] = "Kreskowanie";
-    Text[ japanese ] = "ʯ�ݸ�";
-    Text[ chinese_traditional ] = "���v�u";
+    Text[ japanese ] = "ハッチング";
+    Text[ chinese_traditional ] = "陰影線";
     Text[ arabic ] = "���";
     Text[ greek ] = "����������";
-    Text[ korean ] = "��Ī";
+    Text[ korean ] = "해칭";
     Text[ turkish ] = "Tarama";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Trama";
+    Text[ catalan ] = "Ombreig";
+    Text[ thai ] = "แรเงา";
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -3993,14 +4125,15 @@ String RID_SVXSTR_BMP0
     Text[ swedish ] = "Tomt";
     Text[ polish ] = "Pusty";
     Text[ portuguese_brazilian ] = "Blank";
-    Text[ japanese ] = "��";
-    Text[ korean ] = "����";
-    Text[ chinese_simplified ] = "�հ�";
-    Text[ chinese_traditional ] = "�ť�";
+    Text[ japanese ] = "空白";
+    Text[ korean ] = "공백";
+    Text[ chinese_simplified ] = "空缺";
+    Text[ chinese_traditional ] = "空缺";
     Text[ arabic ] = "����";
     Text[ turkish ] = "Bo�";
-    Text[ catalan ] = "Vac�o";
+    Text[ catalan ] = "En blanc";
     Text[ finnish ] = "Tyhj�";
+    Text[ thai ] = "ช่องว่าง";
 };
 String RID_SVXSTR_BMP1
 {
@@ -4018,14 +4151,15 @@ String RID_SVXSTR_BMP1
     Text[ swedish ] = "Himmel";
     Text[ polish ] = "Niebo";
     Text[ portuguese_brazilian ] = "Orange";
-    Text[ japanese ] = "��";
-    Text[ korean ] = "�ϴ�";
-    Text[ chinese_simplified ] = "���";
-    Text[ chinese_traditional ] = "�Ѫ�";
+    Text[ japanese ] = "空";
+    Text[ korean ] = "하늘";
+    Text[ chinese_simplified ] = "天空";
+    Text[ chinese_traditional ] = "天空";
     Text[ arabic ] = "������";
     Text[ turkish ] = "G�ky�z�";
-    Text[ catalan ] = "Cielo";
+    Text[ catalan ] = "Cel";
     Text[ finnish ] = "Taivas";
+    Text[ thai ] = "ท้องฟ้า";
 };
 String RID_SVXSTR_BMP2
 {
@@ -4043,14 +4177,15 @@ String RID_SVXSTR_BMP2
     Text[ swedish ] = "Vatten";
     Text[ polish ] = "Woda";
     Text[ portuguese_brazilian ] = "Wallpaper";
-    Text[ japanese ] = "����";
-    Text[ korean ] = "��";
-    Text[ chinese_simplified ] = "ˮ";
-    Text[ chinese_traditional ] = "��";
+    Text[ japanese ] = "水面";
+    Text[ korean ] = "수면";
+    Text[ chinese_simplified ] = "水";
+    Text[ chinese_traditional ] = "水";
     Text[ arabic ] = "����";
     Text[ turkish ] = "Su";
-    Text[ catalan ] = "Agua";
+    Text[ catalan ] = "Aigua";
     Text[ finnish ] = "Vesi";
+    Text[ thai ] = "น้ำ";
 };
 String RID_SVXSTR_BMP3
 {
@@ -4068,14 +4203,15 @@ String RID_SVXSTR_BMP3
     Text[ swedish ] = "Grovkornig";
     Text[ polish ] = "Gruboziarnisty";
     Text[ portuguese_brazilian ] = "Texture";
-    Text[ japanese ] = "���炴�炵����";
-    Text[ korean ] = "��ģ �˰���";
-    Text[ chinese_simplified ] = "�ֿ���";
-    Text[ chinese_traditional ] = "�`��";
+    Text[ japanese ] = "ざらざらした面";
+    Text[ korean ] = "거친 알갱이";
+    Text[ chinese_simplified ] = "粗颗粒";
+    Text[ chinese_traditional ] = "深藍";
     Text[ arabic ] = "���������� ���";
     Text[ turkish ] = "�ri taneler";
-    Text[ catalan ] = "Grano grueso";
+    Text[ catalan ] = "En gra gruixut";
     Text[ finnish ] = "Karkea jyvitys";
+    Text[ thai ] = "เนื้อหยาบ";
 };
 String RID_SVXSTR_BMP4
 {
@@ -4093,14 +4229,15 @@ String RID_SVXSTR_BMP4
     Text[ swedish ] = "Kvicksilver";
     Text[ polish ] = "Rt��";
     Text[ portuguese_brazilian ] = "Chocolate";
-    Text[ japanese ] = "��߰����";
-    Text[ korean ] = "����";
-    Text[ chinese_simplified ] = "ˮ��";
-    Text[ chinese_traditional ] = "����";
+    Text[ japanese ] = "スペースメタル";
+    Text[ korean ] = "수은";
+    Text[ chinese_simplified ] = "水银";
+    Text[ chinese_traditional ] = "水銀";
     Text[ arabic ] = "����";
     Text[ turkish ] = "�ikolata";
-    Text[ catalan ] = "Mercurio";
+    Text[ catalan ] = "Mercuri";
     Text[ finnish ] = "Elohopea";
+    Text[ thai ] = "ปรอท";
 };
 String RID_SVXSTR_BMP5
 {
@@ -4118,14 +4255,15 @@ String RID_SVXSTR_BMP5
     Text[ swedish ] = "V�rldsrymd";
     Text[ polish ] = "Kosmos";
     Text[ portuguese_brazilian ] = "Metal";
-    Text[ japanese ] = "��͐��_";
-    Text[ korean ] = "����";
-    Text[ chinese_simplified ] = "����";
-    Text[ chinese_traditional ] = "�Ӫ�";
+    Text[ japanese ] = "銀河星雲";
+    Text[ korean ] = "우주";
+    Text[ chinese_simplified ] = "宇宙";
+    Text[ chinese_traditional ] = "太空";
     Text[ arabic ] = "������";
     Text[ turkish ] = "Uzay";
-    Text[ catalan ] = "Espacio";
+    Text[ catalan ] = "Espai";
     Text[ finnish ] = "Avaruus";
+    Text[ thai ] = "อวกาศ";
 };
 String RID_SVXSTR_BMP6
 {
@@ -4143,14 +4281,15 @@ String RID_SVXSTR_BMP6
     Text[ swedish ] = "Metall";
     Text[ polish ] = "Metal";
     Text[ portuguese_brazilian ] = "Wet";
-    Text[ japanese ] = "�‚Ԃ‚Ԃ�����";
-    Text[ korean ] = "�ݼ�";
-    Text[ chinese_simplified ] = "����";
-    Text[ chinese_traditional ] = "����";
+    Text[ japanese ] = "つぶつぶした面";
+    Text[ korean ] = "금속";
+    Text[ chinese_simplified ] = "金属";
+    Text[ chinese_traditional ] = "金屬";
     Text[ arabic ] = "����";
     Text[ turkish ] = "Metal";
-    Text[ catalan ] = "Metal";
+    Text[ catalan ] = "Metall";
     Text[ finnish ] = "Metalli";
+    Text[ thai ] = "โลหะ";
 };
 String RID_SVXSTR_BMP7
 {
@@ -4162,20 +4301,21 @@ String RID_SVXSTR_BMP7
     Text[ greek ] = "��������";
     Text[ dutch ] = "Druppels";
     Text[ french ] = "Gouttelettes";
-    Text[ spanish ] = "Gotear";
+    Text[ spanish ] = "Gotas";
     Text[ italian ] = "Gocce";
     Text[ danish ] = "Dr�ber";
     Text[ swedish ] = "Droppar";
     Text[ polish ] = "Krople";
     Text[ portuguese_brazilian ] = "Marble";
-    Text[ japanese ] = "������";
-    Text[ korean ] = "���Ѹ���";
-    Text[ chinese_simplified ] = "ˮ��";
-    Text[ chinese_traditional ] = "���w";
+    Text[ japanese ] = "しずく";
+    Text[ korean ] = "물방울";
+    Text[ chinese_simplified ] = "水滴";
+    Text[ chinese_traditional ] = "水滴";
     Text[ arabic ] = "�����";
     Text[ turkish ] = "Damla";
-    Text[ catalan ] = "Gota";
+    Text[ catalan ] = "Gotetes";
     Text[ finnish ] = "Pisarat";
+    Text[ thai ] = "หยดนิดเดียว";
 };
 String RID_SVXSTR_BMP8
 {
@@ -4193,14 +4333,15 @@ String RID_SVXSTR_BMP8
     Text[ swedish ] = "Marmor";
     Text[ polish ] = "Marmur";
     Text[ portuguese_brazilian ] = "Linen";
-    Text[ japanese ] = "���嗝��";
-    Text[ korean ] = "�븮��";
-    Text[ chinese_simplified ] = "����ʯ";
-    Text[ chinese_traditional ] = "�j�z��";
+    Text[ japanese ] = "白大理石";
+    Text[ korean ] = "대리석";
+    Text[ chinese_simplified ] = "大理石";
+    Text[ chinese_traditional ] = "大理石";
     Text[ arabic ] = "����";
     Text[ turkish ] = "Mermer";
-    Text[ catalan ] = "M�rmol";
+    Text[ catalan ] = "Marbre";
     Text[ finnish ] = "Marmori";
+    Text[ thai ] = "หินอ่อน";
 };
 String RID_SVXSTR_BMP9
 {
@@ -4208,7 +4349,7 @@ String RID_SVXSTR_BMP9
     Text [ ENGLISH ] = "Linen";
     Text [ english_us ] = "Linen";
     Text[ portuguese ] = "Linho";
-    Text[ russian ] = "���";
+    Text[ russian ] = "�������";
     Text[ greek ] = "����";
     Text[ dutch ] = "Linnen";
     Text[ french ] = "Lin";
@@ -4218,14 +4359,15 @@ String RID_SVXSTR_BMP9
     Text[ swedish ] = "Linne";
     Text[ polish ] = "Len";
     Text[ portuguese_brazilian ] = "Stone";
-    Text[ japanese ] = "��ݒn";
-    Text[ korean ] = "�Ƹ���";
-    Text[ chinese_simplified ] = "�鲼";
-    Text[ chinese_traditional ] = "�ȳ�";
+    Text[ japanese ] = "リネン地";
+    Text[ korean ] = "아마포";
+    Text[ chinese_simplified ] = "麻布";
+    Text[ chinese_traditional ] = "亞麻";
     Text[ arabic ] = "�����";
     Text[ turkish ] = "Keten";
-    Text[ catalan ] = "Lino";
+    Text[ catalan ] = "Lli";
     Text[ finnish ] = "Pellava";
+    Text[ thai ] = "ลินิน";
 };
 String RID_SVXSTR_BMP10
 {
@@ -4243,14 +4385,15 @@ String RID_SVXSTR_BMP10
     Text[ swedish ] = "Sten";
     Text[ polish ] = "Kamie�";
     Text[ portuguese_brazilian ] = "Quicksilver";
-    Text[ japanese ] = "�ԛ���";
-    Text[ korean ] = "��";
-    Text[ chinese_simplified ] = "ʯ��";
-    Text[ chinese_traditional ] = "���Y";
+    Text[ japanese ] = "花崗岩";
+    Text[ korean ] = "돌";
+    Text[ chinese_simplified ] = "石碑";
+    Text[ chinese_traditional ] = "石頭";
     Text[ arabic ] = "���";
     Text[ turkish ] = "Ta�";
-    Text[ catalan ] = "Piedra";
+    Text[ catalan ] = "Pedra";
     Text[ finnish ] = "Kivi";
+    Text[ thai ] = "หิน";
 };
 String RID_SVXSTR_BMP11
 {
@@ -4268,14 +4411,15 @@ String RID_SVXSTR_BMP11
     Text[ swedish ] = "Makadam";
     Text[ polish ] = "�wir";
     Text[ portuguese_brazilian ] = "Pebbles";
-    Text[ japanese ] = "������";
-    Text[ korean ] = "�ڰ�";
-    Text[ chinese_simplified ] = "��ʯ";
-    Text[ chinese_traditional ] = "�H��";
+    Text[ japanese ] = "砂利道";
+    Text[ korean ] = "자갈";
+    Text[ chinese_simplified ] = "碎石";
+    Text[ chinese_traditional ] = "碎石";
     Text[ arabic ] = "���";
     Text[ turkish ] = "�ak�l";
     Text[ catalan ] = "Grava";
     Text[ finnish ] = "Sora";
+    Text[ thai ] = "กรวด";
 };
 String RID_SVXSTR_BMP12
 {
@@ -4283,7 +4427,7 @@ String RID_SVXSTR_BMP12
     Text [ ENGLISH ] = "Wall";
     Text [ english_us ] = "Wall";
     Text[ portuguese ] = "Parede";
-    Text[ russian ] = "�������� �����";
+    Text[ russian ] = "�����";
     Text[ greek ] = "������";
     Text[ dutch ] = "Muur";
     Text[ french ] = "Muraille";
@@ -4293,14 +4437,15 @@ String RID_SVXSTR_BMP12
     Text[ swedish ] = "Mur";
     Text[ polish ] = "Mur";
     Text[ portuguese_brazilian ] = "Wall";
-    Text[ japanese ] = "�Ί_";
-    Text[ korean ] = "��";
-    Text[ chinese_simplified ] = "ǽ";
-    Text[ chinese_traditional ] = "��";
+    Text[ japanese ] = "石垣";
+    Text[ korean ] = "벽";
+    Text[ chinese_simplified ] = "墙";
+    Text[ chinese_traditional ] = "牆";
     Text[ arabic ] = "���";
     Text[ turkish ] = "Duvar";
-    Text[ catalan ] = "Muralla";
+    Text[ catalan ] = "Mur";
     Text[ finnish ] = "Sein�";
+    Text[ thai ] = "ผนัง";
 };
 String RID_SVXSTR_BMP13
 {
@@ -4308,7 +4453,7 @@ String RID_SVXSTR_BMP13
     Text [ ENGLISH ] = "Brownstone";
     Text [ english_us ] = "Brownstone";
     Text[ portuguese ] = "Tijolos";
-    Text[ russian ] = "�������";
+    Text[ russian ] = "������";
     Text[ greek ] = "�������� ������";
     Text[ dutch ] = "Bakstenen";
     Text[ french ] = "Briques";
@@ -4318,14 +4463,15 @@ String RID_SVXSTR_BMP13
     Text[ swedish ] = "Tegelstenar";
     Text[ polish ] = "Ceg�y";
     Text[ portuguese_brazilian ] = "Brownstone";
-    Text[ japanese ] = "��񂪕�";
-    Text[ korean ] = "����";
-    Text[ chinese_simplified ] = "��שǽ";
-    Text[ chinese_traditional ] = "�j��";
+    Text[ japanese ] = "れんが塀";
+    Text[ korean ] = "벽돌";
+    Text[ chinese_simplified ] = "红砖墙";
+    Text[ chinese_traditional ] = "磚石";
     Text[ arabic ] = "����� ���";
     Text[ turkish ] = "Tu�la";
-    Text[ catalan ] = "Ladrillo";
+    Text[ catalan ] = "Totxo";
     Text[ finnish ] = "Tiilenruskea";
+    Text[ thai ] = "หินสีน้ำตาล";
 };
 String RID_SVXSTR_BMP14
 {
@@ -4333,7 +4479,7 @@ String RID_SVXSTR_BMP14
     Text [ ENGLISH ] = "Pattern";
     Text [ english_us ] = "Netting";
     Text[ portuguese ] = "Rede";
-    Text[ russian ] = "�������";
+    Text[ russian ] = "����";
     Text[ greek ] = "������";
     Text[ dutch ] = "Vlechtwerk";
     Text[ french ] = "Tresses";
@@ -4343,14 +4489,15 @@ String RID_SVXSTR_BMP14
     Text[ swedish ] = "Fl�tverk";
     Text[ polish ] = "Plecionka";
     Text[ portuguese_brazilian ] = "Pattern";
-    Text[ japanese ] = "���D��";
-    Text[ korean ] = "������";
-    Text[ chinese_simplified ] = "��֯��";
-    Text[ chinese_traditional ] = "�s´��";
+    Text[ japanese ] = "麻織物";
+    Text[ korean ] = "엮어짐";
+    Text[ chinese_simplified ] = "编织物";
+    Text[ chinese_traditional ] = "編織物";
     Text[ arabic ] = "����";
     Text[ turkish ] = "Has�r";
     Text[ catalan ] = "Malla";
     Text[ finnish ] = "Verkko";
+    Text[ thai ] = "ตาข่าย";
 };
 String RID_SVXSTR_BMP15
 {
@@ -4368,14 +4515,15 @@ String RID_SVXSTR_BMP15
     Text[ swedish ] = "L�v";
     Text[ polish ] = "Li�cie";
     Text[ portuguese_brazilian ] = "Leaves";
-    Text[ japanese ] = "��";
-    Text[ korean ] = "������";
-    Text[ chinese_simplified ] = "��Ҷ";
-    Text[ chinese_traditional ] = "��";
+    Text[ japanese ] = "蔦";
+    Text[ korean ] = "나뭇잎";
+    Text[ chinese_simplified ] = "树叶";
+    Text[ chinese_traditional ] = "樹葉";
     Text[ arabic ] = "��� �����";
     Text[ turkish ] = "Yapraklar";
-    Text[ catalan ] = "Follaje";
+    Text[ catalan ] = "Fulles";
     Text[ finnish ] = "Lehdet";
+    Text[ thai ] = "ใบไม้";
 };
 String RID_SVXSTR_BMP16
 {
@@ -4383,7 +4531,7 @@ String RID_SVXSTR_BMP16
     Text [ ENGLISH ] = "Artificial Lawn";
     Text [ english_us ] = "Artificial Turf";
     Text[ portuguese ] = "Relva artificial";
-    Text[ russian ] = "������������� �������� ��������";
+    Text[ russian ] = "������������� ����";
     Text[ greek ] = "�������� ������������";
     Text[ dutch ] = "Kunstgras";
     Text[ french ] = "Gazon artificiel";
@@ -4393,14 +4541,15 @@ String RID_SVXSTR_BMP16
     Text[ swedish ] = "Konstgjord gr�smatta";
     Text[ polish ] = "Sztuczny trawnik";
     Text[ portuguese_brazilian ] = "Artificial Lawn";
-    Text[ japanese ] = "�l�H�Ő�";
-    Text[ korean ] = "�ΰ��ܵ�";
-    Text[ chinese_simplified ] = "����ݵ�";
-    Text[ chinese_traditional ] = "�H�y��a";
+    Text[ japanese ] = "人工芝生";
+    Text[ korean ] = "인공잔디";
+    Text[ chinese_simplified ] = "人造草地";
+    Text[ chinese_traditional ] = "人造草地";
     Text[ arabic ] = "���� �����";
     Text[ turkish ] = "Yapay �im";
-    Text[ catalan ] = "C�sped sint�tico";
+    Text[ catalan ] = "Gespa artificial";
     Text[ finnish ] = "Keinonurmi";
+    Text[ thai ] = "หญ้าเทียม";
 };
 String RID_SVXSTR_BMP17
 {
@@ -4418,14 +4567,15 @@ String RID_SVXSTR_BMP17
     Text[ swedish ] = "Tusensk�nor";
     Text[ polish ] = "Kacze�ce";
     Text[ portuguese_brazilian ] = "Daisy";
-    Text[ japanese ] = "�ް�ް";
-    Text[ korean ] = "��������";
-    Text[ chinese_simplified ] = "����";
-    Text[ chinese_traditional ] = "����";
+    Text[ japanese ] = "デージー";
+    Text[ korean ] = "데이지꽃";
+    Text[ chinese_simplified ] = "雏菊";
+    Text[ chinese_traditional ] = "雛菊";
     Text[ arabic ] = "���� ������";
     Text[ turkish ] = "Papatya";
-    Text[ catalan ] = "Margarita";
+    Text[ catalan ] = "Margarida";
     Text[ finnish ] = "P�iv�nkakkara";
+    Text[ thai ] = "เดซี่";
 };
 String RID_SVXSTR_BMP18
 {
@@ -4443,14 +4593,15 @@ String RID_SVXSTR_BMP18
     Text[ swedish ] = "Orange";
     Text[ polish ] = "Pomara�czowy";
     Text[ portuguese_brazilian ] = "Orange";
-    Text[ japanese ] = "��ݼ�";
-    Text[ korean ] = "������";
-    Text[ chinese_simplified ] = "�̽�";
-    Text[ chinese_traditional ] = "����";
+    Text[ japanese ] = "オレンジ";
+    Text[ korean ] = "주황색";
+    Text[ chinese_simplified ] = "橙色";
+    Text[ chinese_traditional ] = "橙色";
     Text[ arabic ] = "�������";
     Text[ turkish ] = "Turuncu";
-    Text[ catalan ] = "Naranja";
+    Text[ catalan ] = "Taronja";
     Text[ finnish ] = "Oranssi";
+    Text[ thai ] = "ส้ม";
 };
 String RID_SVXSTR_BMP19
 {
@@ -4468,14 +4619,15 @@ String RID_SVXSTR_BMP19
     Text[ swedish ] = "Eldig";
     Text[ polish ] = "Ognisty";
     Text[ portuguese_brazilian ] = "Fiery";
-    Text[ japanese ] = "�ܔM";
-    Text[ korean ] = "�Ҳ�";
-    Text[ chinese_simplified ] = "����";
-    Text[ chinese_traditional ] = "������";
+    Text[ japanese ] = "灼熱";
+    Text[ korean ] = "불꽃";
+    Text[ chinese_simplified ] = "火焰";
+    Text[ chinese_traditional ] = "火紅色";
     Text[ arabic ] = "����";
     Text[ turkish ] = "Ate�";
-    Text[ catalan ] = "Fogoso";
+    Text[ catalan ] = "Fog�s";
     Text[ finnish ] = "Tulinen";
+    Text[ thai ] = "เพลิง";
 };
 String RID_SVXSTR_BMP20
 {
@@ -4493,14 +4645,15 @@ String RID_SVXSTR_BMP20
     Text[ swedish ] = "Rosor";
     Text[ polish ] = "R�e";
     Text[ portuguese_brazilian ] = "Roses";
-    Text[ japanese ] = "�^���Ԃ����";
-    Text[ korean ] = "���";
-    Text[ chinese_simplified ] = "õ��";
-    Text[ chinese_traditional ] = "����";
+    Text[ japanese ] = "真っ赤なバラ";
+    Text[ korean ] = "장미";
+    Text[ chinese_simplified ] = "玫瑰";
+    Text[ chinese_traditional ] = "玫瑰";
     Text[ arabic ] = "���";
     Text[ turkish ] = "G�l";
-    Text[ catalan ] = "Rosas";
+    Text[ catalan ] = "Roses";
     Text[ finnish ] = "Ruusut";
+    Text[ thai ] = "กุหลาบ";
 };
 
 String RID_SVXSTR_BMP21
@@ -4509,24 +4662,25 @@ String RID_SVXSTR_BMP21
     Text [ ENGLISH ] = "Bitmap";
     Text [ english_us ] = "Bitmap";
     Text[ portuguese ] = "Bitmap";
-    Text[ russian ] = "Bitmap";
+    Text[ russian ] = "�����";
     Text[ greek ] = "Bitmap";
     Text[ dutch ] = "Bitmap";
     Text[ french ] = "Bitmap";
     Text[ spanish ] = "Bitmap";
     Text[ italian ] = "Bitmap";
-    Text[ danish ] = "Til bitmap";
+    Text[ danish ] = "Bitmap";
     Text[ swedish ] = "Bitmap";
     Text[ polish ] = "Mapa bitowa";
     Text[ portuguese_brazilian ] = "Bitmap";
-    Text[ japanese ] = "�ޯ�ϯ��";
-    Text[ korean ] = "��Ʈ��";
-    Text[ chinese_simplified ] = "λͼ";
-    Text[ chinese_traditional ] = "�I�}��";
+    Text[ japanese ] = "ビットマップ";
+    Text[ korean ] = "비트맵";
+    Text[ chinese_simplified ] = "位图";
+    Text[ chinese_traditional ] = "點陣圖";
     Text[ turkish ] = "Bit e�lem";
     Text[ arabic ] = "���� �����";
-    Text[ catalan ] = "Bitmap";
+    Text[ catalan ] = "Mapa de bits";
     Text[ finnish ] = "Bittikartta";
+    Text[ thai ] = "บิทแม็ป";
 };
 ///////////////////////////////////////////////////////////////////////////////
 //
@@ -4600,9 +4754,9 @@ String RID_SVXSTR_DASH0
     Text [ ENGLISH ] = "Ultrafine Dashed";
     Text [ english_us ] = "Ultrafine dashed";
     Text[ portuguese ] = "Tracejado ultrafino";
-    Text[ russian ] = "����������� ����������";
+    Text[ russian ] = "����������� �����";
     Text[ greek ] = "������������ (���� �����)";
-    Text[ dutch ] = "Ultrafijne streepjes";
+    Text[ dutch ] = "Extra fijne streepjes";
     Text[ french ] = "Tirets ultrafins";
     Text[ spanish ] = "Trazos ultrafinos";
     Text[ italian ] = "A tratti finissimi";
@@ -4610,14 +4764,15 @@ String RID_SVXSTR_DASH0
     Text[ swedish ] = "Mycket fint streckad";
     Text[ polish ] = "Bardzo cienkie kreski";
     Text[ portuguese_brazilian ] = "Ultrafine Dashed";
-    Text[ japanese ] = "�ɍׂ̔j��";
-    Text[ korean ] = "���� ���� ���";
-    Text[ chinese_simplified ] = "��ϸ����";
-    Text[ chinese_traditional ] = "�W���I���u";
+    Text[ japanese ] = "極細の破線";
+    Text[ korean ] = "미세한 파선";
+    Text[ chinese_simplified ] = "超细划线";
+    Text[ chinese_traditional ] = "超細點劃線";
     Text[ arabic ] = "���� ����� ����";
     Text[ turkish ] = "�ok ince kesik �izgili";
-    Text[ catalan ] = "Trazos ultrafinos";
+    Text[ catalan ] = "Tra�os molt fins";
     Text[ finnish ] = "Hyvin ohut katkoviiva";
+    Text[ thai ] = "เส้นประที่บางมาก";
 };
 String RID_SVXSTR_DASH1
 {
@@ -4625,9 +4780,9 @@ String RID_SVXSTR_DASH1
     Text [ ENGLISH ] = "Fine Dashed";
     Text [ english_us ] = "Fine dashed";
     Text[ portuguese ] = "Tracejado fino";
-    Text[ russian ] = "������ ����������";
+    Text[ russian ] = "������ �����";
     Text[ greek ] = "������������ (�����)";
-    Text[ dutch ] = "Fijne streepjes";
+    Text[ dutch ] = "Streepjes";
     Text[ french ] = "Tirets fins";
     Text[ spanish ] = "Trazos finos";
     Text[ italian ] = "A tratti fini";
@@ -4635,14 +4790,15 @@ String RID_SVXSTR_DASH1
     Text[ swedish ] = "Fint streckad";
     Text[ polish ] = "Cienkie kreski";
     Text[ portuguese_brazilian ] = "Fine Dashed";
-    Text[ japanese ] = "�ׂ����j��";
-    Text[ korean ] = "���� ���";
-    Text[ chinese_simplified ] = "ϸ����";
-    Text[ chinese_traditional ] = "���I���u";
+    Text[ japanese ] = "細かい破線";
+    Text[ korean ] = "섬세한 파선";
+    Text[ chinese_simplified ] = "细划线";
+    Text[ chinese_traditional ] = "細點劃線";
     Text[ arabic ] = "���� �����";
     Text[ turkish ] = "�nce kesik �izgili";
-    Text[ catalan ] = "Trazos finos";
+    Text[ catalan ] = "Tra�os fins";
     Text[ finnish ] = "Ohut katkoviiva";
+    Text[ thai ] = "เส้นประบาง";
 };
 String RID_SVXSTR_DASH2
 {
@@ -4652,7 +4808,7 @@ String RID_SVXSTR_DASH2
     Text[ portuguese ] = "3 tra�os 2 pontos ultrafino";
     Text[ russian ] = "����������� 2 ����� 3 ������";
     Text[ greek ] = "2 ������� - 3 ������ (���� ������)";
-    Text[ dutch ] = "Ultrafijn 2 puntjes 3 streepjes";
+    Text[ dutch ] = "Extra fijn 2 puntjes 3 streepjes";
     Text[ french ] = "Ultrafine 2 points 3 traits";
     Text[ spanish ] = "Ultrafino 2 puntos 2 trazos";
     Text[ italian ] = "A 2 punti 3 linee finissimi";
@@ -4660,14 +4816,15 @@ String RID_SVXSTR_DASH2
     Text[ swedish ] = "Mycket fint 2 prickar 3 streck";
     Text[ polish ] = "Bardzo cienkie 2 kropki 3 kreski";
     Text[ portuguese_brazilian ] = "Ultrafine 2 Dots 3 Dashes";
-    Text[ japanese ] = "�ɍׂ̓�_�O�j��";
-    Text[ korean ] = "�̼��� 2 ���� 3 ���";
-    Text[ chinese_simplified ] = "��ϸ2��3����";
-    Text[ chinese_traditional ] = "�W�Ө��I�T�E�u";
+    Text[ japanese ] = "極細の二点三破線";
+    Text[ korean ] = "섬세한 2점 3파선";
+    Text[ chinese_simplified ] = "超细2点3划线";
+    Text[ chinese_traditional ] = "超細兩點三劃線";
     Text[ arabic ] = "2 ���� 3 ��ء ����� ����";
     Text[ turkish ] = "�ok ince 2 nokta 3 �izgi";
-    Text[ catalan ] = "Ultrafino 2 puntos 2 trazos";
+    Text[ catalan ] = "Ultraf� 2 punts 2 tra�os";
     Text[ finnish ] = "Hyvin ohut, 2 pistett�, 3 katkoviivaa";
+    Text[ thai ] = "เส้นประ 2 จุด 3 ขีดที่บางมาก";
 };
 String RID_SVXSTR_DASH3
 {
@@ -4675,7 +4832,7 @@ String RID_SVXSTR_DASH3
     Text [ ENGLISH ] = "Fine Dotted";
     Text [ english_us ] = "Fine dotted";
     Text[ portuguese ] = "Pontilhado fino";
-    Text[ russian ] = "������ �����";
+    Text[ russian ] = "������ ������� 1";
     Text[ greek ] = "����� ���������";
     Text[ dutch ] = "Fijn gestippeld";
     Text[ french ] = "Fine pointill�e";
@@ -4685,14 +4842,15 @@ String RID_SVXSTR_DASH3
     Text[ swedish ] = "Fint prickig";
     Text[ polish ] = "Delikatne kropki";
     Text[ portuguese_brazilian ] = "Fine Dotted";
-    Text[ japanese ] = "�ׂ����_��";
-    Text[ korean ] = "���� ��";
-    Text[ chinese_simplified ] = "ϸ����";
-    Text[ chinese_traditional ] = "���I";
+    Text[ japanese ] = "細かい点線";
+    Text[ korean ] = "여린 점선";
+    Text[ chinese_simplified ] = "细点线";
+    Text[ chinese_traditional ] = "細點";
     Text[ arabic ] = "���� �����";
     Text[ turkish ] = "�nce noktal�";
-    Text[ catalan ] = "Punteado fino";
+    Text[ catalan ] = "Amb puntejat fi";
     Text[ finnish ] = "Pienet pisteet";
+    Text[ thai ] = "จุดบาง";
 };
 String RID_SVXSTR_DASH4
 {
@@ -4700,7 +4858,7 @@ String RID_SVXSTR_DASH4
     Text [ ENGLISH ] = "Line with Fine Dots";
     Text [ english_us ] = "Line with fine dots";
     Text[ portuguese ] = "Tra�o com pontos finos";
-    Text[ russian ] = "����� � ������� �������";
+    Text[ russian ] = "����� � ������ ���������";
     Text[ greek ] = "������ �� ������ �������";
     Text[ dutch ] = "Lijn met fijne puntjes";
     Text[ french ] = "Trait avec des points fins";
@@ -4710,14 +4868,15 @@ String RID_SVXSTR_DASH4
     Text[ swedish ] = "Streck med fina prickar";
     Text[ polish ] = "Kreski z delikatnymi kropkami";
     Text[ portuguese_brazilian ] = "Line with Fine Dots";
-    Text[ japanese ] = "�ׂ����_�̏W�܂�����";
-    Text[ korean ] = "���� ������ �� ��";
-    Text[ chinese_simplified ] = "ϸ�㻮��";
-    Text[ chinese_traditional ] = "���I�u��";
+    Text[ japanese ] = "細かい点の集まった線";
+    Text[ korean ] = "섬세한 점선";
+    Text[ chinese_simplified ] = "细点划线";
+    Text[ chinese_traditional ] = "細點線條";
     Text[ arabic ] = "�� �� ���� �����";
     Text[ turkish ] = "�nce noktal� �izgi";
-    Text[ catalan ] = "Trazo con puntos finos";
+    Text[ catalan ] = "Tra� amb punts fins";
     Text[ finnish ] = "Viiva pienill� pisteill�";
+    Text[ thai ] = "เส้นเป็นจุดบาง";
 };
 String RID_SVXSTR_DASH5
 {
@@ -4725,9 +4884,9 @@ String RID_SVXSTR_DASH5
     Text [ ENGLISH ] = "Fine Dashed (var)";
     Text [ english_us ] = "Fine dashed (variable)";
     Text[ portuguese ] = "Tracejado fino (vari�vel)";
-    Text[ russian ] = "������ ���������� (���.)";
+    Text[ russian ] = "������ ������� 2";
     Text[ greek ] = "������������ ����� (���������)";
-    Text[ dutch ] = "Fijne streepjes (variabel)";
+    Text[ dutch ] = "Streepjes (variabel)";
     Text[ french ] = "Tirets fins (variable)";
     Text[ spanish ] = "Trazos finos (variable)";
     Text[ italian ] = "A tratti fini (var)";
@@ -4735,14 +4894,15 @@ String RID_SVXSTR_DASH5
     Text[ swedish ] = "Fint streckad (variabel)";
     Text[ polish ] = "Cienkie kreski (zmienne)";
     Text[ portuguese_brazilian ] = "Fine Dashed (var)";
-    Text[ japanese ] = "�ׂ����j��(�•�)";
-    Text[ korean ] = "���� ���(������)";
-    Text[ chinese_simplified ] = "ϸ���� (�ɱ�)";
-    Text[ chinese_traditional ] = "���I���u(�i��)";
+    Text[ japanese ] = "細かい破線(可変)";
+    Text[ korean ] = "섬세한 파선(가변)";
+    Text[ chinese_simplified ] = "细划线 (可变)";
+    Text[ chinese_traditional ] = "細點劃線(可變)";
     Text[ arabic ] = "���� ����� (������)";
     Text[ turkish ] = "�nce kesik �izgili (de�i�ken)";
-    Text[ catalan ] = "Trazos finos (variable)";
+    Text[ catalan ] = "Tra�os fins (variable)";
     Text[ finnish ] = "Pienet katkoviivat (muuttuja)";
+    Text[ thai ] = "เส้นประบาง (ตัวแปร)";
 };
 String RID_SVXSTR_DASH6
 {
@@ -4750,7 +4910,7 @@ String RID_SVXSTR_DASH6
     Text [ ENGLISH ] = "3 Dashes 3 Dots (var)";
     Text [ english_us ] = "3 dashes 3 dots (variable)";
     Text[ portuguese ] = "3 tra�os 3 pontos (vari�vel)";
-    Text[ russian ] = "3 ������ 3 ����� (���.)";
+    Text[ russian ] = "3 ������ 3 �����";
     Text[ greek ] = "3 ������ - 3 ������� (���������)";
     Text[ dutch ] = "3 streepjes 3 puntjes (variabel)";
     Text[ french ] = "3 traits 3 points (variable)";
@@ -4760,14 +4920,15 @@ String RID_SVXSTR_DASH6
     Text[ swedish ] = "3 streck 3 prickar (variabel)";
     Text[ polish ] = "3 kreski 3 kropki (zmienne)";
     Text[ portuguese_brazilian ] = "3 Dashes 3 Dots (var)";
-    Text[ japanese ] = "�O�j���O�_����(�•�)";
-    Text[ korean ] = "3 ��� 3 �� (������)";
-    Text[ chinese_simplified ] = "3 �� 3 �� (�ɱ�)";
-    Text[ chinese_traditional ] = "3 �E�u 3 �I(�i��)";
+    Text[ japanese ] = "三破線三点鎖線(可変)";
+    Text[ korean ] = "삼파선 삼점 쇄선(가변)";
+    Text[ chinese_simplified ] = "3 划 3 点 (可变)";
+    Text[ chinese_traditional ] = "3 劃線 3 點(可變)";
     Text[ arabic ] = "3 ���� 3 ���� (������)";
     Text[ turkish ] = "3 �izgi 3 nokta (de�i�ken)";
-    Text[ catalan ] = "3 trazos 3 puntos (variable)";
+    Text[ catalan ] = "3 tra�os 3 punts (variable)";
     Text[ finnish ] = "3 katkoviivaa, 3 pistett� (muuttuja)";
+    Text[ thai ] = "3 ขีด 3 จุด (ตัวแปร)";
 };
 String RID_SVXSTR_DASH7
 {
@@ -4775,9 +4936,9 @@ String RID_SVXSTR_DASH7
     Text [ ENGLISH ] = "Ultrafine Dotted (var)";
     Text [ english_us ] = "Ultrafine dotted (variable)";
     Text[ portuguese ] = "Pontilhado ultrafino (vari�vel)";
-    Text[ russian ] = "������ ����� (���.)";
+    Text[ russian ] = "����������� �������";
     Text[ greek ] = "���� ����� ��������� (���������)";
-    Text[ dutch ] = "Ultrafijn gestippeld (variabel)";
+    Text[ dutch ] = "Extra fijn gestippeld (variabel)";
     Text[ french ] = "Ultrafine pointill�e (variable)";
     Text[ spanish ] = "Punteado ultrafino (variable)";
     Text[ italian ] = "A punti finissimi (var)";
@@ -4785,14 +4946,15 @@ String RID_SVXSTR_DASH7
     Text[ swedish ] = "Mycket fint prickig (variabel)";
     Text[ polish ] = "Bardzo delikatne kropki (zmienne)";
     Text[ portuguese_brazilian ] = "Ultrafine Dotted (var)";
-    Text[ japanese ] = "�ɍׂ̓_��(�•�)";
-    Text[ korean ] = "�̼��� ��(������)";
-    Text[ chinese_simplified ] = "��ϸ���� (�ɱ�)";
-    Text[ chinese_traditional ] = "�W���I(�i��)";
+    Text[ japanese ] = "極細の点線(可変)";
+    Text[ korean ] = "미세한 점선(가변)";
+    Text[ chinese_simplified ] = "超细点线 (可变)";
+    Text[ chinese_traditional ] = "超細點(可變)";
     Text[ arabic ] = "���� ����� ���� (������)";
     Text[ turkish ] = "�ok ince noktal� (de�i�ken)";
-    Text[ catalan ] = "Punteado ultrafino (variable)";
-    Text[ finnish ] = "Hyvin ohuet pisteet (muuttuja)";
+    Text[ catalan ] = "Puntejat molt fi (variable)";
+    Text[ finnish ] = "Hyvin ohut pisteviiva (muuttuja)";
+    Text[ thai ] = "จุดบางมาก(ตัวแปร)";
 };
 String RID_SVXSTR_DASH8
 {
@@ -4800,7 +4962,7 @@ String RID_SVXSTR_DASH8
     Text [ ENGLISH ] = "Line Style 9";
     Text [ english_us ] = "Line style 9";
     Text[ portuguese ] = "Estilo de linha 9";
-    Text[ russian ] = "����� ������ 9";
+    Text[ russian ] = "����� ����� 9";
     Text[ greek ] = "���� ������� 9";
     Text[ dutch ] = "Lijntype 9";
     Text[ french ] = "Style de ligne 9";
@@ -4810,14 +4972,15 @@ String RID_SVXSTR_DASH8
     Text[ swedish ] = "Linjestil 9";
     Text[ polish ] = "Styl linii 9";
     Text[ portuguese_brazilian ] = "Line Style 9";
-    Text[ japanese ] = "���̽��� 9";
-    Text[ korean ] = "�� ���� 9";
-    Text[ chinese_simplified ] = "����ʽ�� 9";
-    Text[ chinese_traditional ] = "�u������ 9";
+    Text[ japanese ] = "線スタイル 9";
+    Text[ korean ] = "선 스타일 9";
+    Text[ chinese_simplified ] = "线条式样 9";
+    Text[ chinese_traditional ] = "線條式樣 9";
     Text[ arabic ] = "��� ���� 9";
     Text[ turkish ] = "�izgi bi�imi 9";
-    Text[ catalan ] = "Estilo de l�nea 9";
+    Text[ catalan ] = "Estil de l�nia 9";
     Text[ finnish ] = "Viivatyyli 9";
+    Text[ thai ] = "เส้นลักษณะที่ 9";
 };
 String RID_SVXSTR_DASH9
 {
@@ -4835,14 +4998,15 @@ String RID_SVXSTR_DASH9
     Text[ swedish ] = "2 prickar 1 streck";
     Text[ polish ] = "2 kropki 1 kreska";
     Text[ portuguese_brazilian ] = "2 Dots 1 Dash";
-    Text[ japanese ] = "��_����";
-    Text[ korean ] = "2 �� 1 ���";
-    Text[ chinese_simplified ] = "2 �� 1 ��";
-    Text[ chinese_traditional ] = "2 �I 1 �E�u";
+    Text[ japanese ] = "二点鎖線";
+    Text[ korean ] = "이점 쇄선";
+    Text[ chinese_simplified ] = "2 点 1 划";
+    Text[ chinese_traditional ] = "2 點 1 劃線";
     Text[ arabic ] = "2 ���� 1 ����";
     Text[ turkish ] = "2 nokta 1 �izgi";
-    Text[ catalan ] = "2 puntos 1 trazo";
+    Text[ catalan ] = "2 punts 1 tra�";
     Text[ finnish ] = "2 pistett�, 1 katkoviiva";
+    Text[ thai ] = "2 จุด 1 ขีด";
 };
 String RID_SVXSTR_DASH10
 {
@@ -4850,7 +5014,7 @@ String RID_SVXSTR_DASH10
     Text [ ENGLISH ] = "Dashed (var)";
     Text [ english_us ] = "Dashed (variable)";
     Text[ portuguese ] = "Pontilhado (vari�vel)";
-    Text[ russian ] = "���������� (���.)";
+    Text[ russian ] = "������� 2";
     Text[ greek ] = "������������ (���������)";
     Text[ dutch ] = "Streepjes (variabel)";
     Text[ french ] = "Tirets (variable)";
@@ -4860,14 +5024,15 @@ String RID_SVXSTR_DASH10
     Text[ swedish ] = "Streckad (variabel)";
     Text[ polish ] = "Kreski (zmienne)";
     Text[ portuguese_brazilian ] = "Dashed (var)";
-    Text[ japanese ] = "�j��(�•�)";
-    Text[ korean ] = "��� (������)";
-    Text[ chinese_simplified ] = "���� (�ɱ�)";
-    Text[ chinese_traditional ] = "�I���u(�i��)";
+    Text[ japanese ] = "破線(可変)";
+    Text[ korean ] = "파선(가변)";
+    Text[ chinese_simplified ] = "划线 (可变)";
+    Text[ chinese_traditional ] = "點劃線(可變)";
     Text[ arabic ] = "���� (������)";
     Text[ turkish ] = "Kesik �izgili (de�i�ken)";
-    Text[ catalan ] = "Trazos (variable)";
+    Text[ catalan ] = "Tra�os (variable)";
     Text[ finnish ] = "Katkoviiva (muuttuja)";
+    Text[ thai ] = "เส้นประ (ตัวแปร)";
 };
 String RID_SVXSTR_DASH11
 {
@@ -4875,24 +5040,25 @@ String RID_SVXSTR_DASH11
     Text [ ENGLISH ] = "Dashed";
     Text [ english_us ] = "Dashed";
     Text[ portuguese ] = "Tracejado";
-    Text[ russian ] = "����������";
+    Text[ russian ] = "������� 1";
     Text[ greek ] = "������������";
-    Text[ dutch ] = "Fijne streepjes";
+    Text[ dutch ] = "Streepjes";
     Text[ french ] = "Tirets";
     Text[ spanish ] = "Trazos";
     Text[ italian ] = "A tratti";
-    Text[ danish ] = "Dashed";
+    Text[ danish ] = "Stiplet";
     Text[ swedish ] = "Streckat";
     Text[ polish ] = "Kreski";
     Text[ portuguese_brazilian ] = "Dashed";
-    Text[ japanese ] = "�j����";
-    Text[ korean ] = "���";
-    Text[ chinese_simplified ] = "���ۺ�";
-    Text[ chinese_traditional ] = "�}�鸹";
+    Text[ japanese ] = "破線状";
+    Text[ korean ] = "파선";
+    Text[ chinese_simplified ] = "破折号";
+    Text[ chinese_traditional ] = "破折號";
     Text[ turkish ] = "Dashed";
     Text[ arabic ] = "����";
-    Text[ catalan ] = "Dashed";
-    Text[ finnish ] = "Gestrichelt";
+    Text[ catalan ] = "Tra�at";
+    Text[ finnish ] = "Katkoviiva";
+    Text[ thai ] = "เส้นประ";
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -4969,7 +5135,7 @@ String RID_SVXSTR_LEND0
     Text[ portuguese ] = "Seta c�ncava";
     Text[ russian ] = "�������� �������";
     Text[ greek ] = "����� �����";
-    Text[ dutch ] = "Pijl concave";
+    Text[ dutch ] = "Pijl concaaf";
     Text[ french ] = "Fl�che concave";
     Text[ spanish ] = "Flecha c�ncava";
     Text[ italian ] = "Freccia concava";
@@ -4977,14 +5143,15 @@ String RID_SVXSTR_LEND0
     Text[ swedish ] = "Pil konkav";
     Text[ polish ] = "Strza�ka wkl�s�a";
     Text[ portuguese_brazilian ] = "Arrow concave";
-    Text[ japanese ] = "�����ڂ݂̖��";
-    Text[ korean ] = "���� ȭ��ǥ";
-    Text[ chinese_simplified ] = "���μ�ͷ";
-    Text[ chinese_traditional ] = "�b�Y�W��";
+    Text[ japanese ] = "中くぼみの矢印";
+    Text[ korean ] = "오목 화살표";
+    Text[ chinese_simplified ] = "凹形箭头";
+    Text[ chinese_traditional ] = "箭頭凹形";
     Text[ arabic ] = "��� ����";
     Text[ turkish ] = "��b�key ok";
-    Text[ catalan ] = "Flecha c�ncava";
+    Text[ catalan ] = "Fletxa c�ncava";
     Text[ finnish ] = "Kovera nuoli";
+    Text[ thai ] = "ลูกศรที่เว้าเข้าข้างใน";
 };
 String RID_SVXSTR_LEND1
 {
@@ -4992,7 +5159,7 @@ String RID_SVXSTR_LEND1
     Text [ ENGLISH ] = "Square 45";
     Text [ english_us ] = "Square 45";
     Text[ portuguese ] = "Quadrado 45";
-    Text[ russian ] = "������� 45";
+    Text[ russian ] = "����";
     Text[ greek ] = "��������� 45";
     Text[ dutch ] = "Vierkant 45";
     Text[ french ] = "Carr� 45";
@@ -5002,14 +5169,15 @@ String RID_SVXSTR_LEND1
     Text[ swedish ] = "Kvadrat 45";
     Text[ polish ] = "Kwadrat 45";
     Text[ portuguese_brazilian ] = "Square 45";
-    Text[ japanese ] = "�^�l�p 45�x�X��";
-    Text[ korean ] = "���簢�� 45";
-    Text[ chinese_simplified ] = "������ 45 ��";
-    Text[ chinese_traditional ] = "����� 45 ��";
+    Text[ japanese ] = "真四角 45度傾斜";
+    Text[ korean ] = "정사각형 45";
+    Text[ chinese_simplified ] = "正方形 45 度";
+    Text[ chinese_traditional ] = "正方形 45 度";
     Text[ arabic ] = "���� 45";
     Text[ turkish ] = "Kare 45";
-    Text[ catalan ] = "Cuadrado 45";
+    Text[ catalan ] = "Quadrat 45";
     Text[ finnish ] = "Neli� 45";
+    Text[ thai ] = "สี่เหลี่ยมจัตุรัส 45";
 };
 String RID_SVXSTR_LEND2
 {
@@ -5017,7 +5185,7 @@ String RID_SVXSTR_LEND2
     Text [ ENGLISH ] = "Small Arrow";
     Text [ english_us ] = "Small arrow";
     Text[ portuguese ] = "Seta estreita";
-    Text[ russian ] = "������������� �������";
+    Text[ russian ] = "�������� �������";
     Text[ greek ] = "����� �����";
     Text[ dutch ] = "Smalle pijl";
     Text[ french ] = "Fl�che �troite";
@@ -5027,14 +5195,15 @@ String RID_SVXSTR_LEND2
     Text[ swedish ] = "Smal pil";
     Text[ polish ] = "Cienka strza�ka";
     Text[ portuguese_brazilian ] = "Small Arrow";
-    Text[ japanese ] = "���ׂ����";
-    Text[ korean ] = "���� ȭ��ǥ";
-    Text[ chinese_simplified ] = "ϸ��ͷ";
-    Text[ chinese_traditional ] = "�Ӥp�b�Y";
+    Text[ japanese ] = "長細い矢印";
+    Text[ korean ] = "가는 화살표";
+    Text[ chinese_simplified ] = "细箭头";
+    Text[ chinese_traditional ] = "細小箭頭";
     Text[ arabic ] = "��� ����";
     Text[ turkish ] = "�nce ok";
-    Text[ catalan ] = "Flecha estrecha";
+    Text[ catalan ] = "Fletxa petita";
     Text[ finnish ] = "Pieni nuoli";
+    Text[ thai ] = "ลูกศรเล็ก";
 };
 String RID_SVXSTR_LEND3
 {
@@ -5042,24 +5211,25 @@ String RID_SVXSTR_LEND3
     Text [ ENGLISH ] = "Dimension Lines";
     Text [ english_us ] = "Dimension lines";
     Text[ portuguese ] = "Linhas de dimensionamento";
-    Text[ russian ] = "����� ��� ��������";
+    Text[ russian ] = "��������� �����";
     Text[ greek ] = "������� ����������������";
     Text[ dutch ] = "Afmetingseinden";
     Text[ french ] = "Extr�mit�s de cotation";
-    Text[ spanish ] = "Fines de dimensiones";
+    Text[ spanish ] = "L�neas de dimensiones";
     Text[ italian ] = "Estremit� quotatura";
     Text[ danish ] = "Dimensioneringsstreger";
     Text[ swedish ] = "Dimensionerings�ndar";
     Text[ polish ] = "Ko�ce wymiarowania";
     Text[ portuguese_brazilian ] = "Dimension Lines";
-    Text[ japanese ] = "���@���̏I�_";
-    Text[ korean ] = "ġ����";
-    Text[ chinese_simplified ] = "���ߴ�����";
-    Text[ chinese_traditional ] = "�w�ؤo�u��";
+    Text[ japanese ] = "寸法線の終点";
+    Text[ korean ] = "치수선";
+    Text[ chinese_simplified ] = "定尺寸线条";
+    Text[ chinese_traditional ] = "定尺寸線條";
     Text[ arabic ] = "���� ����";
     Text[ turkish ] = "Boyutland�rma �izgileri";
-    Text[ catalan ] = "Fines de dimensiones";
-    Text[ finnish ] = "Mittaviivat";
+    Text[ catalan ] = "Fines de dimensions";
+    Text[ finnish ] = "Mittajanat";
+    Text[ thai ] = "เส้นมีมิติ";
 };
 String RID_SVXSTR_LEND4
 {
@@ -5077,14 +5247,15 @@ String RID_SVXSTR_LEND4
     Text[ swedish ] = "Dubbel pil";
     Text[ polish ] = "Podw�jna strza�ka";
     Text[ portuguese_brazilian ] = "Double Arrow";
-    Text[ japanese ] = "��d���";
-    Text[ korean ] = "���� ȭ��ǥ";
-    Text[ chinese_simplified ] = "˫��ͷ";
-    Text[ chinese_traditional ] = "���b�Y";
+    Text[ japanese ] = "二重矢印";
+    Text[ korean ] = "이중 화살표";
+    Text[ chinese_simplified ] = "双箭头";
+    Text[ chinese_traditional ] = "雙箭頭";
     Text[ arabic ] = "��� �����";
     Text[ turkish ] = "�ki u�lu ok";
-    Text[ catalan ] = "Flecha doble";
+    Text[ catalan ] = "Fletxa doble";
     Text[ finnish ] = "Tuplanuoli";
+    Text[ thai ] = "ลูกศรคู่";
 };
 String RID_SVXSTR_LEND5
 {
@@ -5092,7 +5263,7 @@ String RID_SVXSTR_LEND5
     Text [ ENGLISH ] = "Rounded short Arrow";
     Text [ english_us ] = "Rounded short arrow";
     Text[ portuguese ] = "Seta curta arredondada";
-    Text[ russian ] = "������������ �������� �������";
+    Text[ russian ] = "����������� �������� �������";
     Text[ greek ] = "�������������� ����� �����";
     Text[ dutch ] = "Afgeronde korte pijl";
     Text[ french ] = "Fl�che courte arrondie";
@@ -5102,14 +5273,15 @@ String RID_SVXSTR_LEND5
     Text[ swedish ] = "Avrundad kort pil";
     Text[ polish ] = "Zaokr. kr�tka strza�ka";
     Text[ portuguese_brazilian ] = "Rounded short Arrow";
-    Text[ japanese ] = "��̊ۂ��Z���߂̖��";
-    Text[ korean ] = "�ձ۸� ª�� ȭ��ǥ";
-    Text[ chinese_simplified ] = "Բ�ζ̼�ͷ";
-    Text[ chinese_traditional ] = "��εu�b�Y";
+    Text[ japanese ] = "先の丸い短かめの矢印";
+    Text[ korean ] = "둥글린 짧은 화살표";
+    Text[ chinese_simplified ] = "圆形短箭头";
+    Text[ chinese_traditional ] = "圓形短箭頭";
     Text[ arabic ] = "��� ���� ������";
     Text[ turkish ] = "Yuvarlat�lm�� k�sa ok";
-    Text[ catalan ] = "Flecha corta redondeada";
+    Text[ catalan ] = "Fletxa curta arrodonida";
     Text[ finnish ] = "Py�ristetty lyhyt nuoli";
+    Text[ thai ] = "ลูกศรสั้นมน";
 };
 String RID_SVXSTR_LEND6
 {
@@ -5127,14 +5299,15 @@ String RID_SVXSTR_LEND6
     Text[ swedish ] = "Symmetrisk pil";
     Text[ polish ] = "Symetryczna strza�ka";
     Text[ portuguese_brazilian ] = "Symmetric Arrow";
-    Text[ japanese ] = "���ݽ�̂Ƃꂽ���";
-    Text[ korean ] = "��Ī ȭ��ǥ";
-    Text[ chinese_simplified ] = "�ԳƼ�ͷ";
-    Text[ chinese_traditional ] = "��٦��b�Y";
+    Text[ japanese ] = "バランスのとれた矢印";
+    Text[ korean ] = "대칭 화살표";
+    Text[ chinese_simplified ] = "对称箭头";
+    Text[ chinese_traditional ] = "對稱式箭頭";
     Text[ arabic ] = "��� ������";
     Text[ turkish ] = "Simetrik ok";
-    Text[ catalan ] = "Flecha sim�trica";
+    Text[ catalan ] = "Fletxa sim�trica";
     Text[ finnish ] = "Symmetrinen nuoli";
+    Text[ thai ] = "ลูกศรสมมาตร";
 };
 String RID_SVXSTR_LEND7
 {
@@ -5142,24 +5315,25 @@ String RID_SVXSTR_LEND7
     Text [ ENGLISH ] = "Line Arrow";
     Text [ english_us ] = "Line arrow";
     Text[ portuguese ] = "Linha-seta";
-    Text[ russian ] = "������� � ���� �����";
+    Text[ russian ] = "�������� �������";
     Text[ greek ] = "������-�����";
     Text[ dutch ] = "Lijn-pijl";
     Text[ french ] = "Ligne fl�ch�e";
-    Text[ spanish ] = "Flecha l�nea";
+    Text[ spanish ] = "L�nea de flecha";
     Text[ italian ] = "Linea freccia";
     Text[ danish ] = "Streg-pil";
     Text[ swedish ] = "Linjepil";
     Text[ polish ] = "Strza�ka w postaci linii";
     Text[ portuguese_brazilian ] = "Line Arrow";
-    Text[ japanese ] = "����̖��";
-    Text[ korean ] = "�� ȭ��ǥ";
-    Text[ chinese_simplified ] = "������ͷ";
-    Text[ chinese_traditional ] = "�E�u�b�Y";
+    Text[ japanese ] = "線状の矢印";
+    Text[ korean ] = "선 화살표";
+    Text[ chinese_simplified ] = "线条箭头";
+    Text[ chinese_traditional ] = "劃線箭頭";
     Text[ arabic ] = "��� ���";
     Text[ turkish ] = "�izgili ok";
-    Text[ catalan ] = "Flecha l�nea";
+    Text[ catalan ] = "Fletxa l�nia";
     Text[ finnish ] = "Viivanuoli";
+    Text[ thai ] = "เส้นลูกศร";
 };
 String RID_SVXSTR_LEND8
 {
@@ -5167,7 +5341,7 @@ String RID_SVXSTR_LEND8
     Text [ ENGLISH ] = "Rounded large Arrow";
     Text [ english_us ] = "Rounded large arrow";
     Text[ portuguese ] = "Seta longa arredondada";
-    Text[ russian ] = "������������ ������� �������";
+    Text[ russian ] = "����������� ������� �������";
     Text[ greek ] = "�������������� ����� �����";
     Text[ dutch ] = "Afgeronde lange pijl";
     Text[ french ] = "Fl�che longue arrondie";
@@ -5177,14 +5351,15 @@ String RID_SVXSTR_LEND8
     Text[ swedish ] = "Avrundad stor pil";
     Text[ polish ] = "Zaokr. d�uga strza�ka";
     Text[ portuguese_brazilian ] = "Rounded large Arrow";
-    Text[ japanese ] = "��̊ۂ����߂̖��";
-    Text[ korean ] = "�ձ۸� �� ȭ��ǥ";
-    Text[ chinese_simplified ] = "Բ�γ���ͷ";
-    Text[ chinese_traditional ] = "��Τj�b�Y";
+    Text[ japanese ] = "先の丸い長めの矢印";
+    Text[ korean ] = "둥글린 긴 화살표";
+    Text[ chinese_simplified ] = "圆形长箭头";
+    Text[ chinese_traditional ] = "圓形大箭頭";
     Text[ arabic ] = "��� ���� ������";
     Text[ turkish ] = "Yuvarlat�lm�� uzun ok";
-    Text[ catalan ] = "Flecha larga redondeada";
+    Text[ catalan ] = "Fletxa gran arrodonida";
     Text[ finnish ] = "Py�ristetty iso nuoli";
+    Text[ thai ] = "ลูกศรใหญ่มน";
 };
 String RID_SVXSTR_LEND9
 {
@@ -5194,7 +5369,7 @@ String RID_SVXSTR_LEND9
     Text[ portuguese ] = "C�rculo";
     Text[ russian ] = "����";
     Text[ greek ] = "������";
-    Text[ dutch ] = "Circle";
+    Text[ dutch ] = "Cirkel";
     Text[ french ] = "Cercle";
     Text[ spanish ] = "C�rculo";
     Text[ italian ] = "Cerchio";
@@ -5202,14 +5377,15 @@ String RID_SVXSTR_LEND9
     Text[ swedish ] = "Cirkel";
     Text[ polish ] = "Ko�o";
     Text[ portuguese_brazilian ] = "Circle";
-    Text[ japanese ] = "�ۈ�";
-    Text[ korean ] = "��";
-    Text[ chinese_simplified ] = "Բ";
-    Text[ chinese_traditional ] = "���";
+    Text[ japanese ] = "丸印";
+    Text[ korean ] = "원";
+    Text[ chinese_simplified ] = "圆";
+    Text[ chinese_traditional ] = "圓形";
     Text[ arabic ] = "�����";
     Text[ turkish ] = "Daire";
-    Text[ catalan ] = "C�rculo";
+    Text[ catalan ] = "Cercle";
     Text[ finnish ] = "Ympyr�";
+    Text[ thai ] = "วงกลม";
 };
 String RID_SVXSTR_LEND10
 {
@@ -5227,14 +5403,15 @@ String RID_SVXSTR_LEND10
     Text[ swedish ] = "Kvadrat";
     Text[ polish ] = "Kwadrat";
     Text[ portuguese_brazilian ] = "Square";
-    Text[ japanese ] = "�^�l�p";
-    Text[ korean ] = "���簢��";
-    Text[ chinese_simplified ] = "������";
-    Text[ chinese_traditional ] = "�����";
+    Text[ japanese ] = "真四角";
+    Text[ korean ] = "정사각형";
+    Text[ chinese_simplified ] = "正方形";
+    Text[ chinese_traditional ] = "正方形";
     Text[ arabic ] = "����";
     Text[ turkish ] = "Kare";
-    Text[ catalan ] = "Cuadrado";
+    Text[ catalan ] = "Quadrat";
     Text[ finnish ] = "Neli�";
+    Text[ thai ] = "สี่เหลี่ยมจัตุรัส";
 };
 String RID_SVXSTR_LEND11
 {
@@ -5252,14 +5429,15 @@ String RID_SVXSTR_LEND11
     Text[ swedish ] = "Pil";
     Text[ polish ] = "Strza�ka";
     Text[ portuguese_brazilian ] = "Arrow";
-    Text[ japanese ] = "���";
-    Text[ korean ] = "ȭ��ǥ";
-    Text[ chinese_simplified ] = "��ͷ";
-    Text[ chinese_traditional ] = "�b�Y";
+    Text[ japanese ] = "矢印";
+    Text[ korean ] = "화살표";
+    Text[ chinese_simplified ] = "箭头";
+    Text[ chinese_traditional ] = "箭頭";
     Text[ arabic ] = "���";
     Text[ turkish ] = "Ok";
-    Text[ catalan ] = "Flecha";
+    Text[ catalan ] = "Fletxa";
     Text[ finnish ] = "Nuoli";
+    Text[ thai ] = "ลูกศร";
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -5279,7 +5457,7 @@ String RID_SVXSTR_TRASNGR0
     Text [ ENGLISH ] = "Transparence" ;
     Text[ english_us ] = "Transparency";
     Text[ portuguese ] = "Transpar�ncia";
-    Text[ russian ] = "������������ �������";
+    Text[ russian ] = "������������";
     Text[ dutch ] = "Transparantie";
     Text[ french ] = "Transparence";
     Text[ spanish ] = "Transparencia";
@@ -5288,20 +5466,35 @@ String RID_SVXSTR_TRASNGR0
     Text[ swedish ] = "Yttransparens";
     Text[ polish ] = "Przezroczysto�� powierzchni";
     Text[ portuguese_brazilian ] = "Transparence";
-    Text[ japanese ] = "�\\�ʂ̓�����";
-    Text[ chinese_simplified ] = "͸��";
-    Text[ chinese_traditional ] = "�����z��";
+    Text[ japanese ] = "表面の透化性";
+    Text[ chinese_simplified ] = "透明";
+    Text[ chinese_traditional ] = "平面透明";
     Text[ arabic ] = "������";
     Text[ dutch ] = "Transparantie";
-    Text[ chinese_simplified ] = "͸��";
+    Text[ chinese_simplified ] = "透明";
     Text[ greek ] = "��������� ����������";
-    Text[ korean ] = "��� ����";
+    Text[ korean ] = "면의 투명 효과";
     Text[ turkish ] = "Y�zey saydaml���";
-    Text[ catalan ] = "Transparencia";
+    Text[ catalan ] = "Transpar�ncia";
     Text[ finnish ] = "L�pin�kyvyys";
+    Text[ thai ] = "โปร่งแสง";
 };
 
  // ********************************************************************** EOF
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svx/source/dialog/srchdlg.src b/svx/source/dialog/srchdlg.src
index 263886dea610..d4ae37a12ae5 100644
--- a/svx/source/dialog/srchdlg.src
+++ b/svx/source/dialog/srchdlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: srchdlg.src,v $
  *
- *  $Revision: 1.57 $
+ *  $Revision: 1.58 $
  *
- *  last change: $Author: kz $ $Date: 2003-02-27 13:01:15 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,7 +72,7 @@ String RID_SVXSTR_SEARCH_STYLES
     Text [ ENGLISH ] = "including st~ylesheets" ;
     Text [ norwegian ] = "inkludert stilark" ;
     Text [ italian ] = "Includi modelli" ;
-    Text [ portuguese_brazilian ] = "Incluir estilos" ;
+    Text [ portuguese_brazilian ] = "Inclusive folhas de estilo" ;
     Text [ portuguese ] = "Incluindo ~estilos" ;
     Text [ finnish ] = "Sis�llytet��n tyylit" ;
     Text [ danish ] = "Inklusive typografier" ;
@@ -88,10 +88,11 @@ String RID_SVXSTR_SEARCH_STYLES
     Text[ chinese_traditional ] = "包括樣式";
     Text[ arabic ] = "��� �� ��� �������";
     Text[ greek ] = "�����������. �������";
-    Text[ korean ] = "템플릿 포함";
+    Text[ korean ] = "스타일 포함";
     Text[ turkish ] = "Bi~�imler dahil";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Incluir ~estilos";
+    Text[ catalan ] = "S'estan incloent els estils";
+    Text[ thai ] = "รวมลักษณะ";
 };
 String RID_SVXSTR_SEARCH
 {
@@ -118,7 +119,8 @@ String RID_SVXSTR_SEARCH
     Text[ korean ] = "(찾기)";
     Text[ turkish ] = "(Ara)";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "(Buscar)";
+    Text[ catalan ] = "(Cerca)";
+    Text[ thai ] = "(ค้นหา)";
 };
 String RID_SVXSTR_REPLACE
 {
@@ -145,7 +147,8 @@ String RID_SVXSTR_REPLACE
     Text[ korean ] = "(바꾸기)";
     Text[ turkish ] = "(De�i�tir)";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "(Reemplazar)";
+    Text[ catalan ] = "(Reempla�a)";
+    Text[ thai ] = "(แทนที่)";
 };
 
  // RID_SVXDLG_SEARCH -----------------------------------------------------
@@ -161,7 +164,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     Text [ ENGLISH ] = "Search & Replace" ;
     Text [ norwegian ] = "S�k og Erstatt" ;
     Text [ italian ] = "Cerca e sostituisci" ;
-    Text [ portuguese_brazilian ] = "Localizar & Substituir" ;
+    Text [ portuguese_brazilian ] = "Procurar & Substituir" ;
     Text [ portuguese ] = "Localizar & Substituir" ;
     Text [ finnish ] = "Etsi ja korvaa" ;
     Text [ danish ] = "S�g og erstat" ;
@@ -172,12 +175,12 @@ ModelessDialog RID_SVXDLG_SEARCH
     Text [ english_us ] = "Find & Replace" ;
     Text[ chinese_simplified ] = "搜寻和替换";
     Text[ russian ] = "����� � ��������";
-    Text[ polish ] = "Find & Replace";
+    Text[ polish ] = "Znajd� i zamie�";
     Text[ japanese ] = "検索と置換";
     Text[ chinese_traditional ] = "搜尋和替代";
     Text[ arabic ] = "��� ��������";
     Text[ greek ] = "��������� ��� �������������";
-    Text[ korean ] = "찾기와 바꾸기";
+    Text[ korean ] = "찾기 및 바꾸기";
     Text[ turkish ] = "Ara ve de�i�tir";
     Text[ language_user1 ] = " ";
     Moveable = TRUE ;
@@ -189,7 +192,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text [ ENGLISH ] = "S~earch for" ;
         Text [ norwegian ] = "S~�k etter" ;
         Text [ italian ] = "C~erca" ;
-        Text [ portuguese_brazilian ] = "B~uscar por" ;
+        Text [ portuguese_brazilian ] = "P~rocurar por" ;
         Text [ portuguese ] = "L~ocalizar" ;
         Text [ finnish ] = "~Etsitt�v�" ;
         Text [ danish ] = "S�~g efter" ;
@@ -200,15 +203,16 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text [ english_us ] = "~Search for" ;
         Text[ chinese_simplified ] = "搜寻内容(~S)";
         Text[ russian ] = "�����";
-        Text[ polish ] = "~Szukaj";
+        Text[ polish ] = "Szukaj";
         Text[ japanese ] = "検索テキスト(~S)";
         Text[ chinese_traditional ] = "搜尋內容(~S)";
         Text[ arabic ] = "����� ��";
         Text[ greek ] = "A�������� ���";
-        Text[ korean ] = "찾을 대상(~S)";
+        Text[ korean ] = "검색 대상(~S)";
         Text[ turkish ] = "Arana~n";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "B~uscar";
+        Text[ catalan ] = "~Cerca";
+        Text[ thai ] = "~ค้นหาสำหรับ";
     };
     ComboBox ED_SEARCH
     {
@@ -235,6 +239,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         Hide = TRUE ;
     };
     Text[ catalan ] = "Cerca i reempla�a";
+    Text[ thai ] = "Search & Replace";
 #if SUPD < 641 || defined( GT_DEBUG )
     MultiLineEdit ED_SEARCH_FORMATS
     {
@@ -270,7 +275,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text [ english_us ] = "Re~place with" ;
         Text[ chinese_simplified ] = "替换成(~P)";
         Text[ russian ] = "�������� ��";
-        Text[ polish ] = "Z~amie� na";
+        Text[ polish ] = "Zamie� na";
         Text[ japanese ] = "置換テキスト(~P)";
         Text[ chinese_traditional ] = "更替成(~P)";
         Text[ arabic ] = "������ �������";
@@ -278,7 +283,8 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text[ korean ] = "바꾸기(~P)";
         Text[ turkish ] = "Yeni de~�er";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Ree~mpla�a amb";
+        Text[ catalan ] = "Reempla�a ~amb";
+        Text[ thai ] = "แทน~ที่ด้วย";
     };
     ComboBox ED_REPLACE
     {
@@ -340,15 +346,16 @@ ModelessDialog RID_SVXDLG_SEARCH
         TabStop = TRUE ;
         Text[ chinese_simplified ] = "只允许单词(~D)";
         Text[ russian ] = "������ ��� �����";
-        Text[ polish ] = "Tylko ~ca�e wyrazy";
+        Text[ polish ] = "Tylko ca�e s�owa";
         Text[ japanese ] = "単語として(~D)";
         Text[ chinese_traditional ] = "僅是單詞(~D)";
         Text[ arabic ] = "����� ����� ���";
         Text[ greek ] = "���� ��������� ������";
-        Text[ korean ] = "전체 단어만(~D)";
+        Text[ korean ] = "단어 단위로(~D)";
         Text[ turkish ] = "Yaln�zca tam s~�zc�k";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Solo pa~labras completas";
+        Text[ catalan ] = "Nom�s pa~raules completes";
+        Text[ thai ] = "~คำทั้งหมดเท่านั้น";
     };
     CheckBox CB_MATCH_CASE
     {
@@ -369,15 +376,16 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text[ italian ] = "Ricerca esatta";
         Text[ danish ] = "E~ksakt s�gning";
         Text[ swedish ] = "Exakt s�kning";
-        Text[ polish ] = "Uwzgl�dniaj wielk~o�� liter";
-        Text[ portuguese_brazilian ] = "Coincidir ~mai�scula/min�scula";
+        Text[ polish ] = "Dok�adne wyszukiwanie";
+        Text[ portuguese_brazilian ] = "Igua~lar Caixa";
         Text[ japanese ] = "大文字と小文字を区別する";
-        Text[ korean ] = "자세히 찾기(~T)";
+        Text[ korean ] = "대문자 및 소문자를 구분(~T)";
         Text[ chinese_simplified ] = "精确搜寻(~T)";
         Text[ chinese_traditional ] = "精確搜尋(~T)";
         Text[ turkish ] = "~B�Y�K/k���k harf duyarl�";
         Text[ arabic ] = "��� ����";
-        Text[ catalan ] = "Coincidencia e~xacta";
+        Text[ catalan ] = "Coincid�ncia e~xacta";
+        Text[ thai ] = "~จับคู่กรณี";
     };
     CheckBox BTN_BACKWARDS
     {
@@ -387,7 +395,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text [ ENGLISH ] = "Bac~kwards" ;
         Text [ norwegian ] = "Bako~ver" ;
         Text [ italian ] = "I~ndietro" ;
-        Text [ portuguese_brazilian ] = "~Para tr�s" ;
+        Text [ portuguese_brazilian ] = "Para ?tr~s" ;
         Text [ portuguese ] = "~Para tr�s" ;
         Text [ finnish ] = "~Taaksep�in" ;
         Text [ danish ] = "Til~bage" ;
@@ -399,7 +407,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         TabStop = TRUE ;
         Text[ chinese_simplified ] = "向后(~K)";
         Text[ russian ] = "��������";
-        Text[ polish ] = "~Wstecz";
+        Text[ polish ] = "Wstecz";
         Text[ japanese ] = "バックする(~K)";
         Text[ chinese_traditional ] = "向後(~K)";
         Text[ arabic ] = "�����";
@@ -407,7 +415,8 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text[ korean ] = "뒤로(~K)";
         Text[ turkish ] = "~Geri";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Retroce~der";
+        Text[ catalan ] = "Cap ~enrere";
+        Text[ thai ] = "ข้าง~หลัง";
     };
     CheckBox BTN_SELECTIONS
     {
@@ -417,7 +426,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text [ ENGLISH ] = "Select~ions" ;
         Text [ norwegian ] = "Alternativ~er" ;
         Text [ italian ] = "Solo nella selez~ione" ;
-        Text [ portuguese_brazilian ] = "~Apenas selecionados" ;
+        Text [ portuguese_brazilian ] = "Sele~??s" ;
         Text [ portuguese ] = "Apenas ~selec��o activa" ;
         Text [ finnish ] = "Vain nykyinen valinta" ;
         Text [ danish ] = "Kun det markerede" ;
@@ -429,7 +438,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         TabStop = TRUE ;
         Text[ chinese_simplified ] = "只允许当前的选中(~O)";
         Text[ russian ] = "������ ������� ���������";
-        Text[ polish ] = "~Tylko bie��ce zaznaczenie";
+        Text[ polish ] = "Tylko za~znaczone";
         Text[ japanese ] = "選択範囲のみ(~O)";
         Text[ chinese_traditional ] = "只允許目前的選取(~O)";
         Text[ arabic ] = "������� ���";
@@ -437,7 +446,8 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text[ korean ] = "현재 선택 사항만(~O)";
         Text[ turkish ] = "~Yaln�zca se�ilen aral�k i�inde";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Solo e~n la selecci�n";
+        Text[ catalan ] = "Nom�s e~n la selecci�";
+        Text[ thai ] = "ส่วนที่เลือกปัจจุบันเ~ท่านั้น";
     };
     CheckBox BTN_REGEXP
     {
@@ -447,7 +457,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text [ ENGLISH ] = "Re~gular Expressions" ;
         Text [ norwegian ] = "Va~nlige Uttrykk" ;
         Text [ italian ] = "Espressione re~golare" ;
-        Text [ portuguese_brazilian ] = "Express�es Re~gulares" ;
+        Text [ portuguese_brazilian ] = "Express es Re~gulares" ;
         Text [ portuguese ] = "~Express�o regular" ;
         Text [ finnish ] = "S��nn~�lliset lausekkeet" ;
         Text [ danish ] = "Regul�rt udtryk" ;
@@ -459,15 +469,16 @@ ModelessDialog RID_SVXDLG_SEARCH
         TabStop = TRUE ;
         Text[ chinese_simplified ] = "常规表达(~X)";
         Text[ russian ] = "���������� ���������";
-        Text[ polish ] = "Wyra�~enie regularne";
+        Text[ polish ] = "Wyra�enie regularne";
         Text[ japanese ] = "正規表現(~X)";
         Text[ chinese_traditional ] = "常規表達(~X)";
         Text[ arabic ] = "����� �������";
         Text[ greek ] = "�������� ���������";
-        Text[ korean ] = "일반 표현(~X)";
+        Text[ korean ] = "정규식(~X)";
         Text[ turkish ] = "Genel a~rama karakteri";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Expresi�n re~gular";
+        Text[ catalan ] = "E~xpressions habituals";
+        Text[ thai ] = "คำ~อธิบายปกติ";
     };
     CheckBox BTN_LAYOUTS
     {
@@ -477,7 +488,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text [ ENGLISH ] = "Search for St~ylesheets" ;
         Text [ norwegian ] = "S�k etter St~ilark" ;
         Text [ italian ] = "Cerca modelli" ;
-        Text [ portuguese_brazilian ] = "Procurar por ~Estilo" ;
+        Text [ portuguese_brazilian ] = "Procurar por Fo~lhas de estilo" ;
         Text [ portuguese ] = "Locali~zar estilos" ;
         Text [ finnish ] = "Etsitt�v�t t~yylit" ;
         Text [ danish ] = "S�g efter typogra~fier" ;
@@ -489,15 +500,16 @@ ModelessDialog RID_SVXDLG_SEARCH
         TabStop = TRUE ;
         Text[ chinese_simplified ] = "搜寻样式(~Y)";
         Text[ russian ] = "����� ������";
-        Text[ polish ] = "Szukaj sty~l�w";
+        Text[ polish ] = "Szu~kaj styl�w";
         Text[ japanese ] = "スタイルの検索(~Y)";
         Text[ chinese_traditional ] = "搜尋樣式(~Y)";
         Text[ arabic ] = "����� �� �����";
         Text[ greek ] = "A�������� ��� �������";
-        Text[ korean ] = "템플릿 찾기(~Y)";
+        Text[ korean ] = "스타일 찾기(~Y)";
         Text[ language_user1 ] = " ";
         Text[ turkish ] = "~Bi�im ara";
-        Text[ catalan ] = "Buscar ~estilos";
+        Text[ catalan ] = "Cerca es~tils";
+        Text[ thai ] = "ค้นหาลัก~ษณะ";
     };
     CheckBox CB_SIMILARITY
     {
@@ -513,7 +525,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text [ french ] = "Recherche de similarit�" ;
         Text [ swedish ] = "Likhetss�kning" ;
         Text [ danish ] = "S~�g lignende" ;
-        Text [ portuguese_brazilian ] = "~Busca por semelhan�a" ;
+        Text [ portuguese_brazilian ] = "~?hnlichkeitssuche" ;
         Text [ portuguese ] = "Pro~cura por semelhan�a" ;
         Text[ chinese_simplified ] = "类似搜寻(~I)";
         Text[ russian ] = "����� ��������";
@@ -522,11 +534,12 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text[ chinese_traditional ] = "相似字搜尋(~I)";
         Text[ arabic ] = "����� �� ����� �������";
         Text[ greek ] = "��������� ����������";
-        Text[ korean ] = "유사성 찾기(~I)";
+        Text[ korean ] = "유사성 검색(~I)";
         Text[ turkish ] = "~Benzerleri ara";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "B�squeda por se~mejanza";
+        Text[ catalan ] = "Cerca de s~imilitud";
         Text[ finnish ] = "Vastaavuus~haku";
+        Text[ thai ] = "ค้นหาสิ่งที่ค~ล้ายกัน";
     };
     PushButton PB_SIMILARITY
     {
@@ -553,15 +566,16 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text[ italian ] = "Considera la larghezza dei caratteri";
         Text[ danish ] = "Halv-/nor~malbrede former";
         Text[ swedish ] = "Ta h�nsyn till teckenbredd";
-        Text[ polish ] = "Uwz~gl�dniaj szeroko�� znak�w";
-        Text[ portuguese_brazilian ] = "Largura do caracter";
+        Text[ polish ] = "Uwzgl�dnij szeroko�� znak�w";
+        Text[ portuguese_brazilian ] = "Match half/full width forms";
         Text[ japanese ] = "全角と半角を区別する";
-        Text[ korean ] = "문자 폭에 주의하십시오";
+        Text[ korean ] = "전자와 반자를 구분";
         Text[ chinese_simplified ] = "顾全字符宽度";
         Text[ chinese_traditional ] = "顧及字元寬度";
         Text[ turkish ] = "Match half/full width forms";
         Text[ arabic ] = "����� ��� �����/��� ����";
-        Text[ catalan ] = "Formas con ancho medio o normal";
+        Text[ catalan ] = "Formes amb mida mitjana o normal";
+        Text[ thai ] = "จับคู่ความกว้างแบบฟอร์มครึ่ง/เต็ม";
     };
     CheckBox CB_JAP_SOUNDS_LIKE
     {
@@ -580,16 +594,17 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text[ italian ] = "Ortografia simile (giapponese)";
         Text[ danish ] = "Lign. skrivem�de (Jap.)";
         Text[ swedish ] = "Likn. skrivs�tt (japanska)";
-        Text[ polish ] = "~Podobna pisownia (japo�ski)";
-        Text[ portuguese_brazilian ] = "Ortografia semelhante (Japon�s)";
+        Text[ polish ] = "Podobna pisownia (japo�ski)";
+        Text[ portuguese_brazilian ] = "Sounds like (Japanese)";
         Text[ japanese ] = "あいまい検索(日本語)";
-        Text[ korean ] = "유사한 철자법 (일본어)";
+        Text[ korean ] = "동음어 찾기(일본어)";
         Text[ chinese_simplified ] = "类似字符(日文)";
         Text[ chinese_traditional ] = "類似字元(日文)";
         Text[ turkish ] = "Sounds like (Japanese)";
         Text[ arabic ] = "����� ������(�������)";
-        Text[ catalan ] = "Ortograf�a similar (Japon�s)";
+        Text[ catalan ] = "Ortografia similar (Japon�s)";
         Text[ finnish ] = "Samankuuloinen kuin (japani)";
+        Text[ thai ] = "เสียงเหมือน (ภาษาญี่ปุ่น)";
     };
     PushButton PB_JAP_OPTIONS
     {
@@ -626,6 +641,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text[ korean ] = "옵션";
         Text[ turkish ] = "Se�enekler";
         Text[ catalan ] = "Opcions";
+        Text[ thai ] = "ตัวเลือก";
     };
     RadioButton BTN_FORMULAS
     {
@@ -635,7 +651,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text [ ENGLISH ] = "F~ormulas" ;
         Text [ norwegian ] = "F~ormler" ;
         Text [ italian ] = "F~ormule" ;
-        Text [ portuguese_brazilian ] = "F~�rmulas" ;
+        Text [ portuguese_brazilian ] = "F~?mulas" ;
         Text [ portuguese ] = "F~�rmulas" ;
         Text [ finnish ] = "~Kaavat" ;
         Text [ danish ] = "For~mler" ;
@@ -655,7 +671,8 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text[ korean ] = "수식(~O)";
         Text[ turkish ] = "F~orm�l";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~F�rmulas";
+        Text[ catalan ] = "~F�rmules";
+        Text[ thai ] = "สู~ตรคำนวณ";
     };
     RadioButton BTN_VALUES
     {
@@ -677,7 +694,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         Hide = TRUE ;
         Text[ chinese_simplified ] = "数值(~V)";
         Text[ russian ] = "��������";
-        Text[ polish ] = "warto�ciac~h";
+        Text[ polish ] = "warto�c~iach";
         Text[ japanese ] = "値(~V)";
         Text[ chinese_traditional ] = "數值(~V)";
         Text[ arabic ] = "�����";
@@ -685,7 +702,8 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text[ korean ] = "값(~V)";
         Text[ turkish ] = "~De�er";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Valores";
+        Text[ catalan ] = "~Valors";
+        Text[ thai ] = "~ค่า";
     };
     RadioButton BTN_NOTES
     {
@@ -695,7 +713,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text [ ENGLISH ] = "~Notes" ;
         Text [ norwegian ] = "~Notes" ;
         Text [ italian ] = "~Note" ;
-        Text [ portuguese_brazilian ] = "~Anota��es" ;
+        Text [ portuguese_brazilian ] = "~Observa??s" ;
         Text [ portuguese ] = "~Anota��es" ;
         Text [ finnish ] = "Hu~omautukset" ;
         Text [ danish ] = "No~ter" ;
@@ -716,6 +734,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text[ turkish ] = "No~t";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Notes";
+        Text[ thai ] = "~บันทึกย่อ";
     };
     FixedLine FL_SEARCH
     {
@@ -742,10 +761,11 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text[ chinese_traditional ] = "搜尋位置";
         Text[ arabic ] = "����� ��";
         Text[ greek ] = "��������� ��";
-        Text[ korean ] = "찾을 범위";
+        Text[ korean ] = "검색 위치";
         Text[ turkish ] = "Bak�lacak yerler";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Buscar en";
+        Text[ catalan ] = "Cerca a";
+        Text[ thai ] = "ค้นหาใน";
     };
     FixedLine FL_SEARCHDIR_VERT
     {
@@ -761,7 +781,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text [ ENGLISH ] = "~Rows" ;
         Text [ norwegian ] = "~Rows" ;
         Text [ italian ] = "A riga" ;
-        Text [ portuguese_brazilian ] = "~Linhas" ;
+        Text [ portuguese_brazilian ] = "Filei~ras" ;
         Text [ portuguese ] = "~Linhas" ;
         Text [ finnish ] = "~Rivit" ;
         Text [ danish ] = "R~�kkevis" ;
@@ -773,7 +793,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         Hide = TRUE ;
         Text[ chinese_simplified ] = "按照行(~W)";
         Text[ russian ] = "������";
-        Text[ polish ] = "Wie~rszami";
+        Text[ polish ] = "Wierszami";
         Text[ japanese ] = "行(~W)";
         Text[ chinese_traditional ] = "按照列(~W)";
         Text[ arabic ] = "������";
@@ -781,7 +801,8 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text[ korean ] = "행(~W)";
         Text[ turkish ] = "Sat~�r";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Por f~ilas";
+        Text[ catalan ] = "Fi~les";
+        Text[ thai ] = "แถ~ว";
     };
     RadioButton BTN_COLUMNS
     {
@@ -803,7 +824,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         Hide = TRUE ;
         Text[ chinese_simplified ] = "按照列(~U)";
         Text[ russian ] = "�������";
-        Text[ polish ] = "Kol~umnami";
+        Text[ polish ] = "Kolumnami";
         Text[ japanese ] = "列(~U)";
         Text[ chinese_traditional ] = "按照欄(~U)";
         Text[ arabic ] = "�������";
@@ -811,7 +832,8 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text[ korean ] = "열(~U)";
         Text[ turkish ] = "S~�tun";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Por columna~s";
+        Text[ catalan ] = "Col~umnes";
+        Text[ thai ] = "คอ~ลัมน์";
     };
     FixedLine FL_SEARCHDIR
     {
@@ -838,10 +860,11 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text[ chinese_traditional ] = "搜尋方向";
         Text[ arabic ] = "����� �����";
         Text[ greek ] = "���������� ����������";
-        Text[ korean ] = "찾을 방향";
+        Text[ korean ] = "검색 방향";
         Text[ turkish ] = "Arama y�n�";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Direcci�n de b�squeda";
+        Text[ catalan ] = "Direcci� de cerca";
+        Text[ thai ] = "ทิศทางการค้นหา";
     };
     FixedLine FL_SEARCH_VERT
     {
@@ -858,7 +881,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         Hide = TRUE ;
         Text [ portuguese ] = "~Procurar em todas as folhas" ;
         Text [ english_us ] = "Search in all sheets" ;
-        Text [ portuguese_brazilian ] = "~Buscar em todas as planilhas" ;
+        Text [ portuguese_brazilian ] = "~In allen Tabellen suchen" ;
         Text [ swedish ] = "S�k i alla tabeller" ;
         Text [ danish ] = "S�g ~i alle tabeller" ;
         Text [ italian ] = "~Cerca in tutte le tabelle" ;
@@ -875,8 +898,9 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text[ korean ] = "전체 시트에서 찾기";
         Text[ turkish ] = "~T�m tablolarda ara";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Buscar en todas las hojas";
+        Text[ catalan ] = "Cerca en tots els fulls";
         Text[ finnish ] = "Etsi kaikista taulukoista";
+        Text[ thai ] = "ค้นหาในแผ่นงานทั้งหมด";
     };
     FixedLine FL_CALCEXTRAS
     {
@@ -886,7 +910,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text [ ENGLISH ] = "Extras" ;
         Hide = TRUE ;
         Text [ english_us ] = "Options" ;
-        Text [ portuguese_brazilian ] = "Op��es" ;
+        Text [ portuguese_brazilian ] = "Extras" ;
         Text [ swedish ] = "Till�gg" ;
         Text [ danish ] = "Supplerende" ;
         Text [ italian ] = "Strumenti" ;
@@ -896,16 +920,17 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text [ portuguese ] = "Outros" ;
         Text[ chinese_simplified ] = "其它";
         Text[ russian ] = "���������";
-        Text[ polish ] = "Opcje";
+        Text[ polish ] = "Narz�dzia";
         Text[ japanese ] = "その他";
         Text[ chinese_traditional ] = "其它";
         Text[ arabic ] = "�����";
         Text[ greek ] = "��������";
-        Text[ korean ] = "도구";
+        Text[ korean ] = "추가 옵션";
         Text[ turkish ] = "Tablo se�enekleri";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Opcions";
+        Text[ catalan ] = "Extres";
         Text[ finnish ] = "Asetukset";
+        Text[ thai ] = "ตัวเลือก";
     };
     PushButton BTN_SEARCH_ALL
     {
@@ -915,7 +940,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text [ ENGLISH ] = "Search ~All" ;
         Text [ norwegian ] = "S�k ~Alle" ;
         Text [ italian ] = "Cerca ~tutto" ;
-        Text [ portuguese_brazilian ] = "Localizar ~Tudo" ;
+        Text [ portuguese_brazilian ] = "Buscar ~Tudo" ;
         Text [ portuguese ] = "Localizar ~tudo" ;
         Text [ finnish ] = "Etsi k~aikki" ;
         Text [ danish ] = "S�g alle" ;
@@ -927,7 +952,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         TabStop = TRUE ;
         Text[ chinese_simplified ] = "搜寻全部(~A)";
         Text[ russian ] = "����� ���";
-        Text[ polish ] = "Znaj~d� wszystkie";
+        Text[ polish ] = "~Znajd� wszystkie";
         Text[ japanese ] = "すべて検索(~A)";
         Text[ chinese_traditional ] = "搜尋全部(~A)";
         Text[ arabic ] = "����� �� ����";
@@ -935,7 +960,8 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text[ korean ] = "모두 찾기(~A)";
         Text[ turkish ] = "T�m�n� a~ra";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Buscar ~todo";
+        Text[ catalan ] = "Cerca-ho ~tot";
+        Text[ thai ] = "หา~ทั้งหมด";
     };
     PushButton BTN_SEARCH
     {
@@ -945,7 +971,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text [ ENGLISH ] = "~Search" ;
         Text [ norwegian ] = "~S�ke" ;
         Text [ italian ] = "~Cerca" ;
-        Text [ portuguese_brazilian ] = "~Localizar" ;
+        Text [ portuguese_brazilian ] = "~Buscar" ;
         Text [ portuguese ] = "~Localizar" ;
         Text [ finnish ] = "Ets~i" ;
         Text [ danish ] = "~S�g" ;
@@ -958,7 +984,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         DefButton = TRUE ;
         Text[ chinese_simplified ] = "搜寻(~F)";
         Text[ russian ] = "�����";
-        Text[ polish ] = "Zna~jd�";
+        Text[ polish ] = "Szukaj";
         Text[ japanese ] = "検索(~F)";
         Text[ chinese_traditional ] = "搜尋(~F)";
         Text[ arabic ] = "���";
@@ -967,6 +993,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text[ turkish ] = "~Ara";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Cerca";
+        Text[ thai ] = "~หา";
     };
     PushButton BTN_REPLACE_ALL
     {
@@ -988,7 +1015,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         TabStop = TRUE ;
         Text[ chinese_simplified ] = "全部替换(~L)";
         Text[ russian ] = "�������� ���";
-        Text[ polish ] = "Zam~ie� wszyst.";
+        Text[ polish ] = "Zamie� wszyst.";
         Text[ japanese ] = "すべて置換(~L)";
         Text[ chinese_traditional ] = "全部代替(~L)";
         Text[ arabic ] = "������� ����";
@@ -996,7 +1023,8 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text[ korean ] = "모두 바꾸기(~L)";
         Text[ turkish ] = "T�m�n� de�i�~tir";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Reemplazar t~odo";
+        Text[ catalan ] = "Reempla�a-ho t~ot";
+        Text[ thai ] = "แทนที่ทั้~งหมด";
     };
     PushButton BTN_REPLACE
     {
@@ -1018,7 +1046,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         TabStop = TRUE ;
         Text[ chinese_simplified ] = "替换(~R)";
         Text[ russian ] = "��������";
-        Text[ polish ] = "~Zamie�";
+        Text[ polish ] = "Zamie�";
         Text[ japanese ] = "置換(~R)";
         Text[ chinese_traditional ] = "替代(~R)";
         Text[ arabic ] = "�������";
@@ -1027,6 +1055,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text[ turkish ] = "De�i~�tir";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Reempla�a";
+        Text[ thai ] = "แ~ทนที่";
     };
     CancelButton BTN_CLOSE
     {
@@ -1048,7 +1077,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         TabStop = TRUE ;
         Text[ chinese_simplified ] = "关闭(~C)";
         Text[ russian ] = "~�������";
-        Text[ polish ] = "Zam~knij";
+        Text[ polish ] = "Zamknij";
         Text[ japanese ] = "閉じる(~C)";
         Text[ chinese_traditional ] = "關閉(~C)";
         Text[ arabic ] = "�����";
@@ -1057,6 +1086,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text[ turkish ] = "~Kapat";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Tanca";
+        Text[ thai ] = "~ปิด";
     };
     HelpButton BTN_HELP
     {
@@ -1087,7 +1117,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         Delta = 60 ;
         Text[ chinese_simplified ] = "附加(~M)";
         Text[ russian ] = "������";
-        Text[ polish ] = "~Wi�cej";
+        Text[ polish ] = "~Dodatki";
         Text[ japanese ] = "詳細(~M)";
         Text[ chinese_traditional ] = "附加(~M)";
         Text[ arabic ] = "������";
@@ -1095,7 +1125,8 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text[ korean ] = "옵션(~M)";
         Text[ turkish ] = "~Di�er se�enekl.";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Opciones";
+        Text[ catalan ] = "~Opcions";
+        Text[ thai ] = "~รายละเอียด";
     };
     PushButton BTN_ATTRIBUTE
     {
@@ -1117,7 +1148,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         TabStop = TRUE ;
         Text[ chinese_simplified ] = "属性(~B)...";
         Text[ russian ] = "��������...";
-        Text[ polish ] = "At~rybuty...";
+        Text[ polish ] = "Atrybuty...";
         Text[ japanese ] = "属性(~B)...";
         Text[ chinese_traditional ] = "屬性(~B)...";
         Text[ arabic ] = "������...";
@@ -1125,7 +1156,8 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text[ korean ] = "속성(~B)...";
         Text[ turkish ] = "�znitelik~ler...";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Atributos...";
+        Text[ catalan ] = "Atri~buts...";
+        Text[ thai ] = "คุณ~ลักษณะ...";
     };
     PushButton BTN_FORMAT
     {
@@ -1143,11 +1175,11 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text [ swedish ] = "Format..." ;
         Text [ dutch ] = "~Opmaak..." ;
         Text [ spanish ] = "~Formato..." ;
-        Text [ english_us ] = "~Format..." ;
+        Text [ english_us ] = "For~mat..." ;
         TabStop = TRUE ;
         Text[ chinese_simplified ] = "格式(~F)...";
         Text[ russian ] = "������...";
-        Text[ polish ] = "~Format...";
+        Text[ polish ] = "Format...";
         Text[ japanese ] = "書式(~F)...";
         Text[ chinese_traditional ] = "格式(~F)...";
         Text[ arabic ] = "�������...";
@@ -1155,7 +1187,8 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text[ korean ] = "서식(~F)...";
         Text[ turkish ] = "~Format...";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Formato...";
+        Text[ catalan ] = "~Format...";
+        Text[ thai ] = "~รูปแบบ...";
     };
     PushButton BTN_NOFORMAT
     {
@@ -1165,7 +1198,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text [ English ] = "~No format" ;
         Text [ norwegian ] = "~Ingen format" ;
         Text [ italian ] = "Senza formato" ;
-        Text [ portuguese_brazilian ] = "~Sem formato" ;
+        Text [ portuguese_brazilian ] = "~Nenhum formato" ;
         Text [ portuguese ] = "~Sem formato" ;
         Text [ finnish ] = "Ei ~muotoilua" ;
         Text [ danish ] = "Intet format" ;
@@ -1177,7 +1210,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         TabStop = TRUE ;
         Text[ chinese_simplified ] = "无格式(~N)";
         Text[ russian ] = "��� �������";
-        Text[ polish ] = "Bez format~u";
+        Text[ polish ] = "Bez f~ormatu";
         Text[ japanese ] = "書式なし(~N)";
         Text[ chinese_traditional ] = "無格式(~N)";
         Text[ arabic ] = "���� �����";
@@ -1185,7 +1218,8 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text[ greek ] = "����� ~�����";
         Text[ korean ] = "서식 없음(~N)";
         Text[ turkish ] = "For~mats�z";
-        Text[ catalan ] = "S~in formato";
+        Text[ catalan ] = "~Sense format";
+        Text[ thai ] = "ไ~ม่มีรูปแบบ";
     };
     String STR_WORDCALC
     {
@@ -1193,7 +1227,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text [ ENGLISH ] = "Comple~te Cells" ;
         Text [ norwegian ] = "Fullf~�r Celler" ;
         Text [ italian ] = "Celle intere" ;
-        Text [ portuguese_brazilian ] = "C�lulas Comple~tas" ;
+        Text [ portuguese_brazilian ] = "C?lulas Comple~tas" ;
         Text [ portuguese ] = "S� c�lulas com~pletas" ;
         Text [ finnish ] = "Kaikki solut" ;
         Text [ danish ] = "K~un hele r�kker" ;
@@ -1204,7 +1238,7 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text [ english_us ] = "~Entire cells" ;
         Text[ chinese_simplified ] = "只是整个单元格内容(~E)";
         Text[ russian ] = "������ �������";
-        Text[ polish ] = "~Ca�e kom�rki";
+        Text[ polish ] = "Tylko ca�e kom�rki";
         Text[ japanese ] = "セル全体(~E)";
         Text[ chinese_traditional ] = "只是整個儲存格(~E)";
         Text[ arabic ] = "����� ����� ���";
@@ -1212,7 +1246,8 @@ ModelessDialog RID_SVXDLG_SEARCH
         Text[ greek ] = "���� �~������� �����";
         Text[ korean ] = "전체 셀만(~E)";
         Text[ turkish ] = "Yaln�zca ~tam h�creler";
-        Text[ catalan ] = "Solo cel~das completas";
+        Text[ catalan ] = "Nom�s cel.l~es completes";
+        Text[ thai ] = "~ทั้งเซลล์";
     };
     Text[ catalan ] = "Buscar y reemplazar";
 };
@@ -1236,3 +1271,8 @@ ModelessDialog RID_SVXDLG_SEARCH
 
 
 
+
+
+
+
+
diff --git a/svx/source/dialog/srchxtra.src b/svx/source/dialog/srchxtra.src
index d0e751818cb1..5cc8ae56ed46 100644
--- a/svx/source/dialog/srchxtra.src
+++ b/svx/source/dialog/srchxtra.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: srchxtra.src,v $
  *
- *  $Revision: 1.40 $
+ *  $Revision: 1.41 $
  *
- *  last change: $Author: kz $ $Date: 2002-11-27 16:29:48 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -182,7 +182,7 @@ TabDialog RID_SVXDLG_SEARCHFORMAT
                 Text[ polish ] = "Uk�ad azjatycki";
                 Text[ portuguese_brazilian ] = "Asian Layout";
                 Text[ japanese ] = "日本語レイアウト";
-                Text[ korean ] = "한글 입력 체계";
+                Text[ korean ] = "한글 글자꼴";
                 Text[ chinese_simplified ] = "中日韩版式";
                 Text[ chinese_traditional ] = "中日韓版式";
                 Text[ turkish ] = "Asian Layout";
@@ -214,7 +214,7 @@ TabDialog RID_SVXDLG_SEARCHFORMAT
                 Text[ chinese_traditional ] = "縮排和間隔";
                 Text[ arabic ] = "������� ��������";
                 Text[ greek ] = "������ ��� ����������";
-                Text[ korean ] = "들여 쓰기와 간격";
+                Text[ korean ] = "들여쓰기 및 간격";
                 Text[ turkish ] = "Girinti ve Aral�klar";
                 Text[ language_user1 ] = " ";
                 Text[ catalan ] = "Sagnats i espaiat";
@@ -284,7 +284,7 @@ TabDialog RID_SVXDLG_SEARCHFORMAT
                 Text [ ENGLISH ] = "Asian typography" ;
                 Text[ english_us ] = "Asian Typography";
                 Text[ portuguese ] = "Tipografia asi�tica";
-                Text[ russian ] = "��������� ������������ ��������";
+                Text[ russian ] = "��������� ������������ ��������";
                 Text[ greek ] = "�������� ����������";
                 Text[ dutch ] = "Aziatische typografie";
                 Text[ french ] = "Typographie asiatique";
@@ -548,7 +548,7 @@ ModalDialog RID_SVXDLG_SEARCHSIMILARITY
         Text [ English ] = "~Remove characters" ;
         Text [ english_us ] = "~Remove characters" ;
         Text [ italian ] = "Elimina carattere" ;
-        Text [ spanish ] = "~Eliminar caracteres" ;
+        Text [ spanish ] = "~Borrar caracteres" ;
         Text [ french ] = "Caract�res en ~moins" ;
         Text [ dutch ] = "Tekens ver~wijderen" ;
         Text [ swedish ] = "~Ta bort tecken" ;
@@ -672,7 +672,7 @@ ModalDialog RID_SVXDLG_SEARCHSIMILARITY
     Text[ chinese_traditional ] = "相似字搜尋";
     Text[ arabic ] = "����� �� ����� �������";
     Text[ greek ] = "��������� ����������";
-    Text[ korean ] = "유사성 찾기";
+    Text[ korean ] = "유사성 검색";
     Text[ turkish ] = "Benzerleri ara";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Cerca de similitud";
@@ -686,3 +686,8 @@ ModalDialog RID_SVXDLG_SEARCHSIMILARITY
 
 
 
+
+
+
+
+
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 1b364f134c2b..c7fa584a2842 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svxruler.cxx,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: os $ $Date: 2002-11-29 17:20:42 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -94,6 +94,10 @@
 #include "lrspitem.hxx"
 #include "protitem.hxx"
 
+#ifndef RULER_TAB_RTL
+#define RULER_TAB_RTL           ((USHORT)0x0010)
+#endif
+
 // STATIC DATA -----------------------------------------------------------
 
 #define CTRL_ITEM_COUNT 12
@@ -468,9 +472,11 @@ __EXPORT SvxRuler::~SvxRuler()
         EndListening(*pBindings);
 
     pBindings->EnterRegistrations();
+
     for(USHORT i = 0; i < CTRL_ITEM_COUNT  && pCtrlItem[i]; ++i)
         delete pCtrlItem[i];
-    delete pCtrlItem;
+    delete[] pCtrlItem;
+
     delete pLRSpaceItem;
     delete pMinMaxItem;
     delete pULSpaceItem;
@@ -480,11 +486,12 @@ __EXPORT SvxRuler::~SvxRuler()
     delete pPagePosItem;
     delete pColumnItem;
     delete pObjectItem;
-    delete pIndents;
-    delete pBorders;
-    delete pObjectBorders;
-    delete pTabs;
+    delete[] pIndents;
+    delete[] pBorders;
+    delete[] pObjectBorders;
+    delete[] pTabs;
     delete pRuler_Imp;
+
     pBindings->LeaveRegistrations();
 }
 
@@ -920,13 +927,15 @@ void SvxRuler::UpdatePara()
     // Abhaengigkeit zu PagePosItem
     if(pParaItem && pPagePosItem && !pObjectItem)
     {
+        BOOL bRTLText = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
         // Erstzeileneinzug, ist negativ zum linken Absatzrand
         long nLeftFrameMargin = GetLeftFrameMargin();
         long nRightFrameMargin = GetRightFrameMargin();
-        if(pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue())
+        if(bRTLText)
             pIndents[INDENT_FIRST_LINE].nPos =
                 ConvertHPosPixel(
                 nRightFrameMargin -
+                pParaItem->GetTxtLeft() -
                 pParaItem->GetTxtFirstLineOfst() + lAppNullOffset );
         else
             pIndents[INDENT_FIRST_LINE].nPos =
@@ -940,16 +949,32 @@ void SvxRuler::UpdatePara()
         else
             pIndents[INDENT_FIRST_LINE].nStyle &= ~RULER_STYLE_INVISIBLE;
 
-        // linker Rand
-        pIndents[INDENT_LEFT_MARGIN].nPos =
-            ConvertHPosPixel(
-                nLeftFrameMargin +
-                pParaItem->GetTxtLeft() + lAppNullOffset);
-        // rechter Rand, immer negativ zum rechten Rand des umgebenden Frames
-        pIndents[INDENT_RIGHT_MARGIN].nPos =
-            ConvertHPosPixel(
-                nRightFrameMargin -
-                pParaItem->GetRight() + lAppNullOffset);
+        if(bRTLText)
+        {
+            // left margin
+            pIndents[INDENT_LEFT_MARGIN].nPos =
+                ConvertHPosPixel(
+                    nRightFrameMargin -
+                    pParaItem->GetTxtLeft() + lAppNullOffset);
+            // right margin
+            pIndents[INDENT_RIGHT_MARGIN].nPos =
+                ConvertHPosPixel(
+                    nLeftFrameMargin +
+                    pParaItem->GetRight() + lAppNullOffset);
+        }
+        else
+        {
+            // linker Rand
+            pIndents[INDENT_LEFT_MARGIN].nPos =
+                ConvertHPosPixel(
+                    nLeftFrameMargin +
+                    pParaItem->GetTxtLeft() + lAppNullOffset);
+            // rechter Rand, immer negativ zum rechten Rand des umgebenden Frames
+            pIndents[INDENT_RIGHT_MARGIN].nPos =
+                ConvertHPosPixel(
+                    nRightFrameMargin -
+                    pParaItem->GetRight() + lAppNullOffset);
+        }
         if(pParaBorderItem)
         {
             pIndents[INDENT_LEFT_BORDER].nPos =
@@ -1164,15 +1189,19 @@ void SvxRuler::UpdateTabs()
     {
         // Puffer fuer DefaultTabStop
         // Abstand letzter Tab <-> Rechter Absatzrand / DefaultTabDist
+        BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
+        long nLeftFrameMargin = GetLeftFrameMargin();
+        long nRightFrameMargin = GetRightFrameMargin();
+
         const long lParaIndent =
-            GetLeftFrameMargin() + pParaItem->GetTxtLeft();
+            nLeftFrameMargin + pParaItem->GetTxtLeft();
         const long lLastTab =
              pTabStopItem->Count()?
               ConvertHPosPixel((*pTabStopItem)[pTabStopItem->Count()-1].GetTabPos()): 0;
         const long lPosPixel =
             ConvertHPosPixel(lParaIndent) + lLastTab;
         const long lRightIndent =
-            ConvertHPosPixel(GetRightFrameMargin() - pParaItem->GetRight());
+            ConvertHPosPixel(nRightFrameMargin - pParaItem->GetRight());
         long nDefTabDist = ConvertHPosPixel(lDefTabDist);
         if( !nDefTabDist )
             nDefTabDist = 1;
@@ -1192,6 +1221,8 @@ void SvxRuler::UpdateTabs()
 
         nTabCount = 0;
         USHORT j;
+        const long lRightPixMargin = ConvertSizePixel(nRightFrameMargin - pParaItem->GetTxtLeft());
+        const long lParaIndentPix = ConvertSizePixel(lParaIndent);
         for(j = 0; j < pTabStopItem->Count(); ++j)
         {
             const SvxTabStop *pTab = &(*pTabStopItem)[j];
@@ -1201,27 +1232,50 @@ void SvxRuler::UpdateTabs()
             // nicht ueber den rechten Absatzrand
             if(pTabs[nTabCount+TAB_GAP].nPos > lRightIndent)
                 break;
+            if(bRTL)
+            {
+                pTabs[nTabCount+TAB_GAP].nPos = lParaIndentPix + lRightPixMargin - pTabs[nTabCount+TAB_GAP].nPos;
+            }
             pTabs[nTabCount+TAB_GAP].nStyle = ToSvTab_Impl(pTab->GetAdjustment());
             ++nTabCount;
         }
-        const long lParaIndentPix = ConvertSizePixel(lParaIndent);
         if(!pTabStopItem->Count())
-            pTabs[0].nPos = lParaIndentPix;
+            pTabs[0].nPos = bRTL ? lRightPixMargin : lParaIndentPix;
 
         // Rest mit Default-Tabs fuellen
-        for(j = 0; j < nDefTabBuf; ++j)
+        if(bRTL)
         {
-            pTabs[nTabCount + TAB_GAP].nPos =
-                pTabs[nTabCount].nPos + nDefTabDist;
-
-            if(j == 0 )
-                pTabs[nTabCount + TAB_GAP].nPos -=
-                    ((pTabs[nTabCount + TAB_GAP].nPos - lParaIndentPix)
-                     % nDefTabDist );
-            if(pTabs[nTabCount+TAB_GAP].nPos >= lRightIndent)
-                break;
-            pTabs[nTabCount + TAB_GAP].nStyle = RULER_TAB_DEFAULT;
-            ++nTabCount;
+            for(j = 0; j < nDefTabBuf; ++j)
+            {
+                pTabs[nTabCount + TAB_GAP].nPos =
+                    pTabs[nTabCount].nPos - nDefTabDist;
+
+                if(j == 0 )
+                    pTabs[nTabCount + TAB_GAP].nPos -=
+                        ((pTabs[nTabCount + TAB_GAP].nPos - lRightPixMargin)
+                         % nDefTabDist );
+                if(pTabs[nTabCount+TAB_GAP].nPos <= lParaIndentPix)
+                    break;
+                pTabs[nTabCount + TAB_GAP].nStyle = RULER_TAB_DEFAULT;
+                ++nTabCount;
+            }
+        }
+        else
+        {
+            for(j = 0; j < nDefTabBuf; ++j)
+            {
+                pTabs[nTabCount + TAB_GAP].nPos =
+                    pTabs[nTabCount].nPos + nDefTabDist;
+
+                if(j == 0 )
+                    pTabs[nTabCount + TAB_GAP].nPos -=
+                        ((pTabs[nTabCount + TAB_GAP].nPos - lParaIndentPix)
+                         % nDefTabDist );
+                if(pTabs[nTabCount+TAB_GAP].nPos >= lRightIndent)
+                    break;
+                pTabs[nTabCount + TAB_GAP].nStyle = RULER_TAB_DEFAULT;
+                ++nTabCount;
+            }
         }
         const size_t nSize = sizeof(RulerTab) * nTabCount;
         SetTabs(nTabCount, pTabs+TAB_GAP);
@@ -1709,7 +1763,7 @@ void SvxRuler::DragIndents()
 
     BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
     if((nIdx == INDENT_FIRST_LINE ||
-            (!bRTL && nIdx == INDENT_LEFT_MARGIN ) ||(bRTL && nIdx == INDENT_RIGHT_MARGIN ))&&
+            nIdx == INDENT_LEFT_MARGIN )  &&
         (nDragType & DRAG_OBJECT_LEFT_INDENT_ONLY) !=
         DRAG_OBJECT_LEFT_INDENT_ONLY)
         pIndents[INDENT_FIRST_LINE].nPos -= lDiff;
@@ -1790,10 +1844,8 @@ void SvxRuler::DragTabs()
 */
 {
 
-    const long lDragPos = GetCorrectedDragPos();
-
-
-
+    BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
+    long lDragPos = GetCorrectedDragPos();
 
     USHORT nIdx = GetDragAryPos()+TAB_GAP;
     DrawLine_Impl(lTabPos, 7, bHorz);
@@ -2196,24 +2248,60 @@ void SvxRuler::ApplyIndents()
     // #62986# : Ist der neue TxtLeft kleiner als der alte FirstLineIndent,
     // dann geht die Differenz verloren und der Absatz wird insgesamt
     // zu weit eingerueckt, deswegen erst den FirstLineOffset setzen, dann den TxtLeft
+    if(bRTL)
+    {
+        long nLeftFrameMargin = GetLeftFrameMargin();
+        long nRightFrameMargin = GetRightFrameMargin();
+        nNewTxtLeft = nRightFrameMargin - nNewTxtLeft - nLeftFrameMargin;
+        nNewFirstLineOffset -= nNewTxtLeft;
+        if(pParaBorderItem)
+        {
+            nNewTxtLeft += pParaBorderItem->GetLeft() + pParaBorderItem->GetRight();
+            nNewFirstLineOffset -= pParaBorderItem->GetRight();
+        }
+    }
     pParaItem->SetTxtFirstLineOfst(nNewFirstLineOffset);
     pParaItem->SetTxtLeft(nNewTxtLeft);
 
-    if(pColumnItem && !IsActLastColumn( TRUE ))
-        pParaItem->SetRight(
-            PixelHAdjust(
-                ConvertHPosLogic(
-                    pBorders[GetActRightColumn( TRUE )].nPos -
-                    pIndents[INDENT_RIGHT_MARGIN].nPos) -
-                lAppNullOffset,
-                pParaItem->GetRight()));
+    if(pColumnItem && ((!bRTL && !IsActLastColumn( TRUE ))|| (bRTL && !IsActFirstColumn())))
+    {
+        if(bRTL)
+        {
+            long nActBorder = pBorders[GetActLeftColumn( TRUE )].nPos;
+            long nRightMargin = pIndents[INDENT_RIGHT_MARGIN].nPos;
+            long nConvert = ConvertHPosLogic( nRightMargin - nActBorder );
+            pParaItem->SetRight( PixelHAdjust( nConvert - lAppNullOffset, pParaItem->GetRight() ) );
+        }
+        else
+        {
+            pParaItem->SetRight(
+                PixelHAdjust(
+                    ConvertHPosLogic(
+                        pBorders[GetActRightColumn( TRUE )].nPos -
+                        pIndents[INDENT_RIGHT_MARGIN].nPos) -
+                    lAppNullOffset,
+                    pParaItem->GetRight()));
+        }
 
+    }
     else
-        pParaItem->SetRight( PixelHAdjust(
-            ConvertHPosLogic(GetMargin2() -
+    {
+        if(bRTL)
+        {
+            pParaItem->SetRight( PixelHAdjust(
+                ConvertHPosLogic(GetMargin1() +
+                             pIndents[INDENT_RIGHT_MARGIN].nPos) - GetLeftFrameMargin() +
+                             (pParaBorderItem ? pParaBorderItem->GetLeft() : 0) -
+                lAppNullOffset, pParaItem->GetRight()));
+        }
+        else
+        {
+            pParaItem->SetRight( PixelHAdjust(
+                ConvertHPosLogic(GetMargin2() -
                              pIndents[INDENT_RIGHT_MARGIN].nPos) -
-            lAppNullOffset, pParaItem->GetRight()));
-
+                lAppNullOffset, pParaItem->GetRight()));
+        }
+    }
     USHORT nParaId  = bHorz ? SID_ATTR_PARA_LRSPACE : SID_ATTR_PARA_LRSPACE_VERTICAL;
     pBindings->GetDispatcher()->Execute( nParaId, SFX_CALLMODE_RECORD, pParaItem, 0L );
     UpdateTabs();
@@ -2228,6 +2316,7 @@ void SvxRuler::ApplyTabs()
 
 */
 {
+    BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
     const USHORT nCoreIdx = GetDragAryPos();
     if(IsDragDelete())
     {
@@ -2264,10 +2353,15 @@ void SvxRuler::ApplyTabs()
            pTabs[nCoreIdx+TAB_GAP].nPos+Ruler::GetNullOffset()==nMaxRight)
             aTabStop.GetTabPos() = pRuler_Imp->lMaxRightLogic-lLogicNullOffset;
         else
-            aTabStop.GetTabPos() = PixelHAdjust(ConvertHPosLogic(pTabs[nCoreIdx+TAB_GAP].nPos -
-                                                                 GetLeftIndent()) -
-                                                lAppNullOffset,
-                                                aTabStop.GetTabPos());
+        {
+            if(bRTL)
+                aTabStop.GetTabPos() = PixelHAdjust(
+                    ConvertHPosLogic(GetLeftIndent() - pTabs[nCoreIdx+TAB_GAP].nPos) - lAppNullOffset,
+                                                                                        aTabStop.GetTabPos());
+            else
+                aTabStop.GetTabPos() = PixelHAdjust(
+                    ConvertHPosLogic(pTabs[nCoreIdx+TAB_GAP].nPos - GetLeftIndent()) - lAppNullOffset, aTabStop.GetTabPos());
+        }
         pTabStopItem->Remove(nCoreIdx);
         pTabStopItem->Insert(aTabStop);
     }
@@ -2493,18 +2587,20 @@ void __EXPORT SvxRuler::Click()
         pBindings->Update( SID_RULER_PROTECT );
         pBindings->Update( SID_ATTR_PARA_LRSPACE_VERTICAL );
     }
+    BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
     if(pTabStopItem &&
-       (nFlags & SVXRULER_SUPPORT_TABS) == SVXRULER_SUPPORT_TABS) {
+       (nFlags & SVXRULER_SUPPORT_TABS) == SVXRULER_SUPPORT_TABS)
+    {
         BOOL bContentProtected = pRuler_Imp->aProtectItem.IsCntntProtected();
         if( bContentProtected ) return;
         const long lPos = GetClickPos();
-        if(lPos > Min(GetFirstLineIndent(), GetLeftIndent()) &&
-           lPos < GetRightIndent())
+        if((bRTL && lPos < Min(GetFirstLineIndent(), GetLeftIndent()) && lPos > GetRightIndent()) ||
+            (!bRTL && lPos > Min(GetFirstLineIndent(), GetLeftIndent()) && lPos < GetRightIndent()))
         {
             //convert position in left-to-right text
             long nTabPos;
-            if(pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue())
-                nTabPos = GetRightIndent() - lPos;
+            if(bRTL)
+                nTabPos = GetLeftIndent() - lPos;
             else
                 nTabPos = lPos - GetLeftIndent();
             SvxTabStop aTabStop(ConvertHPosLogic(nTabPos),
@@ -2547,6 +2643,7 @@ void SvxRuler::CalcMinMax()
 */
 
 {
+    BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
     const long lNullPix = ConvertPosPixel(lLogicNullOffset);
     pRuler_Imp->lMaxLeftLogic=pRuler_Imp->lMaxRightLogic=-1;
     switch(GetDragType())
@@ -2554,28 +2651,23 @@ void SvxRuler::CalcMinMax()
       case RULER_TYPE_MARGIN1:
         {        // linker Rand umgebender Frame
             // DragPos - NOf zwischen links - rechts
-            /*
-              if(!pBorders)
-              links = 0;
-              rechts = NOf + RAR - Max(EZ,LAR)) -lMinFrame
-              else
-              links = 0;
-              rechts = NOf - lMinFrame
-              if(act)
-              rechts += RAR - Max(EZ,LAR)
-              else
-              rechts += pBorders[0].nPos
-              */
-//      nMaxLeft = pMinMaxItem?
-//          ConvertSizePixel(GetLeftMin()): 0; //Koordinate des linken Papierrands
             pRuler_Imp->lMaxLeftLogic = GetLeftMin();
             nMaxLeft=ConvertSizePixel(pRuler_Imp->lMaxLeftLogic);
 
             if(!pColumnItem || pColumnItem->Count() == 1 )
             {
-                nMaxRight = lNullPix + GetRightIndent() -
-                    Max(GetFirstLineIndent(), GetLeftIndent()) -
-                    lMinFrame;
+                if(bRTL)
+                {
+                    nMaxRight = lNullPix - GetRightIndent() +
+                        Max(GetFirstLineIndent(), GetLeftIndent()) -
+                        lMinFrame;
+                }
+                else
+                {
+                    nMaxRight = lNullPix + GetRightIndent() -
+                        Max(GetFirstLineIndent(), GetLeftIndent()) -
+                        lMinFrame;
+                }
             }
             else
             {
@@ -2596,9 +2688,20 @@ void SvxRuler::CalcMinMax()
                 {
                     nMaxRight = lNullPix - lMinFrame;
                     if(pColumnItem->IsFirstAct())
-                        nMaxRight += Min(
-                            pBorders[0].nPos, GetRightIndent() -
-                            Max(GetFirstLineIndent(), GetLeftIndent()));
+                    {
+                        if(bRTL)
+                        {
+                            nMaxRight += Min(
+                                pBorders[0].nPos,
+                                Max(GetFirstLineIndent(), GetLeftIndent()) - GetRightIndent());
+                        }
+                        else
+                        {
+                            nMaxRight += Min(
+                                pBorders[0].nPos, GetRightIndent() -
+                                Max(GetFirstLineIndent(), GetLeftIndent()));
+                        }
+                    }
                     else if( pColumnItem->Count() > 1 )
                         nMaxRight += pBorders[0].nPos;
                     else
@@ -2611,29 +2714,12 @@ void SvxRuler::CalcMinMax()
                         if(nTmp>nMaxLeft)
                             nMaxLeft=nTmp;
                     }
-                //                      nMaxLeft = pLRSpaceItem?
-                //                                              ConvertSizePixel(pLRSpaceItem->GetLeft()): 0;
                 }
             }
             break;
         }
       case RULER_TYPE_MARGIN2:
-                             {        // rechter Rand umgebender Frame
-/*                rechts = PageWidth
-        if(!pBorders)
-            links = m2 - RAR + Max(EZ. LAR) + lMinF + nOF
-            ??PageWidth - ( NOf + RAR - Max(EZ,LAR) - lMinFrame
-        else
-            links = NOf + pBorders[letzte].nPos +
-                            pBorders[letzte].nWidth
-            links += lMinFrame
-            if(act)
-                links += M2 - RAR + Max(EZ,LAR)
-*/
-//      nMaxRight = pMinMaxItem ?
-//          ConvertSizePixel(
-//              (bHorz ? pPagePosItem->GetWidth() : pPagePosItem->GetHeight())
-//                           - GetRightMax()):  GetPageWidth();
+     {        // rechter Rand umgebender Frame
         pRuler_Imp->lMaxRightLogic =
             pMinMaxItem ?
                 GetPageWidth() - GetRightMax() : GetPageWidth();
@@ -2642,22 +2728,36 @@ void SvxRuler::CalcMinMax()
 
         if(!pColumnItem)
         {
-            nMaxLeft =  GetMargin2() - GetRightIndent() +
-                Max(GetFirstLineIndent(),GetLeftIndent())  - GetMargin1()+
-                    lMinFrame + lNullPix;
-//          nMaxLeft = GetMargin1() + lNullPix + lMinFrame;
-//          nMaxLeft =
-//              GetMargin2() - /Max(GetFirstLineIndent(), GetLeftIndent()) +
-//                  lMinFrame + lNullPix;
+            if(bRTL)
+            {
+                nMaxLeft =  GetMargin2() + GetRightIndent() -
+                    Max(GetFirstLineIndent(),GetLeftIndent())  - GetMargin1()+
+                        lMinFrame + lNullPix;
+            }
+            else
+            {
+                nMaxLeft =  GetMargin2() - GetRightIndent() +
+                    Max(GetFirstLineIndent(),GetLeftIndent())  - GetMargin1()+
+                        lMinFrame + lNullPix;
+            }
         }
         else
         {
             nMaxLeft = lMinFrame + lNullPix;
             if(IsActLastColumn() || pColumnItem->Count() < 2 ) //Falls letzte Spalte aktiv
             {
-                nMaxLeft = lMinFrame + lNullPix + GetMargin2() -
-                    GetRightIndent() + Max(GetFirstLineIndent(),
-                                           GetLeftIndent());
+                if(bRTL)
+                {
+                    nMaxLeft = lMinFrame + lNullPix + GetMargin2() +
+                        GetRightIndent() - Max(GetFirstLineIndent(),
+                                               GetLeftIndent());
+                }
+                else
+                {
+                    nMaxLeft = lMinFrame + lNullPix + GetMargin2() -
+                        GetRightIndent() + Max(GetFirstLineIndent(),
+                                               GetLeftIndent());
+                }
             }
             if( pColumnItem->Count() >= 2 )
             {
@@ -2668,69 +2768,12 @@ void SvxRuler::CalcMinMax()
                 nMaxLeft=Max(nMaxLeft,nNewMaxLeft);
             }
 
-            // den rechten Tabellen-Rand nicht ueber den Seitenrand ziehen
-/*          if(pLRSpaceItem && pColumnItem->IsTable())
-            {
-
-                long nTmp=GetMargin2();/*ConvertSizePixel(pPagePosItem->GetWidth() -
-                                           pLRSpaceItem->GetRight() -
-                                           lLogicNullOffset + lAppNullOffset);
-
-//              long nTmp=ConvertSizePixel(pLRSpaceItem->GetRight());
-                if(nTmp<nMaxRight)
-                    nMaxRight=nTmp;
-            } TLX: Erstmal weggelassen, da zu undurchschaubar*/
-//                      nMaxRight -= pLRSpaceItem && pColumnItem->IsTable()?
-//                                                ConvertSizePixel(pLRSpaceItem->GetRight()): 0;
         }
         break;
     }
     case RULER_TYPE_BORDER:
     {                // Tabelle, Spalten (Modifier)
         const USHORT nIdx = GetDragAryPos();
-/*
-        // linke Seite sizen
-        rechts = pBorders[nAct].nPos + pBorders[Act].nWidth + NOf
-        if(erste)
-            links = NOf
-        else
-            links  = pBorders[nAct-1].nPos+ pBorders[Act-1].nWidth + NOf
-        if(act)
-            links += pBorders[nAct].nPos - RAR + Max(EZ,LAR)
-        links += lMinFrame
-
-        // Moven
-        if(erste)
-            links = NOf
-        else
-            links  = pBorders[nAct-1].nPos+ pBorders[Act-1].nWidth + NOf
-        if(act)
-            links += pBorders[nAct].nPos - RAR + Max(EZ,LAR)
-        links += lMinFrame
-
-        if(letzte)
-            rechts = M2 + NOf
-            if(act = BorderCount-1) // Spalte rechts vom diesem Trenner
-                rechts -= M2 - RAR + Max(EZ,LAR)
-        else
-            rechts = NOf + pBorders[nAct+1].nPos
-            if(act+1) // Spalte rechts vom diesem Trenner
-                rechts -= pBorders[nAct].nPos - RAR + Max(EZ,LAR)
-        rechts -= lMinFrame
-
-        // rechte Seite sizen
-        links = pBorders[nAct].nPos
-        if(letzte)
-            rechts = M2 + NOf
-            if(act = BorderCount-1) // Spalte rechts vom diesem Trenner
-                rechts -= M2 - RAR + Max(EZ,LAR)
-        else
-            rechts = NOf + pBorders[nAct+1].nPos
-            if(act+1) // Spalte rechts vom diesem Trenner
-                rechts -= pBorders[nAct].nPos - RAR + Max(EZ,LAR)
-        rechts -= lMinFrame
-
-*/
         switch(GetDragSize())
         {
           case RULER_DRAGSIZE_1 :
@@ -2743,10 +2786,20 @@ void SvxRuler::CalcMinMax()
                 else
                     nMaxLeft = pBorders[nIdx-1].nPos +
                         pBorders[nIdx-1].nWidth + lNullPix;
-                if(nIdx == pColumnItem->GetActColumn()) {
-                    nMaxLeft += pBorders[nIdx].nPos -
-                        GetRightIndent() + Max(GetFirstLineIndent(),
-                                               GetLeftIndent());
+                if(nIdx == pColumnItem->GetActColumn())
+                {
+                    if(bRTL)
+                    {
+                        nMaxLeft += pBorders[nIdx].nPos +
+                            GetRightIndent() - Max(GetFirstLineIndent(),
+                                                   GetLeftIndent());
+                    }
+                    else
+                    {
+                        nMaxLeft += pBorders[nIdx].nPos -
+                            GetRightIndent() + Max(GetFirstLineIndent(),
+                                                   GetLeftIndent());
+                    }
                     if(0 != nIdx)
                         nMaxLeft -= pBorders[nIdx-1].nPos +
                             pBorders[nIdx-1].nWidth;
@@ -2771,12 +2824,24 @@ void SvxRuler::CalcMinMax()
 
                     if(nActRightCol == nIdx)
                     {
-                        nMaxLeft += pBorders[nIdx].nPos -
-                            GetRightIndent() + Max(GetFirstLineIndent(),
-                                                   GetLeftIndent());
-                        if(nActLeftCol!=USHRT_MAX)
-                            nMaxLeft -= pBorders[nActLeftCol].nPos +
-                                pBorders[nActLeftCol].nWidth;
+                        if(bRTL)
+                        {
+                            nMaxLeft += pBorders[nIdx].nPos +
+                                GetRightIndent() - Max(GetFirstLineIndent(),
+                                                       GetLeftIndent());
+                            if(nActLeftCol!=USHRT_MAX)
+                                nMaxLeft -= pBorders[nActLeftCol].nPos +
+                                    pBorders[nActLeftCol].nWidth;
+                        }
+                        else
+                        {
+                            nMaxLeft += pBorders[nIdx].nPos -
+                                GetRightIndent() + Max(GetFirstLineIndent(),
+                                                       GetLeftIndent());
+                            if(nActLeftCol!=USHRT_MAX)
+                                nMaxLeft -= pBorders[nActLeftCol].nPos +
+                                    pBorders[nActLeftCol].nWidth;
+                        }
                     }
                     nMaxLeft += lMinFrame;
                     nMaxLeft += nDragOffset;
@@ -2800,10 +2865,20 @@ void SvxRuler::CalcMinMax()
                             nMaxRight = GetMargin2() + lNullPix;
                             if(IsActLastColumn())
                             {
-                                nMaxRight -=
-                                    GetMargin2() - GetRightIndent() +
-                                        Max(GetFirstLineIndent(),
-                                            GetLeftIndent());
+                                if(bRTL)
+                                {
+                                    nMaxRight -=
+                                        GetMargin2() + GetRightIndent() -
+                                            Max(GetFirstLineIndent(),
+                                                GetLeftIndent());
+                                }
+                                else
+                                {
+                                    nMaxRight -=
+                                        GetMargin2() - GetRightIndent() +
+                                            Max(GetFirstLineIndent(),
+                                                GetLeftIndent());
+                                }
                                 nMaxRight += pBorders[nIdx].nPos +
                                     pBorders[nIdx].nWidth;
                             }
@@ -2820,9 +2895,18 @@ void SvxRuler::CalcMinMax()
                                     USHRT_MAX ?
                                     GetMargin2() :
                                     pBorders[nNotHiddenRightCol].nPos;
-                                nMaxRight -= nBorder - GetRightIndent() +
-                                    Max(GetFirstLineIndent(),
-                                        GetLeftIndent());
+                                if(bRTL)
+                                {
+                                    nMaxRight -= nBorder + GetRightIndent() -
+                                        Max(GetFirstLineIndent(),
+                                            GetLeftIndent());
+                                }
+                                else
+                                {
+                                    nMaxRight -= nBorder - GetRightIndent() +
+                                        Max(GetFirstLineIndent(),
+                                            GetLeftIndent());
+                                }
                                 nMaxRight += pBorders[nIdx].nPos +
                                     pBorders[nIdx].nWidth;
                             }
@@ -2886,82 +2970,86 @@ void SvxRuler::CalcMinMax()
         {
         const USHORT nIdx = GetDragAryPos();
         switch(nIdx) {
-            // EZ:
-            /*
-               links = NOf
-               if(borders && act != erste)
-               links += pBorders[-1].nPos + pBorders[-1].nStyle
-
-               rechts = NOf
-               rechts += RAR - lMinFrame
-
-               LAR:
-               links = NOf
-               if(borders && act != erste)
-               links += pBorders[-1].nPos + pBorders[-1].nStyle
-               rechts = NOf
-               rechts += RAR - lMinFrame
-
-               if(zusammen)
-               if(LAR > EZ)
-               nLeft += LAR - EZ
-               else
-               rechts -= EZ - LAR
-               */
         case INDENT_FIRST_LINE - INDENT_GAP:
         case INDENT_LEFT_MARGIN - INDENT_GAP:
             {
-                nMaxLeft = lNullPix;
+                if(bRTL)
+                {
+                    nMaxLeft = lNullPix + GetRightIndent();
 
-                if(pColumnItem && !pColumnItem->IsFirstAct())
-                    nMaxLeft += pBorders[pColumnItem->GetActColumn()-1].nPos +
-                        pBorders[pColumnItem->GetActColumn()-1].nWidth;
-                nMaxRight = lNullPix + GetRightIndent() - lMinFrame;
+                    if(pColumnItem && !pColumnItem->IsFirstAct())
+                        nMaxLeft += pBorders[pColumnItem->GetActColumn()-1].nPos +
+                            pBorders[pColumnItem->GetActColumn()-1].nWidth;
+                    nMaxRight = lNullPix + GetMargin2();
 
-                // zusammem draggen
-                if(0 != nIdx &&
-                   (nDragType & DRAG_OBJECT_LEFT_INDENT_ONLY) !=
-                   DRAG_OBJECT_LEFT_INDENT_ONLY)
+                    // zusammem draggen
+                    if((INDENT_FIRST_LINE - INDENT_GAP) != nIdx &&
+                       (nDragType & DRAG_OBJECT_LEFT_INDENT_ONLY) !=
+                       DRAG_OBJECT_LEFT_INDENT_ONLY)
+                    {
+                        if(GetLeftIndent() > GetFirstLineIndent())
+                            nMaxLeft += GetLeftIndent() - GetFirstLineIndent();
+                        else
+                            nMaxRight -= GetFirstLineIndent() - GetLeftIndent();
+                    }
+                }
+                else
                 {
-                    if(GetLeftIndent() > GetFirstLineIndent())
-                        nMaxLeft += GetLeftIndent() - GetFirstLineIndent();
-                    else
-                        nMaxRight -= GetFirstLineIndent() - GetLeftIndent();
+                    nMaxLeft = lNullPix;
+
+                    if(pColumnItem && !pColumnItem->IsFirstAct())
+                        nMaxLeft += pBorders[pColumnItem->GetActColumn()-1].nPos +
+                            pBorders[pColumnItem->GetActColumn()-1].nWidth;
+                    nMaxRight = lNullPix + GetRightIndent() - lMinFrame;
+
+                    // zusammem draggen
+                    if((INDENT_FIRST_LINE - INDENT_GAP) != nIdx &&
+                       (nDragType & DRAG_OBJECT_LEFT_INDENT_ONLY) !=
+                       DRAG_OBJECT_LEFT_INDENT_ONLY)
+                    {
+                        if(GetLeftIndent() > GetFirstLineIndent())
+                            nMaxLeft += GetLeftIndent() - GetFirstLineIndent();
+                        else
+                            nMaxRight -= GetFirstLineIndent() - GetLeftIndent();
+                    }
                 }
-                break;
             }
-                /*
-                   RAR:
-                   links = NOf + Max(EZ, LAR)
-                   rechts = NOf
-                   if(borders && !letzte)
-                   rechts =  borders[+1].nPos
-                   else
-                   rechts += M2
-                   */
+          break;
           case INDENT_RIGHT_MARGIN - INDENT_GAP:
             {
-                nMaxLeft = lNullPix +
-                    Max(GetFirstLineIndent(), GetLeftIndent());
-                nMaxRight = lNullPix;
-                if(pColumnItem)
+                if(bRTL)
                 {
-                    USHORT nRightCol=GetActRightColumn( TRUE );
-                    if(!IsActLastColumn( TRUE ))
-                        nMaxRight += pBorders[nRightCol].nPos;
+                    nMaxLeft = lNullPix;
+                    nMaxRight = lNullPix + Min(GetFirstLineIndent(), GetLeftIndent()) - lMinFrame;
+                    if(pColumnItem)
+                    {
+                        USHORT nRightCol=GetActRightColumn( TRUE );
+                        if(!IsActLastColumn( TRUE ))
+                            nMaxRight += pBorders[nRightCol].nPos;
+                        else
+                            nMaxRight += GetMargin2();
+                    }
                     else
-                        nMaxRight += GetMargin2();
+                        nMaxLeft += GetMargin1();
+                    nMaxLeft += lMinFrame;
                 }
                 else
-                    nMaxRight += GetMargin2();
-                nMaxLeft += lMinFrame;
-
-//                  if(pColumnItem && !pColumnItem->IsLastAct())
-//                      nMaxRight += pBorders[pColumnItem->GetActColumn()].nPos;
-//                  else
-//                      nMaxRight += GetMargin2();
-//                  nMaxLeft += lMinFrame;
-
+                {
+                    nMaxLeft = lNullPix +
+                        Max(GetFirstLineIndent(), GetLeftIndent());
+                    nMaxRight = lNullPix;
+                    if(pColumnItem)
+                    {
+                        USHORT nRightCol=GetActRightColumn( TRUE );
+                        if(!IsActLastColumn( TRUE ))
+                            nMaxRight += pBorders[nRightCol].nPos;
+                        else
+                            nMaxRight += GetMargin2();
+                    }
+                    else
+                        nMaxRight += GetMargin2();
+                    nMaxLeft += lMinFrame;
+                }
             }
             break;
         }
@@ -2972,10 +3060,12 @@ void SvxRuler::CalcMinMax()
            links = NOf + Max(LAR, EZ)
            rechts = NOf + RAR
            */
-        nMaxLeft = lNullPix + Min(GetFirstLineIndent(), GetLeftIndent());
+        long nRightIndent = GetRightIndent();
+        long nLeftIndent = GetLeftIndent();
+        nMaxLeft = bRTL ? lNullPix + GetRightIndent()
+                            : lNullPix + Min(GetFirstLineIndent(), GetLeftIndent());
         pRuler_Imp->lMaxRightLogic=GetLogicRightIndent()+lLogicNullOffset;
         nMaxRight = ConvertSizePixel(pRuler_Imp->lMaxRightLogic);
-//      nMaxRight = lNullPix + GetRightIndent();
         break;
     }
 #ifdef DEBUGLIN
@@ -3049,7 +3139,7 @@ long __EXPORT SvxRuler::StartDrag()
             if( bContentProtected )
                 return FALSE;
             BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
-            USHORT nIndent = bRTL ? INDENT_RIGHT_MARGIN : INDENT_LEFT_MARGIN;
+            USHORT nIndent = INDENT_LEFT_MARGIN;
             if((nIndent) == GetDragAryPos() + INDENT_GAP) {        // Linker Absatzeinzug
                 pIndents[0] = pIndents[INDENT_FIRST_LINE];
                 pIndents[0].nStyle |= RULER_STYLE_DONTKNOW;
diff --git a/svx/source/dialog/tabarea.src b/svx/source/dialog/tabarea.src
index 2c94a0fe3a34..bdcf6076afbb 100644
--- a/svx/source/dialog/tabarea.src
+++ b/svx/source/dialog/tabarea.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabarea.src,v $
  *
- *  $Revision: 1.51 $
+ *  $Revision: 1.52 $
  *
- *  last change: $Author: kz $ $Date: 2002-12-09 09:59:24 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -98,7 +98,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
         Text[ polish ] = "Tryb przezroczysto�ci";
         Text[ portuguese_brazilian ] = "Transparency mode";
         Text[ japanese ] = "透過性モード";
-        Text[ korean ] = "투명 모드";
+        Text[ korean ] = "투명 효과 모드";
         Text[ chinese_simplified ] = "透明模式";
         Text[ chinese_traditional ] = "透明模式";
         Text[ turkish ] = "Transparency mode";
@@ -125,7 +125,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
         Text[ polish ] = "~Bez przezroczysto�ci";
         Text[ portuguese_brazilian ] = "~No transparence";
         Text[ japanese ] = "透過性なし(~N)";
-        Text[ korean ] = "투명효과 없음(~N)";
+        Text[ korean ] = "투명 효과 없음(~N)";
         Text[ chinese_simplified ] = "不透明(~N)";
         Text[ chinese_traditional ] = "不透明(~N)";
         Text[ arabic ] = "���� ������";
@@ -143,7 +143,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
         Text [ ENGLISH ] = "~Transparency" ;
         Text[ english_us ] = "~Transparency";
         Text[ portuguese ] = "~Transpar�ncia";
-        Text[ russian ] = "������������";
+        Text[ russian ] = "���~���������";
         Text[ greek ] = "�������� ���������";
         Text[ dutch ] = "~Transparantie";
         Text[ french ] = "~Transparence";
@@ -380,7 +380,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
         StringList [ japanese ] =
         {
             < "線状" ; Default ; > ;
-            < "軸" ; Default ; > ;
+            < "軸状" ; Default ; > ;
             < "放射線状" ; Default ; > ;
             < "楕円体" ; Default ; > ;
             < "正方形" ; Default ; > ;
@@ -390,10 +390,10 @@ TabPage RID_SVXPAGE_TRANSPARENCE
         {
             < "선형" ; Default ; > ;
             < "축형" ; Default ; > ;
-            < "방사선형" ; Default ; > ;
+            < "방사형" ; Default ; > ;
             < "타원형" ; Default ; > ;
             < "정사각형" ; Default ; > ;
-            < "직사각형" ; Default ; > ;
+            < "사각형" ; Default ; > ;
         };
         StringList [ chinese_simplified ] =
         {
@@ -478,7 +478,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
         Text[ polish ] = "Centrum ~X";
         Text[ portuguese_brazilian ] = "Center ~X";
         Text[ japanese ] = "中心 ~X";
-        Text[ korean ] = "중앙 ~X";
+        Text[ korean ] = "중심 ~X";
         Text[ chinese_simplified ] = "中心 ~X";
         Text[ chinese_traditional ] = "中心 ~X";
         Text[ arabic ] = "���� �";
@@ -522,7 +522,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
         Text[ polish ] = "Centrum ~Y";
         Text[ portuguese_brazilian ] = "Center ~Y";
         Text[ japanese ] = "中心 ~Y";
-        Text[ korean ] = "중앙 ~Y";
+        Text[ korean ] = "중심 ~Y";
         Text[ chinese_simplified ] = "中心 ~Y";
         Text[ chinese_traditional ] = "中心 ~Y";
         Text[ arabic ] = "���� �";
@@ -620,7 +620,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
         Text [ ENGLISH ] = "~Border" ;
         Text[ english_us ] = "~Border";
         Text[ portuguese ] = "~Margem";
-        Text[ russian ] = "~������";
+        Text[ russian ] = "����~��";
         Text[ greek ] = "��~�������";
         Text[ dutch ] = "~Marge";
         Text[ french ] = "~Bordure";
@@ -802,7 +802,7 @@ TabPage RID_SVXPAGE_AREA
     Text[ chinese_traditional ] = "平面";
     Text[ arabic ] = "�������";
     Text[ greek ] = "���������";
-    Text[ korean ] = "개체 채우기";
+    Text[ korean ] = "면";
     Text[ turkish ] = "Y�zey";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Ompliment";
@@ -912,7 +912,7 @@ TabPage RID_SVXPAGE_AREA
         Text[ polish ] = "Gradient";
         Text[ portuguese_brazilian ] = "~D?grad?";
         Text[ japanese ] = "グラデーション";
-        Text[ korean ] = "그라데이션";
+        Text[ korean ] = "그라디언트";
         Text[ chinese_simplified ] = "彩色图案";
         Text[ chinese_traditional ] = "彩色圖案";
         Text[ turkish ] = "Grad~yan";
@@ -957,7 +957,7 @@ TabPage RID_SVXPAGE_AREA
         Text [ ENGLISH ] = "~Bitmap" ;
         Text[ english_us ] = "Bitmap";
         Text[ portuguese ] = "~Bitmap";
-        Text[ russian ] = "�����";
+        Text[ russian ] = "�~����";
         Text[ greek ] = "~Bitmap";
         Text[ dutch ] = "~Bitmap";
         Text[ french ] = "Bitmap";
@@ -1121,7 +1121,7 @@ TabPage RID_SVXPAGE_AREA
         Text[ polish ] = "Kolor t�a";
         Text[ portuguese_brazilian ] = "~Backgroundcolor";
         Text[ japanese ] = "背景色(~B)";
-        Text[ korean ] = "배경색(~B)";
+        Text[ korean ] = "배경 색상(~B)";
         Text[ chinese_simplified ] = "背景颜色(~B)";
         Text[ chinese_traditional ] = "背景顏色(~B)";
         Text[ arabic ] = "��� �������";
@@ -1195,7 +1195,7 @@ TabPage RID_SVXPAGE_AREA
         Text[ chinese_traditional ] = "原件(~O)";
         Text[ arabic ] = "�����";
         Text[ greek ] = "������";
-        Text[ korean ] = "원래대로(~O)";
+        Text[ korean ] = "원본(~O)";
         Text[ turkish ] = "~As�l";
         Text[ language_user1 ] = " ";
         Text[ finnish ] = "~Alkuper�inen";
@@ -1225,7 +1225,7 @@ TabPage RID_SVXPAGE_AREA
         Text[ chinese_traditional ] = "相對(~L)";
         Text[ arabic ] = "����";
         Text[ greek ] = "�������";
-        Text[ korean ] = "상대적(~L)";
+        Text[ korean ] = "비례하여(~L)";
         Text[ turkish ] = "G�re~celi";
         Text[ language_user1 ] = " ";
         Text[ finnish ] = "~Suhteellinen";
@@ -1295,7 +1295,7 @@ TabPage RID_SVXPAGE_AREA
         Text [ portuguese_brazilian ] = "H~?e" ;
         Text [ portuguese ] = "~Altura" ;
         Text[ chinese_simplified ] = "高度(~E)";
-        Text[ russian ] = "������";
+        Text[ russian ] = "�~�����";
         Text[ polish ] = "Wys.";
         Text[ japanese ] = "高さ(~E)";
         Text[ chinese_traditional ] = "高度(~E)";
@@ -1461,7 +1461,7 @@ TabPage RID_SVXPAGE_AREA
         TabStop = TRUE ;
         Text [ english_us ] = "~Tile" ;
         Text [ italian ] = "Affianca" ;
-        Text [ spanish ] = "~Embaldosado" ;
+        Text [ spanish ] = "~Mosaico" ;
         Text [ french ] = "Carrelage" ;
         Text [ dutch ] = "Be~tegelen" ;
         Text [ swedish ] = "Sid~a vid sida" ;
@@ -1505,7 +1505,7 @@ TabPage RID_SVXPAGE_AREA
         Text[ chinese_traditional ] = "調整(~F)";
         Text[ arabic ] = "������";
         Text[ greek ] = "����������";
-        Text[ korean ] = "조정(~F)";
+        Text[ korean ] = "맞춤(~F)";
         Text[ turkish ] = "~Boyuta uydur";
         Text[ language_user1 ] = " ";
         Text[ finnish ] = "Autom. sovitus";
@@ -1640,7 +1640,7 @@ TabPage RID_SVXPAGE_SHADOW
     Text[ chinese_traditional ] = "陰影";
     Text[ arabic ] = "����";
     Text[ greek ] = "����";
-    Text[ korean ] = "음영";
+    Text[ korean ] = "그림자";
     Text[ turkish ] = "G�lge";
     Text[ language_user1 ] = " ";
     Text[ finnish ] = "Varjo";
@@ -1665,7 +1665,7 @@ TabPage RID_SVXPAGE_SHADOW
         Text[ polish ] = "W�a�ciwo�ci";
         Text[ portuguese_brazilian ] = "Properties";
         Text[ japanese ] = "属性";
-        Text[ korean ] = "등록정보";
+        Text[ korean ] = "등록 정보";
         Text[ chinese_simplified ] = "属性";
         Text[ chinese_traditional ] = "屬性";
         Text[ turkish ] = "Properties";
@@ -1694,7 +1694,7 @@ TabPage RID_SVXPAGE_SHADOW
         Text[ polish ] = "Zastosuj cie�";
         Text[ portuguese_brazilian ] = "~mostrar";
         Text[ japanese ] = "影を付ける(~U)";
-        Text[ korean ] = "음역 적용(~U)";
+        Text[ korean ] = "그림자 사용(~U)";
         Text[ chinese_simplified ] = "使用阴影(~U)";
         Text[ chinese_traditional ] = "使用陰影(~U)";
         Text[ turkish ] = "~g�r�nt�le";
@@ -1711,7 +1711,7 @@ TabPage RID_SVXPAGE_SHADOW
         Text [ ENGLISH ] = "~Position" ;
         Text[ english_us ] = "~Position";
         Text[ portuguese ] = "~Alinhamento";
-        Text[ russian ] = "���������";
+        Text[ russian ] = "����~�����";
         Text[ greek ] = "����";
         Text[ dutch ] = "~Uitlijning";
         Text[ french ] = "Position";
@@ -1723,7 +1723,7 @@ TabPage RID_SVXPAGE_SHADOW
         Text[ polish ] = "Wyr�wnanie";
         Text[ portuguese_brazilian ] = "~Posi??o";
         Text[ japanese ] = "位置(~P)";
-        Text[ korean ] = "맞춤(~P)";
+        Text[ korean ] = "위치(~P)";
         Text[ chinese_simplified ] = "对齐(~P)";
         Text[ chinese_traditional ] = "對齊(~P)";
         Text[ turkish ] = "Konum";
@@ -1748,7 +1748,7 @@ TabPage RID_SVXPAGE_SHADOW
         Text [ ENGLISH ] = "~Distance" ;
         Text[ english_us ] = "~Distance";
         Text[ portuguese ] = "~Dist�ncia";
-        Text[ russian ] = "����������";
+        Text[ russian ] = "������~����";
         Text[ greek ] = "��������";
         Text[ dutch ] = "~Afstand";
         Text[ french ] = "Distance";
@@ -1819,7 +1819,7 @@ TabPage RID_SVXPAGE_SHADOW
         Text[ chinese_traditional ] = "顏色(~C)";
         Text[ arabic ] = "�����";
         Text[ greek ] = "�����";
-        Text[ korean ] = "색(~C)";
+        Text[ korean ] = "색상(~C)";
         Text[ turkish ] = "~Renk";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Color";
@@ -1917,7 +1917,7 @@ TabPage RID_SVXPAGE_HATCH
         Text[ polish ] = "W�a�ciwo�ci";
         Text[ portuguese_brazilian ] = "Properties";
         Text[ japanese ] = "属性";
-        Text[ korean ] = "등록정보";
+        Text[ korean ] = "등록 정보";
         Text[ chinese_simplified ] = "属性";
         Text[ chinese_traditional ] = "屬性";
         Text[ turkish ] = "Properties";
@@ -2206,7 +2206,7 @@ TabPage RID_SVXPAGE_HATCH
     };
     StringList [ korean ] =
     {
-            < "단일" ; Default ; > ;
+            < "단일선" ; Default ; > ;
         < "십자" ; Default ; > ;
         < "삼중" ; Default ; > ;
     };
@@ -2308,7 +2308,7 @@ TabPage RID_SVXPAGE_HATCH
         Text[ chinese_simplified ] = "新增(~A)...";
         Text[ russian ] = "��������...";
         Text[ polish ] = "Dodaj...";
-        Text[ japanese ] = "追加..(~A)...";
+        Text[ japanese ] = "追加(~A)...";
         Text[ chinese_traditional ] = "新增(~A)...";
         Text[ arabic ] = "...�����";
         Text[ greek ] = "��������...";
@@ -2343,7 +2343,7 @@ TabPage RID_SVXPAGE_HATCH
         Text[ chinese_traditional ] = "變更(~M)...";
         Text[ arabic ] = "�����...";
         Text[ greek ] = "�����������...";
-        Text[ korean ] = "수정(~M)...";
+        Text[ korean ] = "변경(~M)...";
         Text[ turkish ] = "~De�i�tir...";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Modifica...";
@@ -2364,7 +2364,7 @@ TabPage RID_SVXPAGE_HATCH
         Text [ french ] = "~Supprimer..." ;
         Text [ swedish ] = "~Radera..." ;
         Text [ dutch ] = "~Wissen..." ;
-        Text [ spanish ] = "~Eliminar..." ;
+        Text [ spanish ] = "~Borrar..." ;
         Text [ english_us ] = "~Delete..." ;
         TabStop = TRUE ;
         Text[ chinese_simplified ] = "删除(~D)...";
@@ -2455,7 +2455,7 @@ TabPage RID_SVXPAGE_HATCH
         QuickHelpText[ chinese_traditional ] = "保存陰影表";
         QuickHelpText[ arabic ] = "��� ����� ������";
         QuickHelpText[ greek ] = "���������� ������ �� �����������";
-        QuickHelpText[ korean ] = "해치 목록 저장";
+        QuickHelpText[ korean ] = "해칭 목록 저장";
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ language_user1 ] = " ";
@@ -2516,7 +2516,7 @@ TabPage RID_SVXPAGE_BITMAP
         Text[ polish ] = "W�a�ciwo�ci";
         Text[ portuguese_brazilian ] = "Properties";
         Text[ japanese ] = "属性";
-        Text[ korean ] = "등록정보";
+        Text[ korean ] = "등록 정보";
         Text[ chinese_simplified ] = "属性";
         Text[ chinese_traditional ] = "屬性";
         Text[ turkish ] = "Properties";
@@ -2617,7 +2617,7 @@ TabPage RID_SVXPAGE_BITMAP
         Text[ polish ] = "Kolor t�a";
         Text[ portuguese_brazilian ] = "~Fundo";
         Text[ japanese ] = "背景色(~B)";
-        Text[ korean ] = "배경색(~B)";
+        Text[ korean ] = "배경 색상(~B)";
         Text[ chinese_simplified ] = "背景颜色(~B)";
         Text[ chinese_traditional ] = "背景顏色(~B)";
         Text[ turkish ] = "A~rtalan";
@@ -2643,7 +2643,7 @@ TabPage RID_SVXPAGE_BITMAP
         Text[ portuguese ] = "Bitmap";
         Text[ russian ] = "�����";
         Text[ spanish ] = "Bitmap";
-        Text[ italian ] = "Stile bitmap";
+        Text[ italian ] = "Bitmap";
         Text[ swedish ] = "Bitmap";
         Text[ polish ] = "Mapa bitowa";
         Text[ portuguese_brazilian ] = "Bitmap";
@@ -2783,7 +2783,7 @@ TabPage RID_SVXPAGE_BITMAP
         Text [ french ] = "~Supprimer..." ;
         Text [ swedish ] = "~Radera..." ;
         Text [ dutch ] = "~Wissen..." ;
-        Text [ spanish ] = "~Eliminar..." ;
+        Text [ spanish ] = "~Borrar..." ;
         Text [ english_us ] = "~Delete..." ;
         TabStop = TRUE ;
         Text[ chinese_simplified ] = "删除(~D)...";
@@ -2880,7 +2880,7 @@ TabPage RID_SVXPAGE_BITMAP
     Text[ chinese_simplified ] = "位图图案";
     Text[ russian ] = "������� ������";
     Text[ polish ] = "Wzorzec mapy bitowej";
-    Text[ japanese ] = "ビットマップ パターン";
+    Text[ japanese ] = "ビットマップパターン";
     Text[ chinese_traditional ] = "點陣圖圖案";
     Text[ arabic ] = "����� ������ �������";
     Text[ greek ] = "������ Bitmap";
@@ -2929,7 +2929,7 @@ TabPage RID_SVXPAGE_GRADIENT
         Text[ polish ] = "W�a�ciwo�ci";
         Text[ portuguese_brazilian ] = "Properties";
         Text[ japanese ] = "属性";
-        Text[ korean ] = "등록정보";
+        Text[ korean ] = "등록 정보";
         Text[ chinese_simplified ] = "属性";
         Text[ chinese_traditional ] = "屬性";
         Text[ turkish ] = "Properties";
@@ -3121,7 +3121,7 @@ TabPage RID_SVXPAGE_GRADIENT
     StringList [ japanese ] =
     {
             < "線形" ; Default ; > ;
-        < "軸" ; Default ; > ;
+        < "軸状" ; Default ; > ;
         < "放射線状" ; Default ; > ;
         < "楕円" ; Default ; > ;
         < "正方形" ; Default ; > ;
@@ -3158,7 +3158,7 @@ TabPage RID_SVXPAGE_GRADIENT
     {
             < "선형" ; Default ; > ;
         < "축형" ; Default ; > ;
-        < "방사선형" ; Default ; > ;
+        < "방사형" ; Default ; > ;
         < "타원형" ; Default ; > ;
         < "정사각형" ; Default ; > ;
         < "직사각형" ; Default ; > ;
@@ -3224,7 +3224,7 @@ TabPage RID_SVXPAGE_GRADIENT
         Text[ chinese_traditional ] = "中心(~X)";
         Text[ arabic ] = "������ �";
         Text[ greek ] = "������ X";
-        Text[ korean ] = "중앙 ~X";
+        Text[ korean ] = "중심 ~X";
         Text[ turkish ] = "~X kayd�r";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Centre ~X";
@@ -3269,7 +3269,7 @@ TabPage RID_SVXPAGE_GRADIENT
         Text[ chinese_traditional ] = "中心(~Y)";
         Text[ arabic ] = "������ �";
         Text[ greek ] = "������ ~Y";
-        Text[ korean ] = "중앙 ~Y";
+        Text[ korean ] = "중심 ~Y";
         Text[ turkish ] = "~Y kayd�r";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Centre ~Y";
@@ -3580,7 +3580,7 @@ TabPage RID_SVXPAGE_GRADIENT
         Text[ chinese_traditional ] = "變更(~M)...";
         Text[ arabic ] = "�����...";
         Text[ greek ] = "�����������...";
-        Text[ korean ] = "수정(~M)...";
+        Text[ korean ] = "변경(~M)...";
         Text[ turkish ] = "~De�i�tir...";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Modifica...";
@@ -3601,7 +3601,7 @@ TabPage RID_SVXPAGE_GRADIENT
         Text [ french ] = "~Supprimer..." ;
         Text [ swedish ] = "~Radera..." ;
         Text [ dutch ] = "~Wissen..." ;
-        Text [ spanish ] = "~Eliminar..." ;
+        Text [ spanish ] = "~Borrar..." ;
         Text [ english_us ] = "~Delete..." ;
         TabStop = TRUE ;
         Text[ chinese_simplified ] = "删除(~D)...";
@@ -3748,7 +3748,7 @@ TabPage RID_SVXPAGE_COLOR
         Text[ polish ] = "W�a�ciwo�ci";
         Text[ portuguese_brazilian ] = "Properties";
         Text[ japanese ] = "属性";
-        Text[ korean ] = "등록정보";
+        Text[ korean ] = "등록 정보";
         Text[ chinese_simplified ] = "属性";
         Text[ chinese_traditional ] = "屬性";
         Text[ turkish ] = "Properties";
@@ -3817,7 +3817,7 @@ TabPage RID_SVXPAGE_COLOR
         Text[ chinese_traditional ] = "顏色(~O)";
         Text[ arabic ] = "�����";
         Text[ greek ] = "�����";
-        Text[ korean ] = "색(~O)";
+        Text[ korean ] = "색상(~O)";
         Text[ turkish ] = "~Renk";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "C~olor";
@@ -4160,7 +4160,7 @@ TabPage RID_SVXPAGE_COLOR
         Text [ french ] = "~Supprimer..." ;
         Text [ swedish ] = "R~adera..." ;
         Text [ dutch ] = "~Wissen..." ;
-        Text [ spanish ] = "~Eliminar..." ;
+        Text [ spanish ] = "~Borrar..." ;
         Text [ english_us ] = "~Delete..." ;
         TabStop = TRUE ;
         Text[ chinese_simplified ] = "删除(~D)...";
@@ -4201,7 +4201,7 @@ TabPage RID_SVXPAGE_COLOR
         Text[ chinese_traditional ] = "變更(~M)";
         Text[ arabic ] = "�����";
         Text[ greek ] = "�����������";
-        Text[ korean ] = "수정(~M)";
+        Text[ korean ] = "변경(~M)";
         Text[ turkish ] = "~De�i�tir";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Modifica";
@@ -4240,7 +4240,7 @@ TabPage RID_SVXPAGE_COLOR
         QuickHelpText[ chinese_traditional ] = "載入顏色表";
         QuickHelpText[ arabic ] = "����� ����� �������";
         QuickHelpText[ greek ] = "������� ������ ��������";
-        QuickHelpText[ korean ] = "색상 목록 琯?";
+        QuickHelpText[ korean ] = "색상 목록 로드";
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ turkish ] = "Farbtabelle laden";
         QuickHelpText[ catalan ] = "Carrega la taula de colors";
@@ -4376,7 +4376,7 @@ TabDialog RID_SVXDLG_AREA
                 Text[ chinese_traditional ] = "陰影";
                 Text[ arabic ] = "����";
                 Text[ greek ] = "����";
-                Text[ korean ] = "음영";
+                Text[ korean ] = "그림자";
                 Text[ turkish ] = "G�lge";
                 Text[ language_user1 ] = " ";
                 Text[ finnish ] = "Varjo";
@@ -4566,3 +4566,8 @@ Image RID_SVXIMG_SAVE_H
 
  // ********************************************************************** EOF
 
+
+
+
+
+
diff --git a/svx/source/dialog/tabline.src b/svx/source/dialog/tabline.src
index d844db26be99..eddfbb40ab94 100644
--- a/svx/source/dialog/tabline.src
+++ b/svx/source/dialog/tabline.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabline.src,v $
  *
- *  $Revision: 1.28 $
+ *  $Revision: 1.29 $
  *
- *  last change: $Author: kz $ $Date: 2002-11-27 17:07:21 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -118,7 +118,7 @@ TabPage RID_SVXPAGE_LINE
         Text[ chinese_traditional ] = "線條屬性";
         Text[ arabic ] = "Line properties";
         Text[ greek ] = "Line properties";
-        Text[ korean ] = "선 등록정보";
+        Text[ korean ] = "선 등록 정보";
         Text[ turkish ] = "Line properties";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Propietats de la l�nia";
@@ -148,7 +148,7 @@ TabPage RID_SVXPAGE_LINE
         Text[ chinese_traditional ] = "樣式(~S)";
         Text[ arabic ] = "���";
         Text[ greek ] = "����";
-        Text[ korean ] = "유형(~S)";
+        Text[ korean ] = "스타일(~S)";
         Text[ turkish ] = "Bi�im";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "E~stil";
@@ -187,7 +187,7 @@ TabPage RID_SVXPAGE_LINE
         Text[ chinese_traditional ] = "顏色(~R)";
         Text[ arabic ] = "���";
         Text[ greek ] = "�����";
-        Text[ korean ] = "색(~R)";
+        Text[ korean ] = "색상(~R)";
         Text[ turkish ] = "Renk";
         Text[ language_user1 ] = "DD(09.05.2001): ~Color";
         Text[ catalan ] = "Colo~r";
@@ -265,7 +265,7 @@ TabPage RID_SVXPAGE_LINE
         Text [ portuguese_brazilian ] = "~Transparenz" ;
         Text [ portuguese ] = "~Transpar�ncia" ;
         Text[ chinese_simplified ] = "透明(~T)";
-        Text[ russian ] = "������������";
+        Text[ russian ] = "������~������";
         Text[ polish ] = "Prze�roczysto��";
         Text[ japanese ] = "透明(~T)";
         Text[ chinese_traditional ] = "透明(~T)";
@@ -323,7 +323,7 @@ TabPage RID_SVXPAGE_LINE
         Text[ chinese_traditional ] = "線條箭頭";
         Text[ arabic ] = "������ ����";
         Text[ greek ] = "���� �������";
-        Text[ korean ] = "선 끝";
+        Text[ korean ] = "화살표 스타일";
         Text[ turkish ] = "�izgi u�lar�";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Estils de fletxa";
@@ -353,7 +353,7 @@ TabPage RID_SVXPAGE_LINE
         Text[ chinese_traditional ] = "樣式(~Y)";
         Text[ arabic ] = "���";
         Text[ greek ] = "��~��";
-        Text[ korean ] = "유형(~Y)";
+        Text[ korean ] = "스타일(~Y)";
         Text[ turkish ] = "Bi�im";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Est~il";
@@ -524,7 +524,7 @@ TabPage RID_SVXPAGE_LINE
         Text[ chinese_simplified ] = "线端同步化(~Z)";
         Text[ russian ] = "���������������� �����";
         Text[ polish ] = "Synchronizuj ko�ce";
-        Text[ japanese ] = "同期化の終了(~Z)";
+        Text[ japanese ] = "両端を同じにする(~Z)";
         Text[ chinese_traditional ] = "線端同步化(~Z)";
         Text[ arabic ] = "����� ��������";
         Text[ greek ] = "������������ �����";
@@ -566,7 +566,7 @@ TabPage RID_SVXPAGE_LINE
         Text[ chinese_traditional ] = "圖示";
         Text[ arabic ] = "���";
         Text[ greek ] = "�������";
-        Text[ korean ] = "기호";
+        Text[ korean ] = "아이콘";
         Text[ turkish ] = "Simge";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "S�mbol";
@@ -607,7 +607,7 @@ TabPage RID_SVXPAGE_LINE
                     Text[ chinese_traditional ] = "無圖示";
                     Text[ arabic ] = "���� ���";
                     Text[ greek ] = "������ �������";
-                    Text[ korean ] = "기호가 없습니다.";
+                    Text[ korean ] = "기호 없음";
                     Text[ turkish ] = "Simge yok";
                     Text[ language_user1 ] = " ";
                     Text[ catalan ] = "Sense s�mbol";
@@ -663,7 +663,7 @@ TabPage RID_SVXPAGE_LINE
                     Text[ chinese_traditional ] = "從檔案...";
                     Text[ arabic ] = "...�� ���";
                     Text[ greek ] = "��� ������...";
-                    Text[ korean ] = "... 파일로부터 ";
+                    Text[ korean ] = "파일로부터... ";
                     Text[ turkish ] = "Dosyadan...";
                     Text[ language_user1 ] = " ";
                     Text[ catalan ] = "Des d'un fitxer...";
@@ -858,10 +858,10 @@ TabPage RID_SVXPAGE_LINE
         Text [ English ] = "Fixed ratio" ;
         Text [ english_us ] = "Keep ratio" ;
         Text [ portuguese_brazilian ] = "Abgleich" ;
-        Text [ swedish ] = "~Proportionellt" ;
+        Text [ swedish ] = "Anpassa ~proportionellt" ;
         Text [ danish ] = "Proportional" ;
         Text [ italian ] = "Sincronizza" ;
-        Text [ spanish ] = "~Sincronizaci�n" ;
+        Text [ spanish ] = "Proporcional" ;
         Text [ french ] = "Proportionnel" ;
         Text [ dutch ] = "~Synchroniseren" ;
         Text [ portuguese ] = "Pr~oporcional" ;
@@ -872,7 +872,7 @@ TabPage RID_SVXPAGE_LINE
         Text[ chinese_traditional ] = "同步化";
         Text[ arabic ] = "�����";
         Text[ greek ] = "���~������";
-        Text[ korean ] = "자동 맞춤";
+        Text[ korean ] = "비율을 균등하게 조정";
         Text[ turkish ] = "Orant�l�";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Sincronitzaci�";
@@ -930,7 +930,7 @@ TabPage RID_SVXPAGE_LINE_DEF
         Text[ chinese_traditional ] = "屬性";
         Text[ arabic ] = "�����";
         Text[ greek ] = "�������";
-        Text[ korean ] = "정의";
+        Text[ korean ] = "등록 정보";
         Text[ turkish ] = "Tan�m";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Definici�";
@@ -1076,7 +1076,7 @@ TabPage RID_SVXPAGE_LINE_DEF
         StringList [ korean ] =
         {
                 < "점" ; Default ; > ;
-            < "대쉬" ; Default ; > ;
+            < "파선" ; Default ; > ;
         };
         StringList [ turkish ] =
         {
@@ -1209,7 +1209,7 @@ TabPage RID_SVXPAGE_LINE_DEF
         StringList [ korean ] =
         {
                 < "점" ; Default ; > ;
-            < "대시" ; Default ; > ;
+            < "파선" ; Default ; > ;
         };
         StringList [ turkish ] =
         {
@@ -1423,7 +1423,7 @@ TabPage RID_SVXPAGE_LINE_DEF
         Text [ french ] = "Adapter � la largeur de la ligne" ;
         Text [ swedish ] = "A~npassa till linjebredd" ;
         Text [ dutch ] = "Aanpassen aan lijn~dikte" ;
-        Text [ spanish ] = "Ajustar al ancho de la l�nea" ;
+        Text [ spanish ] = "~Ajustar al espesor del trazo" ;
         Text [ english_us ] = "~Fit to line width" ;
         TabStop = TRUE ;
         Text[ chinese_simplified ] = "和线宽对应(~F)";
@@ -1466,7 +1466,7 @@ TabPage RID_SVXPAGE_LINE_DEF
         Text[ chinese_traditional ] = "線條式樣";
         Text[ arabic ] = "����� ����";
         Text[ greek ] = "���� �������";
-        Text[ korean ] = "선 유형";
+        Text[ korean ] = "선 스타일";
         Text[ turkish ] = "�izgi bi�imleri";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Estils de l�nia";
@@ -1537,7 +1537,7 @@ TabPage RID_SVXPAGE_LINE_DEF
         Text[ chinese_traditional ] = "變更(~M)...";
         Text[ arabic ] = "�����...";
         Text[ greek ] = "�����������...";
-        Text[ korean ] = "수정(~M)...";
+        Text[ korean ] = "변경(~M)...";
         Text[ turkish ] = "De�i�tir...";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Modifica...";
@@ -1558,7 +1558,7 @@ TabPage RID_SVXPAGE_LINE_DEF
         Text [ french ] = "~Supprimer..." ;
         Text [ swedish ] = "~Radera..." ;
         Text [ dutch ] = "~Wissen..." ;
-        Text [ spanish ] = "~Eliminar..." ;
+        Text [ spanish ] = "~Borrar..." ;
         Text [ english_us ] = "~Delete..." ;
         TabStop = TRUE ;
         Text[ chinese_simplified ] = "删除(~D)...";
@@ -1607,7 +1607,7 @@ TabPage RID_SVXPAGE_LINE_DEF
         QuickHelpText[ chinese_traditional ] = "載入線條樣式列表";
         QuickHelpText[ arabic ] = "����� ����� ����� ����";
         QuickHelpText[ greek ] = "������� ������ �� ���� �������";
-        QuickHelpText[ korean ] = "선 유형 로드";
+        QuickHelpText[ korean ] = "선 스타일 로드";
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ turkish ] = "Linienstiltabelle laden";
@@ -1647,7 +1647,7 @@ TabPage RID_SVXPAGE_LINE_DEF
         QuickHelpText[ chinese_traditional ] = "保存線條樣式列表";
         QuickHelpText[ arabic ] = "��� ����� ����� ����";
         QuickHelpText[ greek ] = "���������� ������ �� ���� �������";
-        QuickHelpText[ korean ] = "선 유형 도표 저장";
+        QuickHelpText[ korean ] = "선 스타일 저장";
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ turkish ] = "Linienstiltabelle sichern";
@@ -1668,7 +1668,7 @@ TabPage RID_SVXPAGE_LINE_DEF
     Text[ chinese_traditional ] = "設定線條式樣";
     Text[ arabic ] = "����� ����� ����";
     Text[ greek ] = "������� ���� �������";
-    Text[ korean ] = "선 유형 정의";
+    Text[ korean ] = "선 스타일 설정";
     Text[ turkish ] = "�izgi bi�imlerini tan�mla";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Defineix estils de l�nia";
@@ -1690,10 +1690,10 @@ TabPage RID_SVXPAGE_LINEEND_DEF
     Text [ portuguese ] = "Definir setas" ;
     Text [ finnish ] = "Nuolenk�rjet" ;
     Text [ danish ] = "Definer piltype" ;
-    Text [ french ] = "D�finir extr�mit�s" ;
+    Text [ french ] = "D�finir les extr�mit�s de lignes" ;
     Text [ swedish ] = "Definiera linjeslut" ;
     Text [ dutch ] = "Lijnuiteinden defini�ren" ;
-    Text [ spanish ] = "Definir fin de l�neas" ;
+    Text [ spanish ] = "Fines de l�nea" ;
     Text [ english_us ] = "Arrowheads" ;
 
     FixedLine FL_TIP
@@ -1720,7 +1720,7 @@ TabPage RID_SVXPAGE_LINEEND_DEF
         Text[ chinese_traditional ] = "管理線條箭頭";
         Text[ arabic ] = "������";
         Text[ greek ] = "��������";
-        Text[ korean ] = "주";
+        Text[ korean ] = "화살표 스타일 관리";
         Text[ turkish ] = "Not";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Nota";
@@ -1738,7 +1738,7 @@ TabPage RID_SVXPAGE_LINEEND_DEF
         Text [ portuguese ] = "Se adicionar um objecto seleccionado obt�m novos estilos de setas" ;
         Text [ french ] = "Ajoutez un objet s�lectionn� pour obtenir de nouvelles extr�mit�s de ligne." ;
         Text [ dutch ] = "Een nieuw lijnuiteinde krijgt u door het toevoegen van een geselecteerd object." ;
-        Text [ spanish ] = "Obtendr� nuevos fines de l�nea si a�ade un objeto seleccionado." ;
+        Text [ spanish ] = "A�ada un objeto seleccionado para crear  nuevos fines de l�nea." ;
         Text [ danish ] = "Du f�r nye pile ved at tilf�je et markeret objekt." ;
         Text [ swedish ] = "Nya linjeslut f�r du genom att l�gga till ett markerat objekt." ;
         Text [ finnish ] = "Luo uusia nuolityylej� lis��m�ll� valittu objekti." ;
@@ -1751,7 +1751,7 @@ TabPage RID_SVXPAGE_LINEEND_DEF
         Text[ chinese_traditional ] = "您能夠透過新增選擇一個物件的方式來新建一個線條箭頭。";
         Text[ arabic ] = "����� ������ ��� ������ ����� ���� �� ���� ����� ���� ����";
         Text[ greek ] = "��� �� ������������� ���� '�����' �������, ��������� ��� ���������� �����������";
-        Text[ korean ] = "선택된 개체를 추가하여 새로운 선 끝을 만듭니다";
+        Text[ korean ] = "새로운 화살표 스타일을 만들려면 선택된 개체를 추가하십시오.";
         Text[ turkish ] = "Se�ilen bir nesneyi ekleyerek yeni �izgi u�lar� elde edebilirsiniz.";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Afegeix a l'objecte seleccionat per a crear nous estils de fletxa";
@@ -1782,7 +1782,7 @@ TabPage RID_SVXPAGE_LINEEND_DEF
         Text[ chinese_traditional ] = "線條箭頭式樣";
         Text[ arabic ] = "����� ����";
         Text[ greek ] = "����� �������";
-        Text[ korean ] = "선 끝 유형";
+        Text[ korean ] = "화살표 스타일";
         Text[ turkish ] = "�izgi ucu";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Extrems de la fletxa";
@@ -1890,7 +1890,7 @@ TabPage RID_SVXPAGE_LINEEND_DEF
         Text[ chinese_traditional ] = "變更(~M)...";
         Text[ arabic ] = "�����";
         Text[ greek ] = "�����������";
-        Text[ korean ] = "수정(~M)";
+        Text[ korean ] = "변경(~M)...";
         Text[ turkish ] = "De�i�tir";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Modifica...";
@@ -1911,7 +1911,7 @@ TabPage RID_SVXPAGE_LINEEND_DEF
         Text [ french ] = "~Supprimer..." ;
         Text [ swedish ] = "~Radera..." ;
         Text [ dutch ] = "~Wissen..." ;
-        Text [ spanish ] = "~Eliminar..." ;
+        Text [ spanish ] = "~Borrar..." ;
         Text [ english_us ] = "~Delete..." ;
         TabStop = TRUE ;
         Text[ chinese_simplified ] = "删除(~D)...";
@@ -1960,7 +1960,7 @@ TabPage RID_SVXPAGE_LINEEND_DEF
         QuickHelpText[ chinese_traditional ] = "載入線端列表";
         QuickHelpText[ arabic ] = "����� ����� ������ ����";
         QuickHelpText[ greek ] = "������� ������ �� ���� �������";
-        QuickHelpText[ korean ] = "선 끝 도표 로드";
+        QuickHelpText[ korean ] = "화살표 스타일 로드";
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ turkish ] = "Linienendentabelle laden";
@@ -2000,7 +2000,7 @@ TabPage RID_SVXPAGE_LINEEND_DEF
         QuickHelpText[ chinese_traditional ] = "保存線端列表";
         QuickHelpText[ arabic ] = "��� ����� ������ ����";
         QuickHelpText[ greek ] = "���������� ������ �� ���� �������";
-        QuickHelpText[ korean ] = "선 끝 도표 저장";
+        QuickHelpText[ korean ] = "화살표 스타일 저장";
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ turkish ] = "Linienendentabelle sichern";
@@ -2022,7 +2022,7 @@ TabPage RID_SVXPAGE_LINEEND_DEF
     Text[ chinese_traditional ] = "定義線條箭頭";
     Text[ arabic ] = "����� ������ ����";
     Text[ greek ] = "������� ����� �������";
-    Text[ korean ] = "선 끝 정의";
+    Text[ korean ] = "화살표 모양 지정";
     Text[ turkish ] = "�izgi u�lar�n� tan�mla";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Extrems de la fletxa";
@@ -2109,7 +2109,7 @@ TabDialog RID_SVXDLG_LINE
                 Text[ chinese_traditional ] = "線條式樣";
                 Text[ arabic ] = "����� ����";
                 Text[ greek ] = "���� �������";
-                Text[ korean ] = "선 유형";
+                Text[ korean ] = "선 스타일";
                 Text[ turkish ] = "�izgi bi�imleri";
                 Text[ language_user1 ] = " ";
                 Text[ catalan ] = "Estils de l�nia";
@@ -2129,7 +2129,7 @@ TabDialog RID_SVXDLG_LINE
                 Text [ french ] = "Extr�mit�s de ligne" ;
                 Text [ swedish ] = "Linjeslut" ;
                 Text [ dutch ] = "Lijnuiteinden" ;
-                Text [ spanish ] = "Fin de l�nea" ;
+                Text [ spanish ] = "Fines de l�nea" ;
                 Text [ english_us ] = "Arrow Styles" ;
                 PageResID = RID_SVXPAGE_LINEEND_DEF ;
                 Text[ chinese_simplified ] = "线条箭头";
@@ -2139,7 +2139,7 @@ TabDialog RID_SVXDLG_LINE
                 Text[ chinese_traditional ] = "線條箭頭";
                 Text[ arabic ] = "������ ����";
                 Text[ greek ] = "���� �������";
-                Text[ korean ] = "선 끝";
+                Text[ korean ] = "화살표 스타일";
                 Text[ turkish ] = "�izgi u�lar�";
                 Text[ language_user1 ] = " ";
                 Text[ catalan ] = "Estils de fletxa";
@@ -2161,3 +2161,8 @@ TabDialog RID_SVXDLG_LINE
     Text[ thai ] = "เส้น";
 };
 
+
+
+
+
+
diff --git a/svx/source/dialog/tabstpge.src b/svx/source/dialog/tabstpge.src
index 80c6b29741ae..8bea52a6b0a5 100644
--- a/svx/source/dialog/tabstpge.src
+++ b/svx/source/dialog/tabstpge.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabstpge.src,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: os $ $Date: 2002-05-27 10:49:49 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -103,14 +103,14 @@ TabPage RID_SVXPAGE_TABULATOR
         Text [ portuguese_brazilian ] = "Posi��o" ;
         Text [ portuguese ] = "Posi��o" ;
         Text [ finnish ] = "Sijainti" ;
-        Text [ danish ] = "Placering" ;
+        Text [ danish ] = "~Placering" ;
         Text [ french ] = "Position" ;
         Text [ swedish ] = "~Position" ;
         Text [ dutch ] = "~Positie" ;
         Text [ spanish ] = "Posici�n" ;
         Text [ english_us ] = "Position" ;
         Text[ chinese_simplified ] = "位置";
-        Text[ russian ] = "���������";
+        Text[ russian ] = "�������";
         Text[ polish ] = "Pozycja";
         Text[ japanese ] = "位置";
         Text[ chinese_traditional ] = "位置";
@@ -119,7 +119,7 @@ TabPage RID_SVXPAGE_TABULATOR
         Text[ korean ] = "위치";
         Text[ turkish ] = "Konum";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Posici�n";
+        Text[ catalan ] = "Posici�";
         Text[ thai ] = "ตำแหน่ง";
     };
     FixedLine FL_TABPOS_VERT
@@ -138,7 +138,7 @@ TabPage RID_SVXPAGE_TABULATOR
         Text [ italian ] = "A ~sinistra" ;
         Text [ portuguese_brazilian ] = "~Esquerda" ;
         Text [ portuguese ] = "~Esquerda" ;
-        Text [ finnish ] = "~Vasen:" ;
+        Text [ finnish ] = "~Vasen" ;
         Text [ danish ] = "Venstre" ;
         Text [ french ] = "� gauche" ;
         Text [ swedish ] = "~V�nster" ;
@@ -146,8 +146,8 @@ TabPage RID_SVXPAGE_TABULATOR
         Text [ spanish ] = "~Izquierda" ;
         Text [ english_us ] = "~Left" ;
         Check = TRUE ;
-        Text[ chinese_simplified ] = "向左(~L)";
-        Text[ russian ] = "�����";
+        Text[ chinese_simplified ] = "左(~L)";
+        Text[ russian ] = "~�����";
         Text[ polish ] = "Lewy";
         Text[ japanese ] = "左揃え(~L)";
         Text[ chinese_traditional ] = "向左(~L)";
@@ -156,7 +156,7 @@ TabPage RID_SVXPAGE_TABULATOR
         Text[ korean ] = "왼쪽(~L)";
         Text[ turkish ] = "~Sol";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Izquierda";
+        Text[ catalan ] = "~Esquerra";
         Text[ thai ] = "~ซ้าย";
     };
     Window WIN_TABLEFT
@@ -175,14 +175,14 @@ TabPage RID_SVXPAGE_TABULATOR
         Text [ portuguese_brazilian ] = "Di~reita" ;
         Text [ portuguese ] = "Di~reita" ;
         Text [ finnish ] = "~Oikea" ;
-        Text [ danish ] = "H�jre" ;
+        Text [ danish ] = "H�~jre" ;
         Text [ french ] = "� droite" ;
         Text [ swedish ] = "H�ge~r" ;
         Text [ dutch ] = "~Rechts" ;
         Text [ spanish ] = "Derecha" ;
         Text [ english_us ] = "Righ~t" ;
-        Text[ chinese_simplified ] = "向右(~T)";
-        Text[ russian ] = "������";
+        Text[ chinese_simplified ] = "右(~T)";
+        Text[ russian ] = "����~��";
         Text[ polish ] = "Prawy";
         Text[ japanese ] = "右揃え(~T)";
         Text[ chinese_traditional ] = "向右(~T)";
@@ -191,7 +191,7 @@ TabPage RID_SVXPAGE_TABULATOR
         Text[ korean ] = "오른쪽(~T)";
         Text[ turkish ] = "Sa�~";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Derecha";
+        Text[ catalan ] = "Dre~ta";
         Text[ thai ] = "ข~วา";
     };
     Window WIN_TABRIGHT
@@ -210,14 +210,14 @@ TabPage RID_SVXPAGE_TABULATOR
         Text [ portuguese_brazilian ] = "C~entro" ;
         Text [ portuguese ] = "~Centrado" ;
         Text [ finnish ] = "~Keskitetty" ;
-        Text [ danish ] = "Centreret" ;
+        Text [ danish ] = "~Centreret" ;
         Text [ french ] = "Centr�" ;
         Text [ swedish ] = "~Centrerad" ;
         Text [ dutch ] = "~Gecentreerd" ;
         Text [ spanish ] = "Centrado" ;
         Text [ english_us ] = "C~entered" ;
         Text[ chinese_simplified ] = "居中(~E)";
-        Text[ russian ] = "�� ������";
+        Text[ russian ] = "�� ~������";
         Text[ polish ] = "Do �rodka";
         Text[ japanese ] = "中央揃え(~E)";
         Text[ chinese_traditional ] = "置中(~E)";
@@ -226,7 +226,7 @@ TabPage RID_SVXPAGE_TABULATOR
         Text[ korean ] = "가운데(~E)";
         Text[ turkish ] = "~Ortala";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Cen~trado";
+        Text[ catalan ] = "C~entrat";
         Text[ thai ] = "ต~รงกลาง";
     };
     Window WIN_TABCENTER
@@ -252,7 +252,7 @@ TabPage RID_SVXPAGE_TABULATOR
         Text [ spanish ] = "Deci~mal" ;
         Text [ english_us ] = "Deci~mal" ;
         Text[ chinese_simplified ] = "十进制(~M)";
-        Text[ russian ] = "����������";
+        Text[ russian ] = "~����������";
         Text[ polish ] = "Dziesi�~tny";
         Text[ japanese ] = "小数点揃え(~M)";
         Text[ chinese_traditional ] = "小數點(~M)";
@@ -280,23 +280,23 @@ TabPage RID_SVXPAGE_TABULATOR
         Text [ portuguese_brazilian ] = "~Caracter" ;
         Text [ portuguese ] = "~Caracteres" ;
         Text [ finnish ] = "~Merkki" ;
-        Text [ danish ] = "Tegn" ;
+        Text [ danish ] = "T~egn" ;
         Text [ french ] = "Caract�res" ;
         Text [ swedish ] = "T~ecken" ;
         Text [ dutch ] = "T~eken" ;
         Text [ spanish ] = "~Car�cter" ;
         Text [ english_us ] = "~Character" ;
         Text[ chinese_simplified ] = "字符(~C)";
-        Text[ russian ] = "����";
+        Text[ russian ] = "��~����";
         Text[ polish ] = "Znak";
-        Text[ japanese ] = "文字列(~C)";
+        Text[ japanese ] = "記号(~C)";
         Text[ chinese_traditional ] = "字元(~C)";
         Text[ arabic ] = "���";
         Text[ greek ] = "����������";
-        Text[ korean ] = "문자(~C)";
+        Text[ korean ] = "문자 및 기호(~C)";
         Text[ turkish ] = "Ka~rakter";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Car�cter";
+        Text[ catalan ] = "~Car�cter";
         Text[ thai ] = "~ตัวอักขระ";
     };
     Edit ED_TABTYPE_DECCHAR
@@ -333,7 +333,7 @@ TabPage RID_SVXPAGE_TABULATOR
         Text[ korean ] = "유형";
         Text[ turkish ] = "Tip";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Tipo";
+        Text[ catalan ] = "Tipus";
         Text[ thai ] = "Type";
     };
     FixedLine FL_TABTYPE_VERT
@@ -361,7 +361,7 @@ TabPage RID_SVXPAGE_TABULATOR
         Text [ english_us ] = "N~one" ;
         Check = TRUE ;
         Text[ chinese_simplified ] = "无(~O)";
-        Text[ russian ] = "���";
+        Text[ russian ] = "���";
         Text[ polish ] = "Brak";
         Text[ japanese ] = "なし(~O)";
         Text[ chinese_traditional ] = "無(~O)";
@@ -370,7 +370,7 @@ TabPage RID_SVXPAGE_TABULATOR
         Text[ korean ] = "없음(~O)";
         Text[ turkish ] = "~Yok";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Nin~guno";
+        Text[ catalan ] = "C~ap";
         Text[ thai ] = "ไ~ม่มี";
     };
     RadioButton BTN_FILLCHAR_POINTS
@@ -402,23 +402,23 @@ TabPage RID_SVXPAGE_TABULATOR
         Text [ portuguese_brazilian ] = "Ca~racter" ;
         Text [ portuguese ] = "Ca~racteres" ;
         Text [ finnish ] = "Merkki" ;
-        Text [ danish ] = "Tegn" ;
+        Text [ danish ] = "Teg~n" ;
         Text [ french ] = "Caract�res" ;
         Text [ swedish ] = "Tec~ken" ;
         Text [ dutch ] = "~Teken" ;
         Text [ spanish ] = "C~ar�cter" ;
         Text [ english_us ] = "Character" ;
         Text[ chinese_simplified ] = "字符";
-        Text[ russian ] = "����";
+        Text[ russian ] = "������";
         Text[ polish ] = "Znak";
-        Text[ japanese ] = "文字";
+        Text[ japanese ] = "記号";
         Text[ chinese_traditional ] = "字元";
         Text[ arabic ] = "���";
         Text[ greek ] = "����������";
-        Text[ korean ] = "문자";
+        Text[ korean ] = "문자 및 기호";
         Text[ turkish ] = "Kara~kter";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "C~ar�cter";
+        Text[ catalan ] = "C~ar�cter";
         Text[ thai ] = "ตัวอักขระ";
     };
     Edit ED_FILLCHAR_OTHER
@@ -452,10 +452,10 @@ TabPage RID_SVXPAGE_TABULATOR
         Text[ chinese_traditional ] = "充填字元";
         Text[ arabic ] = "��� ����";
         Text[ greek ] = "���������� ����������";
-        Text[ korean ] = "채움기호";
+        Text[ korean ] = "채움 문자";
         Text[ turkish ] = "�nc�";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Car�cter de relleno";
+        Text[ catalan ] = "Car�cter de farciment";
         Text[ thai ] = "Fill character";
     };
     PushButton BTN_NEW
@@ -476,7 +476,7 @@ TabPage RID_SVXPAGE_TABULATOR
         Text [ spanish ] = "~Nuevo" ;
         Text [ english_us ] = "~New" ;
         Text[ chinese_simplified ] = "新建(~N)";
-        Text[ russian ] = "����~���";
+        Text[ russian ] = "��������";
         Text[ polish ] = "Nowy";
         Text[ japanese ] = "新規作成(~N)";
         Text[ chinese_traditional ] = "新建(~N)";
@@ -485,7 +485,7 @@ TabPage RID_SVXPAGE_TABULATOR
         Text[ korean ] = "새로 만들기(~N)";
         Text[ turkish ] = "~Yeni";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Nuevo";
+        Text[ catalan ] = "~Nou";
         Text[ thai ] = "ใ~หม่";
     };
     PushButton BTN_DELALL
@@ -498,12 +498,12 @@ TabPage RID_SVXPAGE_TABULATOR
         Text [ italian ] = "Elimina t~utti" ;
         Text [ portuguese_brazilian ] = "Apag~ar tudo" ;
         Text [ portuguese ] = "Eli~minar tudo" ;
-        Text [ finnish ] = "~Poista kaikki" ;
+        Text [ finnish ] = "Poista ~kaikki" ;
         Text [ danish ] = "Slet alle" ;
         Text [ french ] = "Supprimer ~tout" ;
         Text [ swedish ] = "Radera ~alla" ;
-        Text [ dutch ] = "~Alle verwijderen" ;
-        Text [ spanish ] = "E~liminar todas" ;
+        Text [ dutch ] = "~Alle wissen" ;
+        Text [ spanish ] = "~Borrar todo" ;
         Text [ english_us ] = "Delete ~All" ;
         Text[ chinese_simplified ] = "全部删除(~A)";
         Text[ russian ] = "������� ���";
@@ -515,7 +515,7 @@ TabPage RID_SVXPAGE_TABULATOR
         Text[ korean ] = "모두 삭제(~A)";
         Text[ turkish ] = "~T�m�n� sil";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "E~liminar todas";
+        Text[ catalan ] = "Suprimeix-ho ~tot";
         Text[ thai ] = "ลบ~ทั้งหมด";
     };
     PushButton BTN_DEL
@@ -533,7 +533,7 @@ TabPage RID_SVXPAGE_TABULATOR
         Text [ french ] = "Supprimer" ;
         Text [ swedish ] = "Ra~dera" ;
         Text [ dutch ] = "~Wissen" ;
-        Text [ spanish ] = "~Eliminar" ;
+        Text [ spanish ] = "~Borrar" ;
         Text [ english_us ] = "~Delete" ;
         Text[ chinese_simplified ] = "删除(~D)";
         Text[ russian ] = "�������";
@@ -545,21 +545,55 @@ TabPage RID_SVXPAGE_TABULATOR
         Text[ korean ] = "삭제(~D)";
         Text[ turkish ] = "~Sil";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Eliminar";
+        Text[ catalan ] = "~Suprimeix";
         Text[ thai ] = "~ลบ";
     };
     String ST_LEFTTAB_ASIAN
     {
         Text = "~Links/Oben" ;
         Text [ english_us ] = "~Left/Top" ;
+        Text[ portuguese ] = "~Left/Top";
+        Text[ russian ] = "~Left/Top";
+        Text[ greek ] = "~Left/Top";
+        Text[ dutch ] = "~Left/Top";
+        Text[ french ] = "� gauche/En haut";
+        Text[ spanish ] = "A la ~izquierda/Arriba";
+        Text[ finnish ] = "~Left/Top";
+        Text[ italian ] = "A sinistra/in alto";
+        Text[ danish ] = "~Left/Top";
+        Text[ swedish ] = "V�nster/uppe";
+        Text[ polish ] = "~Left/Top";
+        Text[ japanese ] = "左/上";
+        Text[ korean ] = "왼쪽/위";
+        Text[ chinese_simplified ] = "左/上";
+        Text[ chinese_traditional ] = "左/上";
+        Text[ turkish ] = "~Left/Top";
+        Text[ arabic ] = "~Left/Top";
     };
     String ST_RIGHTTAB_ASIAN
     {
         Text = "~Rechts/Unten" ;
         Text [ english_us ] = "Righ~t/Bottom" ;
+        Text[ portuguese ] = "Righ~t/Bottom";
+        Text[ russian ] = "Righ~t/Bottom";
+        Text[ greek ] = "Righ~t/Bottom";
+        Text[ dutch ] = "Righ~t/Bottom";
+        Text[ french ] = "� droite/En bas";
+        Text[ spanish ] = "~A la derecha/Abajo";
+        Text[ finnish ] = "Righ~t/Bottom";
+        Text[ italian ] = "A destra/in basso";
+        Text[ danish ] = "Righ~t/Bottom";
+        Text[ swedish ] = "H�ger/nere";
+        Text[ polish ] = "Righ~t/Bottom";
+        Text[ japanese ] = "右/下";
+        Text[ korean ] = "오른쪽/아래";
+        Text[ chinese_simplified ] = "右/下";
+        Text[ chinese_traditional ] = "右/下";
+        Text[ turkish ] = "Righ~t/Bottom";
+        Text[ arabic ] = "Righ~t/Bottom";
     };
     Text[ chinese_simplified ] = "制表符";
-    Text[ russian ] = "����������";
+    Text[ russian ] = "���������";
     Text[ polish ] = "Tabulatory";
     Text[ japanese ] = "タブ";
     Text[ chinese_traditional ] = "定位鍵";
@@ -568,10 +602,24 @@ TabPage RID_SVXPAGE_TABULATOR
     Text[ korean ] = "탭";
     Text[ turkish ] = "Sekmeler";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Tabulaciones";
+    Text[ catalan ] = "Pestanyes";
     Text[ thai ] = "ระยะกั้น";
 };
  // ********************************************************************** EOF
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svx/source/dialog/test.src b/svx/source/dialog/test.src
index 305ae66f52be..ba87b9b5f88d 100644
--- a/svx/source/dialog/test.src
+++ b/svx/source/dialog/test.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: test.src,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: kz $ $Date: 2001-07-14 20:37:57 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -80,7 +80,7 @@ TabPage RID_SVXPAGE_POSITION
     Text [ french ] = "Position" ;
     Text [ swedish ] = "Position" ;
     Text [ dutch ] = "Positie" ;
-    Text [ spanish ] = "Posici??" ;
+    Text [ spanish ] = "Posici??n" ;
     Text [ english_us ] = "Position" ;
     Size = MAP_APPFONT ( 189 , 97 ) ;
     FixedText FT_POS_X
@@ -96,20 +96,21 @@ TabPage RID_SVXPAGE_POSITION
         Text[ french ] = "Position ~X";
         Text[ swedish ] = "Position ~X";
         Text[ dutch ] = "Positie ~X";
-        Text[ spanish ] = "Posici?? ~X";
+        Text[ spanish ] = "Posici??n ~X";
         Text[ english_us ] = "Position ~X";
         Text[ russian ] = "???????? ~X";
-        Text[ greek ] = "???????~X";
+        Text[ greek ] = "??????? ~X";
         Text[ polish ] = "Pozycja ~X";
-        Text[ japanese ] = "�??�?? ~X";
-        Text[ korean ] = "??\"?? ~X";
-        Text[ chinese_simplified ] = "?????? ~X";
-        Text[ chinese_traditional ] = "?????? ~X";
-        Text[ arabic ] = "??\"?????? ?";
+        Text[ japanese ] = "ﾄﾫ?ﾇﾫﾩ ~X";
+        Text[ korean ] = "�?\"��? ~X";
+        Text[ chinese_simplified ] = "ﾄﾫ?ﾇﾫﾩ ~X";
+        Text[ chinese_traditional ] = "ﾄﾫ?ﾇﾫﾩ ~X";
+        Text[ arabic ] = "???\"??????? ??";
         Text[ turkish ] = "~X konumu";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Posici?? ~X";
+        Text[ catalan ] = "Posici??~X";
         Text[ finnish ] = "Sijainti ~X";
+        Text[ thai ] = "�����?�??�� ~X";
     };
     FixedText FT_POS_Y
     {
@@ -123,20 +124,21 @@ TabPage RID_SVXPAGE_POSITION
         Text[ portuguese ] = "Posi???o ~Y";
         Text[ danish ] = "Position Y";
         Text[ dutch ] = "Positie~Y";
-        Text[ spanish ] = "Posici?? ~Y";
+        Text[ spanish ] = "Posici??n ~Y";
         Text[ english_us ] = "Position ~Y";
         Text[ russian ] = "???????? ~Y";
-        Text[ greek ] = "???????~Y";
+        Text[ greek ] = "??????? ~Y";
         Text[ polish ] = "Pozycja ~Y";
-        Text[ japanese ] = "�??�?? ~Y";
-        Text[ korean ] = "??\"?? ~Y";
-        Text[ chinese_simplified ] = "?????? ~Y";
-        Text[ chinese_traditional ] = "?????? ~Y";
-        Text[ arabic ] = "??\"?????? ??";
+        Text[ japanese ] = "ﾄﾫ?ﾇﾫﾩ ~Y";
+        Text[ korean ] = "�?\"��? ~Y";
+        Text[ chinese_simplified ] = "ﾄﾫ?ﾇﾫﾩ ~Y";
+        Text[ chinese_traditional ] = "ﾄﾫ?ﾇﾫﾩ ~Y";
+        Text[ arabic ] = "???\"??????? ??";
         Text[ turkish ] = "~Y konumu";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Posici?? ~Y";
+        Text[ catalan ] = "Posici??~Y";
         Text[ finnish ] = "Sijainti ~Y";
+        Text[ thai ] = "�����?�??�� ~Y";
     };
     MetricField MTR_FLD_POS_X
     {
@@ -183,19 +185,20 @@ TabPage RID_SVXPAGE_POSITION
         Text [ french ] = "Position" ;
         Text [ swedish ] = "Position" ;
         Text [ dutch ] = "Positie" ;
-        Text [ spanish ] = "Posici??" ;
+        Text [ spanish ] = "Posici??n" ;
         Text [ english_us ] = "Position" ;
         Text[ russian ] = "????????";
-        Text[ greek ] = "??????";
+        Text[ greek ] = "???????";
         Text[ polish ] = "Pozycja";
-        Text[ japanese ] = "�??�??";
-        Text[ korean ] = "??\"??";
-        Text[ chinese_simplified ] = "??????";
-        Text[ chinese_traditional ] = "??????";
-        Text[ arabic ] = "??\"??????";
+        Text[ japanese ] = "ﾄﾫ?ﾇﾫﾩ";
+        Text[ korean ] = "�?\"��?";
+        Text[ chinese_simplified ] = "ﾄﾫ?ﾇﾫﾩ";
+        Text[ chinese_traditional ] = "ﾄﾫ?ﾇﾫﾩ";
+        Text[ arabic ] = "???\"???????";
         Text[ turkish ] = "Konum";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Posici??";
+        Text[ thai ] = "�����?�??��";
     };
     Control CTL_RECT
     {
@@ -215,19 +218,20 @@ TabPage RID_SVXPAGE_POSITION
         QuickHelpText [ spanish ] = "Punto base" ;
         QuickHelpText [ french ] = "Point de base" ;
         QuickHelpText [ dutch ] = "Basispunt" ;
-        QuickHelpText[ russian ] = "?'??????? ?,????";
-        QuickHelpText[ greek ] = "????????? ??????,";
+        QuickHelpText[ russian ] = "?'??????????? ?,??????";
+        QuickHelpText[ greek ] = "????????? ???????,";
         QuickHelpText[ polish ] = "Punkt podstawy";
-        QuickHelpText[ japanese ] = "??????????????????";
-        QuickHelpText[ korean ] = "???????";
+        QuickHelpText[ japanese ] = "Ɵ?Ɵ��,�Ɵ?�,�Ɵ�Ɵ?";
+        QuickHelpText[ korean ] = "����Ս�?";
         QuickHelpText[ chinese_simplified ] = "Base point";
-        QuickHelpText[ chinese_traditional ] = "??????";
-        QuickHelpText[ arabic ] = "???,????\"????";
+        QuickHelpText[ chinese_traditional ] = "ﾆ?ﾧﾂﾯ?";
+        QuickHelpText[ arabic ] = "???,?? ???\"??????";
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ turkish ] = "Basispunkt";
-        QuickHelpText[ catalan ] = "Punto base";
-        QuickHelpText[ finnish ] = "Kantapiste";
+        QuickHelpText[ catalan ] = "Punt base";
+        QuickHelpText[ finnish ] = "Peruspiste";
+        QuickHelpText[ thai ] = "Base point";
     };
     GroupBox GB_ANCHOR
     {
@@ -241,22 +245,23 @@ TabPage RID_SVXPAGE_POSITION
         Text [ italian ] = "Ancoraggio" ;
         Text [ spanish ] = "Anclaje" ;
         Text [ french ] = "Ancrage" ;
-        Text [ swedish ] = "F??ankring" ;
+        Text [ swedish ] = "F??rankring" ;
         Text [ danish ] = "Forankring" ;
         Text [ portuguese_brazilian ] = "Verankerung" ;
         Text [ portuguese ] = "?,ncora" ;
-        Text[ russian ] = "???????????";
-        Text[ greek ] = "?'???????????";
+        Text[ russian ] = "???????";
+        Text[ greek ] = "?'????????????";
         Text[ polish ] = "Zakotwiczenie";
-        Text[ japanese ] = "???????";
-        Text[ korean ] = "??\"?? ????-";
-        Text[ chinese_simplified ] = "?\"????";
-        Text[ chinese_traditional ] = "??-???";
-        Text[ arabic ] = "?????";
+        Text[ japanese ] = "�,�Ɵ��,�Ɵ�";
+        Text[ korean ] = "����� �?\"��?";
+        Text[ chinese_simplified ] = "ﾂ\"?ﾆﾩ?";
+        Text[ chinese_traditional ] = "ﾂ?-ﾆﾩ?";
+        Text[ arabic ] = "??????";
         Text[ turkish ] = "Sabitleme";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Anclaje";
+        Text[ catalan ] = "Ancoratge";
         Text[ finnish ] = "Ankkurointi";
+        Text[ thai ] = "???";
     };
     FixedText FT_ANCHOR
     {
@@ -274,18 +279,19 @@ TabPage RID_SVXPAGE_POSITION
         Text [ danish ] = "Anker" ;
         Text [ portuguese ] = "~?,ncora" ;
         Text [ portuguese_brazilian ] = "~Anker" ;
-        Text[ russian ] = "???????????";
-        Text[ greek ] = "~?'???????????";
+        Text[ russian ] = "???????";
+        Text[ greek ] = "~?'????????????";
         Text[ polish ] = "Kotwica";
-        Text[ japanese ] = "????????????~A)";
-        Text[ korean ] = "????? ??\"??(~A)";
-        Text[ chinese_simplified ] = "??????~A)";
-        Text[ chinese_traditional ] = "�šš�??(~A)";
-        Text[ arabic ] = "?????";
+        Text[ japanese ] = "�,�Ɵ��,�Ɵ���?�?�(~A)";
+        Text[ korean ] = "����� �?\"��?(~A)";
+        Text[ chinese_simplified ] = "��?���(~A)";
+        Text[ chinese_traditional ] = "��?�??(~A)";
+        Text[ arabic ] = "??????";
         Text[ turkish ] = "~Sabitleyici";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Ancla";
+        Text[ catalan ] = "~Ancora";
         Text[ finnish ] = "~Ankkuri";
+        Text[ thai ] = "~???";
     };
     ListBox LB_ANCHOR
     {
@@ -360,7 +366,7 @@ TabPage RID_SVXPAGE_POSITION
         stringlist [ french ] =
         {
             < "Au paragraphe" ; > ;
-            < "Comme caract??e" ; > ;
+            < "Comme caract??re" ; > ;
             < "?? la page" ; > ;
             < "Au cadre" ; > ;
         };
@@ -374,16 +380,16 @@ TabPage RID_SVXPAGE_POSITION
     StringList [ russian ] =
     {
             < "?? ???????" ; > ;
-        < "????? ??????" ; > ;
+        < "????? ?????????" ; > ;
         < "?? ???,?????????" ; > ;
         < "?? ????????" ; > ;
     };
     StringList [ greek ] =
     {
-            < "??\"????????????????," ; > ;
-        < "??, ?????????\"?????," ; > ;
-        < "??\"???????????" ; > ;
-        < "??\"? ??????????" ; > ;
+            < "??\"?? ?????????????????," ; > ;
+        < "??, ??????????\"??????," ; > ;
+        < "??\"?? ??????????" ; > ;
+        < "??\"? ???????????" ; > ;
     };
     StringList [ polish ] =
     {
@@ -394,45 +400,45 @@ TabPage RID_SVXPAGE_POSITION
     };
     StringList [ japanese ] =
     {
-            < "????????" ; > ;
-        < "?-???????-???" ; > ;
-        < "?????????????" ; > ;
-        < "??????" ; > ;
+            < "���?��?�" ; > ;
+        < "�-?��-�?��?-�?�" ; > ;
+        < "Ɵ?Ɵ��,��?�" ; > ;
+        < "�?��?�" ; > ;
     };
     StringList [ korean ] =
     {
-            < "?<???-?" ; > ;
-        < "???????" ; > ;
-        < "????????-??\"?" ; > ;
-        < "?\"\"?????\"?-?" ; > ;
+            < "�<�?��-?" ; > ;
+        < "���??��?" ; > ;
+        < "�??�?��Ս-?" ; > ;
+        < "ﾡ\"\"ﾉ??ﾍ?\"ﾍ-?" ; > ;
     };
     StringList [ chinese_simplified ] =
     {
-            < "????????" ; > ;
-        < "??\"????????" ; > ;
-        < "????????" ; > ;
-        < "?????" ; > ;
+            < "�?��?���?" ; > ;
+        < "��\"��?��-���" ; > ;
+        < "�?��?���?" ; > ;
+        < "�?�?���" ; > ;
     };
     StringList [ chinese_traditional ] =
     {
-            < "��?�š�?�šš�" ; > ;
-        < "��-�ššš�?��" ; > ;
-        < "��?��?��?�šš�" ; > ;
-        < "��?�š�,?" ; > ;
+            < "�?��?���?" ; > ;
+        < "�-�?��-�?�" ; > ;
+        < "�?�?�?���?" ; > ;
+        < "�?�?�,?" ; > ;
     };
     StringList [ arabic ] =
     {
-            < "??\"?? ??\"???,?" ; > ;
-        < "????" ; > ;
-        < "??\"?? ??\"?????" ; > ;
-        < "??\"?? ??\"???" ; > ;
+            < "???\"?? ???\"???,??" ; > ;
+        < "?????" ; > ;
+        < "???\"?? ???\"??????" ; > ;
+        < "???\"?? ???\"????" ; > ;
     };
     StringList [ turkish ] =
     {
             < "Paragrafa" ; > ;
         < "Karakter olarak" ; > ;
         < "Sayfaya" ; > ;
-        < "??er??veye" ; > ;
+        < "??er??eveye" ; > ;
     };
     StringList [ language_user1 ] =
     {
@@ -443,10 +449,10 @@ TabPage RID_SVXPAGE_POSITION
     };
     StringList [ catalan ] =
     {
-            < "Al p?rrafo" ; > ;
-        < "Como car?cter" ; > ;
-        < "A la p?gina" ; > ;
-        < "Al marco" ; > ;
+            < "Al par??graf" ; > ;
+        < "Com a car??cter" ; > ;
+        < "A la p??gina" ; > ;
+        < "Al marc" ; > ;
     };
     StringList [ finnish ] =
     {
@@ -455,6 +461,13 @@ TabPage RID_SVXPAGE_POSITION
         < "Sivulle" ; > ;
         < "Kehykseen" ; > ;
     };
+    StringList [ thai ] =
+    {
+         < "��?���,��???�?????���" ; > ;
+        < "��?�?�����?������?��" ; > ;
+        < "��?���,��????���" ; > ;
+        < "��?���,��??��???" ; > ;
+    };
     };
     FixedText FT_ORIENT
     {
@@ -530,9 +543,9 @@ TabPage RID_SVXPAGE_POSITION
             < "Car?cter arriba" ; > ;
             < "Car?cter centrado" ; > ;
             < "Car?cter abajo" ; > ;
-            < "L??ea superior" ; > ;
-            < "L??ea centrada" ; > ;
-            < "L??ea inferior" ; > ;
+            < "L??nea arriba" ; > ;
+            < "L??nea centrada" ; > ;
+            < "L??nea abajo" ; > ;
         };
         stringlist [ french ] =
         {
@@ -541,11 +554,11 @@ TabPage RID_SVXPAGE_POSITION
             < "Centr?" ; > ;
             < "Inf?rieur" ; > ;
             < "D?calage haut" ; > ;
-            < "Caract??e centr?" ; > ;
+            < "Caract??re centr?" ; > ;
             < "D?calage bas" ; > ;
-            < "Ligne sur le bord sup?rieur" ; > ;
+            < "Ligne en haut" ; > ;
             < "Ligne centr?e" ; > ;
-            < "Ligne sur le bord inf?rieur" ; > ;
+            < "Ligne en bas" ; > ;
         };
         stringlist [ dutch ] =
         {
@@ -579,10 +592,10 @@ TabPage RID_SVXPAGE_POSITION
             < "?-verst" ; > ;
             < "Centrerat" ; > ;
             < "Underst" ; > ;
-            < "Tecken ??erst" ; > ;
+            < "Tecken ??verst" ; > ;
             < "Tecken centrerat" ; > ;
             < "Tecken underst" ; > ;
-            < "Rad ??erst" ; > ;
+            < "Rad ??verst" ; > ;
             < "Rad centrerad" ; > ;
             < "Rad underst" ; > ;
         };
@@ -615,106 +628,106 @@ TabPage RID_SVXPAGE_POSITION
     StringList [ russian ] =
     {
             < "????????" ; > ;
-        < "????????" ; > ;
+        < "?????" ; > ;
         < "??????????,???" ; > ;
-        < "????" ; > ;
-        < "?-???? ?????????" ; > ;
-        < "?-???? ????????,????" ; > ;
-        < "?-???? ?????" ; > ;
-        < "??,????????????????" ; > ;
-        < "??,???????????????,????" ; > ;
-        < "??,????????????" ; > ;
+        < "?????" ; > ;
+        < "???????? ?????????" ; > ;
+        < "???????? ?????????,???" ; > ;
+        < "???????? ??????" ; > ;
+        < "?>????? ?????????" ; > ;
+        < "?>????? ?????????,???" ; > ;
+        < "?>????? ??????" ; > ;
     };
     StringList [ greek ] =
     {
             < "A???? ??????" ; > ;
-        < "??????" ; > ;
-        < "??????\"?????????????" ; > ;
+        < "?????" ; > ;
+        < "??????\"???????????????" ; > ;
         < "????\"??" ; > ;
-        < "????????\"?????, ??????" ; > ;
-        < "????????\"?????, ?????\"?????????????" ; > ;
-        < "????????\"?????, ???\"??" ; > ;
+        < "??????????\"??????, ??????" ; > ;
+        < "??????????\"??????, ?????\"???????????????" ; > ;
+        < "??????????\"??????, ???\"??" ; > ;
         < "?\"??????? ??????" ; > ;
-        < "?\"??????? ?????\"?????????????" ; > ;
+        < "?\"??????? ?????\"???????????????" ; > ;
         < "?\"??????? ???\"??" ; > ;
     };
     StringList [ polish ] =
     {
-            < "Z g??y" ; > ;
-        < "W g??ze" ; > ;
+            < "Z g??ry" ; > ;
+        < "W g??rze" ; > ;
         < "Do ?>rodka" ; > ;
         < "W dole" ; > ;
-        < "Znak w g??ze" ; > ;
+        < "Znak w g??rze" ; > ;
         < "Wy?>rodkowany znak" ; > ;
         < "Znak na dole" ; > ;
-        < "Wiersz w g??ze" ; > ;
+        < "Wiersz w g??rze" ; > ;
         < "Wy?>rodkowany wiersz" ; > ;
         < "Wiersz w dole" ; > ;
     };
     StringList [ japanese ] =
     {
-            < "????<?,?" ; > ;
-        < "??" ; > ;
-        < "????" ; > ;
-        < "??" ; > ;
-        < "?-????????" ; > ;
-        < "?-??????????" ; > ;
-        < "?-????????" ; > ;
-        < "????????" ; > ;
-        < "??????????" ; > ;
-        < "????????" ; > ;
+            < "��?�?<�,?" ; > ;
+        < "��?" ; > ;
+        < "���ϩ" ; > ;
+        < "��<" ; > ;
+        < "�-?��-�?���?" ; > ;
+        < "�-?��-�?����ϩ" ; > ;
+        < "�-?��-�?���<" ; > ;
+        < "��?�?���?" ; > ;
+        < "��?�?����ϩ" ; > ;
+        < "��?�?���<" ; > ;
     };
     StringList [ korean ] =
     {
-            < "??\"???\"" ; > ;
-        < "??\"" ; > ;
-        < "??????" ; > ;
-        < "?-\"???" ; > ;
-        < "???? ??\"" ; > ;
-        < "???? ??????" ; > ;
-        < "???? ?-\"???" ; > ;
-        < "??\" ??\"" ; > ;
-        < "??\" ??????" ; > ;
-        < "??\" ?-\"???" ; > ;
+            < "�?\"��ա\"�" ; > ;
+        < "ﾍ?\"" ; > ;
+        < "��Ս?�?�" ; > ;
+        < "ﾍ-\"ﾉ??" ; > ;
+        < "���?? �?\"" ; > ;
+        < "���?? ��Ս?�?�" ; > ;
+        < "���?? �-\"�??" ; > ;
+        < "��\" �?\"" ; > ;
+        < "��\" ��Ս?�?�" ; > ;
+        < "��\" �-\"�??" ; > ;
     };
     StringList [ chinese_simplified ] =
     {
-            < "???????" ; > ;
-        < "??'??" ; > ;
-        < "????" ; > ;
-        < "??'??" ; > ;
-        < "????? ???-" ; > ;
-        < "????? ????" ; > ;
-        < "????? ???-" ; > ;
-        < "??????-" ; > ;
-        < "??? ????" ; > ;
-        < "??????-" ; > ;
+            < "��?��?���" ; > ;
+        < "�?'��?" ; > ;
+        < "��?���" ; > ;
+        < "�?'��<" ; > ;
+        < "��-��݄�?�-�" ; > ;
+        < "��-��݆�?���" ; > ;
+        < "��-��݄�<�-�" ; > ;
+        < "��?��?�-�" ; > ;
+        < "��?��?���" ; > ;
+        < "��?��<�-�" ; > ;
     };
     StringList [ chinese_traditional ] =
     {
-            < "�ššš�" ; > ;
-        < "��?'�š�" ; > ;
-        < "�šššš�" ; > ;
-        < "��?'�š�" ; > ;
-        < "�šš�?�ššš�-�" ; > ;
-        < "�šš�?�ššššš�" ; > ;
-        < "�šš�?�ššš�-�" ; > ;
-        < "�š�?�šš�-�" ; > ;
-        < "�š�?�šššš�" ; > ;
-        < "�š�?�šš�-�" ; > ;
+            < "��?��?" ; > ;
+        < "�?'��?" ; > ;
+        < "������" ; > ;
+        < "�?'��<" ; > ;
+        < "��-�?���?�-�" ; > ;
+        < "��-�?�������" ; > ;
+        < "��-�?���<�-�" ; > ;
+        < "��?��?�-�" ; > ;
+        < "��?������" ; > ;
+        < "��?��<�-�" ; > ;
     };
     StringList [ arabic ] =
     {
-            < "???? ????\"??" ; > ;
-        < "????\"??" ; > ;
-        < "????????" ; > ;
-        < "??????\"" ; > ;
-        < "????\"?? ??\"????" ; > ;
-        < "???? ??\"????" ; > ;
-        < "??????\" ??\"????" ; > ;
-        < "????\"?? ??\"???" ; > ;
-        < "???? ??\"???" ; > ;
-        < "??????\" ??\"???" ; > ;
+            < "???? ?????\"??" ; > ;
+        < "?????\"??" ; > ;
+        < "??????????" ; > ;
+        < "???????\"" ; > ;
+        < "?????\"?? ???\"?????" ; > ;
+        < "????? ???\"?????" ; > ;
+        < "???????\" ???\"?????" ; > ;
+        < "?????\"?? ???\"????" ; > ;
+        < "????? ???\"????" ; > ;
+        < "???????\" ???\"????" ; > ;
     };
     StringList [ turkish ] =
     {
@@ -725,9 +738,9 @@ TabPage RID_SVXPAGE_POSITION
         < "Karakter ?stte" ; > ;
         < "Karakter ortada" ; > ;
         < "Karakter altta" ; > ;
-        < "Sat?? yukarda" ; > ;
-        < "Sat?? ortada" ; > ;
-        < "Sat?? altta" ; > ;
+        < "Sat??r yukarda" ; > ;
+        < "Sat??r ortada" ; > ;
+        < "Sat??r altta" ; > ;
     };
     StringList [ language_user1 ] =
     {
@@ -744,29 +757,42 @@ TabPage RID_SVXPAGE_POSITION
     };
     StringList [ catalan ] =
     {
-            < "Desde arriba" ; > ;
-        < "Arriba" ; > ;
-        < "Centrado" ; > ;
-        < "Abajo" ; > ;
-        < "Car?cter arriba" ; > ;
-        < "Car?cter centrado" ; > ;
-        < "Car?cter abajo" ; > ;
-        < "L??ea superior" ; > ;
-        < "L??ea centrada" ; > ;
-        < "L??ea inferior" ; > ;
+            < "Des de la part superior" ; > ;
+        < "A sobre" ; > ;
+        < "Centrat" ; > ;
+        < "Sota" ; > ;
+        < "Car??cter amunt" ; > ;
+        < "Car??cter avall" ; > ;
+        < "Car??cter centrat" ; > ;
+        < "L'??rea superior" ; > ;
+        < "L'??rea centrada" ; > ;
+        < "L'??rea inferior" ; > ;
     };
     StringList [ finnish ] =
     {
             < "Ylh????lt??" ; > ;
-        < "Ylh????ll??" ; > ;
+        < "Yl??puolella" ; > ;
         < "Keskitetty" ; > ;
-        < "Alhaalla" ; > ;
-        < "Merkin yl??osa" ; > ;
-        < "Merkin keskiosa" ; > ;
-        < "Merkin alaosa" ; > ;
-        < "Viivan yl??osa" ; > ;
-        < "Viivan keskiosa" ; > ;
-        < "Viivan alaosa" ; > ;
+        < "Alapuolella" ; > ;
+        < "Merkin yl??reuna" ; > ;
+        < "Merkin keskikohta" ; > ;
+        < "Merkin alareuna" ; > ;
+        < "Viivan yl??reuna" ; > ;
+        < "Viivan keskikohta" ; > ;
+        < "Viivan alareuna" ; > ;
+    };
+    StringList [ thai ] =
+    {
+         < "����??���???" ; > ;
+        < "�������??" ; > ;
+        < "������?��?" ; > ;
+        < "�������?�??��?" ; > ;
+        < "?���???��?������?������?��" ; > ;
+        < "������?��?��?������?������?��" ; > ;
+        < "?���??�??��?��?������?������?��" ; > ;
+        < "?���???��?��???����?" ; > ;
+        < "������?��?��?��???����?" ; > ;
+        < "?���??�??��?��?��???����?" ; > ;
     };
     };
     TriStateBox TSB_PROTECT
@@ -778,40 +804,42 @@ TabPage RID_SVXPAGE_POSITION
         Text = "Sch~�tzen" ;
         Text [ ENGLISH ] = "~Protect" ;
         Text [ norwegian ] = "~Beskytte" ;
-        Text [ italian ] = "~Proteggi" ;
+        Text [ italian ] = "Proteggi" ;
         Text [ portuguese_brazilian ] = "~Proteger" ;
         Text [ portuguese ] = "~Proteger" ;
         Text [ finnish ] = "~Suojaa" ;
         Text [ danish ] = "Beskyt" ;
-        Text [ french ] = "~Prot?ger" ;
-        Text [ swedish ] = "Sk~ydda" ;
+        Text [ french ] = "Prot?ger" ;
+        Text [ swedish ] = "S~kydda" ;
         Text [ dutch ] = "~Beveiligen" ;
-        Text [ spanish ] = "~Proteger" ;
+        Text [ spanish ] = "Proteger" ;
         Text [ english_us ] = "Pr~otect" ;
         TabStop = TRUE ;
-        Text[ russian ] = "�???,????????? ???????";
-        Text[ greek ] = "????~???\"??????";
+        Text[ russian ] = "?-??????";
+        Text[ greek ] = "???~???\"???????";
         Text[ polish ] = "Chro?\"";
-        Text[ japanese ] = "?????(~O)";
-        Text[ korean ] = "?????~O)";
-        Text[ chinese_simplified ] = "??????(~O)";
-        Text[ chinese_traditional ] = "�š�?�š�(~O)";
-        Text[ arabic ] = "????????";
+        Text[ japanese ] = "��?���(~O)";
+        Text[ korean ] = "���?�(~O)";
+        Text[ chinese_simplified ] = "��?�?�(~O)";
+        Text[ chinese_traditional ] = "��?���(~O)";
+        Text[ arabic ] = "??????????";
         Text[ turkish ] = "~Koru";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Proteger";
+        Text[ catalan ] = "~Protegeix";
+        Text[ thai ] = "?��~������?";
     };
     Text[ russian ] = "????????";
-    Text[ greek ] = "??????";
+    Text[ greek ] = "???????";
     Text[ polish ] = "Pozycja";
-    Text[ japanese ] = "�??�??";
-    Text[ korean ] = "??\"??";
-    Text[ chinese_simplified ] = "??????";
-    Text[ chinese_traditional ] = "??????";
-    Text[ arabic ] = "??\"??????";
+    Text[ japanese ] = "ﾄﾫ?ﾇﾫﾩ";
+    Text[ korean ] = "�?\"��?";
+    Text[ chinese_simplified ] = "ﾄﾫ?ﾇﾫﾩ";
+    Text[ chinese_traditional ] = "ﾄﾫ?ﾇﾫﾩ";
+    Text[ arabic ] = "???\"???????";
     Text[ turkish ] = "Konum";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Posici??";
+    Text[ thai ] = "�����?�??��";
 };
  // RID_SVXPAGE_SIZE ---------------------------------------------------------
 TabPage RID_SVXPAGE_SIZE
@@ -831,7 +859,7 @@ TabPage RID_SVXPAGE_SIZE
     Text [ french ] = "Taille" ;
     Text [ swedish ] = "Storlek" ;
     Text [ dutch ] = "Grootte" ;
-    Text [ spanish ] = "Tama??" ;
+    Text [ spanish ] = "Tama??o" ;
     Text [ english_us ] = "Size" ;
     Size = MAP_APPFONT ( 189 , 97 ) ;
     FixedText FT_WIDTH
@@ -841,27 +869,28 @@ TabPage RID_SVXPAGE_SIZE
         Text = "~Breite" ;
         Text [ ENGLISH ] = "~Width" ;
         Text [ norwegian ] = "~Bredde" ;
-        Text [ italian ] = "~Largh." ;
+        Text [ italian ] = "Larghezza" ;
         Text [ portuguese_brazilian ] = "~Largura" ;
         Text [ portuguese ] = "~Largura" ;
         Text [ finnish ] = "Le~veys" ;
         Text [ danish ] = "Bredde" ;
-        Text [ french ] = "~Largeur" ;
+        Text [ french ] = "Largeur" ;
         Text [ swedish ] = "~Bredd" ;
         Text [ dutch ] = "~Breedte" ;
-        Text [ spanish ] = "A~ncho" ;
+        Text [ spanish ] = "Ancho" ;
         Text [ english_us ] = "Wi~dth" ;
-        Text[ russian ] = "???????";
-        Text[ greek ] = "~?????\"??,";
+        Text[ russian ] = "????????";
+        Text[ greek ] = "~????\"??,";
         Text[ polish ] = "Szer.";
-        Text[ japanese ] = "??(~D)";
-        Text[ korean ] = "?\"???(~D)";
-        Text[ chinese_simplified ] = "??????(~D)";
-        Text[ chinese_traditional ] = "��?�š�(~D)";
-        Text[ arabic ] = "??\"???";
+        Text[ japanese ] = "��?(~D)";
+        Text[ korean ] = "�\"?��\"(~D)";
+        Text[ chinese_simplified ] = "������(~D)";
+        Text[ chinese_traditional ] = "���(~D)";
+        Text[ arabic ] = "???\"????";
         Text[ turkish ] = "~Geni??lik";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "A~ncho";
+        Text[ catalan ] = "Ampla~da";
+        Text[ thai ] = "�����?��~�����?";
     };
     FixedText FT_HEIGHT
     {
@@ -877,22 +906,23 @@ TabPage RID_SVXPAGE_SIZE
         Text [ portuguese ] = "A~ltura" ;
         Text [ finnish ] = "K~orkeus" ;
         Text [ danish ] = "H??de" ;
-        Text [ french ] = "~Hauteur" ;
-        Text [ swedish ] = "H~??d" ;
+        Text [ french ] = "Hauteur" ;
+        Text [ swedish ] = "H~??jd" ;
         Text [ dutch ] = "H~oogte" ;
         Text [ spanish ] = "A~ltura" ;
         Text [ english_us ] = "H~eight" ;
-        Text[ russian ] = "?'?<?????";
+        Text[ russian ] = "?'?<??????";
         Text[ greek ] = "??~????,";
         Text[ polish ] = "Wys.";
-        Text[ japanese ] = "?????-(~E)";
-        Text[ korean ] = "??'???(~E)";
-        Text[ chinese_simplified ] = "??????(~E)";
-        Text[ chinese_traditional ] = "�š�?�šš�(~E)";
-        Text[ arabic ] = "??\"????????";
+        Text[ japanese ] = "��?�?-(~E)";
+        Text[ korean ] = "�?'�?�(~E)";
+        Text[ chinese_simplified ] = "��?���(~E)";
+        Text[ chinese_traditional ] = "��?���(~E)";
+        Text[ arabic ] = "???\"????????";
         Text[ turkish ] = "~Y?kseklik";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "A~ltura";
+        Text[ catalan ] = "A~l??a";
+        Text[ thai ] = "�����???~��";
     };
     MetricField MTR_FLD_WIDTH
     {
@@ -942,19 +972,20 @@ TabPage RID_SVXPAGE_SIZE
         QuickHelpText [ french ] = "Point de base" ;
         QuickHelpText [ dutch ] = "Basispunt" ;
         QuickHelpText [ portuguese ] = "Ponto de base" ;
-        QuickHelpText[ russian ] = "?'??????? ?,????";
-        QuickHelpText[ greek ] = "????????? ??????,";
+        QuickHelpText[ russian ] = "?'??????????? ?,??????";
+        QuickHelpText[ greek ] = "????????? ???????,";
         QuickHelpText[ polish ] = "Punkt podstawy";
-        QuickHelpText[ japanese ] = "??????????????????";
-        QuickHelpText[ korean ] = "???????";
-        QuickHelpText[ chinese_simplified ] = "Base point";
-        QuickHelpText[ chinese_traditional ] = "??????";
-        QuickHelpText[ arabic ] = "???,????\"????";
+        QuickHelpText[ japanese ] = "Ɵ?Ɵ��,�Ɵ?�,�Ɵ�Ɵ?";
+        QuickHelpText[ korean ] = "����Ս�?";
+        QuickHelpText[ chinese_simplified ] = "�?��,�";
+        QuickHelpText[ chinese_traditional ] = "ﾆ?ﾧﾂﾯ?";
+        QuickHelpText[ arabic ] = "???,?? ???\"??????";
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ turkish ] = "Basispunkt";
-        QuickHelpText[ catalan ] = "Punto base";
-        QuickHelpText[ finnish ] = "Kantapiste";
+        QuickHelpText[ catalan ] = "Punt base";
+        QuickHelpText[ finnish ] = "Peruspiste";
+        QuickHelpText[ thai ] = "Base point";
     };
     CheckBox CBX_SCALE
     {
@@ -965,25 +996,26 @@ TabPage RID_SVXPAGE_SIZE
         TabStop = TRUE ;
         Text [ english_us ] = "~Keep ratio" ;
         Text [ italian ] = "~Adatta" ;
-        Text [ spanish ] = "~Igualar" ;
-        Text [ french ] = "~Proportionnel" ;
+        Text [ spanish ] = "~Proporcional" ;
+        Text [ french ] = "Proportionnel" ;
         Text [ dutch ] = "~Synchroniseren" ;
-        Text [ swedish ] = "~Anpassa proportionellt" ;
+        Text [ swedish ] = "Anpassa ~proportionellt" ;
         Text [ danish ] = "Proportional" ;
         Text [ portuguese_brazilian ] = "~Abgleich" ;
         Text [ portuguese ] = "Pr~oporcional" ;
-        Text[ russian ] = "??????????????????????";
-        Text[ greek ] = "~?'??????????";
+        Text[ russian ] = "???????????,?? ??????????????";
+        Text[ greek ] = "~?'???????????";
         Text[ polish ] = "~Dopasuj";
-        Text[ japanese ] = "????-?(~K)";
-        Text[ korean ] = "??????????(~K)";
-        Text[ chinese_simplified ] = "???(~K)";
-        Text[ chinese_traditional ] = "�ššš�-��(~K)";
-        Text[ arabic ] = "????????";
+        Text[ japanese ] = "����-�(~K)";
+        Text[ korean ] = "��\"�?�?\" ���\"�-?��? ���-(~K)";
+        Text[ chinese_simplified ] = "��-�(~K)";
+        Text[ chinese_traditional ] = "����-�(~K)";
+        Text[ arabic ] = "?????????";
         Text[ turkish ] = "~E??itle";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Igualar";
-        Text[ finnish ] = "~S??ilyt?? suhde";
+        Text[ catalan ] = "~Iguala";
+        Text[ finnish ] = "S??ilyt?? ~suhde";
+        Text[ thai ] = "~?����?���������??��";
     };
     GroupBox GRP_SIZE
     {
@@ -1002,19 +1034,20 @@ TabPage RID_SVXPAGE_SIZE
         Text [ french ] = "Taille" ;
         Text [ swedish ] = "Storlek" ;
         Text [ dutch ] = "Grootte" ;
-        Text [ spanish ] = "Tama??" ;
+        Text [ spanish ] = "Tama??o" ;
         Text [ english_us ] = "Size" ;
         Text[ russian ] = "?????????";
-        Text[ greek ] = "??????????,";
+        Text[ greek ] = "????????????,";
         Text[ polish ] = "Rozmiar";
-        Text[ japanese ] = "???????";
-        Text[ korean ] = "?????";
-        Text[ chinese_simplified ] = "????";
-        Text[ chinese_traditional ] = "�šš�?";
-        Text[ arabic ] = "??\"???";
+        Text[ japanese ] = "�,��,��,�";
+        Text[ korean ] = "�?����";
+        Text[ chinese_simplified ] = "����?";
+        Text[ chinese_traditional ] = "����?";
+        Text[ arabic ] = "???\"????";
         Text[ turkish ] = "Boyut";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Tama??";
+        Text[ catalan ] = "Mida";
+        Text[ thai ] = "��?��";
     };
     TriStateBox TSB_PROTECT
     {
@@ -1025,28 +1058,29 @@ TabPage RID_SVXPAGE_SIZE
         Text = "Sch~�tzen" ;
         Text [ ENGLISH ] = "~Protect" ;
         Text [ norwegian ] = "~Beskytte" ;
-        Text [ italian ] = "~Proteggi" ;
+        Text [ italian ] = "Proteggi" ;
         Text [ portuguese_brazilian ] = "~Proteger" ;
         Text [ portuguese ] = "~Proteger" ;
         Text [ finnish ] = "~Suojaa" ;
         Text [ danish ] = "Beskyt" ;
-        Text [ french ] = "~Prot?ger" ;
-        Text [ swedish ] = "Sk~ydda" ;
+        Text [ french ] = "Prot?ger" ;
+        Text [ swedish ] = "S~kydda" ;
         Text [ dutch ] = "~Beveiligen" ;
-        Text [ spanish ] = "~Proteger" ;
+        Text [ spanish ] = "Proteger" ;
         Text [ english_us ] = "Pr~otect" ;
         TabStop = TRUE ;
-        Text[ russian ] = "�???,????????? ???????";
-        Text[ greek ] = "????~???\"??????";
+        Text[ russian ] = "?-??????";
+        Text[ greek ] = "???~???\"???????";
         Text[ polish ] = "Chro?\"";
-        Text[ japanese ] = "?????(~O)";
-        Text[ korean ] = "?????~O)";
-        Text[ chinese_simplified ] = "??????(~O)";
-        Text[ chinese_traditional ] = "�š�?�š�(~O)";
-        Text[ arabic ] = "????????";
+        Text[ japanese ] = "��?���(~O)";
+        Text[ korean ] = "���?�(~O)";
+        Text[ chinese_simplified ] = "��?�?�(~O)";
+        Text[ chinese_traditional ] = "��?���(~O)";
+        Text[ arabic ] = "??????????";
         Text[ turkish ] = "~Koru";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Proteger";
+        Text[ catalan ] = "~Protegeix";
+        Text[ thai ] = "?��~������?";
     };
     TriStateBox TSB_AUTOGROW_WIDTH
     {
@@ -1058,7 +1092,7 @@ TabPage RID_SVXPAGE_SIZE
         TabStop = TRUE ;
         Text [ dutch ] = "Br~eedte aan tekst aanpassen" ;
         Text [ italian ] = "Adatta la larghezza al t~esto" ;
-        Text [ spanish ] = "Ajustar ~ancho al texto" ;
+        Text [ spanish ] = "Ajustar ancho al texto" ;
         Text [ french ] = "Adapter la lar~geur au texte" ;
         Text [ swedish ] = "Anpassa br~edd till text" ;
         Text [ danish ] = "Tilpas bredde til tekst" ;
@@ -1067,15 +1101,16 @@ TabPage RID_SVXPAGE_SIZE
         Text[ russian ] = "?'?<?????????,?? ????????? ????,??????,??";
         Text[ greek ] = "?????????????? ?????\"????, ???, ??????, ?~?????????";
         Text[ polish ] = "Dopasuj szeroko?>?? do tekstu";
-        Text[ japanese ] = "?-?????-??????,'????,???>?,<(~F)";
-        Text[ korean ] = "????????? ?\"??? ??????(~F)";
-        Text[ chinese_simplified ] = "?'??-???????????(~F)";
-        Text[ chinese_traditional ] = "��'?��?��?��?��?�šš�?(~F)";
-        Text[ arabic ] = "???\"????? ??\"?????\"?\"????";
-        Text[ turkish ] = "Geni??li??i, metne g??e aya~rla";
+        Text[ japanese ] = "Ɵ?�,��,�Ɵ?�?���?�,'�??�,?�?>�,<(~F)";
+        Text[ korean ] = "�??�?ϡ?�-? �\"?��\" ��?���(~F)";
+        Text[ chinese_simplified ] = "�'?�-?��-�����݆��\"(~F)";
+        Text[ chinese_traditional ] = "�'?�?�-?��݆�?��?(~F)";
+        Text[ arabic ] = "???\"?????? ???\"???? ?\"?\"????";
+        Text[ turkish ] = "Geni??li??i, metne g??re aya~rla";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Ajustar ~ancho al texto";
-        Text[ finnish ] = "~Sovita leveys tekstiin";
+        Text[ catalan ] = "~Adapta l'amplada al text";
+        Text[ finnish ] = "Sovita ~leveys tekstiin";
+        Text[ thai ] = "~����?�����?�������?��??�,����������?";
     };
     TriStateBox TSB_AUTOGROW_HEIGHT
     {
@@ -1091,34 +1126,36 @@ TabPage RID_SVXPAGE_SIZE
         Text [ italian ] = "Adatta alt~ezza al testo" ;
         Text [ spanish ] = "~Ajustar altura al texto" ;
         Text [ french ] = "Adapter la haute~ur au texte" ;
-        Text [ swedish ] = "Anpassa h??d till text" ;
+        Text [ swedish ] = "Anpassa h??jd till text" ;
         Text [ danish ] = "Tilpas h??de til tekst" ;
         Text [ portuguese ] = "Ajustar ~altura ao texto" ;
         Text [ portuguese_brazilian ] = "H?h~e an Text anpassen" ;
         Text[ russian ] = "?'?<?????????,?? ???????? ????,??????,??";
         Text[ greek ] = "?????????????? ????????, ???, ??????, ??????????";
         Text[ polish ] = "Dopasuj wysoko?>?? do tekstu";
-        Text[ japanese ] = "?-?????-????????-?,'????,???>?,<(~H)";
-        Text[ korean ] = "????????? ??'??? ??????(~H)";
-        Text[ chinese_simplified ] = "?'??-???????????(~H)";
-        Text[ chinese_traditional ] = "��'?��?��?�š�?�š�?�šš�?(~H)";
-        Text[ arabic ] = "???\"????? ??\"???????? ?\"?\"????";
-        Text[ turkish ] = "Y?ksekli??i, metne g??e a~yarla";
+        Text[ japanese ] = "Ɵ?�,��,�Ɵ?�?���?�?-�,'�??�,?�?>�,<(~H)";
+        Text[ korean ] = "�??�?ϡ?�-? �?'�?� ��?���(~H)";
+        Text[ chinese_simplified ] = "�'?�-?��-��?��݆��\"(~H)";
+        Text[ chinese_traditional ] = "�'?�?�-?��?��݆�?��?(~H)";
+        Text[ arabic ] = "???\"?????? ???\"???????? ?\"?\"????";
+        Text[ turkish ] = "Y?ksekli??i, metne g??re a~yarla";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Ajustar altura al texto";
-        Text[ finnish ] = "~Sovita korkeus tekstiin";
+        Text[ catalan ] = "~Adapta l'al??da al texto";
+        Text[ finnish ] = "Sovita ~korkeus tekstiin";
+        Text[ thai ] = "����?�����?~??����??�,����������?";
     };
     Text[ russian ] = "?????????";
-    Text[ greek ] = "??????????,";
+    Text[ greek ] = "????????????,";
     Text[ polish ] = "Rozmiar";
-    Text[ japanese ] = "???????";
-    Text[ korean ] = "?????";
-    Text[ chinese_simplified ] = "????";
-    Text[ chinese_traditional ] = "�šš�?";
-    Text[ arabic ] = "??\"???";
+    Text[ japanese ] = "�,��,��,�";
+    Text[ korean ] = "�?����";
+    Text[ chinese_simplified ] = "����?";
+    Text[ chinese_traditional ] = "����?";
+    Text[ arabic ] = "???\"????";
     Text[ turkish ] = "Boyut";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Tama??";
+    Text[ catalan ] = "Mida";
+    Text[ thai ] = "��?��";
 };
  // RID_SVXPAGE_ANGLE --------------------------------------------------------
 TabPage RID_SVXPAGE_ANGLE
@@ -1154,19 +1191,20 @@ TabPage RID_SVXPAGE_ANGLE
         Text [ french ] = "Position ~X" ;
         Text [ swedish ] = "Position ~X" ;
         Text [ dutch ] = "Positie ~X" ;
-        Text [ spanish ] = "Posici?? ~X" ;
+        Text [ spanish ] = "Posici??n ~X" ;
         Text [ english_us ] = "Position ~X" ;
         Text[ russian ] = "???????? ~X";
-        Text[ greek ] = "???????~X";
+        Text[ greek ] = "??????? ~X";
         Text[ polish ] = "Pozycja X";
-        Text[ japanese ] = "�??�?? ~X";
-        Text[ korean ] = "??\"?? ~X";
-        Text[ chinese_simplified ] = "?????? ~X";
-        Text[ chinese_traditional ] = "?????? ~X";
-        Text[ arabic ] = "??\"?????? ?";
+        Text[ japanese ] = "ﾄﾫ?ﾇﾫﾩ ~X";
+        Text[ korean ] = "�?\"��? ~X";
+        Text[ chinese_simplified ] = "ﾄﾫ?ﾇﾫﾩ ~X";
+        Text[ chinese_traditional ] = "ﾄﾫ?ﾇﾫﾩ ~X";
+        Text[ arabic ] = "???\"??????? ??";
         Text[ turkish ] = "~X konumu";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Posici?? ~X";
+        Text[ catalan ] = "Posici??~X";
+        Text[ thai ] = "�����?�??�� ~X";
     };
     FixedText FT_POS_Y
     {
@@ -1183,19 +1221,20 @@ TabPage RID_SVXPAGE_ANGLE
         Text [ french ] = "Position ~Y" ;
         Text [ swedish ] = "Position ~Y" ;
         Text [ dutch ] = "Positie ~Y" ;
-        Text [ spanish ] = "Posici?? ~Y" ;
+        Text [ spanish ] = "Posici??n ~Y" ;
         Text [ english_us ] = "Position ~Y" ;
         Text[ russian ] = "???????? ~Y";
-        Text[ greek ] = "???????~Y";
+        Text[ greek ] = "??????? ~Y";
         Text[ polish ] = "Pozycja Y";
-        Text[ japanese ] = "�??�?? ~Y";
-        Text[ korean ] = "??\"?? ~Y";
-        Text[ chinese_simplified ] = "?????? ~Y";
-        Text[ chinese_traditional ] = "?????? ~Y";
-        Text[ arabic ] = "??\"?????? ??";
+        Text[ japanese ] = "ﾄﾫ?ﾇﾫﾩ ~Y";
+        Text[ korean ] = "�?\"��? ~Y";
+        Text[ chinese_simplified ] = "ﾄﾫ?ﾇﾫﾩ ~Y";
+        Text[ chinese_traditional ] = "ﾄﾫ?ﾇﾫﾩ ~Y";
+        Text[ arabic ] = "???\"??????? ??";
         Text[ turkish ] = "~Y konumu";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Posici?? ~Y";
+        Text[ catalan ] = "Posici??~Y";
+        Text[ thai ] = "�����?�??�� ~Y";
     };
     MetricField MTR_FLD_POS_X
     {
@@ -1239,22 +1278,23 @@ TabPage RID_SVXPAGE_ANGLE
         Text [ portuguese ] = "~?,ngulo" ;
         Text [ finnish ] = "~Kulma" ;
         Text [ danish ] = "Vinkel" ;
-        Text [ french ] = "~Angle" ;
+        Text [ french ] = "Angle" ;
         Text [ swedish ] = "~Vinkel" ;
         Text [ dutch ] = "~Hoek" ;
-        Text [ spanish ] = "An~gulo" ;
+        Text [ spanish ] = "??n~gulo" ;
         Text [ english_us ] = "~Angle" ;
-        Text[ russian ] = "�????";
-        Text[ greek ] = "~?\"??????";
+        Text[ russian ] = "??????";
+        Text[ greek ] = "~?\"???????";
         Text[ polish ] = "K??t";
-        Text[ japanese ] = "?????(~A)";
-        Text[ korean ] = "????\"(~A)";
-        Text[ chinese_simplified ] = "?????(~A)";
-        Text[ chinese_traditional ] = "�šššš�(~A)";
-        Text[ arabic ] = "??\"????????";
-        Text[ turkish ] = "~A??";
+        Text[ japanese ] = "��'���(~A)";
+        Text[ korean ] = "��?�?\"(~A)";
+        Text[ chinese_simplified ] = "��'���(~A)";
+        Text[ chinese_traditional ] = "��'���(~A)";
+        Text[ arabic ] = "???\"?????????";
+        Text[ turkish ] = "~A???";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "An~gulo";
+        Text[ catalan ] = "~Angle";
+        Text[ thai ] = "~?��?";
     };
     MetricField MTR_FLD_ANGLE
     {
@@ -1281,18 +1321,19 @@ TabPage RID_SVXPAGE_ANGLE
         CustomUnitText [ french ] = " degr?s" ;
         CustomUnitText [ dutch ] = "Graden" ;
         CustomUnitText [ portuguese ] = "Graus" ;
-        CustomUnitText[ russian ] = "?\"???????";
+        CustomUnitText[ russian ] = " ??????????";
         CustomUnitText[ greek ] = "?????????,";
         CustomUnitText[ polish ] = "Stopie?\"";
-        CustomUnitText[ japanese ] = "???";
-        CustomUnitText[ korean ] = "??\"";
-        CustomUnitText[ chinese_simplified ] = "???";
-        CustomUnitText[ chinese_traditional ] = "�šš�";
+        CustomUnitText[ japanese ] = "���";
+        CustomUnitText[ korean ] = "ﾉ?\"";
+        CustomUnitText[ chinese_simplified ] = "���";
+        CustomUnitText[ chinese_traditional ] = "���";
         CustomUnitText[ arabic ] = "????";
         CustomUnitText[ turkish ] = "Derece";
         CustomUnitText[ language_user1 ] = " ";
-        CustomUnitText[ catalan ] = "grados";
-        CustomUnitText[ finnish ] = " asteet";
+        CustomUnitText[ catalan ] = " graus";
+        CustomUnitText[ finnish ] = " astetta";
+        CustomUnitText[ thai ] = " ?��?��";
     };
     Control CTL_RECT
     {
@@ -1308,23 +1349,24 @@ TabPage RID_SVXPAGE_ANGLE
         QuickHelpText [ swedish ] = "Rotationspunkt" ;
         QuickHelpText [ danish ] = "Rotationspunkt" ;
         QuickHelpText [ italian ] = "Punto di rotazione" ;
-        QuickHelpText [ spanish ] = "Punto de rotaci??" ;
+        QuickHelpText [ spanish ] = "Punto de rotaci??n" ;
         QuickHelpText [ french ] = "Point de rotation" ;
         QuickHelpText [ dutch ] = "Rotatiepunt" ;
         QuickHelpText [ portuguese ] = "Ponto de rota???o" ;
-        QuickHelpText[ russian ] = "???????????????";
+        QuickHelpText[ russian ] = "??????? ????????????";
         QuickHelpText[ greek ] = "????????? ??????????\"???????,";
         QuickHelpText[ polish ] = "Punkt rotacyjny";
-        QuickHelpText[ japanese ] = "?>??????-??>?,<?,";
-        QuickHelpText[ korean ] = "?????\"???";
-        QuickHelpText[ chinese_simplified ] = "Rotation point";
-        QuickHelpText[ chinese_traditional ] = "?-<??????";
-        QuickHelpText[ arabic ] = "???,????\"?????????";
+        QuickHelpText[ japanese ] = "�>?����?-�?>�,<�,�";
+        QuickHelpText[ korean ] = "ﾡ??ﾍ?\"ﾍ??";
+        QuickHelpText[ chinese_simplified ] = "�-<����,�";
+        QuickHelpText[ chinese_traditional ] = "ﾑ-<ﾊﾫ?ﾂﾯ?";
+        QuickHelpText[ arabic ] = "???,?? ???\"??????";
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ turkish ] = "Rotationspunkt";
-        QuickHelpText[ catalan ] = "Punto de rotaci??";
+        QuickHelpText[ catalan ] = "Punt de rotaci??";
         QuickHelpText[ finnish ] = "Kiertopiste";
+        QuickHelpText[ thai ] = "Rotation point";
     };
     Control CTL_ANGLE
     {
@@ -1344,24 +1386,25 @@ TabPage RID_SVXPAGE_ANGLE
         Text [ italian ] = "Punto di rotazione" ;
         Text [ portuguese_brazilian ] = "Piv" ;
         Text [ portuguese ] = "Ponto de rota???o" ;
-        Text [ finnish ] = "Pivot-piste" ;
+        Text [ finnish ] = "Keskipiste" ;
         Text [ danish ] = "Rotationspunkt" ;
         Text [ french ] = "Point de rotation" ;
         Text [ swedish ] = "Rotationspunkt" ;
         Text [ dutch ] = "Draaipunt" ;
-        Text [ spanish ] = "Punto de rotaci??" ;
+        Text [ spanish ] = "Punto de rotaci??n" ;
         Text [ english_us ] = "Pivot point" ;
-        Text[ russian ] = "??????????????";
+        Text[ russian ] = "??????,?? ?????????";
         Text[ greek ] = "????????? ??????????\"???????,";
         Text[ polish ] = "Punkt obrotu";
-        Text[ japanese ] = "?>??????????????";
-        Text[ korean ] = "?????\"???";
-        Text[ chinese_simplified ] = "?-<????,";
-        Text[ chinese_traditional ] = "?-<??????";
-        Text[ arabic ] = "???,????????????";
-        Text[ turkish ] = "Eksen noktas?";
+        Text[ japanese ] = "�>?���Ɵ?�,�Ɵ�Ɵ?";
+        Text[ korean ] = "ﾡ??ﾍ?\"ﾍ??";
+        Text[ chinese_simplified ] = "�-<����,�";
+        Text[ chinese_traditional ] = "ﾑ-<ﾊﾫ?ﾂﾯ?";
+        Text[ arabic ] = "???,?? ????????????";
+        Text[ turkish ] = "Eksen noktas??";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Punto de rotaci??";
+        Text[ catalan ] = "Centre de gir";
+        Text[ thai ] = "����??��'����";
     };
     GroupBox GRP_ANGLE
     {
@@ -1378,31 +1421,33 @@ TabPage RID_SVXPAGE_ANGLE
         Text [ french ] = "Angle de rotation" ;
         Text [ swedish ] = "Rotationsvinkel" ;
         Text [ dutch ] = "Draaihoek" ;
-        Text [ spanish ] = "??ngulo de rotaci??" ;
+        Text [ spanish ] = "??ngulo de rotaci??n" ;
         Text [ english_us ] = "Rotation angle" ;
-        Text[ russian ] = "�???? ????????";
-        Text[ greek ] = "?\"?????????????????\"???????,";
+        Text[ russian ] = "?????? ?????????";
+        Text[ greek ] = "?\"??????? ??????????\"???????,";
         Text[ polish ] = "K??t obrotowy";
-        Text[ japanese ] = "?>?????????";
-        Text[ korean ] = "?????\"??";
-        Text[ chinese_simplified ] = "?-<????????";
-        Text[ chinese_traditional ] = "��-<�š�?�šššš�";
-        Text[ arabic ] = "???????? ??\"?????????";
-        Text[ turkish ] = "D????? a??s?";
+        Text[ japanese ] = "�>?�����'���";
+        Text[ korean ] = "�??��\"��?";
+        Text[ chinese_simplified ] = "�-<�����'���";
+        Text[ chinese_traditional ] = "�-<��?��'���";
+        Text[ arabic ] = "????????? ???\"??????";
+        Text[ turkish ] = "D??n??? a???s??";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "??ngulo de rotaci??";
+        Text[ catalan ] = "Angle de gir";
+        Text[ thai ] = "?��???��?";
     };
-    Text[ russian ] = "�????";
-    Text[ greek ] = "?\"??????";
+    Text[ russian ] = "??????";
+    Text[ greek ] = "?\"???????";
     Text[ polish ] = "K??t";
-    Text[ japanese ] = "?????";
-    Text[ korean ] = "????\"";
-    Text[ chinese_simplified ] = "?????";
-    Text[ chinese_traditional ] = "�šššš�";
-    Text[ arabic ] = "??\"????????";
-    Text[ turkish ] = "A??";
+    Text[ japanese ] = "��'���";
+    Text[ korean ] = "��?�?\"";
+    Text[ chinese_simplified ] = "��'���";
+    Text[ chinese_traditional ] = "��'���";
+    Text[ arabic ] = "???\"?????????";
+    Text[ turkish ] = "A???";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "??ngulo";
+    Text[ catalan ] = "Angle";
+    Text[ thai ] = "?��?";
 };
  // RID_SVXPAGE_SLANT -----------------------------------------------------
 TabPage RID_SVXPAGE_SLANT
@@ -1416,10 +1461,10 @@ TabPage RID_SVXPAGE_SLANT
     Text [ ENGLISH ] = "Slant" ;
     Text [ english_us ] = "Slant / Corner Radius" ;
     Text [ italian ] = "Inclina / raggio d'angolo" ;
-    Text [ spanish ] = "Inclinaci??/Radio de ?ngulo" ;
+    Text [ spanish ] = "Inclinaci??n/Radio de ?ngulo" ;
     Text [ french ] = "Inclinaison / rayon d'angle" ;
-    Text [ dutch ] = "Schuintrekken / hoekafronding" ;
-    Text [ swedish ] = "Snedst??ll / h??nradie" ;
+    Text [ dutch ] = "Schuintrekken / hoekradius" ;
+    Text [ swedish ] = "Snedst??ll/h??rnradie" ;
     Text [ danish ] = "H??ldning / hj??neradius" ;
     Text [ portuguese ] = "Inclinar /Raio do ?ngulo" ;
     Text [ portuguese_brazilian ] = "Schr?gstellen / Eckenradius" ;
@@ -1433,23 +1478,24 @@ TabPage RID_SVXPAGE_SLANT
         Text [ english_us ] = "~Radius" ;
         Text [ italian ] = "~Raggio" ;
         Text [ spanish ] = "Ra~dio" ;
-        Text [ french ] = "~Rayon" ;
+        Text [ french ] = "Rayon" ;
         Text [ swedish ] = "~Radie" ;
         Text [ danish ] = "Radius" ;
         Text [ portuguese_brazilian ] = "~Radius" ;
         Text [ portuguese ] = "~Raio" ;
         Text[ russian ] = "????????";
-        Text[ greek ] = "?'~??\"????";
+        Text[ greek ] = "?'~??\"?????";
         Text[ polish ] = "Promie?\"";
-        Text[ japanese ] = "?????(~R)";
-        Text[ korean ] = "??????\"(~R)";
-        Text[ chinese_simplified ] = "?????(~R)";
-        Text[ chinese_traditional ] = "��??�š�(~R)";
-        Text[ arabic ] = "?????? ??\"?,??";
+        Text[ japanese ] = "�??��\"(~R)";
+        Text[ korean ] = "��?��Չ�\"(~R)";
+        Text[ chinese_simplified ] = "�??��\"(~R)";
+        Text[ chinese_traditional ] = "�??��'(~R)";
+        Text[ arabic ] = "?????? ???\"?,???";
         Text[ turkish ] = "~??ap";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Ra~dio";
+        Text[ catalan ] = "~Radi";
         Text[ finnish ] = "~S??de";
+        Text[ thai ] = "~?��??�,�";
     };
     MetricField MTR_FLD_RADIUS
     {
@@ -1476,23 +1522,24 @@ TabPage RID_SVXPAGE_SLANT
         Text [ english_us ] = "~Angle" ;
         Text [ italian ] = "Angolo" ;
         Text [ spanish ] = "??~ngulo" ;
-        Text [ french ] = "~Angle" ;
+        Text [ french ] = "Angle" ;
         Text [ swedish ] = "~Vinkel" ;
         Text [ danish ] = "Vinkel" ;
         Text [ portuguese ] = "~?,ngulo" ;
         Text [ portuguese_brazilian ] = "~Winkel" ;
-        Text[ russian ] = "�????";
-        Text[ greek ] = "~?\"??????";
+        Text[ russian ] = "??????";
+        Text[ greek ] = "~?\"???????";
         Text[ polish ] = "K??t";
-        Text[ japanese ] = "?????(~A)";
-        Text[ korean ] = "????\"(~A)";
-        Text[ chinese_simplified ] = "?????(~A)";
-        Text[ chinese_traditional ] = "�šššš�(~A)";
-        Text[ arabic ] = "??\"????????";
-        Text[ turkish ] = "~A??";
+        Text[ japanese ] = "��'���(~A)";
+        Text[ korean ] = "��?�?\"(~A)";
+        Text[ chinese_simplified ] = "��'���(~A)";
+        Text[ chinese_traditional ] = "��'���(~A)";
+        Text[ arabic ] = "???\"?????????";
+        Text[ turkish ] = "~A???";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "??~ngulo";
+        Text[ catalan ] = "~Angle";
         Text[ finnish ] = "~Kulma";
+        Text[ thai ] = "~?��?";
     };
     MetricField MTR_FLD_ANGLE
     {
@@ -1521,18 +1568,19 @@ TabPage RID_SVXPAGE_SLANT
         CustomUnitText [ danish ] = "grader" ;
         CustomUnitText [ portuguese_brazilian ] = "Grad" ;
         CustomUnitText [ portuguese ] = "Graus" ;
-        CustomUnitText[ russian ] = "?\"???????";
+        CustomUnitText[ russian ] = " ??????????";
         CustomUnitText[ greek ] = "?????????,";
         CustomUnitText[ polish ] = "Stopie?\"";
-        CustomUnitText[ japanese ] = "???";
-        CustomUnitText[ korean ] = "??\"";
-        CustomUnitText[ chinese_simplified ] = "???";
-        CustomUnitText[ chinese_traditional ] = "�šš�";
+        CustomUnitText[ japanese ] = "���";
+        CustomUnitText[ korean ] = "ﾉ?\"";
+        CustomUnitText[ chinese_simplified ] = "���";
+        CustomUnitText[ chinese_traditional ] = "���";
         CustomUnitText[ arabic ] = "????";
         CustomUnitText[ turkish ] = "Derece";
         CustomUnitText[ language_user1 ] = " ";
-        CustomUnitText[ catalan ] = "grados";
-        CustomUnitText[ finnish ] = " asteet";
+        CustomUnitText[ catalan ] = " graus";
+        CustomUnitText[ finnish ] = " astetta";
+        CustomUnitText[ thai ] = " ?��?��";
     };
     /*
     Control CTL_ANGLE
@@ -1549,27 +1597,28 @@ TabPage RID_SVXPAGE_SLANT
         Size = MAP_APPFONT ( 105 , 42 ) ;
         Text = "Eckenradius" ;
         Text [ ENGLISH ] = "Edge radius" ;
-        Text [ dutch ] = "Hoekafronding" ;
+        Text [ dutch ] = "Hoekradius" ;
         Text [ english_us ] = "Corner radius" ;
         Text [ italian ] = "Raggio d'angolo" ;
         Text [ spanish ] = "Radio de ?ngulo" ;
         Text [ french ] = "Rayon d'angle" ;
-        Text [ swedish ] = "H??nradie" ;
+        Text [ swedish ] = "H??rnradie" ;
         Text [ danish ] = "Hj??neradius" ;
         Text [ portuguese_brazilian ] = "Eckenradius" ;
         Text [ portuguese ] = "Raio do ?ngulo" ;
         Text[ russian ] = "???????? ????????????????????????";
-        Text[ greek ] = "?'??\"?????????????,";
+        Text[ greek ] = "?'??\"????? ??????????,";
         Text[ polish ] = "Promie?\" krzywizny";
-        Text[ japanese ] = "??????????";
-        Text[ korean ] = "?????? ????\"";
-        Text[ chinese_simplified ] = "???????";
-        Text[ chinese_traditional ] = "�šš�??�š�";
-        Text[ arabic ] = "?????? ?,?? ??\"????????";
-        Text[ turkish ] = "K??e ??p?";
+        Text[ japanese ] = "��'�?��??��\"";
+        Text[ korean ] = "���\"?�ݪ ��?�?\"";
+        Text[ chinese_simplified ] = "��'�??��\"";
+        Text[ chinese_traditional ] = "��'�??��'";
+        Text[ arabic ] = "?????? ?,??? ???\"?????????";
+        Text[ turkish ] = "K???e ??ap??";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Radio de ?ngulo";
+        Text[ catalan ] = "Radi de l'angle";
         Text[ finnish ] = "Kulmas??de";
+        Text[ thai ] = "?��??�,�?��?";
     };
     GroupBox GRP_SLANT
     {
@@ -1591,15 +1640,16 @@ TabPage RID_SVXPAGE_SLANT
         Text[ russian ] = "?????????";
         Text[ greek ] = "?>????";
         Text[ polish ] = "Pochyl";
-        Text[ japanese ] = "?,????-??>?,<";
-        Text[ korean ] = "?????";
-        Text[ chinese_simplified ] = "????";
-        Text[ chinese_traditional ] = "��,��?";
-        Text[ arabic ] = "?????\"";
+        Text[ japanese ] = "�,�-?�?-�?>�,<";
+        Text[ korean ] = "���?���";
+        Text[ chinese_simplified ] = "���-?";
+        Text[ chinese_traditional ] = "�,�-?";
+        Text[ arabic ] = "??????\"";
         Text[ turkish ] = "Duru?? e??imi";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Inclinar";
+        Text[ catalan ] = "Inclina";
         Text[ finnish ] = "Kallista";
+        Text[ thai ] = "��?�,�?��";
     };
     /*
     TriStateBox TSB_VERTICAL
@@ -1611,18 +1661,19 @@ TabPage RID_SVXPAGE_SLANT
         TabStop = TRUE;
     };
 */
-    Text[ russian ] = "????????? / ???????? ??????";
-    Text[ greek ] = "?>???? / ?'??\"?????????????,";
+    Text[ russian ] = "?????????/???????? ????????????????????????";
+    Text[ greek ] = "?>???? / ?'??\"????? ??????????,";
     Text[ polish ] = "Pochyl / Promie?\" naro??nika";
-    Text[ japanese ] = "?,????-??>?,</??????????????-??-";
-    Text[ korean ] = "??????/ ?????? ????\"";
-    Text[ chinese_simplified ] = "?????'????????";
-    Text[ chinese_traditional ] = "��,��?/�šššš�";
-    Text[ arabic ] = "?????\" / ?????? ?,?? ??\"????????";
-    Text[ turkish ] = "Duru?? e??imi / K??e ??p?";
+    Text[ japanese ] = "�,�-?��'���/��'�?��??��\"";
+    Text[ korean ] = "���?���/���\"?�ݪ ��?�?\"";
+    Text[ chinese_simplified ] = "���-?�'?��'�??��\"";
+    Text[ chinese_traditional ] = "�,�-?/��'���";
+    Text[ arabic ] = "??????\" / ?????? ?,??? ???\"?????????";
+    Text[ turkish ] = "Duru?? e??imi / K???e ??ap??";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Inclinaci??/Radio de ?ngulo";
+    Text[ catalan ] = "Inclinaci??Radi d'angle";
     Text[ finnish ] = "Kallistus-/kulmas??de";
+    Text[ thai ] = "��?�,�?�� / ?��??�,�?��?";
 };
  // RID_SVXDLG_TRANSFORM -----------------------------------------------------
 TabDialog RID_SVXDLG_TRANSFORM
@@ -1644,7 +1695,7 @@ TabDialog RID_SVXDLG_TRANSFORM
     Text [ french ] = "Position et taille" ;
     Text [ swedish ] = "Position och storlek" ;
     Text [ dutch ] = "Positie en grootte" ;
-    Text [ spanish ] = "Posici?? y tama??" ;
+    Text [ spanish ] = "Posici??n y tama??o" ;
     Text [ english_us ] = "Position and Size" ;
     Moveable = TRUE ;
     TabControl TAB_CONTROL
@@ -1668,20 +1719,21 @@ TabDialog RID_SVXDLG_TRANSFORM
                 Text [ french ] = "Position" ;
                 Text [ swedish ] = "Position" ;
                 Text [ dutch ] = "Positie" ;
-                Text [ spanish ] = "Posici??" ;
+                Text [ spanish ] = "Posici??n" ;
                 Text [ english_us ] = "Position" ;
                 PageResID = RID_SVXPAGE_POSITION ;
                 Text[ russian ] = "????????";
-                Text[ greek ] = "??????";
+                Text[ greek ] = "???????";
                 Text[ polish ] = "Pozycja";
-                Text[ japanese ] = "�??�??";
-                Text[ korean ] = "??\"??";
-                Text[ chinese_simplified ] = "??????";
-                Text[ chinese_traditional ] = "??????";
-                Text[ arabic ] = "??\"??????";
+                Text[ japanese ] = "ﾄﾫ?ﾇﾫﾩ";
+                Text[ korean ] = "�?\"��?";
+                Text[ chinese_simplified ] = "ﾄﾫ?ﾇﾫﾩ";
+                Text[ chinese_traditional ] = "ﾄﾫ?ﾇﾫﾩ";
+                Text[ arabic ] = "???\"???????";
                 Text[ turkish ] = "Konum";
                 Text[ language_user1 ] = " ";
                 Text[ catalan ] = "Posici??";
+                Text[ thai ] = "�����?�??��";
             };
             PageItem
             {
@@ -1699,20 +1751,21 @@ TabDialog RID_SVXDLG_TRANSFORM
                 Text [ french ] = "Taille" ;
                 Text [ swedish ] = "Storlek" ;
                 Text [ dutch ] = "Grootte" ;
-                Text [ spanish ] = "Tama??" ;
+                Text [ spanish ] = "Tama??o" ;
                 Text [ english_us ] = "Size" ;
                 PageResID = RID_SVXPAGE_SIZE ;
                 Text[ russian ] = "?????????";
-                Text[ greek ] = "??????????,";
+                Text[ greek ] = "????????????,";
                 Text[ polish ] = "Rozmiar";
-                Text[ japanese ] = "???????";
-                Text[ korean ] = "?????";
-                Text[ chinese_simplified ] = "????";
-                Text[ chinese_traditional ] = "�šš�?";
-                Text[ arabic ] = "??\"???";
+                Text[ japanese ] = "�,��,��,�";
+                Text[ korean ] = "�?����";
+                Text[ chinese_simplified ] = "����?";
+                Text[ chinese_traditional ] = "����?";
+                Text[ arabic ] = "???\"????";
                 Text[ turkish ] = "Boyut";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Tama??";
+                Text[ catalan ] = "Mida";
+                Text[ thai ] = "��?��";
             };
             PageItem
             {
@@ -1728,20 +1781,21 @@ TabDialog RID_SVXDLG_TRANSFORM
                 Text [ french ] = "Rotation" ;
                 Text [ swedish ] = "Rotation" ;
                 Text [ dutch ] = "Draaien" ;
-                Text [ spanish ] = "Rotaci??" ;
+                Text [ spanish ] = "Rotaci??n" ;
                 Text [ english_us ] = "Rotation" ;
                 PageResID = RID_SVXPAGE_ANGLE ;
-                Text[ russian ] = "????????";
-                Text[ greek ] = "??????????\"??????";
-                Text[ polish ] = "Obr??";
-                Text[ japanese ] = "�>?�??";
-                Text[ korean ] = "?????\"";
-                Text[ chinese_simplified ] = "?-<???";
-                Text[ chinese_traditional ] = "?-<???";
-                Text[ arabic ] = "??\"?????????";
-                Text[ turkish ] = "D?????";
+                Text[ russian ] = "?'??????????";
+                Text[ greek ] = "?????????\"??????";
+                Text[ polish ] = "Obr??t";
+                Text[ japanese ] = "ﾆ>?ﾊﾯﾽ";
+                Text[ korean ] = "ﾡ??ﾍ?\"";
+                Text[ chinese_simplified ] = "ﾑ-<ﾊﾫﾪ";
+                Text[ chinese_traditional ] = "ﾑ-<ﾊﾫ?";
+                Text[ arabic ] = "???\"??????";
+                Text[ turkish ] = "D??n???";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Rotaci??";
+                Text[ catalan ] = "Gir";
+                Text[ thai ] = "??��?";
             };
             PageItem
             {
@@ -1753,42 +1807,58 @@ TabDialog RID_SVXDLG_TRANSFORM
                 PageResID = RID_SVXPAGE_SLANT ;
                 Text [ english_us ] = "Slant / Corner Radius" ;
                 Text [ italian ] = "Inclina / raggio d'angolo" ;
-                Text [ spanish ] = "Inclinaci??/Radio de ?ngulo" ;
+                Text [ spanish ] = "Inclinaci??n/Radio de ?ngulo" ;
                 Text [ french ] = "Inclinaison / rayon d'angle" ;
-                Text [ dutch ] = "Schuintrekken/hoekafronding" ;
-                Text [ swedish ] = "Snedst??ll / h??nradie" ;
+                Text [ dutch ] = "Schuintrekken/hoekradius" ;
+                Text [ swedish ] = "Snedst??ll/h??rnradie" ;
                 Text [ danish ] = "H??ldning / hj??neradius" ;
                 Text [ portuguese_brazilian ] = "Schr?gstellen / Eckenradius" ;
                 Text [ portuguese ] = "Inclinar / Raio do ?ngulo" ;
-                Text[ russian ] = "????????? / ???????? ??????";
-                Text[ greek ] = "?>???? / ?'??\"?????????????,";
+                Text[ russian ] = "?????????/???????? ????????????????????????";
+                Text[ greek ] = "?>???? / ?'??\"????? ??????????,";
                 Text[ polish ] = "Pochyl / Promie?\" naro??nika";
-                Text[ japanese ] = "?,????-??>?,</??????????????-??-";
-                Text[ korean ] = "??????/ ?????? ????\"";
-                Text[ chinese_simplified ] = "?????'????????";
-                Text[ chinese_traditional ] = "��,��?/�šššš�";
-                Text[ arabic ] = "?????\" / ?????? ?,?? ??\"????????";
-                Text[ turkish ] = "Duru?? e??imi / K??e ??p?";
+                Text[ japanese ] = "�,�-?��'���/��'�?��??��\"";
+                Text[ korean ] = "���?���/���\"?�ݪ ��?�?\"";
+                Text[ chinese_simplified ] = "���-?�'?��'�??��\"";
+                Text[ chinese_traditional ] = "�,�-?/��'���";
+                Text[ arabic ] = "??????\" / ?????? ?,??? ???\"?????????";
+                Text[ turkish ] = "Duru?? e??imi / K???e ??ap??";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Inclinaci??/Radio de ?ngulo";
+                Text[ catalan ] = "Inclinaci??Radi d'angle";
                 Text[ finnish ] = "Kallistus-/kulmas??de";
+                Text[ thai ] = "��?�,�?�� / ?��??�,�?��?";
             };
         };
     };
-    Text[ russian ] = "???????? ???????????";
-    Text[ greek ] = "????????????????????,";
+    Text[ russian ] = "????????????? ???????????";
+    Text[ greek ] = "??????? ????? ???????????,";
     Text[ polish ] = "Pozycja i rozmiar";
-    Text[ japanese ] = "?????????????";
-    Text[ korean ] = "??\"????? ?????";
-    Text[ chinese_simplified ] = "???????'?????";
-    Text[ chinese_traditional ] = "�š�?�ššš�'?�šš�?";
-    Text[ arabic ] = "??\"?????? ????\"???";
+    Text[ japanese ] = "��?����?��,��,��,�";
+    Text[ korean ] = "�?\"��? ��? �?����";
+    Text[ chinese_simplified ] = "��?����'?����?";
+    Text[ chinese_traditional ] = "��?����'?����?";
+    Text[ arabic ] = "???\"??????? ?????\"????";
     Text[ turkish ] = "Konum ve boyut";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Posici?? y tama??";
+    Text[ catalan ] = "Posici??i mida";
+    Text[ thai ] = "�����?�??��������?��";
 };
  // ********************************************************************** EOF
 
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svx/source/dialog/textanim.src b/svx/source/dialog/textanim.src
index 8510592e2606..e3a24a8233f4 100644
--- a/svx/source/dialog/textanim.src
+++ b/svx/source/dialog/textanim.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: textanim.src,v $
  *
- *  $Revision: 1.25 $
+ *  $Revision: 1.26 $
  *
- *  last change: $Author: kz $ $Date: 2003-02-27 13:35:17 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -112,15 +112,15 @@ TabPage RID_SVXPAGE_TEXTANIMATION
     Text [ dutch ] = "Tekstanimatie" ;
     Text [ english_us ] = "Animation" ;
     Text [ italian ] = "Animazione testo" ;
-    Text [ spanish ] = "Animaci�n de texto" ;
+    Text [ spanish ] = "Animaci�n" ;
     Text [ french ] = "Animation de texte" ;
     Text [ swedish ] = "Textanimation" ;
     Text [ danish ] = "Tekstanimation" ;
     Text [ portuguese ] = "Anima��o de texto" ;
-    Text [ portuguese_brazilian ] = "Anima��o de texto" ;
+    Text [ portuguese_brazilian ] = "Textanimation" ;
     Text[ chinese_simplified ] = "活动文字";
     Text[ russian ] = "��������";
-    Text[ polish ] = "Animacja";
+    Text[ polish ] = "Animacje";
     Text[ japanese ] = "アニメーションテキスト";
     Text[ chinese_traditional ] = "動態文字";
     Text[ greek ] = "��� ������� ��������";
@@ -128,7 +128,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
     Text[ arabic ] = "������� ������";
     Text[ turkish ] = "Metin canland�rma";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Animaci�n de texto";
+    Text[ catalan ] = "Animaci� de text";
     Text[ finnish ] = "Animaatio";
     FixedLine FL_EFFECT
     {
@@ -147,15 +147,16 @@ TabPage RID_SVXPAGE_TEXTANIMATION
         Text[ italian ] = "Effetti di animazione";
         Text[ danish ] = "Effekter i animeret tekst";
         Text[ swedish ] = "Effekter animerad text";
-        Text[ polish ] = "Efekty animacji tekstu";
-        Text[ portuguese_brazilian ] = "Efeitos de anima��o de texto";
+        Text[ polish ] = "Efekty: animacja tekstu";
+        Text[ portuguese_brazilian ] = "Text Animation Effects";
         Text[ japanese ] = "テキストアニメーションの効果";
         Text[ korean ] = "텍스트 애니매이션 효과";
         Text[ chinese_simplified ] = "活动文字的效果";
         Text[ chinese_traditional ] = "動態文字的效果";
         Text[ turkish ] = "Text Animation Effects";
         Text[ arabic ] = "Text Animation Effects";
-        Text[ catalan ] = "Text Animation Effects";
+        Text[ catalan ] = "Efectes d'animaci� de text";
+        Text[ thai ] = "ลักษณะการเคลื่อนไหวของข้อความ";
     };
 #define MA_CURR_Y       RSC_SP_TBPG_INNERBORDER_TOP + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP + MA_BUTTON_HEIGHT
     FixedText FT_EFFECTS
@@ -176,15 +177,16 @@ TabPage RID_SVXPAGE_TEXTANIMATION
         Text[ italian ] = "Effetto";
         Text[ danish ] = "E~ffekt";
         Text[ swedish ] = "E~ffekt";
-        Text[ polish ] = "E~fekt";
-        Text[ portuguese_brazilian ] = "Efeito";
+        Text[ polish ] = "Efekt";
+        Text[ portuguese_brazilian ] = "Effect";
         Text[ japanese ] = "効果(~F)";
         Text[ korean ] = "효과(~F)";
         Text[ chinese_simplified ] = "效果(~F)";
         Text[ chinese_traditional ] = "效果(~F)";
         Text[ turkish ] = "Effect";
         Text[ arabic ] = "Effect";
-        Text[ catalan ] = "~Efectes";
+        Text[ catalan ] = "Efecte";
+        Text[ thai ] = "ลั~กษณะพิเศษ";
     };
     ListBox LB_EFFECT
     {
@@ -227,11 +229,11 @@ TabPage RID_SVXPAGE_TEXTANIMATION
         };
         stringlist [ portuguese_brazilian ] =
         {
-            < "Sem Efeito" ; Default ; > ;
-            < "Piscar" ; Default ; > ;
-            < "Rolar atrav�s" ; Default ; > ;
-            < "Rolar de um lado ao outro" ; Default ; > ;
-            < "Rolar em" ; Default ; > ;
+            < "Kein Effekt" ; Default ; > ;
+            < "Blinken" ; Default ; > ;
+            < "Durchlaufen" ; Default ; > ;
+            < "Hin- und zur?klaufen" ; Default ; > ;
+            < "Reinlaufen" ; Default ; > ;
         };
         stringlist [ swedish ] =
         {
@@ -259,7 +261,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
         };
         stringlist [ spanish ] =
         {
-            < "Sin efecto" ; Default ; > ;
+            < "Sin efectos" ; Default ; > ;
             < "Intermitente" ; Default ; > ;
             < "Continuo" ; Default ; > ;
             < "De un lado al otro" ; Default ; > ;
@@ -332,9 +334,9 @@ TabPage RID_SVXPAGE_TEXTANIMATION
     StringList [ korean ] =
     {
             < "효과 없음" ; Default ; > ;
-        < "깜박이기" ; Default ; > ;
+        < "깜박임 효과" ; Default ; > ;
         < "전체 스크롤" ; Default ; > ;
-        < "앞뒤로 스크롤" ; Default ; > ;
+        < "앞 뒤로 스크롤" ; Default ; > ;
         < "스크롤 인" ; Default ; > ;
     };
     StringList [ arabic ] =
@@ -363,10 +365,10 @@ TabPage RID_SVXPAGE_TEXTANIMATION
     };
     StringList [ catalan ] =
     {
-            < "Sense cap efecte" ; Default ; > ;
-        < "Intermitente" ; Default ; > ;
-        < "Continuo" ; Default ; > ;
-        < "De un lado al otro" ; Default ; > ;
+            < "Sense efectes" ; Default ; > ;
+        < "Parpelleja" ; Default ; > ;
+        < "Continu" ; Default ; > ;
+        < "D'una banda a l'altra" ; Default ; > ;
         < "Entrar" ; Default ; > ;
     };
     StringList [ finnish ] =
@@ -377,6 +379,14 @@ TabPage RID_SVXPAGE_TEXTANIMATION
         < "Vierit� edestakaisin" ; Default ; > ;
         < "Vierit� sis��n" ; Default ; > ;
     };
+    StringList [ thai ] =
+    {
+         < "ไม่มีลักษณะพิเศษ" ; Default ; > ;
+        < "กระพริบ" ; Default ; > ;
+        < "เลื่อนผ่าน" ; Default ; > ;
+        < "เลื่อนกลับและออกไป" ; Default ; > ;
+        < "เลื่อนใน" ; Default ; > ;
+    };
     };
     FixedText FT_DIRECTION
     {
@@ -394,20 +404,21 @@ TabPage RID_SVXPAGE_TEXTANIMATION
         Text[ greek ] = "Direction";
         Text[ dutch ] = "Looprichting";
         Text[ french ] = "Direction";
-        Text[ spanish ] = "Orientaci�n";
+        Text[ spanish ] = "Direcci�n";
         Text[ finnish ] = "Suunta";
         Text[ italian ] = "Direzione";
         Text[ danish ] = "Retning";
         Text[ swedish ] = "Riktning";
-        Text[ polish ] = "Kierunek";
-        Text[ portuguese_brazilian ] = "Dire��o";
+        Text[ polish ] = "Orientacja";
+        Text[ portuguese_brazilian ] = "Direction";
         Text[ japanese ] = "方向";
         Text[ korean ] = "방향";
         Text[ chinese_simplified ] = "方向";
         Text[ chinese_traditional ] = "方向";
         Text[ turkish ] = "Direction";
         Text[ arabic ] = "Direction";
-        Text[ catalan ] = "Direction";
+        Text[ catalan ] = "Direcci�";
+        Text[ thai ] = "ทิศทาง";
     };
     ImageButton BTN_UP
     {
@@ -437,8 +448,9 @@ TabPage RID_SVXPAGE_TEXTANIMATION
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ turkish ] = "Nach Oben";
-        QuickHelpText[ catalan ] = "Hacia arriba";
+        QuickHelpText[ catalan ] = "Cap amunt";
         QuickHelpText[ finnish ] = "Yl�reunaan";
+        QuickHelpText[ thai ] = "To Top";
     };
     ImageButton BTN_LEFT
     {
@@ -468,8 +480,9 @@ TabPage RID_SVXPAGE_TEXTANIMATION
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ turkish ] = "Nach Links";
-        QuickHelpText[ catalan ] = "Hacia la izquierda";
+        QuickHelpText[ catalan ] = "Cap a l'esquerra";
         QuickHelpText[ finnish ] = "Vasemmalle";
+        QuickHelpText[ thai ] = "To Left";
     };
     ImageButton BTN_RIGHT
     {
@@ -499,8 +512,9 @@ TabPage RID_SVXPAGE_TEXTANIMATION
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ turkish ] = "Nach Rechts";
-        QuickHelpText[ catalan ] = "Hacia la derecha";
+        QuickHelpText[ catalan ] = "Cap a la dreta";
         QuickHelpText[ finnish ] = "Oikealle";
+        QuickHelpText[ thai ] = "To Right";
     };
     ImageButton BTN_DOWN
     {
@@ -530,8 +544,9 @@ TabPage RID_SVXPAGE_TEXTANIMATION
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ turkish ] = "Nach Unten";
-        QuickHelpText[ catalan ] = "Hacia abajo";
+        QuickHelpText[ catalan ] = "Cap a avall";
         QuickHelpText[ finnish ] = "Alareunaan";
+        QuickHelpText[ thai ] = "To Bottom";
     };
 
     FixedLine FL_PROPERTIES
@@ -552,14 +567,15 @@ TabPage RID_SVXPAGE_TEXTANIMATION
         Text[ danish ] = "Egenskaber";
         Text[ swedish ] = "Egenskaper";
         Text[ polish ] = "W�a�ciwo�ci";
-        Text[ portuguese_brazilian ] = "Propriedades";
+        Text[ portuguese_brazilian ] = "Properties";
         Text[ japanese ] = "属性";
-        Text[ korean ] = "등록정보";
+        Text[ korean ] = "등록 정보";
         Text[ chinese_simplified ] = "属性";
         Text[ chinese_traditional ] = "屬性";
         Text[ turkish ] = "Properties";
         Text[ arabic ] = "Properties";
         Text[ catalan ] = "Propietats";
+        Text[ thai ] = "คุณสมบัติ";
     };
 #define MA_CURR_Y2      RSC_SP_TBPG_INNERBORDER_TOP + MA_EFFECTSGROUP_HEIGHT + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP
     TriStateBox TSB_START_INSIDE
@@ -577,10 +593,10 @@ TabPage RID_SVXPAGE_TEXTANIMATION
         Text [ swedish ] = "Text synlig vid ~start" ;
         Text [ danish ] = "Te~kst synlig ved start" ;
         Text [ portuguese ] = "Texto vis�vel ao ~iniciar" ;
-        Text [ portuguese_brazilian ] = "Texto vis�vel ao ~iniciar" ;
+        Text [ portuguese_brazilian ] = "Text sichtbar beim ~Starten" ;
         Text[ chinese_simplified ] = "在启动时显示文字(~T)";
         Text[ russian ] = "������ �������";
-        Text[ polish ] = "~Tekst widoczny przy rozpocz�ciu";
+        Text[ polish ] = "Tekst widoczny przy rozpocz�ciu";
         Text[ japanese ] = "開始時にテキストが見える(~T)";
         Text[ chinese_traditional ] = "在啟動時顯示文字(~T)";
         Text[ greek ] = "������� ����� ���� ��� ������~��";
@@ -588,8 +604,9 @@ TabPage RID_SVXPAGE_TEXTANIMATION
         Text[ arabic ] = "����� ���� ��� �������";
         Text[ turkish ] = "Metni, canland�rma ba�larken ~g�r�nt�le";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Texto visible al ~iniciar";
+        Text[ catalan ] = "I~nicia a dins";
         Text[ finnish ] = "~Aloita kohteessa";
+        Text[ thai ] = "เ~ริ่มด้านใน";
     };
 #define MA_CURR_Y3      MA_CURR_Y2 + RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y
     TriStateBox TSB_STOP_INSIDE
@@ -607,10 +624,10 @@ TabPage RID_SVXPAGE_TEXTANIMATION
         Text [ swedish ] = "Text synlig vid a~vslutning" ;
         Text [ danish ] = "Tekst s~ynlig ved afslutning" ;
         Text [ portuguese ] = "Texto vis�vel ao ~finalizar" ;
-        Text [ portuguese_brazilian ] = "Texto v�sivel ao ~sair" ;
+        Text [ portuguese_brazilian ] = "Text sichtbar beim ~Beenden" ;
         Text[ chinese_simplified ] = "在结束时显示文字";
         Text[ russian ] = "���������� ~����� ��� ������";
-        Text[ polish ] = "Tekst widoczny przy ko�czeniu";
+        Text[ polish ] = "Tekst widoczny przy zako�czeniu";
         Text[ japanese ] = "終了時にテキストが見える";
         Text[ chinese_traditional ] = "在結束時顯示文字";
         Text[ greek ] = "������� ����� ���� ��� �����";
@@ -618,8 +635,9 @@ TabPage RID_SVXPAGE_TEXTANIMATION
         Text[ arabic ] = "����� ���� ��� ��������";
         Text[ turkish ] = "Metni, canland�rma bitti�inde g�~r�nt�le";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Texto visible al ~finalizar";
+        Text[ catalan ] = "Text visible al ~finaltizar";
         Text[ finnish ] = "Teksti n�kyviss� poistuttaessa";
+        Text[ thai ] = "สามารถมองเห็นข้อความเมื่อกำลังออก";
     };
 #define MA_CURR_Y4      MA_CURR_Y3 + RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y
     FixedText FT_COUNT
@@ -636,20 +654,21 @@ TabPage RID_SVXPAGE_TEXTANIMATION
         Text [ dutch ] = "Animatiecyclussen" ;
         Text [ swedish ] = "Antal" ;
         Text [ danish ] = "Animationsgentagelser" ;
-        Text [ portuguese_brazilian ] = "Ciclos de anima��o" ;
+        Text [ portuguese_brazilian ] = "Anzahl" ;
         Text [ portuguese ] = "Ciclos de anima��o" ;
         Text[ chinese_simplified ] = "动画循环的次数";
         Text[ russian ] = "����� ��������";
-        Text[ polish ] = "Cykle animacji";
+        Text[ polish ] = "Animacje";
         Text[ japanese ] = "回数";
         Text[ chinese_traditional ] = "動畫循環的次數";
         Text[ greek ] = "������";
-        Text[ korean ] = "개수";
+        Text[ korean ] = "효과 주기";
         Text[ arabic ] = "�����";
         Text[ turkish ] = "Adet say�s�";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Cantidad";
+        Text[ catalan ] = "Quantitat";
         Text[ finnish ] = "Animaation kierto";
+        Text[ thai ] = "เคลื่อนไหวแบบวงกลม";
     };
 #define MA_CURR_Y5      MA_CURR_Y4 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP
     TriStateBox TSB_ENDLESS
@@ -667,19 +686,20 @@ TabPage RID_SVXPAGE_TEXTANIMATION
         Text [ swedish ] = "~Kontinuerligt" ;
         Text [ danish ] = "Endel�s" ;
         Text [ portuguese ] = "~Cont�nuo" ;
-        Text [ portuguese_brazilian ] = "~Cont�nuo" ;
+        Text [ portuguese_brazilian ] = "~Endlos" ;
         Text[ chinese_simplified ] = "不间断(~C)";
         Text[ russian ] = "����������";
-        Text[ polish ] = "~Ci�g�y";
+        Text[ polish ] = "Bez ko�ca";
         Text[ japanese ] = "エンドレスに続ける(~C)";
         Text[ chinese_traditional ] = "不間斷(~C)";
         Text[ greek ] = "�������";
-        Text[ korean ] = "연속(~C)";
+        Text[ korean ] = "계속(~C)";
         Text[ arabic ] = "��� �����";
         Text[ turkish ] = "~Sonsuz";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "S~ense fi";
+        Text[ catalan ] = "~Continu";
         Text[ finnish ] = "~Jatkuva";
+        Text[ thai ] = "~ต่อเนื่อง";
     };
     NumericField NUM_FLD_COUNT
     {
@@ -708,11 +728,11 @@ TabPage RID_SVXPAGE_TEXTANIMATION
         Text [ dutch ] = "Stapgrootte" ;
         Text [ swedish ] = "Stegl�ngd" ;
         Text [ danish ] = "Trinvidde" ;
-        Text [ portuguese_brazilian ] = "Incremento" ;
+        Text [ portuguese_brazilian ] = "Schrittweite" ;
         Text [ portuguese ] = "Incremento" ;
         Text[ chinese_simplified ] = "递增";
         Text[ russian ] = "���";
-        Text[ polish ] = "Przyrost";
+        Text[ polish ] = "Inkrement";
         Text[ japanese ] = "ステップ数";
         Text[ chinese_traditional ] = "漸進";
         Text[ greek ] = "����";
@@ -720,8 +740,9 @@ TabPage RID_SVXPAGE_TEXTANIMATION
         Text[ arabic ] = "�������";
         Text[ turkish ] = "Ad�m";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Import�ncia";
+        Text[ catalan ] = "Increment";
         Text[ finnish ] = "Lis�ys";
+        Text[ thai ] = "ส่วนเพิ่ม";
     };
 #define MA_CURR_Y7      MA_CURR_Y6 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP
     TriStateBox TSB_PIXEL
@@ -739,10 +760,10 @@ TabPage RID_SVXPAGE_TEXTANIMATION
         Text [ swedish ] = "~Pixel" ;
         Text [ danish ] = "Pixel" ;
         Text [ portuguese ] = "~Pixel" ;
-        Text [ portuguese_brazilian ] = "~Pixels" ;
+        Text [ portuguese_brazilian ] = "~Pixel" ;
         Text[ chinese_simplified ] = "像素(~P)";
         Text[ russian ] = "�����";
-        Text[ polish ] = "~Piksele";
+        Text[ polish ] = "Pi~ksel";
         Text[ japanese ] = "ピクセル(~P)";
         Text[ chinese_traditional ] = "像素(~P)";
         Text[ greek ] = "~Pixel";
@@ -752,6 +773,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "P�~xel";
         Text[ finnish ] = "~Kuvapisteet";
+        Text[ thai ] = "~พิกเซล";
     };
     MetricField MTR_FLD_AMOUNT
     {
@@ -785,7 +807,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
         Text [ dutch ] = "Vertraging" ;
         Text [ swedish ] = "F�rdr�jning" ;
         Text [ danish ] = "Trinforsinkelse" ;
-        Text [ portuguese_brazilian ] = "Atraso" ;
+        Text [ portuguese_brazilian ] = "Verz�gerung" ;
         Text [ portuguese ] = "Retardar" ;
         Text[ chinese_simplified ] = "延迟";
         Text[ russian ] = "��������";
@@ -797,8 +819,9 @@ TabPage RID_SVXPAGE_TEXTANIMATION
         Text[ arabic ] = "�����";
         Text[ turkish ] = "Gecikme";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Retardo";
+        Text[ catalan ] = "Retard";
         Text[ finnish ] = "Viivyt�";
+        Text[ thai ] = "หน่วงเวลา";
     };
 #define MA_CURR_Y9      MA_CURR_Y8 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP
     TriStateBox TSB_AUTO
@@ -816,10 +839,10 @@ TabPage RID_SVXPAGE_TEXTANIMATION
         Text [ swedish ] = "~Automatisk" ;
         Text [ danish ] = "Automatisk" ;
         Text [ portuguese ] = "~Automaticamente" ;
-        Text [ portuguese_brazilian ] = "~Autom�tico" ;
+        Text [ portuguese_brazilian ] = "~Automatisch" ;
         Text[ chinese_simplified ] = "自动(~A)";
         Text[ russian ] = "�������������";
-        Text[ polish ] = "~Automatycznie";
+        Text[ polish ] = "Automatycznie";
         Text[ japanese ] = "自動(~A)";
         Text[ chinese_traditional ] = "自動(~A)";
         Text[ greek ] = "��������";
@@ -829,6 +852,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Autom�tic";
         Text[ finnish ] = "~Automaattinen";
+        Text[ thai ] = "~อัตโนมัติ";
     };
     MetricField MTR_FLD_DELAY
     {
@@ -846,6 +870,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
         Maximum = 100000 ;
         Last = 100000 ;
     };
+    Text[ thai ] = "เคลื่อนไหว";
 };
  // RID_SVXDLG_TEXT -------------------------------------------------------
 TabDialog RID_SVXDLG_TEXT
@@ -862,7 +887,7 @@ TabDialog RID_SVXDLG_TEXT
     Text [ dutch ] = "Tekst" ;
     Text [ swedish ] = "Text" ;
     Text [ danish ] = "Tekst" ;
-    Text [ portuguese_brazilian ] = "Texto" ;
+    Text [ portuguese_brazilian ] = "Text" ;
     Text [ portuguese ] = "Texto" ;
     Text[ chinese_simplified ] = "文字";
     Text[ russian ] = "�����";
@@ -874,7 +899,7 @@ TabDialog RID_SVXDLG_TEXT
     Text[ arabic ] = "��";
     Text[ turkish ] = "Metin";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Texto";
+    Text[ catalan ] = "Text";
     Text[ finnish ] = "Teksti";
     Moveable = TRUE ;
     TabControl 1
@@ -897,7 +922,7 @@ TabDialog RID_SVXDLG_TEXT
                 Text [ dutch ] = "Tekst" ;
                 Text [ swedish ] = "Text" ;
                 Text [ danish ] = "Tekst" ;
-                Text [ portuguese_brazilian ] = "Texto" ;
+                Text [ portuguese_brazilian ] = "Text" ;
                 Text [ portuguese ] = "Texto" ;
                 Text[ chinese_simplified ] = "文字";
                 Text[ russian ] = "�����";
@@ -909,8 +934,9 @@ TabDialog RID_SVXDLG_TEXT
                 Text[ arabic ] = "��";
                 Text[ turkish ] = "Metin";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Texto";
+                Text[ catalan ] = "Text";
                 Text[ finnish ] = "Teksti";
+                Text[ thai ] = "ข้อความ";
             };
             PageItem
             {
@@ -925,7 +951,7 @@ TabDialog RID_SVXDLG_TEXT
                 Text [ dutch ] = "Tekstanimatie" ;
                 Text [ swedish ] = "Animerad text" ;
                 Text [ danish ] = "Animeret tekst" ;
-                Text [ portuguese_brazilian ] = "Texto animado" ;
+                Text [ portuguese_brazilian ] = "Lauftext" ;
                 Text [ portuguese ] = "Texto animado" ;
                 Text[ chinese_simplified ] = "活动文字";
                 Text[ russian ] = "�������� ������";
@@ -939,8 +965,15 @@ TabDialog RID_SVXDLG_TEXT
                 Text[ language_user1 ] = " ";
                 Text[ catalan ] = "Animaci� de text";
                 Text[ finnish ] = "Tekstianimaatio";
+                Text[ thai ] = "การเคลื่อนไหวของข้อความ";
             };
         };
     };
+    Text[ thai ] = "ข้อความ";
 };
  // ******************************************************************* EOF
+
+
+
+
+
diff --git a/svx/source/dialog/textattr.src b/svx/source/dialog/textattr.src
index b2b5fc00ac02..3ebad3851ed1 100644
--- a/svx/source/dialog/textattr.src
+++ b/svx/source/dialog/textattr.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: textattr.src,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: kz $ $Date: 2001-07-14 20:39:59 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -97,18 +97,19 @@ TabPage RID_SVXPAGE_TEXTATTR
         Text [ danish ] = "Tekst" ;
         Text [ portuguese_brazilian ] = "Text" ;
         Text [ portuguese ] = "Texto" ;
-        Text[ chinese_simplified ] = "����";
+        Text[ chinese_simplified ] = "文字";
         Text[ russian ] = "�����";
         Text[ polish ] = "Tekst";
-        Text[ japanese ] = "������";
-        Text[ chinese_traditional ] = "����";
+        Text[ japanese ] = "テキスト";
+        Text[ chinese_traditional ] = "內文";
         Text[ arabic ] = "����";
         Text[ greek ] = "�������";
-        Text[ korean ] = "�ؽ�Ʈ";
+        Text[ korean ] = "텍스트";
         Text[ turkish ] = "Metin";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Texto";
+        Text[ catalan ] = "Text";
         Text[ finnish ] = "Teksti";
+        Text[ thai ] = "ข้อความ";
     };
     TriStateBox TSB_AUTOGROW_WIDTH
     {
@@ -121,23 +122,24 @@ TabPage RID_SVXPAGE_TEXTATTR
         Text [ dutch ] = "Br~eedte aan tekst aanpassen" ;
         Text [ italian ] = "~Adatta larghezza a testo" ;
         Text [ spanish ] = "Ajus~tar ancho al texto" ;
-        Text [ french ] = "Adapter largeur au texte" ;
+        Text [ french ] = "Adapter la lar~geur au texte" ;
         Text [ swedish ] = "Anpassa ~bredd till text" ;
-        Text [ danish ] = "Tilpas bredde til tekst" ;
+        Text [ danish ] = "Tilpas ~bredde til tekst" ;
         Text [ portuguese ] = "Ajustar ~largura ao texto" ;
         Text [ portuguese_brazilian ] = "Br~eite an Text anpassen" ;
-        Text[ chinese_simplified ] = "�����ֿ��ȶ�Ӧ(~D)";
+        Text[ chinese_simplified ] = "和文字宽度对应(~D)";
         Text[ russian ] = "��������� ������ �� ������";
         Text[ polish ] = "Dopasuj szeroko~�� do tekstu";
-        Text[ japanese ] = "÷�Ăɕ������킹��(~D)";
-        Text[ chinese_traditional ] = "�e�שM������(~D)";
+        Text[ japanese ] = "テキストに幅を合わせる(~D)";
+        Text[ chinese_traditional ] = "寬度和內文對齊(~D)";
         Text[ arabic ] = "������ ����� ����";
         Text[ greek ] = "���������� ������� �� ���� �������";
-        Text[ korean ] = "�ؽ�Ʈ�� �ʺ� ����(~D)";
+        Text[ korean ] = "텍스트에 너비 맞춤(~D)";
         Text[ turkish ] = "~Geni�li�i metne g�re ayarla";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Ajus~tar ancho al texto";
+        Text[ catalan ] = "Adapta l'ampla~da al text";
         Text[ finnish ] = "~Sovita leveys tekstiin";
+        Text[ thai ] = "จัดความก~ว้างพอดีข้อความ";
     };
     TriStateBox TSB_AUTOGROW_HEIGHT
     {
@@ -152,21 +154,22 @@ TabPage RID_SVXPAGE_TEXTATTR
         Text [ spanish ] = "~Ajustar altura al texto" ;
         Text [ french ] = "Adapter la hauteur au texte" ;
         Text [ swedish ] = "Anpassa h�j~d till text" ;
-        Text [ danish ] = "Tilpas h�jde til tekst" ;
+        Text [ danish ] = "Tilpas h�j~de til tekst" ;
         Text [ portuguese ] = "Ajustar ~altura ao texto" ;
         Text [ portuguese_brazilian ] = "H~?e an Text anpassen" ;
-        Text[ chinese_simplified ] = "�����ָ߶ȶ�Ӧ(~E)";
+        Text[ chinese_simplified ] = "和文字高度对应(~E)";
         Text[ russian ] = "��������� ������ �� ������";
         Text[ polish ] = "Dopas~uj wysoko�� do tekstu";
-        Text[ japanese ] = "÷�Ăɍ��������킹��(~E)";
-        Text[ chinese_traditional ] = "���שM������(~E)";
+        Text[ japanese ] = "テキストに高さを合わせる(~E)";
+        Text[ chinese_traditional ] = "高度和內文對齊(~E)";
         Text[ arabic ] = "������ �������� ����";
         Text[ greek ] = "���������� ����� �� ���� �������";
-        Text[ korean ] = "�ؽ�Ʈ�� ���� ����(~E)";
+        Text[ korean ] = "텍스트에 높이 맞춤(~E)";
         Text[ turkish ] = "~Y�ksekli�i metne g�re ayarla";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Ajustar altura al texto";
+        Text[ catalan ] = "~Ajusta a l'al�ada del text";
         Text[ finnish ] = "~Sovita korkeus tekstiin";
+        Text[ thai ] = "จัดความสู~งพอดีข้อความ";
     };
     TriStateBox TSB_FIT_TO_SIZE
     {
@@ -175,27 +178,28 @@ TabPage RID_SVXPAGE_TEXTATTR
         Size = MAP_APPFONT ( 102 , 10 ) ;
         Text = "Am Rahmen ~anpassen" ;
         Text [ ENGLISH ] = "~Fit to size" ;
-        Text [ dutch ] = "Aan ~kader aanpassen" ;
+        Text [ dutch ] = "Aanpassen aan ~kader" ;
         Text [ english_us ] = "~Fit to frame" ;
         Text [ italian ] = "Adatta alla cornice" ;
         Text [ spanish ] = "Aju~star al marco" ;
         Text [ french ] = "Adapter au cadre" ;
         Text [ swedish ] = "~Anpassa till ram" ;
-        Text [ danish ] = "Tilpas til rammen" ;
+        Text [ danish ] = "Tilp~as til ramme" ;
         Text [ portuguese ] = "Adaptar � ~moldura" ;
         Text [ portuguese_brazilian ] = "Am R~ahmen anpassen" ;
-        Text[ chinese_simplified ] = "�ͱ߿��С���Ӧ(~F)";
-        Text[ russian ] = "����������� � ������";
+        Text[ chinese_simplified ] = "和边框大小相对应(~F)";
+        Text[ russian ] = "��������� �� �����";
         Text[ polish ] = "Dopasuj do ramki";
-        Text[ japanese ] = "�g�ɍ��킹��(~F)";
-        Text[ chinese_traditional ] = "�M��ع��(~F)";
+        Text[ japanese ] = "枠に合わせる(~F)";
+        Text[ chinese_traditional ] = "和邊框大小對應(~F)";
         Text[ arabic ] = "������ ��� ������";
         Text[ greek ] = "���������� �� �������";
-        Text[ korean ] = "�����ӿ� ����(~F)";
+        Text[ korean ] = "프레임에 맞춤(~F)";
         Text[ turkish ] = "Metni ~�er�eveye uydur";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Aju~star al marco";
+        Text[ catalan ] = "A~dapta al marc";
         Text[ finnish ] = "~Sovita kehykseen";
+        Text[ thai ] = "~จัดพอดีกรอบ";
     };
     TriStateBox TSB_CONTOUR
     {
@@ -213,18 +217,19 @@ TabPage RID_SVXPAGE_TEXTATTR
         Text [ spanish ] = "Ajustar al ~contorno" ;
         Text [ french ] = "Adapter au ~contour" ;
         Text [ dutch ] = "~Contourverloop" ;
-        Text[ chinese_simplified ] = "��������Ӧ����(~A)";
-        Text[ russian ] = "~������������ �� �������";
+        Text[ chinese_simplified ] = "文字流对应轮廓(~A)";
+        Text[ russian ] = "~� �������� �������";
         Text[ polish ] = "Obieg konturu";
-        Text[ japanese ] = "�֊s�ɍ��킹��(~A)";
-        Text[ chinese_traditional ] = "�M�������(~A)";
+        Text[ japanese ] = "輪郭に合わせる(~A)";
+        Text[ chinese_traditional ] = "和輪廓對齊(~A)";
         Text[ arabic ] = "������ ���� �������";
         Text[ greek ] = "��� ����~���������";
-        Text[ korean ] = "�������帧(~A)";
+        Text[ korean ] = "윤곽에 맞춤(~A)";
         Text[ turkish ] = "~Kontur ak���";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Ajustar al ~contorno";
+        Text[ catalan ] = "~Ajusta al contorn";
         Text[ finnish ] = "~S��d� ��riviivaan";
+        Text[ thai ] = "~ปรับถึงเส้นแสดงรูปร่าง";
     };
     FixedLine FL_DISTANCE
     {
@@ -238,21 +243,22 @@ TabPage RID_SVXPAGE_TEXTATTR
         Text [ french ] = "�cart du cadre" ;
         Text [ dutch ] = "Afstand tot kader" ;
         Text [ swedish ] = "Avst�nd till ram" ;
-        Text [ danish ] = "Afstand fra rammen" ;
+        Text [ danish ] = "Afstand fra ramme" ;
         Text [ portuguese_brazilian ] = "Abstand vom Rahmen" ;
         Text [ portuguese ] = "Espa�o at� moldura" ;
-        Text[ chinese_simplified ] = "���߿�ľ���";
-        Text[ russian ] = "���������� �� �����";
+        Text[ chinese_simplified ] = "至边框的距离";
+        Text[ russian ] = "���������� �� �����";
         Text[ polish ] = "Odleg�o�� od ramki";
-        Text[ japanese ] = "�g����̊Ԋu";
-        Text[ chinese_traditional ] = "��ت����j";
+        Text[ japanese ] = "枠からの間隔";
+        Text[ chinese_traditional ] = "邊框的間隔";
         Text[ arabic ] = "������� ��� ������";
         Text[ greek ] = "�������� ��� �������";
-        Text[ korean ] = "�׵θ����� ����";
+        Text[ korean ] = "테두리와의 간격";
         Text[ turkish ] = "�er�eveye uzakl�k";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Distancia al marco";
-        Text[ finnish ] = "Spacing to borders";
+        Text[ catalan ] = "Dist�ncia al marc";
+        Text[ finnish ] = "V�li reunoihin";
+        Text[ thai ] = "ระยะห่างถึงเส้นขอบ";
     };
     FixedText FT_LEFT
     {
@@ -263,24 +269,25 @@ TabPage RID_SVXPAGE_TEXTATTR
         Text [ english_us ] = "~Left" ;
         Text [ italian ] = "A sinistra" ;
         Text [ spanish ] = "~Izquierda" ;
-        Text [ french ] = "~� gauche" ;
+        Text [ french ] = "� gauche" ;
         Text [ dutch ] = "~Links" ;
         Text [ swedish ] = "~V�nster" ;
         Text [ danish ] = "Venstre" ;
         Text [ portuguese_brazilian ] = "~Links" ;
         Text [ portuguese ] = "~Esquerda" ;
-        Text[ chinese_simplified ] = "��(~L)";
+        Text[ chinese_simplified ] = "左(~L)";
         Text[ russian ] = "�����";
         Text[ polish ] = "Z lewej";
-        Text[ japanese ] = "��(~L)";
-        Text[ chinese_traditional ] = "�V��(~L)";
+        Text[ japanese ] = "左(~L)";
+        Text[ chinese_traditional ] = "向左(~L)";
         Text[ arabic ] = "����";
         Text[ greek ] = "��������";
-        Text[ korean ] = "����(~L)";
+        Text[ korean ] = "왼쪽(~L)";
         Text[ turkish ] = "~Sol";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Izquierda";
+        Text[ catalan ] = "~Esquerra";
         Text[ finnish ] = "~Vasen";
+        Text[ thai ] = "~ซ้าย";
     };
     FixedText FT_RIGHT
     {
@@ -290,25 +297,26 @@ TabPage RID_SVXPAGE_TEXTATTR
         Text [ ENGLISH ] = "~Right" ;
         Text [ english_us ] = "~Right" ;
         Text [ italian ] = "A destra" ;
-        Text [ spanish ] = "~Derecha" ;
-        Text [ french ] = "~� droite" ;
+        Text [ spanish ] = "Derecha" ;
+        Text [ french ] = "� droite" ;
         Text [ dutch ] = "~Rechts" ;
-        Text [ swedish ] = "~H�ger" ;
+        Text [ swedish ] = "H�g~er" ;
         Text [ danish ] = "H�jre" ;
         Text [ portuguese_brazilian ] = "~Rechts" ;
         Text [ portuguese ] = "~Direita" ;
-        Text[ chinese_simplified ] = "��(~R)";
+        Text[ chinese_simplified ] = "右(~R)";
         Text[ russian ] = "������";
         Text[ polish ] = "Z prawej";
-        Text[ japanese ] = "�E(~R)";
-        Text[ chinese_traditional ] = "�V�k(~R)";
+        Text[ japanese ] = "右(~R)";
+        Text[ chinese_traditional ] = "向右(~R)";
         Text[ arabic ] = "����";
         Text[ greek ] = "�����";
-        Text[ korean ] = "������(~R)";
+        Text[ korean ] = "오른쪽(~R)";
         Text[ turkish ] = "Sa~�";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Derecha";
+        Text[ catalan ] = "~Dreta";
         Text[ finnish ] = "~Oikea";
+        Text[ thai ] = "~ขวา";
     };
     FixedText FT_TOP
     {
@@ -318,25 +326,26 @@ TabPage RID_SVXPAGE_TEXTATTR
         Text [ ENGLISH ] = "~Top" ;
         Text [ english_us ] = "~Top" ;
         Text [ italian ] = "In alto" ;
-        Text [ spanish ] = "Arri~ba" ;
-        Text [ french ] = "~En haut" ;
+        Text [ spanish ] = "Arriba" ;
+        Text [ french ] = "En haut" ;
         Text [ dutch ] = "~Boven" ;
         Text [ swedish ] = "~�verkant" ;
         Text [ danish ] = "Top" ;
         Text [ portuguese_brazilian ] = "~Oben" ;
         Text [ portuguese ] = "~Superior" ;
-        Text[ chinese_simplified ] = "��(~T)";
+        Text[ chinese_simplified ] = "上(~T)";
         Text[ russian ] = "������";
         Text[ polish ] = "W g�rze";
-        Text[ japanese ] = "��(~T)";
-        Text[ chinese_traditional ] = "�V�W(~T)";
+        Text[ japanese ] = "上(~T)";
+        Text[ chinese_traditional ] = "向上(~T)";
         Text[ arabic ] = "����";
         Text[ greek ] = "����";
-        Text[ korean ] = "��(~T)";
+        Text[ korean ] = "위(~T)";
         Text[ turkish ] = "~�st";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Arri~ba";
-        Text[ finnish ] = "~Yl�osa";
+        Text[ catalan ] = "Part ~superior";
+        Text[ finnish ] = "~Yl�reuna";
+        Text[ thai ] = "~บน";
     };
     FixedText FT_BOTTOM
     {
@@ -347,24 +356,25 @@ TabPage RID_SVXPAGE_TEXTATTR
         Text [ english_us ] = "~Bottom" ;
         Text [ italian ] = "In basso" ;
         Text [ spanish ] = "A~bajo" ;
-        Text [ french ] = "En ~bas" ;
+        Text [ french ] = "En bas" ;
         Text [ dutch ] = "~Onder" ;
         Text [ swedish ] = "~Underkant" ;
         Text [ danish ] = "Bund" ;
         Text [ portuguese_brazilian ] = "~Unten" ;
         Text [ portuguese ] = "~Inferior" ;
-        Text[ chinese_simplified ] = "��(~B)";
+        Text[ chinese_simplified ] = "下(~B)";
         Text[ russian ] = "�����";
         Text[ polish ] = "W dole";
-        Text[ japanese ] = "��(~B)";
-        Text[ chinese_traditional ] = "�V�U(~B)";
+        Text[ japanese ] = "下(~B)";
+        Text[ chinese_traditional ] = "向下(~B)";
         Text[ arabic ] = "����";
         Text[ greek ] = "����";
-        Text[ korean ] = "�Ʒ�(~B)";
+        Text[ korean ] = "아래(~B)";
         Text[ turkish ] = "~Alt";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "A~bajo";
-        Text[ finnish ] = "~Alaosa";
+        Text[ catalan ] = "Part ~inferior";
+        Text[ finnish ] = "~Alareuna";
+        Text[ thai ] = "~ล่าง";
     };
     MetricField MTR_FLD_LEFT
     {
@@ -451,18 +461,19 @@ TabPage RID_SVXPAGE_TEXTATTR
         Text [ danish ] = "Tekstforankring" ;
         Text [ portuguese_brazilian ] = "Textverankerung" ;
         Text [ portuguese ] = "�ncora do texto" ;
-        Text[ chinese_simplified ] = "��������";
-        Text[ russian ] = "�������� ������";
+        Text[ chinese_simplified ] = "文字锁定";
+        Text[ russian ] = "����� ������";
         Text[ polish ] = "Zakotwiczenie tekstu";
-        Text[ japanese ] = "÷�Ă̱ݶ�";
-        Text[ chinese_traditional ] = "��r��w";
+        Text[ japanese ] = "テキストのアンカー";
+        Text[ chinese_traditional ] = "文字鎖定";
         Text[ arabic ] = "����� ����";
         Text[ greek ] = "�������� ��������";
-        Text[ korean ] = "�ؽ�Ʈ ��ġ ����";
+        Text[ korean ] = "텍스트 기준 위치";
         Text[ turkish ] = "Metin sabitleme";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Anclaje del texto";
-        Text[ finnish ] = "Text anchor";
+        Text[ catalan ] = "Ancoratge del text";
+        Text[ finnish ] = "Tekstin ankkuri";
+        Text[ thai ] = "สมอของข้อความ";
     };
     Control CTL_POSITION
     {
@@ -482,40 +493,56 @@ TabPage RID_SVXPAGE_TEXTATTR
         Text [ dutch ] = "Volle~dige breedte" ;
         Text [ english_us ] = "Full ~width" ;
         Text [ italian ] = "A tutta larghezza" ;
-        Text [ spanish ] = "Todo el a~ncho" ;
+        Text [ spanish ] = "A~ncho total" ;
         Text [ french ] = "Sur toute la largeur" ;
         Text [ swedish ] = "Hel b~redd" ;
-        Text [ danish ] = "Hele bredden" ;
+        Text [ danish ] = "~Fuld bredde" ;
         Text [ portuguese ] = "~Largura toda" ;
         Text [ portuguese_brazilian ] = "Ganze ~Breite" ;
-        Text[ chinese_simplified ] = "��������(~W)";
+        Text[ chinese_simplified ] = "整个宽度(~W)";
         Text[ russian ] = "������ ������";
         Text[ polish ] = "Ca�a szeroko��";
-        Text[ japanese ] = "�S��(~W)";
-        Text[ chinese_traditional ] = "��Ӽe��(~W)";
+        Text[ japanese ] = "全幅(~W)";
+        Text[ chinese_traditional ] = "整個寬度(~W)";
         Text[ arabic ] = "����� ���";
         Text[ greek ] = "������ ~������";
-        Text[ korean ] = "��ü �ʺ�(~W)";
+        Text[ korean ] = "전체 너비(~W)";
         Text[ turkish ] = "Metni, ~nesne geni�li�ine g�re ayarla";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Todo el a~ncho";
+        Text[ catalan ] = "Toda l'a~mplada";
         Text[ finnish ] = "~T�ysi leveys";
+        Text[ thai ] = "เต็มความ~กว้าง";
     };
-    Text[ chinese_simplified ] = "����";
+    Text[ chinese_simplified ] = "文字";
     Text[ russian ] = "�����";
     Text[ polish ] = "Tekst";
-    Text[ japanese ] = "÷��";
-    Text[ chinese_traditional ] = "��r";
+    Text[ japanese ] = "テキスト";
+    Text[ chinese_traditional ] = "文字";
     Text[ arabic ] = "����";
     Text[ greek ] = "�������";
-    Text[ korean ] = "�ؽ�Ʈ";
+    Text[ korean ] = "텍스트";
     Text[ turkish ] = "Metin";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Texto";
+    Text[ catalan ] = "Text";
     Text[ finnish ] = "Teksti";
+    Text[ thai ] = "ข้อความ";
 };
  // ********************************************************************** EOF
 
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svx/source/dialog/thesdlg.cxx b/svx/source/dialog/thesdlg.cxx
index 747d3e134d23..05287489e15e 100644
--- a/svx/source/dialog/thesdlg.cxx
+++ b/svx/source/dialog/thesdlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: thesdlg.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: tl $ $Date: 2002-04-09 11:35:05 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -274,7 +274,7 @@ SvxThesaurusDialog::SvxThesaurusDialog( Window* pParent, Reference< XThesaurus >
 
     OUString aTmp( rWord );
     linguistic::RemoveHyphens( aTmp );
-    linguistic::RemoveControlChars( aTmp );
+    linguistic::ReplaceControlChars( aTmp );
     aReplaceEdit.SetText( aTmp );
     aWordLB.InsertEntry( aTmp );
     aWordLB.SelectEntry( aTmp );
diff --git a/svx/source/dialog/thesdlg.src b/svx/source/dialog/thesdlg.src
index b116f6f1eb53..499044c0d2f8 100644
--- a/svx/source/dialog/thesdlg.src
+++ b/svx/source/dialog/thesdlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: thesdlg.src,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: kz $ $Date: 2001-07-14 03:44:09 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -109,22 +109,23 @@ ModalDialog RID_SVXDLG_THESAURUS
         Text [ portuguese ] = "~Procurar" ;
         Text [ finnish ] = "~Etsi" ;
         Text [ danish ] = "Sl� op" ;
-        Text [ french ] = "~Rechercher" ;
+        Text [ french ] = "Rechercher" ;
         Text [ swedish ] = "~Sl� upp" ;
         Text [ dutch ] = "~Opzoeken" ;
         Text [ spanish ] = "~Buscar" ;
         Text [ english_us ] = "~Search" ;
-        Text[ chinese_simplified ] = "��Ѱ(~S)";
-        Text[ russian ] = "�����";
+        Text[ chinese_simplified ] = "查寻(~S)";
+        Text[ russian ] = "�����";
         Text[ polish ] = "Szukaj";
-        Text[ japanese ] = "����(~S)";
-        Text[ chinese_traditional ] = "�d�M(~S)";
+        Text[ japanese ] = "検索(~S)";
+        Text[ chinese_traditional ] = "查尋(~S)";
         Text[ arabic ] = "���";
         Text[ greek ] = "�~��������";
-        Text[ korean ] = "� ����(~S)";
+        Text[ korean ] = "찾아보기(~S)";
         Text[ turkish ] = "A~ra";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Buscar";
+        Text[ catalan ] = "~Cerca";
+        Text[ thai ] = "~ค้นหา";
     };
     PushButton BTN_LANGUAGE
     {
@@ -141,18 +142,19 @@ ModalDialog RID_SVXDLG_THESAURUS
         Text [ danish ] = "Sprog..." ;
         Text [ portuguese ] = "L�~ngua..." ;
         Text [ portuguese_brazilian ] = "S~prache..." ;
-        Text[ chinese_simplified ] = "����(~L)...";
+        Text[ chinese_simplified ] = "语言(~L)...";
         Text[ russian ] = "����...";
         Text[ polish ] = "J�zyk...";
-        Text[ japanese ] = "����(~L)...";
-        Text[ chinese_traditional ] = "�y��(~L)...";
+        Text[ japanese ] = "言語(~L)...";
+        Text[ chinese_traditional ] = "語言(~L)...";
         Text[ arabic ] = "�����...";
         Text[ greek ] = "������...";
-        Text[ korean ] = "���(~L)...";
+        Text[ korean ] = "언어(~L)...";
         Text[ turkish ] = "D~il...";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Idioma...";
-        Text[ finnish ] = "~Kieli";
+        Text[ finnish ] = "~Kieli...";
+        Text[ thai ] = "~ภาษา...";
     };
     HelpButton BTN_THES_HELP
     {
@@ -169,25 +171,26 @@ ModalDialog RID_SVXDLG_THESAURUS
         Text [ italian ] = "Parola" ;
         Text [ portuguese_brazilian ] = "~Palavra" ;
         Text [ portuguese ] = "~Palavra" ;
-        Text [ finnish ] = "~Sana" ;
+        Text [ finnish ] = "Sa~na" ;
         Text [ danish ] = "Ord" ;
-        Text [ french ] = "~Mot" ;
+        Text [ french ] = "Mot" ;
         Text [ swedish ] = "~Ord" ;
         Text [ dutch ] = "~Woord" ;
         Text [ spanish ] = "~Palabra" ;
         Text [ english_us ] = "~Word" ;
         LEFT = TRUE ;
-        Text[ chinese_simplified ] = "��(~W)";
+        Text[ chinese_simplified ] = "字(~W)";
         Text[ russian ] = "�����";
         Text[ polish ] = "S�owo";
-        Text[ japanese ] = "�P��(~W)";
-        Text[ chinese_traditional ] = "��(~W)";
+        Text[ japanese ] = "単語(~W)";
+        Text[ chinese_traditional ] = "詞(~W)";
         Text[ arabic ] = "������";
         Text[ greek ] = "����";
-        Text[ korean ] = "�ܾ�(~W)";
+        Text[ korean ] = "단어(~W)";
         Text[ turkish ] = "~S�zc�k";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Palabra";
+        Text[ catalan ] = "~Paraula";
+        Text[ thai ] = "~คำ";
     };
     ListBox LB_WORD
     {
@@ -209,21 +212,22 @@ ModalDialog RID_SVXDLG_THESAURUS
         Text [ danish ] = "Betydning " ;
         Text [ french ] = "~Signification " ;
         Text [ swedish ] = "~Betydelse  " ;
-        Text [ dutch ] = "~Betekenis  " ;
+        Text [ dutch ] = "~Betekenis" ;
         Text [ spanish ] = "~Significado  " ;
         Text [ english_us ] = "~Meaning " ;
         LEFT = TRUE ;
-        Text[ chinese_simplified ] = "���� (~M)";
+        Text[ chinese_simplified ] = "含义 (~M)";
         Text[ russian ] = "��������  ";
         Text[ polish ] = "Znaczenie ";
-        Text[ japanese ] = "��`(~M)";
-        Text[ chinese_traditional ] = "�t�q(~M)";
+        Text[ japanese ] = "語義(~M)";
+        Text[ chinese_traditional ] = "涵義(~M)";
         Text[ arabic ] = "������ ";
         Text[ greek ] = "�~����� ";
-        Text[ korean ] = "�ǹ� (~M)";
+        Text[ korean ] = "의미 (~M)";
         Text[ turkish ] = "~Anlam� ";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Significado  ";
+        Text[ catalan ] = "~Significat";
+        Text[ thai ] = "~ความหมาย ";
     };
     ListBox LB_MEAN
     {
@@ -250,17 +254,18 @@ ModalDialog RID_SVXDLG_THESAURUS
         Text [ spanish ] = "Si~n�nimo" ;
         Text [ english_us ] = "Sy~nonym" ;
         LEFT = TRUE ;
-        Text[ chinese_simplified ] = "ͬ���(~N)";
+        Text[ chinese_simplified ] = "同义词(~N)";
         Text[ russian ] = "�������";
         Text[ polish ] = "Synonim";
-        Text[ japanese ] = "�ދ`��(~N)";
-        Text[ chinese_traditional ] = "�P�q��(~N)";
+        Text[ japanese ] = "類義語(~N)";
+        Text[ chinese_traditional ] = "同義詞(~N)";
         Text[ arabic ] = "�������";
         Text[ greek ] = "~��������";
-        Text[ korean ] = "���Ǿ�(~N)";
+        Text[ korean ] = "동의어(~N)";
         Text[ turkish ] = "~E�anlaml�";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Si~n�nimo";
+        Text[ catalan ] = "Si~n�nim";
+        Text[ thai ] = "คำเ~หมือน";
     };
     ListBox LB_SYNON
     {
@@ -281,23 +286,24 @@ ModalDialog RID_SVXDLG_THESAURUS
         Text [ portuguese ] = "S~ubstituir" ;
         Text [ finnish ] = "~Korvaa" ;
         Text [ danish ] = "Erstat" ;
-        Text [ french ] = "R~emplacer par" ;
+        Text [ french ] = "Remplacer par" ;
         Text [ swedish ] = "~Ers�tt" ;
         Text [ dutch ] = "~Vervangen" ;
         Text [ spanish ] = "~Reemplazar" ;
         Text [ english_us ] = "~Replace" ;
         LEFT = TRUE ;
-        Text[ chinese_simplified ] = "����(~R)";
+        Text[ chinese_simplified ] = "替换(~R)";
         Text[ russian ] = "��������";
         Text[ polish ] = "Zamie�";
-        Text[ japanese ] = "�u��(~R)";
-        Text[ chinese_traditional ] = "���N(~R)";
+        Text[ japanese ] = "置換(~R)";
+        Text[ chinese_traditional ] = "替代(~R)";
         Text[ arabic ] = "�������";
         Text[ greek ] = "�������������";
-        Text[ korean ] = "��ü(~R)";
+        Text[ korean ] = "바꾸기(~R)";
         Text[ turkish ] = "~De�i�tir";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Reemplazar";
+        Text[ catalan ] = "~Reempla�a";
+        Text[ thai ] = "แ~ทนที่";
     };
     Edit ED_REPL
     {
@@ -316,24 +322,25 @@ ModalDialog RID_SVXDLG_THESAURUS
         Text [ italian ] = "Variazioni" ;
         Text [ portuguese_brazilian ] = "Varia??es" ;
         Text [ portuguese ] = "Alternativas" ;
-        Text [ finnish ] = "Muunnelmat" ;
+        Text [ finnish ] = "Muunnokset" ;
         Text [ danish ] = "Variationer" ;
         Text [ french ] = "Suggestions" ;
         Text [ swedish ] = "Variationer" ;
         Text [ dutch ] = "Variaties" ;
         Text [ spanish ] = "Variaciones" ;
         Text [ english_us ] = "Variations" ;
-        Text[ chinese_simplified ] = "��ѡ�ִ�";
+        Text[ chinese_simplified ] = "另选字词";
         Text[ russian ] = "��������";
         Text[ polish ] = "Odmiany";
-        Text[ japanese ] = "��ش����";
-        Text[ chinese_traditional ] = "�t��r��";
+        Text[ japanese ] = "バリエーション";
+        Text[ chinese_traditional ] = "另選字詞";
         Text[ arabic ] = "�������";
         Text[ greek ] = "����������";
-        Text[ korean ] = "����";
+        Text[ korean ] = "변형";
         Text[ turkish ] = "Varyasyonlar";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Variaciones";
+        Text[ catalan ] = "Variacions";
+        Text[ thai ] = "การแปรผัน";
     };
     String STR_ERR_WORDNOTFOUND
     {
@@ -348,31 +355,33 @@ ModalDialog RID_SVXDLG_THESAURUS
         Text [ french ] = "Mot ne figurant pas dans le dictionnaire des synonymes" ;
         Text [ swedish ] = "Ordet finns inte i synonymordlistan" ;
         Text [ dutch ] = "Woord niet gevonden in de Thesaurus" ;
-        Text [ spanish ] = "Palabra no figura en el dic. de sin�nimos" ;
+        Text [ spanish ] = "La palabra no figura en el diccionario de sin�nimos." ;
         Text [ english_us ] = "Word not found in thesaurus" ;
-        Text[ chinese_simplified ] = "�ִ�û����¼�ڴʵ���";
-        Text[ russian ] = "����� �� ���������� � ���������";
+        Text[ chinese_simplified ] = "字词没有收录在同义词词典内";
+        Text[ russian ] = "����� �� ������� � ���������";
         Text[ polish ] = "S�owa nie ma w Tezaurusie";
-        Text[ japanese ] = "�ދ`�ꎫ�T�ɂȂ��P��ł�";
-        Text[ chinese_traditional ] = "�r���S�������b���夺";
+        Text[ japanese ] = "類義語辞典にない単語です";
+        Text[ chinese_traditional ] = "字詞沒有收錄在同義詞詞典內";
         Text[ arabic ] = "������ ��� ������ �� ����� ���������";
         Text[ greek ] = "� ���� ��� ������� ���� ������� ������";
-        Text[ korean ] = "���Ǿ� ������ ���� �ܾ���";
+        Text[ korean ] = "동의어 사전에 없는 단어임";
         Text[ turkish ] = "S�zc�k, s�zl�kte bulunamad�";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Palabra no figura en el dic. de sin�nimos";
+        Text[ catalan ] = "No s'ha trobat la paraula en el tesaurus";
+        Text[ thai ] = "ไม่พบคำในอรรถาภิธาน";
     };
-    Text[ chinese_simplified ] = "�ʵ�";
+    Text[ chinese_simplified ] = "同义词词典";
     Text[ russian ] = "��������";
     Text[ polish ] = "Tezaurus";
-    Text[ japanese ] = "�ދ`�ꎫ�T";
-    Text[ chinese_traditional ] = "����";
+    Text[ japanese ] = "類義語辞典";
+    Text[ chinese_traditional ] = "同義詞詞典";
     Text[ arabic ] = "����� ���������";
     Text[ greek ] = "�������� ������";
-    Text[ korean ] = "���Ǿ� ����";
+    Text[ korean ] = "동의어 사전";
     Text[ turkish ] = "E�anlaml�lar s�zl���";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Diccionario de sin�nimos";
+    Text[ catalan ] = "Tesaurus";
+    Text[ thai ] = "อรรถาภิธาน";
 };
  // RID_SVXDLG_THES_LANGUAGE ----------------------------------------------
 ModalDialog RID_SVXDLG_THES_LANGUAGE
@@ -417,18 +426,19 @@ ModalDialog RID_SVXDLG_THES_LANGUAGE
         Text [ danish ] = "Udvalg" ;
         Text [ portuguese_brazilian ] = "Auswahl" ;
         Text [ portuguese ] = "Selec��o" ;
-        Text[ chinese_simplified ] = "ѡ��";
+        Text[ chinese_simplified ] = "选择";
         Text[ russian ] = "�����";
         Text[ polish ] = "Wyb�r";
-        Text[ japanese ] = "�I��";
-        Text[ chinese_traditional ] = "���";
+        Text[ japanese ] = "選択";
+        Text[ chinese_traditional ] = "選取";
         Text[ arabic ] = "��������";
         Text[ greek ] = "�������";
-        Text[ korean ] = "����";
+        Text[ korean ] = "선택";
         Text[ turkish ] = "Se�im";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Selecci�n";
+        Text[ catalan ] = "Selecci�";
         Text[ finnish ] = "Valinta";
+        Text[ thai ] = "เลือก";
     };
     OKButton BTN_LANG_OK
     {
@@ -446,20 +456,32 @@ ModalDialog RID_SVXDLG_THES_LANGUAGE
         Pos = MAP_APPFONT ( 114 , 43 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
     };
-    Text[ chinese_simplified ] = "ѡ������";
-    Text[ russian ] = "����� �����";
+    Text[ chinese_simplified ] = "选择语言";
+    Text[ russian ] = "������� ����";
     Text[ polish ] = "Wybierz j�zyk";
-    Text[ japanese ] = "����̑I��";
-    Text[ chinese_traditional ] = "��ܻy��";
+    Text[ japanese ] = "言語の選択";
+    Text[ chinese_traditional ] = "選擇語言";
     Text[ arabic ] = "������ �����";
     Text[ greek ] = "������� �������";
-    Text[ korean ] = "��� ����";
+    Text[ korean ] = "언어 선택";
     Text[ turkish ] = "Dil se�imi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Seleccionar idioma";
+    Text[ catalan ] = "Seleccioneu l'idioma";
     Text[ finnish ] = "Valitse kieli";
+    Text[ thai ] = "เลือกภาษา";
 };
  // ********************************************************************** EOF
 
 
 
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svx/source/dialog/tpcolor.cxx b/svx/source/dialog/tpcolor.cxx
index f041cbcd4d8e..92b011441a60 100644
--- a/svx/source/dialog/tpcolor.cxx
+++ b/svx/source/dialog/tpcolor.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tpcolor.cxx,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: fs $ $Date: 2002-11-14 10:07:03 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1071,17 +1071,20 @@ IMPL_LINK( SvxColorTabPage, SelectColorModelHdl_Impl, void *, EMPTYARG )
 
                 // RGB-Werte im Bereich 0..255 verarbeiten (nicht in %),
                 // dazu MetricField's entsprechend einstellen
-                aMtrFldColorModel1.SetUnit (FUNIT_NONE);
-                aMtrFldColorModel1.SetMin (0);
-                aMtrFldColorModel1.SetMax (255);
-
-                aMtrFldColorModel2.SetUnit (FUNIT_NONE);
-                aMtrFldColorModel2.SetMin (0);
-                aMtrFldColorModel2.SetMax (255);
-
-                aMtrFldColorModel3.SetUnit (FUNIT_NONE);
-                aMtrFldColorModel3.SetMin (0);
-                aMtrFldColorModel3.SetMax (255);
+                aMtrFldColorModel1.SetUnit(FUNIT_NONE);
+                aMtrFldColorModel1.SetMin(0);
+                aMtrFldColorModel1.SetMax(255);
+                aMtrFldColorModel1.SetLast(255);
+
+                aMtrFldColorModel2.SetUnit(FUNIT_NONE);
+                aMtrFldColorModel2.SetMin(0);
+                aMtrFldColorModel2.SetMax(255);
+                aMtrFldColorModel2.SetLast(255);
+
+                aMtrFldColorModel3.SetUnit(FUNIT_NONE);
+                aMtrFldColorModel3.SetMin(0);
+                aMtrFldColorModel3.SetMax(255);
+                aMtrFldColorModel3.SetLast(255);
             }
             break;
 
@@ -1115,20 +1118,23 @@ IMPL_LINK( SvxColorTabPage, SelectColorModelHdl_Impl, void *, EMPTYARG )
                 // dazu MetricField's entsprechend einstellen
                 String aStrUnit( RTL_CONSTASCII_USTRINGPARAM( " %" ) );
 
-                aMtrFldColorModel1.SetUnit (FUNIT_CUSTOM);
-                aMtrFldColorModel1.SetCustomUnitText ( aStrUnit );
-                aMtrFldColorModel1.SetMin (0);
-                aMtrFldColorModel1.SetMax (100);
-
-                aMtrFldColorModel2.SetUnit (FUNIT_CUSTOM);
-                aMtrFldColorModel2.SetCustomUnitText ( aStrUnit );
-                aMtrFldColorModel2.SetMin (0);
-                aMtrFldColorModel2.SetMax (100);
-
-                aMtrFldColorModel3.SetUnit (FUNIT_CUSTOM);
-                aMtrFldColorModel3.SetCustomUnitText ( aStrUnit );
-                aMtrFldColorModel3.SetMin (0);
-                aMtrFldColorModel3.SetMax (100);
+                aMtrFldColorModel1.SetUnit(FUNIT_CUSTOM);
+                aMtrFldColorModel1.SetCustomUnitText( aStrUnit );
+                aMtrFldColorModel1.SetMin(0);
+                aMtrFldColorModel1.SetMax(100);
+                aMtrFldColorModel1.SetLast(100);
+
+                aMtrFldColorModel2.SetUnit(FUNIT_CUSTOM);
+                aMtrFldColorModel2.SetCustomUnitText( aStrUnit );
+                aMtrFldColorModel2.SetMin(0);
+                aMtrFldColorModel2.SetMax(100);
+                aMtrFldColorModel2.SetLast(100);
+
+                aMtrFldColorModel3.SetUnit(FUNIT_CUSTOM);
+                aMtrFldColorModel3.SetCustomUnitText( aStrUnit );
+                aMtrFldColorModel3.SetMin(0);
+                aMtrFldColorModel3.SetMax(100);
+                aMtrFldColorModel3.SetLast(100);
             }
             break;
         }
diff --git a/svx/source/dialog/tpline.cxx b/svx/source/dialog/tpline.cxx
index 9c2b65501054..1e69b420672d 100644
--- a/svx/source/dialog/tpline.cxx
+++ b/svx/source/dialog/tpline.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tpline.cxx,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: gt $ $Date: 2002-07-23 07:24:35 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1658,8 +1658,22 @@ IMPL_STATIC_LINK(SvxLineTabPage, GraphicArrivedHdl_Impl, SvxBrushItem*, pItem)
     }
     if( pBmpInfo )
     {
-        Image aImage( pItem->GetGraphic()->GetBitmap() );
-        pPopup->SetItemImage( pBmpInfo->nItemId, aImage );
+        if( pItem->GetGraphic() )
+        {
+            Bitmap aBitmap(pItem->GetGraphic()->GetBitmap());
+            Size aSize(aBitmap.GetSizePixel());
+            if(aSize.Width()  > MAX_BMP_WIDTH ||
+               aSize.Height() > MAX_BMP_HEIGHT)
+            {
+                BOOL bWidth = aSize.Width() > aSize.Height();
+                double nScale = bWidth ?
+                    (double)MAX_BMP_WIDTH / (double)aSize.Width():
+                    (double)MAX_BMP_HEIGHT / (double)aSize.Height();
+                aBitmap.Scale(nScale, nScale);
+            }
+            Image aImage(aBitmap);
+            pPopup->SetItemImage( pBmpInfo->nItemId, aImage );
+        }
     }
 
     return 0;
diff --git a/svx/source/dialog/transfrm.cxx b/svx/source/dialog/transfrm.cxx
index c7df7b692b1a..efca5896f3ae 100644
--- a/svx/source/dialog/transfrm.cxx
+++ b/svx/source/dialog/transfrm.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: transfrm.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: aw $ $Date: 2002-10-21 16:57:06 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -794,6 +794,7 @@ SvxPositionSizeTabPage::SvxPositionSizeTabPage( Window* pParent, const SfxItemSe
     maTsbAutoGrowHeight             ( this, ResId( TSB_AUTOGROW_HEIGHT ) ),
 
     maFlDivider                     (this, ResId( FL_DIVIDER ) ),
+    mnProtectSizeState( STATE_NOCHECK ),
     mbProtectDisabled( false ),
     mbSizeDisabled( false ),
 
@@ -809,8 +810,6 @@ SvxPositionSizeTabPage::SvxPositionSizeTabPage( Window* pParent, const SfxItemSe
     DBG_ASSERT( pPool, "Wo ist der Pool" );
     mePoolUnit = pPool->GetMetric( SID_ATTR_TRANSFORM_POS_X );
 
-    // Wird nicht mehr gebraucht:
-    // aTsbProtect.SetClickHdl( LINK( this, SvxPositionSizeTabPage, ClickProtectHdl ) );
     maDdLbAnchor.SetSelectHdl( LINK( this, SvxPositionSizeTabPage, SetAnchorHdl ) );
     maDdLbOrient.SetSelectHdl( LINK( this, SvxPositionSizeTabPage, SetOrientHdl ) );
 
@@ -825,7 +824,9 @@ SvxPositionSizeTabPage::SvxPositionSizeTabPage( Window* pParent, const SfxItemSe
     maTsbAutoGrowHeight.Disable();
     maFlAdjust.Disable();
 
+    // #i2379# disable controls when protected
     maTsbPosProtect.SetClickHdl( LINK( this, SvxPositionSizeTabPage, ChangePosProtectHdl ) );
+    maTsbSizeProtect.SetClickHdl( LINK( this, SvxPositionSizeTabPage, ChangeSizeProtectHdl ) );
 
 }
 
@@ -1122,7 +1123,9 @@ void SvxPositionSizeTabPage::Reset( const SfxItemSet& rOutAttrs )
 
         maTsbPosProtect.SaveValue();
         maCtlPos.Reset();
-        ClickPosProtectHdl( this );
+
+        // #i2379# Disable controls for protected objects
+        ChangePosProtectHdl( this );
 
         if(maAnchorBox.IsVisible()) //nur fuer den Writer
         {
@@ -1228,6 +1231,9 @@ void SvxPositionSizeTabPage::Reset( const SfxItemSet& rOutAttrs )
     maTsbAutoGrowWidth.SaveValue();
     maTsbAutoGrowHeight.SaveValue();
     ClickSizeProtectHdl( NULL );
+
+    // #i2379# Disable controls for protected objects
+    ChangeSizeProtectHdl( this );
 }
 
 // -----------------------------------------------------------------------
@@ -1269,14 +1275,22 @@ int SvxPositionSizeTabPage::DeactivatePage( SfxItemSet* pSet )
         INT32 lX = maMtrPosX.GetValue();
         INT32 lY = maMtrPosY.GetValue();
 
-        // #101581# GetTopLeftPosition(...) needs coordinates
-        // after UI scaling, in real PagePositions. Thus I added
-        // that calculation here
-        Fraction aUIScale = mpView->GetModel()->GetUIScale();
-        lX += maAnchorPos.X();
-        lX = Fraction( lX ) * aUIScale;
-        lY += maAnchorPos.Y();
-        lY = Fraction( lY ) * aUIScale;
+        // #106330#
+        // The below BugFix assumed that GetTopLeftPosition()
+        // needs special coordinate systems. This is not true,
+        // GetTopLeftPosition() just needs all parameters in one
+        // coor system. Thus, this part below is not necessary and
+        // leads to this new bug. Thus, i remove it again.
+        // I checked that #106330# works and #101581# is fixed, too.
+        //
+        // // #101581# GetTopLeftPosition(...) needs coordinates
+        // // after UI scaling, in real PagePositions. Thus I added
+        // // that calculation here
+        // Fraction aUIScale = mpView->GetModel()->GetUIScale();
+        // lX += maAnchorPos.X();
+        // lX = Fraction( lX ) * aUIScale;
+        // lY += maAnchorPos.Y();
+        // lY = Fraction( lY ) * aUIScale;
 
         GetTopLeftPosition( lX, lY, maRect );
 
@@ -1291,13 +1305,93 @@ int SvxPositionSizeTabPage::DeactivatePage( SfxItemSet* pSet )
 
 //------------------------------------------------------------------------
 
-IMPL_LINK_INLINE_START( SvxPositionSizeTabPage, ChangePosProtectHdl, void *, EMPTYARG )
+IMPL_LINK( SvxPositionSizeTabPage, ChangePosProtectHdl, void *, p )
 {
     maTsbSizeProtect.Enable( !mbProtectDisabled & (maTsbPosProtect.GetState() != STATE_CHECK) );
-    maTsbSizeProtect.SetState( maTsbPosProtect.GetState() );
+
+    // #106572# Remember user's last choice
+    maTsbSizeProtect.SetState( maTsbPosProtect.GetState() == STATE_CHECK ?
+                               STATE_CHECK : mnProtectSizeState );
+
+    DisableSizeControls();
+
+    if( maTsbPosProtect.GetState() == STATE_CHECK )
+    {
+        maFlPosition.Disable();
+        maFtPosX.Disable();
+        maMtrPosX.Disable();
+        maFtPosY.Disable();
+        maMtrPosY.Disable();
+        maFtPosReference.Disable();
+        maCtlPos.Disable();
+        maCtlPos.Invalidate();
+    }
+    else
+    {
+        maFlPosition.Enable();
+        maFtPosX.Enable();
+        maMtrPosX.Enable();
+        maFtPosY.Enable();
+        maMtrPosY.Enable();
+        maFtPosReference.Enable();
+        maCtlPos.Enable();
+        maCtlPos.Invalidate();
+    }
+
+    return( 0L );
+}
+
+//------------------------------------------------------------------------
+
+void SvxPositionSizeTabPage::DisableSizeControls()
+{
+    if( maTsbSizeProtect.GetState() == STATE_CHECK )
+    {
+        maFlSize.Disable();
+        maFtWidth.Disable();
+        maMtrWidth.Disable();
+        maFtHeight.Disable();
+        maMtrHeight.Disable();
+        maCbxScale.Disable();
+        maFtSizeReference.Disable();
+        maCtlSize.Disable();
+        maCtlSize.Invalidate();
+    }
+    else
+    {
+        maFlSize.Enable();
+        maFtWidth.Enable();
+        maMtrWidth.Enable();
+        maFtHeight.Enable();
+        maMtrHeight.Enable();
+        maCbxScale.Enable();
+        maFtSizeReference.Enable();
+        maCtlSize.Enable();
+        maCtlSize.Invalidate();
+    }
+}
+
+//------------------------------------------------------------------------
+
+IMPL_LINK( SvxPositionSizeTabPage, ChangeSizeProtectHdl, void *, p )
+{
+    if( maTsbSizeProtect.IsEnabled() )
+    {
+        // #106572# Remember user's last choice
+
+        // Note: this works only as long as the dialog is open.  When
+        // the user closes the dialog, there is no way to remember
+        // whether size was enabled or disabled befor pos protect was
+        // clicked. Thus, if pos protect is selected, the dialog is
+        // closed and reopened again, unchecking pos protect will
+        // always uncheck size protect, too. That's life.
+        mnProtectSizeState = maTsbSizeProtect.GetState();
+    }
+
+    DisableSizeControls();
+
     return( 0L );
 }
-IMPL_LINK_INLINE_END( SvxPositionSizeTabPage, ChangePosProtectHdl, void *, EMPTYARG )
 
 //------------------------------------------------------------------------
 
@@ -1514,13 +1608,6 @@ void SvxPositionSizeTabPage::GetTopLeftPosition( INT32& rX, INT32& rY,
 
 //------------------------------------------------------------------------
 
-IMPL_LINK( SvxPositionSizeTabPage, ClickPosProtectHdl, void *, p )
-{
-    return( 0L );
-}
-
-//------------------------------------------------------------------------
-
 void SvxPositionSizeTabPage::PointChanged( Window* pWindow, RECT_POINT eRP )
 {
     if( pWindow == &maCtlPos )
diff --git a/svx/source/dialog/transfrm.src b/svx/source/dialog/transfrm.src
index 9b42d3ccf9e9..d04baa1b25b9 100644
--- a/svx/source/dialog/transfrm.src
+++ b/svx/source/dialog/transfrm.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: transfrm.src,v $
  *
- *  $Revision: 1.43 $
+ *  $Revision: 1.44 $
  *
- *  last change: $Author: nf $ $Date: 2002-06-13 13:58:32 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -104,7 +104,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
         Text[ korean ] = "위치";
         Text[ turkish ] = "Konum";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Posici�n";
+        Text[ catalan ] = "Mostra";
         Text[ thai ] = "ตำแหน่ง";
     };
     FixedText FT_POS_X
@@ -135,7 +135,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
         Text[ turkish ] = "~X konumu";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Posici�n ~X";
-        Text[ thai ] = "มห฿??บ ~X";
+        Text[ thai ] = "ตำแหน่ง ~X";
     };
     FixedText FT_POS_Y
     {
@@ -165,7 +165,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
         Text[ turkish ] = "~Y konumu";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Posici�n ~Y";
-        Text[ thai ] = "มห฿??บ ~Y";
+        Text[ thai ] = "ตำแหน่ง ~Y";
     };
     MetricField MTR_FLD_POS_X
     {
@@ -209,7 +209,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
         Text[ greek ] = "Base point";
         Text[ dutch ] = "Basispunt";
         Text[ french ] = "Point de base";
-        Text[ spanish ] = "Punto base";
+        Text[ spanish ] = "Punto de base";
         Text[ finnish ] = "Peruspiste";
         Text[ italian ] = "Punto base";
         Text[ danish ] = "Base point";
@@ -223,7 +223,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
         Text[ turkish ] = "Base point";
         Text[ arabic ] = "Base point";
         Text[ catalan ] = "Base point";
-        Text[ thai ] = "Base point";
+        Text[ thai ] = "จุดฐาน";
     };
     Control CTL_POSRECT
     {
@@ -288,8 +288,8 @@ TabPage RID_SVXPAGE_POSITION_SIZE
         Text[ korean ] = "크기";
         Text[ turkish ] = "Boyut";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Tama�o";
-        Text[ thai ] = "Size";
+        Text[ catalan ] = "Mida";
+        Text[ thai ] = "ขนาด";
     };
     FixedText FT_WIDTH
     {
@@ -318,8 +318,8 @@ TabPage RID_SVXPAGE_POSITION_SIZE
         Text[ korean ] = "너비(~D)";
         Text[ turkish ] = "~Geni�lik";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "A~ncho";
-        Text[ thai ] = "Wi~dth";
+        Text[ catalan ] = "~Amplada";
+        Text[ thai ] = "ความ~กว้าง";
     };
     FixedText FT_HEIGHT
     {
@@ -349,7 +349,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
         Text[ turkish ] = "Y~�kseklik";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "A~ltura";
-        Text[ thai ] = "H~eight";
+        Text[ thai ] = "ความ~สูง";
     };
     MetricField MTR_FLD_WIDTH
     {
@@ -393,7 +393,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
         Text[ greek ] = "Base point";
         Text[ dutch ] = "Basispunt";
         Text[ french ] = "Point de base";
-        Text[ spanish ] = "Punto base";
+        Text[ spanish ] = "Punto de base";
         Text[ finnish ] = "Peruspiste";
         Text[ italian ] = "Punto base";
         Text[ danish ] = "Base point";
@@ -407,7 +407,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
         Text[ turkish ] = "Base point";
         Text[ arabic ] = "Base point";
         Text[ catalan ] = "Base point";
-        Text[ thai ] = "Base point";
+        Text[ thai ] = "จุดฐาน";
     };
     Control CTL_SIZERECT
     {
@@ -451,7 +451,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
         TabStop = TRUE ;
         Text [ english_us ] = "~Keep ratio" ;
         Text [ italian ] = "Adatta" ;
-        Text [ spanish ] = "~Igualar" ;
+        Text [ spanish ] = "~Proporcional" ;
         Text [ french ] = "Proportionnel" ;
         Text [ dutch ] = "~Synchroniseren" ;
         Text [ swedish ] = "Anpassa proportionellt" ;
@@ -465,12 +465,12 @@ TabPage RID_SVXPAGE_POSITION_SIZE
         Text[ chinese_traditional ] = "調整(~K)";
         Text[ arabic ] = "�����";
         Text[ greek ] = "~���������";
-        Text[ korean ] = "비율 유지(~K)";
+        Text[ korean ] = "비율을 균등하게 조정(~K)";
         Text[ turkish ] = "~E�itle";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Igualar";
+        Text[ catalan ] = "~Iguala";
         Text[ finnish ] = "~S�ilyt� suhde";
-        Text[ thai ] = "~Keep ratio";
+        Text[ thai ] = "~?ะํ?ส?ะม?ส?ร?";
     };
 
     // Protect
@@ -500,8 +500,8 @@ TabPage RID_SVXPAGE_POSITION_SIZE
         Text[ chinese_traditional ] = "保護";
         Text[ turkish ] = "Protect";
         Text[ arabic ] = "Protect";
-        Text[ catalan ] = "Protect";
-        Text[ thai ] = "Protect";
+        Text[ catalan ] = "Protegeix";
+        Text[ thai ] = "ป้องกัน";
     };
 
     TriStateBox TSB_POSPROTECT
@@ -531,7 +531,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
         Text[ turkish ] = "Pozisyon";
         Text[ arabic ] = "������ �������";
         Text[ catalan ] = "~Position";
-        Text[ thai ] = "Position";
+        Text[ thai ] = "~ตำแหน่ง";
     };
 
     TriStateBox TSB_SIZEPROTECT
@@ -560,8 +560,8 @@ TabPage RID_SVXPAGE_POSITION_SIZE
         Text[ chinese_traditional ] = "大小(~S)";
         Text[ turkish ] = "~Size";
         Text[ arabic ] = "~Size";
-        Text[ catalan ] = "~Size";
-        Text[ thai ] = "~Size";
+        Text[ catalan ] = "~Mida";
+        Text[ thai ] = "~ขนาด";
     };
 
     // Adjust
@@ -585,15 +585,15 @@ TabPage RID_SVXPAGE_POSITION_SIZE
         Text[ polish ] = "Konfiguracja";
         Text[ portuguese_brazilian ] = "Adjust";
         Text[ japanese ] = "適合";
-        Text[ korean ] = "맞추기";
+        Text[ korean ] = "조정";
         Text[ chinese_simplified ] = "调整";
         Text[ chinese_traditional ] = "調整";
         Text[ arabic ] = "���";
         Text[ turkish ] = "Ayarla";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Ajustar";
+        Text[ catalan ] = "Configura";
         Text[ finnish ] = "Sovita";
-        Text[ thai ] = "Adapt";
+        Text[ thai ] = "ดัดแปลงแก้ไข";
     };
     TriStateBox TSB_AUTOGROW_WIDTH
     {
@@ -618,12 +618,12 @@ TabPage RID_SVXPAGE_POSITION_SIZE
         Text[ chinese_traditional ] = "和內文寬度對齊(~F)";
         Text[ arabic ] = "������ ����� ����";
         Text[ greek ] = "���������� ������� �� ���� �������";
-        Text[ korean ] = "텍스트에 너비 맞추기(~F)";
+        Text[ korean ] = "텍스트에 너비 맞춤(~F)";
         Text[ turkish ] = "Geni�li�i, metne g�re a~yarla";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Ajustar ~ancho al texto";
+        Text[ catalan ] = "~Adapta l'amplada al text";
         Text[ finnish ] = "~Sovita leveys tekstiin";
-        Text[ thai ] = "~Fit width to text";
+        Text[ thai ] = "~จัดความกว้างพอดีข้อความ";
     };
     TriStateBox TSB_AUTOGROW_HEIGHT
     {
@@ -648,12 +648,12 @@ TabPage RID_SVXPAGE_POSITION_SIZE
         Text[ chinese_traditional ] = "和內文高度對齊(~H)";
         Text[ arabic ] = "������ �������� ����";
         Text[ greek ] = "���������� ����� �� ���� �������";
-        Text[ korean ] = "텍스트에 높이 맞추기(~H)";
+        Text[ korean ] = "텍스트에 높이 맞춤(~H)";
         Text[ turkish ] = "Y�ksekli�i, metne g�re a~yarla";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Ajustar altura al texto";
         Text[ finnish ] = "~Sovita korkeus tekstiin";
-        Text[ thai ] = "Fit ~height to text";
+        Text[ thai ] = "จัดความ~สูงพอดีข้อความ";
     };
 
     FixedLine FL_DIVIDER
@@ -675,7 +675,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
         Text [ dutch ] = "Verankering" ;
         Text [ english_us ] = "Anchor" ;
         Text [ italian ] = "Ancoraggio" ;
-        Text [ spanish ] = "Anclaje" ;
+        Text [ spanish ] = "Ancla" ;
         Text [ french ] = "Ancrage" ;
         Text [ swedish ] = "F�rankring" ;
         Text [ danish ] = "Forankring" ;
@@ -688,12 +688,12 @@ TabPage RID_SVXPAGE_POSITION_SIZE
         Text[ chinese_traditional ] = "鎖定";
         Text[ arabic ] = "�����";
         Text[ greek ] = "��������";
-        Text[ korean ] = "앵커";
+        Text[ korean ] = "기준 위치";
         Text[ turkish ] = "Sabitleme";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Anclaje";
         Text[ finnish ] = "Ankkuri";
-        Text[ thai ] = "Anchor";
+        Text[ thai ] = "???";
     };
     FixedText FT_ANCHOR
     {
@@ -715,15 +715,15 @@ TabPage RID_SVXPAGE_POSITION_SIZE
         Text[ russian ] = "��������";
         Text[ polish ] = "Kotwica";
         Text[ japanese ] = "アンカー記号(~A)";
-        Text[ chinese_traditional ] = "縮定(~A)";
+        Text[ chinese_traditional ] = "鎖定(~A)";
         Text[ arabic ] = "�����";
         Text[ greek ] = "��������";
-        Text[ korean ] = "앵커(~A)";
+        Text[ korean ] = "기준 위치(~A)";
         Text[ turkish ] = "~Sabitleyici";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Ancla";
         Text[ finnish ] = "~Ankkuri";
-        Text[ thai ] = "~Anchor";
+        Text[ thai ] = "~???";
     };
     ListBox LB_ANCHOR
     {
@@ -754,10 +754,10 @@ TabPage RID_SVXPAGE_POSITION_SIZE
         };
         stringlist [ english_us ] =
         {
-            < "To Paragraph" ; > ;
+            < "To paragraph" ; > ;
             < "As character" ; > ;
             < "To page" ; > ;
-            < "To Frame" ; > ;
+            < "To frame" ; > ;
         };
         stringlist [ portuguese_brazilian ] =
         {
@@ -880,10 +880,10 @@ TabPage RID_SVXPAGE_POSITION_SIZE
     };
     StringList [ catalan ] =
     {
-            < "Al p�rrafo" ; > ;
-        < "Como car�cter" ; > ;
+            < "Al par??graf" ; > ;
+        < "Com a car??cter" ; > ;
         < "A la p�gina" ; > ;
-        < "Al marco" ; > ;
+        < "Al marc" ; > ;
     };
     StringList [ finnish ] =
     {
@@ -894,10 +894,10 @@ TabPage RID_SVXPAGE_POSITION_SIZE
     };
     StringList [ thai ] =
     {
-         < "To Paragraph" ; > ;
-        < "As character" ; > ;
-        < "To page" ; > ;
-        < "To Frame" ; > ;
+         < "ไปที่ย่อหน้า" ; > ;
+        < "ำ??มะร?ะํ๓?๐" ; > ;
+        < "ไปที่หน้า" ; > ;
+        < "ไปที่กรอบ" ; > ;
     };
     };
     FixedText FT_ORIENT
@@ -927,7 +927,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
         Text[ turkish ] = "O~rtala";
         Text[ arabic ] = "������";
         Text[ catalan ] = "~Position";
-        Text[ thai ] = "P~osition";
+        Text[ thai ] = "~ตำแหน่ง";
     };
     ListBox LB_ORIENT
     {
@@ -963,7 +963,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
         };
         stringlist [ english_us ] =
         {
-            < "From Top" ; > ;
+            < "From top" ; > ;
             < "Above" ; > ;
             < "Centered" ; > ;
             < "Below" ; > ;
@@ -1178,9 +1178,9 @@ TabPage RID_SVXPAGE_POSITION_SIZE
         < "문자 위" ; > ;
         < "문자 가운데" ; > ;
         < "문자 아래" ; > ;
-        < "행 위" ; > ;
-        < "행 가운데" ; > ;
-        < "행 아래" ; > ;
+        < "줄 위" ; > ;
+        < "줄 가운데" ; > ;
+        < "줄 아래" ; > ;
     };
     StringList [ turkish ] =
     {
@@ -1210,16 +1210,16 @@ TabPage RID_SVXPAGE_POSITION_SIZE
     };
     StringList [ catalan ] =
     {
-            < "Desde arriba" ; > ;
-        < "Arriba" ; > ;
-        < "Centrado" ; > ;
-        < "Abajo" ; > ;
-        < "Car�cter arriba" ; > ;
-        < "Car�cter centrado" ; > ;
-        < "Car�cter abajo" ; > ;
-        < "L�nea superior" ; > ;
-        < "L�nea centrada" ; > ;
-        < "L�nea inferior" ; > ;
+            < "Des de la part superior" ; > ;
+        < "Amunt" ; > ;
+        < "Centrat" ; > ;
+        < "Avall" ; > ;
+        < "Car??cter amunt" ; > ;
+        < "Car??cter avall" ; > ;
+        < "Car??cter centrat" ; > ;
+        < "L'??rea superior" ; > ;
+        < "L'??rea centrada" ; > ;
+        < "L'??rea inferior" ; > ;
     };
     StringList [ finnish ] =
     {
@@ -1236,16 +1236,16 @@ TabPage RID_SVXPAGE_POSITION_SIZE
     };
     StringList [ thai ] =
     {
-         < "From Top" ; > ;
-        < "Above" ; > ;
-        < "Centered" ; > ;
-        < "Below" ; > ;
-        < "Top of character" ; > ;
-        < "Center of character" ; > ;
-        < "Bottom of character" ; > ;
-        < "Top of line" ; > ;
-        < "Center of line" ; > ;
-        < "Bottom of line" ; > ;
+         < "จากด้านบน" ; > ;
+        < "ขึ้น" ; > ;
+        < "ตรงกลาง" ; > ;
+        < "ข้างล่าง" ; > ;
+        < "?ฺส???๓?บมะร?ะํ๓?๐" ; > ;
+        < "ตรงกลางของตัวอักขระ" ; > ;
+        < "?ฺส??สบ๓?บมะร?ะํ๓?๐" ; > ;
+        < "?ฺส???๓?บ???ภะ?" ; > ;
+        < "ตรงกลางของบรรทัด" ; > ;
+        < "?ฺส??สบ๓?บ???ภะ?" ; > ;
     };
     };
     Text[ portuguese ] = "Position and Size";
@@ -1261,13 +1261,13 @@ TabPage RID_SVXPAGE_POSITION_SIZE
     Text[ polish ] = "Position and Size";
     Text[ portuguese_brazilian ] = "Position and Size";
     Text[ japanese ] = "位置とサイズ";
-    Text[ korean ] = "위치와 크기";
+    Text[ korean ] = "위치 및 크기";
     Text[ chinese_simplified ] = "位置和大小";
     Text[ chinese_traditional ] = "位置和大小";
     Text[ turkish ] = "Position and Size";
     Text[ arabic ] = "Position and Size";
     Text[ catalan ] = "Position and Size";
-    Text[ thai ] = "Position and Size";
+    Text[ thai ] = "ตำแหน่งและขนาด";
 };
 
  // RID_SVXPAGE_ANGLE --------------------------------------------------------
@@ -1299,7 +1299,7 @@ TabPage RID_SVXPAGE_ANGLE
         Text [ italian ] = "Punto di rotazione" ;
         Text [ portuguese_brazilian ] = "Piv" ;
         Text [ portuguese ] = "Ponto de rota��o" ;
-        Text [ finnish ] = "Pivot-piste" ;
+        Text [ finnish ] = "Keskipiste" ;
         Text [ danish ] = "Rotationspunkt" ;
         Text [ french ] = "Point de rotation" ;
         Text [ swedish ] = "Rotationspunkt" ;
@@ -1307,7 +1307,7 @@ TabPage RID_SVXPAGE_ANGLE
         Text [ spanish ] = "Punto de rotaci�n" ;
         Text [ english_us ] = "Pivot point" ;
         Text[ chinese_simplified ] = "旋转点";
-        Text[ russian ] = "����� ��������";
+        Text[ russian ] = "����� ��������";
         Text[ polish ] = "Punkt obrotu";
         Text[ japanese ] = "回転ポイント";
         Text[ chinese_traditional ] = "旋轉點";
@@ -1316,7 +1316,7 @@ TabPage RID_SVXPAGE_ANGLE
         Text[ korean ] = "회전점";
         Text[ turkish ] = "Eksen noktas�";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Punto de rotaci�n";
+        Text[ catalan ] = "Punt de rotaci�";
         Text[ thai ] = "จุดสำคัญ";
     };
     FixedText FT_POS_X
@@ -1346,7 +1346,7 @@ TabPage RID_SVXPAGE_ANGLE
         Text[ korean ] = "위치 ~X";
         Text[ turkish ] = "~X konumu";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Posici�n ~X";
+        Text[ catalan ] = "Posici� ~X";
         Text[ thai ] = "ตำแหน่ง ~X";
     };
     FixedText FT_POS_Y
@@ -1376,7 +1376,7 @@ TabPage RID_SVXPAGE_ANGLE
         Text[ korean ] = "위치 ~Y";
         Text[ turkish ] = "~Y konumu";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Posici�n ~Y";
+        Text[ catalan ] = "Posici� ~Y";
         Text[ thai ] = "ตำแหน่ง ~Y";
     };
     MetricField MTR_FLD_POS_X
@@ -1417,14 +1417,14 @@ TabPage RID_SVXPAGE_ANGLE
         Text [ ENGLISH ] = "Presets" ;
         Text[ english_us ] = "Default settings";
         Text[ portuguese ] = "Predefini��es";
-        Text[ russian ] = "�������� ��������";
+        Text[ russian ] = "��������� �� ���������";
         Text[ greek ] = "Presets";
         Text[ dutch ] = "Standaardinstellingen";
         Text[ french ] = "D�finitions";
-        Text[ spanish ] = "Predeterminaciones";
-        Text[ finnish ] = "Esiasetukset";
+        Text[ spanish ] = "Configuraci�n predeterminada";
+        Text[ finnish ] = "Oletusasetukset";
         Text[ italian ] = "Preimpostazioni";
-        Text[ danish ] = "Presets";
+        Text[ danish ] = "Forudindstillinger";
         Text[ swedish ] = "F�rinst�llningar";
         Text[ polish ] = "Ustawienia domy�lne";
         Text[ portuguese_brazilian ] = "Presets";
@@ -1434,7 +1434,7 @@ TabPage RID_SVXPAGE_ANGLE
         Text[ chinese_traditional ] = "預設";
         Text[ turkish ] = "Presets";
         Text[ arabic ] = "Presets";
-        Text[ catalan ] = "Presets";
+        Text[ catalan ] = "Predefinits";
         Text[ thai ] = "สีที่กำหนดไว้";
     };
     Control CTL_RECT
@@ -1466,7 +1466,7 @@ TabPage RID_SVXPAGE_ANGLE
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ language_user1 ] = " ";
         QuickHelpText[ turkish ] = "Rotationspunkt";
-        QuickHelpText[ catalan ] = "Punto de rotaci�n";
+        QuickHelpText[ catalan ] = "Punt de rotaci�";
         QuickHelpText[ finnish ] = "Kiertopiste";
         QuickHelpText[ thai ] = "Rotation point";
     };
@@ -1488,7 +1488,7 @@ TabPage RID_SVXPAGE_ANGLE
         Text [ spanish ] = "�ngulo de rotaci�n" ;
         Text [ english_us ] = "Rotation angle" ;
         Text[ chinese_simplified ] = "旋转角度";
-        Text[ russian ] = "���� ��������";
+        Text[ russian ] = "���� ��������";
         Text[ polish ] = "K�t obrotowy";
         Text[ japanese ] = "回転度";
         Text[ chinese_traditional ] = "旋轉角度";
@@ -1497,7 +1497,7 @@ TabPage RID_SVXPAGE_ANGLE
         Text[ korean ] = "회전각";
         Text[ turkish ] = "D�n�� a��s�";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "�ngulo de rotaci�n";
+        Text[ catalan ] = "�ngle de rotaci�";
         Text[ thai ] = "มุมหมุน";
     };
     FixedText FT_ANGLE
@@ -1527,7 +1527,7 @@ TabPage RID_SVXPAGE_ANGLE
         Text[ korean ] = "각도(~A)";
         Text[ turkish ] = "~A��";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "An~gulo";
+        Text[ catalan ] = "~Angle";
         Text[ thai ] = "~มุม";
     };
     MetricField MTR_FLD_ANGLE
@@ -1556,7 +1556,7 @@ TabPage RID_SVXPAGE_ANGLE
         CustomUnitText [ dutch ] = "graden" ;
         CustomUnitText [ portuguese ] = "Graus" ;
         CustomUnitText[ chinese_simplified ] = "度";
-        CustomUnitText[ russian ] = "������";
+        CustomUnitText[ russian ] = "��������";
         CustomUnitText[ polish ] = "stopni(e)";
         CustomUnitText[ japanese ] = "度";
         CustomUnitText[ chinese_traditional ] = "度";
@@ -1565,8 +1565,8 @@ TabPage RID_SVXPAGE_ANGLE
         CustomUnitText[ korean ] = "도";
         CustomUnitText[ turkish ] = "Derece";
         CustomUnitText[ language_user1 ] = " ";
-        CustomUnitText[ catalan ] = "grados";
-        CustomUnitText[ finnish ] = " asteet";
+        CustomUnitText[ catalan ] = " graus";
+        CustomUnitText[ finnish ] = "  astetta";
         CustomUnitText[ thai ] = " องศา";
     };
     FixedText FT_ANGLEPRESETS
@@ -1577,14 +1577,14 @@ TabPage RID_SVXPAGE_ANGLE
         Text [ ENGLISH ] = "Presets" ;
         Text[ english_us ] = "Default settings";
         Text[ portuguese ] = "Predefini��es";
-        Text[ russian ] = "�������� ��������";
+        Text[ russian ] = "��������� �� ���������";
         Text[ greek ] = "Presets";
         Text[ dutch ] = "Standaardinstellingen";
         Text[ french ] = "D�finitions";
-        Text[ spanish ] = "Predeterminaciones";
-        Text[ finnish ] = "Esiasetukset";
+        Text[ spanish ] = "Configuraci�n predeterminada";
+        Text[ finnish ] = "Oletusasetukset";
         Text[ italian ] = "Preimpostazioni";
-        Text[ danish ] = "Presets";
+        Text[ danish ] = "Forudindstillinger";
         Text[ swedish ] = "F�rinst�llningar";
         Text[ polish ] = "Ustawienia domy�lne";
         Text[ portuguese_brazilian ] = "Presets";
@@ -1594,7 +1594,7 @@ TabPage RID_SVXPAGE_ANGLE
         Text[ chinese_traditional ] = "預設";
         Text[ turkish ] = "Presets";
         Text[ arabic ] = "Presets";
-        Text[ catalan ] = "Presets";
+        Text[ catalan ] = "Predefinits";
         Text[ thai ] = "สีที่กำหนดไว้";
     };
     Control CTL_ANGLE
@@ -1638,7 +1638,7 @@ TabPage RID_SVXPAGE_ANGLE
     Text[ korean ] = "각도";
     Text[ turkish ] = "A��";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "�ngulo";
+    Text[ catalan ] = "Angle";
     Text[ thai ] = "มุม";
 };
  // RID_SVXPAGE_SLANT -----------------------------------------------------
@@ -1653,7 +1653,7 @@ TabPage RID_SVXPAGE_SLANT
     Text [ italian ] = "Inclina / raggio d'angolo" ;
     Text [ spanish ] = "Inclinaci�n/Radio de �ngulo" ;
     Text [ french ] = "Inclinaison / rayon d'angle" ;
-    Text [ dutch ] = "Schuintrekken / hoekafronding" ;
+    Text [ dutch ] = "Schuintrekken / hoekradius" ;
     Text [ swedish ] = "Snedst�ll/h�rnradie" ;
     Text [ danish ] = "H�ldning / hj�rneradius" ;
     Text [ portuguese ] = "Inclinar /Raio do �ngulo" ;
@@ -1674,7 +1674,7 @@ TabPage RID_SVXPAGE_SLANT
         Text [ portuguese_brazilian ] = "Eckenradius" ;
         Text [ portuguese ] = "Raio do �ngulo" ;
         Text[ chinese_simplified ] = "角半径";
-        Text[ russian ] = "������ (�������������) ����";
+        Text[ russian ] = "������ ������������ ����";
         Text[ polish ] = "Promie� krzywizny";
         Text[ japanese ] = "角の半径";
         Text[ chinese_traditional ] = "角半徑";
@@ -1683,7 +1683,7 @@ TabPage RID_SVXPAGE_SLANT
         Text[ korean ] = "모서리 각도";
         Text[ turkish ] = "K��e �ap�";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Radio de �ngulo";
+        Text[ catalan ] = "Radi d'angle";
         Text[ finnish ] = "Kulmas�de";
         Text[ thai ] = "รัศมีมุม";
     };
@@ -1712,7 +1712,7 @@ TabPage RID_SVXPAGE_SLANT
         Text[ korean ] = "반지름(~R)";
         Text[ turkish ] = "~�ap";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Ra~dio";
+        Text[ catalan ] = "~Radi";
         Text[ finnish ] = "~S�de";
         Text[ thai ] = "~รัศมี";
     };
@@ -1747,7 +1747,7 @@ TabPage RID_SVXPAGE_SLANT
         Text [ portuguese_brazilian ] = "Schr?gstellen" ;
         Text [ portuguese ] = "Inclinar" ;
         Text[ chinese_simplified ] = "倾斜";
-        Text[ russian ] = "��� ��������";
+        Text[ russian ] = "������";
         Text[ polish ] = "Pochyl";
         Text[ japanese ] = "傾斜させる";
         Text[ chinese_traditional ] = "傾斜";
@@ -1756,7 +1756,7 @@ TabPage RID_SVXPAGE_SLANT
         Text[ korean ] = "기울기";
         Text[ turkish ] = "Duru� e�imi";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Inclinar";
+        Text[ catalan ] = "Inclina";
         Text[ finnish ] = "Kallista";
         Text[ thai ] = "เอียง";
     };
@@ -1785,7 +1785,7 @@ TabPage RID_SVXPAGE_SLANT
         Text[ korean ] = "각도(~A)";
         Text[ turkish ] = "~A��";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "�~ngulo";
+        Text[ catalan ] = "~Angle";
         Text[ finnish ] = "~Kulma";
         Text[ thai ] = "~มุม";
     };
@@ -1817,7 +1817,7 @@ TabPage RID_SVXPAGE_SLANT
         CustomUnitText [ portuguese_brazilian ] = "Grad" ;
         CustomUnitText [ portuguese ] = "Graus" ;
         CustomUnitText[ chinese_simplified ] = "度";
-        CustomUnitText[ russian ] = "������";
+        CustomUnitText[ russian ] = "��������";
         CustomUnitText[ polish ] = "Stopie�";
         CustomUnitText[ japanese ] = "度";
         CustomUnitText[ chinese_traditional ] = "度";
@@ -1826,12 +1826,12 @@ TabPage RID_SVXPAGE_SLANT
         CustomUnitText[ korean ] = "도";
         CustomUnitText[ turkish ] = "Derece";
         CustomUnitText[ language_user1 ] = " ";
-        CustomUnitText[ catalan ] = "grados";
-        CustomUnitText[ finnish ] = " asteet";
+        CustomUnitText[ catalan ] = " graus";
+        CustomUnitText[ finnish ] = "  astetta";
         CustomUnitText[ thai ] = " องศา";
     };
     Text[ chinese_simplified ] = "倾斜和角半径";
-    Text[ russian ] = "������ / ������ ������������� ����";
+    Text[ russian ] = "������ � ������ ������������ ����";
     Text[ polish ] = "Pochyl / Promie� naro�nika";
     Text[ japanese ] = "傾斜角度/角の半径";
     Text[ chinese_traditional ] = "傾斜/角度";
@@ -1840,7 +1840,7 @@ TabPage RID_SVXPAGE_SLANT
     Text[ korean ] = "기울기 / 모서리 각도";
     Text[ turkish ] = "Duru� e�imi / K��e �ap�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Inclinaci�n/Radio de �ngulo";
+    Text[ catalan ] = "Inclinaci�/Radi d'angle";
     Text[ finnish ] = "Kallistus- ja kulmas�de";
     Text[ thai ] = "เอียงและรัศมีมุม";
 };
@@ -1895,11 +1895,11 @@ TabDialog RID_SVXDLG_TRANSFORM
                 Text[ chinese_traditional ] = "位置和大小";
                 Text[ arabic ] = "������ ������";
                 Text[ greek ] = "���� ��� �������";
-                Text[ korean ] = "위치와 크기";
+                Text[ korean ] = "위치 및 크기";
                 Text[ turkish ] = "Konum ve boyut";
                 Text[ language_user1 ] = " ";
                 Text[ catalan ] = "Posici�n y tama�o";
-                Text[ thai ] = "Position and Size";
+                Text[ thai ] = "ตำแหน่งและขนาด";
             };
             PageItem
             {
@@ -1928,7 +1928,7 @@ TabDialog RID_SVXDLG_TRANSFORM
                 Text[ korean ] = "회전";
                 Text[ turkish ] = "D�n��";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Rotaci�n";
+                Text[ catalan ] = "Gir";
                 Text[ thai ] = "หมุน";
             };
             PageItem
@@ -1941,13 +1941,13 @@ TabDialog RID_SVXDLG_TRANSFORM
                 Text [ italian ] = "Inclina / raggio d'angolo" ;
                 Text [ spanish ] = "Inclinaci�n/Radio de �ngulo" ;
                 Text [ french ] = "Inclinaison / rayon d'angle" ;
-                Text [ dutch ] = "Schuintrekken/hoekafronding" ;
+                Text [ dutch ] = "Schuintrekken/hoekradius" ;
                 Text [ swedish ] = "Snedst�ll/h�rnradie" ;
                 Text [ danish ] = "H�ldning / hj�rneradius" ;
                 Text [ portuguese_brazilian ] = "Schr?gstellen / Eckenradius" ;
                 Text [ portuguese ] = "Inclinar / Raio do �ngulo" ;
                 Text[ chinese_simplified ] = "倾斜和角半径";
-                Text[ russian ] = "������ / ������ ������������� ����";
+                Text[ russian ] = "������ � ������ ������������ ����";
                 Text[ polish ] = "Pochyl / Promie� naro�nika";
                 Text[ japanese ] = "傾斜角度/角の半径";
                 Text[ chinese_traditional ] = "傾斜/角度";
@@ -1956,23 +1956,23 @@ TabDialog RID_SVXDLG_TRANSFORM
                 Text[ korean ] = "기울기 / 모서리 각도";
                 Text[ turkish ] = "Duru� e�imi / K��e �ap�";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Inclinaci�n/Radio de �ngulo";
+                Text[ catalan ] = "Inclinaci�/Radi d'angle";
                 Text[ finnish ] = "Kallistus- ja kulmas�de";
                 Text[ thai ] = "เอียงและรัศมีมุม";
             };
         };
     };
     Text[ chinese_simplified ] = "位置和大小";
-    Text[ russian ] = "������� � ������";
+    Text[ russian ] = "��������� � ������";
     Text[ polish ] = "Pozycja i rozmiar";
     Text[ japanese ] = "位置とサイズ";
     Text[ chinese_traditional ] = "位置和大小";
     Text[ arabic ] = "������ ������";
     Text[ greek ] = "���� ��� �������";
-    Text[ korean ] = "위치와 크기";
+    Text[ korean ] = "위치 및 크기";
     Text[ turkish ] = "Konum ve boyut";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Posici�n y tama�o";
+    Text[ catalan ] = "Posici� i mida";
     Text[ thai ] = "ตำแหน่งและขนาด";
 };
  // ********************************************************************** EOF
@@ -1990,3 +1990,8 @@ TabDialog RID_SVXDLG_TRANSFORM
 
 
 
+
+
+
+
+
diff --git a/svx/source/dialog/txenctab.src b/svx/source/dialog/txenctab.src
index 40b50e8ebb46..ff3da58e7eb5 100644
--- a/svx/source/dialog/txenctab.src
+++ b/svx/source/dialog/txenctab.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txenctab.src,v $
  *
- *  $Revision: 1.32 $
+ *  $Revision: 1.33 $
  *
- *  last change: $Author: kz $ $Date: 2002-06-10 15:59:26 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -87,9 +87,9 @@ StringArray RID_SVXSTR_TEXTENCODING_TABLE
         < "Latin 3 (ISO-8859-3)"                            ; RTL_TEXTENCODING_ISO_8859_3       ; > ;
         < "Baltisch (ISO-8859-4)"                           ; RTL_TEXTENCODING_ISO_8859_4       ; > ;
         < "Kyrillisch (ISO-8859-5)"                         ; RTL_TEXTENCODING_ISO_8859_5       ; > ;
-//      < "Arabisch (ISO-8859-6)"                           ; RTL_TEXTENCODING_ISO_8859_6       ; > ;
+        < "Arabisch (ISO-8859-6)"                           ; RTL_TEXTENCODING_ISO_8859_6       ; > ;
         < "Griechisch (ISO-8859-7)"                         ; RTL_TEXTENCODING_ISO_8859_7       ; > ;
-//      < "Hebr�isch (ISO-8859-8)"                          ; RTL_TEXTENCODING_ISO_8859_8       ; > ;
+        < "Hebr�isch (ISO-8859-8)"                          ; RTL_TEXTENCODING_ISO_8859_8       ; > ;
         < "T�rkisch (ISO-8859-9)"                           ; RTL_TEXTENCODING_ISO_8859_9       ; > ;
         < "Westeuropa (ISO-8859-14)"                        ; RTL_TEXTENCODING_ISO_8859_14      ; > ;
         < "Westeuropa (ISO-8859-15/EURO)"                   ; RTL_TEXTENCODING_ISO_8859_15      ; > ;
@@ -98,16 +98,16 @@ StringArray RID_SVXSTR_TEXTENCODING_TABLE
         < "Osteuropa (DOS/OS2-852)"                         ; RTL_TEXTENCODING_IBM_852          ; > ;
         < "Kyrillisch (DOS/OS2-855)"                        ; RTL_TEXTENCODING_IBM_855          ; > ;
         < "T�rkisch (DOS/OS2-857)"                          ; RTL_TEXTENCODING_IBM_857          ; > ;
-//      < "Hebr�isch (DOS/OS2-862)"                         ; RTL_TEXTENCODING_IBM_862          ; > ;
-//      < "Arabisch (DOS/OS2-864)"                          ; RTL_TEXTENCODING_IBM_864          ; > ;
+        < "Hebr�isch (DOS/OS2-862)"                         ; RTL_TEXTENCODING_IBM_862          ; > ;
+        < "Arabisch (DOS/OS2-864)"                          ; RTL_TEXTENCODING_IBM_864          ; > ;
         < "Kyrillisch (DOS/OS2-866/Russisch)"               ; RTL_TEXTENCODING_IBM_866          ; > ;
         < "Griechisch (DOS/OS2-869/Modern)"                 ; RTL_TEXTENCODING_IBM_869          ; > ;
         < "Osteuropa (Windows-1250/WinLatin 2)"             ; RTL_TEXTENCODING_MS_1250          ; > ;
         < "Kyrillisch (Windows-1251)"                       ; RTL_TEXTENCODING_MS_1251          ; > ;
         < "Griechisch (Windows-1253)"                       ; RTL_TEXTENCODING_MS_1253          ; > ;
         < "T�rkisch (Windows-1254)"                         ; RTL_TEXTENCODING_MS_1254          ; > ;
-//      < "Hebr�isch (Windows-1255)"                        ; RTL_TEXTENCODING_MS_1255          ; > ;
-//      < "Arabisch (Windows-1256)"                         ; RTL_TEXTENCODING_MS_1256          ; > ;
+        < "Hebr�isch (Windows-1255)"                        ; RTL_TEXTENCODING_MS_1255          ; > ;
+        < "Arabisch (Windows-1256)"                         ; RTL_TEXTENCODING_MS_1256          ; > ;
         < "Baltisch (Windows-1257)"                         ; RTL_TEXTENCODING_MS_1257          ; > ;
 //      < "Vietnamesisch (Windows-1258)"                    ; RTL_TEXTENCODING_MS_1258          ; > ;
 //      < "Arabisch (Apple Macintosh)"                      ; RTL_TEXTENCODING_APPLE_ARABIC     ; > ;
@@ -159,6 +159,7 @@ StringArray RID_SVXSTR_TEXTENCODING_TABLE
         < "Unicode"                                         ; RTL_TEXTENCODING_UCS2             ; > ;
         < "Thai (ISO-8859-11/TIS-620)"                                  ; RTL_TEXTENCODING_TIS_620          ; > ;
         < "Thai (Windows-874)"                              ; RTL_TEXTENCODING_MS_874           ; > ;
+        < "Kyrillisch (KOI8-U)"                             ; RTL_TEXTENCODING_KOI8_U           ; > ;
     };
     ItemList [ english ] =
     {
@@ -176,9 +177,9 @@ StringArray RID_SVXSTR_TEXTENCODING_TABLE
         < "Latin 3 (ISO-8859-3)"                            ; RTL_TEXTENCODING_ISO_8859_3       ; > ;
         < "Baltic (ISO-8859-4)"                             ; RTL_TEXTENCODING_ISO_8859_4       ; > ;
         < "Cyrillic (ISO-8859-5)"                           ; RTL_TEXTENCODING_ISO_8859_5       ; > ;
-//      < "Arabic (ISO-8859-6)"                             ; RTL_TEXTENCODING_ISO_8859_6       ; > ;
+        < "Arabic (ISO-8859-6)"                             ; RTL_TEXTENCODING_ISO_8859_6       ; > ;
         < "Greek (ISO-8859-7)"                              ; RTL_TEXTENCODING_ISO_8859_7       ; > ;
-//      < "Hebrew (ISO-8859-8)"                             ; RTL_TEXTENCODING_ISO_8859_8       ; > ;
+        < "Hebrew (ISO-8859-8)"                             ; RTL_TEXTENCODING_ISO_8859_8       ; > ;
         < "Turkish (ISO-8859-9)"                            ; RTL_TEXTENCODING_ISO_8859_9       ; > ;
         < "Western (ISO-8859-14)"                           ; RTL_TEXTENCODING_ISO_8859_14      ; > ;
         < "Western (ISO-8859-15/EURO)"                      ; RTL_TEXTENCODING_ISO_8859_15      ; > ;
@@ -187,16 +188,16 @@ StringArray RID_SVXSTR_TEXTENCODING_TABLE
         < "Central European (DOS/OS2-852)"                  ; RTL_TEXTENCODING_IBM_852          ; > ;
         < "Cyrillic (DOS/OS2-855)"                          ; RTL_TEXTENCODING_IBM_855          ; > ;
         < "Turkish (DOS/OS2-857)"                           ; RTL_TEXTENCODING_IBM_857          ; > ;
-//      < "Hebrew (DOS/OS2-862)"                            ; RTL_TEXTENCODING_IBM_862          ; > ;
-//      < "Arabic (DOS/OS2-864)"                            ; RTL_TEXTENCODING_IBM_864          ; > ;
+        < "Hebrew (DOS/OS2-862)"                            ; RTL_TEXTENCODING_IBM_862          ; > ;
+        < "Arabic (DOS/OS2-864)"                            ; RTL_TEXTENCODING_IBM_864          ; > ;
         < "Cyrillic (DOS/OS2-866/Russian)"                  ; RTL_TEXTENCODING_IBM_866          ; > ;
         < "Greek (DOS/OS2-869/Modern)"                      ; RTL_TEXTENCODING_IBM_869          ; > ;
         < "Central European (Windows-1250/WinLatin 2)"      ; RTL_TEXTENCODING_MS_1250          ; > ;
         < "Cyrillic (Windows-1251)"                         ; RTL_TEXTENCODING_MS_1251          ; > ;
         < "Greek (Windows-1253)"                            ; RTL_TEXTENCODING_MS_1253          ; > ;
         < "Turkish (Windows-1254)"                          ; RTL_TEXTENCODING_MS_1254          ; > ;
-//      < "Hebrew (Windows-1255)"                           ; RTL_TEXTENCODING_MS_1255          ; > ;
-//      < "Arabic (Windows-1256)"                           ; RTL_TEXTENCODING_MS_1256          ; > ;
+        < "Hebrew (Windows-1255)"                           ; RTL_TEXTENCODING_MS_1255          ; > ;
+        < "Arabic (Windows-1256)"                           ; RTL_TEXTENCODING_MS_1256          ; > ;
         < "Baltic (Windows-1257)"                           ; RTL_TEXTENCODING_MS_1257          ; > ;
 //      < "Vietnamese (Windows-1258)"                       ; RTL_TEXTENCODING_MS_1258          ; > ;
 //      < "Arabic (Apple Macintosh)"                        ; RTL_TEXTENCODING_APPLE_ARABIC     ; > ;
@@ -337,7 +338,9 @@ ItemList [ language_user1 ] =
         < "Latin 3 (ISO-8859-3)"                            ; RTL_TEXTENCODING_ISO_8859_3       ; > ;
         < "Baltic (ISO-8859-4)"                         ; RTL_TEXTENCODING_ISO_8859_4       ; > ;
         < "Cyrillic (ISO-8859-5)"                           ; RTL_TEXTENCODING_ISO_8859_5       ; > ;
+        < "Arabic (ISO-8859-6)"                             ; RTL_TEXTENCODING_ISO_8859_6       ; > ;
         < "Greek (ISO-8859-7)"                          ; RTL_TEXTENCODING_ISO_8859_7       ; > ;
+        < "Hebrew (ISO-8859-8)"                             ; RTL_TEXTENCODING_ISO_8859_8       ; > ;
         < "Turkish (ISO-8859-9)"                            ; RTL_TEXTENCODING_ISO_8859_9       ; > ;
         < "Western Europe (ISO-8859-14)"                        ; RTL_TEXTENCODING_ISO_8859_14      ; > ;
         < "Western Europe (ISO-8859-15/EURO)"                   ; RTL_TEXTENCODING_ISO_8859_15      ; > ;
@@ -346,12 +349,16 @@ ItemList [ language_user1 ] =
         < "Eastern Europe (DOS/OS2-852)"                            ; RTL_TEXTENCODING_IBM_852          ; > ;
         < "Cyrillic (DOS/OS2-855)"                      ; RTL_TEXTENCODING_IBM_855          ; > ;
         < "Turkish (DOS/OS2-857)"                           ; RTL_TEXTENCODING_IBM_857          ; > ;
+        < "Hebrew (DOS/OS2-862)"                            ; RTL_TEXTENCODING_IBM_862          ; > ;
+        < "Arabic (DOS/OS2-864)"                            ; RTL_TEXTENCODING_IBM_864          ; > ;
         < "Cyrillic (DOS/OS2-866/Russian)"              ; RTL_TEXTENCODING_IBM_866          ; > ;
         < "Greek (DOS/OS2-869/Modern)"                  ; RTL_TEXTENCODING_IBM_869          ; > ;
         < "Eastern Europe (Windows-1250/WinLatin 2)"                ; RTL_TEXTENCODING_MS_1250          ; > ;
         < "Cyrillic (Windows-1251)"                     ; RTL_TEXTENCODING_MS_1251          ; > ;
         < "Greek (Windows-1253)"                        ; RTL_TEXTENCODING_MS_1253          ; > ;
         < "Turkish (Windows-1254)"                          ; RTL_TEXTENCODING_MS_1254          ; > ;
+        < "Hebrew (Windows-1255)"                           ; RTL_TEXTENCODING_MS_1255          ; > ;
+        < "Arabic (Windows-1256)"                           ; RTL_TEXTENCODING_MS_1256          ; > ;
         < "Baltic (Windows-1257)"                           ; RTL_TEXTENCODING_MS_1257          ; > ;
         < "Eastern Europe (Apple Macintosh)"                        ; RTL_TEXTENCODING_APPLE_CENTEURO   ; > ;
         < "Eastern Europe (Apple Macintosh/Croatian)"           ; RTL_TEXTENCODING_APPLE_CROATIAN   ; > ;
@@ -386,12 +393,13 @@ ItemList [ language_user1 ] =
         < "Unicode (UTF-8)"                                 ; RTL_TEXTENCODING_UTF8             ; > ;
         < "Eastern Europe (ISO-8859-10)"                            ; RTL_TEXTENCODING_ISO_8859_10      ; > ;
         < "Eastern Europe (ISO-8859-13)"                            ; RTL_TEXTENCODING_ISO_8859_13      ; > ;
-        < "Korean (EUC-KR)"                             ; RTL_TEXTENCODING_EUC_KR           ; > ;
+        < "Cyrillic (KOI8-U)"                               ; RTL_TEXTENCODING_EUC_KR           ; > ;
         < "Korean (ISO-2022-KR)"                        ; RTL_TEXTENCODING_ISO_2022_KR      ; > ;
         < "Korean (Windows-Johab-1361)"                 ; RTL_TEXTENCODING_MS_1361          ; > ;
         < "Unicode"                                         ; RTL_TEXTENCODING_UCS2             ; > ;
         < "Thai (ISO-8859-11/TIS-620)"                                  ; RTL_TEXTENCODING_TIS_620          ; > ;
         < "Thai (Windows-874)"                              ; RTL_TEXTENCODING_MS_874           ; > ;
+        < "Cyrillic (KOI8-U)"                             ; RTL_TEXTENCODING_KOI8_U           ; > ;
     };
     ItemList [ portuguese ] =
     {
@@ -478,9 +486,9 @@ ItemList [ language_user1 ] =
         < "������������������ (ASCII/���)"                          ; RTL_TEXTENCODING_ASCII_US         ; > ;
         < "������������������ (ISO-8859-1)"                         ; RTL_TEXTENCODING_ISO_8859_1       ; > ;
         < "������������������� (ISO-8859-2)"                            ; RTL_TEXTENCODING_ISO_8859_2       ; > ;
-        < "Latin 3 (ISO-8859-3)"                            ; RTL_TEXTENCODING_ISO_8859_3       ; > ;
+        < "������ 3 (ISO-8859-3)"                           ; RTL_TEXTENCODING_ISO_8859_3       ; > ;
         < "������������� (ISO-8859-4)"                          ; RTL_TEXTENCODING_ISO_8859_4       ; > ;
-        < "������������� (ISO-8859-5)"                          ; RTL_TEXTENCODING_ISO_8859_5       ; > ;
+        < "��������� (ISO-8859-5)"                          ; RTL_TEXTENCODING_ISO_8859_5       ; > ;
         < "��������� (ISO-8859-7)"                          ; RTL_TEXTENCODING_ISO_8859_7       ; > ;
         < "�������� (ISO-8859-9)"                           ; RTL_TEXTENCODING_ISO_8859_9       ; > ;
         < "������������������ (ISO-8859-14)"                        ; RTL_TEXTENCODING_ISO_8859_14      ; > ;
@@ -488,23 +496,23 @@ ItemList [ language_user1 ] =
         < "��������� (DOS/OS2-737)"                     ; RTL_TEXTENCODING_IBM_737          ; > ;
         < "������������� (DOS/OS2-775)"                         ; RTL_TEXTENCODING_IBM_775          ; > ;
         < "������������������� (DOS/OS2-852)"                           ; RTL_TEXTENCODING_IBM_852          ; > ;
-        < "������������� (DOS/OS2-855)"                     ; RTL_TEXTENCODING_IBM_855          ; > ;
+        < "��������� (DOS/OS2-855)"                     ; RTL_TEXTENCODING_IBM_855          ; > ;
         < "�������� (DOS/OS2-857)"                          ; RTL_TEXTENCODING_IBM_857          ; > ;
-        < "������������� (DOS/OS2-866/�������)"             ; RTL_TEXTENCODING_IBM_866          ; > ;
+        < "��������� (DOS/OS2-866/�������)"             ; RTL_TEXTENCODING_IBM_866          ; > ;
         < "��������� (DOS/OS2-869/�����������)"                 ; RTL_TEXTENCODING_IBM_869          ; > ;
         < "������������������� (Windows-1250/WinLatin 2)"               ; RTL_TEXTENCODING_MS_1250          ; > ;
-        < "������������� (Windows-1251)"                        ; RTL_TEXTENCODING_MS_1251          ; > ;
+        < "��������� (Windows-1251)"                        ; RTL_TEXTENCODING_MS_1251          ; > ;
         < "��������� (Windows-1253)"                        ; RTL_TEXTENCODING_MS_1253          ; > ;
         < "�������� (Windows-1254)"                         ; RTL_TEXTENCODING_MS_1254          ; > ;
         < "������������� (Windows-1257)"                            ; RTL_TEXTENCODING_MS_1257          ; > ;
         < "������������������� (Apple Macintosh)"                       ; RTL_TEXTENCODING_APPLE_CENTEURO   ; > ;
         < "������������������� (Apple Macintosh/����������)"            ; RTL_TEXTENCODING_APPLE_CROATIAN   ; > ;
-        < "������������� (Apple Macintosh)"                 ; RTL_TEXTENCODING_APPLE_CYRILLIC   ; > ;
+        < "��������� (Apple Macintosh)"                 ; RTL_TEXTENCODING_APPLE_CYRILLIC   ; > ;
         < "��������� (Apple Macintosh)"                 ; RTL_TEXTENCODING_APPLE_GREEK      ; > ;
         < "������������������ (Apple Macintosh/����������)"         ; RTL_TEXTENCODING_APPLE_ICELAND    ; > ;
         < "������������������� (Apple Macintosh/���������)"         ; RTL_TEXTENCODING_APPLE_ROMANIAN   ; > ;
         < "�������� (Apple Macintosh)"                      ; RTL_TEXTENCODING_APPLE_TURKISH    ; > ;
-        < "������������� (Apple Macintosh/����������)"          ; RTL_TEXTENCODING_APPLE_UKRAINIAN  ; > ;
+        < "��������� (Apple Macintosh/����������)"          ; RTL_TEXTENCODING_APPLE_UKRAINIAN  ; > ;
         < "��������� ���������� (Apple Macintosh)"      ; RTL_TEXTENCODING_APPLE_CHINSIMP   ; > ;
         < "��������� ������������ (Apple Macintosh)"        ; RTL_TEXTENCODING_APPLE_CHINTRAD   ; > ;
         < "�������� (Apple Macintosh)"                      ; RTL_TEXTENCODING_APPLE_JAPANESE   ; > ;
@@ -515,24 +523,24 @@ ItemList [ language_user1 ] =
         < "��������� ������������ (Windows-950)"            ; RTL_TEXTENCODING_MS_950           ; > ;
         < "�������� (Shift-JIS)"                            ; RTL_TEXTENCODING_SHIFT_JIS        ; > ;
         < "��������� ���������� (GB-2312)"              ; RTL_TEXTENCODING_GB_2312          ; > ;
-        < "��������� ������������ (GBT-12345)"               ; RTL_TEXTENCODING_GB_18030         ; > ;
-        < "��������� ���������� (GBK/GB-2312-80)"               ; RTL_TEXTENCODING_GBT_12345        ; > ;
-        < "��������� ������������ (BIG5)"           ; RTL_TEXTENCODING_GBK              ; > ;
-        < "�������� (EUC-JP)"                   ; RTL_TEXTENCODING_BIG5             ; > ;
-        < "��������� ���������� (EUC-CN)"            ; RTL_TEXTENCODING_BIG5_HKSCS       ; > ;
-        < "������������� (KOI8-R)"                              ; RTL_TEXTENCODING_EUC_JP           ; > ;
-        < "������ (UTF-7)"                  ; RTL_TEXTENCODING_EUC_CN           ; > ;
-        < "������ (UTF-8)"                ; RTL_TEXTENCODING_EUC_TW           ; > ;
-        < "������������������� (ISO-8859-10)"                         ; RTL_TEXTENCODING_ISO_2022_JP      ; > ;
-        < "������������������� (ISO-8859-13)"            ; RTL_TEXTENCODING_ISO_2022_CN      ; > ;
-        < "��������� (EUC-KR)"                              ; RTL_TEXTENCODING_KOI8_R           ; > ;
-        < "��������� (Windows-Johab-1361)"                                  ; RTL_TEXTENCODING_UTF7             ; > ;
-        < "������"                                  ; RTL_TEXTENCODING_UTF8             ; > ;
-        < "������������������� (ISO-8859-13)"                           ; RTL_TEXTENCODING_ISO_8859_10      ; > ;
-        < "��������� (EUC-KR)"                          ; RTL_TEXTENCODING_ISO_8859_13      ; > ;
-        < "��������� (ISO-2022-KR)"                             ; RTL_TEXTENCODING_EUC_KR           ; > ;
-        < "��������� (Windows-Johab-1361)"                        ; RTL_TEXTENCODING_ISO_2022_KR      ; > ;
-        < "������"                  ; RTL_TEXTENCODING_MS_1361          ; > ;
+        < "��������� ���������� (GB-18030)"               ; RTL_TEXTENCODING_GB_18030         ; > ;
+        < "��������� ������������ (GBT-12345)"              ; RTL_TEXTENCODING_GBT_12345        ; > ;
+        < "��������� ���������� (GBK/GB-2312-80)"           ; RTL_TEXTENCODING_GBK              ; > ;
+        < "��������� ������������ (BIG5)"                   ; RTL_TEXTENCODING_BIG5             ; > ;
+        < "��������� ������������ (BIG5-HKSCS)"            ; RTL_TEXTENCODING_BIG5_HKSCS       ; > ;
+        < "�������� (EUC-JP)"                               ; RTL_TEXTENCODING_EUC_JP           ; > ;
+        < "��������� ���������� (EUC-CN)"                   ; RTL_TEXTENCODING_EUC_CN           ; > ;
+        < "��������� ������������ (EUC-TW)"                ; RTL_TEXTENCODING_EUC_TW           ; > ;
+        < "�������� (ISO-2022-JP)"                         ; RTL_TEXTENCODING_ISO_2022_JP      ; > ;
+        < "��������� ���������� (ISO-2022-CN)"            ; RTL_TEXTENCODING_ISO_2022_CN      ; > ;
+        < "��������� (KOI8-R)"                              ; RTL_TEXTENCODING_KOI8_R           ; > ;
+        < "������ (UTF-7)"                                  ; RTL_TEXTENCODING_UTF7             ; > ;
+        < "������ (UTF-8)"                                  ; RTL_TEXTENCODING_UTF8             ; > ;
+        < "������������������� (ISO-8859-10)"                           ; RTL_TEXTENCODING_ISO_8859_10      ; > ;
+        < "������������������� (ISO-8859-13)"                           ; RTL_TEXTENCODING_ISO_8859_13      ; > ;
+        < "��������� (EUC-KR)"                              ; RTL_TEXTENCODING_EUC_KR           ; > ;
+        < "��������� (ISO-2022-KR)"                        ; RTL_TEXTENCODING_ISO_2022_KR      ; > ;
+        < "��������� (Windows-Johab-1361)"                  ; RTL_TEXTENCODING_MS_1361          ; > ;
         < "������"                                          ; RTL_TEXTENCODING_UCS2             ; > ;
         < "Thai (ISO-8859-11/TIS-620)"                                  ; RTL_TEXTENCODING_TIS_620          ; > ;
         < "Thai (Windows-874)"                              ; RTL_TEXTENCODING_MS_874           ; > ;
@@ -618,11 +626,11 @@ ItemList [ language_user1 ] =
         < "West-Europa (DOS/OS2-860/Portugees)"         ; RTL_TEXTENCODING_IBM_860          ; > ;
         < "West-Europa (DOS/OS2-861/Ijslands)"              ; RTL_TEXTENCODING_IBM_861          ; > ;
         < "West-Europa (DOS/OS2-863/Frans (Can.))"  ; RTL_TEXTENCODING_IBM_863          ; > ;
-        < "West-Europa (DOS/OS2-865/Skandinavisch)"             ; RTL_TEXTENCODING_IBM_865          ; > ;
+        < "West-Europa (DOS/OS2-865/Scandinavisch)"             ; RTL_TEXTENCODING_IBM_865          ; > ;
         < "West-Europa (ASCII/US)"                          ; RTL_TEXTENCODING_ASCII_US         ; > ;
         < "West-Europa (ISO-8859-1)"                            ; RTL_TEXTENCODING_ISO_8859_1       ; > ;
         < "Oost-Europa (ISO-8859-2)"                            ; RTL_TEXTENCODING_ISO_8859_2       ; > ;
-        < "Latijns 3 (ISO-8859-3)"                          ; RTL_TEXTENCODING_ISO_8859_3       ; > ;
+        < "Latin 3 (ISO-8859-3)"                            ; RTL_TEXTENCODING_ISO_8859_3       ; > ;
         < "Baltisch (ISO-8859-4)"                           ; RTL_TEXTENCODING_ISO_8859_4       ; > ;
         < "Cyrillisch (ISO-8859-5)"                         ; RTL_TEXTENCODING_ISO_8859_5       ; > ;
         < "Grieks (ISO-8859-7)"                         ; RTL_TEXTENCODING_ISO_8859_7       ; > ;
@@ -659,24 +667,24 @@ ItemList [ language_user1 ] =
         < "Chinees traditioneel (Windows-950)"          ; RTL_TEXTENCODING_MS_950           ; > ;
         < "Japans (Shift-JIS)"                          ; RTL_TEXTENCODING_SHIFT_JIS        ; > ;
         < "Chinees vereenvoudigd (GB-2312)"             ; RTL_TEXTENCODING_GB_2312          ; > ;
-        < "Chinees traditioneel (GBT-12345)"               ; RTL_TEXTENCODING_GB_18030         ; > ;
-        < "Chinees vereenvoudigd (GBK/GB-2312-80)"              ; RTL_TEXTENCODING_GBT_12345        ; > ;
-        < "Chinees traditioneel (BIG5)"         ; RTL_TEXTENCODING_GBK              ; > ;
-        < "Japans (EUC-JP)"                 ; RTL_TEXTENCODING_BIG5             ; > ;
-        < "Chinees vereenvoudigd (EUC-CN)"            ; RTL_TEXTENCODING_BIG5_HKSCS       ; > ;
-        < "Cyrillisch (KOI8-R)"                             ; RTL_TEXTENCODING_EUC_JP           ; > ;
-        < "Unicode (UTF-7)"                 ; RTL_TEXTENCODING_EUC_CN           ; > ;
-        < "Unicode (UTF-8)"                ; RTL_TEXTENCODING_EUC_TW           ; > ;
-        < "Oost-Europa (ISO-8859-10)"                         ; RTL_TEXTENCODING_ISO_2022_JP      ; > ;
-        < "Oost-Europa (ISO-8859-13)"            ; RTL_TEXTENCODING_ISO_2022_CN      ; > ;
-        < "Koreaans (EUC-KR)"                               ; RTL_TEXTENCODING_KOI8_R           ; > ;
-        < "Koreaans (Windows-Johab-1361)"                                   ; RTL_TEXTENCODING_UTF7             ; > ;
-        < "Unicode"                                 ; RTL_TEXTENCODING_UTF8             ; > ;
+        < "Chinees vereenvoudigd (GB-18030)"               ; RTL_TEXTENCODING_GB_18030         ; > ;
+        < "Chinees traditioneel (GBT-12345)"                ; RTL_TEXTENCODING_GBT_12345        ; > ;
+        < "Chinees vereenvoudigd (GBK/GB-2312-80)"          ; RTL_TEXTENCODING_GBK              ; > ;
+        < "Chinees traditioneel (BIG5)"                 ; RTL_TEXTENCODING_BIG5             ; > ;
+        < "Japans (EUC-JP)"            ; RTL_TEXTENCODING_BIG5_HKSCS       ; > ;
+        < "Chinees vereenvoudigd (EUC-CN)"                              ; RTL_TEXTENCODING_EUC_JP           ; > ;
+        < "Chinees traditioneel (EUC-TW)"                   ; RTL_TEXTENCODING_EUC_CN           ; > ;
+        < "Japans (ISO-2022-JP)"                ; RTL_TEXTENCODING_EUC_TW           ; > ;
+        < "Chinees vereenvoudigd (ISO-2022-CN)"                         ; RTL_TEXTENCODING_ISO_2022_JP      ; > ;
+        < "Cyrillisch (KOI8-R)"            ; RTL_TEXTENCODING_ISO_2022_CN      ; > ;
+        < "Unicode (UTF-7)"                             ; RTL_TEXTENCODING_KOI8_R           ; > ;
+        < "Unicode (UTF-8)"                                 ; RTL_TEXTENCODING_UTF7             ; > ;
+        < "Oost-Europa (ISO-8859-10)"                                   ; RTL_TEXTENCODING_UTF8             ; > ;
         < "Oost-Europa (ISO-8859-13)"                           ; RTL_TEXTENCODING_ISO_8859_10      ; > ;
         < "Koreaans (EUC-KR)"                           ; RTL_TEXTENCODING_ISO_8859_13      ; > ;
         < "Koreaans (ISO-2022-KR)"                              ; RTL_TEXTENCODING_EUC_KR           ; > ;
         < "Koreaans (Windows-Johab-1361)"                        ; RTL_TEXTENCODING_ISO_2022_KR      ; > ;
-        < "Koreanisch (Windows-Johab-1361)"                 ; RTL_TEXTENCODING_MS_1361          ; > ;
+        < "Unicode"                 ; RTL_TEXTENCODING_MS_1361          ; > ;
         < "Unicode"                                         ; RTL_TEXTENCODING_UCS2             ; > ;
         < "Thai (ISO-8859-11/TIS-620)"                                  ; RTL_TEXTENCODING_TIS_620          ; > ;
         < "Thai (Windows-874)"                              ; RTL_TEXTENCODING_MS_874           ; > ;
@@ -752,6 +760,13 @@ ItemList [ language_user1 ] =
         < "Unicode"                                         ; RTL_TEXTENCODING_UCS2             ; > ;
         < "Tha� (ISO-8859-11/TIS-620)"                                  ; RTL_TEXTENCODING_TIS_620          ; > ;
         < "Tha� (Windows-874)"                              ; RTL_TEXTENCODING_MS_874           ; > ;
+        < "Cyrillique (KOI8-U)"                             ; RTL_TEXTENCODING_EUC_KR           ; > ;
+        < "Koreanisch (ISO-2022-KR)"                        ; RTL_TEXTENCODING_ISO_2022_KR      ; > ;
+        < "Koreanisch (Windows-Johab-1361)"                 ; RTL_TEXTENCODING_MS_1361          ; > ;
+        < "Unicode"                                         ; RTL_TEXTENCODING_UCS2             ; > ;
+        < "Thai (ISO-8859-11/TIS-620)"                                  ; RTL_TEXTENCODING_TIS_620          ; > ;
+        < "Thai (Windows-874)"                              ; RTL_TEXTENCODING_MS_874           ; > ;
+        < "Kyrillisch (KOI8-U)"                             ; RTL_TEXTENCODING_KOI8_U           ; > ;
     };
     ItemList [ spanish ] =
     {
@@ -824,74 +839,81 @@ ItemList [ language_user1 ] =
         < "Unicode"                                         ; RTL_TEXTENCODING_UCS2             ; > ;
         < "Thai (ISO-8859-11/TIS-620)"                                  ; RTL_TEXTENCODING_TIS_620          ; > ;
         < "Thai (Windows-874)"                              ; RTL_TEXTENCODING_MS_874           ; > ;
+        < "Cir�lico (KOI8-U)"                               ; RTL_TEXTENCODING_EUC_KR           ; > ;
+        < "Koreanisch (ISO-2022-KR)"                        ; RTL_TEXTENCODING_ISO_2022_KR      ; > ;
+        < "Koreanisch (Windows-Johab-1361)"                 ; RTL_TEXTENCODING_MS_1361          ; > ;
+        < "Unicode"                                         ; RTL_TEXTENCODING_UCS2             ; > ;
+        < "Thai (ISO-8859-11/TIS-620)"                                  ; RTL_TEXTENCODING_TIS_620          ; > ;
+        < "Thai (Windows-874)"                              ; RTL_TEXTENCODING_MS_874           ; > ;
+        < "Kyrillisch (KOI8-U)"                             ; RTL_TEXTENCODING_KOI8_U           ; > ;
     };
     ItemList [ finnish ] =
     {
-         < "L�nsieurooppalainen (Windows-1252/WinLatin 1)"          ; RTL_TEXTENCODING_MS_1252          ; > ;
-        < "L�nsieurooppalainen (Apple Macintosh)"                   ; RTL_TEXTENCODING_APPLE_ROMAN      ; > ;
-        < "L�nsieurooppalainen (DOS/OS2-850/kansainv�linen)"            ; RTL_TEXTENCODING_IBM_850          ; > ;
-        < "L�nsieurooppalainen (DOS/OS2-437/US)"                        ; RTL_TEXTENCODING_IBM_437          ; > ;
-        < "L�nsieurooppalainen (DOS/OS2-860/portugali)"         ; RTL_TEXTENCODING_IBM_860          ; > ;
-        < "L�nsieurooppalainen (DOS/OS2-861/islanti)"               ; RTL_TEXTENCODING_IBM_861          ; > ;
-        < "L�nsieurooppalainen (DOS/OS2-863/ranska (Kanada))"   ; RTL_TEXTENCODING_IBM_863          ; > ;
-        < "L�nsieurooppalainen (DOS/OS2-865/pohjoismaat)"               ; RTL_TEXTENCODING_IBM_865          ; > ;
-        < "L�nsieurooppalainen (ASCII/US)"                          ; RTL_TEXTENCODING_ASCII_US         ; > ;
-        < "L�nsieurooppalainen (ISO-8859-1)"                            ; RTL_TEXTENCODING_ISO_8859_1       ; > ;
-        < "It�eurooppalainen (ISO-8859-2)"                          ; RTL_TEXTENCODING_ISO_8859_2       ; > ;
-        < "Latin 3 (ISO-8859-3)"                            ; RTL_TEXTENCODING_ISO_8859_3       ; > ;
-        < "Balttialainen (ISO-8859-4)"                          ; RTL_TEXTENCODING_ISO_8859_4       ; > ;
-        < "Kyrilinen (ISO-8859-5)"                          ; RTL_TEXTENCODING_ISO_8859_5       ; > ;
+         < "L�nsi-Eurooppa (Windows-1252/WinLatin 1)"           ; RTL_TEXTENCODING_MS_1252          ; > ;
+        < "L�nsi-Eurooppa (Apple Macintosh)"                    ; RTL_TEXTENCODING_APPLE_ROMAN      ; > ;
+        < "L�nsi-Eurooppa (DOS/OS2-850/kansainv�linen)"         ; RTL_TEXTENCODING_IBM_850          ; > ;
+        < "L�nsi-Eurooppa (DOS/OS2-437/US)"                     ; RTL_TEXTENCODING_IBM_437          ; > ;
+        < "L�nsi-Eurooppa (DOS/OS2-860/portugali)"          ; RTL_TEXTENCODING_IBM_860          ; > ;
+        < "L�nsi-Eurooppa (DOS/OS2-861/islanti)"                ; RTL_TEXTENCODING_IBM_861          ; > ;
+        < "L�nsi-Eurooppa (DOS/OS2-863/ranska (Kanada))"    ; RTL_TEXTENCODING_IBM_863          ; > ;
+        < "L�nsi-Eurooppa (DOS/OS2-865/pohjoismainen)"              ; RTL_TEXTENCODING_IBM_865          ; > ;
+        < "L�nsi-Eurooppa (ASCII/US)"                           ; RTL_TEXTENCODING_ASCII_US         ; > ;
+        < "L�nsi-Eurooppa (ISO-8859-1)"                         ; RTL_TEXTENCODING_ISO_8859_1       ; > ;
+        < "It�-Eurooppa (ISO-8859-2)"                           ; RTL_TEXTENCODING_ISO_8859_2       ; > ;
+        < "Latinalainen 3 (ISO-8859-3)"                         ; RTL_TEXTENCODING_ISO_8859_3       ; > ;
+        < "Baltia (ISO-8859-4)"                         ; RTL_TEXTENCODING_ISO_8859_4       ; > ;
+        < "Kyrillinen (ISO-8859-5)"                         ; RTL_TEXTENCODING_ISO_8859_5       ; > ;
         < "Kreikkalainen (ISO-8859-7)"                          ; RTL_TEXTENCODING_ISO_8859_7       ; > ;
         < "Turkkilainen (ISO-8859-9)"                           ; RTL_TEXTENCODING_ISO_8859_9       ; > ;
-        < "L�nsieurooppalainen (ISO-8859-14)"                       ; RTL_TEXTENCODING_ISO_8859_14      ; > ;
-        < "L�nsieurooppalainen (ISO-8859-15/EURO)"                  ; RTL_TEXTENCODING_ISO_8859_15      ; > ;
+        < "L�nsi-Eurooppa (ISO-8859-14)"                        ; RTL_TEXTENCODING_ISO_8859_14      ; > ;
+        < "L�nsi-Eurooppa (ISO-8859-15/EURO)"                   ; RTL_TEXTENCODING_ISO_8859_15      ; > ;
         < "Kreikkalainen (DOS/OS2-737)"                     ; RTL_TEXTENCODING_IBM_737          ; > ;
-        < "Balttialainen (DOS/OS2-775)"                         ; RTL_TEXTENCODING_IBM_775          ; > ;
-        < "It�eurooppalainen (DOS/OS2-852)"                         ; RTL_TEXTENCODING_IBM_852          ; > ;
-        < "Kyrilinen (DOS/OS2-855)"                     ; RTL_TEXTENCODING_IBM_855          ; > ;
+        < "Baltia (DOS/OS2-775)"                            ; RTL_TEXTENCODING_IBM_775          ; > ;
+        < "It�-Eurooppa (DOS/OS2-852)"                          ; RTL_TEXTENCODING_IBM_852          ; > ;
+        < "Kyrillinen (DOS/OS2-855)"                        ; RTL_TEXTENCODING_IBM_855          ; > ;
         < "Turkkilainen (DOS/OS2-857)"                          ; RTL_TEXTENCODING_IBM_857          ; > ;
-        < "Kyrilinen (DOS/OS2-866/ven�j�l�inen)"                ; RTL_TEXTENCODING_IBM_866          ; > ;
-        < "Kreikkalainen (DOS/OS2-869/moderni)"                 ; RTL_TEXTENCODING_IBM_869          ; > ;
-        < "It�eurooppalainen (Windows-1250/WinLatin 2)"             ; RTL_TEXTENCODING_MS_1250          ; > ;
-        < "Kyrilinen (Windows-1251)"                        ; RTL_TEXTENCODING_MS_1251          ; > ;
+        < "Kyrillinen (DOS/OS2-866/ven�j�)"             ; RTL_TEXTENCODING_IBM_866          ; > ;
+        < "Kreikkalainen (DOS/OS2-869/nykyaikainen)"                    ; RTL_TEXTENCODING_IBM_869          ; > ;
+        < "It�-Eurooppa (Windows-1250/WinLatin 2)"              ; RTL_TEXTENCODING_MS_1250          ; > ;
+        < "Kyrillinen (Windows-1251)"                       ; RTL_TEXTENCODING_MS_1251          ; > ;
         < "Kreikkalainen (Windows-1253)"                        ; RTL_TEXTENCODING_MS_1253          ; > ;
         < "Turkkilainen (Windows-1254)"                         ; RTL_TEXTENCODING_MS_1254          ; > ;
-        < "Balttialainen (Windows-1257)"                            ; RTL_TEXTENCODING_MS_1257          ; > ;
-        < "It�eurooppalainen (Apple Macintosh)"                     ; RTL_TEXTENCODING_APPLE_CENTEURO   ; > ;
-        < "It�eurooppalainen (Apple Macintosh/kroatialainen)"           ; RTL_TEXTENCODING_APPLE_CROATIAN   ; > ;
-        < "Kyrilinen (Apple Macintosh)"                 ; RTL_TEXTENCODING_APPLE_CYRILLIC   ; > ;
+        < "Baltia (Windows-1257)"                           ; RTL_TEXTENCODING_MS_1257          ; > ;
+        < "It�-Eurooppa (Apple Macintosh)"                      ; RTL_TEXTENCODING_APPLE_CENTEURO   ; > ;
+        < "It�-Eurooppa (Apple Macintosh/kroatia)"          ; RTL_TEXTENCODING_APPLE_CROATIAN   ; > ;
+        < "Kyrillinen (Apple Macintosh)"                    ; RTL_TEXTENCODING_APPLE_CYRILLIC   ; > ;
         < "Kreikkalainen (Apple Macintosh)"                 ; RTL_TEXTENCODING_APPLE_GREEK      ; > ;
-        < "L�nsieurooppalainen (Apple Macintosh/islantilainen)"         ; RTL_TEXTENCODING_APPLE_ICELAND    ; > ;
-        < "It�eurooppalainen (Apple Macintosh/romanialainen)"           ; RTL_TEXTENCODING_APPLE_ROMANIAN   ; > ;
+        < "L�nsieurooppa (Apple Macintosh/islanti)"         ; RTL_TEXTENCODING_APPLE_ICELAND    ; > ;
+        < "It�-Eurooppa (Apple Macintosh/romania)"          ; RTL_TEXTENCODING_APPLE_ROMANIAN   ; > ;
         < "Turkkilainen (Apple Macintosh)"                      ; RTL_TEXTENCODING_APPLE_TURKISH    ; > ;
-        < "Kyrilinen (Apple Macintosh/ukrainalainen)"           ; RTL_TEXTENCODING_APPLE_UKRAINIAN  ; > ;
-        < "Yksinkertaistettu kiinalainen (Apple Macintosh)"     ; RTL_TEXTENCODING_APPLE_CHINSIMP   ; > ;
-        < "Yksinkertaistettu kiinalainen (Apple Macintosh)"     ; RTL_TEXTENCODING_APPLE_CHINTRAD   ; > ;
+        < "Kyrillinen (Apple Macintosh/ukraina)"            ; RTL_TEXTENCODING_APPLE_UKRAINIAN  ; > ;
+        < "Yksinkertaistettu kiina (Apple Macintosh)"       ; RTL_TEXTENCODING_APPLE_CHINSIMP   ; > ;
+        < "Perinteinen kiina (Apple Macintosh)"     ; RTL_TEXTENCODING_APPLE_CHINTRAD   ; > ;
         < "Japanilainen (Apple Macintosh)"                      ; RTL_TEXTENCODING_APPLE_JAPANESE   ; > ;
         < "Korealainen (Apple Macintosh)"                   ; RTL_TEXTENCODING_APPLE_KOREAN     ; > ;
         < "Japanilainen (Windows-932)"                          ; RTL_TEXTENCODING_MS_932           ; > ;
-        < "Yksinkertaistettu kiinalainen (Windows-936)"         ; RTL_TEXTENCODING_MS_936           ; > ;
+        < "Yksinkertaistettu kiina (Windows-936)"           ; RTL_TEXTENCODING_MS_936           ; > ;
         < "Korealainen (Windows-949)"                       ; RTL_TEXTENCODING_MS_949           ; > ;
-        < "Perinteinen kiinalainen (Windows-950)"           ; RTL_TEXTENCODING_MS_950           ; > ;
+        < "Perinteinen kiina (Windows-950)"         ; RTL_TEXTENCODING_MS_950           ; > ;
         < "Japanilainen (Shift-JIS)"                            ; RTL_TEXTENCODING_SHIFT_JIS        ; > ;
-        < "Yksinkertaistettu kiinalainen (GB-2312)"             ; RTL_TEXTENCODING_GB_2312          ; > ;
-        < "Perinteinen kiinalainen (GBT-12345)"               ; RTL_TEXTENCODING_GB_18030         ; > ;
-        < "Yksinkertaistettu kiinalainen (GBK/GB-2312-80)"              ; RTL_TEXTENCODING_GBT_12345        ; > ;
-        < "Perinteinen kiinalainen (BIG5)"          ; RTL_TEXTENCODING_GBK              ; > ;
-        < "Japanilainen (EUC-JP)"                   ; RTL_TEXTENCODING_BIG5             ; > ;
-        < "Yksinkertaistettu kiinalainen (EUC-CN)"            ; RTL_TEXTENCODING_BIG5_HKSCS       ; > ;
-        < "Kyrilinen (KOI8-R)"                              ; RTL_TEXTENCODING_EUC_JP           ; > ;
-        < "Unicode (UTF-7)"                 ; RTL_TEXTENCODING_EUC_CN           ; > ;
-        < "Unicode (UTF-8)"                ; RTL_TEXTENCODING_EUC_TW           ; > ;
-        < "It�eurooppalainen (ISO-8859-10)"                         ; RTL_TEXTENCODING_ISO_2022_JP      ; > ;
-        < "It�eurooppalainen (ISO-8859-13)"            ; RTL_TEXTENCODING_ISO_2022_CN      ; > ;
-        < "Korealainen (EUC-KR)"                                ; RTL_TEXTENCODING_KOI8_R           ; > ;
-        < "Korealainen (Windows-Johab-1361)"                                    ; RTL_TEXTENCODING_UTF7             ; > ;
-        < "Unicode"                                 ; RTL_TEXTENCODING_UTF8             ; > ;
-        < "It�eurooppalainen (ISO-8859-13)"                         ; RTL_TEXTENCODING_ISO_8859_10      ; > ;
-        < "Korealainen (EUC-KR)"                            ; RTL_TEXTENCODING_ISO_8859_13      ; > ;
-        < "Korealainen (ISO-2022-KR)"                               ; RTL_TEXTENCODING_EUC_KR           ; > ;
-        < "Korealainen (Windows-Johab-1361)"                        ; RTL_TEXTENCODING_ISO_2022_KR      ; > ;
+        < "Yksinkertaistettu kiina (GB-2312)"               ; RTL_TEXTENCODING_GB_2312          ; > ;
+        < "Yksinkertaistettu kiina (GB-18030)"               ; RTL_TEXTENCODING_GB_18030         ; > ;
+        < "Perinteinen kiina (GBT-12345)"               ; RTL_TEXTENCODING_GBT_12345        ; > ;
+        < "Yksinkertaistettu kiina (GBK/GB-2312-80)"            ; RTL_TEXTENCODING_GBK              ; > ;
+        < "Perinteinen kiina (BIG5)"                    ; RTL_TEXTENCODING_BIG5             ; > ;
+        < "Perinteinen kiina (BIG5-HKSCS)"            ; RTL_TEXTENCODING_BIG5_HKSCS       ; > ;
+        < "Japanilainen (EUC-JP)"                               ; RTL_TEXTENCODING_EUC_JP           ; > ;
+        < "Yksinkertaistettu kiina (EUC-CN)"                    ; RTL_TEXTENCODING_EUC_CN           ; > ;
+        < "Perinteinen kiina (EUC-TW)"                ; RTL_TEXTENCODING_EUC_TW           ; > ;
+        < "Japanilainen (ISO-2022-JP)"                         ; RTL_TEXTENCODING_ISO_2022_JP      ; > ;
+        < "Yksinkertaistettu kiina (ISO-2022-CN)"            ; RTL_TEXTENCODING_ISO_2022_CN      ; > ;
+        < "Kyrillinen (KOI8-R)"                             ; RTL_TEXTENCODING_KOI8_R           ; > ;
+        < "Unicode (UTF-7)"                                 ; RTL_TEXTENCODING_UTF7             ; > ;
+        < "Unicode (UTF-8)"                                 ; RTL_TEXTENCODING_UTF8             ; > ;
+        < "It�-Eurooppa (ISO-8859-10)"                          ; RTL_TEXTENCODING_ISO_8859_10      ; > ;
+        < "It�-Eurooppa (ISO-8859-13)"                          ; RTL_TEXTENCODING_ISO_8859_13      ; > ;
+        < "Korealainen (EUC-KR)"                                ; RTL_TEXTENCODING_EUC_KR           ; > ;
+        < "Korealainen (ISO-2022-KR)"                        ; RTL_TEXTENCODING_ISO_2022_KR      ; > ;
         < "Korealainen (Windows-Johab-1361)"                    ; RTL_TEXTENCODING_MS_1361          ; > ;
         < "Unicode"                                         ; RTL_TEXTENCODING_UCS2             ; > ;
         < "Thai (ISO-8859-11/TIS-620)"                                  ; RTL_TEXTENCODING_TIS_620          ; > ;
@@ -968,75 +990,82 @@ ItemList [ language_user1 ] =
         < "Unicode"                                         ; RTL_TEXTENCODING_UCS2             ; > ;
         < "Thai (ISO-8859-11/TIS-620)"                                  ; RTL_TEXTENCODING_TIS_620          ; > ;
         < "Thai (Windows-874)"                              ; RTL_TEXTENCODING_MS_874           ; > ;
+        < "Cirillico (KOI8-U)"                              ; RTL_TEXTENCODING_EUC_KR           ; > ;
+        < "Koreanisch (ISO-2022-KR)"                        ; RTL_TEXTENCODING_ISO_2022_KR      ; > ;
+        < "Koreanisch (Windows-Johab-1361)"                 ; RTL_TEXTENCODING_MS_1361          ; > ;
+        < "Unicode"                                         ; RTL_TEXTENCODING_UCS2             ; > ;
+        < "Thai (ISO-8859-11/TIS-620)"                                  ; RTL_TEXTENCODING_TIS_620          ; > ;
+        < "Thai (Windows-874)"                              ; RTL_TEXTENCODING_MS_874           ; > ;
+        < "Kyrillisch (KOI8-U)"                             ; RTL_TEXTENCODING_KOI8_U           ; > ;
     };
     ItemList [ danish ] =
     {
-         < "Westeuropa (Windows-1252/WinLatin 1)"           ; RTL_TEXTENCODING_MS_1252          ; > ;
-        < "Westeuropa (Apple Macintosh)"                    ; RTL_TEXTENCODING_APPLE_ROMAN      ; > ;
-        < "Westeuropa (DOS/OS2-850/International)"          ; RTL_TEXTENCODING_IBM_850          ; > ;
-        < "Westeuropa (DOS/OS2-437/US)"                     ; RTL_TEXTENCODING_IBM_437          ; > ;
-        < "Westeuropa (DOS/OS2-860/Portugiesisch)"          ; RTL_TEXTENCODING_IBM_860          ; > ;
-        < "Westeuropa (DOS/OS2-861/Isl�ndisch)"             ; RTL_TEXTENCODING_IBM_861          ; > ;
-        < "Westeuropa (DOS/OS2-863/Franz�sisch (Kand.))"    ; RTL_TEXTENCODING_IBM_863          ; > ;
-        < "Westeuropa (DOS/OS2-865/Nordisch)"               ; RTL_TEXTENCODING_IBM_865          ; > ;
-        < "Westeuropa (ASCII/US)"                           ; RTL_TEXTENCODING_ASCII_US         ; > ;
-        < "Westeuropa (ISO-8859-1)"                         ; RTL_TEXTENCODING_ISO_8859_1       ; > ;
-        < "Osteuropa (ISO-8859-2)"                          ; RTL_TEXTENCODING_ISO_8859_2       ; > ;
+         < "Vesteuropa (Windows-1252/WinLatin 1)"           ; RTL_TEXTENCODING_MS_1252          ; > ;
+        < "Vesteuropa (Apple Macintosh)"                    ; RTL_TEXTENCODING_APPLE_ROMAN      ; > ;
+        < "Vesteuropa (DOS/OS2-850/International)"          ; RTL_TEXTENCODING_IBM_850          ; > ;
+        < "Vesteuropa (DOS/OS2-437/US)"                     ; RTL_TEXTENCODING_IBM_437          ; > ;
+        < "Vesteuropa (DOS/OS2-860/portugisisk)"            ; RTL_TEXTENCODING_IBM_860          ; > ;
+        < "Vesteuropa (DOS/OS2-861/Islandsk)"               ; RTL_TEXTENCODING_IBM_861          ; > ;
+        < "Vesteuropa (DOS/OS2-863/Fransk (Cand.))" ; RTL_TEXTENCODING_IBM_863          ; > ;
+        < "Vesteuropa (DOS/OS2-865/Nordisk)"                ; RTL_TEXTENCODING_IBM_865          ; > ;
+        < "Vesteuropa (ASCII/US)"                           ; RTL_TEXTENCODING_ASCII_US         ; > ;
+        < "Vesteuropa (ISO-8859-1)"                         ; RTL_TEXTENCODING_ISO_8859_1       ; > ;
+        < "�steuropa (ISO-8859-2)"                          ; RTL_TEXTENCODING_ISO_8859_2       ; > ;
         < "Latin 3 (ISO-8859-3)"                            ; RTL_TEXTENCODING_ISO_8859_3       ; > ;
-        < "Baltisch (ISO-8859-4)"                           ; RTL_TEXTENCODING_ISO_8859_4       ; > ;
-        < "Kyrillisch (ISO-8859-5)"                         ; RTL_TEXTENCODING_ISO_8859_5       ; > ;
-        < "Griechisch (ISO-8859-7)"                         ; RTL_TEXTENCODING_ISO_8859_7       ; > ;
-        < "T�rkisch (ISO-8859-9)"                           ; RTL_TEXTENCODING_ISO_8859_9       ; > ;
-        < "Westeuropa (ISO-8859-14)"                        ; RTL_TEXTENCODING_ISO_8859_14      ; > ;
-        < "Westeuropa (ISO-8859-15/EURO)"                   ; RTL_TEXTENCODING_ISO_8859_15      ; > ;
-        < "Griechisch (DOS/OS2-737)"                        ; RTL_TEXTENCODING_IBM_737          ; > ;
-        < "Baltisch (DOS/OS2-775)"                          ; RTL_TEXTENCODING_IBM_775          ; > ;
-        < "Osteuropa (DOS/OS2-852)"                         ; RTL_TEXTENCODING_IBM_852          ; > ;
-        < "Kyrillisch (DOS/OS2-855)"                        ; RTL_TEXTENCODING_IBM_855          ; > ;
-        < "T�rkisch (DOS/OS2-857)"                          ; RTL_TEXTENCODING_IBM_857          ; > ;
-        < "Kyrillisch (DOS/OS2-866/Russisch)"               ; RTL_TEXTENCODING_IBM_866          ; > ;
-        < "Griechisch (DOS/OS2-869/Modern)"                 ; RTL_TEXTENCODING_IBM_869          ; > ;
-        < "Osteuropa (Windows-1250/WinLatin 2)"             ; RTL_TEXTENCODING_MS_1250          ; > ;
-        < "Kyrillisch (Windows-1251)"                       ; RTL_TEXTENCODING_MS_1251          ; > ;
-        < "Griechisch (Windows-1253)"                       ; RTL_TEXTENCODING_MS_1253          ; > ;
-        < "T�rkisch (Windows-1254)"                         ; RTL_TEXTENCODING_MS_1254          ; > ;
-        < "Baltisch (Windows-1257)"                         ; RTL_TEXTENCODING_MS_1257          ; > ;
-        < "Osteuropa (Apple Macintosh)"                     ; RTL_TEXTENCODING_APPLE_CENTEURO   ; > ;
-        < "Osteuropa (Apple Macintosh/Kroatisch)"           ; RTL_TEXTENCODING_APPLE_CROATIAN   ; > ;
-        < "Kyrillisch (Apple Macintosh)"                    ; RTL_TEXTENCODING_APPLE_CYRILLIC   ; > ;
-        < "Griechisch (Apple Macintosh)"                    ; RTL_TEXTENCODING_APPLE_GREEK      ; > ;
-        < "Westeuropa (Apple Macintosh/Isl�ndisch)"         ; RTL_TEXTENCODING_APPLE_ICELAND    ; > ;
-        < "Osteuropa (Apple Macintosh/Rum�nisch)"           ; RTL_TEXTENCODING_APPLE_ROMANIAN   ; > ;
-        < "T�rkisch (Apple Macintosh)"                      ; RTL_TEXTENCODING_APPLE_TURKISH    ; > ;
-        < "Kyrillisch (Apple Macintosh/Ukrainisch)"         ; RTL_TEXTENCODING_APPLE_UKRAINIAN  ; > ;
-        < "Chinesisch vereinfacht (Apple Macintosh)"        ; RTL_TEXTENCODING_APPLE_CHINSIMP   ; > ;
-        < "Chinesisch traditionell (Apple Macintosh)"       ; RTL_TEXTENCODING_APPLE_CHINTRAD   ; > ;
-        < "Japanisch (Apple Macintosh)"                     ; RTL_TEXTENCODING_APPLE_JAPANESE   ; > ;
-        < "Koreanisch (Apple Macintosh)"                    ; RTL_TEXTENCODING_APPLE_KOREAN     ; > ;
-        < "Japanisch (Windows-932)"                         ; RTL_TEXTENCODING_MS_932           ; > ;
-        < "Chinesisch vereinfacht (Windows-936)"            ; RTL_TEXTENCODING_MS_936           ; > ;
-        < "Koreanisch (Windows-949)"                        ; RTL_TEXTENCODING_MS_949           ; > ;
-        < "Chinesisch traditionell (Windows-950)"           ; RTL_TEXTENCODING_MS_950           ; > ;
-        < "Japanisch (Shift-JIS)"                           ; RTL_TEXTENCODING_SHIFT_JIS        ; > ;
-        < "Chinesisch vereinfacht (GB-2312)"                ; RTL_TEXTENCODING_GB_2312          ; > ;
-        < "Chinesisch traditionell (GBT-12345)"               ; RTL_TEXTENCODING_GB_18030         ; > ;
-        < "Chinesisch vereinfacht (GBK/GB-2312-80)"             ; RTL_TEXTENCODING_GBT_12345        ; > ;
-        < "Chinesisch traditionell (BIG5)"          ; RTL_TEXTENCODING_GBK              ; > ;
-        < "Japanisch (EUC-JP)"                  ; RTL_TEXTENCODING_BIG5             ; > ;
-        < "Chinesisch vereinfacht (EUC-CN)"            ; RTL_TEXTENCODING_BIG5_HKSCS       ; > ;
-        < "Kyrillisch (KOI8-R)"                             ; RTL_TEXTENCODING_EUC_JP           ; > ;
+        < "Baltisk (ISO-8859-4)"                            ; RTL_TEXTENCODING_ISO_8859_4       ; > ;
+        < "Kyrillisk (ISO-8859-5)"                          ; RTL_TEXTENCODING_ISO_8859_5       ; > ;
+        < "Gr�sk (ISO-8859-7)"                          ; RTL_TEXTENCODING_ISO_8859_7       ; > ;
+        < "Tyrkisk (ISO-8859-9)"                            ; RTL_TEXTENCODING_ISO_8859_9       ; > ;
+        < "Vesteuropa (ISO-8859-14)"                        ; RTL_TEXTENCODING_ISO_8859_14      ; > ;
+        < "Vesteuropa (ISO-8859-15/EURO)"                   ; RTL_TEXTENCODING_ISO_8859_15      ; > ;
+        < "Gr�sk (DOS/OS2-737)"                     ; RTL_TEXTENCODING_IBM_737          ; > ;
+        < "Baltisk (DOS/OS2-775)"                           ; RTL_TEXTENCODING_IBM_775          ; > ;
+        < "�steuropa (DOS/OS2-852)"                         ; RTL_TEXTENCODING_IBM_852          ; > ;
+        < "Kyrillisk (DOS/OS2-855)"                     ; RTL_TEXTENCODING_IBM_855          ; > ;
+        < "Tyrkisk (DOS/OS2-857)"                           ; RTL_TEXTENCODING_IBM_857          ; > ;
+        < "Kyrillisk (DOS/OS2-866/Russisk)"             ; RTL_TEXTENCODING_IBM_866          ; > ;
+        < "Gr�sk (DOS/OS2-869/Moderne)"                 ; RTL_TEXTENCODING_IBM_869          ; > ;
+        < "�steuropa (Windows-1250/WinLatin 2)"             ; RTL_TEXTENCODING_MS_1250          ; > ;
+        < "Kyrillisk (Windows-1251)"                        ; RTL_TEXTENCODING_MS_1251          ; > ;
+        < "Gr�sk (Windows-1253)"                        ; RTL_TEXTENCODING_MS_1253          ; > ;
+        < "Tyrkisk (Windows-1254)"                          ; RTL_TEXTENCODING_MS_1254          ; > ;
+        < "Baltisk (Windows-1257)"                          ; RTL_TEXTENCODING_MS_1257          ; > ;
+        < "�steuropa (Apple Macintosh)"                     ; RTL_TEXTENCODING_APPLE_CENTEURO   ; > ;
+        < "�steuropa (Apple Macintosh/Kroatisk)"            ; RTL_TEXTENCODING_APPLE_CROATIAN   ; > ;
+        < "Kyrillisk (Apple Macintosh)"                 ; RTL_TEXTENCODING_APPLE_CYRILLIC   ; > ;
+        < "Gr�sk (Apple Macintosh)"                 ; RTL_TEXTENCODING_APPLE_GREEK      ; > ;
+        < "Vesteuropa (Apple Macintosh/Islandsk)"           ; RTL_TEXTENCODING_APPLE_ICELAND    ; > ;
+        < "�steuropa (Apple Macintosh/Rum�nsk)"         ; RTL_TEXTENCODING_APPLE_ROMANIAN   ; > ;
+        < "Tyrkisk (Apple Macintosh)"                       ; RTL_TEXTENCODING_APPLE_TURKISH    ; > ;
+        < "Kyrillisk (Apple Macintosh/Ukrainsk)"            ; RTL_TEXTENCODING_APPLE_UKRAINIAN  ; > ;
+        < "Forenklet kinesisk (Apple Macintosh)"        ; RTL_TEXTENCODING_APPLE_CHINSIMP   ; > ;
+        < "Kinesisk traditionelt (Apple Macintosh)"     ; RTL_TEXTENCODING_APPLE_CHINTRAD   ; > ;
+        < "Japansk (Apple Macintosh)"                       ; RTL_TEXTENCODING_APPLE_JAPANESE   ; > ;
+        < "Koreansk (Apple Macintosh)"                  ; RTL_TEXTENCODING_APPLE_KOREAN     ; > ;
+        < "Japansk (Windows-932)"                           ; RTL_TEXTENCODING_MS_932           ; > ;
+        < "Forenklet kinesisk (Windows-936)"            ; RTL_TEXTENCODING_MS_936           ; > ;
+        < "Koreansk (Windows-949)"                      ; RTL_TEXTENCODING_MS_949           ; > ;
+        < "Kinesisk traditionelt (Windows-950)"         ; RTL_TEXTENCODING_MS_950           ; > ;
+        < "Japansk (Shift-JIS)"                         ; RTL_TEXTENCODING_SHIFT_JIS        ; > ;
+        < "Forenklet kinesisk (GB-2312)"                ; RTL_TEXTENCODING_GB_2312          ; > ;
+        < "Kinesisk traditionelt (GBT-12345)"               ; RTL_TEXTENCODING_GB_18030         ; > ;
+        < "Forenklet kinesisk (GBK/GB-2312-80)"             ; RTL_TEXTENCODING_GBT_12345        ; > ;
+        < "Kinesisk traditionelt (BIG5)"            ; RTL_TEXTENCODING_GBK              ; > ;
+        < "Japansk (EUC-JP)"                    ; RTL_TEXTENCODING_BIG5             ; > ;
+        < "Forenklet kinesisk (EUC-CN)"            ; RTL_TEXTENCODING_BIG5_HKSCS       ; > ;
+        < "Kyrillisk (KOI8-R)"                              ; RTL_TEXTENCODING_EUC_JP           ; > ;
         < "Unicode (UTF-7)"                 ; RTL_TEXTENCODING_EUC_CN           ; > ;
         < "Unicode (UTF-8)"                ; RTL_TEXTENCODING_EUC_TW           ; > ;
-        < "Osteuropa (ISO-8859-10)"                         ; RTL_TEXTENCODING_ISO_2022_JP      ; > ;
-        < "Osteuropa (ISO-8859-13)"            ; RTL_TEXTENCODING_ISO_2022_CN      ; > ;
-        < "Koreanisch (EUC-KR)"                             ; RTL_TEXTENCODING_KOI8_R           ; > ;
-        < "Koreanisch (Windows-Johab-1361)"                                 ; RTL_TEXTENCODING_UTF7             ; > ;
+        < "�steuropa (ISO-8859-10)"                         ; RTL_TEXTENCODING_ISO_2022_JP      ; > ;
+        < "�steuropa (ISO-8859-13)"            ; RTL_TEXTENCODING_ISO_2022_CN      ; > ;
+        < "Koreansk (EUC-KR)"                               ; RTL_TEXTENCODING_KOI8_R           ; > ;
+        < "Koreansk (Windows-Johab-1361)"                                   ; RTL_TEXTENCODING_UTF7             ; > ;
         < "Unicode"                                 ; RTL_TEXTENCODING_UTF8             ; > ;
-        < "Osteuropa (ISO-8859-10)"                         ; RTL_TEXTENCODING_ISO_8859_10      ; > ;
-        < "Osteuropa (ISO-8859-13)"                         ; RTL_TEXTENCODING_ISO_8859_13      ; > ;
-        < "Koreanisch (EUC-KR)"                             ; RTL_TEXTENCODING_EUC_KR           ; > ;
-        < "Koreanisch (ISO-2022-KR)"                        ; RTL_TEXTENCODING_ISO_2022_KR      ; > ;
-        < "Koreanisch (Windows-Johab-1361)"                 ; RTL_TEXTENCODING_MS_1361          ; > ;
+        < "�steuropa (ISO-8859-10)"                         ; RTL_TEXTENCODING_ISO_8859_10      ; > ;
+        < "�steuropa (ISO-8859-13)"                         ; RTL_TEXTENCODING_ISO_8859_13      ; > ;
+        < "Koreansk (EUC-KR)"                               ; RTL_TEXTENCODING_EUC_KR           ; > ;
+        < "Koreansk (ISO-2022-KR)"                        ; RTL_TEXTENCODING_ISO_2022_KR      ; > ;
+        < "Koreansk (Windows-Johab-1361)"                   ; RTL_TEXTENCODING_MS_1361          ; > ;
         < "Unicode"                                         ; RTL_TEXTENCODING_UCS2             ; > ;
         < "Thai (ISO-8859-11/TIS-620)"                                  ; RTL_TEXTENCODING_TIS_620          ; > ;
         < "Thai (Windows-874)"                              ; RTL_TEXTENCODING_MS_874           ; > ;
@@ -1112,6 +1141,13 @@ ItemList [ language_user1 ] =
         < "Unicode"                                         ; RTL_TEXTENCODING_UCS2             ; > ;
         < "Thai (ISO-8859-11/TIS-620)"                                  ; RTL_TEXTENCODING_TIS_620          ; > ;
         < "Thai (Windows-874)"                              ; RTL_TEXTENCODING_MS_874           ; > ;
+        < "Kyrillisk (KOI8-U)"                              ; RTL_TEXTENCODING_EUC_KR           ; > ;
+        < "Koreanisch (ISO-2022-KR)"                        ; RTL_TEXTENCODING_ISO_2022_KR      ; > ;
+        < "Koreanisch (Windows-Johab-1361)"                 ; RTL_TEXTENCODING_MS_1361          ; > ;
+        < "Unicode"                                         ; RTL_TEXTENCODING_UCS2             ; > ;
+        < "Thai (ISO-8859-11/TIS-620)"                                  ; RTL_TEXTENCODING_TIS_620          ; > ;
+        < "Thai (Windows-874)"                              ; RTL_TEXTENCODING_MS_874           ; > ;
+        < "Kyrillisch (KOI8-U)"                             ; RTL_TEXTENCODING_KOI8_U           ; > ;
     };
     ItemList [ polish ] =
     {
@@ -1328,6 +1364,13 @@ ItemList [ language_user1 ] =
         < "Unicode"                                         ; RTL_TEXTENCODING_UCS2             ; > ;
         < "タイ語 (ISO-8859-11/TIS-620)"                                  ; RTL_TEXTENCODING_TIS_620          ; > ;
         < "タイ語 (Windows-874)"                             ; RTL_TEXTENCODING_MS_874           ; > ;
+        < "Koreanisch (EUC-KR)"                             ; RTL_TEXTENCODING_EUC_KR           ; > ;
+        < "Koreanisch (ISO-2022-KR)"                        ; RTL_TEXTENCODING_ISO_2022_KR      ; > ;
+        < "Koreanisch (Windows-Johab-1361)"                 ; RTL_TEXTENCODING_MS_1361          ; > ;
+        < "Unicode"                                         ; RTL_TEXTENCODING_UCS2             ; > ;
+        < "Thai (ISO-8859-11/TIS-620)"                                  ; RTL_TEXTENCODING_TIS_620          ; > ;
+        < "Thai (Windows-874)"                              ; RTL_TEXTENCODING_MS_874           ; > ;
+        < "Kyrillisch (KOI8-U)"                             ; RTL_TEXTENCODING_KOI8_U           ; > ;
     };
     ItemList [ korean ] =
     {
@@ -1337,14 +1380,14 @@ ItemList [ language_user1 ] =
         < "서유럽 (DOS/OS2-437/US)"                      ; RTL_TEXTENCODING_IBM_437          ; > ;
         < "서유럽 (DOS/OS2-860/포르투칼어)"         ; RTL_TEXTENCODING_IBM_860          ; > ;
         < "서유럽 (DOS/OS2-861/아이슬랜드어)"              ; RTL_TEXTENCODING_IBM_861          ; > ;
-        < "서유럽 (DOS/OS2-863/프랑스어 (캐나다)))"   ; RTL_TEXTENCODING_IBM_863          ; > ;
+        < "서유럽 (DOS/OS2-863/프랑스어 (캐나다))"    ; RTL_TEXTENCODING_IBM_863          ; > ;
         < "서유럽 (DOS/OS2-865/북유럽어)"                ; RTL_TEXTENCODING_IBM_865          ; > ;
         < "서유럽 (ASCII/US)"                            ; RTL_TEXTENCODING_ASCII_US         ; > ;
         < "서유럽 (ISO-8859-1)"                          ; RTL_TEXTENCODING_ISO_8859_1       ; > ;
         < "동유럽 (ISO-8859-2)"                          ; RTL_TEXTENCODING_ISO_8859_2       ; > ;
         < "라틴 3 (ISO-8859-3)"                           ; RTL_TEXTENCODING_ISO_8859_3       ; > ;
         < "발트어 (ISO-8859-4)"                          ; RTL_TEXTENCODING_ISO_8859_4       ; > ;
-        < "키릴 (ISO-8859-5)"                         ; RTL_TEXTENCODING_ISO_8859_5       ; > ;
+        < "키릴어 (ISO-8859-5)"                          ; RTL_TEXTENCODING_ISO_8859_5       ; > ;
         < "그리스어 (ISO-8859-7)"                           ; RTL_TEXTENCODING_ISO_8859_7       ; > ;
         < "터어키어 (ISO-8859-9)"                           ; RTL_TEXTENCODING_ISO_8859_9       ; > ;
         < "서유럽 (ISO-8859-14)"                     ; RTL_TEXTENCODING_ISO_8859_14      ; > ;
@@ -1352,23 +1395,23 @@ ItemList [ language_user1 ] =
         < "그리스어 (DOS/OS2-737)"                      ; RTL_TEXTENCODING_IBM_737          ; > ;
         < "발트어 (DOS/OS2-775)"                         ; RTL_TEXTENCODING_IBM_775          ; > ;
         < "동유럽 (DOS/OS2-852)"                         ; RTL_TEXTENCODING_IBM_852          ; > ;
-        < "키릴 (DOS/OS2-855)"                        ; RTL_TEXTENCODING_IBM_855          ; > ;
+        < "키릴어 (DOS/OS2-855)"                         ; RTL_TEXTENCODING_IBM_775          ; > ;
         < "터어키어 (DOS/OS2-857)"                          ; RTL_TEXTENCODING_IBM_857          ; > ;
-        < "키릴 (DOS/OS2-866/러시아어)"               ; RTL_TEXTENCODING_IBM_866          ; > ;
+        < "키릴어 (DOS/OS2-866/러시아어)"                        ; RTL_TEXTENCODING_IBM_855          ; > ;
         < "그리스어 (DOS/OS2-869/현대)"                   ; RTL_TEXTENCODING_IBM_869          ; > ;
         < "동유럽 (Windows-1250/WinLatin 2)"             ; RTL_TEXTENCODING_MS_1250          ; > ;
-        < "키릴 (Windows-1251)"                       ; RTL_TEXTENCODING_MS_1251          ; > ;
+        < "키릴어 (Windows-1251)"                            ; RTL_TEXTENCODING_IBM_864          ; > ;
         < "그리스어 (Windows-1253)"                     ; RTL_TEXTENCODING_MS_1253          ; > ;
         < "터어키어 (Windows-1254)"                         ; RTL_TEXTENCODING_MS_1254          ; > ;
         < "발트어 (Windows-1257)"                            ; RTL_TEXTENCODING_MS_1257          ; > ;
         < "동유럽 (Apple Macintosh)"                     ; RTL_TEXTENCODING_APPLE_CENTEURO   ; > ;
         < "동유럽 (Apple Macintosh/크로아티아어)"          ; RTL_TEXTENCODING_APPLE_CROATIAN   ; > ;
-        < "키릴 (Apple Macintosh)"                    ; RTL_TEXTENCODING_APPLE_CYRILLIC   ; > ;
+        < "키릴어 (Apple Macintosh)"                         ; RTL_TEXTENCODING_MS_1254          ; > ;
         < "그리스어 (Apple Macintosh)"                  ; RTL_TEXTENCODING_APPLE_GREEK      ; > ;
         < "서유럽 (Apple Macintosh/아이슬랜드어)"          ; RTL_TEXTENCODING_APPLE_ICELAND    ; > ;
         < "동유럽 (Apple Macintosh/루마니아어)"         ; RTL_TEXTENCODING_APPLE_ROMANIAN   ; > ;
         < "터어키어 (Apple Macintosh)"                      ; RTL_TEXTENCODING_APPLE_TURKISH    ; > ;
-        < "키릴 (Apple Macintosh/우크라이나어)"         ; RTL_TEXTENCODING_APPLE_UKRAINIAN  ; > ;
+        < "키릴어 (Apple Macintosh/우크라이나어)"          ; RTL_TEXTENCODING_APPLE_CROATIAN   ; > ;
         < "중국어 간체 (Apple Macintosh)"      ; RTL_TEXTENCODING_APPLE_CHINSIMP   ; > ;
         < "중국어 전통 (Apple Macintosh)"      ; RTL_TEXTENCODING_APPLE_CHINTRAD   ; > ;
         < "일본어 (Apple Macintosh)"                     ; RTL_TEXTENCODING_APPLE_JAPANESE   ; > ;
@@ -1376,7 +1419,7 @@ ItemList [ language_user1 ] =
         < "일본어 (Windows-932)"                         ; RTL_TEXTENCODING_MS_932           ; > ;
         < "중국어 간체 (Windows-936)"          ; RTL_TEXTENCODING_MS_936           ; > ;
         < "한국어 (Windows-949)"                     ; RTL_TEXTENCODING_MS_949           ; > ;
-        < "중국어 전통 (Windows-950)"          ; RTL_TEXTENCODING_MS_950           ; > ;
+        < "중국어 번체(Windows-950)"           ; RTL_TEXTENCODING_MS_950           ; > ;
         < "일본어 (Shift-JIS)"                           ; RTL_TEXTENCODING_SHIFT_JIS        ; > ;
         < "중국어 간체 (GB-2312)"              ; RTL_TEXTENCODING_GB_2312          ; > ;
         < "중국어 간체 (GB-18030)"               ; RTL_TEXTENCODING_GB_18030         ; > ;
@@ -1390,7 +1433,7 @@ ItemList [ language_user1 ] =
         < "일본어 (ISO-2022-JP)"                         ; RTL_TEXTENCODING_ISO_2022_JP      ; > ;
         < "중국어 간체 (ISO-2022-CN)"            ; RTL_TEXTENCODING_ISO_2022_CN      ; > ;
         < "키릴어 (KOI8-R)"                              ; RTL_TEXTENCODING_KOI8_R           ; > ;
-        < "유니 코드 (UTF-7)"                                   ; RTL_TEXTENCODING_UTF7             ; > ;
+        < "유니코드 (UTF-7)"                                ; RTL_TEXTENCODING_EUC_JP           ; > ;
         < "유니코드 (UTF-8) "                                   ; RTL_TEXTENCODING_UTF8             ; > ;
         < "동유럽 (ISO-8859-10)"                         ; RTL_TEXTENCODING_ISO_8859_10      ; > ;
         < "동유럽(ISO-8859-13)"                          ; RTL_TEXTENCODING_ISO_8859_13      ; > ;
@@ -1398,8 +1441,15 @@ ItemList [ language_user1 ] =
         < "한국어 (ISO-2022-KR)"                        ; RTL_TEXTENCODING_ISO_2022_KR      ; > ;
         < "한국어 (Windows-Johab-1361)"                  ; RTL_TEXTENCODING_MS_1361          ; > ;
         < "유니코드"                                            ; RTL_TEXTENCODING_UCS2             ; > ;
-        < "타이어 (ISO-8859-11/TIS-620)"                                  ; RTL_TEXTENCODING_TIS_620          ; > ;
-        < "타이어 (Windows-874)"                             ; RTL_TEXTENCODING_MS_874           ; > ;
+        < "태국어 (ISO-8859-11/TIS-620)"                         ; RTL_TEXTENCODING_ISO_8859_10      ; > ;
+        < "태국어 (Windows-874)"                         ; RTL_TEXTENCODING_ISO_8859_13      ; > ;
+        < "키릴어 (KOI8-U)"                              ; RTL_TEXTENCODING_EUC_KR           ; > ;
+        < "Koreanisch (ISO-2022-KR)"                        ; RTL_TEXTENCODING_ISO_2022_KR      ; > ;
+        < "Koreanisch (Windows-Johab-1361)"                 ; RTL_TEXTENCODING_MS_1361          ; > ;
+        < "Unicode"                                         ; RTL_TEXTENCODING_UCS2             ; > ;
+        < "Thai (ISO-8859-11/TIS-620)"                                  ; RTL_TEXTENCODING_TIS_620          ; > ;
+        < "Thai (Windows-874)"                              ; RTL_TEXTENCODING_MS_874           ; > ;
+        < "Kyrillisch (KOI8-U)"                             ; RTL_TEXTENCODING_KOI8_U           ; > ;
     };
     ItemList [ chinese_simplified ] =
     {
@@ -1472,6 +1522,13 @@ ItemList [ language_user1 ] =
         < "统一码"                                           ; RTL_TEXTENCODING_UCS2             ; > ;
         < "泰语 (ISO-8859-11/TIS-620)"                                  ; RTL_TEXTENCODING_TIS_620          ; > ;
         < "泰语 (Windows-874)"                                ; RTL_TEXTENCODING_MS_874           ; > ;
+        < "西里尔语(KOI8-U)"                                ; RTL_TEXTENCODING_EUC_KR           ; > ;
+        < "Koreanisch (ISO-2022-KR)"                        ; RTL_TEXTENCODING_ISO_2022_KR      ; > ;
+        < "Koreanisch (Windows-Johab-1361)"                 ; RTL_TEXTENCODING_MS_1361          ; > ;
+        < "Unicode"                                         ; RTL_TEXTENCODING_UCS2             ; > ;
+        < "Thai (ISO-8859-11/TIS-620)"                                  ; RTL_TEXTENCODING_TIS_620          ; > ;
+        < "Thai (Windows-874)"                              ; RTL_TEXTENCODING_MS_874           ; > ;
+        < "Kyrillisch (KOI8-U)"                             ; RTL_TEXTENCODING_KOI8_U           ; > ;
     };
     ItemList [ chinese_traditional ] =
     {
@@ -1544,6 +1601,13 @@ ItemList [ language_user1 ] =
         < "統一碼"                                           ; RTL_TEXTENCODING_UCS2             ; > ;
         < "泰語 (ISO-8859-11/TIS-620)"                                  ; RTL_TEXTENCODING_TIS_620          ; > ;
         < "泰語 (Windows-874)"                                ; RTL_TEXTENCODING_MS_874           ; > ;
+        < "西里爾語 (KOI8-U)"                               ; RTL_TEXTENCODING_EUC_KR           ; > ;
+        < "Koreanisch (ISO-2022-KR)"                        ; RTL_TEXTENCODING_ISO_2022_KR      ; > ;
+        < "Koreanisch (Windows-Johab-1361)"                 ; RTL_TEXTENCODING_MS_1361          ; > ;
+        < "Unicode"                                         ; RTL_TEXTENCODING_UCS2             ; > ;
+        < "Thai (ISO-8859-11/TIS-620)"                                  ; RTL_TEXTENCODING_TIS_620          ; > ;
+        < "Thai (Windows-874)"                              ; RTL_TEXTENCODING_MS_874           ; > ;
+        < "Kyrillisch (KOI8-U)"                             ; RTL_TEXTENCODING_KOI8_U           ; > ;
     };
     ItemList [ turkish ] =
     {
@@ -1693,70 +1757,70 @@ ItemList [ language_user1 ] =
     {
          < "Europa occidental (Windows-1252/WinLatin 1)"            ; RTL_TEXTENCODING_MS_1252          ; > ;
         < "Europa occidental (Apple Macintosh)"                 ; RTL_TEXTENCODING_APPLE_ROMAN      ; > ;
-        < "Europa occidental (DOS/OS2-850/Internacional)"           ; RTL_TEXTENCODING_IBM_850          ; > ;
-        < "Europa occidental (DOS/OS2-437/US)"                      ; RTL_TEXTENCODING_IBM_437          ; > ;
+        < "Europa occidental (DOS/OS2-850/International)"           ; RTL_TEXTENCODING_IBM_850          ; > ;
+        < "Europa occidental(DOS/OS2-437/US)"                       ; RTL_TEXTENCODING_IBM_437          ; > ;
         < "Europa occidental (DOS/OS2-860/Portugu�s)"           ; RTL_TEXTENCODING_IBM_860          ; > ;
-        < "Europa occidental (DOS/OS2-861/Island�s)"                ; RTL_TEXTENCODING_IBM_861          ; > ;
-        < "Europa occidental (DOS/OS2-863/Franc�s(Cand.))"  ; RTL_TEXTENCODING_IBM_863          ; > ;
-        < "Europa occidental (DOS/OS2-865/N�rdico)"             ; RTL_TEXTENCODING_IBM_865          ; > ;
+        < "Europa occidental (DOS/OS2-861/Icelandic)"               ; RTL_TEXTENCODING_IBM_861          ; > ;
+        < "Europa occidental (DOS/OS2-863/French (Cand.))"  ; RTL_TEXTENCODING_IBM_863          ; > ;
+        < "Europa occidental (DOS/OS2-865/Nordic)"              ; RTL_TEXTENCODING_IBM_865          ; > ;
         < "Europa occidental (ASCII/US)"                            ; RTL_TEXTENCODING_ASCII_US         ; > ;
         < "Europa occidental (ISO-8859-1)"                          ; RTL_TEXTENCODING_ISO_8859_1       ; > ;
         < "Europa oriental (ISO-8859-2)"                            ; RTL_TEXTENCODING_ISO_8859_2       ; > ;
-        < "Lat�n 3 (ISO-8859-3)"                            ; RTL_TEXTENCODING_ISO_8859_3       ; > ;
-        < "B�ltico (ISO-8859-4)"                            ; RTL_TEXTENCODING_ISO_8859_4       ; > ;
-        < "Cir�lico (ISO-8859-5)"                           ; RTL_TEXTENCODING_ISO_8859_5       ; > ;
-        < "Griego (ISO-8859-7)"                         ; RTL_TEXTENCODING_ISO_8859_7       ; > ;
-        < "Turco (ISO-8859-9)"                          ; RTL_TEXTENCODING_ISO_8859_9       ; > ;
+        < "Llat� 3 (ISO-8859-3)"                            ; RTL_TEXTENCODING_ISO_8859_3       ; > ;
+        < "B�ltic (ISO-8859-4)"                         ; RTL_TEXTENCODING_ISO_8859_4       ; > ;
+        < "Cir�l.lic (ISO-8859-5)"                          ; RTL_TEXTENCODING_ISO_8859_5       ; > ;
+        < "Grec (ISO-8859-7)"                           ; RTL_TEXTENCODING_ISO_8859_7       ; > ;
+        < "Turc (ISO-8859-9)"                           ; RTL_TEXTENCODING_ISO_8859_9       ; > ;
         < "Europa occidental (ISO-8859-14)"                     ; RTL_TEXTENCODING_ISO_8859_14      ; > ;
         < "Europa occidental (ISO-8859-15/EURO)"                    ; RTL_TEXTENCODING_ISO_8859_15      ; > ;
-        < "Griego (DOS/OS2-737)"                        ; RTL_TEXTENCODING_IBM_737          ; > ;
-        < "B�ltico (DOS/OS2-775)"                           ; RTL_TEXTENCODING_IBM_775          ; > ;
+        < "Grec (DOS/OS2-737)"                      ; RTL_TEXTENCODING_IBM_737          ; > ;
+        < "B�ltic (DOS/OS2-775)"                            ; RTL_TEXTENCODING_IBM_775          ; > ;
         < "Europa oriental (DOS/OS2-852)"                           ; RTL_TEXTENCODING_IBM_852          ; > ;
-        < "Cir�lico (DOS/OS2-855)"                      ; RTL_TEXTENCODING_IBM_855          ; > ;
-        < "Turco (DOS/OS2-857)"                         ; RTL_TEXTENCODING_IBM_857          ; > ;
-        < "Cir�lico (DOS/OS2-866/Ruso)"             ; RTL_TEXTENCODING_IBM_866          ; > ;
-        < "Griego (DOS/OS2-869/Moderno)"                    ; RTL_TEXTENCODING_IBM_869          ; > ;
+        < "Cir�l.lic (DOS/OS2-855)"                     ; RTL_TEXTENCODING_IBM_855          ; > ;
+        < "Turc (DOS/OS2-857)"                          ; RTL_TEXTENCODING_IBM_857          ; > ;
+        < "Cir�l.lic (DOS/OS2-866/Rus)"             ; RTL_TEXTENCODING_IBM_866          ; > ;
+        < "Grec (DOS/OS2-869/Modern)"                   ; RTL_TEXTENCODING_IBM_869          ; > ;
         < "Europa oriental (Windows-1250/WinLatin 2)"               ; RTL_TEXTENCODING_MS_1250          ; > ;
-        < "Cir�lico (Windows-1251)"                     ; RTL_TEXTENCODING_MS_1251          ; > ;
-        < "Griego (Windows-1253)"                       ; RTL_TEXTENCODING_MS_1253          ; > ;
-        < "Turco (Windows-1254)"                            ; RTL_TEXTENCODING_MS_1254          ; > ;
-        < "B�ltico (Windows-1257)"                          ; RTL_TEXTENCODING_MS_1257          ; > ;
+        < "Cir�l.lic (Windows-1251)"                        ; RTL_TEXTENCODING_MS_1251          ; > ;
+        < "Grec (Windows-1253)"                     ; RTL_TEXTENCODING_MS_1253          ; > ;
+        < "Turc (Windows-1254)"                         ; RTL_TEXTENCODING_MS_1254          ; > ;
+        < "B�ltic (Windows-1257)"                           ; RTL_TEXTENCODING_MS_1257          ; > ;
         < "Europa oriental (Apple Macintosh)"                       ; RTL_TEXTENCODING_APPLE_CENTEURO   ; > ;
-        < "Europa oriental (Apple Macintosh/Croata)"            ; RTL_TEXTENCODING_APPLE_CROATIAN   ; > ;
-        < "Cir�lico (Apple Macintosh)"                  ; RTL_TEXTENCODING_APPLE_CYRILLIC   ; > ;
-        < "Griego (Apple Macintosh)"                    ; RTL_TEXTENCODING_APPLE_GREEK      ; > ;
-        < "Europa occidental (Apple Macintosh/Island�s)"            ; RTL_TEXTENCODING_APPLE_ICELAND    ; > ;
-        < "Europa oriental (Apple Macintosh/Rumano)"            ; RTL_TEXTENCODING_APPLE_ROMANIAN   ; > ;
-        < "Turco (Apple Macintosh)"                     ; RTL_TEXTENCODING_APPLE_TURKISH    ; > ;
-        < "Cir�lico (Apple Macintosh/Ucraniano)"            ; RTL_TEXTENCODING_APPLE_UKRAINIAN  ; > ;
-        < "Chino simplificado (Apple Macintosh)"        ; RTL_TEXTENCODING_APPLE_CHINSIMP   ; > ;
-        < "Chino tradicional (Apple Macintosh)"     ; RTL_TEXTENCODING_APPLE_CHINTRAD   ; > ;
-        < "Japon�s (Apple Macintosh)"                       ; RTL_TEXTENCODING_APPLE_JAPANESE   ; > ;
-        < "Coreano (Apple Macintosh)"                   ; RTL_TEXTENCODING_APPLE_KOREAN     ; > ;
-        < "Japon�s (Windows-932)"                           ; RTL_TEXTENCODING_MS_932           ; > ;
-        < "Chino simplificado (Windows-936)"            ; RTL_TEXTENCODING_MS_936           ; > ;
-        < "Coreano (Windows-949)"                       ; RTL_TEXTENCODING_MS_949           ; > ;
-        < "Chino tradicional (Windows-950)"         ; RTL_TEXTENCODING_MS_950           ; > ;
-        < "Japon�s (Shift-JIS)"                         ; RTL_TEXTENCODING_SHIFT_JIS        ; > ;
-        < "Chino simplificado (GB-2312)"                ; RTL_TEXTENCODING_GB_2312          ; > ;
-        < "Chino tradicional (GBT-12345)"               ; RTL_TEXTENCODING_GB_18030         ; > ;
-        < "Chino simplificado (GBK/GB-2312-80)"             ; RTL_TEXTENCODING_GBT_12345        ; > ;
-        < "Chino tradicional (BIG5)"            ; RTL_TEXTENCODING_GBK              ; > ;
-        < "Japon�s (EUC-JP)"                    ; RTL_TEXTENCODING_BIG5             ; > ;
-        < "Chino simplificado (EUC-CN)"            ; RTL_TEXTENCODING_BIG5_HKSCS       ; > ;
-        < "Cir�lico (KOI8-R)"                               ; RTL_TEXTENCODING_EUC_JP           ; > ;
+        < "Europa oriental (Apple Macintosh/Kroatian)"          ; RTL_TEXTENCODING_APPLE_CROATIAN   ; > ;
+        < "Cir�l.lic (Apple Macintosh)"                 ; RTL_TEXTENCODING_APPLE_CYRILLIC   ; > ;
+        < "Grec (Apple Macintosh)"                  ; RTL_TEXTENCODING_APPLE_GREEK      ; > ;
+        < "Europa occidental(Apple Macintosh/Icelandic)"            ; RTL_TEXTENCODING_APPLE_ICELAND    ; > ;
+        < "Europa oriental (Apple Macintosh/Rumanian)"          ; RTL_TEXTENCODING_APPLE_ROMANIAN   ; > ;
+        < "Turc (Apple Macintosh)"                      ; RTL_TEXTENCODING_APPLE_TURKISH    ; > ;
+        < "Cir�l.lic (Apple Macintosh/Ucraniano)"           ; RTL_TEXTENCODING_APPLE_UKRAINIAN  ; > ;
+        < "Xin�s simplificat (Apple Macintosh)"     ; RTL_TEXTENCODING_APPLE_CHINSIMP   ; > ;
+        < "Xin�s tradicional (Apple Macintosh)"     ; RTL_TEXTENCODING_APPLE_CHINTRAD   ; > ;
+        < "Japon�s (Apple Macintosh)"                       ; RTL_TEXTENCODING_APPLE_JAPANESE   ; > ;
+        < "Core� (Apple Macintosh)"                 ; RTL_TEXTENCODING_APPLE_KOREAN     ; > ;
+        < "Japon�s (Windows-932)"                           ; RTL_TEXTENCODING_MS_932           ; > ;
+        < "Xin�s simplificat (Windows-936)"         ; RTL_TEXTENCODING_MS_936           ; > ;
+        < "Core� (Windows-949)"                     ; RTL_TEXTENCODING_MS_949           ; > ;
+        < "Xin�s tradicional (Windows-950)"         ; RTL_TEXTENCODING_MS_950           ; > ;
+        < "Japon�s (Shift-JIS)"                         ; RTL_TEXTENCODING_SHIFT_JIS        ; > ;
+        < "Xin�s simplificat (GB-2312)"             ; RTL_TEXTENCODING_GB_2312          ; > ;
+        < "Xin�s tradicional (GBT-12345)"               ; RTL_TEXTENCODING_GB_18030         ; > ;
+        < "Xin�s simplificat (GBK/GB-2312-80)"              ; RTL_TEXTENCODING_GBT_12345        ; > ;
+        < "Xin�s tradicional (BIG5)"            ; RTL_TEXTENCODING_GBK              ; > ;
+        < "Japon�s (EUC-JP)"                    ; RTL_TEXTENCODING_BIG5             ; > ;
+        < "Xin�s simplificat (EUC-CN)"            ; RTL_TEXTENCODING_BIG5_HKSCS       ; > ;
+        < "Cir�l.lic (KOI8-R)"                              ; RTL_TEXTENCODING_EUC_JP           ; > ;
         < "Unicode (UTF-7)"                 ; RTL_TEXTENCODING_EUC_CN           ; > ;
         < "Unicode (UTF-8)"                ; RTL_TEXTENCODING_EUC_TW           ; > ;
         < "Europa oriental (ISO-8859-10)"                         ; RTL_TEXTENCODING_ISO_2022_JP      ; > ;
         < "Europa oriental (ISO-8859-13)"            ; RTL_TEXTENCODING_ISO_2022_CN      ; > ;
-        < "Coreano (EUC-KR)"                                ; RTL_TEXTENCODING_KOI8_R           ; > ;
-        < "Coreano (Windows-Johab-1361)"                                    ; RTL_TEXTENCODING_UTF7             ; > ;
+        < "Core� (EUC-KR)"                              ; RTL_TEXTENCODING_KOI8_R           ; > ;
+        < "Core� (Windows-Johab-1361)"                                  ; RTL_TEXTENCODING_UTF7             ; > ;
         < "Unicode"                                 ; RTL_TEXTENCODING_UTF8             ; > ;
         < "Europa oriental (ISO-8859-13)"                           ; RTL_TEXTENCODING_ISO_8859_10      ; > ;
-        < "Coreano (EUC-KR)"                            ; RTL_TEXTENCODING_ISO_8859_13      ; > ;
-        < "Coreano (ISO-2022-KR)"                               ; RTL_TEXTENCODING_EUC_KR           ; > ;
-        < "Coreano (Windows-Johab-1361)"                        ; RTL_TEXTENCODING_ISO_2022_KR      ; > ;
-        < "Koreanisch (Windows-Johab-1361)"                 ; RTL_TEXTENCODING_MS_1361          ; > ;
+        < "Core� (EUC-KR)"                          ; RTL_TEXTENCODING_ISO_8859_13      ; > ;
+        < "Core� (ISO-2022-KR)"                             ; RTL_TEXTENCODING_EUC_KR           ; > ;
+        < "Core� (Windows-Johab-1361)"                        ; RTL_TEXTENCODING_ISO_2022_KR      ; > ;
+        < "Unicode"                 ; RTL_TEXTENCODING_MS_1361          ; > ;
         < "Unicode"                                         ; RTL_TEXTENCODING_UCS2             ; > ;
         < "Thai (ISO-8859-11/TIS-620)"                                  ; RTL_TEXTENCODING_TIS_620          ; > ;
         < "Thai (Windows-874)"                              ; RTL_TEXTENCODING_MS_874           ; > ;
@@ -1850,3 +1914,8 @@ ItemList [ language_user1 ] =
 
 
 
+
+
+
+
+
diff --git a/svx/source/dialog/zoom.src b/svx/source/dialog/zoom.src
index 2eb6080f0e3c..973a437129f5 100644
--- a/svx/source/dialog/zoom.src
+++ b/svx/source/dialog/zoom.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: zoom.src,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: kz $ $Date: 2001-07-14 20:44:06 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -84,22 +84,23 @@ ModalDialog RID_SVXDLG_ZOOM
         Text [ portuguese ] = "~P�gina inteira" ;
         Text [ finnish ] = "~Koko sivu" ;
         Text [ danish ] = "Hele siden" ;
-        Text [ french ] = "~Page enti�re" ;
+        Text [ french ] = "Page enti�re" ;
         Text [ swedish ] = "Hela sidan" ;
-        Text [ dutch ] = "~Hele pagina" ;
+        Text [ dutch ] = "H~ele pagina" ;
         Text [ spanish ] = "~Toda la p�gina" ;
         Text [ english_us ] = "~Entire Page" ;
-        Text[ chinese_simplified ] = "ȫҳ(~E)";
+        Text[ chinese_simplified ] = "整页(~E)";
         Text[ russian ] = "�� ��� ��������";
         Text[ polish ] = "Ca�a strona";
-        Text[ japanese ] = "�߰�ޑS��(~E)";
-        Text[ chinese_traditional ] = "�㭶(~E)";
+        Text[ japanese ] = "ページ全体(~E)";
+        Text[ chinese_traditional ] = "整頁(~E)";
         Text[ arabic ] = "���� �����";
         Text[ greek ] = "�������� ������";
-        Text[ korean ] = "��ü ������(~E)";
+        Text[ korean ] = "전체 페이지(~E)";
         Text[ turkish ] = "~Tam sayfa";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Toda la p�gina";
+        Text[ catalan ] = "~Tota la p�gina";
+        Text[ thai ] = "~ทั้งหน้า";
     };
     RadioButton BTN_PAGE_WIDTH
     {
@@ -118,17 +119,18 @@ ModalDialog RID_SVXDLG_ZOOM
         Text [ dutch ] = "~Paginabreedte" ;
         Text [ spanish ] = "~Ancho de p�gina" ;
         Text [ english_us ] = "~Page Width" ;
-        Text[ chinese_simplified ] = "ҳ��(~P)";
+        Text[ chinese_simplified ] = "页面宽度(~P)";
         Text[ russian ] = "�� ������ ��������";
         Text[ polish ] = "Szeroko�� strony";
-        Text[ japanese ] = "�߰�ޕ�(~P)";
-        Text[ chinese_traditional ] = "���e(~P)";
+        Text[ japanese ] = "ページ幅(~P)";
+        Text[ chinese_traditional ] = "頁面寬度(~P)";
         Text[ arabic ] = "��� ������";
         Text[ greek ] = "������ �������";
-        Text[ korean ] = "�� �ʺ�(~P)";
+        Text[ korean ] = "페이지 너비(~P)";
         Text[ turkish ] = "~Sayfa geni�li�i";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Ancho de p�gina";
+        Text[ catalan ] = "~Ample de p�gina";
+        Text[ thai ] = "ความกว้างของ~หน้า";
     };
     RadioButton BTN_OPTIMAL
     {
@@ -140,24 +142,25 @@ ModalDialog RID_SVXDLG_ZOOM
         Text [ italian ] = "~Ottimale" ;
         Text [ portuguese_brazilian ] = "~Optimal" ;
         Text [ portuguese ] = "~Optimizar" ;
-        Text [ finnish ] = "~Optimaalinen" ;
+        Text [ finnish ] = "O~ptimaalinen" ;
         Text [ danish ] = "Optimal" ;
         Text [ french ] = "~Optimal" ;
         Text [ swedish ] = "Optimal" ;
         Text [ dutch ] = "~Optimaal" ;
         Text [ spanish ] = "�~ptimo" ;
         Text [ english_us ] = "~Optimal" ;
-        Text[ chinese_simplified ] = "���(~O)";
-        Text[ russian ] = "�����������";
+        Text[ chinese_simplified ] = "最佳(~O)";
+        Text[ russian ] = "�����������";
         Text[ polish ] = "~Optymalnie";
-        Text[ japanese ] = "�œK(~O)";
-        Text[ chinese_traditional ] = "�̦X�A(~O)";
+        Text[ japanese ] = "最適(~O)";
+        Text[ chinese_traditional ] = "最合適(~O)";
         Text[ arabic ] = "������";
         Text[ greek ] = "��������";
-        Text[ korean ] = "����(~O)";
+        Text[ korean ] = "최적으로(~O)";
         Text[ turkish ] = "~Optimum";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "�~ptimo";
+        Text[ catalan ] = "�~ptim";
+        Text[ thai ] = "เ~หมาะที่สุด";
     };
     RadioButton BTN_200
     {
@@ -199,24 +202,25 @@ ModalDialog RID_SVXDLG_ZOOM
         Text [ italian ] = "~Variabile" ;
         Text [ portuguese_brazilian ] = "~Pessoal" ;
         Text [ portuguese ] = "~Vari�vel" ;
-        Text [ finnish ] = "~Muuttuja" ;
+        Text [ finnish ] = "~Vaihtuva" ;
         Text [ danish ] = "Variabel" ;
         Text [ french ] = "~Autre" ;
         Text [ swedish ] = "~Stegl�s" ;
         Text [ dutch ] = "~Traploos" ;
         Text [ spanish ] = "~Variable" ;
         Text [ english_us ] = "~Variable" ;
-        Text[ chinese_simplified ] = "�޼�����(~V)";
-        Text[ russian ] = "�������";
+        Text[ chinese_simplified ] = "无级缩放(~V)";
+        Text[ russian ] = "����������";
         Text[ polish ] = "~Bezstopniowo";
-        Text[ japanese ] = "�C��(~V)";
-        Text[ chinese_traditional ] = "�L���Y��(~V)";
+        Text[ japanese ] = "任意(~V)";
+        Text[ chinese_traditional ] = "無級縮放(~V)";
         Text[ arabic ] = "�����";
         Text[ greek ] = "����� �������~�";
-        Text[ korean ] = "�ܰ����(~V)";
+        Text[ korean ] = "임의(~V)";
         Text[ turkish ] = "~De�i�ken";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Variable";
+        Text[ thai ] = "~ตัวแปร";
     };
     MetricField ED_USER
     {
@@ -241,22 +245,23 @@ ModalDialog RID_SVXDLG_ZOOM
         Text[ portuguese ] = "Factor de zoom";
         Text[ russian ] = "����������� ��������";
         Text[ greek ] = "Zoom";
-        Text[ dutch ] = "Zoom";
+        Text[ dutch ] = "Zoomfactor";
         Text[ french ] = "Facteur";
         Text[ spanish ] = "Escala";
-        Text[ finnish ] = "Zoom";
+        Text[ finnish ] = "Zoomauskerroin";
         Text[ italian ] = "Zoom";
-        Text[ danish ] = "Zoom";
+        Text[ danish ] = "Zoomfaktor";
         Text[ swedish ] = "Zoomfaktor";
         Text[ polish ] = "Faktor powi�kszenia";
         Text[ portuguese_brazilian ] = "Zoom";
-        Text[ japanese ] = "�ްїv��";
-        Text[ korean ] = "Ȯ��/���";
-        Text[ chinese_simplified ] = "��ʾ����";
-        Text[ chinese_traditional ] = "��ܤ��";
+        Text[ japanese ] = "ズーム率";
+        Text[ korean ] = "확대/축소";
+        Text[ chinese_simplified ] = "显示比例";
+        Text[ chinese_traditional ] = "顯示比例";
         Text[ turkish ] = "Zoom";
         Text[ arabic ] = "Zoom";
         Text[ catalan ] = "Zoom";
+        Text[ thai ] = "ปัจจัยย่อ/ขยาย";
     };
     OKButton BTN_ZOOM_OK
     {
@@ -275,29 +280,45 @@ ModalDialog RID_SVXDLG_ZOOM
         Size = MAP_APPFONT ( 50 , 14 ) ;
     };
     Text[ greek ] = "�������";
-    Text[ korean ] = "��";
+    Text[ korean ] = "축소/확대";
     Text[ turkish ] = "�l�ek";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Escala";
+    Text[ catalan ] = "Zoom";
     Text[ english_us ] = "Zoom";
     Text[ portuguese ] = "Zoom";
     Text[ russian ] = "�������";
-    Text[ dutch ] = "Zoom";
+    Text[ dutch ] = "Maatstaf";
     Text[ french ] = "Zoom";
     Text[ spanish ] = "Escala";
-    Text[ finnish ] = "Zoomaa";
+    Text[ finnish ] = "Zoomaus";
     Text[ italian ] = "Zoom";
     Text[ danish ] = "M�lestok";
     Text[ swedish ] = "Skala";
     Text[ polish ] = "Skala";
     Text[ portuguese_brazilian ] = "Zoom";
-    Text[ japanese ] = "�ް�";
-    Text[ chinese_simplified ] = "��ʾ����";
-    Text[ chinese_traditional ] = "��ܤ��";
+    Text[ japanese ] = "ズーム";
+    Text[ chinese_simplified ] = "显示比例";
+    Text[ chinese_traditional ] = "顯示比例";
     Text[ arabic ] = "�����/�����";
+    Text[ thai ] = "ย่อ/ขยาย";
 };
  // ********************************************************************** EOF
 
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svx/source/editeng/editeng.cxx b/svx/source/editeng/editeng.cxx
index c637fadadfb7..48526ad5e1c9 100644
--- a/svx/source/editeng/editeng.cxx
+++ b/svx/source/editeng/editeng.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: editeng.cxx,v $
  *
- *  $Revision: 1.77 $
+ *  $Revision: 1.78 $
  *
- *  last change: $Author: mt $ $Date: 2002-11-22 13:54:23 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -836,7 +836,8 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
     sal_Bool bAllowIdle = sal_True;
     sal_Bool bReadOnly  = pEditView->IsReadOnly();
 
-    USHORT nShowCursorFlags = 0;
+    USHORT nNewCursorFlags = 0;
+    BOOL bSetCursorFlags = TRUE;
 
     EditSelection aCurSel( pEditView->pImpEditView->GetEditSelection() );
     DBG_ASSERT( !aCurSel.IsInvalid(), "Blinde Selection in EditEngine::PostKeyEvent" );
@@ -953,6 +954,9 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
             {
                 if ( !rKeyEvent.GetKeyCode().IsMod2() || ( nCode == KEY_LEFT ) || ( nCode == KEY_RIGHT ) )
                 {
+                    if ( pImpEditEngine->DoVisualCursorTraveling( aCurSel.Max().GetNode() ) && ( ( nCode == KEY_LEFT ) || ( nCode == KEY_RIGHT ) /* || ( nCode == KEY_HOME ) || ( nCode == KEY_END ) */ ) )
+                        bSetCursorFlags = FALSE;    // Will be manipulated within visual cursor move
+
                     aCurSel = pImpEditEngine->MoveCursor( rKeyEvent, pEditView );
 
                     if ( aCurSel.HasRange() ) {
@@ -962,9 +966,10 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
 
                     bMoved = sal_True;
                     if ( nCode == KEY_HOME )
-                        nShowCursorFlags |= GETCRSR_STARTOFLINE;
+                        nNewCursorFlags |= GETCRSR_STARTOFLINE;
                     else if ( nCode == KEY_END )
-                        nShowCursorFlags |= GETCRSR_ENDOFLINE;
+                        nNewCursorFlags |= GETCRSR_ENDOFLINE;
+
                 }
 #ifdef DEBUG
                 GetLanguage( pImpEditEngine->GetEditDoc().GetPos( aCurSel.Max().GetNode() ), aCurSel.Max().GetIndex() );
@@ -1151,7 +1156,19 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
 
     if ( ( !IsVertical() && ( nCode != KEY_UP ) && ( nCode != KEY_DOWN ) ) ||
          ( IsVertical() && ( nCode != KEY_LEFT ) && ( nCode != KEY_RIGHT ) ))
+    {
         pEditView->pImpEditView->nTravelXPos = TRAVEL_X_DONTKNOW;
+    }
+
+    if ( /* ( nCode != KEY_HOME ) && ( nCode != KEY_END ) && */
+        ( !IsVertical() && ( nCode != KEY_LEFT ) && ( nCode != KEY_RIGHT ) ) ||
+         ( IsVertical() && ( nCode != KEY_UP ) && ( nCode != KEY_DOWN ) ))
+    {
+        pEditView->pImpEditView->SetCursorBidiLevel( 0xFFFF );
+    }
+
+    if ( bSetCursorFlags )
+        pEditView->pImpEditView->nExtraCursorFlags = nNewCursorFlags;
 
     if ( bModified )
     {
@@ -1166,7 +1183,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
     else if ( bMoved )
     {
         sal_Bool bGotoCursor = pEditView->pImpEditView->DoAutoScroll();
-        pEditView->pImpEditView->ShowCursor( bGotoCursor, sal_True, nShowCursorFlags );
+        pEditView->pImpEditView->ShowCursor( bGotoCursor, sal_True );
         pImpEditEngine->CallStatusHdl();
     }
 
diff --git a/svx/source/editeng/editeng.src b/svx/source/editeng/editeng.src
index e9525aa6d0fc..df78d175977d 100644
--- a/svx/source/editeng/editeng.src
+++ b/svx/source/editeng/editeng.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: editeng.src,v $
  *
- *  $Revision: 1.35 $
+ *  $Revision: 1.36 $
  *
- *  last change: $Author: os $ $Date: 2002-12-02 13:53:16 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,7 +75,7 @@ String RID_EDITUNDO_DEL
     TEXT [ french ] = "Supprimer" ;
     TEXT [ swedish ] = "Radera" ;
     TEXT [ dutch ] = "Wissen" ;
-    TEXT [ spanish ] = "Eliminar" ;
+    TEXT [ spanish ] = "Borrar" ;
     TEXT [ english_us ] = "Delete" ;
     TEXT[ chinese_simplified ] = "删除";
     TEXT[ russian ] = "�������";
@@ -295,7 +295,7 @@ String RID_EDITUNDO_SETSTYLE
     TEXT[ dutch ] = "Opmaakprofielen toepassen";
     TEXT[ chinese_simplified ] = "使用样式";
     TEXT[ greek ] = "�������� ��������";
-    TEXT[ korean ] = "템플릿 적용";
+    TEXT[ korean ] = "스타일 적용";
     TEXT[ turkish ] = "�ablonlar� kullan";
     TEXT[ catalan ] = "Aplica els estils";
     TEXT[ thai ] = "ใช้ลักษณะ";
@@ -318,7 +318,7 @@ String RID_EDITUNDO_TRANSLITERATE
     TEXT[ polish ] = "Wielkie i ma�e litery";
     TEXT[ portuguese_brazilian ] = "Change case";
     TEXT[ japanese ] = "文字種の変換";
-    TEXT[ korean ] = "대/소문자";
+    TEXT[ korean ] = "문자 바꾸기";
     TEXT[ chinese_simplified ] = "变化字母和字体格式";
     TEXT[ chinese_traditional ] = "變化字母和字型格式";
     TEXT[ turkish ] = "Change case";
@@ -346,8 +346,8 @@ Menu RID_MENU_SPELL
             Text[ russian ] = "~�������� ����������";
             Text[ greek ] = "�~���������";
             Text[ dutch ] = "~Spellingcontrole";
-            Text[ french ] = "~Orthographe...";
-            Text[ spanish ] = "Ortogra~f�a...";
+            Text[ french ] = "~V�rification orthographique...";
+            Text[ spanish ] = "~Revisi�n ortogr�fica...";
             Text[ finnish ] = "~Oikeinkirjoituksen tarkistus";
             Text[ italian ] = "Controllo ~ortografico...";
             Text[ danish ] = "~Stavekontrol";
@@ -355,7 +355,7 @@ Menu RID_MENU_SPELL
             Text[ polish ] = "~Pisownia";
             Text[ portuguese_brazilian ] = "~Rechtschreibung";
             Text[ japanese ] = "文章校正(~S)...";
-            Text[ korean ] = "맞춤법(~S)...";
+            Text[ korean ] = "맞춤법 검사(~S)...";
             Text[ chinese_simplified ] = "拼写检查(~S)...";
             Text[ chinese_traditional ] = "拼寫檢查(~S)...";
             Text[ turkish ] = "~Yaz�m k�lavuzu";
@@ -441,7 +441,7 @@ Menu RID_MENU_SPELL
             Text [ swedish ] = "Auto~Korrigering" ;
             Text [ danish ] = "Auto~Korrektur" ;
             Text [ italian ] = "~Correzione automatica" ;
-            Text [ spanish ] = "Auto~Correcci�n" ;
+            Text [ spanish ] = "~Correcci�n autom�tica" ;
             Text [ french ] = "AutoCo~rrection" ;
             Text [ dutch ] = "~AutoCorrectie" ;
             Text [ portuguese ] = "Auto~Correc��o" ;
@@ -454,7 +454,7 @@ Menu RID_MENU_SPELL
             Text[ dutch ] = "~AutoCorrectie";
             Text[ chinese_simplified ] = "自动更正";
             Text[ greek ] = "����~��������";
-            Text[ korean ] = "자동 고침";
+            Text[ korean ] = "자동 수정";
             Text[ turkish ] = "Otomatik d�zeltme";
             Text[ catalan ] = "Auto~correcci�";
             Text[ finnish ] = "Automaattinen korjaus";
@@ -517,3 +517,5 @@ String RID_STR_PARAGRAPH
     Text[ catalan ] = "Paragraph is %x";
     Text[ thai ] = "Paragraph is %x";
 };
+
+
diff --git a/svx/source/editeng/edtspell.cxx b/svx/source/editeng/edtspell.cxx
index 0d15f229e42a..ba53e21dcbb6 100644
--- a/svx/source/editeng/edtspell.cxx
+++ b/svx/source/editeng/edtspell.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: edtspell.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: mt $ $Date: 2000-12-05 11:05:15 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -607,14 +607,17 @@ sal_Bool EdtAutoCorrDoc::Replace( sal_uInt16 nPos, const String& rTxt )
     sal_uInt16 nEnd = nPos+rTxt.Len();
     if ( nEnd > pCurNode->Len() )
         nEnd = pCurNode->Len();
-    EditSelection aSel( EditPaM( pCurNode, nPos ), EditPaM( pCurNode, nEnd ) );
-    aSel = pImpEE->ImpDeleteSelection( aSel );
-    aSel = pImpEE->ImpInsertText( aSel, rTxt );
+
+    // #i5925# First insert new text behind to be deleted text, for keeping attributes.
+    pImpEE->ImpInsertText( EditSelection( EditPaM( pCurNode, nEnd ) ), rTxt );
+    pImpEE->ImpDeleteSelection( EditSelection( EditPaM( pCurNode, nPos ), EditPaM( pCurNode, nEnd ) ) );
+
     if ( nPos == nCursor )
         nCursor += rTxt.Len();
 
     if ( bAllowUndoAction && ( rTxt.Len() == 1 ) )
         ImplStartUndoAction();
+
     bAllowUndoAction = sal_False;
 
     return sal_True;
diff --git a/svx/source/editeng/impedit.cxx b/svx/source/editeng/impedit.cxx
index 48ecacf0e724..e4adf929238c 100644
--- a/svx/source/editeng/impedit.cxx
+++ b/svx/source/editeng/impedit.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: impedit.cxx,v $
  *
- *  $Revision: 1.45 $
+ *  $Revision: 1.46 $
  *
- *  last change: $Author: mt $ $Date: 2002-09-05 09:44:58 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -124,6 +124,7 @@
 
 #include <flditem.hxx>
 #include <svtools/intitem.hxx>
+#include <svtools/transfer.hxx>
 
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
@@ -159,6 +160,8 @@ ImpEditView::ImpEditView( EditView* pView, EditEngine* pEng, Window* pWindow ) :
     pPointer            = NULL;
     pBackgroundColor    = NULL;
     nScrollDiffX        = 0;
+    nExtraCursorFlags   = 0;
+    nCursorBidiLevel    = CURSOR_BIDILEVEL_DONTKNOW;
     pCursor             = NULL;
        pDragAndDropInfo = NULL;
     bReadOnly           = sal_False;
@@ -727,7 +730,25 @@ void ImpEditView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, US
         pOutWin->SetCursor( GetCursor() );
 
     EditPaM aPaM( aEditSelection.Max() );
-    Rectangle aEditCursor = pEditEngine->pImpEditEngine->PaMtoEditCursor( aPaM, GETCRSR_TXTONLY|nShowCursorFlags );
+
+    USHORT nTextPortionStart = 0;
+    USHORT nPara = pEditEngine->pImpEditEngine->aEditDoc.GetPos( aPaM.GetNode() );
+    ParaPortion* pParaPortion = pEditEngine->pImpEditEngine->GetParaPortions().GetObject( nPara );
+
+    nShowCursorFlags |= nExtraCursorFlags;
+
+    nShowCursorFlags |= GETCRSR_TXTONLY;
+
+    // Use CursorBidiLevel 0/1 in meaning of
+    // 0: prefer portion end, normal mode
+    // 1: prefer portion start
+
+    if ( ( GetCursorBidiLevel() != CURSOR_BIDILEVEL_DONTKNOW ) && GetCursorBidiLevel() )
+    {
+        nShowCursorFlags |= GETCRSR_PREFERPORTIONSTART;
+    }
+
+    Rectangle aEditCursor = pEditEngine->pImpEditEngine->PaMtoEditCursor( aPaM, nShowCursorFlags );
     if ( !IsInsertMode() && !aEditSelection.HasRange() )
     {
         if ( aPaM.GetNode()->Len() && ( aPaM.GetIndex() < aPaM.GetNode()->Len() ) )
@@ -735,9 +756,6 @@ void ImpEditView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, US
             // If we are behind a portion, and the next portion has other direction, we must change position...
             aEditCursor.Left() = aEditCursor.Right() = pEditEngine->pImpEditEngine->PaMtoEditCursor( aPaM, GETCRSR_TXTONLY|GETCRSR_PREFERPORTIONSTART ).Left();
 
-            USHORT nTextPortionStart = 0;
-            USHORT nPara = pEditEngine->pImpEditEngine->aEditDoc.GetPos( aPaM.GetNode() );
-            ParaPortion* pParaPortion = pEditEngine->pImpEditEngine->GetParaPortions().GetObject( nPara );
             USHORT nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nTextPortionStart, TRUE );
             TextPortion* pTextPortion = pParaPortion->GetTextPortions().GetObject( nTextPortion );
             if ( pTextPortion->GetKind() == PORTIONKIND_TAB )
@@ -747,7 +765,10 @@ void ImpEditView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, US
             else
             {
                 EditPaM aNext = pEditEngine->pImpEditEngine->CursorRight( aPaM, (USHORT)i18n::CharacterIteratorMode::SKIPCELL );
-                aEditCursor.Right() = pEditEngine->pImpEditEngine->PaMtoEditCursor( aNext, GETCRSR_TXTONLY ).Left();
+                Rectangle aTmpRect = pEditEngine->pImpEditEngine->PaMtoEditCursor( aNext, GETCRSR_TXTONLY );
+                if ( aTmpRect.Top() != aEditCursor.Top() )
+                    aTmpRect = pEditEngine->pImpEditEngine->PaMtoEditCursor( aNext, GETCRSR_TXTONLY|GETCRSR_ENDOFLINE );
+                aEditCursor.Right() = aTmpRect.Left();
             }
         }
     }
@@ -887,6 +908,21 @@ void ImpEditView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, US
                 aCursorSz.Height() = nCursorSz;
         }
         GetCursor()->SetSize( aCursorSz );
+
+        unsigned char nCursorDir = CURSOR_DIRECTION_NONE;
+        if ( IsInsertMode() && !aEditSelection.HasRange() && ( pEditEngine->pImpEditEngine->HasDifferentRTLLevels( aPaM.GetNode() ) ) )
+        {
+            USHORT nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nTextPortionStart, nShowCursorFlags & GETCRSR_PREFERPORTIONSTART ? TRUE : FALSE );
+            TextPortion* pTextPortion = pParaPortion->GetTextPortions().GetObject( nTextPortion );
+            USHORT nRTLLevel = pTextPortion->GetRightToLeft();
+            if ( nRTLLevel%2 )
+                nCursorDir = CURSOR_DIRECTION_RTL;
+            else
+                nCursorDir = CURSOR_DIRECTION_LTR;
+
+        }
+        GetCursor()->SetDirection( nCursorDir );
+
         if ( bForceVisCursor )
             GetCursor()->Show();
 
@@ -1071,6 +1107,8 @@ sal_Bool ImpEditView::MouseButtonUp( const MouseEvent& rMouseEvent )
         }
     }
     nTravelXPos = TRAVEL_X_DONTKNOW;
+    nCursorBidiLevel = CURSOR_BIDILEVEL_DONTKNOW;
+    nExtraCursorFlags = 0;
     bClickedInSelection = sal_False;
 
     if ( rMouseEvent.IsMiddle() && !bReadOnly &&
@@ -1094,13 +1132,14 @@ sal_Bool ImpEditView::MouseButtonDown( const MouseEvent& rMouseEvent )
     if ( pEditEngine->pImpEditEngine->aStatus.NotifyCursorMovements() )
         pEditEngine->pImpEditEngine->aStatus.GetPrevParagraph() = pEditEngine->pImpEditEngine->GetEditDoc().GetPos( GetEditSelection().Max().GetNode() );
     nTravelXPos = TRAVEL_X_DONTKNOW;
+    nExtraCursorFlags = 0;
+    nCursorBidiLevel    = CURSOR_BIDILEVEL_DONTKNOW;
     bClickedInSelection = IsSelectionAtPoint( rMouseEvent.GetPosPixel() );
     return pEditEngine->pImpEditEngine->MouseButtonDown( rMouseEvent, GetEditViewPtr() );
 }
 
 sal_Bool ImpEditView::MouseMove( const MouseEvent& rMouseEvent )
 {
-    nTravelXPos = TRAVEL_X_DONTKNOW;
     return pEditEngine->pImpEditEngine->MouseMove( rMouseEvent, GetEditViewPtr() );
 }
 
@@ -1776,7 +1815,23 @@ void ImpEditView::dragEnter( const ::com::sun::star::datatransfer::dnd::DropTarg
     if ( !pDragAndDropInfo )
         pDragAndDropInfo = new DragAndDropInfo( );
 
-    pDragAndDropInfo->bHasValidData = sal_True; // !!!!!!!!
+    pDragAndDropInfo->bHasValidData = sal_False;
+
+    // Check for supported format...
+    // Only check for text, will also be there if bin or rtf
+    datatransfer::DataFlavor aTextFlavor;
+    SotExchange::GetFormatDataFlavor( SOT_FORMAT_STRING, aTextFlavor );
+    const ::com::sun::star::datatransfer::DataFlavor* pFlavors = rDTDEE.SupportedDataFlavors.getConstArray();
+    int nFlavors = rDTDEE.SupportedDataFlavors.getLength();
+    for ( int n = 0; n < nFlavors; n++ )
+    {
+        if( TransferableDataHelper::IsEqual( pFlavors[n], aTextFlavor ) )
+        {
+            pDragAndDropInfo->bHasValidData = sal_True;
+            break;
+        }
+    }
+
     dragOver( rDTDEE );
 }
 
@@ -1805,6 +1860,7 @@ void ImpEditView::dragOver( const ::com::sun::star::datatransfer::dnd::DropTarge
     if ( GetOutputArea().IsInside( aMousePos ) && !bReadOnly )
     {
         sal_Int8 nSupportedActions = bReadOnly ? datatransfer::dnd::DNDConstants::ACTION_COPY : datatransfer::dnd::DNDConstants::ACTION_COPY_OR_MOVE;
+
         if ( pDragAndDropInfo->bHasValidData /* && ( nSupportedActions & rDTDE.DropAction ) MT: Default = 0x80 ?! */ )
         {
             bAccept = sal_True;
diff --git a/svx/source/editeng/impedit.hxx b/svx/source/editeng/impedit.hxx
index 1922ef43457a..06576052376f 100644
--- a/svx/source/editeng/impedit.hxx
+++ b/svx/source/editeng/impedit.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: impedit.hxx,v $
  *
- *  $Revision: 1.61 $
+ *  $Revision: 1.62 $
  *
- *  last change: $Author: mt $ $Date: 2002-10-10 12:16:39 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:01:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,7 +69,6 @@
 #include <editstt2.hxx>
 #include <editdata.hxx>
 #include <svxacorr.hxx>
-#include <colorcfg.hxx>
 
 #ifndef _SV_VIRDEV_HXX //autogen
 #include <vcl/virdev.hxx>
@@ -126,6 +125,7 @@ DBG_NAMEEX( EditEngine );
 #define DEL_LEFT    1
 #define DEL_RIGHT   2
 #define TRAVEL_X_DONTKNOW   0xFFFFFFFF
+#define CURSOR_BIDILEVEL_DONTKNOW   0xFFFF
 #define MAXCHARSINPARA      0x3FFF-CHARPOSGROW  // Max 16K, because WYSIWYG array
 
 #define ATTRSPECIAL_WHOLEWORD   1
@@ -152,6 +152,8 @@ class SvxLRSpaceItem;
 class TextRanger;
 class SvKeyValueIterator;
 class SvxForbiddenCharactersTable;
+class SvtCTLOptions;
+
 
 class SvUShorts;
 
@@ -163,6 +165,9 @@ namespace clipboard {
     class XClipboard;
 }}}}}
 
+namespace svtools {
+    class ColorConfig;
+}
 
 struct DragAndDropInfo
 {
@@ -266,9 +271,11 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSourceListener > mxDnDListener;
 
 
+    long                nInvMore;
     sal_uInt32          nControl;
     sal_uInt32          nTravelXPos;
-    long                nInvMore;
+    sal_uInt16          nExtraCursorFlags;
+    sal_uInt16          nCursorBidiLevel;
     sal_uInt16          nScrollDiffX;
     sal_Bool            bReadOnly;
     sal_Bool            bClickedInSelection;
@@ -305,6 +312,9 @@ public:
     sal_uInt16      GetScrollDiffX() const          { return nScrollDiffX; }
     void            SetScrollDiffX( sal_uInt16 n )  { nScrollDiffX = n; }
 
+    sal_uInt16      GetCursorBidiLevel() const      { return nCursorBidiLevel; }
+    void            SetCursorBidiLevel( sal_uInt16 n ) { nCursorBidiLevel = n; }
+
     Point           GetDocPos( const Point& rWindowPos ) const;
     Point           GetWindowPos( const Point& rDocPos ) const;
     Rectangle       GetWindowPos( const Rectangle& rDocPos ) const;
@@ -456,7 +466,8 @@ private:
     VirtualDevice*      pVirtDev;
     OutputDevice*       pRefDev;
 
-    svx::ColorConfig*   pColorConfig;
+    svtools::ColorConfig*   pColorConfig;
+    SvtCTLOptions*      pCTLOptions;
 
     SfxItemSet*         pEmptyItemSet;
     EditUndoManager*    pUndoManager;
@@ -628,6 +639,9 @@ private:
     EditPaM             StartOfWord( const EditPaM& rPaM, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES );
     EditPaM             EndOfWord( const EditPaM& rPaM, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES );
     EditSelection       SelectWord( const EditSelection& rCurSelection, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES, BOOL bAcceptStartOfWord = TRUE );
+    EditPaM             CursorVisualLeftRight( EditView* pEditView, const EditPaM& rPaM, USHORT nCharacterIteratorMode, BOOL bToLeft );
+    EditPaM             CursorVisualStartEnd( EditView* pEditView, const EditPaM& rPaM, BOOL bStart );
+
 
     void                InitScriptTypes( USHORT nPara );
     USHORT              GetScriptType( const EditPaM& rPaM, USHORT* pEndPos = NULL ) const;
@@ -732,6 +746,7 @@ public:
     void                    InitWritingDirections( USHORT nPara );
     BOOL                    IsRightToLeft( USHORT nPara ) const;
     BYTE                    GetRightToLeft( USHORT nPara, USHORT nChar, USHORT* pStart = NULL, USHORT* pEnd = NULL );
+    BOOL                    HasDifferentRTLLevels( const ContentNode* pNode );
 
     void                    SetTextRanger( TextRanger* pRanger );
     TextRanger*             GetTextRanger() const { return pTextRanger; }
@@ -850,7 +865,9 @@ public:
     void            FormatAndUpdate( EditView* pCurView = 0 );
     inline void     IdleFormatAndUpdate( EditView* pCurView = 0 );
 
-    svx::ColorConfig& GetColorConfig();
+    svtools::ColorConfig& GetColorConfig();
+    BOOL            IsVisualCursorTravelingEnabled();
+    BOOL            DoVisualCursorTraveling( const ContentNode* pNode );
 
     EditSelection           ConvertSelection( sal_uInt16 nStartPara, sal_uInt16 nStartPos, sal_uInt16 nEndPara, sal_uInt16 nEndPos ) const;
     inline EPaM             CreateEPaM( const EditPaM& rPaM );
diff --git a/svx/source/editeng/impedit2.cxx b/svx/source/editeng/impedit2.cxx
index ba7dcc7a1760..4b9204135b20 100644
--- a/svx/source/editeng/impedit2.cxx
+++ b/svx/source/editeng/impedit2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: impedit2.cxx,v $
  *
- *  $Revision: 1.83 $
+ *  $Revision: 1.84 $
  *
- *  last change: $Author: mt $ $Date: 2002-11-22 13:54:23 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:00 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,7 +75,8 @@
 #include <eeobj.hxx>
 #include <txtrange.hxx>
 #include <svtools/urlbmk.hxx>
-
+#include <svtools/colorcfg.hxx>
+#include <svtools/ctloptions.hxx>
 
 #include <fhgtitem.hxx>
 #include <lrspitem.hxx>
@@ -188,6 +189,7 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool* pItemPool ) :
     pUndoMarkSelection  = NULL;
     pTextRanger         = NULL;
     pColorConfig        = NULL;
+    pCTLOptions         = NULL;
 
     nCurTextHeight      = 0;
     nBlockNotifications = 0;
@@ -266,6 +268,7 @@ ImpEditEngine::~ImpEditEngine()
     delete pTextRanger;
     delete mpIMEInfos;
     delete pColorConfig;
+    delete pCTLOptions;
     if ( bOwnerOfRefDev )
         delete pRefDev;
 }
@@ -867,6 +870,23 @@ EditSelection ImpEditEngine::MoveCursor( const KeyEvent& rKeyEvent, EditView* pE
     BOOL bCtrl = aTranslatedKeyEvent.GetKeyCode().IsMod1() ? TRUE : FALSE;
     USHORT nCode = aTranslatedKeyEvent.GetKeyCode().GetCode();
 
+    if ( DoVisualCursorTraveling( aPaM.GetNode() ) )
+    {
+        // Only for simple cursor movement...
+        if ( !bCtrl && ( ( nCode == KEY_LEFT ) || ( nCode == KEY_RIGHT ) ) )
+        {
+            aPaM = CursorVisualLeftRight( pEditView, aPaM, rKeyEvent.GetKeyCode().IsMod2() ? i18n::CharacterIteratorMode::SKIPCHARACTER : i18n::CharacterIteratorMode::SKIPCELL, rKeyEvent.GetKeyCode().GetCode() == KEY_LEFT );
+            nCode = 0;  // skip switch statement
+        }
+        /*
+        else if ( !bCtrl && ( ( nCode == KEY_HOME ) || ( nCode == KEY_END ) ) )
+        {
+            aPaM = CursorVisualStartEnd( pEditView, aPaM, nCode == KEY_HOME );
+            nCode = 0;  // skip switch statement
+        }
+        */
+    }
+
     switch ( nCode )
     {
         case KEY_UP:        aPaM = CursorUp( aPaM, pEditView );
@@ -916,19 +936,273 @@ EditSelection ImpEditEngine::MoveCursor( const KeyEvent& rKeyEvent, EditView* pE
     return pEditView->pImpEditView->GetEditSelection();
 }
 
+EditPaM ImpEditEngine::CursorVisualStartEnd( EditView* pEditView, const EditPaM& rPaM, BOOL bStart )
+{
+    EditPaM aPaM( rPaM );
+
+    USHORT nPara = GetEditDoc().GetPos( aPaM.GetNode() );
+    ParaPortion* pParaPortion = GetParaPortions().SaveGetObject( nPara );
+
+    USHORT nLine = pParaPortion->GetLines().FindLine( aPaM.GetIndex(), sal_False );
+    EditLine* pLine = pParaPortion->GetLines().GetObject( nLine );
+    BOOL bEmptyLine = pLine->GetStart() == pLine->GetEnd();
+
+    pEditView->pImpEditView->nExtraCursorFlags = 0;
+
+    if ( !bEmptyLine )
+    {
+        String aLine( *aPaM.GetNode(), pLine->GetStart(), pLine->GetEnd() - pLine->GetStart() );
+        USHORT nPosInLine = aPaM.GetIndex() - pLine->GetStart();
+
+        const sal_Unicode* pLineString = aLine.GetBuffer();
+
+        UErrorCode nError = U_ZERO_ERROR;
+        UBiDi* pBidi = ubidi_openSized( aLine.Len(), 0, &nError );
+
+        const BYTE nDefaultDir = IsRightToLeft( nPara ) ? UBIDI_RTL : UBIDI_LTR;
+        ubidi_setPara( pBidi, pLineString, aLine.Len(), nDefaultDir, NULL, &nError );
+
+        USHORT nVisPos = bStart ? 0 : aLine.Len()-1;
+        USHORT nLogPos = (USHORT)ubidi_getLogicalIndex( pBidi, nVisPos, &nError );
+
+        ubidi_close( pBidi );
+
+        aPaM.GetIndex() = nLogPos + pLine->GetStart();
+
+        USHORT nTmp;
+        USHORT nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nTmp, TRUE );
+        TextPortion* pTextPortion = pParaPortion->GetTextPortions().GetObject( nTextPortion );
+        USHORT nRTLLevel = pTextPortion->GetRightToLeft();
+        BOOL bParaRTL = IsRightToLeft( nPara );
+        BOOL bPortionRTL = nRTLLevel%2 ? TRUE : FALSE;
+
+        if ( bStart )
+        {
+            pEditView->pImpEditView->SetCursorBidiLevel( bPortionRTL ? 0 : 1 );
+            // Maybe we must be *behind* the character
+            if ( bPortionRTL && pEditView->IsInsertMode() )
+                aPaM.GetIndex()++;
+        }
+        else
+        {
+            pEditView->pImpEditView->SetCursorBidiLevel( bPortionRTL ? 1 : 0 );
+            if ( !bPortionRTL && pEditView->IsInsertMode() )
+                aPaM.GetIndex()++;
+        }
+    }
+
+    return aPaM;
+}
+
+EditPaM ImpEditEngine::CursorVisualLeftRight( EditView* pEditView, const EditPaM& rPaM, USHORT nCharacterIteratorMode, BOOL bVisualToLeft )
+{
+    EditPaM aPaM( rPaM );
+
+    USHORT nPara = GetEditDoc().GetPos( aPaM.GetNode() );
+    ParaPortion* pParaPortion = GetParaPortions().SaveGetObject( nPara );
+
+    USHORT nLine = pParaPortion->GetLines().FindLine( aPaM.GetIndex(), sal_False );
+    EditLine* pLine = pParaPortion->GetLines().GetObject( nLine );
+    BOOL bEmptyLine = pLine->GetStart() == pLine->GetEnd();
+
+    USHORT nCurrentCursorFlags = pEditView->pImpEditView->nExtraCursorFlags;
+    pEditView->pImpEditView->nExtraCursorFlags = 0;
+
+    BOOL bParaRTL = IsRightToLeft( nPara );
+
+    BOOL bDone = FALSE;
+
+    if ( bEmptyLine )
+    {
+        if ( bVisualToLeft )
+        {
+            aPaM = CursorUp( aPaM, pEditView );
+            if ( aPaM != rPaM )
+                aPaM = CursorVisualStartEnd( pEditView, aPaM, FALSE );
+        }
+        else
+        {
+            aPaM = CursorDown( aPaM, pEditView );
+            if ( aPaM != rPaM )
+                aPaM = CursorVisualStartEnd( pEditView, aPaM, TRUE );
+        }
+
+        bDone = TRUE;
+    }
+
+    BOOL bLogicalBackward = bParaRTL ? !bVisualToLeft : bVisualToLeft;
+
+    if ( !bDone && pEditView->IsInsertMode() )
+    {
+        // Check if we are within a portion and don't have overwrite mode, then it's easy...
+        USHORT nPortionStart;
+        USHORT nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nPortionStart, FALSE );
+        TextPortion* pTextPortion = pParaPortion->GetTextPortions().GetObject( nTextPortion );
+
+        BOOL bPortionBoundary = ( aPaM.GetIndex() == nPortionStart ) || ( aPaM.GetIndex() == (nPortionStart+pTextPortion->GetLen()) );
+        USHORT nRTLLevel = pTextPortion->GetRightToLeft();
+
+        // Portion boundary doesn't matter if both have same RTL level
+        USHORT nRTLLevelNextPortion = 0xFFFF;
+        if ( bPortionBoundary && aPaM.GetIndex() && ( aPaM.GetIndex() < aPaM.GetNode()->Len() ) )
+        {
+            USHORT nTmp;
+            USHORT nNextTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex()+1, nTmp, bLogicalBackward ? FALSE : TRUE );
+            TextPortion* pNextTextPortion = pParaPortion->GetTextPortions().GetObject( nNextTextPortion );
+            nRTLLevelNextPortion = pNextTextPortion->GetRightToLeft();
+        }
+
+        if ( !bPortionBoundary || ( nRTLLevel == nRTLLevelNextPortion ) )
+        {
+            if ( ( bVisualToLeft && !(nRTLLevel%2) ) || ( !bVisualToLeft && (nRTLLevel%2) ) )
+            {
+                aPaM = CursorLeft( aPaM, nCharacterIteratorMode );
+                pEditView->pImpEditView->SetCursorBidiLevel( 1 );
+            }
+            else
+            {
+                aPaM = CursorRight( aPaM, nCharacterIteratorMode );
+                pEditView->pImpEditView->SetCursorBidiLevel( 0 );
+            }
+            bDone = TRUE;
+        }
+    }
+
+    if ( !bDone )
+    {
+        BOOL bGotoStartOfNextLine = FALSE;
+        BOOL bGotoEndOfPrevLine = FALSE;
+
+        String aLine( *aPaM.GetNode(), pLine->GetStart(), pLine->GetEnd() - pLine->GetStart() );
+        USHORT nPosInLine = aPaM.GetIndex() - pLine->GetStart();
+
+        const sal_Unicode* pLineString = aLine.GetBuffer();
+
+        UErrorCode nError = U_ZERO_ERROR;
+        UBiDi* pBidi = ubidi_openSized( aLine.Len(), 0, &nError );
+
+        const BYTE nDefaultDir = IsRightToLeft( nPara ) ? UBIDI_RTL : UBIDI_LTR;
+        ubidi_setPara( pBidi, pLineString, aLine.Len(), nDefaultDir, NULL, &nError );
+
+        if ( !pEditView->IsInsertMode() )
+        {
+            BOOL bEndOfLine = nPosInLine == aLine.Len();
+            USHORT nVisPos = (USHORT)ubidi_getVisualIndex( pBidi, !bEndOfLine ? nPosInLine : nPosInLine-1, &nError );
+            if ( bVisualToLeft )
+            {
+                bGotoEndOfPrevLine = nVisPos == 0;
+                if ( !bEndOfLine )
+                    nVisPos--;
+            }
+            else
+            {
+                bGotoStartOfNextLine = nVisPos == (aLine.Len() - 1);
+                if ( !bEndOfLine )
+                    nVisPos++;
+            }
+
+            if ( !bGotoEndOfPrevLine && !bGotoStartOfNextLine )
+            {
+                USHORT nLogPos = (USHORT)ubidi_getLogicalIndex( pBidi, nVisPos, &nError );
+                aPaM.GetIndex() = pLine->GetStart() + nLogPos;
+                pEditView->pImpEditView->SetCursorBidiLevel( 0 );
+            }
+        }
+        else
+        {
+            BOOL bWasBehind = FALSE;
+            BOOL bBeforePortion = !nPosInLine || pEditView->pImpEditView->GetCursorBidiLevel() == 1;
+            if ( nPosInLine && ( !bBeforePortion ) ) // before the next portion
+                bWasBehind = TRUE;  // step one back, otherwise visual will be unusable when rtl portion follows.
+
+            USHORT nPortionStart;
+            USHORT nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nPortionStart, bBeforePortion );
+            TextPortion* pTextPortion = pParaPortion->GetTextPortions().GetObject( nTextPortion );
+            BOOL bRTLPortion = (pTextPortion->GetRightToLeft() % 2) != 0;
+
+            // -1: We are 'behind' the character
+            long nVisPos = (long)ubidi_getVisualIndex( pBidi, bWasBehind ? nPosInLine-1 : nPosInLine, &nError );
+            if ( bVisualToLeft )
+            {
+                if ( !bWasBehind || bRTLPortion )
+                    nVisPos--;
+            }
+            else
+            {
+                if ( bWasBehind || bRTLPortion || bBeforePortion )
+                    nVisPos++;
+//                if ( bWasBehind && bRTLPortion )
+//                    nVisPos++;
+            }
+
+            bGotoEndOfPrevLine = nVisPos < 0;
+            bGotoStartOfNextLine = nVisPos >= aLine.Len();
+
+            if ( !bGotoEndOfPrevLine && !bGotoStartOfNextLine )
+            {
+                USHORT nLogPos = (USHORT)ubidi_getLogicalIndex( pBidi, nVisPos, &nError );
+
+/*
+                if ( nLogPos == aPaM.GetIndex() )
+                {
+                    if ( bVisualToLeft )
+                        bGotoEndOfPrevLine = TRUE;
+                    else
+                        bGotoStartOfNextLine = TRUE;
+                }
+                else
+*/
+                {
+                    aPaM.GetIndex() = pLine->GetStart() + nLogPos;
+
+                    // RTL portion, stay visually on the left side.
+                    USHORT nPortionStart;
+                    // USHORT nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nPortionStart, !bRTLPortion );
+                    USHORT nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nPortionStart, TRUE );
+                    TextPortion* pTextPortion = pParaPortion->GetTextPortions().GetObject( nTextPortion );
+                    if ( bVisualToLeft && !bRTLPortion && ( pTextPortion->GetRightToLeft() % 2 ) )
+                        aPaM.GetIndex()++;
+                    else if ( !bVisualToLeft && bRTLPortion && ( bWasBehind || !(pTextPortion->GetRightToLeft() % 2 )) )
+                        aPaM.GetIndex()++;
+
+                    pEditView->pImpEditView->SetCursorBidiLevel( nPortionStart );
+                }
+            }
+        }
+
+        ubidi_close( pBidi );
+
+        if ( bGotoEndOfPrevLine )
+        {
+            aPaM = CursorUp( aPaM, pEditView );
+            if ( aPaM != rPaM )
+                aPaM = CursorVisualStartEnd( pEditView, aPaM, FALSE );
+        }
+        else if ( bGotoStartOfNextLine )
+        {
+            aPaM = CursorDown( aPaM, pEditView );
+            if ( aPaM != rPaM )
+                aPaM = CursorVisualStartEnd( pEditView, aPaM, TRUE );
+        }
+    }
+    return aPaM;
+}
+
+
 EditPaM ImpEditEngine::CursorLeft( const EditPaM& rPaM, USHORT nCharacterIteratorMode )
 {
-    EditPaM aNewPaM( rPaM );
+    EditPaM aCurPaM( rPaM );
+    EditPaM aNewPaM( aCurPaM );
 
-    if ( rPaM.GetIndex() )
+    if ( aCurPaM.GetIndex() )
     {
-        uno::Reference < i18n::XBreakIterator > xBI = ImplGetBreakIterator();
         sal_Int32 nCount = 1;
-        aNewPaM.SetIndex( (USHORT)xBI->previousCharacters( *aNewPaM.GetNode(), aNewPaM.GetIndex(), GetLocale( aNewPaM ), nCharacterIteratorMode, nCount, nCount ) );
+        uno::Reference < i18n::XBreakIterator > xBI = ImplGetBreakIterator();
+         aNewPaM.SetIndex( (USHORT)xBI->previousCharacters( *aNewPaM.GetNode(), aNewPaM.GetIndex(), GetLocale( aNewPaM ), nCharacterIteratorMode, nCount, nCount ) );
     }
     else
     {
-        ContentNode* pNode = rPaM.GetNode();
+        ContentNode* pNode = aCurPaM.GetNode();
         pNode = GetPrevVisNode( pNode );
         if ( pNode )
         {
@@ -942,8 +1216,10 @@ EditPaM ImpEditEngine::CursorLeft( const EditPaM& rPaM, USHORT nCharacterIterato
 
 EditPaM ImpEditEngine::CursorRight( const EditPaM& rPaM, USHORT nCharacterIteratorMode )
 {
-    EditPaM aNewPaM( rPaM );
-    if ( rPaM.GetIndex() < rPaM.GetNode()->Len() )
+    EditPaM aCurPaM( rPaM );
+    EditPaM aNewPaM( aCurPaM );
+
+    if ( aCurPaM.GetIndex() < aCurPaM.GetNode()->Len() )
     {
         uno::Reference < i18n::XBreakIterator > xBI = ImplGetBreakIterator();
         sal_Int32 nCount = 1;
@@ -951,7 +1227,7 @@ EditPaM ImpEditEngine::CursorRight( const EditPaM& rPaM, USHORT nCharacterIterat
     }
     else
     {
-        ContentNode* pNode = rPaM.GetNode();
+        ContentNode* pNode = aCurPaM.GetNode();
         pNode = GetNextVisNode( pNode );
         if ( pNode )
         {
@@ -1545,6 +1821,27 @@ BOOL ImpEditEngine::IsRightToLeft( USHORT nPara ) const
     return bR2L;
 }
 
+BOOL ImpEditEngine::HasDifferentRTLLevels( const ContentNode* pNode )
+{
+    USHORT nPara = GetEditDoc().GetPos( (ContentNode*)pNode );
+    ParaPortion* pParaPortion = GetParaPortions().SaveGetObject( nPara );
+
+    BOOL bHasDifferentRTLLevels = FALSE;
+
+    USHORT nRTLLevel = IsRightToLeft( nPara ) ? 1 : 0;
+    for ( USHORT n = 0; n < pParaPortion->GetTextPortions().Count(); n++ )
+    {
+        TextPortion* pTextPortion = pParaPortion->GetTextPortions().GetObject( n );
+        if ( pTextPortion->GetRightToLeft() != nRTLLevel )
+        {
+            bHasDifferentRTLLevels = TRUE;
+            break;
+        }
+    }
+    return bHasDifferentRTLLevels;
+}
+
+
 BYTE ImpEditEngine::GetRightToLeft( USHORT nPara, USHORT nPos, USHORT* pStart, USHORT* pEnd )
 {
 //    BYTE nRightToLeft = IsRightToLeft( nPara ) ? 1 : 0;
@@ -2380,7 +2677,7 @@ BOOL ImpEditEngine::UpdateFields()
                 pField->Reset();
 
                 if ( aStatus.MarkFields() )
-                    pField->GetFldColor() = new Color( GetColorConfig().GetColorValue( svx::WRITERFIELDSHADINGS ).nColor );
+                    pField->GetFldColor() = new Color( GetColorConfig().GetColorValue( svtools::WRITERFIELDSHADINGS ).nColor );
 
                 XubString aFldValue = GetEditEnginePtr()->CalcFieldValue(
                                         (const SvxFieldItem&)*pField->GetItem(),
@@ -3789,14 +4086,48 @@ void ImpEditEngine::SetForbiddenCharsTable( vos::ORef<SvxForbiddenCharactersTabl
     EE_DLL()->GetGlobalData()->SetForbiddenCharsTable( xForbiddenChars );
 }
 
-svx::ColorConfig& ImpEditEngine::GetColorConfig()
+svtools::ColorConfig& ImpEditEngine::GetColorConfig()
 {
     if ( !pColorConfig )
-        pColorConfig = new svx::ColorConfig;
+        pColorConfig = new svtools::ColorConfig;
 
     return *pColorConfig;
 }
 
+BOOL ImpEditEngine::IsVisualCursorTravelingEnabled()
+{
+    BOOL bVisualCursorTravaling = FALSE;
+
+    if( !pCTLOptions )
+        pCTLOptions = new SvtCTLOptions;
+
+    if ( pCTLOptions->IsCTLFontEnabled() && ( pCTLOptions->GetCTLCursorMovement() == SvtCTLOptions::MOVEMENT_VISUAL ) )
+    {
+        bVisualCursorTravaling = TRUE;
+    }
+
+    return bVisualCursorTravaling;
+
+}
+
+BOOL ImpEditEngine::DoVisualCursorTraveling( const ContentNode* pNode )
+{
+    // Don't check if it's necessary, because we also need it when leaving the paragraph
+    return IsVisualCursorTravelingEnabled();
+/*
+    BOOL bDoVisualCursorTraveling = FALSE;
+
+    if ( IsVisualCursorTravelingEnabled() && pNode->Len() )
+    {
+        // Only necessary when RTL text in LTR para or LTR text in RTL para
+        bDoVisualCursorTraveling = HasDifferentRTLLevels( pNode );
+    }
+
+    return bDoVisualCursorTraveling;
+*/
+}
+
+
 void ImpEditEngine::CallNotify( EENotify& rNotify )
 {
     if ( !nBlockNotifications )
diff --git a/svx/source/editeng/impedit3.cxx b/svx/source/editeng/impedit3.cxx
index 45a4b773120d..e3809c40f1ca 100644
--- a/svx/source/editeng/impedit3.cxx
+++ b/svx/source/editeng/impedit3.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: impedit3.cxx,v $
  *
- *  $Revision: 1.83 $
+ *  $Revision: 1.84 $
  *
- *  last change: $Author: cl $ $Date: 2002-12-12 10:52:13 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -97,6 +97,7 @@
 #include <scriptspaceitem.hxx>
 #include <charscaleitem.hxx>
 
+#include <svtools/colorcfg.hxx>
 
 #include <forbiddencharacterstable.hxx>
 
@@ -126,7 +127,6 @@
 #include <com/sun/star/text/CharacterCompressionType.hpp>
 #endif
 
-
 #include <comphelper/processfactory.hxx>
 
 using namespace ::rtl;
@@ -2167,7 +2167,7 @@ void ImpEditEngine::ImpFindKashidas( ContentNode* pNode, USHORT nStart, USHORT n
         if ( STRING_LEN != nKashidaPos )
             rArray.Insert( nKashidaPos, rArray.Count() );
 
-        aWordSel = WordRight( aWordSel.Min(), ::com::sun::star::i18n::WordType::DICTIONARY_WORD );
+        aWordSel = WordRight( aWordSel.Max(), ::com::sun::star::i18n::WordType::DICTIONARY_WORD );
         aWordSel = SelectWord( aWordSel, ::com::sun::star::i18n::WordType::DICTIONARY_WORD );
     }
 }
@@ -2538,7 +2538,16 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode, sal_uInt16 nPos, SvxFont& rF
             {
                 DBG_ASSERT( ( pAttrib->Which() >= EE_CHAR_START ) && ( pAttrib->Which() <= EE_FEATURE_END ), "Unglueltiges Attribut in Seek() " );
                 if ( IsScriptItemValid( pAttrib->Which(), nScriptType ) )
+                {
                     pAttrib->SetFont( rFont, pOut );
+                    // #i1550# hard color attrib should win over text color from field
+                    if ( pAttrib->Which() == EE_FEATURE_FIELD )
+                    {
+                        EditCharAttrib* pColorAttr = pNode->GetCharAttribs().FindAttrib( EE_CHAR_COLOR, nPos );
+                        if ( pColorAttr )
+                            pColorAttr->SetFont( rFont, pOut );
+                    }
+                }
                 if ( pAttrib->Which() == EE_CHAR_FONTWIDTH )
                     nRelWidth = ((const SvxCharScaleWidthItem*)pAttrib->GetItem())->GetValue();
                 if ( pAttrib->Which() == EE_CHAR_LANGUAGE_CJK )
@@ -2745,6 +2754,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
 
     EditLine* pLine;
     Point aTmpPos;
+    Point aRedLineTmpPos;
     DBG_ASSERT( GetParaPortions().Count(), "Keine ParaPortion?!" );
     SvxFont aTmpFont( GetParaPortions()[0]->GetNode()->GetCharAttribs().GetDefFont() );
     Font aOldFont( pOutDev->GetFont() );
@@ -2966,6 +2976,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
                                 long nTxtWidth = pTextPortion->GetSize().Width();
 
                                 Point aOutPos( aTmpPos );
+                                aRedLineTmpPos = aTmpPos;
 //L2R                                if ( pTextPortion->GetRightToLeft() )
 //L2R                                {
 //L2R                                    sal_uInt16 nNextPortion = y+1;
@@ -3002,6 +3013,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
                                                 aOutPos.Y() -= nDiff;
                                             else
                                                 aOutPos.X() += nDiff;
+                                            aRedLineTmpPos = aOutPos;
                                             aTmpFont.SetEscapement( 0 );
                                         }
 
@@ -3068,6 +3080,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
                                         {
                                             aRealOutPos.X() += pTextPortion->GetExtraInfos()->nPortionOffsetX;
                                         }
+
                                         aTmpFont.QuickDrawText( pOutDev, aRealOutPos, aText, nTextStart, nTextLen, pDXArray );
                                         if ( bDrawFrame )
                                         {
@@ -3083,9 +3096,20 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
 #ifndef SVX_LIGHT
                                     if ( GetStatus().DoOnlineSpelling() && GetStatus().DoDrawRedLines() && pPortion->GetNode()->GetWrongList()->HasWrongs() && pTextPortion->GetLen() )
                                     {
+                                        {//#105750# adjust LinePos for superscript or subscript text
+                                            short nEsc = aTmpFont.GetEscapement();
+                                            if( nEsc )
+                                            {
+                                                long nShift = ((nEsc*long(aTmpFont.GetSize().Height()))/ 100L);
+                                                if( !IsVertical() )
+                                                    aRedLineTmpPos.Y() -= nShift;
+                                                else
+                                                    aRedLineTmpPos.X() += nShift;
+                                            }
+                                        }
                                         Color aOldColor( pOutDev->GetLineColor() );
-                                        pOutDev->SetLineColor( Color( GetColorConfig().GetColorValue( svx::SPELL ).nColor ) );
-                                        lcl_DrawRedLines( pOutDev, aTmpFont.GetSize().Height(), aTmpPos, nIndex, nIndex + pTextPortion->GetLen(), pDXArray, pPortion->GetNode()->GetWrongList(), nOrientation, aOrigin, IsVertical() );
+                                        pOutDev->SetLineColor( Color( GetColorConfig().GetColorValue( svtools::SPELL ).nColor ) );
+                                        lcl_DrawRedLines( pOutDev, aTmpFont.GetSize().Height(), aRedLineTmpPos, nIndex, nIndex + pTextPortion->GetLen(), pDXArray, pPortion->GetNode()->GetWrongList(), nOrientation, aOrigin, IsVertical() );
                                         pOutDev->SetLineColor( aOldColor );
                                     }
 #endif // !SVX_LIGHT
@@ -3137,6 +3161,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
                             {
                                 if ( pTextPortion->GetExtraValue() && ( pTextPortion->GetExtraValue() != ' ' ) )
                                 {
+                                    SeekCursor( pPortion->GetNode(), nIndex+1, aTmpFont, pOutDev );
                                     aTmpFont.SetTransparent( sal_False );
                                     aTmpFont.SetEscapement( 0 );
                                     aTmpFont.SetPhysFont( pOutDev );
@@ -3888,6 +3913,9 @@ void ImpEditEngine::ImplInitLayoutMode( OutputDevice* pOutDev, USHORT nPara, USH
         // CTL/Bidi checking neccessary
         // Don't use BIDI_STRONG, VCL must do some checks.
         nLayoutMode &= ~( TEXT_LAYOUT_COMPLEX_DISABLED | TEXT_LAYOUT_BIDI_STRONG );
+
+        if ( GetRightToLeft( nPara, nIndex ) )
+            nLayoutMode |= TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_TEXTORIGIN_LEFT;
     }
 
     pOutDev->SetLayoutMode( nLayoutMode );
@@ -3911,7 +3939,7 @@ Reference < i18n::XBreakIterator > ImpEditEngine::ImplGetBreakIterator()
 
 Color ImpEditEngine::GetAutoColor() const
 {
-    Color aColor = Application::GetSettings().GetStyleSettings().GetWindowTextColor();
+    Color aColor = const_cast<ImpEditEngine*>(this)->GetColorConfig().GetColorValue( svtools::FONTCOLOR ).nColor;
 
     if ( GetBackgroundColor() != COL_AUTO )
     {
diff --git a/svx/source/editeng/impedit5.cxx b/svx/source/editeng/impedit5.cxx
index fe41cd5a4033..96b7b3eff20e 100644
--- a/svx/source/editeng/impedit5.cxx
+++ b/svx/source/editeng/impedit5.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: impedit5.cxx,v $
  *
- *  $Revision: 1.22 $
+ *  $Revision: 1.23 $
  *
- *  last change: $Author: mt $ $Date: 2002-07-19 09:21:18 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -756,16 +756,24 @@ void ImpEditEngine::RemoveCharAttribs( EditSelection aSel, BOOL bRemoveParaAttri
         // Optimieren: Wenn ganzer Absatz, dann RemoveCharAttribs( nPara )?!
         BOOL bChanged = aEditDoc.RemoveAttribs( pNode, nStartPos, nEndPos, nWhich );
         if ( bRemoveParaAttribs )
+        {
             SetParaAttribs( nNode, *pEmptyItemSet );    // Invalidiert
+        }
         else
         {
             // Bei 'Format-Standard' sollen auch die Zeichenattribute verschwinden,
             // die von der DrawingEngine als Absatzattribute eingestellt wurden.
             // Diese koennen sowieso nicht vom Anwender eingestellt worden sein.
-            SfxItemSet aAttribs( GetParaAttribs( nNode ) );
-            for ( USHORT nW = EE_CHAR_START; nW <= EE_CHAR_END; nW++ )
-                aAttribs.ClearItem( nW );
-            SetParaAttribs( nNode, aAttribs );
+
+            // #106871# Not when nWhich
+            // Would have been better to offer a separate method for format/standard...
+            if ( !nWhich )
+            {
+                SfxItemSet aAttribs( GetParaAttribs( nNode ) );
+                for ( USHORT nW = EE_CHAR_START; nW <= EE_CHAR_END; nW++ )
+                    aAttribs.ClearItem( nW );
+                SetParaAttribs( nNode, aAttribs );
+            }
         }
 
         if ( bChanged && !bRemoveParaAttribs )
diff --git a/svx/source/editeng/unolingu.cxx b/svx/source/editeng/unolingu.cxx
index d2682ed96b02..b6fa063fe54d 100644
--- a/svx/source/editeng/unolingu.cxx
+++ b/svx/source/editeng/unolingu.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unolingu.cxx,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: tl $ $Date: 2002-12-09 16:17:05 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1242,7 +1242,7 @@ String SvxGetDictionaryURL(const String &rDicName, sal_Bool bIsUserDic)
     aURLObj.SetSmartProtocol( INET_PROT_FILE );
     aURLObj.SetSmartURL( aDirName );
     DBG_ASSERT(!aURLObj.HasError(), "lng : invalid URL");
-    aURLObj.Append( rDicName );
+    aURLObj.Append( rDicName, INetURLObject::ENCODE_ALL );
     DBG_ASSERT(!aURLObj.HasError(), "lng : invalid URL");
 
     return aURLObj.GetMainURL( INetURLObject::DECODE_TO_IURI );
diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx
index 472d63fa8237..db166d7dad3b 100644
--- a/svx/source/engine3d/extrud3d.cxx
+++ b/svx/source/engine3d/extrud3d.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: extrud3d.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: cl $ $Date: 2002-06-07 12:06:28 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -169,11 +169,13 @@ void E3dExtrudeObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault)
     ImpForceItemSet();
 
     fExtrudeScale = rDefault.GetDefaultExtrudeScale();
-    bExtrudeSmoothed = rDefault.GetDefaultExtrudeSmoothed();
-    bExtrudeSmoothFrontBack = rDefault.GetDefaultExtrudeSmoothFrontBack();
-    bExtrudeCharacterMode = rDefault.GetDefaultExtrudeCharacterMode();
-    bExtrudeCloseFront = rDefault.GetDefaultExtrudeCloseFront();
-    bExtrudeCloseBack = rDefault.GetDefaultExtrudeCloseBack();
+
+    // #107245#
+    mpObjectItemSet->Put(Svx3DSmoothNormalsItem(rDefault.GetDefaultExtrudeSmoothed()));
+    mpObjectItemSet->Put(Svx3DSmoothLidsItem(rDefault.GetDefaultExtrudeSmoothFrontBack()));
+    mpObjectItemSet->Put(Svx3DCharacterModeItem(rDefault.GetDefaultExtrudeCharacterMode()));
+    mpObjectItemSet->Put(Svx3DCloseFrontItem(rDefault.GetDefaultExtrudeCloseFront()));
+    mpObjectItemSet->Put(Svx3DCloseBackItem(rDefault.GetDefaultExtrudeCloseBack()));
 
     // Bei extrudes defaultmaessig StdTexture in X und Y
     mpObjectItemSet->Put(Svx3DTextureProjectionXItem(1));
@@ -290,18 +292,18 @@ void E3dExtrudeObj::CreateGeometry()
             aBackSide,
             0L,
             0L,
-            bExtrudeCloseFront,
-            bExtrudeCloseBack,
+            GetCloseFront(), // #107245# bExtrudeCloseFront,
+            GetCloseBack(), // #107245# bExtrudeCloseBack,
             (double)GetPercentDiagonal() / 200.0,
-            GetExtrudeSmoothed(),
-            GetExtrudeSmoothed(),
-            GetExtrudeSmoothFrontBack(),
+            GetSmoothNormals(), // #107245# GetExtrudeSmoothed(),
+            GetSmoothNormals(), // #107245# GetExtrudeSmoothed(),
+            GetSmoothLids(), // #107245# GetExtrudeSmoothFrontBack(),
             fSurroundFactor,
             fTextureStart,
             fTextureDepth,
             GetCreateNormals(),
             GetCreateTexture(),
-            bExtrudeCharacterMode,
+            GetCharacterMode(), // #107245# bExtrudeCharacterMode,
             FALSE,
             // #78972#
             &maLinePolyPolygon);
@@ -394,14 +396,14 @@ void E3dExtrudeObj::WriteData(SvStream& rOut) const
 
     rOut << (double)GetPercentDiagonal() / 200.0;
 
-    rOut << (BOOL)bExtrudeSmoothed;
-    rOut << (BOOL)bExtrudeSmoothFrontBack;
-    rOut << (BOOL)bExtrudeCharacterMode;
+    rOut << GetSmoothNormals(); // #107245# (BOOL)bExtrudeSmoothed;
+    rOut << GetSmoothLids(); // #107245# (BOOL)bExtrudeSmoothFrontBack;
+    rOut << GetCharacterMode(); // #107245# (BOOL)bExtrudeCharacterMode;
 
     // Ab Version 513a (5.2.99): Parameter fuer das
     // Erzeugen der Vorder/Rueckwand
-    rOut << (BOOL)bExtrudeCloseFront;
-    rOut << (BOOL)bExtrudeCloseBack;
+    rOut << GetCloseFront(); // #107245# (BOOL)bExtrudeCloseFront;
+    rOut << GetCloseBack(); // #107245# (BOOL)bExtrudeCloseBack;
 
     if(nVersion < 3800)
     {
@@ -445,9 +447,14 @@ void E3dExtrudeObj::ReadData(const SdrObjIOHeader& rHead, SvStream& rIn)
             rIn >> fTmp;
             mpObjectItemSet->Put(Svx3DPercentDiagonalItem(sal_uInt16(fTmp * 200.0)));
 
-            rIn >> bTmp; bExtrudeSmoothed = bTmp;
-            rIn >> bTmp; bExtrudeSmoothFrontBack = bTmp;
-            rIn >> bTmp; bExtrudeCharacterMode = bTmp;
+            rIn >> bTmp; // #107245# bExtrudeSmoothed = bTmp;
+            mpObjectItemSet->Put(Svx3DSmoothNormalsItem(bTmp));
+
+            rIn >> bTmp; // #107245# bExtrudeSmoothFrontBack = bTmp;
+            mpObjectItemSet->Put(Svx3DSmoothLidsItem(bTmp));
+
+            rIn >> bTmp; // #107245# bExtrudeCharacterMode = bTmp;
+            mpObjectItemSet->Put(Svx3DCharacterModeItem(bTmp));
 
             bAllDone = TRUE;
 
@@ -457,13 +464,19 @@ void E3dExtrudeObj::ReadData(const SdrObjIOHeader& rHead, SvStream& rIn)
                 // Erzeugen der Vorder/Rueckwand
                 BOOL bTmp;
 
-                rIn >> bTmp; bExtrudeCloseFront = bTmp;
-                rIn >> bTmp; bExtrudeCloseBack = bTmp;
+                rIn >> bTmp; // #107245# bExtrudeCloseFront = bTmp;
+                mpObjectItemSet->Put(Svx3DCloseFrontItem(bTmp));
+
+                rIn >> bTmp; // #107245# bExtrudeCloseBack = bTmp;
+                mpObjectItemSet->Put(Svx3DCloseBackItem(bTmp));
             }
             else
             {
-                bExtrudeCloseFront = TRUE;
-                bExtrudeCloseBack = TRUE;
+                // #107245# bExtrudeCloseFront = TRUE;
+                mpObjectItemSet->Put(Svx3DCloseFrontItem(sal_True));
+
+                // #107245# bExtrudeCloseBack = TRUE;
+                mpObjectItemSet->Put(Svx3DCloseBackItem(sal_True));
             }
         }
     }
@@ -590,9 +603,14 @@ void E3dExtrudeObj::ReadData(const SdrObjIOHeader& rHead, SvStream& rIn)
 
             mpObjectItemSet->Put(Svx3DPercentDiagonalItem(10));
 
-            bExtrudeSmoothed = TRUE;
-            bExtrudeSmoothFrontBack = FALSE;
-            bExtrudeCharacterMode = FALSE;
+            // #107245# bExtrudeSmoothed = TRUE;
+            mpObjectItemSet->Put(Svx3DSmoothNormalsItem(sal_True));
+
+            // #107245# bExtrudeSmoothFrontBack = FALSE;
+            mpObjectItemSet->Put(Svx3DSmoothLidsItem(sal_False));
+
+            // #107245# bExtrudeCharacterMode = FALSE;
+            mpObjectItemSet->Put(Svx3DCharacterModeItem(sal_False));
         }
     }
 
@@ -645,11 +663,12 @@ void E3dExtrudeObj::operator=(const SdrObject& rObj)
     // #95519# copy LinePolygon info, too
     maLinePolyPolygon = r3DObj.maLinePolyPolygon;
 
-    bExtrudeSmoothed = r3DObj.bExtrudeSmoothed;
-    bExtrudeSmoothFrontBack = r3DObj.bExtrudeSmoothFrontBack;
-    bExtrudeCharacterMode = r3DObj.bExtrudeCharacterMode;
-    bExtrudeCloseFront = r3DObj.bExtrudeCloseFront;
-    bExtrudeCloseBack = r3DObj.bExtrudeCloseBack;
+    // #107245# These properties are now items and are copied with the ItemSet
+    // bExtrudeSmoothed = r3DObj.bExtrudeSmoothed;
+    // bExtrudeSmoothFrontBack = r3DObj.bExtrudeSmoothFrontBack;
+    // bExtrudeCharacterMode = r3DObj.bExtrudeCharacterMode;
+    // bExtrudeCloseFront = r3DObj.bExtrudeCloseFront;
+    // bExtrudeCloseBack = r3DObj.bExtrudeCloseBack;
 }
 
 /*************************************************************************
@@ -676,50 +695,55 @@ void E3dExtrudeObj::SetExtrudeScale(double fNew)
     }
 }
 
-void E3dExtrudeObj::SetExtrudeSmoothed(BOOL bNew)
-{
-    if(bExtrudeSmoothed != bNew)
-    {
-        bExtrudeSmoothed = bNew;
-        bGeometryValid = FALSE;
-    }
-}
-
-void E3dExtrudeObj::SetExtrudeSmoothFrontBack(BOOL bNew)
-{
-    if(bExtrudeSmoothFrontBack != bNew)
-    {
-        bExtrudeSmoothFrontBack = bNew;
-        bGeometryValid = FALSE;
-    }
-}
-
-void E3dExtrudeObj::SetExtrudeCharacterMode(BOOL bNew)
-{
-    if(bExtrudeCharacterMode != bNew)
-    {
-        bExtrudeCharacterMode = bNew;
-        bGeometryValid = FALSE;
-    }
-}
-
-void E3dExtrudeObj::SetExtrudeCloseFront(BOOL bNew)
-{
-    if(bExtrudeCloseFront != bNew)
-    {
-        bExtrudeCloseFront = bNew;
-        bGeometryValid = FALSE;
-    }
-}
-
-void E3dExtrudeObj::SetExtrudeCloseBack(BOOL bNew)
-{
-    if(bExtrudeCloseBack != bNew)
-    {
-        bExtrudeCloseBack = bNew;
-        bGeometryValid = FALSE;
-    }
-}
+// #107245#
+// void E3dExtrudeObj::SetExtrudeSmoothed(BOOL bNew)
+// {
+//  if(bExtrudeSmoothed != bNew)
+//  {
+//      bExtrudeSmoothed = bNew;
+//      bGeometryValid = FALSE;
+//  }
+// }
+
+// #107245#
+// void E3dExtrudeObj::SetExtrudeSmoothFrontBack(BOOL bNew)
+// {
+//  if(bExtrudeSmoothFrontBack != bNew)
+//  {
+//      bExtrudeSmoothFrontBack = bNew;
+//      bGeometryValid = FALSE;
+//  }
+// }
+
+// #107245#
+// void E3dExtrudeObj::SetExtrudeCharacterMode(BOOL bNew)
+// {
+//  if(bExtrudeCharacterMode != bNew)
+//  {
+//      bExtrudeCharacterMode = bNew;
+//      bGeometryValid = FALSE;
+//  }
+// }
+
+// #107245#
+// void E3dExtrudeObj::SetExtrudeCloseFront(BOOL bNew)
+// {
+//  if(bExtrudeCloseFront != bNew)
+//  {
+//      bExtrudeCloseFront = bNew;
+//      bGeometryValid = FALSE;
+//  }
+// }
+
+// #107245#
+// void E3dExtrudeObj::SetExtrudeCloseBack(BOOL bNew)
+// {
+//  if(bExtrudeCloseBack != bNew)
+//  {
+//      bExtrudeCloseBack = bNew;
+//      bGeometryValid = FALSE;
+//  }
+// }
 
 //////////////////////////////////////////////////////////////////////////////
 // private support routines for ItemSet access
diff --git a/svx/source/engine3d/float3d.src b/svx/source/engine3d/float3d.src
index 0289b7a467d3..2e1be2502cee 100644
--- a/svx/source/engine3d/float3d.src
+++ b/svx/source/engine3d/float3d.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: float3d.src,v $
  *
- *  $Revision: 1.50 $
+ *  $Revision: 1.51 $
  *
- *  last change: $Author: rt $ $Date: 2002-11-27 16:28:15 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -374,7 +374,7 @@ DockingWindow RID_SVXFLOAT_3D
         QuickHelpText[ dutch ] = "Toewijzen";
         QuickHelpText[ chinese_simplified ] = "指定";
         QuickHelpText[ greek ] = "������������";
-        QuickHelpText[ korean ] = "할당";
+        QuickHelpText[ korean ] = "지정";
         QuickHelpText[ turkish ] = "Zuweisen";
         QuickHelpText[ catalan ] = "Assigna";
         QuickHelpText[ finnish ] = "Liit�";
@@ -572,7 +572,7 @@ DockingWindow RID_SVXFLOAT_3D
         QuickHelpText[ dutch ] = "Alleen 3D-attributen toewijzen";
         QuickHelpText[ chinese_simplified ] = "只指定 3 维属性";
         QuickHelpText[ greek ] = "���� ��������� 3�";
-        QuickHelpText[ korean ] = "3D-속성만";
+        QuickHelpText[ korean ] = "3D 속성만 지정";
         QuickHelpText[ turkish ] = "Nur 3D-Attribute zuweisen";
         QuickHelpText[ catalan ] = "Assigna nom�s atributs 3D";
         QuickHelpText[ finnish ] = "Vain kolmiulotteiset m��ritteet";
@@ -797,7 +797,7 @@ DockingWindow RID_SVXFLOAT_3D
         Text[ dutch ] = "Diepte op schaal brengen";
         Text[ chinese_simplified ] = "深度比例";
         Text[ greek ] = "������� ������";
-        Text[ korean ] = "깊이 배율";
+        Text[ korean ] = "깊이 배율 조정";
         Text[ turkish ] = "Derinlik �l�eklendirmesi";
         Text[ catalan ] = "Profunditat redimensionada";
         Text[ finnish ] = "Skaalattu syvyys";
@@ -864,7 +864,7 @@ DockingWindow RID_SVXFLOAT_3D
         CustomUnitText [ ENGLISH ] = " degree" ;
         CustomUnitText[ english_us ] = " degree(s)";
         CustomUnitText[ portuguese ] = " degree";
-        CustomUnitText[ russian ] = " ������(��)";
+        CustomUnitText[ russian ] = " ��������";
         CustomUnitText[ greek ] = " degree";
         CustomUnitText[ dutch ] = " graden";
         CustomUnitText[ french ] = " degr�s";
@@ -876,7 +876,7 @@ DockingWindow RID_SVXFLOAT_3D
         CustomUnitText[ polish ] = " stopni(e)";
         CustomUnitText[ portuguese_brazilian ] = " degree";
         CustomUnitText[ japanese ] = " 度";
-        CustomUnitText[ korean ] = "각도";
+        CustomUnitText[ korean ] = " 도";
         CustomUnitText[ chinese_simplified ] = " 度";
         CustomUnitText[ chinese_traditional ] = " 度";
         CustomUnitText[ turkish ] = " degree";
@@ -955,7 +955,7 @@ DockingWindow RID_SVXFLOAT_3D
         Text[ dutch ] = "Geometrie";
         Text[ chinese_simplified ] = "几何";
         Text[ greek ] = "���������";
-        Text[ korean ] = "기하";
+        Text[ korean ] = "기하학";
         Text[ turkish ] = "Geometri";
         Text[ catalan ] = "Geometria";
         Text[ finnish ] = "Geometria";
@@ -991,7 +991,7 @@ DockingWindow RID_SVXFLOAT_3D
         QuickHelpText[ dutch ] = "Objectspezifiek";
         QuickHelpText[ chinese_simplified ] = "特殊对象";
         QuickHelpText[ greek ] = "������� �� �� �����������";
-        QuickHelpText[ korean ] = "개체-특유";
+        QuickHelpText[ korean ] = "개체 특유";
         QuickHelpText[ turkish ] = "Objektspezifisch";
         QuickHelpText[ catalan ] = "Espec�fic de l'objecte";
         QuickHelpText[ finnish ] = "Objektikohtainen";
@@ -1419,7 +1419,7 @@ DockingWindow RID_SVXFLOAT_3D
         QuickHelpText[ dutch ] = "3D-schaduw in/-uitschakelen";
         QuickHelpText[ chinese_simplified ] = "显示/隐入 3 维阴影";
         QuickHelpText[ greek ] = "���� 3� ���/���";
-        QuickHelpText[ korean ] = "3D-음영 적용/적용 안함";
+        QuickHelpText[ korean ] = "3D 그림자 적용/해제";
         QuickHelpText[ turkish ] = "3D-Schatten ein/-ausschalten";
         QuickHelpText[ catalan ] = "Activa/desactiva ombra 3D";
         QuickHelpText[ finnish ] = "Kolmiulotteinen varjostus on/off";
@@ -1473,7 +1473,7 @@ DockingWindow RID_SVXFLOAT_3D
         Last = 90 ;
         CustomUnitText[ english_us ] = " degree(s)";
         CustomUnitText[ portuguese ] = " degree";
-        CustomUnitText[ russian ] = " ������(��)";
+        CustomUnitText[ russian ] = " ��������";
         CustomUnitText[ greek ] = " degree";
         CustomUnitText[ dutch ] = " graden";
         CustomUnitText[ french ] = " degr�s";
@@ -1485,7 +1485,7 @@ DockingWindow RID_SVXFLOAT_3D
         CustomUnitText[ polish ] = " stopni(e)";
         CustomUnitText[ portuguese_brazilian ] = " degree";
         CustomUnitText[ japanese ] = " 度";
-        CustomUnitText[ korean ] = "각도";
+        CustomUnitText[ korean ] = " 도";
         CustomUnitText[ chinese_simplified ] = " 度";
         CustomUnitText[ chinese_traditional ] = " 度";
         CustomUnitText[ turkish ] = " degree";
@@ -1517,7 +1517,7 @@ DockingWindow RID_SVXFLOAT_3D
         Text[ dutch ] = "Schaduw";
         Text[ chinese_simplified ] = "阴影";
         Text[ greek ] = "����";
-        Text[ korean ] = "음영";
+        Text[ korean ] = "그림자";
         Text[ turkish ] = "G�lge";
         Text[ catalan ] = "Ombra";
         Text[ finnish ] = "Varjo";
@@ -2421,7 +2421,7 @@ DockingWindow RID_SVXFLOAT_3D
         QuickHelpText[ dutch ] = "Textuur, schaduw en kleur";
         QuickHelpText[ chinese_simplified ] = "纹理，阴影和颜色";
         QuickHelpText[ greek ] = "���, ������ ��� ������";
-        QuickHelpText[ korean ] = "질감, 음영 및 색상";
+        QuickHelpText[ korean ] = "질감, 그림자 및 색상";
         QuickHelpText[ turkish ] = "Textur, Schattierung und Farbe";
         QuickHelpText[ catalan ] = "Textura, ombra i color";
         QuickHelpText[ finnish ] = "Pintakuvio, varjostus ja v�ri";
@@ -2486,7 +2486,7 @@ DockingWindow RID_SVXFLOAT_3D
         QuickHelpText[ dutch ] = "Passend bij object";
         QuickHelpText[ chinese_simplified ] = "特殊对象";
         QuickHelpText[ greek ] = "������� �� �� �����������";
-        QuickHelpText[ korean ] = "개체-특유의";
+        QuickHelpText[ korean ] = "개체 특유의";
         QuickHelpText[ turkish ] = "Objektspezifisch";
         QuickHelpText[ catalan ] = "Espec�fic de l'objecte";
         QuickHelpText[ finnish ] = "Objektikohtainen";
@@ -2621,7 +2621,7 @@ DockingWindow RID_SVXFLOAT_3D
         QuickHelpText[ dutch ] = "Passend bij object";
         QuickHelpText[ chinese_simplified ] = "特殊对象";
         QuickHelpText[ greek ] = "������� �� �� �����������";
-        QuickHelpText[ korean ] = "개체-특유의";
+        QuickHelpText[ korean ] = "개체 특유의";
         QuickHelpText[ turkish ] = "Objektspezifisch";
         QuickHelpText[ catalan ] = "Espec�fic de l'objecte";
         QuickHelpText[ finnish ] = "Objektikohtainen";
@@ -3027,7 +3027,7 @@ DockingWindow RID_SVXFLOAT_3D
         < "금" ; > ;
         < "크롬" ; > ;
         < "플라스틱" ; > ;
-        < "나무" ; > ;
+        < "목재" ; > ;
     };
     StringList [ language_user1 ] =
     {
@@ -3099,7 +3099,7 @@ DockingWindow RID_SVXFLOAT_3D
         Text[ dutch ] = "Objectkleur";
         Text[ chinese_simplified ] = "对象颜色";
         Text[ greek ] = "����� ������������";
-        Text[ korean ] = "개체색";
+        Text[ korean ] = "개체 색상";
         Text[ turkish ] = "Nesne rengi";
         Text[ catalan ] = "Color de l'objecte";
         Text[ finnish ] = "Objektin v�ri";
@@ -3245,7 +3245,7 @@ DockingWindow RID_SVXFLOAT_3D
         Text[ dutch ] = "Kleur";
         Text[ chinese_simplified ] = "颜色";
         Text[ greek ] = "�����";
-        Text[ korean ] = "색";
+        Text[ korean ] = "색상";
         Text[ turkish ] = "Renk";
         Text[ catalan ] = "Color";
         Text[ finnish ] = "V�ri";
@@ -3364,7 +3364,7 @@ DockingWindow RID_SVXFLOAT_3D
         Text[ dutch ] = "Glanspunt";
         Text[ chinese_simplified ] = "发光点";
         Text[ greek ] = "������ ���������";
-        Text[ korean ] = "하일라이트";
+        Text[ korean ] = "반사";
         Text[ turkish ] = "Parlama noktas�";
         Text[ catalan ] = "Punt de brillantor";
         Text[ finnish ] = "Heijastus";
@@ -3847,3 +3847,8 @@ String RID_SVXFLOAT3D_FIX_B
 
 
 
+
+
+
+
+
diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx
index 015181dce672..da10115d32df 100644
--- a/svx/source/engine3d/lathe3d.cxx
+++ b/svx/source/engine3d/lathe3d.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: lathe3d.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: cl $ $Date: 2002-06-07 12:06:28 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -243,11 +243,13 @@ void E3dLatheObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault)
     ImpForceItemSet();
 
     fLatheScale = rDefault.GetDefaultLatheScale();
-    bLatheSmoothed = rDefault.GetDefaultLatheSmoothed();
-    bLatheSmoothFrontBack = rDefault.GetDefaultLatheSmoothFrontBack();
-    bLatheCharacterMode = rDefault.GetDefaultLatheCharacterMode();
-    bLatheCloseFront = rDefault.GetDefaultLatheCloseFront();
-    bLatheCloseBack = rDefault.GetDefaultLatheCloseBack();
+
+    // #107245#
+    mpObjectItemSet->Put(Svx3DSmoothNormalsItem(rDefault.GetDefaultLatheSmoothed()));
+    mpObjectItemSet->Put(Svx3DSmoothLidsItem(rDefault.GetDefaultLatheSmoothFrontBack()));
+    mpObjectItemSet->Put(Svx3DCharacterModeItem(rDefault.GetDefaultLatheCharacterMode()));
+    mpObjectItemSet->Put(Svx3DCloseFrontItem(rDefault.GetDefaultLatheCloseFront()));
+    mpObjectItemSet->Put(Svx3DCloseBackItem(rDefault.GetDefaultLatheCloseBack()));
 }
 
 /*************************************************************************
@@ -398,19 +400,19 @@ void E3dLatheObj::CreateGeometry()
                 aBack,
                 &aPrev,
                 &aNext,
-                (a == 0) && bCreateSides && bLatheCloseFront,
-                (a == nUpperBound-1) && bCreateSides && bLatheCloseBack,
+                (a == 0) && bCreateSides && GetCloseFront(), // #107245# bLatheCloseFront,
+                (a == nUpperBound-1) && bCreateSides && GetCloseBack(), // #107245# bLatheCloseBack,
                 ((double)GetPercentDiagonal() / 200.0)
                     * (double(nUpperBound) / 6.0),
-                GetLatheSmoothed(),
-                GetLatheSmoothed(),
-                GetLatheSmoothFrontBack(),
+                GetSmoothNormals(), // #107245# GetLatheSmoothed(),
+                GetSmoothNormals(), // #107245# GetLatheSmoothed(),
+                GetSmoothLids(), // #107245# GetLatheSmoothFrontBack(),
                 1.0,
                 fTmpStart,
                 fTmpLength,
                 GetCreateTexture(),
                 GetCreateNormals(),
-                GetLatheCharacterMode(),
+                GetCharacterMode(), // #107245# GetLatheCharacterMode(),
                 TRUE,
                 // #78972#
                 &maLinePolyPolygon);
@@ -541,12 +543,13 @@ void E3dLatheObj::operator=(const SdrObject& rObj)
     // #95519# copy LinePolygon info, too
     maLinePolyPolygon = r3DObj.maLinePolyPolygon;
 
-    // Ab Version 374 (15.12.97)
-    bLatheSmoothed = r3DObj.bLatheSmoothed;
-    bLatheSmoothFrontBack = r3DObj.bLatheSmoothFrontBack;
-    bLatheCharacterMode = r3DObj.bLatheCharacterMode;
-    bLatheCloseFront = r3DObj.bLatheCloseFront;
-    bLatheCloseBack = r3DObj.bLatheCloseBack;
+    // #107245# These properties are now items and are copied with the ItemSet
+    // // Ab Version 374 (15.12.97)
+    // bLatheSmoothed = r3DObj.bLatheSmoothed;
+    // bLatheSmoothFrontBack = r3DObj.bLatheSmoothFrontBack;
+    // bLatheCharacterMode = r3DObj.bLatheCharacterMode;
+    // bLatheCloseFront = r3DObj.bLatheCloseFront;
+    // bLatheCloseBack = r3DObj.bLatheCloseBack;
 }
 
 /*************************************************************************
@@ -618,9 +621,9 @@ void E3dLatheObj::WriteData(SvStream& rOut) const
 
     rOut << ((double)GetPercentDiagonal() / 200.0);
 
-    rOut << (BOOL)bLatheSmoothed;
-    rOut << (BOOL)bLatheSmoothFrontBack;
-    rOut << (BOOL)bLatheCharacterMode;
+    rOut << GetSmoothNormals(); // #107245# (BOOL)bLatheSmoothed;
+    rOut << GetSmoothLids(); // #107245# (BOOL)bLatheSmoothFrontBack;
+    rOut << GetCharacterMode(); // #107245# (BOOL)bLatheCharacterMode;
 
     // Ab Version 395 (8.6.98): Parameter aus dem Objekt
     // E3dCompoundObject. Da irgendwann mal jemand die Ableitungs-
@@ -663,8 +666,8 @@ void E3dLatheObj::WriteData(SvStream& rOut) const
 
     // Ab Version 513a (5.2.99): Parameter fuer das
     // Erzeugen der Vorder/Rueckwand
-    rOut << BOOL(bLatheCloseFront);
-    rOut << BOOL(bLatheCloseBack);
+    rOut << GetCloseFront(); // #107245# BOOL(bLatheCloseFront);
+    rOut << GetCloseBack(); // #107245# BOOL(bLatheCloseBack);
 
     // neu ab 534: (hat noch gefehlt)
     rOut << BOOL(GetTextureFilter());
@@ -700,6 +703,9 @@ void E3dLatheObj::ReadData(const SdrObjIOHeader& rHead, SvStream& rIn)
         // dann die Member
         UINT16  nTmp16;
 
+        // #106240# Flag if poly was loaded (all versions above 3.0 and 3.1)
+        sal_Bool bPolyWasRead(sal_False);
+
         pSub->Load(rIn, *pPage);
 
         // Parameter aus E3dObject laden
@@ -726,6 +732,9 @@ void E3dLatheObj::ReadData(const SdrObjIOHeader& rHead, SvStream& rIn)
             // rIn >> aPolyPoly3D;
             rIn >> aPolyPoly3D[0];
 
+            // #106240# OK, this file does have a saved polygon
+            bPolyWasRead = sal_True;
+
             rIn >> nTmp;
             mpObjectItemSet->Put(Svx3DHorizontalSegmentsItem(nTmp));
 
@@ -738,6 +747,40 @@ void E3dLatheObj::ReadData(const SdrObjIOHeader& rHead, SvStream& rIn)
             rIn >> fLatheScale;
         }
 
+        // #106240# No PolyPolygon as base for the lathe object was saved.
+        // Reconstruct it from the objects in the SubList.
+        if(!bPolyWasRead)
+        {
+            // This is really a old 3.0 or 3.1 file, reconstruct
+            // the not saved polygon using the SubList.
+            SdrObjList* pSubList = GetSubList();
+
+            if(pSubList && pSubList->GetObjCount())
+            {
+                sal_uInt16 nHorSegCount = (sal_uInt16)GetHorizontalSegments() / 2;
+                sal_uInt16 nVerSegCount = (sal_uInt16)(pSubList->GetObjCount() / nHorSegCount);
+                Polygon3D aNewBasePoly;
+
+                for(sal_uInt16 a(0); a < nVerSegCount; a++)
+                {
+                    E3dPolyObj* pCandidate = (E3dPolyObj*)pSubList->GetObj(a * nHorSegCount);
+                    if(pCandidate->ISA(E3dPolyObj))
+                    {
+                        const PolyPolygon3D& rCandPoly = ((E3dPolyObj*)pCandidate)->GetPolyPolygon3D();
+
+                        if(rCandPoly[0].GetPointCount() > 1)
+                        {
+                            aNewBasePoly[a] = rCandPoly[0][1];
+                        }
+                    }
+                }
+
+                aPolyPoly3D.Clear();
+                aNewBasePoly.SetClosed(sal_True);
+                aPolyPoly3D.Insert(aNewBasePoly);
+            }
+        }
+
         if (aCompat.GetBytesLeft())
         {
             // Ab Version 364f (19.06.97)
@@ -768,9 +811,14 @@ void E3dLatheObj::ReadData(const SdrObjIOHeader& rHead, SvStream& rIn)
             rIn >> fTmp;
             mpObjectItemSet->Put(Svx3DPercentDiagonalItem(sal_uInt16(fTmp * 200.0)));
 
-            rIn >> bTmp; bLatheSmoothed = bTmp;
-            rIn >> bTmp; bLatheSmoothFrontBack = bTmp;
-            rIn >> bTmp; bLatheCharacterMode = bTmp;
+            rIn >> bTmp; // #107245# bLatheSmoothed = bTmp;
+            mpObjectItemSet->Put(Svx3DSmoothNormalsItem(bTmp));
+
+            rIn >> bTmp; // #107245# bLatheSmoothFrontBack = bTmp;
+            mpObjectItemSet->Put(Svx3DSmoothLidsItem(bTmp));
+
+            rIn >> bTmp; // #107245# bLatheCharacterMode = bTmp;
+            mpObjectItemSet->Put(Svx3DCharacterModeItem(bTmp));
         }
         else
         {
@@ -779,9 +827,14 @@ void E3dLatheObj::ReadData(const SdrObjIOHeader& rHead, SvStream& rIn)
 
             mpObjectItemSet->Put(Svx3DPercentDiagonalItem(10));
 
-            bLatheSmoothed = TRUE;
-            bLatheSmoothFrontBack = FALSE;
-            bLatheCharacterMode = FALSE;
+            // #107245# bLatheSmoothed = TRUE;
+            mpObjectItemSet->Put(Svx3DSmoothNormalsItem(sal_True));
+
+            // #107245# bLatheSmoothFrontBack = FALSE;
+            mpObjectItemSet->Put(Svx3DSmoothLidsItem(sal_False));
+
+            // #107245# bLatheCharacterMode = FALSE;
+            mpObjectItemSet->Put(Svx3DCharacterModeItem(sal_False));
         }
 
         if (aCompat.GetBytesLeft())
@@ -870,13 +923,19 @@ void E3dLatheObj::ReadData(const SdrObjIOHeader& rHead, SvStream& rIn)
             // Erzeugen der Vorder/Rueckwand
             BOOL bTmp;
 
-            rIn >> bTmp; bLatheCloseFront = bTmp;
-            rIn >> bTmp; bLatheCloseBack = bTmp;
+            rIn >> bTmp; // #107245# bLatheCloseFront = bTmp;
+            mpObjectItemSet->Put(Svx3DCloseFrontItem(bTmp));
+
+            rIn >> bTmp; // #107245# bLatheCloseBack = bTmp;
+            mpObjectItemSet->Put(Svx3DCloseBackItem(bTmp));
         }
         else
         {
-            bLatheCloseFront = TRUE;
-            bLatheCloseBack = TRUE;
+            // #107245# bLatheCloseFront = TRUE;
+            mpObjectItemSet->Put(Svx3DCloseFrontItem(sal_True));
+
+            // #107245# bLatheCloseBack = TRUE;
+            mpObjectItemSet->Put(Svx3DCloseBackItem(sal_True));
         }
 
         // neu ab 534: (hat noch gefehlt)
@@ -979,50 +1038,55 @@ void E3dLatheObj::SetLatheScale(double fNew)
     }
 }
 
-void E3dLatheObj::SetLatheSmoothed(BOOL bNew)
-{
-    if(bLatheSmoothed != bNew)
-    {
-        bLatheSmoothed = bNew;
-        bGeometryValid = FALSE;
-    }
-}
-
-void E3dLatheObj::SetLatheSmoothFrontBack(BOOL bNew)
-{
-    if(bLatheSmoothFrontBack != bNew)
-    {
-        bLatheSmoothFrontBack = bNew;
-        bGeometryValid = FALSE;
-    }
-}
-
-void E3dLatheObj::SetLatheCharacterMode(BOOL bNew)
-{
-    if(bLatheCharacterMode != bNew)
-    {
-        bLatheCharacterMode = bNew;
-        bGeometryValid = FALSE;
-    }
-}
-
-void E3dLatheObj::SetLatheCloseFront(BOOL bNew)
-{
-    if(bLatheCloseFront != bNew)
-    {
-        bLatheCloseFront = bNew;
-        bGeometryValid = FALSE;
-    }
-}
-
-void E3dLatheObj::SetLatheCloseBack(BOOL bNew)
-{
-    if(bLatheCloseBack != bNew)
-    {
-        bLatheCloseBack = bNew;
-        bGeometryValid = FALSE;
-    }
-}
+// #107245#
+// void E3dLatheObj::SetLatheSmoothed(BOOL bNew)
+// {
+//  if(bLatheSmoothed != bNew)
+//  {
+//      bLatheSmoothed = bNew;
+//      bGeometryValid = FALSE;
+//  }
+// }
+
+// #107245#
+// void E3dLatheObj::SetLatheSmoothFrontBack(BOOL bNew)
+// {
+//  if(bLatheSmoothFrontBack != bNew)
+//  {
+//      bLatheSmoothFrontBack = bNew;
+//      bGeometryValid = FALSE;
+//  }
+// }
+
+// #107245#
+// void E3dLatheObj::SetLatheCharacterMode(BOOL bNew)
+// {
+//  if(bLatheCharacterMode != bNew)
+//  {
+//      bLatheCharacterMode = bNew;
+//      bGeometryValid = FALSE;
+//  }
+// }
+
+// #107245#
+// void E3dLatheObj::SetLatheCloseFront(BOOL bNew)
+// {
+//  if(bLatheCloseFront != bNew)
+//  {
+//      bLatheCloseFront = bNew;
+//      bGeometryValid = FALSE;
+//  }
+// }
+
+// #107245#
+// void E3dLatheObj::SetLatheCloseBack(BOOL bNew)
+// {
+//  if(bLatheCloseBack != bNew)
+//  {
+//      bLatheCloseBack = bNew;
+//      bGeometryValid = FALSE;
+//  }
+// }
 
 //////////////////////////////////////////////////////////////////////////////
 // private support routines for ItemSet access
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index 64dbbda68536..e51da5897949 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: obj3d.cxx,v $
  *
- *  $Revision: 1.25 $
+ *  $Revision: 1.26 $
  *
- *  last change: $Author: thb $ $Date: 2002-08-22 09:46:27 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -236,6 +236,10 @@
 #include <svtools/whiter.hxx>
 #endif
 
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include <svtools/colorcfg.hxx>
+#endif
+
 #ifndef _EEITEM_HXX
 #include "eeitem.hxx"
 #endif
@@ -1678,6 +1682,22 @@ void E3dObject::ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem)
     SdrAttrObj::ItemChange(nWhich, pNewItem);
 }
 
+// #107770# Like propagating ItemChange to the scene if scene items are changed,
+// do the same with the PostItemChange calls.
+void E3dObject::PostItemChange(const sal_uInt16 nWhich)
+{
+    // propagate item changes to scene
+    if(!nWhich || (nWhich >= SDRATTR_3DSCENE_FIRST && nWhich <= SDRATTR_3DSCENE_LAST))
+    {
+        E3dScene* pScene = GetScene();
+        if(pScene && pScene != this)
+            pScene->PostItemChange(nWhich);
+    }
+
+    // call parent
+    SdrAttrObj::PostItemChange(nWhich);
+}
+
 void E3dObject::ItemSetChanged( const SfxItemSet& rSet )
 {
     // call parent
@@ -3480,7 +3500,10 @@ void E3dCompoundObject::ImpSet3DParForFill(ExtOutputDevice& rOut, Base3D* pBase3
                     }
                     else
                     {
-                        aLogicalSize = OutputDevice::LogicToLogic(aLogicalSize, aBmpEx.GetPrefMapMode(), MAP_100TH_MM);
+                        if ( aBmpEx.GetPrefMapMode() == MAP_PIXEL )
+                            aLogicalSize = Application::GetDefaultDevice()->PixelToLogic( aLogicalSize, MAP_100TH_MM );
+                        else
+                            aLogicalSize = OutputDevice::LogicToLogic( aLogicalSize, aBmpEx.GetPrefMapMode(), MAP_100TH_MM );
                     }
 
                     if(bLogSize)
@@ -3488,7 +3511,7 @@ void E3dCompoundObject::ImpSet3DParForFill(ExtOutputDevice& rOut, Base3D* pBase3
                         // logische Groesse
                         if(aSize.Width() == 0 && aSize.Height() == 0)
                         {
-                            // Originalgroesse benutzen, Original flag
+                            // Originalgroesse benutzen, Original flagy
 
                             // Um ein vernuenftiges Mapping bei defaults auch
                             // fuer 3D-Objekte zu erreichen, nimm die logische
@@ -3771,7 +3794,8 @@ void E3dCompoundObject::ImpSet3DParForLine(ExtOutputDevice& rOut, Base3D* pBase3
 
         if(pBase3D->GetOutputDevice()->GetDrawMode() & DRAWMODE_SETTINGSLINE)
         {
-            aColorLine = Application::GetSettings().GetStyleSettings().GetWindowTextColor();
+            svtools::ColorConfig aColorConfig;
+            aColorLine = Color( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor );
         }
 
         if(nLineWidth && !bIsLineDraft)
diff --git a/svx/source/engine3d/string3d.src b/svx/source/engine3d/string3d.src
index 2820fecee22a..a07fbfe7fc64 100644
--- a/svx/source/engine3d/string3d.src
+++ b/svx/source/engine3d/string3d.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: string3d.src,v $
  *
- *  $Revision: 1.21 $
+ *  $Revision: 1.22 $
  *
- *  last change: $Author: kz $ $Date: 2001-11-16 22:26:31 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,17 +77,18 @@ String RID_SVX_3D_CREATE_LATHE
     Text [ portuguese_brazilian ] = "Erstelle 3D-Rotationsobjekt" ;
     Text [ portuguese ] = "Criar objectos de rota��o 3D" ;
     Text[ chinese_simplified ] = "建立3维旋转体";
-    Text[ russian ] = "������� ������ ��������";
+    Text[ russian ] = "������� ���������� ������ ��������";
     Text[ polish ] = "Utw�rz 3-W obiekt obrotowy";
-    Text[ japanese ] = "3D 回転体ｵﾌﾞｼﾞｪｸﾄの作成";
+    Text[ japanese ] = "3D 回転体オブジェクトの作成";
     Text[ chinese_traditional ] = "建立 3D 旋轉體";
     Text[ arabic ] = "����� ���� ������� ����� �������";
     Text[ greek ] = "���������� ��������������� ������������ 3�";
-    Text[ korean ] = "3D 회전개체 만들기";
+    Text[ korean ] = "3D 회전 개체 만들기";
     Text[ turkish ] = "3B d�ner nesne olu�tur";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Crear objeto de rotaci�n 3D";
-    Text[ finnish ] = "Luo 3D-kierto-objekti";
+    Text[ catalan ] = "Crea un objecte de gir 3D";
+    Text[ finnish ] = "Luo 3D-py�r�hdyskappale";
+    Text[ thai ] = "สร้างวัตถุหมุน 3มิติ";
 };
 String RID_SVX_3D_UNDO_EXCHANGE_PASTE
 {
@@ -99,7 +100,7 @@ String RID_SVX_3D_UNDO_EXCHANGE_PASTE
     Text [ italian ] = "Incolla oggetti" ;
     Text [ portuguese_brazilian ] = "Colar objeto(s)" ;
     Text [ portuguese ] = "Inserir objecto(s)" ;
-    Text [ finnish ] = "Lis?? objekti(t)" ;
+    Text [ finnish ] = "Lis�� objekti(t)" ;
     Text [ danish ] = "Inds�t objekt(er)" ;
     Text [ french ] = "Ins�rer le(s) objet(s)" ;
     Text [ swedish ] = "Infoga objekt" ;
@@ -109,14 +110,15 @@ String RID_SVX_3D_UNDO_EXCHANGE_PASTE
     Text[ chinese_simplified ] = "插入对象";
     Text[ russian ] = "�������� ������(�)";
     Text[ polish ] = "Wstaw obiekt (y)";
-    Text[ japanese ] = "ｵﾌﾞｼﾞｪｸﾄの挿入";
+    Text[ japanese ] = "オブジェクトの挿入";
     Text[ chinese_traditional ] = "插入物件";
     Text[ arabic ] = "����� ����/������";
     Text[ greek ] = "�������� ������������/-��";
     Text[ korean ] = "개체 삽입";
     Text[ turkish ] = "Nesne ekle";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Insertar objeto(s)";
+    Text[ catalan ] = "Insereix objecte(s)";
+    Text[ thai ] = "แทรกวัตถุ";
 };
 String RID_SVX_3D_UNDO_SEGMENTS
 {
@@ -141,8 +143,9 @@ String RID_SVX_3D_UNDO_SEGMENTS
     Text[ korean ] = "세그먼트 수";
     Text[ turkish ] = "Par�a say�s�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "N�mero de segmentos";
-    Text[ finnish ] = "Osioiden m??r?";
+    Text[ catalan ] = "Nombre de segments";
+    Text[ finnish ] = "Osioiden m��r�";
+    Text[ thai ] = "จำนวนส่วน";
 };
 String RID_SVX_3D_UNDO_DEEPTH
 {
@@ -160,15 +163,16 @@ String RID_SVX_3D_UNDO_DEEPTH
     Text[ chinese_simplified ] = "对象深度";
     Text[ russian ] = "������� �������";
     Text[ polish ] = "G��bia obiektu";
-    Text[ japanese ] = "ｵﾌﾞｼﾞｪｸﾄの奥行き";
+    Text[ japanese ] = "オブジェクトの奥行き";
     Text[ chinese_traditional ] = "物件深度";
     Text[ arabic ] = "��� ������";
     Text[ greek ] = "����� ������������";
     Text[ korean ] = "개체 깊이";
     Text[ turkish ] = "Nesne derinli�i";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Profundidad del objeto";
+    Text[ catalan ] = "Profunditat de l'objecte";
     Text[ finnish ] = "Objektin syvyys";
+    Text[ thai ] = "ความลึกของวัตถุ";
 };
 String RID_SVX_3D_UNDO_FOCAL
 {
@@ -184,17 +188,18 @@ String RID_SVX_3D_UNDO_FOCAL
     Text [ portuguese ] = "Dist�ncia focal" ;
     Text [ portuguese_brazilian ] = "Kamerabrennweite" ;
     Text[ chinese_simplified ] = "照相机焦距";
-    Text[ russian ] = "�������� ���������� ������������";
+    Text[ russian ] = "�������� ����������";
     Text[ polish ] = "Ogniskowa kamery";
-    Text[ japanese ] = "ｶﾒﾗの焦点距離";
+    Text[ japanese ] = "カメラの焦点距離";
     Text[ chinese_traditional ] = "照相機焦距";
     Text[ arabic ] = "����� ������ ��������";
     Text[ greek ] = "������� �������� �������";
     Text[ korean ] = "카메라 초점 거리";
     Text[ turkish ] = "Kamera odak uzakl���";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Distancia focal";
-    Text[ finnish ] = "Polttopistepituus";
+    Text[ catalan ] = "Longitud focal";
+    Text[ finnish ] = "Polttov�li";
+    Text[ thai ] = "ความยาวจุดรวม";
 };
 String RID_SVX_3D_UNDO_CAMPOS
 {
@@ -210,24 +215,25 @@ String RID_SVX_3D_UNDO_CAMPOS
     Text [ portuguese ] = "Posi��o da c�mara" ;
     Text [ portuguese_brazilian ] = "Kameraposition" ;
     Text[ chinese_simplified ] = "照相机位置";
-    Text[ russian ] = "������� ������������";
+    Text[ russian ] = "��������� ������";
     Text[ polish ] = "Pozycja kamery";
-    Text[ japanese ] = "ｶﾒﾗ位置";
+    Text[ japanese ] = "カメラ位置";
     Text[ chinese_traditional ] = "照相機位置";
     Text[ arabic ] = "���� ��������";
     Text[ greek ] = "���� ����������";
     Text[ korean ] = "카메라 위치";
     Text[ turkish ] = "Kamera konumu";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Posici�n de la c�mara";
+    Text[ catalan ] = "Posici� de la c�mara";
     Text[ finnish ] = "Kameran sijainti";
+    Text[ thai ] = "ตำแหน่งกล้อง";
 };
 String RID_SVX_3D_UNDO_ROTATE
 {
     Text = "3D-Objekt rotieren" ;
     Text [ ENGLISH ] = "Rotate 3D-Object" ;
     Text [ english_us ] = "Rotate 3D object" ;
-    Text [ dutch ] = "3D-object roteren" ;
+    Text [ dutch ] = "3D-object draaien" ;
     Text [ italian ] = "Ruota oggetto 3d" ;
     Text [ spanish ] = "Rodar un objeto 3D" ;
     Text [ french ] = "Rotation de l'objet 3D" ;
@@ -236,24 +242,25 @@ String RID_SVX_3D_UNDO_ROTATE
     Text [ portuguese ] = "Rodar objecto 3D" ;
     Text [ portuguese_brazilian ] = "3D-Objekt rotieren" ;
     Text[ chinese_simplified ] = "旋转 3 维对象";
-    Text[ russian ] = "������� ������";
+    Text[ russian ] = "������� ���������� ������";
     Text[ polish ] = "Obr�� obiekt 3-W";
-    Text[ japanese ] = "3D 体ｵﾌﾞｼﾞｪｸﾄの回転";
+    Text[ japanese ] = "3D 体オブジェクトの回転";
     Text[ chinese_traditional ] = "旋轉 3D 物件";
     Text[ arabic ] = "������� ���� ����� �������";
     Text[ greek ] = "���������� ������������ 3�";
     Text[ korean ] = "3D 개체 회전";
     Text[ turkish ] = "3B nesneyi d�nd�r";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Rodar un objeto 3D";
-    Text[ finnish ] = "Kierr? 3D-objektia";
+    Text[ catalan ] = "Gira l'objecte 3D";
+    Text[ finnish ] = "Kierr� 3D-kappaletta";
+    Text[ thai ] = "หมุนวัตถุ 3มิติ";
 };
 String RID_SVX_3D_UNDO_EXTRUDE
 {
     Text = "Extrusionsobjekt erstellen" ;
     Text [ ENGLISH ] = "Create Extrusionobject" ;
     Text [ english_us ] = "Create extrusion object" ;
-    Text [ dutch ] = "Extrusie-object maken" ;
+    Text [ dutch ] = "Extrusieobject maken" ;
     Text [ italian ] = "Creare un oggetto di estrusione" ;
     Text [ spanish ] = "Crear un objeto de extrusi�n" ;
     Text [ french ] = "Cr�er un objet d'extrusion" ;
@@ -264,15 +271,16 @@ String RID_SVX_3D_UNDO_EXTRUDE
     Text[ chinese_simplified ] = "生成模压式对象";
     Text[ russian ] = "������� ������ ���������";
     Text[ polish ] = "Utw�rz obiekt wyt�aczany";
-    Text[ japanese ] = "浮き出しｵﾌﾞｼﾞｪｸﾄの作成";
+    Text[ japanese ] = "浮き出しオブジェクトの作成";
     Text[ chinese_traditional ] = "產生模壓式物件";
     Text[ arabic ] = "����� ���� ���";
     Text[ greek ] = "���������� ������������ ��������";
     Text[ korean ] = "입체면 개체 작성";
     Text[ turkish ] = "Kal�p nesne olu�tur";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Crear un objeto de extrusi�n";
-    Text[ finnish ] = "Luo pursotinobjekti";
+    Text[ catalan ] = "Crea un objecte d'extrusi�";
+    Text[ finnish ] = "Luo pursotuskappale";
+    Text[ thai ] = "สร้างวัตถุโผล่ออกมา";
 };
 String RID_SVX_3D_UNDO_LATHE
 {
@@ -290,17 +298,18 @@ String RID_SVX_3D_UNDO_LATHE
     Text [ portuguese ] = "Criar objecto de rota��o" ;
     Text [ portuguese_brazilian ] = "Rotationsk?per erstellen" ;
     Text[ chinese_simplified ] = "制作旋转体";
-    Text[ russian ] = "������� ���� ��������";
+    Text[ russian ] = "������� ������ ��������";
     Text[ polish ] = "Utw�rz obiekt obrotowy";
-    Text[ japanese ] = "回転ｵﾌﾞkｼﾞｪｸﾄの作成";
+    Text[ japanese ] = "回転オブkジェクトの作成";
     Text[ chinese_traditional ] = "製作旋轉體";
     Text[ arabic ] = "����� ��� �������";
     Text[ greek ] = "���������� ��������������� ������������";
     Text[ korean ] = "회전개체 만들기";
     Text[ turkish ] = "D�ner nesne olu�tur";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Crear cuerpo de rotaci�n";
-    Text[ finnish ] = "Luo kierto-objekti";
+    Text[ catalan ] = "Crea un objecte de gir";
+    Text[ finnish ] = "Luo py�r�hdyskappale";
+    Text[ thai ] = "สร้างวัตถุหมุน";
 };
 String RID_SVX_3D_UNDO_BREAK_LATHE
 {
@@ -318,17 +327,18 @@ String RID_SVX_3D_UNDO_BREAK_LATHE
     Text [ french ] = "Fractionner l'objet 3D" ;
     Text [ dutch ] = "3D-object opsplitsen" ;
     Text[ chinese_simplified ] = "分开3维对象";
-    Text[ russian ] = "������� ������ 3-�";
+    Text[ russian ] = "������� ���������� ������";
     Text[ polish ] = "Rozdziel obiekt 3-W";
-    Text[ japanese ] = "3D 体ｵﾌﾞｼﾞｪｸﾄを切り離す";
+    Text[ japanese ] = "3D 体オブジェクトを切り離す";
     Text[ chinese_traditional ] = "分開 3D 物件";
     Text[ arabic ] = "����� ���� ����� �������";
     Text[ greek ] = "�������� ������������ 3�";
     Text[ korean ] = "3D 개체 분할";
     Text[ turkish ] = "3B nesneyi ay�r";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Quebrar objeto 3D";
-    Text[ finnish ] = "Jaa 3D-objekti";
+    Text[ catalan ] = "Divideix l'objecte 3D";
+    Text[ finnish ] = "Pura 3D-kappale";
+    Text[ thai ] = "แยกวัตถุ 3มิติ";
 };
 String RID_SVX_3D_UNDO_ATTRIBUTES
 {
@@ -344,7 +354,7 @@ String RID_SVX_3D_UNDO_ATTRIBUTES
     Text [ french ] = "Attributs 3D" ;
     Text [ dutch ] = "3D-attributen" ;
     Text[ chinese_simplified ] = "3维属性";
-    Text[ russian ] = "�������� 3-�";
+    Text[ russian ] = "���������� ��������";
     Text[ polish ] = "Atrybuty 3-W";
     Text[ japanese ] = "3D 体の属性";
     Text[ chinese_traditional ] = "3D 屬性";
@@ -353,8 +363,9 @@ String RID_SVX_3D_UNDO_ATTRIBUTES
     Text[ korean ] = "3D 속성";
     Text[ turkish ] = "3B �znitelikler";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Atributos en 3D";
-    Text[ finnish ] = "3D-m??ritteet";
+    Text[ catalan ] = "Atributs de 3D";
+    Text[ finnish ] = "3D-m��ritteet";
+    Text[ thai ] = "คุณลักษณะ3มิติ";
 };
  // ********************************************************************** EOF
 
@@ -366,3 +377,9 @@ String RID_SVX_3D_UNDO_ATTRIBUTES
 
 
 
+
+
+
+
+
+
diff --git a/svx/source/engine3d/svx3ditems.cxx b/svx/source/engine3d/svx3ditems.cxx
index 8d1b2de7e95f..ddfbbee0d289 100644
--- a/svx/source/engine3d/svx3ditems.cxx
+++ b/svx/source/engine3d/svx3ditems.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svx3ditems.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: aw $ $Date: 2000-12-06 16:46:01 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -295,6 +295,131 @@ Svx3DShadeModeItem::Svx3DShadeModeItem(sal_uInt16 nVal)
 {}
 
 //////////////////////////////////////////////////////////////////////////////
+// #107245#
+
+Svx3DSmoothNormalsItem::Svx3DSmoothNormalsItem(BOOL bVal)
+:   SfxBoolItem(SDRATTR_3DOBJ_SMOOTH_NORMALS, bVal)
+{}
+
+sal_uInt16 Svx3DSmoothNormalsItem::GetVersion(sal_uInt16 nFileFormatVersion) const
+{
+    return 1;
+}
+
+SfxPoolItem* Svx3DSmoothNormalsItem::Create(SvStream& rIn, sal_uInt16 nItemVersion) const
+{
+    SfxBoolItem* pRetval = new Svx3DSmoothNormalsItem();
+
+    if(nItemVersion > 0)
+    {
+        SfxBoolItem aBoolItem(Which(), rIn);
+        pRetval->SetValue(aBoolItem.GetValue());
+    }
+
+    return pRetval;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+// #107245#
+
+Svx3DSmoothLidsItem::Svx3DSmoothLidsItem(BOOL bVal)
+:   SfxBoolItem(SDRATTR_3DOBJ_SMOOTH_LIDS, bVal)
+{}
+
+sal_uInt16 Svx3DSmoothLidsItem::GetVersion(sal_uInt16 nFileFormatVersion) const
+{
+    return 1;
+}
+
+SfxPoolItem* Svx3DSmoothLidsItem::Create(SvStream& rIn, sal_uInt16 nItemVersion) const
+{
+    SfxBoolItem* pRetval = new Svx3DSmoothLidsItem();
+
+    if(nItemVersion > 0)
+    {
+        SfxBoolItem aBoolItem(Which(), rIn);
+        pRetval->SetValue(aBoolItem.GetValue());
+    }
+
+    return pRetval;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+// #107245#
+
+Svx3DCharacterModeItem::Svx3DCharacterModeItem(BOOL bVal)
+:   SfxBoolItem(SDRATTR_3DOBJ_CHARACTER_MODE, bVal)
+{}
+
+sal_uInt16 Svx3DCharacterModeItem::GetVersion(sal_uInt16 nFileFormatVersion) const
+{
+    return 1;
+}
+
+SfxPoolItem* Svx3DCharacterModeItem::Create(SvStream& rIn, sal_uInt16 nItemVersion) const
+{
+    SfxBoolItem* pRetval = new Svx3DCharacterModeItem();
+
+    if(nItemVersion > 0)
+    {
+        SfxBoolItem aBoolItem(Which(), rIn);
+        pRetval->SetValue(aBoolItem.GetValue());
+    }
+
+    return pRetval;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+// #107245#
+
+Svx3DCloseFrontItem::Svx3DCloseFrontItem(BOOL bVal)
+:   SfxBoolItem(SDRATTR_3DOBJ_CLOSE_FRONT, bVal)
+{}
+
+sal_uInt16 Svx3DCloseFrontItem::GetVersion(sal_uInt16 nFileFormatVersion) const
+{
+    return 1;
+}
+
+SfxPoolItem* Svx3DCloseFrontItem::Create(SvStream& rIn, sal_uInt16 nItemVersion) const
+{
+    SfxBoolItem* pRetval = new Svx3DCloseFrontItem();
+
+    if(nItemVersion > 0)
+    {
+        SfxBoolItem aBoolItem(Which(), rIn);
+        pRetval->SetValue(aBoolItem.GetValue());
+    }
+
+    return pRetval;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+// #107245#
+
+Svx3DCloseBackItem::Svx3DCloseBackItem(BOOL bVal)
+:   SfxBoolItem(SDRATTR_3DOBJ_CLOSE_BACK, bVal)
+{}
+
+sal_uInt16 Svx3DCloseBackItem::GetVersion(sal_uInt16 nFileFormatVersion) const
+{
+    return 1;
+}
+
+SfxPoolItem* Svx3DCloseBackItem::Create(SvStream& rIn, sal_uInt16 nItemVersion) const
+{
+    SfxBoolItem* pRetval = new Svx3DCloseBackItem();
+
+    if(nItemVersion > 0)
+    {
+        SfxBoolItem aBoolItem(Which(), rIn);
+        pRetval->SetValue(aBoolItem.GetValue());
+    }
+
+    return pRetval;
+}
+
+//////////////////////////////////////////////////////////////////////////////
 
 // Svx3DNormalsKindItem: use drawing::NormalsKind
 sal_Bool Svx3DNormalsKindItem::QueryValue( uno::Any& rVal, BYTE nMemberId) const
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 848c3985eccf..218600884889 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmgridif.cxx,v $
  *
- *  $Revision: 1.32 $
+ *  $Revision: 1.33 $
  *
- *  last change: $Author: oj $ $Date: 2002-10-31 12:59:21 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -562,7 +562,7 @@ sal_Bool SAL_CALL FmXGridControl::setModel(const Reference< ::com::sun::star::aw
     if (!UnoControl::setModel(rModel))
         return sal_False;
 
-    Reference< XGridPeer > xGridPeer(mxPeer, UNO_QUERY);
+    Reference< XGridPeer > xGridPeer(getPeer(), UNO_QUERY);
     if (xGridPeer.is())
     {
         Reference< XIndexContainer > xCols(mxModel, UNO_QUERY);
@@ -608,7 +608,7 @@ void SAL_CALL FmXGridControl::createPeer(const Reference< ::com::sun::star::awt:
 
     // TODO: why the hell this whole class does not use any mutex?
 
-    if (!mxPeer.is())
+    if (!getPeer().is())
     {
         mbCreatingPeer = sal_True;
             // mbCreatingPeer is virtually the same as m_nPeerCreationLevel, but it's the base class' method
@@ -624,7 +624,7 @@ void SAL_CALL FmXGridControl::createPeer(const Reference< ::com::sun::star::awt:
 
         FmXGridPeer* pPeer = imp_CreatePeer(pParentWin);
         DBG_ASSERT(pPeer != NULL, "FmXGridControl::createPeer : imp_CreatePeer didn't return a peer !");
-        mxPeer = pPeer;
+        setPeer( pPeer );
 
         // lesen der properties aus dem model
 //      ++m_nPeerCreationLevel;
@@ -641,8 +641,8 @@ void SAL_CALL FmXGridControl::createPeer(const Reference< ::com::sun::star::awt:
         // initialisieren.
 //      if (--m_nPeerCreationLevel == 0)
         {
-            DBG_ASSERT(mxPeer.is(), "FmXGridControl::createPeer : something went wrong ... no top level peer !");
-            pPeer = FmXGridPeer::getImplementation(mxPeer);
+            DBG_ASSERT(getPeer().is(), "FmXGridControl::createPeer : something went wrong ... no top level peer !");
+            pPeer = FmXGridPeer::getImplementation(getPeer());
 
             setPosSize( maComponentInfos.nX, maComponentInfos.nY, maComponentInfos.nWidth, maComponentInfos.nHeight, ::com::sun::star::awt::PosSize::POSSIZE );
 
@@ -726,7 +726,7 @@ void SAL_CALL FmXGridControl::createPeer(const Reference< ::com::sun::star::awt:
                 xLocate->moveToBookmark(aOldCursorBookmark);
             }
 
-            Reference< ::com::sun::star::awt::XView >  xPeerView(mxPeer, UNO_QUERY);
+            Reference< ::com::sun::star::awt::XView >  xPeerView(getPeer(), UNO_QUERY);
             xPeerView->setZoom( maComponentInfos.nZoomX, maComponentInfos.nZoomY );
             xPeerView->setGraphics( mxGraphics );
         }
@@ -738,9 +738,9 @@ void SAL_CALL FmXGridControl::createPeer(const Reference< ::com::sun::star::awt:
 void FmXGridControl::addModifyListener(const Reference< ::com::sun::star::util::XModifyListener >& l) throw( RuntimeException )
 {
     m_aModifyListeners.addInterface( l );
-    if( mxPeer.is() && m_aModifyListeners.getLength() == 1 )
+    if( getPeer().is() && m_aModifyListeners.getLength() == 1 )
     {
-        Reference< ::com::sun::star::util::XModifyBroadcaster >  xGrid(mxPeer, UNO_QUERY);
+        Reference< ::com::sun::star::util::XModifyBroadcaster >  xGrid(getPeer(), UNO_QUERY);
         xGrid->addModifyListener( &m_aModifyListeners);
     }
 }
@@ -749,7 +749,7 @@ void FmXGridControl::addModifyListener(const Reference< ::com::sun::star::util::
 sal_Bool SAL_CALL FmXGridControl::select( const Any& _rSelection ) throw (IllegalArgumentException, RuntimeException)
 {
     ::vos::OGuard aGuard( Application::GetSolarMutex() );
-    Reference< XSelectionSupplier > xPeer(mxPeer, UNO_QUERY);
+    Reference< XSelectionSupplier > xPeer(getPeer(), UNO_QUERY);
     return xPeer->select(_rSelection);
 }
 
@@ -757,7 +757,7 @@ sal_Bool SAL_CALL FmXGridControl::select( const Any& _rSelection ) throw (Illega
 Any SAL_CALL FmXGridControl::getSelection(  ) throw (RuntimeException)
 {
     ::vos::OGuard aGuard( Application::GetSolarMutex() );
-    Reference< XSelectionSupplier > xPeer(mxPeer, UNO_QUERY);
+    Reference< XSelectionSupplier > xPeer(getPeer(), UNO_QUERY);
     return xPeer->getSelection();
 }
 
@@ -765,9 +765,9 @@ Any SAL_CALL FmXGridControl::getSelection(  ) throw (RuntimeException)
 void SAL_CALL FmXGridControl::addSelectionChangeListener( const Reference< XSelectionChangeListener >& _rxListener ) throw (RuntimeException)
 {
     m_aSelectionListeners.addInterface( _rxListener );
-    if( mxPeer.is() && 1 == m_aSelectionListeners.getLength() )
+    if( getPeer().is() && 1 == m_aSelectionListeners.getLength() )
     {
-        Reference< XSelectionSupplier > xGrid(mxPeer, UNO_QUERY);
+        Reference< XSelectionSupplier > xGrid(getPeer(), UNO_QUERY);
         xGrid->addSelectionChangeListener( &m_aSelectionListeners);
     }
 }
@@ -775,9 +775,9 @@ void SAL_CALL FmXGridControl::addSelectionChangeListener( const Reference< XSele
 //------------------------------------------------------------------------------
 void SAL_CALL FmXGridControl::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& _rxListener ) throw (RuntimeException)
 {
-    if( mxPeer.is() && 1 == m_aSelectionListeners.getLength() )
+    if( getPeer().is() && 1 == m_aSelectionListeners.getLength() )
     {
-        Reference< XSelectionSupplier > xGrid(mxPeer, UNO_QUERY);
+        Reference< XSelectionSupplier > xGrid(getPeer(), UNO_QUERY);
         xGrid->removeSelectionChangeListener( &m_aSelectionListeners);
     }
     m_aSelectionListeners.removeInterface( _rxListener );
@@ -786,9 +786,9 @@ void SAL_CALL FmXGridControl::removeSelectionChangeListener( const Reference< XS
 //------------------------------------------------------------------------------
 Sequence< sal_Bool > SAL_CALL FmXGridControl::queryFieldDataType( const Type& xType ) throw(RuntimeException)
 {
-    if (mxPeer.is())
+    if (getPeer().is())
     {
-        Reference< XGridFieldDataSupplier >  xPeerSupplier(mxPeer, UNO_QUERY);
+        Reference< XGridFieldDataSupplier >  xPeerSupplier(getPeer(), UNO_QUERY);
         if (xPeerSupplier.is())
             return xPeerSupplier->queryFieldDataType(xType);
     }
@@ -799,9 +799,9 @@ Sequence< sal_Bool > SAL_CALL FmXGridControl::queryFieldDataType( const Type& xT
 //------------------------------------------------------------------------------
 Sequence< Any > SAL_CALL FmXGridControl::queryFieldData( sal_Int32 nRow, const Type& xType ) throw(RuntimeException)
 {
-    if (mxPeer.is())
+    if (getPeer().is())
     {
-        Reference< XGridFieldDataSupplier >  xPeerSupplier(mxPeer, UNO_QUERY);
+        Reference< XGridFieldDataSupplier >  xPeerSupplier(getPeer(), UNO_QUERY);
         if (xPeerSupplier.is())
             return xPeerSupplier->queryFieldData(nRow, xType);
     }
@@ -812,9 +812,9 @@ Sequence< Any > SAL_CALL FmXGridControl::queryFieldData( sal_Int32 nRow, const T
 //------------------------------------------------------------------------------
 void SAL_CALL FmXGridControl::removeModifyListener(const Reference< ::com::sun::star::util::XModifyListener >& l) throw( RuntimeException )
 {
-    if( mxPeer.is() && m_aModifyListeners.getLength() == 1 )
+    if( getPeer().is() && m_aModifyListeners.getLength() == 1 )
     {
-        Reference< ::com::sun::star::util::XModifyBroadcaster >  xGrid(mxPeer, UNO_QUERY);
+        Reference< ::com::sun::star::util::XModifyBroadcaster >  xGrid(getPeer(), UNO_QUERY);
         xGrid->removeModifyListener( &m_aModifyListeners);
     }
     m_aModifyListeners.removeInterface( l );
@@ -833,7 +833,7 @@ void SAL_CALL FmXGridControl::setDesignMode(sal_Bool bOn) throw( RuntimeExceptio
 {
     ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
-    Reference< ::com::sun::star::sdb::XRowSetSupplier >  xGrid(mxPeer, UNO_QUERY);
+    Reference< ::com::sun::star::sdb::XRowSetSupplier >  xGrid(getPeer(), UNO_QUERY);
 
     if (xGrid.is() && (bOn != mbDesignMode || (!bOn && !xGrid->getRowSet().is())))
     {
@@ -854,9 +854,9 @@ void SAL_CALL FmXGridControl::setDesignMode(sal_Bool bOn) throw( RuntimeExceptio
         mbDesignMode = bOn;
 
 #ifdef MACOSX
-                Reference< ::com::sun::star::awt::XVclWindowPeer> xVclWindowPeer(mxPeer, UNO_QUERY);
+                Reference< ::com::sun::star::awt::XVclWindowPeer> xVclWindowPeer(getPeer(), UNO_QUERY);
 #else
-        Reference< awt::XVclWindowPeer >  xVclWindowPeer(mxPeer, UNO_QUERY);
+        Reference< awt::XVclWindowPeer >  xVclWindowPeer(getPeer(), UNO_QUERY);
 #endif
         if (xVclWindowPeer.is())
             xVclWindowPeer->setDesignMode(bOn);
@@ -869,9 +869,9 @@ void SAL_CALL FmXGridControl::setDesignMode(sal_Bool bOn) throw( RuntimeExceptio
 void SAL_CALL FmXGridControl::addUpdateListener(const Reference< XUpdateListener >& l) throw( RuntimeException )
 {
     m_aUpdateListeners.addInterface( l );
-    if( mxPeer.is() && m_aUpdateListeners.getLength() == 1 )
+    if( getPeer().is() && m_aUpdateListeners.getLength() == 1 )
     {
-        Reference< XBoundComponent >  xBound(mxPeer, UNO_QUERY);
+        Reference< XBoundComponent >  xBound(getPeer(), UNO_QUERY);
         xBound->addUpdateListener( &m_aUpdateListeners);
     }
 }
@@ -879,9 +879,9 @@ void SAL_CALL FmXGridControl::addUpdateListener(const Reference< XUpdateListener
 //------------------------------------------------------------------------------
 void SAL_CALL FmXGridControl::removeUpdateListener(const Reference< XUpdateListener >& l) throw( RuntimeException )
 {
-    if( mxPeer.is() && m_aUpdateListeners.getLength() == 1 )
+    if( getPeer().is() && m_aUpdateListeners.getLength() == 1 )
     {
-        Reference< XBoundComponent >  xBound(mxPeer, UNO_QUERY);
+        Reference< XBoundComponent >  xBound(getPeer(), UNO_QUERY);
         xBound->removeUpdateListener( &m_aUpdateListeners);
     }
     m_aUpdateListeners.removeInterface( l );
@@ -890,7 +890,7 @@ void SAL_CALL FmXGridControl::removeUpdateListener(const Reference< XUpdateListe
 //------------------------------------------------------------------------------
 sal_Bool SAL_CALL FmXGridControl::commit() throw( RuntimeException )
 {
-    Reference< XBoundComponent >  xBound(mxPeer, UNO_QUERY);
+    Reference< XBoundComponent >  xBound(getPeer(), UNO_QUERY);
     if (xBound.is())
         return xBound->commit();
     else
@@ -902,9 +902,9 @@ sal_Bool SAL_CALL FmXGridControl::commit() throw( RuntimeException )
 void SAL_CALL FmXGridControl::addContainerListener(const Reference< XContainerListener >& l) throw( RuntimeException )
 {
     m_aContainerListeners.addInterface( l );
-    if( mxPeer.is() && m_aContainerListeners.getLength() == 1 )
+    if( getPeer().is() && m_aContainerListeners.getLength() == 1 )
     {
-        Reference< XContainer >  xContainer(mxPeer, UNO_QUERY);
+        Reference< XContainer >  xContainer(getPeer(), UNO_QUERY);
         xContainer->addContainerListener( &m_aContainerListeners);
     }
 }
@@ -912,9 +912,9 @@ void SAL_CALL FmXGridControl::addContainerListener(const Reference< XContainerLi
 //------------------------------------------------------------------------------
 void SAL_CALL FmXGridControl::removeContainerListener(const Reference< XContainerListener >& l) throw( RuntimeException )
 {
-    if( mxPeer.is() && m_aContainerListeners.getLength() == 1 )
+    if( getPeer().is() && m_aContainerListeners.getLength() == 1 )
     {
-        Reference< XContainer >  xContainer(mxPeer, UNO_QUERY);
+        Reference< XContainer >  xContainer(getPeer(), UNO_QUERY);
         xContainer->removeContainerListener( &m_aContainerListeners);
     }
     m_aContainerListeners.removeInterface( l );
@@ -923,7 +923,7 @@ void SAL_CALL FmXGridControl::removeContainerListener(const Reference< XContaine
 //------------------------------------------------------------------------------
 Reference< ::com::sun::star::frame::XDispatch >  SAL_CALL FmXGridControl::queryDispatch(const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException )
 {
-    Reference< ::com::sun::star::frame::XDispatchProvider >  xPeerProvider(mxPeer, UNO_QUERY);
+    Reference< ::com::sun::star::frame::XDispatchProvider >  xPeerProvider(getPeer(), UNO_QUERY);
     if (xPeerProvider.is())
         return xPeerProvider->queryDispatch(aURL, aTargetFrameName, nSearchFlags);
     else
@@ -933,7 +933,7 @@ Reference< ::com::sun::star::frame::XDispatch >  SAL_CALL FmXGridControl::queryD
 //------------------------------------------------------------------------------
 Sequence< Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL FmXGridControl::queryDispatches(const Sequence< ::com::sun::star::frame::DispatchDescriptor>& aDescripts) throw( RuntimeException )
 {
-    Reference< ::com::sun::star::frame::XDispatchProvider >  xPeerProvider(mxPeer, UNO_QUERY);
+    Reference< ::com::sun::star::frame::XDispatchProvider >  xPeerProvider(getPeer(), UNO_QUERY);
     if (xPeerProvider.is())
         return xPeerProvider->queryDispatches(aDescripts);
     else
@@ -943,7 +943,7 @@ Sequence< Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL FmXGridCont
 //------------------------------------------------------------------------------
 void SAL_CALL FmXGridControl::registerDispatchProviderInterceptor(const Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& _xInterceptor) throw( RuntimeException )
 {
-    Reference< ::com::sun::star::frame::XDispatchProviderInterception >  xPeerInterception(mxPeer, UNO_QUERY);
+    Reference< ::com::sun::star::frame::XDispatchProviderInterception >  xPeerInterception(getPeer(), UNO_QUERY);
     if (xPeerInterception.is())
         xPeerInterception->registerDispatchProviderInterceptor(_xInterceptor);
 }
@@ -951,7 +951,7 @@ void SAL_CALL FmXGridControl::registerDispatchProviderInterceptor(const Referenc
 //------------------------------------------------------------------------------
 void SAL_CALL FmXGridControl::releaseDispatchProviderInterceptor(const Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& _xInterceptor) throw( RuntimeException )
 {
-    Reference< ::com::sun::star::frame::XDispatchProviderInterception >  xPeerInterception(mxPeer, UNO_QUERY);
+    Reference< ::com::sun::star::frame::XDispatchProviderInterception >  xPeerInterception(getPeer(), UNO_QUERY);
     if (xPeerInterception.is())
         xPeerInterception->releaseDispatchProviderInterceptor(_xInterceptor);
 }
@@ -959,14 +959,14 @@ void SAL_CALL FmXGridControl::releaseDispatchProviderInterceptor(const Reference
 //------------------------------------------------------------------------------
 sal_Int16 SAL_CALL FmXGridControl::getCurrentColumnPosition() throw( RuntimeException )
 {
-    Reference< XGrid >  xGrid(mxPeer, UNO_QUERY);
+    Reference< XGrid >  xGrid(getPeer(), UNO_QUERY);
     return xGrid.is() ? xGrid->getCurrentColumnPosition() : -1;
 }
 
 //------------------------------------------------------------------------------
 void SAL_CALL FmXGridControl::setCurrentColumnPosition(sal_Int16 nPos) throw( RuntimeException )
 {
-    Reference< XGrid >  xGrid( mxPeer, UNO_QUERY );
+    Reference< XGrid >  xGrid( getPeer(), UNO_QUERY );
     if ( xGrid.is() )
     {
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
@@ -978,7 +978,7 @@ void SAL_CALL FmXGridControl::setCurrentColumnPosition(sal_Int16 nPos) throw( Ru
 //------------------------------------------------------------------------------
 sal_Bool SAL_CALL FmXGridControl::hasElements() throw( RuntimeException )
 {
-    Reference< XElementAccess >  xPeer(mxPeer, UNO_QUERY);
+    Reference< XElementAccess >  xPeer(getPeer(), UNO_QUERY);
     return xPeer.is() ? xPeer->hasElements() : 0;
 }
 
@@ -992,7 +992,7 @@ Type SAL_CALL FmXGridControl::getElementType(  ) throw(RuntimeException)
 //------------------------------------------------------------------------------
 Reference< XEnumeration >  SAL_CALL FmXGridControl::createEnumeration() throw( RuntimeException )
 {
-    Reference< XEnumerationAccess >  xPeer(mxPeer, UNO_QUERY);
+    Reference< XEnumerationAccess >  xPeer(getPeer(), UNO_QUERY);
     if (xPeer.is())
         return xPeer->createEnumeration();
     else
@@ -1003,14 +1003,14 @@ Reference< XEnumeration >  SAL_CALL FmXGridControl::createEnumeration() throw( R
 //------------------------------------------------------------------------------
 sal_Int32 SAL_CALL FmXGridControl::getCount() throw( RuntimeException )
 {
-    Reference< XIndexAccess >  xPeer(mxPeer, UNO_QUERY);
+    Reference< XIndexAccess >  xPeer(getPeer(), UNO_QUERY);
     return xPeer.is() ? xPeer->getCount() : 0;
 }
 
 //------------------------------------------------------------------------------
 Any SAL_CALL FmXGridControl::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException )
 {
-    Reference< XIndexAccess >  xPeer(mxPeer, UNO_QUERY);
+    Reference< XIndexAccess >  xPeer(getPeer(), UNO_QUERY);
     if (!xPeer.is())
         throw IndexOutOfBoundsException();
 
@@ -1021,7 +1021,7 @@ Any SAL_CALL FmXGridControl::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoun
 //------------------------------------------------------------------------------
 void SAL_CALL FmXGridControl::setMode(const ::rtl::OUString& Mode) throw( NoSupportException, RuntimeException )
 {
-    Reference< ::com::sun::star::util::XModeSelector >  xPeer(mxPeer, UNO_QUERY);
+    Reference< ::com::sun::star::util::XModeSelector >  xPeer(getPeer(), UNO_QUERY);
     if (!xPeer.is())
         throw NoSupportException();
 
@@ -1031,21 +1031,21 @@ void SAL_CALL FmXGridControl::setMode(const ::rtl::OUString& Mode) throw( NoSupp
 //------------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL FmXGridControl::getMode() throw( RuntimeException )
 {
-    Reference< ::com::sun::star::util::XModeSelector >  xPeer(mxPeer, UNO_QUERY);
+    Reference< ::com::sun::star::util::XModeSelector >  xPeer(getPeer(), UNO_QUERY);
     return xPeer.is() ? xPeer->getMode() : ::rtl::OUString();
 }
 
 //------------------------------------------------------------------------------
 ::comphelper::StringSequence SAL_CALL FmXGridControl::getSupportedModes() throw( RuntimeException )
 {
-    Reference< ::com::sun::star::util::XModeSelector >  xPeer(mxPeer, UNO_QUERY);
+    Reference< ::com::sun::star::util::XModeSelector >  xPeer(getPeer(), UNO_QUERY);
     return xPeer.is() ? xPeer->getSupportedModes() : ::comphelper::StringSequence();
 }
 
 //------------------------------------------------------------------------------
 sal_Bool SAL_CALL FmXGridControl::supportsMode(const ::rtl::OUString& Mode) throw( RuntimeException )
 {
-    Reference< ::com::sun::star::util::XModeSelector >  xPeer(mxPeer, UNO_QUERY);
+    Reference< ::com::sun::star::util::XModeSelector >  xPeer(getPeer(), UNO_QUERY);
     return xPeer.is() ? xPeer->supportsMode(Mode) : sal_False;
 }
 
@@ -1841,6 +1841,8 @@ void FmXGridPeer::elementInserted(const ContainerEvent& evt) throw( RuntimeExcep
 //------------------------------------------------------------------------------
 void FmXGridPeer::elementReplaced(const ContainerEvent& evt) throw( RuntimeException )
 {
+    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+
     FmGridControl* pGrid = (FmGridControl*) GetWindow();
 
     // Handle Column beruecksichtigen
@@ -1895,6 +1897,8 @@ void FmXGridPeer::elementReplaced(const ContainerEvent& evt) throw( RuntimeExcep
 //------------------------------------------------------------------------------
 void FmXGridPeer::elementRemoved(const ContainerEvent& evt) throw( RuntimeException )
 {
+    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+
     FmGridControl* pGrid    = (FmGridControl*) GetWindow();
 
     // Handle Column beruecksichtigen
@@ -1913,236 +1917,230 @@ void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& V
 {
     ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
-    sal_Int32 nId = FmPropertyInfoService::getPropertyId(PropertyName);
     FmGridControl* pGrid = (FmGridControl*) GetWindow();
+
     sal_Bool bVoid = !Value.hasValue();
-    switch (nId)
+
+    if ( 0 == PropertyName.compareToAscii( FM_PROP_TEXTLINECOLOR ) )
     {
-        case FM_ATTR_TEXTLINECOLOR:
+        Color aTextLineColor(::comphelper::getINT32(Value));
+        if (bVoid)
         {
-            Color aTextLineColor(::comphelper::getINT32(Value));
-            if (bVoid)
-            {
-                pGrid->SetTextLineColor();
-                pGrid->GetDataWindow().SetTextLineColor();
-            }
-            else
-            {
-                pGrid->SetTextLineColor(aTextLineColor);
-                pGrid->GetDataWindow().SetTextLineColor(aTextLineColor);
-            }
-
-            // need to forward this to the columns
-            DbGridColumns& rColumns = const_cast<DbGridColumns&>(pGrid->GetColumns());
-            DbGridColumn* pLoop = rColumns.First();
-            while (pLoop)
-            {
-                FmXGridCell* pXCell = pLoop->GetCell();
-                if (pXCell)
-                    if (bVoid)
-                        pXCell->SetTextLineColor();
-                    else
-                        pXCell->SetTextLineColor(aTextLineColor);
-
-                pLoop = rColumns.Next();
-            }
-
-            if (isDesignMode())
-                pGrid->Invalidate();
+            pGrid->SetTextLineColor();
+            pGrid->GetDataWindow().SetTextLineColor();
         }
-        break;
-
-        case FM_ATTR_FONTEMPHASISMARK:
+        else
         {
-            Font aGridFont = pGrid->GetControlFont();
-            sal_Int16 nValue = ::comphelper::getINT16(Value);
-            aGridFont.SetEmphasisMark( nValue );
-            pGrid->SetControlFont( aGridFont );
+            pGrid->SetTextLineColor(aTextLineColor);
+            pGrid->GetDataWindow().SetTextLineColor(aTextLineColor);
         }
-        break;
 
-        case FM_ATTR_FONTRELIEF:
+        // need to forward this to the columns
+        DbGridColumns& rColumns = const_cast<DbGridColumns&>(pGrid->GetColumns());
+        DbGridColumn* pLoop = rColumns.First();
+        while (pLoop)
         {
-            Font aGridFont = pGrid->GetControlFont();
-            sal_Int16 nValue = ::comphelper::getINT16(Value);
-            aGridFont.SetRelief( (FontRelief)nValue );
-            pGrid->SetControlFont( aGridFont );
+            FmXGridCell* pXCell = pLoop->GetCell();
+            if (pXCell)
+                if (bVoid)
+                    pXCell->SetTextLineColor();
+                else
+                    pXCell->SetTextLineColor(aTextLineColor);
+
+            pLoop = rColumns.Next();
         }
-        break;
 
-        case FM_ATTR_HELPURL:
+        if (isDesignMode())
+            pGrid->Invalidate();
+    }
+    else if ( 0 == PropertyName.compareToAscii( FM_PROP_FONTEMPHASISMARK ) )
+    {
+        Font aGridFont = pGrid->GetControlFont();
+        sal_Int16 nValue = ::comphelper::getINT16(Value);
+        aGridFont.SetEmphasisMark( nValue );
+        pGrid->SetControlFont( aGridFont );
+    }
+    else if ( 0 == PropertyName.compareToAscii( FM_PROP_FONTRELIEF ) )
+    {
+        Font aGridFont = pGrid->GetControlFont();
+        sal_Int16 nValue = ::comphelper::getINT16(Value);
+        aGridFont.SetRelief( (FontRelief)nValue );
+        pGrid->SetControlFont( aGridFont );
+    }
+    else if ( 0 == PropertyName.compareToAscii( FM_PROP_HELPURL ) )
+    {
+        String sHelpURL(::comphelper::getString(Value));
+        String sPattern;
+        sPattern.AssignAscii("HID:");
+        if (sHelpURL.Equals(sPattern, 0, sPattern.Len()))
         {
-            String sHelpURL(::comphelper::getString(Value));
-            String sPattern;
-            sPattern.AssignAscii("HID:");
-            if (sHelpURL.Equals(sPattern, 0, sPattern.Len()))
-            {
-                String sID = sHelpURL.Copy(sPattern.Len());
-                pGrid->SetHelpId(sID.ToInt32());
-            }
+            String sID = sHelpURL.Copy(sPattern.Len());
+            pGrid->SetHelpId(sID.ToInt32());
         }
-        break;
-        case FM_ATTR_DISPLAYSYNCHRON:
-            pGrid->setDisplaySynchron(::comphelper::getBOOL(Value));
-            break;
-        case FM_ATTR_CURSORCOLOR:
-            if (bVoid)
-                pGrid->SetCursorColor(COL_TRANSPARENT);
-            else
-                pGrid->SetCursorColor(Color(::comphelper::getINT32(Value)));
-            if (isDesignMode())
-                pGrid->Invalidate();
-            break;
-        case FM_ATTR_ALWAYSSHOWCURSOR:
-            pGrid->EnablePermanentCursor(::comphelper::getBOOL(Value));
-            if (isDesignMode())
-                pGrid->Invalidate();
-            break;
-        case FM_ATTR_FONT:
+    }
+    else if ( 0 == PropertyName.compareToAscii( FM_PROP_DISPLAYSYNCHRON ) )
+    {
+        pGrid->setDisplaySynchron(::comphelper::getBOOL(Value));
+    }
+    else if ( 0 == PropertyName.compareToAscii( FM_PROP_CURSORCOLOR ) )
+    {
+        if (bVoid)
+            pGrid->SetCursorColor(COL_TRANSPARENT);
+        else
+            pGrid->SetCursorColor(Color(::comphelper::getINT32(Value)));
+        if (isDesignMode())
+            pGrid->Invalidate();
+    }
+    else if ( 0 == PropertyName.compareToAscii( FM_PROP_ALWAYSSHOWCURSOR ) )
+    {
+        pGrid->EnablePermanentCursor(::comphelper::getBOOL(Value));
+        if (isDesignMode())
+            pGrid->Invalidate();
+    }
+    else if ( 0 == PropertyName.compareToAscii( FM_PROP_FONT ) )
+    {
+        if ( bVoid )
+            pGrid->SetControlFont( Font() );
+        else
         {
-            if ( bVoid )
-                pGrid->SetControlFont( Font() );
-            else
+            ::com::sun::star::awt::FontDescriptor aFont;
+            if (Value >>= aFont)
             {
-                ::com::sun::star::awt::FontDescriptor aFont;
-                if (Value >>= aFont)
+                Font aNewVclFont;
+                if (::comphelper::operator!=(aFont, ::comphelper::getDefaultFont()))    // ist das der Default
+                    aNewVclFont = ImplCreateFont( aFont );
+
+                // need to add relief and emphasis (they're stored in a VCL-Font, but not in a FontDescriptor
+                Font aOldVclFont = pGrid->GetControlFont();
+                aNewVclFont.SetRelief( aOldVclFont.GetRelief() );
+                aNewVclFont.SetEmphasisMark( aOldVclFont.GetEmphasisMark() );
+
+                // now set it ...
+                pGrid->SetControlFont( aNewVclFont );
+
+                // if our row-height property is void (which means "calculate it font-dependent") we have
+                // to adjust the control's row height
+                Reference< XPropertySet >  xModelSet(getColumns(), UNO_QUERY);
+                if (xModelSet.is() && ::comphelper::hasProperty(FM_PROP_ROWHEIGHT, xModelSet))
                 {
-                    Font aNewVclFont;
-                    if (::comphelper::operator!=(aFont, ::comphelper::getDefaultFont()))    // ist das der Default
-                        aNewVclFont = ImplCreateFont( aFont );
-
-                    // need to add relief and emphasis (they're stored in a VCL-Font, but not in a FontDescriptor
-                    Font aOldVclFont = pGrid->GetControlFont();
-                    aNewVclFont.SetRelief( aOldVclFont.GetRelief() );
-                    aNewVclFont.SetEmphasisMark( aOldVclFont.GetEmphasisMark() );
-
-                    // now set it ...
-                    pGrid->SetControlFont( aNewVclFont );
-
-                    // if our row-height property is void (which means "calculate it font-dependent") we have
-                    // to adjust the control's row height
-                    Reference< XPropertySet >  xModelSet(getColumns(), UNO_QUERY);
-                    if (xModelSet.is() && ::comphelper::hasProperty(FM_PROP_ROWHEIGHT, xModelSet))
-                    {
-                        Any aHeight = xModelSet->getPropertyValue(FM_PROP_ROWHEIGHT);
-                        if (!aHeight.hasValue())
-                            pGrid->SetDataRowHeight(0);
-                    }
-
+                    Any aHeight = xModelSet->getPropertyValue(FM_PROP_ROWHEIGHT);
+                    if (!aHeight.hasValue())
+                        pGrid->SetDataRowHeight(0);
                 }
+
             }
         }
-        break;
-        case FM_ATTR_BACKGROUNDCOLOR:
-            if ( bVoid )
-            {
-                pGrid->SetControlBackground();
-            }
-            else
-            {
-                Color aColor( ::comphelper::getINT32(Value) );
-                pGrid->SetBackground( aColor );
-                pGrid->SetControlBackground( aColor );
-            }
-        break;
-        case FM_ATTR_TEXTCOLOR:
-            if ( bVoid )
-            {
-                pGrid->SetControlForeground();
-            }
-            else
-            {
-                Color aColor( ::comphelper::getINT32(Value) );
-                pGrid->SetTextColor( aColor );
-                pGrid->SetControlForeground( aColor );
-            }
-        break;
-        case FM_ATTR_ROWHEIGHT:
+    }
+    else if ( 0 == PropertyName.compareToAscii( FM_PROP_BACKGROUNDCOLOR ) )
+    {
+        if ( bVoid )
         {
-            sal_Int32 nLogHeight(0);
-            if (Value >>= nLogHeight)
-            {
-                sal_Int32 nHeight = pGrid->LogicToPixel(Point(0,nLogHeight),MAP_10TH_MM).Y();
-                // take the zoom factor into account
-                nHeight = pGrid->CalcZoom(nHeight);
-                pGrid->SetDataRowHeight(nHeight);
-            }
-            else if (bVoid)
-                pGrid->SetDataRowHeight(0);
-        }   break;
-        case FM_ATTR_HASNAVIGATION:
+            pGrid->SetControlBackground();
+        }
+        else
+        {
+            Color aColor( ::comphelper::getINT32(Value) );
+            pGrid->SetBackground( aColor );
+            pGrid->SetControlBackground( aColor );
+        }
+    }
+    else if ( 0 == PropertyName.compareToAscii( FM_PROP_TEXTCOLOR ) )
+    {
+        if ( bVoid )
         {
-            if (Value.getValueType() == ::getBooleanCppuType())
-                pGrid->EnableNavigationBar(*(sal_Bool*)Value.getValue());
-        }   break;
-        case FM_ATTR_RECORDMARKER:
+            pGrid->SetControlForeground();
+        }
+        else
         {
-            if (Value.getValueType() == ::getBooleanCppuType())
-                pGrid->EnableHandle(*(sal_Bool*)Value.getValue());
-        }   break;
-        case FM_ATTR_ENABLED:
+            Color aColor( ::comphelper::getINT32(Value) );
+            pGrid->SetTextColor( aColor );
+            pGrid->SetControlForeground( aColor );
+        }
+    }
+    else if ( 0 == PropertyName.compareToAscii( FM_PROP_ROWHEIGHT ) )
+    {
+        sal_Int32 nLogHeight(0);
+        if (Value >>= nLogHeight)
         {
-            if (Value.getValueType() == ::getBooleanCppuType())
-            {
-                // Im DesignModus nur das Datenfenster disablen
-                // Sonst kann das Control nicht mehr konfiguriert werden
-                if (isDesignMode())
-                    pGrid->GetDataWindow().Enable(*(sal_Bool*)Value.getValue());
-                else
-                    pGrid->Enable(*(sal_Bool*)Value.getValue());
-            }
-        }   break;
-        default:
-            VCLXWindow::setProperty( PropertyName, Value );
+            sal_Int32 nHeight = pGrid->LogicToPixel(Point(0,nLogHeight),MAP_10TH_MM).Y();
+            // take the zoom factor into account
+            nHeight = pGrid->CalcZoom(nHeight);
+            pGrid->SetDataRowHeight(nHeight);
+        }
+        else if (bVoid)
+            pGrid->SetDataRowHeight(0);
+    }
+    else if ( 0 == PropertyName.compareToAscii( FM_PROP_HASNAVIGATION ) )
+    {
+        if (Value.getValueType() == ::getBooleanCppuType())
+            pGrid->EnableNavigationBar(*(sal_Bool*)Value.getValue());
     }
+    else if ( 0 == PropertyName.compareToAscii( FM_PROP_RECORDMARKER ) )
+    {
+        if (Value.getValueType() == ::getBooleanCppuType())
+            pGrid->EnableHandle(*(sal_Bool*)Value.getValue());
+    }
+    else if ( 0 == PropertyName.compareToAscii( FM_PROP_ENABLED ) )
+    {
+        if (Value.getValueType() == ::getBooleanCppuType())
+        {
+            // Im DesignModus nur das Datenfenster disablen
+            // Sonst kann das Control nicht mehr konfiguriert werden
+            if (isDesignMode())
+                pGrid->GetDataWindow().Enable(*(sal_Bool*)Value.getValue());
+            else
+                pGrid->Enable(*(sal_Bool*)Value.getValue());
+        }
+    }
+    else
+        VCLXWindow::setProperty( PropertyName, Value );
 }
 
 //------------------------------------------------------------------------------
-Any FmXGridPeer::getProperty( const ::rtl::OUString& PropertyName ) throw( RuntimeException )
+Any FmXGridPeer::getProperty( const ::rtl::OUString& _rPropertyName ) throw( RuntimeException )
 {
     Any aProp;
     if (GetWindow())
     {
         FmGridControl* pGrid = (FmGridControl*) GetWindow();
         Window* pDataWindow  = &pGrid->GetDataWindow();
-        sal_Int32 nId = FmPropertyInfoService::getPropertyId(PropertyName);
-        switch (nId)
+
+        if ( 0 == _rPropertyName.compareToAscii( FM_PROP_NAME ) )
         {
-            case FM_ATTR_FONT:
-            {
-                Font aFont = pDataWindow->GetControlFont();
-                aProp <<= ImplCreateFontDescriptor( aFont );
-            }   break;
-            case FM_ATTR_TEXTCOLOR:
-                aProp <<= (sal_Int32)pDataWindow->GetControlForeground().GetColor();
-                break;
-            case FM_ATTR_BACKGROUNDCOLOR:
-                aProp <<= (sal_Int32)pDataWindow->GetControlBackground().GetColor();
-                break;
-            case FM_ATTR_ROWHEIGHT:
-            {
-                sal_Int32 nPixelHeight = pGrid->GetDataRowHeight();
-                // take the zoom factor into account
-                nPixelHeight = pGrid->CalcReverseZoom(nPixelHeight);
-                aProp <<= (sal_Int32)pGrid->PixelToLogic(Point(0,nPixelHeight),MAP_10TH_MM).Y();
-            }   break;
-            case FM_ATTR_HASNAVIGATION:
-            {
-                sal_Bool bHasNavBar = pGrid->HasNavigationBar();
-                aProp <<= (sal_Bool)bHasNavBar;
-            }   break;
-            case FM_ATTR_RECORDMARKER:
-            {
-                sal_Bool bHasHandle = pGrid->HasHandle();
-                aProp <<= (sal_Bool)bHasHandle;
-            }   break;
-            case FM_ATTR_ENABLED:
-            {
-                aProp <<= (sal_Bool)pDataWindow->IsEnabled();
-            }   break;
-            default:
-                aProp = VCLXWindow::getProperty( PropertyName );
+            Font aFont = pDataWindow->GetControlFont();
+            aProp <<= ImplCreateFontDescriptor( aFont );
         }
+        else if ( 0 == _rPropertyName.compareToAscii( FM_PROP_TEXTCOLOR ) )
+        {
+            aProp <<= (sal_Int32)pDataWindow->GetControlForeground().GetColor();
+        }
+        else if ( 0 == _rPropertyName.compareToAscii( FM_PROP_BACKGROUNDCOLOR ) )
+        {
+            aProp <<= (sal_Int32)pDataWindow->GetControlBackground().GetColor();
+        }
+        else if ( 0 == _rPropertyName.compareToAscii( FM_PROP_ROWHEIGHT ) )
+        {
+            sal_Int32 nPixelHeight = pGrid->GetDataRowHeight();
+            // take the zoom factor into account
+            nPixelHeight = pGrid->CalcReverseZoom(nPixelHeight);
+            aProp <<= (sal_Int32)pGrid->PixelToLogic(Point(0,nPixelHeight),MAP_10TH_MM).Y();
+        }
+        else if ( 0 == _rPropertyName.compareToAscii( FM_PROP_HASNAVIGATION ) )
+        {
+            sal_Bool bHasNavBar = pGrid->HasNavigationBar();
+            aProp <<= (sal_Bool)bHasNavBar;
+        }
+        else if ( 0 == _rPropertyName.compareToAscii( FM_PROP_RECORDMARKER ) )
+        {
+            sal_Bool bHasHandle = pGrid->HasHandle();
+            aProp <<= (sal_Bool)bHasHandle;
+        }
+        else if ( 0 == _rPropertyName.compareToAscii( FM_PROP_ENABLED ) )
+        {
+            aProp <<= (sal_Bool)pDataWindow->IsEnabled();
+        }
+        else
+            aProp = VCLXWindow::getProperty( _rPropertyName );
     }
     return aProp;
 }
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index b7adcd253ada..89cd12f77bfa 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: gridcell.cxx,v $
  *
- *  $Revision: 1.30 $
+ *  $Revision: 1.31 $
  *
- *  last change: $Author: fs $ $Date: 2002-10-15 07:39:40 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,6 +76,9 @@
 #ifndef _SVX_GRIDCOLS_HXX
 #include "gridcols.hxx"
 #endif
+#ifndef SVX_FORM_SDBDATACOLUMN_HXX
+#include "sdbdatacolumn.hxx"
+#endif
 
 #ifndef _COM_SUN_STAR_SDBC_XSTATEMENT_HPP_
 #include <com/sun/star/sdbc/XStatement.hpp>
@@ -140,15 +143,9 @@
 #ifndef _COMPHELPER_NUMBERS_HXX_
 #include <comphelper/numbers.hxx>
 #endif
-#ifndef _DBHELPER_DBCONVERSION_HXX_
-#include <connectivity/dbconversion.hxx>
-#endif
 #ifndef _COMPHELPER_PROPERTY_HXX_
 #include <comphelper/property.hxx>
 #endif
-#ifndef _CONNECTIVITY_DBTOOLS_HXX_
-#include <connectivity/dbtools.hxx>
-#endif
 #ifndef _COMPHELPER_DATETIME_HXX_
 #include <comphelper/datetime.hxx>
 #endif
@@ -282,8 +279,7 @@ void DbGridColumn::UpdateFromField(const DbGridRow* pRow, const Reference< ::com
         PTR_CAST(FmXFilterCell, m_pCell)->Update();
     else if (pRow && pRow->IsValid() && m_nFieldPos >= 0 && m_pCell && pRow->HasField(m_nFieldPos))
     {
-        const Reference< ::com::sun::star::sdb::XColumn >& xField = pRow->GetField(m_nFieldPos);
-        PTR_CAST(FmXDataCell, m_pCell)->UpdateFromField(xField, xFormatter);
+        PTR_CAST(FmXDataCell, m_pCell)->UpdateFromField( pRow->GetField( m_nFieldPos ).getColumn(), xFormatter );
     }
 }
 
@@ -421,8 +417,7 @@ String DbGridColumn::GetCellText(const DbGridRow* pRow, const Reference< ::com::
         aText  = INVALIDTEXT;
     else if (pRow->HasField(m_nFieldPos))
     {
-        const Reference< ::com::sun::star::sdb::XColumn >& xField = pRow->GetField(m_nFieldPos);
-        aText = GetCellText(xField, xFormatter);
+        aText = GetCellText( pRow->GetField( m_nFieldPos ).getColumn(), xFormatter );
     }
     return aText;
 }
@@ -449,7 +444,7 @@ Reference< ::com::sun::star::sdb::XColumn >  DbGridColumn::GetCurrentFieldValue(
     const DbGridRowRef xRow = m_rParent.GetCurrentRow();
     if (xRow.Is() && xRow->HasField(m_nFieldPos))
     {
-        xField = xRow->GetField(m_nFieldPos);
+        xField = xRow->GetField(m_nFieldPos).getColumn();
     }
     return xField;
 }
@@ -494,8 +489,7 @@ void DbGridColumn::Paint(OutputDevice& rDev,
         }
         else if (pRow->HasField(m_nFieldPos))
         {
-            const Reference< ::com::sun::star::sdb::XColumn >& xField = pRow->GetField(m_nFieldPos);
-            pDataCell->Paint(rDev, rRect, xField, xFormatter);
+            pDataCell->Paint(rDev, rRect, pRow->GetField( m_nFieldPos ).getColumn(), xFormatter);
         }
     }
     else if (!m_pCell)
@@ -662,14 +656,20 @@ sal_Bool DbCellControl::Commit()
 //------------------------------------------------------------------------------
 void DbCellControl::ImplInitSettings(Window* pParent, sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground)
 {
+    Window* pWindows[] = { m_pPainter,m_pWindow};
     if (bFont)
     {
         Font aFont( pParent->IsControlFont() ? pParent->GetControlFont() : pParent->GetPointFont());
         aFont.SetTransparent( isTransparent() );
-        if (m_pPainter)
-            m_pPainter->SetZoomedPointFont(aFont);
-        if (m_pWindow)
-            m_pWindow->SetZoomedPointFont(aFont);
+
+        for (sal_Int32 i=0; i < sizeof(pWindows)/sizeof(pWindows[0]); ++i)
+        {
+            if ( pWindows[i] )
+            {
+                pWindows[i]->SetZoomedPointFont(aFont);
+                pWindows[i]->SetZoom(pParent->GetZoom());
+            }
+        }
     }
 
     if (bFont || bForeground)
@@ -679,27 +679,19 @@ void DbCellControl::ImplInitSettings(Window* pParent, sal_Bool bFont, sal_Bool b
         sal_Bool bTextLineColor = pParent->IsTextLineColor();
         Color aTextLineColor( pParent->GetTextLineColor() );
 
-        if (m_pPainter)
+        for (sal_Int32 i=0; i < sizeof(pWindows)/sizeof(pWindows[0]); ++i)
         {
-            m_pPainter->SetTextColor(aTextColor);
-            if (pParent->IsControlForeground())
-                m_pPainter->SetControlForeground(aTextColor);
-
-            if (bTextLineColor)
-                m_pPainter->SetTextLineColor();
-            else
-                m_pPainter->SetTextLineColor(aTextLineColor);
-        }
-        if (m_pWindow)
-        {
-            m_pWindow->SetTextColor(aTextColor);
-            if (pParent->IsControlForeground())
-                m_pWindow->SetControlForeground(aTextColor);
+            if ( pWindows[i] )
+            {
+                pWindows[i]->SetTextColor(aTextColor);
+                if (pParent->IsControlForeground())
+                    pWindows[i]->SetControlForeground(aTextColor);
 
-            if (bTextLineColor)
-                m_pWindow->SetTextLineColor();
-            else
-                m_pWindow->SetTextLineColor(aTextLineColor);
+                if (bTextLineColor)
+                    pWindows[i]->SetTextLineColor();
+                else
+                    pWindows[i]->SetTextLineColor(aTextLineColor);
+            }
         }
     }
 
@@ -708,28 +700,19 @@ void DbCellControl::ImplInitSettings(Window* pParent, sal_Bool bFont, sal_Bool b
         if (pParent->IsControlBackground())
         {
             Color aColor( pParent->GetControlBackground());
-            if (m_pPainter)
+            for (sal_Int32 i=0; i < sizeof(pWindows)/sizeof(pWindows[0]); ++i)
             {
-                if ( isTransparent() )
-                    m_pPainter->SetBackground();
-                else
-                {
-                    m_pPainter->SetBackground(aColor);
-                    m_pPainter->SetControlBackground(aColor);
-                }
-                m_pPainter->SetFillColor(aColor);
-            }
-
-            if (m_pWindow)
-            {
-                if ( isTransparent() )
-                    m_pWindow->SetBackground();
-                else
+                if ( pWindows[i] )
                 {
-                    m_pWindow->SetBackground(aColor);
-                    m_pWindow->SetControlBackground(aColor);
+                    if ( isTransparent() )
+                        pWindows[i]->SetBackground();
+                    else
+                    {
+                        pWindows[i]->SetBackground(aColor);
+                        pWindows[i]->SetControlBackground(aColor);
+                    }
+                    pWindows[i]->SetFillColor(aColor);
                 }
-                m_pWindow->SetFillColor(aColor);
             }
         }
         else
@@ -884,7 +867,11 @@ double DbCellControl::GetValue(const Reference< ::com::sun::star::sdb::XColumn >
     double fValue = 0;
     if (m_rColumn.IsNumeric())
     {
-        fValue = _xVariant->getDouble();
+        try
+        {
+            fValue = _xVariant->getDouble();
+        }
+        catch(const Exception&) { }
     }
     else
     {
@@ -1475,7 +1462,10 @@ void DbCheckBox::Paint(OutputDevice& rDev, const Rectangle& rRect,
                           const Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter)
 {
     lcl_setCheckBoxState( _xVariant, static_cast<CheckBoxControl*>(m_pPainter) );
-    DbCellControl::Paint(rDev, rRect);
+    if ( m_pPainter->GetParent() != &rDev )
+        m_pPainter->Draw(&rDev,rRect.TopLeft(), rRect.GetSize(),0);
+    else
+        DbCellControl::Paint(rDev, rRect);
 }
 
 //------------------------------------------------------------------------------
@@ -2351,7 +2341,7 @@ String DbListBox::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn
         String aText;
         if (m_bBound)
         {
-            Sequence<sal_Int16> aPosSeq = ::findValue(m_aValueList, _xVariant->getString(), sal_True);
+            Sequence<sal_Int16> aPosSeq = ::comphelper::findValue(m_aValueList, _xVariant->getString(), sal_True);
             if (aPosSeq.getLength())
                 aText = static_cast<ListBox*>(m_pWindow)->GetEntry(aPosSeq.getConstArray()[0]);
         }
@@ -2700,7 +2690,7 @@ void DbFilterField::SetText(const String& rText)
         case ::com::sun::star::form::FormComponentType::LISTBOX:
         {
             String aText;
-            Sequence<sal_Int16> aPosSeq = ::findValue(m_aValueList, m_aText, sal_True);
+            Sequence<sal_Int16> aPosSeq = ::comphelper::findValue(m_aValueList, m_aText, sal_True);
             if (aPosSeq.getLength())
                 static_cast<ListBox*>(m_pWindow)->SelectEntryPos(aPosSeq.getConstArray()[0], sal_True);
             else
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index d122a038d2b9..c91db0255b8b 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: gridctrl.cxx,v $
  *
- *  $Revision: 1.58 $
+ *  $Revision: 1.59 $
  *
- *  last change: $Author: oj $ $Date: 2002-11-22 13:21:13 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -161,10 +161,12 @@
 #ifndef _SVX_DIALMGR_HXX
 #include "dialmgr.hxx"
 #endif
-
 #ifndef _SVX_FMSERVS_HXX
 #include "fmservs.hxx"
 #endif
+#ifndef SVX_FORM_SDBDATACOLUMN_HXX
+#include "sdbdatacolumn.hxx"
+#endif
 
 #define CURSORPOSITION_UNKNOWN -2
 
@@ -176,12 +178,6 @@ String OBJECTTEXT   = String::CreateFromAscii("<OBJECT>");
 #ifndef _COMPHELPER_STLTYPES_HXX_
 #include <comphelper/stl_types.hxx>
 #endif
-#ifndef _CONNECTIVITY_DBTOOLS_HXX_
-#include <connectivity/dbtools.hxx>
-#endif
-#ifndef _DBHELPER_DBCONVERSION_HXX_
-#include <connectivity/dbconversion.hxx>
-#endif
 #ifndef _COMPHELPER_DATETIME_HXX_
 #include <comphelper/datetime.hxx>
 #endif
@@ -195,7 +191,6 @@ String OBJECTTEXT   = String::CreateFromAscii("<OBJECT>");
 
 #include <algorithm>
 
-using namespace ::dbtools;
 using namespace ::svxform;
 using namespace ::svt;
 using namespace ::com::sun::star::beans;
@@ -859,17 +854,25 @@ void DbGridControl::NavigationBar::StateChanged( StateChangedType nType )
     {
         Fraction aZoom = GetZoom();
 
-        m_aRecordText.SetZoom(aZoom);
-        m_aAbsolute.SetZoom(aZoom);
-        m_aRecordOf.SetZoom(aZoom);
-        m_aRecordCount.SetZoom(aZoom);
-        m_aFirstBtn.SetZoom(aZoom);
-        m_aPrevBtn.SetZoom(aZoom);
-        m_aNextBtn.SetZoom(aZoom);
-        m_aLastBtn.SetZoom(aZoom);
-        m_aNewBtn.SetZoom(aZoom);
-            // not all of these controls need to know the new zoom, but to be sure ...
-
+        Window* pWindows[] = {
+                                &m_aRecordText,
+                                &m_aAbsolute,
+                                &m_aRecordOf,
+                                &m_aRecordCount,
+                                &m_aFirstBtn,
+                                &m_aPrevBtn,
+                                &m_aNextBtn,
+                                &m_aLastBtn,
+                                &m_aNewBtn
+                            };
+
+        // not all of these controls need to know the new zoom, but to be sure ...
+        Font aFont( IsControlFont() ? GetControlFont() : GetPointFont());
+        for (sal_Int32 i=0; i < sizeof(pWindows)/sizeof(pWindows[0]); ++i)
+        {
+            pWindows[i]->SetZoom(aZoom);
+            pWindows[i]->SetZoomedPointFont(aFont);
+        }
         // rearrange the controls
         m_nDefaultWidth = ArrangeControls();
     }
diff --git a/svx/source/fmcomp/gridctrl.src b/svx/source/fmcomp/gridctrl.src
index 38df28ed74ed..82b474e3e386 100644
--- a/svx/source/fmcomp/gridctrl.src
+++ b/svx/source/fmcomp/gridctrl.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: gridctrl.src,v $
  *
- *  $Revision: 1.21 $
+ *  $Revision: 1.22 $
  *
- *  last change: $Author: kz $ $Date: 2001-07-26 22:22:22 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -78,23 +78,24 @@ Menu RID_SVXMNU_ROWS
             Text [ swedish ] = "Radera rader" ;
             Text [ danish ] = "Slet r�kker" ;
             Text [ italian ] = "Elimina riga" ;
-            Text [ spanish ] = "Eliminar filas" ;
+            Text [ spanish ] = "Borrar filas" ;
             Text [ french ] = "Supprimer des lignes" ;
             Text [ dutch ] = "Rijen wissen" ;
             Text [ portuguese ] = "Eliminar linhas" ;
-            Text[ chinese_simplified ] = "ɾ����";
+            Text[ chinese_simplified ] = "删除行";
             Text[ russian ] = "������� ������";
             Text[ polish ] = "Usu� wiersze";
-            Text[ japanese ] = "�s�̍폜";
-            Text[ chinese_traditional ] = "�R����";
+            Text[ japanese ] = "行の削除";
+            Text[ chinese_traditional ] = "刪除行";
             Text[ dutch ] = "Rijen wissen";
-            Text[ chinese_simplified ] = "ɾ����";
+            Text[ chinese_simplified ] = "删除行";
             Text[ greek ] = "�������� �������";
-            Text[ korean ] = "�� ����";
+            Text[ korean ] = "행 삭제";
             Text[ arabic ] = "��� ����";
             Text[ turkish ] = "Sat�rlar� sil";
-            Text[ catalan ] = "Eliminar filas";
+            Text[ catalan ] = "Suprimeix les files";
             Text[ finnish ] = "Poista rivit";
+            Text[ thai ] = "ลบแถว";
         };
         MenuItem
         {
@@ -111,19 +112,20 @@ Menu RID_SVXMNU_ROWS
             Text [ spanish ] = "Guardar registro" ;
             Text [ french ] = "Enregistrer l'enregistrement" ;
             Text [ dutch ] = "Record opslaan" ;
-            Text[ chinese_simplified ] = "�������ݼ�¼";
-            Text[ russian ] = "��������� ������ ������";
+            Text[ chinese_simplified ] = "存盘数据记录";
+            Text[ russian ] = "��������� ������";
             Text[ polish ] = "Zapisz rekord";
-            Text[ japanese ] = "ں��ނ�ۑ�";
-            Text[ chinese_traditional ] = "�x�s��Ʊ���";
+            Text[ japanese ] = "レコードを保存";
+            Text[ chinese_traditional ] = "儲存資料條目";
             Text[ dutch ] = "Record opslaan";
-            Text[ chinese_simplified ] = "�������ݼ�¼";
+            Text[ chinese_simplified ] = "存盘数据记录";
             Text[ greek ] = "���������� �������� ���������";
-            Text[ korean ] = "���ڵ� ����";
+            Text[ korean ] = "레코드 저장";
             Text[ arabic ] = "��� ���";
             Text[ turkish ] = "Veri k�mesini kaydet";
-            Text[ catalan ] = "Guardar registro";
+            Text[ catalan ] = "Desa el registre";
             Text[ finnish ] = "Tallenna tietue";
+            Text[ thai ] = "บันทึกระเบียน";
         };
         MenuItem
         {
@@ -139,20 +141,21 @@ Menu RID_SVXMNU_ROWS
             Text [ italian ] = "Annulla: Immissione dati" ;
             Text [ spanish ] = "Deshacer: entrada de datos" ;
             Text [ french ] = "Annuler : saisie de donn�es" ;
-            Text [ dutch ] = "Ongedaan: Gegevensinvoer" ;
-            Text[ chinese_simplified ] = "��������: ��������";
+            Text [ dutch ] = "Ongedaan maken: gegevensinvoer" ;
+            Text[ chinese_simplified ] = "撤消命令: 输入数据";
             Text[ russian ] = "��������: ���� ������";
             Text[ polish ] = "Cofnij: Wprowadzanie danych";
-            Text[ japanese ] = "���ɖ߂�: �ް��̓���";
-            Text[ chinese_traditional ] = "�_��G��J���";
-            Text[ dutch ] = "Ongedaan: Gegevensinvoer";
-            Text[ chinese_simplified ] = "��������: ��������";
+            Text[ japanese ] = "元に戻す: データの入力";
+            Text[ chinese_traditional ] = "復原：輸入資料";
+            Text[ dutch ] = "Ongedaan maken: gegevensinvoer";
+            Text[ chinese_simplified ] = "撤消命令: 输入数据";
             Text[ greek ] = "��������: �������� ���������";
-            Text[ korean ] = "�������: ������ �Է�";
+            Text[ korean ] = "실행 취소: 데이터 입력";
             Text[ arabic ] = "�����: ����� ������";
             Text[ turkish ] = "Geri al: Veri giri�i";
-            Text[ catalan ] = "Deshacer: entrada de datos";
-            Text[ finnish ] = "Peruuta: tietomerkint�";
+            Text[ catalan ] = "Desf�s: entrada de dades";
+            Text[ finnish ] = "Kumoa: tietomerkint�";
+            Text[ thai ] = "เลิกทำ: ป้อนข้อมูล";
         };
     };
 };
@@ -194,19 +197,20 @@ Menu RID_SVXMNU_COLS
                         Text [ spanish ] = "Campo de texto" ;
                         Text [ french ] = "Zone de texte" ;
                         Text [ dutch ] = "Tekstveld" ;
-                        Text[ chinese_simplified ] = "�ı���";
+                        Text[ chinese_simplified ] = "文本框";
                         Text[ russian ] = "��������� ����";
                         Text[ polish ] = "Pole tekstowe";
-                        Text[ japanese ] = "÷���ޯ��";
-                        Text[ chinese_traditional ] = "��r���";
+                        Text[ japanese ] = "テキストボックス";
+                        Text[ chinese_traditional ] = "文字方塊";
                         Text[ dutch ] = "Tekstveld";
-                        Text[ chinese_simplified ] = "�ı���";
+                        Text[ chinese_simplified ] = "文本框";
                         Text[ greek ] = "����� ��������";
-                        Text[ korean ] = "�ؽ�Ʈ �ʵ�";
+                        Text[ korean ] = "텍스트 필드";
                         Text[ arabic ] = "��� ��";
                         Text[ turkish ] = "Metin alan�";
-                        Text[ catalan ] = "Campo de texto";
+                        Text[ catalan ] = "Quadre de text";
                         Text[ finnish ] = "Tekstikehys";
+                        Text[ thai ] = "กล่องข้อความ";
                     };
                     MenuItem
                     {
@@ -217,25 +221,26 @@ Menu RID_SVXMNU_COLS
                         Text [ portuguese ] = "Caixa de verifica��o" ;
                         Text [ english_us ] = "Check Box" ;
                         Text [ portuguese_brazilian ] = "Checkbox" ;
-                        Text [ swedish ] = "Markeringsf�lt" ;
+                        Text [ swedish ] = "Kryssruta" ;
                         Text [ danish ] = "Afkrydsningsfelt" ;
                         Text [ italian ] = "Casella di controllo" ;
                         Text [ spanish ] = "Casilla de verificaci�n" ;
                         Text [ french ] = "Case � cocher" ;
                         Text [ dutch ] = "Markeerveld" ;
-                        Text[ chinese_simplified ] = "��ѡ��";
-                        Text[ russian ] = "���� ������";
+                        Text[ chinese_simplified ] = "复选框";
+                        Text[ russian ] = "������";
                         Text[ polish ] = "Pole wyboru";
-                        Text[ japanese ] = "�����ޯ��";
-                        Text[ chinese_traditional ] = "�֨����";
+                        Text[ japanese ] = "チェックボックス";
+                        Text[ chinese_traditional ] = "核取方塊";
                         Text[ dutch ] = "Markeerveld";
-                        Text[ chinese_simplified ] = "��ѡ��";
+                        Text[ chinese_simplified ] = "复选框";
                         Text[ greek ] = "������� �������";
-                        Text[ korean ] = "Ȯ�ζ�";
+                        Text[ korean ] = "확인란";
                         Text[ arabic ] = "���� ������";
                         Text[ turkish ] = "Se�me kutusu";
-                        Text[ catalan ] = "Casilla de verificaci�n";
+                        Text[ catalan ] = "Casella de verificaci�";
                         Text[ finnish ] = "Valintaruutu";
+                        Text[ thai ] = "กล่องกาเครื่องหมาย";
                     };
                     MenuItem
                     {
@@ -249,22 +254,23 @@ Menu RID_SVXMNU_COLS
                         Text [ swedish ] = "Kombinationsf�lt" ;
                         Text [ danish ] = "Kombinationsboks" ;
                         Text [ italian ] = "Casella combinata" ;
-                        Text [ spanish ] = "Campo combinado" ;
+                        Text [ spanish ] = "Cuadro combinado" ;
                         Text [ french ] = "Zone combin�e" ;
                         Text [ dutch ] = "Combinatieveld" ;
-                        Text[ chinese_simplified ] = "��Ͽ�";
+                        Text[ chinese_simplified ] = "组合框";
                         Text[ russian ] = "���� �� �������";
                         Text[ polish ] = "Pole kombi";
-                        Text[ japanese ] = "�����ޯ��";
-                        Text[ chinese_traditional ] = "�զX���";
+                        Text[ japanese ] = "コンボボックス";
+                        Text[ chinese_traditional ] = "組合方塊";
                         Text[ dutch ] = "Combinatieveld";
-                        Text[ chinese_simplified ] = "��Ͽ�";
+                        Text[ chinese_simplified ] = "组合框";
                         Text[ greek ] = "����� ����������";
-                        Text[ korean ] = "�޺� �ڽ�";
+                        Text[ korean ] = "콤보 상자";
                         Text[ arabic ] = "���� ����� ����";
                         Text[ turkish ] = "Kombinasyon alan�";
-                        Text[ catalan ] = "Campo combinado";
+                        Text[ catalan ] = "Quadre combinat";
                         Text[ finnish ] = "Yhdistelm�ruutu";
+                        Text[ thai ] = "กล่องคอมโบ้ ";
                     };
                     MenuItem
                     {
@@ -281,19 +287,20 @@ Menu RID_SVXMNU_COLS
                         Text [ spanish ] = "Listado" ;
                         Text [ french ] = "Zone de liste" ;
                         Text [ dutch ] = "Keuzelijst" ;
-                        Text[ chinese_simplified ] = "���";
+                        Text[ chinese_simplified ] = "列表框";
                         Text[ russian ] = "������";
                         Text[ polish ] = "Pole listy";
-                        Text[ japanese ] = "ؽ��ޯ��";
-                        Text[ chinese_traditional ] = "�M����";
+                        Text[ japanese ] = "リストボックス";
+                        Text[ chinese_traditional ] = "清單方塊";
                         Text[ dutch ] = "Keuzelijst";
-                        Text[ chinese_simplified ] = "���";
+                        Text[ chinese_simplified ] = "列表框";
                         Text[ greek ] = "����� ������";
-                        Text[ korean ] = "��� �ʵ�";
+                        Text[ korean ] = "목록 필드";
                         Text[ arabic ] = "���� �����";
                         Text[ turkish ] = "Liste alan�";
-                        Text[ catalan ] = "Listado";
+                        Text[ catalan ] = "Quadre de llista";
                         Text[ finnish ] = "Luetteloruutu";
+                        Text[ thai ] = "กล่องรายการ";
                     };
                     MenuItem
                     {
@@ -310,19 +317,20 @@ Menu RID_SVXMNU_COLS
                         Text [ spanish ] = "Campo de fecha" ;
                         Text [ french ] = "Champ de date" ;
                         Text [ dutch ] = "Datumveld" ;
-                        Text[ chinese_simplified ] = "�����ֶ�";
+                        Text[ chinese_simplified ] = "日期字段";
                         Text[ russian ] = "���� ����";
                         Text[ polish ] = "Pole daty";
-                        Text[ japanese ] = "���t̨����";
-                        Text[ chinese_traditional ] = "������";
+                        Text[ japanese ] = "日付フィールド";
+                        Text[ chinese_traditional ] = "日期欄位";
                         Text[ dutch ] = "Datumveld";
-                        Text[ chinese_simplified ] = "�����ֶ�";
+                        Text[ chinese_simplified ] = "日期字段";
                         Text[ greek ] = "����� �����������";
-                        Text[ korean ] = "��¥ �ʵ�";
+                        Text[ korean ] = "날짜 필드";
                         Text[ arabic ] = "��� �������";
                         Text[ turkish ] = "Tarih alan�";
-                        Text[ catalan ] = "Campo de fecha";
+                        Text[ catalan ] = "Camp Data";
                         Text[ finnish ] = "P�iv�m��r�kentt�";
+                        Text[ thai ] = "เขตข้อมูลวันที่";
                     };
                     MenuItem
                     {
@@ -339,19 +347,20 @@ Menu RID_SVXMNU_COLS
                         Text [ spanish ] = "Campo horario" ;
                         Text [ french ] = "Champ horaire" ;
                         Text [ dutch ] = "Tijdveld" ;
-                        Text[ chinese_simplified ] = "ʱ���ֶ�";
+                        Text[ chinese_simplified ] = "时间字段";
                         Text[ russian ] = "���� �������";
-                        Text[ polish ] = "Pole czasu";
-                        Text[ japanese ] = "����̨����";
-                        Text[ chinese_traditional ] = "�ɶ����";
+                        Text[ polish ] = "Pole godziny";
+                        Text[ japanese ] = "時刻フィールド";
+                        Text[ chinese_traditional ] = "時間欄位";
                         Text[ dutch ] = "Tijdveld";
-                        Text[ chinese_simplified ] = "ʱ���ֶ�";
+                        Text[ chinese_simplified ] = "时间字段";
                         Text[ greek ] = "����� ����";
-                        Text[ korean ] = "�ð� �ʵ�";
+                        Text[ korean ] = "시간 필드";
                         Text[ arabic ] = "��� �����";
                         Text[ turkish ] = "Zaman alan�";
-                        Text[ catalan ] = "Campo horario";
+                        Text[ catalan ] = "Camp Hora";
                         Text[ finnish ] = "Aikakentt�";
+                        Text[ thai ] = "เขตข้อมูลเวลา";
                     };
                     MenuItem
                     {
@@ -368,19 +377,20 @@ Menu RID_SVXMNU_COLS
                         Text [ spanish ] = "Campo num�rico" ;
                         Text [ french ] = "Champ num�rique" ;
                         Text [ dutch ] = "Numeriek veld" ;
-                        Text[ chinese_simplified ] = "�����ֶ�";
+                        Text[ chinese_simplified ] = "数字字段";
                         Text[ russian ] = "�������� ����";
                         Text[ polish ] = "Pole numeryczne";
-                        Text[ japanese ] = "�ԍ�̨����";
-                        Text[ chinese_traditional ] = "�Ʀr���";
+                        Text[ japanese ] = "番号フィールド";
+                        Text[ chinese_traditional ] = "數字欄位";
                         Text[ dutch ] = "Numeriek veld";
-                        Text[ chinese_simplified ] = "�����ֶ�";
+                        Text[ chinese_simplified ] = "数字字段";
                         Text[ greek ] = "���������� �����";
-                        Text[ korean ] = "���� �ʵ�";
+                        Text[ korean ] = "숫자 필드";
                         Text[ arabic ] = "��� ����";
                         Text[ turkish ] = "Say�sal alan";
-                        Text[ catalan ] = "Campo num�rico";
+                        Text[ catalan ] = "Campo num�ric";
                         Text[ finnish ] = "Numeerinen kentt�";
+                        Text[ thai ] = "เขตข้อมูลตัวเลข";
                     };
                     MenuItem
                     {
@@ -397,19 +407,20 @@ Menu RID_SVXMNU_COLS
                         Text [ spanish ] = "Campo de moneda" ;
                         Text [ french ] = "Champ mon�taire" ;
                         Text [ dutch ] = "Valutaveld" ;
-                        Text[ chinese_simplified ] = "�����ֶ�";
-                        Text[ russian ] = "���� ��� ������";
+                        Text[ chinese_simplified ] = "货币字段";
+                        Text[ russian ] = "�������� ����";
                         Text[ polish ] = "Pole walutowe";
-                        Text[ japanese ] = "�ʉ�̨����";
-                        Text[ chinese_traditional ] = "�f�����";
+                        Text[ japanese ] = "通貨フィールド";
+                        Text[ chinese_traditional ] = "貨幣欄位";
                         Text[ dutch ] = "Valutaveld";
-                        Text[ chinese_simplified ] = "�����ֶ�";
+                        Text[ chinese_simplified ] = "货币字段";
                         Text[ greek ] = "����� ����������";
-                        Text[ korean ] = "��ȭ �ʵ�";
+                        Text[ korean ] = "통화 필드";
                         Text[ arabic ] = "��� ������";
                         Text[ turkish ] = "Para birimi alan�";
-                        Text[ catalan ] = "Campo de moneda";
+                        Text[ catalan ] = "Camp Moneda";
                         Text[ finnish ] = "Valuuttakentt�";
+                        Text[ thai ] = "เขตข้อมูลสกุลเงิน";
                     };
                     MenuItem
                     {
@@ -426,19 +437,20 @@ Menu RID_SVXMNU_COLS
                         Text [ spanish ] = "Campo enmascarado" ;
                         Text [ french ] = "Champ masqu�" ;
                         Text [ dutch ] = "Patroonveld" ;
-                        Text[ chinese_simplified ] = "�����ֶ�";
-                        Text[ russian ] = "���� �������";
+                        Text[ chinese_simplified ] = "掩码字段";
+                        Text[ russian ] = "���� � ������ �����";
                         Text[ polish ] = "Pole wzorca";
-                        Text[ japanese ] = "�����̨����";
-                        Text[ chinese_traditional ] = "�B�n���";
+                        Text[ japanese ] = "パターンフィールド";
+                        Text[ chinese_traditional ] = "遮罩欄位";
                         Text[ dutch ] = "Patroonveld";
-                        Text[ chinese_simplified ] = "�����ֶ�";
+                        Text[ chinese_simplified ] = "掩码字段";
                         Text[ greek ] = "��������� �����";
-                        Text[ korean ] = "����ũ�� �ʵ�";
+                        Text[ korean ] = "패턴 필드";
                         Text[ arabic ] = "��� �������";
                         Text[ turkish ] = "Maskelenmi� alan";
-                        Text[ catalan ] = "Campo enmascarado";
+                        Text[ catalan ] = "Camp emmascarat";
                         Text[ finnish ] = "Kuviokentt�";
+                        Text[ thai ] = "เขตข้อมูลลวดลาย";
                     };
                     MenuItem
                     {
@@ -453,19 +465,20 @@ Menu RID_SVXMNU_COLS
                         Text[ french ] = "Champ format�";
                         Text[ spanish ] = "Campo formateado";
                         Text[ swedish ] = "Formaterat f�lt";
-                        Text[ russian ] = "����������������� ����";
+                        Text[ russian ] = "���� ��������������";
                         Text[ italian ] = "Campo formattato";
                         Text[ danish ] = "Formateret felt";
                         Text[ polish ] = "Formatowane pole";
                         Text[ portuguese_brazilian ] = "Formatted Field";
-                        Text[ japanese ] = "�����ݒ肳�ꂽ̨����";
-                        Text[ korean ] = "���˵� �ʵ�";
-                        Text[ chinese_simplified ] = "��ʽ�����ֶ�";
-                        Text[ chinese_traditional ] = "�榡�ƪ����";
+                        Text[ japanese ] = "書式設定されたフィールド";
+                        Text[ korean ] = "서식 있는 필드";
+                        Text[ chinese_simplified ] = "格式化的字段";
+                        Text[ chinese_traditional ] = "格式化的欄位";
                         Text[ arabic ] = "��� �������";
                         Text[ turkish ] = "Formatl� alan";
-                        Text[ catalan ] = "Campo formateado";
+                        Text[ catalan ] = "Camp formatat";
                         Text[ finnish ] = "Muotoiltu kentt�";
+                        Text[ thai ] = "เขตข้อมูลการจัดรูปแบบ";
                     };
                     MenuItem
                     {
@@ -486,30 +499,32 @@ Menu RID_SVXMNU_COLS
                         Text[ danish ] = "Dato- og klokkesl�tsfelt";
                         Text[ polish ] = "pole na dat� i godzin�";
                         Text[ portuguese_brazilian ] = "date and time field";
-                        Text[ japanese ] = "���t�Ǝ��Ԃ�̨����";
-                        Text[ korean ] = "��¥�� �ð� �ʵ�";
-                        Text[ chinese_simplified ] = "���ں�ʱ������";
-                        Text[ chinese_traditional ] = "����M�ɶ���";
+                        Text[ japanese ] = "日付と時間のフィールド";
+                        Text[ korean ] = "날짜 및 시간 필드";
+                        Text[ chinese_simplified ] = "日期和时间区域";
+                        Text[ chinese_traditional ] = "日期和時間欄";
                         Text[ arabic ] = "��� ����� ����";
                         Text[ turkish ] = "Tarih ve zaman alan�";
-                        Text[ catalan ] = "Campo de fecha y hora";
+                        Text[ catalan ] = "Camp Data i hora";
                         Text[ finnish ] = "P�iv�m��r� ja kellonaika -kentt�";
+                        Text[ thai ] = "เขตข้อมูลวันที่และเวลา";
                     };
                 };
             };
-            Text[ chinese_simplified ] = "������(~C)";
-            Text[ russian ] = "�������� �������";
+            Text[ chinese_simplified ] = "插入列(~C)";
+            Text[ russian ] = "�������� �������";
             Text[ polish ] = "W~staw kolumn�";
-            Text[ japanese ] = "��̑}��(~C)";
-            Text[ chinese_traditional ] = "���J��(~C)";
+            Text[ japanese ] = "列の挿入(~C)";
+            Text[ chinese_traditional ] = "插入欄(~C)";
             Text[ dutch ] = "~Kolom invoegen";
-            Text[ chinese_simplified ] = "������(~C)";
+            Text[ chinese_simplified ] = "插入列(~C)";
             Text[ greek ] = "�������� ~������";
-            Text[ korean ] = "�� ����(~C)";
+            Text[ korean ] = "열 삽입(~C)";
             Text[ arabic ] = "����� ����";
             Text[ turkish ] = "S�tun ekle";
-            Text[ catalan ] = "~Insertar columna";
+            Text[ catalan ] = "Insereix una ~columna";
             Text[ finnish ] = "~Lis�� sarake";
+            Text[ thai ] = "แทรก~คอลัมน์";
         };
         MenuItem
         {
@@ -522,23 +537,24 @@ Menu RID_SVXMNU_COLS
             Text [ swedish ] = "Ers�tt med" ;
             Text [ danish ] = "Erstat med" ;
             Text [ italian ] = "~Sostituisci con" ;
-            Text [ spanish ] = "~Reemplazar con" ;
+            Text [ spanish ] = "~Reemplazar por " ;
             Text [ french ] = "~Remplacer par" ;
             Text [ dutch ] = "~Vervangen door" ;
             Text [ portuguese ] = "~Substituir por" ;
-            Text[ chinese_simplified ] = "�滻��(~R)";
+            Text[ chinese_simplified ] = "替换成(~R)";
             Text[ russian ] = "�������� ��";
             Text[ polish ] = "Zmie� na";
-            Text[ japanese ] = "�u������(~R)";
-            Text[ chinese_traditional ] = "�����(~R)";
+            Text[ japanese ] = "置き換え(~R)";
+            Text[ chinese_traditional ] = "更替成(~R)";
             Text[ dutch ] = "~Vervangen door";
-            Text[ chinese_simplified ] = "�滻��(~R)";
+            Text[ chinese_simplified ] = "替换成(~R)";
             Text[ greek ] = "������������� �~�";
-            Text[ korean ] = "�ٲٱ�(~R)";
+            Text[ korean ] = "바꾸기(~R)";
             Text[ arabic ] = "������� ��";
             Text[ turkish ] = "�ununla de�i�tir...";
-            Text[ catalan ] = "~Reemplazar con";
-            Text[ finnish ] = "~Korvaa kohteella";
+            Text[ catalan ] = "~Reempla�a amb";
+            Text[ finnish ] = "Korvaa ~kohteella";
+            Text[ thai ] = "แ~ทนที่ด้วย";
         };
         MenuItem
         {
@@ -548,26 +564,27 @@ Menu RID_SVXMNU_COLS
             Text [ ENGLISH ] = "~Delete column" ;
             Text [ english_us ] = "Delete Column" ;
             Text [ portuguese_brazilian ] = "Spalte ~l?chen" ;
-            Text [ swedish ] = "Radera ~kolumn" ;
+            Text [ swedish ] = "Radera ko~lumn" ;
             Text [ danish ] = "Slet kolonne" ;
             Text [ italian ] = "Elimina colonna" ;
-            Text [ spanish ] = "~Eliminar columna" ;
+            Text [ spanish ] = "~Borrar la columna" ;
             Text [ french ] = "Supprimer la ~colonne" ;
             Text [ dutch ] = "Kolom ~wissen" ;
             Text [ portuguese ] = "E~liminar coluna" ;
-            Text[ chinese_simplified ] = "ɾ����(~D)";
+            Text[ chinese_simplified ] = "删除列";
             Text[ russian ] = "������� �������";
             Text[ polish ] = "Usu� kolumn�";
-            Text[ japanese ] = "��̍폜";
-            Text[ chinese_traditional ] = "�R����(~D)";
+            Text[ japanese ] = "列の削除";
+            Text[ chinese_traditional ] = "刪除欄";
             Text[ dutch ] = "Kolom ~wissen";
-            Text[ chinese_simplified ] = "ɾ����(~D)";
+            Text[ chinese_simplified ] = "删除列";
             Text[ greek ] = "�������� ���~���";
-            Text[ korean ] = "�� ����";
+            Text[ korean ] = "열 삭제";
             Text[ arabic ] = "��� ����";
             Text[ turkish ] = "S�tunu sil";
-            Text[ catalan ] = "~Eliminar columna";
+            Text[ catalan ] = "Suprimeix la columna";
             Text[ finnish ] = "Poista sarake";
+            Text[ thai ] = "ลบคอลัมน์";
         };
         MenuItem
         {
@@ -582,19 +599,20 @@ Menu RID_SVXMNU_COLS
             Text[ french ] = "~Masquer la colonne";
             Text[ spanish ] = "~Ocultar columna";
             Text[ swedish ] = "D�lj kolumn";
-            Text[ russian ] = "������ �������";
+            Text[ russian ] = "������ �������";
             Text[ italian ] = "~Nascondi colonne";
             Text[ danish ] = "Skjul kolonne";
             Text[ polish ] = "Ukryj kolumn�";
             Text[ portuguese_brazilian ] = "~Hide column";
-            Text[ japanese ] = "���\\�����Ȃ�(~H)";
-            Text[ korean ] = "�� �����(~H)";
-            Text[ chinese_simplified ] = "������(~H)";
-            Text[ chinese_traditional ] = "���J��(~H)";
+            Text[ japanese ] = "列を表示しない(~H)";
+            Text[ korean ] = "열 숨기기(~H)";
+            Text[ chinese_simplified ] = "隐入列(~H)";
+            Text[ chinese_traditional ] = "隱入欄(~H)";
             Text[ arabic ] = "����� ������";
             Text[ turkish ] = "S�tunu gizle";
-            Text[ catalan ] = "~Ocultar columna";
+            Text[ catalan ] = "~Oculta les columnes";
             Text[ finnish ] = "~Piilota sarakkeet";
+            Text[ thai ] = "~ซ่อนคอลัมน์";
         };
         MenuItem
         {
@@ -624,15 +642,16 @@ Menu RID_SVXMNU_COLS
                         Text[ danish ] = "Flere ...";
                         Text[ polish ] = "Wi�cej ...";
                         Text[ portuguese_brazilian ] = "~More ...";
-                        Text[ japanese ] = "���̑�(~M)...";
-                        Text[ korean ] = "�ڼ��� (~M)...";
-                        Text[ chinese_simplified ] = "����(~M)...";
-                        Text[ chinese_traditional ] = "��h(~M)...";
+                        Text[ japanese ] = "その他(~M)...";
+                        Text[ korean ] = "자세히(~M)...";
+                        Text[ chinese_simplified ] = "更多(~M)...";
+                        Text[ chinese_traditional ] = "更多(~M)...";
                         Text[ arabic ] = "������ ...";
                         Text[ language_user1 ] = "(��): � ����������� � �����������; - - - -";
                         Text[ turkish ] = "Di�er...";
-                        Text[ catalan ] = "~M�s ...";
-                        Text[ finnish ] = "~Lis�� ";
+                        Text[ catalan ] = "~M�s ...";
+                        Text[ finnish ] = "~Lis�� ...";
+                        Text[ thai ] = "~รายละเอียด ...";
                     };
                     MenuItem
                     {
@@ -656,14 +675,15 @@ Menu RID_SVXMNU_COLS
                         Text[ danish ] = "Alle";
                         Text[ polish ] = "Wszystkie";
                         Text[ portuguese_brazilian ] = "~All";
-                        Text[ japanese ] = "���ׂ�(~A)";
-                        Text[ korean ] = "��ü(~A)";
-                        Text[ chinese_simplified ] = "ȫ��(~A)";
-                        Text[ chinese_traditional ] = "����(~A)";
+                        Text[ japanese ] = "すべて(~A)";
+                        Text[ korean ] = "모두(~A)";
+                        Text[ chinese_simplified ] = "全部(~A)";
+                        Text[ chinese_traditional ] = "全部(~A)";
                         Text[ arabic ] = "����";
                         Text[ turkish ] = "T�m�";
-                        Text[ catalan ] = "~Todas";
+                        Text[ catalan ] = "~Tots";
                         Text[ finnish ] = "~Kaikki";
+                        Text[ thai ] = "~ทั้งหมด";
                     };
                 };
             };
@@ -674,19 +694,20 @@ Menu RID_SVXMNU_COLS
             Text[ french ] = "~Afficher les colonnes";
             Text[ spanish ] = "~Mostrar columnas";
             Text[ swedish ] = "Visa kolumner";
-            Text[ russian ] = "�������� �������";
+            Text[ russian ] = "�������� �������";
             Text[ italian ] = "~Mostra colonne";
             Text[ danish ] = "Vis kolonner";
             Text[ polish ] = "Wy�wietl kolumny";
             Text[ portuguese_brazilian ] = "~Show columns";
-            Text[ japanese ] = "���\\������(~S)";
-            Text[ korean ] = "�� ��Ÿ����(~S)";
-            Text[ chinese_simplified ] = "��ʾ��(~S)";
-            Text[ chinese_traditional ] = "�����(~S)";
+            Text[ japanese ] = "列を表示する(~S)";
+            Text[ korean ] = "열 표시(~S)";
+            Text[ chinese_simplified ] = "显示列(~S)";
+            Text[ chinese_traditional ] = "顯示欄(~S)";
             Text[ arabic ] = "����� �������";
             Text[ turkish ] = "S�tunlar� g�ster";
-            Text[ catalan ] = "~Mostrar columnas";
+            Text[ catalan ] = "~Mostra les columnes";
             Text[ finnish ] = "~N�yt� sarakkeet";
+            Text[ thai ] = "แ~สดงคอลัมน์";
         };
         MenuItem
         {
@@ -703,19 +724,20 @@ Menu RID_SVXMNU_COLS
             Text[ swedish ] = "~Kolumn...";
             Text[ dutch ] = "~Kolom...";
             Text[ spanish ] = "~Columna...";
-            Text[ chinese_simplified ] = "��(~C)...";
-            Text[ russian ] = "�������...";
+            Text[ chinese_simplified ] = "列...";
+            Text[ russian ] = "�������...";
             Text[ polish ] = "Kolumna...";
-            Text[ japanese ] = "��...";
-            Text[ chinese_traditional ] = "��(~C)...";
+            Text[ japanese ] = "列...";
+            Text[ chinese_traditional ] = "欄...";
             Text[ dutch ] = "~Kolom...";
-            Text[ chinese_simplified ] = "��(~C)...";
+            Text[ chinese_simplified ] = "列...";
             Text[ greek ] = "~�����...";
-            Text[ korean ] = "��...";
+            Text[ korean ] = "열...";
             Text[ arabic ] = "...����";
             Text[ turkish ] = "S�tun...";
-            Text[ catalan ] = "~Columna...";
-            Text[ finnish ] = "Sarake";
+            Text[ catalan ] = "Columna...";
+            Text[ finnish ] = "Sarake...";
+            Text[ thai ] = "คอลัมน์...";
         };
     };
 };
@@ -737,3 +759,17 @@ Menu RID_SVXMNU_CELL
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svx/source/fmcomp/showcols.src b/svx/source/fmcomp/showcols.src
index abf53e944752..04e7ecec7f01 100644
--- a/svx/source/fmcomp/showcols.src
+++ b/svx/source/fmcomp/showcols.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: showcols.src,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: vg $ $Date: 2001-11-16 22:25:17 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -81,7 +81,7 @@ ModalDialog RID_SVX_DLG_SHOWGRIDCOLUMNS
         Text [ ENGLISH ] = "The following columns are hidden currently. Please mark the fields you want to show and chosse OK";
         Text[ english_us ] = "The following columns are currently hidden. Please mark the fields you want to show and choose OK.";
         Text[ portuguese ] = "As seguintes colunas encontram-se ocultas. Seleccione as que deseja ver novamente e clique em OK.";
-        Text[ russian ] = "��������� ������� ��������. �������� �� �������, ������� ���������� ����� �������� � ������� OK.";
+        Text[ russian ] = "��������� ������� ��������. �������� �������, ������� ���������� �������� � ������� ��.";
         Text[ greek ] = "�� ��������� ������ ����� ������ ���� �� �����. �������� �������� ����� ��� ���������� �� ����������� ��� ������� ��� �������� �� 'OK'";
         Text[ dutch ] = "De volgende kolommen zijn momenteel verborgen. Markeer de kolommen die u weer zichtbaar wilt maken en klik op OK.";
         Text[ french ] = "Les colonnes suivantes sont cach�es pour l'instant. S�lectionnez celles que vous souhaitez faire afficher et cliquez sur OK.";
@@ -92,13 +92,14 @@ ModalDialog RID_SVX_DLG_SHOWGRIDCOLUMNS
         Text[ polish ] = "Nast�puj�ce kolumny s� na razie ukryte. Nale�y zaznaczy� kolumny, kt�re maj� zosta� wy�wietlone i nacisn�� nast�pnie przycisk OK.";
         Text[ portuguese_brazilian ] = "The following columns are hidden currently. Please mark the fields you want to show and chosse OK";
         Text[ japanese ] = "次の列は現在隠されています。表示すべき列を選択してOKを押してください。";
-        Text[ korean ] = "다음 열들은 현재 숨겨진 상태입니다. 다시 나타내고자 하는 열을 선택 표시한 다음 OK (확인) 버튼을 클릭하십시오.";
+        Text[ korean ] = "다음 열들은 현재 숨겨진 상태입니다. 다시 표시하려는 열을 선택한 다음 확인 버튼을 클릭하십시오.";
         Text[ chinese_simplified ] = "已经隐入以下的列。请选中要显示的列区域,然后点击确定。";
         Text[ chinese_traditional ] = "以下的欄是隱入的。請您選取要顯示的欄，然后按一下確定。";
         Text[ arabic ] = "��� ������� ����� ������. ������ ����� ������� ���� ���� ������ǡ �� ����� ��� \"�����\"";
         Text[ turkish ] = "�u s�tunlar �u an gizlenmi� durumda. Tekrar g�r�nt�lemek istediklerinizi se�in ve \"Tamam\" d��mesini t�klay�n.";
-        Text[ catalan ] = "Las siguientes columnas est�n por ahora ocultas. Seleccione las que deban mostrarse y pulse sobre Aceptar.";
-        Text[ finnish ] = "Seuraavat sarakkeet on piilotettu. Merkitse n?ytett?v?t kent?t ja valitse sitten OK.";
+        Text[ catalan ] = "Les seg�ents columnes estan ocultes. Seleccioneu les que s'han de mostrar i feu clic sobre Accepta.";
+        Text[ finnish ] = "Seuraavat sarakkeet on piilotettu. Merkitse n�ytett�v�t kent�t ja valitse sitten OK.";
+        Text[ thai ] = "ปัจจุบันคอลัมน์นี้ถูกซ่อนอยู่ กรุณาทำเครื่องหมายเขตข้อมูลที่คุณต้องการแสดงและเลือกตกลง";
     };
 
     ListBox 1
@@ -128,7 +129,7 @@ ModalDialog RID_SVX_DLG_SHOWGRIDCOLUMNS
     };
     Text[ english_us ] = "Show columns";
     Text[ portuguese ] = "Mostrar colunas";
-    Text[ russian ] = "�������� �������";
+    Text[ russian ] = "�������� �������";
     Text[ greek ] = "�������� ������";
     Text[ dutch ] = "Kolommen weergeven";
     Text[ french ] = "Afficher les colonnes";
@@ -145,8 +146,9 @@ ModalDialog RID_SVX_DLG_SHOWGRIDCOLUMNS
     Text[ arabic ] = "����� �������";
     Text[ turkish ] = "S�tunlar� g�r�nt�le";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Mostrar columnas";
-    Text[ finnish ] = "N?yt? sarakkeet";
+    Text[ catalan ] = "Mostra les columnes";
+    Text[ finnish ] = "N�yt� sarakkeet";
+    Text[ thai ] = "แสดงคอลัมน์";
 };
 
 
@@ -157,3 +159,9 @@ ModalDialog RID_SVX_DLG_SHOWGRIDCOLUMNS
 
 
 
+
+
+
+
+
+
diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx
index aff8fba80bb7..a9ac5e354995 100644
--- a/svx/source/form/dbtoolsclient.cxx
+++ b/svx/source/form/dbtoolsclient.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbtoolsclient.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: os $ $Date: 2002-12-05 15:06:25 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -90,6 +90,7 @@ namespace svxform
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::beans;
     using namespace ::com::sun::star::sdb;
+    using namespace ::com::sun::star::container;
 
     //====================================================================
     //= ODbtoolsClient
@@ -335,6 +336,36 @@ namespace svxform
         return bRet;
     }
 
+    //----------------------------------------------------------------
+    Reference< XNameAccess > OStaticDataAccessTools::getFieldsByCommandDescriptor( const Reference< XConnection >& _rxConnection,
+        const sal_Int32 _nCommandType, const ::rtl::OUString& _rCommand,
+            Reference< XComponent >& _rxKeepFieldsAlive, ::dbtools::SQLExceptionInfo* _pErrorInfo ) SAL_THROW( ( ) )
+    {
+        Reference< XNameAccess > aFields;
+
+        checkIfLoaded();
+        if ( m_xDataAccessTools.is() )
+            aFields = m_xDataAccessTools->getFieldsByCommandDescriptor( _rxConnection, _nCommandType,
+                _rCommand, _rxKeepFieldsAlive, _pErrorInfo );
+
+        return aFields;
+    }
+
+    //----------------------------------------------------------------
+    Sequence< ::rtl::OUString > OStaticDataAccessTools::getFieldNamesByCommandDescriptor(
+        const Reference< XConnection >& _rxConnection, const sal_Int32 _nCommandType,
+        const ::rtl::OUString& _rCommand, ::dbtools::SQLExceptionInfo* _pErrorInfo ) SAL_THROW( ( ) )
+    {
+        Sequence< ::rtl::OUString > aNames;
+
+        checkIfLoaded();
+        if ( m_xDataAccessTools.is() )
+            aNames = m_xDataAccessTools->getFieldNamesByCommandDescriptor( _rxConnection, _nCommandType,
+                _rCommand, _pErrorInfo );
+
+        return aNames;
+    }
+
 //........................................................................
 }   // namespace svxform
 //........................................................................
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 8115d3b1def9..029ecf61a285 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: filtnav.cxx,v $
  *
- *  $Revision: 1.33 $
+ *  $Revision: 1.34 $
  *
- *  last change: $Author: oj $ $Date: 2002-11-22 10:11:35 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -162,9 +162,6 @@
 #ifndef _COMPHELPER_SEQUENCE_HXX_
 #include <comphelper/sequence.hxx>
 #endif
-#ifndef _SVX_FMFILTER_HXX
-#include "fmfilter.hxx"
-#endif
 #ifndef _SVX_GRIDCELL_HXX
 #include "gridcell.hxx"
 #endif
@@ -388,13 +385,13 @@ public:
 TYPEINIT1( FmFilterTextChangedHint, FmFilterHint );
 
 //========================================================================
-class FmFilterClearedHint : public SfxHint
+class FilterClearingHint : public SfxHint
 {
 public:
     TYPEINFO();
-    FmFilterClearedHint(){}
+    FilterClearingHint(){}
 };
-TYPEINIT1( FmFilterClearedHint, SfxHint );
+TYPEINIT1( FilterClearingHint, SfxHint );
 
 //========================================================================
 class FmFilterCurrentChangedHint : public SfxHint
@@ -672,6 +669,11 @@ FmFilterModel::~FmFilterModel()
 //------------------------------------------------------------------------
 void FmFilterModel::Clear()
 {
+    // notify
+    FilterClearingHint aClearedHint;
+    Broadcast( aClearedHint );
+
+    // loose endings
     if (m_pAdapter)
     {
         m_pAdapter->dispose();
@@ -688,10 +690,6 @@ void FmFilterModel::Clear()
         delete (*i);
 
     m_aChilds.clear();
-
-    // UI benachrichtigen
-    FmFilterClearedHint aClearedHint;
-    Broadcast( aClearedHint );
 }
 
 //------------------------------------------------------------------------
@@ -1384,13 +1382,12 @@ sal_Bool FmFilterNavigator::EditedEntry( SvLBoxEntry* pEntry, const XubString& r
         if (m_pModel->ValidateText((FmFilterItem*)pEntry->GetUserData(), aText, aErrorMsg))
         {
             GrabFocus();
-            m_pModel->SetText((FmFilterItem*)pEntry->GetUserData(), aText);
-            SetCursor(pEntry, sal_True);
-            SetEntryText(pEntry, aText);
+            // this will set the text at the FmFilterItem, as well as update any filter controls
+            // which are connected to this particular entry
+            m_pModel->SetText( static_cast< FmFilterItem* >( pEntry->GetUserData() ), aText );
 
-            // settting the text asynchron
-            sal_uInt32 nEvent;
-            PostUserEvent(nEvent, LINK(this, FmFilterNavigator, OnEdited), pEntry);
+            SetCursor( pEntry, sal_True );
+            SetEntryText( pEntry, aText );
         }
         else
         {
@@ -1408,14 +1405,6 @@ sal_Bool FmFilterNavigator::EditedEntry( SvLBoxEntry* pEntry, const XubString& r
 }
 
 //------------------------------------------------------------------------
-IMPL_LINK( FmFilterNavigator, OnEdited, SvLBoxEntry*, pEntry )
-{
-    // invalidate the entry to see the correct text
-    SetEntryText( pEntry, ((FmFilterItem*)pEntry->GetUserData())->GetText());
-    return 0L;
-}
-
-//------------------------------------------------------------------------
 IMPL_LINK( FmFilterNavigator, OnRemove, SvLBoxEntry*, pEntry )
 {
     // now remove the entry
@@ -1654,7 +1643,7 @@ void FmFilterNavigator::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
         FmFilterInsertedHint* pHint = (FmFilterInsertedHint*)&rHint;
         Insert(pHint->GetData(), pHint->GetPos());
     }
-    else if( rHint.ISA(FmFilterClearedHint) )
+    else if( rHint.ISA(FilterClearingHint) )
     {
         SvTreeListBox::Clear();
     }
@@ -2099,6 +2088,13 @@ void FmFilterNavigatorWin::StateChanged( sal_uInt16 nSID, SfxItemState eState, c
 //-----------------------------------------------------------------------
 sal_Bool FmFilterNavigatorWin::Close()
 {
+    if ( m_pNavigator && m_pNavigator->IsEditingActive() )
+        m_pNavigator->EndEditing();
+
+    if ( m_pNavigator && m_pNavigator->IsEditingActive() )
+        // the EndEditing was vetoed (perhaps of an syntax error or such)
+        return sal_False;
+
     Update( NULL );
     return SfxDockingWindow::Close();
 }
diff --git a/svx/source/form/filtnav.src b/svx/source/form/filtnav.src
index 8cbc17e47d47..de91c551daa9 100644
--- a/svx/source/form/filtnav.src
+++ b/svx/source/form/filtnav.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: filtnav.src,v $
  *
- *  $Revision: 1.1.1.9 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: rt $ $Date: 2001-08-29 20:26:09 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,7 +76,7 @@ Menu RID_FM_FILTER_MENU
             Text [ swedish ] = "~Radera" ;
             Text [ danish ] = "Slet" ;
             Text [ italian ] = "~Elimina" ;
-            Text [ spanish ] = "~Eliminar" ;
+            Text [ spanish ] = "~Borrar" ;
             Text [ french ] = "~Supprimer" ;
             Text [ dutch ] = "Wi~ssen" ;
             Text [ portuguese ] = "E~liminar" ;
@@ -90,8 +90,9 @@ Menu RID_FM_FILTER_MENU
             Text[ korean ] = "삭제(~D)";
             Text[ turkish ] = "Sil";
             Text[ language_user1 ] = " ";
-            Text[ catalan ] = "~Eliminar";
+            Text[ catalan ] = "~Suprimeix";
             Text[ finnish ] = "~Poista";
+            Text[ thai ] = "~ลบ";
         };
         MenuItem
         {
@@ -102,7 +103,7 @@ Menu RID_FM_FILTER_MENU
             Text[ portuguese ] = "~Editar";
             Text[ russian ] = "~������";
             Text[ greek ] = "~�����������";
-            Text[ dutch ] = "~Bewerken";
+            Text[ dutch ] = "B~ewerken";
             Text[ french ] = "~�diter";
             Text[ spanish ] = "~Editar";
             Text[ italian ] = "~Modifica";
@@ -117,8 +118,9 @@ Menu RID_FM_FILTER_MENU
             Text[ arabic ] = "~�����";
             Text[ turkish ] = "D�zenle";
             Text[ language_user1 ] = " ";
-            Text[ catalan ] = "~Editar";
+            Text[ catalan ] = "~Edita";
             Text[ finnish ] = "~Muokkaa";
+            Text[ thai ] = "แ~ก้ไข";
         };
         MenuItem
         {
@@ -144,8 +146,9 @@ Menu RID_FM_FILTER_MENU
             Text[ chinese_traditional ] = "是空缺(~I)";
             Text[ arabic ] = "����";
             Text[ turkish ] = "Bo�";
-            Text[ catalan ] = "~Vac�o";
-            Text[ finnish ] = "~Ei p?de";
+            Text[ catalan ] = "~Buit";
+            Text[ finnish ] = "~Ei p�de";
+            Text[ thai ] = "เ~ป็น Null";
         };
         MenuItem
         {
@@ -171,8 +174,9 @@ Menu RID_FM_FILTER_MENU
             Text[ chinese_traditional ] = "不是空缺(~S)";
             Text[ arabic ] = "��� ����";
             Text[ turkish ] = "Bo� de�il";
-            Text[ catalan ] = "~No Vac�o";
-            Text[ finnish ] = "~P?tee";
+            Text[ catalan ] = "~No buit";
+            Text[ finnish ] = "~P�tee";
+            Text[ thai ] = "ไ~ม่เป็น  Null";
         };
     };
 };
@@ -182,3 +186,10 @@ Menu RID_FM_FILTER_MENU
 
 
 
+
+
+
+
+
+
+
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index a93ea5d974d2..bf663f82c375 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmPropBrw.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: fs $ $Date: 2002-11-12 12:16:19 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -100,9 +100,6 @@
 #ifndef _COM_SUN_STAR_AWT_POSSIZE_HPP_
 #include <com/sun/star/awt/PosSize.hpp>
 #endif
-#ifndef _COM_SUN_STAR_AWT_XLAYOUTCONSTRAINS_HPP_
-#include <com/sun/star/awt/XLayoutConstrains.hpp>
-#endif
 #ifndef _COM_SUN_STAR_FORM_XFORM_HPP_
 #include <com/sun/star/form/XForm.hpp>
 #endif
@@ -132,9 +129,6 @@
 #include <vcl/stdtext.hxx>
 #endif
 
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 
@@ -270,7 +264,7 @@ FmPropBrw::FmPropBrw(const Reference< XMultiServiceFactory >&   _xORB,
     DBG_CTOR(FmPropBrw,NULL);
 
     Size aPropWinSize(STD_WIN_SIZE_X,STD_WIN_SIZE_Y);
-    SetMinOutputSizePixel( Size(STD_MIN_SIZE_X,STD_MIN_SIZE_Y) );
+    SetMinOutputSizePixel(Size(STD_MIN_SIZE_X,STD_MIN_SIZE_Y));
     SetOutputSizePixel(aPropWinSize);
     SetUniqueId(UID_FORMPROPBROWSER_FRAME);
 
@@ -332,13 +326,6 @@ FmPropBrw::FmPropBrw(const Reference< XMultiServiceFactory >&   _xORB,
                     xAsXController->attachFrame(m_xMeAsFrame);
                     m_xBrowserComponentWindow = m_xMeAsFrame->getComponentWindow();
                     DBG_ASSERT(m_xBrowserComponentWindow.is(), "FmPropBrw::FmPropBrw: attached the controller, but have no component window!");
-
-                    Reference< awt::XLayoutConstrains > xLayoutInfo( m_xBrowserController, UNO_QUERY );
-                    if ( xLayoutInfo.is() )
-                    {
-                        awt::Size aSize = xLayoutInfo->getMinimumSize( );
-                        SetMinOutputSizePixel( Size( aSize.Width, aSize.Height ) );
-                    }
                 }
             }
         }
@@ -357,17 +344,8 @@ FmPropBrw::FmPropBrw(const Reference< XMultiServiceFactory >&   _xORB,
     }
 
 
-    Point aPropWinPos = Point( WIN_BORDER, WIN_BORDER );
-    aPropWinSize.Width() -= (2*WIN_BORDER);
-    aPropWinSize.Height() -= (2*WIN_BORDER);
-
-    if (m_xBrowserComponentWindow.is())
-    {
-        m_xBrowserComponentWindow->setPosSize(aPropWinPos.X(), aPropWinPos.Y(), aPropWinSize.Width(), aPropWinSize.Height(),
-            ::com::sun::star::awt::PosSize::WIDTH | ::com::sun::star::awt::PosSize::HEIGHT |
-            ::com::sun::star::awt::PosSize::X | ::com::sun::star::awt::PosSize::Y);
-        m_xBrowserComponentWindow->setVisible(sal_True);
-    }
+    if ( m_xBrowserComponentWindow.is() )
+        m_xBrowserComponentWindow->setVisible( sal_True );
 }
 
 //------------------------------------------------------------------------
@@ -479,11 +457,7 @@ void FmPropBrw::implSetNewObject(const Reference< XPropertySet >& _rxObject)
                 bResize = sal_True;
             }
             if( bResize )
-            {
                 SetOutputSizePixel( aSize );
-                // the following Resize call is to circumvent a bug in VCL (or Windows?)
-                Resize();
-            }
         }
     }
 }
@@ -494,25 +468,6 @@ void FmPropBrw::FillInfo( SfxChildWinInfo& rInfo ) const
     rInfo.bVisible = sal_False;
 }
 
-//------------------------------------------------------------------------
-void FmPropBrw::Resize()
-{
-    SfxFloatingWindow::Resize();
-
-    //////////////////////////////////////////////////////////////////////
-    // Groesse anpassen
-    Size  aSize = GetOutputSizePixel();
-    Size aPropWinSize( aSize );
-    aPropWinSize.Width() -= (2*WIN_BORDER);
-    aPropWinSize.Height() -= (2*WIN_BORDER);
-
-    if (m_xBrowserComponentWindow.is())
-    {
-        m_xBrowserComponentWindow->setPosSize(0, 0, aPropWinSize.Width(), aPropWinSize.Height(),
-            ::com::sun::star::awt::PosSize::WIDTH | ::com::sun::star::awt::PosSize::HEIGHT);
-    }
-}
-
 //-----------------------------------------------------------------------
 IMPL_LINK( FmPropBrw, OnAsyncGetFocus, void*, NOTINTERESTEDIN )
 {
diff --git a/svx/source/form/fmctrler.cxx b/svx/source/form/fmctrler.cxx
index be2698418d7e..2872a80d9672 100644
--- a/svx/source/form/fmctrler.cxx
+++ b/svx/source/form/fmctrler.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmctrler.cxx,v $
  *
- *  $Revision: 1.31 $
+ *  $Revision: 1.32 $
  *
- *  last change: $Author: fs $ $Date: 2002-12-05 09:56:34 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -81,6 +81,9 @@
 #include "confirmdelete.hxx"
 #endif
 
+#ifndef _COM_SUN_STAR_BEANS_NAMEDVALUE_HPP_
+#include <com/sun/star/beans/NamedValue.hpp>
+#endif
 #ifndef _COM_SUN_STAR_SDB_ROWCHANGEACTION_HPP_
 #include <com/sun/star/sdb/RowChangeAction.hpp>
 #endif
@@ -126,6 +129,18 @@
 #ifndef _COM_SUN_STAR_AWT_XVCLWINDOWPEER_HPP_
 #include <com/sun/star/awt/XVclWindowPeer.hpp>
 #endif
+#ifndef _COM_SUN_STAR_FORM_XBOUNDCOMPONENT_HPP_
+#include <com/sun/star/form/XBoundComponent.hpp>
+#endif
+#ifndef _COM_SUN_STAR_SDB_XINTERACTIONSUPPLYPARAMETERS_HPP_
+#include <com/sun/star/sdb/XInteractionSupplyParameters.hpp>
+#endif
+#ifndef _COM_SUN_STAR_SDB_PARAMETERSREQUEST_HPP_
+#include <com/sun/star/sdb/ParametersRequest.hpp>
+#endif
+#ifndef _COM_SUN_STAR_TASK_XINTERACTIONHANDLER_HPP_
+#include <com/sun/star/task/XInteractionHandler.hpp>
+#endif
 
 #ifndef _TOOLS_DEBUG_HXX //autogen
 #include <tools/debug.hxx>
@@ -147,10 +162,6 @@
 #include <fmview.hxx>
 #endif
 
-#ifndef _SVX_FMFILTER_HXX
-#include "fmfilter.hxx"
-#endif
-
 #ifndef _SV_MSGBOX_HXX //autogen wg. RET_YES
 #include <vcl/msgbox.hxx>
 #endif
@@ -190,18 +201,12 @@
 #ifndef _COMPHELPER_UNO3_HXX_
 #include <comphelper/uno3.hxx>
 #endif
-#ifndef _CONNECTIVITY_DBTOOLS_HXX_
-#include <connectivity/dbtools.hxx>
-#endif
 #ifndef _COMPHELPER_PROPERTY_AGGREGATION_HXX_
 #include <comphelper/propagg.hxx>
 #endif
 #ifndef _COMPHELPER_ENUMHELPER_HXX_
 #include <comphelper/enumhelper.hxx>
 #endif
-#ifndef _DBHELPER_DBCONVERSION_HXX_
-#include <connectivity/dbconversion.hxx>
-#endif
 #ifndef _COMPHELPER_SEQUENCE_HXX_
 #include <comphelper/sequence.hxx>
 #endif
@@ -223,14 +228,8 @@
 #ifndef _COMPHELPER_INTERACTION_HXX_
 #include <comphelper/interaction.hxx>
 #endif
-#ifndef _COM_SUN_STAR_SDB_XINTERACTIONSUPPLYPARAMETERS_HPP_
-#include <com/sun/star/sdb/XInteractionSupplyParameters.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDB_PARAMETERSREQUEST_HPP_
-#include <com/sun/star/sdb/ParametersRequest.hpp>
-#endif
-#ifndef _COM_SUN_STAR_TASK_XINTERACTIONHANDLER_HPP_
-#include <com/sun/star/task/XInteractionHandler.hpp>
+#ifndef _TOOLKIT_CONTROLS_UNOCONTROL_HXX_
+#include <toolkit/controls/unocontrol.hxx>
 #endif
 
 using namespace ::com::sun::star::uno;
@@ -244,7 +243,6 @@ using namespace ::com::sun::star::form;
 using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::beans;
 using namespace ::comphelper;
-using namespace ::dbtools;
 using namespace ::connectivity;
 using namespace ::svxform;
 using namespace ::connectivity::simple;
@@ -294,15 +292,11 @@ struct FmFieldInfo
 class FmXAutoControl: public UnoControl
 
 {
-    //  friend Reflection* ::getCppuType((const FmXAutoControl*)0);
     friend Reference< XInterface > SAL_CALL FmXAutoControl_NewInstance_Impl();
 
 public:
     FmXAutoControl(){}
 
-// automatisch auskommentiert - [getImplementation] - Wird von OWeakObject nicht weiter unterst�tzt!
-//  virtual void* getImplementation(Reflection * pRef);
-
     virtual ::rtl::OUString GetComponentServiceName() {return ::rtl::OUString::createFromAscii("Edit");}
     virtual void SAL_CALL createPeer( const Reference< ::com::sun::star::awt::XToolkit > & rxToolkit, const Reference< ::com::sun::star::awt::XWindowPeer >  & rParentPeer ) throw( ::com::sun::star::uno::RuntimeException );
 
@@ -315,7 +309,7 @@ void FmXAutoControl::createPeer( const Reference< ::com::sun::star::awt::XToolki
 {
     UnoControl::createPeer( rxToolkit, rParentPeer );
 
-    Reference< ::com::sun::star::awt::XTextComponent >  xText(mxPeer , UNO_QUERY);
+    Reference< ::com::sun::star::awt::XTextComponent >  xText(getPeer() , UNO_QUERY);
     if (xText.is())
     {
         xText->setText(::rtl::OUString(SVX_RES(RID_STR_AUTOFIELD)));
@@ -1162,9 +1156,9 @@ void FmXFormController::focusGained(const ::com::sun::star::awt::FocusEvent& e)
 #endif
             DBG_ASSERT(m_xCurrentControl.is(), "kein CurrentControl gesetzt");
             // zunaechst das Control fragen ob es das IFace unterstuetzt
-            Reference< ::com::sun::star::form::XBoundComponent >  xBound(m_xCurrentControl, UNO_QUERY);
+            Reference< XBoundComponent >  xBound(m_xCurrentControl, UNO_QUERY);
             if (!xBound.is() && m_xCurrentControl.is())
-                xBound  = Reference< ::com::sun::star::form::XBoundComponent > (m_xCurrentControl->getModel(), UNO_QUERY);
+                xBound  = Reference< XBoundComponent > (m_xCurrentControl->getModel(), UNO_QUERY);
 
             // lock if we lose the focus during commit
             m_bCommitLock = sal_True;
@@ -1372,7 +1366,7 @@ void FmXFormController::removeFromEventAttacher(const Reference< ::com::sun::sta
     OSL_ENSURE(!FmXFormController_BASE1::rBHelper.bDisposed,"FmXFormController: Object already disposed!");
     // abmelden beim Eventattacher
     Reference< ::com::sun::star::form::XFormComponent >  xComp(xControl->getModel(), UNO_QUERY);
-    if (xComp.is() && xComp->getParent().is() && m_xModelAsIndex.is())
+    if ( xComp.is() && m_xModelAsIndex.is() )
     {
         // Und die Position des ControlModel darin suchen
         sal_uInt32 nPos = m_xModelAsIndex->getCount();
@@ -1416,7 +1410,7 @@ void FmXFormController::setContainer(const Reference< ::com::sun::star::awt::XCo
 
         // clear the filter map
         for (FmFilterControls::const_iterator iter = m_aFilterControls.begin();
-             iter != m_aFilterControls.end(); iter++)
+             iter != m_aFilterControls.end(); ++iter)
             (*iter).first->removeTextListener(this);
 
         m_aFilterControls.clear();
@@ -1469,11 +1463,11 @@ void FmXFormController::setContainer(const Reference< ::com::sun::star::awt::XCo
 
         // einsammeln der Controls
         sal_Int32 i, j;
-        for (i = 0, j = 0; i < nCount; i++ )
+        for (i = 0, j = 0; i < nCount; ++i )
         {
             Reference< ::com::sun::star::awt::XControlModel >  xCtrlModel = pModels[i];
             // Zum Model passendes Control suchen
-            Reference< ::com::sun::star::awt::XControl >  xCtrl = findControl( xCtrls, xCtrlModel );
+            Reference< ::com::sun::star::awt::XControl >  xCtrl = findControl( xCtrls, xCtrlModel,sal_False );
             if (xCtrl.is())
             {
                 pControls[j++] = xCtrl;
@@ -1808,14 +1802,14 @@ void FmXFormController::stopListening()
 
 
 //------------------------------------------------------------------------------
-Reference< ::com::sun::star::awt::XControl >  FmXFormController::findControl(Sequence< Reference< ::com::sun::star::awt::XControl > >& rCtrls, const Reference< ::com::sun::star::awt::XControlModel > & xCtrlModel ) const
+Reference< ::com::sun::star::awt::XControl >  FmXFormController::findControl(Sequence< Reference< ::com::sun::star::awt::XControl > >& rCtrls, const Reference< ::com::sun::star::awt::XControlModel > & xCtrlModel ,sal_Bool _bRemove) const
 {
     OSL_ENSURE(!FmXFormController_BASE1::rBHelper.bDisposed,"FmXFormController: Object already disposed!");
     DBG_ASSERT( xCtrlModel.is(), "findControl - welches ?!" );
 
-    const Reference< ::com::sun::star::awt::XControl > * pCtrls = rCtrls.getConstArray();
+    Reference< ::com::sun::star::awt::XControl > * pCtrls = rCtrls.getArray();
     Reference< ::com::sun::star::awt::XControlModel >  xModel;
-    for ( sal_Int32 i = 0, nCount = rCtrls.getLength(); i < nCount; i++ )
+    for ( sal_Int32 i = 0, nCount = rCtrls.getLength(); i < nCount; ++i )
     {
         // #66449# Speicherueberschreiber durch folgende Zeile
         // Reference< ::com::sun::star::awt::XControlModel >  xModel(pCtrls[i].is() ? pCtrls[i]->getModel() : Reference< ::com::sun::star::awt::XControlModel > ());
@@ -1825,7 +1819,10 @@ Reference< ::com::sun::star::awt::XControl >  FmXFormController::findControl(Seq
             if ((::com::sun::star::awt::XControlModel*)xModel.get() == (::com::sun::star::awt::XControlModel*)xCtrlModel.get())
             {
                 Reference< ::com::sun::star::awt::XControl >  xCtrl( pCtrls[i] );
-                ::comphelper::removeElementAt(rCtrls, i);
+                if ( _bRemove )
+                    ::comphelper::removeElementAt(rCtrls, i);
+                else
+                    pCtrls[i] = Reference< ::com::sun::star::awt::XControl >();
                 return xCtrl;
             }
         }
@@ -2470,7 +2467,7 @@ void FmXFormController::setFilter(vector<FmFieldInfo>& rFieldInfos)
                                                                     ,xFormatter
                                                                     ,xField
                                                                     ,aAppLocale
-                                                                    ,aLocaleWrapper.getNumDecimalSep().GetChar(0)
+                                                                    ,(sal_Char)aLocaleWrapper.getNumDecimalSep().GetChar(0)
                                                                     ,getParseContext());
                                 aRow[(*iter).xText] = sCriteria;
                             }
@@ -2595,11 +2592,11 @@ void FmXFormController::startFiltering()
                     continue;
                 }
 
-                Reference< XPropertySet >  xSet(xControl->getModel(), UNO_QUERY);
-                if (xSet.is() && ::comphelper::hasProperty(FM_PROP_BOUNDFIELD, xSet))
+                Reference< XPropertySet >  xModel( xControl->getModel(), UNO_QUERY );
+                if (xModel.is() && ::comphelper::hasProperty(FM_PROP_BOUNDFIELD, xModel))
                 {
                     // does the model use a bound field ?
-                    Any aVal = xSet->getPropertyValue(FM_PROP_BOUNDFIELD);
+                    Any aVal = xModel->getPropertyValue(FM_PROP_BOUNDFIELD);
                     Reference< XPropertySet >  xField;
                     aVal >>= xField;
 
@@ -2615,9 +2612,22 @@ void FmXFormController::startFiltering()
                         {
                             // Setzen des FilterControls
                             SdrUnoControlRec& rControlRec = (SdrUnoControlRec&)rControlList[nCtrlNum];
-                            FmXFilterControl* pFilterControl = new FmXFilterControl(m_xORB,xSet, xField, xMetaData, xFormatter, m_pWindow);
-                            Reference< ::com::sun::star::awt::XControl >  xNewControl(pFilterControl);
-                            Reference< ::com::sun::star::awt::XTextComponent >  xText(pFilterControl);
+
+                            // create a filter control
+                            Sequence< Any > aCreationArgs( 3 );
+                            aCreationArgs[ 0 ] <<= NamedValue( ::rtl::OUString::createFromAscii( "MessageParent" ), makeAny( VCLUnoHelper::GetInterface( m_pWindow ) ) );
+                            aCreationArgs[ 1 ] <<= NamedValue( ::rtl::OUString::createFromAscii( "NumberFormatter" ), makeAny( xFormatter ) );
+                            aCreationArgs[ 2 ] <<= NamedValue( ::rtl::OUString::createFromAscii( "ControlModel" ), makeAny( xModel ) );
+                            Reference< XControl > xFilterControl(
+                                m_xORB->createInstanceWithArguments(
+                                    ::rtl::OUString::createFromAscii( "com.sun.star.form.control.FilterControl" ),
+                                    aCreationArgs
+                                ),
+                                UNO_QUERY
+                            );
+                            DBG_ASSERT( xFilterControl.is(), "FmXFormController::startFiltering: could not create a filter control!" );
+
+                            Reference< XTextComponent >  xText( xFilterControl, UNO_QUERY );
 
                             // merken in der Map
                             aFieldInfos.push_back(FmFieldInfo(xField, xText));
@@ -2625,15 +2635,15 @@ void FmXFormController::startFiltering()
 
                             // setting the focus if the current control
                             // is the active one
-                            if ((::com::sun::star::awt::XControl*)m_xActiveControl.get() == (::com::sun::star::awt::XControl*)xControl.get())
+                            if (m_xActiveControl.get() == xControl.get())
                             {
-                                xNewActiveControl = xNewControl;
+                                xNewActiveControl = xFilterControl;
                                 m_xActiveControl = m_xCurrentControl = NULL;
                             }
-                            else if ((::com::sun::star::awt::XControl*)m_xCurrentControl.get() == (::com::sun::star::awt::XControl*)xControl.get())
-                                m_xCurrentControl = xNewControl;
+                            else if (m_xCurrentControl.get() == xControl.get())
+                                m_xCurrentControl = xFilterControl;
 
-                            rControlRec.ReplaceControl(xNewControl);
+                            rControlRec.ReplaceControl( xFilterControl );
                         }
                     }
                 }
diff --git a/svx/source/form/fmexpl.src b/svx/source/form/fmexpl.src
index b8d0b0258f1a..336948a89e5a 100644
--- a/svx/source/form/fmexpl.src
+++ b/svx/source/form/fmexpl.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmexpl.src,v $
  *
- *  $Revision: 1.28 $
+ *  $Revision: 1.29 $
  *
- *  last change: $Author: kz $ $Date: 2002-11-27 16:29:27 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -108,7 +108,7 @@ Menu RID_FMEXPLORER_POPUPMENU
                         Text[ chinese_traditional ] = "表單";
                         Text[ arabic ] = "�������";
                         Text[ greek ] = "~�����";
-                        Text[ korean ] = "용지";
+                        Text[ korean ] = "양식";
                         Text[ turkish ] = "Form";
                         Text[ language_user1 ] = " ";
                         Text[ catalan ] = "Formulari";
@@ -127,7 +127,7 @@ Menu RID_FMEXPLORER_POPUPMENU
                         Text [ danish ] = "Skjult kontrol" ;
                         Text [ italian ] = "Controllo nascosto" ;
                         Text [ spanish ] = "~Control oculto" ;
-                        Text [ french ] = "C~ontr�le cach�" ;
+                        Text [ french ] = "C~ontr�le masqu�" ;
                         Text [ dutch ] = "~verborgen controle" ;
                         Text [ portuguese ] = "Controlo o~culto" ;
                         Text[ chinese_simplified ] = "隐入的控制";
@@ -202,7 +202,7 @@ Menu RID_FMEXPLORER_POPUPMENU
             Text [ swedish ] = "~Radera" ;
             Text [ danish ] = "~Slet" ;
             Text [ italian ] = "Elimina" ;
-            Text [ spanish ] = "~Eliminar" ;
+            Text [ spanish ] = "~Borrar" ;
             Text [ french ] = "~Supprimer" ;
             Text [ dutch ] = "Wi~ssen" ;
             Text [ portuguese ] = "E~liminar" ;
@@ -271,7 +271,7 @@ Menu RID_FMEXPLORER_POPUPMENU
             Text[ chinese_traditional ] = "重新命名(~R)";
             Text[ arabic ] = "����� �����";
             Text[ greek ] = "�����������";
-            Text[ korean ] = "이름 변경(~R)";
+            Text[ korean ] = "이름 바꾸기(~R)";
             Text[ turkish ] = "Yeniden adland�r";
             Text[ language_user1 ] = " ";
             Text[ catalan ] = "~Reanomena";
@@ -300,7 +300,7 @@ Menu RID_FMEXPLORER_POPUPMENU
             Text[ chinese_traditional ] = "屬性(~I)";
             Text[ arabic ] = "�����";
             Text[ greek ] = "�������~��";
-            Text[ korean ] = "등록정보(~I)";
+            Text[ korean ] = "등록 정보(~I)";
             Text[ turkish ] = "�zellikler";
             Text[ language_user1 ] = " ";
             Text[ catalan ] = "Propie~tats";
@@ -323,7 +323,7 @@ Menu RID_FMEXPLORER_POPUPMENU
             Text [ french ] = "Ouvrir en mode C~onception" ;
             Text [ dutch ] = "In ~ontwerpmodus openen" ;
             Text[ chinese_simplified ] = "用设计模式打开";
-            Text[ russian ] = "������� � ������ �������";
+            Text[ russian ] = "������� � ������ ��������������";
             Text[ polish ] = "Otw�rz w trybie projektu";
             Text[ japanese ] = "デザインモードで開く";
             Text[ chinese_traditional ] = "開啟設計模式";
@@ -344,7 +344,7 @@ Menu RID_FMEXPLORER_POPUPMENU
             Text [ english ] =  "Automatic control focus";
             Text [ english_us ] = "Automatic Control Focus";
             Text[ portuguese ] = "Foco autom�tico de controlo";
-            Text[ russian ] = "��������� �������� ����������";
+            Text[ russian ] = "��������� ��� �������� ����������";
             Text[ greek ] = "�������� ������� ��������� �������";
             Text[ dutch ] = "Automatische controle focus";
             Text[ french ] = "Focalisation automatique sur l'�l�ment de contr�le";
@@ -355,7 +355,7 @@ Menu RID_FMEXPLORER_POPUPMENU
             Text[ polish ] = "Automatyczne ognisko elementu kontrolnego";
             Text[ portuguese_brazilian ] = "Automatic control focus";
             Text[ japanese ] = "オートコントロールフォーカス";
-            Text[ korean ] = "자동 포커스 컨트롤";
+            Text[ korean ] = "자동 초점 컨트롤 ";
             Text[ chinese_simplified ] = "自动对准控制单元";
             Text[ chinese_traditional ] = "自動對準控制項";
             Text[ turkish ] = "Automatic control focus";
@@ -390,7 +390,7 @@ Menu RID_FMSHELL_CONVERSIONMENU
             Text[ polish ] = "Pole tekstowe";
             Text[ portuguese_brazilian ] = "~TextField";
             Text[ japanese ] = "テキストボックス(~T)";
-            Text[ korean ] = "텍스트 상자(~T)";
+            Text[ korean ] = "텍스트 필드(~T)";
             Text[ chinese_simplified ] = "文本框(~T)";
             Text[ chinese_traditional ] = "文字方塊(~T)";
             Text[ arabic ] = "��� ��";
@@ -447,7 +447,7 @@ Menu RID_FMSHELL_CONVERSIONMENU
             Text[ polish ] = "Pole etykiety";
             Text[ portuguese_brazilian ] = "~Label";
             Text[ japanese ] = "ラベルフィールド(~B)";
-            Text[ korean ] = "라벨 필드(~B)";
+            Text[ korean ] = "레이블 필드(~B)";
             Text[ chinese_simplified ] = "标签字段(~B)";
             Text[ chinese_traditional ] = "標籤欄位(~B)";
             Text[ arabic ] = "��� �����";
@@ -550,7 +550,7 @@ Menu RID_FMSHELL_CONVERSIONMENU
             Text [ ENGLISH ] = "~Option Button" ;
             Text[ english_us ] = "~Radio Button";
             Text[ portuguese ] = "B~ot�o de op��o";
-            Text[ russian ] = "~�������������";
+            Text[ russian ] = "~������ ������ ���������";
             Text[ greek ] = "����~� ��������";
             Text[ dutch ] = "~Optieveld";
             Text[ french ] = "Bouton ~radio";
@@ -583,7 +583,7 @@ Menu RID_FMSHELL_CONVERSIONMENU
             Text[ greek ] = "����� ~����������";
             Text[ dutch ] = "~Combinatieveld";
             Text[ french ] = "Zone ~combin�e";
-            Text[ spanish ] = "Ca~mpo combinado";
+            Text[ spanish ] = "Cu~adro combinado";
             Text[ italian ] = "Casella com~binata";
             Text[ danish ] = "Kombinationsboks";
             Text[ swedish ] = "~Kombinationsf�lt";
@@ -818,7 +818,7 @@ Menu RID_FMSHELL_CONVERSIONMENU
             Text[ polish ] = "Pole graficzne kontrolne";
             Text[ portuguese_brazilian ] = "Ima~ge Control";
             Text[ japanese ] = "イメージコントロールフィールド(~G)";
-            Text[ korean ] = "이미지 컨트롤 필드(~G)";
+            Text[ korean ] = "이미지 컨트롤(~G)";
             Text[ chinese_simplified ] = "图式控制(~G)";
             Text[ chinese_traditional ] = "圖式控制項(~G)";
             Text[ arabic ] = "���� ���� �����";
@@ -835,7 +835,7 @@ Menu RID_FMSHELL_CONVERSIONMENU
             Text [ ENGLISH ] = "Fo~rmatted Field" ;
             Text[ english_us ] = "Fo~rmatted Field";
             Text[ portuguese ] = "Campo ~formatado";
-            Text[ russian ] = "����������������� ����";
+            Text[ russian ] = "���� � ���������������";
             Text[ greek ] = "���~���������� �����";
             Text[ dutch ] = "Opge~maakt veld";
             Text[ french ] = "~Champ format�";
@@ -846,7 +846,7 @@ Menu RID_FMSHELL_CONVERSIONMENU
             Text[ polish ] = "Pole formatowane";
             Text[ portuguese_brazilian ] = "Fo~rmatted Field";
             Text[ japanese ] = "書式設定されたフィールド(~R)";
-            Text[ korean ] = "서식 지정된 필드(~R)";
+            Text[ korean ] = "서식 있는 필드(~R)";
             Text[ chinese_simplified ] = "格式化的字段(~R)";
             Text[ chinese_traditional ] = "格式化的欄位(~R)";
             Text[ arabic ] = "��� �������";
@@ -1010,7 +1010,7 @@ DockingWindow RID_SVX_FMEXPLORER
     Text [ dutch ] = "Formulier-navigator" ;
     Text [ portuguese ] = "Formul�rio Navegador" ;
     Text[ chinese_simplified ] = "表单助手";
-    Text[ russian ] = "��������� ��������� ����������";
+    Text[ russian ] = "��������� ����";
     Text[ polish ] = "Nawigator formularzy";
     Text[ japanese ] = "フォームナビゲータ";
     Text[ chinese_traditional ] = "表單助手";
@@ -1030,3 +1030,8 @@ DockingWindow RID_SVX_FMEXPLORER
 
 
 
+
+
+
+
+
diff --git a/svx/source/form/fmitems.cxx b/svx/source/form/fmitems.cxx
index 0393fe3d7887..46bef26a6d53 100644
--- a/svx/source/form/fmitems.cxx
+++ b/svx/source/form/fmitems.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmitems.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mba $ $Date: 2002-05-22 11:46:15 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,75 +71,6 @@
 #endif
 
 //========================================================================
-// class FmFormInfoItem
-//========================================================================
-TYPEINIT1(FmFormInfoItem, SfxPoolItem);
-
-//------------------------------------------------------------------------------
-sal_Bool FmFormInfoItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_Int8 nMemberId ) const
-{
-    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
-    nMemberId &= ~CONVERT_TWIPS;
-    switch ( nMemberId )
-    {
-        case MID_POS: rVal <<= aInfo.Pos; break;
-        case MID_COUNT: rVal <<= aInfo.Count; break;
-        case MID_READONLY : rVal <<= aInfo.ReadOnly; break;
-        default: DBG_ERROR("Wrong MemberId"); return sal_False;
-    }
-
-    return sal_True;
-}
-
-//------------------------------------------------------------------------------
-sal_Bool FmFormInfoItem::PutValue(const ::com::sun::star::uno::Any& rVal, sal_Int8 nMemberId )
-{
-    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
-    nMemberId &= ~CONVERT_TWIPS;
-    switch ( nMemberId )
-    {
-        case MID_POS: return( rVal >>= aInfo.Pos); break;
-        case MID_COUNT: return( rVal >>= aInfo.Count); break;
-        case MID_READONLY : return( rVal >>= aInfo.ReadOnly); break;
-        default: DBG_ERROR("Wrong MemberId"); return sal_False;
-    }
-
-    return sal_False;
-}
-
-//------------------------------------------------------------------------------
-int FmFormInfoItem::operator==( const SfxPoolItem& rAttr ) const
-{
-    DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
-    return ( aInfo == ( (FmFormInfoItem&)rAttr ).GetInfo() );
-}
-
-//------------------------------------------------------------------------------
-SfxPoolItem* FmFormInfoItem::Clone( SfxItemPool* ) const
-{
-    return new FmFormInfoItem( *this );
-}
-
-//------------------------------------------------------------------------------
-SvStream& FmFormInfoItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
-{
-    rStrm << (long) aInfo.Pos;
-    rStrm << (long) aInfo.Count;
-    return rStrm;
-}
-
-//------------------------------------------------------------------------------
-SfxPoolItem* FmFormInfoItem::Create( SvStream& rStrm, sal_uInt16 ) const
-{
-    sal_Int32 nCount, nPos;
-    rStrm >> nPos >> nCount;
-
-    FmFormInfoItem* pAttr = new FmFormInfoItem(Which(), FmFormInfo(nPos, nCount) );
-    return pAttr;
-}
-
-
-//========================================================================
 // class FmInterfaceItem
 //========================================================================
 TYPEINIT1(FmInterfaceItem, SfxPoolItem);
diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx
index b9814b651578..a45ee4fc648a 100644
--- a/svx/source/form/fmmodel.cxx
+++ b/svx/source/form/fmmodel.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmmodel.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: fs $ $Date: 2002-10-14 08:48:37 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -98,10 +98,12 @@ struct FmFormModelImplData
     FmXUndoEnvironment*     pUndoEnv;
     XubString               sNextPageId;
     sal_Bool                bOpenInDesignIsDefaulted;
+    sal_Bool                bMovingPage;
 
     FmFormModelImplData()
         :pUndoEnv( NULL )
         ,bOpenInDesignIsDefaulted( sal_True )
+        ,bMovingPage( sal_False )
     {
     }
 };
@@ -336,14 +338,57 @@ void FmFormModel::InsertPage(SdrPage* pPage, sal_uInt16 nPos)
     SdrModel::InsertPage( pPage, nPos );
 
 #ifndef SVX_LIGHT
-    if (pPage)
-        m_pImpl->pUndoEnv->AddForms(((FmFormPage*)pPage)->GetForms());
+    if ( !m_pImpl->bMovingPage )
+    {
+        // this flag here is kind of a hack.
+        // When a page is moved, the SdrModel::MovePage calls an InsertPage only, but
+        // no preceding RemovePage. Thus, we (as a derivee) don't have a chance to see
+        // that the page which is just being inserted is (in real) already a part of the
+        // model. Especially, we do not have a change to notice that the UndoEnvironment
+        // already _knows_ the forms we're just going to add below.
+        //
+        // The real solution to this would have been to fix SdrModel::MovePage, which
+        // is buggy in it's current form (as it violates the semantics of InsertPage, which
+        // is: insert a page which /currently is not part of any model/).
+        // However, this change in the SdrModel is much too risky.
+        //
+        // Another solution to this would have been to track (in the UndoEnv) which pages
+        // we know, and ignore any AddForms calls which are for such a page.
+        // But I refuse to do this (much more) work to hack a bug in the SdrModel.
+        //
+        // I the decision is to do this "small hack" here (which I don't consider really
+        // bad).
+        //
+        // 2002-01-10 - #i3235# - fs@openoffice.org
+        //
+        if ( pPage )
+            m_pImpl->pUndoEnv->AddForms( static_cast< FmFormPage* >( pPage )->GetForms() );
+    }
 #endif
 }
 
 /*************************************************************************
 |*
-|* InsertPage
+|* MovePage
+|*
+\************************************************************************/
+void FmFormModel::MovePage( USHORT nPgNum, USHORT nNewPos )
+{
+#ifndef SVX_LIGHT
+    m_pImpl->bMovingPage = sal_True;
+        // see InsertPage for this
+#endif
+
+    SdrModel::MovePage( nPgNum, nNewPos );
+
+#ifndef SVX_LIGHT
+    m_pImpl->bMovingPage = sal_False;
+#endif
+}
+
+/*************************************************************************
+|*
+|* RemovePage
 |*
 \************************************************************************/
 SdrPage* FmFormModel::RemovePage(sal_uInt16 nPgNum)
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index c80d25111c06..5c4fc44bc835 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmpgeimp.cxx,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: oj $ $Date: 2002-10-07 13:02:58 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -649,17 +649,17 @@ UniString FmFormPageImpl::getDefaultName( sal_Int16 _nClassId, const Reference<
 ::rtl::OUString FmFormPageImpl::getUniqueName(const ::rtl::OUString& rName, const Reference< ::com::sun::star::container::XNameAccess > & xNamedSet) const
 {
     Reference< ::com::sun::star::container::XIndexAccess >  xIndexSet(xNamedSet, UNO_QUERY);
-    ::rtl::OUString sName;
+    ::rtl::OUString sName( rName );
 
     if ( !xIndexSet.is() )
         return sName;
 
     sal_Int32 n = 0;
     ::rtl::OUString sClassName = rName;
-    do
-    {
+
+    while ( xNamedSet->hasByName( sName ) )
         sName = sClassName + ::rtl::OUString::valueOf(++n);
-    }   while (xNamedSet->hasByName(sName));
+
     return sName;
 }
 
diff --git a/svx/source/form/fmprop.cxx b/svx/source/form/fmprop.cxx
index 7a9b33ac52d8..ba551a6dff0f 100644
--- a/svx/source/form/fmprop.cxx
+++ b/svx/source/form/fmprop.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmprop.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: fs $ $Date: 2002-03-14 16:05:39 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:30 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -106,20 +106,6 @@ sal_uInt16 FmPropertyInfoService::nCount = 0;
 FmPropertyInfo* FmPropertyInfoService::pPropertyInfos = NULL;
 
 
-// Vergleichen von Properties
-static int
-#if defined( WNT )
- __cdecl
-#endif
-#if defined( ICC ) && defined( OS2 )
-_Optlink
-#endif
-    PropertyCompare( const void* pFirst, const void* pSecond)
-{
-    return ((::com::sun::star::beans::Property*)pFirst)->Name.compareTo(((::com::sun::star::beans::Property*)pSecond)->Name);
-}
-
-
 // Vergleichen von PropertyInfo
 static int
 #if defined( WNT )
@@ -258,7 +244,6 @@ namespace svxform
     IMPLEMENT_CONSTASCII_USTRING(FM_PROP_HELPURL, "HelpURL");
     IMPLEMENT_CONSTASCII_USTRING(FM_PROP_RECORDMARKER, "HasRecordMarker");
     IMPLEMENT_CONSTASCII_USTRING(FM_PROP_BOUNDFIELD, "BoundField");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_TREATASNUMERIC, "TreatAsNumber");
     IMPLEMENT_CONSTASCII_USTRING(FM_PROP_EFFECTIVE_VALUE, "EffectiveValue");
     IMPLEMENT_CONSTASCII_USTRING(FM_PROP_EFFECTIVE_DEFAULT, "EffectiveDefault");
     IMPLEMENT_CONSTASCII_USTRING(FM_PROP_EFFECTIVE_MIN, "EffectiveMin");
@@ -325,173 +310,132 @@ const FmPropertyInfo* FmPropertyInfoService::getPropertyInfo()
     sal_uInt16 nPos=1;
     if (pPropertyInfos == NULL)
     {
+        // the following does not contain all know properties
+        // ever property which is _not_ multi-property-able (means cannot be set on multiple controls at once)
+        // and which does not have an UI name is omitted by definition
         static FmPropertyInfo __READONLY_DATA aPropertyInfos[] =
         {
-            FmPropertyInfo(FM_PROP_NAME,                FM_ATTR_NAME,               sal_False, ::rtl::OUString(SVX_RES(RID_STR_NAME)),              nPos++, HID_PROP_NAME) ,
-            FmPropertyInfo(FM_PROP_LABEL,               FM_ATTR_LABEL,              sal_True,  ::rtl::OUString(SVX_RES(RID_STR_LABEL)),             nPos++, HID_PROP_LABEL),
-            FmPropertyInfo(FM_PROP_CONTROLLABEL,        FM_ATTR_CONTROLLABEL,       sal_False, ::rtl::OUString(SVX_RES(RID_STR_LABELCONTROL)),      nPos++, HID_PROP_CONTROLLABEL),
-            FmPropertyInfo(FM_PROP_TEXT,                FM_ATTR_TEXT,               sal_True,  ::rtl::OUString(),                                   nPos++, 0),
-            FmPropertyInfo(FM_PROP_MAXTEXTLEN,          FM_ATTR_MAXTEXTLEN,         sal_True,  ::rtl::OUString(SVX_RES(RID_STR_MAXTEXTLEN)),            nPos++, HID_PROP_MAXTEXTLEN),
-            FmPropertyInfo(FM_PROP_EDITMASK,            FM_ATTR_EDITMASK,           sal_True,  ::rtl::OUString(SVX_RES(RID_STR_EDITMASK)),          nPos++, HID_PROP_EDITMASK),
-            FmPropertyInfo(FM_PROP_LITERALMASK,         FM_ATTR_LITERALMASK,        sal_True,  ::rtl::OUString(SVX_RES(RID_STR_LITERALMASK)),       nPos++, HID_PROP_LITERALMASK),
-            FmPropertyInfo(FM_PROP_STRICTFORMAT,        FM_ATTR_STRICTFORMAT,       sal_True,  ::rtl::OUString(SVX_RES(RID_STR_STRICTFORMAT)),      nPos++, HID_PROP_STRICTFORMAT),
-            FmPropertyInfo(FM_PROP_ENABLED,             FM_ATTR_ENABLED,            sal_True,  ::rtl::OUString(SVX_RES(RID_STR_ENABLED)),           nPos++, HID_PROP_ENABLED) ,
-            FmPropertyInfo(FM_PROP_READONLY,            FM_ATTR_READONLY,           sal_True,  ::rtl::OUString(SVX_RES(RID_STR_READONLY)),          nPos++, HID_PROP_READONLY) ,
-            FmPropertyInfo(FM_PROP_PRINTABLE,           FM_ATTR_PRINTABLE,          sal_True,  ::rtl::OUString(SVX_RES(RID_STR_PRINTABLE)),         nPos++, HID_PROP_PRINTABLE) ,
-            FmPropertyInfo(::rtl::OUString::createFromAscii("GroupBox"),                    FM_ATTR_GROUPBOX,           sal_True,  ::rtl::OUString(SVX_RES(RID_STR_GROUPBOX)),          nPos++, HID_PROP_GROUPBOX),
-            FmPropertyInfo(FM_PROP_CONTROLSOURCE,       FM_ATTR_CONTROLSOURCE,      sal_True,  ::rtl::OUString(SVX_RES(RID_STR_CONTROLSOURCE)),     nPos++, HID_PROP_CONTROLSOURCE),
-            FmPropertyInfo(FM_PROP_TABSTOP,             FM_ATTR_TABSTOP,            sal_True,  ::rtl::OUString(SVX_RES(RID_STR_TABSTOP)),           nPos++, HID_PROP_TABSTOP),
-            FmPropertyInfo(FM_PROP_TABINDEX,            FM_ATTR_TABINDEX,           sal_True,  ::rtl::OUString(SVX_RES(RID_STR_TABINDEX)),          nPos++, HID_PROP_TABINDEX) ,
-            FmPropertyInfo(FM_PROP_DATASOURCE,          FM_ATTR_DATASOURCE,         sal_True,  ::rtl::OUString(SVX_RES(RID_STR_DATASOURCE)),            nPos++, HID_PROP_DATASOURCE) ,
-            FmPropertyInfo(FM_PROP_COMMAND,             FM_ATTR_COMMAND,            sal_False, ::rtl::OUString(SVX_RES(RID_STR_CURSORSOURCE)),      nPos++, HID_PROP_CURSORSOURCE),
-            FmPropertyInfo(FM_PROP_COMMANDTYPE,         FM_ATTR_COMMANDTYPE,        sal_False, ::rtl::OUString(SVX_RES(RID_STR_CURSORSOURCETYPE)),  nPos++, HID_PROP_CURSORSOURCETYPE),
-            FmPropertyInfo(FM_PROP_ESCAPE_PROCESSING,   FM_ATTR_ESCAPE_PROCESSING,  sal_False, ::rtl::OUString(SVX_RES(RID_STR_ESCAPE_PROCESSING)), nPos++, HID_PROP_ESCAPE_PROCESSING),
-            FmPropertyInfo(FM_PROP_FILTER_CRITERIA,     FM_ATTR_FILTER_CRITERIA,    sal_False,  ::rtl::OUString(SVX_RES(RID_STR_FILTER_CRITERIA)),  nPos++, HID_PROP_FILTER_CRITERIA ),
-            FmPropertyInfo(FM_PROP_SORT,                FM_ATTR_SORT,               sal_False,  ::rtl::OUString(SVX_RES(RID_STR_SORT_CRITERIA)),            nPos++, HID_PROP_SORT_CRITERIA) ,
-            FmPropertyInfo(FM_PROP_INSERTONLY,          FM_ATTR_INSERTONLY,         sal_False,  ::rtl::OUString(SVX_RES(RID_STR_DATAENTRY)),            nPos++, HID_PROP_DATAENTRY) ,
-            FmPropertyInfo(FM_PROP_ALLOWADDITIONS,      FM_ATTR_ALLOWADDITIONS,     sal_True,  ::rtl::OUString(SVX_RES(RID_STR_ALLOW_ADDITIONS)),   nPos++, HID_PROP_ALLOW_ADDITIONS) ,
-            FmPropertyInfo(FM_PROP_ALLOWEDITS,          FM_ATTR_ALLOWEDITS,         sal_True,  ::rtl::OUString(SVX_RES(RID_STR_ALLOW_EDITS)),       nPos++, HID_PROP_ALLOW_EDITS ) ,
-            FmPropertyInfo(FM_PROP_ALLOWDELETIONS,      FM_ATTR_ALLOWDELETIONS,     sal_True,  ::rtl::OUString(SVX_RES(RID_STR_ALLOW_DELETIONS)),   nPos++, HID_PROP_ALLOW_DELETIONS) ,
-            FmPropertyInfo(FM_PROP_INSERTONLY,          FM_ATTR_INSERTONLY,         sal_True,  ::rtl::OUString(SVX_RES(RID_STR_DATAENTRY)),         nPos++, HID_PROP_DATAENTRY) ,
-            FmPropertyInfo(FM_PROP_NAVIGATION,          FM_ATTR_NAVIGATION,         sal_True,  ::rtl::OUString(SVX_RES(RID_STR_NAVIGATIONBAR)),         nPos++, HID_PROP_NAVIGATION) ,
-            FmPropertyInfo(FM_PROP_CYCLE,               FM_ATTR_CYCLE,              sal_True,  ::rtl::OUString(SVX_RES(RID_STR_CYCLE)),             nPos++, HID_PROP_CYCLE) ,
-            FmPropertyInfo(FM_PROP_CACHESIZE,           FM_ATTR_CACHESIZE,          sal_True,  ::rtl::OUString(),                                   nPos++, 0) ,
-            FmPropertyInfo(FM_PROP_PRIVILEGES,          FM_ATTR_PRIVILEGES,         sal_False, ::rtl::OUString(),                                   nPos++, 0),
-            // TODO : UI-Anbindung fuer Privilegien
-            FmPropertyInfo(FM_PROP_LASTDIRTY,           FM_ATTR_LASTDIRTY,          sal_True,  ::rtl::OUString(),                                   nPos++, 0) ,
-            FmPropertyInfo(FM_PROP_HIDDEN_VALUE,        FM_ATTR_HIDDEN_VALUE,       sal_True,  ::rtl::OUString(SVX_RES(RID_STR_VALUE)),             nPos++, HID_PROP_HIDDEN_VALUE),
-            FmPropertyInfo(FM_PROP_VALUE,               FM_ATTR_VALUE,              sal_True,  ::rtl::OUString(),                                   nPos++, 0),
-            FmPropertyInfo(FM_PROP_VALUEMIN,            FM_ATTR_VALUEMIN,           sal_True,  ::rtl::OUString(SVX_RES(RID_STR_VALUEMIN)),          nPos++, HID_PROP_VALUEMIN) ,
-            FmPropertyInfo(FM_PROP_VALUEMAX,            FM_ATTR_VALUEMAX,           sal_True,  ::rtl::OUString(SVX_RES(RID_STR_VALUEMAX)),          nPos++, HID_PROP_VALUEMAX) ,
-            FmPropertyInfo(FM_PROP_VALUESTEP,           FM_ATTR_VALUESTEP,          sal_True,  ::rtl::OUString(SVX_RES(RID_STR_VALUESTEP)),         nPos++, HID_PROP_VALUESTEP) ,
-            FmPropertyInfo(FM_PROP_DEFAULT_VALUE,       FM_ATTR_DEFAULT_VALUE,      sal_True,  ::rtl::OUString(SVX_RES(RID_STR_DEFAULTVALUE)),      nPos++, HID_PROP_DEFAULT_LONG_VALUE ),
-            FmPropertyInfo(FM_PROP_DECIMAL_ACCURACY,    FM_ATTR_DECIMAL_ACCURACY,   sal_True,  ::rtl::OUString(SVX_RES(RID_STR_DECIMAL_ACCURACY)),  nPos++, HID_PROP_DECIMAL_ACCURACY ),
-            FmPropertyInfo(FM_PROP_DECIMALS,            FM_ATTR_DECIMALS,           sal_True,   ::rtl::OUString(),                                  nPos++, 0),
-            FmPropertyInfo(FM_PROP_SHOWTHOUSANDSEP,     FM_ATTR_SHOWTHOUSANDSEP,    sal_True,  ::rtl::OUString(SVX_RES(RID_STR_SHOWTHOUSANDSEP)),   nPos++, HID_PROP_SHOWTHOUSANDSEP),
-
-            FmPropertyInfo(FM_PROP_REFVALUE,            FM_ATTR_REFVALUE,           sal_True,  ::rtl::OUString(SVX_RES(RID_STR_REFVALUE)),          nPos++, HID_PROP_REFVALUE),
-            FmPropertyInfo(FM_PROP_CURRENCYSYMBOL,      FM_ATTR_CURRENCYSYMBOL,     sal_True,  ::rtl::OUString(SVX_RES(RID_STR_CURRENCYSYMBOL)),        nPos++, HID_PROP_CURRENCYSYMBOL),
-            FmPropertyInfo(FM_PROP_CURRSYM_POSITION,    FM_ATTR_CURRSYM_POSITION,   sal_True,  ::rtl::OUString(SVX_RES(RID_STR_CURRSYM_POSITION)),  nPos++, HID_PROP_CURRSYM_POSITION),
-
-            FmPropertyInfo(FM_PROP_DATE,                FM_ATTR_DATE,               sal_True,  ::rtl::OUString(),                                   nPos++, 0) ,
-            FmPropertyInfo(FM_PROP_DATEMIN,             FM_ATTR_DATEMIN,            sal_True,  ::rtl::OUString(SVX_RES(RID_STR_DATEMIN)),           nPos++, HID_PROP_DATEMIN) ,
-            FmPropertyInfo(FM_PROP_DATEMAX,             FM_ATTR_DATEMAX,            sal_True,  ::rtl::OUString(SVX_RES(RID_STR_DATEMAX)),           nPos++, HID_PROP_DATEMAX) ,
-            FmPropertyInfo(FM_PROP_DATEFORMAT,          FM_ATTR_DATEFORMAT,         sal_True,  ::rtl::OUString(SVX_RES(RID_STR_DATEFORMAT)),        nPos++, HID_PROP_DATEFORMAT) ,
-            FmPropertyInfo(FM_PROP_DEFAULT_DATE,        FM_ATTR_DEFAULT_DATE,       sal_True,  ::rtl::OUString(SVX_RES(RID_STR_DEFAULTVALUE)),      nPos++, HID_PROP_DEFAULT_DATE ),
-
-            FmPropertyInfo(FM_PROP_TIME,                FM_ATTR_TIME,               sal_True,  ::rtl::OUString(),                                   nPos++, 0) ,
-            FmPropertyInfo(FM_PROP_TIMEMIN,             FM_ATTR_TIMEMIN,            sal_True,  ::rtl::OUString(SVX_RES(RID_STR_TIMEMIN)),           nPos++, HID_PROP_TIMEMIN) ,
-            FmPropertyInfo(FM_PROP_TIMEMAX,             FM_ATTR_TIMEMAX,            sal_True,  ::rtl::OUString(SVX_RES(RID_STR_TIMEMAX)),           nPos++, HID_PROP_TIMEMAX) ,
-            FmPropertyInfo(FM_PROP_TIMEFORMAT,          FM_ATTR_TIMEFORMAT,         sal_True,  ::rtl::OUString(SVX_RES(RID_STR_TIMEFORMAT)),        nPos++, HID_PROP_TIMEFORMAT) ,
-            FmPropertyInfo(FM_PROP_DEFAULT_TIME,        FM_ATTR_DEFAULT_TIME,       sal_True,  ::rtl::OUString(SVX_RES(RID_STR_DEFAULTVALUE)),      nPos++, HID_PROP_DEFAULT_TIME ),
-
-            FmPropertyInfo(FM_PROP_EFFECTIVE_VALUE,     FM_ATTR_EFFECTIVE_VALUE,    sal_False, ::rtl::OUString(),                                   nPos++, 0),
-            FmPropertyInfo(FM_PROP_EFFECTIVE_MIN,       FM_ATTR_EFFECTIVE_MIN,      sal_False, ::rtl::OUString(SVX_RES(RID_STR_VALUEMIN)),          nPos++, HID_PROP_EFFECTIVEMIN),
-            FmPropertyInfo(FM_PROP_EFFECTIVE_MAX,       FM_ATTR_EFFECTIVE_MAX,      sal_False, ::rtl::OUString(SVX_RES(RID_STR_VALUEMAX)),          nPos++, HID_PROP_EFFECTIVEMAX),
-            FmPropertyInfo(FM_PROP_EFFECTIVE_DEFAULT,   FM_ATTR_EFFECTIVE_DEFAULT,  sal_False, ::rtl::OUString(SVX_RES(RID_STR_DEFAULTVALUE)),      nPos++, HID_PROP_EFFECTIVEDEFAULT),
-            FmPropertyInfo(FM_PROP_FORMATKEY,           FM_ATTR_FORMATKEY,          sal_True,  ::rtl::OUString(SVX_RES(RID_STR_FORMATKEY)),         nPos++, HID_PROP_FORMATKEY),
-            FmPropertyInfo(FM_PROP_FORMATSSUPPLIER,     FM_ATTR_FORMATSSUPPLIER,    sal_True,  ::rtl::OUString(),                                   nPos++, 0),
-            FmPropertyInfo(FM_PROP_TREATASNUMERIC,      FM_ATTR_TREATASNUMERIC,     sal_False, ::rtl::OUString(),                                   nPos++, 0),
-
-            FmPropertyInfo(FM_PROP_SIZE,                FM_ATTR_SIZE,               sal_True,  ::rtl::OUString(SVX_RES(RID_STR_SIZE)),              nPos++, HID_PROP_SIZE),
-            FmPropertyInfo(FM_PROP_CLASSID,             FM_ATTR_CLASSID,            sal_False, ::rtl::OUString(SVX_RES(RID_STR_CLASSID)),           nPos++, HID_PROP_CLASSID),
-            FmPropertyInfo(::rtl::OUString::createFromAscii("Height"),                  FM_ATTR_HEIGHT,             sal_True,  ::rtl::OUString(SVX_RES(RID_STR_HEIGHT)),                nPos++, HID_PROP_HEIGHT),
-            FmPropertyInfo(FM_PROP_WIDTH,               FM_ATTR_WIDTH,              sal_True,  ::rtl::OUString(SVX_RES(RID_STR_WIDTH)),             nPos++, HID_PROP_WIDTH),
-            FmPropertyInfo(FM_PROP_DEFAULTCONTROL,      FM_ATTR_DEFAULTCONTROL,     sal_True,  ::rtl::OUString(),                                   nPos++, 0),
-            FmPropertyInfo(FM_PROP_BOUNDCOLUMN,         FM_ATTR_BOUNDCOLUMN,        sal_True,  ::rtl::OUString(SVX_RES(RID_STR_BOUNDCOLUMN)),       nPos++, HID_PROP_BOUNDCOLUMN),
-            FmPropertyInfo(FM_PROP_LISTSOURCETYPE,      FM_ATTR_LISTSOURCETYPE,     sal_True,  ::rtl::OUString(SVX_RES(RID_STR_LISTSOURCETYPE)),        nPos++, HID_PROP_LISTSOURCETYPE),
-            FmPropertyInfo(FM_PROP_LISTSOURCE,          FM_ATTR_LISTSOURCE,         sal_True,  ::rtl::OUString(SVX_RES(RID_STR_LISTSOURCE)),            nPos++, HID_PROP_LISTSOURCE),
-            FmPropertyInfo(::rtl::OUString::createFromAscii("ListIndex"),               FM_ATTR_LISTINDEX,          sal_True,  ::rtl::OUString(SVX_RES(RID_STR_LISTINDEX)),         nPos++, HID_PROP_LISTINDEX),
-            FmPropertyInfo(FM_PROP_STRINGITEMLIST,      FM_ATTR_STRINGITEMLIST,     sal_True,  ::rtl::OUString(SVX_RES(RID_STR_STRINGITEMLIST)),        nPos++, HID_PROP_STRINGITEMLIST),
-            FmPropertyInfo(FM_PROP_DEFAULT_TEXT,        FM_ATTR_DEFAULT_TEXT,       sal_True,  ::rtl::OUString(SVX_RES(RID_STR_DEFAULTVALUE)),      nPos++, HID_PROP_DEFAULTVALUE ),
-            FmPropertyInfo(FM_PROP_FONT,                FM_ATTR_FONT,               sal_False, ::rtl::OUString(),                                   nPos++, 0),
-            FmPropertyInfo(FM_PROP_FONT_NAME,           FM_ATTR_FONT_NAME,          sal_True,  ::rtl::OUString(SVX_RES(RID_STR_FONT)),              nPos++, HID_PROP_FONT),
-            FmPropertyInfo(FM_PROP_FONT_STYLENAME,      FM_ATTR_FONT_STYLENAME,     sal_True,  ::rtl::OUString(),                                   nPos++, 0 ),
-            FmPropertyInfo(FM_PROP_FONT_FAMILY,         FM_ATTR_FONT_FAMILY,        sal_True,  ::rtl::OUString(),                                   nPos++, 0 ),
-            FmPropertyInfo(FM_PROP_FONT_CHARSET,        FM_ATTR_FONT_CHARSET,       sal_True,  ::rtl::OUString(),                                   nPos++, 0 ),
-            FmPropertyInfo(FM_PROP_FONT_HEIGHT,         FM_ATTR_FONT_HEIGHT,        sal_True,  ::rtl::OUString(),                                   nPos++, 0 ),
-            FmPropertyInfo(FM_PROP_FONT_WEIGHT,         FM_ATTR_FONT_WEIGHT,        sal_True,  ::rtl::OUString(),                                   nPos++, 0 ),
-            FmPropertyInfo(FM_PROP_FONT_SLANT,          FM_ATTR_FONT_SLANT,         sal_True,  ::rtl::OUString(),                                   nPos++, 0 ),
-            FmPropertyInfo(FM_PROP_FONT_UNDERLINE,      FM_ATTR_FONT_UNDERLINE,     sal_True,  ::rtl::OUString(),                                   nPos++, 0 ),
-            FmPropertyInfo(FM_PROP_FONT_STRIKEOUT,      FM_ATTR_FONT_STRIKEOUT,     sal_True,  ::rtl::OUString(),                                   nPos++, 0 ),
-            FmPropertyInfo(FM_PROP_ALIGN,               FM_ATTR_ALIGN,              sal_True,  ::rtl::OUString(SVX_RES(RID_STR_ALIGN)),             nPos++, HID_PROP_ALIGN),
-            FmPropertyInfo(FM_PROP_ROWHEIGHT,           FM_ATTR_ROWHEIGHT,          sal_True,  ::rtl::OUString(SVX_RES(RID_STR_ROWHEIGHT)),         nPos++, HID_PROP_ROWHEIGHT),
-            FmPropertyInfo(FM_PROP_BACKGROUNDCOLOR,     FM_ATTR_BACKGROUNDCOLOR,    sal_True,  ::rtl::OUString(SVX_RES(RID_STR_BACKGROUNDCOLOR)),   nPos++, HID_PROP_BACKGROUNDCOLOR),
-            FmPropertyInfo(FM_PROP_FILLCOLOR,           FM_ATTR_FILLCOLOR,          sal_True,  ::rtl::OUString(SVX_RES(RID_STR_FILLCOLOR)),         nPos++, HID_PROP_FILLCOLOR),
-            FmPropertyInfo(FM_PROP_TEXTCOLOR,           FM_ATTR_TEXTCOLOR,          sal_True,  ::rtl::OUString(SVX_RES(RID_STR_TEXTCOLOR)),         nPos++, HID_PROP_TEXTCOLOR),
-            FmPropertyInfo(FM_PROP_LINECOLOR,           FM_ATTR_LINECOLOR,          sal_True,  ::rtl::OUString(SVX_RES(RID_STR_LINECOLOR)),         nPos++, HID_PROP_LINECOLOR),
-            FmPropertyInfo(FM_PROP_BORDER,              FM_ATTR_BORDER,             sal_True,  ::rtl::OUString(SVX_RES(RID_STR_BORDER)),                nPos++, HID_PROP_BORDER),
-            FmPropertyInfo(FM_PROP_DROPDOWN,            FM_ATTR_DROPDOWN,           sal_True,  ::rtl::OUString(SVX_RES(RID_STR_DROPDOWN)),          nPos++, HID_PROP_DROPDOWN),
-            FmPropertyInfo(FM_PROP_AUTOCOMPLETE,        FM_ATTR_AUTOCOMPLETE,       sal_True,  ::rtl::OUString(SVX_RES(RID_STR_AUTOCOMPLETE)),      nPos++, HID_PROP_AUTOCOMPLETE),
-            FmPropertyInfo(FM_PROP_LINECOUNT,           FM_ATTR_LINECOUNT,          sal_True,  ::rtl::OUString(SVX_RES(RID_STR_LINECOUNT)),         nPos++, HID_PROP_LINECOUNT),
-            FmPropertyInfo(FM_PROP_MULTI,               FM_ATTR_MULTI,              sal_True,  ::rtl::OUString(SVX_RES(RID_STR_MULTILINE)),         nPos++, HID_PROP_MULTILINE),
-            FmPropertyInfo(FM_PROP_MULTILINE,           FM_ATTR_MULTILINE,          sal_True,  ::rtl::OUString(SVX_RES(RID_STR_MULTILINE)),         nPos++, HID_PROP_MULTILINE),
-            FmPropertyInfo(FM_PROP_MULTISELECTION,      FM_ATTR_MULTISELECTION,     sal_True,  ::rtl::OUString(SVX_RES(RID_STR_MULTISELECTION)),        nPos++, HID_PROP_MULTISELECTION),
-            FmPropertyInfo(FM_PROP_HARDLINEBREAKS,      FM_ATTR_HARDLINEBREAKS,     sal_True,  ::rtl::OUString(SVX_RES(RID_STR_HARDLINEBREAKS)),        nPos++, HID_PROP_HARDLINEBREAKS),
-            FmPropertyInfo(FM_PROP_HSCROLL,             FM_ATTR_HSCROLL,            sal_True,  ::rtl::OUString(SVX_RES(RID_STR_HSCROLL)),           nPos++, HID_PROP_HSCROLL),
-            FmPropertyInfo(FM_PROP_VSCROLL,             FM_ATTR_VSCROLL,            sal_True,  ::rtl::OUString(SVX_RES(RID_STR_VSCROLL)),           nPos++, HID_PROP_VSCROLL),
-            FmPropertyInfo(FM_PROP_SPIN,                FM_ATTR_SPIN,               sal_True,  ::rtl::OUString(SVX_RES(RID_STR_SPIN)),              nPos++, HID_PROP_SPIN),
-            FmPropertyInfo(FM_PROP_STATE,               FM_ATTR_STATE,              sal_True,  ::rtl::OUString(),                                   nPos++, 0 ),
-            FmPropertyInfo(FM_PROP_BUTTONTYPE,          FM_ATTR_BUTTONTYPE,         sal_True,  ::rtl::OUString(SVX_RES(RID_STR_BUTTONTYPE)),            nPos++, HID_PROP_BUTTONTYPE),
-            FmPropertyInfo(FM_PROP_TARGET_URL,          FM_ATTR_TARGET_URL,         sal_True,  ::rtl::OUString(SVX_RES(RID_STR_TARGET_URL)),            nPos++, HID_PROP_TARGET_URL ),
-            FmPropertyInfo(FM_PROP_TARGET_FRAME,        FM_ATTR_TARGET_FRAME,       sal_True,  ::rtl::OUString(SVX_RES(RID_STR_TARGET_FRAME)),      nPos++, HID_PROP_TARGET_FRAME ),
-            FmPropertyInfo(FM_PROP_SUBMIT_ACTION,       FM_ATTR_SUBMIT_ACTION,      sal_True,  ::rtl::OUString(SVX_RES(RID_STR_SUBMIT_ACTION)),     nPos++, HID_PROP_SUBMIT_ACTION ),
-            FmPropertyInfo(FM_PROP_SUBMIT_TARGET,       FM_ATTR_SUBMIT_TARGET,      sal_True,  ::rtl::OUString(SVX_RES(RID_STR_SUBMIT_TARGET)),     nPos++, HID_PROP_SUBMIT_TARGET ),
-            FmPropertyInfo(FM_PROP_SUBMIT_METHOD,       FM_ATTR_SUBMIT_METHOD,      sal_True,  ::rtl::OUString(SVX_RES(RID_STR_SUBMIT_METHOD)),     nPos++, HID_PROP_SUBMIT_METHOD ),
-            FmPropertyInfo(FM_PROP_SUBMIT_ENCODING,     FM_ATTR_SUBMIT_ENCODING,    sal_True,  ::rtl::OUString(SVX_RES(RID_STR_SUBMIT_ENCODING)),   nPos++, HID_PROP_SUBMIT_ENCODING ),
-            FmPropertyInfo(FM_PROP_DEFAULTCHECKED,      FM_ATTR_DEFAULT_CHECKED,    sal_True,  ::rtl::OUString(SVX_RES(RID_STR_DEFAULT_CHECKED)),   nPos++, HID_PROP_DEFAULT_CHECKED ),
-            FmPropertyInfo(::rtl::OUString::createFromAscii("DefaultButton"),           FM_ATTR_DEFAULT_BUTTON,     sal_True,  ::rtl::OUString(SVX_RES(RID_STR_DEFAULT_BUTTON)),        nPos++, HID_PROP_DEFAULT_BUTTON ),
-            FmPropertyInfo(FM_PROP_VALUE_SEQ,           FM_ATTR_VALUE_SEQ,          sal_True,  ::rtl::OUString(),                                   nPos++, 0 ),
-            FmPropertyInfo(FM_PROP_IMAGE_URL,           FM_ATTR_IMAGE_URL,          sal_True,  ::rtl::OUString(SVX_RES(RID_STR_IMAGE_URL)),         nPos++, HID_PROP_IMAGE_URL ),
-            FmPropertyInfo(FM_PROP_SELECT_SEQ,          FM_ATTR_SELECT_SEQ,         sal_True,  ::rtl::OUString(),                                   nPos++, 0 ),
-            FmPropertyInfo(FM_PROP_DEFAULT_SELECT_SEQ,  FM_ATTR_DEFAULT_SELECT_SEQ, sal_True,  ::rtl::OUString(SVX_RES(RID_STR_DEFAULT_SELECT_SEQ)),    nPos++, HID_PROP_DEFAULT_SELECT_SEQ ),
-            FmPropertyInfo(FM_PROP_ECHO_CHAR,           FM_ATTR_ECHO_CHAR,          sal_True,  ::rtl::OUString(SVX_RES(RID_STR_ECHO_CHAR)),         nPos++, HID_PROP_ECHO_CHAR ),
-            FmPropertyInfo(FM_PROP_EMPTY_IS_NULL,       FM_ATTR_EMPTY_IS_NULL,      sal_True,  ::rtl::OUString(SVX_RES(RID_STR_EMPTY_IS_NULL)),     nPos++, HID_PROP_EMPTY_IS_NULL ),
-            FmPropertyInfo(FM_PROP_TRISTATE,            FM_ATTR_TRISTATE    ,       sal_True,  ::rtl::OUString(SVX_RES(RID_STR_TRISTATE)),          nPos++, HID_PROP_TRISTATE ),
-            FmPropertyInfo(FM_PROP_MASTERFIELDS,        FM_ATTR_MASTERFIELDS,       sal_True,  ::rtl::OUString(SVX_RES(RID_STR_MASTERFIELDS)),      nPos++, HID_PROP_MASTERFIELDS) ,
-            FmPropertyInfo(FM_PROP_DETAILFIELDS,        FM_ATTR_DETAILFIELDS,       sal_True,  ::rtl::OUString(SVX_RES(RID_STR_SLAVEFIELDS)),       nPos++, HID_PROP_SLAVEFIELDS),
-            FmPropertyInfo(FM_PROP_HASNAVIGATION,       FM_ATTR_HASNAVIGATION,      sal_True,  ::rtl::OUString(SVX_RES(RID_STR_NAVIGATIONBAR)),     nPos++, HID_PROP_NAVIGATIONBAR) ,
-            FmPropertyInfo(FM_PROP_RECORDMARKER,        FM_ATTR_RECORDMARKER,       sal_True,  ::rtl::OUString(SVX_RES(RID_STR_RECORDMARKER)),      nPos++, HID_PROP_RECORDMARKER) ,
-            FmPropertyInfo(FM_PROP_FILTERPROPOSAL,      FM_ATTR_FILTERPROPOSAL,     sal_True,  ::rtl::OUString(SVX_RES(RID_STR_FILTERPROPOSAL)),        nPos++, HID_PROP_FILTERPROPOSAL) ,
-            FmPropertyInfo(FM_PROP_QUERY,               FM_ATTR_QUERY,              sal_True,  ::rtl::OUString(),                                   nPos++, 0 ),
-            FmPropertyInfo(FM_PROP_ISPASSTHROUGH,       FM_ATTR_ISPASSTHROUGH,      sal_True,  ::rtl::OUString(),                                   nPos++, 0 ),
-            FmPropertyInfo(FM_PROP_TAG,                 FM_ATTR_TAG,                sal_True,  ::rtl::OUString(SVX_RES(RID_STR_TAG)),               nPos++, HID_PROP_TAG ),
-            FmPropertyInfo(FM_PROP_HELPTEXT,            FM_ATTR_HELPTEXT,           sal_False, ::rtl::OUString(SVX_RES(RID_STR_HELPTEXT)),          nPos++, HID_PROP_HELPTEXT),
-            FmPropertyInfo(FM_PROP_HELPURL,             FM_ATTR_HELPURL,            sal_False, ::rtl::OUString(SVX_RES(RID_STR_HELPURL)),           nPos++, HID_PROP_HELPURL),
-            FmPropertyInfo(FM_PROP_BOUNDFIELD,          FM_ATTR_BOUNDFIELD,         sal_False, ::rtl::OUString(),                                   nPos++, 0),
-            FmPropertyInfo(FM_PROP_HIDDEN,              FM_ATTR_HIDDEN,             sal_False, ::rtl::OUString(),                                   nPos++, 0),
-            FmPropertyInfo(FM_PROP_FIELDSOURCE,         FM_ATTR_FIELDSOURCE,        sal_False, ::rtl::OUString(),                                   nPos++, 0),
-            FmPropertyInfo(FM_PROP_FILTERSUPPLIER,      FM_ATTR_FILTERSUPPLIER,     sal_False, ::rtl::OUString(),                                   nPos++, 0),
-            FmPropertyInfo(FM_PROP_CURRENTFILTER,       FM_ATTR_CURRENTFILTER,      sal_False, ::rtl::OUString(),                                   nPos++, 0),
-            FmPropertyInfo(FM_PROP_SELECTED_FIELDS,     FM_ATTR_SELECTED_FIELDS,    sal_False, ::rtl::OUString(),                                   nPos++, 0),
-            FmPropertyInfo(FM_PROP_SELECTED_TABLES,     FM_ATTR_SELECTED_TABLES,    sal_False, ::rtl::OUString(),                                   nPos++, 0),
-            FmPropertyInfo(FM_PROP_TABLENAME,           FM_ATTR_TABLENAME,          sal_False, ::rtl::OUString(),                                   nPos++, 0),
-            FmPropertyInfo(FM_PROP_THREADSAFE,          FM_ATTR_THREADSAFE,         sal_False, ::rtl::OUString(),                                   nPos++, 0),
-            FmPropertyInfo(FM_PROP_APPLYFILTER,         FM_ATTR_APPLYFILTER,        sal_False, ::rtl::OUString(),                                   nPos++, 0),
-            FmPropertyInfo(FM_PROP_SOURCE,              FM_ATTR_SOURCE,             sal_False, ::rtl::OUString(),                                   nPos++, 0),
-
-            FmPropertyInfo(FM_PROP_CURSORCOLOR,         FM_ATTR_CURSORCOLOR,        sal_True, ::rtl::OUString(),                                    nPos++, 0),
-            FmPropertyInfo(FM_PROP_ALWAYSSHOWCURSOR,    FM_ATTR_ALWAYSSHOWCURSOR,   sal_True, ::rtl::OUString(),                                    nPos++, 0),
-            FmPropertyInfo(FM_PROP_DISPLAYSYNCHRON,     FM_ATTR_DISPLAYSYNCHRON,    sal_True, ::rtl::OUString(),                                    nPos++, 0),
-
-            FmPropertyInfo(FM_PROP_ISMODIFIED,          FM_ATTR_ISMODIFIED,         sal_False, ::rtl::OUString(),                                   nPos++, 0),
-            FmPropertyInfo(FM_PROP_ISNEW,               FM_ATTR_ISNEW,              sal_False, ::rtl::OUString(),                                   nPos++, 0),
-            FmPropertyInfo(FM_PROP_RESULTSET_CONCURRENCY,   FM_ATTR_RESULTSET_CONCURRENCY,  sal_False, ::rtl::OUString(),                           nPos++, 0),
-            FmPropertyInfo(FM_PROP_RESULTSET_TYPE,      FM_ATTR_RESULTSET_TYPE,     sal_False, ::rtl::OUString(),                                   nPos++, 0),
-
-            FmPropertyInfo(FM_PROP_ISNULLABLE,          FM_ATTR_ISNULLABLE,         sal_False, ::rtl::OUString(),                                   nPos++, 0),
-            FmPropertyInfo(FM_PROP_ACTIVECOMMAND,       FM_ATTR_ACTIVECOMMAND,      sal_False, ::rtl::OUString(),                                   nPos++, 0),
-            FmPropertyInfo(FM_PROP_ISCURRENCY,          FM_ATTR_ISCURRENCY,         sal_False, ::rtl::OUString(),                                   nPos++, 0),
-            FmPropertyInfo(FM_PROP_NUMBER_FORMATS_SUPPLIER, FM_ATTR_NUMBER_FORMATS_SUPPLIER,    sal_False, ::rtl::OUString(),                       nPos++, 0),
-            FmPropertyInfo(FM_PROP_URL,                 FM_ATTR_URL,                sal_False, ::rtl::OUString(),                                   nPos++, 0),
-            FmPropertyInfo(FM_PROP_TITLE,               FM_ATTR_TITLE,              sal_False, ::rtl::OUString(),                                   nPos++, 0),
-            FmPropertyInfo(FM_PROP_ACTIVE_CONNECTION,   FM_ATTR_ACTIVE_CONNECTION,  sal_False, ::rtl::OUString(),                                   nPos++, 0),
-            FmPropertyInfo(FM_PROP_SCALE,               FM_ATTR_SCALE,              sal_False, ::rtl::OUString(),                                   nPos++, 0),
-            FmPropertyInfo(FM_PROP_REALNAME,            FM_ATTR_REALNAME,           sal_False, ::rtl::OUString(),                                   nPos++, 0),
-            FmPropertyInfo(FM_PROP_CONTROLSOURCEPROPERTY,FM_ATTR_CONTROLSOURCEPROPERTY, sal_False, ::rtl::OUString(),                               nPos++, 0),
-            FmPropertyInfo(FM_PROP_TEXTLINECOLOR,       FM_ATTR_TEXTLINECOLOR,      sal_False, ::rtl::OUString(),                                   nPos++, 0),
-            FmPropertyInfo(FM_PROP_FONTEMPHASISMARK,    FM_ATTR_FONTEMPHASISMARK,   sal_False, ::rtl::OUString(),                                   nPos++, 0),
-            FmPropertyInfo(FM_PROP_FONTRELIEF,          FM_ATTR_FONTRELIEF,         sal_False, ::rtl::OUString(),                                   nPos++, 0)
+            FmPropertyInfo(FM_PROP_NAME,                sal_False, RID_STR_NAME),
+            FmPropertyInfo(FM_PROP_LABEL,               sal_True,  RID_STR_LABEL),
+            FmPropertyInfo(FM_PROP_CONTROLLABEL,        sal_False, RID_STR_LABELCONTROL),
+            FmPropertyInfo(FM_PROP_TEXT,                sal_True,  0),
+            FmPropertyInfo(FM_PROP_MAXTEXTLEN,          sal_True,  RID_STR_MAXTEXTLEN),
+            FmPropertyInfo(FM_PROP_EDITMASK,            sal_True,  RID_STR_EDITMASK),
+            FmPropertyInfo(FM_PROP_LITERALMASK,         sal_True,  RID_STR_LITERALMASK),
+            FmPropertyInfo(FM_PROP_STRICTFORMAT,        sal_True,  RID_STR_STRICTFORMAT),
+            FmPropertyInfo(FM_PROP_ENABLED,             sal_True,  RID_STR_ENABLED),
+            FmPropertyInfo(FM_PROP_READONLY,            sal_True,  RID_STR_READONLY),
+            FmPropertyInfo(FM_PROP_PRINTABLE,           sal_True,  RID_STR_PRINTABLE),
+            FmPropertyInfo(FM_PROP_CONTROLSOURCE,       sal_True,  RID_STR_CONTROLSOURCE),
+            FmPropertyInfo(FM_PROP_TABSTOP,             sal_True,  RID_STR_TABSTOP),
+            FmPropertyInfo(FM_PROP_TABINDEX,            sal_True,  RID_STR_TABINDEX),
+            FmPropertyInfo(FM_PROP_DATASOURCE,          sal_True,  RID_STR_DATASOURCE),
+            FmPropertyInfo(FM_PROP_COMMAND,             sal_False, RID_STR_CURSORSOURCE),
+            FmPropertyInfo(FM_PROP_COMMANDTYPE,         sal_False, RID_STR_CURSORSOURCETYPE),
+            FmPropertyInfo(FM_PROP_ESCAPE_PROCESSING,   sal_False, RID_STR_ESCAPE_PROCESSING),
+            FmPropertyInfo(FM_PROP_FILTER_CRITERIA,     sal_False, RID_STR_FILTER_CRITERIA),
+            FmPropertyInfo(FM_PROP_SORT,                sal_False, RID_STR_SORT_CRITERIA),
+            FmPropertyInfo(FM_PROP_INSERTONLY,          sal_False, RID_STR_DATAENTRY),
+            FmPropertyInfo(FM_PROP_ALLOWADDITIONS,      sal_True,  RID_STR_ALLOW_ADDITIONS),
+            FmPropertyInfo(FM_PROP_ALLOWEDITS,          sal_True,  RID_STR_ALLOW_EDITS),
+            FmPropertyInfo(FM_PROP_ALLOWDELETIONS,      sal_True,  RID_STR_ALLOW_DELETIONS),
+            FmPropertyInfo(FM_PROP_INSERTONLY,          sal_True,  RID_STR_DATAENTRY),
+            FmPropertyInfo(FM_PROP_NAVIGATION,          sal_True,  RID_STR_NAVIGATIONBAR),
+            FmPropertyInfo(FM_PROP_CYCLE,               sal_True,  RID_STR_CYCLE),
+            FmPropertyInfo(FM_PROP_CACHESIZE,           sal_True,  0),
+            FmPropertyInfo(FM_PROP_LASTDIRTY,           sal_True,  0),
+            FmPropertyInfo(FM_PROP_HIDDEN_VALUE,        sal_True,  RID_STR_VALUE),
+            FmPropertyInfo(FM_PROP_VALUE,               sal_True,  0),
+            FmPropertyInfo(FM_PROP_VALUEMIN,            sal_True,  RID_STR_VALUEMIN),
+            FmPropertyInfo(FM_PROP_VALUEMAX,            sal_True,  RID_STR_VALUEMAX),
+            FmPropertyInfo(FM_PROP_VALUESTEP,           sal_True,  RID_STR_VALUESTEP),
+            FmPropertyInfo(FM_PROP_DEFAULT_VALUE,       sal_True,  RID_STR_DEFAULTVALUE),
+            FmPropertyInfo(FM_PROP_DECIMAL_ACCURACY,    sal_True,  RID_STR_DECIMAL_ACCURACY),
+            FmPropertyInfo(FM_PROP_DECIMALS,            sal_True,   0),
+            FmPropertyInfo(FM_PROP_SHOWTHOUSANDSEP,     sal_True,  RID_STR_SHOWTHOUSANDSEP),
+            FmPropertyInfo(FM_PROP_REFVALUE,            sal_True,  RID_STR_REFVALUE),
+            FmPropertyInfo(FM_PROP_CURRENCYSYMBOL,      sal_True,  RID_STR_CURRENCYSYMBOL),
+            FmPropertyInfo(FM_PROP_CURRSYM_POSITION,    sal_True,  RID_STR_CURRSYM_POSITION),
+            FmPropertyInfo(FM_PROP_DATE,                sal_True,  0),
+            FmPropertyInfo(FM_PROP_DATEMIN,             sal_True,  RID_STR_DATEMIN),
+            FmPropertyInfo(FM_PROP_DATEMAX,             sal_True,  RID_STR_DATEMAX),
+            FmPropertyInfo(FM_PROP_DATEFORMAT,          sal_True,  RID_STR_DATEFORMAT),
+            FmPropertyInfo(FM_PROP_DEFAULT_DATE,        sal_True,  RID_STR_DEFAULTVALUE),
+            FmPropertyInfo(FM_PROP_TIME,                sal_True,  0),
+            FmPropertyInfo(FM_PROP_TIMEMIN,             sal_True,  RID_STR_TIMEMIN),
+            FmPropertyInfo(FM_PROP_TIMEMAX,             sal_True,  RID_STR_TIMEMAX),
+            FmPropertyInfo(FM_PROP_TIMEFORMAT,          sal_True,  RID_STR_TIMEFORMAT),
+            FmPropertyInfo(FM_PROP_DEFAULT_TIME,        sal_True,  RID_STR_DEFAULTVALUE),
+            FmPropertyInfo(FM_PROP_EFFECTIVE_MIN,       sal_False, RID_STR_VALUEMIN),
+            FmPropertyInfo(FM_PROP_EFFECTIVE_MAX,       sal_False, RID_STR_VALUEMAX),
+            FmPropertyInfo(FM_PROP_EFFECTIVE_DEFAULT,   sal_False, RID_STR_DEFAULTVALUE),
+            FmPropertyInfo(FM_PROP_FORMATKEY,           sal_True,  RID_STR_FORMATKEY),
+            FmPropertyInfo(FM_PROP_FORMATSSUPPLIER,     sal_True,  0),
+            FmPropertyInfo(FM_PROP_SIZE,                sal_True,  RID_STR_SIZE),
+            FmPropertyInfo(FM_PROP_CLASSID,             sal_False, RID_STR_CLASSID),
+            FmPropertyInfo(FM_PROP_WIDTH,               sal_True,  RID_STR_WIDTH),
+            FmPropertyInfo(FM_PROP_DEFAULTCONTROL,      sal_True,  0),
+            FmPropertyInfo(FM_PROP_BOUNDCOLUMN,         sal_True,  RID_STR_BOUNDCOLUMN),
+            FmPropertyInfo(FM_PROP_LISTSOURCETYPE,      sal_True,  RID_STR_LISTSOURCETYPE),
+            FmPropertyInfo(FM_PROP_LISTSOURCE,          sal_True,  RID_STR_LISTSOURCE),
+            FmPropertyInfo(FM_PROP_STRINGITEMLIST,      sal_True,  RID_STR_STRINGITEMLIST),
+            FmPropertyInfo(FM_PROP_DEFAULT_TEXT,        sal_True,  RID_STR_DEFAULTVALUE),
+            FmPropertyInfo(FM_PROP_FONT_NAME,           sal_True,  RID_STR_FONT),
+            FmPropertyInfo(FM_PROP_FONT_STYLENAME,      sal_True,  0),
+            FmPropertyInfo(FM_PROP_FONT_FAMILY,         sal_True,  0),
+            FmPropertyInfo(FM_PROP_FONT_CHARSET,        sal_True,  0),
+            FmPropertyInfo(FM_PROP_FONT_HEIGHT,         sal_True,  0),
+            FmPropertyInfo(FM_PROP_FONT_WEIGHT,         sal_True,  0),
+            FmPropertyInfo(FM_PROP_FONT_SLANT,          sal_True,  0),
+            FmPropertyInfo(FM_PROP_FONT_UNDERLINE,      sal_True,  0),
+            FmPropertyInfo(FM_PROP_FONT_STRIKEOUT,      sal_True,  0),
+            FmPropertyInfo(FM_PROP_ALIGN,               sal_True,  RID_STR_ALIGN),
+            FmPropertyInfo(FM_PROP_ROWHEIGHT,           sal_True,  RID_STR_ROWHEIGHT),
+            FmPropertyInfo(FM_PROP_BACKGROUNDCOLOR,     sal_True,  RID_STR_BACKGROUNDCOLOR),
+            FmPropertyInfo(FM_PROP_FILLCOLOR,           sal_True,  RID_STR_FILLCOLOR),
+            FmPropertyInfo(FM_PROP_TEXTCOLOR,           sal_True,  RID_STR_TEXTCOLOR),
+            FmPropertyInfo(FM_PROP_LINECOLOR,           sal_True,  RID_STR_LINECOLOR),
+            FmPropertyInfo(FM_PROP_BORDER,              sal_True,  RID_STR_BORDER),
+            FmPropertyInfo(FM_PROP_DROPDOWN,            sal_True,  RID_STR_DROPDOWN),
+            FmPropertyInfo(FM_PROP_AUTOCOMPLETE,        sal_True,  RID_STR_AUTOCOMPLETE),
+            FmPropertyInfo(FM_PROP_LINECOUNT,           sal_True,  RID_STR_LINECOUNT),
+            FmPropertyInfo(FM_PROP_MULTI,               sal_True,  RID_STR_MULTILINE),
+            FmPropertyInfo(FM_PROP_MULTILINE,           sal_True,  RID_STR_MULTILINE),
+            FmPropertyInfo(FM_PROP_MULTISELECTION,      sal_True,  RID_STR_MULTISELECTION),
+            FmPropertyInfo(FM_PROP_HARDLINEBREAKS,      sal_True,  RID_STR_HARDLINEBREAKS),
+            FmPropertyInfo(FM_PROP_HSCROLL,             sal_True,  RID_STR_HSCROLL),
+            FmPropertyInfo(FM_PROP_VSCROLL,             sal_True,  RID_STR_VSCROLL),
+            FmPropertyInfo(FM_PROP_SPIN,                sal_True,  RID_STR_SPIN),
+            FmPropertyInfo(FM_PROP_STATE,               sal_True,  0),
+            FmPropertyInfo(FM_PROP_BUTTONTYPE,          sal_True,  RID_STR_BUTTONTYPE),
+            FmPropertyInfo(FM_PROP_TARGET_URL,          sal_True,  RID_STR_TARGET_URL),
+            FmPropertyInfo(FM_PROP_TARGET_FRAME,        sal_True,  RID_STR_TARGET_FRAME),
+            FmPropertyInfo(FM_PROP_SUBMIT_ACTION,       sal_True,  RID_STR_SUBMIT_ACTION),
+            FmPropertyInfo(FM_PROP_SUBMIT_TARGET,       sal_True,  RID_STR_SUBMIT_TARGET),
+            FmPropertyInfo(FM_PROP_SUBMIT_METHOD,       sal_True,  RID_STR_SUBMIT_METHOD),
+            FmPropertyInfo(FM_PROP_SUBMIT_ENCODING,     sal_True,  RID_STR_SUBMIT_ENCODING),
+            FmPropertyInfo(FM_PROP_DEFAULTCHECKED,      sal_True,  RID_STR_DEFAULT_CHECKED),
+            FmPropertyInfo(::rtl::OUString::createFromAscii("DefaultButton"), sal_True,  RID_STR_DEFAULT_BUTTON),
+            FmPropertyInfo(FM_PROP_VALUE_SEQ,           sal_True,  0),
+            FmPropertyInfo(FM_PROP_IMAGE_URL,           sal_True,  RID_STR_IMAGE_URL),
+            FmPropertyInfo(FM_PROP_SELECT_SEQ,          sal_True,  0),
+            FmPropertyInfo(FM_PROP_DEFAULT_SELECT_SEQ,  sal_True,  RID_STR_DEFAULT_SELECT_SEQ),
+            FmPropertyInfo(FM_PROP_ECHO_CHAR,           sal_True,  RID_STR_ECHO_CHAR),
+            FmPropertyInfo(FM_PROP_EMPTY_IS_NULL,       sal_True,  RID_STR_EMPTY_IS_NULL),
+            FmPropertyInfo(FM_PROP_TRISTATE,            sal_True,  RID_STR_TRISTATE),
+            FmPropertyInfo(FM_PROP_MASTERFIELDS,        sal_True,  RID_STR_MASTERFIELDS),
+            FmPropertyInfo(FM_PROP_DETAILFIELDS,        sal_True,  RID_STR_SLAVEFIELDS),
+            FmPropertyInfo(FM_PROP_HASNAVIGATION,       sal_True,  RID_STR_NAVIGATIONBAR),
+            FmPropertyInfo(FM_PROP_RECORDMARKER,        sal_True,  RID_STR_RECORDMARKER),
+            FmPropertyInfo(FM_PROP_FILTERPROPOSAL,      sal_True,  RID_STR_FILTERPROPOSAL),
+            FmPropertyInfo(FM_PROP_QUERY,               sal_True,  0),
+            FmPropertyInfo(FM_PROP_ISPASSTHROUGH,       sal_True,  0),
+            FmPropertyInfo(FM_PROP_TAG,                 sal_True,  RID_STR_TAG),
+            FmPropertyInfo(FM_PROP_HELPTEXT,            sal_False, RID_STR_HELPTEXT),
+            FmPropertyInfo(FM_PROP_HELPURL,             sal_False, RID_STR_HELPURL),
+            FmPropertyInfo(FM_PROP_CURSORCOLOR,         sal_True, 0),
+            FmPropertyInfo(FM_PROP_ALWAYSSHOWCURSOR,    sal_True, 0),
+            FmPropertyInfo(FM_PROP_DISPLAYSYNCHRON,     sal_True, 0)
         };
 
         pPropertyInfos = (FmPropertyInfo*)aPropertyInfos;
@@ -508,45 +452,28 @@ const FmPropertyInfo* FmPropertyInfoService::getPropertyInfo()
 }
 
 //------------------------------------------------------------------
-FmPropertyInfo::FmPropertyInfo(const ::rtl::OUString& _rName, sal_Int32 _nId, sal_Bool bMSel,
-                               const ::rtl::OUString& aString, sal_uInt16 nP, sal_uInt32 nHid)
-
-               :aName(_rName),nId(_nId),bMultiSelectable(bMSel),
-                aTranslation(aString),nPos(nP),nHelpId(nHid)
-{}
-
-//------------------------------------------------------------------
-::rtl::OUString FmPropertyInfoService::getPropertyTranslation(sal_Int32 _nId)
-{
-    const FmPropertyInfo* pInfo = getPropertyInfo(_nId);
-    return (pInfo) ? pInfo->aTranslation : ::rtl::OUString();
-}
-
-//------------------------------------------------------------------
-sal_uInt32 FmPropertyInfoService::getPropertyHelpId(sal_Int32 _nId)
-{
-    const FmPropertyInfo* pInfo = getPropertyInfo(_nId);
-    return (pInfo) ? pInfo->nHelpId : 0;
-}
+FmPropertyInfo::FmPropertyInfo(const ::rtl::OUString& _rName, sal_Bool bMSel,
+                               sal_uInt16 _nDisplayNameResId)
 
-//------------------------------------------------------------------
-sal_Int32 FmPropertyInfoService::getPropertyId(const ::rtl::OUString& _rName)
+               :aName(_rName)
+               ,bMultiSelectable(bMSel)
+               ,nDisplayNameResId( _nDisplayNameResId )
 {
-    const FmPropertyInfo* pInfo = getPropertyInfo(_rName);
-    return pInfo ? pInfo->nId : -1;
 }
 
 //------------------------------------------------------------------
-sal_uInt16 FmPropertyInfoService::getPropertyPos(sal_Int32 _nId)
+::rtl::OUString FmPropertyInfoService::getPropertyTranslation( const ::rtl::OUString _rName )
 {
-    const FmPropertyInfo* pInfo = getPropertyInfo(_nId);
-    return (pInfo) ? pInfo->nPos : 0xFFFF;
+    const FmPropertyInfo* pInfo = getPropertyInfo( _rName );
+    return  ( pInfo && ( pInfo->nDisplayNameResId > 0 ) )
+        ?   ::rtl::OUString( SVX_RES( pInfo->nDisplayNameResId ) )
+        :   ::rtl::OUString();
 }
 
 //------------------------------------------------------------------------
-sal_Bool FmPropertyInfoService::getPropertyMultiFlag(sal_Int32 _nId)
+sal_Bool FmPropertyInfoService::getPropertyMultiFlag( const ::rtl::OUString _rName )
 {
-    const FmPropertyInfo* pInfo = getPropertyInfo(_nId);
+    const FmPropertyInfo* pInfo = getPropertyInfo( _rName );
     return (pInfo) ? pInfo->bMultiSelectable : sal_False;
 }
 
@@ -556,7 +483,7 @@ const FmPropertyInfo* FmPropertyInfoService::getPropertyInfo(const ::rtl::OUStri
     // intialisierung
     if(!pPropertyInfos)
         getPropertyInfo();
-    FmPropertyInfo  aSearch(_rName, 0L, sal_False,::rtl::OUString(),0);
+    FmPropertyInfo  aSearch( _rName, sal_False, 0 );
 
     const FmPropertyInfo* pPropInfo = (FmPropertyInfo*) bsearch(&aSearch,
                                     (void*) pPropertyInfos,
@@ -568,19 +495,3 @@ const FmPropertyInfo* FmPropertyInfoService::getPropertyInfo(const ::rtl::OUStri
 }
 
 
-//------------------------------------------------------------------------
-const FmPropertyInfo* FmPropertyInfoService::getPropertyInfo(sal_Int32 _nId)
-{
-    // intialisierung
-    if(!pPropertyInfos)
-        getPropertyInfo();
-
-    for (sal_uInt16 i = 0; i < nCount; i++)
-        if (pPropertyInfos[i].nId == _nId)
-            return &pPropertyInfos[i];
-
-    return NULL;
-}
-
-
-
diff --git a/svx/source/form/fmsearch.src b/svx/source/form/fmsearch.src
index 618f76ed509b..0768592d822f 100644
--- a/svx/source/form/fmsearch.src
+++ b/svx/source/form/fmsearch.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmsearch.src,v $
  *
- *  $Revision: 1.45 $
+ *  $Revision: 1.46 $
  *
- *  last change: $Author: kz $ $Date: 2002-11-27 16:33:06 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:30 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -113,7 +113,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM
         Text[ polish ] = "Szukaj:";
         Text[ portuguese_brazilian ] = "Search for";
         Text[ japanese ] = "検索条件";
-        Text[ korean ] = "찾을 대상";
+        Text[ korean ] = "검색 대상";
         Text[ chinese_simplified ] = "搜寻目标";
         Text[ chinese_traditional ] = "搜尋內容";
         Text[ arabic ] = "����� ��";
@@ -198,7 +198,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM
         Text[ polish ] = "Zawarto�� pola jest nier�wna NULL";
         Text[ portuguese_brazilian ] = "Field content is n~ot NULL";
         Text[ japanese ] = "空白でないフィールド";
-        Text[ korean ] = "필드 내용이 NU~LL이 아님";
+        Text[ korean ] = "필드 내용은 NU~LL이 아님";
         Text[ chinese_simplified ] = "字段内容不是 NU~LL";
         Text[ chinese_traditional ] = "欄位內容不是 NU~LL";
         Text[ arabic ] = "������� ����� �� ����� ���� ����� (NULL)";
@@ -265,7 +265,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM
         Text[ polish ] = "Formularz";
         Text[ portuguese_brazilian ] = "~Formular :";
         Text[ japanese ] = "フォーム";
-        Text[ korean ] = "양식:";
+        Text[ korean ] = "양식";
         Text[ chinese_simplified ] = "表单";
         Text[ chinese_traditional ] = "表單";
         Text[ turkish ] = "Form:";
@@ -331,7 +331,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM
         Text[ polish ] = "Pojedyncze pole";
         Text[ portuguese_brazilian ] = "ein~zelnes Feld :";
         Text[ japanese ] = "指定のフィールド";
-        Text[ korean ] = "개별 필드:";
+        Text[ korean ] = "지정 필드:";
         Text[ chinese_simplified ] = "单个字段";
         Text[ chinese_traditional ] = "單個欄位";
         Text[ turkish ] = "Tek alan:";
@@ -396,7 +396,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM
         Text[ polish ] = "Pozycja";
         Text[ portuguese_brazilian ] = "~Position :";
         Text[ japanese ] = "位置";
-        Text[ korean ] = "위치:";
+        Text[ korean ] = "위치";
         Text[ chinese_simplified ] = "位置";
         Text[ chinese_traditional ] = "位置";
         Text[ turkish ] = "Konum:";
@@ -428,7 +428,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM
         Text[ french ] = "Utiliser le f~ormatage de champ";
         Text[ swedish ] = "Anv�nd ~f�ltformatering";
         Text[ dutch ] = "Veldop~maak gebruiken";
-        Text[ spanish ] = "Usar formato de ~campo";
+        Text[ spanish ] = "Aplicar formato de ~campo";
         Text[ english_us ] = "Apply field format";
         Text[ chinese_simplified ] = "使用字段格式";
         Text[ russian ] = "��������� ������ ����";
@@ -468,7 +468,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM
         Text[ chinese_traditional ] = "精確搜尋";
         Text[ arabic ] = "��� ����";
         Text[ greek ] = "������� ���������";
-        Text[ korean ] = "상세하게 찾기";
+        Text[ korean ] = "대문자 및 소문자를 구분";
         Text[ turkish ] = "B�Y�K/k���k harf duyarl�";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Coincid�ncia ~exacta";
@@ -561,7 +561,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM
         Text[ chinese_traditional ] = "萬用字元表達";
         Text[ arabic ] = "����� ���� ����";
         Text[ greek ] = "��������� �����~��� �������� �����";
-        Text[ korean ] = "플레이스홀더 인쇄";
+        Text[ korean ] = "패턴 일치(와일드카드) 식 ";
         Text[ turkish ] = "Genel arama terimi";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Expresi� comod�";
@@ -592,7 +592,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM
         Text[ chinese_traditional ] = "常規表達";
         Text[ arabic ] = "����� �������";
         Text[ greek ] = "�������� �������";
-        Text[ korean ] = "보통 표현";
+        Text[ korean ] = "정규식";
         Text[ turkish ] = "Genel arama terimi";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Expresi� ~regular";
@@ -623,7 +623,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM
         Text[ chinese_traditional ] = "相似字搜尋";
         Text[ arabic ] = "����� �� ����� �������";
         Text[ greek ] = "��������� ����������";
-        Text[ korean ] = "유사성 찾기";
+        Text[ korean ] = "유사성 검색";
         Text[ turkish ] = "Benzerini ara";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Cerca de similitud";
@@ -654,7 +654,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM
         Text[ chinese_traditional ] = "~...";
         Text[ arabic ] = "...";
         Text[ greek ] = "~...";
-        Text[ korean ] = "...";
+        Text[ korean ] = "~...";
         Text[ turkish ] = "~...";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "...";
@@ -681,7 +681,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM
         Text[ polish ] = "Uwzgl�dnij szeroko�� znak�w";
         Text[ portuguese_brazilian ] = "Match half/full width forms";
         Text[ japanese ] = "全角と半角を区別する";
-        Text[ korean ] = "문자 너비 적용";
+        Text[ korean ] = "전자와 반자를 구분";
         Text[ chinese_simplified ] = "顾全字符宽度";
         Text[ chinese_traditional ] = "顧及字元寬度";
         Text[ turkish ] = "Match half/full width forms";
@@ -709,7 +709,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM
         Text[ polish ] = "Podobna pisownia (japo�ski)";
         Text[ portuguese_brazilian ] = "Sounds like (Japanese)";
         Text[ japanese ] = "あいまい検索(日本語)";
-        Text[ korean ] = "유사한 정서법(일본어)";
+        Text[ korean ] = "동음어 찾기(일본어)";
         Text[ chinese_simplified ] = "类似字符(日文)";
         Text[ chinese_traditional ] = "類似字元(日文)";
         Text[ turkish ] = "Sounds like (Japanese)";
@@ -840,7 +840,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM
         Text[ chinese_traditional ] = "搜尋";
         Text[ arabic ] = "���";
         Text[ greek ] = "A��������";
-        Text[ korean ] = "찾기";
+        Text[ korean ] = "검색";
         Text[ turkish ] = "Ara";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Cerca";
@@ -960,7 +960,7 @@ String RID_STR_RECORDSEARCH_BUTTONS
     Text[ chinese_traditional ] = "從起始位置;從結束位置;搜尋;取消";
     Text[ arabic ] = "�� ������ɺ �� ������ɺ ��˺ �����";
     Text[ greek ] = "��� ��� ����;��� �� �����;�������~��;~�������";
-    Text[ korean ] = "처음부터;끝에서 부터;찾기;취소";
+    Text[ korean ] = "처음부터;끝에서부터;찾기;취소";
     Text[ turkish ] = "Ba�tan;Sondan;Ara;�ptal";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "~Des de l'inici;~Des del final;~Cerca;~Cancel.la";
@@ -983,13 +983,13 @@ ErrorBox RID_SVXERR_SEARCH_NORECORD
     Message[ spanish ] = "�No se encontr� ning�n registro de datos adecuado a su informaci�n!";
     Message[ english_us ] = "No records corresponding to your data found!";
     Message[ chinese_simplified ] = "没有找到符合您给定的数据条目！";
-    Message[ russian ] = "�� ������� �������, ��������������� ����� �������!";
+    Message[ russian ] = "�� ������� �������, ��������������� ������ �������!";
     Message[ polish ] = "Nie znaleziono �adnych rekord�w odpowiadaj�cych wpisanym danym!";
     Message[ japanese ] = "入力項目に該当するレコードが見つかりません。";
     Message[ chinese_traditional ] = "沒有找到符合您指定的資料條目﹗";
     Message[ arabic ] = "���� ������ ��� ����� ������ ������ �� ������� !";
     Message[ greek ] = "��� �������� ��������, �� ������ �� ����������� �� �������� ���!";
-    Message[ korean ] = "사용자의 데이터에 맞는 레코드를 찾지 못했습니다!";
+    Message[ korean ] = "사용자의 데이터와 맞는 레코드를 찾지 못했습니다.";
     Message[ turkish ] = "Girdi�iniz verilere uygun veri k�meleri bulunamad�!";
     Message[ language_user1 ] = " ";
     Message[ catalan ] = "No s'ha trobat cap registre que es correspongui a la vostra data!";
@@ -1018,7 +1018,7 @@ ErrorBox RID_SVXERR_SEARCH_GENERAL_ERROR
     Message[ chinese_traditional ] = "出現一個不明的錯誤。無法結束搜尋！";
     Message[ arabic ] = "��� ��� ��� �����. ���� ����� ����� !";
     Message[ greek ] = "������������� ������� ������. � ��������� ��� ���� ������� �� �����������!";
-    Message[ korean ] = "알려져 있지 않은 오류가 발생했습니다. 검색을 종료하지 못했습니다!";
+    Message[ korean ] = "알 수 없는 오류가 발생했습니다. 검색을 마치지 못했습니다.";
     Message[ turkish ] = "Ayr�nt�lar� bilinmeyen bir hata olu�tu. Arama i�lemi tamamlanamad�!";
     Message[ language_user1 ] = " ";
     Message[ catalan ] = "S'ha produ�t un error desconegut. No s'ha pogut completar la cerca.";
@@ -1082,3 +1082,8 @@ String RID_STR_SEARCH_COUNTING
     Text[ thai ] = "นับระเบียน";
 };
 
+
+
+
+
+
diff --git a/svx/source/form/fmservs.cxx b/svx/source/form/fmservs.cxx
index fce477f5b121..388fb5ea0fe3 100644
--- a/svx/source/form/fmservs.cxx
+++ b/svx/source/form/fmservs.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmservs.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: fs $ $Date: 2001-05-11 10:13:02 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -78,48 +78,9 @@
 namespace svxform
 {
 
-    IMPLEMENT_CONSTASCII_USTRING(AWT_CONTROL_TEXTFIELD,"com.sun.star.awt.TextField");
-
-    IMPLEMENT_CONSTASCII_USTRING(VCL_CONTROL_EDIT,"stardiv.vcl.control.Edit");
-    IMPLEMENT_CONSTASCII_USTRING(VCL_CONTROL_LISTBOX,"stardiv.vcl.control.ListBox");
-    IMPLEMENT_CONSTASCII_USTRING(VCL_CONTROL_COMBOBOX,"stardiv.vcl.control.ComboBox");
-    IMPLEMENT_CONSTASCII_USTRING(VCL_CONTROL_RADIOBUTTON,"stardiv.vcl.control.RadioButton");
-    IMPLEMENT_CONSTASCII_USTRING(VCL_CONTROL_GROUPBOX,"stardiv.vcl.control.GroupBox");
-    IMPLEMENT_CONSTASCII_USTRING(VCL_CONTROL_FIXEDTEXT,"stardiv.vcl.control.FixedText");
-    IMPLEMENT_CONSTASCII_USTRING(VCL_CONTROL_COMMANDBUTTON,"stardiv.vcl.control.Button");
-    IMPLEMENT_CONSTASCII_USTRING(VCL_CONTROL_CHECKBOX,"stardiv.vcl.control.CheckBox");
-    IMPLEMENT_CONSTASCII_USTRING(VCL_CONTROL_IMAGEBUTTON,"stardiv.vcl.control.ImageButton");
-    IMPLEMENT_CONSTASCII_USTRING(VCL_CONTROL_FILECONTROL,"stardiv.vcl.control.FileControl");
-    IMPLEMENT_CONSTASCII_USTRING(VCL_CONTROL_TIMEFIELD,"stardiv.vcl.control.TimeField");
-    IMPLEMENT_CONSTASCII_USTRING(VCL_CONTROL_DATEFIELD,"stardiv.vcl.control.DateField");
-    IMPLEMENT_CONSTASCII_USTRING(VCL_CONTROL_NUMERICFIELD,"stardiv.vcl.control.NumericField");
-    IMPLEMENT_CONSTASCII_USTRING(VCL_CONTROL_CURRENCYFIELD,"stardiv.vcl.control.CurrencyField");
-    IMPLEMENT_CONSTASCII_USTRING(VCL_CONTROL_PATTERNFIELD,"stardiv.vcl.control.PatternField");
-    IMPLEMENT_CONSTASCII_USTRING(VCL_CONTROL_FORMATTEDFIELD,"stardiv.vcl.control.FormattedField");
-    IMPLEMENT_CONSTASCII_USTRING(VCL_CONTROL_IMAGECONTROL,"stardiv.vcl.control.ImageControl");
-
-    IMPLEMENT_CONSTASCII_USTRING(VCL_CONTROLMODEL_EDIT,"stardiv.vcl.controlmodel.Edit");
-    IMPLEMENT_CONSTASCII_USTRING(VCL_CONTROLMODEL_LISTBOX,"stardiv.vcl.controlmodel.ListBox");
-    IMPLEMENT_CONSTASCII_USTRING(VCL_CONTROLMODEL_COMBOBOX,"stardiv.vcl.controlmodel.ComboBox");
-    IMPLEMENT_CONSTASCII_USTRING(VCL_CONTROLMODEL_RADIOBUTTON,"stardiv.vcl.controlmodel.RadioButton");
-    IMPLEMENT_CONSTASCII_USTRING(VCL_CONTROLMODEL_GROUPBOX,"stardiv.vcl.controlmodel.GroupBox");
-    IMPLEMENT_CONSTASCII_USTRING(VCL_CONTROLMODEL_FIXEDTEXT,"stardiv.vcl.controlmodel.FixedText");
-    IMPLEMENT_CONSTASCII_USTRING(VCL_CONTROLMODEL_COMMANDBUTTON,"stardiv.vcl.controlmodel.Button");
-    IMPLEMENT_CONSTASCII_USTRING(VCL_CONTROLMODEL_CHECKBOX,"stardiv.vcl.controlmodel.CheckBox");
-    IMPLEMENT_CONSTASCII_USTRING(VCL_CONTROLMODEL_IMAGEBUTTON,"stardiv.vcl.controlmodel.ImageButton");
-    IMPLEMENT_CONSTASCII_USTRING(VCL_CONTROLMODEL_FILECONTROL,"stardiv.vcl.controlmodel.FileControl");
-    IMPLEMENT_CONSTASCII_USTRING(VCL_CONTROLMODEL_TIMEFIELD,"stardiv.vcl.controlmodel.TimeField");
-    IMPLEMENT_CONSTASCII_USTRING(VCL_CONTROLMODEL_DATEFIELD,"stardiv.vcl.controlmodel.DateField");
-    IMPLEMENT_CONSTASCII_USTRING(VCL_CONTROLMODEL_NUMERICFIELD,"stardiv.vcl.controlmodel.NumericField");
-    IMPLEMENT_CONSTASCII_USTRING(VCL_CONTROLMODEL_CURRENCYFIELD,"stardiv.vcl.controlmodel.CurrencyField");
-    IMPLEMENT_CONSTASCII_USTRING(VCL_CONTROLMODEL_PATTERNFIELD,"stardiv.vcl.controlmodel.PatternField");
-    IMPLEMENT_CONSTASCII_USTRING(VCL_CONTROLMODEL_FORMATTEDFIELD,"stardiv.vcl.controlmodel.FormattedField");
-    IMPLEMENT_CONSTASCII_USTRING(VCL_CONTROLMODEL_IMAGECONTROL,"stardiv.vcl.controlmodel.ImageControl");
-
     // -----------------------
     // service names for compatibility
     // -----------------------
-    IMPLEMENT_CONSTASCII_USTRING(FM_COMPONENT_FORM,"stardiv.one.form.component.Form");
     IMPLEMENT_CONSTASCII_USTRING(FM_COMPONENT_EDIT,"stardiv.one.form.component.Edit");          // compatibility
     IMPLEMENT_CONSTASCII_USTRING(FM_COMPONENT_TEXTFIELD,"stardiv.one.form.component.TextField");
     IMPLEMENT_CONSTASCII_USTRING(FM_COMPONENT_LISTBOX,"stardiv.one.form.component.ListBox");
@@ -143,25 +104,8 @@ namespace svxform
     IMPLEMENT_CONSTASCII_USTRING(FM_COMPONENT_IMAGECONTROL,"stardiv.one.form.component.ImageControl");
     IMPLEMENT_CONSTASCII_USTRING(FM_COMPONENT_FORMATTEDFIELD,"stardiv.one.form.component.FormattedField");
 
-    IMPLEMENT_CONSTASCII_USTRING(FM_CONTROL_EDIT,"stardiv.one.form.control.Edit");                  // compatibility
-    IMPLEMENT_CONSTASCII_USTRING(FM_CONTROL_TEXTFIELD,"stardiv.one.form.control.TextField");
-    IMPLEMENT_CONSTASCII_USTRING(FM_CONTROL_LISTBOX,"stardiv.one.form.control.ListBox");
-    IMPLEMENT_CONSTASCII_USTRING(FM_CONTROL_COMBOBOX,"stardiv.one.form.control.ComboBox");
-    IMPLEMENT_CONSTASCII_USTRING(FM_CONTROL_RADIOBUTTON,"stardiv.one.form.control.RadioButton");
-    IMPLEMENT_CONSTASCII_USTRING(FM_CONTROL_GROUPBOX,"stardiv.one.form.control.GroupBox");              // compatibility
-    IMPLEMENT_CONSTASCII_USTRING(FM_CONTROL_FIXEDTEXT,"stardiv.one.form.control.FixedText");            // compatibility
-    IMPLEMENT_CONSTASCII_USTRING(FM_CONTROL_COMMANDBUTTON,"stardiv.one.form.control.CommandButton");
-    IMPLEMENT_CONSTASCII_USTRING(FM_CONTROL_CHECKBOX,"stardiv.one.form.control.CheckBox");
     IMPLEMENT_CONSTASCII_USTRING(FM_CONTROL_GRID,"stardiv.one.form.control.Grid");                  // compatibility
     IMPLEMENT_CONSTASCII_USTRING(FM_CONTROL_GRIDCONTROL,"stardiv.one.form.control.GridControl");
-    IMPLEMENT_CONSTASCII_USTRING(FM_CONTROL_IMAGEBUTTON,"stardiv.one.form.control.ImageButton");
-    IMPLEMENT_CONSTASCII_USTRING(FM_CONTROL_TIMEFIELD,"stardiv.one.form.control.TimeField");
-    IMPLEMENT_CONSTASCII_USTRING(FM_CONTROL_DATEFIELD,"stardiv.one.form.control.DateField");
-    IMPLEMENT_CONSTASCII_USTRING(FM_CONTROL_NUMERICFIELD,"stardiv.one.form.control.NumericField");
-    IMPLEMENT_CONSTASCII_USTRING(FM_CONTROL_CURRENCYFIELD,"stardiv.one.form.control.CurrencyField");
-    IMPLEMENT_CONSTASCII_USTRING(FM_CONTROL_PATTERNFIELD,"stardiv.one.form.control.PatternField");
-    IMPLEMENT_CONSTASCII_USTRING(FM_CONTROL_IMAGECONTROL,"stardiv.one.form.control.ImageControl");
-    IMPLEMENT_CONSTASCII_USTRING(FM_CONTROL_FORMATTEDFIELD,"stardiv.one.form.control.FormattedField");
 
     // -----------------------
     // new (sun) service names
@@ -187,33 +131,11 @@ namespace svxform
     IMPLEMENT_CONSTASCII_USTRING(FM_SUN_COMPONENT_IMAGECONTROL,"com.sun.star.form.component.ImageControl");
     IMPLEMENT_CONSTASCII_USTRING(FM_SUN_COMPONENT_FORMATTEDFIELD,"com.sun.star.form.component.FormattedField");
 
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_CONTROL_TEXTFIELD,"com.sun.star.form.control.TextField");
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_CONTROL_LISTBOX,"com.sun.star.form.control.ListBox");
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_CONTROL_COMBOBOX,"com.sun.star.form.control.ComboBox");
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_CONTROL_RADIOBUTTON,"com.sun.star.form.control.RadioButton");
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_CONTROL_GROUPBOX,"com.sun.star.form.control.GroupBox");
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_CONTROL_FIXEDTEXT,"com.sun.star.form.control.FixedText");
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_CONTROL_COMMANDBUTTON,"com.sun.star.form.control.CommandButton");
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_CONTROL_CHECKBOX,"com.sun.star.form.control.CheckBox");
     IMPLEMENT_CONSTASCII_USTRING(FM_SUN_CONTROL_GRIDCONTROL,"com.sun.star.form.control.GridControl");
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_CONTROL_IMAGEBUTTON,"com.sun.star.form.control.ImageButton");
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_CONTROL_TIMEFIELD,"com.sun.star.form.control.TimeField");
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_CONTROL_DATEFIELD,"com.sun.star.form.control.DateField");
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_CONTROL_NUMERICFIELD,"com.sun.star.form.control.NumericField");
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_CONTROL_CURRENCYFIELD,"com.sun.star.form.control.CurrencyField");
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_CONTROL_PATTERNFIELD,"com.sun.star.form.control.PatternField");
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_CONTROL_IMAGECONTROL,"com.sun.star.form.control.ImageControl");
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_CONTROL_FORMATTEDFIELD,"com.sun.star.form.control.FormattedField");
 
-    IMPLEMENT_CONSTASCII_USTRING(FM_DATA_ENGINE,"com.sun.star.data.DatabaseEngine");
     IMPLEMENT_CONSTASCII_USTRING(FM_NUMBER_FORMATTER,"com.sun.star.util.NumberFormatter");
     IMPLEMENT_CONSTASCII_USTRING(FM_FORM_CONTROLLER,"com.sun.star.form.controller.FormController");
-    IMPLEMENT_CONSTASCII_USTRING(SRV_SDB_ROWSET,"com.sun.star.sdb.RowSet");
     IMPLEMENT_CONSTASCII_USTRING(SRV_SDB_CONNECTION,"com.sun.star.sdb.Connection");
-    IMPLEMENT_CONSTASCII_USTRING(SRV_SDBC_STATEMENT,"com.sun.star.sdbc.Statement");
-    IMPLEMENT_CONSTASCII_USTRING(SRV_SDB_DATABASE_ENVIRONMENT,"com.sun.star.sdb.DatabaseEnvironment");
-    IMPLEMENT_CONSTASCII_USTRING(SRV_SDB_DATABASE_ACCESS_CONNECTION,"com.sun.star.sdb.DatabaseAccessConnection");
-    IMPLEMENT_CONSTASCII_USTRING(SRV_SDB_DATABASE_CONTEXT,"com.sun.star.sdb.DatabaseContext");
     IMPLEMENT_CONSTASCII_USTRING(SRV_SDB_INTERACTION_HANDLER,"com.sun.star.sdb.InteractionHandler");
 }   // namespace svxform
 
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 7f5d4c1ee3a8..27db99006a6a 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmshell.cxx,v $
  *
- *  $Revision: 1.38 $
+ *  $Revision: 1.39 $
  *
- *  last change: $Author: fs $ $Date: 2002-11-14 14:24:04 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1186,9 +1186,11 @@ void FmFormShell::Execute(SfxRequest &rReq)
             if ( pArgs )
             {
                 const SfxPoolItem* pItem;
-                if( (pArgs->GetItemState(SID_FM_RECORD_ABSOLUTE, sal_True, &pItem)) == SFX_ITEM_SET )
+                if( (pArgs->GetItemState(FN_PARAM_1, sal_True, &pItem)) == SFX_ITEM_SET )
                 {
-                    nRecord = Max((((const FmFormInfoItem*)pItem)->GetInfo().Pos), (sal_Int32)0);
+                    const SfxInt32Item* pTypedItem = PTR_CAST( SfxInt32Item, pItem );
+                    if ( pTypedItem )
+                        nRecord = Max( pTypedItem->GetValue(), sal_Int32(0) );
                 }
             }
             else
@@ -1196,9 +1198,9 @@ void FmFormShell::Execute(SfxRequest &rReq)
                 FmInputRecordNoDialog dlg(NULL);
                 dlg.SetValue(xCursor->getRow());
                 if (dlg.Execute() == RET_OK)
-                {
-                    nRecord = dlg.GetValue() - 1;
-                }
+                    nRecord = dlg.GetValue();
+
+                rReq.AppendItem( SfxInt32Item( FN_PARAM_1, nRecord ) );
             }
 
             if (nRecord != -1)
@@ -1207,12 +1209,9 @@ void FmFormShell::Execute(SfxRequest &rReq)
                 sal_Bool    bFinal      = ::comphelper::getBOOL(xSet->getPropertyValue(FM_PROP_ROWCOUNTFINAL));
                 sal_Int32  nRecordCount= ::comphelper::getINT32(xSet->getPropertyValue(FM_PROP_ROWCOUNT));
 
-                if (bFinal && (sal_Int32)nRecord >= nRecordCount)
-                {
-                    Sound::Beep();
-                    rReq.Done();
-                    break;
-                }
+                if ( bFinal && (sal_Int32)nRecord >= nRecordCount )
+                    nRecord = nRecordCount - 1;
+
                 if (GetImpl()->SaveModified(GetImpl()->getNavController()))
                     DO_SAFE( xCursor->absolute(nRecord); );
             }
@@ -1903,13 +1902,13 @@ void FmFormShell::GetFormState(SfxItemSet &rSet, sal_uInt16 nWhich)
                             {
                                 if (bIsNew)
                                     nPos = ++nCount;
-                                rSet.Put(FmFormInfoItem(nWhich, FmFormInfo(nPos, nCount, sal_False)));
+                                rSet.Put( SfxInt32Item( nWhich, nPos ) );
                                 bEnable = sal_True;
                             }
                         }
                         else
                         {
-                            rSet.Put(FmFormInfoItem(nWhich, FmFormInfo(nPos, -1, sal_False)));
+                            rSet.Put( SfxInt32Item( nWhich, nPos ) );
                             bEnable = sal_True;
                         }
                     }
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 4d53819943da..0bb3d8ab987d 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmshimp.cxx,v $
  *
- *  $Revision: 1.40 $
+ *  $Revision: 1.41 $
  *
- *  last change: $Author: fs $ $Date: 2002-11-12 11:28:01 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -2435,6 +2435,9 @@ void FmXFormShell::setActiveController( const Reference< XFormController>& xCont
             Reference< XControl> xCurrentControl(m_xActiveController->getCurrentControl());
             if (xCurrentControl.is())
             {
+                Reference< XBoundComponent> xCurrentBoundComp(xCurrentControl,UNO_QUERY);
+                if ( xCurrentBoundComp.is() )
+                    xCurrentBoundComp->commit();
                 m_bSetFocus = sal_True;
                 Reference< XPropertySet>    xSet(getActiveForm(), UNO_QUERY);
                 if (IsModified(m_xActiveController))
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 48e70337ba84..2e73f4caa891 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmsrcimp.cxx,v $
  *
- *  $Revision: 1.22 $
+ *  $Revision: 1.23 $
  *
- *  last change: $Author: fs $ $Date: 2001-12-04 12:48:22 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:33 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -124,6 +124,9 @@
 #ifndef _COM_SUN_STAR_I18N_TRANSLITERATIONMODULES_HPP_
 #include <com/sun/star/i18n/TransliterationModules.hpp>
 #endif
+#ifndef _COM_SUN_STAR_I18N_COLLATOROPTIONS_HPP_
+#include <com/sun/star/i18n/CollatorOptions.hpp>
+#endif
 
 #ifndef _ISOLANG_HXX
 #include <tools/isolang.hxx>
@@ -171,6 +174,9 @@
 #ifndef _COMPHELPER_NUMBERS_HXX_
 #include <comphelper/numbers.hxx>
 #endif
+#ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
+#include <svtools/syslocale.hxx>
+#endif
 
 //#define COMPARE_BOOKMARKS(a, b) compareUsrAny(a, b)
 #define COMPARE_BOOKMARKS(a, b) ::comphelper::compare(a, b)
@@ -190,24 +196,11 @@ using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::i18n;
+using namespace ::com::sun::star::beans;
 using namespace ::svxform;
 
 // ***************************************************************************************************
 
-//------------------------------------------------------------------------
-void buildUILocale(Locale& _rLocale)
-{
-    _rLocale = Application::GetSettings().GetUILocale();
-}
-
-//------------------------------------------------------------------------
-Locale buildUILocale()
-{
-    Locale aReturn;
-    buildUILocale(aReturn);
-    return aReturn;
-}
-
 // ***************************************************************************************************
 
 SV_IMPL_OBJARR(SvInt32Array, sal_Int32);
@@ -445,6 +438,9 @@ INLINE_METHOD sal_Bool FmSearchEngine::MoveField(sal_Int32& nPos, FieldCollectio
 //------------------------------------------------------------------------
 void FmSearchEngine::BuildAndInsertFieldInfo(const Reference< ::com::sun::star::container::XIndexAccess > & xAllFields, sal_Int32 nField)
 {
+    DBG_ASSERT( xAllFields.is() && ( nField >= 0 ) && ( nField < xAllFields->getCount() ),
+        "FmSearchEngine::BuildAndInsertFieldInfo: invalid field descriptor!" );
+
     // das Feld selber
     Reference< XInterface > xCurrentField;
     xAllFields->getByIndex(nField) >>= xCurrentField;
@@ -700,7 +696,7 @@ INLINE_METHOD FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(
         aParam.insertedChars = m_nLevLonger;
     }
     aParam.searchString = strExpression;
-    buildUILocale(aParam.Locale);
+    aParam.Locale = SvtSysLocale().GetLocaleData().getLocale();
     ::utl::TextSearch aLocalEngine(aParam);
 
     // --------------------------------------------------------------
@@ -806,7 +802,8 @@ FmSearchEngine::FmSearchEngine(const Reference< XMultiServiceFactory >& _rxORB,
     ,m_eMode(eMode)
     ,m_bCancelAsynchRequest(sal_False)
     ,m_bSearchingCurrently(sal_False)
-    ,m_aCharacterClassficator(_rxORB, buildUILocale())
+    ,m_aCharacterClassficator( _rxORB, SvtSysLocale().GetLocaleData().getLocale() )
+    ,m_aStringCompare( _rxORB )
 {
     DBG_CTOR(FmSearchEngine,NULL);
 
@@ -835,7 +832,8 @@ FmSearchEngine::FmSearchEngine(const Reference< XMultiServiceFactory >& _rxORB,
     ,m_eMode(eMode)
     ,m_bCancelAsynchRequest(sal_False)
     ,m_bSearchingCurrently(sal_False)
-    ,m_aCharacterClassficator(_rxORB, buildUILocale())
+    ,m_aCharacterClassficator( _rxORB, SvtSysLocale().GetLocaleData().getLocale() )
+    ,m_aStringCompare( _rxORB )
 {
     DBG_CTOR(FmSearchEngine,NULL);
 
@@ -928,12 +926,43 @@ void FmSearchEngine::fillControlTexts(const InterfaceArray& arrFields)
 //------------------------------------------------------------------------
 void FmSearchEngine::Init(const ::rtl::OUString& sVisibleFields)
 {
-    // die Felder der Tabelle auseinanderdroeseln
-    // ausserdem gleich das Mapping aufbauen: da die Liste der gueltigen Spalten durchaus kuerzer sein kann als die Liste der
-    // Spalten, die der Iterator verwaltet, brauche ich ein solches Mapping : die gueltige Spalte Nummer x entspricht der vom
-    // Iterator gelieferten Spalte y
+    // analyze the fields
+    // additionally, create the mapping: because the list of used columns can be shorter than the list
+    // of columns of the cursor, we need a mapping: "used column numer n" -> "cursor column m"
     m_arrFieldMapping.Remove(0, m_arrFieldMapping.Count());
 
+    // important: The case of the columns does not need to be exact - for instance:
+    // - a user created a form which works on a table, for which the driver returns a column name "COLUMN"
+    // - the driver itself works case-insensitve with column names
+    // - a control in the form is bound to "column" - not the different case
+    // In such a scenario, the form and the field would work okay, but we here need to case for the different case
+    // explicitly
+    // 2003-01-09 - #i8755# - fs@openoffice.org
+
+    // so first of all, check if the database handles identifiers case sensitive
+    Reference< XConnection > xConn;
+    Reference< XDatabaseMetaData > xMeta;
+    Reference< XPropertySet > xCursorProps( IFACECAST( m_xSearchCursor ), UNO_QUERY );
+    if ( xCursorProps.is() )
+    {
+        try
+        {
+            xCursorProps->getPropertyValue( FM_PROP_ACTIVE_CONNECTION ) >>= xConn;
+        }
+        catch( Exception& ) { /* silent this - will be asserted below */ }
+    }
+    if ( xConn.is() )
+        xMeta = xConn->getMetaData();
+    OSL_ENSURE( xMeta.is(), "FmSearchEngine::Init: very strange cursor (could not derive connection meta data from it)!" );
+
+    sal_Bool bCaseSensitiveIdentifiers = sal_True;  // assume case sensivity
+    if ( xMeta.is() )
+        bCaseSensitiveIdentifiers = xMeta->supportsMixedCaseQuotedIdentifiers();
+
+    // now that we have this information, we need a collator which is able to case (in)sentively compare strings
+    m_aStringCompare.loadDefaultCollator( SvtSysLocale().GetLocaleData().getLocale(),
+        bCaseSensitiveIdentifiers ? 0 : ::com::sun::star::i18n::CollatorOptions::CollatorOptions_IGNORE_CASE );
+
     try
     {
         // der Cursor kann mir einen Record (als PropertySet) liefern, dieser unterstuetzt den DatabaseRecord-Service
@@ -955,7 +984,7 @@ void FmSearchEngine::Init(const ::rtl::OUString& sVisibleFields)
             sal_Int32 nFoundIndex = -1;
             for (sal_Int32 j=0; j<seqFieldNames.getLength(); ++j, ++pFieldNames)
             {
-                if (pFieldNames->equals(sCurrentField))
+                if ( 0 == m_aStringCompare.compareString( *pFieldNames, sCurrentField ) )
                 {
                     nFoundIndex = j;
                     break;
diff --git a/svx/source/form/fmstring.src b/svx/source/form/fmstring.src
index 558af362522b..3087d0c20456 100644
--- a/svx/source/form/fmstring.src
+++ b/svx/source/form/fmstring.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmstring.src,v $
  *
- *  $Revision: 1.48 $
+ *  $Revision: 1.49 $
  *
- *  last change: $Author: pb $ $Date: 2002-11-28 08:48:10 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:33 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -107,7 +107,7 @@ String RID_ERR_FIELDREQUIRED
     Text[ japanese ] = "'#' フィールドには入力が必要です。\n数値を入力します。";
     Text[ chinese_traditional ] = "必須為這個欄位<#>輸入一個數值﹗";
     Text[ greek ] = "���������� �������� ��� ����� '#'.\n�������� �������� ��� ����!";
-    Text[ korean ] = "필드'#'에 입력을 해야 합니다.\n어떤 값을 입력하십시오!";
+    Text[ korean ] = "필드 '#'에 입력을 해야 합니다.\n값을 입력하십시오.";
     Text[ arabic ] = "����� ����� �� ����� '#'. ������ ����� ���� �� ����.";
     Text[ turkish ] = "Alan '#' i�in bir giri� yap�lmas� gerekiyor.\nL�tfen bir de�er girin!";
     Text[ language_user1 ] = " ";
@@ -142,60 +142,6 @@ String RID_ERR_DUPLICATE_NAME
     Text[ finnish ] = "Merkint� on jo k�yt�ss�.\nValitse toinen nimi.";
     Text[ thai ] = "รายการมีอยู่แล้ว\nกรุณาเลือกชื่ออื่น";
 };
-String RID_STR_NEW_FORM
-{
-    Text = "Neues Formular" ;
-    Text [ English ] = "New form" ;
-    Text [ portuguese ] = "Novo formul�rio" ;
-    Text [ english_us ] = "New form" ;
-    Text [ portuguese_brazilian ] = "Neues Formular" ;
-    Text [ swedish ] = "Nytt formul�r" ;
-    Text [ danish ] = "Ny formular" ;
-    Text [ italian ] = "Nuovo formulario" ;
-    Text [ spanish ] = "Nuevo formulario" ;
-    Text [ french ] = "Nouveau formulaire" ;
-    Text [ dutch ] = "Nieuw formulier" ;
-    Text[ chinese_simplified ] = "新表单";
-    Text[ russian ] = "������� �����";
-    Text[ polish ] = "Nowy formularz";
-    Text[ japanese ] = "新しいフォーム";
-    Text[ chinese_traditional ] = "新表單";
-    Text[ greek ] = "���������� ������";
-    Text[ korean ] = "새 양식";
-    Text[ arabic ] = "������� �����";
-    Text[ turkish ] = "Yeni form";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Formulari nou";
-    Text[ finnish ] = "Uusi lomake";
-    Text[ thai ] = "แบบฟอร์มใหม่";
-};
-String RID_STR_ALIGNMENT
-{
-    Text = "Links;Zentriert;Rechts" ;
-    Text [ English ] = "Left;Center;Right" ;
-    Text [ portuguese ] = "Esquerda;Centrado;Direita" ;
-    Text [ english_us ] = "Left;Center;Right" ;
-    Text [ portuguese_brazilian ] = "Links;Zentriert;Rechts" ;
-    Text [ swedish ] = "V�nster;Centrerat;H�ger" ;
-    Text [ danish ] = "Venstre;Centreret;H�jre" ;
-    Text [ italian ] = "a sinistra;al centro;a destra" ;
-    Text [ spanish ] = "Izquierda;Centrado;Derecha" ;
-    Text [ french ] = "Gauche;Centr�;Droite" ;
-    Text [ dutch ] = "Links;Gecentreerd;Rechts" ;
-    Text[ chinese_simplified ] = "向左;居中;向右";
-    Text[ russian ] = "�����;�� ������;������";
-    Text[ polish ] = "Do lewej;Wy�rodkowany;Do prawej";
-    Text[ japanese ] = "左揃え;中央揃え;右揃え";
-    Text[ chinese_traditional ] = "向左;置中;向右";
-    Text[ greek ] = "��������;������;�����";
-    Text[ korean ] = "왼쪽;가운데;오른쪽";
-    Text[ arabic ] = "������;�����;������";
-    Text[ turkish ] = "Sol;Orta;Sa�";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Esquerra;Centre;Dreta";
-    Text[ finnish ] = "Vasen;Keskitys;Oikea";
-    Text[ thai ] = "ซ้าย;ตรงกลาง;ขวา";
-};
 String RID_STR_LABEL
 {
     Text = "Titel" ;
@@ -215,7 +161,7 @@ String RID_STR_LABEL
     Text[ japanese ] = "タイトル";
     Text[ chinese_traditional ] = "標題";
     Text[ greek ] = "������";
-    Text[ korean ] = "제목";
+    Text[ korean ] = "레이블";
     Text[ arabic ] = "�������";
     Text[ turkish ] = "Ba�l�k";
     Text[ language_user1 ] = " ";
@@ -223,33 +169,6 @@ String RID_STR_LABEL
     Text[ finnish ] = "Selite";
     Text[ thai ] = "ป้ายชื่อ";
 };
-String RID_STR_CURSORTYPE
-{
-    Text = "Cursortyp" ;
-    Text [ English ] = "Cursor type" ;
-    Text [ english_us ] = "Cursor type" ;
-    Text [ portuguese_brazilian ] = "Cursortyp" ;
-    Text [ swedish ] = "Mark�rtyp" ;
-    Text [ danish ] = "Mark�rtype" ;
-    Text [ italian ] = "Tipo di cursore" ;
-    Text [ spanish ] = "Tipo de cursor" ;
-    Text [ french ] = "Type de curseur" ;
-    Text [ dutch ] = "Cursortype" ;
-    Text [ portuguese ] = "Tipo de cursor" ;
-    Text[ chinese_simplified ] = "光标类型";
-    Text[ russian ] = "��� �������";
-    Text[ polish ] = "Typ kursora";
-    Text[ japanese ] = "カーソルの種類";
-    Text[ chinese_traditional ] = "游標類型";
-    Text[ greek ] = "����� ������";
-    Text[ korean ] = "커서 유형";
-    Text[ arabic ] = "��� ������";
-    Text[ turkish ] = "�mle� tipi";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Tipus de cursor";
-    Text[ finnish ] = "Kohdistintyyppi";
-    Text[ thai ] = "ชนิดเคอร์เซอร์";
-};
 String RID_STR_ALIGN
 {
     Text = "Ausrichtung" ;
@@ -323,7 +242,7 @@ String RID_STR_BACKGROUNDCOLOR
     Text[ japanese ] = "背景色";
     Text[ chinese_traditional ] = "背景顏色";
     Text[ greek ] = "����� ������";
-    Text[ korean ] = "배경색";
+    Text[ korean ] = "배경 색상";
     Text[ arabic ] = "��� �������";
     Text[ turkish ] = "Artalan rengi";
     Text[ language_user1 ] = " ";
@@ -341,7 +260,7 @@ String RID_STR_BORDER
     Text [ swedish ] = "Ram" ;
     Text [ danish ] = "Ramme" ;
     Text [ italian ] = "Cornice" ;
-    Text [ spanish ] = "Marco" ;
+    Text [ spanish ] = "Borde" ;
     Text [ french ] = "Cadre" ;
     Text [ dutch ] = "Kader" ;
     Text[ chinese_simplified ] = "框";
@@ -358,33 +277,6 @@ String RID_STR_BORDER
     Text[ finnish ] = "Reuna";
     Text[ thai ] = "เส้นขอบ";
 };
-String RID_STR_BORDER_TYPE
-{
-    Text = "Ohne Rahmen;3D-Look;Flach" ;
-    Text [ English ] = "Transparence;3D-Look;Flat" ;
-    Text [ portuguese ] = "Sem moldura;3D-Look;Plano" ;
-    Text [ english_us ] = "Without frame;3D look;Flat" ;
-    Text [ portuguese_brazilian ] = "Transparent;3D-Look;Flach" ;
-    Text [ swedish ] = "Utan ram;3D-look;Platt" ;
-    Text [ danish ] = "Uden ramme;3D-look;Flad" ;
-    Text [ italian ] = "Senza cornice;3D;Piano" ;
-    Text [ spanish ] = "Sin marco;3D-Look;Plano" ;
-    Text [ french ] = "Sans cadre;3D;Plat" ;
-    Text [ dutch ] = "Zonder kader;3D-look;vlak" ;
-    Text[ chinese_simplified ] = "无框;3 维显示;平面";
-    Text[ russian ] = "��� �����;���������� ���;�������";
-    Text[ polish ] = "Prze�roczysty;Ustawienie 3-W;P�aski";
-    Text[ japanese ] = "枠なし;3D ルック;平たい";
-    Text[ chinese_traditional ] = "無框;3D 顯示;平面";
-    Text[ greek ] = "����� �������;�������� 3�;�������";
-    Text[ korean ] = "프레임 없이;3D 보기;평면";
-    Text[ arabic ] = "���� ����;���� ����� �������; ������";
-    Text[ turkish ] = "�er�evesiz;3B g�r�n�m;D�z";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Sense marc;3D-Look;Pla";
-    Text[ finnish ] = "Ilman kehyst�;3D-ulkoasu;Litte�";
-    Text[ thai ] = "ไม่มีกรอบ;มองแบบ3มิติ;แบน";
-};
 String RID_STR_DEFAULT_CONTROL
 {
     Text = "Standardkontrollelement" ;
@@ -431,7 +323,7 @@ String RID_STR_HSCROLL
     Text[ japanese ] = "水平スクロールバー";
     Text[ chinese_traditional ] = "水平式捲軸";
     Text[ greek ] = "��������� ������ �������";
-    Text[ korean ] = "수평 스크롤바";
+    Text[ korean ] = "수평 스크롤 막대";
     Text[ arabic ] = "���� ����� ������ ������";
     Text[ turkish ] = "Yatay kayd�rma �ubu�u";
     Text[ language_user1 ] = " ";
@@ -458,7 +350,7 @@ String RID_STR_VSCROLL
     Text[ japanese ] = "垂直スクロールバー";
     Text[ chinese_traditional ] = "垂直式捲軸";
     Text[ greek ] = "���������� ������ �������";
-    Text[ korean ] = "수직 스크롤바";
+    Text[ korean ] = "수직 스크롤 막대";
     Text[ arabic ] = "���� ����� ������ ������";
     Text[ turkish ] = "Dikey kayd�rma �ubu�u";
     Text[ language_user1 ] = " ";
@@ -562,12 +454,12 @@ String RID_STR_TABSTOP
     Text [ french ] = "Tabstop" ;
     Text [ dutch ] = "Tabstop" ;
     Text[ chinese_simplified ] = "制表符";
-    Text[ russian ] = "��������� Tab";
+    Text[ russian ] = "��������� ���������";
     Text[ polish ] = "Tabstop";
     Text[ japanese ] = "タブストップ";
     Text[ chinese_traditional ] = "定位鍵";
     Text[ greek ] = "����������";
-    Text[ korean ] = "탭 위치";
+    Text[ korean ] = "탭 설정 위치";
     Text[ arabic ] = "����� �����";
     Text[ turkish ] = "Sekme dura��";
     Text[ language_user1 ] = " ";
@@ -828,7 +720,7 @@ String RID_STR_ALLOW_DELETIONS
     Text [ swedish ] = "Radera data" ;
     Text [ danish ] = "Slet data" ;
     Text [ italian ] = "Elimina dati" ;
-    Text [ spanish ] = "Eliminar datos" ;
+    Text [ spanish ] = "Borrar datos" ;
     Text [ french ] = "Supprimer les donn�es" ;
     Text [ dutch ] = "Gegevens wissen" ;
     Text[ chinese_simplified ] = "删除数据";
@@ -855,7 +747,7 @@ String RID_STR_ALLOW_EDITS
     Text [ swedish ] = "�ndra data" ;
     Text [ danish ] = "Modificer data" ;
     Text [ italian ] = "Modifica dati" ;
-    Text [ spanish ] = "Modificar datos" ;
+    Text [ spanish ] = "Permitir modificaciones" ;
     Text [ french ] = "Modifier les donn�es" ;
     Text [ dutch ] = "Gegevens wijzigen" ;
     Text[ chinese_simplified ] = "更改数据";
@@ -916,7 +808,7 @@ String RID_STR_DATASOURCE
     Text[ polish ] = "�r�d�o danych";
     Text[ portuguese_brazilian ] = "Datenbank";
     Text[ japanese ] = "データソース";
-    Text[ korean ] = "데이터 소스";
+    Text[ korean ] = "데이터 원본";
     Text[ chinese_simplified ] = "数据源";
     Text[ chinese_traditional ] = "資料源";
     Text[ turkish ] = "Veritaban�";
@@ -926,33 +818,6 @@ String RID_STR_DATASOURCE
     Text[ language_user1 ] = " ";
     Text[ thai ] = "แหล่งข้อมูล";
 };
-String RID_STR_LOCKED
-{
-    Text = "Gesperrt" ;
-    Text [ English ] = "Locked" ;
-    Text [ portuguese ] = "Expandido" ;
-    Text [ english_us ] = "Locked" ;
-    Text [ portuguese_brazilian ] = "Gesperrt" ;
-    Text [ swedish ] = "Sp�rrat" ;
-    Text [ danish ] = "L�st" ;
-    Text [ italian ] = "Bloccato" ;
-    Text [ spanish ] = "Protegido" ;
-    Text [ french ] = "Verrouill�" ;
-    Text [ dutch ] = "Beveiligd" ;
-    Text[ chinese_simplified ] = "锁定的";
-    Text[ russian ] = "�������������";
-    Text[ polish ] = "Ochrona";
-    Text[ japanese ] = "ロックする";
-    Text[ chinese_traditional ] = "鎖定的";
-    Text[ greek ] = "����������";
-    Text[ korean ] = "장평";
-    Text[ arabic ] = "����";
-    Text[ turkish ] = "Kilitli";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Blocat";
-    Text[ finnish ] = "Lukittu";
-    Text[ thai ] = "ล็อค";
-};
 String RID_STR_MASTERFIELDS
 {
     Text = "Verkn�pfen von" ;
@@ -972,7 +837,7 @@ String RID_STR_MASTERFIELDS
     Text[ japanese ] = "リンク元";
     Text[ chinese_traditional ] = "連結到";
     Text[ greek ] = "������� ���";
-    Text[ korean ] = "연결";
+    Text[ korean ] = "마스터 필드 연결";
     Text[ arabic ] = "���";
     Text[ turkish ] = "Ba�lant� ��eleri";
     Text[ language_user1 ] = " ";
@@ -999,7 +864,7 @@ String RID_STR_SLAVEFIELDS
     Text[ japanese ] = "リンク先";
     Text[ chinese_traditional ] = "連結到";
     Text[ greek ] = "������� ��";
-    Text[ korean ] = "연결";
+    Text[ korean ] = "슬레이브 필드 연결";
     Text[ arabic ] = "������ ��";
     Text[ turkish ] = "Alt alanlar";
     Text[ language_user1 ] = " ";
@@ -1007,60 +872,6 @@ String RID_STR_SLAVEFIELDS
     Text[ finnish ] = "Linkit� alisteiset kent�t";
     Text[ thai ] = "เชื่อมโยงเขตข้อมูลแบบทาส";
 };
-String RID_STR_CURSOR_TYPE
-{
-    Text = "Statisch;Dynamisch" ;
-    Text [ English ] = "Static;Dynamic" ;
-    Text [ portuguese ] = "Est�tico;Din�mico" ;
-    Text [ english_us ] = "Static;Dynamic" ;
-    Text [ portuguese_brazilian ] = "Statisch;Dynamisch" ;
-    Text [ swedish ] = "Statisk;Dynamisk" ;
-    Text [ danish ] = "Statisk;Dynamisk" ;
-    Text [ italian ] = "Statico;dinamico" ;
-    Text [ spanish ] = "Est�tico;Din�mico" ;
-    Text [ french ] = "Statique;Dynamique" ;
-    Text [ dutch ] = "Statisch;Dynamisch" ;
-    Text[ chinese_simplified ] = "静态;动态";
-    Text[ russian ] = "��������;���������";
-    Text[ polish ] = "Statyczny;Dynamiczny";
-    Text[ japanese ] = "静的;動的";
-    Text[ chinese_traditional ] = "靜態;最適";
-    Text[ greek ] = "�������;��������";
-    Text[ korean ] = "정적;동적";
-    Text[ arabic ] = "����;��������";
-    Text[ turkish ] = "Statik;Dinamik";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Est�tic;Din�mic";
-    Text[ finnish ] = "Staattinen;Dynaaminen";
-    Text[ thai ] = "คงที่;พลวัต";
-};
-String RID_STR_EVENTS
-{
-    Text = "Ereignisse" ;
-    Text [ English ] = "Events" ;
-    Text [ portuguese ] = "Eventos" ;
-    Text [ english_us ] = "Events" ;
-    Text [ portuguese_brazilian ] = "Ereignisse" ;
-    Text [ swedish ] = "H�ndelser" ;
-    Text [ danish ] = "Begivenheder" ;
-    Text [ italian ] = "Eventi" ;
-    Text [ spanish ] = "Acontecimientos" ;
-    Text [ french ] = "�v�nements" ;
-    Text [ dutch ] = "Gebeurtenissen" ;
-    Text[ chinese_simplified ] = "事件";
-    Text[ russian ] = "�������";
-    Text[ polish ] = "Wydarzenia";
-    Text[ japanese ] = "イベント";
-    Text[ chinese_traditional ] = "動作";
-    Text[ greek ] = "��������";
-    Text[ korean ] = "이벤트";
-    Text[ arabic ] = "�������";
-    Text[ turkish ] = "Olaylar";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Esdeveniments";
-    Text[ finnish ] = "Tapahtumat";
-    Text[ thai ] = "เหตุการณ์";
-};
 String RID_STR_FORMS
 {
     Text = "Formulare" ;
@@ -1107,7 +918,7 @@ String RID_STR_NO_PROPERTIES
     Text[ japanese ] = "コントロール要素の選択なし、あるいは混合選択";
     Text[ chinese_traditional ] = "沒有選取控制項或是一個混合的選取";
     Text[ greek ] = "��� ����� ������� ��������� �������";
-    Text[ korean ] = "컨트롤 요소가 선택되지 않았거나 혼합된 선택임";
+    Text[ korean ] = "컨트롤을 선택하지 않음";
     Text[ arabic ] = "�� ��� ����� ���� ���� �� �� ��� ����� �����";
     Text[ turkish ] = "Komut ��esi se�ilmedi ya da karma se�im yap�ld�.";
     Text[ language_user1 ] = " ";
@@ -1135,7 +946,7 @@ String RID_STR_PROPERTIES_CONTROL
     Text[ japanese ] = "属性 ";
     Text[ chinese_traditional ] = "屬性： ";
     Text[ greek ] = "���������: ";
-    Text[ korean ] = "등록정보: ";
+    Text[ korean ] = "등록 정보: ";
     Text[ arabic ] = "�������: ";
     Text[ turkish ] = "�zellikler: ";
     Text[ language_user1 ] = " ";
@@ -1143,33 +954,6 @@ String RID_STR_PROPERTIES_CONTROL
     Text[ finnish ] = "Ominaisuudet: ";
     Text[ thai ] = "คุณสมบัติ: ";
 };
-String RID_STR_PROPERTIES_COLUMN
-{
-    Text = "Spalten-Eigenschaften: " ;
-    Text [ English ] = "Column properties: " ;
-    Text [ portuguese ] = "Propriedades das colunas:  " ;
-    Text [ english_us ] = "Column properties: " ;
-    Text [ portuguese_brazilian ] = "Spalten-Eigenschaften" ;
-    Text [ swedish ] = "Kolumnegenskaper:  " ;
-    Text [ danish ] = "Kolonneegenskaber: " ;
-    Text [ italian ] = "Propriet� colonne:  " ;
-    Text [ spanish ] = "Propiedades de las columnas: " ;
-    Text [ french ] = "Propri�t�s de la colonne : " ;
-    Text [ dutch ] = "Kolomeigenschappen: " ;
-    Text[ chinese_simplified ] = "列属性： ";
-    Text[ russian ] = "�������� ��������: ";
-    Text[ polish ] = "W�a�ciwo�ci kolumny ";
-    Text[ japanese ] = "列の属性 ";
-    Text[ chinese_traditional ] = "欄屬性： ";
-    Text[ greek ] = "��������� ������: ";
-    Text[ korean ] = "열 등록정보: ";
-    Text[ arabic ] = "����� �������: ";
-    Text[ turkish ] = "S�tun ��eleri: ";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Propietats de la columna: ";
-    Text[ finnish ] = "Sarakkeen ominaisuudet: ";
-    Text[ thai ] = "คุณสมบัติของคอลัมน์: ";
-};
 String RID_STR_PROPERTIES_FORM
 {
     Text = "Formular-Eigenschaften" ;
@@ -1189,7 +973,7 @@ String RID_STR_PROPERTIES_FORM
     Text[ japanese ] = "フォームの属性";
     Text[ chinese_traditional ] = "表單屬性";
     Text[ greek ] = "��������� ������";
-    Text[ korean ] = "양식 등록정보";
+    Text[ korean ] = "양식 등록 정보";
     Text[ arabic ] = "����� ���������";
     Text[ turkish ] = "Form �zellikleri";
     Text[ language_user1 ] = " ";
@@ -1211,7 +995,7 @@ String RID_STR_FMEXPLORER
     Text [ french ] = "Navigateur de formulaires" ;
     Text [ dutch ] = "Formulier-navigator" ;
     Text[ chinese_simplified ] = "表单助手";
-    Text[ russian ] = "��������� �����";
+    Text[ russian ] = "��������� ����";
     Text[ polish ] = "Nawigator formularza";
     Text[ japanese ] = "フォーム ナビゲータ";
     Text[ chinese_traditional ] = "表單助手";
@@ -1224,192 +1008,6 @@ String RID_STR_FMEXPLORER
     Text[ finnish ] = "Lomakkeen etsin";
     Text[ thai ] = "ตัวนำของแบบฟอร์ม";
 };
-String RID_STR_LISTSOURCE_TYPE
-{
-    Text = "Werteliste;Tabelle;Abfrage;Sql;Sql [Native];Tabellenfelder" ;
-    Text [ English ] = "Valuelist;Table;Query;Sql;Sql [Native];Tablefields" ;
-    Text [ portuguese ] = "Lista de valores;Tabela; Consulta; Sql;Sql [Native];Campos de tabela" ;
-    Text [ english_us ] = "Valuelist;Table;Query;Sql;Sql [Native];Tablefields" ;
-    Text [ portuguese_brazilian ] = "Werteliste;Tabelle;Abfrage;Sql;Sql [Native];Tabellenfelder" ;
-    Text [ swedish ] = "V�rdelista;Tabell;S�kning;Sql;Sql [Native];Tabellf�lt" ;
-    Text [ danish ] = "V�rdiliste;Tabel;Foresp�rgsel;Sql;Sql [native];Tabelfelter" ;
-    Text [ italian ] = "Lista valori;Tabella;Ricerca;Sql;Sql [native];Campi tabella" ;
-    Text [ spanish ] = "Lista de valores;Tabla;Consulta;Sql;Sql [Native];Campos de tablas" ;
-    Text [ french ] = "Liste de valeurs;Table;Requ�te;Sql;Sql [Natif];Champs de table" ;
-    Text [ dutch ] = "Waardenlijst;Tabel;Query;Sql;Sql [Native];Tabelvelden" ;
-    Text[ chinese_simplified ] = "数值列单;表格;查询;Sql;Sql [Native];工作表字段";
-    Text[ russian ] = "������ ��������;�������;������;Sql;Sql [\"������\"];���� �������";
-    Text[ polish ] = "Lista warto�ci;Tabela;Kwerenda;Sql;Sql [Native];Pola tabeli";
-    Text[ japanese ] = "値リスト;テーブル;クエリー;Sql;Sql [Native];テーブルフィールド";
-    Text[ greek ] = "����� �����;�������;�������;Sql;Sql [Native];����� �������";
-    Text[ korean ] = "값 목록;시트;질의;Sql;Sql [Native];시트 필드";
-    Text[ chinese_traditional ] = "數值清單;表格;查詢;Sql;Sql [Native];表格欄位";
-    Text[ arabic ] = "����� ���;����;�������;Sql;Sql [Native]���� ����";
-    Text[ turkish ] = "De�er listesi;Tablo;Sorgu;Sql;Sql [Native];Tablo alanlar�";
-    Text[ catalan ] = "Llista de valors;Taula;Consulta;Sql;Sql [Nadiu];Camps taula";
-    Text[ finnish ] = "Arvoluettelo;Taulukko;Kysely;Sql;Sql [suora];Taulukkokent�t";
-    Text[ thai ] = "รายการค่า;ตาราง;แบบสอบถาม;Sql;Sql [โดยกำเนิด];เขตข้อมูลตาราง";
-};
-String RID_STR_CURSORSOURCE_TYPE
-{
-    Text = "Tabelle;Abfrage;SQL-Befehl" ;
-    Text [ English ] = "Table;Query;Sql;Sql [Native]" ;
-    Text [ english_us ] = "Table;Query;SQL command" ;
-    Text [ portuguese_brazilian ] = "Tabelle;Abfrage;Sql;Sql [Native]" ;
-    Text [ swedish ] = "Tabell;S�kning;SQL-kommando" ;
-    Text [ danish ] = "Tabel;Foresp�rgsel;SQL-kommando" ;
-    Text [ italian ] = "Tabella;Ricerca;Comando SQL" ;
-    Text [ spanish ] = "Tabla;Consulta;Comando SQL" ;
-    Text [ french ] = "Table;Requ�te;Instruction SQL" ;
-    Text [ dutch ] = "Tabel;Query;Sql-opdracht" ;
-    Text [ portuguese ] = "Tabela;Consulta;Comando SQL" ;
-    Text[ chinese_simplified ] = "表格;查询;Sql 指令";
-    Text[ russian ] = "�������;������;������� SQL";
-    Text[ polish ] = "Tabela;kwerenda;polecenie SQL";
-    Text[ japanese ] = "テーブル;クエリー;SQL コマンド";
-    Text[ chinese_traditional ] = "表格;查詢;Sql;Sql [Native]";
-    Text[ greek ] = "�������;�������;������ SQL";
-    Text[ korean ] = "시트;질의;SQL 명령";
-    Text[ arabic ] = "����;�������;��� SQL";
-    Text[ turkish ] = "Tablo;Sorgu;SQL komutu";
-    Text[ catalan ] = "Taula;Consulta;Ordre SQL";
-    Text[ finnish ] = "Taulukko;Kysely;SQL-komento";
-    Text[ thai ] = "ตาราง;แบบสอบถาม;คำสั่ง SQL ";
-};
-String RID_STR_COMMAND_TYPE
-{
-    Text = "Tabelle;Abfrage;SQL-Befehl";
-    Text [ English ] = "Table;Query;SQL command";
-    Text [ english_us ] = "Table;Query;SQL command";
-    Text[ portuguese ] = "Tabela;Consulta;Comando SQL";
-    Text[ russian ] = "�������;������;������� SQL";
-    Text[ greek ] = "�������;�������;������ SQL";
-    Text[ dutch ] = "Tabel;Query;SQL-opdracht";
-    Text[ french ] = "Table;Requ�te;Instruction SQL";
-    Text[ spanish ] = "Tabla;consulta;comando SQL";
-    Text[ italian ] = "Tabella;Ricerca;Comando SQL";
-    Text[ danish ] = "Tabel;Foresp�rgsel;SQL-kommando";
-    Text[ swedish ] = "Tabell;S�kning;SQL-kommando";
-    Text[ polish ] = "Tabela;Kwerenda;Polecenie SQL";
-    Text[ portuguese_brazilian ] = ";Query;Table;SQL command";
-    Text[ japanese ] = "テーブル;クエリー;SQL コマンド";
-    Text[ korean ] = "시트;질의;SQL 명령";
-    Text[ chinese_simplified ] = "表格;查询;SQL 指令";
-    Text[ chinese_traditional ] = "查詢;表單;SQL 指令";
-    Text[ arabic ] = "����;�������;��� SQL";
-    Text[ turkish ] = "Tablo;Sorgu;SQL komutu";
-    Text[ catalan ] = "Taula;Consulta;Ordre SQL";
-    Text[ finnish ] = "Taulukko;Kysely;SQL-komento";
-    Text[ thai ] = "ตาราง;แบบสอบถาม;คำสั่ง SQL ";
-};
-String RID_STR_SEARCHING
-{
-    Text = "Suchfeld" ;
-    Text [ English ] = "Searchfield" ;
-    Text [ portuguese ] = "Campo de procura" ;
-    Text [ english_us ] = "Search field" ;
-    Text [ portuguese_brazilian ] = "Suchfeld" ;
-    Text [ swedish ] = "S�kf�lt" ;
-    Text [ danish ] = "S�gefelt" ;
-    Text [ italian ] = "Campo di ricerca" ;
-    Text [ spanish ] = "Campo de b�squeda" ;
-    Text [ french ] = "Champ de recherche" ;
-    Text [ dutch ] = "Zoekveld" ;
-    Text[ chinese_simplified ] = "搜寻字段";
-    Text[ russian ] = "���� ������";
-    Text[ polish ] = "Pole wyszukiwania";
-    Text[ japanese ] = "検索フィールド";
-    Text[ chinese_traditional ] = "搜尋欄位";
-    Text[ greek ] = "����� ����������";
-    Text[ korean ] = "찾기 필드";
-    Text[ arabic ] = "��� �����";
-    Text[ turkish ] = "Arama alan�";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Camp de cerca";
-    Text[ finnish ] = "Hakukentt�";
-    Text[ thai ] = "ค้นหาเขตข้อมูล";
-};
-String RID_STR_SEARCH_TYPE
-{
-    Text = "Nein;Aktiv;Passiv" ;
-    Text [ English ] = "No;Active;Passive" ;
-    Text [ portuguese ] = "N�o;Activo;Passivo" ;
-    Text [ english_us ] = "No;Active;Passive" ;
-    Text [ portuguese_brazilian ] = "Nein;Aktiv;Passiv" ;
-    Text [ swedish ] = "Nej;Aktiv;Passiv" ;
-    Text [ danish ] = "Nej;Aktiv;Passiv" ;
-    Text [ italian ] = "No;Attivo:Passivo" ;
-    Text [ spanish ] = "No;Activo;Pasivo" ;
-    Text [ french ] = "Non;Actif;Passif" ;
-    Text [ dutch ] = "Nee;Actief;Passief" ;
-    Text[ chinese_simplified ] = "否;主动;被动";
-    Text[ russian ] = "���;��������;���������";
-    Text[ polish ] = "Nie;Aktywny;Pasywny";
-    Text[ japanese ] = "いいえ;アクティブ;スリープ";
-    Text[ chinese_traditional ] = "否;主動;被動";
-    Text[ greek ] = "���;������;��������";
-    Text[ korean ] = "아니오;능동;수동";
-    Text[ arabic ] = "�Ǻ���������";
-    Text[ turkish ] = "Hay�r;Etkin;Etkin de�il";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "No;Actiu;Pasiu";
-    Text[ finnish ] = "Ei;Aktiivinen;Passiivinen";
-    Text[ thai ] = "ไม่;กระทำ;ถูกกระทำ";
-};
-String RID_STR_BOOL
-{
-    Text = "Nein;Ja" ;
-    Text [ English ] = "No;Yes" ;
-    Text [ portuguese ] = "N�o;Sim" ;
-    Text [ english_us ] = "No;Yes" ;
-    Text [ portuguese_brazilian ] = "Nein;Ja" ;
-    Text [ swedish ] = "Nej;Ja" ;
-    Text [ danish ] = "Nej;Ja" ;
-    Text [ italian ] = "No;S�" ;
-    Text [ spanish ] = "No;S�" ;
-    Text [ french ] = "Non;Oui" ;
-    Text [ dutch ] = "Nee;Ja" ;
-    Text[ chinese_simplified ] = "否;是";
-    Text[ russian ] = "���;��";
-    Text[ polish ] = "Nie;Tak";
-    Text[ japanese ] = "いいえ;はい";
-    Text[ chinese_traditional ] = "否;是";
-    Text[ greek ] = "���-���";
-    Text[ korean ] = "아니오;예";
-    Text[ arabic ] = "��;���";
-    Text[ turkish ] = "Hay�r;Evet";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "No;S�";
-    Text[ finnish ] = "Ei;Kyll�";
-    Text[ thai ] = "ไม่ใช่;ใช่";
-};
-String RID_STR_PROPPAGE_DEFAULT_TITLE
-{
-    Text = "Allgemein" ;
-    Text [ English ] = "Common" ;
-    Text [ portuguese ] = "Geral" ;
-    Text [ english_us ] = "General" ;
-    Text [ portuguese_brazilian ] = "Allgemein" ;
-    Text [ swedish ] = "Allm�nt" ;
-    Text [ danish ] = "Generelt" ;
-    Text [ italian ] = "Generale" ;
-    Text [ spanish ] = "General" ;
-    Text [ french ] = "G�n�ral" ;
-    Text [ dutch ] = "Algemeen" ;
-    Text[ chinese_simplified ] = "常规";
-    Text[ russian ] = "�����";
-    Text[ polish ] = "Og�lne";
-    Text[ japanese ] = "全般";
-    Text[ chinese_traditional ] = "一般";
-    Text[ greek ] = "������";
-    Text[ korean ] = "일반";
-    Text[ arabic ] = "���";
-    Text[ turkish ] = "Genel";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "General";
-    Text[ finnish ] = "Yleiset";
-    Text[ thai ] = "ทั่วไป";
-};
 String RID_STR_FORM
 {
     Text = "Formular" ;
@@ -1437,60 +1035,6 @@ String RID_STR_FORM
     Text[ finnish ] = "Lomake";
     Text[ thai ] = "แบบฟอร์ม";
 };
-String RID_STR_PROPPAGE_FORMCTL_TITLE
-{
-    Text = "Daten" ;
-    Text [ English ] = "Data" ;
-    Text [ portuguese ] = "Dados" ;
-    Text [ english_us ] = "Data" ;
-    Text [ portuguese_brazilian ] = "Daten" ;
-    Text [ swedish ] = "Data" ;
-    Text [ danish ] = "Data" ;
-    Text [ italian ] = "Dati" ;
-    Text [ spanish ] = "Datos" ;
-    Text [ french ] = "Donn�es" ;
-    Text [ dutch ] = "Gegevens" ;
-    Text[ chinese_simplified ] = "数据";
-    Text[ russian ] = "������";
-    Text[ polish ] = "Dane";
-    Text[ japanese ] = "配列";
-    Text[ chinese_traditional ] = "資料";
-    Text[ greek ] = "��������";
-    Text[ korean ] = "데이터";
-    Text[ arabic ] = "������";
-    Text[ turkish ] = "Veriler";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Dades";
-    Text[ finnish ] = "Tiedot";
-    Text[ thai ] = "ข้อมูล";
-};
-String RID_STR_PROPPAGE_UNOCTL_TITLE
-{
-    Text = "Kontrollelement" ;
-    Text [ English ] = "Control" ;
-    Text [ portuguese ] = "Controlo" ;
-    Text [ english_us ] = "Control" ;
-    Text [ portuguese_brazilian ] = "Control" ;
-    Text [ swedish ] = "Kontrollelement" ;
-    Text [ danish ] = "Kontrolelement" ;
-    Text [ italian ] = "Elemento di controllo" ;
-    Text [ spanish ] = "Elemento de control" ;
-    Text [ french ] = "�l�ment de contr�le" ;
-    Text [ dutch ] = "Controle-element" ;
-    Text[ chinese_simplified ] = "控制";
-    Text[ russian ] = "������� ����������";
-    Text[ polish ] = "Formant";
-    Text[ japanese ] = "コントロール要素";
-    Text[ chinese_traditional ] = "控制項";
-    Text[ greek ] = "�������� �������";
-    Text[ korean ] = "컨트롤";
-    Text[ arabic ] = "���� ����";
-    Text[ turkish ] = "Komut ��esi";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Control";
-    Text[ finnish ] = "Ohjausobjekti";
-    Text[ thai ] = "ควบคุม";
-};
 String RID_STR_TABWIN_PREFIX
 {
     Text = "Tabelle;Abfrage;Sql;Sql [Native]" ;
@@ -1505,12 +1049,12 @@ String RID_STR_TABWIN_PREFIX
     Text [ french ] = "Table;Requ�te;Sql;Sql [Natif]" ;
     Text [ dutch ] = "Tabel;Query;Sql;Sql [Native]" ;
     Text[ chinese_simplified ] = "表格;查询;Sql;Sql [Native]";
-    Text[ russian ] = "�������;������;Sql;Sql [\"������\"]";
+    Text[ russian ] = "�������;������;Sql;Sql [Native]";
     Text[ polish ] = "Tabela;Kwerenda;Sql; [Native]";
     Text[ japanese ] = "テーブル;クエリー;Sql;Sql [Native]";
     Text[ chinese_traditional ] = "表格;查詢;選擇;Sql";
     Text[ greek ] = "�������;�������;Sql;Sql [Native]";
-    Text[ korean ] = "시트;질의;Sql;Sql [Native]";
+    Text[ korean ] = "테이블;쿼리;Sql;Sql [Native]";
     Text[ arabic ] = "����;�������;Sql;Sql [Native]";
     Text[ turkish ] = "Tablo;Sorgu;Sql;Sql [Native]";
     Text[ catalan ] = "Taula;Consulta;Sql;Sql [Nadiu]";
@@ -1548,33 +1092,6 @@ String RID_STR_STDFORMNAME
 {
     Text = "Standard" ;
 };
-String RID_STR_STANDARD
-{
-    Text = "Standard" ;
-    Text [ ENGLISH ] = "Standard" ;
-    Text [ portuguese ] = "Padr�o" ;
-    Text [ english_us ] = "Standard" ;
-    Text [ portuguese_brazilian ] = "Standard" ;
-    Text [ swedish ] = "Standard" ;
-    Text [ danish ] = "Standard" ;
-    Text [ italian ] = "Standard" ;
-    Text [ spanish ] = "Predeterminado" ;
-    Text [ french ] = "Standard" ;
-    Text [ dutch ] = "Standaard" ;
-    Text[ chinese_simplified ] = "标准";
-    Text[ russian ] = "��������";
-    Text[ polish ] = "Domy�lnie";
-    Text[ japanese ] = "標準";
-    Text[ chinese_traditional ] = "標準";
-    Text[ greek ] = "����������";
-    Text[ korean ] = "표준";
-    Text[ arabic ] = "�����";
-    Text[ turkish ] = "Standart";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Predeterminat";
-    Text[ finnish ] = "Vakio";
-    Text[ thai ] = "มาตรฐาน";
-};
 String RID_STR_FORMATTED_CLASSNAME
 {
     Text = "FormattedField";
@@ -1728,7 +1245,7 @@ String RID_STR_REC_FROM_TEXT
     Text[ japanese ] = "候補";
     Text[ chinese_traditional ] = "總計";
     Text[ greek ] = "���";
-    Text[ korean ] = "의";
+    Text[ korean ] = "총계";
     Text[ arabic ] = "��";
     Text[ turkish ] = "�lk";
     Text[ language_user1 ] = " ";
@@ -1790,61 +1307,6 @@ String RID_STR_FIELDSELECTION
     Text[ language_user1 ] = " ";
     Text[ thai ] = "เลือกเขตข้อมูล:";
 };
-String RID_STR_FIELDNULL
-{
-    Text = "<leer>" ;
-    Text [ English ] = "<empty>" ;
-    Text [ portuguese ] = "<vazio>" ;
-    Text [ english_us ] = "<blank>" ;
-    Text [ portuguese_brazilian ] = "<leer>" ;
-    Text [ swedish ] = "<tom>" ;
-    Text [ danish ] = "<tom>" ;
-    Text [ italian ] = "<vuoto>" ;
-    Text [ spanish ] = "<vac�o>" ;
-    Text [ french ] = "<vide>" ;
-    Text [ dutch ] = "<leeg>" ;
-    Text[ chinese_simplified ] = "<空>";
-    Text[ russian ] = "<�����>";
-    Text[ polish ] = "<pusty>";
-    Text[ japanese ] = "<空白>";
-    Text[ chinese_traditional ] = "<空>";
-    Text[ greek ] = "<����>";
-    Text[ korean ] = "<비어 있음>";
-    Text[ arabic ] = "<����>";
-    Text[ turkish ] = "<Bo�>";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "<blanc>";
-    Text[ finnish ] = "<tyhj�>";
-    Text[ thai ] = "<ช่องว่าง>";
-};
-String RID_STR_READERROR
-{
-    Text = "Fehler beim Lesen von Daten aus der Datenbank" ;
-    Text [ ENGLISH ] = "Error while reading data from database" ;
-    Text [ norwegian ] = "Feil ved lesing av data fra database" ;
-    Text [ italian ] = "Errore durante la lettura di dati dal database" ;
-    Text [ portuguese_brazilian ] = "Erro ao ler dados da base de dados" ;
-    Text [ portuguese ] = "Erro ao ler dados da base de dados" ;
-    Text [ finnish ] = "On ilmennyt virhe luettaessa tietokannan tietoja." ;
-    Text [ danish ] = "Fejl under l�sning af data fra databasen" ;
-    Text [ french ] = "Erreur lors de la lecture des donn�es de la base de donn�es" ;
-    Text [ swedish ] = "Fel vid l�sning av data fr�n databasen" ;
-    Text [ dutch ] = "Fout bij lezen van gegevens in database" ;
-    Text [ spanish ] = "Error al leer los datos de la base de datos" ;
-    Text [ english_us ] = "Error reading data from database" ;
-    Text[ chinese_simplified ] = "在读取数据库数据时发生错误";
-    Text[ russian ] = "������ ������ ������ �� ���� ������";
-    Text[ polish ] = "B��d podczas odczytu danych z bazy danych";
-    Text[ japanese ] = "データベースからのデータ読み取りの際のエラー";
-    Text[ chinese_traditional ] = "讀取資料庫時發生錯誤";
-    Text[ greek ] = "������ ���� ��� �������� ��������� ��� �� ���� ���������";
-    Text[ korean ] = "데이터베이스에서 데이터를 읽을 때 오류 발생";
-    Text[ arabic ] = "��� ��� ����� ����� ������ �� ����� ��������";
-    Text[ turkish ] = "Veritaban�ndan veri okuma s�ras�nda hata";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "S'ha produ�t un error en llegir la base de dades";
-    Text[ thai ] = "การอ่านข้อมูลจากฐานข้อมูลผิดพลาด";
-};
 String RID_STR_WRITEERROR
 {
     Text = "Fehler beim Schreiben von Daten in die Datenbank" ;
@@ -1872,88 +1334,6 @@ String RID_STR_WRITEERROR
     Text[ finnish ] = "Virhe kirjoitettaessa tietoja tietokantaan.";
     Text[ thai ] = "การเขียนข้อมูลไปยังฐานข้อมูลผิดพลาด";
 };
-String RID_STR_DELETEERROR
-{
-    Text = "Fehler beim L�schen von Daten. " ;
-    Text [ ENGLISH ] = "Error while deleting data" ;
-    Text [ english_us ] = "Error deleting data. " ;
-    Text [ portuguese_brazilian ] = "Fehler beim Loeschen von Daten. " ;
-    Text [ swedish ] = "Fel vid radering av data.   " ;
-    Text [ danish ] = "Fejl ved sletning af data. " ;
-    Text [ italian ] = "Errore nel cancellare dati.  " ;
-    Text [ spanish ] = "Error al eliminar datos. " ;
-    Text [ french ] = "Erreur lors de la suppression de donn�es. " ;
-    Text [ dutch ] = "Fout bij wissen van gegevens. " ;
-    Text [ portuguese ] = "Erro ao eliminar dados.  " ;
-    Text[ chinese_simplified ] = "在删除数据时发生错误 ";
-    Text[ russian ] = "������ �������� ������. ";
-    Text[ polish ] = "B��d przy usuwaniu danych. ";
-    Text[ japanese ] = "データ削除時のエラー｡ ";
-    Text[ chinese_traditional ] = "在刪除資料時發生一個錯誤 ";
-    Text[ greek ] = "������ ���� �� �������� ���������. ";
-    Text[ korean ] = "데이터 삭제시 오류. ";
-    Text[ arabic ] = "��� ����� ��� ������. ";
-    Text[ turkish ] = "Veri silme s�ras�nda hata. ";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "S'ha produ�t un error en eliminar les dades. ";
-    Text[ finnish ] = "Virhe tietoja poistettaessa. ";
-    Text[ thai ] = "การลบข้อมูลผิดพลาด ";
-};
-String RID_STR_ERR_CONNECTLOST
-{
-    Text = "Die Verbindung zur Datenbank ist unterbrochen." ;
-    Text [ ENGLISH ] = "Connection to database lost." ;
-    Text [ english_us ] = "Connection to database lost." ;
-    Text [ portuguese ] = "Cancelada a liga��o � base de dados." ;
-    Text [ portuguese_brazilian ] = "Die Verbindung zur Datenbank ist unterbrochen." ;
-    Text [ swedish ] = "F�rbindelsen till databasen �r avbruten." ;
-    Text [ danish ] = "Forbindelsen til databasen er afbrudt." ;
-    Text [ italian ] = "Il collegamento al database � interrotto." ;
-    Text [ spanish ] = "Interrumpida la conexi�n con la base de datos." ;
-    Text [ french ] = "La connexion � la base de donn�es a �t� interrompue." ;
-    Text [ dutch ] = "De verbinding met de database is verbroken." ;
-    Text[ chinese_simplified ] = "和数据库的连接已经中断。";
-    Text[ russian ] = "����� � ����� ������ ��������.";
-    Text[ polish ] = "Przerwano po��czenie z baz� danych.";
-    Text[ japanese ] = "データベースへの接続は中断されました。";
-    Text[ chinese_traditional ] = "資料庫連線已經中斷。";
-    Text[ greek ] = "������� ��� �������� �� �� ���� ���������";
-    Text[ korean ] = "데이터베이스와의 연결이 중단되었습니다.";
-    Text[ arabic ] = "�� ��� ������� ������ ��������.";
-    Text[ turkish ] = "Veritaban� ba�lant�s� kesildi.";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "S'ha interromput la connexi� amb la base de dades.";
-    Text[ finnish ] = "Yhteys tietokantaan on katkennut.";
-    Text[ thai ] = "การเชื่อมต่อกับฐานข้อมูลขาดหาย";
-};
-String RID_STR_CONNECTERROR
-{
-    Text = "Verbindungsaufbau gescheitert" ;
-    Text [ ENGLISH ] = "Can't create connection" ;
-    Text [ norwegian ] = "Kan ikke opprette forbindelse" ;
-    Text [ italian ] = "Impossibile creare la connessione" ;
-    Text [ portuguese_brazilian ] = "N?o consigo criar a conex?o" ;
-    Text [ portuguese ] = "N�o foi poss�vel estabelecer a liga��o." ;
-    Text [ finnish ] = "Yhteyden muodostaminen ei onnistunut." ;
-    Text [ danish ] = "Det var ikke muligt at oprette forbindelsen" ;
-    Text [ french ] = "Cr�ation de la connexion impossible" ;
-    Text [ swedish ] = "Uppkoppling avbruten" ;
-    Text [ dutch ] = "Kan geen verbinding tot stand brengen" ;
-    Text [ spanish ] = "La conexi�n ha fallado." ;
-    Text [ english_us ] = "Connection failed" ;
-    Text[ chinese_simplified ] = "连接失败";
-    Text[ russian ] = "������ ����������";
-    Text[ polish ] = "Po��czenie nie dosz�o do skutku";
-    Text[ japanese ] = "接続が失敗に終わりました";
-    Text[ chinese_traditional ] = "連線失敗";
-    Text[ greek ] = "� ������� �������";
-    Text[ korean ] = "연결하지 못했습니다.";
-    Text[ arabic ] = "����� ������� ����";
-    Text[ turkish ] = "Ba�lant� kurulamad�";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "La connexi� ha fallat.";
-    Text[ thai ] = "การเชื่อมต่อล้มเหลว";
-};
 
 String RID_STR_SYNTAXERROR
 {
@@ -1975,94 +1355,13 @@ String RID_STR_SYNTAXERROR
     Text[ chinese_traditional ] = "在分解查詢語句時發生一個錯誤。";
     Text[ arabic ] = "��� ��� ����� ����� ����� ���������";
     Text[ greek ] = "������ ���� ��� ������� ��� ��������� ��� ����������";
-    Text[ korean ] = "질의 표현식을 분석할 때 오류";
+    Text[ korean ] = "쿼리식을 분석하는 중 오류";
     Text[ turkish ] = "Sorgu ifadesinde s�zdizim hatas�";
     Text[ catalan ] = "S'ha produ�t un error en analitzar l'expressi� de consulta";
     Text[ finnish ] = "Syntaksivirhe kyselylausekkeessa";
     Text[ thai ] = "ไวยกรณ์ในคำอธิบายแบบสอบถามผิดพลาด";
 };
 
-String RID_STR_INSERTING_ALLOWED_ERROR
-{
-    Text = "Das Einf�gen von Datens�tzen ist nicht erlaubt!" ;
-    Text [ ENGLISH ] = "Inserting records isn't allowed!" ;
-    Text [ english_us ] = "Inserting records isn't allowed!" ;
-    Text[ portuguese ] = "N�o � permitido inserir registos de dados!";
-    Text[ russian ] = "�� ��������� ������� �������!";
-    Text[ greek ] = "��� ����������� � �������� �������� ���������!";
-    Text[ dutch ] = "Het invoegen van records is niet toegestaan!";
-    Text[ french ] = "L'insertion d'enregistrements n'est pas permise !";
-    Text[ spanish ] = "�No se permite insertar registros de datos!";
-    Text[ italian ] = "Non � consentito inserire record di dati!";
-    Text[ danish ] = "Det er ikke tilladt at inds�tte dataposter!";
-    Text[ swedish ] = "Det �r inte till�tet att infoga dataposter!";
-    Text[ polish ] = "Wstawianie rekord�w jest niedozwolone!";
-    Text[ portuguese_brazilian ] = "Inserting records isn't allowed!";
-    Text[ japanese ] = "レコードの挿入は許可されません。";
-    Text[ korean ] = "레코드 삽입이 허용되지 않습니다!";
-    Text[ chinese_simplified ] = "不允许插入数据条目！";
-    Text[ chinese_traditional ] = "不允許插入資料條目！";
-    Text[ arabic ] = "�� ����� ������ �������!";
-    Text[ turkish ] = "Veri k�meleri eklenemez!";
-    Text[ catalan ] = "No es permet inserir registres de dades!";
-    Text[ finnish ] = "Tietuiden lis��minen ei ole sallittua.";
-    Text[ thai ] = "ไม่อนุญาตให้แทรกระเบียน!";
-};
-
-String RID_STR_UPDATING_ALLOWED_ERROR
-{
-    Text = "Das Ver�ndern von Datens�tzen ist nicht erlaubt!" ;
-    Text [ ENGLISH ] = "Updating records isn't allowed!" ;
-    Text [ english_us ] = "Altering records isn't allowed!" ;
-    Text[ portuguese ] = "N�o � permitido modificar registos de dados!";
-    Text[ russian ] = "�� ��������� ��������� �������!";
-    Text[ greek ] = "� ������ �������� ��������� ��� �����������!";
-    Text[ dutch ] = "Het wijzigen van records is niet toegestaan!";
-    Text[ french ] = "La modification d'enregistrements n'est pas permise !";
-    Text[ spanish ] = "�No se permite modificar registros de datos!";
-    Text[ italian ] = "Non � consentito modificare i record di dati!";
-    Text[ danish ] = "Det er ikke tilladt at �ndre dataposter!";
-    Text[ swedish ] = "Det �r inte till�tet att �ndra dataposter!";
-    Text[ polish ] = "Zmienianie rekord�w jest niedozwolone!";
-    Text[ portuguese_brazilian ] = "Updating records isn't allowed!";
-    Text[ japanese ] = "レコードの変更は許可されていません!";
-    Text[ korean ] = "레코드 변경이 허용되지 않습니다!";
-    Text[ chinese_simplified ] = "不允许更改数据条目！";
-    Text[ chinese_traditional ] = "不允許變更資料條目！";
-    Text[ arabic ] = "�� ����� ������ �������!";
-    Text[ turkish ] = "Veri k�meleri de�i�tirilemez!";
-    Text[ catalan ] = "No es permet modificar registres de dades!";
-    Text[ finnish ] = "Tietuiden muuttaminen ei ole sallittua.";
-    Text[ thai ] = "ไม่อนุญาตให้ทดแทนระเบียน!";
-};
-
-String RID_STR_DELETING_ALLOWED_ERROR
-{
-    Text = "Das L�schen von Datens�tzen ist nicht erlaubt!" ;
-    Text [ ENGLISH ] = "Deleting records isn't allowed!" ;
-    Text [ english_us ] = "Deleting records isn't allowed!" ;
-    Text[ portuguese ] = "N�o � permitido eliminar registos de dados!";
-    Text[ russian ] = "�� ��������� �������� �������!";
-    Text[ greek ] = "��� ����������� � �������� �������� ���������!";
-    Text[ dutch ] = "Het wissen van records is niet toegestaan!";
-    Text[ french ] = "La suppression d'enregistrements n'est pas permise !";
-    Text[ spanish ] = "�No se permite eliminar registros de datos!";
-    Text[ italian ] = "Non � consentito eliminare record di dati!";
-    Text[ danish ] = "Det er ikke tilladt at slette dataposter!";
-    Text[ swedish ] = "Det �r inte till�tet att radera dataposter!";
-    Text[ polish ] = "Usuwanie rekord�w jest niedozwolone!";
-    Text[ portuguese_brazilian ] = "Deleting records isn't allowed!";
-    Text[ japanese ] = "レコードの削除は許可されません。";
-    Text[ korean ] = "레코드 삭제가 허용되지 않습니다!";
-    Text[ chinese_simplified ] = "不允许删除数据条目！";
-    Text[ chinese_traditional ] = "不允許刪除資料條目！";
-    Text[ arabic ] = "�� ����� ���� �������!";
-    Text[ turkish ] = "Veri k�meleri silinemez!";
-    Text[ catalan ] = "No es permet eliminar registres de dades!";
-    Text[ finnish ] = "Tietuiden poistaminen ei ole sallittua.";
-    Text[ thai ] = "ไม่อนุญาตให้ลบระเบียน!";
-};
-
 String RID_STR_DELETECONFIRM_RECORD
 {
     Text = "Sie beabsichtigen, 1 Datensatz zu l�schen." ;
@@ -2073,7 +1372,7 @@ String RID_STR_DELETECONFIRM_RECORD
     Text [ swedish ] = "Du kommer att radera 1 datapost." ;
     Text [ danish ] = "Du vil slette 1 datapost." ;
     Text [ italian ] = "Intendete eliminare 1 record di dati." ;
-    Text [ spanish ] = "Usted desea eliminar 1 registro de datos." ;
+    Text [ spanish ] = "Tiene la intenci�n de borrar 1 registro de datos." ;
     Text [ french ] = "Vous avez l'intention de supprimer 1 enregistrement." ;
     Text [ dutch ] = "U wilt 1 record wissen." ;
     Text[ chinese_simplified ] = "您要删除一个数据条目。";
@@ -2100,7 +1399,7 @@ String RID_STR_DELETECONFIRM_RECORDS
     Text [ swedish ] = "Du t�nker radera # dataposter." ;
     Text [ danish ] = "Du er i gang med at slette # dataposter." ;
     Text [ italian ] = "Intendete eliminare i record # di dati." ;
-    Text [ spanish ] = "Usted pretende eliminar # registros de datos." ;
+    Text [ spanish ] = "Pretende borrar # registros de datos." ;
     Text [ french ] = "Vous avez l'intention de supprimer # enregistrements." ;
     Text [ dutch ] = "U wilt # records wissen." ;
     Text[ chinese_simplified ] = "您要删除数据条目 # 。";
@@ -2109,7 +1408,7 @@ String RID_STR_DELETECONFIRM_RECORDS
     Text[ japanese ] = "# レコードを削除します。";
     Text[ chinese_traditional ] = "您要刪除資料條目 # 。";
     Text[ greek ] = "����������� �� ���������� # ��������.";
-    Text[ korean ] = "데이터 레코드#을(를 삭제하려 합니다다.";
+    Text[ korean ] = "레코드 #을(를) 삭제하시려고 합니다.";
     Text[ arabic ] = "��� ���� ��� # ����� ������.";
     Text[ turkish ] = "# kayd� silmek istiyorsunuz.";
     Text[ language_user1 ] = " ";
@@ -2136,7 +1435,7 @@ String RID_STR_DELETECONFIRM
     Text[ japanese ] = "はいを選択すると、操作を元に戻すことが出来ません!\nそれでも続行しますか?";
     Text[ chinese_traditional ] = "若選擇<是>，就不能夠撤消這個作業！\n要繼續？";
     Text[ greek ] = "�� ��������� \"���\" ��� �� ����� ������� �� �������� ���� � ��������!\n��������;";
-    Text[ korean ] = "'예'를 클릭하면 이 작업의 실행을 취소할 수 없습니다.\n그래도 계속하겠습니까?";
+    Text[ korean ] = "[예]를 클릭하면 이 작업의 실행을 취소할 수 없습니다.\n그래도 계속하시겠습니까?";
     Text[ arabic ] = "��� ��� ������� \"���\"� ��� ����� ������� �� ������� ��� ���!\n�� ���� �������� ������ �� ��߿";
     Text[ turkish ] = "\"Evet\" se�ildi�inde, i�lem art�k geri al�namaz!\nYinde de devam etmek istiyor musunuz?";
     Text[ language_user1 ] = " ";
@@ -2144,173 +1443,6 @@ String RID_STR_DELETECONFIRM
     Text[ finnish ] = "Jos valitset Kyll�, et voi kumota t�t� toimintoa.\nHaluatko kuitenkin jatkaa?";
     Text[ thai ] = "ถ้าคุณคลิ๊ก ใช่  คุณจะไม่สามารถเลิกทำปฏิบัติการนี้!\nคุณต้องการทำต่อหรือไม่?";
 };
-String RID_STR_WARNING
-{
-    Text = "Warnung!" ;
-    Text [ ENGLISH ] = "Warning!" ;
-    Text [ english_us ] = "Warning!" ;
-    Text [ portuguese ] = "Advert�ncia!" ;
-    Text [ portuguese_brazilian ] = "Warnung!" ;
-    Text [ swedish ] = "Varning!" ;
-    Text [ danish ] = "Advarsel!" ;
-    Text [ italian ] = "Attenzione!" ;
-    Text [ spanish ] = "�Advertencia!" ;
-    Text [ french ] = "Avertissement !" ;
-    Text [ dutch ] = "Waarschuwing!" ;
-    Text[ chinese_simplified ] = "警告！";
-    Text[ russian ] = "��������������!";
-    Text[ polish ] = "Ostrze�enie!";
-    Text[ japanese ] = "警告";
-    Text[ chinese_traditional ] = "警告！";
-    Text[ greek ] = "�������������!";
-    Text[ korean ] = "경고!";
-    Text[ arabic ] = "�����!";
-    Text[ turkish ] = "Uyar�!";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Advert�ncia!";
-    Text[ finnish ] = "Varoitus";
-    Text[ thai ] = "คำเตือน!";
-};
-
-String RID_STR_NO_FORM_CONNECT
-{
-    Text = "Die Verkn�pfung von Formular '#' zu Formular '#' konnte nicht hergestellt werden." ;
-    Text [ ENGLISH ] = "Couldn't establish connection between form '#' and form '#'" ;
-    Text [ english_us ] = "Couldn't establish connection between form '#' and form '#'" ;
-    Text[ italian ] = "Non � stato possibile ripristinare il collegamento dal formulario '#' al formulario '#'.";
-    Text[ portuguese_brazilian ] = "Die Verkn?fung von Formular '#' zu Formular '#' konnte nicht hergestellt werden.";
-    Text[ portuguese ] = "Foi imposs�vel estabelecer a liga��o do formul�rio '#' ao formul�rio '#'.";
-    Text[ danish ] = "Det var ikke muligt at oprette k�den fra formular # til formular #.";
-    Text[ french ] = "Le lien entre le formulaire '#' et le formulaire '#' n'a pas pu �tre �tabli.";
-    Text[ swedish ] = "L�nkningen mellan formul�ret '#' och formul�ret '#' kunde inte skapas.";
-    Text[ dutch ] = "De koppeling van formulier '#' naar formulier '#' kan niet worden uitgevoerd.";
-    Text[ spanish ] = "No se pudo realizar el v�nculo entre el formulario '#' y el formulario '#'.";
-    Text[ chinese_simplified ] = "无法建立从表单 '#' 指向表单 '#' 的链接。";
-    Text[ russian ] = "���������� ������������ ����� ����� ������ '#' � ������ '#'.";
-    Text[ polish ] = "Po��czenie formularza '#' z formularzem '#' nie mog�o zosta� ustanowione.";
-    Text[ japanese ] = "'#'フォームから'#'フォームへのリンクは接続できませんでした。";
-    Text[ chinese_traditional ] = "無法建立從表單<#>指向表單<#>的捷徑。";
-    Text[ greek ] = "��� ���� ������� �� ������������ � ������� ��� �� ����� '#' ��� ����� '#'.";
-    Text[ korean ] = "양식'#'과 양식'#'을 연결하지 못했습니다.";
-    Text[ arabic ] = "���� ��� ������ �� ��������� '#' ��� ��������� '#'.";
-    Text[ turkish ] = "Form '#' ile form '#' aras�nda ba�lant� olu�turulamaz";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "No s'ha pogut realitzar l'enlla� entre el formulari '#' i el formulari '#'.";
-    Text[ finnish ] = "Yhteytt� ei voitu muodostaa lomakkeen '#' ja lomakkeen '#' v�lille.";
-    Text[ thai ] = "ไม่สามารถสร้างการเชื่อมต่อระหว่างแบบฟอร์ม '#' และแบบฟอร์ม '#'";
-};
-
-String RID_STR_FIELD_NOT_FOUND
-{
-    Text = "Das Feld '#' konnte nicht gefunden werden." ;
-    Text [ ENGLISH ] = "Field '#' not found" ;
-    Text [ english_us ] = "Field '#' not found" ;
-    Text[ italian ] = "Non � stato possibile trovare il campo '#'.";
-    Text[ portuguese_brazilian ] = "Das Feld '#' konnte nicht gefunden werden.";
-    Text[ portuguese ] = "Foi imposs�vel encontrar o campo '#'.";
-    Text[ danish ] = "Det var ikke muligt at finde feltet #.";
-    Text[ french ] = "Le champ '#' n'a pas �t� trouv�";
-    Text[ swedish ] = "F�ltet '#' kunde inte hittas.";
-    Text[ dutch ] = "Veld '#' niet gevonden";
-    Text[ spanish ] = "El campo '#' no pudo ser encontrado.";
-    Text[ chinese_simplified ] = "无法找到字段 '#' 。";
-    Text[ russian ] = "���������� ����� ���� '#'.";
-    Text[ polish ] = "Pole '#' nie zosta�o znalezione.";
-    Text[ japanese ] = "フィールド'#'は見つかりませんでした。";
-    Text[ chinese_traditional ] = "無法找到欄位<#>。";
-    Text[ greek ] = "��� ���� ������� �� ������ �� ����� '#'.";
-    Text[ korean ] = "필드'#'를 찾지 못했습니다.";
-    Text[ arabic ] = "���� ������ ��� ����� '#'.";
-    Text[ turkish ] = "Alan '#' bulunamad�.";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "No s'ha trobat el camp '#'";
-    Text[ finnish ] = "Kentt�� '#' ei l�ytynyt";
-    Text[ thai ] = "ไม่พบเขตข้อมูล '#' ";
-};
-
-String RID_STR_TABLE_NOT_FOUND
-{
-    Text = "Die Tabelle '#' konnte nicht gefunden werden." ;
-    Text [ ENGLISH ] = "Table '#' not found" ;
-    Text [ english_us ] = "Table '#' not found" ;
-    Text[ italian ] = "Non � stato possibile trovare la tabella '#'.";
-    Text[ portuguese_brazilian ] = "Die Tabelle '#' konnte nicht gefunden werden.";
-    Text[ portuguese ] = "Foi imposs�vel localizar a tabela '#'.";
-    Text[ danish ] = "Det var ikke muligt at finde tabel #.";
-    Text[ french ] = "Impossible de trouver le classeur '#'. ";
-    Text[ swedish ] = "Tabellen '#' kunde inte hittas.";
-    Text[ dutch ] = "Tabel '#' niet gevonden.";
-    Text[ spanish ] = "No se pudo encontrar la tabla '#'.";
-    Text[ chinese_simplified ] = "无法找到表格 '#' 。";
-    Text[ russian ] = "���������� ����� ������� '#'.";
-    Text[ polish ] = "Tabeli '#' nie znaleziono.";
-    Text[ japanese ] = "テーブル'#'は見つかりませんでした。";
-    Text[ chinese_traditional ] = "無法找到表格<#>。";
-    Text[ greek ] = "��� ������� � ������� '#'.";
-    Text[ korean ] = "시트 '#'을(를) 찾지 못했습니다.";
-    Text[ arabic ] = "���� ������ ��� ������ '#'.";
-    Text[ turkish ] = "Tablo '#' bulunamad�.";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "No s'ha trobat la taula '#'";
-    Text[ finnish ] = "Taulukkoa '#' ei l�ytynyt";
-    Text[ thai ] = "ไม่พบตาราง '#' ";
-};
-
-String RID_STR_QUERY_NOT_FOUND
-{
-    Text = "Die Abfrage '#' konnte nicht gefunden werden." ;
-    Text [ ENGLISH ] = "Query '#' not found" ;
-    Text [ english_us ] = "Query '#' not found" ;
-    Text[ italian ] = "Non � stato possibile trovare la ricerca '#'.";
-    Text[ portuguese_brazilian ] = "Die Abfrage '#' konnte nicht gefunden werden.";
-    Text[ portuguese ] = "Foi imposs�vel localizar a consulta '#'.";
-    Text[ danish ] = "Det var ikke muligt at finde foresp�rgsel #.";
-    Text[ french ] = "La recherche '#' n'a pas abouti.";
-    Text[ swedish ] = "S�kningen '#' kunde inte hittas.";
-    Text[ dutch ] = "Query '#' niet gevonden.";
-    Text[ spanish ] = "No se pudo encontrar la consulta '#'.";
-    Text[ chinese_simplified ] = "无法找到查询 '#' 。";
-    Text[ russian ] = "���������� ����� ������ '#'.";
-    Text[ polish ] = "Kwerendy '#' nie znaleziono.";
-    Text[ japanese ] = "'#' クエリーは見つかりませんでした。";
-    Text[ chinese_traditional ] = "無法找到查詢<#>。";
-    Text[ greek ] = "��� ������� �� ������� '#'.";
-    Text[ korean ] = "질의'#'을(를) 찾지 못했습니다.";
-    Text[ arabic ] = "���� ������ ��� ��������� '#'.";
-    Text[ turkish ] = "Sorgu '#' bulunamad�.";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "No s'ha trobat la consulta '#'";
-    Text[ finnish ] = "Kysely� '#' ei l�ytynyt";
-    Text[ thai ] = "ไม่พบแบบสอบถาม '#' ";
-};
-
-String RID_ERR_NO_ELEMENT_TITLE
-{
-    Text = "Der eingegebene Text ist kein Element der Liste." ;
-    Text [ ENGLISH ] = "The text entry is not an element of the list." ;
-    Text [ english_us ] = "The text entry does not correspont to one of the list items." ;
-    Text[ italian ] = "Il testo immesso non � un elemento dell'elenco.";
-    Text[ portuguese_brazilian ] = "Der eingegebene Text ist kein Element der Liste.";
-    Text[ portuguese ] = "O texto indicado n�o � um elemento da lista.";
-    Text[ danish ] = "Den indtastede tekst er ikke et element fra listen.";
-    Text[ french ] = "Le texte saisi n'est pas un �l�ment de la liste";
-    Text[ swedish ] = "Den inmatade texten �r inget element fr�n listan.";
-    Text[ dutch ] = "De ingevoerde tekst komt niet overeen met een element uit de lijst.";
-    Text[ spanish ] = "El texto indicado no es ning�n elemento de la lista.";
-    Text[ chinese_simplified ] = "输入的文字不是列表条目。";
-    Text[ russian ] = "��������� ����� �� ������������� �� ������ �������� ������.";
-    Text[ polish ] = "Wpisany tekst nie jest elementem listy.";
-    Text[ japanese ] = "入力したテキストはリストの要素ではありません。";
-    Text[ chinese_traditional ] = "輸入的文字不是清單條目。";
-    Text[ greek ] = "�� ������� ��� �������� ��� ����� �������� ��� ������.";
-    Text[ korean ] = "입력한 문서는 목록의 항목이 아닙니다.";
-    Text[ arabic ] = "�� ����� ������� ��� ���� ���� �� ������.";
-    Text[ turkish ] = "Girilen metin, listede yer alan ��elerden de�il.";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "El text indicat no �s cap element de la llista.";
-    Text[ finnish ] = "Teksti ei vastaa mit��n luettelon kohdetta.";
-    Text[ thai ] = "ข้อความที่ใส่ไม่ตรงกับรายการ";
-};
 
 String RID_ERR_NO_ELEMENT
 {
@@ -2521,7 +1653,7 @@ String RID_STR_NAVIGATIONBAR
     Text[ japanese ] = "ナビゲーションバー";
     Text[ chinese_traditional ] = "瀏覽位址列";
     Text[ greek ] = "������ ���������";
-    Text[ korean ] = "탐색 표시줄";
+    Text[ korean ] = "탐색 도구 표시줄";
     Text[ arabic ] = "���� �������";
     Text[ turkish ] = "Dola�ma �ubu�u";
     Text[ language_user1 ] = " ";
@@ -2548,7 +1680,7 @@ String RID_STR_CYCLE
     Text[ japanese ] = "反復";
     Text[ chinese_traditional ] = "循環";
     Text[ greek ] = "������";
-    Text[ korean ] = "사이클";
+    Text[ korean ] = "반복";
     Text[ arabic ] = "�����";
     Text[ turkish ] = "Devre";
     Text[ language_user1 ] = " ";
@@ -2556,114 +1688,6 @@ String RID_STR_CYCLE
     Text[ finnish ] = "Kierto";
     Text[ thai ] = "วงกลม";
 };
-String RID_STR_ENUM_CYCLE
-{
-    Text = "Alle Datens�tze;Aktueller Datensatz;Aktuelle Seite" ;
-    Text [ ENGLISH ] = "All records;Activ record;Activ page" ;
-    Text [ english_us ] = "All records;Active record;Current page" ;
-    Text[ portuguese ] = "Registos todos;Registo actual;P�gina actual";
-    Text[ russian ] = "��� ������;�������� ������;������� ��������";
-    Text[ dutch ] = "Alle records;Huidige record;Huidige pagina";
-    Text[ french ] = "Tous les enregistrements;Enregistrement actif;Page active";
-    Text[ spanish ] = "Todos los registros de datos;Registro actual;P�gina actual";
-    Text[ italian ] = "Tutti i record di dati;record di dati attuale;pagina attuale";
-    Text[ danish ] = "Alle dataposter;Aktuel datapost;Aktuel side";
-    Text[ swedish ] = "Alla dataposter;Aktuell datapost;Aktuell sida";
-    Text[ polish ] = "Wszystkie rekordy;Aktualny rekord;Aktualna strona";
-    Text[ portuguese_brazilian ] = "Alle Datens?tze;Aktueller Datensatz";
-    Text[ japanese ] = "すべてのレコード;現在のレコード;現在のページ";
-    Text[ chinese_simplified ] = "所有的数据条目;当前的数据条目;当前页面";
-    Text[ chinese_traditional ] = "所有的資料條目;目前的資料條目;目前的頁面";
-    Text[ greek ] = "���� �� ��������;�������� �������;�������� ������";
-    Text[ korean ] = "모든 데이터 레코드;현재 데이터 레코드;현재 페이지";
-    Text[ arabic ] = "�� �������;����� ������;������ �������";
-    Text[ turkish ] = "T�m veri k�meleri;Y�r�rl�kteki veri k�mesi;Y�r�rl�kteki sayfa";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Tots els registres de dades;Registre actual;P�gina actual";
-    Text[ finnish ] = "Kaikki tietueet;Aktiivinen tietue;Nykyinen sivu";
-    Text[ thai ] = "ระเบียนทั้งหมด;ระเบียนที่ใช้งานอยู่;หน้าปัจจุบัน";
-};
-String RID_STR_ENUM_NAVIGATION
-{
-    Text = "Nein;Ja;�bergeordnetes Formular" ;
-    Text [ ENGLISH ] = "No;Yes;Parent";
-    Text [ english_us ] = "No;Yes;Parent Form";
-    Text[ italian ] = "No;Si;Formulario superiore";
-    Text[ portuguese_brazilian ] = "No;Yes;Parent";
-    Text[ portuguese ] = "N�o; Sim;Formul�rio superior";
-    Text[ danish ] = "Nei;Ja;Overordnet formular";
-    Text[ french ] = "Non;Oui;Formulaire parent";
-    Text[ swedish ] = "Nej;Ja;�verordnat formul�r";
-    Text[ dutch ] = "Nee;ja;Bovenliggend formulier";
-    Text[ spanish ] = "No;S�;Formulario superior";
-    Text[ chinese_simplified ] = "否;是;母表单";
-    Text[ russian ] = "���;��;����������� �����";
-    Text[ polish ] = "Nie;Tak;Nadrz�dny formularz";
-    Text[ japanese ] = "いいえ;はい;上位のフォーム";
-    Text[ chinese_traditional ] = "否;是;母表單";
-    Text[ greek ] = "���;���;������� �����";
-    Text[ korean ] = "아니오;예;상위 양식";
-    Text[ arabic ] = "�Ǻ������������ �����";
-    Text[ turkish ] = "Hay�r;Evet;�st d�zey form";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "No;S�;Formulari superior";
-    Text[ finnish ] = "Ei;Kyll�;P��lomake";
-    Text[ thai ] = "ไม่ใช่;ใช่;แม่แบบ";
-};
-String RID_STR_DIRTY
-{
-    Text = "Ge�ndert" ;
-    Text [ ENGLISH ] = "Dirty" ;
-    Text [ portuguese ] = "Modificado" ;
-    Text [ english_us ] = "Modified" ;
-    Text [ portuguese_brazilian ] = "Ge?ndert" ;
-    Text [ swedish ] = "�ndrat" ;
-    Text [ danish ] = "�ndret" ;
-    Text [ italian ] = "Modificato" ;
-    Text [ spanish ] = "Modificado" ;
-    Text [ french ] = "Modifi�" ;
-    Text [ dutch ] = "Gewijzigd" ;
-    Text[ chinese_simplified ] = "已经更改";
-    Text[ russian ] = "�������";
-    Text[ polish ] = "Zmodyfikowany";
-    Text[ japanese ] = "変更";
-    Text[ chinese_traditional ] = "已經變更";
-    Text[ greek ] = "�������������";
-    Text[ korean ] = "변경됨";
-    Text[ arabic ] = "����";
-    Text[ turkish ] = "De�i�tirildi";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Modificat";
-    Text[ finnish ] = "Muutettu";
-    Text[ thai ] = "ดัดแปลงแก้ไข";
-};
-String RID_STR_OLDVALUE
-{
-    Text = "Alter Wert" ;
-    Text [ ENGLISH ] = "Old value" ;
-    Text [ portuguese ] = "Valor antigo" ;
-    Text [ english_us ] = "Old value" ;
-    Text [ portuguese_brazilian ] = "Alter Wert" ;
-    Text [ swedish ] = "Gammalt v�rde" ;
-    Text [ danish ] = "Gammel v�rdi" ;
-    Text [ italian ] = "Valore precedente" ;
-    Text [ spanish ] = "Valor antiguo" ;
-    Text [ french ] = "Ancienne valeur" ;
-    Text [ dutch ] = "Oude waarde" ;
-    Text[ chinese_simplified ] = "旧的数值";
-    Text[ russian ] = "������ ��������";
-    Text[ polish ] = "Stara warto��";
-    Text[ japanese ] = "古い数値";
-    Text[ chinese_traditional ] = "舊數值";
-    Text[ greek ] = "����� ����";
-    Text[ korean ] = "이전 값";
-    Text[ arabic ] = "������ �������";
-    Text[ turkish ] = "Eski de�er";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Valor antic";
-    Text[ finnish ] = "Vanha arvo";
-    Text[ thai ] = "ค่าเก่า";
-};
 String RID_STR_VALUE
 {
     Text = "Wert" ;
@@ -2710,7 +1734,7 @@ String RID_STR_FORMATKEY
     Text[ japanese ] = "書式設定";
     Text[ chinese_traditional ] = "格式化";
     Text[ greek ] = "�����������";
-    Text[ korean ] = "서식 지정";
+    Text[ korean ] = "서식 설정";
     Text[ arabic ] = "�������";
     Text[ turkish ] = "Formatlama";
     Text[ language_user1 ] = " ";
@@ -2718,60 +1742,6 @@ String RID_STR_FORMATKEY
     Text[ finnish ] = "Muotoilu";
     Text[ thai ] = "จัดรูปแบบ";
 };
-String RID_STR_REQUIRED
-{
-    Text = "Eingabe erforderlich" ;
-    Text [ ENGLISH ] = "Required" ;
-    Text [ portuguese ] = "Entrada necess�ria" ;
-    Text [ english_us ] = "Entry required" ;
-    Text [ portuguese_brazilian ] = "Eingabe erforderlich" ;
-    Text [ swedish ] = "Inmatning kr�vs" ;
-    Text [ danish ] = "Input kr�ves" ;
-    Text [ italian ] = "La digitazione � necessaria" ;
-    Text [ spanish ] = "Entrada requerida" ;
-    Text [ french ] = "Saisie requise" ;
-    Text [ dutch ] = "Invoer vereist" ;
-    Text[ chinese_simplified ] = "必须输入";
-    Text[ russian ] = "������������";
-    Text[ polish ] = "Wymagany jest wpis";
-    Text[ japanese ] = "入力が必要";
-    Text[ chinese_traditional ] = "必須輸入數據";
-    Text[ greek ] = "���������� ��������";
-    Text[ korean ] = "입력해야 합니다.";
-    Text[ arabic ] = "����� �����";
-    Text[ turkish ] = "Giri� gerekli";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Es necessita una entrada";
-    Text[ finnish ] = "Merkint� pakollinen";
-    Text[ thai ] = "ต้องการการป้อนข้อมูล";
-};
-String RID_STR_SCALE
-{
-    Text = "Skalierung" ;
-    Text [ ENGLISH ] = "Scale" ;
-    Text [ portuguese ] = "Escala" ;
-    Text [ english_us ] = "Scale" ;
-    Text [ portuguese_brazilian ] = "Skalierung" ;
-    Text [ swedish ] = "Skalning" ;
-    Text [ danish ] = "Skalering" ;
-    Text [ italian ] = "Scala" ;
-    Text [ spanish ] = "Escala" ;
-    Text [ french ] = "�chelle" ;
-    Text [ dutch ] = "Schaalverdeling" ;
-    Text[ chinese_simplified ] = "显示比例";
-    Text[ russian ] = "���������������";
-    Text[ polish ] = "Skalowanie";
-    Text[ japanese ] = "スケール";
-    Text[ chinese_traditional ] = "顯示比例";
-    Text[ greek ] = "�������";
-    Text[ korean ] = "배율";
-    Text[ arabic ] = "�������";
-    Text[ turkish ] = "�l�eklendirme";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Escala";
-    Text[ finnish ] = "Skaalaa";
-    Text[ thai ] = "สเกล";
-};
 String RID_STR_SIZE
 {
     Text = "Gr��e" ;
@@ -2799,33 +1769,6 @@ String RID_STR_SIZE
     Text[ finnish ] = "Koko";
     Text[ thai ] = "ขนาด";
 };
-String RID_STR_UNIQUE
-{
-    Text = "Eindeutig" ;
-    Text [ ENGLISH ] = "Unique" ;
-    Text [ portuguese ] = "�nico" ;
-    Text [ english_us ] = "Unique" ;
-    Text [ portuguese_brazilian ] = "Eindeutig" ;
-    Text [ swedish ] = "Entydig" ;
-    Text [ danish ] = "Entydig" ;
-    Text [ italian ] = "Univoco" ;
-    Text [ spanish ] = "�nico" ;
-    Text [ french ] = "Unique" ;
-    Text [ dutch ] = "Duidelijk" ;
-    Text[ chinese_simplified ] = "明确的";
-    Text[ russian ] = "����������";
-    Text[ polish ] = "Jednoznaczny";
-    Text[ japanese ] = "固有";
-    Text[ chinese_traditional ] = "明確的";
-    Text[ greek ] = "��������";
-    Text[ korean ] = "단일";
-    Text[ arabic ] = "����";
-    Text[ turkish ] = "Benzersiz";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "�nic";
-    Text[ finnish ] = "Yksil�llinen";
-    Text[ thai ] = "เฉพาะ";
-};
 String RID_STR_CLASSID
 {
     Text = "Klassenindex" ;
@@ -2853,60 +1796,6 @@ String RID_STR_CLASSID
     Text[ finnish ] = "Luokan tunnus";
     Text[ thai ] = "คลาส ID";
 };
-String RID_STR_LEFT
-{
-    Text = "Links" ;
-    Text [ ENGLISH ] = "Left" ;
-    Text [ portuguese ] = "Esquerda" ;
-    Text [ english_us ] = "Left" ;
-    Text [ portuguese_brazilian ] = "Links" ;
-    Text [ swedish ] = "V�nster" ;
-    Text [ danish ] = "Venstre" ;
-    Text [ italian ] = "Sinistra" ;
-    Text [ spanish ] = "Izquierda" ;
-    Text [ french ] = "� gauche" ;
-    Text [ dutch ] = "Links" ;
-    Text[ chinese_simplified ] = "向左";
-    Text[ russian ] = "�����";
-    Text[ polish ] = "Z lewej";
-    Text[ japanese ] = "左に";
-    Text[ chinese_traditional ] = "向左";
-    Text[ greek ] = "��������";
-    Text[ korean ] = "왼쪽";
-    Text[ arabic ] = "����";
-    Text[ turkish ] = "Sol";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Esquerra";
-    Text[ finnish ] = "Vasen";
-    Text[ thai ] = "ซ้าย";
-};
-String RID_STR_RIGHT
-{
-    Text = "Rechts" ;
-    Text [ ENGLISH ] = "Right" ;
-    Text [ portuguese ] = "Direita" ;
-    Text [ english_us ] = "Right" ;
-    Text [ portuguese_brazilian ] = "Rechts" ;
-    Text [ swedish ] = "H�ger" ;
-    Text [ danish ] = "H�jre" ;
-    Text [ italian ] = "Destra" ;
-    Text [ spanish ] = "Derecha" ;
-    Text [ french ] = "� droite" ;
-    Text [ dutch ] = "Rechts" ;
-    Text[ chinese_simplified ] = "向右";
-    Text[ russian ] = "������";
-    Text[ polish ] = "Z prawej";
-    Text[ japanese ] = "右に";
-    Text[ chinese_traditional ] = "向右";
-    Text[ greek ] = "�����";
-    Text[ korean ] = "오른쪽";
-    Text[ arabic ] = "����";
-    Text[ turkish ] = "Sa�";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Dreta";
-    Text[ finnish ] = "Oikea";
-    Text[ thai ] = "ขวา";
-};
 String RID_STR_HEIGHT
 {
     Text = "H�he" ;
@@ -2961,33 +1850,6 @@ String RID_STR_WIDTH
     Text[ finnish ] = "Leveys";
     Text[ thai ] = "ความกว้าง";
 };
-String RID_STR_LISTINDEX
-{
-    Text = "ListIndex" ;
-    Text [ ENGLISH ] = "ListIndex" ;
-    Text [ portuguese ] = "�ndice de listas" ;
-    Text [ english_us ] = "List Index" ;
-    Text [ portuguese_brazilian ] = "ListIndex" ;
-    Text [ swedish ] = "Listindex" ;
-    Text [ danish ] = "ListIndeks" ;
-    Text [ italian ] = "Indice elenco" ;
-    Text [ spanish ] = "Indice de listas" ;
-    Text [ french ] = "Index de liste" ;
-    Text [ dutch ] = "ListIndex" ;
-    Text[ chinese_simplified ] = "列表索引";
-    Text[ russian ] = "������ ������";
-    Text[ polish ] = "Indeks list";
-    Text[ japanese ] = "リストのインデックス";
-    Text[ chinese_traditional ] = "清單索引";
-    Text[ greek ] = "��������� ������";
-    Text[ korean ] = "목록 색인";
-    Text[ arabic ] = "���� �������";
-    Text[ turkish ] = "Liste dizini";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "�ndex de llistes";
-    Text[ finnish ] = "Luettelohakemisto";
-    Text[ thai ] = "รายการดัชนี";
-};
 String RID_STR_ROWHEIGHT
 {
     Text = "Zeilenh�he" ;
@@ -3049,19 +1911,19 @@ String RID_STR_TEXTCOLOR
     Text [ portuguese ] = "Cor do texto" ;
     Text [ english_us ] = "Font color" ;
     Text [ portuguese_brazilian ] = "Schriftfarbe" ;
-    Text [ swedish ] = "Textf�rg" ;
+    Text [ swedish ] = "Teckenf�rg" ;
     Text [ danish ] = "Tekstfarve" ;
-    Text [ italian ] = "Colore testo" ;
-    Text [ spanish ] = "Color de texto" ;
-    Text [ french ] = "Couleur du texte" ;
+    Text [ italian ] = "Colore carattere" ;
+    Text [ spanish ] = "Color de fuente" ;
+    Text [ french ] = "Couleur de police" ;
     Text [ dutch ] = "Tekstkleur" ;
     Text[ chinese_simplified ] = "文字颜色";
     Text[ russian ] = "���� ������";
     Text[ polish ] = "Kolor tekstu";
-    Text[ japanese ] = "テキストの色";
-    Text[ chinese_traditional ] = "文字顏色";
+    Text[ japanese ] = "フォントの色";
+    Text[ chinese_traditional ] = "字型顏色";
     Text[ greek ] = "����� ��������";
-    Text[ korean ] = "텍스트 색상";
+    Text[ korean ] = "글꼴 색상";
     Text[ arabic ] = "��� ����";
     Text[ turkish ] = "Metin rengi";
     Text[ language_user1 ] = " ";
@@ -3133,7 +1995,7 @@ String RID_STR_STRINGITEMLIST
     Text [ swedish ] = "Listposter" ;
     Text [ danish ] = "Liste-elementer" ;
     Text [ italian ] = "Voci dell'elenco" ;
-    Text [ spanish ] = "Entradas de listas" ;
+    Text [ spanish ] = "Entradas de la lista" ;
     Text [ french ] = "Entr�es de liste" ;
     Text [ dutch ] = "Items in lijsten" ;
     Text[ chinese_simplified ] = "列表条目";
@@ -3169,7 +2031,7 @@ String RID_STR_COLUMN
     Text[ japanese ] = "列";
     Text[ chinese_traditional ] = "欄";
     Text[ greek ] = "�����";
-    Text[ korean ] = "단";
+    Text[ korean ] = "열";
     Text[ arabic ] = "����";
     Text[ turkish ] = "S�tun";
     Text[ language_user1 ] = " ";
@@ -3304,7 +2166,7 @@ String RID_STR_DEFAULTVALUE
     Text[ japanese ] = "標準値";
     Text[ chinese_traditional ] = "默認值";
     Text[ greek ] = "������������� ����";
-    Text[ korean ] = "기본 값";
+    Text[ korean ] = "기본값";
     Text[ arabic ] = "���� ��������";
     Text[ turkish ] = "Standart de�er";
     Text[ language_user1 ] = " ";
@@ -3322,7 +2184,7 @@ String RID_STR_SUBMIT_TARGET
     Text [ swedish ] = "Ram" ;
     Text [ danish ] = "Frame" ;
     Text [ italian ] = "Frame" ;
-    Text [ spanish ] = "Frame" ;
+    Text [ spanish ] = "Marco destino" ;
     Text [ french ] = "Frame" ;
     Text [ dutch ] = "Frame" ;
     Text[ chinese_simplified ] = "框对象";
@@ -3339,87 +2201,6 @@ String RID_STR_SUBMIT_TARGET
     Text[ finnish ] = "Kohdekehys";
     Text[ thai ] = "กรอบเป้าหมาย";
 };
-String RID_STR_ENUM_BUTTONTYPE
-{
-    Text = "Push;Submit;Reset;Url" ;
-    Text [ English ] = "Push;Submit;Reset;Url" ;
-    Text [ portuguese ] = "Push;Submit;Reset;Url" ;
-    Text [ english_us ] = "Push;Submit;Reset;Url" ;
-    Text [ portuguese_brazilian ] = "Push;Submit;Reset;Url" ;
-    Text [ swedish ] = "Push;Submit;Reset;Url" ;
-    Text [ danish ] = "Push;Submit;Reset;Url" ;
-    Text [ italian ] = "Push;Submit;Reset;Url" ;
-    Text [ spanish ] = "Push;Submit;Reset;Url" ;
-    Text [ french ] = "Push;Submit;Reset;Url" ;
-    Text [ dutch ] = "Push;Submit;Reset;Url" ;
-    Text[ chinese_simplified ] = "Push;Submit;Reset;Url";
-    Text[ russian ] = "������;�����������;��������;Url";
-    Text[ polish ] = "Push;Submit;Reset;Url";
-    Text[ japanese ] = "Push;Submit;Reset;Url";
-    Text[ chinese_traditional ] = "Push;Submit;Reset;Url";
-    Text[ greek ] = "Push;Submit;Reset;Url";
-    Text[ korean ] = "밀어넣기;전송;원래대로;Url";
-    Text[ arabic ] = "Push;Submit;Reset;Url";
-    Text[ turkish ] = "Push;Submit;Reset;Url";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Prem;Tramet;Reinicia;Url";
-    Text[ finnish ] = "Tavallinen;L�het�;Tyhjenn�;Url-osoite";
-    Text[ thai ] = "ผลัก;ยอมรับ;ตั้งใหม่;Url";
-};
-String RID_STR_ENUM_SUBMIT_METHOD
-{
-    Text = "Get;Post" ;
-    Text [ English ] = "Get;Post" ;
-    Text [ portuguese ] = "Get;Post" ;
-    Text [ english_us ] = "Get;Post" ;
-    Text [ portuguese_brazilian ] = "Get;Post" ;
-    Text [ swedish ] = "Get;Post" ;
-    Text [ danish ] = "Get;Post" ;
-    Text [ italian ] = "Get;Post" ;
-    Text [ spanish ] = "Get;Post" ;
-    Text [ french ] = "Get;Post" ;
-    Text [ dutch ] = "Get;Post" ;
-    Text[ chinese_simplified ] = "收取;寄发";
-    Text[ russian ] = "��������;���������";
-    Text[ polish ] = "Get;Post";
-    Text[ japanese ] = "Get;Post";
-    Text[ chinese_traditional ] = "取得;發送";
-    Text[ greek ] = "Get;Post";
-    Text[ korean ] = "가져오기;게시";
-    Text[ arabic ] = "Get;Post";
-    Text[ turkish ] = "Get;Post";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Recupera;Envia";
-    Text[ finnish ] = "Get;Post";
-    Text[ thai ] = "รับ;ติดประกาศ";
-};
-String RID_STR_ENUM_SUBMIT_ENCODING
-{
-    Text = "URL;Multipart;Text" ;
-    Text [ English ] = "URL;Multipart;Text" ;
-    Text [ portuguese ] = "URL;Multipart;Texto" ;
-    Text [ english_us ] = "URL;Multipart;Text" ;
-    Text [ portuguese_brazilian ] = "URL;Multipart" ;
-    Text [ swedish ] = "URL;Multipart;Text" ;
-    Text [ danish ] = "URL;Multipart;Tekst" ;
-    Text [ italian ] = "URL;Multipart;Testo" ;
-    Text [ spanish ] = "URL;Multipart;Texto" ;
-    Text [ french ] = "URL;Multipart;Texte" ;
-    Text [ dutch ] = "URL;Multipart;Tekst" ;
-    Text[ chinese_simplified ] = "URL;Multipart;Text" ;
-    Text[ russian ] = "URL;Multipart;�����";
-    Text[ polish ] = "URL;Multipart;Tekst" ;
-    Text[ japanese ] = "URL;Multipart;Text" ;
-    Text[ chinese_traditional ] = "URL;Multipart;Text" ;
-    Text[ greek ] = "URL;Multipart;�������" ;
-    Text[ korean ] = "URL;Multipart;텍스트" ;
-    Text[ arabic ] = "URL;Multipart;Text" ;
-    Text[ turkish ] = "URL;Multipart;Metin";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "URL;Multipart;text";
-    Text[ finnish ] = "URL;Moniosainen;Teksti";
-    Text[ thai ] = "URL;หลายส่วน;ข้อความ";
-};
 String RID_STR_DEFAULT_CHECKED
 {
     Text = "Standardstatus" ;
@@ -3447,37 +2228,6 @@ String RID_STR_DEFAULT_CHECKED
     Text[ finnish ] = "Oletustila";
     Text[ thai ] = "สถานะค่าเริ่มต้น";
 };
-String RID_STR_ENUM_CHECKED
-{
-    Text = "Nicht ausgew�hlt;Ausgew�hlt;Unbestimmt" ;
-    Text [ English ] = "No;Yes;Unassigned" ;
-    Text [ portuguese ] = "N�o seleccionado;Seleccionado;Indefinido" ;
-    Text [ english_us ] = "Not Selected;Selected;Not Defined" ;
-    Text [ portuguese_brazilian ] = "Nein;Ja;Unbestimmt" ;
-    Text [ swedish ] = "Ej utvalt;Utvalt;Obest�mt" ;
-    Text [ danish ] = "Ikke valgt;Valgt;Udefineret" ;
-    Text [ italian ] = "Non selezionato;Selezionato;Indefinito" ;
-    Text [ spanish ] = "No seleccionado;Seleccionado;Indeterminado" ;
-    Text [ french ] = "Non s�lectionn�;S�lectionn�;Ind�termin�" ;
-    Text [ dutch ] = "Niet geselecteerd;Wel geselecteerd;Onbepaald" ;
-    Text[ chinese_simplified ] = "没有选择;已选择;未定";
-    Text[ russian ] = "�� �������;�������;�� ����������";
-    Text[ polish ] = "Niewybrany;Wybrany;Nieokre�lony";
-    Text[ japanese ] = "選択していない;選択した;指定なし";
-    Text[ chinese_traditional ] = "沒有選擇;已選擇;未定";
-    Text[ greek ] = "�� ����������;����������;�� ��������";
-    Text[ korean ] = "선택되지 않음;선택됨;지정되지 않음";
-    Text[ arabic ] = "��� ���Ϻ���Ϻ��� ����";
-    Text[ turkish ] = "Se�ilmedi;Se�ildi;Belirsiz";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "No seleccionat;Seleccionat;No definit";
-    Text[ finnish ] = "Ei valittu;Valittu;Ei m��ritetty";
-    Text[ thai ] = "ไม่เลือก;เลือก;ไม่กำหนด";
-};
-String RID_STR_ENUM_SUBMIT_TARGET
-{
-    Text = "_blank;_parent;_self;_top" ;
-};
 String RID_STR_IMAGE_URL
 {
     Text = "Grafik" ;
@@ -3497,7 +2247,7 @@ String RID_STR_IMAGE_URL
     Text[ japanese ] = "図";
     Text[ chinese_traditional ] = "圖形";
     Text[ greek ] = "�������";
-    Text[ korean ] = "그래픽";
+    Text[ korean ] = "그림";
     Text[ arabic ] = "����";
     Text[ turkish ] = "Grafik";
     Text[ language_user1 ] = " ";
@@ -3524,7 +2274,7 @@ String RID_STR_DEFAULT_SELECT_SEQ
     Text[ japanese ] = "標準選択範囲";
     Text[ chinese_traditional ] = "標準選取";
     Text[ greek ] = "������� �����������";
-    Text[ korean ] = "기본 선택";
+    Text[ korean ] = "기본값 선택";
     Text[ arabic ] = "����� �������";
     Text[ turkish ] = "Standart se�im";
     Text[ language_user1 ] = " ";
@@ -3551,7 +2301,7 @@ String RID_STR_UNDO_PROPERTY
     Text[ japanese ] = "プロパティ'#'の設定";
     Text[ chinese_traditional ] = "設定屬性<#>";
     Text[ greek ] = "������� ��� ��������� '#'";
-    Text[ korean ] = "등록정보'#' 설정";
+    Text[ korean ] = "등록 정보 '#' 설정";
     Text[ arabic ] = "���� ������� '#'";
     Text[ turkish ] = "'#' �zelli�ini belirle";
     Text[ language_user1 ] = " ";
@@ -3578,7 +2328,7 @@ String RID_STR_UNDO_CONTAINER_INSERT
     TEXT[ japanese ] = "コンテナーに挿入";
     TEXT[ chinese_traditional ] = "插入到Container";
     TEXT[ greek ] = "�������� ��� �������";
-    TEXT[ korean ] = "컨테이너에 추가";
+    TEXT[ korean ] = "컨테이너에 삽입";
     TEXT[ arabic ] = "����� �� �����";
     TEXT[ turkish ] = "Tabloya ekle";
     TEXT[ language_user1 ] = " ";
@@ -3598,7 +2348,7 @@ String RID_STR_UNDO_CONTAINER_REMOVE
     TEXT[ french ] = "Supprimer #";
     TEXT[ swedish ] = "Radera #";
     TEXT[ dutch ] = "# wissen";
-    TEXT[ spanish ] = "Eliminar #";
+    TEXT[ spanish ] = "Borrar #";
     TEXT[ chinese_simplified ] = "删除 #";
     TEXT[ russian ] = "������� #";
     TEXT[ polish ] = "Usu� #";
@@ -3625,7 +2375,7 @@ String RID_STR_UNDO_CONTAINER_REMOVE_MULTIPLE
     TEXT[ french ] = "Supprimer des objets #";
     TEXT[ swedish ] = "Radera # objekt";
     TEXT[ dutch ] = "# objecten wissen";
-    TEXT[ spanish ] = "Eliminar # objetos";
+    TEXT[ spanish ] = "Borrar objetos # ";
     TEXT[ chinese_simplified ] = "删除对象 #";
     TEXT[ russian ] = "������� # ������(�,��)";
     TEXT[ polish ] = "Usu� obiekty #";
@@ -3679,7 +2429,7 @@ String RID_STR_UNDO_DELETE_LOGICAL
     TEXT[ french ] = "Supprimer la structure";
     TEXT[ swedish ] = "Radera struktur";
     TEXT[ dutch ] = "Structuur wissen";
-    TEXT[ spanish ] = "Eliminar estructura";
+    TEXT[ spanish ] = "Borrar estructura";
     TEXT[ chinese_simplified ] = "删除结构";
     TEXT[ russian ] = "������� ���������";
     TEXT[ polish ] = "Usu� struktur�";
@@ -3738,7 +2488,7 @@ String RID_STR_UNDO_MODEL_REPLACE
     Text[ polish ] = "Zamieni� pole kontrolne";
     Text[ portuguese_brazilian ] = "Replace Control";
     Text[ japanese ] = "コントロールフィールドの置換";
-    Text[ korean ] = "컨트롤 필드 바꾸기";
+    Text[ korean ] = "컨트롤 바꾸기";
     Text[ chinese_simplified ] = "替换控制";
     Text[ chinese_traditional ] = "替代控制項";
     Text[ arabic ] = "������� ���� ����";
@@ -3855,33 +2605,6 @@ String RID_STR_DATEFORMAT
     Text[ finnish ] = "P�iv�m��r�muoto";
     Text[ thai ] = "รูปแบบวันที่";
 };
-String RID_STR_DATEFORMAT_LIST
-{
-    Text = "Standard (kurz);Standard (kurz JJ);Standard (kurz JJJJ);Standard (lang);TT.MM.JJ;MM.TT.JJ;JJ.MM.TT;TT.MM.JJJJ;MM.TT.JJJJ;JJJJ.MM.TT;JJ-MM-TT (DIN5008);JJJJ-MM-TT (DIN5008)" ;
-    Text [ English ] = "Standard (short);Standard (short YY);Standard (short YYYY);Standard (long);DD.MM.YY;MM.DD.YY;YY.MM.DD;DD.MM.YYYY;MM.DD.YYYY;YYYY.MM.DD;YY-MM-DD (DIN5008);YYYY-MM-DD (DIN5008)" ;
-    Text [ portuguese ] = "Standard (curto);Standard (curto AA);Standard (curto AAAA);Standard (longo);DD.MM.AA;MM.DD.AA;AA.MM.DD;DD.MM.AAAA;MM.DD.AAAA;AAAA.MM.DD;AA-MM-DD (DIN5008);AAAA-MM-DD (DIN5008)" ;
-    Text [ english_us ] = "Standard (short);Standard (short YY);Standard (short YYYY);Standard (long);DD.MM.YY;MM.DD.YY;YY.MM.DD;DD.MM.YYYY;MM.DD.YYYY;YYYY.MM.DD;YY-MM-DD (DIN5008);YYYY-MM-DD (DIN5008)" ;
-    Text [ portuguese_brazilian ] = "Standard (kurz);Standard (kurz JJ);Standard (kurz JJJJ);Standard (lang);TT.MM.JJ;MM.TT.JJ;JJ.MM.TT;TT.MM.JJJJ;MM.TT.JJJJ;JJJJ.MM.TT;JJ-MM-TT (DIN5008);JJJJ-MM-TT (DIN5008)" ;
-    Text [ swedish ] = "Standard (kort);Standard (kort ��);Standard (kort ����);Standard (l�ng);DD.MM.��;MM.DD.��;��.MM.DD;DD.MM.����;MM.DD.����;����.MM.DD;��-MM-DD (DIN5008);����-MM-DD (DIN5008)" ;
-    Text [ danish ] = "Standard (kort);Standard (kort ��);Standard (kort ����);Standard (lang);DD.MM.��;MM.DD.��;��.MM.DD;DD.MM.����;MM.DD.����;����.MM.DD;��-MM-DD (DIN5008);����-MM-DD (DIN5008)" ;
-    Text [ italian ] = "Standard (breve);Standard (breve AA);Standard (breve AAAA);Standard (lungo);GG.MM.AA;MM.GG.AA;AA.MM.GG;GG.MM.AAAA;MM.GG.AAAA;AAAA.MM.GG;AA-MM-GG (DIN5008);AAAA-MM-GG (DIN5008)" ;
-    Text [ spanish ] = "Predeterminada (breve);Predeterminada (breve JJ);Predeterminada (breve JJJJ);Predeterminada(largo);DD.MM.AA;MM.DD.AA;AA.MM.DD;DD.MM.AAAA;MM.DD.AAAA;AAAA.MM.DD;AA-MM-DD (DIN5008);JJJJ-MM-TT (DIN5008)" ;
-    Text [ french ] = "Standard (court);Standard (court AA);Standard (court AAAA);Standard (long);JJ.MM.AA;MM.JJ.AA;AA.MM.JJ;JJ.MM.AAAA;MM.JJ.AAAA;.AAAA.MM.JJ;AA-MM-JJ (DIN5008);AAAA-MM-JJ (DIN5008)" ;
-    Text [ dutch ] = "Standaard (kort);Standaard (kort JJ);Standaard (kort JJJJ);Standaard (lang);TT.MM.JJ;MM.TT.JJ;JJ.MM.TT;TT.MM.JJJJ;MM.TT.JJJJ;JJJJ.MM.TT;JJ-MM-TT;JJJJ-MM-TT" ;
-    Text[ chinese_simplified ] = "标准(缩写);标准(缩写 JJ);标准(缩写 JJJJ);标准 (完整);DD.MM.YY;MM.DD.YY;YY.MM.DD;DD.MM.YYYY;MM.DD.YYYY;YYYY.MM.DD;YY-MM-DD (DIN5008);YYYY-MM-DD (DIN5008)";
-    Text[ russian ] = "�������� (�������);�������� (������� ��); (������� ����);�������� (������);��.MM.��;MM.��.��;��.MM.��;��.��.����;����.��.��;��-��-�� (DIN5008);����-MM-�� (DIN5008)";
-    Text[ polish ] = "Standardowy (kr�tki);Standardowy (kr�tki JJ);Standardowy (kr�tki JJJJ);Standardowy (d�ugi);TT.MM.JJ;MM.TT.JJ;JJ.MM.TT;TT.MM.JJJJ;MM.TT.JJJJ;JJJJ.MM.TT;JJ-MM-TT (DIN5008);JJJJ-MM-TT (DIN5008)";
-    Text[ japanese ] = "標準(短い形式);標準(短い形式 YY);標準(短い形式 YYYY);標準(長い形式）;DD.MM.YY;MM.DD.YY;YY.MM.DD;DD.MM.YYYY;MM.DD.YYYY;YYYY.MM.DD;YY-MM-DD (DIN5008);YYYY-MM-DD (DIN5008)";
-    Text[ chinese_traditional ] = "標準(縮寫);標準(縮寫 JJ);標準(縮寫 JJJJ);標準(完整);DD.MM.YY;MM.DD.YY;YY.MM.DD;DD.MM.YYYY;MM.DD.YYYY;YYYY.MM.DD;YY-MM-DD (DIN5008);YYYY-MM-DD (DIN5008)";
-    Text[ greek ] = "���������� (�������);���������� (������� YY);���������� (������� YYYY);���������� (�����);DD.MM.YY;MM.DD.YY;YY.MM.DD;DD.MM.YYYY;MM.DD.YYYY;YYYY.MM.DD;YY-MM-DD (DIN5008);YYYY-MM-DD (DIN5008) ";
-    Text[ korean ] = "표준(짧게);표준(짧게YY);표준(짧게YYYY);표준(길게);DD.MM.YY;MM.DD.YY;YY.MM.DD;DD.MM.YYYY;MM.DD.YYYY;YYYY.MM.DD;YY-MM-DD (DIN5008);YYYY-MM-DD (DIN5008)";
-    Text[ arabic ] = "����� (����)������ (���� YY)������ (���� YYY)������ (����)�DD.MM.YY�MM.DD.YY�YY.MM.DD�DD.MM.YYYY�MM.DD.YYYY�YYYY.MM.DD�YY-MM-DD (DIN5008)�YYYY-MM-DD (DIN5008)";
-    Text[ turkish ] = "Standart (k�sa);Standart (k�sa YY);Standart (k�sa YYYY);Standart (uzun);GG.AA.YY;AA.GG.YY;YY.AA.GG;GG.AA.YYYY;AA.GG.YYYY;YYYY.AA.GG;YY-AA-GG (DIN5008);YYYY-AA-GG (DIN5008)";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Est�ndard (breu);Est�ndard (breu JJ);Est�ndard (breu JJJJ);Est�ndard (llarg);DD.MM.AA;MM.DD.AA;AA.MM.DD;DD.MM.AAAA;MM.DD.AAAA;AAAA.MM.DD;AA-MM-DD (DIN5008);JJJJ-MM-TT (DIN5008)";
-    Text[ finnish ] = "Vakio (lyhyt);Vakio (lyhyt VV);Vakio (lyhyt VVVV);Vakio (pitk�);PP.KK.VV;KK.PP.VV;VV.KK.PP;PP.KK.VVVV;KK.PP.VVVV;VVVV.KK.PP;VV-KK-PP (DIN5008);VVVV-KK-PP (DIN5008)";
-    Text[ thai ] = "มาตรฐาน (สั้น);มาตรฐาน (สั้น ปป);มาตรฐาน (สั้น ปปปป);มาตรฐาน (ยาว);วว.ดด.ปป;ดด.วว.ปป;ปป.ดด.วว;วว.ดด.ปปปป;ดด.วว.ปปปป;ปปปป.ดด.วว;ปป-ดด-วว (DIN5008);ปปปป-ดด-วว (DIN5008)";
-};
 String RID_STR_TIME
 {
     Text = "Zeit" ;
@@ -3982,7 +2705,7 @@ String RID_STR_TIMEFORMAT
     Text[ japanese ] = "時刻の書式";
     Text[ chinese_traditional ] = "時間格式";
     Text[ greek ] = "����� ����";
-    Text[ korean ] = "시간 포맷";
+    Text[ korean ] = "시간 표기 형식";
     Text[ arabic ] = "����� ���";
     Text[ turkish ] = "Zaman format�";
     Text[ language_user1 ] = " ";
@@ -3990,32 +2713,6 @@ String RID_STR_TIMEFORMAT
     Text[ finnish ] = "Ajan muoto";
     Text[ thai ] = "รูปแบบเวลา";
 };
-String RID_STR_TIMEFORMAT_LIST
-{
-    Text = "13:45;13:45:00;01:45 PM;01:45:00 PM" ;
-    Text [ English ] = "13:45;13:45:00;01:45 PM;01:45:00 PM" ;
-    Text [ portuguese ] = "13:45;13:45:00;01:45 PM;01:45:00 PM" ;
-    Text [ english_us ] = "13:45;13:45:00;01:45 PM;01:45:00 PM" ;
-    Text [ portuguese_brazilian ] = "13:45;13:45:00;01:45 PM;01:45:00 PM" ;
-    Text [ swedish ] = "13:45;13:45:00;01:45 PM;01:45:00 PM" ;
-    Text [ danish ] = "13:45;13:45:00;01:45 PM;01:45:00 PM" ;
-    Text [ italian ] = "13:45;13:45:00;01:45 PM;01:45:00 PM" ;
-    Text [ spanish ] = "13:45;13:45:00;01:45 PM;01:45:00 PM" ;
-    Text [ french ] = "13:45;13:45:00;01:45 PM;01:45:00 PM" ;
-    Text [ dutch ] = "13:45;13:45:00;01:45 PM;01:45:00 PM" ;
-    Text[ chinese_simplified ] = "13:45;13:45:00;01:45 下午;01:45:00 下午";
-    Text[ russian ] = "13:45;13:45:00;01:45 PM;01:45:00 PM";
-    Text[ polish ] = "13:45;13:45:00;01:45 PM;01:45:00 PM";
-    Text[ japanese ] = "13:45;13:45:00;01:45 PM;01:45:00 PM";
-    Text[ chinese_traditional ] = "13:45;13:45:00;01:45 下午;01:45:00 下午";
-    Text[ greek ] = "13:45;13:45:00;01:45 PM;01:45:00 PM";
-    Text[ korean ] = "13:45;13:45:00;01:45 PM;01:45:00 PM";
-    Text[ arabic ] = "13:45;13:45:00;01:45 PM;01:45:00 PM";
-    Text[ turkish ] = "13:45;13:45:00;01:45 PM;01:45:00 PM";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "13:45;13:45:00;01:45 PM;01:45:00 PM";
-    Text[ finnish ] = "13:45;13:45:00;01:45 PM;01:45:00 PM";
-};
 String RID_STR_VALUEMIN
 {
     Text = "Min. Wert" ;
@@ -4151,32 +2848,6 @@ String RID_STR_CURRSYM_POSITION
     Text[ finnish ] = "Etuliitteen symboli";
     Text[ thai ] = "สัญลักษณ์นำหน้า";
 };
-String RID_STR_LIST_N_COMBO_FILLLIST
-{
-    Text = "Der Inhalt eines Kombinations- oder Listenfeldes konnte nicht ermittelt werden.";
-    Text [ ENGLISH ] = "The content of a combo or list box could not be determined.";
-    Text [ english_us ] = "The contents of a combo box or list field could not be determined.";
-    Text[ portuguese ] = "Foi imposs�vel determinar o conte�do de uma caixa de combina��o ou caixa de listagem.";
-    Text[ russian ] = "���������� ���������� ���������� ���� �� ������� ��� ������.";
-    Text[ greek ] = "��� ���� ������� �� ������������� �� ����������� ���� ������ ���������� � ���� ������.";
-    Text[ dutch ] = "Combinatieveld/Keuzelijst: de inhoud kan niet worden weergegeven";
-    Text[ french ] = "Impossible de d�terminer le contenu de la zone combin�e/zone de liste.";
-    Text[ spanish ] = "No se pudo determinar el contenido de un campo combinado o un listado.";
-    Text[ italian ] = "Non � stato possibile determinare il contenuto di una casella combinata o di una casella di riepilogo.";
-    Text[ danish ] = "Det var ikke muligt at bestemme indholdet for en kombinationsboks eller rulleliste.";
-    Text[ swedish ] = "Inneh�llet i ett kombinationsf�lt eller en listruta kunde inte best�mmas.";
-    Text[ polish ] = "Nie mo�na by�o ustali� zawarto�ci pola kombi lub pola listy.";
-    Text[ portuguese_brazilian ] = "ComboBox/ListBox : determine the list contents";
-    Text[ japanese ] = "コンボボックスまたはリストボックスの内容が確められませんでした。";
-    Text[ korean ] = "콤보 상자나 목록필드의 내용을 찾을 수 없습니다.";
-    Text[ chinese_simplified ] = "无法确定组合框或者列表框内的内容。";
-    Text[ chinese_traditional ] = "無法從資料庫內測定組合方塊或清單方塊的內容";
-    Text[ arabic ] = "���� ������ ��� ������� ���� ����� ���� �� ���� �����.";
-    Text[ turkish ] = "Kombinasyon alan�n�n ya da liste alan�n�n i�eri�i belirlenemedi.";
-    Text[ catalan ] = "No s'ha pogut determinar els continguts del quadre combinat o del camp de llista";
-    Text[ finnish ] = "Yhdistelm�ruudun tai luettelokent�n sis�lt�� ei voitu m��ritt��.";
-    Text[ thai ] = "ไม่สามารถกำหนดเนื้อหาของกล่องคอมโบ้หรือรายการเขตข้อมูล ";
-};
 String RID_STR_EDITMASK
 {
     Text = "Eingabemaske" ;
@@ -4187,7 +2858,7 @@ String RID_STR_EDITMASK
     Text [ swedish ] = "Inmatningsmask" ;
     Text [ danish ] = "Redigeringsmaske" ;
     Text [ italian ] = "Maschera di digitazione" ;
-    Text [ spanish ] = "M�scara de entrada" ;
+    Text [ spanish ] = "Editar m�scara" ;
     Text [ french ] = "Masque de saisie" ;
     Text [ dutch ] = "Invoervenster" ;
     Text[ chinese_simplified ] = "编辑掩码";
@@ -4250,7 +2921,7 @@ String RID_STR_ENABLED
     Text[ japanese ] = "アクティブにする";
     Text[ chinese_traditional ] = "啟動的";
     Text[ greek ] = "��������������";
-    Text[ korean ] = "활성 상태";
+    Text[ korean ] = "활성화";
     Text[ arabic ] = "���";
     Text[ turkish ] = "Etkinle�tirildi";
     Text[ language_user1 ] = " ";
@@ -4268,8 +2939,8 @@ String RID_STR_AUTOCOMPLETE
     Text [ swedish ] = "Automatisk fyllning" ;
     Text [ danish ] = "Fyld automatisk" ;
     Text [ italian ] = "Riempi automaticamente" ;
-    Text [ spanish ] = "Rellenar autom�ticamente" ;
-    Text [ french ] = "Remplir automatiquement" ;
+    Text [ spanish ] = "Relleno autom�tico" ;
+    Text [ french ] = "Remplissage automatique" ;
     Text [ dutch ] = "Automatisch vullen" ;
     Text[ chinese_simplified ] = "自动完成";
     Text[ russian ] = "��������������";
@@ -4304,7 +2975,7 @@ String RID_STR_LINECOUNT
     Text[ japanese ] = "行数";
     Text[ chinese_traditional ] = "行數";
     Text[ greek ] = "������� �������";
-    Text[ korean ] = "줄의 수";
+    Text[ korean ] = "줄 수";
     Text[ arabic ] = "��� ������";
     Text[ turkish ] = "Sat�r say�s�";
     Text[ language_user1 ] = " ";
@@ -4349,7 +3020,7 @@ String RID_STR_SPIN
     Text [ swedish ] = "Rotationsknapp" ;
     Text [ danish ] = "Rulleknap" ;
     Text [ italian ] = "Pulsante di selezione" ;
-    Text [ spanish ] = "Campo giratorio" ;
+    Text [ spanish ] = "Bot�n de selecci�n" ;
     Text [ french ] = "Compteur" ;
     Text [ dutch ] = "Draaiveld" ;
     Text[ chinese_simplified ] = "选值框";
@@ -4403,7 +3074,7 @@ String RID_STR_SHOWTHOUSANDSEP
     Text [ swedish ] = "Tusentalsavgr�nsare" ;
     Text [ danish ] = "Tusindtalsseparator" ;
     Text [ italian ] = "Car. di separz. migliaia" ;
-    Text [ spanish ] = "Delimitador decimal" ;
+    Text [ spanish ] = "Separador de miles" ;
     Text [ french ] = "S�parateur de milliers" ;
     Text [ dutch ] = "Scheidingsteken voor duizendtallen" ;
     Text[ chinese_simplified ] = "千位分隔符";
@@ -4431,7 +3102,7 @@ String RID_STR_HARDLINEBREAKS
     Text [ danish ] = "H�rdt linjeskift" ;
     Text [ italian ] = "Interruzione di riga fissa" ;
     Text [ spanish ] = "Salto de l�nea manual" ;
-    Text [ french ] = "Renvoi � la ligne forc�" ;
+    Text [ french ] = "Renvoi � la ligne direct" ;
     Text [ dutch ] = "Vast regeleinde" ;
     Text[ chinese_simplified ] = "手动换行";
     Text[ russian ] = "������� ������";
@@ -4439,7 +3110,7 @@ String RID_STR_HARDLINEBREAKS
     Text[ japanese ] = "ハード改行";
     Text[ chinese_traditional ] = "手動換行";
     Text[ greek ] = "������ ������ �������";
-    Text[ korean ] = "개행(고정)";
+    Text[ korean ] = "수동으로 줄 바꿈";
     Text[ arabic ] = "���� ���� ����";
     Text[ turkish ] = "Kullan�c� tan�ml� sat�r sonu";
     Text[ language_user1 ] = " ";
@@ -4510,7 +3181,7 @@ String RID_STR_TARGET_FRAME
     Text [ swedish ] = "Ram" ;
     Text [ danish ] = "Frame" ;
     Text [ italian ] = "Frame" ;
-    Text [ spanish ] = "Frame" ;
+    Text [ spanish ] = "Marco destino" ;
     Text [ french ] = "Frame" ;
     Text [ dutch ] = "Frame" ;
     Text[ chinese_simplified ] = "框对象";
@@ -4527,33 +3198,6 @@ String RID_STR_TARGET_FRAME
     Text[ finnish ] = "Kohdekehys";
     Text[ thai ] = "กรอบเป้าหมาย";
 };
-String RID_STR_IMPORT_GRAPHIC
-{
-    Text = "Grafik einf�gen" ;
-    Text [ English ] = "Insert graphic" ;
-    Text [ portuguese ] = "Inserir imagem" ;
-    Text [ english_us ] = "Insert graphics" ;
-    Text [ portuguese_brazilian ] = "Grafik einf?en" ;
-    Text [ swedish ] = "Infoga grafik" ;
-    Text [ danish ] = "Inds�t grafik" ;
-    Text [ italian ] = "Inserisci immagine" ;
-    Text [ spanish ] = "Insertar imagen" ;
-    Text [ french ] = "Ins�rer une image" ;
-    Text [ dutch ] = "Afbeelding invoegen" ;
-    Text[ chinese_simplified ] = "插入图形";
-    Text[ russian ] = "�������� ����������� ������";
-    Text[ polish ] = "Wstaw grafik�";
-    Text[ japanese ] = "図の挿入";
-    Text[ chinese_traditional ] = "插入圖形";
-    Text[ greek ] = "�������� ��������";
-    Text[ korean ] = "그래픽 삽입";
-    Text[ arabic ] = "����� ����";
-    Text[ turkish ] = "Grafik ekle";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Insereix imatge";
-    Text[ finnish ] = "Lis�� kuva";
-    Text[ thai ] = "แทรกกราฟิค";
-};
 String RID_STR_TAG
 {
     Text = "Zusatzinformation" ;
@@ -4600,7 +3244,7 @@ String RID_STR_ECHO_CHAR
     Text[ japanese ] = "パスワード用の記号";
     Text[ chinese_traditional ] = "密碼字元";
     Text[ greek ] = "���������� ��� �������� ���������";
-    Text[ korean ] = "패스워드용 문자";
+    Text[ korean ] = "암호용 문자";
     Text[ arabic ] = "���� ����� ����";
     Text[ turkish ] = "�ifre karakterleri";
     Text[ language_user1 ] = " ";
@@ -4690,1338 +3334,6 @@ String RID_STR_DEFAULT_BUTTON
     Text[ thai ] = "ค่าเริ่มต้นปุ่ม";
 };
  // Events
-String RID_STR_EVT_APPROVEPARAMETER
-{
-    Text = "Parameter f�llen" ;
-    Text [ English ] = "Fill parameters" ;
-    Text [ english_us ] = "Fill parameters" ;
-    Text[ portuguese ] = "Preencher par�metros";
-    Text[ russian ] = "��������� ���������";
-    Text[ greek ] = "���������� ����������";
-    Text[ dutch ] = "Parameter invullen";
-    Text[ french ] = "Remplir les param�tres";
-    Text[ spanish ] = "Rellenar par�metros";
-    Text[ italian ] = "Compila parametri";
-    Text[ danish ] = "Fyld parametre";
-    Text[ swedish ] = "Fyll parametrar";
-    Text[ polish ] = "Wype�nij parametry";
-    Text[ portuguese_brazilian ] = "Fill parameters";
-    Text[ japanese ] = "パラメータで入れる時";
-    Text[ korean ] = "파라미터 채우기";
-    Text[ chinese_simplified ] = "填入参数";
-    Text[ chinese_traditional ] = "填入參數";
-    Text[ arabic ] = "����� ��������";
-    Text[ turkish ] = "Parametreleri doldur";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Omple els par�metres";
-    Text[ finnish ] = "T�ytt�parametrit";
-    Text[ thai ] = "เติมพารามิเตอร์";
-};
-
-String RID_STR_EVT_ACTIONPERFORMED
-{
-    Text = "Beim Ausl�sen" ;
-    Text [ English ] = "on click" ;
-    Text [ portuguese ] = "Ao iniciar" ;
-    Text [ english_us ] = "When initiating" ;
-    Text [ portuguese_brazilian ] = "Aktion ausgel?t" ;
-    Text [ swedish ] = "Vid utf�rande" ;
-    Text [ danish ] = "Under udf�relse" ;
-    Text [ italian ] = "Durante l'esecuzione" ;
-    Text [ spanish ] = "Al ejecutar" ;
-    Text [ french ] = "Lors du d�clenchement" ;
-    Text [ dutch ] = "Bij het oproepen" ;
-    Text[ chinese_simplified ] = "在执行操作时";
-    Text[ russian ] = "�� ����� ����������";
-    Text[ polish ] = "Podczas wykonywania";
-    Text[ japanese ] = "コマンド実行時";
-    Text[ chinese_traditional ] = "在動作時";
-    Text[ greek ] = "���� ��� ��������";
-    Text[ korean ] = "실행할 때";
-    Text[ arabic ] = "��� �������";
-    Text[ turkish ] = "Ba�latma s�ras�nda";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "En iniciar";
-    Text[ finnish ] = "Otettaessa k�ytt��n";
-    Text[ thai ] = "เมื่อเริ่ม";
-};
-String RID_STR_EVT_AFTERDELETE
-{
-    Text = "Nach dem L�schen" ;
-    Text [ English ] = "After delete" ;
-    Text [ portuguese ] = "Depois de eliminar" ;
-    Text [ english_us ] = "After deleting" ;
-    Text [ portuguese_brazilian ] = "Nach dem L?chen" ;
-    Text [ swedish ] = "Efter radering" ;
-    Text [ danish ] = "Efter sletning" ;
-    Text [ italian ] = "Ad eliminazione avvenuta" ;
-    Text [ spanish ] = "Despu�s de eliminar" ;
-    Text [ french ] = "Apr�s la suppression" ;
-    Text [ dutch ] = "Na het wissen" ;
-    Text[ chinese_simplified ] = "删除之后";
-    Text[ russian ] = "����� ��������";
-    Text[ polish ] = "Po usuni�ciu";
-    Text[ japanese ] = "削除の後";
-    Text[ chinese_traditional ] = "刪除之後";
-    Text[ greek ] = "���� �� ��������";
-    Text[ korean ] = "삭제한 후";
-    Text[ arabic ] = "��� �����";
-    Text[ turkish ] = "Silmeden sonra";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Despr�s d'eliminar";
-    Text[ finnish ] = "Poistamisen j�lkeen";
-    Text[ thai ] = "หลังการลบ";
-};
-String RID_STR_EVT_AFTERINSERT
-{
-    Text = "Nach dem Einf�gen" ;
-    Text [ English ] = "After insert" ;
-    Text [ portuguese ] = "Depois de inserir" ;
-    Text [ english_us ] = "After insert" ;
-    Text [ portuguese_brazilian ] = "Nach dem Einf?en" ;
-    Text [ swedish ] = "Efter infogning" ;
-    Text [ danish ] = "Efter inds�t" ;
-    Text [ italian ] = "Ad inserimento avvenuto" ;
-    Text [ spanish ] = "Despu�s de insertar" ;
-    Text [ french ] = "Apr�s l'insertion" ;
-    Text [ dutch ] = "Na het invoegen" ;
-    Text[ chinese_simplified ] = "插入之后";
-    Text[ russian ] = "����� �������";
-    Text[ polish ] = "Po wstawieniu";
-    Text[ japanese ] = "挿入の後";
-    Text[ chinese_traditional ] = "插入之後";
-    Text[ greek ] = "���� ��� ��� ��������";
-    Text[ korean ] = "삽입한 후";
-    Text[ arabic ] = "��� �������";
-    Text[ turkish ] = "Eklemeden sonra";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Despr�s d'inserir";
-    Text[ finnish ] = "Lis��misen j�lkeen";
-    Text[ thai ] = "หลังการแทรก";
-};
-String RID_STR_EVT_AFTERUPDATE
-{
-    Text = "Nach dem Aktualisieren" ;
-    Text [ English ] = "After update" ;
-    Text [ portuguese ] = "Depois de actualizar" ;
-    Text [ english_us ] = "After update" ;
-    Text [ portuguese_brazilian ] = "Nach dem Aktualisieren" ;
-    Text [ swedish ] = "Efter uppdatering" ;
-    Text [ danish ] = "Efter opdatering" ;
-    Text [ italian ] = "Ad aggiornamento avvenuto" ;
-    Text [ spanish ] = "Despu�s de actualizar" ;
-    Text [ french ] = "Apr�s l'actualisation" ;
-    Text [ dutch ] = "Na het bijwerken" ;
-    Text[ chinese_simplified ] = "更新之后";
-    Text[ russian ] = "����� ����������";
-    Text[ polish ] = "Po zaktualizowaniu";
-    Text[ japanese ] = "更新した後";
-    Text[ chinese_traditional ] = "更新之後";
-    Text[ greek ] = "���� ��� ���������";
-    Text[ korean ] = "업데이트한 후";
-    Text[ arabic ] = "��� �������";
-    Text[ turkish ] = "G�ncellemeden sonra";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Despr�s d'actualitzar";
-    Text[ finnish ] = "P�ivitt�misen j�lkeen";
-    Text[ thai ] = "หลังการปรับปรุง";
-};
-String RID_STR_EVT_BEFOREDELETE
-{
-    Text = "Vor dem L�schen" ;
-    Text [ English ] = "Before delete" ;
-    Text [ portuguese ] = "Antes de eliminar" ;
-    Text [ english_us ] = "Before deletion" ;
-    Text [ portuguese_brazilian ] = "Vor dem L?chen" ;
-    Text [ swedish ] = "Innan radering" ;
-    Text [ danish ] = "Inden sletning" ;
-    Text [ italian ] = "Prima di eliminare" ;
-    Text [ spanish ] = "Antes de eliminar" ;
-    Text [ french ] = "Avant la suppression" ;
-    Text [ dutch ] = "Voor het wissen" ;
-    Text[ chinese_simplified ] = "在删除之前";
-    Text[ russian ] = "����� ���������";
-    Text[ polish ] = "Przed usuni�ciem";
-    Text[ japanese ] = "削除の前";
-    Text[ chinese_traditional ] = "在刪除之前";
-    Text[ greek ] = "���� �� ��������";
-    Text[ korean ] = "삭제하기 전";
-    Text[ arabic ] = "��� �����";
-    Text[ turkish ] = "Silmeden �nce";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Abans d'eliminar";
-    Text[ finnish ] = "Ennen poistamista";
-    Text[ thai ] = "ก่อนการลบ";
-};
-String RID_STR_EVT_BEFOREINSERT
-{
-    Text = "Vor dem Einf�gen" ;
-    Text [ English ] = "Before insert" ;
-    Text [ portuguese ] = "Antes de inserir" ;
-    Text [ english_us ] = "Before insert" ;
-    Text [ portuguese_brazilian ] = "Vor dem Einf?en" ;
-    Text [ swedish ] = "F�re infogning" ;
-    Text [ danish ] = "Inden inds�t" ;
-    Text [ italian ] = "Prima di inserire" ;
-    Text [ spanish ] = "Antes de insertar" ;
-    Text [ french ] = "Avant l'insertion" ;
-    Text [ dutch ] = "Voor het invoegen" ;
-    Text[ chinese_simplified ] = "在插入之前";
-    Text[ russian ] = "����� ��������";
-    Text[ polish ] = "Przed wstawieniem";
-    Text[ japanese ] = "挿入の前";
-    Text[ chinese_traditional ] = "在插入之前";
-    Text[ greek ] = "���� ��� ��� ��������";
-    Text[ korean ] = "삽입하기 전";
-    Text[ arabic ] = "��� �������";
-    Text[ turkish ] = "Eklemeden �nce";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Abans d'inserir";
-    Text[ finnish ] = "Ennen lis��mist�";
-    Text[ thai ] = "ก่อนการแทรก";
-};
-String RID_STR_EVT_BEFOREUPDATE
-{
-    Text = "Vor dem Aktualisieren" ;
-    Text [ English ] = "Before update" ;
-    Text [ portuguese ] = "Antes de actualizar" ;
-    Text [ english_us ] = "Before updating" ;
-    Text [ portuguese_brazilian ] = "Vor dem Aktualisieren" ;
-    Text [ swedish ] = "Innan uppdatering" ;
-    Text [ danish ] = "Inden opdatering" ;
-    Text [ italian ] = "Prima di aggiornare" ;
-    Text [ spanish ] = "Antes de actualizar" ;
-    Text [ french ] = "Avant l'actualisation" ;
-    Text [ dutch ] = "Voor het bijwerken" ;
-    Text[ chinese_simplified ] = "在更新之前";
-    Text[ russian ] = "����� �����������";
-    Text[ polish ] = "Przed aktualizacj�";
-    Text[ japanese ] = "更新する前";
-    Text[ chinese_traditional ] = "在更新之前";
-    Text[ greek ] = "���� ��� ���������";
-    Text[ korean ] = "업데이트하기 전";
-    Text[ arabic ] = "��� �������";
-    Text[ turkish ] = "G�ncellemeden �nce";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Abans d'actualitzar";
-    Text[ finnish ] = "Ennen p�ivityst�";
-    Text[ thai ] = "ก่อนการปรับปรุง";
-};
-
-String RID_STR_EVT_APPROVEROWCHANGE
-{
-    Text = "Vor der Datensatz�nderung" ;
-    Text [ English ] = "Before row change" ;
-    Text [ english_us ] = "Before record change" ;
-    Text[ portuguese ] = "Antes de modificar registo de dados";
-    Text[ russian ] = "����� ���������� ������";
-    Text[ greek ] = "���� ��� ������ ��� ��������";
-    Text[ dutch ] = "Voor het wijzigen van de record";
-    Text[ french ] = "Avant la modification de l'enregistrement";
-    Text[ spanish ] = "Antes de la modificaci�n del registro de datos";
-    Text[ italian ] = "Prima della modifica dei record di dati";
-    Text[ danish ] = "Inden datapost�ndring";
-    Text[ swedish ] = "Innan datapost�ndring";
-    Text[ polish ] = "Przed zmodyfikowaniem rekord�w";
-    Text[ portuguese_brazilian ] = "Before row change";
-    Text[ japanese ] = "レコードを変更する前";
-    Text[ korean ] = "데이터 레코드 변경 전에";
-    Text[ chinese_simplified ] = "更改数据条目之前";
-    Text[ chinese_traditional ] = "資料條目變更之前";
-    Text[ arabic ] = "��� ����� �����";
-    Text[ turkish ] = "Veri k�mesi de�i�ikli�inden �nce";
-    Text[ catalan ] = "Abans del canvi del registre";
-    Text[ finnish ] = "Ennen tietueen muuttamista";
-    Text[ thai ] = "ก่อนเปลี่ยนระเบียน";
-};
-
-String RID_STR_EVT_ROWCHANGE
-{
-    Text = "Nach der Datensatz�nderung" ;
-    Text [ English ] = "After row change" ;
-    Text [ english_us ] = "After record change" ;
-    Text[ portuguese ] = "Depois de modificar registo de dados";
-    Text[ russian ] = "����� ��������� ������";
-    Text[ greek ] = "���� ��� ������ ��� ��������";
-    Text[ dutch ] = "Na het wijzigen van de record";
-    Text[ french ] = "Apr�s la modification de l'enregistrement";
-    Text[ spanish ] = "Despu�s de la modificaci�n del registro de datos";
-    Text[ italian ] = "Dopo la modifica dei record di dati";
-    Text[ danish ] = "Efter datapost�ndring";
-    Text[ swedish ] = "Efter datapost�ndring";
-    Text[ polish ] = "Po zmodyfikowaniu rekord�w";
-    Text[ portuguese_brazilian ] = "After row change";
-    Text[ japanese ] = "レコード変更後";
-    Text[ korean ] = "데이터 레코드 변경 후에";
-    Text[ chinese_simplified ] = "更改数据条目之后";
-    Text[ chinese_traditional ] = "資料條目變更之後";
-    Text[ arabic ] = "��� ����� �����";
-    Text[ turkish ] = "Veri k�mesi de�i�ikli�inden sonra";
-    Text[ catalan ] = "Despr�s de la modificaci� del registre de dades";
-    Text[ finnish ] = "Tietueen muuttamisen j�lkeen";
-    Text[ thai ] = "หลังจากเปลี่ยนระเบียน";
-};
-
-String RID_STR_EVT_COMPONENTHIDDEN
-{
-    Text = "Verstecken" ;
-    Text [ English ] = "Component hidden" ;
-    Text [ portuguese ] = "Ocultar" ;
-    Text [ english_us ] = "Hide" ;
-    Text [ portuguese_brazilian ] = "Verstecken" ;
-    Text [ swedish ] = "D�lj" ;
-    Text [ danish ] = "Skjul" ;
-    Text [ italian ] = "Nascondi" ;
-    Text [ spanish ] = "Ocultar" ;
-    Text [ french ] = "Masquer" ;
-    Text [ dutch ] = "Verbergen" ;
-    Text[ chinese_simplified ] = "隐入";
-    Text[ russian ] = "������";
-    Text[ polish ] = "Ukryj";
-    Text[ japanese ] = "非表示";
-    Text[ chinese_traditional ] = "隱入";
-    Text[ greek ] = "��������";
-    Text[ korean ] = "숨기기";
-    Text[ arabic ] = "�����";
-    Text[ turkish ] = "Gizle";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Oculta";
-    Text[ finnish ] = "Piilota";
-    Text[ thai ] = "ซ่อน";
-};
-String RID_STR_EVT_COMPONENTMOVED
-{
-    Text = "Bewegen" ;
-    Text [ English ] = "Component moved" ;
-    Text [ portuguese ] = "Deslocar" ;
-    Text [ english_us ] = "Move" ;
-    Text [ portuguese_brazilian ] = "Bewegen" ;
-    Text [ swedish ] = "Flytta" ;
-    Text [ danish ] = "Flyt" ;
-    Text [ italian ] = "Sposta" ;
-    Text [ spanish ] = "Mover" ;
-    Text [ french ] = "D�placer" ;
-    Text [ dutch ] = "Bewegen" ;
-    Text[ chinese_simplified ] = "活动";
-    Text[ russian ] = "����������";
-    Text[ polish ] = "Poruszaj";
-    Text[ japanese ] = "移動";
-    Text[ chinese_traditional ] = "移動";
-    Text[ greek ] = "����������";
-    Text[ korean ] = "이동";
-    Text[ arabic ] = "�����";
-    Text[ turkish ] = "Ta��";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Mou";
-    Text[ finnish ] = "Siirr�";
-    Text[ thai ] = "ย้าย";
-};
-String RID_STR_EVT_COMPONENTPAINT
-{
-    Text = "Neu zeichnen" ;
-    Text [ English ] = "Component paint" ;
-    Text [ portuguese ] = "Redesenhar" ;
-    Text [ english_us ] = "Refresh" ;
-    Text [ portuguese_brazilian ] = "Neu zeichnen" ;
-    Text [ swedish ] = "Rita om" ;
-    Text [ danish ] = "Gentegn" ;
-    Text [ italian ] = "Ridisegna" ;
-    Text [ spanish ] = "Volver a dibujar" ;
-    Text [ french ] = "Redessiner" ;
-    Text [ dutch ] = "Opnieuw tekenen" ;
-    Text[ chinese_simplified ] = "重新绘制";
-    Text[ russian ] = "��������";
-    Text[ polish ] = "Rysuj ponownie";
-    Text[ japanese ] = "新しく描く";
-    Text[ chinese_traditional ] = "重新繪製";
-    Text[ greek ] = "��������� ����������";
-    Text[ korean ] = "새로 그리기";
-    Text[ arabic ] = "����� �����";
-    Text[ turkish ] = "Yenile";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Refresca";
-    Text[ finnish ] = "P�ivit�";
-    Text[ thai ] = "ฟื้นฟู";
-};
-String RID_STR_EVT_COMPONENTRESIZED
-{
-    Text = "Gr��e ge�ndert" ;
-    Text [ English ] = "Component resized" ;
-    Text [ portuguese ] = "Tamanho modificado" ;
-    Text [ english_us ] = "Component resized" ;
-    Text [ portuguese_brazilian ] = "Gr?e ge?ndert" ;
-    Text [ swedish ] = "Storlek �ndrad" ;
-    Text [ danish ] = "St�rrelse �ndret" ;
-    Text [ italian ] = "Dimensione cambiata" ;
-    Text [ spanish ] = "Tama�o modificado" ;
-    Text [ french ] = "Taille modifi�e" ;
-    Text [ dutch ] = "Grootte gewijzigd" ;
-    Text[ chinese_simplified ] = "大小已经更改";
-    Text[ russian ] = "������� ������ �����������";
-    Text[ polish ] = "Zmieniono rozmiar";
-    Text[ japanese ] = "サイズの変更";
-    Text[ chinese_traditional ] = "大小已經變更";
-    Text[ greek ] = "�� ��������������������";
-    Text[ korean ] = "크기 변경됨";
-    Text[ arabic ] = "�� ����� �����";
-    Text[ turkish ] = "Boyutu de�i�tirildi";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "S'ha canviat la mida del component";
-    Text[ finnish ] = "Komponentin koko muutettu";
-    Text[ thai ] = "ปรับขนาดส่วนประกอบโปรแกรม";
-};
-String RID_STR_EVT_COMPONENTSHOWN
-{
-    Text = "Anzeigen" ;
-    Text [ English ] = "Component shown" ;
-    Text [ portuguese ] = "Mostrar" ;
-    Text [ english_us ] = "Component shown" ;
-    Text [ portuguese_brazilian ] = "Anzeigen" ;
-    Text [ swedish ] = "Visa" ;
-    Text [ danish ] = "Vis" ;
-    Text [ italian ] = "Mostra" ;
-    Text [ spanish ] = "Mostrar" ;
-    Text [ french ] = "Afficher" ;
-    Text [ dutch ] = "Weergeven" ;
-    Text[ chinese_simplified ] = "显示";
-    Text[ russian ] = "���������� ��������";
-    Text[ polish ] = "Poka�";
-    Text[ japanese ] = "表示";
-    Text[ chinese_traditional ] = "顯示";
-    Text[ greek ] = "�������";
-    Text[ korean ] = "표시";
-    Text[ arabic ] = "�����";
-    Text[ turkish ] = "G�r�nt�le";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "S'ha mostrat el component";
-    Text[ finnish ] = "N�kyv� komponentti";
-    Text[ thai ] = "แสดงส่วนประกอบโปรแกรม";
-};
-String RID_STR_EVT_CONFIRMDELETE
-{
-    Text = "L�schen best�tigen" ;
-    Text [ English ] = "Confirm delete" ;
-    Text [ portuguese ] = "Confirmar eliminar" ;
-    Text [ english_us ] = "Confirm Deletion" ;
-    Text [ portuguese_brazilian ] = "L?chen best?tigen" ;
-    Text [ swedish ] = "Bekr�fta radering" ;
-    Text [ danish ] = "Bekr�ft sletning" ;
-    Text [ italian ] = "Conferma 'Elimina'" ;
-    Text [ spanish ] = "Confirmar eliminaci�n" ;
-    Text [ french ] = "Confirmation de suppression" ;
-    Text [ dutch ] = "Wissen bevestigen" ;
-    Text[ chinese_simplified ] = "确定删除";
-    Text[ russian ] = "����������� ��������";
-    Text[ polish ] = "Potwierd� usuni�cie";
-    Text[ japanese ] = "削除の確認";
-    Text[ chinese_traditional ] = "確認刪除";
-    Text[ greek ] = "����������� ���������";
-    Text[ korean ] = "삭제 확인";
-    Text[ arabic ] = "����� �����";
-    Text[ turkish ] = "Silme i�lemini onayla";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Confirma l'eliminaci�";
-    Text[ finnish ] = "Vahvista poistaminen";
-    Text[ thai ] = "ยืนยันการลบ";
-};
-String RID_STR_EVT_ELEMENTINSERTED
-{
-    Text = "Element eingef�gt" ;
-    Text [ English ] = "Element inserted" ;
-    Text [ portuguese ] = "Elemento inserido" ;
-    Text [ english_us ] = "Element inserted" ;
-    Text [ portuguese_brazilian ] = "Element eingef?t" ;
-    Text [ swedish ] = "Element infogat" ;
-    Text [ danish ] = "Element indsat" ;
-    Text [ italian ] = "Elemento inserito" ;
-    Text [ spanish ] = "Elemento insertado" ;
-    Text [ french ] = "L'�l�ment a �t� ins�r�" ;
-    Text [ dutch ] = "Element ingevoegd" ;
-    Text[ chinese_simplified ] = "插入条目";
-    Text[ russian ] = "������� ��������";
-    Text[ polish ] = "Wstawiono element";
-    Text[ japanese ] = "要素の挿入";
-    Text[ chinese_traditional ] = "插入條目";
-    Text[ greek ] = "�� �������� ����������";
-    Text[ korean ] = "요소 삽입됨";
-    Text[ arabic ] = "�� ����� ����";
-    Text[ turkish ] = "��e eklendi";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "S'ha inserit l'element";
-    Text[ finnish ] = "Elementti lis�tty";
-    Text[ thai ] = "แทรกองค์ประกอบ";
-};
-String RID_STR_EVT_ELEMENTREMOVED
-{
-    Text = "Element entfernt" ;
-    Text [ English ] = "Element removed" ;
-    Text [ portuguese ] = "Elemento eliminado" ;
-    Text [ english_us ] = "Element removed" ;
-    Text [ portuguese_brazilian ] = "Element entfernt" ;
-    Text [ swedish ] = "Element borttaget" ;
-    Text [ danish ] = "Element fjernet" ;
-    Text [ italian ] = "Elemento rimosso" ;
-    Text [ spanish ] = "Elemento eliminado" ;
-    Text [ french ] = "l'�l�ment a �t� enlev�" ;
-    Text [ dutch ] = "Element verwijderd" ;
-    Text[ chinese_simplified ] = "删除条目";
-    Text[ russian ] = "������� ������";
-    Text[ polish ] = "Usuni�to element";
-    Text[ japanese ] = "要素の解除";
-    Text[ chinese_traditional ] = "刪除條目";
-    Text[ greek ] = "�� �������� ���� ���������";
-    Text[ korean ] = "요소 제거됨";
-    Text[ arabic ] = "�� ����� ����";
-    Text[ turkish ] = "��e kald�r�ld�";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "S'ha suprimit l'element";
-    Text[ finnish ] = "Elementti poistettu";
-    Text[ thai ] = "เอาองค์ประกอบออก";
-};
-String RID_STR_EVT_ELEMENTREPLACED
-{
-    Text = "Element ersetzt" ;
-    Text [ English ] = "Element Replaced" ;
-    Text [ portuguese ] = "Elemento substitu�do" ;
-    Text [ english_us ] = "Element replaced" ;
-    Text [ portuguese_brazilian ] = "Element ersetzt" ;
-    Text [ swedish ] = "Element ersatt" ;
-    Text [ danish ] = "Element erstattet" ;
-    Text [ italian ] = "Elemento sostituito" ;
-    Text [ spanish ] = "Elemento sustituido" ;
-    Text [ french ] = "L'�l�ment recherch� a �t� remplac�" ;
-    Text [ dutch ] = "Element vervangen" ;
-    Text[ chinese_simplified ] = "替换条目";
-    Text[ russian ] = "������� �������";
-    Text[ polish ] = "Zamieniono element";
-    Text[ japanese ] = "要素の置換";
-    Text[ chinese_traditional ] = "替代條目";
-    Text[ greek ] = "�� �������� ���� ��������������";
-    Text[ korean ] = "요소 변경됨";
-    Text[ arabic ] = "�� ������� ����";
-    Text[ turkish ] = "��e ba�kas�yla de�i�tirildi";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Element substitu�t";
-    Text[ finnish ] = "Elementti korvattu";
-    Text[ thai ] = "แทนที่องค์ประกอบ";
-};
-String RID_STR_EVT_ERROROCCURED
-{
-    Text = "Fehler aufgetreten" ;
-    Text [ English ] = "Error occured" ;
-    Text [ portuguese ] = "Surgiu erro" ;
-    Text [ english_us ] = "Error occurred" ;
-    Text [ portuguese_brazilian ] = "Fehler aufgetreten" ;
-    Text [ swedish ] = "Fel har uppst�tt" ;
-    Text [ danish ] = "Der opstod en fejl" ;
-    Text [ italian ] = "Si � verificato un errore" ;
-    Text [ spanish ] = "Ha ocurrido un error" ;
-    Text [ french ] = "Erreur survenue" ;
-    Text [ dutch ] = "Fout opgetreden" ;
-    Text[ chinese_simplified ] = "发生一个错误";
-    Text[ russian ] = "������";
-    Text[ polish ] = "Wyst�pi� b��d";
-    Text[ japanese ] = "エラー発生";
-    Text[ chinese_traditional ] = "發生一個錯誤";
-    Text[ greek ] = "������������� ������";
-    Text[ korean ] = "오류 발생";
-    Text[ arabic ] = "��� ���";
-    Text[ turkish ] = "Hata olu�tu";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "S'ha produ�t un error";
-    Text[ finnish ] = "On ilmennyt virhe";
-    Text[ thai ] = "เกิดความผิดพลาด";
-};
-String RID_STR_EVT_FIRING
-{
-    Text = "Abschu�" ;
-    Text [ English ] = "firing" ;
-    Text [ portuguese ] = "Disparar" ;
-    Text [ english_us ] = "Firing" ;
-    Text [ portuguese_brazilian ] = "Abschu?" ;
-    Text [ swedish ] = "Avfyrning" ;
-    Text [ danish ] = "Affyring" ;
-    Text [ italian ] = "Lancio" ;
-    Text [ spanish ] = "Disparo" ;
-    Text [ french ] = "Feu" ;
-    Text [ dutch ] = "Afsluiting" ;
-    Text[ chinese_simplified ] = "清除";
-    Text[ russian ] = "������";
-    Text[ polish ] = "Odstrza�";
-    Text[ japanese ] = "Firing";
-    Text[ chinese_traditional ] = "清除";
-    Text[ greek ] = "���������";
-    Text[ korean ] = "점화";
-    Text[ arabic ] = "�����";
-    Text[ turkish ] = "Firing";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Tret";
-    Text[ finnish ] = "Laukaistaan";
-    Text[ thai ] = "เผา";
-};
-String RID_STR_EVT_FOCUSGAINED
-{
-    Text = "Bei Fokuserhalt" ;
-    Text [ English ] = "Focus gained" ;
-    Text [ portuguese ] = "Ao receber foco" ;
-    Text [ english_us ] = "When receiving focus" ;
-    Text [ portuguese_brazilian ] = "Bei Fokuserhalt" ;
-    Text [ swedish ] = "Vid fokusering" ;
-    Text [ danish ] = "Ved fokusopretholdelse" ;
-    Text [ italian ] = "Raggiungimento del punto focale" ;
-    Text [ spanish ] = "Recepci�n de foco" ;
-    Text [ french ] = "R�ception de focus" ;
-    Text [ dutch ] = "Indien focus bereikt" ;
-    Text[ chinese_simplified ] = "在瞄准时";
-    Text[ russian ] = "��� ��������� ������";
-    Text[ polish ] = "Po otrzymaniu ogniska";
-    Text[ japanese ] = "フォーカスを得た時";
-    Text[ chinese_traditional ] = "在瞄準時";
-    Text[ greek ] = "�� ��������� ��������";
-    Text[ korean ] = "초점을 맞췄을 때";
-    Text[ arabic ] = "��� ������ ��� �������";
-    Text[ turkish ] = "Odakland�";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "En rebre l'enfocament";
-    Text[ finnish ] = "Kun kohdistus saavutetaan";
-    Text[ thai ] = "เมื่อได้โฟกัส";
-};
-String RID_STR_EVT_FOCUSLOST
-{
-    Text = "Bei Fokusverlust" ;
-    Text [ English ] = "Focus lost" ;
-    Text [ portuguese ] = "Ao perder foco" ;
-    Text [ english_us ] = "When losing focus" ;
-    Text [ portuguese_brazilian ] = "Bei Fokusverlust" ;
-    Text [ swedish ] = "Vid fokusf�rlust" ;
-    Text [ danish ] = "Ved fokustab" ;
-    Text [ italian ] = "Perdita del punto focale" ;
-    Text [ spanish ] = "P�rdida de foco" ;
-    Text [ french ] = "Perte de focus" ;
-    Text [ dutch ] = "Bij focusverlies" ;
-    Text[ chinese_simplified ] = "在偏离目标时";
-    Text[ russian ] = "��� ������ ������";
-    Text[ polish ] = "Po utracie ogniska";
-    Text[ japanese ] = "フォーカスを失った時";
-    Text[ chinese_traditional ] = "在偏離目標時";
-    Text[ greek ] = "���� ��������� �������� ������";
-    Text[ korean ] = "초점을 잃었을 때";
-    Text[ arabic ] = "����� �������";
-    Text[ turkish ] = "Odak kayboldu";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "En perdre l'enfocament";
-    Text[ finnish ] = "Kun kohdistus menetet��n";
-    Text[ thai ] = "เมื่อเสียโฟกัส";
-};
-String RID_STR_EVT_ITEMSTATECHANGED
-{
-    Text = "Status ge�ndert" ;
-    Text [ English ] = "Item state changed" ;
-    Text [ portuguese ] = "Estado modificado" ;
-    Text [ english_us ] = "Item status changed" ;
-    Text [ portuguese_brazilian ] = "Status ge?ndert" ;
-    Text [ swedish ] = "Status �ndrad" ;
-    Text [ danish ] = "Status �ndret" ;
-    Text [ italian ] = "Stato modificato" ;
-    Text [ spanish ] = "Estado modificado" ;
-    Text [ french ] = "Statut modifi�" ;
-    Text [ dutch ] = "Status gewijzigd" ;
-    Text[ chinese_simplified ] = "状态已经更改";
-    Text[ russian ] = "��������� �������� ��������";
-    Text[ polish ] = "Zmieniony stan";
-    Text[ japanese ] = "ステータスを変更した時";
-    Text[ chinese_traditional ] = "狀態已經變更";
-    Text[ greek ] = "��������� �������������";
-    Text[ korean ] = "상태 변경";
-    Text[ arabic ] = "�� ����� ������";
-    Text[ turkish ] = "Durum de�i�tirildi";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "L'estat de l'element ha canviat";
-    Text[ finnish ] = "Nimikkeen tilaa muutettu";
-    Text[ thai ] = "เปลี่ยนแปลงสถานะรายการ";
-};
-String RID_STR_EVT_KEYTYPED
-{
-    Text = "Taste gedr�ckt" ;
-    Text [ English ] = "Key typed" ;
-    Text [ portuguese ] = "Tecla premida" ;
-    Text [ english_us ] = "Key pressed" ;
-    Text [ portuguese_brazilian ] = "Nach Tastendruck" ;
-    Text [ swedish ] = "Tangent tryckt" ;
-    Text [ danish ] = "Knap trykket" ;
-    Text [ italian ] = "Tasto premuto" ;
-    Text [ spanish ] = "Tecla pulsada" ;
-    Text [ french ] = "Touche enfonc�e" ;
-    Text [ dutch ] = "Met ingedrukte toets" ;
-    Text[ chinese_simplified ] = "按住按键";
-    Text[ russian ] = "������� ������";
-    Text[ polish ] = "Po naci�ni�ciu klawisza";
-    Text[ japanese ] = "キーを押した時";
-    Text[ chinese_traditional ] = "按住按鍵";
-    Text[ greek ] = "������� ��������";
-    Text[ korean ] = "키 눌렀음";
-    Text[ arabic ] = "����� ��� ��";
-    Text[ turkish ] = "Tu� bas�l�";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Tecla premuda";
-    Text[ finnish ] = "N�pp�int� painettu";
-    Text[ thai ] = "กดแป้น";
-};
-
-String RID_STR_EVT_KEYUP
-{
-    Text = "Taste losgelassen" ;
-    Text [ English ] = "Key up" ;
-    Text [ portuguese ] = "Depois de premir tecla" ;
-    Text [ english_us ] = "Key released" ;
-    Text [ portuguese_brazilian ] = "Nach Tastendruck" ;
-    Text [ swedish ] = "Efter tangenttryck" ;
-    Text [ danish ] = "Knap sluppet" ;
-    Text [ italian ] = "Dopo aver premuto il tasto" ;
-    Text [ spanish ] = "Despu�s de haber pulsado la tecla" ;
-    Text [ french ] = "Apr�s avoir l�ch� la touche" ;
-    Text [ dutch ] = "Toets losgelaten" ;
-    Text[ chinese_simplified ] = "放开按键";
-    Text[ russian ] = "������� ��������";
-    Text[ polish ] = "Po zwolnieniu klawisza";
-    Text[ japanese ] = "キーから離れた時";
-    Text[ chinese_traditional ] = "放開按鍵";
-    Text[ greek ] = "������� ��������������";
-    Text[ korean ] = "키에서 손을 떼기";
-    Text[ arabic ] = "��� ����� ��� ��";
-    Text[ turkish ] = "Tu� b�ralk�ld���nda";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "S'ha alliberat la clau";
-    Text[ finnish ] = "Vapautettu avain";
-    Text[ thai ] = "ปล่อยแป้น";
-};
-
-String RID_STR_EVT_LOADED
-{
-    Text = "Beim Laden" ;
-    Text [ English ] = "When loading" ;
-    Text [ portuguese ] = "Ao carregar" ;
-    Text [ english_us ] = "When loading" ;
-    Text [ portuguese_brazilian ] = "Beim Laden" ;
-    Text [ swedish ] = "Vid laddning" ;
-    Text [ danish ] = "Ved indl�sning" ;
-    Text [ italian ] = "Durante il caricamento" ;
-    Text [ spanish ] = "Al cargar" ;
-    Text [ french ] = "Lors du chargement" ;
-    Text [ dutch ] = "Bij het laden" ;
-    Text[ chinese_simplified ] = "在装入时";
-    Text[ russian ] = "��� ��������";
-    Text[ polish ] = "Podczas �adowania";
-    Text[ japanese ] = "読み込む時";
-    Text[ chinese_traditional ] = "在載入時";
-    Text[ greek ] = "���� �� �������";
-    Text[ korean ] = "로드할 때";
-    Text[ arabic ] = "��� �������";
-    Text[ turkish ] = "Y�kleme s�ras�nda";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "En carregar";
-    Text[ finnish ] = "Ladattaessa";
-    Text[ thai ] = "เมื่อโหลด";
-};
-
-String RID_STR_EVT_RELOADING
-{
-    Text = "Vor dem erneuten Laden";
-    Text [ english ] = "Before reloading" ;
-    Text [ english_us ] = "Before reloading" ;
-    Text[ portuguese ] = "Antes de recarregar";
-    Text[ russian ] = "����� �������������";
-    Text[ greek ] = "���� ��� ������������";
-    Text[ dutch ] = "Alvorens opnieuw te laden";
-    Text[ french ] = "Avant le rechargement";
-    Text[ spanish ] = "Antes de recargar";
-    Text[ italian ] = "Prima del ricaricamento";
-    Text[ danish ] = "F�r ny indl�sning";
-    Text[ swedish ] = "F�re omladdning";
-    Text[ polish ] = "Przed ponownym za�adowaniem";
-    Text[ portuguese_brazilian ] = "Before reloading";
-    Text[ japanese ] = "再ロードする前";
-    Text[ korean ] = "다시 로드하기 전에";
-    Text[ chinese_simplified ] = "在重新载入之前";
-    Text[ chinese_traditional ] = "在重新載入之前";
-    Text[ turkish ] = "Before reloading";
-    Text[ arabic ] = "��� ����� �������";
-    Text[ catalan ] = "Abans de tornar a carregar";
-    Text[ finnish ] = "Ennen uudelleenlatausta";
-    Text[ thai ] = "เมื่อโหลดอีกครั้ง";
-};
-
-String RID_STR_EVT_RELOADED
-{
-    Text = "Beim erneuten Laden" ;
-    Text [ English ] = "When reloading" ;
-    Text [ english_us ] = "When reloading" ;
-    Text[ portuguese ] = "Ao recarregar";
-    Text[ russian ] = "��� ������������";
-    Text[ greek ] = "���� ��� ��������� ��� ��������";
-    Text[ dutch ] = "Bij het opnieuw laden";
-    Text[ french ] = "Lors du rechargement";
-    Text[ spanish ] = "Al recargar";
-    Text[ italian ] = "Durante il ricaricamento";
-    Text[ danish ] = "Under genladning";
-    Text[ swedish ] = "Vid omladdning";
-    Text[ polish ] = "Podczas ponownego �adowania";
-    Text[ portuguese_brazilian ] = "When reloading";
-    Text[ japanese ] = "再読み込み時";
-    Text[ korean ] = "새로 로드할 때";
-    Text[ chinese_simplified ] = "在重新装入时";
-    Text[ chinese_traditional ] = "在重新載入時";
-    Text[ arabic ] = "��� ����� �������";
-    Text[ turkish ] = "Yeniden y�kleme s�ras�nda";
-    Text[ catalan ] = "En tornar a carregar";
-    Text[ finnish ] = "Uudelleenlatauksen yhteydess�";
-    Text[ thai ] = "เมื่อโหลดอีกครั้ง";
-};
-
-String RID_STR_EVT_MOUSEDRAGGED
-{
-    Text = "Mausbewegung bei Tastendruck" ;
-    Text [ English ] = "Mouse dragged" ;
-    Text [ portuguese ] = "Mover rato ao premir tecla" ;
-    Text [ english_us ] = "Mouse moved while key pressed" ;
-    Text [ portuguese_brazilian ] = "Mausbewegung bei Tastendruck" ;
-    Text [ swedish ] = "Musr�relse vid tangenttryck" ;
-    Text [ danish ] = "Musbev�gelse ved knaptryk" ;
-    Text [ italian ] = "Movimento del mouse premendo i tasti" ;
-    Text [ spanish ] = "Mover rat�n por medio del teclado" ;
-    Text [ french ] = "D�placement de la souris et touche enfonc�e" ;
-    Text [ dutch ] = "Muisbeweging bij indrukken toets" ;
-    Text[ chinese_simplified ] = "按住鼠标键移动";
-    Text[ russian ] = "����������� ���� ��� ������� �������";
-    Text[ polish ] = "Przesuwanie myszy z naci�ni�tym przyciskiem";
-    Text[ japanese ] = "キーを押しマウス操作する時";
-    Text[ chinese_traditional ] = "按住滑鼠按鍵移動";
-    Text[ greek ] = "���������� ��������� �� �������� �������";
-    Text[ korean ] = "키를 누를 때 마우스 이동";
-    Text[ arabic ] = "����� ������ ����� ����� ��� ����";
-    Text[ turkish ] = "Tu�a basarak fare hareketi";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Moure el ratol� per mitj� del teclat";
-    Text[ finnish ] = "Hiirt� siirretty, kun painiketta painettu";
-    Text[ thai ] = "เลื่อนเม้าส์ขณะกดแป้น";
-};
-String RID_STR_EVT_MOUSEENTERED
-{
-    Text = "Maus innerhalb" ;
-    Text [ English ] = "Mouse entered" ;
-    Text [ portuguese ] = "Rato dentro" ;
-    Text [ english_us ] = "Mouse inside" ;
-    Text [ portuguese_brazilian ] = "Maus innerhalb" ;
-    Text [ swedish ] = "Mus inom" ;
-    Text [ danish ] = "Mus indenfor" ;
-    Text [ italian ] = "Mouse dentro" ;
-    Text [ spanish ] = "Rat�n dentro" ;
-    Text [ french ] = "Souris � l'int�rieur" ;
-    Text [ dutch ] = "Muis binnen" ;
-    Text[ chinese_simplified ] = "鼠标进入";
-    Text[ russian ] = "���� ������";
-    Text[ polish ] = "Mysz wewn�trz";
-    Text[ japanese ] = "マウスを内に入れた時";
-    Text[ chinese_traditional ] = "鼠標進入";
-    Text[ greek ] = "������� �����";
-    Text[ korean ] = "마우스 내부";
-    Text[ arabic ] = "������ �������";
-    Text[ turkish ] = "Fare i�erde";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Ratol� a dins";
-    Text[ finnish ] = "Hiiri sis�puolella";
-    Text[ thai ] = "ด้านในเม้าส์";
-};
-String RID_STR_EVT_MOUSEEXITED
-{
-    Text = "Maus ausserhalb" ;
-    Text [ English ] = "Mouse exited" ;
-    Text [ portuguese ] = "Rato fora" ;
-    Text [ english_us ] = "Mouse outside" ;
-    Text [ portuguese_brazilian ] = "Maus ausserhalb" ;
-    Text [ swedish ] = "Mus utanf�r" ;
-    Text [ danish ] = "Mus udenfor" ;
-    Text [ italian ] = "Mouse fuori" ;
-    Text [ spanish ] = "Rat�n fuera" ;
-    Text [ french ] = "Souris � l'ext�rieur" ;
-    Text [ dutch ] = "Muis buiten" ;
-    Text[ chinese_simplified ] = "鼠标退出";
-    Text[ russian ] = "���� �������";
-    Text[ polish ] = "Mysz na zewn�trz";
-    Text[ japanese ] = "マウスを外に出した時";
-    Text[ chinese_traditional ] = "鼠標退出";
-    Text[ greek ] = "������� �����";
-    Text[ korean ] = "마우스 외부";
-    Text[ arabic ] = "������ �������";
-    Text[ turkish ] = "Fare d��arda";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Ratoli a fora";
-    Text[ finnish ] = "Hiiri ulkopuolella";
-    Text[ thai ] = "ด้านนอกเม้าส์";
-};
-String RID_STR_EVT_MOUSEMOVED
-{
-    Text = "Mausbewegung" ;
-    Text [ English ] = "Mouse moved" ;
-    Text [ portuguese ] = "Mover rato" ;
-    Text [ english_us ] = "Mouse moved" ;
-    Text [ portuguese_brazilian ] = "Mausbewegung" ;
-    Text [ swedish ] = "Musr�relse" ;
-    Text [ danish ] = "Musbev�gelse" ;
-    Text [ italian ] = "Movimento del mouse" ;
-    Text [ spanish ] = "Movimiento de rat�n" ;
-    Text [ french ] = "D�placement de la souris" ;
-    Text [ dutch ] = "Muisbeweging" ;
-    Text[ chinese_simplified ] = "鼠标活动";
-    Text[ russian ] = "����������� ����";
-    Text[ polish ] = "Przesuni�cie myszy";
-    Text[ japanese ] = "マウス操作時";
-    Text[ chinese_traditional ] = "鼠標移動";
-    Text[ greek ] = "������ ���������";
-    Text[ korean ] = "마우스 이동";
-    Text[ arabic ] = "����� ������";
-    Text[ turkish ] = "Fare hareketi";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Movimient del ratol�";
-    Text[ finnish ] = "Hiirt� siirretty";
-    Text[ thai ] = "เลื่อนเม้าส์";
-};
-String RID_STR_EVT_MOUSEPRESSED
-{
-    Text = "Maustaste gedr�ckt" ;
-    Text [ English ] = "Mouse pressed" ;
-    Text [ portuguese ] = "Bot�o do rato premido" ;
-    Text [ english_us ] = "Mouse button pressed" ;
-    Text [ portuguese_brazilian ] = "Maustaste gedr?kt" ;
-    Text [ swedish ] = "Musknapp nedtryckt" ;
-    Text [ danish ] = "Museknap trykket" ;
-    Text [ italian ] = "Tasto del mouse premuto" ;
-    Text [ spanish ] = "Pulsar bot�n del rat�n" ;
-    Text [ french ] = "Bouton de souris enfonc�" ;
-    Text [ dutch ] = "Muistoets ingedrukt" ;
-    Text[ chinese_simplified ] = "按住鼠标键";
-    Text[ russian ] = "������� ���� ������";
-    Text[ polish ] = "Przycisk myszy naci�ni�ty";
-    Text[ japanese ] = "マウスボタンを押した時";
-    Text[ chinese_traditional ] = "按住滑鼠鍵";
-    Text[ greek ] = "������� ��������� ��������";
-    Text[ korean ] = "마우스 누름";
-    Text[ arabic ] = "����� ��� �� ������";
-    Text[ turkish ] = "Fare tu�u bas�l�";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "S'ha fet clic amb el bot� del ratol�";
-    Text[ finnish ] = "Hiiren painiketta painettu";
-    Text[ thai ] = "กดปุ่มเม้าส์";
-};
-String RID_STR_EVT_MOUSERELEASED
-{
-    Text = "Maustaste losgelassen" ;
-    Text [ English ] = "Mouse released" ;
-    Text [ portuguese ] = "Bot�o do rato largado" ;
-    Text [ english_us ] = "Mouse button released" ;
-    Text [ portuguese_brazilian ] = "Maustaste losgelassen" ;
-    Text [ swedish ] = "Musknapp uppsl�ppt" ;
-    Text [ danish ] = "Museknap sluppet" ;
-    Text [ italian ] = "Tasto del mouse rilasciato" ;
-    Text [ spanish ] = "Bot�n del rat�n soltado" ;
-    Text [ french ] = "Bouton de souris rel�ch�" ;
-    Text [ dutch ] = "Muistoets losgelaten" ;
-    Text[ chinese_simplified ] = "放开鼠标键";
-    Text[ russian ] = "������� ���� ��������";
-    Text[ polish ] = "Po zwolnieniu przycisku myszy";
-    Text[ japanese ] = "マウスボタンから離れた時";
-    Text[ chinese_traditional ] = "放開滑鼠鍵";
-    Text[ greek ] = "������� ��������� ��������������";
-    Text[ korean ] = "마우스에서 손을 떼기";
-    Text[ arabic ] = "��� ����� ��� �� ������";
-    Text[ turkish ] = "Fare tu�u b�rak�lm��";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "S'ha deixat anar el bot� del ratol�";
-    Text[ finnish ] = "Hiiren painike vapautettu";
-    Text[ thai ] = "ปล่อยปุ่มเม้าส์";
-};
-String RID_STR_EVT_POSITIONING
-{
-    Text = "Vor dem Datensatzwechsel" ;
-    Text [ English ] = "Prior positioning" ;
-    Text [ english_us ] = "Before record change" ;
-    Text[ portuguese ] = "Antes da altera��o do registo";
-    Text[ russian ] = "����� ��������� �������";
-    Text[ greek ] = "���� ��� ������ ��������";
-    Text[ dutch ] = "Voor wisselen van record";
-    Text[ french ] = "Avant le changement d'enregistrement";
-    Text[ spanish ] = "Antes del cambio de registro de datos";
-    Text[ italian ] = "Prima del cambio record di dati";
-    Text[ danish ] = "Inden datapostskift";
-    Text[ swedish ] = "F�re datapostv�xling";
-    Text[ polish ] = "Przed zmian� rekord�w";
-    Text[ portuguese_brazilian ] = "Prior positioning";
-    Text[ japanese ] = "レコード置換前";
-    Text[ korean ] = "레코드 변경 전에";
-    Text[ chinese_simplified ] = "在转换数据条目之前";
-    Text[ chinese_traditional ] = "在變換資料條目之前";
-    Text[ arabic ] = "��� ����� �����";
-    Text[ turkish ] = "Veri k�mesi de�i�ikli�inden �nce";
-    Text[ catalan ] = "Abans del canvi del registre";
-    Text[ finnish ] = "Ennen tietueen muuttamista";
-    Text[ thai ] = "ก่อนเปลี่ยนระเบียน";
-};
-String RID_STR_EVT_POSITIONED
-{
-    Text = "Nach dem Datensatzwechsel" ;
-    Text [ English ] = "After positioning" ;
-    Text [ english_us ] = "After record change" ;
-    Text [ portuguese_brazilian ] = "Position ver?ndert" ;
-    Text [ swedish ] = "Efter datapostv�xling" ;
-    Text [ danish ] = "Efter datapostskift" ;
-    Text [ italian ] = "Dopo il cambio record di dati" ;
-    Text [ spanish ] = "Tras el cambio de registro de datos" ;
-    Text [ french ] = "Apr�s le changement d'enregistrement" ;
-    Text [ dutch ] = "Na wisselen van record" ;
-    Text[ chinese_simplified ] = "转换数据条目以后";
-    Text[ russian ] = "����� ��������� ������";
-    Text[ polish ] = "Po zmianie rekord�w";
-    Text[ japanese ] = "レコード置換後";
-    Text[ chinese_traditional ] = "在變換資料條目之後";
-    Text[ greek ] = "���� ��� ������ ��������";
-    Text[ korean ] = "레코드 변경 후에";
-    Text[ arabic ] = "��� ����� �����";
-    Text[ portuguese ] = "Ap�s altera��o do registo";
-    Text[ turkish ] = "Veri k�mesi de�i�ikli�inden sonra";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Despr�s del canvi del registre";
-    Text[ finnish ] = "Tietueen muuttamisen j�lkeen";
-    Text[ thai ] = "หลังจากเปลี่ยนระเบียน";
-};
-String RID_STR_EVT_PROPERTIESCHANGE
-{
-    Text = "Eigenschaften ge�ndert" ;
-    Text [ English ] = "Properties change" ;
-    Text [ portuguese ] = "Propriedades modificadas" ;
-    Text [ english_us ] = "Properties change" ;
-    Text [ portuguese_brazilian ] = "Eigenschaften ge?ndert" ;
-    Text [ swedish ] = "Egenskaper �ndrade" ;
-    Text [ danish ] = "Egenskaber �ndret" ;
-    Text [ italian ] = "Propriet� cambiate" ;
-    Text [ spanish ] = "Propiedades modificadas" ;
-    Text [ french ] = "Propri�t�s modifi�es" ;
-    Text [ dutch ] = "Eigenschappen gewijzigd" ;
-    Text[ chinese_simplified ] = "属性已经更改";
-    Text[ russian ] = "�������� ��������";
-    Text[ polish ] = "Zmieniono w�a�ciwo�ci";
-    Text[ japanese ] = "プロパティの変更";
-    Text[ chinese_traditional ] = "屬性已經變更";
-    Text[ greek ] = "��������� ��������������";
-    Text[ korean ] = "등록정보 변경";
-    Text[ arabic ] = "�� ����� �������";
-    Text[ turkish ] = "�zellikler de�i�tirildi";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Canvi de propietats";
-    Text[ finnish ] = "Ominaisuuksien muutos";
-    Text[ thai ] = "เปลี่ยนคุณสมบัติ";
-};
-String RID_STR_EVT_PROPERTYCHANGE
-{
-    Text = "Eigenschaft ge�ndert" ;
-    Text [ English ] = "Property changed" ;
-    Text [ portuguese ] = "Propriedade modificada" ;
-    Text [ english_us ] = "Property changed" ;
-    Text [ portuguese_brazilian ] = "Eigenschaft ge?ndert" ;
-    Text [ swedish ] = "Egenskap �ndrad" ;
-    Text [ danish ] = "Egenskab �ndret" ;
-    Text [ italian ] = "Propriet� cambiata" ;
-    Text [ spanish ] = "Propiedad modificada" ;
-    Text [ french ] = "Propri�t� a �t� chang�" ;
-    Text [ dutch ] = "Eigenschap gewijzigd" ;
-    Text[ chinese_simplified ] = "属性已经更改";
-    Text[ russian ] = "�������� ��������";
-    Text[ polish ] = "Zmieniono w�a�ciwo�ci";
-    Text[ japanese ] = "プロパティの変更";
-    Text[ chinese_traditional ] = "屬性已經變更";
-    Text[ greek ] = "�������� �������������";
-    Text[ korean ] = "등록정보 변경";
-    Text[ arabic ] = "�� ����� �������";
-    Text[ turkish ] = "�zellik de�i�tirildi";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "La propietat ha canviat";
-    Text[ finnish ] = "Ominaisuus muutettu";
-    Text[ thai ] = "เปลี่ยนคุณสมบัติ";
-};
-String RID_STR_EVT_PROPERTYSTATECHANGE
-{
-    Text = "Statuseigenschaft ge�ndert" ;
-    Text [ English ] = "Property state changed" ;
-    Text [ portuguese ] = "Estado de propriedades modificado" ;
-    Text [ english_us ] = "Property status changed" ;
-    Text [ portuguese_brazilian ] = "Statuseigenschaft ge?ndert" ;
-    Text [ swedish ] = "Statusegenskap �ndrad" ;
-    Text [ danish ] = "Statusegenskab �ndret" ;
-    Text [ italian ] = "Propriet� stato modificato" ;
-    Text [ spanish ] = "Propiedad de estado modificada" ;
-    Text [ french ] = "Propri�t� de statut modifi�e" ;
-    Text [ dutch ] = "Statuseigenschap gewijzigd" ;
-    Text[ chinese_simplified ] = "状态属性已经更改";
-    Text[ russian ] = "�������� ��������� ��������";
-    Text[ polish ] = "Zmieniony stan w�a�ciwo�ci";
-    Text[ japanese ] = "ステータスの属性に変更";
-    Text[ chinese_traditional ] = "狀態屬性已經變更";
-    Text[ greek ] = "�������� ���������� �������������";
-    Text[ korean ] = "상태 등록정보 변경";
-    Text[ arabic ] = "�� ����� ����� ������";
-    Text[ turkish ] = "Durum �zellikleri de�i�tirildi";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "L'estat de la propietat ha canviat";
-    Text[ finnish ] = "Ominaisuustila muutettu";
-    Text[ thai ] = "เปลี่ยนสถานะคุณสมบัติ";
-};
-String RID_STR_EVT_RESETTED
-{
-    Text = "Nach dem Zur�cksetzen" ;
-    Text [ English ] = "After reset" ;
-    Text [ portuguese ] = "Depois de restaurar" ;
-    Text [ english_us ] = "After resetting" ;
-    Text [ portuguese_brazilian ] = "Zur?kgesetzt" ;
-    Text [ swedish ] = "Efter �terst�llande" ;
-    Text [ danish ] = "Efter nulstilling" ;
-    Text [ italian ] = "Dopo aver ripristinato" ;
-    Text [ spanish ] = "Despu�s de restaurar" ;
-    Text [ french ] = "Apr�s la restauration" ;
-    Text [ dutch ] = "Na het herstellen" ;
-    Text[ chinese_simplified ] = "重新设定之后";
-    Text[ russian ] = "����� ��������������";
-    Text[ polish ] = "Po cofni�ciu";
-    Text[ japanese ] = "元に戻した後";
-    Text[ chinese_traditional ] = "重設之後";
-    Text[ greek ] = "���� ��� ���������";
-    Text[ korean ] = "리셋한 후에";
-    Text[ arabic ] = "��� ����� �������";
-    Text[ turkish ] = "Geri almadan sonra";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Despr�s de restaurar";
-    Text[ finnish ] = "Uudelleenasetuksen j�lkeen";
-    Text[ thai ] = "หลังการกำหนดค่าใหม่";
-};
-
-String RID_STR_EVT_APPROVERESETTED
-{
-    Text = "Vor dem Zur�cksetzen" ;
-    Text [ English ] = "Approve resetted" ;
-    Text [ portuguese ] = "Antes de restaurar" ;
-    Text [ english_us ] = "Prior to Reset" ;
-    Text [ portuguese_brazilian ] = "Zur?kgesetzt" ;
-    Text [ swedish ] = "Innan �terst�llning" ;
-    Text [ danish ] = "Inden nulstilning" ;
-    Text [ italian ] = "Prima di ripristinare" ;
-    Text [ spanish ] = "Antes de restablecer" ;
-    Text [ french ] = "Avant la restauration" ;
-    Text [ dutch ] = "Voor het herstellen" ;
-    Text[ chinese_simplified ] = "在重设之前";
-    Text[ russian ] = "����� ���������������";
-    Text[ polish ] = "Przed cofni�ciem";
-    Text[ japanese ] = "元に戻す前";
-    Text[ chinese_traditional ] = "在重設之前";
-    Text[ greek ] = "���� ��� ���������";
-    Text[ korean ] = "리셋하기 전에";
-    Text[ arabic ] = "��� ����� �������";
-    Text[ turkish ] = "Geri almadan �nce";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Abans de reiniciar";
-    Text[ finnish ] = "Ennen uudelleenk�ynnistyst�";
-    Text[ thai ] = "ก่อนที่จะกำหนดค่าใหม่";
-};
-
-String RID_STR_EVT_APPROVEACTIONPERFORMED
-{
-    Text = "Vor dem Ausl�sen" ;
-    Text [ English ] = "Before click" ;
-    Text [ portuguese ] = "Antes de executar" ;
-    Text [ english_us ] = "Before commencing" ;
-    Text [ portuguese_brazilian ] = "Aktion ausgel?t" ;
-    Text [ swedish ] = "Innan utf�rande" ;
-    Text [ danish ] = "Inden udf�relse" ;
-    Text [ italian ] = "Prima dell'esecuzione" ;
-    Text [ spanish ] = "antes de ejecutar" ;
-    Text [ french ] = "Avant le d�clenchement" ;
-    Text [ dutch ] = "Voor het oproepen" ;
-    Text[ chinese_simplified ] = "在操作之前";
-    Text[ russian ] = "����� �����������";
-    Text[ polish ] = "Przed wykonaniem";
-    Text[ japanese ] = "実行前";
-    Text[ chinese_traditional ] = "在動作之前";
-    Text[ greek ] = "���� ��� ��������";
-    Text[ korean ] = "작동 전에";
-    Text[ arabic ] = "��� ��� �������";
-    Text[ turkish ] = "Ba�latmadan �nce";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Abans d'executar";
-    Text[ finnish ] = "Ennen aloittamista";
-    Text[ thai ] = "ก่อนการตั้งต้น";
-};
-
-String RID_STR_EVT_SUBMITTED
-{
-    Text = "Vor dem Submit" ;
-    Text [ English ] = "Before submit" ;
-    Text [ english_us ] = "Before submitting" ;
-    Text[ portuguese ] = "Antes de enviar";
-    Text[ russian ] = "����� ��������������";
-    Text[ greek ] = "���� ��� �������";
-    Text[ dutch ] = "Voor submit";
-    Text[ french ] = "Avant l'envoi";
-    Text[ spanish ] = "Antes del env�o";
-    Text[ italian ] = "Prima dell'invio";
-    Text[ danish ] = "Inden submitting";
-    Text[ swedish ] = "Innan s�ndning";
-    Text[ polish ] = "Przed submitem";
-    Text[ portuguese_brazilian ] = "Submit";
-    Text[ japanese ] = "サブミットする前";
-    Text[ korean ] = "전송하기 전에";
-    Text[ chinese_simplified ] = "提交之前";
-    Text[ chinese_traditional ] = "提交之前";
-    Text[ arabic ] = "��� �������";
-    Text[ turkish ] = "G�ndermeden �nce";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Abans de la tramesa";
-    Text[ finnish ] = "Ennen l�hett�mist�";
-    Text[ thai ] = "ก่อนการยอมรับ";
-};
-
-String RID_STR_EVT_TEXTCHANGED
-{
-    Text = "Text modifiziert" ;
-    Text [ English ] = "Text changed" ;
-    Text [ portuguese ] = "Texto modificado" ;
-    Text [ english_us ] = "Text modified" ;
-    Text [ portuguese_brazilian ] = "Text modifiziert" ;
-    Text [ swedish ] = "Text modifierad" ;
-    Text [ danish ] = "Tekst �ndret" ;
-    Text [ italian ] = "Testo modificato" ;
-    Text [ spanish ] = "Texto modificado" ;
-    Text [ french ] = "Texte modifi�" ;
-    Text [ dutch ] = "Tekst gemodificeerd" ;
-    Text[ chinese_simplified ] = "文字已经修改";
-    Text[ russian ] = "����� �������";
-    Text[ polish ] = "Tekst zmodyfikowano";
-    Text[ japanese ] = "テキストを変更した時";
-    Text[ chinese_traditional ] = "文字已經修改";
-    Text[ greek ] = "����������� ��������";
-    Text[ korean ] = "텍스트 변경";
-    Text[ arabic ] = "��� ����� ����";
-    Text[ turkish ] = "Metin de�i�tirildi";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Text modificat";
-    Text[ finnish ] = "Muutettu teksti";
-    Text[ thai ] = "ดัดแปลงแก้ไขข้อความ";
-};
-
-String RID_STR_EVT_UNLOADING
-{
-    Text = "Vor dem Entladen";
-    Text [ english ] = "Before unloading" ;
-    Text [ english_us ] = "Before unloading" ;
-    Text[ portuguese ] = "Antes de descarregar";
-    Text[ russian ] = "����� ���������";
-    Text[ greek ] = "���� ��� ����������";
-    Text[ dutch ] = "Voor het afsluiten";
-    Text[ french ] = "Avant le d�chargement";
-    Text[ spanish ] = "Antes de descargar";
-    Text[ italian ] = "Prima di scaricare";
-    Text[ danish ] = "F�r fjernelse";
-    Text[ swedish ] = "Innan avladdning";
-    Text[ polish ] = "Przed roz�adowaniem";
-    Text[ portuguese_brazilian ] = "Before unloading";
-    Text[ japanese ] = "アンロードする前";
-    Text[ korean ] = "언로드하기 전에";
-    Text[ chinese_simplified ] = "在退卸之前";
-    Text[ chinese_traditional ] = "在退卸之前";
-    Text[ turkish ] = "Before unloading";
-    Text[ arabic ] = "��� ����� �������";
-    Text[ catalan ] = "Abans de descarregar";
-    Text[ finnish ] = "Ennen muistista poistamista";
-    Text[ thai ] = "ก่อนไม่โหลด";
-};
-
-String RID_STR_EVT_UNLOADED
-{
-    Text = "Beim Entladen" ;
-    Text [ English ] = "When unloading" ;
-    Text [ portuguese ] = "Ao descarregar" ;
-    Text [ english_us ] = "When unloading" ;
-    Text [ portuguese_brazilian ] = "Beim Schlie?en" ;
-    Text [ swedish ] = "Vid avladdning" ;
-    Text [ danish ] = "Under afladning" ;
-    Text [ italian ] = "Durante lo scaricamento" ;
-    Text [ spanish ] = "Al descargar" ;
-    Text [ french ] = "Lors du d�chargement" ;
-    Text [ dutch ] = "Bij het sluiten" ;
-    Text[ chinese_simplified ] = "在退卸时";
-    Text[ russian ] = "�� ����� ��������";
-    Text[ polish ] = "Przy roz�adowywaniu";
-    Text[ japanese ] = "アンロードする時";
-    Text[ chinese_traditional ] = "在退卸時";
-    Text[ greek ] = "���� ��� ����������";
-    Text[ korean ] = "언로드할 때";
-    Text[ arabic ] = "��� ����� �������";
-    Text[ turkish ] = "Kapatma s�ras�nda";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "En descarregar";
-    Text[ finnish ] = "Poistettaessa muistista";
-    Text[ thai ] = "เมื่อไม่โหลด";
-};
-String RID_STR_EVT_UPDATECANCELED
-{
-    Text = "Update abgebrochen" ;
-    Text [ English ] = "Update canceled" ;
-    Text [ portuguese ] = "Actualiza��o cancelada" ;
-    Text [ english_us ] = "Update canceled" ;
-    Text [ portuguese_brazilian ] = "Update abgebrochen" ;
-    Text [ swedish ] = "Uppdatering avbruten" ;
-    Text [ danish ] = "Opdatering annulleret" ;
-    Text [ italian ] = "Update interrotto" ;
-    Text [ spanish ] = "Actualizaci�n interrumpida" ;
-    Text [ french ] = "Mise � jour annul�e" ;
-    Text [ dutch ] = "Update gestopt" ;
-    Text[ chinese_simplified ] = "已经中断更新";
-    Text[ russian ] = "���������� ��������";
-    Text[ polish ] = "Aktualizacja zosta�a anulowana";
-    Text[ japanese ] = "更新の中止";
-    Text[ chinese_traditional ] = "已經中斷升級";
-    Text[ greek ] = "������� ����������";
-    Text[ korean ] = "업테이트 취소됨";
-    Text[ arabic ] = "�� ��� ����� �������";
-    Text[ turkish ] = "G�ncelleme iptal edildi";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Actualitzaci� interrompuda";
-    Text[ finnish ] = "P�ivitys peruutettu";
-    Text[ thai ] = "ยกเลิกการปรับปรุง";
-};
-String RID_STR_EVT_VETOABLECHANGE
-{
-    Text = "Ablehnbare �nderung" ;
-    Text [ English ] = "Vetoable change" ;
-    Text [ portuguese ] = "Modifica��o rejeit�vel" ;
-    Text [ english_us ] = "Rejectable modification" ;
-    Text [ portuguese_brazilian ] = "Ablehnbare ?nderung" ;
-    Text [ swedish ] = "Ignorerbar �ndring" ;
-    Text [ danish ] = "�ndring som kan forkastes" ;
-    Text [ italian ] = "Modifica ricusabile" ;
-    Text [ spanish ] = "Modificaci�n rechazable" ;
-    Text [ french ] = "Modification optionnelle" ;
-    Text [ dutch ] = "Wijziging kan ongedaan worden gemaakt" ;
-    Text[ chinese_simplified ] = "可拒绝的更改";
-    Text[ russian ] = "����������� ���������";
-    Text[ polish ] = "Zmiana mo�liwa do odrzucenia";
-    Text[ japanese ] = "拒否できる変更";
-    Text[ chinese_traditional ] = "可拒絕的變更";
-    Text[ greek ] = "������� �� ���������� ���������";
-    Text[ korean ] = "거부 가능한 변경";
-    Text[ arabic ] = "������� ���� �����";
-    Text[ turkish ] = "Reddedilebilir de�i�iklik";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Modificaci� eliminable";
-    Text[ finnish ] = "Hyl�tt�v� muutos";
-    Text[ thai ] = "สามารถปฏิเสธการดัดแปลงแก้ไข";
-};
 String RID_STR_PROPTITLE_PUSHBUTTON
 {
     Text = "Schaltfl�che" ;
@@ -6068,7 +3380,7 @@ String RID_STR_PROPTITLE_RADIOBUTTON
     Text[ japanese ] = "ラジオボタン";
     Text[ chinese_traditional ] = "選項欄位";
     Text[ greek ] = "����� ��������";
-    Text[ korean ] = "옵션 필드";
+    Text[ korean ] = "옵션 버튼";
     Text[ arabic ] = "�� ����";
     Text[ turkish ] = "Se�im alan�";
     Text[ language_user1 ] = " ";
@@ -6117,12 +3429,12 @@ String RID_STR_PROPTITLE_FIXEDTEXT
     Text [ french ] = "Champ d'�tiquette" ;
     Text [ dutch ] = "Titelveld" ;
     Text[ chinese_simplified ] = "标签字段";
-    Text[ russian ] = "���� �������";
+    Text[ russian ] = "�������";
     Text[ polish ] = "Pole etykiety";
     Text[ japanese ] = "ラベルフィールド";
     Text[ chinese_traditional ] = "標籤欄位";
     Text[ greek ] = "����� ���������";
-    Text[ korean ] = "라벨 필드";
+    Text[ korean ] = "레이블 필드";
     Text[ arabic ] = "��� �����";
     Text[ turkish ] = "Etiket alan�";
     Text[ language_user1 ] = " ";
@@ -6190,7 +3502,7 @@ String RID_STR_PROPTITLE_FORMATTED
     Text [ ENGLISH ] = "Formatted Field" ;
     Text[ english_us ] = "Formatted Field";
     Text[ portuguese ] = "Campo formatado";
-    Text[ russian ] = "���� ��������������";
+    Text[ russian ] = "���� � ���������������";
     Text[ greek ] = "������������� �����";
     Text[ dutch ] = "Opgemaakt veld";
     Text[ french ] = "Champ format�";
@@ -6201,7 +3513,7 @@ String RID_STR_PROPTITLE_FORMATTED
     Text[ polish ] = "Formatowane pole";
     Text[ portuguese_brazilian ] = "Formatted Field";
     Text[ japanese ] = "書式設定されたフィールド";
-    Text[ korean ] = "서식 지정된 필드";
+    Text[ korean ] = "서식 있는 필드";
     Text[ chinese_simplified ] = "格式化的字段";
     Text[ chinese_traditional ] = "格式化的欄位";
     Text[ arabic ] = "��� �������";
@@ -6228,7 +3540,7 @@ String RID_STR_MOVING_CURSOR
     Text[ polish ] = "Wyr�wna� �r�d�o danych";
     Text[ portuguese_brazilian ] = "align data source";
     Text[ japanese ] = "データソースの配置";
-    Text[ korean ] = "데이터 소스 맞춤";
+    Text[ korean ] = "데이터 원본 맞춤";
     Text[ chinese_simplified ] = "排列数据源";
     Text[ chinese_traditional ] = "調整資料源";
     Text[ arabic ] = "������ ���� ��������";
@@ -6275,7 +3587,7 @@ String RID_STR_PROPTITLE_COMBOBOX
     Text [ swedish ] = "Kombinationsf�lt" ;
     Text [ danish ] = "Kombinationsboks" ;
     Text [ italian ] = "Casella combinata" ;
-    Text [ spanish ] = "Campo combinado" ;
+    Text [ spanish ] = "Cuadro combinado" ;
     Text [ french ] = "Zone combin�e" ;
     Text [ dutch ] = "Combinatieveld" ;
     Text[ chinese_simplified ] = "组合框";
@@ -6338,7 +3650,7 @@ String RID_STR_PROPTITLE_IMAGECONTROL
     Text[ japanese ] = "イメージコントロール";
     Text[ chinese_traditional ] = "圖式控制項";
     Text[ greek ] = "������� ����� �������";
-    Text[ korean ] = "이미지 컨트롤 필드";
+    Text[ korean ] = "이미지 컨트롤";
     Text[ arabic ] = "���� ���� �����";
     Text[ turkish ] = "Grafiksel komut ��esi";
     Text[ language_user1 ] = " ";
@@ -6360,7 +3672,7 @@ String RID_STR_PROPTITLE_FILECONTROL
     Text [ french ] = "S�lection de fichier" ;
     Text [ dutch ] = "Bestandselectie" ;
     Text[ chinese_simplified ] = "选择文件";
-    Text[ russian ] = "��� ������";
+    Text[ russian ] = "����� �����";
     Text[ polish ] = "Wyb�r plik�w";
     Text[ japanese ] = "ファイルの選択";
     Text[ chinese_traditional ] = "選擇檔案";
@@ -6522,12 +3834,12 @@ String RID_STR_PROPTITLE_DBGRID
     Text [ french ] = "Contr�le de table " ;
     Text [ dutch ] = "Tabellen-controleveld" ;
     Text[ chinese_simplified ] = "表格控制 ";
-    Text[ russian ] = "������� ���������� ������ ";
+    Text[ russian ] = "������� ���������� ������� ";
     Text[ polish ] = "Pole kontrolne tabeli ";
     Text[ japanese ] = "テーブルコントロール ";
     Text[ chinese_traditional ] = "表格控制項 ";
     Text[ greek ] = "����� ������� ������ ";
-    Text[ korean ] = "표 컨트롤 필드 ";
+    Text[ korean ] = "테이블 컨트롤";
     Text[ arabic ] = "���� ���� ��� ��������";
     Text[ turkish ] = "Tablo komut ��esi ";
     Text[ language_user1 ] = " ";
@@ -6589,33 +3901,6 @@ String RID_STR_TRISTATE
     Text[ finnish ] = "Kolmitila";
     Text[ thai ] = "สามสถานะ";
 };
-String RID_STR_EVT_CHANGED
-{
-    Text = "Modifiziert" ;
-    Text [ ENGLISH ] = "changed" ;
-    Text [ portuguese ] = "Modificado" ;
-    Text [ english_us ] = "changed" ;
-    Text [ portuguese_brazilian ] = "Modifiziert" ;
-    Text [ swedish ] = "Modifierad" ;
-    Text [ danish ] = "Modificeret" ;
-    Text [ italian ] = "Modificato" ;
-    Text [ spanish ] = "Modificado" ;
-    Text [ french ] = "Modifi�(es)" ;
-    Text [ dutch ] = "Gemodificeerd" ;
-    Text[ chinese_simplified ] = "已经修改";
-    Text[ russian ] = "�������";
-    Text[ polish ] = "Zmodyfikowano";
-    Text[ japanese ] = "変更した時";
-    Text[ chinese_traditional ] = "已經修改";
-    Text[ greek ] = "�������������";
-    Text[ korean ] = "변경됨";
-    Text[ arabic ] = "����";
-    Text[ turkish ] = "De�i�tirildi";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "canviat";
-    Text[ finnish ] = "muutettu";
-    Text[ thai ] = "เปลี่ยนแปลง";
-};
 String RID_STR_NODATACONTROLS
 {
     Text = "Es existieren keine an ein g�ltiges Tabellenfeld gebundenen Controls im aktuellen Formular !" ;
@@ -6635,7 +3920,7 @@ String RID_STR_NODATACONTROLS
     Text[ japanese ] = "現在の形式に有効な表フィールドに関連するコントロールはありません!";
     Text[ chinese_traditional ] = "使用中的表單沒有一個有效的和表單欄位連結的控制項﹗";
     Text[ greek ] = "��� �������� ����� ��� �������� �������� ������� �� �������� �� ������ ������ ����� �������!";
-    Text[ korean ] = "현재의 양식에는 유효한 시트 필드에 연결된 컨트롤이 없습니다!";
+    Text[ korean ] = "현재의 양식에는 데이터와 관련된 컨트롤이 없습니다.";
     Text[ arabic ] = "�� ���� ����� ���� ������ ���� ���� ���� �� ��������� �������!";
     Text[ turkish ] = "Y�r�rl�kteki formda, ge�erli bir tablo alan�na ba�l� komut ��eleri yok!";
     Text[ language_user1 ] = " ";
@@ -6718,7 +4003,7 @@ String RID_STR_RECORDMARKER
     Text[ chinese_simplified ] = "数据标记";
     Text[ chinese_traditional ] = "資料標記";
     Text[ greek ] = "������� ��������";
-    Text[ korean ] = "데이터 레코드 선택 표시";
+    Text[ korean ] = "레코드 표시기";
     Text[ arabic ] = "����� �����";
     Text[ turkish ] = "Veri k�mesi i�areti";
     Text[ language_user1 ] = " ";
@@ -6822,7 +4107,7 @@ String RID_STR_FILTER_FILTER_FOR
     Text[ greek ] = "����������� �� ����";
     Text[ dutch ] = "Filter voor";
     Text[ french ] = "Filtrer";
-    Text[ spanish ] = "Filtrar por";
+    Text[ spanish ] = "Filtrar seg�n";
     Text[ italian ] = "Filtra per";
     Text[ danish ] = "Filtrer efter";
     Text[ swedish ] = "Filter efter";
@@ -6884,7 +4169,7 @@ String RID_STR_NOCONTROLS_FOR_EXTERNALDISPLAY
     Text[ polish ] = "W aktualnym formularzu brak wa�nych formant�w, kt�rych mo�na by by�o u�y� dla widoku tabeli!";
     Text[ portuguese_brazilian ] = "No valid bound controls usable for the table view exist in the current form";
     Text[ japanese ] = "表ビューに使用できる、結合の有効なコントロールは現在のフォームの中にありません。";
-    Text[ korean ] = "현재의 양식에는 시트 보기에 사용될 수 있는 유효한 연결된 컨트롤이 없습니다.";
+    Text[ korean ] = "현재의 양식에는 테이블 보기에 사용할 수 있는 유효한 관련 컨트롤이 없습니다.";
     Text[ chinese_simplified ] = "当前的表单内没有可用于表格视图的有效控件！";
     Text[ chinese_traditional ] = "開啓的表單沒有有效的啟動表格檢視模式的控制件。";
     Text[ arabic ] = "�� ��������� ������ɡ �� ���� ����� ���� ������ ���� ���� ���� ��������� �� ����� ��� ������!";
@@ -6912,7 +4197,7 @@ String RID_STR_LABELCONTROL
     Text[ polish ] = "Pole etykiety";
     Text[ portuguese_brazilian ] = "Label field";
     Text[ japanese ] = "ラベルフィールド";
-    Text[ korean ] = "라벨 필드";
+    Text[ korean ] = "레이블 필드";
     Text[ chinese_simplified ] = "标签字段";
     Text[ chinese_traditional ] = "標籤欄位";
     Text[ arabic ] = "��� �����";
@@ -6922,33 +4207,6 @@ String RID_STR_LABELCONTROL
     Text[ thai ] = "ป้ายชื่อเขตข้อมูล";
 };
 
-String RID_STR_VETO_DATASOURCE
-{
-    Text = "Die Eigenschaft 'Datenbank' darf nicht ver�ndert werden, da das Formular bereits Bestandteil einer Datenbank ist!";
-    Text [ ENGLISH ] = "The property 'Database' can not be changed as the form already belongs to a database!";
-    Text[ english_us ] = "The property 'Database' can not be changed as the form already belongs to a database!";
-    Text[ portuguese ] = "� imposs�vel modificar a propriedade 'Base de dados', uma vez que o formul�rio j� pertence a uma base de dados!";
-    Text[ russian ] = "�������� �������� '���� ������' ������, ��������� ��� ����� �������� ������ ���� ������!";
-    Text[ greek ] = "� �������� '���� ���������' ��� ����������� �� ������������ ������ � ����� �������� ��� ������ ����� ��� ����� ���������!";
-    Text[ dutch ] = "De eigenschap 'Database' mag niet worden gewijzigd omdat het formulier reeds onderdeel is van een database.";
-    Text[ french ] = "Impossible de modifier la propri�t� 'Base de donn�es' : le formulaire a d�j� �t� int�gr� � une base de donn�es !";
-    Text[ spanish ] = "�La propiedad 'Base de datos' no se puede modificar porque el formulario ya forma parte de una base de datos!";
-    Text[ italian ] = "La propriet� 'database' non pu� essere cambiata in quanto il formulario � gi� parte del database.";
-    Text[ danish ] = "Det er ikke tilladt at �ndre egenskaben 'Database', fordi formularen allerede er en del af en database!";
-    Text[ swedish ] = "Egenskapen 'Databas' f�r inte �ndras eftersom formul�ret redan �r del av en databas!";
-    Text[ polish ] = "W�a�ciwo�ci 'Bazy danych' nie wolno zmienia�, poniwa� formularz jest ju� cz�ci� bazy danych.";
-    Text[ portuguese_brazilian ] = "The property 'Database' can not be changed as the form already belongs to a database!";
-    Text[ japanese ] = "フォームがすでにデータベースの構成要素なのでプロパティ[データベース]は変更できません!";
-    Text[ korean ] = "양식은 이미 데이터베이스의 구성요소이므로 등록정보 '데이터베이스'를 변경해서는 안됩니다!";
-    Text[ chinese_simplified ] = "不可以更改\"数据库\"属性，因为表单已经是数据库的组成部分！";
-    Text[ chinese_traditional ] = "資料庫屬性不可以變更，因為表單是資料庫的組成部分！";
-    Text[ arabic ] = "�� ����� ������ ������� '����� ������'� ��� ��������� �� ������ ��� �� ����� ������!";
-    Text[ turkish ] = "Form bir veritaban�n�n ��esi oldu�undan, 'veritaban�' �zelli�i de�i�tirilemez!";
-    Text[ catalan ] = "No es pot canviar la propietat 'Database' com a formulari ja que pertany a la base de dades!";
-    Text[ finnish ] = "Tietokanta-ominaisuutta ei voi muuttaa, koska lomake on jo tietokannassa.";
-    Text[ thai ] = "ไม่สามารถเปลี่ยนคุณสมบัติ 'ฐานข้อมูล' เป็นแบบที่เป็นของฐานข้อมูลแล้ว";
-};
-
 String RID_STR_AUTOFIELD
 {
     Text = "<AutoFeld>";
@@ -6959,7 +4217,7 @@ String RID_STR_AUTOFIELD
     Text[ greek ] = "<���������>";
     Text[ dutch ] = "<AutoVeld>";
     Text[ french ] = "<AutoChamp>";
-    Text[ spanish ] = "<AutoCampo>";
+    Text[ spanish ] = "<Campo autom�tico>";
     Text[ italian ] = "<Campo automatico>";
     Text[ danish ] = "<AutoFelt>";
     Text[ swedish ] = "<AutoF�lt>";
@@ -7015,7 +4273,7 @@ String RID_STR_ESCAPE_PROCESSING
     Text[ greek ] = "������� ������� SQL";
     Text[ dutch ] = "SQL-opdracht analyseren";
     Text[ french ] = "Analyser l'instruction SQL";
-    Text[ spanish ] = "Analizar comando SQL";
+    Text[ spanish ] = "Analizar la orden SQL";
     Text[ italian ] = "Analizza comando SQL";
     Text[ danish ] = "Analyser SQL-kommando";
     Text[ swedish ] = "Analysera SQL-kommando";
@@ -7083,162 +4341,6 @@ String RID_STR_COULDNOTSETFILTER
     Text[ finnish ] = "Virhe suodatusehtojen m��rityksess�";
     Text[ thai ] = "กำหนดเกณฑ์ในการกรองผิดพลาด";
 };
-String RID_STR_SQLEXCEPTIONTYPES
-{
-    Text = "Fehler;Warnung;Information;Details;SQL-Status;Fehler-Code";
-    Text [ english ] = "error;warning;information;details;SQL State;error code";
-    Text [ english_us ] = "Error;Warning;Information;Details;SQL status;Error code";
-    Text[ portuguese ] = "Erro;Advert�ncia;Informa��o;Detalhes;Estado-SQL;C�digo de erro";
-    Text[ russian ] = "������;��������������;����������;������;��������� SQL;��� ������";
-    Text[ greek ] = "������;����������;�����������;������������;�������� SQL; ������� ���������";
-    Text[ dutch ] = "fout;waarschuwing;informatie;details;SQL status; foutcode";
-    Text[ french ] = "Erreur;avertissement;information;d�tails;statut SQL;code d'erreur";
-    Text[ spanish ] = "Error;Aviso;Informaci�n;Detalles;Estado SQL;C�digo de error";
-    Text[ italian ] = "Errore;Avviso;Informazione;Dettagli;Stato SQL;Codice errato";
-    Text[ danish ] = "Fejl; Advarsel; Information;Detaljer;SQL-status;Fejlkode";
-    Text[ swedish ] = "fel;varning;information;detaljer;SQL-status; felkod";
-    Text[ polish ] = "b��d;ostrze�enie;szczeg�y;stan SQL;kod b��du";
-    Text[ portuguese_brazilian ] = "error;warning;information;details;SQL State; error code";
-    Text[ japanese ] = "エラー;警告;情報;詳細;SQLのステータス;エラーコード";
-    Text[ korean ] = "오류;경고;정보;자세히;SQL 상태; 오류 코드";
-    Text[ chinese_simplified ] = "错误;警告;信息;细节;SQL状态; 错误代码";
-    Text[ chinese_traditional ] = "錯誤;警告;資訊;細節;SQL 狀態; 錯誤碼";
-    Text[ arabic ] = "���;�����;������;������;���� SQL;��� �����";
-    Text[ turkish ] = "Hata;Uyar�;Bilgi;Ayr�nt�lar;SQL durumu;Hata kodu";
-    Text[ catalan ] = "Error;Av�s;Informaci�;Detalls;Estat SQL;C�di d'error";
-    Text[ finnish ] = "Virhe;Varoitus;Tiedot;Lis�tiedot;SQL-tila;Virhekoodi";
-    Text[ thai ] = "ข้อผิดพลาด;คำเตือน;ข้อมูล;รายละเอียด;สถานะ SQL ;รหัสผิดพลาด";
-};
-String RID_ERR_REFRESHING_SUB_FORM
-{
-    Text = "Die Dateninhalte des Unterformulars konnten nicht aktualisiert werden.";
-    Text [ english ] = "The data content of the sub form could not be refreshed.";
-    Text [ english_us ] = "The sub form data content could not be refreshed.";
-    Text[ portuguese ] = "Foi imposs�vel actualizar o conte�do dos dados do sub-formul�rio.";
-    Text[ russian ] = "���������� �������� ���������� ������ ��������.";
-    Text[ greek ] = "��� ���� ������� �� ����� ��������� ��� ������������� ��� ��������� ��� ���������.";
-    Text[ dutch ] = "De gegevens van het subformulier kunnen niet worden bijgewerkt.";
-    Text[ french ] = "Impossible d'actualiser le contenu des donn�es du sous-formulaire.";
-    Text[ spanish ] = "No se pudieron actualizar los contenidos de los datos del subformulario.";
-    Text[ italian ] = "Non � stato possibile aggiornare i contenuti del formulario.";
-    Text[ danish ] = "Det var ikke muligt at opdatere underformularens dataindhold.";
-    Text[ swedish ] = "Det gick inte att uppdatera datainneh�llet i det underordnade formul�ret.";
-    Text[ polish ] = "Nie mo�na by�o zaktualizowa� zawarto�ci formularza podrz�dnego.";
-    Text[ portuguese_brazilian ] = "The data content of the sub form could not be refreshed.";
-    Text[ japanese ] = "サブフォームのデータ内容が更新できませんでした。";
-    Text[ korean ] = "하위 양식의 데이터 내용을 새로 변경하지 못했습니다.";
-    Text[ chinese_simplified ] = "无法更新子表单内的数据内容。";
-    Text[ chinese_traditional ] = "無法更新子表格的資料內容";
-    Text[ arabic ] = "���� ����� ��������� �������� ��������� �������.";
-    Text[ turkish ] = "Alt d�zey formun veri i�eri�i g�ncellenemedi.";
-    Text[ catalan ] = "No s'ha pogut refrescar el contingut de les dades del sub formulari.";
-    Text[ finnish ] = "Alilomakkeen tietosis�ll�n p�ivitt�minen ei onnistunut.";
-    Text[ thai ] = "ไม่สามารถฟื้นฟูเนื้อหาข้อมูลของแบบย่อย";
-};
-String RID_ERR_LOADING_FORM
-{
-    Text = "Die Dateninhalte konnten nicht geladen werden.";
-    Text [ english ] = "The data content could not be loaded.";
-    Text [ english_us ] = "The data content could not be loaded.";
-    Text[ portuguese ] = "Foi imposs�vel carregar o conte�do dos dados.";
-    Text[ russian ] = "���������� ��������� ���������� ������.";
-    Text[ greek ] = "��� ���� ������� �� ����� ������� ��� ������������ ���������.";
-    Text[ dutch ] = "De gegevens kunnen niet worden geladen.";
-    Text[ french ] = "Impossible de charger le contenu des donn�es.";
-    Text[ spanish ] = "No se pudieron cargar los contenidos de los datos.";
-    Text[ italian ] = "Non � stato possibile caricare i contenuti.";
-    Text[ danish ] = "Det var ikke muligt at indl�se dataindholdet.";
-    Text[ swedish ] = "Datainneh�llet kunde inte laddas.";
-    Text[ polish ] = "Nie mo�na by�o za�adowa� zawarto�ci danych.";
-    Text[ portuguese_brazilian ] = "The data content could not be loaded.";
-    Text[ japanese ] = "データ内容が読み込みできませんでした。";
-    Text[ korean ] = "데이터 내용을 로드하지 못했습니다.";
-    Text[ chinese_simplified ] = "无法装入数据内容。";
-    Text[ chinese_traditional ] = "無法載入資料內容。";
-    Text[ arabic ] = "���� ����� ��������� ��������.";
-    Text[ turkish ] = "Veri i�eri�i y�klenemedi.";
-    Text[ catalan ] = "No s'ha pogut carregar el contingut de les dades.";
-    Text[ finnish ] = "Tietosis�ll�n lataaminen ei onnistunut.";
-    Text[ thai ] = "ไม่สามารถโหลดเนื้อหาข้อมูลได้";
-};
-String RID_ERR_REFRESHING_FORM
-{
-    Text = "Die Dateninhalte konnten nicht aktualisiert werden.";
-    Text [ english ] = "The data content could not be refreshed.";
-    Text [ english_us ] = "The data content could not be refreshed.";
-    Text[ portuguese ] = "Foi imposs�vel actualizar o conte�do dos dados.";
-    Text[ russian ] = "���������� �������� ���������� ������.";
-    Text[ greek ] = "��� ���� ������� �� ����� ��������� ��� ������������ ���������.";
-    Text[ dutch ] = "De gegevens kunnen niet worden bijgewerkt:";
-    Text[ french ] = "Impossible d'actualiser le contenu des donn�es.";
-    Text[ spanish ] = "No se pudieron actualizar los contenidos de los datos.";
-    Text[ italian ] = "Non � stato possibile aggiornare i contenuti.";
-    Text[ danish ] = "Det var ikke muligt at opdatere dataindholdet.";
-    Text[ swedish ] = "Datainneh�llet kunde inte uppdateras.";
-    Text[ polish ] = "Nie mo�na by�o zaktualizowa� zawarto�ci danych.";
-    Text[ portuguese_brazilian ] = "The data content could not be refreshed.";
-    Text[ japanese ] = "データ内容が更新できませんでした。";
-    Text[ korean ] = "데이터 내용을 새로 변경하지 못했습니다.";
-    Text[ chinese_simplified ] = "无法更新数据内容。";
-    Text[ chinese_traditional ] = "無法更新資料內容。";
-    Text[ arabic ] = "���� ����� ��������� ��������.";
-    Text[ turkish ] = "Veri i�eri�i g�ncellenemedi.";
-    Text[ catalan ] = "No s'ha pogut refrescar el contingut de les dades.";
-    Text[ finnish ] = "Tietosis�ll�n p�ivitt�minen ei onnistunut.";
-    Text[ thai ] = "ไม่สามารถฟื้นฟูเนื้อหาข้อมูลได้";
-};
-String RID_STR_ERR_INSERTRECORD
-{
-    Text = "Fehler beim Einf�gen des neuen Datensatzs";
-    Text [ english ] = "error inserting the new record";
-    Text [ english_us ] = "Error inserting the new record";
-    Text[ portuguese ] = "Erro ao inserir o novo registo de dados";
-    Text[ russian ] = "������ ����� ����� ������";
-    Text[ greek ] = "������ ���� ��� �������� ��� ���� ��������";
-    Text[ dutch ] = "Fout bij invoegen van nieuwe record";
-    Text[ french ] = "Erreur lors de l'insertion du nouvel enregistrement";
-    Text[ spanish ] = "Error al insertar un nuevo registro de datos";
-    Text[ italian ] = "Errore nell'inserire il nuovo record di dati.";
-    Text[ danish ] = "Fejl ved inds�ttelse af den nye datapost";
-    Text[ swedish ] = "Fel vid infogning av den nya dataposten";
-    Text[ polish ] = "B��d przy wstawianiu nowego rekordu";
-    Text[ portuguese_brazilian ] = "error inserting the new record";
-    Text[ japanese ] = "新しいレコードを挿入する際のエラー";
-    Text[ korean ] = "새 레코드 삽입시 오류";
-    Text[ chinese_simplified ] = "在插入新数据条目时发生错误";
-    Text[ chinese_traditional ] = "在插入新資料條目時發生錯誤";
-    Text[ arabic ] = "��� ��� ����� ����� ����� ������";
-    Text[ turkish ] = "Yeni veri k�mesini ekleme s�ras�nda hata";
-    Text[ catalan ] = "S'ha produ�t un error en inserir un nou registre de dades";
-    Text[ finnish ] = "Virhe lis�tt�ess� uutta tietuetta.";
-    Text[ thai ] = "แทรกระเบียนใหม่ผิดพลาด";
-};
-String RID_STR_ERR_UPDATERECORD
-{
-    Text = "Fehler beim Schreiben des aktuellen Datensatzes";
-    Text [ english ] = "error updating the current record";
-    Text [ english_us ] = "Error updating the current record";
-    Text[ portuguese ] = "Erro ao escrever o registo de dados activo";
-    Text[ russian ] = "������ ���������� ������� ������";
-    Text[ greek ] = "������ ���� ��� ������� ��� ��������� ��������";
-    Text[ dutch ] = "Fout bij schrijven van huidige record";
-    Text[ french ] = "Erreur lors de la saisie de l'enregistrement actif";
-    Text[ spanish ] = "Error al escribir el registro actual de datos";
-    Text[ italian ] = "Errore nello scrivere il record di dati corrente.";
-    Text[ danish ] = "Fejl ved skrivning af den aktuelle datapost";
-    Text[ swedish ] = "Fel vid skrivning av den aktuella dataposten";
-    Text[ polish ] = "B��d przy pisaniu aktualnego rekordu";
-    Text[ portuguese_brazilian ] = "error updating the current record";
-    Text[ japanese ] = "現在のレコードを書き込む際のエラー";
-    Text[ korean ] = "현재 레코드 업데이트시 오류";
-    Text[ chinese_simplified ] = "在更新当前数据条目时发生错误";
-    Text[ chinese_traditional ] = "在寫入資料條目時發生錯誤";
-    Text[ arabic ] = "��� ��� ����� ����� ����� ������";
-    Text[ turkish ] = "Y�r�rl�kteki veri k�mesini g�ncelleme s�ras�nda hata";
-    Text[ catalan ] = "S'ha produ�t un error en escriure el registre actual de dades";
-    Text[ finnish ] = "Virhe p�ivitett�ess� nykyist� tietuetta.";
-    Text[ thai ] = "ปรับปรุงระเบียนปัจจุบันผิดพลาด";
-};
 String RID_STR_ERR_DELETERECORD
 {
     Text = "Fehler beim L�schen des aktuellen Datensatzes";
@@ -7249,7 +4351,7 @@ String RID_STR_ERR_DELETERECORD
     Text[ greek ] = "������ ���� ��� �������� ��� ��������� ��������";
     Text[ dutch ] = "Fout bij wissen van huidige record";
     Text[ french ] = "Erreur lors de la suppression de l'enregistrement actif";
-    Text[ spanish ] = "Error al eliminar el registro actual de datos";
+    Text[ spanish ] = "Error al borrar el registro actual";
     Text[ italian ] = "Errore nel cancellare il record di dati corrente.";
     Text[ danish ] = "Fejl ved sletning af den aktuelle datapost";
     Text[ swedish ] = "Fel vid radering av den aktuella dataposten";
@@ -7265,192 +4367,6 @@ String RID_STR_ERR_DELETERECORD
     Text[ finnish ] = "Virhe poistettaessa nykyist� tietuetta.";
     Text[ thai ] = "ลบระเบียนปัจจุบันผิดพลาด";
 };
-String RID_STR_ERR_DELETERECORDS
-{
-    Text = "Fehler beim L�schen der angegebenen Datens�tze";
-    Text [ english ] = "error deleting the specified records";
-    Text [ english_us ] = "Error deleting the specified records";
-    Text[ portuguese ] = "Erro ao eliminar os registos de dados indicados.";
-    Text[ russian ] = "������ �������� ��������� �������";
-    Text[ greek ] = "������ ���� ��� �������� ��� ����������� ��������";
-    Text[ dutch ] = "Fout bij wissen van records";
-    Text[ french ] = "Erreur lors de la suppression des enregistrements sp�cifi�s";
-    Text[ spanish ] = "Error al eliminar los registros de datos indicados.";
-    Text[ italian ] = "Errore nel cancellare i record di dati specificati.";
-    Text[ danish ] = "Fejl ved sletning af de angivne dataposter";
-    Text[ swedish ] = "Fel vid radering av de angivna dataposterna";
-    Text[ polish ] = "B��d przy usuwaniu podanych rekord�w";
-    Text[ portuguese_brazilian ] = "error deleting the specified records";
-    Text[ japanese ] = "指定したレコードの削除の際のエラー";
-    Text[ korean ] = "지정된 레코드 삭제시 오류";
-    Text[ chinese_simplified ] = "在删除指定的数据条目时发生错误";
-    Text[ chinese_traditional ] = "在刪除指定資料條目時發生錯誤";
-    Text[ arabic ] = "��� ��� ����� ��� ������� �������";
-    Text[ turkish ] = "Belirtilen veri k�melerini silme s�ras�nda hata";
-    Text[ catalan ] = "S'ha produ�t un error en eliminar els registres de dades indicats.";
-    Text[ finnish ] = "Virhe poistettaessa m��ritettyj� tietueita.";
-    Text[ thai ] = "ลบระเบียนที่ระบุผิดพลาด";
-};
-String RID_STR_CONTROL_SUBSTITUTED_NAME
-{
-    Text = "ersetzt";
-    Text [ english ] = "substituted";
-    Text [ english_us ] = "substituted";
-    Text[ portuguese ] = "substitu�do";
-    Text[ russian ] = "��������";
-    Text[ greek ] = "���������������";
-    Text[ dutch ] = "vervangen";
-    Text[ french ] = "remplace";
-    Text[ spanish ] = "reemplazado";
-    Text[ italian ] = "sostituito";
-    Text[ danish ] = "erstattet";
-    Text[ swedish ] = "ersatt";
-    Text[ polish ] = "zamieniono";
-    Text[ portuguese_brazilian ] = "substituted";
-    Text[ japanese ] = "置換";
-    Text[ korean ] = "바꾸기";
-    Text[ chinese_simplified ] = "替换";
-    Text[ chinese_traditional ] = "替代";
-    Text[ arabic ] = "������";
-    Text[ turkish ] = "de�i�tirildi";
-    Text[ catalan ] = "reempla�at";
-    Text[ finnish ] = "korvattu";
-    Text[ thai ] = "สำรอง";
-};
-
-String RID_STR_CONTROL_SUBSTITUTED_EPXPLAIN
-{
-    Text = "Beim Laden dieses Controls trat ein Fehler auf. Es wurde daher durch einen Platzhalter ersetzt.";
-    Text [ english ] = "While loading this control an error occured. Thus it was replaced with a placeholder.";
-    Text [ english_us ] = "An error occurred while this control was being loaded. It was therefore replaced with a placeholder.";
-    Text[ portuguese ] = "Ao carregar este controlo ocorreu um erro. Por esta raz�o foi substitu�do por um marcador de posi��o.";
-    Text[ russian ] = "������ �������� �������� ����������. �� ��� ������� ����� �����������.";
-    Text[ greek ] = "�������� ������ ���� �� ������� ��� ��������� �������. ��� ����� ��� ���� ��������������� �� ��� ������� �������� �����.";
-    Text[ dutch ] = "Fout bij laden van control. Is vervangen door plaatsvervanger.";
-    Text[ french ] = "Une erreur s'est produite lors du chargement du contr�le, qui a �t� remplac� par un substituant.";
-    Text[ spanish ] = "Ha ocurrido un error al cargar este Control. Por ello se ha reemplazado con un comod�n.";
-    Text[ italian ] = "Durante il caricamento del control si � verificato un errore. Pertanto � stato sostituito con una variabile.";
-    Text[ danish ] = "Der opstod en fejl under indl�sningen af dette kontrolelement. Det blev derfor erstattet med en pladsholder.";
-    Text[ swedish ] = "N�r denna control laddades uppstod ett fel. D�rf�r ersattes den av en platsh�llare.";
-    Text[ polish ] = "Wyst�pi� b��d podczas �adowania pola kontrolnego (control). Zamieniono je dlatego na symbol wieloznaczny.";
-    Text[ portuguese_brazilian ] = "While loading this control an error occured. Thus it was replaced with a placeholder.";
-    Text[ japanese ] = "このコントロールの読み込み中にエラーが発生しました。それでワイルドカードに置換されました。";
-    Text[ korean ] = "이 컨트롤을 로드할 때 오류가 발생해서 플레이스홀더로 변경되었습니다.";
-    Text[ chinese_simplified ] = "装入这个字段时出现了一个错误，因此用通配符代替字段。";
-    Text[ chinese_traditional ] = "在載入這個控制項時發生一個錯誤。但已經用一個萬用字元替代它。";
-    Text[ arabic ] = "��� ��� ����� ����� ���� ������ ���. ���� �� �������� ����� ����.";
-    Text[ turkish ] = "Komut ��esi y�klenirken bir hata olu�tu. Bu nedenle komut ��esi yerine yer tutucu g�r�nt�leniyor.";
-    Text[ catalan ] = "S'ha produ�t un error en carregar aquest control. Per aix� s'ha canviat per un comod�";
-    Text[ finnish ] = "T�t� ohjausobjektia ladattaessa ilmeni virhe. Se korvattiin siksi paikkamerkill�.";
-    Text[ thai ] = "เกิดความผิดพลาดขณะกำลังโหลดตัวควบคุมนี้ เนื่องจากมันถูกแทนที่ด้วยตัวยึดตำแหน่ง";
-};
-Resource RID_RES_CONTROL_WIZARDS_ERROR_CONTEXTS
-{
-    String RID_SUB_GRIDCONTROL_WIZARD
-    {
-        Text = "Der Tabellen-Kontrollfeld-Autopilot konnte nicht gestartet werden";
-        Text [ ENGLISH ] = "The table control AutoPilot could not be started";
-        Text [ english_us ] = "The table check box AutoPilot could not be started";
-        Text[ portuguese ] = "Foi imposs�vel iniciar o AutoPiloto dos campos de controlo de tabelas";
-        Text[ russian ] = "���������� ��������� ������� ��������� ���������� �������";
-        Text[ greek ] = "��� ���� ������� �� ����� �������� ��� ������ ������� ������ ��� AutoPilot";
-        Text[ dutch ] = "De AutoPiloot voor tabelcontrole kan niet worden gestart";
-        Text[ french ] = "Impossible de lancer l'AutoPilote de contr�le de table !";
-        Text[ spanish ] = "No se pudo iniciar el AutoPiloto de campos de control de tablas";
-        Text[ italian ] = "Non � stato possibile avviare il Pilota automatico dei campi di controllo.";
-        Text[ danish ] = "Det var ikke muligt at starte tabelkontrolelement-AutoPiloten";
-        Text[ swedish ] = "AutoPilot f�r tabellkontrollf�lt kunde inte startas";
-        Text[ polish ] = "Nie mo�na by�o uruchomi� AutoPilota pola kontrolnego tabeli";
-        Text[ portuguese_brazilian ] = "The table control AutoPilot could not be started";
-        Text[ japanese ] = "表コントロール オートパイロットはスタートできませんでした";
-        Text[ korean ] = "시트 컨트롤 필드 자동파일럿을 시작하지 못했습니다.";
-        Text[ chinese_simplified ] = "无法启动表格控制的自动文件助理";
-        Text[ chinese_traditional ] = "無法啟動表格控制項的自動檔案助理程式。";
-        Text[ arabic ] = "���� ��� ����� ������ ����� ������ ������ �� ������";
-        Text[ turkish ] = "Tablo komut ��esi OtoPilotu ba�lat�lamad�";
-        Text[ catalan ] = "No s'ha pogut iniciar l'Autopilot de camps de control de taules";
-        Text[ finnish ] = "Ohjatun toiminnon taulukon valintaruutua ei voitu avata.";
-        Text[ thai ] = "ไม่สามารถเริ่มการนำร่องตารางกล่องกาเครื่องหมายอัตโนมัติได้ ";
-    };
-    String RID_SUB_LISTBOX_WIZARD
-    {
-        Text = "Der Listenfeld-Autopilot konnte nicht gestartet werden";
-        Text [ ENGLISH ] = "The list box AutoPilot could not be started";
-        Text [ english_us ] = "The list box AutoPilot could not be started";
-        Text[ portuguese ] = "Foi imposs�vel iniciar o AutoPiloto de caixas de listagem.";
-        Text[ russian ] = "���������� ��������� ������� ������";
-        Text[ greek ] = "��� ���� ������� �� ��������� �� ��������� AutoPilot ��� ����� ������";
-        Text[ dutch ] = "De AutoPiloot voor keuzelijsten kan niet worden gestart";
-        Text[ french ] = "Impossible de lancer l'AutoPilote de zone de liste !";
-        Text[ spanish ] = "No se pudo iniciar el AutoPiloto de listado";
-        Text[ italian ] = "Non � stato possibile avviare il Pilota automatico delle caselle di riepilogo.";
-        Text[ danish ] = "Det var ikke muligt at starte rulleliste-AutoPiloten";
-        Text[ swedish ] = "AutoPilot f�r listrutor kunde inte startas";
-        Text[ polish ] = "Nie mo�na by�o uruchomi� AutoPilota pola listy";
-        Text[ portuguese_brazilian ] = "The list box AutoPilot could not be started";
-        Text[ japanese ] = "リストボックス オートパイロットはスタートできませんでした";
-        Text[ korean ] = "목록 필드 자동 파일럿을 시작하지 못했습니다.";
-        Text[ chinese_simplified ] = "无法启动 列表框-自动文件助理";
-        Text[ chinese_traditional ] = "無法啟動清單方塊自動檔案助理程式。";
-        Text[ arabic ] = "���� ��� ����� ������ ����� ����� �������";
-        Text[ turkish ] = "Liste alan� OtoPilotu ba�lat�lamad�";
-        Text[ catalan ] = "No s'ha pogut iniciar el quadre de llista de l'AutoPilot.";
-        Text[ finnish ] = "Ohjatun toiminnon luetteloruutua ohjausta ei voitu avata.";
-        Text[ thai ] = "ไม่สามารถเริ่มการนำร่องกล่องรายการอัตโนมัติได้ ";
-    };
-    String RID_SUB_COMBOBOX_WIZARD
-    {
-        Text = "Der Kombinationsfeld-Autopilot konnte nicht gestartet werden";
-        Text [ ENGLISH ] = "The combo box AutoPilot could not be started";
-        Text [ english_us ] = "The combo box AutoPilot could not be started";
-        Text[ portuguese ] = "Foi imposs�vel iniciar o AutoPiloto de caixas combinadas.";
-        Text[ russian ] = "���������� ��������� ������� ���� �� �������";
-        Text[ greek ] = "��� ���� ������ � �������� ��� AutoPilot ��� ����� ����������";
-        Text[ dutch ] = "De AutoPiloot voor combinatievelden kan niet worden gestart";
-        Text[ french ] = "Impossible de lancer l'AutoPilote de zone combin�e !";
-        Text[ spanish ] = "No se pudo iniciar el AutoPiloto de campo combinado";
-        Text[ italian ] = "Non � stato possibile avviare il Pilota automatico delle caselle combinate.";
-        Text[ danish ] = "Det var ikke muligt at starte kombinationsboks-AutoPiloten";
-        Text[ swedish ] = "AutoPilot f�r kombinationsf�lt kunde inte startas";
-        Text[ polish ] = "Nie mo�na by�o uruchomi� AutoPilota pola kombi";
-        Text[ portuguese_brazilian ] = "The combo box AutoPilot could not be started";
-        Text[ japanese ] = "コンボボックス オートパイロットはスタートできませんでした";
-        Text[ korean ] = "콤보 상자 자동 파일럿을 시작하지 못했습니다.";
-        Text[ chinese_simplified ] = "无法启动 组合框-自动文件助理";
-        Text[ chinese_traditional ] = "無法啟動組合方塊自動檔案助理程式";
-        Text[ arabic ] = "���� ��� ����� ������ ����� ����� ������� ������";
-        Text[ turkish ] = "Kombinasyon alan� OtoPilotu ba�lat�lamad�";
-        Text[ catalan ] = "No s'ha pogut iniciar el quadre combinat de l'AutoPilot.";
-        Text[ finnish ] = "Ohjatun toiminnon yhdistelm�ruutua ei voitu avata.";
-        Text[ thai ] = "ไม่สามารถเริ่มการนำร่องกล่องคอมโบ้อัตโนมัติได้ ";
-    };
-    String RID_SUB_GROUPBOX_WIZARD
-    {
-        Text = "Der Gruppierungsrahmen-Autopilot konnte nicht gestartet werden";
-        Text [ ENGLISH ] = "The group box AutoPilot could not be started";
-        Text [ english_us ] = "The group box AutoPilot could not be started";
-        Text[ portuguese ] = "Foi imposs�vel iniciar o AutoPiloto de caixas de grupo.";
-        Text[ russian ] = "���������� ��������� ������� ���������� �����";
-        Text[ greek ] = "��� ���� ������� �� ��������� �� ��������� AutoPilot ��� ������� ������������";
-        Text[ dutch ] = "De AutoPiloot voor groepskaders kan niet worden gestart";
-        Text[ french ] = "Impossible de lancer l'AutoPilote de zone de groupe !";
-        Text[ spanish ] = "No se pudo iniciar el AutoPiloto de marcos de grupo";
-        Text[ italian ] = "Non � stato possibile avviare il Pilota automatico delle caselle di gruppo.";
-        Text[ danish ] = "Det var ikke muligt at starte gruppeboks-AutoPiloten";
-        Text[ swedish ] = "AutoPilot f�r grupperingsramar kunde inte startas";
-        Text[ polish ] = "Uruchomienie AutoPilota: Ramka grupy - nie powiod�o si�.";
-        Text[ portuguese_brazilian ] = "The group box AutoPilot could not be started";
-        Text[ japanese ] = "グルーブボックス オートパイロットはスタートできませんでした";
-        Text[ korean ] = "그룹 상자 자동파일럿을 시작하지 못했습니다.";
-        Text[ chinese_simplified ] = "无法启动小组框自动文件助理";
-        Text[ chinese_traditional ] = "無法啟動群組方塊自動檔案助理程式";
-        Text[ arabic ] = "���� ��� ����� ������ ����� ����� �������";
-        Text[ turkish ] = "Grup �er�evesi OtoPilotu ba�lat�lamad�";
-        Text[ catalan ] = "No s'ha pogut iniciar el quadre de grup de l'AutoPilot";
-        Text[ finnish ] = "Ohjatun toiminnon ryhm�ruutua ei voitu avata.";
-        Text[ thai ] = "ไม่สามารถเริ่มการนำร่องกล่องการจัดกลุ่มอัตโนมัติได้ ";
-    };
-};
 String RID_STR_SVT_SQL_INTERNATIONAL
 {
     Text = "WIE;NICHT;LEER;WAHR;FALSCH;IST;ZWISCHEN;ODER;UND;Durchschnitt;Anzahl;Maximum;Minimum;Summe" ;
@@ -7462,7 +4378,7 @@ String RID_STR_SVT_SQL_INTERNATIONAL
     Text [ danish ] = "SOM;IKKE;TOM;SAND;FALSK;ER;MELLEM;ELLER;OG;Gennemsnit;Antal;Maksimum;Minimum;Sum" ;
     Text [ italian ] = "COME;NON;VUOTO;VERO;FALSO;�;TRA;O;E;media;quantit�;massimo;minimo;totale" ;
     Text [ spanish ] = "COMO;NO;VACIO;VERDADERO;FALSO;ES;ENTRE;O;Y;Promedio;Cantidad;M�ximo;M�nimo;Suma" ;
-    Text [ french ] = "COMME;PAS;VIDE;VRAI;FAUX;EST;ENTRE;OU;ET;moyenne;nombre;maximum;minimum;somme" ;
+    Text [ french ] = "COMME;PAS;VIDE;VRAI;FAUX;EST;ENTRE;OU;ET;Moyenne;Nombre;Maximum;Minimum;Somme" ;
     Text [ dutch ] = "ALS;NIET;LEEG;WAAR;ONWAAR;IS;TUSSEN;OF;EN;Gemiddelde;Aantal;Maximum;Minimum;Som" ;
     Text[ chinese_simplified ] = "LIKE;NOT;EMPTY;TRUE;FALSE;IS;BETWEEN;OR;AND;average;number;maximum;minimum;sum";
     Text[ russian ] = "���;��;�����;������;����;����;�����;���;�;������;����������;��������;�������;�����";
@@ -7473,7 +4389,7 @@ String RID_STR_SVT_SQL_INTERNATIONAL
     Text[ dutch ] = "ALS;NIET;LEEG;WAAR;ONWAAR;IS;TUSSEN;OF;EN;Gemiddelde;Aantal;Maximum;Minimum;Som";
     Text[ chinese_simplified ] = "LIKE;NOT;EMPTY;TRUE;FALSE;IS;BETWEEN;OR;AND;average;number;maximum;minimum;sum";
     Text[ greek ] = "����;���;����;������;�����;�����;������;�;���;����� ����;������;�������;��������;��������";
-    Text[ korean ] = "LIKE;NOT;EMPTY;TRUE;FALSE;IS;BETWEEN;OR;AND;평균;번호;최대;최소;합";
+    Text[ korean ] = "LIKE;NOT;EMPTY;TRUE;FALSE;IS;BETWEEN;OR;AND;평균;개수;최대;최소;합계";
     Text[ turkish ] = "G�B�;DE��L;BO�;DO�RU;YANLI�;OLMA;ARADA;YA DA;VE;Ortalama;Adet say�s�;Azami;Asgari;Toplam";
     Text[ finnish ] = "LIKE;NOT;EMPTY;TRUE;FALSE;IS;BETWEEN;OR;AND;Keskiarvo;M��r�;Enint��n;V�hint��n;Summa";
     Text[ catalan ] = "LIKE;NOT;EMPTY;TRUE;FALSE;IS;BETWEEN;OR;AND;Promig;Recompte;M�xim;M�nim;Suma";
@@ -7497,13 +4413,13 @@ String RID_STR_SVT_SQL_SYNTAX_ERROR
     Text[ chinese_simplified ] = "SQL 表达式语法错误";
     Text[ russian ] = "�������������� ������ � ��������� SQL";
     Text[ polish ] = "B��d sk�adni w wyra�eniu SQL";
-    Text[ japanese ] = "SQL 表現のシンタックスエラー";
-    Text[ chinese_traditional ] = "SQL 表達語法錯誤";
+    Text[ japanese ] = "SQL 文のシンタックスエラー";
+    Text[ chinese_traditional ] = "SQL 敘述語法錯誤";
     Text[ arabic ] = "��� �� ���� ������ �� ����� SQL";
     Text[ dutch ] = "Foutieve syntaxis in SQL-uitdrukking";
     Text[ chinese_simplified ] = "SQL 表达式语法错误";
     Text[ greek ] = "���������� ������ �� ������� SQL";
-    Text[ korean ] = "SQL 식에 구문 오류";
+    Text[ korean ] = "SQL 문장의 구문 오류";
     Text[ turkish ] = "SQL terimi s�z dizimi hatas�";
     Text[ finnish ] = "Syntaksivirhe SQL-lausekkeessa";
     Text[ catalan ] = "S'ha produ�t un error de sintaxi en l'expressi� SQL";
@@ -7519,20 +4435,20 @@ String RID_STR_SVT_SQL_SYNTAX_ERROR_BEFORE
     Text[ portuguese ] = "antes da express�o \"#\".";
     Text[ danish ] = "f�r \"#\"-udtryk.";
     Text[ french ] = "avant l'expression \"#\".";
-    Text[ swedish ] = "f�re \"#\" uttryck.";
+    Text[ swedish ] = "f�re \"#\"-uttryck.";
     Text[ dutch ] = "voor \"#\" uitdrukking.";
-    Text[ spanish ] = "expresi�n anterior a \"#\"";
+    Text[ spanish ] = "antes de la expresi�n \"#\".";
     Text[ english_us ] = "before \"#\" expression.";
     Text[ chinese_simplified ] = "\"#\" 表达式之前。";
     Text[ russian ] = "����� ���������� \"#\".";
     Text[ polish ] = "przed wyra�eniem \"#\".";
     Text[ japanese ] = "\"#\" 表現の前にあります。";
     Text[ arabic ] = "��� ����� \"#\".";
-    Text[ chinese_traditional ] = "在<#>表達之前";
+    Text[ chinese_traditional ] = "在 \"#\" 表達之前。";
     Text[ dutch ] = "voor \"#\" uitdrukking.";
     Text[ chinese_simplified ] = "\"#\" 表达式之前。";
     Text[ greek ] = "���� ��� ��������� \"#\".";
-    Text[ korean ] = "\"#\" 식 전에";
+    Text[ korean ] = "\"#\"식 앞에 있습니다.";
     Text[ turkish ] = "\"#\" teriminden �nce.";
     Text[ finnish ] = "ennen \"#\" lauseketta.";
     Text[ catalan ] = "abans de l'expressi� \"#\".";
@@ -7556,8 +4472,8 @@ String RID_STR_SVT_SQL_SYNTAX_VALUE_NO_LIKE
     Text[ polish ] = "Warto�ci #1 nie mo�na zastosowa� z JAK!";
     Text[ portuguese_brazilian ] = "The value #1 can not be used with LIKE!";
     Text[ japanese ] = "#1 の値は LIKE と一緒に使用できません。";
-    Text[ korean ] = "값 #1은 LIKE와 같이 사용될 수 없습니다!";
-    Text[ chinese_simplified ] = "数值 #1不能与LIKE同时使用！";
+    Text[ korean ] = "#1값은 LIKE 연산자처럼 사용할 수 없습니다.";
+    Text[ chinese_simplified ] = "数值 #1 不能与 LIKE 同时使用！";
     Text[ chinese_traditional ] = "LIKE 和數值 #1 不可以一起使用！";
     Text[ arabic ] = "�� ���� ������� ������ #1 �� LIKE!";
     Text[ turkish ] = "#1 de�eri, G�B� ile birlikte kullan�lamaz!";
@@ -7583,9 +4499,9 @@ String RID_STR_SVT_SQL_SYNTAX_FIELD_NO_LIKE
     Text[ polish ] = "JAK nie mo�na u�y� przy tym polu!";
     Text[ portuguese_brazilian ] = "LIKE can not be used with this field!";
     Text[ japanese ] = "LIKE はこのフィールドで使用できません。";
-    Text[ korean ] = "LIKE는 이 필드에서 사용할 수 없습니다!";
-    Text[ chinese_simplified ] = "在这个字段中不能使用LIKE！";
-    Text[ chinese_traditional ] = "這欄不可以使用 LIKE！";
+    Text[ korean ] = "LIKE는 이 필드에서 사용할 수 없습니다.";
+    Text[ chinese_simplified ] = "在这个字段中不能使用 LIKE ！";
+    Text[ chinese_traditional ] = "這個欄位和 LIKE 不可以一起使用。";
     Text[ arabic ] = "�� ���� ������� LIKE �� ��� �����!";
     Text[ turkish ] = "G�B�, bu alanda kullan�lamaz!";
     Text[ finnish ] = "Funktiota LIKE ei voi k�ytt�� t�ss� kent�ss�.";
@@ -7601,7 +4517,7 @@ String RID_STR_SVT_SQL_SYNTAX_NO_NUM
     Text[ portuguese ] = "Este campo n�o pode ser comparado a uma cadeia de caracteres!";
     Text[ greek ] = "��� ����� ������� �� ��������� ���� �� ����� �� ��� ��������� ����������!";
     Text[ dutch ] = "Het veld kan niet worden vergeleken met een string!";
-    Text[ french ] = "Impossible de comparer ce champ avec une cha�ne de caract�res !";
+    Text[ french ] = "Impossible de comparer le champ avec une cha�ne de caract�res !";
     Text[ spanish ] = "�El campo no se puede comparar con una cadena de caracteres!";
     Text[ swedish ] = "F�ltet kan inte j�mf�ras med en teckenstr�ng!";
     Text[ russian ] = "�������� ���� �� ������� ������!";
@@ -7610,9 +4526,9 @@ String RID_STR_SVT_SQL_SYNTAX_NO_NUM
     Text[ polish ] = "Pola nie mo�na por�wna� z ci�giem znak�w!";
     Text[ portuguese_brazilian ] = "The field can not be compared with a string!";
     Text[ japanese ] = "このフィールドは文字列で比較できません。";
-    Text[ korean ] = "필드를 문자열과 비교할 수 없습니다!";
+    Text[ korean ] = "필드를 문자열과 비교할 수 없습니다.";
     Text[ chinese_simplified ] = "这个字段不能与字符串相比较！";
-    Text[ chinese_traditional ] = "這欄的內容不可以和字串相比較！";
+    Text[ chinese_traditional ] = "此欄位不可以和字串相比較。";
     Text[ arabic ] = "�� ���� ������ ����� ������ ����!";
     Text[ turkish ] = "Alan, bir karakter zinciri ile kar��la�t�r�lamaz!";
     Text[ finnish ] = "Kentt�� ei voi verrata merkkijonoon.";
@@ -7628,18 +4544,18 @@ String RID_STR_SVT_SQL_SYNTAX_ACCESS_DAT_NO_VALID
     Text[ portuguese ] = "Este campo n�o pode ser comparado com uma data!";
     Text[ greek ] = "��� ����� ������� �� ����� �������� ��� ������ �� ��� ����������!";
     Text[ dutch ] = "Het veld kan niet worden vergeleken met een datum!";
-    Text[ french ] = "Impossible de comparer ce champ avec une date !";
+    Text[ french ] = "Impossible de comparer le champ avec une date !";
     Text[ spanish ] = "�El campo no se puede comparar con una fecha!";
     Text[ swedish ] = "F�ltet kan inte j�mf�ras med ett datum!";
     Text[ russian ] = "�������� ���� � ����� ������!";
-    Text[ italian ] = "Il campo non pu� essere paragonato a un dato!";
+    Text[ italian ] = "Il campo non pu� essere paragonato a un dato.";
     Text[ danish ] = "Feltet kan ikke sammenlignes med en dato!";
     Text[ polish ] = "Pola nie mo�na por�wna� z dat�!";
     Text[ portuguese_brazilian ] = "The field can not be compared with a ACCESS date!";
     Text[ japanese ] = "このフィールドは日付で比較できません。";
-    Text[ korean ] = "필드를 날짜와 비교할 수 없습니다!";
+    Text[ korean ] = "필드를 날짜와 비교할 수 없습니다.";
     Text[ chinese_simplified ] = "这个字段不能与日期相比较！";
-    Text[ chinese_traditional ] = "這欄的內容不可以和一個日期相比較！";
+    Text[ chinese_traditional ] = "此欄位不可以和日期相比較。";
     Text[ arabic ] = "�� ���� ������ ����� �������!";
     Text[ turkish ] = "Alan, bir tarih ile kar��la�t�r�lamaz!";
     Text[ finnish ] = "Kentt�� ei voi verrata p�iv�m��r��n.";
@@ -7655,18 +4571,18 @@ String RID_STR_SVT_SQL_SYNTAX_INT_NO_VALID
     Text[ portuguese ] = "Este campo n�o pode ser comparado com um n�mero inteiro!";
     Text[ greek ] = "��� ����� ������� �� ����� �������� ��� ������ �� ���� �������!";
     Text[ dutch ] = "Het veld kan niet worden vergeleken met een Integer!";
-    Text[ french ] = "Impossible de comparer cLe champ avec un nombre entier !";
+    Text[ french ] = "Impossible de comparer le champ avec un nombre entier !";
     Text[ spanish ] = "�El campo no se puede comparar con un integral!";
     Text[ swedish ] = "F�ltet kan inte j�mf�ras med ett heltal!";
     Text[ russian ] = "�������� ���� � ����� ������ ������!";
-    Text[ italian ] = "Il campo non pu� essere paragonato a un integrale!";
+    Text[ italian ] = "Il campo non pu� essere paragonato a un integrale.";
     Text[ danish ] = "Feltet kan ikke sammenlignes med et heltal!";
     Text[ polish ] = "Por�wnanie pola z liczb� ca�kowit� nie jest mo�liwe!";
     Text[ portuguese_brazilian ] = "The field can not be compared with a integer!";
     Text[ japanese ] = "このフィールドは整数で比較できません。";
-    Text[ korean ] = "필드를 정수와 비교할 수 없습니다!";
+    Text[ korean ] = "필드를 정수와 비교할 수 없습니다.";
     Text[ chinese_simplified ] = "这个字段不能与一个整数相比较！";
-    Text[ chinese_traditional ] = "這欄的內容不可以和整數相比較！";
+    Text[ chinese_traditional ] = "此欄位不可以和整數相比較。";
     Text[ arabic ] = "�� ���� ������ ����� ���� ����!";
     Text[ turkish ] = "Alan, bir tamsay� ile kar��la�t�r�lamaz!";
     Text[ finnish ] = "Kentt�� ei voi verrata muuttujaan.";
@@ -7690,9 +4606,9 @@ String RID_STR_SVT_SQL_SYNTAX_TABLE
     Text[ polish ] = "Tabela \"#\" jest nieznana w bazie danych!";
     Text[ portuguese_brazilian ] = "The table \"#\" is unknown in the database!";
     Text[ japanese ] = "テーブル \"#\" は、データベースでは不明です。";
-    Text[ korean ] = "데이터베이스에 알 수 없는 \"#\" 시트가 포함되어 있습니다.!";
+    Text[ korean ] = "\"#\" 테이블은 데이터베이스에서 알 수 없습니다.";
     Text[ chinese_simplified ] = "这个表格 \"#\" 对数据库而言是不明的！";
-    Text[ chinese_traditional ] = "這個表格<#>對資料庫而言是不明的！";
+    Text[ chinese_traditional ] = "表格 \"#\" 對資料庫而言是不明的。";
     Text[ turkish ] = "The table \"#\" is unknown in the database!";
     Text[ arabic ] = "������ \"#\" ��� ����� �� ����� ��������!";
     Text[ finnish ] = "Taulukkoa \"#\" ei tunneta tietokannassa.";
@@ -7710,15 +4626,15 @@ String RID_STR_SVT_SQL_SYNTAX_COLUMN
     Text[ dutch ] = "Kolom \"#\" is onbekend in tabel \"#\"!";
     Text[ french ] = "La colonne \"#\" est inconnue dans la table \"#\" !";
     Text[ spanish ] = "�La columna \"#\" es desconocida en la tabla \"#\"!";
-    Text[ italian ] = "La colonna \"#\" risulta sconosciuta alla tabella \"#\"!";
+    Text[ italian ] = "La colonna \"#\" risulta sconosciuta alla tabella \"#\".";
     Text[ danish ] = "Kolonnen \"#\" er ukendt i tabellen \"#\"!";
     Text[ swedish ] = "Kolumnen \"#\" �r ok�nd i tabellen \"#\"!";
     Text[ polish ] = "Kolumna \"#\" jest w tabeli \"#\" nieznana!";
     Text[ portuguese_brazilian ] = "The column \"#\" is unknown in the table \"#\"!";
     Text[ japanese ] = "列 \"#\" は、\"#\" のテーブルでは不明です。";
-    Text[ korean ] = "\"#\" 표에 알 수 없는 \"#\"열이 포함되어 있습니다.!";
+    Text[ korean ] = "\"#\" 열은 \"#\" 테이블에서 알 수 없습니다.";
     Text[ chinese_simplified ] = "这个列 \"#\" 对数据库 \"#\" 而言是不明的!";
-    Text[ chinese_traditional ] = "這欄位<#>對這個表格<#>而言是不明的!";
+    Text[ chinese_traditional ] = "欄 \"#\" 對表格 \"#\" 而言是不明的！";
     Text[ turkish ] = "The column \"#\" is unknown in the table \"#\"!";
     Text[ arabic ] = "������ \"#\" ��� ����� �� ������ \"#\" !";
     Text[ finnish ] = "Saraketta \"#\" ei tunneta taulukossa \"#\".";
@@ -7737,14 +4653,14 @@ String RID_STR_SVT_SQL_SYNTAX_REAL_NO_VALID
     Text[ spanish ] = "�El campo no se puede comparar con un n�mero de coma flotante!";
     Text[ swedish ] = "F�ltet kan inte j�mf�ras med ett flytande kommatal!";
     Text[ russian ] = "�������� ���� � ������ � ��������� ������� ������!";
-    Text[ italian ] = "Il campo non pu� essere paragonato a un numero in virgola mobile!";
+    Text[ italian ] = "Il campo non pu� essere paragonato a un numero in virgola mobile.";
     Text[ danish ] = "Feltet kan ikke sammenlignes med et flydende tal!";
     Text[ polish ] = "Por�wnanie pola z liczb� rzeczywist� nie jest mo�liwe!";
     Text[ portuguese_brazilian ] = "The field can not be compared with a real!";
     Text[ japanese ] = "このフィールドは浮動小数で比較できません。";
-    Text[ korean ] = "필드를 부동소수점의 수와 비교할 수 없습니다!";
+    Text[ korean ] = "필드를 부동 소수점의 수와 비교할 수 없습니다.";
     Text[ chinese_simplified ] = "这个字段不能与一个带可变小数点位数相比较！";
-    Text[ chinese_traditional ] = "這欄的內容不可以和小數相比較！";
+    Text[ chinese_traditional ] = "此欄位不可以和浮點數相比較。";
     Text[ arabic ] = "�� ���� ������ ����� �� ��� ���� �� ��� ����� �� ������� �������!";
     Text[ turkish ] = "Alan, bir kayan nokta say�s� ile kar��la�t�r�lamaz!";
     Text[ finnish ] = "Kentt�� ei voi verrata irralliseen pistenumeroon.";
@@ -7761,17 +4677,17 @@ String RID_STR_SVT_SQL_SYNTAX_CRIT_NO_COMPARE
     Text[ russian ] = "�������� �������� �������� � ���� ����� ������.";
     Text[ greek ] = "��� ����� ������� �� ����� � �������� ��� ����������� ��������� �� ���� �� �����!";
     Text[ dutch ] = "Het aangegeven criterium kan niet worden vergeleken met dit veld!";
-    Text[ french ] = "Impossible de comparer le crit�re saisi avec ce champ !";
+    Text[ french ] = "Impossible de comparer le crit�re sp�cifi� avec ce champ !";
     Text[ spanish ] = "�El criterio indicado no se puede comparar con este campo!";
-    Text[ italian ] = "Il criterio specificato non pu� essere paragonato a questo campo!";
+    Text[ italian ] = "Il criterio specificato non pu� essere paragonato a questo campo.";
     Text[ danish ] = "Det angivne kriterium kan ikke sammenlignes med dette felt!!";
     Text[ swedish ] = "Det angivna kriteriet kan inte j�mf�ras med det h�r f�ltet!!";
     Text[ polish ] = "Podanego kryterium nie mo�na por�wna� z danym polem!!";
     Text[ portuguese_brazilian ] = "The entered critisim can not be compared with this field!!";
     Text[ japanese ] = "入力した検索条件はこのフィールドで比較できません。";
-    Text[ korean ] = "지정한 기준을 이 필드와 비교할 수 없습니다!!";
+    Text[ korean ] = "지정한 기준을 이 필드와 비교할 수 없습니다.";
     Text[ chinese_simplified ] = "设定的条件无法与这个字段比较！";
-    Text[ chinese_traditional ] = "指定的條件無法和這個欄位相比較！";
+    Text[ chinese_traditional ] = "指定的條件無法和這個欄位相比較。";
     Text[ arabic ] = "�� ���� ������ ������ѡ ���� �� ������ ���� �����!!";
     Text[ turkish ] = "Belirtilen �l��t, bu alan ile kar��la�t�r�lamaz!!";
     Text[ finnish ] = "Sy�tetty� ehtoa ei voi verrata t�h�n kentt��n.";
@@ -7787,3 +4703,8 @@ String RID_STR_SVT_SQL_SYNTAX_CRIT_NO_COMPARE
 
 
 
+
+
+
+
+
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 659f1c1127d1..e9ff7c70a38b 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmtools.cxx,v $
  *
- *  $Revision: 1.25 $
+ *  $Revision: 1.26 $
  *
- *  last change: $Author: fs $ $Date: 2002-10-14 13:50:03 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -202,8 +202,8 @@
 #include <svtools/sbxvar.hxx>
 #endif
 
-#ifndef _TOOLS_SOLMATH_HXX //autogen wg. SolarMath
-#include <tools/solmath.hxx>
+#ifndef INCLUDED_RTL_MATH_HXX
+#include <rtl/math.hxx>
 #endif
 
 #ifndef _SV_SVAPP_HXX //autogen
@@ -266,6 +266,7 @@
 #ifndef _COMPHELPER_EXTRACT_HXX_
 #include <comphelper/extract.hxx>
 #endif
+#include <algorithm>
 
 namespace svxform
 {
@@ -342,66 +343,10 @@ void displayException(const ::com::sun::star::sdb::SQLErrorEvent& _rEvent, Windo
 }
 
 //------------------------------------------------------------------------------
-// Vergleichen von Properties
-extern "C" int
-#if defined( WNT )
- __cdecl
-#endif
-#if defined( ICC ) && defined( OS2 )
-_Optlink
-#endif
-    PropertyCompare( const void* pFirst, const void* pSecond)
-{
-    return ((::com::sun::star::beans::Property*)pFirst)->Name.compareTo(((::com::sun::star::beans::Property*)pSecond)->Name);
-}
-
-//------------------------------------------------------------------------------
-Reference< XInterface> clone(const Reference< ::com::sun::star::io::XPersistObject>& _xObj)
+Reference< XInterface > cloneUsingProperties(const Reference< ::com::sun::star::io::XPersistObject>& _xObj)
 {
-    Reference< XInterface> xClone;
     if (!_xObj.is())
-        return Reference< XInterface>();
-
-    // ::std::copy it by streaming
-
-    // creating a pipe
-    Reference< ::com::sun::star::io::XOutputStream> xOutPipe(::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.io.Pipe")), UNO_QUERY);
-    Reference< ::com::sun::star::io::XInputStream> xInPipe(xOutPipe, UNO_QUERY);
-
-    // creating the mark streams
-    Reference< ::com::sun::star::io::XInputStream> xMarkIn(::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.io.MarkableInputStream")), UNO_QUERY);
-    Reference< ::com::sun::star::io::XActiveDataSink> xMarkSink(xMarkIn, UNO_QUERY);
-    xMarkSink->setInputStream(xInPipe);
-
-    Reference< ::com::sun::star::io::XOutputStream> xMarkOut(::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.io.MarkableOutputStream")), UNO_QUERY);
-    Reference< ::com::sun::star::io::XActiveDataSource> xMarkSource(xMarkOut, UNO_QUERY);
-    xMarkSource->setOutputStream(xOutPipe);
-
-    // connect mark and sink
-    Reference< ::com::sun::star::io::XActiveDataSink> xSink(::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.io.ObjectInputStream")), UNO_QUERY);
-    xSink->setInputStream(xMarkIn);
-
-    // connect mark and source
-    Reference< ::com::sun::star::io::XActiveDataSource> xSource(::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.io.ObjectOutputStream")), UNO_QUERY);
-    xSource->setOutputStream(xMarkOut);
-
-    // write the string to source
-    Reference< ::com::sun::star::io::XObjectOutputStream> xOutStrm(xSource, UNO_QUERY);
-    xOutStrm->writeObject(_xObj);
-    xOutStrm->closeOutput();
-
-    Reference< ::com::sun::star::io::XObjectInputStream> xInStrm(xSink, UNO_QUERY);
-    xClone = xInStrm->readObject();
-    xInStrm->closeInput();
-
-    return xClone;
-}
-
-//------------------------------------------------------------------------------
-Reference< XInterface> cloneUsingProperties(const Reference< ::com::sun::star::io::XPersistObject>& _xObj)
-{
-    if (!_xObj.is())
-        return Reference< XInterface>();
+        return Reference< XInterface >();
 
     // create a new object
     ::rtl::OUString aObjectService = _xObj->getServiceName();
@@ -409,34 +354,41 @@ Reference< XInterface> cloneUsingProperties(const Reference< ::com::sun::star::i
     if (!xDestSet.is())
     {
         DBG_ERROR("cloneUsingProperties : could not instantiate an object of the given type !");
-        return Reference< XInterface>();
+        return Reference< XInterface >();
     }
     // transfer properties
-    Reference< ::com::sun::star::beans::XPropertySet> xSourceSet(_xObj, UNO_QUERY);
-    Reference< ::com::sun::star::beans::XPropertySetInfo> xSourceInfo( xSourceSet->getPropertySetInfo());
-    Sequence< ::com::sun::star::beans::Property> aSourceProperties = xSourceInfo->getProperties();
-    Reference< ::com::sun::star::beans::XPropertySetInfo> xDestInfo( xDestSet->getPropertySetInfo());
-    Sequence< ::com::sun::star::beans::Property> aDestProperties = xDestInfo->getProperties();
+    Reference< XPropertySet > xSourceSet(_xObj, UNO_QUERY);
+    Reference< XPropertySetInfo > xSourceInfo( xSourceSet->getPropertySetInfo());
+    Sequence< Property> aSourceProperties = xSourceInfo->getProperties();
+    Reference< XPropertySetInfo > xDestInfo( xDestSet->getPropertySetInfo());
+    Sequence< Property> aDestProperties = xDestInfo->getProperties();
     int nDestLen = aDestProperties.getLength();
 
-    ::com::sun::star::beans::Property* pSourceProps = aSourceProperties.getArray();
-    ::com::sun::star::beans::Property* pDestProps = aDestProperties.getArray();
+    Property* pSourceProps = aSourceProperties.getArray();
+    Property* pSourceEnd = pSourceProps + aSourceProperties.getLength();
+    Property* pDestProps = aDestProperties.getArray();
 
-    for (sal_Int16 i=0; i<aSourceProperties.getLength(); ++i)
+    for (; pSourceProps != pSourceEnd; ++pSourceProps)
     {
-        ::com::sun::star::beans::Property* pResult = (::com::sun::star::beans::Property*) bsearch(pSourceProps + i, (void*)pDestProps, nDestLen, sizeof(::com::sun::star::beans::Property),
-            &PropertyCompare);
-        if  (   pResult
-            &&  (pResult->Attributes == pSourceProps[i].Attributes)
-            &&  ((pResult->Attributes &  ::com::sun::star::beans::PropertyAttribute::READONLY) == 0)
-            &&  (pResult->Type.equals(pSourceProps[i].Type))
+        ::com::sun::star::beans::Property* pResult = ::std::lower_bound(
+                pDestProps,
+                pDestProps + nDestLen,
+                pSourceProps->Name,
+                ::comphelper::PropertyStringLessFunctor()
+            );
+
+        if  (   ( pResult != pDestProps + nDestLen )
+            &&  ( pResult->Name == pSourceProps->Name )
+            &&  ( pResult->Attributes == pSourceProps->Attributes )
+            &&  ( (pResult->Attributes &  PropertyAttribute::READONLY ) == 0 )
+            &&  ( pResult->Type.equals( pSourceProps->Type ) )
             )
         {   // Attribute/type are the same and the prop isn't readonly
             try
             {
                 xDestSet->setPropertyValue(pResult->Name, xSourceSet->getPropertyValue(pResult->Name));
             }
-            catch(::com::sun::star::lang::IllegalArgumentException e)
+            catch(IllegalArgumentException e)
             {
                 e;
 #ifdef DBG_UTIL
@@ -454,47 +406,13 @@ Reference< XInterface> cloneUsingProperties(const Reference< ::com::sun::star::i
 }
 
 //------------------------------------------------------------------------------
-void CloneForms(const Reference< ::com::sun::star::container::XIndexContainer>& _xSource, const Reference< ::com::sun::star::container::XIndexContainer>& _xDest)
-{
-    DBG_ASSERT(_xSource.is() && _xDest.is(), "CloneForms : invalid argument !");
-
-    sal_Int32 nSourceCount = _xSource->getCount();
-    Reference< ::com::sun::star::sdbc::XRowSet> xCurrent;
-    for (sal_Int32 i=nSourceCount-1; i>=0; --i)
-    {
-        _xSource->getByIndex(i) >>= xCurrent;
-        if (!xCurrent.is())
-            continue;
-
-        Reference< ::com::sun::star::io::XPersistObject> xCurrentPersist(xCurrent, UNO_QUERY);
-        DBG_ASSERT(xCurrentPersist.is(), "CloneForms : a form should always be a PersistObject !");
-
-        // don't use a simple clone on xCurrentPersist as this would clone all childs, too
-        Reference< XInterface> xNewObject( cloneUsingProperties(xCurrentPersist));
-        Reference< ::com::sun::star::sdbc::XRowSet> xNew(xNewObject, UNO_QUERY);
-        if (!xNew.is())
-        {
-            DBG_ERROR("CloneForms : could not clone a form object !");
-            ::comphelper::disposeComponent(xNewObject);
-            continue;
-        }
-        _xDest->insertByIndex(0, makeAny(xNew));
-
-        Reference< ::com::sun::star::container::XIndexContainer> xStepIntoSource(xCurrent, UNO_QUERY);
-        Reference< ::com::sun::star::container::XIndexContainer> xStepIntoDest(xNew, UNO_QUERY);
-        if (xStepIntoSource.is() && xStepIntoDest.is())
-            CloneForms(xStepIntoSource, xStepIntoDest);
-    }
-}
-
-//------------------------------------------------------------------------------
-sal_Bool searchElement(const Reference< ::com::sun::star::container::XIndexAccess>& xCont, const Reference< XInterface>& xElement)
+sal_Bool searchElement(const Reference< ::com::sun::star::container::XIndexAccess>& xCont, const Reference< XInterface >& xElement)
 {
     if (!xCont.is() || !xElement.is())
         return sal_False;
 
     sal_Int32 nCount = xCont->getCount();
-    Reference< XInterface> xComp;
+    Reference< XInterface > xComp;
     for (sal_Int32 i = 0; i < nCount; i++)
     {
         try
@@ -520,7 +438,7 @@ sal_Bool searchElement(const Reference< ::com::sun::star::container::XIndexAcces
 }
 
 //------------------------------------------------------------------------------
-sal_Int32 getElementPos(const Reference< ::com::sun::star::container::XIndexAccess>& xCont, const Reference< XInterface>& xElement)
+sal_Int32 getElementPos(const Reference< ::com::sun::star::container::XIndexAccess>& xCont, const Reference< XInterface >& xElement)
 {
     sal_Int32 nIndex = -1;
     if (!xCont.is())
@@ -555,7 +473,7 @@ sal_Int32 getElementPos(const Reference< ::com::sun::star::container::XIndexAcce
 }
 
 //------------------------------------------------------------------
-String getFormComponentAccessPath(const Reference< XInterface>& _xElement, Reference< XInterface>& _rTopLevelElement)
+String getFormComponentAccessPath(const Reference< XInterface >& _xElement, Reference< XInterface >& _rTopLevelElement)
 {
     Reference< ::com::sun::star::form::XFormComponent> xChild(_xElement, UNO_QUERY);
     Reference< ::com::sun::star::container::XIndexAccess> xParent;
@@ -590,19 +508,19 @@ String getFormComponentAccessPath(const Reference< XInterface>& _xElement, Refer
 }
 
 //------------------------------------------------------------------
-String getFormComponentAccessPath(const Reference< XInterface>& _xElement)
+String getFormComponentAccessPath(const Reference< XInterface >& _xElement)
 {
-    Reference< XInterface> xDummy;
+    Reference< XInterface > xDummy;
     return getFormComponentAccessPath(_xElement, xDummy);
 }
 
 //------------------------------------------------------------------------------
-Reference< XInterface> getElementFromAccessPath(const Reference< ::com::sun::star::container::XIndexAccess>& _xParent, const String& _rRelativePath)
+Reference< XInterface > getElementFromAccessPath(const Reference< ::com::sun::star::container::XIndexAccess>& _xParent, const String& _rRelativePath)
 {
     if (!_xParent.is())
-        return Reference< XInterface>();
+        return Reference< XInterface >();
     Reference< ::com::sun::star::container::XIndexAccess> xContainer(_xParent);
-    Reference< XInterface> xElement( _xParent);
+    Reference< XInterface > xElement( _xParent);
 
     String sPath(_rRelativePath);
     while (sPath.Len() && xContainer.is())
@@ -640,16 +558,6 @@ _Optlink
 }
 
 //------------------------------------------------------------------------------
-sal_Bool hasString(const ::rtl::OUString& aStr, const Sequence< ::rtl::OUString>& rList)
-{
-    const ::rtl::OUString* pStrList = rList.getConstArray();
-    ::rtl::OUString* pResult = (::rtl::OUString*) bsearch(&aStr, (void*)pStrList, rList.getLength(), sizeof(::rtl::OUString),
-        &NameCompare);
-
-    return pResult != NULL;
-}
-
-//------------------------------------------------------------------------------
 sal_Int32 findPos(const ::rtl::OUString& aStr, const Sequence< ::rtl::OUString>& rList)
 {
     const ::rtl::OUString* pStrList = rList.getConstArray();
@@ -663,46 +571,7 @@ sal_Int32 findPos(const ::rtl::OUString& aStr, const Sequence< ::rtl::OUString>&
 }
 
 //------------------------------------------------------------------
-void ModifyPropertyAttributes(Sequence< ::com::sun::star::beans::Property>& seqProps, const ::rtl::OUString& ustrPropName, sal_Int16 nAddAttrib, sal_Int16 nRemoveAttrib)
-{
-    sal_Int32 nLen = seqProps.getLength();
-
-    // binaere Suche
-    Type type;
-    ::com::sun::star::beans::Property propSearchDummy(ustrPropName, 0, type, 0);
-    ::com::sun::star::beans::Property* pResult = (::com::sun::star::beans::Property*) bsearch(&propSearchDummy, (void*)seqProps.getArray(), nLen, sizeof(::com::sun::star::beans::Property),
-        &PropertyCompare);
-
-    // gefunden ?
-    if (pResult)
-    {
-        pResult->Attributes |= nAddAttrib;
-        pResult->Attributes &= ~nRemoveAttrib;
-    }
-}
-
-//------------------------------------------------------------------
-void RemoveProperty(Sequence< ::com::sun::star::beans::Property>& seqProps, const ::rtl::OUString& ustrPropName)
-{
-    sal_Int32 nLen = seqProps.getLength();
-
-    // binaere Suche
-    Type type;
-    ::com::sun::star::beans::Property propSearchDummy(ustrPropName, 0, type, 0);
-    const ::com::sun::star::beans::Property* pProperties = seqProps.getConstArray();
-    ::com::sun::star::beans::Property* pResult = (::com::sun::star::beans::Property*) bsearch(&propSearchDummy, (void*)pProperties, nLen, sizeof(::com::sun::star::beans::Property),
-        &PropertyCompare);
-
-    // gefunden ?
-    if (pResult)
-    {
-        DBG_ASSERT(pResult->Name == ustrPropName, "::RemoveProperty Properties nicht sortiert");
-        ::comphelper::removeElementAt(seqProps, pResult - pProperties);
-    }
-}
-
-//------------------------------------------------------------------
-Reference< ::com::sun::star::frame::XModel> getXModel(const Reference< XInterface>& xIface)
+Reference< ::com::sun::star::frame::XModel> getXModel(const Reference< XInterface >& xIface)
 {
     Reference< ::com::sun::star::frame::XModel> xModel(xIface, UNO_QUERY);
     if (xModel.is())
@@ -712,7 +581,7 @@ Reference< ::com::sun::star::frame::XModel> getXModel(const Reference< XInterfac
         Reference< ::com::sun::star::container::XChild> xChild(xIface, UNO_QUERY);
         if (xChild.is())
         {
-            Reference< XInterface> xParent( xChild->getParent());
+            Reference< XInterface > xParent( xChild->getParent());
             return getXModel(xParent);
         }
         else
@@ -741,293 +610,6 @@ Reference< ::com::sun::star::frame::XModel> getXModel(const Reference< XInterfac
     return ::comphelper::getString(xControlModel->getPropertyValue(FM_PROP_CONTROLSOURCE));
 }
 
-
-
-//------------------------------------------------------------------
-//sal_Bool set_impl(Reflection* pRefl, void* pData, const Any& rValue)
-//{
-//  sal_Bool bRes = sal_True;
-//  void* pConv = TypeConversion::to(pRefl, rValue);
-//
-//  if (!pConv && pRefl->getTypeClass() != TypeClass_ANY)
-//      bRes = pRefl->getTypeClass() == TypeClass_VOID;
-//  else
-//  {
-//      switch (pRefl->getTypeClass())
-//      {
-//          case TypeClass_BOOLEAN:
-//              *(sal_Bool*)pData = *(sal_Bool *)pConv; break;
-//          case TypeClass_CHAR:
-//              *(char*)pData = *(char *)pConv; break;
-//          case TypeClass_STRING:
-//              *(::rtl::OUString*)pData = *(::rtl::OUString *)pConv; break;
-//          case TypeClass_FLOAT:
-//              *(float*)pData = *(float *)pConv; break;
-//          case TypeClass_DOUBLE:
-//              *(double*)pData = *(double *)pConv; break;
-//          case TypeClass_BYTE:
-//              *(BYTE*)pData = *(BYTE *)pConv; break;
-//          case TypeClass_SHORT:
-//              *(sal_Int16*)pData = *(sal_Int16 *)pConv; break;
-//          case TypeClass_LONG:
-//              *(sal_Int32*)pData = *(sal_Int32 *)pConv; break;
-//          case TypeClass_UNSIGNED_SHORT:
-//              *(sal_uInt16*)pData = *(sal_uInt16 *)pConv; break;
-//          case TypeClass_UNSIGNED_LONG:
-//              *(sal_uInt32*)pData = *(sal_uInt32 *)pConv; break;
-//          case TypeClass_ANY:
-//              *(Any*)pData = rValue; break;
-//          default:
-//              bRes = sal_False;
-//      }
-//  }
-//  return bRes;
-//}
-
-
-//------------------------------------------------------------------------------
-sal_uInt32 findValue(const Sequence< Any>& rList, const Any& rValue)
-{
-    sal_uInt32 nLen = rList.getLength();
-    const Any* pArray = (const Any*)rList.getConstArray();
-    sal_uInt32 i;
-    for (i = 0; i < nLen; i++)
-    {
-        if (::comphelper::compare(rValue, pArray[i]))
-            break;
-    }
-    return (i < nLen) ? i : LIST_ENTRY_NOTFOUND;
-}
-
-//------------------------------------------------------------------------------
-Sequence<sal_Int16> findValueINT16(const Sequence< ::rtl::OUString>& rList, const ::rtl::OUString& rValue, sal_Bool bOnlyFirst )
-{
-    if( bOnlyFirst )
-    {
-        //////////////////////////////////////////////////////////////////////
-        // An welcher Position finde ich den Wert?
-        sal_Int32 nPos = -1;
-        const ::rtl::OUString* pTArray = (const ::rtl::OUString*)rList.getConstArray();
-        for (sal_uInt32 i = 0; i < (sal_uInt32)rList.getLength(); i++)
-        {
-            if( rValue==pTArray[i] )
-            {
-                nPos = i;
-                break;
-            }
-        }
-
-        //////////////////////////////////////////////////////////////////////
-        // Sequence fuellen
-        if( nPos>-1 )
-        {
-            Sequence<sal_Int16> aRetSeq( 1 );
-            aRetSeq.getArray()[0] = (sal_Int16)nPos;
-
-            return aRetSeq;
-        }
-
-        return Sequence<sal_Int16>();
-
-    }
-    else
-    {
-        //////////////////////////////////////////////////////////////////////
-        // Wie oft kommt der Wert vor?
-        sal_uInt32 nCount = 0;
-        const ::rtl::OUString* pTArray = (const ::rtl::OUString*)rList.getConstArray();
-        sal_uInt32 i;
-        for (i = 0; i < (sal_uInt32)rList.getLength(); i++)
-        {
-            if( rValue==pTArray[i] )
-                nCount++;
-        }
-
-        //////////////////////////////////////////////////////////////////////
-        // Jetzt Sequence fuellen
-        Sequence<sal_Int16> aRetSeq( nCount );
-        sal_uInt32 j = 0;
-        for (i = 0; i < (sal_uInt32)rList.getLength(); i++)
-        {
-            if( rValue==pTArray[i] )
-            {
-                aRetSeq.getArray()[j] = (sal_Int16)i;
-                j++;
-            }
-        }
-
-        return aRetSeq;
-    }
-}
-
-//------------------------------------------------------------------------------
-Sequence<sal_Int16> findValue(const Sequence< ::rtl::OUString>& rList, const ::rtl::OUString& rValue, sal_Bool bOnlyFirst )
-{
-    if( bOnlyFirst )
-    {
-        //////////////////////////////////////////////////////////////////////
-        // An welcher Position finde ich den Wert?
-        sal_Int32 nPos = -1;
-        const ::rtl::OUString* pTArray = (const ::rtl::OUString*)rList.getConstArray();
-        for (sal_uInt32 i = 0; i < (sal_uInt32)rList.getLength(); ++i, ++pTArray)
-        {
-            if( rValue == *pTArray )
-            {
-                nPos = i;
-                break;
-            }
-        }
-
-        //////////////////////////////////////////////////////////////////////
-        // Sequence fuellen
-        if( nPos>-1 )
-        {
-            Sequence<sal_Int16> aRetSeq( 1 );
-            aRetSeq.getArray()[0] = (sal_Int16)nPos;
-
-            return aRetSeq;
-        }
-
-        return Sequence<sal_Int16>();
-
-    }
-
-    else
-    {
-        //////////////////////////////////////////////////////////////////////
-        // Wie oft kommt der Wert vor?
-        sal_uInt32 nCount = 0;
-        const ::rtl::OUString* pTArray = (const ::rtl::OUString*)rList.getConstArray();
-        sal_uInt32 i;
-        for (i = 0; i < (sal_uInt32)rList.getLength(); i++)
-        {
-            if( rValue==pTArray[i] )
-                ++nCount;
-        }
-
-        //////////////////////////////////////////////////////////////////////
-        // Jetzt Sequence fuellen
-        Sequence<sal_Int16> aRetSeq( nCount );
-        sal_uInt32 j = 0;
-        for (i = 0; i < (sal_uInt32)rList.getLength(); i++)
-        {
-            if( rValue==pTArray[i] )
-            {
-                aRetSeq.getArray()[j] = (sal_Int16)i;
-                ++j;
-            }
-        }
-
-        return aRetSeq;
-    }
-}
-
-//------------------------------------------------------------------------------
-sal_uInt32 findValue1(const Sequence< ::rtl::OUString>& rList, const ::rtl::OUString& rValue)
-{
-    const ::rtl::OUString* pTArray = rList.getConstArray();
-    const ::rtl::OUString* pTArrayStart = pTArray;
-    const ::rtl::OUString* pTArrayEnd = pTArray + rList.getLength();
-    for (; pTArray < pTArrayEnd; ++pTArray)
-    {
-        if (*pTArray == rValue)
-            break;
-    }
-    return (pTArray < pTArrayEnd) ? (pTArray - pTArrayStart) : LIST_ENTRY_NOTFOUND;
-}
-
-
-//==================================================================
-// StringConversion
-//==================================================================
-::rtl::OUString AnyToStr( const Any& aValue)
-{
-    UniString aRetStr;
-
-    switch( aValue.getValueTypeClass() )
-    {
-        case TypeClass_INTERFACE:       aRetStr.AssignAscii("TYPE INTERFACE");          break;
-        case TypeClass_SERVICE:         aRetStr.AssignAscii("TYPE SERVICE");            break;
-        case TypeClass_MODULE:          aRetStr.AssignAscii("TYPE MODULE");             break;
-        case TypeClass_STRUCT:          aRetStr.AssignAscii("TYPE STRUCT");             break;
-        case TypeClass_TYPEDEF:         aRetStr.AssignAscii("TYPE TYPEDEF");            break;
-        case TypeClass_UNION:           aRetStr.AssignAscii("TYPE UNION");              break;
-        case TypeClass_ENUM:                aRetStr.AssignAscii("TYPE ENUM");               break;
-        case TypeClass_EXCEPTION:       aRetStr.AssignAscii("TYPE EXCEPTION");          break;
-        case TypeClass_ARRAY:           aRetStr.AssignAscii("TYPE ARRAY");              break;
-        case TypeClass_SEQUENCE:            aRetStr.AssignAscii("TYPE SEQUENCE");           break;
-        case TypeClass_VOID:                aRetStr.AssignAscii("");                        break;
-        case TypeClass_ANY:             aRetStr.AssignAscii("TYPE any");                break;
-        case TypeClass_UNKNOWN:         aRetStr.AssignAscii("TYPE unknown");            break;
-        case TypeClass_BOOLEAN:         aRetStr = ::comphelper::getBOOL(aValue) ? '1' : '0';    break;
-        case TypeClass_CHAR:                aRetStr = String::CreateFromInt32(::comphelper::getINT16(aValue));          break;
-        case TypeClass_STRING:          aRetStr = (const sal_Unicode*)::comphelper::getString(aValue);  break;
-        //  case TypeClass_FLOAT:           SolarMath::DoubleToString( aRetStr, ::comphelper::getFloat(aValue), 'F', 40, '.', sal_True); break;
-        //  case TypeClass_DOUBLE:          SolarMath::DoubleToString( aRetStr, ::comphelper::getDouble(aValue), 'F', 400, '.', sal_True); break;
-        case TypeClass_FLOAT:           aRetStr = String::CreateFromFloat( ::comphelper::getFloat(aValue));break;
-        case TypeClass_DOUBLE:          aRetStr = String::CreateFromDouble( ::comphelper::getDouble(aValue));break;
-                // use SolarMath::DoubleToString instead of sprintf as it is more flexible
-                // with respect to the decimal digits (sprintf uses a default value for the number
-                // of dec digits and isn't able to cut trailing zeros)
-                // 67901 - 27.07.99 - FS
-        case TypeClass_BYTE:                aRetStr = String::CreateFromInt32(::comphelper::getINT16(aValue));      break;
-        case TypeClass_SHORT:           aRetStr = String::CreateFromInt32(::comphelper::getINT16(aValue));      break;
-        case TypeClass_LONG:                aRetStr = String::CreateFromInt32(::comphelper::getINT32(aValue));      break;
-        case TypeClass_HYPER:           aRetStr.AssignAscii("TYPE HYPER");          break;
-        case TypeClass_UNSIGNED_SHORT:  aRetStr = String::CreateFromInt32(::comphelper::getINT16(aValue));      break;
-        case TypeClass_UNSIGNED_LONG:   aRetStr = String::CreateFromInt32(::comphelper::getINT32(aValue));      break;
-        case TypeClass_UNSIGNED_HYPER:  aRetStr.AssignAscii("TYPE UNSIGNED_HYPER"); break;
-    }
-
-    return aRetStr;
-}
-
-// Hilfs-Funktion, um ein ::rtl::OUString in einen Any zu konvertieren
-Any StringToAny( ::rtl::OUString _Str, TypeClass eTargetType )
-{
-    String aStr(_Str);
-    Any aRetAny;
-    switch( eTargetType )
-    {
-        case TypeClass_INTERFACE:       break;
-        case TypeClass_SERVICE:         break;
-        case TypeClass_MODULE:          break;
-        case TypeClass_STRUCT:          break;
-        case TypeClass_TYPEDEF:         break;
-        case TypeClass_UNION:           break;
-        case TypeClass_ENUM:                break;
-        case TypeClass_EXCEPTION:       break;
-        case TypeClass_ARRAY:           break;
-        case TypeClass_SEQUENCE:            break;
-        case TypeClass_VOID:                break;
-        case TypeClass_ANY:             break;
-        case TypeClass_UNKNOWN:         break;
-        case TypeClass_BOOLEAN:
-            {
-                sal_Bool bB = (aStr.ToInt32() != 0);
-                aRetAny.setValue(&bB,getBooleanCppuType() );
-                break;
-            }
-        case TypeClass_CHAR:
-            {
-                sal_Char cC = (sal_Char)(aStr.GetChar(0));
-                aRetAny.setValue(&cC,getCharCppuType() );       break;
-            }
-        case TypeClass_STRING:          aRetAny <<= _Str;           break;
-        case TypeClass_FLOAT:           aRetAny <<= aStr.ToFloat(); break;
-        case TypeClass_DOUBLE:          aRetAny <<= aStr.ToDouble(); break;
-        case TypeClass_BYTE:                aRetAny <<=  (sal_uInt8)aStr.ToInt32(); break;
-        case TypeClass_SHORT:           aRetAny <<=  (sal_Int16)aStr.ToInt32(); break;
-        case TypeClass_LONG:                aRetAny <<=  (sal_Int32)aStr.ToInt32(); break;
-        case TypeClass_HYPER:           break;
-        case TypeClass_UNSIGNED_SHORT:  aRetAny <<=  (sal_uInt16)aStr.ToInt32();    break;
-        case TypeClass_UNSIGNED_LONG:   aRetAny <<=  (sal_uInt32)aStr.ToInt32();    break;
-        case TypeClass_UNSIGNED_HYPER:  break;
-    }
-    return aRetAny;
-}
-
-
 //========================================================================
 // = CursorWrapper
 //------------------------------------------------------------------------
@@ -1088,114 +670,6 @@ const CursorWrapper& CursorWrapper::operator=(const Reference< ::com::sun::star:
     return *this;
 }
 
-//==============================================================================
-//==============================================================================
-//IndexAccessIterator::IndexAccessIterator(Reference< XInterface> xStartingPoint)
-//  :m_xStartingPoint(xStartingPoint)
-//  ,m_xCurrentObject(NULL)
-//{
-//  DBG_ASSERT(m_xStartingPoint.is(), "IndexAccessIterator::IndexAccessIterator : no starting point !");
-//}
-//
-//  ------------------------------------------------------------------------------
-//Reference< XInterface> IndexAccessIterator::Next()
-//{
-//  sal_Bool bCheckingStartingPoint = !m_xCurrentObject.is();
-//      // ist die aktuelle Node der Anfangspunkt ?
-//  sal_Bool bAlreadyCheckedCurrent = m_xCurrentObject.is();
-//      // habe ich die aktuelle Node schon mal mittels ShouldHandleElement testen ?
-//  if (!m_xCurrentObject.is())
-//      m_xCurrentObject = m_xStartingPoint;
-//
-//  Reference< XInterface> xSearchLoop( m_xCurrentObject);
-//  sal_Bool bHasMoreToSearch = sal_True;
-//  sal_Bool bFoundSomething = sal_False;
-//  while (!bFoundSomething && bHasMoreToSearch)
-//  {
-//      // pre-order-traversierung
-//      if (!bAlreadyCheckedCurrent && ShouldHandleElement(xSearchLoop))
-//      {
-//          m_xCurrentObject = xSearchLoop;
-//          bFoundSomething = sal_True;
-//      }
-//      else
-//      {
-//          // zuerst absteigen, wenn moeglich
-//          Reference< ::com::sun::star::container::XIndexAccess> xContainerAccess(xSearchLoop, UNO_QUERY);
-//          if (xContainerAccess.is() && xContainerAccess->getCount() && ShouldStepInto(xContainerAccess))
-//          {   // zum ersten Child
-//              Any aElement(xContainerAccess->getByIndex(0));
-//              xSearchLoop = *(Reference< XInterface>*)aElement.getValue();
-//              bCheckingStartingPoint = sal_False;
-//
-//              m_arrChildIndizies.Insert(ULONG(0), m_arrChildIndizies.Count());
-//          }
-//          else
-//          {
-//              // dann nach oben und nach rechts, wenn moeglich
-//              while (m_arrChildIndizies.Count() > 0)
-//              {   // (mein Stack ist nich leer, also kann ich noch nach oben gehen)
-//                  Reference< ::com::sun::star::container::XChild> xChild(xSearchLoop, UNO_QUERY);
-//                  DBG_ASSERT(xChild.is(), "IndexAccessIterator::Next : a content has no approriate interface !");
-//
-//                  Reference< XInterface> xParent( xChild->getParent());
-//                  xContainerAccess = Reference< ::com::sun::star::container::XIndexAccess>(xParent, UNO_QUERY);
-//                  DBG_ASSERT(xContainerAccess.is(), "IndexAccessIterator::Next : a content has an invalid parent !");
-//
-//                  // den Index, den SearchLoop in diesem Parent hatte, von meinem 'Stack'
-//                  ULONG nOldSearchChildIndex = m_arrChildIndizies.GetObject(m_arrChildIndizies.Count() - 1);
-//                  m_arrChildIndizies.Remove(m_arrChildIndizies.Count() - 1);
-//
-//                  if (nOldSearchChildIndex < xContainerAccess->getCount() - 1)
-//                  {   // auf dieser Ebene geht es noch nach rechts
-//                      ++nOldSearchChildIndex;
-//                      // also das naechste Child
-//                      Any aElement(xContainerAccess->getByIndex(nOldSearchChildIndex));
-//                      xSearchLoop = *(Reference< XInterface>*) aElement.getValue();
-//                      bCheckingStartingPoint = sal_False;
-//                      // und dessen Position auf den 'Stack'
-//                      m_arrChildIndizies.Insert(ULONG(nOldSearchChildIndex), m_arrChildIndizies.Count());
-//
-//                      break;
-//                  }
-//                  // hierher komme ich, wenn es auf der aktuellen Ebene nicht nach rechts geht, dann mache ich eine darueber weiter
-//                  xSearchLoop = xParent;
-//                  bCheckingStartingPoint = sal_False;
-//              }
-//
-//              if ((m_arrChildIndizies.Count() == 0) && !bCheckingStartingPoint)
-//              {   // das ist genau dann der Fall, wenn ich keinen rechten Nachbarn fuer irgendeinen der direkten Vorfahren des
-//                  // urspruenglichen xSearchLoop gefunden habe
-//                  bHasMoreToSearch = sal_False;
-//              }
-//          }
-//
-//          if (bHasMoreToSearch)
-//          {   // ich habe in xSearchLoop jetzt ein Interface eines 'Knotens' meines 'Baumes', den ich noch abtesten kann
-//              if (ShouldHandleElement(xSearchLoop))
-//              {
-//                  m_xCurrentObject = xSearchLoop;
-//                  bFoundSomething = sal_True;
-//              }
-//              else
-//                  if (bCheckingStartingPoint)
-//                      // ich bin noch am Anfang, konnte nicht absteigen, und habe an diesem Anfang nix gefunden -> nix mehr zu tun
-//                      bHasMoreToSearch = sal_False;
-//              bAlreadyCheckedCurrent = sal_True;
-//          }
-//      }
-//  }
-//
-//  if (!bFoundSomething)
-//  {
-//      DBG_ASSERT(m_arrChildIndizies.Count() == 0, "IndexAccessIterator::Next : items left on stack ! how this ?");
-//      Invalidate();
-//  }
-//
-//  return m_xCurrentObject;
-//}
-
-
 //------------------------------------------------------------------------------
 FmXDisposeListener::~FmXDisposeListener()
 {
@@ -1340,57 +814,6 @@ sal_Int16 getControlTypeByObject(const Reference< ::com::sun::star::lang::XServi
     return OBJ_FM_CONTROL;
 }
 
-/*
-sal_Int16 getControlTypeByModelName(const ::rtl::OUString& rModel)
-{
-    if (rModel.equals(FM_COMPONENT_EDIT))   // 5.0-Name
-        return OBJ_FM_EDIT;
-    if (rModel.equals(FM_COMPONENT_TEXTFIELD))
-        return OBJ_FM_EDIT;
-    if (rModel.equals(FM_COMPONENT_COMMANDBUTTON))
-        return OBJ_FM_BUTTON;
-    if (rModel.equals(FM_COMPONENT_FIXEDTEXT))
-        return OBJ_FM_FIXEDTEXT;
-    if (rModel.equals(FM_COMPONENT_LISTBOX))
-        return OBJ_FM_LISTBOX;
-    if (rModel.equals(FM_COMPONENT_CHECKBOX))
-        return OBJ_FM_CHECKBOX;
-    if (rModel.equals(FM_COMPONENT_RADIOBUTTON))
-        return OBJ_FM_RADIOBUTTON;
-    if (rModel.equals(FM_COMPONENT_GROUPBOX))
-        return OBJ_FM_GROUPBOX;
-    if (rModel.equals(FM_COMPONENT_COMBOBOX))
-        return OBJ_FM_COMBOBOX;
-    if (rModel.equals(FM_COMPONENT_GRID))   // 5.0-Name
-        return OBJ_FM_GRID;
-    if (rModel.equals(FM_COMPONENT_GRIDCONTROL))
-        return OBJ_FM_GRID;
-    if (rModel.equals(FM_COMPONENT_IMAGEBUTTON))
-        return OBJ_FM_IMAGEBUTTON;
-    if (rModel.equals(FM_COMPONENT_FILECONTROL))
-        return OBJ_FM_FILECONTROL;
-    if (rModel.equals(FM_COMPONENT_DATEFIELD))
-        return OBJ_FM_DATEFIELD;
-    if (rModel.equals(FM_COMPONENT_TIMEFIELD))
-        return OBJ_FM_TIMEFIELD;
-    if (rModel.equals(FM_COMPONENT_NUMERICFIELD))
-        return OBJ_FM_NUMERICFIELD;
-    if (rModel.equals(FM_COMPONENT_CURRENCYFIELD))
-        return OBJ_FM_CURRENCYFIELD;
-    if (rModel.equals(FM_COMPONENT_PATTERNFIELD))
-        return OBJ_FM_PATTERNFIELD;
-    if (rModel.equals(FM_COMPONENT_HIDDEN)) // 5.0-Name
-        return OBJ_FM_HIDDEN;
-    if (rModel.equals(FM_COMPONENT_HIDDENCONTROL))
-        return OBJ_FM_HIDDEN;
-    if (rModel.equals(FM_COMPONENT_IMAGECONTROL))
-        return OBJ_FM_IMAGECONTROL;
-    if (rModel.equals(FM_COMPONENT_FORMATTEDFIELD))
-        return OBJ_FM_FORMATTEDFIELD;
-    return OBJ_FM_CONTROL;
-}
-*/
-
 //------------------------------------------------------------------------------
 ::rtl::OUString getServiceNameByControlType(sal_Int16 nType)
 {
@@ -1548,44 +971,6 @@ void TransferEventScripts(const Reference< ::com::sun::star::awt::XControlModel>
 }
 
 //------------------------------------------------------------------------------
-sal_Int16   GridModel2ViewPos(const Reference< ::com::sun::star::container::XIndexAccess>& rColumns, sal_Int16 nModelPos)
-{
-    try
-    {
-        if (rColumns.is())
-        {
-            // invalid pos ?
-            if (nModelPos >= rColumns->getCount())
-                return (sal_Int16)-1;
-
-            // the column itself shouldn't be hidden
-            Reference< ::com::sun::star::beans::XPropertySet> xAskedFor;
-            rColumns->getByIndex(nModelPos) >>= xAskedFor;
-            if (::comphelper::getBOOL(xAskedFor->getPropertyValue(FM_PROP_HIDDEN)))
-            {
-                DBG_ERROR("GridModel2ViewPos : invalid argument !");
-                return (sal_Int16)-1;
-            }
-
-            sal_Int16 nViewPos = nModelPos;
-            Reference< ::com::sun::star::beans::XPropertySet> xCur;
-            for (sal_Int16 i=0; i<nModelPos; ++i)
-            {
-                rColumns->getByIndex(i) >>= xCur;
-                if (::comphelper::getBOOL(xCur->getPropertyValue(FM_PROP_HIDDEN)))
-                    --nViewPos;
-            }
-            return nViewPos;
-        }
-    }
-    catch(const Exception&)
-    {
-        DBG_ERROR("GridModel2ViewPos Exception occured!");
-    }
-    return (sal_Int16)-1;
-}
-
-//------------------------------------------------------------------------------
 sal_Int16   GridView2ModelPos(const Reference< ::com::sun::star::container::XIndexAccess>& rColumns, sal_Int16 nViewPos)
 {
     try
@@ -1617,32 +1002,6 @@ sal_Int16   GridView2ModelPos(const Reference< ::com::sun::star::container::XInd
     return (sal_Int16)-1;
 }
 
-//------------------------------------------------------------------------------
-sal_Int16   GridViewColumnCount(const Reference< ::com::sun::star::container::XIndexAccess>& rColumns)
-{
-    try
-    {
-        if (rColumns.is())
-        {
-            sal_Int16 nCount = (sal_Int16)rColumns->getCount();
-            // loop through all columns
-            Reference< ::com::sun::star::beans::XPropertySet> xCur;
-            for (sal_Int16 i=0; i<rColumns->getCount(); ++i)
-            {
-                rColumns->getByIndex(i) >>= xCur;
-                if (::comphelper::getBOOL(xCur->getPropertyValue(FM_PROP_HIDDEN)))
-                    --nCount;
-            }
-            return nCount;
-        }
-    }
-    catch(const Exception&)
-    {
-        DBG_ERROR("GridView2ModelPos Exception occured!");
-    }
-    return 0;
-}
-//------------------------------------------------------------------------------
 //==============================================================================
 // FmSlotDispatch - some kind of translator between the Sfx-Slots and the UNO-dispatchers
 //==============================================================================
@@ -1776,20 +1135,6 @@ void FmSlotDispatch::StateChanged(USHORT _nSID, SfxItemState _eState, const SfxP
     return aReturn;
 }
 
-// search in the hierarchy for a connection
-//------------------------------------------------------------------------------
-Reference< ::com::sun::star::sdbc::XConnection> findConnection(const Reference< XInterface>& xParent)
-{
-    Reference< ::com::sun::star::sdbc::XConnection> xConnection(xParent, UNO_QUERY);
-    if (!xConnection.is())
-    {
-        Reference< ::com::sun::star::container::XChild> xChild(xParent, UNO_QUERY);
-        if (xChild.is())
-            return findConnection(xChild->getParent());
-    }
-    return xConnection;
-}
-
 //========================================================================
 //= FmXDispatchInterceptorImpl
 //========================================================================
@@ -1797,7 +1142,7 @@ Reference< ::com::sun::star::sdbc::XConnection> findConnection(const Reference<
 DBG_NAME(FmXDispatchInterceptorImpl);
 //------------------------------------------------------------------------
 FmXDispatchInterceptorImpl::FmXDispatchInterceptorImpl(
-            const Reference< XDispatchProviderInterception>& _rxToIntercept, FmDispatchInterceptor* _pMaster,
+            const Reference< XDispatchProviderInterception >& _rxToIntercept, FmDispatchInterceptor* _pMaster,
             sal_Int16 _nId, Sequence< ::rtl::OUString > _rInterceptedSchemes)
     :FmXDispatchInterceptorImpl_BASE(_pMaster && _pMaster->getInterceptorMutex() ? *_pMaster->getInterceptorMutex() : m_aFallback)
     ,m_xIntercepted(_rxToIntercept)
@@ -1953,7 +1298,7 @@ void FmXDispatchInterceptorImpl::disposing()
 //==============================================================================
 
 //------------------------------------------------------------------------------
-sal_Bool isLoadable(const Reference< XInterface>& xLoad)
+sal_Bool isLoadable(const Reference< XInterface >& xLoad)
 {
     // determines whether a form should be loaded or not
     // if there is no datasource or connection there is no reason to load a form
@@ -1963,12 +1308,11 @@ sal_Bool isLoadable(const Reference< XInterface>& xLoad)
         try
         {
             // is there already a active connection
-            Reference< XInterface> xConn;
+            Reference< XInterface > xConn;
             xSet->getPropertyValue(FM_PROP_ACTIVE_CONNECTION) >>= xConn;
             return (xConn.is() ||
                     ::comphelper::getString(xSet->getPropertyValue(FM_PROP_DATASOURCE)).getLength() ||
-                    ::comphelper::getString(xSet->getPropertyValue(FM_PROP_URL)).getLength() ||
-                    ::findConnection(xLoad).is());
+                    ::comphelper::getString(xSet->getPropertyValue(FM_PROP_URL)).getLength());
         }
         catch(Exception&)
         {
@@ -1998,7 +1342,7 @@ void setConnection(const Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet,
     }
 }
 //------------------------------------------------------------------------------
-sal_Bool isRowSetAlive(const Reference< XInterface>& _rxRowSet)
+sal_Bool isRowSetAlive(const Reference< XInterface >& _rxRowSet)
 {
     sal_Bool bIsAlive = sal_False;
     Reference< ::com::sun::star::sdbcx::XColumnsSupplier> xSupplyCols(_rxRowSet, UNO_QUERY);
@@ -2011,21 +1355,3 @@ sal_Bool isRowSetAlive(const Reference< XInterface>& _rxRowSet)
     return bIsAlive;
 }
 
-
-//==============================================================================
-DataColumn::DataColumn(const Reference< ::com::sun::star::beans::XPropertySet>& _rxIFace)
-{
-    m_xPropertySet = _rxIFace;
-    m_xColumn = Reference< ::com::sun::star::sdb::XColumn>(_rxIFace, UNO_QUERY);
-    m_xColumnUpdate = Reference< ::com::sun::star::sdb::XColumnUpdate>(_rxIFace, UNO_QUERY);
-
-    if (!m_xPropertySet.is() || !m_xColumn.is())
-    {
-        m_xPropertySet = NULL;
-        m_xColumn = NULL;
-        m_xColumnUpdate = NULL;
-    }
-}
-
-
-
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index fa7488c894f6..9aa7a5326fa5 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmundo.cxx,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: oj $ $Date: 2002-08-01 08:16:27 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -342,7 +342,7 @@ void FmXUndoEnvironment::Inserted(SdrObject* pObj)
     if (pObj->GetObjInventor() == FmFormInventor)
     {
         FmFormObj* pFormObj = PTR_CAST(FmFormObj, pObj);
-        Inserted(pFormObj);
+        Inserted( pFormObj );
     }
     else if (pObj->IsGroupObject())
     {
@@ -358,6 +358,10 @@ void FmXUndoEnvironment::Inserted(SdrObject* pObj)
 //------------------------------------------------------------------------------
 void FmXUndoEnvironment::Inserted(FmFormObj* pObj)
 {
+    DBG_ASSERT( pObj, "FmXUndoEnvironment::Inserted: invalid object!" );
+    if ( !pObj )
+        return;
+
     // ist das Control noch einer Form zugeordnet
     Reference< XInterface >  xModel = pObj->GetUnoControlModel();
     Reference< XFormComponent >  xContent(xModel, UNO_QUERY);
@@ -426,6 +430,10 @@ void FmXUndoEnvironment::Removed(SdrObject* pObj)
 //------------------------------------------------------------------------------
 void FmXUndoEnvironment::Removed(FmFormObj* pObj)
 {
+    DBG_ASSERT( pObj, "FmXUndoEnvironment::Removed: invalid object!" );
+    if ( !pObj )
+        return;
+
     // ist das Control noch einer Form zugeordnet
     Reference< XInterface >  xModel = pObj->GetUnoControlModel();
     Reference< XFormComponent >  xContent(xModel, UNO_QUERY);
@@ -620,23 +628,6 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt)
     }
 }
 
-// XVetoableChangeListener
-//------------------------------------------------------------------------------
-void SAL_CALL FmXUndoEnvironment::vetoableChange(const PropertyChangeEvent& aEvent) throw( PropertyVetoException, RuntimeException )
-{
-    ::vos::OClearableGuard aGuard( Application::GetSolarMutex() );
-    if (aEvent.PropertyName == FM_PROP_DATASOURCE)
-    {
-        // if the database form belongs to a connection
-        // it is not possible to change the connection
-        if (findConnection(aEvent.Source).is())
-        {
-            ::rtl::OUString aMessage = ::rtl::OUString(SVX_RES(RID_STR_VETO_DATASOURCE));
-            throw(PropertyVetoException(aMessage, (XVetoableChangeListener*)this));
-        }
-    }
-}
-
 // XContainerListener
 //------------------------------------------------------------------------------
 void SAL_CALL FmXUndoEnvironment::elementInserted(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException)
@@ -763,12 +754,7 @@ void FmXUndoEnvironment::AddElement(const Reference< XInterface > & Element)
         // auf Properties horchen
         Reference< XPropertySet >  xSet(Element, UNO_QUERY);
         if (xSet.is())
-        {
             xSet->addPropertyChangeListener(::rtl::OUString(), (XPropertyChangeListener*)this);
-            Reference< XForm >  xForm(xSet, UNO_QUERY);
-            if (xForm.is())
-                xSet->addVetoableChangeListener(FM_PROP_DATASOURCE, (XVetoableChangeListener*)this);
-        }
     }
 }
 
@@ -786,8 +772,6 @@ void FmXUndoEnvironment::RemoveElement(const Reference< XInterface > & Element)
             Reference< XForm >  xForm(xSet, UNO_QUERY);
             if (xForm.is())
             {
-                xSet->removeVetoableChangeListener(FM_PROP_DATASOURCE, (XVetoableChangeListener*)this);
-
                 // reset the ActiveConnection if the form is to be removed. This will (should) free the resources
                 // associated with this connection
                 // 86299 - 05/02/2001 - frank.schoenheit@germany.sun.com
@@ -966,11 +950,12 @@ void FmUndoPropertyAction::Redo()
 String FmUndoPropertyAction::GetComment() const
 {
     String aStr(static_STR_UNDO_PROPERTY);
-    sal_uInt16 nId = (sal_uInt16)FmPropertyInfoService::getPropertyId(aPropertyName);
-    if (nId)
-        aStr.SearchAndReplace('#', FmPropertyInfoService::getPropertyTranslation(nId));
-    else
-        aStr.SearchAndReplace('#', aPropertyName);
+
+    ::rtl::OUString sPropertyDisplayName = FmPropertyInfoService::getPropertyTranslation( aPropertyName );
+    if ( sPropertyDisplayName.getLength() )
+        sPropertyDisplayName = aPropertyName;
+
+    aStr.SearchAndReplace( '#', sPropertyDisplayName );
     return aStr;
 }
 
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index ef1c5eecfc40..844130ea4d23 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmview.cxx,v $
  *
- *  $Revision: 1.24 $
+ *  $Revision: 1.25 $
  *
- *  last change: $Author: oj $ $Date: 2002-10-31 13:30:33 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -290,8 +290,23 @@ void FmFormView::MarkListHasChanged()
 {
     E3dView::MarkListHasChanged();
 
-    if (pFormShell && IsDesignMode())
+    if ( pFormShell && IsDesignMode() )
+    {
+        FmFormObj* pObj = getMarkedGrid();
+        if ( pImpl->m_pMarkedGrid && pImpl->m_pMarkedGrid != pObj )
+        {
+            pImpl->m_pMarkedGrid = NULL;
+            if ( pImpl->m_xWindow.is() )
+            {
+                pImpl->m_xWindow->removeFocusListener(pImpl);
+                pImpl->m_xWindow = NULL;
+            }
+            SetMoveOutside(FALSE);
+            RefreshAllIAOManagers();
+        }
+
         pFormShell->GetImpl()->SetSelectionDelayed(this);
+    }
 }
 
 //------------------------------------------------------------------------
@@ -647,30 +662,22 @@ BOOL FmFormView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
         &&  !rKeyCode.IsMod2()
         &&  rKeyCode.GetCode() == KEY_RETURN )
     {
-        const SdrMarkList& rMarkList = GetMarkList();
-        if ( 1 == rMarkList.GetMarkCount() )
+        FmFormObj* pObj = getMarkedGrid();
+        if ( pObj )
         {
-            SdrMark* pMark = rMarkList.GetMark(0);
-            if ( pMark )
+            Reference< ::com::sun::star::awt::XWindow> xWindow(pObj->GetUnoControl( pWin ),UNO_QUERY);
+            if ( xWindow.is() )
             {
-                FmFormObj* pObj = PTR_CAST(FmFormObj,pMark->GetObj());
-                if ( pObj && pObj->getType() == OBJ_FM_GRID )
-                {
-                    // get the context of the control - it will be our "inner" context
-                    Reference< ::com::sun::star::awt::XWindow> xWindow(pObj->GetUnoControl( pWin ),UNO_QUERY);
-                    if ( xWindow.is() )
-                    {
-                        pImpl->m_xWindow = xWindow;
-                        xWindow->addFocusListener(pImpl);
-                        SetMoveOutside(TRUE);
-                        RefreshAllIAOManagers();
-                        xWindow->setFocus();
-                        bDone = TRUE;
-                    }
-                }
+                pImpl->m_pMarkedGrid = pObj;
+                pImpl->m_xWindow = xWindow;
+                // add as listener to get notified when ESC will be pressed inside the grid
+                pImpl->m_xWindow->addFocusListener(pImpl);
+                SetMoveOutside(TRUE);
+                RefreshAllIAOManagers();
+                xWindow->setFocus();
+                bDone = TRUE;
             }
         }
-
     }
     if ( !bDone )
         bDone = E3dView::KeyInput(rKEvt,pWin);
@@ -683,6 +690,28 @@ sal_Bool FmFormView::checkUnMarkAll(const Reference< XInterface >& _xSource)
     Reference< ::com::sun::star::awt::XControl> xControl(pImpl->m_xWindow,UNO_QUERY);
     if ( bRet = ( !xControl.is() || !_xSource.is() || _xSource != xControl->getModel() ) )
         UnmarkAll();
+
     return bRet;
 }
-// -----------------------------------------------------------------------------
\ No newline at end of file
+// -----------------------------------------------------------------------------
+FmFormObj* FmFormView::getMarkedGrid() const
+{
+    FmFormObj* pObj = NULL;
+    const SdrMarkList& rMarkList = GetMarkList();
+    if ( 1 == rMarkList.GetMarkCount() )
+    {
+        SdrMark* pMark = rMarkList.GetMark(0);
+        if ( pMark )
+        {
+            pObj = PTR_CAST(FmFormObj,pMark->GetObj());
+            if ( pObj )
+            {
+                Reference<XServiceInfo> xServInfo(pObj->GetUnoControlModel(),UNO_QUERY);
+                if ( !xServInfo.is() || !xServInfo->supportsService(FM_SUN_COMPONENT_GRIDCONTROL) )
+                    pObj = NULL;
+            }
+        }
+    }
+    return pObj;
+}
+// -----------------------------------------------------------------------------
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 8b5747d094f1..515d09e17f54 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmvwimp.cxx,v $
  *
- *  $Revision: 1.26 $
+ *  $Revision: 1.27 $
  *
- *  last change: $Author: oj $ $Date: 2002-11-22 12:46:24 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -499,6 +499,7 @@ FmXFormView::FmXFormView(const ::com::sun::star::uno::Reference< ::com::sun::sta
     ,m_nAutoFocusEvent( 0 )
     ,m_pWatchStoredList( NULL )
     ,m_bFirstActivation( sal_True )
+    ,m_pMarkedGrid(NULL)
 {
 }
 
@@ -977,48 +978,24 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript
     OAutoDispose aDisposeConnection( xAutoDisposee );
 
 
-    Reference< XPreparedStatement >     xStatement;
+    OStaticDataAccessTools aDBATools;
+    Reference< XComponent > xKeepFieldsAlive;
     // go
     try
     {
         FmFormPage& rPage = *static_cast<FmFormPage*>(m_pView->GetPageViewPvNum(0)->GetPage());
-        // Festellen des Feldes
-        Reference< XNameAccess >    xFields;
-        Reference< XPropertySet >       _rxField;
-        switch (nCommandType)
-        {
-            case 0: // old : DataSelectionType_TABLE:
-            {
-                Reference< XTablesSupplier >  xSupplyTables(xConnection, UNO_QUERY);
-                Reference< XColumnsSupplier >  xSupplyColumns;
-                xSupplyTables->getTables()->getByName(sCommand) >>= xSupplyColumns;
-                xFields = xSupplyColumns->getColumns();
-            }
-            break;
-            case 1: // old : DataSelectionType_QUERY:
-            {
-                Reference< XQueriesSupplier >  xSupplyQueries(xConnection, UNO_QUERY);
-                Reference< XColumnsSupplier >  xSupplyColumns;
-                xSupplyQueries->getQueries()->getByName(sCommand) >>= xSupplyColumns;
-                xFields  = xSupplyColumns->getColumns();
-            }
-            break;
-            default:
-            {
-                xStatement = xConnection->prepareStatement(sCommand);
-                // not interested in any results
-                Reference< XPropertySet > (xStatement,UNO_QUERY)->setPropertyValue(::rtl::OUString::createFromAscii("MaxRows"),makeAny(sal_Int32(0)));
-                Reference< XColumnsSupplier >  xSupplyCols(xStatement->executeQuery(), UNO_QUERY);
-                if (xSupplyCols.is())
-                    xFields = xSupplyCols->getColumns();
-            }
-        }
+
+        // determine the table/query field which we should create a control for
+        Reference< XPropertySet >   xField;
+
+        Reference< XNameAccess >    xFields = aDBATools.getFieldsByCommandDescriptor(
+            xConnection, nCommandType, sCommand, xKeepFieldsAlive );
 
         if (xFields.is() && xFields->hasByName(sFieldName))
-            xFields->getByName(sFieldName) >>= _rxField;
+            xFields->getByName(sFieldName) >>= xField;
 
-        Reference< XNumberFormatsSupplier >  xSupplier = OStaticDataAccessTools().getNumberFormats(xConnection, sal_False);
-        if (!xSupplier.is() || !_rxField.is())
+        Reference< XNumberFormatsSupplier >  xSupplier = aDBATools.getNumberFormats(xConnection, sal_False);
+        if (!xSupplier.is() || !xField.is())
             return NULL;
 
         Reference< XNumberFormats >  xNumberFormats(xSupplier->getNumberFormats());
@@ -1028,8 +1005,8 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript
         // Vom Feld werden nun zwei Informationen benoetigt:
         // a.) Name des Feldes fuer Label und ControlSource
         // b.) FormatKey, um festzustellen, welches Feld erzeugt werden soll
-        sal_Int32 nDataType = ::comphelper::getINT32(_rxField->getPropertyValue(FM_PROP_FIELDTYPE));
-        sal_Int32 nFormatKey = ::comphelper::getINT32(_rxField->getPropertyValue(FM_PROP_FORMATKEY));
+        sal_Int32 nDataType = ::comphelper::getINT32(xField->getPropertyValue(FM_PROP_FIELDTYPE));
+        sal_Int32 nFormatKey = ::comphelper::getINT32(xField->getPropertyValue(FM_PROP_FORMATKEY));
 
         ::rtl::OUString sLabelPostfix;
 
@@ -1067,8 +1044,8 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript
         sal_Bool bDateNTimeField = sal_False;
 
         sal_Bool bIsCurrency = sal_False;
-        if (::comphelper::hasProperty(FM_PROP_ISCURRENCY, _rxField))
-            bIsCurrency = ::comphelper::getBOOL(_rxField->getPropertyValue(FM_PROP_ISCURRENCY));
+        if (::comphelper::hasProperty(FM_PROP_ISCURRENCY, xField))
+            bIsCurrency = ::comphelper::getBOOL(xField->getPropertyValue(FM_PROP_ISCURRENCY));
 
         if (bIsCurrency)
             nOBJID = OBJ_FM_CURRENCYFIELD;
@@ -1119,7 +1096,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript
 
         FmFormObj* pLabel;
         FmFormObj* pControl;
-        createControlLabelPair(_pOutDev, 0, _rxField, xNumberFormats, nOBJID, sLabelPostfix, pLabel, pControl);
+        createControlLabelPair(_pOutDev, 0, xField, xNumberFormats, nOBJID, sLabelPostfix, pLabel, pControl);
         if (!pLabel || !pControl)
         {
             delete pLabel;
@@ -1153,7 +1130,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript
         {   // wir haben bis jetzt nur ein Datums-Feld eingefuegt, brauchen aber noch ein extra Feld fuer
             // die Zeit-Komponente
             pLabel = pControl = NULL;
-            createControlLabelPair(_pOutDev, 1000, _rxField, xNumberFormats, OBJ_FM_TIMEFIELD,
+            createControlLabelPair(_pOutDev, 1000, xField, xNumberFormats, OBJ_FM_TIMEFIELD,
                 UniString(SVX_RES(RID_STR_DATETIME_LABELPOSTFIX)).GetToken(1, ';'),
                 pLabel, pControl);
 
@@ -1174,7 +1151,6 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript
     catch(const Exception&)
     {
         DBG_ERROR("FmXFormView::implCreateFieldControl: caught an exception while creating the control !");
-        ::comphelper::disposeComponent(xStatement);
     }
 
 
@@ -1599,11 +1575,22 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList )
 // -----------------------------------------------------------------------------
 void SAL_CALL FmXFormView::focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException)
 {
+    if ( m_xWindow.is() && m_pView )
+    {
+        m_pView->SetMoveOutside(TRUE);
+        m_pView->RefreshAllIAOManagers();
+    }
 }
 // -----------------------------------------------------------------------------
 void SAL_CALL FmXFormView::focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException)
 {
-    removeGridWindowListening();
+    // when switch the focus outside the office the mark didn't change
+    // so we can not remove us as focus listener
+    if ( m_xWindow.is() && m_pView )
+    {
+        m_pView->SetMoveOutside(FALSE);
+        m_pView->RefreshAllIAOManagers();
+    }
 }
 // -----------------------------------------------------------------------------
 void FmXFormView::removeGridWindowListening()
diff --git a/svx/source/form/makefile.mk b/svx/source/form/makefile.mk
index 4f2ba3d4c803..fa64818eacbb 100644
--- a/svx/source/form/makefile.mk
+++ b/svx/source/form/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.12 $
+#   $Revision: 1.13 $
 #
-#   last change: $Author: oj $ $Date: 2002-09-27 11:21:40 $
+#   last change: $Author: hr $ $Date: 2003-03-27 15:02:39 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -122,7 +122,6 @@ SLOFILES = \
     $(SLO)$/tabwin.obj      \
     $(SLO)$/multipro.obj	\
     $(SLO)$/fmurl.obj		\
-    $(SLO)$/fmfilter.obj	\
     $(SLO)$/filtnav.obj		\
     $(SLO)$/fmimplids.obj   \
     $(SLO)$/fmtools.obj     \
@@ -131,7 +130,8 @@ SLOFILES = \
     $(SLO)$/fmsearch.obj	\
     $(SLO)$/fmsrcimp.obj	\
     $(SLO)$/fmview.obj		\
-    $(SLO)$/siimport.obj
+    $(SLO)$/siimport.obj	\
+    $(SLO)$/sdbdatacolumn.obj
 
 .IF "$(OS)$(CPU)"=="SOLARISI" 
 NOOPTFILES=$(SLO)$/fmprop.obj
diff --git a/svx/source/form/sdbdatacolumn.cxx b/svx/source/form/sdbdatacolumn.cxx
new file mode 100644
index 000000000000..9bfbff479b28
--- /dev/null
+++ b/svx/source/form/sdbdatacolumn.cxx
@@ -0,0 +1,321 @@
+/*************************************************************************
+ *
+ *  $RCSfile: sdbdatacolumn.cxx,v $
+ *
+ *  $Revision: 1.2 $
+ *
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:41 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  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., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#ifndef SVX_FORM_SDBDATACOLUMN_HXX
+#include "sdbdatacolumn.hxx"
+#endif
+
+//..............................................................................
+namespace svxform
+{
+//..............................................................................
+
+    using namespace ::com::sun::star::uno;
+    using namespace ::com::sun::star::lang;
+    using namespace ::com::sun::star::beans;
+    using namespace ::com::sun::star::sdbc;
+    using namespace ::com::sun::star::util;
+    using namespace ::com::sun::star::io;
+    using namespace ::com::sun::star::container;
+
+    //==========================================================================
+    //= DataColumn - a class wrapping an object implementing a sdb::DataColumn service
+    //==========================================================================
+    DataColumn::DataColumn(const Reference< ::com::sun::star::beans::XPropertySet>& _rxIFace)
+    {
+        m_xPropertySet = _rxIFace;
+        m_xColumn = Reference< ::com::sun::star::sdb::XColumn>(_rxIFace, UNO_QUERY);
+        m_xColumnUpdate = Reference< ::com::sun::star::sdb::XColumnUpdate>(_rxIFace, UNO_QUERY);
+
+        if (!m_xPropertySet.is() || !m_xColumn.is())
+        {
+            m_xPropertySet = NULL;
+            m_xColumn = NULL;
+            m_xColumnUpdate = NULL;
+        }
+    }
+
+    // Reference< XPropertySet>
+    Reference< XPropertySetInfo> DataColumn::getPropertySetInfo() const throw( RuntimeException )
+    {
+        return m_xPropertySet->getPropertySetInfo();
+    }
+
+    void DataColumn::setPropertyValue(const ::rtl::OUString& aPropertyName, const Any& aValue) throw( UnknownPropertyException,  PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException )
+    {
+        m_xPropertySet->setPropertyValue(aPropertyName, aValue);
+    }
+
+    Any DataColumn::getPropertyValue(const ::rtl::OUString& PropertyName) const throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
+    {
+        return m_xPropertySet->getPropertyValue(PropertyName);
+    }
+
+    void DataColumn::addPropertyChangeListener(const ::rtl::OUString& aPropertyName, const Reference< XPropertyChangeListener>& xListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
+    {
+        m_xPropertySet->addPropertyChangeListener(aPropertyName, xListener);
+    }
+
+    void DataColumn::removePropertyChangeListener(const ::rtl::OUString& aPropertyName, const Reference< XPropertyChangeListener>& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
+    {
+        m_xPropertySet->removePropertyChangeListener(aPropertyName, aListener);
+    }
+
+    void DataColumn::addVetoableChangeListener(const ::rtl::OUString& PropertyName, const Reference< XVetoableChangeListener>& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
+    {
+        m_xPropertySet->addVetoableChangeListener(PropertyName, aListener);
+    }
+
+    void DataColumn::removeVetoableChangeListener(const ::rtl::OUString& PropertyName, const Reference< XVetoableChangeListener>& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
+    {
+        m_xPropertySet->removeVetoableChangeListener(PropertyName, aListener);
+    }
+
+    // XColumn
+    sal_Bool DataColumn::wasNull() throw( SQLException, RuntimeException )
+    {
+        return m_xColumn->wasNull();
+    }
+
+    ::rtl::OUString DataColumn::getString() throw( SQLException, RuntimeException )
+    {
+        return m_xColumn->getString();
+    }
+
+    sal_Bool DataColumn::getBoolean() throw( SQLException, RuntimeException )
+    {
+        return m_xColumn->getBoolean();
+    }
+
+    sal_Int8 DataColumn::getByte() throw( SQLException, RuntimeException )
+    {
+        return m_xColumn->getByte();
+    }
+
+    sal_Int16 DataColumn::getShort() throw( SQLException, RuntimeException )
+    {
+        return m_xColumn->getShort();
+    }
+
+    sal_Int32 DataColumn::getInt() throw( SQLException, RuntimeException )
+    {
+        return m_xColumn->getInt();
+    }
+
+    sal_Int64 DataColumn::getLong() throw( SQLException, RuntimeException )
+    {
+        return m_xColumn->getLong();
+    }
+
+    float DataColumn::getFloat() throw( SQLException, RuntimeException )
+    {
+        return m_xColumn->getFloat();
+    }
+
+    double DataColumn::getDouble() throw( SQLException, RuntimeException )
+    {
+        return m_xColumn->getDouble();
+    }
+
+    Sequence< sal_Int8 > DataColumn::getBytes() throw( SQLException, RuntimeException )
+    {
+        return m_xColumn->getBytes();
+    }
+
+    Date DataColumn::getDate() throw( SQLException, RuntimeException )
+    {
+        return m_xColumn->getDate();
+    }
+
+    Time DataColumn::getTime() throw( SQLException, RuntimeException )
+    {
+        return m_xColumn->getTime();
+    }
+
+    DateTime DataColumn::getTimestamp() throw( SQLException, RuntimeException )
+    {
+        return m_xColumn->getTimestamp();
+    }
+
+    Reference< XInputStream> DataColumn::getBinaryStream() throw( SQLException, RuntimeException )
+    {
+        return m_xColumn->getBinaryStream();
+    }
+
+    Reference< XInputStream> DataColumn::getCharacterStream() throw( SQLException, RuntimeException )
+    {
+        return m_xColumn->getCharacterStream();
+    }
+
+    Any DataColumn::getObject(const Reference< XNameAccess>& typeMap) throw( SQLException, RuntimeException )
+    {
+        return m_xColumn->getObject(typeMap);
+    }
+
+    Reference< XRef> DataColumn::getRef() throw( SQLException, RuntimeException )
+    {
+        return m_xColumn->getRef();
+    }
+
+    Reference< XBlob> DataColumn::getBlob() throw( SQLException, RuntimeException )
+    {
+        return m_xColumn->getBlob();
+    }
+
+    Reference< XClob> DataColumn::getClob() throw( SQLException, RuntimeException )
+    {
+        return m_xColumn->getClob();
+    }
+
+    Reference< XArray> DataColumn::getArray() throw( SQLException, RuntimeException )
+    {
+        return m_xColumn->getArray();
+    }
+
+    // XColumnUpdate
+    void DataColumn::updateNull() throw( SQLException, RuntimeException )
+    {
+        m_xColumnUpdate->updateNull();
+    }
+
+    void DataColumn::updateBoolean(sal_Bool x) throw( SQLException, RuntimeException )
+    {
+        m_xColumnUpdate->updateBoolean(x);
+    }
+
+    void DataColumn::updateByte(sal_Int8 x) throw( SQLException, RuntimeException )
+    {
+        m_xColumnUpdate->updateByte(x);
+    }
+
+    void DataColumn::updateShort(sal_Int16 x) throw( SQLException, RuntimeException )
+    {
+        m_xColumnUpdate->updateShort(x);
+    }
+
+    void DataColumn::updateInt(sal_Int32 x) throw( SQLException, RuntimeException )
+    {
+        m_xColumnUpdate->updateInt(x);
+    }
+
+    void DataColumn::updateLong(sal_Int64 x) throw( SQLException, RuntimeException )
+    {
+        m_xColumnUpdate->updateLong(x);
+    }
+
+    void DataColumn::updateFloat(float x) throw( SQLException, RuntimeException )
+    {
+        m_xColumnUpdate->updateFloat(x);
+    }
+
+    void DataColumn::updateDouble(double x) throw( SQLException, RuntimeException )
+    {
+        m_xColumnUpdate->updateDouble(x);
+    }
+
+    void DataColumn::updateString(const ::rtl::OUString& x) throw( SQLException, RuntimeException )
+    {
+        m_xColumnUpdate->updateString(x);
+    }
+
+    void DataColumn::updateBytes(const Sequence< sal_Int8 >& x) throw( SQLException, RuntimeException )
+    {
+        m_xColumnUpdate->updateBytes(x);
+    }
+
+    void DataColumn::updateDate(const com::sun::star::util::Date& x) throw( SQLException, RuntimeException )
+    {
+        m_xColumnUpdate->updateDate(x);
+    }
+
+    void DataColumn::updateTime(const Time& x) throw( SQLException, RuntimeException )
+    {
+        m_xColumnUpdate->updateTime(x);
+    }
+
+    void DataColumn::updateTimestamp(const DateTime& x) throw( SQLException, RuntimeException )
+    {
+        m_xColumnUpdate->updateTimestamp(x);
+    }
+
+    void DataColumn::updateBinaryStream(const Reference< XInputStream>& x, sal_Int32 length) throw( SQLException, RuntimeException )
+    {
+        m_xColumnUpdate->updateBinaryStream(x, length);
+    }
+
+    void DataColumn::updateCharacterStream(const Reference< XInputStream>& x, sal_Int32 length) throw( SQLException, RuntimeException )
+    {
+        m_xColumnUpdate->updateCharacterStream(x, length);
+    }
+
+    void DataColumn::updateObject(const Any& x) throw( SQLException, RuntimeException )
+    {
+        m_xColumnUpdate->updateObject(x);
+    }
+
+    void DataColumn::updateNumericObject(const Any& x, sal_Int32 scale) throw( SQLException, RuntimeException )
+    {
+        m_xColumnUpdate->updateNumericObject(x, scale);
+    }
+
+    //..............................................................................
+}   // namespace svxform
+//..............................................................................
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index a176db615004..a8842c498066 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabwin.cxx,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: fs $ $Date: 2002-05-06 10:35:15 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:44 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -100,9 +100,6 @@
 #ifndef _COMPHELPER_STLTYPES_HXX_
 #include <comphelper/stl_types.hxx>
 #endif
-#ifndef _CONNECTIVITY_DBTOOLS_HXX_
-#include <connectivity/dbtools.hxx>
-#endif
 
 #ifndef _SVX_FMHELP_HRC
 #include "fmhelp.hrc"
@@ -166,7 +163,7 @@
 #include <sfx2/frame.hxx>
 #endif
 #ifndef _SVX_DATACCESSDESCRIPTOR_HXX_
-#include <svx/dataaccessdescriptor.hxx>
+#include <dataaccessdescriptor.hxx>
 #endif
 
 const long STD_WIN_POS_X = 50;
@@ -181,8 +178,12 @@ const long MIN_WIN_SIZE_Y = 50;
 const long LISTBOX_BORDER = 2;
 
 using namespace ::com::sun::star::sdbc;
+using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::datatransfer;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::container;
 using namespace ::svxform;
 using namespace ::svx;
 
@@ -410,7 +411,7 @@ sal_Bool FmFieldWin::Update(FmFormShell* pShell)
 //-----------------------------------------------------------------------
 sal_Bool FmFieldWin::Update(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > & xForm)
 {
-    // ::com::sun::star::form::ListBox loeschen
+    // ListBox loeschen
     pListBox->Clear();
     UniString aTitle(SVX_RES(RID_STR_FIELDSELECTION));
     SetText(aTitle);
@@ -418,74 +419,25 @@ sal_Bool FmFieldWin::Update(const ::com::sun::star::uno::Reference< ::com::sun::
     if (!xForm.is())
         return sal_False;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement >  xStatement;
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >  xSet(xForm, ::com::sun::star::uno::UNO_QUERY);
+    Reference< XPreparedStatement >  xStatement;
+    Reference< XPropertySet >  xSet(xForm, UNO_QUERY);
 
     m_aObjectName   = ::comphelper::getString(xSet->getPropertyValue(FM_PROP_COMMAND));
     m_aDatabaseName = ::comphelper::getString(xSet->getPropertyValue(FM_PROP_DATASOURCE));
     m_nObjectType   = ::comphelper::getINT32(xSet->getPropertyValue(FM_PROP_COMMANDTYPE));
 
-    // Festellen des Feldes
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >  xFields;
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >  xField;
-    try
-    {
-        // get the connection of the form
-        Reference< XConnection > xConnection = OStaticDataAccessTools().calcConnection(Reference< XRowSet >(xForm, UNO_QUERY), ::comphelper::getProcessServiceFactory());
-
-        if (!xConnection.is())
-            return sal_True;
-
-        switch (m_nObjectType)
-        {
-            case 0:
-            {
-                ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier >  xSupplyTables(xConnection, ::com::sun::star::uno::UNO_QUERY);
-                if (xSupplyTables.is() && xSupplyTables->getTables().is() && xSupplyTables->getTables()->hasByName(m_aObjectName))
-                {
-                    ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier >  xSupplyColumns;
-                    xSupplyTables->getTables()->getByName(m_aObjectName) >>= xSupplyColumns;
-                    xFields = xSupplyColumns->getColumns();
-                }
-            }
-            break;
-            case 1:
-            {
-                ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XQueriesSupplier >  xSupplyQueries(xConnection, ::com::sun::star::uno::UNO_QUERY);
-                if (xSupplyQueries.is() && xSupplyQueries->getQueries().is() && xSupplyQueries->getQueries()->hasByName(m_aObjectName))
-                {
-                    ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier >  xSupplyColumns;
-                    xSupplyQueries->getQueries()->getByName(m_aObjectName) >>= xSupplyColumns;
-                    xFields  = xSupplyColumns->getColumns();
-                }
-            }
-            break;
-            default:
-            {
-                xStatement = xConnection->prepareStatement(m_aObjectName);
-                // not interested in any results
-                ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > (xStatement,::com::sun::star::uno::UNO_QUERY)->setPropertyValue(::rtl::OUString::createFromAscii("MaxRows"),::com::sun::star::uno::makeAny(sal_Int32(0)));
-                ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier >  xSupplyCols(xStatement->executeQuery(), ::com::sun::star::uno::UNO_QUERY);
-                if (xSupplyCols.is())
-                    xFields = xSupplyCols->getColumns();
-            }
-        }
-    }
-    catch(Exception&)
-    {
-        DBG_WARNING("FmFieldWin::Update(::com::sun::star::form::XForm) : could not collect the fields of the current data source !");
-    }
-
-
-    if (xFields.is())
-    {
-        ::com::sun::star::uno::Sequence< ::rtl::OUString> aNames(xFields->getElementNames());
-        sal_Int32 nFieldsCount = aNames.getLength();
-        const ::rtl::OUString* pNames = aNames.getConstArray();
+    // get the connection of the form
+    Reference< XConnection > xConnection = OStaticDataAccessTools().calcConnection(Reference< XRowSet >(xForm, UNO_QUERY), ::comphelper::getProcessServiceFactory());
+    Sequence< ::rtl::OUString> aFieldNames;
+    // get the fields of the object
+    if ( xConnection.is() && m_aObjectName.getLength() )
+        aFieldNames = getFieldNamesByCommandDescriptor( xConnection, m_nObjectType, m_aObjectName );
 
-        for (sal_Int32 i=0; i<nFieldsCount; i++)
-            pListBox->InsertEntry(pNames[i]);
-    }
+    // put them into the list
+    const ::rtl::OUString* pFieldNames = aFieldNames.getConstArray();
+    sal_Int32 nFieldsCount = aFieldNames.getLength();
+    for ( sal_Int32 i = 0; i < nFieldsCount; ++i, ++pFieldNames)
+        pListBox->InsertEntry( * pFieldNames);
 
     // Prefix setzen
     UniString  aPrefix;
@@ -493,10 +445,10 @@ sal_Bool FmFieldWin::Update(const ::com::sun::star::uno::Reference< ::com::sun::
 
     switch (m_nObjectType)
     {
-        case ::com::sun::star::sdb::CommandType::TABLE:
+        case CommandType::TABLE:
             aPrefix = aPrefixes.GetToken(0);
             break;
-        case ::com::sun::star::sdb::CommandType::QUERY:
+        case CommandType::QUERY:
             aPrefix = aPrefixes.GetToken(1);
             break;
         default:
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index 3a852c02371c..0a8b01bfb620 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tbxform.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: fs $ $Date: 2002-05-29 13:29:41 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:45 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -120,6 +120,9 @@
 #ifndef _SVX_FMITEMS_HXX
 #include "fmitems.hxx"
 #endif
+#ifndef _SVX_FMHELP_HRC
+#include "fmhelp.hrc"
+#endif
 
 #ifndef _SFXVIEWFRM_HXX
 #include <sfx2/viewfrm.hxx>
@@ -171,39 +174,44 @@ SvxFmAbsRecWin::~SvxFmAbsRecWin()
 }
 
 // -----------------------------------------------------------------------
-void SvxFmAbsRecWin::FirePosition()
+void SvxFmAbsRecWin::FirePosition( sal_Bool _bForce )
 {
-    INT32 nRecord = GetValue();
-    if (nRecord < GetMin() || nRecord > GetMax())
+    if ( _bForce || ( GetText() != GetSavedValue() ) )
     {
-        Sound::Beep();
-        return;
-    }
+        INT32 nRecord = GetValue();
+        if (nRecord < GetMin() || nRecord > GetMax())
+        {
+            Sound::Beep();
+            return;
+        }
+
+        SfxInt32Item aPositionParam( FN_PARAM_1, nRecord );
 
-    FmFormInfoItem aItem( SID_FM_RECORD_ABSOLUTE, FmFormInfo(nRecord,-1));
+        m_pController->GetBindings().GetDispatcher()->Execute( SID_FM_RECORD_ABSOLUTE, SFX_CALLMODE_RECORD, &aPositionParam, 0L );
 
-    m_pController->GetBindings().GetDispatcher()->Execute( SID_FM_RECORD_ABSOLUTE, SFX_CALLMODE_RECORD, &aItem, 0L );
+        // to update our content we explicitly call StateChanged : a simple Invalidate(m_nId) is insufficient
+        // as our StateChanged won't be called if entered a invalid position which didn't cause the cursor
+        // to be moved.
+        SfxPoolItem* pState = NULL;
+        SfxItemState eState = m_pController->GetBindings().QueryState(m_pController->GetId(), pState);
+        ((SfxControllerItem*)m_pController)->StateChanged(m_pController->GetId(), eState, pState);
+        delete pState;
 
-    // to update our content we explicitly call StateChanged : a simple Invalidate(m_nId) is insufficient
-    // as our StateChanged won't be called if entered a invalid position which didn't cause the cursor
-    // to be moved.
-    SfxPoolItem* pState = NULL;
-    SfxItemState eState = m_pController->GetBindings().QueryState(m_pController->GetId(), pState);
-    ((SfxControllerItem*)m_pController)->StateChanged(m_pController->GetId(), eState, pState);
-    delete pState;
+        SaveValue();
+    }
 }
 
 // -----------------------------------------------------------------------
 void SvxFmAbsRecWin::LoseFocus()
 {
-    FirePosition();
+    FirePosition( sal_False );
 }
 
 // -----------------------------------------------------------------------
 void SvxFmAbsRecWin::KeyInput( const KeyEvent& rKeyEvent )
 {
     if( rKeyEvent.GetKeyCode() == KEY_RETURN && GetText().Len() )
-        FirePosition();
+        FirePosition( sal_True );
     else
         NumericField::KeyInput( rKeyEvent );
 }
@@ -352,7 +360,7 @@ void SvxFmTbxCtlConfig::Select( USHORT nModifier )
 // class SvxFmTbxCtlAbsRec
 //========================================================================
 
-SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlAbsRec, FmFormInfoItem );
+SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlAbsRec, SfxInt32Item );
 DBG_NAME(SvxFmTbxCtlAbsRec);
 //-----------------------------------------------------------------------
 SvxFmTbxCtlAbsRec::SvxFmTbxCtlAbsRec( USHORT nId, ToolBox& rTbx, SfxBindings& rBindings )
@@ -378,17 +386,9 @@ void SvxFmTbxCtlAbsRec::StateChanged( USHORT nSID, SfxItemState eState, const Sf
 
     if (pState)
     {
-        FmFormInfo aInfo = ((FmFormInfoItem*)pState)->GetInfo();
-        if (aInfo.Count > 0)
-        {
-            pWin->SetMax(aInfo.Count);
-        }
-        else
-        {
-            pWin->SetMax(LONG_MAX);
-        }
-        pWin->SetValue(aInfo.Pos);
-        pWin->SetReadOnly(aInfo.ReadOnly);
+        const SfxInt32Item* pItem = PTR_CAST( SfxInt32Item, pState );
+        DBG_ASSERT( pItem, "SvxFmTbxCtlAbsRec::StateChanged: invalid item!" );
+        pWin->SetValue( pItem ? pItem->GetValue() : -1 );
     }
 
     BOOL bEnable = SFX_ITEM_DISABLED != eState && pState;
@@ -405,6 +405,7 @@ void SvxFmTbxCtlAbsRec::StateChanged( USHORT nSID, SfxItemState eState, const Sf
 Window* SvxFmTbxCtlAbsRec::CreateItemWindow( Window* pParent )
 {
     SvxFmAbsRecWin* pWin = new SvxFmAbsRecWin( pParent, this );
+    pWin->SetUniqueId( UID_ABSOLUTE_RECORD_WINDOW );
     return pWin;
 }
 
diff --git a/svx/source/form/tbxform.src b/svx/source/form/tbxform.src
index 0392fd35e9e4..5486f2591c9e 100644
--- a/svx/source/form/tbxform.src
+++ b/svx/source/form/tbxform.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tbxform.src,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: oj $ $Date: 2002-06-21 06:19:07 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -80,15 +80,16 @@ String RID_SVXTBX_FORM_FILTER
     Text[ swedish ] = "Filterlist";
     Text[ polish ] = "Pasek filtru";
     Text[ portuguese_brazilian ] = "Filter toolbox";
-    Text[ japanese ] = "ﾌｨﾙﾀﾊﾞｰ";
+    Text[ japanese ] = "フィルタバー";
     Text[ korean ] = "필터 도구모음";
     Text[ chinese_simplified ] = "筛选栏";
     Text[ chinese_traditional ] = "篩選欄";
     Text[ arabic ] = "���� ������";
     Text[ turkish ] = "Filtre �ubu�u";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Barra de filtros";
-    Text[ finnish ] = "Suodatinpalkki";
+    Text[ catalan ] = "Barra de filtre";
+    Text[ finnish ] = "Suodatusrivi";
+    Text[ thai ] = "แถบตัวกรอง";
 };
 
  //------------------------------------------------------------------------
@@ -142,15 +143,16 @@ ToolBox RID_SVXTBX_FORM_FILTER
     Text[ swedish ] = "Filterlist";
     Text[ polish ] = "Pasek filtru";
     Text[ portuguese_brazilian ] = "Filter toolbox";
-    Text[ japanese ] = "ﾌｨﾙﾀﾊﾞｰ";
+    Text[ japanese ] = "フィルタバー";
     Text[ korean ] = "필터 도구모음";
     Text[ chinese_simplified ] = "筛选栏";
     Text[ chinese_traditional ] = "篩選欄";
     Text[ arabic ] = "���� ������";
     Text[ turkish ] = "Filtre �ubu�u";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Barra de filtros";
-    Text[ finnish ] = "Suodatinpalkki";
+    Text[ catalan ] = "Barra de filtre";
+    Text[ finnish ] = "Suodatusrivi";
+    Text[ thai ] = "แถบตัวกรอง";
 };
 
 String RID_SVXTBX_FORM_NAVIGATION
@@ -164,20 +166,21 @@ String RID_SVXTBX_FORM_NAVIGATION
     Text[ danish ] = "Databaselinje";
     Text[ french ] = "Barre de base de donn�es";
     Text[ swedish ] = "Databaslist";
-    Text[ dutch ] = "Database-balk";
+    Text[ dutch ] = "Databasebalk";
     Text[ spanish ] = "Barra de base de datos";
     Text[ chinese_simplified ] = "数据库工具栏";
-    Text[ russian ] = "������ ������������ ���� ������";
+    Text[ russian ] = "������ ���� ������";
     Text[ polish ] = "Przybornik bazy danych";
-    Text[ japanese ] = "ﾃﾞｰﾀﾍﾞｰｽﾊﾞｰ";
+    Text[ japanese ] = "データベースバー";
     Text[ chinese_traditional ] = "資料庫工具列";
     Text[ greek ] = "������ ����� ���������";
     Text[ korean ] = "데이터베이스 도구모음";
     Text[ arabic ] = "���� ����� ��������";
     Text[ turkish ] = "Veritaban� �ubu�u";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Barra de base de datos";
-    Text[ finnish ] = "Tietokantapalkki";
+    Text[ catalan ] = "Barra de la base de dades";
+    Text[ finnish ] = "Tietol�hdety�kalurivi";
+    Text[ thai ] = "แถบฐานข้อมูล";
 };
 
  //------------------------------------------------------------------------
@@ -320,19 +323,20 @@ ToolBox RID_SVXTBX_FORM_NAVIGATION
     Text [ italian ] = "Barra database" ;
     Text [ spanish ] = "Barra de base de datos" ;
     Text [ french ] = "Barre de base de donn�es" ;
-    Text [ dutch ] = "Database-balk" ;
+    Text [ dutch ] = "Databasebalk" ;
     Text[ chinese_simplified ] = "数据库工具栏";
     Text[ russian ] = "������ ���� ������";
     Text[ polish ] = "Pasek bazy danych";
-    Text[ japanese ] = "ﾃﾞｰﾀﾍﾞｰｽﾊﾞｰ";
+    Text[ japanese ] = "データベースバー";
     Text[ chinese_traditional ] = "資料庫工具列";
     Text[ greek ] = "������ ����� ���������";
-    Text[ korean ] = "데이터베이스 모음";
+    Text[ korean ] = "데이터베이스 도구모음";
     Text[ arabic ] = "���� ����� ��������";
     Text[ turkish ] = "Veritaban� �ubu�u";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Barra de base de datos";
-    Text[ finnish ] = "Tietokantapalkki";
+    Text[ catalan ] = "Barra de la base de dades";
+    Text[ finnish ] = "Tietol�hdety�kalurivi";
+    Text[ thai ] = "แถบฐานข้อมูล";
 };
 
  //------------------------------------------------------------------------
@@ -538,22 +542,23 @@ FloatingWindow RID_SVXTBX_FORM
     Text [ swedish ] = "Formul�rfunktioner" ;
     Text [ danish ] = "Formularfunktioner" ;
     Text [ italian ] = "Funzioni formulario" ;
-    Text [ spanish ] = "Funciones formulario" ;
+    Text [ spanish ] = "Funciones del formulario" ;
     Text [ french ] = "Fonctions de formulaire" ;
     Text [ dutch ] = "Formulierfuncties" ;
     Text [ portuguese ] = "Fun��es de formul�rio" ;
     Text[ chinese_simplified ] = "表单功能";
-    Text[ russian ] = "������� ���������";
+    Text[ russian ] = "�������� ���������� �������";
     Text[ polish ] = "Funkcje formularza";
-    Text[ japanese ] = "ﾌｫｰﾑの機能";
+    Text[ japanese ] = "フォームの機能";
     Text[ chinese_traditional ] = "表單功能";
     Text[ greek ] = "����������� ������";
     Text[ korean ] = "양식 기능";
     Text[ arabic ] = "���� ���������";
     Text[ turkish ] = "Form i�levleri";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Funciones formulario";
-    Text[ finnish ] = "Lomakkeen funktiot";
+    Text[ catalan ] = "Funcions del formulari";
+    Text[ finnish ] = "Lomaketoiminnot";
+    Text[ thai ] = "ฟังก์ชั่นแบบฟอร์ม";
 };
 
 ModalDialog RID_SVX_DLG_INPUTRECORDNO
@@ -576,7 +581,7 @@ ModalDialog RID_SVX_DLG_INPUTRECORDNO
     Text [ swedish ] = "Datapostnummer";
     Text [ polish ] = "Numer rekordu";
     Text [ portuguese_brazilian ] = "AbsoluteRecord";
-    Text [ japanese ] = "ﾚｺｰﾄﾞ番号";
+    Text [ japanese ] = "レコード番号";
     Text [ chinese_simplified ] = "数据条目编号";
 
     FixedText 1
@@ -591,20 +596,21 @@ ModalDialog RID_SVX_DLG_INPUTRECORDNO
         Text[ greek ] = "�������� ���� �������";
         Text[ dutch ] = "ga naar record";
         Text[ french ] = "Passer � l'enregistrement";
-        Text[ spanish ] = "ir a registro";
+        Text[ spanish ] = "Ir a registro";
         Text[ italian ] = "Vai al record di dati";
         Text[ danish ] = "g� til datapost";
         Text[ swedish ] = "g� till datapost";
         Text[ polish ] = "przejd� do rekordu";
         Text[ portuguese_brazilian ] = "go to record";
-        Text[ japanese ] = "ﾚｺｰﾄﾞへ";
+        Text[ japanese ] = "レコードへ";
         Text[ korean ] = "레코드로 가기";
         Text[ chinese_simplified ] = "转到数据条目";
         Text[ chinese_traditional ] = "轉到資料條目";
         Text[ arabic ] = "�������� ��� �����";
         Text[ turkish ] = "Veri k�mesine git";
-        Text[ catalan ] = "ir a registro";
+        Text[ catalan ] = "v�s al registre";
         Text[ finnish ] = "siirry tietueeseen";
+        Text[ thai ] = "ไปยังระเบียน";
     };
     NumericField 1
     {
@@ -627,12 +633,13 @@ ModalDialog RID_SVX_DLG_INPUTRECORDNO
         TabStop = TRUE ;
     };
     Text[ greek ] = "������� ��������";
-    Text[ korean ] = "데이터 레코드 번호";
+    Text[ korean ] = "레코드 번호";
     Text[ chinese_traditional ] = "資料條目編號";
     Text[ arabic ] = "��� �����";
     Text[ turkish ] = "Veri k�mesi no.";
-    Text[ catalan ] = "N�mero de registro";
+    Text[ catalan ] = "N�mero de registre";
     Text[ finnish ] = "Tietueen numero";
+    Text[ thai ] = "เลขระเบียน";
 };
 
 
@@ -641,3 +648,9 @@ ModalDialog RID_SVX_DLG_INPUTRECORDNO
 
 
 
+
+
+
+
+
+
diff --git a/svx/source/form/typemap.cxx b/svx/source/form/typemap.cxx
index ad5951547a5a..75f32dc476ce 100644
--- a/svx/source/form/typemap.cxx
+++ b/svx/source/form/typemap.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: typemap.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:01:18 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -95,19 +95,18 @@ SfxType0 aSfxUInt32Item_Impl =
 };
 
 /************************************************************/
-extern SfxType3 aFmFormInfoItem_Impl;
-SfxType3 aFmFormInfoItem_Impl =
-{
-    TYPE(FmFormInfoItem), 3, { {MID_POS,"Pos"}, {MID_COUNT,"Count"}, {MID_READONLY,"ReadOnly"} }
-};
-
-/************************************************************/
 extern SfxType0 aSfxObjectItem_Impl;
 SfxType0 aSfxObjectItem_Impl =
 {
     TYPE(SfxObjectItem), 0
 };
 
+/************************************************************/
+extern SfxType0 aSfxInt32Item_Impl;
+SfxType0 aSfxInt32Item_Impl =
+{
+    TYPE(SfxInt32Item), 0
+};
 // diese werden nur bei einer Aufteilung in 2 Dll's gebraucht
 #if 1
 #if defined(WNT) || defined(OS2)
@@ -143,6 +142,7 @@ SfxType0 aSfxBoolItem_Impl =
     TYPE(SfxBoolItem), 0
 };
 
+
 #endif
 #endif
 
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index 0374f4a2ed00..1ad897c2981b 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: galbrws1.cxx,v $
  *
- *  $Revision: 1.21 $
+ *  $Revision: 1.22 $
  *
- *  last change: $Author: sj $ $Date: 2002-11-29 12:18:57 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:02:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -184,6 +184,10 @@ GalleryBrowser1::GalleryBrowser1( GalleryBrowser* pParent, const ResId& rResId,
     maNewTheme.SetText( String( GAL_RESID( RID_SVXSTR_GALLERY_CREATETHEME ) ) );
     maNewTheme.SetClickHdl( LINK( this, GalleryBrowser1, ClickNewThemeHdl ) );
 
+    // disable creation of new themes if a writable directory is not available
+    if( mpGallery->GetUserURL().GetProtocol() == INET_PROT_NOT_VALID )
+        maNewTheme.Disable();
+
     mpThemes->SetHelpId( HID_GALLERY_THEMELIST );
     mpThemes->SetSelectHdl( LINK( this, GalleryBrowser1, SelectThemeHdl ) );
 
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 41e472556d64..6a0711fd0045 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: galbrws2.cxx,v $
  *
- *  $Revision: 1.37 $
+ *  $Revision: 1.38 $
  *
- *  last change: $Author: sj $ $Date: 2002-12-03 18:14:59 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:00 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -249,6 +249,7 @@ GalleryThemePopup::GalleryThemePopup( const GalleryTheme* pTheme, ULONG nObjectP
         if( aDataHelper.GetFormatCount() )
         {
             if( aDataHelper.HasFormat( SOT_FORMATSTR_ID_DRAWING ) ||
+                aDataHelper.HasFormat( SOT_FORMAT_FILE_LIST ) ||
                 aDataHelper.HasFormat( FORMAT_FILE ) ||
                 aDataHelper.HasFormat( SOT_FORMATSTR_ID_SVXB ) ||
                 aDataHelper.HasFormat( FORMAT_GDIMETAFILE ) ||
@@ -486,6 +487,7 @@ sal_Int8 GalleryBrowser2::AcceptDrop( DropTargetHelper& rTarget, const AcceptDro
         if( !mpCurTheme->IsDragging() )
         {
             if( rTarget.IsDropFormatSupported( SOT_FORMATSTR_ID_DRAWING ) ||
+                rTarget.IsDropFormatSupported( SOT_FORMAT_FILE_LIST ) ||
                 rTarget.IsDropFormatSupported( FORMAT_FILE ) ||
                 rTarget.IsDropFormatSupported( SOT_FORMATSTR_ID_SVXB ) ||
                 rTarget.IsDropFormatSupported( FORMAT_GDIMETAFILE ) ||
@@ -541,6 +543,7 @@ void GalleryBrowser2::StartDrag( Window* pWindow, const Point* pDragPoint )
 void GalleryBrowser2::TogglePreview( Window* pWindow, const Point* pPreviewPoint )
 {
     SetMode( ( GALLERYBROWSERMODE_PREVIEW != GetMode() ) ? GALLERYBROWSERMODE_PREVIEW : meLastMode );
+    GetViewWindow()->GrabFocus();
 }
 
 // -----------------------------------------------------------------------------
@@ -927,6 +930,7 @@ void GalleryBrowser2::ImplSelectItemId( ULONG nItemId )
 {
     if( nItemId )
     {
+
         mpIconView->SelectItem( (USHORT) nItemId );
         mpListView->SelectRow( nItemId - 1 );
     }
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 8ea7bd36f36b..32527b818c2d 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: galctrl.cxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: ka $ $Date: 2002-06-21 11:31:21 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -372,7 +372,7 @@ void GalleryIconView::UserDraw( const UserDrawEvent& rUDEvt )
             else
                 aGraphic = pObj->GetThumbMtf();
 
-            Size aSize( pDev->LogicToPixel( aGraphic.GetPrefSize(), aGraphic.GetPrefMapMode() ) );
+            Size aSize( aGraphic.GetSizePixel( pDev ) );
 
             if ( aSize.Width() && aSize.Height() )
             {
diff --git a/svx/source/gallery2/gallery.src b/svx/source/gallery2/gallery.src
index 68c6d4d7441a..f5adfd6a0a1b 100644
--- a/svx/source/gallery2/gallery.src
+++ b/svx/source/gallery2/gallery.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: gallery.src,v $
  *
- *  $Revision: 1.62 $
+ *  $Revision: 1.63 $
  *
- *  last change: $Author: sj $ $Date: 2002-11-29 12:23:20 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -136,7 +136,7 @@ TabDialog RID_SVXTABDLG_GALLERY
     SVLook = TRUE ;
     Text = "Eigenschaften von " ;
     Text [ ENGLISH ] = "Settings of " ;
-    Text [ dutch ] = "Eigenschappen van   " ;
+    Text [ dutch ] = "Eigenschappen van" ;
     Text [ english_us ] = "Properties of " ;
     Text [ italian ] = "Propriet� di  " ;
     Text [ spanish ] = "Propiedades de " ;
@@ -151,14 +151,14 @@ TabDialog RID_SVXTABDLG_GALLERY
     Text[ japanese ] = "プロパティ ";
     Text[ chinese_traditional ] = "屬性： ";
     Text[ arabic ] = "�����";
-    Text[ dutch ] = "Eigenschappen van   ";
+    Text[ dutch ] = "Eigenschappen van";
     Text[ chinese_simplified ] = "属性： ";
     Text[ greek ] = "��������� ��� ";
-    Text[ korean ] = "등록정보 ";
+    Text[ korean ] = "등록 정보 ";
     Text[ turkish ] = "�zellikler: ";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Propietats de ";
-    Text[ finnish ] = "Ominaisuudet:";
+    Text[ finnish ] = "Ominaisuudet: ";
     Moveable = TRUE ;
     TabControl 1
     {
@@ -192,7 +192,7 @@ TabDialog RID_SVXTABDLG_GALLERY
                 Text[ turkish ] = "Genel";
                 Text[ language_user1 ] = " ";
                 Text[ catalan ] = "General";
-                Text[ finnish ] = "Yleist�";
+                Text[ finnish ] = "Yleiset";
                 Text[ thai ] = "ทั่วไป";
             };
         };
@@ -208,7 +208,7 @@ TabDialog RID_SVXTABDLG_GALLERYTHEME
     SVLook = TRUE ;
     Text = "Eigenschaften von " ;
     Text [ ENGLISH ] = "Settings of " ;
-    Text [ dutch ] = "Eigenschappen van   " ;
+    Text [ dutch ] = "Eigenschappen van" ;
     Text [ english_us ] = "Properties of " ;
     Text [ italian ] = "Propriet� di  " ;
     Text [ spanish ] = "Propiedades de " ;
@@ -218,19 +218,19 @@ TabDialog RID_SVXTABDLG_GALLERYTHEME
     Text [ portuguese ] = "Propriedades de  " ;
     Text [ portuguese_brazilian ] = "Eigenschaften von " ;
     Text[ chinese_simplified ] = "属性： ";
-    Text[ russian ] = "�������� ";
+    Text[ russian ] = "��������: ";
     Text[ polish ] = "W�a�ciwo�ci ";
     Text[ japanese ] = "プロパティ ";
     Text[ chinese_traditional ] = "屬性： ";
     Text[ arabic ] = "�����";
-    Text[ dutch ] = "Eigenschappen van   ";
+    Text[ dutch ] = "Eigenschappen van";
     Text[ chinese_simplified ] = "属性： ";
     Text[ greek ] = "��������� ��� ";
-    Text[ korean ] = "등록정보 ";
+    Text[ korean ] = "등록 정보 ";
     Text[ turkish ] = "�zellikler: ";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Propietats de";
-    Text[ finnish ] = "Ominaisuudet:";
+    Text[ finnish ] = "Ominaisuudet: ";
     Moveable = TRUE ;
     TabControl 1
     {
@@ -264,7 +264,7 @@ TabDialog RID_SVXTABDLG_GALLERYTHEME
                 Text[ turkish ] = "Genel";
                 Text[ language_user1 ] = " ";
                 Text[ catalan ] = "General";
-                Text[ finnish ] = "Yleist�";
+                Text[ finnish ] = "Yleiset";
                 Text[ thai ] = "ทั่วไป";
             };
             PageItem
@@ -354,7 +354,7 @@ TabPage RID_SVXTABPAGE_GALLERY_GENERAL
         Text[ turkish ] = "Tip:";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Tipus:";
-        Text[ finnish ] = "Tyyppi";
+        Text[ finnish ] = "Tyyppi:";
         Text[ thai ] = "ชนิด:";
     };
     FixedText FT_MS_SHOW_TYPE
@@ -379,7 +379,7 @@ TabPage RID_SVXTABPAGE_GALLERY_GENERAL
         Text [ portuguese_brazilian ] = "Ort:" ;
         Text [ portuguese ] = "Local:" ;
         Text[ chinese_simplified ] = "位置:";
-        Text[ russian ] = "�����:";
+        Text[ russian ] = "������������:";
         Text[ polish ] = "Lokalizacja:";
         Text[ japanese ] = "場所:";
         Text[ chinese_traditional ] = "位置：";
@@ -458,7 +458,7 @@ TabPage RID_SVXTABPAGE_GALLERY_GENERAL
         Text [ portuguese ] = "Alterado em:" ;
         Text [ portuguese_brazilian ] = "Ge?ndert am:" ;
         Text[ chinese_simplified ] = "更改日期:";
-        Text[ russian ] = "���� ���������:";
+        Text[ russian ] = "�������:";
         Text[ polish ] = "Zmodyfikowano:";
         Text[ japanese ] = "変更日時:";
         Text[ chinese_traditional ] = "變更日期：";
@@ -466,11 +466,11 @@ TabPage RID_SVXTABPAGE_GALLERY_GENERAL
         Text[ dutch ] = "Gewijzigd op:";
         Text[ chinese_simplified ] = "更改日期:";
         Text[ greek ] = "����������� ���:";
-        Text[ korean ] = "변경일자:";
+        Text[ korean ] = "변경 날짜:";
         Text[ turkish ] = "De�i�iklik tarihi:";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Modificat:";
-        Text[ finnish ] = "Muokattu:";
+        Text[ finnish ] = "Muutettu:";
         Text[ thai ] = "ดัดแปลงแก้ไข:";
     };
     FixedText FT_MS_SHOW_CHANGEDATE
@@ -498,7 +498,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
         Text [ italian ] = "~Tipo file" ;
         Text [ spanish ] = "~Tipo de archivo" ;
         Text [ french ] = "Type de fichier" ;
-        Text [ dutch ] = "Bestandstype" ;
+        Text [ dutch ] = "~Bestandstype" ;
         Text [ swedish ] = "Filtyp" ;
         Text [ danish ] = "Filtype" ;
         Text [ portuguese_brazilian ] = "~Dateityp" ;
@@ -509,14 +509,14 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
         Text[ japanese ] = "ファイルの種類";
         Text[ chinese_traditional ] = "檔案類型";
         Text[ arabic ] = "��� �����";
-        Text[ dutch ] = "Bestandstype";
+        Text[ dutch ] = "~Bestandstype";
         Text[ chinese_simplified ] = "文件类型";
         Text[ greek ] = "����� �������";
         Text[ korean ] = "파일 형식";
         Text[ turkish ] = "Dosya tipi";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Tipus de fitxer";
-        Text[ finnish ] = "Tiedostotyyppi";
+        Text[ finnish ] = "~Tiedostotyyppi";
         Text[ thai ] = "ชนิดแฟ้ม";
     };
     ComboBox CBB_FILETYPE
@@ -565,7 +565,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
         Text[ turkish ] = "Dosyay� bul";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Cerca fitxers...";
-        Text[ finnish ] = "~Etsi tiedostot";
+        Text[ finnish ] = "~Etsi tiedostot...";
         Text[ thai ] = "~หาแฟ้ม...";
     };
     PushButton BTN_TAKE
@@ -650,7 +650,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
         Text [ SWEDISH ] = "F�~rhandsvisning" ;
         Text [ PORTUGUESE ] = "~Previsualizar" ;
         Text[ chinese_simplified ] = "预览(~E)";
-        Text[ russian ] = "��������";
+        Text[ russian ] = "���������. ��������";
         Text[ polish ] = "Podgl�d";
         Text[ japanese ] = "プレビュー(~E)";
         Text[ chinese_traditional ] = "預覽(~E)";
@@ -688,7 +688,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
         Text [ portuguese_brazilian ] = "Maddin1" ;
         Text [ portuguese ] = "Maddin1" ;
         Text[ chinese_simplified ] = "Maddin1";
-        Text[ russian ] = "Maddin1";
+        Text[ russian ] = "Madd";
         Text[ polish ] = "Maddin1";
         Text[ japanese ] = "Maddin1";
         Text[ chinese_traditional ] = "Maddin1";
@@ -720,7 +720,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
         Text [ portuguese_brazilian ] = "Maddin2" ;
         Text [ portuguese ] = "Maddin2" ;
         Text[ chinese_simplified ] = "Maddin2";
-        Text[ russian ] = "Maddin2";
+        Text[ russian ] = "Madd";
         Text[ polish ] = "Maddin2";
         Text[ japanese ] = "Maddin2";
         Text[ chinese_traditional ] = "Maddin2";
@@ -800,7 +800,7 @@ ModalDialog RID_SVXDLG_GALLERY_TITLE
         Text[ portuguese ] = "T�tulo";
         Text[ russian ] = "���������";
         Text[ greek ] = "������";
-        Text[ dutch ] = "Title";
+        Text[ dutch ] = "Titel";
         Text[ french ] = "Titre";
         Text[ spanish ] = "T�tulo";
         Text[ italian ] = "Titolo";
@@ -964,7 +964,7 @@ ModalDialog RID_SVXDLG_GALLERY_TAKE_PROGRESS
     Text [ portuguese ] = "Aplicar" ;
     Text [ portuguese_brazilian ] = "?bernehmen" ;
     Text[ chinese_simplified ] = "采用";
-    Text[ russian ] = "�������";
+    Text[ russian ] = "���������";
     Text[ polish ] = "Zastosuj";
     Text[ japanese ] = "適用";
     Text[ chinese_traditional ] = "採用";
@@ -1038,7 +1038,7 @@ ModalDialog RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS
     Text [ italian ] = "Aggiorna" ;
     Text [ spanish ] = "Actualizar" ;
     Text [ french ] = "Actualiser" ;
-    Text [ dutch ] = "Actualiseren" ;
+    Text [ dutch ] = "Bijwerken" ;
     Text [ swedish ] = "Uppdatera" ;
     Text [ danish ] = "Opdater" ;
     Text [ portuguese_brazilian ] = "Aktualisieren" ;
@@ -1049,7 +1049,7 @@ ModalDialog RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS
     Text[ japanese ] = "更新";
     Text[ chinese_traditional ] = "更新";
     Text[ arabic ] = "�����";
-    Text[ dutch ] = "Actualiseren";
+    Text[ dutch ] = "Bijwerken";
     Text[ chinese_simplified ] = "更新";
     Text[ greek ] = "���������";
     Text[ korean ] = "업데이트";
@@ -1114,7 +1114,7 @@ ModalDialog RID_SVXDLG_GALLERY_THEMEID
     Text [ english_us ] = "Theme ID" ;
     Text[ portuguese ] = "ID Tema";
     Text[ russian ] = "ID ����";
-    Text[ dutch ] = "Onderwerp ID";
+    Text[ dutch ] = "Onderwerp-ID";
     Text[ french ] = "ID du th�me";
     Text[ spanish ] = "Temas ID";
     Text[ italian ] = "ID tema";
@@ -1126,10 +1126,10 @@ ModalDialog RID_SVXDLG_GALLERY_THEMEID
     Text[ chinese_simplified ] = "主题  ID";
     Text[ chinese_traditional ] = "主題 - ID";
     Text[ arabic ] = "����� ��������";
-    Text[ dutch ] = "Onderwerp ID";
+    Text[ dutch ] = "Onderwerp-ID";
     Text[ chinese_simplified ] = "主题  ID";
     Text[ greek ] = "��������� (ID) �������";
-    Text[ korean ] = "주제- ID";
+    Text[ korean ] = "주제 ID";
     Text[ turkish ] = "Konu tan�t�c�s�";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Identificador del tema";
@@ -1230,7 +1230,7 @@ String RID_SVXSTR_GALLERY_ACTUALIZE_PROGRESS
 {
     Text = "Aktualisieren" ;
     Text [ ENGLISH ] = "Update";
-    Text [ dutch ] = "Actualiseren";
+    Text [ dutch ] = "Bijwerken";
     Text [ english_us ] = "Update";
     Text [ italian ] = "Aggiorna";
     Text [ spanish ] = "Actualizar";
@@ -1245,7 +1245,7 @@ String RID_SVXSTR_GALLERY_ACTUALIZE_PROGRESS
     Text[ japanese ] = "更新";
     Text[ chinese_traditional ] = "更新";
     Text[ arabic ] = "�����";
-    Text[ dutch ] = "Actualiseren";
+    Text[ dutch ] = "Bijwerken";
     Text[ chinese_simplified ] = "更新";
     Text[ greek ] = "���������";
     Text[ korean ] = "업데이트";
@@ -1269,7 +1269,7 @@ String RID_SVXSTR_GALLERY_FOPENERROR
     Text [ portuguese ] = "Imposs�vel abrir este ficheiro." ;
     Text [ portuguese_brazilian ] = "Diese Datei kann nicht ge?fnet werden" ;
     Text[ chinese_simplified ] = "无法打开这个文件。";
-    Text[ russian ] = "������� ���� ���� �� �������";
+    Text[ russian ] = "���������� ������� ���� ����";
     Text[ polish ] = "Pliku nie mo�na otworzy�.";
     Text[ japanese ] = "このファイルを開くことはできません。";
     Text[ chinese_traditional ] = "無法開啟這個檔案。";
@@ -1298,7 +1298,7 @@ String RID_SVXSTR_GALLERY_NOFILES
     Text [ portuguese ] = "<Nenhum ficheiro>" ;
     Text [ portuguese_brazilian ] = "<Keine Dateien>" ;
     Text[ chinese_simplified ] = "<无文件>";
-    Text[ russian ] = "<��� ������>";
+    Text[ russian ] = "<��� ������>";
     Text[ polish ] = "<Brak plik�w>";
     Text[ japanese ] = "<ファイルなし>";
     Text[ chinese_traditional ] = "<無檔案>";
@@ -1310,7 +1310,7 @@ String RID_SVXSTR_GALLERY_NOFILES
     Text[ turkish ] = "<Dosya yok>";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "<Cap fitxer>";
-    Text[ finnish ] = "<Ei tiedostoja >";
+    Text[ finnish ] = "<Ei tiedostoja>";
     Text[ thai ] = "<ไม่มีแฟ้ม>";
 };
 String RID_SVXSTR_GALLERY_NOTHEME
@@ -1335,11 +1335,11 @@ String RID_SVXSTR_GALLERY_NOTHEME
     Text[ dutch ] = "De naam van het onderwerp is ongeldig!";
     Text[ chinese_simplified ] = "这个主题名称无效！";
     Text[ greek ] = "�� �������� ����� �������!";
-    Text[ korean ] = "주제 이름이 유효하지 않습니다!";
+    Text[ korean ] = "주제 이름이 잘못되었습니다.";
     Text[ turkish ] = "Bu konu ad� ge�erli de�il!";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "El nom del tema no �s v�lid!";
-    Text[ finnish ] = "Virheellinen teeman nimi.";
+    Text[ finnish ] = "Virheellinen teeman nimi";
     Text[ thai ] = "ชุดรูปแบบชื่อไม่ถูกต้อง!";
 };
 String RID_SVXSTR_GALLERY_DELETEOBJ
@@ -1349,7 +1349,7 @@ String RID_SVXSTR_GALLERY_DELETEOBJ
     Text [ dutch ] = "Wilt u dit object\nwerkelijk wissen?" ;
     Text [ english_us ] = "Do you really want to\ndelete this object?" ;
     Text [ italian ] = "Cancellare veramente\nl'oggetto?" ;
-    Text [ spanish ] = "�Desea realmente\neliminar este objeto?" ;
+    Text [ spanish ] = "�Desea realmente\nborrar este objeto?" ;
     Text [ french ] = "Voulez-vous vraiment\nsupprimer cet objet ?" ;
     Text [ swedish ] = "Vill du verkligen radera\ndet h�r objektet?" ;
     Text [ danish ] = "Skal dette objekt\nvirkelig slettes?" ;
@@ -1368,7 +1368,7 @@ String RID_SVXSTR_GALLERY_DELETEOBJ
     Text[ turkish ] = "Bu nesneyi ger�ekten\nsilmek istiyor musunuz?";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Esteu segur de voler\nsuprimir aquest objecte?";
-    Text[ finnish ] = "Halutko varmasti\npoistaa t�m�n objektin?";
+    Text[ finnish ] = "Haluatko varmasti\npoistaa t�m�n objektin?";
     Text[ thai ] = "คุณต้องการ\nลบวัตถุนี้หรือไม่?";
 };
 String RID_SVXSTR_GALLERY_DELETETHEME
@@ -1381,7 +1381,7 @@ String RID_SVXSTR_GALLERY_DELETETHEME
     Text[ greek ] = "������ ����������\n�� ���������� ���� �� ����;";
     Text[ dutch ] = "Wilt u dit onderwerp\nwerkelijk wissen?";
     Text[ french ] = "Voulez-vous vraiment\nsupprimer ce th�me ?";
-    Text[ spanish ] = "�Desea realmente eliminar\neste tema?";
+    Text[ spanish ] = "�Desea realmente borrar\neste tema?";
     Text[ italian ] = "Volete cancellare\nquesto argomento?";
     Text[ danish ] = "Skal dette emne\nvirkelig slettes?";
     Text[ swedish ] = "Vill du verkligen radera det\n h�r temat?";
@@ -1394,7 +1394,7 @@ String RID_SVXSTR_GALLERY_DELETETHEME
     Text[ turkish ] = "Do you really want to\ndelete this theme?";
     Text[ arabic ] = "�� ���� ������\n ��� ��� ������ڿ";
     Text[ catalan ] = "Esteu segur de voler\nsuprimir aquest tema?";
-    Text[ finnish ] = "Halutko varmasti\npoistaa t�m�n teeman?";
+    Text[ finnish ] = "Haluatko varmasti\npoistaa t�m�n teeman?";
     Text[ thai ] = "คุณต้องการ\nลบชุดรุปแบบนี้หรือไม่?";
 };
 String RID_SVXSTR_EXTFORMAT1_SYS
@@ -1415,7 +1415,7 @@ String RID_SVXSTR_EXTFORMAT1_UI
     Text [ portuguese ] = "Wave - ficheiro �udio" ;
     Text [ portuguese_brazilian ] = "Wave - Klangdatei" ;
     Text[ chinese_simplified ] = "Wave 音频文件";
-    Text[ russian ] = "Wave - ���� ������";
+    Text[ russian ] = "Wave - �������� ����";
     Text[ polish ] = "Plik d�wi�kowy typu Wave";
     Text[ japanese ] = "Wave サウンドファイル";
     Text[ chinese_traditional ] = "Wave - 聲音檔案";
@@ -1423,7 +1423,7 @@ String RID_SVXSTR_EXTFORMAT1_UI
     Text[ dutch ] = "Wave - geluidsbestand";
     Text[ chinese_simplified ] = "Wave 音频文件";
     Text[ greek ] = "Wave - ������ ����";
-    Text[ korean ] = "웨이브-사운드 파일";
+    Text[ korean ] = "Wave 사운드 파일";
     Text[ turkish ] = "Wave - Ses dosyas�";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Fitxer de so - Wave";
@@ -1442,18 +1442,18 @@ String RID_SVXSTR_EXTFORMAT2_UI
     Text [ italian ] = "Audio Interchange File Format" ;
     Text [ spanish ] = "Formato de archivo Audio Interchange" ;
     Text [ french ] = "Audio Interchange File Format" ;
-    Text [ dutch ] = "Audio Interchange bestandsformaat" ;
+    Text [ dutch ] = "Audio Interchange-bestandsindeling" ;
     Text [ swedish ] = "Filformat Audio Interchange" ;
     Text [ danish ] = "Audio Interchange File Format" ;
     Text [ portuguese ] = "Audio Interchange File Format" ;
     Text [ portuguese_brazilian ] = "Audio Interchange File Format" ;
     Text[ chinese_simplified ] = "音频交换文件格式(AIFF)";
-    Text[ russian ] = "������ ����� Audio Interchange";
+    Text[ russian ] = "������ ����� ��������� ������";
     Text[ polish ] = "Format pliku Audio Interchange";
     Text[ japanese ] = "オーディオ・インターチェンジ・ファイル・フォーマット(AIFF)";
     Text[ chinese_traditional ] = "聲音交換檔案格式(AIFF)";
     Text[ arabic ] = "����� ��� Audio Interchange";
-    Text[ dutch ] = "Audio Interchange bestandsformaat";
+    Text[ dutch ] = "Audio Interchange-bestandsindeling";
     Text[ chinese_simplified ] = "音频交换文件格式(AIFF)";
     Text[ greek ] = "����� ������� Audio Interchange";
     Text[ korean ] = "오디오 교환 파일 서식";
@@ -1473,7 +1473,7 @@ String RID_SVXSTR_EXTFORMAT3_UI
     Text [ ENGLISH ] = "AU - Soundfile" ;
     Text [ english_us ] = "AU - Sound File" ;
     Text[ portuguese ] = "AU - ficheiro �udio";
-    Text[ russian ] = "AU - ���� ������";
+    Text[ russian ] = "AU - �������� ����";
     Text[ greek ] = "AU - ������ ����";
     Text[ dutch ] = "AU - geluidsbestand";
     Text[ french ] = "AU - Fichier son";
@@ -1484,7 +1484,7 @@ String RID_SVXSTR_EXTFORMAT3_UI
     Text[ polish ] = "Plik d�wi�kowy AU";
     Text[ portuguese_brazilian ] = "AU - Sound File";
     Text[ japanese ] = "AU サウンドファイル";
-    Text[ korean ] = "AU - 사운드 파일";
+    Text[ korean ] = "AU 사운드 파일";
     Text[ chinese_simplified ] = "AU 声音文件";
     Text[ chinese_traditional ] = "AU - 聲音檔案";
     Text[ arabic ] = "��� ���� -AU ";
@@ -1500,8 +1500,8 @@ String RID_SVXSTR_GALLERY_FILTER
     Text [ english_us ] = "Graphics filter" ;
     Text [ italian ] = "Filtro grafico" ;
     Text [ spanish ] = "Filtro de imagen" ;
-    Text [ french ] = "Filtre d'image" ;
-    Text [ dutch ] = "Grafische filter" ;
+    Text [ french ] = "Filtre graphique" ;
+    Text [ dutch ] = "Afbeeldingsfilter" ;
     Text [ swedish ] = "Grafikfilter" ;
     Text [ danish ] = "Grafikfilter" ;
     Text [ portuguese ] = "Filtro gr�fico" ;
@@ -1512,7 +1512,7 @@ String RID_SVXSTR_GALLERY_FILTER
     Text[ japanese ] = "画像フィルタ";
     Text[ chinese_traditional ] = "圖形過濾器";
     Text[ arabic ] = "���� ��������";
-    Text[ dutch ] = "Grafische filter";
+    Text[ dutch ] = "Afbeeldingsfilter";
     Text[ chinese_simplified ] = "图形过滤器";
     Text[ greek ] = "������ ��������";
     Text[ korean ] = "그래픽 필터";
@@ -1584,29 +1584,29 @@ String RID_SVXSTR_GALLERY_DELETEDD
 {
     Text = "M�chten Sie die verkn�pfte Datei l�schen?" ;
     Text [ ENGLISH ] = "Do you want to delete the linked file?" ;
-    Text [ dutch ] = "Wilt u het gekoppelde bestand wissen ?" ;
+    Text [ dutch ] = "Wilt u het gekoppelde bestand wissen?" ;
     Text [ english_us ] = "Do you want to delete the linked file?" ;
     Text [ italian ] = "Eliminare il file collegato?" ;
-    Text [ spanish ] = "�Desea eliminar el archivo enlazado?" ;
+    Text [ spanish ] = "�Desea borrar el archivo enlazado?" ;
     Text [ french ] = "Voulez-vous supprimer le fichier li�?" ;
     Text [ swedish ] = "Vill du radera den l�nkade filen?" ;
     Text [ danish ] = "Skal den k�dede fil slettes?" ;
     Text [ portuguese ] = "Eliminar o ficheiro ligado?" ;
     Text [ portuguese_brazilian ] = "M?hten Sie die verkn?fte Datei l?chen?" ;
     Text[ chinese_simplified ] = "您要删除链接的文件吗？";
-    Text[ russian ] = "�� ������ ������� ��������� ����?";
+    Text[ russian ] = "������� ��������� ����?";
     Text[ polish ] = "Czy na pewno usun�� po��czony plik?";
     Text[ japanese ] = "リンクしたファイルを削除しますか。";
     Text[ chinese_traditional ] = "您要刪除連結的檔案﹖";
     Text[ arabic ] = "�� ���� ��� ����� ������ؿ";
-    Text[ dutch ] = "Wilt u het gekoppelde bestand wissen ?";
+    Text[ dutch ] = "Wilt u het gekoppelde bestand wissen?";
     Text[ chinese_simplified ] = "您要删除链接的文件吗？";
     Text[ greek ] = "������ �� ��������� �� ����������� ������;";
-    Text[ korean ] = "링크된 파일을 삭제하겠습니까?";
+    Text[ korean ] = "연결된 파일을 삭제하시겠습니까?";
     Text[ turkish ] = "Ba�lant� olu�turdu�unuz dosyay� silmek istiyor musunuz?";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Voleu suprimir el fitxer enlla�at?";
-    Text[ finnish ] = "Halutko poistaa linkitetyn tiedoston?";
+    Text[ finnish ] = "Haluatko poistaa linkitetyn tiedoston?";
     Text[ thai ] = "คุณต้องการลบแฟ้มที่เชื่อมโยงหรือไม่?";
 };
 String RID_SVXSTR_GALLERY_SEARCH
@@ -1617,25 +1617,25 @@ String RID_SVXSTR_GALLERY_SEARCH
     Text [ italian ] = "Aggiornare l'elenco dei file?" ;
     Text [ spanish ] = "�Desea actualizar la lista de archivos?" ;
     Text [ french ] = "Voulez-vous actualiser la liste des fichiers ?" ;
-    Text [ dutch ] = "Wilt u de bestandslijst actualiseren ?" ;
+    Text [ dutch ] = "Wilt u de bestandslijst bijwerken?" ;
     Text [ swedish ] = "Vill du uppdatera fillistan?" ;
     Text [ danish ] = "Skal fillisten opdateres?" ;
     Text [ portuguese ] = "Actualizar a lista de ficheiros?" ;
     Text [ portuguese_brazilian ] = "M?hten Sie die Dateiliste aktualisieren?" ;
     Text[ chinese_simplified ] = "要更新这个文件列单？";
-    Text[ russian ] = "�� ������ �������� ������ ������?";
+    Text[ russian ] = "�������� ������ ������?";
     Text[ polish ] = "Czy zaktualizowa� list� plik�w?";
     Text[ japanese ] = "ファイルリストを更新しますか。";
     Text[ chinese_traditional ] = "您要更新這個檔案清單﹖";
     Text[ arabic ] = "�� ���� ����� ����� ������ʿ";
-    Text[ dutch ] = "Wilt u de bestandslijst actualiseren ?";
+    Text[ dutch ] = "Wilt u de bestandslijst bijwerken?";
     Text[ chinese_simplified ] = "要更新这个文件列单？";
     Text[ greek ] = "������ �� ����� � ��������� ��� ������ �������;";
-    Text[ korean ] = "파일목록을 업데이트하겠습니까?";
+    Text[ korean ] = "파일 목록을 업데이트하시겠습니까?";
     Text[ turkish ] = "Dosya listesini g�ncellemek istiyor musunuz?";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Voleu actualitzar la llista de fitxers?";
-    Text[ finnish ] = "Halutko p�ivitt�� tiedostoluettelon?";
+    Text[ finnish ] = "Haluatko p�ivitt�� tiedostoluettelon?";
     Text[ thai ] = "คุณต้องการปรับปรุงรายการของแฟ้มหรือไม่?";
 };
 String RID_SVXSTR_GALLERY_SGIERROR
@@ -1646,18 +1646,18 @@ String RID_SVXSTR_GALLERY_SGIERROR
     Text [ italian ] = "Questo file non pu� essere aperto.\nDigitare un nuovo percorso di ricerca?   " ;
     Text [ spanish ] = "No se puede abrir este archivo.\n�Desea indicar otra ruta de b�squeda? " ;
     Text [ french ] = "Impossible d'ouvrir ce fichier.\nVoulez-vous indiquer un autre chemin de recherche ? " ;
-    Text [ dutch ] = "Dit bestand kan niet worden geopend. \nWilt u een ander zoekpad aangeven??   " ;
+    Text [ dutch ] = "Dit bestand kan niet worden geopend. \nWilt u een ander zoekpad opgeven?" ;
     Text [ swedish ] = "Den h�r filen kan inte �ppnas.\nVill du ange en annan s�kv�g? " ;
     Text [ danish ] = "Det er ikke muligt at �bne denne fil.\nVil du angive en ny s�gesti? " ;
     Text [ portuguese ] = "Imposs�vel abrir este ficheiro.\nDeseja indicar outro atalho de localiza��o?  " ;
     Text [ portuguese_brazilian ] = "Diese Datei kann nicht ge?fnet werden. \nM?hten Sie einen anderen Suchpfad angeben? " ;
     Text[ chinese_simplified ] = "无法打开这个文件。\n您要指定另一个路径？ ";
-    Text[ russian ] = "������� ���� ���� �� �������.\n�� ������ ������ ������ ���� ������? ";
+    Text[ russian ] = "���������� ������� ����.\n������ ������ ���� ������? ";
     Text[ polish ] = "Pliku tego nie mo�na otworzy�.\nCzy chcesz poda� inn� �cie�k� wyszukiwania? ";
     Text[ japanese ] = "このファイルは開けません。\n別の検索パス名を入力しますか。 ";
     Text[ chinese_traditional ] = "無法開啟這個檔案。\n您要輸入一個其他路徑﹖ ";
     Text[ arabic ] = "�� ���� ��� ��� �����.\n�� ���� ����� ���� ��� ��ѿ ";
-    Text[ dutch ] = "Dit bestand kan niet worden geopend. \nWilt u een ander zoekpad aangeven??   ";
+    Text[ dutch ] = "Dit bestand kan niet worden geopend. \nWilt u een ander zoekpad opgeven?";
     Text[ chinese_simplified ] = "无法打开这个文件。\n您要指定另一个路径？ ";
     Text[ greek ] = "��� ����� ������� �� �������� ���� �� ������.\n������ �� �������� ������ ���� �������� ����������; ";
     Text[ korean ] = "이 파일을 열 수 없습니다. \n다른 검색경로를 입력하겠습니까? ";
@@ -1676,7 +1676,7 @@ String RID_SVXSTR_GALLERY_NEWTHEME
     Text [ swedish ] = "Nytt tema" ;
     Text [ danish ] = "Nyt emne" ;
     Text [ italian ] = "Nuovo argomento" ;
-    Text [ spanish ] = "Nuevo Tema" ;
+    Text [ spanish ] = "Tema nuevo" ;
     Text [ french ] = "Nouveau th�me" ;
     Text [ portuguese ] = "Novo tema" ;
     Text [ portuguese_brazilian ] = "~Thema" ;
@@ -1710,7 +1710,7 @@ String RID_SVXSTR_GALLERY_BROWSER
     Text [ portuguese ] = "~Organizar..." ;
     Text [ portuguese_brazilian ] = "~Verwaltung..." ;
     Text[ chinese_simplified ] = "管理(~O)...";
-    Text[ russian ] = "������������...";
+    Text[ russian ] = "�����������...";
     Text[ polish ] = "Zarz�dzanie...";
     Text[ japanese ] = "管理(~O)...";
     Text[ chinese_traditional ] = "管理(~O)...";
@@ -1722,7 +1722,7 @@ String RID_SVXSTR_GALLERY_BROWSER
     Text[ turkish ] = "Y�net...";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "~Organitzador...";
-    Text[ finnish ] = "~J�rjestelyty�kalu";
+    Text[ finnish ] = "~J�rjestelyty�kalu...";
     Text[ thai ] = "~ตัวจัดการ...";
 };
 String RID_SVXSTR_GALLERY_THEMEERR
@@ -1739,7 +1739,7 @@ String RID_SVXSTR_GALLERY_THEMEERR
     Text [ portuguese ] = "Este nome de tema j� existe.\nQueira escolher outro." ;
     Text [ portuguese_brazilian ] = "Dieser Themenname existiert bereits.\nBitte w?hlen Sie einen anderen Namen." ;
     Text[ chinese_simplified ] = "这个主题名称已经存在。\n请您选择一个其他的名称。";
-    Text[ russian ] = "����� �������� ���� ��� ����������.\n��������, ����������, ������ ��������.";
+    Text[ russian ] = "����� �������� ���� ��� ����������.\n�������� ������ ��������.";
     Text[ polish ] = "Ta nazwa tematu ju� istnieje.\nNale�y wybra� inn� nazw�.";
     Text[ japanese ] = "このテーマ名はすでにあります。\n別の名前を入力してください。";
     Text[ chinese_traditional ] = "這個主題名稱已經存在。\n請您選擇一個其他的名稱。";
@@ -1819,7 +1819,7 @@ String RID_SVXSTR_GALLERYPROPS_GALTHEME
     Text [ english_us ] = "Gallery Theme" ;
     Text [ dutch ] = "Gallery-onderwerp" ;
     Text [ italian ] = "Argomento Gallery" ;
-    Text [ spanish ] = "Tema Gallery" ;
+    Text [ spanish ] = "Tema de Gallery" ;
     Text [ french ] = "Th�me de la Gallery" ;
     Text [ swedish ] = "Gallery-tema" ;
     Text [ danish ] = "Gallery-emne" ;
@@ -1867,7 +1867,7 @@ String RID_SVXSTR_GALLERY_IMPORTTHEME
     Text[ turkish ] = "��~e aktar...";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "I~mporta...";
-    Text[ finnish ] = "T~uo";
+    Text[ finnish ] = "T~uo...";
     Text[ thai ] = "นำเ~ข้า...";
 };
 String RID_SVXSTR_GALLERY_CREATETHEME
@@ -1879,12 +1879,12 @@ String RID_SVXSTR_GALLERY_CREATETHEME
     Text [ swedish ] = "Nytt tema..." ;
     Text [ danish ] = "Nyt emne..." ;
     Text [ italian ] = "Nuovo argomento..." ;
-    Text [ spanish ] = "Nuevo tema..." ;
+    Text [ spanish ] = "Tema nuevo..." ;
     Text [ french ] = "Nouveau th�me..." ;
     Text [ portuguese ] = "Novo tema..." ;
     Text [ portuguese_brazilian ] = "Neues Thema" ;
     Text[ chinese_simplified ] = "新建主题...";
-    Text[ russian ] = "����� ����...";
+    Text[ russian ] = "������� ����...";
     Text[ polish ] = "Nowy temat...";
     Text[ japanese ] = "新しいテーマ...";
     Text[ chinese_traditional ] = "新建主題...";
@@ -1896,7 +1896,7 @@ String RID_SVXSTR_GALLERY_CREATETHEME
     Text[ turkish ] = "Yeni konu...";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Tema nou...";
-    Text[ finnish ] = "Uusi teema";
+    Text[ finnish ] = "Uusi teema...";
     Text[ thai ] = "ชุดรูปแบบใหม่...";
 };
 String RID_SVXSTR_GALLERY_READONLY
@@ -1912,7 +1912,7 @@ String RID_SVXSTR_GALLERY_READONLY
     Text [ french ] = "(en lecture seule)" ;
     Text [ swedish ] = "(skrivskyddad)" ;
     Text [ dutch ] = " (alleen lezen)" ;
-    Text [ spanish ] = " (solo lectura)" ;
+    Text [ spanish ] = "(s�lo lectura)" ;
     Text [ english_us ] = " (read-only)" ;
     Text[ chinese_simplified ] = " (防改写)";
     Text[ russian ] = " (������ ��� ������)";
@@ -1993,7 +1993,7 @@ String RID_SVXSTR_GALLERY_ID_EXISTS
     Text [ English ] = "This ID already exists..." ;
     Text [ english_us ] = "This ID already exists..." ;
     Text[ portuguese ] = "Este ID j� existe...";
-    Text[ russian ] = "���� ������������� ��� ����������...";
+    Text[ russian ] = "���� ID ��� ����������...";
     Text[ dutch ] = "ID bestaat reeds...";
     Text[ french ] = "Cet ID existe d�j�...";
     Text[ spanish ] = "Esta ID ya existe...";
@@ -2013,7 +2013,7 @@ String RID_SVXSTR_GALLERY_ID_EXISTS
     Text[ turkish ] = "Bu tan�t�c� mevcut durumda...";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Aquest identificador ja existeix...";
-    Text[ finnish ] = "Tunnus on jo olemassa";
+    Text[ finnish ] = "Tunnus on jo olemassa...";
     Text[ thai ] = " ID นี้มีอยู่แล้ว...";
 };
 String RID_SVXSTR_GALLERY_TITLE
@@ -2076,19 +2076,19 @@ String RID_SVXSTR_GALLERY_ICONVIEW
     Text [ English ] = "Symbol view" ;
     Text[ english_us ] = "Icon View";
     Text[ portuguese ] = "Ver �cones";
-    Text[ russian ] = "��� ��������";
+    Text[ russian ] = "��� �������";
     Text[ greek ] = "Symbol view";
     Text[ dutch ] = "Pictogramweergave";
     Text[ french ] = "Affichage des ic�nes";
     Text[ spanish ] = "Ver s�mbolos";
-    Text[ finnish ] = "Symbol view";
+    Text[ finnish ] = "Kuvaken�kym�";
     Text[ italian ] = "Vista simboli";
     Text[ danish ] = "Ikonvisning";
     Text[ swedish ] = "Symbolvy";
     Text[ polish ] = "Widok symboli";
     Text[ portuguese_brazilian ] = "Symbol view";
     Text[ japanese ] = "アイコン表示";
-    Text[ korean ] = "기호 보기";
+    Text[ korean ] = "아이콘 보기";
     Text[ chinese_simplified ] = "图标视图";
     Text[ chinese_traditional ] = "圖示檢視";
     Text[ turkish ] = "Symbol view";
@@ -2107,14 +2107,14 @@ String RID_SVXSTR_GALLERY_LISTVIEW
     Text[ dutch ] = "Detailweergave";
     Text[ french ] = "Liste d�taill�e";
     Text[ spanish ] = "Ver detalles";
-    Text[ finnish ] = "Detail view";
+    Text[ finnish ] = "Tarkka n�kym�";
     Text[ italian ] = "Vista dettagli";
     Text[ danish ] = "Detaljevisning";
     Text[ swedish ] = "Detaljvy";
     Text[ polish ] = "Widok szczeg��w";
     Text[ portuguese_brazilian ] = "Detail view";
     Text[ japanese ] = "詳細表示";
-    Text[ korean ] = "상세히 보기";
+    Text[ korean ] = "자세히 보기";
     Text[ chinese_simplified ] = "细节视图";
     Text[ chinese_traditional ] = "細節檢視";
     Text[ turkish ] = "Detail view";
@@ -2252,7 +2252,7 @@ Menu RID_SVXMN_GALLERY1
             HelpId = HID_GALLERY_ACTUALIZE;
             Text = "~Aktualisieren" ;
             Text [ ENGLISH ] = "~Update";
-            Text [ dutch ] = "~Actualiseren";
+            Text [ dutch ] = "~Bijwerken";
             Text [ english_us ] = "Update";
             Text [ italian ] = "Aggiorna";
             Text [ spanish ] = "Actuali~zar";
@@ -2267,7 +2267,7 @@ Menu RID_SVXMN_GALLERY1
             Text[ japanese ] = "更新";
             Text[ chinese_traditional ] = "更新";
             Text[ arabic ] = "�����";
-            Text[ dutch ] = "~Actualiseren";
+            Text[ dutch ] = "~Bijwerken";
             Text[ chinese_simplified ] = "更新";
             Text[ greek ] = "���������";
             Text[ korean ] = "업데이트";
@@ -2290,7 +2290,7 @@ Menu RID_SVXMN_GALLERY1
             Text [ dutch ] = "~Wissen" ;
             Text [ english_us ] = "~Delete" ;
             Text [ italian ] = "~Elimina" ;
-            Text [ spanish ] = "~Eliminar" ;
+            Text [ spanish ] = "~Borrar" ;
             Text [ french ] = "~Supprimer" ;
             Text [ swedish ] = "~Radera" ;
             Text [ danish ] = "~Slet" ;
@@ -2334,7 +2334,7 @@ Menu RID_SVXMN_GALLERY1
             Text[ dutch ] = "~Naam wijzigen";
             Text[ chinese_simplified ] = "重命名(~R)";
             Text[ greek ] = "�����������";
-            Text[ korean ] = "이름 변경(~R)";
+            Text[ korean ] = "이름 바꾸기(~R)";
             Text[ turkish ] = "Ye~niden adland�r";
             Text[ language_user1 ] = " ";
             Text[ catalan ] = "~Reanomena";
@@ -2403,11 +2403,11 @@ Menu RID_SVXMN_GALLERY1
             Text[ dutch ] = "~Eigenschappen ...";
             Text[ chinese_simplified ] = "属性(~I)...";
             Text[ greek ] = "�������~�� ...";
-            Text[ korean ] = "등록정보(~I)...";
+            Text[ korean ] = "등록 정보(~I)...";
             Text[ turkish ] = "~�zellikler ...";
             Text[ language_user1 ] = " ";
             Text[ catalan ] = "Prop~ietats...";
-            Text[ finnish ] = "Ominai~suudet";
+            Text[ finnish ] = "Ominaisuu~det...";
             Text[ thai ] = "คุณสม~บัติ ...";
         };
     };
@@ -2435,7 +2435,7 @@ Menu RID_SVXMN_GALLERY2
             Text [ portuguese_brazilian ] = "~Hinzuf?en" ;
             Text [ portuguese ] = "~Adicionar" ;
             Text[ chinese_simplified ] = "加入(~I)";
-            Text[ russian ] = "��������";
+            Text[ russian ] = "��������";
             Text[ polish ] = "Dodaj";
             Text[ japanese ] = "挿入(~I)";
             Text[ chinese_traditional ] = "加入(~I)";
@@ -2447,7 +2447,7 @@ Menu RID_SVXMN_GALLERY2
             Text[ turkish ] = "Ekle";
             Text[ language_user1 ] = " ";
             Text[ catalan ] = "~Insereix";
-            Text[ finnish ] = "~Lis��";
+            Text[ finnish ] = "Lis~��";
             SubMenu = Menu
             {
                 ItemList =
@@ -2480,7 +2480,7 @@ Menu RID_SVXMN_GALLERY2
                         Text[ turkish ] = "Kopya";
                         Text[ language_user1 ] = " ";
                         Text[ catalan ] = "~Copia";
-                        Text[ finnish ] = "~Kopioi";
+                        Text[ finnish ] = "K~opioi";
                         Text[ thai ] = "~คัดลอก";
                     };
                     MenuItem
@@ -2572,7 +2572,7 @@ Menu RID_SVXMN_GALLERY2
             Text [ danish ] = "Eksempel" ;
             Text [ portuguese_brazilian ] = "~Vorschau" ;
             Text [ portuguese ] = "~Previsualizar" ;
-            Text[ russian ] = "�����. ��������";
+            Text[ russian ] = "��������������� ��������";
             Text[ polish ] = "Podgl�~d";
             Text[ japanese ] = "プレビュー(~P)";
             Text[ chinese_simplified ] = "预览(~P)";
@@ -2631,7 +2631,7 @@ Menu RID_SVXMN_GALLERY2
             Text [ dutch ] = "~Wissen" ;
             Text [ english_us ] = "~Delete" ;
             Text [ italian ] = "~Elimina" ;
-            Text [ spanish ] = "~Eliminar" ;
+            Text [ spanish ] = "~Borrar" ;
             Text [ french ] = "~Supprimer" ;
             Text [ swedish ] = "~Radera" ;
             Text [ danish ] = "~Slet" ;
@@ -2665,7 +2665,7 @@ Menu RID_SVXMN_GALLERY2
             Text [ italian ] = "~Copia" ;
             Text [ portuguese_brazilian ] = "~Copiar" ;
             Text [ portuguese ] = "~Copiar" ;
-            Text [ finnish ] = "~Kopioi" ;
+            Text [ finnish ] = "K~opioi" ;
             Text [ danish ] = "~Kopier" ;
             Text [ french ] = "~Copier" ;
             Text [ swedish ] = "~Kopiera" ;
@@ -2696,15 +2696,15 @@ Menu RID_SVXMN_GALLERY2
             Text [ italian ] = "~Inserisci" ;
             Text [ portuguese_brazilian ] = "Inserir" ;
             Text [ portuguese ] = "~Inserir" ;
-            Text [ finnish ] = "~Lis��" ;
+            Text [ finnish ] = "Lis~��" ;
             Text [ danish ] = "S�t i~nd" ;
             Text [ french ] = "C~oller" ;
             Text [ swedish ] = "~Infoga" ;
-            Text [ dutch ] = "~Plakken" ;
+            Text [ dutch ] = "P~lakken" ;
             Text [ spanish ] = "~Insertar" ;
             Text [ english_us ] = "~Insert" ;
             Text[ chinese_simplified ] = "插入(~I)";
-            Text[ russian ] = "���~����";
+            Text[ russian ] = "���~�����";
             Text[ polish ] = "W~staw";
             Text[ japanese ] = "貼り付け(~I)";
             Text[ chinese_traditional ] = "插入(~I)"  ;
@@ -2722,3 +2722,8 @@ Menu RID_SVXMN_GALLERY2
 
 
 
+
+
+
+
+
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 73cc098b1d50..8041cd5a10e0 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: gallery1.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: ka $ $Date: 2001-10-31 17:04:45 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -328,24 +328,36 @@ void Gallery::ReleaseGallery( Gallery* pGallery )
 
 void Gallery::ImplLoad( const String& rMultiPath )
 {
-    const USHORT nTokenCount = rMultiPath.GetTokenCount( ';' );
+    INetURLObject   aCurURL;
+    const USHORT    nTokenCount = rMultiPath.GetTokenCount( ';' );
+    sal_Bool        bIsReadOnlyDir;
 
     bMultiPath = ( nTokenCount > 0 );
-    aUserURL = SvtPathOptions().GetConfigPath();
-    ImplLoadSubDirs( aUserURL, bMultiPath );
+
+    aCurURL = SvtPathOptions().GetConfigPath();
+    ImplLoadSubDirs( aCurURL, bIsReadOnlyDir );
+
+    if( !bIsReadOnlyDir )
+        aUserURL = aCurURL;
 
     if( bMultiPath )
     {
         aRelURL = INetURLObject( rMultiPath.GetToken( 0, ';' ) );
-        aUserURL = INetURLObject( rMultiPath.GetToken( nTokenCount - 1, ';' ) );
 
         for( USHORT i = 0UL; i < nTokenCount; i++ )
-            ImplLoadSubDirs( INetURLObject( rMultiPath.GetToken( i, ';' ) ), i < ( nTokenCount - 1 ) );
+        {
+            aCurURL = rMultiPath.GetToken( i, ';' );
+
+            ImplLoadSubDirs( aCurURL, bIsReadOnlyDir );
+
+            if( !bIsReadOnlyDir )
+                aUserURL = aCurURL;
+        }
     }
     else
         aRelURL = INetURLObject( rMultiPath );
 
-    DBG_ASSERT( aUserURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
+    DBG_ASSERT( aUserURL.GetProtocol() != INET_PROT_NOT_VALID, "no writable Gallery user directory available" );
     DBG_ASSERT( aRelURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
 
     ImplLoadImports();
@@ -353,18 +365,52 @@ void Gallery::ImplLoad( const String& rMultiPath )
 
 // ------------------------------------------------------------------------
 
-void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, BOOL bReadOnly )
+void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsReadOnly )
 {
+    rbDirIsReadOnly = sal_False;
+
     try
     {
-        uno::Reference< XCommandEnvironment > xEnv;
-        Content                               aCnt( rBaseURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv );
+        uno::Reference< XCommandEnvironment >   xEnv;
+        Content                                 aCnt( rBaseURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv );
 
         uno::Sequence< OUString > aProps( 1 );
-        aProps.getArray()[ 0 ] == OUString::createFromAscii( "Url" );
+        aProps.getArray()[ 0 ] = OUString::createFromAscii( "Url" );
 
         uno::Reference< sdbc::XResultSet > xResultSet( aCnt.createCursor( aProps, INCLUDE_DOCUMENTS_ONLY ) );
 
+        try
+        {
+            // check readonlyness the very hard way
+            INetURLObject   aTestURL( rBaseURL );
+            String          aTestFile( RTL_CONSTASCII_USTRINGPARAM( "cdefghij.klm" ) );
+
+            aTestURL.Append( aTestFile );
+            SvStream* pTestStm = ::utl::UcbStreamHelper::CreateStream( aTestURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE );
+
+            if( pTestStm )
+            {
+                *pTestStm << 1;
+
+                if( pTestStm->GetError() )
+                    rbDirIsReadOnly = sal_True;
+
+                delete pTestStm;
+                KillFile( aTestURL );
+            }
+            else
+                rbDirIsReadOnly = sal_True;
+        }
+        catch( const ContentCreationException& )
+        {
+        }
+        catch( const ::com::sun::star::uno::RuntimeException& )
+        {
+        }
+        catch( const ::com::sun::star::uno::Exception& )
+        {
+        }
+
         if( xResultSet.is() )
         {
             uno::Reference< XContentAccess > xContentAccess( xResultSet, uno::UNO_QUERY );
@@ -410,7 +456,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, BOOL bReadOnly )
                                     aSdvCnt.getPropertyValue( aReadOnlyProp ) >>= bReadOnly;
                             }
 
-                            GalleryThemeEntry* pEntry = GalleryTheme::CreateThemeEntry( aThmURL, bReadOnly );
+                            GalleryThemeEntry* pEntry = GalleryTheme::CreateThemeEntry( aThmURL, rbDirIsReadOnly || bReadOnly );
 
                             if( pEntry )
                             {
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 5c24d715b8bb..bec568479ed7 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: galtheme.cxx,v $
  *
- *  $Revision: 1.27 $
+ *  $Revision: 1.28 $
  *
- *  last change: $Author: ka $ $Date: 2002-12-04 16:40:38 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,6 +71,7 @@
 #include <ucbhelper/content.hxx>
 #include <so3/svstor.hxx>
 #include <sot/formats.hxx>
+#include <sot/filelist.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/cvtgrf.hxx>
 #include <svtools/itempool.hxx>
@@ -1244,13 +1245,27 @@ BOOL GalleryTheme::InsertTransferable( const ::com::sun::star::uno::Reference< :
             if( aDataHelper.GetSotStorageStream( SOT_FORMATSTR_ID_DRAWING, xModelStm ) )
                 bRet = InsertModelStream( xModelStm, nInsertPos );
         }
-        else if( aDataHelper.HasFormat( FORMAT_FILE ) )
+        else if( aDataHelper.HasFormat( SOT_FORMAT_FILE_LIST ) ||
+                 aDataHelper.HasFormat( FORMAT_FILE ) )
         {
-            String aFile;
+            FileList aFileList;
 
-            if( aDataHelper.GetString( FORMAT_FILE, aFile ) && aFile.Len() )
+            if( aDataHelper.HasFormat( SOT_FORMAT_FILE_LIST ) )
+                aDataHelper.GetFileList( SOT_FORMAT_FILE_LIST, aFileList );
+            else
             {
-                INetURLObject aURL( aFile );
+                String aFile;
+
+                aDataHelper.GetString( FORMAT_FILE, aFile );
+
+                if( aFile.Len() )
+                    aFileList.AppendFile( aFile );
+            }
+
+            for( sal_uInt32 i = 0, nCount = aFileList.Count(); i < nCount; ++i )
+            {
+                const String    aFile( aFileList.GetFile( i ) );
+                INetURLObject   aURL( aFile );
 
                 if( aURL.GetProtocol() == INET_PROT_NOT_VALID )
                 {
@@ -1286,6 +1301,7 @@ BOOL GalleryTheme::InsertTransferable( const ::com::sun::star::uno::Reference< :
 
             if( aDataHelper.HasFormat( SOT_FORMATSTR_ID_SVIM ) )
             {
+
                 ImageMap aImageMap;
 
                 if( aDataHelper.GetImageMap( SOT_FORMATSTR_ID_SVIM, aImageMap ) )
diff --git a/svx/source/gallery2/galtheme.src b/svx/source/gallery2/galtheme.src
index cec0e96f5db5..1ed85f021618 100644
--- a/svx/source/gallery2/galtheme.src
+++ b/svx/source/gallery2/galtheme.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: galtheme.src,v $
  *
- *  $Revision: 1.45 $
+ *  $Revision: 1.46 $
  *
- *  last change: $Author: kz $ $Date: 2003-02-27 13:03:29 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,18 +76,19 @@ String RID_GALLERYSTR_THEME_3D
     Text[ italian ] = "Effetti 3D";
     Text[ danish ] = "3D-effekter";
     Text[ swedish ] = "3D-effekter";
-    Text[ polish ] = "Efekty 3D";
-    Text[ portuguese_brazilian ] = "Efeitos 3D";
+    Text[ polish ] = "Efekty 3-W";
+    Text[ portuguese_brazilian ] = "3D";
     Text[ japanese ] = "3D 効果";
     Text[ chinese_simplified ] = "3 维效果";
     Text[ chinese_traditional ] = "3D 效果";
     Text[ arabic ] = "����� ������ �������";
     Text[ greek ] = "��� 3�";
-    Text[ korean ] = "3Ｄ효과";
+    Text[ korean ] = "3Ｄ 효과";
     Text[ turkish ] = "3B";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Efectos 3D";
+    Text[ catalan ] = "Efectes 3D";
     Text[ finnish ] = "Kolmiulotteiset tehosteet";
+    Text[ thai ] = "ลักษณะ3มิติ";
 };
 
 // -----------------------------------------------------------------------------
@@ -106,7 +107,7 @@ String RID_GALLERYSTR_THEME_ANIMATIONS
     Text[ danish ] = "Animationer";
     Text[ swedish ] = "Animationer";
     Text[ polish ] = "Animacje";
-    Text[ portuguese_brazilian ] = "Anima��es";
+    Text[ portuguese_brazilian ] = "Animations";
     Text[ japanese ] = "アニメーション";
     Text[ chinese_simplified ] = "动画";
     Text[ chinese_traditional ] = "動畫";
@@ -115,8 +116,9 @@ String RID_GALLERYSTR_THEME_ANIMATIONS
     Text[ korean ] = "애니메이션";
     Text[ turkish ] = "Canland�rmalar";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Animaciones";
+    Text[ catalan ] = "Animacions";
     Text[ finnish ] = "Animaatiot";
+    Text[ thai ] = "เคลื่อนไหว";
 };
 
 // -----------------------------------------------------------------------------
@@ -135,7 +137,7 @@ String RID_GALLERYSTR_THEME_BULLETS
     Text[ danish ] = "Punkttegn";
     Text[ swedish ] = "Punkter";
     Text[ polish ] = "Znaki wypunktowania";
-    Text[ portuguese_brazilian ] = "Marcas";
+    Text[ portuguese_brazilian ] = "Bullets";
     Text[ japanese ] = "箇条書きシンボル";
     Text[ chinese_simplified ] = "项目符号";
     Text[ chinese_traditional ] = "項目符號";
@@ -146,6 +148,7 @@ String RID_GALLERYSTR_THEME_BULLETS
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Pics";
     Text[ finnish ] = "Luettelomerkit";
+    Text[ thai ] = "สัญลักษณ์แสดงหัวข้อย่อย";
 };
 
 // -----------------------------------------------------------------------------
@@ -175,6 +178,7 @@ String RID_GALLERYSTR_THEME_OFFICE
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Oficina";
     Text[ finnish ] = "Toimisto";
+    Text[ thai ] = "ที่ทำงาน";
 };
 
 // -----------------------------------------------------------------------------
@@ -193,7 +197,7 @@ String RID_GALLERYSTR_THEME_FLAGS
     Text[ danish ] = "Flag";
     Text[ swedish ] = "Flaggor";
     Text[ polish ] = "Flagi";
-    Text[ portuguese_brazilian ] = "Bandeiras";
+    Text[ portuguese_brazilian ] = "Flags";
     Text[ japanese ] = "国旗";
     Text[ chinese_simplified ] = "各式国旗";
     Text[ chinese_traditional ] = "各式國旗";
@@ -202,8 +206,9 @@ String RID_GALLERYSTR_THEME_FLAGS
     Text[ korean ] = "플래그";
     Text[ turkish ] = "Bayraklar";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Banderas";
+    Text[ catalan ] = "Indicadors";
     Text[ finnish ] = "Tunnisteet";
+    Text[ thai ] = "ค่าสถานะ";
 };
 
 // -----------------------------------------------------------------------------
@@ -221,8 +226,8 @@ String RID_GALLERYSTR_THEME_FLOWCHARTS
     Text[ italian ] = "Diagramma di flusso";
     Text[ danish ] = "Rutediagrammer";
     Text[ swedish ] = "Fl�desdiagram";
-    Text[ polish ] = "Schematy blokowe";
-    Text[ portuguese_brazilian ] = "Fluxogramas";
+    Text[ polish ] = "Wykresy blokowy";
+    Text[ portuguese_brazilian ] = "Flowcharts";
     Text[ japanese ] = "フローチャート";
     Text[ chinese_simplified ] = "各种多边形";
     Text[ chinese_traditional ] = "各種多邊形";
@@ -231,8 +236,9 @@ String RID_GALLERYSTR_THEME_FLOWCHARTS
     Text[ korean ] = "순서도";
     Text[ turkish ] = "Ak�� �emalar�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Diagramas de flujo";
+    Text[ catalan ] = "Diagrames de flux";
     Text[ finnish ] = "Vuokaaviot";
+    Text[ thai ] = "แผนผังลำดับงาน";
 };
 
 // -----------------------------------------------------------------------------
@@ -251,7 +257,7 @@ String RID_GALLERYSTR_THEME_EMOTICONS
     Text[ danish ] = "Smileys";
     Text[ swedish ] = "Emoticons";
     Text[ polish ] = "Bu�ki";
-    Text[ portuguese_brazilian ] = "Formas";
+    Text[ portuguese_brazilian ] = "Forms";
     Text[ japanese ] = "エモーティコン";
     Text[ chinese_simplified ] = "情绪图案";
     Text[ chinese_traditional ] = "情緒圖案";
@@ -260,8 +266,9 @@ String RID_GALLERYSTR_THEME_EMOTICONS
     Text[ korean ] = "감정 표현 기호";
     Text[ turkish ] = "�ekiller";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Emoticon";
+    Text[ catalan ] = "Emoticones";
     Text[ finnish ] = "Hymi�t";
+    Text[ thai ] = "อารมณ์";
 };
 
 // -----------------------------------------------------------------------------
@@ -279,8 +286,8 @@ String RID_GALLERYSTR_THEME_PHOTOS
     Text[ italian ] = "Fotografie";
     Text[ danish ] = "Fotografier";
     Text[ swedish ] = "Foton";
-    Text[ polish ] = "Obrazy";
-    Text[ portuguese_brazilian ] = "Figuras";
+    Text[ polish ] = "Zdj�cia";
+    Text[ portuguese_brazilian ] = "Photos";
     Text[ japanese ] = "写真";
     Text[ chinese_simplified ] = "彩色照片";
     Text[ chinese_traditional ] = "彩色照片";
@@ -289,8 +296,9 @@ String RID_GALLERYSTR_THEME_PHOTOS
     Text[ korean ] = "사진";
     Text[ turkish ] = "Foto�raflar";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Fotos";
+    Text[ catalan ] = "Imatges";
     Text[ finnish ] = "Kuvat";
+    Text[ thai ] = "รูปภาพ";
 };
 
 // -----------------------------------------------------------------------------
@@ -309,7 +317,7 @@ String RID_GALLERYSTR_THEME_BACKGROUNDS
     Text[ danish ] = "Baggrunde";
     Text[ swedish ] = "Bakgrunder";
     Text[ polish ] = "T�a";
-    Text[ portuguese_brazilian ] = "Planos de fundo";
+    Text[ portuguese_brazilian ] = "Backgrounds";
     Text[ japanese ] = "背景";
     Text[ chinese_simplified ] = "各种背景";
     Text[ chinese_traditional ] = "各式背景";
@@ -318,8 +326,9 @@ String RID_GALLERYSTR_THEME_BACKGROUNDS
     Text[ korean ] = "배경";
     Text[ turkish ] = "Artalanlar";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Fondos";
+    Text[ catalan ] = "Fons";
     Text[ finnish ] = "Taustat";
+    Text[ thai ] = "พื้นหลัง";
 };
 
 // -----------------------------------------------------------------------------
@@ -337,8 +346,8 @@ String RID_GALLERYSTR_THEME_HOMEPAGE
     Text[ italian ] = "Homepage";
     Text[ danish ] = "Hjemmeside";
     Text[ swedish ] = "Hemsida";
-    Text[ polish ] = "Strona g��wna";
-    Text[ portuguese_brazilian ] = "P�gina principal";
+    Text[ polish ] = "Strona macierzysta";
+    Text[ portuguese_brazilian ] = "Homepage";
     Text[ japanese ] = "ホームページ";
     Text[ chinese_simplified ] = "主页";
     Text[ chinese_traditional ] = "首頁";
@@ -347,8 +356,9 @@ String RID_GALLERYSTR_THEME_HOMEPAGE
     Text[ korean ] = "홈페이지";
     Text[ turkish ] = "Web sayfas�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "P�gina d'inici";
+    Text[ catalan ] = "P�gina principal";
     Text[ finnish ] = "Kotisivu";
+    Text[ thai ] = "โฮมเพจ";
 };
 
 // -----------------------------------------------------------------------------
@@ -367,17 +377,18 @@ String RID_GALLERYSTR_THEME_INTERACTION
     Text[ danish ] = "Interaktion";
     Text[ swedish ] = "Interaktion";
     Text[ polish ] = "Interakcja";
-    Text[ portuguese_brazilian ] = "Intera��o";
+    Text[ portuguese_brazilian ] = "Interaction";
     Text[ japanese ] = "インタラクション";
     Text[ chinese_simplified ] = "交互式";
     Text[ chinese_traditional ] = "互動式";
     Text[ arabic ] = "������ ����";
     Text[ greek ] = "�������������";
-    Text[ korean ] = "상호작용";
+    Text[ korean ] = "상호 작용";
     Text[ turkish ] = "Etkile�im";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Interacci�";
     Text[ finnish ] = "Vuorovaikutus";
+    Text[ thai ] = "ปฏิสัมพันธ์";
 };
 
 // -----------------------------------------------------------------------------
@@ -396,7 +407,7 @@ String RID_GALLERYSTR_THEME_MAPS
     Text[ danish ] = "Kort";
     Text[ swedish ] = "Kartor";
     Text[ polish ] = "Mapy";
-    Text[ portuguese_brazilian ] = "Mapas";
+    Text[ portuguese_brazilian ] = "Maps";
     Text[ japanese ] = "地図";
     Text[ chinese_simplified ] = "世界地图";
     Text[ chinese_traditional ] = "世界地圖";
@@ -405,8 +416,9 @@ String RID_GALLERYSTR_THEME_MAPS
     Text[ korean ] = "지도";
     Text[ turkish ] = "Haritalar";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Mapas";
+    Text[ catalan ] = "Mapes";
     Text[ finnish ] = "Kartat";
+    Text[ thai ] = "แผนที่";
 };
 
 // -----------------------------------------------------------------------------
@@ -424,8 +436,8 @@ String RID_GALLERYSTR_THEME_PEOPLE
     Text[ italian ] = "Persone";
     Text[ danish ] = "Personer";
     Text[ swedish ] = "Personer";
-    Text[ polish ] = "Ludzie";
-    Text[ portuguese_brazilian ] = "Pessoas";
+    Text[ polish ] = "Ludziki";
+    Text[ portuguese_brazilian ] = "Furniture";
     Text[ japanese ] = "人物";
     Text[ chinese_simplified ] = "人物";
     Text[ chinese_traditional ] = "人物";
@@ -434,8 +446,9 @@ String RID_GALLERYSTR_THEME_PEOPLE
     Text[ korean ] = "사람";
     Text[ turkish ] = "E�yalar";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Personas";
+    Text[ catalan ] = "Gent";
     Text[ finnish ] = "Ihmiset";
+    Text[ thai ] = "ประชาชน";
 };
 
 // -----------------------------------------------------------------------------
@@ -454,7 +467,7 @@ String RID_GALLERYSTR_THEME_SURFACES
     Text[ danish ] = "Overflader";
     Text[ swedish ] = "Ytor";
     Text[ polish ] = "Powierzchnie";
-    Text[ portuguese_brazilian ] = "Texturas";
+    Text[ portuguese_brazilian ] = "Surfaces";
     Text[ japanese ] = "表面";
     Text[ chinese_simplified ] = "彩色平面";
     Text[ chinese_traditional ] = "彩色平面";
@@ -463,8 +476,9 @@ String RID_GALLERYSTR_THEME_SURFACES
     Text[ korean ] = "표면";
     Text[ turkish ] = "Y�zeyler";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Superficies";
+    Text[ catalan ] = "Superf�cies";
     Text[ finnish ] = "Pinnat";
+    Text[ thai ] = "พื้นผิว";
 };
 
 // -----------------------------------------------------------------------------
@@ -498,18 +512,19 @@ String RID_GALLERYSTR_THEME_RULERS
     Text[ italian ] = "Limiti";
     Text[ danish ] = "Gr�nser";
     Text[ swedish ] = "Linjaler";
-    Text[ polish ] = "Obramowania";
-    Text[ portuguese_brazilian ] = "Limites";
+    Text[ polish ] = "Granice";
+    Text[ portuguese_brazilian ] = "Rulers";
     Text[ japanese ] = "ルーラー";
     Text[ chinese_simplified ] = "彩色线条";
     Text[ chinese_traditional ] = "彩色線條";
     Text[ arabic ] = "����";
     Text[ greek ] = "����";
-    Text[ korean ] = "경계";
+    Text[ korean ] = "눈금자";
     Text[ turkish ] = "�izgiler";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "L�mites";
+    Text[ catalan ] = "Regles";
     Text[ finnish ] = "Viivaimet";
+    Text[ thai ] = "ไม้บรรทัด";
 };
 
 // -----------------------------------------------------------------------------
@@ -528,7 +543,7 @@ String RID_GALLERYSTR_THEME_SOUNDS
     Text[ danish ] = "Lyde";
     Text[ swedish ] = "Ljud";
     Text[ polish ] = "D�wi�ki";
-    Text[ portuguese_brazilian ] = "Sons";
+    Text[ portuguese_brazilian ] = "Sounds";
     Text[ japanese ] = "サウンド";
     Text[ chinese_simplified ] = "声音图标";
     Text[ chinese_traditional ] = "聲音圖示";
@@ -537,8 +552,9 @@ String RID_GALLERYSTR_THEME_SOUNDS
     Text[ korean ] = "사운드";
     Text[ turkish ] = "Sesler";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Sonidos";
+    Text[ catalan ] = "Sons";
     Text[ finnish ] = "��net";
+    Text[ thai ] = "เสียง";
 };
 
 // -----------------------------------------------------------------------------
@@ -557,7 +573,7 @@ String RID_GALLERYSTR_THEME_SYMBOLS
     Text[ danish ] = "Symboler";
     Text[ swedish ] = "Symboler";
     Text[ polish ] = "Symbole";
-    Text[ portuguese_brazilian ] = "S�mbolos";
+    Text[ portuguese_brazilian ] = "Symbols";
     Text[ japanese ] = "シンボル";
     Text[ chinese_simplified ] = "各式图标";
     Text[ chinese_traditional ] = "各式圖示";
@@ -568,6 +584,7 @@ String RID_GALLERYSTR_THEME_SYMBOLS
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "S�mbols";
     Text[ finnish ] = "Symbolit";
+    Text[ thai ] = "สัญลักษณ์";
 };
 
 // -----------------------------------------------------------------------------
@@ -586,16 +603,17 @@ String RID_GALLERYSTR_THEME_MYTHEME
     Text[ italian ] = "Argomento proprio";
     Text[ danish ] = "Eget emne";
     Text[ swedish ] = "Eget tema";
-    Text[ polish ] = "M�j temat";
-    Text[ portuguese_brazilian ] = "Temas pr�prios";
+    Text[ polish ] = "Wlasny temat";
+    Text[ portuguese_brazilian ] = "My theme";
     Text[ japanese ] = "独自のテーマ";
     Text[ korean ] = "고유 주제";
     Text[ chinese_simplified ] = "自己的主题";
     Text[ chinese_traditional ] = "自訂主題";
     Text[ turkish ] = "Kullan�c� konusu";
     Text[ arabic ] = "����� ����";
-    Text[ catalan ] = "Mis temas";
+    Text[ catalan ] = "El meu tema";
     Text[ finnish ] = "Oma teema";
+    Text[ thai ] = "ชุดรูปแบบของฉัน";
 };
 
 // -----------------------------------------------------------------------------
@@ -623,15 +641,16 @@ String RID_GALLERYSTR_THEME_ARROWS
     Text[ danish ] = "Pile";
     Text[ swedish ] = "Pilar";
     Text[ polish ] = "Strza�ki";
-    Text[ portuguese_brazilian ] = "Setas";
+    Text[ portuguese_brazilian ] = "My theme";
     Text[ japanese ] = "矢印";
     Text[ korean ] = "화살표";
     Text[ chinese_simplified ] = "箭头";
     Text[ chinese_traditional ] = "箭頭";
     Text[ turkish ] = "Kullan�c� konusu";
     Text[ arabic ] = "����";
-    Text[ catalan ] = "Flechas";
+    Text[ catalan ] = "Fletxes";
     Text[ finnish ] = "Nuolet";
+    Text[ thai ] = "ลูกศร";
 };
 
 // -----------------------------------------------------------------------------
@@ -651,15 +670,16 @@ String RID_GALLERYSTR_THEME_BALLOONS
     Text[ danish ] = "Talebobler";
     Text[ swedish ] = "Pratbubblor";
     Text[ polish ] = "Chmurki tekstowe";
-    Text[ portuguese_brazilian ] = "Bal�es";
+    Text[ portuguese_brazilian ] = "My theme";
     Text[ japanese ] = "吹き出し";
     Text[ korean ] = "풍선";
     Text[ chinese_simplified ] = "说话文字框";
     Text[ chinese_traditional ] = "說話方框";
     Text[ turkish ] = "Kullan�c� konusu";
     Text[ arabic ] = "����� ������";
-    Text[ catalan ] = "Llamadas";
+    Text[ catalan ] = "Globus";
     Text[ finnish ] = "Puhekuplat";
+    Text[ thai ] = "บอลลูน";
 };
 
 // -----------------------------------------------------------------------------
@@ -679,15 +699,16 @@ String RID_GALLERYSTR_THEME_KEYBOARD
     Text[ danish ] = "Tastatur";
     Text[ swedish ] = "Tangentbord";
     Text[ polish ] = "Klawiatura";
-    Text[ portuguese_brazilian ] = "Teclado";
+    Text[ portuguese_brazilian ] = "My theme";
     Text[ japanese ] = "キーボード";
     Text[ korean ] = "키보드";
     Text[ chinese_simplified ] = "键盘";
     Text[ chinese_traditional ] = "鍵盤";
     Text[ turkish ] = "Kullan�c� konusu";
     Text[ arabic ] = "���� ��������";
-    Text[ catalan ] = "Teclado";
+    Text[ catalan ] = "Teclat";
     Text[ finnish ] = "N�pp�imist�";
+    Text[ thai ] = "แป้นพิมพ์";
 };
 
 // -----------------------------------------------------------------------------
@@ -707,7 +728,7 @@ String RID_GALLERYSTR_THEME_TIME
     Text[ danish ] = "Tid";
     Text[ swedish ] = "Tid";
     Text[ polish ] = "Czas";
-    Text[ portuguese_brazilian ] = "Hora";
+    Text[ portuguese_brazilian ] = "My theme";
     Text[ japanese ] = "時間";
     Text[ korean ] = "시간";
     Text[ chinese_simplified ] = "时间";
@@ -716,6 +737,7 @@ String RID_GALLERYSTR_THEME_TIME
     Text[ arabic ] = "�����";
     Text[ catalan ] = "Hora";
     Text[ finnish ] = "Aika";
+    Text[ thai ] = "เวลา";
 };
 
 // -----------------------------------------------------------------------------
@@ -735,7 +757,7 @@ String RID_GALLERYSTR_THEME_PRESENTATION
     Text[ danish ] = "Pr�sentation";
     Text[ swedish ] = "Presentation";
     Text[ polish ] = "Prezentacja";
-    Text[ portuguese_brazilian ] = "Apresenta��o";
+    Text[ portuguese_brazilian ] = "My theme";
     Text[ japanese ] = "プレゼンテーション";
     Text[ korean ] = "프레젠테이션";
     Text[ chinese_simplified ] = "演示文稿";
@@ -744,6 +766,7 @@ String RID_GALLERYSTR_THEME_PRESENTATION
     Text[ arabic ] = "��� ������";
     Text[ catalan ] = "Presentaci�";
     Text[ finnish ] = "Esitys";
+    Text[ thai ] = "การนำเสนอ";
 };
 
 // -----------------------------------------------------------------------------
@@ -763,15 +786,16 @@ String RID_GALLERYSTR_THEME_CALENDAR
     Text[ danish ] = "Kalender";
     Text[ swedish ] = "Kalender";
     Text[ polish ] = "Kalendarz";
-    Text[ portuguese_brazilian ] = "Calend�rio";
+    Text[ portuguese_brazilian ] = "My theme";
     Text[ japanese ] = "カレンダー";
     Text[ korean ] = "칼렌더";
     Text[ chinese_simplified ] = "日历";
     Text[ chinese_traditional ] = "行事曆";
     Text[ turkish ] = "Kullan�c� konusu";
     Text[ arabic ] = "�����";
-    Text[ catalan ] = "Calendario";
+    Text[ catalan ] = "Calendari";
     Text[ finnish ] = "Kalenteri";
+    Text[ thai ] = "ปฏิทิน";
 };
 
 // -----------------------------------------------------------------------------
@@ -791,15 +815,16 @@ String RID_GALLERYSTR_THEME_NAVIGATION
     Text[ danish ] = "Navigation";
     Text[ swedish ] = "Navigation";
     Text[ polish ] = "Nawigacja";
-    Text[ portuguese_brazilian ] = "Navega��o";
+    Text[ portuguese_brazilian ] = "My theme";
     Text[ japanese ] = "ナビゲーション";
-    Text[ korean ] = "네비게이션";
+    Text[ korean ] = "탐색";
     Text[ chinese_simplified ] = "浏览";
     Text[ chinese_traditional ] = "瀏覽";
     Text[ turkish ] = "Kullan�c� konusu";
     Text[ arabic ] = "�����";
-    Text[ catalan ] = "Navegaci�n";
+    Text[ catalan ] = "Navegaci�";
     Text[ finnish ] = "Siirtyminen";
+    Text[ thai ] = "นำทาง";
 };
 
 // -----------------------------------------------------------------------------
@@ -819,15 +844,16 @@ String RID_GALLERYSTR_THEME_COMMUNICATION
     Text[ danish ] = "Kommunikation";
     Text[ swedish ] = "Kommunikation";
     Text[ polish ] = "Komunikacja";
-    Text[ portuguese_brazilian ] = "Comunica��o";
+    Text[ portuguese_brazilian ] = "My theme";
     Text[ japanese ] = "コミュニケーション";
     Text[ korean ] = "통신";
     Text[ chinese_simplified ] = "通讯";
     Text[ chinese_traditional ] = "通訊";
     Text[ turkish ] = "Kullan�c� konusu";
     Text[ arabic ] = "�����";
-    Text[ catalan ] = "Comunicaci�n";
+    Text[ catalan ] = "Comunicaci�";
     Text[ finnish ] = "Yhteydenpito";
+    Text[ thai ] = "การสื่อสาร";
 };
 
 // -----------------------------------------------------------------------------
@@ -847,15 +873,16 @@ String RID_GALLERYSTR_THEME_FINANCES
     Text[ danish ] = "Finanser";
     Text[ swedish ] = "Ekonomi";
     Text[ polish ] = "Finanse";
-    Text[ portuguese_brazilian ] = "Finan�as";
+    Text[ portuguese_brazilian ] = "My theme";
     Text[ japanese ] = "ファイナンス";
-    Text[ korean ] = "회계";
+    Text[ korean ] = "재정 관리";
     Text[ chinese_simplified ] = "财务";
     Text[ chinese_traditional ] = "財務";
     Text[ turkish ] = "Kullan�c� konusu";
     Text[ arabic ] = "�����";
-    Text[ catalan ] = "Finanzas";
+    Text[ catalan ] = "Finances";
     Text[ finnish ] = "Talous";
+    Text[ thai ] = "การเงิน";
 };
 
 // -----------------------------------------------------------------------------
@@ -874,16 +901,17 @@ String RID_GALLERYSTR_THEME_COMPUTER
     Text[ italian ] = "Computer";
     Text[ danish ] = "Computer";
     Text[ swedish ] = "Dator";
-    Text[ polish ] = "Komputery";
-    Text[ portuguese_brazilian ] = "Computador";
+    Text[ polish ] = "Komputer";
+    Text[ portuguese_brazilian ] = "My theme";
     Text[ japanese ] = "コンピュータ";
     Text[ korean ] = "컴퓨터";
     Text[ chinese_simplified ] = "计算机";
     Text[ chinese_traditional ] = "電腦";
     Text[ turkish ] = "Kullan�c� konusu";
     Text[ arabic ] = "�������";
-    Text[ catalan ] = "Ordenador";
+    Text[ catalan ] = "Ordinadors";
     Text[ finnish ] = "Tietokoneet";
+    Text[ thai ] = "คอมพิวเตอร์";
 };
 
 // -----------------------------------------------------------------------------
@@ -903,15 +931,16 @@ String RID_GALLERYSTR_THEME_CLIMA
     Text[ danish ] = "Klima";
     Text[ swedish ] = "Klimat";
     Text[ polish ] = "Klimat";
-    Text[ portuguese_brazilian ] = "Clima";
+    Text[ portuguese_brazilian ] = "Climate";
     Text[ japanese ] = "気候";
     Text[ korean ] = "기후";
     Text[ chinese_simplified ] = "气候";
     Text[ chinese_traditional ] = "氣候";
     Text[ turkish ] = "Climate";
     Text[ arabic ] = "Climate";
-    Text[ catalan ] = "Climate";
+    Text[ catalan ] = "Clima";
     Text[ finnish ] = "Ymp�rist�";
+    Text[ thai ] = "อากาศ";
 };
 
 // -----------------------------------------------------------------------------
@@ -931,15 +960,16 @@ String RID_GALLERYSTR_THEME_EDUCATION
     Text[ danish ] = "Skole og universitet";
     Text[ swedish ] = "Skola & universitet";
     Text[ polish ] = "Szko�a i uniwersytet";
-    Text[ portuguese_brazilian ] = "Escola & Universidade";
+    Text[ portuguese_brazilian ] = "School & University";
     Text[ japanese ] = "教育機関";
-    Text[ korean ] = "학교 & 대학";
+    Text[ korean ] = "교육 기관";
     Text[ chinese_simplified ] = "中学和大学";
     Text[ chinese_traditional ] = "中學和大學";
     Text[ turkish ] = "School & University";
     Text[ arabic ] = "School & University";
-    Text[ catalan ] = "School & University";
+    Text[ catalan ] = "Escola i universitat";
     Text[ finnish ] = "Koulu ja yliopisto";
+    Text[ thai ] = "โรงเรียนและมหาวิทยาลัย";
 };
 
 // -----------------------------------------------------------------------------
@@ -958,16 +988,17 @@ String RID_GALLERYSTR_THEME_TROUBLE
     Text[ italian ] = "Soluzioni";
     Text[ danish ] = "Probleml�sninger";
     Text[ swedish ] = "Probleml�sningar";
-    Text[ polish ] = "Rozwi�zywanie problem�w";
-    Text[ portuguese_brazilian ] = "Solu��o de problemas";
+    Text[ polish ] = "Rozwi�zania problemu";
+    Text[ portuguese_brazilian ] = "Problem Solving";
     Text[ japanese ] = "トラブル解決";
     Text[ korean ] = "문제 해결";
     Text[ chinese_simplified ] = "解决问题的方案";
     Text[ chinese_traditional ] = "解決問題的方案";
     Text[ turkish ] = "Problem Solving";
     Text[ arabic ] = "Problem Solving";
-    Text[ catalan ] = "Problem Solving";
+    Text[ catalan ] = "Soluci� de problemes";
     Text[ finnish ] = "Ongelmanratkaisu";
+    Text[ thai ] = "การแก้ปัญหา";
 };
 
 // -----------------------------------------------------------------------------
@@ -988,7 +1019,7 @@ String RID_GALLERYSTR_THEME_SCREENBEANS
     Text[ italian ] = "Screen Beans";
     Text[ danish ] = "ScreenBeans";
     Text[ swedish ] = "Screen Beans";
-    Text[ polish ] = "Ludki";
+    Text[ polish ] = "ScreenBeans";
     Text[ portuguese_brazilian ] = "ScreenBeans";
     Text[ japanese ] = "Screen Beans";
     Text[ korean ] = "ScreenBeans";
@@ -997,6 +1028,7 @@ String RID_GALLERYSTR_THEME_SCREENBEANS
     Text[ turkish ] = "ScreenBeans";
     Text[ arabic ] = "ScreenBeans";
     Text[ catalan ] = "ScreenBeans";
+    Text[ thai ] = "Screen Beans";
 };
 
 // -----------------------------------------------------------------------------
@@ -1023,3 +1055,8 @@ String RID_GALLERYSTR_THEME_DUMMY5
 
 
 
+
+
+
+
+
diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx
index 04b1258ca878..f8e250106e4b 100644
--- a/svx/source/inc/GraphCtlAccessibleContext.hxx
+++ b/svx/source/inc/GraphCtlAccessibleContext.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: GraphCtlAccessibleContext.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: af $ $Date: 2002-10-23 09:44:52 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -318,23 +318,6 @@ private:
     */
     ::rtl::OUString msName;
 
-    /// set of property change listeners.
-    cppu::OInterfaceContainerHelper* mpEventListeners;
-
-    /// set of Accessible event listeners.
-    typedef ::std::set< ::com::sun::star::uno::Reference<
-            ::drafts::com::sun::star::accessibility::XAccessibleEventListener> >
-        AccessibleEventListenerListType;
-
-    AccessibleEventListenerListType mxAccessibleEventListeners;
-
-    /// set of event listeners.
-    typedef ::std::set< ::com::sun::star::uno::Reference<
-            ::com::sun::star::document::XEventListener> >
-        EventListenerListType;
-
-    EventListenerListType mxEventListeners;
-
     /// map of accessible shapes
     struct SdrObjectCompareLess
     {
@@ -352,6 +335,9 @@ private:
     SdrPage* mpPage;
     SdrView* mpView;
 
+    /// client id in the AccessibleEventNotifier queue
+    sal_uInt32 mnClientId;
+
     sal_Bool mbDisposed;
 };
 
diff --git a/svx/source/inc/dbtoolsclient.hxx b/svx/source/inc/dbtoolsclient.hxx
index f0520df7a452..a0c058718889 100644
--- a/svx/source/inc/dbtoolsclient.hxx
+++ b/svx/source/inc/dbtoolsclient.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbtoolsclient.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: os $ $Date: 2002-12-05 15:06:30 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -206,6 +206,25 @@ namespace svxform
             @param      _rxCursorSet    the property set
         */
         sal_Bool canDelete(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const;
+
+        // ------------------------------------------------
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >
+            getFieldsByCommandDescriptor(
+                const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
+                const sal_Int32 _nCommandType,
+                const ::rtl::OUString& _rCommand,
+                ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxKeepFieldsAlive,
+                ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL
+            )   SAL_THROW( ( ) );
+
+        // ------------------------------------------------
+        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString >
+            getFieldNamesByCommandDescriptor(
+                const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
+                const sal_Int32 _nCommandType,
+                const ::rtl::OUString& _rCommand,
+                ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL
+            )   SAL_THROW( ( ) );
     };
 //........................................................................
 }   // namespace svxform
diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx
index 881886120d3f..690e5af2f13c 100644
--- a/svx/source/inc/fmPropBrw.hxx
+++ b/svx/source/inc/fmPropBrw.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmPropBrw.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: fs $ $Date: 2001-01-24 14:04:56 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -111,7 +111,6 @@ class FmPropBrw : public SfxFloatingWindow, public SfxControllerItem
                     m_xBrowserComponentWindow;
 
 protected:
-    virtual void Resize();
     virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState);
     virtual void FillInfo( SfxChildWinInfo& rInfo ) const;
     virtual sal_Bool Close();
diff --git a/svx/source/inc/fmctrler.hxx b/svx/source/inc/fmctrler.hxx
index 58a164131a18..cd59067fc9df 100644
--- a/svx/source/inc/fmctrler.hxx
+++ b/svx/source/inc/fmctrler.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmctrler.hxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: fs $ $Date: 2002-12-05 09:58:04 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -588,7 +588,7 @@ protected:
     void startFormListening( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxForm, sal_Bool _bPropertiesOnly  );
     void stopFormListening( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxForm, sal_Bool _bPropertiesOnly );
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> findControl(::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> >& rCtrls, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>& rxCtrlModel ) const;
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> findControl(::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> >& rCtrls, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>& rxCtrlModel ,sal_Bool _bRemove = sal_True) const;
 
     void insertControl(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl);
     void removeControl(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl);
diff --git a/svx/source/inc/fmexpl.hrc b/svx/source/inc/fmexpl.hrc
index 23a9c8210f1c..f137a4849311 100644
--- a/svx/source/inc/fmexpl.hrc
+++ b/svx/source/inc/fmexpl.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmexpl.hrc,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:01:19 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
diff --git a/svx/source/inc/fmgroup.hxx b/svx/source/inc/fmgroup.hxx
new file mode 100644
index 000000000000..cda0c15371dc
--- /dev/null
+++ b/svx/source/inc/fmgroup.hxx
@@ -0,0 +1,154 @@
+/*************************************************************************
+ *
+ *  $RCSfile: fmgroup.hxx,v $
+ *
+ *  $Revision: 1.3 $
+ *
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:13 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  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., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+#ifndef _SVX_FMGROUP_HXX
+#define _SVX_FMGROUP_HXX
+
+#ifndef _SVX_FMCPONT_HXX
+#include "fmcpont.hxx"
+#endif
+
+#ifndef __DBFORM_HXX
+#include <dbform.hxx>
+#endif
+
+DECLARE_LIST( FmCtrlModelList, XInterface* );
+
+struct FmXGroupModel_Impl;
+
+//==================================================================
+// FmXGroupModel
+//==================================================================
+class FmXGroupModel : public XBoundControl,
+                      public XLoadListener,
+                      public XPropertyChangeListener,
+                      public XGroup,
+                      public FmXControlModel
+{
+    FmFormControlMap        aControlMap;
+
+    friend Reflection*      FmXGroupModel_getReflection();
+    FmXGroupModel_Impl*     pGroupModelData;            // Properties
+
+public:
+    FmXGroupModel();
+    virtual ~FmXGroupModel();
+
+    // UNO Anbindung
+    SMART_UNO_DECLARATION( FmXGroupModel, FmXControlModel );
+    virtual XInterface*     queryInterface(UsrUik);
+    virtual XIdlClassRef    getIdlClass();
+
+    // XGroup
+    virtual INT32 getFormControlCount();
+    virtual XFormControlRef getFormControlByName( const XubString& sName ) const;
+    virtual XFormControlRef getFormControlByIndex( INT32 Index ) const;
+    virtual void appendFormControl( const XFormControlRef& FormControl );
+    virtual XFormControlRef removeFormControl( const XFormControlRef& FormControl );
+
+    // XFormControl
+    virtual void setParent( const XFormRef& Parent );
+
+    // XEventListener
+    virtual void disposing( const EventObject& Source );
+
+    // XPropertiesChangeListener
+    virtual void propertyChange( const PropertyChangeEvent& evt );
+
+    // XLoadListener
+    virtual void loaded( const EventObject& rEvent );
+    virtual void unloaded( const EventObject& rEvent );
+
+    // XBoundControl
+    virtual void addBoundControlListener( const XBoundControlListenerRef& l );
+    virtual void removeBoundControlListener( const XBoundControlListenerRef& l );
+
+    // XPersistObject
+    virtual XubString getServiceName( void ) const;
+    virtual void write( const XObjectOutputStreamRef& OutStream );
+    virtual void read( const XObjectInputStreamRef& InStream );
+
+    // PropertySetInterface
+    virtual FmXPropertySetInfo* createPropertySetInfo() const;
+    virtual BOOL setPropertyValue( UINT16 nId, const XubString& aPropertyName,
+                                   const UsrAny& aValue,
+                                   PropertyChangeEventSequence* pSeq,
+                                   INT32 nIndex );
+    virtual UsrAny getPropertyValue( UINT16 nId, const XubString& aPropertyName ) const;
+    virtual void addPropertyChangeListener( const XubString& aPropertyName, const XPropertyChangeListenerRef& aListener );
+    virtual void removePropertyChangeListener( const XubString& aPropertyName, const XPropertyChangeListenerRef& aListener );
+};
+
+//==================================================================
+// FmXGroupModelInfo
+// Properties:
+//==================================================================
+class FmXGroupModelInfo : public FmXControlModelInfo
+{
+    friend class FmXGroupModel;
+
+protected:
+    FmXGroupModelInfo( const FmXGroupModel* pCp );
+    virtual void fillProperties( UINT32& nIndex, PropertySequence& aSeq ) const;
+};
+
+
+#endif // _SVX_FMGROUP_HXX
+
diff --git a/svx/source/inc/fmitems.hxx b/svx/source/inc/fmitems.hxx
index 7e6247a46865..411ba0823faa 100644
--- a/svx/source/inc/fmitems.hxx
+++ b/svx/source/inc/fmitems.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmitems.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mba $ $Date: 2002-05-22 11:46:49 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,53 +73,6 @@
 FORWARD_DECLARE_INTERFACE(uno,Any)
 //  class ::com::sun::star::uno::Any;
 
-struct FmFormInfo
-{
-    sal_Int32   Pos;
-    sal_Int32   Count;
-    sal_Bool    ReadOnly;
-    FmFormInfo(sal_Int32 _Pos = 0, sal_Int32 _Count = -1, sal_Bool _ReadOnly = sal_False)
-        :Pos(_Pos)
-        ,Count(_Count)
-        ,ReadOnly(_ReadOnly){}
-    sal_Bool operator == (const FmFormInfo& rInfo) const
-        {return Pos == rInfo.Pos && Count == rInfo.Count && ReadOnly==rInfo.ReadOnly;}
-};
-
-//==================================================================
-class FmFormInfoItem : public SfxPoolItem
-{
-    FmFormInfo  aInfo;
-
-public:
-    TYPEINFO();
-
-    FmFormInfoItem(const sal_uInt16 nId, const FmFormInfo& rInfo = FmFormInfo())
-        :SfxPoolItem(nId)
-        ,aInfo(rInfo){}
-
-    inline FmFormInfoItem&   operator=( const FmFormInfoItem &rCpy );
-
-    // "pure virtual Methoden" vom SfxPoolItem
-    virtual int              operator==( const SfxPoolItem& ) const;
-    virtual sal_Bool             QueryValue( ::com::sun::star::uno::Any& rVal, sal_Int8 nMemberId = 0 ) const;
-    virtual sal_Bool             PutValue( const ::com::sun::star::uno::Any& rVal, sal_Int8 nMemberId = 0 );
-
-    virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*     Create(SvStream &, sal_uInt16) const;
-    virtual SvStream&        Store(SvStream &, sal_uInt16 nItemVersion ) const;
-
-    const FmFormInfo& GetInfo() const { return aInfo; }
-    void              SetInfo(const FmFormInfo& rInfo) { aInfo = rInfo; }
-};
-
-inline FmFormInfoItem& FmFormInfoItem::operator=( const FmFormInfoItem &rCpy )
-{
-    aInfo = rCpy.aInfo;
-    return *this;
-}
-
-
 //==================================================================
 class FmInterfaceItem : public SfxPoolItem
 {
diff --git a/svx/source/inc/fmprop.hrc b/svx/source/inc/fmprop.hrc
index a2a8a21d87f1..cd8a5207bc82 100644
--- a/svx/source/inc/fmprop.hrc
+++ b/svx/source/inc/fmprop.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmprop.hrc,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: fs $ $Date: 2001-06-11 11:44:34 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -86,18 +86,18 @@
 #define FM_ATTR_VALUE               (FM_ATTR_START + 31)    // sal_Int32
 #define FM_ATTR_FORMATKEY           (FM_ATTR_START + 33)    // sal_uInt32
 #define FM_ATTR_SIZE                (FM_ATTR_START + 37)    // sal_uInt32
-#define FM_ATTR_HEIGHT              (FM_ATTR_START + 41)    // sal_uInt16
+    // free
 #define FM_ATTR_WIDTH               (FM_ATTR_START + 42)    // sal_uInt16
 #define FM_ATTR_DEFAULTCONTROL      (FM_ATTR_START + 43)    // string
 #define FM_ATTR_BOUNDCOLUMN         (FM_ATTR_START + 44)    // sal_uInt16 may be null
 #define FM_ATTR_LISTSOURCETYPE      (FM_ATTR_START + 45)    // sal_uInt16
 #define FM_ATTR_LISTSOURCE          (FM_ATTR_START + 46)    // string
-#define FM_ATTR_LISTINDEX           (FM_ATTR_START + 47)    // sal_uInt32
+    // free
 #define FM_ATTR_TEXT                (FM_ATTR_START + 48)    // string
 #define FM_ATTR_STRINGITEMLIST      (FM_ATTR_START + 49)    // wsstringsequence
 #define FM_ATTR_LABEL               (FM_ATTR_START + 50)    // string
 #define FM_ATTR_STATE               (FM_ATTR_START + 52)    // sal_uInt16
-#define FM_ATTR_GROUPBOX            (FM_ATTR_START + 53)    // string
+    // free
 #define FM_ATTR_FONT                (FM_ATTR_START + 54)    // font
 #define FM_ATTR_HASNAVIGATION       (FM_ATTR_START + 55)
 #define FM_ATTR_ROWHEIGHT           (FM_ATTR_START + 57)    // sal_uInt16
@@ -350,7 +350,6 @@ namespace svxform
     DECLARE_CONSTASCII_USTRING(FM_PROP_HELPURL);
     DECLARE_CONSTASCII_USTRING(FM_PROP_RECORDMARKER);
     DECLARE_CONSTASCII_USTRING(FM_PROP_BOUNDFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_TREATASNUMERIC);
     DECLARE_CONSTASCII_USTRING(FM_PROP_EFFECTIVE_VALUE);
     DECLARE_CONSTASCII_USTRING(FM_PROP_EFFECTIVE_DEFAULT);
     DECLARE_CONSTASCII_USTRING(FM_PROP_EFFECTIVE_MIN);
diff --git a/svx/source/inc/fmresids.hrc b/svx/source/inc/fmresids.hrc
index 4a72d688e435..0bf205f2e11a 100644
--- a/svx/source/inc/fmresids.hrc
+++ b/svx/source/inc/fmresids.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmresids.hrc,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: oj $ $Date: 2002-09-27 11:20:30 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,16 +65,10 @@
 #include <svtools/solar.hrc>
 
 // unnamed ressources -------------------------------------------------------
-#define RID_RES_CONTROL_WIZARDS_ERROR_CONTEXTS      (RID_FORMS_START + 0)
 // sub ressources .....................
-#define RID_SUB_GRIDCONTROL_WIZARD                  1
-#define RID_SUB_LISTBOX_WIZARD                      2
-#define RID_SUB_COMBOBOX_WIZARD                     3
-#define RID_SUB_GROUPBOX_WIZARD                     4
 
 // ImageList-Id's -----------------------------------------------------------
 #define RID_SVXIMGLIST_FMEXPL                       (RID_FORMS_START + 0)
-#define RID_SVXIMGLIST_DBBRW                        (RID_FORMS_START + 1)
 #define RID_SVXIMGLIST_FMEXPL_HC                    (RID_FORMS_START + 2)
 
 // Image-Id's -----------------------------------------------------------
@@ -106,9 +100,6 @@
 #define RID_SVXIMG_FILTER                           SID_FM_FILTERCRIT
 #define RID_SVXIMG_DATE_N_TIME_FIELDS               SID_FM_TWOFIELDS_DATE_N_TIME
 #define RID_SVXIMG_FIELD                            (RID_FORMS_START +27)
-#define RID_SVXIMG_ERROR                            (RID_FORMS_START +28)
-#define RID_SVXIMG_WARNING                          (RID_FORMS_START +29)
-#define RID_SVXIMG_INFO                             (RID_FORMS_START +30)
 
 // Dialog-Id's -----------------------------------------------------------
 #define RID_SVXTBX_FORM                             (RID_FORMS_START + 1)
@@ -117,20 +108,14 @@
 #define RID_SVXTBX_FORM_FILTER                      (RID_FORMS_START + 4)
 #define RID_SVXDLG_ADD_TABLE                        (RID_FORMS_START + 5)
 #define RID_SVXDLG_TAB_ORDER                        (RID_FORMS_START + 6)
-#define RID_SVXDLG_PROPBRW                          (RID_FORMS_START + 7)
-#define RID_SVX_PROPBRW                             (RID_FORMS_START + 8)
 #define RID_SVXDLG_SETFORM                          (RID_FORMS_START + 9)
 #define RID_SVX_FMEXPLORER                          (RID_FORMS_START + 10)
 // --------- free id -----------------
-#define RID_SVXDLG_FMMACRO                          (RID_FORMS_START + 12)
-#define RID_SVXDLG_FMFONT                           (RID_FORMS_START + 13)
 #define RID_SVXDLG_SEARCHFORM                       (RID_FORMS_START + 14)
 #define RID_SVXERR_SEARCH_NORECORD                  (RID_FORMS_START + 15)
 #define RID_SVXERR_SEARCH_GENERAL_ERROR             (RID_FORMS_START + 16)
 #define RID_SVX_DLG_INPUTRECORDNO                   (RID_FORMS_START + 17)
 #define RID_SVX_DLG_SHOWGRIDCOLUMNS                 (RID_FORMS_START + 18)
-// --------- free id -----------------
-#define RID_SVX_DLG_LABELCONTROL                    (RID_FORMS_START + 20)
 
 // Menu-Id's -----------------------------------------------------------
 #define RID_FMEXPLORER_POPUPMENU                    (RID_FORMS_START + 0)
@@ -162,7 +147,6 @@
 #define RID_STR_UNDO_MODEL_REPLACE                  (RID_FORMS_START + 24)
 
 // ErrorStrings
-#define RID_STR_ERR_CONNECTLOST                     (RID_FORMS_START + 30)
 
 #define RID_STR_FILTER_CRITERIA                     (RID_FORMS_START + 36)
 #define RID_STR_SORT_CRITERIA                       (RID_FORMS_START + 37)
@@ -189,62 +173,35 @@
 #define RID_STR_ALLOW_EDITS                         (RID_FORMS_START + 58)
 #define RID_STR_DATAENTRY                           (RID_FORMS_START + 59)
 #define RID_STR_DATASOURCE                          (RID_FORMS_START + 60)
-#define RID_STR_LOCKED                              (RID_FORMS_START + 61)
 #define RID_STR_MASTERFIELDS                        (RID_FORMS_START + 62)
 #define RID_STR_SLAVEFIELDS                         (RID_FORMS_START + 63)
 #define RID_STR_FONT                                (RID_FORMS_START + 64)
-#define RID_STR_SEARCHING                           (RID_FORMS_START + 65)
-#define RID_STR_SEARCH_TYPE                         (RID_FORMS_START + 66)
-#define RID_STR_CURSORTYPE                          (RID_FORMS_START + 67)
 #define RID_STR_LABEL                               (RID_FORMS_START + 68)
-#define RID_STR_ALIGNMENT                           (RID_FORMS_START + 69)
-#define RID_STR_NEW_FORM                            (RID_FORMS_START + 70)
 #define RID_STR_TABWIN_PREFIX                       (RID_FORMS_START + 71)
 #define RID_STR_FORM                                (RID_FORMS_START + 72)
-#define RID_STR_PROPPAGE_FORMCTL_TITLE              (RID_FORMS_START + 73)
-#define RID_STR_PROPPAGE_UNOCTL_TITLE               (RID_FORMS_START + 74)
-#define RID_STR_PROPPAGE_DEFAULT_TITLE              (RID_FORMS_START + 75)
-#define RID_STR_CURSORSOURCE_TYPE                   (RID_FORMS_START + 76)
-#define RID_STR_BOOL                                (RID_FORMS_START + 77)
 #define RID_STR_FIELDSELECTION                      (RID_FORMS_START + 78)
-#define RID_STR_FIELDNULL                           (RID_FORMS_START + 79)
 #define RID_STR_NO_PROPERTIES                       (RID_FORMS_START + 80)
 #define RID_STR_PROPERTIES_CONTROL                  (RID_FORMS_START + 81)
 #define RID_STR_PROPERTIES_FORM                     (RID_FORMS_START + 82)
 #define RID_STR_FMEXPLORER                          (RID_FORMS_START + 83)
 #define RID_STR_FORMS                               (RID_FORMS_START + 84)
-#define RID_STR_LISTSOURCE_TYPE                     (RID_FORMS_START + 85)
-#define RID_STR_EVENTS                              (RID_FORMS_START + 86)
-#define RID_STR_CURSOR_TYPE                         (RID_FORMS_START + 87)
 
-#define RID_STR_READERROR                           (RID_FORMS_START + 88)
 #define RID_STR_WRITEERROR                          (RID_FORMS_START + 89)
-#define RID_STR_DELETEERROR                         (RID_FORMS_START + 90)
-#define RID_STR_WARNING                             (RID_FORMS_START + 91)
-#define RID_STR_CONNECTERROR                        (RID_FORMS_START + 92)
 #define RID_STR_DELETECONFIRM_RECORD                (RID_FORMS_START + 93)
 #define RID_STR_DELETECONFIRM                       (RID_FORMS_START + 94)
-#define RID_STR_PROPERTIES_COLUMN                   (RID_FORMS_START + 95)
 
 #define RID_STR_READONLY                            (RID_FORMS_START + 96)
 #define RID_STR_GROUPBOX                            (RID_FORMS_START + 97)
 #define RID_STR_TABINDEX                            (RID_FORMS_START + 98)
 #define RID_STR_NAVIGATION                          (RID_FORMS_START + 99)
 #define RID_STR_CYCLE                               (RID_FORMS_START +100)
-#define RID_STR_DIRTY                               (RID_FORMS_START +101)
-#define RID_STR_OLDVALUE                            (RID_FORMS_START +102)
 #define RID_STR_VALUE                               (RID_FORMS_START +103)
 #define RID_STR_FORMATKEY                           (RID_FORMS_START +104)
-#define RID_STR_REQUIRED                            (RID_FORMS_START +105)
-#define RID_STR_SCALE                               (RID_FORMS_START +106)
 #define RID_STR_SIZE                                (RID_FORMS_START +107)
-#define RID_STR_UNIQUE                              (RID_FORMS_START +108)
 #define RID_STR_CLASSID                             (RID_FORMS_START +109)
-#define RID_STR_LEFT                                (RID_FORMS_START +110)
-#define RID_STR_RIGHT                               (RID_FORMS_START +111)
 #define RID_STR_HEIGHT                              (RID_FORMS_START +112)
 #define RID_STR_WIDTH                               (RID_FORMS_START +113)
-#define RID_STR_LISTINDEX                           (RID_FORMS_START +114)
+    // free
 #define RID_STR_ROWHEIGHT                           (RID_FORMS_START +115)
 #define RID_STR_FILLCOLOR                           (RID_FORMS_START +116)
 #define RID_STR_TEXTCOLOR                           (RID_FORMS_START +117)
@@ -258,17 +215,9 @@
 #define RID_STR_SUBMIT_ENCODING                     (RID_FORMS_START +125)
 #define RID_STR_DEFAULTVALUE                        (RID_FORMS_START +126)
 #define RID_STR_SUBMIT_TARGET                       (RID_FORMS_START +127)
-#define RID_STR_ENUM_BUTTONTYPE                     (RID_FORMS_START +128)
-#define RID_STR_ENUM_SUBMIT_METHOD                  (RID_FORMS_START +129)
-#define RID_STR_ENUM_SUBMIT_ENCODING                (RID_FORMS_START +130)
 #define RID_STR_DEFAULT_CHECKED                     (RID_FORMS_START +131)
-#define RID_STR_ENUM_SUBMIT_TARGET                  (RID_FORMS_START +132)
 #define RID_STR_IMAGE_URL                           (RID_FORMS_START +133)
-#define RID_STR_STRING_ITEM_LIST                    (RID_FORMS_START +134)
 #define RID_STR_DEFAULT_SELECT_SEQ                  (RID_FORMS_START +135)
-#define RID_STR_DEFAULT_FORM_NAME                   (RID_FORMS_START +136)
-#define RID_STR_DEFAULT_CONTROL_NAME                (RID_FORMS_START +137)
-#define RID_STR_STANDARD                            (RID_FORMS_START +138)
 #define RID_STR_MULTISELECTION                      (RID_FORMS_START +139)
 
 #define RID_STR_DATE                                (RID_FORMS_START +140)
@@ -296,18 +245,12 @@
 #define RID_STR_PRINTABLE                           (RID_FORMS_START +162)
 #define RID_STR_TARGET_URL                          (RID_FORMS_START +163)
 #define RID_STR_TARGET_FRAME                        (RID_FORMS_START +164)
-#define RID_STR_IMPORT_GRAPHIC                      (RID_FORMS_START +165)
-#define RID_STR_DATEFORMAT_LIST                     (RID_FORMS_START +166)
-#define RID_STR_TIMEFORMAT_LIST                     (RID_FORMS_START +167)
 #define RID_STR_TAG                                 (RID_FORMS_START +168)
 #define RID_STR_ECHO_CHAR                           (RID_FORMS_START +169)
 #define RID_STR_EMPTY_IS_NULL                       (RID_FORMS_START +170)
 #define RID_STR_DECIMAL_ACCURACY                    (RID_FORMS_START +171)
     // FREE
-#define RID_STR_BORDER_TYPE                         (RID_FORMS_START +173)
-#define RID_STR_ENUM_CHECKED                        (RID_FORMS_START +174)
 #define RID_STR_DEFAULT_BUTTON                      (RID_FORMS_START +175)
-#define RID_STR_ENUM_CYCLE                          (RID_FORMS_START +176)
 
 #define RID_STR_PROPTITLE_PUSHBUTTON                (RID_FORMS_START +177)
 #define RID_STR_PROPTITLE_RADIOBUTTON               (RID_FORMS_START +178)
@@ -331,13 +274,7 @@
 #define RID_STR_DELETECONFIRM_RECORDS               (RID_FORMS_START +195)
 #define RID_STR_TRISTATE                            (RID_FORMS_START +196)
 #define RID_STR_CONTROL                             (RID_FORMS_START +197)
-#define RID_STR_NO_FORM_CONNECT                     (RID_FORMS_START +198)
-#define RID_STR_FIELD_NOT_FOUND                     (RID_FORMS_START +199)
-#define RID_STR_TABLE_NOT_FOUND                     (RID_FORMS_START +200)
-#define RID_STR_QUERY_NOT_FOUND                     (RID_FORMS_START +201)
-#define RID_STR_ENUM_NAVIGATION                     (RID_FORMS_START +202)
 
-#define RID_STR_RECORDSEARCH_DIRECTIONS             (RID_FORMS_START +203)
 #define RID_STR_RECORDSEARCH_METHODS                (RID_FORMS_START +204)
 #define RID_STR_RECORDSEARCH_BUTTONS                (RID_FORMS_START +205)
 #define RID_STR_SEARCH_OVERFLOW                     (RID_FORMS_START +206)
@@ -355,30 +292,19 @@
 
 #define RID_STR_PROPTITLE_FORMATTED                 (RID_FORMS_START +217)
 #define RID_STR_SYNTAXERROR                         (RID_FORMS_START +218)
-#define RID_STR_INSERTING_ALLOWED_ERROR             (RID_FORMS_START +219)
-#define RID_STR_UPDATING_ALLOWED_ERROR              (RID_FORMS_START +220)
-#define RID_STR_DELETING_ALLOWED_ERROR              (RID_FORMS_START +221)
 #define RID_STR_MOVING_CURSOR                       (RID_FORMS_START +222)
 
 #define RID_STR_NOCONTROLS_FOR_EXTERNALDISPLAY      (RID_FORMS_START +223)
 
 #define RID_STR_LABELCONTROL                        (RID_FORMS_START +224)
-#define RID_STR_VETO_DATASOURCE                     (RID_FORMS_START +225)
+    // free
 
 #define RID_STR_CURRSYM_POSITION                    (RID_FORMS_START +226)
-#define RID_STR_LIST_N_COMBO_FILLLIST               (RID_FORMS_START +227)
-#define RID_STR_COMMAND_TYPE                        (RID_FORMS_START +228)
 #define RID_STR_ESCAPE_PROCESSING                   (RID_FORMS_START +229)
 #define RID_STR_COULDNOTSETORDER                    (RID_FORMS_START +230)
 #define RID_STR_COULDNOTSETFILTER                   (RID_FORMS_START +231)
-#define RID_STR_SQLEXCEPTIONTYPES                   (RID_FORMS_START +232)
-#define RID_STR_ERR_INSERTRECORD                    (RID_FORMS_START +233)
-#define RID_STR_ERR_UPDATERECORD                    (RID_FORMS_START +234)
 #define RID_STR_ERR_DELETERECORD                    (RID_FORMS_START +235)
-#define RID_STR_ERR_DELETERECORDS                   (RID_FORMS_START +236)
 #define RID_STR_AUTOFIELD                           (RID_FORMS_START +237)
-#define RID_STR_CONTROL_SUBSTITUTED_NAME            (RID_FORMS_START +238)
-#define RID_STR_CONTROL_SUBSTITUTED_EPXPLAIN        (RID_FORMS_START +239)
 
 #define RID_STR_SVT_SQL_INTERNATIONAL               (RID_FORMS_START +240)
 #define RID_STR_SVT_SQL_SYNTAX_ERROR                (RID_FORMS_START +241)
@@ -421,68 +347,13 @@
 // Events
 #define RID_STR_EVT_START                           (RID_FORMS_START +400)
 
-#define RID_STR_EVT_ACTIONPERFORMED                 (RID_STR_EVT_START +  0)
-#define RID_STR_EVT_AFTERDELETE                     (RID_STR_EVT_START +  1)
-#define RID_STR_EVT_AFTERINSERT                     (RID_STR_EVT_START +  2)
-#define RID_STR_EVT_AFTERUPDATE                     (RID_STR_EVT_START +  3)
-#define RID_STR_EVT_BEFOREDELETE                    (RID_STR_EVT_START +  4)
-#define RID_STR_EVT_BEFOREINSERT                    (RID_STR_EVT_START +  5)
-#define RID_STR_EVT_BEFOREUPDATE                    (RID_STR_EVT_START +  6)
-#define RID_STR_EVT_COMPONENTHIDDEN                 (RID_STR_EVT_START +  7)
-#define RID_STR_EVT_COMPONENTMOVED                  (RID_STR_EVT_START +  8)
-#define RID_STR_EVT_COMPONENTPAINT                  (RID_STR_EVT_START +  9)
-#define RID_STR_EVT_COMPONENTRESIZED                (RID_STR_EVT_START + 10)
-#define RID_STR_EVT_COMPONENTSHOWN                  (RID_STR_EVT_START + 11)
-#define RID_STR_EVT_CONFIRMDELETE                   (RID_STR_EVT_START + 12)
-#define RID_STR_EVT_ELEMENTINSERTED                 (RID_STR_EVT_START + 13)
-#define RID_STR_EVT_ELEMENTREMOVED                  (RID_STR_EVT_START + 14)
-#define RID_STR_EVT_ELEMENTREPLACED                 (RID_STR_EVT_START + 15)
-#define RID_STR_EVT_ERROROCCURED                    (RID_STR_EVT_START + 16)
-#define RID_STR_EVT_FIRING                          (RID_STR_EVT_START + 17)
-#define RID_STR_EVT_FOCUSGAINED                     (RID_STR_EVT_START + 18)
-#define RID_STR_EVT_FOCUSLOST                       (RID_STR_EVT_START + 19)
-#define RID_STR_EVT_ITEMSTATECHANGED                (RID_STR_EVT_START + 20)
-#define RID_STR_EVT_KEYTYPED                        (RID_STR_EVT_START + 21)
-#define RID_STR_EVT_LOADED                          (RID_STR_EVT_START + 22)
-#define RID_STR_EVT_MOUSEDRAGGED                    (RID_STR_EVT_START + 23)
-#define RID_STR_EVT_MOUSEENTERED                    (RID_STR_EVT_START + 24)
-#define RID_STR_EVT_MOUSEEXITED                     (RID_STR_EVT_START + 25)
-#define RID_STR_EVT_MOUSEMOVED                      (RID_STR_EVT_START + 26)
-#define RID_STR_EVT_MOUSEPRESSED                    (RID_STR_EVT_START + 27)
-#define RID_STR_EVT_MOUSERELEASED                   (RID_STR_EVT_START + 28)
-#define RID_STR_EVT_POSITIONED                      (RID_STR_EVT_START + 29)
-#define RID_STR_EVT_PROPERTIESCHANGE                (RID_STR_EVT_START + 30)
-#define RID_STR_EVT_PROPERTYCHANGE                  (RID_STR_EVT_START + 31)
-#define RID_STR_EVT_PROPERTYSTATECHANGE             (RID_STR_EVT_START + 32)
-#define RID_STR_EVT_RESETTED                        (RID_STR_EVT_START + 33)
-#define RID_STR_EVT_SUBMITTED                       (RID_STR_EVT_START + 34)
-#define RID_STR_EVT_TEXTCHANGED                     (RID_STR_EVT_START + 35)
-#define RID_STR_EVT_UNLOADED                        (RID_STR_EVT_START + 36)
-#define RID_STR_EVT_UPDATECANCELED                  (RID_STR_EVT_START + 37)
-#define RID_STR_EVT_VETOABLECHANGE                  (RID_STR_EVT_START + 38)
-#define RID_STR_EVT_CHANGED                         (RID_STR_EVT_START + 39)
-#define RID_STR_EVT_APPROVERESETTED                 (RID_STR_EVT_START + 40)
-#define RID_STR_EVT_APPROVEACTIONPERFORMED          (RID_STR_EVT_START + 41)
-#define RID_STR_EVT_KEYUP                           (RID_STR_EVT_START + 42)
-#define RID_STR_EVT_APPROVEPARAMETER                (RID_STR_EVT_START + 43)
-#define RID_STR_EVT_POSITIONING                     (RID_STR_EVT_START + 44)
-#define RID_STR_EVT_APPROVEROWCHANGE                (RID_STR_EVT_START + 45)
-#define RID_STR_EVT_ROWCHANGE                       (RID_STR_EVT_START + 46)
-#define RID_STR_EVT_RELOADED                        (RID_STR_EVT_START + 47)
-#define RID_STR_EVT_UNLOADING                       (RID_STR_EVT_START + 48)
-#define RID_STR_EVT_RELOADING                       (RID_STR_EVT_START + 49)
 
 // Error-String-Id's -----------------------------------------------------------
 #define RID_ERR_START                               (RID_FORMS_START + 600)
 #define RID_ERR_CONTEXT_ADDFORM                     (RID_ERR_START + 0)
 #define RID_ERR_DUPLICATE_NAME                      (RID_ERR_START + 1)
 #define RID_ERR_FIELDREQUIRED                       (RID_ERR_START + 2)
-#define RID_ERR_NO_ELEMENT_TITLE                    (RID_ERR_START + 3)
 #define RID_ERR_NO_ELEMENT                          (RID_ERR_START + 4)
-#define RID_ERR_COULD_NOT_CONVERT_PARAM             (RID_ERR_START + 5)
-#define RID_ERR_REFRESHING_SUB_FORM                 (RID_ERR_START + 6)
-#define RID_ERR_LOADING_FORM                        (RID_ERR_START + 7)
-#define RID_ERR_REFRESHING_FORM                     (RID_ERR_START + 8)
 
 // Error-Id's  -----------------------------------------------------------
 
diff --git a/svx/source/inc/fmservs.hxx b/svx/source/inc/fmservs.hxx
index 20629988800f..40ec3c4654ff 100644
--- a/svx/source/inc/fmservs.hxx
+++ b/svx/source/inc/fmservs.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmservs.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: fs $ $Date: 2000-12-18 07:49:20 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -70,46 +70,6 @@ namespace svxform
 
     DECLARE_CONSTASCII_USTRING(FM_NUMBER_FORMATTER);
 
-    DECLARE_CONSTASCII_USTRING(VCL_CONTROL_EDIT);
-    DECLARE_CONSTASCII_USTRING(VCL_CONTROL_LISTBOX);
-    DECLARE_CONSTASCII_USTRING(VCL_CONTROL_COMBOBOX);
-    DECLARE_CONSTASCII_USTRING(VCL_CONTROL_RADIOBUTTON);
-    DECLARE_CONSTASCII_USTRING(VCL_CONTROL_GROUPBOX);
-    DECLARE_CONSTASCII_USTRING(VCL_CONTROL_FIXEDTEXT);
-    DECLARE_CONSTASCII_USTRING(VCL_CONTROL_COMMANDBUTTON);
-    DECLARE_CONSTASCII_USTRING(VCL_CONTROL_CHECKBOX);
-    DECLARE_CONSTASCII_USTRING(VCL_CONTROL_IMAGEBUTTON);
-    DECLARE_CONSTASCII_USTRING(VCL_CONTROL_FILECONTROL);
-    DECLARE_CONSTASCII_USTRING(VCL_CONTROL_TIMEFIELD);
-    DECLARE_CONSTASCII_USTRING(VCL_CONTROL_DATEFIELD);
-    DECLARE_CONSTASCII_USTRING(VCL_CONTROL_NUMERICFIELD);
-    DECLARE_CONSTASCII_USTRING(VCL_CONTROL_CURRENCYFIELD);
-    DECLARE_CONSTASCII_USTRING(VCL_CONTROL_PATTERNFIELD);
-    DECLARE_CONSTASCII_USTRING(VCL_CONTROL_FORMATTEDFIELD);
-    DECLARE_CONSTASCII_USTRING(VCL_CONTROL_IMAGECONTROL);
-
-    DECLARE_CONSTASCII_USTRING(VCL_CONTROLMODEL_EDIT);
-    DECLARE_CONSTASCII_USTRING(VCL_CONTROLMODEL_LISTBOX);
-    DECLARE_CONSTASCII_USTRING(VCL_CONTROLMODEL_COMBOBOX);
-    DECLARE_CONSTASCII_USTRING(VCL_CONTROLMODEL_RADIOBUTTON);
-    DECLARE_CONSTASCII_USTRING(VCL_CONTROLMODEL_GROUPBOX);
-    DECLARE_CONSTASCII_USTRING(VCL_CONTROLMODEL_FIXEDTEXT);
-    DECLARE_CONSTASCII_USTRING(VCL_CONTROLMODEL_COMMANDBUTTON);
-    DECLARE_CONSTASCII_USTRING(VCL_CONTROLMODEL_CHECKBOX);
-    DECLARE_CONSTASCII_USTRING(VCL_CONTROLMODEL_IMAGEBUTTON);
-    DECLARE_CONSTASCII_USTRING(VCL_CONTROLMODEL_FILECONTROL);
-    DECLARE_CONSTASCII_USTRING(VCL_CONTROLMODEL_TIMEFIELD);
-    DECLARE_CONSTASCII_USTRING(VCL_CONTROLMODEL_DATEFIELD);
-    DECLARE_CONSTASCII_USTRING(VCL_CONTROLMODEL_NUMERICFIELD);
-    DECLARE_CONSTASCII_USTRING(VCL_CONTROLMODEL_CURRENCYFIELD);
-    DECLARE_CONSTASCII_USTRING(VCL_CONTROLMODEL_PATTERNFIELD);
-    DECLARE_CONSTASCII_USTRING(VCL_CONTROLMODEL_FORMATTEDFIELD);
-    DECLARE_CONSTASCII_USTRING(VCL_CONTROLMODEL_IMAGECONTROL);
-
-    DECLARE_CONSTASCII_USTRING(AWT_CONTROL_TEXTFIELD);
-
-    DECLARE_CONSTASCII_USTRING(FM_COMPONENT_FORM);
-
     DECLARE_CONSTASCII_USTRING(FM_COMPONENT_EDIT);      // alter service name (5.0)
     DECLARE_CONSTASCII_USTRING(FM_COMPONENT_TEXTFIELD);
 
@@ -138,41 +98,13 @@ namespace svxform
 
     DECLARE_CONSTASCII_USTRING(FM_COMPONENT_IMAGECONTROL);
 
-    DECLARE_CONSTASCII_USTRING(FM_CONTROL_LISTBOX);
-    DECLARE_CONSTASCII_USTRING(FM_CONTROL_RADIOBUTTON);
-    DECLARE_CONSTASCII_USTRING(FM_CONTROL_COMBOBOX);
-    DECLARE_CONSTASCII_USTRING(FM_CONTROL_GROUPBOX);
-    DECLARE_CONSTASCII_USTRING(FM_CONTROL_CHECKBOX);
-    DECLARE_CONSTASCII_USTRING(FM_CONTROL_FIXEDTEXT);
-    DECLARE_CONSTASCII_USTRING(FM_CONTROL_COMMANDBUTTON);
-
     DECLARE_CONSTASCII_USTRING(FM_CONTROL_GRID);
     DECLARE_CONSTASCII_USTRING(FM_CONTROL_GRIDCONTROL);
 
-    DECLARE_CONSTASCII_USTRING(FM_CONTROL_IMAGEBUTTON);
-
-    DECLARE_CONSTASCII_USTRING(FM_CONTROL_EDIT);      // alt
-    DECLARE_CONSTASCII_USTRING(FM_CONTROL_TEXTFIELD);
-
-    DECLARE_CONSTASCII_USTRING(FM_CONTROL_TIMEFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_CONTROL_DATEFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_CONTROL_NUMERICFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_CONTROL_CURRENCYFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_CONTROL_PATTERNFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_CONTROL_FILECONTROL);
-    DECLARE_CONSTASCII_USTRING(FM_CONTROL_IMAGECONTROL);
-    DECLARE_CONSTASCII_USTRING(FM_CONTROL_FORMATTEDFIELD);
-
     DECLARE_CONSTASCII_USTRING(FM_FORM_CONTROLLER);
-    DECLARE_CONSTASCII_USTRING(SRV_SDB_ROWSET);
     DECLARE_CONSTASCII_USTRING(SRV_SDB_CONNECTION);
-    DECLARE_CONSTASCII_USTRING(SRV_SDBC_STATEMENT);
-    DECLARE_CONSTASCII_USTRING(SRV_SDB_DATABASE_ENVIRONMENT);
-    DECLARE_CONSTASCII_USTRING(SRV_SDB_DATABASE_ACCESS_CONNECTION);
-    DECLARE_CONSTASCII_USTRING(SRV_SDB_DATABASE_CONTEXT);
     DECLARE_CONSTASCII_USTRING(SRV_SDB_INTERACTION_HANDLER);
 
-
     DECLARE_CONSTASCII_USTRING(FM_SUN_COMPONENT_FORM);
     DECLARE_CONSTASCII_USTRING(FM_SUN_COMPONENT_TEXTFIELD);
     DECLARE_CONSTASCII_USTRING(FM_SUN_COMPONENT_LISTBOX);
@@ -194,23 +126,7 @@ namespace svxform
     DECLARE_CONSTASCII_USTRING(FM_SUN_COMPONENT_IMAGECONTROL);
     DECLARE_CONSTASCII_USTRING(FM_SUN_COMPONENT_FORMATTEDFIELD);
 
-    DECLARE_CONSTASCII_USTRING(FM_SUN_CONTROL_TEXTFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_CONTROL_LISTBOX);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_CONTROL_COMBOBOX);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_CONTROL_RADIOBUTTON);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_CONTROL_GROUPBOX);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_CONTROL_FIXEDTEXT);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_CONTROL_COMMANDBUTTON);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_CONTROL_CHECKBOX);
     DECLARE_CONSTASCII_USTRING(FM_SUN_CONTROL_GRIDCONTROL);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_CONTROL_IMAGEBUTTON);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_CONTROL_TIMEFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_CONTROL_DATEFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_CONTROL_NUMERICFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_CONTROL_CURRENCYFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_CONTROL_PATTERNFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_CONTROL_IMAGECONTROL);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_CONTROL_FORMATTEDFIELD);
 
     void ImplSmartRegisterUnoServices();
 
diff --git a/svx/source/inc/fmsrcimp.hxx b/svx/source/inc/fmsrcimp.hxx
index 737864823296..86c593e01e21 100644
--- a/svx/source/inc/fmsrcimp.hxx
+++ b/svx/source/inc/fmsrcimp.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmsrcimp.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: hr $ $Date: 2001-10-22 16:30:02 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -104,6 +104,9 @@
 #ifndef _UNOTOOLS_CHARCLASS_HXX
 #include <unotools/charclass.hxx>
 #endif
+#ifndef _UNOTOOLS_COLLATORWRAPPER_HXX
+#include <unotools/collatorwrapper.hxx>
+#endif
 
 // ===================================================================================================
 // Hilfsstrukturen
@@ -248,6 +251,7 @@ class FmSearchEngine
     ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >        m_xFormatter;
 
     CharClass               m_aCharacterClassficator;
+    CollatorWrapper         m_aStringCompare;
 
     // die Sammlung aller interesanten Felder (bzw. ihre ::com::sun::star::data::XDatabaseVariant-Interfaces und ihre FormatKeys)
     struct FieldInfo
diff --git a/svx/source/inc/fmtools.hxx b/svx/source/inc/fmtools.hxx
index 41cff0b3b566..d7be60ced379 100644
--- a/svx/source/inc/fmtools.hxx
+++ b/svx/source/inc/fmtools.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmtools.hxx,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: fs $ $Date: 2002-10-14 13:48:58 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -186,10 +186,6 @@
 #include <sfx2/ctrlitem.hxx>
 #endif
 
-//  #ifndef _USR_ITERHLP_HXX //autogen wg. OInterfaceContainerHelper
-//  #include <usr/iterhlp.hxx>
-//  #endif
-
 #ifndef _LINK_HXX
 #include <tools/link.hxx>
 #endif
@@ -286,27 +282,10 @@ namespace svxform
 
 
 // Kopieren von Persistenten Objecten
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> clone(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XPersistObject>& _xObj);
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> cloneUsingProperties(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XPersistObject>& _xObj);
-void CloneForms(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer>& _xSource, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer>& _xDest);
-
-// Suchen eines Wertes in einer StringListe
-// Fehler 0xFFFFFFFF (LIST_ENTRY_NOTFOUND)
-//------------------------------------------------------------------------------
-sal_uInt32 findValue(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>& rList, const ::com::sun::star::uno::Any& rValue);
-
-::com::sun::star::uno::Sequence<sal_Int16> findValueINT16(const ::com::sun::star::uno::Sequence< ::rtl::OUString>& rList, const ::rtl::OUString& rValue, sal_Bool bOnlyFirst=sal_False );
-::com::sun::star::uno::Sequence<sal_Int16> findValue(const ::com::sun::star::uno::Sequence< ::rtl::OUString>& rList, const ::rtl::OUString& rValue, sal_Bool bOnlyFirst=sal_False );
-
-sal_uInt32 findValue1(const ::com::sun::star::uno::Sequence< ::rtl::OUString>& rList, const ::rtl::OUString& rValue);
-
-// geht von einer sortierten !!! sequence aus
-sal_Bool hasString(const ::rtl::OUString& aStr, const ::com::sun::star::uno::Sequence< ::rtl::OUString>& rList);
 
 sal_Int32 findPos(const ::rtl::OUString& aStr, const ::com::sun::star::uno::Sequence< ::rtl::OUString>& rList);
 
-//  void checkArg(const ::com::sun::star::uno::Any& Element, Reflection* pRefl) throw( ::com::sun::star::lang::IllegalArgumentException );
-
 // Suchen in einer Indexliste nach einem Element
 sal_Bool  searchElement(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& xCont, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xElement);
 
@@ -319,13 +298,6 @@ String getFormComponentAccessPath(const ::com::sun::star::uno::Reference< ::com:
 ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel> getXModel(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xIface);
 
 ::rtl::OUString getLabelName(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& xControlModel);
-::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> findConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xParent);
-
-// date conversion
-extern Date STANDARD_DATE;
-double ToStandardDate(const Date& rNullDate, double rVal);
-double ToNullDate(const Date& rNullDate, double rVal);
-
 
 // ===================================================================================================
 // = class CursorWrapper - eine Hilfsklasse, die parallel mit je einem ::com::sun::star::uno::Reference<XDatabaseUpdateCursor>,
@@ -391,7 +363,6 @@ public:
     sal_Bool isFirst() const                    { return m_xMoveOperations->isFirst(); }
     sal_Bool isLast() const                     { return m_xMoveOperations->isLast(); }
     void beforeFirst()                          { m_xMoveOperations->beforeFirst(); }
-//  void moveAfterLast()                    { m_xMoveOperations->moveAfterLast(); }
     sal_Bool first()                            { return m_xMoveOperations->first(); }
     sal_Bool last()                             { return m_xMoveOperations->last(); }
     sal_Int32 getRow() const                    { return m_xMoveOperations->getRow(); }
@@ -411,55 +382,6 @@ private:
 };
 
 
-//==================================================================
-// FmXSequenceIndexAccess - a class which wraps a ::com::sun::star::uno::Sequence so it's
-// elements may be accessed via XIndexAccess-methods
-//==================================================================
-
-template <class ElementType>
-class FmXSequenceIndexAccess : public ::cppu::WeakImplHelper1< ::com::sun::star::container::XIndexAccess>
-{
-    ::com::sun::star::uno::Sequence<ElementType>    m_aElements;
-
-public:
-    FmXSequenceIndexAccess(const ::com::sun::star::uno::Sequence<ElementType>& _rElements) : m_aElements(_rElements) { }
-
-    // UNO
-    DECLARE_UNO3_DEFAULTS(FmXSequenceIndexAccess, cppu::WeakImplHelper1< ::com::sun::star::container::XIndexAccess> );
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException );
-
-    // XIndexAccess
-    virtual sal_Int32 getCount(void) const throw( ::com::sun::star::uno::RuntimeException ) { return m_aElements.getLength(); }
-    virtual ::com::sun::star::uno::Any getByIndex(sal_Int32 Index) const throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException )
-    {   // we implement this in-place as MSVC41 doesn't like a non-in-place template implementation with a throw-clause
-        if ((Index < 0) || (Index >= getCount()))
-        {
-            throw ::com::sun::star::lang::IndexOutOfBoundsException();
-        }
-
-        return ::com::sun::star::uno::Any(m_aElements.getConstArray() + Index, ::getReflection((ElementType*)NULL));
-    }
-
-    // XElementAccess
-    virtual ::com::sun::star::uno::Type SAL_CALL getElementType(  ) throw(::com::sun::star::uno::RuntimeException)
-    { return ::getCppuType((ElementType*)NULL); }
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(::com::sun::star::uno::RuntimeException)
-    { return m_aElements.getLength() > 0; }
-
-protected:
-    ~FmXSequenceIndexAccess() { }
-};
-
-//------------------------------------------------------------------
-template <class ElementType>
-::com::sun::star::uno::Any SAL_CALL FmXSequenceIndexAccess<ElementType>::queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException )
-{
-    return cppu::WeakImplHelper1< ::com::sun::star::container::XIndexAccess >::queryInterface(type);
-}
-
-//==================================================================
-// Einfacher Adapter fuer Components
-//==================================================================
 class FmXDisposeMultiplexer;
 class FmXDisposeListener
 {
@@ -653,350 +575,22 @@ protected:
 };
 
 //==================================================================
-// Stringkonvertierung
-//==================================================================
-::rtl::OUString AnyToStr( const ::com::sun::star::uno::Any& aValue);
-::com::sun::star::uno::Any StringToAny( ::rtl::OUString aStr, ::com::sun::star::uno::TypeClass eTargetType );
-::com::sun::star::uno::Sequence< ::rtl::OUString> getEventMethods(const ::com::sun::star::uno::Type& type);
-
-//==================================================================
 // ...
 //==================================================================
-//sal_Int16 getControlTypeByModelName(const ::rtl::OUString& rModel);
-//::rtl::OUString   getModelNameByControlType(sal_Int16 nType);
 ::rtl::OUString     getServiceNameByControlType(sal_Int16 nType);
     // get a service name to create a model of the given type (OBJ_FM_...)
 sal_Int16       getControlTypeByObject(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo>& _rxObject);
     // get the object type (OBJ_FM_...) from the services the object supports
 
-//  void TransferFormComponentProperties(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& xOld, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& xNew);
 void TransferEventScripts(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>& xModel, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl,
     const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor>& rTransferIfAvailable);
 
-sal_Int16   GridModel2ViewPos(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& rColumns, sal_Int16 nModelPos);
 sal_Int16   GridView2ModelPos(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& rColumns, sal_Int16 nViewPos);
-sal_Int16   GridViewColumnCount(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& rColumns);
 
 //==================================================================
 sal_Bool isLoadable(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xLoad);
 sal_Bool isRowSetAlive(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rxRowSet);
     // checks if the ::com::sun::star::sdbcx::XColumnsSupplier provided by _rxRowSet supllies any columns
 
-
-//==================================================================
-//= a class wrapping an object implementing a sdb::DataColumn service
-//==================================================================
-class DataColumn
-{
-    // interfaces needed for sddb::Column
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>                m_xPropertySet;
-    // interfaces needed for sdb::DataColumn
-    ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>                   m_xColumn;
-    ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumnUpdate>         m_xColumnUpdate;
-
-public:
-    DataColumn() { };
-    DataColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxIFace);
-    // if the object behind _rxIFace doesn't fully support the DataColumn service,
-    // (which is checked via the supported interfaces) _all_ members will be set to
-    // void !, even if the object has some of the needed interfaces.
-
-    sal_Bool is() const { return m_xColumn.is(); }
-    sal_Bool Is() const { return m_xColumn.is(); }
-    sal_Bool supportsUpdate() const { return m_xColumnUpdate.is(); }
-
-    DataColumn* operator ->() { return this; }
-    //  operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> () const { return ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xColumn; }
-    operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> () const{ return m_xColumn;; }
-
-    // 'conversions'
-    operator const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>&() const                { return m_xPropertySet; }
-    operator const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>&() const                   { return m_xColumn; }
-    operator const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumnUpdate>&() const
-    {
-        DBG_ASSERT(m_xColumnUpdate.is() , "operator XColumnUpdate(): is NULL!");
-        return m_xColumnUpdate;
-    }
-
-    // das normale queryInterface
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException )
-    { return m_xColumn->queryInterface(type); }
-
-    // ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>
-    inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> getPropertySetInfo() const throw( ::com::sun::star::uno::RuntimeException );
-    inline void setPropertyValue(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue) throw( ::com::sun::star::beans::UnknownPropertyException,  ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-    inline ::com::sun::star::uno::Any getPropertyValue(const ::rtl::OUString& PropertyName) const throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-    inline void addPropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener>& xListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-    inline void removePropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener>& aListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-    inline void addVetoableChangeListener(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener>& aListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-    inline void removeVetoableChangeListener(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener>& aListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-
-    // ::com::sun::star::sdb::XColumn
-    inline sal_Bool wasNull() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline ::rtl::OUString getString() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline sal_Bool getBoolean() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline sal_Int8 getByte() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline sal_Int16 getShort() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline sal_Int32 getInt() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline sal_Int64 getLong() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline float getFloat() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline double getDouble() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline ::com::sun::star::uno::Sequence< sal_Int8 > getBytes() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline ::com::sun::star::util::Date getDate() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline ::com::sun::star::util::Time getTime() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline ::com::sun::star::util::DateTime  getTimestamp() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream> getBinaryStream() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream> getCharacterStream() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline ::com::sun::star::uno::Any getObject(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& typeMap) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef> getRef() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob> getBlob() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob> getClob() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray> getArray() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-
-    // XColumnUpdate
-    inline void updateNull(void) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline void updateBoolean(sal_Bool x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline void updateByte(sal_Int8 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline void updateShort(sal_Int16 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline void updateInt(sal_Int32 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline void updateLong(sal_Int64 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline void updateFloat(float x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline void updateDouble(double x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline void updateString(const ::rtl::OUString& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline void updateBytes(const ::com::sun::star::uno::Sequence< sal_Int8 >& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline void updateDate(const com::sun::star::util::Date& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline void updateTime(const ::com::sun::star::util::Time& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline void updateTimestamp(const ::com::sun::star::util::DateTime& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline void updateBinaryStream(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>& x, sal_Int32 length) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline void updateCharacterStream(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>& x, sal_Int32 length) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline void updateObject(const ::com::sun::star::uno::Any& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-    inline void updateNumericObject(const ::com::sun::star::uno::Any& x, sal_Int32 scale) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-};
-
-// ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>
-::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> DataColumn::getPropertySetInfo() const throw( ::com::sun::star::uno::RuntimeException )
-{
-    return m_xPropertySet->getPropertySetInfo();
-}
-
-void DataColumn::setPropertyValue(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue) throw( ::com::sun::star::beans::UnknownPropertyException,  ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException )
-{
-    m_xPropertySet->setPropertyValue(aPropertyName, aValue);
-}
-
-::com::sun::star::uno::Any DataColumn::getPropertyValue(const ::rtl::OUString& PropertyName) const throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException )
-{
-    return m_xPropertySet->getPropertyValue(PropertyName);
-}
-
-void DataColumn::addPropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener>& xListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException )
-{
-    m_xPropertySet->addPropertyChangeListener(aPropertyName, xListener);
-}
-
-void DataColumn::removePropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener>& aListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException )
-{
-    m_xPropertySet->removePropertyChangeListener(aPropertyName, aListener);
-}
-
-void DataColumn::addVetoableChangeListener(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener>& aListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException )
-{
-    m_xPropertySet->addVetoableChangeListener(PropertyName, aListener);
-}
-
-void DataColumn::removeVetoableChangeListener(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener>& aListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException )
-{
-    m_xPropertySet->removeVetoableChangeListener(PropertyName, aListener);
-}
-
-// ::com::sun::star::sdb::XColumn
-sal_Bool DataColumn::wasNull() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    return m_xColumn->wasNull();
-}
-
-::rtl::OUString DataColumn::getString() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    return m_xColumn->getString();
-}
-
-sal_Bool DataColumn::getBoolean() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    return m_xColumn->getBoolean();
-}
-
-sal_Int8 DataColumn::getByte() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    return m_xColumn->getByte();
-}
-
-sal_Int16 DataColumn::getShort() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    return m_xColumn->getShort();
-}
-
-sal_Int32 DataColumn::getInt() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    return m_xColumn->getInt();
-}
-
-sal_Int64 DataColumn::getLong() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    return m_xColumn->getLong();
-}
-
-float DataColumn::getFloat() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    return m_xColumn->getFloat();
-}
-
-double DataColumn::getDouble() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    return m_xColumn->getDouble();
-}
-
-::com::sun::star::uno::Sequence< sal_Int8 > DataColumn::getBytes() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    return m_xColumn->getBytes();
-}
-
-::com::sun::star::util::Date DataColumn::getDate() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    return m_xColumn->getDate();
-}
-
-::com::sun::star::util::Time DataColumn::getTime() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    return m_xColumn->getTime();
-}
-
-::com::sun::star::util::DateTime DataColumn::getTimestamp() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    return m_xColumn->getTimestamp();
-}
-
-::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream> DataColumn::getBinaryStream() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    return m_xColumn->getBinaryStream();
-}
-
-::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream> DataColumn::getCharacterStream() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    return m_xColumn->getCharacterStream();
-}
-
-::com::sun::star::uno::Any DataColumn::getObject(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& typeMap) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    return m_xColumn->getObject(typeMap);
-}
-
-::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef> DataColumn::getRef() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    return m_xColumn->getRef();
-}
-
-::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob> DataColumn::getBlob() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    return m_xColumn->getBlob();
-}
-
-::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob> DataColumn::getClob() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    return m_xColumn->getClob();
-}
-
-::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray> DataColumn::getArray() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    return m_xColumn->getArray();
-}
-
-// XColumnUpdate
-void DataColumn::updateNull() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    m_xColumnUpdate->updateNull();
-}
-
-void DataColumn::updateBoolean(sal_Bool x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    m_xColumnUpdate->updateBoolean(x);
-}
-
-void DataColumn::updateByte(sal_Int8 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    m_xColumnUpdate->updateByte(x);
-}
-
-void DataColumn::updateShort(sal_Int16 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    m_xColumnUpdate->updateShort(x);
-}
-
-void DataColumn::updateInt(sal_Int32 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    m_xColumnUpdate->updateInt(x);
-}
-
-void DataColumn::updateLong(sal_Int64 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    m_xColumnUpdate->updateLong(x);
-}
-
-void DataColumn::updateFloat(float x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    m_xColumnUpdate->updateFloat(x);
-}
-
-void DataColumn::updateDouble(double x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    m_xColumnUpdate->updateDouble(x);
-}
-
-void DataColumn::updateString(const ::rtl::OUString& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    m_xColumnUpdate->updateString(x);
-}
-
-void DataColumn::updateBytes(const ::com::sun::star::uno::Sequence< sal_Int8 >& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    m_xColumnUpdate->updateBytes(x);
-}
-
-void DataColumn::updateDate(const com::sun::star::util::Date& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    m_xColumnUpdate->updateDate(x);
-}
-
-void DataColumn::updateTime(const ::com::sun::star::util::Time& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    m_xColumnUpdate->updateTime(x);
-}
-
-void DataColumn::updateTimestamp(const ::com::sun::star::util::DateTime& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    m_xColumnUpdate->updateTimestamp(x);
-}
-
-void DataColumn::updateBinaryStream(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>& x, sal_Int32 length) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    m_xColumnUpdate->updateBinaryStream(x, length);
-}
-
-void DataColumn::updateCharacterStream(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>& x, sal_Int32 length) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    m_xColumnUpdate->updateCharacterStream(x, length);
-}
-
-void DataColumn::updateObject(const ::com::sun::star::uno::Any& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    m_xColumnUpdate->updateObject(x);
-}
-
-void DataColumn::updateNumericObject(const ::com::sun::star::uno::Any& x, sal_Int32 scale) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
-{
-    m_xColumnUpdate->updateNumericObject(x, scale);
-}
-
-
-
 #endif // _SVX_FMTOOLS_HXX
 
diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx
index 236d9693cec9..ace4783b2e09 100644
--- a/svx/source/inc/fmundo.hxx
+++ b/svx/source/inc/fmundo.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmundo.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: hjs $ $Date: 2001-09-12 18:11:08 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,9 +68,6 @@
 #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
 #include <com/sun/star/beans/XPropertySet.hpp>
 #endif
-#ifndef _COM_SUN_STAR_BEANS_XVETOABLECHANGELISTENER_HPP_
-#include <com/sun/star/beans/XVetoableChangeListener.hpp>
-#endif
 #ifndef _COM_SUN_STAR_BEANS_XPROPERTYCHANGELISTENER_HPP_
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #endif
@@ -99,7 +96,9 @@
 #include <com/sun/star/container/XNameContainer.hpp>
 #endif
 
-#include <cppuhelper/implbase4.hxx>
+#ifndef _CPPUHELPER_IMPLBASE3_HXX_
+#include <cppuhelper/implbase3.hxx>
+#endif
 
 
 
@@ -196,11 +195,12 @@ public:
 };
 
 //========================================================================
-class FmXUndoEnvironment : public ::cppu::WeakImplHelper4< ::com::sun::star::beans::XVetoableChangeListener,
-                            ::com::sun::star::beans::XPropertyChangeListener,
-                           ::com::sun::star::container::XContainerListener,
-                           ::com::sun::star::script::XScriptListener>,
-                           public SfxListener
+class FmXUndoEnvironment
+    : public ::cppu::WeakImplHelper3<   ::com::sun::star::beans::XPropertyChangeListener
+                                    ,   ::com::sun::star::container::XContainerListener
+                                    ,   ::com::sun::star::script::XScriptListener
+                                    >
+    , public SfxListener
                            //   public ::cppu::OWeakObject
 {
     friend class FmFormModel;
@@ -234,9 +234,6 @@ protected:
 // ::com::sun::star::beans::XPropertyChangeListener
     virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException);
 
-// XVetoableChangeListener
-    virtual void SAL_CALL vetoableChange(const ::com::sun::star::beans::PropertyChangeEvent& aEvent) throw( ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException );
-
 // ::com::sun::star::container::XContainerListener
     virtual void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException);
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index 8a8049ee1f4d..39d42480b56b 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmvwimp.hxx,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: oj $ $Date: 2002-11-22 12:45:15 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -196,6 +196,7 @@ class FmXFormView : public ::cppu::WeakImplHelper3<
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >    m_xORB;
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>                   m_xWindow;
 
+    FmFormObj*      m_pMarkedGrid;
     FmFormView*     m_pView;
     sal_uInt32      m_nActivationEvent;
     sal_uInt32      m_nErrorMessageEvent;   // event for an asynchronous error message. See also m_aAsyncError
diff --git a/svx/source/inc/sdbdatacolumn.hxx b/svx/source/inc/sdbdatacolumn.hxx
new file mode 100644
index 000000000000..e5a71a3d0d57
--- /dev/null
+++ b/svx/source/inc/sdbdatacolumn.hxx
@@ -0,0 +1,183 @@
+/*************************************************************************
+ *
+ *  $RCSfile: sdbdatacolumn.hxx,v $
+ *
+ *  $Revision: 1.2 $
+ *
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:20 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  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., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#ifndef SVX_FORM_SDBDATACOLUMN_HXX
+#define SVX_FORM_SDBDATACOLUMN_HXX
+
+#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
+#include <com/sun/star/beans/XPropertySet.hpp>
+#endif
+#ifndef _COM_SUN_STAR_SDB_XCOLUMN_HPP_
+#include <com/sun/star/sdb/XColumn.hpp>
+#endif
+#ifndef _COM_SUN_STAR_SDB_XCOLUMNUPDATE_HPP_
+#include <com/sun/star/sdb/XColumnUpdate.hpp>
+#endif
+#ifndef _OSL_DIAGNOSE_H_
+#include <osl/diagnose.h>
+#endif
+
+//..............................................................................
+namespace svxform
+{
+//..............................................................................
+
+    //==========================================================================
+    //= DataColumn - a class wrapping an object implementing a sdb::DataColumn service
+    //==========================================================================
+    class DataColumn
+    {
+        // interfaces needed for sddb::Column
+        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>    m_xPropertySet;
+        // interfaces needed for sdb::DataColumn
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>           m_xColumn;
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumnUpdate>     m_xColumnUpdate;
+
+    public:
+        DataColumn() { };
+        DataColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxIFace);
+        // if the object behind _rxIFace doesn't fully support the DataColumn service,
+        // (which is checked via the supported interfaces) _all_ members will be set to
+        // void !, even if the object has some of the needed interfaces.
+
+        sal_Bool is() const { return m_xColumn.is(); }
+        sal_Bool Is() const { return m_xColumn.is(); }
+        sal_Bool supportsUpdate() const { return m_xColumnUpdate.is(); }
+
+        DataColumn* operator ->() { return this; }
+        //  operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> () const { return ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xColumn; }
+        operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> () const{ return m_xColumn;; }
+
+        // 'conversions'
+        inline const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& getPropertySet() const
+        {
+            return m_xPropertySet;
+        }
+        inline const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>& getColumn() const
+        {
+            return m_xColumn;
+        }
+        inline const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumnUpdate>& getColumnUpdate() const
+        {
+            OSL_ENSURE(m_xColumnUpdate.is() , "DataColumn::getColumnUpdate: NULL!");
+            return m_xColumnUpdate;
+        }
+
+        // das normale queryInterface
+        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException )
+        { return m_xColumn->queryInterface(type); }
+
+        // ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>
+        inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> getPropertySetInfo() const throw( ::com::sun::star::uno::RuntimeException );
+        inline void setPropertyValue(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue) throw( ::com::sun::star::beans::UnknownPropertyException,  ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
+        inline ::com::sun::star::uno::Any getPropertyValue(const ::rtl::OUString& PropertyName) const throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
+        inline void addPropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener>& xListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
+        inline void removePropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener>& aListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
+        inline void addVetoableChangeListener(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener>& aListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
+        inline void removeVetoableChangeListener(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener>& aListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
+
+        // ::com::sun::star::sdb::XColumn
+        inline sal_Bool wasNull() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline ::rtl::OUString getString() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline sal_Bool getBoolean() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline sal_Int8 getByte() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline sal_Int16 getShort() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline sal_Int32 getInt() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline sal_Int64 getLong() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline float getFloat() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline double getDouble() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline ::com::sun::star::uno::Sequence< sal_Int8 > getBytes() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline ::com::sun::star::util::Date getDate() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline ::com::sun::star::util::Time getTime() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline ::com::sun::star::util::DateTime  getTimestamp() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream> getBinaryStream() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream> getCharacterStream() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline ::com::sun::star::uno::Any getObject(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& typeMap) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef> getRef() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob> getBlob() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob> getClob() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray> getArray() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+
+        // XColumnUpdate
+        inline void updateNull(void) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline void updateBoolean(sal_Bool x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline void updateByte(sal_Int8 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline void updateShort(sal_Int16 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline void updateInt(sal_Int32 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline void updateLong(sal_Int64 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline void updateFloat(float x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline void updateDouble(double x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline void updateString(const ::rtl::OUString& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline void updateBytes(const ::com::sun::star::uno::Sequence< sal_Int8 >& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline void updateDate(const com::sun::star::util::Date& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline void updateTime(const ::com::sun::star::util::Time& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline void updateTimestamp(const ::com::sun::star::util::DateTime& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline void updateBinaryStream(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>& x, sal_Int32 length) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline void updateCharacterStream(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>& x, sal_Int32 length) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline void updateObject(const ::com::sun::star::uno::Any& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+        inline void updateNumericObject(const ::com::sun::star::uno::Any& x, sal_Int32 scale) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+    };
+
+#endif // SVX_FORM_SDBDATACOLUMN_HXX
+
+//..............................................................................
+}   // namespace svxform
+//..............................................................................
diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx
index 5ba5ac5b98d9..1ab3b0acd70c 100644
--- a/svx/source/inc/svxrectctaccessiblecontext.hxx
+++ b/svx/source/inc/svxrectctaccessiblecontext.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svxrectctaccessiblecontext.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: os $ $Date: 2002-10-29 15:19:12 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -391,8 +391,8 @@ private:
     /// array for all possible childs
     SvxRectCtlChildAccessibleContext**  mpChilds;
 
-    /// List of property change listeners.
-    cppu::OInterfaceContainerHelper*    mpEventListeners;
+    /// client id in the AccessibleEventNotifier queue
+    sal_uInt32 mnClientId;
 
     /// actual selected child
     long                                mnSelectedChild;
@@ -575,6 +575,8 @@ protected:
 
     void CommitChange( const drafts::com::sun::star::accessibility::AccessibleEventObject& rEvent );
 
+    virtual void SAL_CALL disposing();
+
     /// @returns true if it's disposed or in disposing
     inline sal_Bool IsAlive( void ) const;
 
@@ -610,8 +612,8 @@ private:
     /// window of parent
     const Window&                       mrParentWindow;
 
-    /// List of property change listeners.
-    cppu::OInterfaceContainerHelper*    mpEventListeners;
+    /// client id in the AccessibleEventNotifier queue
+    sal_uInt32 mnClientId;
 
     /// index of child in parent
     long                                mnIndexInParent;
diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx
index 8b23f2149664..34b5d03769ed 100644
--- a/svx/source/inc/tabwin.hxx
+++ b/svx/source/inc/tabwin.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabwin.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: fs $ $Date: 2002-05-06 10:34:47 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -95,6 +95,9 @@
 #ifndef _TRANSFER_HXX
 #include <svtools/transfer.hxx>
 #endif
+#ifndef SVX_DBTOOLSCLIENT_HXX
+#include "dbtoolsclient.hxx"
+#endif
 
 //==================================================================
 class FmFieldWin;
@@ -134,6 +137,7 @@ public:
 class FmFieldWin    :public SfxFloatingWindow
                     ,public SfxControllerItem
                     ,public ::comphelper::OPropertyChangeListener
+                    ,public ::svxform::OStaticDataAccessTools
 {
     ::osl::Mutex        m_aMutex;
     FmFieldWinListBox* pListBox;
diff --git a/svx/source/inc/tbxform.hxx b/svx/source/inc/tbxform.hxx
index e3e92cc84444..93568ea2c6f1 100644
--- a/svx/source/inc/tbxform.hxx
+++ b/svx/source/inc/tbxform.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tbxform.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:01:20 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -111,7 +111,7 @@ public:
     virtual void LoseFocus();
 
 protected:
-    virtual void FirePosition();
+    virtual void FirePosition( sal_Bool _bForce );
 };
 
 
diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx
index e5aea6e3a1a3..f2306e6193f9 100644
--- a/svx/source/items/chrtitem.cxx
+++ b/svx/source/items/chrtitem.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: chrtitem.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: sj $ $Date: 2002-12-05 11:23:30 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:30 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -70,8 +70,8 @@
 #if defined UNX && !defined LINUX
 #include <wchar.h>
 #endif
-#ifndef _TOOLS_SOLMATH_HXX
-#include <tools/solmath.hxx>
+#ifndef INCLUDED_RTL_MATH_HXX
+#include <rtl/math.hxx>
 #endif
 #ifndef _UNOTOOLS_INTLWRAPPER_HXX
 #include <unotools/intlwrapper.hxx>
@@ -320,12 +320,11 @@ SfxItemPresentation SvxDoubleItem::GetPresentation
               SfxMapUnit ePresentationMetric, XubString& rText,
               const IntlWrapper * pIntlWrapper) const
 {
-    rText.Erase();
     DBG_ASSERT( pIntlWrapper, "SvxDoubleItem::GetPresentation: no IntlWrapper" );
     if ( pIntlWrapper )
     {
-        SolarMath::DoubleToString( rText, fVal, 'E', 4,
-            pIntlWrapper->getLocaleData()->getNumDecimalSep().GetChar(0), TRUE );
+        rText = ::rtl::math::doubleToUString( fVal, rtl_math_StringFormat_E, 4,
+            pIntlWrapper->getLocaleData()->getNumDecimalSep().GetChar(0), true );
     }
     else
         rText = GetValueText();
diff --git a/svx/source/items/frmitems.cxx b/svx/source/items/frmitems.cxx
index 67cd54d4a8ed..08d2443c4dea 100644
--- a/svx/source/items/frmitems.cxx
+++ b/svx/source/items/frmitems.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: frmitems.cxx,v $
  *
- *  $Revision: 1.27 $
+ *  $Revision: 1.28 $
  *
- *  last change: $Author: os $ $Date: 2002-08-16 12:55:45 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:30 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -3972,7 +3972,9 @@ IMPL_STATIC_LINK( SvxBrushItem, DoneHdl_Impl, void*, EMPTYARG )
         int nRes;
         pStream->Seek( STREAM_SEEK_TO_BEGIN );
         nRes = GetGrfFilter()->
-            ImportGraphic( aGraphic, *pThis->pStrLink, *pStream );
+            ImportGraphic( aGraphic, *pThis->pStrLink, *pStream,
+                           GRFILTER_FORMAT_DONTKNOW, NULL, GRFILTER_I_FLAGS_DONT_SET_LOGSIZE_FOR_JPEG );
+
         if( nRes != GRFILTER_OK )
         {
             DELETEZ( pThis->pImpl->pGraphicObject );
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index 3d2e2cb25681..c092192ddb18 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: numfmtsh.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: dr $ $Date: 2002-07-23 10:52:55 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -966,7 +966,7 @@ short SvxNumberFormatShell::FillEListWithUserCurrencys( SvStrings& rList,short n
     short           nIq=0;
 
     const NfCurrencyEntry* pTmpCurrencyEntry;
-    sal_Bool            bTmpBanking;
+    sal_Bool        bTmpBanking, bAdaptSelPos;
     XubString       rSymbol;
     XubString       rBankSymbol;
 
@@ -980,13 +980,20 @@ short SvxNumberFormatShell::FillEListWithUserCurrencys( SvStrings& rList,short n
 
     if(pCurCurrencyEntry==NULL)
     {
+        bAdaptSelPos = sal_False;
         pCurCurrencyEntry=(NfCurrencyEntry*)pTmpCurrencyEntry;
         bBankingSymbol=bTmpBanking;
         nCurCurrencyEntryPos=FindCurrencyFormat(pTmpCurrencyEntry,bTmpBanking);
     }
     else
     {
-        pTmpCurrencyEntry=pCurCurrencyEntry;
+        if (pTmpCurrencyEntry == pCurCurrencyEntry)
+            bAdaptSelPos = sal_True;
+        else
+        {
+            bAdaptSelPos = sal_False;
+            pTmpCurrencyEntry = pCurCurrencyEntry;
+        }
         bTmpBanking=bBankingSymbol;
     }
 
@@ -1123,7 +1130,7 @@ short SvxNumberFormatShell::FillEListWithUserCurrencys( SvStrings& rList,short n
     {
         aCurrencyFormatList.Insert(new String(*rList[i]),aCurrencyFormatList.Count());
 
-        if ( nSelPos == SELPOS_NONE && aCurEntryList[i] == nCurFormatKey )
+        if ( nSelPos == SELPOS_NONE && bAdaptSelPos && aCurEntryList[i] == nCurFormatKey )
             nSelPos = i;
     }
 
diff --git a/svx/source/items/numitem.cxx b/svx/source/items/numitem.cxx
index aa910c3fa565..6da50f34ca22 100644
--- a/svx/source/items/numitem.cxx
+++ b/svx/source/items/numitem.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: numitem.cxx,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: os $ $Date: 2002-11-22 07:45:51 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -303,6 +303,8 @@ SvxNumberFormat::SvxNumberFormat(SvStream &rStream)
     {
         pBulletFont = new Font;
         rStream >> *pBulletFont;
+        if(!pBulletFont->GetCharSet())
+            pBulletFont->SetCharSet(rStream.GetStreamCharSet());
     }
     else
         pBulletFont = 0;
diff --git a/svx/source/items/svxerr.src b/svx/source/items/svxerr.src
index 00a7e9e9d1f0..090bb75f0671 100644
--- a/svx/source/items/svxerr.src
+++ b/svx/source/items/svxerr.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svxerr.src,v $
  *
- *  $Revision: 1.40 $
+ *  $Revision: 1.41 $
  *
- *  last change: $Author: kz $ $Date: 2002-05-06 07:48:08 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:33 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -94,8 +94,9 @@ Resource RID_SVXERRCTX
         Text[ korean ] = "동의어 사전 실행시 $(ERR)";
         Text[ turkish ] = "E�anlaml�lar kullan�m� s�ras�nda $(ERR).";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "$(ERR) al ejecutar el diccionario de sin�nimos.";
+        Text[ catalan ] = "$(ERR) en executar el diccionari de sin�nims.";
         Text[ finnish ] = "$(ERR) suoritettaessa synonyymisanastohakua.";
+        Text[ thai ] = "$(ERR) กำลังปฏิบัติการอรรถาภิธาน";
     };
     String ERRCTX_SVX_LINGU_SPELLING&ERRCODE_RES_MASK
     {
@@ -113,7 +114,7 @@ Resource RID_SVXERRCTX
         Text [ portuguese ] = "$(ERR) ao executar a verifica��o ortogr�fica." ;
         Text [ portuguese_brazilian ] = "$(ERR) bei der Ausf?rung der Rechtschreibpr?ung." ;
         Text[ chinese_simplified ] = "拼写检查时发生 $(ERR) 。";
-        Text[ russian ] = "$(ERR) ��� ���������� �������� ������������.";
+        Text[ russian ] = "$(ERR) ��� �������� ����������.";
         Text[ polish ] = "$(ERR) przy sprawdzaniu pisowni.";
         Text[ japanese ] = "スペルチェック実行中に $(ERR) が発生。";
         Text[ chinese_traditional ] = "拼寫檢查時發生 $(ERR)。";
@@ -124,8 +125,9 @@ Resource RID_SVXERRCTX
         Text[ korean ] = "맞춤법 검사 실행시 $(ERR)";
         Text[ turkish ] = "Yaz�m denetimi s�ras�nda $(ERR).";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "$(ERR) al ejecutar la revisi�n ortogr�fica.";
+        Text[ catalan ] = "$(ERR) en executar la revisi� ortogr�fica";
         Text[ finnish ] = "$(ERR) suoritettaessa oikeinkirjoituksen tarkistusta.";
+        Text[ thai ] = "$(ERR) กำลังปฏิบัติการตรวจสอบการสะกด";
     };
     String ERRCTX_SVX_LINGU_HYPHENATION&ERRCODE_RES_MASK
     {
@@ -143,7 +145,7 @@ Resource RID_SVXERRCTX
         Text [ portuguese ] = "$(ERR) ao executar a divis�o sil�bica." ;
         Text [ portuguese_brazilian ] = "$(ERR) bei der Ausf?rung der Trennhilfe." ;
         Text[ chinese_simplified ] = "$(ERR) 发生在使用连字符时。";
-        Text[ russian ] = "$(ERR) ��� ���������� ����������� ���������.";
+        Text[ russian ] = "$(ERR) ��� ����������� ���������.";
         Text[ polish ] = "$(ERR) przy wykonywaniu dzielenia s��w na sylaby.";
         Text[ japanese ] = "$(ERR) ハイフネーション実行中に発生。";
         Text[ chinese_traditional ] = "$(ERR)發生在使用連字符時。";
@@ -154,8 +156,9 @@ Resource RID_SVXERRCTX
         Text[ korean ] = "하이픈 실행시 $(ERR)";
         Text[ turkish ] = "Heceleme yard�m�n� y�r�tme s�ras�nda $(ERR).";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "$(ERR) al ejecutar la separaci�n sil�bica.";
+        Text[ catalan ] = "$(ERR) en executar la separaci� en s�l.labes.";
         Text[ finnish ] = "$(ERR) suoritettaessa tavutusta.";
+        Text[ thai ] = "$(ERR) กำลังปฏิบัติการใส่ยัติภังค์";
     };
     String ERRCTX_SVX_LINGU_DICTIONARY&ERRCODE_RES_MASK
     {
@@ -181,11 +184,12 @@ Resource RID_SVXERRCTX
         Text[ dutch ] = "$(ERR) bij het maken van een woordenboek";
         Text[ chinese_simplified ] = "$(ERR) 发生在建立一个词典时。";
         Text[ greek ] = "$(ERR) ���� �� ���������� ���� �������.";
-        Text[ korean ] = "사전 작성시 $(ERR)";
+        Text[ korean ] = "사전 만드는 중 $(ERR)";
         Text[ turkish ] = "S�zl�k olu�turma s�ras�nda $(ERR).";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "$(ERR) al crear un diccionario.";
+        Text[ catalan ] = "$(ERR) en crear un diccionari.";
         Text[ finnish ] = "$(ERR) luotaessa sanastoa.";
+        Text[ thai ] = "$(ERR) กำลังสร้างพจนานุกรม";
     };
     String ERRCTX_SVX_BACKGROUND&ERRCODE_RES_MASK
     {
@@ -212,8 +216,9 @@ Resource RID_SVXERRCTX
         Text[ korean ] = "배경 속성 설정시 $(ERR)";
         Text[ turkish ] = "Artalan �zniteliklerinin tan�mlanmas� s�ras�nda $(ERR) .";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "$(ERR) al definir un atributo de fondo.";
+        Text[ catalan ] = "$(ERR) en definir l'atribut de fons.";
         Text[ finnish ] = "$(ERR) m��ritett�ess� taustam��ritett�.";
+        Text[ thai ] = "$(ERR) กำลังกำหนดคุณลักษณะพื้นหลัง";
     };
     String ERRCTX_SVX_IMPORT_GRAPHIC&ERRCODE_RES_MASK
     {
@@ -237,11 +242,12 @@ Resource RID_SVXERRCTX
         Text[ dutch ] = "$(ERR) bij het laden van een afbeelding";
         Text[ chinese_simplified ] = "$(ERR) 发生在装入一个图形时。";
         Text[ greek ] = "$(ERR) ���� �� ������� ���� ��������.";
-        Text[ korean ] = "그래픽 로드시 $(ERR)";
+        Text[ korean ] = "그림 로드 중 $(ERR)";
         Text[ turkish ] = "Grafik y�kleme s�ras�nda $(ERR).";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "$(ERR) al cargar una imagen.";
+        Text[ catalan ] = "$(ERR) en carregar una imatge.";
         Text[ finnish ] = "$(ERR) ladattaessa kuvia.";
+        Text[ thai ] = "$(ERR) กำลังโหลดกราฟิค";
     };
 };
  // Error-Code ------------------------------------------------------------
@@ -263,7 +269,7 @@ Resource RID_SVXERRCODE
         Text [ portuguese ] = "O dicion�rio de sin�nimos n�o se encontra dispon�vel para a l�ngua especificada.\nConfira a sua instala��o e, se necess�rio, instale a l�ngua desejada." ;
         Text [ portuguese_brazilian ] = "Ein Thesaurus f? die eingestellte Sprache ist nicht verf?bar.\n?berpr?en Sie bitte Ihre Installation und installieren Sie gegebenenfalls die gew?schte Sprache" ;
         Text[ chinese_simplified ] = "您所设定的语言没有相应的同义词词典。\n请您检查安装，如有必要，请您安装所要使用的语言版本。";
-        Text[ russian ] = "��� �������������� ����� �������� ����������.\n���������, ����������. ���� ����������� �, � ������ �������������, ������������� ���������";
+        Text[ russian ] = "���������� �������� ��� �������� �����.\n��������� ��������� �, � ������ �������������, ���������� ��������� ����.";
         Text[ polish ] = "Tezaurus jest niedost�pny dla wybranego j�zyka.\nProsz� sprawdzi� instalacj� i zainstalowa� potrzebny j�zyk.";
         Text[ japanese ] = "設定した言語で類語辞典は使用できません。\nプログラムのインストールをチェックして、必要ならば希望の言語をインストールしてください。";
         Text[ chinese_traditional ] = "您所設定的語言沒有相應的同義詞詞典。\n請您檢查安裝﹐若有必要﹐請安裝所要使用的語言版本。";
@@ -274,8 +280,9 @@ Resource RID_SVXERRCODE
         Text[ korean ] = "설정된 언어에 대한 동의어 사전을 사용할 수 없습니다.\n설치 상태를 검사한 다음 필요하면 원하는 언어를 설치하십시오";
         Text[ turkish ] = "Ayarlanan dile ili�kin e�anlaml�lar mevcut de�il.\nL�tfen kurulumu kontrol edin ve gerekirse istenilen dili kurun.";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "No hay ning�n diccionario de sin�nimos disponible para el idioma seleccionado.\nExamine por favor su instalaci�n e instale en caso dado el idioma deseado.";
+        Text[ catalan ] = "No hi ha cap diccionari de sin�nims disponible per a l'idioma seleccionat.\nExamineu la vostra instal.laci� i instal.leu l'idioma desitjat.";
         Text[ finnish ] = "Nykyiselle kielelle ei ole k�ytett�viss� oikeinkirjoituksen tarkistusohjelmaa.\nTarkista asennetut osat ja asenna haluttu kieli";
+        Text[ thai ] = "ไม่มีอรรถาภิธานที่ใช้ได้สำหรับภาษาปัจจุบัน\nกรุณาตรวจสอบการติดตั้งของคุณและติดตั้งภาษาที่ต้องการ";
     };
     String ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS&ERRCODE_RES_MASK
     {
@@ -283,24 +290,25 @@ Resource RID_SVXERRCODE
         TEXT [ English ] = "$(ARG1) is not available or is currently not active.\nPlease check your installation and install the desired language\nor activate in 'Tools - Options - Language Settings - Writing Aids' the desired module." ;
         TEXT[ english_us ] = "$(ARG1) is not supported by the spellcheck function or is not presently active.\nPlease check your installation and, if necessary, install the required language module\n or activate it under 'Tools - Options -  Language Settings - Writing Aids'.";
         TEXT[ portuguese ] = "$(ARG1) n�o tem suporte para verifica��o ortogr�fica ou encontra-se desactivado. \nConfira a sua instala��o e, se necess�rio, instale o m�dulo lingu�stico desejado\nou ent�o active-o em 'Ferramentas - Op��es - Configura��o da l�ngua - Lingu�stica'.";
-        TEXT[ russian ] = "$(ARG1) �� �������������� ��������� ������������ ��� � ��������� ������ ����������.\n��������� ���� ����������� �, � ������ �������������, ������������� ��������� �������� ������\n��� �������� ������ �������� ������ � '������ - ��������� - ��������� ����� - �����������'.";
+        TEXT[ russian ] = "$(ARG1) �������� ������ �� �������������� ��������� ���������� ��� � ��������� ������ ���������. ��������� ��������� �, � ������ �������������, ���������� ��������� �������� ������ ��� �������� ������ �������� ������ � '������ - ��������� - ��������� ����� - �����������'.";
         TEXT[ greek ] = "$(ARG1) ��� ����� ��������� ��� ��� ����������� ������.\n�������� ������� ��� ����������� ��� ������������ �� ��������� ��� ������ ��� ������? ";
-        TEXT[ dutch ] = "$(ARG1) wordt niet ondersteund door de controle, resp. is momenteel niet geactiveerd. \nControleer uw installatie en installeer eventueel de gewenste taalmodule\nresp. activeer de betreffende taalmodule onder 'Extra - Opties - Taalinstellingen - Lingu�stiek' ";
+        TEXT[ dutch ] = "$(ARG1) wordt niet ondersteund door de controle, of is momenteel niet geactiveerd. \nControleer uw installatie en installeer eventueel de gewenste taalmodule\nof activeer de betreffende taalmodule onder 'Extra - Opties - Taalinstellingen - Lingu�stiek' ";
         TEXT[ french ] = "$(ARG1) n'est pas support� par la v�rification ou n'est actuellement pas actif.\nV�rifiez l'installation et installez le cas �ch�ant le module de langue requis, ou activez-le sous 'Outils - Options - Param�tres linguistiques - Linguistique'.";
-        TEXT[ spanish ] = "$(ARG1) no est� disponible para la revisi�n ortogr�fica o esta no lo apoya.\n Examine su instalaci�n e instale en caso dado el idioma deseado\no active el m�dulo correspondiente en 'Herramientas - Opciones - Configuraci�n de idiomas - Ling��stica'.";
+        TEXT[ spanish ] = "$(ARG1) no est� disponible para la revisi�n ortogr�fica o no est� activo en este momento.\n Examine la instalaci�n e instale en caso dado el idioma deseado\no active el m�dulo correspondiente en 'Herramientas - Opciones - Configuraci�n de idiomas - Ling��stica'.";
         TEXT[ finnish ] = "$(ARG1) ei ole k�ytett�viss� oikeinkirjoituksen tarkistusta varten.\nTarkista asennetut osat ja asenna haluttu kieli.\n";
         TEXT[ italian ] = "$(ARG1) non � supportato per il controllo oppure non � attivato al momento.\nControllate l'installazione ed installate, se necessario, la lingua desiderata\noppure impostate il modulo linquistico corrispondente in 'Strumenti - Opzioni - Impostazioni lingua - Linguistica'.";
-        TEXT[ danish ] = "$(ARG1) st�r ikke til r�dighed for kontrollen.\nKontroller venligst din installation og installer i givet fald det �nskede sprog.";
+        TEXT[ danish ] = "$(ARG1) underst�ttes ikke af kontrollen eller er ikke aktiveret i �jeblikket.\nKontroller installationen, og installer eventuelt det n�dvendige sprogmodul,\neller aktiver det p�g�ldende sprogmodul under 'Supplerende - Indstillinger -  Sprogindstillinger - Lingvistik'.";
         TEXT[ swedish ] = "$(ARG1) st�ds inte av kontrollen resp., �r inte aktiverat f�r n�rvarande.\nKontrollera installationen och installera eventuellt den n�dv�ndiga spr�kmodulen\nresp. aktivera motsvarande spr�kmodul under \"Verktyg - Alternativ - Spr�kinst�llningar - Lingvistik\".";
         TEXT[ polish ] = "$(ARG1) nie jest obs�ugiwany przez funkcj� sprawdzania pisowni lub nie zosta� uaktywniony.\nNale�y sprawdzi� instalacj� i zainstalowa� ewentualnie wymagany modu� j�zyka\nlub uaktywni� go po wybraniu sekwencji 'Narz�dzia - Opcje - Konfiguracja j�zyk�w - Pisownia'.";
         TEXT[ portuguese_brazilian ] = "$(ARG1) ist f? die Pr?ung nicht verf?bar.\n?berpr?en Sie bitte Ihre Installation und installieren Sie gegebenenfalls die gew?schte Sprache.";
         TEXT[ japanese ] = "$(ARG1)のスペルチェックは支援されていません。あるいは現在アクティブではありません。\nインストールされているプログラムをチェックして、必要に応じてスペルチェックに必要な言語をインスト-ルするか、\nメニュー ツール → オプション → 言語設定 → 文章校正で必要な言語モジュールをオンにします。";
-        TEXT[ korean ] = "$(ARG1)을(를) 맞춤법 검사에 이용할 수 없습니다.\n 사용자의 설치를 점검한 다음 필요하면 사용할 언어를 설치하십시오.";
+        TEXT[ korean ] = "$(ARG1)은(는) 맞춤법 검사에서 지원하지 않거나 활성화되지 않았습니다.\n 설치를 점검해보십시오. 필요한 언어 모듈을 설치하거나 [도구] - [옵션] - [언어 설정] - [맞춤법 교정] 메뉴에서 해당하는 언어 모듈을 활성화해야 할 수도 있습니다.";
         TEXT[ chinese_simplified ] = "$(ARG1)不支持拼写检查功能或者目前未启用该功能。\n请您检查安装，如有必要请安装所需的语言模块\n或者借助菜单命令“工具 - 选项... - 语言设定 - 语言规则”启用相应的语言模块。";
         TEXT[ chinese_traditional ] = "$(ARG1) 不受支援或沒有被啓動。\n請檢查程式的安裝。若有必要請安裝所需的語言模塊或按功能表<工具> - <選項> ，在<語言規則>處設定要用的語言模塊。";
         TEXT[ turkish ] = "$(ARG1) yaz�m denetiminde kullan�lam�yor.\nL�tfen kurulumu kontrol edin ve gerekirse istenilen dili kurun.";
         TEXT[ arabic ] = "$(ARG1) ��� ������ ������� ��������.\n������ ��� ������� ����� �ߡ ��� ������ ����� �������ɡ ��� ��� �����.";
-        TEXT[ catalan ] = "$(ARG1) no disponible para la revisi�n ortogr�fica.\n Examine por favor su instalaci�n e instale en caso dado el idioma deseado.";
+        TEXT[ catalan ] = "$(ARG1) no disponible per a la revisi� ortogr�fica.\n Examineu la vostra instal.laci� i instal.leu l'idioma desitjat.";
+        TEXT[ thai ] = "$(ARG1) ใช้ไม่ได้กับการตรวจสอบการสะกด\nกรุณาตรวจสอบการติดตั้งของคุณและติดตั้งภาษาที่ต้องการ";
     };
     String ERRCODE_SVX_LINGU_LINGUNOTEXISTS&ERRCODE_RES_MASK
     {
@@ -318,7 +326,7 @@ Resource RID_SVXERRCODE
         Text [ portuguese ] = "A verifica��o ortogr�fica n�o est� dispon�vel." ;
         Text [ portuguese_brazilian ] = "Die Rechtschreibpr?ung ist nicht verf?bar." ;
         Text[ chinese_simplified ] = "不提供这个拼写检查功能。";
-        Text[ russian ] = "�������� ������������ ����������.";
+        Text[ russian ] = "���������� �������� ����������.";
         Text[ polish ] = "Sprawdzanie pisowni jest niedost�pne.";
         Text[ japanese ] = "この文章校正は使用できません。";
         Text[ chinese_traditional ] = "這個拼寫檢查功能不存在。";
@@ -329,8 +337,9 @@ Resource RID_SVXERRCODE
         Text[ korean ] = "맞춤법 검사를 할 수 없습니다.";
         Text[ turkish ] = "Yaz�m denetimi i�levi kullan�lam�yor.";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "La revisi�n ortogr�fica no est� disponible.";
+        Text[ catalan ] = "La revisi� ortogr�fica no est� disponible.";
         Text[ finnish ] = "Oikeinkirjoituksen tarkistus ei ole k�ytett�viss�.";
+        Text[ thai ] = "ใช้การตรวจสอบการสะกดไม่ได้";
     };
     String ERRCODE_SVX_LINGU_HYPHENNOTEXISTS&ERRCODE_RES_MASK
     {
@@ -341,14 +350,14 @@ Resource RID_SVXERRCODE
         Text [ english_us ] = "Hyphenation not available." ;
         Text [ italian ] = "La sillabazione non � disponibile." ;
         Text [ spanish ] = "La ayuda para la separaci�n sil�bica no est� disponible." ;
-        Text [ french ] = "La c�sure n'est pas disponible." ;
+        Text [ french ] = "C�sure non disponible" ;
         Text [ dutch ] = "De modus Woordafbreken is niet beschikbaar." ;
         Text [ swedish ] = "Avstavningshj�lpen �r inte tillg�nglig." ;
         Text [ danish ] = "Orddelingen st�r ikke til r�dighed." ;
         Text [ portuguese ] = "A separa��o sil�bica n�o est� dispon�vel." ;
         Text [ portuguese_brazilian ] = "Die Trennhilfe ist nicht verf?bar." ;
         Text[ chinese_simplified ] = "连字符不存在。";
-        Text[ russian ] = "������ � ����������� ��������� ����������.";
+        Text[ russian ] = "���������� ����������� ���������.";
         Text[ polish ] = "Dzielenie wyraz�w jest niedost�pne.";
         Text[ japanese ] = "ハイフネーションが使用できません。";
         Text[ chinese_traditional ] = "連字符不存在。";
@@ -359,8 +368,9 @@ Resource RID_SVXERRCODE
         Text[ korean ] = "하이픈을 사용할 수 없습니다.";
         Text[ turkish ] = "Heceleme yard�m� mevcut de�il.";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "La ayuda para la separaci�n sil�bica no est� disponible.";
+        Text[ catalan ] = "L'ajuda per a la separaci� ortogr�fica no est� disponible.";
         Text[ finnish ] = "Tavutusta ei ole k�ytett�viss�.";
+        Text[ thai ] = "ใช้ยัติภังค์ไม่ได้";
     };
     String ERRCODE_SVX_LINGU_DICT_NOTREADABLE&ERRCODE_RES_MASK
     {
@@ -378,7 +388,7 @@ Resource RID_SVXERRCODE
         Text [ portuguese ] = "Imposs�vel ler o dicion�rio pessoal $(ARG1)." ;
         Text [ portuguese_brazilian ] = "Das pers?liche W?terbuch $(ARG1) kann nicht gelesen werden." ;
         Text[ chinese_simplified ] = "无法读出私人词典 $(ARG1)。";
-        Text[ russian ] = "��������� ������� ������������ $(ARG1) �� �������.";
+        Text[ russian ] = "���������� ������� ������� ������������ $(ARG1).";
         Text[ polish ] = "S�ownik u�ytkownika $(ARG1) nie m�g� zosta� odczytany.";
         Text[ japanese ] = "ユーザー辞書$(ARG1)が読み取れません。";
         Text[ chinese_traditional ] = "無法讀出個人詞典 $(ARG1)。";
@@ -389,8 +399,9 @@ Resource RID_SVXERRCODE
         Text[ korean ] = "사용자 정의 사전$(ARG1)을(를) 읽을 수 없습니다.";
         Text[ turkish ] = "�zel s�zl�k $(ARG1) okunam�yor.";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "No es posible leer el diccionario personal $(ARG1).";
+        Text[ catalan ] = "No es pot llegir el diccionari personalitzat $(ARG1).";
         Text[ finnish ] = "Mukautettua sanastoa $(ARG1) ei voida lukea.";
+        Text[ thai ] = "ไม่สามารถอ่านพจนานุกรมแบบกำหนดเอง $(ARG1) ";
     };
     String ERRCODE_SVX_LINGU_DICT_NOTWRITEABLE&ERRCODE_RES_MASK
     {
@@ -408,7 +419,7 @@ Resource RID_SVXERRCODE
         Text [ portuguese ] = "Imposs�vel criar o dicion�rio pessoal $(ARG1)." ;
         Text [ portuguese_brazilian ] = "Das pers?liche W?terbuch $(ARG1) kann nicht angelegt werden." ;
         Text[ chinese_simplified ] = "无法建立私人词典 $(ARG1)。";
-        Text[ russian ] = "������� ������� ������������ $(ARG1) �� �������.";
+        Text[ russian ] = "���������� ������� ������� ������������ $(ARG1).";
         Text[ polish ] = "S�ownik u�ytkownika $(ARG1) nie m�g� zosta� odczytany.";
         Text[ japanese ] = "ユーザー辞書$(ARG1)が作成できません。";
         Text[ chinese_traditional ] = "無法建立個人詞典 $(ARG1)。";
@@ -419,8 +430,9 @@ Resource RID_SVXERRCODE
         Text[ korean ] = "사용자 정의 사전$(ARG1)을(를) 만들 수 없습니다.";
         Text[ turkish ] = "�zel s�zl�k $(ARG1) olu�turulam�yor.";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "No se puede crear el diccionario personal $(ARG1).";
+        Text[ catalan ] = "No es pot crear el diccionari personalitzat $(ARG1).";
         Text[ finnish ] = "Mukautettua sanastoa $(ARG1) ei voida luoda.";
+        Text[ thai ] = "ไม่สามารถสร้างพจนานุกรมแบบกำหนดเอง $(ARG1) ";
     };
     String ERRCODE_SVX_GRAPHIC_NOTREADABLE&ERRCODE_RES_MASK
     {
@@ -436,7 +448,7 @@ Resource RID_SVXERRCODE
         Text [ portuguese_brazilian ] = "Die Grafik $(ARG1) konnte nicht gefunden werden." ;
         Text [ portuguese ] = "Foi imposs�vel encontrar a imagem $(ARG1)." ;
         Text[ chinese_simplified ] = "无法找到图形 $(ARG1)。";
-        Text[ russian ] = "����� ������� $(ARG1) �� �������.";
+        Text[ russian ] = "���������� ����� ����������� ������� $(ARG1).";
         Text[ polish ] = "Grafiki $(ARG1) nie znaleziono.";
         Text[ japanese ] = "図 $(ARG1) は見つかりませんでした。";
         Text[ chinese_traditional ] = "無法找到圖形 $(ARG1)。";
@@ -447,8 +459,9 @@ Resource RID_SVXERRCODE
         Text[ korean ] = "그래픽$(ARG1)을(를) 찾지 못했습니다.";
         Text[ turkish ] = "Grafik $(ARG1) bulunamad�.";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "No se pudo encontrar la imagen $(ARG1).";
+        Text[ catalan ] = "No es pot trobar la imatge $(ARG1).";
         Text[ finnish ] = "Kuvaa $(ARG1) ei l�ytynyt.";
+        Text[ thai ] = "ไม่สามารถพบกราฟิค $(ARG1) ";
     };
     String ERRCODE_SVX_GRAPHIC_WRONG_FILEFORMAT&ERRCODE_RES_MASK
     {
@@ -457,23 +470,24 @@ Resource RID_SVXERRCODE
         TEXT[ english_us ] = "An unlinked graphic could not be loaded";
         TEXT[ portuguese ] = "Foi imposs�vel carregar uma imagem n�o ligada.";
         TEXT[ greek ] = "��� ���� ������� �� �������� ������ ������� ����� �������";
-        TEXT[ dutch ] = "Niet-gekoppelde afbeelding kon niet worden geladen";
+        TEXT[ dutch ] = "Niet-gekoppelde afbeelding kan niet worden geladen";
         TEXT[ french ] = "Une image (non li�e) n'a pas pu �tre charg�e.";
         TEXT[ spanish ] = "No se pudo cargar una imagen no vinculada";
         TEXT[ swedish ] = "Ett grafikobjekt utan l�nk kunde inte laddas";
-        TEXT[ russian ] = "��������� �� ����������� ������� �� �������";
+        TEXT[ russian ] = "���������� ��������� ����������� ����������� �������";
         TEXT[ italian ] = "Non � stato possibile caricare un'immagine non collegata";
         TEXT[ danish ] = "Det var ikke muligt at indl�se en ikke-k�det grafik";
         TEXT[ polish ] = "Nie mo�na by�o za�adowa� po��czonej grafiki";
         TEXT[ portuguese_brazilian ] = "An embedded graphic could not be read";
         TEXT[ japanese ] = "リンクされていない図は読み込みできません";
-        TEXT[ korean ] = "링크되지 않은 그래픽은 로드하지 못했습니다.";
+        TEXT[ korean ] = "연결되지 않은 그래픽은 로드하지 못했습니다.";
         TEXT[ chinese_simplified ] = "无法装入一个尚未链接的图形";
         TEXT[ chinese_traditional ] = "無法載入一個尚未連結的圖形";
         TEXT[ arabic ] = "���� ����� ���� ����� ����� ������";
         TEXT[ turkish ] = "Ba�lant� olu�turulmam�� bir grafik y�klenemedi";
-        TEXT[ catalan ] = "No se pudo cargar una imagen no vinculada";
-        TEXT[ finnish ] = "Linkitt�m�t�nt� grafiikkaa ei voitu ladata";
+        TEXT[ catalan ] = "No s'ha pogut carregar la imatge no enlla�ada";
+        TEXT[ finnish ] = "Linkitt�m�t�nt� kuvaa ei voitu ladata";
+        TEXT[ thai ] = "ไม่สามารถโหลดกราฟิคที่ไม่เชื่อมโยงได้";
     };
     String ERRCODE_SVX_LINGU_NOLANGUAGE&ERRCODE_RES_MASK
     {
@@ -482,11 +496,11 @@ Resource RID_SVXERRCODE
         TEXT[ english_us ] = "A language has not been fixed for the selected term.";
         TEXT[ portuguese ] = "N�o foi especificada a l�ngua para o termo seleccionado.";
         TEXT[ greek ] = "��� ���� ��������� ������ ��� ��� ������������ ���.";
-        TEXT[ dutch ] = "Voor het geselecteerde item werd geen taal vastgelegd.";
+        TEXT[ dutch ] = "Voor het geselecteerde item is geen taal vastgelegd.";
         TEXT[ french ] = "Aucune langue n'a �t� sp�cifi�e pour le terme s�lectionn�.";
         TEXT[ spanish ] = "No hay idioma determinado para la entrada seleccionada";
         TEXT[ swedish ] = "Inget spr�k har st�llts in f�r det utvalda begreppet.";
-        TEXT[ russian ] = "���� ��� ����������� ������� �� ����������.";
+        TEXT[ russian ] = "�� ���������� ���� ��� ����������� �������.";
         TEXT[ italian ] = "Non � stata impostata la lingua per il termine selezionato.";
         TEXT[ danish ] = "Der er ikke indstillet et sprog ved det valgte udtryk.";
         TEXT[ polish ] = "Nie ustawiono j�zyka przy wybranym ha�le.";
@@ -497,8 +511,9 @@ Resource RID_SVXERRCODE
         TEXT[ chinese_traditional ] = "沒有選擇一個語言。";
         TEXT[ arabic ] = "�� ���� ��� ��� ������ �������.";
         TEXT[ turkish ] = "Se�ilen s�zc�k i�in dil belirlenmedi.";
-        TEXT[ catalan ] = "No hay idioma determinado para la entrada seleccionada";
+        TEXT[ catalan ] = "No hi ha cap idioma determinat per a l'entrada seleccionada";
         TEXT[ finnish ] = "Valitulle termille ei ole m��ritetty kielt�.";
+        TEXT[ thai ] = "ภาษาไม่ได้ถูกกำหนดตายตัวสำหรับเงื่อนไขที่เลือก";
     };
     String (ERRCODE_SVX_FORMS_NOIOSERVICES | ERRCODE_CLASS_READ) & ERRCODE_RES_MASK
     {
@@ -507,12 +522,12 @@ Resource RID_SVXERRCODE
         Text[ english_us ] = "The form layer wasn't loaded as the required IO-services (stardiv.uno.io.*) could not be instantiated";
         Text[ portuguese ] = "Imposs�vel carregar a camada do formul�rio: foi imposs�vel instanciar os servi�os IO (stardiv.uno.io.*) necess�rios";
         Text[ greek ] = "��� ��������� � ������ ��� ������, ������ ��� ���� ������� �� ����� ��������� ������� ������������ ��������� ������� - ������ (stardiv.uno.io.*).";
-        Text[ dutch ] = "Formulier-level kon niet worden geladen daar noodzakelijke io--services (stardiv.uno.io.*) niet konden worden ge�nstantieerd.";
+        Text[ dutch ] = "Formulierniveau kan niet worden geladen omdat noodzakelijke io--services (stardiv.uno.io.*) niet kunnen worden ge�nitieerd.";
         Text[ french ] = "La couche de formulaire n'a pas �t� charg�e : impossible d'instancier les services IO (stardiv.uno.io.*) requis.";
         Text[ spanish ] = "No se carg� la capa de formulario porque no se pudieron instanciar servicios IO necesarios (stardiv.uno.io.*)";
         Text[ swedish ] = "Formul�rskiktet laddades inte eftersom n�dv�ndig IO-service (stardiv.uno.io.*) inte kunde instantieras.";
         Text[ language_user1 ] = " ";
-        Text[ russian ] = "���� ��������� �� ��������, ��������� ����������� ��� ����� ������ io (stardiv.uno.io.*) �� ����������������.";
+        Text[ russian ] = "�� �������� ���� �����, ��� ��� �� ������� ������� ��������� ������ IO (stardiv.uno.io.*).";
         Text[ italian ] = "Lo strato del formulario non � stato caricato poich� stato possibile creare i servizi IO (strdiv.uno.io.*) necessari.";
         Text[ danish ] = "Formularlaget blev ikke indl�st, fordi det ikke var muligt at instantiere den kr�vede IO-service (stardiv.uno.io.*).";
         Text[ polish ] = "Warstwa formularza nie zosta�a za�adowana, poniewa� nie mo�na by�o utworzy� wymaganych serwis�w IO (stardiv.uno.io.*)";
@@ -523,8 +538,9 @@ Resource RID_SVXERRCODE
         Text[ chinese_traditional ] = "因為沒有安裝必要的 IO 服務(stardiv.uno.io.*)而無法載入表單層次。";
         Text[ arabic ] = "�� ��� ����� ���� ��������ɡ �� ���� ����� ����� IO ������� (stardiv.uno.io.*)";
         Text[ turkish ] = "Gerekli IO hizmetleri (stardiv.uno.io.*) ba�lat�lamad��� i�in, form d�zeyi y�klenemedi.";
-        Text[ catalan ] = "No se carg� la capa de formulario porque no se pudieron instanciar servicios IO necesarios (stardiv.uno.io.*)";
+        Text[ catalan ] = "La capa del formulari no estava carregada quan no s'han pogut instanciar els serveis IO (stardiv.uno.io.*) necessaris";
         Text[ finnish ] = "Lomakekerrosta ei ladattu, koska vaadittujen IO-palveluiden (stardiv.uno.io.*) k�ytt� ei onnistunut";
+        Text[ thai ] = "ไม่ได้โหลดระดับของแบบฟอร์มเป็น IO-services (stardiv.uno.io.*) อย่างที่ต้องการไม่สามารถถูกแสดงให้เห็นตัวอย่าง";
     };
     String (ERRCODE_SVX_FORMS_NOIOSERVICES | ERRCODE_CLASS_WRITE) & ERRCODE_RES_MASK
     {
@@ -533,11 +549,11 @@ Resource RID_SVXERRCODE
         Text[ english_us ] = "The form layer wasn't written as the required IO services (stardiv.uno.io.*) could not be instantiated";
         Text[ portuguese ] = "Imposs�vel escrever a camada do formul�rio: foi imposs�vel instanciar os servi�os IO (stardiv.uno.io.*) necess�rios.";
         Text[ greek ] = "��� ��������� � ������ ��� ������, ������ ��� ���� ������� �� ����� ��������� ������� ������������ ��������� ������� - ������ (stardiv.uno.io.*).";
-        Text[ dutch ] = "Formulier-level werd niet geschreven daar noodzakelijke io-services (stardiv.uno.io.*) niet konden worden ge�nstantieerd.";
+        Text[ dutch ] = "Formulierniveau is niet geschreven omdat noodzakelijke io-services (stardiv.uno.io.*) niet kunnen worden ge�nitieerd.";
         Text[ french ] = "La couche de formulaire n'a pas �t� �crite : impossible d'instancier les services IO (stardiv.uno.io.*) requis.";
         Text[ spanish ] = "No se pudo escribir la capa de formulario porque no se pudieron instanciar servicios IO necesarios (stardiv.uno.io.*)";
         Text[ swedish ] = "Formul�rskiktet skrevs inte eftersom n�dv�ndig IO-service (stardiv.uno.io.*) inte kunde instantieras";
-        Text[ russian ] = "���� ��������� �� �������, ��������� ����������� ��� ����� ������ io (stardiv.uno.io.*) �� ����������������.";
+        Text[ russian ] = "�� ������� ���� �����, ��� ��� �� ������� ������� ��������� ������ IO (stardiv.uno.io.*).";
         Text[ italian ] = "Lo strato del formulario non � stato scritto perch� non non � stato possibile creare i servizi IO (stardiv.uno.io.*) necessari.";
         Text[ danish ] = "Formularlaget blev ikke skrevet, fordi det ikke var muligt at instantiere den kr�vede IO-service (stardiv.uno.io.*).";
         Text[ polish ] = "Warstwa formularza nie zosta�a zapisana, poniewa� nie mo�na by�o utworzy� wymaganych serwis�w IO (stardiv.uno.io.*)";
@@ -548,8 +564,9 @@ Resource RID_SVXERRCODE
         Text[ chinese_traditional ] = "因為沒有安裝必要的 IO 服務(stardiv.uno.io.*)而無法寫入表單層次。";
         Text[ arabic ] = "�� ��� ����� ���� ��������ɡ �� ���� ����� ����� IO ������� (stardiv.uno.io.*)";
         Text[ turkish ] = "Gerekli IO hizmetleri (stardiv.uno.io.*) ba�lat�lamad��� i�in, form d�zeyi yaz�lamad�.";
-        Text[ catalan ] = "No se pudo escribir la capa de formulario porque no se pudieron instanciar servicios IO necesarios (stardiv.uno.io.*)";
+        Text[ catalan ] = "La capa del formulari no estava escrita quan no s'han pogut instanciar els serveis IO (stardiv.uno.io.*) necessaris";
         Text[ finnish ] = "Lomakekerrosta ei kirjoitettu, koska vaadittujen IO-palveluiden (stardiv.uno.io.*) k�ytt� ei onnistunut";
+        Text[ thai ] = "ไม่สามารถเขียนระดับของแบบฟอร์มเป็น IO services (stardiv.uno.io.*) อย่างที่ต้องการไม่สามารถถูกแสดงให้เห็นตัวอย่าง";
     };
     String (ERRCODE_SVX_FORMS_READWRITEFAILED | ERRCODE_CLASS_READ) & ERRCODE_RES_MASK
     {
@@ -558,11 +575,11 @@ Resource RID_SVXERRCODE
         Text[ english_us ] = "An error occurred while reading the form controls. The form layer has not been loaded";
         Text[ portuguese ] = "Ocorreu um erro na leitura dos controlos do formul�rio. Foi imposs�vel carregar a camada do formul�rio.";
         Text[ greek ] = "���� ��� �������� ��� ��������� ������� ��� ������ ������������� ��� ������. � ������ ��� ������ ��� ���������.";
-        Text[ dutch ] = "Fout bij lezen van formulier-controls. Formulier-level werd niet geladen.";
+        Text[ dutch ] = "Fout bij lezen van formulier-controls. Formulierniveau is niet geladen.";
         Text[ french ] = "Une erreur est survenue lors de la lecture des contr�les de formulaire. La couche de formulaire n'a pas �t� charg�e.";
         Text[ spanish ] = "Ha ocurrido un error al leer los controles de formulario. No se carg� la capa de formulario.";
         Text[ swedish ] = "Det uppstod ett fel vid l�sning av formul�r-controls. Formul�rskiktet laddades inte";
-        Text[ russian ] = "��� ������ ��������� ���������� ��������� ��������� ������. ���� ��������� �� ��������.";
+        Text[ russian ] = "������ ������ ��������� ���������� �����. �� �������� ���� �����";
         Text[ italian ] = "Si � verificato un errore nella lettura del formulario Controls. Lo strato del formulario non � stato caricato";
         Text[ danish ] = "Der opstod en fejl under l�sning af formular-kontrolelementerne. Formularlaget blev ikke indl�st.";
         Text[ polish ] = "Podczas odczytu kontroli formularza wyst�pi� b��d. Warstwa formularza nie zosta�a za�adowana";
@@ -573,8 +590,9 @@ Resource RID_SVXERRCODE
         Text[ chinese_traditional ] = "在讀取表單控制項時發生錯誤。無法載入表單層次。";
         Text[ arabic ] = "��� ��� ����� ����� ����� ���� ���������. �� ��� ����� ���� ���������";
         Text[ turkish ] = "Form komut ��eleri okunurken bir hata olu�tu. Form d�zeyi y�klenemedi.";
-        Text[ catalan ] = "Ha ocurrido un error al leer los controles de formulario. No se carg� la capa de formulario.";
-        Text[ finnish ] = "Lomakeohjaimia luettaessa ilmeni virhe. Lomakekerrosta ei ole ladattu";
+        Text[ catalan ] = "Hi ha hagut un error en llegir els controls del formulari. No s'ha pogut carregar la capa del formulari";
+        Text[ finnish ] = "Lomakkeen ohjausobjekteja luettaessa ilmeni virhe. Lomakekerrosta ei ole ladattu";
+        Text[ thai ] = "เกิดความผิดพลาดขณะอ่านตัวควบคุมแบบฟอร์ม ระดับของแบบฟอร์มยังไม่ได้ถูกโหลด";
     };
     String (ERRCODE_SVX_FORMS_READWRITEFAILED | ERRCODE_CLASS_WRITE) & ERRCODE_RES_MASK
     {
@@ -583,11 +601,11 @@ Resource RID_SVXERRCODE
         Text[ english_us ] = "An error occurred while writing the form controls. The form layer has not been saved";
         Text[ portuguese ] = "Ocorreu um erro ao escrever os controlos do formul�rio. Foi imposs�vel guardar a camada do formul�rio.";
         Text[ greek ] = "���� ��� ������� ��� ��������� ������� ��� ������ ������������� ��� ������. � ������ ��� ������ ��� ���������.";
-        Text[ dutch ] = "Fout bij schrijven van formulier-controls. Formulier-level werd niet opgeslagen.";
+        Text[ dutch ] = "Fout bij schrijven van formulier-controls. Formulierniveau is niet opgeslagen.";
         Text[ french ] = "Une erreur est survenue lors de l'�criture des contr�les de formulaire. La couche de formulaire n'a pas �t� enregistr�e.";
         Text[ spanish ] = "Ha ocurrido un error al escribir los controles de formulario. No se guard� la capa de formulario.";
         Text[ swedish ] = "Det uppstod ett fel vid skrivning av formul�r-controls. Formul�rskiktet sparades inte";
-        Text[ russian ] = "��� ��������� ��������� ���������� ��������� ��������� ������. ���� ��������� �� ��������.";
+        Text[ russian ] = "������ ������ ��������� ���������� �����. �� �������� ���� �����";
         Text[ italian ] = "Si � verificato un errore durante la compilazione del formulario controls. Lo strato del formulario non � stato salvato.";
         Text[ danish ] = "Der opstod en fejl under skrivning af formular-kontrolelementerne. Formularlaget blev ikke gemt.";
         Text[ polish ] = "Podczas zapisu kontroli formularza wyst�pi� b��d. Warstwa formularza nie zosta�a zapisana";
@@ -598,8 +616,9 @@ Resource RID_SVXERRCODE
         Text[ chinese_traditional ] = "在寫入表單控制項時發生一個錯誤。沒有儲存表單層次。";
         Text[ arabic ] = "��� ��� ����� ����� ����� ���� ���������. �� ��� ��� ���� ���������";
         Text[ turkish ] = "Form komut ��eleri yaz�l�rken bir hata olu�tu. Form d�zeyi kaydedilemedi.";
-        Text[ catalan ] = "Ha ocurrido un error al escribir los controles de formulario. No se guard� la capa de formulario.";
-        Text[ finnish ] = "Lomakeohjaimia kirjoitettaessa ilmeni virhe. Lomakekerrosta ei ole tallennettu";
+        Text[ catalan ] = "Hi ha hagut un error en llegir els controls del formulari. No s'ha pogut desar la capa del formulari";
+        Text[ finnish ] = "Lomakkeen ohjausobjekteja kirjoitettaessa ilmeni virhe. Lomakekerrosta ei ole tallennettu";
+        Text[ thai ] = "เกิดความผิดพลาดขณะเขียนตัวควบคุมแบบฟอร์ม ระดับของแบบฟอร์มยังไม่ได้ถูกบันทึก";
     };
     String (ERRCODE_SVX_BULLETITEM_NOBULLET | ERRCODE_CLASS_READ) & ERRCODE_RES_MASK
     {
@@ -607,9 +626,9 @@ Resource RID_SVXERRCODE
         Text [ english ] = "There occurred an error during reading a bullet. Not all Bullets coud be read correctly";
         Text[ english_us ] = "An error occurred while reading one of the bullets. Not all of the bullets were loaded.";
         Text[ portuguese ] = "Surgiu um erro durante a leitura de uma marca. Foi imposs�vel carreg�-las todas.";
-        Text[ russian ] = "�� ����� ������ ������ ������� ��������� ������. ������� ��������� ��� ������� �� �������.";
+        Text[ russian ] = "������ ������ �������. �� ������� ��������� ��� �������.";
         Text[ greek ] = "���� ��� �������� ���� �������� ������������� ��� ������. ��� ���� ������� �� ����� ������� ���� ��� ��������";
-        Text[ dutch ] = "Fout bij laden van opsommingsteken. Niet alle konden worden geladen.";
+        Text[ dutch ] = "Fout bij laden van opsommingsteken. Niet alle tekens kunnen worden geladen.";
         Text[ french ] = "Une erreur s'est produite pendant la lecture d'une puce. Certaines puces n'ont pas pu �tre charg�es.";
         Text[ spanish ] = "Ha ocurrido un error al leer una vi�eta. No se pudieron cargar todas las vi�etas.";
         Text[ italian ] = "Durante la lettura di un bullet si � verificato un errore. Non � stato possibile caricare tutti i bullet.";
@@ -618,13 +637,14 @@ Resource RID_SVXERRCODE
         Text[ polish ] = "Wyst�pi� b��d przy odczycie wypunktowania. Nie mo�na by�o za�adowa� wszystkich wypunktowa�.";
         Text[ portuguese_brazilian ] = "There occurred an error during reading a bullet. Not all Bullets coud be read correctly";
         Text[ japanese ] = "箇条書きを読み込むときにエラーが発生しました。すべての箇条書きは読み込めませんでした。";
-        Text[ korean ] = "글머리 기호를 읽을 때 오류가 발생했습니다. 글머리 기호를 모두 로드하지는 못했습니다.";
+        Text[ korean ] = "글머리 기호를 읽는 중 오류가 발생했습니다. 글머리 기호를 모두 로드하지 못했습니다.";
         Text[ chinese_simplified ] = "在读取一个项目符号时发生错误。无法装入全部的项目符号。";
         Text[ chinese_traditional ] = "在讀取一個項目符號時發生錯誤。無法載入所有的項目符號。";
         Text[ arabic ] = "��� ��� ����� ����� ���� ������ �������. ���� ����� �� ������ �������.";
         Text[ turkish ] = "Madde i�aretleri okunurken hata olu�tu. Bu nedenle t�m madde i�aretleri y�klenemedi.";
-        Text[ catalan ] = "Ha ocurrido un error al leer una vi�eta. No se pudieron cargar todas las vi�etas.";
+        Text[ catalan ] = "Hi ha hagut un error en llegir un pic. No s'han pogut carregar tots el pics.";
         Text[ finnish ] = "Luettelomerkki� luettaessa on ilmennyt virhe. Kaikkia luettelomerkkej� ei ladattu.";
+        Text[ thai ] = "เกิดความผิดพลาดขณะอ่านหนึ่งในสัญลักษณ์แสดงหัวข้อย่อย  ไม่ทั้งหมดของสัญลักษณ์แสดงหัวข้อย่อยถูกโหลด";
     };
 
     String ERRCODE_SVX_MODIFIED_VBASIC_STORAGE & ERRCODE_RES_MASK
@@ -635,9 +655,9 @@ Resource RID_SVXERRCODE
         TEXT [ English ] = "All changes made on the document Basic code will be lost. The original VBA macro code will be saved instead." ;
         TEXT[ english_us ] = "All changes to the Basic Code are lost.The original VBA Macro Code is saved instead.";
         TEXT[ portuguese ] = "As modifica��es efectuadas no documento Basic Code perder-se-�o. No seu lugar ser� guardado o c�digo macro VBA.";
-        TEXT[ russian ] = "��� ��������� ��������� Basic Code ����� �������. ������ ����� ����� �������� �������� VBA ��������.";
+        TEXT[ russian ] = "��� ��������� ���� Basic �������. ������ ����� ����� �������� �������� VBA.";
         TEXT[ greek ] = "���� �� ������� ��� �������� Basic Code �� ������. ���� ����� �� ����������� �� ��������� VBA Makrocode.";
-        TEXT[ dutch ] = "De Basic-code werd veranderd en kan daardoor niet meer als origineel worden opgeslagen.";
+        TEXT[ dutch ] = "De Basic-code is gewijzigd en kan daardoor niet meer als origineel worden opgeslagen.";
         TEXT[ french ] = "Comme les modifications apport�es au code Basic du document vont �tre perdues, c'est le code de macro VBA d'origine qui va �tre enregistr� � la place.";
         TEXT[ spanish ] = "Se perder�n todas las modificaciones del Basic Code del documento. En su lugar se guardar� el c�digo macro VBA original.";
         TEXT[ italian ] = "Tutte le modifiche apportate al documento Basic Code andranno perdute. Pertanto verr� salvato l'originale VBA.";
@@ -646,13 +666,14 @@ Resource RID_SVXERRCODE
         TEXT[ polish ] = "Wszelkie modyfikacje dotycz�ce Basic Code dokumentu b�d� anulowane. Zapisany zostanie za to oryginalny kod makro VBA.";
         TEXT[ portuguese_brazilian ] = "The Basic-Code is modified and so it can not be saved as original.";
         TEXT[ japanese ] = "Basic Code ドキュメントのすべての変更は失われました。オリジナルの VBA Makrocodeがその代りに保存されます。";
-        TEXT[ korean ] = "Basic 코드에 대한 모든 변경 사항은 손실됩니다.  대신 VBA  매크로 코드가 저장됩니다.";
+        TEXT[ korean ] = "Basic code에 대한 모든 변경 사항은 손실됩니다.  대신 VBA Macro Code가 저장됩니다.";
         TEXT[ chinese_simplified ] = "丢失了对Basic Code文档进行的更改。存盘的只是源VBA宏码。";
         TEXT[ chinese_traditional ] = "文件的 Basic 碼所有變更已經流失。已經儲存源 VBA 巨集。";
         TEXT[ turkish ] = "Basic Code belgesindeki t�m de�i�iklikler kaybolacak. Bunun yerine orjinal VBA Macrocode kaydedilecek.";
         TEXT[ arabic ] = "��� ���� ���� ��������� ���� �� ������� ���  Basic Code ������ϡ ���� ��� ��� VBA Macro Code ����� ����.";
-        TEXT[ catalan ] = "Se perder�n todas las modificaciones del Basic Code del documento. En su lugar se guardar� el c�digo macro VBA original.";
+        TEXT[ catalan ] = "Es perdran totes les modificacions del Basic Code del document. En el seu lloc es desar� el codi macro VBA original.";
         TEXT[ finnish ] = "Kaikki Basic-koodin muutokset on menetetty. Alkuper�inen VBA-makrokoodi tallennetaan.";
+        TEXT[ thai ] = "การเปลี่ยนแปลงที่ Basic Code สูญหาย ต้นฉบับ VBA Macro Code ถูกบันทึกแทน";
     };
 
     String ERRCODE_SVX_VBASIC_STORAGE_EXIST & ERRCODE_RES_MASK
@@ -661,9 +682,9 @@ Resource RID_SVXERRCODE
         TEXT [ English ] = "The original VBA basic code contained in the document will no be saved." ;
         TEXT[ english_us ] = "The original VBA Basic Code contained in the document will not be saved.";
         TEXT[ portuguese ] = "O c�digo VBA original contido no documento n�o ser� guardado.";
-        TEXT[ russian ] = "������������ � ��������� �������� VBA Basic Code �������� �� �����.";
+        TEXT[ russian ] = "������������ � ��������� �������� ��� VBA Basic �������� �� �����.";
         TEXT[ greek ] = "��� �� ����� ���������� ��� ���������� VBA basic code ��� ���������� ��� �������.";
-        TEXT[ dutch ] = "The original VBA basic code contained in the document will no be saved.";
+        TEXT[ dutch ] = "De originele VBA Basic-code in dit document wordt niet opgeslagen.";
         TEXT[ french ] = "Le code VBA basic d'origine contenu dans le document ne sera pas enregistr�.";
         TEXT[ spanish ] = "No se guardar� el Basic Code VBA incluido en el documento.";
         TEXT[ italian ] = "Non � possibile salvare il codice VBA Basic contenuto nel documeto.";
@@ -672,13 +693,14 @@ Resource RID_SVXERRCODE
         TEXT[ polish ] = "Zawarty w dokumencie oryginalny VBA Basic Code nie zostanie zapisany.";
         TEXT[ portuguese_brazilian ] = "The original VBA basic code contained in the document will no be saved.";
         TEXT[ japanese ] = "ドキュメントに含まれているオリジナルの VBA Basic Code は保存されません。";
-        TEXT[ korean ] = "문서에 포함되어 있는 원래 VBA 기본 코드는  저장되지 않습니다.";
+        TEXT[ korean ] = "문서에 포함되어 있는 원래 VBA Basic Code는 저장되지 않습니다.";
         TEXT[ chinese_simplified ] = "不会存盘文档中含有的源VBA Basic Code。";
         TEXT[ chinese_traditional ] = "文件含有的源 VBA basic 碼不會被儲存。";
         TEXT[ turkish ] = "Belgede bulunan ilk VBA basic kodu kaydedilmeyecek.";
         TEXT[ arabic ] = "�� ��� ��� ���  VBA Basic Code������ ������� �� �������.";
-        TEXT[ catalan ] = "No se guardar� el Basic Code VBA incluido en el documento.";
+        TEXT[ catalan ] = "No es desar� el Basic Code VBA incl�s en el document.";
         TEXT[ finnish ] = "Asiakirjan alkuper�ist� VBA-peruskoodia ei tallenneta.";
+        TEXT[ thai ] = "มีต้นฉบับ VBA Basic Code ในเอกสารที่จะไม่ถูกบันทึก";
     };
 };
  // ********************************************************************** EOF
@@ -700,3 +722,6 @@ Resource RID_SVXERRCODE
 
 
 
+
+
+
diff --git a/svx/source/items/svxitems.src b/svx/source/items/svxitems.src
index 871f1ba4ab7a..e584f3c3dd31 100644
--- a/svx/source/items/svxitems.src
+++ b/svx/source/items/svxitems.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svxitems.src,v $
  *
- *  $Revision: 1.66 $
+ *  $Revision: 1.67 $
  *
- *  last change: $Author: os $ $Date: 2002-08-22 13:30:24 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:33 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,7 +79,7 @@ String RID_SVXITEMS_TRUE
     Text [ spanish ] = "Verdadero" ;
     Text [ english_us ] = "True" ;
     Text[ chinese_simplified ] = "真";
-    Text[ russian ] = "������";
+    Text[ russian ] = "������";
     Text[ polish ] = "Prawda";
     Text[ japanese ] = "真(TRUE)";
     Text[ chinese_traditional ] = "真";
@@ -107,7 +107,7 @@ String RID_SVXITEMS_FALSE
     Text [ spanish ] = "Falso" ;
     Text [ english_us ] = "False" ;
     Text[ chinese_simplified ] = "错误";
-    Text[ russian ] = "����";
+    Text[ russian ] = "����";
     Text[ polish ] = "Fa�sz";
     Text[ japanese ] = "偽(FALSE)";
     Text[ chinese_traditional ] = "錯誤";
@@ -172,7 +172,7 @@ String RID_SVXITEMS_SEARCHCMD_FIND
     Text[ chinese_traditional ] = "搜尋";
     Text[ arabic ] = "���";
     Text[ greek ] = "���������";
-    Text[ korean ] = "찾기";
+    Text[ korean ] = "검색";
     Text[ turkish ] = "Ara";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Cerca";
@@ -188,7 +188,7 @@ String RID_SVXITEMS_SEARCHCMD_FIND_ALL
     Text [ portuguese ] = "Localizar todos" ;
     Text [ finnish ] = "Etsi kaikki" ;
     Text [ danish ] = "S�g alle" ;
-    Text [ french ] = "Rechercher tous" ;
+    Text [ french ] = "Rechercher tout" ;
     Text [ swedish ] = "S�k alla" ;
     Text [ dutch ] = "Alle zoeken" ;
     Text [ spanish ] = "Buscar todo" ;
@@ -228,7 +228,7 @@ String RID_SVXITEMS_SEARCHCMD_REPLACE
     Text[ chinese_traditional ] = "代替";
     Text[ arabic ] = "�������";
     Text[ greek ] = "�������������";
-    Text[ korean ] = "대체";
+    Text[ korean ] = "바꾸기";
     Text[ turkish ] = "De�i�tir";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Reempla�a";
@@ -271,7 +271,7 @@ String RID_SVXITEMS_SEARCHSTYL_CHAR
     Text [ italian ] = "Modello di carattere" ;
     Text [ portuguese_brazilian ] = "Folha de estilos" ;
     Text [ portuguese ] = "Estilos de caracteres" ;
-    Text [ finnish ] = "Merkist�n tyyli" ;
+    Text [ finnish ] = "Merkkityyli" ;
     Text [ danish ] = "Tegntypografi" ;
     Text [ french ] = "Style de caract�res" ;
     Text [ swedish ] = "Teckenformatmall" ;
@@ -279,13 +279,13 @@ String RID_SVXITEMS_SEARCHSTYL_CHAR
     Text [ spanish ] = "Estilo de caracteres" ;
     Text [ english_us ] = "Character Style" ;
     Text[ chinese_simplified ] = "字符样式";
-    Text[ russian ] = "����� ������";
+    Text[ russian ] = "����� �������";
     Text[ polish ] = "Styl znaku";
     Text[ japanese ] = "文字スタイル";
     Text[ chinese_traditional ] = "字元樣式";
     Text[ arabic ] = "��� ������";
     Text[ greek ] = "���� ����������";
-    Text[ korean ] = "문자 템플릿";
+    Text[ korean ] = "문자 스타일";
     Text[ turkish ] = "Karakter bi�imi";
     Text[ language_user1 ] = "All \"Vorlage\"/Styles are always written with capital S. 10.5.00EM";
     Text[ catalan ] = "Estil de car�cters";
@@ -313,7 +313,7 @@ String RID_SVXITEMS_SEARCHSTYL_PARA
     Text[ chinese_traditional ] = "段落樣式";
     Text[ arabic ] = "��� ����";
     Text[ greek ] = "������� ����������";
-    Text[ korean ] = "단락 템플릿";
+    Text[ korean ] = "단락 스타일";
     Text[ turkish ] = "Paragraf bi�imi";
     Text[ language_user1 ] = "All \"Vorlagen\" /Styles are written with a capital S.10.5.00EM";
     Text[ catalan ] = "Estil de par�graf";
@@ -341,7 +341,7 @@ String RID_SVXITEMS_SEARCHSTYL_FRAME
     Text[ chinese_traditional ] = "訊框樣式";
     Text[ arabic ] = "��� ����";
     Text[ greek ] = "���� ��������";
-    Text[ korean ] = "프레임 템플릿";
+    Text[ korean ] = "프레임 스타일";
     Text[ turkish ] = "�er�eve bi�imi";
     Text[ language_user1 ] = "All \"Vorlagen\" /Styles are written with a capital S.10.5.00EM";
     Text[ catalan ] = "Estil del marc";
@@ -440,7 +440,7 @@ String RID_SVXITEMS_SEARCHIN_NOTE
     Text [ italian ] = "Nota" ;
     Text [ portuguese_brazilian ] = "Observa??o" ;
     Text [ portuguese ] = "Anota��o" ;
-    Text [ finnish ] = "Huomautus:" ;
+    Text [ finnish ] = "Huomautus" ;
     Text [ danish ] = "Note" ;
     Text [ french ] = "Note" ;
     Text [ swedish ] = "Anteckning" ;
@@ -448,7 +448,7 @@ String RID_SVXITEMS_SEARCHIN_NOTE
     Text [ spanish ] = "Nota" ;
     Text [ english_us ] = "Note" ;
     Text[ chinese_simplified ] = "备注";
-    Text[ russian ] = "�������";
+    Text[ russian ] = "����������";
     Text[ polish ] = "Notatka";
     Text[ japanese ] = "メモ";
     Text[ chinese_traditional ] = "備註";
@@ -514,7 +514,7 @@ String RID_SVXITEMS_BREAK_COLUMN_BEFORE
     Text [ italian ] = "Interrompi prima di nuova colonna" ;
     Text [ portuguese_brazilian ] = "Interromper antes de nova coluna" ;
     Text [ portuguese ] = "Quebra antes de nova coluna" ;
-    Text [ finnish ] = "Rivinvaihto ennen uutta saraketta" ;
+    Text [ finnish ] = "Vaihto ennen uutta saraketta" ;
     Text [ danish ] = "Skift f�r ny kolonne" ;
     Text [ french ] = "Saut avant nouvelle colonne" ;
     Text [ swedish ] = "Brytning f�re ny kolumn" ;
@@ -522,7 +522,7 @@ String RID_SVXITEMS_BREAK_COLUMN_BEFORE
     Text [ spanish ] = "Salto antes de nueva columna" ;
     Text [ english_us ] = "Break before new column" ;
     Text[ chinese_simplified ] = "在新列之前分开";
-    Text[ russian ] = "������ ����� ����� ��������";
+    Text[ russian ] = "������ �� ������ �������";
     Text[ polish ] = "Podzia� przed now� kolumn�";
     Text[ japanese ] = "新しい列の前で改行";
     Text[ chinese_traditional ] = "在新欄之前分開";
@@ -542,7 +542,7 @@ String RID_SVXITEMS_BREAK_COLUMN_AFTER
     Text [ italian ] = "Interrompi dopo nuova colonna" ;
     Text [ portuguese_brazilian ] = "Interromper ap? nova coluna" ;
     Text [ portuguese ] = "Quebra ap�s nova coluna" ;
-    Text [ finnish ] = "Rivinvaihto uuden sarakkeen j�lkeen" ;
+    Text [ finnish ] = "Vaihto uuden sarakkeen j�lkeen" ;
     Text [ danish ] = "Skift efter ny kolonne" ;
     Text [ french ] = "Saut apr�s nouvelle colonne" ;
     Text [ swedish ] = "Brytning efter ny kolumn" ;
@@ -550,7 +550,7 @@ String RID_SVXITEMS_BREAK_COLUMN_AFTER
     Text [ spanish ] = "Salto despu�s de nueva columna" ;
     Text [ english_us ] = "Break after new column" ;
     Text[ chinese_simplified ] = "在新列之后分开";
-    Text[ russian ] = "������ ����� ����� �������";
+    Text[ russian ] = "������ ����� ������ �������";
     Text[ polish ] = "Podzia� po nowej kolumnie";
     Text[ japanese ] = "新しい列の後で改行";
     Text[ chinese_traditional ] = "在新欄之後分開";
@@ -570,7 +570,7 @@ String RID_SVXITEMS_BREAK_COLUMN_BOTH
     Text [ italian ] = "Interrompi prima e dopo nuova colonna" ;
     Text [ portuguese_brazilian ] = "Interromper antes e ap? nova coluna" ;
     Text [ portuguese ] = "Quebra antes e ap�s nova coluna" ;
-    Text [ finnish ] = "Rivinvaihto uutta saraketta ennen ja uuden sarakkeen j�lkeen" ;
+    Text [ finnish ] = "Vaihto uutta saraketta ennen ja uuden sarakkeen j�lkeen" ;
     Text [ danish ] = "Skift f�r og efter ny kolonne" ;
     Text [ french ] = "Sauts avant et apr�s nouvelle colonne" ;
     Text [ swedish ] = "Brytning f�re och efter ny kolumn" ;
@@ -578,7 +578,7 @@ String RID_SVXITEMS_BREAK_COLUMN_BOTH
     Text [ spanish ] = "Salto antes y despu�s de nueva columna" ;
     Text [ english_us ] = "Break before and after new column" ;
     Text[ chinese_simplified ] = "在新列前后分开";
-    Text[ russian ] = "������ ����� ����� �������� � ����� ���";
+    Text[ russian ] = "������ �� � ����� ������ �������";
     Text[ polish ] = "Podzia� przed i po nowej kolumnie";
     Text[ japanese ] = "新しい列の前後で改行";
     Text[ chinese_traditional ] = "在新欄前後分開";
@@ -598,7 +598,7 @@ String RID_SVXITEMS_BREAK_PAGE_BEFORE
     Text [ italian ] = "Interrompi prima di nuova pagina" ;
     Text [ portuguese_brazilian ] = "Interromper antes de nova p?gina" ;
     Text [ portuguese ] = "Quebra antes de nova p�gina" ;
-    Text [ finnish ] = "Rivinvaihto ennen uutta sivua" ;
+    Text [ finnish ] = "Vaihto ennen uutta sivua" ;
     Text [ danish ] = "Skift f�r ny side" ;
     Text [ french ] = "Saut avant nouvelle page" ;
     Text [ swedish ] = "Brytning f�re ny sida" ;
@@ -606,7 +606,7 @@ String RID_SVXITEMS_BREAK_PAGE_BEFORE
     Text [ spanish ] = "Salto antes de p�gina nueva" ;
     Text [ english_us ] = "Break before new page" ;
     Text[ chinese_simplified ] = "在新页之前换页";
-    Text[ russian ] = "������ ����� ����� ���������";
+    Text[ russian ] = "������ �� ����� ��������";
     Text[ polish ] = "Podzia� przed now� stron�";
     Text[ japanese ] = "新しいページの前で区切る";
     Text[ chinese_traditional ] = "在新頁之前換頁";
@@ -626,7 +626,7 @@ String RID_SVXITEMS_BREAK_PAGE_AFTER
     Text [ italian ] = "Interrompi dopo nuova pagina" ;
     Text [ portuguese_brazilian ] = "Interromper ap? nova p?gina" ;
     Text [ portuguese ] = "Quebra ap�s nova p�gina" ;
-    Text [ finnish ] = "Rivinvaihto uuden sivun j�lkeen" ;
+    Text [ finnish ] = "Vaihto uuden sivun j�lkeen" ;
     Text [ danish ] = "Skift efter ny side" ;
     Text [ french ] = "Saut apr�s nouvelle page" ;
     Text [ swedish ] = "Brytning efter ny sida" ;
@@ -654,7 +654,7 @@ String RID_SVXITEMS_BREAK_PAGE_BOTH
     Text [ italian ] = "Interrompi prima e dopo nuova pagina" ;
     Text [ portuguese_brazilian ] = "Interromper antes e ap? nova p?gina" ;
     Text [ portuguese ] = "Quebra antes e ap�s nova p�gina" ;
-    Text [ finnish ] = "Rivinvaihto uutta sivua ennen ja uuden sivun j�lkeen" ;
+    Text [ finnish ] = "Vaihto uutta sivua ennen ja uuden sivun j�lkeen" ;
     Text [ danish ] = "Skift f�r og efter ny side" ;
     Text [ french ] = "Sauts avant et apr�s nouvelle page" ;
     Text [ swedish ] = "Brytning f�re och efter ny sida" ;
@@ -662,7 +662,7 @@ String RID_SVXITEMS_BREAK_PAGE_BOTH
     Text [ spanish ] = "Salto antes y despu�s de nueva p�gina" ;
     Text [ english_us ] = "Break before and after new page" ;
     Text[ chinese_simplified ] = "在新页前后换页";
-    Text[ russian ] = "������ ����� ����� ��������� � ����� ���";
+    Text[ russian ] = "������ �� � ����� ����� ��������";
     Text[ polish ] = "Podzia� przed i po nowej stronie";
     Text[ japanese ] = "新しいページの前後で区切る";
     Text[ chinese_traditional ] = "在新頁前後換頁";
@@ -697,7 +697,7 @@ String RID_SVXITEMS_SHADOW_NONE
     Text[ chinese_traditional ] = "不帶陰影";
     Text[ arabic ] = "���� ��";
     Text[ greek ] = "����� ����";
-    Text[ korean ] = "음영 없음";
+    Text[ korean ] = "그림자 없음";
     Text[ turkish ] = "G�lge yok";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Sense ombra";
@@ -725,7 +725,7 @@ String RID_SVXITEMS_SHADOW_TOPLEFT
     Text[ chinese_traditional ] = "左上方陰影";
     Text[ arabic ] = "���� ���� ������";
     Text[ greek ] = "���� ���� ��������";
-    Text[ korean ] = "위 왼쪽에 음영";
+    Text[ korean ] = "위 왼쪽에 그림자";
     Text[ turkish ] = "Sol �stte g�lge";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Ombra superior esquerra";
@@ -753,7 +753,7 @@ String RID_SVXITEMS_SHADOW_TOPRIGHT
     Text[ chinese_traditional ] = "右上方陰影";
     Text[ arabic ] = "���� ���� ������";
     Text[ greek ] = "���� ���� �����";
-    Text[ korean ] = "위 오른쪽에 음영";
+    Text[ korean ] = "위 오른쪽에 그림자";
     Text[ turkish ] = "Sa� �stte g�lge";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Ombra superior dreta";
@@ -781,7 +781,7 @@ String RID_SVXITEMS_SHADOW_BOTTOMLEFT
     Text[ chinese_traditional ] = "左下方陰影";
     Text[ arabic ] = "���� ���� ������";
     Text[ greek ] = "���� ���� ��������";
-    Text[ korean ] = "아래 왼쪽에 음영";
+    Text[ korean ] = "아래 왼쪽에 그림자";
     Text[ turkish ] = "Sol altta g�lge";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Ombra inferior esquerra";
@@ -809,7 +809,7 @@ String RID_SVXITEMS_SHADOW_BOTTOMRIGHT
     Text[ chinese_traditional ] = "右下方陰影";
     Text[ arabic ] = "���� ���� ������";
     Text[ greek ] = "���� ���� �����";
-    Text[ korean ] = "아래 오른쪽에 음영";
+    Text[ korean ] = "아래 오른쪽에 그림자";
     Text[ turkish ] = "Sa� altta g�lge";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Ombra inferior dreta";
@@ -832,7 +832,7 @@ String RID_SVXITEMS_BRUSHSTYLE_NULL
     Text [ spanish ] = "Ninguno" ;
     Text [ english_us ] = "None" ;
     Text[ chinese_simplified ] = "无";
-    Text[ russian ] = "���";
+    Text[ russian ] = "���";
     Text[ polish ] = "Brak";
     Text[ japanese ] = "なし";
     Text[ chinese_traditional ] = "無充填";
@@ -860,7 +860,7 @@ String RID_SVXITEMS_BRUSHSTYLE_SOLID
     Text [ spanish ] = "S�lido" ;
     Text [ english_us ] = "Solid" ;
     Text[ chinese_simplified ] = "充填";
-    Text[ russian ] = "������";
+    Text[ russian ] = "��������";
     Text[ polish ] = "Pe�ny";
     Text[ japanese ] = "塗りつぶし";
     Text[ chinese_traditional ] = "充填";
@@ -950,7 +950,7 @@ String RID_SVXITEMS_BRUSHSTYLE_CROSS
     Text[ chinese_traditional ] = "格子";
     Text[ arabic ] = "����";
     Text[ greek ] = "����";
-    Text[ korean ] = "격자";
+    Text[ korean ] = "격자 무늬";
     Text[ turkish ] = "Karo";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Graella";
@@ -969,7 +969,7 @@ String RID_SVXITEMS_BRUSHSTYLE_DIAGCROSS
     Text [ french ] = "Losange" ;
     Text [ swedish ] = "Rutor diagonalt" ;
     Text [ dutch ] = "Ruit" ;
-    Text [ spanish ] = "Cuadriculado diagonal" ;
+    Text [ spanish ] = "Rombo" ;
     Text [ english_us ] = "Diamond" ;
     Text[ chinese_simplified ] = "对角格子";
     Text[ russian ] = "������������ ������";
@@ -1006,7 +1006,7 @@ String RID_SVXITEMS_BRUSHSTYLE_UPDIAG
     Text[ chinese_traditional ] = "對角向上";
     Text[ arabic ] = "���� �����";
     Text[ greek ] = "�������� ����";
-    Text[ korean ] = "대각선을 위로";
+    Text[ korean ] = "대각선 방향 위로";
     Text[ turkish ] = "Diyagonal yukar�";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Diagonal cap amunt";
@@ -1020,7 +1020,7 @@ String RID_SVXITEMS_BRUSHSTYLE_DOWNDIAG
     Text [ italian ] = "Diagonale gi�" ;
     Text [ portuguese_brazilian ] = "Diagonal para baixo" ;
     Text [ portuguese ] = "Diagonal para baixo" ;
-    Text [ finnish ] = "L�vist�j� alhaalla" ;
+    Text [ finnish ] = "Vinosti alas" ;
     Text [ danish ] = "Diagonal ned" ;
     Text [ french ] = "Diagonale vers le bas" ;
     Text [ swedish ] = "Diagonalt ned�t" ;
@@ -1034,7 +1034,7 @@ String RID_SVXITEMS_BRUSHSTYLE_DOWNDIAG
     Text[ chinese_traditional ] = "對角向下";
     Text[ arabic ] = "���� �����";
     Text[ greek ] = "�������� ����";
-    Text[ korean ] = "대각선 아래로";
+    Text[ korean ] = "대각선 방향 아래로";
     Text[ turkish ] = "Diyagonal a�a��";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Diagonal cap avall";
@@ -1074,7 +1074,7 @@ String RID_SVXITEMS_BRUSHSTYLE_BITMAP
     Text[ chinese_traditional ] = "影像";
     Text[ arabic ] = "����";
     Text[ greek ] = "������";
-    Text[ korean ] = "비트맵";
+    Text[ korean ] = "이미지";
     Text[ turkish ] = "Resim";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Imatge";
@@ -1089,11 +1089,11 @@ String RID_SVXITEMS_COLOR
     Text [ italian ] = "Colore  " ;
     Text [ portuguese_brazilian ] = "Cor " ;
     Text [ portuguese ] = "Cor  " ;
-    Text [ finnish ] = "V�ri" ;
+    Text [ finnish ] = "V�ri " ;
     Text [ danish ] = "Farve " ;
     Text [ french ] = "Couleur " ;
     Text [ swedish ] = "F�rg " ;
-    Text [ dutch ] = "Kleur   " ;
+    Text [ dutch ] = "Kleur" ;
     Text [ spanish ] = "Color   " ;
     Text [ english_us ] = "Color " ;
     Text[ chinese_simplified ] = "颜色 ";
@@ -1257,15 +1257,15 @@ String RID_SVXITEMS_COLOR_MAGENTA
     Text [ italian ] = "Magenta" ;
     Text [ portuguese_brazilian ] = "Magenta" ;
     Text [ portuguese ] = "Magenta" ;
-    Text [ finnish ] = "Purppura" ;
+    Text [ finnish ] = "Magenta" ;
     Text [ danish ] = "Magenta" ;
     Text [ french ] = "Magenta" ;
     Text [ swedish ] = "Magenta" ;
-    Text [ dutch ] = "Magenta" ;
+    Text [ dutch ] = "Violet" ;
     Text [ spanish ] = "Magenta" ;
     Text [ english_us ] = "Magenta" ;
     Text[ chinese_simplified ] = "紫红色";
-    Text[ russian ] = "�������";
+    Text[ russian ] = "���������";
     Text[ polish ] = "Purpurowy";
     Text[ japanese ] = "マゼンタ";
     Text[ chinese_traditional ] = "紫紅色";
@@ -1341,7 +1341,7 @@ String RID_SVXITEMS_COLOR_LIGHTGRAY
     Text [ italian ] = "Grigio chiaro" ;
     Text [ portuguese_brazilian ] = "Cinza Claro" ;
     Text [ portuguese ] = "Cinzento-claro" ;
-    Text [ finnish ] = "Vaaleanharmaa" ;
+    Text [ finnish ] = "Kirkas harmaa" ;
     Text [ danish ] = "Lysegr�" ;
     Text [ french ] = "Gris clair" ;
     Text [ swedish ] = "Ljusgr�tt" ;
@@ -1369,7 +1369,7 @@ String RID_SVXITEMS_COLOR_LIGHTBLUE
     Text [ italian ] = "Blu chiaro" ;
     Text [ portuguese_brazilian ] = "Azul Claro" ;
     Text [ portuguese ] = "Azul-claro" ;
-    Text [ finnish ] = "Vaaleansininen" ;
+    Text [ finnish ] = "Kirkas sininen" ;
     Text [ danish ] = "Lysebl�" ;
     Text [ french ] = "Bleu clair" ;
     Text [ swedish ] = "Ljusbl�tt" ;
@@ -1397,7 +1397,7 @@ String RID_SVXITEMS_COLOR_LIGHTGREEN
     Text [ italian ] = "Verde chiaro" ;
     Text [ portuguese_brazilian ] = "Verde Claro" ;
     Text [ portuguese ] = "Verde-claro" ;
-    Text [ finnish ] = "Vaaleanvihre�" ;
+    Text [ finnish ] = "Kirkas vihre�" ;
     Text [ danish ] = "Lysegr�n" ;
     Text [ french ] = "Vert clair" ;
     Text [ swedish ] = "Ljusgr�nt" ;
@@ -1425,7 +1425,7 @@ String RID_SVXITEMS_COLOR_LIGHTCYAN
     Text [ italian ] = "Ciano chiaro" ;
     Text [ portuguese_brazilian ] = "Ciano Claro" ;
     Text [ portuguese ] = "Cobalto-claro" ;
-    Text [ finnish ] = "Vaalea syaani" ;
+    Text [ finnish ] = "Kirkas syaani" ;
     Text [ danish ] = "Lys cyan" ;
     Text [ french ] = "Cyan clair" ;
     Text [ swedish ] = "Ljus cyan" ;
@@ -1453,7 +1453,7 @@ String RID_SVXITEMS_COLOR_LIGHTRED
     Text [ italian ] = "Rosso chiaro" ;
     Text [ portuguese_brazilian ] = "Vermelho Claro" ;
     Text [ portuguese ] = "Vermelho-claro" ;
-    Text [ finnish ] = "Vaalea punainen" ;
+    Text [ finnish ] = "Kirkas punainen" ;
     Text [ danish ] = "Lys r�d" ;
     Text [ french ] = "Rouge clair" ;
     Text [ swedish ] = "Ljusr�tt" ;
@@ -1481,15 +1481,15 @@ String RID_SVXITEMS_COLOR_LIGHTMAGENTA
     Text [ italian ] = "Magenta chiaro" ;
     Text [ portuguese_brazilian ] = "Magenta Claro" ;
     Text [ portuguese ] = "Magenta-claro" ;
-    Text [ finnish ] = "Vaaleanpurppura" ;
+    Text [ finnish ] = "Kirkas magenta" ;
     Text [ danish ] = "Lys magenta" ;
     Text [ french ] = "Magenta clair" ;
     Text [ swedish ] = "Ljus magenta" ;
-    Text [ dutch ] = "Lichtmagenta" ;
+    Text [ dutch ] = "Lichtviolet" ;
     Text [ spanish ] = "Magenta claro" ;
     Text [ english_us ] = "Light Magenta" ;
     Text[ chinese_simplified ] = "浅紫红色";
-    Text[ russian ] = "������-�������";
+    Text[ russian ] = "������-���������";
     Text[ polish ] = "Jasnopurpurowy";
     Text[ japanese ] = "明るいマゼンタ";
     Text[ chinese_traditional ] = "淺紫紅色";
@@ -1634,7 +1634,7 @@ String RID_SVXITEMS_ITALIC_NONE
     Text [ spanish ] = "No cursiva" ;
     Text [ english_us ] = "Not Italic" ;
     Text[ chinese_simplified ] = "不是斜体";
-    Text[ russian ] = "�� ������";
+    Text[ russian ] = "��� �������";
     Text[ polish ] = "Nie kursywa";
     Text[ japanese ] = "斜体でない";
     Text[ chinese_traditional ] = "不是斜體";
@@ -1682,7 +1682,7 @@ String RID_SVXITEMS_ITALIC_NORMAL
     Text [ italian ] = "Corsivo" ;
     Text [ portuguese_brazilian ] = "It?lico" ;
     Text [ portuguese ] = "It�lico" ;
-    Text [ finnish ] = "Kursivointi" ;
+    Text [ finnish ] = "Kursivoitu" ;
     Text [ danish ] = "Kursiv" ;
     Text [ french ] = "Italique" ;
     Text [ swedish ] = "Kursiv" ;
@@ -1720,7 +1720,7 @@ String RID_SVXITEMS_WEIGHT_THIN
     Text [ french ] = "Fin" ;
     Text [ swedish ] = "tunt" ;
     Text [ dutch ] = "dun" ;
-    Text [ spanish ] = "delgada" ;
+    Text [ spanish ] = "fina" ;
     Text [ english_us ] = "thin" ;
     Text[ chinese_simplified ] = "细体";
     Text[ russian ] = "������";
@@ -1729,7 +1729,7 @@ String RID_SVXITEMS_WEIGHT_THIN
     Text[ chinese_traditional ] = "細體";
     Text[ arabic ] = "����";
     Text[ greek ] = "�����";
-    Text[ korean ] = "가늘게";
+    Text[ korean ] = "얇게";
     Text[ turkish ] = "�nce";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "prim";
@@ -1757,7 +1757,7 @@ String RID_SVXITEMS_WEIGHT_ULTRALIGHT
     Text[ chinese_traditional ] = "特細";
     Text[ arabic ] = "���� ������";
     Text[ greek ] = "���� �����";
-    Text[ korean ] = "아주 가늘게";
+    Text[ korean ] = "아주 얇게";
     Text[ turkish ] = "�ok ince";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "ultraprim";
@@ -1771,7 +1771,7 @@ String RID_SVXITEMS_WEIGHT_LIGHT
     Text [ italian ] = "leggero" ;
     Text [ portuguese_brazilian ] = "claro" ;
     Text [ portuguese ] = "claro" ;
-    Text [ finnish ] = "vaalea" ;
+    Text [ finnish ] = "kirkas" ;
     Text [ danish ] = "let" ;
     Text [ french ] = "L�ger" ;
     Text [ swedish ] = "l�tt" ;
@@ -1799,12 +1799,12 @@ String RID_SVXITEMS_WEIGHT_SEMILIGHT
     Text [ italian ] = "semileggero" ;
     Text [ portuguese_brazilian ] = "semi-claro" ;
     Text [ portuguese ] = "semi-claro" ;
-    Text [ finnish ] = "puolivaalea" ;
+    Text [ finnish ] = "puolikirkas" ;
     Text [ danish ] = "semi let" ;
     Text [ french ] = "Semi-clair" ;
     Text [ swedish ] = "semil�tt" ;
     Text [ dutch ] = "halflicht" ;
-    Text [ spanish ] = "semi claro" ;
+    Text [ spanish ] = "semiclaro" ;
     Text [ english_us ] = "semi light" ;
     Text[ chinese_simplified ] = "半细";
     Text[ russian ] = "����������";
@@ -1869,7 +1869,7 @@ String RID_SVXITEMS_WEIGHT_MEDIUM
     Text[ chinese_traditional ] = "中等";
     Text[ arabic ] = "�����";
     Text[ greek ] = "������";
-    Text[ korean ] = "중간";
+    Text[ korean ] = "보통";
     Text[ turkish ] = "Orta";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "mitj�";
@@ -1888,7 +1888,7 @@ String RID_SVXITEMS_WEIGHT_SEMIBOLD
     Text [ french ] = "Semi-gras" ;
     Text [ swedish ] = "halvfet" ;
     Text [ dutch ] = "halfvet" ;
-    Text [ spanish ] = "semi negrita" ;
+    Text [ spanish ] = "seminegrita" ;
     Text [ english_us ] = "semi bold" ;
     Text[ chinese_simplified ] = "半粗";
     Text[ russian ] = "����������";
@@ -1897,7 +1897,7 @@ String RID_SVXITEMS_WEIGHT_SEMIBOLD
     Text[ chinese_traditional ] = "半粗";
     Text[ arabic ] = "��� ����";
     Text[ greek ] = "���-������";
-    Text[ korean ] = "굵게, 중간";
+    Text[ korean ] = "중간 굵게";
     Text[ turkish ] = "Yar� kal�n";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "seminegreta";
@@ -1911,7 +1911,7 @@ String RID_SVXITEMS_WEIGHT_BOLD
     Text [ italian ] = "grassetto" ;
     Text [ portuguese_brazilian ] = "negrito" ;
     Text [ portuguese ] = "negrito" ;
-    Text [ finnish ] = "lihavointi" ;
+    Text [ finnish ] = "lihavoitu" ;
     Text [ danish ] = "fed" ;
     Text [ french ] = "Gras" ;
     Text [ swedish ] = "fet" ;
@@ -2124,7 +2124,7 @@ String RID_SVXITEMS_UL_DONTKNOW
     Text[ turkish ] = "Alt� �izili";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Subratllat";
-    Text[ finnish ] = "Alleviivaa";
+    Text[ finnish ] = "Alleviivaus";
     Text[ thai ] = "ขีดเส้นใต้";
 };
 String RID_SVXITEMS_UL_DASH
@@ -2147,7 +2147,7 @@ String RID_SVXITEMS_UL_DASH
     Text[ chinese_traditional ] = "底線(劃線)";
     Text[ arabic ] = "�� ���� (�����)";
     Text[ greek ] = "Y���������� (�����)";
-    Text[ korean ] = "밑줄(대시)";
+    Text[ korean ] = "밑줄(파선)";
     Text[ turkish ] = "Alt� �izili (�izgi)";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Subratllat (tra�)";
@@ -2174,7 +2174,7 @@ String RID_SVXITEMS_UL_LONGDASH
     Text[ chinese_traditional ] = "底線(長劃線)";
     Text[ arabic ] = "�� ���� (����� �����)";
     Text[ greek ] = "Y���������� (������ �����)";
-    Text[ korean ] = "밑줄(긴 대시)";
+    Text[ korean ] = "밑줄(긴 파선)";
     Text[ turkish ] = "Alt� �izili (uzun �izgi)";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Subratllat (tra� llarg)";
@@ -2255,7 +2255,7 @@ String RID_SVXITEMS_UL_SMALLWAVE
     Text[ chinese_traditional ] = "底線(小波浪線)";
     Text[ arabic ] = "�� ���� (���� �����)";
     Text[ greek ] = "Y���������� (���� �����)";
-    Text[ korean ] = "밑줄(작은 파선)";
+    Text[ korean ] = "밑줄(여린 물결선)";
     Text[ turkish ] = "Alt� �izili (k���k dalga)";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Subratllat (ona petita)";
@@ -2282,7 +2282,7 @@ String RID_SVXITEMS_UL_WAVE
     Text[ chinese_traditional ] = "底線(波浪線)";
     Text[ arabic ] = "�� ���� (����)";
     Text[ greek ] = "Y���������� (����)";
-    Text[ korean ] = "밑줄(파선)";
+    Text[ korean ] = "밑줄(물결선)";
     Text[ turkish ] = "Alt� �izili (dalga)";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Subratllat (ona)";
@@ -2309,7 +2309,7 @@ String RID_SVXITEMS_UL_DOUBLEWAVE
     Text[ chinese_traditional ] = "底線(雙波浪線)";
     Text[ arabic ] = "�� ���� (���� ������)";
     Text[ greek ] = "Y���������� (���� �����)";
-    Text[ korean ] = "밑줄(이중 파선)";
+    Text[ korean ] = "밑줄(이중 물결선)";
     Text[ turkish ] = "Alt� �izili (�ift dalga)";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Subratllat (ona doble)";
@@ -2336,11 +2336,11 @@ String RID_SVXITEMS_UL_BOLD
     Text[ chinese_traditional ] = "粗型底線";
     Text[ arabic ] = "�� ���� ����";
     Text[ greek ] = "����������� (������)";
-    Text[ korean ] = "굵은 밑줄";
+    Text[ korean ] = "밑줄(굵게)";
     Text[ turkish ] = "Alt� �izili (kal�n)";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Subratllat (negreta)";
-    Text[ finnish ] = "Alleviivattu (lihavoitu)";
+    Text[ finnish ] = "Alleviivaus (lihavoitu)";
     Text[ thai ] = "ขีดเส้นใต้ (หนา)";
 };
 String RID_SVXITEMS_UL_BOLDDOTTED
@@ -2363,7 +2363,7 @@ String RID_SVXITEMS_UL_BOLDDOTTED
     Text[ chinese_traditional ] = "粗型下劃點線";
     Text[ arabic ] = "�� ���� ���� ����";
     Text[ greek ] = "��������� ����������� (������)";
-    Text[ korean ] = "굵은 점선 밑줄";
+    Text[ korean ] = "점선 밑줄(굵게)";
     Text[ turkish ] = "Noktalarla alt� �izili (kal�n)";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Subratllat de punts (negreta)";
@@ -2390,7 +2390,7 @@ String RID_SVXITEMS_UL_BOLDDASH
     Text[ chinese_traditional ] = "底線(粗型劃線)";
     Text[ arabic ] = "�� ���� ���� (����)";
     Text[ greek ] = "����������� (������ �����)";
-    Text[ korean ] = "밑줄(굵은 대시)";
+    Text[ korean ] = "밑줄(굵은 파선)";
     Text[ turkish ] = "Alt� �izili (kal�n �izgi)";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Subratallat (tra� negreta)";
@@ -2417,7 +2417,7 @@ String RID_SVXITEMS_UL_BOLDLONGDASH
     Text[ chinese_traditional ] = "底線(粗型長劃線)";
     Text[ arabic ] = "�� ���� ���� (���� �����)";
     Text[ greek ] = "����������� (������ �����, ������)";
-    Text[ korean ] = "밑줄(일점 쇄선, 굵게)";
+    Text[ korean ] = "밑줄(굵은 일점 쇄선)";
     Text[ turkish ] = "Alt� �izili (uzun kal�n �izgi)";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Subratllat (tra� negreta llarg)";
@@ -2444,7 +2444,7 @@ String RID_SVXITEMS_UL_BOLDDASHDOT
     Text[ chinese_traditional ] = "底線(粗型點劃線)";
     Text[ arabic ] = "�� ���� ���� (���� ����)";
     Text[ greek ] = "����������� (������-�����, ������)";
-    Text[ korean ] = "밑줄(일점 쇄선, 굵게)";
+    Text[ korean ] = "밑줄(굵은 일점 쇄선)";
     Text[ turkish ] = "Alt� �izili (kal�n nokta �izgi)";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Subratllat (punt tra� negreta)";
@@ -2471,7 +2471,7 @@ String RID_SVXITEMS_UL_BOLDDASHDOTDOT
     Text[ chinese_traditional ] = "底線(粗型點點劃線)";
     Text[ arabic ] = "�� ���� ���� (���� ���� ����)";
     Text[ greek ] = "����������� (������-������-�����, ������)";
-    Text[ korean ] = "밑줄(이점 쇄선, 굵게)";
+    Text[ korean ] = "밑줄(굵은 이점 쇄선)";
     Text[ turkish ] = "Alt� �izili (kal�n nokta nokta �izgi)";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Subratllat (punt punt tra� negreta)";
@@ -2498,7 +2498,7 @@ String RID_SVXITEMS_UL_BOLDWAVE
     Text[ chinese_traditional ] = "底線(粗型波浪線)";
     Text[ arabic ] = "�� ���� ���� (����)";
     Text[ greek ] = "����������� (������ ��������� �����)";
-    Text[ korean ] = "밑줄(굵은 파선)";
+    Text[ korean ] = "밑줄(굵은 물결선)";
     Text[ turkish ] = "Alt� �izili (kal�n dalga)";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Subratllat (ona, negreta)";
@@ -2623,7 +2623,7 @@ String RID_SVXITEMS_STRIKEOUT_SLASH
     Text [ English ] = "Strike through with /" ;
     Text[ english_us ] = "Strike through with slash";
     Text[ portuguese ] = "Rasurado com /";
-    Text[ russian ] = "������������ � /";
+    Text[ russian ] = "������������ ��������: /";
     Text[ dutch ] = "Doorhalen met /";
     Text[ french ] = "Barr� avec /";
     Text[ spanish ] = "Tachado con /";
@@ -2637,7 +2637,7 @@ String RID_SVXITEMS_STRIKEOUT_SLASH
     Text[ chinese_traditional ] = "用 / 代替刪除線";
     Text[ arabic ] = "����� ���� �����";
     Text[ greek ] = "�������� �� /";
-    Text[ korean ] = "/가 있는 취소선";
+    Text[ korean ] = "슬래시(/)로 취소선";
     Text[ turkish ] = "/ ile �st� �izili";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Barrat amb barra";
@@ -2650,7 +2650,7 @@ String RID_SVXITEMS_STRIKEOUT_X
     Text [ English ] = "Strike through with X" ;
     Text[ english_us ] = "Strike through with Xes";
     Text[ portuguese ] = "Rasurado com X";
-    Text[ russian ] = "������������ � X";
+    Text[ russian ] = "������������ ��������: X";
     Text[ dutch ] = "Doorhalen met X";
     Text[ french ] = "Barr� avec X";
     Text[ spanish ] = "Tachado con X";
@@ -2664,7 +2664,7 @@ String RID_SVXITEMS_STRIKEOUT_X
     Text[ chinese_traditional ] = "用 X 替代刪除線";
     Text[ arabic ] = "����� ������� X";
     Text[ greek ] = "����������� �� �";
-    Text[ korean ] = "X가 있는 취소선";
+    Text[ korean ] = "X자로 취소선";
     Text[ turkish ] = "X ile �st� �izili";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Barrat amb ics";
@@ -2688,7 +2688,7 @@ String RID_SVXITEMS_CASEMAP_NONE
     Text [ spanish ] = "Ninguno" ;
     Text [ english_us ] = "None" ;
     Text[ chinese_simplified ] = "无";
-    Text[ russian ] = "���";
+    Text[ russian ] = "���";
     Text[ polish ] = "Brak";
     Text[ japanese ] = "なし";
     Text[ chinese_traditional ] = "無";
@@ -2768,11 +2768,11 @@ String RID_SVXITEMS_CASEMAP_TITEL
     Text [ danish ] = "Titelskrift" ;
     Text [ french ] = "Caract�res du titre" ;
     Text [ swedish ] = "Titel" ;
-    Text [ dutch ] = "Titel" ;
-    Text [ spanish ] = "Caracteres de t�tulo" ;
+    Text [ dutch ] = "Lettertype titel" ;
+    Text [ spanish ] = "T�tulo" ;
     Text [ english_us ] = "Title" ;
     Text[ chinese_simplified ] = "标题文字";
-    Text[ russian ] = "��������� �����";
+    Text[ russian ] = "���������";
     Text[ polish ] = "Czcionka tytu�owa";
     Text[ japanese ] = "タイトル文字";
     Text[ chinese_traditional ] = "標題文字";
@@ -2850,11 +2850,11 @@ String RID_SVXITEMS_ESCAPEMENT_SUPER
     Text [ portuguese_brazilian ] = "Superposition " ;
     Text [ portuguese ] = "Superior � linha  " ;
     Text [ english_us ] = "Superscript " ;
-    Text [ finnish ] = "Yl�indeksi" ;
+    Text [ finnish ] = "Yl�indeksi " ;
     Text [ danish ] = "H�vet " ;
     Text [ french ] = "Exposant " ;
     Text [ swedish ] = "Upph�jt " ;
-    Text [ dutch ] = "Superscript   " ;
+    Text [ dutch ] = "Superscript" ;
     Text [ spanish ] = "Super�ndice   " ;
     Text[ chinese_simplified ] = "上标 ";
     Text[ russian ] = "������� ������ ";
@@ -2863,7 +2863,7 @@ String RID_SVXITEMS_ESCAPEMENT_SUPER
     Text[ chinese_traditional ] = "上標 ";
     Text[ arabic ] = "����� ";
     Text[ greek ] = "������� ";
-    Text[ korean ] = "위 첨자 ";
+    Text[ korean ] = "위첨자 ";
     Text[ turkish ] = "�st simge ";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Super�ndex   ";
@@ -2878,11 +2878,11 @@ String RID_SVXITEMS_ESCAPEMENT_SUB
     Text [ portuguese_brazilian ] = "Subposition " ;
     Text [ portuguese ] = "Inferior � linha  " ;
     Text [ english_us ] = "Subscript " ;
-    Text [ finnish ] = "Alaindeksi" ;
+    Text [ finnish ] = "Alapuolella " ;
     Text [ danish ] = "S�nket " ;
     Text [ french ] = "Indice " ;
     Text [ swedish ] = "Neds�nkt " ;
-    Text [ dutch ] = "Subscript   " ;
+    Text [ dutch ] = "Subscript" ;
     Text [ spanish ] = "Sub�ndice   " ;
     Text[ chinese_simplified ] = "下标 ";
     Text[ russian ] = "������ ������ ";
@@ -2891,7 +2891,7 @@ String RID_SVXITEMS_ESCAPEMENT_SUB
     Text[ chinese_traditional ] = "下標 ";
     Text[ arabic ] = "����� ";
     Text[ greek ] = "������� ";
-    Text[ korean ] = "아래 첨자 ";
+    Text[ korean ] = "아래첨자 ";
     Text[ turkish ] = "Alt simge ";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Sub�ndex   ";
@@ -2935,7 +2935,7 @@ String RID_SVXITEMS_ADJUST_LEFT
     Text [ portuguese ] = "Ajustar � esquerda" ;
     Text [ finnish ] = "Tasaa vasemmalle" ;
     Text [ danish ] = "Venstrejusteret" ;
-    Text [ french ] = "Alignement � gauche" ;
+    Text [ french ] = "Aligner � gauche" ;
     Text [ swedish ] = "V�nsterjusterat" ;
     Text [ dutch ] = "Op links uitlijnen" ;
     Text [ spanish ] = "Alinear a la izquierda" ;
@@ -2963,7 +2963,7 @@ String RID_SVXITEMS_ADJUST_RIGHT
     Text [ portuguese ] = "Ajustar � direita" ;
     Text [ finnish ] = "Tasaa oikealle" ;
     Text [ danish ] = "H�jrejusteret" ;
-    Text [ french ] = "Alignement � droite" ;
+    Text [ french ] = "Aligner � droite" ;
     Text [ swedish ] = "H�gerjusterat" ;
     Text [ dutch ] = "Op rechts uitlijnen" ;
     Text [ spanish ] = "Alinear a la derecha" ;
@@ -3133,7 +3133,7 @@ String RID_SVXITEMS_TAB_DECIMAL_CHAR
     Text[ chinese_traditional ] = "小數點符號：";
     Text[ arabic ] = "����� �����:";
     Text[ greek ] = "������� ���������:";
-    Text[ korean ] = "소수점 기호:";
+    Text[ korean ] = "소수 기호:";
     Text[ turkish ] = "Ondal�k ay�r�c�s�:";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Car�cter decimal:";
@@ -3287,7 +3287,7 @@ String RID_SVXITEMS_TAB_ADJUST_DEFAULT
     Text [ italian ] = "Predefinito" ;
     Text [ portuguese_brazilian ] = "Padr?o" ;
     Text [ portuguese ] = "Padr�o" ;
-    Text [ finnish ] = "Oletusarvo" ;
+    Text [ finnish ] = "Oletus" ;
     Text [ danish ] = "Standard" ;
     Text [ french ] = "Par d�faut" ;
     Text [ swedish ] = "Standard" ;
@@ -3295,13 +3295,13 @@ String RID_SVXITEMS_TAB_ADJUST_DEFAULT
     Text [ spanish ] = "Predeterminado" ;
     Text [ english_us ] = "Default" ;
     Text[ chinese_simplified ] = "默认";
-    Text[ russian ] = "�� ���������";
+    Text[ russian ] = "��������";
     Text[ polish ] = "Domy�lnie";
     Text[ japanese ] = "既定値";
     Text[ chinese_traditional ] = "默認";
     Text[ arabic ] = "�������";
     Text[ greek ] = "����������";
-    Text[ korean ] = "기본";
+    Text[ korean ] = "기본값";
     Text[ turkish ] = "Standart";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Per defecte";
@@ -3380,13 +3380,13 @@ String RID_ATTR_TABSTOP
     Text [ spanish ] = "Tabuladores" ;
     Text [ english_us ] = "Tab stops" ;
     Text[ chinese_simplified ] = "制表符";
-    Text[ russian ] = "����������";
+    Text[ russian ] = "���������";
     Text[ polish ] = "Tabulatory";
     Text[ japanese ] = "タブストップ";
     Text[ chinese_traditional ] = "定位鍵";
     Text[ arabic ] = "������ �������";
     Text[ greek ] = "����������";
-    Text[ korean ] = "탭 위치";
+    Text[ korean ] = "탭 설정 위치";
     Text[ turkish ] = "Sekme duraklar�";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Tabuladors";
@@ -3420,7 +3420,7 @@ String RID_ATTR_CHAR
     Text [ spanish ] = "Car�cter" ;
     Text [ english_us ] = "Character" ;
     Text[ chinese_simplified ] = "字符";
-    Text[ russian ] = "����";
+    Text[ russian ] = "������";
     Text[ polish ] = "Znak";
     Text[ japanese ] = "文字";
     Text[ chinese_traditional ] = "字元";
@@ -3472,7 +3472,7 @@ String RID_ATTR_CHAR_POSTURE
     Text [ danish ] = "Skriftposition" ;
     Text [ french ] = "Inclinaison" ;
     Text [ swedish ] = "Teckenstil" ;
-    Text [ dutch ] = "Letterpositie" ;
+    Text [ dutch ] = "Tekenstijl" ;
     Text [ spanish ] = "Posici�n de la fuente" ;
     Text [ english_us ] = "Font posture" ;
     Text[ chinese_simplified ] = "字体式样";
@@ -3500,17 +3500,17 @@ String RID_ATTR_CHAR_WEIGHT
     Text [ danish ] = "Skrifttykkelse" ;
     Text [ french ] = "Graisse" ;
     Text [ swedish ] = "Tjocklek" ;
-    Text [ dutch ] = "Letterdikte" ;
-    Text [ spanish ] = "Peso de fuente" ;
+    Text [ dutch ] = "Tekendikte" ;
+    Text [ spanish ] = "Grosor de fuente" ;
     Text [ english_us ] = "Font weight" ;
     Text[ chinese_simplified ] = "字体粗细";
-    Text[ russian ] = "������� ������";
+    Text[ russian ] = "��������";
     Text[ polish ] = "Grubo�� czcionki";
     Text[ japanese ] = "フォントの太さ";
     Text[ chinese_traditional ] = "字型粗細";
     Text[ arabic ] = "��� ����";
     Text[ greek ] = "����� ��������������";
-    Text[ korean ] = "글꼴 두께";
+    Text[ korean ] = "글꼴 굵기";
     Text[ turkish ] = "Yaz�tipi kal�nl���";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Pes de la lletra";
@@ -3538,7 +3538,7 @@ String RID_ATTR_CHAR_SHADOWED
     Text[ chinese_traditional ] = "帶陰影";
     Text[ arabic ] = "����";
     Text[ greek ] = "���������";
-    Text[ korean ] = "음영";
+    Text[ korean ] = "그림자 효과";
     Text[ turkish ] = "G�lgeli";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Amb ombra";
@@ -3556,8 +3556,8 @@ String RID_ATTR_CHAR_WORDLINEMODE
     Text [ danish ] = "Ordvis" ;
     Text [ french ] = "Mot par mot" ;
     Text [ swedish ] = "Ordvis" ;
-    Text [ dutch ] = "Alleen woorden" ;
-    Text [ spanish ] = "Solo palabras" ;
+    Text [ dutch ] = "Woord voor woord" ;
+    Text [ spanish ] = "S�lo palabras" ;
     Text [ english_us ] = "Individual words" ;
     Text[ chinese_simplified ] = "逐字";
     Text[ russian ] = "������ �����";
@@ -3566,7 +3566,7 @@ String RID_ATTR_CHAR_WORDLINEMODE
     Text[ chinese_traditional ] = "逐字";
     Text[ arabic ] = "������� ���";
     Text[ greek ] = "���� ����";
-    Text[ korean ] = "단어별";
+    Text[ korean ] = "한 단어 마다";
     Text[ turkish ] = "Yaln�zca s�zc�kler";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Paraules individuals";
@@ -3594,7 +3594,7 @@ String RID_ATTR_CHAR_CONTOUR
     Text[ chinese_traditional ] = "輪廓";
     Text[ arabic ] = "���� ��������";
     Text[ greek ] = "����������";
-    Text[ korean ] = "윤곽";
+    Text[ korean ] = "외곽선";
     Text[ turkish ] = "Kontur";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Contorn";
@@ -3636,7 +3636,7 @@ String RID_ATTR_CHAR_UNDERLINE
     Text [ italian ] = "Sottolineato" ;
     Text [ portuguese_brazilian ] = "Sublinhado" ;
     Text [ portuguese ] = "Sublinhado" ;
-    Text [ finnish ] = "Alleviivaa" ;
+    Text [ finnish ] = "Alleviivaus" ;
     Text [ danish ] = "Understreget" ;
     Text [ french ] = "Soulignage" ;
     Text [ swedish ] = "Understruken" ;
@@ -3664,15 +3664,15 @@ String RID_ATTR_CHAR_FONTHEIGHT
     Text [ italian ] = "Dimensioni carattere" ;
     Text [ portuguese_brazilian ] = "Altura de fonte" ;
     Text [ portuguese ] = "Altura do tipo de letra" ;
-    Text [ finnish ] = "Fontin korkeus" ;
+    Text [ finnish ] = "Fonttikoko" ;
     Text [ danish ] = "Skriftgrad" ;
     Text [ french ] = "Taille" ;
     Text [ swedish ] = "Teckenstorlek" ;
-    Text [ dutch ] = "Letterhoogte" ;
+    Text [ dutch ] = "Schriftgrootte" ;
     Text [ spanish ] = "Tama�o de la fuente" ;
     Text [ english_us ] = "Font size" ;
     Text[ chinese_simplified ] = "字体规格";
-    Text[ russian ] = "������ ������";
+    Text[ russian ] = "������ ������";
     Text[ polish ] = "Wysoko�� czcionki";
     Text[ japanese ] = "フォントのサイズ";
     Text[ chinese_traditional ] = "字型規格";
@@ -3696,11 +3696,11 @@ String RID_ATTR_CHAR_PROPSIZE
     Text [ danish ] = "Rel. skriftst�rrelse" ;
     Text [ french ] = "Taille relative" ;
     Text [ swedish ] = "Rel. teckenstorlek" ;
-    Text [ dutch ] = "Relatieve letterhoogte" ;
+    Text [ dutch ] = "Relatieve tekengrootte" ;
     Text [ spanish ] = "Tama�o relativo de fuente" ;
     Text [ english_us ] = "Rel. Font Size" ;
     Text[ chinese_simplified ] = "标准字体大小";
-    Text[ russian ] = "������ �������.";
+    Text[ russian ] = "�����. ������ ������";
     Text[ polish ] = "Wzgl�dna wielko�� czcionki";
     Text[ japanese ] = "相対的なフォントのサイズ";
     Text[ chinese_traditional ] = "標準字型大小";
@@ -3724,7 +3724,7 @@ String RID_ATTR_CHAR_COLOR
     Text [ danish ] = "Skriftfarve" ;
     Text [ french ] = "Couleur de police" ;
     Text [ swedish ] = "Teckenf�rg" ;
-    Text [ dutch ] = "Letterkleur" ;
+    Text [ dutch ] = "Tekenkleur" ;
     Text [ spanish ] = "Color de fuente" ;
     Text [ english_us ] = "Font color" ;
     Text[ chinese_simplified ] = "字体颜色";
@@ -3734,7 +3734,7 @@ String RID_ATTR_CHAR_COLOR
     Text[ chinese_traditional ] = "字型顏色";
     Text[ arabic ] = "��� ����";
     Text[ greek ] = "����� ��������������";
-    Text[ korean ] = "글꼴 색";
+    Text[ korean ] = "글꼴 색상";
     Text[ turkish ] = "Yaz�tipi rengi";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Color de la lletra";
@@ -3753,7 +3753,7 @@ String RID_ATTR_CHAR_KERNING
     Text [ spanish ] = "Ajuste entre caracteres" ;
     Text [ danish ] = "Knibning" ;
     Text [ swedish ] = "Kerning" ;
-    Text [ finnish ] = "Fonttilimitys" ;
+    Text [ finnish ] = "V�listys" ;
     Text [ english_us ] = "Kerning" ;
     Text[ chinese_simplified ] = "字母间隔相等";
     Text[ russian ] = "�������";
@@ -3876,7 +3876,7 @@ String RID_ATTR_CHAR_BLINK
     Text[ chinese_traditional ] = "閃動";
     Text[ arabic ] = "����";
     Text[ greek ] = "�� �����������";
-    Text[ korean ] = "깜박임";
+    Text[ korean ] = "깜박임 효과";
     Text[ turkish ] = "Yan�p s�nme";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Parpelleig";
@@ -3889,7 +3889,7 @@ String RID_ATTR_CHAR_CHARSETCOLOR
     Text [ English ] = "Charset Color" ;
     Text[ english_us ] = "Character set color";
     Text[ portuguese ] = "Cor dos caracteres";
-    Text[ russian ] = "���� ������ ������";
+    Text[ russian ] = "���� ������ ��������";
     Text[ greek ] = "����� ��� ����������";
     Text[ dutch ] = "Kleur tekenset";
     Text[ french ] = "Couleur de jeu de caract�res";
@@ -4013,7 +4013,7 @@ String RID_ATTR_PARA_LINESPACE
     Text [ spanish ] = "Interlineado" ;
     Text [ english_us ] = "Line spacing" ;
     Text[ chinese_simplified ] = "行距";
-    Text[ russian ] = "����� ��������";
+    Text[ russian ] = "��� �����";
     Text[ polish ] = "Odst�p wierszy";
     Text[ japanese ] = "行間";
     Text[ chinese_traditional ] = "行距";
@@ -4098,24 +4098,24 @@ String RID_ATTR_PARA_SPLIT
     Text = "Absatz nicht trennen" ;
     Text [ English ] = "Split paragraph" ;
     Text [ norwegian ] = "Del opp avsnitt" ;
-    Text [ italian ] = "Dividi paragrafo" ;
+    Text [ italian ] = "Non dividere paragrafo" ;
     Text [ portuguese_brazilian ] = "Partir par?grafo" ;
     Text [ portuguese ] = "Dividir par�grafo" ;
     Text [ finnish ] = "Jaa kappale" ;
     Text [ danish ] = "Del afsnit" ;
-    Text [ french ] = "Lignes non solidaires" ;
-    Text [ swedish ] = "Dela stycke" ;
+    Text [ french ] = "Lignes solidaires" ;
+    Text [ swedish ] = "Dela inte stycke" ;
     Text [ dutch ] = "Alinea splitsen" ;
-    Text [ spanish ] = "Dividir p�rrafo" ;
+    Text [ spanish ] = "No dividir p�rrafo" ;
     Text [ english_us ] = "Do not split paragraph" ;
-    Text[ chinese_simplified ] = "分开段落";
-    Text[ russian ] = "��������� �����";
+    Text[ chinese_simplified ] = "段中不分页";
+    Text[ russian ] = "������� �����";
     Text[ polish ] = "Podziel akapit";
-    Text[ japanese ] = "段落の分割";
-    Text[ chinese_traditional ] = "分開段落";
+    Text[ japanese ] = "段落を分割しない";
+    Text[ chinese_traditional ] = "段落不分開";
     Text[ arabic ] = "����� ������";
     Text[ greek ] = "����������� ����������";
-    Text[ korean ] = "단락 나누기";
+    Text[ korean ] = "단락 나누지 않음";
     Text[ turkish ] = "Paragraf� ay�r";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Divideix el par�graf";
@@ -4139,7 +4139,7 @@ String RID_ATTR_PARA_WIDOWS
     Text[ chinese_simplified ] = "段前分页";
     Text[ russian ] = "�������� ������� ������";
     Text[ polish ] = "Szewcy";
-    Text[ japanese ] = "オーファン";
+    Text[ japanese ] = "改ページ前の段落の孤立行";
     Text[ chinese_traditional ] = "段落前分頁";
     Text[ arabic ] = "������ �������";
     Text[ greek ] = "������";
@@ -4167,7 +4167,7 @@ String RID_ATTR_PARA_ORPHANS
     Text[ chinese_simplified ] = "孤行控制";
     Text[ russian ] = "��������� ������� ������";
     Text[ polish ] = "B�karty";
-    Text[ japanese ] = "ウィドウ";
+    Text[ japanese ] = "改ページ後の段落の孤立行";
     Text[ chinese_traditional ] = "段落遺留字串控制";
     Text[ arabic ] = "������ �������";
     Text[ greek ] = "�����";
@@ -4185,7 +4185,7 @@ String RID_ATTR_PARA_ULSPACE
     Text [ italian ] = "Distanza" ;
     Text [ portuguese_brazilian ] = "Dist?ncia" ;
     Text [ portuguese ] = "Espa�amento" ;
-    Text [ finnish ] = "Objektiv�lit" ;
+    Text [ finnish ] = "V�lit" ;
     Text [ danish ] = "Mellemrum" ;
     Text [ french ] = "�cart" ;
     Text [ swedish ] = "Avst�nd" ;
@@ -4217,7 +4217,7 @@ String RID_ATTR_PARA_LRSPACE
     Text [ danish ] = "Indrykning" ;
     Text [ french ] = "Retrait" ;
     Text [ swedish ] = "Indrag" ;
-    Text [ dutch ] = "Inspringen" ;
+    Text [ dutch ] = "Inspringing" ;
     Text [ spanish ] = "Sangr�a" ;
     Text [ english_us ] = "Indent" ;
     Text[ chinese_simplified ] = "缩进";
@@ -4227,7 +4227,7 @@ String RID_ATTR_PARA_LRSPACE
     Text[ chinese_traditional ] = "縮排";
     Text[ arabic ] = "�������";
     Text[ greek ] = "�����";
-    Text[ korean ] = "들여 쓰기";
+    Text[ korean ] = "들여쓰기";
     Text[ turkish ] = "Girinti";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Sagnat";
@@ -4261,7 +4261,7 @@ String RID_ATTR_LRSPACE
     Text [ danish ] = "Indrykning" ;
     Text [ french ] = "Retrait" ;
     Text [ swedish ] = "Indrag" ;
-    Text [ dutch ] = "Inspringen" ;
+    Text [ dutch ] = "Inspringing" ;
     Text [ spanish ] = "Sangr�a" ;
     Text [ english_us ] = "Indent" ;
     Text[ chinese_simplified ] = "缩进";
@@ -4285,7 +4285,7 @@ String RID_ATTR_ULSPACE
     Text [ italian ] = "Distanza" ;
     Text [ portuguese_brazilian ] = "Dist?ncia" ;
     Text [ portuguese ] = "Espa�amento" ;
-    Text [ finnish ] = "Objektiv�lit" ;
+    Text [ finnish ] = "V�lit" ;
     Text [ danish ] = "Mellemrum" ;
     Text [ french ] = "�cart" ;
     Text [ swedish ] = "Avst�nd" ;
@@ -4313,7 +4313,7 @@ String RID_ATTR_PAGE
     Text [ italian ] = "Pagina" ;
     Text [ portuguese_brazilian ] = "P?gina" ;
     Text [ portuguese ] = "P�gina" ;
-    Text [ finnish ] = "Sivu " ;
+    Text [ finnish ] = "Sivu" ;
     Text [ danish ] = "Side" ;
     Text [ french ] = "Page" ;
     Text [ swedish ] = "Sida" ;
@@ -4433,13 +4433,13 @@ String RID_ATTR_PARA_KEEP
     Text [ spanish ] = "Mantener p�rrafos juntos" ;
     Text [ english_us ] = "Keep with next paragraph" ;
     Text[ chinese_simplified ] = "与下段同页";
-    Text[ russian ] = "������ �� ��������� �������";
+    Text[ russian ] = "��������� �� ��������� �������";
     Text[ polish ] = "Razem z nast�pnym";
     Text[ japanese ] = "次の段落を離さない";
     Text[ chinese_traditional ] = "段落不分開";
     Text[ arabic ] = "����� �������";
     Text[ greek ] = "��������� ���������� ����";
-    Text[ korean ] = "단락들을 같은 페이지에";
+    Text[ korean ] = "현재 단락과 다음 단락을 같은 페이지에 배치";
     Text[ turkish ] = "Paragraflar� bir arada tut";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Mant� els par�grafs junts";
@@ -4450,19 +4450,19 @@ String RID_ATTR_FLASH
     Text = "Blinkend" ;
     Text [ english_us ] = "Blinking" ;
     Text[ portuguese ] = "Blinking";
-    Text[ russian ] = "Blinking";
+    Text[ russian ] = "�������";
     Text[ greek ] = "Blinking";
-    Text[ dutch ] = "Blinking";
+    Text[ dutch ] = "Knipperend";
     Text[ french ] = "Clignotant";
     Text[ spanish ] = "Intermitente";
-    Text[ finnish ] = "Blinking";
+    Text[ finnish ] = "Vilkkuva";
     Text[ italian ] = "Lampeggiante";
     Text[ danish ] = "Blinkende";
     Text[ swedish ] = "Blinkande";
     Text[ polish ] = "Blinking";
     Text[ portuguese_brazilian ] = "Blinking";
     Text[ japanese ] = "点滅";
-    Text[ korean ] = "깜박임";
+    Text[ korean ] = "깜박임 효과";
     Text[ chinese_simplified ] = "闪动的";
     Text[ chinese_traditional ] = "閃動";
     Text[ turkish ] = "Blinking";
@@ -4475,19 +4475,19 @@ String RID_ATTR_PARA_REGISTER
     Text = "Registerhaltigkeit" ;
     Text [ english_us ] = "Register-true" ;
     Text[ portuguese ] = "Register-true";
-    Text[ russian ] = "Register-true";
+    Text[ russian ] = "��������";
     Text[ greek ] = "Register-true";
-    Text[ dutch ] = "Register-true";
+    Text[ dutch ] = "Registreren";
     Text[ french ] = "Contr�le de rep�rage";
     Text[ spanish ] = "Conformidad registro";
-    Text[ finnish ] = "Register-true";
+    Text[ finnish ] = "Rivirekisteri";
     Text[ italian ] = "Conformit� registro";
     Text[ danish ] = "Hold register";
     Text[ swedish ] = "Register";
     Text[ polish ] = "Register-true";
     Text[ portuguese_brazilian ] = "Register-true";
     Text[ japanese ] = "印刷見当を合わせる";
-    Text[ korean ] = "등록-true";
+    Text[ korean ] = "인쇄할 때 가늠 맞춤 ";
     Text[ chinese_simplified ] = "正反页的行距相等";
     Text[ chinese_traditional ] = "正反頁的行距相等";
     Text[ turkish ] = "Register-true";
@@ -4500,12 +4500,12 @@ String RID_ATTR_BRUSH_CHAR
     Text = "Zeichenhintergrund" ;
     Text[ english_us ] = "Character background";
     Text[ portuguese ] = "Character Background";
-    Text[ russian ] = "Character Background";
+    Text[ russian ] = "��� �������";
     Text[ greek ] = "Character Background";
-    Text[ dutch ] = "Character Background";
+    Text[ dutch ] = "Tekenachtergrond";
     Text[ french ] = "Trame de fond";
     Text[ spanish ] = "Fondo de car�cter";
-    Text[ finnish ] = "Character Background";
+    Text[ finnish ] = "Merkin tausta";
     Text[ italian ] = "Sfondo carattere";
     Text[ danish ] = "Tegnbaggrund";
     Text[ swedish ] = "Teckenbakgrund";
@@ -4525,19 +4525,19 @@ String RID_ATTR_CHAR_CJK_FONT
     Text = "Asiatische Schrift" ;
     Text [ english_us ] = "Asian font" ;
     Text[ portuguese ] = "Asian Font";
-    Text[ russian ] = "Asian Font";
+    Text[ russian ] = "��������� �����";
     Text[ greek ] = "Asian Font";
-    Text[ dutch ] = "Asian Font";
+    Text[ dutch ] = "Aziatisch lettertype";
     Text[ french ] = "Police asiatique";
     Text[ spanish ] = "Fuente asi�tica";
-    Text[ finnish ] = "Asian Font";
+    Text[ finnish ] = "Aasialainen fontti";
     Text[ italian ] = "Caratteri asiatici";
     Text[ danish ] = "Asiatisk skrift";
     Text[ swedish ] = "Asiatiskt teckensnitt";
     Text[ polish ] = "Asian Font";
     Text[ portuguese_brazilian ] = "Asian Font";
     Text[ japanese ] = "日本語用フォント";
-    Text[ korean ] = "아시아어 글꼴";
+    Text[ korean ] = "한글 글꼴";
     Text[ chinese_simplified ] = "中日韩文字";
     Text[ chinese_traditional ] = "中日韓文字";
     Text[ turkish ] = "Asian Font";
@@ -4550,19 +4550,19 @@ String RID_ATTR_CHAR_CJK_FONTHEIGHT
     Text = "Schriftgrad asiatische Schrift" ;
     Text [ english_us ] = "Size of Asian font" ;
     Text[ portuguese ] = "Size asian font";
-    Text[ russian ] = "Size asian font";
+    Text[ russian ] = "������ ���������� ������";
     Text[ greek ] = "Size asian font";
-    Text[ dutch ] = "Size asian font";
+    Text[ dutch ] = "Schriftgrootte Aziatisch lettertype";
     Text[ french ] = "Taille police asiatique";
     Text[ spanish ] = "Tama�o de la fuente asi�tica";
-    Text[ finnish ] = "Size asian font";
+    Text[ finnish ] = "Aasialaisen fontin koko";
     Text[ italian ] = "Dimensioni del carattere asiatico";
     Text[ danish ] = "Skriftgrad, asiatisk skrift";
     Text[ swedish ] = "Teckenstorlek asiatiskt teckensnitt";
     Text[ polish ] = "Size asian font";
     Text[ portuguese_brazilian ] = "Size asian font";
     Text[ japanese ] = "日本語用フォントのサイズ";
-    Text[ korean ] = "아시아어 글꼴(크기)";
+    Text[ korean ] = "한글 글꼴 크기";
     Text[ chinese_simplified ] = "中日韩文字的字体规格";
     Text[ chinese_traditional ] = "中日韓文字的字型規格";
     Text[ turkish ] = "Size asian font";
@@ -4575,19 +4575,19 @@ String RID_ATTR_CHAR_CJK_LANGUAGE
     Text = "Sprache asiatische Schrift" ;
     Text [ english_us ] = "Language of Asian fonts" ;
     Text[ portuguese ] = "Language asian font";
-    Text[ russian ] = "Language asian font";
+    Text[ russian ] = "���� ��������� �������";
     Text[ greek ] = "Language asian font";
-    Text[ dutch ] = "Language asian font";
+    Text[ dutch ] = "Taal Aziatisch lettertype";
     Text[ french ] = "Langue police asiatique";
     Text[ spanish ] = "Idioma de la fuente asi�tica";
-    Text[ finnish ] = "Language asian font";
+    Text[ finnish ] = "Aasialaisten fonttien kieli";
     Text[ italian ] = "Lingua carattere asiatico";
     Text[ danish ] = "Sprog, asiatisk skrift";
     Text[ swedish ] = "Spr�k asiatiskt teckensnitt";
     Text[ polish ] = "Language asian font";
     Text[ portuguese_brazilian ] = "Language asian font";
     Text[ japanese ] = "日本語用フォントの言語";
-    Text[ korean ] = "언어 아시아어 글꼴(언어)";
+    Text[ korean ] = "한글 글꼴 언어";
     Text[ chinese_simplified ] = "中日韩文字语言";
     Text[ chinese_traditional ] = "中日韓文字語言";
     Text[ turkish ] = "Language asian font";
@@ -4600,19 +4600,19 @@ String RID_ATTR_CHAR_CJK_POSTURE
     Text = "Schriftstellung asiatische Schrift" ;
     Text [ english_us ] = "Posture of Asian fonts" ;
     Text[ portuguese ] = "Posture asian font";
-    Text[ russian ] = "Posture asian font";
+    Text[ russian ] = "��������� ��������� �������";
     Text[ greek ] = "Posture asian font";
-    Text[ dutch ] = "Posture asian font";
+    Text[ dutch ] = "Tekenstijl Aziatisch lettertype";
     Text[ french ] = "Inclinaison police asiatique";
     Text[ spanish ] = "Posici�n de la fuente asi�tica";
-    Text[ finnish ] = "Posture asian font";
+    Text[ finnish ] = "Aasialaisten fonttien asento";
     Text[ italian ] = "Orientamento carattere asiatico";
     Text[ danish ] = "Skriftposition, asiatisk skrift";
     Text[ swedish ] = "Teckenstil asiatiskt teckensnitt";
     Text[ polish ] = "Posture asian font";
     Text[ portuguese_brazilian ] = "Posture asian font";
     Text[ japanese ] = "日本語用フォントのスタイル";
-    Text[ korean ] = "아시아어 글꼴(스타일)";
+    Text[ korean ] = "한글 글꼴 스타일";
     Text[ chinese_simplified ] = "中日韩文字的字体式样";
     Text[ chinese_traditional ] = "中日韓文字字型的式樣";
     Text[ turkish ] = "Posture asian font";
@@ -4625,19 +4625,19 @@ String RID_ATTR_CHAR_CJK_WEIGHT
     Text = "Schriftst�rke asiatische Schrift" ;
     Text [ english_us ] = "Weight of Asian fonts" ;
     Text[ portuguese ] = "Weight asian font";
-    Text[ russian ] = "Weight asian font";
+    Text[ russian ] = "��� ��������� �������";
     Text[ greek ] = "Weight asian font";
-    Text[ dutch ] = "Weight asian font";
+    Text[ dutch ] = "Tekendikte Aziatisch lettertype";
     Text[ french ] = "Graisse police asiatique";
-    Text[ spanish ] = "Peso de la fuente asi�tica";
-    Text[ finnish ] = "Weight asian font";
+    Text[ spanish ] = "Espesor de la fuente asi�tica";
+    Text[ finnish ] = "Aasialaisten fonttien paino";
     Text[ italian ] = "Spessore carattere asiatico";
     Text[ danish ] = "Skrifttykkelse, asiatisk skrift";
     Text[ swedish ] = "Tjocklek asiatiskt teckensnitt";
     Text[ polish ] = "Weight asian font";
     Text[ portuguese_brazilian ] = "Weight asian font";
     Text[ japanese ] = "日本語用フォントの太さ";
-    Text[ korean ] = "아시아어 글꼴(두께)";
+    Text[ korean ] = "한글 글꼴 굵기";
     Text[ chinese_simplified ] = "中日韩文字的字体粗细";
     Text[ chinese_traditional ] = "中日韓文字字型的粗細";
     Text[ turkish ] = "Weight asian font";
@@ -4648,23 +4648,23 @@ String RID_ATTR_CHAR_CJK_WEIGHT
 String RID_ATTR_CHAR_CTL_FONT
 {
     Text = "CTL" ;
-    Text [ english_us ] = "Complex scripts" ;
+    Text [ english_us ] = "CTL" ;
     Text[ portuguese ] = "Complex scripts";
-    Text[ russian ] = "Complex scripts";
+    Text[ russian ] = "����������� ������";
     Text[ greek ] = "Complex scripts";
-    Text[ dutch ] = "Complex scripts";
+    Text[ dutch ] = "Complexe scripts";
     Text[ french ] = "Scripts complexes";
-    Text[ spanish ] = "Scripts complejos";
-    Text[ finnish ] = "Complex scripts";
+    Text[ spanish ] = "CTL";
+    Text[ finnish ] = "Laajennettu tekstiasettelu";
     Text[ italian ] = "Script complessi";
     Text[ danish ] = "Komplekse scripts";
-    Text[ swedish ] = "Komplexa skript";
+    Text[ swedish ] = "CTL";
     Text[ polish ] = "Complex scripts";
     Text[ portuguese_brazilian ] = "Complex scripts";
     Text[ japanese ] = "複合文字言語";
-    Text[ korean ] = "합성 스크립트";
-    Text[ chinese_simplified ] = "复杂的文字";
-    Text[ chinese_traditional ] = "複雜的文字";
+    Text[ korean ] = "복합 문자 언어(CTL)";
+    Text[ chinese_simplified ] = "复杂的文字版式";
+    Text[ chinese_traditional ] = "複雜的文字版式";
     Text[ turkish ] = "Complex scripts";
     Text[ arabic ] = "Complex scripts";
     Text[ catalan ] = "Scripts complexos";
@@ -4675,19 +4675,19 @@ String RID_ATTR_CHAR_CTL_FONTHEIGHT
     Text = "Schriftgrad komplexe Skripte" ;
     Text [ english_us ] = "Size of complex scripts" ;
     Text[ portuguese ] = "Size complex scripts";
-    Text[ russian ] = "Size complex scripts";
+    Text[ russian ] = "������ ����������� ��������";
     Text[ greek ] = "Size complex scripts";
-    Text[ dutch ] = "Size complex scripts";
+    Text[ dutch ] = "Schriftgrootte complexe scripts";
     Text[ french ] = "Taille scripts complexes";
     Text[ spanish ] = "Tama�o de scripts complejos";
-    Text[ finnish ] = "Size complex scripts";
+    Text[ finnish ] = "Laajennettujen tekstiasettelujen koko";
     Text[ italian ] = "Dimensioni degli script complessi";
     Text[ danish ] = "Skriftgrad, komplekse scripts";
     Text[ swedish ] = "Teckenstorlek komplexa teckensnitt";
     Text[ polish ] = "Size complex scripts";
     Text[ portuguese_brazilian ] = "Size complex scripts";
     Text[ japanese ] = "複合文字言語用フォントのサイズ";
-    Text[ korean ] = "크기 합성 스크립트";
+    Text[ korean ] = "복함 문자 언어 글꼴 크기";
     Text[ chinese_simplified ] = "复杂的文字的字体大小";
     Text[ chinese_traditional ] = "複雜的文字的字型大小";
     Text[ turkish ] = "Size complex scripts";
@@ -4700,19 +4700,19 @@ String RID_ATTR_CHAR_CTL_LANGUAGE
     Text = "Sprache komplexe Skripte" ;
     Text [ english_us ] = "Language of complex scripts" ;
     Text[ portuguese ] = "Language complex scripts";
-    Text[ russian ] = "Language complex scripts";
+    Text[ russian ] = "���� ����������� ��������";
     Text[ greek ] = "Language complex scripts";
-    Text[ dutch ] = "Language complex scripts";
+    Text[ dutch ] = "Taal complexe scripts";
     Text[ french ] = "Langue scripts complexes";
     Text[ spanish ] = "Idioma de scripts complejos";
-    Text[ finnish ] = "Language complex scripts";
+    Text[ finnish ] = "Laajennettujen tekstiasettelujen kieli";
     Text[ italian ] = "Lingua script complessi";
     Text[ danish ] = "Sprog, komplekse scripts";
     Text[ swedish ] = "Spr�k komplexa skript";
     Text[ polish ] = "Language complex scripts";
     Text[ portuguese_brazilian ] = "Language complex scripts";
     Text[ japanese ] = "複合文字言語";
-    Text[ korean ] = "언어 합성 스크립트";
+    Text[ korean ] = "양방향 텍스트 언어";
     Text[ chinese_simplified ] = "复杂的文字语言";
     Text[ chinese_traditional ] = "複雜的文字語言";
     Text[ turkish ] = "Language complex scripts";
@@ -4725,19 +4725,19 @@ String RID_ATTR_CHAR_CTL_POSTURE
     Text = "Schriftstellung komplexe Skripte" ;
     Text [ english_us ] = "Posture of complex scripts" ;
     Text[ portuguese ] = "Posture complex scripts";
-    Text[ russian ] = "Posture complex scripts";
+    Text[ russian ] = "��������� ����������� ��������";
     Text[ greek ] = "Posture complex scripts";
-    Text[ dutch ] = "Posture complex scripts";
+    Text[ dutch ] = "Tekenstijl complexe scripts";
     Text[ french ] = "Inclinaison scripts complexes";
     Text[ spanish ] = "Posici�n de scripts complejos";
-    Text[ finnish ] = "Posture complex scripts";
+    Text[ finnish ] = "Laajennettujen tekstiasettelujen asento";
     Text[ italian ] = "Orientamento script complessi";
     Text[ danish ] = "Skriftposition, komplekse scripts";
     Text[ swedish ] = "Teckenstil komplexa skript";
     Text[ polish ] = "Posture complex scripts";
     Text[ portuguese_brazilian ] = "Posture complex scripts";
     Text[ japanese ] = "複合文字言語用フォントのスタイル";
-    Text[ korean ] = "스타일 합성 스크립트";
+    Text[ korean ] = "복합 문자 언어 스타일";
     Text[ chinese_simplified ] = "复杂的文字的字体式样";
     Text[ chinese_traditional ] = "複雜的文字的字型式樣";
     Text[ turkish ] = "Posture complex scripts";
@@ -4750,19 +4750,19 @@ String RID_ATTR_CHAR_CTL_WEIGHT
     Text = "Schriftst�rke komplexe Skripte" ;
     Text [ english_us ] = "Weight of complex scripts" ;
     Text[ portuguese ] = "Weight complex scripts";
-    Text[ russian ] = "Weight complex scripts";
+    Text[ russian ] = "��� ����������� ��������";
     Text[ greek ] = "Weight complex scripts";
-    Text[ dutch ] = "Weight complex scripts";
+    Text[ dutch ] = "Tekendikte complexe scripts";
     Text[ french ] = "Graisse scripts complexes";
-    Text[ spanish ] = "Peso de scripts complejos";
-    Text[ finnish ] = "Weight complex scripts";
+    Text[ spanish ] = "Espesor de scripts complejos";
+    Text[ finnish ] = "Laajennettujen tekstiasettelujen paino";
     Text[ italian ] = "Spessore script complessi";
     Text[ danish ] = "Skrifttykkelse, komplekse scripts";
     Text[ swedish ] = "Tjocklek komplexa skript";
     Text[ polish ] = "Weight complex scripts";
     Text[ portuguese_brazilian ] = "Weight complex scripts";
     Text[ japanese ] = "複合文字言語用フォントの太さ";
-    Text[ korean ] = "두께 합성 스크립트";
+    Text[ korean ] = "복합 문자 언어 굵기";
     Text[ chinese_simplified ] = "复杂的文字字体粗细";
     Text[ chinese_traditional ] = "複雜的文字的字型粗細";
     Text[ turkish ] = "Weight complex scripts";
@@ -4775,19 +4775,19 @@ String RID_ATTR_CHAR_TWO_LINES
     Text = "Doppelzeilig";
     Text [ english_us ] = "Double-lined" ;
     Text[ portuguese ] = "Double lined";
-    Text[ russian ] = "Double lined";
+    Text[ russian ] = "������������";
     Text[ greek ] = "Double lined";
-    Text[ dutch ] = "Double lined";
+    Text[ dutch ] = "Tweeregelig";
     Text[ french ] = "Deux lignes en une";
     Text[ spanish ] = "L�neas dobles";
-    Text[ finnish ] = "Double lined";
+    Text[ finnish ] = "Kaksoisviiva";
     Text[ italian ] = "Due righe";
     Text[ danish ] = "Dobbeltlinjet";
     Text[ swedish ] = "Dubbla rader";
     Text[ polish ] = "Double lined";
     Text[ portuguese_brazilian ] = "Double lined";
     Text[ japanese ] = "2行使い";
-    Text[ korean ] = "두 자리로";
+    Text[ korean ] = "두줄";
     Text[ chinese_simplified ] = "双行";
     Text[ chinese_traditional ] = "雙行";
     Text[ turkish ] = "Double lined";
@@ -4800,12 +4800,12 @@ String RID_ATTR_CHAR_EMPHASISMARK
     Text = "Betonungszeichen";
     Text [ english_us ] = "Emphasis mark" ;
     Text[ portuguese ] = "Emphasis mark";
-    Text[ russian ] = "Emphasis mark";
+    Text[ russian ] = "����� ���������";
     Text[ greek ] = "Emphasis mark";
-    Text[ dutch ] = "Emphasis mark";
+    Text[ dutch ] = "Accentteken";
     Text[ french ] = "Caract�res d'accentuation";
     Text[ spanish ] = "Caracteres de acentuaci�n";
-    Text[ finnish ] = "Emphasis mark";
+    Text[ finnish ] = "Painotusmerkki";
     Text[ italian ] = "Segni esclamativi";
     Text[ danish ] = "Fremh�vningstegn";
     Text[ swedish ] = "Betoningstecken";
@@ -4825,12 +4825,12 @@ String RID_ATTR_PARA_SCRIPTSPACE
     Text = "Text Abstand" ;
     Text[ english_us ] = "Text spacing";
     Text[ portuguese ] = "Text spacing";
-    Text[ russian ] = "Text spacing";
+    Text[ russian ] = "��������� ��������";
     Text[ greek ] = "Text spacing";
-    Text[ dutch ] = "Text spacing";
+    Text[ dutch ] = "Afstand tot tekst";
     Text[ french ] = "Espacement du texte";
     Text[ spanish ] = "Espacio del texto";
-    Text[ finnish ] = "Text spacing";
+    Text[ finnish ] = "Tekstin v�lit";
     Text[ italian ] = "Spaziatura testo";
     Text[ danish ] = "Tekstafstand";
     Text[ swedish ] = "Textavst�nd";
@@ -4850,19 +4850,19 @@ String RID_ATTR_PARA_HANGPUNCTUATION
     Text = "H�ngende Interpunktion" ;
     Text[ english_us ] = "Hanging punctuation";
     Text[ portuguese ] = "Hanging punctuation";
-    Text[ russian ] = "Hanging punctuation";
+    Text[ russian ] = "������� ����������";
     Text[ greek ] = "Hanging punctuation";
-    Text[ dutch ] = "Hanging punctuation";
+    Text[ dutch ] = "Hangende interpunctie";
     Text[ french ] = "Ponctuation en retrait";
     Text[ spanish ] = "Puntuaci�n saliente";
-    Text[ finnish ] = "Hanging punctuation";
+    Text[ finnish ] = "Riippuvat v�limerkit";
     Text[ italian ] = "Punteggiatura sospesa";
     Text[ danish ] = "H�ngende tegns�tning";
     Text[ swedish ] = "H�ngande interpunktion";
     Text[ polish ] = "Hanging punctuation";
     Text[ portuguese_brazilian ] = "Hanging punctuation";
     Text[ japanese ] = "句読点のぶら下げ";
-    Text[ korean ] = "행잉(Hanging) 구두점";
+    Text[ korean ] = "문장 부호 끌어 맞춤";
     Text[ chinese_simplified ] = "行末附加标点符号";
     Text[ chinese_traditional ] = "行末附加標點符號";
     Text[ turkish ] = "Hanging punctuation";
@@ -4875,19 +4875,19 @@ String RID_ATTR_PARA_FORBIDDEN_RULES
     Text = "Verbotene Zeichen" ;
     Text[ english_us ] = "Forbidden characters";
     Text[ portuguese ] = "Forbidden characters";
-    Text[ russian ] = "Forbidden characters";
+    Text[ russian ] = "����������� �������";
     Text[ greek ] = "Forbidden characters";
-    Text[ dutch ] = "Forbidden characters";
+    Text[ dutch ] = "Niet-toegestane tekens";
     Text[ french ] = "Caract�res non permis";
     Text[ spanish ] = "Caracteres no permitidos";
-    Text[ finnish ] = "Forbidden characters";
+    Text[ finnish ] = "Kielletyt merkit";
     Text[ italian ] = "Caratteri non ammessi";
     Text[ danish ] = "Forbudte tegn";
     Text[ swedish ] = "F�rbjudna tecken";
     Text[ polish ] = "Forbidden characters";
     Text[ portuguese_brazilian ] = "Forbidden characters";
     Text[ japanese ] = "禁則文字";
-    Text[ korean ] = "사용 금지 문자";
+    Text[ korean ] = "금칙 문자";
     Text[ chinese_simplified ] = "禁止使用的字符";
     Text[ chinese_traditional ] = "禁止使用的字元";
     Text[ turkish ] = "Forbidden characters";
@@ -4902,7 +4902,7 @@ String RID_ATTR_CHAR_ROTATED
     Text[ portuguese ] = "Rota��o";
     Text[ russian ] = "��������";
     Text[ greek ] = "����������";
-    Text[ dutch ] = "Draaien";
+    Text[ dutch ] = "Rotatie";
     Text[ french ] = "Rotation";
     Text[ spanish ] = "Rotaci�n";
     Text[ finnish ] = "Kierto";
@@ -4925,12 +4925,12 @@ String RID_ATTR_CHAR_SCALEWIDTH
     Text = "Skalierung";
     Text [ english_us ] = "Scale" ;
     Text[ portuguese ] = "Scaling";
-    Text[ russian ] = "Scaling";
+    Text[ russian ] = "�������";
     Text[ greek ] = "Scaling";
-    Text[ dutch ] = "Scaling";
+    Text[ dutch ] = "Schaal";
     Text[ french ] = "�chelle";
     Text[ spanish ] = "Escala";
-    Text[ finnish ] = "Scaling";
+    Text[ finnish ] = "Skaalaa";
     Text[ italian ] = "Scala";
     Text[ danish ] = "Skalering";
     Text[ swedish ] = "Skalning";
@@ -4975,19 +4975,19 @@ String RID_PARA_VERTALIGN
     Text = "Vertikale Textausrichtung" ;
     Text[ english_us ] = "Vertical text alignment";
     Text[ portuguese ] = "Vertical text alignment";
-    Text[ russian ] = "Vertical text alignment";
+    Text[ russian ] = "������������ ������ �� ���������";
     Text[ greek ] = "Vertical text alignment";
-    Text[ dutch ] = "Vertical text alignment";
+    Text[ dutch ] = "Verticale tekstuitlijning";
     Text[ french ] = "Alignement vertical du texte";
     Text[ spanish ] = "Alineaci�n vertical del texto";
-    Text[ finnish ] = "Vertical text alignment";
+    Text[ finnish ] = "Tekstin tasaus pystysuunnassa";
     Text[ italian ] = "Allineamento del testo verticale";
     Text[ danish ] = "Lodret tekstjustering";
     Text[ swedish ] = "Vertikal textjustering";
     Text[ polish ] = "Vertical text alignment";
     Text[ portuguese_brazilian ] = "Vertical text alignment";
     Text[ japanese ] = "縦書き";
-    Text[ korean ] = "세로 텍스트 맞춤";
+    Text[ korean ] = "세로 쓰기";
     Text[ chinese_simplified ] = "直式文字对齐";
     Text[ chinese_traditional ] = "直式文字對齊";
     Text[ turkish ] = "Vertical text alignment";
@@ -5015,7 +5015,7 @@ String RID_SINGLE_LINE0
     Text[ chinese_traditional ] = "單﹐細線";
     Text[ arabic ] = "���ϡ �� ����";
     Text[ greek ] = "���� ����� ������";
-    Text[ korean ] = "단일 가는 선";
+    Text[ korean ] = "섬세한 단일선";
     Text[ turkish ] = "Tek, �nce �izgi";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Senzill, l�nies fines";
@@ -5034,15 +5034,15 @@ String RID_SINGLE_LINE1
     Text [ italian ] = "Singola, sottile" ;
     Text [ spanish ] = "Sencilla, delgada" ;
     Text [ french ] = "Ligne fine" ;
-    Text [ dutch ] = "Eenvoudig, dun" ;
+    Text [ dutch ] = "Enkel, dun" ;
     Text[ chinese_simplified ] = "单，细";
-    Text[ russian ] = "������� ������ �����";
+    Text[ russian ] = "������� ������";
     Text[ polish ] = "Pojedyncza, cienka";
     Text[ japanese ] = "線､細い";
     Text[ chinese_traditional ] = "單﹐細";
     Text[ arabic ] = "���ϡ ����";
     Text[ greek ] = "����, �����";
-    Text[ korean ] = "단일, 얇게";
+    Text[ korean ] = "얇은 단일선";
     Text[ turkish ] = "Tek, �nce";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Simple, prim";
@@ -5061,15 +5061,15 @@ String RID_SINGLE_LINE2
     Text [ italian ] = "Singola, spessa" ;
     Text [ spanish ] = "Sencilla, gruesa" ;
     Text [ french ] = "Ligne �paisse" ;
-    Text [ dutch ] = "Eenvoudig, dik" ;
+    Text [ dutch ] = "Enkel, dik" ;
     Text[ chinese_simplified ] = "单，粗";
-    Text[ russian ] = "������� ������� �����";
+    Text[ russian ] = "������� �������";
     Text[ polish ] = "Pojedyncza, gruba";
     Text[ japanese ] = "線､太い";
     Text[ chinese_traditional ] = "單﹐粗";
     Text[ arabic ] = "���ϡ ����";
     Text[ greek ] = "����, ����";
-    Text[ korean ] = "단일, 굵게";
+    Text[ korean ] = "굵은 단일선";
     Text[ turkish ] = "Tek, Kal�n";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Simple, gruixut";
@@ -5088,15 +5088,15 @@ String RID_SINGLE_LINE3
     Text [ italian ] = "Singola, molto spessa" ;
     Text [ spanish ] = "Sencilla, muy gruesa" ;
     Text [ french ] = "Ligne extra �paisse" ;
-    Text [ dutch ] = "Eenvoudig, zeer dik" ;
+    Text [ dutch ] = "Enkel, zeer dik" ;
     Text[ chinese_simplified ] = "单，很粗";
-    Text[ russian ] = "�������, ����� ������� �����";
+    Text[ russian ] = "�������, ����� �������";
     Text[ polish ] = "Pojedyncza, bardzo gruba";
     Text[ japanese ] = "線､極太";
     Text[ chinese_traditional ] = "單﹐很粗";
     Text[ arabic ] = "���ϡ ���� ����";
     Text[ greek ] = "����, ���� ����";
-    Text[ korean ] = "단일, 아주 굵게";
+    Text[ korean ] = "아주 굵은 단일선";
     Text[ turkish ] = "Tek, �ok kal�n";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Simple, molt gruixut";
@@ -5115,7 +5115,7 @@ String RID_SINGLE_LINE4
     Text [ italian ] = "Singola, grassetto" ;
     Text [ spanish ] = "Sencillo, negrita" ;
     Text [ french ] = "Ligne grasse" ;
-    Text [ dutch ] = "Eenvoudig, vet" ;
+    Text [ dutch ] = "Enkel, vet" ;
     Text[ chinese_simplified ] = "单，粗";
     Text[ russian ] = "�������, ������ �����";
     Text[ polish ] = "Pojedyncza, gruba";
@@ -5123,7 +5123,7 @@ String RID_SINGLE_LINE4
     Text[ chinese_traditional ] = "單﹐粗";
     Text[ arabic ] = "���ϡ ����";
     Text[ greek ] = "����, ������";
-    Text[ korean ] = "단일, 진함";
+    Text[ korean ] = "굵은 단일선";
     Text[ turkish ] = "Tek, Kal�n";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Simple, negreta";
@@ -5204,7 +5204,7 @@ String RID_DOUBLE_LINE2
     Text[ chinese_traditional ] = "雙，細，間隔：小";
     Text[ arabic ] = "����̡ ���ڡ �������: ����";
     Text[ greek ] = "�����, �����, ��������: �����";
-    Text[ korean ] = "이중, 얇게, 간격: 작게";
+    Text[ korean ] = "이중선, 얇게, 간격: 작게";
     Text[ turkish ] = "�ift, �nce, Aral�k: k���k";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Doble, prim, espaiat: petit";
@@ -5225,7 +5225,7 @@ String RID_DOUBLE_LINE3
     Text [ french ] = "Double, �paisse, �cart : grand" ;
     Text [ dutch ] = "Dubbel, dik, afstand: groot" ;
     Text[ chinese_simplified ] = "双，粗，间隔：大";
-    Text[ russian ] = "�������, ������� �����, ��������:�������";
+    Text[ russian ] = "������� �����, �������, ��������:�������";
     Text[ polish ] = "Podw�jna, gruba, Odst�p: du�y";
     Text[ japanese ] = "二重線､太い､間隔:広い";
     Text[ chinese_traditional ] = "雙，粗，間隔：大";
@@ -5258,7 +5258,7 @@ String RID_DOUBLE_LINE4
     Text[ chinese_traditional ] = "雙，內：細線，外：細，間隔：大";
     Text[ arabic ] = "����̡ ������: �� ���ޡ ������: ���ڡ �������: ����";
     Text[ greek ] = "�����, ���������: ����� ������, ���������: �����, ��������: ������";
-    Text[ korean ] = "이중, 안: 가는 선, 바깥: 얇게, 간격: 크게";
+    Text[ korean ] = "이중선, 안: 섬세한 선, 바깥: 얇게, 간격: 크게";
     Text[ turkish ] = "�ift, ��: ince �izgi, D��: ince, Aral�k: b�y�k";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Doble, interior: L�nia fina, exterior: prima, Espai: gran";
@@ -5339,7 +5339,7 @@ String RID_DOUBLE_LINE7
     Text[ chinese_traditional ] = "雙，內：細，外：粗，間隔：大";
     Text[ arabic ] = "����̡ ������: ���ڡ ������: ���� �������: ����";
     Text[ greek ] = "�����, ���������: �����, ���������: ����, ��������: ������";
-    Text[ korean ] = "이중, 안: 얇게, 바깥: 굵게, 간격: 크게";
+    Text[ korean ] = "이중선, 안: 얇게, 바깥: 굵게, 간격: 크게";
     Text[ turkish ] = "�ift, ��: ince, D��: kal�n, Aral�k: b�y�k";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Doble, dins: prim, fora: gruixut, espaiat: gran";
@@ -5366,7 +5366,7 @@ String RID_DOUBLE_LINE8
     Text[ chinese_traditional ] = "雙, 內: 粗, 外: 細, 間隔: 小";
     Text[ arabic ] = "����̡ ������: ���� ������: ���ڡ �������: ����";
     Text[ greek ] = "�����, ���������: ����, ���������: �����, ��������: �����";
-    Text[ korean ] = "이중, 안: 두껍게, 바깥: 얇게, 간격: 작게";
+    Text[ korean ] = "이중선, 안: 두껍게, 바깥: 얇게, 간격: 작게";
     Text[ turkish ] = "�ift, ��: kal�n, D��: ince, Aral�k: k���k";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Doble, dins: gruixut, fora: prim, espaiat: petit";
@@ -5414,7 +5414,7 @@ String RID_DOUBLE_LINE10
     Text [ french ] = "Double, int�rieure : tr�s �paisse, ext�rieure : �paisse, �cart : grand" ;
     Text [ dutch ] = "Dubbel, binnen: zeer dik, buiten: dik, afstand: groot" ;
     Text[ chinese_simplified ] = "双，内：很粗，外：粗，间隔：大";
-    Text[ russian ] = "������� �����, ������: ����� �������, �������: �������, ��������: �������";
+    Text[ russian ] = "������� �����, ������: ����� �������, �������: �������, ��������: �������";
     Text[ polish ] = "Podw�jna, Wewn�trzna: bardzo gruba, Zewn�trzna: gruba, Odst�p: du�y";
     Text[ japanese ] = "二重線､内側:極太､外側:並太､間隔:広い";
     Text[ chinese_traditional ] = "雙，內：很粗：外：粗，間隔：大";
@@ -5459,7 +5459,7 @@ String RID_SVXITEMS_HORJUST_STANDARD
     Text [ italian ] = "Allineamento orizzontale standard" ;
     Text [ portuguese_brazilian ] = "Ajuste padr?o" ;
     Text [ portuguese ] = "Alinhamento padr�o horizontal" ;
-    Text [ finnish ] = "Vaakatasaus oletusarvona" ;
+    Text [ finnish ] = "Vaakatasaus oletuksena" ;
     Text [ danish ] = "Vandretjustering standard" ;
     Text [ french ] = "Alignement horizontal par d�faut" ;
     Text [ swedish ] = "Horisontell justering standard" ;
@@ -5473,7 +5473,7 @@ String RID_SVXITEMS_HORJUST_STANDARD
     Text[ chinese_traditional ] = "水平對齊 標準";
     Text[ arabic ] = "������ ����� ������";
     Text[ greek ] = "��������� �������� �� ����������";
-    Text[ korean ] = "수평 맞춤, 기본";
+    Text[ korean ] = "기본 수평 맞춤 ";
     Text[ turkish ] = "Yatay hizalama (standart)";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Alineament horitzontal est�ndard";
@@ -5489,7 +5489,7 @@ String RID_SVXITEMS_HORJUST_LEFT
     Text [ portuguese ] = "Alinhar � esquerda" ;
     Text [ finnish ] = "Tasaa vasemmalle" ;
     Text [ danish ] = "Venstrejusteret" ;
-    Text [ french ] = "Alignement � gauche" ;
+    Text [ french ] = "Aligner � gauche" ;
     Text [ swedish ] = "V�nsterjusterat" ;
     Text [ dutch ] = "Op links uitlijnen" ;
     Text [ spanish ] = "Alinear a la izquierda" ;
@@ -5520,7 +5520,7 @@ String RID_SVXITEMS_HORJUST_CENTER
     Text [ french ] = "Centr� horizontalement" ;
     Text [ swedish ] = "Horisontellt centrerat" ;
     Text [ dutch ] = "Horizontaal gecentreerd" ;
-    Text [ spanish ] = "Centrado horizontal" ;
+    Text [ spanish ] = "Centrado horizontalmente" ;
     Text [ english_us ] = "Centered horizontally" ;
     Text[ chinese_simplified ] = "水平居中";
     Text[ russian ] = "�� ����������� � ������";
@@ -5545,7 +5545,7 @@ String RID_SVXITEMS_HORJUST_RIGHT
     Text [ portuguese ] = "Alinhar � direita" ;
     Text [ finnish ] = "Tasaa oikealle" ;
     Text [ danish ] = "H�jrejusteret" ;
-    Text [ french ] = "Alignement � droite" ;
+    Text [ french ] = "Aligner � droite" ;
     Text [ swedish ] = "H�gerjusterat" ;
     Text [ dutch ] = "Op rechts uitlijnen" ;
     Text [ spanish ] = "Ajustar a la derecha" ;
@@ -5627,7 +5627,7 @@ String RID_SVXITEMS_VERJUST_STANDARD
     Text [ italian ] = "Allineamento verticale standard" ;
     Text [ portuguese_brazilian ] = "Ajustar Padr?o" ;
     Text [ portuguese ] = "Alinhamento padr�o vertical" ;
-    Text [ finnish ] = "Pystytasaus oletusarvona" ;
+    Text [ finnish ] = "Pystytasaus oletuksena" ;
     Text [ danish ] = "Lodretjustering standard" ;
     Text [ french ] = "Alignement vertical par d�faut" ;
     Text [ swedish ] = "Vertikal justering standard" ;
@@ -5641,7 +5641,7 @@ String RID_SVXITEMS_VERJUST_STANDARD
     Text[ chinese_traditional ] = "標準垂直對齊";
     Text[ arabic ] = "������ ����� ������";
     Text[ greek ] = "��������� �������� �� ����������";
-    Text[ korean ] = "수직 맞춤, 기본";
+    Text[ korean ] = "기본 수직 맞춤";
     Text[ turkish ] = "Standart dikey hizalama";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Alineament vertical est�ndard";
@@ -5669,7 +5669,7 @@ String RID_SVXITEMS_VERJUST_TOP
     Text[ chinese_traditional ] = "向上對齊";
     Text[ arabic ] = "������ ��� ����";
     Text[ greek ] = "�������� ����";
-    Text[ korean ] = "위 맞춤";
+    Text[ korean ] = "위에 맞춤";
     Text[ turkish ] = "Yukar� do�ru hizala";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Alinea a la part superior";
@@ -5688,7 +5688,7 @@ String RID_SVXITEMS_VERJUST_CENTER
     Text [ french ] = "Centr� verticalement" ;
     Text [ swedish ] = "Vertikalt centrerat" ;
     Text [ dutch ] = "Verticaal gecentreerd" ;
-    Text [ spanish ] = "Centrado vertical" ;
+    Text [ spanish ] = "Centrado verticalmente" ;
     Text [ english_us ] = "Centered vertically" ;
     Text[ chinese_simplified ] = "垂直居中";
     Text[ russian ] = "����������� �� ������";
@@ -5711,7 +5711,7 @@ String RID_SVXITEMS_VERJUST_BOTTOM
     Text [ italian ] = "Allinea in basso" ;
     Text [ portuguese_brazilian ] = "Ajuste na base" ;
     Text [ portuguese ] = "Alinhar para baixo" ;
-    Text [ finnish ] = "Tasaa alaosaan" ;
+    Text [ finnish ] = "Tasaa alareunaan" ;
     Text [ danish ] = "Juster nedad" ;
     Text [ french ] = "Alignement au bord inf�rieur" ;
     Text [ swedish ] = "Justering ned�t" ;
@@ -5743,17 +5743,17 @@ String RID_SVXITEMS_ORI_STANDARD
     Text [ danish ] = "Standardskriveretning" ;
     Text [ french ] = "Orientation par d�faut" ;
     Text [ swedish ] = "Skrivriktning standard" ;
-    Text [ dutch ] = "Standaard-afdrukstand" ;
+    Text [ dutch ] = "Standaardafdrukrichting" ;
     Text [ spanish ] = "Orientaci�n predeterminada" ;
     Text [ english_us ] = "Default orientation" ;
     Text[ chinese_simplified ] = "标准输入方向";
-    Text[ russian ] = "����������� ����������� ������";
+    Text[ russian ] = "����������� �����������";
     Text[ polish ] = "Orientacja domy�lna";
     Text[ japanese ] = "記入方向 標準";
     Text[ chinese_traditional ] = "標準輸入方向";
     Text[ arabic ] = "����� ������� ���������";
     Text[ greek ] = "���������� ����������� ������";
-    Text[ korean ] = "쓰기 방향 표준";
+    Text[ korean ] = "쓰기 방향 기본값";
     Text[ turkish ] = "Standart yazma y�n�";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Orientaci� predeterminada";
@@ -5797,7 +5797,7 @@ String RID_SVXITEMS_ORI_BOTTOMTOP
     Text [ portuguese ] = "De baixo para cima" ;
     Text [ finnish ] = "Alhaalta yl�s" ;
     Text [ danish ] = "Fra nederst til �verst" ;
-    Text [ french ] = "Du bas en haut" ;
+    Text [ french ] = "De bas en haut" ;
     Text [ swedish ] = "Nedifr�n och upp" ;
     Text [ dutch ] = "Van beneden naar boven" ;
     Text [ spanish ] = "De abajo hacia arriba" ;
@@ -5866,7 +5866,7 @@ String RID_SVXITEMS_SHADOWED_TRUE
     Text[ chinese_traditional ] = "帶陰影";
     Text[ arabic ] = "����";
     Text[ greek ] = "���������";
-    Text[ korean ] = "음영";
+    Text[ korean ] = "그림자 효과";
     Text[ turkish ] = "G�lgeli";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Amb ombra";
@@ -5894,7 +5894,7 @@ String RID_SVXITEMS_SHADOWED_FALSE
     Text[ chinese_traditional ] = "沒有陰影";
     Text[ arabic ] = "��� ����";
     Text[ greek ] = "����� ����";
-    Text[ korean ] = "음영 없음";
+    Text[ korean ] = "그림자 없음";
     Text[ turkish ] = "G�lgeli de�il";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Sense ombra";
@@ -5914,13 +5914,13 @@ String RID_SVXITEMS_BLINK_TRUE
     Text [ portuguese ] = "Intermitente" ;
     Text [ portuguese_brazilian ] = "Blinkend" ;
     Text[ chinese_simplified ] = "闪动的";
-    Text[ russian ] = "�������";
+    Text[ russian ] = "��������";
     Text[ polish ] = "Miganie";
     Text[ japanese ] = "点滅する";
     Text[ chinese_traditional ] = "閃動";
     Text[ arabic ] = "����";
     Text[ greek ] = "�� �����������";
-    Text[ korean ] = "깜박임";
+    Text[ korean ] = "깜박임 효과";
     Text[ turkish ] = "Yan�p s�nme";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Parpelleig";
@@ -5941,13 +5941,13 @@ String RID_SVXITEMS_BLINK_FALSE
     Text [ portuguese ] = "N�o intermitente" ;
     Text [ portuguese_brazilian ] = "Nicht Blinkend" ;
     Text[ chinese_simplified ] = "不闪动";
-    Text[ russian ] = "�� ��������";
+    Text[ russian ] = "����������";
     Text[ polish ] = "Nie migaj�cy";
     Text[ japanese ] = "点滅しない";
     Text[ chinese_traditional ] = "不閃動";
     Text[ arabic ] = "���� ����";
     Text[ greek ] = "�� ��� �����������";
-    Text[ korean ] = "깜박임 없음";
+    Text[ korean ] = "깜박임 효과 없음";
     Text[ turkish ] = "Yan�p s�nme yok";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "No parpellejant";
@@ -5962,7 +5962,7 @@ String RID_SVXITEMS_AUTOKERN_TRUE
     Text [ italian ] = "Crenatura a coppia" ;
     Text [ portuguese_brazilian ] = "Kerning Autom?tico" ;
     Text [ portuguese ] = "Kerning de pares" ;
-    Text [ finnish ] = "Parilimitys" ;
+    Text [ finnish ] = "Pariv�listys" ;
     Text [ danish ] = "Parvis knibning" ;
     Text [ french ] = "Cr�nage pair" ;
     Text [ swedish ] = "Parvis kerning" ;
@@ -5976,7 +5976,7 @@ String RID_SVXITEMS_AUTOKERN_TRUE
     Text[ chinese_traditional ] = "字母間隔相等";
     Text[ arabic ] = "����� ���� ����";
     Text[ greek ] = "������������� ��� �����";
-    Text[ korean ] = "커닝, 쌍";
+    Text[ korean ] = "글꼴 커닝";
     Text[ turkish ] = "Aral�k azaltma";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Interlletratge parell";
@@ -5990,7 +5990,7 @@ String RID_SVXITEMS_AUTOKERN_FALSE
     Text [ italian ] = "Senza kerning automatico" ;
     Text [ portuguese_brazilian ] = "Sem Kerning Autom?tico" ;
     Text [ portuguese ] = "Sem kerning de pares" ;
-    Text [ finnish ] = "Ei parilimityst�" ;
+    Text [ finnish ] = "Ei pariv�listyst�" ;
     Text [ danish ] = "Ingen parvis knibning" ;
     Text [ french ] = "Pas de cr�nage pair" ;
     Text [ swedish ] = "Ingen parvis kerning" ;
@@ -6004,7 +6004,7 @@ String RID_SVXITEMS_AUTOKERN_FALSE
     Text[ chinese_traditional ] = "字母間隔不相等";
     Text[ arabic ] = "���� ����� ���� ����";
     Text[ greek ] = "����� ������������� ��� �����";
-    Text[ korean ] = "커닝, 쌍 아님";
+    Text[ korean ] = "글꼴 커닝 없음";
     Text[ turkish ] = "Aral�k azaltma yok";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Sense interlletratge parell";
@@ -6022,8 +6022,8 @@ String RID_SVXITEMS_WORDLINE_TRUE
     Text [ danish ] = "Ordvis" ;
     Text [ french ] = "Mot par mot" ;
     Text [ swedish ] = "Ordvis" ;
-    Text [ dutch ] = "Heel woord" ;
-    Text [ spanish ] = "Solo palabras" ;
+    Text [ dutch ] = "Woord voor woord" ;
+    Text [ spanish ] = "S�lo palabras" ;
     Text [ english_us ] = "Individual words" ;
     Text[ chinese_simplified ] = "逐字";
     Text[ russian ] = "������ �����";
@@ -6032,7 +6032,7 @@ String RID_SVXITEMS_WORDLINE_TRUE
     Text[ chinese_traditional ] = "逐字";
     Text[ arabic ] = "������� ���";
     Text[ greek ] = "���� ����";
-    Text[ korean ] = "단어별";
+    Text[ korean ] = "한 단어 마다";
     Text[ turkish ] = "Yaln�zca s�zc�kler";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Paraules individuals";
@@ -6050,8 +6050,8 @@ String RID_SVXITEMS_WORDLINE_FALSE
     Text [ danish ] = "Ikke ordvis" ;
     Text [ french ] = "Plus d'un mot" ;
     Text [ swedish ] = "Inte ordvis" ;
-    Text [ dutch ] = "Niet alleen woorden" ;
-    Text [ spanish ] = "No solo palabras" ;
+    Text [ dutch ] = "Niet woord voor woord" ;
+    Text [ spanish ] = "No s�lo palabras" ;
     Text [ english_us ] = "Not Words Only" ;
     Text[ chinese_simplified ] = "不是逐字";
     Text[ russian ] = "�� ������ �����";
@@ -6078,7 +6078,7 @@ String RID_SVXITEMS_CONTOUR_TRUE
     Text [ danish ] = "Konturskrift" ;
     Text [ french ] = "Contour" ;
     Text [ swedish ] = "Kontur" ;
-    Text [ dutch ] = "Open letters" ;
+    Text [ dutch ] = "Contourlettertypen" ;
     Text [ spanish ] = "Contorno" ;
     Text [ english_us ] = "Outline" ;
     Text[ chinese_simplified ] = "轮廓";
@@ -6106,11 +6106,11 @@ String RID_SVXITEMS_CONTOUR_FALSE
     Text [ danish ] = "Ingen konturskrift" ;
     Text [ french ] = "Police sans contour" ;
     Text [ swedish ] = "Ingen kontur" ;
-    Text [ dutch ] = "Geen open letters" ;
+    Text [ dutch ] = "Geen contourlettertypen" ;
     Text [ spanish ] = "Sin contornos" ;
     Text [ english_us ] = "No Outline" ;
     Text[ chinese_simplified ] = "不显示轮廓";
-    Text[ russian ] = "��� ���������� ������";
+    Text[ russian ] = "��� �������";
     Text[ polish ] = "Nie kontur";
     Text[ japanese ] = "中抜き文字なし";
     Text[ chinese_traditional ] = "不顯示輪廓";
@@ -6188,7 +6188,7 @@ String RID_SVXITEMS_PRINT_FALSE
     Text[ chinese_traditional ] = "不要列印";
     Text[ arabic ] = "��� �������";
     Text[ greek ] = "�� ��� ���������";
-    Text[ korean ] = "인쇄 않음";
+    Text[ korean ] = "인쇄하지 않음";
     Text[ turkish ] = "Yazd�rma";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "No imprimeixis";
@@ -6266,13 +6266,13 @@ String RID_SVXITEMS_FMTKEEP_TRUE
     Text [ spanish ] = "Mantener p�rrafos juntos" ;
     Text [ english_us ] = "Keep with next paragraph" ;
     Text[ chinese_simplified ] = "与下段同页";
-    Text[ russian ] = "������ �� ��������� �������";
+    Text[ russian ] = "��������� �� ��������� �������";
     Text[ polish ] = "Razem z nast�pnym";
     Text[ japanese ] = "段落を接合する";
     Text[ chinese_traditional ] = "段落不分開";
     Text[ arabic ] = "����� �������";
     Text[ greek ] = "��������� ���������� ����";
-    Text[ korean ] = "단락들을 같은 페이지에";
+    Text[ korean ] = "현재 단락과 다음 단락을 같은 페이지에 배치";
     Text[ turkish ] = "Paragraflar� bir arada tut";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Mant� els par�grafs junts";
@@ -6294,13 +6294,13 @@ String RID_SVXITEMS_FMTKEEP_FALSE
     Text [ spanish ] = "No mantener p�rrafos juntos" ;
     Text [ english_us ] = "Don't Keep Paragraphs Together" ;
     Text[ chinese_simplified ] = "段落可以分开";
-    Text[ russian ] = "��� ���������� ������";
+    Text[ russian ] = "�� ��������� ������ ������";
     Text[ polish ] = "Akapit nie razem z nast�pnym";
     Text[ japanese ] = "段落を接合しない";
     Text[ chinese_traditional ] = "段落可以分開";
     Text[ arabic ] = "��� ����� �������";
     Text[ greek ] = "���������� ��� ����";
-    Text[ korean ] = "단락들을 같은 페이지에 놓지 않음";
+    Text[ korean ] = "현재 단락과 다음 단락을 같은 페이지에 배치하지 않음";
     Text[ turkish ] = "Paragraflar� bir arada tutma";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "No mantinguis els par�grafs junts";
@@ -6318,11 +6318,11 @@ String RID_SVXITEMS_FMTSPLIT_TRUE
     Text [ danish ] = "Del afsnit" ;
     Text [ french ] = "Lignes non solidaires" ;
     Text [ swedish ] = "Dela stycke" ;
-    Text [ dutch ] = "De alinea splitsen" ;
+    Text [ dutch ] = "Alinea splitsen" ;
     Text [ spanish ] = "Dividir p�rrafo" ;
     Text [ english_us ] = "Split paragraph" ;
     Text[ chinese_simplified ] = "分开段落";
-    Text[ russian ] = "��������� �����";
+    Text[ russian ] = "������� �����";
     Text[ polish ] = "Podziel akapit";
     Text[ japanese ] = "段落を分割する";
     Text[ chinese_traditional ] = "分開段落";
@@ -6710,11 +6710,11 @@ String RID_SVXITEMS_BOXINF_MDIST_TRUE
     Text [ danish ] = "Underskrid afstand ikke" ;
     Text [ french ] = "Ne pas d�passer l'espace" ;
     Text [ swedish ] = "Underskrid inte avst�ndet" ;
-    Text [ dutch ] = "Te kleine afstand niet toegestaan" ;
-    Text [ spanish ] = "Mantener el espacio" ;
+    Text [ dutch ] = "Kleinere afstand niet toegestaan" ;
+    Text [ spanish ] = "Conservar el espacio" ;
     Text [ english_us ] = "Keep spacing interval" ;
     Text[ chinese_simplified ] = "不小于间隔";
-    Text[ russian ] = "�� ����������� ������� ��������, ��� �������������";
+    Text[ russian ] = "�� ����������� ������� ��������, ��� ������������";
     Text[ polish ] = "Odst�p nie mo�e by� mniejszy ni� przewidziany";
     Text[ japanese ] = "間隔を狭くできない";
     Text[ chinese_traditional ] = "不小於間隔";
@@ -6738,11 +6738,11 @@ String RID_SVXITEMS_BOXINF_MDIST_FALSE
     Text [ danish ] = "Tilladt at underskride afstand" ;
     Text [ french ] = "Autorisation d'un espace inf�rieur" ;
     Text [ swedish ] = "Till�tet att underskrida avst�nd" ;
-    Text [ dutch ] = "Te kleine afstand toegestaan" ;
+    Text [ dutch ] = "Kleinere afstand toegestaan" ;
     Text [ spanish ] = "Permitir espacio menor al especificado" ;
     Text [ english_us ] = "Allowed to fall short of spacing interval" ;
     Text[ chinese_simplified ] = "允许小于间隔";
-    Text[ russian ] = "����������� ������� ��������, ��� �������������";
+    Text[ russian ] = "����������� ������� ��������, ��� ������������";
     Text[ polish ] = "Dozwolony mniejszy odst�p ni� przewidziany";
     Text[ japanese ] = "間隔を狭くできる";
     Text[ chinese_traditional ] = "允許小於間隔";
@@ -6875,11 +6875,11 @@ String RID_SVXITEMS_MARGIN_LEFT
     Text [ portuguese_brazilian ] = "Margem esquerda: " ;
     Text [ portuguese ] = "Margem esquerda: " ;
     Text [ english_us ] = "Left margin: " ;
-    Text [ finnish ] = "Vasen marginaali: " ;
+    Text [ finnish ] = "Vasen reunus: " ;
     Text [ danish ] = "Venstre margen: " ;
     Text [ french ] = "Marge gauche : " ;
     Text [ swedish ] = "V�nstermarginal: " ;
-    Text [ dutch ] = "Marge links:   " ;
+    Text [ dutch ] = "Linkermarge:" ;
     Text [ spanish ] = "Margen izquierdo:   " ;
     Text[ chinese_simplified ] = "左方页边距： ";
     Text[ russian ] = "����� ����: ";
@@ -6903,11 +6903,11 @@ String RID_SVXITEMS_MARGIN_TOP
     Text [ portuguese_brazilian ] = "Top margin: " ;
     Text [ portuguese ] = "Margem superior: " ;
     Text [ english_us ] = "Top margin: " ;
-    Text [ finnish ] = "Yl�marginaali: " ;
+    Text [ finnish ] = "Yl�reunus: " ;
     Text [ danish ] = "Topmargen: " ;
     Text [ french ] = "Marge sup�rieure : " ;
     Text [ swedish ] = "�vre marginal: " ;
-    Text [ dutch ] = "Marge boven:   " ;
+    Text [ dutch ] = "Bovenmarge:" ;
     Text [ spanish ] = "Margen superior:   " ;
     Text[ chinese_simplified ] = "上方页边距： ";
     Text[ russian ] = "������� ����: ";
@@ -6931,11 +6931,11 @@ String RID_SVXITEMS_MARGIN_RIGHT
     Text [ portuguese_brazilian ] = "Margem direita: " ;
     Text [ portuguese ] = "Margem direita: " ;
     Text [ english_us ] = "Right margin: " ;
-    Text [ finnish ] = "Oikea marginaali: " ;
+    Text [ finnish ] = "Oikea reunus: " ;
     Text [ danish ] = "H�jre margen: " ;
     Text [ french ] = "Marge droite : " ;
     Text [ swedish ] = "H�germarginal: " ;
-    Text [ dutch ] = "Marge rechts:   " ;
+    Text [ dutch ] = "Rechtermarge:" ;
     Text [ spanish ] = "Margen derecho:  " ;
     Text[ chinese_simplified ] = "右方页边距： ";
     Text[ russian ] = "������ ����: ";
@@ -6959,11 +6959,11 @@ String RID_SVXITEMS_MARGIN_BOTTOM
     Text [ portuguese_brazilian ] = "Margem base: " ;
     Text [ portuguese ] = "Margem inferior: " ;
     Text [ english_us ] = "Bottom margin: " ;
-    Text [ finnish ] = "Alamarginaali: " ;
+    Text [ finnish ] = "Alareunus: " ;
     Text [ danish ] = "Bundmargen: " ;
     Text [ french ] = "Marge inf�rieure : " ;
     Text [ swedish ] = "Undre marginal: " ;
-    Text [ dutch ] = "Marge beneden:   " ;
+    Text [ dutch ] = "Benedenmarge:" ;
     Text [ spanish ] = "Margen inferior:   " ;
     Text[ chinese_simplified ] = "下方页边距： ";
     Text[ russian ] = "������ ����: ";
@@ -6972,7 +6972,7 @@ String RID_SVXITEMS_MARGIN_BOTTOM
     Text[ chinese_traditional ] = "下邊框： ";
     Text[ arabic ] = "������ ������: ";
     Text[ greek ] = "���� ���������: ";
-    Text[ korean ] = "아래 여백: ";
+    Text[ korean ] = "아래쪽 여백: ";
     Text[ turkish ] = "Alt kenar: ";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Marge inferior: ";
@@ -6991,7 +6991,7 @@ String RID_SVXITEMS_SIZE_WIDTH
     Text [ danish ] = "Bredde: " ;
     Text [ french ] = "Largeur : " ;
     Text [ swedish ] = "Bredd: " ;
-    Text [ dutch ] = "Breedte:   " ;
+    Text [ dutch ] = "Breedte:" ;
     Text [ spanish ] = "Ancho:   " ;
     Text[ chinese_simplified ] = "宽度： ";
     Text[ russian ] = "������: ";
@@ -7019,7 +7019,7 @@ String RID_SVXITEMS_SIZE_HEIGHT
     Text [ danish ] = "H�jde: " ;
     Text [ french ] = "Hauteur : " ;
     Text [ swedish ] = "H�jd: " ;
-    Text [ dutch ] = "Hoogte:   " ;
+    Text [ dutch ] = "Hoogte:" ;
     Text [ spanish ] = "Alto:   " ;
     Text[ chinese_simplified ] = "高度： ";
     Text[ russian ] = "������: ";
@@ -7043,11 +7043,11 @@ String RID_SVXITEMS_LRSPACE_LEFT
     Text [ portuguese_brazilian ] = "From left " ;
     Text [ portuguese ] = "Avan�o de par�grafo, esquerda " ;
     Text [ english_us ] = "Indent left " ;
-    Text [ finnish ] = "Sisenn� vasemmalle" ;
+    Text [ finnish ] = "Sisenn� vasemmalle " ;
     Text [ danish ] = "Indrykning venstre " ;
     Text [ french ] = "Retrait � gauche " ;
     Text [ swedish ] = "Indrag v�nster " ;
-    Text [ dutch ] = "Links inspringen   " ;
+    Text [ dutch ] = "Links inspringen" ;
     Text [ spanish ] = "Sangr�a a la izquierda   " ;
     Text[ chinese_simplified ] = "左缩进 ";
     Text[ russian ] = "������ ����� ";
@@ -7056,7 +7056,7 @@ String RID_SVXITEMS_LRSPACE_LEFT
     Text[ chinese_traditional ] = "左縮排 ";
     Text[ arabic ] = "����� ���� ";
     Text[ greek ] = "����� �������� ";
-    Text[ korean ] = "왼쪽 들여쓰기 ";
+    Text[ korean ] = "왼쪽 들여쓰기";
     Text[ turkish ] = "Sol girinti ";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Sagnat esquerre ";
@@ -7071,11 +7071,11 @@ String RID_SVXITEMS_LRSPACE_FLINE
     Text [ portuguese_brazilian ] = "First line " ;
     Text [ portuguese ] = "1� linha " ;
     Text [ english_us ] = "First Line " ;
-    Text [ finnish ] = "Ensimm�inen rivi" ;
+    Text [ finnish ] = "Ensimm�inen rivi " ;
     Text [ danish ] = "F�rste r�kke " ;
     Text [ french ] = "Premi�re ligne " ;
     Text [ swedish ] = "F�rsta raden " ;
-    Text [ dutch ] = "Eerste regel   " ;
+    Text [ dutch ] = "Eerste regel" ;
     Text [ spanish ] = "Primera l�nea   " ;
     Text[ chinese_simplified ] = "第一行 ";
     Text[ russian ] = "������ ������ ";
@@ -7099,11 +7099,11 @@ String RID_SVXITEMS_LRSPACE_RIGHT
     Text [ portuguese_brazilian ] = "From right " ;
     Text [ portuguese ] = "Avan�o de par�grafo, direita " ;
     Text [ english_us ] = "Indent right " ;
-    Text [ finnish ] = "Sisenn� oikealle" ;
+    Text [ finnish ] = "Sisenn� oikealle " ;
     Text [ danish ] = "Indrykning h�jre " ;
     Text [ french ] = "Retrait � droite " ;
     Text [ swedish ] = "Indrag h�ger " ;
-    Text [ dutch ] = "Rechts inspringen   " ;
+    Text [ dutch ] = "Rechts inspringen" ;
     Text [ spanish ] = "Sangr�a a la derecha   " ;
     Text[ chinese_simplified ] = "右缩进 ";
     Text[ russian ] = "������ ������ ";
@@ -7112,7 +7112,7 @@ String RID_SVXITEMS_LRSPACE_RIGHT
     Text[ chinese_traditional ] = "右縮排 ";
     Text[ arabic ] = "����� ���� ";
     Text[ greek ] = "����� ����� ";
-    Text[ korean ] = "오른쪽 들여쓰기 ";
+    Text[ korean ] = "오른쪽 들여쓰기";
     Text[ turkish ] = "Sa� girinti ";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Sagnat dret ";
@@ -7131,7 +7131,7 @@ String RID_SVXITEMS_SHADOW_COMPLETE
     Text [ danish ] = "Skygge: " ;
     Text [ french ] = "Ombre : " ;
     Text [ swedish ] = "Skugga: " ;
-    Text [ dutch ] = "Schaduw:   " ;
+    Text [ dutch ] = "Schaduw:" ;
     Text [ spanish ] = "Sombra: " ;
     Text[ chinese_simplified ] = "阴影： ";
     Text[ russian ] = "����: ";
@@ -7140,7 +7140,7 @@ String RID_SVXITEMS_SHADOW_COMPLETE
     Text[ chinese_traditional ] = "陰影： ";
     Text[ arabic ] = "����: ";
     Text[ greek ] = "����: ";
-    Text[ korean ] = "음영: ";
+    Text[ korean ] = "그림자: ";
     Text[ turkish ] = "G�lge: ";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Ombra: ";
@@ -7155,12 +7155,12 @@ String RID_SVXITEMS_BORDER_COMPLETE
     Text [ portuguese_brazilian ] = "Borda: " ;
     Text [ portuguese ] = "Contornos  " ;
     Text [ english_us ] = "Borders " ;
-    Text [ finnish ] = "Reunat" ;
+    Text [ finnish ] = "Reunat " ;
     Text [ danish ] = "Ramme " ;
     Text [ french ] = "Bordure " ;
     Text [ swedish ] = "Inramning " ;
-    Text [ dutch ] = "Omranding:   " ;
-    Text [ spanish ] = "Bordes " ;
+    Text [ dutch ] = "Omranding:" ;
+    Text [ spanish ] = "Bordes" ;
     Text[ chinese_simplified ] = "边框 ";
     Text[ russian ] = "���������� ";
     Text[ polish ] = "Obramowanie ";
@@ -7168,7 +7168,7 @@ String RID_SVXITEMS_BORDER_COMPLETE
     Text[ chinese_traditional ] = "邊框 ";
     Text[ arabic ] = "������ ";
     Text[ greek ] = "���������� ";
-    Text[ korean ] = "테두리: ";
+    Text[ korean ] = "테두리 ";
     Text[ turkish ] = "Kenarl�k ";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Vores ";
@@ -7209,11 +7209,11 @@ String RID_SVXITEMS_BORDER_TOP
     Text [ portuguese_brazilian ] = "Topo " ;
     Text [ portuguese ] = "em cima  " ;
     Text [ english_us ] = "top " ;
-    Text [ finnish ] = "yl�osa" ;
+    Text [ finnish ] = "yl�reuna " ;
     Text [ danish ] = "foroven " ;
     Text [ french ] = "En haut " ;
     Text [ swedish ] = "Uppe " ;
-    Text [ dutch ] = "boven   " ;
+    Text [ dutch ] = "boven" ;
     Text [ spanish ] = "arriba " ;
     Text[ chinese_simplified ] = "上 ";
     Text[ russian ] = "������ ";
@@ -7237,11 +7237,11 @@ String RID_SVXITEMS_BORDER_BOTTOM
     Text [ portuguese_brazilian ] = "Base " ;
     Text [ portuguese ] = "em baixo  " ;
     Text [ english_us ] = "bottom " ;
-    Text [ finnish ] = "alaosa" ;
+    Text [ finnish ] = "alareuna " ;
     Text [ danish ] = "forneden " ;
     Text [ french ] = "En bas " ;
     Text [ swedish ] = "Nere " ;
-    Text [ dutch ] = "beneden   " ;
+    Text [ dutch ] = "beneden" ;
     Text [ spanish ] = "abajo " ;
     Text[ chinese_simplified ] = "下 ";
     Text[ russian ] = "����� ";
@@ -7265,11 +7265,11 @@ String RID_SVXITEMS_BORDER_LEFT
     Text [ portuguese_brazilian ] = "A Esquerda " ;
     Text [ portuguese ] = "esquerda  " ;
     Text [ english_us ] = "left " ;
-    Text [ finnish ] = "vasen" ;
+    Text [ finnish ] = "vasemmalle " ;
     Text [ danish ] = "til venstre " ;
     Text [ french ] = "� gauche " ;
     Text [ swedish ] = "till v�nster " ;
-    Text [ dutch ] = "links   " ;
+    Text [ dutch ] = "links" ;
     Text [ spanish ] = "izquierda " ;
     Text[ chinese_simplified ] = "左 ";
     Text[ russian ] = "����� ";
@@ -7293,11 +7293,11 @@ String RID_SVXITEMS_BORDER_RIGHT
     Text [ portuguese_brazilian ] = "A Direita " ;
     Text [ portuguese ] = "direita  " ;
     Text [ english_us ] = "right " ;
-    Text [ finnish ] = "oikea" ;
+    Text [ finnish ] = "oikealle " ;
     Text [ danish ] = "til h�jre " ;
     Text [ french ] = "� droite " ;
     Text [ swedish ] = "till h�ger " ;
-    Text [ dutch ] = "rechts   " ;
+    Text [ dutch ] = "rechts" ;
     Text [ spanish ] = "derecha " ;
     Text[ chinese_simplified ] = "右 ";
     Text[ russian ] = "������ ";
@@ -7321,11 +7321,11 @@ String RID_SVXITEMS_BORDER_DISTANCE
     Text [ portuguese_brazilian ] = "Dist?ncia " ;
     Text [ portuguese ] = "Espa�amento  " ;
     Text [ english_us ] = "Spacing " ;
-    Text [ finnish ] = "Objektiv�lit" ;
+    Text [ finnish ] = "V�lit " ;
     Text [ danish ] = "Afstand " ;
     Text [ french ] = "�cart " ;
     Text [ swedish ] = "Avst�nd " ;
-    Text [ dutch ] = "Afstand   " ;
+    Text [ dutch ] = "Afstand" ;
     Text [ spanish ] = "Espacio   " ;
     Text[ chinese_simplified ] = "间隔 ";
     Text[ russian ] = "�������� ";
@@ -7349,11 +7349,11 @@ String RID_SVXITEMS_ULSPACE_UPPER
     Text [ portuguese_brazilian ] = "To top " ;
     Text [ portuguese ] = "De cima  " ;
     Text [ english_us ] = "From top " ;
-    Text [ finnish ] = "Ylh��lt�" ;
+    Text [ finnish ] = "Ylh��lt� " ;
     Text [ danish ] = "Fra toppen " ;
     Text [ french ] = "Du haut " ;
     Text [ swedish ] = "Uppifr�n  " ;
-    Text [ dutch ] = "Van boven   " ;
+    Text [ dutch ] = "Van boven" ;
     Text [ spanish ] = "Desde arriba " ;
     Text[ chinese_simplified ] = "从上 ";
     Text[ russian ] = "������ ";
@@ -7377,11 +7377,11 @@ String RID_SVXITEMS_ULSPACE_LOWER
     Text [ portuguese_brazilian ] = "To bottom " ;
     Text [ portuguese ] = "De baixo  " ;
     Text [ english_us ] = "From bottom " ;
-    Text [ finnish ] = "Alhaalta" ;
+    Text [ finnish ] = "Alhaalta " ;
     Text [ danish ] = "Fra bunden " ;
     Text [ french ] = "Du bas " ;
     Text [ swedish ] = "Nedifr�n  " ;
-    Text [ dutch ] = "Van beneden   " ;
+    Text [ dutch ] = "Van beneden" ;
     Text [ spanish ] = "Desde abajo " ;
     Text[ chinese_simplified ] = "从下 ";
     Text[ russian ] = "����� ";
@@ -7409,7 +7409,7 @@ String RID_SVXITEMS_PAGE_COMPLETE
     Text [ danish ] = "Sidebeskrivelse: " ;
     Text [ french ] = "Description de la page : " ;
     Text [ swedish ] = "Sidbeskrivning:  " ;
-    Text [ dutch ] = "Paginabeschrijving:   " ;
+    Text [ dutch ] = "Paginabeschrijving:" ;
     Text [ spanish ] = "Descripci�n de la p�gina:  " ;
     Text[ chinese_simplified ] = "页面说明： ";
     Text[ russian ] = "�������� ��������: ";
@@ -7580,7 +7580,7 @@ String RID_SVXITEMS_PAGE_NUM_NONE
     Text [ dutch ] = "Zonder" ;
     Text [ spanish ] = "Ninguno" ;
     Text[ chinese_simplified ] = "无";
-    Text[ russian ] = "���";
+    Text[ russian ] = "���";
     Text[ polish ] = "Brak";
     Text[ japanese ] = "なし";
     Text[ chinese_traditional ] = "無";
@@ -7642,7 +7642,7 @@ String RID_SVXITEMS_PAGE_LAND_FALSE
     Text[ chinese_traditional ] = "縱向";
     Text[ arabic ] = "������";
     Text[ greek ] = "����������";
-    Text[ korean ] = "세로 방향";
+    Text[ korean ] = "세로";
     Text[ turkish ] = "Dikey";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Vertical";
@@ -7748,7 +7748,7 @@ String RID_SVXITEMS_PAGE_USAGE_MIRROR
     Text [ dutch ] = "Gespiegeld" ;
     Text [ spanish ] = "Reflejado" ;
     Text[ chinese_simplified ] = "翻转的";
-    Text[ russian ] = "���������";
+    Text[ russian ] = "����������";
     Text[ polish ] = "Odbicie lustrzane";
     Text[ japanese ] = "左右対称";
     Text[ chinese_traditional ] = "翻轉的";
@@ -7797,20 +7797,20 @@ String RID_SVXITEMS_WIDOWS_COMPLETE
     Text [ portuguese_brazilian ] = "Widows " ;
     Text [ portuguese ] = "Linhas isoladas  " ;
     Text [ english_us ] = "Orphan control " ;
-    Text [ finnish ] = "Orporivien esto" ;
+    Text [ finnish ] = "Orporivien esto " ;
     Text [ danish ] = "Fransk horeunge-ordning " ;
     Text [ french ] = "Traitement des orphelines " ;
     Text [ swedish ] = "�nkekontroll " ;
-    Text [ dutch ] = "Zwevende regels: wezen  " ;
+    Text [ dutch ] = "Zwevende regels: wezen" ;
     Text [ spanish ] = "Ajuste de hu�rfanas " ;
     Text[ chinese_simplified ] = "段前分页";
     Text[ russian ] = "���������� ��������� �������� �������� ";
     Text[ polish ] = "Kontrola szewc�w";
-    Text[ japanese ] = "オーファン制限";
+    Text[ japanese ] = "改ページ前の段落の孤立行";
     Text[ chinese_traditional ] = "段落前分頁";
     Text[ arabic ] = "������ ������� ������� ";
     Text[ greek ] = "������� �������";
-    Text[ korean ] = "첫 줄 분리 방지 ";
+    Text[ korean ] = "처음 한 줄 분리 방지 ";
     Text[ turkish ] = "�lk sat�r� paragrafla birle�tir ";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Orfes ";
@@ -7825,20 +7825,20 @@ String RID_SVXITEMS_ORPHANS_COMPLETE
     Text [ portuguese_brazilian ] = "?rf?os " ;
     Text [ portuguese ] = "Controlar orf�os  " ;
     Text [ english_us ] = "Widow control " ;
-    Text [ finnish ] = "Leskirivien ohjaus" ;
+    Text [ finnish ] = "Leskirivien ohjaus " ;
     Text [ danish ] = "Horeunge-ordning " ;
     Text [ french ] = "Traitement des veuves " ;
     Text [ swedish ] = "Horungekontroll " ;
-    Text [ dutch ] = "Zwevende regels: weduwen  " ;
+    Text [ dutch ] = "Zwevende regels: weduwen" ;
     Text [ spanish ] = "Ajuste de viudas " ;
     Text[ chinese_simplified ] = "孤行控制";
     Text[ russian ] = "���������� ���������� �������� �������� ";
     Text[ polish ] = "Kontrola b�kart�w";
-    Text[ japanese ] = "ウィドウ制限";
+    Text[ japanese ] = "改ページ後の段落の孤立行";
     Text[ chinese_traditional ] = "段落遺留字串控制";
     Text[ arabic ] = "������ ������� ������� ";
     Text[ greek ] = "������� �����";
-    Text[ korean ] = "마지막 줄 분리 방지 ";
+    Text[ korean ] = "마지막 한 줄 분리 방지";
     Text[ turkish ] = "Son sat�r� paragrafla birle�tir ";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Viudes   ";
@@ -7859,11 +7859,11 @@ String RID_SVXITEMS_HYPHEN_MINLEAD
     Text [ swedish ] = " tecken vid radslut" ;
     Text [ dutch ] = " tekens aan regeleinde" ;
     Text [ spanish ] = "Caracteres al final de la l�nea" ;
-    Text[ chinese_simplified ] = "字符在行末";
-    Text[ russian ] = "����� � ����� ������";
+    Text[ chinese_simplified ] = "字符留位于行末";
+    Text[ russian ] = "������� � ����� ������";
     Text[ polish ] = "Znak ko�ca wiersza";
     Text[ japanese ] = "行末の記号";
-    Text[ chinese_traditional ] = "字元在行末";
+    Text[ chinese_traditional ] = "字元留位於行末";
     Text[ arabic ] = "���� ��� ����� �����";
     Text[ greek ] = "���������� ��� ����� ��� �������";
     Text[ korean ] = "줄 끝에 문자";
@@ -7887,11 +7887,11 @@ String RID_SVXITEMS_HYPHEN_MINTRAIL
     Text [ swedish ] = " tecken vid radens b�rjan" ;
     Text [ dutch ] = " tekens aan regelbegin" ;
     Text [ spanish ] = "caracteres al comienzo de la l�nea" ;
-    Text[ chinese_simplified ] = "字符在行首";
-    Text[ russian ] = "����� � ������ ������";
+    Text[ chinese_simplified ] = "字符留位于行首";
+    Text[ russian ] = "������� � ������ ������";
     Text[ polish ] = "Znak pocz�tku wiersza";
     Text[ japanese ] = "行頭の記号";
-    Text[ chinese_traditional ] = "字元在行首";
+    Text[ chinese_traditional ] = "字元留位於行首";
     Text[ arabic ] = "���� ��� ����� �����";
     Text[ greek ] = "���������� ���� ���� ��� �������";
     Text[ korean ] = "줄 시작 부분(~T)";
@@ -7916,7 +7916,7 @@ String RID_SVXITEMS_HYPHEN_MAX
     Text [ dutch ] = "Koppeltekens" ;
     Text [ spanish ] = "guiones" ;
     Text[ chinese_simplified ] = "分隔点";
-    Text[ russian ] = " �����������";
+    Text[ russian ] = "�����������";
     Text[ polish ] = "Miejsca podzia�u";
     Text[ japanese ] = "ハイフン位置";
     Text[ chinese_traditional ] = "分隔點";
@@ -7941,7 +7941,7 @@ String RID_SVXITEMS_PAGEMODEL_COMPLETE
     Text [ danish ] = "Sidetypografi: " ;
     Text [ french ] = "Style de page : " ;
     Text [ swedish ] = "Sidformatmall:  " ;
-    Text [ dutch ] = "Pagina-opmaakprofiel:   " ;
+    Text [ dutch ] = "Pagina-opmaakprofiel:" ;
     Text [ spanish ] = "Estilo de p�gina:  " ;
     Text[ chinese_simplified ] = "页面样式： ";
     Text[ russian ] = "����� ��������: ";
@@ -7965,11 +7965,11 @@ String RID_SVXITEMS_KERNING_COMPLETE
     Text [ portuguese_brazilian ] = "Kerning " ;
     Text [ portuguese ] = "Kerning  " ;
     Text [ english_us ] = "Kerning " ;
-    Text [ finnish ] = "Fonttilimitys" ;
+    Text [ finnish ] = "V�listys " ;
     Text [ danish ] = "Knibning " ;
     Text [ french ] = "Cr�nage " ;
     Text [ swedish ] = "Kerning " ;
-    Text [ dutch ] = "Kerning  " ;
+    Text [ dutch ] = "Kerning" ;
     Text [ spanish ] = "Ajuste entre caracteres   " ;
     Text[ chinese_simplified ] = "字母间隔相等 ";
     Text[ russian ] = "������� ";
@@ -7993,14 +7993,14 @@ String RID_SVXITEMS_KERNING_EXPANDED
     Text [ portuguese_brazilian ] = "expanded " ;
     Text [ portuguese ] = "Expandido " ;
     Text [ english_us ] = "locked " ;
-    Text [ finnish ] = "lukittu" ;
+    Text [ finnish ] = "lukittu " ;
     Text [ danish ] = "bred " ;
     Text [ french ] = "�tendu " ;
     Text [ swedish ] = "sp�rrad " ;
-    Text [ dutch ] = "verbreed   " ;
+    Text [ dutch ] = "verbreed" ;
     Text [ spanish ] = "expandido " ;
     Text[ chinese_simplified ] = "锁定的 ";
-    Text[ russian ] = "����������� ";
+    Text[ russian ] = "�������������";
     Text[ polish ] = "szerokie ";
     Text[ japanese ] = "字間をあける ";
     Text[ chinese_traditional ] = "鎖定 ";
@@ -8021,14 +8021,14 @@ String RID_SVXITEMS_KERNING_CONDENSED
     Text [ portuguese_brazilian ] = "condensed " ;
     Text [ portuguese ] = "Condensado " ;
     Text [ english_us ] = "Condensed " ;
-    Text [ finnish ] = "Tiivistetty" ;
+    Text [ finnish ] = "Tiivistetty " ;
     Text [ danish ] = "smal " ;
     Text [ french ] = "Condens� " ;
     Text [ swedish ] = "smal " ;
-    Text [ dutch ] = "versmald   " ;
+    Text [ dutch ] = "versmald" ;
     Text [ spanish ] = "condensada   " ;
     Text[ chinese_simplified ] = "瘦形 ";
-    Text[ russian ] = "����������� ";
+    Text[ russian ] = "����������� ";
     Text[ polish ] = "w�ski ";
     Text[ japanese ] = "狭くする ";
     Text[ chinese_traditional ] = "瘦形 ";
@@ -8049,11 +8049,11 @@ String RID_SVXITEMS_AUTHOR_COMPLETE
     Text [ portuguese_brazilian ] = "Autor: " ;
     Text [ portuguese ] = "Autor:  " ;
     Text [ english_us ] = "Author: " ;
-    Text [ finnish ] = "Laatija: " ;
+    Text [ finnish ] = "Tekij�: " ;
     Text [ danish ] = "Forfatter: " ;
     Text [ french ] = "Auteur : " ;
     Text [ swedish ] = "F�rfattare: " ;
-    Text [ dutch ] = "Auteur:   " ;
+    Text [ dutch ] = "Auteur:" ;
     Text [ spanish ] = "Autor:   " ;
     Text[ chinese_simplified ] = "作者： ";
     Text[ russian ] = "�����: ";
@@ -8081,7 +8081,7 @@ String RID_SVXITEMS_DATE_COMPLETE
     Text [ danish ] = "Dato: " ;
     Text [ french ] = "Date : " ;
     Text [ swedish ] = "Datum:  " ;
-    Text [ dutch ] = "Datum:   " ;
+    Text [ dutch ] = "Datum:" ;
     Text [ spanish ] = "Fecha:   " ;
     Text[ chinese_simplified ] = "日期： ";
     Text[ russian ] = "����: ";
@@ -8109,7 +8109,7 @@ String RID_SVXITEMS_TEXT_COMPLETE
     Text [ danish ] = "Tekst: " ;
     Text [ french ] = "Texte : " ;
     Text [ swedish ] = "Text:  " ;
-    Text [ dutch ] = "Tekst:   " ;
+    Text [ dutch ] = "Tekst:" ;
     Text [ spanish ] = "Texto: " ;
     Text[ chinese_simplified ] = "文字： ";
     Text[ russian ] = "�����: ";
@@ -8128,7 +8128,7 @@ String RID_SVXITEMS_BACKGROUND_COLOR
 {
     Text = "Hintergrundfarbe: " ;
     Text [ English ] = "Backgroundcolor: " ;
-    Text [ dutch ] = "Achtergrondkleur:   " ;
+    Text [ dutch ] = "Achtergrondkleur:" ;
     Text [ english_us ] = "Background color: " ;
     Text [ italian ] = "Colore di sfondo:  " ;
     Text [ spanish ] = "Color de fondo:   " ;
@@ -8144,7 +8144,7 @@ String RID_SVXITEMS_BACKGROUND_COLOR
     Text[ chinese_traditional ] = "背景顏色： ";
     Text[ arabic ] = "��� �������:";
     Text[ greek ] = "����� ������: ";
-    Text[ korean ] = "배경색: ";
+    Text[ korean ] = "배경 색상: ";
     Text[ turkish ] = "Artalan rengi: ";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Color de fons: ";
@@ -8159,7 +8159,7 @@ String RID_SVXITEMS_PATTERN_COLOR
     Text [ italian ] = "Colore motivo:   " ;
     Text [ spanish ] = "Color modelo:  " ;
     Text [ french ] = "Couleur de motif : " ;
-    Text [ dutch ] = "Patroonkleur:   " ;
+    Text [ dutch ] = "Patroonkleur:" ;
     Text [ swedish ] = "M�nsterf�rg:  " ;
     Text [ danish ] = "M�nsterfarve: " ;
     Text [ portuguese ] = "Cor padr�o:  " ;
@@ -8192,7 +8192,7 @@ String RID_SVXITEMS_GRAPHIC
     Text [ portuguese ] = "Imagem" ;
     Text [ portuguese_brazilian ] = "Grafik" ;
     Text[ chinese_simplified ] = "图形";
-    Text[ russian ] = "�������";
+    Text[ russian ] = "����������� ������";
     Text[ polish ] = "Grafika";
     Text[ japanese ] = "図";
     Text[ chinese_traditional ] = "圖形";
@@ -8220,7 +8220,7 @@ String RID_SVXITEMS_BRUSH_CHAR
     Text[ spanish ] = "Fondo de car�cter";
     Text[ english_us ] = "Character background";
     Text[ chinese_simplified ] = "字符背景";
-    Text[ russian ] = "��� ������";
+    Text[ russian ] = "��� �������";
     Text[ polish ] = "T�o znaku";
     Text[ japanese ] = "文字の背景";
     Text[ chinese_traditional ] = "字元背景";
@@ -8241,7 +8241,7 @@ String RID_SVXITEMS_EMPHASIS_NONE_STYLE
     Text [ English ] = "none" ;
     Text[ english_us ] = "none";
     Text[ portuguese ] = "nenhum(a)";
-    Text[ russian ] = "���";
+    Text[ russian ] = "���";
     Text[ greek ] = "������";
     Text[ dutch ] = "geen";
     Text[ french ] = "aucun(e)";
@@ -8284,7 +8284,7 @@ String RID_SVXITEMS_EMPHASIS_DOT_STYLE
     Text[ turkish ] = "Dots ";
     Text[ arabic ] = "����";
     Text[ catalan ] = "Punts ";
-    Text[ finnish ] = "Pilkut";
+    Text[ finnish ] = "Pilkut ";
     Text[ thai ] = "จุด ";
 };
 String RID_SVXITEMS_EMPHASIS_CIRCLE_STYLE
@@ -8295,7 +8295,7 @@ String RID_SVXITEMS_EMPHASIS_CIRCLE_STYLE
     Text[ portuguese ] = "C�rculo";
     Text[ russian ] = "���� ";
     Text[ greek ] = "������ ";
-    Text[ dutch ] = "Cirkel  ";
+    Text[ dutch ] = "Cirkel";
     Text[ french ] = "Cercle ";
     Text[ spanish ] = "C�rculo ";
     Text[ italian ] = "Cerchio ";
@@ -8310,7 +8310,7 @@ String RID_SVXITEMS_EMPHASIS_CIRCLE_STYLE
     Text[ turkish ] = "Ring ";
     Text[ arabic ] = "�����";
     Text[ catalan ] = "Cercle ";
-    Text[ finnish ] = "Ympyr�";
+    Text[ finnish ] = "Ympyr� ";
     Text[ thai ] = "วงกลม ";
 };
 String RID_SVXITEMS_EMPHASIS_DISC_STYLE
@@ -8322,7 +8322,7 @@ String RID_SVXITEMS_EMPHASIS_DISC_STYLE
     Text[ portuguese ] = "C�rculo preenchido";
     Text[ russian ] = "����������� ���� ";
     Text[ greek ] = "������ �� ������� ";
-    Text[ dutch ] = "gevulde cirkel  ";
+    Text[ dutch ] = "gevulde cirkel";
     Text[ french ] = "Cercle plein ";
     Text[ spanish ] = "c�rculo relleno ";
     Text[ italian ] = "Cerchio pieno ";
@@ -8337,7 +8337,7 @@ String RID_SVXITEMS_EMPHASIS_DISC_STYLE
     Text[ turkish ] = "Filled ring ";
     Text[ arabic ] = "����� �����";
     Text[ catalan ] = "Cercle ple ";
-    Text[ finnish ] = "T�ytetty ympyr�";
+    Text[ finnish ] = "T�ytetty ympyr� ";
     Text[ thai ] = "เติมวงกลม ";
 };
 String RID_SVXITEMS_EMPHASIS_ACCENT_STYLE
@@ -8348,7 +8348,7 @@ String RID_SVXITEMS_EMPHASIS_ACCENT_STYLE
     Text[ portuguese ] = "Acento";
     Text[ russian ] = "������ ";
     Text[ greek ] = "�������� ";
-    Text[ dutch ] = "Accent  ";
+    Text[ dutch ] = "Accent";
     Text[ french ] = "Accent ";
     Text[ spanish ] = "Acento ";
     Text[ italian ] = "Accento ";
@@ -8363,7 +8363,7 @@ String RID_SVXITEMS_EMPHASIS_ACCENT_STYLE
     Text[ turkish ] = "Accent ";
     Text[ arabic ] = "����� ����� ";
     Text[ catalan ] = "Accent ";
-    Text[ finnish ] = "Aksentti";
+    Text[ finnish ] = "Aksentti ";
     Text[ thai ] = "เน้น ";
 };
 
@@ -8390,7 +8390,7 @@ String RID_SVXITEMS_EMPHASIS_ABOVE_POS
     Text[ turkish ] = "Above";
     Text[ arabic ] = "����";
     Text[ catalan ] = "A sobre";
-    Text[ finnish ] = "Ylh��ll�";
+    Text[ finnish ] = "Yl�puolella";
     Text[ thai ] = "ข้างบน";
 };
 String RID_SVXITEMS_EMPHASIS_BELOW_POS
@@ -8416,7 +8416,7 @@ String RID_SVXITEMS_EMPHASIS_BELOW_POS
     Text[ turkish ] = "Below";
     Text[ arabic ] = "����";
     Text[ catalan ] = "Sota";
-    Text[ finnish ] = "Alhaalla";
+    Text[ finnish ] = "Alapuolella";
     Text[ thai ] = "ข้างล่าง";
 };
 
@@ -8426,7 +8426,7 @@ String RID_SVXITEMS_TWOLINES_OFF
     Text [ English ] = "Double lined off" ;
     Text[ english_us ] = "Double-lined off";
     Text[ portuguese ] = "Desactivar linhas duplas";
-    Text[ russian ] = "����. �����������";
+    Text[ russian ] = "����. ������������";
     Text[ greek ] = "�������� - ���";
     Text[ dutch ] = "Tweeregelig uit";
     Text[ french ] = "'Deux lignes en une' d�sactiv�";
@@ -8437,13 +8437,13 @@ String RID_SVXITEMS_TWOLINES_OFF
     Text[ polish ] = "Wy��cz podw�jne wiersze";
     Text[ portuguese_brazilian ] = "Two lines off";
     Text[ japanese ] = "2行使い オフ";
-    Text[ korean ] = "두 행, 오프";
+    Text[ korean ] = "두줄 해제";
     Text[ chinese_simplified ] = "不使用双行";
     Text[ chinese_traditional ] = "不使用雙行";
     Text[ turkish ] = "Two lines off";
     Text[ arabic ] = "Two lines off";
     Text[ catalan ] = "Desactiva l�nies dobles";
-    Text[ finnish ] = "Kaksoisviiva off";
+    Text[ finnish ] = "Kaksoisviiva poissa k�yt�st�";
     Text[ thai ] = "ขีดเส้นปิดคู่";
 };
 String RID_SVXITEMS_TWOLINES
@@ -8452,7 +8452,7 @@ String RID_SVXITEMS_TWOLINES
     Text [ English ] = "Double lined" ;
     Text[ english_us ] = "Double-lined";
     Text[ portuguese ] = "Linhas duplas";
-    Text[ russian ] = "�����������";
+    Text[ russian ] = "������������";
     Text[ greek ] = "��������";
     Text[ dutch ] = "Tweeregelig";
     Text[ french ] = "Deux lignes en une";
@@ -8463,7 +8463,7 @@ String RID_SVXITEMS_TWOLINES
     Text[ polish ] = "podw�jne";
     Text[ portuguese_brazilian ] = "Two lines";
     Text[ japanese ] = "2行使い";
-    Text[ korean ] = "두 행";
+    Text[ korean ] = "두줄";
     Text[ chinese_simplified ] = "双行";
     Text[ chinese_traditional ] = "雙行";
     Text[ turkish ] = "Two lines";
@@ -8479,9 +8479,9 @@ String RID_SVXITEMS_SCRPTSPC_OFF
     Text [ English ] = "No automatic character distance" ;
     Text[ english_us ] = "No automatic character spacing";
     Text[ portuguese ] = "Espa�amento de caracteres n�o-autom�tico";
-    Text[ russian ] = "��� ��������������� ��������� ����� �������";
+    Text[ russian ] = "��� ��������������� ������������ ���������";
     Text[ greek ] = "����� �������� �������� ����������";
-    Text[ dutch ] = "Geen automatische spati�ring";
+    Text[ dutch ] = "Geen automatische kerning";
     Text[ french ] = "Espacement des caract�res non automatique";
     Text[ spanish ] = "Interlineado no autom�tico";
     Text[ italian ] = "Nessuna distanza automatica tra i caratteri";
@@ -8490,7 +8490,7 @@ String RID_SVXITEMS_SCRPTSPC_OFF
     Text[ polish ] = "Bez automatycznych odst�p�w mi�dzy literami";
     Text[ portuguese_brazilian ] = "No automatic character distance";
     Text[ japanese ] = "自動文字間隔調整なし";
-    Text[ korean ] = "문자 간격, 비자동";
+    Text[ korean ] = "자동으로 문자 간격 적용하지 않음 ";
     Text[ chinese_simplified ] = "不自动调整字符间隔";
     Text[ chinese_traditional ] = "不自動調整字元間隔";
     Text[ turkish ] = "No automatic character distance";
@@ -8505,9 +8505,9 @@ String RID_SVXITEMS_SCRPTSPC_ON
     Text [ English ] = "Automatic character distance" ;
     Text[ english_us ] = "No automatic character spacing";
     Text[ portuguese ] = "Espa�amento de caracteres n�o-autom�tico";
-    Text[ russian ] = "��� ��������������� ��������� ����� �������";
+    Text[ russian ] = "��� ��������������� ������������ ���������";
     Text[ greek ] = "����� �������� �������� ����������";
-    Text[ dutch ] = "Automatische spati�ring";
+    Text[ dutch ] = "Automatische kerning";
     Text[ french ] = "Espacement des caract�res non automatique";
     Text[ spanish ] = "Interlineado no autom�tico";
     Text[ italian ] = "Nessuno spazio automatico tra i caratteri";
@@ -8516,7 +8516,7 @@ String RID_SVXITEMS_SCRPTSPC_ON
     Text[ polish ] = "Bez automatycznych odst�p�w mi�dzy literami";
     Text[ portuguese_brazilian ] = "Automatic character distance";
     Text[ japanese ] = "自動文字間隔調整なし";
-    Text[ korean ] = "문자 간격, 비자동";
+    Text[ korean ] = "자동 문자 간격 적용하지 않음";
     Text[ chinese_simplified ] = "不自动调整字符间隔";
     Text[ chinese_traditional ] = "不自動調整字元間隔";
     Text[ turkish ] = "Automatic character distance";
@@ -8543,7 +8543,7 @@ String RID_SVXITEMS_HNGPNCT_OFF
     Text[ polish ] = "Koniec wiersza bez sierot i wd�w";
     Text[ portuguese_brazilian ] = "No hanging punctuation at line end";
     Text[ japanese ] = "行末に句読点をつけない";
-    Text[ korean ] = "행 끝에 구두점 없음";
+    Text[ korean ] = "줄 끝에 문장 부호 끌어 맞춤 없음";
     Text[ chinese_simplified ] = "行末不附加标点符号";
     Text[ chinese_traditional ] = "行末不附加標點符號";
     Text[ turkish ] = "No hanging punctuation at line end";
@@ -8569,7 +8569,7 @@ String RID_SVXITEMS_HNGPNCT_ON
     Text[ polish ] = "Sieroty i wdowy na ko�cu wiersza";
     Text[ portuguese_brazilian ] = "Hanging punctuation at line end";
     Text[ japanese ] = "行末で処理する";
-    Text[ korean ] = "행 끝에 구두점";
+    Text[ korean ] = "줄 끝에 문장 부호 끌어 맞춤";
     Text[ chinese_simplified ] = "行末附加标点符号";
     Text[ chinese_traditional ] = "行末附加標點符號";
     Text[ turkish ] = "Hanging punctuation at line end";
@@ -8584,11 +8584,11 @@ String RID_SVXITEMS_FORBIDDEN_RULE_OFF
     Text [ English ] = "Apply list of forbidden characters at line end and line start" ;
     Text[ english_us ] = "Apply list of forbidden characters to beginning and end of lines";
     Text[ portuguese ] = "Respeitar carateres interditos no in�cio e no fim da linha";
-    Text[ russian ] = "��������� ������������ ����� � ������ � ����� ������";
+    Text[ russian ] = "��������� ������������ ������� � ������ � ����� ������";
     Text[ greek ] = "�� ������� ����� �� �� ������������� ���������� ���� ���� ��� ��� ����� ��� �������";
     Text[ dutch ] = "Rekening houden met verboden tekens aan regelbegin en -einde";
     Text[ french ] = "Tenir compte des caract�res interdits en d�but et en fin de ligne";
-    Text[ spanish ] = "Considerar caracteres no permitidos a comienzo y final de l�nea.";
+    Text[ spanish ] = "Aplicar lista de caracteres no permitidos a comienzo y final de l�nea.";
     Text[ italian ] = "Considera elenco dei caratteri non consentiti all'inizio e alla fine della riga";
     Text[ danish ] = "Tag hensyn til forbudte tegn ved linjestart og -slutning";
     Text[ swedish ] = "Anv�nd lista med f�rbjudna tecken i b�rjan och slutet av rader";
@@ -8601,7 +8601,7 @@ String RID_SVXITEMS_FORBIDDEN_RULE_OFF
     Text[ turkish ] = "Apply list of forbidden characters at line end and line start";
     Text[ arabic ] = "����� ������ �������� ��� ����� ������ ��������";
     Text[ catalan ] = "Considera car�cters no acceptables a l'inici i final de l�nia.";
-    Text[ finnish ] = "Lis�� kiellettyjen merkkien luettelo rivien alkuihin ja loppuihin";
+    Text[ finnish ] = "K�yt� rivien alussa ja lopussa kiellettyjen merkkien luetteloa";
     Text[ thai ] = "ใช้รายการตัวอักขระที่ห้ามที่บรรทัดเริ่มต้นและบรรทัดสุดท้าย";
 };
 
@@ -8611,11 +8611,11 @@ String RID_SVXITEMS_FORBIDDEN_RULE_ON
     Text [ English ] = "Don't Apply list of forbidden characters at line end and line start" ;
     Text[ english_us ] = "Don't apply list of forbidden characters to beginning and end of lines";
     Text[ portuguese ] = "Ignorar caracteres interditos no in�cio e no fim da linha";
-    Text[ russian ] = "��������� ������������ ����� � ������ � ����� ������";
+    Text[ russian ] = "�� ��������� ������������ ������� � ������ � ����� ������";
     Text[ greek ] = "�� ��� ������� ����� �� �� ������������� ���������� ���� ���� ��� ��� ����� ��� �������";
-    Text[ dutch ] = "Geen rekening houden met verboden tekens aan regelbegin en-einde";
+    Text[ dutch ] = "Geen rekening houden met verboden tekens aan regelbegin en -einde";
     Text[ french ] = "Ignorer les caract�res interdits en d�but et en fin de ligne";
-    Text[ spanish ] = "No considerar caracteres no permitidos a comienzo y final de l�nea.";
+    Text[ spanish ] = "Ignorar los caracteres no permitidos a comienzo y final de l�nea.";
     Text[ italian ] = "Non considerare elenco dei caratteri non consentiti all'inizio e alla fine della riga";
     Text[ danish ] = "Tag ikke hensyn til forbudte tegn ved linjestart og -slutning";
     Text[ swedish ] = "Anv�nd inte lista med f�rbjudna tecken i b�rjan och slutet av rader";
@@ -8628,7 +8628,7 @@ String RID_SVXITEMS_FORBIDDEN_RULE_ON
     Text[ turkish ] = "Don't Apply list of forbidden characters at line end and line start";
     Text[ arabic ] = "��� ����� ������ �������� ��� ����� ������ ��������";
     Text[ catalan ] = "No consideris car�cters no acceptables al principi i final de l�nia.";
-    Text[ finnish ] = "�l� lis�� kiellettyjen merkkien luetteloa rivien alkuihin ja loppuihin";
+    Text[ finnish ] = "�l� k�yt� kiellettyjen merkkien luetteloa rivien alussa ja lopussa";
     Text[ thai ] = "ไม่ใช้รายการตัวอักขระที่ห้ามที่บรรทัดเริ่มต้นและบรรทัดสุดท้าย";
 };
 
@@ -8639,7 +8639,7 @@ String RID_SVXITEMS_CHARROTATE_OFF
     Text [ English ] = "no rotated character";
     Text[ english_us ] = "No rotated characters";
     Text[ portuguese ] = "Sem rota��o de caracteres";
-    Text[ russian ] = "��� ������������ ������";
+    Text[ russian ] = "��� ������������ ��������";
     Text[ greek ] = "����� ���������������� ����������";
     Text[ dutch ] = "geen gedraaide tekens";
     Text[ french ] = "Sans rotation des caract�res";
@@ -8665,7 +8665,7 @@ String RID_SVXITEMS_CHARROTATE
     Text [ English ] = "character rotated by $(ARG1)�";
     Text[ english_us ] = "Character rotated by $(ARG1)�";
     Text[ portuguese ] = "Rota��o de caracteres: $(ARG1)�";
-    Text[ russian ] = "��������� ����� �� $(ARG1)�";
+    Text[ russian ] = "��������� ������� �� $(ARG1)�";
     Text[ greek ] = "���������� ���������� ���� $(ARG1)�";
     Text[ dutch ] = "teken $(ARG1)� gedraaid";
     Text[ french ] = "Rotation des caract�res : $(ARG1)�";
@@ -8694,21 +8694,21 @@ String RID_SVXITEMS_CHARROTATE_FITLINE
     Text[ russian ] = "����������� �� �������";
     Text[ greek ] = "���������� ��� �����";
     Text[ dutch ] = "aanpassen aan regel";
-    Text[ french ] = " Ajuster � la ligne";
-    Text[ spanish ] = "ajustar a fila";
+    Text[ french ] = " Adapter � la ligne";
+    Text[ spanish ] = "Ajustar a la l�nea";
     Text[ italian ] = "Adatta alla riga";
     Text[ danish ] = " tilpas til linje";
     Text[ swedish ] = " Anpassa till rad";
     Text[ polish ] = "Wyr�wnaj do wiersza";
     Text[ portuguese_brazilian ] = " fit to line";
     Text[ japanese ] = "行に合わせる";
-    Text[ korean ] = " 줄에 맞추기";
+    Text[ korean ] = "줄에 맞춤";
     Text[ chinese_simplified ] = "和行对齐";
     Text[ chinese_traditional ] = "和行對齊";
     Text[ turkish ] = " fit to line";
     Text[ arabic ] = "������ �����";
     Text[ catalan ] = "ajustar a fila";
-    Text[ finnish ] = "Sovita riviin";
+    Text[ finnish ] = "Sovita riville";
     Text[ thai ] = "จัดพอดีบรรทัด";
 };
 String RID_SVXITEMS_CHARSCALE
@@ -8717,7 +8717,7 @@ String RID_SVXITEMS_CHARSCALE
     Text [ English ] = "Scaled characters $(ARG1)%";
     Text[ english_us ] = "Characters scaled $(ARG1)%";
     Text[ portuguese ] = "Escalar caracteres: $(ARG1)%";
-    Text[ russian ] = "��������������� ������ $(ARG1)%";
+    Text[ russian ] = "��������������� �������� $(ARG1)%";
     Text[ greek ] = "��������� ���������� $(ARG1)%";
     Text[ dutch ] = "Schaal van tekens $(ARG1)%";
     Text[ french ] = "Graduation des caract�res : $(ARG1)%";
@@ -8728,7 +8728,7 @@ String RID_SVXITEMS_CHARSCALE
     Text[ polish ] = "Skalowane znaki $(ARG1)%";
     Text[ portuguese_brazilian ] = "Scaled characters $(ARG1)%";
     Text[ japanese ] = "文字の倍率 $(ARG1)%";
-    Text[ korean ] = "문자 스케일링 $(ARG1)%";
+    Text[ korean ] = "장평 $(ARG1)%";
     Text[ chinese_simplified ] = "字符显示比例 $(ARG1)%";
     Text[ chinese_traditional ] = "字元顯示比例 $(ARG1)%";
     Text[ turkish ] = "Scaled characters $(ARG1)%";
@@ -8743,9 +8743,9 @@ String RID_SVXITEMS_CHARSCALE_OFF
     Text [ English ] = "no scaled characters";
     Text[ english_us ] = "No scaled characters";
     Text[ portuguese ] = "Caracteres n�o dimensionados";
-    Text[ russian ] = "��� ��������������� ������";
+    Text[ russian ] = "��� ��������������� ��������";
     Text[ greek ] = "����� ������������� ����������";
-    Text[ dutch ] = "geen schaalverandering van tekens";
+    Text[ dutch ] = "geen schaalwijziging van tekens";
     Text[ french ] = "Sans graduation des caract�res";
     Text[ spanish ] = "sin aumento de tama�o del car�cter";
     Text[ italian ] = "Senza scala carattere";
@@ -8754,7 +8754,7 @@ String RID_SVXITEMS_CHARSCALE_OFF
     Text[ polish ] = "bez skalowania znak�w";
     Text[ portuguese_brazilian ] = "no scaled characters";
     Text[ japanese ] = "文字を倍率変更しない";
-    Text[ korean ] = "스케일링없는 문자";
+    Text[ korean ] = "장평 없음";
     Text[ chinese_simplified ] = "不使用字符显示比例";
     Text[ chinese_traditional ] = "不使用字元顯示比例";
     Text[ turkish ] = "no scaled characters";
@@ -8772,7 +8772,7 @@ String RID_SVXITEMS_RELIEF_NONE
     Text[ portuguese ] = "Sem relevo";
     Text[ russian ] = "��� �������";
     Text[ greek ] = "����� ��������";
-    Text[ dutch ] = "Geen relief";
+    Text[ dutch ] = "Geen reli�f";
     Text[ french ] = "Sans relief";
     Text[ spanish ] = "Sin relieve";
     Text[ italian ] = "Senza rilievo";
@@ -8833,7 +8833,7 @@ String RID_SVXITEMS_RELIEF_ENGRAVED
     Text[ polish ] = "Grawura";
     Text[ portuguese_brazilian ] = "Engrave";
     Text[ japanese ] = "浮き彫り";
-    Text[ korean ] = "각인";
+    Text[ korean ] = "오목 효과";
     Text[ chinese_simplified ] = "雕刻";
     Text[ chinese_traditional ] = "雕刻";
     Text[ turkish ] = "Engrave";
@@ -8878,14 +8878,14 @@ String RID_SVXITEMS_PARAVERTALIGN_BASELINE
     Text[ greek ] = "text alignment baseline";
     Text[ dutch ] = "Uitlijnen op basislijn";
     Text[ french ] = "Alignement du texte sur la ligne de base";
-    Text[ spanish ] = "Alineaci�n de texto a l�nea base";
+    Text[ spanish ] = "Alineaci�n del texto a la l�nea de base";
     Text[ italian ] = "Allineamento alla linea di base";
     Text[ danish ] = "Tekstjustering Basislinje";
     Text[ swedish ] = "Textjustering baslinje";
     Text[ polish ] = "Wyr�wnanie tekstu do linii podstawowej";
     Text[ portuguese_brazilian ] = "text alignment baseline";
     Text[ japanese ] = "基線に文字配置";
-    Text[ korean ] = "텍스트 기준선 맞춤";
+    Text[ korean ] = "텍스트를 기준선에 맞춤";
     Text[ chinese_simplified ] = "文字对齐基线";
     Text[ chinese_traditional ] = "文字和基線對齊";
     Text[ turkish ] = "text alignment baseline";
@@ -8911,7 +8911,7 @@ String RID_SVXITEMS_PARAVERTALIGN_TOP
     Text[ polish ] = "Wyr�wnanie tekstu do g�ry";
     Text[ portuguese_brazilian ] = "text alignment top";
     Text[ japanese ] = "上揃えで文字配置";
-    Text[ korean ] = "텍스트 맞춤. 위로";
+    Text[ korean ] = "위로 텍스트를 맞춤";
     Text[ chinese_simplified ] = "文字向上对齐";
     Text[ chinese_traditional ] = "文字向上對齊";
     Text[ turkish ] = "text alignment top";
@@ -8937,7 +8937,7 @@ String RID_SVXITEMS_PARAVERTALIGN_CENTER
     Text[ polish ] = "Wy�rodkowanie tekstu";
     Text[ portuguese_brazilian ] = "text alignment center";
     Text[ japanese ] = "中央揃えで文字配置";
-    Text[ korean ] = "텍스트 맞춤, 가운데";
+    Text[ korean ] = "가운데로 텍스트 맞춤";
     Text[ chinese_simplified ] = "文字居中对齐";
     Text[ chinese_traditional ] = "文字置中對齊";
     Text[ turkish ] = "text alignment center";
@@ -8963,7 +8963,7 @@ String RID_SVXITEMS_PARAVERTALIGN_BOTTOM
     Text[ polish ] = "Wyr�wnanie tekstu do do�u";
     Text[ portuguese_brazilian ] = "text alignment bottom";
     Text[ japanese ] = "下揃えで文字配置";
-    Text[ korean ] = "텍스트 맞춤, 아래로";
+    Text[ korean ] = "아래로 텍스트 맞춤";
     Text[ chinese_simplified ] = "文字向下对齐";
     Text[ chinese_traditional ] = "文字向下對齊";
     Text[ turkish ] = "text alignment bottom";
@@ -8979,19 +8979,19 @@ String RID_SVXITEMS_FRMDIR_HORI_LEFT_TOP
     Text [ English ] = "text flow horizontal from left";
     Text[ english_us ] = "Text direction left-to-right (horizontal)";
     Text[ portuguese ] = "text flow horizontal from left";
-    Text[ russian ] = "text flow horizontal from left";
+    Text[ russian ] = "����������� ������ ����� ������� (�������������)";
     Text[ greek ] = "text flow horizontal from left";
-    Text[ dutch ] = "text flow horizontal from left";
-    Text[ french ] = "Encha�nements de gauche � droite (horizontal)";
-    Text[ spanish ] = "Flujo de texto horizontal desde la izquierda";
-    Text[ finnish ] = "text flow horizontal from left";
+    Text[ dutch ] = "Tekstverloop links-naar-rechts (horizontaal)";
+    Text[ french ] = "Orientation du texte de gauche � droite (horizontal)";
+    Text[ spanish ] = "Direcci�n de escritura desde la izquierda (horizontal)";
+    Text[ finnish ] = "Tekstin suunta vasemmalta oikealle (vaaka)";
     Text[ italian ] = "Testo orizzontale da sinistra a destra";
     Text[ danish ] = "Tekstretning � Fra venstre mod h�jre (vandret)";
     Text[ swedish ] = "Textriktning v�nster-till-h�ger (horisontellt)";
     Text[ polish ] = "text flow horizontal from left";
     Text[ portuguese_brazilian ] = "text flow horizontal from left";
     Text[ japanese ] = "文字方向は左から右へ (横書き)";
-    Text[ korean ] = "텍스트 방향 왼쪽에서 오른쪽으로 (가로)";
+    Text[ korean ] = "문자 방향 왼쪽에서 오른쪽으로 (가로)";
     Text[ chinese_simplified ] = "文字方向从左向右(横写)";
     Text[ chinese_traditional ] = "文字方向從左向右(橫書)";
     Text[ turkish ] = "text flow horizontal from left";
@@ -9005,19 +9005,19 @@ String RID_SVXITEMS_FRMDIR_HORI_RIGHT_TOP
     Text [ English ] = "text flow horizontal from right";
     Text[ english_us ] = "Text direction right-to-left (horizontal)";
     Text[ portuguese ] = "text flow horizontal from right";
-    Text[ russian ] = "text flow horizontal from right";
+    Text[ russian ] = "����������� ������ ������ ������ (�������������)";
     Text[ greek ] = "text flow horizontal from right";
-    Text[ dutch ] = "text flow horizontal from right";
-    Text[ french ] = "Encha�nements de droite � gauche (horizontal)";
-    Text[ spanish ] = "Flujo de texto horizontal desde la derecha";
-    Text[ finnish ] = "text flow horizontal from right";
+    Text[ dutch ] = "Tekstverloop rechts-naar-links (horizontaal)";
+    Text[ french ] = "Orientation du texte de droite � gauche (horizontal)";
+    Text[ spanish ] = "Direcci�n de escritura desde la derecha (horizontal)";
+    Text[ finnish ] = "Tekstin suunta oikealta vasemmalle (vaaka)";
     Text[ italian ] = "Testo orizzontale da destra a sinistra";
     Text[ danish ] = "Tekstretning � Fra h�jre mod venstre (vandret)";
     Text[ swedish ] = "Textriktning h�ger-till-v�nster (horisontellt)";
     Text[ polish ] = "text flow horizontal from right";
     Text[ portuguese_brazilian ] = "text flow horizontal from right";
     Text[ japanese ] = "文字方向は右から左へ (横書き)";
-    Text[ korean ] = "텍스트 방향 오른쪽에서 왼쪽으로 (가로)";
+    Text[ korean ] = "문자 방향 오른쪽에서 왼쪽으로 (가로)";
     Text[ chinese_simplified ] = "文字方向从右向左(竖写)";
     Text[ chinese_traditional ] = "文字方向從右向左(橫書)";
     Text[ turkish ] = "text flow horizontal from right";
@@ -9031,19 +9031,19 @@ String RID_SVXITEMS_FRMDIR_VERT_TOP_RIGHT
     Text [ English ] = "text flow vertical from right";
     Text[ english_us ] = "Text direction right-to-left (vertical)";
     Text[ portuguese ] = "text flow vertical from right";
-    Text[ russian ] = "text flow vertical from right";
+    Text[ russian ] = "����������� ������ ������ ������ (�����������)";
     Text[ greek ] = "text flow vertical from right";
-    Text[ dutch ] = "text flow vertical from right";
-    Text[ french ] = "Encha�nements de droite � gauche (vertical)";
-    Text[ spanish ] = "Flujo de texto vertical de derecha a izquierda";
-    Text[ finnish ] = "text flow vertical from right";
+    Text[ dutch ] = "Tekstverloop rechts-naar-links (verticaal)";
+    Text[ french ] = "Orientation du texte de droite � gauche (vertical)";
+    Text[ spanish ] = "Direcci�n de escritura de derecha a izquierda (vertical)";
+    Text[ finnish ] = "Tekstin suunta oikealta vasemmalle (pysty)";
     Text[ italian ] = "Testo verticale da destra a sinistra";
     Text[ danish ] = "Tekstretning � Fra h�jre mod venstre (lodret)";
     Text[ swedish ] = "Textriktning h�ger-till-v�nster (vertikalt)";
     Text[ polish ] = "text flow vertical from right";
     Text[ portuguese_brazilian ] = "text flow vertical from right";
     Text[ japanese ] = "文字方向は右から左へ (縦書き)";
-    Text[ korean ] = "텍스트 방향 오른쪽에서 왼쪽으로 (세로)";
+    Text[ korean ] = "문자 방향 오른쪽에서 왼쪽으로 (세로)";
     Text[ chinese_simplified ] = "文字方向从右向左(竖写)";
     Text[ chinese_traditional ] = "文字方向從右向左(直書)";
     Text[ turkish ] = "text flow vertical from right";
@@ -9057,19 +9057,19 @@ String RID_SVXITEMS_FRMDIR_VERT_TOP_LEFT
     Text [ English ] = "text flow vertical from left";
     Text[ english_us ] = "Text direction left-to-right (vertical)";
     Text[ portuguese ] = "text flow vertical from left";
-    Text[ russian ] = "text flow vertical from left";
+    Text[ russian ] = "����������� ������ ����� ������� (�����������)";
     Text[ greek ] = "text flow vertical from left";
-    Text[ dutch ] = "text flow vertical from left";
-    Text[ french ] = "Encha�nements de gauche � droite (vertical)";
-    Text[ spanish ] = "Flujo de texto vertical de izquierda a derecha";
-    Text[ finnish ] = "text flow vertical from left";
+    Text[ dutch ] = "Tekstverloop links-naar-rechts (verticaal)";
+    Text[ french ] = "Orientation du texte de gauche � droite (vertical)";
+    Text[ spanish ] = "Direcci�n de escritura de izquierda a derecha (vertical)";
+    Text[ finnish ] = "Tekstin suunta vasemmalta oikealle (pysty)";
     Text[ italian ] = "Testo verticale da sinistra a destra";
     Text[ danish ] = "Tekstretning � Fra venstre mod h�jre (lodret)";
     Text[ swedish ] = "Textriktning v�nster-till-h�ger (vertikalt)";
     Text[ polish ] = "text flow vertical from left";
     Text[ portuguese_brazilian ] = "text flow vertical from left";
     Text[ japanese ] = "文字方向は左から右へ (縦書き)";
-    Text[ korean ] = "텍스트 방향 왼쪽에서 오른쪽으로 (세로)";
+    Text[ korean ] = "문자 방향 왼쪽에서 오른쪽으로 (세로)";
     Text[ chinese_simplified ] = "文字方向从左向右(横写)";
     Text[ chinese_traditional ] = "文字方向從左向右(直書)";
     Text[ turkish ] = "text flow vertical from left";
@@ -9083,19 +9083,19 @@ String RID_SVXITEMS_FRMDIR_ENVIRONMENT
     Text [ English ] = "text flow from environment";
     Text[ english_us ] = "Use superordinate object text direction setting";
     Text[ portuguese ] = "text flow from environment";
-    Text[ russian ] = "text flow from environment";
+    Text[ russian ] = "������������ ����������� ������ ����������� ��������";
     Text[ greek ] = "text flow from environment";
-    Text[ dutch ] = "text flow from environment";
-    Text[ french ] = "Utiliser le param�tre d'encha�nement de l'objet sup�rieur";
-    Text[ spanish ] = "Utilizar la configuraci�n del flujo de texto del objeto superior";
-    Text[ finnish ] = "text flow from environment";
+    Text[ dutch ] = "Instelling voor tekstverloop van het object op het bovenliggende niveau gebruiken";
+    Text[ french ] = "Utiliser le param�tre d'orientation du texte de l'objet sup�rieur";
+    Text[ spanish ] = "Utilizar la configuraci�n de la direcci�n de escritura del objeto superior";
+    Text[ finnish ] = "K�yt� ensisijaista objektin tekstin suunta -asetusta";
     Text[ italian ] = "Usa le impostazioni di testo dell'oggetto superiore";
     Text[ danish ] = "Tekstretning � Anvend det overordnede objekts indstilling";
     Text[ swedish ] = "Anv�nd det �verordnade objektets inst�llning av textriktning";
     Text[ polish ] = "text flow from environment";
     Text[ portuguese_brazilian ] = "text flow from environment";
-    Text[ japanese ] = "上位オブジェクトに設定した体裁を使用";
-    Text[ korean ] = "고급 설정으로부터 텍스트 방향 설정";
+    Text[ japanese ] = "周りのテキストの文字方向に合わせる";
+    Text[ korean ] = "상위 개체의 문자 방향 설정을 적용";
     Text[ chinese_simplified ] = "沿用现有的文字方向的设定";
     Text[ chinese_traditional ] = "沿用現有的文字方向的設定";
     Text[ turkish ] = "text flow from environment";
@@ -9110,19 +9110,19 @@ String RID_SVXITEMS_PARASNAPTOGRID_ON
     Text [ English ] = "paragraph snap to grid";
     Text[ english_us ] = "Paragraph snaps to text grid (if active)";
     Text[ portuguese ] = "paragraph snap to grid";
-    Text[ russian ] = "paragraph snap to grid";
+    Text[ russian ] = "�������� �������� � ����� ������ (���� �������)";
     Text[ greek ] = "paragraph snap to grid";
-    Text[ dutch ] = "paragraph snap to grid";
+    Text[ dutch ] = "Alinea wordt aan tekstraster gevangen (indien geactiveerd)";
     Text[ french ] = "Capture du paragraphe � la grille du texte (si activ�e)";
     Text[ spanish ] = "Utilizar la cuadr�cula en el p�rrafo (si activada) ";
-    Text[ finnish ] = "paragraph snap to grid";
+    Text[ finnish ] = "Kappaleen kohdistus tekstiruudukkoon (jos k�yt�ss�)";
     Text[ italian ] = "Cattura il paragrafo alla griglia di testo (se attivata)";
     Text[ danish ] = "Afstanden m�les ved tekstgitteret (ved aktivering)";
     Text[ swedish ] = "Stycke f�sts mot textraster (om det �r aktiverat)";
     Text[ polish ] = "paragraph snap to grid";
     Text[ portuguese_brazilian ] = "paragraph snap to grid";
     Text[ japanese ] = "段落を罫線位置に合わせる(罫線がオンの場合)";
-    Text[ korean ] = "단락을 그리드선에 정렬 (활성시)";
+    Text[ korean ] = "단락을 텍스트 그리드로 맞춤(활성시)";
     Text[ chinese_simplified ] = "段落和文字格子线对齐(如使用文字格子线)";
     Text[ chinese_traditional ] = "段落和文字格子線對齊(如有使用文字格子線)";
     Text[ turkish ] = "paragraph snap to grid";
@@ -9137,19 +9137,19 @@ String RID_SVXITEMS_PARASNAPTOGRID_OFF
     Text [ English ] = "paragraph does not snap to grid";
     Text[ english_us ] = "Paragraph does not snap to text grid";
     Text[ portuguese ] = "paragraph does not snap to grid";
-    Text[ russian ] = "paragraph does not snap to grid";
+    Text[ russian ] = "�������� �� �������� � ����� ������";
     Text[ greek ] = "paragraph does not snap to grid";
-    Text[ dutch ] = "paragraph does not snap to grid";
+    Text[ dutch ] = "Alinea wordt niet aan tekstraster gevangen";
     Text[ french ] = "Pas de capture du paragraphe � la grille du texte";
     Text[ spanish ] = "No utiliza la cuadr�cula en el p�rrafo";
-    Text[ finnish ] = "paragraph does not snap to grid";
+    Text[ finnish ] = "Kappale ei kohdistu tekstiruudukkoon";
     Text[ italian ] = "Non cattura il paragrafo alla griglia di testo";
     Text[ danish ] = "Afstanden m�les ikke ved tekstgitteret";
     Text[ swedish ] = "Stycke f�sts inte mot textraster";
     Text[ polish ] = "paragraph does not snap to grid";
     Text[ portuguese_brazilian ] = "paragraph does not snap to grid";
     Text[ japanese ] = "段落を罫線位置に合わせない";
-    Text[ korean ] = "단락을 그리드선에 정렬 안함";
+    Text[ korean ] = "단락을 텍스트 그리드로 가져와 맞춤";
     Text[ chinese_simplified ] = "段落不和文字格子线对齐";
     Text[ chinese_traditional ] = "段落不和文字格子線對齊";
     Text[ turkish ] = "paragraph does not snap to grid";
@@ -9178,3 +9178,8 @@ String RID_SVXITEMS_PARASNAPTOGRID_OFF
 
 
 
+
+
+
+
+
diff --git a/svx/source/items/textitem.cxx b/svx/source/items/textitem.cxx
index 08595c388be1..746674bcb0e9 100644
--- a/svx/source/items/textitem.cxx
+++ b/svx/source/items/textitem.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: textitem.cxx,v $
  *
- *  $Revision: 1.49 $
+ *  $Revision: 1.50 $
  *
- *  last change: $Author: mt $ $Date: 2002-11-05 15:40:55 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,8 +73,8 @@
 #endif
 #include <toolkit/unohlp.hxx>
 #include <math.h>
-#ifndef _TOOLS_SOLMATH_HXX
-#include <tools/solmath.hxx>
+#ifndef INCLUDED_RTL_MATH_HXX
+#include <rtl/math.hxx>
 #endif
 
 #include <eeitem.hxx>
@@ -953,7 +953,8 @@ sal_Bool SvxFontHeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
             else
             {
                 double fPoints = MM100_TO_TWIP((long)nHeight) / 20.0;
-                float fRoundPoints = static_cast<float>(SolarMath::Round(fPoints, 1));
+                float fRoundPoints =
+                    static_cast<float>(::rtl::math::round(fPoints, 1));
                 rVal <<= fRoundPoints;
             }
         }
@@ -1153,7 +1154,7 @@ int SvxFontHeightItem::HasMetrics() const
 void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, const USHORT nNewProp,
                                     SfxMapUnit eUnit )
 {
-    DBG_ASSERT( GetRef() == 0, "SetValue() with pooled item" );
+    DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
 
 #ifndef SVX_LIGHT
     if( SFX_MAPUNIT_RELATIVE != eUnit )
@@ -1173,7 +1174,7 @@ void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, const USHORT nNewProp,
 void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, USHORT nNewProp,
                                  SfxMapUnit eMetric, SfxMapUnit eCoreMetric )
 {
-    DBG_ASSERT( GetRef() == 0, "SetValue() with pooled item" );
+    DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
 
 #ifndef SVX_LIGHT
     if( SFX_MAPUNIT_RELATIVE != eMetric )
diff --git a/svx/source/msfilter/escherex.cxx b/svx/source/msfilter/escherex.cxx
index 21b5e164b6a3..68b6c7745659 100644
--- a/svx/source/msfilter/escherex.cxx
+++ b/svx/source/msfilter/escherex.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: escherex.cxx,v $
  *
- *  $Revision: 1.36 $
+ *  $Revision: 1.37 $
  *
- *  last change: $Author: sj $ $Date: 2002-12-11 16:27:16 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -60,7 +60,9 @@
  ************************************************************************/
 
 #include <math.h>
-
+#ifndef _SVX_IMPGRF_HXX
+#include "impgrf.hxx"
+#endif
 #ifndef _ESCHESDO_HXX
 #include "eschesdo.hxx"
 #endif
@@ -740,6 +742,16 @@ void EscherPropertyContainer::CreateLineProperties(
     }
 }
 
+static Size lcl_SizeToEmu(Size aPrefSize, MapMode aPrefMapMode)
+{
+    Size aRetSize;
+    if (aPrefMapMode == MAP_PIXEL)
+        aRetSize = Application::GetDefaultDevice()->PixelToLogic( aPrefSize, MAP_100TH_MM );
+    else
+        aRetSize = Application::GetDefaultDevice()->LogicToLogic( aPrefSize, aPrefMapMode, MAP_100TH_MM );
+    return aRetSize;
+}
+
 void EscherPropertyContainer::ImplCreateGraphicAttributes( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
                                                             sal_uInt32 nBlibId, sal_Bool bCreateCroppingAttributes )
 {
@@ -818,11 +830,7 @@ void EscherPropertyContainer::ImplCreateGraphicAttributes( const ::com::sun::sta
         MapMode aPrefMapMode;
         if ( pGraphicProvider->GetPrefSize( nBlibId, aPrefSize, aPrefMapMode ) )
         {
-            Size aCropSize;
-            if ( aPrefMapMode == MAP_PIXEL )
-                aCropSize = Application::GetDefaultDevice()->PixelToLogic( aPrefSize, MAP_100TH_MM );
-            else
-                aCropSize = Application::GetDefaultDevice()->LogicToLogic( aPrefSize, aPrefMapMode, MAP_100TH_MM );
+            Size aCropSize(lcl_SizeToEmu(aPrefSize, aPrefMapMode));
             if ( aCropSize.Width() && aCropSize.Height() )
             {
                 if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "GraphicCrop" ) ) ) )
@@ -2023,7 +2031,35 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, const ByteSt
             GraphicType eGraphicType = aGraphic.GetType();
             if ( ( eGraphicType == GRAPHIC_BITMAP ) || ( eGraphicType == GRAPHIC_GDIMETAFILE ) )
             {
-                sal_uInt32 nErrCode = GraphicConverter::Export( aStream, aGraphic, ( eGraphicType == GRAPHIC_BITMAP ) ? CVT_PNG  : CVT_WMF );
+                sal_uInt32 nErrCode;
+                if ( !aGraphic.IsAnimated() )
+                    nErrCode = GraphicConverter::Export( aStream, aGraphic, ( eGraphicType == GRAPHIC_BITMAP ) ? CVT_PNG  : CVT_WMF );
+                else
+                {   // to store a animation, a gif has to be included into the msOG chunk of a png  #I5583#
+                    GraphicFilter*  pFilter = GetGrfFilter();
+                    SvMemoryStream  aGIFStream;
+                    ByteString      aVersion( "MSOFFICE9.0" );
+                    aGIFStream.Write( aVersion.GetBuffer(), aVersion.Len() );
+                    nErrCode = pFilter->ExportGraphic( aGraphic, String(), aGIFStream,
+                        pFilter->GetExportFormatNumberForShortName( String( RTL_CONSTASCII_USTRINGPARAM( "GIF" ) ) ), sal_False, NULL );
+                    com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aFilterData( 1 );
+                    com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aAdditionalChunkSequence( 1 );
+                    sal_uInt32 nGIFSreamLen = aGIFStream.Tell();
+                    com::sun::star::uno::Sequence< sal_Int8 > aGIFSeq( nGIFSreamLen );
+                    sal_Int8* pSeq = aGIFSeq.getArray();
+                    aGIFStream.Seek( STREAM_SEEK_TO_BEGIN );
+                    aGIFStream.Read( pSeq, nGIFSreamLen );
+                    com::sun::star::beans::PropertyValue aChunkProp, aFilterProp;
+                    aChunkProp.Name = String( RTL_CONSTASCII_USTRINGPARAM( "msOG" ) );
+                    aChunkProp.Value <<= aGIFSeq;
+                    aAdditionalChunkSequence[ 0 ] = aChunkProp;
+                    aFilterProp.Name = String( RTL_CONSTASCII_USTRINGPARAM( "AdditionalChunks" ) );
+                    aFilterProp.Value <<= aAdditionalChunkSequence;
+                    aFilterData[ 0 ] = aFilterProp;
+                    nErrCode = pFilter->ExportGraphic( aGraphic, String(), aStream,
+                        pFilter->GetExportFormatNumberForShortName( String( RTL_CONSTASCII_USTRINGPARAM( "PNG" ) ) ), sal_False,
+                            &aFilterData );
+                }
                 if ( nErrCode == ERRCODE_NONE )
                 {
                     p_EscherBlibEntry->meBlibType = ( eGraphicType == GRAPHIC_BITMAP ) ? PNG : WMF;
@@ -2088,7 +2124,6 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, const ByteSt
                         rPicOutStrm.Write( p_EscherBlibEntry->mnIdentifier, 16 );
                     rPicOutStrm.Write( p_EscherBlibEntry->mnIdentifier, 16 );
 
-#if 1
                     /*
                      ##913##
                      For Word the stored size of the graphic is critical the
@@ -2099,16 +2134,12 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, const ByteSt
                      msoffice app may show strange behaviour as the size jumps
                      around, and the original size and scaling factor in word
                      will be a very strange figure
-
-                     The older code works in powerpoint probably because
-                     powerpoint uses the values of the graphic itself and
-                     ignores these ones.
-                     */
-                    Size aPrefSize = aGraphic.GetPrefSize();
-                    UINT32 nPrefWidth = aPrefSize.Width();
-                    UINT32 nPrefHeight = aPrefSize.Height();
-                    UINT32 nWidth = nPrefWidth * 360; //EMU
-                    UINT32 nHeight = nPrefHeight * 360; //EMU
+                    */
+                    UINT32 nPrefWidth = p_EscherBlibEntry->maPrefSize.Width();
+                    UINT32 nPrefHeight = p_EscherBlibEntry->maPrefSize.Height();
+                    Size aPrefSize(lcl_SizeToEmu(p_EscherBlibEntry->maPrefSize, p_EscherBlibEntry->maPrefMapMode));
+                    UINT32 nWidth = aPrefSize.Width() * 360;
+                    UINT32 nHeight = aPrefSize.Height() * 360;
 
                     rPicOutStrm << nUncompressedSize // WMFSize without FileHeader
                     << (sal_Int32)0     // da die Originalgroesse des WMF's (ohne FileHeader)
@@ -2120,22 +2151,6 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, const ByteSt
                     << p_EscherBlibEntry->mnSize
                     << (sal_uInt16)0xfe00;  // compression Flags
                     rPicOutStrm.Write( pGraphicAry, p_EscherBlibEntry->mnSize );
-#else
-                    UINT32 nWidth = rBoundRect.GetWidth() * 360;
-                    UINT32 nHeight = rBoundRect.GetHeight() * 360;
-                    double fWidth = (double)rBoundRect.GetWidth() / 10000.0 * 1027.0;
-                    double fHeight = (double)rBoundRect.GetHeight() / 10000.0 * 1027.0;
-                    rPicOutStrm << nUncompressedSize    // WMFSize ohne FileHeader
-                                << (sal_Int32)0         // da die Originalgroesse des WMF's (ohne FileHeader)
-                                << (sal_Int32)0         // nicht mehr feststellbar ist, schreiben wir 10cm / x
-                                << (sal_Int32)fWidth
-                                << (sal_Int32)fHeight
-                                << nWidth
-                                << nHeight
-                                << p_EscherBlibEntry->mnSize
-                                << (sal_uInt16)0xfe00;  // compression Flags
-                    rPicOutStrm.Write( pGraphicAry, p_EscherBlibEntry->mnSize );
-#endif
                 }
             }
             if ( nAtomSize )
diff --git a/svx/source/msfilter/eschesdo.cxx b/svx/source/msfilter/eschesdo.cxx
index 771d703f5e7f..9796ef7aa4a1 100644
--- a/svx/source/msfilter/eschesdo.cxx
+++ b/svx/source/msfilter/eschesdo.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: eschesdo.cxx,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: dr $ $Date: 2002-11-29 11:54:08 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -798,7 +798,7 @@ UINT32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
                 else
                 {
                     ADD_SHAPE( ESCHER_ShpInst_PictureFrame, 0xa00 );
-                    if ( aPropOpt.CreateGraphicProperties( rObj.mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "GraphicURL" ) ), sal_False ) )
+                    if ( aPropOpt.CreateGraphicProperties( rObj.mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "GraphicURL" ) ), sal_False, sal_True ) )
                         aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 );
                 }
             }
diff --git a/svx/source/msfilter/makefile.mk b/svx/source/msfilter/makefile.mk
index 47c08295e6ca..14974a1c0f48 100644
--- a/svx/source/msfilter/makefile.mk
+++ b/svx/source/msfilter/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.8 $
+#   $Revision: 1.9 $
 #
-#   last change: $Author: hjs $ $Date: 2001-11-21 18:45:19 $
+#   last change: $Author: hr $ $Date: 2003-03-27 15:03:38 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -68,10 +68,7 @@ AUTOSEG=true
 
 # --- Settings -----------------------------------------------------
 
-.INCLUDE :  svpre.mk
 .INCLUDE :  settings.mk
-.INCLUDE :  sv.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 # --- Files --------------------------------------------------------
 
@@ -83,21 +80,16 @@ SLOFILES=\
     $(SLO)$/msvbasic.obj	\
     $(SLO)$/msashape.obj	\
     $(SLO)$/svxmsbas.obj	\
-    $(SLO)$/msocximex.obj
+    $(SLO)$/msocximex.obj	\
+    $(SLO)$/msashape3d.obj	\
+    $(SLO)$/msfiltertracer.obj
 
 EXCEPTIONSFILES= \
     $(SLO)$/eschesdo.obj	\
     $(SLO)$/escherex.obj	\
     $(SLO)$/msdffimp.obj	\
-    $(SLO)$/msocximex.obj
-
-.IF "$(SVXLIGHT)"!=""
-EXCEPTIONSFILES+= \
-    $(OBJ)$/sxl_msdffimp.obj
-.ENDIF          # "$(SVXLIGHT)"!=""
-
-SVXLIGHTOBJFILES=\
-    $(OBJ)$/msdffimp.obj
+    $(SLO)$/msocximex.obj	\
+    $(SLO)$/msfiltertracer.obj
 
 .INCLUDE :  target.mk
 
diff --git a/svx/source/msfilter/msashape.cxx b/svx/source/msfilter/msashape.cxx
index 663951a87fb6..4e6aeddb96c8 100644
--- a/svx/source/msfilter/msashape.cxx
+++ b/svx/source/msfilter/msashape.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: msashape.cxx,v $
  *
- *  $Revision: 1.28 $
+ *  $Revision: 1.29 $
  *
- *  last change: $Author: sj $ $Date: 2002-11-01 16:55:31 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:39 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -121,6 +121,8 @@ struct mso_AutoShape
     sal_Int32                   nCoordHeight;
     sal_Int32                   nXRef;
     sal_Int32                   nYRef;
+    SvxMSDffVertPair*           pGluePoints;
+    sal_uInt32                  nGluePoints;
 };
 
 #define GEOMETRY_USED_LEFT              1
@@ -162,7 +164,8 @@ static const mso_AutoShape mso =
     (sal_Int32*)mso_sptDefault,
     (SvxMSDffTextRectangles*)mso_sptTextRect, sizeof( mso_sptTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptVert, sizeof( mso_sptVert ) / sizeof( SvxMSDffVertPair )
 };
 */
 
@@ -217,6 +220,10 @@ static const sal_Int32 mso_sptArcDefault[] =
 {
     2, 270 << 16, 0
 };
+static const SvxMSDffVertPair mso_sptStandardGluePoints[] =
+{
+    { 10800, 0 }, { 0, 10800 }, { 10800, 21600 }, { 21600, 10800 }
+};
 static const mso_AutoShape msoArc =
 {
     NULL, 0,
@@ -225,7 +232,8 @@ static const mso_AutoShape msoArc =
     (sal_Int32*)mso_sptArcDefault,
     NULL, 0,
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const mso_AutoShape msoRectangle =
@@ -233,10 +241,11 @@ static const mso_AutoShape msoRectangle =
     NULL, 0,
     NULL, 0,
     NULL, 0,
-    (sal_Int32*)mso_sptDefault0,
+    NULL,
     NULL, 0,
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffCalculationData mso_sptRoundRectangleCalc[] =  // adjustment1 : 0 - 10800
@@ -259,7 +268,8 @@ static const mso_AutoShape msoRoundRectangle =
     (sal_Int32*)mso_sptDefault3600,
     (SvxMSDffTextRectangles*)mso_sptRoundRectangleTextRect, sizeof( mso_sptRoundRectangleTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptRightTriangleVert[] =
@@ -270,6 +280,10 @@ static const SvxMSDffTextRectangles mso_sptRightTriangleTextRect[] =
 {
     { { 1900, 12700 }, { 12700, 19700 } }
 };
+static const SvxMSDffVertPair mso_sptRightTriangleGluePoints[] =
+{
+    { 10800, 0 }, { 5400, 10800 }, { 0, 21600 }, { 10800, 21600 }, { 21600, 21600 }, { 16200, 10800 }
+};
 static const mso_AutoShape msoRightTriangle =
 {
     (SvxMSDffVertPair*)mso_sptRightTriangleVert, sizeof( mso_sptRightTriangleVert ) / sizeof( SvxMSDffVertPair ),
@@ -278,13 +292,18 @@ static const mso_AutoShape msoRightTriangle =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptRightTriangleTextRect, sizeof( mso_sptRightTriangleTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptRightTriangleGluePoints, sizeof( mso_sptRightTriangleGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffTextRectangles mso_sptEllipseTextRect[] =
 {
     { { 3200, 3200 }, { 18400, 18400 } }
 };
+static const SvxMSDffVertPair mso_sptEllipseGluePoints[] =
+{
+    { 10800, 0 }, { 3160, 3160 }, { 0, 10800 }, { 3160, 18440 }, { 10800, 21600 }, { 18440, 18440 }, { 21600, 10800 }, { 18440, 3160 }
+};
 static const mso_AutoShape msoEllipse =
 {
     NULL, 0,
@@ -293,7 +312,8 @@ static const mso_AutoShape msoEllipse =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptEllipseTextRect, sizeof( mso_sptEllipseTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptEllipseGluePoints, sizeof( mso_sptEllipseGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptParallelogramVert[] =  // adjustment1 : 0 - 21600
@@ -310,12 +330,25 @@ static const SvxMSDffCalculationData mso_sptParallelogramCalc[] =
     { 0x8000, 0, 21600, DFF_Prop_adjustValue },
     { 0x2001, DFF_Prop_adjustValue, 10, 24 },
     { 0x2000, 0x0402, 1750, 0 },
-    { 0x8000, 21600, 0, 0x0403 }
+    { 0x8000, 21600, 0, 0x0403 },
+    { 0x2001, 0x400, 1, 2 },
+    { 0x4000, 10800, 0x405, 0 },
+    { 0x2000, 0x400, 0, 10800 },
+    { 0x6006, 0x407, 0x40d, 0 },
+    { 0x8000, 10800, 0, 0x405 },
+    { 0x6006, 0x407, 0x40c, 21600 },
+    { 0x8000, 21600, 0, 0x405 },
+    { 0x8001, 21600, 10800, 0x400 },
+    { 0x8000, 21600, 0, 0x40c }
 };
 static const SvxMSDffTextRectangles mso_sptParallelogramTextRect[] =
 {
     { { 3 MSO_I, 3 MSO_I }, { 4 MSO_I, 4 MSO_I } }
 };
+static const SvxMSDffVertPair mso_sptParallelogramGluePoints[] =
+{
+    { 6 MSO_I, 0 }, { 10800, 8 MSO_I }, { 11 MSO_I, 10800 }, { 9 MSO_I, 21600 }, { 10800, 10 MSO_I }, { 5 MSO_I, 10800 }
+};
 static const mso_AutoShape msoParallelogram =
 {
     (SvxMSDffVertPair*)mso_sptParallelogramVert, sizeof( mso_sptParallelogramVert ) / sizeof( SvxMSDffVertPair ),
@@ -324,7 +357,8 @@ static const mso_AutoShape msoParallelogram =
     (sal_Int32*)mso_sptDefault5400,
     (SvxMSDffTextRectangles*)mso_sptParallelogramTextRect, sizeof( mso_sptParallelogramTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptParallelogramGluePoints, sizeof( mso_sptParallelogramGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptDiamondVert[] =
@@ -343,7 +377,8 @@ static const mso_AutoShape msoDiamond =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptDiamondTextRect, sizeof( mso_sptDiamondTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptTrapezoidVert[] =      // adjustment1 : 0 - 10800
@@ -360,12 +395,18 @@ static const SvxMSDffCalculationData mso_sptTrapezoidCalc[] =
     { 0x2000, DFF_Prop_adjustValue, 0, 0 },
     { 0x2001, DFF_Prop_adjustValue, 10, 18 },
     { 0x2000, 0x0402, 1750, 0 },
-    { 0x8000, 21600, 0, 0x403 }
+    { 0x8000, 21600, 0, 0x403 },
+    { 0x2001, DFF_Prop_adjustValue, 1, 2 },
+    { 0x8000, 21600, 0, 0x405 }
 };
 static const SvxMSDffTextRectangles mso_sptTrapezoidTextRect[] =
 {
     { { 3 MSO_I, 3 MSO_I }, { 4 MSO_I, 4 MSO_I } }
 };
+static const SvxMSDffVertPair mso_sptTrapezoidGluePoints[] =
+{
+    { 6 MSO_I, 10800 }, { 10800, 21600 }, { 5 MSO_I, 10800 }, { 10800, 0 }
+};
 static const mso_AutoShape msoTrapezoid =
 {
     (SvxMSDffVertPair*)mso_sptTrapezoidVert, sizeof( mso_sptTrapezoidVert ) / sizeof( SvxMSDffVertPair ),
@@ -374,13 +415,14 @@ static const mso_AutoShape msoTrapezoid =
     (sal_Int32*)mso_sptDefault5400,
     (SvxMSDffTextRectangles*)mso_sptTrapezoidTextRect, sizeof( mso_sptTrapezoidTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptTrapezoidGluePoints, sizeof( mso_sptTrapezoidGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptOctagonVert[] =        // adjustment1 : 0 - 10800
 {
-    { 0 MSO_I, 0 }, { 1 MSO_I, 0 }, { 21600, 0 MSO_I }, { 21600, 2 MSO_I },
-    { 1 MSO_I, 21600 }, { 0 MSO_I, 21600 }, { 0, 2 MSO_I }, { 0, 0 MSO_I }
+    { 0 MSO_I, 0 }, { 2 MSO_I, 0 }, { 21600, 1 MSO_I }, { 21600, 3 MSO_I },
+    { 2 MSO_I, 21600 }, { 0 MSO_I, 21600 }, { 0, 3 MSO_I }, { 0, 1 MSO_I }
 };
 static const sal_uInt16 mso_sptOctagonSegm[] =
 {
@@ -388,12 +430,15 @@ static const sal_uInt16 mso_sptOctagonSegm[] =
 };
 static const SvxMSDffCalculationData mso_sptOctagonCalc[] =
 {
-    { 0x4000, 0, DFF_Prop_adjustValue, 0 },
+    { 0x6000, DFF_Prop_geoLeft, DFF_Prop_adjustValue, 0 },
+    { 0x6000, DFF_Prop_geoTop, DFF_Prop_adjustValue, 0 },
     { 0xa000, DFF_Prop_geoRight, 0, DFF_Prop_adjustValue },
     { 0xa000, DFF_Prop_geoBottom, 0, DFF_Prop_adjustValue },
     { 0x2001, DFF_Prop_adjustValue, 1, 2 },
-    { 0xa000, DFF_Prop_geoRight, 0, 0x403 },
-    { 0xa000, DFF_Prop_geoBottom, 0, 0x403 }
+    { 0x6000, DFF_Prop_geoLeft, 0x404, 0 },
+    { 0x6000, DFF_Prop_geoTop, 0x404, 0 },
+    { 0xa000, DFF_Prop_geoRight, 0, 0x404 },
+    { 0xa000, DFF_Prop_geoBottom, 0, 0x404 }
 };
 static const sal_Int32 mso_sptOctagonDefault[] =
 {
@@ -401,7 +446,7 @@ static const sal_Int32 mso_sptOctagonDefault[] =
 };
 static const SvxMSDffTextRectangles mso_sptOctagonTextRect[] =
 {
-    { { 3 MSO_I, 3 MSO_I }, { 4 MSO_I, 5 MSO_I } }
+    { { 5 MSO_I, 6 MSO_I }, { 7 MSO_I, 8 MSO_I } }
 };
 static const mso_AutoShape msoOctagon =
 {
@@ -411,7 +456,8 @@ static const mso_AutoShape msoOctagon =
     (sal_Int32*)mso_sptOctagonDefault,
     (SvxMSDffTextRectangles*)mso_sptOctagonTextRect, sizeof( mso_sptOctagonTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    10800, 10800
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptIsocelesTriangleVert[] =   // adjustment1 : 0 - 21600
@@ -428,14 +474,20 @@ static const SvxMSDffCalculationData mso_sptIsocelesTriangleCalc[] =
     { 0x2001, DFF_Prop_adjustValue, 1, 2 },
     { 0x2000, 0x401, 10800, 0 },
     { 0x2001, DFF_Prop_adjustValue, 2, 3 },
-    { 0x2000, 0x403, 7200, 0 }
-
+    { 0x2000, 0x403, 7200, 0 },
+    { 0x8000, 21600, 0, 0x400 },
+    { 0x2001, 0x405, 1, 2 },
+    { 0x8000, 21600, 0, 0x406 }
 };
 static const SvxMSDffTextRectangles mso_sptIsocelesTriangleTextRect[] =
 {
     { { 1 MSO_I, 10800 }, { 2 MSO_I, 18000 } },
     { { 3 MSO_I, 7200 }, { 4 MSO_I, 21600   } }
 };
+static const SvxMSDffVertPair mso_sptIsocelesTriangleGluePoints[] =
+{
+    { 10800, 0 }, { 1 MSO_I, 10800 }, { 0, 21600 }, { 10800, 21600 }, { 21600, 21600 }, { 7 MSO_I, 10800 }
+};
 static const mso_AutoShape msoIsocelesTriangle =
 {
     (SvxMSDffVertPair*)mso_sptIsocelesTriangleVert, sizeof( mso_sptIsocelesTriangleVert ) / sizeof( SvxMSDffVertPair ),
@@ -444,7 +496,8 @@ static const mso_AutoShape msoIsocelesTriangle =
     (sal_Int32*)mso_sptDefault10800,
     (SvxMSDffTextRectangles*)mso_sptIsocelesTriangleTextRect, sizeof( mso_sptIsocelesTriangleTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptIsocelesTriangleGluePoints, sizeof( mso_sptIsocelesTriangleGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptHexagonVert[] =                // adjustment1 : 0 - 10800
@@ -476,19 +529,24 @@ static const mso_AutoShape msoHexagon =
     (sal_Int32*)mso_sptDefault5400,
     (SvxMSDffTextRectangles*)mso_sptHexagonTextRect, sizeof( mso_sptHexagonTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
-
 static const SvxMSDffVertPair mso_sptPentagonVert[] =
 {
-    { 0, 8260 }, { 10800, 0 }, { 21600, 8260 }, { 17370, 21600 },
-    { 4230, 21600 }, { 0, 8260 }
+    { 10800, 0 }, { 0, 8260 }, { 4230, 21600 }, { 17370, 21600 },
+    { 21600, 8260 }, { 10800, 0 }
 };
 static const SvxMSDffTextRectangles mso_sptPentagonTextRect[] =
 {
     { { 4230, 5080 }, { 17370, 21600 } }
 };
+static const SvxMSDffVertPair mso_sptPentagonGluePoints[] =
+{
+    { 10800, 0 }, { 0, 8260 }, { 4230, 21600 }, { 10800, 21600 },
+    { 17370, 21600 }, { 21600, 8260 }
+};
 static const mso_AutoShape msoPentagon =
 {
     (SvxMSDffVertPair*)mso_sptPentagonVert, sizeof( mso_sptPentagonVert ) / sizeof( SvxMSDffVertPair ),
@@ -497,7 +555,8 @@ static const mso_AutoShape msoPentagon =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptPentagonTextRect, sizeof( mso_sptPentagonTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptPentagonGluePoints, sizeof( mso_sptPentagonGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptPlusVert[] =               // adjustment1 : 0 - 10800
@@ -524,7 +583,8 @@ static const mso_AutoShape msoPlus =
     (sal_Int32*)mso_sptDefault5400,
     (SvxMSDffTextRectangles*)mso_sptPlusTextRect, sizeof( mso_sptPlusTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    10800, 10800
+    10800, 10800,
+    (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptCanVert[] =        // adjustment1 : 0 - 10800
@@ -561,6 +621,10 @@ static const SvxMSDffTextRectangles mso_sptCanTextRect[] =
 {
     { { 0, 6 MSO_I }, { 88, 3 MSO_I } }
 };
+static const SvxMSDffVertPair mso_sptCanGluePoints[] =
+{
+    { 44, 6 MSO_I }, { 44, 0 }, { 0, 5400 }, { 44, 10800 }, { 88, 5400 }
+};
 static const sal_Int32 mso_sptCanBoundRect[] =
 {
     0, 0, 88, 10800
@@ -573,7 +637,8 @@ static const mso_AutoShape msoCan =
     (sal_Int32*)mso_sptDefault5400,
     (SvxMSDffTextRectangles*)mso_sptCanTextRect, sizeof( mso_sptCanTextRect ) / sizeof( SvxMSDffTextRectangles ),
     88, 10800,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptCanGluePoints, sizeof( mso_sptCanGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptArrowVert[] =  // adjustment1: x 0 - 21600
@@ -608,7 +673,8 @@ static const mso_AutoShape msoArrow =
     (sal_Int32*)mso_sptDefault16200and5400,
     (SvxMSDffTextRectangles*)mso_sptArrowTextRect, sizeof( mso_sptArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptLeftArrowVert[] =  // adjustment1: x 0 - 21600
@@ -636,7 +702,8 @@ static const mso_AutoShape msoLeftArrow =
     (sal_Int32*)mso_sptLeftArrowDefault,
     (SvxMSDffTextRectangles*)mso_sptLeftArrowTextRect, sizeof( mso_sptLeftArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptDownArrowVert[] =  // adjustment1: x 0 - 21600
@@ -660,7 +727,8 @@ static const mso_AutoShape msoDownArrow =
     (sal_Int32*)mso_sptDefault16200and5400,
     (SvxMSDffTextRectangles*)mso_sptDownArrowTextRect, sizeof( mso_sptDownArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptUpArrowVert[] =    // adjustment1: x 0 - 21600
@@ -688,7 +756,8 @@ static const mso_AutoShape msoUpArrow =
     (sal_Int32*)mso_sptUpArrowDefault,
     (SvxMSDffTextRectangles*)mso_sptUpArrowTextRect, sizeof( mso_sptUpArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptLeftRightArrowVert[] = // adjustment1: x 0 - 10800
@@ -730,7 +799,8 @@ static const mso_AutoShape msoLeftRightArrow =
     (sal_Int32*)mso_sptLeftRightArrowDefault,
     (SvxMSDffTextRectangles*)mso_sptLeftRightArrowTextRect, sizeof( mso_sptLeftRightArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptUpDownArrowVert[] =    // adjustment1: x 0 - 10800
@@ -759,7 +829,8 @@ static const mso_AutoShape msoUpDownArrow =
     (sal_Int32*)mso_sptUpDownArrowDefault,
     (SvxMSDffTextRectangles*)mso_sptUpDownArrowTextRect, sizeof( mso_sptUpDownArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptQuadArrowVert[] =  // adjustment1: x 0 - 10800, adjustment2: x 0 - 10800
@@ -800,7 +871,8 @@ static const mso_AutoShape msoQuadArrow =
     (sal_Int32*)mso_sptQuadArrowDefault,
     (SvxMSDffTextRectangles*)mso_sptQuadArrowTextRect, sizeof( mso_sptQuadArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptLeftRightUpArrowVert[] =   // adjustment1: x 0 - 10800, adjustment2: x 0 - 10800
@@ -840,7 +912,8 @@ static const mso_AutoShape msoLeftRightUpArrow =
     (sal_Int32*)mso_sptLeftRightUpArrowDefault,
     (SvxMSDffTextRectangles*)mso_sptLeftRightUpArrowTextRect, sizeof( mso_sptLeftRightUpArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptBentArrowVert[] =  // adjustment1 : x 12427 - 21600
@@ -877,7 +950,8 @@ static const mso_AutoShape msoBentArrow =
     (sal_Int32*)mso_sptBentArrowDefault,
     (SvxMSDffTextRectangles*)mso_sptBentArrowTextRect, sizeof( mso_sptBentArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptUturnArrowVert[] =
@@ -906,7 +980,8 @@ static const mso_AutoShape msoUturnArrow =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptUturnArrowTextRect, sizeof( mso_sptUturnArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptLeftUpArrowVert[] =    // adjustment1 : x 0 - 21600, adjustment2 : x 0 - 21600
@@ -947,7 +1022,8 @@ static const mso_AutoShape msoLeftUpArrow =
     (sal_Int32*)mso_sptLeftUpArrowDefault,
     (SvxMSDffTextRectangles*)mso_sptLeftUpArrowTextRect, sizeof( mso_sptLeftUpArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptBentUpArrowVert[] =    // adjustment1 : x 0 - 21600, adjustment2 : x 0 - 21600
@@ -989,7 +1065,8 @@ static const mso_AutoShape msoBentUpArrow =
     (sal_Int32*)mso_sptBentUpArrowDefault,
     (SvxMSDffTextRectangles*)mso_sptBentUpArrowTextRect, sizeof( mso_sptBentUpArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptCurvedArrowVert[] =    // adjustment1 : y 10800 - 21600, adjustment2 : y 16424 - 21600
@@ -1042,7 +1119,8 @@ static const mso_AutoShape msoCurvedArrow =
     (sal_Int32*)mso_sptCurvedArrowDefault,
     (SvxMSDffTextRectangles*)mso_sptCurvedArrowTextRect, sizeof( mso_sptCurvedArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptStripedRightArrowVert[] =  // adjustment1 : x 3375 - 21600
@@ -1079,7 +1157,8 @@ static const mso_AutoShape msoStripedRightArrow =
     (sal_Int32*)mso_sptDefault16200and5400,
     (SvxMSDffTextRectangles*)mso_sptStripedRightArrowTextRect, sizeof( mso_sptStripedRightArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptNotchedRightArrowVert[] =  // adjustment1 : x 0 - 21600    (default 16200)
@@ -1108,7 +1187,8 @@ static const mso_AutoShape msoNotchedRightArrow =
     (sal_Int32*)mso_sptDefault16200and5400,
     (SvxMSDffTextRectangles*)mso_sptNotchedRightArrowTextRect, sizeof( mso_sptNotchedRightArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptHomePlateVert[] =  // adjustment1 : x 0 - 21600
@@ -1140,7 +1220,8 @@ static const mso_AutoShape msoHomePlate =
     (sal_Int32*)mso_sptHomePlateDefault,
     (SvxMSDffTextRectangles*)mso_sptHomePlateTextRect, sizeof( mso_sptHomePlateTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptChevronVert[] =    // adjustment1 : x 0 - 21600
@@ -1173,7 +1254,8 @@ static const mso_AutoShape msoChevron =
     (sal_Int32*)mso_sptChevronDefault,
     (SvxMSDffTextRectangles*)mso_sptChevronTextRect, sizeof( mso_sptChevronTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptRightArrowCalloutVert[] =  // adjustment1 : x 0 - 21000
@@ -1211,7 +1293,8 @@ static const mso_AutoShape msoRightArrowCallout =
     (sal_Int32*)mso_sptRightArrowCalloutDefault,
     (SvxMSDffTextRectangles*)mso_sptRightArrowCalloutTextRect, sizeof( mso_sptRightArrowCalloutTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptLeftArrowCalloutVert[] =   // adjustment1 : x 0 - 21600, adjustment2 : y 0 - 10800
@@ -1249,7 +1332,8 @@ static const mso_AutoShape msoLeftArrowCallout =
     (sal_Int32*)mso_sptLeftArrowCalloutDefault,
     (SvxMSDffTextRectangles*)mso_sptLeftArrowCalloutTextRect, sizeof( mso_sptLeftArrowCalloutTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptUpArrowCalloutVert[] =
@@ -1287,7 +1371,8 @@ static const mso_AutoShape msoUpArrowCallout =
     (sal_Int32*)mso_sptUpArrowCalloutDefault,
     (SvxMSDffTextRectangles*)mso_sptUpArrowCalloutTextRect, sizeof( mso_sptUpArrowCalloutTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptDownArrowCalloutVert[] =
@@ -1325,7 +1410,8 @@ static const mso_AutoShape msoDownArrowCallout =
     (sal_Int32*)mso_sptDownArrowCalloutDefault,
     (SvxMSDffTextRectangles*)mso_sptDownArrowCalloutTextRect, sizeof( mso_sptDownArrowCalloutTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptLeftRightArrowCalloutVert[] =
@@ -1367,7 +1453,8 @@ static const mso_AutoShape msoLeftRightArrowCallout =
     (sal_Int32*)mso_sptLeftRightArrowCalloutDefault,
     (SvxMSDffTextRectangles*)mso_sptLeftRightArrowCalloutTextRect, sizeof( mso_sptLeftRightArrowCalloutTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptUpDownArrowCalloutVert[] =
@@ -1409,7 +1496,8 @@ static const mso_AutoShape msoUpDownArrowCallout =
     (sal_Int32*)mso_sptUpDownArrowCalloutDefault,
     (SvxMSDffTextRectangles*)mso_sptUpDownArrowCalloutTextRect, sizeof( mso_sptUpDownArrowCalloutTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptQuadArrowCalloutVert[] =
@@ -1454,7 +1542,8 @@ static const mso_AutoShape msoQuadArrowCallout =
     (sal_Int32*)mso_sptQuadArrowCalloutDefault,
     (SvxMSDffTextRectangles*)mso_sptQuadArrowCalloutTextRect, sizeof( mso_sptQuadArrowCalloutTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptCircularArrowVert[] =
@@ -1527,7 +1616,8 @@ static const mso_AutoShape msoCircularArrow =
     (sal_Int32*)mso_sptCircularArrowDefault,
     (SvxMSDffTextRectangles*)mso_sptCircularArrowTextRect, sizeof( mso_sptCircularArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptCubeVert[] =
@@ -1549,7 +1639,12 @@ static const SvxMSDffCalculationData mso_sptCubeCalc[] =
     { 0x6000, DFF_Prop_geoTop, 0x400, 0 },
     { 0x6000, DFF_Prop_geoLeft, 0x400, 0 },
     { 0xa000, DFF_Prop_geoBottom, 0, 0x400 },
-    { 0xa000, DFF_Prop_geoRight, 0, 0x400 }
+    { 0xa000, DFF_Prop_geoRight, 0, 0x400 },
+    { 0x8000,  21600, 0, 0x402 },   // 5
+    { 0x2001, 0x405, 1, 2 },        // 6
+    { 0x6000, 0x402, 0x406, 0 },    // 7
+    { 0x2001, 0x404, 1, 2 }         // 8
+
 };
 static const SvxMSDffTextRectangles mso_sptCubeTextRect[] =
 {
@@ -1563,7 +1658,8 @@ static const mso_AutoShape msoCube =
     (sal_Int32*)mso_sptDefault5400,
     (SvxMSDffTextRectangles*)mso_sptCubeTextRect, sizeof( mso_sptCubeTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    10800, 10800
+    10800, 10800,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptBevelVert[] =
@@ -1599,7 +1695,8 @@ static const mso_AutoShape msoBevel =
     (sal_Int32*)mso_sptDefault2700,
     (SvxMSDffTextRectangles*)mso_sptBevelTextRect, sizeof( mso_sptBevelTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    10800, 10800
+    10800, 10800,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptFoldedCornerVert[] =   // adjustment1 : x 10800 - 21600
@@ -1644,7 +1741,8 @@ static const mso_AutoShape msoFoldedCorner =
     (sal_Int32*)mso_sptFoldedCornerDefault,
     (SvxMSDffTextRectangles*)mso_sptFoldedCornerTextRect, sizeof( mso_sptFoldedCornerTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptActionButtonBlankVert[] =
@@ -1680,7 +1778,8 @@ static const mso_AutoShape msoActionButtonBlank =
     (sal_Int32*)mso_sptDefault1400,
     (SvxMSDffTextRectangles*)mso_sptActionButtonBlankTextRect, sizeof( mso_sptActionButtonBlankTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    10800, 10800
+    10800, 10800,
+    NULL, 0
 };
 
 static const SvxMSDffTextRectangles mso_sptActionButtonTextRect[] =
@@ -1766,7 +1865,8 @@ static const mso_AutoShape msoActionButtonHome =
     (sal_Int32*)mso_sptDefault1400,
     (SvxMSDffTextRectangles*)mso_sptActionButtonTextRect, sizeof( mso_sptActionButtonTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptActionButtonHelpVert[] =
@@ -1874,7 +1974,8 @@ static const mso_AutoShape msoActionButtonHelp =
     (sal_Int32*)mso_sptDefault1400,
     (SvxMSDffTextRectangles*)mso_sptActionButtonTextRect, sizeof( mso_sptActionButtonTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptActionButtonInformationVert[] =
@@ -1959,7 +2060,8 @@ static const mso_AutoShape msoActionButtonInformation =
     (sal_Int32*)mso_sptDefault1400,
     (SvxMSDffTextRectangles*)mso_sptActionButtonTextRect, sizeof( mso_sptActionButtonTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptActionButtonBackPreviousVert[] =
@@ -2010,7 +2112,8 @@ static const mso_AutoShape msoActionButtonBackPrevious =
     (sal_Int32*)mso_sptDefault1400,
     (SvxMSDffTextRectangles*)mso_sptActionButtonTextRect, sizeof( mso_sptActionButtonTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptActionButtonForwardNextVert[] =
@@ -2031,7 +2134,8 @@ static const mso_AutoShape msoActionButtonForwardNext =
     (sal_Int32*)mso_sptDefault1400,
     (SvxMSDffTextRectangles*)mso_sptActionButtonTextRect, sizeof( mso_sptActionButtonTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptActionButtonBeginningVert[] =
@@ -2096,7 +2200,8 @@ static const mso_AutoShape msoActionButtonBeginning =
     (sal_Int32*)mso_sptDefault1400,
     (SvxMSDffTextRectangles*)mso_sptActionButtonTextRect, sizeof( mso_sptActionButtonTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptActionButtonEndVert[] =
@@ -2119,7 +2224,8 @@ static const mso_AutoShape msoActionButtonEnd =
     (sal_Int32*)mso_sptDefault1400,
     (SvxMSDffTextRectangles*)mso_sptActionButtonTextRect, sizeof( mso_sptActionButtonTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptActionButtonReturnVert[] =
@@ -2206,7 +2312,8 @@ static const mso_AutoShape msoActionButtonReturn =
     (sal_Int32*)mso_sptDefault1400,
     (SvxMSDffTextRectangles*)mso_sptActionButtonTextRect, sizeof( mso_sptActionButtonTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptActionButtonDocumentVert[] =
@@ -2264,7 +2371,8 @@ static const mso_AutoShape msoActionButtonDocument =
     (sal_Int32*)mso_sptDefault1400,
     (SvxMSDffTextRectangles*)mso_sptActionButtonTextRect, sizeof( mso_sptActionButtonTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptActionButtonSoundVert[] =
@@ -2338,7 +2446,8 @@ static const mso_AutoShape msoActionButtonSound =
     (sal_Int32*)mso_sptDefault1400,
     (SvxMSDffTextRectangles*)mso_sptActionButtonTextRect, sizeof( mso_sptActionButtonTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptActionButtonMovieVert[] =
@@ -2421,7 +2530,8 @@ static const mso_AutoShape msoActionButtonMovie =
     (sal_Int32*)mso_sptDefault1400,
     (SvxMSDffTextRectangles*)mso_sptActionButtonTextRect, sizeof( mso_sptActionButtonTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptSmileyFaceVert[] = // adj value 15510 - 17520
@@ -2460,7 +2570,8 @@ static const mso_AutoShape msoSmileyFace =
     (sal_Int32*)mso_sptSmileyFaceDefault,
     (SvxMSDffTextRectangles*)mso_sptEllipseTextRect, sizeof( mso_sptEllipseTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptEllipseGluePoints, sizeof( mso_sptEllipseGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptDonutVert[] =  // adj value 0 - 10800
@@ -2484,7 +2595,8 @@ static const mso_AutoShape msoDonut =
     (sal_Int32*)mso_sptDefault5400,
     (SvxMSDffTextRectangles*)mso_sptEllipseTextRect, sizeof( mso_sptEllipseTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptEllipseGluePoints, sizeof( mso_sptEllipseGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptNoSmokingVert[] =  // adj value 0 - 7200
@@ -2525,7 +2637,8 @@ static const mso_AutoShape msoNoSmoking =
     (sal_Int32*)mso_sptDefault2700,
     (SvxMSDffTextRectangles*)mso_sptEllipseTextRect, sizeof( mso_sptEllipseTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptEllipseGluePoints, sizeof( mso_sptEllipseGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptBlockArcVert[] =   // adj value 0 (degrees)
@@ -2562,7 +2675,8 @@ static const mso_AutoShape msoBlockArc =
     (sal_Int32*)mso_sptBlockArcDefault,
     NULL, 0,
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 // aware : control points are always part of the bounding box
@@ -2612,6 +2726,10 @@ static const SvxMSDffTextRectangles mso_sptHeartTextRect[] =
 {
     { { 5080, 2540 }, { 16520, 13550 } }
 };
+static const SvxMSDffVertPair mso_sptHeartGluePoints[] =
+{
+    { 10800, 2180 }, { 3090, 10800 }, { 10800, 21600 }, { 18490, 10800 }
+};
 static const sal_Int32 mso_sptHeartBoundRect[] =
 {
     -9, 0, 21606, 21602
@@ -2624,7 +2742,8 @@ static const mso_AutoShape msoHeart =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptHeartTextRect, sizeof( mso_sptHeartTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21615, 21602,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptHeartGluePoints, sizeof( mso_sptHeartGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptLightningBoldVert[] =
@@ -2637,6 +2756,11 @@ static const SvxMSDffTextRectangles mso_sptLightningBoldTextRect[] =
 {
     { { 8680, 7410 }, { 13970, 14190 } }
 };
+static const SvxMSDffVertPair mso_sptLightningBoldGluePoints[] =
+{
+    { 8458, 0 }, { 0, 3923 }, { 4993, 9720 }, { 9987, 14934 }, { 21600, 21600 },
+    { 16558, 12016 }, { 12831, 6120 }
+};
 static const mso_AutoShape msoLightningBold =
 {
     (SvxMSDffVertPair*)mso_sptLightningBoldVert, sizeof( mso_sptLightningBoldVert ) / sizeof( SvxMSDffVertPair ),
@@ -2645,7 +2769,8 @@ static const mso_AutoShape msoLightningBold =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptLightningBoldTextRect, sizeof( mso_sptLightningBoldTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptLightningBoldGluePoints, sizeof( mso_sptLightningBoldGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptSunVert[] =    // adj value 2700 -> 10125
@@ -2742,7 +2867,8 @@ static const mso_AutoShape msoSun =
     (sal_Int32*)mso_sptDefault5400,
     (SvxMSDffTextRectangles*)mso_sptSunTextRect, sizeof( mso_sptSunTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptMoonVert[] =   // adj value 0 -> 18900
@@ -2775,6 +2901,10 @@ static const SvxMSDffTextRectangles mso_sptMoonTextRect[] =
 {
     { { 9 MSO_I, 8 MSO_I }, { 0 MSO_I, 0xa MSO_I } }
 };
+static const SvxMSDffVertPair mso_sptMoonGluePoints[] =
+{
+    { 21600, 0 }, { 0, 10800 }, { 21600, 21600 }, { 0 MSO_I, 10800 }
+};
 static const mso_AutoShape msoMoon =
 {
     (SvxMSDffVertPair*)mso_sptMoonVert, sizeof( mso_sptMoonVert ) / sizeof( SvxMSDffVertPair ),
@@ -2783,7 +2913,8 @@ static const mso_AutoShape msoMoon =
     (sal_Int32*)mso_sptDefault10800,
     (SvxMSDffTextRectangles*)mso_sptMoonTextRect, sizeof( mso_sptMoonTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptMoonGluePoints, sizeof( mso_sptMoonGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptBracketPairVert[] =    // adj value 0 -> 10800
@@ -2829,7 +2960,8 @@ static const mso_AutoShape msoBracketPair =
     (sal_Int32*)mso_sptDefault3700,
     (SvxMSDffTextRectangles*)mso_sptBracketPairTextRect, sizeof( mso_sptBracketPairTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const sal_uInt16 mso_sptPlaqueSegm[] =
@@ -2848,7 +2980,8 @@ static const mso_AutoShape msoPlaque =
     (sal_Int32*)mso_sptDefault3600,
     (SvxMSDffTextRectangles*)mso_sptPlaqueTextRect, sizeof( mso_sptPlaqueTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptBracePairVert[] =  // adj value 0 -> 5400
@@ -2894,7 +3027,8 @@ static const mso_AutoShape msoBracePair =
     (sal_Int32*)mso_sptDefault1800,
     (SvxMSDffTextRectangles*)mso_sptBracePairTextRect, sizeof( mso_sptBracePairTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffCalculationData mso_sptBracketCalc[] =
@@ -2918,6 +3052,10 @@ static const SvxMSDffTextRectangles mso_sptLeftBracketTextRect[] =
 {
     { { 6350, 3 MSO_I }, { 21600, 4 MSO_I } }
 };
+static const SvxMSDffVertPair mso_sptLeftBracketGluePoints[] =
+{
+    { 21600, 0 }, { 0, 10800 }, { 21600, 21600 }
+};
 static const mso_AutoShape msoLeftBracket =
 {
     (SvxMSDffVertPair*)mso_sptLeftBracketVert, sizeof( mso_sptLeftBracketVert ) / sizeof( SvxMSDffVertPair ),
@@ -2926,7 +3064,8 @@ static const mso_AutoShape msoLeftBracket =
     (sal_Int32*)mso_sptDefault1800,
     (SvxMSDffTextRectangles*)mso_sptLeftBracketTextRect, sizeof( mso_sptLeftBracketTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptLeftBracketGluePoints, sizeof( mso_sptLeftBracketGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 static const SvxMSDffVertPair mso_sptRightBracketVert[] =   // adj value 0 -> 10800
 {
@@ -2937,6 +3076,10 @@ static const SvxMSDffTextRectangles mso_sptRightBracketTextRect[] =
 {
     { { 0, 3 MSO_I }, { 15150, 4 MSO_I } }
 };
+static const SvxMSDffVertPair mso_sptRightBracketGluePoints[] =
+{
+    { 0, 0 }, { 0, 21600 }, { 21600, 10800 }
+};
 static const mso_AutoShape msoRightBracket =
 {
     (SvxMSDffVertPair*)mso_sptRightBracketVert, sizeof( mso_sptRightBracketVert ) / sizeof( SvxMSDffVertPair ),
@@ -2945,7 +3088,8 @@ static const mso_AutoShape msoRightBracket =
     (sal_Int32*)mso_sptDefault1800,
     (SvxMSDffTextRectangles*)mso_sptRightBracketTextRect, sizeof( mso_sptRightBracketTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptRightBracketGluePoints, sizeof( mso_sptRightBracketGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffCalculationData mso_sptBraceCalc[] =
@@ -2992,7 +3136,8 @@ static const mso_AutoShape msoLeftBrace =       // adj value0 0 -> 5400
     (sal_Int32*)mso_sptBraceDefault,
     (SvxMSDffTextRectangles*)mso_sptLeftBraceTextRect, sizeof( mso_sptLeftBraceTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptLeftBracketGluePoints, sizeof( mso_sptLeftBracketGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 static const SvxMSDffVertPair mso_sptRightBraceVert[] =
 {
@@ -3016,7 +3161,8 @@ static const mso_AutoShape msoRightBrace =      // adj value0 0 -> 5400
     (sal_Int32*)mso_sptBraceDefault,
     (SvxMSDffTextRectangles*)mso_sptRightBraceTextRect, sizeof( mso_sptRightBraceTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptRightBracketGluePoints, sizeof( mso_sptRightBracketGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptIrregularSeal1Vert[] =
@@ -3032,6 +3178,10 @@ static const SvxMSDffTextRectangles mso_sptIrregularSeal1TextRect[] =
 {
     { { 4680, 6570 }, { 16140, 13280 } }
 };
+static const SvxMSDffVertPair mso_sptIrregularSeal1GluePoints[] =
+{
+    { 14623, 106 }, { 106, 8718 }, { 8590, 21600 }, { 21600, 13393 }
+};
 static const mso_AutoShape msoIrregularSeal1 =
 {
     (SvxMSDffVertPair*)mso_sptIrregularSeal1Vert, sizeof( mso_sptIrregularSeal1Vert ) / sizeof( SvxMSDffVertPair ),
@@ -3040,7 +3190,8 @@ static const mso_AutoShape msoIrregularSeal1 =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptIrregularSeal1TextRect, sizeof( mso_sptIrregularSeal1TextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptIrregularSeal1GluePoints, sizeof( mso_sptIrregularSeal1GluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptIrregularSeal2Vert[] =
@@ -3058,6 +3209,10 @@ static const SvxMSDffTextRectangles mso_sptIrregularSeal2TextRect[] =
 {
     { { 5400, 6570 }, { 14160, 15290 } }
 };
+static const SvxMSDffVertPair mso_sptIrregularSeal2GluePoints[] =
+{
+    { 9722, 1887 }, { 0, 12875 }, { 11614, 18844 }, { 21600, 6646 }
+};
 static const mso_AutoShape msoIrregularSeal2 =
 {
     (SvxMSDffVertPair*)mso_sptIrregularSeal2Vert, sizeof( mso_sptIrregularSeal2Vert ) / sizeof( SvxMSDffVertPair ),
@@ -3066,7 +3221,8 @@ static const mso_AutoShape msoIrregularSeal2 =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptIrregularSeal2TextRect, sizeof( mso_sptIrregularSeal2TextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptIrregularSeal2GluePoints, sizeof( mso_sptIrregularSeal2GluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptSeal4Vert[] =      // adjustment1 : 0 - 10800
@@ -3095,7 +3251,8 @@ static const mso_AutoShape msoSeal4 =
     (sal_Int32*)mso_sptDefault8100,
     (SvxMSDffTextRectangles*)mso_sptSeal4TextRect, sizeof( mso_sptSeal4TextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptStarVert[] =
@@ -3116,7 +3273,8 @@ static const mso_AutoShape msoStar =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptStarTextRect, sizeof( mso_sptStarTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffCalculationData mso_sptSeal24Calc[] =
@@ -3243,7 +3401,8 @@ static const mso_AutoShape msoSeal8 =
     (sal_Int32*)mso_sptDefault2500,
     (SvxMSDffTextRectangles*)mso_sptSealTextRect, sizeof( mso_sptSealTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 static const SvxMSDffVertPair mso_sptSeal16Vert[] = // adj value 0 -> 10800
 {
@@ -3337,7 +3496,8 @@ static const mso_AutoShape msoSeal16 =
     (sal_Int32*)mso_sptDefault2500,
     (SvxMSDffTextRectangles*)mso_sptSealTextRect, sizeof( mso_sptSealTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 static const SvxMSDffVertPair mso_sptSeal24Vert[] =
 {
@@ -3363,7 +3523,8 @@ static const mso_AutoShape msoSeal24 =
     (sal_Int32*)mso_sptDefault2500,
     (SvxMSDffTextRectangles*)mso_sptSealTextRect, sizeof( mso_sptSealTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 static const SvxMSDffCalculationData mso_sptSeal32Calc[] =
 {
@@ -3529,7 +3690,8 @@ static const mso_AutoShape msoSeal32 =
     (sal_Int32*)mso_sptDefault2500,
     (SvxMSDffTextRectangles*)mso_sptSealTextRect, sizeof( mso_sptSealTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptRibbon2Vert[] =    // adjustment1 : x 2700  - 8100     def 5400
@@ -3617,7 +3779,8 @@ static const mso_AutoShape msoRibbon2 =
     (sal_Int32*)mso_sptRibbon2Default,
     (SvxMSDffTextRectangles*)mso_sptRibbon2TextRect, sizeof( mso_sptRibbon2TextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptVerticalScrollVert[] = // adjustment1 : 0 - 5400
@@ -3673,7 +3836,8 @@ static const mso_AutoShape msoVerticalScroll =
     (sal_Int32*)mso_sptDefault2700,
     (SvxMSDffTextRectangles*)mso_sptScrollTextRect, sizeof( mso_sptScrollTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    11000, 10800
+    11000, 10800,
+    NULL, 0
 };
 static const SvxMSDffVertPair mso_sptHorizontalScrollVert[] =   // adjustment1 : 0 - 5400
 {
@@ -3712,7 +3876,8 @@ static const mso_AutoShape msoHorizontalScroll =
     (sal_Int32*)mso_sptDefault2700,
     (SvxMSDffTextRectangles*)mso_sptScrollTextRect, sizeof( mso_sptScrollTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    10800, 11000
+    10800, 11000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptWaveVert[] =   // adjustment1 : 0 - 4459
@@ -3744,7 +3909,8 @@ static const mso_AutoShape msoWave =
     (sal_Int32*)mso_sptWaveDefault,
     (SvxMSDffTextRectangles*)mso_sptWaveTextRect, sizeof( mso_sptWaveTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptFlowChartProcessVert[] =
@@ -3759,7 +3925,8 @@ static const mso_AutoShape msoFlowChartProcess =
     NULL,
     NULL, 0,
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptFlowChartAlternateProcessVert[] =
@@ -3794,7 +3961,8 @@ static const mso_AutoShape msoFlowChartAlternateProcess =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptFlowChartAlternateProcessTextRect, sizeof( mso_sptFlowChartAlternateProcessTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptFlowChartDecisionVert[] =
@@ -3813,7 +3981,8 @@ static const mso_AutoShape msoFlowChartDecision =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptFlowChartDecisionTextRect, sizeof( mso_sptFlowChartDecisionTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptFlowChartInputOutputVert[] =
@@ -3824,6 +3993,10 @@ static const SvxMSDffTextRectangles mso_sptFlowChartInputOutputTextRect[] =
 {
     { { 4230, 0 }, { 17370, 21600 } }
 };
+static const SvxMSDffVertPair mso_sptFlowChartInputOutputGluePoints[] =
+{
+    { 12960, 0 }, { 10800, 0 }, { 2160, 10800 }, { 8600, 21600 }, { 10800, 21600 }, { 19400, 10800 }
+};
 static const mso_AutoShape msoFlowChartInputOutput =
 {
     (SvxMSDffVertPair*)mso_sptFlowChartInputOutputVert, sizeof( mso_sptFlowChartInputOutputVert ) / sizeof( SvxMSDffVertPair ),
@@ -3832,7 +4005,8 @@ static const mso_AutoShape msoFlowChartInputOutput =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptFlowChartInputOutputTextRect, sizeof( mso_sptFlowChartInputOutputTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptFlowChartInputOutputGluePoints, sizeof( mso_sptFlowChartInputOutputGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptFlowChartPredefinedProcessVert[] =
@@ -3861,7 +4035,8 @@ static const mso_AutoShape msoFlowChartPredefinedProcess =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptFlowChartPredefinedProcessTextRect, sizeof( mso_sptFlowChartPredefinedProcessTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptFlowChartInternalStorageVert[] =
@@ -3890,7 +4065,8 @@ static const mso_AutoShape msoFlowChartInternalStorage =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptFlowChartInternalStorageTextRect, sizeof( mso_sptFlowChartInternalStorageTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptFlowChartDocumentVert[] =
@@ -3907,6 +4083,10 @@ static const SvxMSDffTextRectangles mso_sptFlowChartDocumentTextRect[] =
 {
     { { 0, 0 }, { 21600, 17360 } }
 };
+static const SvxMSDffVertPair mso_sptFlowChartDocumentGluePoints[] =
+{
+    { 10800, 0 }, { 0, 10800 }, { 10800, 20320 }, { 21600, 10800 }
+};
 static const mso_AutoShape msoFlowChartDocument =
 {
     (SvxMSDffVertPair*)mso_sptFlowChartDocumentVert, sizeof( mso_sptFlowChartDocumentVert ) / sizeof( SvxMSDffVertPair ),
@@ -3915,7 +4095,8 @@ static const mso_AutoShape msoFlowChartDocument =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptFlowChartDocumentTextRect, sizeof( mso_sptFlowChartDocumentTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptFlowChartDocumentGluePoints, sizeof( mso_sptFlowChartDocumentGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptFlowChartMultidocumentVert[] =
@@ -3940,6 +4121,10 @@ static const SvxMSDffTextRectangles mso_sptFlowChartMultidocumentTextRect[] =
 {
     { { 0, 3600 }, { 21600 - 3000, 14409 + 3600 } }
 };
+static const SvxMSDffVertPair mso_sptFlowChartMultidocumentGluePoints[] =
+{
+    { 10800, 0 }, { 0, 10800 }, { 10800, 19890 }, { 21600, 10800 }
+};
 static const mso_AutoShape msoFlowChartMultidocument =
 {
     (SvxMSDffVertPair*)mso_sptFlowChartMultidocumentVert, sizeof( mso_sptFlowChartMultidocumentVert ) / sizeof( SvxMSDffVertPair ),
@@ -3948,7 +4133,8 @@ static const mso_AutoShape msoFlowChartMultidocument =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptFlowChartMultidocumentTextRect, sizeof( mso_sptFlowChartMultidocumentTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptFlowChartMultidocumentGluePoints, sizeof( mso_sptFlowChartMultidocumentGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptFlowChartTerminatorVert[] =
@@ -3972,7 +4158,8 @@ static const mso_AutoShape msoFlowChartTerminator =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptFlowChartTerminatorTextRect, sizeof( mso_sptFlowChartTerminatorTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptFlowChartPreparationVert[] =
@@ -3992,7 +4179,8 @@ static const mso_AutoShape msoFlowChartPreparation =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptFlowChartPreparationTextRect, sizeof( mso_sptFlowChartPreparationTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptFlowChartManualInputVert[] =
@@ -4003,6 +4191,10 @@ static const SvxMSDffTextRectangles mso_sptFlowChartManualInputTextRect[] =
 {
     { { 0, 4300 }, { 21600, 21600 } }
 };
+static const SvxMSDffVertPair mso_sptFlowChartManualInputGluePoints[] =
+{
+    { 10800, 2150 }, { 0, 10800 }, { 10800, 19890 }, { 21600, 10800 }
+};
 static const mso_AutoShape msoFlowChartManualInput =
 {
     (SvxMSDffVertPair*)mso_sptFlowChartManualInputVert, sizeof( mso_sptFlowChartManualInputVert ) / sizeof( SvxMSDffVertPair ),
@@ -4011,7 +4203,8 @@ static const mso_AutoShape msoFlowChartManualInput =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptFlowChartManualInputTextRect, sizeof( mso_sptFlowChartManualInputTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptFlowChartManualInputGluePoints, sizeof( mso_sptFlowChartManualInputGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptFlowChartManualOperationVert[] =
@@ -4022,6 +4215,10 @@ static const SvxMSDffTextRectangles mso_sptFlowChartManualOperationTextRect[] =
 {
     { { 4350, 0 }, { 17250, 21600 } }
 };
+static const SvxMSDffVertPair mso_sptFlowChartManualOperationGluePoints[] =
+{
+    { 10800, 0 }, { 2160, 10800 }, { 10800, 21600 }, { 19440, 10800 }
+};
 static const mso_AutoShape msoFlowChartManualOperation =
 {
     (SvxMSDffVertPair*)mso_sptFlowChartManualOperationVert, sizeof( mso_sptFlowChartManualOperationVert ) / sizeof( SvxMSDffVertPair ),
@@ -4030,7 +4227,8 @@ static const mso_AutoShape msoFlowChartManualOperation =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptFlowChartManualOperationTextRect, sizeof( mso_sptFlowChartManualOperationTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptFlowChartManualOperationGluePoints, sizeof( mso_sptFlowChartManualOperationGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptFlowChartConnectorVert[] =
@@ -4053,7 +4251,8 @@ static const mso_AutoShape msoFlowChartConnector =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptFlowChartConnectorTextRect, sizeof( mso_sptFlowChartConnectorTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptEllipseGluePoints, sizeof( mso_sptEllipseGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptFlowChartOffpageConnectorVert[] =
@@ -4073,7 +4272,8 @@ static const mso_AutoShape msoFlowChartOffpageConnector =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptFlowChartOffpageConnectorTextRect, sizeof( mso_sptFlowChartOffpageConnectorTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptFlowChartPunchedCardVert[] =
@@ -4093,7 +4293,8 @@ static const mso_AutoShape msoFlowChartPunchedCard =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptFlowChartPunchedCardTextRect, sizeof( mso_sptFlowChartPunchedCardTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptFlowChartPunchedTapeVert[] =
@@ -4117,6 +4318,10 @@ static const SvxMSDffTextRectangles mso_sptFlowChartPunchedTapeTextRect[] =
 {
     { { 0, 4360 }, { 21600, 17240 } }
 };
+static const SvxMSDffVertPair mso_sptFlowChartPunchedTapeGluePoints[] =
+{
+    { 10800, 2020 }, { 0, 10800 }, { 10800, 19320 }, { 21600, 10800 }
+};
 static const mso_AutoShape msoFlowChartPunchedTape =
 {
     (SvxMSDffVertPair*)mso_sptFlowChartPunchedTapeVert, sizeof( mso_sptFlowChartPunchedTapeVert ) / sizeof( SvxMSDffVertPair ),
@@ -4125,7 +4330,8 @@ static const mso_AutoShape msoFlowChartPunchedTape =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptFlowChartPunchedTapeTextRect, sizeof( mso_sptFlowChartPunchedTapeTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptFlowChartPunchedTapeGluePoints, sizeof( mso_sptFlowChartPunchedTapeGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptFlowChartSummingJunctionVert[] =
@@ -4156,7 +4362,8 @@ static const mso_AutoShape msoFlowChartSummingJunction =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptFlowChartSummingJunctionTextRect, sizeof( mso_sptFlowChartSummingJunctionTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptEllipseGluePoints, sizeof( mso_sptEllipseGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptFlowChartOrVert[] =
@@ -4185,7 +4392,8 @@ static const mso_AutoShape msoFlowChartOr =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptFlowChartOrTextRect, sizeof( mso_sptFlowChartOrTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptEllipseGluePoints, sizeof( mso_sptEllipseGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptFlowChartCollateVert[] =
@@ -4196,6 +4404,10 @@ static const SvxMSDffTextRectangles mso_sptFlowChartCollateTextRect[] =
 {
     { { 5400, 5400 }, { 16200, 16200 } }
 };
+static const SvxMSDffVertPair mso_sptFlowChartCollateGluePoints[] =
+{
+    { 10800, 0 }, { 10800, 10800 }, { 10800, 21600 }
+};
 static const mso_AutoShape msoFlowChartCollate =
 {
     (SvxMSDffVertPair*)mso_sptFlowChartCollateVert, sizeof( mso_sptFlowChartCollateVert ) / sizeof( SvxMSDffVertPair ),
@@ -4204,7 +4416,8 @@ static const mso_AutoShape msoFlowChartCollate =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptFlowChartCollateTextRect, sizeof( mso_sptFlowChartCollateTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptFlowChartCollateGluePoints, sizeof( mso_sptFlowChartCollateGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptFlowChartSortVert[] =
@@ -4230,7 +4443,8 @@ static const mso_AutoShape msoFlowChartSort =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptFlowChartSortTextRect, sizeof( mso_sptFlowChartSortTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptFlowChartExtractVert[] =
@@ -4241,6 +4455,10 @@ static const SvxMSDffTextRectangles mso_sptFlowChartExtractTextRect[] =
 {
     { { 5400, 10800 }, { 16200, 21600 } }
 };
+static const SvxMSDffVertPair mso_sptFlowChartExtractGluePoints[] =
+{
+    { 10800, 0 }, { 5400, 10800 }, { 10800, 21600 }, { 16200, 10800 }
+};
 static const mso_AutoShape msoFlowChartExtract =
 {
     (SvxMSDffVertPair*)mso_sptFlowChartExtractVert, sizeof( mso_sptFlowChartExtractVert ) / sizeof( SvxMSDffVertPair ),
@@ -4249,7 +4467,8 @@ static const mso_AutoShape msoFlowChartExtract =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptFlowChartExtractTextRect, sizeof( mso_sptFlowChartExtractTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptFlowChartExtractGluePoints, sizeof( mso_sptFlowChartExtractGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptFlowChartMergeVert[] =
@@ -4268,7 +4487,8 @@ static const mso_AutoShape msoFlowChartMerge =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptFlowChartMergeTextRect, sizeof( mso_sptFlowChartMergeTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptFlowChartExtractGluePoints, sizeof( mso_sptFlowChartExtractGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptFlowChartOnlineStorageVert[] =
@@ -4284,6 +4504,10 @@ static const SvxMSDffTextRectangles mso_sptFlowChartOnlineStorageTextRect[] =
 {
     { { 3600, 0 }, { 18000, 21600 } }
 };
+static const SvxMSDffVertPair mso_sptFlowChartOnlineStorageGluePoints[] =
+{
+    { 10800, 0 }, { 0, 10800 }, { 10800, 21600 }, { 18000, 10800 }
+};
 static const mso_AutoShape msoFlowChartOnlineStorage =
 {
     (SvxMSDffVertPair*)mso_sptFlowChartOnlineStorageVert, sizeof( mso_sptFlowChartOnlineStorageVert ) / sizeof( SvxMSDffVertPair ),
@@ -4292,7 +4516,8 @@ static const mso_AutoShape msoFlowChartOnlineStorage =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptFlowChartOnlineStorageTextRect, sizeof( mso_sptFlowChartOnlineStorageTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptFlowChartOnlineStorageGluePoints, sizeof( mso_sptFlowChartOnlineStorageGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptFlowChartDelayVert[] =
@@ -4316,7 +4541,8 @@ static const mso_AutoShape msoFlowChartDelay =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptFlowChartDelayTextRect, sizeof( mso_sptFlowChartDelayTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptFlowChartMagneticTapeVert[] =
@@ -4343,7 +4569,8 @@ static const mso_AutoShape msoFlowChartMagneticTape =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptFlowChartMagneticTapeTextRect, sizeof( mso_sptFlowChartMagneticTapeTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptFlowChartMagneticDiskVert[] =
@@ -4362,6 +4589,10 @@ static const SvxMSDffTextRectangles mso_sptFlowChartMagneticDiskTextRect[] =
 {
     { { 0, 6800 }, { 21600, 18200 } }
 };
+static const SvxMSDffVertPair mso_sptFlowChartMagneticDiskGluePoints[] =
+{
+    { 10800, 6800 }, { 10800, 0 }, { 0, 10800 }, { 10800, 21600 }, { 21600, 10800 }
+};
 static const mso_AutoShape msoFlowChartMagneticDisk =
 {
     (SvxMSDffVertPair*)mso_sptFlowChartMagneticDiskVert, sizeof( mso_sptFlowChartMagneticDiskVert ) / sizeof( SvxMSDffVertPair ),
@@ -4370,7 +4601,8 @@ static const mso_AutoShape msoFlowChartMagneticDisk =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptFlowChartMagneticDiskTextRect, sizeof( mso_sptFlowChartMagneticDiskTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptFlowChartMagneticDiskGluePoints, sizeof( mso_sptFlowChartMagneticDiskGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptFlowChartMagneticDrumVert[] =
@@ -4389,6 +4621,10 @@ static const SvxMSDffTextRectangles mso_sptFlowChartMagneticDrumTextRect[] =
 {
     { { 3400, 0 }, { 14800, 21600 } }
 };
+static const SvxMSDffVertPair mso_sptFlowChartMagneticDrumGluePoints[] =
+{
+    { 10800, 0 }, { 0, 10800 }, { 10800, 21600 }, { 14800, 10800 }, { 21600, 10800 }
+};
 static const mso_AutoShape msoFlowChartMagneticDrum =
 {
     (SvxMSDffVertPair*)mso_sptFlowChartMagneticDrumVert, sizeof( mso_sptFlowChartMagneticDrumVert ) / sizeof( SvxMSDffVertPair ),
@@ -4397,7 +4633,8 @@ static const mso_AutoShape msoFlowChartMagneticDrum =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptFlowChartMagneticDrumTextRect, sizeof( mso_sptFlowChartMagneticDrumTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptFlowChartMagneticDrumGluePoints, sizeof( mso_sptFlowChartMagneticDrumGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptFlowChartDisplayVert[] =
@@ -4421,7 +4658,8 @@ static const mso_AutoShape msoFlowChartDisplay =
     NULL,
     (SvxMSDffTextRectangles*)mso_sptFlowChartDisplayTextRect, sizeof( mso_sptFlowChartDisplayTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair )
 };
 
 static const SvxMSDffVertPair mso_sptWedgeRectCalloutVert[] =
@@ -4444,7 +4682,8 @@ static const mso_AutoShape msoWedgeRectCallout =
     (sal_Int32*)mso_sptWedgeRectCalloutDefault,
     (SvxMSDffTextRectangles*)mso_sptWedgeRectCalloutTextRect, sizeof( mso_sptWedgeRectCalloutTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptWedgeRRectCalloutVert[] =
@@ -4472,7 +4711,8 @@ static const mso_AutoShape msoWedgeRRectCallout =
     (sal_Int32*)mso_sptWedgeRRectCalloutDefault,
     (SvxMSDffTextRectangles*)mso_sptWedgeRRectCalloutTextRect, sizeof( mso_sptWedgeRRectCalloutTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptWedgeEllipseCalloutVert[] =
@@ -4499,7 +4739,8 @@ static const mso_AutoShape msoWedgeEllipseCallout =
     (sal_Int32*)mso_sptWedgeEllipseCalloutDefault,
     (SvxMSDffTextRectangles*)mso_sptWedgeEllipseCalloutTextRect, sizeof( mso_sptWedgeEllipseCalloutTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 static const SvxMSDffVertPair mso_sptCloudCalloutVert[] =
@@ -4579,7 +4820,8 @@ static const mso_AutoShape msoCloudCallout =
     (sal_Int32*)mso_sptCloudCalloutDefault,
     (SvxMSDffTextRectangles*)mso_sptCloudCalloutTextRect, sizeof( mso_sptCloudCalloutTextRect ) / sizeof( SvxMSDffTextRectangles ),
     21600, 21600,
-    0x80000000, 0x80000000
+    0x80000000, 0x80000000,
+    NULL, 0
 };
 
 class SvxMSDffAdjustmentHandle
@@ -4597,6 +4839,137 @@ class SvxMSDffAdjustmentHandle
     sal_Bool    IsDefault() const { return bIsDefault; };
 };
 
+const mso_AutoShape* GetAutoShapeContent( MSO_SPT eSpType )
+{
+    const mso_AutoShape* pAutoShape = NULL;
+    switch( eSpType )
+    {
+        case mso_sptArc :                       pAutoShape = &msoArc; break;
+        case mso_sptRectangle :                 pAutoShape = &msoRectangle; break;
+        case mso_sptParallelogram :             pAutoShape = &msoParallelogram; break;
+        case mso_sptTrapezoid :                 pAutoShape = &msoTrapezoid; break;
+        case mso_sptDiamond :                   pAutoShape = &msoDiamond; break;
+        case mso_sptRoundRectangle :            pAutoShape = &msoRoundRectangle; break;
+        case mso_sptOctagon :                   pAutoShape = &msoOctagon; break;
+        case mso_sptIsocelesTriangle :          pAutoShape = &msoIsocelesTriangle; break;
+        case mso_sptRightTriangle :             pAutoShape = &msoRightTriangle; break;
+        case mso_sptEllipse :                   pAutoShape = &msoEllipse; break;
+        case mso_sptHexagon :                   pAutoShape = &msoHexagon; break;
+        case mso_sptPlus :                      pAutoShape = &msoPlus; break;
+        case mso_sptPentagon :                  pAutoShape = &msoPentagon; break;
+        case mso_sptCan :                       pAutoShape = &msoCan; break;
+        case mso_sptCube :                      pAutoShape = &msoCube; break;
+        case mso_sptActionButtonBlank :         pAutoShape = &msoActionButtonBlank; break;
+        case mso_sptActionButtonHome :          pAutoShape = &msoActionButtonHome; break;
+        case mso_sptActionButtonHelp :          pAutoShape = &msoActionButtonHelp; break;
+        case mso_sptActionButtonInformation :   pAutoShape = &msoActionButtonInformation; break;
+        case mso_sptActionButtonBackPrevious :  pAutoShape = &msoActionButtonBackPrevious; break;
+        case mso_sptActionButtonForwardNext :   pAutoShape = &msoActionButtonForwardNext; break;
+        case mso_sptActionButtonBeginning :     pAutoShape = &msoActionButtonBeginning; break;
+        case mso_sptActionButtonEnd :           pAutoShape = &msoActionButtonEnd; break;
+        case mso_sptActionButtonReturn :        pAutoShape = &msoActionButtonReturn;    break;
+        case mso_sptActionButtonDocument :      pAutoShape = &msoActionButtonDocument; break;
+        case mso_sptActionButtonSound :         pAutoShape = &msoActionButtonSound; break;
+        case mso_sptActionButtonMovie :         pAutoShape = &msoActionButtonMovie; break;
+        case mso_sptBevel :                     pAutoShape = &msoBevel; break;
+        case mso_sptFoldedCorner :              pAutoShape = &msoFoldedCorner; break;
+        case mso_sptSmileyFace :                pAutoShape = &msoSmileyFace;    break;
+        case mso_sptDonut :                     pAutoShape = &msoDonut; break;
+        case mso_sptNoSmoking :                 pAutoShape = &msoNoSmoking; break;
+        case mso_sptBlockArc :                  pAutoShape = &msoBlockArc; break;
+        case mso_sptHeart :                     pAutoShape = &msoHeart; break;
+        case mso_sptLightningBolt :             pAutoShape = &msoLightningBold; break;
+        case mso_sptSun :                       pAutoShape = &msoSun; break;
+        case mso_sptMoon :                      pAutoShape = &msoMoon; break;
+        case mso_sptBracketPair :               pAutoShape = &msoBracketPair; break;
+        case mso_sptBracePair :                 pAutoShape = &msoBracePair; break;
+        case mso_sptPlaque :                    pAutoShape = &msoPlaque; break;
+        case mso_sptLeftBracket :               pAutoShape = &msoLeftBracket; break;
+        case mso_sptRightBracket :              pAutoShape = &msoRightBracket; break;
+        case mso_sptLeftBrace :                 pAutoShape = &msoLeftBrace; break;
+        case mso_sptRightBrace :                pAutoShape = &msoRightBrace; break;
+        case mso_sptArrow :                     pAutoShape = &msoArrow; break;
+        case mso_sptUpArrow :                   pAutoShape = &msoUpArrow; break;
+        case mso_sptDownArrow :                 pAutoShape = &msoDownArrow; break;
+        case mso_sptLeftArrow :                 pAutoShape = &msoLeftArrow; break;
+        case mso_sptLeftRightArrow :            pAutoShape = &msoLeftRightArrow; break;
+        case mso_sptUpDownArrow :               pAutoShape = &msoUpDownArrow; break;
+        case mso_sptQuadArrow :                 pAutoShape = &msoQuadArrow; break;
+        case mso_sptLeftRightUpArrow :          pAutoShape = &msoLeftRightUpArrow; break;
+        case mso_sptBentArrow :                 pAutoShape = &msoBentArrow; break;
+        case mso_sptUturnArrow :                pAutoShape = &msoUturnArrow; break;
+        case mso_sptLeftUpArrow :               pAutoShape = &msoLeftUpArrow; break;
+        case mso_sptBentUpArrow :               pAutoShape = &msoBentUpArrow; break;
+        case mso_sptCurvedRightArrow :          pAutoShape = &msoCurvedArrow; break;
+        case mso_sptCurvedLeftArrow :           pAutoShape = &msoCurvedArrow; break;
+        case mso_sptCurvedUpArrow :             pAutoShape = &msoCurvedArrow; break;
+        case mso_sptCurvedDownArrow :           pAutoShape = &msoCurvedArrow; break;
+        case mso_sptStripedRightArrow :         pAutoShape = &msoStripedRightArrow; break;
+        case mso_sptNotchedRightArrow :         pAutoShape = &msoNotchedRightArrow; break;
+        case mso_sptHomePlate :                 pAutoShape = &msoHomePlate; break;
+        case mso_sptChevron :                   pAutoShape = &msoChevron; break;
+        case mso_sptRightArrowCallout :         pAutoShape = &msoRightArrowCallout; break;
+        case mso_sptLeftArrowCallout :          pAutoShape = &msoLeftArrowCallout; break;
+        case mso_sptUpArrowCallout :            pAutoShape = &msoUpArrowCallout; break;
+        case mso_sptDownArrowCallout :          pAutoShape = &msoDownArrowCallout; break;
+        case mso_sptLeftRightArrowCallout :     pAutoShape = &msoLeftRightArrowCallout; break;
+        case mso_sptUpDownArrowCallout :        pAutoShape = &msoUpDownArrowCallout; break;
+        case mso_sptQuadArrowCallout :          pAutoShape = &msoQuadArrowCallout; break;
+        case mso_sptCircularArrow :             pAutoShape = &msoCircularArrow; break;
+        case mso_sptIrregularSeal1 :            pAutoShape = &msoIrregularSeal1; break;
+        case mso_sptIrregularSeal2 :            pAutoShape = &msoIrregularSeal2; break;
+        case mso_sptSeal4 :                     pAutoShape = &msoSeal4; break;
+        case mso_sptStar :                      pAutoShape = &msoStar; break;
+        case mso_sptSeal8 :                     pAutoShape = &msoSeal8; break;
+        case mso_sptSeal16 :                    pAutoShape = &msoSeal16; break;
+        case mso_sptSeal24 :                    pAutoShape = &msoSeal24; break;
+        case mso_sptSeal32 :                    pAutoShape = &msoSeal32; break;
+        case mso_sptRibbon2 :                   pAutoShape = &msoRibbon2; break;
+        case mso_sptRibbon :                    pAutoShape = &msoRibbon2; break;
+        case mso_sptEllipseRibbon2 :            pAutoShape = &msoRibbon2; break;    //!!!!!
+        case mso_sptEllipseRibbon :             pAutoShape = &msoRibbon2; break; //!!!!!
+        case mso_sptVerticalScroll :            pAutoShape = &msoVerticalScroll;    break;
+        case mso_sptHorizontalScroll :          pAutoShape = &msoHorizontalScroll; break;
+        case mso_sptFlowChartProcess :          pAutoShape = &msoFlowChartProcess; break;
+        case mso_sptFlowChartAlternateProcess : pAutoShape = &msoFlowChartAlternateProcess; break;
+        case mso_sptFlowChartDecision :         pAutoShape = &msoFlowChartDecision; break;
+        case mso_sptFlowChartInputOutput :      pAutoShape = &msoFlowChartInputOutput; break;
+        case mso_sptFlowChartPredefinedProcess :pAutoShape = &msoFlowChartPredefinedProcess; break;
+        case mso_sptFlowChartInternalStorage :  pAutoShape = &msoFlowChartInternalStorage; break;
+        case mso_sptFlowChartDocument :         pAutoShape = &msoFlowChartDocument; break;
+        case mso_sptFlowChartMultidocument :    pAutoShape = &msoFlowChartMultidocument; break;
+        case mso_sptFlowChartTerminator :       pAutoShape = &msoFlowChartTerminator; break;
+        case mso_sptFlowChartPreparation :      pAutoShape = &msoFlowChartPreparation; break;
+        case mso_sptFlowChartManualInput :      pAutoShape = &msoFlowChartManualInput; break;
+        case mso_sptFlowChartManualOperation :  pAutoShape = &msoFlowChartManualOperation; break;
+        case mso_sptFlowChartConnector :        pAutoShape = &msoFlowChartConnector; break;
+        case mso_sptFlowChartOffpageConnector : pAutoShape = &msoFlowChartOffpageConnector; break;
+        case mso_sptFlowChartPunchedCard :      pAutoShape = &msoFlowChartPunchedCard; break;
+        case mso_sptFlowChartPunchedTape :      pAutoShape = &msoFlowChartPunchedTape; break;
+        case mso_sptFlowChartSummingJunction :  pAutoShape = &msoFlowChartSummingJunction; break;
+        case mso_sptFlowChartOr :               pAutoShape = &msoFlowChartOr; break;
+        case mso_sptFlowChartCollate :          pAutoShape = &msoFlowChartCollate; break;
+        case mso_sptFlowChartSort :             pAutoShape = &msoFlowChartSort; break;
+        case mso_sptFlowChartExtract :          pAutoShape = &msoFlowChartExtract; break;
+        case mso_sptFlowChartMerge :            pAutoShape = &msoFlowChartMerge; break;
+        case mso_sptFlowChartOnlineStorage :    pAutoShape = &msoFlowChartOnlineStorage; break;
+        case mso_sptFlowChartDelay :            pAutoShape = &msoFlowChartDelay; break;
+        case mso_sptFlowChartMagneticTape :     pAutoShape = &msoFlowChartMagneticTape; break;
+        case mso_sptFlowChartMagneticDisk :     pAutoShape = &msoFlowChartMagneticDisk; break;
+        case mso_sptFlowChartMagneticDrum :     pAutoShape = &msoFlowChartMagneticDrum; break;
+        case mso_sptFlowChartDisplay :          pAutoShape = &msoFlowChartDisplay; break;
+        case mso_sptWedgeRectCallout :          pAutoShape = &msoWedgeRectCallout; break;
+        case mso_sptWedgeRRectCallout :         pAutoShape = &msoWedgeRRectCallout; break;
+        case mso_sptWedgeEllipseCallout :       pAutoShape = &msoWedgeEllipseCallout; break;
+        case mso_sptCloudCallout :              pAutoShape = &msoCloudCallout; break;
+//      case mso_sptWave :                      pAutoShape = &msoWave; break;
+        break;
+        default :
+        break;
+    }
+    return pAutoShape;
+}
+
 SvxMSDffAutoShape::~SvxMSDffAutoShape()
 {
     if ( bVertAlloc )
@@ -4622,11 +4995,13 @@ SvxMSDffAutoShape::SvxMSDffAutoShape( const DffPropertyReader& rPropReader, SvSt
     nCalculationData    ( 0 ),
     nTextRectData       ( 0 ),
     nAdjustmentHandles  ( 0 ),
+    nGluePoints         ( 0 ),
     pAdjustmentHandles  ( NULL ),
     pVertData           ( NULL ),
     pSegData            ( NULL ),
     pCalculationData    ( NULL ),
     pTextRectData       ( NULL ),
+    pGluePoints         ( NULL ),
     bIsEmpty            ( TRUE ),
     bVertAlloc          ( FALSE ),
     bSegAlloc           ( FALSE ),
@@ -4658,280 +5033,65 @@ SvxMSDffAutoShape::SvxMSDffAutoShape( const DffPropertyReader& rPropReader, SvSt
             nHandlesUsed = nIndex + 1;
         }
     }
-
-    switch( eSpType )
+    pDefAutoShape = GetAutoShapeContent( eSpType );
+    if ( pDefAutoShape )
     {
-        case mso_sptArc :                   pDefAutoShape = &msoArc; break;
-        case mso_sptRectangle :             pDefAutoShape = &msoRectangle; break;
-        case mso_sptParallelogram :         pDefAutoShape = &msoParallelogram; break;
-        case mso_sptTrapezoid :             pDefAutoShape = &msoTrapezoid; break;
-        case mso_sptDiamond :               pDefAutoShape = &msoDiamond; break;
-        case mso_sptRoundRectangle :        pDefAutoShape = &msoRoundRectangle; break;
-        case mso_sptOctagon :               pDefAutoShape = &msoOctagon; break;
-        case mso_sptIsocelesTriangle :      pDefAutoShape = &msoIsocelesTriangle; break;
-        case mso_sptRightTriangle :         pDefAutoShape = &msoRightTriangle; break;
-        case mso_sptEllipse :               pDefAutoShape = &msoEllipse; break;
-        case mso_sptHexagon :               pDefAutoShape = &msoHexagon; break;
-        case mso_sptPlus :                  pDefAutoShape = &msoPlus; break;
-        case mso_sptPentagon :              pDefAutoShape = &msoPentagon; break;
-        case mso_sptCan :
+        switch( eSpType )
         {
-            pDefAutoShape = &msoCan;
-            nColorData = 0x20200000;
-        }
-        break;
-        case mso_sptCube :
-        {
-            pDefAutoShape = &msoCube;
-            nColorData = 0x302d0000;
-        }
-        break;
-
-        case mso_sptActionButtonBlank :
-        {
-            pDefAutoShape = &msoActionButtonBlank;
-            nColorData = 0x502ad400;
-        }
-        break;
-        case mso_sptActionButtonHome :
-        {
-            pDefAutoShape = &msoActionButtonHome;
-            nColorData = 0x702ad4ad;
-        }
-        break;
-        case mso_sptActionButtonHelp :
-        {
-            pDefAutoShape = &msoActionButtonHelp;
-            nColorData = 0x602ad4a0;
-        }
-        break;
-        case mso_sptActionButtonInformation :
-        {
-            pDefAutoShape = &msoActionButtonInformation;
-            nColorData = 0x702ad4a5;
-        }
-        break;
-        case mso_sptActionButtonBackPrevious :
-        {
-            pDefAutoShape = &msoActionButtonBackPrevious;
-            nColorData = 0x602ad4a0;
-        }
-        break;
-        case mso_sptActionButtonForwardNext :
-        {
-            pDefAutoShape = &msoActionButtonForwardNext;
-            nColorData = 0x602ad4a0;
-        }
-        break;
-        case mso_sptActionButtonBeginning :
-        {
-            pDefAutoShape = &msoActionButtonBeginning;
-            nColorData = 0x602ad4a0;
-        }
-        break;
-        case mso_sptActionButtonEnd :
-        {
-            pDefAutoShape = &msoActionButtonEnd;
-            nColorData = 0x602ad4a0;
-        }
-        break;
-        case mso_sptActionButtonReturn :
-        {
-            pDefAutoShape = &msoActionButtonReturn;
-            nColorData = 0x602ad4a0;
-        }
-        break;
-        case mso_sptActionButtonDocument :
-        {
-            pDefAutoShape =&msoActionButtonDocument;
-            nColorData = 0x702ad4da;
-        }
-        break;
-        case mso_sptActionButtonSound :
-        {
-            pDefAutoShape = &msoActionButtonSound;
-            nColorData = 0x602ad4a0;
-        }
-        break;
-        case mso_sptActionButtonMovie :
-        {
-            pDefAutoShape = &msoActionButtonMovie;
-            nColorData = 0x602ad4a0;
-        }
-        break;
-        case mso_sptBevel :
-        {
-            pDefAutoShape = &msoBevel;
-            nColorData = 0x502ad400;
-        }
-        break;
-
-        case mso_sptFoldedCorner :
-        {
-            pDefAutoShape = &msoFoldedCorner;
-            nColorData = 0x20d00000;
-        }
-        break;
-        case mso_sptSmileyFace :
-        {
-            pDefAutoShape = &msoSmileyFace;
-            nColorData = 0x20d00000;
-        }
-        break;
-        case mso_sptDonut :                 pDefAutoShape = &msoDonut; break;
-        case mso_sptNoSmoking :             pDefAutoShape = &msoNoSmoking; break;
-        case mso_sptBlockArc :              pDefAutoShape = &msoBlockArc; break;
-        case mso_sptHeart :                 pDefAutoShape = &msoHeart; break;
-        case mso_sptLightningBolt :         pDefAutoShape = &msoLightningBold; break;
-        case mso_sptSun :                   pDefAutoShape = &msoSun; break;
-        case mso_sptMoon :                  pDefAutoShape = &msoMoon; break;
-        case mso_sptBracketPair :           pDefAutoShape = &msoBracketPair; break;
-        case mso_sptBracePair :             pDefAutoShape = &msoBracePair; break;
-        case mso_sptPlaque :                pDefAutoShape = &msoPlaque; break;
-        case mso_sptLeftBracket :           pDefAutoShape = &msoLeftBracket; break;
-        case mso_sptRightBracket :          pDefAutoShape = &msoRightBracket; break;
-        case mso_sptLeftBrace :             pDefAutoShape = &msoLeftBrace; break;
-        case mso_sptRightBrace :            pDefAutoShape = &msoRightBrace; break;
-        case mso_sptArrow :                 pDefAutoShape = &msoArrow; break;
-        case mso_sptUpArrow :               pDefAutoShape = &msoUpArrow; break;
-        case mso_sptDownArrow :             pDefAutoShape = &msoDownArrow; break;
-        case mso_sptLeftArrow :             pDefAutoShape = &msoLeftArrow; break;
-        case mso_sptLeftRightArrow :        pDefAutoShape = &msoLeftRightArrow; break;
-        case mso_sptUpDownArrow :           pDefAutoShape = &msoUpDownArrow; break;
-        case mso_sptQuadArrow :             pDefAutoShape = &msoQuadArrow; break;
-        case mso_sptLeftRightUpArrow :      pDefAutoShape = &msoLeftRightUpArrow; break;
-        case mso_sptBentArrow :             pDefAutoShape = &msoBentArrow; break;
-        case mso_sptUturnArrow :            pDefAutoShape = &msoUturnArrow; break;
-        case mso_sptLeftUpArrow :           pDefAutoShape = &msoLeftUpArrow; break;
-        case mso_sptBentUpArrow :           pDefAutoShape = &msoBentUpArrow; break;
-        case mso_sptCurvedRightArrow :
-        {
-            pDefAutoShape = &msoCurvedArrow;
-        }
-        break;
-        case mso_sptCurvedLeftArrow :
-        {
-            pDefAutoShape = &msoCurvedArrow;
-            if ( nHandlesSet & 4 )
-                nHandles[ 2 ] = 21600 - nHandles[ 2 ];
-            nFlags |= DFF_AUTOSHAPE_FLIP_H;
-        }
-        break;
-        case mso_sptCurvedUpArrow :
-        {
-            pDefAutoShape = &msoCurvedArrow;
-            if ( nHandlesSet & 4 )
-                nHandles[ 2 ] = 21600 - nHandles[ 2 ];
-            nFlags |= DFF_AUTOSHAPE_FLIP_V | DFF_AUTOSHAPE_EXCH;
-        }
-        break;
-        case mso_sptCurvedDownArrow :
-        {
-            pDefAutoShape = &msoCurvedArrow;
-            nFlags |= DFF_AUTOSHAPE_EXCH;
-        }
-        break;
-        case mso_sptStripedRightArrow :     pDefAutoShape = &msoStripedRightArrow; break;
-        case mso_sptNotchedRightArrow :     pDefAutoShape = &msoNotchedRightArrow; break;
-        case mso_sptHomePlate :             pDefAutoShape = &msoHomePlate; break;
-        case mso_sptChevron :               pDefAutoShape = &msoChevron; break;
-        case mso_sptRightArrowCallout :     pDefAutoShape = &msoRightArrowCallout; break;
-        case mso_sptLeftArrowCallout :      pDefAutoShape = &msoLeftArrowCallout; break;
-        case mso_sptUpArrowCallout :        pDefAutoShape = &msoUpArrowCallout; break;
-        case mso_sptDownArrowCallout :      pDefAutoShape = &msoDownArrowCallout; break;
-        case mso_sptLeftRightArrowCallout : pDefAutoShape = &msoLeftRightArrowCallout; break;
-        case mso_sptUpDownArrowCallout :    pDefAutoShape = &msoUpDownArrowCallout; break;
-        case mso_sptQuadArrowCallout :      pDefAutoShape = &msoQuadArrowCallout; break;
-        case mso_sptCircularArrow :         pDefAutoShape = &msoCircularArrow; break;
-        case mso_sptIrregularSeal1 :        pDefAutoShape = &msoIrregularSeal1; break;
-        case mso_sptIrregularSeal2 :        pDefAutoShape = &msoIrregularSeal2; break;
-        case mso_sptSeal4 :                 pDefAutoShape = &msoSeal4; break;
-        case mso_sptStar :                  pDefAutoShape = &msoStar; break;
-        case mso_sptSeal8 :                 pDefAutoShape = &msoSeal8; break;
-        case mso_sptSeal16 :                pDefAutoShape = &msoSeal16; break;
-        case mso_sptSeal24 :                pDefAutoShape = &msoSeal24; break;
-        case mso_sptSeal32 :                pDefAutoShape = &msoSeal32; break;
-        case mso_sptRibbon2 :
-        {
-            pDefAutoShape = &msoRibbon2;
-            nColorData = 0x30dd0000;
-        }
-        break;
-        case mso_sptRibbon :
-        {
-            pDefAutoShape = &msoRibbon2;
-            if ( nHandlesSet & 2 )
-                nHandles[ 1 ] = 21600 - nHandles[ 1 ];
-            nFlags |= DFF_AUTOSHAPE_FLIP_V;
-            nColorData = 0x30dd0000;
-        }
-        break;
-        case mso_sptEllipseRibbon2 :            // !!!!!!!!!!
-        {
-            pDefAutoShape = &msoRibbon2;
-            nColorData = 0x30dd0000;
-        }
-        break;
-        case mso_sptEllipseRibbon :             // !!!!!!!!!!
-        {
-            pDefAutoShape = &msoRibbon2;
-            if ( nHandlesSet & 2 )
-                nHandles[ 1 ] = 21600 - nHandles[ 1 ];
-            nFlags |= DFF_AUTOSHAPE_FLIP_V;
-            nColorData = 0x30dd0000;
-        }
-        break;
-        case mso_sptVerticalScroll :
-        {
-            pDefAutoShape = &msoVerticalScroll;
-            nColorData = 0x30dd0000;
-        }
-        break;
-        case mso_sptHorizontalScroll :
-        {
-            pDefAutoShape = &msoHorizontalScroll;
-            nColorData = 0x30dd0000;
+            case mso_sptCan :                       nColorData = 0x20200000; break;
+            case mso_sptCube :                      nColorData = 0x302d0000; break;
+            case mso_sptActionButtonBlank :         nColorData = 0x502ad400; break;
+            case mso_sptActionButtonHome :          nColorData = 0x702ad4ad; break;
+            case mso_sptActionButtonHelp :          nColorData = 0x602ad4a0; break;
+            case mso_sptActionButtonInformation :   nColorData = 0x702ad4a5; break;
+            case mso_sptActionButtonBackPrevious :  nColorData = 0x602ad4a0; break;
+            case mso_sptActionButtonForwardNext :   nColorData = 0x602ad4a0; break;
+            case mso_sptActionButtonBeginning :     nColorData = 0x602ad4a0; break;
+            case mso_sptActionButtonEnd :           nColorData = 0x602ad4a0; break;
+            case mso_sptActionButtonReturn :        nColorData = 0x602ad4a0; break;
+            case mso_sptActionButtonDocument :      nColorData = 0x702ad4da; break;
+            case mso_sptActionButtonSound :         nColorData = 0x602ad4a0; break;
+            case mso_sptActionButtonMovie :         nColorData = 0x602ad4a0; break;
+            case mso_sptBevel :                     nColorData = 0x502ad400; break;
+            case mso_sptFoldedCorner :              nColorData = 0x20d00000; break;
+            case mso_sptSmileyFace :                nColorData = 0x20d00000; break;
+            case mso_sptCurvedLeftArrow :
+            {
+                if ( nHandlesSet & 4 )
+                    nHandles[ 2 ] = 21600 - nHandles[ 2 ];
+                nFlags |= DFF_AUTOSHAPE_FLIP_H;
+            }
+            break;
+            case mso_sptCurvedUpArrow :
+            {
+                if ( nHandlesSet & 4 )
+                    nHandles[ 2 ] = 21600 - nHandles[ 2 ];
+                nFlags |= DFF_AUTOSHAPE_FLIP_V | DFF_AUTOSHAPE_EXCH;
+            }
+            break;
+            case mso_sptCurvedDownArrow :           nFlags |= DFF_AUTOSHAPE_EXCH; break;
+            case mso_sptRibbon2 :                   nColorData = 0x30dd0000; break;
+            case mso_sptRibbon :
+            {
+                if ( nHandlesSet & 2 )
+                    nHandles[ 1 ] = 21600 - nHandles[ 1 ];
+                nFlags |= DFF_AUTOSHAPE_FLIP_V;
+                nColorData = 0x30dd0000;
+            }
+            break;
+            case mso_sptEllipseRibbon2 :            nColorData = 0x30dd0000; break;
+            case mso_sptEllipseRibbon :             // !!!!!!!!!!
+            {
+                if ( nHandlesSet & 2 )
+                    nHandles[ 1 ] = 21600 - nHandles[ 1 ];
+                nFlags |= DFF_AUTOSHAPE_FLIP_V;
+                nColorData = 0x30dd0000;
+            }
+            break;
+            case mso_sptVerticalScroll :            nColorData = 0x30dd0000; break;
+            case mso_sptHorizontalScroll :          nColorData = 0x30dd0000; break;
         }
-        break;
-        case mso_sptFlowChartProcess :          pDefAutoShape = &msoFlowChartProcess; break;
-        case mso_sptFlowChartAlternateProcess : pDefAutoShape = &msoFlowChartAlternateProcess; break;
-        case mso_sptFlowChartDecision :         pDefAutoShape = &msoFlowChartDecision; break;
-        case mso_sptFlowChartInputOutput :      pDefAutoShape = &msoFlowChartInputOutput; break;
-        case mso_sptFlowChartPredefinedProcess :pDefAutoShape = &msoFlowChartPredefinedProcess; break;
-        case mso_sptFlowChartInternalStorage :  pDefAutoShape = &msoFlowChartInternalStorage; break;
-        case mso_sptFlowChartDocument :         pDefAutoShape = &msoFlowChartDocument; break;
-        case mso_sptFlowChartMultidocument :    pDefAutoShape = &msoFlowChartMultidocument; break;
-        case mso_sptFlowChartTerminator :       pDefAutoShape = &msoFlowChartTerminator; break;
-        case mso_sptFlowChartPreparation :      pDefAutoShape = &msoFlowChartPreparation; break;
-        case mso_sptFlowChartManualInput :      pDefAutoShape = &msoFlowChartManualInput; break;
-        case mso_sptFlowChartManualOperation :  pDefAutoShape = &msoFlowChartManualOperation; break;
-        case mso_sptFlowChartConnector :        pDefAutoShape = &msoFlowChartConnector; break;
-        case mso_sptFlowChartOffpageConnector : pDefAutoShape = &msoFlowChartOffpageConnector; break;
-        case mso_sptFlowChartPunchedCard :      pDefAutoShape = &msoFlowChartPunchedCard; break;
-        case mso_sptFlowChartPunchedTape :      pDefAutoShape = &msoFlowChartPunchedTape; break;
-        case mso_sptFlowChartSummingJunction :  pDefAutoShape = &msoFlowChartSummingJunction; break;
-        case mso_sptFlowChartOr :               pDefAutoShape = &msoFlowChartOr; break;
-        case mso_sptFlowChartCollate :          pDefAutoShape = &msoFlowChartCollate; break;
-        case mso_sptFlowChartSort :             pDefAutoShape = &msoFlowChartSort; break;
-        case mso_sptFlowChartExtract :          pDefAutoShape = &msoFlowChartExtract; break;
-        case mso_sptFlowChartMerge :            pDefAutoShape = &msoFlowChartMerge; break;
-        case mso_sptFlowChartOnlineStorage :    pDefAutoShape = &msoFlowChartOnlineStorage; break;
-        case mso_sptFlowChartDelay :            pDefAutoShape = &msoFlowChartDelay; break;
-        case mso_sptFlowChartMagneticTape :     pDefAutoShape = &msoFlowChartMagneticTape; break;
-        case mso_sptFlowChartMagneticDisk :     pDefAutoShape = &msoFlowChartMagneticDisk; break;
-        case mso_sptFlowChartMagneticDrum :     pDefAutoShape = &msoFlowChartMagneticDrum; break;
-        case mso_sptFlowChartDisplay :          pDefAutoShape = &msoFlowChartDisplay; break;
-        case mso_sptWedgeRectCallout :          pDefAutoShape = &msoWedgeRectCallout; break;
-        case mso_sptWedgeRRectCallout :         pDefAutoShape = &msoWedgeRRectCallout; break;
-        case mso_sptWedgeEllipseCallout :       pDefAutoShape = &msoWedgeEllipseCallout; break;
-        case mso_sptCloudCallout :              pDefAutoShape = &msoCloudCallout; break;
-
-//      case mso_sptWave :                  pDefAutoShape = &msoWave; break;
-        break;
-        default :
-        break;
     }
-
     nCoordHeight = nCoordWidth  = 21600;
     if ( pDefAutoShape )
     {
@@ -4949,6 +5109,8 @@ SvxMSDffAutoShape::SvxMSDffAutoShape( const DffPropertyReader& rPropReader, SvSt
         nCoordHeight = pDefAutoShape->nCoordHeight;
         nXRef = pDefAutoShape->nXRef;
         nYRef = pDefAutoShape->nYRef;
+        pGluePoints = pDefAutoShape->pGluePoints;
+        nGluePoints = pDefAutoShape->nGluePoints;
     }
     sal_Int32 nGeoRight = rPropReader.GetPropertyValue( DFF_Prop_geoRight, 0 );
     if ( nGeoRight )
@@ -5505,6 +5667,33 @@ Rectangle SvxMSDffAutoShape::GetTextRect() const
     return aRect;
 }
 
+sal_Bool SvxMSDffAutoShape::HasGluePointList( const MSO_SPT eShapeType )
+{
+    const mso_AutoShape* pAutoShape = GetAutoShapeContent( eShapeType );
+    return pAutoShape && pAutoShape->nGluePoints;
+}
+
+MSO_SPT SvxMSDffAutoShape::GetShapeTypeFromSdrObject(  const SdrObject* pObj )
+{
+    MSO_SPT eShapeType = mso_sptNil;
+    const SfxPoolItem* pAdjustItem = NULL;
+    const SfxItemSet&  rItemSet = pObj->GetItemSet();
+    rItemSet.GetItemState( SDRATTR_AUTOSHAPE_ADJUSTMENT, FALSE, &pAdjustItem );
+    if ( pAdjustItem )
+    {
+        SdrAutoShapeAdjustmentItem& rAdjustItem = *(SdrAutoShapeAdjustmentItem*)pAdjustItem;
+        sal_uInt32 nCount = rAdjustItem.GetCount();
+        if ( nCount >= 3 )
+        {
+            /* checking magic number, so we can get sure that the SdrObject was a autoshape
+               and we can get the autoshape type */
+            if ( rAdjustItem.GetValue( nCount - 1 ).GetValue() == 0x80001234 )
+                eShapeType = (MSO_SPT)((sal_uInt32)(rAdjustItem.GetValue( nCount - 2 ).GetValue()) >> 16);
+        }
+    }
+    return eShapeType;
+}
+
 SdrObject* SvxMSDffAutoShape::GetObject( SdrModel* pSdrModel, SfxItemSet& rSet, sal_Bool bSetAutoShapeAdjustItem )
 {
     SdrObject* pRet = NULL;
@@ -5991,6 +6180,31 @@ SdrObject* SvxMSDffAutoShape::GetObject( SdrModel* pSdrModel, SfxItemSet& rSet,
     }
     if ( pRet )
     {
+        // some objects needs to have their own GluePoint list
+        if ( HasGluePointList( eSpType ) )
+        {
+            sal_uInt32 i;
+            const SvxMSDffVertPair* pTmp = pGluePoints;
+            for ( i = 0; i < nGluePoints; i++ )
+            {
+                SdrGluePoint aGluePoint;
+                const Point& rPoint = GetPoint( *pTmp++, sal_True );
+                double fXRel = rPoint.X();
+                double fYRel = rPoint.Y();
+                fXRel = fXRel / aSnapRect.GetWidth() * 10000;
+                fYRel = fYRel / aSnapRect.GetHeight() * 10000;
+                aGluePoint.SetPos( Point( (sal_Int32)fXRel, (sal_Int32)fYRel ) );
+                aGluePoint.SetPercent( sal_True );
+                aGluePoint.SetAlign( SDRVERTALIGN_TOP | SDRHORZALIGN_LEFT );
+                aGluePoint.SetEscDir( SDRESC_SMART );
+                SdrGluePointList* pList = pRet->ForceGluePointList();
+                if( pList )
+                {
+                    sal_uInt16 nId = pList->Insert( aGluePoint );
+//                  sal_uInt16 nNewId = (sal_Int32)((*pList)[nId].GetId() + 4 );
+                }
+            }
+        }
         if ( bSetAutoShapeAdjustItem )
         {
             if ( pRet->ISA( SdrObjGroup ) || pRet->ISA( SdrPathObj ) )
diff --git a/svx/source/msfilter/msashape.hxx b/svx/source/msfilter/msashape.hxx
index cdf916c40552..5112ce6df682 100644
--- a/svx/source/msfilter/msashape.hxx
+++ b/svx/source/msfilter/msashape.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: msashape.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: sj $ $Date: 2002-06-25 12:14:17 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:39 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -108,6 +108,8 @@ class SvxMSDffAutoShape
         SvxMSDffCalculationData*    pCalculationData;
         sal_uInt32                  nAdjustmentHandles;
         SvxMSDffAdjustmentHandle*   pAdjustmentHandles;
+        sal_uInt32                  nGluePoints;
+        SvxMSDffVertPair*           pGluePoints;
 
         sal_Bool                    bIsEmpty        : 1;
         sal_Bool                    bVertAlloc      : 1;
@@ -133,11 +135,12 @@ class SvxMSDffAutoShape
         sal_Bool                    IsEmpty() const;
 
         Rectangle                   GetTextRect() const;
+        static sal_Bool             HasGluePointList( const MSO_SPT eShapeType );
+        static MSO_SPT              GetShapeTypeFromSdrObject( const SdrObject* );
 
         SvxMSDffAutoShape( const DffPropertyReader& rPropReader, SvStream&,
                             DffObjData& rObjDat, Rectangle& rSnapRect, sal_Int32 nFix16Angle );
         ~SvxMSDffAutoShape();
-
 };
 
 #endif
diff --git a/svx/source/msfilter/msashape3d.cxx b/svx/source/msfilter/msashape3d.cxx
new file mode 100644
index 000000000000..2249349ed8d0
--- /dev/null
+++ b/svx/source/msfilter/msashape3d.cxx
@@ -0,0 +1,599 @@
+/*************************************************************************
+ *
+ *  $RCSfile: msashape3d.cxx,v $
+ *
+ *  $Revision: 1.2 $
+ *
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:40 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  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., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2002 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#ifndef _MSASHAPE3D_HXX
+#include <msashape3d.hxx>
+#endif
+
+#ifndef _SV_POLY_HXX
+#include <vcl/poly.hxx>
+#endif
+#ifndef _SVDITER_HXX
+#include <svditer.hxx>
+#endif
+#ifndef _SVDOBJ_HXX
+#include <svdobj.hxx>
+#endif
+#ifndef _SFXPOOLITEM_HXX
+#include <svtools/poolitem.hxx>
+#endif
+#ifndef _SFXITEMSET_HXX
+#include <svtools/itemset.hxx>
+#endif
+#ifndef SVX_XFILLIT0_HXX
+#include <xfillit0.hxx>
+#endif
+#ifndef _SVX_XIT_HXX
+#include <xit.hxx>
+#endif
+#ifndef _SVX_XBTMPIT_HXX
+#include <xbtmpit.hxx>
+#endif
+#ifndef _SVX_XFLCLIT_HXX
+#include <xflclit.hxx>
+#endif
+#ifndef _SVDOPATH_HXX
+#include <svdopath.hxx>
+#endif
+#ifndef _SVDOGRP_HXX
+#include <svdogrp.hxx>
+#endif
+#ifndef _SVDPAGE_HXX
+#include <svdpage.hxx>
+#endif
+#ifndef _E3D_POLYSC3D_HXX
+#include "polysc3d.hxx"
+#endif
+#ifndef _SVDDEF_HXX
+#include "svddef.hxx"
+#endif
+#ifndef _SVX3DITEMS_HXX
+#include "svx3ditems.hxx"
+#endif
+#ifndef _E3D_EXTRUD3D_HXX
+#include "extrud3d.hxx"
+#endif
+#ifndef _SVX_XFLBMTIT_HXX
+#include <xflbmtit.hxx>
+#endif
+#ifndef _SV_SVAPP_HXX
+#include <vcl/svapp.hxx>
+#endif
+#ifndef _SVX_XLNCLIT_HXX
+#include <xlnclit.hxx>
+#endif
+
+#define ITEMVALUE(ItemSet,Id,Cast)  ((const Cast&)(ItemSet).Get(Id)).GetValue()
+
+double SvxMSDffAutoShape3D::Fix16ToAngle( sal_Int32 nFixAngle )
+{
+    double fAngle = 0.0;
+    if ( nFixAngle )
+    {
+        fAngle = nFixAngle;
+        fAngle /= 65536.0;
+    }
+    return fAngle;
+}
+
+SvxMSDffAutoShape3D::Transformation2D::Transformation2D( const DffPropSet& rPropSet, const Rectangle& rSnapRect ) :
+    aCenter( rSnapRect.Center() )
+{
+    bParallel = ( rPropSet.GetPropertyValue( DFF_Prop_fc3DFillHarsh, 0 ) & 4 ) != 0;
+    if ( bParallel )
+    {
+        fSkewAngle = Fix16ToAngle( rPropSet.GetPropertyValue( DFF_Prop_c3DSkewAngle, -135 * 65536 ) ) * F_PI180;
+        nSkewAmount = rPropSet.GetPropertyValue( DFF_Prop_c3DSkewAmount, 50 );
+    }
+    else
+    {
+        fZScreen = 0.0;
+        fViewPointOriginX = ((double)((sal_Int32)rPropSet.GetPropertyValue( DFF_Prop_c3DOriginX, 32768 )) * rSnapRect.GetWidth()) / 65536.0;
+        fViewPointOriginY = ((double)((sal_Int32)rPropSet.GetPropertyValue( DFF_Prop_c3DOriginY,-32768 )) * rSnapRect.GetHeight()) / 65536.0;
+        fViewPoint.X() = (double)((sal_Int32)rPropSet.GetPropertyValue( DFF_Prop_c3DXViewpoint, 1250000 )) / 360;   // 360 emu = 0,01 mm
+        fViewPoint.Y() = (double)((sal_Int32)rPropSet.GetPropertyValue( DFF_Prop_c3DYViewpoint,-1250000 )) / 360;
+        fViewPoint.W() = (double)((sal_Int32)rPropSet.GetPropertyValue( DFF_Prop_c3DZViewpoint,-9000000 )) / 360;
+    }
+}
+
+void SvxMSDffAutoShape3D::Transformation2D::ApplySkewSettings( Polygon3D& rPoly3D )
+{
+    sal_uInt16 j;
+    for ( j = 0; j < rPoly3D.GetPointCount(); j++ )
+    {
+        Vector3D& rPoint = rPoly3D[ j ];
+        double fDepth = -( rPoint.Z() * nSkewAmount ) / 100.0;
+        rPoint.X() += fDepth * cos( fSkewAngle );
+        rPoint.Y() += -( fDepth * sin( fSkewAngle ) );
+    }
+}
+
+Point SvxMSDffAutoShape3D::Transformation2D::Transform2D( const Vector3D& rPoint3D )
+{
+    Point aPoint2D;
+    if ( bParallel )
+    {
+        aPoint2D.X() = (sal_Int32)rPoint3D.X();
+        aPoint2D.Y() = (sal_Int32)rPoint3D.Y();
+    }
+    else
+    {
+        double fX = rPoint3D.X() - fViewPointOriginX;
+        double fY = rPoint3D.Y() - fViewPointOriginY;
+        double f = ( fZScreen - fViewPoint.W() ) / ( rPoint3D.Z() - fViewPoint.W() );
+        aPoint2D.X() = (sal_Int32)(( fX - fViewPoint.X() ) * f + fViewPoint.X() + fViewPointOriginX );
+        aPoint2D.Y() = (sal_Int32)(( fY - fViewPoint.Y() ) * f + fViewPoint.Y() + fViewPointOriginY );
+    }
+    aPoint2D.Move( aCenter.X(), aCenter.Y() );
+    return aPoint2D;
+}
+
+void SvxMSDffAutoShape3D::Rotate( Vector3D& rPoint, const double x, const double y, const double z )
+{
+    // rotation z axis
+     Vector3D aPoint( rPoint );
+    rPoint.X() = aPoint.X() * cos( z ) + aPoint.Y() * sin( z );
+    rPoint.Y() = -( aPoint.X() * sin( z ) ) + aPoint.Y() * cos( z );
+
+    // rotation y axis
+    aPoint = rPoint;
+    rPoint.X() = aPoint.X() * cos( y ) + aPoint.Z() * sin( y );
+    rPoint.Z() = -( aPoint.X() * sin( y ) ) + aPoint.Z() * cos( y );
+
+    // rotation x axis
+    aPoint = rPoint;
+    rPoint.Y() = aPoint.Y() * cos( x ) + aPoint.Z() * sin( x );
+    rPoint.Z() = -( aPoint.Y() * sin( x ) ) + aPoint.Z() * cos( x );
+}
+
+void SvxMSDffAutoShape3D::Rotate( PolyPolygon3D& rPolyPoly3D, const Point3D& rOrigin, const double x, const double y, const double z )
+{
+    sal_uInt16 i, j;
+    for( i = 0; i < rPolyPoly3D.Count(); i++ )
+    {
+        Polygon3D& rPoly3D = rPolyPoly3D[ i ];
+        for( j = 0; j < rPoly3D.GetPointCount(); j++ )
+        {
+            Vector3D& rPoint = rPoly3D[ j ];
+            rPoint.X() -= rOrigin.X();
+            rPoint.Y() -= rOrigin.Y();
+            rPoint.Z() -= rOrigin.W();
+            Rotate( rPoint, x, y, z );
+            rPoint.X() += rOrigin.X();
+            rPoint.Y() += rOrigin.Y();
+            rPoint.Z() += rOrigin.W();
+        }
+    }
+}
+
+SdrObject* SvxMSDffAutoShape3D::Create3DObject( const SdrObject* pObj, const DffPropSet& rPropSet,
+                SfxItemSet& aSet, Rectangle& rSnapRect, sal_uInt32 nSpFlags )
+{
+    SdrObject* pRet = NULL;
+    std::vector< E3dCompoundObject* > aPlaceholderObjectList;
+
+    double fExtrusionBackward = (double)((sal_Int32)rPropSet.GetPropertyValue( DFF_Prop_c3DExtrudeBackward, 457200 )) / 360.0;  // in emus
+    double fExtrusionForward  = (double)((sal_Int32)rPropSet.GetPropertyValue( DFF_Prop_c3DExtrudeForward, 0 )) / 360.0;
+    double fDepth = fExtrusionBackward - fExtrusionForward;
+    if ( fDepth < 1.0 )
+        fDepth = 1.0;
+    ProjectionType eProjectionType( rPropSet.GetPropertyValue( DFF_Prop_fc3DFillHarsh, 0 ) & 4 ? PR_PARALLEL : PR_PERSPECTIVE );
+
+    // pObj Umwandeln in Szene mit 3D Objekt
+    E3dDefaultAttributes a3DDefaultAttr;
+    a3DDefaultAttr.SetDefaultLatheCharacterMode( TRUE );
+    a3DDefaultAttr.SetDefaultExtrudeCharacterMode( TRUE );
+
+    E3dScene* pScene = new E3dPolyScene( a3DDefaultAttr );
+
+    sal_Bool bSceneHasObjects ( sal_False );
+    sal_Bool bUseTwoFillStyles( sal_False );
+
+    MSO_3DRenderMode eRenderMode( (MSO_3DRenderMode)rPropSet.GetPropertyValue( DFF_Prop_c3DRenderMode, mso_FullRender ) );
+    XFillStyle eFillStyle( ITEMVALUE( aSet, XATTR_FILLSTYLE, XFillStyleItem ) );
+    pScene->SetItem( Svx3DShadeModeItem( 0 ) );
+    aSet.Put( Svx3DPercentDiagonalItem( 0 ) );
+    aSet.Put( Svx3DTextureModeItem( 1 ) );
+    if ( eRenderMode == mso_Wireframe )
+    {
+        aSet.Put( XLineStyleItem( XLINE_SOLID ) );
+        aSet.Put( XFillStyleItem ( XFILL_NONE ) );
+        aSet.Put( Svx3DDoubleSidedItem( TRUE ) );
+    }
+    else
+    {
+        aSet.Put( XLineStyleItem( XLINE_NONE ) );
+        if ( eFillStyle == XFILL_NONE )
+            aSet.Put( XFillStyleItem( XFILL_SOLID ) );
+        else if ( ( eFillStyle == XFILL_BITMAP ) || ( eFillStyle == XFILL_GRADIENT ) )
+            bUseTwoFillStyles = sal_True;
+    }
+    const SdrObject* pNext = NULL;
+    SdrObjListIter* pIter = NULL;
+    if ( pObj->IsGroupObject() )
+    {
+        pIter = new SdrObjListIter( *pObj, IM_DEEPWITHGROUPS );
+        if ( pIter->IsMore() )
+            pNext = pIter->Next();
+    }
+    else
+        pNext = pObj;
+    while ( pNext )
+    {
+        sal_Bool bIsPlaceholderObject = (((XFillStyleItem&)pNext->GetItem( XATTR_FILLSTYLE )).GetValue() == XFILL_NONE )
+                                     && (((XLineStyleItem&)pNext->GetItem( XATTR_LINESTYLE )).GetValue() == XLINE_NONE );
+
+        SdrObject* pNewObj = pNext->ConvertToPolyObj( FALSE, FALSE );
+        SdrPathObj* pPath = PTR_CAST( SdrPathObj, pNewObj );
+        if( pPath )
+        {
+            const XPolyPolygon& rPolyPolygon = pPath->GetPathPoly();
+            E3dCompoundObject* p3DObj = new E3dExtrudeObj( a3DDefaultAttr,
+                rPolyPolygon, bUseTwoFillStyles ? 1 : fDepth );
+            p3DObj->NbcSetLayer( pObj->GetLayer() );
+            p3DObj->SetItemSet( aSet );
+            if ( bIsPlaceholderObject )
+                aPlaceholderObjectList.push_back( p3DObj );
+            else if ( bUseTwoFillStyles )
+            {
+                Bitmap aFillBmp;
+                sal_Bool bFillBmpTile = ((XFillBmpTileItem&)p3DObj->GetItem( XATTR_FILLBMP_TILE )).GetValue();
+                if ( bFillBmpTile )
+                {
+                    const XFillBitmapItem& rBmpItm = (XFillBitmapItem&)p3DObj->GetItem( XATTR_FILLBITMAP );
+                    const XOBitmap& rXOBmp = rBmpItm.GetValue();
+                    aFillBmp = rXOBmp.GetBitmap();
+                    Size aLogicalSize = aFillBmp.GetPrefSize();
+                    if ( aFillBmp.GetPrefMapMode() == MAP_PIXEL )
+                        aLogicalSize = Application::GetDefaultDevice()->PixelToLogic( aLogicalSize, MAP_100TH_MM );
+                    else
+                        aLogicalSize = OutputDevice::LogicToLogic( aLogicalSize, aFillBmp.GetPrefMapMode(), MAP_100TH_MM );
+                    aLogicalSize.Width()  *= 5;         ;//             :-(     nice scaling, look at engine3d/obj3d.cxx
+                    aLogicalSize.Height() *= 5;
+                    aFillBmp.SetPrefSize( aLogicalSize );
+                    aFillBmp.SetPrefMapMode( MAP_100TH_MM );
+                    p3DObj->SetItem( XFillBitmapItem( String(), aFillBmp ) );
+                }
+                else
+                {
+                    Rectangle aBoundRect( rPolyPolygon.GetBoundRect() );
+                    if ( rSnapRect != aBoundRect )
+                    {
+                        const XFillBitmapItem& rBmpItm = (XFillBitmapItem&)p3DObj->GetItem( XATTR_FILLBITMAP );
+                        const XOBitmap& rXOBmp = rBmpItm.GetValue();
+                        aFillBmp = rXOBmp.GetBitmap();
+                        Size aBmpSize( aFillBmp.GetSizePixel() );
+                        double fXScale = (double)aBoundRect.GetWidth() / (double)rSnapRect.GetWidth();
+                        double fYScale = (double)aBoundRect.GetHeight() / (double)rSnapRect.GetHeight();
+
+                        Point aPt( (sal_Int32)( (double)( aBoundRect.Left() - rSnapRect.Left() )* (double)aBmpSize.Width() / (double)rSnapRect.GetWidth() ),
+                                            (sal_Int32)( (double)( aBoundRect.Top() - rSnapRect.Top() ) * (double)aBmpSize.Height() / (double)rSnapRect.GetHeight() ) );
+                        Size aSize( (sal_Int32)( aBmpSize.Width() * fXScale ),
+                                                (sal_Int32)( aBmpSize.Height() * fYScale ) );
+                        Rectangle aCropRect( aPt, aSize );
+                         aFillBmp.Crop( aCropRect );
+                        p3DObj->SetItem( XFillBitmapItem( String(), aFillBmp ) );
+                    }
+                }
+                pScene->Insert3DObj( p3DObj );
+                p3DObj = new E3dExtrudeObj( a3DDefaultAttr, pPath->GetPathPoly(), fDepth );
+                p3DObj->NbcSetLayer( pObj->GetLayer() );
+                p3DObj->SetItemSet( aSet );
+                p3DObj->SetItem( XFillStyleItem( XFILL_SOLID ) );
+                p3DObj->SetItem( Svx3DCloseFrontItem( sal_False ) );
+                p3DObj->SetItem( Svx3DCloseBackItem( sal_False ) );
+                pScene->Insert3DObj( p3DObj );
+                p3DObj = new E3dExtrudeObj( a3DDefaultAttr, pPath->GetPathPoly(), 1 );
+                p3DObj->NbcSetLayer( pObj->GetLayer() );
+                p3DObj->SetItemSet( aSet );
+                Matrix4D aFrontTransform( p3DObj->GetTransform() );
+                aFrontTransform.Translate( 0, 0, fDepth );
+                p3DObj->NbcSetTransform( aFrontTransform );
+                if ( ( eFillStyle == XFILL_BITMAP ) && !aFillBmp.IsEmpty() )
+                    p3DObj->SetItem( XFillBitmapItem( String(), aFillBmp ) );
+            }
+            else if ( eFillStyle == XFILL_NONE )
+            {
+                XLineColorItem& rLineColor = (XLineColorItem&)p3DObj->GetItem( XATTR_LINECOLOR );
+                p3DObj->SetItem( XFillColorItem( String(), rLineColor.GetValue() ) );
+                p3DObj->SetItem( Svx3DDoubleSidedItem( sal_True ) );
+                p3DObj->SetItem( Svx3DCloseFrontItem( sal_False ) );
+                p3DObj->SetItem( Svx3DCloseBackItem( sal_False ) );
+            }
+            pScene->Insert3DObj( p3DObj );
+            bSceneHasObjects = sal_True;
+        }
+        delete pNewObj;
+        pNext = NULL;
+        if ( pIter && pIter->IsMore() )
+            pNext = pIter->Next();
+    }
+    delete pIter;
+
+    if ( bSceneHasObjects ) // is the SdrObject properly converted
+    {
+        // then we can change the return value
+        pRet = pScene;
+
+        // Kameraeinstellungen, Perspektive ...
+        Camera3D& rCamera = (Camera3D&)pScene->GetCamera();
+        const Volume3D& rVolume = pScene->GetBoundVolume();
+        pScene->CorrectSceneDimensions();
+        pScene->NbcSetSnapRect( rSnapRect );
+
+        // InitScene replacement
+        double fW = rVolume.GetWidth();
+        double fH = rVolume.GetHeight();
+        double fCamZ = rVolume.MaxVec().Z() + ( ( fW + fH ) / 2.0 );
+
+        rCamera.SetAutoAdjustProjection( FALSE );
+        rCamera.SetViewWindow( -fW / 2, - fH / 2, fW, fH);
+        Vector3D aLookAt( 0.0, 0.0, 0.0 );
+        Vector3D aCamPos( 0.0, 0.0, 100.0 );
+
+        rCamera.SetDefaults( Vector3D( 0.0, 0.0, 100.0 ), aLookAt, 100.0 );
+        rCamera.SetPosAndLookAt( aCamPos, aLookAt );
+        rCamera.SetFocalLength( 1.0 );
+        rCamera.SetProjection( eProjectionType );
+        pScene->SetCamera( rCamera );
+        pScene->SetRectsDirty();
+
+        double fViewPointOriginX = ((double)((sal_Int32)rPropSet.GetPropertyValue( DFF_Prop_c3DOriginX, 32768 )) * rSnapRect.GetWidth()) / 65536.0;
+        double fViewPointOriginY = ((double)((sal_Int32)rPropSet.GetPropertyValue( DFF_Prop_c3DOriginY,-32768 )) * rSnapRect.GetHeight()) / 65536.0;
+
+        Matrix4D aNewTransform( pScene->GetTransform() );
+        Point aCenter( rSnapRect.Center() );
+        aNewTransform.Translate( -aCenter.X(), aCenter.Y(), -pScene->GetBoundVolume().GetDepth() );
+        double fXRotate = Fix16ToAngle( rPropSet.GetPropertyValue( DFF_Prop_c3DXRotationAngle, 0 ) );
+        double fYRotate = Fix16ToAngle( rPropSet.GetPropertyValue( DFF_Prop_c3DYRotationAngle, 0 ) );
+        double fZRotate = Fix16ToAngle( rPropSet.GetPropertyValue( DFF_Prop_Rotation, 0 ) );
+        if ( fZRotate != 0.0 )
+            aNewTransform.RotateZ( -fZRotate * F_PI180 );
+        if ( nSpFlags & SP_FFLIPH )
+            aNewTransform.ScaleX( -1 );
+        if ( nSpFlags & SP_FFLIPV )
+            aNewTransform.ScaleY( -1 );
+        if( fYRotate != 0.0 )
+            aNewTransform.RotateY( -fYRotate * F_PI180 );
+        if( fXRotate != 0.0 )
+            aNewTransform.RotateX( -fXRotate * F_PI180 );
+        if ( eProjectionType == PR_PARALLEL )
+        {
+            sal_Int32 nSkewAmount = rPropSet.GetPropertyValue( DFF_Prop_c3DSkewAmount, 50 );
+            if ( nSkewAmount )
+            {
+                sal_Int32 nSkewAngle = ((sal_Int32)rPropSet.GetPropertyValue( DFF_Prop_c3DSkewAngle,  -135 * 65536 ) ) >> 16;
+
+                double fAlpha( (double)nSkewAngle * F_PI180 );
+                double fInvTanBeta( (double)nSkewAmount / 100.0 );
+                if(fInvTanBeta)
+                {
+                    aNewTransform.ShearXY(
+                        fInvTanBeta * cos(fAlpha),
+                        fInvTanBeta * sin(fAlpha));
+                }
+            }
+        }
+        else
+        {
+            aNewTransform.Translate( -fViewPointOriginX, fViewPointOriginY, 0 );
+            // now set correct camera position
+            double fViewPointOriginX = ((double)((sal_Int32)rPropSet.GetPropertyValue( DFF_Prop_c3DOriginX, 32768 )) * rSnapRect.GetWidth()) / 65536.0;
+            double fViewPointOriginY = ((double)((sal_Int32)rPropSet.GetPropertyValue( DFF_Prop_c3DOriginY,-32768 )) * rSnapRect.GetHeight()) / 65536.0;
+            double fViewPointX = (double)((sal_Int32)rPropSet.GetPropertyValue( DFF_Prop_c3DXViewpoint, 1250000 )) / 360;
+            double fViewPointY = (double)((sal_Int32)rPropSet.GetPropertyValue( DFF_Prop_c3DYViewpoint,-1250000 )) / 360;
+            double fViewPointZ = (double)((sal_Int32)rPropSet.GetPropertyValue( DFF_Prop_c3DZViewpoint,-9000000 )) / 360;
+
+            Vector3D aLookAt( fViewPointX, -fViewPointY, 0 );
+            Vector3D aNewCamPos( fViewPointX, -fViewPointY, -fViewPointZ );
+            rCamera.SetPosAndLookAt( aNewCamPos, aLookAt );
+            pScene->SetCamera( rCamera );
+        }
+        pScene->NbcSetTransform( aNewTransform );
+        pScene->FitSnapRectToBoundVol();
+
+        ///////////
+        // light //
+        ///////////
+        double fAmbientIntensity = ((double)rPropSet.GetPropertyValue( DFF_Prop_c3DAmbientIntensity, 22178 )) / 65536.0;
+
+        sal_Int32 nLightX = ((sal_Int32)rPropSet.GetPropertyValue( DFF_Prop_c3DKeyX, 50000 )) / 360;
+        sal_Int32 nLightY = - ((sal_Int32)rPropSet.GetPropertyValue( DFF_Prop_c3DKeyY, 0 )) / 360;
+        sal_Int32 nLightZ = - ((sal_Int32)rPropSet.GetPropertyValue( DFF_Prop_c3DKeyZ, 10000 )) / 360;
+        if ( !nLightZ )
+            nLightZ = 1;
+        double fLightIntensity = ((double)rPropSet.GetPropertyValue( DFF_Prop_c3DKeyIntensity, 43712 )) / 65536.0;
+        sal_Bool bLightHarsh = ( rPropSet.GetPropertyValue( DFF_Prop_fc3DFillHarsh, 0 ) & 2 ) != 0;
+
+        sal_Int32 nLight2X = ((sal_Int32)rPropSet.GetPropertyValue( DFF_Prop_c3DFillX, -50000 )) / 360;
+        sal_Int32 nLight2Y = - ((sal_Int32)rPropSet.GetPropertyValue( DFF_Prop_c3DFillY, 0 )) / 360;
+        sal_Int32 nLight2Z = - ((sal_Int32)rPropSet.GetPropertyValue( DFF_Prop_c3DFillZ, 10000 )) / 360;
+        if ( !nLight2Z )
+            nLight2Z = -1;
+        double fLight2Intensity = ((double)rPropSet.GetPropertyValue( DFF_Prop_c3DFillIntensity, 43712 )) / 65536.0;
+        sal_Bool bLight2Harsh = ( rPropSet.GetPropertyValue( DFF_Prop_fc3DFillHarsh, 0 ) & 1 ) != 0;
+        sal_Bool bLightFace = ( rPropSet.GetPropertyValue( DFF_Prop_fc3DLightFace, 0 ) & 1 ) != 0;
+
+        sal_uInt16 nAmbientColor = (sal_uInt16)( fAmbientIntensity * 255.0 );
+        if ( nAmbientColor > 255 )
+            nAmbientColor = 255;
+        Color aGlobalAmbientColor( (sal_uInt8)nAmbientColor, (sal_uInt8)nAmbientColor, (sal_uInt8)nAmbientColor );
+        pScene->SetItem( Svx3DAmbientcolorItem( aGlobalAmbientColor ) );
+
+        sal_uInt8 nSpotLight1 = (sal_uInt8)( fLightIntensity * 255.0 );
+        Vector3D aSpotLight1( (double)nLightX, (double)nLightY, (double)nLightZ );
+        aSpotLight1.Normalize();
+        pScene->SetItem( Svx3DLightOnOff1Item( sal_True ) );
+        Color aAmbientSpot1Color( nSpotLight1, nSpotLight1, nSpotLight1 );
+        pScene->SetItem( Svx3DLightcolor1Item( aAmbientSpot1Color ) );
+        pScene->SetItem( Svx3DLightDirection1Item( aSpotLight1 ) );
+
+        sal_uInt8 nSpotLight2 = (sal_uInt8)( fLight2Intensity * 255.0 );
+        Vector3D aSpotLight2( (double)nLight2X, (double)nLight2Y, (double)nLight2Z );
+        aSpotLight2.Normalize();
+        pScene->SetItem( Svx3DLightOnOff2Item( sal_True ) );
+        Color aAmbientSpot2Color( nSpotLight2, nSpotLight2, nSpotLight2 );
+        pScene->SetItem( Svx3DLightcolor2Item( aAmbientSpot2Color ) );
+        pScene->SetItem( Svx3DLightDirection2Item( aSpotLight2 ) );
+
+        if ( nLightX || nLightY )
+        {
+            sal_uInt8 nSpotLight3 = 70;
+            Vector3D aSpotLight3( 0, 0, 1 );
+            pScene->SetItem( Svx3DLightOnOff3Item( sal_True ) );
+            Color aAmbientSpot3Color( nSpotLight3, nSpotLight3, nSpotLight3 );
+            pScene->SetItem( Svx3DLightcolor3Item( aAmbientSpot3Color ) );
+            pScene->SetItem( Svx3DLightDirection3Item( aSpotLight3 ) );
+        }
+
+        double fSpecular = ((double)rPropSet.GetPropertyValue( DFF_Prop_c3DSpecularAmt, 0 )) / 65536.0;
+        double fDiffuse = ((double)rPropSet.GetPropertyValue( DFF_Prop_c3DDiffuseAmt, 0 )) / 65536.0;
+        double fShininess = ((double)rPropSet.GetPropertyValue( DFF_Prop_c3DShininess, 0 )) / 65536.0;
+
+        sal_uInt16 nItensity = 25;
+        Color aSpecularCol( COL_BLACK );
+        if ( fSpecular == 0.0 )
+        {
+            aSpecularCol = Color( 51, 51, 51 );
+        }
+        else if ( fSpecular > 1.2 )
+        {
+            aSpecularCol = Color( 128, 128, 128 );
+        }
+        pScene->SetItem( Svx3DMaterialSpecularItem( aSpecularCol ) );
+        pScene->SetItem( Svx3DMaterialSpecularIntensityItem( nItensity ) );
+
+        pScene->SetModel( pObj->GetModel() );
+        pScene->InitTransformationSet();
+        pRet->SetSnapRect( CalculateNewSnapRect( rSnapRect, rPropSet ) );
+
+        // removing placeholder objects
+        std::vector< E3dCompoundObject* >::iterator aObjectListIter( aPlaceholderObjectList.begin() );
+        while ( aObjectListIter != aPlaceholderObjectList.end() )
+        {
+            pScene->Remove3DObj( *aObjectListIter );
+            delete *aObjectListIter++;
+        }
+    }
+    else
+        delete pScene;
+    return pRet;
+}
+
+Rectangle SvxMSDffAutoShape3D::CalculateNewSnapRect( const Rectangle& rOriginalSnapRect, const DffPropSet& rPropSet )
+{
+    const Point aCenter( rOriginalSnapRect.Center() );
+
+    double fExtrusionBackward = (double)((sal_Int32)rPropSet.GetPropertyValue( DFF_Prop_c3DExtrudeBackward, 457200 )) / 360.0;
+    double fExtrusionForward  = (double)((sal_Int32)rPropSet.GetPropertyValue( DFF_Prop_c3DExtrudeForward, 0 )) / 360.0;
+
+    sal_uInt16 i;
+
+    // creating initial bound volume ( without rotation. skewing.and camera )
+    Polygon3D aBoundVolume( 8 );
+    const Polygon aPolygon( rOriginalSnapRect );
+    for ( i = 0; i < 4; i++ )
+    {
+        aBoundVolume[ i ].X() = aPolygon[ i ].X() - aCenter.X();
+        aBoundVolume[ i ].Y() = aPolygon[ i ].Y() - aCenter.Y();
+        aBoundVolume[ i ].Z()  = fExtrusionForward;
+        aBoundVolume[ i + 4 ].X()  = aPolygon[ i ].X() - aCenter.X();
+        aBoundVolume[ i + 4 ].Y()  = aPolygon[ i ].Y() - aCenter.Y();
+        aBoundVolume[ i + 4 ].Z()  = fExtrusionBackward;
+    }
+
+    Point3D aRotateCenter;
+    aRotateCenter.X() = 0.0;
+    aRotateCenter.Y() = 0.0;
+    aRotateCenter.W() = rPropSet.GetPropertyValue( DFF_Prop_c3DRotationCenterZ, 0 ) / 360;
+
+    // double XCenterInGUnits = rPropSet.GetPropertyValue( DFF_Prop_c3DRotationCenterX, 0 );
+    // double YCenterInGUnits = rPropSet.GetPropertyValue( DFF_Prop_c3DRotationCenterY, 0 );
+
+    // sal_Int32 nRotationXAxisInProz = rPropSet.GetPropertyValue( DFF_Prop_c3DRotationAxisX, 100 );
+    // sal_Int32 nRotationYAxisInProz = rPropSet.GetPropertyValue( DFF_Prop_c3DRotationAxisY, 0 );
+    // sal_Int32 nRotationZAxisInProz = rPropSet.GetPropertyValue( DFF_Prop_c3DRotationAxisZ, 0 );
+
+    double fXRotate = Fix16ToAngle( rPropSet.GetPropertyValue( DFF_Prop_c3DXRotationAngle, 0 ) ) * F_PI180;
+    double fYRotate = Fix16ToAngle( rPropSet.GetPropertyValue( DFF_Prop_c3DYRotationAngle, 0 ) ) * F_PI180;
+    double fZRotate = -Fix16ToAngle( rPropSet.GetPropertyValue( DFF_Prop_Rotation, 0 ) ) * F_PI180;
+    // double fRotationAngle = Fix16ToAngle( rPropSet.GetPropertyValue( DFF_Prop_c3DRotationAngle, 0 ) );       // * F_PI180;
+
+    for( i = 0; i < 8; i++ )        // rotating bound volume
+    {
+        Vector3D& rPoint = aBoundVolume[ i ];
+        rPoint.X() -= aRotateCenter.X();
+        rPoint.Y() -= aRotateCenter.Y();
+        rPoint.Z() -= aRotateCenter.W();
+        Rotate( rPoint, fXRotate, fYRotate, fZRotate );
+        rPoint.X() += aRotateCenter.X();
+        rPoint.Y() += aRotateCenter.Y();
+        rPoint.Z() += aRotateCenter.W();
+    }
+    Transformation2D aTransformation2D( rPropSet, rOriginalSnapRect );
+    if ( aTransformation2D.IsParallel() )
+        aTransformation2D.ApplySkewSettings( aBoundVolume );
+
+    Polygon aTransformed( 8 );
+    for ( i = 0; i < 8; i++ )
+        aTransformed[ i ] = aTransformation2D.Transform2D( aBoundVolume[ i ] );
+    return aTransformed.GetBoundRect();
+}
diff --git a/svx/source/msfilter/msashape3d.hxx b/svx/source/msfilter/msashape3d.hxx
new file mode 100644
index 000000000000..bde0a41f94fe
--- /dev/null
+++ b/svx/source/msfilter/msashape3d.hxx
@@ -0,0 +1,114 @@
+/*************************************************************************
+ *
+ *  $RCSfile: msashape3d.hxx,v $
+ *
+ *  $Revision: 1.2 $
+ *
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:41 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  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., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2002 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#ifndef _MSASHAPE3D_HXX
+#define _MSASHAPE3D_HXX
+
+#ifndef _MSDFFIMP_HXX
+#include <msdffimp.hxx>
+#endif
+#include <vector>
+#include <poly3d.hxx>
+#include <goodies/point3d.hxx>
+
+class SvxMSDffAutoShape3D
+{
+    class Transformation2D
+    {
+        Point       aCenter;
+        sal_Bool    bParallel;
+
+        // parallel projection
+        double      fSkewAngle;
+        sal_Int32   nSkewAmount;    // in percent
+
+        // perspective projection
+        double      fZScreen;
+        Point3D     fViewPoint;
+        double      fViewPointOriginX;
+        double      fViewPointOriginY;
+
+        public :
+
+                        Transformation2D( const DffPropSet& rPropSet, const Rectangle& rSnapRect );
+
+            void        ApplySkewSettings( Polygon3D& rPolyPoly3D );
+            Point       Transform2D( const Vector3D& rPoint );
+            sal_Bool    IsParallel() const { return bParallel; };
+    };
+
+    friend class Transformation2D;
+
+    protected :
+
+        static void Rotate( Vector3D& rPoint, const double x, const double y, const double z );
+        static void Rotate( PolyPolygon3D&, const Point3D& rRotateCenter, const double x, const double y, const double z );
+        static double Fix16ToAngle( sal_Int32 nFixAngle );
+        static Rectangle CalculateNewSnapRect( const Rectangle& rOriginalSnapRect, const DffPropSet& );
+
+    public :
+
+        static SdrObject*       Create3DObject( const SdrObject* pSource, const DffPropSet&,
+                                    SfxItemSet&, Rectangle& rSnapRect, sal_uInt32 nSpFlags );
+};
+
+#endif
+
diff --git a/svx/source/msfilter/msdffimp.cxx b/svx/source/msfilter/msdffimp.cxx
index bd01389cd9ca..ff601e31d154 100644
--- a/svx/source/msfilter/msdffimp.cxx
+++ b/svx/source/msfilter/msdffimp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: msdffimp.cxx,v $
  *
- *  $Revision: 1.70 $
+ *  $Revision: 1.71 $
  *
- *  last change: $Author: sj $ $Date: 2002-12-11 14:36:25 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -67,8 +67,8 @@
 #ifndef _SOLAR_H
 #include <tools/solar.h>               // UINTXX
 #endif
-#ifndef _TOOLS_SOLMATH_HXX
-#include <tools/solmath.hxx>
+#ifndef INCLUDED_RTL_MATH_HXX
+#include <rtl/math.hxx>
 #endif
 
 #pragma hdrstop
@@ -114,6 +114,21 @@
 #ifndef _UNOTOOLS_LOCALFILEHELPER_HXX
 #include <unotools/localfilehelper.hxx>
 #endif
+#ifndef _SVX_ESCHEREX_HXX
+#include <escherex.hxx>
+#endif
+#ifndef _COM_SUN_STAR_CONTAINER_XIDENTIFIERCONTAINER_HPP_
+#include <com/sun/star/container/XIdentifierContainer.hpp>
+#endif
+#ifndef _COM_SUN_STAR_DRAWING_XGLUEPOINTSSUPPLIER_HPP_
+#include <com/sun/star/drawing/XGluePointsSupplier.hpp>
+#endif
+#ifndef _COM_SUN_STAR_DRAWING_GLUEPOINT2_HPP_
+#include <com/sun/star/drawing/GluePoint2.hpp>
+#endif
+#ifndef _COM_SUN_STAR_DRAWING_XSHAPES_HPP_
+#include <com/sun/star/drawing/XShapes.hpp>
+#endif
 #ifndef _FILTER_HXX //autogen
 #include <svtools/filter.hxx>
 #endif
@@ -275,14 +290,15 @@
 #include "impgrf.hxx"
 #endif
 
-#define _MSDFFIMP_CXX
-
 #ifndef _MSDFFIMP_HXX
 #include "msdffimp.hxx" // extern sichtbare Header-Datei
 #endif
 #ifndef _MSASHAPE_HXX
 #include "msashape.hxx"
 #endif
+#ifndef _MSASHAPE3D_HXX
+#include "msashape3d.hxx"
+#endif
 #ifndef _GALLERY_HXX_
 #include "gallery.hxx"
 #endif
@@ -309,6 +325,12 @@
 using namespace vos;
 #endif
 
+using namespace ::com::sun::star    ;
+using namespace uno                 ;
+using namespace beans               ;
+using namespace drawing             ;
+using namespace container           ;
+
 #define ITEMVALUE(ItemSet,Id,Cast)  ((const Cast&)(ItemSet).Get(Id)).GetValue()
 
 // static counter for OLE-Objects
@@ -791,6 +813,237 @@ DffPropertyReader::~DffPropertyReader()
     delete pDefaultPropSet;
 }
 
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+SvStream& operator>>( SvStream& rIn, SvxMSDffConnectorRule& rRule )
+{
+    rIn >> rRule.nRuleId
+        >> rRule.nShapeA
+        >> rRule.nShapeB
+        >> rRule.nShapeC
+        >> rRule.ncptiA
+        >> rRule.ncptiB;
+
+    return rIn;
+}
+
+SvxMSDffSolverContainer::SvxMSDffSolverContainer()
+{
+}
+
+SvxMSDffSolverContainer::~SvxMSDffSolverContainer()
+{
+    for ( SvxMSDffConnectorRule* pPtr = (SvxMSDffConnectorRule*)aCList.First();
+            pPtr; pPtr = (SvxMSDffConnectorRule*)aCList.Next() )
+        delete pPtr;
+}
+
+SvStream& operator>>( SvStream& rIn, SvxMSDffSolverContainer& rContainer )
+{
+    DffRecordHeader aHd;
+    rIn >> aHd;
+    if ( aHd.nRecType == DFF_msofbtSolverContainer )
+    {
+        DffRecordHeader aCRule;
+        while ( ( rIn.GetError() == 0 ) && ( rIn.Tell() < aHd.GetRecEndFilePos() ) )
+        {
+            rIn >> aCRule;
+            if ( aCRule.nRecType == DFF_msofbtConnectorRule )
+            {
+                SvxMSDffConnectorRule* pRule = new SvxMSDffConnectorRule;
+                rIn >> *pRule;
+                rContainer.aCList.Insert( pRule, LIST_APPEND );
+            }
+            aCRule.SeekToEndOfRecord( rIn );
+        }
+    }
+    return rIn;
+}
+
+void SvxMSDffManager::SolveSolver( const SvxMSDffSolverContainer& rSolver )
+{
+    sal_Int32 i, nCount;
+    for ( i = 0, nCount = rSolver.aCList.Count(); i < nCount; i++ )
+    {
+        SvxMSDffConnectorRule* pPtr = (SvxMSDffConnectorRule*)rSolver.aCList.GetObject( i );
+        if ( pPtr->pCObj )
+        {
+            for ( int nN = 0; nN < 2; nN++ )
+            {
+                SdrObject*  pO;
+                sal_uInt32  nC, nSpFlags;
+                sal_Bool    bTail;
+                if ( !nN )
+                {
+                    bTail = sal_True;
+                    pO = pPtr->pAObj;
+                    nC = pPtr->ncptiA;
+                    nSpFlags = pPtr->nSpFlagsA;
+                }
+                else
+                {
+                    bTail = sal_False;
+                    pO = pPtr->pBObj;
+                    nC = pPtr->ncptiB;
+                    nSpFlags = pPtr->nSpFlagsB;
+                }
+                if ( pO )
+                {
+                    Any aAny;
+                    SdrGluePoint aGluePoint;
+                    Reference< XShape > aXShape( pO->getUnoShape(), UNO_QUERY );
+                    Reference< XShape > aXConnector( pPtr->pCObj->getUnoShape(), UNO_QUERY );
+                    SdrGluePointList* pList = pO->ForceGluePointList();
+
+                    sal_Bool bValidGluePoint = sal_False;
+                    sal_Int32 nId = nC;
+                    sal_uInt32 nInventor = pO->GetObjInventor();
+
+                    if( nInventor == SdrInventor )
+                    {
+                        if ( pList && ( pList->GetCount() > nC ) )
+                        {
+                            bValidGluePoint = sal_True;
+                            nId = (sal_Int32)((*pList)[ (sal_uInt16)nC].GetId() + 4 );
+                        }
+                        else
+                        {
+                            sal_uInt32 nObjId = pO->GetObjIdentifier();
+                            switch( nObjId )
+                            {
+                                case OBJ_GRUP :
+                                case OBJ_GRAF :
+                                case OBJ_RECT :
+                                case OBJ_TEXT :
+                                case OBJ_PAGE :
+                                case OBJ_TEXTEXT :
+                                case OBJ_wegFITTEXT :
+                                case OBJ_wegFITALLTEXT :
+                                case OBJ_TITLETEXT :
+                                case OBJ_OUTLINETEXT :
+                                {
+                                    if ( nC & 1 )
+                                    {
+                                        if ( nSpFlags & SP_FFLIPH )
+                                            nC ^= 2;    // 1 <-> 3
+                                    }
+                                    else
+                                    {
+                                        if ( nSpFlags & SP_FFLIPV )
+                                            nC ^= 1;    // 0 <-> 2
+                                    }
+                                    switch( nC )
+                                    {
+                                        case 0 :
+                                            nId = 0;    // SDRVERTALIGN_TOP;
+                                        break;
+                                        case 1 :
+                                            nId = 3;    // SDRHORZALIGN_RIGHT;
+                                        break;
+                                        case 2 :
+                                            nId = 2;    // SDRVERTALIGN_BOTTOM;
+                                        break;
+                                        case 3 :
+                                            nId = 1; // SDRHORZALIGN_LEFT;
+                                        break;
+                                    }
+                                    if ( nId <= 3 )
+                                        bValidGluePoint = sal_True;
+                                }
+                                break;
+                                case OBJ_POLY :
+                                case OBJ_PLIN :
+                                case OBJ_LINE :
+                                case OBJ_PATHLINE :
+                                case OBJ_PATHFILL :
+                                case OBJ_FREELINE :
+                                case OBJ_FREEFILL :
+                                case OBJ_SPLNLINE :
+                                case OBJ_SPLNFILL :
+                                case OBJ_PATHPOLY :
+                                case OBJ_PATHPLIN :
+                                {
+                                    sal_Bool bNotFound = sal_True;
+
+                                    PolyPolygon aPolyPoly( EscherPropertyContainer::GetPolyPolygon( aXShape ) );
+                                    sal_uInt16 i, j, nPolySize = aPolyPoly.Count();
+                                    if ( nPolySize )
+                                    {
+                                        sal_uInt32  nPointCount = 0;
+                                        Rectangle aBoundRect( aPolyPoly.GetBoundRect() );
+                                        if ( aBoundRect.GetWidth() && aBoundRect.GetHeight() )
+                                        {
+                                            for ( i = 0; bNotFound && ( i < nPolySize ); i++ )
+                                            {
+                                                const Polygon& rPolygon = aPolyPoly.GetObject( i );
+                                                for ( j = 0; bNotFound && ( j < rPolygon.GetSize() ); j++ )
+                                                {
+                                                    PolyFlags eFlags = rPolygon.GetFlags( j );
+                                                    if ( eFlags == POLY_NORMAL )
+                                                    {
+                                                        if ( nC == nPointCount )
+                                                        {
+                                                            const Point& rPoint = rPolygon.GetPoint( j );
+                                                            double fXRel = rPoint.X() - aBoundRect.Left();
+                                                            double fYRel = rPoint.Y() - aBoundRect.Top();
+                                                            fXRel = fXRel / aBoundRect.GetWidth() * 10000;
+                                                            fYRel = fYRel / aBoundRect.GetHeight() * 10000;
+                                                            aGluePoint.SetPos( Point( (sal_Int32)fXRel, (sal_Int32)fYRel ) );
+                                                            aGluePoint.SetPercent( sal_True );
+                                                            aGluePoint.SetAlign( SDRVERTALIGN_TOP | SDRHORZALIGN_LEFT );
+                                                            aGluePoint.SetEscDir( SDRESC_SMART );
+                                                            nId = (sal_Int32)((*pList)[ pList->Insert( aGluePoint ) ].GetId() + 4 );
+                                                            bNotFound = sal_False;
+                                                        }
+                                                        nPointCount++;
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                    if ( !bNotFound )
+                                    {
+                                        bValidGluePoint = sal_True;
+                                    }
+                                }
+                                break;
+                            }
+                        }
+                        if ( bValidGluePoint )
+                        {
+                            Reference< XPropertySet > xPropSet( aXConnector, UNO_QUERY );
+                            if ( xPropSet.is() )
+                            {
+                                if ( nN )
+                                {
+                                    String aPropName( RTL_CONSTASCII_USTRINGPARAM( "EndShape" ) );
+                                    aAny <<= aXShape;
+                                    SetPropValue( aAny, xPropSet, aPropName, sal_True );
+                                    aPropName  = String( RTL_CONSTASCII_USTRINGPARAM( "EndGluePointIndex" ) );
+                                    aAny <<= nId;
+                                    SetPropValue( aAny, xPropSet, aPropName, sal_True );
+                                }
+                                else
+                                {
+                                    String aPropName( RTL_CONSTASCII_USTRINGPARAM( "StartShape" ) );
+                                    aAny <<= aXShape;
+                                    SetPropValue( aAny, xPropSet, aPropName, sal_True );
+                                    aPropName = String( RTL_CONSTASCII_USTRINGPARAM( "StartGluePointIndex" ) );
+                                    aAny <<= nId;
+                                    SetPropValue( aAny, xPropSet, aPropName, sal_True );
+                                }
+                                pO->SendRepaintBroadcast();
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
 static void GetLineArrow( const sal_Int32 nLineWidth, const MSO_LineEnd eLineEnd,
                             const MSO_LineEndWidth eLineWidth, const MSO_LineEndLength eLineLenght,
                                 sal_Int32& rnArrowWidth, XPolygon& rXPoly, sal_Bool& rbArrowCenter,
@@ -1075,7 +1328,7 @@ void DffPropertyReader::ApplyAttributes( SvStream& rIn, SfxItemSet& rSet, SdrObj
             double nTrans = GetPropertyValue(DFF_Prop_lineOpacity, 0x10000);
             nTrans = (nTrans * 100) / 65536;
             rSet.Put(XLineTransparenceItem(
-                sal_uInt16(100 - SolarMath::Round(nTrans))));
+                sal_uInt16(100 - ::rtl::math::round(nTrans))));
         }
 
         rManager.ScaleEmu( nLineWidth );
@@ -1174,7 +1427,7 @@ void DffPropertyReader::ApplyAttributes( SvStream& rIn, SfxItemSet& rSet, SdrObj
             double nTrans = GetPropertyValue(DFF_Prop_fillOpacity);
             nTrans = (nTrans * 100) / 65536;
             rSet.Put(XFillTransparenceItem(
-                sal_uInt16(100 - SolarMath::Round(nTrans))));
+                sal_uInt16(100 - ::rtl::math::round(nTrans))));
         }
 
         if ( eXFill == XFILL_GRADIENT )
@@ -1243,8 +1496,6 @@ void DffPropertyReader::ApplyAttributes( SvStream& rIn, SfxItemSet& rSet, SdrObj
         }
         else if ( eXFill == XFILL_BITMAP )
         {
-            ULONG nWdt = GetPropertyValue( DFF_Prop_fillWidth, 0 );
-            ULONG nHgt = GetPropertyValue( DFF_Prop_fillHeight, 0 );
             if( IsProperty( DFF_Prop_fillBlip ) )
             {
                 Graphic aGraf;
@@ -1290,12 +1541,20 @@ void DffPropertyReader::ApplyAttributes( SvStream& rIn, SfxItemSet& rSet, SdrObj
                         }
                         rSet.Put( XFillBitmapItem( String(), aXOBitmap ) );
                     }
+                    else if ( eMSO_FillType == mso_fillTexture )
+                    {
+                        XOBitmap aXBmp( aBmp, XBITMAP_STRETCH );
+                        rSet.Put( XFillBmpTileItem( sal_True ) );
+                        rSet.Put( XFillBitmapItem( String(), aXBmp ) );
+                        rSet.Put( XFillBmpSizeXItem( GetPropertyValue( DFF_Prop_fillWidth, 0 ) / 360 ) );
+                        rSet.Put( XFillBmpSizeYItem( GetPropertyValue( DFF_Prop_fillHeight, 0 ) / 360 ) );
+                        rSet.Put( XFillBmpSizeLogItem( sal_True ) );
+                    }
                     else
                     {
                         XOBitmap aXBmp( aBmp, XBITMAP_STRETCH );
                         rSet.Put( XFillBitmapItem( String(), aXBmp ) );
-                        if ( eMSO_FillType == mso_fillPicture )
-                            rSet.Put( XFillBmpTileItem( FALSE ) );
+                        rSet.Put( XFillBmpTileItem( sal_False ) );
                     }
                 }
             }
@@ -2204,411 +2463,11 @@ void SvxMSDffManager::MSDFFReadZString( SvStream& rIn, String& rStr,
         rStr.Erase();
 }
 
-static void Apply3dObjectRotation( E3dScene* pScene, sal_Int32 nXRotate, sal_Int32 nYRotate )
-{
-    // ## 3D changes
-    // create transformation for 3d object (rotation around
-    // Y-Axis, but aligned to front face)
-    Matrix4D aNewTransform;
-    const Volume3D& rVolume = pScene->GetBoundVolume();
-    const Matrix4D& rOldTransform = pScene->GetTransform();
-    Vector3D aObjCenter = pScene->GetCenter();
-
-    aNewTransform.Translate(-aObjCenter.X(), -aObjCenter.Y(), -rVolume.GetDepth());
-    if( nYRotate )
-        aNewTransform.RotateY((double)nYRotate * nPi180);
-    if( nXRotate )
-        aNewTransform.RotateX( (double)nXRotate * nPi180 );
-    aNewTransform.Translate(aObjCenter.X(), aObjCenter.Y(), rVolume.GetDepth());
-    pScene->SetTransform(aNewTransform * rOldTransform);
-}
-
-
-static void Apply3dSkewSettings( Camera3D& rCamera, E3dScene* pScene, sal_Int32 nSkewAmount, sal_Int32 nSkewAngle, double& fDepth )
-{
-
-    Rectangle aOldSnap( pScene->GetSnapRect() );
-
-    double fCaMX = 0.0;
-    double fCaMY = 0.0;
-
-    if ( nSkewAmount )
-    {
-        nSkewAngle %= 360;
-        if ( nSkewAngle < 0 )
-            nSkewAngle = 360 + nSkewAngle;
-
-        fCaMX = (double)aOldSnap.GetWidth() / 2;
-        fCaMY = (double)aOldSnap.GetHeight() / 2;
-
-        fCaMX += fDepth;
-        fCaMY += fDepth;
-
-        if ( nSkewAngle < 45 )
-        {
-            fCaMX *= -1.0;
-            fCaMY = 0.0;
-        }
-        else if ( nSkewAngle < 90 )
-        {
-            fCaMX *= -1.0;
-            fCaMY *= -1.0;
-        }
-        else if ( nSkewAngle < 135 )
-        {
-            fCaMX = 0.0;
-            fCaMY *= -1.0;
-        }
-        else if ( nSkewAngle < 180 )
-        {
-            fCaMY *= -1.0;
-        }
-        else if ( nSkewAngle < 225 )
-        {
-            fCaMY = 0.0;
-        }
-        else if ( nSkewAngle < 270 )
-        {
-            // default;
-        }
-        else if ( nSkewAngle < 315 )
-        {
-            fCaMX = 0.0;
-        }
-        else
-        {
-            fCaMX *= -1;
-        }
-    }
-    // ## 3D changes
-    Vector3D aNewCamPos( fCaMX, fCaMY, fDepth );
-    Vector3D aNewLookAt( fCaMX, fCaMY, 0 );
-    rCamera.SetPosAndLookAt( aNewCamPos, aNewLookAt );
-
-    pScene->SetCamera( rCamera );
-    pScene->FitSnapRectToBoundVol();
-    Rectangle aModifiedSnap( pScene->GetSnapRect() );
-    Point aPos( aOldSnap.TopLeft() );
-    if ( fCaMX < 0.0 )
-        aPos.X() -= ( aModifiedSnap.GetWidth() - aOldSnap.GetWidth() );
-    if ( fCaMY > 0.0 )
-        aPos.Y() -= ( aModifiedSnap.GetHeight() - aOldSnap.GetHeight() );
-    Rectangle aNewSnap( aPos, aModifiedSnap.GetSize() );
-    pScene->SetSnapRect( aNewSnap );
-}
-
-SdrObject* SvxMSDffManager::Import3DObject( SdrObject* pRet, SfxItemSet& aSet, Rectangle& aBoundRect, BOOL bIsAutoText ) const
-{
-    // pRet Umwandeln in Szene mit 3D Objekt
-    E3dDefaultAttributes a3DDefaultAttr;
-    a3DDefaultAttr.SetDefaultLatheCharacterMode( TRUE );
-    a3DDefaultAttr.SetDefaultExtrudeCharacterMode( TRUE );
-
-    E3dScene* pScene = new E3dPolyScene( a3DDefaultAttr );
-    double fDepth = 1270.0;
-    BOOL bSceneHasObjects( FALSE );
-
-    if( pRet->IsGroupObject() )
-    {
-        SdrObjListIter aIter( *pRet, IM_DEEPWITHGROUPS );
-        while( aIter.IsMore() )
-        {
-            SdrObject* pPartObj = aIter.Next();
-            SdrObject* pNewObj = pPartObj->ConvertToPolyObj( FALSE, FALSE );
-            SdrPathObj* pPath = PTR_CAST( SdrPathObj, pNewObj );
-
-            if( pPath )
-            {
-                E3dCompoundObject* p3DObj = new E3dExtrudeObj( a3DDefaultAttr, pPath->GetPathPoly(), fDepth );
-                p3DObj->NbcSetLayer( pRet->GetLayer() );
-                aSet.Put( XLineStyleItem( XLINE_NONE ) );   // ... aber keine Linien
-                // Feststellen, ob ein FILL_Attribut gesetzt ist.
-                // Falls nicht, Fuellattribut hart setzen
-                XFillStyle eFillStyle = ITEMVALUE( aSet, XATTR_FILLSTYLE, XFillStyleItem );
-                if ( eFillStyle == XFILL_NONE )
-                    aSet.Put( XFillStyleItem( XFILL_SOLID ) );
-                pScene->Insert3DObj( p3DObj );
-                bSceneHasObjects = TRUE;
-            }
-            delete pNewObj; // Aufraeumen
-        }
-    }
-    else
-    {
-        sal_Bool bHasFillStyle = ( GetPropertyValue( DFF_Prop_fNoFillHitTest ) & 0x10 ) != 0;
-        sal_Bool bHasLineStyle = ( GetPropertyValue( DFF_Prop_fNoLineDrawDash ) & 8 ) != 0;
-
-        if ( bHasFillStyle || bHasLineStyle )
-        {
-            SdrObject* pNewObj = pRet->ConvertToPolyObj( FALSE, FALSE );
-            SdrPathObj* pPath = PTR_CAST( SdrPathObj, pNewObj );
-
-            if ( pPath )
-            {
-                E3dCompoundObject* p3DObj = new E3dExtrudeObj( a3DDefaultAttr, pPath->GetPathPoly(), fDepth );
-                p3DObj->NbcSetLayer( pRet->GetLayer() );
-                aSet.Put( XLineStyleItem( XLINE_NONE ) );// ... aber keine Linien
-                if ( !bHasFillStyle )
-                    aSet.Put( XFillStyleItem( XFILL_SOLID ) );
-                pScene->Insert3DObj( p3DObj );
-                bSceneHasObjects = TRUE;
-            }
-            delete pNewObj; // Aufraeumen
-        }
-    }
-
-    // Hat das Umwandeln geklappt?
-    if ( bSceneHasObjects )
-    {
-        // Returnwert aendern
-        delete pRet;
-        pRet = pScene;
-
-        aSet.Put( Svx3DPercentDiagonalItem( 1 ) );
-        aSet.Put( Svx3DShadeModeItem( 0 ) );
-        pScene->SetItemSet(aSet);
-
-        // Kameraeinstellungen, Perspektive ...
-        sal_Int32 nVal;
-        Camera3D& rCamera = (Camera3D&)pScene->GetCamera();
-        const Volume3D& rVolume = pScene->GetBoundVolume();
-        Point aCenter = aBoundRect.Center();
-        Matrix4D aMatrix;
-        // 3D-Objekt auf die Mitte des Gesamtrechtecks zentrieren
-        aMatrix.Translate( Vector3D( -aCenter.X(), aCenter.Y(), 0.0 ) );
-        pScene->SetTransform(aMatrix * pScene->GetTransform());
-        pScene->CorrectSceneDimensions();
-        pScene->NbcSetSnapRect( aBoundRect );
-
-        // InitScene replacement
-        double fW = rVolume.GetWidth();
-        double fH = rVolume.GetHeight();
-        double fCamZ = rVolume.MaxVec().Z() + ( ( fW + fH ) / 2.0 );
-
-        rCamera.SetAutoAdjustProjection( FALSE );
-        rCamera.SetViewWindow( -fW / 2, - fH / 2, fW, fH);
-        Vector3D aLookAt( 0.0, 0.0, 0.0 );
-        Vector3D aCamPos( 0.0, 0.0, 100.0 );
-
-        rCamera.SetDefaults( Vector3D( 0.0, 0.0, 100.0 ), aLookAt, 100.0 );
-        rCamera.SetPosAndLookAt( aCamPos, aLookAt );
-        rCamera.SetFocalLength( 100.0 );
-
-        // Default: non perspective
-//      rCamera.SetProjection( GetPropertyValue( DFF_Prop_fc3DFillHarsh, 0 ) & 4 ? PR_PARALLEL : PR_PERSPECTIVE );
-
-        // always set perspective mode because otherwise the camera positioning that reflects
-        // the skewangle will not work properly
-        rCamera.SetProjection( PR_PERSPECTIVE );
-        pScene->SetCamera( rCamera );
-
-        pScene->SetRectsDirty();
-
-        // Merker fuer Kameraaenderungen
-
-        if ( IsProperty( DFF_Prop_c3DRenderMode ) )
-        {
-            MSO_3DRenderMode eRenderMode = (MSO_3DRenderMode)GetPropertyValue( DFF_Prop_c3DRenderMode, 0 );
-            if ( eRenderMode == mso_Wireframe )
-            {
-                aSet.Put( XLineStyleItem( XLINE_SOLID ) );  // Linien: Durchgehend
-                aSet.Put( XFillStyleItem ( XFILL_NONE ) );  // Flaeche: unsichtbar
-                pScene->SetItemSet(aSet);
-
-                // 3D: Doppelseitig
-                SdrObjListIter aIter( *pScene, IM_DEEPWITHGROUPS );
-                while ( aIter.IsMore() )
-                {
-                    SdrObject* pSingleObj = aIter.Next();
-                    if ( pSingleObj->ISA(E3dExtrudeObj ) )
-                    {
-                        E3dExtrudeObj* pSingleExtrude = (E3dExtrudeObj*)pSingleObj;
-                        pSingleExtrude->SetItem(Svx3DDoubleSidedItem(TRUE));
-                    }
-                }
-            }
-        }
-
-        BOOL bUseBackSide = FALSE;
-        if ( IsProperty( DFF_Prop_c3DExtrudeBackward ) || IsProperty( DFF_Prop_c3DExtrudeForward ) )
-        {
-            nVal = GetPropertyValue( DFF_Prop_c3DExtrudeBackward, GetPropertyValue( DFF_Prop_c3DExtrudeForward, 0 ) );
-            ScaleEmu( nVal );
-            SdrObjListIter aIter( *pScene, IM_DEEPWITHGROUPS );
-            while( aIter.IsMore() )
-            {
-                SdrObject* pSingleObj = aIter.Next();
-                if ( pSingleObj->ISA( E3dExtrudeObj ) )
-                {
-                    E3dExtrudeObj* pSingleExtrude = (E3dExtrudeObj*)pSingleObj;
-                    sal_Int32 nSingleExtrudeDepth = pSingleExtrude->GetExtrudeDepth();
-                    if( nVal != nSingleExtrudeDepth )
-                    {
-                        if ( nVal == 338667 )
-                        {
-                            // MS unendlich
-                            pSingleExtrude->SetItem(Svx3DDepthItem(sal_uInt32((fDepth * 18.0)+0.5)));
-
-                            UINT16 nBackScale = (UINT16)((0.1 * 100.0) + 0.5);
-                            pSingleExtrude->SetItem(Svx3DBackscaleItem(nBackScale));
-
-                            UINT16 nPercentDiagonal = (UINT16)((0.01 * 200.0) + 0.5);
-                            pSingleExtrude->SetItem(Svx3DPercentDiagonalItem(nPercentDiagonal));
-
-                            Matrix4D aMirrorMat;
-                            aMirrorMat.Scale( 1.0, -1.0, -1.0 );
-                            pSingleExtrude->NbcSetTransform( pSingleExtrude->GetTransform() * aMirrorMat);
-                            bUseBackSide = TRUE;
-                        }
-                        else
-                            pSingleExtrude->SetItem(Svx3DDepthItem(sal_uInt32(nVal + 0.5)));
-                    }
-                }
-            }
-        }
-
-        // Ausgleichsrotation
-        if( (INT32)aCamPos.X() != 0 && (INT32)aCamPos.Y() != 0 )
-        {
-            // Ausgleichsdrehung notwendig...
-            double fArcTan = atan2( rCamera.GetVUV().Y(), rCamera.GetVUV().X() );
-            fArcTan = ( nPi / 2.0 ) - fArcTan;
-            rCamera.SetBankAngle( fArcTan );
-            pScene->SetCamera( rCamera );
-        }
-        if ( (INT32)aCamPos.X() == 0 && (INT32)aCamPos.Y() == 0 )
-        {
-            // Ausgleichsrotation fuer plane Flaechen
-            pScene->NbcRotateX( 0.5 * nPi180 );
-        }
-/*
-        sal_uInt32 nSpecular = GetPropertyValue( DFF_Prop_c3DSpecularAmt, 0 );
-        if ( nSpecular )
-        {
-            Color aSpecularCol( 204, 204, 204 );
-            aSet.Put( Svx3DMaterialSpecularItem( aSpecularCol ) );
-            aSet.Put( Svx3DMaterialSpecularIntensityItem( 15 ) );
-        }
-        sal_uInt32 nDiffuse = GetPropertyValue( DFF_Prop_c3DDiffuseAmt, 0 );
-        if ( nDiffuse )
-        {
-            Color aDiffuseCol( 45, 45, 45 );
-            aSet.Put( Svx3DMaterialSpecularItem( aDiffuseCol ) );
-            aSet.Put( Svx3DMaterialSpecularIntensityItem( 50 ) );
-        }
-*/
-        sal_Int32 nXRotate = GetPropertyValue( DFF_Prop_c3DXRotationAngle, 0 );
-        sal_Int32 nYRotate = GetPropertyValue( DFF_Prop_c3DYRotationAngle, 0 );
-        if ( nXRotate || nYRotate )
-            Apply3dObjectRotation( pScene, Fix16ToAngle( nXRotate ), Fix16ToAngle( nYRotate ) );
-
-        // set correct camera depth and evaluate new size
-        fDepth = pScene->GetBoundVolume().GetDepth();
-        if ( fDepth < 1.0 )
-            fDepth = 1.0;
-        fDepth = pScene->GetBoundVolume().GetDepth(); // 100.0;
-        Vector3D aNewCamPos( 0.0, 0.0, fDepth );
-        rCamera.SetPosAndLookAt( aNewCamPos, aLookAt );
-        pScene->SetCamera( rCamera );
-        pScene->FitSnapRectToBoundVol();
-
-        sal_Int32 nSkewAmount = GetPropertyValue( DFF_Prop_c3DSkewAmount, 30 );
-        if ( nSkewAmount )
-        {
-            Apply3dSkewSettings( rCamera, pScene, nSkewAmount,
-                ((sal_Int32)GetPropertyValue( DFF_Prop_c3DSkewAngle, 225 << 16 ) ) >> 16, fDepth);
-        }
-
-
-        ///////////
-        // light //
-        ///////////
-        sal_Int32 nLightKeyX = GetPropertyValue( DFF_Prop_c3DKeyX, 50000 );
-        sal_Int32 nLightKeyY = - ((sal_Int32)GetPropertyValue( DFF_Prop_c3DKeyY, 0 ));
-        sal_Int32 nLightKeyZ = GetPropertyValue( DFF_Prop_c3DKeyZ, 0 );
-        if ( nLightKeyX )
-            ScaleEmu( nLightKeyX );
-        if ( nLightKeyY )
-            ScaleEmu( nLightKeyY );
-        if ( nLightKeyZ )
-            ScaleEmu( nLightKeyZ );
-        else
-            nLightKeyZ = 1;
-        Vector3D aLightKey( (double)nLightKeyX, (double)nLightKeyY, (double)nLightKeyZ );
-        aLightKey.Normalize();
-        if ( bIsAutoText )
-            aLightKey = -aLightKey;
-
-        sal_uInt8 nAmbValGlobal = 102;
-        sal_uInt8 nAmbValSpot   = 204;
-        sal_uInt8 nAmbValCamera = 153;
-
-        Vector3D aSpotDirection = aLightKey;
-        Vector3D aCameraDirection(  0, 0, 1 );
-        Vector3D aPos = rCamera.GetPosition();
-        if ( aPos.X() > 0 )
-            aCameraDirection.X() = 1.0;
-        else if ( aPos.X() < 0 )
-            aCameraDirection.X() = -1.0;
-        if ( aPos.Y() > 0 )
-            aCameraDirection.Y() = 0.5;
-        else if ( aPos.Y() < 0 )
-            aCameraDirection.Y() = -0.5;
-
-        // aware, the ambient value does only matter for solid fill styles
-        if ( (MSO_FillType)GetPropertyValue( DFF_Prop_fillType, mso_fillSolid ) == mso_fillSolid )
-        {
-            sal_uInt32 nAmbient = GetPropertyValue( DFF_Prop_c3DAmbientIntensity, 16000 );  // 16000->bright, 10000->normal, 4000->dim
-            if ( nAmbient < 7000 )          // dim
-            {
-                nAmbValGlobal = 51;
-                nAmbValSpot = 102;
-                nAmbValCamera = 153;
-            }
-            else if ( nAmbient < 13000 )    // normal
-            {
-                nAmbValGlobal = 76;
-                nAmbValSpot = 153;
-                nAmbValCamera = 153;
-            }
-            if ( ( nAmbValSpot > 102 ) && ( aSpotDirection.X() * aCameraDirection.X() >= 0 ) )
-                nAmbValSpot -= 50;
-            if ( ( nAmbValSpot > 102 ) && ( aSpotDirection.Y() * aCameraDirection.Y() >= 0 ) )
-                nAmbValSpot -= 50;
-        }
-        Color aGlobalAmbientColor( nAmbValGlobal, nAmbValGlobal, nAmbValGlobal );
-        aSet.Put( Svx3DAmbientcolorItem( aGlobalAmbientColor ) );
-
-        aSet.Put( Svx3DLightOnOff1Item( sal_True ) );
-        Color aAmbientSpotColor( nAmbValSpot, nAmbValSpot, nAmbValSpot );
-        aSet.Put( Svx3DLightcolor1Item( aAmbientSpotColor ) );
-        aSet.Put( Svx3DLightDirection1Item( aSpotDirection ) );
-
-        aSet.Put( Svx3DLightOnOff2Item( sal_True ) );
-        Color aAmbientCameraColor( nAmbValCamera, nAmbValCamera, nAmbValCamera );
-        aSet.Put( Svx3DLightcolor2Item( aAmbientCameraColor ) );
-        aSet.Put( Svx3DLightDirection2Item( aCameraDirection ) );
-
-
-        Color aSpecularCol( 51, 51, 51 );
-        aSet.Put( Svx3DMaterialSpecularItem( aSpecularCol ) );
-        aSet.Put( Svx3DMaterialSpecularIntensityItem( 85 ) );
-
-        pScene->SetModel( pSdrModel );
-        pScene->SetItemSet( aSet );
-        pScene->InitTransformationSet();
-    }
-    else
-        delete pScene;  // Aufraeumen
-    return pRet;
-}
-
 SdrObject* SvxMSDffManager::ImportWordArt( SvStream& rStCtrl, SfxItemSet& rSet, Rectangle& rBoundRect ) const
 {
     SdrObject*  pRet = NULL;
     String      aObjectText;
     String      aFontName;
-    INT32       nAngle = mnFix16Angle;
     BOOL        bTextRotate = FALSE;
 
     ((SvxMSDffManager*)this)->mnFix16Angle = 0; // we don't want to use this property in future
@@ -2659,15 +2518,10 @@ SdrObject* SvxMSDffManager::ImportWordArt( SvStream& rStCtrl, SfxItemSet& rSet,
                 pRet->NbcSetSnapRect( rBoundRect );
                 delete pNewObj;
             }
-            if( nAngle || bTextRotate )
+            if( bTextRotate )
             {
-                if ( bTextRotate )
-                    nAngle = NormAngle360( nAngle + 9000 );
-                if( nAngle )
-                {
-                    double a = nAngle * nPi180;
-                    pRet->NbcRotate( rBoundRect.Center(), nAngle, sin( a ), cos( a ) );
-                }
+                double a = 9000 * nPi180;
+                pRet->NbcRotate( rBoundRect.Center(), 9000, sin( a ), cos( a ) );
             }
         }
     }
@@ -2934,7 +2788,7 @@ SdrObject* SvxMSDffManager::ImportGraphic( SvStream& rSt, SfxItemSet& rSet, Rect
                 {
                     try
                     {
-                        ::ucb::Content  aCnt( aName, ::com::sun::star::uno::Reference<
+                        ::ucb::Content  aCnt( aName, uno::Reference<
                             ::com::sun::star::ucb::XCommandEnvironment >() );
                         ::rtl::OUString     aTitle;
 
@@ -3128,6 +2982,8 @@ SdrObject* SvxMSDffManager::ImportObj( SvStream& rSt, void* pClientData,
 
                 sal_Bool    bIsConnector = ( ( aObjData.eShapeType >= mso_sptStraightConnector1 ) && ( aObjData.eShapeType <= mso_sptCurvedConnector5 ) );
                 sal_Bool    bIsAutoShape = FALSE;
+                sal_Int32   nObjectRotation = mnFix16Angle;
+                sal_uInt32  nSpFlags = aObjData.nSpFlags;
 
                 if ( bGraphic )
                 {
@@ -3177,7 +3033,7 @@ SdrObject* SvxMSDffManager::ImportObj( SvStream& rSt, void* pClientData,
                             }
                         }
                     }
-                    aObjData.nSpFlags &=~ ( SP_FFLIPH | SP_FFLIPV );            // #68396#
+                    nSpFlags &=~ ( SP_FFLIPH | SP_FFLIPV );         // #68396#
                 }
                 else  if ( ( aObjData.eShapeType == mso_sptCurvedLeftArrow )    // #97935# not taking the autoshapes from msashape,
                         || ( aObjData.eShapeType == mso_sptCurvedRightArrow )   // instead we are using our precalculated ones
@@ -3190,7 +3046,7 @@ SdrObject* SvxMSDffManager::ImportObj( SvStream& rSt, void* pClientData,
                 }
                 else
                 {
-                    SvxMSDffAutoShape aAutoShape( *this, rSt, aObjData, aBoundRect, mnFix16Angle );
+                    SvxMSDffAutoShape aAutoShape( *this, rSt, aObjData, aBoundRect, nObjectRotation );
                     if ( !aAutoShape.IsEmpty() )
                     {
                         ApplyAttributes( rSt, aSet, NULL );
@@ -3264,9 +3120,9 @@ SdrObject* SvxMSDffManager::ImportObj( SvStream& rSt, void* pClientData,
                             Point aPoint2( aBoundRect.BottomRight() );
 
                             // Rotationen beachten
-                            if ( mnFix16Angle )
+                            if ( nObjectRotation )
                             {
-                                double a = mnFix16Angle * nPi180;
+                                double a = nObjectRotation * nPi180;
                                 Point aCenter( aBoundRect.Center() );
                                 double ss = sin(a);
                                 double cc = cos(a);
@@ -3276,19 +3132,19 @@ SdrObject* SvxMSDffManager::ImportObj( SvStream& rSt, void* pClientData,
                             }
 
                             // Linie innerhalb des Bereiches zurechtdrehen/spiegeln
-                            if ( aObjData.nSpFlags & SP_FFLIPH )
+                            if ( nSpFlags & SP_FFLIPH )
                             {
                                 INT32 n = aPoint1.X();
                                 aPoint1.X() = aPoint2.X();
                                 aPoint2.X() = n;
                             }
-                            if ( aObjData.nSpFlags & SP_FFLIPV )
+                            if ( nSpFlags & SP_FFLIPV )
                             {
                                 INT32 n = aPoint1.Y();
                                 aPoint1.Y() = aPoint2.Y();
                                 aPoint2.Y() = n;
                             }
-                            aObjData.nSpFlags &= ~( SP_FFLIPV | SP_FFLIPH );
+                            nSpFlags &= ~( SP_FFLIPV | SP_FFLIPH );
 
                             pRet->NbcSetPoint(aPoint1, 0);  // Startpunkt
                             pRet->NbcSetPoint(aPoint2, 1);  // Endpunkt
@@ -3345,15 +3201,24 @@ SdrObject* SvxMSDffManager::ImportObj( SvStream& rSt, void* pClientData,
                     {
                         // #81981# not all objects are effected by 3d effects
                         if ( !bGraphic )
-                            pRet = Import3DObject( pRet, aSet, aBoundRect, aObjData.bIsAutoText );
+                        {
+                            SdrObject* p3d = SvxMSDffAutoShape3D::Create3DObject( pRet, *this, aSet, aBoundRect, nSpFlags );
+                            if ( p3d )
+                            {
+                                nSpFlags &= ~( SP_FFLIPV | SP_FFLIPH );
+                                nObjectRotation = 0;
+                                delete pRet;
+                                pRet = p3d;
+                            }
+                        }
                     }
                 }
                 if ( pRet )
                 {
-                    if( mnFix16Angle && !bIsConnector )
+                    if( nObjectRotation && !bIsConnector )
                     {
-                        double a = mnFix16Angle * nPi180;
-                        pRet->NbcRotate( aBoundRect.Center(), mnFix16Angle, sin( a ), cos( a ) );
+                        double a = nObjectRotation * nPi180;
+                        pRet->NbcRotate( aBoundRect.Center(), nObjectRotation, sin( a ), cos( a ) );
                     }
                     if ( nSpecialGroupSettings )
                     {
@@ -3376,7 +3241,7 @@ SdrObject* SvxMSDffManager::ImportObj( SvStream& rSt, void* pClientData,
                         }
                     }
                     // Horizontal gespiegelt?
-                    if ( aObjData.nSpFlags & SP_FFLIPH )
+                    if ( nSpFlags & SP_FFLIPH )
                     {
                         Rectangle aBoundRect( pRet->GetSnapRect() );
                         Point aTop( ( aBoundRect.Left() + aBoundRect.Right() ) >> 1, aBoundRect.Top() );
@@ -3384,7 +3249,7 @@ SdrObject* SvxMSDffManager::ImportObj( SvStream& rSt, void* pClientData,
                         pRet->NbcMirror( aTop, aBottom );
                     }
                     // Vertikal gespiegelt?
-                    if ( aObjData.nSpFlags & SP_FFLIPV )
+                    if ( nSpFlags & SP_FFLIPV )
                     {
                         Rectangle aBoundRect( pRet->GetSnapRect() );
                         Point aLeft( aBoundRect.Left(), ( aBoundRect.Top() + aBoundRect.Bottom() ) >> 1 );
@@ -3541,6 +3406,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
             if( !pObj )
                 ApplyAttributes( rSt, aSet, pTextObj );
 
+            bool bFitText = false;
             if (GetPropertyValue(DFF_Prop_FitTextToShape) & 2)
             {
                 aSet.Put( SdrTextAutoGrowHeightItem( TRUE ) );
@@ -3548,6 +3414,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
                     aNewRect.Bottom() - aNewRect.Top() ) );
                 aSet.Put( SdrTextMinFrameWidthItem(
                     aNewRect.Right() - aNewRect.Left() ) );
+                bFitText = true;
             }
             else
             {
@@ -3560,6 +3427,11 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
             {
                 case mso_wrapNone :
                     aSet.Put( SdrTextAutoGrowWidthItem( TRUE ) );
+                    if (bFitText)
+                    {
+                        //can't do autowidth in flys #i107184#
+                        pTextImpRec->bReplaceByFly = false;
+                    }
                 break;
                 case mso_wrapByPoints :
                     aSet.Put( SdrTextContourFrameItem( TRUE ) );
@@ -5277,11 +5149,8 @@ SdrObject* SvxMSDffManager::GetAutoForm( MSO_SPT eTyp ) const
     return pRet;
 }
 
-sal_Bool SvxMSDffManager::SetPropValue(
-    const ::com::sun::star::uno::Any& rAny,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
-            const String& rPropName,
-                sal_Bool bTestPropertyAvailability )
+sal_Bool SvxMSDffManager::SetPropValue( const uno::Any& rAny, const uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
+            const String& rPropName, sal_Bool bTestPropertyAvailability )
 {
     sal_Bool bRetValue = sal_True;
     if ( bTestPropertyAvailability )
@@ -5289,12 +5158,12 @@ sal_Bool SvxMSDffManager::SetPropValue(
         bRetValue = sal_False;
         try
         {
-            ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >
+            uno::Reference< beans::XPropertySetInfo >
                 aXPropSetInfo( rXPropSet->getPropertySetInfo() );
             if ( aXPropSetInfo.is() )
                 bRetValue = aXPropSetInfo->hasPropertyByName( rPropName );
         }
-        catch( ::com::sun::star::uno::Exception& )
+        catch( uno::Exception& )
         {
             bRetValue = sal_False;
         }
@@ -5306,7 +5175,7 @@ sal_Bool SvxMSDffManager::SetPropValue(
             rXPropSet->setPropertyValue( rPropName, rAny );
             bRetValue = sal_True;
         }
-        catch( ::com::sun::star::uno::Exception& )
+        catch( uno::Exception& )
         {
             bRetValue = sal_False;
         }
diff --git a/svx/source/msfilter/msfiltertracer.cxx b/svx/source/msfilter/msfiltertracer.cxx
new file mode 100644
index 000000000000..5ae5adbf28f9
--- /dev/null
+++ b/svx/source/msfilter/msfiltertracer.cxx
@@ -0,0 +1,188 @@
+/*************************************************************************
+ *
+ *  $RCSfile: msfiltertracer.cxx,v $
+ *
+ *  $Revision: 1.2 $
+ *
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:42 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  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., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#ifndef _MS_FILTERTRACER_HXX
+#include "msfiltertracer.hxx"
+#endif
+
+#ifndef _COM_SUN_STAR_UNO_SEQUENCE_H_
+#include <com/sun/star/uno/Sequence.h>
+#endif
+#ifndef _COM_SUN_STAR_UTIL_LOGGING_LOGLEVEL_HPP_
+#include <com/sun/star/util/logging/LogLevel.hpp>
+#endif
+#ifndef _COM_SUN_STAR_UTIL_SEARCHALGORITHMS_HPP_
+#include <com/sun/star/util/SearchAlgorithms.hpp>
+#endif
+#ifndef _COM_SUN_STAR_UTIL_SEARCHFLAGS_HPP_
+#include <com/sun/star/util/SearchFlags.hpp>
+#endif
+#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+#include <comphelper/processfactory.hxx>
+#endif
+#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#endif
+#ifndef _FILTER_CONFIG_ITEM_HXX_
+#include <svtools/FilterConfigItem.hxx>
+#endif
+
+// --------------
+// - Namespaces -
+// --------------
+
+using namespace ::com::sun::star;
+
+MSFilterTracer::MSFilterTracer() :
+    mpCfgItem( NULL )
+{
+
+};
+
+MSFilterTracer::~MSFilterTracer()
+{
+    delete mpCfgItem;
+};
+
+MSFilterTracer& MSFilterTracer::operator=( const MSFilterTracer& rFilterTracer )
+{
+    delete mpCfgItem, mpCfgItem = new FilterConfigItem( *rFilterTracer.mpCfgItem );
+    mbEnabled = rFilterTracer.mbEnabled;
+    mxFilterTracer = rFilterTracer.mxFilterTracer;
+    mxLogger = rFilterTracer.mxLogger;
+    return *this;
+}
+
+void MSFilterTracer::StartTracing( const ::rtl::OUString& rConfigPath )
+{
+    delete mpCfgItem, mpCfgItem = new FilterConfigItem( rConfigPath );
+
+    mbEnabled = mpCfgItem->ReadBool( rtl::OUString::createFromAscii( "Enabled" ), sal_False );
+    if ( mbEnabled )
+    {
+        sal_Int32 nLogLevel = mpCfgItem->ReadInt32( rtl::OUString::createFromAscii( "LogLevel" ), util::logging::LogLevel::ALL );
+        ::rtl::OUString aEmptyString;
+        ::rtl::OUString aClassFilter( mpCfgItem->ReadString( rtl::OUString::createFromAscii( "ClassFilter" ), aEmptyString ) );
+        ::rtl::OUString aMethodFilter( mpCfgItem->ReadString( rtl::OUString::createFromAscii( "MethodFilter" ), aEmptyString ) );
+        ::rtl::OUString aMessageFilter( mpCfgItem->ReadString( rtl::OUString::createFromAscii( "MessageFilter" ), aEmptyString ) );
+        ::rtl::OUString aURL( mpCfgItem->ReadString( rtl::OUString::createFromAscii( "URL" ), aEmptyString ) );
+        util::SearchAlgorithms eSearchAlgorithm = (util::SearchAlgorithms)
+            mpCfgItem->ReadInt32( rtl::OUString::createFromAscii( "SearchAlgorithm" ), util::SearchAlgorithms_ABSOLUTE );
+
+        uno::Sequence< uno::Any > aArgument( 1 );
+        uno::Sequence< beans::PropertyValue > aPropValues( 5 );
+        aPropValues[ 0 ].Name  = ::rtl::OUString::createFromAscii( "LogLevel" );
+        aPropValues[ 0 ].Value <<= nLogLevel;
+        aPropValues[ 1 ].Name  = ::rtl::OUString::createFromAscii( "ClassFilter" );
+        aPropValues[ 1 ].Value <<= aClassFilter;
+        aPropValues[ 2 ].Name  = ::rtl::OUString::createFromAscii( "MethodFilter" );
+        aPropValues[ 2 ].Value <<= aMethodFilter;
+        aPropValues[ 3 ].Name  = ::rtl::OUString::createFromAscii( "MessageFilter" );
+        aPropValues[ 3 ].Value <<= aMessageFilter;
+        aPropValues[ 4 ].Name  = ::rtl::OUString::createFromAscii( "URL" );
+        aPropValues[ 4 ].Value <<= aURL;
+        aArgument[ 0 ] <<= aPropValues;
+
+        uno::Reference< lang::XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
+        if ( xMgr.is() )
+        {
+            mxFilterTracer = xMgr->createInstanceWithArguments( ::rtl::OUString::createFromAscii( "com.sun.star.util.FilterTracer" ), aArgument );
+            if ( mxFilterTracer.is() )
+            {
+                uno::Reference< util::XTextSearch >
+                    xTextSearch( mxFilterTracer, uno::UNO_QUERY );
+                mxLogger = uno::Reference< util::logging::XLogger >( mxFilterTracer, uno::UNO_QUERY );
+
+                if ( xTextSearch.is() )
+                {
+                    util::SearchOptions aOptions;
+                    aOptions.algorithmType = eSearchAlgorithm;
+                    xTextSearch->setOptions( aOptions );
+                }
+            }
+        }
+    }
+}
+
+void MSFilterTracer::EndTracing()
+{
+    mbEnabled = sal_False;
+    uno::Reference< uno::XInterface > x;
+    mxFilterTracer = x;
+    delete mpCfgItem, mpCfgItem = NULL;
+}
+
+void MSFilterTracer::Trace( const rtl::OUString& rMessage ) const
+{
+    if ( mbEnabled && mxLogger.is() )
+    {
+        rtl::OUString aEmpty;
+        mxLogger->logp( 0, aEmpty, aEmpty, rMessage );
+    }
+}
+
+uno::Any MSFilterTracer::GetProperty( const rtl::OUString& rPropName ) const
+{
+    uno::Any aAny;
+    if ( mpCfgItem )
+        aAny = mpCfgItem->ReadAny( rPropName, aAny );
+    return aAny;
+}
\ No newline at end of file
diff --git a/svx/source/msfilter/msocximex.cxx b/svx/source/msfilter/msocximex.cxx
index f72805d16f9f..9aedd0160b99 100644
--- a/svx/source/msfilter/msocximex.cxx
+++ b/svx/source/msfilter/msocximex.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: msocximex.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: cmc $ $Date: 2003-01-28 11:02:25 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:43 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -109,14 +109,29 @@
 #ifndef _COM_SUN_STAR_FORM_FORMCOMPONENTTYPE_HPP_
 #include <com/sun/star/form/FormComponentType.hpp>
 #endif
+#ifndef _COM_SUN_STAR_AWT_FONTWEIGHT_HPP_
+#include <com/sun/star/awt/FontWeight.hpp>
+#endif
+#ifndef _COM_SUN_STAR_AWT_FONTSLANT_HPP_
+#include <com/sun/star/awt/FontSlant.hpp>
+#endif
+#ifndef _COM_SUN_STAR_AWT_FONTUNDERLINE_HPP_
+#include <com/sun/star/awt/FontUnderline.hpp>
+#endif
+#ifndef _COM_SUN_STAR_AWT_FONTSTRIKEOUT_HPP_
+#include <com/sun/star/awt/FontStrikeout.hpp>
+#endif
 #ifndef _COMPHELPER_EXTRACT_HXX_
 #include <comphelper/extract.hxx>
 #endif
+#ifndef _SV_SVAPP_HXX
+#include <vcl/svapp.hxx>
+#endif
 #ifndef _SFX_OBJSH_HXX
 #include <sfx2/objsh.hxx>
 #endif
 #ifndef _MSOCXIMEX_HXX
-#include <msocximex.hxx>
+#include "msocximex.hxx"
 #endif
 
 #ifndef C2S
@@ -143,12 +158,6 @@ using namespace cppu;
 static char sWW8_form[] = "WW-Standard";
 
 
-sal_uInt32 OCX_Control::pColor[25] = {
-0xC0C0C0, 0x008080, 0x000080, 0x808080, 0xC0C0C0, 0xFFFFFF, 0x000000,
-0x000000, 0x000000, 0xFFFFFF, 0xC0C0C0, 0xC0C0C0, 0x808080, 0x000080,
-0xFFFFFF, 0xC0C0C0, 0x808080, 0x808080, 0x000000, 0xC0C0C0, 0xFFFFFF,
-0x000000, 0xC0C0C0, 0x000000, 0xFFFFC0 };
-
 sal_uInt8 __READONLY_DATA OCX_Control::aObjInfo[4] = {
 0x00, 0x12, 0x03, 0x00, };
 
@@ -171,6 +180,42 @@ void Align(SvStorageStream *pS,int nAmount,BOOL bFill=FALSE)
 sal_uInt16 OCX_Control::nStandardId(0x0200);
 sal_uInt16 OCX_FontData::nStandardId(0x0200);
 
+sal_uInt32 OCX_Control::pColor[25] = {
+0xC0C0C0, 0x008080, 0x000080, 0x808080, 0xC0C0C0, 0xFFFFFF, 0x000000,
+0x000000, 0x000000, 0xFFFFFF, 0xC0C0C0, 0xC0C0C0, 0x808080, 0x000080,
+0xFFFFFF, 0xC0C0C0, 0x808080, 0x808080, 0x000000, 0xC0C0C0, 0xFFFFFF,
+0x000000, 0xC0C0C0, 0x000000, 0xFFFFC0 };
+
+void OCX_Control::FillSystemColors()
+{
+    // overwrite the predefined colors with available system colors
+    const StyleSettings& rSett = Application::GetSettings().GetStyleSettings();
+
+    pColor[ 0x00 ] = rSett.GetFaceColor().GetColor();
+    pColor[ 0x01 ] = rSett.GetWorkspaceColor().GetColor();
+    pColor[ 0x02 ] = rSett.GetActiveColor().GetColor();
+    pColor[ 0x03 ] = rSett.GetDeactiveColor().GetColor();
+    pColor[ 0x04 ] = rSett.GetMenuBarColor().GetColor();
+    pColor[ 0x05 ] = rSett.GetWindowColor().GetColor();
+    pColor[ 0x07 ] = rSett.GetMenuTextColor().GetColor();
+    pColor[ 0x08 ] = rSett.GetWindowTextColor().GetColor();
+    pColor[ 0x09 ] = rSett.GetActiveTextColor().GetColor();
+    pColor[ 0x0A ] = rSett.GetActiveBorderColor().GetColor();
+    pColor[ 0x0B ] = rSett.GetDeactiveBorderColor().GetColor();
+    pColor[ 0x0C ] = rSett.GetWorkspaceColor().GetColor();
+    pColor[ 0x0D ] = rSett.GetHighlightColor().GetColor();
+    pColor[ 0x0E ] = rSett.GetHighlightTextColor().GetColor();
+    pColor[ 0x0F ] = rSett.GetFaceColor().GetColor();
+    pColor[ 0x10 ] = rSett.GetShadowColor().GetColor();
+    pColor[ 0x12 ] = rSett.GetButtonTextColor().GetColor();
+    pColor[ 0x13 ] = rSett.GetDeactiveTextColor().GetColor();
+    pColor[ 0x14 ] = rSett.GetHighlightColor().GetColor();
+    pColor[ 0x15 ] = rSett.GetDarkShadowColor().GetColor();
+    pColor[ 0x16 ] = rSett.GetShadowColor().GetColor();
+    pColor[ 0x17 ] = rSett.GetHelpTextColor().GetColor();
+    pColor[ 0x18 ] = rSett.GetHelpColor().GetColor();
+}
+
 sal_uInt32 OCX_Control::ImportColor(sal_uInt32 nColor) const
 {
     sal_uInt8 nUpper = (sal_uInt8)( nColor >> 24 );
@@ -478,6 +523,7 @@ sal_Bool OCX_CommandButton::WriteContents(SvStorageStreamRef &rContents,
 {
     sal_Bool bRet=sal_True;
 
+    sal_uInt32 nOldPos = rContents->Tell();
     rContents->SeekRel(8);
 
     uno::Any aTmp = rPropSet->getPropertyValue(WW8_ASCII2STR("TextColor"));
@@ -517,12 +563,11 @@ sal_Bool OCX_CommandButton::WriteContents(SvStorageStreamRef &rContents,
     *rContents << rSize.Width;
     *rContents << rSize.Height;
 
-    nFixedAreaLen = static_cast<sal_uInt16>(rContents->Tell());
+    nFixedAreaLen = static_cast<sal_uInt16>(rContents->Tell()-nOldPos-4);
 
     bRet = aFontData.Export(rContents,rPropSet);
 
-    nFixedAreaLen-=4;
-    rContents->Seek(0);
+    rContents->Seek(nOldPos);
     *rContents << nStandardId;
     *rContents << nFixedAreaLen;
 
@@ -599,6 +644,7 @@ sal_Bool OCX_ImageButton::WriteContents(SvStorageStreamRef &rContents,
 {
     sal_Bool bRet=sal_True;
 
+    sal_uInt32 nOldPos = rContents->Tell();
     rContents->SeekRel(8);
 
     uno::Any aTmp=rPropSet->getPropertyValue(WW8_ASCII2STR("BackgroundColor"));
@@ -620,12 +666,11 @@ sal_Bool OCX_ImageButton::WriteContents(SvStorageStreamRef &rContents,
     *rContents << rSize.Width;
     *rContents << rSize.Height;
 
-    nFixedAreaLen = static_cast<sal_uInt16>(rContents->Tell());
+    nFixedAreaLen = static_cast<sal_uInt16>(rContents->Tell()-nOldPos-4);
 
     bRet = aFontData.Export(rContents,rPropSet);
 
-    nFixedAreaLen-=4;
-    rContents->Seek(0);
+    rContents->Seek(nOldPos);
     *rContents << nStandardId;
     *rContents << nFixedAreaLen;
 
@@ -753,6 +798,7 @@ sal_Bool OCX_OptionButton::WriteContents(SvStorageStreamRef &rContents,
 {
     sal_Bool bRet=sal_True;
 
+    sal_uInt32 nOldPos = rContents->Tell();
     rContents->SeekRel(12);
 
     pBlockFlags[0] = 0;
@@ -819,11 +865,10 @@ sal_Bool OCX_OptionButton::WriteContents(SvStorageStreamRef &rContents,
         rContents->Write(sByte.GetBuffer(),sByte.Len());
 
     Align(rContents,4,TRUE);
-    nFixedAreaLen = static_cast<sal_uInt16>(rContents->Tell());
+    nFixedAreaLen = static_cast<sal_uInt16>(rContents->Tell()-nOldPos-4);
     bRet = aFontData.Export(rContents,rPropSet);
 
-    nFixedAreaLen-=4;
-    rContents->Seek(0);
+    rContents->Seek(nOldPos);
     *rContents << nStandardId;
     *rContents << nFixedAreaLen;
 
@@ -1004,6 +1049,7 @@ sal_Bool OCX_TextBox::WriteContents(SvStorageStreamRef &rContents,
     const awt::Size &rSize)
 {
     sal_Bool bRet=sal_True;
+    sal_uInt32 nOldPos = rContents->Tell();
     rContents->SeekRel(12);
 
     pBlockFlags[0] = 0;
@@ -1109,12 +1155,11 @@ sal_Bool OCX_TextBox::WriteContents(SvStorageStreamRef &rContents,
 
     Align(rContents,4,TRUE);
 
-    nFixedAreaLen = static_cast<sal_uInt16>(rContents->Tell());
+    nFixedAreaLen = static_cast<sal_uInt16>(rContents->Tell()-nOldPos-4);
 
     bRet = aFontData.Export(rContents,rPropSet);
 
-    nFixedAreaLen-=4;
-    rContents->Seek(0);
+    rContents->Seek(nOldPos);
     *rContents << nStandardId;
     *rContents << nFixedAreaLen;
 
@@ -1188,6 +1233,7 @@ sal_Bool OCX_FieldControl::WriteContents(SvStorageStreamRef &rContents,
     const awt::Size &rSize)
 {
     sal_Bool bRet=sal_True;
+    sal_uInt32 nOldPos = rContents->Tell();
     rContents->SeekRel(12);
 
     pBlockFlags[0] = 0;
@@ -1266,12 +1312,11 @@ sal_Bool OCX_FieldControl::WriteContents(SvStorageStreamRef &rContents,
 
     Align(rContents,4,TRUE);
 
-    nFixedAreaLen = static_cast<sal_uInt16>(rContents->Tell());
+    nFixedAreaLen = static_cast<sal_uInt16>(rContents->Tell()-nOldPos-4);
 
     bRet = aFontData.Export(rContents,rPropSet);
 
-    nFixedAreaLen-=4;
-    rContents->Seek(0);
+    rContents->Seek(nOldPos);
     *rContents << nStandardId;
     *rContents << nFixedAreaLen;
 
@@ -1373,6 +1418,10 @@ sal_Bool OCX_ToggleButton::Import(
     aTmp = bool2any(bTemp);
     xPropSet->setPropertyValue( WW8_ASCII2STR("Enabled"), aTmp);
 
+    bTemp = nMultiState;
+    aTmp = bool2any(bTemp);
+    xPropSet->setPropertyValue( WW8_ASCII2STR("TriState"), aTmp);
+
     aTmp <<= ImportColor(nForeColor);
     xPropSet->setPropertyValue( WW8_ASCII2STR("TextColor"), aTmp);
 
@@ -1520,6 +1569,7 @@ sal_Bool OCX_ComboBox::WriteContents(SvStorageStreamRef &rContents,
     const awt::Size &rSize)
 {
     sal_Bool bRet=sal_True;
+    sal_uInt32 nOldPos = rContents->Tell();
     rContents->SeekRel(12);
 
     pBlockFlags[0] = 0;
@@ -1613,12 +1663,11 @@ sal_Bool OCX_ComboBox::WriteContents(SvStorageStreamRef &rContents,
 
     Align(rContents,4,TRUE);
 
-    nFixedAreaLen = static_cast<sal_uInt16>(rContents->Tell());
+    nFixedAreaLen = static_cast<sal_uInt16>(rContents->Tell()-nOldPos-4);
 
     bRet = aFontData.Export(rContents,rPropSet);
 
-    nFixedAreaLen-=4;
-    rContents->Seek(0);
+    rContents->Seek(nOldPos);
     *rContents << nStandardId;
     *rContents << nFixedAreaLen;
 
@@ -1751,6 +1800,7 @@ sal_Bool OCX_ListBox::WriteContents(SvStorageStreamRef &rContents,
     const awt::Size &rSize)
 {
     sal_Bool bRet=sal_True;
+    sal_uInt32 nOldPos = rContents->Tell();
     rContents->SeekRel(12);
 
     pBlockFlags[0] = 0;
@@ -1835,12 +1885,11 @@ sal_Bool OCX_ListBox::WriteContents(SvStorageStreamRef &rContents,
 
     Align(rContents,4,TRUE);
 
-    nFixedAreaLen = static_cast<sal_uInt16>(rContents->Tell());
+    nFixedAreaLen = static_cast<sal_uInt16>(rContents->Tell()-nOldPos-4);
 
     bRet = aFontData.Export(rContents,rPropSet);
 
-    nFixedAreaLen-=4;
-    rContents->Seek(0);
+    rContents->Seek(nOldPos);
     *rContents << nStandardId;
     *rContents << nFixedAreaLen;
 
@@ -1923,7 +1972,7 @@ sal_Bool OCX_ModernControl::Read(SvStorageStream *pS)
 
         fEnabled = (nTemp & 0x02) >> 1;
         fLocked = (nTemp & 0x04) >> 2;
-        fBackStyle = (nTemp & 0x02) >> 3;
+        fBackStyle = (nTemp & 0x08) >> 3;
 
         *pS >> nTemp;
 
@@ -2322,6 +2371,7 @@ sal_Bool OCX_Label::WriteContents(SvStorageStreamRef &rContents,
     const awt::Size &rSize)
 {
     sal_Bool bRet = sal_True;
+    sal_uInt32 nOldPos = rContents->Tell();
     rContents->SeekRel(8);
     pBlockFlags[0] = 0x20;
     pBlockFlags[1] = 0;
@@ -2383,12 +2433,11 @@ sal_Bool OCX_Label::WriteContents(SvStorageStreamRef &rContents,
     Align(rContents,4,TRUE);
     *rContents << rSize.Width;
     *rContents << rSize.Height;
-    nFixedAreaLen = static_cast<sal_uInt16>(rContents->Tell());
+    nFixedAreaLen = static_cast<sal_uInt16>(rContents->Tell()-nOldPos-4);
 
     bRet = aFontData.Export(rContents,rPropSet);
 
-    nFixedAreaLen-=4;
-    rContents->Seek(0);
+    rContents->Seek(nOldPos);
     *rContents << nStandardId;
     *rContents << nFixedAreaLen;
 
@@ -2517,6 +2566,13 @@ OCX_map aOCXTab[NO_OCX] =
         form::FormComponentType::GROUPBOX,""}
 };
 
+SvxMSConvertOCXControls::SvxMSConvertOCXControls( SfxObjectShell *pDSh,SwPaM *pP ) :
+    pDocSh( pDSh ), pPaM(pP),nEdit( 0 ), nCheckbox( 0 )
+{
+    DBG_ASSERT( pDocSh, "No DocShell, Cannot do Controls" );
+    OCX_Control::FillSystemColors();
+}
+
 OCX_Control * SvxMSConvertOCXControls::OCX_Factory(const String &sName)
 {
     for (int i=0;i<NO_OCX;i++)
@@ -2707,7 +2763,7 @@ sal_Bool SvxMSConvertOCXControls::WriteOCXStream( SvStorageRef& rSrc1,
 }
 
 
-//I think this should work for excel documents, create the Cnts stream
+//I think this should work for excel documents, create the "Ctls" stream
 //and give it here as rContents, we'll append out streams ole id and
 //contents here and that appears to be what Excel is doing
 sal_Bool SvxMSConvertOCXControls::WriteOCXExcelKludgeStream(
@@ -2737,6 +2793,8 @@ sal_Bool SvxMSConvertOCXControls::WriteOCXExcelKludgeStream(
         *pS << aName;
         bRet = pObj->WriteContents(rContents,xPropSet,rSize);
         delete pObj;
+        // export needs correct stream position
+        rContents->Seek( STREAM_SEEK_TO_END );
     }
     return bRet;
 }
@@ -2813,7 +2871,7 @@ sal_Bool OCX_CheckBox::WriteContents(SvStorageStreamRef &rContents,
 
 {
     sal_Bool bRet=sal_True;
-
+    sal_uInt32 nOldPos = rContents->Tell();
     rContents->SeekRel(12);
 
     pBlockFlags[0] = 0;
@@ -2883,10 +2941,9 @@ sal_Bool OCX_CheckBox::WriteContents(SvStorageStreamRef &rContents,
         rContents->Write(sByte.GetBuffer(),sByte.Len());
 
     Align(rContents,4,TRUE);
-    nFixedAreaLen = static_cast<sal_uInt16>(rContents->Tell());
+    nFixedAreaLen = static_cast<sal_uInt16>(rContents->Tell()-nOldPos-4);
     bRet = aFontData.Export(rContents,rPropSet);
-    nFixedAreaLen-=4;
-    rContents->Seek(0);
+    rContents->Seek(nOldPos);
     *rContents << nStandardId;
     *rContents << nFixedAreaLen;
 
@@ -3002,7 +3059,14 @@ sal_Bool OCX_FontData::Read(SvStorageStream *pS)
         *pS >> nLanguageID;
     }
     if (pBlockFlags[0] & 0x40)
+    {
         *pS >> nJustification;
+    }
+    if (pBlockFlags[0] & 0x80)  // font weight before font name
+    {
+        Align(pS,2);
+        *pS >> nFontWeight;
+    }
 
     if (nFontNameLen)
     {
@@ -3037,11 +3101,28 @@ void OCX_FontData::Import(uno::Reference< beans::XPropertySet > &rPropSet)
 
     if (fBold)
     {
-        float nBold=150;
-        aTmp.setValue(&nBold,getCppuType((float *)0));
+        aTmp <<= awt::FontWeight::BOLD;
         rPropSet->setPropertyValue( WW8_ASCII2STR("FontWeight"), aTmp);
     }
 
+    if (fItalic)
+    {
+        aTmp <<= (sal_Int16)awt::FontSlant_ITALIC;
+        rPropSet->setPropertyValue( WW8_ASCII2STR("FontSlant"), aTmp);
+    }
+
+    if (fUnderline)
+    {
+        aTmp <<= awt::FontUnderline::SINGLE;
+        rPropSet->setPropertyValue( WW8_ASCII2STR("FontUnderline"), aTmp);
+    }
+
+    if (fStrike)
+    {
+        aTmp <<= awt::FontStrikeout::SINGLE;
+        rPropSet->setPropertyValue( WW8_ASCII2STR("FontStrikeout"), aTmp);
+    }
+
     aTmp <<= sal_Int16(nFontSize/20);
     rPropSet->setPropertyValue( WW8_ASCII2STR("FontHeight"), aTmp);
 }
@@ -3050,7 +3131,7 @@ sal_Bool OCX_FontData::Export(SvStorageStreamRef &rContent,
     const uno::Reference< beans::XPropertySet > &rPropSet)
 {
     sal_uInt8 nFlags=0x00;
-    nFixedAreaLen = static_cast<sal_uInt16>(rContent->Tell());
+    sal_uInt32 nOldPos = rContent->Tell();
     rContent->SeekRel(8);
     ByteString sByte;
     uno::Any aTmp;
@@ -3090,12 +3171,12 @@ sal_Bool OCX_FontData::Export(SvStorageStreamRef &rContent,
         }
 
         aTmp = rPropSet->getPropertyValue(WW8_ASCII2STR("FontHeight"));
-        sal_Int16 nFontHeight;
+        float nFontHeight;
         aTmp >>= nFontHeight;
-        if (nFontHeight != 12)
+        if (nFontHeight)
         {
             nFlags |= 0x04;
-            nFontSize = nFontHeight*20;
+            nFontSize = static_cast<sal_uInt32>(nFontHeight*20);
             *rContent << nFontSize;
         }
 
@@ -3120,9 +3201,7 @@ sal_Bool OCX_FontData::Export(SvStorageStreamRef &rContent,
     rContent->Write(sByte.GetBuffer(),sByte.Len());
     Align(rContent,4,TRUE);
 
-    UINT32 nOldPos = nFixedAreaLen;
-    nFixedAreaLen = static_cast<sal_uInt16>(rContent->Tell()-nFixedAreaLen);
-    nFixedAreaLen -= 4;
+    sal_uInt16 nFixedAreaLen = static_cast<sal_uInt16>(rContent->Tell()-nOldPos-4);
     rContent->Seek(nOldPos);
     *rContent << nStandardId;
     *rContent << nFixedAreaLen;
@@ -3140,7 +3219,7 @@ sal_Bool OCX_Image::WriteContents(SvStorageStreamRef &rContents,
     const awt::Size &rSize)
 {
     sal_Bool bRet=sal_True;
-
+    sal_uInt32 nOldPos = rContents->Tell();
     rContents->SeekRel(8);
 
     pBlockFlags[0] = 0;
@@ -3190,10 +3269,9 @@ sal_Bool OCX_Image::WriteContents(SvStorageStreamRef &rContents,
     *rContents << rSize.Height;
 
     Align(rContents,4,TRUE);
-    nFixedAreaLen = static_cast<sal_uInt16>(rContents->Tell());
+    nFixedAreaLen = static_cast<sal_uInt16>(rContents->Tell()-nOldPos-4);
 
-    nFixedAreaLen-=4;
-    rContents->Seek(0);
+    rContents->Seek(nOldPos);
     *rContents << nStandardId;
     *rContents << nFixedAreaLen;
 
diff --git a/svx/source/msfilter/msvbasic.cxx b/svx/source/msfilter/msvbasic.cxx
index 5c79d9edc5bd..15bfd262b445 100644
--- a/svx/source/msfilter/msvbasic.cxx
+++ b/svx/source/msfilter/msvbasic.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: msvbasic.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: cmc $ $Date: 2002-12-10 15:19:43 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:43 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -221,6 +221,12 @@ int VBA_Impl::ReadVBAProject(const SvStorageRef &rxVBAStorage)
     {
         0x73, 0x00, 0x00, 0x01, 0x00, 0xFF
     };
+
+    static const sal_uInt8 aOfficeXPBE[] =
+    {
+        0x63, 0x00, 0x00, 0x0E, 0x00, 0xFF
+    };
+
     static const sal_uInt8 aOffice2000LE[] =
     {
         0x6D, 0x00, 0x00, 0x01, 0x00, 0xFF
@@ -242,6 +248,12 @@ int VBA_Impl::ReadVBAProject(const SvStorageRef &rxVBAStorage)
         xVBAProject->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
         bIsUnicode = true;
     }
+    else if (!(memcmp(aProduct, aOfficeXPBE, sizeof(aProduct))))
+    {
+        xVBAProject->SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
+        bIsUnicode = false;
+        eCharSet = RTL_TEXTENCODING_APPLE_ROMAN;
+    }
     else if (!(memcmp(aProduct, aOffice2000LE, sizeof(aProduct))))
     {
         xVBAProject->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
@@ -260,8 +272,22 @@ int VBA_Impl::ReadVBAProject(const SvStorageRef &rxVBAStorage)
     }
     else
     {
-        DBG_ASSERT(!this, "unrecognized VBA macro version, report to cmc");
-        return 0;
+        switch (aProduct[3])
+        {
+            case 0x1:
+                xVBAProject->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
+                bIsUnicode = true;
+                DBG_ASSERT(!this, "unrecognized VBA macro version, report to cmc. Guessing at unicode little endian");
+                break;
+            case 0xe:
+                xVBAProject->SetNumberFormatInt(NUMBERFORMAT_INT_BIGENDIAN);
+                bIsUnicode = false;
+                DBG_ASSERT(!this, "unrecognized VBA macro version, report to cmc. Guessing at 8bit big endian");
+                break;
+            default:
+                DBG_ASSERT(!this, "totally unrecognized VBA macro version, report to cmc");
+                return 0;
+        }
     }
 
     sal_uInt32 nLidA;  //Language identifiers
diff --git a/svx/source/options/makefile.mk b/svx/source/options/makefile.mk
index 3fe51f814998..7a30b31f4d73 100644
--- a/svx/source/options/makefile.mk
+++ b/svx/source/options/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.22 $
+#   $Revision: 1.23 $
 #
-#   last change: $Author: pb $ $Date: 2002-12-02 07:56:57 $
+#   last change: $Author: hr $ $Date: 2003-03-27 15:03:48 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -105,7 +105,6 @@ EXCEPTIONSFILES=\
 SLOFILES=\
     $(EXCEPTIONSFILES)	\
     $(SLO)$/asiancfg.obj	\
-    $(SLO)$/colorcfg.obj    \
     $(SLO)$/optcolor.obj    \
     $(SLO)$/optjsearch.obj  \
     $(SLO)$/optitems.obj	\
diff --git a/svx/source/options/multipat.src b/svx/source/options/multipat.src
index 7e755dbff9fb..09b3dcf67f52 100644
--- a/svx/source/options/multipat.src
+++ b/svx/source/options/multipat.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: multipat.src,v $
  *
- *  $Revision: 1.27 $
+ *  $Revision: 1.28 $
  *
- *  last change: $Author: kz $ $Date: 2003-02-27 12:55:28 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,7 +73,7 @@ ModalDialog RID_SVXDLG_MULTIPATH
     Text = "Pfade ausw�hlen" ;
     Text [ English ] = "Select paths" ;
     Text [ english_us ] = "Select Paths" ;
-    Text [ portuguese_brazilian ] = "Selecionar caminhos" ;
+    Text [ portuguese_brazilian ] = "Pfade ausw?hlen" ;
     Text [ swedish ] = "V�lj s�kv�gar" ;
     Text [ danish ] = "V�lg stier" ;
     Text [ italian ] = "Seleziona percorsi" ;
@@ -93,7 +93,7 @@ ModalDialog RID_SVXDLG_MULTIPATH
     Text[ korean ] = "경로 선택";
     Text[ turkish ] = "Veri yollar�n� se�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Seleccionar rutas";
+    Text[ catalan ] = "Seleccioneu els camins";
     Text[ finnish ] = "Valitse polut";
     Moveable = TRUE ;
     Closeable = TRUE ;
@@ -112,7 +112,7 @@ ModalDialog RID_SVXDLG_MULTIPATH
         Text [ English ] = "Add..." ;
         Text [ portuguese ] = "~Adicionar..." ;
         Text [ english_us ] = "~Add..." ;
-        Text [ portuguese_brazilian ] = "~Adicionar..." ;
+        Text [ portuguese_brazilian ] = "Hi~nzuf?en" ;
         Text [ swedish ] = "L�gg t~ill..." ;
         Text [ danish ] = "T~ilf�j..." ;
         Text [ italian ] = "~Aggiungi..." ;
@@ -121,7 +121,7 @@ ModalDialog RID_SVXDLG_MULTIPATH
         Text [ dutch ] = "Toe~voegen..." ;
         Text[ chinese_simplified ] = "新增(~A)...";
         Text[ russian ] = "��������...";
-        Text[ polish ] = "~Dodaj...";
+        Text[ polish ] = "Dodaj...";
         Text[ japanese ] = "追加(~A)...";
         Text[ chinese_traditional ] = "新增(~A)...";
         Text[ arabic ] = "...�����";
@@ -133,6 +133,7 @@ ModalDialog RID_SVXDLG_MULTIPATH
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Afegeix...";
         Text[ finnish ] = "~Lis��...";
+        Text[ thai ] = "เ~พิ่ม...";
     };
     PushButton BTN_DEL_MULTIPATH
     {
@@ -142,16 +143,16 @@ ModalDialog RID_SVXDLG_MULTIPATH
         Text [ English ] = "~Delete" ;
         Text [ portuguese ] = "E~liminar" ;
         Text [ english_us ] = "~Delete" ;
-        Text [ portuguese_brazilian ] = "~Excluir" ;
+        Text [ portuguese_brazilian ] = "~L?chen" ;
         Text [ swedish ] = "~Radera" ;
         Text [ danish ] = "Slet" ;
         Text [ italian ] = "~Elimina" ;
-        Text [ spanish ] = "~Eliminar" ;
+        Text [ spanish ] = "~Borrar" ;
         Text [ french ] = "Supprimer" ;
         Text [ dutch ] = "~Wissen" ;
         Text[ chinese_simplified ] = "删除(~D)";
         Text[ russian ] = "�������";
-        Text[ polish ] = "~Usu�";
+        Text[ polish ] = "Usu�";
         Text[ japanese ] = "削除(~D)";
         Text[ chinese_traditional ] = "刪除(~D)";
         Text[ arabic ] = "���";
@@ -163,6 +164,7 @@ ModalDialog RID_SVXDLG_MULTIPATH
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Suprimeix";
         Text[ finnish ] = "~Poista";
+        Text[ thai ] = "~ลบ";
     };
     FixedLine GB_MULTIPATH
     {
@@ -171,7 +173,7 @@ ModalDialog RID_SVXDLG_MULTIPATH
         Text = "Pfade" ;
         Text [ English ] = "Paths" ;
         Text [ english_us ] = "Paths" ;
-        Text [ portuguese_brazilian ] = "Caminhos" ;
+        Text [ portuguese_brazilian ] = "Pfade" ;
         Text [ swedish ] = "S�kv�gar" ;
         Text [ danish ] = "Stier" ;
         Text [ italian ] = "Percorsi" ;
@@ -191,8 +193,9 @@ ModalDialog RID_SVXDLG_MULTIPATH
         Text[ korean ] = "경로";
         Text[ turkish ] = "Veri yollar�";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Colors";
+        Text[ catalan ] = "Camins";
         Text[ finnish ] = "Polut";
+        Text[ thai ] = "เส้นทาง";
     };
     OKButton BTN_MULTIPATH_OK
     {
@@ -210,13 +213,14 @@ ModalDialog RID_SVXDLG_MULTIPATH
         Pos = MAP_APPFONT ( 200 , 43 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
     };
+    Text[ thai ] = "เลือกเส้นทาง";
 };
 String RID_MULTIPATH_DBL_ERR
 {
     Text = "Der Pfad %1 ist bereits vorhanden." ;
     Text [ ENGLISH ] = "The path %1 is already defined." ;
     Text [ english_us ] = "The path %1 already exists." ;
-    Text [ portuguese_brazilian ] = "O caminho %1 j� existe." ;
+    Text [ portuguese_brazilian ] = "Der Pfad %1 ist bereits vorhanden." ;
     Text [ swedish ] = "S�kv�gen %1 finns redan." ;
     Text [ danish ] = "Stien %1 findes allerede." ;
     Text [ italian ] = "Il percorso %1 esiste gi�." ;
@@ -236,8 +240,9 @@ String RID_MULTIPATH_DBL_ERR
     Text[ korean ] = "경로%1이(가) 이미 존재합니다.";
     Text[ turkish ] = "Veri yolu %1 mevcut durumda";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "La ruta %1 ya existe.";
+    Text[ catalan ] = "El cam� %1 ja existeix.";
     Text[ finnish ] = "Polku %1 on jo olemassa.";
+    Text[ thai ] = "เส้นทาง %1 มีอยู่แล้ว";
 };
 String RID_SVXSTR_FILE_TITLE
 {
@@ -245,7 +250,7 @@ String RID_SVXSTR_FILE_TITLE
     Text [ English ] = "Select files" ;
     Text [ english_us ] = "Select files" ;
     Text [ portuguese ] = "Seleccionar ficheiros" ;
-    Text [ portuguese_brazilian ] = "Selecionar arquivos" ;
+    Text [ portuguese_brazilian ] = "Dateien ausw?hlen" ;
     Text [ swedish ] = "V�lj ut filer" ;
     Text [ danish ] = "V�lg filer" ;
     Text [ italian ] = "Seleziona file" ;
@@ -264,8 +269,9 @@ String RID_SVXSTR_FILE_TITLE
     Text[ korean ] = "파일 선택";
     Text[ turkish ] = "Dosyalar� se�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Seleccionar archivos";
+    Text[ catalan ] = "Seleccioneu els fitxers";
     Text[ finnish ] = "Valitse tiedostot";
+    Text[ thai ] = "เลือกแฟ้ม";
 };
 String RID_SVXSTR_FILE_HEADLINE
 {
@@ -273,7 +279,7 @@ String RID_SVXSTR_FILE_HEADLINE
     Text [ English ] = "Files" ;
     Text [ english_us ] = "Files" ;
     Text [ portuguese ] = "Ficheiros" ;
-    Text [ portuguese_brazilian ] = "Arquivos" ;
+    Text [ portuguese_brazilian ] = "Dateien" ;
     Text [ swedish ] = "Filer" ;
     Text [ danish ] = "Filer" ;
     Text [ italian ] = "File" ;
@@ -294,6 +300,7 @@ String RID_SVXSTR_FILE_HEADLINE
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Fitxers";
     Text[ finnish ] = "Tiedostot";
+    Text[ thai ] = "Files";
 };
 String RID_SVXSTR_ARCHIVE_TITLE
 {
@@ -310,15 +317,16 @@ String RID_SVXSTR_ARCHIVE_TITLE
     Text[ italian ] = "Seleziona archivio";
     Text[ danish ] = "V�lg arkiver";
     Text[ swedish ] = "V�lj arkiv";
-    Text[ polish ] = "Wybierz archiwa";
-    Text[ portuguese_brazilian ] = "Selecionar arquivos";
+    Text[ polish ] = "Select archives";
+    Text[ portuguese_brazilian ] = "Select archives";
     Text[ japanese ] = "アーカイブの選択";
-    Text[ korean ] = "저장 위치 선택";
-    Text[ chinese_simplified ] = "选择备件";
-    Text[ chinese_traditional ] = "選擇備件";
+    Text[ korean ] = "보관 선택";
+    Text[ chinese_simplified ] = "选择文件";
+    Text[ chinese_traditional ] = "選擇檔案";
     Text[ turkish ] = "Select archives";
     Text[ arabic ] = "Select archives";
-    Text[ catalan ] = "Select archives";
+    Text[ catalan ] = "Selecci� de fitxers";
+    Text[ thai ] = "Select Archives";
 };
 String RID_SVXSTR_ARCHIVE_HEADLINE
 {
@@ -335,15 +343,16 @@ String RID_SVXSTR_ARCHIVE_HEADLINE
     Text[ italian ] = "Archivi";
     Text[ danish ] = "Arkiv";
     Text[ swedish ] = "Arkiv";
-    Text[ polish ] = "Archiwa";
-    Text[ portuguese_brazilian ] = "Arquivos";
+    Text[ polish ] = "Archives";
+    Text[ portuguese_brazilian ] = "Archives";
     Text[ japanese ] = "アーカイブ";
-    Text[ korean ] = "자료 저장";
-    Text[ chinese_simplified ] = "备件";
-    Text[ chinese_traditional ] = "備件";
+    Text[ korean ] = "보관";
+    Text[ chinese_simplified ] = "文件";
+    Text[ chinese_traditional ] = "檔案";
     Text[ turkish ] = "Archives";
     Text[ arabic ] = "Archives";
-    Text[ catalan ] = "Archives";
+    Text[ catalan ] = "Fitxers";
+    Text[ thai ] = "Archives";
 };
 String RID_SVXSTR_MULTIFILE_DBL_ERR
 {
@@ -351,7 +360,7 @@ String RID_SVXSTR_MULTIFILE_DBL_ERR
     Text [ ENGLISH ] = "The file %1 is already defined." ;
     Text [ english_us ] = "The file %1 already exists." ;
     Text [ portuguese ] = "O ficheiro %1 j� existe." ;
-    Text [ portuguese_brazilian ] = "O arquivo %1 j� existe." ;
+    Text [ portuguese_brazilian ] = "Die Datei %1 ist bereits vorhanden." ;
     Text [ swedish ] = "Filen %1 existerar redan." ;
     Text [ danish ] = "Filen %1 findes allerede." ;
     Text [ italian ] = "Il file %1 esiste gi�." ;
@@ -370,9 +379,12 @@ String RID_SVXSTR_MULTIFILE_DBL_ERR
     Text[ korean ] = "파일%1이(가) 이미 존재합니다.";
     Text[ turkish ] = "Dosya %1 mevcut durumda.";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "El archivo %1 ya existe.";
+    Text[ catalan ] = "El fitxer %1 ja existeix.";
     Text[ finnish ] = "Tiedosto %1 on jo olemassa.";
+    Text[ thai ] = "แฟ้ม %1 มีอยู่แล้ว";
 };
 
 
 
+
+
diff --git a/svx/source/options/optaccessibility.src b/svx/source/options/optaccessibility.src
index 9269e53bb849..0583ccede872 100644
--- a/svx/source/options/optaccessibility.src
+++ b/svx/source/options/optaccessibility.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: optaccessibility.src,v $
  *
- *  $Revision: 1.22 $
+ *  $Revision: 1.23 $
  *
- *  last change: $Author: rt $ $Date: 2002-12-09 09:58:07 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,22 +79,22 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
         Text[ english_us ] = "Miscellaneous options";
         Text[ portuguese ] = "Miscellaneous options";
         Text[ russian ] = "Miscellaneous options";
-        Text[ spanish ] = "Miscellaneous options";
-        Text[ italian ] = "Miscellaneous options";
-        Text[ swedish ] = "Miscellaneous options";
+        Text[ spanish ] = "Otras opciones";
+        Text[ italian ] = "Ulteriori opzioni";
+        Text[ swedish ] = "�vriga alternativ";
         Text[ polish ] = "Miscellaneous options";
         Text[ portuguese_brazilian ] = "Miscellaneous options";
-        Text[ japanese ] = "Miscellaneous options";
-        Text[ korean ] = "Miscellaneous options";
+        Text[ japanese ] = "その他のオプション";
+        Text[ korean ] = "기타 옵션";
         Text[ turkish ] = "Miscellaneous options";
         Text[ thai ] = "Miscellaneous options";
         Text[ greek ] = "Miscellaneous options";
         Text[ dutch ] = "Miscellaneous options";
-        Text[ french ] = "Miscellaneous options";
+        Text[ french ] = "Autres options";
         Text[ finnish ] = "Miscellaneous options";
         Text[ danish ] = "Miscellaneous options";
-        Text[ chinese_simplified ] = "Miscellaneous options";
-        Text[ chinese_traditional ] = "Miscellaneous options";
+        Text[ chinese_simplified ] = "其他选项";
+        Text[ chinese_traditional ] = "其他選項";
         Text[ arabic ] = "Miscellaneous options";
         Text[ catalan ] = "Miscellaneous options";
     };
@@ -102,7 +102,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
     {
         TabStop = TRUE ;
         Pos = MAP_APPFONT( COL1, ROWA_1 );
-        Size = MAP_APPFONT( CB_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT * 2 );
+        Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
         WordBreak = TRUE;
         Text = "Unterst�tzung ~behindertengerechter Zugangsprogramme (Programmneustart erforderlich)" ;
         Text [ ENGLISH ] = "Support ~assistive technology tools (program restart required)" ;
@@ -112,7 +112,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
         Text[ greek ] = "Support ~assistive technology tools (program restart required)";
         Text[ dutch ] = "Support ~assistive technology tools (program restart required)";
         Text[ french ] = "Support des logiciels d'accessibilit� pour les personnes souffrant d'un handicap (red�marrage du programme requis)";
-        Text[ spanish ] = "~Soporte de los programas de acceso adaptados a disminuidos (reiniciar el programa)";
+        Text[ spanish ] = "~Admisi�n de los programas de accesibilidad adaptados a disminuidos (reiniciar el programa)";
         Text[ finnish ] = "Support ~assistive technology tools (program restart required)";
         Text[ italian ] = "Supporto per facilitare l'accesso da parte di persone disabili (riavviare il programma)";
         Text[ danish ] = "Support ~assistive technology tools (program restart required)";
@@ -168,7 +168,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
         Text[ russian ] = "Use system ~font for user interface";
         Text[ greek ] = "Use system ~font for user interface";
         Text[ dutch ] = "Use system ~font for user interface";
-        Text[ french ] = "Utiliser la police du syst�me pour l'interface utilisateur";
+        Text[ french ] = "Police du syst�me pour l'interface utilisateur";
         Text[ spanish ] = "Utilizar las ~fuentes del sistema para la interfaz del usuario";
         Text[ finnish ] = "Use system ~font for user interface";
         Text[ italian ] = "Usa i caratteri del sistema per l'interfaccia utente";
@@ -206,7 +206,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
         Text[ polish ] = "Allow animated ~graphics";
         Text[ portuguese_brazilian ] = "Allow animated ~graphics";
         Text[ japanese ] = "アニメーション画像を許可する";
-        Text[ korean ] = "애니메이션된 그래픽 허용";
+        Text[ korean ] = "애니메이션된 그림 허용";
         Text[ chinese_simplified ] = "允许动画图形";
         Text[ chinese_traditional ] = "允許動畫圖形";
         Text[ turkish ] = "Allow animated ~graphics";
@@ -264,7 +264,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
         Text[ polish ] = "~Help tips disappear after ";
         Text[ portuguese_brazilian ] = "~Help tips disappear after ";
         Text[ japanese ] = "ヒントの表示時間";
-        Text[ korean ] = "도움말 지속시간";
+        Text[ korean ] = "도움말 지속 시간";
         Text[ chinese_simplified ] = "帮助文显示停留";
         Text[ chinese_traditional ] = "說明文顯示停留";
         Text[ turkish ] = "~Help tips disappear after ";
@@ -322,22 +322,22 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
         Text [ english_us ] = "Options for high contrast appearance";
         Text[ portuguese ] = "Options for high contrast appearance";
         Text[ russian ] = "Options for high contrast appearance";
-        Text[ spanish ] = "Options for high contrast appearance";
-        Text[ italian ] = "Options for high contrast appearance";
-        Text[ swedish ] = "Options for high contrast appearance";
+        Text[ spanish ] = "Opciones para la visualizaci�n de contraste elevado";
+        Text[ italian ] = "Opzioni per la visualizzazione a contrasto elevato";
+        Text[ swedish ] = "Alternativ f�r h�gkontrastvisning";
         Text[ polish ] = "Options for high contrast appearance";
         Text[ portuguese_brazilian ] = "Options for high contrast appearance";
-        Text[ japanese ] = "Options for high contrast appearance";
-        Text[ korean ] = "Options for high contrast appearance";
+        Text[ japanese ] = "高コントラスト表示のオプション";
+        Text[ korean ] = "고대비 표시 형식의 옵션";
         Text[ turkish ] = "Options for high contrast appearance";
         Text[ thai ] = "Options for high contrast appearance";
         Text[ greek ] = "Options for high contrast appearance";
         Text[ dutch ] = "Options for high contrast appearance";
-        Text[ french ] = "Options for high contrast appearance";
+        Text[ french ] = "Options pour le contraste �lev�";
         Text[ finnish ] = "Options for high contrast appearance";
         Text[ danish ] = "Options for high contrast appearance";
-        Text[ chinese_simplified ] = "Options for high contrast appearance";
-        Text[ chinese_traditional ] = "Options for high contrast appearance";
+        Text[ chinese_simplified ] = "系统的高对比度的设定";
+        Text[ chinese_traditional ] = "高對比度顯示的選項";
         Text[ arabic ] = "Options for high contrast appearance";
         Text[ catalan ] = "Options for high contrast appearance";
     };
@@ -351,22 +351,22 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
         Text [ english_us ] = "Automatically ~detect high contrast mode of operating system";
         Text[ portuguese ] = "Automatically detect high contrast mode of operating system";
         Text[ russian ] = "Automatically detect high contrast mode of operating system";
-        Text[ spanish ] = "Automatically detect high contrast mode of operating system";
-        Text[ italian ] = "Automatically detect high contrast mode of operating system";
-        Text[ swedish ] = "Automatically detect high contrast mode of operating system";
+        Text[ spanish ] = "Detecci�n autom�tica del modo de contraste elevado del sistema operativo";
+        Text[ italian ] = "Riconosci automaticamente la mo~dalit� a contrasto elevato del sistema operativo";
+        Text[ swedish ] = "K�nn igen operativsystemets h�gkontrastl�ge automatiskt";
         Text[ polish ] = "Automatically detect high contrast mode of operating system";
         Text[ portuguese_brazilian ] = "Automatically detect high contrast mode of operating system";
-        Text[ japanese ] = "Automatically detect high contrast mode of operating system";
-        Text[ korean ] = "Automatically detect high contrast mode of operating system";
+        Text[ japanese ] = "オペレーティングシステムの高コントラストモードを自動検出(~D)";
+        Text[ korean ] = "운영 체제의 고대비 모드를 자동으로 추적하기";
         Text[ turkish ] = "Automatically detect high contrast mode of operating system";
         Text[ thai ] = "Automatically detect high contrast mode of operating system";
         Text[ greek ] = "Automatically detect high contrast mode of operating system";
         Text[ dutch ] = "Automatically detect high contrast mode of operating system";
-        Text[ french ] = "Automatically detect high contrast mode of operating system";
+        Text[ french ] = "D�tection automatique du mode de contraste �lev� du syst�me d'exploitation";
         Text[ finnish ] = "Automatically detect high contrast mode of operating system";
         Text[ danish ] = "Automatically detect high contrast mode of operating system";
-        Text[ chinese_simplified ] = "Automatically detect high contrast mode of operating system";
-        Text[ chinese_traditional ] = "Automatically detect high contrast mode of operating system";
+        Text[ chinese_simplified ] = "自动识别作业系统的高对比度模式(~D)";
+        Text[ chinese_traditional ] = "自動偵測操作系統的高對比度模式";
         Text[ arabic ] = "Automatically detect high contrast mode of operating system";
         Text[ catalan ] = "Automatically detect high contrast mode of operating system";
     };
@@ -378,6 +378,23 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
         Text = "Automatische Schrift~farbe f�r Bildschirmdarstellung verwenden" ;
         Text [ ENGLISH ] = "Always use automatic font ~color for screen display" ;
         Text[ english_us ] = "Use automatic font ~color for screen display";
+        Text[ portuguese ] = "Always use automatic font ~color for screen display";
+        Text[ russian ] = "Always use automatic font ~color for screen display";
+        Text[ greek ] = "Always use automatic font ~color for screen display";
+        Text[ dutch ] = "Always use automatic font ~color for screen display";
+        Text[ french ] = "Couleur de police automatique pour l'affichage � l'�cran";
+        Text[ spanish ] = "Utilizar ~color de fuente autom�tico para la visualizaci�n en pantalla";
+        Text[ finnish ] = "Always use automatic font ~color for screen display";
+        Text[ italian ] = "Usa colore carattere automatico per le impostazioni dello schermo";
+        Text[ danish ] = "Always use automatic font ~color for screen display";
+        Text[ swedish ] = "Anv�nd automatisk tecken~f�rg f�r bildsk�rmsvisning";
+        Text[ polish ] = "Always use automatic font ~color for screen display";
+        Text[ japanese ] = "画面表示用フォント色を自動的に使用(~C)";
+        Text[ korean ] = "화면 표시용으로 자동 글꼴 색상을 사용 ";
+        Text[ chinese_simplified ] = "使用屏幕自动显示的字体颜色";
+        Text[ chinese_traditional ] = "將自動字型顏色用於螢幕顯示(~C)";
+        Text[ turkish ] = "Always use automatic font ~color for screen display";
+        Text[ arabic ] = "Always use automatic font ~color for screen display";
     };
     CheckBox CB_PAGE_PREVIEWS
     {
@@ -387,6 +404,28 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
         Text = "Systemfarben f�r Seitenvorschau ~verwenden" ;
         Text [ ENGLISH ] = "~Use system colors for page previews" ;
         Text[ english_us ] = "~Use system colors for page previews";
+        Text[ portuguese ] = "For page ~previews";
+        Text[ russian ] = "For page ~previews";
+        Text[ greek ] = "For page ~previews";
+        Text[ dutch ] = "For page ~previews";
+        Text[ french ] = "Couleurs du syst�me dans les aper�us de page";
+        Text[ spanish ] = "~Utilizar los colores del sistema en la vista preliminar";
+        Text[ finnish ] = "For page ~previews";
+        Text[ italian ] = "Applica i colori di sistema all'anteprima di pagina";
+        Text[ danish ] = "For page ~previews";
+        Text[ swedish ] = "An~v�nd systemf�rger f�r f�rhandsgranskning";
+        Text[ polish ] = "For page ~previews";
+        Text[ japanese ] = "システムカラーを印刷プレビューで使用(~U)";
+        Text[ korean ] = "시스템 색상을 페이지 미리 보기용으로 사용";
+        Text[ chinese_simplified ] = "使用作业系统预设的页面视图的颜色(~U)";
+        Text[ chinese_traditional ] = "將系統顏色用於頁面預覽(~U)";
+        Text[ turkish ] = "For page ~previews";
+        Text[ arabic ] = "For page ~previews";
     };
 };
 
+
+
+
+
+
diff --git a/svx/source/options/optasian.src b/svx/source/options/optasian.src
index a9043c64a256..35bdd63678dd 100644
--- a/svx/source/options/optasian.src
+++ b/svx/source/options/optasian.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: optasian.src,v $
  *
- *  $Revision: 1.37 $
+ *  $Revision: 1.38 $
  *
- *  last change: $Author: kz $ $Date: 2003-02-27 12:57:25 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -90,15 +90,16 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
         Text[ danish ] = "Knibning";
         Text[ swedish ] = "Kerning";
         Text[ polish ] = "Kerning";
-        Text[ portuguese_brazilian ] = "Ajustar";
+        Text[ portuguese_brazilian ] = "Kerning";
         Text[ japanese ] = "カーニング";
         Text[ korean ] = "커닝";
         Text[ chinese_simplified ] = "字符间隔";
         Text[ chinese_traditional ] = "字元間隔";
         Text[ turkish ] = "Kerning";
         Text[ arabic ] = "����� ����";
-        Text[ catalan ] = "Kerning";
+        Text[ catalan ] = "Interlletratge";
         Text[ finnish ] = "V�listys";
+        Text[ thai ] = "ปรับระยะ";
     };
     RadioButton RB_CHAR_KERNING
     {
@@ -116,16 +117,17 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
         Text[ italian ] = "Solo caratteri occidentali";
         Text[ danish ] = "~Kun vestlige tegn";
         Text[ swedish ] = "Bara v�stliga tecke~n";
-        Text[ polish ] = "~Tylko znaki zachodnie";
-        Text[ portuguese_brazilian ] = "~Somente caracteres ocidentais";
+        Text[ polish ] = "Tylko znaki zachodnie";
+        Text[ portuguese_brazilian ] = "Western characters only";
         Text[ japanese ] = "英字のみ(~W)";
-        Text[ korean ] = "알파벳 문자만(~W)";
+        Text[ korean ] = "영어 문자만(~W)";
         Text[ chinese_simplified ] = "仅适用于西文(~W)";
         Text[ chinese_traditional ] = "僅用於西文(~W)";
         Text[ turkish ] = "Western characters only";
         Text[ arabic ] = "���� ����� ���";
-        Text[ catalan ] = "Solo caracteres del alfabeto occidental";
+        Text[ catalan ] = "Nom�s car�cters de l'alfabet occidental";
         Text[ finnish ] = "Vain l�nsimaiset merkit";
+        Text[ thai ] = "ตัวอักขระแบบ~ตะวันตกเท่านั้น";
     };
     RadioButton RB_CHAR_PUNCT
     {
@@ -137,22 +139,23 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
         Text[ portuguese ] = "~Texto ocidental e pontua��o";
         Text[ russian ] = "�������� ����� � ��������� ����������";
         Text[ greek ] = "������ ������� ��� ������ ������";
-        Text[ dutch ] = "~Westerse tekst en Asiatische interpunctie";
+        Text[ dutch ] = "~Westerse tekst en Aziatische interpunctie";
         Text[ french ] = "Caract�res ~occidentaux et ponctuation asiatique";
         Text[ spanish ] = "Texto occidental y puntuaci�n asi�tica";
         Text[ finnish ] = "L�nsimainen teksti ja v�limerkit";
         Text[ italian ] = "~Testo occidentale e punteggiatura asiatica";
         Text[ danish ] = "~Vestlig tekst og tegns�tning";
         Text[ swedish ] = "~V�stliga tecken och asiatisk interpunktion";
-        Text[ polish ] = "Znaki ~zachodnie i interpunkcja azjatycka";
-        Text[ portuguese_brazilian ] = "Texto e pontua��o ocidentais";
+        Text[ polish ] = "Znaki zachodnie i interpunkcja azjatycka";
+        Text[ portuguese_brazilian ] = "Western text and punctuation";
         Text[ japanese ] = "半角英字と日本語の区切り記号(~T)";
-        Text[ korean ] = "알파벳 문자와 아시아 구두점(T)";
+        Text[ korean ] = "영어 텍스트 및 한국어 문장 부호(~T)";
         Text[ chinese_simplified ] = "西文字符和中日韩标点符号(~T)";
         Text[ chinese_traditional ] = "西文和中日韓文字標點符號(~T)";
         Text[ turkish ] = "Western text and punctuation";
         Text[ arabic ] = "�� ���� ������� �����";
-        Text[ catalan ] = "Texto y puntuaci�n occidentales";
+        Text[ catalan ] = "Text i puntuaci� occidentals";
+        Text[ thai ] = "~ข้อความและเครื่องหมายวรรคตอนแบบตะวันตก";
     };
     FixedLine GB_CHAR_DIST
     {
@@ -164,22 +167,23 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
         Text[ portuguese ] = "Espa�amento entre caracteres";
         Text[ russian ] = "����������� ��������";
         Text[ greek ] = "�������� ����������";
-        Text[ dutch ] = "Spati�ring";
+        Text[ dutch ] = "Kerning";
         Text[ french ] = "Espacement des caract�res";
         Text[ spanish ] = "Espacio entre caracteres";
         Text[ italian ] = "Spazio tra caratteri";
         Text[ danish ] = "Linjeafstand";
         Text[ swedish ] = "Teckenavst�nd";
         Text[ polish ] = "Odst�py mi�dzy znakami";
-        Text[ portuguese_brazilian ] = "Espa�amento entre caracteres";
+        Text[ portuguese_brazilian ] = "Character distance";
         Text[ japanese ] = "文字間隔の調整";
-        Text[ korean ] = "자간";
+        Text[ korean ] = "문자 간격 조정";
         Text[ chinese_simplified ] = "字符间隔";
         Text[ chinese_traditional ] = "字元間隔";
         Text[ turkish ] = "Character distance";
         Text[ arabic ] = "����� ������";
-        Text[ catalan ] = "Character distance";
+        Text[ catalan ] = "Espai entre car�cters";
         Text[ finnish ] = "Merkkien v�lit";
+        Text[ thai ] = "ระยะห่างตัวอักขระ";
     };
     RadioButton RB_NO_COMP
     {
@@ -197,16 +201,17 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
         Text[ italian ] = "Senza compressione";
         Text[ danish ] = "~Ingen kompression";
         Text[ swedish ] = "Ingen ~kompression";
-        Text[ polish ] = "~Bez kompresji";
-        Text[ portuguese_brazilian ] = "~Sem compress�o";
+        Text[ polish ] = "Bez kompresji";
+        Text[ portuguese_brazilian ] = "No compression";
         Text[ japanese ] = "間隔を詰めない(~N)";
-        Text[ korean ] = "압축 안함(~N)";
+        Text[ korean ] = "간격 좁히지 않음(~N)";
         Text[ chinese_simplified ] = "不压缩(~N)";
         Text[ chinese_traditional ] = "不壓縮(~N)";
         Text[ turkish ] = "No compression";
         Text[ arabic ] = "���� ���";
-        Text[ catalan ] = "Sin compresi�n";
+        Text[ catalan ] = "Sense compressi�";
         Text[ finnish ] = "Ei pakkausta";
+        Text[ thai ] = "ไ~ม่ย่อ";
     };
     RadioButton RB_PUNCT_COMP
     {
@@ -220,20 +225,21 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
         Text[ greek ] = "�������� ���� ��� ������� ������";
         Text[ dutch ] = "Alleen ~interpunctie comprimeren";
         Text[ french ] = "Compression uniquement pour la ponctuat~ion";
-        Text[ spanish ] = "Comprimir solo puntuaci�n";
+        Text[ spanish ] = "C~omprimir s�lo la puntuaci�n";
         Text[ italian ] = "Comprimi solo le interpunzioni";
         Text[ danish ] = "K~omprimer kun tegns�tning";
         Text[ swedish ] = "Komprimera bara ~interpunktion";
-        Text[ polish ] = "~Kondensuj tylko interpunkcj�";
-        Text[ portuguese_brazilian ] = "Compactar somente pontua��o";
+        Text[ polish ] = "Skompresuj tylko interpunkcj�";
+        Text[ portuguese_brazilian ] = "Compress punctuation only";
         Text[ japanese ] = "句読点のみを詰める(~C)";
-        Text[ korean ] = "구두점만 압축(~C)";
+        Text[ korean ] = "문장 부호만 좁힘(~C)";
         Text[ chinese_simplified ] = "只压缩标点符号(~C)";
         Text[ chinese_traditional ] = "僅壓縮標點符號(~C)";
         Text[ turkish ] = "Compress punctuation only";
         Text[ arabic ] = "��� ������ ������� ���";
-        Text[ catalan ] = "Comprimir solo puntuaci�n";
+        Text[ catalan ] = "Comprimeix nom�s la puntuaci�";
         Text[ finnish ] = "Vain v�limerkkien tiivistys";
+        Text[ thai ] = "~ย่อเครื่องหมายวรรคตอนเท่านั้น";
     };
     RadioButton RB_PUNCT_KANA_COMP
     {
@@ -251,16 +257,17 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
         Text[ italian ] = "Comprimi interpunzioni e kana giapponese";
         Text[ danish ] = "Komprimer tegns�tning og ~japansk Kana";
         Text[ swedish ] = "Komprimera interpunktion och ~japansk Kana";
-        Text[ polish ] = "Kondensuj ~interpunkcj� i japo�sk� Kan�";
-        Text[ portuguese_brazilian ] = "Compactar pontua��o e Kana japon�s";
+        Text[ polish ] = "Skompresuj interpunkcj� i japo�sk� Kan�";
+        Text[ portuguese_brazilian ] = "Compress punctuation and japanese Kana";
         Text[ japanese ] = "句読点とかなを詰める(~P)";
-        Text[ korean ] = "구두점과 일본 가나문자만 압축(~P)";
+        Text[ korean ] = "문장 부호 및 일본 가나문자만 좁힘(~P)";
         Text[ chinese_simplified ] = "压缩标点符号和日文假名(~P)";
         Text[ chinese_traditional ] = "僅壓縮標點符號和日文假名(~P)";
         Text[ turkish ] = "Compress punctuation and japanese Kana";
         Text[ arabic ] = "Compress punctuation and japanese Kana";
-        Text[ catalan ] = "Comprimir puntuaci�n y Kana japon�s";
+        Text[ catalan ] = "Comprimeix la puntuaci� i el Kana japon�s";
         Text[ finnish ] = "V�limerkkien ja japanilaisten kana-merkkien tiivistys";
+        Text[ thai ] = "ย่อเ~ครื่องหมายวรรคตอนและภาษาญี่ปุ่นแบบคานะ";
     };
     FixedLine GB_START_END
     {
@@ -279,15 +286,16 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
         Text[ danish ] = "Start- og sluttegn";
         Text[ swedish ] = "Start- och sluttecken";
         Text[ polish ] = "Znaki wiod�ce i ko�cowe";
-        Text[ portuguese_brazilian ] = "Caracteres iniciais e finais";
+        Text[ portuguese_brazilian ] = "Start and end characters";
         Text[ japanese ] = "行頭禁則文字と行末禁則文字";
-        Text[ korean ] = "시작문자와 끝문자";
+        Text[ korean ] = "금칙 문자";
         Text[ chinese_simplified ] = "开头和结尾字符";
         Text[ chinese_traditional ] = "開頭字元和結尾字元";
         Text[ turkish ] = "Start and end characters";
         Text[ arabic ] = "���� ������� ��������";
-        Text[ catalan ] = "Start and end characters";
+        Text[ catalan ] = "Primers i �ltims car�cters";
         Text[ finnish ] = "Aloitus- ja lopetusmerkit";
+        Text[ thai ] = "ตัวอักขระตัวแรกและตัวสุดท้าย";
     };
     FixedText FT_LANGUAGE
     {
@@ -305,16 +313,17 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
         Text[ italian ] = "~Lingua";
         Text[ danish ] = "~Sprog";
         Text[ swedish ] = "~Spr�k";
-        Text[ polish ] = "~J�zyk";
-        Text[ portuguese_brazilian ] = "~Idioma";
+        Text[ polish ] = "J�zyk";
+        Text[ portuguese_brazilian ] = "Language";
         Text[ japanese ] = "言語(~L)";
         Text[ korean ] = "언어(~L)";
         Text[ chinese_simplified ] = "语言(~L)";
         Text[ chinese_traditional ] = "語言(~L)";
         Text[ turkish ] = "Language";
         Text[ arabic ] = "�����";
-        Text[ catalan ] = "Idioma";
+        Text[ catalan ] = "~Idioma";
         Text[ finnish ] = "Kieli";
+        Text[ thai ] = "~ภาษา";
     };
     ListBox LB_LANGUAGE
     {
@@ -333,22 +342,23 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
         Text[ portuguese ] = "~Padr�o";
         Text[ russian ] = "�� ���������";
         Text[ greek ] = "����������";
-        Text[ dutch ] = "S~tandaard";
+        Text[ dutch ] = "~Standaard";
         Text[ french ] = "Par d�faut";
         Text[ spanish ] = "Predeterminado";
         Text[ italian ] = "~Standard";
         Text[ danish ] = "Stan~dard";
         Text[ swedish ] = "St~andard";
-        Text[ polish ] = "~Domy�lnie";
-        Text[ portuguese_brazilian ] = "~Padr�o";
+        Text[ polish ] = "Domy�lnie";
+        Text[ portuguese_brazilian ] = "Standard";
         Text[ japanese ] = "標準(~D)";
-        Text[ korean ] = "표준(~D)";
+        Text[ korean ] = "기본값(~D)";
         Text[ chinese_simplified ] = "标准(~D)";
         Text[ chinese_traditional ] = "標準(~D)";
         Text[ turkish ] = "Standard";
         Text[ arabic ] = "�����";
         Text[ catalan ] = "~Per defecte";
         Text[ finnish ] = "Oletus";
+        Text[ thai ] = "~ค่าเริ่มต้น";
     };
     FixedText FT_START
     {
@@ -366,17 +376,18 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
         Text[ italian ] = "No ad inizio riga:";
         Text[ danish ] = "I~ngen linjestart:";
         Text[ swedish ] = "Inte i ~b�rjan av rad:";
-        Text[ polish ] = "~Nie na pocz�tku wiersza:";
-        Text[ portuguese_brazilian ] = "Sem in�cio de linha:";
+        Text[ polish ] = "Nie na pocz�tku wiersza:";
+        Text[ portuguese_brazilian ] = "No start of line:";
         Text[ japanese ] = "行頭禁則文字:";
-        Text[ korean ] = "행 시작 아님:";
+        Text[ korean ] = "줄 앞 금칙 문자:";
         Text[ chinese_simplified ] = "行首禁止使用字符：";
         Text[ chinese_traditional ] = "行首禁止使用字元：";
         Text[ turkish ] = "No start of line:";
         Text[ arabic ] = "���� ����� �����:";
         Text[ language_user1 ] = "EM22.3.01: Dt soll eigtl \"nicht am Z...\" heissen.";
-        Text[ catalan ] = "Sin inicio de fila:";
+        Text[ catalan ] = "Sense inici de fila:";
         Text[ finnish ] = "Ei rivin alussa:";
+        Text[ thai ] = "ไม่ใช่จุดเริ่มของบรรทัด:";
     };
     Edit ED_START
     {
@@ -400,17 +411,18 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
         Text[ italian ] = "No a fine riga:";
         Text[ danish ] = "Ingen linje~afslutning:";
         Text[ swedish ] = "Inte i slut~et av rad:";
-        Text[ polish ] = "Ni~e na ko�cu wiersza:";
-        Text[ portuguese_brazilian ] = "Sem final de linha:";
+        Text[ polish ] = "Nie na ko�cu wiersza:";
+        Text[ portuguese_brazilian ] = "No end of line:";
         Text[ japanese ] = "行末禁則文字:";
-        Text[ korean ] = "행 끝 아님:";
+        Text[ korean ] = "줄 뒤 금칙 문자:";
         Text[ chinese_simplified ] = "行末禁止使用字符：";
         Text[ chinese_traditional ] = "行末禁止使用字元：";
         Text[ turkish ] = "No end of line:";
         Text[ arabic ] = "���� ����� ���:";
         Text[ language_user1 ] = "EM22.3.01: Dt soll eigtl \"nicht am Z...\" heissen.";
-        Text[ catalan ] = "Sin fin de l�nea:";
+        Text[ catalan ] = "Sense final de l�nia:";
         Text[ finnish ] = "Ei rivin lopussa:";
+        Text[ thai ] = "ไม่ใช่จุดสิ้นสุดบรรทัด:";
     };
     Edit ED_END
     {
@@ -435,15 +447,16 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
         Text[ danish ] = "Uden brugerdefinerede linjeskifttegn";
         Text[ swedish ] = "Utan anv�ndardefinierade radbrytningstecken";
         Text[ polish ] = "Bez zdefiniowanych indywidualnie znak�w podzia�u wiersza";
-        Text[ portuguese_brazilian ] = "Sem quebra de linha definida pelo usu�rio";
+        Text[ portuguese_brazilian ] = "Without user-defined line break symbols";
         Text[ japanese ] = "ユーザー定義の改行時の禁則文字は除く";
-        Text[ korean ] = "사용자 정의 줄바꾸기 기호 없음";
+        Text[ korean ] = "사용자 정의 줄바꿈 기호 없음";
         Text[ chinese_simplified ] = "不附带使用者自定的换行符号";
         Text[ chinese_traditional ] = "不附帶使用者自訂的換行符號";
         Text[ turkish ] = "Without user-defined line break symbols";
         Text[ arabic ] = "���� ������ ��� ���� �����";
-        Text[ catalan ] = "Sin car�cter de cambio de fila definido por el usuario";
+        Text[ catalan ] = "Sense car�cter de canvi de fila definit per l'usuari";
         Text[ finnish ] = "Ilman k�ytt�j�n m��ritt�mi� rivinvaihtomerkkej�";
+        Text[ thai ] = "ไม่มีบรรทัดระบุผู้ใช้แบ่งสัญลักษณ์";
     };
     Text[ english_us ] = "Proxy";
     Text[ portuguese ] = "Proxy";
@@ -465,6 +478,7 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
     Text[ arabic ] = "Proxy";
     Text[ catalan ] = "Servidor intermediari";
     Text[ finnish ] = "V�lityspalvelin";
+    Text[ thai ] = "Proxy";
 };
 
 
@@ -483,3 +497,7 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
 
 
 
+
+
+
+
diff --git a/svx/source/options/optcolor.src b/svx/source/options/optcolor.src
index 7da58144ca6c..07ba58842ba2 100644
--- a/svx/source/options/optcolor.src
+++ b/svx/source/options/optcolor.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: optcolor.src,v $
  *
- *  $Revision: 1.29 $
+ *  $Revision: 1.30 $
  *
- *  last change: $Author: kz $ $Date: 2002-12-09 11:42:50 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -176,7 +176,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
         Text[ greek ] = "Delete";
         Text[ dutch ] = "Delete";
         Text[ french ] = "Supprimer";
-        Text[ spanish ] = "Eliminar";
+        Text[ spanish ] = "Borrar";
         Text[ finnish ] = "Delete";
         Text[ italian ] = "Elimina";
         Text[ danish ] = "Delete";
@@ -197,25 +197,25 @@ TabPage RID_SVXPAGE_COLORCONFIG
         Pos = MAP_APPFONT ( 6 , 34 ) ;
         Size = MAP_APPFONT ( 248 , 8 ) ;
 
-        Text = "Schema" ;
+        Text = "Benutzerdefinierte Farben" ;
         Text [ ENGLISH ] = "Scheme" ;
-        Text[ english_us ] = "Scheme";
+        Text[ english_us ] = "Custom colors";
         Text[ portuguese ] = "Scheme";
         Text[ russian ] = "Scheme";
         Text[ greek ] = "Scheme";
         Text[ dutch ] = "Scheme";
-        Text[ french ] = "Sch�ma";
-        Text[ spanish ] = "Esquema";
+        Text[ french ] = "Couleurs personnalis�es";
+        Text[ spanish ] = "Colores personalizados";
         Text[ finnish ] = "Scheme";
-        Text[ italian ] = "Schema";
+        Text[ italian ] = "Colori personalizzati";
         Text[ danish ] = "Scheme";
-        Text[ swedish ] = "Schema";
+        Text[ swedish ] = "Anv�ndardefinierade f�rger";
         Text[ polish ] = "Scheme";
         Text[ portuguese_brazilian ] = "Scheme";
         Text[ japanese ] = "パターン";
-        Text[ korean ] = "구성표";
-        Text[ chinese_simplified ] = "颜色图案";
-        Text[ chinese_traditional ] = "顏色圖案";
+        Text[ korean ] = "사용자 정의 색상";
+        Text[ chinese_simplified ] = "自定的颜色";
+        Text[ chinese_traditional ] = "自訂的顏色";
         Text[ turkish ] = "Scheme";
         Text[ arabic ] = "Scheme";
         Text[ catalan ] = "Scheme";
@@ -304,7 +304,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
             Text[ polish ] = "Color setting";
             Text[ portuguese_brazilian ] = "Color setting";
             Text[ japanese ] = "色の設定";
-            Text[ korean ] = "색 설정";
+            Text[ korean ] = "색상 설정";
             Text[ chinese_simplified ] = "颜色的设定";
             Text[ chinese_traditional ] = "顔色的設定";
             Text[ turkish ] = "Color setting";
@@ -437,9 +437,9 @@ TabPage RID_SVXPAGE_COLORCONFIG
             CheckBox CB_DOCBOUND
             {
                 CB_POS_SIZE( 2 );
-                Text = "Dokumentumrandung" ;
+                Text = "Textbegrenzungen" ;
                 Text [ ENGLISH ] = "Document boundaries" ;
-                Text[ english_us ] = "Document boundaries";
+                Text[ english_us ] = "Text boundaries";
                 Text[ portuguese ] = "Document boundaries";
                 Text[ russian ] = "Document boundaries";
                 Text[ greek ] = "Document boundaries";
@@ -558,22 +558,22 @@ TabPage RID_SVXPAGE_COLORCONFIG
                 Text[ english_us ] = "Font color";
                 Text[ portuguese ] = "Font color";
                 Text[ russian ] = "Font color";
-                Text[ spanish ] = "Font color";
-                Text[ italian ] = "Font color";
-                Text[ swedish ] = "Font color";
+                Text[ spanish ] = "Color de la fuente";
+                Text[ italian ] = "Colore carattere";
+                Text[ swedish ] = "Teckenf�rg";
                 Text[ polish ] = "Font color";
                 Text[ portuguese_brazilian ] = "Font color";
-                Text[ japanese ] = "Font color";
-                Text[ korean ] = "Font color";
+                Text[ japanese ] = "フォントの色";
+                Text[ korean ] = "글꼴 색상";
                 Text[ turkish ] = "Font color";
                 Text[ thai ] = "Font color";
                 Text[ greek ] = "Font color";
                 Text[ dutch ] = "Font color";
-                Text[ french ] = "Font color";
+                Text[ french ] = "Couleur de police";
                 Text[ finnish ] = "Font color";
                 Text[ danish ] = "Font color";
-                Text[ chinese_simplified ] = "Font color";
-                Text[ chinese_traditional ] = "Font color";
+                Text[ chinese_simplified ] = "文字颜色";
+                Text[ chinese_traditional ] = "字型顏色";
                 Text[ arabic ] = "Font color";
                 Text[ catalan ] = "Font color";
             };
@@ -742,7 +742,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
                 Text[ polish ] = "Field shadings";
                 Text[ portuguese_brazilian ] = "Field shadings";
                 Text[ japanese ] = "フィールドのシェーディング";
-                Text[ korean ] = "필드 음영 효과";
+                Text[ korean ] = "필드 음영";
                 Text[ chinese_simplified ] = "字段背景颜色";
                 Text[ chinese_traditional ] = "欄位背景顔色";
                 Text[ turkish ] = "Field shadings";
@@ -850,7 +850,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
                 Text[ greek ] = "Section boundaries";
                 Text[ dutch ] = "Section boundaries";
                 Text[ french ] = "Bordures des sections";
-                Text[ spanish ] = "Bordes del �rea";
+                Text[ spanish ] = "Bordes de la secci�n";
                 Text[ finnish ] = "Section boundaries";
                 Text[ italian ] = "Margini sezione";
                 Text[ danish ] = "Section boundaries";
@@ -858,7 +858,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
                 Text[ polish ] = "Section boundaries";
                 Text[ portuguese_brazilian ] = "Section boundaries";
                 Text[ japanese ] = "範囲の境界";
-                Text[ korean ] = "영역 테두리";
+                Text[ korean ] = "구역 테두리";
                 Text[ chinese_simplified ] = "区域的边框";
                 Text[ chinese_traditional ] = "區域的邊框";
                 Text[ turkish ] = "Section boundaries";
@@ -873,6 +873,25 @@ TabPage RID_SVXPAGE_COLORCONFIG
                 FT_POS_SIZE( 17 );
                 Text = "Seiten- und Spaltenumbr�che" ;
                 Text[ english_us ] = "Page and column breaks";
+                Text[ portuguese ] = "Page breaks";
+                Text[ russian ] = "Page breaks";
+                Text[ greek ] = "Page breaks";
+                Text[ dutch ] = "Page breaks";
+                Text[ french ] = "Sauts de page et de colonne";
+                Text[ spanish ] = "Saltos de p�gina y de columna";
+                Text[ finnish ] = "Page breaks";
+                Text[ italian ] = "Interruzioni di pagina e di colonna";
+                Text[ danish ] = "Page breaks";
+                Text[ swedish ] = "Sid- och kolumnbrytningar";
+                Text[ polish ] = "Page breaks";
+                Text[ japanese ] = "改ページ";
+                Text[ korean ] = "페이지 및 열 나누기";
+                Text[ chinese_simplified ] = "换页";
+                Text[ chinese_traditional ] = "換頁和換欄";
+                Text[ turkish ] = "Page breaks";
+                Text[ arabic ] = "Page breaks";
+                Text[ catalan ] = "Page breaks";
+                Text[ thai ] = "Page breaks";
             };
             LB_WN( WRITERPAGEBREAKS, 17 )
 
@@ -981,7 +1000,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
                 Text[ polish ] = "Comment highlighting";
                 Text[ portuguese_brazilian ] = "Comment highlighting";
                 Text[ japanese ] = "コメントのハイライト";
-                Text[ korean ] = "주석 강조 표시";
+                Text[ korean ] = "설명 강조 표시";
                 Text[ chinese_simplified ] = "突出显示备注";
                 Text[ chinese_traditional ] = "突出顯示備註";
                 Text[ turkish ] = "Comment highlighting";
@@ -1010,7 +1029,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
                 Text[ polish ] = "Keyword highlighting";
                 Text[ portuguese_brazilian ] = "Keyword highlighting";
                 Text[ japanese ] = "キーワードのハイライト";
-                Text[ korean ] = "핵심어 강조 표시";
+                Text[ korean ] = "키워드 강조 표시";
                 Text[ chinese_simplified ] = "突出显示关键字";
                 Text[ chinese_traditional ] = "突出顯示關鍵字";
                 Text[ turkish ] = "Keyword highlighting";
@@ -1096,7 +1115,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
                 Text[ polish ] = "Grid lines";
                 Text[ portuguese_brazilian ] = "Grid lines";
                 Text[ japanese ] = "グリッド線";
-                Text[ korean ] = "그리드선";
+                Text[ korean ] = "눈금선";
                 Text[ chinese_simplified ] = "格子线条";
                 Text[ chinese_traditional ] = "格子線條";
                 Text[ turkish ] = "Grid lines";
@@ -1154,7 +1173,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
                 Text[ polish ] = "Manual page breaks";
                 Text[ portuguese_brazilian ] = "Manual page breaks";
                 Text[ japanese ] = "手動改ページ";
-                Text[ korean ] = "수동 나누기";
+                Text[ korean ] = "수동 페이지 나누기";
                 Text[ chinese_simplified ] = "手工换页";
                 Text[ chinese_traditional ] = "手動換頁";
                 Text[ turkish ] = "Manual page breaks";
@@ -1233,7 +1252,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
                 Text[ greek ] = "Detective error";
                 Text[ dutch ] = "Detective error";
                 Text[ french ] = "Erreur d'audit";
-                Text[ spanish ] = "Error detective";
+                Text[ spanish ] = "Error de detective";
                 Text[ finnish ] = "Detective error";
                 Text[ italian ] = "Errore detective";
                 Text[ danish ] = "Detective error";
@@ -1382,7 +1401,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
                 Text[ finnish ] = "Basic Syntax Highlighting";
                 Text[ italian ] = "Mettere in rilievo sintassi base";
                 Text[ danish ] = "Basic Syntax Highlighting";
-                Text[ swedish ] = "Standardmarkering av syntax";
+                Text[ swedish ] = "Markering av Basic-syntax";
                 Text[ polish ] = "Basic Syntax Highlighting";
                 Text[ portuguese_brazilian ] = "Basic Syntax Highlighting";
                 Text[ japanese ] = "Basic シンタックスのハイライト";
@@ -1472,7 +1491,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
                 Text[ polish ] = "Number";
                 Text[ portuguese_brazilian ] = "Number";
                 Text[ japanese ] = "数値";
-                Text[ korean ] = "개수";
+                Text[ korean ] = "수";
                 Text[ chinese_simplified ] = "数字";
                 Text[ chinese_traditional ] = "數字";
                 Text[ turkish ] = "Number";
@@ -1559,7 +1578,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
                 Text[ polish ] = "Reserved expression";
                 Text[ portuguese_brazilian ] = "Reserved expression";
                 Text[ japanese ] = "予約語";
-                Text[ korean ] = "예약어";
+                Text[ korean ] = "예약식";
                 Text[ chinese_simplified ] = "保留的表达式";
                 Text[ chinese_traditional ] = "保留的表達式";
                 Text[ turkish ] = "Reserved expression";
@@ -1612,7 +1631,7 @@ QueryBox RID_SVXQB_DELETE_COLOR_CONFIG
     Message[ greek ] = "Do you really want to delete the color scheme?";
     Message[ dutch ] = "Do you really want to delete the color scheme?";
     Message[ french ] = "Voulez-vous vraiment supprimer le sch�ma de couleur ?";
-    Message[ spanish ] = "�Desea eliminar el esquema de colores?";
+    Message[ spanish ] = "�Desea borrar el esquema de colores?";
     Message[ finnish ] = "Do you really want to delete the color scheme?";
     Message[ italian ] = "Volete eliminare lo schema colori?";
     Message[ danish ] = "Do you really want to delete the color scheme?";
@@ -1637,7 +1656,7 @@ String RID_SVXSTR_COLOR_CONFIG_DELETE
     Text[ greek ] = "Color Scheme Deletion";
     Text[ dutch ] = "Color Scheme Deletion";
     Text[ french ] = "Confirmer la suppression du sch�ma";
-    Text[ spanish ] = "Confirmar la eliminaci�n del esquema";
+    Text[ spanish ] = "Confirmar la supresi�n del esquema";
     Text[ finnish ] = "Color Scheme Deletion";
     Text[ italian ] = "Conferma eliminazione dello schema";
     Text[ danish ] = "Color Scheme Deletion";
@@ -1704,3 +1723,8 @@ String RID_SVXSTR_COLOR_CONFIG_SAVE2
     Text[ thai ] = "Name of color scheme";
 };
 
+
+
+
+
+
diff --git a/svx/source/options/optctl.src b/svx/source/options/optctl.src
index b41203a12e50..d9a833a95412 100644
--- a/svx/source/options/optctl.src
+++ b/svx/source/options/optctl.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: optctl.src,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2002-12-09 09:58:54 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -82,22 +82,22 @@ TabPage RID_SVXPAGE_OPTIONS_CTL
         Text[ english_us ] = "Sequence checking";
         Text[ portuguese ] = "Sequence checking";
         Text[ russian ] = "Sequence checking";
-        Text[ spanish ] = "Sequence checking";
-        Text[ italian ] = "Sequence checking";
-        Text[ swedish ] = "Sequence checking";
+        Text[ spanish ] = "Control de secuencia";
+        Text[ italian ] = "Controllo sequenza";
+        Text[ swedish ] = "Sekvenskontroll";
         Text[ polish ] = "Sequence checking";
         Text[ portuguese_brazilian ] = "Sequence checking";
-        Text[ japanese ] = "Sequence checking";
-        Text[ korean ] = "Sequence checking";
+        Text[ japanese ] = "シーケンスチェック";
+        Text[ korean ] = "순서 검사";
         Text[ turkish ] = "Sequence checking";
         Text[ thai ] = "Sequence checking";
         Text[ greek ] = "Sequence checking";
         Text[ dutch ] = "Sequence checking";
-        Text[ french ] = "Sequence checking";
+        Text[ french ] = "Contr�le de s�quence";
         Text[ finnish ] = "Sequence checking";
         Text[ danish ] = "Sequence checking";
-        Text[ chinese_simplified ] = "Sequence checking";
-        Text[ chinese_traditional ] = "Sequence checking";
+        Text[ chinese_simplified ] = "检查顺序";
+        Text[ chinese_traditional ] = "順序檢查";
         Text[ arabic ] = "Sequence checking";
         Text[ catalan ] = "Sequence checking";
     };
@@ -109,22 +109,22 @@ TabPage RID_SVXPAGE_OPTIONS_CTL
         Text[ english_us ] = "Use se~quence checking";
         Text[ portuguese ] = "Use se~quence checking";
         Text[ russian ] = "Use se~quence checking";
-        Text[ spanish ] = "Use se~quence checking";
-        Text[ italian ] = "Use se~quence checking";
-        Text[ swedish ] = "Use se~quence checking";
+        Text[ spanish ] = "Aplicar el ~control de secuencia";
+        Text[ italian ] = "Applica controllo se~quenza";
+        Text[ swedish ] = "Anv�nd sekvenskontroll";
         Text[ polish ] = "Use se~quence checking";
         Text[ portuguese_brazilian ] = "Use se~quence checking";
-        Text[ japanese ] = "Use se~quence checking";
-        Text[ korean ] = "Use se~quence checking";
+        Text[ japanese ] = "シーケンスチェックを使用(~Q)";
+        Text[ korean ] = "순서 검사 사용";
         Text[ turkish ] = "Use se~quence checking";
         Text[ thai ] = "Use se~quence checking";
         Text[ greek ] = "Use se~quence checking";
         Text[ dutch ] = "Use se~quence checking";
-        Text[ french ] = "Use se~quence checking";
+        Text[ french ] = "Appliquer le contr�le de s�quence";
         Text[ finnish ] = "Use se~quence checking";
         Text[ danish ] = "Use se~quence checking";
-        Text[ chinese_simplified ] = "Use se~quence checking";
-        Text[ chinese_traditional ] = "Use se~quence checking";
+        Text[ chinese_simplified ] = "使用顺序检查";
+        Text[ chinese_traditional ] = "使用順序檢查(~q)";
         Text[ arabic ] = "Use se~quence checking";
         Text[ catalan ] = "Use se~quence checking";
     };
@@ -136,22 +136,22 @@ TabPage RID_SVXPAGE_OPTIONS_CTL
         Text[ english_us ] = "Cursor control";
         Text[ portuguese ] = "Cursor control";
         Text[ russian ] = "Cursor control";
-        Text[ spanish ] = "Cursor control";
-        Text[ italian ] = "Cursor control";
-        Text[ swedish ] = "Cursor control";
+        Text[ spanish ] = "Control del cursor";
+        Text[ italian ] = "Controllo cursore";
+        Text[ swedish ] = "Mark�rkontroll";
         Text[ polish ] = "Cursor control";
         Text[ portuguese_brazilian ] = "Cursor control";
-        Text[ japanese ] = "Cursor control";
-        Text[ korean ] = "Cursor control";
+        Text[ japanese ] = "カーソル制御";
+        Text[ korean ] = "커서 제어";
         Text[ turkish ] = "Cursor control";
         Text[ thai ] = "Cursor control";
         Text[ greek ] = "Cursor control";
         Text[ dutch ] = "Cursor control";
-        Text[ french ] = "Cursor control";
+        Text[ french ] = "Contr�le du curseur";
         Text[ finnish ] = "Cursor control";
         Text[ danish ] = "Cursor control";
-        Text[ chinese_simplified ] = "Cursor control";
-        Text[ chinese_traditional ] = "Cursor control";
+        Text[ chinese_simplified ] = "鼠标控制";
+        Text[ chinese_traditional ] = "游標控制";
         Text[ arabic ] = "Cursor control";
         Text[ catalan ] = "Cursor control";
     };
@@ -163,22 +163,22 @@ TabPage RID_SVXPAGE_OPTIONS_CTL
         Text[ english_us ] = "Movement";
         Text[ portuguese ] = "Movement";
         Text[ russian ] = "Movement";
-        Text[ spanish ] = "Movement";
-        Text[ italian ] = "Movement";
-        Text[ swedish ] = "Movement";
+        Text[ spanish ] = "Movimiento";
+        Text[ italian ] = "Movimento";
+        Text[ swedish ] = "R�relse";
         Text[ polish ] = "Movement";
         Text[ portuguese_brazilian ] = "Movement";
-        Text[ japanese ] = "Movement";
-        Text[ korean ] = "Movement";
+        Text[ japanese ] = "移動";
+        Text[ korean ] = "움직임";
         Text[ turkish ] = "Movement";
         Text[ thai ] = "Movement";
         Text[ greek ] = "Movement";
         Text[ dutch ] = "Movement";
-        Text[ french ] = "Movement";
+        Text[ french ] = "Mouvement";
         Text[ finnish ] = "Movement";
         Text[ danish ] = "Movement";
-        Text[ chinese_simplified ] = "Movement";
-        Text[ chinese_traditional ] = "Movement";
+        Text[ chinese_simplified ] = "移动";
+        Text[ chinese_traditional ] = "移動";
         Text[ arabic ] = "Movement";
         Text[ catalan ] = "Movement";
     };
@@ -190,22 +190,22 @@ TabPage RID_SVXPAGE_OPTIONS_CTL
         Text[ english_us ] = "Lo~gical";
         Text[ portuguese ] = "Lo~gical";
         Text[ russian ] = "Lo~gical";
-        Text[ spanish ] = "Lo~gical";
-        Text[ italian ] = "Lo~gical";
-        Text[ swedish ] = "Lo~gical";
+        Text[ spanish ] = "L�~gico";
+        Text[ italian ] = "Lo~gico";
+        Text[ swedish ] = "Lo~gisk";
         Text[ polish ] = "Lo~gical";
         Text[ portuguese_brazilian ] = "Lo~gical";
-        Text[ japanese ] = "Lo~gical";
-        Text[ korean ] = "Lo~gical";
+        Text[ japanese ] = "論理(~G)";
+        Text[ korean ] = "논리적";
         Text[ turkish ] = "Lo~gical";
         Text[ thai ] = "Lo~gical";
         Text[ greek ] = "Lo~gical";
         Text[ dutch ] = "Lo~gical";
-        Text[ french ] = "Lo~gical";
+        Text[ french ] = "Logique";
         Text[ finnish ] = "Lo~gical";
         Text[ danish ] = "Lo~gical";
-        Text[ chinese_simplified ] = "Lo~gical";
-        Text[ chinese_traditional ] = "Lo~gical";
+        Text[ chinese_simplified ] = "逻辑的";
+        Text[ chinese_traditional ] = "邏輯(~G)";
         Text[ arabic ] = "Lo~gical";
         Text[ catalan ] = "Lo~gical";
     };
@@ -218,21 +218,21 @@ TabPage RID_SVXPAGE_OPTIONS_CTL
         Text[ portuguese ] = "~Visual";
         Text[ russian ] = "~Visual";
         Text[ spanish ] = "~Visual";
-        Text[ italian ] = "~Visual";
-        Text[ swedish ] = "~Visual";
+        Text[ italian ] = "~Visivo";
+        Text[ swedish ] = "~Visuell";
         Text[ polish ] = "~Visual";
         Text[ portuguese_brazilian ] = "~Visual";
-        Text[ japanese ] = "~Visual";
-        Text[ korean ] = "~Visual";
+        Text[ japanese ] = "ビジュアル(~V)";
+        Text[ korean ] = "시각적";
         Text[ turkish ] = "~Visual";
         Text[ thai ] = "~Visual";
         Text[ greek ] = "~Visual";
         Text[ dutch ] = "~Visual";
-        Text[ french ] = "~Visual";
+        Text[ french ] = "Visuel";
         Text[ finnish ] = "~Visual";
         Text[ danish ] = "~Visual";
-        Text[ chinese_simplified ] = "~Visual";
-        Text[ chinese_traditional ] = "~Visual";
+        Text[ chinese_simplified ] = "视觉的";
+        Text[ chinese_traditional ] = "視覺(~V)";
         Text[ arabic ] = "~Visual";
         Text[ catalan ] = "~Visual";
     };
@@ -244,22 +244,22 @@ TabPage RID_SVXPAGE_OPTIONS_CTL
         Text[ english_us ] = "General options";
         Text[ portuguese ] = "General options";
         Text[ russian ] = "General options";
-        Text[ spanish ] = "General options";
-        Text[ italian ] = "General options";
-        Text[ swedish ] = "General options";
+        Text[ spanish ] = "Opciones generales";
+        Text[ italian ] = "Opzioni generali";
+        Text[ swedish ] = "Allm�nna alternativ";
         Text[ polish ] = "General options";
         Text[ portuguese_brazilian ] = "General options";
-        Text[ japanese ] = "General options";
-        Text[ korean ] = "General options";
+        Text[ japanese ] = "一般オプション";
+        Text[ korean ] = "일반 옵션";
         Text[ turkish ] = "General options";
         Text[ thai ] = "General options";
         Text[ greek ] = "General options";
         Text[ dutch ] = "General options";
-        Text[ french ] = "General options";
+        Text[ french ] = "Options g�n�rales";
         Text[ finnish ] = "General options";
         Text[ danish ] = "General options";
-        Text[ chinese_simplified ] = "General options";
-        Text[ chinese_traditional ] = "General options";
+        Text[ chinese_simplified ] = "常规选项";
+        Text[ chinese_traditional ] = "一般選項";
         Text[ arabic ] = "General options";
         Text[ catalan ] = "General options";
     };
@@ -268,25 +268,25 @@ TabPage RID_SVXPAGE_OPTIONS_CTL
         Pos = MAP_APPFONT ( 12, 64 ) ;
         Size = MAP_APPFONT ( 90 , 8 ) ;
         Text = "~Ziffern (nur in Text)" ;
-        Text[ english_us ] = "~Numerals (in text only)";
+        Text[ english_us ] = "~Numerals";
         Text[ portuguese ] = "~Numerals (in text only)";
         Text[ russian ] = "~Numerals (in text only)";
-        Text[ spanish ] = "~Numerals (in text only)";
-        Text[ italian ] = "~Numerals (in text only)";
-        Text[ swedish ] = "~Numerals (in text only)";
+        Text[ spanish ] = "~Numerales (s�lo en texto)";
+        Text[ italian ] = "~Numerali (solo nel testo)";
+        Text[ swedish ] = "~Siffror (bara i text)";
         Text[ polish ] = "~Numerals (in text only)";
         Text[ portuguese_brazilian ] = "~Numerals (in text only)";
-        Text[ japanese ] = "~Numerals (in text only)";
-        Text[ korean ] = "~Numerals (in text only)";
+        Text[ japanese ] = "数値(テキストのみ)(~N) ";
+        Text[ korean ] = "숫자(텍스트에서만)";
         Text[ turkish ] = "~Numerals (in text only)";
         Text[ thai ] = "~Numerals (in text only)";
         Text[ greek ] = "~Numerals (in text only)";
         Text[ dutch ] = "~Numerals (in text only)";
-        Text[ french ] = "~Numerals (in text only)";
+        Text[ french ] = "Chiffres (uniquement dans le texte)";
         Text[ finnish ] = "~Numerals (in text only)";
         Text[ danish ] = "~Numerals (in text only)";
-        Text[ chinese_simplified ] = "~Numerals (in text only)";
-        Text[ chinese_traditional ] = "~Numerals (in text only)";
+        Text[ chinese_simplified ] = "数字(仅在文字之内)";
+        Text[ chinese_traditional ] = "數字(僅在文字中)(~N)";
         Text[ arabic ] = "~Numerals (in text only)";
         Text[ catalan ] = "~Numerals (in text only)";
     };
@@ -340,7 +340,7 @@ TabPage RID_SVXPAGE_OPTIONS_CTL
     };
     StringList [ swedish ] =
     {
-         < "Arabisk" ; > ;
+         < "Arabiska" ; > ;
         < "Hindi" ; > ;
         < "System" ; > ;
     };
@@ -364,7 +364,7 @@ TabPage RID_SVXPAGE_OPTIONS_CTL
     };
     StringList [ korean ] =
     {
-         < "아라비아" ; > ;
+         < "아랍어" ; > ;
         < "힌두어" ; > ;
         < "시스템" ; > ;
     };
@@ -437,23 +437,28 @@ TabPage RID_SVXPAGE_OPTIONS_CTL
     };
     Text[ portuguese ] = "Complex Text Layout";
     Text[ russian ] = "Complex Text Layout";
-    Text[ spanish ] = "Complex Text Layout";
-    Text[ italian ] = "Complex Text Layout";
-    Text[ swedish ] = "Complex Text Layout";
+    Text[ spanish ] = "Dise�o de texto complejo (CTL)";
+    Text[ italian ] = "Disposizione testo complesso";
+    Text[ swedish ] = "Komplex textlayout";
     Text[ polish ] = "Complex Text Layout";
     Text[ portuguese_brazilian ] = "Complex Text Layout";
-    Text[ japanese ] = "Complex Text Layout";
-    Text[ korean ] = "Complex Text Layout";
+    Text[ japanese ] = "複合文字言語";
+    Text[ korean ] = "CTL(Complex Text Layout)";
     Text[ turkish ] = "Complex Text Layout";
     Text[ thai ] = "Complex Text Layout";
     Text[ greek ] = "Complex Text Layout";
     Text[ dutch ] = "Complex Text Layout";
-    Text[ french ] = "Complex Text Layout";
+    Text[ french ] = "Scripts complexes";
     Text[ finnish ] = "Complex Text Layout";
     Text[ danish ] = "Complex Text Layout";
-    Text[ chinese_simplified ] = "Complex Text Layout";
-    Text[ chinese_traditional ] = "Complex Text Layout";
+    Text[ chinese_simplified ] = "复杂文字的版式";
+    Text[ chinese_traditional ] = "複雜文字版式";
     Text[ arabic ] = "Complex Text Layout";
     Text[ catalan ] = "Complex Text Layout";
 };
 
+
+
+
+
+
diff --git a/svx/source/options/optdict.src b/svx/source/options/optdict.src
index 70ccf2fb9810..f92b11e32aa5 100644
--- a/svx/source/options/optdict.src
+++ b/svx/source/options/optdict.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: optdict.src,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: kz $ $Date: 2001-07-19 20:14:54 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -88,14 +88,14 @@ ModalDialog RID_SFXDLG_NEWDICT
     Text [ dutch ] = "Nieuw woordenboek" ;
     Text [ spanish ] = "Crear diccionario de usuario" ;
     Text [ english_us ] = "New Dictionary" ;
-    Text[ chinese_simplified ] = "����ʹ���ߴʵ�";
-    Text[ russian ] = "������� ������� ������������";
+    Text[ chinese_simplified ] = "建立使用者词典";
+    Text[ russian ] = "����� �������";
     Text[ polish ] = "Utw�rz w�asny s�ownik";
-    Text[ japanese ] = "հ�ް�����̍쐬";
-    Text[ chinese_traditional ] = "�ۭq�r��";
+    Text[ japanese ] = "ユーザー辞書の作成";
+    Text[ chinese_traditional ] = "自訂字典";
     Text[ arabic ] = "����� ����� ��������";
     Text[ greek ] = "���������� �������";
-    Text[ korean ] = "�� ����ڻ���";
+    Text[ korean ] = "사전 새로 만들기";
     Text[ turkish ] = "Kullan�c� s�zl��� olu�tur";
     Text[ language_user1 ] = " ";
     FixedText FT_DICTNAME
@@ -110,23 +110,24 @@ ModalDialog RID_SFXDLG_NEWDICT
         Text [ portuguese ] = "~Nome" ;
         Text [ finnish ] = "~Nimi" ;
         Text [ danish ] = "Navn" ;
-        Text [ french ] = "~Nom" ;
+        Text [ french ] = "Nom" ;
         Text [ swedish ] = "~Namn" ;
         Text [ dutch ] = "~Naam" ;
         Text [ spanish ] = "~Nombre" ;
         Text [ english_us ] = "~Name" ;
         LeftLabel = TRUE ;
-        Text[ chinese_simplified ] = "����(~N)";
+        Text[ chinese_simplified ] = "名称(~N)";
         Text[ russian ] = "���";
         Text[ polish ] = "Nazwa";
-        Text[ japanese ] = "���O(~N)";
-        Text[ chinese_traditional ] = "�W��(~N)";
+        Text[ japanese ] = "名前(~N)";
+        Text[ chinese_traditional ] = "名稱(~N)";
         Text[ arabic ] = "�����";
         Text[ greek ] = "�����";
-        Text[ korean ] = "�̸�(~N)";
+        Text[ korean ] = "이름(~N)";
         Text[ turkish ] = "Ad";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Nombre";
+        Text[ catalan ] = "~Nom";
+        Text[ thai ] = "~ชื่อ";
     };
     Edit ED_DICTNAME
     {
@@ -147,23 +148,24 @@ ModalDialog RID_SFXDLG_NEWDICT
         Text [ portuguese ] = "~L�ngua" ;
         Text [ finnish ] = "~Kieli" ;
         Text [ danish ] = "Sprog" ;
-        Text [ french ] = "~Langue" ;
+        Text [ french ] = "Langue" ;
         Text [ swedish ] = "~Spr�k" ;
         Text [ dutch ] = "~Taal" ;
         Text [ spanish ] = "I~dioma" ;
         Text [ english_us ] = "~Language" ;
         LeftLabel = TRUE ;
-        Text[ chinese_simplified ] = "����(~L)";
+        Text[ chinese_simplified ] = "语言(~L)";
         Text[ russian ] = "����";
         Text[ polish ] = "J�zyk";
-        Text[ japanese ] = "����(~L)";
-        Text[ chinese_traditional ] = "�y��(~L)";
+        Text[ japanese ] = "言語(~L)";
+        Text[ chinese_traditional ] = "語言(~L)";
         Text[ arabic ] = "�����";
         Text[ greek ] = "������";
-        Text[ korean ] = "���(~L)";
+        Text[ korean ] = "언어(~L)";
         Text[ turkish ] = "Dil";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "I~dioma";
+        Text[ catalan ] = "~Idioma";
+        Text[ thai ] = "~ภาษา";
     };
     ListBox LB_DICTLANG
     {
@@ -189,17 +191,18 @@ ModalDialog RID_SFXDLG_NEWDICT
         Text [ dutch ] = "~Uitzondering (-)" ;
         Text [ spanish ] = "~Excepci�n (-)" ;
         Text [ english_us ] = "~Exception (-)" ;
-        Text[ chinese_simplified ] = "����(-)(~E)";
+        Text[ chinese_simplified ] = "例外(-)(~E)";
         Text[ russian ] = "���������� (-)";
         Text[ polish ] = "Wyj�tek (-)";
-        Text[ japanese ] = "��O(-) (~E)";
-        Text[ chinese_traditional ] = "�ҥ~(-)(~E)";
+        Text[ japanese ] = "例外(-) (~E)";
+        Text[ chinese_traditional ] = "例外(-)(~E)";
         Text[ arabic ] = "������� (-)";
         Text[ greek ] = "��~������ (-)";
-        Text[ korean ] = "���� (-)(~E)";
+        Text[ korean ] = "예외 (-)(~E)";
         Text[ turkish ] = "�stisna (-)";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Excepci�n (-)";
+        Text[ catalan ] = "~Excepci� (-)";
+        Text[ thai ] = "~ข้อยกเว้น (-)";
     };
     FixedLine GB_NEWDICT
     {
@@ -216,21 +219,22 @@ ModalDialog RID_SFXDLG_NEWDICT
         Text [ finnish ] = "Sanasto" ;
         Text [ danish ] = "Ordbog" ;
         Text [ french ] = "Dictionnaire" ;
-        Text [ swedish ] = "Ordbok" ;
+        Text [ swedish ] = "Ordlista" ;
         Text [ dutch ] = "Woordenboek" ;
         Text [ spanish ] = "Diccionario" ;
         Text [ english_us ] = "Dictionary" ;
-        Text[ chinese_simplified ] = "�ֵ�";
+        Text[ chinese_simplified ] = "字典";
         Text[ russian ] = "�������";
         Text[ polish ] = "S�ownik";
-        Text[ japanese ] = "����";
-        Text[ chinese_traditional ] = "����";
+        Text[ japanese ] = "辞書";
+        Text[ chinese_traditional ] = "詞典";
         Text[ arabic ] = "�������";
         Text[ greek ] = "������";
-        Text[ korean ] = "����";
+        Text[ korean ] = "사전";
         Text[ turkish ] = "S�zl�k";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Diccionario";
+        Text[ catalan ] = "Diccionari";
+        Text[ thai ] = "พจนานุกรม";
     };
     OKButton BTN_NEWDICT_OK
     {
@@ -249,7 +253,8 @@ ModalDialog RID_SFXDLG_NEWDICT
         Pos = MAP_APPFONT ( 157 , 43 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
     };
-    Text[ catalan ] = "Crear diccionario de usuario";
+    Text[ catalan ] = "Diccionari nou";
+    Text[ thai ] = "พจนานุกรมใหม่";
 };
 
  // RID_SFXDLG_EDITDICT ---------------------------------------------------
@@ -275,7 +280,7 @@ ModalDialog RID_SFXDLG_EDITDICT
     Text [ dutch ] = "Gebruikerswoordenboek bewerken" ;
     Text [ spanish ] = "Editar diccionario de usuario" ;
     Text [ english_us ] = "Edit Custom Dictionary" ;
-    Text[ chinese_simplified ] = "�༭ʹ���ߴʵ�";
+    Text[ chinese_simplified ] = "编辑使用者词典";
 
     Moveable = TRUE ;
     FixedText FT_BOOK
@@ -288,23 +293,24 @@ ModalDialog RID_SFXDLG_EDITDICT
         Text [ dutch ] = "~Boek" ;
         Text [ italian ] = "Libro" ;
         Text [ spanish ] = "~Libro" ;
-        Text [ french ] = "~Livre" ;
+        Text [ french ] = "Livre" ;
         Text [ swedish ] = "~Bok" ;
         Text [ danish ] = "Bog" ;
         Text [ portuguese ] = "~Livro" ;
         Text [ portuguese_brazilian ] = "~Buch" ;
-        Text[ chinese_simplified ] = "�鼮(~B)";
+        Text[ chinese_simplified ] = "书籍(~B)";
         Text[ russian ] = "~�����";
         Text[ polish ] = "Ksi��ka";
-        Text[ japanese ] = "�ޯ�(~B)";
-        Text[ chinese_traditional ] = "��(~B)";
+        Text[ japanese ] = "本(~B)";
+        Text[ chinese_traditional ] = "書(~B)";
         Text[ arabic ] = "������";
         Text[ greek ] = "������";
-        Text[ korean ] = "å(~B)";
+        Text[ korean ] = "책(~B)";
         Text[ turkish ] = "Kitap";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Libro";
+        Text[ catalan ] = "~Llibre";
         Text[ finnish ] = "~Kirja";
+        Text[ thai ] = "~หนังสือ";
     };
     ListBox LB_ALLDICTS
     {
@@ -323,23 +329,24 @@ ModalDialog RID_SFXDLG_EDITDICT
         Text [ dutch ] = "T~aal" ;
         Text [ italian ] = "Lingua" ;
         Text [ spanish ] = "I~dioma" ;
-        Text [ french ] = "~Langue" ;
+        Text [ french ] = "Langue" ;
         Text [ swedish ] = "S~pr�k" ;
         Text [ danish ] = "Sprog" ;
         Text [ portuguese_brazilian ] = "S~prache" ;
         Text [ portuguese ] = "~L�ngua" ;
-        Text[ chinese_simplified ] = "����(~L)";
+        Text[ chinese_simplified ] = "语言(~L)";
         Text[ russian ] = "����";
         Text[ polish ] = "J�zyk";
-        Text[ japanese ] = "����(~L)";
-        Text[ chinese_traditional ] = "�y��(~L)";
+        Text[ japanese ] = "言語(~L)";
+        Text[ chinese_traditional ] = "語言(~L)";
         Text[ arabic ] = "�����";
         Text[ greek ] = "������";
-        Text[ korean ] = "���(~L)";
+        Text[ korean ] = "언어(~L)";
         Text[ turkish ] = "Dil";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "I~dioma";
+        Text[ catalan ] = "~Idioma";
         Text[ finnish ] = "~Kieli";
+        Text[ thai ] = "~ภาษา";
     };
     ListBox LB_DICTLANG
     {
@@ -373,16 +380,17 @@ ModalDialog RID_SFXDLG_EDITDICT
         Text[ swedish ] = "~Ord";
         Text[ polish ] = "S�owo";
         Text[ portuguese_brazilian ] = "Word";
-        Text[ japanese ] = "�P��(~W)";
-        Text[ chinese_simplified ] = "��(~W)";
-        Text[ chinese_traditional ] = "�r(~W)";
+        Text[ japanese ] = "単語(~W)";
+        Text[ chinese_simplified ] = "字(~W)";
+        Text[ chinese_traditional ] = "字(~W)";
         Text[ arabic ] = "������";
         Text[ greek ] = "����";
-        Text[ korean ] = "�ܾ�(~W)";
+        Text[ korean ] = "단어(~W)";
         Text[ turkish ] = "S�zc�k";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Palabra";
+        Text[ catalan ] = "~Paraula";
         Text[ finnish ] = "~Sana";
+        Text[ thai ] = "~คำ";
     };
     Edit ED_WORD
     {
@@ -399,7 +407,7 @@ ModalDialog RID_SFXDLG_EDITDICT
         Text [ English ] = "Replace ~By:" ;
         Text[ english_us ] = "Replace ~By:";
         Text[ portuguese ] = "~Sugest�o";
-        Text[ russian ] = "��������";
+        Text[ russian ] = "��������:";
         Text[ dutch ] = "~Voorstel";
         Text[ french ] = "Suggestion";
         Text[ spanish ] = "~Sugerencia";
@@ -408,16 +416,17 @@ ModalDialog RID_SFXDLG_EDITDICT
         Text[ swedish ] = "~F�rslag";
         Text[ polish ] = "Propozycja";
         Text[ portuguese_brazilian ] = "Replace ~By:";
-        Text[ japanese ] = "���(~B):";
-        Text[ chinese_simplified ] = "����(~B)";
-        Text[ chinese_traditional ] = "��ij(~B)";
+        Text[ japanese ] = "提案(~B):";
+        Text[ chinese_simplified ] = "建议(~B)";
+        Text[ chinese_traditional ] = "建議(~B)";
         Text[ arabic ] = "��������";
         Text[ language_user1 ] = " ";
         Text[ greek ] = "������������:";
-        Text[ korean ] = "����(~B):";
+        Text[ korean ] = "제안(~B):";
         Text[ turkish ] = "�neri";
-        Text[ catalan ] = "~Sugerencia";
+        Text[ catalan ] = "~Suger�ncia";
         Text[ finnish ] = "~Korvaus:";
+        Text[ thai ] = "แทนที่~ด้วย:";
     };
 
     Edit ED_REPLACE
@@ -444,18 +453,19 @@ ModalDialog RID_SFXDLG_EDITDICT
         Text [ danish ] = "Ny" ;
         Text [ portuguese_brazilian ] = "~Neu" ;
         Text [ portuguese ] = "~Novo" ;
-        Text[ chinese_simplified ] = "���ִ�(~N)";
-        Text[ russian ] = "����~���";
+        Text[ chinese_simplified ] = "新字词(~N)";
+        Text[ russian ] = "�������";
         Text[ polish ] = "Nowy";
-        Text[ japanese ] = "�V�K�쐬(~N)";
-        Text[ chinese_traditional ] = "�s�r��(~N)";
+        Text[ japanese ] = "新規作成(~N)";
+        Text[ chinese_traditional ] = "新字詞(~N)";
         Text[ arabic ] = "����";
         Text[ greek ] = "����������";
-        Text[ korean ] = "����(~N)";
+        Text[ korean ] = "새로 만들기(~N)";
         Text[ turkish ] = "Yeni";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Nuevo";
+        Text[ catalan ] = "~Nou";
         Text[ finnish ] = "~Uusi";
+        Text[ thai ] = "ใ~หม่";
     };
     PushButton PB_DELETE_REPLACE
     {
@@ -466,25 +476,26 @@ ModalDialog RID_SFXDLG_EDITDICT
         TabStop = TRUE ;
         Text [ english_us ] = "~Delete" ;
         Text [ italian ] = "Elimina" ;
-        Text [ spanish ] = "~Eliminar" ;
-        Text [ french ] = "~Supprimer" ;
+        Text [ spanish ] = "~Borrar" ;
+        Text [ french ] = "Supprimer" ;
         Text [ dutch ] = "~Wissen" ;
         Text [ swedish ] = "~Radera" ;
         Text [ danish ] = "Slet" ;
         Text [ portuguese_brazilian ] = "~L?chen" ;
         Text [ portuguese ] = "E~liminar" ;
-        Text[ chinese_simplified ] = "ɾ��(~D)";
+        Text[ chinese_simplified ] = "删除(~D)";
         Text[ russian ] = "�������";
         Text[ polish ] = "Usu�";
-        Text[ japanese ] = "�폜(~D)";
-        Text[ chinese_traditional ] = "�R��(~D)";
+        Text[ japanese ] = "削除(~D)";
+        Text[ chinese_traditional ] = "刪除(~D)";
         Text[ arabic ] = "���";
         Text[ greek ] = "��������";
-        Text[ korean ] = "����(~D)";
+        Text[ korean ] = "삭제(~D)";
         Text[ turkish ] = "Sil";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Eliminar";
+        Text[ catalan ] = "~Suprimeix";
         Text[ finnish ] = "~Poista";
+        Text[ thai ] = "~ลบ";
     };
     Control TLB_REPLACE
     {
@@ -504,22 +515,23 @@ ModalDialog RID_SFXDLG_EDITDICT
         Text [ portuguese ] = "~Substituir" ;
         Text [ finnish ] = "~Korvaa" ;
         Text [ danish ] = "Erstat" ;
-        Text [ french ] = "~Remplacer" ;
+        Text [ french ] = "Remplacer" ;
         Text [ swedish ] = "~Ers�tt" ;
         Text [ dutch ] = "~Vervangen" ;
         Text [ spanish ] = "~Reemplazar" ;
         Text [ english_us ] = "~Replace" ;
-        Text[ chinese_simplified ] = "����(~R)";
+        Text[ chinese_simplified ] = "替换(~R)";
         Text[ russian ] = "��������";
         Text[ polish ] = "Zamie�";
-        Text[ japanese ] = "�u��(~R)";
-        Text[ chinese_traditional ] = "���N(~R)";
+        Text[ japanese ] = "置換(~R)";
+        Text[ chinese_traditional ] = "替代(~R)";
         Text[ arabic ] = "�������";
         Text[ greek ] = "�������������";
-        Text[ korean ] = "�ٲٱ�(~R)";
+        Text[ korean ] = "바꾸기(~R)";
         Text[ turkish ] = "De�i�tir";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Reemplazar";
+        Text[ catalan ] = "~Reempla�a";
+        Text[ thai ] = "แ~ทนที่";
     };
 
 
@@ -545,33 +557,35 @@ ModalDialog RID_SFXDLG_EDITDICT
         Text [ portuguese ] = "Fechar" ;
         Text [ finnish ] = "~Sulje" ;
         Text [ danish ] = "Luk" ;
-        Text [ french ] = "~Fermer" ;
+        Text [ french ] = "Fermer" ;
         Text [ swedish ] = "~St�ng" ;
         Text [ dutch ] = "~Sluiten" ;
         Text [ spanish ] = "~Cerrar" ;
         Text [ english_us ] = "~Close" ;
-        Text[ chinese_simplified ] = "�ر�(~C)";
+        Text[ chinese_simplified ] = "关闭(~C)";
         Text[ russian ] = "�������";
         Text[ polish ] = "Zamknij";
-        Text[ japanese ] = "�‚���(~C)";
-        Text[ chinese_traditional ] = "����(~C)";
+        Text[ japanese ] = "閉じる(~C)";
+        Text[ chinese_traditional ] = "關閉(~C)";
         Text[ arabic ] = "�����";
         Text[ greek ] = "��������";
-        Text[ korean ] = "�ݱ�(~C)";
+        Text[ korean ] = "닫기(~C)";
         Text[ turkish ] = "Kapat";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Cerrar";
+        Text[ catalan ] = "~Tanca";
+        Text[ thai ] = "~ปิด";
     };
     Text[ russian ] = "������ ������� ������������";
     Text[ polish ] = "Edytuj s�ownik u�ytkownika";
-    Text[ japanese ] = "հ�ް�����̕ҏW";
-    Text[ chinese_traditional ] = "�s��ۭq�r��";
+    Text[ japanese ] = "ユーザー辞書の編集";
+    Text[ chinese_traditional ] = "編輯自訂字典";
     Text[ arabic ] = "����� ����� ��������";
     Text[ greek ] = "����������� �������";
-    Text[ korean ] = "����ڻ��� ����";
+    Text[ korean ] = "사용자 사전 편집";
     Text[ turkish ] = "Kullan�c� s�zl���n� d�zenle";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Editar diccionario de usuario";
+    Text[ catalan ] = "Edita el diccionari personalitzat";
+    Text[ thai ] = "แก้ไขพจนานุกรมแบบกำหนดเอง";
 };
 
  // Strings ---------------------------------------------------------------
@@ -588,18 +602,19 @@ String RID_SVXSTR_OPT_DOUBLE_DICTS
     Text [ danish ] = "Det angivne navn findes allerede.\nIndtast venligst et nyt navn." ;
     Text [ portuguese ] = "O nome fornecido j� existe.\nPor favor introduza outro nome." ;
     Text [ portuguese_brazilian ] = "Der angegebene Name ist schon vorhanden.\nBitte geben Sie einen neuen Namen ein." ;
-    Text[ chinese_simplified ] = "��������������Ѿ����ڡ�\n��������һ�������ơ�";
-    Text[ russian ] = "�������� ��� ��� �������.\n�������, ����������, ����� ���.";
+    Text[ chinese_simplified ] = "这个给定的名称已经存在。\n请您输入一个新名称。";
+    Text[ russian ] = "�������� ��� ��� ����������.\n������� ����� ���.";
     Text[ polish ] = "Podana nazwa ju� istnieje.\nProsz� wpisa� now� nazw�.";
-    Text[ japanese ] = "���͂������O�͂��łɂ���܂��B\n�V�������O����͂��Ă��������B";
-    Text[ chinese_traditional ] = "�o�ӿ�J���W�٤w�g�s�b�C\n�бz��J�@�ӷs�W�١C";
+    Text[ japanese ] = "入力した名前はすでにあります。\n新しい名前を入力してください。";
+    Text[ chinese_traditional ] = "這個輸入的名稱已經存在。\n請您輸入一個新名稱。";
     Text[ arabic ] = "����� ���� ������ ����� ������.\n������ ����� ��� ����.";
     Text[ greek ] = "�� ����� ������� ���.\n�������� �������� ������ ���� �����.";
-    Text[ korean ] = "������ �̸��� �̹� �ֽ��ϴ�.\n�� �̸��� �Է��Ͻʽÿ�.";
+    Text[ korean ] = "지정된 이름은 이미 존재합니다.\n새 이름을 입력하십시오.";
     Text[ turkish ] = "Girilen ad mevcut durumda.\nL�tfen ba�ka bir ad girin.";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Este nombre ya existe.\nPor favor escriba otro nombre.";
+    Text[ catalan ] = "Aquest nom ja existeix.\nEscribiu un altre nom.";
     Text[ finnish ] = "M��ritetty nimi on jo k�yt�ss�.\nM��rit� uusi nimi.";
+    Text[ thai ] = "ชื่อที่ระบุมีอยู่แล้ว\nกรุณาใส่ชื่อใหม่";
 };
  // RID_SFXQB_SET_LANGUAGE ------------------------------------------------
 QueryBox RID_SFXQB_SET_LANGUAGE
@@ -612,27 +627,28 @@ QueryBox RID_SFXQB_SET_LANGUAGE
     /* ### ACHTUNG: Neuer Text in Resource? M�chten Sie die Sprache des W�rterbuches '%1' �ndern? : M�chten Sie die Sprache des W�rterbuches '%1' �ndern? */
     Message = "M�chten Sie die Sprache des W�rterbuches '%1' �ndern?" ;
     Message [ English ] = "Do you want to replace the language of the dictionary '%1'?" ;
-    Message [ dutch ] = "Wilt u de taal van het woordenboek '%1' veranderen?" ;
+    Message [ dutch ] = "Wilt u de taal van het woordenboek '%1' wijzigen?" ;
     Message [ english_us ] = "Do you want to change the '%1' dictionary language?" ;
     Message [ italian ] = "Cambiare la lingua del dizionario '%1' ?" ;
     Message [ spanish ] = "�Desea cambiar el idioma del diccionario '%1' ?" ;
     Message [ french ] = "D�sirez-vous changer la langue du dictionnaire '%1' ?" ;
-    Message [ swedish ] = "Vill Du �ndra spr�ket i ordboken '%1'?" ;
+    Message [ swedish ] = "Vill du �ndra spr�ket i ordlistan '%1'?" ;
     Message [ danish ] = "Vil du �ndre sproget i ordbogen '%1'?" ;
     Message [ portuguese ] = "Deseja mudar a l�ngua do dicion�rio '%1'?" ;
     Message [ portuguese_brazilian ] = "M?hten Sie die Sprache des W?terbuches '%1' ?ndern?" ;
-    Message[ chinese_simplified ] = "��Ҫ���Ĵʵ� '%1' ��������";
-    Message[ russian ] = "�� ������ �������� ���� ������� '%1'?";
+    Message[ chinese_simplified ] = "您要更改词典 '%1' 的语言吗？";
+    Message[ russian ] = "�������� ���� ������� '%1'?";
     Message[ polish ] = "Czy chcesz zmieni� j�zyk s�ownika '%1'?";
-    Message[ japanese ] = "�����u%1�v�̌����ύX���܂����H";
-    Message[ chinese_traditional ] = "�z�n�������'%1'���y���H";
+    Message[ japanese ] = "辞書「%1」の言語を変更しますか？";
+    Message[ chinese_traditional ] = "要變更詞典<%1>的語言？";
     Message[ arabic ] = "�� ���� ����� ��� ������� '%1'�";
     Message[ greek ] = "������ �� �������� ��� ������ ��� ������� '%1';";
-    Message[ korean ] = "����'%1'�� �� �����Ͻðڽ��ϱ�?";
+    Message[ korean ] = "사전 '%1'의 언어를 변경하겠습니까?";
     Message[ turkish ] = "'%1' s�zl���n�n dilini de�i�tirmek isityor musunuz?";
     Message[ language_user1 ] = " ";
-    Message[ catalan ] = "�Desea cambiar el idioma del diccionario '%1' ?";
+    Message[ catalan ] = "Voleu canviar l'idioma del diccionari '%1' ?";
     Message[ finnish ] = "Haluatko vaihtaa sanaston '%1' kielt�?";
+    Message[ thai ] = "คุณต้องการเปลี่ยน '%1' ภาษาพจนานุกรมหรือไม่?";
 };
  // ********************************************************************** EOF
 
@@ -640,3 +656,16 @@ QueryBox RID_SFXQB_SET_LANGUAGE
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svx/source/options/optgenrl.src b/svx/source/options/optgenrl.src
index a9b9a35c8099..683f81d609d4 100644
--- a/svx/source/options/optgenrl.src
+++ b/svx/source/options/optgenrl.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: optgenrl.src,v $
  *
- *  $Revision: 1.42 $
+ *  $Revision: 1.43 $
  *
- *  last change: $Author: rt $ $Date: 2002-06-13 14:54:42 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -83,7 +83,7 @@ TabPage RID_SFXPAGE_GENERAL
     Text [ danish ] = "Brugerdata" ;
     Text [ italian ] = "Dati utente" ;
     Text [ spanish ] = "Datos del usuario" ;
-    Text [ french ] = "Donn�es d'identit�" ;
+    Text [ french ] = "Donn�es d'utilisateur" ;
     Text [ dutch ] = "Gebruikersgegevens" ;
     Text [ portuguese_brazilian ] = "Benutzerdaten" ;
     Text [ portuguese ] = "Dados de utilizador" ;
@@ -106,7 +106,7 @@ TabPage RID_SFXPAGE_GENERAL
         Text [ danish ] = "Firma" ;
         Text [ french ] = "~Soci�t�" ;
         Text [ swedish ] = "~F�retag" ;
-        Text [ dutch ] = "~Firma" ;
+        Text [ dutch ] = "~Bedrijf" ;
         Text [ spanish ] = "E~mpresa" ;
         Text [ english_us ] = "~Company" ;
         Text[ chinese_simplified ] = "公司(~C)";
@@ -119,7 +119,7 @@ TabPage RID_SFXPAGE_GENERAL
         Text[ korean ] = "회사(~C)";
         Text[ turkish ] = "�irket";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "E~mpresa";
+        Text[ catalan ] = "~Empresa";
         Text[ thai ] = "~บริษัท";
     };
     Edit ED_COMPANY
@@ -140,10 +140,10 @@ TabPage RID_SFXPAGE_GENERAL
         Text [ portuguese_brazilian ] = "~Primeiro/?ltimo" ;
         Text [ portuguese ] = "~Nome/Apelido/Iniciais" ;
         Text [ finnish ] = "Etu-/suku~nimi/nimikirjaimet" ;
-        Text [ danish ] = "For-/Efternavn/Initialer" ;
+        Text [ danish ] = "F~or-/Efternavn/Initialer" ;
         Text [ french ] = "Pr�nom/Nom/Initiales" ;
         Text [ swedish ] = "F�r-/Efter~namn/Initialer" ;
-        Text [ dutch ] = "~Voor-/Naam/Initialen" ;
+        Text [ dutch ] = "V~oor-/Achternaam/Initialen" ;
         Text [ spanish ] = "Nom~bre/Apellidos/Iniciales" ;
         Text [ english_us ] = "First/Last ~name/Initials" ;
         Text[ chinese_simplified ] = "名字/姓氏/缩写(~N)";
@@ -153,10 +153,10 @@ TabPage RID_SFXPAGE_GENERAL
         Text[ chinese_traditional ] = "名字/姓氏/縮寫(~N)";
         Text[ arabic ] = "�����/��� �������/��������";
         Text[ greek ] = "�����/�������/��~����";
-        Text[ korean ] = "성/이름/머리글자(~N)";
+        Text[ korean ] = "성/이름/이니셜(~N)";
         Text[ turkish ] = "~Ad/Soyad/Ba�harfler";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Nom~bre/Apellidos/Iniciales";
+        Text[ catalan ] = "~Nom/Cognom/Inicials";
         Text[ thai ] = "~ชื่อ/นามสกุล/คำนำหน้า";
     };
     FixedText FT_NAME_RUSS
@@ -184,7 +184,7 @@ TabPage RID_SFXPAGE_GENERAL
         Text[ finnish ] = " ";
         Text[ chinese_simplified ] = " ";
         Text[ arabic ] = " ";
-        Text[ catalan ] = " ";
+        Text[ catalan ] = "~Nom/Nom del pare/Cognom/DNI";
         Text[ thai ] = " ";
     };
     Edit ED_FATHERNAME
@@ -224,7 +224,7 @@ TabPage RID_SFXPAGE_GENERAL
         Text [ portuguese_brazilian ] = "~Rua" ;
         Text [ portuguese ] = "~Rua" ;
         Text [ finnish ] = "~Katuosoite" ;
-        Text [ danish ] = "Gade" ;
+        Text [ danish ] = "~Gade" ;
         Text [ french ] = "Rue" ;
         Text [ swedish ] = "~Gatuadress" ;
         Text [ dutch ] = "~Straat" ;
@@ -240,7 +240,7 @@ TabPage RID_SFXPAGE_GENERAL
         Text[ korean ] = "주소(~S)";
         Text[ turkish ] = "Cadde";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Calle";
+        Text[ catalan ] = "~Carrer";
         Text[ thai ] = "~ถนน";
     };
     FixedText FT_STREET_RUSS
@@ -251,7 +251,7 @@ TabPage RID_SFXPAGE_GENERAL
         Hide = TRUE;
         Text = "~Stra�e/Wohnungsnummer" ;
         Text [ ENGLISH ] = "~Street/Apartmentnumber" ;
-        Text[ russian ] = "~�����, � ����/��������";
+        Text[ russian ] = "~�����, ���/��������";
         Text[ greek ] = "����� ����/������� ����";
         Text[ dutch ] = "-";
         Text[ french ] = " ";
@@ -270,6 +270,7 @@ TabPage RID_SFXPAGE_GENERAL
         Text[ chinese_simplified ] = " ";
         Text[ arabic ] = " ";
         Text[ thai ] = " ";
+        Text[ catalan ] = " ";
     };
     Edit ED_STREET
     {
@@ -293,10 +294,10 @@ TabPage RID_SFXPAGE_GENERAL
         Text [ ENGLISH ] = "~Zip/City" ;
         Text[ english_us ] = "Zip/City";
         Text[ portuguese ] = "~CP/Localidade";
-        Text[ russian ] = "����. ������/�����";
+        Text[ russian ] = "�������� ������/�����";
         Text[ dutch ] = "~Postcode/Plaats";
-        Text[ french ] = "Code postal/Ville";
-        Text[ spanish ] = "CP/C~iudad";
+        Text[ french ] = "C.P./Ville";
+        Text[ spanish ] = "C.P./Ciuda~d";
         Text[ italian ] = "C.A.P./Localit�";
         Text[ danish ] = "Postnr./By";
         Text[ swedish ] = "Postnr/~Ort";
@@ -310,8 +311,8 @@ TabPage RID_SFXPAGE_GENERAL
         Text[ korean ] = "우편번호/도시";
         Text[ turkish ] = "Posta kodu/�ehir";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "CP/C~iudad";
-        Text[ finnish ] = "Postinumero/Kaupunki";
+        Text[ catalan ] = "Codi postal/Ciutat";
+        Text[ finnish ] = "Postinumero/Toimipaikka";
         Text[ thai ] = "รหัสไปรษณีย์/เมือง";
     };
     Edit ED_PLZ
@@ -353,12 +354,12 @@ TabPage RID_SFXPAGE_GENERAL
         Text [ ENGLISH ] = "~Country/Region" ;
         Text[ english_us ] = "Country/Region";
         Text[ portuguese ] = "~Pa�s";
-        Text[ russian ] = "������";
+        Text[ russian ] = "������/�������";
         Text[ dutch ] = "~Land";
         Text[ french ] = "Pays/R�gion";
         Text[ spanish ] = "~Pa�s/Regi�n";
         Text[ italian ] = "Paese/Regione";
-        Text[ danish ] = "Land";
+        Text[ danish ] = "~Land/Omr�de";
         Text[ swedish ] = "~Land/Region";
         Text[ polish ] = "Pa�stwo";
         Text[ portuguese_brazilian ] = "Pa?s/~CEP/Cidade";
@@ -371,7 +372,7 @@ TabPage RID_SFXPAGE_GENERAL
         Text[ turkish ] = "�lke";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Pa�s";
-        Text[ finnish ] = "Maa";
+        Text[ finnish ] = "Maa/alue";
         Text[ thai ] = "ประเทศ";
     };
     Edit ED_COUNTRY
@@ -393,11 +394,11 @@ TabPage RID_SFXPAGE_GENERAL
         Text [ french ] = "~Titre/Position" ;
         Text [ dutch ] = "~Titel/Functie" ;
         Text [ swedish ] = "Titel/~Befattning" ;
-        Text [ danish ] = "Titel/Stilling" ;
+        Text [ danish ] = "T~itel/Stilling" ;
         Text [ portuguese_brazilian ] = "~Titel/Position" ;
         Text [ portuguese ] = "~T�tulo/Posi��o" ;
         Text[ chinese_simplified ] = "头衔/职务(~T)";
-        Text[ russian ] = "�����/���������";
+        Text[ russian ] = "������/���������";
         Text[ polish ] = "Tytu�/Stanowisko";
         Text[ japanese ] = "肩書き/部署(~T)";
         Text[ chinese_traditional ] = "頭銜/職務(~T)";
@@ -406,8 +407,8 @@ TabPage RID_SFXPAGE_GENERAL
         Text[ korean ] = "직함/직위(~T)";
         Text[ turkish ] = "~Unvan/Pozisyon";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "T�tulo/p~osici�n";
-        Text[ finnish ] = "~Asema/arvo";
+        Text[ catalan ] = "T�tol/p~osici�";
+        Text[ finnish ] = "~Teht�v�/arvo";
         Text[ thai ] = "~ยศ/ตำแหน่ง";
     };
     Edit ED_TITLE
@@ -433,15 +434,15 @@ TabPage RID_SFXPAGE_GENERAL
         Text [ portuguese_brazilian ] = "Fo~ne (Priv./Co.)" ;
         Text [ portuguese ] = "Tel. (~part./emprego)" ;
         Text [ finnish ] = "Puh. (koti/ty�)" ;
-        Text [ danish ] = "Tlf. (priv./arb.)" ;
+        Text [ danish ] = "Tlf. (p~riv./arb.)" ;
         Text [ french ] = "T�l. (domicile/bureau)" ;
         Text [ swedish ] = "Tfn (~priv./arb.)" ;
         Text [ dutch ] = "Tel. (Priv/~Za)" ;
-        Text [ spanish ] = "~Tel. (Privado/trabajo)" ;
+        Text [ spanish ] = "~Tfno. (particular/trabajo)" ;
         Text [ english_us ] = "Tel. (Home/Work)" ;
         LeftLabel = TRUE ;
         Text[ chinese_simplified ] = "电话(私人/办公室)";
-        Text[ russian ] = "������� (���./����.)";
+        Text[ russian ] = "���. ���/���. ���.";
         Text[ polish ] = "Tel. (pryw./s�u�b.)";
         Text[ japanese ] = "Tel.(自宅/会社)";
         Text[ chinese_traditional ] = "電話(私人/辦公室)";
@@ -450,7 +451,7 @@ TabPage RID_SFXPAGE_GENERAL
         Text[ korean ] = "전화(자택/회사)";
         Text[ turkish ] = "Tlf. (Ev/��)";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Tel. (Privado/trabajo)";
+        Text[ catalan ] = "Tel. (particular/feina)";
         Text[ thai ] = "เบอร์โทรศัพท์ (บ้าน/ที่ทำงาน)";
     };
     Edit ED_TELPRIVAT
@@ -476,24 +477,24 @@ TabPage RID_SFXPAGE_GENERAL
         Text [ italian ] = "Fa~x/eMail" ;
         Text [ portuguese_brazilian ] = "Fa~x" ;
         Text [ portuguese ] = "Fa~x/e-mail" ;
-        Text [ finnish ] = "Faksi/s�hk�posti" ;
+        Text [ finnish ] = "~Faksi tai s�hk�posti" ;
         Text [ danish ] = "Fax/E-mail" ;
-        Text [ french ] = "~Fax/e-mail" ;
+        Text [ french ] = "~Fax / e-mail" ;
         Text [ swedish ] = "Fa~x/e-post" ;
         Text [ dutch ] = "Fa~x/e-mail" ;
-        Text [ spanish ] = "Fa~x/E-mail" ;
+        Text [ spanish ] = "Fa~x/Correo-e" ;
         Text [ english_us ] = "Fa~x / E-mail" ;
         Text[ chinese_simplified ] = "传真/电子邮件(~X)";
-        Text[ russian ] = "���� �/����� ��. �����";
+        Text[ russian ] = "����/����������� �����";
         Text[ polish ] = "Faks/e-mail";
         Text[ japanese ] = "Fa~x/E-mail";
         Text[ chinese_traditional ] = "傳真/電子郵件(~X)";
         Text[ arabic ] = "����/���� ��������";
         Text[ greek ] = "Fax/E-mail";
-        Text[ korean ] = "팩스/E-mail(~X)";
+        Text[ korean ] = "팩스/전자 메일(~X)";
         Text[ turkish ] = "Faks/e-posta";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Fa~x/E-mail";
+        Text[ catalan ] = "Fa~x/Correu electr�nic";
         Text[ thai ] = "โทร~สาร /อีเมล์";
     };
     Edit ED_FAX
@@ -518,11 +519,11 @@ TabPage RID_SFXPAGE_GENERAL
         Text [ italian ] = "Indirizzo " ;
         Text [ portuguese_brazilian ] = "Endere?o " ;
         Text [ portuguese ] = "Endere�o" ;
-        Text [ finnish ] = "Osoite" ;
+        Text [ finnish ] = "Osoite " ;
         Text [ danish ] = " Adresse " ;
         Text [ french ] = " Adresse " ;
         Text [ swedish ] = "Adress " ;
-        Text [ dutch ] = "Adres  " ;
+        Text [ dutch ] = "Adres" ;
         Text [ spanish ] = "Direcci�n " ;
         Text [ english_us ] = "Address " ;
         Text[ chinese_simplified ] = " 地址 ";
@@ -535,7 +536,7 @@ TabPage RID_SFXPAGE_GENERAL
         Text[ korean ] = "주소 ";
         Text[ turkish ] = "Adres ";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "  Direcci�n ";
+        Text[ catalan ] = "  Direcci� ";
         Text[ thai ] = "ที่อยู่ ";
     };
     CheckBox CB_USEDATA
@@ -561,10 +562,10 @@ TabPage RID_SFXPAGE_GENERAL
         Text[ chinese_traditional ] = "使用文件屬性的資料";
         Text[ arabic ] = "������� ������ ����� �������";
         Text[ greek ] = "����� ��������� ��� ��� ��������� ��� ��������";
-        Text[ korean ] = "문서 등록정보용 데이터 사용";
+        Text[ korean ] = "문서 등록 정보의 데이터를 사용";
         Text[ turkish ] = "Verileri belge �zellikleri i�in kullan";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Usar ~datos para las propiedades del documento";
+        Text[ catalan ] = "Utilitza les dades de les propietats del document";
         Text[ finnish ] = "K�yt� asiakirjan ominaisuustietoja";
         Text[ thai ] = "ใช้ข้อมูลสำหรับคุณสมบัติของเอกสาร";
     };
@@ -578,8 +579,8 @@ TabPage RID_SFXPAGE_GENERAL
         Text[ portuguese ] = "~Localidade/Estado/CP";
         Text[ russian ] = "�����/�������/�������� ������";
         Text[ dutch ] = "Plaats/~Straat/Postcode";
-        Text[ french ] = "Ville/�tat/Code postal";
-        Text[ spanish ] = "~Ciudad/Pa�s/CP";
+        Text[ french ] = "Ville/�tat/C.P.";
+        Text[ spanish ] = "~Ciudad/Provincia/C.P.";
         Text[ italian ] = "Locali�/Provincia/C.A.P.";
         Text[ danish ] = "By/Land/Postnummer";
         Text[ swedish ] = "~Ort/Land/Postnr";
@@ -593,7 +594,7 @@ TabPage RID_SFXPAGE_GENERAL
         Text[ korean ] = "도시/국가/우편번호";
         Text[ turkish ] = "�ehir/�lke/Posta kodu";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Ciudad/Pa�s/CP";
+        Text[ catalan ] = "Ciutat/Comarca/Codi postal";
         Text[ finnish ] = "Postitoimipaikka/osavaltio/postinumero";
         Text[ thai ] = "เมือง/รัฐ/รหัสไปรษณีย์";
     };
@@ -603,12 +604,12 @@ TabPage RID_SFXPAGE_GENERAL
         Text [ English ] = "Bitte beachten Sie, da� Stra�e, Postleitzahl und Ort f�r die Berechnung des Registrierungsschl�ssels herangezogen werden. Bis zur Registrierung k�nnen diese Benutzerdaten nicht mehr ge�ndert werden.  Wollen Sie diese Benutzerdaten jetzt noch �ndern?" ;
         Text[ english_us ] = "Note that street, Zip code and city are used to generate the registration key. You will not be able to change the user data again until the registration has been carried out. Do you want to modify the user data now?";
         Text[ portuguese ] = "N�o esque�a que a rua, o c�digo postal e a localidade ser�o utilizados para calcular o seu c�digo de registo. Estes dados n�o podem ser modificados at� se efectuar o seu registo. Modificar os seus dados agora?";
-        Text[ russian ] = "����������, ������, ��� ������ ��������� ������ ����� ������������ ��� �������� ���������������� �����. �������� ��� ������ �� ����� ����������� ������. �� ������ ������ �������� ���� ������?";
-        Text[ dutch ] = "Wij wijzen u erop dat straat, postcode en plaats worden gebruikt voor het berekenen van de registratiesleutel. Tot aan de registratie mag u deze gegevens niet meer veranderen. Wilt u ze nu nog veranderen?";
-        Text[ french ] = "Notez que le code d'enregistrement est g�n�r� � partir de vos donn�es d'identit� telles que rue, code postal et ville. Tant que l'enregistrement n'aura pas eu lieu, il sera impossible de modifier ces donn�es. Voulez-vous effectuer une derni�re modification avant de poursuivre ?";
+        Text[ russian ] = "������, ��� �������� �����, �������� ������ � �������� ������ ����� ������������ ��� �������� ���������������� �����. ������ �������� ��� ������ �� ���������� �����������. �������� ���� ������ ������?";
+        Text[ dutch ] = "Wij wijzen u erop dat straat, postcode en plaats worden gebruikt voor het berekenen van de registratiesleutel. Tot aan de registratie mag u deze gegevens niet meer wijzigen. Wilt u ze nu nog wijzigen?";
+        Text[ french ] = "Notez que le code d'enregistrement est g�n�r� � partir de vos donn�es d'utilisateur telles que rue, code postal et ville. Tant que l'enregistrement n'aura pas eu lieu, il sera impossible de modifier ces donn�es. Voulez-vous effectuer une derni�re modification avant de poursuivre ?";
         Text[ spanish ] = "Tenga en cuenta que la calle, el c�digo postal y la ciudad se tendr�n en cuenta para determinar la clave de registro. Estos datos no podr�n ser modificados hasta que se registre. �Desea modificar a�n estos datos de usuario?";
         Text[ italian ] = "Vi preghiamo di osservare che il codice di registrazione si basa sull'indirizzo (via, C.A.P. e citt�) specificato. Fino alla registrazione questi dati non potranno essere cambiati. Volete cambiarli adesso?";
-        Text[ danish ] = "Bem�rk venligst, at gade, postnummer og by bruges til at beregne registreringsn�glen. Disse brugerdata kan ikke mere �ndres indtil registreringen. Vil du endnu �ndre dem nu?";
+        Text[ danish ] = "V�r opm�rksom p�, at gade, postnummer og by anvendes til beregning af registreringsn�glen. Indtil registreringen kan disse brugerdata ikke �ndres.  Vil du �ndre disse brugerdata?";
         Text[ swedish ] = "Observera att gatu- och postadress anv�nds f�r ber�kningen av registreringsnyckeln. Fram till registreringen kan anv�ndardata inte �ndras. Vill du �ndra de h�r anv�ndardata nu?";
         Text[ polish ] = "Nale�y uwzgl�dni�, �e podanie nazwy ulicy, kodu pocztowego i miejscowo�ci wymagane jest do utworzenia klucza rejestracyjnego. Do czasu rejestracji danych tych nie b�dzie mo�na zmieni�. Czy chcesz je zmieni� teraz?";
         Text[ portuguese_brazilian ] = "Bitte beachten Sie, da? Stra?e, Postleitzahl und Ort f? die Berechnung des Registrierungsschl?sels herangezogen werden. Bis zur Registrierung k?nen diese Benutzerdaten nicht mehr ge?ndert werden.  Wollen Sie diese Benutzerdaten jetzt noch ?ndern?";
@@ -620,8 +621,8 @@ TabPage RID_SFXPAGE_GENERAL
         Text[ korean ] = "주소나 우편번호 등은 등록 키 생성에 이용된다는 사실을 명심하십시오. 등록이 완료될 때까지는 이 사용자 데이터를 더 이상 바꿀 수 없습니다. 지금이라도 이 사용자 데이터를 변경하겠습니까?";
         Text[ turkish ] = "Cadde, posta kodu ve �ehir bilgilerinin kay�t kodunun olu�turulmas� i�in kullan�ld���n� dikkate al�n. Kay�t yap�lana kadar bu kullan�c� verileri de�i�tirilemez. Kullan�c� verilerini �imdi de�i�tirmek istiyor musunuz?";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Tenga en cuenta que la calle, el c�digo postal y la ciudad se tendr�n en cuenta para determinar la clave de registro. Estos datos no podr�n ser modificados hasta que se registre. �Desea modificar a�n estos datos de usuario?";
-        Text[ finnish ] = "Katuosoite-, postinumero- ja postitoimipaikkatietoja k�ytet��n rekister�intiavaimen luonnissa. Et voi muuttaa k�ytt�j�tietoja rekister�innin j�lkeen. Haluatko muokata k�ytt�j�tietoja nyt?";
+        Text[ catalan ] = "Observeu que el carrer, el codi postal i la ciutat s'utilitzen per generar la clau de registre. Les dades de l'usuari no es poden modificar fins que s'hagi efectuat correctament el registre. Voleu modificar les dades personals ara?";
+        Text[ finnish ] = "Katuosoite-, postinumero- ja postitoimipaikkatietoja k�ytet��n rekister�intiavaimen luonnissa. Et voi muuttaa k�ytt�j�tietoja rekister�innin j�lkeen. Haluatko muuttaa k�ytt�j�tietoja nyt?";
         Text[ thai ] = "บันทึกว่าถนน, รหัสไปรษณีย์และเมืองถูกใช้เพื่อสร้างกุญแจลงทะเบียน  คุณจะไม่สามารถเปลี่ยนข้อมูลผู้ใช้ได้อีกจนกว่าการลงทะเบียนนั้นจะสำเร็จ  คุณต้องการดัดแปลงแก้ไขข้อมูลผู้ใช้ตอนนี้หรือไม่?";
     };
     Text[ chinese_traditional ] = "使用者資料";
@@ -630,7 +631,7 @@ TabPage RID_SFXPAGE_GENERAL
     Text[ korean ] = "사용자 데이터";
     Text[ turkish ] = "Kullan�c� verileri";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Datos del usuario";
+    Text[ catalan ] = "Dades de l'usuari";
     Text[ finnish ] = "K�ytt�j�n tiedot";
     Text[ thai ] = "ข้อมูลผู้ใช้";
 };
@@ -644,25 +645,25 @@ QueryBox RID_SVXQB_CHANGEDATA
     Message = "Sie haben die Benutzerdaten ge�ndert.\nBitte bedenken Sie, dass dadurch die Registrierung verf�llt.\nSie ben�tigen einen neuen Registrierungsschl�ssel, der innerhalb der n�chsten 30 Tage eingegeben werden muss.\nDas Registrierungsformular finden Sie im Men� Hilfe - Registrierung...\nWollen Sie die Benutzerdaten wirklich �ndern?";
     Message [ English ] = "The user data have been changed.\nPlease note that in this way the registration will become invalid.\nTherefore, a new registration key is needed within 30 days.\nYou can find the registration form in the menu Help - Registration...\nDo you really want to change the user data?";
     Message [ english_us ] = "The User Data have been changed.\nNote that, if you continue, the registration key will become invalid.\nTherefore, a new registration key is needed within 30 days.\nYou can find the registration form in the menu Help - Registration...\nDo you really want to change your User Data?";
-    Message [ french ] = "Vous avez modifi� vos donn�es d'identit�.\nVeuillez noter que cela va faire expirer votre enregistrement.\nVous devrez vous procurer un nouveau code d'enregistrement et le saisir dans un d�lai de 30 jours.\nVous trouverez le formulaire d'enregistrement au menu Aide - Enregistrement...\nVoulez-vous vraiment modifier vos donn�es d'identit� ?";
+    Message [ french ] = "Vous avez modifi� vos donn�es d'utilisateur.\nCeci va entra�ner l'expiration de votre enregistrement.\nVous devrez vous procurer un nouveau code d'enregistrement et le saisir dans un d�lai de 30 jours.\nVous trouverez le formulaire d'enregistrement au menu Aide - Enregistrement...\nVoulez-vous vraiment modifier vos donn�es d'utilisateur ?";
     Message [ italian ] = "Avete modificato i dati utente.\nVi preghiamo di osservare che in questo modo la registrazione scadr�.\nEntro 30 giorni a partire da oggi dovrete inserire un nuovo codice di registrazione. Troverete il formulario di registrazione nel menu ? - Registrazione... \nVolete davvero cambiare i dati utente?" ;
-    Message [ dutch ] = "U heeft de gebruikersgegevens gewijzigd.\nWij maken u erop attent dat de registratie daardoor ongeldig wordt.\nU heeft een nieuwe registratiesleutel nodig, die binnen de volgende 30 dagen moet worden aangegeven.\\Het registratieformulier vindt u in het menu Help - Registratie...\nWilt u de gebruikersgegevens werkelijk veranderen?";
+    Message [ dutch ] = "U heeft de gebruikersgegevens gewijzigd.\nWij wijzen u erop dat de registratie daardoor ongeldig wordt.\nU heeft een nieuwe registratiesleutel nodig, die binnen de komende 30 dagen moet worden opgegeven.\\Het registratieformulier vindt u in het menu Help - Registratie...\nWilt u de gebruikersgegevens werkelijk wijzigen?";
     Message [ spanish ] = "Usted ha modificado los datos de usuario.\nTenga en cuenta que con ello expirar� el registro.\nNecesita una nueva clave de registro que tiene que ser introducida en los pr�ximos 30 d�as.\nEl formulario de registro lo encuentra en el men� Ayuda - Registro...\n�Desea realmente modificar los datos de usuario?" ;
     Message [ swedish ] = "Du har �ndrat dina anv�ndardata.\nT�nk p� att din nuvarande registrering l�per ut i och med detta.\nDu beh�ver en ny registreringsnyckel som m�ste matas in inom de n�rmaste 30 dagarna.\nRegistreringsformul�ret hittar du under menyn Hj�lp - Registrering...\nVill du verkligen �ndra dina anv�ndardata?" ;
     Message [ portuguese ] = "Modificou os dados de utilizador.\nN�o se esque�a de que o seu registo expirar�.\nPor esta raz�o necessitar� de um novo c�digo de registo dentro do prazo de 30 dias.\nEncontrar� o formul�rio de registo no menu Ajuda - Registo...\nModificar os dados de utilizador?" ;
     Message[ portuguese_brazilian ] = "Sie haben die Benutzerdaten ge?ndert.\nBitte bedenken Sie, da? dadurch die Registrierung verf?llt.\nSie ben?igen einen neuen Registrierungsschl?sel, der innerhalb der n?chsten 30 Tage eingegeben werden mu?.\nDas Registrierungsformular finden Sie im Men?Hilfe - Registrierung...\nWollen Sie die Benutzerdaten wirklich ?ndern?";
     Message[ danish ] = "Du har �ndret brugerdataene.\nBem�rk venligst, at din registrering derigennem bliver ugyldig.\nDu har brug for en ny registreringsn�gle, som skal indtastes indenfor 30 dage.\nDu finder registreringsformularen i menuen Hj�lp - Registrering...\nEr du sikker p�, at du vil �ndre brugerdataene?";
     Message[ chinese_simplified ] = "您已经更改了使用者数据。\n这样您的注册就会无效。\n您必须在今后30天之内输入一个新的注册密码。\n您能够在菜单\"帮助 - 注册...\"处找到注册表单。\n您真要更改使用者资料？";
-    Message[ russian ] = "�� �������� ������ ������������.\n����������, �������, ��� ��-�� ����� �� �������� �����������.\n��� ����������� ����� ��������������� ����, ������� ���������� ����� ������ � ������� 30 ����.\n��������������� �������� �� ������� � ���� ������� - �����������...\n�� ������������� ������ �������� ������ ������������?";
+    Message[ russian ] = "�� �������� ������ ������������.\n��-�� ����� �� �������� ������ ������������������� ������������.\n��� ����������� ����� ��������������� ����, ������� ���������� ����� ������ � ������� 30 ����.\n��������������� ����� �� ������� � ���� ������� - �����������...\n�������� ������ ������������, �������� �� ���?";
     Message[ polish ] = "Zmieniono dane u�ytkownika.\nNale�y uwzgl�dni�, �e przez to traci wa�no�� rejestracja.\nWymagany b�dzie nowy klucz rejestracyjny, kt�ry nale�y wprowadzi� w ci�gu nast�pnych 30 dni.\nFormularz rejestracyjny znajduje si� w menu Pomoc - Rejestracja...\nCzy na pewno zmieni� dane u�ytkownika?";
     Message[ japanese ] = "ユーザーデータが変更されました。\nそのため登録が失効するのは免れません。\n新しい登録キーが必要となり､それを30日以内に済まさなければなりません。\n登録用紙は[メニューヘルプ/登録...]にあります。\nユーザーデータを本当に変更しますか?";
     Message[ chinese_traditional ] = "您已經變更使用者資料。\n這樣您的註冊就會無效。\n您需要一個新的﹐且必須在30天之內輸入的註冊密鍵碼。\n您能夠在功能表說明，註冊之下找到註冊表格。\n真要修改使用者資料？";
     Message[ arabic ] = "��� ��� ������ ������ ��������.\n������ ������ �� ��� ������� ��� ���� ������� ��� ����.\n��� ����� ��� ����� ����� ���ϡ ��� ������ ���� �������� ����� ��������.\n����� ������ ��� ������� ������� �� ����� \"������\" ��� \"�����\"...\n�� ���� �������� ����� ������ ��������";
     Message[ greek ] = "�������� �� �������� ��� ������.\n�������� ��� �� ���� ��� �������� ����� �� ������ � ������.\n�� ���� �� ��������� �� ����������� ��� ��� ������ �������, �� ����� �� ������ �� �������� ���� ��� ������� �������� ��� �������� 30 ������.\n�� ����� ������� �� �� ������ ��� ����� ������� - ������...\n������ ���������� �� �������� �� �������� ��� ������;";
-    Message[ korean ] = "사용자 데이터가 변경되었습니다.\n이로 인해 등록이 무효화된다는 사실을 유념하십시오.\n앞으로 30일내에 입력해야 할 새 등록 키가 필요합니다.\n등록 양식은 도움말-등록... 메뉴에서 찾을 수 있습니다.\n사용자 데이터를 정말 변경하겠습니까?";
+    Message[ korean ] = "사용자 데이터가 변경되었습니다.\n이로 인해 등록이 무효화된다는 사실을 알아두십시오.\n앞으로 30일내에 입력해야 할 새 등록키가 필요합니다.\n등록 양식은 [도움말] - [Suite 웹 등록...] 메뉴에서 찾을 수 있습니다.\n사용자 데이터를 정말로 변경하시겠습니까?";
     Message[ turkish ] = "Kullan�c� verilerini de�i�tirdiniz.\nBu nedenle kay�t i�lemi de iptal edilecektir.\nEn ge� 30 g�n i�erisinde yeni bir kay�t kodu� girmeniz gerekiyor.\n�lgili kay�t formunu m�n�de, \"Yard�m - Kay�t...\" alt�nda bulabilirsiniz.\nKullan�c� verilerini ger�ekten de�i�tirmek istiyor musunuz?";
     Message[ language_user1 ] = " ";
-    Message[ catalan ] = "Usted ha modificado los datos de usuario.\nTenga en cuenta que con ello expirar� el registro.\nNecesita una nueva clave de registro que tiene que ser introducida en los pr�ximos 30 d�as.\nEl formulario de registro lo encuentra en el men� Ayuda - Registro...\n�Desea realmente modificar los datos de usuario?";
+    Message[ catalan ] = "s'han modificat Les dades de l'usuari ";
     Message[ finnish ] = "K�ytt�j�tietoja on muutettu.\nJos jatkat, rekister�intiavain ei ole en�� kelvollinen.\nUusi rekister�intiavain on hankittava 30 p�iv�n kuluessa.\nRekister�intilomake l�ytyy valikosta Ohje - Rekister�inti.\nHaluatko todella muuttaa k�ytt�j�tietoja?";
     Message[ thai ] = "ข้อมูลผู้ใช้ได้ถูกเปลี่ยนไป\nบันทึกว่า ถ้าคุณทำต่อ กุญแจลงทะเบียนจะใช้ไม่ได้\nเนื่องจากต้องการกุญแจลงทะเบียนใหม่ภายใน  30 วัน\nคุณสามารถหาแบบฟอร์มลงทะเบียนในเมนูส่วนช่วยเหลือ - ลงทะเบียน...\nคุณต้องเปลี่ยนข้อมูลผู้ใช้หรือไม่?";
 };
@@ -848,7 +849,7 @@ StringArray RID_SVXSTR_FIELDUNIT_TABLE
         < "�����" ; FUNIT_INCH ; > ;
         < "����" ; FUNIT_FOOT ; > ;
         < "����" ; FUNIT_MILE ; > ;
-        < "����" ; FUNIT_PICA ; > ;
+        < "�����" ; FUNIT_PICA ; > ;
         < "�����" ; FUNIT_POINT ; > ;
     };
     ItemList [ polish ] =
@@ -920,7 +921,7 @@ StringArray RID_SVXSTR_FIELDUNIT_TABLE
         < "인치" ; FUNIT_INCH ; > ;
         < "피트" ; FUNIT_FOOT ; > ;
         < "마일" ; FUNIT_MILE ; > ;
-        < "파이커" ; FUNIT_PICA ; > ;
+        < "파이카" ; FUNIT_PICA ; > ;
         < "포인트" ; FUNIT_POINT ; > ;
     };
     ItemList [ turkish ] =
@@ -949,15 +950,15 @@ StringArray RID_SVXSTR_FIELDUNIT_TABLE
     };
     ItemList [ catalan ] =
     {
-            < "Mil�metro" ; FUNIT_MM ; > ;
-        < "Cent�metro" ; FUNIT_CM ; > ;
-        < "Metro" ; FUNIT_M ; > ;
-        < "Kil�metro" ; FUNIT_KM ; > ;
-        < "Pulgadas" ; FUNIT_INCH ; > ;
-        < "Pie" ; FUNIT_FOOT ; > ;
-        < "Millas" ; FUNIT_MILE ; > ;
-        < "Pica" ; FUNIT_PICA ; > ;
-        < "Punto" ; FUNIT_POINT ; > ;
+            < "Mil�metres" ; FUNIT_MM ; > ;
+        < "Cent�metres" ; FUNIT_CM ; > ;
+        < "Metres" ; FUNIT_M ; > ;
+        < "Kil�metres" ; FUNIT_KM ; > ;
+        < "Polzades" ; FUNIT_INCH ; > ;
+        < "Peus" ; FUNIT_FOOT ; > ;
+        < "Milles" ; FUNIT_MILE ; > ;
+        < "Piques" ; FUNIT_PICA ; > ;
+        < "Punts" ; FUNIT_POINT ; > ;
     };
     ItemList [ thai ] =
     {
@@ -986,3 +987,8 @@ StringArray RID_SVXSTR_FIELDUNIT_TABLE
 
 
 
+
+
+
+
+
diff --git a/svx/source/options/optgrid.src b/svx/source/options/optgrid.src
index 01a221b39441..8ab3d1c8fe87 100644
--- a/svx/source/options/optgrid.src
+++ b/svx/source/options/optgrid.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: optgrid.src,v $
  *
- *  $Revision: 1.45 $
+ *  $Revision: 1.46 $
  *
- *  last change: $Author: os $ $Date: 2002-09-09 07:11:30 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -95,7 +95,7 @@ TabPage RID_SVXPAGE_GRID
         Text[ chinese_traditional ] = "網格";
         Text[ arabic ] = "������";
         Text[ greek ] = "������";
-        Text[ korean ] = "눈금";
+        Text[ korean ] = "그리드";
         Text[ turkish ] = "K�lavuz �izgiler";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Graella";
@@ -126,7 +126,7 @@ TabPage RID_SVXPAGE_GRID
         Text[ chinese_traditional ] = "使用網格座標(~A)";
         Text[ arabic ] = "������� ���� �����";
         Text[ greek ] = "����� ��������� ������������";
-        Text[ korean ] = "맞춤 눈금 사용(~A)";
+        Text[ korean ] = "그리드로 맞춤(~A)";
         Text[ turkish ] = "Kavrama k�lavuz �izgileri kullan";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Cap~tura la graella";
@@ -143,7 +143,7 @@ TabPage RID_SVXPAGE_GRID
         Text [ DANISH ] = "Synligt gitter" ;
         Text [ ENGLISH_US ] = "V~isible grid" ;
         Text [ SPANISH ] = "~Cuadr�cula visible" ;
-        Text [ FINNISH ] = "~N�kyv� ruudukko" ;
+        Text [ FINNISH ] = "N~�kyv� ruudukko" ;
         Text [ FRENCH ] = "Grille visible" ;
         Text [ ITALIAN ] = "Griglia visibile" ;
         Text [ DUTCH ] = "~Raster zichtbaar" ;
@@ -157,7 +157,7 @@ TabPage RID_SVXPAGE_GRID
         Text[ chinese_traditional ] = "顯示網格(~I)";
         Text[ arabic ] = "���� �����";
         Text[ greek ] = "������ ���~��";
-        Text[ korean ] = "눈금 표시(~I)";
+        Text[ korean ] = "그리드 표시(~I)";
         Text[ turkish ] = "K�lavuz �izgileri g�ster";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Graella v~isible";
@@ -203,7 +203,7 @@ TabPage RID_SVXPAGE_GRID
         Text[ portuguese ] = "~Horizontal";
         Text[ russian ] = "�������������";
         Text[ greek ] = "���������";
-        Text[ dutch ] = "H~orizontaal";
+        Text[ dutch ] = "Hori~zontaal";
         Text[ french ] = "H~orizontal";
         Text[ spanish ] = "~Horizontal";
         Text[ italian ] = "~Orizzontale";
@@ -232,7 +232,7 @@ TabPage RID_SVXPAGE_GRID
         Text[ portuguese ] = "~Vertical";
         Text[ russian ] = "�����������";
         Text[ greek ] = "�������~���";
-        Text[ dutch ] = "~Verticaal";
+        Text[ dutch ] = "Verti~caal";
         Text[ french ] = "Vertical";
         Text[ spanish ] = "~Vertical";
         Text[ italian ] = "Verticale";
@@ -446,7 +446,7 @@ TabPage RID_SVXPAGE_GRID
         Text [ DANISH ] = "Synkroniser akser" ;
         Text [ ENGLISH_US ] = "Synchronize a~xes" ;
         Text [ SPANISH ] = "~Sincronizar ejes" ;
-        Text [ FINNISH ] = "~Synkronoi akselit" ;
+        Text [ FINNISH ] = "Synkronoi akselit" ;
         Text [ FRENCH ] = "~Synchroniser les axes" ;
         Text [ ITALIAN ] = "~Sincronizza assi" ;
         Text [ DUTCH ] = "Assen s~ynchroniseren" ;
@@ -485,13 +485,13 @@ TabPage RID_SVXPAGE_GRID
         Text [ SWEDISH ] = "F�st" ;
         Text [ PORTUGUESE ] = "Captura" ;
         Text[ chinese_simplified ] = "对齐";
-        Text[ russian ] = "���������";
+        Text[ russian ] = "��������";
         Text[ polish ] = "Zaczep";
         Text[ japanese ] = "合わせる";
         Text[ chinese_traditional ] = "對齊";
         Text[ arabic ] = "�����";
         Text[ greek ] = "�����������";
-        Text[ korean ] = "맞추기";
+        Text[ korean ] = "맞춤";
         Text[ turkish ] = "Kavrama";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Captura";
@@ -513,7 +513,7 @@ TabPage RID_SVXPAGE_GRID
         Text [ FINNISH ] = "Kohdistusviivoihin" ;
         Text [ FRENCH ] = "Aux lignes de capture" ;
         Text [ ITALIAN ] = "Alle linee di cattura" ;
-        Text [ DUTCH ] = "Aan ~vanglijnen" ;
+        Text [ DUTCH ] = "Aan vangli~jnen" ;
         Text [ PORTUGUESE_BRAZILIAN ] = "An Hilfslinien" ;
         Text [ SWEDISH ] = "Mot st�~dlinjer" ;
         Text [ PORTUGUESE ] = "Nas linhas de capt~ura" ;
@@ -542,7 +542,7 @@ TabPage RID_SVXPAGE_GRID
         Text [ italian ] = "Ai margini delle pagine" ;
         Text [ spanish ] = "En los ~m�rgenes de p�gina" ;
         Text [ french ] = "Aux marges" ;
-        Text [ dutch ] = "Aan de ~marges" ;
+        Text [ dutch ] = "Aan ~marges" ;
         Text [ swedish ] = "Mot s~idmarginalerna" ;
         Text [ danish ] = "Ved s~idemargenerne" ;
         Text [ portuguese ] = "Nas ~margens" ;
@@ -573,7 +573,7 @@ TabPage RID_SVXPAGE_GRID
         Text [ DANISH ] = "Ved obje~ktramme" ;
         Text [ ENGLISH_US ] = "To object ~frame" ;
         Text [ SPANISH ] = "Al marco del objeto" ;
-        Text [ FINNISH ] = "Objektin ~kehykseen" ;
+        Text [ FINNISH ] = "Objektin kehykseen" ;
         Text [ FRENCH ] = "Au cadre de l'objet" ;
         Text [ ITALIAN ] = "Alla cornice dell'oggetto" ;
         Text [ DUTCH ] = "Aan object~kader" ;
@@ -605,7 +605,7 @@ TabPage RID_SVXPAGE_GRID
         Text [ DANISH ] = "~Ved objektpunkter" ;
         Text [ ENGLISH_US ] = "To obje~ct points" ;
         Text [ SPANISH ] = "En los ~puntos del objeto" ;
-        Text [ FINNISH ] = "Objekti~pisteisiin" ;
+        Text [ FINNISH ] = "Objekt~ipisteisiin" ;
         Text [ FRENCH ] = "~Aux points de l'objet" ;
         Text [ ITALIAN ] = "Ai punti dell'oggetto" ;
         Text [ DUTCH ] = "Aan object~punten" ;
@@ -636,7 +636,7 @@ TabPage RID_SVXPAGE_GRID
         Text [ DANISH ] = "Fang~omr�de" ;
         Text [ ENGLISH_US ] = "~Snap range" ;
         Text [ SPANISH ] = "�rea de c~aptura" ;
-        Text [ FINNISH ] = "~Kohdista alue" ;
+        Text [ FINNISH ] = "Kohdista ~alue" ;
         Text [ FRENCH ] = "~Zone de capture" ;
         Text [ ITALIAN ] = "Area di cattura" ;
         Text [ DUTCH ] = "Vang~bereik" ;
@@ -677,7 +677,7 @@ TabPage RID_SVXPAGE_GRID
         CustomUnitText [ DANISH ] = " Pixel" ;
         CustomUnitText [ ENGLISH_US ] = " Pixels" ;
         CustomUnitText [ SPANISH ] = "P�xel" ;
-        CustomUnitText [ FINNISH ] = " Kuvapisteet" ;
+        CustomUnitText [ FINNISH ] = "  kuvapistett�" ;
         CustomUnitText [ FRENCH ] = " Pixels" ;
         CustomUnitText [ ITALIAN ] = "Pixel" ;
         CustomUnitText [ DUTCH ] = "Pixels" ;
@@ -685,7 +685,7 @@ TabPage RID_SVXPAGE_GRID
         CustomUnitText [ SWEDISH ] = " pixel" ;
         CustomUnitText [ PORTUGUESE ] = "Pixel" ;
         CustomUnitText[ chinese_simplified ] = "像素";
-        CustomUnitText[ russian ] = "�������";
+        CustomUnitText[ russian ] = "�����";
         CustomUnitText[ polish ] = "Piksel";
         CustomUnitText[ japanese ] = "ピクセル";
         CustomUnitText[ chinese_traditional ] = " 像素";
@@ -723,13 +723,13 @@ TabPage RID_SVXPAGE_GRID
         Text [ SWEDISH ] = "Anpassa till st�draster" ;
         Text [ PORTUGUESE ] = "Encaixe" ;
         Text[ chinese_simplified ] = "对齐位置";
-        Text[ russian ] = "���������";
+        Text[ russian ] = "�������� �������";
         Text[ polish ] = "Zaskocz";
         Text[ japanese ] = "かみ合わせる";
         Text[ chinese_traditional ] = "對齊位置";
         Text[ arabic ] = "�������";
         Text[ greek ] = "�����������";
-        Text[ korean ] = "위치 고정";
+        Text[ korean ] = "맞춤 위치";
         Text[ turkish ] = "Kavrama y�n�";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Encaixa";
@@ -747,7 +747,7 @@ TabPage RID_SVXPAGE_GRID
         Text [ DANISH ] = "Ved opr~ettelse og flytning" ;
         Text [ ENGLISH_US ] = "~When creating or moving objects" ;
         Text [ SPANISH ] = "Al crear ~y mover" ;
-        Text [ FINNISH ] = "~Objekteja luotaessa tai siirrett�ess�" ;
+        Text [ FINNISH ] = "O~bjekteja luotaessa tai siirrett�ess�" ;
         Text [ FRENCH ] = "Lors de la ~cr�ation et du d�placement" ;
         Text [ ITALIAN ] = "Nella creazione e nel movimento" ;
         Text [ DUTCH ] = "~Tijdens het maken en bewegen" ;
@@ -755,7 +755,7 @@ TabPage RID_SVXPAGE_GRID
         Text [ SWEDISH ] = "N�r obj~ekt skapas och flyttas" ;
         Text [ PORTUGUESE ] = "Ao criar ou mover" ;
         Text[ chinese_simplified ] = "在生成和移动对象时(~W)";
-        Text[ russian ] = "��� �������� � �����������";
+        Text[ russian ] = "��� �������� � ����������� ��������";
         Text[ polish ] = "Podczas tworzenia i przenoszenia";
         Text[ japanese ] = "作成時または移動時(~W)";
         Text[ chinese_traditional ] = "產生和移動物件時(~W)";
@@ -778,7 +778,7 @@ TabPage RID_SVXPAGE_GRID
         Text [ NORWEGIAN ] = "L�ngere Kantenl�nge" ;
         Text [ DANISH ] = "L~�ngere kantl�ngde" ;
         Text [ ENGLISH_US ] = "~Extend edges" ;
-        Text [ SPANISH ] = "Aristas e~xtendidas" ;
+        Text [ SPANISH ] = "Aristas ~m�s largas" ;
         Text [ FINNISH ] = "~Laajenna reunat" ;
         Text [ FRENCH ] = "Ar�tes plus ~longues" ;
         Text [ ITALIAN ] = "Bordo pi� lungo" ;
@@ -815,7 +815,7 @@ TabPage RID_SVXPAGE_GRID
         Text [ FINNISH ] = "Kier~rett�ess�" ;
         Text [ FRENCH ] = "Lors de la rotation" ;
         Text [ ITALIAN ] = "Nella rotazione" ;
-        Text [ DUTCH ] = "T~ijdens draaien" ;
+        Text [ DUTCH ] = "T~ijdens het draaien" ;
         Text [ PORTUGUESE_BRAZILIAN ] = "Beim Drehen" ;
         Text [ SWEDISH ] = "Vid ~rotation" ;
         Text [ PORTUGUESE ] = "Durante a rota��o" ;
@@ -869,7 +869,7 @@ TabPage RID_SVXPAGE_GRID
         CustomUnitText[ korean ] = "도";
         CustomUnitText[ turkish ] = "Derece";
         CustomUnitText[ language_user1 ] = " ";
-        CustomUnitText[ finnish ] = " asteet";
+        CustomUnitText[ finnish ] = "  astetta";
         CustomUnitText[ catalan ] = " graus";
         CustomUnitText[ thai ] = " องศา";
     };
@@ -880,17 +880,17 @@ TabPage RID_SVXPAGE_GRID
         Hide = TRUE;
         Text = "~Punktreduktion" ;
         Text [ ENGLISH ] = "Point reduction" ;
-        Text [ dutch ] = "P~untreductie" ;
+        Text [ dutch ] = "Puntredu~ctie" ;
         Text [ english_us ] = "Point reducti~on" ;
         Text [ italian ] = "Riduzione punti" ;
         Text [ spanish ] = "Reducci�n de puntos" ;
-        Text [ french ] = "R�duction de point" ;
+        Text [ french ] = "R�duction de points" ;
         Text [ swedish ] = "~Punktreduktion" ;
         Text [ danish ] = "~Punktreduktion" ;
         Text [ portuguese ] = "Redu��o de pontos" ;
         Text [ portuguese_brazilian ] = "Punktreduktion" ;
         Text[ chinese_simplified ] = "减少接点(~O)";
-        Text[ russian ] = "~���������� �����";
+        Text[ russian ] = "~������ �����";
         Text[ polish ] = "Redukcja punkt�w";
         Text[ japanese ] = "点を減らす(~O)";
         Text[ chinese_traditional ] = "減少點數(~O)";
@@ -939,9 +939,14 @@ TabPage RID_SVXPAGE_GRID
         CustomUnitText[ korean ] = "도";
         CustomUnitText[ turkish ] = "Derece";
         CustomUnitText[ language_user1 ] = " ";
-        CustomUnitText[ finnish ] = " asteet";
+        CustomUnitText[ finnish ] = "  astetta";
         CustomUnitText[ catalan ] = " graus";
         CustomUnitText[ thai ] = " องศา";
     };
 };
 
+
+
+
+
+
diff --git a/svx/source/options/optinet2.src b/svx/source/options/optinet2.src
index b83ce3e6f4be..ac2124f1c040 100644
--- a/svx/source/options/optinet2.src
+++ b/svx/source/options/optinet2.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: optinet2.src,v $
  *
- *  $Revision: 1.70 $
+ *  $Revision: 1.71 $
  *
- *  last change: $Author: kz $ $Date: 2002-11-27 16:39:45 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -297,7 +297,7 @@ TabPage RID_SVXPAGE_INET_PROXY
         Text[ greek ] = "Use browser settings";
         Text[ dutch ] = "Browserinstellingen gebruiken";
         Text[ french ] = "Utiliser les param�tres du Browser";
-        Text[ spanish ] = "Utilizar configuraci�n del navegador";
+        Text[ spanish ] = "Utilizar la configuraci�n del navegador";
         Text[ finnish ] = "K�yt� selaimen asetuksia";
         Text[ italian ] = "Usa le impostazioni browser";
         Text[ danish ] = "Brug browserindstillinger";
@@ -362,7 +362,7 @@ TabPage RID_SVXPAGE_INET_PROXY
         Text [ dutch ] = "~Poort" ;
         Text [ portuguese ] = "~Porta" ;
         Text[ chinese_simplified ] = "端口(~P)";
-        Text[ russian ] = "����";
+        Text[ russian ] = "~����";
         Text[ polish ] = "Port";
         Text[ japanese ] = "ポート(~P)";
         Text[ chinese_traditional ] = "埠(~P)";
@@ -431,7 +431,7 @@ TabPage RID_SVXPAGE_INET_PROXY
         Text [ dutch ] = "P~oort" ;
         Text [ portuguese ] = "P~ort" ;
         Text[ chinese_simplified ] = "端口(~O)";
-        Text[ russian ] = "����";
+        Text[ russian ] = "�~���";
         Text[ polish ] = "Port";
         Text[ japanese ] = "ポート(~O)";
         Text[ chinese_traditional ] = "埠(~O)";
@@ -500,7 +500,7 @@ TabPage RID_SVXPAGE_INET_PROXY
         Text [ dutch ] = "Poo~rt" ;
         Text [ portuguese ] = "Po~rt" ;
         Text[ chinese_simplified ] = "端口(~R)";
-        Text[ russian ] = "����";
+        Text[ russian ] = "���~�";
         Text[ polish ] = "Port";
         Text[ japanese ] = "ポート(~R)";
         Text[ chinese_traditional ] = "埠(~R)";
@@ -541,7 +541,7 @@ TabPage RID_SVXPAGE_INET_PROXY
         Text[ chinese_traditional ] = "不用代理伺服器(~N)";
         Text[ arabic ] = "�� ���� Proxy ��:";
         Text[ greek ] = "~������ Proxy ���";
-        Text[ korean ] = "프록시 없음(~N):";
+        Text[ korean ] = "프록시 없음(~N)";
         Text[ turkish ] = "Proxy yok:";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Sense a:";
@@ -764,7 +764,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
     Text[ chinese_traditional ] = "搜尋";
     Text[ arabic ] = "���";
     Text[ greek ] = "A��������";
-    Text[ korean ] = "찾기";
+    Text[ korean ] = "검색";
 
     #define GB_SEARCH_LEFT 6
     #define GB_SEARCH_TOP 3
@@ -790,7 +790,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
         Text[ chinese_traditional ] = "搜尋位置";
         Text[ arabic ] = "����� ��";
         Text[ greek ] = "��������� ���";
-        Text[ korean ] = "찾을 범위";
+        Text[ korean ] = "검색 위치";
         Text[ turkish ] = "�urada ara:";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Cerca a";
@@ -864,7 +864,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
         Text[ chinese_traditional ] = "類型";
         Text[ arabic ] = "�����";
         Text[ greek ] = "�����";
-        Text[ korean ] = "유형";
+        Text[ korean ] = "검색 유형";
         Text[ turkish ] = "T�r";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Tipus";
@@ -894,7 +894,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
         Text[ chinese_traditional ] = "和";
         Text[ arabic ] = "�";
         Text[ greek ] = "���";
-        Text[ korean ] = "그리고";
+        Text[ korean ] = "및(And)";
         Text[ turkish ] = "Ve";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "I";
@@ -952,7 +952,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
         Text[ chinese_traditional ] = "精確(~X)";
         Text[ arabic ] = "�������";
         Text[ greek ] = "�~������";
-        Text[ korean ] = "정확히(~X)";
+        Text[ korean ] = "자세히(~X)";
         Text[ turkish ] = "Ayn�s�";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "E~xacte";
@@ -981,7 +981,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
         Text[ chinese_traditional ] = "前綴(~P)";
         Text[ arabic ] = "������ �����";
         Text[ greek ] = "�������";
-        Text[ korean ] = "접두어(~P)";
+        Text[ korean ] = "검색 접두어(~P)";
         Text[ turkish ] = "�nek";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Prefix";
@@ -1016,7 +1016,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
         Text[ chinese_traditional ] = "後綴(~F)";
         Text[ arabic ] = "������ ������";
         Text[ greek ] = "������~��";
-        Text[ korean ] = "접두어(~F)";
+        Text[ korean ] = "검색 접미어(~F)";
         Text[ turkish ] = "Sonek";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Su~fix";
@@ -1045,7 +1045,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
         Text [ portuguese_brazilian ] = "~Trenner" ;
         Text [ portuguese ] = "~Separador" ;
         Text[ chinese_simplified ] = "分隔符(~S)";
-        Text[ russian ] = "�����������";
+        Text[ russian ] = "��~���������";
         Text[ polish ] = "Separator";
         Text[ japanese ] = "区切り記号(~S)";
         Text[ chinese_traditional ] = "連接符(~S)";
@@ -1073,7 +1073,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
         Text [ dutch ] = "S~chrijfstijl" ;
         Text [ english_us ] = "~Case match" ;
         Text [ italian ] = "Stile carattere" ;
-        Text [ spanish ] = "Es~tilo" ;
+        Text [ spanish ] = "Es~tilo de escritura" ;
         Text [ french ] = "Style d'�criture" ;
         Text [ swedish ] = "~Skrivstil" ;
         Text [ danish ] = "Skrivestil" ;
@@ -1086,7 +1086,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
         Text[ chinese_traditional ] = "大小寫(~C)";
         Text[ arabic ] = "��� �������";
         Text[ greek ] = "~���� ������";
-        Text[ korean ] = "글씨체(~C)";
+        Text[ korean ] = "문자 구분(~C)";
         Text[ turkish ] = "~B�Y�K/k���k harf duyarl�";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Es~til";
@@ -1324,7 +1324,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
         Text[ chinese_traditional ] = "變更(~M)";
         Text[ arabic ] = "�����";
         Text[ greek ] = "�����������";
-        Text[ korean ] = "수정(~M)";
+        Text[ korean ] = "변경(~M)";
         Text[ turkish ] = "De�i�tir";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Modifica";
@@ -1339,7 +1339,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
         Text [ English ] = "Dele~te" ;
         Text [ english_us ] = "~Delete" ;
         Text [ italian ] = "Elimina" ;
-        Text [ spanish ] = "~Eliminar" ;
+        Text [ spanish ] = "~Borrar" ;
         Text [ french ] = "Supprimer" ;
         Text [ dutch ] = "~Wissen" ;
         Text [ swedish ] = "~Radera" ;
@@ -1445,7 +1445,7 @@ TabPage RID_SVXPAGE_INET_SCRIPTING
         Text [ swedish ] = "%PRODUCTNAME Basic-skript" ;
         Text [ danish ] = "%PRODUCTNAME Basic-Script" ;
         Text [ italian ] = "Script %PRODUCTNAME Basic" ;
-        Text [ spanish ] = "Script %PRODUCTNAME Basic" ;
+        Text [ spanish ] = "%PRODUCTNAME Basic - Script" ;
         Text [ french ] = "Script %PRODUCTNAME Basic" ;
         Text [ dutch ] = "%PRODUCTNAME Basic Script" ;
         Text [ portuguese ] = "Script %PRODUCTNAME Basic" ;
@@ -1601,7 +1601,7 @@ TabPage RID_SVXPAGE_INET_SCRIPTING
         StringList [ korean ] =
         {
              < "절대 안함" ; > ;
-            < "경로 목록에 의거" ; > ;
+            < "경로 목록에 해당" ; > ;
             < "항상" ; > ;
         };
         StringList [ chinese_simplified ] =
@@ -1655,7 +1655,7 @@ TabPage RID_SVXPAGE_INET_SCRIPTING
         Text[ polish ] = "C~onfirm in case of other document sources";
         Text[ portuguese_brazilian ] = "C~onfirm in case of other document sources";
         Text[ japanese ] = "ほかのドキュメントソースでは確認する";
-        Text[ korean ] = "다른 문서에서는 확인(~O)";
+        Text[ korean ] = "다른 문서 원본에서 확인(~O)";
         Text[ chinese_simplified ] = "如果是其它文档来源就需要确认";
         Text[ chinese_traditional ] = "如果是其它文件來源就需要確認";
         Text[ turkish ] = "C~onfirm in case of other document sources";
@@ -1737,7 +1737,7 @@ TabPage RID_SVXPAGE_INET_SCRIPTING
         Text [ swedish ] = "~Radera" ;
         Text [ danish ] = "Slet" ;
         Text [ italian ] = "~Elimina" ;
-        Text [ spanish ] = "~Eliminar" ;
+        Text [ spanish ] = "~Borrar" ;
         Text [ french ] = "Supprimer" ;
         Text [ dutch ] = "~Wissen" ;
         Text [ portuguese ] = "E~liminar" ;
@@ -1777,7 +1777,7 @@ TabPage RID_SVXPAGE_INET_SCRIPTING
         Text[ chinese_traditional ] = "標準(~E)";
         Text[ arabic ] = "�������";
         Text[ greek ] = "����������";
-        Text[ korean ] = "기본(~E)";
+        Text[ korean ] = "기본값(~E)";
         Text[ turkish ] = "Standart";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "P~er defecte";
@@ -1796,7 +1796,7 @@ TabPage RID_SVXPAGE_INET_SCRIPTING
         Text[ greek ] = "New pa~th";
         Text[ dutch ] = "Ni~euw pad";
         Text[ french ] = "Nouveau chemin";
-        Text[ spanish ] = "~Nueva ruta";
+        Text[ spanish ] = "~Ruta nueva";
         Text[ finnish ] = "Uusi polku";
         Text[ italian ] = "~Nuovo percorso";
         Text[ danish ] = "N~y sti";
@@ -2353,11 +2353,11 @@ TabPage RID_SVXPAGE_INET_SCRIPTING
         Text = "~Durchsuchen...";
         Text [ english_us ] = "~Browse..." ;
         Text[ portuguese ] = "~Browse...";
-        Text[ russian ] = "�����...";
+        Text[ russian ] = "~�����...";
         Text[ greek ] = "~Browse...";
         Text[ dutch ] = "~Bladeren...";
         Text[ french ] = "Parcourir...";
-        Text[ spanish ] = "E~xaminar...";
+        Text[ spanish ] = "~Buscar...";
         Text[ finnish ] = "~Selaa...";
         Text[ italian ] = "~Sfoglia...";
         Text[ danish ] = "~Gennemse...";
@@ -2365,7 +2365,7 @@ TabPage RID_SVXPAGE_INET_SCRIPTING
         Text[ polish ] = "~Browse...";
         Text[ portuguese_brazilian ] = "~Browse...";
         Text[ japanese ] = "検索(~B)...";
-        Text[ korean ] = "검색(~B)...";
+        Text[ korean ] = "찾아보기(~B)...";
         Text[ chinese_simplified ] = "浏览(~B)...";
         Text[ chinese_traditional ] = "瀏覽(~B)...";
         Text[ turkish ] = "~Browse...";
@@ -2489,7 +2489,7 @@ ErrorBox RID_SVXERR_OPT_PROXYPORTS
     Message[ chinese_traditional ] = "無效的數值！\n\n一個埠號碼的最大值是65535 。";
     Message[ arabic ] = "���� ��� �����!\n\n������ ������ ���� ���� �� 65535.";
     Message[ greek ] = "�� ������ ����!\n\n� ������� ���� ������� ����� ����� 65535.";
-    Message[ korean ] = "값이 유효하지 않음!\n\n포트 번호의 최대값은 65535임.";
+    Message[ korean ] = "값이 잘못되었습니다!\n\n포트 번호의 최대값은 65535입니다.";
     Message[ turkish ] = "Ge�ersiz de�er!\n\nPort numaras� i�in en y�ksek de�er 65535.";
     Message[ language_user1 ] = " ";
     Message[ catalan ] = "Valor no v�lid!\n\nEl valor m�xim d'un n�mero de port �s 65535.";
@@ -2533,7 +2533,7 @@ ModalDialog RID_SVXDLG_OPT_JAVASCRIPT_DISABLE
         Text[ chinese_traditional ] = "請註意：關閉 Java 支援，\n也就不能使用Javascript 功能。\n\n還是要關閉 Java ？";
         Text[ arabic ] = "������ ������ ��� ������� �� Java\n���� ������ Javascript �����.\n\n�� ���� ����� Java ������ �� ��߿";
         Text[ greek ] = "�������� �������� ��� �� ��� �������������� ��� Java\n������� ��� �������������� ��� Javascript.\n\n������ �� ����� �������������� ��� Java;";
-        Text[ korean ] = "Java와 더불어 \nJavaScript도 사용할 수 없게 된다는 사실에 유의하십시오. \n\n그래도 Java를 사용 해제하겠습니까?";
+        Text[ korean ] = "Java와 더불어 \nJavaScript도 사용할 수 없게 된다는 사실에 유의하십시오. \n\n그래도 Java를 해제하겠습니까?";
         Text[ turkish ] = "Java ile birlikte Javascript'in de\nkapat�laca��n� dikkate al�n.\n\nYine de Java'y� kapatmak istiyor musunuz?";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "S'ha de tenir en compte que amb el Java\ntamb� �s desactivar� Javascript.\n\nEncara voleu desactivar el Java?";
@@ -2552,7 +2552,7 @@ ModalDialog RID_SVXDLG_OPT_JAVASCRIPT_DISABLE
         Text [ spanish ] = "~No mostrar m�s esta advertencia." ;
         Text [ french ] = "~Ne plus afficher cet avertissement" ;
         Text[ portuguese ] = "~N�o mostrar mais esta advert�ncia";
-        Text[ russian ] = "�� ���������� ~��� ��������������.";
+        Text[ russian ] = "�� ���������� ~��� ��������������";
         Text[ dutch ] = "~Waarschuwing niet meer weergeven";
         Text[ danish ] = "Vis denne advarsel ikke igen";
         Text[ swedish ] = "~Visa inte den h�r varningen mer";
@@ -2563,7 +2563,7 @@ ModalDialog RID_SVXDLG_OPT_JAVASCRIPT_DISABLE
         Text[ chinese_traditional ] = "不要再顯示這個警告(~D)";
         Text[ arabic ] = "��� ����� ��� ������� ��� ���� �� ��������";
         Text[ greek ] = "�� ��� ���������� ���� ���� � �����~��������";
-        Text[ korean ] = "이 경고를 다시 표시 안함(~D)";
+        Text[ korean ] = "이 경고를 다시 표시하지 않음(~D)";
         Text[ turkish ] = "Bu uyar�y� art�k g�r�nt�leme";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~No tornis a mostrar l'advertiment";
@@ -2598,3 +2598,8 @@ ModalDialog RID_SVXDLG_OPT_JAVASCRIPT_DISABLE
 
 
 
+
+
+
+
+
diff --git a/svx/source/options/optjsearch.src b/svx/source/options/optjsearch.src
index a21333095ea6..a6b2da5e537b 100644
--- a/svx/source/options/optjsearch.src
+++ b/svx/source/options/optjsearch.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: optjsearch.src,v $
  *
- *  $Revision: 1.28 $
+ *  $Revision: 1.29 $
  *
- *  last change: $Author: os $ $Date: 2002-08-21 15:09:11 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -97,7 +97,7 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS
         Text[ chinese_traditional ] = "當作相等處理";
         Text[ turkish ] = "Treat as equal";
         Text[ arabic ] = "Treat as equal";
-        Text[ language_user1 ] = "EM23.3.01ENGLISH: Group box title. Use only one verb for the whole group box. Instead of saying \"Treat as equal - match...\" (dh gleichwertig behandeln und gleichstellen), just use \"treat as equal\" as title above all and no verb at check boxes (ie diff than English MS Word)";
+        Text[ language_user1 ] = "EM23; EM23.3.01ENGLISH: Group box title. Use only one verb for the whole group box. Instead of saying \"Treat as equal - match...\" (dh gleichwertig behandeln und gleichstellen), just use \"treat as equal\" as title above all and no verb at check boxes (ie diff than English MS Word)";
         Text[ catalan ] = "Tracta com a iguals";
         Text[ finnish ] = "K�sittele tasa-arvoisena";
         Text[ thai ] = "ปฏิบัติอย่างเท่าเทียมกัน";
@@ -112,23 +112,23 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS
         Text[ portuguese ] = "~Mai�sculas/min�sculas";
         Text[ russian ] = "���������/�������� �����";
         Text[ greek ] = "��������/����";
-        Text[ dutch ] = "~Hoofd-/kleine letters";
+        Text[ dutch ] = "Hoofdletters/~kleine letters";
         Text[ french ] = "Majuscules/minuscules";
         Text[ spanish ] = "May�sculas/min�sculas";
         Text[ italian ] = "Maiuscole/minuscole";
-        Text[ danish ] = "~Store og sm� bogstaver";
+        Text[ danish ] = "St~ore og sm� bogstaver";
         Text[ swedish ] = "St~ora/sm� bokst�ver";
         Text[ polish ] = "Wielkie i ma�e litery";
         Text[ portuguese_brazilian ] = "Match case";
         Text[ japanese ] = "大文字/小文字(~U)";
-        Text[ korean ] = "대/소문자 구분(~U)";
+        Text[ korean ] = "대문자/소문자(~U)";
         Text[ chinese_simplified ] = "字母大小写(~U)";
         Text[ chinese_traditional ] = "字母大小寫(~U)";
         Text[ turkish ] = "Match case";
         Text[ arabic ] = "������� ����� ����� �� �����";
-        Text[ language_user1 ] = "EM23.3.01ENGLISH: only in this dialog does Eng not follow the usual check box style of first letter uppercase and all others lowercase; for clarity and consistency.";
+        Text[ language_user1 ] = "EM23; EM23.3.01ENGLISH: only in this dialog does Eng not follow the usual check box style of first letter uppercase and all others lowercase; for clarity and consistency.";
         Text[ catalan ] = "Maj�scules/min�scules";
-        Text[ finnish ] = "~isot kirjaimet/pienet kirjaimet";
+        Text[ finnish ] = "isot kirjaimet/pienet kirjaimet";
         Text[ thai ] = "~ตัวพิมพ์ใหญ่/ตัวพิมพ์เล็ก";
     };
     CheckBox CB_MATCH_FULL_HALF_WIDTH
@@ -139,7 +139,7 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS
         Text [ ENGLISH ] = "Match full/half width form" ;
         Text[ english_us ] = "~full-width/half-width forms";
         Text[ portuguese ] = "Formas de meia-largura e largura normal";
-        Text[ russian ] = "����������/����������� �����";
+        Text[ russian ] = "������/����������� ������ ����";
         Text[ greek ] = "������ ���������/����� �������";
         Text[ dutch ] = "~Normale/halfbrede vormen";
         Text[ french ] = "Formes de demi et pleine chasse";
@@ -150,14 +150,14 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS
         Text[ polish ] = "Formy o zwyk�ej / o po�owie szeroko�ci";
         Text[ portuguese_brazilian ] = "Match full/half width form";
         Text[ japanese ] = "全角/半角(~F)";
-        Text[ korean ] = "일반/반폭 형식)(~F)";
+        Text[ korean ] = "전자/반자 형식(~F)";
         Text[ chinese_simplified ] = "全角和半角(~F)";
         Text[ chinese_traditional ] = "全形和半形字型(~F)";
         Text[ turkish ] = "Match full/half width form";
         Text[ arabic ] = "Match full/half width form";
-        Text[ language_user1 ] = "EM23.3.01ENGLISH: only in this dialog does Eng not follow the usual check box style of first letter uppercase and all others lowercase; for clarity and consistency.";
+        Text[ language_user1 ] = "EM23; EM23.3.01ENGLISH: only in this dialog does Eng not follow the usual check box style of first letter uppercase and all others lowercase; for clarity and consistency.";
         Text[ catalan ] = "formes d'amplada completa/mitja amplada";
-        Text[ finnish ] = "~t�ysleve�t/puolileve�t lomakkeet";
+        Text[ finnish ] = "t�ysleve�t/puolileve�t lomakkeet";
         Text[ thai ] = "แบบฟอร์มความกว้าง~เต็ม/ความกว้างครึ่งหนึ่ง";
     };
     CheckBox CB_MATCH_HIRAGANA_KATAKANA
@@ -170,23 +170,23 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS
         Text[ portuguese ] = "~Hiragana/Katakana";
         Text[ russian ] = "��������/��������";
         Text[ greek ] = "Hiragana/Katakana";
-        Text[ dutch ] = "~Hiragana/Katakana";
+        Text[ dutch ] = "Hira~gana/Katakana";
         Text[ french ] = "Hiragana/katakana";
         Text[ spanish ] = "Hiragana/Katakana";
         Text[ italian ] = "Hiragana/katakana";
-        Text[ danish ] = "~Hiragana/Katakana";
+        Text[ danish ] = "H~iragana/Katakana";
         Text[ swedish ] = "Hira~gana/katakana";
         Text[ polish ] = "Hiragana/Katakana";
         Text[ portuguese_brazilian ] = "Match hiragana/katakana";
         Text[ japanese ] = "ひらがな/カタカナ(~H)";
-        Text[ korean ] = "히라가나/가다가나(~H)";
+        Text[ korean ] = "히라가나/가타카나(~H)";
         Text[ chinese_simplified ] = "平假名和片假名(~H)";
         Text[ chinese_traditional ] = "平假名和片假名(~H)";
         Text[ turkish ] = "Match hiragana/katakana";
         Text[ arabic ] = "��������/��������";
-        Text[ language_user1 ] = "EM23.3.01ENGLISH: only in this dialog does Eng not follow the usual check box style of first letter uppercase and all others lowercase; for clarity and consistency.";
+        Text[ language_user1 ] = "EM23; EM23.3.01ENGLISH: only in this dialog does Eng not follow the usual check box style of first letter uppercase and all others lowercase; for clarity and consistency.";
         Text[ catalan ] = "hiragana/katakana";
-        Text[ finnish ] = "~hiragana/katakana";
+        Text[ finnish ] = "hiragana/katakana";
         Text[ thai ] = "~ฮิรากานะ/คาตากานะ";
     };
     CheckBox CB_MATCH_CONTRACTIONS
@@ -208,14 +208,14 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS
         Text[ polish ] = "Kontrakcje (yo-on, sokuon)";
         Text[ portuguese_brazilian ] = "Match contractions (yo-on, sokuon)";
         Text[ japanese ] = "拗音、促音(~C)";
-        Text[ korean ] = "축약(yo-on, sokuon)(~C)";
+        Text[ korean ] = "요음(~C)";
         Text[ chinese_simplified ] = "日文缩写式(拗音、促音)(~C)";
         Text[ chinese_traditional ] = "日文縮寫式(拗音，促音)(~C)";
         Text[ turkish ] = "Match contractions (yo-on, sokuon)";
         Text[ arabic ] = "Match contractions (yo-on, sokuon)";
-        Text[ language_user1 ] = "EM23.3.01ENGLISH: only in this dialog does Eng not follow the usual check box style of first letter uppercase and all others lowercase; for clarity and consistency.";
+        Text[ language_user1 ] = "EM23; EM23.3.01ENGLISH: only in this dialog does Eng not follow the usual check box style of first letter uppercase and all others lowercase; for clarity and consistency.";
         Text[ catalan ] = "contraccions (yo-on, sokuon)";
-        Text[ finnish ] = "~kutistumat (yo-on, sokuon)";
+        Text[ finnish ] = "kutistumat (yo-on, sokuon)";
         Text[ thai ] = "~หนังสือสัญญา (yo-on, sokuon)";
     };
     CheckBox CB_MATCH_MINUS_DASH_CHOON
@@ -237,14 +237,14 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS
         Text[ polish ] = "Minus/my�lnik/cho-on";
         Text[ portuguese_brazilian ] = "Match minus/dash/cho-on";
         Text[ japanese ] = "マイナス/ハイフン/長音[－/‐/ー](~M)";
-        Text[ korean ] = "마이너스/대시/cho-on(~M)";
+        Text[ korean ] = "빼기/대시/장음[－/‐/ー](~M)";
         Text[ chinese_simplified ] = "负数符号/连字符/長音[－/‐/ー](~M)";
         Text[ chinese_traditional ] = "負數符號/連字符/長音[－/‐/ー](~M)";
         Text[ turkish ] = "Match minus/dash/cho-on";
         Text[ arabic ] = "Match minus/dash/cho-on";
-        Text[ language_user1 ] = "EM23.3.01ENGLISH: only in this dialog does Eng not follow the usual check box style of first letter uppercase and all others lowercase; for clarity and consistency.";
+        Text[ language_user1 ] = "EM23; EM23.3.01ENGLISH: only in this dialog does Eng not follow the usual check box style of first letter uppercase and all others lowercase; for clarity and consistency.";
         Text[ catalan ] = "Menys/Gui�/cho-on";
-        Text[ finnish ] = "~miinus/viiva/cho-on";
+        Text[ finnish ] = "miinus/viiva/cho-on";
         Text[ thai ] = "~ลบ/เส้นประ/cho-on";
     };
     CheckBox CB_MATCH_REPEAT_CHAR_MARKS
@@ -255,9 +255,9 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS
         Text [ ENGLISH ] = "Match 'repeat character' marks" ;
         Text[ english_us ] = "'re~peat character' marks";
         Text[ portuguese ] = "Ca~racteres de repeti��o";
-        Text[ russian ] = "������������� �����";
+        Text[ russian ] = "������������� �������";
         Text[ greek ] = "���������� ����������";
-        Text[ dutch ] = "~Herhalingstekens";
+        Text[ dutch ] = "He~rhalingstekens";
         Text[ french ] = "Caract�res de r�p�tition";
         Text[ spanish ] = "Car�cter de repetici�n";
         Text[ italian ] = "Caratteri di ripetizione";
@@ -266,12 +266,12 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS
         Text[ polish ] = "Znaki powt�rki";
         Text[ portuguese_brazilian ] = "Match 'repeat character' marks";
         Text[ japanese ] = "繰り返し記号[ヽヾゝゞ々](~P)";
-        Text[ korean ] = "반복 기호(~P)";
+        Text[ korean ] = "반복 기호[ヽヾゝゞ々](~P)";
         Text[ chinese_simplified ] = "重复的字符[ヽヾゝゞ々](~P)";
         Text[ chinese_traditional ] = "重復的字元[ヽヾゝゞ々](~P)";
         Text[ turkish ] = "Match 'repeat character' marks";
         Text[ arabic ] = "��� �������";
-        Text[ language_user1 ] = "EM23.3.01ENGLISH: only in this dialog does Eng not follow the usual check box style of first letter uppercase and all others lowercase; for clarity and consistency.";
+        Text[ language_user1 ] = "EM23; EM23.3.01ENGLISH: only in this dialog does Eng not follow the usual check box style of first letter uppercase and all others lowercase; for clarity and consistency.";
         Text[ catalan ] = "Car�cter de repetici�";
         Text[ finnish ] = "merkintoistomerkit";
         Text[ thai ] = "'ทำเครื่องหมายตัวอักขระ~ซ้ำ";
@@ -295,14 +295,14 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS
         Text[ polish ] = "Wariant kanji (itaiji)";
         Text[ portuguese_brazilian ] = "Match variant-form kanji (itaiji)";
         Text[ japanese ] = "漢字表記のゆれ(異体字)(~V)";
-        Text[ korean ] = "간지 변형(itaiji)(~V)";
+        Text[ korean ] = "간지 변형(~V)";
         Text[ chinese_simplified ] = "日文汉字(異体字)(~V)";
         Text[ chinese_traditional ] = "日文漢字(異体字)(~V)";
         Text[ turkish ] = "Match variant-form kanji (itaiji)";
         Text[ arabic ] = "Match variant-form kanji (itaiji)";
-        Text[ language_user1 ] = "EM23.3.01ENGLISH: only in this dialog does Eng not follow the usual check box style of first letter uppercase and all others lowercase; for clarity and consistency.";
+        Text[ language_user1 ] = "EM23; EM23.3.01ENGLISH: only in this dialog does Eng not follow the usual check box style of first letter uppercase and all others lowercase; for clarity and consistency.";
         Text[ catalan ] = "Kanji de forma variant (Itaiji)";
-        Text[ finnish ] = "~kanji (itaiji) -muodot";
+        Text[ finnish ] = "kanji (itaiji) -muodot";
         Text[ thai ] = "แบบแ~ปรผันคันจิ (itaiji)";
     };
     CheckBox CB_MATCH_OLD_KANA_FORMS
@@ -319,19 +319,19 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS
         Text[ french ] = "Anciennes formes kana";
         Text[ spanish ] = "Antiguas formas Kana";
         Text[ italian ] = "Tutte le vecchie forme kana";
-        Text[ danish ] = "Gam~le Kana-former";
+        Text[ danish ] = "Gamle Kana-~former";
         Text[ swedish ] = "Gam~la kana-former";
         Text[ polish ] = "Stare formy Kana";
         Text[ portuguese_brazilian ] = "Match old kana forms";
         Text[ japanese ] = "新旧かな字体(~O)";
-        Text[ korean ] = "구 가나 형식(~O)";
+        Text[ korean ] = "이전 가나 형식(~O)";
         Text[ chinese_simplified ] = "旧式日文假名(~O)";
         Text[ chinese_traditional ] = "舊式日文假名(~O)";
         Text[ turkish ] = "Match old kana forms";
         Text[ arabic ] = "Match old kana forms";
-        Text[ language_user1 ] = "EM23.3.01ENGLISH: only in this dialog does Eng not follow the usual check box style of first letter uppercase and all others lowercase; for clarity and consistency.";
+        Text[ language_user1 ] = "EM23; EM23.3.01ENGLISH: only in this dialog does Eng not follow the usual check box style of first letter uppercase and all others lowercase; for clarity and consistency.";
         Text[ catalan ] = "formes Kana antigues";
-        Text[ finnish ] = "~vanhat kana-muodot";
+        Text[ finnish ] = "vanhat Kana-muodot";
         Text[ thai ] = "แบบคานะเ~ก่า";
     };
     CheckBox CB_MATCH_DIZI_DUZU
@@ -353,14 +353,14 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS
         Text[ polish ] = "Di/zi, du/zu";
         Text[ portuguese_brazilian ] = "Match di/zi, du/zu";
         Text[ japanese ] = "ヂ/ジ、ヅ/ズ(~D)";
-        Text[ korean ] = "~di/zi, du/zu!";
+        Text[ korean ] = "~di/zi, du/zu";
         Text[ chinese_simplified ] = "ヂ/ジ、ヅ/ズ(~D)";
         Text[ chinese_traditional ] = "ヂ/ジ、ヅ/ズ(~D)";
         Text[ turkish ] = "Match di/zi, du/zu";
         Text[ arabic ] = "Match di/zi, du/zu";
-        Text[ language_user1 ] = "EM23.3.01ENGLISH: only in this dialog does Eng not follow the usual check box style of first letter uppercase and all others lowercase; for clarity and consistency.";
+        Text[ language_user1 ] = "EM23; EM23.3.01ENGLISH: only in this dialog does Eng not follow the usual check box style of first letter uppercase and all others lowercase; for clarity and consistency.";
         Text[ catalan ] = "di/zi, du/zu";
-        Text[ finnish ] = "~di/zi, du/zu";
+        Text[ finnish ] = "di/zi, du/zu";
         Text[ thai ] = "~di/zi, du/zu";
     };
     CheckBox CB_MATCH_BAVA_HAFA
@@ -382,14 +382,14 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS
         Text[ polish ] = "Ba/va, ha/fa";
         Text[ portuguese_brazilian ] = "Match ba/va, ha/fa";
         Text[ japanese ] = "バ/ヴァ、ハ/ファ(~B)";
-        Text[ korean ] = "~ba/va, ha/fa!";
+        Text[ korean ] = "~ba/va, ha/fa";
         Text[ chinese_simplified ] = "バ/ヴァ、ハ/ファ(~B)";
         Text[ chinese_traditional ] = "バ/ヴァ、ハ/ファ(~B)";
         Text[ turkish ] = "Match ba/va, ha/fa";
         Text[ arabic ] = "Match ba/va, ha/fa";
-        Text[ language_user1 ] = "EM23.3.01ENGLISH: only in this dialog does Eng not follow the usual check box style of first letter uppercase and all others lowercase; for clarity and consistency.";
+        Text[ language_user1 ] = "EM23; EM23.3.01ENGLISH: only in this dialog does Eng not follow the usual check box style of first letter uppercase and all others lowercase; for clarity and consistency.";
         Text[ catalan ] = "ba/va, ha/fa";
-        Text[ finnish ] = "~ba/va, ha/fa";
+        Text[ finnish ] = "ba/va, ha/fa";
         Text[ thai ] = "~ba/va, ha/fa";
     };
     CheckBox CB_MATCH_TSITHICHI_DHIZI
@@ -406,19 +406,19 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS
         Text[ french ] = "Tsi/thi/chi, dhi/zi";
         Text[ spanish ] = "Tsi/thi/chi, dhi/zi";
         Text[ italian ] = "Tsi/thi/chi, dhi/zi";
-        Text[ danish ] = "~Tsi/thi/chi, dhi/zi";
+        Text[ danish ] = "T~si/thi/chi, dhi/zi";
         Text[ swedish ] = "Tsi/thi/chi, dhi/~zi";
         Text[ polish ] = "Tsi/thi/chi, dhi/zi";
         Text[ portuguese_brazilian ] = "Match tsi/thi/chi, dhi/zi";
         Text[ japanese ] = "ツィ/ティ/チ、ディ/ジ(~T)";
-        Text[ korean ] = "~tsi/thi/chi, dhi/zi!";
+        Text[ korean ] = "~tsi/thi/chi, dhi/zi";
         Text[ chinese_simplified ] = "バ/ヴァ、ハ/ファ(~T)";
         Text[ chinese_traditional ] = "バ/ヴァ、ハ/ファ(~T)";
         Text[ turkish ] = "Match tsi/thi/chi, dhi/zi";
         Text[ arabic ] = "Match tsi/thi/chi, dhi/zi";
-        Text[ language_user1 ] = "EM23.3.01ENGLISH: only in this dialog does Eng not follow the usual check box style of first letter uppercase and all others lowercase; for clarity and consistency.";
+        Text[ language_user1 ] = "EM23; EM23.3.01ENGLISH: only in this dialog does Eng not follow the usual check box style of first letter uppercase and all others lowercase; for clarity and consistency.";
         Text[ catalan ] = "tsi/thi/chi, dhi/zi";
-        Text[ finnish ] = "~tsi/thi/chi, dhi/zi";
+        Text[ finnish ] = "tsi/thi/chi, dhi/zi";
         Text[ thai ] = "~tsi/thi/chi, dhi/zi";
     };
     CheckBox CB_MATCH_HYUFYU_BYUVYU
@@ -431,7 +431,7 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS
         Text[ portuguese ] = "H~yu/fyu, byu/vyu";
         Text[ russian ] = "Hyu/fyu, byu/vyu";
         Text[ greek ] = "Hyu/fyu, byu/vyu";
-        Text[ dutch ] = "~Hyu/fyu, byu/vyu";
+        Text[ dutch ] = "H~yu/fyu, byu/vyu";
         Text[ french ] = "Hyu/fyu, byu/vyu";
         Text[ spanish ] = "hyu/fyu, byu/vyu";
         Text[ italian ] = "hyu/fyu, byu/vyu";
@@ -440,14 +440,14 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS
         Text[ polish ] = "Hyu/fyu, byu/vyu";
         Text[ portuguese_brazilian ] = "Match hyu/fyu, byu/vyu";
         Text[ japanese ] = "ヒュ/フュ、ビュ/ヴュ(~Y)";
-        Text[ korean ] = "h~yu/fyu, byu/vyu!";
+        Text[ korean ] = "h~yu/fyu, byu/vyu";
         Text[ chinese_simplified ] = "ヒュ/フュ、ビュ/ヴュ(~Y)";
         Text[ chinese_traditional ] = "ヒュ/フュ、ビュ/ヴュ(~Y)";
         Text[ turkish ] = "Match hyu/fyu, byu/vyu";
         Text[ arabic ] = "Match hyu/fyu, byu/vyu";
-        Text[ language_user1 ] = "EM23.3.01ENGLISH: only in this dialog does Eng not follow the usual check box style of first letter uppercase and all others lowercase; for clarity and consistency.";
+        Text[ language_user1 ] = "EM23; EM23.3.01ENGLISH: only in this dialog does Eng not follow the usual check box style of first letter uppercase and all others lowercase; for clarity and consistency.";
         Text[ catalan ] = "hyu/fyu, byu/vyu";
-        Text[ finnish ] = "h~yu/fyu, byu/vyu";
+        Text[ finnish ] = "hyu/fyu, byu/vyu";
         Text[ thai ] = "h~yu/fyu, byu/vyu";
     };
     CheckBox CB_MATCH_SESHE_ZEJE
@@ -460,23 +460,23 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS
         Text[ portuguese ] = "~Se/she, ze/je";
         Text[ russian ] = "Se/she, ze/je";
         Text[ greek ] = "Se/she, ze/je";
-        Text[ dutch ] = "~Se/she, ze/je";
+        Text[ dutch ] = "Se/she, ~ze/je";
         Text[ french ] = "Se/she, ze/je";
         Text[ spanish ] = "Se/she, ze/je";
         Text[ italian ] = "Se/she, ze/je";
-        Text[ danish ] = "~Se/she, ze/je";
+        Text[ danish ] = "Se/she, ze/~je";
         Text[ swedish ] = "~Se/she, ze/je";
         Text[ polish ] = "Se/she, ze/je";
         Text[ portuguese_brazilian ] = "Match se/she, ze/je";
         Text[ japanese ] = "セ/シェ、ゼ/ジェ(~S)";
-        Text[ korean ] = "~se/she, ze/je!";
+        Text[ korean ] = "~se/she, ze/je";
         Text[ chinese_simplified ] = "バ/ヴァ、ハ/ファ(~S)";
         Text[ chinese_traditional ] = "バ/ヴァ、ハ/ファ(~S)";
         Text[ turkish ] = "Match se/she, ze/je";
         Text[ arabic ] = "Match se/she, ze/je";
-        Text[ language_user1 ] = "EM23.3.01ENGLISH: only in this dialog does Eng not follow the usual check box style of first letter uppercase and all others lowercase; for clarity and consistency.";
+        Text[ language_user1 ] = "EM23; EM23.3.01ENGLISH: only in this dialog does Eng not follow the usual check box style of first letter uppercase and all others lowercase; for clarity and consistency.";
         Text[ catalan ] = "se/she, ze/je";
-        Text[ finnish ] = "~se/she, ze/je";
+        Text[ finnish ] = "se/she, ze/je";
         Text[ thai ] = "~se/she, ze/je";
     };
     CheckBox CB_MATCH_IAIYA
@@ -493,19 +493,19 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS
         Text[ french ] = "Ia/iya (piano/piyano)";
         Text[ spanish ] = "Ia/iya (piano/piyano)";
         Text[ italian ] = "Ia/iya (piano/piyano)";
-        Text[ danish ] = "Ia/iya (~piano/piyano)";
+        Text[ danish ] = "Ia/iya (pian~o/piyano)";
         Text[ swedish ] = "Ia/iya (~piano/piyano)";
         Text[ polish ] = "Ia/iya (piano/piyano)";
         Text[ portuguese_brazilian ] = "Match ia/iya (piano/piyano)";
         Text[ japanese ] = "イ段、エ段に続くア/ヤ (ピアノ/ピヤノ)(~I)";
-        Text[ korean ] = "~ia/iya (piano/piyano)!";
+        Text[ korean ] = "~ia/iya (piano/piyano)";
         Text[ chinese_simplified ] = "イ段、エ段的连接ｱ/ﾔ(ﾋﾟｱﾉ/ﾋﾟﾔﾉ)(~I)";
         Text[ chinese_traditional ] = "イ段及エ段的連接(ﾋﾟｱﾉ/ﾋﾟﾔﾉ)(~I)";
         Text[ turkish ] = "Match ia/iya (piano/piyano)";
         Text[ arabic ] = "Match ia/iya (piano/piyano)";
-        Text[ language_user1 ] = "EM23.3.01ENGLISH: only in this dialog does Eng not follow the usual check box style of first letter uppercase and all others lowercase; for clarity and consistency.";
+        Text[ language_user1 ] = "EM23; EM23.3.01ENGLISH: only in this dialog does Eng not follow the usual check box style of first letter uppercase and all others lowercase; for clarity and consistency.";
         Text[ catalan ] = "ia/iya (piano/piyano)";
-        Text[ finnish ] = "~ia/iya (piano/piyano)";
+        Text[ finnish ] = "ia/iya (piano/piyano)";
         Text[ thai ] = "~ia/iya (piano/piyano)";
     };
     CheckBox CB_MATCH_KIKU
@@ -527,14 +527,14 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS
         Text[ polish ] = "Ki/ku (tekisuto/tekusuto)";
         Text[ portuguese_brazilian ] = "Match ki/ku (tekisuto/tekusuto)";
         Text[ japanese ] = "サ行の前のキ/ク (テキスト/テクスト)(~K)";
-        Text[ korean ] = "~ki/ku (tekisuto/tekusuto)!";
+        Text[ korean ] = "~ki/ku (tekisuto/tekusuto)";
         Text[ chinese_simplified ] = "サ行之前的ｷ/ｸ(ﾃｷｽﾄ/ﾃｸｽﾄ)(~K)";
         Text[ chinese_traditional ] = "サ行之前的ｷ/ｸ(ﾃｷｽﾄ/ﾃｸｽﾄ)(~K)";
         Text[ turkish ] = "Match ki/ku (tekisuto/tekusuto)";
         Text[ arabic ] = "Match ki/ku (tekisuto/tekusuto)";
-        Text[ language_user1 ] = "EM23.3.01ENGLISH: only in this dialog does Eng not follow the usual check box style of first letter uppercase and all others lowercase; for clarity and consistency.";
+        Text[ language_user1 ] = "EM23; EM23.3.01ENGLISH: only in this dialog does Eng not follow the usual check box style of first letter uppercase and all others lowercase; for clarity and consistency.";
         Text[ catalan ] = "ki/ku (tekisuto/tekusuto)";
-        Text[ finnish ] = "~ki/ku (tekisuto/tekusuto)";
+        Text[ finnish ] = "ki/ku (tekisuto/tekusuto)";
         Text[ thai ] = "~ki/ku (tekisuto/tekusuto)";
     };
     CheckBox CB_MATCH_PROLONGED_SOUNDMARK
@@ -543,6 +543,26 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text = "Verl~�ngerte Vokale (ka-/kaa)" ;
         Text[ english_us ] = "Prolon~ged vowels (ka-/kaa)";
+        Text[ portuguese ] = "Prolon~ged vowels (ka-/kaa)";
+        Text[ russian ] = "Prolon~ged vowels (ka-/kaa)";
+        Text[ greek ] = "Prolon~ged vowels (ka-/kaa)";
+        Text[ dutch ] = "Prolon~ged vowels (ka-/kaa)";
+        Text[ french ] = "Voyelles prolong�es (ka-/kaa)";
+        Text[ spanish ] = "Vocales prol~ongadas (ka-/kaa)";
+        Text[ finnish ] = "Prolon~ged vowels (ka-/kaa)";
+        Text[ italian ] = "Vocali prolungate (ka-/kaa)";
+        Text[ danish ] = "Prolon~ged vowels (ka-/kaa)";
+        Text[ swedish ] = "F�rl�ngda ~vokaler (ka-/kaa)";
+        Text[ polish ] = "Prolon~ged vowels (ka-/kaa)";
+        Text[ portuguese_brazilian ] = "Prolon~ged vowels (ka-/kaa)";
+        Text[ japanese ] = "長音(カー/カア)";
+        Text[ korean ] = "장모음 (ka-/kaa)";
+        Text[ chinese_simplified ] = "长元音(ｶ/ｶｰ)";
+        Text[ chinese_traditional ] = "長元音(ｶ/ｶｰ)";
+        Text[ turkish ] = "Prolon~ged vowels (ka-/kaa)";
+        Text[ arabic ] = "Prolon~ged vowels (ka-/kaa)";
+        Text[ catalan ] = "Prolon~ged vowels (ka-/kaa)";
+        Text[ thai ] = "Prolon~ged vowels (ka-/kaa)";
     };
     FixedLine FL_IGNORE
     {
@@ -552,7 +572,7 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS
         Text [ ENGLISH ] = "Ignore";
         Text[ english_us ] = "Ignore";
         Text[ portuguese ] = "Ignorar";
-        Text[ russian ] = "������������";
+        Text[ russian ] = "����������";
         Text[ greek ] = "���������";
         Text[ dutch ] = "Negeren";
         Text[ french ] = "Ignorer";
@@ -591,13 +611,13 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS
         Text[ polish ] = "Znak interpunkcji";
         Text[ portuguese_brazilian ] = "Punctuation characters";
         Text[ japanese ] = "区切り記号(~N)";
-        Text[ korean ] = "구두점 기호(~N)";
+        Text[ korean ] = "문장 부호 문자(~N)";
         Text[ chinese_simplified ] = "拼音和注音符号(~N)";
         Text[ chinese_traditional ] = "注音符號(~N)";
         Text[ turkish ] = "Punctuation characters";
         Text[ arabic ] = "���� ������ �������";
         Text[ catalan ] = "Car�cters de puntuaci�";
-        Text[ finnish ] = "~V�limerkit";
+        Text[ finnish ] = "V�limerkit";
         Text[ thai ] = "ตัวอักขระเครื่องหมาย~วรรคตอน";
     };
     CheckBox CB_IGNORE_WHITESPACES
@@ -608,24 +628,24 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS
         Text [ ENGLISH ] = "Whitespace characters" ;
         Text[ english_us ] = "~Whitespace characters";
         Text[ portuguese ] = "~Espa�os";
-        Text[ russian ] = "����� ��������";
+        Text[ russian ] = "������� ��������";
         Text[ greek ] = "���������� �����";
-        Text[ dutch ] = "~Spatietekens";
+        Text[ dutch ] = "Spat~ietekens";
         Text[ french ] = "Espaces";
         Text[ spanish ] = "Car�cter de espacio";
         Text[ italian ] = "Spazio";
-        Text[ danish ] = "Melle~mrumstegn";
+        Text[ danish ] = "Mellem~rumstegn";
         Text[ swedish ] = "Mellanrumste~cken";
         Text[ polish ] = "Znak spacji";
         Text[ portuguese_brazilian ] = "Whitespace characters";
         Text[ japanese ] = "空白として使用される文字(~W)";
-        Text[ korean ] = "여백 문자(~W)";
+        Text[ korean ] = "공백 문자(~W)";
         Text[ chinese_simplified ] = "空格字符(~W)";
         Text[ chinese_traditional ] = "空格字元(~W)";
         Text[ turkish ] = "Whitespace characters";
         Text[ arabic ] = "���� ��������";
         Text[ catalan ] = "Car�cter d'espai";
-        Text[ finnish ] = "~Tyhj�n v�lin merkit";
+        Text[ finnish ] = "Tyhj�n v�lin merkit";
         Text[ thai ] = "ตัวอักขระระยะห่างสี~ขาว ";
     };
     CheckBox CB_IGNORE_MIDDLE_DOT
@@ -642,7 +662,7 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS
         Text[ french ] = "Points centraux";
         Text[ spanish ] = "Punto centrado";
         Text[ italian ] = "Punto al centro";
-        Text[ danish ] = "Punkt i mid~ten";
+        Text[ danish ] = "~Punkt i midten";
         Text[ swedish ] = "M~ittpunkt";
         Text[ polish ] = "Kropka po�rodku";
         Text[ portuguese_brazilian ] = "Middle dots";
@@ -653,12 +673,12 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS
         Text[ turkish ] = "Middle dots";
         Text[ arabic ] = "���� �����";
         Text[ catalan ] = "Punts del mig";
-        Text[ finnish ] = "~Keskell� olevat pisteet";
+        Text[ finnish ] = "Keskell� olevat pisteet";
         Text[ thai ] = "จุดกลา~ง";
     };
     Text[ english_us ] = "Searching in Japanese";
     Text[ portuguese ] = "Op��es de procura para Japon�s";
-    Text[ russian ] = "��������� ������ ��� ��������� �����";
+    Text[ russian ] = "����� � �������� �����";
     Text[ greek ] = "Searching in Japanese";
     Text[ dutch ] = "Zoekopties voor Japans";
     Text[ french ] = "Options de recherche pour le japonais";
@@ -680,3 +700,21 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS
 };
 // end TabPage
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svx/source/options/optlingu.cxx b/svx/source/options/optlingu.cxx
index 06bc0629b2c5..26a0bdef0d5f 100644
--- a/svx/source/options/optlingu.cxx
+++ b/svx/source/options/optlingu.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: optlingu.cxx,v $
  *
- *  $Revision: 1.42 $
+ *  $Revision: 1.43 $
  *
- *  last change: $Author: tl $ $Date: 2002-12-04 13:03:54 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:03:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
diff --git a/svx/source/options/optlingu.src b/svx/source/options/optlingu.src
index 6478c1257c88..23bcbd9d6e06 100644
--- a/svx/source/options/optlingu.src
+++ b/svx/source/options/optlingu.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: optlingu.src,v $
  *
- *  $Revision: 1.35 $
+ *  $Revision: 1.36 $
  *
- *  last change: $Author: kz $ $Date: 2001-07-26 22:23:26 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:00 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -91,18 +91,19 @@ ModalDialog RID_SVXDLG_EDIT_MODULES
         Text[ french ] = "Fermer";
         Text[ spanish ] = "Cerrar";
         Text[ italian ] = "Chiudi";
-        Text[ danish ] = "Close";
+        Text[ danish ] = "Luk";
         Text[ swedish ] = "St�ng";
         Text[ polish ] = "Zamknij";
         Text[ portuguese_brazilian ] = "Close";
-        Text[ japanese ] = "�‚���";
-        Text[ korean ] = "�ݱ�";
-        Text[ chinese_simplified ] = "�ر�";
-        Text[ chinese_traditional ] = "����";
+        Text[ japanese ] = "閉じる";
+        Text[ korean ] = "닫기";
+        Text[ chinese_simplified ] = "关闭";
+        Text[ chinese_traditional ] = "關閉";
         Text[ turkish ] = "Close";
         Text[ arabic ] = "�����";
-        Text[ catalan ] = "Cerrar";
+        Text[ catalan ] = "Tanca";
         Text[ finnish ] = "Sulje";
+        Text[ thai ] = "ปิด";
     };
     HelpButton PB_HELP
     {
@@ -124,18 +125,19 @@ ModalDialog RID_SVXDLG_EDIT_MODULES
         Text[ french ] = "Options";
         Text[ spanish ] = "Opciones";
         Text[ italian ] = "Opzioni";
-        Text[ danish ] = "Options";
+        Text[ danish ] = "Indstillinger";
         Text[ swedish ] = "Alternativ";
         Text[ polish ] = "Opcje";
         Text[ portuguese_brazilian ] = "Options";
-        Text[ japanese ] = "��߼��";
-        Text[ korean ] = "�ɼ�";
-        Text[ chinese_simplified ] = "ѡ��";
-        Text[ chinese_traditional ] = "�ﶵ";
+        Text[ japanese ] = "オプション";
+        Text[ korean ] = "옵션";
+        Text[ chinese_simplified ] = "选项";
+        Text[ chinese_traditional ] = "選項";
         Text[ turkish ] = "Options";
         Text[ arabic ] = "��������";
-        Text[ catalan ] = "Opciones";
-        Text[ finnish ] = "Mukauta";
+        Text[ catalan ] = "Opcions";
+        Text[ finnish ] = "Asetukset";
+        Text[ thai ] = "ตัวเลือก";
     };
     FixedText FT_EDIT_MODULES_LANGUAGE
     {
@@ -149,21 +151,22 @@ ModalDialog RID_SVXDLG_EDIT_MODULES
         Text[ russian ] = "����";
         Text[ greek ] = "���~���";
         Text[ dutch ] = "~Taal";
-        Text[ french ] = "~Langue";
+        Text[ french ] = "Langue";
         Text[ spanish ] = "Idioma";
         Text[ italian ] = "Lingua";
-        Text[ danish ] = "Language";
+        Text[ danish ] = "~Sprog";
         Text[ swedish ] = "~Spr�k";
         Text[ polish ] = "J�zyk";
         Text[ portuguese_brazilian ] = "Language";
-        Text[ japanese ] = "����";
-        Text[ korean ] = "���";
-        Text[ chinese_simplified ] = "����";
-        Text[ chinese_traditional ] = "�y��";
+        Text[ japanese ] = "言語";
+        Text[ korean ] = "언어";
+        Text[ chinese_simplified ] = "语言";
+        Text[ chinese_traditional ] = "語言";
         Text[ turkish ] = "Language";
         Text[ arabic ] = "�����";
         Text[ catalan ] = "Idioma";
-        Text[ finnish ] = "Language";
+        Text[ finnish ] = "Kieli";
+        Text[ thai ] = "ภาษา";
     };
     ListBox LB_EDIT_MODULES_LANGUAGE
     {
@@ -189,7 +192,7 @@ ModalDialog RID_SVXDLG_EDIT_MODULES
         Text [ English ] = "~Prio +" ;
         Text[ english_us ] = "Move Up";
         Text[ portuguese ] = "Prio +";
-        Text[ russian ] = "��������� +";
+        Text[ russian ] = "�������";
         Text[ greek ] = "������������� +";
         Text[ dutch ] = "Prio +";
         Text[ french ] = "Prio +";
@@ -199,14 +202,15 @@ ModalDialog RID_SVXDLG_EDIT_MODULES
         Text[ swedish ] = "Prio +";
         Text[ polish ] = "Priorytet +";
         Text[ portuguese_brazilian ] = "Prio +";
-        Text[ japanese ] = "�D�揇�� +";
-        Text[ korean ] = "�տ���";
-        Text[ chinese_simplified ] = "��Ҫ�� +";
-        Text[ chinese_traditional ] = "ɬ���� +";
+        Text[ japanese ] = "優先順序 +";
+        Text[ korean ] = "우선 순위＋";
+        Text[ chinese_simplified ] = "重要性 +";
+        Text[ chinese_traditional ] = "優先度 +";
         Text[ turkish ] = "Prio +";
         Text[ arabic ] = "������ +";
-        Text[ catalan ] = "Prio +";
-        Text[ finnish ] = "Siirr� yl�s";
+        Text[ catalan ] = "Mou cap amunt";
+        Text[ finnish ] = "Siirr� ylemm�s";
+        Text[ thai ] = "เลื่อนขึ้น";
     };
     PushButton PB_EDIT_MODULES_PRIO_DOWN
     {
@@ -217,7 +221,7 @@ ModalDialog RID_SVXDLG_EDIT_MODULES
         Text [ English ] = "P~rio -" ;
         Text[ english_us ] = "Move Down";
         Text[ portuguese ] = "Prio -";
-        Text[ russian ] = "��������� -";
+        Text[ russian ] = "��������";
         Text[ greek ] = "������������� -";
         Text[ dutch ] = "Prio -";
         Text[ french ] = "Prio -";
@@ -227,14 +231,15 @@ ModalDialog RID_SVXDLG_EDIT_MODULES
         Text[ swedish ] = "Prio -";
         Text[ polish ] = "Priorytet -";
         Text[ portuguese_brazilian ] = "Prio -";
-        Text[ japanese ] = "�D�揇�� -";
-        Text[ korean ] = "�տ���";
-        Text[ chinese_simplified ] = "��Ҫ�� -";
-        Text[ chinese_traditional ] = "ɬ���� -";
+        Text[ japanese ] = "優先順序 -";
+        Text[ korean ] = "우선 순위－";
+        Text[ chinese_simplified ] = "重要性 -";
+        Text[ chinese_traditional ] = "優先度 -";
         Text[ turkish ] = "Prio -";
         Text[ arabic ] = "������ -";
-        Text[ catalan ] = "Prio -";
-        Text[ finnish ] = "Siirr� alas";
+        Text[ catalan ] = "Mou cap avall";
+        Text[ finnish ] = "Siirr� alemmas";
+        Text[ thai ] = "เลื่อนลง";
     };
     PushButton PB_EDIT_MODULES_PRIO_BACK
     {
@@ -248,21 +253,22 @@ ModalDialog RID_SVXDLG_EDIT_MODULES
         Text[ russian ] = "�����";
         Text[ greek ] = "����";
         Text[ dutch ] = "~Vorige";
-        Text[ french ] = "~Pr�c�dent";
-        Text[ spanish ] = "~Regresar";
+        Text[ french ] = "Pr�c�dent";
+        Text[ spanish ] = "Regresar";
         Text[ italian ] = "Indietro";
-        Text[ danish ] = "Back";
+        Text[ danish ] = "~Tilbage";
         Text[ swedish ] = "~Tillbaka";
         Text[ polish ] = "Wstecz";
         Text[ portuguese_brazilian ] = "Back";
-        Text[ japanese ] = "���ɖ߂�(~B)";
-        Text[ korean ] = "�ڷ�(~B)";
-        Text[ chinese_simplified ] = "����(~B)";
-        Text[ chinese_traditional ] = "��^(~B)";
+        Text[ japanese ] = "元に戻す(~B)";
+        Text[ korean ] = "원래대로(~B)";
+        Text[ chinese_simplified ] = "返回(~B)";
+        Text[ chinese_traditional ] = "返回(~B)";
         Text[ turkish ] = "Back";
         Text[ arabic ] = "������";
-        Text[ catalan ] = "~Regresar";
-        Text[ finnish ] = "Back";
+        Text[ catalan ] = "~Enrere";
+        Text[ finnish ] = "~Edellinen";
+        Text[ thai ] = "~กลับไป";
     };
 
     Bitmap BMP_CHKBUT_UNCHECKED
@@ -279,24 +285,25 @@ ModalDialog RID_SVXDLG_EDIT_MODULES
         Text [ English ] = "Spelling";
         Text[ english_us ] = "Spelling";
         Text[ portuguese ] = "Ortografia";
-        Text[ russian ] = "������������";
+        Text[ russian ] = "�������� ����������";
         Text[ greek ] = "����������";
         Text[ dutch ] = "Spelling";
         Text[ french ] = "Orthographe";
         Text[ spanish ] = "Ortograf�a";
         Text[ italian ] = "Controllo ortografico";
-        Text[ danish ] = "Spelling";
+        Text[ danish ] = "Stavekontrol";
         Text[ swedish ] = "R�ttstavning";
         Text[ polish ] = "Ortografia";
         Text[ portuguese_brazilian ] = "Spelling";
-        Text[ japanese ] = "���͍Z��";
-        Text[ korean ] = "�����";
-        Text[ chinese_simplified ] = "ƴд���";
-        Text[ chinese_traditional ] = "���g�ˬd";
+        Text[ japanese ] = "文章校正";
+        Text[ korean ] = "맞춤법";
+        Text[ chinese_simplified ] = "拼写检查";
+        Text[ chinese_traditional ] = "拼寫檢查";
         Text[ turkish ] = "Spelling";
         Text[ arabic ] = "����� ������";
-        Text[ catalan ] = "Ortograf�a";
+        Text[ catalan ] = "Ortografia";
         Text[ finnish ] = "Oikeinkirjoitus";
+        Text[ thai ] = "สะกด";
     };
     String ST_HYPH
     {
@@ -310,18 +317,19 @@ ModalDialog RID_SVXDLG_EDIT_MODULES
         Text[ french ] = "Coupure des mots";
         Text[ spanish ] = "Separaci�n sil�bica";
         Text[ italian ] = "Sillabazione";
-        Text[ danish ] = "Hyphenation";
+        Text[ danish ] = "Orddeling";
         Text[ swedish ] = "Avstavning";
         Text[ polish ] = "Dzielenie wyraz�w";
         Text[ portuguese_brazilian ] = "Hyphenation";
-        Text[ japanese ] = "ʲ�Ȱ���";
-        Text[ korean ] = "���������� �и�";
-        Text[ chinese_simplified ] = "���ַ�";
-        Text[ chinese_traditional ] = "�s�r��";
+        Text[ japanese ] = "ハイフネーション";
+        Text[ korean ] = "하이픈 넣기";
+        Text[ chinese_simplified ] = "连字符";
+        Text[ chinese_traditional ] = "連字符";
         Text[ turkish ] = "Hyphenation";
         Text[ arabic ] = "��� �������";
-        Text[ catalan ] = "Separaci�n sil�bica";
+        Text[ catalan ] = "Separaci� en s�l.labes";
         Text[ finnish ] = "Tavutus";
+        Text[ thai ] = "ใส่ยัติภังค์";
     };
     String ST_THES
     {
@@ -339,14 +347,15 @@ ModalDialog RID_SVXDLG_EDIT_MODULES
         Text[ swedish ] = "Synonymordlista";
         Text[ polish ] = "Tezaurus";
         Text[ portuguese_brazilian ] = "Thesaurus";
-        Text[ japanese ] = "�ދ`�ꎫ�T";
-        Text[ korean ] = "���Ǿ� ����";
-        Text[ chinese_simplified ] = "�ʵ�";
-        Text[ chinese_traditional ] = "����";
+        Text[ japanese ] = "類義語辞典";
+        Text[ korean ] = "동의어 사전";
+        Text[ chinese_simplified ] = "同义词词典";
+        Text[ chinese_traditional ] = "同義詞詞典";
         Text[ turkish ] = "E�anlaml�lar s�zl���";
         Text[ arabic ] = "����� ���������";
-        Text[ catalan ] = "Sin�nimos";
+        Text[ catalan ] = "Tesaurus";
         Text[ finnish ] = "Synonyymisanasto";
+        Text[ thai ] = "อรรถาภิธาน";
     };
     Text[ english_us ] = "Edit Modules";
     Text[ portuguese ] = "Editar m�dulos";
@@ -356,18 +365,19 @@ ModalDialog RID_SVXDLG_EDIT_MODULES
     Text[ french ] = "�dition des modules";
     Text[ spanish ] = "Editar m�dulos";
     Text[ italian ] = "Modifica moduli";
-    Text[ danish ] = "Edit modules";
+    Text[ danish ] = "Rediger moduler";
     Text[ swedish ] = "Redigera moduler";
     Text[ polish ] = "Edytuj modu�y";
     Text[ portuguese_brazilian ] = "Edit modules";
-    Text[ japanese ] = "Ӽޭ�ق̕ҏW";
-    Text[ korean ] = "���� ���";
-    Text[ chinese_simplified ] = "�༭ģ��";
-    Text[ chinese_traditional ] = "�s��Ҷ�";
+    Text[ japanese ] = "モジュールの編集";
+    Text[ korean ] = "편집 모듈";
+    Text[ chinese_simplified ] = "编辑模块";
+    Text[ chinese_traditional ] = "編輯模塊";
     Text[ turkish ] = "Edit modules";
     Text[ arabic ] = "����� ������� �������";
-    Text[ catalan ] = "Editar m�dulos";
+    Text[ catalan ] = "Edita els m�duls";
     Text[ finnish ] = "Muokkaa moduuleja";
+    Text[ thai ] = "แก้ไขโมดูล";
 };
 
 // RID_SVXDLG_LNG_ED_NUM_PREBREAK -------------------------------------------
@@ -388,14 +398,14 @@ ModalDialog RID_SVXDLG_LNG_ED_NUM_PREBREAK
     Text[ french ] = "Coupure des mots";
     Text[ spanish ] = "Separaci�n sil�bica";
     Text[ italian ] = "Sillabazione";
-    Text[ danish ] = "Hyphenation";
+    Text[ danish ] = "Orddeling";
     Text[ swedish ] = "Avstavning";
     Text[ polish ] = "Dzielenie wyraz�w";
     Text[ portuguese_brazilian ] = "Hyphenation";
-    Text[ japanese ] = "ʲ�Ȱ���";
-    Text[ korean ] = "���������� �и�";
-    Text[ chinese_simplified ] = "���ַ�";
-    Text[ chinese_traditional ] = "�s�r��";
+    Text[ japanese ] = "ハイフネーション";
+    Text[ korean ] = "하이픈 넣기";
+    Text[ chinese_simplified ] = "连字符";
+    Text[ chinese_traditional ] = "連字符";
     Text[ turkish ] = "Hyphenation";
     Text[ arabic ] = "��� �������";
     FixedLine FL_NUMVAL_PREBREAK
@@ -433,51 +443,53 @@ ModalDialog RID_SVXDLG_LNG_ED_NUM_PREBREAK
     {
         Text = "Zeichen vor Umbruch" ;
         Text[ ENGLISH ] = "Characters before linebreak" ;
-        Text[ english_us ] = "Characters before line break";
+        Text[ english_us ] = "Characters before break";
         Text[ portuguese ] = "Caracteres antes quebra";
-        Text[ russian ] = "����� ������ ����� ���������";
+        Text[ russian ] = "�������� ����� ���������";
         Text[ greek ] = "���������� ���� ��� ������ �������";
         Text[ dutch ] = "Tekens voor regelafbreking";
         Text[ french ] = "Caract�res avant le saut";
         Text[ spanish ] = "Car�cter antes de salto";
         Text[ italian ] = "Caratteri prima della sillabazione";
-        Text[ danish ] = "Characters before linebreak";
-        Text[ swedish ] = "tecken per stavelse f�re avstavning";
+        Text[ danish ] = "Tegn f�r skift";
+        Text[ swedish ] = "Tecken f�re avstavning";
         Text[ polish ] = "Znaki przed podzia�em s�owa";
         Text[ portuguese_brazilian ] = "Characters before linebreak";
-        Text[ japanese ] = "���s�O������";
-        Text[ korean ] = "����, ���� ��";
-        Text[ chinese_simplified ] = "���ֺ�֮ǰ����ĸ";
-        Text[ chinese_traditional ] = "�s�r�����e���r��";
+        Text[ japanese ] = "改行前文字数";
+        Text[ korean ] = "나누기 전 문자";
+        Text[ chinese_simplified ] = "连字符之前的字母数";
+        Text[ chinese_traditional ] = "連字號之前的字母";
         Text[ turkish ] = "Characters before linebreak";
         Text[ arabic ] = "���� ��� ������";
-        Text[ catalan ] = "Car�cter antes de salto";
-        Text[ finnish ] = "Zeichen vor Umbruch";
+        Text[ catalan ] = "Car�cter abans de salt";
+        Text[ finnish ] = "Merkkej� ennen rivinvaihtoa";
+        Text[ thai ] = "ตัวอักขระก่อนตัวแบ่งบรรทัด";
     };
     String STR_NUM_POST_BREAK_DLG
     {
         Text = "Zeichen nach Umbruch" ;
         Text[ ENGLISH ] = "Characters after linebreak" ;
-        Text[ english_us ] = "Characters after line break";
+        Text[ english_us ] = "Characters after break";
         Text[ portuguese ] = "Caracteres ap�s quebra de linha";
-        Text[ russian ] = "����� ������ ����� ��������";
+        Text[ russian ] = "�������� ����� ��������";
         Text[ greek ] = "���������� ���� ��� ������ �������";
         Text[ dutch ] = "Tekens na regelafbreking";
         Text[ french ] = "Caract�res apr�s le saut";
         Text[ spanish ] = "Car�cter despu�s de salto";
         Text[ italian ] = "Caratteri dopo la sillabazione";
-        Text[ danish ] = "Characters after linebreak";
-        Text[ swedish ] = "tecken per stavelse efter avstavning";
+        Text[ danish ] = "Tegn efter skift";
+        Text[ swedish ] = "Tecken efter avstavning";
         Text[ polish ] = "Znaki za podzia�em s�owa";
         Text[ portuguese_brazilian ] = "Characters after linebreak";
-        Text[ japanese ] = "���s�㕶����";
-        Text[ korean ] = "����, ���� ��";
-        Text[ chinese_simplified ] = "���ֺ�֮�����ĸ";
-        Text[ chinese_traditional ] = "�s�r�����᪺�r��";
+        Text[ japanese ] = "改行後文字数";
+        Text[ korean ] = "나누기 다음 문자";
+        Text[ chinese_simplified ] = "连字符之后的字母数";
+        Text[ chinese_traditional ] = "連字號之後的字母";
         Text[ turkish ] = "Characters after linebreak";
         Text[ arabic ] = "���� ��� ������";
-        Text[ catalan ] = "Car�cter despu�s de salto";
-        Text[ finnish ] = "Zeichen nach Umbruch";
+        Text[ catalan ] = "Car�cter despr�s de salt";
+        Text[ finnish ] = "Merkkej� rivinvaihdon j�lkeen";
+        Text[ thai ] = "ตัวอักขระหลังตัวแบ่งบรรทัด";
     };
     String STR_NUM_MIN_WORDLEN_DLG
     {
@@ -491,21 +503,23 @@ ModalDialog RID_SVXDLG_LNG_ED_NUM_PREBREAK
         Text[ french ] = "Longueur de mot minimum";
         Text[ spanish ] = "Tam�ana min�mo de palabra";
         Text[ italian ] = "Lunghezza minima della parola";
-        Text[ danish ] = "Minimal wordlength";
+        Text[ danish ] = "Minimal ordl�ngde";
         Text[ swedish ] = "Minimal ordl�ngd";
         Text[ polish ] = "Minimalna d�ugo�� s�owa";
         Text[ portuguese_brazilian ] = "Minimal wordlength";
-        Text[ japanese ] = "�Œᕶ����";
-        Text[ korean ] = "�ּ� �ܾ� ����";
-        Text[ chinese_simplified ] = "��̵��ִ�";
-        Text[ chinese_traditional ] = "�̵u���r��";
+        Text[ japanese ] = "最低文字数";
+        Text[ korean ] = "최소 단어 길이";
+        Text[ chinese_simplified ] = "最短的字词";
+        Text[ chinese_traditional ] = "最短的字詞";
         Text[ turkish ] = "Minimal wordlength";
         Text[ arabic ] = "����� ������ ������";
-        Text[ catalan ] = "Tam�ana min�mo de palabra";
-        Text[ finnish ] = "Minimale Wortl�nge";
+        Text[ catalan ] = "Mida m�nima de la paraula";
+        Text[ finnish ] = "Sanojen v�himm�ispituus";
+        Text[ thai ] = "ความยาวคำที่น้อยที่สุด";
     };
-    Text[ catalan ] = "Separaci�n sil�bica";
+    Text[ catalan ] = "Separaci� en s�l.labes";
     Text[ finnish ] = "Tavutus";
+    Text[ thai ] = "ยัติภังค์";
 };
 
 // RID_SFXPAGE_LINGU --------------------------------------------------------
@@ -530,18 +544,19 @@ TabPage RID_SFXPAGE_LINGU
         Text[ french ] = "Linguistique";
         Text[ spanish ] = "Lingu�stica";
         Text[ italian ] = "Linguistica";
-        Text[ danish ] = "Linguistic";
+        Text[ danish ] = "Lingvistik";
         Text[ swedish ] = "Lingvistik";
         Text[ polish ] = "Pisownia";
         Text[ portuguese_brazilian ] = "Linguistic";
-        Text[ japanese ] = "���͍Z��";
-        Text[ korean ] = "�����";
-        Text[ chinese_simplified ] = "���Թ���";
-        Text[ chinese_traditional ] = "�y���W�h";
+        Text[ japanese ] = "文章校正";
+        Text[ korean ] = "맞춤법 교정";
+        Text[ chinese_simplified ] = "语言规则";
+        Text[ chinese_traditional ] = "語言規則";
         Text[ turkish ] = "Linguistic";
         Text[ arabic ] = "����� �����";
         Text[ catalan ] = "Lingu�stica";
         Text[ finnish ] = "Kirjoituksen aputy�kalut";
+        Text[ thai ] = "ตัวช่วยเขียน";
     };
     FixedText FT_LINGU_MODULES
     {
@@ -550,26 +565,27 @@ TabPage RID_SFXPAGE_LINGU
         Size = MAP_APPFONT ( 175 , 8 ) ;
         Text = "~Verf�gbare Sprachmodule" ;
         Text [ English ] = "~Available language modules" ;
-        Text[ english_us ] = "Available language modules:";
-        Text[ portuguese ] = "~M�dulos lingu�sticos dispon�veis:";
+        Text[ english_us ] = "Available language modules";
+        Text[ portuguese ] = "~M�dulos lingu�sticos dispon�veis";
         Text[ russian ] = "��������� �������� ������";
         Text[ greek ] = "���������� ������������ ������� �������:";
-        Text[ dutch ] = "~Beschikbare taalmodules:";
-        Text[ french ] = "~Modules de langue disponibles :";
+        Text[ dutch ] = "~Beschikbare taalmodules";
+        Text[ french ] = "Modules de langue disponibles";
         Text[ spanish ] = "~M�dulos disponibles de idioma";
-        Text[ italian ] = "Moduli linguistici disponibili:";
-        Text[ danish ] = "Available language modules:";
+        Text[ italian ] = "Moduli linguistici disponibili";
+        Text[ danish ] = "~Disponible sprogmoduler";
         Text[ swedish ] = "T~illg�ngliga spr�kmoduler";
         Text[ polish ] = "Dost�pne modu�y j�zyk�w";
         Text[ portuguese_brazilian ] = "Available language modules:";
-        Text[ japanese ] = "�g�p�ł��錾��Ӽޭ��";
-        Text[ korean ] = "��� ������ ��� ���:";
-        Text[ chinese_simplified ] = "�ɹ�ʹ�õ�����ģ�飺";
-        Text[ chinese_traditional ] = "���ѨϥΪ��y���Ҷ��G";
+        Text[ japanese ] = "使用できる言語モジュール";
+        Text[ korean ] = "사용 가능한 언어 모듈";
+        Text[ chinese_simplified ] = "可供使用的语言模块";
+        Text[ chinese_traditional ] = "可使用的語言模塊";
         Text[ turkish ] = "Available language modules:";
         Text[ arabic ] = "����� ����� ������� ��������:";
-        Text[ catalan ] = "~M�dulos disponibles de idioma:";
-        Text[ finnish ] = "Available language modules:";
+        Text[ catalan ] = "~M�duls disponibles d'idioma:";
+        Text[ finnish ] = "K�ytett�viss� olevat kielimoduulit:";
+        Text[ thai ] = "โมดูลของภาษาที่ใช้ได้:";
     };
     Control CLB_LINGU_MODULES
     {
@@ -589,22 +605,23 @@ TabPage RID_SFXPAGE_LINGU
         Text[ portuguese ] = "~Editar...";
         Text[ russian ] = "~������...";
         Text[ greek ] = "�����������...";
-        Text[ dutch ] = "~Bewerken...";
+        Text[ dutch ] = "Bewe~rken...";
         Text[ french ] = "~�diter...";
         Text[ spanish ] = "~Editar...";
         Text[ italian ] = "~Modifica...";
-        Text[ danish ] = "~Edit...";
+        Text[ danish ] = "~Rediger...";
         Text[ swedish ] = "~Redigera...";
         Text[ polish ] = "~Edytuj...";
         Text[ portuguese_brazilian ] = "~Edit...";
-        Text[ japanese ] = "�ҏW(~E)...";
-        Text[ korean ] = "����(~E)...";
-        Text[ chinese_simplified ] = "�༭(~E)...";
-        Text[ chinese_traditional ] = "�s��(~E)...";
+        Text[ japanese ] = "編集(~E)...";
+        Text[ korean ] = "편집(~E)...";
+        Text[ chinese_simplified ] = "编辑(~E)...";
+        Text[ chinese_traditional ] = "編輯(~E)...";
         Text[ turkish ] = "~Edit...";
         Text[ arabic ] = "�����...";
-        Text[ catalan ] = "~Editar...";
-        Text[ finnish ] = "~Muokkaa";
+        Text[ catalan ] = "~Edita...";
+        Text[ finnish ] = "~Muokkaa...";
+        Text[ thai ] = "แ~ก้ไข...";
     };
     FixedText FT_LINGU_DICS
     {
@@ -614,25 +631,26 @@ TabPage RID_SFXPAGE_LINGU
         Text = "Ben~utzerw�rterb�cher" ;
         Text [ ENGLISH ] = "~User-defined dictionaries" ;
         Text[ english_us ] = "User-defined dictionaries";
-        Text[ portuguese ] = "Dicion�rios do utilizador";
+        Text[ portuguese ] = "Di~cion�rios do utilizador";
         Text[ russian ] = "������� ������������";
         Text[ greek ] = "��������� ������";
-        Text[ dutch ] = "Gebruikerswoordenboeken";
+        Text[ dutch ] = "Gebr~uikerswoordenboeken";
         Text[ french ] = "Dictionnaires de l'utilisateur";
         Text[ spanish ] = "Diccionarios de usuario";
         Text[ italian ] = "Dizionari utente";
-        Text[ danish ] = "Personal dictionaries";
+        Text[ danish ] = "Br~ugerordb�ger";
         Text[ swedish ] = "An~v�ndarordlistor";
         Text[ polish ] = "S�owniki u�ytkownika";
         Text[ portuguese_brazilian ] = "Personal dictionaries";
-        Text[ japanese ] = "հ�ް����";
-        Text[ korean ] = "����� ����";
-        Text[ chinese_simplified ] = "ʹ�����ֵ�";
-        Text[ chinese_traditional ] = "�ۭq�r��";
+        Text[ japanese ] = "ユーザー辞書";
+        Text[ korean ] = "사용자 정의 사전";
+        Text[ chinese_simplified ] = "使用者字典";
+        Text[ chinese_traditional ] = "自訂字典";
         Text[ turkish ] = "Personal dictionaries";
         Text[ arabic ] = "������ ��������";
-        Text[ catalan ] = "Diccionarios de usuario";
+        Text[ catalan ] = "Diccionaris d'usuari";
         Text[ finnish ] = "K�ytt�j�n m��ritt�m�t sanastot";
+        Text[ thai ] = "พจนานุกรมระบุผู้ใช้";
     };
     Control CLB_LINGU_DICS
     {
@@ -656,18 +674,19 @@ TabPage RID_SFXPAGE_LINGU
         Text[ french ] = "Nouveau...";
         Text[ spanish ] = "~Nuevo...";
         Text[ italian ] = "Nuovo...";
-        Text[ danish ] = "New";
+        Text[ danish ] = "~Ny(t)...";
         Text[ swedish ] = "~Ny...";
         Text[ polish ] = "Nowy...";
         Text[ portuguese_brazilian ] = "New";
-        Text[ japanese ] = "�V�K�쐬(~N)...";
-        Text[ korean ] = "��(~N)";
-        Text[ chinese_simplified ] = "�½�(~N)...";
-        Text[ chinese_traditional ] = "�s��(~N)...";
+        Text[ japanese ] = "新規作成(~N)...";
+        Text[ korean ] = "새로 만들기(~N)";
+        Text[ chinese_simplified ] = "新建(~N)...";
+        Text[ chinese_traditional ] = "新建(~N)...";
         Text[ turkish ] = "New";
         Text[ arabic ] = "����...";
-        Text[ catalan ] = "~Nuevo...";
-        Text[ finnish ] = "New";
+        Text[ catalan ] = "~Nou...";
+        Text[ finnish ] = "~Uusi...";
+        Text[ thai ] = "ใ~หม่...";
     };
     PushButton PB_LINGU_DICS_EDIT_DIC
     {
@@ -680,22 +699,23 @@ TabPage RID_SFXPAGE_LINGU
         Text[ portuguese ] = "~Editar...";
         Text[ russian ] = "������...";
         Text[ greek ] = "�����������...";
-        Text[ dutch ] = "~Bewerken...";
+        Text[ dutch ] = "B~ewerken...";
         Text[ french ] = "�diter...";
         Text[ spanish ] = "~Editar...";
-        Text[ italian ] = "Modifica...";
-        Text[ danish ] = "Edit";
+        Text[ italian ] = "Modi~fica...";
+        Text[ danish ] = "Redig~er...";
         Text[ swedish ] = "R~edigera...";
         Text[ polish ] = "Edytuj...";
         Text[ portuguese_brazilian ] = "Edit";
-        Text[ japanese ] = "�ҏW(~E)...";
-        Text[ korean ] = "����(~E)";
-        Text[ chinese_simplified ] = "�༭(~E)...";
-        Text[ chinese_traditional ] = "�s��(~E)...";
+        Text[ japanese ] = "編集(~E)...";
+        Text[ korean ] = "편집(~E)...";
+        Text[ chinese_simplified ] = "编辑(~E)...";
+        Text[ chinese_traditional ] = "編輯(~E)...";
         Text[ turkish ] = "Edit";
         Text[ arabic ] = "�����...";
-        Text[ catalan ] = "~Editar...";
-        Text[ finnish ] = "Edit";
+        Text[ catalan ] = "~Edita...";
+        Text[ finnish ] = "Muokka~a...";
+        Text[ thai ] = "แ~ก้ไข...";
     };
     PushButton PB_LINGU_DICS_DEL_DIC
     {
@@ -710,20 +730,21 @@ TabPage RID_SFXPAGE_LINGU
         Text[ greek ] = "��������";
         Text[ dutch ] = "~Wissen";
         Text[ french ] = "Supprimer";
-        Text[ spanish ] = "~Eliminar";
+        Text[ spanish ] = "~Borrar";
         Text[ italian ] = "Elimina";
-        Text[ danish ] = "Delete";
+        Text[ danish ] = "S~let";
         Text[ swedish ] = "R~adera";
         Text[ polish ] = "Usu�";
         Text[ portuguese_brazilian ] = "Delete";
-        Text[ japanese ] = "�폜(~T)";
-        Text[ korean ] = "����(~T)";
-        Text[ chinese_simplified ] = "ɾ��(~T)";
-        Text[ chinese_traditional ] = "�R��(~T)";
+        Text[ japanese ] = "削除(~T)";
+        Text[ korean ] = "삭제(~T)";
+        Text[ chinese_simplified ] = "删除(~T)";
+        Text[ chinese_traditional ] = "刪除(~T)";
         Text[ turkish ] = "Delete";
         Text[ arabic ] = "���";
-        Text[ catalan ] = "~Eliminar";
-        Text[ finnish ] = "Delete";
+        Text[ catalan ] = "~Suprimeix";
+        Text[ finnish ] = "Pois~ta";
+        Text[ thai ] = "ล~บ";
     };
     FixedText FT_LINGU_OPTIONS
     {
@@ -732,26 +753,27 @@ TabPage RID_SFXPAGE_LINGU
         Size = MAP_APPFONT ( 175 , 8 ) ;
         Text = "~Optionen" ;
         Text [ English ] = "~Options" ;
-        Text[ english_us ] = "Options:";
-        Text[ portuguese ] = "Op��es:";
+        Text[ english_us ] = "~Options";
+        Text[ portuguese ] = "~Op��es";
         Text[ russian ] = "���������";
         Text[ greek ] = "��������:";
-        Text[ dutch ] = "Opties:";
-        Text[ french ] = "Options :";
+        Text[ dutch ] = "~Opties";
+        Text[ french ] = "Options";
         Text[ spanish ] = "Opciones";
-        Text[ italian ] = "Opzioni:";
-        Text[ danish ] = "Options:";
-        Text[ swedish ] = "Al~ternativ";
+        Text[ italian ] = "~Opzioni";
+        Text[ danish ] = "~Indstillinger";
+        Text[ swedish ] = "A~lternativ";
         Text[ polish ] = "Opcje";
         Text[ portuguese_brazilian ] = "Options:";
-        Text[ japanese ] = "��߼��";
-        Text[ korean ] = "�ɼ�:";
-        Text[ chinese_simplified ] = "ѡ�";
-        Text[ chinese_traditional ] = "�ﶵ�G";
+        Text[ japanese ] = "オプション(~O)";
+        Text[ korean ] = "옵션(~O)";
+        Text[ chinese_simplified ] = "选项(~O)";
+        Text[ chinese_traditional ] = "選項(~O)";
         Text[ turkish ] = "Options:";
         Text[ arabic ] = "��������:";
-        Text[ catalan ] = "Opciones:";
-        Text[ finnish ] = "Asetukset";
+        Text[ catalan ] = "Opcions:";
+        Text[ finnish ] = "A~setukset";
+        Text[ thai ] = "ตัวเลือก:";
     };
     Control CLB_LINGU_OPTIONS
     {
@@ -771,22 +793,23 @@ TabPage RID_SFXPAGE_LINGU
         Text[ portuguese ] = "E~ditar...";
         Text[ russian ] = "������...";
         Text[ greek ] = "~�����������...";
-        Text[ dutch ] = "B~ewerken...";
-        Text[ french ] = "�~diter...";
+        Text[ dutch ] = "Bewer~ken...";
+        Text[ french ] = "�diter...";
         Text[ spanish ] = "E~ditar...";
-        Text[ italian ] = "~Modifica...";
-        Text[ danish ] = "E~dit...";
+        Text[ italian ] = "Modifi~ca...";
+        Text[ danish ] = "Redi~ger...";
         Text[ swedish ] = "Re~digera...";
         Text[ polish ] = "E~dytuj...";
         Text[ portuguese_brazilian ] = "E~dit...";
-        Text[ japanese ] = "�ҏW(~D)...";
-        Text[ korean ] = "����(~D)...";
-        Text[ chinese_simplified ] = "�༭(~D)...";
-        Text[ chinese_traditional ] = "�s��(~D)...";
+        Text[ japanese ] = "編集(~D)...";
+        Text[ korean ] = "편집(~D)...";
+        Text[ chinese_simplified ] = "编辑(~D)...";
+        Text[ chinese_traditional ] = "編輯(~D)...";
         Text[ turkish ] = "E~dit...";
         Text[ arabic ] = "�����...";
-        Text[ catalan ] = "E~ditar...";
-        Text[ finnish ] = "M~uokkaa";
+        Text[ catalan ] = "E~dita...";
+        Text[ finnish ] = "M~uokkaa...";
+        Text[ thai ] = "แก้ไ~ข...";
     };
 
     String STR_CAPITAL_WORDS
@@ -795,24 +818,25 @@ TabPage RID_SFXPAGE_LINGU
         Text[ ENGLISH ] = "Check uppercase words" ;
         Text[ english_us ] = "Check uppercase words";
         Text[ portuguese ] = "Verificar palavras em mai�sculas";
-        Text[ russian ] = "��������� �����, ���������� ����������";
+        Text[ russian ] = "��������� �����, ���������� ���������� �������";
         Text[ greek ] = "������� ������ �� ��������";
         Text[ dutch ] = "Hoofdletter aan woordbegin controleren";
         Text[ french ] = "V�rifier les mots en majuscules";
         Text[ spanish ] = "Revisar palabras en may�scula";
         Text[ italian ] = "Parole maiuscole";
-        Text[ danish ] = "Check uppercase words";
+        Text[ danish ] = "Kontroller ord med versaler";
         Text[ swedish ] = "Kontrollera ord med stor bokst�ver";
         Text[ polish ] = "Sprawd� wyrazy napisane wielk� liter�";
         Text[ portuguese_brazilian ] = "Check uppercase words";
-        Text[ japanese ] = "�啶���̒P����������";
-        Text[ korean ] = "�빮�� �ܾ� �˻�";
-        Text[ chinese_simplified ] = "����д��ĸ";
-        Text[ chinese_traditional ] = "�ˬd�j�g�r��";
+        Text[ japanese ] = "大文字の単語をスペルチェック";
+        Text[ korean ] = "대문자 단어 검사";
+        Text[ chinese_simplified ] = "检查大写字母";
+        Text[ chinese_traditional ] = "檢查大寫字母";
         Text[ turkish ] = "Check uppercase words";
         Text[ arabic ] = "����� ������� �������� ����� �����";
-        Text[ catalan ] = "Revisar palabras en may�scula";
+        Text[ catalan ] = "Revisa les paraules en maj�scula";
         Text[ finnish ] = "Tarkista isolla kirjaimella kirjoitetut sanat";
+        Text[ thai ] = "ตรวจสอบคำที่ใช้ตัวพิมพ์ใหญ่";
     };
     String STR_WORDS_WITH_DIGITS
     {
@@ -826,18 +850,19 @@ TabPage RID_SFXPAGE_LINGU
         Text[ french ] = "V�rifier les mots comportant des chiffres";
         Text[ spanish ] = "Revisar palabras con n�meros";
         Text[ italian ] = "Parole con numeri";
-        Text[ danish ] = "Check words with numbers ";
+        Text[ danish ] = "Kontroller ord med tal";
         Text[ swedish ] = "Kontrollera ord med siffror";
         Text[ polish ] = "Sprawd� s�owa z cyframi";
         Text[ portuguese_brazilian ] = "Check words with numbers ";
-        Text[ japanese ] = "�������܂ޒP��̽�������";
-        Text[ korean ] = "���ڰ� ���Ե� �ܾ �˻�";
-        Text[ chinese_simplified ] = "������ŵ���";
-        Text[ chinese_traditional ] = "�ˬd�a�s�����r";
+        Text[ japanese ] = "数字を含む単語のスペルチェック";
+        Text[ korean ] = "숫자가 포함된 단어를 검사";
+        Text[ chinese_simplified ] = "检查带编号的字";
+        Text[ chinese_traditional ] = "檢查帶編號的字";
         Text[ turkish ] = "Check words with numbers ";
         Text[ arabic ] = "����� ������� ���� ����� ��� �����";
-        Text[ catalan ] = "Revisar palabras con n�meros";
-        Text[ finnish ] = "Tarkista lukuja sis�lt�v�t sanat";
+        Text[ catalan ] = "Verifica les paraules amb nombres";
+        Text[ finnish ] = "Tarkista lukuja sis�lt�v�t sanat ";
+        Text[ thai ] = "ตรวจสอบคำที่มีตัวเลข ";
     };
     String STR_CAPITALIZATION
     {
@@ -847,22 +872,23 @@ TabPage RID_SFXPAGE_LINGU
         Text[ portuguese ] = "Verificar mai�sculas/min�sculas";
         Text[ russian ] = "��������� �������";
         Text[ greek ] = "������� ��������/����";
-        Text[ dutch ] = "Hoofd-/kleine letters controleren";
+        Text[ dutch ] = "Hoofdletters/kleine letters controleren";
         Text[ french ] = "V�rifier la casse";
         Text[ spanish ] = "Revisar may�sculas";
         Text[ italian ] = "Maiuscole e minuscole";
-        Text[ danish ] = "Check capitalization words";
+        Text[ danish ] = "Kontroller store og sm� bogstaver";
         Text[ swedish ] = "Kontrollera stor och liten bokstav";
         Text[ polish ] = "Sprawd� pisowni� ma�� i wielk� liter�";
         Text[ portuguese_brazilian ] = "Check capitalization words";
-        Text[ japanese ] = "�啶��/�������̽���н";
-        Text[ korean ] = "�빮��/�ҹ��� �˻�";
-        Text[ chinese_simplified ] = "�����ĸ��Сд";
-        Text[ chinese_traditional ] = "�ˬd�r���j�p�g";
+        Text[ japanese ] = "大文字と小文字のスペルミス";
+        Text[ korean ] = "대문자 및 소문자 오류 검사";
+        Text[ chinese_simplified ] = "检查字母大小写";
+        Text[ chinese_traditional ] = "檢查字母大小寫";
         Text[ turkish ] = "Check capitalization words";
         Text[ arabic ] = "����� ������� ����� ����� �� �����";
-        Text[ catalan ] = "Revisar may�sculas";
+        Text[ catalan ] = "Revisa maj�scules";
         Text[ finnish ] = "Tarkista isot kirjaimet";
+        Text[ thai ] = "ตรวจสอบตัวพิมพ์ใหญ่";
     };
     String STR_SPELL_SPECIAL
     {
@@ -876,18 +902,19 @@ TabPage RID_SFXPAGE_LINGU
         Text[ french ] = "V�rifier les zones sp�ciales";
         Text[ spanish ] = "Revisar �reas especiales";
         Text[ italian ] = "Controlla aree speciali";
-        Text[ danish ] = "Proof special regions";
+        Text[ danish ] = "Kontroller specialomr�der";
         Text[ swedish ] = "Kontrollera specialomr�den";
         Text[ polish ] = "Sprawd� obszary specjalne";
         Text[ portuguese_brazilian ] = "Proof special regions";
-        Text[ japanese ] = "���ʔ͈͂̽�������";
-        Text[ korean ] = "Ư������  �˻�";
-        Text[ chinese_simplified ] = "�����������";
-        Text[ chinese_traditional ] = "�ˬd�S���ϰ�";
+        Text[ japanese ] = "特別範囲のスペルチェック";
+        Text[ korean ] = "특수영역  검사";
+        Text[ chinese_simplified ] = "检查特殊区域";
+        Text[ chinese_traditional ] = "檢查特殊區域";
         Text[ turkish ] = "Proof special regions";
         Text[ arabic ] = "����� ������� ������";
-        Text[ catalan ] = "Revisar �reas especiales";
+        Text[ catalan ] = "Comprova les regions especials";
         Text[ finnish ] = "Tarkista erityisalueet";
+        Text[ thai ] = "ตรวจสอบบริเวณพิเศษ";
     };
     String STR_ALL_LANGUAGES
     {
@@ -901,18 +928,19 @@ TabPage RID_SFXPAGE_LINGU
         Text[ french ] = "V�rifier dans toutes les langues";
         Text[ spanish ] = "Revisar en todos los idiomas";
         Text[ italian ] = "Tutte le lingue";
-        Text[ danish ] = "Spell in all languages";
+        Text[ danish ] = "Kontroller p� alle sprog";
         Text[ swedish ] = "Kontrollera alla spr�k";
         Text[ polish ] = "Sprawd� we wszystkich j�zykach";
         Text[ portuguese_brazilian ] = "Spell in all languages";
-        Text[ japanese ] = "���ׂĂ̌���Ž�������";
-        Text[ korean ] = "��� ���� �˻�";
-        Text[ chinese_simplified ] = "����������";
-        Text[ chinese_traditional ] = "�ˬd�Ҧ����y��";
+        Text[ japanese ] = "すべての言語でスペルチェック";
+        Text[ korean ] = "모든 언어에서 검사";
+        Text[ chinese_simplified ] = "检查所有的语言";
+        Text[ chinese_traditional ] = "檢查所有的語言";
         Text[ turkish ] = "Spell in all languages";
         Text[ arabic ] = "������� �� �� ������";
-        Text[ catalan ] = "Revisar en todos los idiomas";
+        Text[ catalan ] = "Verifica en tots els idiomes";
         Text[ finnish ] = "Tarkista kaikilla kielill�";
+        Text[ thai ] = "ตรวจสอบในภาษาทั้งหมด";
     };
     String STR_SPELL_AUTO
     {
@@ -924,45 +952,47 @@ TabPage RID_SFXPAGE_LINGU
         Text[ greek ] = "��������� �������";
         Text[ dutch ] = "Automatische controle";
         Text[ french ] = "V�rification automatique";
-        Text[ spanish ] = "Revisi�n autom�tica";
+        Text[ spanish ] = "Revisi�n ortogr�fica autom�tica";
         Text[ italian ] = "Controllo automatico";
-        Text[ danish ] = "Online Checking";
+        Text[ danish ] = "Automatisk stavekontrol";
         Text[ swedish ] = "Automatisk kontroll";
         Text[ polish ] = "Automatyczne sprawdzanie";
         Text[ portuguese_brazilian ] = "Online Checking";
-        Text[ japanese ] = "������������";
-        Text[ korean ] = "�ڵ� �˻�";
-        Text[ chinese_simplified ] = "�Զ����";
-        Text[ chinese_traditional ] = "�۰��ˬd";
+        Text[ japanese ] = "自動スペルチェック";
+        Text[ korean ] = "자동 검사";
+        Text[ chinese_simplified ] = "自动检查";
+        Text[ chinese_traditional ] = "自動檢查";
         Text[ turkish ] = "Online Checking";
         Text[ arabic ] = "����� ������";
-        Text[ catalan ] = "Revisi�n autom�tica";
+        Text[ catalan ] = "Revisi� autom�tica";
         Text[ finnish ] = "Automaattinen tarkistus";
+        Text[ thai ] = "ตรวจสอบอัตโนมัติ";
     };
     String STR_HIDE_MARKINGS
     {
         Text = "Kennung ausblenden" ;
         Text[ English ] = "Hide the marking" ;
-        Text[ english_us ] = "Don't mark errors";
+        Text[ english_us ] = "Do not mark errors";
         Text[ portuguese ] = "Ocultar sublinhado de erros";
-        Text[ russian ] = "������ �������";
+        Text[ russian ] = "�� �������� ������";
         Text[ greek ] = "�������� ��������";
-        Text[ dutch ] = "Kenteken verbergen";
+        Text[ dutch ] = "ID verbergen";
         Text[ french ] = "Masquer le soulignage des fautes";
-        Text[ spanish ] = "Ocultar identificador";
+        Text[ spanish ] = "Ocultar errores";
         Text[ italian ] = "Nascondi sottolineatura errori";
-        Text[ danish ] = "Hide the marking";
+        Text[ danish ] = "Skjul identifikation";
         Text[ swedish ] = "D�lj felmarkering";
         Text[ polish ] = "Ukryj identyfikator";
         Text[ portuguese_brazilian ] = "Hide the marking";
-        Text[ japanese ] = "�g����\\�����Ȃ�";
-        Text[ korean ] = "��ũ �����";
-        Text[ chinese_simplified ] = "�����ɫ����";
-        Text[ chinese_traditional ] = "���J���⦱�u";
+        Text[ japanese ] = "波線を表示しない";
+        Text[ korean ] = "오류 표시를 하지 않음";
+        Text[ chinese_simplified ] = "隐入红色曲线";
+        Text[ chinese_traditional ] = "隱入紅色曲線";
         Text[ turkish ] = "Hide the marking";
         Text[ arabic ] = "��� ����� �������";
-        Text[ catalan ] = "Ocultar identificador";
+        Text[ catalan ] = "No marquis els errors";
         Text[ finnish ] = "�l� merkitse virheit�";
+        Text[ thai ] = "อย่าทำเครื่องหมายข้อผิดพลาด";
     };
     String STR_OLD_GERMAN
     {
@@ -976,18 +1006,19 @@ TabPage RID_SFXPAGE_LINGU
         Text[ french ] = "Ancienne orthographe allemande";
         Text[ spanish ] = "Antigua ortograf�a alemana";
         Text[ italian ] = "Ortografia tedesca pre-riforma";
-        Text[ danish ] = "Pre reform german spelling";
+        Text[ danish ] = "Gammel tysk retskrivning";
         Text[ swedish ] = "Gammal tysk r�ttstavning";
         Text[ polish ] = "Stara niemiecka pisownia";
         Text[ portuguese_brazilian ] = "Pre reform german spelling";
-        Text[ japanese ] = "���޲Œꐳ���@";
-        Text[ korean ] = "���Ͼ� �����, ��";
-        Text[ chinese_simplified ] = "��ʽ����ƴд���";
-        Text[ chinese_traditional ] = "�¦��w�y���g�ˬd";
+        Text[ japanese ] = "旧ドイツ語正書法";
+        Text[ korean ] = "독일어 개정 전 맞춤법";
+        Text[ chinese_simplified ] = "旧式德语拼写检查";
+        Text[ chinese_traditional ] = "舊式德語拼寫檢查";
         Text[ turkish ] = "Pre reform german spelling";
         Text[ arabic ] = "����� ������ ������ ����";
-        Text[ catalan ] = "Antigua ortograf�a alemana";
+        Text[ catalan ] = "Ortografia alemanya - antiga";
         Text[ finnish ] = "Saksan oikoluku - vanha";
+        Text[ thai ] = "การสะกดภาษาเยอรมัน - เก่า";
     };
     String STR_NUM_MIN_WORDLEN
     {
@@ -1001,68 +1032,71 @@ TabPage RID_SFXPAGE_LINGU
         Text[ french ] = "Longueur de mot minimum pour la coupure des mots : ";
         Text[ spanish ] = "Tama�o m�nimo de palabra para separaci�n sil�bica: ";
         Text[ italian ] = "Larghezza minima della parola prima della sillabazione: ";
-        Text[ danish ] = "Minimal wordlength for hyphenation: ";
+        Text[ danish ] = "Minimal ordl�ngde for orddeling: ";
         Text[ swedish ] = "Minimal ordl�ngd f�r avstavning: ";
         Text[ polish ] = "Minimalna d�ugo�� wyraz�w do dzielenia:";
         Text[ portuguese_brazilian ] = "Minimal wordlength for hyphenation: ";
-        Text[ japanese ] = "ʲ�݂��‚���O�̍Œᕶ����: ";
-        Text[ korean ] = "������ �и��� ���� �ּ� �ܾ� ����: ";
-        Text[ chinese_simplified ] = "�������ַ�����̵��ִʳ��ȣ�";
-        Text[ chinese_traditional ] = "�Ω�s�r�Ū��̵u���r�����סG";
+        Text[ japanese ] = "ハイフンをつける前の最低文字数: ";
+        Text[ korean ] = "하이픈 분리에 대한 최소 단어 길이: ";
+        Text[ chinese_simplified ] = "使用连字符时最少的字母数：";
+        Text[ chinese_traditional ] = "用於連字符的最短的字詞長度：";
         Text[ turkish ] = "Minimal wordlength for hyphenation: ";
         Text[ arabic ] = "����� ������ ������ ��� ��� �������: ";
-        Text[ catalan ] = "Tama�o m�nimo de palabra para separaci�n sil�bica: ";
-        Text[ finnish ] = "Minimale Wortl�nge f�r Silbentrennung: ";
+        Text[ catalan ] = "Mida m�nima de la paraula per separar-la en s�l.labes: ";
+        Text[ finnish ] = "Sanojen v�himm�ispituus tavutuksessa: ";
+        Text[ thai ] = "จำนวนตัวอักขระที่น้อยที่สุดสำหรับใช้เครื่องหมายยัติภังค์: ";
     };
     String STR_NUM_PRE_BREAK
     {
         Text = "Zeichen vor dem Zeilenumbruch: " ;
         Text[ ENGLISH ] = "Characters before linebreak: " ;
-        Text[ english_us ] = "Characters before break: ";
+        Text[ english_us ] = "Characters before line break: ";
         Text[ portuguese ] = "Caracteres antes da quebra: ";
-        Text[ russian ] = "����� ����� �������� ������: ";
+        Text[ russian ] = "������� ����� ��������� ������: ";
         Text[ greek ] = "���������� ���� ��� ������ �������:";
         Text[ dutch ] = "Tekens voor regelafbreking: ";
         Text[ french ] = "Caract�res avant le saut : ";
         Text[ spanish ] = "Caracteres antes de salto de fila: ";
         Text[ italian ] = "Caratteri prima dell'interruzione di riga: ";
-        Text[ danish ] = "Characters before hyphenation";
+        Text[ danish ] = "Tegn f�r linjeskift: ";
         Text[ swedish ] = "Tecken f�re radbrytning: ";
         Text[ polish ] = "Znaki przed podzia�em wiersza:";
         Text[ portuguese_brazilian ] = "Characters before hyphenation";
-        Text[ japanese ] = "���s�O������: ";
-        Text[ korean ] = "���� �� ����";
-        Text[ chinese_simplified ] = "���ַ�֮ǰ���ַ���";
-        Text[ chinese_traditional ] = "�s�r�Ť��e���r���G";
+        Text[ japanese ] = "改行前文字数: ";
+        Text[ korean ] = "줄 바꿈 전 문자 수:";
+        Text[ chinese_simplified ] = "连字符之前的字母数：";
+        Text[ chinese_traditional ] = "連字符之前的字元：";
         Text[ turkish ] = "Characters before hyphenation";
         Text[ arabic ] = "���� ��� ���� ������: ";
-        Text[ catalan ] = "Caracteres antes de salto de fila: ";
-        Text[ finnish ] = "Characters before break ";
+        Text[ catalan ] = "Car�cters abans del salt de fila: ";
+        Text[ finnish ] = "Merkit ennen rivinvaihtoa: ";
+        Text[ thai ] = "ตัวอักขระก่อนแบ่ง: ";
     };
     String STR_NUM_POST_BREAK
     {
         Text = "Zeichen nach dem Zeilenumbruch: " ;
         Text[ ENGLISH ] = "Characters behind linebreak: " ;
-        Text[ english_us ] = "Characters after break: ";
+        Text[ english_us ] = "Characters after line break: ";
         Text[ portuguese ] = "Caracteres ap�s quebra: ";
-        Text[ russian ] = "����� ����� ������� ������: ";
+        Text[ russian ] = "������� ����� �������� ������: ";
         Text[ greek ] = "���������� ���� ��� ������ �������:";
         Text[ dutch ] = "Tekens na regelafbreking: ";
         Text[ french ] = "Caract�res apr�s le saut : ";
         Text[ spanish ] = "Caracteres despu�s de salto de l�nea: ";
         Text[ italian ] = "Caratteri dopo l'interruzione di riga: ";
-        Text[ danish ] = "Characters behind hyphenation";
+        Text[ danish ] = "Tegn efter linjeskift: ";
         Text[ swedish ] = "Tecken efter radbrytning: ";
         Text[ polish ] = "Znaki za podzia�em wiersza:";
         Text[ portuguese_brazilian ] = "Characters behind hyphenation";
-        Text[ japanese ] = "���s�㕶����: ";
-        Text[ korean ] = "���� ����  ����";
-        Text[ chinese_simplified ] = "���ַ���֮����ַ���";
-        Text[ chinese_traditional ] = "�s�r�Ť��᪺�r���G";
+        Text[ japanese ] = "改行後文字数: ";
+        Text[ korean ] = "줄 바꿈 후 문자 수:";
+        Text[ chinese_simplified ] = "连字符之后的字母数：";
+        Text[ chinese_traditional ] = "連字符之後的字元數：";
         Text[ turkish ] = "Characters behind hyphenation";
         Text[ arabic ] = "���� ��� ���� ������: ";
-        Text[ catalan ] = "Caracteres despu�s de salto de l�nea: ";
-        Text[ finnish ] = "Characters after break ";
+        Text[ catalan ] = "Car�cters despr�s del salt de l�nia: ";
+        Text[ finnish ] = "Merkit rivinvaihdon j�lkeen: ";
+        Text[ thai ] = "ตัวอักขระหลังแบ่ง: ";
     };
     String STR_HYPH_AUTO
     {
@@ -1076,18 +1110,19 @@ TabPage RID_SFXPAGE_LINGU
         Text[ french ] = "Coupure automatique";
         Text[ spanish ] = "Separar sin preguntar";
         Text[ italian ] = "Sillabazione senza conferma";
-        Text[ danish ] = "Hyphenation without interaction";
+        Text[ danish ] = "Del ord uden foresp�rgsel";
         Text[ swedish ] = "Automatisk avstavning";
         Text[ polish ] = "Dzielenie wyraz�w na sylaby bez komunikatu";
         Text[ portuguese_brazilian ] = "Hyphenation without interaction";
-        Text[ japanese ] = "�m�F�Ȃ���ʲ�Ȱ���";
-        Text[ korean ] = "��ȸ���� ���������� �и�";
-        Text[ chinese_simplified ] = "�Զ��ֿ�";
-        Text[ chinese_traditional ] = "�۰ʤ��}";
+        Text[ japanese ] = "確認なしのハイフネーション";
+        Text[ korean ] = "자동으로 하이픈 넣기";
+        Text[ chinese_simplified ] = "自动分开";
+        Text[ chinese_traditional ] = "自動分開";
         Text[ turkish ] = "Hyphenation without interaction";
         Text[ arabic ] = "��� ������� ���� �������";
-        Text[ catalan ] = "Separar sin preguntar";
-        Text[ finnish ] = "Tavutus ilman kysely�";
+        Text[ catalan ] = "Parteix els mots sense consultar";
+        Text[ finnish ] = "Tavuta kysym�tt�";
+        Text[ thai ] = "ใช้ยัติภังค์โดยไม่มีการถาม";
     };
     String STR_HYPH_SPECIAL
     {
@@ -1101,18 +1136,19 @@ TabPage RID_SFXPAGE_LINGU
         Text[ french ] = "Coupure des zones sp�ciales";
         Text[ spanish ] = "Separar �reas especiales";
         Text[ italian ] = "Sillabazione aree speciali";
-        Text[ danish ] = "Hyphenate special regions";
+        Text[ danish ] = "Del specialomr�der";
         Text[ swedish ] = "Avstava specialomr�den";
         Text[ polish ] = "Podziel obszary specjalne";
         Text[ portuguese_brazilian ] = "Hyphenate special regions";
-        Text[ japanese ] = "���ʔ͈͂�ʲ�Ȱ���";
-        Text[ korean ] = "Ư�� ���� �и�";
-        Text[ chinese_simplified ] = "�ֿ���������";
-        Text[ chinese_traditional ] = "���}�S���ϰ�";
+        Text[ japanese ] = "特別範囲のハイフネーション";
+        Text[ korean ] = "특수 영역에 하이픈 넣기";
+        Text[ chinese_simplified ] = "分开特殊区域";
+        Text[ chinese_traditional ] = "分開特殊區域";
         Text[ turkish ] = "Hyphenate special regions";
         Text[ arabic ] = "��� ������� ������";
-        Text[ catalan ] = "Separar �reas especiales";
+        Text[ catalan ] = "Parteix els mots de regions especials";
         Text[ finnish ] = "Tavuta erityisalueet";
+        Text[ thai ] = "ใช้ยัติภังค์บริเวณพิเศษ";
     };
 
     Bitmap BMP_CHKBUT_UNCHECKED
@@ -1146,17 +1182,18 @@ QueryBox RID_SFXQB_DELDICT
     Message [ french ] = "Voulez-vous supprimer le dictionnaire?" ;
     Message [ swedish ] = "Vill du radera ordlistan?" ;
     Message [ dutch ] = "Wilt u de woordenlijst wissen?" ;
-    Message [ spanish ] = "�Desea eliminar el diccionario?" ;
-    Message[ chinese_simplified ] = "��Ҫɾ������ʵ���";
-    Message[ russian ] = "�� ������ ������� ���� �������?";
+    Message [ spanish ] = "�Desea borrar el diccionario?" ;
+    Message[ chinese_simplified ] = "您要删除这个词典吗？";
+    Message[ russian ] = "������� �������?";
     Message[ polish ] = "Chcesz skasowa� s�ownik?";
-    Message[ japanese ] = "�������폜���܂����B";
-    Message[ chinese_traditional ] = "�z�n�R���o�ӵ���H";
+    Message[ japanese ] = "辞書を削除しますか。";
+    Message[ chinese_traditional ] = "您要刪除這個詞典？";
     Message[ arabic ] = "�� ���� ��� ������ӿ";
     Message[ greek ] = "������ �� ��������� �� ������;";
-    Message[ korean ] = "������ �����Ͻðڽ��ϱ�?";
+    Message[ korean ] = "사전을 삭제하겠습니까?";
     Message[ turkish ] = "S�zl��� silmek istiyor musunuz?";
-    Message[ catalan ] = "�Desea eliminar el diccionario?";
+    Message[ catalan ] = "Voleu suprimir el diccionari?";
+    Message[ thai ] = "คุณต้องการลบพจนานุกรมหรือไม่?";
 };
  // RID_SFXQB_DEL_IGNORELIST ----------------------------------------------
 QueryBox RID_SFXQB_DEL_IGNORELIST
@@ -1170,24 +1207,25 @@ QueryBox RID_SFXQB_DEL_IGNORELIST
     Message [ ENGLISH ] = "Do you want to delete the ignore list?" ;
     Message [ english_us ] = "Do you want to delete the ignore list?" ;
     Message [ italian ] = "Eliminare la lista ignora?" ;
-    Message [ spanish ] = "�Desea eliminar la lista Ignorar?" ;
+    Message [ spanish ] = "�Desea borrar la lista de ignorar?" ;
     Message [ french ] = "Voulez-vous supprimer la liste des exclusions ?" ;
     Message [ dutch ] = "Wilt u de lijst Negeren wissen?" ;
     Message [ swedish ] = "Vill du radera ignorera-listan?" ;
     Message [ danish ] = "Vil du slette Ignorer-listen?" ;
     Message [ portuguese ] = "Deseja eliminar a lista Ignorar?" ;
     Message [ portuguese_brazilian ] = "M?hten Sie die Ignorieren-Liste l?chen?" ;
-    Message[ chinese_simplified ] = "��Ҫɾ������������е�����";
-    Message[ russian ] = "�� ������ ������� ������ �����������?";
+    Message[ chinese_simplified ] = "要删除这个\"忽略列单\"？";
+    Message[ russian ] = "������� ������ �����������?";
     Message[ polish ] = "Czy chcesz usun�� list� ignoracji?";
-    Message[ japanese ] = "<ؽĂ͖�������>���폜���܂����B";
-    Message[ chinese_traditional ] = "�z�n�R���o�ӡu�����M��v�H";
+    Message[ japanese ] = "<リストは無視する>を削除しますか。";
+    Message[ chinese_traditional ] = "要刪除這個<忽略清單>？";
     Message[ arabic ] = "�� ���� ��� ����� �������";
     Message[ greek ] = "������ �� ��������� � ����� ����������;";
-    Message[ korean ] = "���ø���� �����Ͻðڽ��ϱ�?";
+    Message[ korean ] = "무시목록을 삭제하겠습니까?";
     Message[ turkish ] = "\"Yok say\" listesini silmek istiyor musunuz?";
-    Message[ catalan ] = "�Desea eliminar la lista Ignorar?";
+    Message[ catalan ] = "Voleu suprimir la llista Ignorar?";
     Message[ finnish ] = "Haluatko poistaa ohitettavien luettelon?";
+    Message[ thai ] = "คุณต้องการลบรายการที่ยกเลิกหรือไม่?";
 };
  // ******************************************************************* EOF
 
@@ -1197,3 +1235,22 @@ QueryBox RID_SFXQB_DEL_IGNORELIST
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svx/source/options/optpath.src b/svx/source/options/optpath.src
index c2f9426d86e7..09364265b647 100644
--- a/svx/source/options/optpath.src
+++ b/svx/source/options/optpath.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: optpath.src,v $
  *
- *  $Revision: 1.20 $
+ *  $Revision: 1.21 $
  *
- *  last change: $Author: os $ $Date: 2002-12-03 16:27:51 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -213,7 +213,7 @@ TabPage RID_SFXPAGE_PATH
         Text[ chinese_traditional ] = "標準(~D)";
         Text[ arabic ] = "�������";
         Text[ greek ] = "����������";
-        Text[ korean ] = "기본 값(~D)";
+        Text[ korean ] = "기본값(~D)";
         Text[ turkish ] = "Standart";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Per defecte";
@@ -238,13 +238,13 @@ TabPage RID_SFXPAGE_PATH
         Text [ spanish ] = "Predeterminado" ;
         Text [ english_us ] = "Default" ;
         Text[ chinese_simplified ] = "标准";
-        Text[ russian ] = "��������";
+        Text[ russian ] = "�� ���������";
         Text[ polish ] = "Domy�lnie";
         Text[ japanese ] = "標準";
         Text[ chinese_traditional ] = "標準";
         Text[ arabic ] = "�������";
         Text[ greek ] = "����������";
-        Text[ korean ] = "기본";
+        Text[ korean ] = "기본값";
         Text[ turkish ] = "Standart";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Per defecte";
@@ -291,7 +291,7 @@ ErrorBox RID_SVXERR_OPT_DOUBLEPATHS
     Message[ chinese_traditional ] = "配置和儲存郵件的目錄不能相同。\n請您選擇一個新的目錄。";
     Message[ arabic ] = "��� �� ���� ����� ������� ������� ������.\n������ ������ ���� ����.";
     Message[ greek ] = "�� ��������� ��� ��� ���������� ��� ��� ���������� ��� ���������\n������ �� ����� ������������.\n�������� ������� ��� ��� ��������.";
-    Message[ korean ] = "구성용 디렉토리와 메일저장 디렉토리는 구분되어야 합니다.\n새 경로를 선택하십시오.";
+    Message[ korean ] = "설정용 디렉토리와 메일 저장 디렉토리는 구분되어야 합니다.\n새 경로를 선택하십시오.";
     Message[ turkish ] = "Konfig�rasyon ve ileti dizinlerinin ayr� dizinler olarak\nbelirlenmesi gerekir.\nL�tfen yeni bir veri yolu se�in.";
     Message[ language_user1 ] = " ";
     Message[ catalan ] = "La configuraci� i els directoris de correu electr�nic\ns'han d'especificar com a directoris separats.\nEscolliu un nou cam�.";
@@ -301,3 +301,19 @@ ErrorBox RID_SVXERR_OPT_DOUBLEPATHS
  // ******************************************************************* EOF
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svx/source/options/optsave.src b/svx/source/options/optsave.src
index b7acbbc1dce7..d385283b1b7a 100644
--- a/svx/source/options/optsave.src
+++ b/svx/source/options/optsave.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: optsave.src,v $
  *
- *  $Revision: 1.59 $
+ *  $Revision: 1.60 $
  *
- *  last change: $Author: kz $ $Date: 2002-10-31 13:36:16 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -88,7 +88,8 @@
     Text[ greek ] = "����������";   \
     Text[ korean ] = "저장";  \
     Text[ turkish ] = "Kaydet"; \
-    Text[ catalan ] = "Desa";
+    Text[ catalan ] = "Desa";   \
+    Text[ thai ] = "บันทึก";
 
 TabPage RID_SFXPAGE_SAVE
 {
@@ -111,7 +112,7 @@ TabPage RID_SFXPAGE_SAVE
         Text[ dutch ] = "Laden";
         Text[ french ] = "Charger";
         Text[ spanish ] = "Cargar";
-        Text[ finnish ] = "Load";
+        Text[ finnish ] = "Lataa";
         Text[ italian ] = "Carica";
         Text[ danish ] = "Indl�s";
         Text[ swedish ] = "Ladda";
@@ -124,6 +125,7 @@ TabPage RID_SFXPAGE_SAVE
         Text[ turkish ] = "Load";
         Text[ arabic ] = "Load";
         Text[ catalan ] = "Carrega";
+        Text[ thai ] = "โหลด";
     };
     CheckBox CB_LOAD_SETTINGS
     {
@@ -133,12 +135,12 @@ TabPage RID_SFXPAGE_SAVE
         Text [ English ] = "Load user-defined settings with the document" ;
         Text[ english_us ] = "Load user-specific settings with the document";
         Text[ portuguese ] = "~Carregar defini��es personalizadas com o documento";
-        Text[ russian ] = "��������� ������ � ���������� ���������, �������� �������������";
+        Text[ russian ] = "��������� ��������� ������������ ������ � ����������";
         Text[ greek ] = "Load user-defined settings with the document";
         Text[ dutch ] = "Door gebruiker gedefinieerde instellingen samen met het document laden";
         Text[ french ] = "Chargement des param�tres utilisateur avec le document";
         Text[ spanish ] = "Cargar la configuraci�n de usuario al cargar el documento";
-        Text[ finnish ] = "Load user-defined settings with the document";
+        Text[ finnish ] = "Lataa k�ytt�j�n m��ritt�m�t asetukset asiakirjan kanssa";
         Text[ italian ] = "Carica le impostazioni personalizzate insieme al documento";
         Text[ danish ] = "Indl�s ~brugerspecifikke indstillinger sammen med dokumentet";
         Text[ swedish ] = "Ladda ~anv�ndarspecifika inst�llningar med dokumentet";
@@ -150,7 +152,8 @@ TabPage RID_SFXPAGE_SAVE
         Text[ chinese_traditional ] = "連同使用者的設定一起載入文件";
         Text[ turkish ] = "Load user-defined settings with the document";
         Text[ arabic ] = "Load user-defined settings with the document";
-        Text[ catalan ] = "Load user-defined settings with the document";
+        Text[ catalan ] = "Carrega els par�metres personalitzats amb el document";
+        Text[ thai ] = "โหลดการกำหนดผู้ใช้เฉพาะกับเอกสาร";
     };
     FixedLine GB_SAVE
     {
@@ -179,6 +182,7 @@ TabPage RID_SFXPAGE_SAVE
         Text[ korean ] = "저장";
         Text[ turkish ] = "Kaydet";
         Text[ catalan ] = "Desa";
+        Text[ thai ] = "บันทึก";
     };
     CheckBox BTN_DOCINFO
     {
@@ -205,9 +209,10 @@ TabPage RID_SFXPAGE_SAVE
         Text[ chinese_traditional ] = "先編輯屬性(~E)";
         Text[ arabic ] = "����� ����� ������� ��� �����";
         Text[ greek ] = "�������. ~��������� �������� ���� ��� ����������";
-        Text[ korean ] = "문서 등록정보 미리 편집(~E)";
+        Text[ korean ] = "문서 등록 정보를 저장 전에 편집(~E)";
         Text[ turkish ] = "�nce �zellikleri d�zenle";
-        Text[ catalan ] = "Edi~tar propiedades previamente";
+        Text[ catalan ] = "~Edita les propietats del document abans de desar";
+        Text[ thai ] = "แ~ก้ไขคุณสมบัติเอกสารก่อนบันทึก";
     };
     CheckBox BTN_BACKUP
     {
@@ -219,7 +224,7 @@ TabPage RID_SFXPAGE_SAVE
         Text [ italian ] = "~Crea sempre copia di backup" ;
         Text [ portuguese_brazilian ] = "~Backup copy always" ;
         Text [ portuguese ] = "Criar sempre ~c�pia de seguran�a" ;
-        Text [ finnish ] = "~Luo aina varmistuskopio" ;
+        Text [ finnish ] = "~Luo aina varmuuskopio" ;
         Text [ danish ] = "Opret altid sikkerhedskopi" ;
         Text [ french ] = "Toujours cr�er une copie de sauvegarde" ;
         Text [ swedish ] = "Skapa alltid ~s�kerhetskopia" ;
@@ -227,7 +232,7 @@ TabPage RID_SFXPAGE_SAVE
         Text [ spanish ] = "Cre~ar siempre copia de seguridad" ;
         Text [ english_us ] = "Al~ways create backup copy" ;
         Text[ chinese_simplified ] = "自动建立安全备件(~W)";
-        Text[ russian ] = "��������� ������ ��������� �����";
+        Text[ russian ] = "������ ��������� ��������� �����";
         Text[ polish ] = "Tw�rz zawsze kopi� zapasow�";
         Text[ japanese ] = "常時バックアップコピーの作成(~W)";
         Text[ chinese_traditional ] = "自動製作安全備份(~W)";
@@ -235,7 +240,8 @@ TabPage RID_SFXPAGE_SAVE
         Text[ greek ] = "����� ���������� ���������� �~��������";
         Text[ korean ] = "항상 백업 복사(~W)";
         Text[ turkish ] = "~Her zaman yedekle";
-        Text[ catalan ] = "Cre~ar siempre copia de seguridad";
+        Text[ catalan ] = "Cre~a sempre c�pia de seguretat";
+        Text[ thai ] = "สร้างสำเนาสำรองทุก~ครั้ง";
     };
 
     CheckBox BTN_AUTOSAVE
@@ -256,15 +262,16 @@ TabPage RID_SFXPAGE_SAVE
         Text [ spanish ] = "~Guardar autom�ticamente cada" ;
         Text [ english_us ] = "~AutoSave every" ;
         Text[ chinese_simplified ] = "自动存盘间隔时间(~A)";
-        Text[ russian ] = "��������� ������������� ������";
+        Text[ russian ] = "�������������� ������";
         Text[ polish ] = "Zapisuj automatycznie co";
         Text[ japanese ] = "自動的に保存(~A)";
         Text[ chinese_traditional ] = "自動儲存間隔時間(~A)";
         Text[ arabic ] = "����� �������� ��";
         Text[ greek ] = "�������� ���������� ����";
-        Text[ korean ] = "모두 자동으로 저장(~A)";
+        Text[ korean ] = "자동으로 저장(~A)";
         Text[ turkish ] = "Otomatik kaydetme s�kl���";
-        Text[ catalan ] = "~Guardar autom�ticamente cada";
+        Text[ catalan ] = "~Desa autom�ticament cada";
+        Text[ thai ] = "บันทึก~อัตโนมัติทุกครั้ง";
     };
     NumericField ED_AUTOSAVE
     {
@@ -308,7 +315,8 @@ TabPage RID_SFXPAGE_SAVE
         Text[ greek ] = "�����";
         Text[ korean ] = "분";
         Text[ turkish ] = "Dakika";
-        Text[ catalan ] = "Minutos";
+        Text[ catalan ] = "Minuts";
+        Text[ thai ] = "นาที";
     };
     CheckBox BTN_AUTOSAVEPROMPT
     {
@@ -328,7 +336,7 @@ TabPage RID_SFXPAGE_SAVE
         Text [ spanish ] = "Con c~onsulta" ;
         Text [ english_us ] = "~Prompt to save" ;
         Text[ chinese_simplified ] = "显示询问(~P)";
-        Text[ russian ] = "� ��������";
+        Text[ russian ] = "������ �� ��~��������";
         Text[ polish ] = "Potwierdzenie";
         Text[ japanese ] = "確認メッセージの表示(~P)";
         Text[ chinese_traditional ] = "顯示詢問(~P)";
@@ -336,7 +344,8 @@ TabPage RID_SFXPAGE_SAVE
         Text[ greek ] = "�� �~������ ������������";
         Text[ korean ] = "저장할 때 확인(~P)";
         Text[ turkish ] = "~�nce sor";
-        Text[ catalan ] = "Con c~onsulta";
+        Text[ catalan ] = "~Pregunta per desar";
+        Text[ thai ] = "~ข้อความรอรับค่าเพื่อบันทึก";
     };
 
     CheckBox BTN_NOPRETTYPRINTING
@@ -347,15 +356,15 @@ TabPage RID_SFXPAGE_SAVE
         Text [ english ] = "Size optimization for XML format (no pretty printing)" ;
         Text [ english_us ] = "Size optimization for XML format (no pretty printing)" ;
         Text[ portuguese ] = "Size optimization for XML files (no pretty printing)";
-        Text[ russian ] = "Size optimization for XML files (no pretty printing)";
+        Text[ russian ] = "����������� ������� ��� ������� XML (�������������� ������)";
         Text[ greek ] = "Size optimization for XML files (no pretty printing)";
         Text[ dutch ] = "Grootte van ~XML-bestanden optimaliseren (zonder Pretty Printing)";
         Text[ french ] = "Optimisation de la taille pour le format XML (sans pretty printing)";
         Text[ spanish ] = "Optimar el tama�o del formato XML (sin pretty printing)";
-        Text[ finnish ] = "Size optimization for XML files (no pretty printing)";
+        Text[ finnish ] = "Koon optimointi ~XML-muodolle (ei siistitty� tulostusta)";
         Text[ italian ] = "Ottimizza dimensioni del formato XML (senza stampa elegante)";
         Text[ danish ] = "Optimer st�rrelse for XML-format (uden Pretty Printing)";
-        Text[ swedish ] = "Storleksoptimering f�r XML-format (utan pretty printing)";
+        Text[ swedish ] = "Storleksoptimering f�r XML-format (utan snygg utskrift)";
         Text[ polish ] = "Size optimization for XML files (no pretty printing)";
         Text[ portuguese_brazilian ] = "Size optimization for XML files (no pretty printing)";
         Text[ japanese ] = "XML 形式でサイズを最適化する(pretty printing なし)";
@@ -364,7 +373,8 @@ TabPage RID_SFXPAGE_SAVE
         Text[ chinese_traditional ] = "最佳化 XML 格式的大小(不使用 Pretty Printing 技術)";
         Text[ turkish ] = "Size optimization for XML files (no pretty printing)";
         Text[ arabic ] = "Size optimization for XML files (no pretty printing)";
-        Text[ catalan ] = "Size optimization for XML files (no pretty printing)";
+        Text[ catalan ] = "Optimitzaci� de fitxers XML (menys qualitat)";
+        Text[ thai ] = "Size optimization for XML format (no pretty printing)";
     };
 
     FixedLine GB_RELATIVE
@@ -389,10 +399,11 @@ TabPage RID_SFXPAGE_SAVE
         Text[ chinese_traditional ] = "儲存相對式 URL 地址";
         Text[ arabic ] = "��� ��� URLs ����� ������ ��";
         Text[ greek ] = "������� ���������� ��� URL";
-        Text[ korean ] = "URL 상대적 저장";
+        Text[ korean ] = "URL을 다음 기준으로 저장";
         Text[ turkish ] = "URL g�receli kay�t yeri";
-        Text[ finnish ] = "URL-osoitteen viitelinkin aloituskohta";
-        Text[ catalan ] = "Guardar URLs relativamente";
+        Text[ finnish ] = "URL-osoitteen tallennus suhteessa kohteeseen";
+        Text[ catalan ] = "Desa els URL relatius a";
+        Text[ thai ] = "บันทึก URL สัมพัทธ์กับ";
     };
     CheckBox BTN_RELATIVE_FSYS
     {
@@ -403,7 +414,7 @@ TabPage RID_SFXPAGE_SAVE
         Text [ english_us ] = "~File system" ;
         Text [ dutch ] = "~naar bestandssysteem" ;
         Text [ italian ] = "Al file sys~tem" ;
-        Text [ spanish ] = "En el ~sistema de archivos" ;
+        Text [ spanish ] = "~Sistema de archivos" ;
         Text [ french ] = "~Syst�me de fichiers" ;
         TabStop = TRUE ;
         Text [ swedish ] = "i fils~ystem" ;
@@ -411,7 +422,7 @@ TabPage RID_SFXPAGE_SAVE
         Text [ portuguese_brazilian ] = "im Da~teisystem" ;
         Text [ portuguese ] = "No sistema de ~ficheiros" ;
         Text[ chinese_simplified ] = "在文件系统内(~F)";
-        Text[ russian ] = "� ������� ������";
+        Text[ russian ] = "�������� �������";
         Text[ polish ] = "W systemie pli~k�w";
         Text[ japanese ] = "ファイルシステム(~F)";
         Text[ chinese_traditional ] = "在檔案系統內(~F)";
@@ -421,7 +432,8 @@ TabPage RID_SFXPAGE_SAVE
         Text[ language_user1 ] = "LS 21.12.99 Vorsicht, nicht viel Platz! - - - -";
         Text[ turkish ] = "Dosya sistemi";
         Text[ finnish ] = "~Tiedostoj�rjestelm�";
-        Text[ catalan ] = "En el ~sistema de archivos";
+        Text[ catalan ] = "Sistema de ~fitxers";
+        Text[ thai ] = "ระบบแ~ฟ้ม";
     };
     CheckBox BTN_RELATIVE_INET
     {
@@ -432,14 +444,14 @@ TabPage RID_SFXPAGE_SAVE
         Text [ english_us ] = "~Internet" ;
         Text [ italian ] = "A Internet" ;
         Text [ spanish ] = "En ~Internet" ;
-        Text [ french ] = "Sur l'~Internet" ;
+        Text [ french ] = "Sur ~Internet" ;
         Text [ dutch ] = "~in Internet" ;
         Text [ swedish ] = "p� Int~ernet" ;
         Text [ danish ] = "p� Internettet" ;
         Text [ portuguese_brazilian ] = "im Int~ernet" ;
         Text [ portuguese ] = "Na Int~ernet" ;
         Text[ chinese_simplified ] = "在国际互联网内(~I)";
-        Text[ russian ] = "� ���������";
+        Text[ russian ] = "��������";
         Text[ polish ] = "W I~nternecie";
         Text[ japanese ] = "インターネット(~I)";
         Text[ chinese_traditional ] = "~Internet";
@@ -448,7 +460,8 @@ TabPage RID_SFXPAGE_SAVE
         Text[ korean ] = "인터넷(~I)";
         Text[ turkish ] = "Internet";
         Text[ finnish ] = "~Internet";
-        Text[ catalan ] = "En ~Internet";
+        Text[ catalan ] = "~Internet";
+        Text[ thai ] = "~อินเตอร์เน็ต";
     };
     FixedLine FL_FILTER
     {
@@ -458,7 +471,7 @@ TabPage RID_SFXPAGE_SAVE
         Text [ English ] = "Standard file format" ;
         Text[ english_us ] = "Standard file format";
         Text[ portuguese ] = "Formato de ficheiro padr�o";
-        Text[ russian ] = "����������� ������ �����";
+        Text[ russian ] = "������ ����� �� ���������";
         Text[ greek ] = "������ ����� �������";
         Text[ dutch ] = "Standaardbestandsindeling";
         Text[ french ] = "Format de fichier standard";
@@ -475,7 +488,8 @@ TabPage RID_SFXPAGE_SAVE
         Text[ turkish ] = "Standard file format";
         Text[ arabic ] = "Standard file format";
         Text[ finnish ] = "Vakiotiedostomuoto";
-        Text[ catalan ] = "Standard file format";
+        Text[ catalan ] = "Format de fitxer est�ndard";
+        Text[ thai ] = "รูปแบบแฟ้มมาตรฐาน";
     };
     FixedText FT_APP
     {
@@ -490,7 +504,7 @@ TabPage RID_SFXPAGE_SAVE
         Text[ dutch ] = "~Documenttype";
         Text[ french ] = "Type de document";
         Text[ spanish ] = "Tipo de documento";
-        Text[ finnish ] = "~Asiakirjan tyyppi";
+        Text[ finnish ] = "Asiakir~jan tyyppi";
         Text[ italian ] = "Tipo documento";
         Text[ danish ] = "~Dokumenttype";
         Text[ swedish ] = "~Dokumenttyp";
@@ -502,7 +516,8 @@ TabPage RID_SFXPAGE_SAVE
         Text[ chinese_traditional ] = "文件類型(~O)";
         Text[ turkish ] = "Document";
         Text[ arabic ] = "Document";
-        Text[ catalan ] = "Document";
+        Text[ catalan ] = "Tipus de document";
+        Text[ thai ] = "ชนิดเอ~กสาร";
     };
     FixedText FT_FILTER
     {
@@ -529,7 +544,8 @@ TabPage RID_SFXPAGE_SAVE
         Text[ chinese_traditional ] = "自動另存為(~V)";
         Text[ turkish ] = "File formats";
         Text[ arabic ] = "File formats";
-        Text[ catalan ] = "File formats";
+        Text[ catalan ] = "Sempre desa com a";
+        Text[ thai ] = "บัน~ทึกเป็นเสมอ";
     };
     ListBox LB_APP
     {
@@ -584,8 +600,8 @@ TabPage RID_SFXPAGE_SAVE
     StringList [ russian ] =
     {
             < "��������� ��������" ;     APP_WRITER    ; > ;
-        < "�������� HTML" ;    APP_WRITER_WEB;  > ;
-        < "�������� ����������� �������" ; APP_CALC      ; > ;
+        < "���-��������" ;    APP_WRITER_WEB;  > ;
+        < "����������� �������" ; APP_CALC      ; > ;
         < "�����������" ;     APP_IMPRESS   ; > ;
         < "�������" ;        APP_DRAW      ; > ;
         < "�������" ;           APP_MATH      ; > ;
@@ -631,7 +647,7 @@ TabPage RID_SFXPAGE_SAVE
             < "Tekstiasiakirja" ;     APP_WRITER    ; > ;
         < "HTML-asiakirja" ;    APP_WRITER_WEB;  > ;
         < "Laskentataulukko" ; APP_CALC      ; > ;
-        < "Esitys" ;     APP_IMPRESS   ; > ;
+        < "Diaesitys" ;     APP_IMPRESS   ; > ;
         < "Piirros" ;        APP_DRAW      ; > ;
         < "Kaava" ;           APP_MATH      ; > ;
         };
@@ -647,7 +663,7 @@ TabPage RID_SFXPAGE_SAVE
     StringList [ danish ] =
     {
             < "Tekstdokument" ;     APP_WRITER    ; > ;
-        < "HTML-Dokument" ;    APP_WRITER_WEB;  > ;
+        < "HTML-dokument" ;    APP_WRITER_WEB;  > ;
         < "Regneark" ; APP_CALC      ; > ;
         < "Pr�sentation" ;     APP_IMPRESS   ; > ;
         < "Tegning" ;        APP_DRAW      ; > ;
@@ -691,9 +707,9 @@ TabPage RID_SFXPAGE_SAVE
         };
     StringList [ korean ] =
     {
-            < "글 문서" ;     APP_WRITER    ; > ;
-        < "HTML형 문서" ;    APP_WRITER_WEB;  > ;
-        < "스프레드시트 문서" ; APP_CALC      ; > ;
+            < "텍스트 문서" ;     APP_WRITER    ; > ;
+        < "HTML 문서" ;    APP_WRITER_WEB;  > ;
+        < "스프레드시트" ; APP_CALC      ; > ;
         < "프레젠테이션" ;     APP_IMPRESS   ; > ;
         < "그리기" ;        APP_DRAW      ; > ;
         < "수식" ;           APP_MATH      ; > ;
@@ -741,8 +757,17 @@ TabPage RID_SFXPAGE_SAVE
         < "Full de c�lcul" ; APP_CALC      ; > ;
         < "Presentaci�" ;     APP_IMPRESS   ; > ;
         < "Dibuix" ;        APP_DRAW      ; > ;
-        < "Formel" ;           APP_MATH      ; > ;
+        < "F�rmula" ;           APP_MATH      ; > ;
         };
+    StringList [ thai ] =
+    {
+         < "เอกสารข้อความ" ;     APP_WRITER    ; > ;
+        < "เอกสาร HTML" ;    APP_WRITER_WEB;  > ;
+        < "กระดาษคำนวณ" ; APP_CALC      ; > ;
+        < "การนำเสนอ" ;     APP_IMPRESS   ; > ;
+        < "การวาดรูป" ;        APP_DRAW      ; > ;
+        < "สูตรคำนวณ" ;           APP_MATH      ; > ;
+    };
     };
     ListBox LB_FILTER
     {
@@ -780,24 +805,25 @@ ModalDialog RID_SVXDLG_FILTER_WARNING
         "Should the changes be applied?" ;
         Text[ english_us ] = "Using \"%1\" as default file format may cause information loss.\n";
         Text[ portuguese ] = "Saving with \"%1\" may cause information loss.\n";
-        Text[ russian ] = "Saving with \"%1\" may cause information loss.\n";
+        Text[ russian ] = "������������� \"%1\" � �������� ������� ����� ����� �������� � ������ ����������.\n";
         Text[ greek ] = "Saving with \"%1\" may cause information loss.\n";
         Text[ dutch ] = "Het gebruik van \"%1\" als standaardbestandsindeling kan leiden tot verlies van gegevens.\n";
         Text[ french ] = "L'application de \"%1\" comme format de fichier par d�faut peut entra�ner une perte d'information.\n";
         Text[ spanish ] = "El uso de \"%1\" como formato de archivo predeterminado puede causar una p�rdida de informaci�n.\n";
-        Text[ finnish ] = "Saving with \"%1\" may cause information loss.\n";
+        Text[ finnish ] = "Jos oletustiedostomuotona k�ytet��n muotoa \"%1\", tietoja voi h�vit�.\n";
         Text[ italian ] = "L'uso di \"%1\" quale formato standard pu� causare la perdita di dati.\n";
         Text[ danish ] = "\"Brug af \"\"%1\"\" som standard-filformat kan medf�re datatab.\n\"";
         Text[ swedish ] = "Att anv�nda \"%1\" som standardfilformat kan leda till att information g�r f�rlorad.\n";
         Text[ polish ] = "Saving with \"%1\" may cause information loss.\n";
         Text[ portuguese_brazilian ] = "Saving with \"%1\" may cause information loss.\n";
         Text[ japanese ] = "\"%1\" を標準ファイル書式として使用すると、情報が失われる可能性があります。\n";
-        Text[ korean ] = "\"%1\"로(으로) 저장하면 정보가 손실될 수도 있습니다.\n";
+        Text[ korean ] = "\"%1\"을(를) 기본 파일로 사용하면 정보를 손실할 수 있습니다.\n";
         Text[ chinese_simplified ] = "将 \"%1\" 当成标准文件格式来存盘文件可能会引起数据流失。\n";
         Text[ chinese_traditional ] = "將 \"%1\" 當成標準檔案格式來儲存文件可能會引起資料流失。\n";
         Text[ turkish ] = "Saving with \"%1\" may cause information loss.\n";
         Text[ arabic ] = "Saving with \"%1\" may cause information loss.\n";
-        Text[ catalan ] = "Saving with \"%1\" may cause information loss.\n";
+        Text[ catalan ] = "Desant-lo com a \"%1\" pot provocar p�rdues d'informaci�.\n";
+        Text[ thai ] = "Using \"%1\" as default file format may cause information loss.\n";
     };
 /*    CheckBox CB_DONT_SHOW_AGAIN
     {
@@ -831,3 +857,8 @@ ModalDialog RID_SVXDLG_FILTER_WARNING
 
 
 
+
+
+
+
+
diff --git a/svx/source/options/optspell.src b/svx/source/options/optspell.src
index 449ee2ddef72..3093a50c09b0 100644
--- a/svx/source/options/optspell.src
+++ b/svx/source/options/optspell.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: optspell.src,v $
  *
- *  $Revision: 1.23 $
+ *  $Revision: 1.24 $
  *
- *  last change: $Author: os $ $Date: 2002-12-02 14:00:18 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -78,10 +78,10 @@ TabPage RID_SFXPAGE_SPELL
     Text [ portuguese ] = "Correc��o ortogr�fica" ;
     Text [ finnish ] = "Oikeinkirjoituksen tarkistus" ;
     Text [ danish ] = "Stavekontrol" ;
-    Text [ french ] = "Orthographe" ;
+    Text [ french ] = "V�rification orthographique" ;
     Text [ swedish ] = "R�ttstavning" ;
     Text [ dutch ] = "Spellingcontrole" ;
-    Text [ spanish ] = "Ortograf�a" ;
+    Text [ spanish ] = "Revisi�n ortogr�fica" ;
     Text [ english_us ] = "Spellcheck" ;
     PushButton BTN_BOOK
     {
@@ -93,7 +93,7 @@ TabPage RID_SFXPAGE_SPELL
         Text [ italian ] = "Modifica..." ;
         Text [ portuguese_brazilian ] = "~Editar..." ;
         Text [ portuguese ] = "~Editar..." ;
-        Text [ finnish ] = "~Muokkaa" ;
+        Text [ finnish ] = "~Muokkaa..." ;
         Text [ danish ] = "Rediger..." ;
         Text [ french ] = "�diter..." ;
         Text [ swedish ] = "~Redigera..." ;
@@ -111,7 +111,8 @@ TabPage RID_SFXPAGE_SPELL
         Text[ korean ] = "편집(~E)...";
         Text[ turkish ] = "D�zenle...";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Editar...";
+        Text[ catalan ] = "~Edita...";
+        Text[ thai ] = "แ~ก้ไข...";
     };
     MultiListBox LB_BOOK
     {
@@ -150,7 +151,8 @@ TabPage RID_SFXPAGE_SPELL
         Text[ korean ] = "사전";
         Text[ turkish ] = "S�zl�kler";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Diccionarios";
+        Text[ catalan ] = "Diccionaris";
+        Text[ thai ] = "พจนานุกรม";
     };
     CheckBox BTN_CAPS
     {
@@ -179,10 +181,11 @@ TabPage RID_SFXPAGE_SPELL
         Text[ chinese_traditional ] = "大寫字(~C)";
         Text[ arabic ] = "������� �������� ����� �����";
         Text[ greek ] = "������ �� �������� ��������";
-        Text[ korean ] = "대문자로 쓰인 단어(~C)";
+        Text[ korean ] = "대문자로 사용된 단어(~C)";
         Text[ turkish ] = "B�y�k harfli s�zc�kler";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Palabras en may�scula";
+        Text[ catalan ] = "~Paraules en maj�scula";
+        Text[ thai ] = "คำที่ใช้~ตัวพิมพ์ใหญ่";
     };
     CheckBox BTN_NUMS
     {
@@ -196,11 +199,11 @@ TabPage RID_SFXPAGE_SPELL
         Text [ italian ] = "Parole con ~numeri " ;
         Text [ portuguese_brazilian ] = "~Palavras com n?eros " ;
         Text [ portuguese ] = "~Palavras com n�meros " ;
-        Text [ finnish ] = "~Numeroita sis?lt?v?t sanat" ;
+        Text [ finnish ] = "~Numeroita sis�lt�v�t sanat " ;
         Text [ danish ] = "Ord med tal " ;
         Text [ french ] = "les mots comportant des ~chiffres  " ;
         Text [ swedish ] = "Ord med s~iffror  " ;
-        Text [ dutch ] = "~Woorden met cijfers  " ;
+        Text [ dutch ] = "~Woorden met cijfers" ;
         Text [ spanish ] = "P~alabras con n�meros  " ;
         Text [ english_us ] = "~Words with numbers " ;
         TabStop = TRUE ;
@@ -211,10 +214,11 @@ TabPage RID_SFXPAGE_SPELL
         Text[ chinese_traditional ] = "含有數字的詞(~W)";
         Text[ arabic ] = "������� ���� ����� ��� ����� ";
         Text[ greek ] = "������ �� �������� ";
-        Text[ korean ] = "숫자가 있는 단어 (~W)";
+        Text[ korean ] = "숫자가 포함된 단어 (~W)";
         Text[ turkish ] = "Rakaml� s�zc�kler ";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "P~alabras con n�meros  ";
+        Text[ catalan ] = "~Paraules amb nombres ";
+        Text[ thai ] = "~คำที่มีตัวเลข ";
     };
     CheckBox BTN_UPLOW
     {
@@ -228,25 +232,26 @@ TabPage RID_SFXPAGE_SPELL
         Text [ italian ] = "Mai~uscole e minuscole " ;
         Text [ portuguese_brazilian ] = "~Caixa alta e baixa " ;
         Text [ portuguese ] = "~Mai�sculas & Min�sculas " ;
-        Text [ finnish ] = "~Kirjainkoon erottelu" ;
+        Text [ finnish ] = "~Kirjainkoon erottelu " ;
         Text [ danish ] = "Store og sm� bogstaver " ;
         Text [ french ] = "la ~casse  " ;
         Text [ swedish ] = "Versal~k�nslig " ;
-        Text [ dutch ] = "~Hoofd-/kleine letters belangrijk " ;
+        Text [ dutch ] = "~Hoofdletters/kleine letters " ;
         Text [ spanish ] = "~May�sculas y min�sculas  " ;
         Text [ english_us ] = "~Case sensitive " ;
         TabStop = TRUE ;
         Text[ chinese_simplified ] = "字母大小写 (~C)";
         Text[ russian ] = "��������� ������� ";
         Text[ polish ] = "Wielkie i ma�e litery ";
-        Text[ japanese ] = "大文字/小文字を区別 (~C)";
+        Text[ japanese ] = "大文字と小文字を区別する(~C)";
         Text[ chinese_traditional ] = "字母大小寫(~C)";
         Text[ arabic ] = "������� ����� ����� �� ����� ";
         Text[ greek ] = "����-�������� ";
         Text[ korean ] = "대문자와 소문자 (~C)";
         Text[ turkish ] = "B�y�k/k���k yaz�m ";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~May�sculas y min�sculas  ";
+        Text[ catalan ] = "~Maj�scules i min�scules  ";
+        Text[ thai ] = "~ตรงตามตัวพิมพ์ใหญ่-เล็ก ";
     };
     FixedLine GB_AUDIT
     {
@@ -270,17 +275,18 @@ TabPage RID_SFXPAGE_SPELL
         Text[ chinese_simplified ] = "检查";
         Text[ russian ] = "���������";
         Text[ polish ] = "Sprawd�";
-        Text[ japanese ] = "ｽﾍﾟﾙﾁｪｯｸ";
+        Text[ japanese ] = "スペルチェック";
         Text[ chinese_traditional ] = "檢查";
         Text[ arabic ] = "�������";
         Text[ greek ] = "�������";
         Text[ korean ] = "검사";
         Text[ turkish ] = "Denetim";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Revisar";
+        Text[ catalan ] = "Comprova";
+        Text[ thai ] = "ตรวจสอบ";
     };
     Text[ chinese_simplified ] = "拼写检查";
-    Text[ russian ] = "������������";
+    Text[ russian ] = "�������� ����������";
     Text[ polish ] = "Pisownia";
     Text[ japanese ] = "文章校正";
     Text[ chinese_traditional ] = "拼寫檢查";
@@ -289,7 +295,8 @@ TabPage RID_SFXPAGE_SPELL
     Text[ korean ] = "맞춤법 검사";
     Text[ turkish ] = "Yaz�m k�lavuzu";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Ortograf�a";
+    Text[ catalan ] = "Ortografia";
+    Text[ thai ] = "ตรวจสอบการสะกด";
 };
  // ********************************************************************** EOF
 
@@ -301,3 +308,5 @@ TabPage RID_SFXPAGE_SPELL
 
 
 
+
+
diff --git a/svx/source/outliner/outliner.cxx b/svx/source/outliner/outliner.cxx
index fc53398f60a2..92f6ac9db209 100644
--- a/svx/source/outliner/outliner.cxx
+++ b/svx/source/outliner/outliner.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: outliner.cxx,v $
  *
- *  $Revision: 1.50 $
+ *  $Revision: 1.51 $
  *
- *  last change: $Author: mt $ $Date: 2002-10-07 14:11:21 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -885,7 +885,7 @@ void Outliner::ImplInitDepth( USHORT nPara, USHORT nDepth, BOOL bCreateUndo, BOO
     }
 }
 
-void Outliner::SetParaAttribs( ULONG nPara, const SfxItemSet& rSet )
+void Outliner::SetParaAttribs( ULONG nPara, const SfxItemSet& rSet, bool bApiCall /* = false */ )
 {
     DBG_CHKTHIS(Outliner,0);
 
@@ -901,7 +901,7 @@ void Outliner::SetParaAttribs( ULONG nPara, const SfxItemSet& rSet )
 
         pEditEngine->SetParaAttribs( (USHORT)nPara, rSet );
 
-        if ( bLRSpaceChanged )
+        if ( !bApiCall && bLRSpaceChanged )
         {
             const SvxNumBulletItem& rNumBullet = (const SvxNumBulletItem&)pEditEngine->GetParaAttrib( (USHORT)nPara, EE_PARA_NUMBULLET );
             Paragraph* pPara = pParaList->GetParagraph( nPara );
@@ -1059,21 +1059,27 @@ void Outliner::PaintBullet( USHORT nPara, const Point& rStartPos,
             if( pFmt->GetNumberingType() != SVX_NUM_BITMAP )
             {
                 Font aBulletFont( ImpCalcBulletFont( nPara ) );
+                // #2338# Use base line
+                BOOL bSymbol = pFmt->GetNumberingType() == SVX_NUM_CHAR_SPECIAL;
+                aBulletFont.SetAlign( bSymbol ? ALIGN_BOTTOM : ALIGN_BASELINE );
                 Font aOldFont = pOutDev->GetFont();
                 pOutDev->SetFont( aBulletFont );
 
+                ParagraphInfos  aParaInfos = pEditEngine->GetParagraphInfos( nPara );
                 Point aTextPos;
                 if ( !bVertical )
                 {
-                    aTextPos.Y() = rStartPos.Y() + aBulletArea.Bottom();
+//                  aTextPos.Y() = rStartPos.Y() + aBulletArea.Bottom();
+                    aTextPos.Y() = rStartPos.Y() + ( bSymbol ? aBulletArea.Bottom() : aParaInfos.nFirstLineMaxAscent );
                     if ( !bRightToLeftPara )
                         aTextPos.X() = rStartPos.X() + aBulletArea.Left();
                     else
-                        aTextPos.X() = rStartPos.X() + GetPaperSize().Width() - aBulletArea.Right();
+                        aTextPos.X() = rStartPos.X() + GetPaperSize().Width() - aBulletArea.Left();
                 }
                 else
                 {
-                    aTextPos.X() = rStartPos.X() - aBulletArea.Bottom();
+//                  aTextPos.X() = rStartPos.X() - aBulletArea.Bottom();
+                    aTextPos.X() = rStartPos.X() - ( bSymbol ? aBulletArea.Bottom() : aParaInfos.nFirstLineMaxAscent );
                     aTextPos.Y() = rStartPos.Y() + aBulletArea.Left();
                 }
 
@@ -1100,6 +1106,13 @@ void Outliner::PaintBullet( USHORT nPara, const Point& rStartPos,
                         pOutDev->SetFont( aRotatedFont );
                     }
 
+                    // #105803# VCL will care for brackets and so on...
+                    ULONG nLayoutMode = pOutDev->GetLayoutMode();
+                    nLayoutMode &= ~(TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_COMPLEX_DISABLED|TEXT_LAYOUT_BIDI_STRONG);
+                    if ( bRightToLeftPara )
+                        nLayoutMode |= TEXT_LAYOUT_BIDI_RTL;
+                    pOutDev->SetLayoutMode( nLayoutMode );
+
                     pOutDev->DrawText( aTextPos, pPara->GetText() );
 
                     // HACK #47227#
@@ -1121,7 +1134,7 @@ void Outliner::PaintBullet( USHORT nPara, const Point& rStartPos,
                         // USHORT nScriptType = GetScriptTypeOfLanguage( eLang );
                         Font aNewFont( OutputDevice::GetDefaultFont( DEFAULTFONT_SANS_UNICODE, eLang, 0 ) );
                         aNewFont.SetSize( aFontSz );
-                        aNewFont.SetAlign( ALIGN_BOTTOM );
+                        aNewFont.SetAlign( aBulletFont.GetAlign() );
                         aNewFont.SetVertical( bVertical );
                         aNewFont.SetOrientation( bVertical ? 2700 : 0 );
                         aNewFont.SetColor( aBulletFont.GetColor() );
@@ -1811,6 +1824,9 @@ void Outliner::StyleSheetChanged( SfxStyleSheet* pStyle )
         {
             ImplCheckNumBulletItem( nPara );
             ImplCalcBulletText( nPara, FALSE, FALSE );
+            // #97333# EditEngine formats changed paragraphs before calling this method,
+            // so they are not reformatted now and use wrong bullet indent
+            pEditEngine->QuickMarkInvalid( ESelection( nPara, 0, nPara, 0 ) );
         }
     }
 }
diff --git a/svx/source/outliner/outliner.src b/svx/source/outliner/outliner.src
index 8731f10db6d8..06ab4a3c653a 100644
--- a/svx/source/outliner/outliner.src
+++ b/svx/source/outliner/outliner.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: outliner.src,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: kz $ $Date: 2001-07-13 20:32:17 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,19 +75,20 @@ String RID_OUTLUNDO_HEIGHT
     TEXT [ dutch ] = "Verplaatsen" ;
     TEXT [ spanish ] = "Desplazar" ;
     TEXT [ english_us ] = "Move" ;
-    TEXT[ chinese_simplified ] = "�ƶ�";
+    TEXT[ chinese_simplified ] = "移动";
     TEXT[ russian ] = "�����������";
     TEXT[ polish ] = "Przesu�";
-    TEXT[ japanese ] = "�ړ�";
-    TEXT[ chinese_traditional ] = "����";
+    TEXT[ japanese ] = "移動";
+    TEXT[ chinese_traditional ] = "移動";
     TEXT[ arabic ] = "�����";
     TEXT[ dutch ] = "Verplaatsen";
-    TEXT[ chinese_simplified ] = "�ƶ�";
+    TEXT[ chinese_simplified ] = "移动";
     TEXT[ greek ] = "����������";
-    TEXT[ korean ] = "�̵�";
+    TEXT[ korean ] = "이동";
     TEXT[ turkish ] = "Ta��";
     TEXT[ language_user1 ] = " ";
-    TEXT[ catalan ] = "Desplazar";
+    TEXT[ catalan ] = "Mou";
+    TEXT[ thai ] = "ย้าย";
 };
 String RID_OUTLUNDO_DEPTH
 {
@@ -99,25 +100,26 @@ String RID_OUTLUNDO_DEPTH
     Text [ italian ] = "Rientra" ;
     Text [ spanish ] = "Sangr�a" ;
     Text [ french ] = "Mettre en retrait" ;
-    Text [ dutch ] = "Inspringen" ;
+    Text [ dutch ] = "Inspringing" ;
     Text [ swedish ] = "Dra in" ;
     Text [ danish ] = "Indryk" ;
     Text [ portuguese ] = "Avan�ar" ;
     Text [ portuguese_brazilian ] = "Einr?ken" ;
-    Text[ chinese_simplified ] = "����";
-    Text[ russian ] = "�����";
-    Text[ polish ] = "Wysuni�cie";
-    Text[ japanese ] = "������";
-    Text[ chinese_traditional ] = "�Y��";
+    Text[ chinese_simplified ] = "缩进";
+    Text[ russian ] = "������";
+    Text[ polish ] = "Wci�cie";
+    Text[ japanese ] = "インデント";
+    Text[ chinese_traditional ] = "縮排";
     Text[ arabic ] = "�����";
-    Text[ dutch ] = "Inspringen";
-    Text[ chinese_simplified ] = "����";
+    Text[ dutch ] = "Inspringing";
+    Text[ chinese_simplified ] = "缩进";
     Text[ greek ] = "�����";
-    Text[ korean ] = "�鿩 ����";
+    Text[ korean ] = "들여쓰기";
     Text[ turkish ] = "Girinti";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Sangr�a";
+    Text[ catalan ] = "Sagnat";
     Text[ finnish ] = "Sisenn�";
+    Text[ thai ] = "ระยะเยื้อง";
 };
 String RID_OUTLUNDO_EXPAND
 {
@@ -129,25 +131,26 @@ String RID_OUTLUNDO_EXPAND
     Text [ italian ] = "Mostra i sottoparagrafi" ;
     Text [ spanish ] = "Mostrar subp�rrafos" ;
     Text [ french ] = "Afficher les sous-paragraphes" ;
-    Text [ dutch ] = "Subalinea�s weergeven" ;
+    Text [ dutch ] = "Subalinea's weergeven" ;
     Text [ swedish ] = "Visa understycken" ;
     Text [ danish ] = "Vis underafsnit" ;
     Text [ portuguese ] = "Mostrar subpar�grafos" ;
     Text [ portuguese_brazilian ] = "Unterabs?tze zeigen" ;
-    Text[ chinese_simplified ] = "��ʾ�ֶ���";
-    Text[ russian ] = "���������� ���������";
+    Text[ chinese_simplified ] = "显示分段落";
+    Text[ russian ] = "���������� ���������";
     Text[ polish ] = "Poka� akapity podrz�dne";
-    Text[ japanese ] = "���ʒi���̕\\��";
-    Text[ chinese_traditional ] = "��ܤ��q��";
+    Text[ japanese ] = "下位段落の表示";
+    Text[ chinese_traditional ] = "顯示分段落";
     Text[ arabic ] = "����� ������� �������";
-    Text[ dutch ] = "Subalinea�s weergeven";
-    Text[ chinese_simplified ] = "��ʾ�ֶ���";
+    Text[ dutch ] = "Subalinea's weergeven";
+    Text[ chinese_simplified ] = "显示分段落";
     Text[ greek ] = "�������� �������������";
-    Text[ korean ] = "�δܶ� ǥ��";
+    Text[ korean ] = "하위 단락 표시";
     Text[ turkish ] = "Alt b�l�mleri g�ster";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Mostrar subp�rrafos";
+    Text[ catalan ] = "Mostra els subpunts";
     Text[ finnish ] = "N�yt� alipisteet";
+    Text[ thai ] = "แสดงจุดย่อย";
 };
 String RID_OUTLUNDO_COLLAPSE
 {
@@ -159,25 +162,26 @@ String RID_OUTLUNDO_COLLAPSE
     Text [ italian ] = "Nascondi i sottoparagrafi" ;
     Text [ spanish ] = "Ocultar subp�rrafos" ;
     Text [ french ] = "Masquer les sous-paragraphes" ;
-    Text [ dutch ] = "Subalinea�s verbergen" ;
+    Text [ dutch ] = "Subalinea's verbergen" ;
     Text [ swedish ] = "D�lj understycken" ;
     Text [ danish ] = "Skjul underafsnit" ;
     Text [ portuguese ] = "Ocultar subpar�grafos" ;
     Text [ portuguese_brazilian ] = "Unterabs?tze verstecken" ;
-    Text[ chinese_simplified ] = "����ֶ���";
+    Text[ chinese_simplified ] = "隐入分段落";
     Text[ russian ] = "�������� ���������";
     Text[ polish ] = "Zwi� akapity podrz�dne";
-    Text[ japanese ] = "���ʒi���̔�\\��";
-    Text[ chinese_traditional ] = "���J���q��";
+    Text[ japanese ] = "下位段落の非表示";
+    Text[ chinese_traditional ] = "隱入分段落";
     Text[ arabic ] = "������ ������� �������";
-    Text[ dutch ] = "Subalinea�s verbergen";
-    Text[ chinese_simplified ] = "����ֶ���";
+    Text[ dutch ] = "Subalinea's verbergen";
+    Text[ chinese_simplified ] = "隐入分段落";
     Text[ greek ] = "�������� �������������";
-    Text[ korean ] = "�δܶ� �����";
+    Text[ korean ] = "하위 단락 숨기기";
     Text[ turkish ] = "Alt b�l�mleri gizle";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Ocultar subp�rrafos";
+    Text[ catalan ] = "Redueix";
     Text[ finnish ] = "Pienenn�";
+    Text[ thai ] = "ยุบ";
 };
 String RID_OUTLUNDO_ATTR
 {
@@ -194,19 +198,20 @@ String RID_OUTLUNDO_ATTR
     TEXT [ dutch ] = "Attributen toepassen" ;
     TEXT [ spanish ] = "Aplicar atributos" ;
     TEXT [ english_us ] = "Apply attributes" ;
-    TEXT[ chinese_simplified ] = "ʹ������";
+    TEXT[ chinese_simplified ] = "使用属性";
     TEXT[ russian ] = "��������� ��������";
     TEXT[ polish ] = "Zastosuj atrybuty";
-    TEXT[ japanese ] = "�����̓K�p";
-    TEXT[ chinese_traditional ] = "�ϥ��ݩ�";
+    TEXT[ japanese ] = "属性の適用";
+    TEXT[ chinese_traditional ] = "使用屬性";
     TEXT[ arabic ] = "������� ������";
     TEXT[ dutch ] = "Attributen toepassen";
-    TEXT[ chinese_simplified ] = "ʹ������";
+    TEXT[ chinese_simplified ] = "使用属性";
     TEXT[ greek ] = "�������� ���������";
-    TEXT[ korean ] = "�Ӽ� ����";
+    TEXT[ korean ] = "속성 적용";
     TEXT[ turkish ] = "�znitelikleri uygula";
     TEXT[ language_user1 ] = " ";
-    TEXT[ catalan ] = "Aplicar atributos";
+    TEXT[ catalan ] = "Aplica els atributs";
+    TEXT[ thai ] = "ใช้คุณลักษณะ";
 };
 String RID_OUTLUNDO_INSERT
 {
@@ -225,19 +230,30 @@ String RID_OUTLUNDO_INSERT
     TEXT [ dutch ] = "Invoegen" ;
     TEXT [ spanish ] = "Insertar" ;
     TEXT [ english_us ] = "Insert" ;
-    TEXT[ chinese_simplified ] = "����";
+    TEXT[ chinese_simplified ] = "插入";
     TEXT[ russian ] = "��������";
     TEXT[ polish ] = "Wstaw";
-    TEXT[ japanese ] = "�}��";
-    TEXT[ chinese_traditional ] = "���J";
+    TEXT[ japanese ] = "挿入";
+    TEXT[ chinese_traditional ] = "插入";
     TEXT[ arabic ] = "�����";
     TEXT[ dutch ] = "Invoegen";
-    TEXT[ chinese_simplified ] = "����";
+    TEXT[ chinese_simplified ] = "插入";
     TEXT[ greek ] = "��������";
-    TEXT[ korean ] = "����";
+    TEXT[ korean ] = "삽입";
     TEXT[ turkish ] = "Ekle";
     TEXT[ language_user1 ] = " ";
-    TEXT[ catalan ] = "Insertar";
+    TEXT[ catalan ] = "Insereix";
+    TEXT[ thai ] = "แทรก";
 };
 
 
+
+
+
+
+
+
+
+
+
+
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index 32db05f2499d..3da8ef654b17 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: stbctrls.src,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: kz $ $Date: 2002-11-27 16:28:13 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -343,7 +343,7 @@ Menu RID_SVXMNU_ZOOM
             Text[ dutch ] = "Hele pagina";
             Text[ chinese_simplified ] = "整页";
             Text[ greek ] = "�������� ������";
-            Text[ korean ] = "페이지 전체";
+            Text[ korean ] = "전체 페이지";
             Text[ turkish ] = "T�m sayfa";
             Text[ language_user1 ] = " ";
             Text[ catalan ] = "Tota la p�gina";
@@ -380,7 +380,7 @@ Menu RID_SVXMNU_PSZ_FUNC
             Text[ dutch ] = "Gemiddelde";
             Text[ chinese_simplified ] = "平均值";
             Text[ greek ] = "���� ����";
-            Text[ korean ] = "중간값";
+            Text[ korean ] = "평균값";
             Text[ turkish ] = "Ortalama";
             Text[ language_user1 ] = " ";
             Text[ catalan ] = "Mitjana";
@@ -603,3 +603,8 @@ Image RID_SVXBMP_SIZE
     };
 };
 
+
+
+
+
+
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 7da05138f2d7..b6be3e369f5f 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdattr.cxx,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: cl $ $Date: 2002-10-09 15:47:42 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -384,7 +384,15 @@ void SdrItemPool::Ctor(SfxItemPool* pMaster, USHORT nAttrStart, USHORT nAttrEnd)
     ppPoolDefaults[ SDRATTR_3DOBJ_TEXTURE_MODE - SDRATTR_START ] = new Svx3DTextureModeItem;
     ppPoolDefaults[ SDRATTR_3DOBJ_TEXTURE_FILTER - SDRATTR_START ] = new Svx3DTextureFilterItem;
 
-    for( i = SDRATTR_3DOBJ_RESERVED_01; i <= SDRATTR_3DOBJ_RESERVED_20; i++ )
+    // #107245# Add new items for 3d objects
+    ppPoolDefaults[ SDRATTR_3DOBJ_SMOOTH_NORMALS - SDRATTR_START ] = new Svx3DSmoothNormalsItem;
+    ppPoolDefaults[ SDRATTR_3DOBJ_SMOOTH_LIDS - SDRATTR_START ] = new Svx3DSmoothLidsItem;
+    ppPoolDefaults[ SDRATTR_3DOBJ_CHARACTER_MODE - SDRATTR_START ] = new Svx3DCharacterModeItem;
+    ppPoolDefaults[ SDRATTR_3DOBJ_CLOSE_FRONT - SDRATTR_START ] = new Svx3DCloseFrontItem;
+    ppPoolDefaults[ SDRATTR_3DOBJ_CLOSE_BACK - SDRATTR_START ] = new Svx3DCloseBackItem;
+
+    // #107245# Start with SDRATTR_3DOBJ_RESERVED_06 now
+    for( i = SDRATTR_3DOBJ_RESERVED_06; i <= SDRATTR_3DOBJ_RESERVED_20; i++ )
         ppPoolDefaults[ i - SDRATTR_START ] = new SfxVoidItem( i );
 
     // 3D Scene Attr (28092000 AW)
@@ -499,7 +507,7 @@ SdrItemPool::~SdrItemPool()
         unsigned nBeg=SDRATTR_SHADOW-SDRATTR_START;
         unsigned nEnd=SDRATTR_END-SDRATTR_START;
         for (unsigned i=nBeg; i<=nEnd; i++) {
-            SetRef(*ppPoolDefaults[i],0);
+            SetRefCount(*ppPoolDefaults[i],0);
             delete ppPoolDefaults[i];
             ppPoolDefaults[i]=NULL;
         }
@@ -2133,10 +2141,10 @@ sal_uInt16 SdrAutoShapeAdjustmentItem::GetVersion( sal_uInt16 nFileFormatVersion
 sal_Bool SdrAutoShapeAdjustmentItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 {
     sal_uInt32 i, nCount = GetCount();
-    uno::Sequence< sal_uInt32 > aSequence( nCount );
+    uno::Sequence< sal_Int32 > aSequence( nCount );
     if ( nCount )
     {
-        sal_uInt32* pPtr = aSequence.getArray();
+        sal_Int32* pPtr = aSequence.getArray();
         for ( i = 0; i < nCount; i++ )
             *pPtr++ = GetValue( i ).nValue;
     }
@@ -2146,7 +2154,7 @@ sal_Bool SdrAutoShapeAdjustmentItem::QueryValue( uno::Any& rVal, BYTE nMemberId
 
 sal_Bool SdrAutoShapeAdjustmentItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 {
-    uno::Sequence< sal_uInt32 > aSequence;
+    uno::Sequence< sal_Int32 > aSequence;
     if( !( rVal >>= aSequence ) )
         return sal_False;
 
@@ -2157,7 +2165,7 @@ sal_Bool SdrAutoShapeAdjustmentItem::PutValue( const uno::Any& rVal, BYTE nMembe
     sal_uInt32 i, nCount = aSequence.getLength();
     if ( nCount )
     {
-        const sal_uInt32* pPtr = aSequence.getConstArray();
+        const sal_Int32* pPtr = aSequence.getConstArray();
         for ( i = 0; i < nCount; i++ )
         {
             SdrAutoShapeAdjustmentValue* pItem = new SdrAutoShapeAdjustmentValue;
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index d82fe0c145e4..783902cf4c53 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdcrtv.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: aw $ $Date: 2002-08-02 10:01:29 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1027,6 +1027,20 @@ void SdrCreateView::ShowCreateObj(OutputDevice* pOut, BOOL bFull)
         }
         DrawCreateObj(pOut,bFull);
         aDragStat.SetShown(TRUE);
+
+        // #i3705# set shown state at views
+        if(pOut)
+        {
+            sal_uInt16 nw(aWinList.Find(pOut));
+
+            if(nw < GetWinCount() && SDRVIEWWIN_NOTFOUND != nw)
+            {
+                if(!IsShownXorVisibleWinNum(nw))
+                {
+                    SetShownXorVisible(nw, TRUE);
+                }
+            }
+        }
     }
 }
 
@@ -1035,6 +1049,20 @@ void SdrCreateView::HideCreateObj(OutputDevice* pOut, BOOL bFull)
     if (IsCreateObj() && aDragStat.IsShown()) {
         DrawCreateObj(pOut,bFull);
         aDragStat.SetShown(FALSE);
+
+        // #i3705# clear shown state at views
+        if(pOut)
+        {
+            sal_uInt16 nw(aWinList.Find(pOut));
+
+            if(nw < GetWinCount() && SDRVIEWWIN_NOTFOUND != nw)
+            {
+                if(IsShownXorVisibleWinNum(nw))
+                {
+                    SetShownXorVisible(nw, FALSE);
+                }
+            }
+        }
     }
 }
 
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index cab5b64718e9..7383810a9559 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svddrgmt.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:01:24 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1554,6 +1554,68 @@ void SdrDragCrook::TakeComment(XubString& rStr) const
         rStr += ImpGetResStr(STR_EditWithCopy);
 }
 
+// #96920#
+void ImplAddDragRaster(XPolyPolygon& rPolyPoly, const Rectangle& rRect,
+    sal_uInt32 nHorDiv, sal_uInt32 nVerDiv)
+{
+    const sal_uInt32 nXLen(rRect.GetWidth() / nHorDiv);
+    const sal_uInt32 nYLen(rRect.GetHeight() / nVerDiv);
+
+    sal_Int32 nYPos(rRect.Top());
+    const sal_uInt32 nXLenOneThird(nXLen / 3);
+
+    sal_uInt32 a, b;
+
+    for(a = 0; a <= nVerDiv; a++)
+    {
+        // hor lines
+        for(b = 0; b < nHorDiv; b++)
+        {
+            XPolygon aHorLineSegment(4);
+
+            aHorLineSegment[0] = Point(rRect.Left() + (b * nXLen), nYPos);
+            aHorLineSegment[3] = Point(aHorLineSegment[0].X() + nXLen, nYPos);
+            aHorLineSegment[1] = Point(aHorLineSegment[0].X() + nXLenOneThird, nYPos);
+            aHorLineSegment.SetFlags(1, XPOLY_CONTROL);
+            aHorLineSegment[2] = Point(aHorLineSegment[3].X() - nXLenOneThird, nYPos);
+            aHorLineSegment.SetFlags(2, XPOLY_CONTROL);
+            rPolyPoly.Insert(aHorLineSegment);
+        }
+
+        // increments
+        nYPos += nYLen;
+    }
+
+    sal_Int32 nXPos(rRect.Left());
+    const sal_uInt32 nYLenOneThird(nYLen / 3);
+
+    for(a = 0; a <= nHorDiv; a++)
+    {
+        // ver lines
+        for(b = 0; b < nVerDiv; b++)
+        {
+            XPolygon aVerLineSegment(4);
+
+            aVerLineSegment[0] = Point(nXPos, rRect.Top() + (b * nYLen));
+            aVerLineSegment[3] = Point(nXPos, aVerLineSegment[0].Y() + nYLen);
+            aVerLineSegment[1] = Point(nXPos, aVerLineSegment[0].Y() + nYLenOneThird);
+            aVerLineSegment.SetFlags(1, XPOLY_CONTROL);
+            aVerLineSegment[2] = Point(nXPos, aVerLineSegment[3].Y() - nYLenOneThird);
+            aVerLineSegment.SetFlags(2, XPOLY_CONTROL);
+            rPolyPoly.Insert(aVerLineSegment);
+        }
+
+        // increments
+        nXPos += nXLen;
+    }
+}
+
+// #96920# These defines parametrise the created raster
+// for interactions
+#define DRAG_CROOK_RASTER_MINIMUM   (4)
+#define DRAG_CROOK_RASTER_MAXIMUM   (15)
+#define DRAG_CROOK_RASTER_DISTANCE  (30)
+
 FASTBOOL SdrDragCrook::Beg()
 {
     bContortionAllowed=rView.IsCrookAllowed(FALSE);
@@ -1568,6 +1630,32 @@ FASTBOOL SdrDragCrook::Beg()
         aCenter=aMarkCenter;
         aStart=DragStat().GetStart();
         SetDragPolysSeparated();
+
+        // #96920# Add extended XOR frame raster
+        const sal_uInt16 nPageViewNum(rView.GetPageViewCount());
+        for(sal_uInt16 a(0); a < nPageViewNum; a++)
+        {
+            SdrPageView* pPV = rView.GetPageViewPvNum(a);
+            OutputDevice* pOut = (pPV->GetWinList())[0].GetOutputDevice();
+            Rectangle aPixelSize = pOut->LogicToPixel(aMarkRect);
+
+            sal_uInt32 nHorDiv(aPixelSize.GetWidth() / DRAG_CROOK_RASTER_DISTANCE);
+            sal_uInt32 nVerDiv(aPixelSize.GetHeight() / DRAG_CROOK_RASTER_DISTANCE);
+
+            if(nHorDiv > DRAG_CROOK_RASTER_MAXIMUM)
+                nHorDiv = DRAG_CROOK_RASTER_MAXIMUM;
+            if(nHorDiv < DRAG_CROOK_RASTER_MINIMUM)
+                nHorDiv = DRAG_CROOK_RASTER_MINIMUM;
+
+            if(nVerDiv > DRAG_CROOK_RASTER_MAXIMUM)
+                nVerDiv = DRAG_CROOK_RASTER_MAXIMUM;
+            if(nVerDiv < DRAG_CROOK_RASTER_MINIMUM)
+                nVerDiv = DRAG_CROOK_RASTER_MINIMUM;
+
+            ImplAddDragRaster(pPV->DragPoly0(), aMarkRect, nHorDiv, nVerDiv);
+            pPV->DragPoly() = pPV->DragPoly0();
+        }
+
         Show();
         return TRUE;
     } else {
@@ -1915,6 +2003,32 @@ FASTBOOL SdrDragDistort::Beg()
         aMarkRect=GetMarkedRect();
         aDistortedRect=XPolygon(aMarkRect);
         SetDragPolys();
+
+        // #96920# Add extended XOR frame raster
+        const sal_uInt16 nPageViewNum(rView.GetPageViewCount());
+        for(sal_uInt16 a(0); a < nPageViewNum; a++)
+        {
+            SdrPageView* pPV = rView.GetPageViewPvNum(a);
+            OutputDevice* pOut = (pPV->GetWinList())[0].GetOutputDevice();
+            Rectangle aPixelSize = pOut->LogicToPixel(aMarkRect);
+
+            sal_uInt32 nHorDiv(aPixelSize.GetWidth() / DRAG_CROOK_RASTER_DISTANCE);
+            sal_uInt32 nVerDiv(aPixelSize.GetHeight() / DRAG_CROOK_RASTER_DISTANCE);
+
+            if(nHorDiv > DRAG_CROOK_RASTER_MAXIMUM)
+                nHorDiv = DRAG_CROOK_RASTER_MAXIMUM;
+            if(nHorDiv < DRAG_CROOK_RASTER_MINIMUM)
+                nHorDiv = DRAG_CROOK_RASTER_MINIMUM;
+
+            if(nVerDiv > DRAG_CROOK_RASTER_MAXIMUM)
+                nVerDiv = DRAG_CROOK_RASTER_MAXIMUM;
+            if(nVerDiv < DRAG_CROOK_RASTER_MINIMUM)
+                nVerDiv = DRAG_CROOK_RASTER_MINIMUM;
+
+            ImplAddDragRaster(pPV->DragPoly0(), aMarkRect, nHorDiv, nVerDiv);
+            pPV->DragPoly() = pPV->DragPoly0();
+        }
+
         Show();
         return TRUE;
     } else {
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index e8790c7cf35c..bc77bc9fdb3e 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdedtv1.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: aw $ $Date: 2002-10-09 15:35:51 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -819,8 +819,16 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll)
                 AddUndo(new SdrUndoGeoObj(*pObj));
             }
 
+            // #i8508#
+            // If this is a text object also rescue the OutlinerParaObject since
+            // applying attributes to the object may change text layout when
+            // multiple portions exist with multiple formats. If a OutlinerParaObject
+            // really exists and needs to be rescued is evaluated in the undo
+            // implementation itself.
+            sal_Bool bRescueText(pObj->ISA(SdrTextObj));
+
             // add attribute undo
-            AddUndo(new SdrUndoAttrObj(*pObj,FALSE,bHasEEItems || bPossibleGeomChange));
+            AddUndo(new SdrUndoAttrObj(*pObj,FALSE,bHasEEItems || bPossibleGeomChange || bRescueText));
 
             SdrBroadcastItemChange aItemChange(*pObj);
             if(bReplaceAll)
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 2cca94d414eb..8fab41a97460 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdedxv.cxx,v $
  *
- *  $Revision: 1.28 $
+ *  $Revision: 1.29 $
  *
- *  last change: $Author: aw $ $Date: 2002-11-26 15:48:20 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -130,8 +130,8 @@
 #endif
 
 // #98988#
-#ifndef _SVX_COLORCFG_HXX
-#include "colorcfg.hxx"
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include <svtools/colorcfg.hxx>
 #endif
 
 #define SPOTCOUNT   5
@@ -418,7 +418,10 @@ void SdrObjEditView::ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectang
         pWin->EnableMapMode(FALSE);
 
         PolyPolygon aPolyPoly( 2 );
-        const Hatch aHatch( HATCH_SINGLE, Application::GetSettings().GetStyleSettings().GetWindowTextColor(), 3, 450 );
+
+        svtools::ColorConfig aColorConfig;
+        Color aHatchCol( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor );
+        const Hatch aHatch( HATCH_SINGLE, aHatchCol, 3, 450 );
 
         aPolyPoly.Insert( aOuterPix );
         aPolyPoly.Insert( aPixRect );
@@ -432,12 +435,12 @@ void SdrObjEditView::ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectang
 
 Color SdrObjEditView::ImpGetTextEditBackgroundColor() const
 {
-    svx::ColorConfig aColorConfig;
-    Color aBackground(aColorConfig.GetColorValue(svx::DOCCOLOR).nColor);
+    svtools::ColorConfig aColorConfig;
+    Color aBackground(aColorConfig.GetColorValue(svtools::DOCCOLOR).nColor);
 
     // #98988# test if we are in High contrast mode; if yes, take
     // application background color
-    // #10049# wrong, always use svx::DOCCOLOR as default and use document settings if
+    // #10049# wrong, always use svtools::DOCCOLOR as default and use document settings if
     //         not hc mode
     const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
 
diff --git a/svx/source/svdraw/svdfppt.cxx b/svx/source/svdraw/svdfppt.cxx
index cf6f40b78296..abd176491435 100644
--- a/svx/source/svdraw/svdfppt.cxx
+++ b/svx/source/svdraw/svdfppt.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdfppt.cxx,v $
  *
- *  $Revision: 1.101 $
+ *  $Revision: 1.102 $
  *
- *  last change: $Author: sj $ $Date: 2002-12-10 17:00:26 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,10 +59,6 @@
  *
  ************************************************************************/
 
-#ifndef _COM_SUN_STAR_CONTAINER_XIDENTIFIERCONTAINER_HPP_
-#include <com/sun/star/container/XIdentifierContainer.hpp>
-#endif
-
 #ifndef _SV_SVAPP_HXX
 #include <vcl/svapp.hxx>
 #endif
@@ -246,12 +242,6 @@
 #ifndef _COM_SUN_STAR_DRAWING_XDRAWPAGESUPPLIER_HPP_
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
 #endif
-#ifndef _COM_SUN_STAR_DRAWING_XGLUEPOINTSSUPPLIER_HPP_
-#include <com/sun/star/drawing/XGluePointsSupplier.hpp>
-#endif
-#ifndef _COM_SUN_STAR_DRAWING_GLUEPOINT2_HPP_
-#include <com/sun/star/drawing/GluePoint2.hpp>
-#endif
 #ifndef _COM_SUN_STAR_AWT_SIZE_HPP_
 #include <com/sun/star/awt/Size.hpp>
 #endif
@@ -261,9 +251,6 @@
 #ifndef _SVX_WRITINGMODEITEM_HXX
 #include "writingmodeitem.hxx"
 #endif
-#ifndef _SVX_ESCHEREX_HXX
-#include <escherex.hxx>
-#endif
 #ifndef _SV_PRINT_HXX
 #include <vcl/print.hxx>
 #endif
@@ -564,53 +551,6 @@ SvStream& operator>>( SvStream& rIn, PptColorSchemeAtom& rAtom )
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-SvStream& operator>>( SvStream& rIn, PptConnectorRule& rRule )
-{
-    rIn >> rRule.nRuleId
-        >> rRule.nShapeA
-        >> rRule.nShapeB
-        >> rRule.nShapeC
-        >> rRule.ncptiA
-        >> rRule.ncptiB;
-
-    return rIn;
-}
-
-PptSolverContainer::PptSolverContainer()
-{
-}
-
-PptSolverContainer::~PptSolverContainer()
-{
-    for ( PptConnectorRule* pPtr = (PptConnectorRule*)aCList.First();
-            pPtr; pPtr = (PptConnectorRule*)aCList.Next() )
-        delete pPtr;
-}
-
-SvStream& operator>>( SvStream& rIn, PptSolverContainer& rContainer )
-{
-    DffRecordHeader aHd;
-    rIn >> aHd;
-    if ( aHd.nRecType == DFF_msofbtSolverContainer )
-    {
-        DffRecordHeader aCRule;
-        while ( ( rIn.GetError() == 0 ) && ( rIn.Tell() < aHd.GetRecEndFilePos() ) )
-        {
-            rIn >> aCRule;
-            if ( aCRule.nRecType == DFF_msofbtConnectorRule )
-            {
-                PptConnectorRule* pRule = new PptConnectorRule;
-                rIn >> *pRule;
-                rContainer.aCList.Insert( pRule, LIST_APPEND );
-            }
-            aCRule.SeekToEndOfRecord( rIn );
-        }
-    }
-    return rIn;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
 SvStream& operator>>( SvStream& rIn, PptFontEntityAtom& rAtom )
 {
     DffRecordHeader aHd;
@@ -739,23 +679,6 @@ SvStream& operator>>( SvStream& rIn, PptOEPlaceholderAtom& rAtom )
     return rIn;
 }
 
-PptBackgroundHelper::PptBackgroundHelper() :
-    pBObj           ( NULL ),
-    bIsTemporary    ( sal_True )
-{
-}
-
-void PptBackgroundHelper::SetBackground( sal_Bool _bIsTemporary, SdrObject* pObj )
-{
-    pBObj = pObj;
-    bIsTemporary = _bIsTemporary;
-}
-
-PptBackgroundHelper::~PptBackgroundHelper()
-{
-}
-
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 PptSlidePersistEntry::PptSlidePersistEntry() :
@@ -766,11 +689,12 @@ PptSlidePersistEntry::PptSlidePersistEntry() :
     pSolverContainer    ( NULL ),
     pPresentationObjects( NULL ),
     pStyleSheet         ( NULL ),
+    pBObj               ( NULL ),
+    bBObjIsTemporary    ( sal_True ),
     ePageKind           ( PPT_MASTERPAGE ),
     nDrawingDgId        ( 0xffffffff ),
     nBackgroundOffset   ( 0 )
 {
-    pBackgroundHelper = NULL;
 }
 
 
@@ -997,8 +921,9 @@ void SdrEscherImport::RecolorGraphic( SvStream& rSt, sal_uInt32 nRecLen, Graphic
     }
 }
 
-SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, void* pData, Rectangle& rTextRect, SdrObject* pRet )
+SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, void* pData, Rectangle& rTextRect, SdrObject* pOriginalObj )
 {
+    SdrObject* pRet = pOriginalObj;
     ProcessData& rData = *((ProcessData*)pData);
     PptSlidePersistEntry& rPersistEntry = rData.rPersistEntry;
 
@@ -1165,15 +1090,12 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
             SdrTextVertAdjust eTVA;
             SdrTextHorzAdjust eTHA;
 
+            nTextFlags &= PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_LEFT   | PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_RIGHT
+                        | PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_CENTER | PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_BLOCK;
+
             if ( bVerticalText )
             {
-                if ( nTextFlags & PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_BLOCK )
-                    nTextFlags |= PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_CENTER;
-
-                nTextFlags &= ( PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_LEFT | PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_CENTER
-                              | PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_RIGHT );
-
-                eTVA = SDRTEXTVERTADJUST_TOP;
+                eTVA = SDRTEXTVERTADJUST_BLOCK;
                 eTHA = SDRTEXTHORZADJUST_CENTER;
 
                 // Textverankerung lesen
@@ -1200,7 +1122,6 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
                         eTHA = SDRTEXTHORZADJUST_LEFT;
                     break;
                 }
-
                 // if there is a 100% use of following attributes, the textbox can been aligned also in vertical direction
                 switch ( eTextAnchor )
                 {
@@ -1219,8 +1140,8 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
 
                     default :
                     {
-                        if ( nTextFlags == PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_CENTER )
-                            eTVA = SDRTEXTVERTADJUST_CENTER;
+                        if ( nTextFlags == PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_LEFT )
+                            eTVA = SDRTEXTVERTADJUST_TOP;
                         else if ( nTextFlags == PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_RIGHT )
                             eTVA = SDRTEXTVERTADJUST_BOTTOM;
                     }
@@ -1257,9 +1178,6 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
                         eTVA = SDRTEXTVERTADJUST_BOTTOM;
                     break;
                 }
-                nTextFlags &= PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_LEFT   | PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_RIGHT
-                            | PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_CENTER | PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_BLOCK;
-
                 // if there is a 100% usage of following attributes, the textbox can be aligned also in horizontal direction
                 switch ( eTextAnchor )
                 {
@@ -1476,21 +1394,36 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
         }
         if ( rPersistEntry.pSolverContainer )
         {
-            for ( PptConnectorRule* pPtr = (PptConnectorRule*)rPersistEntry.pSolverContainer->aCList.First();
-                pPtr; pPtr = (PptConnectorRule*)rPersistEntry.pSolverContainer->aCList.Next() )
+            for ( SvxMSDffConnectorRule* pPtr = (SvxMSDffConnectorRule*)rPersistEntry.pSolverContainer->aCList.First();
+                pPtr; pPtr = (SvxMSDffConnectorRule*)rPersistEntry.pSolverContainer->aCList.Next() )
             {
                 if ( rObjData.nShapeId == pPtr->nShapeC )
                     pPtr->pCObj = pRet;
                 else
                 {
+                    SdrObject* pConnectObj = pRet;
+                    if ( pOriginalObj && pRet->ISA( SdrObjGroup ) )
+                    {   /* check if the original object from the escherimport is part of the group object,
+                        if this is the case, we will use the original object to connect to */
+                        SdrObjListIter aIter( *pRet, IM_DEEPWITHGROUPS );
+                        while( aIter.IsMore() )
+                        {
+                            SdrObject* pPartObj = aIter.Next();
+                            if ( pPartObj == pOriginalObj )
+                            {
+                                pConnectObj = pPartObj;
+                                break;
+                            }
+                        }
+                    }
                     if ( rObjData.nShapeId == pPtr->nShapeA )
                     {
-                        pPtr->pAObj = pRet;
+                        pPtr->pAObj = pConnectObj;
                         pPtr->nSpFlagsA = rObjData.nSpFlags;
                     }
                     if ( rObjData.nShapeId == pPtr->nShapeB )
                     {
-                        pPtr->pBObj = pRet;
+                        pPtr->pBObj = pConnectObj;
                         pPtr->nSpFlagsB = rObjData.nSpFlags;
                     }
                 }
@@ -1774,7 +1707,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam ) :
                                     }
                                     if ( SeekToRec( rStCtrl, DFF_msofbtSolverContainer, aPPTDgContainer.GetRecEndFilePos() ) )
                                     {
-                                        pE->pSolverContainer = new PptSolverContainer;
+                                        pE->pSolverContainer = new SvxMSDffSolverContainer;
                                         rStCtrl >> *( pE->pSolverContainer );
                                     }
                                     aPPTDgContainer.SeekToBegOfRecord( rStCtrl );
@@ -2905,245 +2838,6 @@ SdrPage* SdrPowerPointImport::MakeBlancPage( sal_Bool bMaster ) const
 }
 
 
-void SdrPowerPointImport::SolveSolver( const PptSolverContainer& rSolver )
-{
-    sal_Int32 i, nCount;
-    for ( i = 0, nCount = rSolver.aCList.Count(); i < nCount; i++ )
-    {
-        PptConnectorRule* pPtr = (PptConnectorRule*)rSolver.aCList.GetObject( i );
-        if ( pPtr->pCObj )
-        {
-            for ( int nN = 0; nN < 2; nN++ )
-            {
-                SdrObject*  pO;
-                sal_uInt32  nC, nSpFlags;
-                sal_Bool    bTail;
-                if ( !nN )
-                {
-                    bTail = sal_True;
-                    pO = pPtr->pAObj;
-                    nC = pPtr->ncptiA;
-                    nSpFlags = pPtr->nSpFlagsA;
-                }
-                else
-                {
-                    bTail = sal_False;
-                    pO = pPtr->pBObj;
-                    nC = pPtr->ncptiB;
-                    nSpFlags = pPtr->nSpFlagsB;
-                }
-                if ( pO )
-                {
-                    Any aAny;
-                    GluePoint2 aGluePoint;
-                    Reference< XShape > aXShape( pO->getUnoShape(), UNO_QUERY );
-                    Reference< XShape > aXConnector( pPtr->pCObj->getUnoShape(), UNO_QUERY );
-                    Reference< XGluePointsSupplier > aXGluePointsSupplier;
-                    Reference< XIdentifierContainer > aXGluePointContainer;
-                    try
-                    {
-                        if ( aXShape.is() && aXConnector.is() )
-                        {
-                            aXGluePointsSupplier = Reference< XGluePointsSupplier >( aXShape, UNO_QUERY );
-                            if ( aXGluePointsSupplier.is() )
-                                aXGluePointContainer = Reference< XIdentifierContainer >::query( aXGluePointsSupplier->getGluePoints() );
-                        }
-                        if ( aXGluePointContainer.is() )
-                        {
-                            sal_Int32 nIndex = 4;
-                            sal_Bool bValidGluePoint = sal_False;
-                            UINT32 nInventor = pO->GetObjInventor();
-                            if( nInventor == SdrInventor )
-                            {
-                                UINT32 nObjId = pO->GetObjIdentifier();
-                                if ( nObjId == OBJ_CIRC )
-                                {                           // an ellipse has 8 default points to connect in PowerPoint
-                                    if ( ! ( nC & 1 ) )     // we do only support 4, each second point can be mapped
-                                        nObjId = OBJ_RECT;
-                                    nC >>= 1;               // reducing points to 4
-                                }
-                                switch( nObjId )
-                                {
-                                    case OBJ_GRUP :
-                                    case OBJ_GRAF :
-                                    case OBJ_RECT :
-                                    case OBJ_TEXT :
-                                    case OBJ_PAGE :
-                                    case OBJ_TEXTEXT :
-                                    case OBJ_wegFITTEXT :
-                                    case OBJ_wegFITALLTEXT :
-                                    case OBJ_TITLETEXT :
-                                    case OBJ_OUTLINETEXT :
-                                    {
-                                        if ( nC & 1 )
-                                        {
-                                            if ( nSpFlags & SP_FFLIPH )
-                                                nC ^= 2;    // 1 <-> 3
-                                        }
-                                        else
-                                        {
-                                            if ( nSpFlags & SP_FFLIPV )
-                                                nC ^= 1;    // 0 <-> 2
-                                        }
-                                        switch( nC )
-                                        {
-                                            case 0 :
-                                                nIndex = 0; // SDRVERTALIGN_TOP;
-                                            break;
-                                            case 1 :
-                                                nIndex = 3; // SDRHORZALIGN_RIGHT;
-                                            break;
-                                            case 2 :
-                                                nIndex = 2; // SDRVERTALIGN_BOTTOM;
-                                            break;
-                                            case 3 :
-                                                nIndex = 1; // SDRHORZALIGN_LEFT;
-                                            break;
-                                        }
-                                        if ( nIndex <= 3 )
-                                            bValidGluePoint = sal_True;
-                                    }
-                                    break;
-
-                                    case OBJ_CIRC :
-                                    {
-                                        aGluePoint.IsRelative = sal_True;
-                                        if ( nSpFlags & SP_FFLIPH )
-                                            nC ^= 3;    // 0 <-> 3, 1 <-> 2
-                                        if ( nSpFlags & SP_FFLIPV )
-                                            nC ^= 1;    // 0 <-> 1, 2 <-> 3
-                                        switch ( nC )
-                                        {
-                                            case 0 :
-                                            {
-                                                aGluePoint.Escape = EscapeDirection_UP;
-                                                aGluePoint.Position.X = 1464;
-                                                aGluePoint.Position.Y = 1464;
-                                            }
-                                            break;
-                                            case 1 :
-                                            {
-                                                aGluePoint.Escape = EscapeDirection_DOWN;
-                                                aGluePoint.Position.X = 1464;
-                                                aGluePoint.Position.Y = 10000 - 1464;
-                                            }
-                                            break;
-                                            case 2 :
-                                            {
-                                                aGluePoint.Escape = EscapeDirection_DOWN;
-                                                aGluePoint.Position.X = 10000 - 1464;
-                                                aGluePoint.Position.Y = 10000 - 1464;
-                                            }
-                                            break;
-                                            case 3 :
-                                            {
-                                                aGluePoint.Escape = EscapeDirection_UP;
-                                                aGluePoint.Position.X = 10000 - 1464;
-                                                aGluePoint.Position.Y = 1464;
-                                            }
-                                            break;
-                                        }
-                                        bValidGluePoint = sal_True;
-                                    }
-                                    break;
-
-                                    case OBJ_POLY :
-                                    case OBJ_PLIN :
-                                    case OBJ_LINE :
-                                    case OBJ_PATHLINE :
-                                    case OBJ_PATHFILL :
-                                    case OBJ_FREELINE :
-                                    case OBJ_FREEFILL :
-                                    case OBJ_SPLNLINE :
-                                    case OBJ_SPLNFILL :
-                                    case OBJ_PATHPOLY :
-                                    case OBJ_PATHPLIN :
-                                    {
-                                        sal_Bool bNotFound = sal_True;
-
-                                        PolyPolygon aPolyPoly( EscherPropertyContainer::GetPolyPolygon( aXShape ) );
-                                        sal_uInt16 i, j, nPolySize = aPolyPoly.Count();
-                                        if ( nPolySize )
-                                        {
-                                            sal_uInt32  nPointCount = 0;
-                                            Rectangle aBoundRect( aPolyPoly.GetBoundRect() );
-                                            if ( aBoundRect.GetWidth() && aBoundRect.GetHeight() )
-                                            {
-                                                for ( i = 0; bNotFound && ( i < nPolySize ); i++ )
-                                                {
-                                                    const Polygon& rPolygon = aPolyPoly.GetObject( i );
-                                                    for ( j = 0; bNotFound && ( j < rPolygon.GetSize() ); j++ )
-                                                    {
-                                                        PolyFlags eFlags = rPolygon.GetFlags( j );
-                                                        if ( eFlags == POLY_NORMAL )
-                                                        {
-                                                            if ( nC == nPointCount )
-                                                            {
-                                                                const Point& rPoint = rPolygon.GetPoint( j );
-                                                                double fXRel = rPoint.X() - aBoundRect.Left();
-                                                                double fYRel = rPoint.Y() - aBoundRect.Top();
-                                                                fXRel = fXRel / aBoundRect.GetWidth() * 10000;
-                                                                fYRel = fYRel / aBoundRect.GetHeight() * 10000;
-                                                                aGluePoint.Position = awt::Point( (sal_Int32)fXRel, (sal_Int32)fYRel );
-                                                                aGluePoint.IsRelative = sal_True;
-                                                                bNotFound = sal_False;
-                                                            }
-                                                            nPointCount++;
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                        if ( !bNotFound )
-                                        {
-                                            bValidGluePoint = sal_True;
-                                        }
-                                    }
-                                    break;
-                                }
-                                if ( bValidGluePoint )
-                                {
-                                    Reference< XPropertySet > xPropSet( aXConnector, UNO_QUERY );
-                                    if ( xPropSet.is() )
-                                    {
-                                        if ( nIndex > 3 )
-                                        {
-                                            aAny <<= aGluePoint;
-                                            nIndex = aXGluePointContainer->insert( aAny );
-                                        }
-                                        if ( nN )
-                                        {
-                                            String aPropName( RTL_CONSTASCII_USTRINGPARAM( "EndShape" ) );
-                                            aAny <<= aXShape;
-                                            SetPropValue( aAny, xPropSet, aPropName, sal_True );
-                                            aPropName  = String( RTL_CONSTASCII_USTRINGPARAM( "EndGluePointIndex" ) );
-                                            aAny <<= nIndex;
-                                            SetPropValue( aAny, xPropSet, aPropName, sal_True );
-                                        }
-                                        else
-                                        {
-                                            String aPropName( RTL_CONSTASCII_USTRINGPARAM( "StartShape" ) );
-                                            aAny <<= aXShape;
-                                            SetPropValue( aAny, xPropSet, aPropName, sal_True );
-                                            aPropName = String( RTL_CONSTASCII_USTRINGPARAM( "StartGluePointIndex" ) );
-                                            aAny <<= nIndex;
-                                            SetPropValue( aAny, xPropSet, aPropName, sal_True );
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    catch ( ::com::sun::star::uno::Exception& )
-                    {
-                        DBG_ERROR("SdrPowerPointImport::SolveSolver - something goes wrong");
-                    }
-                }
-            }
-        }
-    }
-}
-
 // be sure not to import masterpages with this method
 // be sure not to import masterpages with this method
 void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry* pMasterPersist )
@@ -3177,8 +2871,6 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry*
             }
         }
         ProcessData aProcessData( rSlidePersist, (SdPage*)pRet );
-        rSlidePersist.pBackgroundHelper = new PptBackgroundHelper();
-
         while ( ( rStCtrl.GetError() == 0 ) && ( rStCtrl.Tell() < aPageHd.GetRecEndFilePos() ) )
         {
             DffRecordHeader aHd;
@@ -3245,7 +2937,8 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry*
                                                 sal_Bool bTemporary = ( rSlidePersist.aSlideAtom.nFlags & 2 ) != 0;
                                                 sal_uInt32 nPos = rStCtrl.Tell();
                                                 rStCtrl.Seek( pE->nBackgroundOffset );
-                                                rSlidePersist.pBackgroundHelper->SetBackground( bTemporary, ImportObj( rStCtrl, (void*)&aProcessData, NULL ) );
+                                                rSlidePersist.pBObj = ImportObj( rStCtrl, (void*)&aProcessData, NULL );
+                                                rSlidePersist.bBObjIsTemporary = bTemporary;
                                                 rStCtrl.Seek( nPos );
                                             }
                                         }
@@ -3261,7 +2954,8 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry*
                                             if ( nSpFlags & SP_FBACKGROUND )
                                             {
                                                 aEscherObjListHd.SeekToBegOfRecord( rStCtrl );
-                                                rSlidePersist.pBackgroundHelper->SetBackground( sal_False, ImportObj( rStCtrl, (void*)&aProcessData, NULL ) );
+                                                rSlidePersist.pBObj = ImportObj( rStCtrl, (void*)&aProcessData, NULL );
+                                                rSlidePersist.bBObjIsTemporary = sal_False;
                                             }
                                         }
                                     }
@@ -3333,13 +3027,13 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry*
                             List* pList = aProcessData.pBackgroundColoredObjects;
                             if ( pList )
                             {
-                                if ( rSlidePersist.pBackgroundHelper->pBObj )
+                                if ( rSlidePersist.pBObj )
                                 {
                                     void* pPtr;
                                     const SfxPoolItem* pPoolItem = NULL;
 
-                                    SfxItemState eState = rSlidePersist.pBackgroundHelper->
-                                        pBObj->GetItemSet().GetItemState( XATTR_FILLCOLOR, FALSE, &pPoolItem );
+                                    SfxItemState eState = rSlidePersist.pBObj->GetItemSet()
+                                        .GetItemState( XATTR_FILLCOLOR, FALSE, &pPoolItem );
                                     if ( pPoolItem )
                                     {
                                         for ( pPtr = pList->First(); pPtr; pPtr = pList->Next() )
@@ -3351,12 +3045,12 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry*
                                 }
                             }
                         }
-                        if ( rSlidePersist.pBackgroundHelper->pBObj )
+                        if ( rSlidePersist.pBObj )
                         {
-                            if ( rSlidePersist.pBackgroundHelper->bIsTemporary )
-                                delete rSlidePersist.pBackgroundHelper->pBObj;
+                            if ( rSlidePersist.bBObjIsTemporary )
+                                delete rSlidePersist.pBObj;
                             else
-                                pRet->SetBackgroundObj( rSlidePersist.pBackgroundHelper->pBObj );
+                                pRet->SetBackgroundObj( rSlidePersist.pBObj );
                         }
                     }
                 }
@@ -3366,8 +3060,6 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry*
         }
         if ( rSlidePersist.pSolverContainer )
             SolveSolver( *rSlidePersist.pSolverContainer );
-
-        delete rSlidePersist.pBackgroundHelper;
     }
     rStCtrl.Seek( nMerk );
 }
@@ -3388,7 +3080,7 @@ sal_Bool SdrPowerPointImport::IsNoteOrHandout( USHORT nPageNum, PptPageKind ePag
 {
     sal_Bool bNote = eAktPageKind == PPT_NOTEPAGE;
     if ( eAktPageKind == PPT_MASTERPAGE )
-        bNote = nPageNum == 0 || nPageNum == 2;
+        bNote = ( nPageNum & 1 ) == 0;
     return bNote;
 }
 
@@ -7423,8 +7115,8 @@ PPTParagraphObj* PPTTextObj::Next()
 
 const SfxItemSet* PPTTextObj::GetBackground() const
 {
-    if ( mpImplTextObj->mrPersistEntry.pBackgroundHelper->pBObj )
-        return &mpImplTextObj->mrPersistEntry.pBackgroundHelper->pBObj->GetItemSet();
+    if ( mpImplTextObj->mrPersistEntry.pBObj )
+        return &mpImplTextObj->mrPersistEntry.pBObj->GetItemSet();
     else
         return NULL;
 }
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 0a543e19cbc4..a5df2b1db589 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdhdl.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: aw $ $Date: 2002-11-28 12:13:56 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:30 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -660,8 +660,25 @@ B2dIAObject* SdrHdl::CreateMarkerObject(B2dIAOManager* pMan, Point aPos, BitmapC
     sal_Bool bIsHighContrast(rStyleSettings.GetHighContrastMode());
 
     // support bigger sizes
+    sal_Bool bForceBiggerSize(sal_False);
+
+    if(pHdlList->GetHdlSize() > 3)
+    {
+        bForceBiggerSize = sal_True;
+    }
+
     // #101928# ...for high contrast, too.
-    if(pHdlList->GetHdlSize() > 3 || bIsHighContrast)
+    if(!bForceBiggerSize && bIsHighContrast)
+    {
+        // #107925#
+        // ...but not for anchors, else they will not blink when activated
+        if(Anchor != eKindOfMarker && AnchorTR != eKindOfMarker)
+        {
+            bForceBiggerSize = sal_True;
+        }
+    }
+
+    if(bForceBiggerSize)
     {
         eKindOfMarker = GetNextBigger(eKindOfMarker);
     }
diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx
index aab2d59d42d4..61592305adc2 100644
--- a/svx/source/svdraw/svdlayer.cxx
+++ b/svx/source/svdraw/svdlayer.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdlayer.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: aw $ $Date: 2002-03-11 15:34:11 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -567,7 +567,7 @@ SdrLayerID SdrLayerAdmin::GetUniqueLayerID() const
     sal_Int32 j;
     for (j=0; j<GetLayerCount(); j++)
     {
-        aSet.Set(GetLayer((sal_uInt16)j)->GetID());
+        aSet.Set(GetLayer(j)->GetID());
     }
     SdrLayerID i;
     if (!bDown)
@@ -620,7 +620,6 @@ const SdrLayerSet* SdrLayerAdmin::GetLayerSet(const XubString& rName, FASTBOOL b
     UINT16 i(0);
     const SdrLayerSet* pSet = NULL;
 
-    // #97995# <= is WRONG, GPFs at 0
     while(i <= GetLayerSetCount() && !pSet)
     {
         if(rName.Equals(GetLayerSet(i)->GetName()))
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index f4e926014058..2cc8c9a83843 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdmodel.cxx,v $
  *
- *  $Revision: 1.46 $
+ *  $Revision: 1.47 $
  *
- *  last change: $Author: cl $ $Date: 2002-12-11 16:50:05 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,6 +73,36 @@
 #include <tools/string.hxx>
 #endif
 
+#ifndef _SFX_WHITER_HXX
+#include <svtools/whiter.hxx>
+#endif
+
+#ifndef _SVX_XIT_HXX
+#include "xit.hxx"
+#endif
+#ifndef _SVX_XBTMPIT_HXX
+#include "xbtmpit.hxx"
+#endif
+#ifndef _SVX_XLNDSIT_HXX
+#include "xlndsit.hxx"
+#endif
+#ifndef _SVX_XLNEDIT_HXX //autogen
+#include "xlnedit.hxx"
+#endif
+#ifndef _SVX_XFLGRIT_HXX
+#include "xflgrit.hxx"
+#endif
+#ifndef _SVX_XFLFTRIT_HXX
+#include "xflftrit.hxx"
+#endif
+#ifndef _SVX_XFLHTIT_HXX //autogen
+#include "xflhtit.hxx"
+#endif
+#ifndef _SVX_XLNSTIT_HXX
+#include "xlnstit.hxx"
+#endif
+
+
 #include "svditext.hxx"
 #include "editeng.hxx"   // Fuer EditEngine::CreatePool()
 
@@ -2715,6 +2745,66 @@ void SdrModel::setLock( BOOL bLock )
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
+void SdrModel::MigrateItemSet( const SfxItemSet* pSourceSet, SfxItemSet* pDestSet, SdrModel* pNewModel )
+{
+    if( pSourceSet && pDestSet && (pSourceSet != pDestSet ) )
+    {
+        if( pNewModel == NULL )
+            pNewModel = this;
+
+        SfxWhichIter aWhichIter(*pSourceSet);
+        sal_uInt16 nWhich(aWhichIter.FirstWhich());
+        const SfxPoolItem *pPoolItem;
+
+        while(nWhich)
+        {
+            if(SFX_ITEM_SET == pSourceSet->GetItemState(nWhich, FALSE, &pPoolItem))
+            {
+                const SfxPoolItem* pItem = pPoolItem;
+
+                switch( nWhich )
+                {
+                case XATTR_FILLBITMAP:
+                    pItem = ((XFillBitmapItem*)pItem)->checkForUniqueItem( pNewModel );
+                    break;
+                case XATTR_LINEDASH:
+                    pItem = ((XLineDashItem*)pItem)->checkForUniqueItem( pNewModel );
+                    break;
+                case XATTR_LINESTART:
+                    pItem = ((XLineStartItem*)pItem)->checkForUniqueItem( pNewModel );
+                    break;
+                case XATTR_LINEEND:
+                    pItem = ((XLineEndItem*)pItem)->checkForUniqueItem( pNewModel );
+                    break;
+                case XATTR_FILLGRADIENT:
+                    pItem = ((XFillGradientItem*)pItem)->checkForUniqueItem( pNewModel );
+                    break;
+                case XATTR_FILLFLOATTRANSPARENCE:
+                    // #85953# allow all kinds of XFillFloatTransparenceItem to be set
+                    pItem = ((XFillFloatTransparenceItem*)pItem)->checkForUniqueItem( pNewModel );
+                    break;
+                case XATTR_FILLHATCH:
+                    pItem = ((XFillHatchItem*)pItem)->checkForUniqueItem( pNewModel );
+                    break;
+                }
+
+                // set item
+                if( pItem )
+                {
+                    pDestSet->Put(*pItem);
+
+                    // delete item if it was a generated one
+                    if( pItem != pPoolItem)
+                        delete (SfxPoolItem*)pItem;
+                }
+            }
+            nWhich = aWhichIter.NextWhich();
+        }
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
 void SdrModel::SetForbiddenCharsTable( vos::ORef<SvxForbiddenCharactersTable> xForbiddenChars )
 {
     if( mpForbiddenCharactersTable )
@@ -2836,4 +2926,3 @@ SdrHint::SdrHint(const SdrObject& rNewObj, const Rectangle& rRect)
     bNeedRepaint = TRUE;
     eHint = HINT_OBJCHG;
 }
-
diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx
index f6e1916d3c10..015ba61e44a8 100644
--- a/svx/source/svdraw/svdoattr.cxx
+++ b/svx/source/svdraw/svdoattr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdoattr.cxx,v $
  *
- *  $Revision: 1.37 $
+ *  $Revision: 1.38 $
  *
- *  last change: $Author: thb $ $Date: 2002-10-31 12:52:36 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -180,22 +180,10 @@
 #include <xfltrit.hxx>
 #endif
 
-#ifndef _SVX_XFLHTIT_HXX //autogen
-#include <xflhtit.hxx>
-#endif
-
-#ifndef _SVX_XLNEDIT_HXX //autogen
-#include <xlnedit.hxx>
-#endif
-
 #ifndef _SVX_XLNEDCIT_HXX //autogen
 #include <xlnedcit.hxx>
 #endif
 
-#ifndef _SVX_XLNSTIT_HXX //autogen
-#include <xlnstit.hxx>
-#endif
-
 #ifndef _SVX_ADJITEM_HXX
 #include <adjitem.hxx>
 #endif
@@ -204,25 +192,31 @@
 #include "xflbckit.hxx"
 #endif
 
-#ifndef _SVX_XBTMPIT_HXX
-#include "xbtmpit.hxx"
-#endif
-
 #ifndef _XTABLE_HXX
 #include "xtable.hxx"
 #endif
 
+#ifndef _SVX_XBTMPIT_HXX
+#include "xbtmpit.hxx"
+#endif
 #ifndef _SVX_XLNDSIT_HXX
 #include "xlndsit.hxx"
 #endif
-
+#ifndef _SVX_XLNEDIT_HXX //autogen
+#include "xlnedit.hxx"
+#endif
 #ifndef _SVX_XFLGRIT_HXX
 #include "xflgrit.hxx"
 #endif
-
 #ifndef _SVX_XFLFTRIT_HXX
 #include "xflftrit.hxx"
 #endif
+#ifndef _SVX_XFLHTIT_HXX //autogen
+#include "xflhtit.hxx"
+#endif
+#ifndef _SVX_XLNSTIT_HXX
+#include "xlnstit.hxx"
+#endif
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -1286,82 +1280,28 @@ void SdrAttrObj::MigrateItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool,
         // call parent
         SdrObject::MigrateItemPool(pSrcPool, pDestPool, pNewModel);
 
-        // eigene Reaktion
-        if(pDestPool && pSrcPool && (pDestPool != pSrcPool))
+        if(mpObjectItemSet)
         {
-            if(mpObjectItemSet)
-            {
-                if( pNewModel == NULL )
-                    pNewModel = GetModel();
+            // migrate ItemSet to new pool. Scaling is NOT necessary
+            // because this functionality is used by UNDO only. Thus
+            // objects and ItemSets would be moved back to their original
+            // pool before usage.
 
-                // migrate ItemSet to new pool. Scaling is NOT necessary
-                // because this functionality is used by UNDO only. Thus
-                // objects and ItemSets would be moved back to their original
-                // pool before usage.
+            SfxItemSet* pOldSet = mpObjectItemSet;
+            SfxStyleSheet* pStySheet = GetStyleSheet();
 
-                SfxItemSet* pOldSet = mpObjectItemSet;
-                SfxStyleSheet* pStySheet = GetStyleSheet();
+            if(GetStyleSheet())
+                RemoveStyleSheet();
 
-                if(GetStyleSheet())
-                    RemoveStyleSheet();
+            mpObjectItemSet = CreateNewItemSet(*pDestPool);
 
-                mpObjectItemSet = CreateNewItemSet(*pDestPool);
+            GetModel()->MigrateItemSet( pOldSet, mpObjectItemSet, pNewModel );
 
-                SfxWhichIter aWhichIter(*pOldSet);
-                sal_uInt16 nWhich(aWhichIter.FirstWhich());
-                const SfxPoolItem *pPoolItem;
+            // set stylesheet (if used)
+            if(pStySheet)
+                AddStyleSheet(pStySheet, TRUE);
 
-                while(nWhich)
-                {
-                    if(SFX_ITEM_SET == pOldSet->GetItemState(nWhich, FALSE, &pPoolItem))
-                    {
-                        const SfxPoolItem* pItem = pPoolItem;
-
-                        switch( nWhich )
-                        {
-                        case XATTR_FILLBITMAP:
-                            pItem = ((XFillBitmapItem*)pItem)->checkForUniqueItem( pNewModel );
-                            break;
-                        case XATTR_LINEDASH:
-                            pItem = ((XLineDashItem*)pItem)->checkForUniqueItem( pNewModel );
-                            break;
-                        case XATTR_LINESTART:
-                            pItem = ((XLineStartItem*)pItem)->checkForUniqueItem( pNewModel );
-                            break;
-                        case XATTR_LINEEND:
-                            pItem = ((XLineEndItem*)pItem)->checkForUniqueItem( pNewModel );
-                            break;
-                        case XATTR_FILLGRADIENT:
-                            pItem = ((XFillGradientItem*)pItem)->checkForUniqueItem( pNewModel );
-                            break;
-                        case XATTR_FILLFLOATTRANSPARENCE:
-                            // #85953# allow all kinds of XFillFloatTransparenceItem to be set
-                            pItem = ((XFillFloatTransparenceItem*)pItem)->checkForUniqueItem( pNewModel );
-                            break;
-                        case XATTR_FILLHATCH:
-                            pItem = ((XFillHatchItem*)pItem)->checkForUniqueItem( pNewModel );
-                            break;
-                        }
-
-                        // set item
-                        if( pItem )
-                        {
-                            mpObjectItemSet->Put(*pItem);
-
-                            // delete item if it was a generated one
-                            if( pItem != pPoolItem)
-                                delete (SfxPoolItem*)pItem;
-                        }
-                    }
-                    nWhich = aWhichIter.NextWhich();
-                }
-
-                // set stylesheet (if used)
-                if(pStySheet)
-                    AddStyleSheet(pStySheet, TRUE);
-
-                delete pOldSet;
-            }
+            delete pOldSet;
         }
     }
 }
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 3aae87ce6aa1..7315c592b0b6 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdobj.cxx,v $
  *
- *  $Revision: 1.54 $
+ *  $Revision: 1.55 $
  *
- *  last change: $Author: thb $ $Date: 2002-11-08 16:20:44 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -158,6 +158,10 @@
 #include <svtools/graphictools.hxx>
 #endif
 
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include <svtools/colorcfg.hxx>
+#endif
+
 using namespace ::com::sun::star;
 
 // #104018# replace macros above with type-detecting methods
@@ -2095,7 +2099,8 @@ void SdrObject::ImpDrawLineGeometry(   ExtOutputDevice&     rXOut,
     }
     else if( ( nOldDrawMode & DRAWMODE_SETTINGSFILL ) && ( nOldDrawMode & DRAWMODE_SETTINGSLINE ) )
     {
-        aLineColor = Application::GetSettings().GetStyleSettings().GetWindowTextColor();
+        svtools::ColorConfig aColorConfig;
+        aLineColor = Color( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor );
         rXOut.GetOutDev()->SetDrawMode( nOldDrawMode & (~DRAWMODE_SETTINGSFILL) );
     }
 
@@ -2383,25 +2388,26 @@ void SdrObject::ImpDrawLineGeometry(   ExtOutputDevice&     rXOut,
 
                     if( rPoly.GetSize() == 2 )
                     {
-                        const Line  aLine( rXOut.GetOutDev()->LogicToPixel( rPoly[ 0 ] ),
-                                           rXOut.GetOutDev()->LogicToPixel( rPoly[ 1 ] ) );
-
-                        if( aLine.GetLength() > 16000 )
+                        if ( !rXOut.GetOutDev()->GetConnectMetaFile() )
                         {
-                            Point       aPoint;
-                            Rectangle   aOutRect( aPoint, rXOut.GetOutDev()->GetOutputSizePixel() );
-                            Line        aIntersection;
+                            const Line  aLine( rXOut.GetOutDev()->LogicToPixel( rPoly[ 0 ] ),
+                                               rXOut.GetOutDev()->LogicToPixel( rPoly[ 1 ] ) );
 
-                            if( aLine.Intersection( aOutRect, aIntersection ) )
+                            if( aLine.GetLength() > 16000 )
                             {
-                                rXOut.GetOutDev()->DrawLine( rXOut.GetOutDev()->PixelToLogic( aIntersection.GetStart() ),
-                                                             rXOut.GetOutDev()->PixelToLogic( aIntersection.GetEnd() ) );
-                            }
+                                Point       aPoint;
+                                Rectangle   aOutRect( aPoint, rXOut.GetOutDev()->GetOutputSizePixel() );
+                                Line        aIntersection;
 
-                            bDrawn = TRUE;
+                                if( aLine.Intersection( aOutRect, aIntersection ) )
+                                {
+                                    rXOut.GetOutDev()->DrawLine( rXOut.GetOutDev()->PixelToLogic( aIntersection.GetStart() ),
+                                                                 rXOut.GetOutDev()->PixelToLogic( aIntersection.GetEnd() ) );
+                                }
+                                bDrawn = TRUE;
+                            }
                         }
                     }
-
                     if( !bDrawn )
                         rXOut.GetOutDev()->DrawPolyLine( rPoly );
                 }
@@ -4064,6 +4070,14 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, BOOL bForceLineDas
             PolyPolygon3D& rPolyPoly3D = aLineGeom->GetPolyPoly3D();
             PolyPolygon3D& rLinePoly3D = aLineGeom->GetLinePoly3D();
 
+            // #107201#
+            // Since this may in some cases lead to a count of 0 after
+            // the merge i moved the merge to the front.
+            if(rPolyPoly3D.Count())
+            {
+                rPolyPoly3D.Merge(TRUE);
+            }
+
             //  || rLinePoly3D.Count() removed; the conversion is ONLY
             // useful when new closed filled polygons are created
             if(rPolyPoly3D.Count() || (bForceLineDash && rLinePoly3D.Count()))
@@ -4074,7 +4088,8 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, BOOL bForceLineDas
                 SdrPathObj* aLineLinePart = NULL;
                 BOOL bBuildGroup(FALSE);
 
-                rPolyPoly3D.Merge(TRUE);
+                // #107600#
+                sal_Bool bAddOriginalGeometry(sal_False);
 
                 if(rPolyPoly3D.Count())
                 {
@@ -4094,65 +4109,95 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, BOOL bForceLineDas
 
                 if(rLinePoly3D.Count())
                 {
-                    aLineLinePart = new SdrPathObj(OBJ_PATHFILL, rLinePoly3D.GetXPolyPolygon());
+                    // #106907#
+                    // OBJ_PATHLINE is necessary here, not OBJ_PATHFILL. This is intended
+                    // to get a non-filled object. If the poly is closed, the PathObj takes care for
+                    // the correct closed state.
+                    aLineLinePart = new SdrPathObj(OBJ_PATHLINE, rLinePoly3D.GetXPolyPolygon());
+
                     aLineLinePart->SetModel(pRet->GetModel());
 
                     aSet.Put(XLineWidthItem(0L));
                     aSet.Put(XFillStyleItem(XFILL_NONE));
                     aSet.Put(XLineStyleItem(XLINE_SOLID));
 
+                    // #106907#
+                    // it is also necessary to switch off line start and ends here
+                    aSet.Put(XLineStartWidthItem(0));
+                    aSet.Put(XLineEndWidthItem(0));
+
                     aLineLinePart->SetItemSet(aSet);
 
                     if(aLinePolygonPart)
                         bBuildGroup = TRUE;
                 }
 
-                if(!bBuildGroup)
+                // #107600# This test does not depend on !bBuildGroup
+                SdrPathObj* pPath = PTR_CAST(SdrPathObj, pRet);
+                if(pPath && pPath->IsClosed())
                 {
-                    SdrPathObj* pPath = PTR_CAST(SdrPathObj, pRet);
-                    if(pPath && pPath->IsClosed())
+                    if(eOldFillStyle != XFILL_NONE)
                     {
-                        if(eOldFillStyle != XFILL_NONE)
-                            bBuildGroup = TRUE;
+                        // #107600# use new boolean here
+                        bAddOriginalGeometry = sal_True;
                     }
                 }
 
-                if(bBuildGroup)
+                // #107600# ask for new boolean, too.
+                if(bBuildGroup || bAddOriginalGeometry)
                 {
                     SdrObject* pGroup = new SdrObjGroup;
                     pGroup->SetModel(pRet->GetModel());
 
-                    aSet.ClearItem();
-
-                    aSet.Put(pRet->GetItemSet());
-
-                    aSet.Put(XLineStyleItem(XLINE_NONE));
-                    aSet.Put(XLineWidthItem(0L));
+                    if(bAddOriginalGeometry)
+                    {
+                        // #107600# Add a clone of the original geometry.
+                        aSet.ClearItem();
+                        aSet.Put(pRet->GetItemSet());
+                        aSet.Put(XLineStyleItem(XLINE_NONE));
+                        aSet.Put(XLineWidthItem(0L));
 
-                    SdrObject* pClone = pRet->Clone();
-                    pClone->SetModel(pRet->GetModel());
+                        SdrObject* pClone = pRet->Clone();
 
-                    pClone->SetItemSet(aSet);
+                        pClone->SetModel(pRet->GetModel());
+                        pClone->SetItemSet(aSet);
 
-                    pGroup->GetSubList()->NbcInsertObject( pClone );
+                        pGroup->GetSubList()->NbcInsertObject(pClone);
+                    }
 
                     if(aLinePolygonPart)
+                    {
                         pGroup->GetSubList()->NbcInsertObject(aLinePolygonPart);
+                    }
 
                     if(aLineLinePart)
+                    {
                         pGroup->GetSubList()->NbcInsertObject(aLineLinePart);
+                    }
 
                     pRet = pGroup;
+
+                    // #107201#
+                    // be more careful with the state describing bool
+                    bNoChange = FALSE;
                 }
                 else
                 {
                     if(aLinePolygonPart)
+                    {
                         pRet = aLinePolygonPart;
+                        // #107201#
+                        // be more careful with the state describing bool
+                        bNoChange = FALSE;
+                    }
                     else if(aLineLinePart)
+                    {
                         pRet = aLineLinePart;
+                        // #107201#
+                        // be more careful with the state describing bool
+                        bNoChange = FALSE;
+                    }
                 }
-
-                bNoChange = FALSE;
             }
         }
     }
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index c7bdb410ee63..03f4c789be88 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdograf.cxx,v $
  *
- *  $Revision: 1.53 $
+ *  $Revision: 1.54 $
  *
- *  last change: $Author: thb $ $Date: 2002-10-23 11:29:01 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:33 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -317,6 +317,85 @@ const Graphic& SdrGrafObj::GetGraphic() const
 
 // -----------------------------------------------------------------------------
 
+void SdrGrafObj::ImpTransformBitmap( BitmapEx&          rBmpEx,
+                                     const GraphicAttr& rAttr,
+                                     const Size&        rCropLeftTop,
+                                     const Size&        rCropRightBottom,
+                                     const Rectangle&   rCropRect,
+                                     const Size&        rDstSize,
+                                     BOOL               bRotate,
+                                     BOOL               bEnlarge ) const
+{
+    // #104115# Crop the bitmap
+    if( rAttr.IsCropped() )
+    {
+        rBmpEx.Crop( rCropRect );
+
+        // #104115# Negative crop sizes mean: enlarge bitmap and pad
+        if( bEnlarge &&
+            rCropLeftTop.Width() < 0 ||
+            rCropLeftTop.Height() < 0 ||
+            rCropRightBottom.Width() < 0 ||
+            rCropRightBottom.Height() < 0 )
+        {
+            Size aBmpSize( rBmpEx.GetSizePixel() );
+            sal_Int32 nPadLeft( rCropLeftTop.Width() < 0 ? -rCropLeftTop.Width() : 0 );
+            sal_Int32 nPadTop( rCropLeftTop.Height() < 0 ? -rCropLeftTop.Height() : 0 );
+            sal_Int32 nPadTotalWidth( aBmpSize.Width() + nPadLeft + (rCropRightBottom.Width() < 0 ? -rCropRightBottom.Width() : 0) );
+            sal_Int32 nPadTotalHeight( aBmpSize.Height() + nPadTop + (rCropRightBottom.Height() < 0 ? -rCropRightBottom.Height() : 0) );
+
+            BitmapEx aBmpEx2;
+
+            if( rBmpEx.IsTransparent() )
+            {
+                if( rBmpEx.IsAlpha() )
+                    aBmpEx2 = BitmapEx( rBmpEx.GetBitmap(), rBmpEx.GetAlpha() );
+                else
+                    aBmpEx2 = BitmapEx( rBmpEx.GetBitmap(), rBmpEx.GetMask() );
+            }
+            else
+            {
+                // #104115# Generate mask bitmap and init to zero
+                Bitmap aMask( aBmpSize, 1 );
+                aMask.Erase( Color(0,0,0) );
+
+                // #104115# Always generate transparent bitmap, we need the border transparent
+                aBmpEx2 = BitmapEx( rBmpEx.GetBitmap(), aMask );
+
+                // #104115# Add opaque mask to source bitmap, otherwise the destination remains transparent
+                rBmpEx = aBmpEx2;
+            }
+
+            aBmpEx2.SetSizePixel( Size(nPadTotalWidth, nPadTotalHeight) );
+            aBmpEx2.Erase( Color(0xFF,0,0,0) );
+            aBmpEx2.CopyPixel( Rectangle( Point(nPadLeft, nPadTop), aBmpSize ), Rectangle( Point(0, 0), aBmpSize ), &rBmpEx );
+            rBmpEx = aBmpEx2;
+        }
+    }
+
+    const Size  aSizePixel( rBmpEx.GetSizePixel() );
+
+    if( bRotate )
+    {
+        if( aSizePixel.Width() && aSizePixel.Height() && rDstSize.Width() && rDstSize.Height() )
+        {
+            double fSrcWH = (double) aSizePixel.Width() / aSizePixel.Height();
+            double fDstWH = (double) rDstSize.Width() / rDstSize.Height();
+            double fScaleX = 1.0, fScaleY = 1.0;
+
+            // always choose scaling to shrink bitmap
+            if( fSrcWH < fDstWH )
+                fScaleY = aSizePixel.Width() / ( fDstWH * aSizePixel.Height() );
+            else
+                fScaleX = fDstWH * aSizePixel.Height() / aSizePixel.Width();
+
+            rBmpEx.Scale( fScaleX, fScaleY );
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+
 Graphic SdrGrafObj::GetTransformedGraphic( ULONG nTransformFlags ) const
 {
     Graphic         aTransGraphic( GetGraphic() );
@@ -325,8 +404,8 @@ Graphic SdrGrafObj::GetTransformedGraphic( ULONG nTransformFlags ) const
     const Size      aSrcSize( aTransGraphic.GetPrefSize() );
     const Size      aDstSize( GetLogicRect().GetSize() );
     const BOOL      bMirror = ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_MIRROR ) != 0;
-    const BOOL      bRotate = ( ( ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_ROTATE ) != 0 ) &&
-                                ( aGeo.nDrehWink && aGeo.nDrehWink != 18000 ) && ( GRAPHIC_NONE != eType ) && !IsAnimated() );
+    const BOOL      bRotate = ( ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_ROTATE ) != 0 ) &&
+        ( aGeo.nDrehWink && aGeo.nDrehWink != 18000 ) && ( GRAPHIC_NONE != eType );
 
     // #104115# Need cropping info earlier
     ( (SdrGrafObj*) this )->ImpSetAttrToGrafInfo();
@@ -407,8 +486,6 @@ Graphic SdrGrafObj::GetTransformedGraphic( ULONG nTransformFlags ) const
     }
     else if( GRAPHIC_BITMAP == eType )
     {
-        BitmapEx    aBmpEx( aTransGraphic.GetBitmapEx() );
-
         // convert crops to pixel
         aCropLeftTop = Application::GetDefaultDevice()->LogicToPixel( Size( aActAttr.GetLeftCrop(),
                                                                             aActAttr.GetTopCrop() ),
@@ -417,85 +494,87 @@ Graphic SdrGrafObj::GetTransformedGraphic( ULONG nTransformFlags ) const
                                                                                 aActAttr.GetBottomCrop() ),
                                                                           aMap100 );
 
-        // #104115# Crop the bitmap
-        if( aActAttr.IsCropped() )
+        // convert from prefmapmode to pixel
+        const Size aSrcSizePixel( Application::GetDefaultDevice()->LogicToPixel( aSrcSize,
+                                                                                 aMapGraph ) );
+
+        // setup crop rectangle in pixel
+        Rectangle aCropRect( aCropLeftTop.Width(), aCropLeftTop.Height(),
+                             aSrcSize.Width() - aCropRightBottom.Width(),
+                             aSrcSize.Height() - aCropRightBottom.Height() );
+
+        // #105641# Also crop animations
+        if( aTransGraphic.IsAnimated() )
         {
-            Size aSrcSize( aTransGraphic.GetPrefSize() );
+            int nFrame;
+            Animation aAnim( aTransGraphic.GetAnimation() );
 
-            // setup crop rectangle in prefmapmode system
-            Rectangle aCropRect( aCropLeftTop.Width(), aCropLeftTop.Height(),
-                                 aSrcSize.Width() - aCropRightBottom.Width(),
-                                 aSrcSize.Height() - aCropRightBottom.Height() );
+            for( nFrame=0; nFrame<aAnim.Count(); ++nFrame )
+            {
+                AnimationBitmap aAnimBmp( aAnim.Get( nFrame ) );
 
-            // convert from prefmapmode to pixel
-            aCropRect = Application::GetDefaultDevice()->LogicToPixel( aCropRect,
-                                                                       aMapGraph );
+                if( !aCropRect.IsInside( Rectangle(aAnimBmp.aPosPix, aAnimBmp.aSizePix) ) )
+                {
+                    // setup actual cropping (relative to frame position)
+                    Rectangle aCropRectRel( aCropRect );
+                    aCropRectRel.Move( -aAnimBmp.aPosPix.X(),
+                                       -aAnimBmp.aPosPix.Y() );
 
-            aBmpEx.Crop( aCropRect );
+                    // cropping affects this frame, apply it then
+                    // do _not_ apply enlargement, this is done below
+                    ImpTransformBitmap( aAnimBmp.aBmpEx, aActAttr, Size(), Size(),
+                                        aCropRectRel, aDstSize, bRotate, FALSE );
+
+                    aAnim.Replace( aAnimBmp, nFrame );
+                }
+                // else: bitmap completely within crop area,
+                // i.e. nothing is cropped away
+            }
 
-            // #104115# Negative crop sizes mean: enlarge bitmap and pad
+            // now, apply enlargement (if any) through global animation size
             if( aCropLeftTop.Width() < 0 ||
                 aCropLeftTop.Height() < 0 ||
                 aCropRightBottom.Width() < 0 ||
                 aCropRightBottom.Height() < 0 )
             {
-                Size aBmpSize( aBmpEx.GetSizePixel() );
-                sal_Int32 nPadLeft( aCropLeftTop.Width() < 0 ? -aCropLeftTop.Width() : 0 );
-                sal_Int32 nPadTop( aCropLeftTop.Height() < 0 ? -aCropLeftTop.Height() : 0 );
-                sal_Int32 nPadTotalWidth( aBmpSize.Width() + nPadLeft + (aCropRightBottom.Width() < 0 ? -aCropRightBottom.Width() : 0) );
-                sal_Int32 nPadTotalHeight( aBmpSize.Height() + nPadTop + (aCropRightBottom.Height() < 0 ? -aCropRightBottom.Height() : 0) );
+                Size aNewSize( aAnim.GetDisplaySizePixel() );
+                aNewSize.Width() += aCropRightBottom.Width() < 0 ? -aCropRightBottom.Width() : 0;
+                aNewSize.Width() += aCropLeftTop.Width() < 0 ? -aCropLeftTop.Width() : 0;
+                aNewSize.Height() += aCropRightBottom.Height() < 0 ? -aCropRightBottom.Height() : 0;
+                aNewSize.Height() += aCropLeftTop.Height() < 0 ? -aCropLeftTop.Height() : 0;
+                aAnim.SetDisplaySizePixel( aNewSize );
+            }
 
-                BitmapEx aBmpEx2;
+            // if topleft has changed, we must move all frames to the
+            // right and bottom, resp.
+            if( aCropLeftTop.Width() < 0 ||
+                aCropLeftTop.Height() < 0 )
+            {
+                Point aPosOffset( aCropLeftTop.Width() < 0 ? -aCropLeftTop.Width() : 0,
+                                  aCropLeftTop.Height() < 0 ? -aCropLeftTop.Height() : 0 );
 
-                if( aBmpEx.IsTransparent() )
-                {
-                    if( aBmpEx.IsAlpha() )
-                        aBmpEx2 = BitmapEx( aBmpEx.GetBitmap(), aBmpEx.GetAlpha() );
-                    else
-                        aBmpEx2 = BitmapEx( aBmpEx.GetBitmap(), aBmpEx.GetMask() );
-                }
-                else
+                for( nFrame=0; nFrame<aAnim.Count(); ++nFrame )
                 {
-                    // #104115# Generate mask bitmap and init to zero
-                    Bitmap aMask( aBmpSize, 1 );
-                    aMask.Erase( Color(0,0,0) );
+                    AnimationBitmap aAnimBmp( aAnim.Get( nFrame ) );
 
-                    // #104115# Always generate transparent bitmap, we need the border transparent
-                    aBmpEx2 = BitmapEx( aBmpEx.GetBitmap(), aMask );
+                    aAnimBmp.aPosPix += aPosOffset;
 
-                    // #104115# Add opaque mask to source bitmap, otherwise the destination remains transparent
-                    aBmpEx = aBmpEx2;
+                    aAnim.Replace( aAnimBmp, nFrame );
                 }
-
-                aBmpEx2.SetSizePixel( Size(nPadTotalWidth, nPadTotalHeight) );
-                aBmpEx2.Erase( Color(0xFF,0,0,0) );
-                aBmpEx2.CopyPixel( Rectangle( Point(nPadLeft, nPadTop), aBmpSize ), Rectangle( Point(0, 0), aBmpSize ), &aBmpEx );
-                aBmpEx = aBmpEx2;
             }
-        }
-
-        const Size  aSizePixel( aBmpEx.GetSizePixel() );
 
-        if( bRotate && !IsAnimated() )
+            aTransGraphic = aAnim;
+        }
+        else
         {
-            if( aSizePixel.Width() && aSizePixel.Height() && aDstSize.Width() && aDstSize.Height() )
-            {
-                double fSrcWH = (double) aSizePixel.Width() / aSizePixel.Height();
-                double fDstWH = (double) aDstSize.Width() / aDstSize.Height();
-                double fScaleX = 1.0, fScaleY = 1.0;
+            BitmapEx aBmpEx( aTransGraphic.GetBitmapEx() );
 
-                // always choose scaling to shrink bitmap
-                if( fSrcWH < fDstWH )
-                    fScaleY = aSizePixel.Width() / ( fDstWH * aSizePixel.Height() );
-                else
-                    fScaleX = fDstWH * aSizePixel.Height() / aSizePixel.Width();
+            ImpTransformBitmap( aBmpEx, aActAttr, aCropLeftTop, aCropRightBottom,
+                                aCropRect, aDstSize, bRotate, TRUE );
 
-                aBmpEx.Scale( fScaleX, fScaleY );
-            }
+            aTransGraphic = aBmpEx;
         }
 
-        aTransGraphic = aBmpEx;
-
         aTransGraphic.SetPrefSize( aDstSize );
         aTransGraphic.SetPrefMapMode( aDstMap );
     }
@@ -840,35 +919,44 @@ FASTBOOL SdrGrafObj::ImpPaintEmptyPres( OutputDevice* pOutDev ) const
 
 void SdrGrafObj::ImpPaintReplacement(OutputDevice* pOutDev, const XubString& rText, const Bitmap* pBmp, FASTBOOL bFill) const
 {
+    Size aPixelSize( 1, 1 );
+    Size aBmpSize;
+
+    aPixelSize = Application::GetDefaultDevice()->PixelToLogic( aPixelSize, pOutDev->GetMapMode() );
+
     if( bFill )
     {
         pOutDev->SetLineColor();
         pOutDev->SetFillColor( COL_LIGHTGRAY );
     }
 
-    Rectangle aRect1(pOutDev->LogicToPixel(aRect));
-    Rectangle aTextRect(aRect1);
-    Rectangle aRect2(aRect1);
-    aRect2.Left()++; aRect2.Top()++; aRect2.Right()--; aRect2.Bottom()--;
-    Point aTopLeft(aRect1.TopLeft());
-    Point aBmpPos(aTopLeft);
+    Rectangle   aRect1( aRect );
+    Rectangle   aRect2( aRect1 );
+    Rectangle   aTextRect( aRect1 );
+    Point       aTopLeft( aRect1.TopLeft() );
+    Point       aBmpPos( aTopLeft );
+
+    aRect2.Left() += aPixelSize.Width();
+    aRect2.Top() += aPixelSize.Height();
+    aRect2.Right() -= aPixelSize.Width();
+    aRect2.Bottom() -= aPixelSize.Height();
 
     if( pBmp != NULL )
     {
-        Size        aBmpSize(pBmp->GetSizePixel());
-        long        nRectWdt=aTextRect.Right()-aTextRect.Left();
-        long        nRectHgt=aTextRect.Bottom()-aTextRect.Top();
-        long        nBmpWdt=aBmpSize.Width();
-        long        nBmpHgt=aBmpSize.Height();
+        aBmpSize = Size( Application::GetDefaultDevice()->PixelToLogic( pBmp->GetSizePixel(), pOutDev->GetMapMode() ) );
+
+        long        nRectWdt = aTextRect.Right() - aTextRect.Left();
+        long        nRectHgt = aTextRect.Bottom() - aTextRect.Top();
+        long        nBmpWdt = aBmpSize.Width();
+        long        nBmpHgt = aBmpSize.Height();
+        long        nMinWdt = nBmpWdt;
+        long        nMinHgt = nBmpHgt;
         BOOL        bText = rText.Len() > 0;
 
-        long nMinWdt = nBmpWdt;
-        long nMinHgt = nBmpHgt;
-
         if( bText )
         {
-            nMinWdt=2 + nBmpWdt * 2 + 3;
-            nMinHgt=2 + nBmpHgt * 2 + 3;
+            nMinWdt= 2 * nBmpWdt + 5 * aPixelSize.Width();
+            nMinHgt= 2 * nBmpHgt + 5 * aPixelSize.Height();
         }
 
         if( nRectWdt < nMinWdt || nRectHgt < nMinHgt )
@@ -878,160 +966,172 @@ void SdrGrafObj::ImpPaintReplacement(OutputDevice* pOutDev, const XubString& rTe
             aTextRect.Left() += nBmpWdt;
 
             if( bText )
-                aTextRect.Left()+=2+3;
+                aTextRect.Left() += 5 * aPixelSize.Width();
         }
 
-        aBmpPos.X() += 2;
-        aBmpPos.Y() += 2;
+        aBmpPos.X() += 2 * aPixelSize.Width();
+        aBmpPos.Y() += 2 * aPixelSize.Height();
 
-        if( aGeo.nDrehWink!=0 )
+        if( aGeo.nDrehWink != 0 )
         {
-            Point aRef(aBmpPos);
-            aRef.X()-=aBmpSize.Width()/2+2;
-            aRef.Y()-=aBmpSize.Height()/2+2;
-            double nSin=sin(aGeo.nDrehWink*nPi180);
-            double nCos=cos(aGeo.nDrehWink*nPi180);
-            RotatePoint(aBmpPos,aRef,nSin,nCos);
+            Point   aRef( aBmpPos.X() - aBmpSize.Width() / 2 + 2 * aPixelSize.Width(),
+                          aBmpPos.Y() - aBmpSize.Height() / 2 + 2 * aPixelSize.Height() );
+            double  nSin = sin( aGeo.nDrehWink * nPi180 );
+            double  nCos = cos( aGeo.nDrehWink * nPi180 );
+
+            RotatePoint( aBmpPos, aRef, nSin, nCos );
         }
     }
 
-    const BOOL bOldMap = pOutDev->IsMapModeEnabled();
-    pOutDev->EnableMapMode( FALSE );
-
     if( aGeo.nDrehWink == 0 && aGeo.nShearWink == 0 )
     {
-        if (bFill)
-            pOutDev->DrawRect(aRect);
+        const StyleSettings& rStyleSettings = pOutDev->GetSettings().GetStyleSettings();
 
-        if (pBmp!=NULL)
-            pOutDev->DrawBitmap(aBmpPos,*pBmp);
+        if( bFill )
+            pOutDev->DrawRect( aRect );
 
-        const StyleSettings& rStyleSettings = pOutDev->GetSettings().GetStyleSettings();
+        if( pBmp!=NULL )
+            pOutDev->DrawBitmap( aBmpPos, aBmpSize, *pBmp );
 
         pOutDev->SetFillColor();
         pOutDev->SetLineColor( rStyleSettings.GetShadowColor() );
-        pOutDev->DrawLine(aRect1.TopLeft(),aRect1.TopRight()); pOutDev->DrawLine(aRect1.TopLeft(),aRect1.BottomLeft());
-
+        pOutDev->DrawLine( aRect1.TopLeft(), aRect1.TopRight() );
+        pOutDev->DrawLine( aRect1.TopLeft(), aRect1.BottomLeft() );
 
         pOutDev->SetLineColor( rStyleSettings.GetLightColor() );
-        pOutDev->DrawLine(aRect1.TopRight(),aRect1.BottomRight()); pOutDev->DrawLine(aRect1.BottomLeft(),aRect1.BottomRight());
+        pOutDev->DrawLine( aRect1.TopRight(), aRect1.BottomRight() );
+        pOutDev->DrawLine( aRect1.BottomLeft(), aRect1.BottomRight() );
 
         pOutDev->SetLineColor( rStyleSettings.GetLightColor() );
-        pOutDev->DrawLine(aRect2.TopLeft(),aRect2.TopRight()); pOutDev->DrawLine(aRect2.TopLeft(),aRect2.BottomLeft());
+        pOutDev->DrawLine( aRect2.TopLeft(), aRect2.TopRight() );
+        pOutDev->DrawLine( aRect2.TopLeft(), aRect2.BottomLeft() );
 
         pOutDev->SetLineColor( rStyleSettings.GetShadowColor() );
-        pOutDev->DrawLine(aRect2.TopRight(),aRect2.BottomRight()); pOutDev->DrawLine(aRect2.BottomLeft(),aRect2.BottomRight());
+        pOutDev->DrawLine( aRect2.TopRight(), aRect2.BottomRight() );
+        pOutDev->DrawLine( aRect2.BottomLeft(), aRect2.BottomRight() );
     }
     else
     {
-        Polygon aPoly1(Rect2Poly(aRect1,aGeo));
+        Polygon aPoly1( Rect2Poly( aRect1, aGeo ) );
         Polygon aPoly2(5);
-        aPoly2[0]=aRect2.TopLeft();
-        aPoly2[1]=aRect2.TopRight();
-        aPoly2[2]=aRect2.BottomRight();
-        aPoly2[3]=aRect2.BottomLeft();
-        aPoly2[4]=aRect2.TopLeft();
 
-        if (aGeo.nShearWink != 0)
-            ShearPoly(aPoly2,aTopLeft,aGeo.nTan);
+        aPoly2[0] = aRect2.TopLeft();
+        aPoly2[1] = aRect2.TopRight();
+        aPoly2[2] = aRect2.BottomRight();
+        aPoly2[3] = aRect2.BottomLeft();
+        aPoly2[4] = aRect2.TopLeft();
+
+        if( aGeo.nShearWink != 0 )
+            ShearPoly( aPoly2, aTopLeft, aGeo.nTan );
 
         if( aGeo.nDrehWink != 0 )
-            RotatePoly(aPoly2,aTopLeft,aGeo.nSin,aGeo.nCos);
+            RotatePoly( aPoly2, aTopLeft, aGeo.nSin, aGeo.nCos );
 
         if( bFill )
-            pOutDev->DrawPolygon(aPoly1);
+            pOutDev->DrawPolygon( aPoly1 );
 
         if( pBmp != NULL )
-            pOutDev->DrawBitmap( aBmpPos, *pBmp );
+            pOutDev->DrawBitmap( aBmpPos, aBmpSize, *pBmp );
 
         pOutDev->SetFillColor();
 
-        long        nHWink=NormAngle360(aGeo.nDrehWink);
-        long        nVWink=NormAngle360(aGeo.nDrehWink-aGeo.nShearWink);
-        FASTBOOL    bHorzChg=nHWink>13500 && nHWink<=31500;
-        FASTBOOL    bVertChg=nVWink>4500 && nVWink<=22500;
-
-        const StyleSettings& rStyleSettings = pOutDev->GetSettings().GetStyleSettings();
-        Color a3DLightColor( rStyleSettings.GetLightColor() );
-        Color a3DShadowColor( rStyleSettings.GetShadowColor() );
+        const StyleSettings&    rStyleSettings = pOutDev->GetSettings().GetStyleSettings();
+        Color                   a3DLightColor( rStyleSettings.GetLightColor() );
+        Color                   a3DShadowColor( rStyleSettings.GetShadowColor() );
+        long                    nHWink=NormAngle360( aGeo.nDrehWink );
+        long                    nVWink=NormAngle360( aGeo.nDrehWink-aGeo.nShearWink );
+        FASTBOOL                bHorzChg=nHWink>13500 && nHWink<=31500;
+        FASTBOOL                bVertChg=nVWink>4500 && nVWink<=22500;
 
         pOutDev->SetLineColor( bHorzChg ? a3DShadowColor : a3DLightColor);
-        pOutDev->DrawLine(aPoly2[0],aPoly2[1]);
+        pOutDev->DrawLine( aPoly2[0], aPoly2[1] );
 
         pOutDev->SetLineColor( bHorzChg ? a3DLightColor  : a3DShadowColor);
-        pOutDev->DrawLine(aPoly2[2],aPoly2[3]);
+        pOutDev->DrawLine( aPoly2[2], aPoly2[3] );
 
         pOutDev->SetLineColor( bVertChg ? a3DLightColor  : a3DShadowColor);
-        pOutDev->DrawLine(aPoly2[1],aPoly2[2]);
+        pOutDev->DrawLine( aPoly2[1], aPoly2[2] );
 
         pOutDev->SetLineColor( bVertChg ? a3DShadowColor : a3DLightColor);
-        pOutDev->DrawLine(aPoly2[3],aPoly2[4]);
+        pOutDev->DrawLine( aPoly2[3], aPoly2[4] );
 
         pOutDev->SetLineColor( bHorzChg ? a3DLightColor  : a3DShadowColor);
-        pOutDev->DrawLine(aPoly1[0],aPoly1[1]);
+        pOutDev->DrawLine( aPoly1[0], aPoly1[1] );
 
         pOutDev->SetLineColor( bHorzChg ? a3DShadowColor : a3DLightColor);
-        pOutDev->DrawLine(aPoly1[2],aPoly1[3]);
+        pOutDev->DrawLine( aPoly1[2], aPoly1[3] );
 
         pOutDev->SetLineColor( bVertChg ? a3DShadowColor : a3DLightColor);
-        pOutDev->DrawLine(aPoly1[1],aPoly1[2]);
+        pOutDev->DrawLine( aPoly1[1], aPoly1[2] );
 
         pOutDev->SetLineColor( bVertChg ? a3DLightColor  : a3DShadowColor);
-        pOutDev->DrawLine(aPoly1[3],aPoly1[4]);
+        pOutDev->DrawLine( aPoly1[3], aPoly1[4] );
     }
-    XubString aNam(rText);
 
-    if(aNam.Len())
+    XubString aNam( rText );
+
+    if( aNam.Len() )
     {
-        Size aOutSize(aTextRect.GetSize()); aOutSize.Width()-=6; aOutSize.Height()-=6;
+        Size aOutSize( aTextRect.GetWidth() - 6 * aPixelSize.Width(),
+                       aTextRect.GetHeight() - 6 * aPixelSize.Height() );
 
-        if (aOutSize.Width()>=4 || aOutSize.Height()>=4)
+        if( aOutSize.Width() >= ( 4 * aPixelSize.Width() ) ||
+            aOutSize.Height() >=  ( 4 * aPixelSize.Height() ) )
         {
-            Point aOutPos(aTextRect.TopLeft()); aOutPos.X()+=3; aOutPos.Y()+=3;
-            long nMaxOutY=aOutPos.Y()+aOutSize.Height();
-            Font aFontMerk(pOutDev->GetFont());
-            Font aFont( OutputDevice::GetDefaultFont( DEFAULTFONT_SANS_UNICODE, LANGUAGE_SYSTEM, DEFAULTFONT_FLAGS_ONLYONE ) );
-            aFont.SetColor(COL_LIGHTRED);
-            aFont.SetTransparent(TRUE);
-            aFont.SetLineOrientation(USHORT(NormAngle360(aGeo.nDrehWink)/10));
-
-            if (IsLinkedGraphic())
-                aFont.SetUnderline(UNDERLINE_SINGLE);
-            Size aFontSize(Size(0,aGeo.nDrehWink % 9000==0 ? 12 : 14));
-
-            if (aFontSize.Height()>aOutSize.Height())
-                aFontSize.Height()=aOutSize.Height();
-            aFont.SetSize(aFontSize);
-            pOutDev->SetFont(aFont);
-            String aOutStr(aNam);
-
-            while(aOutStr.Len() && aOutPos.Y() <= nMaxOutY)
+            Point   aOutPos( aTextRect.Left() + 3 * aPixelSize.Width(),
+                             aTextRect.Top() + 3 * aPixelSize.Height() );
+            long    nMaxOutY = aOutPos.Y() + aOutSize.Height();
+            Font    aFontMerk( pOutDev->GetFont() );
+            Font    aFont( OutputDevice::GetDefaultFont( DEFAULTFONT_SANS_UNICODE, LANGUAGE_SYSTEM, DEFAULTFONT_FLAGS_ONLYONE ) );
+
+            aFont.SetColor( COL_LIGHTRED );
+            aFont.SetTransparent( TRUE );
+            aFont.SetLineOrientation( USHORT( NormAngle360( aGeo.nDrehWink ) / 10 ) );
+
+            if( IsLinkedGraphic() )
+                aFont.SetUnderline( UNDERLINE_SINGLE );
+
+            Size aFontSize( 0, ( aGeo.nDrehWink % 9000 == 0 ? 12 : 14 ) * aPixelSize.Height() );
+
+            if( aFontSize.Height() > aOutSize.Height() )
+                aFontSize.Height() = aOutSize.Height();
+
+            aFont.SetSize( aFontSize );
+            pOutDev->SetFont( aFont );
+            String aOutStr( aNam );
+
+            while( aOutStr.Len() && aOutPos.Y() <= nMaxOutY )
             {
-                String aStr1(aOutStr);
-                INT32 nTextWidth = pOutDev->GetTextWidth(aStr1);
-                INT32 nTextHeight = pOutDev->GetTextHeight();
+                String  aStr1( aOutStr );
+                INT32   nTextWidth = pOutDev->GetTextWidth( aStr1 );
+                INT32   nTextHeight = pOutDev->GetTextHeight();
 
-                while(aStr1.Len() && nTextWidth > aOutSize.Width())
+                while( aStr1.Len() && nTextWidth > aOutSize.Width() )
                 {
-                    aStr1.Erase(aStr1.Len() - 1);
-                    nTextWidth = pOutDev->GetTextWidth(aStr1);
+                    aStr1.Erase( aStr1.Len() - 1 );
+                    nTextWidth = pOutDev->GetTextWidth( aStr1 );
                     nTextHeight = pOutDev->GetTextHeight();
                 }
-                Point aPos(aOutPos);
+
+                Point aPos( aOutPos );
                 aOutPos.Y() += nTextHeight;
 
-                if (aOutPos.Y()<=nMaxOutY)
+                if( aOutPos.Y() <= nMaxOutY )
                 {
-                    if (aGeo.nShearWink!=0) ShearPoint(aPos,aTopLeft,aGeo.nTan);
-                    if (aGeo.nDrehWink!=0) RotatePoint(aPos,aTopLeft,aGeo.nSin,aGeo.nCos);
-                    pOutDev->DrawText(aPos,aStr1);
-                    aOutStr.Erase(0, aStr1.Len());
+                    if( aGeo.nShearWink != 0 )
+                        ShearPoint( aPos, aTopLeft, aGeo.nTan );
+
+                    if( aGeo.nDrehWink != 0 )
+                        RotatePoint( aPos, aTopLeft, aGeo.nSin, aGeo.nCos );
+
+                    pOutDev->DrawText( aPos, aStr1 );
+                    aOutStr.Erase( 0, aStr1.Len() );
                 }
             }
-            pOutDev->SetFont(aFontMerk);
+
+            pOutDev->SetFont( aFontMerk );
         }
     }
-    pOutDev->EnableMapMode( bOldMap );
 }
 
 // -----------------------------------------------------------------------------
@@ -1083,6 +1183,7 @@ FASTBOOL SdrGrafObj::Paint( ExtOutputDevice& rOut, const SdrPaintInfoRec& rInfoR
         Point       aLogPos( aRect.TopLeft() );
         Size        aLogSize( pOutDev->PixelToLogic( pOutDev->LogicToPixel( aRect ).GetSize() ) );
         GraphicAttr aAttr( aGrafInfo );
+        const ULONG nGraphicManagerDrawMode = ( pView ? pView->GetGraphicManagerDrawMode() : GRFMGR_DRAW_STANDARD );
 
         aAttr.SetMirrorFlags( ( bHMirr ? BMP_MIRROR_HORZ : 0 ) | ( bVMirr ? BMP_MIRROR_VERT : 0 ) );
 
@@ -1099,28 +1200,22 @@ FASTBOOL SdrGrafObj::Paint( ExtOutputDevice& rOut, const SdrPaintInfoRec& rInfoR
                 SdrAnimationMode    eAnimMode = SDR_ANIMATION_ANIMATE;
                 FASTBOOL            bEnable = TRUE;
 
-                if( rInfoRec.pPV != NULL )
+                if( pView )
                 {
-                    eAnimMode= ((SdrPaintView&) rInfoRec.pPV->GetView()).GetAnimationMode();
-                    bEnable = eAnimMode != SDR_ANIMATION_DISABLE;
-                }
-
-                // #98825# Look if graphics animation is disabled by
-                // accessibility options
-                if(rInfoRec.pPV // #99632# This may be zero when it's an animated GIF /e.g.)
-                    && bEnable)
-                {
-                    const SdrView& rTargetView = rInfoRec.pPV->GetView();
-                    const SvtAccessibilityOptions& rOpt = ((SdrView&)rTargetView).getAccessibilityOptions();
-                    sal_Bool bIsAllowedAnimatedGraphics = rOpt.GetIsAllowAnimatedGraphics();
+                    eAnimMode= pView->GetAnimationMode();
+                    bEnable = ( eAnimMode != SDR_ANIMATION_DISABLE );
 
-                    if(!bIsAllowedAnimatedGraphics)
+                    if( bEnable )
                     {
-                        bEnable = FALSE;
+                        const SvtAccessibilityOptions& rOpt = const_cast< SdrView* >( pView )->getAccessibilityOptions();
+                        sal_Bool bIsAllowedAnimatedGraphics = rOpt.GetIsAllowAnimatedGraphics();
 
-                        // extra work to be done to make graphic visible at all
-                        pGraphic->StopAnimation();
-                        pGraphic->Draw(pOutDev, aLogPos, aLogSize, &aAttr);
+                        if( !bIsAllowedAnimatedGraphics )
+                        {
+                            pGraphic->StopAnimation();
+                            pGraphic->Draw( pOutDev, aLogPos, aLogSize, &aAttr, nGraphicManagerDrawMode );
+                            bEnable = FALSE;
+                        }
                     }
                 }
 
@@ -1132,7 +1227,7 @@ FASTBOOL SdrGrafObj::Paint( ExtOutputDevice& rOut, const SdrPaintInfoRec& rInfoR
                         pGraphic->StartAnimation( pOutDev, aLogPos, aLogSize, 0, &aAttr );
                     }
                     else if( eAnimMode == SDR_ANIMATION_DONT_ANIMATE )
-                        pGraphic->Draw( pOutDev, aLogPos, aLogSize, &aAttr );
+                        pGraphic->Draw( pOutDev, aLogPos, aLogSize, &aAttr, nGraphicManagerDrawMode );
                 }
             }
             else
@@ -1140,7 +1235,7 @@ FASTBOOL SdrGrafObj::Paint( ExtOutputDevice& rOut, const SdrPaintInfoRec& rInfoR
                 if( bRotate && !bRota180 )
                     aAttr.SetRotation( nDrehWink / 10 );
 
-                pGraphic->Draw( pOutDev, aLogPos, aLogSize, &aAttr );
+                pGraphic->Draw( pOutDev, aLogPos, aLogSize, &aAttr, nGraphicManagerDrawMode );
             }
         }
         else
@@ -1159,7 +1254,7 @@ FASTBOOL SdrGrafObj::Paint( ExtOutputDevice& rOut, const SdrPaintInfoRec& rInfoR
             if( bRotate && !bRota180 )
                 aAttr.SetRotation( nDrehWink / 10 );
 
-            pGraphic->Draw( pOutDev, aLogPos, aLogSize, &aAttr );
+            pGraphic->Draw( pOutDev, aLogPos, aLogSize, &aAttr, nGraphicManagerDrawMode );
             pOutDev->SetDrawMode( nOldDrawMode );
         }
     }
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 8878a1894694..59e53d91ec5b 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdoole2.cxx,v $
  *
- *  $Revision: 1.32 $
+ *  $Revision: 1.33 $
  *
- *  last change: $Author: aw $ $Date: 2002-07-02 16:28:53 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:33 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -163,6 +163,10 @@ public:
     GDIMetaFile*    pMetaFile;          // Metafile fuer GetMtf kopieren und merken
     GraphicObject*  pGraphicObject;
     String          aPersistName;       // name of object in persist
+
+    // #107645#
+    // New local var to avoid repeated loading if load of OLE2 fails
+    sal_Bool        mbLoadingOLEObjectFailed;
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -262,6 +266,10 @@ void SdrOle2Obj::Init()
     pGraphic=NULL;
     mpImpl->pMetaFile=NULL;
     mpImpl->pGraphicObject=NULL;
+
+    // #107645#
+    // init to start situation, loading did not fail
+    mpImpl->mbLoadingOLEObjectFailed = sal_False;
 }
 
 // -----------------------------------------------------------------------------
@@ -651,8 +659,8 @@ FASTBOOL SdrOle2Obj::Paint(ExtOutputDevice& rOut, const SdrPaintInfoRec& rInfoRe
             if (aPos.X() >= aRect.Left() && aPos.Y() >= aRect.Top())
                 pGraphic->Draw(pOutDev,aPos, aDstSize);
 
-            svx::ColorConfig aColorConfig;
-            svx::ColorConfigValue aColor( aColorConfig.GetColorValue( svx::OBJECTBOUNDARIES ) );
+            svtools::ColorConfig aColorConfig;
+            svtools::ColorConfigValue aColor( aColorConfig.GetColorValue( svtools::OBJECTBOUNDARIES ) );
 
             if( aColor.bIsVisible )
             {
@@ -1181,8 +1189,21 @@ const SvInPlaceObjectRef& SdrOle2Obj::GetObjRef() const
 #ifndef SVX_LIGHT
     if ( !ppObjRef->Is() && pModel && pModel->GetPersist() && !pModel->GetPersist()->IsHandsOff() )
     {
-        // Objekt laden
-        (*ppObjRef) = &( pModel->GetPersist()->GetObject( mpImpl->aPersistName ) );
+        // #107645#
+        // Only try loading if it did not wrent wrong up to now
+        if(!mpImpl->mbLoadingOLEObjectFailed)
+        {
+            // Objekt laden
+            (*ppObjRef) = &( pModel->GetPersist()->GetObject( mpImpl->aPersistName ) );
+
+            // #107645#
+            // If loading of OLE object failed, remember that to not invoke a endless
+            // loop trying to load it again and again.
+            if(!ppObjRef->Is())
+            {
+                mpImpl->mbLoadingOLEObjectFailed = sal_True;
+            }
+        }
 
         if ( ppObjRef->Is() )
         {
diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx
index 2606abd5e54d..585bb4c6a653 100644
--- a/svx/source/svdraw/svdopage.cxx
+++ b/svx/source/svdraw/svdopage.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdopage.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: cl $ $Date: 2002-11-13 15:14:37 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,8 +71,8 @@
 #include "svdpagv.hxx"
 #include "svdoutl.hxx"
 
-#ifndef _SVX_COLORCFG_HXX
-#include "colorcfg.hxx"
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include <svtools/colorcfg.hxx>
 #endif
 
 #ifndef _SFXITEMSET_HXX
@@ -277,9 +277,9 @@ FASTBOOL SdrPageObj::Paint(ExtOutputDevice& rXOut, const SdrPaintInfoRec& rInfoR
     if(bPaintArea)
     {
         OutputDevice& rOut=*rXOut.GetOutDev();
-        svx::ColorConfig aColorConfig;
-        svx::ColorConfigValue aDocColor( aColorConfig.GetColorValue( svx::DOCCOLOR ) );
-        svx::ColorConfigValue aBorderColor( aColorConfig.GetColorValue( svx::DOCBOUNDARIES ) );
+        svtools::ColorConfig aColorConfig;
+        svtools::ColorConfigValue aDocColor( aColorConfig.GetColorValue( svtools::DOCCOLOR ) );
+        svtools::ColorConfigValue aBorderColor( aColorConfig.GetColorValue( svtools::DOCBOUNDARIES ) );
 
         rOut.SetFillColor( aDocColor.nColor );
         rOut.SetLineColor( aBorderColor.bIsVisible ? aBorderColor.nColor: aDocColor.nColor );
@@ -435,8 +435,8 @@ FASTBOOL SdrPageObj::Paint(ExtOutputDevice& rXOut, const SdrPaintInfoRec& rInfoR
 
     if(bPaintFrame)
     {
-        svx::ColorConfig aColorConfig;
-        svx::ColorConfigValue aColor( aColorConfig.GetColorValue( svx::OBJECTBOUNDARIES ) );
+        svtools::ColorConfig aColorConfig;
+        svtools::ColorConfigValue aColor( aColorConfig.GetColorValue( svtools::OBJECTBOUNDARIES ) );
 
         if( aColor.bIsVisible )
         {
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 0ddd6c9d42ea..3724e5e15c72 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdopath.cxx,v $
  *
- *  $Revision: 1.22 $
+ *  $Revision: 1.23 $
  *
- *  last change: $Author: aw $ $Date: 2002-11-01 12:10:45 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -242,7 +242,36 @@ void SdrPathObj::ImpForceKind()
     if (eKind==OBJ_PLIN && (nPolyAnz==1 && nPoly1PointAnz==2)) eKind=OBJ_LINE;
 
     bClosedObj=IsClosed();
-    if (eKind==OBJ_LINE) ImpForceLineWink();
+
+    if (eKind==OBJ_LINE)
+    {
+        ImpForceLineWink();
+    }
+    else
+    {
+        // #i10659#, similar to #101412# but for polys with more than 2 points.
+        //
+        // Here i again need to fix something, because when Path-Polys are Copy-Pasted
+        // between Apps with different measurements (e.g. 100TH_MM and TWIPS) there is
+        // a scaling loop started from SdrExchangeView::Paste. This is principally nothing
+        // wrong, but aRect is wrong here and not even updated by RecalcSnapRect(). If
+        // this is the case, some size needs to be set here in aRect to avoid that the cyclus
+        // through Rect2Poly - Poly2Rect does something badly wrong since that cycle is
+        // BASED on aRect. That cycle is triggered in SdrTextObj::NbcResize() which is called
+        // from the local Resize() implementation.
+        //
+        // Basic problem is that the member aRect in SdrTextObj basically is a unrotated
+        // text rectangle for the text object itself and methods at SdrTextObj do handle it
+        // in that way. Many draw objects derived from SdrTextObj 'abuse' aRect as SnapRect
+        // which is basically wrong. To make the SdrText methods which deal with aRect directly
+        // work it is necessary to always keep aRect updated. This e.g. not done after a Clone()
+        // command for SdrPathObj. Since adding this update mechanism with #101412# to
+        // ImpForceLineWink() for lines was very successful, i add it to where ImpForceLineWink()
+        // was called, once here below and once on a 2nd place below.
+
+        // #i10659# for SdrTextObj, keep aRect up to date
+        aRect=aPathPolygon.GetBoundRect(); // fuer SdrTextObj
+    }
 }
 
 void SdrPathObj::ImpSetClosed(FASTBOOL bClose)
@@ -2295,7 +2324,17 @@ void SdrPathObj::NbcSetPoint(const Point& rPnt, USHORT nHdlNum)
         XPolygon& rXP=aPathPolygon[nPoly];
         rXP[nPnt]=rPnt;
         if (IsClosed() && nPnt==0) rXP[rXP.GetPointCount()-1]=rXP[0];
-        if (eKind==OBJ_LINE) ImpForceLineWink();
+
+        if (eKind==OBJ_LINE)
+        {
+            ImpForceLineWink();
+        }
+        else
+        {
+            // #i10659# for SdrTextObj, keep aRect up to date
+            aRect=aPathPolygon.GetBoundRect(); // fuer SdrTextObj
+        }
+
         SetRectsDirty();
     }
 }
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index d576a5825722..e193154af4e0 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdotext.cxx,v $
  *
- *  $Revision: 1.57 $
+ *  $Revision: 1.58 $
  *
- *  last change: $Author: aw $ $Date: 2002-11-26 15:34:42 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,8 +76,8 @@
 #include "svdtxhdl.hxx"  // DrawTextToPath
 #include "writingmodeitem.hxx"
 
-#ifndef _SVX_COLORCFG_HXX
-#include "colorcfg.hxx"
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include <svtools/colorcfg.hxx>
 #endif
 
 #ifndef _EEITEM_HXX //autogen
@@ -921,6 +921,23 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FAS
     Point aTextPos(aAnkRect.TopLeft());
     Size aTextSiz(rOutliner.GetPaperSize()); // GetPaperSize() hat etwas Toleranz drauf, oder?
 
+    // #106653#
+    // For draw objects containing text correct hor/ver alignment if text is bigger
+    // than the object itself. Without that correction, the text would always be
+    // formatted to the left edge (or top edge when vertical) of the draw object.
+    if(!IsTextFrame())
+    {
+        if(aAnkRect.GetWidth() < aTextSiz.Width() && !IsVerticalWriting())
+        {
+            eHAdj = SDRTEXTHORZADJUST_CENTER;
+        }
+
+        if(aAnkRect.GetHeight() < aTextSiz.Height() && IsVerticalWriting())
+        {
+            eVAdj = SDRTEXTVERTADJUST_CENTER;
+        }
+    }
+
     if (eHAdj==SDRTEXTHORZADJUST_CENTER || eHAdj==SDRTEXTHORZADJUST_RIGHT)
     {
         long nFreeWdt=aAnkRect.GetWidth()-aTextSiz.Width();
@@ -1088,6 +1105,7 @@ FASTBOOL SdrTextObj::Paint(ExtOutputDevice& rXOut, const SdrPaintInfoRec& rInfoR
 
     FASTBOOL bOk=TRUE;
     FASTBOOL bPrinter=rXOut.GetOutDev()->GetOutDevType()==OUTDEV_PRINTER;
+    FASTBOOL bPrintPreView=rXOut.GetOutDev()->GetOutDevViewType()==OUTDEV_VIEWTYPE_PRINTPREVIEW;
 
     if (bPrinter && bEmptyPresObj)
         return bOk; // Leere Praesentationsobjekte nicht drucken!
@@ -1104,7 +1122,11 @@ FASTBOOL SdrTextObj::Paint(ExtOutputDevice& rXOut, const SdrPaintInfoRec& rInfoR
 
             {
                 SvtAccessibilityOptions aOptions;
-                rOutliner.ForceAutoColor( aOptions.GetIsAutomaticFontColor() );
+                FASTBOOL bForceAutoColor = aOptions.GetIsAutomaticFontColor();
+                //#106611# don't use automatic colors in WYSIWYG Print Previews
+                if(bPrintPreView&& !aOptions.GetIsForPagePreviews())
+                    bForceAutoColor = FALSE;
+                rOutliner.ForceAutoColor( bForceAutoColor );
             }
 
             FASTBOOL bContourFrame=IsContourTextFrame();
@@ -1280,8 +1302,8 @@ FASTBOOL SdrTextObj::Paint(ExtOutputDevice& rXOut, const SdrPaintInfoRec& rInfoR
         if (bEmptyPresObj)
         {
             // leere Praesentationsobjekte bekommen einen grauen Rahmen
-            svx::ColorConfig aColorConfig;
-            svx::ColorConfigValue aColor( aColorConfig.GetColorValue( svx::OBJECTBOUNDARIES ) );
+            svtools::ColorConfig aColorConfig;
+            svtools::ColorConfigValue aColor( aColorConfig.GetColorValue( svtools::OBJECTBOUNDARIES ) );
 
             if( aColor.bIsVisible )
             {
@@ -2579,7 +2601,7 @@ void SdrTextObj::TRSetBaseGeometry(const Matrix3D& rMat, const XPolyPolygon& rPo
     if( pModel->IsWriter() )
     {
         if(GetAnchorPos().X() != 0 || GetAnchorPos().Y() != 0)
-            aTranslate -= Vector2D(GetAnchorPos().X(), GetAnchorPos().Y());
+            aTranslate += Vector2D(GetAnchorPos().X(), GetAnchorPos().Y());
     }
 
     // build and set BaseRect (use scale)
@@ -2615,6 +2637,11 @@ void SdrTextObj::TRSetBaseGeometry(const Matrix3D& rMat, const XPolyPolygon& rPo
     }
 }
 
+bool SdrTextObj::IsRealyEdited() const
+{
+    return pEdtOutl && pEdtOutl->IsModified();
+}
+
 /////////////////////////////////////////////////////////////////////////////////////////////////
 //
 // Konzept des TextObjekts:
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index 03c745f0b4e0..13e7bf2397bd 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdotxed.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: aw $ $Date: 2002-11-07 12:29:53 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -198,7 +198,14 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* p
         if (aTmpSiz.Width()!=0) aMaxSiz.Width()=aTmpSiz.Width();
         if (aTmpSiz.Height()!=0) aMaxSiz.Height()=aTmpSiz.Height();
     }
-    if (bTextFrame) {
+
+    // #106879#
+    // Done earlier since used in else tree below
+    SdrTextHorzAdjust eHAdj(GetTextHorizontalAdjust());
+    SdrTextVertAdjust eVAdj(GetTextVerticalAdjust());
+
+    if(IsTextFrame())
+    {
         long nMinWdt=GetMinTextFrameWidth();
         long nMinHgt=GetMinTextFrameHeight();
         long nMaxWdt=GetMaxTextFrameWidth();
@@ -229,12 +236,21 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* p
         }
         aPaperMin.Width()=nMinWdt;
         aPaperMin.Height()=nMinHgt;
-    } else {
+    }
+    else
+    {
+        // #106879#
+        // aPaperMin needs to be set to object's size if full width is activated
+        // for hor or ver writing respectively
+        if((SDRTEXTHORZADJUST_BLOCK == eHAdj && !IsVerticalWriting())
+            || (SDRTEXTVERTADJUST_BLOCK == eVAdj && IsVerticalWriting()))
+        {
+            aPaperMin = aAnkSiz;
+        }
+
         aPaperMax=aMaxSiz;
     }
 
-    SdrTextHorzAdjust eHAdj=GetTextHorizontalAdjust();
-    SdrTextVertAdjust eVAdj=GetTextVerticalAdjust();
     if (pViewMin!=NULL) {
         *pViewMin=aViewInit;
 
@@ -299,7 +315,7 @@ void SdrTextObj::EndTextEdit(SdrOutliner& rOutl)
             if(nParaAnz != 0)
             {
                 // Wirklich Textobjekt kreieren
-                pNewText = rOutl.CreateParaObject( 0, nParaAnz );
+                pNewText = rOutl.CreateParaObject( 0, (sal_uInt16)nParaAnz );
             }
         }
         SetOutlinerParaObject(pNewText);
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index c38790dfaa80..fc4673423ae0 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdouno.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: tbe $ $Date: 2002-08-01 15:04:06 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -299,17 +299,14 @@ FASTBOOL SdrUnoObj::Paint(ExtOutputDevice& rXOut, const SdrPaintInfoRec& rInfoRe
 
             BOOL bDesignMode = pPV->GetView().IsDesignMode();
 
-            if (eOutDevType != OUTDEV_VIRDEV)
+            uno::Reference< awt::XWindow > xWindow(xUnoControl, uno::UNO_QUERY);
+            if (xWindow.is())
             {
-                uno::Reference< awt::XWindow > xWindow(xUnoControl, uno::UNO_QUERY);
-                if (xWindow.is() && eOutDevType != OUTDEV_VIRDEV)
-                {
-                    Point aPixPos(pOut->LogicToPixel(aRect.TopLeft()));
-                    Size aPixSize(pOut->LogicToPixel(aRect.GetSize()));
-                    xWindow->setPosSize(aPixPos.X(), aPixPos.Y(),
-                                              aPixSize.Width(), aPixSize.Height(),
-                                              awt::PosSize::POSSIZE);
-                }
+                Point aPixPos(pOut->LogicToPixel(aRect.TopLeft()));
+                Size aPixSize(pOut->LogicToPixel(aRect.GetSize()));
+                xWindow->setPosSize(aPixPos.X(), aPixPos.Y(),
+                                    aPixSize.Width(), aPixSize.Height(),
+                                    awt::PosSize::POSSIZE);
             }
 
             BOOL bInvalidatePeer = FALSE;
@@ -374,7 +371,7 @@ FASTBOOL SdrUnoObj::Paint(ExtOutputDevice& rXOut, const SdrPaintInfoRec& rInfoRe
                     bInvalidatePeer = TRUE;
                 }
             }
-            else if (eOutDevType == OUTDEV_PRINTER)
+            else if (eOutDevType == OUTDEV_PRINTER || eOutDevType == OUTDEV_VIRDEV)
             {
                 uno::Reference< beans::XPropertySet > xP(xUnoControl->getModel(), uno::UNO_QUERY);
                 if (xP.is())
@@ -393,10 +390,8 @@ FASTBOOL SdrUnoObj::Paint(ExtOutputDevice& rXOut, const SdrPaintInfoRec& rInfoRe
                     }
                 }
             }
-            else if (!bDesignMode)
-            {
-                bInvalidatePeer = TRUE;
-            }
+            else
+                DBG_ERROR( "SdrUnoObj::Paint: Ehm - what kind of device is this?" );
 
             if ( bInvalidatePeer )
             {
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index d275e8d8b8f8..0e0dd605bdc0 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdpage.cxx,v $
  *
- *  $Revision: 1.34 $
+ *  $Revision: 1.35 $
  *
- *  last change: $Author: cl $ $Date: 2002-11-13 15:17:27 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1591,10 +1591,12 @@ INT32 SdrPage::GetLwrBorder() const
     return nBordLwr;
 }
 
-Point SdrPage::GetOffset() const
-{
-    return Point();
-}
+// #i3694#
+// This GetOffset() method is not needed anymore, it even leads to errors.
+//Point SdrPage::GetOffset() const
+//{
+//  return Point();
+//}
 
 void SdrPage::SetModel(SdrModel* pNewModel)
 {
@@ -2052,8 +2054,8 @@ Color SdrPage::GetBackgroundColor( SdrPageView* pView ) const
 
     if( (NULL == pView) || (pView->GetApplicationDocumentColor() == COL_AUTO) )
     {
-        svx::ColorConfig aColorConfig;
-        aColor = aColorConfig.GetColorValue( svx::DOCCOLOR ).nColor;
+        svtools::ColorConfig aColorConfig;
+        aColor = aColorConfig.GetColorValue( svtools::DOCCOLOR ).nColor;
     }
     else
     {
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index 29cd9151ea5b..cf8774b70e83 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdpagv.cxx,v $
  *
- *  $Revision: 1.27 $
+ *  $Revision: 1.28 $
  *
- *  last change: $Author: cl $ $Date: 2002-11-13 15:14:38 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -103,7 +103,10 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #endif
 
-#include "colorcfg.hxx"
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include <svtools/colorcfg.hxx>
+#endif
+
 #include "svdedxv.hxx"
 #include "svdpagv.hxx"
 #include "svdoutl.hxx"
@@ -819,11 +822,12 @@ void SdrPageView::ImpInsertControl(const SdrUnoObj* pSdrUnoObj,
                         }
                     }
 
-                    pRec->GetControlContainerRef()->addControl(pSdrUnoObj->GetUnoControlTypeName(), xUnoControl);
-
-                    // Designmodus erst setzen, wenn Peer bereits existiert!
+                    // #107049# set design mode before peer is created,
+                    // this is also needed for accessibility
                     xUnoControl->setDesignMode(GetView().IsDesignMode());
 
+                    pRec->GetControlContainerRef()->addControl(pSdrUnoObj->GetUnoControlTypeName(), xUnoControl);
+
                     SdrUnoControlRec* pUCR = new SdrUnoControlRec(&pRec->aControlList, (SdrUnoObj*)pSdrUnoObj, xUnoControl);
                     pRec->aControlList.Insert(pUCR);
                 }
@@ -1466,8 +1470,8 @@ void SdrPageView::DrawPaper(OutputDevice& rOut)
         }
         else
         {
-            const svx::ColorConfig aColorConfig;
-            rOut.SetFillColor( aColorConfig.GetColorValue( svx::DOCCOLOR ).nColor );
+            const svtools::ColorConfig aColorConfig;
+            rOut.SetFillColor( aColorConfig.GetColorValue( svtools::DOCCOLOR ).nColor );
         }
 
 
@@ -1480,7 +1484,8 @@ void SdrPageView::DrawPaperBorder(OutputDevice& rOut)
 {
     if( pPage )
     {
-        rOut.SetLineColor( Application::GetSettings().GetStyleSettings().GetWindowTextColor() );
+        svtools::ColorConfig aColorConfig;
+        rOut.SetLineColor( Color(aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor) );
         rOut.SetFillColor();
         rOut.DrawRect( GetPageRect() );
     }
@@ -1490,13 +1495,13 @@ void SdrPageView::DrawBorder(OutputDevice& rOut)
 {
     if( pPage && ( pPage->GetLftBorder() || pPage->GetUppBorder() || pPage->GetRgtBorder() || pPage->GetLwrBorder() ) )
     {
-        svx::ColorConfig    aColorConfig;
+        svtools::ColorConfig    aColorConfig;
         Color               aBorderColor;
 
         if( Application::GetSettings().GetStyleSettings().GetHighContrastMode() )
-            aBorderColor = Application::GetSettings().GetStyleSettings().GetWindowTextColor();
+            aBorderColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor;
         else
-            aBorderColor = aColorConfig.GetColorValue( svx::DOCBOUNDARIES ).nColor;
+            aBorderColor = aColorConfig.GetColorValue( svtools::DOCBOUNDARIES ).nColor;
 
         rOut.SetLineColor( aBorderColor );
         rOut.SetFillColor();
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index fa43d1733dd3..95d4871c2a1c 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdpntv.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: cl $ $Date: 2002-11-13 15:14:38 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -123,6 +123,10 @@
 #include <goodies/b2dmtri.hxx>
 #endif
 
+#ifndef _GRFMGR_HXX
+#include <goodies/grfmgr.hxx>
+#endif
+
 using namespace ::rtl;
 using namespace ::com::sun::star;
 
@@ -523,6 +527,8 @@ void SdrPaintView::ImpClearVars()
     pMasterBmp=NULL;
     nMasterCacheMode = SDR_MASTERPAGECACHE_DEFAULT;
 
+    nGraphicManagerDrawMode = GRFMGR_DRAW_STANDARD;
+
     aComeBackTimer.SetTimeout(1);
     aComeBackTimer.SetTimeoutHdl(LINK(this,SdrPaintView,ImpComeBackHdl));
     aAfterPaintTimer.SetTimeout(1);
@@ -2105,7 +2111,7 @@ void SdrPaintView::VisAreaChanged(const SdrPageViewWinRec& rPVWR)
 
         for (ULONG i = 0; i < rCList.GetCount(); i++)
         {
-            const SdrUnoControlRec& rControlRec = rCList[i];
+            const SdrUnoControlRec& rControlRec = rCList[ (sal_uInt16) i];
             uno::Reference< awt::XControl > xUnoControl = rControlRec.GetControl();
 
             if (xUnoControl.is())
@@ -2128,14 +2134,14 @@ void SdrPaintView::VisAreaChanged(const SdrPageViewWinRec& rPVWR)
 }
 
 
-const svx::ColorConfig& SdrPaintView::getColorConfig() const
+const svtools::ColorConfig& SdrPaintView::getColorConfig() const
 {
     return maColorConfig;
 }
 
 void SdrPaintView::onChangeColorConfig()
 {
-    SetGridColor( Color( maColorConfig.GetColorValue( svx::DRAWGRID ).nColor ) );
+    SetGridColor( Color( maColorConfig.GetColorValue( svtools::DRAWGRID ).nColor ) );
 }
 
 void SdrPaintView::SetGridColor( Color aColor )
diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx
index a673f49cd9ae..d94232317dde 100644
--- a/svx/source/svdraw/svdsnpv.cxx
+++ b/svx/source/svdraw/svdsnpv.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdsnpv.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: af $ $Date: 2002-10-11 11:40:54 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:39 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -222,9 +222,14 @@ USHORT SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const
     bPVOfs=TRUE;
     // !!!!!!hier stattdessen mal die GridFrames verwenden!!!!!!!!
     // SdrPage::GetOffset() kann dann entsorgt werden.
-    Point aWriterPageOffset(pPV->GetPage()->GetOffset());
-    xOffs=pPV->GetOffset().X()+aWriterPageOffset.X();
-    yOffs=pPV->GetOffset().Y()+aWriterPageOffset.Y();
+
+    // #i3694#
+    // The Page::GetOffset() method is not needed anymore, it even leads to errors.
+    // I will completely remove it, only Writer implements it (with a constant
+    // of (DOCUMENTBORDER, DOCUMENTBORDER ).
+    // Point aWriterPageOffset(pPV->GetPage()->GetOffset());
+    xOffs=pPV->GetOffset().X(); // +aWriterPageOffset.X();
+    yOffs=pPV->GetOffset().Y(); // +aWriterPageOffset.Y();
     x-=xOffs;
     y-=yOffs;
 
diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src
index 52582ec1ccf3..8061cbab9fbc 100644
--- a/svx/source/svdraw/svdstr.src
+++ b/svx/source/svdraw/svdstr.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdstr.src,v $
  *
- *  $Revision: 1.70 $
+ *  $Revision: 1.71 $
  *
- *  last change: $Author: cl $ $Date: 2002-10-09 16:05:18 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:39 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -78,7 +78,7 @@ String STR_ObjNameSingulNONE
     Text [ spanish ] = "Objeto de dibujo" ;
     Text [ english_us ] = "draw object" ;
     Text[ chinese_simplified ] = "绘图对象";
-    Text[ russian ] = "����������� ������";
+    Text[ russian ] = "����������� ������";
     Text[ polish ] = "Obiekt graficzny";
     Text[ japanese ] = "図形描画オブジェクト";
     Text[ chinese_traditional ] = "繪圖物件";
@@ -89,7 +89,8 @@ String STR_ObjNameSingulNONE
     Text[ korean ] = "그리기 개체";
     Text[ turkish ] = "�izim nesnesi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Objeto de dibujo";
+    Text[ catalan ] = "objecte de dibuix";
+    Text[ thai ] = "วาดวัตถุ";
 };
 String STR_ObjNamePluralNONE
 {
@@ -107,7 +108,7 @@ String STR_ObjNamePluralNONE
     Text [ spanish ] = "Objetos de dibujo" ;
     Text [ english_us ] = "draw objects" ;
     Text[ chinese_simplified ] = "绘图对象";
-    Text[ russian ] = "����������� �������";
+    Text[ russian ] = "����������� �������";
     Text[ polish ] = "Obiekty graficzne";
     Text[ japanese ] = "図形描画オブジェクト";
     Text[ chinese_traditional ] = "繪圖物件";
@@ -118,7 +119,8 @@ String STR_ObjNamePluralNONE
     Text[ korean ] = "그리기 개체";
     Text[ turkish ] = "�izim nesnesi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Objetos de dibujo";
+    Text[ catalan ] = "objectes de dibuix";
+    Text[ thai ] = "วาดวัตถุ";
 };
  ////////////////////////////////////////////////////////////////////////////////////////////////////
 String STR_ObjNameSingulGRUP
@@ -129,7 +131,7 @@ String STR_ObjNameSingulGRUP
     Text [ italian ] = "Oggetto di gruppo" ;
     Text [ portuguese_brazilian ] = "Agrupar objeto" ;
     Text [ portuguese ] = "Objecto de grupo" ;
-    Text [ finnish ] = "ryhm�objekti" ;
+    Text [ finnish ] = "objektiryhm�" ;
     Text [ danish ] = "Gruppeobjekt" ;
     Text [ french ] = "Objet de groupe" ;
     Text [ swedish ] = "Gruppobjekt" ;
@@ -137,7 +139,7 @@ String STR_ObjNameSingulGRUP
     Text [ spanish ] = "Objeto de grupo" ;
     Text [ english_us ] = "group object" ;
     Text[ chinese_simplified ] = "分组对象";
-    Text[ russian ] = "������ ������";
+    Text[ russian ] = "��������� ������";
     Text[ polish ] = "Obiekty grupy";
     Text[ japanese ] = "グループ化オブジェクト";
     Text[ chinese_traditional ] = "群組物件";
@@ -148,7 +150,8 @@ String STR_ObjNameSingulGRUP
     Text[ korean ] = "그룹 개체";
     Text[ turkish ] = "Grup nesnesi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Objeto de grupo";
+    Text[ catalan ] = "objecte del grup";
+    Text[ thai ] = "จัดกลุ่มวัตถุ";
 };
 String STR_ObjNamePluralGRUP
 {
@@ -158,7 +161,7 @@ String STR_ObjNamePluralGRUP
     Text [ italian ] = "Oggetti di gruppo" ;
     Text [ portuguese_brazilian ] = "Agrupar objetos" ;
     Text [ portuguese ] = "Objectos de grupo" ;
-    Text [ finnish ] = "ryhm�objektit" ;
+    Text [ finnish ] = "objektiryhm�t" ;
     Text [ danish ] = "Gruppeobjekter" ;
     Text [ french ] = "Objets de groupe" ;
     Text [ swedish ] = "Gruppobjekt" ;
@@ -166,7 +169,7 @@ String STR_ObjNamePluralGRUP
     Text [ spanish ] = "Objetos de grupo" ;
     Text [ english_us ] = "group objects" ;
     Text[ chinese_simplified ] = "分组对象";
-    Text[ russian ] = "������� ������";
+    Text[ russian ] = "��������� �������";
     Text[ polish ] = "Obiekty grupy";
     Text[ japanese ] = "グループ化オブジェクト";
     Text[ chinese_traditional ] = "群組物件";
@@ -177,7 +180,8 @@ String STR_ObjNamePluralGRUP
     Text[ korean ] = "그룹 개체";
     Text[ turkish ] = "Grup nesneleri";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Objetos de grupo";
+    Text[ catalan ] = "objectes del grup";
+    Text[ thai ] = "จัดกลุ่มวัตถุ";
 };
 String STR_ObjNameSingulGRUPEMPTY
 {
@@ -193,7 +197,7 @@ String STR_ObjNameSingulGRUPEMPTY
     Text [ french ] = "Objet de groupe vide" ;
     Text [ dutch ] = "Leeg groepsobject" ;
     Text[ chinese_simplified ] = "空的分组对象";
-    Text[ russian ] = "������ ������ ������";
+    Text[ russian ] = "������ ��������� ������";
     Text[ polish ] = "pusty obiekt grupy";
     Text[ japanese ] = "空のグループ オブジェクト";
     Text[ chinese_traditional ] = "空的群組物件";
@@ -201,11 +205,12 @@ String STR_ObjNameSingulGRUPEMPTY
     Text[ dutch ] = "Leeg groepsobject";
     Text[ chinese_simplified ] = "空的分组对象";
     Text[ greek ] = "���� ����������� ������";
-    Text[ korean ] = "비어 있는 그룹 개체";
+    Text[ korean ] = "빈 그룹 개체";
     Text[ turkish ] = "Bo� grup nesnesi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Objeto de grupo vac�o";
-    Text[ finnish ] = "Tyhj� ryhm�objekti";
+    Text[ catalan ] = "objecte de grup en blanc";
+    Text[ finnish ] = "Tyhj� objektiryhm�";
+    Text[ thai ] = "กลุ่มวัตถุเปล่า";
 };
 String STR_ObjNamePluralGRUPEMPTY
 {
@@ -221,7 +226,7 @@ String STR_ObjNamePluralGRUPEMPTY
     Text [ french ] = "Objets de groupe vides" ;
     Text [ dutch ] = "Lege groepsobjecten" ;
     Text[ chinese_simplified ] = "空的分组对象";
-    Text[ russian ] = "������ ��������� �������";
+    Text[ russian ] = "������ ��������� �������";
     Text[ polish ] = "Puste obiekty grupy";
     Text[ japanese ] = "空のグループ オブジェクト";
     Text[ chinese_traditional ] = "空的群組物件";
@@ -229,11 +234,12 @@ String STR_ObjNamePluralGRUPEMPTY
     Text[ dutch ] = "Lege groepsobjecten";
     Text[ chinese_simplified ] = "空的分组对象";
     Text[ greek ] = "���� ����������� ������";
-    Text[ korean ] = "비어 있는 그룹 개체";
+    Text[ korean ] = "빈 그룹 개체";
     Text[ turkish ] = "Bo� grup nesneleri";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Objetos de grupo vac�os";
-    Text[ finnish ] = "Tyhji� ryhm�objekteja";
+    Text[ catalan ] = "Objectes de grup en blanc";
+    Text[ finnish ] = "Tyhji� objektiryhmi�";
+    Text[ thai ] = "กลุ่มวัตถุเปล่า";
 };
 String STR_ObjNameSingulGRUPLNK
 {
@@ -249,7 +255,7 @@ String STR_ObjNameSingulGRUPLNK
     Text [ french ] = "Objet de groupe li�" ;
     Text [ dutch ] = "Gekoppeld groepsobject" ;
     Text[ chinese_simplified ] = "链接的分组对象";
-    Text[ russian ] = "��������� ������ ������";
+    Text[ russian ] = "��������� ��������� ������";
     Text[ polish ] = "Po��czony obiekt grupy";
     Text[ japanese ] = "リンクされたグループ オブジェクト";
     Text[ chinese_traditional ] = "連結的群組物件";
@@ -260,8 +266,9 @@ String STR_ObjNameSingulGRUPLNK
     Text[ korean ] = "연결된 그룹 개체";
     Text[ turkish ] = "Ba�lant�l� grup nesnesi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Objeto de grupo enlazado";
-    Text[ finnish ] = "Linkitetty ryhm�objekti";
+    Text[ catalan ] = "Objecte de grup enlla�at";
+    Text[ finnish ] = "Linkitetty objektiryhm�";
+    Text[ thai ] = "เชื่อมโยงกลุ่มวัตถุ";
 };
 String STR_ObjNamePluralGRUPLNK
 {
@@ -277,7 +284,7 @@ String STR_ObjNamePluralGRUPLNK
     Text [ french ] = "Objets de groupe li�s" ;
     Text [ dutch ] = "Gekoppelde groepsobjecten" ;
     Text[ chinese_simplified ] = "链接的分组对象";
-    Text[ russian ] = "��������� ������� ������";
+    Text[ russian ] = "��������� ��������� �������";
     Text[ polish ] = "Po��czone obiekty grupy";
     Text[ japanese ] = "リンクしたグループ オブジェクト";
     Text[ chinese_traditional ] = "連結的群組物件";
@@ -288,8 +295,9 @@ String STR_ObjNamePluralGRUPLNK
     Text[ korean ] = "연결된 그룹 개체";
     Text[ turkish ] = "Ba�lant�l� grup nesneleri";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Objetos de grupo vinculados";
-    Text[ finnish ] = "Linkitetyt ryhm�objektit";
+    Text[ catalan ] = "Objectes de grup enlla�ats";
+    Text[ finnish ] = "Linkitetyt objektiryhm�t";
+    Text[ thai ] = "เชื่อมโยงกลุ่มวัตถุ";
 };
  ////////////////////////////////////////////////////////////////////////////////////////////////////
 String STR_ObjNameSingulLINE
@@ -319,7 +327,8 @@ String STR_ObjNameSingulLINE
     Text[ korean ] = "선";
     Text[ turkish ] = "�izgi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "L�nea";
+    Text[ catalan ] = "L�nia";
+    Text[ thai ] = "เส้น";
 };
 String STR_ObjNameSingulLINE_Hori
 {
@@ -335,7 +344,7 @@ String STR_ObjNameSingulLINE_Hori
     Text [ french ] = "Ligne horizontale" ;
     Text [ dutch ] = "Horizontale lijn" ;
     Text[ chinese_simplified ] = "水平线";
-    Text[ russian ] = "�������������� �����";
+    Text[ russian ] = "�������������� �����";
     Text[ polish ] = "Linia pozioma";
     Text[ japanese ] = "水平線";
     Text[ chinese_traditional ] = "水平線";
@@ -343,11 +352,12 @@ String STR_ObjNameSingulLINE_Hori
     Text[ dutch ] = "Horizontale lijn";
     Text[ chinese_simplified ] = "水平线";
     Text[ greek ] = "��������� ������";
-    Text[ korean ] = "수평선";
+    Text[ korean ] = "가로선";
     Text[ turkish ] = "Yatay �izgi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "L�nea horizontal";
+    Text[ catalan ] = "L�nia horitzontal";
     Text[ finnish ] = "vaakaviiva";
+    Text[ thai ] = "เส้นแนวนอน";
 };
 String STR_ObjNameSingulLINE_Vert
 {
@@ -363,7 +373,7 @@ String STR_ObjNameSingulLINE_Vert
     Text [ french ] = "Ligne verticale" ;
     Text [ dutch ] = "Verticale lijn" ;
     Text[ chinese_simplified ] = "垂直线";
-    Text[ russian ] = "������������ �����";
+    Text[ russian ] = "������������ �����";
     Text[ polish ] = "Linia pionowa";
     Text[ japanese ] = "垂直線";
     Text[ chinese_traditional ] = "垂直線";
@@ -371,11 +381,12 @@ String STR_ObjNameSingulLINE_Vert
     Text[ dutch ] = "Verticale lijn";
     Text[ chinese_simplified ] = "垂直线";
     Text[ greek ] = "���������� ������";
-    Text[ korean ] = "수직선";
+    Text[ korean ] = "세로선";
     Text[ turkish ] = "Dikey �izgi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "L�nea vertical";
+    Text[ catalan ] = "L�nia vertical";
     Text[ finnish ] = "pystyviiva";
+    Text[ thai ] = "เส้นแนวตั้ง";
 };
 String STR_ObjNameSingulLINE_Diag
 {
@@ -391,7 +402,7 @@ String STR_ObjNameSingulLINE_Diag
     Text [ french ] = "Ligne diagonale" ;
     Text [ dutch ] = "Diagonale lijn" ;
     Text[ chinese_simplified ] = "对角线";
-    Text[ russian ] = "������������� �����";
+    Text[ russian ] = "������������ �����";
     Text[ polish ] = "Przek�tna";
     Text[ japanese ] = "対角線";
     Text[ chinese_traditional ] = "對角線";
@@ -402,8 +413,9 @@ String STR_ObjNameSingulLINE_Diag
     Text[ korean ] = "대각선";
     Text[ turkish ] = "Diyagonal �izgi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "L�nea diagonal";
+    Text[ catalan ] = "L�nia diagonal";
     Text[ finnish ] = "l�vist�j�viiva";
+    Text[ thai ] = "เส้นทแยงมุม";
 };
 String STR_ObjNamePluralLINE
 {
@@ -432,7 +444,8 @@ String STR_ObjNamePluralLINE
     Text[ korean ] = "선";
     Text[ turkish ] = "�izgi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "L�neas";
+    Text[ catalan ] = "L�nes";
+    Text[ thai ] = "เส้น";
 };
  ////////////////////////////////////////////////////////////////////////////////////////////////////
 String STR_ObjNameSingulRECT
@@ -462,7 +475,8 @@ String STR_ObjNameSingulRECT
     Text[ korean ] = "직사각형";
     Text[ turkish ] = "Dikd�rtgen";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Rect�ngulo";
+    Text[ catalan ] = "Rectangle";
+    Text[ thai ] = "สี่เหลี่ยม";
 };
 String STR_ObjNamePluralRECT
 {
@@ -472,7 +486,7 @@ String STR_ObjNamePluralRECT
     Text [ italian ] = "Rettangoli" ;
     Text [ portuguese_brazilian ] = "Ret?ngulos" ;
     Text [ portuguese ] = "Rect�ngulo" ;
-    Text [ finnish ] = "Suorakulmiot" ;
+    Text [ finnish ] = "Suorakulmio" ;
     Text [ danish ] = "Rektangler" ;
     Text [ french ] = "Rectangles" ;
     Text [ swedish ] = "Rektanglar" ;
@@ -491,7 +505,8 @@ String STR_ObjNamePluralRECT
     Text[ korean ] = "직사각형";
     Text[ turkish ] = "Dikd�rtgenler";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Rect�ngulos";
+    Text[ catalan ] = "Rectangles";
+    Text[ thai ] = "สี่เหลี่ยม";
 };
 String STR_ObjNameSingulQUAD
 {
@@ -518,8 +533,9 @@ String STR_ObjNameSingulQUAD
     Text[ korean ] = "정사각형";
     Text[ turkish ] = "Kare";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Cuadrado";
+    Text[ catalan ] = "Quadrat";
     Text[ finnish ] = "Neli�";
+    Text[ thai ] = "สี่เหลี่ยมจัตุรัส";
 };
 String STR_ObjNamePluralQUAD
 {
@@ -546,8 +562,9 @@ String STR_ObjNamePluralQUAD
     Text[ korean ] = "정사각형";
     Text[ turkish ] = "Kareler";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Cuadrados";
-    Text[ finnish ] = "Neli�t";
+    Text[ catalan ] = "Quadrats";
+    Text[ finnish ] = "Neli�";
+    Text[ thai ] = "สี่เหลี่ยมจัตุรัส";
 };
 String STR_ObjNameSingulPARAL
 {
@@ -561,14 +578,14 @@ String STR_ObjNameSingulPARAL
     Text [ italian ] = "Parallelogramma" ;
     Text [ spanish ] = "Paralelograma" ;
     Text [ french ] = "Parall�logramme" ;
-    Text [ dutch ] = "Parallelogram" ;
+    Text [ dutch ] = "Parallellogram" ;
     Text[ chinese_simplified ] = "平行四边形";
     Text[ russian ] = "��������������";
     Text[ polish ] = "R�wnoleg�obok";
     Text[ japanese ] = "平行四辺形";
     Text[ chinese_traditional ] = "平行四邊形";
     Text[ arabic ] = "������ �����";
-    Text[ dutch ] = "Parallelogram";
+    Text[ dutch ] = "Parallellogram";
     Text[ chinese_simplified ] = "平行四边形";
     Text[ greek ] = "���������������";
     Text[ korean ] = "평행사변형";
@@ -576,6 +593,7 @@ String STR_ObjNameSingulPARAL
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Paralelograma";
     Text[ finnish ] = "Suunnikas";
+    Text[ thai ] = "สี่เหลี่ยมด้านขนาน";
 };
 String STR_ObjNamePluralPARAL
 {
@@ -589,21 +607,22 @@ String STR_ObjNamePluralPARAL
     Text [ italian ] = "Parallelogrammi" ;
     Text [ spanish ] = "Paralelogramos" ;
     Text [ french ] = "Parall�logramme" ;
-    Text [ dutch ] = "Parallelogrammen" ;
+    Text [ dutch ] = "Parallellogrammen" ;
     Text[ chinese_simplified ] = "平行四边形";
     Text[ russian ] = "���������������";
     Text[ polish ] = "R�wnoleg�oboki";
     Text[ japanese ] = "平行四辺形";
     Text[ chinese_traditional ] = "平行四邊形";
     Text[ arabic ] = "�������� �������";
-    Text[ dutch ] = "Parallelogrammen";
+    Text[ dutch ] = "Parallellogrammen";
     Text[ chinese_simplified ] = "平行四边形";
     Text[ greek ] = "���������������";
     Text[ korean ] = "평행사변형";
     Text[ turkish ] = "Paralelkenarlar";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Paralelogramos";
+    Text[ catalan ] = "Paralelogrames";
     Text[ finnish ] = "Suunnikkaat";
+    Text[ thai ] = "สี่เหลี่ยมด้านขนาน";
 };
 String STR_ObjNameSingulRAUTE
 {
@@ -630,8 +649,9 @@ String STR_ObjNameSingulRAUTE
     Text[ korean ] = "마름모꼴";
     Text[ turkish ] = "Elmas";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Rombo";
+    Text[ catalan ] = "Rombe";
     Text[ finnish ] = "Vinoneli�";
+    Text[ thai ] = "สี่เหลี่ยมขนมเปียกปูน";
 };
 String STR_ObjNamePluralRAUTE
 {
@@ -658,8 +678,9 @@ String STR_ObjNamePluralRAUTE
     Text[ korean ] = "마름모꼴";
     Text[ turkish ] = "Elmaslar";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Rombos";
-    Text[ finnish ] = "Vinoneli�t";
+    Text[ catalan ] = "Rombes";
+    Text[ finnish ] = "Vinoneli�";
+    Text[ thai ] = "สี่เหลี่ยมขนมเปียกปูน";
 };
 String STR_ObjNameSingulRECTRND
 {
@@ -675,7 +696,7 @@ String STR_ObjNameSingulRECTRND
     Text [ french ] = "Rectangle arrondi" ;
     Text [ dutch ] = "Afgeronde rechthoek" ;
     Text[ chinese_simplified ] = "圆角矩形";
-    Text[ russian ] = "������������ �������������";
+    Text[ russian ] = "������������ �������������";
     Text[ polish ] = "Prostok�t z zaokr�glonymi naro�nikami";
     Text[ japanese ] = "角を丸くした長方形";
     Text[ chinese_traditional ] = "圓角矩形";
@@ -686,8 +707,9 @@ String STR_ObjNameSingulRECTRND
     Text[ korean ] = "둥글린 직사각형";
     Text[ turkish ] = "Yuvarlak k��eli dikd�rtgen";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Rect�ngulo redondeado";
+    Text[ catalan ] = "Rectangle arrodonit";
     Text[ finnish ] = "Py�ristetty nelikulmio";
+    Text[ thai ] = "สี่เหลี่ยมมน";
 };
 String STR_ObjNamePluralRECTRND
 {
@@ -703,7 +725,7 @@ String STR_ObjNamePluralRECTRND
     Text [ french ] = "Rectangles arrondis" ;
     Text [ dutch ] = "Afgeronde rechthoeken" ;
     Text[ chinese_simplified ] = "圆角矩形";
-    Text[ russian ] = "������������ ��������������";
+    Text[ russian ] = "������������ ��������������";
     Text[ polish ] = "Prostok�ty z zaokr�glonymi naro�nikami";
     Text[ japanese ] = "角を丸くした長方形";
     Text[ chinese_traditional ] = "圓角矩形";
@@ -714,8 +736,9 @@ String STR_ObjNamePluralRECTRND
     Text[ korean ] = "둥글린 직사각형";
     Text[ turkish ] = "Yuvarlak k��eli dikd�rtgenler";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Rect�ngulos redondeados";
-    Text[ finnish ] = "Py�ristetyt nelikulmiot";
+    Text[ catalan ] = "Rectangles arrodonits";
+    Text[ finnish ] = "Py�ristetty nelikulmio";
+    Text[ thai ] = "สี่เหลี่ยมมน";
 };
 String STR_ObjNameSingulQUADRND
 {
@@ -729,21 +752,22 @@ String STR_ObjNameSingulQUADRND
     Text [ italian ] = "Quadrato arrotondato" ;
     Text [ spanish ] = "Cuadrado redondeado" ;
     Text [ french ] = "Carr� arrondi" ;
-    Text [ dutch ] = "Afgrond vierkant" ;
+    Text [ dutch ] = "Afgerond vierkant" ;
     Text[ chinese_simplified ] = "圆角正方形";
-    Text[ russian ] = "������������ �������";
+    Text[ russian ] = "������������ �������";
     Text[ polish ] = "Kwadrat z zaokr�glonymi naro�nikami";
     Text[ japanese ] = "角を丸くした正方形";
     Text[ chinese_traditional ] = "圓角正方形";
     Text[ arabic ] = "���� ������ �������";
-    Text[ dutch ] = "Afgrond vierkant";
+    Text[ dutch ] = "Afgerond vierkant";
     Text[ chinese_simplified ] = "圆角正方形";
     Text[ greek ] = "������������� ���������";
     Text[ korean ] = "둥글린 정사각형";
     Text[ turkish ] = "Yuvarlak k��eli kare";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Cuadrado redondeado";
+    Text[ catalan ] = "Quadrat arrodonit";
     Text[ finnish ] = "py�ristetty neli�";
+    Text[ thai ] = "สี่เหลี่ยมจัตุรัสมน";
 };
 String STR_ObjNamePluralQUADRND
 {
@@ -759,7 +783,7 @@ String STR_ObjNamePluralQUADRND
     Text [ french ] = "Carr�s arrondis" ;
     Text [ dutch ] = "Afgeronde vierkanten" ;
     Text[ chinese_simplified ] = "圆角正方形";
-    Text[ russian ] = "������������ ��������";
+    Text[ russian ] = "������������ ��������";
     Text[ polish ] = "Kwadraty z zaokr�glonymi naro�nikami";
     Text[ japanese ] = "角を丸くした正方形";
     Text[ chinese_traditional ] = "圓角正方形";
@@ -767,11 +791,12 @@ String STR_ObjNamePluralQUADRND
     Text[ dutch ] = "Afgeronde vierkanten";
     Text[ chinese_simplified ] = "圆角正方形";
     Text[ greek ] = "������������� ���������";
-    Text[ korean ] = "모서리가 둥근 정사각형";
+    Text[ korean ] = "둥글린 정사각형";
     Text[ turkish ] = "Yuvarlak k��eli kareler";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Cuadrados redondeados";
-    Text[ finnish ] = "Py�ristetyt neli�t";
+    Text[ catalan ] = "Quadrats arrodonits";
+    Text[ finnish ] = "Py�ristetty neli�t";
+    Text[ thai ] = "สี่เหลี่ยมจัตุรัสมน";
 };
 String STR_ObjNameSingulPARALRND
 {
@@ -785,21 +810,22 @@ String STR_ObjNameSingulPARALRND
     Text [ italian ] = "Parallelogramma arrotondato" ;
     Text [ spanish ] = "Paralelograma redondeado" ;
     Text [ french ] = "Parall�logramme arrondi" ;
-    Text [ dutch ] = "Afgerond paralellogram" ;
+    Text [ dutch ] = "Afgerond parallellogram" ;
     Text[ chinese_simplified ] = "圆角平行四边形";
-    Text[ russian ] = "������������ ��������������";
+    Text[ russian ] = "������������ ��������������";
     Text[ polish ] = "R�wnoleg�obok z zaokr�glonymi naro�nikami";
     Text[ japanese ] = "角を丸くした平行四辺形";
     Text[ chinese_traditional ] = "圓角平行四邊形";
     Text[ arabic ] = "������ ����� ������ �������";
-    Text[ dutch ] = "Afgerond paralellogram";
+    Text[ dutch ] = "Afgerond parallellogram";
     Text[ chinese_simplified ] = "圆角平行四边形";
     Text[ greek ] = "������������� ���������������";
     Text[ korean ] = "둥글린 평행사변형";
     Text[ turkish ] = "Yuvarlak k��eli paralelkenar";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Paralelograma redondeado";
+    Text[ catalan ] = "Paralelograma arrodonit";
     Text[ finnish ] = "Py�ristetty suunnikas";
+    Text[ thai ] = "สี่เหลี่ยมด้านขนานมน";
 };
 String STR_ObjNamePluralPARALRND
 {
@@ -813,21 +839,22 @@ String STR_ObjNamePluralPARALRND
     Text [ italian ] = "parallelogrammi arrotondati" ;
     Text [ spanish ] = "Paralelogramas redondeados" ;
     Text [ french ] = "Parall�logrammes arrondis" ;
-    Text [ dutch ] = "Afgeronde parallelogrammen" ;
+    Text [ dutch ] = "Afgeronde parallellogrammen" ;
     Text[ chinese_simplified ] = "圆角平行四边形";
-    Text[ russian ] = "������������ ���������������";
+    Text[ russian ] = "������������ ���������������";
     Text[ polish ] = "R�wnoleg�oboki z zaokr�glonymi naro�nikami";
     Text[ japanese ] = "角を丸くした平行四辺形";
     Text[ chinese_traditional ] = "圓角平行四邊形";
     Text[ arabic ] = "�������� ����� ������� �������";
-    Text[ dutch ] = "Afgeronde parallelogrammen";
+    Text[ dutch ] = "Afgeronde parallellogrammen";
     Text[ chinese_simplified ] = "圆角平行四边形";
     Text[ greek ] = "������������� ���������������";
     Text[ korean ] = "둥글린 평행사변형";
     Text[ turkish ] = "Yuvarlak k��eli paralelkenarlar";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Paralelogramas redondeados";
+    Text[ catalan ] = "Paralelogrames arrodonits";
     Text[ finnish ] = "Py�ristetyt suunnikkaat";
+    Text[ thai ] = "สี่เหลี่ยมด้านขนานมน";
 };
 String STR_ObjNameSingulRAUTERND
 {
@@ -843,7 +870,7 @@ String STR_ObjNameSingulRAUTERND
     Text [ french ] = "Rhombe arrondi" ;
     Text [ dutch ] = "Afgeronde ruit" ;
     Text[ chinese_simplified ] = "圆角菱形";
-    Text[ russian ] = "������������ ����";
+    Text[ russian ] = "������������ ����";
     Text[ polish ] = "Romb z zaokr�glonymi naro�nikami";
     Text[ japanese ] = "角を丸くしたひし形";
     Text[ chinese_traditional ] = "圓角菱形";
@@ -854,8 +881,9 @@ String STR_ObjNameSingulRAUTERND
     Text[ korean ] = "둥글린 마름모꼴";
     Text[ turkish ] = "Yuvarlak k��eli elmas";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Rombo redondeado";
+    Text[ catalan ] = "Rombe arrodonit";
     Text[ finnish ] = "py�ristetty vinoneli�";
+    Text[ thai ] = "สี่เหลี่ยมขนมเปียกปูนมน";
 };
 String STR_ObjNamePluralRAUTERND
 {
@@ -871,7 +899,7 @@ String STR_ObjNamePluralRAUTERND
     Text [ french ] = "Rhombes arrondis" ;
     Text [ dutch ] = "Afgeronde ruiten" ;
     Text[ chinese_simplified ] = "圆角菱形";
-    Text[ russian ] = "������������ �����";
+    Text[ russian ] = "������������ �����";
     Text[ polish ] = "Romby z zaokr�glonymi naro�nikami";
     Text[ japanese ] = "角を丸くしたひし形";
     Text[ chinese_traditional ] = "圓角菱形";
@@ -882,8 +910,9 @@ String STR_ObjNamePluralRAUTERND
     Text[ korean ] = "둥글린 마름모꼴";
     Text[ turkish ] = "Yuvarlak k��eli elmaslar";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Rombos redondeados";
+    Text[ catalan ] = "Rombes arrodonits";
     Text[ finnish ] = "Py�ristetyt vinoneli�t";
+    Text[ thai ] = "สี่เหลี่ยมขนมเปียกปูนมน";
 };
  ////////////////////////////////////////////////////////////////////////////////////////////////////
 String STR_ObjNameSingulCIRC
@@ -913,7 +942,8 @@ String STR_ObjNameSingulCIRC
     Text[ korean ] = "원";
     Text[ turkish ] = "Daire";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "C�rculo";
+    Text[ catalan ] = "Cercle";
+    Text[ thai ] = "วงกลม";
 };
 String STR_ObjNamePluralCIRC
 {
@@ -942,7 +972,8 @@ String STR_ObjNamePluralCIRC
     Text[ korean ] = "원";
     Text[ turkish ] = "Daire";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "C�rculos";
+    Text[ catalan ] = "Cercles";
+    Text[ thai ] = "วงกลม";
 };
 String STR_ObjNameSingulSECT
 {
@@ -971,7 +1002,8 @@ String STR_ObjNameSingulSECT
     Text[ korean ] = "원 부채꼴";
     Text[ turkish ] = "Pasta";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Sector de c�rculo";
+    Text[ catalan ] = "Sector del cercle";
+    Text[ thai ] = "ส่วนของวงกลม";
 };
 String STR_ObjNamePluralSECT
 {
@@ -981,7 +1013,7 @@ String STR_ObjNamePluralSECT
     Text [ italian ] = "Settori di cerchio" ;
     Text [ portuguese_brazilian ] = "Setores" ;
     Text [ portuguese ] = "Sectores de c�rculo" ;
-    Text [ finnish ] = "Ympyr�n sektorit" ;
+    Text [ finnish ] = "Ympyr�n sektori" ;
     Text [ danish ] = "Cirkelsektorer" ;
     Text [ french ] = "Secteurs de cercle" ;
     Text [ swedish ] = "Cirkelsektorer" ;
@@ -1000,7 +1032,8 @@ String STR_ObjNamePluralSECT
     Text[ korean ] = "원 부채꼴";
     Text[ turkish ] = "Pastalar";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Sectores de c�rculo";
+    Text[ catalan ] = "Sectors del cercle";
+    Text[ thai ] = "ส่วนของวงกลม";
 };
 String STR_ObjNameSingulCARC
 {
@@ -1015,7 +1048,7 @@ String STR_ObjNameSingulCARC
     Text [ french ] = "Arc de cercle" ;
     Text [ swedish ] = "Cirkelb�ge" ;
     Text [ dutch ] = "Cirkelboog" ;
-    Text [ spanish ] = "Arco de c�rculo" ;
+    Text [ spanish ] = "Arco" ;
     Text [ english_us ] = "Arc" ;
     Text[ chinese_simplified ] = "圆弧";
     Text[ russian ] = "���� ����������";
@@ -1029,7 +1062,8 @@ String STR_ObjNameSingulCARC
     Text[ korean ] = "원호";
     Text[ turkish ] = "Yay";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Arco de c�rculo";
+    Text[ catalan ] = "Arc";
+    Text[ thai ] = "ส่วนโค้ง";
 };
 String STR_ObjNamePluralCARC
 {
@@ -1044,7 +1078,7 @@ String STR_ObjNamePluralCARC
     Text [ french ] = "Arcs de cercles" ;
     Text [ swedish ] = "Cirkelb�gar" ;
     Text [ dutch ] = "Cirkelbogen" ;
-    Text [ spanish ] = "Arcos de c�rculo" ;
+    Text [ spanish ] = "Arcos" ;
     Text [ english_us ] = "Arcs" ;
     Text[ chinese_simplified ] = "圆弧";
     Text[ russian ] = "���� ����������";
@@ -1058,7 +1092,8 @@ String STR_ObjNamePluralCARC
     Text[ korean ] = "원호";
     Text[ turkish ] = "Yaylar";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Arcos de c�rculo";
+    Text[ catalan ] = "Arcs";
+    Text[ thai ] = "ส่วนโค้ง";
 };
 String STR_ObjNameSingulCCUT
 {
@@ -1072,7 +1107,7 @@ String STR_ObjNameSingulCCUT
     Text [ danish ] = "Cirkelsegment" ;
     Text [ french ] = "Segment de cercle" ;
     Text [ swedish ] = "Cirkelsegment" ;
-    Text [ dutch ] = "Segment" ;
+    Text [ dutch ] = "Cirkelsegment" ;
     Text [ spanish ] = "Segmento de c�rculo" ;
     Text [ english_us ] = "Circle segment" ;
     Text[ chinese_simplified ] = "扇形";
@@ -1081,13 +1116,14 @@ String STR_ObjNameSingulCCUT
     Text[ japanese ] = "円の切片";
     Text[ chinese_traditional ] = "扇形";
     Text[ arabic ] = "���� �� �����";
-    Text[ dutch ] = "Segment";
+    Text[ dutch ] = "Cirkelsegment";
     Text[ chinese_simplified ] = "扇形";
     Text[ greek ] = "����� ������";
     Text[ korean ] = "원 세그먼트";
     Text[ turkish ] = "Daire par�as�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Segmento de c�rculo";
+    Text[ catalan ] = "Segment del cercle";
+    Text[ thai ] = "ส่วนของวงกลม";
 };
 String STR_ObjNamePluralCCUT
 {
@@ -1116,7 +1152,8 @@ String STR_ObjNamePluralCCUT
     Text[ korean ] = "원 세그먼트";
     Text[ turkish ] = "Daire par�alar�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Segmentos de c�rculo";
+    Text[ catalan ] = "Segments del cercle";
+    Text[ thai ] = "ส่วนของวงกลม";
 };
 String STR_ObjNameSingulCIRCE
 {
@@ -1126,7 +1163,7 @@ String STR_ObjNameSingulCIRCE
     Text [ italian ] = "Ellisse" ;
     Text [ portuguese_brazilian ] = "Elipse" ;
     Text [ portuguese ] = "Elipse" ;
-    Text [ finnish ] = "Ellipsi" ;
+    Text [ finnish ] = "Soikio" ;
     Text [ danish ] = "Ellipse" ;
     Text [ french ] = "Ellipse" ;
     Text [ swedish ] = "Ellips" ;
@@ -1134,7 +1171,7 @@ String STR_ObjNameSingulCIRCE
     Text [ spanish ] = "Elipse" ;
     Text [ english_us ] = "Ellipse" ;
     Text[ chinese_simplified ] = "椭圆";
-    Text[ russian ] = "�������";
+    Text[ russian ] = "������";
     Text[ polish ] = "Elipsa";
     Text[ japanese ] = "楕円形";
     Text[ chinese_traditional ] = "橢圓";
@@ -1146,6 +1183,7 @@ String STR_ObjNameSingulCIRCE
     Text[ turkish ] = "Elips";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Elipse";
+    Text[ thai ] = "วงรี";
 };
 String STR_ObjNamePluralCIRCE
 {
@@ -1155,7 +1193,7 @@ String STR_ObjNamePluralCIRCE
     Text [ italian ] = "Ellissi" ;
     Text [ portuguese_brazilian ] = "Elipses" ;
     Text [ portuguese ] = "Elipses" ;
-    Text [ finnish ] = "Ellipsit" ;
+    Text [ finnish ] = "Soikiot" ;
     Text [ danish ] = "Ellipser" ;
     Text [ french ] = "Ellipses" ;
     Text [ swedish ] = "Ellipser" ;
@@ -1175,6 +1213,7 @@ String STR_ObjNamePluralCIRCE
     Text[ turkish ] = "Elips";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Elipses";
+    Text[ thai ] = "วงรี";
 };
 String STR_ObjNameSingulSECTE
 {
@@ -1184,12 +1223,12 @@ String STR_ObjNameSingulSECTE
     Text [ italian ] = "Settore di ellisse" ;
     Text [ portuguese_brazilian ] = "Setor El?ptico" ;
     Text [ portuguese ] = "Sector de elipse" ;
-    Text [ finnish ] = "Ellipsikaavio" ;
+    Text [ finnish ] = "Soikion lohko" ;
     Text [ danish ] = "Ellipsesektor" ;
-    Text [ french ] = "Secteur elliptique" ;
+    Text [ french ] = "Secteur d'ellipse" ;
     Text [ swedish ] = "Ellipssektor" ;
     Text [ dutch ] = "Ellipssector" ;
-    Text [ spanish ] = "Sector el�ptico" ;
+    Text [ spanish ] = "Sector de la elipse" ;
     Text [ english_us ] = "Ellipse Pie" ;
     Text[ chinese_simplified ] = "椭圆部分";
     Text[ russian ] = "������ �������";
@@ -1203,7 +1242,8 @@ String STR_ObjNameSingulSECTE
     Text[ korean ] = "타원 부채꼴";
     Text[ turkish ] = "Elips pasta";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Sector el�ptico";
+    Text[ catalan ] = "Sector el�ptic";
+    Text[ thai ] = "วงรีพาย";
 };
 String STR_ObjNamePluralSECTE
 {
@@ -1213,9 +1253,9 @@ String STR_ObjNamePluralSECTE
     Text [ italian ] = "Settori di ellisse" ;
     Text [ portuguese_brazilian ] = "Setores El?pticos" ;
     Text [ portuguese ] = "Sectores de elipse" ;
-    Text [ finnish ] = "Ellipsikaaviot" ;
+    Text [ finnish ] = "Soikion lohkot" ;
     Text [ danish ] = "Ellipsesektorer" ;
-    Text [ french ] = "Secteurs ellipse" ;
+    Text [ french ] = "Secteurs d'ellipse" ;
     Text [ swedish ] = "Ellipssektorer" ;
     Text [ dutch ] = "Ellipssectoren" ;
     Text [ spanish ] = "Sectores de la elipse" ;
@@ -1232,7 +1272,8 @@ String STR_ObjNamePluralSECTE
     Text[ korean ] = "타원 부채꼴";
     Text[ turkish ] = "Elips pastalar";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Sectores de la elipse";
+    Text[ catalan ] = "Sectors de l'elipse";
+    Text[ thai ] = "วงรีไพ";
 };
 String STR_ObjNameSingulCARCE
 {
@@ -1242,12 +1283,12 @@ String STR_ObjNameSingulCARCE
     Text [ italian ] = "Arco ellittico" ;
     Text [ portuguese_brazilian ] = "Arco El?ptico" ;
     Text [ portuguese ] = "Arco el�ptico" ;
-    Text [ finnish ] = "Ellipsikaari" ;
+    Text [ finnish ] = "Soikion kaari" ;
     Text [ danish ] = "Ellipsebue" ;
     Text [ french ] = "Arc d'ellipse" ;
     Text [ swedish ] = "Ellipsb�ge" ;
     Text [ dutch ] = "Ellipsboog" ;
-    Text [ spanish ] = "Arco de elipse" ;
+    Text [ spanish ] = "Arco de la elipse" ;
     Text [ english_us ] = "Elliptical arc" ;
     Text[ chinese_simplified ] = "椭圆弧";
     Text[ russian ] = "���� �������";
@@ -1261,7 +1302,8 @@ String STR_ObjNameSingulCARCE
     Text[ korean ] = "타원호";
     Text[ turkish ] = "Elips yay";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Arco de elipse";
+    Text[ catalan ] = "Arc d'elipse";
+    Text[ thai ] = "ส่วนโค้งของวงรี";
 };
 String STR_ObjNamePluralCARCE
 {
@@ -1276,7 +1318,7 @@ String STR_ObjNamePluralCARCE
     Text [ french ] = "Arcs d'ellipse" ;
     Text [ swedish ] = "Ellipsb�gar" ;
     Text [ dutch ] = "Ellipsbogen" ;
-    Text [ spanish ] = "Arcos el�pticos" ;
+    Text [ spanish ] = "Arcos de elipse" ;
     Text [ english_us ] = "Elliptical arcs" ;
     Text[ chinese_simplified ] = "椭圆弧";
     Text[ russian ] = "���� �������";
@@ -1290,7 +1332,8 @@ String STR_ObjNamePluralCARCE
     Text[ korean ] = "타원호";
     Text[ turkish ] = "Elips yaylar";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Arcos el�pticos";
+    Text[ catalan ] = "Arcs el�ptics";
+    Text[ thai ] = "ส่วนโค้งของวงรี";
 };
 String STR_ObjNameSingulCCUTE
 {
@@ -1300,12 +1343,12 @@ String STR_ObjNameSingulCCUTE
     Text [ italian ] = "Segmento di ellisse" ;
     Text [ portuguese_brazilian ] = "Segmento El?ptico" ;
     Text [ portuguese ] = "Segmento el�ptico" ;
-    Text [ finnish ] = "Ellipsin segmentti" ;
+    Text [ finnish ] = "Soikion segmentti" ;
     Text [ danish ] = "Ellipsesegment" ;
     Text [ french ] = "Segment d'ellipse" ;
     Text [ swedish ] = "Ellipssegment" ;
     Text [ dutch ] = "Ellipssegment" ;
-    Text [ spanish ] = "Segmento el�ptico" ;
+    Text [ spanish ] = "Segmento de la elipse" ;
     Text [ english_us ] = "Ellipse Segment" ;
     Text[ chinese_simplified ] = "椭圆缺";
     Text[ russian ] = "������� �������";
@@ -1319,7 +1362,8 @@ String STR_ObjNameSingulCCUTE
     Text[ korean ] = "타원 세그먼트";
     Text[ turkish ] = "Elips par�as�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Segmento el�ptico";
+    Text[ catalan ] = "Segment el�ptic";
+    Text[ thai ] = "ส่วนของวงรี";
 };
 String STR_ObjNamePluralCCUTE
 {
@@ -1329,12 +1373,12 @@ String STR_ObjNamePluralCCUTE
     Text [ italian ] = "Segmenti di ellisse" ;
     Text [ portuguese_brazilian ] = "Segmentos El?pticos" ;
     Text [ portuguese ] = "Segmentos el�pticos" ;
-    Text [ finnish ] = "Ellipsisegmentit" ;
+    Text [ finnish ] = "Soikion segmentit" ;
     Text [ danish ] = "Ellipsesegmenter" ;
     Text [ french ] = "Segments d'ellipse" ;
     Text [ swedish ] = "Ellipssegment" ;
-    Text [ dutch ] = "Ellips-segmenten" ;
-    Text [ spanish ] = "Segmentos el�pticos" ;
+    Text [ dutch ] = "Ellipssegmenten" ;
+    Text [ spanish ] = "Segmentos de la elipse" ;
     Text [ english_us ] = "Ellipse Segments" ;
     Text[ chinese_simplified ] = "椭圆缺";
     Text[ russian ] = "�������� �������";
@@ -1342,13 +1386,14 @@ String STR_ObjNamePluralCCUTE
     Text[ japanese ] = "楕円形の切片";
     Text[ chinese_traditional ] = "橢圓缺";
     Text[ arabic ] = "��� �� ��� �����";
-    Text[ dutch ] = "Ellips-segmenten";
+    Text[ dutch ] = "Ellipssegmenten";
     Text[ chinese_simplified ] = "椭圆缺";
     Text[ greek ] = "������� ��������";
     Text[ korean ] = "타원 세그먼트";
     Text[ turkish ] = "Elips par�alar�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Segmentos el�pticos";
+    Text[ catalan ] = "Segments el�ptics";
+    Text[ thai ] = "ส่วนของวงรี";
 };
  ////////////////////////////////////////////////////////////////////////////////////////////////////
 String STR_ObjNameSingulPOLY
@@ -1359,7 +1404,7 @@ String STR_ObjNameSingulPOLY
     Text [ italian ] = "Poligono" ;
     Text [ portuguese_brazilian ] = "Pol?gono" ;
     Text [ portuguese ] = "Pol�gono" ;
-    Text [ finnish ] = "Polygoni" ;
+    Text [ finnish ] = "Monikulmio" ;
     Text [ danish ] = "Polygon" ;
     Text [ french ] = "Polygone" ;
     Text [ swedish ] = "Polygon" ;
@@ -1378,7 +1423,8 @@ String STR_ObjNameSingulPOLY
     Text[ korean ] = "다각형";
     Text[ turkish ] = "�okgen";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Pol�gono";
+    Text[ catalan ] = "Pol�gon";
+    Text[ thai ] = "หลายเหลี่ยม";
 };
 String STR_ObjNameSingulPOLY_PntAnz
 {
@@ -1388,7 +1434,7 @@ String STR_ObjNameSingulPOLY_PntAnz
     Text [ italian ] = "Poligono con %N punti" ;
     Text [ portuguese_brazilian ] = "+++Pol?gono" ;
     Text [ portuguese ] = "Pol�gono com %N pontos" ;
-    Text [ finnish ] = "Polygoni, jossa %N kulmaa" ;
+    Text [ finnish ] = "Monikulmio, jossa %N kulmaa" ;
     Text [ danish ] = "Polygon med %N punkter" ;
     Text [ french ] = "Polygone avec %N points" ;
     Text [ swedish ] = "Polygon med %N punkter" ;
@@ -1396,7 +1442,7 @@ String STR_ObjNameSingulPOLY_PntAnz
     Text [ spanish ] = "Pol�gono con %N puntos" ;
     Text [ english_us ] = "Polygon %N corners" ;
     Text[ chinese_simplified ] = "带 %N 点的多边形";
-    Text[ russian ] = "������������� � %N ��������";
+    Text[ russian ] = "������������� � %N ������";
     Text[ polish ] = "Wielok�t z %N naro�nikami";
     Text[ japanese ] = "%Nつの制御点をもつ多角形";
     Text[ chinese_traditional ] = "帶 %N 點的多邊形";
@@ -1407,7 +1453,8 @@ String STR_ObjNameSingulPOLY_PntAnz
     Text[ korean ] = "%N 점이 있는 다각형";
     Text[ turkish ] = "%N noktal� �okgen";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Pol�gono con %N puntos";
+    Text[ catalan ] = "Pol�gon amb %N punts";
+    Text[ thai ] = "หลายเหลี่ยม %N มุม";
 };
 String STR_ObjNamePluralPOLY
 {
@@ -1417,7 +1464,7 @@ String STR_ObjNamePluralPOLY
     Text [ italian ] = "Poligoni" ;
     Text [ portuguese_brazilian ] = "Pol?gonos" ;
     Text [ portuguese ] = "Pol�gonos" ;
-    Text [ finnish ] = "Polygonit" ;
+    Text [ finnish ] = "Monikulmio" ;
     Text [ danish ] = "Polygoner" ;
     Text [ french ] = "Polygones" ;
     Text [ swedish ] = "Polygoner" ;
@@ -1436,7 +1483,8 @@ String STR_ObjNamePluralPOLY
     Text[ korean ] = "다각형";
     Text[ turkish ] = "�okgenler";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Pol�gonos";
+    Text[ catalan ] = "Pol�gons";
+    Text[ thai ] = "หลายเหลี่ยม";
 };
 String STR_ObjNameSingulPLIN
 {
@@ -1454,7 +1502,7 @@ String STR_ObjNameSingulPLIN
     Text [ spanish ] = "Polil�nea" ;
     Text [ english_us ] = "Polyline" ;
     Text[ chinese_simplified ] = "多边线条";
-    Text[ russian ] = "���������";
+    Text[ russian ] = "�������";
     Text[ polish ] = "Linia �amana";
     Text[ japanese ] = "多折線";
     Text[ chinese_traditional ] = "多邊線條";
@@ -1465,7 +1513,8 @@ String STR_ObjNameSingulPLIN
     Text[ korean ] = "다중선";
     Text[ turkish ] = "�oklu �izgi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Polil�nea";
+    Text[ catalan ] = "Polil�nia";
+    Text[ thai ] = "หลายเส้น";
 };
 String STR_ObjNameSingulPLIN_PntAnz
 {
@@ -1483,7 +1532,7 @@ String STR_ObjNameSingulPLIN_PntAnz
     Text [ spanish ] = "Polil�nea con %N puntos" ;
     Text [ english_us ] = "Polyline with %N corners" ;
     Text[ chinese_simplified ] = "带 %N 点的多边线条";
-    Text[ russian ] = "������� � %N �������(���)";
+    Text[ russian ] = "������� � %N ������";
     Text[ polish ] = "Linia �amana z %N punktami";
     Text[ japanese ] = "%N点付きの多折線";
     Text[ chinese_traditional ] = "帶 %N 點的多邊線條";
@@ -1494,7 +1543,8 @@ String STR_ObjNameSingulPLIN_PntAnz
     Text[ korean ] = "%N 점이 있는 다중선";
     Text[ turkish ] = "%N noktal� �oklu �izgiler";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Polil�nea con %N puntos";
+    Text[ catalan ] = "Polil�nia amb %N punts";
+    Text[ thai ] = "หลายเส้นกับ %N มุม";
 };
 String STR_ObjNamePluralPLIN
 {
@@ -1504,7 +1554,7 @@ String STR_ObjNamePluralPLIN
     Text [ italian ] = "Polilinee" ;
     Text [ portuguese_brazilian ] = "Polilinhas" ;
     Text [ portuguese ] = "Polilinhas" ;
-    Text [ finnish ] = "Murtoviivat" ;
+    Text [ finnish ] = "Murtoviiva" ;
     Text [ danish ] = "Polylinjer" ;
     Text [ french ] = "Polylignes" ;
     Text [ swedish ] = "Polylinjer" ;
@@ -1512,7 +1562,7 @@ String STR_ObjNamePluralPLIN
     Text [ spanish ] = "Polil�neas" ;
     Text [ english_us ] = "Polylines" ;
     Text[ chinese_simplified ] = "多边线";
-    Text[ russian ] = "���������";
+    Text[ russian ] = "�������";
     Text[ polish ] = "Linia �amana";
     Text[ japanese ] = "多折線";
     Text[ chinese_traditional ] = "多邊線";
@@ -1523,7 +1573,8 @@ String STR_ObjNamePluralPLIN
     Text[ korean ] = "다중선";
     Text[ turkish ] = "�oklu �izgiler";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Polil�neas";
+    Text[ catalan ] = "Polil�nies";
+    Text[ thai ] = "หลายเส้น";
 };
 String STR_ObjNameSingulPATHLINE
 {
@@ -1552,7 +1603,8 @@ String STR_ObjNameSingulPATHLINE
     Text[ korean ] = "베지에 곡선";
     Text[ turkish ] = "B�zier e�risi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Curva de B�zier";
+    Text[ catalan ] = "Corba de B�zier";
+    Text[ thai ] = "เส้นโค้ง B้zier ";
 };
 String STR_ObjNamePluralPATHLINE
 {
@@ -1581,7 +1633,8 @@ String STR_ObjNamePluralPATHLINE
     Text[ korean ] = "베지에 곡선";
     Text[ turkish ] = "B�zier e�rileri";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Curvas de B�zier";
+    Text[ catalan ] = "Corbes de B�zier";
+    Text[ thai ] = "เส้นโค้งB้zier ";
 };
 String STR_ObjNameSingulPATHFILL
 {
@@ -1610,7 +1663,8 @@ String STR_ObjNameSingulPATHFILL
     Text[ korean ] = "베지에 곡선";
     Text[ turkish ] = "B�zier e�risi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Curva de B�zier";
+    Text[ catalan ] = "Corba de B�zier";
+    Text[ thai ] = "เส้นโค้งB้zier ";
 };
 String STR_ObjNamePluralPATHFILL
 {
@@ -1639,7 +1693,8 @@ String STR_ObjNamePluralPATHFILL
     Text[ korean ] = "베지에 곡선";
     Text[ turkish ] = "B�zier e�rileri";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Curvas de B�zier";
+    Text[ catalan ] = "Corba de B�zier";
+    Text[ thai ] = "เส้นโค้งB้zier ";
 };
 String STR_ObjNameSingulFREELINE
 {
@@ -1653,22 +1708,23 @@ String STR_ObjNameSingulFREELINE
     Text [ danish ] = "Frih�ndslinje" ;
     Text [ french ] = "Ligne � main lev�e" ;
     Text [ swedish ] = "Frihandslinje" ;
-    Text [ dutch ] = "Vrije hand-lijn" ;
+    Text [ dutch ] = "Vrije-hand-lijn" ;
     Text [ spanish ] = "L�nea a mano alzada" ;
     Text [ english_us ] = "Freeform Line" ;
     Text[ chinese_simplified ] = "自由形线条";
-    Text[ russian ] = "���������� �����";
+    Text[ russian ] = "���������";
     Text[ polish ] = "Dowolne linie";
     Text[ japanese ] = "フリーハンドの線";
     Text[ chinese_traditional ] = "自由形線條";
     Text[ arabic ] = "�� ��";
-    Text[ dutch ] = "Vrije hand-lijn";
+    Text[ dutch ] = "Vrije-hand-lijn";
     Text[ chinese_simplified ] = "自由形线条";
     Text[ greek ] = "������ ��������� ���������";
     Text[ korean ] = "자유형 선";
     Text[ turkish ] = "Serbest �izgi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "L�nea a mano alzada";
+    Text[ catalan ] = "L�nia a m� al�ada";
+    Text[ thai ] = "เส้นแบบฟอร์มอิสระ";
 };
 String STR_ObjNamePluralFREELINE
 {
@@ -1682,22 +1738,23 @@ String STR_ObjNamePluralFREELINE
     Text [ danish ] = "Frih�ndslinjer" ;
     Text [ french ] = "Lignes � main lev�e" ;
     Text [ swedish ] = "Frihandslinjer" ;
-    Text [ dutch ] = "Vrije hand-lijnen" ;
+    Text [ dutch ] = "Vrije-hand-lijnen" ;
     Text [ spanish ] = "L�neas a mano alzada" ;
     Text [ english_us ] = "Freeform Lines" ;
     Text[ chinese_simplified ] = "自由形线条";
-    Text[ russian ] = "���������� �����";
+    Text[ russian ] = "���������";
     Text[ polish ] = "Dowolne linie";
     Text[ japanese ] = "フリーハンドの線";
     Text[ chinese_traditional ] = "自由形線條";
     Text[ arabic ] = "���� ���";
-    Text[ dutch ] = "Vrije hand-lijnen";
+    Text[ dutch ] = "Vrije-hand-lijnen";
     Text[ chinese_simplified ] = "自由形线条";
     Text[ greek ] = "������� ��������� ���������";
     Text[ korean ] = "자유형 선";
     Text[ turkish ] = "Serbest �izgiler";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "L�neas a mano alzada";
+    Text[ catalan ] = "L�nies a m� al�ada";
+    Text[ thai ] = "เส้นแบบฟอร์มอิสระ";
 };
 String STR_ObjNameSingulFREEFILL
 {
@@ -1711,22 +1768,23 @@ String STR_ObjNameSingulFREEFILL
     Text [ danish ] = "Frih�ndslinje" ;
     Text [ french ] = "Ligne � main lev�e" ;
     Text [ swedish ] = "Frihandslinje" ;
-    Text [ dutch ] = "Vrije hand-lijn" ;
+    Text [ dutch ] = "Vrije-hand-lijn" ;
     Text [ spanish ] = "L�nea a mano alzada" ;
     Text [ english_us ] = "Freeform Line" ;
     Text[ chinese_simplified ] = "填色自由形线条";
-    Text[ russian ] = "���������� �����";
+    Text[ russian ] = "���������";
     Text[ polish ] = "Dowolne linie";
     Text[ japanese ] = "フリーハンドの線";
     Text[ chinese_traditional ] = "自由形線條";
     Text[ arabic ] = "�� ��";
-    Text[ dutch ] = "Vrije hand-lijn";
+    Text[ dutch ] = "Vrije-hand-lijn";
     Text[ chinese_simplified ] = "填色自由形线条";
     Text[ greek ] = "������ ��������� ���������";
     Text[ korean ] = "자유형 선";
     Text[ turkish ] = "Serbest �izgi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "L�nea a mano alzada";
+    Text[ catalan ] = "L�nia a m� al�ada";
+    Text[ thai ] = "เส้นแบบฟอร์มอิสระ";
 };
 String STR_ObjNamePluralFREEFILL
 {
@@ -1740,22 +1798,23 @@ String STR_ObjNamePluralFREEFILL
     Text [ danish ] = "Frih�ndslinjer" ;
     Text [ french ] = "Lignes � main lev�e" ;
     Text [ swedish ] = "Frihandslinjer" ;
-    Text [ dutch ] = "Vrije hand-lijnen" ;
+    Text [ dutch ] = "Vrije-hand-lijnen" ;
     Text [ spanish ] = "L�neas a mano alzada" ;
     Text [ english_us ] = "Freeform Lines" ;
     Text[ chinese_simplified ] = "填色自由形线条";
-    Text[ russian ] = "���������� �����";
+    Text[ russian ] = "���������";
     Text[ polish ] = "Dowolne linie";
     Text[ japanese ] = "フリーハンドの線";
     Text[ chinese_traditional ] = "自由形線條";
     Text[ arabic ] = "���� ���";
-    Text[ dutch ] = "Vrije hand-lijnen";
+    Text[ dutch ] = "Vrije-hand-lijnen";
     Text[ chinese_simplified ] = "填色自由形线条";
     Text[ greek ] = "������� ��������� ���������";
     Text[ korean ] = "자유형 선";
     Text[ turkish ] = "Serbest �izgiler";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "L�neas a mano alzada";
+    Text[ catalan ] = "L�nies a m� al�ada";
+    Text[ thai ] = "เส้นแบบฟอร์มอิสระ";
 };
 String STR_ObjNameSingulCOMBLINE
 {
@@ -1782,8 +1841,9 @@ String STR_ObjNameSingulCOMBLINE
     Text[ korean ] = "곡선 개체";
     Text[ turkish ] = "E�ri nesneler";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Objeto de curva";
+    Text[ catalan ] = "Corba";
     Text[ finnish ] = "K�yr�";
+    Text[ thai ] = "เส้นโค้ง";
 };
 String STR_ObjNamePluralCOMBLINE
 {
@@ -1799,7 +1859,7 @@ String STR_ObjNamePluralCOMBLINE
     Text [ french ] = "Objets incurv�s" ;
     Text [ dutch ] = "Boogobjecten" ;
     Text[ chinese_simplified ] = "曲线对象";
-    Text[ russian ] = "������� ������";
+    Text[ russian ] = "������� ������";
     Text[ polish ] = "Obiekty krzywych";
     Text[ japanese ] = "曲線オブジェクト";
     Text[ chinese_traditional ] = "曲線物件";
@@ -1810,8 +1870,9 @@ String STR_ObjNamePluralCOMBLINE
     Text[ korean ] = "곡선 개체";
     Text[ turkish ] = "E�ri nesneler";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Objetos de curva";
+    Text[ catalan ] = "Objectes corbs";
     Text[ finnish ] = "K�yr�objektit";
+    Text[ thai ] = "วัตถุโค้ง";
 };
 String STR_ObjNameSingulCOMBFILL
 {
@@ -1838,8 +1899,9 @@ String STR_ObjNameSingulCOMBFILL
     Text[ korean ] = "곡선 개체";
     Text[ turkish ] = "E�ri nesne";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Objeto de curva";
+    Text[ catalan ] = "Corba";
     Text[ finnish ] = "K�yr�";
+    Text[ thai ] = "เส้นโค้ง";
 };
 String STR_ObjNamePluralCOMBFILL
 {
@@ -1855,7 +1917,7 @@ String STR_ObjNamePluralCOMBFILL
     Text [ french ] = "Objets incurv�s" ;
     Text [ dutch ] = "Boogobjecten" ;
     Text[ chinese_simplified ] = "曲线对象";
-    Text[ russian ] = "������� ������";
+    Text[ russian ] = "������� ������";
     Text[ polish ] = "Obiekty krzywych";
     Text[ japanese ] = "曲線オブジェクト";
     Text[ chinese_traditional ] = "曲線物件";
@@ -1866,8 +1928,9 @@ String STR_ObjNamePluralCOMBFILL
     Text[ korean ] = "곡선 개체";
     Text[ turkish ] = "E�ri nesneler";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Objetos de curva";
+    Text[ catalan ] = "Objectes corbs";
     Text[ finnish ] = "K�yr�objektit";
+    Text[ thai ] = "วัตถุโค้ง";
 };
  ////////////////////////////////////////////////////////////////////////////////////////////////////
 String STR_ObjNameSingulNATSPLN
@@ -1886,7 +1949,7 @@ String STR_ObjNameSingulNATSPLN
     Text [ spanish ] = "Spline natural" ;
     Text [ english_us ] = "Natural Spline" ;
     Text[ chinese_simplified ] = "自然的齿条形";
-    Text[ russian ] = "����������� ������";
+    Text[ russian ] = "������������ ������";
     Text[ polish ] = "Naturalna krzywa sk�adana";
     Text[ japanese ] = "自然なスプライン線";
     Text[ chinese_traditional ] = "自然的齒條形";
@@ -1898,6 +1961,7 @@ String STR_ObjNameSingulNATSPLN
     Text[ turkish ] = "Do�al Spline";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Spline natural";
+    Text[ thai ] = "ลิ้นสลักธรรมชาติ";
 };
 String STR_ObjNamePluralNATSPLN
 {
@@ -1915,7 +1979,7 @@ String STR_ObjNamePluralNATSPLN
     Text [ spanish ] = "splines naturales" ;
     Text [ english_us ] = "Natural Splines" ;
     Text[ chinese_simplified ] = "自然形齿条";
-    Text[ russian ] = "����������� �������";
+    Text[ russian ] = "������������ �������";
     Text[ polish ] = "Naturalne krzywe sk�adane";
     Text[ japanese ] = "自然なスプライン線";
     Text[ chinese_traditional ] = "自然形齒條";
@@ -1926,7 +1990,8 @@ String STR_ObjNamePluralNATSPLN
     Text[ greek ] = "������� Splines";
     Text[ korean ] = "자연적인 스플라인";
     Text[ turkish ] = "Do�al Spline";
-    Text[ catalan ] = "splines naturales";
+    Text[ catalan ] = "Splines naturals";
+    Text[ thai ] = "ลิ้นสลักธรรมชาติ";
 };
 String STR_ObjNameSingulPERSPLN
 {
@@ -1955,7 +2020,8 @@ String STR_ObjNameSingulPERSPLN
     Text[ korean ] = "주기적 스플라인";
     Text[ turkish ] = "D�zenli Spline";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "spline peri�dico";
+    Text[ catalan ] = "Spline peri�dic";
+    Text[ thai ] = "ลิ้นสลักเป็นระยะ";
 };
 String STR_ObjNamePluralPERSPLN
 {
@@ -1973,7 +2039,7 @@ String STR_ObjNamePluralPERSPLN
     Text [ spanish ] = "splines peri�dicos" ;
     Text [ english_us ] = "Periodic Splines" ;
     Text[ chinese_simplified ] = "有规律的齿条形";
-    Text[ russian ] = "������� � ���������";
+    Text[ russian ] = "������������� �������";
     Text[ polish ] = "Okresowe krzywe sk�adane";
     Text[ japanese ] = "周期スプライン線";
     Text[ chinese_traditional ] = "有規律的齒條形";
@@ -1984,7 +2050,8 @@ String STR_ObjNamePluralPERSPLN
     Text[ greek ] = "���������� Splines";
     Text[ korean ] = "주기적 스플라인";
     Text[ turkish ] = "D�zenli Spline";
-    Text[ catalan ] = "splines peri�dicos";
+    Text[ catalan ] = "Splines peri�dics";
+    Text[ thai ] = "ลิ้นสลักเป็นระยะ";
 };
  ////////////////////////////////////////////////////////////////////////////////////////////////////
 String STR_ObjNameSingulTEXT
@@ -2003,7 +2070,7 @@ String STR_ObjNameSingulTEXT
     Text [ spanish ] = "Marco de texto" ;
     Text [ english_us ] = "Text Frame" ;
     Text[ chinese_simplified ] = "文本框";
-    Text[ russian ] = "��������� �����";
+    Text[ russian ] = "������";
     Text[ polish ] = "Ramka tekstu";
     Text[ japanese ] = "テキスト枠";
     Text[ chinese_traditional ] = "文字方塊";
@@ -2011,10 +2078,11 @@ String STR_ObjNameSingulTEXT
     Text[ dutch ] = "Tekstkader";
     Text[ chinese_simplified ] = "文本框";
     Text[ greek ] = "������� ��������";
-    Text[ korean ] = "텍스트 틀";
+    Text[ korean ] = "텍스트 프레임";
     Text[ turkish ] = "Metin �er�evesi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Marco de texto";
+    Text[ catalan ] = "Marc del text";
+    Text[ thai ] = "กรอบข้อความ";
 };
 String STR_ObjNamePluralTEXT
 {
@@ -2032,7 +2100,7 @@ String STR_ObjNamePluralTEXT
     Text [ spanish ] = "Marco de texto" ;
     Text [ english_us ] = "Text Frame" ;
     Text[ chinese_simplified ] = "文本框";
-    Text[ russian ] = "��������� �����";
+    Text[ russian ] = "������";
     Text[ polish ] = "Ramka tekstu";
     Text[ japanese ] = "テキスト枠";
     Text[ chinese_traditional ] = "文字方塊";
@@ -2040,10 +2108,11 @@ String STR_ObjNamePluralTEXT
     Text[ dutch ] = "Tekstkader";
     Text[ chinese_simplified ] = "文本框";
     Text[ greek ] = "������� ��������";
-    Text[ korean ] = "텍스트 틀";
+    Text[ korean ] = "텍스트 프레임";
     Text[ turkish ] = "Metin �er�evesi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Marco de texto";
+    Text[ catalan ] = "Marc del text";
+    Text[ thai ] = "กรอบข้อความ";
 };
 String STR_ObjNameSingulTEXTLNK
 {
@@ -2059,7 +2128,7 @@ String STR_ObjNameSingulTEXTLNK
     Text [ french ] = "Cadre texte li�" ;
     Text [ dutch ] = "Gekoppeld tekstkader" ;
     Text[ chinese_simplified ] = "链接的文本框";
-    Text[ russian ] = "��������� ��������� �����";
+    Text[ russian ] = "��������� ������";
     Text[ polish ] = "Po��czona ramka tekstu";
     Text[ japanese ] = "連結されたテキスト枠";
     Text[ chinese_traditional ] = "連結的文字方塊";
@@ -2067,11 +2136,12 @@ String STR_ObjNameSingulTEXTLNK
     Text[ dutch ] = "Gekoppeld tekstkader";
     Text[ chinese_simplified ] = "链接的文本框";
     Text[ greek ] = "����������� ������� ��������";
-    Text[ korean ] = "연결된 텍스트 틀";
+    Text[ korean ] = "연결된 텍스트 프레임";
     Text[ turkish ] = "Ba�lant�l� metin �er�evesi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Marco de texto vinculado";
+    Text[ catalan ] = "Marc de text enlla�at";
     Text[ finnish ] = "Linkitetty tekstikehys";
+    Text[ thai ] = "เชื่อมโยงกรอบข้อความ";
 };
 String STR_ObjNamePluralTEXTLNK
 {
@@ -2087,7 +2157,7 @@ String STR_ObjNamePluralTEXTLNK
     Text [ french ] = "Cadres texte li�s" ;
     Text [ dutch ] = "Gekoppelde tekstkaders" ;
     Text[ chinese_simplified ] = "连接的文本框";
-    Text[ russian ] = "��������� ��������� �����";
+    Text[ russian ] = "��������� ������";
     Text[ polish ] = "Po��czone ramki tekstu";
     Text[ japanese ] = "連結されたテキスト枠";
     Text[ chinese_traditional ] = "連結的文字方塊";
@@ -2095,11 +2165,12 @@ String STR_ObjNamePluralTEXTLNK
     Text[ dutch ] = "Gekoppelde tekstkaders";
     Text[ chinese_simplified ] = "连接的文本框";
     Text[ greek ] = "����������� ������� ��������";
-    Text[ korean ] = "연결된 텍스트 틀";
+    Text[ korean ] = "연결된 텍스트 프레임";
     Text[ turkish ] = "Ba�lant�l� metin �er�eveleri";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Marcos de texto vinculados";
+    Text[ catalan ] = "Marcs de text enlla�ats";
     Text[ finnish ] = "Linkitetyt tekstikehykset";
+    Text[ thai ] = "เชื่อมโยงกรอบข้อความ";
 };
  //String STR_ObjNameSingulXTXT {
  //    Text="Textfortsetzungsrahmen";
@@ -2147,7 +2218,7 @@ String STR_ObjNameSingulFITTEXT
     Text [ spanish ] = "Objeto de texto ajustado" ;
     Text [ english_us ] = "Fit-to-size text object" ;
     Text[ chinese_simplified ] = "调整过的文字对象";
-    Text[ russian ] = "������������� ������ ������";
+    Text[ russian ] = "������������� �� ������� ��������� ������";
     Text[ polish ] = "dostosowany obiekt tekstowy";
     Text[ japanese ] = "適合したテキスト オブジェクト";
     Text[ chinese_traditional ] = "調整過的文字物件";
@@ -2158,7 +2229,8 @@ String STR_ObjNameSingulFITTEXT
     Text[ korean ] = "텍스트 개체에 크기 맞춤";
     Text[ turkish ] = "Ayarlanm�� metin nesnesi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Objeto de texto ajustado";
+    Text[ catalan ] = "Objecte de text Ajusta a la mida";
+    Text[ thai ] = "จัดพอดีขนาดวัตถุข้อความ";
 };
 String STR_ObjNamePluralFITTEXT
 {
@@ -2176,7 +2248,7 @@ String STR_ObjNamePluralFITTEXT
     Text [ spanish ] = "Objetos de texto ajustados" ;
     Text [ english_us ] = "Fit-to-size text objects" ;
     Text[ chinese_simplified ] = "调整过的文字对象";
-    Text[ russian ] = "������������� ������� ������";
+    Text[ russian ] = "������������� �� ������� ��������� �������";
     Text[ polish ] = "dostosowane obiekty tekstowe";
     Text[ japanese ] = "合ったテキスト オブジェクト";
     Text[ chinese_traditional ] = "調整過的文字物件";
@@ -2187,7 +2259,8 @@ String STR_ObjNamePluralFITTEXT
     Text[ korean ] = "텍스트 개체에 크기 맞춤";
     Text[ turkish ] = "Ayarlanm�� metin nesneleri";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Objetos de texto ajustados";
+    Text[ catalan ] = "Objectes de text Ajusta a la mida";
+    Text[ thai ] = "จัดพอดีขนาดวัตถุข้อความ";
 };
 String STR_ObjNameSingulFITALLTEXT
 {
@@ -2205,7 +2278,7 @@ String STR_ObjNameSingulFITALLTEXT
     Text [ spanish ] = "Objeto de texto ajustado" ;
     Text [ english_us ] = "Fit-to-size text object" ;
     Text[ chinese_simplified ] = "调整过的文字对象";
-    Text[ russian ] = "������������� ������ ������";
+    Text[ russian ] = "������������� �� ������� ��������� ������";
     Text[ polish ] = "dostosowany obiekt tekstowy";
     Text[ japanese ] = "適合したテキスト オブジェクト";
     Text[ chinese_traditional ] = "調整過的文字物件";
@@ -2216,7 +2289,8 @@ String STR_ObjNameSingulFITALLTEXT
     Text[ korean ] = "텍스트 개체에 크기 맞춤";
     Text[ turkish ] = "Ayarlanm�� metin nesnesi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Objeto de texto ajustado";
+    Text[ catalan ] = "Objecte de text Ajusta a la mida";
+    Text[ thai ] = "จัดพอดีขนาดวัตถุข้อความ";
 };
 String STR_ObjNamePluralFITALLTEXT
 {
@@ -2234,7 +2308,7 @@ String STR_ObjNamePluralFITALLTEXT
     Text [ spanish ] = "Objetos de texto ajustados" ;
     Text [ english_us ] = "Fit-to-size text objects" ;
     Text[ chinese_simplified ] = "调整过的文字对象";
-    Text[ russian ] = "������������� ������� ������";
+    Text[ russian ] = "������������� �� ������� ��������� �������";
     Text[ polish ] = "dostosowane obiekty tekstowe";
     Text[ japanese ] = "合ったテキスト オブジェクト";
     Text[ chinese_traditional ] = "調整過的文字物件";
@@ -2245,7 +2319,8 @@ String STR_ObjNamePluralFITALLTEXT
     Text[ korean ] = "텍스트 개체에 크기 맞춤";
     Text[ turkish ] = "Ayarlanm�� metin nesneleri";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Objetos de texto ajustados";
+    Text[ catalan ] = "Objectes de text Ajusta a la mida";
+    Text[ thai ] = "จัดพอดีขนาดวัตถุข้อความ";
 };
 String STR_ObjNameSingulTITLETEXT
 {
@@ -2274,7 +2349,8 @@ String STR_ObjNameSingulTITLETEXT
     Text[ korean ] = "제목 텍스트";
     Text[ turkish ] = "Ba�l�k metni";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Texto del t�tulo";
+    Text[ catalan ] = "Text del t�tol";
+    Text[ thai ] = "ชื่อข้อความ";
 };
 String STR_ObjNamePluralTITLETEXT
 {
@@ -2303,7 +2379,8 @@ String STR_ObjNamePluralTITLETEXT
     Text[ korean ] = "제목 텍스트";
     Text[ turkish ] = "Ba�l�k metinleri";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Textos del t�tulo";
+    Text[ catalan ] = "Textos del t�tol";
+    Text[ thai ] = "ชื่อข้อความ";
 };
 String STR_ObjNameSingulOUTLINETEXT
 {
@@ -2332,7 +2409,8 @@ String STR_ObjNameSingulOUTLINETEXT
     Text[ korean ] = "아웃트라인 텍스트";
     Text[ turkish ] = "Anahat metni";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Texto del esquema";
+    Text[ catalan ] = "Text del contorn";
+    Text[ thai ] = "เค้าร่างข้อความ";
 };
 String STR_ObjNamePluralOUTLINETEXT
 {
@@ -2346,7 +2424,7 @@ String STR_ObjNamePluralOUTLINETEXT
     Text [ danish ] = "Dispositionstekster" ;
     Text [ french ] = "Textes de plan" ;
     Text [ swedish ] = "Dispositionstexter" ;
-    Text [ dutch ] = "Overzichtteksten" ;
+    Text [ dutch ] = "Overzichtsteksten" ;
     Text [ spanish ] = "Textos del esquema" ;
     Text [ english_us ] = "Outline Texts" ;
     Text[ chinese_simplified ] = "大纲文字";
@@ -2355,13 +2433,14 @@ String STR_ObjNamePluralOUTLINETEXT
     Text[ japanese ] = "見出し";
     Text[ chinese_traditional ] = "大綱文字";
     Text[ arabic ] = "���� �������";
-    Text[ dutch ] = "Overzichtteksten";
+    Text[ dutch ] = "Overzichtsteksten";
     Text[ chinese_simplified ] = "大纲文字";
     Text[ greek ] = "������� ����������";
     Text[ korean ] = "아웃트라인 텍스트";
     Text[ turkish ] = "Anahat metinleri";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Textos del esquema";
+    Text[ catalan ] = "Textos del contorn";
+    Text[ thai ] = "เค้าร่างข้อความ";
 };
  ////////////////////////////////////////////////////////////////////////////////////////////////////
 String STR_ObjNameSingulGRAF
@@ -2380,7 +2459,7 @@ String STR_ObjNameSingulGRAF
     Text [ spanish ] = "Imagen" ;
     Text [ english_us ] = "graphic" ;
     Text[ chinese_simplified ] = "图形";
-    Text[ russian ] = "�������";
+    Text[ russian ] = "����������� ������";
     Text[ polish ] = "Grafika";
     Text[ japanese ] = "図";
     Text[ chinese_traditional ] = "圖形";
@@ -2391,7 +2470,8 @@ String STR_ObjNameSingulGRAF
     Text[ greek ] = "�������";
     Text[ korean ] = "그래픽";
     Text[ turkish ] = "Grafik";
-    Text[ catalan ] = "Imagen";
+    Text[ catalan ] = "Imatge";
+    Text[ thai ] = "กราฟิค";
 };
 String STR_ObjNamePluralGRAF
 {
@@ -2401,7 +2481,7 @@ String STR_ObjNamePluralGRAF
     Text [ italian ] = "Immagini" ;
     Text [ portuguese_brazilian ] = "Gr?ficos" ;
     Text [ portuguese ] = "Imagens" ;
-    Text [ finnish ] = "kuvat" ;
+    Text [ finnish ] = "grafiikka" ;
     Text [ danish ] = "Grafik" ;
     Text [ french ] = "Images" ;
     Text [ swedish ] = "Grafik" ;
@@ -2409,7 +2489,7 @@ String STR_ObjNamePluralGRAF
     Text [ spanish ] = "Im�genes" ;
     Text [ english_us ] = "graphics" ;
     Text[ chinese_simplified ] = "图形";
-    Text[ russian ] = "�������";
+    Text[ russian ] = "����������� �������";
     Text[ polish ] = "Grafiki";
     Text[ japanese ] = "図";
     Text[ chinese_traditional ] = "圖形";
@@ -2418,9 +2498,10 @@ String STR_ObjNamePluralGRAF
     Text[ dutch ] = "Afbeeldingen";
     Text[ chinese_simplified ] = "图形";
     Text[ greek ] = "�������";
-    Text[ korean ] = "그래픽";
+    Text[ korean ] = "그림";
     Text[ turkish ] = "Grafik";
-    Text[ catalan ] = "Im�genes";
+    Text[ catalan ] = "Imatges";
+    Text[ thai ] = "กราฟิค";
 };
 String STR_ObjNameSingulGRAFLNK
 {
@@ -2436,7 +2517,7 @@ String STR_ObjNameSingulGRAFLNK
     Text [ french ] = "Image li�e" ;
     Text [ dutch ] = "Gekoppelde afbeelding" ;
     Text[ chinese_simplified ] = "链接的图形";
-    Text[ russian ] = "��������� �������";
+    Text[ russian ] = "��������� ����������� ������";
     Text[ polish ] = "Po��czona grafika";
     Text[ japanese ] = "リンクされた図";
     Text[ chinese_traditional ] = "連結的圖形";
@@ -2447,8 +2528,9 @@ String STR_ObjNameSingulGRAFLNK
     Text[ korean ] = "연결된 그래픽";
     Text[ turkish ] = "Ba�lant�l� grafik";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Imagen vinculada";
+    Text[ catalan ] = "Imatge enlla�ada";
     Text[ finnish ] = "Linkitetty kuva";
+    Text[ thai ] = "เชื่อมโยงกราฟิค";
 };
 String STR_ObjNamePluralGRAFLNK
 {
@@ -2464,7 +2546,7 @@ String STR_ObjNamePluralGRAFLNK
     Text [ french ] = "Images li�es" ;
     Text [ dutch ] = "Gekoppelde afbeeldingen" ;
     Text[ chinese_simplified ] = "链接的图形";
-    Text[ russian ] = "��������� �������";
+    Text[ russian ] = "��������� ����������� �������";
     Text[ polish ] = "Po��czone grafiki";
     Text[ japanese ] = "リンクされた図";
     Text[ chinese_traditional ] = "連結的圖形";
@@ -2472,11 +2554,12 @@ String STR_ObjNamePluralGRAFLNK
     Text[ dutch ] = "Gekoppelde afbeeldingen";
     Text[ chinese_simplified ] = "链接的图形";
     Text[ greek ] = "����������� �������";
-    Text[ korean ] = "연결된 그래픽";
+    Text[ korean ] = "연결된 그림";
     Text[ turkish ] = "Ba�lant�l� grafikler";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Im�genes vinculadas";
+    Text[ catalan ] = "Imatges enlla�ades";
     Text[ finnish ] = "Linkitetyt kuvat";
+    Text[ thai ] = "เชื่อมโยงกราฟิค";
 };
 String STR_ObjNameSingulGRAFNONE
 {
@@ -2494,7 +2577,7 @@ String STR_ObjNameSingulGRAFNONE
     Text [ spanish ] = "Objeto gr�fico vac�o" ;
     Text [ english_us ] = "Blank graphic object" ;
     Text[ chinese_simplified ] = "空的图形对象";
-    Text[ russian ] = "������ ����������� ������";
+    Text[ russian ] = "������ ����������� ������";
     Text[ polish ] = "Pusty obiekt graficzny";
     Text[ japanese ] = "空の図形描画オブジェクト";
     Text[ chinese_traditional ] = "空的圖形物件";
@@ -2505,7 +2588,8 @@ String STR_ObjNameSingulGRAFNONE
     Text[ korean ] = "비어 있는 그래픽 개체";
     Text[ turkish ] = "Bo� grafik nesnesi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Objeto gr�fico vac�o";
+    Text[ catalan ] = "Objecte gr�fic buit";
+    Text[ thai ] = "วัตถุกราฟิคเปล่า";
 };
 String STR_ObjNamePluralGRAFNONE
 {
@@ -2523,7 +2607,7 @@ String STR_ObjNamePluralGRAFNONE
     Text [ spanish ] = "Objetos gr�ficos vac�os" ;
     Text [ english_us ] = "Blank graphic objects" ;
     Text[ chinese_simplified ] = "空白的图形对象";
-    Text[ russian ] = "������ ����������� �������";
+    Text[ russian ] = "������ ����������� �������";
     Text[ polish ] = "puste obiekty graficzne";
     Text[ japanese ] = "空の図形描画オブジェクト";
     Text[ chinese_traditional ] = "空白的圖形物件";
@@ -2534,7 +2618,8 @@ String STR_ObjNamePluralGRAFNONE
     Text[ korean ] = "비어 있는 그래픽 개체";
     Text[ turkish ] = "Bo� grafik nesneleri";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Objetos gr�ficos vac�os";
+    Text[ catalan ] = "Objectes gr�fics buits";
+    Text[ thai ] = "วัตถุกราฟิคเปล่า";
 };
 String STR_ObjNameSingulGRAFNONELNK
 {
@@ -2550,7 +2635,7 @@ String STR_ObjNameSingulGRAFNONELNK
     Text [ french ] = "Objet graphique li� vide" ;
     Text [ dutch ] = "Leeg gekoppeld grafisch object" ;
     Text[ chinese_simplified ] = "空的链接图形对象";
-    Text[ russian ] = "������ ��������� ����������� ������";
+    Text[ russian ] = "������ ��������� ����������� ������";
     Text[ polish ] = "Pusty po��czony obiekt graficzny";
     Text[ japanese ] = "空のリンクされた図形描画オブジェクト";
     Text[ chinese_traditional ] = "空的連結圖形物件";
@@ -2558,11 +2643,12 @@ String STR_ObjNameSingulGRAFNONELNK
     Text[ dutch ] = "Leeg gekoppeld grafisch object";
     Text[ chinese_simplified ] = "空的链接图形对象";
     Text[ greek ] = "���� ����������� ����������� ��������";
-    Text[ korean ] = "비어 있는 연결된 그래픽 개체";
+    Text[ korean ] = "연결된 빈 그래픽 개체";
     Text[ turkish ] = "Bo� ba�lant�l� grafik nesnesi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Objeto gr�fico enlazado vac�o";
+    Text[ catalan ] = "Objecte gr�fic enlla�at buit";
     Text[ finnish ] = "Avoin linkitetty kuva";
+    Text[ thai ] = "ช่องว่างเชื่อมโยงกราฟิค";
 };
 String STR_ObjNamePluralGRAFNONELNK
 {
@@ -2578,7 +2664,7 @@ String STR_ObjNamePluralGRAFNONELNK
     Text [ french ] = "Objets graphiques li�s vides" ;
     Text [ dutch ] = "Lege gekoppelde grafische objecten" ;
     Text[ chinese_simplified ] = "空白的链接图形对象";
-    Text[ russian ] = "������ ��������� ����������� �������";
+    Text[ russian ] = "������ ��������� ����������� �������";
     Text[ polish ] = "Puste po��czone obiekty graficzne";
     Text[ japanese ] = "空のリンクした図形描画オブジェクト";
     Text[ chinese_traditional ] = "空白的連結圖形物件";
@@ -2586,11 +2672,12 @@ String STR_ObjNamePluralGRAFNONELNK
     Text[ dutch ] = "Lege gekoppelde grafische objecten";
     Text[ chinese_simplified ] = "空白的链接图形对象";
     Text[ greek ] = "���� ����������� ����������� ��������";
-    Text[ korean ] = "비어 있는 연결 그래픽 개체";
+    Text[ korean ] = "연결된 빈 그림 개체";
     Text[ turkish ] = "Bo� ba�lant�l� grafik nesneleri";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Objetos gr�ficos vinculados vac�os";
+    Text[ catalan ] = "Objectes gr�fics enlla�ats buits";
     Text[ finnish ] = "Avoimet linkitetyt kuvat";
+    Text[ thai ] = "ช่องว่างเชื่อมโยงกราฟิค";
 };
 String STR_ObjNameSingulGRAFMTF
 {
@@ -2607,19 +2694,20 @@ String STR_ObjNameSingulGRAFMTF
     Text [ dutch ] = "Metabestand" ;
     Text [ spanish ] = "Metaarchivo" ;
     Text [ english_us ] = "Metafile" ;
-    Text[ chinese_simplified ] = "元文件";
+    Text[ chinese_simplified ] = "图元文件";
     Text[ russian ] = "��������";
     Text[ polish ] = "Metapliki";
     Text[ japanese ] = "メタファイル";
     Text[ chinese_traditional ] = "元檔案";
     Text[ arabic ] = "��� ����";
     Text[ dutch ] = "Metabestand";
-    Text[ chinese_simplified ] = "元文件";
+    Text[ chinese_simplified ] = "图元文件";
     Text[ greek ] = "Metafile";
     Text[ korean ] = "메타파일";
     Text[ turkish ] = "Metafile";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Metaarchivo";
+    Text[ catalan ] = "Metafitxer";
+    Text[ thai ] = "Metafile";
 };
 String STR_ObjNamePluralGRAFMTF
 {
@@ -2636,19 +2724,20 @@ String STR_ObjNamePluralGRAFMTF
     Text [ dutch ] = "Metabestanden" ;
     Text [ spanish ] = "Metaarchivos" ;
     Text [ english_us ] = "Metafiles" ;
-    Text[ chinese_simplified ] = "元文件";
+    Text[ chinese_simplified ] = "图元文件";
     Text[ russian ] = "���������";
     Text[ polish ] = "Metapliki";
     Text[ japanese ] = "メタファイル";
     Text[ chinese_traditional ] = "元檔案";
     Text[ arabic ] = "������� ������";
     Text[ dutch ] = "Metabestanden";
-    Text[ chinese_simplified ] = "元文件";
+    Text[ chinese_simplified ] = "图元文件";
     Text[ greek ] = "Metafiles";
     Text[ korean ] = "메타 파일";
     Text[ turkish ] = "Meta dosyas�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Metaarchivos";
+    Text[ catalan ] = "Metafitxers";
+    Text[ thai ] = "Metafiles";
 };
 String STR_ObjNameSingulGRAFMTFLNK
 {
@@ -2662,21 +2751,22 @@ String STR_ObjNameSingulGRAFMTFLNK
     Text [ italian ] = "Metafile collegato" ;
     Text [ spanish ] = "Metaarchivo vinculado" ;
     Text [ french ] = "M�tafichier li�" ;
-    Text [ dutch ] = "Gekoppeld Meta-bestand" ;
-    Text[ chinese_simplified ] = "链接的元文件";
-    Text[ russian ] = "�������� � �������";
+    Text [ dutch ] = "Gekoppeld metabestand" ;
+    Text[ chinese_simplified ] = "链接的图元文件";
+    Text[ russian ] = "��������� ��������";
     Text[ polish ] = "Po��czone metapliki";
     Text[ japanese ] = "リンクされたメタファイル";
     Text[ chinese_traditional ] = "連結的元檔案";
     Text[ arabic ] = "��� ���� �����";
-    Text[ dutch ] = "Gekoppeld Meta-bestand";
-    Text[ chinese_simplified ] = "链接的元文件";
+    Text[ dutch ] = "Gekoppeld metabestand";
+    Text[ chinese_simplified ] = "链接的图元文件";
     Text[ greek ] = "����������� Metafile";
-    Text[ korean ] = "연결된 메타파일";
+    Text[ korean ] = "연결된 메타 파일";
     Text[ turkish ] = "Ba�lant�l� Metafile";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Metaarchivo vinculado";
+    Text[ catalan ] = "Metafitxer enlla�at";
     Text[ finnish ] = "Linkitetty metatiedosto";
+    Text[ thai ] = "เชื่อมโยง Metafile";
 };
 String STR_ObjNamePluralGRAFMTFLNK
 {
@@ -2690,21 +2780,22 @@ String STR_ObjNamePluralGRAFMTFLNK
     Text [ italian ] = "Metafile collegati" ;
     Text [ spanish ] = "Metaarchivos vinculados" ;
     Text [ french ] = "M�tafichiers li�s" ;
-    Text [ dutch ] = "Gekoppelde Meta-bestanden" ;
-    Text[ chinese_simplified ] = "链接的元文件";
-    Text[ russian ] = "��������� � ��������";
+    Text [ dutch ] = "Gekoppelde metabestanden" ;
+    Text[ chinese_simplified ] = "链接的图元文件";
+    Text[ russian ] = "��������� ���������";
     Text[ polish ] = "Po��czone metapliki";
     Text[ japanese ] = "リンクされたメタファイル";
     Text[ chinese_traditional ] = "連結的元檔案";
     Text[ arabic ] = "����� ����� ������";
-    Text[ dutch ] = "Gekoppelde Meta-bestanden";
-    Text[ chinese_simplified ] = "链接的元文件";
+    Text[ dutch ] = "Gekoppelde metabestanden";
+    Text[ chinese_simplified ] = "链接的图元文件";
     Text[ greek ] = "����������� Metafile";
     Text[ korean ] = "연결된 메타 파일";
     Text[ turkish ] = "Ba�lant�l� meta dosyalar�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Metaarchivos vinculados";
+    Text[ catalan ] = "Metafitxers enlla�ats";
     Text[ finnish ] = "Linkitetyt metatiedostot";
+    Text[ thai ] = "เชื่อมโยง Metafiles";
 };
 String STR_ObjNameSingulGRAFBMP
 {
@@ -2722,7 +2813,7 @@ String STR_ObjNameSingulGRAFBMP
     Text [ spanish ] = "Bitmap" ;
     Text [ english_us ] = "Bitmap" ;
     Text[ chinese_simplified ] = "位图";
-    Text[ russian ] = "Bitmap";
+    Text[ russian ] = "�����";
     Text[ polish ] = "Mapa bitowa";
     Text[ japanese ] = "ビットマップ";
     Text[ chinese_traditional ] = "點陣圖";
@@ -2734,6 +2825,7 @@ String STR_ObjNameSingulGRAFBMP
     Text[ turkish ] = "Bit e�lem";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Mapa de bits";
+    Text[ thai ] = "บิทแมป";
 };
 String STR_ObjNameSingulGRAFBMPTRANS
 {
@@ -2741,14 +2833,14 @@ String STR_ObjNameSingulGRAFBMPTRANS
     Text [ ENGLISH ] = "bitmap with transparency" ;
     Text [ english_us ] = "Bitmap with transparency" ;
     Text[ portuguese ] = "Bitmap transparente";
-    Text[ russian ] = "������� Bitmap � �������������";
+    Text[ russian ] = "����� � �������������";
     Text[ greek ] = "Bitmap with transparency";
     Text[ dutch ] = "Bitmap met transparantie";
     Text[ french ] = "Bitmap avec transparence";
     Text[ spanish ] = "Bitmap con transparencia";
-    Text[ finnish ] = "Bitmap with transparency";
+    Text[ finnish ] = "L�pin�kyv� bittikartta";
     Text[ italian ] = "Bitmap con trasparenza";
-    Text[ danish ] = "Bitmap with transparency";
+    Text[ danish ] = "Bitmap med transparens";
     Text[ swedish ] = "Bitmap med transparens";
     Text[ polish ] = "Prze�roczysta mapa bitowa";
     Text[ portuguese_brazilian ] = "Bitmap with transparency";
@@ -2758,7 +2850,8 @@ String STR_ObjNameSingulGRAFBMPTRANS
     Text[ chinese_traditional ] = "帶透明色的點陣圖";
     Text[ turkish ] = "Bitmap with transparency";
     Text[ arabic ] = "Bitmap with transparency";
-    Text[ catalan ] = "Bitmap with transparency";
+    Text[ catalan ] = "Mapa de bits amb transpar�ncia";
+    Text[ thai ] = "บิทแม็ปโปร่งแสง";
 };
 String STR_ObjNameSingulGRAFBMPLNK
 {
@@ -2774,7 +2867,7 @@ String STR_ObjNameSingulGRAFBMPLNK
     Text [ french ] = "Bitmap li�" ;
     Text [ dutch ] = "Gekoppelde Bitmap" ;
     Text[ chinese_simplified ] = "链接的位图";
-    Text[ russian ] = "��������� �������� �������";
+    Text[ russian ] = "��������� �����";
     Text[ polish ] = "Po��czona mapa bitowa";
     Text[ japanese ] = "リンクされたビットマップ";
     Text[ chinese_traditional ] = "連結的點陣圖";
@@ -2785,8 +2878,9 @@ String STR_ObjNameSingulGRAFBMPLNK
     Text[ korean ] = "연결된 비트맵";
     Text[ turkish ] = "Ba�lant�l� bit e�lem";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Bitmap vinculado";
+    Text[ catalan ] = "Mapa de bits enlla�at";
     Text[ finnish ] = "Linkitetty bittikartta";
+    Text[ thai ] = "บิทแม็ปที่เชื่อมโยง";
 };
 String STR_ObjNameSingulGRAFBMPTRANSLNK
 {
@@ -2794,14 +2888,14 @@ String STR_ObjNameSingulGRAFBMPTRANSLNK
     Text [ ENGLISH ] = "linked bitmap with transparency" ;
     Text [ english_us ] = "Linked bitmap with transparency" ;
     Text[ portuguese ] = "Liga��o de bitmap com transpar�ncia";
-    Text[ russian ] = "��������� ������� Bitmap � �������������";
+    Text[ russian ] = "��������� ����� � �������������";
     Text[ greek ] = "Linked Bitmap with transparency";
     Text[ dutch ] = "gekoppelde Bitmap met transparantie";
     Text[ french ] = "Bitmap li� avec transparence";
     Text[ spanish ] = "bitmap con transparencia vinculado";
-    Text[ finnish ] = "Linked Bitmap with transparency";
+    Text[ finnish ] = "L�pin�kyv� linkitetty bittikartta";
     Text[ italian ] = "Bitmap con trasparenza collegato";
-    Text[ danish ] = "Linked Bitmap with transparency";
+    Text[ danish ] = "k�det bitmap med transparens";
     Text[ swedish ] = "L�nkad bitmap med transparens";
     Text[ polish ] = "Po��czona prze�roczysta mapa bitowa";
     Text[ portuguese_brazilian ] = "Linked Bitmap with transparency";
@@ -2811,7 +2905,8 @@ String STR_ObjNameSingulGRAFBMPTRANSLNK
     Text[ chinese_traditional ] = "連結的帶透明色的點陣圖";
     Text[ turkish ] = "Linked Bitmap with transparency";
     Text[ arabic ] = "Linked Bitmap with transparency";
-    Text[ catalan ] = "Linked Bitmap with transparency";
+    Text[ catalan ] = "Mapa de bits enlla�at amb transpar�ncia";
+    Text[ thai ] = "บิทแม็ปโปร่งแสงที่เชื่อมโยง";
 };
 String STR_ObjNamePluralGRAFBMP
 {
@@ -2829,7 +2924,7 @@ String STR_ObjNamePluralGRAFBMP
     Text [ spanish ] = "Bitmaps" ;
     Text [ english_us ] = "Bitmaps" ;
     Text[ chinese_simplified ] = "位图";
-    Text[ russian ] = "�������� � ������� Bitmap";
+    Text[ russian ] = "������";
     Text[ polish ] = "Mapy bitowe";
     Text[ japanese ] = "ビットマップ";
     Text[ chinese_traditional ] = "點陣圖";
@@ -2840,7 +2935,8 @@ String STR_ObjNamePluralGRAFBMP
     Text[ korean ] = "비트맵";
     Text[ turkish ] = "Bit e�lem";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Bitmaps";
+    Text[ catalan ] = "Mapes de bits";
+    Text[ thai ] = "บิทแมป";
 };
 String STR_ObjNamePluralGRAFBMPTRANS
 {
@@ -2848,14 +2944,14 @@ String STR_ObjNamePluralGRAFBMPTRANS
     Text [ ENGLISH ] = "bitmaps with transparency" ;
     Text [ english_us ] = "Bitmaps with transparency" ;
     Text[ portuguese ] = "Bitmaps transparentes";
-    Text[ russian ] = "������� Bitmap � �������������";
+    Text[ russian ] = "������ � �������������";
     Text[ greek ] = "Bitmaps with transparency";
-    Text[ dutch ] = "Bitmaps met transparentie";
+    Text[ dutch ] = "Bitmaps met transparantie";
     Text[ french ] = "Bitmaps avec transparence";
     Text[ spanish ] = "Bitmaps con transparencia";
-    Text[ finnish ] = "Bitmaps with transparency";
+    Text[ finnish ] = "L�pin�kyv�t bittikartat";
     Text[ italian ] = "Bitmap con trasparenza";
-    Text[ danish ] = "Bitmaps with transparency";
+    Text[ danish ] = "Bitmaps med transparens";
     Text[ swedish ] = "Bitmaps med transparens";
     Text[ polish ] = "Prze�roczysta mapa bitowa";
     Text[ portuguese_brazilian ] = "Bitmaps with transparency";
@@ -2865,7 +2961,8 @@ String STR_ObjNamePluralGRAFBMPTRANS
     Text[ chinese_traditional ] = "帶透明色的點陣圖";
     Text[ turkish ] = "Bitmaps with transparency";
     Text[ arabic ] = "Bitmaps with transparency";
-    Text[ catalan ] = "Bitmaps with transparency";
+    Text[ catalan ] = "Mapes de bits amb transpar�ncies";
+    Text[ thai ] = "บิทแม็ปโปร่งแสง";
 };
 String STR_ObjNamePluralGRAFBMPLNK
 {
@@ -2881,7 +2978,7 @@ String STR_ObjNamePluralGRAFBMPLNK
     Text [ french ] = "Bitmaps li�s" ;
     Text [ dutch ] = "Gekoppelde Bitmaps" ;
     Text[ chinese_simplified ] = "链接的位图";
-    Text[ russian ] = "��������� �������� Bitmap";
+    Text[ russian ] = "��������� ������";
     Text[ polish ] = "Po��czone mapy bitowe";
     Text[ japanese ] = "リンクされたビットマップ";
     Text[ chinese_traditional ] = "連結的點陣圖";
@@ -2892,8 +2989,9 @@ String STR_ObjNamePluralGRAFBMPLNK
     Text[ korean ] = "연결된 비트맵";
     Text[ turkish ] = "Ba�lant�l� bit e�lemler";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Bitmaps vinculados";
+    Text[ catalan ] = "Mapes de bits enlla�ats";
     Text[ finnish ] = "Linkitetyt bittikartat";
+    Text[ thai ] = "เชื่อมโยงบิทแมป";
 };
 String STR_ObjNamePluralGRAFBMPTRANSLNK
 {
@@ -2901,14 +2999,14 @@ String STR_ObjNamePluralGRAFBMPTRANSLNK
     Text [ ENGLISH ] = "linked bitmaps with transparency" ;
     Text [ english_us ] = "Linked bitmaps with transparency" ;
     Text[ portuguese ] = "Liga��o de bitmaps com transpar�ncia";
-    Text[ russian ] = "��������� ������� Bitmap � �������������";
+    Text[ russian ] = "��������� ������ � �������������";
     Text[ greek ] = "Linked Bitmaps with transparency";
     Text[ dutch ] = "gekoppelde bitmaps met transparantie";
     Text[ french ] = "Bitmaps li�s avec transparence";
     Text[ spanish ] = "bitmaps con transparencia vinculados";
-    Text[ finnish ] = "Linked Bitmaps with transparency";
+    Text[ finnish ] = "L�pin�kyv�t linkitetyt bittikartat";
     Text[ italian ] = "Bitmap con trasparenza collegato";
-    Text[ danish ] = "Linked Bitmaps with transparency";
+    Text[ danish ] = "k�dede bitmaps med transparens";
     Text[ swedish ] = "L�nkade bitmaps med transparens";
     Text[ polish ] = "Po��czona prze�roczysta mapa bitowa";
     Text[ portuguese_brazilian ] = "Linked Bitmaps with transparency";
@@ -2918,7 +3016,8 @@ String STR_ObjNamePluralGRAFBMPTRANSLNK
     Text[ chinese_traditional ] = "連結的帶透明色的點陣圖";
     Text[ turkish ] = "Linked Bitmaps with transparency";
     Text[ arabic ] = "Linked Bitmaps with transparency";
-    Text[ catalan ] = "Linked Bitmaps with transparency";
+    Text[ catalan ] = "Mapes de bits enlla�ats amb transpar�ncies";
+    Text[ thai ] = "บิทแม็ปโปร่งแสงที่เชื่อมโยง";
 };
 String STR_ObjNameSingulGRAFMAC
 {
@@ -2936,7 +3035,7 @@ String STR_ObjNameSingulGRAFMAC
     Text [ spanish ] = "Imagen Mac" ;
     Text [ english_us ] = "Mac graphic" ;
     Text[ chinese_simplified ] = "Mac-图形";
-    Text[ russian ] = "������� Mac";
+    Text[ russian ] = "����������� ������ Mac";
     Text[ polish ] = "Grafika Mac";
     Text[ japanese ] = "Mac 図";
     Text[ chinese_traditional ] = "Mac 圖形";
@@ -2947,7 +3046,8 @@ String STR_ObjNameSingulGRAFMAC
     Text[ korean ] = "Mac 그래픽";
     Text[ turkish ] = "Mac grafi�i";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Imagen Mac";
+    Text[ catalan ] = "Imatge Mac";
+    Text[ thai ] = "กราฟิค Mac ";
 };
 String STR_ObjNamePluralGRAFMAC
 {
@@ -2965,7 +3065,7 @@ String STR_ObjNamePluralGRAFMAC
     Text [ spanish ] = "Im�genes Mac" ;
     Text [ english_us ] = "Mac graphics" ;
     Text[ chinese_simplified ] = "Mac-图形";
-    Text[ russian ] = "������� Mac";
+    Text[ russian ] = "����������� ������� Mac";
     Text[ polish ] = "Grafiki Mac";
     Text[ japanese ] = "Mac の図";
     Text[ chinese_traditional ] = "Mac 圖形";
@@ -2973,10 +3073,11 @@ String STR_ObjNamePluralGRAFMAC
     Text[ dutch ] = "Mac-afbeeldingen";
     Text[ chinese_simplified ] = "Mac-图形";
     Text[ greek ] = "������� Mac";
-    Text[ korean ] = "Mac 그래픽";
+    Text[ korean ] = "Mac 그림";
     Text[ turkish ] = "Mac grafikleri";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Im�genes Mac";
+    Text[ catalan ] = "Imatges Mac";
+    Text[ thai ] = "กราฟิค Mac ";
 };
 String STR_ObjNameSingulGRAFMACLNK
 {
@@ -2988,11 +3089,11 @@ String STR_ObjNameSingulGRAFMACLNK
     Text [ swedish ] = "l�nkad Mac-grafik" ;
     Text [ danish ] = "K�det Mac-grafik" ;
     Text [ italian ] = "Grafici Mac collegati" ;
-    Text [ spanish ] = "Im�genes Mac vinculadas" ;
+    Text [ spanish ] = "Im�genes de Mac vinculadas" ;
     Text [ french ] = "Images Mac li�es" ;
     Text [ dutch ] = "Gekoppelde Mac-afbeeldingen" ;
     Text[ chinese_simplified ] = "链接的 Mac-图形";
-    Text[ russian ] = "��������� ������� Mac";
+    Text[ russian ] = "��������� ����������� ������ Mac";
     Text[ polish ] = "Po��czona grafika Mac";
     Text[ japanese ] = "リンクされた Mac の図";
     Text[ chinese_traditional ] = "連結的 Mac 圖形";
@@ -3003,8 +3104,9 @@ String STR_ObjNameSingulGRAFMACLNK
     Text[ korean ] = "연결된 Mac 그래픽";
     Text[ turkish ] = "Ba�lant�l� Mac grafikleri";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Im�genes Mac vinculadas";
+    Text[ catalan ] = "Imatges Mac enlla�ades";
     Text[ finnish ] = "Linkitetty Mac-kuva";
+    Text[ thai ] = "เชื่อมโยงกราฟิค  Mac ";
 };
 String STR_ObjNamePluralGRAFMACLNK
 {
@@ -3016,11 +3118,11 @@ String STR_ObjNamePluralGRAFMACLNK
     Text [ swedish ] = "l�nkad Mac-Grafik" ;
     Text [ danish ] = "K�det Mac-grafik" ;
     Text [ italian ] = "Immagine Mac collegata" ;
-    Text [ spanish ] = "Imagen Mac vinculada" ;
+    Text [ spanish ] = "Imagen de Mac vinculada" ;
     Text [ french ] = "Image Mac li�e" ;
     Text [ dutch ] = "Gekoppelde Mac-afbeelding" ;
     Text[ chinese_simplified ] = "链接的 Mac-图形";
-    Text[ russian ] = "��������� ������� Mac";
+    Text[ russian ] = "��������� ����������� ������� Mac";
     Text[ polish ] = "Po��czone grafiki Mac";
     Text[ japanese ] = "リンクされた Mac の図";
     Text[ chinese_traditional ] = "連結的 Mac 圖形";
@@ -3028,11 +3130,12 @@ String STR_ObjNamePluralGRAFMACLNK
     Text[ dutch ] = "Gekoppelde Mac-afbeelding";
     Text[ chinese_simplified ] = "链接的 Mac-图形";
     Text[ greek ] = "����������� ������� Mac";
-    Text[ korean ] = "연결된 Mac 그래픽";
+    Text[ korean ] = "연결된 Mac 그림";
     Text[ turkish ] = "Ba�lant�l� Mac grafikleri";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Imagen Mac vinculada";
+    Text[ catalan ] = "Imatge Mac enlla�ada";
     Text[ finnish ] = "Linkitetyt Mac-kuvat";
+    Text[ thai ] = "เชื่อมโยงกราฟิค Mac ";
 };
  ////////////////////////////////////////////////////////////////////////////////////////////////////
 String STR_ObjNameSingulOLE2
@@ -3051,7 +3154,7 @@ String STR_ObjNameSingulOLE2
     Text [ spanish ] = "Objeto incrustado (OLE)" ;
     Text [ english_us ] = "embedded object (OLE)" ;
     Text[ chinese_simplified ] = "嵌入的对象(OLE)";
-    Text[ russian ] = "���������� ������ (OLE)";
+    Text[ russian ] = "���������� ������ (OLE)";
     Text[ polish ] = "osadzony obiekt (OLE)";
     Text[ japanese ] = "埋め込みオブジェクト(OLE)";
     Text[ chinese_traditional ] = "嵌入的物件(OLE)";
@@ -3059,10 +3162,11 @@ String STR_ObjNameSingulOLE2
     Text[ dutch ] = "Ingesloten object (OLE)";
     Text[ chinese_simplified ] = "嵌入的对象(OLE)";
     Text[ greek ] = "������������ ����������� (OLE)";
-    Text[ korean ] = "매입된 개체(OLE)";
+    Text[ korean ] = "포함된 개체(OLE)";
     Text[ turkish ] = "G�m�l� nesne (OLE)";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Objeto incrustado (OLE)";
+    Text[ catalan ] = "objecte incrustat (OLE)";
+    Text[ thai ] = "วัตถุฝังตัว (OLE)";
 };
 String STR_ObjNamePluralOLE2
 {
@@ -3080,7 +3184,7 @@ String STR_ObjNamePluralOLE2
     Text [ spanish ] = "Objetos incrustados (OLE)" ;
     Text [ english_us ] = "Embedded objects (OLE)" ;
     Text[ chinese_simplified ] = "嵌入的对象(OLE)";
-    Text[ russian ] = "���������� ������� (OLE)";
+    Text[ russian ] = "���������� ������� (OLE)";
     Text[ polish ] = "osadzone obiekty (OLE)";
     Text[ japanese ] = "埋め込みオブジェクト(OLE)";
     Text[ chinese_traditional ] = "內嵌的物件(OLE)";
@@ -3091,7 +3195,8 @@ String STR_ObjNamePluralOLE2
     Text[ korean ] = "포함된 개체(OLE)";
     Text[ turkish ] = "g�m�l� nesne (OLE)";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Objetos incrustados (OLE)";
+    Text[ catalan ] = "Objectes incrustats (OLE)";
+    Text[ thai ] = "วัตถุฝังตัว (OLE)";
 };
 String STR_ObjNameSingulUno
 {
@@ -3115,11 +3220,12 @@ String STR_ObjNameSingulUno
     Text[ dutch ] = "Controleveld";
     Text[ chinese_simplified ] = "控制";
     Text[ greek ] = "����� �������";
-    Text[ korean ] = "컨트롤 필드";
+    Text[ korean ] = "컨트롤";
     Text[ turkish ] = "Komut alan�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Campo de control";
-    Text[ finnish ] = "Ohjain";
+    Text[ catalan ] = "Control";
+    Text[ finnish ] = "Ohjausobjekti";
+    Text[ thai ] = "ตัวควบคุม";
 };
 String STR_ObjNamePluralUno
 {
@@ -3143,11 +3249,12 @@ String STR_ObjNamePluralUno
     Text[ dutch ] = "Controlevelden";
     Text[ chinese_simplified ] = "控制";
     Text[ greek ] = "����� �������";
-    Text[ korean ] = "컨트롤 필드";
+    Text[ korean ] = "컨트롤";
     Text[ turkish ] = "Komut alan�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Campos de control";
-    Text[ finnish ] = "Ohjaimet";
+    Text[ catalan ] = "Controls";
+    Text[ finnish ] = "Ohjausobjektit";
+    Text[ thai ] = "ตัวควบคุม";
 };
 String STR_ObjNameSingulOLE2LNK
 {
@@ -3163,7 +3270,7 @@ String STR_ObjNameSingulOLE2LNK
     Text [ french ] = "Objet li� et incorpor� (OLE)" ;
     Text [ dutch ] = "Gekoppeld ingesloten object (OLE)" ;
     Text[ chinese_simplified ] = "链接的嵌入对象(OLE)";
-    Text[ russian ] = "��������� ���������� ������ (OLE)";
+    Text[ russian ] = "��������� ���������� ������ (OLE)";
     Text[ polish ] = "Po��czony osadzony obiekt (OLE)";
     Text[ japanese ] = "リンクされた埋め込みオブジェクト(OLE)";
     Text[ chinese_traditional ] = "連結嵌入的物件(OLE)";
@@ -3174,8 +3281,9 @@ String STR_ObjNameSingulOLE2LNK
     Text[ korean ] = "연결된 포함 개체(OLE)";
     Text[ turkish ] = "Ba�lant�l� g�m�l� nesne (OLE)";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Objeto (OLE) incrustado vinculado";
+    Text[ catalan ] = "Objecte (OLE) incrustat enlla�at";
     Text[ finnish ] = "linkitetty upotettu objekti (OLE)";
+    Text[ thai ] = "เชื่อมโยงวัตถุฝังตัว (OLE)";
 };
 String STR_ObjNamePluralOLE2LNK
 {
@@ -3191,7 +3299,7 @@ String STR_ObjNamePluralOLE2LNK
     Text [ french ] = "Objets li�s et incorpor�s (OLE)" ;
     Text [ dutch ] = "Gekoppelde ingesloten objecten (OLE)" ;
     Text[ chinese_simplified ] = "链接的嵌入对象(OLE)";
-    Text[ russian ] = "��������� ���������� ������� (OLE)";
+    Text[ russian ] = "��������� ���������� ������� (OLE)";
     Text[ polish ] = "Po��czone osadzone obiekty (OLE)";
     Text[ japanese ] = "リンクされた埋め込みオブジェクト(OLE)";
     Text[ chinese_traditional ] = "嵌入的物件(OLE)";
@@ -3202,8 +3310,9 @@ String STR_ObjNamePluralOLE2LNK
     Text[ korean ] = "연결된 포함 개체 (OLE)";
     Text[ turkish ] = "Ba�lant�l�, g�m�l� nesne (OLE)";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Objetos (OLE) incrustados vinculados";
+    Text[ catalan ] = "Objectes (OLE) incrustats enlla�ats";
     Text[ finnish ] = "Linkitetyt upotetut objektit (OLE)";
+    Text[ thai ] = "เชื่อมโยงวัตถุฝังตัว (OLE)";
 };
 String STR_ObjOLE2NamePrefix
 {
@@ -3230,8 +3339,9 @@ String STR_ObjOLE2NamePrefix
     Text[ korean ] = "개체";
     Text[ turkish ] = "Nesne";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Objeto";
+    Text[ catalan ] = "Objecte";
     Text[ finnish ] = "Objekti";
+    Text[ thai ] = "วัตถุ";
 };
  ////////////////////////////////////////////////////////////////////////////////////////////////////
 String STR_ObjNameSingulFrame
@@ -3244,11 +3354,11 @@ String STR_ObjNameSingulFrame
     Text [ swedish ] = "Ram" ;
     Text [ danish ] = "Frame" ;
     Text [ italian ] = "Frame" ;
-    Text [ spanish ] = "Frame" ;
+    Text [ spanish ] = "Marco" ;
     Text [ french ] = "Frame" ;
     Text [ dutch ] = "Frame" ;
     Text[ chinese_simplified ] = "框对象";
-    Text[ russian ] = "����";
+    Text[ russian ] = "�����";
     Text[ polish ] = "Ramka";
     Text[ japanese ] = "フレーム";
     Text[ chinese_traditional ] = "訊框";
@@ -3261,6 +3371,7 @@ String STR_ObjNameSingulFrame
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Marc";
     Text[ finnish ] = "Kehys";
+    Text[ thai ] = "กรอบ";
 };
 String STR_ObjNamePluralFrame
 {
@@ -3272,11 +3383,11 @@ String STR_ObjNamePluralFrame
     Text [ swedish ] = "Ramar" ;
     Text [ danish ] = "Frames" ;
     Text [ italian ] = "Frame" ;
-    Text [ spanish ] = "Frames" ;
+    Text [ spanish ] = "Marcos" ;
     Text [ french ] = "Frames" ;
     Text [ dutch ] = "Frames" ;
     Text[ chinese_simplified ] = "框对象";
-    Text[ russian ] = "�����";
+    Text[ russian ] = "�����";
     Text[ polish ] = "Ramki";
     Text[ japanese ] = "フレーム";
     Text[ chinese_traditional ] = "訊框";
@@ -3287,8 +3398,9 @@ String STR_ObjNamePluralFrame
     Text[ korean ] = "프레임";
     Text[ turkish ] = "Frame";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Frames";
+    Text[ catalan ] = "Marcs";
     Text[ finnish ] = "Kehykset";
+    Text[ thai ] = "กรอบ";
 };
 String STR_ObjFrameNamePrefix
 {
@@ -3300,11 +3412,11 @@ String STR_ObjFrameNamePrefix
     Text [ swedish ] = "Ram" ;
     Text [ danish ] = "Frame" ;
     Text [ italian ] = "Frame" ;
-    Text [ spanish ] = "Frame" ;
+    Text [ spanish ] = "Marco" ;
     Text [ french ] = "Frame" ;
     Text [ dutch ] = "Frame" ;
     Text[ chinese_simplified ] = "框对象";
-    Text[ russian ] = "����";
+    Text[ russian ] = "�����";
     Text[ polish ] = "Ramka";
     Text[ japanese ] = "フレーム";
     Text[ chinese_traditional ] = "訊框";
@@ -3317,6 +3429,7 @@ String STR_ObjFrameNamePrefix
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Marc";
     Text[ finnish ] = "Kehys";
+    Text[ thai ] = "กรอบ";
 };
  ////////////////////////////////////////////////////////////////////////////////////////////////////
 String STR_ObjNameSingulEDGE
@@ -3327,7 +3440,7 @@ String STR_ObjNameSingulEDGE
     Text [ italian ] = "Connettore di oggetti" ;
     Text [ portuguese_brazilian ] = "Conector" ;
     Text [ portuguese ] = "Conectores de objectos" ;
-    Text [ finnish ] = "Objektiliittimet" ;
+    Text [ finnish ] = "Objektien yhdysviivat" ;
     Text [ danish ] = "Objektforbindelser" ;
     Text [ french ] = "Connecteurs d'objets" ;
     Text [ swedish ] = "Objektf�rbindelse" ;
@@ -3335,7 +3448,7 @@ String STR_ObjNameSingulEDGE
     Text [ spanish ] = "Conectores de objetos" ;
     Text [ english_us ] = "Object Connectors" ;
     Text[ chinese_simplified ] = "对象连接符";
-    Text[ russian ] = "����������� �������";
+    Text[ russian ] = "������� �������";
     Text[ polish ] = "��cznik obiekt�w";
     Text[ japanese ] = "オブジェクト コネクタ";
     Text[ chinese_traditional ] = "物件連接符";
@@ -3346,7 +3459,8 @@ String STR_ObjNameSingulEDGE
     Text[ korean ] = "개체 연결선";
     Text[ turkish ] = "Nesne ba�lay�c�s�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Conectores de objetos";
+    Text[ catalan ] = "Connectors de l'objecte";
+    Text[ thai ] = "ตัวเชื่อมต่อวัตถุ";
 };
 String STR_ObjNamePluralEDGE
 {
@@ -3356,7 +3470,7 @@ String STR_ObjNamePluralEDGE
     Text [ italian ] = "Connettori di oggetti" ;
     Text [ portuguese_brazilian ] = "Conectores" ;
     Text [ portuguese ] = "Conectores de objectos" ;
-    Text [ finnish ] = "Objektiliittimet" ;
+    Text [ finnish ] = "Objektiyhdysviivat" ;
     Text [ danish ] = "Objektforbindelser" ;
     Text [ french ] = "Connecteurs d'objets" ;
     Text [ swedish ] = "Objektf�rbindelse" ;
@@ -3364,7 +3478,7 @@ String STR_ObjNamePluralEDGE
     Text [ spanish ] = "Conectores de objetos" ;
     Text [ english_us ] = "Object Connectors" ;
     Text[ chinese_simplified ] = "对象连接符";
-    Text[ russian ] = "����������� �������";
+    Text[ russian ] = "������� �������";
     Text[ polish ] = "��czniki obiekt�w";
     Text[ japanese ] = "オブジェクト コネクタ";
     Text[ chinese_traditional ] = "物件連接符";
@@ -3375,7 +3489,8 @@ String STR_ObjNamePluralEDGE
     Text[ korean ] = "개체 연결선";
     Text[ turkish ] = "Nesne ba�lay�c�s�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Conectores de objetos";
+    Text[ catalan ] = "Connectors de l'objecte";
+    Text[ thai ] = "ตัวเชื่อมต่อวัตถุ";
 };
 String STR_ObjNameSingulCAPTION
 {
@@ -3393,7 +3508,7 @@ String STR_ObjNameSingulCAPTION
     Text [ spanish ] = "Leyenda" ;
     Text [ english_us ] = "Callout" ;
     Text[ chinese_simplified ] = "图例";
-    Text[ russian ] = "�������";
+    Text[ russian ] = "�������";
     Text[ polish ] = "Legenda";
     Text[ japanese ] = "凡例";
     Text[ chinese_traditional ] = "圖例";
@@ -3404,7 +3519,8 @@ String STR_ObjNameSingulCAPTION
     Text[ korean ] = "범례";
     Text[ turkish ] = "Belirtme �izgisi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Leyenda";
+    Text[ catalan ] = "Llegenda";
+    Text[ thai ] = "คำบรรยายภาพ";
 };
 String STR_ObjNamePluralCAPTION
 {
@@ -3422,7 +3538,7 @@ String STR_ObjNamePluralCAPTION
     Text [ spanish ] = "Leyendas" ;
     Text [ english_us ] = "Callouts" ;
     Text[ chinese_simplified ] = "图例";
-    Text[ russian ] = "�������";
+    Text[ russian ] = "�������";
     Text[ polish ] = "Legendy";
     Text[ japanese ] = "凡例";
     Text[ chinese_traditional ] = "圖例";
@@ -3433,7 +3549,8 @@ String STR_ObjNamePluralCAPTION
     Text[ korean ] = "범례";
     Text[ turkish ] = "Belirtme �izgileri";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Leyendas";
+    Text[ catalan ] = "Llegendes";
+    Text[ thai ] = "คำบรรยายภาพ";
 };
  ////////////////////////////////////////////////////////////////////////////////////////////////////
 String STR_ObjNameSingulPAGE
@@ -3463,7 +3580,8 @@ String STR_ObjNameSingulPAGE
     Text[ korean ] = "페이지 모양 개체";
     Text[ turkish ] = "�nizleme nesnesi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Objeto de presentaci�n de p�gina";
+    Text[ catalan ] = "Previsualitza l'objecte";
+    Text[ thai ] = "แสดงตัวอย่างวัตถุ";
 };
 String STR_ObjNamePluralPAGE
 {
@@ -3492,7 +3610,8 @@ String STR_ObjNamePluralPAGE
     Text[ korean ] = "페이지 모양 개체";
     Text[ turkish ] = "�nizleme nesneleri";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Objetos para presentaciones de p�ginas";
+    Text[ catalan ] = "Previsualitza els objectes";
+    Text[ thai ] = "แสดงตัวอย่างวัตถุ";
 };
 String STR_ObjNameSingulMEASURE
 {
@@ -3506,11 +3625,11 @@ String STR_ObjNameSingulMEASURE
     Text [ swedish ] = "Dimensioneringsobjekt" ;
     Text [ danish ] = "Dimensioneringsobjekt" ;
     Text [ italian ] = "Oggetto di quotatura" ;
-    Text [ spanish ] = "Objeto de dimensiones" ;
+    Text [ spanish ] = "L�nea de dimensiones" ;
     Text [ french ] = "Objet de cotation" ;
     Text [ dutch ] = "Objectafmetingen" ;
     Text[ chinese_simplified ] = "定尺寸对象";
-    Text[ russian ] = "������ ��� ���������";
+    Text[ russian ] = "��������� �����";
     Text[ polish ] = "Obiekt do wymiarowania";
     Text[ japanese ] = "寸法記入するオブジェクト";
     Text[ chinese_traditional ] = "定尺寸物件";
@@ -3521,8 +3640,9 @@ String STR_ObjNameSingulMEASURE
     Text[ korean ] = "치수 개체";
     Text[ turkish ] = "�l��m nesnesi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Objeto de dimensiones";
-    Text[ finnish ] = "Mittaviiva";
+    Text[ catalan ] = "Objecte de dimensions";
+    Text[ finnish ] = "Mittajana";
+    Text[ thai ] = "เส้นมีมิติ";
 };
 String STR_ObjNamePluralMEASURE
 {
@@ -3540,7 +3660,7 @@ String STR_ObjNamePluralMEASURE
     Text [ french ] = "Objets de cotation" ;
     Text [ dutch ] = "Objectafmetingen" ;
     Text[ chinese_simplified ] = "定尺寸对象";
-    Text[ russian ] = "������� ���������";
+    Text[ russian ] = "��������� �������";
     Text[ polish ] = "Obiekty do wymiarowania";
     Text[ japanese ] = "寸法記入するオブジェクト";
     Text[ chinese_traditional ] = "定尺寸物件";
@@ -3551,8 +3671,9 @@ String STR_ObjNamePluralMEASURE
     Text[ korean ] = "치수 개체";
     Text[ turkish ] = "�l��m nesneleri";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Objetos de dimensiones";
+    Text[ catalan ] = "Objectes de mesura";
     Text[ finnish ] = "Mitoitusobjektit";
+    Text[ thai ] = "วัตถุมีมิติ";
 };
 String STR_ObjNamePlural
 {
@@ -3570,7 +3691,7 @@ String STR_ObjNamePlural
     Text [ spanish ] = "Objetos de dibujo" ;
     Text [ english_us ] = "draw objects" ;
     Text[ chinese_simplified ] = "绘图对象";
-    Text[ russian ] = "����������� �������";
+    Text[ russian ] = "����������� �������";
     Text[ polish ] = "Obiekty graficzne";
     Text[ japanese ] = "図形描画オブジェクト";
     Text[ chinese_traditional ] = "繪圖物件";
@@ -3581,7 +3702,8 @@ String STR_ObjNamePlural
     Text[ korean ] = "그리기 개체";
     Text[ turkish ] = "�izim nesneleri";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Objetos de dibujo";
+    Text[ catalan ] = "Objectes de dibuix";
+    Text[ thai ] = "วาดวัตถุ";
 };
 String STR_ObjNameNoObj
 {
@@ -3610,7 +3732,8 @@ String STR_ObjNameNoObj
     Text[ korean ] = "그리기 개체 없음";
     Text[ turkish ] = "�izim nesnesi yok";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Ning�n objeto de dibujo";
+    Text[ catalan ] = "Cap objecte de dibuix";
+    Text[ thai ] = "ไม่วาดวัตถุ";
 };
 String STR_ObjNameAnd
 {
@@ -3636,10 +3759,11 @@ String STR_ObjNameAnd
     Text[ dutch ] = "en";
     Text[ chinese_simplified ] = "和";
     Text[ greek ] = "���";
-    Text[ korean ] = "그리고";
+    Text[ korean ] = "와(과)";
     Text[ turkish ] = "ve";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "y";
+    Text[ catalan ] = "i";
+    Text[ thai ] = "และ";
 };
 String STR_ObjNameSingulPlural
 {
@@ -3668,7 +3792,8 @@ String STR_ObjNameSingulPlural
     Text[ korean ] = "그리기 개체(들)";
     Text[ turkish ] = "�izim nesnesi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "objeto(s) de dibujo";
+    Text[ catalan ] = "objecte(s) de dibuix";
+    Text[ thai ] = "วาดวัตถุ";
 };
 
  ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -3683,11 +3808,11 @@ String STR_ObjNameSingulCube3d
     Text[ english_us ] = "3D cube";
     Text[ portuguese ] = "Cubo 3D";
     Text[ greek ] = "����� 3�";
-    Text[ dutch ] = "3D dobbelsteen";
+    Text[ dutch ] = "3D-dobbelsteen";
     Text[ french ] = "Cube 3D";
     Text[ spanish ] = "Cubo 3D";
     Text[ swedish ] = "3D-kub";
-    Text[ russian ] = "��� 3-�";
+    Text[ russian ] = "���������� ���";
     Text[ italian ] = "Cubo 3D";
     Text[ danish ] = "3D terning";
     Text[ polish ] = "kostka 3-W";
@@ -3699,8 +3824,9 @@ String STR_ObjNameSingulCube3d
     Text[ arabic ] = "���� ����� �������";
     Text[ turkish ] = "3B k�p";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Cubo 3D";
+    Text[ catalan ] = "cub 3D";
     Text[ finnish ] = "3D-kuutio";
+    Text[ thai ] = "ลูกบาศก์3มิติ";
 };
 
 String STR_ObjNamePluralCube3d
@@ -3710,11 +3836,11 @@ String STR_ObjNamePluralCube3d
     Text[ english_us ] = "3D cubes";
     Text[ portuguese ] = "Cubos 3D";
     Text[ greek ] = "����� 3�";
-    Text[ dutch ] = "3D dobbelstenen";
+    Text[ dutch ] = "3D-dobbelstenen";
     Text[ french ] = "Cubes 3D";
     Text[ spanish ] = "Cubos 3D";
     Text[ swedish ] = "3D-kuber";
-    Text[ russian ] = "���� 3-�";
+    Text[ russian ] = "���������� ����";
     Text[ italian ] = "Cubi 3D";
     Text[ danish ] = "3D terninger";
     Text[ polish ] = "kostki 3-W";
@@ -3726,8 +3852,9 @@ String STR_ObjNamePluralCube3d
     Text[ arabic ] = "������ ������ �������";
     Text[ turkish ] = "3B k�pler";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Cubos 3D";
+    Text[ catalan ] = "cubs 3D";
     Text[ finnish ] = "3D-kuutiot";
+    Text[ thai ] = "ลูกบาศก์3มิติ";
 };
 
 String STR_ObjNameSingulExtrude3d
@@ -3752,8 +3879,9 @@ String STR_ObjNameSingulExtrude3d
     Text[ chinese_traditional ] = "模壓式物件";
     Text[ arabic ] = "���� �����";
     Text[ turkish ] = "Kal�p nesne";
-    Text[ catalan ] = "Objeto de extrusi�n";
-    Text[ finnish ] = "Pursotusobjekti";
+    Text[ catalan ] = "Objeto d'extrusi�";
+    Text[ finnish ] = "Pursotuskappale";
+    Text[ thai ] = "วัตถุส่วนที่ยื่น";
 };
 
 String STR_ObjNamePluralExtrude3d
@@ -3778,8 +3906,9 @@ String STR_ObjNamePluralExtrude3d
     Text[ chinese_traditional ] = "模壓式物件";
     Text[ arabic ] = "������ ������";
     Text[ turkish ] = "Kal�p nesneler";
-    Text[ catalan ] = "Objetos de extrusi�n";
-    Text[ finnish ] = "Pursotusobjektit";
+    Text[ catalan ] = "Objectes d'extrusi�";
+    Text[ finnish ] = "Pursotuskappaleet";
+    Text[ thai ] = "วัตถุส่วนที่ยื่น";
 };
 
 String STR_ObjNameSingulLabel3d
@@ -3789,11 +3918,11 @@ String STR_ObjNameSingulLabel3d
     Text[ english_us ] = "3D text";
     Text[ portuguese ] = "Texto 3D";
     Text[ greek ] = "������� 3�";
-    Text[ dutch ] = "3D tekst";
+    Text[ dutch ] = "3D-tekst";
     Text[ french ] = "Texte 3D";
     Text[ spanish ] = "Texto 3D";
     Text[ swedish ] = "3D-text";
-    Text[ russian ] = "����� 3-�";
+    Text[ russian ] = "���������� �����";
     Text[ italian ] = "Testo 3D";
     Text[ danish ] = "3D tekst";
     Text[ polish ] = "tekst 3-W";
@@ -3805,8 +3934,9 @@ String STR_ObjNameSingulLabel3d
     Text[ arabic ] = "�� ����� �������";
     Text[ turkish ] = "3B metin";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Texto 3D";
+    Text[ catalan ] = "text 3D";
     Text[ finnish ] = "3D-teksti";
+    Text[ thai ] = "ข้อความ3มิติ";
 };
 
 String STR_ObjNamePluralLabel3d
@@ -3816,11 +3946,11 @@ String STR_ObjNamePluralLabel3d
     Text[ english_us ] = "3D texts";
     Text[ portuguese ] = "Textos 3D";
     Text[ greek ] = "������� 3�";
-    Text[ dutch ] = "3D teksten";
+    Text[ dutch ] = "3D-teksten";
     Text[ french ] = "Textes 3D";
     Text[ spanish ] = "Textos 3D";
     Text[ swedish ] = "3D-texter";
-    Text[ russian ] = "������ 3-�";
+    Text[ russian ] = "���������� ������";
     Text[ italian ] = "Testi 3D";
     Text[ danish ] = "3D tekster";
     Text[ polish ] = "tekst 3-W";
@@ -3832,8 +3962,9 @@ String STR_ObjNamePluralLabel3d
     Text[ arabic ] = "���� ������ �������";
     Text[ turkish ] = "3B metinler";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Textos 3D";
+    Text[ catalan ] = "texts 3D";
     Text[ finnish ] = "3D-tekstit";
+    Text[ thai ] = "ข้อความ3มิติ";
 };
 
 String STR_ObjNameSingulLathe3d
@@ -3858,8 +3989,9 @@ String STR_ObjNameSingulLathe3d
     Text[ chinese_traditional ] = "旋轉物件";
     Text[ arabic ] = "���� �������";
     Text[ turkish ] = "D�ner nesne";
-    Text[ catalan ] = "Objeto de rotaci�n";
-    Text[ finnish ] = "kierto-objekti";
+    Text[ catalan ] = "objecte de gir";
+    Text[ finnish ] = "py�r�hdyskappale";
+    Text[ thai ] = "การหมุนวัตถุ";
 };
 
 String STR_ObjNamePluralLathe3d
@@ -3884,8 +4016,9 @@ String STR_ObjNamePluralLathe3d
     Text[ chinese_traditional ] = "旋轉物件";
     Text[ arabic ] = "������ �������";
     Text[ turkish ] = "D�ner nesneler";
-    Text[ catalan ] = "Objetos de rotaci�n";
-    Text[ finnish ] = "kierto-objektit";
+    Text[ catalan ] = "objectes de gir";
+    Text[ finnish ] = "py�r�hdyskappaleet";
+    Text[ thai ] = "การหมุนวัตถุ";
 };
 
 String STR_ObjNameSingulObj3d
@@ -3895,11 +4028,11 @@ String STR_ObjNameSingulObj3d
     Text[ english_us ] = "3D object";
     Text[ portuguese ] = "Objecto 3D";
     Text[ greek ] = "����������� 3�";
-    Text[ dutch ] = "3D object";
+    Text[ dutch ] = "3D-object";
     Text[ french ] = "Objet 3D";
     Text[ spanish ] = "Objeto 3D";
     Text[ swedish ] = "3D-objekt";
-    Text[ russian ] = "������ 3-�";
+    Text[ russian ] = "���������� ������";
     Text[ italian ] = "Oggetto 3D";
     Text[ danish ] = "3D objekt";
     Text[ polish ] = "obiekt 3-W";
@@ -3911,8 +4044,9 @@ String STR_ObjNameSingulObj3d
     Text[ arabic ] = "���� ����� �������";
     Text[ turkish ] = "3B nesne";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Objeto 3D";
-    Text[ finnish ] = "3D-objekti";
+    Text[ catalan ] = "objecte 3D";
+    Text[ finnish ] = "3D-kappale";
+    Text[ thai ] = "วัตถุ3มิติ";
 };
 
 String STR_ObjNamePluralObj3d
@@ -3922,11 +4056,11 @@ String STR_ObjNamePluralObj3d
     Text[ english_us ] = "3D objects";
     Text[ portuguese ] = "Objectos 3D";
     Text[ greek ] = "����������� 3�";
-    Text[ dutch ] = "3D objecten";
+    Text[ dutch ] = "3D-objecten";
     Text[ french ] = "Objets 3D";
     Text[ spanish ] = "Objetos 3D";
     Text[ swedish ] = "3D-objekt";
-    Text[ russian ] = "������� 3-�";
+    Text[ russian ] = "���������� �������";
     Text[ italian ] = "Oggetti 3D";
     Text[ danish ] = "3D objekter";
     Text[ polish ] = "obiekty 3-W";
@@ -3938,8 +4072,9 @@ String STR_ObjNamePluralObj3d
     Text[ arabic ] = "������ ������ �������";
     Text[ turkish ] = "3B nesneler";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Objetos 3D";
-    Text[ finnish ] = "3D-objektit";
+    Text[ catalan ] = "objectes 3D";
+    Text[ finnish ] = "3D-kappaleet";
+    Text[ thai ] = "วัตถุ3มิติ";
 };
 
 String STR_ObjNameSingulPoly3d
@@ -3949,11 +4084,11 @@ String STR_ObjNameSingulPoly3d
     Text[ english_us ] = "3D polygon";
     Text[ portuguese ] = "Pol�gono 3D";
     Text[ greek ] = "�������� 3�";
-    Text[ dutch ] = "3D veelhoek";
+    Text[ dutch ] = "3D-veelhoek";
     Text[ french ] = "Polygone 3D";
     Text[ spanish ] = "Pol�gono 3D";
     Text[ swedish ] = "3D-polygon";
-    Text[ russian ] = "������� 3-�";
+    Text[ russian ] = "���������� �������������";
     Text[ italian ] = "Poligono 3D";
     Text[ danish ] = "3D polygon";
     Text[ polish ] = "wielok�t 3-W";
@@ -3965,8 +4100,9 @@ String STR_ObjNameSingulPoly3d
     Text[ arabic ] = "���� ����� �������";
     Text[ turkish ] = "3B �okgen";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Pol�gono 3D";
-    Text[ finnish ] = "3D-polygoni";
+    Text[ catalan ] = "Pol�gon 3D";
+    Text[ finnish ] = "3D-monikulmio";
+    Text[ thai ] = "รูปหลายเหลี่ยม3มิติ";
 };
 
 String STR_ObjNamePluralPoly3d
@@ -3976,11 +4112,11 @@ String STR_ObjNamePluralPoly3d
     Text[ english_us ] = "3D polygons";
     Text[ portuguese ] = "Pol�gonos 3D";
     Text[ greek ] = "�������� 3�";
-    Text[ dutch ] = "3D veelhoeken";
+    Text[ dutch ] = "3D-veelhoeken";
     Text[ french ] = "Polygones 3D";
     Text[ spanish ] = "Pol�gonos 3D";
     Text[ swedish ] = "3D-polygoner";
-    Text[ russian ] = "�������� 3-�";
+    Text[ russian ] = "���������� ��������������";
     Text[ italian ] = "Poligoni 3D";
     Text[ danish ] = "3D polygoner";
     Text[ polish ] = "wielok�ty 3-W";
@@ -3992,8 +4128,9 @@ String STR_ObjNamePluralPoly3d
     Text[ arabic ] = "������ ������ �������";
     Text[ turkish ] = "3B �okgenler";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Pol�gonos 3D";
-    Text[ finnish ] = "3D-polygonit";
+    Text[ catalan ] = "Pol�gons 3D";
+    Text[ finnish ] = "3D-monikulmio";
+    Text[ thai ] = "รูปหลายเหลี่ยม3มิติ";
 };
 
 String STR_ObjNameSingulScene3d
@@ -4003,11 +4140,11 @@ String STR_ObjNameSingulScene3d
     Text[ english_us ] = "3D scene";
     Text[ portuguese ] = "Cena 3D";
     Text[ greek ] = "3� �����";
-    Text[ dutch ] = "3D scene";
+    Text[ dutch ] = "3D-scene";
     Text[ french ] = "S�quence 3D";
     Text[ spanish ] = "Escena 3D";
     Text[ swedish ] = "3D-scen";
-    Text[ russian ] = "����� 3-�";
+    Text[ russian ] = "���������� �����";
     Text[ italian ] = "Scena 3D";
     Text[ danish ] = "3D scene";
     Text[ polish ] = "scena 3-W";
@@ -4019,8 +4156,9 @@ String STR_ObjNameSingulScene3d
     Text[ arabic ] = "���� ����� �������";
     Text[ turkish ] = "3B g�r�nt�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Escena 3D";
+    Text[ catalan ] = "escena 3D";
     Text[ finnish ] = "3D-alue";
+    Text[ thai ] = "ฉาก3มิติ";
 };
 
 String STR_ObjNamePluralScene3d
@@ -4030,11 +4168,11 @@ String STR_ObjNamePluralScene3d
     Text[ english_us ] = "3D scenes";
     Text[ portuguese ] = "Cenas 3D";
     Text[ greek ] = "3� ������";
-    Text[ dutch ] = "3D scenes";
+    Text[ dutch ] = "3D-scenes";
     Text[ french ] = "S�quences 3D";
     Text[ spanish ] = "Escenas 3D";
     Text[ swedish ] = "3D-scener";
-    Text[ russian ] = "����� 3-�";
+    Text[ russian ] = "���������� �����";
     Text[ italian ] = "Scene 3D";
     Text[ danish ] = "3D scener";
     Text[ polish ] = "sceny 3-W";
@@ -4046,8 +4184,9 @@ String STR_ObjNamePluralScene3d
     Text[ arabic ] = "����� ������ �������";
     Text[ turkish ] = "3B g�r�nt�ler";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Escenas 3D";
-    Text[ finnish ] = "3D-alueet";
+    Text[ catalan ] = "escenes 3D";
+    Text[ finnish ] = "3D-alue";
+    Text[ thai ] = "ฉาก3มิติ";
 };
 
 String STR_ObjNameSingulSphere3d
@@ -4072,8 +4211,9 @@ String STR_ObjNameSingulSphere3d
     Text[ chinese_traditional ] = "球體";
     Text[ arabic ] = "���";
     Text[ turkish ] = "K�re";
-    Text[ catalan ] = "Esfera";
+    Text[ catalan ] = "esfera";
     Text[ finnish ] = "pallo";
+    Text[ thai ] = "ลายลูกกลมเล็ก";
 };
 
 String STR_ObjNamePluralSphere3d
@@ -4098,8 +4238,9 @@ String STR_ObjNamePluralSphere3d
     Text[ chinese_traditional ] = "球體";
     Text[ arabic ] = "����";
     Text[ turkish ] = "K�reler";
-    Text[ catalan ] = "Esferas";
-    Text[ finnish ] = "pallot";
+    Text[ catalan ] = "esferes";
+    Text[ finnish ] = "pallo";
+    Text[ thai ] = "ลายลูกกลมเล็ก";
 };
 
  ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -4130,10 +4271,11 @@ String STR_EditWithCopy
     Text[ dutch ] = "meekopi�ren";
     Text[ chinese_simplified ] = "一起复制";
     Text[ greek ] = "�� ���������";
-    Text[ korean ] = "복사와 함께";
+    Text[ korean ] = "복사 포함";
     Text[ turkish ] = "ile birlikte kopyala";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "con copia";
+    Text[ catalan ] = "amb c�pia";
+    Text[ thai ] = "ด้วยการคัดลอก";
 };
 String STR_EditPosSize
 {
@@ -4161,10 +4303,11 @@ String STR_EditPosSize
     Text[ dutch ] = "Positie en grootte voor %O instellen";
     Text[ chinese_simplified ] = "设定 %O 位置和大小";
     Text[ greek ] = "������� ����� ��� �������� ��� %O";
-    Text[ korean ] = "%O에 위치와 크기 설정";
+    Text[ korean ] = "%O에 위치 및 크기 설정";
     Text[ turkish ] = "%O i�in konum ve boyut belirle";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Definir posici�n y tama�o para %O";
+    Text[ catalan ] = "Defineix posici� i mida per %O";
+    Text[ thai ] = "กำหนดตำแหน่งและขนาดสำหรับ %O";
 };
 String STR_EditDelete
 {
@@ -4181,7 +4324,7 @@ String STR_EditDelete
     Text [ french ] = "Supprimer %O" ;
     Text [ swedish ] = "Radera %0" ;
     Text [ dutch ] = "%O verwijderen" ;
-    Text [ spanish ] = "Eliminar %O" ;
+    Text [ spanish ] = "Borrar %O" ;
     Text [ english_us ] = "Delete %O" ;
     Text[ chinese_simplified ] = "删除 %O";
     Text[ russian ] = "������� %O";
@@ -4195,7 +4338,8 @@ String STR_EditDelete
     Text[ korean ] = "%O 삭제";
     Text[ turkish ] = "Sil: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Eliminar %O";
+    Text[ catalan ] = "Suprimeix %O";
+    Text[ thai ] = "ลบ %O";
 };
 String STR_EditMovToTop
 {
@@ -4224,7 +4368,8 @@ String STR_EditMovToTop
     Text[ korean ] = "%O 계속해서 앞으로 이동";
     Text[ turkish ] = "Bir �ne getir: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Desplazar %O hacia adelante";
+    Text[ catalan ] = "Despla�a %O cap endavant";
+    Text[ thai ] = "ย้าย %O ไปข้างหน้า";
 };
 String STR_EditMovToBtm
 {
@@ -4253,7 +4398,8 @@ String STR_EditMovToBtm
     Text[ korean ] = "%O 계속해서 뒤로 이동";
     Text[ turkish ] = "Bir alta g�nder: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Desplazar %O hacia atr�s";
+    Text[ catalan ] = "Despla�a %O cap enrera";
+    Text[ thai ] = "ย้าย %O ไปข้างหลัง";
 };
 String STR_EditPutToTop
 {
@@ -4282,7 +4428,8 @@ String STR_EditPutToTop
     Text[ korean ] = "%O 앞으로 이동";
     Text[ turkish ] = "En �ne getir: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Desplazar %O al frente";
+    Text[ catalan ] = "Despla�a %O al davant";
+    Text[ thai ] = "ย้าย %O ไปด้านหน้า";
 };
 String STR_EditPutToBtm
 {
@@ -4311,7 +4458,8 @@ String STR_EditPutToBtm
     Text[ korean ] = "%O 뒤로 이동";
     Text[ turkish ] = "En alta g�nder: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Desplazar %O hacia atr�s";
+    Text[ catalan ] = "Despla�a %O al darrere";
+    Text[ thai ] = "ย้าย %O ไปด้านหลัง";
 };
 String STR_EditRevOrder
 {
@@ -4325,21 +4473,22 @@ String STR_EditRevOrder
     Text [ italian ] = "Inverti la sequenza di %O" ;
     Text [ spanish ] = "Invertir el orden de %O" ;
     Text [ french ] = "Inverser l'ordre de %O" ;
-    Text [ dutch ] = "Volgorde van %0 omkeren" ;
+    Text [ dutch ] = "Volgorde van %O omkeren" ;
     Text[ chinese_simplified ] = "%O 顺序相反";
-    Text[ russian ] = "�������� ������������������ %O";
+    Text[ russian ] = "�������� ������� %O";
     Text[ polish ] = "Odwr�� kolejno�� %O";
     Text[ japanese ] = "%Oの順序を逆にする";
     Text[ chinese_traditional ] = "%O 順序相反";
     Text[ arabic ] = "��� ����� %O";
-    Text[ dutch ] = "Volgorde van %0 omkeren";
+    Text[ dutch ] = "Volgorde van %O omkeren";
     Text[ chinese_simplified ] = "%O 顺序相反";
     Text[ greek ] = "���������� �������� ��� %O";
     Text[ korean ] = "%O의 순서를 반대로";
     Text[ turkish ] = "S�ras�n� de�i�tir: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Invertir el orden de %O";
+    Text[ catalan ] = "Inverteix l'ordre de %O";
     Text[ finnish ] = "Muuta kohteen %O j�rjestyst�";
+    Text[ thai ] = "ลำดับที่กลับกันของ %O";
 };
 String STR_EditMove
 {
@@ -4368,7 +4517,8 @@ String STR_EditMove
     Text[ korean ] = "%O 이동";
     Text[ turkish ] = "Ta��: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Desplazar %O";
+    Text[ catalan ] = "Despla�a %O";
+    Text[ thai ] = "ย้าย %O";
 };
 String STR_EditResize
 {
@@ -4399,7 +4549,8 @@ String STR_EditResize
     Text[ korean ] = "%O의 크기 변경";
     Text[ turkish ] = "Boyutunu de�i�tir: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Modificar tama�o de %O";
+    Text[ catalan ] = "Modifica la mida de %O";
+    Text[ thai ] = "ปรับขนาด %O";
 };
 String STR_EditRotate
 {
@@ -4428,7 +4579,8 @@ String STR_EditRotate
     Text[ korean ] = "%O 회전";
     Text[ turkish ] = "D�nd�r: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Rodar %O";
+    Text[ catalan ] = "Roda %O";
+    Text[ thai ] = "หมุน %O";
 };
 String STR_EditMirrorHori
 {
@@ -4457,7 +4609,8 @@ String STR_EditMirrorHori
     Text[ korean ] = "%O 수평으로 대칭";
     Text[ turkish ] = "Yatay yans�t: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Reflejar %O horizontalmente";
+    Text[ catalan ] = "Reflexa %O horitzontalment";
+    Text[ thai ] = "พลิก %O แนวนอน";
 };
 String STR_EditMirrorVert
 {
@@ -4486,7 +4639,8 @@ String STR_EditMirrorVert
     Text[ korean ] = "%O 수직으로 대칭";
     Text[ turkish ] = "Dikey yans�t: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Reflejar %O verticalmente";
+    Text[ catalan ] = "Reflexa %O verticalment";
+    Text[ thai ] = "พลิก %O แนวตั้ง";
 };
 String STR_EditMirrorDiag
 {
@@ -4515,7 +4669,8 @@ String STR_EditMirrorDiag
     Text[ korean ] = "%O 대각선으로 대칭";
     Text[ turkish ] = "Diyagonal yans�t: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Reflejar %O diagonalmente";
+    Text[ catalan ] = "Reflexa %O diagonalment";
+    Text[ thai ] = "พลิก %O แนวทแยงมุม";
 };
 String STR_EditMirrorFree
 {
@@ -4544,7 +4699,8 @@ String STR_EditMirrorFree
     Text[ korean ] = "%O 임의대로 대칭";
     Text[ turkish ] = "Serbest yans�t: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Reflejar %O libremente";
+    Text[ catalan ] = "Reflexa %O lliurement";
+    Text[ thai ] = "พลิก %O อิสระ";
 };
 String STR_EditShear
 {
@@ -4576,6 +4732,7 @@ String STR_EditShear
     Text[ turkish ] = "�arp�t (e�): %O";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Distorsionar (inclinar) %O";
+    Text[ thai ] = "บิด %O (เอียง)";
 };
 String STR_EditCrook
 {
@@ -4587,8 +4744,8 @@ String STR_EditCrook
     Text [ swedish ] = "Placera %O i cirkel" ;
     Text [ danish ] = "Arranger %O i cirkel" ;
     Text [ italian ] = "Disponi %O in cerchio" ;
-    Text [ spanish ] = "Organizar %O en c�rculo" ;
-    Text [ french ] = "Disposer en cercle %O" ;
+    Text [ spanish ] = "Disponer %O en c�rculo" ;
+    Text [ french ] = "Positionner %O dans le cercle" ;
     Text [ dutch ] = "%O in cirkel schikken" ;
     Text[ chinese_simplified ] = "%O 排序成圆形";
     Text[ russian ] = "����������� %O � �����";
@@ -4599,11 +4756,12 @@ String STR_EditCrook
     Text[ dutch ] = "%O in cirkel schikken";
     Text[ chinese_simplified ] = "%O 排序成圆形";
     Text[ greek ] = "���������� �� ����� %O";
-    Text[ korean ] = "%O을 원 안에서 정렬";
+    Text[ korean ] = "%O을(를) 원에서 배치 ";
     Text[ turkish ] = "Daire bi�iminde d�zenle: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Organizar %O en c�rculo";
+    Text[ catalan ] = "Organtiza %O en cercle";
     Text[ finnish ] = "J�rjest� %O ympyr��n";
+    Text[ thai ] = "จัดระเบียบ %O ในวงกลม";
 };
 String STR_EditCrookContortion
 {
@@ -4629,11 +4787,12 @@ String STR_EditCrookContortion
     Text[ dutch ] = "%O in cirkel buigen";
     Text[ chinese_simplified ] = "%O 转变成圆形";
     Text[ greek ] = "������� %O �� �����";
-    Text[ korean ] = "%O을 원형태로 구부림";
+    Text[ korean ] = "%O 원형으로 구부림";
     Text[ turkish ] = "Daire bi�iminde e�: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Doblar %O en c�rculo";
+    Text[ catalan ] = "Dobla %O en cercle";
     Text[ finnish ] = "Kaareuta %O ympyr�ksi";
+    Text[ thai ] = "เส้นโค้ง %O ในวงกลม";
 };
 String STR_EditDistort
 {
@@ -4649,7 +4808,7 @@ String STR_EditDistort
     Text [ french ] = "D�former librement %O" ;
     Text [ dutch ] = "%O vrij vervormen" ;
     Text[ chinese_simplified ] = "%O 自由扭曲";
-    Text[ russian ] = "��������� ��������� %O";
+    Text[ russian ] = "��������� %O";
     Text[ polish ] = "Zniekszta�� dowolnie %O";
     Text[ japanese ] = "%Oを自由に歪める";
     Text[ chinese_traditional ] = "%O 自由扭曲";
@@ -4657,11 +4816,12 @@ String STR_EditDistort
     Text[ dutch ] = "%O vrij vervormen";
     Text[ chinese_simplified ] = "%O 自由扭曲";
     Text[ greek ] = "�������� ����������� %O";
-    Text[ korean ] = "%O 임의대로 일그러뜨림";
+    Text[ korean ] = "%O 임의대로 일그러뜨리기";
     Text[ turkish ] = "Serbest �arp�t: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Distorsi�n libre de %O";
+    Text[ catalan ] = "Distorsi� lliure de %O";
     Text[ finnish ] = "V��rist� %O";
+    Text[ thai ] = "บิด %O";
 };
 String STR_EditRipUp
 {
@@ -4671,7 +4831,7 @@ String STR_EditRipUp
     Text [ italian ] = "separa %O" ;
     Text [ portuguese_brazilian ] = "Abrir %O" ;
     Text [ portuguese ] = "Separar %O" ;
-    Text [ finnish ] = "Peruuta %O" ;
+    Text [ finnish ] = "Kumoa %O" ;
     Text [ danish ] = "Opdel %O" ;
     Text [ french ] = "Scinder %O" ;
     Text [ swedish ] = "Upph�v %O" ;
@@ -4679,7 +4839,7 @@ String STR_EditRipUp
     Text [ spanish ] = "Separar %O" ;
     Text [ english_us ] = "Undo %O" ;
     Text[ chinese_simplified ] = "分开 %O";
-    Text[ russian ] = "����������� %O";
+    Text[ russian ] = "�������� %O";
     Text[ polish ] = "Rozdziel %O";
     Text[ japanese ] = "%Oを元に戻す";
     Text[ chinese_traditional ] = "分開 %O";
@@ -4687,10 +4847,11 @@ String STR_EditRipUp
     Text[ dutch ] = "%O opsplitsen";
     Text[ chinese_simplified ] = "分开 %O";
     Text[ greek ] = "�������� %O";
-    Text[ korean ] = "%O 분리";
+    Text[ korean ] = "%O 실행 취소";
     Text[ turkish ] = "B�l: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Separar %O";
+    Text[ catalan ] = "Separa %O";
+    Text[ thai ] = "เลิกทำ %O";
 };
 String STR_EditSetPointsSmooth
 {
@@ -4716,11 +4877,12 @@ String STR_EditSetPointsSmooth
     Text[ dutch ] = "B�zier-eigenschappen van %O wijzigen";
     Text[ chinese_simplified ] = "更改 %O 的曲线属性";
     Text[ greek ] = "����������� ��������� �������� ��� %O";
-    Text[ korean ] = "%O 베지에 속성 변경";
+    Text[ korean ] = "%O 베지에 등록 정보 변경";
     Text[ turkish ] = "B�zier �zelliklerini de�i�tir: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Modificar propiedades B�zier de %O";
-    Text[ finnish ] = "Muokkaa kohteen %O bezier-ominaisuuksia";
+    Text[ catalan ] = "Modifica les propietats B�zier de %O";
+    Text[ finnish ] = "Muuta kohteen %O bezier-ominaisuuksia";
+    Text[ thai ] = "ดัดแปลงคุณสมบัติ b้zier ของ %O";
 };
 String STR_EditSetSegmentsKind
 {
@@ -4746,11 +4908,12 @@ String STR_EditSetSegmentsKind
     Text[ dutch ] = "B�zier-eigenschappen van %O wijzigen";
     Text[ chinese_simplified ] = "更改 %O 的曲线属性";
     Text[ greek ] = "����������� ��������� �������� ��� %O";
-    Text[ korean ] = "%O 베지에 속성 변경";
+    Text[ korean ] = "%O 베지에 등록 정보 변경";
     Text[ turkish ] = "B�zier �zelliklerini de�i�tir: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Modificar propiedades B�zier de %O";
-    Text[ finnish ] = "Muokkaa kohteen %O bezier-ominaisuuksia";
+    Text[ catalan ] = "Modifica les propietats B�zier de %O";
+    Text[ finnish ] = "Muuta kohteen %O bezier-ominaisuuksia";
+    Text[ thai ] = "ดัดแปลงคุณสมบัติ b้zier ของ %O";
 };
 String STR_EditShut
 {
@@ -4781,7 +4944,8 @@ String STR_EditShut
     Text[ korean ] = "%O 닫기";
     Text[ turkish ] = "Kapat: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Cerrar %O";
+    Text[ catalan ] = "Tanca %O";
+    Text[ thai ] = "ปิด %O";
 };
 String STR_EditSetGlueEscDir
 {
@@ -4797,21 +4961,22 @@ String STR_EditSetGlueEscDir
     Text [ italian ] = "Imposta allineamento per %O" ;
     Text [ spanish ] = "Definir direcci�n de salida de %O" ;
     Text [ french ] = "D�finir la direction de sortie pour %O" ;
-    Text [ dutch ] = "Uittredingsrichting voor %0 defini�ren" ;
+    Text [ dutch ] = "Verdwijningsrichting voor %O defini�ren" ;
     Text[ chinese_simplified ] = "为 %O 设定退出方向";
-    Text[ russian ] = "���������� ��� %O ����������� ������";
+    Text[ russian ] = "���������� ����� ��� %O";
     Text[ polish ] = "Okre�l kierunek wyj�cia dla %O ";
     Text[ japanese ] = "%Oの出す方向を設定";
     Text[ chinese_traditional ] = "為 %O 設定退出方向";
     Text[ arabic ] = "����� ����� ������ �� %O";
     Text[ language_user1 ] = " ";
-    Text[ dutch ] = "Uittredingsrichting voor %0 defini�ren";
+    Text[ dutch ] = "Verdwijningsrichting voor %O defini�ren";
     Text[ chinese_simplified ] = "为 %O 设定退出方向";
     Text[ greek ] = "������� ����������� ������ ��� %O";
     Text[ korean ] = "%O의 끝내기 방향 설정";
     Text[ turkish ] = "%O i�in ��k�� y�n� belirle";
-    Text[ catalan ] = "Definir direcci�n de salida de %O";
+    Text[ catalan ] = "Defineix la direcci� de sortida de %O";
     Text[ finnish ] = "M��rit� kohteen %O poistumissuunta";
+    Text[ thai ] = "กำหนดทิศทางออกสำหรับ %O";
 };
 String STR_EditSetGluePercent
 {
@@ -4829,7 +4994,7 @@ String STR_EditSetGluePercent
     Text [ french ] = "D�finir l'attribut relatif pour %O" ;
     Text [ dutch ] = "Relatief attribuut voor %O defini�ren" ;
     Text[ chinese_simplified ] = "为 %O 设定相关属性";
-    Text[ russian ] = "���������� ��� %O ������������� �������";
+    Text[ russian ] = "���������� ������������� ������� ��� %O";
     Text[ polish ] = "Osad� atrybut wzgl�dny dla %O";
     Text[ japanese ] = "%Oの相対属性を設定";
     Text[ chinese_traditional ] = "為 %O 設定相關屬性";
@@ -4837,11 +5002,12 @@ String STR_EditSetGluePercent
     Text[ dutch ] = "Relatief attribuut voor %O defini�ren";
     Text[ chinese_simplified ] = "为 %O 设定相关属性";
     Text[ greek ] = "������� �������� ��������� ��� %O";
-    Text[ korean ] = "%O의 상대 속성 설정";
+    Text[ korean ] = "%O의 관계적 속성 설정";
     Text[ turkish ] = "%O i�in g�receli �znitelik belirle";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Definir atributo relativo para %O";
+    Text[ catalan ] = "Defineix l'atribut relatiu per %O";
     Text[ finnish ] = "M��rit� suhteellinen m��rite kohteeseen %O";
+    Text[ thai ] = "กำหนดคุณลักษณะสัมพัทธ์ที่ %O";
 };
 String STR_EditSetGlueAlign
 {
@@ -4859,7 +5025,7 @@ String STR_EditSetGlueAlign
     Text [ french ] = "D�finir un point de r�f�rence pour %O" ;
     Text [ dutch ] = "Verwijzingspunt voor %O defini�ren" ;
     Text[ chinese_simplified ] = "为 %O 设定引用点";
-    Text[ russian ] = "���������� ��� %O �������� �����";
+    Text[ russian ] = "���������� �������� ����� ��� %O";
     Text[ polish ] = "Okre�l punkt odniesienia dla %O ";
     Text[ japanese ] = "%Oに参照点を設定";
     Text[ chinese_traditional ] = "為 %O 設定參照點";
@@ -4870,8 +5036,9 @@ String STR_EditSetGlueAlign
     Text[ korean ] = "%O를 위한 참조 포인트 설정";
     Text[ turkish ] = "%O i�in referans noktas� belirle";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Definir puntos de referencia para %O";
+    Text[ catalan ] = "Defineix punts de refer�ncia per %O";
     Text[ finnish ] = "M��rit� kohteen %O viitepiste";
+    Text[ thai ] = "กำหนดจุดอ้างอิงสำหรับ %O";
 };
 String STR_EditGroup
 {
@@ -4897,10 +5064,11 @@ String STR_EditGroup
     Text[ dutch ] = "%O groeperen";
     Text[ chinese_simplified ] = "分组 %O";
     Text[ greek ] = "����������� %O";
-    Text[ korean ] = "%O 그룹화";
+    Text[ korean ] = "%O 그룹";
     Text[ turkish ] = "Grupla: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Agrupar %O";
+    Text[ catalan ] = "Agrupa %O";
+    Text[ thai ] = "จัดกลุ่ม %O";
 };
 String STR_EditUngroup
 {
@@ -4931,7 +5099,8 @@ String STR_EditUngroup
     Text[ korean ] = "%O 그룹 해제";
     Text[ turkish ] = "Grubu ��z: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Deshacer %O";
+    Text[ catalan ] = "Desf�s %O";
+    Text[ thai ] = "ไม่จัดกลุ่ม %O";
 };
 String STR_EditSetAttributes
 {
@@ -4960,7 +5129,8 @@ String STR_EditSetAttributes
     Text[ korean ] = "%O로 속성 적용";
     Text[ turkish ] = "�znitelikleri uygula: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Aplicar atributos a %O";
+    Text[ catalan ] = "Aplica atributs a %O";
+    Text[ thai ] = "ใช้คุณลักษณะเป็น %O";
 };
 String STR_EditSetStylesheet
 {
@@ -4975,10 +5145,10 @@ String STR_EditSetStylesheet
     Text [ french ] = "Appliquer la feuille de style � %O" ;
     Text [ swedish ] = "Anv�nd formatmall f�r %O" ;
     Text [ dutch ] = "Opmaakprofiel op %O toepassen" ;
-    Text [ spanish ] = "Aplicar estilo a %O" ;
+    Text [ spanish ] = "Aplicar estilos a %O" ;
     Text [ english_us ] = "Apply Styles to %O" ;
     Text[ chinese_simplified ] = "分配样式到 %O";
-    Text[ russian ] = "��������� � %O �����";
+    Text[ russian ] = "��������� ����� � %O";
     Text[ polish ] = "Zastosuj styl dla %O";
     Text[ japanese ] = "%Oにスタイルを適用";
     Text[ chinese_traditional ] = "分配樣式到 %O";
@@ -4986,10 +5156,11 @@ String STR_EditSetStylesheet
     Text[ dutch ] = "Opmaakprofiel op %O toepassen";
     Text[ chinese_simplified ] = "分配样式到 %O";
     Text[ greek ] = "�������� ���� �� %O";
-    Text[ korean ] = "%O에 템플릿 적용";
+    Text[ korean ] = "%O에 스타일을 적용";
     Text[ turkish ] = "Bi�imleri %O i�in kullan";
     Text[ language_user1 ] = "All \"Vorlagen\" /Styles are written with a capital S.10.5.00EM - -";
-    Text[ catalan ] = "Aplicar estilo a %O";
+    Text[ catalan ] = "Aplica estil a %O";
+    Text[ thai ] = "ใช้ลักษณะเป็น %O";
 };
 String STR_EditDelStylesheet
 {
@@ -5004,10 +5175,10 @@ String STR_EditDelStylesheet
     Text [ french ] = "Retirer la feuille de style de %O" ;
     Text [ swedish ] = "Ta bort formatmall f�r %O" ;
     Text [ dutch ] = "Opmaakprofiel van %O verwijderen" ;
-    Text [ spanish ] = "Eliminar estilo de %O" ;
+    Text [ spanish ] = "Borrar el estilo de %O" ;
     Text [ english_us ] = "Remove Style from %O" ;
     Text[ chinese_simplified ] = "从 %O 之中删除样式";
-    Text[ russian ] = "������� ����� %O";
+    Text[ russian ] = "������� ����� �� %O";
     Text[ polish ] = "Usu� styl z %O";
     Text[ japanese ] = "%Oのスタイルを削除";
     Text[ chinese_traditional ] = "從 %O 之中刪除樣式";
@@ -5015,10 +5186,11 @@ String STR_EditDelStylesheet
     Text[ dutch ] = "Opmaakprofiel van %O verwijderen";
     Text[ chinese_simplified ] = "从 %O 之中删除样式";
     Text[ greek ] = "�������� �������� ��� %O";
-    Text[ korean ] = "%O에서 템플릿 제거";
+    Text[ korean ] = "%O에서 스타일을 제거";
     Text[ turkish ] = "Bi�imini kald�r: %O";
     Text[ language_user1 ] = "All \"Vorlagen\" /Styles are written with a capital S.10.5.00EM - -";
-    Text[ catalan ] = "Eliminar estilo de %O";
+    Text[ catalan ] = "Suprimeix l'estil de %O";
+    Text[ thai ] = "เอาลักษณะออกจาก %O";
 };
 String STR_EditConvToPoly
 {
@@ -5036,7 +5208,7 @@ String STR_EditConvToPoly
     Text [ spanish ] = "Convertir %O en pol�gono" ;
     Text [ english_us ] = "Convert %O to polygon" ;
     Text[ chinese_simplified ] = "%O 转变成多边形";
-    Text[ russian ] = "���������� %O � �������������";
+    Text[ russian ] = "������������� %O � �������������";
     Text[ polish ] = "Konwertuj %O na wielok�t";
     Text[ japanese ] = "%Oを多角形に変換";
     Text[ chinese_traditional ] = "%O 轉變成多邊形";
@@ -5047,7 +5219,8 @@ String STR_EditConvToPoly
     Text[ korean ] = "%O을 다각형으로 변환";
     Text[ turkish ] = "�okgene d�n��t�r: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Convertir %O en pol�gono";
+    Text[ catalan ] = "Converteix %O en pol�gon";
+    Text[ thai ] = "แปลง %O เป็นรูปหลายเหลี่ยม";
 };
 String STR_EditConvToPolys
 {
@@ -5065,7 +5238,7 @@ String STR_EditConvToPolys
     Text [ spanish ] = "Convertir %O en pol�gonos" ;
     Text [ english_us ] = "Convert %O to polygons" ;
     Text[ chinese_simplified ] = "%O 转换成多边形";
-    Text[ russian ] = "���������� %O � �������������";
+    Text[ russian ] = "������������� %O � ��������������";
     Text[ polish ] = "Konwertuj %O na wielok�t";
     Text[ japanese ] = "%Oを多角形に変換";
     Text[ chinese_traditional ] = "%O 轉換成多邊形";
@@ -5076,7 +5249,8 @@ String STR_EditConvToPolys
     Text[ korean ] = "%O을 다각형으로 변환";
     Text[ turkish ] = "�okgenlere d�n��t�r: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Convertir %O en pol�gonos";
+    Text[ catalan ] = "Converteix %O en pol�gons";
+    Text[ thai ] = "แปลง %O เป็นรูปหลายเหลี่ยม";
 };
 String STR_EditConvToCurve
 {
@@ -5086,7 +5260,7 @@ String STR_EditConvToCurve
     Text [ italian ] = "Converti %O in curva" ;
     Text [ portuguese_brazilian ] = "Converter %O em curva" ;
     Text [ portuguese ] = "Converter %O em curva" ;
-    Text [ finnish ] = "Muunna %O kaareksi" ;
+    Text [ finnish ] = "Muunna %O k�yr�ksi" ;
     Text [ danish ] = "Konverter %O til kurve" ;
     Text [ french ] = "Convertir %O en courbe" ;
     Text [ swedish ] = "Omvandla %O till kurva" ;
@@ -5094,7 +5268,7 @@ String STR_EditConvToCurve
     Text [ spanish ] = "Convertir %O en curva" ;
     Text [ english_us ] = "Convert %O to curve" ;
     Text[ chinese_simplified ] = "%O 转变成曲线";
-    Text[ russian ] = "���������� %O � ������";
+    Text[ russian ] = "������������� %O � ������";
     Text[ polish ] = "Konwertuj %O na krzyw�";
     Text[ japanese ] = "%Oを曲線に変換";
     Text[ chinese_traditional ] = "%O 轉變成曲線";
@@ -5105,7 +5279,8 @@ String STR_EditConvToCurve
     Text[ korean ] = "%O을 곡선으로 변환";
     Text[ turkish ] = "E�riye d�n��t�r: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Convertir %O en curva";
+    Text[ catalan ] = "Converteix %O en corba";
+    Text[ thai ] = "แปลง %O เป็นเส้นโค้ง";
 };
 String STR_EditConvToCurves
 {
@@ -5115,7 +5290,7 @@ String STR_EditConvToCurves
     Text [ italian ] = "Converti %O in curve" ;
     Text [ portuguese_brazilian ] = "Converter %O em curvas" ;
     Text [ portuguese ] = "Converter %O em curvas" ;
-    Text [ finnish ] = "Muunna %O kaariksi" ;
+    Text [ finnish ] = "Muunna %O k�yriksi" ;
     Text [ danish ] = "Konverter %O til kurver" ;
     Text [ french ] = "Convertir %O en courbes" ;
     Text [ swedish ] = "Omvandla %O till kurvor" ;
@@ -5123,7 +5298,7 @@ String STR_EditConvToCurves
     Text [ spanish ] = "Convertir %O en curvas" ;
     Text [ english_us ] = "Convert %O to curves" ;
     Text[ chinese_simplified ] = "%O 转变成曲线";
-    Text[ russian ] = "���������� %O � ������";
+    Text[ russian ] = "������������� %O � ������";
     Text[ polish ] = "Konwertuj %O na krzywe";
     Text[ japanese ] = "%Oを曲線に変換";
     Text[ chinese_traditional ] = "%O 轉變成曲線";
@@ -5134,7 +5309,8 @@ String STR_EditConvToCurves
     Text[ korean ] = "%O을 곡선으로 변환";
     Text[ turkish ] = "E�rilere d�n��t�r: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Convertir %O en curvas";
+    Text[ catalan ] = "Converteix %O en corbes";
+    Text[ thai ] = "แปลง %O  เป็นเส้นโค้ง";
 };
 String STR_EditConvToContour
 {
@@ -5158,8 +5334,9 @@ String STR_EditConvToContour
     Text[ chinese_traditional ] = "%O 轉換成輪廓";
     Text[ arabic ] = "����� %O ��� �� �����";
     Text[ turkish ] = "Kontura d�n��t�r: %O";
-    Text[ catalan ] = "Convertir %O en contorno";
+    Text[ catalan ] = "Converteix %O en contorn";
     Text[ finnish ] = "Muunna %O ��riviivaksi";
+    Text[ thai ] = "แปลง %O เป็นเส้นแสดงรูปร่าง";
 };
 String STR_EditConvToContours
 {
@@ -5183,8 +5360,9 @@ String STR_EditConvToContours
     Text[ chinese_traditional ] = "%O 轉換成輪廓";
     Text[ arabic ] = "����� %O ��� ���� ������";
     Text[ turkish ] = "Konturlara d�n��t�r: %O";
-    Text[ catalan ] = "Convertir %O en contornos";
+    Text[ catalan ] = "Converteix %O en contorns";
     Text[ finnish ] = "Muunna %O ��riviivoiksi";
+    Text[ thai ] = "แปลง %O เป็นเส้นแสดงรูปร่าง";
 };
 String STR_EditAlign
 {
@@ -5213,7 +5391,8 @@ String STR_EditAlign
     Text[ korean ] = "%O 맞춤";
     Text[ turkish ] = "Hizala: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Alinear %O";
+    Text[ catalan ] = "Alinea %O";
+    Text[ thai ] = "จัดตำแหน่ง %O";
 };
 String STR_EditAlignVTop
 {
@@ -5244,7 +5423,8 @@ String STR_EditAlignVTop
     Text[ korean ] = "%O 위 맞춤";
     Text[ turkish ] = "Yukar� do�ru hizala: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Alinear %O arriba";
+    Text[ catalan ] = "Alinea %O amunt";
+    Text[ thai ] = "จัด %O ชิดด้านบน";
 };
 String STR_EditAlignVBottom
 {
@@ -5275,7 +5455,8 @@ String STR_EditAlignVBottom
     Text[ korean ] = "%O 아래 맞춤";
     Text[ turkish ] = "A�a�� do�ru hizala: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Alinear %O al pie";
+    Text[ catalan ] = "Alinea %O al peu";
+    Text[ thai ] = "จัด %O ชิดด้านล่าง";
 };
 String STR_EditAlignVCenter
 {
@@ -5287,7 +5468,7 @@ String STR_EditAlignVCenter
     Text [ portuguese ] = "Centrar %O na horizontal" ;
     Text [ finnish ] = "Keskit� %O vaakasuunnassa" ;
     Text [ danish ] = "Centrer %O vandret" ;
-    Text [ french ] = "Centrer %O horizontalement" ;
+    Text [ french ] = "Centrer %O � l'horizontale" ;
     Text [ swedish ] = "%O horisontellt centrerad" ;
     Text [ dutch ] = "%O horizontaal centreren" ;
     Text [ spanish ] = "Centrar %O horizontalmente" ;
@@ -5304,7 +5485,8 @@ String STR_EditAlignVCenter
     Text[ korean ] = "%O 수평으로  가운데 맞춤";
     Text[ turkish ] = "Yatay ortala: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Centrar %O horizontalmente";
+    Text[ catalan ] = "Centra %O horitzontalment";
+    Text[ thai ] = "ตรงกลางแนวนอน %O";
 };
 String STR_EditAlignHLeft
 {
@@ -5335,7 +5517,8 @@ String STR_EditAlignHLeft
     Text[ korean ] = "%O 왼쪽으로 맞춤";
     Text[ turkish ] = "Sola hizala: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Alinear %O a la izquierda";
+    Text[ catalan ] = "Alinea %O a l'esquerra";
+    Text[ thai ] = "จัด %O ชิดซ้าย";
 };
 String STR_EditAlignHRight
 {
@@ -5366,7 +5549,8 @@ String STR_EditAlignHRight
     Text[ korean ] = "%O 오른쪽으로 맞춤";
     Text[ turkish ] = "Sa�a hizala: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Alinear %O a la derecha";
+    Text[ catalan ] = "Alinea %O a la dreta";
+    Text[ thai ] = "จัด %O ชิดขวา";
 };
 String STR_EditAlignHCenter
 {
@@ -5378,7 +5562,7 @@ String STR_EditAlignHCenter
     Text [ portuguese ] = "Centrar %O na vertical" ;
     Text [ finnish ] = "Keskit� %O pystysuunnassa" ;
     Text [ danish ] = "Centrer %O lodret" ;
-    Text [ french ] = "Centrer %O verticalement" ;
+    Text [ french ] = "Centrer %O � la verticale" ;
     Text [ swedish ] = "%O vertikalt centrerad" ;
     Text [ dutch ] = "%O verticaal centreren" ;
     Text [ spanish ] = "Centrar %O verticalmente" ;
@@ -5395,7 +5579,8 @@ String STR_EditAlignHCenter
     Text[ korean ] = "%O 수직으로 가운데 맞춤";
     Text[ turkish ] = "Dikey ortala: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Centrar %O verticalmente";
+    Text[ catalan ] = "Centra %O verticalment";
+    Text[ thai ] = "ตรงกลางแนวตั้ง %O";
 };
 String STR_EditAlignCenter
 {
@@ -5424,7 +5609,8 @@ String STR_EditAlignCenter
     Text[ korean ] = "%O 가운데 맞춤";
     Text[ turkish ] = "Ortala: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Centrar %O";
+    Text[ catalan ] = "Centra %O";
+    Text[ thai ] = "ตรงกลาง %O";
 };
 String STR_EditTransform
 {
@@ -5442,7 +5628,7 @@ String STR_EditTransform
     Text [ spanish ] = "Transformar %O" ;
     Text [ english_us ] = "Transform %O" ;
     Text[ chinese_simplified ] = "转换 %O";
-    Text[ russian ] = "������������� %O";
+    Text[ russian ] = "���������������� %O";
     Text[ polish ] = "Przekszta�� %O";
     Text[ japanese ] = "%Oを変える";
     Text[ chinese_traditional ] = "轉換 %O";
@@ -5453,7 +5639,8 @@ String STR_EditTransform
     Text[ korean ] = "%O 변형";
     Text[ turkish ] = "D�n��t�r: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Transformar %O";
+    Text[ catalan ] = "Transforma %O";
+    Text[ thai ] = "เปลี่ยนรูป %O";
 };
 String STR_EditCombine_PolyPoly
 {
@@ -5467,21 +5654,22 @@ String STR_EditCombine_PolyPoly
     Text [ italian ] = "Combina %O" ;
     Text [ spanish ] = "Combinar %O" ;
     Text [ french ] = "Combiner %O" ;
-    Text [ dutch ] = "%O combineren" ;
+    Text [ dutch ] = "%O koppelen" ;
     Text[ chinese_simplified ] = "组合 %O";
     Text[ russian ] = "������������� %O";
     Text[ polish ] = "Kombinuj %O";
     Text[ japanese ] = "%Oを結合";
     Text[ chinese_traditional ] = "%O 合併";
     Text[ arabic ] = "����� %O";
-    Text[ dutch ] = "%O combineren";
+    Text[ dutch ] = "%O koppelen";
     Text[ chinese_simplified ] = "组合 %O";
     Text[ greek ] = "���������� %O";
     Text[ korean ] = "%O 조합";
     Text[ turkish ] = "Birle�tir: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Combinar %O";
+    Text[ catalan ] = "Combina %O";
     Text[ finnish ] = "Yhdist� %O";
+    Text[ thai ] = "เชื่อม %O";
 };
 String STR_EditMergeMergePoly
 {
@@ -5489,9 +5677,9 @@ String STR_EditMergeMergePoly
     Text [ ENGLISH ] = "Merge %O" ;
     Text[ english_us ] = "Merge %O";
     Text[ portuguese ] = "Unir %O";
-    Text[ russian ] = "������� %O";
+    Text[ russian ] = "����������� %O";
     Text[ greek ] = "���������� %O";
-    Text[ dutch ] = "Merge %O";
+    Text[ dutch ] = "%O samenvoegen ";
     Text[ french ] = "Fusionner %O";
     Text[ spanish ] = "Unir %O";
     Text[ italian ] = "Unisci %O";
@@ -5505,8 +5693,9 @@ String STR_EditMergeMergePoly
     Text[ chinese_traditional ] = "融合 %O";
     Text[ arabic ] = "��� %O";
     Text[ turkish ] = "Birle�tir: %O";
-    Text[ catalan ] = "Unir %O";
+    Text[ catalan ] = "Uneix %O";
     Text[ finnish ] = "Yhdist� %O";
+    Text[ thai ] = "ผสาน %O";
 };
 String STR_EditMergeSubstractPoly
 {
@@ -5516,7 +5705,7 @@ String STR_EditMergeSubstractPoly
     Text[ portuguese ] = "Subtrair %O";
     Text[ russian ] = "��������� %O";
     Text[ greek ] = "�������� %O";
-    Text[ dutch ] = "Subtract %O";
+    Text[ dutch ] = "%O aftrekken ";
     Text[ french ] = "Soustraire %O";
     Text[ spanish ] = "Substraer %O";
     Text[ italian ] = "Sottrai %O";
@@ -5530,8 +5719,9 @@ String STR_EditMergeSubstractPoly
     Text[ chinese_traditional ] = "減去 %O";
     Text[ arabic ] = "��� %O";
     Text[ turkish ] = "%O ��kart";
-    Text[ catalan ] = "Substraer %O";
+    Text[ catalan ] = "Substrau %O";
     Text[ finnish ] = "V�henn� %O";
+    Text[ thai ] = "ลบ %O";
 };
 String STR_EditMergeIntersectPoly
 {
@@ -5541,7 +5731,7 @@ String STR_EditMergeIntersectPoly
     Text[ portuguese ] = "Intersectar %O";
     Text[ russian ] = "����������� %O";
     Text[ greek ] = "���� %O";
-    Text[ dutch ] = "Intersect %O";
+    Text[ dutch ] = "%O knippen";
     Text[ french ] = "Intersecter %O";
     Text[ spanish ] = "Cortar %O";
     Text[ italian ] = "Interseca %O";
@@ -5555,8 +5745,9 @@ String STR_EditMergeIntersectPoly
     Text[ chinese_traditional ] = "除去 %O";
     Text[ arabic ] = "��� %O";
     Text[ turkish ] = "%O kes";
-    Text[ catalan ] = "Cortar %O";
+    Text[ catalan ] = "Talla %O";
     Text[ finnish ] = "Leikkaa %O";
+    Text[ thai ] = "ตัดกับ %O";
 };
 String STR_DistributeMarkedObjects
 {
@@ -5581,8 +5772,9 @@ String STR_DistributeMarkedObjects
     Text[ arabic ] = "����� �������� �������";
     Text[ turkish ] = "Se�ilen nesneleri da��t";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Distribuir objetos de la selecci�n";
+    Text[ catalan ] = "Distribueix els objectes seleccionats";
     Text[ finnish ] = "Jaa valitut objektit";
+    Text[ thai ] = "แจกแจงวัตถุที่เลือก";
 };
 String STR_EditCombine_OnePoly
 {
@@ -5594,23 +5786,24 @@ String STR_EditCombine_OnePoly
     Text [ swedish ] = "F�rbind %O" ;
     Text [ danish ] = "Forbind %O" ;
     Text [ italian ] = "Collega %O" ;
-    Text [ spanish ] = "Enlazar %O" ;
+    Text [ spanish ] = "Combinar %O" ;
     Text [ french ] = "Relier %O" ;
-    Text [ dutch ] = "%O combineren" ;
+    Text [ dutch ] = "%O koppelen" ;
     Text[ chinese_simplified ] = "%O 合并";
-    Text[ russian ] = "��������� %O";
+    Text[ russian ] = "���������� %O";
     Text[ polish ] = "Po��cz %O";
     Text[ japanese ] = "%Oを結合";
     Text[ chinese_traditional ] = "%O 合併";
     Text[ arabic ] = "��� %O";
-    Text[ dutch ] = "%O combineren";
+    Text[ dutch ] = "%O koppelen";
     Text[ chinese_simplified ] = "%O 合并";
     Text[ greek ] = "������� %O";
     Text[ korean ] = "%O 결합";
     Text[ turkish ] = "Ba�lant� olu�tur: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Enlazar %O";
+    Text[ catalan ] = "Enlla�a %O";
     Text[ finnish ] = "Yhdist� %O";
+    Text[ thai ] = "เชื่อม %O";
 };
 String STR_EditDismantle_Polys
 {
@@ -5624,21 +5817,22 @@ String STR_EditDismantle_Polys
     Text [ italian ] = "Elimina la combinazione di  %O" ;
     Text [ spanish ] = "Deshacer combinaci�n de %O" ;
     Text [ french ] = "Annuler la combinaison de %O" ;
-    Text [ dutch ] = "Combinatie van %0 opheffen" ;
+    Text [ dutch ] = "Combinatie van %O opheffen" ;
     Text[ chinese_simplified ] = "分开 %O 的组合";
-    Text[ russian ] = "����� ���������� %O";
+    Text[ russian ] = "������� %O";
     Text[ polish ] = "Usu� kombinacj� z %O";
     Text[ japanese ] = "%Oの結合を解除";
     Text[ chinese_traditional ] = "分開 %O 的組合";
     Text[ arabic ] = "����� ����� %O";
-    Text[ dutch ] = "Combinatie van %0 opheffen";
+    Text[ dutch ] = "Combinatie van %O opheffen";
     Text[ chinese_simplified ] = "分开 %O 的组合";
     Text[ greek ] = "��������� ���������� %O";
-    Text[ korean ] = "%O의 조합 해제";
+    Text[ korean ] = "%O 분할";
     Text[ turkish ] = "Kombinasyonu kald�r: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Deshacer combinaci�n de %O";
+    Text[ catalan ] = "Desf�s combinaci� de %O";
     Text[ finnish ] = "Jaa %O";
+    Text[ thai ] = "แยก %O";
 };
 String STR_EditDismantle_Lines
 {
@@ -5665,8 +5859,9 @@ String STR_EditDismantle_Lines
     Text[ korean ] = "%O 분할";
     Text[ turkish ] = "Ay�r: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "%O dividir";
+    Text[ catalan ] = "Divideix %O";
     Text[ finnish ] = "Jaa %O";
+    Text[ thai ] = "แยก %O";
 };
 String STR_EditImportMtf
 {
@@ -5693,8 +5888,9 @@ String STR_EditImportMtf
     Text[ korean ] = "%O 분할";
     Text[ turkish ] = "Ay�r: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Dividir %O";
+    Text[ catalan ] = "Divideix %O";
     Text[ finnish ] = "Jaa %O";
+    Text[ thai ] = "แยก %O";
 };
 String STR_EditImportSGV
 {
@@ -5723,7 +5919,7 @@ String STR_ExchangePaste
     Text [ french ] = "Ins�rer le(s) objet(s)" ;
     Text [ swedish ] = "Infoga objekt" ;
     Text [ dutch ] = "Object(en) plakken" ;
-    Text [ spanish ] = "Pegar objeto(s)" ;
+    Text [ spanish ] = "Insertar objeto(s)" ;
     Text [ english_us ] = "Insert object(s)" ;
     Text[ chinese_simplified ] = "插入对象";
     Text[ russian ] = "�������� ������(�)";
@@ -5737,7 +5933,8 @@ String STR_ExchangePaste
     Text[ korean ] = "개체 삽입";
     Text[ turkish ] = "Nesne ekle";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Pegar objeto(s)";
+    Text[ catalan ] = "Enganxa objecte(s)";
+    Text[ thai ] = "แทรกวัตถุ";
 };
 String STR_ExchangeClpCut
 {
@@ -5752,7 +5949,7 @@ String STR_ExchangeClpCut
     Text [ french ] = "Couper %O" ;
     Text [ swedish ] = "Klipp ut %O" ;
     Text [ dutch ] = "%O knippen" ;
-    Text [ spanish ] = "Recortar %O" ;
+    Text [ spanish ] = "Cortar %O" ;
     Text [ english_us ] = "Cut %O" ;
     Text[ chinese_simplified ] = "剪切 %O";
     Text[ russian ] = "�������� %O";
@@ -5766,7 +5963,8 @@ String STR_ExchangeClpCut
     Text[ korean ] = "%O 잘라내기";
     Text[ turkish ] = "Kes: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Recortar %O";
+    Text[ catalan ] = "Retalla %O";
+    Text[ thai ] = "ตัด %O";
 };
 String STR_ExchangeClpPaste
 {
@@ -5780,7 +5978,7 @@ String STR_ExchangeClpPaste
     Text [ portuguese ] = "Colar conte�do da �rea de transfer�ncia" ;
     Text [ finnish ] = "Liit� leikep�yt�" ;
     Text [ danish ] = "Inds�t udklipsholder" ;
-    Text [ french ] = "Coller le contenu du presse-papiers" ;
+    Text [ french ] = "Coller le presse-papiers" ;
     Text [ swedish ] = "Klistra in inneh�llet i urklippet" ;
     Text [ dutch ] = "Inhoud van het Klembord plakken" ;
     Text [ spanish ] = "Pegar contenido del portapapeles" ;
@@ -5797,7 +5995,8 @@ String STR_ExchangeClpPaste
     Text[ korean ] = "클립보드 붙여넣기";
     Text[ turkish ] = "Pano i�eri�ini yap��t�r";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Pegar contenido del portapapeles";
+    Text[ catalan ] = "Enganxa el porta-retalls";
+    Text[ thai ] = "วางคลิปบอร์ด";
 };
 String STR_ExchangeDD
 {
@@ -5818,15 +6017,16 @@ String STR_ExchangeDD
     Text[ russian ] = "���������� %O";
     Text[ polish ] = "Przeci�gnij i upu�� %O";
     Text[ japanese ] = "%O をドラッグ＆ドロップ";
-    Text[ chinese_traditional ] = "拖放 %O";
+    Text[ chinese_traditional ] = "拖曳 %O";
     Text[ arabic ] = "��� � ����� %O";
     Text[ dutch ] = "Slepen&neerzetten %O";
     Text[ chinese_simplified ] = "拖放 %O";
     Text[ greek ] = "���������� ��� A������ %O";
-    Text[ korean ] = "%O 끌어서 놓기";
+    Text[ korean ] = "%O 끌어 놓기";
     Text[ turkish ] = "S�r�kle ve b�rak: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Arrastrar y colocar %O";
+    Text[ catalan ] = "Arrossega i col.loca %O";
+    Text[ thai ] = "ลากและปล่อย %O";
 };
 String STR_ExchangeDDPaste
 {
@@ -5842,22 +6042,23 @@ String STR_ExchangeDDPaste
     Text [ danish ] = "Inds�t tr�k-og-slip" ;
     Text [ french ] = "Coller Glisser-D�poser" ;
     Text [ swedish ] = "Infoga dra-och-sl�pp" ;
-    Text [ dutch ] = "Plakken via slepen&neerzetten" ;
+    Text [ dutch ] = "Invoegen via Slepen & neerzetten" ;
     Text [ spanish ] = "Insertar arrastrar y colocar" ;
     Text [ english_us ] = "Insert Drag and Drop" ;
     Text[ chinese_simplified ] = "插入拖放内容";
     Text[ russian ] = "�������� ����� ��������������";
     Text[ polish ] = "Wstaw Przeci�gnij i upu��";
     Text[ japanese ] = "ドラッグ＆ドロップで挿入";
-    Text[ chinese_traditional ] = "插入拖放內容";
+    Text[ chinese_traditional ] = "插入拖曳內容";
     Text[ arabic ] = "����� ��� � �����";
-    Text[ dutch ] = "Plakken via slepen&neerzetten";
+    Text[ dutch ] = "Invoegen via Slepen & neerzetten";
     Text[ chinese_simplified ] = "插入拖放内容";
     Text[ greek ] = "�������� '���������� ��� A������'";
-    Text[ korean ] = "끌어서 놓기 삽입";
+    Text[ korean ] = "끌어 놓기 삽입";
     Text[ turkish ] = "S�r�kle ve b�rak i�leviyle ekle";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Insertar arrastrar y colocar";
+    Text[ catalan ] = "Insereix arrossega i col.loca";
+    Text[ thai ] = "แทรกลากและปล่อย";
 };
 String STR_DragInsertPoint
 {
@@ -5888,7 +6089,8 @@ String STR_DragInsertPoint
     Text[ korean ] = "점을 %O로(으로) 삽입";
     Text[ turkish ] = "Nokta ekle: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Insertar punto en %O";
+    Text[ catalan ] = "Insereix punt a %O";
+    Text[ thai ] = "แทรกจุดที่ %O";
 };
 String STR_DragInsertGluePoint
 {
@@ -5904,21 +6106,22 @@ String STR_DragInsertGluePoint
     Text [ italian ] = "Inserisci punto di incollaggio in %O" ;
     Text [ spanish ] = "A�adir punto de adhesi�n en %O" ;
     Text [ french ] = "Ins�rer un point de collage dans %O" ;
-    Text [ dutch ] = "Plakpunt in %0 invoegen" ;
+    Text [ dutch ] = "Plakpunt in %O invoegen" ;
     Text[ chinese_simplified ] = "在 %O 处插入粘结点";
     Text[ russian ] = "�������� ����� ���������� � %O";
     Text[ polish ] = "Wstaw punkt sklejania do %O";
     Text[ japanese ] = "%O に接着点を挿入";
     Text[ chinese_traditional ] = "在 %O 插入接點";
     Text[ arabic ] = "����� ���� ��� �� %O";
-    Text[ dutch ] = "Plakpunt in %0 invoegen";
+    Text[ dutch ] = "Plakpunt in %O invoegen";
     Text[ chinese_simplified ] = "在 %O 处插入粘结点";
     Text[ greek ] = "�������� ������� �������� �� %O";
     Text[ korean ] = "접착점을 %O로(으로) 삽입";
     Text[ turkish ] = "Yap��t�rma noktas� ekle: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "A�adir punto de adhesi�n en %O";
+    Text[ catalan ] = "Afegeix punt d'adhesi� a %O";
     Text[ finnish ] = "Lis�� liimapiste kohteeseen %O";
+    Text[ thai ] = "แทรกจุดเชื่อมที่ %O";
 };
 String STR_DragMethMovHdl
 {
@@ -5947,7 +6150,8 @@ String STR_DragMethMovHdl
     Text[ korean ] = "참조점 이동";
     Text[ turkish ] = "Referans noktas�n� ta��";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Desplazar punto de referencia";
+    Text[ catalan ] = "Despla�a punt de refer�ncia";
+    Text[ thai ] = "ย้ายจุดอ้างอิง";
 };
 String STR_DragMethObjOwn
 {
@@ -5978,7 +6182,8 @@ String STR_DragMethObjOwn
     Text[ korean ] = "%O 기하학적 조정";
     Text[ turkish ] = "Geometrik de�i�iklik yap: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Modificar geom�tricamente %O";
+    Text[ catalan ] = "Modifica geom�tricament %O";
+    Text[ thai ] = "เปลี่ยนเชิงเรขาคณิต %O";
 };
 String STR_DragMethMove
 {
@@ -6007,7 +6212,8 @@ String STR_DragMethMove
     Text[ korean ] = "%O 이동";
     Text[ turkish ] = "Ta��: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Desplazar %O";
+    Text[ catalan ] = "Despla�a %O";
+    Text[ thai ] = "ย้าย %O";
 };
 String STR_DragMethResize
 {
@@ -6038,7 +6244,8 @@ String STR_DragMethResize
     Text[ korean ] = "%O의 크기 조정";
     Text[ turkish ] = "Boyutunu de�i�tir: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Modificar el tama�o de %O";
+    Text[ catalan ] = "Modifica la mida de %O";
+    Text[ thai ] = "ปรับขนาด %O";
 };
 String STR_DragMethRotate
 {
@@ -6067,7 +6274,8 @@ String STR_DragMethRotate
     Text[ korean ] = "%O 회전";
     Text[ turkish ] = "D�nd�r: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Rodar %O";
+    Text[ catalan ] = "Roda %O";
+    Text[ thai ] = "หมุน %O";
 };
 String STR_DragMethMirrorHori
 {
@@ -6093,10 +6301,11 @@ String STR_DragMethMirrorHori
     Text[ dutch ] = "%O horizontaal spiegelen";
     Text[ chinese_simplified ] = "%O 水平翻转";
     Text[ greek ] = "���������� %O ����������";
-    Text[ korean ] = "%O을(를) 수평으로 대칭";
+    Text[ korean ] = "%O 수평으로 대칭";
     Text[ turkish ] = "Yatay yans�t: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Reflejar %O horizontalmente";
+    Text[ catalan ] = "Reflexa %O horitzontalment";
+    Text[ thai ] = "พลิก %O แนวนอน";
 };
 String STR_DragMethMirrorVert
 {
@@ -6122,10 +6331,11 @@ String STR_DragMethMirrorVert
     Text[ dutch ] = "%O verticaal spiegelen";
     Text[ chinese_simplified ] = "%O 垂直翻转";
     Text[ greek ] = "���������� %O ����������";
-    Text[ korean ] = "%O을(를) 수직으로 대칭";
+    Text[ korean ] = "%O 수직으로 대칭";
     Text[ turkish ] = "Dikey yans�t: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Reflejar %O verticalmente";
+    Text[ catalan ] = "Reflexa %O verticalment";
+    Text[ thai ] = "พลิก %O แนวตั้ง";
 };
 String STR_DragMethMirrorDiag
 {
@@ -6151,10 +6361,11 @@ String STR_DragMethMirrorDiag
     Text[ dutch ] = "%O diagonaal spiegelen";
     Text[ chinese_simplified ] = "%O 对角翻转";
     Text[ greek ] = "���������� %O ���������";
-    Text[ korean ] = "%O을(를) 대각선으로 대칭";
+    Text[ korean ] = "%O 대각선으로 대칭";
     Text[ turkish ] = "Diyagonal yans�t: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Reflejar %O diagonalmente";
+    Text[ catalan ] = "Reflexa %O diagonalment";
+    Text[ thai ] = "พลิก %O แนวทแยงมุม";
 };
 String STR_DragMethMirrorFree
 {
@@ -6183,7 +6394,8 @@ String STR_DragMethMirrorFree
     Text[ korean ] = "%O을(를) 임의로 대칭";
     Text[ turkish ] = "Serbest yans�t: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Reflejar libremente %O";
+    Text[ catalan ] = "Reflexa lliurement %O";
+    Text[ thai ] = "พลิก %O แนวอิสระ";
 };
 String STR_DragMethGradient
 {
@@ -6192,23 +6404,24 @@ String STR_DragMethGradient
     Text[ english_us ] = "Interactive gradient for %O";
     Text[ portuguese ] = "Grada��o interactiva para %O";
     Text[ greek ] = "��������� ���������� �������� ��� %O";
-    Text[ dutch ] = "Interactief kleurverloop voor %O";
+    Text[ dutch ] = "Interactieve kleurovergangen voor %O";
     Text[ french ] = "D�grad� interactif pour %O";
     Text[ spanish ] = "gradiente interactivo para %O";
     Text[ swedish ] = "Interaktiv f�rggradient f�r %O";
-    Text[ russian ] = "������������� ����������� ��� %O";
+    Text[ russian ] = "������������� �������� ��� %O";
     Text[ italian ] = "Sfumatura interattiva per %O";
     Text[ danish ] = "Interaktiv farvegraduering for %O";
     Text[ polish ] = "Interaktywny gradient dla %O";
     Text[ portuguese_brazilian ] = "Interactive gradient for %O";
     Text[ japanese ] = "%O の対話型操作グラデーション";
-    Text[ korean ] = "%O를 위한 대화식 그라데이션";
+    Text[ korean ] = "%O의 상호 작용식 그라디언트";
     Text[ chinese_simplified ] = "用于 %O 的交互式彩色图案";
     Text[ chinese_traditional ] = "%O 交動式彩色圖案";
     Text[ arabic ] = "���� ��� ������ �� %O";
     Text[ turkish ] = "%O i�in etkile�imli gradyan";
-    Text[ catalan ] = "gradiente interactivo para %O";
-    Text[ finnish ] = "Vuorovaikutteinen s�vytys kohteelle %O";
+    Text[ catalan ] = "Gradient interactiu per %O";
+    Text[ finnish ] = "Vuorovaikutteinen liukuv�rj�ys kohteelle %O";
+    Text[ thai ] = "ไล่ระดับสีโต้ตอบสำหรับ %O";
 };
 String STR_DragMethTransparence
 {
@@ -6227,13 +6440,14 @@ String STR_DragMethTransparence
     Text[ polish ] = "Interaktywna przezroczysto�� dla %O";
     Text[ portuguese_brazilian ] = "Interactive transparence for %O";
     Text[ japanese ] = "%O の対話型操作透過性";
-    Text[ korean ] = "%O를 위한 대화식 투명도";
+    Text[ korean ] = "%O의 상호 작용식 투명";
     Text[ chinese_simplified ] = "用于 %O 的交互式透明";
     Text[ chinese_traditional ] = "%O 的交動式透明";
     Text[ arabic ] = "������ ������� �� %O";
     Text[ turkish ] = "%O i�in etkile�imli saydaml�k";
-    Text[ catalan ] = "transparencia interactiva para %O";
+    Text[ catalan ] = "Transpar�ncia interactiva per %O";
     Text[ finnish ] = "Vuorovaikutteinen l�pin�kyvyys kohteelle %O";
+    Text[ thai ] = "โปร่งแสงโต้ตอบสำหรับ %O";
 };
 String STR_DragMethShear
 {
@@ -6264,7 +6478,8 @@ String STR_DragMethShear
     Text[ korean ] = "%O 일그러뜨림(기울기)";
     Text[ turkish ] = "�arp�t (e�): %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Distorsionar (inclinar) %O";
+    Text[ catalan ] = "Distorsiona (inclina) %O";
+    Text[ thai ] = "บิด %O (เอียง)";
 };
 String STR_DragMethCrook
 {
@@ -6276,8 +6491,8 @@ String STR_DragMethCrook
     Text [ swedish ] = "Placera %O i cirkel" ;
     Text [ danish ] = "Arranger %O i cirkel" ;
     Text [ italian ] = "Disponi %O in cerchio" ;
-    Text [ spanish ] = "Organizar %O en c�rculo" ;
-    Text [ french ] = "Disposer dans le cercle %O" ;
+    Text [ spanish ] = "Disponer %O en c�rculo" ;
+    Text [ french ] = "Positionner %O dans le cercle" ;
     Text [ dutch ] = "%O in cirkel schikken" ;
     Text[ chinese_simplified ] = "排序 %O 成圆形";
     Text[ russian ] = "����������� %O � �����";
@@ -6288,11 +6503,12 @@ String STR_DragMethCrook
     Text[ dutch ] = "%O in cirkel schikken";
     Text[ chinese_simplified ] = "排序 %O 成圆形";
     Text[ greek ] = "���������� �� ����� %O";
-    Text[ korean ] = "%O을(를) 원 안에서 정렬";
+    Text[ korean ] = "%O을(를) 원에서 배치";
     Text[ turkish ] = "Daire bi�iminde d�zenle: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Organizar %O en c�rculo";
+    Text[ catalan ] = "Organitza %O en cercle";
     Text[ finnish ] = "J�rjest� %O ympyr��n";
+    Text[ thai ] = "จัดระเบียบ %O ในวงกลม";
 };
 String STR_DragMethCrookContortion
 {
@@ -6308,21 +6524,22 @@ String STR_DragMethCrookContortion
     Text [ italian ] = "Piega %O a cerchio" ;
     Text [ spanish ] = "Doblar %O en c�rculo" ;
     Text [ french ] = "Courber %O en cercle" ;
-    Text [ dutch ] = "%O cirkelvormig buigen" ;
+    Text [ dutch ] = "%O in cirkel buigen" ;
     Text[ chinese_simplified ] = "%O 转变成圆形";
     Text[ russian ] = "������� %O � ���� �����";
     Text[ polish ] = "Przekszta�� %O w ko�o";
     Text[ japanese ] = "%Oを丸くカーブさせる";
     Text[ chinese_traditional ] = "%O 轉變成圓形";
     Text[ arabic ] = "��� %O ��� ��� �����";
-    Text[ dutch ] = "%O cirkelvormig buigen";
+    Text[ dutch ] = "%O in cirkel buigen";
     Text[ chinese_simplified ] = "%O 转变成圆形";
     Text[ greek ] = "������� %O �� �����";
-    Text[ korean ] = "%O을(를) 원형태로 구부림";
+    Text[ korean ] = "%O 원형으로 구부림";
     Text[ turkish ] = "Daire bi�iminde e�: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Doblar %O en c�rculo";
+    Text[ catalan ] = "Dobla %O en cercle";
     Text[ finnish ] = "Kaareuta %O ympyr�ksi";
+    Text[ thai ] = "เส้นโค้ง %O ในวงกลม";
 };
 String STR_DragMethDistort
 {
@@ -6336,21 +6553,22 @@ String STR_DragMethDistort
     Text [ italian ] = "Distorci %O liberamente" ;
     Text [ spanish ] = "Distorsi�n libre de %O" ;
     Text [ french ] = "D�former librement %O" ;
-    Text [ dutch ] = "%O vrij vertekenen" ;
+    Text [ dutch ] = "%O vrij vervormen" ;
     Text[ chinese_simplified ] = "%O 自由扭曲";
-    Text[ russian ] = "��������� ��������� %O";
+    Text[ russian ] = "�������� %O";
     Text[ polish ] = "%O zniekszta�� dowolnie";
     Text[ japanese ] = "%Oを自由に歪める";
     Text[ chinese_traditional ] = "%O 自由扭曲";
     Text[ arabic ] = "����� ��� %O (��)";
-    Text[ dutch ] = "%O vrij vertekenen";
+    Text[ dutch ] = "%O vrij vervormen";
     Text[ chinese_simplified ] = "%O 自由扭曲";
     Text[ greek ] = "�������� ����������� %O";
     Text[ korean ] = "%O을(를) 일그러뜨림";
     Text[ turkish ] = "Serbest �arp�t: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Distorsi�n libre de %O";
+    Text[ catalan ] = "Distorsi� lliure de %O";
     Text[ finnish ] = "V��rist� %O";
+    Text[ thai ] = "บิด %O";
 };
 String STR_DragRectEckRad
 {
@@ -6366,7 +6584,7 @@ String STR_DragRectEckRad
     Text [ danish ] = "Modificer hj�rneradius p� %O" ;
     Text [ french ] = "Modifier le rayon d'angle de %O" ;
     Text [ swedish ] = "�ndra h�rnradien fr�n %O" ;
-    Text [ dutch ] = "Hoekafronding van %O wijzigen" ;
+    Text [ dutch ] = "Hoekradius van %O wijzigen" ;
     Text [ spanish ] = "Modificar radio de �ngulo en %O" ;
     Text [ english_us ] = "Alter radius by %O" ;
     Text[ chinese_simplified ] = "更改 %O 角度";
@@ -6375,13 +6593,14 @@ String STR_DragRectEckRad
     Text[ japanese ] = "%Oの角の半径を変更";
     Text[ chinese_traditional ] = "變更 %O 角度";
     Text[ arabic ] = "����� ��� ��� ����� %O";
-    Text[ dutch ] = "Hoekafronding van %O wijzigen";
+    Text[ dutch ] = "Hoekradius van %O wijzigen";
     Text[ chinese_simplified ] = "更改 %O 角度";
     Text[ greek ] = "������ ������� ������ %O";
     Text[ korean ] = "%O의 모서리각도 변경";
     Text[ turkish ] = "K��e �ap�n� de�i�tir: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Modificar radio de �ngulo en %O";
+    Text[ catalan ] = "Modifica el radi d'angle a %O";
+    Text[ thai ] = "ทดแทนรัศมีด้วย %O";
 };
 String STR_DragPathObj
 {
@@ -6412,7 +6631,8 @@ String STR_DragPathObj
     Text[ korean ] = "%O 변경";
     Text[ turkish ] = "De�i�tir: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Modificar %O";
+    Text[ catalan ] = "Modifica %O";
+    Text[ thai ] = "เปลี่ยน %O";
 };
 String STR_DragRectResize
 {
@@ -6443,7 +6663,8 @@ String STR_DragRectResize
     Text[ korean ] = "%O의 크기 조정";
     Text[ turkish ] = "Boyutunu de�i�tir: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Cambiar el tama�o de %O";
+    Text[ catalan ] = "Cambia la mida de %O";
+    Text[ thai ] = "ปรับขนาด %O";
 };
 String STR_DragCaptFram
 {
@@ -6472,7 +6693,8 @@ String STR_DragCaptFram
     Text[ korean ] = "%O 이동";
     Text[ turkish ] = "Ta��: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Desplazar %O";
+    Text[ catalan ] = "Despla�a %O";
+    Text[ thai ] = "ย้าย %O";
 };
 String STR_DragCaptTail
 {
@@ -6486,7 +6708,7 @@ String STR_DragCaptTail
     Text [ danish ] = "Flyt slutpunkt p� %O" ;
     Text [ french ] = "D�placer point limite de %O" ;
     Text [ swedish ] = "Flytta slutpunkten f�r %O" ;
-    Text [ dutch ] = "Einpunt van %0 verplaatsen" ;
+    Text [ dutch ] = "Eindpunt van %O verplaatsen" ;
     Text [ spanish ] = "Desplazar punto final de %O" ;
     Text [ english_us ] = "Move end point of %O" ;
     Text[ chinese_simplified ] = "移动 %O 的终点";
@@ -6495,13 +6717,14 @@ String STR_DragCaptTail
     Text[ japanese ] = "%Oの終点を移動";
     Text[ chinese_traditional ] = "移動 %O 的終點";
     Text[ arabic ] = "����� ���� ������� ������ �� %O";
-    Text[ dutch ] = "Einpunt van %0 verplaatsen";
+    Text[ dutch ] = "Eindpunt van %O verplaatsen";
     Text[ chinese_simplified ] = "移动 %O 的终点";
     Text[ greek ] = "���������� ������� ������ ��� %O";
     Text[ korean ] = "%O의 끝점 이동";
     Text[ turkish ] = "Biti� noktas�n� ta��: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Desplazar punto final de %O";
+    Text[ catalan ] = "Despla�a el punt final de %O";
+    Text[ thai ] = "ย้ายจุดสิ้นสุดของ %O";
 };
 String STR_DragCircAngle
 {
@@ -6532,7 +6755,8 @@ String STR_DragCircAngle
     Text[ korean ] = "%O 각 이동";
     Text[ turkish ] = "A��s�n� de�i�tir: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Modificar �ngulo de %O";
+    Text[ catalan ] = "Modifica l'angle de %O";
+    Text[ thai ] = "ปรับมุมโดย %O";
 };
 String STR_DragEdgeTail
 {
@@ -6560,10 +6784,11 @@ String STR_DragEdgeTail
     Text[ dutch ] = "%O wijzigen";
     Text[ chinese_simplified ] = "更改 %O";
     Text[ greek ] = "������ %O";
-    Text[ korean ] = "%O 자동 맞춤";
+    Text[ korean ] = "%O 변경";
     Text[ turkish ] = "De�i�tir: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Modificar %O";
+    Text[ catalan ] = "Modifica %O";
+    Text[ thai ] = "เปลี่ยน %O";
 };
 String STR_ViewTextEdit
 {
@@ -6590,8 +6815,9 @@ String STR_ViewTextEdit
     Text[ korean ] = "텍스트 편집: 단락 %a, 행 %z, 열 %s";
     Text[ turkish ] = "Metin d�zenleme: Paragraf %a, Sat�r %z, S�tun %s";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Editar Texto: P�rrafo %a, L�nea %z, Columna %s";
+    Text[ catalan ] = "Edita Text: Par�graf %a, L�nia %z, Columna %s";
     Text[ finnish ] = "Tekstin muokkaus: Kappale %a, Rivi %z, Sarake %s";
+    Text[ thai ] = "แก้ไขข้อความ: ย่อหน้า %a, แถว %z, คอลัมน์ %s";
 };
 String STR_ViewMarked
 {
@@ -6609,7 +6835,7 @@ String STR_ViewMarked
     Text [ spanish ] = "%O marcado" ;
     Text [ english_us ] = "%O selected" ;
     Text[ chinese_simplified ] = "已经选取 %O";
-    Text[ russian ] = "%O �������";
+    Text[ russian ] = "%O";
     Text[ polish ] = "Zaznaczono %O";
     Text[ japanese ] = "%O が選択されています";
     Text[ chinese_traditional ] = "已經選擇 %O";
@@ -6620,7 +6846,8 @@ String STR_ViewMarked
     Text[ korean ] = "%O 선택 표시";
     Text[ language_user1 ] = " ";
     Text[ turkish ] = "%O se�ildi";
-    Text[ catalan ] = "%O marcado";
+    Text[ catalan ] = "%O marcat";
+    Text[ thai ] = "เลือก %O ";
 };
 String STR_ViewMarkedPoint
 {
@@ -6634,21 +6861,22 @@ String STR_ViewMarkedPoint
     Text [ italian ] = "Punto di %O" ;
     Text [ spanish ] = "Punto de %O" ;
     Text [ french ] = "Point de %O" ;
-    Text [ dutch ] = "Punt van %0" ;
+    Text [ dutch ] = "Punt van %O" ;
     Text[ chinese_simplified ] = "%O 的接点";
-    Text[ russian ] = "����� %O";
+    Text[ russian ] = "����� �� %O";
     Text[ polish ] = "Punkt z %O";
     Text[ japanese ] = "%Oの点";
     Text[ chinese_traditional ] = "%O 的接點";
     Text[ arabic ] = "���� �� %O";
-    Text[ dutch ] = "Punt van %0";
+    Text[ dutch ] = "Punt van %O";
     Text[ chinese_simplified ] = "%O 的接点";
     Text[ greek ] = "������ ��� %O";
     Text[ korean ] = "%O의 점";
     Text[ turkish ] = "Nokta: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Punto de %O";
+    Text[ catalan ] = "Punt de %O";
     Text[ finnish ] = "Piste kohteesta %O";
+    Text[ thai ] = "จุดจาก %O";
 };
 String STR_ViewMarkedPoints
 {
@@ -6662,21 +6890,22 @@ String STR_ViewMarkedPoints
     Text [ italian ] = "%N punkti di %O" ;
     Text [ spanish ] = "%N Puntos de %O" ;
     Text [ french ] = "%N points de %O" ;
-    Text [ dutch ] = "%N punten van %0" ;
+    Text [ dutch ] = "%N punten van %O" ;
     Text[ chinese_simplified ] = "%O 的 %N 接点";
-    Text[ russian ] = "%N �����(��) %O";
+    Text[ russian ] = "%N �����(��) �� %O";
     Text[ polish ] = "%N punkty z %O";
     Text[ japanese ] = "%Oの%N点";
     Text[ chinese_traditional ] = "%O 的 %N 接點";
     Text[ arabic ] = "%N ���� �� %O";
-    Text[ dutch ] = "%N punten van %0";
+    Text[ dutch ] = "%N punten van %O";
     Text[ chinese_simplified ] = "%O 的 %N 接点";
     Text[ greek ] = "%N ������ ��� %O";
     Text[ korean ] = "%O의 %N 점";
     Text[ turkish ] = "%N yap��t�rma noktas�: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "%N Puntos de %O";
+    Text[ catalan ] = "%N Punts de %O";
     Text[ finnish ] = "%N pistett� kohteesta %O";
+    Text[ thai ] = "%N จุดจาก %O";
 };
 String STR_ViewMarkedGluePoint
 {
@@ -6690,21 +6919,22 @@ String STR_ViewMarkedGluePoint
     Text [ italian ] = "Punto di incollaggio di  %O" ;
     Text [ spanish ] = "Punto de adhesi�n de %O" ;
     Text [ french ] = "Point de collage de %O" ;
-    Text [ dutch ] = "Plakpunt van %0" ;
+    Text [ dutch ] = "Plakpunt van %O" ;
     Text[ chinese_simplified ] = "%O 的粘结点";
     Text[ russian ] = "����� ���������� �� %O";
     Text[ polish ] = "Punkt sklejania z %O";
     Text[ japanese ] = "%Oの接着点";
     Text[ chinese_traditional ] = "%O 的接點";
     Text[ arabic ] = "���� ��� �� %O";
-    Text[ dutch ] = "Plakpunt van %0";
+    Text[ dutch ] = "Plakpunt van %O";
     Text[ chinese_simplified ] = "%O 的粘结点";
     Text[ greek ] = "������ �������� ��� %O";
     Text[ korean ] = "%O의 접착점";
     Text[ turkish ] = "Yap��t�rma noktas�: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Punto de adhesi�n de %O";
+    Text[ catalan ] = "Punt d'adhesi� de %O";
     Text[ finnish ] = "Liimapiste kohteesta %O";
+    Text[ thai ] = "จุดเชื่อมจาก %O";
 };
 String STR_ViewMarkedGluePoints
 {
@@ -6718,21 +6948,22 @@ String STR_ViewMarkedGluePoints
     Text [ italian ] = "%N punti di incollaggio di  %O" ;
     Text [ spanish ] = "%N Puntos de adhesi�n de %O" ;
     Text [ french ] = "%N points de collage de %O" ;
-    Text [ dutch ] = "%N plakpunten van %0" ;
+    Text [ dutch ] = "%N plakpunten van %O" ;
     Text[ chinese_simplified ] = "%O 的 %N 粘结点";
     Text[ russian ] = "%N ����� ���������� �� %O";
     Text[ polish ] = "%N punkty sklejania z %O";
     Text[ japanese ] = "%Oの%N接着点";
     Text[ chinese_traditional ] = "%O 的 %N 接點";
     Text[ arabic ] = "%N ���� ��� �� %O";
-    Text[ dutch ] = "%N plakpunten van %0";
+    Text[ dutch ] = "%N plakpunten van %O";
     Text[ chinese_simplified ] = "%O 的 %N 粘结点";
     Text[ greek ] = "%N ������ �������� ��� %O";
     Text[ korean ] = "%O의 %N 접착점";
     Text[ turkish ] = "%N yap��t�rma noktas�: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "%N Puntos de adhesi�n de %O";
+    Text[ catalan ] = "%N Punts d'adhesi� de %O";
     Text[ finnish ] = "%N liimapistett� kohteesta %O";
+    Text[ thai ] = "%N จุดเชื่อมจาก %O";
 };
 String STR_ViewMarkObjs
 {
@@ -6750,7 +6981,7 @@ String STR_ViewMarkObjs
     Text [ spanish ] = "Marcar objetos" ;
     Text [ english_us ] = "Mark objects" ;
     Text[ chinese_simplified ] = "标记对象";
-    Text[ russian ] = "���������� �������";
+    Text[ russian ] = "�������� �������";
     Text[ polish ] = "Zaznacz obiekty";
     Text[ japanese ] = "オブジェクトを選択します";
     Text[ chinese_traditional ] = "選取物件";
@@ -6761,7 +6992,8 @@ String STR_ViewMarkObjs
     Text[ korean ] = "개체 선택 표시";
     Text[ turkish ] = "Nesneleri se�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Marcar objetos";
+    Text[ catalan ] = "Marca els objectes";
+    Text[ thai ] = "ทำเครื่องหมายวัตถุ";
 };
 String STR_ViewMarkMoreObjs
 {
@@ -6775,7 +7007,7 @@ String STR_ViewMarkMoreObjs
     Text [ danish ] = "Marker flere objekter" ;
     Text [ french ] = "S�lectionner des objets suppl�mentaires" ;
     Text [ swedish ] = "Markera ytterligare objekt" ;
-    Text [ dutch ] = "Markeer verdere objecten" ;
+    Text [ dutch ] = "Markeer andere objecten" ;
     Text [ spanish ] = "Marcar objetos adicionales" ;
     Text [ english_us ] = "Mark additional objects" ;
     Text[ chinese_simplified ] = "选择其他的对象";
@@ -6784,13 +7016,14 @@ String STR_ViewMarkMoreObjs
     Text[ japanese ] = "ほかのオブジェクトも選択";
     Text[ chinese_traditional ] = "選取其他的物件";
     Text[ arabic ] = "����� ���� ����";
-    Text[ dutch ] = "Markeer verdere objecten";
+    Text[ dutch ] = "Markeer andere objecten";
     Text[ chinese_simplified ] = "选择其他的对象";
     Text[ greek ] = "������� �������� ������������";
     Text[ korean ] = "기타 개체 선택 표시";
     Text[ turkish ] = "Ek nesneler se�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Marcar objetos adicionales";
+    Text[ catalan ] = "Marca els objectes addicionals";
+    Text[ thai ] = "ทำเครื่องหมายวัตถุเพิ่มเติม";
 };
 String STR_ViewMarkPoints
 {
@@ -6800,25 +7033,26 @@ String STR_ViewMarkPoints
     Text [ portuguese_brazilian ] = "Markiere Punkte" ;
     Text [ swedish ] = "Markera punkter" ;
     Text [ danish ] = "Marker punkter" ;
-    Text [ italian ] = "Marca punti" ;
+    Text [ italian ] = "Contrassegna punti" ;
     Text [ spanish ] = "Marcar puntos" ;
     Text [ french ] = "S�lectionner des points" ;
-    Text [ dutch ] = "Parkeer punten" ;
+    Text [ dutch ] = "Markeer punten" ;
     Text [ portuguese ] = "Marcar pontos" ;
     Text[ chinese_simplified ] = "选择接点";
-    Text[ russian ] = "���������� �����";
+    Text[ russian ] = "�������� �����";
     Text[ polish ] = "Zaznacz punkty";
     Text[ japanese ] = "制御点を選択します";
     Text[ chinese_traditional ] = "選取接點";
     Text[ arabic ] = "����� ����";
-    Text[ dutch ] = "Parkeer punten";
+    Text[ dutch ] = "Markeer punten";
     Text[ chinese_simplified ] = "选择接点";
     Text[ greek ] = "������� �������";
     Text[ korean ] = "점 선택 표시";
     Text[ turkish ] = "Noktalar� se�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Marcar puntos";
+    Text[ catalan ] = "Marca els punts";
     Text[ finnish ] = "Merkitse kohdat";
+    Text[ thai ] = "ทำเครื่องหมายจุด";
 };
 String STR_ViewMarkMorePoints
 {
@@ -6828,25 +7062,26 @@ String STR_ViewMarkMorePoints
     Text [ portuguese_brazilian ] = "Markiere weitere Punkte" ;
     Text [ swedish ] = "Markerar ytterligare punkter" ;
     Text [ danish ] = "Marker flere punkter" ;
-    Text [ italian ] = "Marca ulteriori punti" ;
+    Text [ italian ] = "Seleziona punti aggiuntivi" ;
     Text [ spanish ] = "Marcar puntos adicionales" ;
     Text [ french ] = "S�lectionner des points suppl�mentaires" ;
-    Text [ dutch ] = "Markeer verdere punten" ;
+    Text [ dutch ] = "Markeer andere punten" ;
     Text [ portuguese ] = "Marcar pontos adicionais" ;
     Text[ chinese_simplified ] = "选择其他的接点";
-    Text[ russian ] = "���������� �������������� �����";
+    Text[ russian ] = "�������� �������������� �����";
     Text[ polish ] = "Zaznacz dodatkowe punkty";
     Text[ japanese ] = "ほかの制御点も選択";
     Text[ chinese_traditional ] = "選取其他的接點";
     Text[ arabic ] = "����� ���� ����";
-    Text[ dutch ] = "Markeer verdere punten";
+    Text[ dutch ] = "Markeer andere punten";
     Text[ chinese_simplified ] = "选择其他的接点";
     Text[ greek ] = "������� �������� �������";
     Text[ korean ] = "기타 점 선택 표시";
     Text[ turkish ] = "Ek noktalar se�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Marcar puntos adicionales";
+    Text[ catalan ] = "Marca els punts addicionals";
     Text[ finnish ] = "Merkitse lis�kohdat";
+    Text[ thai ] = "ทำเครื่องหมายจุดเพิ่มเติม";
 };
 String STR_ViewMarkGluePoints
 {
@@ -6857,7 +7092,7 @@ String STR_ViewMarkGluePoints
     Text [ portuguese_brazilian ] = "Markiere Klebepunkte" ;
     Text [ swedish ] = "Markera f�stpunkter" ;
     Text [ danish ] = "Marker kl�bepunkter" ;
-    Text [ italian ] = "Marca punti di incollaggio" ;
+    Text [ italian ] = "Contrassegna punti di incollaggio" ;
     Text [ spanish ] = "Marcar puntos de adhesi�n" ;
     Text [ french ] = "Marquer les points de collage" ;
     Text [ dutch ] = "Markeer plakpunten" ;
@@ -6873,8 +7108,9 @@ String STR_ViewMarkGluePoints
     Text[ korean ] = "접착점 선택 표시";
     Text[ turkish ] = "Yap��t�rma noktalar�n� se�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Marcar puntos de adhesi�n";
+    Text[ catalan ] = "Marca els punts de cola";
     Text[ finnish ] = "Merkitse kiinnityskohdat";
+    Text[ thai ] = "ทำเครื่องหมายจุดเชื่อม";
 };
 String STR_ViewMarkMoreGluePoints
 {
@@ -6884,10 +7120,10 @@ String STR_ViewMarkMoreGluePoints
     Text [ portuguese_brazilian ] = "Markiere weitere Klebepunkte" ;
     Text [ swedish ] = "Markera ytterligare f�stpunkter" ;
     Text [ danish ] = "Marker flere kl�bepunkter" ;
-    Text [ italian ] = "Marca ulteriori punti di incollaggio" ;
+    Text [ italian ] = "Contrassegna punti di incollaggio aggiuntivi" ;
     Text [ spanish ] = "Marcar puntos de adhesi�n adicionales" ;
     Text [ french ] = "S�lectionner des points de collage suppl�mentaires" ;
-    Text [ dutch ] = "Markeer verdere plakpunten" ;
+    Text [ dutch ] = "Markeer andere plakpunten" ;
     Text [ portuguese ] = "Marcar pontos de colagem adicionais" ;
     Text[ chinese_simplified ] = "标记其他的粘结点";
     Text[ russian ] = "�������� ��������� ����� ����������";
@@ -6895,14 +7131,15 @@ String STR_ViewMarkMoreGluePoints
     Text[ japanese ] = "ほかの接着点も選択";
     Text[ chinese_traditional ] = "選取其他的接點";
     Text[ arabic ] = "����� ���� ��� ����";
-    Text[ dutch ] = "Markeer verdere plakpunten";
+    Text[ dutch ] = "Markeer andere plakpunten";
     Text[ chinese_simplified ] = "标记其他的粘结点";
     Text[ greek ] = "������� �������� ������� ��������";
     Text[ korean ] = "기타 접착점 선택 표시";
     Text[ turkish ] = "Ek yap��t�rma noktalar� se�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Marcar puntos de adhesi�n adicionales";
+    Text[ catalan ] = "Marca els punts de cola addicionals";
     Text[ finnish ] = "Merkitse lis�kiinnityskohdat";
+    Text[ thai ] = "ทำเครื่องหมายจุดเชื่อมเพิ่มเติม";
 };
 String STR_ViewCreateObj
 {
@@ -6931,7 +7168,8 @@ String STR_ViewCreateObj
     Text[ korean ] = "%O 만들기";
     Text[ turkish ] = "Olu�tur: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Crear %O";
+    Text[ catalan ] = "Crea %O";
+    Text[ thai ] = "สร้าง %O";
 };
 String STR_UndoInsertObj
 {
@@ -6962,7 +7200,8 @@ String STR_UndoInsertObj
     Text[ korean ] = "%O 삽입";
     Text[ turkish ] = "Ekle: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Insertar %O";
+    Text[ catalan ] = "Insereix %O";
+    Text[ thai ] = "แทรก %O";
 };
 String STR_UndoCopyObj
 {
@@ -6991,7 +7230,8 @@ String STR_UndoCopyObj
     Text[ korean ] = "%O 복사";
     Text[ turkish ] = "Kopyala: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Copiar %O";
+    Text[ catalan ] = "Copia %O";
+    Text[ thai ] = "คัดลอก %O";
 };
 String STR_UndoObjOrdNum
 {
@@ -7022,7 +7262,8 @@ String STR_UndoObjOrdNum
     Text[ korean ] = "%O의 개체 순서 변경";
     Text[ turkish ] = "Nesne s�ras�n� de�i�tir: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Modificar el orden de %O";
+    Text[ catalan ] = "Modifica l'ordre de %O";
+    Text[ thai ] = "เปลี่ยนลำดับวัตถุของ %O";
 };
 String STR_UndoObjSetText
 {
@@ -7036,7 +7277,7 @@ String STR_UndoObjSetText
     Text [ danish ] = "Rediger tekst af %O" ;
     Text [ french ] = "�diter le texte de %O" ;
     Text [ swedish ] = "Redigera text f�r %0" ;
-    Text [ dutch ] = "Tekst van %0 editeren" ;
+    Text [ dutch ] = "Tekst van %O bewerken" ;
     Text [ spanish ] = "Editar texto de %O" ;
     Text [ english_us ] = "Edit text of %O" ;
     Text[ chinese_simplified ] = "编辑 %O 的文字";
@@ -7045,13 +7286,14 @@ String STR_UndoObjSetText
     Text[ japanese ] = "%Oのテキストを編集";
     Text[ chinese_traditional ] = "編輯 %O 的文字";
     Text[ arabic ] = "����� �� %O";
-    Text[ dutch ] = "Tekst van %0 editeren";
+    Text[ dutch ] = "Tekst van %O bewerken";
     Text[ chinese_simplified ] = "编辑 %O 的文字";
     Text[ greek ] = "����������� �������� ��� %O";
     Text[ korean ] = "%O의 텍스트 편집";
     Text[ turkish ] = "Metnini d�zenle: %O";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Editar texto de %O";
+    Text[ catalan ] = "Edita text de %O";
+    Text[ thai ] = "แก้ไขข้อความของ %O";
 };
 String STR_UndoNewPage
 {
@@ -7082,7 +7324,8 @@ String STR_UndoNewPage
     Text[ korean ] = "페이지 삽입";
     Text[ turkish ] = "Sayfa ekle";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Insertar p�gina";
+    Text[ catalan ] = "Insereix p�gina";
+    Text[ thai ] = "แทรกหน้า";
 };
 String STR_UndoDelPage
 {
@@ -7099,7 +7342,7 @@ String STR_UndoDelPage
     Text [ french ] = "Supprimer la page" ;
     Text [ swedish ] = "Radera sida" ;
     Text [ dutch ] = "Pagina wissen" ;
-    Text [ spanish ] = "Eliminar p�gina" ;
+    Text [ spanish ] = "Borrar p�gina" ;
     Text [ english_us ] = "Delete page" ;
     Text[ chinese_simplified ] = "删除页面";
     Text[ russian ] = "������� ��������";
@@ -7113,7 +7356,8 @@ String STR_UndoDelPage
     Text[ korean ] = "페이지 삭제";
     Text[ turkish ] = "Sayfay� sil";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Eliminar p�gina";
+    Text[ catalan ] = "Elimina p�gina";
+    Text[ thai ] = "ลบหน้า";
 };
 String STR_UndoCopPage
 {
@@ -7142,7 +7386,8 @@ String STR_UndoCopPage
     Text[ korean ] = "페이지 복사";
     Text[ turkish ] = "Sayfay� kopyala";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Copiar p�gina";
+    Text[ catalan ] = "Copia p�gina";
+    Text[ thai ] = "คัดลอกหน้า";
 };
 String STR_UndoMovPage
 {
@@ -7173,7 +7418,8 @@ String STR_UndoMovPage
     Text[ korean ] = "페이지 순서 변경";
     Text[ turkish ] = "Sayfa s�ras�n� de�i�tir";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Modificar el orden de las p�ginas";
+    Text[ catalan ] = "Modifica l'ordre de les p�gines";
+    Text[ thai ] = "เปลี่ยนลำดับของหน้า";
 };
 String STR_UndoNewPageMasterDscr
 {
@@ -7200,8 +7446,9 @@ String STR_UndoNewPageMasterDscr
     Text[ korean ] = "배경 페이지 지정";
     Text[ turkish ] = "Artalan sayfas� ata";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Asignar p�gina de fondo";
+    Text[ catalan ] = "Assigna p�gina de fons";
     Text[ finnish ] = "M��rit� taustasivu";
+    Text[ thai ] = "กำหนดพื้นหลังของหน้า";
 };
 String STR_UndoDelPageMasterDscr
 {
@@ -7213,23 +7460,24 @@ String STR_UndoDelPageMasterDscr
     Text [ swedish ] = "Ta bort tilldelning av bakgrundssidor" ;
     Text [ danish ] = "Fjern baggrundssidetildeling" ;
     Text [ italian ] = "Elimina correlazione pagina di sfondo" ;
-    Text [ spanish ] = "Eliminar atributos de la p�gina de fondo" ;
-    Text [ french ] = "Supprimer les attributs de la page en arri�re-plan" ;
-    Text [ dutch ] = "Toewijzing achtergrondpagina�s verwijderen" ;
+    Text [ spanish ] = "Borrar los atributos de la p�gina de fondo" ;
+    Text [ french ] = "Effacer l'assignation de la page d'arri�re-plan" ;
+    Text [ dutch ] = "Toewijzing achtergrondpagina's verwijderen" ;
     Text[ chinese_simplified ] = "删除背景页面配置";
     Text[ russian ] = "������� ���������� �������� ����";
     Text[ polish ] = "Usu� atrybuty t�a stron";
     Text[ japanese ] = "マスターページ割り当ての削除";
     Text[ chinese_traditional ] = "刪除背景頁面配置";
     Text[ arabic ] = "����� ����� ����� �������";
-    Text[ dutch ] = "Toewijzing achtergrondpagina�s verwijderen";
+    Text[ dutch ] = "Toewijzing achtergrondpagina's verwijderen";
     Text[ chinese_simplified ] = "删除背景页面配置";
     Text[ greek ] = "��������� ������������� ������� ������";
     Text[ korean ] = "배경 페이지 지정 제거";
     Text[ turkish ] = "Artalan sayfa atamas�n� kald�r";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Eliminar atributos de la p�gina de fondo";
+    Text[ catalan ] = "Suprimeix atributs de la p�gina de fons";
     Text[ finnish ] = "Tyhjenn� taustasivun m��ritykset";
+    Text[ thai ] = "ล้างการกำหนดพื้นหลังของหน้า";
 };
 String STR_UndoMovPageMasterDscr
 {
@@ -7243,21 +7491,22 @@ String STR_UndoMovPageMasterDscr
     Text [ italian ] = "Sposta correlazione pagina di sfondo" ;
     Text [ spanish ] = "Desplazar atributos de la p�gina de fondo" ;
     Text [ french ] = "D�placer les attributs de la page en arri�re-plan" ;
-    Text [ dutch ] = "Toewijzing achtergrondpagina�s verplaatsen" ;
+    Text [ dutch ] = "Toewijzing achtergrondpagina's verplaatsen" ;
     Text[ chinese_simplified ] = "移动背景页面分配";
     Text[ russian ] = "����������� ���������� �������� ����";
     Text[ polish ] = "Przesu� atrybuty t�a stron";
     Text[ japanese ] = "マスターページ割り当ての移動";
     Text[ chinese_traditional ] = "移動背景頁面配置";
     Text[ arabic ] = "����� ����� ���� �������";
-    Text[ dutch ] = "Toewijzing achtergrondpagina�s verplaatsen";
+    Text[ dutch ] = "Toewijzing achtergrondpagina's verplaatsen";
     Text[ chinese_simplified ] = "移动背景页面分配";
     Text[ greek ] = "���������� ������������� ������� ������";
     Text[ korean ] = "배경 페이지 지정 이동";
     Text[ turkish ] = "Artalan sayfa atamas�n� ta��";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Desplazar atributos de la p�gina de fondo";
+    Text[ catalan ] = "Despla�a atributs de la p�gina de fons";
     Text[ finnish ] = "Siirr� taustasivun m��rityksi�";
+    Text[ thai ] = "ย้ายการกำหนดพื้นหลังของหน้า";
 };
 String STR_UndoChgPageMasterDscr
 {
@@ -7273,21 +7522,22 @@ String STR_UndoChgPageMasterDscr
     Text [ italian ] = "Modifica correlazione pagina di sfondo" ;
     Text [ spanish ] = "Modificar atributos de la p�gina de fondo" ;
     Text [ french ] = "Modifier les attributs de la page en arri�re-plan" ;
-    Text [ dutch ] = "Toewijzing achtergrondpagina�s wijzigen" ;
+    Text [ dutch ] = "Toewijzing achtergrondpagina's wijzigen" ;
     Text[ chinese_simplified ] = "更改背景页面配置";
     Text[ russian ] = "�������� ���������� �������� ����";
     Text[ polish ] = "Zmie� atrybuty t�a stron";
     Text[ japanese ] = "マスターページ割り当ての変更";
     Text[ chinese_traditional ] = "變更背景頁面配置";
     Text[ arabic ] = "����� ����� ����� �������";
-    Text[ dutch ] = "Toewijzing achtergrondpagina�s wijzigen";
+    Text[ dutch ] = "Toewijzing achtergrondpagina's wijzigen";
     Text[ chinese_simplified ] = "更改背景页面配置";
     Text[ greek ] = "������ ������������� ������� ������";
     Text[ korean ] = "배경 페이지 지정 변경";
     Text[ turkish ] = "Artalan sayfa atamas�n� de�i�tir";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Modificar atributos de la p�gina de fondo";
+    Text[ catalan ] = "Modifica atributs de la p�gina de fons";
     Text[ finnish ] = "Muuta taustasivun m��rityksi�";
+    Text[ thai ] = "เปลี่ยนการกำหนดพื้นหลังของหน้า";
 };
 String STR_UndoMergeModel
 {
@@ -7316,8 +7566,9 @@ String STR_UndoMergeModel
     Text[ korean ] = "문서 삽입";
     Text[ turkish ] = "Belge ekle";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Insertar documento";
+    Text[ catalan ] = "Insereix el document";
     Text[ finnish ] = "Lis�� asiakirja";
+    Text[ thai ] = "แทรกเอกสาร";
 };
 String STR_UndoNewLayer
 {
@@ -7346,8 +7597,9 @@ String STR_UndoNewLayer
     Text[ korean ] = "계층 삽입";
     Text[ turkish ] = "D�zey ekle";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Insertar nivel";
+    Text[ catalan ] = "Insereix una capa";
     Text[ finnish ] = "Lis�� kerros";
+    Text[ thai ] = "แทรกระดับ";
 };
 String STR_UndoDelLayer
 {
@@ -7361,7 +7613,7 @@ String STR_UndoDelLayer
     Text [ swedish ] = "Radera niv�" ;
     Text [ danish ] = "Slet niveau" ;
     Text [ italian ] = "Elimina livello" ;
-    Text [ spanish ] = "Eliminar nivel" ;
+    Text [ spanish ] = "Borrar nivel" ;
     Text [ french ] = "Supprimer le niveau" ;
     Text [ dutch ] = "Niveau wissen" ;
     Text[ chinese_simplified ] = "删除级";
@@ -7376,8 +7628,9 @@ String STR_UndoDelLayer
     Text[ korean ] = "계층 삭제";
     Text[ turkish ] = "D�zey sil";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Eliminar nivel";
+    Text[ catalan ] = "Suprimeix la capa";
     Text[ finnish ] = "Poista kerros";
+    Text[ thai ] = "ลบระดับ";
 };
 String STR_UndoMovLayer
 {
@@ -7392,7 +7645,7 @@ String STR_UndoMovLayer
     Text [ danish ] = "Modificer niveaur�kkef�lge" ;
     Text [ italian ] = "Cambia la sequenza dei livelli" ;
     Text [ spanish ] = "Modificar el orden de los niveles" ;
-    Text [ french ] = "Changer l'ordre des niveaux" ;
+    Text [ french ] = "Changer l'ordre des couches" ;
     Text [ dutch ] = "Niveauvolgorde wijzigen" ;
     Text[ chinese_simplified ] = "更改分层顺序";
     Text[ russian ] = "�������� ������������������ �����";
@@ -7406,8 +7659,9 @@ String STR_UndoMovLayer
     Text[ korean ] = "계층 순서 변경";
     Text[ turkish ] = "D�zey s�ras�n� de�i�tir";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Modificar el orden de los niveles";
+    Text[ catalan ] = "Canvia l'ordre de les capes";
     Text[ finnish ] = "Muuta kerrosj�rjestyst�";
+    Text[ thai ] = "เปลี่ยนลำดับของระดับ";
 };
 String STR_StandardLayerName
 {
@@ -7436,7 +7690,8 @@ String STR_StandardLayerName
     Text[ korean ] = "표준";
     Text[ turkish ] = "Standart";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Predeterminado";
+    Text[ catalan ] = "Predeterminat";
+    Text[ thai ] = "มาตรฐาน";
 };
  ////////////////////////////////////////////////////////////////////////////////////////////////////
  ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -7466,8 +7721,9 @@ String STR_ItemValON
     Text[ korean ] = "적용";
     Text[ turkish ] = "A��k";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "activado";
-    Text[ finnish ] = "on";
+    Text[ catalan ] = "activat";
+    Text[ finnish ] = "k�yt�ss�";
+    Text[ thai ] = "เปิด";
 };
 String STR_ItemValOFF
 {
@@ -7494,8 +7750,9 @@ String STR_ItemValOFF
     Text[ korean ] = "해제";
     Text[ turkish ] = "Kapal�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "desactivado";
-    Text[ finnish ] = "off";
+    Text[ catalan ] = "desactivat";
+    Text[ finnish ] = "poissa k�yt�st�";
+    Text[ thai ] = "ปิด";
 };
 String STR_ItemValYES
 {
@@ -7524,6 +7781,7 @@ String STR_ItemValYES
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "s�";
     Text[ finnish ] = "kyll�";
+    Text[ thai ] = "ใช่";
 };
 String STR_ItemValNO
 {
@@ -7550,8 +7808,9 @@ String STR_ItemValNO
     Text[ korean ] = "아니오";
     Text[ turkish ] = "Hay�r";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "No";
+    Text[ catalan ] = "no";
     Text[ finnish ] = "Ei";
+    Text[ thai ] = "ไม่ใช่";
 };
  ////////////////////////////////////////////////////////////////////////////////////////////////////
 String STR_ItemValCAPTIONTYPE1
@@ -7579,8 +7838,9 @@ String STR_ItemValCAPTIONTYPE1
     Text[ korean ] = "유형 1";
     Text[ turkish ] = "Tip 1";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Tipo 1";
+    Text[ catalan ] = "Tipus 1";
     Text[ finnish ] = "Tyyppi 1";
+    Text[ thai ] = "ชนิด 1";
 };
 String STR_ItemValCAPTIONTYPE2
 {
@@ -7607,8 +7867,9 @@ String STR_ItemValCAPTIONTYPE2
     Text[ korean ] = "유형 2";
     Text[ turkish ] = "Tip 2";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Tipo 2";
+    Text[ catalan ] = "Tipus 2";
     Text[ finnish ] = "Tyyppi 2";
+    Text[ thai ] = "ชนิด 2";
 };
 String STR_ItemValCAPTIONTYPE3
 {
@@ -7635,8 +7896,9 @@ String STR_ItemValCAPTIONTYPE3
     Text[ korean ] = "유형 3";
     Text[ turkish ] = "Tip 3";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Tipo 3";
+    Text[ catalan ] = "Tipus 3";
     Text[ finnish ] = "Tyyppi 3";
+    Text[ thai ] = "ชนิด 3";
 };
 String STR_ItemValCAPTIONTYPE4
 {
@@ -7663,8 +7925,9 @@ String STR_ItemValCAPTIONTYPE4
     Text[ korean ] = "유형 4";
     Text[ turkish ] = "Tip 4";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Tipo 4";
+    Text[ catalan ] = "Tipus 4";
     Text[ finnish ] = "Tyyppi 4";
+    Text[ thai ] = "ชนิด 4";
 };
 String STR_ItemValCAPTIONESCHORI
 {
@@ -7693,6 +7956,7 @@ String STR_ItemValCAPTIONESCHORI
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Horitzontal";
     Text[ finnish ] = "Vaakataso";
+    Text[ thai ] = "แนวนอน";
 };
 String STR_ItemValCAPTIONESCVERT
 {
@@ -7721,6 +7985,7 @@ String STR_ItemValCAPTIONESCVERT
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Vertical";
     Text[ finnish ] = "Pystytaso";
+    Text[ thai ] = "แนวตั้ง";
 };
 String STR_ItemValCAPTIONESCBESTFIT
 {
@@ -7747,8 +8012,9 @@ String STR_ItemValCAPTIONESCBESTFIT
     Text[ korean ] = "자동";
     Text[ turkish ] = "Otomatik";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Autom�tico";
+    Text[ catalan ] = "Autom�tic";
     Text[ finnish ] = "Automaattinen";
+    Text[ thai ] = "อัตโนมัติ";
 };
  ///////////////////////////////////////////////////////////////////////////////////////////////////
 String STR_ItemValFITTOSIZENONE
@@ -7776,8 +8042,9 @@ String STR_ItemValFITTOSIZENONE
     Text[ korean ] = "해제";
     Text[ turkish ] = "Kapal�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Desactivado";
-    Text[ finnish ] = "Off";
+    Text[ catalan ] = "Desactivat";
+    Text[ finnish ] = "Poissa k�yt�st�";
+    Text[ thai ] = "ปิด";
 };
 String STR_ItemValFITTOSIZEPROP
 {
@@ -7806,6 +8073,7 @@ String STR_ItemValFITTOSIZEPROP
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Proporcional";
     Text[ finnish ] = "Suhteellinen";
+    Text[ thai ] = "สัดส่วน";
 };
 String STR_ItemValFITTOSIZEALLLINES
 {
@@ -7819,21 +8087,22 @@ String STR_ItemValFITTOSIZEALLLINES
     Text [ italian ] = "Tutte le righe separate" ;
     Text [ spanish ] = "Todas las filas separadas" ;
     Text [ french ] = "Toutes les lignes s�par�ment" ;
-    Text [ dutch ] = "Alle rijen separaat" ;
+    Text [ dutch ] = "Alle rijen afzonderlijk" ;
     Text[ chinese_simplified ] = "单独处理所有的行";
     Text[ russian ] = "��� ������ ��������";
     Text[ polish ] = "Wszystkie wiersze oddzielnie";
     Text[ japanese ] = "全行個別";
     Text[ chinese_traditional ] = "單獨處理所有的行";
     Text[ arabic ] = "�� ������ ������";
-    Text[ dutch ] = "Alle rijen separaat";
+    Text[ dutch ] = "Alle rijen afzonderlijk";
     Text[ chinese_simplified ] = "单独处理所有的行";
     Text[ greek ] = "���� ��� ������ ���������";
     Text[ korean ] = "모든 행을 분리";
     Text[ turkish ] = "T�m sat�rlar� tek tek s��d�r";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Todas las filas separadas";
+    Text[ catalan ] = "Ajusta a la mida (totes les files per separat)";
     Text[ finnish ] = "Sovita kokoon (kaikki rivit erikseen) ";
+    Text[ thai ] = "จัดพอดีกับขนาด (แถวทั้งหมดแยกกัน) ";
 };
 String STR_ItemValFITTOSIZERESIZEAT
 {
@@ -7860,8 +8129,9 @@ String STR_ItemValFITTOSIZERESIZEAT
     Text[ greek ] = "����� \"�������\" ���������";
     Text[ korean ] = "고정 속성 사용";
     Text[ turkish ] = "Sabit �znitelikler";
-    Text[ catalan ] = "Usar atributos fijos";
+    Text[ catalan ] = "Utilitza atributs durs";
     Text[ finnish ] = "K�yt� v�ltt�m�tt�mi� m��ritteit�";
+    Text[ thai ] = "ใช้คุณลักษณะยาก";
 };
  ///////////////////////////////////////////////////////////////////////////////////////////////////
 String STR_ItemValTEXTVADJTOP
@@ -7889,8 +8159,9 @@ String STR_ItemValTEXTVADJTOP
     Text[ korean ] = "위";
     Text[ turkish ] = "�st";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Arriba";
-    Text[ finnish ] = "Yl�osa";
+    Text[ catalan ] = "Superior";
+    Text[ finnish ] = "Yl�reuna";
+    Text[ thai ] = "บน";
 };
 String STR_ItemValTEXTVADJCENTER
 {
@@ -7903,10 +8174,10 @@ String STR_ItemValTEXTVADJCENTER
     Text [ danish ] = "Midte" ;
     Text [ italian ] = "Centro" ;
     Text [ spanish ] = "Centrado" ;
-    Text [ french ] = "Milieu" ;
+    Text [ french ] = "Centre" ;
     Text [ dutch ] = "Midden" ;
     Text[ chinese_simplified ] = "居中";
-    Text[ russian ] = "�� ��������";
+    Text[ russian ] = "����������";
     Text[ polish ] = "Po�rodku";
     Text[ japanese ] = "中央";
     Text[ chinese_traditional ] = "居中";
@@ -7917,8 +8188,9 @@ String STR_ItemValTEXTVADJCENTER
     Text[ korean ] = "가운데";
     Text[ turkish ] = "Orta";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Centro";
+    Text[ catalan ] = "Centre";
     Text[ finnish ] = "Keskell�";
+    Text[ thai ] = "ตรงกลาง";
 };
 String STR_ItemValTEXTVADJBOTTOM
 {
@@ -7945,8 +8217,9 @@ String STR_ItemValTEXTVADJBOTTOM
     Text[ korean ] = "아래";
     Text[ turkish ] = "Alt";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Abajo";
-    Text[ finnish ] = "Alaosa";
+    Text[ catalan ] = "Part inferior";
+    Text[ finnish ] = "Alareuna";
+    Text[ thai ] = "ล่าง";
 };
 String STR_ItemValTEXTVADJBLOCK
 {
@@ -7957,7 +8230,7 @@ String STR_ItemValTEXTVADJBLOCK
     Text [ portuguese ] = "Aproveitar altura total" ;
     Text [ english_us ] = "Use entire height" ;
     Text [ portuguese_brazilian ] = "Ausnutzung der gesamten H?e" ;
-    Text [ swedish ] = "Utnyttja hela bredden" ;
+    Text [ swedish ] = "Utnyttja hela h�jden" ;
     Text [ danish ] = "Udnyt hele h�jden" ;
     Text [ italian ] = "Utilizzo dell'intera altezza" ;
     Text [ spanish ] = "Utilizar toda la altura" ;
@@ -7975,8 +8248,9 @@ String STR_ItemValTEXTVADJBLOCK
     Text[ korean ] = "전체 높이 이용";
     Text[ turkish ] = "T�m y�ksekli�i kullan";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Utilizar toda la altura";
+    Text[ catalan ] = "Utilitza tota l'al�ada";
     Text[ finnish ] = "K�yt� koko korkeutta";
+    Text[ thai ] = "ใช้ทั้งความสูง";
 };
 String STR_ItemValTEXTVADJSTRETCH
 {
@@ -8003,8 +8277,9 @@ String STR_ItemValTEXTVADJSTRETCH
     Text[ korean ] = "앙쪽 늘임";
     Text[ turkish ] = "Geni�letilmi�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Extendido";
+    Text[ catalan ] = "Ampliat";
     Text[ finnish ] = "Venytetty";
+    Text[ thai ] = "ร่าง";
 };
 String STR_ItemValTEXTHADJLEFT
 {
@@ -8031,8 +8306,9 @@ String STR_ItemValTEXTHADJLEFT
     Text[ korean ] = "왼쪽";
     Text[ turkish ] = "Sol";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Izquierda";
+    Text[ catalan ] = "Esquerra";
     Text[ finnish ] = "Vasen";
+    Text[ thai ] = "ซ้าย";
 };
 String STR_ItemValTEXTHADJCENTER
 {
@@ -8045,10 +8321,10 @@ String STR_ItemValTEXTHADJCENTER
     Text [ danish ] = "Midte" ;
     Text [ italian ] = "Centro" ;
     Text [ spanish ] = "Centrado" ;
-    Text [ french ] = "Milieu" ;
+    Text [ french ] = "Centre" ;
     Text [ dutch ] = "Midden" ;
     Text[ chinese_simplified ] = "中";
-    Text[ russian ] = "�� ��������";
+    Text[ russian ] = "����������";
     Text[ polish ] = "Po�rodku";
     Text[ japanese ] = "中央";
     Text[ chinese_traditional ] = "置中";
@@ -8059,8 +8335,9 @@ String STR_ItemValTEXTHADJCENTER
     Text[ korean ] = "가운데";
     Text[ turkish ] = "Orta";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Centro";
+    Text[ catalan ] = "Centre";
     Text[ finnish ] = "Keskell�";
+    Text[ thai ] = "ตรงกลาง";
 };
 String STR_ItemValTEXTHADJRIGHT
 {
@@ -8087,8 +8364,9 @@ String STR_ItemValTEXTHADJRIGHT
     Text[ korean ] = "오른쪽";
     Text[ turkish ] = "Sa�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "A la derecha";
+    Text[ catalan ] = "Dreta";
     Text[ finnish ] = "Oikea";
+    Text[ thai ] = "ขวา";
 };
 String STR_ItemValTEXTHADJBLOCK
 {
@@ -8115,8 +8393,9 @@ String STR_ItemValTEXTHADJBLOCK
     Text[ korean ] = "전체 너비 이용";
     Text[ turkish ] = "T�m geni�li�i kullan";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Utilizar todo el ancho";
+    Text[ catalan ] = "Utilitza tota l'amplada";
     Text[ finnish ] = "K�yt� koko leveytt�";
+    Text[ thai ] = "ใช้ทั้งความกว้าง";
 };
 String STR_ItemValTEXTHADJSTRETCH
 {
@@ -8143,8 +8422,9 @@ String STR_ItemValTEXTHADJSTRETCH
     Text[ korean ] = "양쪽 늘임";
     Text[ turkish ] = "Geni�letilmi�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Extendido";
+    Text[ catalan ] = "Ampliat";
     Text[ finnish ] = "Venytetty";
+    Text[ thai ] = "ร่าง";
 };
  ///////////////////////////////////////////////////////////////////////////////////////////////////
 String STR_ItemValTEXTANI_NONE
@@ -8172,8 +8452,9 @@ String STR_ItemValTEXTANI_NONE
     Text[ korean ] = "해제";
     Text[ turkish ] = "Kapal�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "desactivado";
-    Text[ finnish ] = "off";
+    Text[ catalan ] = "desactivat";
+    Text[ finnish ] = "poissa k�yt�st�";
+    Text[ thai ] = "ปิด";
 };
 String STR_ItemValTEXTANI_BLINK
 {
@@ -8200,8 +8481,9 @@ String STR_ItemValTEXTANI_BLINK
     Text[ korean ] = "깜박임";
     Text[ turkish ] = "Yan�p s�nme";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "intermitente";
+    Text[ catalan ] = "flaix";
     Text[ finnish ] = "v�l�ys";
+    Text[ thai ] = "แฟลช";
 };
 String STR_ItemValTEXTANI_SCROLL
 {
@@ -8228,8 +8510,9 @@ String STR_ItemValTEXTANI_SCROLL
     Text[ korean ] = "전체 스크롤";
     Text[ turkish ] = "Kayd�r";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "continuo";
+    Text[ catalan ] = "continu";
     Text[ finnish ] = "Vierit� l�pi";
+    Text[ thai ] = "เลื่อนผ่าน";
 };
 String STR_ItemValTEXTANI_ALTERNATE
 {
@@ -8256,8 +8539,9 @@ String STR_ItemValTEXTANI_ALTERNATE
     Text[ korean ] = "대체 중";
     Text[ turkish ] = "De�iken";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "alternando";
+    Text[ catalan ] = "alternat";
     Text[ finnish ] = "vuorotteleva";
+    Text[ thai ] = "ทดแทน";
 };
 String STR_ItemValTEXTANI_SLIDE
 {
@@ -8284,8 +8568,9 @@ String STR_ItemValTEXTANI_SLIDE
     Text[ korean ] = "스크롤 인";
     Text[ turkish ] = "��eri s�r";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "solo entrar";
+    Text[ catalan ] = "nom�s entrar";
     Text[ finnish ] = "Vierit� sis��n";
+    Text[ thai ] = "เลื่อนใน";
 };
 String STR_ItemValTEXTANI_LEFT
 {
@@ -8312,8 +8597,9 @@ String STR_ItemValTEXTANI_LEFT
     Text[ greek ] = "���� �� ��������";
     Text[ korean ] = "왼쪽으로";
     Text[ turkish ] = "Sola";
-    Text[ catalan ] = "hacia la izquierda";
-    Text[ finnish ] = "vasen";
+    Text[ catalan ] = "esquerra";
+    Text[ finnish ] = "vasemmalle";
+    Text[ thai ] = "ซ้าย";
 };
 String STR_ItemValTEXTANI_UP
 {
@@ -8340,8 +8626,9 @@ String STR_ItemValTEXTANI_UP
     Text[ korean ] = "위로";
     Text[ language_user1 ] = " ";
     Text[ turkish ] = "Yukar�";
-    Text[ catalan ] = "hacia arriba";
+    Text[ catalan ] = "amunt";
     Text[ finnish ] = "yl�s";
+    Text[ thai ] = "ขึ้น";
 };
 String STR_ItemValTEXTANI_RIGHT
 {
@@ -8368,8 +8655,9 @@ String STR_ItemValTEXTANI_RIGHT
     Text[ korean ] = "오른쪽으로";
     Text[ turkish ] = "Sa�a";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "hacia la derecha";
-    Text[ finnish ] = "oikea";
+    Text[ catalan ] = "dreta";
+    Text[ finnish ] = "oikealle";
+    Text[ thai ] = "ขวา";
 };
 String STR_ItemValTEXTANI_DOWN
 {
@@ -8396,8 +8684,9 @@ String STR_ItemValTEXTANI_DOWN
     Text[ korean ] = "아래로";
     Text[ turkish ] = "A�a��";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "hacia abajo";
+    Text[ catalan ] = "avall";
     Text[ finnish ] = "alas";
+    Text[ thai ] = "ลง";
 };
  ///////////////////////////////////////////////////////////////////////////////////////////////////
 String STR_ItemValEDGE_ORTHOLINES
@@ -8425,8 +8714,9 @@ String STR_ItemValEDGE_ORTHOLINES
     Text[ korean ] = "표준 연결자";
     Text[ turkish ] = "Standart ba�lay�c�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Conector est�ndar";
-    Text[ finnish ] = "Vakioliitin";
+    Text[ catalan ] = "Connector est�ndard";
+    Text[ finnish ] = "Vakioyhdysviiva";
+    Text[ thai ] = "ตัวเชื่อมต่อมาตรฐาน";
 };
 String STR_ItemValEDGE_THREELINES
 {
@@ -8453,8 +8743,9 @@ String STR_ItemValEDGE_THREELINES
     Text[ korean ] = "선 연결자";
     Text[ turkish ] = "K��eli ba�lay�c�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Conector lineal";
-    Text[ finnish ] = "Viivaliitin";
+    Text[ catalan ] = "Connector lineal";
+    Text[ finnish ] = "Yhdysviiva";
+    Text[ thai ] = "ตัวเชื่อมต่อเส้น";
 };
 String STR_ItemValEDGE_ONELINE
 {
@@ -8468,21 +8759,22 @@ String STR_ItemValEDGE_ONELINE
     Text [ italian ] = "Connettore diretto" ;
     Text [ spanish ] = "Conector directo" ;
     Text [ french ] = "Connecteur direct" ;
-    Text [ dutch ] = "Direct-verbinding" ;
+    Text [ dutch ] = "Directverbinding" ;
     Text[ chinese_simplified ] = "直线连接符";
     Text[ russian ] = "������ �������������� �����";
     Text[ polish ] = "��cznik prosty";
     Text[ japanese ] = "直線コネクタ";
     Text[ chinese_traditional ] = "直線連接符";
     Text[ arabic ] = "���� �����";
-    Text[ dutch ] = "Direct-verbinding";
+    Text[ dutch ] = "Directverbinding";
     Text[ chinese_simplified ] = "直线连接符";
     Text[ greek ] = "��������� �������";
     Text[ korean ] = "직선 연결자";
     Text[ turkish ] = "D�z ba�lay�c�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Conector directo";
-    Text[ finnish ] = "Suora liitin";
+    Text[ catalan ] = "Connector directe";
+    Text[ finnish ] = "Suora yhdysviiva";
+    Text[ thai ] = "ตัวเชื่อมต่อแบบเส้นตรง";
 };
 String STR_ItemValEDGE_BEZIER
 {
@@ -8509,8 +8801,9 @@ String STR_ItemValEDGE_BEZIER
     Text[ korean ] = "곡선 연결자";
     Text[ turkish ] = "E�ri ba�lay�c�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Conector curvo";
-    Text[ finnish ] = "K�yr�liitin";
+    Text[ catalan ] = "Connector corbat";
+    Text[ finnish ] = "K�yr� yhdysviiva";
+    Text[ thai ] = "ตัวเชื่อมต่อแบบเส้นโค้ง";
 };
  ///////////////////////////////////////////////////////////////////////////////////////////////////
 String STR_ItemValMEASURE_STD
@@ -8538,8 +8831,9 @@ String STR_ItemValMEASURE_STD
     Text[ korean ] = "표준";
     Text[ turkish ] = "Standart";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Predeterminado";
+    Text[ catalan ] = "Predeterminat";
     Text[ finnish ] = "Vakio";
+    Text[ thai ] = "มาตรฐาน";
 };
 String STR_ItemValMEASURE_RADIUS
 {
@@ -8566,8 +8860,9 @@ String STR_ItemValMEASURE_RADIUS
     Text[ korean ] = "반지름";
     Text[ turkish ] = "�ap";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Radio";
+    Text[ catalan ] = "Radi";
     Text[ finnish ] = "S�de";
+    Text[ thai ] = "รัศมี";
 };
 String STR_ItemValMEASURE_TEXTHAUTO
 {
@@ -8580,7 +8875,7 @@ String STR_ItemValMEASURE_TEXTHAUTO
     Text [ danish ] = "automatisk" ;
     Text [ italian ] = "automatico" ;
     Text [ spanish ] = "autom�tico" ;
-    Text [ french ] = "automatiquement" ;
+    Text [ french ] = "automatique" ;
     Text [ dutch ] = "automatisch" ;
     Text[ chinese_simplified ] = "自动";
     Text[ russian ] = "�������������";
@@ -8594,8 +8889,9 @@ String STR_ItemValMEASURE_TEXTHAUTO
     Text[ korean ] = "자동";
     Text[ turkish ] = "otomatik";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "autom�tico";
+    Text[ catalan ] = "autom�tic";
     Text[ finnish ] = "automaattinen";
+    Text[ thai ] = "อัตโนมัติ";
 };
 String STR_ItemValMEASURE_TEXTLEFTOUTSIDE
 {
@@ -8624,8 +8920,9 @@ String STR_ItemValMEASURE_TEXTLEFTOUTSIDE
     Text[ korean ] = "왼쪽 바깥";
     Text[ turkish ] = "Sol d��ta";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "izquierda fuera";
+    Text[ catalan ] = "esquerra exterior";
     Text[ finnish ] = "vasemmalla ulkopuolella";
+    Text[ thai ] = "ด้านนอกซ้าย";
 };
 String STR_ItemValMEASURE_TEXTINSIDE
 {
@@ -8649,11 +8946,12 @@ String STR_ItemValMEASURE_TEXTINSIDE
     Text[ dutch ] = "binnen (midden)";
     Text[ chinese_simplified ] = "内部(居中)";
     Text[ greek ] = "��������� (������)";
-    Text[ korean ] = "안(가운데)";
+    Text[ korean ] = "내부(가운데)";
     Text[ turkish ] = "�� (orta)";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "interior centro";
+    Text[ catalan ] = "interior (centrat)";
     Text[ finnish ] = "sis�ll� (keskitetty)";
+    Text[ thai ] = "ด้านใน (ตรงกลาง)";
 };
 String STR_ItemValMEASURE_TEXTRIGHTOUTSID
 {
@@ -8682,8 +8980,9 @@ String STR_ItemValMEASURE_TEXTRIGHTOUTSID
     Text[ korean ] = "오른쪽 바깥";
     Text[ turkish ] = "Sa� d��ta";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "derecha fuera";
+    Text[ catalan ] = "dreta exterior";
     Text[ finnish ] = "oikealla ulkopuolella";
+    Text[ thai ] = "ด้านนอกขวา";
 };
 String STR_ItemValMEASURE_TEXTVAUTO
 {
@@ -8696,7 +8995,7 @@ String STR_ItemValMEASURE_TEXTVAUTO
     Text [ danish ] = "automatisk" ;
     Text [ italian ] = "automatico" ;
     Text [ spanish ] = "autom�tico" ;
-    Text [ french ] = "automatiquement" ;
+    Text [ french ] = "automatique" ;
     Text [ dutch ] = "automatisch" ;
     Text[ chinese_simplified ] = "自动";
     Text[ russian ] = "�������������";
@@ -8710,8 +9009,9 @@ String STR_ItemValMEASURE_TEXTVAUTO
     Text[ korean ] = "자동";
     Text[ turkish ] = "Otomatik";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "autom�tico";
+    Text[ catalan ] = "autom�tic";
     Text[ finnish ] = "automaattinen";
+    Text[ thai ] = "อัตโนมัติ";
 };
 String STR_ItemValMEASURE_ABOVE
 {
@@ -8738,8 +9038,9 @@ String STR_ItemValMEASURE_ABOVE
     Text[ korean ] = "선 위";
     Text[ turkish ] = "�izgi �zerinde";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "en la l�nea";
+    Text[ catalan ] = "en la l�nia";
     Text[ finnish ] = "rivill�";
+    Text[ thai ] = "บนเส้น";
 };
 String STR_ItemValMEASURETEXT_BREAKEDLINE
 {
@@ -8755,7 +9056,7 @@ String STR_ItemValMEASURETEXT_BREAKEDLINE
     Text [ french ] = "Ligne interrompue" ;
     Text [ dutch ] = "onderbroken lijn" ;
     Text[ chinese_simplified ] = "折断的线条";
-    Text[ russian ] = "���������� �����";
+    Text[ russian ] = "���������� �����";
     Text[ polish ] = "Linia przerwana";
     Text[ japanese ] = "中断された線";
     Text[ chinese_traditional ] = "折斷的線條";
@@ -8766,8 +9067,9 @@ String STR_ItemValMEASURETEXT_BREAKEDLINE
     Text[ korean ] = "중단된 선";
     Text[ turkish ] = "Kesik �izgi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "l�nea interrumpida";
+    Text[ catalan ] = "l�nia interrompuda";
     Text[ finnish ] = "vajaa rivi";
+    Text[ thai ] = "เส้นขาด";
 };
 String STR_ItemValMEASURE_BELOW
 {
@@ -8794,8 +9096,9 @@ String STR_ItemValMEASURE_BELOW
     Text[ korean ] = "선 아래";
     Text[ turkish ] = "�izginin alt�nda";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "bajo la l�nea";
+    Text[ catalan ] = "sota la l�nia";
     Text[ finnish ] = "rivin alapuolella";
+    Text[ thai ] = "ใต้เส้น";
 };
 String STR_ItemValMEASURETEXT_VERTICALCEN
 {
@@ -8811,7 +9114,7 @@ String STR_ItemValMEASURETEXT_VERTICALCEN
     Text [ dutch ] = "op de lijn gecentreerd" ;
     Text [ portuguese ] = "Centrado em rel. � linha" ;
     Text[ chinese_simplified ] = "居中";
-    Text[ russian ] = "������������ �� �����";
+    Text[ russian ] = "��������������";
     Text[ polish ] = "wy�rodkowany do linii";
     Text[ japanese ] = "線に中央揃え";
     Text[ chinese_traditional ] = "置中";
@@ -8822,8 +9125,9 @@ String STR_ItemValMEASURETEXT_VERTICALCEN
     Text[ korean ] = "가운데";
     Text[ turkish ] = "Ortala";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "centrado seg�n l�nea";
+    Text[ catalan ] = "centrat";
     Text[ finnish ] = "keskitetty";
+    Text[ thai ] = "ตรงกลาง";
 };
  ///////////////////////////////////////////////////////////////////////////////////////////////////
 String STR_ItemValCIRC_FULL
@@ -8840,7 +9144,7 @@ String STR_ItemValCIRC_FULL
     Text [ french ] = "Cercle entier" ;
     Text [ dutch ] = "Volle cirkel" ;
     Text[ chinese_simplified ] = "整圆";
-    Text[ russian ] = "����";
+    Text[ russian ] = "����";
     Text[ polish ] = "Zape�nione ko�o";
     Text[ japanese ] = "円";
     Text[ chinese_traditional ] = "整圓";
@@ -8851,8 +9155,9 @@ String STR_ItemValCIRC_FULL
     Text[ korean ] = "완전 원";
     Text[ turkish ] = "Tam daire";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "C�rculo completo";
+    Text[ catalan ] = "cercle complet";
     Text[ finnish ] = "t�ysi ympyr�";
+    Text[ thai ] = "วงกลมเต็มวง";
 };
 String STR_ItemValCIRC_SECT
 {
@@ -8879,8 +9184,9 @@ String STR_ItemValCIRC_SECT
     Text[ korean ] = "원 부채꼴";
     Text[ turkish ] = "Daire dilimi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Sector de c�rculo";
+    Text[ catalan ] = "Diagrama de sectors circular";
     Text[ finnish ] = "Ympyr�kaavio";
+    Text[ thai ] = "วงกลมพาย";
 };
 String STR_ItemValCIRC_CUT
 {
@@ -8907,8 +9213,9 @@ String STR_ItemValCIRC_CUT
     Text[ korean ] = "원 세그먼트";
     Text[ turkish ] = "Daire par�as�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Segmento de c�rculo";
+    Text[ catalan ] = "Segment del cercle";
     Text[ finnish ] = "Ympyr�n segmentti";
+    Text[ thai ] = "ส่วนของวงกลม";
 };
 String STR_ItemValCIRC_ARC
 {
@@ -8920,7 +9227,7 @@ String STR_ItemValCIRC_ARC
     Text [ swedish ] = "Cirkelb�ge" ;
     Text [ danish ] = "Cirkelbue" ;
     Text [ italian ] = "Arco di cerchio" ;
-    Text [ spanish ] = "Arco de c�rculo" ;
+    Text [ spanish ] = "Arco" ;
     Text [ french ] = "Arc de cercle" ;
     Text [ dutch ] = "Cirkelboog" ;
     Text[ chinese_simplified ] = "圆弧";
@@ -8935,8 +9242,9 @@ String STR_ItemValCIRC_ARC
     Text[ korean ] = "원호";
     Text[ turkish ] = "Yay";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Arco de c�rculo";
+    Text[ catalan ] = "Arc";
     Text[ finnish ] = "Kaari";
+    Text[ thai ] = "ส่วนโค้งของวงกลม";
 };
  ///////////////////////////////////////////////////////////////////////////////////////////////////
  ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -8962,11 +9270,12 @@ String STR_ItemNam_SHADOW
     Text[ dutch ] = "Schaduw";
     Text[ chinese_simplified ] = "阴影";
     Text[ greek ] = "����";
-    Text[ korean ] = "음영";
+    Text[ korean ] = "그림자";
     Text[ turkish ] = "G�lge";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Sombra";
-    Text[ finnish ] = "Varjo ";
+    Text[ catalan ] = "Ombra";
+    Text[ finnish ] = "Varjo";
+    Text[ thai ] = "แรเงา";
 };
 String STR_ItemNam_SHADOWCOLOR
 {
@@ -8990,11 +9299,12 @@ String STR_ItemNam_SHADOWCOLOR
     Text[ dutch ] = "Schaduwkleur";
     Text[ chinese_simplified ] = "阴影颜色";
     Text[ greek ] = "����� �����";
-    Text[ korean ] = "음영 색상";
+    Text[ korean ] = "그림자 색상";
     Text[ turkish ] = "G�lge rengi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Color de sombra";
+    Text[ catalan ] = "Color de l'ombra";
     Text[ finnish ] = "Varjon v�ri";
+    Text[ thai ] = "สีแรเงา";
 };
 String STR_ItemNam_SHADOWXDIST
 {
@@ -9018,11 +9328,12 @@ String STR_ItemNam_SHADOWXDIST
     Text[ dutch ] = "Horizontale schaduwopvulling";
     Text[ chinese_simplified ] = "水平方向阴影";
     Text[ greek ] = "��������� ���������� �����";
-    Text[ korean ] = "수평적 음영 윤곽";
+    Text[ korean ] = "수평으로 그림자 이동";
     Text[ turkish ] = "Yatay g�lge konumu";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Desplazamiento hor. de sombra";
+    Text[ catalan ] = "Contorn d'ombra horitzontal";
     Text[ finnish ] = "Vaakatason varjokorostus";
+    Text[ thai ] = "แรเงาเค้าร่างแนวนอน";
 };
 String STR_ItemNam_SHADOWYDIST
 {
@@ -9046,11 +9357,12 @@ String STR_ItemNam_SHADOWYDIST
     Text[ dutch ] = "Verticale schaduwopvulling";
     Text[ chinese_simplified ] = "垂直方向阴影";
     Text[ greek ] = "���������� ���������� �����";
-    Text[ korean ] = "수직적 음영 윤곽";
+    Text[ korean ] = "수직으로 그림자 이동";
     Text[ turkish ] = "Dikey g�lge kaymas�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Desplazamiento vert. de sombra";
+    Text[ catalan ] = "Contorn de l'ombra vertical";
     Text[ finnish ] = "Pystytason varjokorostus";
+    Text[ thai ] = "แรเงาเค้าร่างแนวตั้ง";
 };
 String STR_ItemNam_SHADOWTRANSPARENCE
 {
@@ -9074,11 +9386,12 @@ String STR_ItemNam_SHADOWTRANSPARENCE
     Text[ dutch ] = "Schaduw transparant";
     Text[ chinese_simplified ] = "阴影透明";
     Text[ greek ] = "��������� �����";
-    Text[ korean ] = "투명 음영";
+    Text[ korean ] = "투명 그림자";
     Text[ turkish ] = "G�lge saydaml���";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Transparencia de sombra";
+    Text[ catalan ] = "Transpar�ncia de l'ombra";
     Text[ finnish ] = "Varjon l�pin�kyvyys";
+    Text[ thai ] = "แรเงาโปร่งแสง";
 };
 String STR_ItemNam_SHADOW3D
 {
@@ -9094,7 +9407,7 @@ String STR_ItemNam_SHADOW3D
     Text [ french ] = "Ombre 3D" ;
     Text [ dutch ] = "3D-schaduw" ;
     Text[ chinese_simplified ] = "3 维阴影";
-    Text[ russian ] = "���� 3-�";
+    Text[ russian ] = "���������� ����";
     Text[ polish ] = "Cie� 3-W";
     Text[ japanese ] = "3D 体の影";
     Text[ chinese_traditional ] = "3D 陰影";
@@ -9102,11 +9415,12 @@ String STR_ItemNam_SHADOW3D
     Text[ dutch ] = "3D-schaduw";
     Text[ chinese_simplified ] = "3 维阴影";
     Text[ greek ] = "���� 3�";
-    Text[ korean ] = "3D 음영";
+    Text[ korean ] = "3D 그림자";
     Text[ turkish ] = "3B g�lge";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Sombra 3D";
+    Text[ catalan ] = "ombra 3D";
     Text[ finnish ] = "3D-varjo";
+    Text[ thai ] = "แรเงา3มิติ";
 };
 String STR_ItemNam_SHADOWPERSP
 {
@@ -9130,11 +9444,12 @@ String STR_ItemNam_SHADOWPERSP
     Text[ dutch ] = "Perspectivische schaduw";
     Text[ chinese_simplified ] = "透视阴影";
     Text[ greek ] = "��������� ����";
-    Text[ korean ] = "원근감있는 음영";
+    Text[ korean ] = "원근감있는 그림자";
     Text[ turkish ] = "Perspektifli g�lge";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Sombra en perspectiva";
+    Text[ catalan ] = "Ombra en perspectiva";
     Text[ finnish ] = "Perspektiivivarjo";
+    Text[ thai ] = "แรเงาตำแหน่งการมอง";
 };
 String STR_ItemNam_SHADOWRESERVE1 { Text = "" ; };
 String STR_ItemNam_SHADOWRESERVE2 { Text = "" ; };
@@ -9163,11 +9478,12 @@ String STR_ItemNamSET_SHADOW
     Text[ dutch ] = "Schaduwattributen";
     Text[ chinese_simplified ] = "阴影属性";
     Text[ greek ] = "��������� �����";
-    Text[ korean ] = "음영 속성";
+    Text[ korean ] = "그림자 속성";
     Text[ turkish ] = "G�lge �znitelikleri";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Atributos de sombra";
-    Text[ finnish ] = "Varjon ominaisuudet";
+    Text[ catalan ] = "Atributs de l'ombra";
+    Text[ finnish ] = "Varjon m��ritteet";
+    Text[ thai ] = "คุณลักษณะเงา";
 };
 String STR_ItemNam_CAPTIONTYPE
 {
@@ -9183,7 +9499,7 @@ String STR_ItemNam_CAPTIONTYPE
     Text [ french ] = "Type de l�gende" ;
     Text [ dutch ] = "Legendatype" ;
     Text[ chinese_simplified ] = "图例类型";
-    Text[ russian ] = "��� �������";
+    Text[ russian ] = "��� �������";
     Text[ polish ] = "Typ legendy";
     Text[ japanese ] = "凡例の種類";
     Text[ chinese_traditional ] = "圖例類型";
@@ -9191,11 +9507,12 @@ String STR_ItemNam_CAPTIONTYPE
     Text[ dutch ] = "Legendatype";
     Text[ chinese_simplified ] = "图例类型";
     Text[ greek ] = "����� ���������";
-    Text[ korean ] = "범례 형식";
+    Text[ korean ] = "범례 유형";
     Text[ turkish ] = "Belirtme �izgisi tipi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Tipo de leyenda";
+    Text[ catalan ] = "Tipus de llegenda";
     Text[ finnish ] = "Kuvatekstityyppi";
+    Text[ thai ] = "ชนิดคำบรรยายภาพ";
 };
 String STR_ItemNam_CAPTIONFIXEDANGLE
 {
@@ -9222,8 +9539,9 @@ String STR_ItemNam_CAPTIONFIXEDANGLE
     Text[ korean ] = "주어진 각도";
     Text[ turkish ] = "Belirlenen a��";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "�ngulo dado";
+    Text[ catalan ] = "Angle donat";
     Text[ finnish ] = "M��ritetty kulma";
+    Text[ thai ] = "มุมที่ให้มา";
 };
 String STR_ItemNam_CAPTIONANGLE
 {
@@ -9250,8 +9568,9 @@ String STR_ItemNam_CAPTIONANGLE
     Text[ korean ] = "각도";
     Text[ turkish ] = "A��";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "�ngulo";
+    Text[ catalan ] = "Angle";
     Text[ finnish ] = "Kulma";
+    Text[ thai ] = "มุม";
 };
 String STR_ItemNam_CAPTIONGAP
 {
@@ -9265,21 +9584,22 @@ String STR_ItemNam_CAPTIONGAP
     Text [ italian ] = "Spazio libero" ;
     Text [ spanish ] = "Espacio libre" ;
     Text [ french ] = "Espace libre" ;
-    Text [ dutch ] = "Vrijruimte" ;
+    Text [ dutch ] = "Vrije ruimte" ;
     Text[ chinese_simplified ] = "自由空间";
     Text[ russian ] = "�������";
     Text[ polish ] = "Wolne miejsce";
     Text[ japanese ] = "空白部分";
     Text[ chinese_traditional ] = "自由空間";
     Text[ arabic ] = "�����";
-    Text[ dutch ] = "Vrijruimte";
+    Text[ dutch ] = "Vrije ruimte";
     Text[ chinese_simplified ] = "自由空间";
     Text[ greek ] = "��������� �����";
     Text[ korean ] = "공백";
     Text[ turkish ] = "Bo�luk";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Espacio libre";
+    Text[ catalan ] = "Espai";
     Text[ finnish ] = "V�li";
+    Text[ thai ] = "ช่องว่าง";
 };
 String STR_ItemNam_CAPTIONESCDIR
 {
@@ -9293,21 +9613,22 @@ String STR_ItemNam_CAPTIONESCDIR
     Text [ italian ] = "Direzione di uscita" ;
     Text [ spanish ] = "Direcci�n de salida" ;
     Text [ french ] = "Direction de sortie" ;
-    Text [ dutch ] = "Uittredingsrichting" ;
+    Text [ dutch ] = "Verdwijnt in richting" ;
     Text[ chinese_simplified ] = "退出方向";
     Text[ russian ] = "����������� ������";
     Text[ polish ] = "Kierunek wyj�cia";
     Text[ japanese ] = "出す方向";
     Text[ chinese_traditional ] = "退出方向";
     Text[ arabic ] = "����� ������";
-    Text[ dutch ] = "Uittredingsrichting";
+    Text[ dutch ] = "Verdwijnt in richting";
     Text[ chinese_simplified ] = "退出方向";
     Text[ greek ] = "���������� ������";
     Text[ korean ] = "끝내기 방향";
     Text[ turkish ] = "��k�� y�n�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Direcci�n de salida";
+    Text[ catalan ] = "Direcci� de sortida";
     Text[ finnish ] = "Poistumissuunta";
+    Text[ thai ] = "ออกจากทิศทาง";
 };
 String STR_ItemNam_CAPTIONESCISREL
 {
@@ -9319,23 +9640,24 @@ String STR_ItemNam_CAPTIONESCISREL
     Text [ swedish ] = "Relativ uttr�desposition" ;
     Text [ danish ] = "Relativ udgangsplacering" ;
     Text [ italian ] = "Posizione di uscita relativa" ;
-    Text [ spanish ] = "Direcci�n de salida relativa" ;
+    Text [ spanish ] = "Posici�n de salida relativa" ;
     Text [ french ] = "Position de sortie relative" ;
-    Text [ dutch ] = "Relatieve uittredingspositie" ;
+    Text [ dutch ] = "Relatieve verdwijningspositie" ;
     Text[ chinese_simplified ] = "相对的退出位置";
     Text[ russian ] = "������������� ������� ������";
     Text[ polish ] = "Wzgl�dna pozycja wyj�ciowa";
     Text[ japanese ] = "相対的な出す位置";
     Text[ chinese_traditional ] = "相對的退出位置";
     Text[ arabic ] = "���� ���� ����";
-    Text[ dutch ] = "Relatieve uittredingspositie";
+    Text[ dutch ] = "Relatieve verdwijningspositie";
     Text[ chinese_simplified ] = "相对的退出位置";
     Text[ greek ] = "������� ���� ������";
-    Text[ korean ] = "상대적 끝내기 위치";
+    Text[ korean ] = "상대적 종료 위치";
     Text[ turkish ] = "G�receli ��k�� konumu";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Direcci�n de salida relativa";
+    Text[ catalan ] = "Direcci� de sortida relativa";
     Text[ finnish ] = "Suhteellinen poistumissijainti";
+    Text[ thai ] = "ตำแหน่งการออกแบบสัมพัทธ์";
 };
 String STR_ItemNam_CAPTIONESCREL
 {
@@ -9349,21 +9671,22 @@ String STR_ItemNam_CAPTIONESCREL
     Text [ italian ] = "Posizione di uscita" ;
     Text [ spanish ] = "Posici�n de salida" ;
     Text [ french ] = "Position de sortie" ;
-    Text [ dutch ] = "Uittredingspositie" ;
+    Text [ dutch ] = "Verdwijningspositie" ;
     Text[ chinese_simplified ] = "退出位置";
     Text[ russian ] = "������� ������";
     Text[ polish ] = "Po�o�enie wyj�ciowe";
     Text[ japanese ] = "出す位置";
     Text[ chinese_traditional ] = "退出位置";
     Text[ arabic ] = "���� ������";
-    Text[ dutch ] = "Uittredingspositie";
+    Text[ dutch ] = "Verdwijningspositie";
     Text[ chinese_simplified ] = "退出位置";
     Text[ greek ] = "���� ������";
     Text[ korean ] = "끝내기 위치";
     Text[ turkish ] = "��k�� konumu";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Posici�n de salida";
+    Text[ catalan ] = "Posici� de sortida";
     Text[ finnish ] = "Poistumissijainti";
+    Text[ thai ] = "ออกจากตำแหน่ง";
 };
 String STR_ItemNam_CAPTIONESCABS
 {
@@ -9377,21 +9700,22 @@ String STR_ItemNam_CAPTIONESCABS
     Text [ italian ] = "Posizione di uscita" ;
     Text [ spanish ] = "Posici�n de salida" ;
     Text [ french ] = "Position de sortie" ;
-    Text [ dutch ] = "Uittredingspositie" ;
+    Text [ dutch ] = "Verdwijningspositie" ;
     Text[ chinese_simplified ] = "退出位置";
     Text[ russian ] = "������� ������";
     Text[ polish ] = "Po�o�enie wyj�ciowe";
     Text[ japanese ] = "出す位置";
     Text[ chinese_traditional ] = "退出位置";
     Text[ arabic ] = "���� ������";
-    Text[ dutch ] = "Uittredingspositie";
+    Text[ dutch ] = "Verdwijningspositie";
     Text[ chinese_simplified ] = "退出位置";
     Text[ greek ] = "���� ������";
     Text[ korean ] = "끝내기 위치";
     Text[ turkish ] = "��k�� konumu";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Posici�n de salida";
+    Text[ catalan ] = "Posici� de sortida";
     Text[ finnish ] = "Poistumissijainti";
+    Text[ thai ] = "ออกจากตำแหน่ง";
 };
 String STR_ItemNam_CAPTIONLINELEN
 {
@@ -9420,8 +9744,9 @@ String STR_ItemNam_CAPTIONLINELEN
     Text[ korean ] = "선 길이";
     Text[ turkish ] = "�izgi uzunlu�u";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Largo de la l�nea";
+    Text[ catalan ] = "Llargada de la l�nia";
     Text[ finnish ] = "Viivan pituus";
+    Text[ thai ] = "ความยาวเส้น";
 };
 String STR_ItemNam_CAPTIONFITLINELEN
 {
@@ -9450,8 +9775,9 @@ String STR_ItemNam_CAPTIONFITLINELEN
     Text[ korean ] = "자동 선 길이";
     Text[ turkish ] = "Otomatik �izgi uzunlu�u";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Largo de l�nea autom�tico";
+    Text[ catalan ] = "Llargada de l�nia autom�tic";
     Text[ finnish ] = "Automaattinen rivin pituus";
+    Text[ thai ] = "ความยาวเส้นอัตโนมัติ";
 };
 String STR_ItemNam_CAPTIONRESERVE1 { Text = "" ; };
 String STR_ItemNam_CAPTIONRESERVE2 { Text = "" ; };
@@ -9472,7 +9798,7 @@ String STR_ItemNamSET_CAPTION
     Text [ french ] = "Attributs l�gende" ;
     Text [ dutch ] = "Legenda-attributen" ;
     Text[ chinese_simplified ] = "图例属性";
-    Text[ russian ] = "�������� �������";
+    Text[ russian ] = "�������� �������";
     Text[ polish ] = "Atrybuty legendy";
     Text[ japanese ] = "凡例の属性";
     Text[ chinese_traditional ] = "圖例屬性";
@@ -9483,8 +9809,9 @@ String STR_ItemNamSET_CAPTION
     Text[ korean ] = "범례 속성";
     Text[ turkish ] = "Belirtme �izgisi �znitelikleri";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Atributos de leyenda";
+    Text[ catalan ] = "Atributs de la llegenda";
     Text[ finnish ] = "Kuvatekstin m��ritteet";
+    Text[ thai ] = "คุณลักษณะคำบรรยายภาพ";
 };
 String STR_ItemNamSET_OUTLINER
 {
@@ -9511,8 +9838,9 @@ String STR_ItemNamSET_OUTLINER
     Text[ korean ] = "텍스트 속성";
     Text[ turkish ] = "Metin �znitelikleri";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Atributos de texto";
-    Text[ finnish ] = "Tekstin ominaisuudet";
+    Text[ catalan ] = "Atributs del text";
+    Text[ finnish ] = "Tekstin m��ritteet";
+    Text[ thai ] = "คุณลักษณะข้อความ";
 };
 String STR_ItemNam_ECKENRADIUS
 {
@@ -9526,21 +9854,22 @@ String STR_ItemNam_ECKENRADIUS
     Text [ italian ] = "Raggio d'angolo" ;
     Text [ spanish ] = "Radio de �ngulo" ;
     Text [ french ] = "Rayon d'angle" ;
-    Text [ dutch ] = "Hoekafronding" ;
+    Text [ dutch ] = "Hoekradius" ;
     Text[ chinese_simplified ] = "角半径";
-    Text[ russian ] = "������ ������������� ����";
+    Text[ russian ] = "������ ������������ ����";
     Text[ polish ] = "Promie� krzywizny";
     Text[ japanese ] = "角の半径";
     Text[ chinese_traditional ] = "角半徑";
     Text[ arabic ] = "��� ��� �������";
-    Text[ dutch ] = "Hoekafronding";
+    Text[ dutch ] = "Hoekradius";
     Text[ chinese_simplified ] = "角半径";
     Text[ greek ] = "������ ������";
     Text[ korean ] = "모서리 각도";
     Text[ turkish ] = "K��e �ap�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Radio de �ngulo";
+    Text[ catalan ] = "Radi de l'angle";
     Text[ finnish ] = "Kulmas�de";
+    Text[ thai ] = "รัศมีมุม";
 };
 String STR_ItemNam_TEXT_LEFTDIST
 {
@@ -9554,21 +9883,22 @@ String STR_ItemNam_TEXT_LEFTDIST
     Text [ italian ] = "Distanza sinistra cornice" ;
     Text [ spanish ] = "Margen izquierdo" ;
     Text [ french ] = "Bord gauche du cadre" ;
-    Text [ dutch ] = "Linker kaderafstand" ;
+    Text [ dutch ] = "Linkerkaderafstand" ;
     Text[ chinese_simplified ] = "左框间隔";
     Text[ russian ] = "����� �������� �����";
     Text[ polish ] = "Lewy odst�p ramek";
     Text[ japanese ] = "左枠線までの間隔";
     Text[ chinese_traditional ] = "左框間隔";
     Text[ arabic ] = "������� ������ ������";
-    Text[ dutch ] = "Linker kaderafstand";
+    Text[ dutch ] = "Linkerkaderafstand";
     Text[ chinese_simplified ] = "左框间隔";
     Text[ greek ] = "�������� �������� ��������";
-    Text[ korean ] = "왼쪽 틀 간격";
+    Text[ korean ] = "왼쪽 테두리 간격";
     Text[ turkish ] = "Sol �er�eve aral���";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Margen izquierdo";
+    Text[ catalan ] = "Espaiat de la vora esquerra";
     Text[ finnish ] = "Vasen reunav�li";
+    Text[ thai ] = "ระยะห่างเส้นขอบซ้าย";
 };
 String STR_ItemNam_TEXT_RIGHTDIST
 {
@@ -9580,23 +9910,24 @@ String STR_ItemNam_TEXT_RIGHTDIST
     Text [ swedish ] = "H�ger ramavst�nd" ;
     Text [ danish ] = "H�jre rammeafstand" ;
     Text [ italian ] = "Distanta destra cornice" ;
-    Text [ spanish ] = "Margen derecho" ;
+    Text [ spanish ] = "Borde derecho del marco" ;
     Text [ french ] = "Bord droit du cadre" ;
-    Text [ dutch ] = "Rechter kaderafstand" ;
+    Text [ dutch ] = "Rechterkaderafstand" ;
     Text[ chinese_simplified ] = "右框间隔";
-    Text[ russian ] = "���������� �� ����� ������";
+    Text[ russian ] = "������ �������� �����";
     Text[ polish ] = "Prawy odst�p ramek";
     Text[ japanese ] = "右枠線までの間隔";
     Text[ chinese_traditional ] = "右框間隔";
     Text[ arabic ] = "������� ������ ������";
-    Text[ dutch ] = "Rechter kaderafstand";
+    Text[ dutch ] = "Rechterkaderafstand";
     Text[ chinese_simplified ] = "右框间隔";
     Text[ greek ] = "����� �������� ��������";
-    Text[ korean ] = "오른쪽 틀 간격";
+    Text[ korean ] = "오른쪽 테두리 간격";
     Text[ turkish ] = "Sa� �er�eve aral���";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Margen derecho";
+    Text[ catalan ] = "Espaiat de la vora dreta";
     Text[ finnish ] = "Oikea reunav�li";
+    Text[ thai ] = "ระยะห่างเส้นขอบขวา";
 };
 String STR_ItemNam_TEXT_UPPERDIST
 {
@@ -9608,7 +9939,7 @@ String STR_ItemNam_TEXT_UPPERDIST
     Text [ swedish ] = "�vre ramavst�nd" ;
     Text [ danish ] = "Rammeafstand foroven" ;
     Text [ italian ] = "Distanza superiore cornice" ;
-    Text [ spanish ] = "Margen superior" ;
+    Text [ spanish ] = "Borde superior del marco" ;
     Text [ french ] = "Bord sup�rieur du cadre" ;
     Text [ dutch ] = "Kaderafstand boven" ;
     Text[ chinese_simplified ] = "上框间隔";
@@ -9620,11 +9951,12 @@ String STR_ItemNam_TEXT_UPPERDIST
     Text[ dutch ] = "Kaderafstand boven";
     Text[ chinese_simplified ] = "上框间隔";
     Text[ greek ] = "��� �������� ��������";
-    Text[ korean ] = "위 틀 간격";
+    Text[ korean ] = "위쪽 테두리 간격";
     Text[ turkish ] = "�st �er�eve aral���";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Margen superior";
+    Text[ catalan ] = "Espaiat de la vora superior";
     Text[ finnish ] = "Yl�reunav�li";
+    Text[ thai ] = "ระยะห่างเส้นขอบบน";
 };
 String STR_ItemNam_TEXT_LOWERDIST
 {
@@ -9648,11 +9980,12 @@ String STR_ItemNam_TEXT_LOWERDIST
     Text[ dutch ] = "Kaderafstand beneden";
     Text[ chinese_simplified ] = "下框间隔";
     Text[ greek ] = "�������� �������� ����";
-    Text[ korean ] = "아래 틀 간격";
+    Text[ korean ] = "아래쪽 테두리 간격";
     Text[ turkish ] = "Alt �er�eve aral���";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Margen inferior";
+    Text[ catalan ] = "Espaiat de la vora inferior";
     Text[ finnish ] = "Alareunav�li";
+    Text[ thai ] = "ระยะห่างเส้นขอบล่าง";
 };
 String STR_ItemNam_TEXT_AUTOGROWHEIGHT
 {
@@ -9681,8 +10014,9 @@ String STR_ItemNam_TEXT_AUTOGROWHEIGHT
     Text[ korean ] = "프레임 높이 자동 맞춤";
     Text[ turkish ] = "Otomatik �er�eve y�ksekli�i ayar�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Ajuste autom�tico de la altura del marco";
+    Text[ catalan ] = "Ajust autom�tic de l'al�ada del marc";
     Text[ finnish ] = "Automaattinen kehyksen korkeuden sovitus";
+    Text[ thai ] = "จัดความสูงพอดีกรอบอัตโนมัติ";
 };
 String STR_ItemNam_TEXT_MINFRAMEHEIGHT
 {
@@ -9708,11 +10042,12 @@ String STR_ItemNam_TEXT_MINFRAMEHEIGHT
     Text[ dutch ] = "Minimale kaderhoogte";
     Text[ chinese_simplified ] = "最小的框高";
     Text[ greek ] = "�������� ���� ��������";
-    Text[ korean ] = "최소 틀 높이";
+    Text[ korean ] = "최소 프레임 높이";
     Text[ turkish ] = "Asgari �er�eve y�ksekli�i";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Altura m�nima del marco";
+    Text[ catalan ] = "Al�ada m�nima del marc";
     Text[ finnish ] = "Kehyskorkeus v�h.";
+    Text[ thai ] = "ความสูงกรอบที่น้อยที่สุด";
 };
 String STR_ItemNam_TEXT_MAXFRAMEHEIGHT
 {
@@ -9738,11 +10073,12 @@ String STR_ItemNam_TEXT_MAXFRAMEHEIGHT
     Text[ dutch ] = "Maximale kaderhoogte";
     Text[ chinese_simplified ] = "最大的框高";
     Text[ greek ] = "������� ���� ��������";
-    Text[ korean ] = "최대 틀 높이";
+    Text[ korean ] = "최대 프레임 높이";
     Text[ turkish ] = "Azami �er�eve y�ksekli�i";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Altura m�xima del marco";
+    Text[ catalan ] = "Al�ada m�xima del marc";
     Text[ finnish ] = "Suurin kehyskorkeus";
+    Text[ thai ] = "ความสูงกรอบที่มากที่สุด";
 };
 String STR_ItemNam_TEXT_AUTOGROWWIDTH
 {
@@ -9769,8 +10105,9 @@ String STR_ItemNam_TEXT_AUTOGROWWIDTH
     Text[ korean ] = "프레임 너비 자동 맞춤";
     Text[ turkish ] = "Otomatik �er�eve geni�li�i ayar�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Ajuste autom�tico del ancho del marco";
+    Text[ catalan ] = "Ajust autom�tic de l'amplada del marc";
     Text[ finnish ] = "Automaattinen kehyksen leveyden sovitus";
+    Text[ thai ] = "จัดพอดีความกว้างกรอบอัตโนมัติ";
 };
 String STR_ItemNam_TEXT_MINFRAMEWIDTH
 {
@@ -9794,11 +10131,12 @@ String STR_ItemNam_TEXT_MINFRAMEWIDTH
     Text[ dutch ] = "Minimale kaderbreedte";
     Text[ chinese_simplified ] = "最小的框宽";
     Text[ greek ] = "�������� ������ ��������";
-    Text[ korean ] = "최소 틀 너비";
+    Text[ korean ] = "최소 프레임 너비";
     Text[ turkish ] = "Asgari �er�eve geni�li�i";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Ancho m�nimo del marco";
+    Text[ catalan ] = "Amplada m�nima del marc";
     Text[ finnish ] = "Kehysleveys v�h.";
+    Text[ thai ] = "ความกว้างกรอบที่น้อยที่สุด";
 };
 String STR_ItemNam_TEXT_MAXFRAMEWIDTH
 {
@@ -9822,11 +10160,12 @@ String STR_ItemNam_TEXT_MAXFRAMEWIDTH
     Text[ dutch ] = "Maximale kaderbreedte";
     Text[ chinese_simplified ] = "最大的框宽";
     Text[ greek ] = "������� ������ ��������";
-    Text[ korean ] = "최대 틀 너비";
+    Text[ korean ] = "최대 프레임 너비";
     Text[ turkish ] = "Azami �er�eve geni�li�i";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Ancho m�ximo del marco";
+    Text[ catalan ] = "Llargada m�xima del marc";
     Text[ finnish ] = "Suurin kehysleveys";
+    Text[ thai ] = "ความกว้างกรอบที่มากที่สุด";
 };
 String STR_ItemNam_TEXT_VERTADJUST
 {
@@ -9842,7 +10181,7 @@ String STR_ItemNam_TEXT_VERTADJUST
     Text [ french ] = "Ancrage vertical du texte" ;
     Text [ dutch ] = "Verticale tekstverankering" ;
     Text[ chinese_simplified ] = "垂直方向文字锁定";
-    Text[ russian ] = "������������ �������� ������";
+    Text[ russian ] = "������������ ����� ������";
     Text[ polish ] = "Pionowe zakotwiczenie tekstu";
     Text[ japanese ] = "垂直にテキストのアンカー";
     Text[ chinese_traditional ] = "垂直方向文字鎖定";
@@ -9850,11 +10189,12 @@ String STR_ItemNam_TEXT_VERTADJUST
     Text[ dutch ] = "Verticale tekstverankering";
     Text[ chinese_simplified ] = "垂直方向文字锁定";
     Text[ greek ] = "���������� �������� ��������";
-    Text[ korean ] = "수직으로 텍스트 위치 고정";
+    Text[ korean ] = "수직으로 텍스트 기준 위치";
     Text[ turkish ] = "Dikey metin sabitleme";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Anclaje vertical del texto";
+    Text[ catalan ] = "Ancoratge vertical del text";
     Text[ finnish ] = "Pystytason tekstiankkuri";
+    Text[ thai ] = "สมอข้อความแนวตั้ง";
 };
 String STR_ItemNam_TEXT_HORZADJUST
 {
@@ -9870,7 +10210,7 @@ String STR_ItemNam_TEXT_HORZADJUST
     Text [ french ] = "Ancrage horizontal du texte" ;
     Text [ dutch ] = "Horizontale tekstverankering" ;
     Text[ chinese_simplified ] = "水平方向文字锁定";
-    Text[ russian ] = "�������������� �������� ������";
+    Text[ russian ] = "�������������� ����� ������";
     Text[ polish ] = "Poziome zakotwiczenie tekstu";
     Text[ japanese ] = "横位置にテキストのアンカー";
     Text[ chinese_traditional ] = "水平方向文字鎖定";
@@ -9878,11 +10218,12 @@ String STR_ItemNam_TEXT_HORZADJUST
     Text[ dutch ] = "Horizontale tekstverankering";
     Text[ chinese_simplified ] = "水平方向文字锁定";
     Text[ greek ] = "��������� �������� ��������";
-    Text[ korean ] = "수평으로 텍스트 위치 고정";
+    Text[ korean ] = "수평으로 텍스트 기준 위치";
     Text[ turkish ] = "Yatay metin sabitleme";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Anclaje horizontal del texto";
+    Text[ catalan ] = "Ancoratge horitzontal del text";
     Text[ finnish ] = "Vaakatason tekstiankkuri";
+    Text[ thai ] = "สมอข้อความแนวนอน";
 };
 String STR_ItemNam_TEXT_FITTOSIZE
 {
@@ -9894,11 +10235,11 @@ String STR_ItemNam_TEXT_FITTOSIZE
     Text [ swedish ] = "Text-till-ram" ;
     Text [ danish ] = "Tekst til rammen" ;
     Text [ italian ] = "Testo alla cornice" ;
-    Text [ spanish ] = "Texto en marco" ;
+    Text [ spanish ] = "Adaptar el texto al marco" ;
     Text [ french ] = "Texte au cadre" ;
     Text [ dutch ] = "Tekst-aan-kader" ;
     Text[ chinese_simplified ] = "文字和框对齐";
-    Text[ russian ] = "������ ������ ��� �����";
+    Text[ russian ] = "������ ������ ��� �����";
     Text[ polish ] = "Tekst do ramki";
     Text[ japanese ] = "テキストを枠に合わす";
     Text[ chinese_traditional ] = "文字和框對齊";
@@ -9906,11 +10247,12 @@ String STR_ItemNam_TEXT_FITTOSIZE
     Text[ dutch ] = "Tekst-aan-kader";
     Text[ chinese_simplified ] = "文字和框对齐";
     Text[ greek ] = "���������� �������� �� �������";
-    Text[ korean ] = "텍스트를 틀에 맞춤";
+    Text[ korean ] = "텍스트를 프레임에 맞춤";
     Text[ turkish ] = "Metni �er�eveye s��d�r";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Texto en marco";
+    Text[ catalan ] = "Ajusta el text al marc";
     Text[ finnish ] = "Sovita teksti kehykseen";
+    Text[ thai ] = "จัดข้อความพอดีกรอบ";
 };
 
 String STR_ItemNam_GRAFRED
@@ -9924,7 +10266,7 @@ String STR_ItemNam_GRAFRED
     Text[ french ] = "Proportion de rouge";
     Text[ spanish ] = "Proporci�n de rojo";
     Text[ swedish ] = "Andel r�tt";
-    Text[ russian ] = "���� ��������";
+    Text[ russian ] = "���������� ��������";
     Text[ italian ] = "Percentuale di rosso";
     Text[ danish ] = "R�d-andel";
     Text[ polish ] = "Zawarto�� czerw.";
@@ -9935,8 +10277,9 @@ String STR_ItemNam_GRAFRED
     Text[ chinese_traditional ] = "紅色比例";
     Text[ arabic ] = "���� ������";
     Text[ turkish ] = "K�rm�z� oran�";
-    Text[ catalan ] = "Proporci�n de rojo";
+    Text[ catalan ] = "Vermell";
     Text[ finnish ] = "Punainen";
+    Text[ thai ] = "แดง";
 };
 String STR_ItemNam_GRAFGREEN
 {
@@ -9949,7 +10292,7 @@ String STR_ItemNam_GRAFGREEN
     Text[ french ] = "Proportion de vert";
     Text[ spanish ] = "Proporci�n de verde";
     Text[ swedish ] = "Andel gr�nt";
-    Text[ russian ] = "���� ��������";
+    Text[ russian ] = "���������� ��������";
     Text[ italian ] = "Percentuale di verde";
     Text[ danish ] = "Gr�n-andel";
     Text[ polish ] = "Zawarto�� zielonego";
@@ -9960,8 +10303,9 @@ String STR_ItemNam_GRAFGREEN
     Text[ chinese_traditional ] = "綠色比例";
     Text[ arabic ] = "���� ������";
     Text[ turkish ] = "Ye�il oran�";
-    Text[ catalan ] = "Proporci�n de verde";
+    Text[ catalan ] = "Verd";
     Text[ finnish ] = "Vihre�";
+    Text[ thai ] = "เขียว";
 };
 String STR_ItemNam_GRAFBLUE
 {
@@ -9985,8 +10329,9 @@ String STR_ItemNam_GRAFBLUE
     Text[ chinese_traditional ] = "藍色比例";
     Text[ arabic ] = "���� ������";
     Text[ turkish ] = "Mavi oran�";
-    Text[ catalan ] = "Proporci�n de azul";
+    Text[ catalan ] = "Blau";
     Text[ finnish ] = "Sininen";
+    Text[ thai ] = "น้ำเงิน";
 };
 String STR_ItemNam_GRAFLUMINANCE
 {
@@ -10010,8 +10355,9 @@ String STR_ItemNam_GRAFLUMINANCE
     Text[ chinese_traditional ] = "亮度";
     Text[ arabic ] = "�������";
     Text[ turkish ] = "Parlakl�k";
-    Text[ catalan ] = "Brillo";
+    Text[ catalan ] = "Brillantor";
     Text[ finnish ] = "Kirkkaus";
+    Text[ thai ] = "ความสว่าง";
 };
 String STR_ItemNam_GRAFCONTRAST
 {
@@ -10035,8 +10381,9 @@ String STR_ItemNam_GRAFCONTRAST
     Text[ chinese_traditional ] = "對比度";
     Text[ arabic ] = "�������";
     Text[ turkish ] = "Kontrast";
-    Text[ catalan ] = "Contraste";
+    Text[ catalan ] = "Contrast";
     Text[ finnish ] = "Kontrasti";
+    Text[ thai ] = "ความคมชัด";
 };
 String STR_ItemNam_GRAFGAMMA
 {
@@ -10062,6 +10409,7 @@ String STR_ItemNam_GRAFGAMMA
     Text[ turkish ] = "Gamma";
     Text[ catalan ] = "Gamma";
     Text[ finnish ] = "Gamma";
+    Text[ thai ] = "แกมม่า";
 };
 String STR_ItemNam_GRAFTRANSPARENCE
 {
@@ -10085,8 +10433,9 @@ String STR_ItemNam_GRAFTRANSPARENCE
     Text[ chinese_traditional ] = "透明";
     Text[ arabic ] = "������";
     Text[ turkish ] = "Saydaml�k";
-    Text[ catalan ] = "Transparencia";
-    Text[ finnish ] = "L�pikuultavuus";
+    Text[ catalan ] = "Transpar�ncia";
+    Text[ finnish ] = "L�pin�kyvyys";
+    Text[ thai ] = "ความโปร่งแสง";
 };
 String STR_ItemNam_GRAFINVERT
 {
@@ -10110,8 +10459,9 @@ String STR_ItemNam_GRAFINVERT
     Text[ chinese_traditional ] = "互補色轉換";
     Text[ arabic ] = "���";
     Text[ turkish ] = "Tersine �evir";
-    Text[ catalan ] = "Invertir";
+    Text[ catalan ] = "Inverteix";
     Text[ finnish ] = "K��nn�";
+    Text[ thai ] = "สลับ";
 };
 String STR_ItemNam_GRAFMODE
 {
@@ -10130,13 +10480,14 @@ String STR_ItemNam_GRAFMODE
     Text[ polish ] = "Tryb grafiki";
     Text[ portuguese_brazilian ] = "Graphics mode";
     Text[ japanese ] = "図モード";
-    Text[ korean ] = "그래픽 모드";
+    Text[ korean ] = "그림 모드";
     Text[ chinese_simplified ] = "图形模式";
     Text[ chinese_traditional ] = "圖形模式";
     Text[ arabic ] = "��� �����";
     Text[ turkish ] = "Grafik kipi";
-    Text[ catalan ] = "Modo gr�fico";
+    Text[ catalan ] = "Mode gr�fic";
     Text[ finnish ] = "Grafiikkatila";
+    Text[ thai ] = "โหมดกราฟิค";
 };
 String STR_ItemNam_GRAFRESERVE2 { Text = "" ; };
 String STR_ItemNam_GRAFRESERVE3 { Text = "" ; };
@@ -10170,8 +10521,9 @@ String STR_ItemNamSET_MISC
     Text[ korean ] = "다양한 속성";
     Text[ turkish ] = "�e�itli �znitelikler";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Atributos diversos";
-    Text[ finnish ] = "Useita ominaisuuksia";
+    Text[ catalan ] = "Atributs diversos";
+    Text[ finnish ] = "Eri m��ritteit�";
+    Text[ thai ] = "คุณลักษณะต่าง ๆ";
 };
 String STR_ItemNam_OBJMOVEPROTECT
 {
@@ -10198,8 +10550,9 @@ String STR_ItemNam_OBJMOVEPROTECT
     Text[ korean ] = "위치 보호";
     Text[ turkish ] = "Konum korumas�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Protecci�n de posici�n";
+    Text[ catalan ] = "Protecci� de posici�";
     Text[ finnish ] = "Suojattu sijainti";
+    Text[ thai ] = "ป้องกันตำแหน่ง";
 };
 String STR_ItemNam_OBJSIZEPROTECT
 {
@@ -10228,8 +10581,9 @@ String STR_ItemNam_OBJSIZEPROTECT
     Text[ korean ] = "크기 보호";
     Text[ turkish ] = "Boyut korumas�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Protecci�n de tama�o";
+    Text[ catalan ] = "Protecci� de mida";
     Text[ finnish ] = "Kokosuojaus";
+    Text[ thai ] = "ป้องกันขนาด";
 };
 String STR_ItemNam_OBJPRINTABLE
 {
@@ -10245,7 +10599,7 @@ String STR_ItemNam_OBJPRINTABLE
     Text [ french ] = "Ne pas imprimer" ;
     Text [ dutch ] = "Niet afdrukken" ;
     Text[ chinese_simplified ] = "不要打印";
-    Text[ russian ] = "��� ������";
+    Text[ russian ] = "�� ��������";
     Text[ polish ] = "Nie drukuj";
     Text[ japanese ] = "印刷しない";
     Text[ chinese_traditional ] = "不要列印";
@@ -10253,11 +10607,12 @@ String STR_ItemNam_OBJPRINTABLE
     Text[ dutch ] = "Niet afdrukken";
     Text[ chinese_simplified ] = "不要打印";
     Text[ greek ] = "�� ��� ���������";
-    Text[ korean ] = "인쇄 않음";
+    Text[ korean ] = "인쇄하지 않음";
     Text[ turkish ] = "Yazd�rma";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "No imprimir";
+    Text[ catalan ] = "No imprimeixis";
     Text[ finnish ] = "�l� tulosta";
+    Text[ thai ] = "ห้ามพิมพ์";
 };
 String STR_ItemNam_LAYERID
 {
@@ -10270,7 +10625,7 @@ String STR_ItemNam_LAYERID
     Text [ danish ] = "Niveau-identifikation" ;
     Text [ italian ] = "Contrassegno livello" ;
     Text [ spanish ] = "Identificaci�n de niveles" ;
-    Text [ french ] = "Indification de niveau" ;
+    Text [ french ] = "Identification de couche" ;
     Text [ dutch ] = "Niveau-indicator" ;
     Text[ chinese_simplified ] = "分层标识";
     Text[ russian ] = "��������� ����";
@@ -10284,8 +10639,9 @@ String STR_ItemNam_LAYERID
     Text[ korean ] = "계층 표시";
     Text[ turkish ] = "D�zey tan�t�c�s�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Identificaci�n de niveles";
+    Text[ catalan ] = "Indicador de capa";
     Text[ finnish ] = "Kerrosilmaisin";
+    Text[ thai ] = "ตัวบ่งชี้ระดับ";
 };
 String STR_ItemNam_LAYERNAME
 {
@@ -10309,11 +10665,12 @@ String STR_ItemNam_LAYERNAME
     Text[ dutch ] = "Niveau";
     Text[ chinese_simplified ] = "分层(~V)";
     Text[ greek ] = "�������";
-    Text[ korean ] = "계층(~V)";
+    Text[ korean ] = "수준(~V)";
     Text[ turkish ] = "D�zey";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Nivel";
+    Text[ catalan ] = "Ni~vell";
     Text[ finnish ] = "~Taso";
+    Text[ thai ] = "ระ~ดับ";
 };
 String STR_ItemNam_OBJECTNAME
 {
@@ -10340,8 +10697,9 @@ String STR_ItemNam_OBJECTNAME
     Text[ korean ] = "개체 이름";
     Text[ turkish ] = "Nesne ad�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Nombre del objeto";
+    Text[ catalan ] = "Nom de l'objecte";
     Text[ finnish ] = "Objektin nimi";
+    Text[ thai ] = "ชื่อวัตถุ";
 };
 String STR_ItemNam_STARTANGLE
 {
@@ -10357,7 +10715,7 @@ String STR_ItemNam_STARTANGLE
     Text [ french ] = "Angle de d�part" ;
     Text [ dutch ] = "Starthoek" ;
     Text[ chinese_simplified ] = "起始角度";
-    Text[ russian ] = "����������� ����";
+    Text[ russian ] = "��������� ����";
     Text[ polish ] = "K�t pocz�tkowy";
     Text[ japanese ] = "始める角度";
     Text[ chinese_traditional ] = "起始角度";
@@ -10368,8 +10726,9 @@ String STR_ItemNam_STARTANGLE
     Text[ korean ] = "시작 각도";
     Text[ turkish ] = "Ba�lang�� a��s�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "�ngulo inicial";
+    Text[ catalan ] = "Angle inicial";
     Text[ finnish ] = "Aloituskulma";
+    Text[ thai ] = "เริ่มมุม";
 };
 String STR_ItemNam_ENDANGLE
 {
@@ -10396,8 +10755,9 @@ String STR_ItemNam_ENDANGLE
     Text[ korean ] = "끝 각도";
     Text[ turkish ] = "Son a��";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "�ngulo final";
+    Text[ catalan ] = "Angle final";
     Text[ finnish ] = "Lopullinen kulma";
+    Text[ thai ] = "สิ้นสุดมุม";
 };
 String STR_ItemNam_POSITIONX
 {
@@ -10424,8 +10784,9 @@ String STR_ItemNam_POSITIONX
     Text[ korean ] = "X 위치";
     Text[ turkish ] = "X konumu";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Posici�n X";
-    Text[ finnish ] = "~X-sijainti";
+    Text[ catalan ] = "Posici� X";
+    Text[ finnish ] = "X-sijainti";
+    Text[ thai ] = "ตำแหน่ง X ";
 };
 String STR_ItemNam_POSITIONY
 {
@@ -10452,8 +10813,9 @@ String STR_ItemNam_POSITIONY
     Text[ korean ] = "Y 위치";
     Text[ turkish ] = "Y konumu";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Posici�n Y";
-    Text[ finnish ] = "~Y-sijainti";
+    Text[ catalan ] = "Posici� Y";
+    Text[ finnish ] = "Y-sijainti";
+    Text[ thai ] = "ตำแหน่ง Y ";
 };
 String STR_ItemNam_SIZEWIDTH
 {
@@ -10480,8 +10842,9 @@ String STR_ItemNam_SIZEWIDTH
     Text[ korean ] = "너비";
     Text[ turkish ] = "Geni�lik";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Ancho";
+    Text[ catalan ] = "Amplada";
     Text[ finnish ] = "Leveys";
+    Text[ thai ] = "ความกว้าง";
 };
 String STR_ItemNam_SIZEHEIGHT
 {
@@ -10510,8 +10873,9 @@ String STR_ItemNam_SIZEHEIGHT
     Text[ korean ] = "높이";
     Text[ turkish ] = "Y�kseklik";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Altura";
+    Text[ catalan ] = "Al�ada";
     Text[ finnish ] = "Korkeus";
+    Text[ thai ] = "ความสูง";
 };
 String STR_ItemNam_ROTATEANGLE
 {
@@ -10538,8 +10902,9 @@ String STR_ItemNam_ROTATEANGLE
     Text[ korean ] = "회전 각도";
     Text[ turkish ] = "D�n�� a��s�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "�ngulo de rotaci�n";
+    Text[ catalan ] = "Angle de gir";
     Text[ finnish ] = "Kiertokulma";
+    Text[ thai ] = "การหมุนของมุม";
 };
 String STR_ItemNam_SHEARANGLE
 {
@@ -10566,8 +10931,9 @@ String STR_ItemNam_SHEARANGLE
     Text[ korean ] = "교차각";
     Text[ turkish ] = "Kesi�me a��s�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "�ngulo de desviaci�n";
+    Text[ catalan ] = "Angle de retallament";
     Text[ finnish ] = "Murtumakulma";
+    Text[ thai ] = "มุมตัด";
 };
  ////////////////////////////////////////////////////////////////////////////////////////////////////
  ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -10601,10 +10967,11 @@ String SIP_UNKNOWN_ATTR
     Text[ dutch ] = "Onbekend attribuut";
     Text[ chinese_simplified ] = "属性不明";
     Text[ greek ] = "������� ��������";
-    Text[ korean ] = "알려져 있지 않은 속성";
+    Text[ korean ] = "알 수 없는 속성";
     Text[ turkish ] = "Bilinmeyen �znitelik";
-    Text[ catalan ] = "Atributo desconocido";
+    Text[ catalan ] = "Atribut desconegut";
     Text[ finnish ] = "Tuntematon m��rite";
+    Text[ thai ] = "ไม่รู้จักคุณลักษณะ";
 };
 
 // Strings fuer den Vorlagen-Dialog
@@ -10630,11 +10997,12 @@ String SIP_XA_LINESTYLE
     Text[ dutch ] = "Lijntype";
     Text[ chinese_simplified ] = "线条式样";
     Text[ greek ] = "���� �������";
-    Text[ korean ] = "선 유형";
+    Text[ korean ] = "줄 스타일";
     Text[ turkish ] = "�izgi bi�imi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Estilo de l�nea";
+    Text[ catalan ] = "Estil de l�nia";
     Text[ finnish ] = "Viivatyyli";
+    Text[ thai ] = "ลักษณะเส้น";
 };
 
 String SIP_XA_LINEDASH
@@ -10661,8 +11029,9 @@ String SIP_XA_LINEDASH
     Text[ greek ] = "������ �������";
     Text[ korean ] = "선 패턴";
     Text[ turkish ] = "�izgi deseni";
-    Text[ catalan ] = "Dise�o de l�nea";
+    Text[ catalan ] = "Disseny de l�nia";
     Text[ finnish ] = "Viivakuvio";
+    Text[ thai ] = "ลวดลายเส้น";
 };
 
 String SIP_XA_LINEWIDTH
@@ -10687,10 +11056,11 @@ String SIP_XA_LINEWIDTH
     Text[ dutch ] = "Lijndikte";
     Text[ chinese_simplified ] = "线粗";
     Text[ greek ] = "����� �������";
-    Text[ korean ] = "선 너비";
+    Text[ korean ] = "선 굵기";
     Text[ turkish ] = "�izgi kal�nl���";
-    Text[ catalan ] = "Espesor del trazo";
-    Text[ finnish ] = "Rivin leveys";
+    Text[ catalan ] = "Espessor del tra�";
+    Text[ finnish ] = "Viivan leveys";
+    Text[ thai ] = "ความกว้างของเส้น";
 };
 
 String SIP_XA_LINECOLOR
@@ -10718,8 +11088,9 @@ String SIP_XA_LINECOLOR
     Text[ korean ] = "선의 색";
     Text[ turkish ] = "�izgi rengi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Color de l�nea";
+    Text[ catalan ] = "Color de l�nia";
     Text[ finnish ] = "Viivan v�ri";
+    Text[ thai ] = "สีของเส้น";
 };
 
 String SIP_XA_LINESTART
@@ -10746,8 +11117,9 @@ String SIP_XA_LINESTART
     Text[ greek ] = "���� �������";
     Text[ korean ] = "선 시작";
     Text[ turkish ] = "�izgi ba��";
-    Text[ catalan ] = "Comienzo de l�nea";
-    Text[ finnish ] = "Rivin alku";
+    Text[ catalan ] = "Inici de l�nia";
+    Text[ finnish ] = "Viivan alku";
+    Text[ thai ] = "หัวเส้น";
 };
 
 String SIP_XA_LINEEND
@@ -10774,8 +11146,9 @@ String SIP_XA_LINEEND
     Text[ greek ] = "����� �������";
     Text[ korean ] = "선 끝";
     Text[ turkish ] = "�izgi sonu";
-    Text[ catalan ] = "Fin de l�nea";
-    Text[ finnish ] = "Rivin loppu";
+    Text[ catalan ] = "Fi de l�nia";
+    Text[ finnish ] = "Viivan loppu";
+    Text[ thai ] = "ท้ายเส้น";
 };
 
 String SIP_XA_LINESTARTWIDTH
@@ -10802,8 +11175,9 @@ String SIP_XA_LINESTARTWIDTH
     Text[ greek ] = "������ ����� �������";
     Text[ korean ] = "선 시작의 너비";
     Text[ turkish ] = "�izgi ba�� geni�li�i";
-    Text[ catalan ] = "Ancho de comienzo de l�nea";
-    Text[ finnish ] = "Rivin alun leveys";
+    Text[ catalan ] = "Amplada de comen�ament de l�nia";
+    Text[ finnish ] = "Viivan alun leveys";
+    Text[ thai ] = "ความกว้างหัวเส้น";
 };
 
 String SIP_XA_LINEENDWIDTH
@@ -10830,8 +11204,9 @@ String SIP_XA_LINEENDWIDTH
     Text[ greek ] = "������ ������ �������";
     Text[ korean ] = "선 끝의 너비";
     Text[ turkish ] = "�izgi sonu geni�li�i";
-    Text[ catalan ] = "Ancho de fin de l�nea";
-    Text[ finnish ] = "Rivin lopun leveys";
+    Text[ catalan ] = "Amplada de fi de l�nia";
+    Text[ finnish ] = "Viivan lopun leveys";
+    Text[ thai ] = "ความกว้างท้ายเส้น";
 };
 
 String SIP_XA_LINESTARTCENTER
@@ -10840,7 +11215,7 @@ String SIP_XA_LINESTARTCENTER
     Text [ ENGLISH ] = "Center linestart" ;
     Text[ english_us ] = "Center arrowhead";
     Text[ portuguese ] = "In�cio centrado";
-    Text[ russian ] = "������������ ������ ����� �� ������";
+    Text[ russian ] = "����� ��������� �������";
     Text[ dutch ] = "Lijnbegin gecentreerd";
     Text[ french ] = "D�but de ligne centr�";
     Text[ spanish ] = "Comienzo de l�nea, centrado";
@@ -10858,8 +11233,9 @@ String SIP_XA_LINESTARTCENTER
     Text[ greek ] = "���� ������� �������������";
     Text[ korean ] = "선 시작 - 가운데";
     Text[ turkish ] = "�izgi ba��n� ortala";
-    Text[ catalan ] = "Comienzo de l�nea, centrado";
+    Text[ catalan ] = "Centra l'extrem inicial de la fletxa";
     Text[ finnish ] = "Keskit� nuolenk�rki";
+    Text[ thai ] = "หัวลูกศรตรงกลาง";
 };
 
 String SIP_XA_LINEENDCENTER
@@ -10868,7 +11244,7 @@ String SIP_XA_LINEENDCENTER
     Text [ ENGLISH ] = "Center lineend" ;
     Text[ english_us ] = "Center arrowend";
     Text[ portuguese ] = "Fim centrado";
-    Text[ russian ] = "������������ ����� ����� �� ������";
+    Text[ russian ] = "����� ��������� �������";
     Text[ dutch ] = "Lijnuiteinde gecentreerd";
     Text[ french ] = "Extr�mit�s centr�es";
     Text[ spanish ] = "Fines de l�nea, centrado";
@@ -10884,10 +11260,11 @@ String SIP_XA_LINEENDCENTER
     Text[ dutch ] = "Lijnuiteinde gecentreerd";
     Text[ chinese_simplified ] = "线条箭头居中";
     Text[ greek ] = "������������� ����� �������";
-    Text[ korean ] = "선 끝 - 가운데";
+    Text[ korean ] = "선 끝을 가운데로";
     Text[ turkish ] = "�izgi sonunu ortala";
-    Text[ catalan ] = "Fines de l�nea, centrado";
+    Text[ catalan ] = "Centra l'extrem final de la fletxa";
     Text[ finnish ] = "Keskit� nuolenp��";
+    Text[ thai ] = "หางลูกศรตรงกลาง";
 };
 
 String SIP_XA_LINETRANSPARENCE
@@ -10914,8 +11291,9 @@ String SIP_XA_LINETRANSPARENCE
     Text[ greek ] = "��������� �������";
     Text[ korean ] = "투명 선";
     Text[ turkish ] = "�izgi saydaml���";
-    Text[ catalan ] = "Transparencia de l�nea";
-    Text[ finnish ] = "Viivan l�pikuultavuus";
+    Text[ catalan ] = "Transpar�ncia de l�nea";
+    Text[ finnish ] = "Viivan l�pin�kyvyys";
+    Text[ thai ] = "ความโปร่งแสงของเส้น";
 };
 
 String SIP_XA_LINEJOINT
@@ -10924,7 +11302,7 @@ String SIP_XA_LINEJOINT
     Text [ ENGLISH ] = "Line joint" ;
     Text[ english_us ] = "Line joint";
     Text[ portuguese ] = "Jun��o de linhas";
-    Text[ russian ] = "������� �����";
+    Text[ russian ] = "���������� �����";
     Text[ greek ] = "�������� �������";
     Text[ dutch ] = "Samenkomende lijnen";
     Text[ french ] = "Jointure de lignes";
@@ -10940,8 +11318,9 @@ String SIP_XA_LINEJOINT
     Text[ chinese_traditional ] = "線條接合";
     Text[ arabic ] = "���� ����";
     Text[ turkish ] = "�izgi ge�i�i";
-    Text[ catalan ] = "Junta de l�neas";
+    Text[ catalan ] = "Junta de l�nies";
     Text[ finnish ] = "Viivaliitos";
+    Text[ thai ] = "จุดเชื่อมของเส้น";
 };
 
 String SIP_XA_LINERESERVED2
@@ -10968,8 +11347,9 @@ String SIP_XA_LINERESERVED2
     Text[ greek ] = "������ ��������. 2";
     Text[ korean ] = "선 예비2";
     Text[ turkish ] = "�izgi - Yedek 2";
-    Text[ catalan ] = "L�nea reserva 2";
-    Text[ finnish ] = "Rivi varattu 2:lle";
+    Text[ catalan ] = "L�nia reserva 2";
+    Text[ finnish ] = "Viiva varattu 2:lle";
+    Text[ thai ] = "สงวนเส้นไว้สำหรับ 2";
 };
 
 String SIP_XA_LINERESERVED3
@@ -10996,8 +11376,9 @@ String SIP_XA_LINERESERVED3
     Text[ greek ] = "������ ��������. 3";
     Text[ korean ] = "선 예비3";
     Text[ turkish ] = "�izgi - Yedek 3";
-    Text[ catalan ] = "L�nea reserva 3";
-    Text[ finnish ] = "Rivi varattu 3:lle";
+    Text[ catalan ] = "L�nia reserva 3";
+    Text[ finnish ] = "Viiva varattu 3:lle";
+    Text[ thai ] = "สงวนเส้นไว้สำหรับ 3";
 };
 
 String SIP_XA_LINERESERVED4
@@ -11024,8 +11405,9 @@ String SIP_XA_LINERESERVED4
     Text[ greek ] = "������ ��������. 4";
     Text[ korean ] = "선 예비4";
     Text[ turkish ] = "�izgi - Yedek 4";
-    Text[ catalan ] = "L�nea reserva 4";
-    Text[ finnish ] = "Rivi varattu 4:lle";
+    Text[ catalan ] = "L�nia reserva 4";
+    Text[ finnish ] = "Viiva varattu 4:lle";
+    Text[ thai ] = "สงวนเส้นไว้สำหรับ 4";
 };
 
 String SIP_XA_LINERESERVED5
@@ -11052,8 +11434,9 @@ String SIP_XA_LINERESERVED5
     Text[ greek ] = "������ ��������. 5";
     Text[ korean ] = "선 예비5";
     Text[ turkish ] = "�izgi - Yedek 5";
-    Text[ catalan ] = "L�nea reserva 5";
-    Text[ finnish ] = "Rivi varattu 5:lle";
+    Text[ catalan ] = "L�nia reserva 5";
+    Text[ finnish ] = "Viiva varattu 5:lle";
+    Text[ thai ] = "สงวนเส้นไว้สำหรับ 5";
 };
 
 String SIP_XA_LINERESERVED_LAST
@@ -11080,8 +11463,9 @@ String SIP_XA_LINERESERVED_LAST
     Text[ greek ] = "������ ��������. 6";
     Text[ korean ] = "선 예비 6";
     Text[ turkish ] = "�izgi - Yedek 6";
-    Text[ catalan ] = "L�nea reserva 6";
-    Text[ finnish ] = "Rivi varattu 6:lle";
+    Text[ catalan ] = "L�nia reserva 6";
+    Text[ finnish ] = "Viiva varattu 6:lle";
+    Text[ thai ] = "สงวนเส้นไว้สำหรับ 6";
 };
 
 String SIP_XATTRSET_LINE
@@ -11091,7 +11475,7 @@ String SIP_XATTRSET_LINE
     Text[ english_us ] = "Line attributes";
     Text[ portuguese ] = "Atributos";
     Text[ russian ] = "�������� �����";
-    Text[ dutch ] = "Lijneattributen";
+    Text[ dutch ] = "Lijnattributen";
     Text[ french ] = "Attributs de lignes";
     Text[ spanish ] = "Atributos de l�nea";
     Text[ italian ] = "Attributi linea";
@@ -11103,20 +11487,21 @@ String SIP_XATTRSET_LINE
     Text[ chinese_simplified ] = "线条属性";
     Text[ chinese_traditional ] = "線條屬性";
     Text[ arabic ] = "���� ����";
-    Text[ dutch ] = "Lijneattributen";
+    Text[ dutch ] = "Lijnattributen";
     Text[ chinese_simplified ] = "线条属性";
     Text[ greek ] = "��������� �������";
     Text[ korean ] = "선 속성";
     Text[ turkish ] = "�izgi �znitelikleri";
-    Text[ catalan ] = "Atributos de l�nea";
+    Text[ catalan ] = "Atributs de l�nia";
     Text[ finnish ] = "Viivan m��ritteet";
+    Text[ thai ] = "คุณลักษณะเส้น";
 };
 
 String SIP_XA_FILLSTYLE
 {
     Text = "F�llstil";
     Text [ ENGLISH ] = "Fillstyle" ;
-    Text[ english_us ] = "Fillstyle";
+    Text[ english_us ] = "Fill style";
     Text[ portuguese ] = "Preenchimento";
     Text[ russian ] = "����� �������";
     Text[ dutch ] = "Vulling";
@@ -11134,11 +11519,12 @@ String SIP_XA_FILLSTYLE
     Text[ dutch ] = "Vulling";
     Text[ chinese_simplified ] = "填色样式";
     Text[ greek ] = "���� ����������";
-    Text[ korean ] = "채우기 유형";
+    Text[ korean ] = "채우기 스타일";
     Text[ turkish ] = "Dolgu bi�imi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Estilo de relleno";
+    Text[ catalan ] = "Estil d'emplenament";
     Text[ finnish ] = "T�ytt�tyyli";
+    Text[ thai ] = "เติมลักษณะ";
 };
 
 String SIP_XA_FILLCOLOR
@@ -11166,8 +11552,9 @@ String SIP_XA_FILLCOLOR
     Text[ korean ] = "채우기 색상";
     Text[ turkish ] = "Dolgu rengi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Color de relleno";
+    Text[ catalan ] = "Color d'emplenament";
     Text[ finnish ] = "T�ytt�v�ri";
+    Text[ thai ] = "เติมสี";
 };
 
 String SIP_XA_FILLGRADIENT
@@ -11176,8 +11563,8 @@ String SIP_XA_FILLGRADIENT
     Text [ ENGLISH ] = "Gradient" ;
     Text[ english_us ] = "Gradient";
     Text[ portuguese ] = "Grada��o";
-    Text[ russian ] = "�����������";
-    Text[ dutch ] = "Kleurverloop";
+    Text[ russian ] = "��������";
+    Text[ dutch ] = "Kleurovergangen";
     Text[ french ] = "D�grad�";
     Text[ spanish ] = "Gradiente";
     Text[ italian ] = "Sfumatura";
@@ -11189,13 +11576,14 @@ String SIP_XA_FILLGRADIENT
     Text[ chinese_simplified ] = "彩色图案";
     Text[ chinese_traditional ] = "彩色圖案";
     Text[ arabic ] = "���� �����";
-    Text[ dutch ] = "Kleurverloop";
+    Text[ dutch ] = "Kleurovergangen";
     Text[ chinese_simplified ] = "彩色图案";
     Text[ greek ] = "���������� ��������";
-    Text[ korean ] = "그라데이션";
+    Text[ korean ] = "그라디언트";
     Text[ turkish ] = "Gradyan";
-    Text[ catalan ] = "Gradiente";
-    Text[ finnish ] = "Gradientti";
+    Text[ catalan ] = "Gradient";
+    Text[ finnish ] = "Liukuv�rj�ys";
+    Text[ thai ] = "ไล่ระดับสี";
 };
 
 String SIP_XA_FILLHATCH
@@ -11222,8 +11610,9 @@ String SIP_XA_FILLHATCH
     Text[ greek ] = "����������";
     Text[ korean ] = "해칭";
     Text[ turkish ] = "Tarama";
-    Text[ catalan ] = "Trama";
+    Text[ catalan ] = "Ombreig";
     Text[ finnish ] = "Viivoitus";
+    Text[ thai ] = "ขีดเส้นขนานกัน";
 };
 
 String SIP_XA_FILLBITMAP
@@ -11232,7 +11621,7 @@ String SIP_XA_FILLBITMAP
     Text [ ENGLISH ] = "Fillbitmap" ;
     Text[ english_us ] = "Fillbitmap";
     Text[ portuguese ] = "Bitmap de preenchimento";
-    Text[ russian ] = "������� �������� ��������";
+    Text[ russian ] = "������� ������";
     Text[ dutch ] = "Vullingsbitmap";
     Text[ french ] = "Bitmap de remplissage";
     Text[ spanish ] = "Bitmap de relleno";
@@ -11251,8 +11640,9 @@ String SIP_XA_FILLBITMAP
     Text[ korean ] = "채우기 비트맵";
     Text[ turkish ] = "Dolgu i�in bit e�lem";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Bitmap de relleno";
+    Text[ catalan ] = "Mapa de bits d'emplenament";
     Text[ finnish ] = "T�ytt�bittikartta";
+    Text[ thai ] = "เติมบิทแมป";
 };
 
 String SIP_XA_FILLTRANSPARENCE
@@ -11261,7 +11651,7 @@ String SIP_XA_FILLTRANSPARENCE
     Text [ ENGLISH ] = "Transparence" ;
     Text[ english_us ] = "Transparency";
     Text[ portuguese ] = "Transpar�ncia";
-    Text[ russian ] = "������������ �������";
+    Text[ russian ] = "������������";
     Text[ dutch ] = "Transparantie";
     Text[ french ] = "Transparence";
     Text[ spanish ] = "Transparencia";
@@ -11277,10 +11667,11 @@ String SIP_XA_FILLTRANSPARENCE
     Text[ dutch ] = "Transparantie";
     Text[ chinese_simplified ] = "透明";
     Text[ greek ] = "��������� ����������";
-    Text[ korean ] = "투명 채우기";
+    Text[ korean ] = "투명도";
     Text[ turkish ] = "Y�zey saydaml���";
-    Text[ catalan ] = "Transparencia";
-    Text[ finnish ] = "L�pikuultavuus";
+    Text[ catalan ] = "Transpar�ncia";
+    Text[ finnish ] = "L�pin�kyvyys";
+    Text[ thai ] = "ความโปร่งแสง";
 };
 
 String SIP_XA_GRADIENTSTEPCOUNT
@@ -11289,8 +11680,8 @@ String SIP_XA_GRADIENTSTEPCOUNT
     Text [ ENGLISH ] = "Gradient steps" ;
     Text[ english_us ] = "Number of gradient steps";
     Text[ portuguese ] = "N�mero de grada��es";
-    Text[ russian ] = "���� �����������";
-    Text[ dutch ] = "Gradatie kleurverloop";
+    Text[ russian ] = "����� ����������� �����";
+    Text[ dutch ] = "Gradatie kleurovergangen";
     Text[ french ] = "Finesse du grain (d�grad�)";
     Text[ spanish ] = "Incremento";
     Text[ italian ] = "Numero gradi di sfumatura";
@@ -11302,13 +11693,14 @@ String SIP_XA_GRADIENTSTEPCOUNT
     Text[ chinese_simplified ] = "彩色图案变化步数";
     Text[ chinese_traditional ] = "彩色圖案步數";
     Text[ arabic ] = "��� ����� ���� �����";
-    Text[ dutch ] = "Gradatie kleurverloop";
+    Text[ dutch ] = "Gradatie kleurovergangen";
     Text[ chinese_simplified ] = "彩色图案变化步数";
     Text[ greek ] = "������� ������� ����������� ��������";
-    Text[ korean ] = "그라데이션 단계의 수";
+    Text[ korean ] = "그라디언트 단계수";
     Text[ turkish ] = "Gradyan ad�mlar� say�s�";
-    Text[ catalan ] = "Incremento";
-    Text[ finnish ] = "S�vytysasteiden m��r�";
+    Text[ catalan ] = "Increment";
+    Text[ finnish ] = "Liukuv�rj�ysasteiden m��r�";
+    Text[ thai ] = "จำนวนขั้นในการไล่สี";
 };
 
 String SIP_XA_FILLBMP_TILE
@@ -11317,10 +11709,10 @@ String SIP_XA_FILLBMP_TILE
     Text [ ENGLISH ] = "Tilefill" ;
     Text[ english_us ] = "Tile fill";
     Text[ portuguese ] = "Em mosaico";
-    Text[ russian ] = "������� ������";
+    Text[ russian ] = "������� �������";
     Text[ dutch ] = "Tegelvulling";
     Text[ french ] = "Remplissage du carrelage";
-    Text[ spanish ] = "Relleno de azulejo";
+    Text[ spanish ] = "Relleno del mosaico ";
     Text[ italian ] = "Riempimento piastrella";
     Text[ danish ] = "Flisefyld";
     Text[ swedish ] = "Kakelfyllning";
@@ -11335,8 +11727,9 @@ String SIP_XA_FILLBMP_TILE
     Text[ greek ] = "������� ���������";
     Text[ korean ] = "바둑판 채우기";
     Text[ turkish ] = "D��eme ta�lar�";
-    Text[ catalan ] = "Relleno de azulejo";
+    Text[ catalan ] = "Emplenament en mosaic";
     Text[ finnish ] = "Vierekk�inen t�ytt�";
+    Text[ thai ] = "เติมแบบเรียงซ้อน";
 };
 
 String SIP_XA_FILLBMP_POS
@@ -11345,7 +11738,7 @@ String SIP_XA_FILLBMP_POS
     Text [ ENGLISH ] = "Position of fillbitmap" ;
     Text[ english_us ] = "Fillbitmap position";
     Text[ portuguese ] = "Posi��o do bitmap";
-    Text[ russian ] = "������� ������� �������� ��������";
+    Text[ russian ] = "������� ������� ������";
     Text[ dutch ] = "Positie vullingsbitmap";
     Text[ french ] = "Position du bitmap de remplissage";
     Text[ spanish ] = "Posici�n bitmap de relleno";
@@ -11364,8 +11757,9 @@ String SIP_XA_FILLBMP_POS
     Text[ korean ] = "채우기 비트맵 위치";
     Text[ turkish ] = "Dolgu bit e�lem konumu";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Posici�n bitmap de relleno";
+    Text[ catalan ] = "Posici� bitmap d'emplenament";
     Text[ finnish ] = "T�ytt�bittikartan sijainti";
+    Text[ thai ] = "ตำแหน่งการเติมบิทแมป";
 };
 
 String SIP_XA_FILLBMP_SIZEX
@@ -11374,7 +11768,7 @@ String SIP_XA_FILLBMP_SIZEX
     Text [ ENGLISH ] = "Width of fillbitmap" ;
     Text[ english_us ] = "Fillbitmap width";
     Text[ portuguese ] = "Largura do bitmap";
-    Text[ russian ] = "������ ������� �������� ��������";
+    Text[ russian ] = "������ ������� ������";
     Text[ dutch ] = "Breedte vullingsbitmap";
     Text[ french ] = "Largeur du bitmap de remplissage";
     Text[ spanish ] = "Ancho bitmap de relleno";
@@ -11393,8 +11787,9 @@ String SIP_XA_FILLBMP_SIZEX
     Text[ korean ] = "채우기 비트맵 너비";
     Text[ turkish ] = "Dolgu bit e�lem geni�li�i";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Ancho bitmap de relleno";
+    Text[ catalan ] = "Amplada del mapa de bits d'emplenament";
     Text[ finnish ] = "T�ytt�bittikartan leveys";
+    Text[ thai ] = "ความกว้างการเติมบิทแมป";
 };
 
 String SIP_XA_FILLBMP_SIZEY
@@ -11403,7 +11798,7 @@ String SIP_XA_FILLBMP_SIZEY
     Text [ ENGLISH ] = "Height of fillbitmap" ;
     Text[ english_us ] = "Height of fillbitmap";
     Text[ portuguese ] = "Altura do bitmap";
-    Text[ russian ] = "������ ������� �������� ��������";
+    Text[ russian ] = "������ ������� ������";
     Text[ dutch ] = "Hoogte vullingsbitmap";
     Text[ french ] = "Hauteur du bitmap de remplissage";
     Text[ spanish ] = "Alto de bitmap de relleno";
@@ -11422,8 +11817,9 @@ String SIP_XA_FILLBMP_SIZEY
     Text[ korean ] = "채우기 비트맵의 높이";
     Text[ turkish ] = "Dolgu bit e�lem y�ksekli�i";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Alto de bitmap de relleno";
+    Text[ catalan ] = "Al�ada del mapa de bits d'emplenament";
     Text[ finnish ] = "T�ytt�bittikartan korkeus";
+    Text[ thai ] = "ความสูงของการเติมบิทแมป";
 };
 
 String SIP_XA_FILLFLOATTRANSPARENCE
@@ -11437,19 +11833,20 @@ String SIP_XA_FILLFLOATTRANSPARENCE
     Text[ french ] = "D�grad� transparent";
     Text[ spanish ] = "Gradiente transparente";
     Text[ swedish ] = "Transparent gradient";
-    Text[ russian ] = "���������� �����������";
+    Text[ russian ] = "���������� ��������";
     Text[ italian ] = "Sfumatura trasparente";
     Text[ danish ] = "Transparent graduering";
     Text[ polish ] = "Prze�roczysty gradient";
     Text[ portuguese_brazilian ] = "Transparent gradient";
     Text[ japanese ] = "透過性のあるグラデーション";
-    Text[ korean ] = "투명 그라데이션";
+    Text[ korean ] = "투명 그라디언트";
     Text[ chinese_simplified ] = "透明图案";
     Text[ chinese_traditional ] = "透明圖案";
     Text[ arabic ] = "���� ����";
     Text[ turkish ] = "Saydam gradyan";
-    Text[ catalan ] = "Gradiente transparente";
-    Text[ finnish ] = "L�pin�kyv� s�vytys";
+    Text[ catalan ] = "Gradient transparent";
+    Text[ finnish ] = "L�pin�kyv� liukuv�rj�ys";
+    Text[ thai ] = "ไล่ระดับสีที่ดปร่งแสง";
 };
 
 String SIP_XA_FILLRESERVED2
@@ -11476,8 +11873,9 @@ String SIP_XA_FILLRESERVED2
     Text[ greek ] = "������� ��������. 2";
     Text[ korean ] = "채우기　예비2";
     Text[ turkish ] = "Dolgu - Yedek 2";
-    Text[ catalan ] = "Relleno reserva 2";
+    Text[ catalan ] = "Emplenament reservat per a 2";
     Text[ finnish ] = "T�ytt� varattu 2:lle";
+    Text[ thai ] = "สงวนการเติมไว้สำหรับ 2";
 };
 
 String SIP_XA_FILLBMP_SIZELOG
@@ -11486,10 +11884,10 @@ String SIP_XA_FILLBMP_SIZELOG
     Text [ ENGLISH ] = "Tile size not in %" ;
     Text[ english_us ] = "Tile size not in %";
     Text[ portuguese ] = "Tamanho n�o em %";
-    Text[ russian ] = "������ ������ �� � %";
+    Text[ russian ] = "������ ������� �� � %";
     Text[ dutch ] = "Tegelgrootte niet in %";
     Text[ french ] = "Taille de carrelage absente dans %";
-    Text[ spanish ] = "Tama�o de azulejo en %";
+    Text[ spanish ] = "Tama�o del mosaico en %";
     Text[ italian ] = "Dimensione piastrella non in %";
     Text[ danish ] = "Flisest�rrelse ikke i %";
     Text[ swedish ] = "Kakelstorlek ej i %";
@@ -11504,8 +11902,9 @@ String SIP_XA_FILLBMP_SIZELOG
     Text[ greek ] = "������� ���������� ��� �� %";
     Text[ korean ] = "바둑판 크기를 %로 하지 않음";
     Text[ turkish ] = "D��eme ta�lar� boyutu % de�il";
-    Text[ catalan ] = "Tama�o de azulejo en %";
+    Text[ catalan ] = "Mida de azulejo en %";
     Text[ finnish ] = "Lohkokokoa ei alueella %";
+    Text[ thai ] = "ขนาดที่เรียงซ้อนไม่อยู่ใน %";
 };
 
 String SIP_XA_FILLBMP_TILEOFFSETX
@@ -11514,10 +11913,10 @@ String SIP_XA_FILLBMP_TILEOFFSETX
     Text [ ENGLISH ] = "Tile offset X in %" ;
     Text[ english_us ] = "Tile offset X in %";
     Text[ portuguese ] = "Offset X em mosaico em %";
-    Text[ russian ] = "�������� ������ X � %";
+    Text[ russian ] = "�������� ������� X � %";
     Text[ dutch ] = "Tegelopvulling X in %";
     Text[ french ] = "D�calage de carrelage X dans %";
-    Text[ spanish ] = "Desplazamiento de azulejo en %";
+    Text[ spanish ] = "Desplazamiento del mosaico en %";
     Text[ italian ] = "Spost. piastrella X in %";
     Text[ danish ] = "Fliseforskydning X i %";
     Text[ swedish ] = "F�rskjutning sida vid sida X i %";
@@ -11532,8 +11931,9 @@ String SIP_XA_FILLBMP_TILEOFFSETX
     Text[ greek ] = "���������� ���������� X �� %";
     Text[ korean ] = "바둑판 오프셋 X를 %로";
     Text[ turkish ] = "D��eme ta�� konumu X (%)";
-    Text[ catalan ] = "Desplazamiento de azulejo en %";
+    Text[ catalan ] = "Despla�ament de azulejo en %";
     Text[ finnish ] = "Lohkosiirtym� X kohteessa %";
+    Text[ thai ] = "ออฟเซตแบบเรียงซ้อน X ใน %";
 };
 
 String SIP_XA_FILLBMP_TILEOFFSETY
@@ -11542,10 +11942,10 @@ String SIP_XA_FILLBMP_TILEOFFSETY
     Text [ ENGLISH ] = "Tile offset Y in %" ;
     Text[ english_us ] = "Tile offset Y in %";
     Text[ portuguese ] = "Offset Y em mosaico em %";
-    Text[ russian ] = "�������� ������ Y � %";
+    Text[ russian ] = "�������� ������� Y � %";
     Text[ dutch ] = "Trapsgewijze plaatsing tegels in %";
     Text[ french ] = "D�calage de carrelage Y dans %";
-    Text[ spanish ] = "Desplazamiento de azulejo Y en %";
+    Text[ spanish ] = "Desplazamiento del mosaico Y en %";
     Text[ italian ] = "Spost. piastrella Y in %";
     Text[ danish ] = "Fliseforskydning Y i %";
     Text[ swedish ] = "F�rskjutning sida vid sida Y i %";
@@ -11560,8 +11960,9 @@ String SIP_XA_FILLBMP_TILEOFFSETY
     Text[ greek ] = "���������� ���������� Y �� %";
     Text[ korean ] = "바둑판 오프셋 Y를 %로";
     Text[ turkish ] = "D��eme ta�� konumu Y (%)";
-    Text[ catalan ] = "Desplazamiento de azulejo Y en %";
+    Text[ catalan ] = "Despla�ament de azulejo Y en %";
     Text[ finnish ] = "Lohkosiirtym� Y kohteessa %";
+    Text[ thai ] = "ออฟเซตแบบเรียงซ้อน Y ใน %";
 };
 
 String SIP_XA_FILLBMP_STRETCH
@@ -11570,7 +11971,7 @@ String SIP_XA_FILLBMP_STRETCH
     Text [ ENGLISH ] = "Bitmap scaling" ;
     Text[ english_us ] = "Bitmap scaling";
     Text[ portuguese ] = "Extens�o do bitmap";
-    Text[ russian ] = "��������������� ��������� �������";
+    Text[ russian ] = "��������������� ������";
     Text[ dutch ] = "Bitmapmaatstaf";
     Text[ french ] = "Extension de bitmap";
     Text[ spanish ] = "Redimensionamiento de bitmap";
@@ -11588,8 +11989,9 @@ String SIP_XA_FILLBMP_STRETCH
     Text[ greek ] = "���������� Bitmap";
     Text[ korean ] = "비트맵 길게 늘임";
     Text[ turkish ] = "Bit e�lem �l�eklendirme";
-    Text[ catalan ] = "Redimensionamiento de bitmap";
+    Text[ catalan ] = "Canvi de mida del mapa de bits";
     Text[ finnish ] = "Bittikartan skaalaus";
+    Text[ thai ] = "สเกลบิทแมป";
 };
 
 String SIP_XA_FILLRESERVED3
@@ -11598,7 +12000,7 @@ String SIP_XA_FILLRESERVED3
     Text [ ENGLISH ] = "Bitmap reserved 3" ;
     Text[ english_us ] = "Bitmap reserved for 3";
     Text[ portuguese ] = "Bitmap de reserva 3";
-    Text[ russian ] = "����������������� �������� ������� 3";
+    Text[ russian ] = "����������������� ����� 3";
     Text[ dutch ] = "Bitmapreserve 3";
     Text[ french ] = "R�serv� pour bitmap 3";
     Text[ spanish ] = "Bitmap reserva 3";
@@ -11616,8 +12018,9 @@ String SIP_XA_FILLRESERVED3
     Text[ greek ] = "Bitmap ��������. 3";
     Text[ korean ] = "비트맵 예비 3";
     Text[ turkish ] = "Bit e�lem - Yedek 3";
-    Text[ catalan ] = "Bitmap reserva 3";
+    Text[ catalan ] = "Mapa de bits reservat per a 3";
     Text[ finnish ] = "Bittikartta varattu 3:lle";
+    Text[ thai ] = "สงวนบิทแมปไว้สำหรับ 3";
 };
 
 String SIP_XA_FILLRESERVED4
@@ -11626,7 +12029,7 @@ String SIP_XA_FILLRESERVED4
     Text [ ENGLISH ] = "Bitmap reserved 4" ;
     Text[ english_us ] = "Bitmap reserved for 4";
     Text[ portuguese ] = "Bitmap de reserva 4";
-    Text[ russian ] = "����������������� �������� ������� 4";
+    Text[ russian ] = "����������������� ����� 4";
     Text[ dutch ] = "Bitmapreserve 4";
     Text[ french ] = "R�serv� pour bitmap 4";
     Text[ spanish ] = "Bitmap reserva 4";
@@ -11644,8 +12047,9 @@ String SIP_XA_FILLRESERVED4
     Text[ greek ] = "Bitmap ��������. 4";
     Text[ korean ] = "비트맵 예비 4";
     Text[ turkish ] = "Bit e�lem - Yedek 4";
-    Text[ catalan ] = "Bitmap reserva 4";
+    Text[ catalan ] = "Mapa de bits reservat per a 4";
     Text[ finnish ] = "Bittikartta varattu 4:lle";
+    Text[ thai ] = "สงวนบิทแมปไว้สำหรับ 4";
 };
 
 String SIP_XA_FILLRESERVED5
@@ -11654,7 +12058,7 @@ String SIP_XA_FILLRESERVED5
     Text [ ENGLISH ] = "Bitmap reserved 5" ;
     Text[ english_us ] = "Bitmap reserved for 5";
     Text[ portuguese ] = "Bitmap de reserva 5";
-    Text[ russian ] = "����������������� �������� ������� 5";
+    Text[ russian ] = "����������������� ����� 5";
     Text[ dutch ] = "Bitmapreserve 5";
     Text[ french ] = "R�serv� pour bitmap 5";
     Text[ spanish ] = "Bitmap reserva 5";
@@ -11672,8 +12076,9 @@ String SIP_XA_FILLRESERVED5
     Text[ greek ] = "Bitmap ��������. 5";
     Text[ korean ] = "비트맵 예비 5";
     Text[ turkish ] = "Bit e�lem - Yedek 5";
-    Text[ catalan ] = "Bitmap reserva 5";
+    Text[ catalan ] = "Mapa de bits reservat per a 5";
     Text[ finnish ] = "Bittikartta varattu 5:lle";
+    Text[ thai ] = "สงวนบิทแมปไว้สำหรับ 5";
 };
 
 String SIP_XA_FILLRESERVED6
@@ -11682,7 +12087,7 @@ String SIP_XA_FILLRESERVED6
     Text [ ENGLISH ] = "Bitmap reserved 6" ;
     Text[ english_us ] = "Bitmap reserved for 6";
     Text[ portuguese ] = "Bitmap de reserva 6";
-    Text[ russian ] = "����������������� �������� ������� 6";
+    Text[ russian ] = "����������������� ����� 6";
     Text[ dutch ] = "Bitmapreserve 6";
     Text[ french ] = "R�serv� pour bitmap 6";
     Text[ spanish ] = "Bitmap reserva 6";
@@ -11700,8 +12105,9 @@ String SIP_XA_FILLRESERVED6
     Text[ greek ] = "Bitmap ��������. 6";
     Text[ korean ] = "비트맵 예비 6";
     Text[ turkish ] = "Bit e�lem - Yedek 6";
-    Text[ catalan ] = "Bitmap reserva 6";
+    Text[ catalan ] = "Mapa de bits reservat per a 6";
     Text[ finnish ] = "Bittikartta varattu 6:lle";
+    Text[ thai ] = "สงวนบิทแมปไว้สำหรับ 6";
 };
 
 String SIP_XA_FILLRESERVED7
@@ -11710,7 +12116,7 @@ String SIP_XA_FILLRESERVED7
     Text [ ENGLISH ] = "Bitmap reserved 7" ;
     Text[ english_us ] = "Bitmap reserved for 7";
     Text[ portuguese ] = "Bitmap de reserva 7";
-    Text[ russian ] = "����������������� �������� ������� 7";
+    Text[ russian ] = "����������������� ����� 7";
     Text[ dutch ] = "Bitmapreserve 7";
     Text[ french ] = "R�serv� pour bitmap 7";
     Text[ spanish ] = "Bitmap reserva 7";
@@ -11728,8 +12134,9 @@ String SIP_XA_FILLRESERVED7
     Text[ greek ] = "Bitmap ��������. 7";
     Text[ korean ] = "비트맵 예비 7";
     Text[ turkish ] = "Bit e�lem - Yedek 7";
-    Text[ catalan ] = "Bitmap reserva 7";
+    Text[ catalan ] = "Mapa de bits reservat per a 7";
     Text[ finnish ] = "Bittikartta varattu 7:lle";
+    Text[ thai ] = "สงวนบิทแมปไว้สำหรับ 7";
 };
 
 String SIP_XA_FILLRESERVED8
@@ -11738,7 +12145,7 @@ String SIP_XA_FILLRESERVED8
     Text [ ENGLISH ] = "Bitmap reserved 8" ;
     Text[ english_us ] = "Bitmap reserved for 8";
     Text[ portuguese ] = "Bitmap de reserva 8";
-    Text[ russian ] = "����������������� �������� ������� 8";
+    Text[ russian ] = "����������������� ����� 8";
     Text[ dutch ] = "Bitmapreserve 8";
     Text[ french ] = "R�serv� pour bitmap 8";
     Text[ spanish ] = "Bitmap reserva 8";
@@ -11756,8 +12163,9 @@ String SIP_XA_FILLRESERVED8
     Text[ greek ] = "Bitmap ��������. 8";
     Text[ korean ] = "비트맵 예비 8";
     Text[ turkish ] = "Bit e�lem - Yedek 8";
-    Text[ catalan ] = "Bitmap reserva 8";
+    Text[ catalan ] = "Mapa de bits reservat per a 8";
     Text[ finnish ] = "Bittikartta varattu 8:lle";
+    Text[ thai ] = "สงวนบิทแมปไว้สำหรับ 8";
 };
 
 String SIP_XA_FILLBMP_POSOFFSETX
@@ -11766,10 +12174,10 @@ String SIP_XA_FILLBMP_POSOFFSETX
     Text [ ENGLISH ] = "Tile position X in %" ;
     Text[ english_us ] = "Tile position X in %";
     Text[ portuguese ] = "Posi��o mosaico X em %";
-    Text[ russian ] = "������� ������ X � %";
+    Text[ russian ] = "������� ������� X � %";
     Text[ dutch ] = "Tegelpositie X in %";
     Text[ french ] = "Position de carrelage X dans %";
-    Text[ spanish ] = "Posici�n azulejo X en %";
+    Text[ spanish ] = "Posici�n del mosaico X en %";
     Text[ italian ] = "Posizione piastrella X in %";
     Text[ danish ] = "Fliseposition X i %";
     Text[ swedish ] = "Position sida vid sida X i %";
@@ -11784,8 +12192,9 @@ String SIP_XA_FILLBMP_POSOFFSETX
     Text[ greek ] = "���� X ��������� �� %";
     Text[ korean ] = "바둑판 위치 X를 %로";
     Text[ turkish ] = "D��eme ta�� konumu X (%)";
-    Text[ catalan ] = "Posici�n azulejo X en %";
+    Text[ catalan ] = "Posici� azulejo X en %";
     Text[ finnish ] = "Lohkosijainti X kohteessa %";
+    Text[ thai ] = "ตำแหน่งเรียงซ้อน X ใน %";
 };
 
 String SIP_XA_FILLBMP_POSOFFSETY
@@ -11794,10 +12203,10 @@ String SIP_XA_FILLBMP_POSOFFSETY
     Text [ ENGLISH ] = "Tile position Y in %" ;
     Text[ english_us ] = "Tile position Y in %";
     Text[ portuguese ] = "Posi��o mosaico Y em %";
-    Text[ russian ] = "������� ������ Y � %";
+    Text[ russian ] = "������� ������� Y � %";
     Text[ dutch ] = "Tegelpositie Y in %";
     Text[ french ] = "Position de carrelage Y dans %";
-    Text[ spanish ] = "Posici�n azulejo Y en %";
+    Text[ spanish ] = "Posici�n del mosaico Y en %";
     Text[ italian ] = "Posizione piastrella Y in %";
     Text[ danish ] = "Fliseposition Y i %";
     Text[ swedish ] = "Position sida vid sida Y i %";
@@ -11812,8 +12221,9 @@ String SIP_XA_FILLBMP_POSOFFSETY
     Text[ greek ] = "���� Y ��������� �� %";
     Text[ korean ] = "바둑판 위치 Y를 %로";
     Text[ turkish ] = "D��eme ta�� konumu Y (%)";
-    Text[ catalan ] = "Posici�n azulejo Y en %";
+    Text[ catalan ] = "Posici� azulejo Y en %";
     Text[ finnish ] = "Lohkosijainti Y kohteessa %";
+    Text[ thai ] = "ตำแหน่งเรียงซ้อน Y ใน %";
 };
 
 String SIP_XA_FILLBACKGROUND
@@ -11822,7 +12232,7 @@ String SIP_XA_FILLBACKGROUND
     Text [ ENGLISH ] = "Background fill" ;
     Text[ english_us ] = "Background fill";
     Text[ portuguese ] = "Preencher plano de fundo";
-    Text[ russian ] = "���������� ����";
+    Text[ russian ] = "������� ����";
     Text[ greek ] = "������� ������";
     Text[ dutch ] = "Achtergrondvulling";
     Text[ french ] = "Remplissage d'arri�re-plan";
@@ -11839,8 +12249,9 @@ String SIP_XA_FILLBACKGROUND
     Text[ arabic ] = "����� �������";
     Text[ turkish ] = "Artalan dolgusu";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Relleno de fondo";
+    Text[ catalan ] = "Emplenament del fons";
     Text[ finnish ] = "Taustan t�ytt�";
+    Text[ thai ] = "เติมพื้นหลัง";
 };
 
 String SIP_XA_FILLRESERVED10
@@ -11867,8 +12278,9 @@ String SIP_XA_FILLRESERVED10
     Text[ greek ] = "������� ��������. 10";
     Text[ korean ] = "채우기　예비 10";
     Text[ turkish ] = "Dolgu - Yedek 10";
-    Text[ catalan ] = "Relleno reserva 10";
+    Text[ catalan ] = "Emplenament reservat per a 10";
     Text[ finnish ] = "T�ytt� varattu 10:lle";
+    Text[ thai ] = "สงวนการเติมไว้สำหรับ 10";
 };
 
 String SIP_XA_FILLRESERVED11
@@ -11895,8 +12307,9 @@ String SIP_XA_FILLRESERVED11
     Text[ greek ] = "������� ��������. 11";
     Text[ korean ] = "채우기　예비 11";
     Text[ turkish ] = "Dolgu - Yedek 11";
-    Text[ catalan ] = "Relleno reserva 11";
+    Text[ catalan ] = "Emplenament reservat per a 11";
     Text[ finnish ] = "T�ytt� varattu 11:lle";
+    Text[ thai ] = "สงวนการเติมไว้สำหรับ 11";
 };
 
 String SIP_XA_FILLRESERVED_LAST
@@ -11923,8 +12336,9 @@ String SIP_XA_FILLRESERVED_LAST
     Text[ greek ] = "������� ��������. 12";
     Text[ korean ] = "채우기 예비 12";
     Text[ turkish ] = "Dolgu - Yedek 12";
-    Text[ catalan ] = "Relleno reserva 12";
+    Text[ catalan ] = "Emplenament reservat per a 12";
     Text[ finnish ] = "T�ytt� varattu 12:lle";
+    Text[ thai ] = "สงวนการเติมไว้สำหรับ 12";
 };
 
 String SIP_XATTRSET_FILL
@@ -11933,8 +12347,8 @@ String SIP_XATTRSET_FILL
     Text [ ENGLISH ] = "Fill attributes" ;
     Text[ english_us ] = "Area attributes";
     Text[ portuguese ] = "Atributos de preenchimento";
-    Text[ russian ] = "�������� �������";
-    Text[ dutch ] = "Vullingsattributen";
+    Text[ russian ] = "�������� �������";
+    Text[ dutch ] = "Opvullingsattributen";
     Text[ french ] = "Attributs de remplissage";
     Text[ spanish ] = "Atributos de relleno";
     Text[ italian ] = "Attributi di riempimento";
@@ -11946,14 +12360,15 @@ String SIP_XATTRSET_FILL
     Text[ chinese_simplified ] = "充填属性";
     Text[ chinese_traditional ] = "充填屬性";
     Text[ arabic ] = "���� �������";
-    Text[ dutch ] = "Vullingsattributen";
+    Text[ dutch ] = "Opvullingsattributen";
     Text[ chinese_simplified ] = "充填属性";
     Text[ greek ] = "��������� ����������";
-    Text[ korean ] = "채우기 속성";
+    Text[ korean ] = "면 속성";
     Text[ turkish ] = "Y�zey �znitelikleri";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Atributos de relleno";
+    Text[ catalan ] = "Atributs d'emplenament";
     Text[ finnish ] = "Alueen m��ritteet";
+    Text[ thai ] = "คุณลักษณะพื้นที่";
 };
 
 String SIP_XA_FORMTXTSTYLE
@@ -11962,8 +12377,8 @@ String SIP_XA_FORMTXTSTYLE
     Text [ ENGLISH ] = "Fontwork style" ;
     Text[ english_us ] = "Fontwork style";
     Text[ portuguese ] = "Estilo Fontwork";
-    Text[ russian ] = "����� Fontwork";
-    Text[ dutch ] = "Fontwork stijl";
+    Text[ russian ] = "����� ��������";
+    Text[ dutch ] = "Fontwork-stijl";
     Text[ french ] = "Style Fontwork";
     Text[ spanish ] = "Estilos Fontwork";
     Text[ italian ] = "Stile Fontwork";
@@ -11975,13 +12390,14 @@ String SIP_XA_FORMTXTSTYLE
     Text[ chinese_simplified ] = "美工字体样式";
     Text[ chinese_traditional ] = "美術字型風格";
     Text[ arabic ] = "��� Fontwork";
-    Text[ dutch ] = "Fontwork stijl";
+    Text[ dutch ] = "Fontwork-stijl";
     Text[ chinese_simplified ] = "美工字体样式";
     Text[ greek ] = "���� Fontwork";
-    Text[ korean ] = "폰트워크 유형";
+    Text[ korean ] = "폰트워크 스타일";
     Text[ turkish ] = "Fontwork bi�imi";
-    Text[ catalan ] = "Estilos Fontwork";
-    Text[ finnish ] = "Fonttity�n tyyli";
+    Text[ catalan ] = "Estil del FontWork";
+    Text[ finnish ] = "Fonttity�-tyyli";
+    Text[ thai ] = "ลักษณะตัวอักษร";
 };
 
 String SIP_XA_FORMTXTADJUST
@@ -11990,8 +12406,8 @@ String SIP_XA_FORMTXTADJUST
     Text [ ENGLISH ] = "Fontwork justification" ;
     Text[ english_us ] = "Fontwork alignment";
     Text[ portuguese ] = "Alinhamento Fontwork";
-    Text[ russian ] = "������������ Fontwork";
-    Text[ dutch ] = "Fontwork uitlijning";
+    Text[ russian ] = "������������ �������";
+    Text[ dutch ] = "Fontwork-uitlijning";
     Text[ french ] = "Alignement Fontwork";
     Text[ spanish ] = "Alineaci�n Fontwork";
     Text[ italian ] = "Allineamento Fontwork";
@@ -12003,24 +12419,25 @@ String SIP_XA_FORMTXTADJUST
     Text[ chinese_simplified ] = "美工字体对齐";
     Text[ chinese_traditional ] = "美術字型對齊";
     Text[ arabic ] = "������ Fontwork";
-    Text[ dutch ] = "Fontwork uitlijning";
+    Text[ dutch ] = "Fontwork-uitlijning";
     Text[ chinese_simplified ] = "美工字体对齐";
     Text[ greek ] = "�������� Fontwork";
     Text[ korean ] = "폰트워크 맞춤";
     Text[ turkish ] = "Fontwork hizalamas�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Alineaci�n Fontwork";
-    Text[ finnish ] = "Fonttity�n tasaus";
+    Text[ catalan ] = "Alineament Fontwork";
+    Text[ finnish ] = "Fonttity�-tasaus";
+    Text[ thai ] = "จัดตำแหน่งตัวอักษร";
 };
 
 String SIP_XA_FORMTXTDISTANCE
 {
     Text = "Fontworkabstand";
     Text [ ENGLISH ] = "Fontwork distance" ;
-    Text[ english_us ] = "FontWork spacing";
+    Text[ english_us ] = "Fontwork spacing";
     Text[ portuguese ] = "Dist�ncia Fontwork";
-    Text[ russian ] = "�������� Fontwork";
-    Text[ dutch ] = "Fontwork afstand";
+    Text[ russian ] = "�������� �������";
+    Text[ dutch ] = "Fontwork-afstand";
     Text[ french ] = "�cart Fontwork";
     Text[ spanish ] = "Distancia Fontwork";
     Text[ italian ] = "Distanza Fontwork";
@@ -12032,14 +12449,15 @@ String SIP_XA_FORMTXTDISTANCE
     Text[ chinese_simplified ] = "美工字体间隔";
     Text[ chinese_traditional ] = "美術字型間隔";
     Text[ arabic ] = "����� Fontwork";
-    Text[ dutch ] = "Fontwork afstand";
+    Text[ dutch ] = "Fontwork-afstand";
     Text[ chinese_simplified ] = "美工字体间隔";
     Text[ greek ] = "�������� Fontwork";
     Text[ korean ] = "폰트워크 간격";
     Text[ turkish ] = "Fontwork aral���";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Distancia Fontwork";
-    Text[ finnish ] = "Fonttity�n v�li";
+    Text[ catalan ] = "Espaiat del FontWork";
+    Text[ finnish ] = "Fonttity�-v�li";
+    Text[ thai ] = "ระยะห่างตัวอักษร";
 };
 
 String SIP_XA_FORMTXTSTART
@@ -12048,8 +12466,8 @@ String SIP_XA_FORMTXTSTART
     Text [ ENGLISH ] = "Fontwork start" ;
     Text[ english_us ] = "Fontwork font begin";
     Text[ portuguese ] = "In�cio Fontwork";
-    Text[ russian ] = "������ ������ Fontwork";
-    Text[ dutch ] = "Fontwork schriftbegin";
+    Text[ russian ] = "������ ������ �������";
+    Text[ dutch ] = "Fontwork-schriftbegin";
     Text[ french ] = "D�but Fontwork";
     Text[ spanish ] = "Inicio Fontwork";
     Text[ italian ] = "Inizio carattere Fontwork";
@@ -12061,14 +12479,15 @@ String SIP_XA_FORMTXTSTART
     Text[ chinese_simplified ] = "美工字体的开端";
     Text[ chinese_traditional ] = "美術字型開端";
     Text[ arabic ] = "��� Fontwork";
-    Text[ dutch ] = "Fontwork schriftbegin";
+    Text[ dutch ] = "Fontwork-schriftbegin";
     Text[ chinese_simplified ] = "美工字体的开端";
     Text[ greek ] = "���� �������������� Fontwork";
     Text[ korean ] = "폰트워크 글꼴 시작";
     Text[ turkish ] = "Fontwork: Yaz�tipi ba��";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Inicio Fontwork";
-    Text[ finnish ] = "Fonttity�n fonttialoitus";
+    Text[ catalan ] = "Inici de tipus de lletra del FontWork";
+    Text[ finnish ] = "Fonttity�-fonttialoitus";
+    Text[ thai ] = "เริ่มต้นตัวอักษรที่ใช้งาน";
 };
 
 String SIP_XA_FORMTXTMIRROR
@@ -12077,8 +12496,8 @@ String SIP_XA_FORMTXTMIRROR
     Text [ ENGLISH ] = "Fontwork mirror" ;
     Text[ english_us ] = "Fontwork mirror";
     Text[ portuguese ] = "Reflectir Fontwork";
-    Text[ russian ] = "���������� ������ Fontwork";
-    Text[ dutch ] = "Fontwork spiegelschrift";
+    Text[ russian ] = "���������� ����������� �������";
+    Text[ dutch ] = "Fontwork-spiegelschrift";
     Text[ french ] = "Reflet Fontwork";
     Text[ spanish ] = "Reflejo Fontwork";
     Text[ italian ] = "Carattere rispecchiato Fontwork";
@@ -12090,13 +12509,14 @@ String SIP_XA_FORMTXTMIRROR
     Text[ chinese_simplified ] = "美工字体反映";
     Text[ chinese_traditional ] = "美術字型翻轉";
     Text[ arabic ] = "������� �������� �� Fontwork";
-    Text[ dutch ] = "Fontwork spiegelschrift";
+    Text[ dutch ] = "Fontwork-spiegelschrift";
     Text[ chinese_simplified ] = "美工字体反映";
     Text[ greek ] = "������������ ������ Fontwork";
     Text[ korean ] = "폰트워크 대칭글꼴";
     Text[ turkish ] = "Fontwork aynal� yaz�";
-    Text[ catalan ] = "Reflejo Fontwork";
-    Text[ finnish ] = "Fonttity�n kopio";
+    Text[ catalan ] = "Reflex Fontwork";
+    Text[ finnish ] = "Fonttity�-kopio";
+    Text[ thai ] = "ส่องตัวอักษร";
 };
 
 String SIP_XA_FORMTXTOUTLINE
@@ -12105,8 +12525,8 @@ String SIP_XA_FORMTXTOUTLINE
     Text [ ENGLISH ] = "Fontwork contour" ;
     Text[ english_us ] = "Fontwork outline";
     Text[ portuguese ] = "Contorno Fontwork";
-    Text[ russian ] = "��������� ����� Fontwork";
-    Text[ dutch ] = "Fontwork contourschrift";
+    Text[ russian ] = "��������� ����� �������";
+    Text[ dutch ] = "Fontwork-contourschrift";
     Text[ french ] = "Contour Fontwork";
     Text[ spanish ] = "Contorno Fontwork";
     Text[ italian ] = "Carattere contorno Fontwork";
@@ -12118,13 +12538,14 @@ String SIP_XA_FORMTXTOUTLINE
     Text[ chinese_simplified ] = "美工字体轮廓";
     Text[ chinese_traditional ] = "美術字型輪廓";
     Text[ arabic ] = "���� ������ �� Fontwork";
-    Text[ dutch ] = "Fontwork contourschrift";
+    Text[ dutch ] = "Fontwork-contourschrift";
     Text[ chinese_simplified ] = "美工字体轮廓";
     Text[ greek ] = "���������� Fontwork";
     Text[ korean ] = "폰트워크 윤곽 문자";
     Text[ turkish ] = "Fontwork: Konturlu yaz�";
-    Text[ catalan ] = "Contorno Fontwork";
-    Text[ finnish ] = "Fonttity�n ��riviiva";
+    Text[ catalan ] = "Contorn del FontWork";
+    Text[ finnish ] = "Fonttity�-��riviiva";
+    Text[ thai ] = "เค้าร่างตัวอักษร";
 };
 
 String SIP_XA_FORMTXTSHADOW
@@ -12133,8 +12554,8 @@ String SIP_XA_FORMTXTSHADOW
     Text [ ENGLISH ] = "Fontwork shadow" ;
     Text[ english_us ] = "Fontwork shadow";
     Text[ portuguese ] = "Sombreado Fontwork";
-    Text[ russian ] = "���� Fontwork";
-    Text[ dutch ] = "Fontwork schaduw";
+    Text[ russian ] = "���� �������";
+    Text[ dutch ] = "Fontwork-schaduw";
     Text[ french ] = "Ombre Fontwork";
     Text[ spanish ] = "Sombra Fontwork";
     Text[ italian ] = "Ombra Fontwork";
@@ -12146,13 +12567,14 @@ String SIP_XA_FORMTXTSHADOW
     Text[ chinese_simplified ] = "美工字体阴影";
     Text[ chinese_traditional ] = "美術字型陰影";
     Text[ arabic ] = "�� Fontwork";
-    Text[ dutch ] = "Fontwork schaduw";
+    Text[ dutch ] = "Fontwork-schaduw";
     Text[ chinese_simplified ] = "美工字体阴影";
     Text[ greek ] = "���� Fontwork";
-    Text[ korean ] = "폰트워크 음영";
+    Text[ korean ] = "폰트워크 그림자";
     Text[ turkish ] = "Fontwork g�lgesi";
-    Text[ catalan ] = "Sombra Fontwork";
-    Text[ finnish ] = "Fonttity�n varjostus";
+    Text[ catalan ] = "Ombra del FontWork";
+    Text[ finnish ] = "Fonttity�-varjostus";
+    Text[ thai ] = "เงาตัวอักษร";
 };
 
 String SIP_XA_FORMTXTSHDWCOLOR
@@ -12161,8 +12583,8 @@ String SIP_XA_FORMTXTSHDWCOLOR
     Text [ ENGLISH ] = "Color of fontwork color" ;
     Text[ english_us ] = "Fontwork shadow color";
     Text[ portuguese ] = "Cor do sombreado Fontwork";
-    Text[ russian ] = "���� ���� fontwork";
-    Text[ dutch ] = "Fontwork schaduwkleur";
+    Text[ russian ] = "���� ���� �������";
+    Text[ dutch ] = "Fontwork-schaduwkleur";
     Text[ french ] = "Couleur d'ombre Fontwork";
     Text[ spanish ] = "Color de sombra Fontwork";
     Text[ italian ] = "Colore ombra Fontwork";
@@ -12174,13 +12596,14 @@ String SIP_XA_FORMTXTSHDWCOLOR
     Text[ chinese_simplified ] = "美工字体阴影颜色";
     Text[ chinese_traditional ] = "美術字型陰影顏色";
     Text[ arabic ] = "��� �� Fontwork";
-    Text[ dutch ] = "Fontwork schaduwkleur";
+    Text[ dutch ] = "Fontwork-schaduwkleur";
     Text[ chinese_simplified ] = "美工字体阴影颜色";
     Text[ greek ] = "����� ����� Fontwork";
-    Text[ korean ] = "폰트워크 음영 색상";
+    Text[ korean ] = "폰트워크 그림자 색상";
     Text[ turkish ] = "Fontwork g�lge rengi";
-    Text[ catalan ] = "Color de sombra Fontwork";
-    Text[ finnish ] = "Fonttity�n varjostusv�ri";
+    Text[ catalan ] = "Color de l'ombra del FontWork";
+    Text[ finnish ] = "Fonttity�-varjostusv�ri";
+    Text[ thai ] = "สีเงาตัวอักษร";
 };
 
 String SIP_XA_FORMTXTSHDWXVAL
@@ -12189,8 +12612,8 @@ String SIP_XA_FORMTXTSHDWXVAL
     Text [ ENGLISH ] = "Offset of fontwork X" ;
     Text[ english_us ] = "Fontwork shadow offset X";
     Text[ portuguese ] = "Offset do sombreado Fontwork X";
-    Text[ russian ] = "�������� ���� fontwork X";
-    Text[ dutch ] = "Fontwork schaduwvulling X";
+    Text[ russian ] = "�������� ���� ������� X";
+    Text[ dutch ] = "Fontwork-schaduwvulling X";
     Text[ french ] = "D�calage d'ombre Fontwork X";
     Text[ spanish ] = "Desplaz. sombra de Fontwork X";
     Text[ italian ] = "Spost. ombra Fontwork X";
@@ -12202,13 +12625,14 @@ String SIP_XA_FORMTXTSHDWXVAL
     Text[ chinese_simplified ] = "美工字体偏移 X";
     Text[ chinese_traditional ] = "美術字型偏移 X";
     Text[ arabic ] = "����� �� Fontwork (�)";
-    Text[ dutch ] = "Fontwork schaduwvulling X";
+    Text[ dutch ] = "Fontwork-schaduwvulling X";
     Text[ chinese_simplified ] = "美工字体偏移 X";
     Text[ greek ] = "���������� � ����� Fontwork";
-    Text[ korean ] = "폰트워크 음영 오프셋 X";
+    Text[ korean ] = "폰트워크 그림자 오프셋 X";
     Text[ turkish ] = "Fontwork g�lge konumu X";
-    Text[ catalan ] = "Desplaz. sombra de Fontwork X";
-    Text[ finnish ] = "Fonttity�n varjosiirtym� X";
+    Text[ catalan ] = "Despla�. ombra de Fontwork X";
+    Text[ finnish ] = "Fonttity�-varjosiirtym� X";
+    Text[ thai ] = "ออฟเซตเงาตัวอักษร X";
 };
 
 String SIP_XA_FORMTXTSHDWYVAL
@@ -12217,8 +12641,8 @@ String SIP_XA_FORMTXTSHDWYVAL
     Text [ ENGLISH ] = "Offset of fontwork Y" ;
     Text[ english_us ] = "Fontwork shadow offset Y";
     Text[ portuguese ] = "Offset do sombreado Fontwork Y";
-    Text[ russian ] = "�������� ���� fontwork Y";
-    Text[ dutch ] = "Fontwork schaduwvulling Y";
+    Text[ russian ] = "�������� ���� ������� Y";
+    Text[ dutch ] = "Fontwork-schaduwvulling Y";
     Text[ french ] = "D�calage d'ombre Fontwork Y";
     Text[ spanish ] = "Desplaz. sombra de Fontwork Y";
     Text[ italian ] = "Spost. ombra Fontwork Y";
@@ -12230,13 +12654,14 @@ String SIP_XA_FORMTXTSHDWYVAL
     Text[ chinese_simplified ] = "美工字体偏移 Y";
     Text[ chinese_traditional ] = "美術字型陰影偏移 Y";
     Text[ arabic ] = "����� �� Fontwork (�)";
-    Text[ dutch ] = "Fontwork schaduwvulling Y";
+    Text[ dutch ] = "Fontwork-schaduwvulling Y";
     Text[ chinese_simplified ] = "美工字体偏移 Y";
     Text[ greek ] = "���������� Y ����� Fontwork";
-    Text[ korean ] = "폰트워크 음영 오프셋 Y";
+    Text[ korean ] = "폰트워크 그림자 오프셋 Y";
     Text[ turkish ] = "Fontwork g�lge konumu Y";
-    Text[ catalan ] = "Desplaz. sombra de Fontwork Y";
-    Text[ finnish ] = "Fonttity�n varjosiirtym� Y";
+    Text[ catalan ] = "Despla�. ombra de Fontwork Y";
+    Text[ finnish ] = "Fonttity�-varjosiirtym� Y";
+    Text[ thai ] = "ออฟเซตเงาตัวอักษร  Y";
 };
 
 String SIP_XA_FORMTXTSTDFORM
@@ -12245,8 +12670,8 @@ String SIP_XA_FORMTXTSTDFORM
     Text [ ENGLISH ] = "Fontwork standard form" ;
     Text[ english_us ] = "Fontwork default form";
     Text[ portuguese ] = "Forma padr�o Fontwork";
-    Text[ russian ] = "����������� ����� Fontwork";
-    Text[ dutch ] = "Fontwork standaardvorm";
+    Text[ russian ] = "����������� ����� �������";
+    Text[ dutch ] = "Fontwork-standaardvorm";
     Text[ french ] = "Forme standard Fontwork";
     Text[ spanish ] = "Forma predeterminada Fontwork";
     Text[ italian ] = "Forma standard Fontwork";
@@ -12258,14 +12683,15 @@ String SIP_XA_FORMTXTSTDFORM
     Text[ chinese_simplified ] = "美工字体标准格式";
     Text[ chinese_traditional ] = "美術字型標準格式";
     Text[ arabic ] = "������� Fontwork ����������";
-    Text[ dutch ] = "Fontwork standaardvorm";
+    Text[ dutch ] = "Fontwork-standaardvorm";
     Text[ chinese_simplified ] = "美工字体标准格式";
     Text[ greek ] = "������������� ����� Fontwork";
     Text[ korean ] = "폰트워크 기본형";
     Text[ turkish ] = "Fontwork: Standart bi�im";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Forma est�ndar Fontwork";
-    Text[ finnish ] = "Fonttity�n oletuslomake";
+    Text[ catalan ] = "Formulari per defecte del FontWork";
+    Text[ finnish ] = "Fonttity�-oletuslomake";
+    Text[ thai ] = "แบบค่าเริ่มต้นตัวอักษร";
 };
 
 String SIP_XA_FORMTXTHIDEFORM
@@ -12274,36 +12700,37 @@ String SIP_XA_FORMTXTHIDEFORM
     Text [ ENGLISH ] = "Hide fontwork contour" ;
     Text[ english_us ] = "Hide fontwork outline";
     Text[ portuguese ] = "Ocultar contorno Fontwork";
-    Text[ russian ] = "������ ������ fontwork";
-    Text[ dutch ] = "Fontwork contour verbergen";
+    Text[ russian ] = "������ ������ �������";
+    Text[ dutch ] = "Fontwork-contour verbergen";
     Text[ french ] = "Masquer le contour Fontwork";
     Text[ spanish ] = "Ocultar contorno Fontwork";
     Text[ italian ] = "Nascondi contorno Fontwork";
     Text[ danish ] = "Skjul FontWork-kontur";
-    Text[ swedish ] = "D�lj fontworkkontur";
+    Text[ swedish ] = "D�lj Fontworkkontur";
     Text[ polish ] = "Fontwork - ukryj kontur";
     Text[ portuguese_brazilian ] = "Hide fontwork contour";
     Text[ japanese ] = "フォントワーク 中抜きを非表示";
     Text[ chinese_simplified ] = "隐藏美工字体轮廓";
     Text[ chinese_traditional ] = "隱入美術字型輪廓";
     Text[ arabic ] = "����� ���� ������ �� Fontwork";
-    Text[ dutch ] = "Fontwork contour verbergen";
+    Text[ dutch ] = "Fontwork-contour verbergen";
     Text[ chinese_simplified ] = "隐藏美工字体轮廓";
     Text[ greek ] = "�������� ������������� Fontwork";
     Text[ korean ] = "폰트워크 윤곽 숨기기";
     Text[ turkish ] = "Fontwork konturunu gizle";
-    Text[ catalan ] = "Ocultar contorno Fontwork";
-    Text[ finnish ] = "Piilota fonttity�n ��riviivat";
+    Text[ catalan ] = "Oculta el contorn del fontwork";
+    Text[ finnish ] = "Piilota Fonttity�n ��riviivat";
+    Text[ thai ] = "ซ่อนเค้าร่างตัวอักษร";
 };
 
 String SIP_XA_FORMTXTSHDWTRANSP
 {
     Text = "Fontworkschattentransparenz";
     Text [ ENGLISH ] = "Transparence of fontwork shadow" ;
-    Text[ english_us ] = "FontWork shadow transparency";
+    Text[ english_us ] = "Fontwork shadow transparency";
     Text[ portuguese ] = "Transpar�ncia do sombreado Fontwork";
-    Text[ russian ] = "������������ ���� fontwork";
-    Text[ dutch ] = "Fontwork schaduwtransparantie";
+    Text[ russian ] = "������������ ���� �������";
+    Text[ dutch ] = "Fontwork-schaduwtransparantie";
     Text[ french ] = "Transparence d'ombre Fontwork";
     Text[ spanish ] = "Transparencia de sombra Fontwork";
     Text[ italian ] = "Trasparenza ombra Fontwork";
@@ -12315,13 +12742,14 @@ String SIP_XA_FORMTXTSHDWTRANSP
     Text[ chinese_simplified ] = "美工字体阴影透明";
     Text[ chinese_traditional ] = "美術字型陰影透明";
     Text[ arabic ] = "������ �� Fontwork";
-    Text[ dutch ] = "Fontwork schaduwtransparantie";
+    Text[ dutch ] = "Fontwork-schaduwtransparantie";
     Text[ chinese_simplified ] = "美工字体阴影透明";
     Text[ greek ] = "��������� ����� Fontwork";
-    Text[ korean ] = "폰트워크 음영 투명";
+    Text[ korean ] = "폰트워크 그림자 투명";
     Text[ turkish ] = "Fontwork g�lge saydaml���";
-    Text[ catalan ] = "Transparencia de sombra Fontwork";
-    Text[ finnish ] = "Fonttity�n varjostuksen l�pin�kyvyys";
+    Text[ catalan ] = "Transpar�ncia d'ombra Fontwork";
+    Text[ finnish ] = "Fonttity�-varjostuksen l�pin�kyvyys";
+    Text[ thai ] = "ความโปร่งแสงของเงาตัวอักษร";
 };
 
 String SIP_XA_FTRESERVED2
@@ -12330,8 +12758,8 @@ String SIP_XA_FTRESERVED2
     Text [ ENGLISH ] = "Fontwork reserved 2" ;
     Text[ english_us ] = "Fontwork reserved for 2";
     Text[ portuguese ] = "Fontwork de reserva 2";
-    Text[ russian ] = "����������������� Fontwork 2";
-    Text[ dutch ] = "Fontwork reserve 2";
+    Text[ russian ] = "����������������� ������ 2";
+    Text[ dutch ] = "Fontwork-reserve 2";
     Text[ french ] = "R�serv� pour Fontwork 2";
     Text[ spanish ] = "Fontwork reserva 2";
     Text[ italian ] = "Riservato per Fontwork 2";
@@ -12343,13 +12771,14 @@ String SIP_XA_FTRESERVED2
     Text[ chinese_simplified ] = "美工字体预留 2";
     Text[ chinese_traditional ] = "美術字型預留 2";
     Text[ arabic ] = "Fontwork ����� �� 2";
-    Text[ dutch ] = "Fontwork reserve 2";
+    Text[ dutch ] = "Fontwork-reserve 2";
     Text[ chinese_simplified ] = "美工字体预留 2";
     Text[ greek ] = "Fontwork ��������. 2";
     Text[ korean ] = "폰트워크 예비 2";
     Text[ turkish ] = "Fontwork: Yedek 2";
-    Text[ catalan ] = "Fontwork reserva 2";
+    Text[ catalan ] = "Fontwork reservat per a 2";
     Text[ finnish ] = "Fonttity� varattu 2:lle";
+    Text[ thai ] = "สงวนFontworkไว้สำหรับ 2";
 };
 
 String SIP_XA_FTRESERVED3
@@ -12358,8 +12787,8 @@ String SIP_XA_FTRESERVED3
     Text [ ENGLISH ] = "Fontwork reserved 3" ;
     Text[ english_us ] = "Fontwork reserved for 3";
     Text[ portuguese ] = "Fontwork de reserva 3";
-    Text[ russian ] = "����������������� Fontwork 3";
-    Text[ dutch ] = "Fontwork reserve 3";
+    Text[ russian ] = "����������������� ������ 3";
+    Text[ dutch ] = "Fontwork-reserve 3";
     Text[ french ] = "R�serv� pour Fontwork 3";
     Text[ spanish ] = "Fontwork reserva 3";
     Text[ italian ] = "Riservato per Fontwork 3";
@@ -12371,13 +12800,14 @@ String SIP_XA_FTRESERVED3
     Text[ chinese_simplified ] = "美工字体预留 3";
     Text[ chinese_traditional ] = "美術字型預留 3";
     Text[ arabic ] = "Fontwork ����� �� 3";
-    Text[ dutch ] = "Fontwork reserve 3";
+    Text[ dutch ] = "Fontwork-reserve 3";
     Text[ chinese_simplified ] = "美工字体预留 3";
     Text[ greek ] = "Fontwork ��������. 3";
     Text[ korean ] = "폰트워크 예비 3";
     Text[ turkish ] = "Fontwork: Yedek 3";
-    Text[ catalan ] = "Fontwork reserva 3";
+    Text[ catalan ] = "Fontwork reservat per a 3";
     Text[ finnish ] = "Fonttity� varattu 3:lle";
+    Text[ thai ] = "สงวนFontworkไว้สำหรับ 3";
 };
 
 String SIP_XA_FTRESERVED4
@@ -12386,8 +12816,8 @@ String SIP_XA_FTRESERVED4
     Text [ ENGLISH ] = "Fontwork reserved 4" ;
     Text[ english_us ] = "Fontwork reserved for 4";
     Text[ portuguese ] = "Fontwork de reserva 4";
-    Text[ russian ] = "����������������� Fontwork 4";
-    Text[ dutch ] = "Fontwork reserve 4";
+    Text[ russian ] = "����������������� ������ 4";
+    Text[ dutch ] = "Fontwork-reserve 4";
     Text[ french ] = "R�serv� pour Fontwork 4";
     Text[ spanish ] = "Fontwork reserva 4";
     Text[ italian ] = "Riservato per Fontwork 4";
@@ -12399,13 +12829,14 @@ String SIP_XA_FTRESERVED4
     Text[ chinese_simplified ] = "美工字体预留 4";
     Text[ chinese_traditional ] = "美術字型預留 4";
     Text[ arabic ] = "Fontwork ����� �� 4";
-    Text[ dutch ] = "Fontwork reserve 4";
+    Text[ dutch ] = "Fontwork-reserve 4";
     Text[ chinese_simplified ] = "美工字体预留 4";
     Text[ greek ] = "Fontwork ��������. 4";
     Text[ korean ] = "폰트워크 예비 4";
     Text[ turkish ] = "Fontwork: Yedek 4";
-    Text[ catalan ] = "Fontwork reserva 4";
+    Text[ catalan ] = "Fontwork reservat per a 4";
     Text[ finnish ] = "Fonttity� varattu 4:lle";
+    Text[ thai ] = "สงวนFontworkไว้สำหรับ 4";
 };
 
 String SIP_XA_FTRESERVED5
@@ -12414,8 +12845,8 @@ String SIP_XA_FTRESERVED5
     Text [ ENGLISH ] = "Fontwork reserved 5" ;
     Text[ english_us ] = "Fontwork reserved for 5";
     Text[ portuguese ] = "Fontwork de reserva 5";
-    Text[ russian ] = "����������������� Fontwork 5";
-    Text[ dutch ] = "Fontwork reserve 5";
+    Text[ russian ] = "����������������� ������ 5";
+    Text[ dutch ] = "Fontwork-reserve 5";
     Text[ french ] = "R�serv� pour Fontwork 5";
     Text[ spanish ] = "Fontwork reserva 5";
     Text[ italian ] = "Riservato per Fontwork 5";
@@ -12427,13 +12858,14 @@ String SIP_XA_FTRESERVED5
     Text[ chinese_simplified ] = "美工字体预留 5";
     Text[ chinese_traditional ] = "美術字型預留 5";
     Text[ arabic ] = "Fontwork ����� �� 5";
-    Text[ dutch ] = "Fontwork reserve 5";
+    Text[ dutch ] = "Fontwork-reserve 5";
     Text[ chinese_simplified ] = "美工字体预留 5";
     Text[ greek ] = "Fontwork ��������. 5";
     Text[ korean ] = "폰트워크 예비 5";
     Text[ turkish ] = "Fontwork: Yedek 5";
-    Text[ catalan ] = "Fontwork reserva 5";
+    Text[ catalan ] = "Fontwork reservat per a 5";
     Text[ finnish ] = "Fonttity� varattu 5:lle";
+    Text[ thai ] = "สงวนFontworkไว้สำหรับ 5";
 };
 
 String SIP_XA_FTRESERVED_LAST
@@ -12442,8 +12874,8 @@ String SIP_XA_FTRESERVED_LAST
     Text [ ENGLISH ] = "Fontwork reserved 6" ;
     Text[ english_us ] = "Fontwork reserved for 6";
     Text[ portuguese ] = "Fontwork de reserva 6";
-    Text[ russian ] = "����������������� Fontwork 6";
-    Text[ dutch ] = "Fontwork reserve 6";
+    Text[ russian ] = "����������������� ������ 6";
+    Text[ dutch ] = "Fontwork-reserve 6";
     Text[ french ] = "R�serv� pour Fontwork 6";
     Text[ spanish ] = "Fontwork reserva 6";
     Text[ italian ] = "Riservato per Fontwork 6";
@@ -12455,13 +12887,14 @@ String SIP_XA_FTRESERVED_LAST
     Text[ chinese_simplified ] = "美工字体预留 6";
     Text[ chinese_traditional ] = "美術字型預留 6";
     Text[ arabic ] = "Fontwork ����� �� 6";
-    Text[ dutch ] = "Fontwork reserve 6";
+    Text[ dutch ] = "Fontwork-reserve 6";
     Text[ chinese_simplified ] = "美工字体预留 6";
     Text[ greek ] = "Fontwork ��������. 6";
     Text[ korean ] = "폰트워크 예비 6";
     Text[ turkish ] = "Fontwork: Yedek 6";
-    Text[ catalan ] = "Fontwork reserva 6";
+    Text[ catalan ] = "Fontwork reservat per a 6";
     Text[ finnish ] = "Fonttity� varattu 6:lle";
+    Text[ thai ] = "สงวนFontworkไว้สำหรับ 6";
 };
 
 String SIP_XATTRSET_TEXT
@@ -12470,8 +12903,8 @@ String SIP_XATTRSET_TEXT
     Text [ ENGLISH ] = "Fontwork attributes" ;
     Text[ english_us ] = "Fontwork attributes";
     Text[ portuguese ] = "Atributos Fontwork";
-    Text[ russian ] = "�������� Fontwork";
-    Text[ dutch ] = "Fontwork attributen";
+    Text[ russian ] = "�������� �������";
+    Text[ dutch ] = "Fontwork-attributen";
     Text[ french ] = "Attributs Fontwork";
     Text[ spanish ] = "Atributos de Fontwork";
     Text[ italian ] = "Attributi Fontwork";
@@ -12483,14 +12916,15 @@ String SIP_XATTRSET_TEXT
     Text[ chinese_simplified ] = "美工字体属性";
     Text[ chinese_traditional ] = "美術字型屬性";
     Text[ arabic ] = "���� Fontwork";
-    Text[ dutch ] = "Fontwork attributen";
+    Text[ dutch ] = "Fontwork-attributen";
     Text[ chinese_simplified ] = "美工字体属性";
     Text[ greek ] = "��������� Fontwork";
     Text[ korean ] = "폰트워크 속성";
     Text[ turkish ] = "Fontwork �znitelikleri";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Atributos de Fontwork";
-    Text[ finnish ] = "Fonttity�n m��ritteet";
+    Text[ catalan ] = "Atributs del FontWork";
+    Text[ finnish ] = "Fonttity�m��ritteet";
+    Text[ thai ] = "คุณลักษณะFontwork ";
 };
 
 String SIP_SA_SHADOW
@@ -12515,10 +12949,11 @@ String SIP_SA_SHADOW
     Text[ dutch ] = "Schaduw";
     Text[ chinese_simplified ] = "阴影";
     Text[ greek ] = "����";
-    Text[ korean ] = "음영";
+    Text[ korean ] = "그림자";
     Text[ turkish ] = "G�lge";
-    Text[ catalan ] = "Sombra";
-    Text[ finnish ] = "Varjo ";
+    Text[ catalan ] = "Ombra";
+    Text[ finnish ] = "Varjo";
+    Text[ thai ] = "เงา";
 };
 
 String SIP_SA_SHADOWCOLOR
@@ -12543,11 +12978,12 @@ String SIP_SA_SHADOWCOLOR
     Text[ dutch ] = "Schaduwkleur";
     Text[ chinese_simplified ] = "阴影颜色";
     Text[ greek ] = "����� �����";
-    Text[ korean ] = "음영 색상";
+    Text[ korean ] = "그림자 색상";
     Text[ turkish ] = "G�lge rengi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Color de sombra";
+    Text[ catalan ] = "Color de l'ombra";
     Text[ finnish ] = "Varjon v�ri";
+    Text[ thai ] = "สีเงา";
 };
 
 String SIP_SA_SHADOWXDIST
@@ -12572,10 +13008,11 @@ String SIP_SA_SHADOWXDIST
     Text[ dutch ] = "Schaduwafstand X";
     Text[ chinese_simplified ] = "阴影间隔 X";
     Text[ greek ] = "�������� ����� X";
-    Text[ korean ] = "음영 간격 X";
+    Text[ korean ] = "그림자 간격 X";
     Text[ turkish ] = "G�lge aral��� X";
-    Text[ catalan ] = "Distancia de sombra X";
+    Text[ catalan ] = "Espaiat X de l'ombra";
     Text[ finnish ] = "Varjov�lit X";
+    Text[ thai ] = "ระยะห่างเงา X";
 };
 
 String SIP_SA_SHADOWYDIST
@@ -12600,10 +13037,11 @@ String SIP_SA_SHADOWYDIST
     Text[ dutch ] = "Schaduwafstand Y";
     Text[ chinese_simplified ] = "阴影间隔 Y";
     Text[ greek ] = "�������� ����� Y";
-    Text[ korean ] = "음영 간격 Y";
+    Text[ korean ] = "그림자 간격 Y";
     Text[ turkish ] = "G�lge aral��� Y";
-    Text[ catalan ] = "Distancia de sombra Y";
+    Text[ catalan ] = "Espaiat Y de l'ombra";
     Text[ finnish ] = "Varjov�lit Y";
+    Text[ thai ] = "ระยะห่างเงา Y";
 };
 
 String SIP_SA_SHADOWTRANSPARENCE
@@ -12628,10 +13066,11 @@ String SIP_SA_SHADOWTRANSPARENCE
     Text[ dutch ] = "Transparantie schaduw";
     Text[ chinese_simplified ] = "阴影透明";
     Text[ greek ] = "��������� �����";
-    Text[ korean ] = "투명 음영";
+    Text[ korean ] = "투명 그림자";
     Text[ turkish ] = "G�lge saydaml���";
-    Text[ catalan ] = "Transparencia de sombra";
+    Text[ catalan ] = "Transpar�ncia d'ombra";
     Text[ finnish ] = "Varjon l�pin�kyvyys";
+    Text[ thai ] = "ความโปร่งแสงของเงา";
 };
 
 String SIP_SA_SHADOW3D
@@ -12640,7 +13079,7 @@ String SIP_SA_SHADOW3D
     Text [ ENGLISH ] = "3D-Shadow" ;
     Text[ english_us ] = "3D shadow";
     Text[ portuguese ] = "Sombra 3D";
-    Text[ russian ] = "���� 3-�";
+    Text[ russian ] = "���������� ����";
     Text[ dutch ] = "3D-schaduw";
     Text[ french ] = "Ombre 3D";
     Text[ spanish ] = "Sombra 3D";
@@ -12656,11 +13095,12 @@ String SIP_SA_SHADOW3D
     Text[ dutch ] = "3D-schaduw";
     Text[ chinese_simplified ] = "3 维阴影";
     Text[ greek ] = "���� 3�";
-    Text[ korean ] = "3Ｄ－ 음영";
+    Text[ korean ] = "3Ｄ 그림자";
     Text[ turkish ] = "3B g�lge";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Sombra 3D";
+    Text[ catalan ] = "ombra 3D";
     Text[ finnish ] = "3D-varjo";
+    Text[ thai ] = "เงา3มิติ";
 };
 
 String SIP_SA_SHADOWPERSP
@@ -12671,7 +13111,7 @@ String SIP_SA_SHADOWPERSP
     Text[ portuguese ] = "Sombra em perspectiva";
     Text[ russian ] = "���� � �����������";
     Text[ dutch ] = "Perspectivische schaduw";
-    Text[ french ] = "Ombre perspective";
+    Text[ french ] = "Ombre en perspective";
     Text[ spanish ] = "Sombra en perspectiva";
     Text[ italian ] = "Ombra in prospettiva";
     Text[ danish ] = "Perspektivisk skygge";
@@ -12685,10 +13125,11 @@ String SIP_SA_SHADOWPERSP
     Text[ dutch ] = "Perspectivische schaduw";
     Text[ chinese_simplified ] = "透视阴影";
     Text[ greek ] = "��������� ����";
-    Text[ korean ] = "원근감있는 음영";
+    Text[ korean ] = "원근감있는 그림자";
     Text[ turkish ] = "Perspektifli g�lge";
-    Text[ catalan ] = "Sombra en perspectiva";
+    Text[ catalan ] = "Ombra en perspectiva";
     Text[ finnish ] = "Perspektiivivarjo";
+    Text[ thai ] = "ตำแหน่งการมองเงา";
 };
 
 String SIP_SA_SHADOWRESERVE1
@@ -12713,10 +13154,11 @@ String SIP_SA_SHADOWRESERVE1
     Text[ dutch ] = "Schaduwreserve 1";
     Text[ chinese_simplified ] = "阴影预留 1";
     Text[ greek ] = "���� ��������. 1";
-    Text[ korean ] = "음영 예비 1";
+    Text[ korean ] = "그림자 예비 1";
     Text[ turkish ] = "G�lge - Yedek 1";
-    Text[ catalan ] = "Sombra reserva 1";
+    Text[ catalan ] = "Ombra reservada per a 1";
     Text[ finnish ] = "Varjo varattu 1:lle";
+    Text[ thai ] = "สงวนการแรเงาไว้สำหรับ 1";
 };
 
 String SIP_SA_SHADOWRESERVE2
@@ -12741,10 +13183,11 @@ String SIP_SA_SHADOWRESERVE2
     Text[ dutch ] = "Schaduwreserve 2";
     Text[ chinese_simplified ] = "阴影预留 2";
     Text[ greek ] = "���� ��������. 2";
-    Text[ korean ] = "음영 예비 2";
+    Text[ korean ] = "그림자 예비 2";
     Text[ turkish ] = "G�lge - Yedek 2";
-    Text[ catalan ] = "Sombra reserva 2";
+    Text[ catalan ] = "Ombra reservada per a 2";
     Text[ finnish ] = "Varjo varattu 2:lle";
+    Text[ thai ] = "สงวนการแรเงาไว้สำหรับ 2";
 };
 
 String SIP_SA_SHADOWRESERVE3
@@ -12769,10 +13212,11 @@ String SIP_SA_SHADOWRESERVE3
     Text[ dutch ] = "Schaduwreserve 3";
     Text[ chinese_simplified ] = "阴影预留 3";
     Text[ greek ] = "���� ��������. 3";
-    Text[ korean ] = "음영 예비 3";
+    Text[ korean ] = "그림자 예비 3";
     Text[ turkish ] = "G�lge - Yedek 3";
-    Text[ catalan ] = "Sombra reserva 3";
+    Text[ catalan ] = "Ombra reservada per a 3";
     Text[ finnish ] = "Varjo varattu 3:lle";
+    Text[ thai ] = "สงวนการแรเงาไว้สำหรับ 3";
 };
 
 String SIP_SA_SHADOWRESERVE4
@@ -12797,10 +13241,11 @@ String SIP_SA_SHADOWRESERVE4
     Text[ dutch ] = "Schaduwreserve 4";
     Text[ chinese_simplified ] = "阴影预留 4";
     Text[ greek ] = "���� ��������. 4";
-    Text[ korean ] = "음영 예비 4";
+    Text[ korean ] = "그림자 예비 4";
     Text[ turkish ] = "G�lge - Yedek 4";
-    Text[ catalan ] = "Sombra reserva 4";
+    Text[ catalan ] = "Ombra reservada per a 4";
     Text[ finnish ] = "Varjo varattu 4:lle";
+    Text[ thai ] = "สงวนการแรเงาไว้สำหรับ 4";
 };
 
 String SIP_SA_SHADOWRESERVE5
@@ -12825,10 +13270,11 @@ String SIP_SA_SHADOWRESERVE5
     Text[ dutch ] = "Schaduwreserve 5";
     Text[ chinese_simplified ] = "阴影预留 5";
     Text[ greek ] = "���� ��������. 5";
-    Text[ korean ] = "음영 예비 5";
+    Text[ korean ] = "그림자 예비 5";
     Text[ turkish ] = "G�lge - Yedek 5";
-    Text[ catalan ] = "Sombra reserva 5";
+    Text[ catalan ] = "Ombra reservada per a 5";
     Text[ finnish ] = "Varjo varattu 5:lle";
+    Text[ thai ] = "สงวนการแรเงาไว้สำหรับ 5";
 };
 
 String SIP_SDRATTRSET_SHADOW
@@ -12853,10 +13299,11 @@ String SIP_SDRATTRSET_SHADOW
     Text[ dutch ] = "Schaduwattributen";
     Text[ chinese_simplified ] = "阴影属性";
     Text[ greek ] = "��������� �����";
-    Text[ korean ] = "음영 속성";
+    Text[ korean ] = "그림자 속성";
     Text[ turkish ] = "G�lge �znitelikleri";
-    Text[ catalan ] = "Atributos de sombra";
-    Text[ finnish ] = "Varjon ominaisuudet";
+    Text[ catalan ] = "Atributs de l'ombra";
+    Text[ finnish ] = "Varjon m��ritteet";
+    Text[ thai ] = "คุณลักษณะเงา";
 };
 
 String SIP_SA_CAPTIONTYPE
@@ -12881,10 +13328,11 @@ String SIP_SA_CAPTIONTYPE
     Text[ dutch ] = "Legendatype";
     Text[ chinese_simplified ] = "图例类型";
     Text[ greek ] = "����� �����������";
-    Text[ korean ] = "범례 형식";
+    Text[ korean ] = "범례 유형";
     Text[ turkish ] = "Belirtme �izgisi tipi";
-    Text[ catalan ] = "Tipo de leyenda";
+    Text[ catalan ] = "Tipus de llegenda";
     Text[ finnish ] = "Selitteen laji";
+    Text[ thai ] = "ชนิดคำอธิบายแผนภูมิ";
 };
 
 String SIP_SA_CAPTIONFIXEDANGLE
@@ -12911,8 +13359,9 @@ String SIP_SA_CAPTIONFIXEDANGLE
     Text[ greek ] = "������� ������ �����������";
     Text[ korean ] = "범례 각도 고정";
     Text[ turkish ] = "Sabit belirtme �izgisi a��s�";
-    Text[ catalan ] = "Fijaci�n �ngulo de leyenda";
+    Text[ catalan ] = "Angle de la llegenda fix";
     Text[ finnish ] = "Kiinte� selitteen kulma";
+    Text[ thai ] = "มุมคำอธิบายแผนภูมิคงที่";
 };
 
 String SIP_SA_CAPTIONANGLE
@@ -12939,8 +13388,9 @@ String SIP_SA_CAPTIONANGLE
     Text[ greek ] = "����� �����������";
     Text[ korean ] = "범례 각도";
     Text[ turkish ] = "Belirtme �izgisi a��s�";
-    Text[ catalan ] = "Angulo de leyenda";
+    Text[ catalan ] = "Angle de la llegenda";
     Text[ finnish ] = "Selitteen kulma";
+    Text[ thai ] = "มุมคำอธิบายแผนภูมิ";
 };
 
 String SIP_SA_CAPTIONGAP
@@ -12949,7 +13399,7 @@ String SIP_SA_CAPTIONGAP
     Text [ ENGLISH ] = "Distance of legend line" ;
     Text[ english_us ] = "Legend lines spacing";
     Text[ portuguese ] = "Dist�ncia da linha da legenda";
-    Text[ russian ] = "���������� ����� ������� �������";
+    Text[ russian ] = "��� ������ �������";
     Text[ dutch ] = "Legenda-lijnafstand";
     Text[ french ] = "�cart des lignes de l�gende";
     Text[ spanish ] = "Distancia l�nea de leyenda";
@@ -12965,10 +13415,11 @@ String SIP_SA_CAPTIONGAP
     Text[ dutch ] = "Legenda-lijnafstand";
     Text[ chinese_simplified ] = "图例线条间隔";
     Text[ greek ] = "�������� ������� �����������";
-    Text[ korean ] = "범례선 간격";
+    Text[ korean ] = "범례 줄 간격";
     Text[ turkish ] = "Belirtme �izgisi aral���";
-    Text[ catalan ] = "Distancia l�nea de leyenda";
+    Text[ catalan ] = "Dist�ncia l�nia de llegenda";
     Text[ finnish ] = "Selitteen rivitys";
+    Text[ thai ] = "ระยะห่างบรรทัดคำอธิบายแผนภูมิ";
 };
 
 String SIP_SA_CAPTIONESCDIR
@@ -12996,8 +13447,9 @@ String SIP_SA_CAPTIONESCDIR
     Text[ greek ] = "���������� ������ �����������";
     Text[ korean ] = "범례 끝내기 방향";
     Text[ turkish ] = "Belirtme �izgisi ��k�� y�n�";
-    Text[ catalan ] = "Direcci�n salida de leyenda";
+    Text[ catalan ] = "Direcci� de sortida de llegenda";
     Text[ finnish ] = "Selitteen lopun kohdistus";
+    Text[ thai ] = "คำอธิบายแผนภูมิออกจากการจัดตำแหน่ง";
 };
 
 String SIP_SA_CAPTIONESCISREL
@@ -13006,7 +13458,7 @@ String SIP_SA_CAPTIONESCISREL
     Text [ ENGLISH ] = "Reative exit of legend" ;
     Text[ english_us ] = "Relative exit legend";
     Text[ portuguese ] = "Sa�da relativa da legenda";
-    Text[ russian ] = "������������� ����� �������";
+    Text[ russian ] = "������������� ����� �� �������";
     Text[ dutch ] = "Relatief verdwijnen van legenda";
     Text[ french ] = "Sortie relative de la l�gende";
     Text[ spanish ] = "Salida relativa de leyenda";
@@ -13025,8 +13477,9 @@ String SIP_SA_CAPTIONESCISREL
     Text[ greek ] = "������� ������ �����������";
     Text[ korean ] = "범례 상대적 끝내기";
     Text[ turkish ] = "Belirtme �izgisi: G�receli ��k��";
-    Text[ catalan ] = "Salida relativa de leyenda";
+    Text[ catalan ] = "Llegenda relativa de la sortida";
     Text[ finnish ] = "Suhteellinen poistumaselite";
+    Text[ thai ] = "คำอธิบายแผนภูมิออกสัมพัทธ์";
 };
 
 String SIP_SA_CAPTIONESCREL
@@ -13035,7 +13488,7 @@ String SIP_SA_CAPTIONESCREL
     Text [ ENGLISH ] = "Reative exit of legend" ;
     Text[ english_us ] = "Relative exit legend";
     Text[ portuguese ] = "Sa�da relativa da legenda";
-    Text[ russian ] = "������������� ����� �������";
+    Text[ russian ] = "������������� ����� �� �������";
     Text[ dutch ] = "Relatief verdwijnen van legenda";
     Text[ french ] = "Sortie relative de la l�gende";
     Text[ spanish ] = "Salida relativa de leyenda";
@@ -13051,10 +13504,11 @@ String SIP_SA_CAPTIONESCREL
     Text[ dutch ] = "Relatief verdwijnen van legenda";
     Text[ chinese_simplified ] = "相对退出的图例";
     Text[ greek ] = "������� ������ �����������";
-    Text[ korean ] = "범례 상대적 끝내기";
+    Text[ korean ] = "범례 상대적 종료";
     Text[ turkish ] = "Belirtme �izgisi: G�receli ��k��";
-    Text[ catalan ] = "Salida relativa de leyenda";
+    Text[ catalan ] = "Llegenda relativa de la sortida";
     Text[ finnish ] = "Suhteellinen poistumaselite";
+    Text[ thai ] = "คำอธิบายแผนภูมิออกสัมพัทธ์";
 };
 
 String SIP_SA_CAPTIONESCABS
@@ -13063,7 +13517,7 @@ String SIP_SA_CAPTIONESCABS
     Text [ ENGLISH ] = "Absolute exit of legend" ;
     Text[ english_us ] = "Absolute exit of legend";
     Text[ portuguese ] = "Sa�da absoluta da legenda";
-    Text[ russian ] = "���������� ����� �������";
+    Text[ russian ] = "���������� ����� �� �������";
     Text[ dutch ] = "Absoluut verdwijnen van legenda";
     Text[ french ] = "Sortie absolue de la l�gende";
     Text[ spanish ] = "Salida absoluta de leyenda";
@@ -13081,8 +13535,9 @@ String SIP_SA_CAPTIONESCABS
     Text[ greek ] = "������� ������ �����������";
     Text[ korean ] = "범례 절대적 끝내기";
     Text[ turkish ] = "Belirtme �izgisi: Mutlak ��k��";
-    Text[ catalan ] = "Salida absoluta de leyenda";
+    Text[ catalan ] = "Sortida absoluta de la llegenda";
     Text[ finnish ] = "Absoluuttinen poistumaselite";
+    Text[ thai ] = "คำอธิบายแผนภูมิออกสัมบูรณ์";
 };
 
 String SIP_SA_CAPTIONLINELEN
@@ -13111,6 +13566,7 @@ String SIP_SA_CAPTIONLINELEN
     Text[ turkish ] = "Belirtme �izgisi uzunlu�u";
     Text[ catalan ] = "Longitud de l�nea de leyenda";
     Text[ finnish ] = "Selitteen rivipituus";
+    Text[ thai ] = "ความยาวของบรรทัดคำอธิบายแผนภูมิ";
 };
 
 String SIP_SA_CAPTIONFITLINELEN
@@ -13139,6 +13595,7 @@ String SIP_SA_CAPTIONFITLINELEN
     Text[ turkish ] = "Otomatik belirtme �izgisi uzunlu�u";
     Text[ catalan ] = "Longitud de l�nea de leyenda, autom�tico";
     Text[ finnish ] = "Seliterivien automaattinen pituus";
+    Text[ thai ] = "ความยาวอัตโนมัติของบรรทัดคำอธิบายแผนภูมิ";
 };
 
 String SIP_SA_CAPTIONRESERVE1
@@ -13147,7 +13604,7 @@ String SIP_SA_CAPTIONRESERVE1
     Text [ ENGLISH ] = "Legend reserved 1" ;
     Text[ english_us ] = "Legend reserved for 1";
     Text[ portuguese ] = "Legenda de reserva 1";
-    Text[ russian ] = "������� ������� 1";
+    Text[ russian ] = "����������������� ������� 1";
     Text[ dutch ] = "Legenda reserve 1";
     Text[ french ] = "R�serv� pour la l�gende 1";
     Text[ spanish ] = "Leyenda reserva 1";
@@ -13165,8 +13622,9 @@ String SIP_SA_CAPTIONRESERVE1
     Text[ greek ] = "�������� ��������. 1";
     Text[ korean ] = "범례 예비1";
     Text[ turkish ] = "Belirtme �izgisi - Yedek 1";
-    Text[ catalan ] = "Leyenda reserva 1";
+    Text[ catalan ] = "Llegenda reservada per a 1";
     Text[ finnish ] = "Selite varattu 1:lle";
+    Text[ thai ] = "สงวนคำอธิบายแผนภูมิไว้สำหรับ 1";
 };
 
 String SIP_SA_CAPTIONRESERVE2
@@ -13175,7 +13633,7 @@ String SIP_SA_CAPTIONRESERVE2
     Text [ ENGLISH ] = "Legend reserved 2" ;
     Text[ english_us ] = "Legend reserved for 2";
     Text[ portuguese ] = "Legenda de reserva 2";
-    Text[ russian ] = "������� ������� 2";
+    Text[ russian ] = "����������������� ������� 2";
     Text[ dutch ] = "Legenda reserve 2";
     Text[ french ] = "R�serv� pour la l�gende 2";
     Text[ spanish ] = "Leyenda reserva 2";
@@ -13193,8 +13651,9 @@ String SIP_SA_CAPTIONRESERVE2
     Text[ greek ] = "�������� ��������. 2";
     Text[ korean ] = "범례 예비2";
     Text[ turkish ] = "Belirtme �izgisi - Yedek 2";
-    Text[ catalan ] = "Leyenda reserva 2";
+    Text[ catalan ] = "Llegenda reservada per a 2";
     Text[ finnish ] = "Selite varattu 2:lle";
+    Text[ thai ] = "สงวนคำอธิบายแผนภูมิไว้สำหรับ 2";
 };
 
 String SIP_SA_CAPTIONRESERVE3
@@ -13203,7 +13662,7 @@ String SIP_SA_CAPTIONRESERVE3
     Text [ ENGLISH ] = "Legend reserved 3" ;
     Text[ english_us ] = "Legend reserved for 3";
     Text[ portuguese ] = "Legenda de reserva 3";
-    Text[ russian ] = "������� ������� 3";
+    Text[ russian ] = "����������������� ������� 3";
     Text[ dutch ] = "Legenda reserve 3";
     Text[ french ] = "R�serv� pour la l�gende 3";
     Text[ spanish ] = "Leyenda reserva 3";
@@ -13221,8 +13680,9 @@ String SIP_SA_CAPTIONRESERVE3
     Text[ greek ] = "�������� ��������. 3";
     Text[ korean ] = "범례 예비3";
     Text[ turkish ] = "Belirtme �izgisi - Yedek 3";
-    Text[ catalan ] = "Leyenda reserva 3";
+    Text[ catalan ] = "Llegenda reservada per a 3";
     Text[ finnish ] = "Selite varattu 3:lle";
+    Text[ thai ] = "สงวนคำอธิบายแผนภูมิไว้สำหรับ 3";
 };
 
 String SIP_SA_CAPTIONRESERVE4
@@ -13231,7 +13691,7 @@ String SIP_SA_CAPTIONRESERVE4
     Text [ ENGLISH ] = "Legend reserved 4" ;
     Text[ english_us ] = "Legend reserved for 4";
     Text[ portuguese ] = "Legenda de reserva 4";
-    Text[ russian ] = "������� ������� 4";
+    Text[ russian ] = "����������������� ������� 4";
     Text[ dutch ] = "Legenda reserve 4";
     Text[ french ] = "R�serv� pour la l�gende 4";
     Text[ spanish ] = "Leyenda reserva 4";
@@ -13249,8 +13709,9 @@ String SIP_SA_CAPTIONRESERVE4
     Text[ greek ] = "�������� ��������. 4";
     Text[ korean ] = "범례 예비4";
     Text[ turkish ] = "Belirtme �izgisi - Yedek 4";
-    Text[ catalan ] = "Leyenda reserva 4";
+    Text[ catalan ] = "Llegenda reservada per a 4";
     Text[ finnish ] = "Selite varattu 4:lle";
+    Text[ thai ] = "สงวนคำอธิบายแผนภูมิไว้สำหรับ 4";
 };
 
 String SIP_SA_CAPTIONRESERVE5
@@ -13259,7 +13720,7 @@ String SIP_SA_CAPTIONRESERVE5
     Text [ ENGLISH ] = "Legend reserved 5" ;
     Text[ english_us ] = "Legend reserved 5";
     Text[ portuguese ] = "Legenda de reserva 5";
-    Text[ russian ] = "������� ������� 5";
+    Text[ russian ] = "����������������� ������� 5";
     Text[ dutch ] = "Legenda reserve 5";
     Text[ french ] = "R�serv� pour la l�gende 5";
     Text[ spanish ] = "Leyenda reserva 5";
@@ -13277,8 +13738,9 @@ String SIP_SA_CAPTIONRESERVE5
     Text[ greek ] = "�������� ��������. 5";
     Text[ korean ] = "범례 예비5";
     Text[ turkish ] = "Belirtme �izgisi - Yedek 5";
-    Text[ catalan ] = "Leyenda reserva 5";
+    Text[ catalan ] = "Llegenda reservada 5";
     Text[ finnish ] = "Selite varattu 5:lle";
+    Text[ thai ] = "สงวนคำอธิบายแผนภูมิไว้สำหรับ 5";
 };
 
 String SIP_SDRATTRSET_CAPTION
@@ -13305,8 +13767,9 @@ String SIP_SDRATTRSET_CAPTION
     Text[ greek ] = "��������� �����������";
     Text[ korean ] = "범례 속성";
     Text[ turkish ] = "Belirtme �izgisi �znitelikleri";
-    Text[ catalan ] = "Atributos de leyenda";
+    Text[ catalan ] = "Atributs de la llegenda";
     Text[ finnish ] = "Selitteen m��ritteet";
+    Text[ thai ] = "คุณลักษณะคำอธิบายแผนภูมิ";
 };
 
 String SIP_SDRATTRSET_OUTLINER
@@ -13334,8 +13797,9 @@ String SIP_SDRATTRSET_OUTLINER
     Text[ korean ] = "텍스트 속성";
     Text[ turkish ] = "Metin �znitelikleri";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Atributos de texto";
-    Text[ finnish ] = "Tekstin ominaisuudet";
+    Text[ catalan ] = "Atributs del text";
+    Text[ finnish ] = "Tekstin m��ritteet";
+    Text[ thai ] = "คุณลักษณะข้อความ";
 };
 
 String SIP_SA_ECKENRADIUS
@@ -13344,7 +13808,7 @@ String SIP_SA_ECKENRADIUS
     Text [ ENGLISH ] = "Edge radius" ;
     Text[ english_us ] = "Corner radius";
     Text[ portuguese ] = "Raio do �ngulo";
-    Text[ russian ] = "������ ������������� ����";
+    Text[ russian ] = "������ ������������ ����";
     Text[ dutch ] = "Hoekradius";
     Text[ french ] = "Rayon d'angle";
     Text[ spanish ] = "Radio de �ngulo";
@@ -13362,8 +13826,9 @@ String SIP_SA_ECKENRADIUS
     Text[ greek ] = "������ ������";
     Text[ korean ] = "모서리 각도";
     Text[ turkish ] = "K��e �ap�";
-    Text[ catalan ] = "Radio de �ngulo";
+    Text[ catalan ] = "Radi de l'angle";
     Text[ finnish ] = "Kulmas�de";
+    Text[ thai ] = "รัศมีมุม";
 };
 
 String SIP_SA_TEXT_MINFRAMEHEIGHT
@@ -13388,10 +13853,11 @@ String SIP_SA_TEXT_MINFRAMEHEIGHT
     Text[ dutch ] = "Minimale kaderhoogte";
     Text[ chinese_simplified ] = "最小的框高";
     Text[ greek ] = "�������� ���� ��������";
-    Text[ korean ] = "최소 틀 높이";
+    Text[ korean ] = "최소 프레임 높이";
     Text[ turkish ] = "Asgari �er�eve y�ksekli�i";
-    Text[ catalan ] = "Altura de marco m�nima";
+    Text[ catalan ] = "Al�ada de marc m�nima";
     Text[ finnish ] = "Kehyskorkeus v�hint��n";
+    Text[ thai ] = "ความสูงกรอบที่น้อยที่สุด";
 };
 
 String SIP_SA_TEXT_AUTOGROWHEIGHT
@@ -13403,7 +13869,7 @@ String SIP_SA_TEXT_AUTOGROWHEIGHT
     Text[ russian ] = "���������� ������";
     Text[ dutch ] = "Automatische hoogte-instelling";
     Text[ french ] = "Adapter la hauteur au texte";
-    Text[ spanish ] = "Ajute de altura autom�tico";
+    Text[ spanish ] = "Ajute autom�tico de la altura ";
     Text[ italian ] = "Adattamento altezza automatico";
     Text[ danish ] = "Automatisk h�jdejustering";
     Text[ swedish ] = "Automatisk h�jdanpassning";
@@ -13418,8 +13884,9 @@ String SIP_SA_TEXT_AUTOGROWHEIGHT
     Text[ greek ] = "�������� ���������� ��� �����";
     Text[ korean ] = "높이 자동 맞춤";
     Text[ turkish ] = "Otomatik y�kseklik ayar�";
-    Text[ catalan ] = "Ajute de altura autom�tico";
+    Text[ catalan ] = "Ajust d'al�ada autom�tic";
     Text[ finnish ] = "Automaattinen korkeuden sovitus";
+    Text[ thai ] = "จัดความสูงพอดีอัตโนมัติ";
 };
 
 String SIP_SA_TEXT_FITTOSIZE
@@ -13431,7 +13898,7 @@ String SIP_SA_TEXT_FITTOSIZE
     Text[ russian ] = "��������� ����� �� �����";
     Text[ dutch ] = "Tekst aanpassen aan kader";
     Text[ french ] = "Adapter le texte au cadre";
-    Text[ spanish ] = "Ajustar texto al marco";
+    Text[ spanish ] = "Adaptar el texto al marco";
     Text[ italian ] = "Adatta il testo alla cornice";
     Text[ danish ] = "Tilpas tekst til ramme";
     Text[ swedish ] = "Anpassa texten till ramen";
@@ -13444,11 +13911,12 @@ String SIP_SA_TEXT_FITTOSIZE
     Text[ dutch ] = "Tekst aanpassen aan kader";
     Text[ chinese_simplified ] = "文字和框对齐";
     Text[ greek ] = "���������� �������� �� ���� �������";
-    Text[ korean ] = "텍스트를 틀에 맞춤";
+    Text[ korean ] = "텍스트를 프레임에 맞춤";
     Text[ turkish ] = "Metni �er�eveye s��d�r";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Ajustar texto al marco";
+    Text[ catalan ] = "Ajusta el text al marc";
     Text[ finnish ] = "Sovita teksti kehykseen";
+    Text[ thai ] = "จัดข้อความพอดีกรอบ";
 };
 
 String SIP_SA_TEXT_LEFTDIST
@@ -13458,7 +13926,7 @@ String SIP_SA_TEXT_LEFTDIST
     Text[ english_us ] = "Left text frame spacing";
     Text[ portuguese ] = "Dist�ncia esquerda � moldura de texto";
     Text[ russian ] = "�������� ����� ������ �����";
-    Text[ dutch ] = "Afstand tekst-kader, links";
+    Text[ dutch ] = "Afstand tekstkader, links";
     Text[ french ] = "�cart gauche du cadre texte";
     Text[ spanish ] = "Distancia izquierda al marco de texto";
     Text[ italian ] = "Distanza sinistra cornice testo";
@@ -13470,14 +13938,15 @@ String SIP_SA_TEXT_LEFTDIST
     Text[ chinese_simplified ] = "左边文字框间隔";
     Text[ chinese_traditional ] = "左文字方塊間隔";
     Text[ arabic ] = "������� ������ ����� ����";
-    Text[ dutch ] = "Afstand tekst-kader, links";
+    Text[ dutch ] = "Afstand tekstkader, links";
     Text[ chinese_simplified ] = "左边文字框间隔";
     Text[ greek ] = "�������� ��������� �������� ��������";
-    Text[ korean ] = "왼쪽 텍스트 틀 간격";
+    Text[ korean ] = "텍스트 프레임의 왼쪽 여백";
     Text[ turkish ] = "Sol metin �er�evesi aral���";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Distancia izquierda al marco de texto";
+    Text[ catalan ] = "Espaiat esquerre del marc del text";
     Text[ finnish ] = "Vasemman tekstikehyksen v�lit";
+    Text[ thai ] = "ระยะห่างกรอบข้อความด้านซ้าย";
 };
 
 String SIP_SA_TEXT_RIGHTDIST
@@ -13487,7 +13956,7 @@ String SIP_SA_TEXT_RIGHTDIST
     Text[ english_us ] = "Right text frame spacing";
     Text[ portuguese ] = "Dist�ncia esquerda � moldura de texto";
     Text[ russian ] = "�������� ����� ������ ������";
-    Text[ dutch ] = "Afstand tekst-kader, rechts";
+    Text[ dutch ] = "Afstand tekstkader, rechts";
     Text[ french ] = "�cart droit du cadre texte";
     Text[ spanish ] = "Distancia derecha al marco de texto";
     Text[ italian ] = "Distanza destra cornice testo";
@@ -13499,13 +13968,14 @@ String SIP_SA_TEXT_RIGHTDIST
     Text[ chinese_simplified ] = "右边文字框间隔";
     Text[ chinese_traditional ] = "右文字方塊間隔";
     Text[ arabic ] = "������� ������ ����� ����";
-    Text[ dutch ] = "Afstand tekst-kader, rechts";
+    Text[ dutch ] = "Afstand tekstkader, rechts";
     Text[ chinese_simplified ] = "右边文字框间隔";
     Text[ greek ] = "����� �������� �������� ��������";
-    Text[ korean ] = "오른쪽 텍스트 틀 간격";
+    Text[ korean ] = "텍스트 프레임의 오른쪽 여백";
     Text[ turkish ] = "Sa� metin �er�evesi aral���";
-    Text[ catalan ] = "Distancia derecha al marco de texto";
+    Text[ catalan ] = "Espaiat dret del marc del text";
     Text[ finnish ] = "Oikean tekstikehyksen v�lit";
+    Text[ thai ] = "ระยะห่างกรอบข้อความด้านขวา";
 };
 
 String SIP_SA_TEXT_UPPERDIST
@@ -13515,7 +13985,7 @@ String SIP_SA_TEXT_UPPERDIST
     Text[ english_us ] = "Upper text frame spacing";
     Text[ portuguese ] = "Dist�ncia superior � moldura de texto";
     Text[ russian ] = "�������� ����� ������ ������";
-    Text[ dutch ] = "Afstand tekst-kader, boven";
+    Text[ dutch ] = "Afstand tekstkader, boven";
     Text[ french ] = "�cart sup�rieur du cadre texte";
     Text[ spanish ] = "Distancia superior al marco de texto";
     Text[ italian ] = "Distanza superiore cornice testo";
@@ -13527,13 +13997,14 @@ String SIP_SA_TEXT_UPPERDIST
     Text[ chinese_simplified ] = "上边文字框间隔";
     Text[ chinese_traditional ] = "上文字方塊間隔";
     Text[ arabic ] = "������� ������ ����� ����";
-    Text[ dutch ] = "Afstand tekst-kader, boven";
+    Text[ dutch ] = "Afstand tekstkader, boven";
     Text[ chinese_simplified ] = "上边文字框间隔";
     Text[ greek ] = "��� ��������� �������� ��������";
-    Text[ korean ] = "위쪽 텍스트 틀 간격";
+    Text[ korean ] = "텍스트 프레임의 위쪽 여백";
     Text[ turkish ] = "�st metin �er�evesi aral���";
-    Text[ catalan ] = "Distancia superior al marco de texto";
+    Text[ catalan ] = "Espaiat superior del marc del text";
     Text[ finnish ] = "Ylemm�n tekstikehyksen v�lit";
+    Text[ thai ] = "ระยะห่างกรอบข้อความด้านบน";
 };
 
 String SIP_SA_TEXT_LOWERDIST
@@ -13543,7 +14014,7 @@ String SIP_SA_TEXT_LOWERDIST
     Text[ english_us ] = "Lower text frame spacing";
     Text[ portuguese ] = "Dist�ncia inferior � moldura de texto";
     Text[ russian ] = "�������� ����� ������ �����";
-    Text[ dutch ] = "Afstand tekst-kader, beneden";
+    Text[ dutch ] = "Afstand tekstkader, beneden";
     Text[ french ] = "�cart inf�rieur du cadre texte";
     Text[ spanish ] = "Distancia inferior al marco de texto";
     Text[ italian ] = "Distanza inferiore cornice testo";
@@ -13555,14 +14026,15 @@ String SIP_SA_TEXT_LOWERDIST
     Text[ chinese_simplified ] = "下边文字框间隔";
     Text[ chinese_traditional ] = "下文字方塊間隔";
     Text[ arabic ] = "������� ������ ����� ����";
-    Text[ dutch ] = "Afstand tekst-kader, beneden";
+    Text[ dutch ] = "Afstand tekstkader, beneden";
     Text[ chinese_simplified ] = "下边文字框间隔";
     Text[ greek ] = "�������� ���� �������� ��������";
-    Text[ korean ] = "아래쪽 텍스트 틀 간격";
+    Text[ korean ] = "텍스트 프레임의 아래쪽 여백";
     Text[ turkish ] = "Alt metin �er�evesi aral���";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Distancia inferior al marco de texto";
+    Text[ catalan ] = "Espaiat inferior del marc del text";
     Text[ finnish ] = "Alemman tekstikehyksen v�lit";
+    Text[ thai ] = "ระยะห่างกรอบข้อความด้านล่าง";
 };
 
 String SIP_SA_TEXT_VERTADJUST
@@ -13571,8 +14043,8 @@ String SIP_SA_TEXT_VERTADJUST
     Text [ ENGLISH ] = "Vertical text anchor" ;
     Text[ english_us ] = "Vertical text anchor";
     Text[ portuguese ] = "�ncora vertical do texto";
-    Text[ russian ] = "������������ �������� ������";
-    Text[ dutch ] = "Verticaal tekstanker";
+    Text[ russian ] = "������������ ����� ������";
+    Text[ dutch ] = "Verticale tekstverankering";
     Text[ french ] = "Ancrage vertical du texte";
     Text[ spanish ] = "Anclaje de texto, vertical";
     Text[ italian ] = "Ancoraggio verticale testo";
@@ -13584,14 +14056,15 @@ String SIP_SA_TEXT_VERTADJUST
     Text[ chinese_simplified ] = "垂直方向文字锁定";
     Text[ chinese_traditional ] = "垂直方向文字鎖定";
     Text[ arabic ] = "����� ���� ������";
-    Text[ dutch ] = "Verticaal tekstanker";
+    Text[ dutch ] = "Verticale tekstverankering";
     Text[ chinese_simplified ] = "垂直方向文字锁定";
     Text[ greek ] = "���������� �������� ��������";
-    Text[ korean ] = "수직 방향 텍스트 고정";
+    Text[ korean ] = "수직 텍스트 기준 위치";
     Text[ turkish ] = "Dikey metin sabitleme";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Anclaje de texto, vertical";
+    Text[ catalan ] = "Ancoratge de text, vertical";
     Text[ finnish ] = "Pystytason tekstiankkuri";
+    Text[ thai ] = "สมอข้อความแนวตั้ง";
 };
 
 String SIP_SA_TEXT_MAXFRAMEHEIGHT
@@ -13616,10 +14089,11 @@ String SIP_SA_TEXT_MAXFRAMEHEIGHT
     Text[ dutch ] = "Maximale kaderhoogte";
     Text[ chinese_simplified ] = "最大的框高";
     Text[ greek ] = "������� ���� ��������";
-    Text[ korean ] = "최대 틀 높이";
+    Text[ korean ] = "최대 프레임 높이";
     Text[ turkish ] = "Azami �er�eve y�ksekli�i";
-    Text[ catalan ] = "Altura de marco m�xima";
+    Text[ catalan ] = "Al�ada de marc m�xima";
     Text[ finnish ] = "Kehyskorkeus enint��n";
+    Text[ thai ] = "ความสูงกรอบที่มากที่สุด";
 };
 
 String SIP_SA_TEXT_MINFRAMEWIDTH
@@ -13644,10 +14118,11 @@ String SIP_SA_TEXT_MINFRAMEWIDTH
     Text[ dutch ] = "Minimale kaderbreedte";
     Text[ chinese_simplified ] = "最小的框宽";
     Text[ greek ] = "�������� ������ ��������";
-    Text[ korean ] = "최소 틀 너비";
+    Text[ korean ] = "최소 프레임 너비";
     Text[ turkish ] = "Asgari �er�eve geni�li�i";
-    Text[ catalan ] = "Ancho m�nimo de marco";
+    Text[ catalan ] = "Amplada m�nima de marc";
     Text[ finnish ] = "Kehysleveys v�hint��n";
+    Text[ thai ] = "ความกว้างกรอบที่น้อยที่สุด";
 };
 
 String SIP_SA_TEXT_MAXFRAMEWIDTH
@@ -13672,10 +14147,11 @@ String SIP_SA_TEXT_MAXFRAMEWIDTH
     Text[ dutch ] = "Maximale kaderbreedte";
     Text[ chinese_simplified ] = "最大的框宽";
     Text[ greek ] = "������� ������ ��������";
-    Text[ korean ] = "최대 틀 너비";
+    Text[ korean ] = "최대 프레임 너비";
     Text[ turkish ] = "Azami �er�eve geni�li�i";
-    Text[ catalan ] = "Ancho m�ximo de marco";
+    Text[ catalan ] = "Amplada m�xima de marc";
     Text[ finnish ] = "Kehysleveys enint��n";
+    Text[ thai ] = "ความกว้างกรอบที่มากที่สุด";
 };
 
 String SIP_SA_TEXT_AUTOGROWWIDTH
@@ -13687,7 +14163,7 @@ String SIP_SA_TEXT_AUTOGROWWIDTH
     Text[ russian ] = "���������� ������";
     Text[ dutch ] = "Automatische breedte-instelling";
     Text[ french ] = "Adapter la largeur au texte";
-    Text[ spanish ] = "Ajuste autom�tico de ancho";
+    Text[ spanish ] = "Ajuste autom�tico del ancho";
     Text[ italian ] = "Adattamento automatico larghezza";
     Text[ danish ] = "Atomatisk breddejustering";
     Text[ swedish ] = "Automatisk breddanpassning";
@@ -13702,8 +14178,9 @@ String SIP_SA_TEXT_AUTOGROWWIDTH
     Text[ greek ] = "�������� ���������� �������";
     Text[ korean ] = "너비 자동 맞춤";
     Text[ turkish ] = "Otomatik geni�lik ayar�";
-    Text[ catalan ] = "Ajuste autom�tico de ancho";
+    Text[ catalan ] = "Ajust autom�tico d'amplada";
     Text[ finnish ] = "Automaattinen leveyden sovitus";
+    Text[ thai ] = "จัดความกว้างพอดีอัตโนมัติ";
 };
 
 String SIP_SA_TEXT_HORZADJUST
@@ -13712,8 +14189,8 @@ String SIP_SA_TEXT_HORZADJUST
     Text [ ENGLISH ] = "Horizontal text anchor" ;
     Text[ english_us ] = "Horizontal text anchor";
     Text[ portuguese ] = "�ncora horizontal do texto";
-    Text[ russian ] = "�������������� �������� ������";
-    Text[ dutch ] = "Horizontaal tekstanker";
+    Text[ russian ] = "�������������� ����� ������";
+    Text[ dutch ] = "Horizontale tekstverankering";
     Text[ french ] = "Ancrage horizontal du texte";
     Text[ spanish ] = "Anclaje horizontal de texto";
     Text[ italian ] = "Ancoraggio testo orizzontale";
@@ -13725,14 +14202,15 @@ String SIP_SA_TEXT_HORZADJUST
     Text[ chinese_simplified ] = "水平方向文字锁定";
     Text[ chinese_traditional ] = "水平方向文字鎖定";
     Text[ arabic ] = "����� ���� ������";
-    Text[ dutch ] = "Horizontaal tekstanker";
+    Text[ dutch ] = "Horizontale tekstverankering";
     Text[ chinese_simplified ] = "水平方向文字锁定";
     Text[ greek ] = "��������� �������� ��������";
-    Text[ korean ] = "수평 방향 텍스트 고정";
+    Text[ korean ] = "수평으로 텍스트 기준 위치";
     Text[ turkish ] = "Yatay metin sabitleme";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Anclaje horizontal de texto";
+    Text[ catalan ] = "Ancoratge horitzontal de text";
     Text[ finnish ] = "Vaakatason tekstiankkuri";
+    Text[ thai ] = "สมอข้อความแนวนอน";
 };
 
 String SIP_SA_TEXT_ANIKIND
@@ -13759,8 +14237,9 @@ String SIP_SA_TEXT_ANIKIND
     Text[ greek ] = "��������� �������";
     Text[ korean ] = "티커";
     Text[ turkish ] = "Hareketli yaz�";
-    Text[ catalan ] = "Animaci�n de texto";
-    Text[ finnish ] = "Ajanotto";
+    Text[ catalan ] = "Teletip";
+    Text[ finnish ] = "Vieriv� teksti";
+    Text[ thai ] = "อุปกรณ์ติดต่อ";
 };
 
 String SIP_SA_TEXT_ANIDIRECTION
@@ -13787,8 +14266,9 @@ String SIP_SA_TEXT_ANIDIRECTION
     Text[ greek ] = "���������� ���������� ��������";
     Text[ korean ] = "티커 방향";
     Text[ turkish ] = "Hareketli yaz� y�n�";
-    Text[ catalan ] = "Direcci�n de la animaci�n de texto";
-    Text[ finnish ] = "Ajanoton suunta";
+    Text[ catalan ] = "Direcci� de l'animaci� de text";
+    Text[ finnish ] = "Vieriv�n tekstin suunta";
+    Text[ thai ] = "ทิศทางอุปกรณ์ติดต่อ";
 };
 
 String SIP_SA_TEXT_ANISTARTINSIDE
@@ -13815,8 +14295,9 @@ String SIP_SA_TEXT_ANISTARTINSIDE
     Text[ greek ] = "�������� ���������� �������� ���������";
     Text[ korean ] = "티커 시작 범위";
     Text[ turkish ] = "Hareketli yaz� ba�lang�c�:";
-    Text[ catalan ] = "Inicio de la animaci�n en";
-    Text[ finnish ] = "Ajanoton k�ynnistys sis�lt�";
+    Text[ catalan ] = "Inici del teletip dins de";
+    Text[ finnish ] = "Vieriv�n tekstin k�ynnistys sis�lt�";
+    Text[ thai ] = "อุปกรณ์ติดต่อเริ่มด้านใน";
 };
 
 String SIP_SA_TEXT_ANISTOPINSIDE
@@ -13844,8 +14325,9 @@ String SIP_SA_TEXT_ANISTOPINSIDE
     Text[ korean ] = "티커 정지 범위";
     Text[ turkish ] = "Hareketli yaz� dura��:";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Parada de animaci�n en";
-    Text[ finnish ] = "Ajanoton sammutus sis�lt�";
+    Text[ catalan ] = "Aturada del teletip dins de";
+    Text[ finnish ] = "Vieriv�n tekstin pys�ytys sis�ll�";
+    Text[ thai ] = "อุปกรณ์ติดต่อหยุดด้านใน";
 };
 
 String SIP_SA_TEXT_ANICOUNT
@@ -13870,10 +14352,11 @@ String SIP_SA_TEXT_ANICOUNT
     Text[ dutch ] = "Snelheid tekstanimatie";
     Text[ chinese_simplified ] = "活动标题的数目";
     Text[ greek ] = "������� ����������� ���������� ��������";
-    Text[ korean ] = "순환 문자  수";
+    Text[ korean ] = "순환되는 티커 수";
     Text[ turkish ] = "Hareketli yaz� hareket say�s�";
-    Text[ catalan ] = "Cantidad de animaciones";
-    Text[ finnish ] = "Ajanottojen m��r�";
+    Text[ catalan ] = "Nombre d'execucions del teletip";
+    Text[ finnish ] = "Vieriv�n tekstin suorituskertojen m��r�";
+    Text[ thai ] = "จำนวนอุปกรณ์ติดต่อที่ช้งาน";
 };
 
 String SIP_SA_TEXT_ANIDELAY
@@ -13883,7 +14366,7 @@ String SIP_SA_TEXT_ANIDELAY
     Text[ english_us ] = "Speed of ticker";
     Text[ portuguese ] = "Cad�ncia da anima��o";
     Text[ russian ] = "�������� ������� ������";
-    Text[ dutch ] = "Tijdsinsteloing tekstanimatie";
+    Text[ dutch ] = "Tijdsinstelling tekstanimatie";
     Text[ french ] = "Cadence de d�filement";
     Text[ spanish ] = "Incremento de animaci�n";
     Text[ italian ] = "Velocit� scritta scorrevole";
@@ -13895,13 +14378,14 @@ String SIP_SA_TEXT_ANIDELAY
     Text[ chinese_simplified ] = "活动标题的速度";
     Text[ chinese_traditional ] = "移動文字的速度";
     Text[ arabic ] = "���� ������� ��������";
-    Text[ dutch ] = "Tijdsinsteloing tekstanimatie";
+    Text[ dutch ] = "Tijdsinstelling tekstanimatie";
     Text[ chinese_simplified ] = "活动标题的速度";
     Text[ greek ] = "������ ���������� ��������";
     Text[ korean ] = "티커 속도";
     Text[ turkish ] = "Hareketli yaz� h�z�";
-    Text[ catalan ] = "Incremento de animaci�n";
-    Text[ finnish ] = "Ajanoton nopeus";
+    Text[ catalan ] = "Velocitat del teletip";
+    Text[ finnish ] = "Vieriv�n tekstin nopeus";
+    Text[ thai ] = "ความเร็วของอุปกรณ์ติดต่อ";
 };
 
 String SIP_SA_TEXT_ANIAMOUNT
@@ -13928,8 +14412,9 @@ String SIP_SA_TEXT_ANIAMOUNT
     Text[ greek ] = "���� ���������� ��������";
     Text[ korean ] = "티커 증가폭";
     Text[ turkish ] = "Hareketli yaz� aral���";
-    Text[ catalan ] = "Retardo de la animaci�n";
-    Text[ finnish ] = "Ajanoton vaihekoko";
+    Text[ catalan ] = "Mida del pas de teletip";
+    Text[ finnish ] = "Vieriv�n tekstin askelkoko";
+    Text[ thai ] = "ขนาดขั้นของอุปกรณ์ติดต่อ";
 };
 
 String SIP_SA_TEXT_CONTOURFRAME
@@ -13938,7 +14423,7 @@ String SIP_SA_TEXT_CONTOURFRAME
     Text [ ENGLISH ] = "Outline" ;
     Text[ english_us ] = "Outline text flow";
     Text[ portuguese ] = "Fluxo texto de contorno";
-    Text[ russian ] = "������";
+    Text[ russian ] = "������ ������";
     Text[ dutch ] = "Animatie contourtekst";
     Text[ french ] = "Contours des encha�nements";
     Text[ spanish ] = "Flujo de texto de contorno";
@@ -13956,8 +14441,9 @@ String SIP_SA_TEXT_CONTOURFRAME
     Text[ greek ] = "��� �������� �������������";
     Text[ korean ] = "윤곽 텍스트 흐름";
     Text[ turkish ] = "Konturlu metin ak���";
-    Text[ catalan ] = "Flujo de texto de contorno";
+    Text[ catalan ] = "Flux de text del contorn";
     Text[ finnish ] = "J�sennyksen rivitys";
+    Text[ thai ] = "เค้าร่างการไหลของข้อความ";
 };
 
 String SIP_SA_AUTOSHAPE_ADJUSTMENT
@@ -13970,9 +14456,9 @@ String SIP_SA_AUTOSHAPE_ADJUSTMENT
     Text[ greek ] = "������� ����������";
     Text[ dutch ] = "AutoVormen justeren";
     Text[ french ] = "Cadrage des formes automatiques";
-    Text[ spanish ] = "Ajuste de autoformas";
+    Text[ spanish ] = "Ajuste de formas autom�ticas";
     Text[ italian ] = "Regolazione autoshape";
-    Text[ danish ] = "SvDraw Autoshape Adjustment";
+    Text[ danish ] = "Autoformater justering";
     Text[ swedish ] = "Justering av autoformer";
     Text[ polish ] = "Justowanie form automatycznych";
     Text[ portuguese_brazilian ] = "SvDraw Autoshape Adjustment";
@@ -13982,8 +14468,9 @@ String SIP_SA_AUTOSHAPE_ADJUSTMENT
     Text[ chinese_traditional ] = "形狀自動調適";
     Text[ turkish ] = "SvDraw Autoshape Adjustment";
     Text[ arabic ] = "��� ������� ���������";
-    Text[ catalan ] = "Ajuste de autoformas";
+    Text[ catalan ] = "Ajust d'autoformes";
     Text[ finnish ] = "Automaattinen muutosten muotoilu";
+    Text[ thai ] = "ปรับรูปร่างอัตโนมัติ";
 };
 
 String SIP_SA_XMLATTRIBUTES
@@ -13997,9 +14484,9 @@ String SIP_SA_XMLATTRIBUTES
     Text[ dutch ] = "Door gebruiker gedefinieerde attributen";
     Text[ french ] = "Attributs utilisateur";
     Text[ spanish ] = "Atributos definidos por el usuario";
-    Text[ finnish ] = "User definied Attributes";
+    Text[ finnish ] = "K�ytt�j�n m��ritteet";
     Text[ italian ] = "Attributi personalizzati";
-    Text[ danish ] = "User definied Attributes";
+    Text[ danish ] = "Brugerdefinerede attributter";
     Text[ swedish ] = "Anv�ndardefinierade attribut";
     Text[ polish ] = "Atrybuty indywidualne";
     Text[ portuguese_brazilian ] = "User definied Attributes";
@@ -14009,7 +14496,8 @@ String SIP_SA_XMLATTRIBUTES
     Text[ chinese_traditional ] = "自訂的屬性";
     Text[ turkish ] = "User definied Attributes";
     Text[ arabic ] = "User definied Attributes";
-    Text[ catalan ] = "User definied Attributes";
+    Text[ catalan ] = "Atributs definits per l'usuari";
+    Text[ thai ] = "ผู้ใช้กำหนดคุณลักษณะเอง";
 };
 
 String SIP_SA_RESERVE15
@@ -14036,8 +14524,9 @@ String SIP_SA_RESERVE15
     Text[ greek ] = "SvDraw ��������. 15";
     Text[ korean ] = "SvDraw 예비 15";
     Text[ turkish ] = "SvDraw - Yedek 15";
-    Text[ catalan ] = "SvDraw reserva 15";
+    Text[ catalan ] = "SvDraw reservat per a 15";
     Text[ finnish ] = "SvDraw varattu 15:lle";
+    Text[ thai ] = "สงวน SvDraw ไว้สำหรับ  15";
 };
 
 String SIP_SA_RESERVE16
@@ -14064,8 +14553,9 @@ String SIP_SA_RESERVE16
     Text[ greek ] = "SvDraw ��������. 16";
     Text[ korean ] = "SvDraw 예비 16";
     Text[ turkish ] = "SvDraw - Yedek 16";
-    Text[ catalan ] = "SvDraw reserva 16";
+    Text[ catalan ] = "SvDraw reservat per a 16";
     Text[ finnish ] = "SvDraw varattu 16:lle";
+    Text[ thai ] = "สงวน SvDraw ไว้สำหรับ  16";
 };
 
 String SIP_SA_RESERVE17
@@ -14092,8 +14582,9 @@ String SIP_SA_RESERVE17
     Text[ greek ] = "SvDraw ��������. 17";
     Text[ korean ] = "SvDraw 예비 17";
     Text[ turkish ] = "SvDraw - Yedek 17";
-    Text[ catalan ] = "SvDraw reserva 17";
+    Text[ catalan ] = "SvDraw reservat per a 17";
     Text[ finnish ] = "SvDraw varattu 17:lle";
+    Text[ thai ] = "สงวน SvDraw ไว้สำหรับ 17";
 };
 
 String SIP_SA_RESERVE18
@@ -14120,8 +14611,9 @@ String SIP_SA_RESERVE18
     Text[ greek ] = "SvDraw ��������. 18";
     Text[ korean ] = "SvDraw 예비 18";
     Text[ turkish ] = "SvDraw - Yedek 18";
-    Text[ catalan ] = "SvDraw reserva 18";
+    Text[ catalan ] = "SvDraw reservat per a 18";
     Text[ finnish ] = "SvDraw varattu 18:lle";
+    Text[ thai ] = "สงวน SvDraw ไว้สำหรับ 18";
 };
 
 String SIP_SA_RESERVE19
@@ -14148,8 +14640,9 @@ String SIP_SA_RESERVE19
     Text[ greek ] = "SvDraw ��������. 19";
     Text[ korean ] = "SvDraw 예비 19";
     Text[ turkish ] = "SvDraw - Yedek 19";
-    Text[ catalan ] = "SvDraw reserva 19";
+    Text[ catalan ] = "SvDraw reservat per a 19";
     Text[ finnish ] = "SvDraw varattu 19:lle";
+    Text[ thai ] = "สงวน SvDraw ไว้สำหรับ 19";
 };
 
 String SIP_SDRATTRSET_MISC
@@ -14160,7 +14653,7 @@ String SIP_SDRATTRSET_MISC
     Text[ portuguese ] = "Diversos atributos";
     Text[ russian ] = "��������� ��������";
     Text[ dutch ] = "Diverse attributen";
-    Text[ french ] = "Divers attributs";
+    Text[ french ] = "Attributs divers";
     Text[ spanish ] = "Diversos atributos";
     Text[ italian ] = "Attributi vari";
     Text[ danish ] = "Diverse attributter";
@@ -14176,8 +14669,9 @@ String SIP_SDRATTRSET_MISC
     Text[ greek ] = "�������� ���������";
     Text[ korean ] = "다양한 속성";
     Text[ turkish ] = "�e�itli �znitelikler";
-    Text[ catalan ] = "Diversos atributos";
-    Text[ finnish ] = "Useita ominaisuuksia";
+    Text[ catalan ] = "Atributs diversos";
+    Text[ finnish ] = "Eri m��ritteit�";
+    Text[ thai ] = "คุณลักษณะต่าง ๆ";
 };
 
 String SIP_SA_EDGEKIND
@@ -14204,8 +14698,9 @@ String SIP_SA_EDGEKIND
     Text[ greek ] = "����� ��������";
     Text[ korean ] = "연결선 유형";
     Text[ turkish ] = "Ba�lay�c� tipi";
-    Text[ catalan ] = "Tipo de conector";
-    Text[ finnish ] = "Liittimen tyyppi";
+    Text[ catalan ] = "Tipus de connector";
+    Text[ finnish ] = "Yhdysviivan tyyppi";
+    Text[ thai ] = "ชนิดตัวเชื่อมต่อ";
 };
 
 String SIP_SA_EDGENODE1HORZDIST
@@ -14232,8 +14727,9 @@ String SIP_SA_EDGENODE1HORZDIST
     Text[ greek ] = "����. �������� ������������ 1";
     Text[ korean ] = "수평 간격 개체 1";
     Text[ turkish ] = "Yatay uzakl�k Nesne 1";
-    Text[ catalan ] = "Distancia horz. objeto 1";
+    Text[ catalan ] = "Espaiat horitz. de l'objecte 1";
     Text[ finnish ] = "Vaakav�liobjekti 1";
+    Text[ thai ] = "ระยะห่างวัตถุแนวนอน 1";
 };
 
 String SIP_SA_EDGENODE1VERTDIST
@@ -14260,8 +14756,9 @@ String SIP_SA_EDGENODE1VERTDIST
     Text[ greek ] = "�����. �������� ������������ 1";
     Text[ korean ] = "수직 간격 개체 1";
     Text[ turkish ] = "Dikey uzakl�k Nesne 1";
-    Text[ catalan ] = "Distancia vert. objeto 1";
+    Text[ catalan ] = "Espaiat vert. de l'objecte 1";
     Text[ finnish ] = "Pystyv�liobjekti 1";
+    Text[ thai ] = "ระยะห่างวัตถุแนวตั้ง 1";
 };
 
 String SIP_SA_EDGENODE2HORZDIST
@@ -14289,8 +14786,9 @@ String SIP_SA_EDGENODE2HORZDIST
     Text[ korean ] = "수평 간격 개체 2";
     Text[ turkish ] = "Yatay uzakl�k Nesne 2";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Distancia hor. objeto 2";
+    Text[ catalan ] = "Espaiat horitz. de l'objecte 2";
     Text[ finnish ] = "Vaakav�liobjekti 2";
+    Text[ thai ] = "ระยะห่างวัตถุแนวนอน 2";
 };
 
 String SIP_SA_EDGENODE2VERTDIST
@@ -14317,8 +14815,9 @@ String SIP_SA_EDGENODE2VERTDIST
     Text[ greek ] = "�����. �������� ������������ 2";
     Text[ korean ] = "수직 간격 개체 2";
     Text[ turkish ] = "Dikey uzakl�k Nesne 2";
-    Text[ catalan ] = "Distancia ver. objeto 2";
+    Text[ catalan ] = "Espaiat vert. de l'objecte 2";
     Text[ finnish ] = "Pystyv�liobjekti 2";
+    Text[ thai ] = "ระยะห่างวัตถุแนวตั้ง 2";
 };
 
 String SIP_SA_EDGENODE1GLUEDIST
@@ -14327,8 +14826,8 @@ String SIP_SA_EDGENODE1GLUEDIST
     Text [ ENGLISH ] = "Glue distance object 1" ;
     Text[ english_us ] = "Glue spacing object 1";
     Text[ portuguese ] = "Dist�ncia de ades�o - objecto 1";
-    Text[ russian ] = "�������� ����� ������� ���������� ������� 1";
-    Text[ dutch ] = "Kleefafstand object 1";
+    Text[ russian ] = "�������� ���������� ����� ������� 1";
+    Text[ dutch ] = "Plakafstand object 1";
     Text[ french ] = "�cart d'adh�sion objet 1";
     Text[ spanish ] = "Distancia adhesi�n objeto 1";
     Text[ italian ] = "Distanza incollaggio oggetto 1";
@@ -14340,13 +14839,14 @@ String SIP_SA_EDGENODE1GLUEDIST
     Text[ chinese_simplified ] = "接贴间隔对象 1";
     Text[ chinese_traditional ] = "接點間隔物件 1";
     Text[ arabic ] = "����� ����� � ������ 1";
-    Text[ dutch ] = "Kleefafstand object 1";
+    Text[ dutch ] = "Plakafstand object 1";
     Text[ chinese_simplified ] = "接贴间隔对象 1";
     Text[ greek ] = "�������� �������� ������������ 1";
     Text[ korean ] = "접착 간격 개체 1";
     Text[ turkish ] = "Yap��t�rma aral���: Nesne 1";
-    Text[ catalan ] = "Distancia adhesi�n objeto 1";
+    Text[ catalan ] = "Espaiat de cola de l'objecte 1";
     Text[ finnish ] = "Liimav�liobjekti 1";
+    Text[ thai ] = "ระยะห่างวัตถุกาว 1";
 };
 
 String SIP_SA_EDGENODE2GLUEDIST
@@ -14355,8 +14855,8 @@ String SIP_SA_EDGENODE2GLUEDIST
     Text [ ENGLISH ] = "Glue distance object 2" ;
     Text[ english_us ] = "Glue spacing object 2";
     Text[ portuguese ] = "Dist�ncia de ades�o - objecto 2";
-    Text[ russian ] = "�������� ����� ������� ���������� ������� 2";
-    Text[ dutch ] = "Kleefafstand object 2";
+    Text[ russian ] = "�������� ���������� ����� ������� 2";
+    Text[ dutch ] = "Plakafstand object 2";
     Text[ french ] = "�cart d'adh�sion objet 2";
     Text[ spanish ] = "Distancia adhesi�n objeto 2";
     Text[ italian ] = "Distanza incollaggio oggetto 2";
@@ -14368,13 +14868,14 @@ String SIP_SA_EDGENODE2GLUEDIST
     Text[ chinese_simplified ] = "接贴间隔对象 2";
     Text[ chinese_traditional ] = "接點間隔物件 2";
     Text[ arabic ] = "����� ����� � ������ 2";
-    Text[ dutch ] = "Kleefafstand object 2";
+    Text[ dutch ] = "Plakafstand object 2";
     Text[ chinese_simplified ] = "接贴间隔对象 2";
     Text[ greek ] = "�������� �������� ������������ 2";
     Text[ korean ] = "접착 간격 개체 2";
     Text[ turkish ] = "Yap��t�rma aral���: Nesne 2";
-    Text[ catalan ] = "Distancia adhesi�n objeto 2";
+    Text[ catalan ] = "Espaiat de cola de l'objecte 2";
     Text[ finnish ] = "Liimav�liobjekti 2";
+    Text[ thai ] = "ระยะห่างวัตถุกาว 2";
 };
 
 String SIP_SA_EDGELINEDELTAANZ
@@ -14401,8 +14902,9 @@ String SIP_SA_EDGELINEDELTAANZ
     Text[ greek ] = "������� ������� ��� �������������";
     Text[ korean ] = "이동 가능한 선의 개수";
     Text[ turkish ] = "Ta��nabilir �izgi say�s�";
-    Text[ catalan ] = "N�m. l�neas desplazables";
+    Text[ catalan ] = "N�m. l�nies despla�ables";
     Text[ finnish ] = "Siirrett�vien rivien m��r�";
+    Text[ thai ] = "จำนวนบรรทัดที่สามารถย้ายได้";
 };
 
 String SIP_SA_EDGELINE1DELTA
@@ -14411,7 +14913,7 @@ String SIP_SA_EDGELINE1DELTA
     Text [ ENGLISH ] = "Offset line 1" ;
     Text[ english_us ] = "Offset line 1";
     Text[ portuguese ] = "Linha de offset 1";
-    Text[ russian ] = "������������ ����� 1";
+    Text[ russian ] = "����� �������� 1";
     Text[ dutch ] = "Lijnvulling 1";
     Text[ french ] = "Ligne de d�calage 1";
     Text[ spanish ] = "Desplazamiento l�nea 1";
@@ -14429,8 +14931,9 @@ String SIP_SA_EDGELINE1DELTA
     Text[ greek ] = "������ ����������� 1";
     Text[ korean ] = "오프셋 선 1";
     Text[ turkish ] = "Kayma �izgisi 1";
-    Text[ catalan ] = "Desplazamiento l�nea 1";
+    Text[ catalan ] = "Despla�ament l�nia 1";
     Text[ finnish ] = "Siirtym�rivi 1";
+    Text[ thai ] = "เส้นออฟเซต 1";
 };
 
 String SIP_SA_EDGELINE2DELTA
@@ -14439,7 +14942,7 @@ String SIP_SA_EDGELINE2DELTA
     Text [ ENGLISH ] = "Offset line 2" ;
     Text[ english_us ] = "Offset line 2";
     Text[ portuguese ] = "Linha de offset 2";
-    Text[ russian ] = "������������ ����� 2";
+    Text[ russian ] = "����� �������� 2";
     Text[ dutch ] = "Lijnvulling 2";
     Text[ french ] = "Ligne de d�calage 2";
     Text[ spanish ] = "Desplazamiento l�nea 2";
@@ -14457,8 +14960,9 @@ String SIP_SA_EDGELINE2DELTA
     Text[ greek ] = "������ ����������� 2";
     Text[ korean ] = "오프셋 선 2";
     Text[ turkish ] = "Kayma �izgisi 2";
-    Text[ catalan ] = "Desplazamiento l�nea 2";
+    Text[ catalan ] = "Despla�amient l�nia 2";
     Text[ finnish ] = "Siirtym�rivi 2";
+    Text[ thai ] = "เส้นออฟเซต 2";
 };
 
 String SIP_SA_EDGELINE3DELTA
@@ -14467,7 +14971,7 @@ String SIP_SA_EDGELINE3DELTA
     Text [ ENGLISH ] = "Offset line 3" ;
     Text[ english_us ] = "Offset line 3";
     Text[ portuguese ] = "Linha de offset 3";
-    Text[ russian ] = "������������ ����� 3";
+    Text[ russian ] = "����� �������� 3";
     Text[ dutch ] = "Lijnvulling 3";
     Text[ french ] = "Ligne de d�calage 3";
     Text[ spanish ] = "Desplazamiento l�nea 3";
@@ -14485,8 +14989,9 @@ String SIP_SA_EDGELINE3DELTA
     Text[ greek ] = "������ ����������� 3";
     Text[ korean ] = "오프셋 선 3";
     Text[ turkish ] = "Kayma �izgisi 3";
-    Text[ catalan ] = "Desplazamiento l�nea 3";
+    Text[ catalan ] = "Despla�ament l�nia 3";
     Text[ finnish ] = "Siirtym�rivi 3";
+    Text[ thai ] = "เส้นออฟเซต 3";
 };
 
 String SIP_SA_EDGERESERVE02
@@ -14498,7 +15003,7 @@ String SIP_SA_EDGERESERVE02
     Text[ russian ] = "����������������� �������������� ����� 2";
     Text[ dutch ] = "Verbindingsreserve 2";
     Text[ french ] = "R�serv� pour connecteur 2";
-    Text[ spanish ] = "Conector reserva 2";
+    Text[ spanish ] = "Reservado para conector 2";
     Text[ italian ] = "Riservato per connettore 2";
     Text[ danish ] = "Forbindelse reserve 2";
     Text[ swedish ] = "F�rbindelse reserverad f�r 2";
@@ -14513,8 +15018,9 @@ String SIP_SA_EDGERESERVE02
     Text[ greek ] = "��������� ��������. 2";
     Text[ korean ] = "연결자 예비 2";
     Text[ turkish ] = "Ba�lay�c� - Yedek 2";
-    Text[ catalan ] = "Conector reserva 2";
-    Text[ finnish ] = "Varattu liitin 2";
+    Text[ catalan ] = "Connector reservat 2";
+    Text[ finnish ] = "Varattu yhdysviiva 2";
+    Text[ thai ] = "สงวนตัวเชื่อมต่อไว้ 2";
 };
 
 String SIP_SA_EDGERESERVE03
@@ -14541,8 +15047,9 @@ String SIP_SA_EDGERESERVE03
     Text[ greek ] = "��������� ��������. 3";
     Text[ korean ] = "연결자 예비 3";
     Text[ turkish ] = "Ba�lay�c� - Yedek 3";
-    Text[ catalan ] = "Conector reserva 3";
-    Text[ finnish ] = "Varattu liitin 3";
+    Text[ catalan ] = "Connector reservat 3";
+    Text[ finnish ] = "Varattu yhdysviiva 3";
+    Text[ thai ] = "สงวนตัวเชื่อมต่อไว้ 3";
 };
 
 String SIP_SA_EDGERESERVE04
@@ -14569,8 +15076,9 @@ String SIP_SA_EDGERESERVE04
     Text[ greek ] = "��������� ��������. 4";
     Text[ korean ] = "연결자 예비 4";
     Text[ turkish ] = "Ba�lay�c� - Yedek 4";
-    Text[ catalan ] = "Conector reserva 4";
-    Text[ finnish ] = "Varattu liitin 4";
+    Text[ catalan ] = "Connector reservat 4";
+    Text[ finnish ] = "Varattu yhdysviiva 4";
+    Text[ thai ] = "สงวนตัวเชื่อมต่อไว้ 4";
 };
 
 String SIP_SA_EDGERESERVE05
@@ -14597,8 +15105,9 @@ String SIP_SA_EDGERESERVE05
     Text[ greek ] = "��������� ��������. 5";
     Text[ korean ] = "연결자 예비 5";
     Text[ turkish ] = "Ba�lay�c� - Yedek 5";
-    Text[ catalan ] = "Conector reserva 5";
-    Text[ finnish ] = "Varattu liitin 5";
+    Text[ catalan ] = "Connector reservat 5";
+    Text[ finnish ] = "Varattu yhdysviiva 5";
+    Text[ thai ] = "สงวนตัวเชื่อมต่อไว้ 5";
 };
 
 String SIP_SA_EDGERESERVE06
@@ -14625,8 +15134,9 @@ String SIP_SA_EDGERESERVE06
     Text[ greek ] = "��������� ��������. 6";
     Text[ korean ] = "연결자 예비 6";
     Text[ turkish ] = "Ba�lay�c� - Yedek 6";
-    Text[ catalan ] = "Conector reserva 6";
-    Text[ finnish ] = "Varattu liitin 6";
+    Text[ catalan ] = "Connector reservat 6";
+    Text[ finnish ] = "Varattu yhdysviiva 6";
+    Text[ thai ] = "สงวนตัวเชื่อมต่อไว้ 6";
 };
 
 String SIP_SA_EDGERESERVE07
@@ -14653,8 +15163,9 @@ String SIP_SA_EDGERESERVE07
     Text[ greek ] = "��������� ��������. 7";
     Text[ korean ] = "연결자 예비 7";
     Text[ turkish ] = "Ba�lay�c� - Yedek 7";
-    Text[ catalan ] = "Conector reserva 7";
-    Text[ finnish ] = "Varattu liitin 7";
+    Text[ catalan ] = "Connector reservat 7";
+    Text[ finnish ] = "Varattu yhdysviiva 7";
+    Text[ thai ] = "สงวนตัวเชื่อมต่อไว้ 7";
 };
 
 String SIP_SA_EDGERESERVE08
@@ -14681,8 +15192,9 @@ String SIP_SA_EDGERESERVE08
     Text[ greek ] = "��������� ��������. 8";
     Text[ korean ] = "연결자 예비 8";
     Text[ turkish ] = "Ba�lay�c� - Yedek 8";
-    Text[ catalan ] = "Conector reserva 8";
-    Text[ finnish ] = "Varattu liitin 8";
+    Text[ catalan ] = "Connector reservat 8";
+    Text[ finnish ] = "Varattu yhdysviiva 8";
+    Text[ thai ] = "สงวนตัวเชื่อมต่อไว้ 8";
 };
 
 String SIP_SA_EDGERESERVE09
@@ -14709,8 +15221,9 @@ String SIP_SA_EDGERESERVE09
     Text[ greek ] = "��������� ��������. 9";
     Text[ korean ] = "연결자 예비 9";
     Text[ turkish ] = "Ba�lay�c� - Yedek 9";
-    Text[ catalan ] = "Conector reserva 9";
-    Text[ finnish ] = "Varattu liitin 9";
+    Text[ catalan ] = "Connector reservat 9";
+    Text[ finnish ] = "Varattu yhdysviiva 9";
+    Text[ thai ] = "สงวนตัวเชื่อมต่อไว้ 9";
 };
 
 String SIP_SDRATTRSET_EDGE
@@ -14737,8 +15250,9 @@ String SIP_SDRATTRSET_EDGE
     Text[ greek ] = "��������� ��������";
     Text[ korean ] = "연결자 속성";
     Text[ turkish ] = "Ba�lay�c� �znitelikleri";
-    Text[ catalan ] = "Atributos de conector";
-    Text[ finnish ] = "Liitinm��ritteet";
+    Text[ catalan ] = "Atributs del connector";
+    Text[ finnish ] = "Yhdysviivam��ritteet";
+    Text[ thai ] = "คุณลักษณะตัวเชื่อมต่อ";
 };
 
 String SIP_SA_MEASUREKIND
@@ -14750,7 +15264,7 @@ String SIP_SA_MEASUREKIND
     Text[ russian ] = "��� ��������";
     Text[ dutch ] = "Afmetingstype";
     Text[ french ] = "Type de cotation";
-    Text[ spanish ] = "Tipo de dimensionamiento";
+    Text[ spanish ] = "Tipo de dimensiones";
     Text[ italian ] = "Tipo di quotatura";
     Text[ danish ] = "Dimensioneringstype";
     Text[ swedish ] = "Typ av dimensionering";
@@ -14765,8 +15279,9 @@ String SIP_SA_MEASUREKIND
     Text[ greek ] = "����� ����������������";
     Text[ korean ] = "치수 유형";
     Text[ turkish ] = "�l��m tipi";
-    Text[ catalan ] = "Tipo de dimensionamiento";
+    Text[ catalan ] = "Tipus de dimensionament";
     Text[ finnish ] = "Mitoituslaji";
+    Text[ thai ] = "ชนิดของมิติ";
 };
 
 String SIP_SA_MEASURETEXTHPOS
@@ -14794,8 +15309,9 @@ String SIP_SA_MEASURETEXTHPOS
     Text[ greek ] = "������� ���������������� - ��������� ����";
     Text[ korean ] = "치수값 - 수평 위치";
     Text[ turkish ] = "�l��m metni - Yatay konum";
-    Text[ catalan ] = "Pos. horiz. texto dimension.";
+    Text[ catalan ] = "Pos. horitz. text dimensi�.";
     Text[ finnish ] = "Mitoitusarvo - vaakasijainti";
+    Text[ thai ] = "ค่ามิติ - ตำแหน่งแนวนอน";
 };
 
 String SIP_SA_MEASURETEXTVPOS
@@ -14823,8 +15339,9 @@ String SIP_SA_MEASURETEXTVPOS
     Text[ greek ] = "������� ���������������� - ���������� ����";
     Text[ korean ] = "치수값 - 수직 위치";
     Text[ turkish ] = "�l��m metni - Dikey konum";
-    Text[ catalan ] = "Pos. vert. texto dimension.";
+    Text[ catalan ] = "Pos. vert. text dimensi�.";
     Text[ finnish ] = "Mitoitusarvo - pystysijainti";
+    Text[ thai ] = "ค่ามิติ - ตำแหน่งแนวตั้ง";
 };
 
 String SIP_SA_MEASURELINEDIST
@@ -14852,8 +15369,9 @@ String SIP_SA_MEASURELINEDIST
     Text[ korean ] = "치수선 간격";
     Text[ turkish ] = "�l��m �izgisi aral���";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Distancia l�neas dimensiones";
-    Text[ finnish ] = "Mittaviivatila";
+    Text[ catalan ] = "Dist�ncia l�nies dimensions";
+    Text[ finnish ] = "Mittaviivan v�li";
+    Text[ thai ] = "ระยะห่างมิติของเส้น";
 };
 
 String SIP_SA_MEASUREHELPLINEOVERHANG
@@ -14880,8 +15398,9 @@ String SIP_SA_MEASUREHELPLINEOVERHANG
     Text[ greek ] = "�������� ���������� ������� ����������������";
     Text[ korean ] = "치수 안내선 돌출";
     Text[ turkish ] = "Yard�mc� �izgi sarkmas�";
-    Text[ catalan ] = "Gu�as sobresalientes";
+    Text[ catalan ] = "Dimensiona el sobresortint de l'ajuda";
     Text[ finnish ] = "Leijuva ohjemittaviiva";
+    Text[ thai ] = "มิติเส้นช่วยเหลือที่ยื่นออกมา";
 };
 
 String SIP_SA_MEASUREHELPLINEDIST
@@ -14890,7 +15409,7 @@ String SIP_SA_MEASUREHELPLINEDIST
     Text [ ENGLISH ] = "Distance of dimension help line" ;
     Text[ english_us ] = "Dimension help line spacing";
     Text[ portuguese ] = "Dist�ncia entre guias de dimens.";
-    Text[ russian ] = "�������� ����� �������������� ���������� �������";
+    Text[ russian ] = "��� ����� ������������� ��������� �����";
     Text[ dutch ] = "Afstand afmetingen hulplijn";
     Text[ french ] = "�cart des rep�res cot�s";
     Text[ spanish ] = "Distancia entre gu�as";
@@ -14908,8 +15427,9 @@ String SIP_SA_MEASUREHELPLINEDIST
     Text[ greek ] = "�������� ��� ���������� ������� ����������������";
     Text[ korean ] = "치수 안내선 간격";
     Text[ turkish ] = "Yard�mc� �l��m �izgisi aral���";
-    Text[ catalan ] = "Distancia entre gu�as";
+    Text[ catalan ] = "Dist�ncia entre guies";
     Text[ finnish ] = "Ohjemittaviivan v�lit";
+    Text[ thai ] = "ระยะห่างมิติเส้นช่วยเหลือ";
 };
 
 String SIP_SA_MEASUREHELPLINE1LEN
@@ -14936,8 +15456,9 @@ String SIP_SA_MEASUREHELPLINE1LEN
     Text[ greek ] = "�������� ���������� ������� ���������������� 1";
     Text[ korean ] = "치수 안내선 백로그 1";
     Text[ turkish ] = "Yard�mc� �l��m �izgisi ta�mas� 1";
-    Text[ catalan ] = "Extralargo l�neas aux. de dimensionamiento 1";
+    Text[ catalan ] = "Extrallarg l�nies aux. de dimensionament 1";
     Text[ finnish ] = "Ohjemittaviivan taustaloki 1";
+    Text[ thai ] = "สิ่งที่ค้างของมิติเส้นช่วยเหลือ 1";
 };
 
 String SIP_SA_MEASUREHELPLINE2LEN
@@ -14964,8 +15485,9 @@ String SIP_SA_MEASUREHELPLINE2LEN
     Text[ greek ] = "�������� ���������� ������� ���������������� 2";
     Text[ korean ] = "치수 안내선 백로그 2";
     Text[ turkish ] = "Yard�mc� �l��m �izgisi ta�mas� 2";
-    Text[ catalan ] = "Extralargo l�neas aux. de dimensionamiento 2";
+    Text[ catalan ] = "Extrallarg l�nies aux. de dimensionament 2";
     Text[ finnish ] = "Ohjemittaviivan taustaloki 2";
+    Text[ thai ] = "สิ่งที่ค้างของมิติเส้นช่วยเหลือ2";
 };
 
 String SIP_SA_MEASUREBELOWREFEDGE
@@ -14977,7 +15499,7 @@ String SIP_SA_MEASUREBELOWREFEDGE
     Text[ russian ] = "������� ������� �����";
     Text[ dutch ] = "Afmetingen onderkant";
     Text[ french ] = "Cotation de l'ar�te inf�rieure";
-    Text[ spanish ] = "Dimensiones borde inferior";
+    Text[ spanish ] = "Dimensiones del borde inferior";
     Text[ italian ] = "Quotatura bordi inferiori";
     Text[ danish ] = "Underkantdimensionering";
     Text[ swedish ] = "Underkantsdimensionering";
@@ -14992,8 +15514,9 @@ String SIP_SA_MEASUREBELOWREFEDGE
     Text[ greek ] = "��������������� ���� �����";
     Text[ korean ] = "아래 모서리 치수";
     Text[ turkish ] = "Alt kenar �l��s�";
-    Text[ catalan ] = "Dimensiones borde inferior";
+    Text[ catalan ] = "Dimensionat de la vora inferior";
     Text[ finnish ] = "Alareunan mitat";
+    Text[ thai ] = "มิติขอบล่าง";
 };
 
 String SIP_SA_MEASURETEXTROTA90
@@ -15005,7 +15528,7 @@ String SIP_SA_MEASURETEXTROTA90
     Text[ russian ] = "���������� ��������� ������ �������� � ��������� �����";
     Text[ dutch ] = "Tekstafmetingen haaks op lijnafmetingen";
     Text[ french ] = "Valeur de la cote perpendiculaire � la ligne de cote";
-    Text[ spanish ] = "Dimens. de texto a trav�s de l�nea";
+    Text[ spanish ] = "Valor de dimensi�n perpendicular a la l�nea de dimensiones.";
     Text[ italian ] = "Testo di quotatura perpendicolare alla linea";
     Text[ danish ] = "M�letekst p� tv�rs af m�lelinjen";
     Text[ swedish ] = "M�ttext vinkelr�t mot m�ttlinje";
@@ -15020,8 +15543,9 @@ String SIP_SA_MEASURETEXTROTA90
     Text[ greek ] = "������� ���������������� ���� ���� ������ ����������������";
     Text[ korean ] = "치수값을 치수선에 가로로";
     Text[ turkish ] = "�l��m �izgisini kesen �l��m metni";
-    Text[ catalan ] = "Dimens. de texto a trav�s de l�nea";
+    Text[ catalan ] = "Dimens. de text a trav�s de l�nia";
     Text[ finnish ] = "Mittaviivojen mitta-arvo";
+    Text[ thai ] = "ค่ามิติข้ามมิติของเส้น";
 };
 
 String SIP_SA_MEASURETEXTUPSIDEDOWN
@@ -15030,7 +15554,7 @@ String SIP_SA_MEASURETEXTUPSIDEDOWN
     Text [ ENGLISH ] = "Turn dimensioning text 180�" ;
     Text[ english_us ] = "Rotate dimension value by 180�";
     Text[ portuguese ] = "Rodar texto dimens. 180�";
-    Text[ russian ] = "������������ ����� �������� �� 180�";
+    Text[ russian ] = "������������ ����� �������� �� 180�";
     Text[ dutch ] = "Tekstafmetingen 180� draaien";
     Text[ french ] = "Faire pivoter de 180� la valeur de la cote";
     Text[ spanish ] = "Girar texto dimens. en 180�";
@@ -15048,8 +15572,9 @@ String SIP_SA_MEASURETEXTUPSIDEDOWN
     Text[ greek ] = "���������� �������� ���������������� ���� 180�";
     Text[ korean ] = "치수값 180 회전";
     Text[ turkish ] = "�l��m metnini 180� d�nd�r";
-    Text[ catalan ] = "Girar texto dimens. en 180�";
+    Text[ catalan ] = "Gira text dimens. en 180�";
     Text[ finnish ] = "K��nn� mitta-arvoa 180 astetta";
+    Text[ thai ] = "หมุนค่ามิติด้วย 180๘";
 };
 
 String SIP_SA_MEASUREOVERHANG
@@ -15061,7 +15586,7 @@ String SIP_SA_MEASUREOVERHANG
     Text[ russian ] = "������ ��������� �����";
     Text[ dutch ] = "Lijnafmetingen, uitstekend";
     Text[ french ] = "Saillie des lignes de cote";
-    Text[ spanish ] = "Resalte l�neas de dimensiones";
+    Text[ spanish ] = "Resaltar l�neas de dimensiones";
     Text[ italian ] = "Sporgimento linee di quotatura";
     Text[ danish ] = "M�lelinjeoverskud";
     Text[ swedish ] = "F�r l�ng m�ttlinje";
@@ -15076,8 +15601,9 @@ String SIP_SA_MEASUREOVERHANG
     Text[ greek ] = "�������� ������� ����������������";
     Text[ korean ] = "치수선 돌출";
     Text[ turkish ] = "�l��m �izgisi sarkmas�";
-    Text[ catalan ] = "Resalte l�neas de dimensiones";
+    Text[ catalan ] = "Dimensiona el sobresortint";
     Text[ finnish ] = "Leijuva mittaviiva";
+    Text[ thai ] = "มิติของเส้นที่ยื่นออกมา";
 };
 
 String SIP_SA_MEASUREUNIT
@@ -15104,8 +15630,9 @@ String SIP_SA_MEASUREUNIT
     Text[ greek ] = "������ ��������";
     Text[ korean ] = "치수 단위";
     Text[ turkish ] = "�l��m birimi";
-    Text[ catalan ] = "Unidad de medida";
+    Text[ catalan ] = "Unitat de mesura";
     Text[ finnish ] = "Mittayksikk�";
+    Text[ thai ] = "หน่วยมาตรวัด";
 };
 
 String SIP_SA_MEASURESCALE
@@ -15130,11 +15657,12 @@ String SIP_SA_MEASURESCALE
     Text[ dutch ] = "schaal, extra factor";
     Text[ chinese_simplified ] = "显示比例的附加因素";
     Text[ greek ] = "��������� ���������� ��������";
-    Text[ korean ] = "배율 추가적인 요인";
+    Text[ korean ] = "추가적 축소/확대 요소";
     Text[ turkish ] = "Ek �l�ek fakt�r�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Factor adicional de escala";
+    Text[ catalan ] = "Factor d'escala addicional";
     Text[ finnish ] = "Lis�skaalauskerroin";
+    Text[ thai ] = "องค์ประกอบสเกลเพิ่มเติม";
 };
 
 String SIP_SA_MEASURESHOWUNIT
@@ -15161,8 +15689,9 @@ String SIP_SA_MEASURESHOWUNIT
     Text[ greek ] = "�������� ������� ��������";
     Text[ korean ] = "치수 단위 표시";
     Text[ turkish ] = "�l�� birimini g�ster";
-    Text[ catalan ] = "Visualizaci�n unidades de medida";
+    Text[ catalan ] = "Visualitzaci� d'unitats de mesura";
     Text[ finnish ] = "Mittayksik�n n�ytt�";
+    Text[ thai ] = "แสดงผลหน่วยมาตรวัด";
 };
 
 String SIP_SA_MEASUREFORMATSTRING
@@ -15189,8 +15718,9 @@ String SIP_SA_MEASUREFORMATSTRING
     Text[ greek ] = "����� �������� ����������������";
     Text[ korean ] = "치수값 서식";
     Text[ turkish ] = "�l��m metni format�";
-    Text[ catalan ] = "Formato texto dimensionado";
+    Text[ catalan ] = "Dimensiona el format del valor";
     Text[ finnish ] = "Mitoitusarvon muoto";
+    Text[ thai ] = "รูปแบบค่ามิติ";
 };
 
 String SIP_SA_MEASURETEXTAUTOANGLE
@@ -15215,10 +15745,11 @@ String SIP_SA_MEASURETEXTAUTOANGLE
     Text[ dutch ] = "Automatische hoek bij tekstafmetingen";
     Text[ chinese_simplified ] = "定量文字自动定角度";
     Text[ greek ] = "��������� ������� ����� �������� ����������������";
-    Text[ korean ] = "치수값각 자동";
+    Text[ korean ] = "치수값 각도를 자동으로 조정";
     Text[ turkish ] = "Otomatik �l��m metni a��s�";
-    Text[ catalan ] = "Posicionamiento autom�tico del texto de �ngulo";
-    Text[ finnish ] = "Mitta-arvon automaattinen sijoitus";
+    Text[ catalan ] = "Autoposicionament del valor de dimensionament";
+    Text[ finnish ] = "Mitta-arvon automaattinen sijoittelu";
+    Text[ thai ] = "ตำแหน่งอัตโนมัติของค่ามิติ";
 };
 
 String SIP_SA_MEASURETEXTAUTOANGLEVIEW
@@ -15243,10 +15774,11 @@ String SIP_SA_MEASURETEXTAUTOANGLEVIEW
     Text[ dutch ] = "Hoek voor automatische hoek bij tekstafmetingen";
     Text[ chinese_simplified ] = "用于定量文字自动定角度的角度";
     Text[ greek ] = "����� ������ ��� ��� �������� ������ ����� ��� �������� ����������������";
-    Text[ korean ] = "치수값각 자동용 각도";
+    Text[ korean ] = "치수값 각도의 자동 조정을 위한 각도";
     Text[ turkish ] = "Otomatik �l��m metni a��s� i�in a��";
-    Text[ catalan ] = "Angulo para �ngulo autom�t. de texto dimens.";
+    Text[ catalan ] = "�ngle per �ngle autom�t. de text dimens.";
     Text[ finnish ] = "Mitta-arvon automaattisen sijoituksen kulma";
+    Text[ thai ] = "มุมสำหรับตำแหน่งอัตโนมัติของค่ามิติ";
 };
 
 String SIP_SA_MEASURETEXTISFIXEDANGLE
@@ -15271,10 +15803,11 @@ String SIP_SA_MEASURETEXTISFIXEDANGLE
     Text[ dutch ] = "Vaststelling van hoek bij tekstafmetingen";
     Text[ chinese_simplified ] = "确定定量文字的角度";
     Text[ greek ] = "���������� ��� ������ ��� �������� ����������������";
-    Text[ korean ] = "치수값각 정의";
+    Text[ korean ] = "치수값 각도 지정";
     Text[ turkish ] = "�l��m metni a��s�n�n belirlenmesi";
-    Text[ catalan ] = "Definici�n del �ngulo de texto dimensionado";
+    Text[ catalan ] = "Definici� de l'angle de text dimensionat";
     Text[ finnish ] = "Mitta-arvon kulman m��ritys";
+    Text[ thai ] = "กำหนดมุมค่ามิติ";
 };
 
 String SIP_SA_MEASURETEXTFIXEDANGLE
@@ -15299,10 +15832,11 @@ String SIP_SA_MEASURETEXTFIXEDANGLE
     Text[ dutch ] = "Hoek bij tekstafmetingen";
     Text[ chinese_simplified ] = "定量文字角度";
     Text[ greek ] = "����� ������ �������� ����������������";
-    Text[ korean ] = "치수값각";
+    Text[ korean ] = "치수값 각도";
     Text[ turkish ] = "�l��m metni a��s�";
-    Text[ catalan ] = "Angulo de texto dimensionado";
+    Text[ catalan ] = "Angle del valor de dimensionament";
     Text[ finnish ] = "Mitta-arvon kulma";
+    Text[ thai ] = "มุมของค่ามิติ";
 };
 
 String SIP_SA_MEASUREDECIMALPLACES
@@ -15310,6 +15844,26 @@ String SIP_SA_MEASUREDECIMALPLACES
     Text = "Nachkommastellen";
     Text [ ENGLISH ] = "Decimal places" ;
     Text[ english_us ] = "Decimal places";
+    Text[ portuguese ] = "Decimal places";
+    Text[ russian ] = "Decimal places";
+    Text[ greek ] = "Decimal places";
+    Text[ dutch ] = "Decimal places";
+    Text[ french ] = "D�cimales";
+    Text[ spanish ] = "Decimales";
+    Text[ finnish ] = "Decimal places";
+    Text[ italian ] = "Posizioni decimali";
+    Text[ danish ] = "Decimal places";
+    Text[ swedish ] = "Antal decimaler";
+    Text[ polish ] = "Decimal places";
+    Text[ portuguese_brazilian ] = "Decimal places";
+    Text[ japanese ] = "小数点以下の桁数";
+    Text[ korean ] = "소수점 이하 자릿수";
+    Text[ chinese_simplified ] = "小数点位数";
+    Text[ chinese_traditional ] = "小數點位數";
+    Text[ turkish ] = "Decimal places";
+    Text[ arabic ] = "Decimal places";
+    Text[ catalan ] = "Decimal places";
+    Text[ thai ] = "Decimal places";
 };
 
 String SIP_SA_MEASURERESERVE05
@@ -15321,7 +15875,7 @@ String SIP_SA_MEASURERESERVE05
     Text[ russian ] = "����������������� ������ 5";
     Text[ dutch ] = "Afmetingsreserve 5";
     Text[ french ] = "R�serv� pour cotation 5";
-    Text[ spanish ] = "Dimensionamiento reserva 5";
+    Text[ spanish ] = "Dimensiones reserva 5";
     Text[ italian ] = "Quotatura riservato 5";
     Text[ danish ] = "Dimensionering reserve 5";
     Text[ swedish ] = "Dimensionering reserverad f�r 5";
@@ -15336,8 +15890,9 @@ String SIP_SA_MEASURERESERVE05
     Text[ greek ] = "��������������� ��������. 5";
     Text[ korean ] = "치수 예비 5";
     Text[ turkish ] = "Boyutlar - Yedek 5";
-    Text[ catalan ] = "Dimensionamiento reserva 5";
+    Text[ catalan ] = "Dimensions reserva 5";
     Text[ finnish ] = "Mitoitus varattu 5:lle";
+    Text[ thai ] = "สงวนมิติ 5";
 };
 
 String SIP_SA_MEASURERESERVE06
@@ -15349,7 +15904,7 @@ String SIP_SA_MEASURERESERVE06
     Text[ russian ] = "����������������� ������ 6";
     Text[ dutch ] = "Afmetingsreserve 6";
     Text[ french ] = "R�serv� pour cotation 6";
-    Text[ spanish ] = "Dimensionamiento reserva 6";
+    Text[ spanish ] = "Dimensiones reserva 6";
     Text[ italian ] = "Quotatura riservato 6";
     Text[ danish ] = "Dimensionering reserve 6";
     Text[ swedish ] = "Dimensionering reserverad f�r 6";
@@ -15364,8 +15919,9 @@ String SIP_SA_MEASURERESERVE06
     Text[ greek ] = "��������������� ��������. 6";
     Text[ korean ] = "치수 예비 6";
     Text[ turkish ] = "Boyutlar - Yedek 6";
-    Text[ catalan ] = "Dimensionamiento reserva 6";
+    Text[ catalan ] = "Dimensions reserva 6";
     Text[ finnish ] = "Mitoitus varattu 6:lle";
+    Text[ thai ] = "สงวนมิติไว้สำหรับ 6";
 };
 
 String SIP_SA_MEASURERESERVE07
@@ -15377,7 +15933,7 @@ String SIP_SA_MEASURERESERVE07
     Text[ russian ] = "����������������� ������ 7";
     Text[ dutch ] = "Afmetingsreserve 7";
     Text[ french ] = "R�serv� pour cotation 7";
-    Text[ spanish ] = "Dimensionamiento reserva 7";
+    Text[ spanish ] = "Dimensiones reservadas para 7";
     Text[ italian ] = "Quotatura riservato 7";
     Text[ danish ] = "Dimensionering reserve 7";
     Text[ swedish ] = "Dimensionering reserverad f�r 7";
@@ -15392,8 +15948,9 @@ String SIP_SA_MEASURERESERVE07
     Text[ greek ] = "��������������� ��������. 7";
     Text[ korean ] = "치수 예비 7";
     Text[ turkish ] = "Boyutlar - Yedek 7";
-    Text[ catalan ] = "Dimensionamiento reserva 7";
+    Text[ catalan ] = "Dimensions reserva 7";
     Text[ finnish ] = "Mitoitus varattu 7:lle";
+    Text[ thai ] = "สงวนมิติไว้สำหรับ 7";
 };
 
 String SIP_SDRATTRSET_MEASURE
@@ -15405,7 +15962,7 @@ String SIP_SDRATTRSET_MEASURE
     Text[ russian ] = "�������� ��������";
     Text[ dutch ] = "Afmetingsattributen";
     Text[ french ] = "Attributs de cotation";
-    Text[ spanish ] = "Atributo de dimensiones";
+    Text[ spanish ] = "Atributos de dimensiones";
     Text[ italian ] = "Attributi di quotatura";
     Text[ danish ] = "Dimensioneringsattributter";
     Text[ swedish ] = "Dimensioneringsattribut";
@@ -15420,8 +15977,9 @@ String SIP_SDRATTRSET_MEASURE
     Text[ greek ] = "��������� ����������������";
     Text[ korean ] = "치수 속성";
     Text[ turkish ] = "Boyut �znitelikleri";
-    Text[ catalan ] = "Atributo de dimensiones";
+    Text[ catalan ] = "Atributs de dimensi�";
     Text[ finnish ] = "Mitoitusm��ritteet";
+    Text[ thai ] = "คุณลักษณะมิติ";
 };
 
 String SIP_SA_CIRCKIND
@@ -15449,8 +16007,9 @@ String SIP_SA_CIRCKIND
     Text[ korean ] = "원 유형";
     Text[ turkish ] = "Daire tipi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Tipo de c�rculo";
+    Text[ catalan ] = "Tipus de cercle";
     Text[ finnish ] = "Ympyr�n tyyppi";
+    Text[ thai ] = "ชนิดของวงกลม";
 };
 
 String SIP_SA_CIRCSTARTANGLE
@@ -15460,7 +16019,7 @@ String SIP_SA_CIRCSTARTANGLE
     Text[ english_us ] = "Start angle";
     Text[ portuguese ] = "�ngulo inicial";
     Text[ russian ] = "��������� ����";
-    Text[ dutch ] = "Beginhoek";
+    Text[ dutch ] = "Starthoek";
     Text[ french ] = "Angle de d�part";
     Text[ spanish ] = "�ngulo inicial";
     Text[ italian ] = "Angolo inizio";
@@ -15472,14 +16031,15 @@ String SIP_SA_CIRCSTARTANGLE
     Text[ chinese_simplified ] = "起始角度";
     Text[ chinese_traditional ] = "起始角度";
     Text[ arabic ] = "����� �����";
-    Text[ dutch ] = "Beginhoek";
+    Text[ dutch ] = "Starthoek";
     Text[ chinese_simplified ] = "起始角度";
     Text[ greek ] = "������ �����";
     Text[ korean ] = "시작 각도";
     Text[ turkish ] = "Ba�lang�� a��s�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Angulo inicial";
+    Text[ catalan ] = "Angle inicial";
     Text[ finnish ] = "Aloituskulma";
+    Text[ thai ] = "เริ่มมุม";
 };
 
 String SIP_SA_CIRCENDANGLE
@@ -15506,8 +16066,9 @@ String SIP_SA_CIRCENDANGLE
     Text[ greek ] = "������ �����";
     Text[ korean ] = "끝 각도";
     Text[ turkish ] = "Biti� a��s�";
-    Text[ catalan ] = "Angulo final";
+    Text[ catalan ] = "Angle final";
     Text[ finnish ] = "Loppukulma";
+    Text[ thai ] = "สิ้นสุดมุม";
 };
 
 String SIP_SA_CIRCRESERVE0
@@ -15516,7 +16077,7 @@ String SIP_SA_CIRCRESERVE0
     Text [ ENGLISH ] = "Circle reserved 0" ;
     Text[ english_us ] = "Circle reserved for 0";
     Text[ portuguese ] = "C�rculo de reserva 0";
-    Text[ russian ] = "����������������� ������ 0";
+    Text[ russian ] = "����������������� ���� 0";
     Text[ dutch ] = "Cirkelreserve 0";
     Text[ french ] = "R�serv� pour cercle 0";
     Text[ spanish ] = "C�rculo reserva 0";
@@ -15534,8 +16095,9 @@ String SIP_SA_CIRCRESERVE0
     Text[ greek ] = "������ ��������. 0";
     Text[ korean ] = "원 예비 0";
     Text[ turkish ] = "Daire - Yedek 0";
-    Text[ catalan ] = "C�rculo reserva 0";
+    Text[ catalan ] = "Cercle reservat per a 0";
     Text[ finnish ] = "Ympyr� varattu 0:lle";
+    Text[ thai ] = "สงวนวงกลมไว้สำหรับ 0";
 };
 
 String SIP_SA_CIRCRESERVE1
@@ -15544,7 +16106,7 @@ String SIP_SA_CIRCRESERVE1
     Text [ ENGLISH ] = "Circle reserved 1" ;
     Text[ english_us ] = "Circle reserved for 1";
     Text[ portuguese ] = "C�rculo de reserva 1";
-    Text[ russian ] = "����������������� ������ 1";
+    Text[ russian ] = "����������������� ���� 1";
     Text[ dutch ] = "Cirkelreserve 1";
     Text[ french ] = "R�serv� pour cercle 1";
     Text[ spanish ] = "C�rculo reserva 1";
@@ -15562,8 +16124,9 @@ String SIP_SA_CIRCRESERVE1
     Text[ greek ] = "������ ��������. 1";
     Text[ korean ] = "원 예비 1";
     Text[ turkish ] = "Daire - Yedek 1";
-    Text[ catalan ] = "C�rculo reserva 1";
+    Text[ catalan ] = "Cercle reservat per a 1";
     Text[ finnish ] = "Ympyr� varattu 1:lle";
+    Text[ thai ] = "สงวนวงกลมไว้สำหรับ 1";
 };
 
 String SIP_SA_CIRCRESERVE2
@@ -15572,7 +16135,7 @@ String SIP_SA_CIRCRESERVE2
     Text [ ENGLISH ] = "Circle reserved 2" ;
     Text[ english_us ] = "Circle reserved for 2";
     Text[ portuguese ] = "C�rculo de reserva 2";
-    Text[ russian ] = "����������������� ������ 2";
+    Text[ russian ] = "����������������� ���� 2";
     Text[ dutch ] = "Cirkelreserve 2";
     Text[ french ] = "R�serv� pour cercle 2";
     Text[ spanish ] = "C�rculo reserva 2";
@@ -15590,8 +16153,9 @@ String SIP_SA_CIRCRESERVE2
     Text[ greek ] = "������ ��������. 2";
     Text[ korean ] = "원 예비 2";
     Text[ turkish ] = "Daire - Yedek 2";
-    Text[ catalan ] = "C�rculo reserva 2";
+    Text[ catalan ] = "Cercle reservat per a 2";
     Text[ finnish ] = "Ympyr� varattu 2:lle";
+    Text[ thai ] = "สงวนวงกลมไว้สำหรับ 2";
 };
 
 String SIP_SA_CIRCRESERVE3
@@ -15600,7 +16164,7 @@ String SIP_SA_CIRCRESERVE3
     Text [ ENGLISH ] = "Circle reserved 3" ;
     Text[ english_us ] = "Circle reserved for 3";
     Text[ portuguese ] = "C�rculo de reserva 3";
-    Text[ russian ] = "����������������� ������ 3";
+    Text[ russian ] = "����������������� ���� 3";
     Text[ dutch ] = "Cirkelreserve 3";
     Text[ french ] = "R�serv� pour cercle 3";
     Text[ spanish ] = "C�rculo reserva 3";
@@ -15618,8 +16182,9 @@ String SIP_SA_CIRCRESERVE3
     Text[ greek ] = "������ ��������. 3";
     Text[ korean ] = "원 예비 3";
     Text[ turkish ] = "Daire - Yedek 3";
-    Text[ catalan ] = "C�rculo reserva 3";
+    Text[ catalan ] = "Cercle reservat per a 3";
     Text[ finnish ] = "Ympyr� varattu 3:lle";
+    Text[ thai ] = "สงวนวงกลมไว้สำหรับ 3";
 };
 
 String SIP_SDRATTRSET_CIRC
@@ -15646,15 +16211,16 @@ String SIP_SDRATTRSET_CIRC
     Text[ greek ] = "��������� ������";
     Text[ korean ] = "원 속성";
     Text[ turkish ] = "Daire �znitelikleri";
-    Text[ catalan ] = "Atributos de c�rculo";
+    Text[ catalan ] = "Atributs del cercle";
     Text[ finnish ] = "Ympyr�n m��ritteet";
+    Text[ thai ] = "คุณลักษณะวงกลม";
 };
 
 String SIP_SA_OBJMOVEPROTECT
 {
     Text = "Objektposition gesch�tzt";
     Text [ ENGLISH ] = "Protected object positon" ;
-    Text[ english_us ] = "Protected object positon";
+    Text[ english_us ] = "Protected object position";
     Text[ portuguese ] = "Posi��o do objecto protegida";
     Text[ russian ] = "���������� ������� �������";
     Text[ dutch ] = "Objectpositie beveiligd";
@@ -15674,8 +16240,9 @@ String SIP_SA_OBJMOVEPROTECT
     Text[ greek ] = "�������������� ���� ������������";
     Text[ korean ] = "개체 위치 보호";
     Text[ turkish ] = "Nesne konumu korumal�";
-    Text[ catalan ] = "Posici�n de objeto protegida";
+    Text[ catalan ] = "Posici� d'objecte protegida";
     Text[ finnish ] = "Suojattu objektisijainti";
+    Text[ thai ] = "ป้องกันตำแหน่งวัตถุ";
 };
 
 String SIP_SA_OBJSIZEPROTECT
@@ -15703,8 +16270,9 @@ String SIP_SA_OBJSIZEPROTECT
     Text[ korean ] = "개체 크기 보호";
     Text[ turkish ] = "Nesne boyutu korumal�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Tama�o de objeto protegido";
+    Text[ catalan ] = "Mida de l'objecte protegida";
     Text[ finnish ] = "Suojattu objektikoko";
+    Text[ thai ] = "ป้องกันขนาดวัตถุ";
 };
 
 String SIP_SA_OBJPRINTABLE
@@ -15729,11 +16297,12 @@ String SIP_SA_OBJPRINTABLE
     Text[ dutch ] = "Object afdrukbaar";
     Text[ chinese_simplified ] = "可打印的对象";
     Text[ greek ] = "����������� ����������";
-    Text[ korean ] = "개체, 인쇄 가능";
+    Text[ korean ] = "개체 인쇄 가능";
     Text[ turkish ] = "Nesne yazd�r�labilir";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Objeto imprimible";
+    Text[ catalan ] = "Objecte, imprimible";
     Text[ finnish ] = "Objekti, tulostettava";
+    Text[ thai ] = "วัตถุ, สามารถพิมพ์ได้";
 };
 
 String SIP_SA_LAYERID
@@ -15742,9 +16311,9 @@ String SIP_SA_LAYERID
     Text [ ENGLISH ] = "Layer ID" ;
     Text[ english_us ] = "Level ID";
     Text[ portuguese ] = "Identificar n�veis";
-    Text[ russian ] = "������������� ����";
+    Text[ russian ] = "ID ������";
     Text[ dutch ] = "Niveau-ID";
-    Text[ french ] = "Identification de niveau";
+    Text[ french ] = "Identification de couche";
     Text[ spanish ] = "Identificaci�n de niveles";
     Text[ italian ] = "Livello identificazione";
     Text[ danish ] = "Niveau-identifikation";
@@ -15758,10 +16327,11 @@ String SIP_SA_LAYERID
     Text[ dutch ] = "Niveau-ID";
     Text[ chinese_simplified ] = "分层标识";
     Text[ greek ] = "��������� ��������";
-    Text[ korean ] = "레벨 ID";
+    Text[ korean ] = "수준 ID";
     Text[ turkish ] = "D�zey tan�t�c�s�";
-    Text[ catalan ] = "Identificaci�n de niveles";
+    Text[ catalan ] = "Identificador de nivell";
     Text[ finnish ] = "Tasotunnus";
+    Text[ thai ] = "ระดับ ID";
 };
 
 String SIP_SA_LAYERNAME
@@ -15770,7 +16340,7 @@ String SIP_SA_LAYERNAME
     Text [ ENGLISH ] = "Layer" ;
     Text[ english_us ] = "Layer";
     Text[ portuguese ] = "N�vel";
-    Text[ russian ] = "�������";
+    Text[ russian ] = "����";
     Text[ dutch ] = "Niveau";
     Text[ french ] = "Niveau";
     Text[ spanish ] = "Nivel";
@@ -15786,10 +16356,11 @@ String SIP_SA_LAYERNAME
     Text[ dutch ] = "Niveau";
     Text[ chinese_simplified ] = "分层";
     Text[ greek ] = "�������";
-    Text[ korean ] = "레벨";
+    Text[ korean ] = "계층";
     Text[ turkish ] = "D�zey";
-    Text[ catalan ] = "Nivel";
-    Text[ finnish ] = "Taso ";
+    Text[ catalan ] = "Nivell";
+    Text[ finnish ] = "Kerros";
+    Text[ thai ] = "ระดับ";
 };
 
 String SIP_SA_OBJECTNAME
@@ -15817,8 +16388,9 @@ String SIP_SA_OBJECTNAME
     Text[ korean ] = "개체 이름";
     Text[ turkish ] = "Nesne ad�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Nombre de objeto";
+    Text[ catalan ] = "Nom de l'objecte";
     Text[ finnish ] = "Objektin nimi";
+    Text[ thai ] = "ชื่อวัตถุ";
 };
 
 String SIP_SA_ALLPOSITIONX
@@ -15845,8 +16417,9 @@ String SIP_SA_ALLPOSITIONX
     Text[ greek ] = "���� X, ������";
     Text[ korean ] = "X 위치, 전체";
     Text[ turkish ] = "X konumu (t�m�)";
-    Text[ catalan ] = "Posici�n X, todo";
+    Text[ catalan ] = "Posici� X, tot";
     Text[ finnish ] = "Sijainti X, valmis";
+    Text[ thai ] = "ตำแหน่ง X, สมบูรณ์";
 };
 
 String SIP_SA_ALLPOSITIONY
@@ -15873,8 +16446,9 @@ String SIP_SA_ALLPOSITIONY
     Text[ greek ] = "���� Y, ������";
     Text[ korean ] = "Y 위치, 전체";
     Text[ turkish ] = "Y konumu (t�m�)";
-    Text[ catalan ] = "Posici�n Y, todo";
+    Text[ catalan ] = "Posici� Y, tot";
     Text[ finnish ] = "Sijainti Y, valmis";
+    Text[ thai ] = "ตำแหน่ง Y, สมบูรณ์";
 };
 
 String SIP_SA_ALLSIZEWIDTH
@@ -15899,10 +16473,11 @@ String SIP_SA_ALLSIZEWIDTH
     Text[ dutch ] = "Breedte, totaal";
     Text[ chinese_simplified ] = "总宽度";
     Text[ greek ] = "������, ������";
-    Text[ korean ] = "너비, 전체";
+    Text[ korean ] = "너비 전체";
     Text[ turkish ] = "Toplam geni�lik";
-    Text[ catalan ] = "Ancho, todo";
+    Text[ catalan ] = "Amplada total";
     Text[ finnish ] = "Kokonaisleveys";
+    Text[ thai ] = "ความกว้างรวม";
 };
 
 String SIP_SA_ALLSIZEHEIGHT
@@ -15929,8 +16504,9 @@ String SIP_SA_ALLSIZEHEIGHT
     Text[ greek ] = "����, ��������";
     Text[ korean ] = "높이, 전체";
     Text[ turkish ] = "Toplam y�kseklik";
-    Text[ catalan ] = "Alto, todo";
+    Text[ catalan ] = "Alt, tot";
     Text[ finnish ] = "Korkeus, t�ydellinen";
+    Text[ thai ] = "ความสูง, สมบูรณ์";
 };
 
 String SIP_SA_ONEPOSITIONX
@@ -15957,8 +16533,9 @@ String SIP_SA_ONEPOSITIONX
     Text[ greek ] = "���� X �������";
     Text[ korean ] = "X 위치, 단일";
     Text[ turkish ] = "X konumu (tek)";
-    Text[ catalan ] = "Posici�n X, individual";
+    Text[ catalan ] = "Posici� X, individual";
     Text[ finnish ] = "Yksitt�inen sijainti X";
+    Text[ thai ] = "ตำแหน่ง X เดี่ยว";
 };
 
 String SIP_SA_ONEPOSITIONY
@@ -15985,8 +16562,9 @@ String SIP_SA_ONEPOSITIONY
     Text[ greek ] = "���� Y �������";
     Text[ korean ] = "Y 위치, 단일";
     Text[ turkish ] = "Y konumu (tek)";
-    Text[ catalan ] = "Posici�n Y, individual";
+    Text[ catalan ] = "Posici� Y, individual";
     Text[ finnish ] = "Yksitt�inen sijainti Y";
+    Text[ thai ] = "ตำแหน่ง Y เดี่ยว";
 };
 
 String SIP_SA_ONESIZEWIDTH
@@ -16013,8 +16591,9 @@ String SIP_SA_ONESIZEWIDTH
     Text[ greek ] = "������ ���������";
     Text[ korean ] = "단일 너비";
     Text[ turkish ] = "Geni�lik (tek)";
-    Text[ catalan ] = "Ancho, individual";
+    Text[ catalan ] = "Amplada simple";
     Text[ finnish ] = "Yksitt�inen leveys";
+    Text[ thai ] = "ความกว้างเดี่ยว";
 };
 
 String SIP_SA_ONESIZEHEIGHT
@@ -16023,7 +16602,7 @@ String SIP_SA_ONESIZEHEIGHT
     Text [ ENGLISH ] = "Single height" ;
     Text[ english_us ] = "Single height";
     Text[ portuguese ] = "Altura individual";
-    Text[ russian ] = "������ �� ����������";
+    Text[ russian ] = "������ �� �����������";
     Text[ dutch ] = "Hoogte, enkel";
     Text[ french ] = "Hauteur individuelle";
     Text[ spanish ] = "Alto, individual";
@@ -16041,8 +16620,9 @@ String SIP_SA_ONESIZEHEIGHT
     Text[ greek ] = "���� ����������";
     Text[ korean ] = "단일 높이";
     Text[ turkish ] = "Y�kseklik (tek)";
-    Text[ catalan ] = "Alto, individual";
+    Text[ catalan ] = "Alt, individual";
     Text[ finnish ] = "Yksitt�inen korkeus";
+    Text[ thai ] = "ความสูงเดี่ยว";
 };
 
 String SIP_SA_LOGICSIZEWIDTH
@@ -16054,7 +16634,7 @@ String SIP_SA_LOGICSIZEWIDTH
     Text[ russian ] = "���������� ������";
     Text[ dutch ] = "Logische breedte";
     Text[ french ] = "Largeur logique";
-    Text[ spanish ] = "Ancho, l�gico";
+    Text[ spanish ] = "Ancho l�gico";
     Text[ italian ] = "Larghezza logica";
     Text[ danish ] = "Bredde, logisk";
     Text[ swedish ] = "Logisk bredd";
@@ -16069,8 +16649,9 @@ String SIP_SA_LOGICSIZEWIDTH
     Text[ greek ] = "������ ������";
     Text[ korean ] = "논리적 너비";
     Text[ turkish ] = "Mant�ksal geni�lik";
-    Text[ catalan ] = "Ancho, l�gico";
+    Text[ catalan ] = "Ample, l�gic";
     Text[ finnish ] = "Looginen leveys";
+    Text[ thai ] = "ความกว้างแบบตรรกะ";
 };
 
 String SIP_SA_LOGICSIZEHEIGHT
@@ -16082,7 +16663,7 @@ String SIP_SA_LOGICSIZEHEIGHT
     Text[ russian ] = "���������� ������";
     Text[ dutch ] = "Logische hoogte";
     Text[ french ] = "Hauteur logique";
-    Text[ spanish ] = "Alto, l�gico";
+    Text[ spanish ] = "Altura l�gica";
     Text[ italian ] = "Altezza logica";
     Text[ danish ] = "H�jde, logisk";
     Text[ swedish ] = "Logisk h�jd";
@@ -16097,8 +16678,9 @@ String SIP_SA_LOGICSIZEHEIGHT
     Text[ greek ] = "������ ����";
     Text[ korean ] = "논리적 높이";
     Text[ turkish ] = "Mant�ksal y�kseklik";
-    Text[ catalan ] = "Alto, l�gico";
+    Text[ catalan ] = "Alt, l�gic";
     Text[ finnish ] = "Looginen korkeus";
+    Text[ thai ] = "ความสูงแบบตรรกะ";
 };
 
 String SIP_SA_ROTATEANGLE
@@ -16125,8 +16707,9 @@ String SIP_SA_ROTATEANGLE
     Text[ greek ] = "����� ����������� ����������";
     Text[ korean ] = "단일 회전 각도";
     Text[ turkish ] = "D�n�� a��s� (tek)";
-    Text[ catalan ] = "Angulo de rotaci�n, individual";
+    Text[ catalan ] = "Angle de gir simple";
     Text[ finnish ] = "Yksitt�inen k��nt�kulma";
+    Text[ thai ] = "การหมุนมุมเดี่ยว";
 };
 
 String SIP_SA_SHEARANGLE
@@ -16153,8 +16736,9 @@ String SIP_SA_SHEARANGLE
     Text[ greek ] = "����� ���������, ����������";
     Text[ korean ] = "단일 교차 각도";
     Text[ turkish ] = "Kesi�me a��s� (tek)";
-    Text[ catalan ] = "Angulo de desviaci�n, individual";
+    Text[ catalan ] = "Angle de retallament simple";
     Text[ finnish ] = "Yksitt�inen murtumakulma";
+    Text[ thai ] = "มุมตัดเดี่ยว";
 };
 
 String SIP_SA_MOVEX
@@ -16163,10 +16747,10 @@ String SIP_SA_MOVEX
     Text [ ENGLISH ] = "Move horizontally" ;
     Text[ english_us ] = "Move horizontally";
     Text[ portuguese ] = "Deslocar na horizontal";
-    Text[ russian ] = "��������. ��������";
+    Text[ russian ] = "�������������� ��������";
     Text[ dutch ] = "Horizontaal verplaatsen";
     Text[ french ] = "D�placer � l'horizontale";
-    Text[ spanish ] = "Desplazar horizontal";
+    Text[ spanish ] = "Desplazar horizontalmente";
     Text[ italian ] = "Sposta orizz.";
     Text[ danish ] = "Flyt vandret";
     Text[ swedish ] = "Flytta horisontalt";
@@ -16182,8 +16766,9 @@ String SIP_SA_MOVEX
     Text[ korean ] = "수평 이동";
     Text[ turkish ] = "Yatay ta��";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Desplazar horizontal";
+    Text[ catalan ] = "Mou horitzontalment";
     Text[ finnish ] = "Siirr� vaakatasossa";
+    Text[ thai ] = "ย้ายตามแนวนอน";
 };
 
 String SIP_SA_MOVEY
@@ -16192,10 +16777,10 @@ String SIP_SA_MOVEY
     Text [ ENGLISH ] = "Move vertically" ;
     Text[ english_us ] = "Move vertically";
     Text[ portuguese ] = "Deslocar na vertical";
-    Text[ russian ] = "������. ��������";
+    Text[ russian ] = "������������ ��������";
     Text[ dutch ] = "Verticaal verplaatsen";
     Text[ french ] = "D�placer � la verticale";
-    Text[ spanish ] = "Desplazar vertical";
+    Text[ spanish ] = "Desplazar verticalmente";
     Text[ italian ] = "Sposta vert.";
     Text[ danish ] = "Flyt lodret";
     Text[ swedish ] = "Flytta vertikalt";
@@ -16211,8 +16796,9 @@ String SIP_SA_MOVEY
     Text[ korean ] = "수직 이동";
     Text[ turkish ] = "Dikey ta��";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Desplazar vertical";
+    Text[ catalan ] = "Mou verticalment";
     Text[ finnish ] = "Siirr� pystytasossa";
+    Text[ thai ] = "ย้ายตามแนวตั้ง";
 };
 
 String SIP_SA_RESIZEXONE
@@ -16221,7 +16807,7 @@ String SIP_SA_RESIZEXONE
     Text [ ENGLISH ] = "Single resize X" ;
     Text[ english_us ] = "Resize X, single";
     Text[ portuguese ] = "Redimensionar apenas X";
-    Text[ russian ] = "�������� ������ X �� �����������";
+    Text[ russian ] = "�������� ������ X, �� �����������";
     Text[ dutch ] = "Herschalen X, enkel";
     Text[ french ] = "Redimensionner uniquement X";
     Text[ spanish ] = "Redimensi�n X, individual";
@@ -16240,8 +16826,9 @@ String SIP_SA_RESIZEXONE
     Text[ korean ] = "크기 변경 X, 단일";
     Text[ turkish ] = "X i�in yeni boyut (tek)";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Redimensi�n X, individual";
+    Text[ catalan ] = "Canvia la mida d'X, senzill";
     Text[ finnish ] = "Muuta X:n kokoa, yksitt�inen";
+    Text[ thai ] = "ปรับขนาด X, เดี่ยว";
 };
 
 String SIP_SA_RESIZEYONE
@@ -16250,7 +16837,7 @@ String SIP_SA_RESIZEYONE
     Text [ ENGLISH ] = "Single resize Y" ;
     Text[ english_us ] = "Resize Y, single";
     Text[ portuguese ] = "Redimensionar apenas Y";
-    Text[ russian ] = "�������� ������ Y �� �����������";
+    Text[ russian ] = "�������� ������ Y, �� �����������";
     Text[ dutch ] = "Herschalen Y";
     Text[ french ] = "Redimensionner uniquement Y";
     Text[ spanish ] = "Redimensi�n Y, individual";
@@ -16269,8 +16856,9 @@ String SIP_SA_RESIZEYONE
     Text[ korean ] = "크기 변경 Y, 단일";
     Text[ turkish ] = "Y i�in yeni boyut (tek)";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Redimensi�n Y, individual";
+    Text[ catalan ] = "Canvia la mida d'Y, senzill";
     Text[ finnish ] = "Muuta Y:n kokoa, yksitt�inen";
+    Text[ thai ] = "ปรับขนาด Y, เดี่ยว";
 };
 
 String SIP_SA_ROTATEONE
@@ -16280,7 +16868,7 @@ String SIP_SA_ROTATEONE
     Text[ english_us ] = "Single rotation";
     Text[ portuguese ] = "Rota��o individual";
     Text[ russian ] = "������� �� �����������";
-    Text[ dutch ] = "Roteren, enkel";
+    Text[ dutch ] = "Draaien, enkel";
     Text[ french ] = "Rotation individuelle";
     Text[ spanish ] = "Rodar, individual";
     Text[ italian ] = "Rotazione singola";
@@ -16292,13 +16880,14 @@ String SIP_SA_ROTATEONE
     Text[ chinese_simplified ] = "单个旋转";
     Text[ chinese_traditional ] = "單個旋轉";
     Text[ arabic ] = "������� �����";
-    Text[ dutch ] = "Roteren, enkel";
+    Text[ dutch ] = "Draaien, enkel";
     Text[ chinese_simplified ] = "单个旋转";
     Text[ greek ] = "����������, ����������";
     Text[ korean ] = "단일 회전";
     Text[ turkish ] = "D�nd�r (tek)";
-    Text[ catalan ] = "Rodar, individual";
+    Text[ catalan ] = "Gir simple";
     Text[ finnish ] = "Yksitt�inen k��nt�";
+    Text[ thai ] = "การหมุนเดี่ยว";
 };
 
 String SIP_SA_HORZSHEARONE
@@ -16325,8 +16914,9 @@ String SIP_SA_HORZSHEARONE
     Text[ greek ] = "��������� ��������, ����������";
     Text[ korean ] = "수평으로 단일 교차";
     Text[ turkish ] = "Yatay kesi�me (tek)";
-    Text[ catalan ] = "Cortar horiz., individual";
+    Text[ catalan ] = "Retalla horitz., individual";
     Text[ finnish ] = "Yksitt�inen vaakasuora murtuma";
+    Text[ thai ] = "มุมตัดเดี่ยวแนวนอน";
 };
 
 String SIP_SA_VERTSHEARONE
@@ -16353,8 +16943,9 @@ String SIP_SA_VERTSHEARONE
     Text[ greek ] = "���������� ��������, ����������";
     Text[ korean ] = "수직으로 단일 교차";
     Text[ turkish ] = "Dikey kesi�me (tek)";
-    Text[ catalan ] = "Cortar vert., individual";
+    Text[ catalan ] = "Retallament vertical simple";
     Text[ finnish ] = "Yksitt�inen pystysuora murtuma";
+    Text[ thai ] = "มุมตัดเดี่ยวแนวตั้ง";
 };
 
 String SIP_SA_RESIZEXALL
@@ -16382,8 +16973,9 @@ String SIP_SA_RESIZEXALL
     Text[ korean ] = "크기 변경 X, 전체";
     Text[ turkish ] = "X i�in yeni boyut (t�m�)";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Redimensi�n X, todo";
+    Text[ catalan ] = "Canvia la mida d'X, complet";
     Text[ finnish ] = "Muuta X:n kokoa, t�ysin";
+    Text[ thai ] = "ปรับขนาด X, สมบูรณ์";
 };
 
 String SIP_SA_RESIZEYALL
@@ -16411,8 +17003,9 @@ String SIP_SA_RESIZEYALL
     Text[ korean ] = "크기 변경 Y, 전체";
     Text[ turkish ] = "Y i�in yeni boyut (t�m�)";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Redimensi�n Y, todo";
+    Text[ catalan ] = "Canvia la mida d'Y, complet";
     Text[ finnish ] = "Muuta Y:n kokoa, t�ysin";
+    Text[ thai ] = "ปรับขนาด Y, สมบูรณ์";
 };
 
 String SIP_SA_ROTATEALL
@@ -16439,8 +17032,9 @@ String SIP_SA_ROTATEALL
     Text[ greek ] = "������, ������";
     Text[ korean ] = "전체 회전";
     Text[ turkish ] = "D�nd�r (t�m�)";
-    Text[ catalan ] = "Rodar, todo";
+    Text[ catalan ] = "Gira'ls tots";
     Text[ finnish ] = "Kierr� kaikkia";
+    Text[ thai ] = "หมุนทั้งหมด";
 };
 
 String SIP_SA_HORZSHEARALL
@@ -16465,11 +17059,12 @@ String SIP_SA_HORZSHEARALL
     Text[ dutch ] = "Scheren, compleet";
     Text[ chinese_simplified ] = "全部水平方向的剪切";
     Text[ greek ] = "��������� ��������, ������";
-    Text[ korean ] = "수평으로 전체 회전";
+    Text[ korean ] = "수평으로 전체 교차";
     Text[ turkish ] = "Yatay kesi�me (t�m�)";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Cortar horiz., todo";
+    Text[ catalan ] = "Retallament horitzontal, complet";
     Text[ finnish ] = "Vaakamurtuma, t�ydellinen";
+    Text[ thai ] = "มุมตัดแนวนอน, สมบูรณ์";
 };
 
 String SIP_SA_VERTSHEARALL
@@ -16480,7 +17075,7 @@ String SIP_SA_VERTSHEARALL
     Text[ portuguese ] = "Desvio vertical, tudo";
     Text[ russian ] = "������� �� ��������� �������";
     Text[ dutch ] = "Verticaal scheren, compleet";
-    Text[ french ] = "Cisaillement horiz. pour tout";
+    Text[ french ] = "Cisaillement vert. pour tout";
     Text[ spanish ] = "Cortar vert., todo";
     Text[ italian ] = "Tronca tutto vert.";
     Text[ danish ] = "Forskyd lodret, samlet";
@@ -16496,8 +17091,9 @@ String SIP_SA_VERTSHEARALL
     Text[ greek ] = "���������� ��������, ��������";
     Text[ korean ] = "수직으로 전체 교차";
     Text[ turkish ] = "Dikey kesi�me (t�m�)";
-    Text[ catalan ] = "Cortar vert., todo";
+    Text[ catalan ] = "Retallament vertical, complet";
     Text[ finnish ] = "Pystymurtuma, t�ydellinen";
+    Text[ thai ] = "มุมตัดแนวตั้ง, สมบูรณ์";
 };
 
 String SIP_SA_TRANSFORMREF1X
@@ -16525,8 +17121,9 @@ String SIP_SA_TRANSFORMREF1X
     Text[ korean ] = "참조 포인트 1 X";
     Text[ turkish ] = "Referans noktas� 1 X";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Punto de referencia 1 X";
+    Text[ catalan ] = "Punt de refer�ncia 1 X";
     Text[ finnish ] = "Viitepiste 1 X";
+    Text[ thai ] = "จุดอ้างอิง 1 X";
 };
 
 String SIP_SA_TRANSFORMREF1Y
@@ -16554,8 +17151,9 @@ String SIP_SA_TRANSFORMREF1Y
     Text[ korean ] = "참조 포인트 1 Y";
     Text[ turkish ] = "Referans noktas� 1 Y";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Punto de referencia 1 Y";
+    Text[ catalan ] = "Punt de refer�ncia 1 Y";
     Text[ finnish ] = "Viitepiste 1 Y";
+    Text[ thai ] = "จุดอ้างอิง 1 Y";
 };
 
 String SIP_SA_TRANSFORMREF2X
@@ -16583,8 +17181,9 @@ String SIP_SA_TRANSFORMREF2X
     Text[ korean ] = "참조 포인트 2 X";
     Text[ turkish ] = "Referans noktas� 2 X";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Punto de referencia 2 X";
+    Text[ catalan ] = "Punt de refer�ncia 2 X";
     Text[ finnish ] = "Viitepiste 2 X";
+    Text[ thai ] = "จุดอ้างอิง 2 X";
 };
 
 String SIP_SA_TRANSFORMREF2Y
@@ -16612,8 +17211,9 @@ String SIP_SA_TRANSFORMREF2Y
     Text[ korean ] = "참조 포인트 2 Y";
     Text[ turkish ] = "Referans noktas� 2 Y";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Punto de referencia 2 Y";
+    Text[ catalan ] = "Punt de refer�ncia 2 Y";
     Text[ finnish ] = "Viitepiste 2 Y";
+    Text[ thai ] = "จุดอ้างอิง 2 Y";
 };
 
 String SIP_EE_PARA_HYPHENATE
@@ -16641,8 +17241,9 @@ String SIP_EE_PARA_HYPHENATE
     Text[ korean ] = "하이픈 넣기";
     Text[ turkish ] = "Heceleme";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Separaci�n sil�bica";
+    Text[ catalan ] = "Separaci� en s�l.labes";
     Text[ finnish ] = "Tavutus";
+    Text[ thai ] = "ใช้ยัติภังค์";
 };
 
 String SIP_EE_PARA_BULLETSTATE
@@ -16651,7 +17252,7 @@ String SIP_EE_PARA_BULLETSTATE
     Text [ ENGLISH ] = "Show bullet" ;
     Text[ english_us ] = "Display bullets";
     Text[ portuguese ] = "Mostrar marcas";
-    Text[ russian ] = "�������� ������� ������";
+    Text[ russian ] = "�������� �������";
     Text[ dutch ] = "Opsommingsteken weergeven";
     Text[ french ] = "Afficher les puces";
     Text[ spanish ] = "Mostrar vi�eta";
@@ -16667,11 +17268,12 @@ String SIP_EE_PARA_BULLETSTATE
     Text[ dutch ] = "Opsommingsteken weergeven";
     Text[ chinese_simplified ] = "显示编号字符";
     Text[ greek ] = "�������� �������� ���������";
-    Text[ korean ] = "글머리 기호  나타내기";
+    Text[ korean ] = "글머리 기호 표시";
     Text[ turkish ] = "Madde i�aretlerini g�ster";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Mostrar vi�eta";
+    Text[ catalan ] = "Visualitza els pics";
     Text[ finnish ] = "N�yt� luettelomerkit";
+    Text[ thai ] = "แสดงผลสัญลักษณ์แสดงหัวข้อย่อย";
 };
 
 String SIP_EE_PARA_OUTLLRSPACE
@@ -16680,10 +17282,10 @@ String SIP_EE_PARA_OUTLLRSPACE
     Text [ ENGLISH ] = "Indent of enumeration" ;
     Text[ english_us ] = "Numbering indents";
     Text[ portuguese ] = "Avan�os na numera��o";
-    Text[ russian ] = "������� � ������";
+    Text[ russian ] = "������� ���������";
     Text[ dutch ] = "Inspringing bij opsomming";
     Text[ french ] = "Retraits des puces";
-    Text[ spanish ] = "Sangr�a en enumeraci�n";
+    Text[ spanish ] = "Sangr�a en la enumeraci�n";
     Text[ italian ] = "Rientri nella numerazione";
     Text[ danish ] = "Indrykning ved punktopstilling";
     Text[ swedish ] = "Indrag vid punktuppst�llning";
@@ -16699,8 +17301,9 @@ String SIP_EE_PARA_OUTLLRSPACE
     Text[ korean ] = "글머리 기호에서 들여쓰기";
     Text[ turkish ] = "Numaralama i�in girintiler";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Sangr�a en enumeraci�n";
+    Text[ catalan ] = "Sagnia en enumeraci�";
     Text[ finnish ] = "Numeroinnin sisennys";
+    Text[ thai ] = "ระยะเยื้องลำดับตัวเลข";
 };
 
 String SIP_EE_PARA_OUTLLEVEL
@@ -16709,10 +17312,10 @@ String SIP_EE_PARA_OUTLLEVEL
     Text [ ENGLISH ] = "Layer of enumeration" ;
     Text[ english_us ] = "Numbering level";
     Text[ portuguese ] = "N�vel de numera��o";
-    Text[ russian ] = "������� ������";
+    Text[ russian ] = "������� ���������";
     Text[ dutch ] = "Nummeringsniveau";
     Text[ french ] = "Niveau d'�num�ration";
-    Text[ spanish ] = "Nivel de enumeraci�n";
+    Text[ spanish ] = "Nivel de numeraci�n";
     Text[ italian ] = "Livello di numerazione";
     Text[ danish ] = "Punktopstillingsniveau";
     Text[ swedish ] = "Punktuppst�llningsniv�";
@@ -16725,11 +17328,12 @@ String SIP_EE_PARA_OUTLLEVEL
     Text[ dutch ] = "Nummeringsniveau";
     Text[ chinese_simplified ] = "编号层次";
     Text[ greek ] = "������� ���������";
-    Text[ korean ] = "글머리 기호 수준";
+    Text[ korean ] = "번호 매기기 수준";
     Text[ turkish ] = "Numaralama d�zeyi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Nivel de enumeraci�n";
+    Text[ catalan ] = "Nivell d'enumeraci�";
     Text[ finnish ] = "Numerointitaso";
+    Text[ thai ] = "ระดับลำดับตัวเลข";
 };
 
 String SIP_EE_PARA_BULLET
@@ -16738,10 +17342,10 @@ String SIP_EE_PARA_BULLET
     Text [ ENGLISH ] = "Character of enumeration" ;
     Text[ english_us ] = "Bullets and Numberings";
     Text[ portuguese ] = "Marcas e numera��o";
-    Text[ russian ] = "������� ������";
-    Text[ dutch ] = "Nummeringsteken";
+    Text[ russian ] = "������� � ���������";
+    Text[ dutch ] = "Opsommingstekens";
     Text[ french ] = "Puces";
-    Text[ spanish ] = "Vi�eta";
+    Text[ spanish ] = "Vi�etas";
     Text[ italian ] = "Carattere per elenchi numerati";
     Text[ danish ] = "Punkttegn";
     Text[ swedish ] = "Punktuppst�llningstecken";
@@ -16751,14 +17355,15 @@ String SIP_EE_PARA_BULLET
     Text[ chinese_simplified ] = "编号字符";
     Text[ chinese_traditional ] = "項目符號";
     Text[ arabic ] = "������ �����";
-    Text[ dutch ] = "Nummeringsteken";
+    Text[ dutch ] = "Opsommingstekens";
     Text[ chinese_simplified ] = "编号字符";
     Text[ greek ] = "������� ���������";
-    Text[ korean ] = "글머리 기호";
+    Text[ korean ] = "글머리 기호 및 번호 매기기";
     Text[ turkish ] = "Numaralama ve madde i�aretleri";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Vi�eta";
+    Text[ catalan ] = "Pics i numeracions";
     Text[ finnish ] = "Luettelomerkit ja numeroinnit";
+    Text[ thai ] = "สัญลักษณ์แสดงหัวข้อย่อยและลำดับตัวเลข";
 };
 
 String SIP_EE_PARA_LRSPACE
@@ -16786,8 +17391,9 @@ String SIP_EE_PARA_LRSPACE
     Text[ korean ] = "들여쓰기";
     Text[ turkish ] = "Girintiler";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Sangr�as";
+    Text[ catalan ] = "Sagnats";
     Text[ finnish ] = "Sisennykset";
+    Text[ thai ] = "ระยะเยื้อง";
 };
 
 String SIP_EE_PARA_ULSPACE
@@ -16814,8 +17420,9 @@ String SIP_EE_PARA_ULSPACE
     Text[ greek ] = "���������� ����������";
     Text[ korean ] = "단락 간격";
     Text[ turkish ] = "Paragraf aral�klar�";
-    Text[ catalan ] = "Espacios entre p�rrafos";
+    Text[ catalan ] = "Espais entre par�grafs";
     Text[ finnish ] = "Kappalev�li";
+    Text[ thai ] = "ระยะห่างย่อหน้า";
 };
 
 String SIP_EE_PARA_SBL
@@ -16824,7 +17431,7 @@ String SIP_EE_PARA_SBL
     Text [ ENGLISH ] = "Line distance" ;
     Text[ english_us ] = "Line spacing";
     Text[ portuguese ] = "Entrelinhas";
-    Text[ russian ] = "����� ��������";
+    Text[ russian ] = "��� �����";
     Text[ dutch ] = "Regelafstand";
     Text[ french ] = "Interligne";
     Text[ spanish ] = "Interlineado";
@@ -16840,10 +17447,11 @@ String SIP_EE_PARA_SBL
     Text[ dutch ] = "Regelafstand";
     Text[ chinese_simplified ] = "线条间隔";
     Text[ greek ] = "��������";
-    Text[ korean ] = "행간";
+    Text[ korean ] = "줄 간격";
     Text[ turkish ] = "Sat�r aral���";
-    Text[ catalan ] = "Interlineado";
+    Text[ catalan ] = "Interlineat";
     Text[ finnish ] = "Riviv�li";
+    Text[ thai ] = "ระยะห่างบรรทัด";
 };
 
 String SIP_EE_PARA_JUST
@@ -16871,8 +17479,9 @@ String SIP_EE_PARA_JUST
     Text[ korean ] = "단락 맞춤";
     Text[ turkish ] = "Paragraf hizalamas�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Alineaci�n de p�rrafo";
+    Text[ catalan ] = "Alineament de par�graf";
     Text[ finnish ] = "Kappaleen tasaus";
+    Text[ thai ] = "จัดตำแหน่งย่อหน้า";
 };
 
 String SIP_EE_PARA_TABS
@@ -16881,7 +17490,7 @@ String SIP_EE_PARA_TABS
     Text [ ENGLISH ] = "Tabulators" ;
     Text[ english_us ] = "Tabulators";
     Text[ portuguese ] = "Tabula��es";
-    Text[ russian ] = "����������";
+    Text[ russian ] = "���������";
     Text[ dutch ] = "Tabulatoren";
     Text[ french ] = "Tabulations";
     Text[ spanish ] = "Tabuladores";
@@ -16899,8 +17508,9 @@ String SIP_EE_PARA_TABS
     Text[ greek ] = "����������";
     Text[ korean ] = "탭";
     Text[ turkish ] = "Sekmeler";
-    Text[ catalan ] = "Tabulaciones";
-    Text[ finnish ] = "Tabulaattorit";
+    Text[ catalan ] = "Tabuladors";
+    Text[ finnish ] = "Sarkaimet";
+    Text[ thai ] = "ที่เลื่อนแคร่พิมพ์";
 };
 
 String SIP_EE_CHAR_COLOR
@@ -16925,11 +17535,12 @@ String SIP_EE_CHAR_COLOR
     Text[ dutch ] = "Tekstkleur";
     Text[ chinese_simplified ] = "文字颜色";
     Text[ greek ] = "����� ��������������";
-    Text[ korean ] = "글꼴 색";
+    Text[ korean ] = "글꼴 색상";
     Text[ turkish ] = "Yaz�tipi rengi";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Color de fuente";
+    Text[ catalan ] = "Color de la lletra";
     Text[ finnish ] = "Fontin v�ri";
+    Text[ thai ] = "สีตัวอักษร";
 };
 
 String SIP_EE_CHAR_FONTINFO
@@ -16938,7 +17549,7 @@ String SIP_EE_CHAR_FONTINFO
     Text [ ENGLISH ] = "Font" ;
     Text[ english_us ] = "Character set";
     Text[ portuguese ] = "Conjunto de caracteres";
-    Text[ russian ] = "�����";
+    Text[ russian ] = "���������";
     Text[ dutch ] = "Tekenset";
     Text[ french ] = "Police";
     Text[ spanish ] = "Juego de caracteres";
@@ -16956,8 +17567,9 @@ String SIP_EE_CHAR_FONTINFO
     Text[ greek ] = "��� ����������";
     Text[ korean ] = "문자집합";
     Text[ turkish ] = "Karakter k�mesi";
-    Text[ catalan ] = "Juego de caracteres";
+    Text[ catalan ] = "Joc de car�cters";
     Text[ finnish ] = "Merkist�";
+    Text[ thai ] = "ชุดตัวอักขระ";
 };
 
 String SIP_EE_CHAR_FONTHEIGHT
@@ -16985,8 +17597,9 @@ String SIP_EE_CHAR_FONTHEIGHT
     Text[ korean ] = "글꼴 크기";
     Text[ turkish ] = "Yaz�tipi boyutu";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Tama�o de fuente";
+    Text[ catalan ] = "Mida de la lletra";
     Text[ finnish ] = "Fonttikoko";
+    Text[ thai ] = "ขนาดตัวอักษร";
 };
 
 String SIP_EE_CHAR_FONTWIDTH
@@ -17014,8 +17627,9 @@ String SIP_EE_CHAR_FONTWIDTH
     Text[ korean ] = "글꼴 너비";
     Text[ turkish ] = "Yaz�tipi geni�li�i";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Ancho de fuente";
+    Text[ catalan ] = "Amplada de la lletra";
     Text[ finnish ] = "Fontin leveys";
+    Text[ thai ] = "ความกว้างตัวอักษร";
 };
 
 String SIP_EE_CHAR_WEIGHT
@@ -17024,7 +17638,7 @@ String SIP_EE_CHAR_WEIGHT
     Text [ ENGLISH ] = "Bold" ;
     Text[ english_us ] = "Bold (thickness)";
     Text[ portuguese ] = "Espessura para caracteres";
-    Text[ russian ] = "������� ������";
+    Text[ russian ] = "�������� (�������)";
     Text[ dutch ] = "Vet";
     Text[ french ] = "Graisse de police";
     Text[ spanish ] = "Negrita";
@@ -17040,10 +17654,11 @@ String SIP_EE_CHAR_WEIGHT
     Text[ dutch ] = "Vet";
     Text[ chinese_simplified ] = "粗体";
     Text[ greek ] = "����� ��������������";
-    Text[ korean ] = "글꼴 두께";
+    Text[ korean ] = "글꼴 굵기";
     Text[ turkish ] = "Yaz�tipi kal�nl���";
-    Text[ catalan ] = "Negrita";
-    Text[ finnish ] = "Lihavointi (paksuus)";
+    Text[ catalan ] = "Negreta (gruix)";
+    Text[ finnish ] = "Lihavoitu (paksuus)";
+    Text[ thai ] = "หนา (ความหนา)";
 };
 
 String SIP_EE_CHAR_UNDERLINE
@@ -17063,7 +17678,7 @@ String SIP_EE_CHAR_UNDERLINE
     Text[ portuguese_brazilian ] = "Underline";
     Text[ japanese ] = "下線";
     Text[ chinese_simplified ] = "下划线";
-    Text[ chinese_traditional ] = "下划線";
+    Text[ chinese_traditional ] = "下劃線";
     Text[ arabic ] = "�� ����";
     Text[ dutch ] = "Onderstrepen";
     Text[ chinese_simplified ] = "下划线";
@@ -17071,8 +17686,9 @@ String SIP_EE_CHAR_UNDERLINE
     Text[ korean ] = "밑줄";
     Text[ turkish ] = "Alt� �izili";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Subrayado";
-    Text[ finnish ] = "Alleviivaa";
+    Text[ catalan ] = "Subratllat";
+    Text[ finnish ] = "Alleviivaus";
+    Text[ thai ] = "ขีดเส้นใต้";
 };
 
 String SIP_EE_CHAR_STRIKEOUT
@@ -17092,7 +17708,7 @@ String SIP_EE_CHAR_STRIKEOUT
     Text[ portuguese_brazilian ] = "Strike through";
     Text[ japanese ] = "取り消し線";
     Text[ chinese_simplified ] = "中划线";
-    Text[ chinese_traditional ] = "中划線";
+    Text[ chinese_traditional ] = "中劃線";
     Text[ arabic ] = "���";
     Text[ dutch ] = "Doorhalen";
     Text[ chinese_simplified ] = "中划线";
@@ -17100,8 +17716,9 @@ String SIP_EE_CHAR_STRIKEOUT
     Text[ korean ] = "취소선";
     Text[ turkish ] = "�st� �izili";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Tachado";
+    Text[ catalan ] = "Barrat";
     Text[ finnish ] = "Yliviivaus";
+    Text[ thai ] = "ขีดทับ";
 };
 
 String SIP_EE_CHAR_ITALIC
@@ -17130,7 +17747,8 @@ String SIP_EE_CHAR_ITALIC
     Text[ turkish ] = "�talik";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Cursiva";
-    Text[ finnish ] = "Kursivointi";
+    Text[ finnish ] = "Kursivoitu";
+    Text[ thai ] = "เอียง";
 };
 
 String SIP_EE_CHAR_OUTLINE
@@ -17139,7 +17757,7 @@ String SIP_EE_CHAR_OUTLINE
     Text [ ENGLISH ] = "Contour" ;
     Text[ english_us ] = "Outline";
     Text[ portuguese ] = "Contorno";
-    Text[ russian ] = "��������� �����";
+    Text[ russian ] = "������";
     Text[ dutch ] = "Contour";
     Text[ french ] = "Contour";
     Text[ spanish ] = "Contorno";
@@ -17157,8 +17775,9 @@ String SIP_EE_CHAR_OUTLINE
     Text[ greek ] = "������������� �������������";
     Text[ korean ] = "윤곽 문자";
     Text[ turkish ] = "Konturlu yaz�";
-    Text[ catalan ] = "Contorno";
+    Text[ catalan ] = "Contorn";
     Text[ finnish ] = "J�sennys";
+    Text[ thai ] = "เค้าร่าง";
 };
 
 String SIP_EE_CHAR_SHADOW
@@ -17183,10 +17802,11 @@ String SIP_EE_CHAR_SHADOW
     Text[ dutch ] = "Schaduw";
     Text[ chinese_simplified ] = "字体阴影";
     Text[ greek ] = "���� ��������������";
-    Text[ korean ] = "글꼴 음영";
+    Text[ korean ] = "글꼴 그림자";
     Text[ turkish ] = "Yaz�tipi g�lgesi";
-    Text[ catalan ] = "Sombra";
+    Text[ catalan ] = "Ombra de la lletra";
     Text[ finnish ] = "Fontin varjostus";
+    Text[ thai ] = "เงาตัวอักษร";
 };
 
 String SIP_EE_CHAR_ESCAPEMENT
@@ -17195,7 +17815,7 @@ String SIP_EE_CHAR_ESCAPEMENT
     Text [ ENGLISH ] = "Escapement" ;
     Text[ english_us ] = "Superscript/subscript";
     Text[ portuguese ] = "Acima/abaixo da linha";
-    Text[ russian ] = "�������/������ ������";
+    Text[ russian ] = "������� ������/������ ������";
     Text[ dutch ] = "Super-/subscript";
     Text[ french ] = "Exposant/Indice";
     Text[ spanish ] = "Sub/Super�ndice";
@@ -17216,6 +17836,7 @@ String SIP_EE_CHAR_ESCAPEMENT
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Sub/Super�ndice";
     Text[ finnish ] = "Yl�indeksi/alaindeksi";
+    Text[ thai ] = "ตัวยก/ตัวห้อย";
 };
 
 String SIP_EE_CHAR_PAIRKERNING
@@ -17225,7 +17846,7 @@ String SIP_EE_CHAR_PAIRKERNING
     Text[ english_us ] = "Kerning";
     Text[ portuguese ] = "Kerning";
     Text[ russian ] = "�������";
-    Text[ dutch ] = "Spati�ring";
+    Text[ dutch ] = "Kerning";
     Text[ french ] = "Cr�nage";
     Text[ spanish ] = "Ajuste entre caracteres";
     Text[ italian ] = "Kerning";
@@ -17237,14 +17858,15 @@ String SIP_EE_CHAR_PAIRKERNING
     Text[ chinese_simplified ] = "字母间隔相等";
     Text[ chinese_traditional ] = "字母間隔相等";
     Text[ arabic ] = "����� ������";
-    Text[ dutch ] = "Spati�ring";
+    Text[ dutch ] = "Kerning";
     Text[ chinese_simplified ] = "字母间隔相等";
     Text[ greek ] = "�������";
     Text[ korean ] = "커닝";
     Text[ turkish ] = "Aral�k azaltma";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Ajuste entre caracteres";
+    Text[ catalan ] = "Interlletratge";
     Text[ finnish ] = "Fonttilimitys";
+    Text[ thai ] = "ปรับระยะ";
 };
 
 String SIP_EE_CHAR_KERNING
@@ -17254,7 +17876,7 @@ String SIP_EE_CHAR_KERNING
     Text[ english_us ] = "Manual kerning";
     Text[ portuguese ] = "Sublinhado manual";
     Text[ russian ] = "��������� �������� �������";
-    Text[ dutch ] = "Handmatige spati�ring";
+    Text[ dutch ] = "Handmatige kerning";
     Text[ french ] = "Cr�nage manuel";
     Text[ spanish ] = "Ajuste entre caracteres, manual";
     Text[ italian ] = "Kerning manuale";
@@ -17266,13 +17888,14 @@ String SIP_EE_CHAR_KERNING
     Text[ chinese_simplified ] = "使用者设定字母间隔";
     Text[ chinese_traditional ] = "自訂字母間隔";
     Text[ arabic ] = "����� ���� ����";
-    Text[ dutch ] = "Handmatige spati�ring";
+    Text[ dutch ] = "Handmatige kerning";
     Text[ chinese_simplified ] = "使用者设定字母间隔";
     Text[ greek ] = "����������� �������������";
     Text[ korean ] = "수동 커닝";
     Text[ turkish ] = "Man�el aral�k azaltma";
-    Text[ catalan ] = "Ajuste entre caracteres, manual";
+    Text[ catalan ] = "Interlletratge manual";
     Text[ finnish ] = "Manuaalinen v�listys";
+    Text[ thai ] = "ปรับระยะด้วยตนเอง";
 };
 
 String SIP_EE_CHAR_WLM
@@ -17282,7 +17905,7 @@ String SIP_EE_CHAR_WLM
     Text[ english_us ] = "No underline for spaces";
     Text[ portuguese ] = "N�o sublinhar espa�os";
     Text[ russian ] = "������� �� ������������";
-    Text[ dutch ] = "Spaties niet onderstepen";
+    Text[ dutch ] = "Spaties niet onderstrepen";
     Text[ french ] = "Aucun soulignage des espaces";
     Text[ spanish ] = "No subrayar espacios vac�os";
     Text[ italian ] = "Non sottolineare spazi";
@@ -17292,16 +17915,17 @@ String SIP_EE_CHAR_WLM
     Text[ portuguese_brazilian ] = "No underline for spaces";
     Text[ japanese ] = "空白は下線なし";
     Text[ chinese_simplified ] = "空格处不加下划线";
-    Text[ chinese_traditional ] = "空格不加下划線";
+    Text[ chinese_traditional ] = "空格不加下劃線";
     Text[ arabic ] = "�������� ���� �� ����";
-    Text[ dutch ] = "Spaties niet onderstepen";
+    Text[ dutch ] = "Spaties niet onderstrepen";
     Text[ chinese_simplified ] = "空格处不加下划线";
     Text[ greek ] = "����� ����������� �����";
-    Text[ korean ] = "공백에 밑줄 긋지 않음";
+    Text[ korean ] = "공백 밑에 밑줄 넣지 않음";
     Text[ turkish ] = "Bo�luklar�n alt�n� �izme";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "No subrayar espacios vac�os";
+    Text[ catalan ] = "Sense subratllat per als espais";
     Text[ finnish ] = "Ei alleviivausta v�leihin";
+    Text[ thai ] = "ไม่ขีดเส้นใต้ช่องว่าง";
 };
 
 String SIP_EE_FEATURE_TAB
@@ -17310,7 +17934,7 @@ String SIP_EE_FEATURE_TAB
     Text [ ENGLISH ] = "Tabulator" ;
     Text[ english_us ] = "Tabulator";
     Text[ portuguese ] = "Tabula��o";
-    Text[ russian ] = "���������";
+    Text[ russian ] = "���������";
     Text[ dutch ] = "Tabulator";
     Text[ french ] = "Tabulation";
     Text[ spanish ] = "Tabulador";
@@ -17329,8 +17953,9 @@ String SIP_EE_FEATURE_TAB
     Text[ korean ] = "탭";
     Text[ turkish ] = "Sekme";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Tabulaci�n";
-    Text[ finnish ] = "Tabulaattori";
+    Text[ catalan ] = "Tabulador";
+    Text[ finnish ] = "Sarkain";
+    Text[ thai ] = "ที่เลื่อนแคร่พิมพ์";
 };
 
 String SIP_EE_FEATURE_LINEBR
@@ -17339,7 +17964,7 @@ String SIP_EE_FEATURE_LINEBR
     Text [ ENGLISH ] = "Soft line break" ;
     Text[ english_us ] = "Optional line break";
     Text[ portuguese ] = "Quebra de linha suave";
-    Text[ russian ] = "������ ������ ������";
+    Text[ russian ] = "������ ������� ������";
     Text[ dutch ] = "Zachte woordafbreking";
     Text[ french ] = "Renvoi � la ligne souple";
     Text[ spanish ] = "Salto de l�nea manual";
@@ -17355,17 +17980,18 @@ String SIP_EE_FEATURE_LINEBR
     Text[ dutch ] = "Zachte woordafbreking";
     Text[ chinese_simplified ] = "软性换行符";
     Text[ greek ] = "����� ������ �������";
-    Text[ korean ] = "임의의 개행";
+    Text[ korean ] = "사용자 지정 줄 바꿈";
     Text[ turkish ] = "Sat�r sonu";
-    Text[ catalan ] = "Salto de l�nea manual";
+    Text[ catalan ] = "Salt de l�nia manual";
     Text[ finnish ] = "Valinnainen rivinvaihto";
+    Text[ thai ] = "ตัวแบ่งบรรทัดทางเลือก";
 };
 
 String SIP_EE_FEATURE_NOTCONV
 {
     Text = "Nichtkonvertierbares Zeichen";
     Text [ ENGLISH ] = "Non convertable character" ;
-    Text[ english_us ] = "Non convertable character";
+    Text[ english_us ] = "Non-convertible character";
     Text[ portuguese ] = "Caracter n�o convert�vel";
     Text[ russian ] = "��������������� ����";
     Text[ dutch ] = "Niet-converteerbaar teken";
@@ -17385,8 +18011,9 @@ String SIP_EE_FEATURE_NOTCONV
     Text[ greek ] = "�� ������������ ����������";
     Text[ korean ] = "변환 불가능한 문자";
     Text[ turkish ] = "D�n��t�r�lemeyen karakter";
-    Text[ catalan ] = "Car�cter no convertible";
+    Text[ catalan ] = "Car�cter no convertible";
     Text[ finnish ] = "Merkki� ei voi muuntaa";
+    Text[ thai ] = "ไม่สามารถแปลงตัวอักขระ";
 };
 
 String SIP_EE_FEATURE_FIELD
@@ -17395,7 +18022,7 @@ String SIP_EE_FEATURE_FIELD
     Text [ ENGLISH ] = "Auto field" ;
     Text[ english_us ] = "Fields";
     Text[ portuguese ] = "Campos";
-    Text[ russian ] = "����";
+    Text[ russian ] = "����";
     Text[ dutch ] = "Veldopdracht";
     Text[ french ] = "Champ";
     Text[ spanish ] = "Campos";
@@ -17411,10 +18038,11 @@ String SIP_EE_FEATURE_FIELD
     Text[ dutch ] = "Veldopdracht";
     Text[ chinese_simplified ] = "字段指令";
     Text[ greek ] = "������ ������";
-    Text[ korean ] = "필드 명령";
+    Text[ korean ] = "필드";
     Text[ turkish ] = "Alan ��esi";
-    Text[ catalan ] = "Campo";
+    Text[ catalan ] = "Camps";
     Text[ finnish ] = "Kent�t";
+    Text[ thai ] = "เขตข้อมูล";
 };
 
 String SIP_SA_GRAFRED
@@ -17428,7 +18056,7 @@ String SIP_SA_GRAFRED
     Text[ french ] = "Proportion de rouge";
     Text[ spanish ] = "Proporci�n de rojo";
     Text[ swedish ] = "Andel r�tt";
-    Text[ russian ] = "���� ��������";
+    Text[ russian ] = "���������� ��������";
     Text[ italian ] = "Percentuale di rosso";
     Text[ danish ] = "R�d-andel";
     Text[ polish ] = "Zawarto�� czerw.";
@@ -17439,8 +18067,9 @@ String SIP_SA_GRAFRED
     Text[ chinese_traditional ] = "紅色比例";
     Text[ arabic ] = "���� ������";
     Text[ turkish ] = "K�rm�z� oran�";
-    Text[ catalan ] = "Proporci�n de rojo";
+    Text[ catalan ] = "Vermell";
     Text[ finnish ] = "Punainen";
+    Text[ thai ] = "แดง";
 };
 String SIP_SA_GRAFGREEN
 {
@@ -17453,7 +18082,7 @@ String SIP_SA_GRAFGREEN
     Text[ french ] = "Proportion de vert";
     Text[ spanish ] = "Proporci�n de verde";
     Text[ swedish ] = "Andel gr�nt";
-    Text[ russian ] = "���� ��������";
+    Text[ russian ] = "���������� ��������";
     Text[ italian ] = "Percentuale di verde";
     Text[ danish ] = "Gr�n-andel";
     Text[ polish ] = "Zawarto�� zielonego";
@@ -17464,8 +18093,9 @@ String SIP_SA_GRAFGREEN
     Text[ chinese_traditional ] = "綠色比例";
     Text[ arabic ] = "���� ������";
     Text[ turkish ] = "Ye�il oran�";
-    Text[ catalan ] = "Proporci�n de verde";
+    Text[ catalan ] = "Verd";
     Text[ finnish ] = "Vihre�";
+    Text[ thai ] = "เขียว";
 };
 String SIP_SA_GRAFBLUE
 {
@@ -17489,8 +18119,9 @@ String SIP_SA_GRAFBLUE
     Text[ chinese_traditional ] = "藍色比例";
     Text[ arabic ] = "���� ������";
     Text[ turkish ] = "Mavi oran�";
-    Text[ catalan ] = "Proporci�n de azul";
+    Text[ catalan ] = "Blau";
     Text[ finnish ] = "Sininen";
+    Text[ thai ] = "น้ำเงิน";
 };
 String SIP_SA_GRAFLUMINANCE
 {
@@ -17514,8 +18145,9 @@ String SIP_SA_GRAFLUMINANCE
     Text[ chinese_traditional ] = "亮度";
     Text[ arabic ] = "�������";
     Text[ turkish ] = "Parlakl�k";
-    Text[ catalan ] = "Brillo";
+    Text[ catalan ] = "Brillantor";
     Text[ finnish ] = "Kirkkaus";
+    Text[ thai ] = "ความสว่าง";
 };
 String SIP_SA_GRAFCONTRAST
 {
@@ -17539,8 +18171,9 @@ String SIP_SA_GRAFCONTRAST
     Text[ chinese_traditional ] = "對比度";
     Text[ arabic ] = "�������";
     Text[ turkish ] = "Kontrast";
-    Text[ catalan ] = "Contraste";
+    Text[ catalan ] = "Contrast";
     Text[ finnish ] = "Kontrasti";
+    Text[ thai ] = "ความคมชัด";
 };
 String SIP_SA_GRAFGAMMA
 {
@@ -17566,6 +18199,7 @@ String SIP_SA_GRAFGAMMA
     Text[ turkish ] = "Gamma";
     Text[ catalan ] = "Gamma";
     Text[ finnish ] = "Gamma";
+    Text[ thai ] = "แกมม่า";
 };
 String SIP_SA_GRAFTRANSPARENCE
 {
@@ -17589,8 +18223,9 @@ String SIP_SA_GRAFTRANSPARENCE
     Text[ chinese_traditional ] = "透明";
     Text[ arabic ] = "������";
     Text[ turkish ] = "Saydaml�k";
-    Text[ catalan ] = "Transparencia";
-    Text[ finnish ] = "L�pikuultavuus";
+    Text[ catalan ] = "Transpar�ncia";
+    Text[ finnish ] = "L�pin�kyvyys";
+    Text[ thai ] = "ความโปร่งแสง";
 };
 String SIP_SA_GRAFINVERT
 {
@@ -17614,8 +18249,9 @@ String SIP_SA_GRAFINVERT
     Text[ chinese_traditional ] = "互補色轉換";
     Text[ arabic ] = "���";
     Text[ turkish ] = "Tersine �evir";
-    Text[ catalan ] = "Invertir";
+    Text[ catalan ] = "Inverteix";
     Text[ finnish ] = "K��nn�";
+    Text[ thai ] = "สลับ";
 };
 String SIP_SA_GRAFMODE
 {
@@ -17634,13 +18270,14 @@ String SIP_SA_GRAFMODE
     Text[ polish ] = "Tryb grafiki";
     Text[ portuguese_brazilian ] = "Graphics mode";
     Text[ japanese ] = "図モード";
-    Text[ korean ] = "그래픽 모드";
+    Text[ korean ] = "그림 모드";
     Text[ chinese_simplified ] = "图形模式";
     Text[ chinese_traditional ] = "圖形模式";
     Text[ arabic ] = "��� �����";
     Text[ turkish ] = "Grafik kipi";
-    Text[ catalan ] = "Modo gr�fico";
+    Text[ catalan ] = "Mode gr�fic";
     Text[ finnish ] = "Grafiikkatila";
+    Text[ thai ] = "โหมดกราฟิค";
 };
 String SIP_SA_GRAFCROP
 {
@@ -17649,9 +18286,9 @@ String SIP_SA_GRAFCROP
     Text[ english_us ] = "Crop";
 
     Text[ portuguese ] = "Recortar";
-    Text[ russian ] = "��������";
+    Text[ russian ] = "�����������";
     Text[ greek ] = "����������";
-    Text[ dutch ] = "Knippen";
+    Text[ dutch ] = "Uitknippen";
     Text[ french ] = "Rogner";
     Text[ spanish ] = "Recortar";
     Text[ italian ] = "Taglia";
@@ -17665,8 +18302,9 @@ String SIP_SA_GRAFCROP
     Text[ chinese_traditional ] = "裁剪";
     Text[ turkish ] = "Crop";
     Text[ arabic ] = "������";
-    Text[ catalan ] = "Cortar";
+    Text[ catalan ] = "Retalla";
     Text[ finnish ] = "Rajaa";
+    Text[ thai ] = "ครอบตัด";
 };
 String SIP_SA_GRAFRESERVE3 { Text = "" ; };
 String SIP_SA_GRAFRESERVE4 { Text = "" ; };
@@ -17683,19 +18321,20 @@ String SIP_SDRATTRSET_GRAF
     Text[ french ] = "Attributs graphiques";
     Text[ spanish ] = "Atributos de imagen";
     Text[ swedish ] = "Grafikattribut";
-    Text[ russian ] = "�������� �������";
+    Text[ russian ] = "�������� ����������� ��������";
     Text[ italian ] = "Attributi grafici";
     Text[ danish ] = "Grafikattributter";
     Text[ polish ] = "Atrybuty grafiki";
     Text[ portuguese_brazilian ] = "Graphics attributes";
     Text[ japanese ] = "図の属性";
-    Text[ korean ] = "그래픽 속성";
+    Text[ korean ] = "그림 속성";
     Text[ chinese_simplified ] = "图形属性";
     Text[ chinese_traditional ] = "圖形屬性";
     Text[ arabic ] = "���� �����";
     Text[ turkish ] = "Grafik �znitelikleri";
-    Text[ catalan ] = "Atributos de imagen";
+    Text[ catalan ] = "Atributs d'imatge";
     Text[ finnish ] = "Grafiikkam��ritteet";
+    Text[ thai ] = "คุณลักษณะกราฟิค";
 };
 
 Bitmap SIP_SA_MARKERS
@@ -17708,18 +18347,18 @@ Bitmap SIP_SA_FINE_MARKERS
     File = "markers2.bmp";
 };
 
-// #101928#
-Bitmap SIP_SA_ACCESSIBILITY_MARKERS
-{
-    File = "markersACC.bmp";
-};
-
 // #100499#
 Bitmap BMP_OLEOBJ
 {
     File = "oleobj.bmp" ;
 };
 
+// #101928#
+Bitmap SIP_SA_ACCESSIBILITY_MARKERS
+{
+    File = "markersACC.bmp";
+};
+
 // ******************************************************************* EOF
 
 
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 3b3aa1102b5f..153702309646 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdundo.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: aw $ $Date: 2002-11-20 16:28:31 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,6 +75,11 @@
 #include <outlobj.hxx>
 #endif
 
+// #i11426#
+#ifndef _SVDOGRP_HXX
+#include <svdogrp.hxx>
+#endif
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 TYPEINIT1(SdrUndoAction,SfxUndoAction);
@@ -304,6 +309,10 @@ SdrUndoAttrObj::SdrUndoAttrObj(SdrObject& rNewObj, FASTBOOL bStyleSheet1, FASTBO
     pRedoStyleSheet(NULL),
     pRepeatStyleSheet(NULL),
     pTextUndo(NULL),
+
+    // #i8508#
+    pTextRedo(NULL),
+
     pUndoGroup(NULL),
     bHaveToTakeRedoSet(TRUE)
 {
@@ -356,6 +365,10 @@ SdrUndoAttrObj::~SdrUndoAttrObj()
         delete pUndoGroup;
     if(pTextUndo)
         delete pTextUndo;
+
+    // #i8508#
+    if(pTextRedo)
+        delete pTextRedo;
 }
 
 void SdrUndoAttrObj::SetRepeatAttr(const SfxItemSet& rSet)
@@ -383,6 +396,15 @@ void SdrUndoAttrObj::Undo()
             pRedoSet->Put(pObj->GetItemSet());
             if(bStyleSheet)
                 pRedoStyleSheet=pObj->GetStyleSheet();
+
+            if(pTextUndo)
+            {
+                // #i8508#
+                pTextRedo = pObj->GetOutlinerParaObject();
+
+                if(pTextRedo)
+                    pTextRedo = pTextRedo->Clone();
+            }
         }
 
         if(bStyleSheet)
@@ -451,6 +473,12 @@ void SdrUndoAttrObj::Redo()
         }
 
         pObj->BroadcastItemChange(aItemChange);
+
+        // #i8508#
+        if(pTextRedo)
+        {
+            pObj->SetOutlinerParaObject(pTextRedo->Clone());
+        }
     }
 
     if(pUndoGroup)
@@ -690,9 +718,29 @@ void SdrUndoRemoveObj::Undo()
     ImpShowPageOfThisObject();
 
     DBG_ASSERT(!pObj->IsInserted(),"UndoRemoveObj: pObj ist bereits Inserted");
-    if (!pObj->IsInserted()) {
+    if (!pObj->IsInserted())
+    {
+        // #i11426#
+        // For UNDOs in Calc/Writer it is necessary to adapt the anchor
+        // pos of the target object.
+        Point aOwnerAnchorPos(0, 0);
+
+        if(pObjList
+            && pObjList->GetOwnerObj()
+            && pObjList->GetOwnerObj()->ISA(SdrObjGroup))
+        {
+            aOwnerAnchorPos = pObjList->GetOwnerObj()->GetAnchorPos();
+        }
+
         SdrInsertReason aReason(SDRREASON_UNDO);
         pObjList->InsertObject(pObj,nOrdNum,&aReason);
+
+        // #i11426#
+        if(aOwnerAnchorPos.X() || aOwnerAnchorPos.Y())
+        {
+            pObj->NbcSetAnchorPos(aOwnerAnchorPos);
+        }
+
         if(pObjList->GetOwnerObj() && pObjList->GetOwnerObj()->ISA(E3dObject) && pObj->ISA(E3dObject))
         {
             E3dScene* pScene = ((E3dObject*)pObjList->GetOwnerObj())->GetScene();
diff --git a/svx/source/svrtf/rtfgrf.cxx b/svx/source/svrtf/rtfgrf.cxx
index bdfe342ea928..f65681022606 100644
--- a/svx/source/svrtf/rtfgrf.cxx
+++ b/svx/source/svrtf/rtfgrf.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: rtfgrf.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: jp $ $Date: 2001-11-30 18:18:25 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,6 +59,8 @@
  *
  ************************************************************************/
 
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
+
 #pragma hdrstop
 
 #ifndef _CACHESTR_HXX //autogen
@@ -575,4 +577,4 @@ void SvxRTFPictureType::ResetValues()
     nCropT = nCropB = nCropL = nCropR = 0;
 }
 
-
+/* vi:set tabstop=4 shiftwidth=4 expandtab: */
diff --git a/svx/source/svrtf/rtfitem.cxx b/svx/source/svrtf/rtfitem.cxx
index 2f152e02f7ef..b9222299fa0c 100644
--- a/svx/source/svrtf/rtfitem.cxx
+++ b/svx/source/svrtf/rtfitem.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: rtfitem.cxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: cmc $ $Date: 2002-11-12 10:25:58 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,6 +59,8 @@
  *
  ************************************************************************/
 
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
+
 #pragma hdrstop
 
 #define ITEMID_FONTLIST     0
@@ -503,6 +505,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                 break;
 
             case RTF_LI:
+            case RTF_LIN:
                 if( PARDID->nLRSpace )
                 {
                     SvxLRSpaceItem aLR( GetLRSpace(*pSet, PARDID->nLRSpace ));
@@ -519,6 +522,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                 break;
 
             case RTF_RI:
+            case RTF_RIN:
                 if( PARDID->nLRSpace )
                 {
                     SvxLRSpaceItem aLR( GetLRSpace(*pSet, PARDID->nLRSpace ));
@@ -603,7 +607,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                     // (100%) und dem Leerraum ueber der Zeile (20%).
                     SvxLineSpacingItem aLSpace( 0, PARDID->nLinespacing );
 
-                    if( !nTokenValue || -1 == nTokenValue || 1000 == nTokenValue )
+                    if( !nTokenValue || 1000 == nTokenValue )
                         nTokenValue = 240;
 
                     SvxLineSpace eLnSpc;
@@ -716,7 +720,7 @@ SET_FONTALIGNMENT:
                     else
                     {
                         nEs = (short)-nTokenValue;
-                        nProp = DFLT_ESC_PROP;
+                        nProp = (nToken == RTF_SUB) ? DFLT_ESC_PROP : 100;
                     }
                     pSet->Put( SvxEscapementItem( nEs, nProp, nEsc ));
                 }
@@ -778,7 +782,10 @@ SET_FONTALIGNMENT:
                                     SID_ATTR_CHAR_FONT );
                     SetScriptAttr( eCharType, *pSet, aTmpItem );
                     if( RTF_F == nToken )
+                    {
                         SetEncoding( rSVFont.GetCharSet() );
+                        RereadLookahead();
+                    }
                 }
                 break;
 
@@ -962,7 +969,7 @@ ATTR_SETUNDERLINE:
                     else
                     {
                         nEs = (short)nTokenValue;
-                        nProp = DFLT_ESC_PROP;
+                        nProp = (nToken == RTF_SUPER) ? DFLT_ESC_PROP : 100;
                     }
                     pSet->Put( SvxEscapementItem( nEs, nProp, nEsc ));
                 }
@@ -2049,4 +2056,4 @@ void SvxRTFParser::UnknownAttrToken( int nToken, SfxItemSet* pSet )
 {
 }
 
-
+/* vi:set tabstop=4 shiftwidth=4 expandtab: */
diff --git a/svx/source/svrtf/segincr.asm b/svx/source/svrtf/segincr.asm
new file mode 100644
index 000000000000..028e8830cbb1
--- /dev/null
+++ b/svx/source/svrtf/segincr.asm
@@ -0,0 +1,72 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;  $RCSfile: segincr.asm,v $
+;;
+;;  $Revision: 1.4 $
+;;
+;;  last change: $Author: hr $ $Date: 2003-03-27 15:04:51 $
+;;
+;;  The Contents of this file are made available subject to the terms of
+;;  either of the following licenses
+;;
+;;         - GNU Lesser General Public License Version 2.1
+;;         - Sun Industry Standards Source License Version 1.1
+;;
+;;  Sun Microsystems Inc., October, 2000
+;;
+;;  GNU Lesser General Public License Version 2.1
+;;  =============================================
+;;  Copyright 2000 by Sun Microsystems, Inc.
+;;  901 San Antonio Road, Palo Alto, CA 94303, USA
+;;
+;;  This library is free software; you can redistribute it and/or
+;;  modify it under the terms of the GNU Lesser General Public
+;;  License version 2.1, as published by the Free Software Foundation.
+;;
+;;  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., 59 Temple Place, Suite 330, Boston,
+;;  MA  02111-1307  USA
+;;
+;;
+;;  Sun Industry Standards Source License Version 1.1
+;;  =================================================
+;;  The contents of this file are subject to the Sun Industry Standards
+;;  Source License Version 1.1 (the "License"); You may not use this file
+;;  except in compliance with the License. You may obtain a copy of the
+;;  License at http://www.openoffice.org/license.html.
+;;
+;;  Software provided under this License is provided on an "AS IS" basis,
+;;  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+;;  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+;;  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+;;  See the License for the specific provisions governing your rights and
+;;  obligations concerning the Software.
+;;
+;;  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+;;
+;;  Copyright: 2000 by Sun Microsystems, Inc.
+;;
+;;  All Rights Reserved.
+;;
+;;  Contributor(s): _______________________________________
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+EXTRN   __AHINCR:abs
+         .MODEL  LARGE
+STARTWS0_SEG SEGMENT WORD PUBLIC 'STARTWS_CODE'
+
+         PUBLIC  _SegIncr
+_SegIncr PROC
+         MOV AX, __AHINCR
+         RET
+_SegIncr ENDP
+
+STARTWS0_SEG ENDS
+         END
diff --git a/svx/source/svrtf/svxrtf.cxx b/svx/source/svrtf/svxrtf.cxx
index c3d937cada4e..d96833ed12e5 100644
--- a/svx/source/svrtf/svxrtf.cxx
+++ b/svx/source/svrtf/svxrtf.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svxrtf.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: cmc $ $Date: 2002-07-29 10:11:56 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,6 +59,8 @@
  *
  ************************************************************************/
 
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
+
 #pragma hdrstop
 
 #define ITEMID_FONT     0
@@ -1458,3 +1460,5 @@ RTFPardAttrMapIds ::RTFPardAttrMapIds ( const SfxItemPool& rPool )
     nForbRule = rPool.GetTrueWhich( SID_ATTR_PARA_FORBIDDEN_RULES, FALSE );
     nDirection = rPool.GetTrueWhich( SID_ATTR_FRAMEDIRECTION, FALSE );
 }
+
+/* vi:set tabstop=4 shiftwidth=4 expandtab: */
diff --git a/svx/source/svxlink/linkmgr.src b/svx/source/svxlink/linkmgr.src
index f043b5cb8012..5b330e0421be 100644
--- a/svx/source/svxlink/linkmgr.src
+++ b/svx/source/svxlink/linkmgr.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: linkmgr.src,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: kz $ $Date: 2001-11-16 22:24:37 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -78,7 +78,7 @@ String RID_SVXSTR_FILELINK
     Text[ chinese_simplified ] = "文档";
     Text[ russian ] = "��������";
     Text[ polish ] = "Dokument";
-    Text[ japanese ] = "ﾄﾞｷｭﾒﾝﾄ";
+    Text[ japanese ] = "ドキュメント";
     Text[ chinese_traditional ] = "文件";
     Text[ arabic ] = "�������";
     Text[ dutch ] = "Document";
@@ -87,7 +87,8 @@ String RID_SVXSTR_FILELINK
     Text[ korean ] = "문서";
     Text[ turkish ] = "Belge";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Documento";
+    Text[ catalan ] = "Document";
+    Text[ thai ] = "เอกสาร";
 };
 String RID_SVXSTR_GRAFIKLINK
 {
@@ -105,7 +106,7 @@ String RID_SVXSTR_GRAFIKLINK
     Text [ spanish ] = "Imagen" ;
     Text [ english_us ] = "Graphic" ;
     Text[ chinese_simplified ] = "图形";
-    Text[ russian ] = "�������";
+    Text[ russian ] = "����������� ������";
     Text[ polish ] = "Grafika";
     Text[ japanese ] = "図";
     Text[ chinese_traditional ] = "圖形";
@@ -116,7 +117,8 @@ String RID_SVXSTR_GRAFIKLINK
     Text[ korean ] = "그래픽";
     Text[ turkish ] = "Grafik";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Imagen";
+    Text[ catalan ] = "Imatge";
+    Text[ thai ] = "กราฟิค";
 };
 String RID_SVXSTR_EDITGRFLINK
 {
@@ -128,7 +130,7 @@ String RID_SVXSTR_EDITGRFLINK
     Text [ italian ] = "Collega immagine" ;
     Text [ portuguese_brazilian ] = "Ligar a Gr?fico" ;
     Text [ portuguese ] = "Ligar imagem" ;
-    Text [ finnish ] = "Linkit? kuvat" ;
+    Text [ finnish ] = "Linkit� kuvat" ;
     Text [ danish ] = "K�d grafik" ;
     Text [ french ] = "Image du lien" ;
     Text [ swedish ] = "L�nka till grafik" ;
@@ -136,18 +138,19 @@ String RID_SVXSTR_EDITGRFLINK
     Text [ spanish ] = "Enlazar imagen" ;
     Text [ english_us ] = "Link graphics" ;
     Text[ chinese_simplified ] = "链接图形";
-    Text[ russian ] = "������� �������";
+    Text[ russian ] = "������������ �����";
     Text[ polish ] = "Po��cz grafik�";
-    Text[ japanese ] = "図をﾘﾝｸする";
+    Text[ japanese ] = "図をリンクする";
     Text[ chinese_traditional ] = "連結圖形";
     Text[ arabic ] = "��� ��������";
     Text[ language_user1 ] = "LS 09.08.99 Wir wollen in der franz?ischen Version m?lichst Substantive als Dialog?erschriften haben. Hier wird die bestehende Verkn?fung ge?dert, d.h., es wird eine neue Grafik ausgew?lt";
     Text[ dutch ] = "Afbeelding koppelen";
     Text[ chinese_simplified ] = "链接图形";
     Text[ greek ] = "������� ��������";
-    Text[ korean ] = "그래픽 연결";
+    Text[ korean ] = "그림 연결";
     Text[ turkish ] = "Grafik ba�lant�s� olu�tur";
-    Text[ catalan ] = "Enlazar imagen";
+    Text[ catalan ] = "Enlla�a la imatge";
+    Text[ thai ] = "เชื่อมโยงกราฟิค";
 };
 String RID_SVXSTR_GRFLINKPROGRESS
 {
@@ -157,25 +160,26 @@ String RID_SVXSTR_GRFLINKPROGRESS
     Text [ english_us ] = "Importing graphic..." ;
     Text [ italian ] = "Importazione immagine..." ;
     Text [ spanish ] = "Importando imagen..." ;
-    Text [ french ] = "Import d'image en cours..." ;
+    Text [ french ] = "Import de l'image..." ;
     Text [ swedish ] = "Importerar grafik..." ;
     Text [ danish ] = "Importerer grafik..." ;
     Text [ portuguese ] = "A importar imagem..." ;
     Text [ portuguese_brazilian ] = "Importiere Grafik..." ;
     Text[ chinese_simplified ] = "输入图形...";
-    Text[ russian ] = "������ �������...";
+    Text[ russian ] = "������ ������������ �������...";
     Text[ polish ] = "Importuj grafik�...";
-    Text[ japanese ] = "図のｲﾝﾎﾟｰﾄ...";
+    Text[ japanese ] = "図のインポート...";
     Text[ chinese_traditional ] = "匯入圖形...";
     Text[ arabic ] = "������� ������...";
     Text[ dutch ] = "Bezig met het importeren van afbeelding...";
     Text[ chinese_simplified ] = "输入图形...";
     Text[ greek ] = "�������� ��������...";
-    Text[ korean ] = "그래픽 가져 오는 중...";
+    Text[ korean ] = "그림을 가져오고 있습니다...";
     Text[ turkish ] = "��e aktar (grafik)...";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Importando imagen...";
+    Text[ catalan ] = "S'est� important la imatge...";
     Text[ finnish ] = "Tuodaan grafiikkaa...";
+    Text[ thai ] = "กำลังนำเข้ากราฟิค...";
 };
 Bitmap RID_SVXGRF_GRAPHICLOAD
 {
@@ -187,3 +191,12 @@ Bitmap RID_SVXGRF_GRAPHICLOAD
 
 
 
+
+
+
+
+
+
+
+
+
diff --git a/svx/source/tbxctrls/colrctrl.src b/svx/source/tbxctrls/colrctrl.src
index d996953c775c..23057a3d4ea8 100644
--- a/svx/source/tbxctrls/colrctrl.src
+++ b/svx/source/tbxctrls/colrctrl.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: colrctrl.src,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: kz $ $Date: 2001-11-16 22:26:50 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -100,7 +100,7 @@ DockingWindow RID_SVXCTRL_COLOR
     Text[ russian ] = "�����";
     Text[ polish ] = "Kolory";
     Text[ japanese ] = "色";
-    Text[ chinese_traditional ] = "顔色";
+    Text[ chinese_traditional ] = "顏色";
     Text[ arabic ] = "�������";
     Text[ dutch ] = "Kleuren";
     Text[ chinese_simplified ] = "颜色";
@@ -108,8 +108,9 @@ DockingWindow RID_SVXCTRL_COLOR
     Text[ korean ] = "색상";
     Text[ turkish ] = "Renkler";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Colores";
-    Text[ finnish ] = "V?rit";
+    Text[ catalan ] = "Colors";
+    Text[ finnish ] = "V�rit";
+    Text[ thai ] = "สี";
 };
  // ********************************************************************** EOF
 
@@ -118,3 +119,10 @@ DockingWindow RID_SVXCTRL_COLOR
 
 
 
+
+
+
+
+
+
+
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index d364a35ebbd9..b16d698ff969 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: grafctrl.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: cl $ $Date: 2002-06-13 10:29:05 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -121,6 +121,7 @@
 #include "svdmodel.hxx"
 #include "svdograf.hxx"
 #include "svdundo.hxx"
+#include "svdtrans.hxx"
 #include "grafctrl.hxx"
 
 // -----------
@@ -1055,7 +1056,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
                 aCropDlgAttr.Put( SvxBrushItem( pObj->GetGraphic(), GPOS_MM, SID_ATTR_GRAF_GRAPHIC ) );
                 aCropDlgAttr.Put( SvxSizeItem( SID_ATTR_PAGE_SIZE,
                                                Size( OutputDevice::LogicToLogic(
-                                                     Size( 100000, 100000 ), aMap100, aMapTwip ) ) ) );
+                                                     Size( 200000, 200000 ), aMap100, aMapTwip ) ) ) );
                 aCropDlgAttr.Put( SvxSizeItem( SID_ATTR_GRAF_FRMSIZE, OutputDevice::LogicToLogic(
                                                pObj->GetLogicRect().GetSize(), aMap100, aMapTwip ) ) );
 
@@ -1102,10 +1103,41 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
                             Size        aNewGrfSize( OutputDevice::LogicToLogic( rGrfSize, aMapTwip, aMap100 ) );
                             Size        aOldGrfSize( pObj->GetLogicRect().GetSize() );
 
-                            aNewOrigin.X() -= ( aNewGrfSize.Width() - aOldGrfSize.Width() ) >> 1;
-                            aNewOrigin.Y() -= ( aNewGrfSize.Height() - aOldGrfSize.Height() ) >> 1;
+                            Rectangle aNewRect( aNewOrigin, aNewGrfSize );
+                            Point aOffset( (aNewGrfSize.Width() - aOldGrfSize.Width()) >> 1,
+                                           (aNewGrfSize.Height() - aOldGrfSize.Height()) >> 1 );
 
-                            const Rectangle aNewRect( aNewOrigin, aNewGrfSize );
+                            // #106181# rotate snap rect before setting it
+                            const GeoStat& aGeo = pObj->GetGeoStat();
+
+                            if (aGeo.nDrehWink!=0 || aGeo.nShearWink!=0)
+                            {
+                                Polygon aPol(aNewRect);
+
+                                // also transform origin offset
+                                if (aGeo.nShearWink!=0)
+                                {
+                                    ShearPoly(aPol,
+                                              aNewRect.TopLeft(),
+                                              aGeo.nTan);
+                                    ShearPoint(aOffset, Point(0,0), aGeo.nTan);
+                                }
+                                if (aGeo.nDrehWink!=0)
+                                {
+                                    RotatePoly(aPol,
+                                               aNewRect.TopLeft(),
+                                               aGeo.nSin,aGeo.nCos);
+                                    RotatePoint(aOffset, Point(0,0), aGeo.nSin,aGeo.nCos);
+                                }
+
+                                // apply offset
+                                aPol.Move( -aOffset.X(), -aOffset.Y() );
+                                aNewRect=aPol.GetBoundRect();
+                            }
+                            else
+                            {
+                                aNewRect.Move( -aOffset.X(), -aOffset.Y() );
+                            }
 
                             if( !aSet.Count() )
                                 rView.SetMarkedObjRect( aNewRect );
diff --git a/svx/source/tbxctrls/grafctrl.src b/svx/source/tbxctrls/grafctrl.src
index d1519340f535..d647833d3017 100644
--- a/svx/source/tbxctrls/grafctrl.src
+++ b/svx/source/tbxctrls/grafctrl.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: grafctrl.src,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: kz $ $Date: 2001-07-26 22:22:59 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -154,19 +154,20 @@ FloatingWindow RID_SVXTBX_GRFFILTER
     Text[ french ] = "Filtres";
     Text[ spanish ] = "Filtros";
     Text[ italian ] = "Filtri";
-    Text[ danish ] = "Filtre";
+    Text[ danish ] = "Filter";
     Text[ swedish ] = "Filter";
     Text[ polish ] = "Filtr";
     Text[ portuguese_brazilian ] = "Filter";
-    Text[ japanese ] = "̨��";
-    Text[ korean ] = "����";
-    Text[ chinese_simplified ] = "ɸѡ";
-    Text[ chinese_traditional ] = "�z��";
+    Text[ japanese ] = "フィルタ";
+    Text[ korean ] = "필터";
+    Text[ chinese_simplified ] = "筛选";
+    Text[ chinese_traditional ] = "篩選";
     Text[ arabic ] = "�����";
     Text[ turkish ] = "Filtre";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Filtros";
+    Text[ catalan ] = "Filtres";
     Text[ finnish ] = "Suodattimet";
+    Text[ thai ] = "ตัวกรอง";
 };
 
 // -----------
@@ -189,14 +190,15 @@ String RID_SVXSTR_UNDO_GRAFMODE
     Text[ danish ] = "Grafikmodus";
     Text[ polish ] = "Tryb grafiki";
     Text[ portuguese_brazilian ] = "Graphics mode";
-    Text[ japanese ] = "�}Ӱ��";
-    Text[ korean ] = "�׷��� ���";
-    Text[ chinese_simplified ] = "ͼ��ģʽ";
-    Text[ chinese_traditional ] = "�ϧμҦ�";
+    Text[ japanese ] = "図モード";
+    Text[ korean ] = "그림 모드";
+    Text[ chinese_simplified ] = "图形模式";
+    Text[ chinese_traditional ] = "圖形模式";
     Text[ arabic ] = "��� �����";
     Text[ turkish ] = "Grafik kipi";
-    Text[ catalan ] = "Modo gr�fico";
+    Text[ catalan ] = "Mode gr�fic";
     Text[ finnish ] = "Grafiikkatila";
+    Text[ thai ] = "โหมดกราฟิค";
 };
 String RID_SVXSTR_UNDO_GRAFRED
 {
@@ -214,14 +216,15 @@ String RID_SVXSTR_UNDO_GRAFRED
     Text[ danish ] = "R�d-andel";
     Text[ polish ] = "Zawarto�� czerw.";
     Text[ portuguese_brazilian ] = "Red portion";
-    Text[ japanese ] = "�ԐF�̊���";
-    Text[ korean ] = "����";
-    Text[ chinese_simplified ] = "��ɫ����";
-    Text[ chinese_traditional ] = "������";
+    Text[ japanese ] = "赤色の割合";
+    Text[ korean ] = "적색";
+    Text[ chinese_simplified ] = "红色比例";
+    Text[ chinese_traditional ] = "紅色比例";
     Text[ arabic ] = "���� ������";
     Text[ turkish ] = "K�rm�z� oran�";
-    Text[ catalan ] = "Proporci�n de rojo";
+    Text[ catalan ] = "Vermell";
     Text[ finnish ] = "Punainen";
+    Text[ thai ] = "แดง";
 };
 String RID_SVXSTR_UNDO_GRAFGREEN
 {
@@ -239,14 +242,15 @@ String RID_SVXSTR_UNDO_GRAFGREEN
     Text[ danish ] = "Gr�n-andel";
     Text[ polish ] = "Zawarto�� zielonego";
     Text[ portuguese_brazilian ] = "Green portion";
-    Text[ japanese ] = "�ΐF�̊���";
-    Text[ korean ] = "���";
-    Text[ chinese_simplified ] = "��ɫ����";
-    Text[ chinese_traditional ] = "�����";
+    Text[ japanese ] = "緑色の割合";
+    Text[ korean ] = "녹색";
+    Text[ chinese_simplified ] = "绿色比例";
+    Text[ chinese_traditional ] = "綠色比例";
     Text[ arabic ] = "���� ������";
     Text[ turkish ] = "Ye�il oran�";
-    Text[ catalan ] = "Proporci�n de verde";
+    Text[ catalan ] = "Verd";
     Text[ finnish ] = "Vihre�";
+    Text[ thai ] = "เขียว";
 };
 String RID_SVXSTR_UNDO_GRAFBLUE
 {
@@ -264,14 +268,15 @@ String RID_SVXSTR_UNDO_GRAFBLUE
     Text[ danish ] = "Bl�-andel";
     Text[ polish ] = "Zawarto�� niebiesk.";
     Text[ portuguese_brazilian ] = "Blue portion";
-    Text[ japanese ] = "�F�̊���";
-    Text[ korean ] = "û��";
-    Text[ chinese_simplified ] = "��ɫ����";
-    Text[ chinese_traditional ] = "�Ŧ���";
+    Text[ japanese ] = "青色の割合";
+    Text[ korean ] = "청색";
+    Text[ chinese_simplified ] = "蓝色比例";
+    Text[ chinese_traditional ] = "藍色比例";
     Text[ arabic ] = "���� ������";
     Text[ turkish ] = "Mavi oran�";
-    Text[ catalan ] = "Proporci�n de azul";
+    Text[ catalan ] = "Blau";
     Text[ finnish ] = "Sininen";
+    Text[ thai ] = "น้ำเงิน";
 };
 String RID_SVXSTR_UNDO_GRAFLUMINANCE
 {
@@ -289,14 +294,15 @@ String RID_SVXSTR_UNDO_GRAFLUMINANCE
     Text[ danish ] = "Lysstyrke";
     Text[ polish ] = "Jasno��";
     Text[ portuguese_brazilian ] = "Luminance";
-    Text[ japanese ] = "���x";
-    Text[ korean ] = "���";
-    Text[ chinese_simplified ] = "����";
-    Text[ chinese_traditional ] = "�G��";
+    Text[ japanese ] = "明度";
+    Text[ korean ] = "밝기";
+    Text[ chinese_simplified ] = "亮度";
+    Text[ chinese_traditional ] = "亮度";
     Text[ arabic ] = "�������";
     Text[ turkish ] = "Parlakl�k";
-    Text[ catalan ] = "Brillo";
+    Text[ catalan ] = "Brillantor";
     Text[ finnish ] = "Kirkkaus";
+    Text[ thai ] = "ความสว่าง";
 };
 String RID_SVXSTR_UNDO_GRAFCONTRAST
 {
@@ -311,17 +317,18 @@ String RID_SVXSTR_UNDO_GRAFCONTRAST
     Text[ swedish ] = "Kontrast";
     Text[ russian ] = "��������";
     Text[ italian ] = "Contrasto";
-    Text[ danish ] = "- Kontrast";
+    Text[ danish ] = "Kontrast";
     Text[ polish ] = "Kontrast";
     Text[ portuguese_brazilian ] = "Contrast";
-    Text[ japanese ] = "���׽�";
-    Text[ korean ] = "���";
-    Text[ chinese_simplified ] = "�Աȶ�";
-    Text[ chinese_traditional ] = "����";
+    Text[ japanese ] = "コントラスト";
+    Text[ korean ] = "대비";
+    Text[ chinese_simplified ] = "对比度";
+    Text[ chinese_traditional ] = "對比度";
     Text[ arabic ] = "�������";
     Text[ turkish ] = "Kontrast� azalt";
-    Text[ catalan ] = "Contraste";
+    Text[ catalan ] = "Contrast";
     Text[ finnish ] = "Kontrasti";
+    Text[ thai ] = "ความคมชัด";
 };
 String RID_SVXSTR_UNDO_GRAFGAMMA
 {
@@ -339,14 +346,15 @@ String RID_SVXSTR_UNDO_GRAFGAMMA
     Text[ danish ] = "Gamma";
     Text[ polish ] = "Gama";
     Text[ portuguese_brazilian ] = "Gamma";
-    Text[ japanese ] = "����";
-    Text[ korean ] = "����";
-    Text[ chinese_simplified ] = "��ɫϵ��";
-    Text[ chinese_traditional ] = "�Ǧ�t��";
+    Text[ japanese ] = "ガンマ";
+    Text[ korean ] = "감마";
+    Text[ chinese_simplified ] = "灰色系数";
+    Text[ chinese_traditional ] = "灰色系數";
     Text[ arabic ] = "����";
     Text[ turkish ] = "Gamma";
     Text[ catalan ] = "Gamma";
     Text[ finnish ] = "Gamma";
+    Text[ thai ] = "แกมม่า";
 };
 String RID_SVXSTR_UNDO_GRAFTRANSPARENCY
 {
@@ -364,14 +372,15 @@ String RID_SVXSTR_UNDO_GRAFTRANSPARENCY
     Text[ danish ] = "Transparens";
     Text[ polish ] = "Przezroczysto��";
     Text[ portuguese_brazilian ] = "Transparency";
-    Text[ japanese ] = "���ߐ�";
-    Text[ korean ] = "����";
-    Text[ chinese_simplified ] = "͸��";
-    Text[ chinese_traditional ] = "�z��";
+    Text[ japanese ] = "透過性";
+    Text[ korean ] = "투명도";
+    Text[ chinese_simplified ] = "透明";
+    Text[ chinese_traditional ] = "透明";
     Text[ arabic ] = "������";
     Text[ turkish ] = "Saydaml�k";
-    Text[ catalan ] = "Transparencia";
-    Text[ finnish ] = "L�pikuultavuus";
+    Text[ catalan ] = "Transpar�ncia";
+    Text[ finnish ] = "L�pin�kyvyys";
+    Text[ thai ] = "ความโปร่งแสง";
 };
 String RID_SVXSTR_GRAFCROP
 {
@@ -379,24 +388,25 @@ String RID_SVXSTR_GRAFCROP
     Text[ english ] = "Crop";
     Text[ english_us ] = "Crop";
     Text[ portuguese ] = "Recortar";
-    Text[ russian ] = "��������";
+    Text[ russian ] = "�����������";
     Text[ greek ] = "����������";
     Text[ dutch ] = "Uitknippen";
     Text[ french ] = "Rogner";
     Text[ spanish ] = "Recortar";
     Text[ italian ] = "Taglia";
-    Text[ danish ] = "Crop";
+    Text[ danish ] = "Besk�r";
     Text[ swedish ] = "Besk�r";
     Text[ polish ] = "Przytnij";
     Text[ portuguese_brazilian ] = "Crop";
-    Text[ japanese ] = "���ݸ�";
-    Text[ korean ] = "�ٵ��";
-    Text[ chinese_simplified ] = "�ü�";
-    Text[ chinese_traditional ] = "����";
+    Text[ japanese ] = "トリミング";
+    Text[ korean ] = "다듬기";
+    Text[ chinese_simplified ] = "裁剪";
+    Text[ chinese_traditional ] = "裁剪";
     Text[ turkish ] = "Crop";
     Text[ arabic ] = "������";
-    Text[ catalan ] = "Recortar";
+    Text[ catalan ] = "Retalla";
     Text[ finnish ] = "Rajaa";
+    Text[ thai ] = "ครอบตัด";
 };
 
 // ********************************************************************** EOF
@@ -404,3 +414,15 @@ String RID_SVXSTR_GRAFCROP
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index dd44704ef988..36d21f330659 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: itemwin.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: cl $ $Date: 2002-06-04 12:48:05 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -97,7 +97,9 @@
 #include "dlgutil.hxx"
 #include "itemwin.hxx"
 #include "linectrl.hxx"
-#include "colorcfg.hxx"
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include <svtools/colorcfg.hxx>
+#endif
 
 #include "linectrl.hrc"
 
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index 8742452a9f9b..4ce448062fa4 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: layctrl.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: os $ $Date: 2002-12-06 13:02:17 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -89,6 +89,9 @@
 #include <dialmgr.hxx>
 #endif
 
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include <svtools/colorcfg.hxx>
+#endif
 
 
 SFX_IMPL_TOOLBOX_CONTROL(SvxTableToolBoxControl,SfxUInt16Item);
@@ -142,7 +145,8 @@ TableWindow::TableWindow( USHORT nId, SfxBindings& rBind, ToolBox& rParentTbx )
     rTbx(rParentTbx)
 {
     const StyleSettings& rStyles = Application::GetSettings().GetStyleSettings();
-    aLineColor = rStyles.GetWindowTextColor();
+    svtools::ColorConfig aColorConfig;
+    aLineColor = Color( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor );
     aHighlightLineColor = rStyles.GetHighlightTextColor();
     aFillColor = rStyles.GetWindowColor();
     aHighlightFillColor = rStyles.GetHighlightColor();
@@ -517,7 +521,8 @@ ColumnsWindow::ColumnsWindow( USHORT nId, SfxBindings& rBind,
 
 {
     const StyleSettings& rStyles = Application::GetSettings().GetStyleSettings();
-    aLineColor = rStyles.GetWindowTextColor();
+    svtools::ColorConfig aColorConfig;
+    aLineColor = Color( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor );
     aHighlightLineColor = rStyles.GetHighlightTextColor();
     aFillColor = rStyles.GetWindowColor();
     aHighlightFillColor = rStyles.GetHighlightColor();
diff --git a/svx/source/tbxctrls/lboxctrl.src b/svx/source/tbxctrls/lboxctrl.src
index a7d93d6c47b1..11a259dd267e 100644
--- a/svx/source/tbxctrls/lboxctrl.src
+++ b/svx/source/tbxctrls/lboxctrl.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: lboxctrl.src,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: ssa $ $Date: 2002-07-02 15:18:25 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -95,24 +95,24 @@ String RID_SVXSTR_NUM_UNDO_ACTIONS
     Text [ENGLISH] = "Undo $(ARG1) action(s)" ;
     Text[ english_us ] = "Undo $(ARG1) action(s)";
     Text[ portuguese ] = "Anular opera��o $(ARG1)";
-    Text[ russian ] = "�������� ��������(�) $(ARG1)";
+    Text[ russian ] = "�������� $(ARG1)";
     Text[ greek ] = "Undo $(ARG1) action";
-    Text[ dutch ] = "Ongedaan $(ARG1) activiteit(en)";
+    Text[ dutch ] = "Ongedaan maken $(ARG1) activiteit(en)";
     Text[ french ] = "Annuler $(ARG1) op�ration(s)";
     Text[ spanish ] = "Deshacer $(ARG1) acci�n(es)";
-    Text[ finnish ] = "Peruuta $(ARG1) toimintoa";
+    Text[ finnish ] = "Kumoa $(ARG1) toiminto(a)";
     Text[ italian ] = "Annulla $(ARG1) operazione/i";
-    Text[ danish ] = "Undo $(ARG1) action";
+    Text[ danish ] = "Fortryd $(ARG1) handling(er)";
     Text[ swedish ] = "�ngra $(ARG1) �tg�rd(er)";
     Text[ polish ] = "Cofnij $(ARG1) akcj�(e)";
     Text[ portuguese_brazilian ] = "Undo $(ARG1) action";
     Text[ japanese ] = "$(ARG1) アクションを元に戻す";
-    Text[ korean ] = "$(ARG1) 작업 실행 취소";
+    Text[ korean ] = "$(ARG1) 작동 실행 취소";
     Text[ chinese_simplified ] = "撤消命令 $(ARG1) 操作";
     Text[ chinese_traditional ] = "復原 $(ARG1) 指令";
     Text[ turkish ] = "Undo $(ARG1) action";
     Text[ arabic ] = "Undo $(ARG1) action";
-    Text[ catalan ] = "Undo $(ARG1) action";
+    Text[ catalan ] = "Desf�s $(ARG1) acci�/ns";
     Text[ thai ] = "เลิกทำการกระทำ $(ARG1) ";
 };
 
@@ -122,24 +122,38 @@ String RID_SVXSTR_NUM_REDO_ACTIONS
     Text [ENGLISH] = "Redo $(ARG1) action(s)" ;
     Text[ english_us ] = "Redo $(ARG1) action(s)";
     Text[ portuguese ] = "Restaurar opera��o $(ARG1)";
-    Text[ russian ] = "������������ ��������(�) $(ARG1)";
+    Text[ russian ] = "������� $(ARG1)";
     Text[ greek ] = "��������� $(ARG1) ���������(��)";
     Text[ dutch ] = "Herhalen $(ARG1) activiteit(en)";
     Text[ french ] = "Restaurer $(ARG1) op�ration(s)";
     Text[ spanish ] = "Restaurar $(ARG1) acci�n(es)";
-    Text[ finnish ] = "Toista $(ARG1) toimintoa";
+    Text[ finnish ] = "Toista $(ARG1) toiminto(a)";
     Text[ italian ] = "Ripeti $(ARG1) operazione/i";
-    Text[ danish ] = "Redo $(ARG1) action";
+    Text[ danish ] = "Gendan $(ARG1) handling(er)";
     Text[ swedish ] = "�terst�ll $(ARG1) �tg�rd(er)";
     Text[ polish ] = "Odtw�rz $(ARG1) akcj�(e)";
     Text[ portuguese_brazilian ] = "Redo $(ARG1) action";
     Text[ japanese ] = "$(ARG1) アクションのやり直し";
-    Text[ korean ] = "$(ARG1) 작업 삭제 취소";
+    Text[ korean ] = "$(ARG1) 작동 다시 실행";
     Text[ chinese_simplified ] = "恢复撤消命令 $(ARG1) 操作";
     Text[ chinese_traditional ] = "恢復撤消 $(ARG1) 指令";
     Text[ turkish ] = "Redo $(ARG1) action";
     Text[ arabic ] = "Redo $(ARG1) action";
-    Text[ catalan ] = "Redo $(ARG1) action";
+    Text[ catalan ] = "Ref�s $(ARG1) acci�/ns";
     Text[ thai ] = "ทำการกระทำ $(ARG1) ซ้ำ";
 };
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index ceb949c4c09d..19349b18ee8b 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tbcontrl.cxx,v $
  *
- *  $Revision: 1.37 $
+ *  $Revision: 1.38 $
  *
- *  last change: $Author: gt $ $Date: 2002-12-04 15:07:16 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -115,6 +115,10 @@
 
 #define _SVX_TBCONTRL_CXX
 
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include <svtools/colorcfg.hxx>
+#endif
+
 #include "dialogs.hrc"
 #include "svxitems.hrc"
 #include "helpid.hrc"
@@ -242,6 +246,7 @@ public:
                           nFtCount = pList->GetFontNameCount(); }
     virtual long    PreNotify( NotifyEvent& rNEvt );
     virtual long    Notify( NotifyEvent& rNEvt );
+    virtual ::com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessible > CreateAccessible();
 };
 
 //========================================================================
@@ -1749,7 +1754,8 @@ void SvxLineWindow_Impl::CreateBitmaps( void )
     String                  aStr;
 
     const StyleSettings&    rStyleSettings = Application::GetSettings().GetStyleSettings();
-    Color                   aLineCol( rStyleSettings.GetWindowTextColor() );
+    svtools::ColorConfig aColorConfig;
+    Color                   aLineCol( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor );
     Color                   aBackCol( rStyleSettings.GetWindowColor() );
     aLineSet.Clear();
 
@@ -2903,4 +2909,11 @@ BOOL lcl_FontChangedHint( const SfxHint &rHint )
                             ( pSimpleHint->GetId() & SFX_HINT_DATACHANGED ) );
     }
 }
+// -----------------------------------------------------------------------------
+::com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessible > SvxFontNameBox_Impl::CreateAccessible()
+{
+    FillList();
+    return FontNameBox::CreateAccessible();
+}
+
 
diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src
index e2687ba15af7..370691776740 100644
--- a/svx/source/tbxctrls/tbcontrl.src
+++ b/svx/source/tbxctrls/tbcontrl.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tbcontrl.src,v $
  *
- *  $Revision: 1.30 $
+ *  $Revision: 1.31 $
  *
- *  last change: $Author: os $ $Date: 2002-12-06 13:04:43 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:04:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -161,7 +161,7 @@ String RID_SVXSTR_FRAME
     Text [ french ] = "Bordure" ;
     Text [ swedish ] = "Inramning" ;
     Text [ dutch ] = "Omranding" ;
-    Text [ spanish ] = "Borde" ;
+    Text [ spanish ] = "Bordes" ;
     Text [ english_us ] = "Borders" ;
     Text[ chinese_simplified ] = "边框";
     Text[ russian ] = "����������";
@@ -198,7 +198,7 @@ String RID_SVXSTR_FRAME_STYLE
     Text[ chinese_traditional ] = "邊框樣式";
     Text[ arabic ] = "��� ������";
     Text[ greek ] = "���� �������������";
-    Text[ korean ] = "테두리 유형";
+    Text[ korean ] = "테두리 스타일";
     Text[ turkish ] = "Kenarl�k bi�imi";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Estil de la vora";
@@ -226,7 +226,7 @@ String RID_SVXSTR_FRAME_COLOR
     Text[ chinese_traditional ] = "邊框顏色";
     Text[ arabic ] = "��� ������";
     Text[ greek ] = "������� �������������";
-    Text[ korean ] = "테두리 색";
+    Text[ korean ] = "테두리 색상";
     Text[ turkish ] = "Kenarl�k rengi";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Color de la vora";
@@ -252,7 +252,7 @@ String RID_SVXSTR_EXTRAS_CHARBACKGROUND
     Text [ swedish ] = "Teckenbakgrund" ;
     Text [ danish ] = "Tegnbaggrund" ;
     Text [ italian ] = "Sfondo caratteri" ;
-    Text [ spanish ] = "Fondo de car�cter" ;
+    Text [ spanish ] = "Fondo del car�cter" ;
     Text [ french ] = "Trame de fond" ;
     Text [ dutch ] = "Tekenachtergrond" ;
     Text [ portuguese ] = "Destacar caracteres" ;
@@ -263,7 +263,7 @@ String RID_SVXSTR_EXTRAS_CHARBACKGROUND
     Text[ chinese_traditional ] = "字元背景";
     Text[ arabic ] = "����� ����";
     Text[ greek ] = "����� ����������";
-    Text[ korean ] = "강조";
+    Text[ korean ] = "문자 배경";
     Text[ turkish ] = "Vurgu";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Ressaltament";
@@ -326,6 +326,25 @@ String RID_SVXSTR_PAGES
 {
     Text = "Seiten";
     Text[ english_us ] = "Pages";
+    Text[ portuguese ] = "Pages";
+    Text[ russian ] = "Pages";
+    Text[ greek ] = "Pages";
+    Text[ dutch ] = "Pages";
+    Text[ french ] = "Pages";
+    Text[ spanish ] = "P�ginas";
+    Text[ finnish ] = "Pages";
+    Text[ italian ] = "Pagine";
+    Text[ danish ] = "Pages";
+    Text[ swedish ] = "Pages";
+    Text[ polish ] = "Pages";
+    Text[ japanese ] = "ページ";
+    Text[ korean ] = "페이지";
+    Text[ chinese_simplified ] = "页";
+    Text[ chinese_traditional ] = "頁";
+    Text[ turkish ] = "Pages";
+    Text[ arabic ] = "Pages";
+    Text[ catalan ] = "Pages";
+    Text[ thai ] = "Pages";
 };
 Image RID_SVXIMG_GRAF_RED
 {
@@ -399,3 +418,8 @@ Image RID_SVXIMG_GRAF_TRANSPARENCE_H
 };
 
 // ********************************************************************** EOF
+
+
+
+
+
diff --git a/svx/source/tbxctrls/tbxdraw.src b/svx/source/tbxctrls/tbxdraw.src
index 6f2610fc6f0c..12f05c3e6184 100644
--- a/svx/source/tbxctrls/tbxdraw.src
+++ b/svx/source/tbxctrls/tbxdraw.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tbxdraw.src,v $
  *
- *  $Revision: 1.34 $
+ *  $Revision: 1.35 $
  *
- *  last change: $Author: kz $ $Date: 2001-11-13 22:44:04 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:05:00 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -110,7 +110,8 @@ FloatingWindow RID_SVXTBX_DRAW
                 Text[ arabic ] = "�����";
                 Text[ turkish ] = "Se�im";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Selecci�n";
+                Text[ catalan ] = "Selecci�";
+                Text[ thai ] = "การเลือก";
             };
             ToolBoxItem
             {
@@ -140,7 +141,8 @@ FloatingWindow RID_SVXTBX_DRAW
                 Text[ arabic ] = "��";
                 Text[ turkish ] = "�izgi";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "L�nea";
+                Text[ catalan ] = "L�nia";
+                Text[ thai ] = "เส้น";
             };
             ToolBoxItem
             {
@@ -170,7 +172,8 @@ FloatingWindow RID_SVXTBX_DRAW
                 Text[ arabic ] = "������";
                 Text[ turkish ] = "Dikd�rtgen";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Rect�ngulo";
+                Text[ catalan ] = "Rectangle";
+                Text[ thai ] = "สี่เหลี่ยม";
             };
             ToolBoxItem
             {
@@ -183,7 +186,7 @@ FloatingWindow RID_SVXTBX_DRAW
                 Text [ italian ] = "Ellisse" ;
                 Text [ portuguese_brazilian ] = "Elipse" ;
                 Text [ portuguese ] = "Elipse" ;
-                Text [ finnish ] = "Ellipsi" ;
+                Text [ finnish ] = "Soikio" ;
                 Text [ danish ] = "Ellipse" ;
                 Text [ french ] = "Ellipse" ;
                 Text [ swedish ] = "Ellips" ;
@@ -192,7 +195,7 @@ FloatingWindow RID_SVXTBX_DRAW
                 Text [ english_us ] = "Ellipse" ;
                 Text [ dutch ] = "Ellips" ;
                 Text[ chinese_simplified ] = "椭圆";
-                Text[ russian ] = "�������";
+                Text[ russian ] = "������";
                 Text[ polish ] = "Elipsa";
                 Text[ japanese ] = "楕円形";
                 Text[ chinese_traditional ] = "橢圓形";
@@ -202,6 +205,7 @@ FloatingWindow RID_SVXTBX_DRAW
                 Text[ turkish ] = "Elips";
                 Text[ language_user1 ] = " ";
                 Text[ catalan ] = "Elipse";
+                Text[ thai ] = "วงรี";
             };
             ToolBoxItem
             {
@@ -214,7 +218,7 @@ FloatingWindow RID_SVXTBX_DRAW
                 Text [ italian ] = "Poligono" ;
                 Text [ portuguese_brazilian ] = "Pol?gono" ;
                 Text [ portuguese ] = "Pol�gono" ;
-                Text [ finnish ] = "Polygoni" ;
+                Text [ finnish ] = "Monikulmio" ;
                 Text [ danish ] = "Polygon" ;
                 Text [ french ] = "Polygone" ;
                 Text [ swedish ] = "Polygon" ;
@@ -231,7 +235,8 @@ FloatingWindow RID_SVXTBX_DRAW
                 Text[ arabic ] = "����";
                 Text[ turkish ] = "Poligon";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Pol�gono";
+                Text[ catalan ] = "Pol�gon";
+                Text[ thai ] = "หลายเหลี่ยม";
             };
             ToolBoxItem
             {
@@ -247,9 +252,9 @@ FloatingWindow RID_SVXTBX_DRAW
                 Text[ dutch ] = "Boog";
                 Text[ french ] = "Courbe";
                 Text[ spanish ] = "Curva";
-                Text[ finnish ] = "B�zier";
+                Text[ finnish ] = "K�yr�";
                 Text[ italian ] = "Curva";
-                Text[ danish ] = "Bezier";
+                Text[ danish ] = "Kurve";
                 Text[ swedish ] = "Kurva";
                 Text[ polish ] = "Krzywa";
                 Text[ portuguese_brazilian ] = "Bezier";
@@ -260,6 +265,7 @@ FloatingWindow RID_SVXTBX_DRAW
                 Text[ turkish ] = "Bezier";
                 Text[ arabic ] = "B�zier";
                 Text[ catalan ] = "B�zier";
+                Text[ thai ] = "โค้ง";
             };
             ToolBoxItem
             {
@@ -270,24 +276,25 @@ FloatingWindow RID_SVXTBX_DRAW
                 Text [ ENGLISH ] = "Freeform Line" ;
                 Text[ english_us ] = "Freeform Line";
                 Text[ portuguese ] = "Curva livre";
-                Text[ russian ] = "���������� �����";
+                Text[ russian ] = "���������";
                 Text[ greek ] = "�������� ��������";
-                Text[ dutch ] = "Vrije hand lijn";
+                Text[ dutch ] = "Vrije-hand-lijn";
                 Text[ french ] = "Ligne � main lev�e";
                 Text[ spanish ] = "L�nea a mano alzada";
-                Text[ finnish ] = "Vapaamuoto";
+                Text[ finnish ] = "Vapaamuotoinen viiva";
                 Text[ italian ] = "Mano libera";
-                Text[ danish ] = "Frih�nd";
+                Text[ danish ] = "Frih�ndslinje";
                 Text[ swedish ] = "Frihandslinje";
                 Text[ polish ] = "Linia narysowana odr�cznie";
                 Text[ portuguese_brazilian ] = "Freihand";
-                Text[ japanese ] = "ﾌﾘｰﾊﾝﾄﾞの曲線";
-                Text[ korean ] = "자유형 곡선";
+                Text[ japanese ] = "フリーハンドの曲線";
+                Text[ korean ] = "자유형 선";
                 Text[ chinese_simplified ] = "自由形线条";
                 Text[ chinese_traditional ] = "自由形線條";
                 Text[ turkish ] = "Serbest bi�im";
                 Text[ arabic ] = "��";
-                Text[ catalan ] = "Mano alzada";
+                Text[ catalan ] = "Forma lliure";
+                Text[ thai ] = "เส้นอิสระ";
             };
             ToolBoxItem
             {
@@ -305,7 +312,7 @@ FloatingWindow RID_SVXTBX_DRAW
                 Text [ french ] = "Arc de cercle" ;
                 Text [ swedish ] = "Cirkelb�ge" ;
                 Text [ dutch ] = "Cirkelboog" ;
-                Text [ spanish ] = "Arco de c�rculo" ;
+                Text [ spanish ] = "Arco" ;
                 Text [ english_us ] = "Arc" ;
                 Text[ chinese_simplified ] = "圆弧";
                 Text[ russian ] = "����";
@@ -317,7 +324,8 @@ FloatingWindow RID_SVXTBX_DRAW
                 Text[ arabic ] = "��� �����";
                 Text[ turkish ] = "Yay";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Arco de c�rculo";
+                Text[ catalan ] = "Arc";
+                Text[ thai ] = "ส่วนโค้งของวงกลม";
             };
             ToolBoxItem
             {
@@ -332,7 +340,7 @@ FloatingWindow RID_SVXTBX_DRAW
                 Text [ swedish ] = "Ellipssektor" ;
                 Text [ danish ] = "Ellipsesektor" ;
                 Text [ italian ] = "Settore di cerchio" ;
-                Text [ spanish ] = "Sector de elipse" ;
+                Text [ spanish ] = "Sector de la elipse" ;
                 Text [ french ] = "Secteur d'ellipse" ;
                 Text [ dutch ] = "Ellipssector" ;
                 Text[ chinese_simplified ] = "椭圆扇形";
@@ -345,8 +353,9 @@ FloatingWindow RID_SVXTBX_DRAW
                 Text[ arabic ] = "���� ��� �����";
                 Text[ turkish ] = "Elips dilimi";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Sector de elipse";
-                Text[ finnish ] = "Ellipsikaavio";
+                Text[ catalan ] = "Sector d'elipse";
+                Text[ finnish ] = "Soikion lohko";
+                Text[ thai ] = "วงรีพาย";
             };
             ToolBoxItem
             {
@@ -374,8 +383,9 @@ FloatingWindow RID_SVXTBX_DRAW
                 Text[ arabic ] = "���� �� �����";
                 Text[ turkish ] = "Yay dilimi";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Segmento de c�rculo";
+                Text[ catalan ] = "Segment del cercle";
                 Text[ finnish ] = "Ympyr�n segmentti";
+                Text[ thai ] = "ส่วนของวงกลม";
             };
             ToolBoxItem
             {
@@ -398,14 +408,15 @@ FloatingWindow RID_SVXTBX_DRAW
                 Text[ chinese_simplified ] = "文字";
                 Text[ russian ] = "�����";
                 Text[ polish ] = "Tekst";
-                Text[ japanese ] = "ﾃｷｽﾄ";
+                Text[ japanese ] = "テキスト";
                 Text[ chinese_traditional ] = "文字";
                 Text[ greek ] = "�������";
                 Text[ korean ] = "텍스트";
                 Text[ arabic ] = "����";
                 Text[ turkish ] = "Metin";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Texto";
+                Text[ catalan ] = "Text";
+                Text[ thai ] = "ข้อความ";
             };
             ToolBoxItem
             {
@@ -422,18 +433,19 @@ FloatingWindow RID_SVXTBX_DRAW
                 Text[ french ] = "Texte vertical";
                 Text[ spanish ] = "Texto vertical";
                 Text[ italian ] = "Testo verticale";
-                Text[ danish ] = "Vertical Text";
+                Text[ danish ] = "Lodret tekst";
                 Text[ swedish ] = "Vertikal text";
                 Text[ polish ] = "Pionowy tekst";
                 Text[ portuguese_brazilian ] = "Vertical Text";
-                Text[ japanese ] = "縦書きﾃｷｽﾄ";
-                Text[ korean ] = "수직 텍스트";
+                Text[ japanese ] = "縦書きテキスト";
+                Text[ korean ] = "세로 쓰기 텍스트";
                 Text[ chinese_simplified ] = "直式文字";
                 Text[ chinese_traditional ] = "直式文字";
                 Text[ turkish ] = "Vertical Text";
                 Text[ arabic ] = "�� �����";
-                Text[ catalan ] = "Texto vertical";
+                Text[ catalan ] = "Text vertical";
                 Text[ finnish ] = "Pystysuuntainen teksti";
+                Text[ thai ] = "ข้อความแนวตั้ง";
             };
             ToolBoxItem
             {
@@ -454,15 +466,16 @@ FloatingWindow RID_SVXTBX_DRAW
                 Text[ chinese_simplified ] = "活动文字";
                 Text[ russian ] = "������� ������";
                 Text[ polish ] = "Animacje tekstu";
-                Text[ japanese ] = "ﾃｷｽﾄｱﾆﾒｰｼｮﾝ";
+                Text[ japanese ] = "テキストアニメーション";
                 Text[ chinese_traditional ] = "動態文字";
                 Text[ greek ] = "��������� �������";
                 Text[ korean ] = "텍스트 애니메이션";
                 Text[ arabic ] = "�� �����";
                 Text[ turkish ] = "Metin canland�rma";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Animaci�n de texto";
+                Text[ catalan ] = "Animaci� de text";
                 Text[ finnish ] = "Tekstianimaatio";
+                Text[ thai ] = "การเคลื่อนไหวข้อความ";
             };
             ToolBoxItem
             {
@@ -483,7 +496,7 @@ FloatingWindow RID_SVXTBX_DRAW
                 Text [ spanish ] = "Leyenda" ;
                 Text [ english_us ] = "Callouts" ;
                 Text[ chinese_simplified ] = "图例";
-                Text[ russian ] = "�������";
+                Text[ russian ] = "�������";
                 Text[ polish ] = "Legenda";
                 Text[ japanese ] = "凡例";
                 Text[ chinese_traditional ] = "圖例";
@@ -492,7 +505,8 @@ FloatingWindow RID_SVXTBX_DRAW
                 Text[ arabic ] = "����� ������";
                 Text[ turkish ] = "Belirtme �izgisi";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Leyenda";
+                Text[ catalan ] = "Llegendes";
+                Text[ thai ] = "คำบรรยายภาพ";
             };
             ToolBoxItem
             {
@@ -503,13 +517,13 @@ FloatingWindow RID_SVXTBX_DRAW
                 Text [ ENGLISH ] = "Vertical Caption" ;
                 Text[ english_us ] = "Vertical Callout";
                 Text[ portuguese ] = "Legenda vertical";
-                Text[ russian ] = "������������ �������";
+                Text[ russian ] = "������������ �������";
                 Text[ greek ] = "���������� ��������";
                 Text[ dutch ] = "Verticale legenda";
                 Text[ french ] = "L�gende verticale";
                 Text[ spanish ] = "Leyenda vertical";
                 Text[ italian ] = "Legenda verticale";
-                Text[ danish ] = "Vertical Caption";
+                Text[ danish ] = "Lodret forklaring";
                 Text[ swedish ] = "Vertikal f�rklaring";
                 Text[ polish ] = "Pionowa legenda";
                 Text[ portuguese_brazilian ] = "Vertical Caption";
@@ -519,8 +533,9 @@ FloatingWindow RID_SVXTBX_DRAW
                 Text[ chinese_traditional ] = "直式圖例";
                 Text[ turkish ] = "Vertical Caption";
                 Text[ arabic ] = "����� ������� ������";
-                Text[ catalan ] = "Leyenda vertical";
+                Text[ catalan ] = "Llegenda vertical";
                 Text[ finnish ] = "Pystysuuntainen kuvateksti";
+                Text[ thai ] = "คำบรรยายภาพแนวตั้ง";
             };
         };
     };
@@ -539,12 +554,13 @@ FloatingWindow RID_SVXTBX_DRAW
     Text[ japanese ] = "図形描画機能";
     Text[ chinese_traditional ] = "繪圖功能";
     Text[ greek ] = "����������� ���������";
-    Text[ korean ] = "그리기 함수";
+    Text[ korean ] = "그리기 기능";
     Text[ arabic ] = "����� ���";
     Text[ turkish ] = "�izim i�levleri";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Funciones de dibujo";
+    Text[ catalan ] = "Funcions de dibuix";
     Text[ finnish ] = "Piirtotoiminnot";
+    Text[ thai ] = "ฟังก์ชั่นการวาดรูป";
 };
 FloatingWindow RID_SVXTBX_ALIGNMENT
 {
@@ -600,7 +616,8 @@ FloatingWindow RID_SVXTBX_ALIGNMENT
                 Text[ arabic ] = "����";
                 Text[ turkish ] = "Sol";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Izquierda";
+                Text[ catalan ] = "Esquerra";
+                Text[ thai ] = "ซ้าย";
             };
             ToolBoxItem
             {
@@ -629,7 +646,8 @@ FloatingWindow RID_SVXTBX_ALIGNMENT
                 Text[ arabic ] = "�����";
                 Text[ turkish ] = "Ortala";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Centrado";
+                Text[ catalan ] = "Centre";
+                Text[ thai ] = "ตรงกลาง";
             };
             ToolBoxItem
             {
@@ -658,7 +676,8 @@ FloatingWindow RID_SVXTBX_ALIGNMENT
                 Text[ arabic ] = "����";
                 Text[ turkish ] = "Sa�";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Derecha";
+                Text[ catalan ] = "Dreta";
+                Text[ thai ] = "ขวา";
             };
             ToolBoxItem
             {
@@ -670,7 +689,7 @@ FloatingWindow RID_SVXTBX_ALIGNMENT
                 Text [ italian ] = "Sopra" ;
                 Text [ portuguese_brazilian ] = "Topo" ;
                 Text [ portuguese ] = "Em cima" ;
-                Text [ finnish ] = "Yl�osa" ;
+                Text [ finnish ] = "Yl�reuna" ;
                 Text [ danish ] = "�verst" ;
                 Text [ french ] = "En haut" ;
                 Text [ swedish ] = "�verst" ;
@@ -687,7 +706,8 @@ FloatingWindow RID_SVXTBX_ALIGNMENT
                 Text[ arabic ] = "����";
                 Text[ turkish ] = "�st";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Arriba";
+                Text[ catalan ] = "Superior";
+                Text[ thai ] = "บน";
             };
             ToolBoxItem
             {
@@ -701,13 +721,13 @@ FloatingWindow RID_SVXTBX_ALIGNMENT
                 Text [ portuguese ] = "Centro" ;
                 Text [ finnish ] = "Keskitetty" ;
                 Text [ danish ] = "Centreret" ;
-                Text [ french ] = "Milieu" ;
+                Text [ french ] = "Centre" ;
                 Text [ swedish ] = "Mitten" ;
                 Text [ dutch ] = "Midden" ;
                 Text [ spanish ] = "Centrado" ;
                 Text [ english_us ] = "Centered" ;
                 Text[ chinese_simplified ] = "中心";
-                Text[ russian ] = "�� ��������";
+                Text[ russian ] = "����������";
                 Text[ polish ] = "Po�rodku";
                 Text[ japanese ] = "中央";
                 Text[ chinese_traditional ] = "置中";
@@ -716,7 +736,8 @@ FloatingWindow RID_SVXTBX_ALIGNMENT
                 Text[ arabic ] = "�����";
                 Text[ turkish ] = "Orta";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Centro";
+                Text[ catalan ] = "Centrat";
+                Text[ thai ] = "ตรงกลาง";
             };
             ToolBoxItem
             {
@@ -728,7 +749,7 @@ FloatingWindow RID_SVXTBX_ALIGNMENT
                 Text [ italian ] = "Sotto" ;
                 Text [ portuguese_brazilian ] = "Base" ;
                 Text [ portuguese ] = "Em baixo" ;
-                Text [ finnish ] = "Alaosa" ;
+                Text [ finnish ] = "Alareuna" ;
                 Text [ danish ] = "Nederst" ;
                 Text [ french ] = "En bas" ;
                 Text [ swedish ] = "Nederst" ;
@@ -745,7 +766,8 @@ FloatingWindow RID_SVXTBX_ALIGNMENT
                 Text[ arabic ] = "����";
                 Text[ turkish ] = "Alt";
                 Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Abajo";
+                Text[ catalan ] = "Part inferior";
+                Text[ thai ] = "ล่าง";
             };
         };
     };
@@ -755,11 +777,12 @@ FloatingWindow RID_SVXTBX_ALIGNMENT
     Text[ japanese ] = "配置";
     Text[ chinese_traditional ] = "對齊";
     Text[ greek ] = "��������";
-    Text[ korean ] = "배열";
+    Text[ korean ] = "맞춤";
     Text[ arabic ] = "��������";
     Text[ turkish ] = "Hizalama";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Alineaci�n";
+    Text[ catalan ] = "Alineament";
+    Text[ thai ] = "จัดตำแหน่ง";
 };
  // ********************************************************************** EOF
 
@@ -778,3 +801,9 @@ FloatingWindow RID_SVXTBX_ALIGNMENT
 
 
 
+
+
+
+
+
+
diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx
index 64534aa5e6a0..4b000aa7312f 100644
--- a/svx/source/tbxctrls/verttexttbxctrl.cxx
+++ b/svx/source/tbxctrls/verttexttbxctrl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: verttexttbxctrl.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: os $ $Date: 2002-09-13 13:38:47 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:05:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -102,11 +102,20 @@ SvxVertCTLTextTbxCtrl::~SvxVertCTLTextTbxCtrl( )
 void SvxVertCTLTextTbxCtrl::StateChanged( USHORT nSID, SfxItemState eState,
                                   const SfxPoolItem* pState )
 {
-    BOOL bVisible = GetToolBox().IsItemVisible(GetId());
-    BOOL bCalc = sal_False;
     SvtLanguageOptions aLangOptions;
-    sal_Bool bEnabled = bCheckVertical ?
-                aLangOptions.IsVerticalTextEnabled() : aLangOptions.IsCTLFontEnabled();
+    BOOL bCalc = sal_False;
+    BOOL bVisible = GetToolBox().IsItemVisible(GetId());
+    sal_Bool bEnabled = sal_False;
+    if ( nSID == SID_VERTICALTEXT_STATE )
+        bEnabled = aLangOptions.IsVerticalTextEnabled();
+    else if ( nSID == SID_CTLFONT_STATE )
+        bEnabled = aLangOptions.IsCTLFontEnabled();
+    else
+    {
+        SfxToolBoxControl::StateChanged(nSID, eState, pState);
+        return;
+    }
+
     if(bEnabled)
     {
         if(!bVisible)
@@ -132,7 +141,6 @@ void SvxVertCTLTextTbxCtrl::StateChanged( USHORT nSID, SfxItemState eState,
             pParent->SetOutputSizePixel( aSize );
         }
     }
-    SfxToolBoxControl::StateChanged(nSID, eState, pState);
 }
 /* -----------------------------27.04.01 15:50--------------------------------
 
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 11e3d01b3b81..d20b24402efb 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: UnoGraphicExporter.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: cl $ $Date: 2002-12-11 16:54:34 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:05:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -815,7 +815,6 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes
             {
                 SdrObject* pObj = (*aIter++);
                 Rectangle aR1(pObj->GetBoundRect());
-    //              aR1+=pM->GetPageView()->GetOffset();
                 if (aBound.IsEmpty())
                     aBound=aR1;
                 else
@@ -829,9 +828,9 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes
             aMtf.Clear();
             aMtf.Record( &aOut );
 
-            Point aOfs( -aBound.TopLeft().X(), -aBound.TopLeft().Y() );
-    //              aOfs+= pM->GetPageView()->GetOffset();
-//          aXOut.SetOffset( aOfs );
+            MapMode aOutMap( aMap );
+            aOutMap.SetOrigin( Point( -aBound.TopLeft().X(), -aBound.TopLeft().Y() ) );
+            aOut.SetRelativeMapMode( aOutMap );
 
             SdrPaintInfoRec aInfoRec;
             aInfoRec.nPaintMode|=SDRPAINTMODE_ANILIKEPRN;
@@ -850,14 +849,8 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes
             Size        aBoundSize( aBound.GetWidth() + ( aExtSize.Width() ),
                                     aBound.GetHeight() + ( aExtSize.Height() ) );
 
-            MapMode aNewMap( aMap );
-            Point aOrigin( aNewMap.GetOrigin() );
-            aOrigin -= aBound.TopLeft();
-            aNewMap.SetOrigin( aOrigin );
-
-            aMtf.SetPrefMapMode( aNewMap );
+            aMtf.SetPrefMapMode( aMap );
             aMtf.SetPrefSize( aBoundSize );
-//          aMtf.Move( -aBound.TopLeft().X(), -aBound.TopLeft().Y() );
 
             if( !bVectorType )
             {
diff --git a/svx/source/unodraw/UnoNameItemTable.hxx b/svx/source/unodraw/UnoNameItemTable.hxx
index 7422894a08c9..ede513eb892d 100644
--- a/svx/source/unodraw/UnoNameItemTable.hxx
+++ b/svx/source/unodraw/UnoNameItemTable.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: UnoNameItemTable.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: cl $ $Date: 2001-10-16 15:34:40 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:05:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,9 +71,7 @@
 
 #include <cppuhelper/implbase2.hxx>
 
-#ifndef __SGI_STL_VECTOR
 #include <vector>
-#endif
 
 #ifndef _SFXLSTNER_HXX
 #include <svtools/lstner.hxx>
diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx
index 843380ea97f7..aabf6658250e 100644
--- a/svx/source/unodraw/unodtabl.cxx
+++ b/svx/source/unodraw/unodtabl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unodtabl.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: armin $ $Date: 2001-03-08 09:45:20 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:05:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,9 +71,7 @@
 #include <svtools/itemset.hxx>
 #endif
 
-#ifndef __SGI_STL_VECTOR
 #include <vector>
-#endif
 
 #ifndef _SVX_UNONAMEITEMTABLE_HXX_
 #include "UnoNameItemTable.hxx"
diff --git a/svx/source/unodraw/unoipset.cxx b/svx/source/unodraw/unoipset.cxx
index ca3f1047dc25..048c9833a86a 100644
--- a/svx/source/unodraw/unoipset.cxx
+++ b/svx/source/unodraw/unoipset.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unoipset.cxx,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: bm $ $Date: 2001-12-04 13:57:42 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:05:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -170,7 +170,7 @@ uno::Reference< beans::XPropertySetInfo > SvxInfoSetCache::getCachedPropertySetI
         return aIt->second.get();
 
     uno::Reference< beans::XPropertySetInfo > xInfo( new SvxCachedItemPropertySetInfo( pMap, mpGlobalCache ) );
-    mpGlobalCache->maInfoMap[pMap] = xInfo;
+    mpGlobalCache->maInfoMap.insert(InfoMap::value_type(pMap,xInfo));
 
     /* if this assertion is triggered this class is possible used with dynamicly created
        SfxItemPropertyMap pointers. This will cause a cache overflow as the current
diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx
index adc9da747904..43ad5995f77a 100644
--- a/svx/source/unodraw/unomtabl.cxx
+++ b/svx/source/unodraw/unomtabl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unomtabl.cxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: cl $ $Date: 2002-04-04 10:14:41 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:05:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -103,9 +103,7 @@
 #include "xdef.hxx"
 #include "xflhtit.hxx"
 
-#ifndef __SGI_STL_VECTOR
 #include <vector>
-#endif
 
 #ifndef _VOS_MUTEX_HXX_
 #include <vos/mutex.hxx>
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index f49cc69903a9..15c3b533d408 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unopage.cxx,v $
  *
- *  $Revision: 1.22 $
+ *  $Revision: 1.23 $
  *
- *  last change: $Author: cl $ $Date: 2002-07-19 12:35:00 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:05:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -300,17 +300,15 @@ uno::Any SAL_CALL SvxDrawPage::getByIndex( sal_Int32 Index )
     if(pPage == NULL)
         throw uno::RuntimeException();
 
-    if( Index < 0 || Index >= (sal_Int32)pPage->GetObjCount())
+    if ( Index < 0 || Index >= (sal_Int32)pPage->GetObjCount() )
         throw lang::IndexOutOfBoundsException();
 
     SdrObject* pObj = pPage->GetObj( Index );
     if( pObj == NULL )
         throw uno::RuntimeException();
 
-    Reference< drawing::XShape >  xRet( pObj->getUnoShape(), uno::UNO_QUERY );
-    uno::Any aAny;
-    aAny <<= xRet;
-    return aAny;
+
+    return makeAny(Reference< drawing::XShape >( pObj->getUnoShape(), uno::UNO_QUERY ));
 }
 
 
@@ -513,7 +511,9 @@ SdrObject *SvxDrawPage::_CreateSdrObject( const Reference< drawing::XShape > & x
 
                 PolyPolygon3D aNewPP(aNewP);
                 pObj->SetExtrudePolygon(aNewPP);
-                pObj->SetExtrudeCharacterMode(TRUE);
+
+                // #107245# pObj->SetExtrudeCharacterMode(TRUE);
+                pObj->SetItem(Svx3DCharacterModeItem(sal_True));
             }
             else if(pNewObj->ISA(E3dLatheObj))
             {
@@ -530,7 +530,9 @@ SdrObject *SvxDrawPage::_CreateSdrObject( const Reference< drawing::XShape > & x
 
                 PolyPolygon3D aNewPP(aNewP);
                 pObj->SetPolyPoly3D(aNewPP);
-                pObj->SetLatheCharacterMode(TRUE);
+
+                // #107245# pObj->SetLatheCharacterMode(TRUE);
+                pObj->SetItem(Svx3DCharacterModeItem(sal_True));
             }
         }
     }
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 10e1b33b3c03..0f76f5260978 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unoprov.cxx,v $
  *
- *  $Revision: 1.47 $
+ *  $Revision: 1.48 $
  *
- *  last change: $Author: cl $ $Date: 2002-11-15 15:35:11 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:05:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -359,6 +359,10 @@ SfxItemPropertyMap* ImplGetSvx3DLatheObjectPropertyMap()
     static SfxItemPropertyMap a3DLatheObjectPropertyMap_Impl[] =
     {
         SPECIAL_3DLATHEOBJECT_PROPERTIES
+
+        // #107245# New 3D properties which are possible for lathe and extrude 3d objects
+        SPECIAL_3DLATHEANDEXTRUDEOBJ_PROPERTIES
+
         SPECIAL_3DBACKSCALE_PROPERTIES
         MISC_3D_OBJ_PROPERTIES
         FILL_PROPERTIES
@@ -381,6 +385,10 @@ SfxItemPropertyMap* ImplGetSvx3DExtrudeObjectPropertyMap()
     static SfxItemPropertyMap a3DExtrudeObjectPropertyMap_Impl[] =
     {
         SPECIAL_3DEXTRUDEOBJECT_PROPERTIES
+
+        // #107245# New 3D properties which are possible for lathe and extrude 3d objects
+        SPECIAL_3DLATHEANDEXTRUDEOBJ_PROPERTIES
+
         SPECIAL_3DBACKSCALE_PROPERTIES
         MISC_3D_OBJ_PROPERTIES
         FILL_PROPERTIES
@@ -447,6 +455,10 @@ SfxItemPropertyMap* ImplGetSvxAllPropertyMap()
         SPECIAL_3DSPHEREOBJECT_PROPERTIES
         SPECIAL_3DLATHEOBJECT_PROPERTIES
         SPECIAL_3DEXTRUDEOBJECT_PROPERTIES
+
+        // #107245# New 3D properties which are possible for lathe and extrude 3d objects
+        SPECIAL_3DLATHEANDEXTRUDEOBJ_PROPERTIES
+
         SPECIAL_3DBACKSCALE_PROPERTIES
         SPECIAL_3DPOLYGONOBJECT_PROPERTIES
         AUTOSHAPE_PROPERTIES
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index f1f8e517ad0f..10029ed4d6eb 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unoshap2.cxx,v $
  *
- *  $Revision: 1.39 $
+ *  $Revision: 1.40 $
  *
- *  last change: $Author: fs $ $Date: 2002-11-06 10:38:37 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:05:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -136,7 +136,6 @@ sal_Bool ConvertGDIMetaFileToWMF( const GDIMetaFile & rMTF, SvStream & rTargetSt
 /***********************************************************************
 * class SvxShapeGroup                                                  *
 ***********************************************************************/
-uno::Sequence< uno::Type > SvxShapeGroup::maTypeSequence;
 
 SvxShapeGroup::SvxShapeGroup( SdrObject* pObj, SvxDrawPage* pDrawPage  )  throw() :
     SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_GROUP) ),
@@ -421,7 +420,6 @@ uno::Sequence< OUString > SAL_CALL SvxShapeGroup::getSupportedServiceNames()
 /***********************************************************************
 *                                                                      *
 ***********************************************************************/
-uno::Sequence< uno::Type > SvxShapeConnector::maTypeSequence;
 
 SvxShapeConnector::SvxShapeConnector( SdrObject* pObj )  throw() :
     SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_CONNECTOR) )
@@ -589,7 +587,6 @@ uno::Sequence< OUString > SAL_CALL SvxShapeConnector::getSupportedServiceNames()
 * class SvxShapeControl                                                *
 ***********************************************************************/
 
-uno::Sequence< uno::Type > SvxShapeControl::maTypeSequence;
 
 SvxShapeControl::SvxShapeControl( SdrObject* pObj )  throw() :
     SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_CONTROL) )
@@ -777,10 +774,13 @@ static struct
 }
 SvxShapeControlPropertyValueMapping[] =
 {
+    // note that order matters:
+    // valueAlignToParaAdjust and valueParaAdjustToAlign search this map from the _beginning_
+    // and use the first matching entry
     {style::ParagraphAdjust_LEFT,           (sal_Int16)awt::TextAlign::LEFT},
     {style::ParagraphAdjust_CENTER,         (sal_Int16)awt::TextAlign::CENTER},
     {style::ParagraphAdjust_RIGHT,          (sal_Int16)awt::TextAlign::RIGHT},
-    {style::ParagraphAdjust_BLOCK,          (sal_Int16)awt::TextAlign::LEFT},
+    {style::ParagraphAdjust_BLOCK,          (sal_Int16)awt::TextAlign::RIGHT},
     {style::ParagraphAdjust_STRETCH,        (sal_Int16)awt::TextAlign::LEFT},
     {style::ParagraphAdjust_MAKE_FIXED_SIZE,(sal_Int16)awt::TextAlign::LEFT},
     {-1,-1}
@@ -1062,11 +1062,12 @@ void SAL_CALL ImplSvxPolyPolygonToPointSequenceSequence( const drawing::PointSeq
 
     // Zeiger auf innere sequences holen
     const drawing::PointSequence* pInnerSequence = pOuterSequence->getConstArray();
+    const drawing::PointSequence* pInnerSeqEnd   = pInnerSequence + pOuterSequence->getLength();
 
     // #85920# Clear the given polygon, since the new one shall be SET, not ADDED
     rNewPolyPolygon.Clear();
 
-    for(sal_Int32 a=0;a<nOuterSequenceCount;a++)
+    for(;pInnerSequence != pInnerSeqEnd;++pInnerSequence)
     {
         sal_Int32 nInnerSequenceCount = pInnerSequence->getLength();
 
@@ -1074,14 +1075,15 @@ void SAL_CALL ImplSvxPolyPolygonToPointSequenceSequence( const drawing::PointSeq
         XPolygon aNewPolygon((USHORT)nInnerSequenceCount);
 
         // Zeiger auf Arrays holen
-        const awt::Point* pArray = pInnerSequence->getConstArray();
+        const awt::Point* pArray    = pInnerSequence->getConstArray();
+        const awt::Point* pArrayEnd = pArray + nInnerSequenceCount;
 
-        for(sal_Int32 b=0;b<nInnerSequenceCount;b++)
+        for(USHORT b=0;pArray != pArrayEnd;++b,++pArray)
         {
-            aNewPolygon[(USHORT)b] = Point( pArray->X, pArray->Y );
-            pArray++;
+            Point& rPoint = aNewPolygon[b];
+            rPoint.X() = pArray->X;
+            rPoint.Y() = pArray->Y;
         }
-        pInnerSequence++;
 
         // Neues Teilpolygon einfuegen
         rNewPolyPolygon.Insert(aNewPolygon);
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index 38f39d14c3c6..824a8b701467 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unoshap3.cxx,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: aw $ $Date: 2002-11-14 15:35:19 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:05:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -118,7 +118,6 @@ using namespace ::com::sun::star::container;
 /***********************************************************************
 * class Svx3DSceneObject                                               *
 ***********************************************************************/
-uno::Sequence< uno::Type > Svx3DSceneObject::maTypeSequence;
 
 //----------------------------------------------------------------------
 Svx3DSceneObject::Svx3DSceneObject( SdrObject* pObj, SvxDrawPage* pDrawPage ) throw()
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 5273b8b93cf3..e2cd1fc5e756 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unoshape.cxx,v $
  *
- *  $Revision: 1.102 $
+ *  $Revision: 1.103 $
  *
- *  last change: $Author: cl $ $Date: 2002-10-17 15:39:13 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:05:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -296,7 +296,6 @@ struct SvxShapeImpl
 };
 
 //UNO3_GETIMPLEMENTATION_IMPL( SvxShape );
-uno::Sequence< uno::Type > SvxShape::maTypeSequence;
 
 SvxShape::SvxShape( SdrObject* pObject ) throw()
 :   aPropSet(aSvxMapProvider.GetMap(SVXMAP_SHAPE)),
@@ -1260,10 +1259,10 @@ OUString SAL_CALL SvxShape::getShapeType() throw(uno::RuntimeException)
     if( 0 == aShapeType.getLength() )
     {
         UHashMapEntry* pMap = pSdrShapeIdentifierMap;
-        while(pMap->aIdentifier.getLength() && ( pMap->nId != mpImpl->mnObjId ) )
-            pMap++;
+        while ( ( pMap->nId != mpImpl->mnObjId ) && pMap->aIdentifier.getLength() )
+            ++pMap;
 
-        if(pMap->aIdentifier)
+        if ( pMap->aIdentifier.getLength() )
         {
             return pMap->aIdentifier;
         }
diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx
index 7659949fd0bb..ca67cd0fd432 100644
--- a/svx/source/unodraw/unoshcol.cxx
+++ b/svx/source/unodraw/unoshcol.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unoshcol.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: cl $ $Date: 2001-03-27 11:58:51 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:05:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -235,8 +235,8 @@ uno::Any SAL_CALL SvxShapeCollection::getByIndex( sal_Int32 Index )
 
     uno::Sequence< Reference< uno::XInterface> > xElements( maShapeContainer.getElements() );
 
-    Reference< drawing::XShape > xShape( xElements.getArray()[Index], UNO_QUERY );
-    return uno::Any( &xShape, getElementType() );
+
+    return uno::makeAny( Reference< XShape>(static_cast< drawing::XShape* >( xElements.getArray()[Index].get())) );
 }
 
 // XElementAccess
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index e1e2e2560cb2..9eee488328a1 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unoshtxt.cxx,v $
  *
- *  $Revision: 1.42 $
+ *  $Revision: 1.43 $
  *
- *  last change: $Author: thb $ $Date: 2002-11-21 13:48:58 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:05:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -124,6 +124,13 @@
 #endif
 
 #include "unotext.hxx"
+#ifndef _COM_SUN_STAR_LINGUISTIC2_XLINGUSERVICEMANAGER_HPP_
+#include <com/sun/star/linguistic2/XLinguServiceManager.hpp>
+#endif
+#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+#include <comphelper/processfactory.hxx>
+#endif
+
 
 using namespace ::osl;
 using namespace ::vos;
@@ -131,6 +138,7 @@ using namespace ::rtl;
 
 namespace css = ::com::sun::star;
 
+
 //------------------------------------------------------------------------
 // SvxTextEditSourceImpl
 //------------------------------------------------------------------------
@@ -167,6 +175,7 @@ private:
     SdrOutliner*                    mpOutliner;
     SvxOutlinerForwarder*           mpTextForwarder;
     SvxDrawOutlinerViewForwarder*   mpViewForwarder;    // if non-NULL, use GetViewModeTextForwarder text forwarder
+    css::uno::Reference< css::linguistic2::XLinguServiceManager > m_xLinguServiceManager;
     Point                           maTextOffset;
     BOOL                            mbDataValid;
     BOOL                            mbDestroyed;
@@ -530,12 +539,6 @@ void SvxTextEditSourceImpl::UpdateOutliner()
 
 //------------------------------------------------------------------------
 
-#ifndef _COM_SUN_STAR_LINGUISTIC2_XLINGUSERVICEMANAGER_HPP_
-#include <com/sun/star/linguistic2/XLinguServiceManager.hpp>
-#endif
-#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
-#include <comphelper/processfactory.hxx>
-#endif
 
 
 SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder()
@@ -575,13 +578,16 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder()
             }
 
 // -
-            css::uno::Reference< css::lang::XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
-            css::uno::Reference< css::linguistic2::XLinguServiceManager > xLinguServiceManager(
-                xMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.linguistic2.LinguServiceManager" ))), css::uno::UNO_QUERY );
+            if ( !m_xLinguServiceManager.is() )
+            {
+                css::uno::Reference< css::lang::XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
+                m_xLinguServiceManager = css::uno::Reference< css::linguistic2::XLinguServiceManager >(
+                    xMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.linguistic2.LinguServiceManager" ))), css::uno::UNO_QUERY );
+            }
 
-            if ( xLinguServiceManager.is() )
+            if ( m_xLinguServiceManager.is() )
             {
-                css::uno::Reference< css::linguistic2::XHyphenator > xHyphenator( xLinguServiceManager->getHyphenator(), css::uno::UNO_QUERY );
+                css::uno::Reference< css::linguistic2::XHyphenator > xHyphenator( m_xLinguServiceManager->getHyphenator(), css::uno::UNO_QUERY );
                 if( xHyphenator.is() )
                     mpOutliner->SetHyphenator( xHyphenator );
             }
@@ -616,7 +622,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder()
             mpOutliner->SetText( *mpOutlinerParaObject );
 
             // #91254# put text to object and set EmptyPresObj to FALSE
-            if( pTextObj && bTextEditActive && mpOutlinerParaObject && mpObject->IsEmptyPresObj() )
+            if( pTextObj && bTextEditActive && mpOutlinerParaObject && mpObject->IsEmptyPresObj() && pTextObj->IsRealyEdited() )
             {
                 mpObject->SetEmptyPresObj( FALSE );
                 pTextObj->SetOutlinerParaObject( mpOutlinerParaObject );
diff --git a/svx/source/unoedit/unoedhlp.cxx b/svx/source/unoedit/unoedhlp.cxx
index b49333c76671..00cfefa93a71 100644
--- a/svx/source/unoedit/unoedhlp.cxx
+++ b/svx/source/unoedit/unoedhlp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unoedhlp.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: thb $ $Date: 2002-11-29 10:17:59 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:05:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -147,11 +147,16 @@ void SvxEditSourceHint::SetEndValue( ULONG n )
                 return ::std::auto_ptr<SfxHint>( new SvxEditSourceHint( EDITSOURCE_HINT_SELECTIONCHANGED ) );
 
             case EE_NOTIFY_BLOCKNOTIFICATION_START:
+                return ::std::auto_ptr<SfxHint>( new TextHint( TEXT_HINT_BLOCKNOTIFICATION_START, 0 ) );
+
             case EE_NOTIFY_BLOCKNOTIFICATION_END:
+                return ::std::auto_ptr<SfxHint>( new TextHint( TEXT_HINT_BLOCKNOTIFICATION_END, 0 ) );
+
             case EE_NOTIFY_INPUT_START:
+                return ::std::auto_ptr<SfxHint>( new TextHint( TEXT_HINT_INPUT_START, 0 ) );
+
             case EE_NOTIFY_INPUT_END:
-                // TODO
-                break;
+                return ::std::auto_ptr<SfxHint>( new TextHint( TEXT_HINT_INPUT_END, 0 ) );
 
             default:
                 DBG_ERROR( "SvxEditSourceHelper::EENotification2Hint unknown notification" );
@@ -215,12 +220,14 @@ Point SvxEditSourceHelper::UserSpaceToEE( const Point& rPoint, const Size& rEESi
 
 Rectangle SvxEditSourceHelper::EEToUserSpace( const Rectangle& rRect, const Size& rEESize, bool bIsVertical )
 {
-    return Rectangle( EEToUserSpace(rRect.BottomLeft(), rEESize, bIsVertical),
-                      EEToUserSpace(rRect.TopRight(), rEESize, bIsVertical) );
+    // #106775# Don't touch rect if not vertical
+    return bIsVertical ? Rectangle( EEToUserSpace(rRect.BottomLeft(), rEESize, bIsVertical),
+                                    EEToUserSpace(rRect.TopRight(), rEESize, bIsVertical) ) : rRect;
 }
 
 Rectangle SvxEditSourceHelper::UserSpaceToEE( const Rectangle& rRect, const Size& rEESize, bool bIsVertical )
 {
-    return Rectangle( UserSpaceToEE(rRect.TopRight(), rEESize, bIsVertical),
-                      UserSpaceToEE(rRect.BottomLeft(), rEESize, bIsVertical) );
+    // #106775# Don't touch rect if not vertical
+    return bIsVertical ? Rectangle( UserSpaceToEE(rRect.TopRight(), rEESize, bIsVertical),
+                                    UserSpaceToEE(rRect.BottomLeft(), rEESize, bIsVertical) ) : rRect;
 }
diff --git a/svx/source/unoedit/unoedprx.cxx b/svx/source/unoedit/unoedprx.cxx
index b6cb28af7f11..829738844c7d 100644
--- a/svx/source/unoedit/unoedprx.cxx
+++ b/svx/source/unoedit/unoedprx.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unoedprx.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: sab $ $Date: 2002-10-22 15:42:18 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:05:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -256,7 +256,6 @@ void SvxAccessibleTextIndex::SetEEIndex( USHORT nEEIndex, const SvxTextForwarder
 
     // calculate unknowns
     USHORT                  nCurrField, nFieldCount = rTF.GetFieldCount( GetParagraph() );
-    sal_Int32               nTmp;
 
     mnIndex = nEEIndex;
 
@@ -283,9 +282,8 @@ void SvxAccessibleTextIndex::SetEEIndex( USHORT nEEIndex, const SvxTextForwarder
             break;
         }
 
-        // nCharIndex = Max(aFieldInfo.aCurrentText.Len(), 1);
-        nTmp = aFieldInfo.aCurrentText.Len();
-        mnIndex += nTmp > 1 ? nTmp-1 : 0 ;
+        // #106010#
+        mnIndex += ::std::max(aFieldInfo.aCurrentText.Len()-1, 0);
     }
 }
 
@@ -304,7 +302,6 @@ void SvxAccessibleTextIndex::SetIndex( sal_Int32 nIndex, const SvxTextForwarder&
 
     // calculate unknowns
     USHORT                  nCurrField, nFieldCount = rTF.GetFieldCount( GetParagraph() );
-    sal_Int32               nTmp;
 
     DBG_ASSERT(nIndex >= 0 && nIndex <= USHRT_MAX,
                "SvxAccessibleTextIndex::SetIndex: index value overflow");
@@ -339,21 +336,18 @@ void SvxAccessibleTextIndex::SetIndex( sal_Int32 nIndex, const SvxTextForwarder&
         if( aFieldInfo.aPosition.nIndex > mnEEIndex )
             break;
 
-        // this is: nEEIndex = Max(aFieldInfo.aCurrentText.Len(), 1);
-        nTmp = aFieldInfo.aCurrentText.Len();
-        mnEEIndex -= nTmp > 1 ? nTmp : 1 ;
+        // #106010#
+        mnEEIndex -= ::std::max(aFieldInfo.aCurrentText.Len()-1, 0);
 
         // we're within a field
-        if( aFieldInfo.aPosition.nIndex > mnEEIndex )
+        if( aFieldInfo.aPosition.nIndex >= mnEEIndex )
         {
             AreInField();
-            SetFieldOffset( aFieldInfo.aCurrentText.Len() - aFieldInfo.aPosition.nIndex + mnEEIndex, aFieldInfo.aCurrentText.Len() );
+            SetFieldOffset( ::std::max(aFieldInfo.aCurrentText.Len()-1, 0) - (aFieldInfo.aPosition.nIndex - mnEEIndex),
+                            aFieldInfo.aCurrentText.Len() );
             mnEEIndex = aFieldInfo.aPosition.nIndex ;
             break;
         }
-
-        // now we're after the field
-        mnEEIndex += 1;
     }
 }
 
diff --git a/svx/source/unoedit/unofield.cxx b/svx/source/unoedit/unofield.cxx
index 36299c295aab..8e6c10ffd24a 100644
--- a/svx/source/unoedit/unofield.cxx
+++ b/svx/source/unoedit/unofield.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unofield.cxx,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: iha $ $Date: 2002-10-01 13:43:00 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:05:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,9 +74,6 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #endif
 
-#ifndef _TOOLS_SOLMATH_HXX
-#include <tools/solmath.hxx>
-#endif
 #ifndef _SV_SVAPP_HXX //autogen
 #include <vcl/svapp.hxx>
 #endif
diff --git a/svx/source/unoedit/unoforou.cxx b/svx/source/unoedit/unoforou.cxx
index 47feb9fa4302..65823194e993 100644
--- a/svx/source/unoedit/unoforou.cxx
+++ b/svx/source/unoedit/unoforou.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unoforou.cxx,v $
  *
- *  $Revision: 1.21 $
+ *  $Revision: 1.22 $
  *
- *  last change: $Author: thb $ $Date: 2002-09-13 14:31:58 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:05:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -231,7 +231,7 @@ void SvxOutlinerForwarder::SetParaAttribs( USHORT nPara, const SfxItemSet& rSet
     if( pOldParent )
         ((SfxItemSet*)&rSet)->SetParent( NULL );
 
-    rOutliner.SetParaAttribs( nPara, rSet );
+    rOutliner.SetParaAttribs( nPara, rSet, true );
 
     if( pOldParent )
         ((SfxItemSet*)&rSet)->SetParent( pOldParent );
diff --git a/svx/source/unoedit/unotext.cxx b/svx/source/unoedit/unotext.cxx
index d31828d9e885..cec1d20dd529 100644
--- a/svx/source/unoedit/unotext.cxx
+++ b/svx/source/unoedit/unotext.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unotext.cxx,v $
  *
- *  $Revision: 1.43 $
+ *  $Revision: 1.44 $
  *
- *  last change: $Author: cl $ $Date: 2002-11-26 17:01:35 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:05:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1430,7 +1430,11 @@ uno::Reference< uno::XInterface > SvxUnoTextRange_NewInstance()
 {
     SvxUnoText aText;
     uno::Reference< text::XTextRange > xRange( new SvxUnoTextRange( aText ) );
+#if (_MSC_VER < 1300)
     return xRange;
+#else
+    return (uno::Reference< uno::XInterface >)xRange;
+#endif
 }
 
 SvxUnoTextRange::SvxUnoTextRange( const SvxUnoTextBase& rParent, sal_Bool bPortion /* = sal_False */ ) throw()
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index a47f0d0ca7d9..784f599efa7e 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmleohlp.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: vg $
+ *  last change: $Author: hr $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -84,9 +84,7 @@
 #include <so3/embobj.hxx>
 #endif
 
-#ifndef __SGI_STL_MAP
 #include <map>
-#endif
 
 #ifndef _XMLEOHLP_HXX
 #include "xmleohlp.hxx"
diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx
index ebb8c1aa7c96..c88c05bc029c 100644
--- a/svx/source/xml/xmlxtexp.cxx
+++ b/svx/source/xml/xmlxtexp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlxtexp.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: thb $ $Date: 2002-09-17 11:49:31 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:05:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -370,13 +370,11 @@ sal_Bool SvxXMLXTableExportComponent::exportTable() throw()
     {
         GetDocHandler()->startDocument();
 
-        const OUString sCDATA( RTL_CONSTASCII_USTRINGPARAM( sXML_CDATA ) );
-
         // export namespaces
         sal_uInt16 nPos = GetNamespaceMap().GetFirstKey();
         while( USHRT_MAX != nPos )
         {
-            GetAttrList().AddAttribute( GetNamespaceMap().GetAttrNameByKey( nPos ), sCDATA, GetNamespaceMap().GetNameByKey( nPos ) );
+            GetAttrList().AddAttribute( GetNamespaceMap().GetAttrNameByKey( nPos ), GetNamespaceMap().GetNameByKey( nPos ) );
             nPos = GetNamespaceMap().GetNextKey( nPos );
         }
 
diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx
index 621c1e1c59f9..8f00908187ff 100644
--- a/svx/source/xoutdev/_xpoly.cxx
+++ b/svx/source/xoutdev/_xpoly.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: _xpoly.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: ka $ $Date: 2002-05-29 13:26:27 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:05:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -465,8 +465,7 @@ XPolygon::XPolygon(const Point& rCenter, long nRx, long nRy,
         GenBezArc(rCenter, nRx, nRy, nXHdl, nYHdl, nA1, nA2, nQuad, nPos);
         nPos += 3;
         if ( !bLoopEnd )
-            // ## XPOLY_SMOOTH -> XPOLY_SYMMTR
-            pImpXPolygon->pFlagAry[nPos] = (BYTE) XPOLY_SYMMTR;
+            pImpXPolygon->pFlagAry[nPos] = (BYTE) XPOLY_SMOOTH;
 
     } while ( !bLoopEnd );
 
@@ -476,9 +475,8 @@ XPolygon::XPolygon(const Point& rCenter, long nRx, long nRy,
 
     if ( bFull )
     {
-        // ## XPOLY_SMOOTH -> XPOLY_SYMMTR
-        pImpXPolygon->pFlagAry[0   ] = (BYTE) XPOLY_SYMMTR;
-        pImpXPolygon->pFlagAry[nPos] = (BYTE) XPOLY_SYMMTR;
+        pImpXPolygon->pFlagAry[0   ] = (BYTE) XPOLY_SMOOTH;
+        pImpXPolygon->pFlagAry[nPos] = (BYTE) XPOLY_SMOOTH;
     }
     pImpXPolygon->nPoints = nPos + 1;
 }
diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx
index e2f724589a51..e1d59eed17f3 100644
--- a/svx/source/xoutdev/xpool.cxx
+++ b/svx/source/xoutdev/xpool.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xpool.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: ka $ $Date: 2002-05-29 13:20:42 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 15:05:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -457,7 +457,7 @@ XOutdevItemPool::~XOutdevItemPool()
             if ( *ppDefaultItem ) //Teile schon von abgel. Klasse abgeraeumt!
             {
 #ifndef PRODUCT
-                SetRef( **ppDefaultItem, 0 );
+                SetRefCount( **ppDefaultItem, 0 );
 #endif
                 delete *ppDefaultItem;
             }