From 80204d8fcf35c14168a75765360eb61977653162 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien
Date: Thu, 27 Mar 2003 14:06:05 +0000
Subject: MWS_SRX644: migrate branch mws_srx644 -> HEAD
---
svx/source/accessibility/AccessibleContextBase.cxx | 97 +-
.../accessibility/AccessibleControlShape.cxx | 547 +++-
.../accessibility/AccessibleEditableTextPara.cxx | 335 +-
.../accessibility/AccessibleEditableTextPara.hxx | 11 +-
svx/source/accessibility/AccessibleImageBullet.cxx | 234 +-
svx/source/accessibility/AccessibleImageBullet.hxx | 15 +-
svx/source/accessibility/AccessibleParaManager.cxx | 7 +-
svx/source/accessibility/AccessibleShape.cxx | 345 +-
.../accessibility/AccessibleShapeTreeInfo.cxx | 19 +-
.../accessibility/AccessibleStaticTextBase.cxx | 135 +-
svx/source/accessibility/AccessibleTextHelper.cxx | 247 +-
svx/source/accessibility/ChildrenManagerImpl.cxx | 361 ++-
svx/source/accessibility/ChildrenManagerImpl.hxx | 70 +-
.../accessibility/GraphCtlAccessibleContext.cxx | 157 +-
svx/source/accessibility/ShapeTypeHandler.cxx | 10 +-
svx/source/accessibility/accessibility.src | 47 +-
svx/source/accessibility/charmapacc.cxx | 6 +-
svx/source/accessibility/makefile.mk | 8 +-
.../accessibility/svxrectctaccessiblecontext.cxx | 171 +-
svx/source/dialog/_bmpmask.cxx | 31 +-
svx/source/dialog/align.cxx | 155 +-
svx/source/dialog/align.src | 145 +-
svx/source/dialog/backgrnd.src | 141 +-
svx/source/dialog/bbdlg.src | 20 +-
svx/source/dialog/bmpmask.hrc | 5 +-
svx/source/dialog/bmpmask.src | 30 +-
svx/source/dialog/border.cxx | 184 +-
svx/source/dialog/border.src | 263 +-
svx/source/dialog/chardlg.cxx | 14 +-
svx/source/dialog/chardlg.src | 529 +--
svx/source/dialog/charmap.cxx | 122 +-
svx/source/dialog/charmap.src | 498 +--
svx/source/dialog/connect.src | 103 +-
svx/source/dialog/contdlg.src | 27 +-
svx/source/dialog/ctredlin.src | 33 +-
svx/source/dialog/dlgctl3d.cxx | 16 +-
svx/source/dialog/dlgctrl.cxx | 23 +-
svx/source/dialog/dlgname.src | 10 +-
svx/source/dialog/dlgutil.cxx | 6 +-
svx/source/dialog/dstribut.src | 89 +-
svx/source/dialog/fntctrl.cxx | 11 +-
svx/source/dialog/fontwork.cxx | 18 +-
svx/source/dialog/fontwork.src | 144 +-
svx/source/dialog/frmdirlbox.src | 121 +-
svx/source/dialog/frmsel.cxx | 62 +-
svx/source/dialog/frmsel.src | 11 +-
svx/source/dialog/graphctl.cxx | 15 +-
svx/source/dialog/grfflt.src | 149 +-
svx/source/dialog/grfpage.src | 242 +-
svx/source/dialog/hdft.src | 117 +-
svx/source/dialog/hldocntp.cxx | 29 +-
svx/source/dialog/hldoctp.cxx | 7 +-
svx/source/dialog/hlmailtp.cxx | 11 +-
svx/source/dialog/hlmarkwn.src | 10 +-
svx/source/dialog/hyperdlg.cxx | 9 +-
svx/source/dialog/hyperdlg.src | 66 +-
svx/source/dialog/hyphen.src | 87 +-
svx/source/dialog/hyprlink.src | 78 +-
svx/source/dialog/iconcdlg.cxx | 90 +-
svx/source/dialog/iconcdlg.src | 26 +-
svx/source/dialog/imapdlg.cxx | 6 +-
svx/source/dialog/imapdlg.src | 47 +-
svx/source/dialog/impgrf.src | 236 +-
svx/source/dialog/labdlg.src | 19 +-
svx/source/dialog/language.src | 30 +-
svx/source/dialog/lingu.src | 283 +-
svx/source/dialog/measure.src | 308 +-
svx/source/dialog/numfmt.cxx | 23 +-
svx/source/dialog/numfmt.src | 47 +-
svx/source/dialog/numpages.cxx | 34 +-
svx/source/dialog/numpages.src | 487 +--
svx/source/dialog/opengrf.cxx | 52 +-
svx/source/dialog/page.src | 65 +-
svx/source/dialog/paragrph.src | 139 +-
svx/source/dialog/passwd.src | 79 +-
svx/source/dialog/postdlg.src | 76 +-
svx/source/dialog/prtqry.src | 64 +-
svx/source/dialog/rubydialog.cxx | 13 +-
svx/source/dialog/rubydialog.src | 67 +-
svx/source/dialog/ruler.src | 155 +-
svx/source/dialog/sdstring.src | 2325 +++++++------
svx/source/dialog/srchdlg.src | 220 +-
svx/source/dialog/srchxtra.src | 19 +-
svx/source/dialog/svxruler.cxx | 584 ++--
svx/source/dialog/tabarea.src | 107 +-
svx/source/dialog/tabline.src | 83 +-
svx/source/dialog/tabstpge.src | 132 +-
svx/source/dialog/test.src | 980 +++---
svx/source/dialog/textanim.src | 157 +-
svx/source/dialog/textattr.src | 207 +-
svx/source/dialog/thesdlg.cxx | 6 +-
svx/source/dialog/thesdlg.src | 156 +-
svx/source/dialog/tpcolor.cxx | 60 +-
svx/source/dialog/tpline.cxx | 22 +-
svx/source/dialog/transfrm.cxx | 133 +-
svx/source/dialog/transfrm.src | 239 +-
svx/source/dialog/txenctab.src | 529 +--
svx/source/dialog/zoom.src | 103 +-
svx/source/editeng/editeng.cxx | 29 +-
svx/source/editeng/editeng.src | 22 +-
svx/source/editeng/edtspell.cxx | 13 +-
svx/source/editeng/impedit.cxx | 74 +-
svx/source/editeng/impedit.hxx | 29 +-
svx/source/editeng/impedit2.cxx | 359 ++-
svx/source/editeng/impedit3.cxx | 42 +-
svx/source/editeng/impedit5.cxx | 20 +-
svx/source/editeng/unolingu.cxx | 6 +-
svx/source/engine3d/extrud3d.cxx | 178 +-
svx/source/engine3d/float3d.src | 45 +-
svx/source/engine3d/lathe3d.cxx | 220 +-
svx/source/engine3d/obj3d.cxx | 34 +-
svx/source/engine3d/string3d.src | 99 +-
svx/source/engine3d/svx3ditems.cxx | 129 +-
svx/source/fmcomp/fmgridif.cxx | 484 ++-
svx/source/fmcomp/gridcell.cxx | 112 +-
svx/source/fmcomp/gridctrl.cxx | 45 +-
svx/source/fmcomp/gridctrl.src | 336 +-
svx/source/fmcomp/showcols.src | 26 +-
svx/source/form/dbtoolsclient.cxx | 35 +-
svx/source/form/filtnav.cxx | 50 +-
svx/source/form/filtnav.src | 31 +-
svx/source/form/fmPropBrw.cxx | 55 +-
svx/source/form/fmctrler.cxx | 106 +-
svx/source/form/fmexpl.src | 41 +-
svx/source/form/fmitems.cxx | 73 +-
svx/source/form/fmmodel.cxx | 55 +-
svx/source/form/fmpgeimp.cxx | 12 +-
svx/source/form/fmprop.cxx | 367 +--
svx/source/form/fmsearch.src | 45 +-
svx/source/form/fmservs.cxx | 82 +-
svx/source/form/fmshell.cxx | 29 +-
svx/source/form/fmshimp.cxx | 7 +-
svx/source/form/fmsrcimp.cxx | 77 +-
svx/source/form/fmstring.src | 3323 +------------------
svx/source/form/fmtools.cxx | 766 +----
svx/source/form/fmundo.cxx | 49 +-
svx/source/form/fmview.cxx | 77 +-
svx/source/form/fmvwimp.cxx | 77 +-
svx/source/form/makefile.mk | 8 +-
svx/source/form/sdbdatacolumn.cxx | 321 ++
svx/source/form/tabwin.cxx | 94 +-
svx/source/form/tbxform.cxx | 63 +-
svx/source/form/tbxform.src | 71 +-
svx/source/form/typemap.cxx | 18 +-
svx/source/gallery2/galbrws1.cxx | 8 +-
svx/source/gallery2/galbrws2.cxx | 8 +-
svx/source/gallery2/galctrl.cxx | 6 +-
svx/source/gallery2/gallery.src | 203 +-
svx/source/gallery2/gallery1.cxx | 72 +-
svx/source/gallery2/galtheme.cxx | 28 +-
svx/source/gallery2/galtheme.src | 183 +-
svx/source/inc/GraphCtlAccessibleContext.hxx | 24 +-
svx/source/inc/dbtoolsclient.hxx | 23 +-
svx/source/inc/fmPropBrw.hxx | 5 +-
svx/source/inc/fmctrler.hxx | 6 +-
svx/source/inc/fmexpl.hrc | 4 +-
svx/source/inc/fmgroup.hxx | 154 +
svx/source/inc/fmitems.hxx | 51 +-
svx/source/inc/fmprop.hrc | 11 +-
svx/source/inc/fmresids.hrc | 137 +-
svx/source/inc/fmservs.hxx | 88 +-
svx/source/inc/fmsrcimp.hxx | 8 +-
svx/source/inc/fmtools.hxx | 410 +--
svx/source/inc/fmundo.hxx | 25 +-
svx/source/inc/fmvwimp.hxx | 5 +-
svx/source/inc/sdbdatacolumn.hxx | 183 ++
svx/source/inc/svxrectctaccessiblecontext.hxx | 14 +-
svx/source/inc/tabwin.hxx | 8 +-
svx/source/inc/tbxform.hxx | 6 +-
svx/source/items/chrtitem.cxx | 13 +-
svx/source/items/frmitems.cxx | 8 +-
svx/source/items/numfmtsh.cxx | 17 +-
svx/source/items/numitem.cxx | 6 +-
svx/source/items/svxerr.src | 155 +-
svx/source/items/svxitems.src | 905 +++---
svx/source/items/textitem.cxx | 15 +-
svx/source/msfilter/escherex.cxx | 87 +-
svx/source/msfilter/eschesdo.cxx | 6 +-
svx/source/msfilter/makefile.mk | 22 +-
svx/source/msfilter/msashape.cxx | 1016 +++---
svx/source/msfilter/msashape.hxx | 9 +-
svx/source/msfilter/msashape3d.cxx | 599 ++++
svx/source/msfilter/msashape3d.hxx | 114 +
svx/source/msfilter/msdffimp.cxx | 753 ++---
svx/source/msfilter/msfiltertracer.cxx | 188 ++
svx/source/msfilter/msocximex.cxx | 182 +-
svx/source/msfilter/msvbasic.cxx | 34 +-
svx/source/options/makefile.mk | 5 +-
svx/source/options/multipat.src | 72 +-
svx/source/options/optaccessibility.src | 101 +-
svx/source/options/optasian.src | 120 +-
svx/source/options/optcolor.src | 96 +-
svx/source/options/optctl.src | 157 +-
svx/source/options/optdict.src | 225 +-
svx/source/options/optgenrl.src | 138 +-
svx/source/options/optgrid.src | 63 +-
svx/source/options/optinet2.src | 69 +-
svx/source/options/optjsearch.src | 180 +-
svx/source/options/optlingu.cxx | 4 +-
svx/source/options/optlingu.src | 637 ++--
svx/source/options/optpath.src | 28 +-
svx/source/options/optsave.src | 127 +-
svx/source/options/optspell.src | 51 +-
svx/source/outliner/outliner.cxx | 32 +-
svx/source/outliner/outliner.src | 110 +-
svx/source/stbctrls/stbctrls.src | 13 +-
svx/source/svdraw/svdattr.cxx | 24 +-
svx/source/svdraw/svdcrtv.cxx | 32 +-
svx/source/svdraw/svddrgmt.cxx | 118 +-
svx/source/svdraw/svdedtv1.cxx | 14 +-
svx/source/svdraw/svdedxv.cxx | 19 +-
svx/source/svdraw/svdfppt.cxx | 400 +--
svx/source/svdraw/svdhdl.cxx | 23 +-
svx/source/svdraw/svdlayer.cxx | 7 +-
svx/source/svdraw/svdmodel.cxx | 95 +-
svx/source/svdraw/svdoattr.cxx | 118 +-
svx/source/svdraw/svdobj.cxx | 117 +-
svx/source/svdraw/svdograf.cxx | 467 +--
svx/source/svdraw/svdoole2.cxx | 33 +-
svx/source/svdraw/svdopage.cxx | 18 +-
svx/source/svdraw/svdopath.cxx | 47 +-
svx/source/svdraw/svdotext.cxx | 43 +-
svx/source/svdraw/svdotxed.cxx | 30 +-
svx/source/svdraw/svdouno.cxx | 29 +-
svx/source/svdraw/svdpage.cxx | 18 +-
svx/source/svdraw/svdpagv.cxx | 29 +-
svx/source/svdraw/svdpntv.cxx | 16 +-
svx/source/svdraw/svdsnpv.cxx | 15 +-
svx/source/svdraw/svdstr.src | 3403 ++++++++++++--------
svx/source/svdraw/svdundo.cxx | 54 +-
svx/source/svrtf/rtfgrf.cxx | 8 +-
svx/source/svrtf/rtfitem.cxx | 19 +-
svx/source/svrtf/segincr.asm | 72 +
svx/source/svrtf/svxrtf.cxx | 8 +-
svx/source/svxlink/linkmgr.src | 45 +-
svx/source/tbxctrls/colrctrl.src | 18 +-
svx/source/tbxctrls/grafctrl.cxx | 44 +-
svx/source/tbxctrls/grafctrl.src | 134 +-
svx/source/tbxctrls/itemwin.cxx | 8 +-
svx/source/tbxctrls/layctrl.cxx | 13 +-
svx/source/tbxctrls/lboxctrl.src | 40 +-
svx/source/tbxctrls/tbcontrl.cxx | 19 +-
svx/source/tbxctrls/tbcontrl.src | 38 +-
svx/source/tbxctrls/tbxdraw.src | 131 +-
svx/source/tbxctrls/verttexttbxctrl.cxx | 22 +-
svx/source/unodraw/UnoGraphicExporter.cxx | 19 +-
svx/source/unodraw/UnoNameItemTable.hxx | 6 +-
svx/source/unodraw/unodtabl.cxx | 6 +-
svx/source/unodraw/unoipset.cxx | 6 +-
svx/source/unodraw/unomtabl.cxx | 6 +-
svx/source/unodraw/unopage.cxx | 20 +-
svx/source/unodraw/unoprov.cxx | 16 +-
svx/source/unodraw/unoshap2.cxx | 26 +-
svx/source/unodraw/unoshap3.cxx | 5 +-
svx/source/unodraw/unoshape.cxx | 11 +-
svx/source/unodraw/unoshcol.cxx | 8 +-
svx/source/unodraw/unoshtxt.cxx | 34 +-
svx/source/unoedit/unoedhlp.cxx | 23 +-
svx/source/unoedit/unoedprx.cxx | 24 +-
svx/source/unoedit/unofield.cxx | 7 +-
svx/source/unoedit/unoforou.cxx | 6 +-
svx/source/unoedit/unotext.cxx | 8 +-
svx/source/xml/xmleohlp.cxx | 6 +-
svx/source/xml/xmlxtexp.cxx | 8 +-
svx/source/xoutdev/_xpoly.cxx | 12 +-
svx/source/xoutdev/xpool.cxx | 6 +-
266 files changed, 19628 insertions(+), 17545 deletions(-)
create mode 100644 svx/source/form/sdbdatacolumn.cxx
create mode 100644 svx/source/inc/fmgroup.hxx
create mode 100644 svx/source/inc/sdbdatacolumn.hxx
create mode 100644 svx/source/msfilter/msashape3d.cxx
create mode 100644 svx/source/msfilter/msashape3d.hxx
create mode 100644 svx/source/msfilter/msfiltertracer.cxx
create mode 100644 svx/source/svrtf/segincr.asm
(limited to 'svx/source')
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
#endif
+#ifndef COMPHELPER_ACCESSIBLE_EVENT_NOTIFIER
+#include
+#endif
#ifndef _RTL_UUID_H_
#include
@@ -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 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& rxListener)
throw (uno::RuntimeException)
{
- if (rBHelper.bDisposed || rBHelper.bInDispose)
- {
- uno::Reference 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 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_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*)0));
- if (pContainer != NULL)
- {
- ::cppu::OInterfaceIteratorHelper I (*pContainer);
- while (I.hasMoreElements())
- {
- Reference xListener =
- static_cast(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
#endif
+#ifndef _DRAFTS_COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLESTATETYPE_HPP_
+#include
+#endif
+#ifndef _COM_SUN_STAR_FORM_FORMCOMPONENTTYPE_HPP_
+#include
+#endif
#ifndef _COM_SUN_STAR_REFLECTION_XPROXYFACTORY_HPP_
#include
#endif
#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
#include
#endif
+#ifndef _UTL_ACCESSIBLESTATESETHELPER_HXX_
+#include
+#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
-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 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 SAL_CALL
break;
default:
sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("UnknownAccessibleControlShape"));
- uno::Reference xDescriptor (mxShape, uno::UNO_QUERY);
+ Reference< XShapeDescriptor > xDescriptor (mxShape, UNO_QUERY);
if (xDescriptor.is())
sName += ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM(": "))
+ xDescriptor->getShapeType();
@@ -267,27 +380,10 @@ Reference 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 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 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
#endif
+#ifndef COMPHELPER_ACCESSIBLE_EVENT_NOTIFIER
+#include
+#endif
+
#ifndef _UTL_ACCESSIBLESTATESETHELPER_HXX_
#include
#endif
@@ -154,6 +158,9 @@
#endif
#include "accessibility.hrc"
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include
+#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(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
#endif
+#ifndef COMPHELPER_ACCESSIBLE_EVENT_NOTIFIER
+#include
+#endif
+
#ifndef _UTL_ACCESSIBLESTATESETHELPER_HXX_
#include
#endif
@@ -127,6 +131,9 @@
#include "editeng.hxx"
#include "outliner.hxx"
#include "accessibility.hrc"
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include
+#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(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
#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 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 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 xSelectedShape (
- xSelectionSupplier->getSelection(), uno::UNO_QUERY);
- if (xSelectedShape.is() && xSelectedShape == mxShape)
- bShapeIsSelected = true;
- else
- {
- Reference xSelectedShapes (
- xSelectionSupplier->getSelection(), uno::UNO_QUERY);
- if( xSelectedShapes.is() )
- {
- for (sal_Int32 i=0,nCount=xSelectedShapes->getCount();
- igetByIndex(i) == mxShape)
- bShapeIsSelected = true;
- }
- }
- }
+ bShapeIsSelected = maShapeTreeInfo.GetSdrView()->IsObjMarked(m_pShape) == TRUE;
}
+
+
+// Reference xSelectionSupplier ( maShapeTreeInfo.GetController(), uno::UNO_QUERY);
+// if ( xSelectionSupplier.is() )
+// {
+// uno::Any aSelection(xSelectionSupplier->getSelection());
+// Reference xSelectedShape;
+// aSelection >>= xSelectedShape;
+// if ( xSelectedShape.is() && xSelectedShape.get() == mxShape.get() )
+// bShapeIsSelected = true;
+// else
+// {
+// Reference xSelectedShapes;
+// aSelection >>= xSelectedShapes;
+// if ( xSelectedShapes.is() )
+// {
+// for (sal_Int32 i=0,nCount=xSelectedShapes->getCount();
+// igetByIndex(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 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 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 xSet (mxShape, uno::UNO_QUERY);
- Reference 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 xSet (mxShape, uno::UNO_QUERY);
+ Reference 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(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 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(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 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 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 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 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
#endif
+#ifndef COMPHELPER_ACCESSIBLE_EVENT_NOTIFIER
+#include
+#endif
+
#ifndef _UTL_ACCESSIBLESTATESETHELPER_HXX_
#include
#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(-1)),
- uno::makeAny(static_cast(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(-1)),
+ uno::makeAny(static_cast(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
#endif
+#ifndef _COMPHELPER_UNO3_HXX_
+#include
+#endif
+#ifndef _COM_SUN_STAR_CONTAINER_XCHILD_HPP_
+#include
+#endif
#include
#include
@@ -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
"no accessible child with index ") + nIndex,
mxParent);
- return GetChild (maVisibleChildren[nIndex]);
+ return GetChild (maVisibleChildren[nIndex],nIndex);
}
@@ -164,7 +181,7 @@ uno::Reference
yet in the cache.
*/
uno::Reference
- 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
AccessibleShapeInfo (
rChildDescriptor.mxShape,
mxParent,
- this),
+ this,
+ mnNewNameIndex++),
maShapeTreeInfo);
rChildDescriptor.mxAccessibleShape = uno::Reference (
static_cast(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
ChildrenManagerImpl::GetChild (const uno::Reference& 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 ();
@@ -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 xShape;
+ for (sal_Int32 i=0; i 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 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& 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 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 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& rxShape
if (I != maVisibleChildren.end())
{
// Remove descriptor from that list.
- maVisibleChildren.erase (I);
Reference 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 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 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 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 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 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; iGetAccessibleShape();
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& xShape)
+{
+ Reference xComponent (xShape, uno::UNO_QUERY);
+ if (xComponent.is())
+ xComponent->addEventListener (
+ static_cast(this));
+}
+
+
+
+
+void ChildrenManagerImpl::UnregisterAsDisposeListener (
+ const Reference& xShape)
+{
+ Reference xComponent (xShape, uno::UNO_QUERY);
+ if (xComponent.is())
+ xComponent->removeEventListener (
+ static_cast(this));
+}
@@ -917,42 +962,48 @@ ChildDescriptor::ChildDescriptor (const Reference& rxAccessibleShap
-AccessibleShape* ChildDescriptor::GetAccessibleShape (void) const
+ChildDescriptor::~ChildDescriptor (void)
{
- return static_cast (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 (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 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 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 ViewForwarderChanged.
+ 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.
+
@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.
*/
- typedef ::std::vector 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
#endif
+#ifndef _TOOLKIT_HELPER_CONVERT_HXX_
+#include
+#endif
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include
+#endif
+#ifndef COMPHELPER_ACCESSIBLE_EVENT_NOTIFIER
+#include
+#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(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 ] = "Textfrg";
+ Text[ swedish ] = "Teckenfrg";
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
#endif
+#ifndef COMPHELPER_ACCESSIBLE_EVENT_NOTIFIER
+#include
+#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 ; > ;
< "Ylreuna" ; 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 ] = "Orientao" ;
Text [ finnish ] = "Tekstin suunta" ;
Text [ danish ] = "Skriveretning" ;
- Text [ french ] = "Orientation" ;
+ Text [ french ] = "Orientation du texte" ;
Text [ swedish ] = "Skrivriktning" ;
Text [ dutch ] = "Schrijfrichting" ;
Text [ spanish ] = "Direccin 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 ] = "Kt";
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 rfrence" ;
- Text [ dutch ] = "~Invalshoek" ;
+ Text [ dutch ] = "I~nvalshoek" ;
Text [ portuguese ] = "A~resta de referncia" ;
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 referncia";
- 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 cuadrcula" ;
Text [ english_us ] = "Spacing to grid lines" ;
Text[ chinese_simplified ] = "至网格线的距离";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ polish ] = "Odstp 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 ] = "Klavuz izgilere uzaklk";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Espai a la quadrcula";
@@ -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 ] = "Hjre" ;
+ 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 ] = "~Ylosa" ;
- Text [ danish ] = "verst" ;
+ Text [ finnish ] = "~Ylreuna" ;
+ 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 ] = "Textflde" ;
+ Text [ english_us ] = "Properties" ;
+ Text [ swedish ] = "Egenskaper" ;
Text [ danish ] = "Tekstretning" ;
- Text [ italian ] = "Testo" ;
- Text [ spanish ] = "Flujo de texto" ;
- Text [ french ] = "Enchanements" ;
+ Text [ italian ] = "Propriet?" ;
+ Text [ spanish ] = "Propiedades" ;
+ Text [ french ] = "Proprits" ;
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 ~lnea automtico" ;
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 ] = "Satr son~u";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Salt de ~lnia";
@@ -1038,7 +1038,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
Text [ ENGLISH ] = "Hyphenation active" ;
Text[ english_us ] = "Hyphenation active";
Text[ portuguese ] = "Diviso silbica 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 ] = "Enchanements";
+ 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~xtflde";
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 ] = "Expanso do texto a partir do canto inferior da clula." ;
Text[ chinese_simplified ] = "文字从单元格下边缘延伸。";
- Text[ russian ] = " .";
+ Text[ russian ] = " ";
Text[ polish ] = "Rozcignicie tekstu od dolnej krawdzi komrki.";
Text[ japanese ] = "セルの下縁を基準に傾ける";
Text[ language_user1 ] = " ";
@@ -1160,7 +1160,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
Text [ dutch ] = "Inhoud uitbreiden vanaf bovenkant cel." ;
Text [ portuguese ] = "Expanso do texto a partir do canto superior da clula." ;
Text[ chinese_simplified ] = "文字从单元格上边缘扩展。";
- Text[ russian ] = " .";
+ Text[ russian ] = " ";
Text[ polish ] = "Rozcignicie tekstu od grnej krawdzi komrki.";
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 ] = "Hcre st kenarndan metin genilemesi.";
Text[ catalan ] = "Expansi del text a partir de la vora superior de la cel.la.";
Text[ finnish ] = "Tekstin laajennus solun ylreunasta";
@@ -1189,7 +1189,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
Text [ dutch ] = "Inhoud uitbreiden alleen binnen cel." ;
Text [ portuguese ] = "Expanso do texto apenas dentro da clula." ;
Text[ chinese_simplified ] = "文字只在单元格内扩展。";
- Text[ russian ] = " .";
+ Text[ russian ] = " ";
Text[ polish ] = "Rozcignicie tekstu tylko wewntrz komrki.";
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 no ligada" ; \
text[ chinese_simplified ] = "未链接的图形"; \
- text[ russian ] = " "; \
+ text[ russian ] = " "; \
text[ polish ] = "Nie poczona grafika"; \
text[ japanese ] = "リンクされていない図"; \
text[ chinese_traditional ] = "未連結的圖形"; \
@@ -87,7 +87,7 @@
text[ turkish ] = "Balantsz grafik"; \
text[ language_user1 ] = " "; \
text[ finnish ] = "Linkittmtn kuva"; \
- text[ catalan ] = "Imagen no vinculada"; \
+ text[ catalan ] = "Imatge no enllaada"; \
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 ] =
{
- < "Prrafo" ; > ;
- < "Carcter" ; > ;
+ < "Pargraf" ; > ;
+ < "Carcter" ; > ;
};
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 ] = "~Vlj 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 ] = "Przegld~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 ] = "~Ligao" ;
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 ] = "Bala";
Text[ language_user1 ] = " ";
- Text[ finnish ] = "~Linkki";
- Text[ catalan ] = "~Vincular";
+ Text[ finnish ] = "~Linkit";
+ Text[ catalan ] = "~Enllaa";
Text[ thai ] = "เ~ชื่อมโยง";
};
FixedText FT_FILE
@@ -785,7 +805,7 @@ TabPage RID_SVXPAGE_BACKGROUND
Text[ korean ] = "유형";
Text[ turkish ] = "Tr";
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 ] = "~Posicin";
+ 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 ] = "~De";
Text[ language_user1 ] = " ";
- Text[ finnish ] = "~Vierekk?in";
- Text[ catalan ] = "~Mosaico";
+ Text[ finnish ] = "Vi~erekkin";
+ 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~odgld";
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~odgld";
Text[ japanese ] = "プレビュー(~V)";
Text[ chinese_traditional ] = "預覽(~V)";
Text[ arabic ] = "";
Text[ language_user1 ] = " ";
Text[ finnish ] = "Esi~katselu";
- Text[ catalan ] = "Previsuali~zacin";
+ 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 / Arrire-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 ] = "Kenarlk";
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 ] = "Kenarlk / 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 ] = "Reemplaa 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 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 ] = "ereve";
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 ] = "Odstp od zawartoci";
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 ] = "Glge";
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 ] = "Slo 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 extrieure";
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 lneas 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 extrieure 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 lneas 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 extrieure et totalit des lignes intrieures";
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 modificacin de las lneas 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 extrieure sans modification des lignes intrieures";
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 complte";
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 ] = "Slo borde derecho e izquierdo";
+ Text[ italian ] = "Imposta solo il bordo sinistro e destro";
+ Text[ swedish ] = "Rita bara hger och vnster 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 ] = "Slo 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 suprieure et infrieure";
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 ] = "Slo borde izquierdo";
+ Text[ italian ] = "Imposta solo il margine sinistro";
+ Text[ swedish ] = "Bara vnster 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 nedt t hger";
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 uppt t hger";
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 nedt t vnster";
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 uppt t vnster";
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 fr 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 fr 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 ] = "Tamao";
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 ] = "Tamao";
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 fr asiatischen Text";
Text [ english_us ] = "Asian text font";
Text[ portuguese ] = "Tipo de letra para texto asitico";
- 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 fr 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 ] = "Tamao";
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~rk";
Text[ polish ] = "Jzyk";
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" ;
+ "Padro" ;
+ "Itlico" ;
+ "Negrito" ;
+ "Itlico 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 ; > ;
- < "Yksittinen" ; CHRDLG_UNDERLINE_SINGLE ; > ;
+ < "Rivivli 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; > ;
- < "Vliviiva"; CHRDLG_UNDERLINE_DASH; > ;
- < "Vliviiva (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 ] = "~Frg";
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 ; > ;
- < "Yksittinen" ; CHRDLG_STRIKEOUT_SINGLE ; > ;
+ < "Rivivli 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 sowa";
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 ] = "~Yksittiset sanat";
+ Text[ finnish ] = "Yksittiset ~sanat";
Text[ thai ] = "~คำเฉพาะ";
};
FixedText FT_EMPHASIS
@@ -2382,18 +2383,18 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
Text[ french ] = "Caractres d'a~ccentuation";
Text[ spanish ] = "Caracteres de acentuacin";
Text[ italian ] = "Carattere di accentua~zione";
- Text[ danish ] = "~Fremhvningstegn";
+ Text[ danish ] = "Fre~mhvningstegn";
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 ] = "Carcter ~emftic";
- 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 mitn)" ; 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 ] = "~Posio";
- 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 mitn" ; 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 ] = "~Relif";
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 mitn" ; 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 ttulo";
- Text[ russian ] = " ";
+ Text[ russian ] = "";
Text[ greek ] = "";
- Text[ dutch ] = "Titel";
+ Text[ dutch ] = "Lettertype titel";
Text[ french ] = "Caractres du titre";
Text[ spanish ] = "Ttulo";
Text[ italian ] = "Titolo";
@@ -3402,7 +3404,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
Text[ turkish ] = "Small Capitals";
Text[ arabic ] = " ";
Text[ catalan ] = "Majscules 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 ] = "Posio";
- 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 ] = "Superndice";
Text[ italian ] = "~Apice";
@@ -3568,7 +3570,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
Text[ turkish ] = "Super";
Text[ arabic ] = "";
Text[ catalan ] = "Superndex";
- Text[ finnish ] = "Ylpuolella";
+ Text[ finnish ] = "Ylindeksi";
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 ] = "Subndice";
Text[ italian ] = "P~edice";
@@ -3626,7 +3628,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
Text[ turkish ] = "Sub";
Text[ arabic ] = "";
Text[ catalan ] = "Subndex";
- 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/subndice";
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~utomtico";
Text[ russian ] = "";
Text[ greek ] = "~";
- Text[ dutch ] = "A~utomatisch";
+ Text[ dutch ] = "Au~tomatisch";
Text[ french ] = "Automatique";
Text[ spanish ] = "Automtico";
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 lnea";
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 ] = "Tamao 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 ] = "Espaamento";
Text[ russian ] = "";
Text[ greek ] = "";
- Text[ dutch ] = "Spatiring";
+ Text[ dutch ] = "Kerning";
Text[ french ] = "Espacement";
Text[ spanish ] = "Espacios";
Text[ italian ] = "Spaziatura";
@@ -3978,13 +3980,13 @@ TabPage RID_SVXPAGE_CHAR_POSITION
Text[ polish ] = "Odstpy";
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 ] = "Objektivlit";
+ Text[ finnish ] = "Vlit";
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 ] = "~etisyys";
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 ] = "~Crnage 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 ] = "~Parivlistys";
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 dwch 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 lnies per rengla";
- Text[ finnish ] = "~Kyt kaksoisviivoja";
+ Text[ finnish ] = "Kyt ~kaksoisviivoja";
Text[ thai ] = "เ~ขียนในบรรทัดคู่";
};
FixedLine FL_ENCLOSE
@@ -4306,7 +4309,7 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
Text = "Einschlieende Zeichen";
Text [ english_us ] = "Enclosing character" ;
Text[ portuguese ] = "Caracteres de incluso";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ greek ] = " ";
Text[ dutch ] = "Omhullend teken";
Text[ french ] = "Caractres d'encadrement";
@@ -4317,7 +4320,7 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
Text[ polish ] = "Znaki wiodce i kocowe";
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 ] = "Carcter i~nicial";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ greek ] = " ";
Text[ dutch ] = "~Eerste teken";
Text[ french ] = "Caractre de ~dbut";
@@ -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 ] = "Carcter ~final";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ greek ] = "~ ";
Text[ dutch ] = "~Laatste teken";
Text[ french ] = "Caractre 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
+#endif
+
#include
#include
@@ -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 ] = "Smbolos";
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 ] = "~Yaztipi";
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 ] = "~Omrde";
Text[ swedish ] = "~Omrde";
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 ] = "Carcter:";
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 ] = "Carcter:";
+ Text[ catalan ] = "Carcter:";
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 ] = "Smbolos";
- Text[ finnish ] = "Erikoismerkit";
+ Text[ catalan ] = "Smbols";
+ Text[ finnish ] = "Erikoismerkki";
+ Text[ thai ] = "ตัวอักขระพิเศษ";
};
/*
@@ -302,18 +307,19 @@ String RID_SUBSETSTR_BASIC_LATIN
Text[ french ] = "Latin de base";
Text[ spanish ] = "Latn bsico";
Text[ italian ] = "Latino di base";
- Text[ danish ] = "Basic Latin";
+ Text[ danish ] = "Basis Latin";
Text[ swedish ] = "Latin (standard)";
Text[ polish ] = "aciski 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 ] = "Latn bsico";
- Text[ finnish ] = "Latina (perus)";
+ Text[ catalan ] = "Llat bsic";
+ 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 ] = "aciski-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 ] = "Latn-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 ] = "Latn ampliado A";
Text[ italian ] = "Latino esteso A";
- Text[ danish ] = "Latin Extended-A";
+ Text[ danish ] = "Latin Udvidet-A";
Text[ swedish ] = "Utkat latin A";
Text[ polish ] = "aciski 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 ] = "Latn 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 ] = "Latn ampliado B";
Text[ italian ] = "Latino esteso B";
- Text[ danish ] = "Latin Extended-B";
+ Text[ danish ] = "Latin Udvidet-B";
Text[ swedish ] = "Utkat latin B";
Text[ polish ] = "aciski 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 ] = "Latn 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 fonticas";
Text[ italian ] = "Estensioni fonetiche";
- Text[ danish ] = "IPA Extensions";
+ Text[ danish ] = "Lydskrift Udvidelser";
Text[ swedish ] = "IPA-utkningar";
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 fonticas";
+ 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 modificao do espaamento";
- 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 ] = "Avstndsndrande tecken";
Text[ polish ] = "Litery modyfikujce odstpy";
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 ] = "Vlimerkityksen muokkauskirjaimet";
+ Text[ thai ] = "ระยะห่างตัวดัดแปลงแก้ไขอักษร";
};
String RID_SUBSETSTR_COMB_DIACRITICAL
{
@@ -452,7 +463,7 @@ String RID_SUBSETSTR_COMB_DIACRITICAL
Text[ french ] = "Marques diacritiques jonctives";
Text[ spanish ] = "Combinacin de caracteres diacrticos";
Text[ italian ] = "Caratteri diacritici di combinazione";
- Text[ danish ] = "Combining Diacritical Marks";
+ Text[ danish ] = "Kombinerende diakritiske tegn";
Text[ swedish ] = "Kombinerade diakritiska tecken";
Text[ polish ] = "czce 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 ] = "Combinacin de caracteres diacrticos";
+ Text[ catalan ] = "Combinaci de carcters diacrtics";
Text[ finnish ] = "Yhdistvt 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 bsico";
Text[ italian ] = "Greco di base";
- Text[ danish ] = "Basic Greek";
+ Text[ danish ] = "Basis Grsk";
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 bsico";
+ Text[ catalan ] = "Grec bsic";
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 ] = "Smbolos griegos y copto";
Text[ italian ] = "Simboli greci e copti";
- Text[ danish ] = "Greek Symbols And Coptic";
+ Text[ danish ] = "Grske 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 ] = "Smbolos griegos y copto";
+ Text[ catalan ] = "Smbols 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 ] = "Cirlico";
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 ] = "Cirlico";
+ Text[ catalan ] = "Cirl.lic";
Text[ finnish ] = "kyrillinen";
+ Text[ thai ] = "ตัวอักขระของซิริล";
};
String RID_SUBSETSTR_ARMENIAN
{
@@ -548,11 +563,11 @@ String RID_SUBSETSTR_ARMENIAN
Text[ portuguese ] = "Armnio";
Text[ russian ] = "";
Text[ greek ] = "";
- Text[ dutch ] = "Armenieens";
+ Text[ dutch ] = "Armeens";
Text[ french ] = "Armnien";
Text[ spanish ] = "Armenio";
Text[ italian ] = "Armeno";
- Text[ danish ] = "Armenian";
+ Text[ danish ] = "Armensk";
Text[ swedish ] = "Armenisk";
Text[ polish ] = "Armeski";
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 ] = "Hbreu de base";
Text[ spanish ] = "Hebreo bsico";
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 bsico";
+ Text[ catalan ] = "Hebreu bsic";
Text[ finnish ] = "heprea (perusteet)";
+ Text[ thai ] = "ภาษาฮิบรูพื้นฐาน";
};
String RID_SUBSETSTR_BASIC_HEBREW
{
@@ -602,7 +619,7 @@ String RID_SUBSETSTR_BASIC_HEBREW
Text[ french ] = "Hbreu tendu";
Text[ spanish ] = "Hebreo ampliado";
Text[ italian ] = "Ebraico esteso";
- Text[ danish ] = "Hebrew Extended";
+ Text[ danish ] = "Udvidet Hebraisk";
Text[ swedish ] = "Hebreisk (utkad)";
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 bsico";
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 bsico";
+ Text[ catalan ] = "rab bsic";
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 (utkad)";
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 ] = "Tailands";
Text[ italian ] = "Thai";
- Text[ danish ] = "Thai";
+ Text[ danish ] = "Thailandsk";
Text[ swedish ] = "Thailndsk";
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 ] = "Tailands";
+ 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 ] = "Laotaski";
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 ] = "Gorgien de base";
Text[ spanish ] = "Georgiano bsico";
Text[ italian ] = "Georgiano di base";
- Text[ danish ] = "Basic Georgian";
+ Text[ danish ] = "Basis Georgisk";
Text[ swedish ] = "Georgisk (standard)";
Text[ polish ] = "Gruziski 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 bsico";
+ Text[ catalan ] = "Georgi bsic";
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 ] = "Gorgien 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 ] = "Gruziski 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 ] = "Latn extendido adicional";
+ Text[ spanish ] = "Latn ampliado adicional";
Text[ italian ] = "Latino esteso addizionale";
- Text[ danish ] = "Latin Extended Additional";
+ Text[ danish ] = "Latin Udvidede tilfjelser";
Text[ swedish ] = "Utkat latin tillgg";
Text[ polish ] = "aciski 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 ] = "Latn extendido adicional";
+ Text[ catalan ] = "Llat ampliat addicional";
Text[ finnish ] = "latina (lislaajennus)";
+ 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 Grsk";
Text[ swedish ] = "Grekisk (utkad)";
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 gnrale";
Text[ spanish ] = "Puntuacin general";
Text[ italian ] = "Punteggiatura generale";
- Text[ danish ] = "General Punctuation";
+ Text[ danish ] = "Generel tegnstning";
Text[ swedish ] = "Allmn interpunktion";
Text[ polish ] = "Oglna 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 ] = "Puntuacin general";
+ Text[ catalan ] = "Puntuaci general";
Text[ finnish ] = "Yleinen vlimerkitys";
+ 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 subndices";
+ Text[ spanish ] = "Subndices y superndices";
Text[ italian ] = "Apice e pedice";
- Text[ danish ] = "Superscripts And Subscripts";
+ Text[ danish ] = "Hvet og snket skrift";
Text[ swedish ] = "Upphjda och nedsnkta tecken";
Text[ polish ] = "Indeksy dolne i grne";
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 subndices";
+ Text[ catalan ] = "Super i subndexs";
Text[ finnish ] = "Yl- ja alaindeksit";
+ Text[ thai ] = "ตัวยกและตัวห้อย";
};
String RID_SUBSETSTR_CURRENCY_SYMBOLS
{
@@ -1129,18 +1167,19 @@ String RID_SUBSETSTR_CURRENCY_SYMBOLS
Text[ french ] = "Symboles montaires";
Text[ spanish ] = "Smbolos 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 ] = "Smbolos de monedas";
+ Text[ catalan ] = "Smbols 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 smbolos diacrticos";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ greek ] = " ";
Text[ dutch ] = "Gecombineerde diakritische tekens";
Text[ french ] = "Signes diacritiques jonctifs";
Text[ spanish ] = "Combinacin de smbolos diacrticos";
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 czce (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 ] = "Combinacin de smbolos diacrticos";
+ Text[ catalan ] = "Combinaci de smbols diacrtics";
Text[ finnish ] = "Yhdistvt diakriittiset merkit";
+ Text[ thai ] = "เชื่อมสัญลักษณ์การออกเสียง";
};
String RID_SUBSETSTR_LETTERLIKE_SYMBOLS
{
@@ -1175,11 +1215,11 @@ String RID_SUBSETSTR_LETTERLIKE_SYMBOLS
Text[ portuguese ] = "Smbolos tipo letras";
Text[ russian ] = " ";
Text[ greek ] = " ";
- Text[ dutch ] = "Letterachtige symbolen";
+ Text[ dutch ] = "Lettersymbolen";
Text[ french ] = "Symboles Letterlike";
Text[ spanish ] = "Smbolos 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 ] = "Smbolos tipo carta";
+ Text[ catalan ] = "Smbols 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 ] = "Smbolos numricos";
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 ] = "Smbolos numricos";
- Text[ finnish ] = "Numeromuodot";
+ Text[ catalan ] = "Smbols numrics";
+ Text[ finnish ] = "Lukumuodot";
+ Text[ thai ] = "แบบตัวเลข";
};
String RID_SUBSETSTR_ARROWS
{
@@ -1229,7 +1271,7 @@ String RID_SUBSETSTR_ARROWS
Text[ french ] = "Flches";
Text[ spanish ] = "Flechas";
Text[ italian ] = "Frecce";
- Text[ danish ] = "Arrows";
+ Text[ danish ] = "Pilesymboler";
Text[ swedish ] = "Pilsymboler";
Text[ polish ] = "Strzaki";
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 matemticos";
Text[ russian ] = " ";
Text[ greek ] = " ";
- Text[ dutch ] = "Wiskundige symbolen";
+ Text[ dutch ] = "Wiskundige operatoren";
Text[ french ] = "Oprateurs mathmatiques";
Text[ spanish ] = "Operadores matemticos";
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 matemticos";
+ Text[ catalan ] = "Operadors matemtics";
Text[ finnish ] = "Matemaattiset operaattorit";
+ Text[ thai ] = "ตัวปฏิบัติการทางคณิตศาสตร์";
};
String RID_SUBSETSTR_MISC_TECHNICAL
{
@@ -1276,11 +1320,11 @@ String RID_SUBSETSTR_MISC_TECHNICAL
Text[ portuguese ] = "Caracteres tcnicos vrios";
Text[ russian ] = " ";
Text[ greek ] = " ";
- Text[ dutch ] = "Diverse technisch";
+ Text[ dutch ] = "Diverse technische tekens";
Text[ french ] = "Divers technique";
Text[ spanish ] = "Diversos caracteres tcnicos";
Text[ italian ] = "Tecnici misti";
- Text[ danish ] = "Miscellaneous Technical";
+ Text[ danish ] = "Forskellige tekniske tegn";
Text[ swedish ] = "Blandade tekniska tecken";
Text[ polish ] = "Rne 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 tcnicos";
+ Text[ catalan ] = "Diversos carcters tcnics";
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 ] = "Smbolos 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 ] = "Smbolos 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 caractres";
Text[ spanish ] = "Caracteres legibles por mquina";
Text[ italian ] = "Riconoscimento ottico dei caratteri";
- Text[ danish ] = "Optical Character Recognition";
+ Text[ danish ] = "Maskinlsbare tegn";
Text[ swedish ] = "Optisk teckenlsning";
Text[ polish ] = "Optyczne rozpoznawanie znakw";
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 mquina";
- Text[ finnish ] = "Optinen merkkitunnistus";
+ Text[ catalan ] = "Carcters llegibles per mquina";
+ 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 alfanumricos inclusos";
- Text[ russian ] = " - ";
+ Text[ russian ] = " - ";
Text[ greek ] = " ";
Text[ dutch ] = "Ingesloten tekens";
Text[ french ] = "Alphanumriques encercls";
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 ] = "Carcters inclosos";
Text[ finnish ] = "Sislletyt 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 ] = "Bote de dessin";
Text[ spanish ] = "Smbolos 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 ] = "Smbolos 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 ] = "Pavs";
Text[ spanish ] = "Smbolos 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 ] = "Smbolos 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 geomtricas";
Text[ russian ] = " ";
Text[ greek ] = " ";
- Text[ dutch ] = "Geometrische vormen";
+ Text[ dutch ] = "Meetkundige symbolen";
Text[ french ] = "Formes gomtriques";
Text[ spanish ] = "Smbolos geomtricos";
Text[ italian ] = "Simboli geometrici";
- Text[ danish ] = "Geometric Shapes";
+ Text[ danish ] = "Geometriske symboler";
Text[ swedish ] = "Geometriska symboler";
Text[ polish ] = "Ksztaty 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 ] = "Smbolos geomtricos";
+ Text[ catalan ] = "Smbols geomtrics";
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 smbolos";
Text[ italian ] = "Simboli";
- Text[ danish ] = "Miscellaneous Symbols";
+ Text[ danish ] = "Forskellige symboler";
Text[ swedish ] = "Diverse symboler";
Text[ polish ] = "Rne";
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 smbolos";
+ Text[ catalan ] = "Diversos smbols";
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 ] = "Smbolos y puntuacin CJK";
Text[ italian ] = "Simboli e punteggiatura CJK";
- Text[ danish ] = "CJK Symbols And Punctuation";
+ Text[ danish ] = "CJK-symboler og tegnstning";
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 ] = "Smbolos y puntuacin CJK";
+ Text[ catalan ] = "Smbols i puntuaci CJK";
Text[ finnish ] = "CJK-merkit ja -vlimerkitys";
+ 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 ] = "Rne 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 encercls";
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 -mneder med bolle omkring";
Text[ swedish ] = "Omslutna CJK-bokstav och -mnad";
Text[ polish ] = "Otoczone CJK litery i miesice";
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 ] = "Carcters i mesos inclosos en CJK";
Text[ finnish ] = "Sisllytetyt 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 ] = "Idogrammes unifis 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 ] = "Idogrammes unifis CJC extension-A";
Text[ spanish ] = "Ideogramas CJK unificados extensin 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 utkning-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 extensin 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 utilizao privada";
Text[ russian ] = " ";
Text[ greek ] = " ";
- Text[ dutch ] = "Privgebruik";
+ Text[ dutch ] = "Priv-gebruik";
Text[ french ] = "Zone usage priv";
Text[ spanish ] = "Smbolos especficos de fuentes";
Text[ italian ] = "Area uso privato";
- Text[ danish ] = "Private Use Area";
+ Text[ danish ] = "Tegnstspecifikke symboler";
Text[ swedish ] = "Symboler specifika f. teckenuppsttningar";
Text[ polish ] = "Symbole specyficzne dla zbioru znakw";
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 ] = "Smbolos especficos de fuentes";
+ Text[ catalan ] = "rea d's privat";
Text[ finnish ] = "Henkilkohtainen alue";
+ Text[ thai ] = "พื้นที่ใช้ส่วนตัว";
};
String RID_SUBSETSTR_CJK_COMPAT_IDGRAPHS
{
@@ -1808,7 +1873,7 @@ String RID_SUBSETSTR_CJK_COMPAT_IDGRAPHS
Text[ french ] = "Idogrammes 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 prsentation alphabtiques";
Text[ spanish ] = "Formas de presentacin alfabticas";
Text[ italian ] = "Forme di presentazione alfabetiche";
- Text[ danish ] = "Alphabetic Presentation Forms";
+ Text[ danish ] = "Alfabetiske prsentationsformer";
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 presentacin alfabticas";
+ Text[ catalan ] = "Formes de presentaci alfabtiques";
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 presentacin rabe";
Text[ italian ] = "Forme di presentazione arabe A";
- Text[ danish ] = "Arabic Presentation Forms-A";
+ Text[ danish ] = "Arabiske prsentationsformer-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 presentacin 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 ] = "Combinacin de medias marcas";
Text[ italian ] = "Mezze marche di combinazione";
- Text[ danish ] = "Combining Half Marks";
+ Text[ danish ] = "Kombinerende halvmrker";
Text[ swedish ] = "Kombinerar halva markeringar";
Text[ polish ] = "czce pznaczniki";
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 ] = "Combinacin de medias marcas";
+ Text[ catalan ] = "Combinaci de miges marques";
Text[ finnish ] = "Puolimerkkien yhdistminen";
+ 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 zgodnoci 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 pequeas formas";
Text[ italian ] = "Piccole varianti di forma";
- Text[ danish ] = "Small Form Variants";
+ Text[ danish ] = "Sm formvarianter";
Text[ swedish ] = "Sm formatvarianter";
Text[ polish ] = "Warianty maych 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 pequeas 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 prsentation arabe";
Text[ spanish ] = "Formas B de presentacin rabe";
Text[ italian ] = "Forme di presentazione arabe B";
- Text[ danish ] = "Arabic Presentation Forms-B";
+ Text[ danish ] = "Arabiske prsentationsformer-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 presentacin 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 pszerokie";
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 ] = "Puolilevet ja tyslevet lomakkeet";
+ Text[ thai ] = "แบบฟอร์มที่มีความกว้างครึ่งหนึ่งและความกว้างเต็ม";
};
String RID_SUBSETSTR_SPECIALS
{
@@ -2010,7 +2083,7 @@ String RID_SUBSETSTR_SPECIALS
Text[ french ] = "Symboles spciaux";
Text[ spanish ] = "Smbolos 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 ] = "Smbolos 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 ] = "Tibtain";
Text[ spanish ] = "Tibetano";
Text[ italian ] = "Tibetano";
- Text[ danish ] = "Tibetan";
+ Text[ danish ] = "Tibetansk";
Text[ swedish ] = "Tibetansk";
Text[ polish ] = "Tybetaski";
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 ] = "Rnico";
- Text[ russian ] = " ";
+ Text[ russian ] = "";
Text[ greek ] = "";
Text[ dutch ] = "Runen";
Text[ french ] = "Runique";
Text[ spanish ] = "Rnico";
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 ] = "Rnico";
+ Text[ catalan ] = "Rnic";
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 ] = "Etope";
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 ] = "Etope";
+ Text[ catalan ] = "Etop";
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 ] = "Slabas autctones canadianas";
Text[ russian ] = " ";
Text[ greek ] = " Aborigin";
- Text[ dutch ] = "Canadese Aboriginal lettergrepen";
+ Text[ dutch ] = "Canadese Aboriginal-lettergrepen";
Text[ french ] = "Syllabaires autochtones canadiens";
Text[ spanish ] = "Slabas aborgenes 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 aborygenw";
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 ] = "Slabas aborgenes canadienses";
+ Text[ catalan ] = "Sl.labes aborgens canadenques";
Text[ finnish ] = "Kanadan alkuperiskansojen 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 ] = "Transposio de linhas" ;
Text[ chinese_simplified ] = "线偏离";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ polish ] = "Przesunicie linii";
Text[ japanese ] = "線のずれ";
Text[ chinese_traditional ] = "線偏離";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = "선 빗김";
+ Text[ korean ] = "휘인 선";
Text[ turkish ] = "izgi erilii";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Desplazamiento de lneas";
- Text[ finnish ] = "Viivan viistotus";
+ Text[ catalan ] = "Desplaament de lnies";
+ 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 ] = "Lnea ~1";
- Text[ finnish ] = "Rivi ~1";
+ Text[ catalan ] = "Lnia ~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 ] = "Lnea ~2";
- Text[ finnish ] = "Rivi ~2";
+ Text[ catalan ] = "Lnia ~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 ] = "Lnea~3";
- Text[ finnish ] = "Rivi ~3";
+ Text[ catalan ] = "Lnia ~3";
+ Text[ finnish ] = "Viivanosa ~3";
+ Text[ thai ] = "Line ~3";
};
MetricField MTR_FLD_LINE_3
{
@@ -290,12 +295,12 @@ TabPage RID_SVXPAGE_CONNECTION
Text [ swedish ] = "Linjeavstnd" ;
Text [ danish ] = "Linjeafstand" ;
Text [ italian ] = "Distanza tra le linee" ;
- Text [ spanish ] = "Distancia entre lneas" ;
+ 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 ] = "Odstpy midzy 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 lneas";
- Text[ finnish ] = "Line spacing";
+ Text[ catalan ] = "Distncia entre lnies";
+ Text[ finnish ] = "Viivan vlit";
+ 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 ] = "Dbut 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 ] = "Incio ~vertical" ;
Text[ chinese_simplified ] = "起始部分是垂直方向(~V)";
- Text[ russian ] = " ";
+ Text[ russian ] = "~ ";
Text[ polish ] = "Pocztek 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 ] = "Aperu";
QuickHelpText[ spanish ] = "Previsualizacin";
- QuickHelpText[ finnish ] = "Preview";
+ QuickHelpText[ finnish ] = "Esikatselu";
QuickHelpText[ italian ] = "Anteprima";
QuickHelpText[ danish ] = "Preview";
QuickHelpText[ swedish ] = "Frhandsvisning";
QuickHelpText[ polish ] = "Podgld";
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 ] = "Balayc";
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 ] = "Dikdrtgen";
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 automtic";
@@ -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 arbetsomrde\nleder till att konturen raderas.\nVill du fortstta nd?" ;
Text [ danish ] = "Hvis du definerer et nyt arbejdsomrde\nbliver konturen slettet.\nEr du sikker p at du vil fortstte?" ;
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.\nDesea realmente continuar?" ;
+ Text [ spanish ] = "Al establecer una nueva rea de trabajo\nse borrar el contorno.\nDesea 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 alma 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 balantl. Grafii dzenlemek iin bu balanty kaldrmak istiyor musunuz?";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Aquesta imatge est enllaada 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 ] = "~Tmn 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 ] = "~Desfs";
@@ -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
#endif
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include
+#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 mitn";
+ 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 ] = "~Vnster";
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 ] = "Porodku";
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 ] = "~Avstnd";
Text[ polish ] = "Odstp";
Text[ portuguese_brazilian ] = "Distance";
@@ -211,8 +215,9 @@ TabPage RID_SVXPAGE_DISTRIBUTE
Text[ chinese_traditional ] = "間隔(~S)";
Text[ arabic ] = "";
Text[ turkish ] = "Aralk";
- Text[ catalan ] = "Espacio";
- Text[ finnish ] = "Objektivlit";
+ Text[ catalan ] = "Espaiat";
+ Text[ finnish ] = "Vlit";
+ 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 ] = "Hjre";
+ Text[ danish ] = "H~jre";
Text[ swedish ] = "Hge~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 mitn";
+ 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 gry";
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 ] = "Ylosa";
+ Text[ catalan ] = "Superior";
+ Text[ finnish ] = "Ylreuna";
+ 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 ] = "Porodku";
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~stnd";
Text[ polish ] = "Odstp";
Text[ portuguese_brazilian ] = "Distance";
@@ -419,8 +429,9 @@ TabPage RID_SVXPAGE_DISTRIBUTE
Text[ chinese_traditional ] = "間隔(~P)";
Text[ arabic ] = "";
Text[ turkish ] = "Aralk";
- Text[ catalan ] = "Espacio";
- Text[ finnish ] = "Objektivlit";
+ Text[ catalan ] = "Espaiat";
+ Text[ finnish ] = "Vlit";
+ 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 ] = "Dalm";
- Text[ catalan ] = "Distribucin";
+ 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
+#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 kytst";
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 eim";
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 eim";
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 ] = "Orientao" ;
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 yn";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Orientacin";
+ 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? Linksbndig : Linksbndig */
+ /* ### ACHTUNG: Neuer Text in Resource? Linksbndig : Linksbndig */
Text = "Linksbndig" ;
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 ] = "Vnsterjusterat" ;
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? Rechtsbndig : Rechtsbndig */
+ /* ### ACHTUNG: Neuer Text in Resource? Rechtsbndig : Rechtsbndig */
Text = "Rechtsbndig" ;
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 ] = "Hgerjusterat" ;
Text [ danish ] = "Hjrejusteret" ;
@@ -396,10 +397,10 @@ DockingWindow RID_SVXDLG_FONTWORK
Text[ chinese_traditional ] = "向右對齊";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = "오른쪽 배열";
+ Text[ korean ] = "오른쪽 맞춤";
Text[ turkish ] = "Saa 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-Textgre : Auto-Textgre */
+ /* ### ACHTUNG: Neuer Text in Resource? Auto-Textgre : Auto-Textgre */
Text = "Auto-Textgre" ;
Text [ ENGLISH ] = "Autosize" ;
Text [ dutch ] = "AutoTekstgrootte" ;
Text [ english_us ] = "AutoSize Text" ;
Text [ italian ] = "Dimensione testo automatico" ;
- Text [ spanish ] = "Tamao automtico de texto" ;
+ Text [ spanish ] = "Texto - Tamao automtico" ;
Text [ french ] = "Taille du texte adapte" ;
Text [ swedish ] = "AutoTextstorlek" ;
Text [ danish ] = "AutoTekststrrelse" ;
@@ -430,7 +433,7 @@ DockingWindow RID_SVXDLG_FONTWORK
Text[ korean ] = "자동텍스트 크기";
Text[ turkish ] = "Otomatik metin boyu";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Tamao automtico de texto";
+ Text[ catalan ] = "Mida automtica del text";
Text[ finnish ] = "Automaattinen tekstin koon mritys";
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 ] = "Distncia";
QuickHelpText[ finnish ] = "Etisyys";
QuickHelpText[ thai ] = "Distance";
};
@@ -525,7 +528,7 @@ DockingWindow RID_SVXDLG_FONTWORK
QuickHelpText[ korean ] = "들여쓰기";
CustomUnitText[ language_user1 ] = " ";
QuickHelpText[ turkish ] = "Einzug";
- QuickHelpText[ catalan ] = "Sangra";
+ 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 ] = "Wycz";
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 ] = "Eim";
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 ] = "Avstnd 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 ] = "Etisyys 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 vri";
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 yarm daire";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Semicrculo 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 yarm daire";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Semicrculo 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 yarm daire";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Semicrculo 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 yarm daire";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Semicrculo 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 crculo";
+ 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 crculo";
+ 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 crculo" ;
Text [ danish ] = "Venstre bue" ;
Text [ swedish ] = "Vnster cirkelbge" ;
@@ -1267,7 +1268,7 @@ String RID_SVXSTR_FONTWORK_FORM7
Text[ korean ] = "왼쪽 원호";
Text[ turkish ] = "Sol yay";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Arco izquierdo de crculo";
+ 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 crculo" ;
Text [ danish ] = "Hjre bue" ;
Text [ swedish ] = "Hger cirkelbge" ;
@@ -1295,7 +1296,7 @@ String RID_SVXSTR_FONTWORK_FORM8
Text[ korean ] = "오른쪽 원호";
Text[ turkish ] = "Sa yay";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Arco derecho de crculo";
+ Text[ catalan ] = "Arc dret";
Text[ thai ] = "ส่วนโค้งของวงกลมขวา";
};
String RID_SVXSTR_FONTWORK_FORM9
@@ -1323,7 +1324,7 @@ String RID_SVXSTR_FONTWORK_FORM9
Text[ korean ] = "열린 원";
Text[ turkish ] = "Ak 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 ] = "Crculo 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 ] = "Crculo 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 ak daire";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Crculo 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 ] = "Crer 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 ] = "Utwrz obiekt FontWork";
Text[ japanese ] = "フォントワーク オブジェクトの作成";
Text[ chinese_traditional ] = "產生美術字型物件";
Text[ arabic ] = " FontWork";
Text[ greek ] = " FontWork";
- Text[ korean ] = "FontWork 개체 생성";
+ Text[ korean ] = "폰트워크 개체 만들기";
Text[ turkish ] = "FontWork nesnesi olutur";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Crear objeto FontWork";
- Text[ finnish ] = "Luo fonttityobjekti";
+ Text[ catalan ] = "Crea un objecte FontWork";
+ Text[ finnish ] = "Luo Fonttityobjekti";
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 ] = "Vnster-till-hger";
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 ] = "Hger-till-vnster";
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 paramtres de l'objet suprieur";
+ Text[ spanish ] = "Utilizar la configuracin 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 ] = "Anvnd det verordnade objektets instllningar";
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 ] = "Vnster-till-hger (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 ] = "Hger-till-vnster (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 ] = "Hger-till-vnster (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 ] = "Vnster-till-hger (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 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
#endif
-#ifndef _TOOLS_SOLMATH_HXX
-#include
+#ifndef INCLUDED_RTL_MATH_HXX
+#include
#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 ] = "Paramtres";
Text[ spanish ] = "Parmetros";
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 ] = "Parmetros";
+ Text[ catalan ] = "Parmetres";
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 ] = "Genilik";
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 ] = "Hjde" ;
+ Text[ finnish ] = "~Korkeus" ;
+ Text[ danish ] = "H~jde" ;
Text[ french ] = "Hauteur" ;
Text[ swedish ] = "~Hjd" ;
Text[ dutch ] = "~Hoogte" ;
@@ -212,7 +214,8 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC
Text[ korean ] = "높이(~E)";
Text[ turkish ] = "Yksek.";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "A~ltura";
+ Text[ catalan ] = "A~lada";
+ 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 ~artes";
Text[ spanish ] = "~Resaltar aristas";
Text[ italian ] = "E~videnzia gli angoli";
- Text[ danish ] = "Fremhv kanter";
+ Text[ danish ] = "Fremhv ~kanter";
Text[ swedish ] = "Framhv ~kanter";
Text[ polish ] = "Wyrnij krawdzie";
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 ] = "Yksek pozlama";
Text[ language_user1 ] = " ";
@@ -333,18 +338,19 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE
Text[ french ] = "Paramtres";
Text[ spanish ] = "Parmetros";
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 ] = "Parmetros";
+ Text[ catalan ] = "Parmetres";
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 ] = "Trskelvrdi" ;
+ Text[ danish ] = "~Trskelvrdi" ;
Text[ french ] = "~Valeur de seuil" ;
Text[ swedish ] = "Tr~skelvrde" ;
Text[ dutch ] = "~Drempelwaarde" ;
@@ -379,7 +385,8 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE
Text[ korean ] = "임계값(~V)";
Text[ turkish ] = "Eik deer";
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 ] = "~Knn" ;
- Text[ danish ] = "Inverter" ;
+ Text[ finnish ] = "Muunna ~knteiseksi" ;
+ 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 ] = "Solarizacin";
+ 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 ] = "Ikntynyt" ;
- Text[ danish ] = "ldning" ;
+ Text[ finnish ] = "Ikntyminen" ;
+ 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 ] = "Paramtre";
Text[ spanish ] = "Parmetros";
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 ] = "Parmetros";
+ Text[ catalan ] = "Parmetres";
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 ] = "Ikntymisaste" ;
- 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 ] = "Vrien vhennys" ;
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 ] = "Paramtre";
Text[ spanish ] = "Parmetros";
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 ] = "Parmetros";
+ Text[ catalan ] = "Parmetres";
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 vrit" ;
+ Text[ finnish ] = "Vrien mr" ;
Text[ danish ] = "Plakatfarver" ;
Text[ french ] = "Couleurs du poster" ;
Text[ swedish ] = "Posterfrger" ;
@@ -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 pster";
+ Text[ catalan ] = "Colors del pster";
+ 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 ] = "Pster";
+ 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 ] = "Paramtre";
Text[ spanish ] = "Parmetros";
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 ] = "Parmetros";
+ Text[ catalan ] = "Parmetres";
Text[ finnish ] = "Parametrit";
+ Text[ thai ] = "พารามิเตอร์";
};
Control CTL_PREVIEW
{
@@ -826,7 +842,8 @@ ModalDialog RID_SVX_GRFFILTER_DLG_EMBOSS
Text[ greek ] = " ";
Text[ korean ] = "광원";
Text[ turkish ] = "Ik 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 ] = "Beskr" ;
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 ] = "Krp";
- 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 ] = "~Vnster" ;
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 ] = "Hge~r" ;
Text [ danish ] = "Hjre" ;
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 grze";
- 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 ] = "~Ylosa";
+ Text[ catalan ] = "Part ~superior";
+ Text[ finnish ] = "~Ylreuna";
+ 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 tamao" ;
+ Text [ spanish ] = "~Conservar el tamao de la imagen" ;
Text [ french ] = "Conserver la taille de l'image" ;
Text [ dutch ] = "M~et behoud van grootte" ;
Text [ swedish ] = "Bibehll bilds~torlek" ;
- Text [ danish ] = "Bevar strrelse" ;
+ 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 ] = "Oejp(~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 tamao";
- Text[ finnish ] = "Silyt ko~ko";
+ Text[ catalan ] = "Conserva la mi~da";
+ Text[ finnish ] = "Silyt 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 ] = "Bibehll ~skalning" ;
- Text [ danish ] = "Bevar mlestok" ;
+ 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 ] = "~Oranty koru";
- Text[ catalan ] = "Mantener la ~escala";
+ Text[ catalan ] = "Conserva l'~escala";
Text[ finnish ] = "Silyt ~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 ] = "Mlestok" ;
+ 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 ] = "lek";
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~enilik";
- 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 ] = "Hjde" ;
- 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~lada";
+ 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 ] = "Strrelse" ;
+ Text [ finnish ] = "Kuvan koko" ;
+ Text [ danish ] = "Billedstrrelse" ;
Text [ french ] = "Taille de l'image" ;
Text [ swedish ] = "Bildstorlek" ;
- Text [ dutch ] = "Grootte van de afbeelding" ;
+ Text [ dutch ] = "Afbeeldingsgrootte" ;
Text [ spanish ] = "Tamao 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 ] = "vjp";
+ Text[ japanese ] = "画像サイズ";
+ Text[ chinese_traditional ] = "影像大小";
Text[ arabic ] = "";
Text[ greek ] = "";
- Text[ korean ] = "ũ";
+ Text[ korean ] = "이미지 크기";
Text[ turkish ] = "Boyut";
- Text[ catalan ] = "Tamao";
+ 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 ] = "~Genilik";
- 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 ] = "Hjde" ;
- Text [ french ] = "Hau~teur" ;
+ Text [ french ] = "Hauteur" ;
Text [ swedish ] = "Hj~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 ] = "~Ykseklik";
- Text[ catalan ] = "A~ltura";
+ Text[ catalan ] = "A~lada";
+ 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 ] = "Tamao ori~ginal" ;
Text [ french ] = "Taille d'~origine" ;
- Text [ dutch ] = "~Originele grootte" ;
+ Text [ dutch ] = "Rele gr~ootte" ;
Text [ swedish ] = "Ori~ginalstorlek" ;
- Text [ danish ] = "Oprindelig strrelse" ;
+ 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 ] = "jp(~O)";
+ Text[ japanese ] = "オリジナルサイズ(~O)";
+ Text[ chinese_traditional ] = "原件大小(~O)";
Text[ arabic ] = " ";
Text[ greek ] = " ~";
- Text[ korean ] = " ũ(~O)";
+ Text[ korean ] = "원래 크기(~O)";
Text[ turkish ] = "~lk boyut";
- Text[ catalan ] = "Tamao ori~ginal";
+ Text[ catalan ] = "Mida ~original";
Text[ finnish ] = "~Alkuperinen 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 ] = "~Vnstermarginal" ; \
- 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 ] = "Hjre ~margen" ; \
Text [ french ] = "Marge ~droite" ; \
Text [ swedish ] = "Hge~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 ] = "Cabealho" ;
- Text [ finnish ] = "Ylotsikko" ;
+ Text [ finnish ] = "Yltunniste" ;
Text [ danish ] = "Sidehoved" ;
Text [ french ] = "En-tte" ;
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 ~cabealho" ;
- Text [ finnish ] = "~Otsikko pll" ;
+ Text [ finnish ] = "~Yltunniste kytss" ;
Text [ danish ] = "Aktiver sidehoved" ;
Text [ french ] = "Activer l'~en-tte " ;
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 ] = "~Wcz nagwek";
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 ~contedo esquerda/direita" ;
- Text [ finnish ] = "~Sama sislt vasemmalla/oikealla" ;
+ Text [ finnish ] = "~Sama sislt vasemmalla ja oikealla" ;
Text [ danish ] = "Ens indhold venstre/hjre" ;
Text [ french ] = "~Contenu identique gauche/droite" ;
Text [ swedish ] = "Samma ~innehll till hger/vnster" ;
@@ -251,7 +251,7 @@ TabPage RID_SVXPAGE_HEADER
Text [ English ] = "~Distance" ;
Text [ english_us ] = "~Spacing" ;
Text [ portuguese_brazilian ] = "~H?e" ;
- Text [ swedish ] = "~Avstnd" ;
+ Text [ swedish ] = "A~vstnd" ;
Text [ danish ] = "Afstand" ;
Text [ italian ] = "Distanza" ;
Text [ spanish ] = "Espacio" ;
@@ -269,7 +269,7 @@ TabPage RID_SVXPAGE_HEADER
Text[ turkish ] = "U~zaklk";
Text[ language_user1 ] = " ";
Text[ catalan ] = "~Espaiat";
- Text[ finnish ] = "~Objektivlit";
+ Text[ finnish ] = "Vl~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~inmico";
+ Text[ finnish ] = "Use D~ynamic spacing";
+ Text[ italian ] = "Usa spaziatura dinamica";
+ Text[ danish ] = "Use D~ynamic spacing";
+ Text[ swedish ] = "Anvnd d~ynamiskt avstnd";
+ 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 ] = "Ykseklii oto~matik olarak ayarla";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Adap~taci dinmica de l'alada";
- 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 ] = "Cabealho" ;
- Text [ finnish ] = "Ylotsikko" ;
+ Text [ finnish ] = "Yltunniste" ;
Text [ danish ] = "Sidehoved" ;
Text [ french ] = "En-tte" ;
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 kytss" ;
+ Text [ finnish ] = "Alatunniste k~ytss" ;
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 pgina" ;
Text [ english_us ] = "~Footer on" ;
Text[ chinese_simplified ] = "显示页脚(~F)";
- Text[ russian ] = ". ";
+ Text[ russian ] = ". ~ ";
Text[ polish ] = "Wcz stopk";
Text[ japanese ] = "フッタを付ける(~F)";
Text[ chinese_traditional ] = "顯示頁尾(~F)";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = "바닥글 삽입(~F)";
+ Text[ korean ] = "바닥글 표시(~F)";
Text[ turkish ] = "A~ltbilgi olutur";
Text[ language_user1 ] = " ";
Text[ catalan ] = "~Activa el peu de pgina";
@@ -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 ~contedo esquerda/direita" ;
- Text [ finnish ] = "~Sama sislt vasemmalla/oikealla" ;
+ Text [ finnish ] = "~Sama sislt vasemmalla ja oikealla" ;
Text [ danish ] = "Ens indhold venstre/hjre" ;
Text [ french ] = "~Contenu identique gauche/droite" ;
Text [ swedish ] = "Samma ~innehll till hger/vnster" ;
@@ -597,7 +617,7 @@ TabPage RID_SVXPAGE_FOOTER
Text[ turkish ] = "~Uzaklk";
Text[ language_user1 ] = " ";
Text[ catalan ] = "~Espaiat";
- Text[ finnish ] = "~Objektivlit";
+ Text[ finnish ] = "Vl~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~inmico";
+ Text[ finnish ] = "Use D~ynamic spacing";
+ Text[ italian ] = "Usa spaziatura dinamica";
+ Text[ danish ] = "Use D~ynamic spacing";
+ Text[ swedish ] = "Anvnd d~ynamiskt avstnd";
+ 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 dinmico da altura" ;
- Text [ finnish ] = "~Automaattinen korkeuden sovitus" ;
+ Text [ finnish ] = "A~utomaattinen korkeuden sovitus" ;
Text [ danish ] = "Juster hjde dynamisk" ;
Text [ french ] = "Adaptation dynamique de la hauteur" ;
Text [ swedish ] = "An~passa hjd 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 cabealho ou o rodap apaga o respectivo contedo.\nDeseja realmente eliminar o texto?" ;
- Message [ finnish ] = "Ylotsikoiden tai alaselitteiden poistaminen poistaa sislln.\nPoistetaanko teksti?" ;
+ Message [ finnish ] = "Yl- tai alatunnisteiden poistaminen poistaa sislln.\nPoistetaanko teksti?" ;
Message [ danish ] = "Deaktivering af sidehoveder eller sidefdder sletter det aktuelle indhold.\nSkal indholdet slettes?" ;
Message [ french ] = "La dsactivation de l'en-tte ou du pied de page en supprime le contenu.\ntes-vous sr de vouloir supprimer ce texte ?" ;
Message [ swedish ] = "Om du deaktiverar sidhuvuden eller sidftter raderas innehllet. \nVill du radera innehllet?" ;
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 pgina se eliminar su contenido.\nDesea eliminarlo?" ;
+ Message [ spanish ] = "Al desactivar un encabezamiento o pie de pgina se borrar su contenido.\nDesea 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 ] = "Wyczenie stopki i nagwka spowoduje usunicie zawartoci. \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 kaldrlmas ile mevcut metin silinecek.\nerii silmek istiyor musunuz?";
Message[ language_user1 ] = " ";
Message[ catalan ] = "Si desactiveu el encapalament o el peu de pgina 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'intrieur du document";
+ Text[ french ] = "Cible dans le document";
Text[ spanish ] = "Destino en documento";
Text[ italian ] = "Destinazione nel documento";
Text[ danish ] = "Ml 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 hipercza";
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 ] = "Haso";
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 ] = "Webblsare";
@@ -383,6 +383,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
Text[ swedish ] = "Webblsare";
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 ] = "rda 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 donnes...";
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'intrieur du document";
+ Text[ french ] = "Cible dans le document";
Text[ spanish ] = "Destino en el documento";
Text[ italian ] = "Destinazione nel documento";
Text[ danish ] = "Ml 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 hipercze";
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 ] = "Hr kan du skapa en hyperlnk 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 ] = "Crez 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 yazlsn 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 ] = "Sowo";
- 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 ] = "Szck";
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 ] = "~Nsta" ;
Text [ danish ] = "Nste" ;
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 ] = "~Segent";
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 ] = "~Kaldr";
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 ] = "sr(~H)";
+ TEXT[ japanese ] = "分ける(~H)";
+ TEXT[ chinese_traditional ] = "連字符(~H)";
TEXT[ arabic ] = " ";
TEXT[ greek ] = "";
- TEXT[ korean ] = " ֱ(~H)";
+ TEXT[ korean ] = "하이픈 넣기(~H)";
TEXT[ turkish ] = "~Ayr";
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 wyrazw";
- Text[ japanese ] = "ʲȰ";
- Text[ chinese_traditional ] = "sr";
+ Text[ japanese ] = "ハイフネーション";
+ Text[ chinese_traditional ] = "連字符";
Text[ arabic ] = " ";
Text[ greek ] = "";
- Text[ korean ] = " ֱ";
+ Text[ korean ] = "하이픈 넣기";
Text[ turkish ] = "Heceleme";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Separacin silbica";
+ Text[ catalan ] = "Separaci en sl.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 fr 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 ] = "Zakadka";
- Text[ japanese ] = "ブックマーク";
+ Text[ japanese ] = "ブックマーク";
Text[ chinese_traditional ] = "書籤";
Text[ arabic ] = " ";
Text[ greek ] = "";
@@ -235,7 +239,8 @@ DockingWindow RID_SVXDLG_HYPERLINK
Text[ turkish ] = "Yer iareti";
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 hipercze";
- 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 ~botn" ;
@@ -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 ] = "Dme olarak";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Como ~botn";
+ 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 ligao.\nDeseja inici-la?" ;
Message[ chinese_simplified ] = "只有在建立连接后才能确定这个 URL 是否正确。\n您要现在建立连接吗?";
- Message[ russian ] = " URL .n ?";
+ Message[ russian ] = " URL .\n ?";
Message[ polish ] = "URL moe zosta sprawdzony dopiero po ustanowieniu poczenia.\nCzy utworzy poczenie?";
- 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 balant kurulduktan sonra kontrol edilebilir.\nBalant kurulsun mu?";
Message[ language_user1 ] = " ";
- Message[ catalan ] = "La URL solo puede ser verificada despus de haberse establecido una conexin.\nDesea establecer la conexin?";
- Message[ finnish ] = "T?m? URL-osoite voidaan testata vasta, kun yhteys on muodostettu. Muodostetaanko yhteys?";
+ Message[ catalan ] = "La URL noms es pot verificar desprs d'establir-se una connexi.\nVoleu establir la connexi?";
+ Message[ finnish ] = "Tm 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 no 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 deil.\nYine de URL'yi eklemek istiyor musunuz?";
Message[ language_user1 ] = " ";
- Message[ catalan ] = "La URL no existe.\nDesea 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. Listnk 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 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 ] = "~Prcdent";
+ Text[ french ] = "Prcdent";
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 ] = "Dikdrtgen";
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 dzenle";
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 ] = "Posicin" ;
+ Text [ spanish ] = "~Disposicin" ;
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 ~ms 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 gnder";
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 ] = "Sralama";
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 lschen : Die Selektion lschen */
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.\nDesea guardar los cambios?" ;
+ Text [ spanish ] = "Image Map se ha modificado.\nDesea guardar las modificaciones?" ;
Text [ french ] = "L'Image Map a t modifie.\nEnregistrer les modifications?" ;
Text [ dutch ] = "De ImageMap is gewijzigd.\nWilt u de wijzigingen opslaan?" ;
/* ### ACHTUNG: Neuer Text in Resource? Die ImageMap wurde gendert.\nSollen die nderungen gespeichert werden? : Die ImageMap wurde gendert.\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.\nDesea guardar las modificaciones?" ;
+ Text [ spanish ] = "Image Map se ha modificado.\nDesea guardar las modificaciones?" ;
Text [ french ] = "L'Image Map a t modifie.\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 ] = "" ;
Text [ portuguese ] = "" ;
Text [ portuguese_brazilian ] = "" ;
- Text[ chinese_simplified ] = "<еĸʽ>";
+ Text[ chinese_simplified ] = "<所有的文件>";
Text[ russian ] = "< >";
Text[ polish ] = "";
- Text[ japanese ] = "<ׂĂ̧>";
- Text[ chinese_traditional ] = "<Ҧ榡>";
+ Text[ japanese ] = "<すべてのファイル>";
+ Text[ chinese_traditional ] = "<所有的檔案>";
Text[ arabic ] = "< >";
Text[ greek ] = "< >";
- Text[ korean ] = "< >";
+ Text[ korean ] = "<모든 파일>";
Text[ turkish ] = "";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "";
+ Text[ catalan ] = "";
Text[ finnish ] = "";
+ Text[ thai ] = "<แฟ้มทั้งหมด>";
};
Resource RID_SVXRES_IMPORTGRAPHIC
{
@@ -104,20 +105,21 @@ Resource RID_SVXRES_IMPORTGRAPHIC
Text [ danish ] = "" ;
Text [ french ] = "" ;
Text [ swedish ] = "" ;
- Text [ dutch ] = "" ;
+ Text [ dutch ] = "" ;
Text [ spanish ] = "" ;
Text [ english_us ] = "" ;
- Text[ chinese_simplified ] = "<еĸʽ>";
+ Text[ chinese_simplified ] = "<所有的格式>";
Text[ russian ] = "< >";
Text[ polish ] = "";
- Text[ japanese ] = "<ׂĂ̏>";
- Text[ chinese_traditional ] = "<Ҧ榡>";
+ Text[ japanese ] = "<すべての書式>";
+ Text[ chinese_traditional ] = "<所有的格式>";
Text[ arabic ] = "< >";
Text[ greek ] = "< >";
- Text[ korean ] = "< >";
+ Text[ korean ] = "<모든 서식>";
Text[ turkish ] = "";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "";
+ Text[ catalan ] = "";
+ 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 ] = "Oknt 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 ] = "şُ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 directrio '" ;
- Text [ finnish ] = "Hakemisto '" ;
+ Text [ finnish ] = "Hakemistoa" ;
Text [ danish ] = "Biblioteket '" ;
Text [ french ] = "Le rpertoire '" ;
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 ] = "' no 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 ] = "' sbC";
+ Text[ japanese ] = "'は存在しません。";
+ Text[ chinese_traditional ] = ">不存在。";
Text[ arabic ] = "' ";
Text[ greek ] = "' .";
- Text[ korean ] = "' () ϴ.";
+ Text[ korean ] = "' 가(이) 없습니다.";
Text[ turkish ] = "' mevcut deil.";
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 ] = "Impossvel abrir ficheiro grfico" ;
- 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 grfico" ;
TEXT [ english_us ] = "Graphics file cannot be opened" ;
- TEXT[ chinese_simplified ] = "ͼļ";
+ TEXT[ chinese_simplified ] = "无法打开图形文件";
TEXT[ russian ] = " ";
TEXT[ polish ] = "Pliku graficznego nie mona otworzy";
- TEXT[ japanese ] = "摜̧قJ܂B";
- TEXT[ chinese_traditional ] = "Lk}ҹϧɮ";
+ TEXT[ japanese ] = "画像ファイルを開けません。";
+ TEXT[ chinese_traditional ] = "無法開啟圖形檔案";
TEXT[ arabic ] = " ";
TEXT[ greek ] = " ";
- TEXT[ korean ] = " ϴ";
+ TEXT[ korean ] = "그림 파일을 열 수 없습니다.";
TEXT[ turkish ] = "Grafik dosyas alamyor";
TEXT[ language_user1 ] = " ";
- TEXT[ catalan ] = "No es posible abrir el archivo grfico";
+ TEXT[ catalan ] = "No s possible obrir el fitxer grfic";
+ 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 ] = "Impossvel ler ficheiro grfico" ;
- TEXT [ finnish ] = "Grafiikkatiedostoa ei voi lukea" ;
+ TEXT [ finnish ] = "Grafiikkatiedostoa ei voi lukea." ;
TEXT [ danish ] = "Det er ikke muligt at lse grafikfilen" ;
- TEXT [ french ] = "Lecture du fichier graphique impossible" ;
+ TEXT [ french ] = "Impossible de lire le fichier graphique !" ;
TEXT [ swedish ] = "Grafikfil kan inte lsas" ;
TEXT [ dutch ] = "Grafisch bestand is onleesbaar" ;
TEXT [ spanish ] = "No es posible leer el archivo grfico" ;
TEXT [ english_us ] = "Graphics file cannot be read" ;
- TEXT[ chinese_simplified ] = "ͼļ";
+ TEXT[ chinese_simplified ] = "无法读出图形文件";
TEXT[ russian ] = " ";
TEXT[ polish ] = "Pliku graficznego nie mona otworzy";
- TEXT[ japanese ] = "摜̧ق͓ǂ߂܂B";
- TEXT[ chinese_traditional ] = "LkŪXϧɮ";
+ TEXT[ japanese ] = "画像ファイルは読めません。";
+ TEXT[ chinese_traditional ] = "無法讀出圖形檔案";
TEXT[ arabic ] = " ";
TEXT[ greek ] = " ";
- TEXT[ korean ] = " ϴ";
+ TEXT[ korean ] = "그림 파일을 읽을 수 없습니다.";
TEXT[ turkish ] = "Grafik dosyas okunamyor";
TEXT[ language_user1 ] = " ";
- TEXT[ catalan ] = "No es posible leer el archivo grfico";
+ TEXT[ catalan ] = "No s possible llegir el fitxer grfic";
+ 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 ] = "Oknt 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 ] = "Verso do ficheiro grfico no tem suporte" ;
- TEXT [ finnish ] = "Grafiikkatiedoston versiota ei tueta" ;
+ TEXT [ finnish ] = "Grafiikkatiedoston versiota ei tueta." ;
TEXT [ danish ] = "Grafikfilens version understttes ikke" ;
TEXT [ french ] = "Version du fichier graphique non supporte" ;
TEXT [ swedish ] = "Grafikfilens version stds inte" ;
TEXT [ dutch ] = "Deze versie van het grafisch bestand wordt niet ondersteund" ;
- TEXT [ spanish ] = "No se apoya la versin del archivo grfico" ;
+ TEXT [ spanish ] = "No se admite la versin del archivo grfico" ;
TEXT [ english_us ] = "Cannot support version of graphic file" ;
- TEXT[ chinese_simplified ] = "֧ͼļ汾";
+ TEXT[ chinese_simplified ] = "不支持这个图形文件版本";
TEXT[ russian ] = " ";
TEXT[ polish ] = "Wersja pliku graficznego nie bdzie obsugiwana";
- TEXT[ japanese ] = "摜̧قްޮ݂߰ĂĂ܂B";
- TEXT[ chinese_traditional ] = "oӹϧɮת";
+ TEXT[ japanese ] = "画像ファイルのバージョンがサポートされていません。";
+ TEXT[ chinese_traditional ] = "不支持這個圖形檔案版本";
TEXT[ arabic ] = " ";
TEXT[ greek ] = " .";
- TEXT[ korean ] = " ";
+ TEXT[ korean ] = "그래픽 파일의 버전이 지원되지 않습니다";
TEXT[ turkish ] = "Grafik dosyasnn srm desteklenmiyor";
TEXT[ language_user1 ] = " ";
- TEXT[ catalan ] = "No se apoya la versin del archivo grfico";
+ TEXT[ catalan ] = "No se suporta aquesta versi del fitxer grfic";
+ 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 grfico no encontrado" ;
- TEXT [ finnish ] = "Grafiikkasuodatinta ei lytynyt" ;
+ TEXT [ finnish ] = "Grafiikkasuodatinta ei lytynyt." ;
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 imgenes" ;
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ϧιLo";
+ 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 imgenes";
+ 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 ] = "Memria insuficiente para inserir a imagem." ;
- TEXT [ finnish ] = "Muisti ei riit kuvan lismiseen" ;
+ TEXT [ finnish ] = "Muisti ei riit kuvan lismiseen." ;
TEXT [ danish ] = "Ikke tilstrkkelig hukommelse til at indstte grafik" ;
TEXT [ french ] = "Mmoire insuffisante pour l'insertion de l'image" ;
TEXT [ swedish ] = "Inte tillrckligt med minne fr 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 pamici do wstawienia grafiki";
- TEXT[ japanese ] = "}}ɂ́Aؗeʂs\\łB";
- TEXT[ chinese_traditional ] = "O餣MLkJϧ";
+ TEXT[ japanese ] = "図の挿入に必要なディスク空き容量がありません。";
+ TEXT[ chinese_traditional ] = "記憶體不足﹐無法插入圖形";
TEXT[ arabic ] = " ";
TEXT[ greek ] = " ";
- TEXT[ korean ] = " մϴ";
+ TEXT[ korean ] = "메모리가 부족하여 그래픽을 삽입할 수 없습니다";
TEXT[ turkish ] = "Grafiin eklenmesi iin yeterli bellek mevcut deil";
TEXT[ language_user1 ] = " ";
- TEXT[ catalan ] = "No hay suficiente memoria para insertar la imagen";
+ TEXT[ catalan ] = "No hi ha prou memria 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 ] = "~Proprits..." ;
+ Text [ french ] = "Proprits..." ;
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 ] = "Waciwoci...";
- 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 ] = "~Padro" ;
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 ] = "Domylnie";
- 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 ] = "Pocz";
- 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 ] = "~Balant olutur";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "~Vincular";
+ Text[ catalan ] = "~Enllaa";
+ 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~peru" ;
Text [ swedish ] = "~Frhandsvisning" ;
Text [ dutch ] = "~Voorbeeld" ;
Text [ spanish ] = "~Previsualizacin" ;
Text [ english_us ] = "Pr~eview" ;
- Text[ chinese_simplified ] = "Ԥ(~E)";
+ Text[ chinese_simplified ] = "预览(~E)";
Text[ russian ] = "";
Text[ polish ] = "Podgld";
- 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 ] = "~Previsualizacin";
+ 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 ] = "~Extensin" ;
Text [ french ] = "~Extension" ;
Text [ swedish ] = "Fste" ;
Text [ danish ] = "Tilhftning" ;
@@ -614,7 +614,7 @@ TabPage RID_SVXPAGE_CAPTION
Text[ chinese_traditional ] = "數值(~B)";
Text[ arabic ] = "";
Text[ greek ] = "";
- Text[ korean ] = "만큼(~B)";
+ Text[ korean ] = "배율(~B)";
Text[ turkish ] = "~Deer";
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 al izgi";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Lnia angular amb noms 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 al izgi";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Lnia 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 ] = "Posicin y tamao";
@@ -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 ] = "[Tm]";
- 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 ] = "Tm sana esiintyy vltettvien 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 hr ordet! Starta synonymordbok?" ;
+ MESSAGE [ swedish ] = "Undvik det hr ordet! Starta synonymordlista?" ;
MESSAGE [ dutch ] = "Dit woord is niet zo geschikt. Thesaurus starten?" ;
- MESSAGE [ spanish ] = "Evite por favor esta palabra! Desea iniciar la bsqueda de sinnimos?" ;
+ MESSAGE [ spanish ] = "Evite esta palabra! Desea iniciar la bsqueda de sinnimos?" ;
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 sowa! Wczy Tezaurus?";
- MESSAGE[ japanese ] = "̒P͔ĉ!@ތꎫTN܂?";
- MESSAGE[ chinese_traditional ] = "zקKϥγoӦrTnҰʵH";
+ MESSAGE[ japanese ] = "この単語の使用は避けてください。類義語辞典を開始しますか。";
+ MESSAGE[ chinese_traditional ] = "您應該避免使用這個字﹗要啟動同義詞詞典?";
MESSAGE[ arabic ] = " ! ʿ";
MESSAGE[ greek ] = " ! ;";
- MESSAGE[ korean ] = " ܾ ȸǴܾ Ͽ ֽϴ. Ǿ ұ?";
+ MESSAGE[ korean ] = "이 단어는 부적합 단어 목록에 있습니다. 동의어 사전을 시작할까요?";
MESSAGE[ turkish ] = "Bu szc kullanmaktan kanmalsnz! E anlamllar szl balatlsn m?";
MESSAGE[ language_user1 ] = " ";
- MESSAGE[ catalan ] = "Evite por favor esta palabra! Desea iniciar la bsqueda de sinnimos?";
+ 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 verificao no incio do documento?" ;
MESSAGE [ finnish ] = "Jatketaanko tarkistusta asiakirjan alusta?" ;
MESSAGE [ danish ] = "Vil du fortstte kontrollen fra dokumentets begyndelse?" ;
- MESSAGE [ french ] = "Voulez-vous continuer la vrification depuis le dbut du document?" ;
+ MESSAGE [ french ] = "Continuer la vrification au dbut du document ?" ;
MESSAGE [ swedish ] = "Fortstta kontroll i brjan 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 revisin 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 pocztku dokumentu?";
- MESSAGE[ japanese ] = "Ă̎n߂ɖ߂s܂H";
- MESSAGE[ chinese_traditional ] = "q_lm~jMH";
+ MESSAGE[ japanese ] = "ドキュメントの始めに戻ってチェックを続行しますか?";
+ MESSAGE[ chinese_traditional ] = "從文件起始位置繼續搜尋?";
MESSAGE[ arabic ] = " Ͽ";
MESSAGE[ greek ] = " ;";
- MESSAGE[ korean ] = " ó ˻縦 ұ?";
+ MESSAGE[ korean ] = "문서 처음부터 검사를 계속하겠습니까?";
MESSAGE[ turkish ] = "Denetlemeye, belge banda devam edilsin mi?";
MESSAGE[ language_user1 ] = " ";
- MESSAGE[ catalan ] = "Desea continuar la revisin 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 fortstte kontrollen fra dokumentets slutning?" ;
Message [ portuguese ] = "Continuar a verificao 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 kocu dokumentu?";
- Message[ japanese ] = "Ėɖ߂s܂H";
- Message[ chinese_traditional ] = "q~jMH";
+ 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 revisin 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 ptekstin?" ;
MESSAGE [ danish ] = "Vil du kontrollere brdteksten?" ;
MESSAGE [ french ] = "Voulez-vous vrifier 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 gwny?";
- MESSAGE[ japanese ] = "Ҳ÷Ă܂H";
- MESSAGE[ chinese_traditional ] = "zQnˬdH";
+ 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 sromrderne?" ;
MESSAGE [ french ] = "Voulez-vous vrifier les zones spciales?" ;
- MESSAGE [ swedish ] = "Vill Du kontrollera specialomrden?" ;
+ MESSAGE [ swedish ] = "Vill du kontrollera specialomrden?" ;
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 ] = "ˬdSϰH";
+ MESSAGE[ japanese ] = "特別範囲をチェックしますか。";
+ MESSAGE[ chinese_traditional ] = "檢查特殊區域?";
MESSAGE[ arabic ] = " ɿ";
MESSAGE[ greek ] = " ;";
- MESSAGE[ korean ] = "Ư ˻Ͻðڽϱ?";
+ MESSAGE[ korean ] = "특수 영역을 검사하겠습니까?";
MESSAGE[ turkish ] = "zel blmler 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 verificacin 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 obszarw specjalnych jest wyczone. Mimo to sprawdza?";
- MESSAGE[ japanese ] = "ʔ͈͂̂ɂȂĂ܂Bł܂B";
- MESSAGE[ chinese_traditional ] = "wgˬdSϰMz٬OnˬdH";
+ MESSAGE[ japanese ] = "特別範囲のチェックがオフになっています。それでもチェックしますか。";
+ MESSAGE[ chinese_traditional ] = "已經關閉檢查特殊區域﹐您還是要執行檢查?";
MESSAGE[ arabic ] = " . ߿";
MESSAGE[ greek ] = " . ;";
- MESSAGE[ korean ] = "Ư ˻簡 ȰԴϴ. ˻ұ?";
+ MESSAGE[ korean ] = "특수영역 검사가 비활성 상태입니다. 그래도 검사할까요?";
MESSAGE[ turkish ] = "zel blm denetleme etkin deil, yine de denetlensin mi?";
MESSAGE[ language_user1 ] = " ";
- MESSAGE[ catalan ] = "La verificacin 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 ] = "Sowo jest napisane poprawnie";
- Text[ japanese ] = "̒P̽ق͐młB";
- Text[ chinese_traditional ] = "oӦrgkT";
+ Text[ japanese ] = "この単語のスペルは正確です。";
+ Text[ chinese_traditional ] = "這個字的寫法正確";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = "ܾ Ȯմϴ";
+ Text[ korean ] = "단어의 맞춤법이 정확합니다";
Text[ turkish ] = "Szcn imlas doru";
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 ] = "Debera 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 sowa";
- Text[ japanese ] = "̒P̎gp͔ĂB";
- Text[ chinese_traditional ] = "ijznϥγoӦr";
+ Text[ japanese ] = "この単語の使用は避けてください。";
+ Text[ chinese_traditional ] = "建議您不要使用這個字";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = " ܾ Ͻʽÿ";
+ Text[ korean ] = "이 단어는 가급적 사용하지 마십시오";
Text[ turkish ] = "Bu szc kullanmaktan kanmalsnz";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Debera evitar esta palabra";
+ Text[ catalan ] = "Haureu 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 ] = "Oknt 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 sowo.";
- Text[ japanese ] = "̒P͕słB";
- Text[ chinese_traditional ] = "oӦrC";
+ Text[ japanese ] = "この単語は不明です。";
+ Text[ chinese_traditional ] = "這個字不明。";
Text[ arabic ] = " .";
Text[ greek ] = " .";
- Text[ korean ] = "˷ ܾԴϴ.";
+ Text[ korean ] = "알 수 없는 단어입니다.";
Text[ turkish ] = "Szck bilinmiyor.";
- Text[ language_user1 ] = " ";
- Text[ catalan ] = "Palabra desconocida.";
+ Text[ language_user1 ] = "Der Punkt am Ende des Satzes sieht im Dialog nicht sehr schn 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 anvndning av versaler" ;
- Text [ dutch ] = "Fout bij gebruik hoofdletter/kleine letters" ;
+ Text [ dutch ] = "Fout bij gebruik hoofdletters/kleine letters" ;
Text [ spanish ] = "Error de maysculas/minsculas" ;
Text [ english_us ] = "Capitalization error" ;
- Text[ chinese_simplified ] = "ĸСд - ";
- Text[ russian ] = " ";
+ Text[ chinese_simplified ] = "字母大小写 - 错误";
+ Text[ russian ] = " ";
Text[ polish ] = "Bdy w pisowni duych i maych liter";
- Text[ japanese ] = "啶/̴װ";
- Text[ chinese_traditional ] = "rjpg~";
+ Text[ japanese ] = "大文字と小文字のエラー";
+ Text[ chinese_traditional ] = "字母大小寫錯誤";
Text[ arabic ] = " /";
Text[ greek ] = " (-)";
- Text[ korean ] = "/ҹ ";
+ Text[ korean ] = "대/소문자 오류";
Text[ turkish ] = "Byk /kk harf hatas";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Error de maysculas/minsculas";
+ Text[ catalan ] = "Error de majscules/minscules";
+ 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 supporte";
- Text[ spanish ] = "No se apoya este idioma";
+ Text[ spanish ] = "No se admite este idioma";
Text[ italian ] = "La lingua non viene supportata";
Text[ danish ] = "Sproget understttes ikke";
Text[ swedish ] = "Sprket gr inte att anvnda";
Text[ polish ] = "Jzyk nie jest obsugiwany";
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 kytettviss oikeinkirjoituksen tarkistusta varten\nTarkista asennetut osat ja asenna haluttu kieli\n" ;
TEXT [ danish ] = "str ikke til rdighed for stavekontrollen.\nKontroller venligst din installation og installer i\ngivet fald det nskede sprog" ;
TEXT [ french ] = "n'est pas disponible pour la vrification. Veuillez vrifier l'installation et installer, le cas chant, la langue souhaite" ;
- TEXT [ swedish ] = "r inte tillgnglig fr stavningskontroll\nKontrollera Din installation och installera\neventuellt nskat sprk" ;
+ TEXT [ swedish ] = " r inte tillgnglig fr stavningskontroll\nKontrollera din installation och installera\neventuellt nskat sprk" ;
TEXT [ dutch ] = "is niet beschikbaar voor spellingcontrole\nControleer uw installatie en installeer\neventueel de gewenste taal." ;
TEXT [ spanish ] = "no est disponible para la revisin ortogrfica.\nRevise su instalacin 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 niedostpne do sprawdzania. \nProsz sprawdzi instalacj i zainstalowa \n ewentualnie potrzebny jzyk.";
- TEXT[ japanese ] = "ͽɎgpł܂B\n۸т̲ݽİق\nꍇɂĂ͂]̌ݽİقĂB";
- TEXT[ chinese_traditional ] = " Lkѫgˬd\\C\nˬdw˪{MYnM\nбzw˭nϥΪyC";
+ 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 ykleyin.";
TEXT[ language_user1 ] = " ";
- TEXT[ catalan ] = "no est disponible para la revisin ortogrfica.\nRevise su instalacin e instale,\nsi es necesario, el idioma deseado";
+ TEXT[ catalan ] = "no est disponible per fer la revisi ortogrfica.\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 list sanastoon" ;
Text [ danish ] = "Det var ikke muligt at tilfje dette ord til ordbogen." ;
Text [ french ] = "Impossible d'ajouter ce mot au dictionnaire" ;
- Text [ swedish ] = "Det gick inte att lgga in ordet i ordboken." ;
+ Text [ swedish ] = "Det gick inte att lgga in ordet i ordlistan." ;
Text [ dutch ] = "Woord kan niet in woordenboek worden opgenomen" ;
Text [ spanish ] = "No se pudo aadir 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 sowo nie mogo zosta wpisane do sownika.";
- Text[ japanese ] = "̒P͎ɉ܂B";
- Text[ chinese_traditional ] = "LkoӦrC";
+ Text[ japanese ] = "この単語は辞書に加えられません。";
+ Text[ chinese_traditional ] = "無法收錄這個字。";
Text[ arabic ] = " .";
Text[ greek ] = " ";
- Text[ korean ] = "ܾ ߰ ߽ϴ.";
+ Text[ korean ] = "단어를 사전에 추가하지 못했습니다.";
Text[ turkish ] = "Szck, szle eklenemedi.";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "No se pudo aadir 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 separacin silbica" ;
TEXT [ english_us ] = "Hyphenation not available" ;
- TEXT[ chinese_simplified ] = "ַ";
- TEXT[ russian ] = " ";
+ TEXT[ chinese_simplified ] = "连字符不存在";
+ TEXT[ russian ] = " ";
TEXT[ polish ] = "Dzielenie wyrazw nie jest moliwe";
- TEXT[ japanese ] = "ʲȰ݂gpł܂B";
- TEXT[ chinese_traditional ] = "srŤsb";
+ TEXT[ japanese ] = "ハイフネーションが使用できません。";
+ TEXT[ chinese_traditional ] = "連字符不存在";
TEXT[ arabic ] = " ";
TEXT[ greek ] = " ";
- TEXT[ korean ] = " Ұ";
+ TEXT[ korean ] = "하이픈 사용 불가능";
TEXT[ turkish ] = "Heceleme kullanlamyor";
TEXT[ language_user1 ] = " ";
- TEXT[ catalan ] = "No est disponible la separacin silbica";
+ TEXT[ catalan ] = "No est disponible la separaci per sl.labes";
+ TEXT[ thai ] = "ใช้ยัติภังค์ไม่ได้";
};
String RID_SVXSTR_HMERR_THESAURUS
{
@@ -484,21 +498,22 @@ String RID_SVXSTR_HMERR_THESAURUS
TEXT [ finnish ] = "Valitulle kielelle ei ole kytettviss synonyymisanastoa. \nTarkista asennetut osat ja asenna haluttu kieli\n" ;
TEXT [ danish ] = "Synonymordbogen str ikke til rdighed 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 slectionne.\nVeuillez vrifiez l'installation et installer\nle cas chant la langue concerne." ;
- TEXT [ swedish ] = "Ingen synonymordbok r tillgnglig fr det instllda sprket. \nKontrollera Din installation och installera\neventuellt nskat sprk." ;
+ TEXT [ swedish ] = "Ingen synonymordlista r tillgnglig fr det instllda sprket. \nKontrollera din installation och installera\neventuellt nskat sprk." ;
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 sinnimos para el idioma seleccionado. \nCompruebe por favor su instalacin\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 niedostpny dla wybranego jzyka. \nProsz sprawdzi instalacj i zainstalowa \newentualnie potrzebny jzyk.";
- TEXT[ japanese ] = "IŗތꎫT͎gpł܂B\n۸т̲ݽİقāA\nKvȂA]̌ݽİقĂB";
- TEXT[ chinese_traditional ] = "z]wyS[\\C\nбzˬdw˪{C\nYnMбzw˭nϥΪyC";
+ 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 iin e anlamllar szl mevcut deil. \nKurulumunuzu kontrol edip gerekirse\nistenen dili ykleyin.";
TEXT[ language_user1 ] = " ";
- TEXT[ catalan ] = "No existe un diccionario de sinnimos para el idioma seleccionado. \nCompruebe por favor su instalacin\n e instale, si es necesario, el idioma deseado";
+ TEXT[ catalan ] = "No hi ha cap diccionari de sinnims 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 impossvel adicionar a palavra ao\ndicionrio por razes 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'insrer le mot dans le dictionnaire.";
Text[ spanish ] = "No se puede recoger en el diccionario la\npalabra debido a una razn desconocida.";
Text[ italian ] = "Non stato possibile inserire la parola nel dizionario.\nErrore sconosciuto.";
Text[ danish ] = "Det var af en ukendt grund ikke muligt\nat tilfje ordet til ordbogen.";
- Text[ swedish ] = "Ordet kunde av oknd anledning\ninte tas upp i ordboken.";
+ Text[ swedish ] = "Ordet kunde av oknd anledning\ninte tas upp i ordlistan.";
Text[ polish ] = "Z nieznanej przyczyny\nwyrazu nie mona byo przej do sownika.";
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 ] = "rLkoӦrA]C";
+ Text[ japanese ] = "単語は原因が不明なまま\n辞書に追加できませんでした。";
+ Text[ korean ] = "알 수 없는 단어이므로\n사전에 추가하지 못했습니다.";
+ Text[ chinese_simplified ] = "这个字无法添加到词典中去,原因不明。";
+ Text[ chinese_traditional ] = "字典無法收錄這個字,原因不明。";
Text[ arabic ] = " \n .";
Text[ turkish ] = "Szck bilinmeyen bir nedenden dolay\nszle eklenemedi.";
- Text[ catalan ] = "No se puede recoger en el diccionario la\npalabra debido a una razn desconocida.";
+ Text[ catalan ] = "No es pot recollir en el diccionari la\nparaula degut a un error desconegut.";
Text[ finnish ] = "Sanan lisminen 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 dicionrio 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 ] = "Sownik jest przepeniony.";
Text[ portuguese_brazilian ] = "The dictionary is already full.";
- Text[ japanese ] = "͂łɂςłB";
- Text[ korean ] = " ̹ ֽϴ.";
- Text[ chinese_simplified ] = "ʵ";
- Text[ chinese_traditional ] = "rwC";
+ Text[ japanese ] = "辞書はすでにいっぱいです。";
+ Text[ korean ] = "사전이 이미 다 찼습니다.";
+ Text[ chinese_simplified ] = "词典已满。";
+ Text[ chinese_traditional ] = "字典已滿。";
Text[ arabic ] = " .";
Text[ turkish ] = "Szlk doldu.";
- Text[ catalan ] = "El diccionario est lleno.";
+ Text[ catalan ] = "El diccionari est ple.";
Text[ finnish ] = "Sanasto on jo tynn.";
+ Text[ thai ] = "พจนานุกรมเต็มแล้ว";
};
String RID_SVXSTR_DIC_ERR_READONLY
{
@@ -556,29 +573,47 @@ String RID_SVXSTR_DIC_ERR_READONLY
Text [ ENGLISH ] = "The dictionary is readonly." ;
Text[ english_us ] = "The dictionary is read-only.";
Text[ portuguese ] = "O dicionrio 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 ] = "Sownik jest tylko do odczytu.";
Text[ portuguese_brazilian ] = "The dictionary is readonly.";
- Text[ japanese ] = "͓ǂݎpłB";
- Text[ korean ] = " бԴϴ.";
- Text[ chinese_simplified ] = "ʵǷд(ֻȡ)";
- Text[ chinese_traditional ] = "rOŪC";
+ Text[ japanese ] = "辞書は読み取り専用です。";
+ Text[ korean ] = "사전이 읽기 전용입니다.";
+ Text[ chinese_simplified ] = "这个词典是防改写的。";
+ Text[ chinese_traditional ] = "字典是唯讀的。";
Text[ arabic ] = " .";
Text[ turkish ] = "Szlk yazmaya kar korumaldr.";
- Text[ catalan ] = "El diccionario es solo de lectura.";
+ Text[ catalan ] = "El diccionari s de noms lectura.";
Text[ finnish ] = "Sanasto on vain luku -muotoa.";
+ Text[ thai ] = "พจนานุกรมเป็นแบบอ่านได้อย่างเดียว";
};
// ********************************************************************** EOF
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 ] = "Lnea";
- 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 ] = "Lnia";
+ Text[ thai ] = "บรรทัด";
};
FixedText FT_LINE_DIST
{
@@ -125,18 +126,19 @@ TabPage RID_SVXPAGE_MEASURE
Text [ danish ] = "Linjeafstand" ;
Text [ portuguese_brazilian ] = "L~iniendistanz" ;
Text [ portuguese ] = "~Espao entre linhas" ;
- Text[ chinese_simplified ] = "(~D)";
- Text[ russian ] = " ";
+ Text[ chinese_simplified ] = "线条间隔(~D)";
+ Text[ russian ] = "~ ";
Text[ polish ] = "Odlego linii pomocniczych";
- Text[ japanese ] = "̊Ԋu(~D)";
- Text[ chinese_traditional ] = "uj(~D)";
+ Text[ japanese ] = "線の間隔(~D)";
+ Text[ chinese_traditional ] = "線條間隔(~D)";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = " (~D)";
+ Text[ korean ] = "선 간격(~D)";
Text[ turkish ] = "~Nesneye uzaklk";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "D~istancia entre lneas";
- Text[ finnish ] = "~Rivien etisyys";
+ Text[ catalan ] = "D~istncia entre lnies";
+ Text[ finnish ] = "Janan etisyys kohteesta";
+ Text[ thai ] = "~ระยะบรรทัด";
};
MetricField MTR_LINE_DIST
{
@@ -166,21 +168,22 @@ TabPage RID_SVXPAGE_MEASURE
Text [ french ] = "D~passement des repres" ;
Text [ dutch ] = "Hulplijn ~overhangend" ;
Text [ swedish ] = "Hjlplinje~verhng" ;
- Text [ danish ] = "Hjlpelinjeoverhng" ;
+ Text [ danish ] = "H~jlpelinjeoverhng" ;
Text [ portuguese_brazilian ] = "Hilfslinien~?erhang" ;
Text [ portuguese ] = "Linhas auxiliares realadas" ;
- Text[ chinese_simplified ] = "ӳ(~O)";
- Text[ russian ] = " ";
+ Text[ chinese_simplified ] = "辅助线延长(~O)";
+ Text[ russian ] = "~";
Text[ polish ] = "Nawis linii pomocniczych";
- Text[ japanese ] = "⏕̒o(~O)";
- Text[ chinese_traditional ] = "Uu(~O)";
+ Text[ japanese ] = "補助線の張り出し(~O)";
+ Text[ chinese_traditional ] = "輔助線延長(~O)";
Text[ arabic ] = " ";
Text[ greek ] = "~ ";
- Text[ korean ] = "ȳ (~O)";
+ Text[ korean ] = "안내선 돌출(~O)";
Text[ turkish ] = "Klavuz izgi ~tamas";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Guas ~sobresalientes";
- Text[ finnish ] = "~Ohjain ylpuolella";
+ Text[ catalan ] = "Guia ~sobresortint";
+ Text[ finnish ] = "Jananpn ylulkonema";
+ Text[ thai ] = "คำแนะนำที่~ยื่นออกมา";
};
MetricField MTR_FLD_HELPLINE_OVERHANG
{
@@ -210,21 +213,22 @@ TabPage RID_SVXPAGE_MEASURE
Text [ french ] = "~cart des repres" ;
Text [ dutch ] = "Afstand ~hulplijnen" ;
Text [ swedish ] = "Hjlplinjeavstn~d" ;
- Text [ danish ] = "Hjlpelinjeafstand" ;
+ Text [ danish ] = "Hjlpelinjea~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 ] = "Odlego linii pomocniczych";
- Text[ japanese ] = "⏕̋(~G)";
- Text[ chinese_traditional ] = "Uuj(~G)";
+ Text[ japanese ] = "補助線の距離(~G)";
+ Text[ chinese_traditional ] = "輔助線間隔(~G)";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = "ȳ (~G)";
+ Text[ korean ] = "안내선 거리(~G)";
Text[ turkish ] = "Klavuz izgi uzakl~";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "~Distancia entre guas";
- Text[ finnish ] = "~Ohjainetisyys";
+ Text[ catalan ] = "~Distncia entre guies";
+ Text[ finnish ] = "Janan- ja nuolenpn 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 ] = "Lnea auxiliar i~zquierda" ;
Text [ french ] = "Repre ~gauche" ;
- Text [ dutch ] = "Linker h~ulplijn" ;
+ Text [ dutch ] = "Linkerh~ulplijn" ;
Text [ swedish ] = "Vnster hjlp~linje" ;
Text [ danish ] = "Venstre hjlpelinje" ;
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 ] = "Uu(~L)";
+ Text[ japanese ] = "左の補助線(~L)";
+ Text[ chinese_traditional ] = "左輔助線(~L)";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = " ȳ(~L)";
+ Text[ korean ] = "왼쪽 안내선(~L)";
Text[ turkish ] = "~Sol klavuz izgi";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Lnea auxiliar i~zquierda";
- Text[ finnish ] = "~Vasen ohjain";
+ Text[ catalan ] = "Guia ~esquerra";
+ Text[ finnish ] = "Vas. jananpn 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 ] = "Lnea au~xiliar derecha" ;
- Text [ french ] = "Repre ~droit" ;
- Text [ dutch ] = "~Rechter hulplijn" ;
+ Text [ french ] = "Repre droit" ;
+ Text [ dutch ] = "~Rechterhulplijn" ;
Text [ swedish ] = "Hge~r hjlplinje" ;
- Text [ danish ] = "Hjre hjlpelinje" ;
+ Text [ danish ] = "Hjre hjl~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 ] = "kUu(~R)";
+ Text[ japanese ] = "右の補助線(~R)";
+ Text[ chinese_traditional ] = "右輔助線(~R)";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = " ȳ(~R)";
+ Text[ korean ] = "오른쪽 안내선(~R)";
Text[ turkish ] = "Sa~ klavuz izgi";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Lnea au~xiliar derecha";
- Text[ finnish ] = "~Oikea ohjain";
+ Text[ catalan ] = "Guia ~dreta";
+ Text[ finnish ] = "Oik. jananpn 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 ] = "Lnea de tamao ~debajo del objeto";
- Text[ finnish ] = "~Viitereunan alapuolella";
+ Text[ dutch ] = "~Meetlat onder het object";
+ Text[ french ] = "Ligne de cote ~sous l'objet";
+ Text[ spanish ] = "Lnea de tamao debajo del objeto";
+ Text[ finnish ] = "Mittayksikk objektin alapuolella";
Text[ italian ] = "Linea di quotatura sotto l'oggetto";
- Text[ danish ] = "Vis nedenfor";
+ Text[ danish ] = "Mlelinje u~nder objektet";
Text[ swedish ] = "Mttlinje ~nedanfr 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 ] = "ؤouܦbU(~B)";
+ Text[ japanese ] = "オブジェクト下方に寸法線の表示(~B)";
+ Text[ korean ] = "개체 아래 방향에 치수선 표시(~B)";
+ Text[ chinese_simplified ] = "定量线条显示在对象下方(~B)";
+ Text[ chinese_traditional ] = "尺寸線條顯示在物件下方(~B)";
Text[ turkish ] = "Altta ~grntle";
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 ] = "Dcimales";
+ 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 ] = "Posicin del texto" ;
Text [ french ] = "Position du ~texte" ;
Text [ swedish ] = "~Textposition" ;
- Text [ danish ] = "Tekstplacering" ;
+ Text [ danish ] = "Te~kstplacering" ;
Text [ portuguese_brazilian ] = "Textposition" ;
Text [ portuguese ] = "~Posio 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 ] = "rm(~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 ] = "Posicin 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 automticamente";
- 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 automticamente";
- Text[ finnish ] = "~Automaattinen pystysuunta";
+ Text[ catalan ] = "~Vertical automticament";
+ 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 automticamente";
- 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 automticamente";
- Text[ finnish ] = "~Automaattinen vaakataso";
+ Text[ catalan ] = "~Horitzontal automticament";
+ 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 ] = "~lm birimlerini grntle";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "~Mostrar mtrica";
- Text[ finnish ] = "~Nyt mittayksikt";
+ Text[ catalan ] = "Mostra les unitats de ~mesura";
+ Text[ finnish ] = "Nyt 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 parallle";
+ Text[ dutch ] = "~Parallel met hulplijn";
+ Text[ french ] = "~Parallle au repre";
Text[ spanish ] = "Paralela a lnea auxiliar";
- Text[ finnish ] = "~Samansuuntainen";
+ Text[ finnish ] = "Viivan suuntaisesti";
Text[ italian ] = "~Parallela alla griglia";
- Text[ danish ] = "Vis parallelt";
+ Text[ danish ] = "~Parallelt med hjlpelinje";
Text[ swedish ] = "~Parallell med hjlplinje";
Text[ polish ] = "Rwnolegle do linii pomocniczej";
Text[ portuguese_brazilian ] = "Anzeige ~parallel";
- Text[ japanese ] = "@ƕsɕ\\(~P)";
- Text[ korean ] = "ĸ ȳ (~P)";
- Text[ chinese_simplified ] = "ǩƽ(~P)";
- Text[ chinese_traditional ] = "ҩMUu(~P)";
+ Text[ japanese ] = "寸法線と平行に表示(~P)";
+ Text[ korean ] = "안내선과 평행으로 표시(~P)";
+ Text[ chinese_simplified ] = "标签和辅助线平行(~P)";
+ Text[ chinese_traditional ] = "標籤和輔助線平行(~P)";
Text[ turkish ] = "Paralel ~grntle";
Text[ arabic ] = " ";
- Text[ catalan ] = "M~ostrar paralelamente";
- Text[ language_user1 ] = " ";
+ Text[ catalan ] = "M~ostra paral.lelament";
+ Text[ thai ] = "~ขนานกับบรรทัด";
};
Control CTL_PREVIEW
{
@@ -596,36 +627,55 @@ 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 ] = "Automtico";
+ Text[ catalan ] = "Automtic";
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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include
+#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 ] =
{
- < "Automtico" ; Default ; > ;
+ < "Automticamente" ; 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 ] = "~Ondalk haneler";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Nombre de ~decimals";
@@ -768,7 +768,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
Text [ french ] = "~Nbres ng. en rouge" ;
Text [ swedish ] = "Negativa vrden i ~rtt" ;
Text [ dutch ] = "~Negatieve getallen rood" ;
- Text [ spanish ] = "~Negativo en rojo" ;
+ Text [ spanish ] = "~Nm. 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 tysiczny";
Text[ japanese ] = "千単位の桁区切り(~T)";
Text[ chinese_traditional ] = "千位點(~T)";
@@ -901,7 +901,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
Text[ polish ] = "Format rdowy";
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 lschen : Zahlenformat lschen
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 ] = "Automtico";
+ 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 numric";
@@ -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 ] = "Seleo" ;
+ Text [ portuguese_brazilian ] = "Auswahl" ;
Text [ swedish ] = "Urval" ;
Text [ danish ] = "Udvalg" ;
Text [ italian ] = "Selezione" ;
@@ -91,7 +91,7 @@ TabPage RID_SVXPAGE_PICK_BULLET
Text [ portuguese ] = "Seleco" ;
Text[ chinese_simplified ] = "选择";
Text[ russian ] = "";
- Text[ polish ] = "Wybr";
+ Text[ polish ] = "Selekcja";
Text[ japanese ] = "選択";
Text[ chinese_traditional ] = "選擇";
Text[ arabic ] = "";
@@ -99,8 +99,9 @@ TabPage RID_SVXPAGE_PICK_BULLET
Text[ korean ] = "선택";
Text[ turkish ] = "Seim";
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 ] = "Seleo" ;
+ 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 ] = "Seleco" ;
Text[ chinese_simplified ] = "选择";
Text[ russian ] = "";
- Text[ polish ] = "Wybr";
+ Text[ polish ] = "Selekcja";
Text[ japanese ] = "選択";
Text[ chinese_traditional ] = "選擇";
Text[ arabic ] = "";
@@ -145,8 +146,9 @@ TabPage RID_SVXPAGE_PICK_SINGLE_NUM
Text[ korean ] = "선택";
Text[ turkish ] = "Seim";
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 ] = "Seleo" ;
+ Text [ portuguese_brazilian ] = "Auswahl" ;
Text [ swedish ] = "Urval" ;
Text [ danish ] = "Udvalg" ;
Text [ italian ] = "Selezione" ;
@@ -183,7 +185,7 @@ TabPage RID_SVXPAGE_PICK_NUM
Text [ portuguese ] = "Seleco" ;
Text[ chinese_simplified ] = "选择";
Text[ russian ] = "";
- Text[ polish ] = "Wybr";
+ Text[ polish ] = "Selekcja";
Text[ japanese ] = "選択";
Text[ chinese_traditional ] = "選擇";
Text[ arabic ] = "";
@@ -191,8 +193,9 @@ TabPage RID_SVXPAGE_PICK_NUM
Text[ korean ] = "선택";
Text[ turkish ] = "Seim";
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 ] = "Seleco" ;
Text [ english_us ] = "Selection" ;
- Text [ portuguese_brazilian ] = "Seleo" ;
+ 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 ] = "Wybr";
+ Text[ polish ] = "Selekcja";
Text[ japanese ] = "選択";
Text[ chinese_traditional ] = "選擇";
Text[ arabic ] = "";
@@ -237,8 +240,9 @@ TabPage RID_SVXPAGE_PICK_BMP
Text[ korean ] = "선택";
Text[ turkish ] = "Seim";
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 ] = "Kd grafik";
Text[ swedish ] = "~Lnka grafik";
- Text[ polish ] = "~Docz grafik";
- Text[ portuguese_brazilian ] = "~Vincular imagens";
+ Text[ polish ] = "P~oczy 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 ] = "Grafie balant olutur";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "~Vincular imgenes";
+ Text[ catalan ] = "~Enllaa 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 ] = "No existem imagens no tema 'Marcas' da Gallery." ;
Text [ english_us ] = "The Gallery theme 'Bullets' is empty (no graphics)." ;
- Text [ portuguese_brazilian ] = "No 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 iaretleri' galeri konusu altnda grafik mevcut deil.";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "No hay imgenes en el tema 'Bullets' de la Galera.";
+ 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 ] = "Dzey";
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~meracin" ;
Text [ french ] = "Numrotation" ;
Text [ dutch ] = "~Nummering" ;
- Text [ portuguese_brazilian ] = "~Numerao" ;
+ Text [ portuguese_brazilian ] = "~Numerierung" ;
Text [ portuguese ] = "~Numerao" ;
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~meracin";
+ 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 */; > ;
- < "Doczone grafiki" ; 0x88/*SVX_NUM_BITMAP|0x80 */; > ;
+ < "Grafika poczona" ; 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*/; > ;
- < "Vieta" ; 6/*SVX_NUM_CHAR_SPECIAL */; > ;
- < "Grfics" ; 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 enllaada" ; 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 mitn" ; 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 ] = "Bana 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~trs" ;
Text [ finnish ] = "Jlkeen" ;
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~etrs";
+ 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 carcter:" ;
+ Text [ spanish ] = "Es~tilo de caracteres:" ;
Text [ french ] = "Style de caractres" ;
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 carcter:";
+ Text[ catalan ] = "Es~til de carcter:";
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 ] = "Vri";
+ 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 strrelse";
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 wzgldny";
+ Text[ polish ] = "Rozmiar wzgldny";
Text[ japanese ] = "相対的なサイズ(~R)";
Text[ chinese_traditional ] = "相對的大小(~R)";
Text[ arabic ] = ": ";
Text[ greek ] = " :";
- Text[ korean ] = "상대적 크기(~R)";
+ Text[ korean ] = "기준 크기(~R)";
Text[ turkish ] = "Orantl boyut:";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "~Tamao 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 ] = "Nyt alitasot" ;
Text [ danish ] = "F~uldstndig" ;
@@ -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 ] = "Tm dzeyler";
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 ] = "~Comear em" ;
+ Text [ portuguese_brazilian ] = "~Come?ar em" ;
Text [ portuguese ] = "~Comear 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 ] = "Balang";
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 smbolo";
+ Text[ portuguese_brazilian ] = "~Show symbol";
Text[ portuguese ] = "~Mostrar smbolo";
Text[ danish ] = "Vis symbol";
Text[ french ] = "~Afficher le symbole";
@@ -1053,8 +1083,9 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
Text[ korean ] = "기호 표시";
Text[ turkish ] = "Simgeyi grntle";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "~Mostrar smbolo";
+ Text[ catalan ] = "~Mostra el smbol";
Text[ finnish ] = "Nyt 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 ] = "~Alineacin";
Text[ chinese_simplified ] = "对齐(~A)";
Text[ russian ] = "";
- Text[ polish ] = "~Wyrwnanie";
+ Text[ polish ] = "Wyrwnanie";
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 ] = "~Alineacin";
+ 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" ; > ;
- < "Porodku" ; > ;
+ < "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 ] = "~Carcter" ;
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~arcter";
+ Text[ catalan ] = "C~arcter";
+ 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 ] = "Grfics";
+ 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 ] = "Frn 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 ] = "Vlg..." ;
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 ] = "Wybr...";
Text[ japanese ] = "選択...";
Text[ chinese_traditional ] = "選擇...";
Text[ arabic ] = "...";
Text[ greek ] = "~...";
- Text[ korean ] = "...선택";
+ Text[ korean ] = "선택...";
Text[ turkish ] = "Seim...";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Selec~cin...";
+ 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 ] = "Genilik";
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 ] = "Ykseklik";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "~Alada";
+ Text[ catalan ] = "A~lada";
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 ] = "~Sincronizacin" ;
+ 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 ] = "Orantl";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "~Sincronizacin";
+ Text[ catalan ] = "~Sincronitzaci";
Text[ finnish ] = "Silyt 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 ] = "~Orientacin";
+ 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 referncia" ; > ;
- < "Centro da linha de referncia" ; > ;
- < "Abaixo da linha de referncia" ; > ;
- < "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
< "Carcter arriba" ; > ;
< "Carcter centrado" ; > ;
< "Carcter abajo" ; > ;
- < "Lnea superior" ; > ;
- < "Lnea centro" ; > ;
- < "Lnea inferior" ; > ;
+ < "Lnea arriba" ; > ;
+ < "Lnea centrada" ; > ;
+ < "Lnea abajo" ; > ;
};
stringlist [ french ] =
{
@@ -1651,9 +1698,9 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
< "Dcalage haut" ; > ;
< "Caractre centr" ; > ;
< "Dcalage bas" ; > ;
- < "Ligne suprieure" ; > ;
+ < "Ligne en haut" ; > ;
< "Ligne centre" ; > ;
- < "Ligne infrieure" ; > ;
+ < "Ligne en bas" ; > ;
};
stringlist [ dutch ] =
{
@@ -1717,15 +1764,15 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
};
StringList [ polish ] =
{
- < "Gra linii odniesienia" ; > ;
- < "rodek linii odniesienia" ; > ;
- < "D linii odniesienia" ; > ;
- < "Gra znaku" ; > ;
- < "rodek znaku" ; > ;
- < "D znaku" ; > ;
- < "Gra wiersza" ; > ;
- < "rodek wiersza" ; > ;
- < "D wiersza" ; > ;
+ < "Linia odniesienia w grze" ; > ;
+ < "Wyrodkowana linia odniesienia" ; > ;
+ < "Linia odniesienia w dole" ; > ;
+ < "Znak w grze" ; > ;
+ < "Wyrodkuj znaki" ; > ;
+ < "Znak w dole" ; > ;
+ < "Wiersz w grze" ; > ;
+ < "Wyrodkuj 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 lnea de refefencia" ; > ;
- < "Centro de lnea de referencia" ; > ;
- < "Debajo de lnea de referencia" ; > ;
- < "Carcter arriba" ; > ;
- < "Carcter centrado" ; > ;
- < "Carcter abajo" ; > ;
- < "Lnea superior" ; > ;
- < "Lnea centro" ; > ;
- < "Lnea inferior" ; > ;
+ < "Ms amunt de la lnia de referncia" ; > ;
+ < "Al centre de la lnia de referncia" ; > ;
+ < "Ms avall de la lnia de referncia" ; > ;
+ < "Carcter amunt" ; > ;
+ < "Carcter centrat" ; > ;
+ < "Carcter avall" ; > ;
+ < "Lnia superior" ; > ;
+ < "Lnia central" ; > ;
+ < "Lnia 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 nveis" ;
+ Text [ portuguese_brazilian ] = "Alle Ebenen" ;
Text [ swedish ] = "Alla niver" ;
Text [ danish ] = "Alle niveauer" ;
Text [ italian ] = "Tutti i livelli" ;
@@ -1849,8 +1908,9 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
Text[ korean ] = "모든 수준";
Text[ turkish ] = "Tm dzeyler";
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 ] = "Numerao c~ontnua" ;
+ Text [ portuguese_brazilian ] = "~Fortlaufende Numerierung" ;
Text [ swedish ] = "Fort~lpande numrering" ;
Text [ danish ] = "~Fortlbende nu~mmerering" ;
Text [ italian ] = "~Numerazione continua" ;
@@ -1869,7 +1929,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
Text [ portuguese ] = "Numerao c~ontnua" ;
Text[ chinese_simplified ] = "连续编号(~C)";
Text[ russian ] = " ";
- Text[ polish ] = "Numeracja ~ciga";
+ 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 ] = "Srekli numaralama";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Numeracin 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 ] = "No 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 imgenes en el tema 'Vietas' 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 ] = "Dzey";
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 avstnd" ;
Text [ danish ] = "Placering og afstand" ;
- Text [ portuguese_brazilian ] = "Posio e espaamento" ;
+ Text [ portuguese_brazilian ] = "Position" ;
Text [ portuguese ] = "Posio e espaamento" ;
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 aralk";
- Text[ catalan ] = "Posicin y espacio";
+ Text[ catalan ] = "Posici i espai";
Text[ finnish ] = "Sijainti ja vlit";
+ Text[ thai ] = "ตำแหน่งและระยะห่าง";
};
FixedText FT_BORDERDIST
{
@@ -2004,11 +2068,11 @@ TabPage RID_SVXPAGE_NUM_POSITION
Text [ spanish ] = "~Sangra" ;
Text [ french ] = "Retrait" ;
Text [ dutch ] = "In~springing" ;
- Text [ portuguese_brazilian ] = "Avano" ;
+ Text [ portuguese_brazilian ] = "Ab~stand Text <-> Rand" ;
Text [ portuguese ] = "A~vano" ;
Text[ chinese_simplified ] = "缩进";
Text[ russian ] = "";
- Text[ polish ] = "Wcicie";
+ Text[ polish ] = "Wcicie 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 ] = "~Sangra";
+ 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 ] = "Greceli";
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 ] = "Distncia do ~texto" ;
+ Text [ portuguese_brazilian ] = "Einr~?kung" ;
Text [ portuguese ] = "Distncia 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 ] = "Vlit tekstiin";
+ Text[ thai ] = "ระยะห่างถึงข้อความ";
};
MetricField MF_INDENT
{
@@ -2124,20 +2191,21 @@ TabPage RID_SVXPAGE_NUM_POSITION
Text [ spanish ] = "Distancia mnima nmero <-> texto" ;
Text [ french ] = "cart ~minimum numrotation <-> texte" ;
Text [ dutch ] = "~Minimale afstand nummer <-> tekst" ;
- Text [ portuguese_brazilian ] = "~Distncia mnima texto <-> numerao" ;
+ Text [ portuguese_brazilian ] = "Abstand Te~xt <-> Numerierung" ;
Text [ portuguese ] = "~Distncia mnima texto <-> numerao" ;
Text[ chinese_simplified ] = "编号和正文之间的最少间隔";
Text[ russian ] = ". <-> ";
- Text[ polish ] = "Minim~alny odstp numeracja <-> tekst";
+ Text[ polish ] = "Minimalny odstp numeracja <-> tekst";
Text[ japanese ] = "番号とテキストの最小間隔";
Text[ chinese_traditional ] = "編號和內文之間的最少間隔";
Text[ arabic ] = " <-> ";
Text[ greek ] = " ~ <-> ";
- Text[ korean ] = "최소 간격, 번호 <-> 텍스트";
+ Text[ korean ] = "번호와 텍스트의 최소 간격";
Text[ turkish ] = "Asgari aralk: Numara <-> Metin";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Distancia mnima nmero <-> texto";
+ Text[ catalan ] = "Distncia mnima nmero <-> text";
Text[ finnish ] = "Numeroinnin ja tekstin vlill vhintn";
+ 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 ] = "~Alineacin de numeracin" ;
+ Text [ spanish ] = "~Alineacin de la numeracin" ;
Text [ french ] = "~Alignement de la numrotation" ;
Text [ dutch ] = "~Uitlijning van nummering" ;
- Text [ portuguese_brazilian ] = "A~linhamento da numerao" ;
+ Text [ portuguese_brazilian ] = "Ausri~chtung der Numerierung" ;
Text [ portuguese ] = "A~linhamento da numerao" ;
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 ] = "~Alineacin de numeracin";
+ 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 ] = "Padro" ;
+ 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 ] = "~Estndard";
+ 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 ] = "Kd" ;
@@ -2383,7 +2459,7 @@ String RID_STR_EDIT_GRAPHIC
Text [ english_us ] = "Link" ;
Text[ chinese_simplified ] = "链接";
Text[ russian ] = " ";
- Text[ polish ] = "Docz";
+ Text[ polish ] = "Pocz";
Text[ japanese ] = "リンク";
Text[ chinese_traditional ] = "捷徑";
Text[ arabic ] = "";
@@ -2391,7 +2467,8 @@ String RID_STR_EDIT_GRAPHIC
Text[ korean ] = "연결";
Text[ turkish ] = "Balant olutur";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Vincular";
+ Text[ catalan ] = "Enllaa";
+ 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 ] = "Enchanements";
- Text[ spanish ] = "Flujo de texto";
+ Text[ french ] = "Orientation du texte";
+ Text[ spanish ] = "~Direccin 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 alimentacin";
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 dzeni";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Disseny de pgina";
@@ -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~matsz";
@@ -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 gre ayarla";
@@ -1255,7 +1255,7 @@ TabPage RID_SVXPAGE_PAGE
Text[ chinese_traditional ] = "正反頁的行距相等";
Text[ arabic ] = "";
Text[ greek ] = "~";
- Text[ korean ] = "등록 확인";
+ Text[ korean ] = "인쇄할 때 가늠 맞춤 ";
Text[ turkish ] = "al~tr";
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 biimi";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Estil de ~refrencia";
@@ -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 ayarlarnz, yazdrma aralnn dnda.\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 alimentacin" ;
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 ] = "Kat 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 prrafo";
Text[ finnish ] = "~Ylreuna";
Text[ italian ] = "Precede il testo";
Text[ danish ] = "Foroven";
- Text[ swedish ] = "Fre text";
+ Text[ swedish ] = "Fre stycke";
Text[ polish ] = "Od gry";
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 ] = "Satr 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 hnsyn till" ;
@@ -810,7 +810,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
Text[ chinese_traditional ] = "正反頁的行距相等";
Text[ arabic ] = "";
Text[ greek ] = " ";
- Text[ korean ] = "등록 확인";
+ Text[ korean ] = "가늠 맞춤";
Text[ turkish ] = "Eit satr ykseklii";
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 Aralklar";
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 ] = "Rozcignij pojedyncze ~sowo";
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 ] = "Enchanements";
- Text[ spanish ] = "~Direccin del texto";
+ Text[ french ] = "Orientation du texte";
+ Text[ spanish ] = "~Direccin 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 ] = "Automtico" ;
+ Text [ spanish ] = "~Automticamente" ;
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 ] = "caractres en fin de ligne" ;
+ Text [ french ] = "Caractres en fin de ligne" ;
Text [ swedish ] = "tecken i slutet av raden" ;
Text [ dutch ] = "tekens aan regeleinde" ;
- Text [ spanish ] = "caracteres al final de la lnea" ;
+ Text [ spanish ] = "~Caracteres al final de la lnea" ;
Text [ english_us ] = "C~haracters at line end" ;
Left = TRUE ;
- Text[ chinese_simplified ] = "行末字符";
+ Text[ chinese_simplified ] = "字符留位于行末";
Text[ russian ] = " ";
Text[ polish ] = "znakw na kocu 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 ] = "satrsonu karakteri";
Text[ language_user1 ] = " ";
Text[ catalan ] = "carcter al final de la lnia";
@@ -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 incio da linha" ;
Text [ finnish ] = "Merkkej rivin alussa" ;
Text [ danish ] = "tegn ved linjens begyndelse" ;
- Text [ french ] = "caractres en dbut de ligne" ;
+ Text [ french ] = "Caractres en dbut de ligne" ;
Text [ swedish ] = "tecken i brjan av raden" ;
Text [ dutch ] = "tekens aan regelbegin" ;
- Text [ spanish ] = "caracteres al comienzo de la lnea" ;
+ Text [ spanish ] = "Caracteres al comienzo de la lnea" ;
Text [ english_us ] = "Cha~racters at line begin" ;
Left = TRUE ;
- Text[ chinese_simplified ] = "行首字符";
+ Text[ chinese_simplified ] = "字符留位于行首";
Text[ russian ] = " ";
Text[ polish ] = "znakw na pocztku wiersza";
- Text[ japanese ] = "文字以上残す";
- Text[ chinese_traditional ] = "行首文字";
+ Text[ japanese ] = "文字以上残す(行頭)(~R)";
+ Text[ chinese_traditional ] = "字元留位於行首(~R)";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = "줄 시작부분에 있는 문자";
+ Text[ korean ] = "줄 시작 문자";
Text[ turkish ] = "satrba karakteri";
Text[ language_user1 ] = " ";
Text[ catalan ] = "carcter al comenament de la lnia";
@@ -1784,18 +1784,18 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
Text [ finnish ] = "Per~kkisten tavuviivojen enimmismr" ;
Text [ danish ] = "Maksimalt antal orddelinger i rkke" ;
Text [ french ] = "Nombre maximal de coupures conscutives" ;
- 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 mxima de guiones consecutivos" ;
+ Text [ spanish ] = "~Nmero mximo de guiones consecutivos" ;
Text [ english_us ] = "~Maximum number of consecutive hyphens" ;
Text[ chinese_simplified ] = "最多连续使用的连字符数目(~M)";
Text[ russian ] = " ";
Text[ polish ] = "maksymalnie nastpujce po sobie miejsca podziau";
Text[ japanese ] = "ハイフネーション行の最高連続数(~M)";
- Text[ chinese_traditional ] = "最多連續使用的連字符數目(~M)";
+ Text[ chinese_traditional ] = "最多連續使用的連字號數目(~M)";
Text[ arabic ] = " ";
Text[ greek ] = " ~ ";
- Text[ korean ] = "최대 연속 하이픈 수(~M)";
+ Text[ korean ] = "하이픈이 연속으로 삽입될 수 있는 최대 수(~M)";
Text[ turkish ] = "Azami ardk ayrma iareti sa~ys";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Quantitat mxima 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 biiml~i";
Text[ language_user1 ] = "All \"Vorlagen\" /Styles are written with a capital S.10.5.00EM";
Text[ catalan ] = "A~mb estil de pgina";
@@ -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 ~blme";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Mant les ~lnies 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 pargra~fs junts";
@@ -2338,7 +2338,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
Text[ language_user1 ] = " ";
Text[ english_us ] = "~Orphan control";
Text[ portuguese ] = "Controlo de linhas ~vivas";
- 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 asitica";
- 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 caractres interdits en dbut et en fin de ligne";
- Text[ spanish ] = "Considerar lista de caracteres no aceptables a comienzo y fin de lnea.";
+ Text[ spanish ] = "Aplicar lista de caracteres no permitidos a comienzo y fin de lnea.";
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 ] = "Anvnd ~lista med frbjudna tecken i brjan och slutet av rader";
Text[ polish ] = "Uwzgldnij list znakw niedozwolonych na pocztku i na kocu 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 ~diviso 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 caractres latins";
@@ -2604,7 +2604,7 @@ TabPage RID_SVXPAGE_PARA_ASIAN
Text[ polish ] = "Dopu podzia wyrazw w tekcie napisanym literami aciskimi";
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 pontuao 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 ] = "Odstpy midzy 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 pontuao no incio de linha para compresso";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ greek ] = "~ ";
Text[ dutch ] = "I~nterpunctie ter comprimering aan regelbegin toestaan";
Text[ french ] = "Autoriser la po~nctuation en dbut de ligne pour compression";
@@ -2716,7 +2716,7 @@ TabPage RID_SVXPAGE_PARA_ASIAN
Text[ polish ] = "Ustaw odstp midzy tekstem azjatyckim, aciskim i zoonym";
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 odstp midzy 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 ] = "~Lsenord" ;
- 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 ] = "~Contrasea";
+ 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 lsenord" ;
- 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 ] = "Ls~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~ntrasea";
+ 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 ] = "~Bekrft";
Text[ swedish ] = "~Bekrfta";
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 ] = "Contrasea nueva" ;
Text [ french ] = "Nouveau" ;
Text [ dutch ] = "Nieuw wachtwoord" ;
Text [ swedish ] = "Nytt lsenord" ;
- 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 ] = "Geersiz ifre";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Contrasea no vlida";
+ 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 contraseas no coinciden" ;
Text [ french ] = "Les mots de passe ne concordent pas." ;
Text [ swedish ] = "Lsenord stmmer inte verens" ;
- Text [ danish ] = "Adgangskode passer ikke" ;
+ Text [ danish ] = "Adgangskoder stemmer ikke overens" ;
Text [ portuguese ] = "As senhas no 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 deil";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Las contraseas no coinciden";
+ Text[ catalan ] = "Les contrasenyes no coincideixen";
Text[ finnish ] = "Salasanat eivt vastaa toisiaan";
+ Text[ thai ] = "รหัสผ่านไม่ตรงกัน";
};
Text [ english_us ] = "Change Password" ;
Text [ italian ] = "Cambia password" ;
- Text [ spanish ] = "Modificar contrasea" ;
+ Text [ spanish ] = "Cambiar contrasea" ;
Text [ french ] = "Modification du mot de passe" ;
- Text [ dutch ] = "Wachtwoord veranderen" ;
+ Text [ dutch ] = "Wachtwoord wijzigen" ;
Text [ swedish ] = "ndra lsenord" ;
- 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 deitirme";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Modificar contrasea";
+ 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 ] = "Observao" ;
- 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 ] = "Frfattare" ;
@@ -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~infgen" ;
Text [ English ] = "~Insert" ;
+ Text[ english_us ] = "~Insert";
+ Text[ portuguese ] = "~Insert";
+ Text[ russian ] = "~Insert";
+ Text[ greek ] = "~Insert";
+ Text[ dutch ] = "~Insert";
+ Text[ french ] = "Insrer";
+ 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 dzenle";
- 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 slection";
Text[ swedish ] = "Skriv ut markering";
- Text[ dutch ] = "Afdrukken van de selectie";
+ Text[ dutch ] = "Selectie afdrukken";
Text[ spanish ] = "Imprimir la seleccin";
Text[ english_us ] = "Printing selection";
- Text[ chinese_simplified ] = "ӡѡеIJ";
+ Text[ chinese_simplified ] = "打印选中的部分";
Text[ russian ] = " ";
Text[ polish ] = "Drukuj zaznaczony obszar";
- Text[ japanese ] = "Ï";
- Text[ chinese_traditional ] = "CL";
+ Text[ japanese ] = "選択した部分の印刷";
+ Text[ chinese_traditional ] = "列印選取部份";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = " μ";
+ Text[ korean ] = "선택한 범위 인쇄";
Text[ turkish ] = "Seilen aralk yazdrlyor";
- Text[ catalan ] = "Imprimir la seleccin";
+ 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 seleco ou o documento inteiro?";
Text[ danish ] = "Vil du udskrive det markerede eller hele dokumentet?";
Text[ french ] = "Souhaitez vous imprimer uniquement la slection 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 seleccin 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 cay dokument?";
- Text[ japanese ] = "͑Iɂ܂AđŜ܂H";
- Text[ chinese_traditional ] = "nCL٬OnCLӤH";
+ Text[ japanese ] = "印刷は選択した部分にしますか、ドキュメント全体しますか?";
+ Text[ chinese_traditional ] = "要列印選取的部份還是要列印整個文件?";
Text[ arabic ] = " ء ";
Text[ greek ] = " ;";
- Text[ korean ] = " Ǵ ü μϽðڽϱ?";
+ Text[ korean ] = "선택한 범위 또는 문서 전체를 인쇄하겠습니까?";
Text[ turkish ] = "Seilen aralk ya da belgenin tm m yazdrlsn?";
- Text[ catalan ] = "Desea imprimir solo la seleccin o todo el documento?";
+ Text[ catalan ] = "Voleu imprimir noms 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 ] = "~Tm";
- 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~ccin";
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 ] = "~Seilen aralk";
- Text[ catalan ] = "Sele~ccin";
- 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
#endif
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include
+#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 automtico";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ greek ] = " ";
Text[ dutch ] = "Automatische herkenning";
Text[ french ] = "Dtection 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 ] = "~Posio";
- Text[ russian ] = "";
+ Text[ russian ] = "";
Text[ greek ] = "Position";
- Text[ dutch ] = "~Position";
+ Text[ dutch ] = "~Positie";
Text[ french ] = "Position";
Text[ spanish ] = "Posicin";
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 ~caractres pour le texte Ruby";
- Text[ spanish ] = "Estilo de carcter para texto ruby";
+ Text[ spanish ] = "~Estilo de carcter para el texto Ruby";
Text[ italian ] = "Stile del carattere per testo Ruby";
Text[ danish ] = "~Tegntypografi for fonetisk tekst";
Text[ swedish ] = "~Teckenformatmall fr ruby-text";
Text[ polish ] = "Styl znakw 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 ] = "Aperu :";
@@ -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 ] = "~Anvnd";
@@ -721,7 +721,7 @@ ModelessDialog RID_SVXDLG_RUBY
Text[ turkish ] = "Apply";
Text[ arabic ] = "";
Text[ catalan ] = "Aplica";
- Text[ finnish ] = "~Kyt";
+ 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 ] = "Carcter fontic 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 ] = "Milmetro" ;
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 ] = "Milmetros";
+ Text[ catalan ] = "Milimetres";
Text[ finnish ] = "Millimetri";
+ Text[ thai ] = "มิลลิเมตร";
};
MenuItem
{
@@ -110,17 +111,18 @@ Menu RID_SVXMN_RULER
Text [ dutch ] = "Centimeter" ;
Text [ spanish ] = "Centmetro" ;
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 ] = "Centmetro";
+ Text[ catalan ] = "Centmetres";
+ 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 ] = "Quilmetro" ;
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 ] = "Kilmetro";
+ Text[ catalan ] = "Kilmetres";
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 ] = "Ps" ;
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 ] = "Vk";
+ 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 ] = "Dziesitny";
- TEXT[ japanese ] = "_";
- TEXT[ chinese_traditional ] = "Qi쪺";
+ TEXT[ japanese ] = "小数点揃え";
+ TEXT[ chinese_traditional ] = "十進位";
TEXT[ arabic ] = "";
TEXT[ greek ] = "";
- TEXT[ korean ] = "Ҽ";
+ TEXT[ korean ] = "소수점";
TEXT[ turkish ] = "Ondalk";
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 ] = "Wyrodkuj";
- 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 ] = "Cigy";
- Text[ japanese ] = "";
- Text[ chinese_traditional ] = "";
+ Text[ japanese ] = "実線";
+ Text[ chinese_traditional ] = "持續的";
Text[ arabic ] = "";
Text[ greek ] = "";
- Text[ korean ] = "Ϲ";
+ Text[ korean ] = "계속";
Text[ turkish ] = "Srekli";
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 ] = "Gradao" ;
- Text [ finnish ] = "Svytys" ;
+ Text [ finnish ] = "Liukuvrjys" ;
Text [ danish ] = "Farvegraduering" ;
Text [ french ] = "Dgrad" ;
Text [ swedish ] = "Frggradient" ;
- 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 gradao:" ;
Text [ french ] = "Saisissez un nom pour le dgrad :" ;
- 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 fr frggradienten hr:" ;
- Text [ finnish ] = "Kirjoita svytyksen nimi:" ;
+ Text [ finnish ] = "Kirjoita liukuvrjyksen 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 ] = "бzbsmϮJ@ӦW١G";
+ Text[ japanese ] = "グラデーションの名前をここに入力してください:";
+ Text[ chinese_traditional ] = "請在這裡輸入一個新的彩色圖案名稱:";
Text[ arabic ] = " :";
Text[ greek ] = " :";
- Text[ korean ] = " ̼ ̸ ԷϽʽÿ:";
+ Text[ korean ] = "여기에 그라디언트의 이름을 입력하십시오:";
Text[ turkish ] = "Gradyan iin 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 gradao" ;
- Text [ finnish ] = "Poista svytys" ;
+ Text [ finnish ] = "Poista liukuvrjys" ;
Text [ danish ] = "Slet farvegradueringen" ;
Text [ french ] = "Supprimer le dgrad" ;
Text [ swedish ] = "Radera frggradient" ;
- 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 ] = "RmϮ";
+ 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 gradao?" ;
- Text [ finnish ] = "Haluatko poistaa svytyksen?" ;
+ Text [ finnish ] = "Haluatko poistaa liukuvrjyksen?" ;
Text [ danish ] = "Er du sikker p, at du vil slette farvegradueringen?" ;
Text [ french ] = "Voulez-vous supprimer le dgrad ?" ;
Text [ swedish ] = "Skall frggradienten 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 ] = "zunRoӱmϮסH";
+ Text[ japanese ] = "このグラデーションを削除してかまいませんか。";
+ Text[ chinese_traditional ] = "真要刪除這個彩色圖案?";
Text[ arabic ] = " ";
Text[ greek ] = " ;";
- Text[ korean ] = "̼ Ͻðڽϱ?";
+ Text[ korean ] = "그라디언트를 정말로 삭제하겠습니까?";
Text[ turkish ] = "Gradyan gerekten 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 gradao da cor foi modificada e no guardada.\nPoder modificar a gradao seleccionada\nou adicionar uma nova." ;
- Text [ finnish ] = "Svytyst ei tallennettu muokkauksen jlkeen. \nMuokkaa valittua svytyst tai lis uusi svytys." ;
+ Text [ finnish ] = "Liukuvrjyst ei tallennettu muutoksen jlkeen. \nMuuta valittua liukuvrjyst tai lis uusi liukuvrjys." ;
Text [ danish ] = "Farvegradueringen er blevet ndret, men ikke gemt. \nDu kan ndre den markerede farvegraduering \neller tilfje en ny." ;
Text [ french ] = "Le dgrad a t modifi sans avoir t sauvegard.\nVous pouvez modifier le dgrad slectionn ou en ajouter un nouveau." ;
Text [ swedish ] = "Frggradienten ndrades utan att sparas.\nDu kan ndra den markerade frggradienten\neller lgga 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 aadir 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. \nMoesz zmieni zaznaczony gradient \nlub doda nowy gradient.";
- Text[ japanese ] = "ް݂ύXĕۑĂ܂B\nIް݂̕ύX܂\nVް݂̒ljł܂B";
- Text[ chinese_traditional ] = "oӱmϮפwgܧMO|xsC\nzܧmϮ\nΪ̼W[@ӷsmϮס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 deitirildi ancak kaydedilmedi.\nSeili gradyan deitirebilir ya da\nyeni bir gradyan ekleyebilirsiniz.";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "El gradiente de color ha sido modificado sin guardar.\nPuede modificarlo\no aadir 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 elem";
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 fr 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 ] = "бzbsϿJ@ӦW١G";
+ Text[ japanese ] = "ビットマップの名前をここに入力してください:";
+ Text[ chinese_traditional ] = "請您在此為新的位圖輸入一個名稱:";
Text[ arabic ] = " :";
Text[ greek ] = " itmap:";
- Text[ korean ] = " Ʈ ̸ ԷϽʽÿ:";
+ Text[ korean ] = "여기에 비트맵의 이름을 입력하십시오:";
Text[ turkish ] = "Bit elem iin 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 fr 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 zewntrznej mapy bitowej:";
- Text[ japanese ] = "Oޯϯ߂̖Oɓ͂ĂF";
- Text[ chinese_traditional ] = "бzbs~I}ϿJ@ӦW١G";
+ Text[ japanese ] = "外部ビットマップの名前をここに入力してください:";
+ Text[ chinese_traditional ] = "請您在此為新的外來點陣圖輸入一個名稱:";
Text[ arabic ] = " :";
Text[ greek ] = " itmap:";
- Text[ korean ] = " ܺ Ʈ ̸ ԷϽʽÿ:";
+ Text[ korean ] = "여기에 외부 비트맵의 이름을 입력하십시오:";
Text[ turkish ] = "D bit elem iin 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 ] = "RI}";
+ Text[ japanese ] = "ビットマップの削除";
+ Text[ chinese_traditional ] = "刪除點陣圖";
Text[ arabic ] = " ";
Text[ greek ] = " bitmap";
- Text[ korean ] = "Ʈ ";
+ Text[ korean ] = "비트맵 삭제";
Text[ turkish ] = "Bit elemi 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 ] = "zunRoI}ϡH";
+ Text[ japanese ] = "このビットマップを削除してかまいませんか。";
+ Text[ chinese_traditional ] = "您真要刪除這個點陣圖?";
Text[ arabic ] = " ɿ";
Text[ greek ] = " Bitmap;";
- Text[ korean ] = "Ʈ Ͻðڽϱ?";
+ Text[ korean ] = "비트맵을 정말로 삭제하겠습니까?";
Text[ turkish ] = "Bit elem gerekten 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 no 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 jlkeen. \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 tilfje en ny." ;
Text [ french ] = "Le bitmap a t modifi sans avoir t sauvegard.\nVous pouvez modifier le bitmap slectionn ou en ajouter un nouveau." ;
Text [ swedish ] = "Bitmappen ndrades utan att sparas. \nDu kan ndra den markerade bitmappen\neller lgga 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 aadir 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 zostaa zmieniona i nie zapisana. \nMoesz zmieni zaznaczon map bitow \nlub doda now map bitow.";
- Text[ japanese ] = "ޯϯ߂ύXĕۑĂ܂B\nIޯϯ߂̕ύX܂\nVޯϯ߂̒ljł܂B";
- Text[ chinese_traditional ] = "oI}Ϫ˦wgܧMO|xsC \nzܧI}\nΪ̼W[@ӷsI}ϡ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 elem deitirildi ancak kaydedilmedi.\nSeili bit elemi deitirebilir ya da\nyeni bir bit elem ekleyebilirsiniz.";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "El bitmap ha sido modificado sin guardar.\nPuede modificar el bitmap seleccionado\no aadir 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 lnea" ;
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 biimi";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Estilo de lnea";
+ Text[ catalan ] = "Estil de lnia";
+ 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 lnea:" ;
+ Text [ spanish ] = "Inserte el nombre del estilo de lnea:" ;
Text [ danish ] = "Indtast venligst et navn til den nye stregtype:" ;
Text [ swedish ] = "Mata in namnet fr linjestilen hr:" ;
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 ] = "Цbsu˿J@ӦW١G";
+ Text[ japanese ] = "線スタイルの名前をここに入力してください:";
+ Text[ chinese_traditional ] = "請在此為新的線條式樣輸入一個名稱:";
Text[ arabic ] = " :";
Text[ greek ] = " :";
- Text[ korean ] = " ̸ ԷϽʽÿ:";
+ Text[ korean ] = "여기에 새 선 스타일의 이름을 입력하십시오:";
Text[ turkish ] = "izgi biimi iin bir ad girin:";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Inserte aqu el nombre para el estilo de lnea:";
+ Text[ catalan ] = "Inseriu aqu el nom per l'estil de lnia:";
+ 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 lnea" ;
+ Text [ spanish ] = "Borrar estilo de lnea" ;
Text [ english_us ] = "Delete line style" ;
- Text[ chinese_simplified ] = "ɾʽ";
+ Text[ chinese_simplified ] = "删除线条式样";
Text[ russian ] = " ";
Text[ polish ] = "Usu styl linii";
- Text[ japanese ] = "ق̍폜";
- Text[ chinese_traditional ] = "Ru";
+ Text[ japanese ] = "線スタイルの削除";
+ Text[ chinese_traditional ] = "刪除線條式樣";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = " ";
+ Text[ korean ] = "선 스타일 삭제";
Text[ turkish ] = "izgi biimini sil";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Eliminar estilo de lnea";
+ Text[ catalan ] = "Suprimeix l'estil de lnia";
+ 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 lnea?" ;
+ Text [ spanish ] = "Desea realmente borrar el estilo de lnea?" ;
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 usunity?";
- Text[ japanese ] = "̐ق{ɍ폜܂B";
- Text[ chinese_traditional ] = "unRoӽuˡH";
+ Text[ japanese ] = "この線スタイルを本当に削除しますか。";
+ Text[ chinese_traditional ] = "真要刪除這個線條式樣?";
Text[ arabic ] = " ؿ";
Text[ greek ] = " ;";
- Text[ korean ] = " Ͻðڽϱ?";
+ Text[ korean ] = "선 스타일을 삭제하시겠습니까?";
Text[ turkish ] = "izgi biimi gerekten silinsin mi?";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Desea realmente eliminar el estilo de lnea?";
+ Text[ catalan ] = "Voleu realment suprimir l'estil de lnia?";
+ 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 no 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 jlkeen. \nMuuta valittua viivatyyli tai lis uusi viivatyyli." ;
Text [ danish ] = "Stregtypen er blevet ndret, men ikke gemt. \nDu kan ndre den markerede stregtype \neller tilfje en ny." ;
Text [ french ] = "Le style de ligne a t modifi sans avoir t sauvegard. \nVous pouvez modifiez le style de ligne slectionn ou en ajouter un nouveau." ;
Text [ swedish ] = "Linjestilen ndrades utan att sparas.\nDu kan ndra den markerade linjestilen eller\nlgga 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 lnea ha sido modificado sin guardar.\nPuede modificar el estilo de lnea seleccionado\no aadir 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 lnea se modific sin guardar.\nPuede modificar el estilo de lnea seleccionado\no aadir 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. \nMoesz zmieni zaznaczony styl linii \nlub doda nowy styl linii.";
- Text[ japanese ] = "̽قύXĕۑĂ܂B\nI̽ق̕ύX܂\nV̽ق̒ljł܂B";
- Text[ chinese_traditional ] = "oӽuˤwgܧMO|xsC \nzܧu\nΪ̼W[@ӷsuˡ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 biimi deitirildi ancak kaydedilmedi. \nSeili izgi biimini deitirebilir ya da \nyeni bir izgi biimi ekleyebilirsiniz.";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "El estilo de lnea ha sido modificado sin guardar.\nPuede modificar el estilo de lnea seleccionado\no aadir uno nuevo.";
+ Text[ catalan ] = "L'estil de lnia s'ha modificat sense desar-lo.\nPodeu modificar l'estil de lnia 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 ] = "vu";
+ 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 fr skrafferingen hr:" ;
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 ] = "бzbsvuJ@ӦW١G";
+ Text[ japanese ] = "ハッチングの名前をここに入力してください:";
+ Text[ chinese_traditional ] = "請您在此為新的陰影線輸入一個名稱:";
Text[ arabic ] = " :";
Text[ greek ] = " :";
- Text[ korean ] = " Ī ̸ ԷϽʽÿ:";
+ Text[ korean ] = "해칭의 이름을 입력하십시오:";
Text[ turkish ] = "Tarama iin 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 ] = "Rvu";
+ 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 ] = "zunRoӳvuH";
+ Text[ japanese ] = "このハッチングを削除してかまいませんか。";
+ Text[ chinese_traditional ] = "您真要刪除這個陰影線?";
Text[ arabic ] = " Կ";
Text[ greek ] = " ;";
- Text[ korean ] = "Ī Ͻðڽϱ?";
+ Text[ korean ] = "해칭을 정말로 삭제하겠습니까?";
Text[ turkish ] = "Tarama gerekten 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 no 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 tilfje en ny." ;
Text [ french ] = "Les hachures ont t modifies sans avoir t sauvegardes. \nVous pouvez modifier les hachures slectionnes ou en ajouter de nouvelles." ;
Text [ swedish ] = "Skrafferingen ndrades utan att sparas.\nDu kan ndra den markerade skrafferingen eller\nlgga 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 aadir 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 zostao zmienione i nie zapisane. \nMoesz zmieni zaznaczone kreskowanie \ni lub doda nowe kreskowanie.";
- Text[ japanese ] = "ʯݸނύXĕۑĂ܂B\nIʯݸނ̕ύX܂\nVʯݸނ̒ljł܂B";
- Text[ chinese_traditional ] = "oӳvwgܧMO|xsC \nzܧv\nΪ̼W[@ӷsvC";
+ 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 deitirildi ancak kaydedilmedi.\nSeili deseni deitirebilir ya da\nyeni bir tarama ekleyebilirsiniz.";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "La trama ha sido modificada sin guardar.\nPuede modificar la trama seleccionada\no aadir 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 ] = "Deitir";
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 ] = "Aadir" ;
Text [ english_us ] = "Add" ;
- Text[ chinese_simplified ] = "";
+ Text[ chinese_simplified ] = "新增";
Text[ russian ] = "";
Text[ polish ] = "Dodaj";
- Text[ japanese ] = "lj";
- Text[ chinese_traditional ] = "sW";
+ Text[ japanese ] = "追加";
+ Text[ chinese_traditional ] = "新增";
Text[ arabic ] = "";
Text[ greek ] = "";
- Text[ korean ] = "߰";
+ Text[ korean ] = "추가";
Text[ turkish ] = "Ekle";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Aadir";
+ 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 fr den nya frgen:" ;
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 ] = "VF̖O͂Ă:";
- Text[ chinese_traditional ] = "бzbsCJ@ӦW١G";
+ Text[ japanese ] = "新しい色の名前を入力してください:";
+ Text[ chinese_traditional ] = "請在這裡輸入一個新顏色的名稱:";
Text[ arabic ] = " :";
Text[ greek ] = " :";
- Text[ korean ] = " ο ̸ ԷϽʽÿ:";
+ Text[ korean ] = "여기에서 새로운 색상의 이름을 입력하십시오:";
Text[ turkish ] = "Yeni rengin adn 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 frg" ;
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 ] = "RC";
+ 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 vrin?" ;
Text [ danish ] = "Er du sikker p, at du vil slette farven?" ;
Text [ french ] = "Voulez-vous supprimer la couleur ?" ;
- Text [ swedish ] = "Vill Du verkligen radera frgen?" ;
+ Text [ swedish ] = "Vill du verkligen radera frgen?" ;
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 ] = "zunRoCH";
+ Text[ japanese ] = "この色を削除してかまいませんか。";
+ Text[ chinese_traditional ] = "您真要刪除這個顏色?";
Text[ arabic ] = " ";
Text[ greek ] = " ;";
- Text[ korean ] = " Ͻðڽϱ?";
+ Text[ korean ] = "색을 정말로 삭제하겠습니까?";
Text[ turkish ] = "Renk gerekten 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 no guardada? \nPoder modificar a cor seleccionada\nou adicionar uma nova." ;
- Text [ finnish ] = "Vri on muokattu tallentamatta.\nMuokkaa valittua vri tai lis uusi vri." ;
+ Text [ finnish ] = "Vri on muutettu tallentamatta.\nMuuta valittua vri tai lis uusi vri." ;
Text [ danish ] = "Farven er blevet ndret, men ikke gemt. \nDu kan ndre den markerede farve\n eller tilfje en ny." ;
Text [ french ] = "La couleur a t modifie sans avoir t sauvegarde.\nVous pouvez modifier la couleur slectionne ou en ajouter une nouvelle." ;
Text [ swedish ] = "Frgen ndrades utan att sparas.\nDu kan ndra den markerade frgen\neller lgga 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 aadir 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. \nMoesz zmieni zaznaczony kolor \nlub doda nowy kolor.";
- Text[ japanese ] = "FύXĕۑĂ܂B\nIF̕ύX܂\nVF̒ljł܂B";
- Text[ chinese_traditional ] = "oCwgܧMO|xsC \nzܧC\nΪ̼W[@ӷsCC";
+ 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 deitirildi ancak kaydedilmedi.\nSeili rengi deitirebilir ya da\nyeni bir renk ekleyebilirsiniz.";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "El color ha sido modificado sin guardar.\nPuede modificar el color seleccionado\no aadir 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 impossvel 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 mg zosta zapisany!";
- Text[ japanese ] = "̧ق͕ۑł܂łB";
- Text[ chinese_traditional ] = "Lkxsoɮס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 impossvel carregar o ficheiro!" ;
- Text [ finnish ] = "Tiedostoa ei lytynyt." ;
+ Text [ finnish ] = "Tiedoston lataaminen ei onnistunut." ;
Text [ danish ] = "Det var ikke muligt at indlse 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 mg zosta zaadowany!";
- Text[ japanese ] = "̧ق͓ǂݍ݂ł܂łB";
- Text[ chinese_traditional ] = "LkJoɮסI";
+ Text[ japanese ] = "ファイルは読み込みできませんでした。";
+ Text[ chinese_traditional ] = "無法載入這個檔案!";
Text[ arabic ] = " !";
Text[ greek ] = " !";
- Text[ korean ] = " ε ߽ϴ!";
+ Text[ korean ] = "파일을 로드하지 못했습니다.";
Text[ turkish ] = "Dosya yklenemedi!";
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 no 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 modifie sans avoir t enregistre. 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.\nDesea 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 zostaa zmieniona i nie jest zapisana. \nCzy tabela ma by zapisana?";
- Text[ japanese ] = "\\̕ύXۑĂ܂B\n\\ۑ܂B";
- Text[ chinese_traditional ] = "oӪwgܧMO|xsC \nznxsoӪH";
+ Text[ japanese ] = "表の変更があり保存されていません。\n表を保存しますか。";
+ Text[ chinese_traditional ] = "這個表格已經變更﹐但是尚未儲存。 \n您要儲存這個表格?";
Text[ arabic ] = " .\n ";
Text[ greek ] = " .\n ;";
- Text[ korean ] = "̺ Ǿ ʾҽϴ. \n̺ ұ?";
+ Text[ korean ] = "표가 변경되었으나 저장되지 않았습니다. \n표를 저장하시겠습니까?";
Text[ turkish ] = "Tablo deitirildi ancak kaydedilmedi. Tablo \n kaydedilsin mi?";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "La tabla ha sido modificada sin guardar.\nDesea 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 ] = "Mritetty nimi on jo kytss. \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 dj. \nVeuillez en saisir un autre." ;
- Text [ swedish ] = "Namnet Du valde finns redan. \nVlj ett annat namn." ;
+ Text [ swedish ] = "Namnet du valde finns redan. \nVlj 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 ] = "zJW٤wgsbC\nбzJ@ӨLW١C";
+ Text[ japanese ] = "入力した名前はすでにあります。\n別の名前を入力してください。";
+ Text[ chinese_traditional ] = "您輸入的名稱已經存在。\n請您輸入一個其他的名稱。";
Text[ arabic ] = " .\n .";
Text[ greek ] = " . \n .";
- Text[ korean ] = "Է ̸ ̹ ֽϴ. \nٸ ̸ ԷϽʽÿ.";
+ Text[ korean ] = "입력한 이름이 이미 있습니다. \n다른 이름을 입력하십시오.";
Text[ turkish ] = "Girdiiniz 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. \nIntroduu un altre nom.";
+ Text[ thai ] = "ชื่อที่คุณใส่มีอยู่แล้ว \nกรุณาเลือกชื่ออื่น";
};
String RID_SVXSTR_LINEEND
{
@@ -1069,19 +1104,20 @@ String RID_SVXSTR_LINEEND
Text [ french ] = "Extrmit de ligne" ;
Text [ swedish ] = "Linjeslut" ;
Text [ dutch ] = "Lijnuiteinde" ;
- Text [ spanish ] = "Fin de lnea" ;
+ Text [ spanish ] = "Fines de lnea" ;
Text [ english_us ] = "Arrowheads" ;
- Text[ chinese_simplified ] = "ͷ";
- Text[ russian ] = " ";
+ Text[ chinese_simplified ] = "线条箭头";
+ Text[ russian ] = " ";
Text[ polish ] = "Kocwki linii";
- Text[ japanese ] = "̏I_";
- Text[ chinese_traditional ] = "ubY";
+ Text[ japanese ] = "線の終点";
+ Text[ chinese_traditional ] = "線條箭頭";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = " ";
+ Text[ korean ] = "화살표 모양";
Text[ turkish ] = "izgi ucu";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Fin de lnea";
+ 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 nuolenkrjen nimi:" ;
Text [ danish ] = "Indtast venligst et navn til den nye piltype:" ;
Text [ french ] = "Saisissez un nom pour la nouvelle extrmit de ligne :" ;
- Text [ swedish ] = "Ange namn fr nya linjeslutet:" ;
- Text [ dutch ] = "Typ hier een naam voor het nieuwe lijnuiteinde:" ;
- Text [ spanish ] = "Inserte aqu el nombre para el nuevo fin de lnea:" ;
+ Text [ swedish ] = "Ange ett namn fr det nya linjeslutet:" ;
+ Text [ dutch ] = "Typ hier een naam voor de nieuwe lijnuiteinde:" ;
+ Text [ spanish ] = "Introduzca aqu un nombre para el nuevo fin de lnea:" ;
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 kocwek linii:";
- Text[ japanese ] = "V[̖Oɓ͂ĂF";
- Text[ chinese_traditional ] = "ЦbsubYJ@ӦW١G";
+ Text[ japanese ] = "新しい線端の名前をここに入力してください:";
+ Text[ chinese_traditional ] = "請在此為新線條箭頭輸入一個名稱:";
Text[ arabic ] = " :";
Text[ greek ] = " :";
- Text[ korean ] = " ̸ ԷϽʽÿ:";
+ Text[ korean ] = "여기에 새 화살표의 이름을 입력하십시오:";
Text[ turkish ] = "Yeni izgi ucu iin bir ad girin:";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Inserte aqu el nombre para el nuevo fin de lnea:";
+ Text[ catalan ] = "Inseriu aqu el nom pel nou fi de lnia:";
+ Text[ thai ] = "กรุณาใส่ชื่อหัวลูกศรใหม่:";
};
String RID_SVXSTR_DEL_LINEEND
{
@@ -1127,19 +1164,20 @@ String RID_SVXSTR_DEL_LINEEND
Text [ french ] = "Supprimer les extrmits" ;
Text [ swedish ] = "Radera linjeslut" ;
Text [ dutch ] = "Lijnuiteinde verwijderen" ;
- Text [ spanish ] = "Eliminar fin de lnea" ;
+ Text [ spanish ] = "Borrar fin de lnea" ;
Text [ english_us ] = "Delete line ends" ;
- Text[ chinese_simplified ] = "ɾͷ";
- Text[ russian ] = " ";
+ Text[ chinese_simplified ] = "删除线条箭头";
+ Text[ russian ] = " ";
Text[ polish ] = "Usu kocwki linii";
- Text[ japanese ] = "[̍폜";
- Text[ chinese_traditional ] = "RubY";
+ 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 lnea";
+ Text[ catalan ] = "Suprimeix el fi de lnia";
+ Text[ thai ] = "ลบส่วนท้ายของบรรทัด";
};
String RID_SVXSTR_ASK_DEL_LINEEND
{
@@ -1154,21 +1192,22 @@ String RID_SVXSTR_ASK_DEL_LINEEND
Text [ finnish ] = "Haluatko poistaa nuolenkrjen?" ;
Text [ danish ] = "Er du sikker p, at du vil slette piltypen?" ;
Text [ french ] = "Voulez-vous supprimer l'extrmit 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 lnea?" ;
+ Text [ spanish ] = "Desea realmente borrar el final de lnea?" ;
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 kocwki linii?";
- Text[ japanese ] = "̐[폜Ă܂܂B";
- Text[ chinese_traditional ] = "zunRoӽubYH";
+ Text[ japanese ] = "この線端を削除してかまいませんか。";
+ Text[ chinese_traditional ] = "您真要刪除這個線條箭頭?";
Text[ arabic ] = " ؿ";
Text[ greek ] = " ;";
- Text[ korean ] = " Ͻðڽϱ?";
+ Text[ korean ] = "화살표를 정말로 삭제하시겠습니까?";
Text[ turkish ] = "izgi ucu gerekten silinsin mi?";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Desea realmente eliminar el final de lnea?";
+ 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 gendert und nicht gesichert. \nMchten Sie das Linienende jetzt sichern? : Das Linienende wurde gendert und nicht gesichert. \nMchten Sie das Linienende jetzt sichern? */
Text = "Das Linienende wurde gendert und nicht gesichert. \nMchten 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 lnea ha sido modificado pero no guardado. \nDesea guardar ahora el final de lnea?" ;
Text [ french ] = "L'extrmit de la ligne a t modifie sans avoir t sauvegarde.\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 tilfje en ny." ;
Text [ portuguese ] = "O fim de linha foi modificado e no 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 ] = "Kocwki linii zostay zmienione i nie zapisane. \nCzy chcesz zmieni teraz kocwki linii?";
- Text[ japanese ] = "[ύXĕۑĂ܂B\n̐[ۑ܂B";
- Text[ chinese_traditional ] = "oӽubYwgܧMO|xsC\nzn{bxsoӽubYH";
+ Text[ japanese ] = "線端が変更されて保存されていません。\nこの線端を今すぐ保存しますか。";
+ Text[ chinese_traditional ] = "這個線條箭頭已經變更﹐但是尚未儲存。\n您要現在儲存這個線條箭頭?";
Text[ arabic ] = " .\n ";
Text[ greek ] = " .\n ;";
- Text[ korean ] = " Ǿ ʾҽϴ .\n Ͻðڽϱ?";
+ Text[ korean ] = "화살표가 변경되었으나 저장되지 않았습니다.\n화살표를 저장하시겠습니까?";
Text[ turkish ] = "izgi ucu deitirildi ancak kaydedilmedi.\nizgi ucunu imdi kaydetmek istiyor musunuz?";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "El final de lnea ha sido modificado pero no guardado. \nDesea guardar ahora el final de lnea?";
- Text[ finnish ] = "Nuolenkrke on muokattu ilman tallennusta.\nHaluatko tallentaa nuolenkrjen 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 ] = "Nuolenkrke on muutettu ilman tallennusta.\nHaluatko tallentaa nuolenkrjen 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 ] = "Bltt" ;
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 ] = "Grnt" ;
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 ] = "Yeil";
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 ] = "Rtt" ;
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 ] = "Krmz";
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 ] = "Brzowy";
- 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 ] = "Marrn";
+ Text[ catalan ] = "Marr";
+ Text[ thai ] = "น้ำตาล";
};
String RID_SVXSTR_GREY
{
@@ -1436,17 +1484,18 @@ String RID_SVXSTR_GREY
Text [ swedish ] = "Grtt" ;
Text [ finnish ] = "Harmaa" ;
Text [ english_us ] = "Gray" ;
- Text[ chinese_simplified ] = "ɫ";
+ Text[ chinese_simplified ] = "灰色";
Text[ russian ] = "";
Text[ polish ] = "Szary";
- Text[ japanese ] = "DF";
- 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 ] = "Ljusgrtt" ;
- 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 ] = "邢DF";
- Text[ chinese_traditional ] = "LǦ";
+ Text[ japanese ] = "明るい灰色";
+ Text[ chinese_traditional ] = "淺灰色";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = " ȸ";
+ Text[ korean ] = "밝은 회색";
Text[ turkish ] = "Ak 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 ] = "Ljusbltt" ;
- 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 ] = "Ak 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 ] = "Lysegrn" ;
Text [ swedish ] = "Ljusgrnt" ;
- 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 ] = "Ak yeil";
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 ] = "Ak 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 rd" ;
Text [ swedish ] = "Ljusrtt" ;
- 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 ] = "Ak krmz";
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 ] = "Biay";
- 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 ] = "Blgrtt" ;
Text [ finnish ] = "Siniharmaa" ;
Text [ english_us ] = "Blue gray" ;
- Text[ chinese_simplified ] = "ɫ";
+ Text[ chinese_simplified ] = "蓝灰色";
Text[ russian ] = "-";
Text[ polish ] = "Bkitnoszary";
- Text[ japanese ] = "DF";
- 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 blavs";
+ 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 ] = "Pomaraczowy";
- 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 ] = "Strzaka";
- Text[ japanese ] = "";
- Text[ chinese_traditional ] = "bY";
+ 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 ] = "Koo";
- 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 ] = "Crculo";
+ 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 mitn -";
+ Text[ catalan ] = "- cap -";
+ Text[ finnish ] = "- ei mitn -";
+ Text[ thai ] = "- ไม่มี -";
};
String RID_SVXSTR_TRANSPARENCE
{
@@ -1845,18 +1908,19 @@ String RID_SVXSTR_TRANSPARENCE
Text [ danish ] = "Transparens" ;
Text [ portuguese ] = "Transparncia" ;
Text [ portuguese_brazilian ] = "Transparenz" ;
- Text[ chinese_simplified ] = "";
+ Text[ chinese_simplified ] = "透明";
Text[ russian ] = "";
Text[ polish ] = "Przeroczysto";
- Text[ japanese ] = "ߐ";
- Text[ chinese_traditional ] = "z";
+ Text[ japanese ] = "透過性";
+ Text[ chinese_traditional ] = "透明";
Text[ arabic ] = "";
Text[ greek ] = "";
- Text[ korean ] = "";
+ Text[ korean ] = "투명";
Text[ turkish ] = "Saydamlk";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Transparencia";
+ Text[ catalan ] = "Transparncia";
Text[ finnish ] = "Lpinkyvyys";
+ 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 ] = "No centrado" ;
Text [ portuguese_brazilian ] = "Nicht Zentriert" ;
- Text[ chinese_simplified ] = "";
+ Text[ chinese_simplified ] = "不居中";
Text[ russian ] = " ";
Text[ polish ] = "Nie wyrodkowany";
- 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 ] = "Padro";
- Text[ russian ] = "";
+ Text[ russian ] = " ";
Text[ greek ] = "";
Text[ dutch ] = "Standaard";
- Text[ french ] = "Par dfaut";
+ Text[ french ] = "Standard";
Text[ spanish ] = "Predeterminado";
Text[ italian ] = "Standard";
Text[ danish ] = "Standard";
Text[ swedish ] = "Standard";
Text[ polish ] = "Domylnie";
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 ] = "Grskalor";
Text[ polish ] = "Odcienie szaroci";
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 ] = "Harmaasvy";
+ 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-biay";
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 ] = "Vandmrke";
Text[ swedish ] = "Vattenmrke";
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 ] = "Vdeo para Windows (*.avi)";
+ Text[ catalan ] = "Vdeo 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 ] = "";
Text[ polish ] = "";
Text[ portuguese_brazilian ] = "";
- Text[ japanese ] = "<ׂ>";
- Text[ korean ] = "<>";
- Text[ chinese_simplified ] = "<ȫ>";
- Text[ chinese_traditional ] = "<>";
+ Text[ japanese ] = "<すべて>";
+ Text[ korean ] = "<모두>";
+ Text[ chinese_simplified ] = "<全部>";
+ Text[ chinese_traditional ] = "<全部>";
Text[ arabic ] = "<>";
Text[ turkish ] = "";
- Text[ catalan ] = "";
+ Text[ catalan ] = "";
Text[ finnish ] = "";
+ Text[ thai ] = "<ทั้งหมด>";
};
String STR_INSERT_SOUND_TITLE
@@ -2157,15 +2232,16 @@ String STR_INSERT_SOUND_TITLE
Text[ swedish ] = "Infoga ljud";
Text[ polish ] = "Wstaw dwik";
Text[ portuguese_brazilian ] = "Insert sound";
- Text[ japanese ] = "ނ̑}";
- Text[ korean ] = " ";
- Text[ chinese_simplified ] = "";
- Text[ chinese_traditional ] = "Jn";
+ 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 ] = "Jv";
+ Text[ japanese ] = "ビデオの挿入";
+ Text[ korean ] = "비디오 삽입";
+ Text[ chinese_simplified ] = "插入影视";
+ Text[ chinese_traditional ] = "插入影視";
Text[ arabic ] = " ";
Text[ turkish ] = "Film ekle";
- Text[ catalan ] = "Insertar vdeo";
+ Text[ catalan ] = "Insereix vdeo";
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 ] = "Meneke";
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 ple";
@@ -2265,14 +2344,15 @@ String RID_SVXSTR_PALE_YELLOW
Text[ swedish ] = "Blekgul";
Text[ polish ] = "Bladoty";
Text[ portuguese_brazilian ] = "Pale yellow";
- Text[ japanese ] = "WF";
- 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 ple";
@@ -2291,14 +2371,15 @@ String RID_SVXSTR_PALE_GREEN
Text[ swedish ] = "Blekgrn";
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 yeil";
- 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 ] = "Mrklila";
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 ] = "Salmn";
+ 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 ] = "3D";
+ 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 ] = "Bltt";
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 ] = "Brzowy";
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 ] = "Marrn";
+ 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 ] = "통화 3D";
+ 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 grtt";
Text[ polish ] = "Waluta Szara";
Text[ portuguese_brazilian ] = "Currency Gray";
- Text[ japanese ] = "ʉ DF";
- 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 laventelinvihren";
+ 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 ] = "Grtt";
Text[ polish ] = "Szary";
Text[ portuguese_brazilian ] = "Gray";
- Text[ japanese ] = "DF";
- 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 ] = "Grnt";
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 ] = "Yeil";
- 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 ] = "Rtt";
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 ] = "Krmz";
- 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 ] = "Juno de linhas; mediana";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ greek ] = " ( )";
Text[ dutch ] = "Samenkomende lijnen, gemiddelde";
Text[ french ] = "Jointure de lignes, moyenne";
@@ -2828,14 +2929,15 @@ String RID_SVXSTR_LINEJOINT_MIDDLE
Text[ swedish ] = "Linjevergng, medelvrde";
Text[ polish ] = "Wyrodkowane poczenie linii";
Text[ portuguese_brazilian ] = "Line joint middle";
- Text[ japanese ] = "̌p ϕ";
- Text[ korean ] = " ߰";
- Text[ chinese_simplified ] = "ƽֵӺ";
- Text[ chinese_traditional ] = "ȫuX";
+ Text[ japanese ] = "線の継ぎ目 均分";
+ Text[ korean ] = "선 이음 평균";
+ Text[ chinese_simplified ] = "平均值型线条接合";
+ Text[ chinese_traditional ] = "平均值型線條接合";
Text[ arabic ] = " ";
Text[ turkish ] = "Ortalanm izgi geii";
- Text[ catalan ] = "Juntas de lnea, media";
+ Text[ catalan ] = "Mitjana de juntes de lnia";
Text[ finnish ] = "Keskimrinen 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 ] = "Juno de linhas, conjugada";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ greek ] = " ()";
Text[ dutch ] = "Samenkomende lijnen, verbonden";
Text[ french ] = "Jointure de lignes, conjugue";
@@ -2853,14 +2955,15 @@ String RID_SVXSTR_LINEJOINT_BEVEL
Text[ swedish ] = "Linjevergng, frbunden";
Text[ polish ] = "Powizane poczenie linii";
Text[ portuguese_brazilian ] = "Line joint bevel";
- Text[ japanese ] = "̌p Ίp";
- Text[ korean ] = " , ϳ ";
- Text[ chinese_simplified ] = "Ӻ";
- Text[ chinese_traditional ] = "puX";
+ Text[ japanese ] = "線の継ぎ目 斜角";
+ Text[ korean ] = "선 이음 빗면";
+ Text[ chinese_simplified ] = "联结型线条接合";
+ Text[ chinese_traditional ] = "聯結型線條接合";
Text[ arabic ] = " ";
Text[ turkish ] = "Birletirilmi izgi geii";
- Text[ catalan ] = "Junta de lneas unida";
+ Text[ catalan ] = "Junta de lnies 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 ] = "Juno de linhas, secante";
- Text[ russian ] = " ";
+ Text[ russian ] = " 45 ";
Text[ greek ] = " ()";
Text[ dutch ] = "Samenkomende lijnen, snijdend";
Text[ french ] = "Jointure de lignes, scante";
@@ -2878,14 +2981,15 @@ String RID_SVXSTR_LINEJOINT_MITER
Text[ swedish ] = "Linjevergng, klippt";
Text[ polish ] = "Przecite poczenie linii";
Text[ portuguese_brazilian ] = "Line joint miter";
- Text[ japanese ] = "̌p ";
- Text[ korean ] = " , ";
- Text[ chinese_simplified ] = "Ӻ";
- Text[ chinese_traditional ] = "űuX";
+ Text[ japanese ] = "線の継ぎ目 交差";
+ Text[ korean ] = "선 이음 교차";
+ Text[ chinese_simplified ] = "剪接型线条接合";
+ Text[ chinese_traditional ] = "剪接型線條接合";
Text[ arabic ] = " ";
Text[ turkish ] = "izgi kesime noktas";
- Text[ catalan ] = "Junta de lneas cortada";
+ Text[ catalan ] = "Junta de lnies 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 ] = "Juno 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 ] = "Linjevergng, rund";
Text[ polish ] = "Okrge poczenie linii";
Text[ portuguese_brazilian ] = "Line joint round";
- Text[ japanese ] = "̌p ۂ";
- Text[ korean ] = " , ձ۰";
- Text[ chinese_simplified ] = "ԲӺ";
- Text[ chinese_traditional ] = "νuX";
+ Text[ japanese ] = "線の継ぎ目 丸く";
+ Text[ korean ] = "선 이음 둥글게";
+ Text[ chinese_simplified ] = "圆形线条接合";
+ Text[ chinese_traditional ] = "圓形線條接合";
Text[ arabic ] = " ء ";
Text[ turkish ] = "Yuvarlak izgi geii";
- Text[ catalan ] = "Junta de lneas redonda";
+ Text[ catalan ] = "Junta de lnies rodonda";
Text[ finnish ] = "Pyre 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 ] = "Impossvel abrir ficheiro grfico" ;
- 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 gr 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 grfico" ;
TEXT [ english_us ] = "Graphics file cannot be opened" ;
- TEXT[ chinese_simplified ] = "ͼļ";
- TEXT[ russian ] = " ";
+ TEXT[ chinese_simplified ] = "无法打开图形文件";
+ TEXT[ russian ] = " ";
TEXT[ polish ] = "Pliku graficznego nie mona otworzy";
- TEXT[ japanese ] = "摜̧ق͊J܂B";
- TEXT[ chinese_traditional ] = "Lk}ҹϧɮ";
+ TEXT[ japanese ] = "画像ファイルは開けません。";
+ TEXT[ chinese_traditional ] = "無法開啟圖形檔案";
TEXT[ arabic ] = " ";
TEXT[ greek ] = " ";
- TEXT[ korean ] = " ϴ";
+ TEXT[ korean ] = "그림 파일을 열 수 없습니다.";
TEXT[ turkish ] = "Grafik dosyas alamyor";
TEXT[ language_user1 ] = " ";
- TEXT[ catalan ] = "No es posible abrir el archivo grfico";
+ TEXT[ catalan ] = "No es pot obrir el fitxer grfic";
+ 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 ] = "Impossvel ler o ficheiro grfico" ;
- TEXT [ finnish ] = "Grafiikkatiedostoa ei voi lukea" ;
- TEXT [ danish ] = "Det er ikke muligt at lse grafikfilen" ;
+ TEXT [ finnish ] = "Grafiikkatiedostoa ei voi lukea." ;
+ TEXT [ danish ] = "Grafikfil kan ikke lses" ;
TEXT [ french ] = "Impossible de lire le fichier graphique" ;
TEXT [ swedish ] = "Det gr inte att lsa grafikfil" ;
- TEXT [ dutch ] = "Grafisch bestand is onleesbaar" ;
+ TEXT [ dutch ] = "Afbeeldingsbestand is onleesbaar" ;
TEXT [ spanish ] = "No es posible leer el archivo grfico" ;
TEXT [ english_us ] = "Graphics file cannot be read" ;
- TEXT[ chinese_simplified ] = "ͼļ";
- TEXT[ russian ] = " ";
+ TEXT[ chinese_simplified ] = "无法读出图形文件";
+ TEXT[ russian ] = " ";
TEXT[ polish ] = "Pliku graficznego nie mona otworzy";
- TEXT[ japanese ] = "摜̧ق͓ǂݎ܂B";
- TEXT[ chinese_traditional ] = "LkŪXϧɮ";
+ TEXT[ japanese ] = "画像ファイルは読み取れません。";
+ TEXT[ chinese_traditional ] = "無法讀出圖形檔案";
TEXT[ arabic ] = " ";
TEXT[ greek ] = " ";
- TEXT[ korean ] = " ϴ";
+ TEXT[ korean ] = "그림 파일을 읽을 수 없습니다.";
TEXT[ turkish ] = "Grafik dosyas okunamyor";
TEXT[ language_user1 ] = " ";
- TEXT[ catalan ] = "No es posible leer el archivo grfico";
+ TEXT[ catalan ] = "No es pot llegir el fitxer grfic";
+ 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 ] = "Oknt 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 ] = "Verso do ficheiro grfico no tem suporte" ;
- TEXT [ finnish ] = "Grafiikkatiedoston versiota ei tueta" ;
- TEXT [ danish ] = "Grafikfilens version understttes ikke" ;
+ TEXT [ finnish ] = "Grafiikkatiedoston versiota ei tueta." ;
+ TEXT [ danish ] = "Grafikfilens version supporteres ikke" ;
TEXT [ french ] = "Version du fichier graphique non supporte" ;
TEXT [ swedish ] = "Grafikfilens version stds inte" ;
- TEXT [ dutch ] = "Deze versie van het grafisch bestand wordt niet ondersteund" ;
- TEXT [ spanish ] = "No se apoya la versin del archivo grfico" ;
+ TEXT [ dutch ] = "Deze versie van het afbeeldingsbestand wordt niet ondersteund" ;
+ TEXT [ spanish ] = "Esta versin del archivo grfico 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 obsugiwana";
- TEXT[ japanese ] = "摜̧قްޮ݂ͻ߰Ă܂B";
- TEXT[ chinese_traditional ] = "oӹϧɮת";
+ TEXT[ japanese ] = "画像ファイルのバージョンはサポートされません。";
+ TEXT[ chinese_traditional ] = "不支持這個圖形檔案版本";
TEXT[ arabic ] = " ";
TEXT[ greek ] = " .";
- TEXT[ korean ] = " ";
+ TEXT[ korean ] = "그림 파일의 이 버전은 지원되지 않습니다.";
TEXT[ turkish ] = "Grafik dosyasnn srm desteklenmiyor";
TEXT[ language_user1 ] = " ";
- TEXT[ catalan ] = "No se apoya la versin del archivo grfico";
+ TEXT[ catalan ] = "No se suporta la versi del fitxer grfic";
+ 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 grfico no encontrado" ;
- TEXT [ finnish ] = "Grafiikkasuodatinta ei lytynyt" ;
- TEXT [ danish ] = "Grafikfilter blev ikke fundet" ;
- TEXT [ french ] = "Filtre d'image non dtect" ;
+ TEXT [ finnish ] = "Grafiikkasuodatinta ei lytynyt." ;
+ 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 imgenes" ;
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ϧιLo";
+ 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 imgenes";
+ 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 ] = "Memria insuficiente para inserir a imagem." ;
- TEXT [ finnish ] = "Muisti ei riit kuvan lismiseen" ;
- TEXT [ danish ] = "Ikke tilstrkkelig hukommelse til at indstte grafik" ;
+ TEXT [ finnish ] = "Muisti ei riit kuvan lismiseen." ;
+ TEXT [ danish ] = "Ikke tilstrkkelig hukommelse til indstning af grafik" ;
TEXT [ french ] = "Mmoire insuffisante pour l'insertion de l'image" ;
TEXT [ swedish ] = "Inte tillrckligt med minne fr 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 pamici potrzebnej do wstawienia grafiki";
- TEXT[ japanese ] = "}}ɂ́Aؗeʂs\\łB";
- TEXT[ chinese_traditional ] = "O餣MLkJϧ";
+ TEXT[ japanese ] = "図の挿入に必要なディスク空き容量がありません。";
+ TEXT[ chinese_traditional ] = "記憶體不足﹐無法插入圖形";
TEXT[ arabic ] = " ";
TEXT[ greek ] = " ";
- TEXT[ korean ] = " մϴ";
+ TEXT[ korean ] = "메모리가 부족하여 그래픽 삽입을 삽입할 수 없습니다.";
TEXT[ turkish ] = "Grafiin eklenmesi iin yeterli bellek mevcut deil";
TEXT[ language_user1 ] = " ";
- TEXT[ catalan ] = "No hay suficiente memoria para insertar la imagen";
+ TEXT[ catalan ] = "No hi ha prou memria per inserir la imatge";
+ TEXT[ thai ] = "หน่วยความจำไม่พอในการแทรกกราฟิค";
};
@@ -3276,9 +3387,9 @@ String RID_SVXSTR_GRDT0
Text [ ENGLISH ] = "Gradient";
Text[ english_us ] = "Gradient";
Text[ portuguese ] = "Gradao";
- Text[ russian ] = "";
+ Text[ russian ] = "";
Text[ greek ] = " ";
- Text[ dutch ] = "Kleurverloop";
+ Text[ dutch ] = "Kleurovergangen";
Text[ french ] = "Dgrad";
Text[ spanish ] = "Gradiente";
Text[ italian ] = "Sfumatura";
@@ -3286,14 +3397,15 @@ String RID_SVXSTR_GRDT0
Text[ swedish ] = "Frggradient";
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 ] = "Liukuvrjys";
+ 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 ] = "Linaire bleu/blanc";
@@ -3311,14 +3423,15 @@ String RID_SVXSTR_GRDT1
Text[ swedish ] = "Linjr bltt/vitt";
Text[ polish ] = "Linearny niebieski/biay";
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 ] = "Dorusal 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 ] = "Linaire violet/vert";
@@ -3336,14 +3449,15 @@ String RID_SVXSTR_GRDT2
Text[ swedish ] = "Linjr violett/grnt";
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 ] = "Dorusal meneke/yeil";
- 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 ] = "Linaire jaune/marron";
@@ -3361,14 +3475,15 @@ String RID_SVXSTR_GRDT3
Text[ swedish ] = "Linjr gult/brunt";
Text[ polish ] = "Linearny ty/brzowy";
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 ] = "Dorusal sar/kahverengi";
- Text[ catalan ] = "Lineal amarillo/marrn";
+ 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 grnt/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 yeil/siyah";
- Text[ catalan ] = "Radial verde/negro";
+ Text[ catalan ] = "Radial verd/negre";
Text[ finnish ] = "Steittinen 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 rtt/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 krmz/sar";
- Text[ catalan ] = "Radial rojo/amarillo";
+ Text[ catalan ] = "Radial vermell/groc";
Text[ finnish ] = "Steittinen 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 ] = "Rektangulr rtt/vitt";
Text[ polish ] = "Prostokt czerwony/biay";
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 ] = "Dikdrtgen krmz/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/biae";
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 ] = "Ellipsode gris bleu/bleu clair";
@@ -3486,14 +3605,15 @@ String RID_SVXSTR_GRDT8
Text[ swedish ] = "Ellipsoid blgr/ljusbl";
Text[ polish ] = "Elips. niebiesko-szary/jasnoniebieski";
Text[ portuguese_brazilian ] = "Ellipsoid blue gray/light blue";
- Text[ japanese ] = "ȉ~ DF/邢";
- 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/ak 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 ljusrtt/vitt";
Text[ polish ] = "Osiowy jasnoczerw./biay";
Text[ portuguese_brazilian ] = "Axial light red/white";
- Text[ japanese ] = " 邢/";
- Text[ korean ] = " /";
- Text[ chinese_simplified ] = " dz/";
- Text[ chinese_traditional ] = "bVL/զ";
+ Text[ japanese ] = "軸状 明るい赤/白";
+ Text[ korean ] = "축 밝은 적색/흰색";
+ Text[ chinese_simplified ] = "轴向 浅红/白";
+ Text[ chinese_traditional ] = "軸向淺紅色/白色";
Text[ arabic ] = " /";
Text[ turkish ] = "Eksen ak krmz/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, rozcignity";
Text[ portuguese_brazilian ] = "Black 45 Degrees Wide";
- Text[ japanese ] = " 45x 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 ] = " 45x";
- 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 ] = " -45x";
- 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 ] = " 90x";
- 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 degrs";
Text[ spanish ] = "Rojo red 45 grados";
Text[ italian ] = "Rosso a rete 45 gradi";
@@ -3698,14 +3823,15 @@ String RID_SVXSTR_HATCH4
Text[ swedish ] = "Rtt nt 45 grader";
Text[ polish ] = "Czerw. siatka 45 stopni";
Text[ portuguese_brazilian ] = "Red Crossed 45 Degrees";
- Text[ japanese ] = " 45x";
- 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 ] = "Krmz 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 ] = "Rtt nt 0 grader";
Text[ polish ] = "Czerw. siatka 0 stopni";
Text[ portuguese_brazilian ] = "Red Crossed 0 Degrees";
- Text[ japanese ] = " 0x";
- 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 ] = "Krmz 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 degrs";
Text[ spanish ] = "Azul red 45 grados";
Text[ italian ] = "Blu a rete 45 gradi";
@@ -3748,14 +3875,15 @@ String RID_SVXSTR_HATCH6
Text[ swedish ] = "Bltt nt 45 grader";
Text[ polish ] = "Nieb. siatka 45 stopni";
Text[ portuguese_brazilian ] = "Blue Crossed 45 Degrees";
- Text[ japanese ] = " 45x";
- 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 ] = "Bltt nt 0 grader";
Text[ polish ] = "Nieb. siatka 0 stopni";
Text[ portuguese_brazilian ] = "Blue Crossed 0 Degrees";
- Text[ japanese ] = " 0x";
- 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 degrs";
Text[ spanish ] = "Azul red triple 90 grados";
Text[ italian ] = "Blu tripla rete 90 gradi";
@@ -3798,14 +3927,15 @@ String RID_SVXSTR_HATCH8
Text[ swedish ] = "Bltt trippelnt 90 grader";
Text[ polish ] = "Nieb. potrjna siatka 90 stopni";
Text[ portuguese_brazilian ] = "Blue Triple 90 Degrees";
- Text[ japanese ] = " 3{ 90x";
- 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 ] = " 0x";
- 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 ] = "vu";
+ 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 ] = "Vaco";
+ 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 ] = "Gkyz";
- 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 ] = "Vrldsrymd";
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 ] = "Drber";
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 ] = "jz";
+ Text[ japanese ] = "白大理石";
+ Text[ korean ] = "대리석";
+ Text[ chinese_simplified ] = "大理石";
+ Text[ chinese_traditional ] = "大理石";
Text[ arabic ] = "";
Text[ turkish ] = "Mermer";
- Text[ catalan ] = "Mrmol";
+ 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 ] = "akl";
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 ] = "Cegy";
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 ] = "Tula";
- 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 ] = "Fltverk";
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 ] = "Hasr";
Text[ catalan ] = "Malla";
Text[ finnish ] = "Verkko";
+ Text[ thai ] = "ตาข่าย";
};
String RID_SVXSTR_BMP15
{
@@ -4368,14 +4515,15 @@ String RID_SVXSTR_BMP15
Text[ swedish ] = "Lv";
Text[ polish ] = "Licie";
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 grsmatta";
Text[ polish ] = "Sztuczny trawnik";
Text[ portuguese_brazilian ] = "Artificial Lawn";
- Text[ japanese ] = "lHŐ";
- Text[ korean ] = "ΰܵ";
- Text[ chinese_simplified ] = "ݵ";
- Text[ chinese_traditional ] = "Hya";
+ Text[ japanese ] = "人工芝生";
+ Text[ korean ] = "인공잔디";
+ Text[ chinese_simplified ] = "人造草地";
+ Text[ chinese_traditional ] = "人造草地";
Text[ arabic ] = " ";
Text[ turkish ] = "Yapay im";
- Text[ catalan ] = "Csped sinttico";
+ Text[ catalan ] = "Gespa artificial";
Text[ finnish ] = "Keinonurmi";
+ Text[ thai ] = "หญ้าเทียม";
};
String RID_SVXSTR_BMP17
{
@@ -4418,14 +4567,15 @@ String RID_SVXSTR_BMP17
Text[ swedish ] = "Tusensknor";
Text[ polish ] = "Kaczece";
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 ] = "Pivnkakkara";
+ Text[ thai ] = "เดซี่";
};
String RID_SVXSTR_BMP18
{
@@ -4443,14 +4593,15 @@ String RID_SVXSTR_BMP18
Text[ swedish ] = "Orange";
Text[ polish ] = "Pomaraczowy";
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 ] = "Fogs";
Text[ finnish ] = "Tulinen";
+ Text[ thai ] = "เพลิง";
};
String RID_SVXSTR_BMP20
{
@@ -4493,14 +4645,15 @@ String RID_SVXSTR_BMP20
Text[ swedish ] = "Rosor";
Text[ polish ] = "Re";
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 ] = "Gl";
- 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 elem";
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 ] = "WIu";
+ Text[ japanese ] = "極細の破線";
+ Text[ korean ] = "미세한 파선";
+ Text[ chinese_simplified ] = "超细划线";
+ Text[ chinese_traditional ] = "超細點劃線";
Text[ arabic ] = " ";
Text[ turkish ] = "ok ince kesik izgili";
- Text[ catalan ] = "Trazos ultrafinos";
+ Text[ catalan ] = "Traos 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 ] = "Iu";
+ Text[ japanese ] = "細かい破線";
+ Text[ korean ] = "섬세한 파선";
+ Text[ chinese_simplified ] = "细划线";
+ Text[ chinese_traditional ] = "細點劃線";
Text[ arabic ] = " ";
Text[ turkish ] = "nce kesik izgili";
- Text[ catalan ] = "Trazos finos";
+ Text[ catalan ] = "Traos fins";
Text[ finnish ] = "Ohut katkoviiva";
+ Text[ thai ] = "เส้นประบาง";
};
String RID_SVXSTR_DASH2
{
@@ -4652,7 +4808,7 @@ String RID_SVXSTR_DASH2
Text[ portuguese ] = "3 traos 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 ] = "ɍׂ̓_Oj";
- Text[ korean ] = "̼ 2 3 ";
- Text[ chinese_simplified ] = "ϸ23";
- Text[ chinese_traditional ] = "WӨITEu";
+ 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 traos";
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 pointille";
@@ -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 ] = "Trao 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 ] = "Iu";
+ 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 (varivel)";
- 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 ] = "Iu(i)";
+ Text[ japanese ] = "細かい破線(可変)";
+ Text[ korean ] = "섬세한 파선(가변)";
+ Text[ chinese_simplified ] = "细划线 (可变)";
+ Text[ chinese_traditional ] = "細點劃線(可變)";
Text[ arabic ] = " ()";
Text[ turkish ] = "nce kesik izgili (deiken)";
- Text[ catalan ] = "Trazos finos (variable)";
+ Text[ catalan ] = "Traos 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 traos 3 pontos (varivel)";
- 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 ] = "OjO_()";
- Text[ korean ] = "3 3 ()";
- Text[ chinese_simplified ] = "3 3 (ɱ)";
- Text[ chinese_traditional ] = "3 Eu 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 (deiken)";
- Text[ catalan ] = "3 trazos 3 puntos (variable)";
+ Text[ catalan ] = "3 traos 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 (varivel)";
- Text[ russian ] = " (.)";
+ Text[ russian ] = " ";
Text[ greek ] = " ()";
- Text[ dutch ] = "Ultrafijn gestippeld (variabel)";
+ Text[ dutch ] = "Extra fijn gestippeld (variabel)";
Text[ french ] = "Ultrafine pointille (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 ] = "WI(i)";
+ Text[ japanese ] = "極細の点線(可変)";
+ Text[ korean ] = "미세한 점선(가변)";
+ Text[ chinese_simplified ] = "超细点线 (可变)";
+ Text[ chinese_traditional ] = "超細點(可變)";
Text[ arabic ] = " ()";
Text[ turkish ] = "ok ince noktal (deiken)";
- 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 biimi 9";
- Text[ catalan ] = "Estilo de lnea 9";
+ Text[ catalan ] = "Estil de lnia 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 Eu";
+ 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 (varivel)";
- 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 ] = "Iu(i)";
+ Text[ japanese ] = "破線(可変)";
+ Text[ korean ] = "파선(가변)";
+ Text[ chinese_simplified ] = "划线 (可变)";
+ Text[ chinese_traditional ] = "點劃線(可變)";
Text[ arabic ] = " ()";
Text[ turkish ] = "Kesik izgili (deiken)";
- Text[ catalan ] = "Trazos (variable)";
+ Text[ catalan ] = "Traos (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 ] = "Traat";
+ Text[ finnish ] = "Katkoviiva";
+ Text[ thai ] = "เส้นประ";
};
///////////////////////////////////////////////////////////////////////////////
@@ -4969,7 +5135,7 @@ String RID_SVXSTR_LEND0
Text[ portuguese ] = "Seta cncava";
Text[ russian ] = " ";
Text[ greek ] = " ";
- Text[ dutch ] = "Pijl concave";
+ Text[ dutch ] = "Pijl concaaf";
Text[ french ] = "Flche concave";
Text[ spanish ] = "Flecha cncava";
Text[ italian ] = "Freccia concava";
@@ -4977,14 +5143,15 @@ String RID_SVXSTR_LEND0
Text[ swedish ] = "Pil konkav";
Text[ polish ] = "Strzaka wklsa";
Text[ portuguese_brazilian ] = "Arrow concave";
- Text[ japanese ] = "ڂ݂̖";
- Text[ korean ] = " ȭǥ";
- Text[ chinese_simplified ] = "μͷ";
- Text[ chinese_traditional ] = "bYW";
+ Text[ japanese ] = "中くぼみの矢印";
+ Text[ korean ] = "오목 화살표";
+ Text[ chinese_simplified ] = "凹形箭头";
+ Text[ chinese_traditional ] = "箭頭凹形";
Text[ arabic ] = " ";
Text[ turkish ] = "bkey ok";
- Text[ catalan ] = "Flecha cncava";
+ Text[ catalan ] = "Fletxa cncava";
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 ] = "^lp 45xX";
- 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 ] = "Flche troite";
@@ -5027,14 +5195,15 @@ String RID_SVXSTR_LEND2
Text[ swedish ] = "Smal pil";
Text[ polish ] = "Cienka strzaka";
Text[ portuguese_brazilian ] = "Small Arrow";
- Text[ japanese ] = "ׂ";
- Text[ korean ] = " ȭǥ";
- Text[ chinese_simplified ] = "ϸͷ";
- Text[ chinese_traditional ] = "ӤpbY";
+ 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 ] = "Extrmits de cotation";
- Text[ spanish ] = "Fines de dimensiones";
+ Text[ spanish ] = "Lneas de dimensiones";
Text[ italian ] = "Estremit quotatura";
Text[ danish ] = "Dimensioneringsstreger";
Text[ swedish ] = "Dimensioneringsndar";
Text[ polish ] = "Koce wymiarowania";
Text[ portuguese_brazilian ] = "Dimension Lines";
- Text[ japanese ] = "@̏I_";
- Text[ korean ] = "ġ";
- Text[ chinese_simplified ] = "ߴ";
- Text[ chinese_traditional ] = "wؤou";
+ Text[ japanese ] = "寸法線の終点";
+ Text[ korean ] = "치수선";
+ Text[ chinese_simplified ] = "定尺寸线条";
+ Text[ chinese_traditional ] = "定尺寸線條";
Text[ arabic ] = " ";
Text[ turkish ] = "Boyutlandrma 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 ] = "Podwjna strzaka";
Text[ portuguese_brazilian ] = "Double Arrow";
- Text[ japanese ] = "d";
- Text[ korean ] = " ȭǥ";
- Text[ chinese_simplified ] = "˫ͷ";
- Text[ chinese_traditional ] = "bY";
+ Text[ japanese ] = "二重矢印";
+ Text[ korean ] = "이중 화살표";
+ Text[ chinese_simplified ] = "双箭头";
+ Text[ chinese_traditional ] = "雙箭頭";
Text[ arabic ] = " ";
Text[ turkish ] = "ki ulu 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 ] = "Flche courte arrondie";
@@ -5102,14 +5273,15 @@ String RID_SVXSTR_LEND5
Text[ swedish ] = "Avrundad kort pil";
Text[ polish ] = "Zaokr. krtka strzaka";
Text[ portuguese_brazilian ] = "Rounded short Arrow";
- Text[ japanese ] = "̊ۂZ߂̖";
- Text[ korean ] = "ձ۸ ª ȭǥ";
- Text[ chinese_simplified ] = "Բζ̼ͷ";
- Text[ chinese_traditional ] = "εubY";
+ Text[ japanese ] = "先の丸い短かめの矢印";
+ Text[ korean ] = "둥글린 짧은 화살표";
+ Text[ chinese_simplified ] = "圆形短箭头";
+ Text[ chinese_traditional ] = "圓形短箭頭";
Text[ arabic ] = " ";
Text[ turkish ] = "Yuvarlatlm ksa ok";
- Text[ catalan ] = "Flecha corta redondeada";
+ Text[ catalan ] = "Fletxa curta arrodonida";
Text[ finnish ] = "Pyristetty lyhyt nuoli";
+ Text[ thai ] = "ลูกศรสั้นมน";
};
String RID_SVXSTR_LEND6
{
@@ -5127,14 +5299,15 @@ String RID_SVXSTR_LEND6
Text[ swedish ] = "Symmetrisk pil";
Text[ polish ] = "Symetryczna strzaka";
Text[ portuguese_brazilian ] = "Symmetric Arrow";
- Text[ japanese ] = "ݽ̂Ƃꂽ";
- Text[ korean ] = "Ī ȭǥ";
- Text[ chinese_simplified ] = "ԳƼͷ";
- Text[ chinese_traditional ] = "٦bY";
+ Text[ japanese ] = "バランスのとれた矢印";
+ Text[ korean ] = "대칭 화살표";
+ Text[ chinese_simplified ] = "对称箭头";
+ Text[ chinese_traditional ] = "對稱式箭頭";
Text[ arabic ] = " ";
Text[ turkish ] = "Simetrik ok";
- Text[ catalan ] = "Flecha simtrica";
+ Text[ catalan ] = "Fletxa simtrica";
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 flche";
- Text[ spanish ] = "Flecha lnea";
+ Text[ spanish ] = "Lnea de flecha";
Text[ italian ] = "Linea freccia";
Text[ danish ] = "Streg-pil";
Text[ swedish ] = "Linjepil";
Text[ polish ] = "Strzaka w postaci linii";
Text[ portuguese_brazilian ] = "Line Arrow";
- Text[ japanese ] = "̖";
- Text[ korean ] = " ȭǥ";
- Text[ chinese_simplified ] = "ͷ";
- Text[ chinese_traditional ] = "EubY";
+ Text[ japanese ] = "線状の矢印";
+ Text[ korean ] = "선 화살표";
+ Text[ chinese_simplified ] = "线条箭头";
+ Text[ chinese_traditional ] = "劃線箭頭";
Text[ arabic ] = " ";
Text[ turkish ] = "izgili ok";
- Text[ catalan ] = "Flecha lnea";
+ Text[ catalan ] = "Fletxa lnia";
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 ] = "Flche longue arrondie";
@@ -5177,14 +5351,15 @@ String RID_SVXSTR_LEND8
Text[ swedish ] = "Avrundad stor pil";
Text[ polish ] = "Zaokr. duga strzaka";
Text[ portuguese_brazilian ] = "Rounded large Arrow";
- Text[ japanese ] = "̊ۂ߂̖";
- Text[ korean ] = "ձ۸ ȭǥ";
- Text[ chinese_simplified ] = "Բγͷ";
- Text[ chinese_traditional ] = "ΤjbY";
+ Text[ japanese ] = "先の丸い長めの矢印";
+ Text[ korean ] = "둥글린 긴 화살표";
+ Text[ chinese_simplified ] = "圆形长箭头";
+ Text[ chinese_traditional ] = "圓形大箭頭";
Text[ arabic ] = " ";
Text[ turkish ] = "Yuvarlatlm uzun ok";
- Text[ catalan ] = "Flecha larga redondeada";
+ Text[ catalan ] = "Fletxa gran arrodonida";
Text[ finnish ] = "Pyristetty iso nuoli";
+ Text[ thai ] = "ลูกศรใหญ่มน";
};
String RID_SVXSTR_LEND9
{
@@ -5194,7 +5369,7 @@ String RID_SVXSTR_LEND9
Text[ portuguese ] = "Crculo";
Text[ russian ] = "";
Text[ greek ] = "";
- Text[ dutch ] = "Circle";
+ Text[ dutch ] = "Cirkel";
Text[ french ] = "Cercle";
Text[ spanish ] = "Crculo";
Text[ italian ] = "Cerchio";
@@ -5202,14 +5377,15 @@ String RID_SVXSTR_LEND9
Text[ swedish ] = "Cirkel";
Text[ polish ] = "Koo";
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 ] = "Crculo";
+ 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 ] = "^lp";
- 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 ] = "Strzaka";
Text[ portuguese_brazilian ] = "Arrow";
- Text[ japanese ] = "";
- Text[ korean ] = "ȭǥ";
- Text[ chinese_simplified ] = "ͷ";
- Text[ chinese_traditional ] = "bY";
+ 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 ] = "Transparncia";
- 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 ] = "Yzey saydaml";
- Text[ catalan ] = "Transparencia";
+ Text[ catalan ] = "Transparncia";
Text[ finnish ] = "Lpinkyvyys";
+ 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 ] = "Sisllytetn 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 ] = "(Deitir)";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "(Reemplazar)";
+ Text[ catalan ] = "(Reemplaa)";
+ Text[ thai ] = "(แทนที่)";
};
// RID_SVXDLG_SEARCH -----------------------------------------------------
@@ -161,7 +164,7 @@ ModelessDialog RID_SVXDLG_SEARCH
Text [ ENGLISH ] = "Search & Replace" ;
Text [ norwegian ] = "Sk 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 ] = "Sg 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 deitir";
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 ] = "~Etsittv" ;
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 reemplaa";
+ 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~mplaa amb";
+ Text[ catalan ] = "Reemplaa ~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 ~cae wyrazy";
+ Text[ polish ] = "Tylko cae sowa";
Text[ japanese ] = "単語として(~D)";
Text[ chinese_traditional ] = "僅是單詞(~D)";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = "전체 단어만(~D)";
+ Text[ korean ] = "단어 단위로(~D)";
Text[ turkish ] = "Yalnzca tam s~zck";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Solo pa~labras completas";
+ Text[ catalan ] = "Noms 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 sgning";
Text[ swedish ] = "Exakt skning";
- Text[ polish ] = "Uwzgldniaj wielk~o liter";
- Text[ portuguese_brazilian ] = "Coincidir ~maiscula/minscula";
+ Text[ polish ] = "Dokadne 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 ] = "~BYK/kk harf duyarl";
Text[ arabic ] = " ";
- Text[ catalan ] = "Coincidencia e~xacta";
+ Text[ catalan ] = "Coincidncia 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 trs" ;
+ Text [ portuguese_brazilian ] = "Para ?tr~s" ;
Text [ portuguese ] = "~Para trs" ;
Text [ finnish ] = "~Taaksepin" ;
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 ~seleco 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 biece 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 ] = "~Yalnzca seilen aralk iinde";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Solo e~n la seleccin";
+ Text[ catalan ] = "Noms 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 ] = "Expresses Re~gulares" ;
+ Text [ portuguese_brazilian ] = "Express es Re~gulares" ;
Text [ portuguese ] = "~Expresso regular" ;
Text [ finnish ] = "Snn~lliset lausekkeet" ;
Text [ danish ] = "Regulrt udtryk" ;
@@ -459,15 +469,16 @@ ModelessDialog RID_SVXDLG_SEARCH
TabStop = TRUE ;
Text[ chinese_simplified ] = "常规表达(~X)";
Text[ russian ] = " ";
- Text[ polish ] = "Wyra~enie regularne";
+ Text[ polish ] = "Wyraenie 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 ] = "Expresin 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 ] = "Sk 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 ] = "Etsittvt t~yylit" ;
Text [ danish ] = "Sg efter typogra~fier" ;
@@ -489,15 +500,16 @@ ModelessDialog RID_SVXDLG_SEARCH
TabStop = TRUE ;
Text[ chinese_simplified ] = "搜寻样式(~Y)";
Text[ russian ] = " ";
- Text[ polish ] = "Szukaj sty~lw";
+ Text[ polish ] = "Szu~kaj stylw";
Text[ japanese ] = "スタイルの検索(~Y)";
Text[ chinese_traditional ] = "搜尋樣式(~Y)";
Text[ arabic ] = " ";
Text[ greek ] = "A ";
- Text[ korean ] = "템플릿 찾기(~Y)";
+ Text[ korean ] = "스타일 찾기(~Y)";
Text[ language_user1 ] = " ";
Text[ turkish ] = "~Biim 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 ] = "Likhetsskning" ;
Text [ danish ] = "S~g lignende" ;
- Text [ portuguese_brazilian ] = "~Busca por semelhana" ;
+ Text [ portuguese_brazilian ] = "~?hnlichkeitssuche" ;
Text [ portuguese ] = "Pro~cura por semelhana" ;
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 ] = "Bsqueda 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 hnsyn till teckenbredd";
- Text[ polish ] = "Uwz~gldniaj szeroko znakw";
- Text[ portuguese_brazilian ] = "Largura do caracter";
+ Text[ polish ] = "Uwzgldnij szeroko znakw";
+ 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. skrivemde (Jap.)";
Text[ swedish ] = "Likn. skrivstt (japanska)";
- Text[ polish ] = "~Podobna pisownia (japoski)";
- Text[ portuguese_brazilian ] = "Ortografia semelhante (Japons)";
+ Text[ polish ] = "Podobna pisownia (japoski)";
+ 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 ] = "Ortografa similar (Japons)";
+ Text[ catalan ] = "Ortografia similar (Japons)";
Text[ finnish ] = "Samankuuloinen kuin (japani)";
+ Text[ thai ] = "เสียงเหมือน (ภาษาญี่ปุ่น)";
};
PushButton PB_JAP_OPTIONS
{
@@ -626,6 +641,7 @@ ModelessDialog RID_SVXDLG_SEARCH
Text[ korean ] = "옵션";
Text[ turkish ] = "Seenekler";
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~orml";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "~Frmulas";
+ Text[ catalan ] = "~Frmules";
+ Text[ thai ] = "สู~ตรคำนวณ";
};
RadioButton BTN_VALUES
{
@@ -677,7 +694,7 @@ ModelessDialog RID_SVXDLG_SEARCH
Hide = TRUE ;
Text[ chinese_simplified ] = "数值(~V)";
Text[ russian ] = "";
- Text[ polish ] = "wartociac~h";
+ Text[ polish ] = "wartoc~iach";
Text[ japanese ] = "値(~V)";
Text[ chinese_traditional ] = "數值(~V)";
Text[ arabic ] = "";
@@ -685,7 +702,8 @@ ModelessDialog RID_SVXDLG_SEARCH
Text[ korean ] = "값(~V)";
Text[ turkish ] = "~Deer";
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 ] = "~Anotaes" ;
+ Text [ portuguese_brazilian ] = "~Observa??s" ;
Text [ portuguese ] = "~Anotaes" ;
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 ] = "Baklacak 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 yn";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Direccin de bsqueda";
+ 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 ] = "Sk i alla tabeller" ;
Text [ danish ] = "Sg ~i alle tabeller" ;
Text [ italian ] = "~Cerca in tutte le tabelle" ;
@@ -875,8 +898,9 @@ ModelessDialog RID_SVXDLG_SEARCH
Text[ korean ] = "전체 시트에서 찾기";
Text[ turkish ] = "~Tm 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 ] = "Opes" ;
+ Text [ portuguese_brazilian ] = "Extras" ;
Text [ swedish ] = "Tillgg" ;
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 ] = "Narzdzia";
Text[ japanese ] = "その他";
Text[ chinese_traditional ] = "其它";
Text[ arabic ] = "";
Text[ greek ] = "";
- Text[ korean ] = "도구";
+ Text[ korean ] = "추가 옵션";
Text[ turkish ] = "Tablo seenekleri";
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 ] = "Sk ~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 ] = "Sg 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 ] = "Tmn 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 ] = "~Ske" ;
Text [ italian ] = "~Cerca" ;
- Text [ portuguese_brazilian ] = "~Localizar" ;
+ Text [ portuguese_brazilian ] = "~Buscar" ;
Text [ portuguese ] = "~Localizar" ;
Text [ finnish ] = "Ets~i" ;
Text [ danish ] = "~Sg" ;
@@ -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 ] = "Tmn dei~tir";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Reemplazar t~odo";
+ Text[ catalan ] = "Reemplaa-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 ] = "Dei~tir";
Text[ language_user1 ] = " ";
Text[ catalan ] = "~Reemplaa";
+ 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 ] = "~Wicej";
+ 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 ] = "~Dier seenekl.";
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~matsz";
- 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 ] = "Clulas Comple~tas" ;
+ Text [ portuguese_brazilian ] = "C?lulas Comple~tas" ;
Text [ portuguese ] = "S clulas com~pletas" ;
Text [ finnish ] = "Kaikki solut" ;
Text [ danish ] = "K~un hele rkker" ;
@@ -1204,7 +1238,7 @@ ModelessDialog RID_SVXDLG_SEARCH
Text [ english_us ] = "~Entire cells" ;
Text[ chinese_simplified ] = "只是整个单元格内容(~E)";
Text[ russian ] = " ";
- Text[ polish ] = "~Cae komrki";
+ Text[ polish ] = "Tylko cae komrki";
Text[ japanese ] = "セル全体(~E)";
Text[ chinese_traditional ] = "只是整個儲存格(~E)";
Text[ arabic ] = " ";
@@ -1212,7 +1246,8 @@ ModelessDialog RID_SVXDLG_SEARCH
Text[ greek ] = " ~ ";
Text[ korean ] = "전체 셀만(~E)";
Text[ turkish ] = "Yalnzca ~tam hcreler";
- Text[ catalan ] = "Solo cel~das completas";
+ Text[ catalan ] = "Noms cel.l~es completes";
+ Text[ thai ] = "~ทั้งเซลล์";
};
Text[ catalan ] = "Buscar y reemplazar";
};
@@ -1233,6 +1268,11 @@ 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 ] = "Ukad 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 Aralklar";
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 asitica";
- 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 ] = "Caractres 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(nTmpIsTable()?
-// 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 przezroczystoci";
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 przezroczystoci";
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 ] = "~Transparncia";
- 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 ] = "Yzey";
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 ta";
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 ] = "~Asl";
Text[ language_user1 ] = " ";
Text[ finnish ] = "~Alkuperinen";
@@ -1225,7 +1225,7 @@ TabPage RID_SVXPAGE_AREA
Text[ chinese_traditional ] = "相對(~L)";
Text[ arabic ] = "";
Text[ greek ] = "";
- Text[ korean ] = "상대적(~L)";
+ Text[ korean ] = "비례하여(~L)";
Text[ turkish ] = "Gre~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 ] = "Glge";
Text[ language_user1 ] = " ";
Text[ finnish ] = "Varjo";
@@ -1665,7 +1665,7 @@ TabPage RID_SVXPAGE_SHADOW
Text[ polish ] = "Waciwoci";
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 ] = "~grntle";
@@ -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 ] = "Wyrwnanie";
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 ] = "~Distncia";
- 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 ] = "Waciwoci";
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 ] = "~Deitir...";
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 ] = "Waciwoci";
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 ta";
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 ] = "Waciwoci";
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 kaydr";
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 kaydr";
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 ] = "~Deitir...";
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 ] = "Waciwoci";
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 ] = "~Deitir";
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 ] = "Glge";
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 lnia";
@@ -148,7 +148,7 @@ TabPage RID_SVXPAGE_LINE
Text[ chinese_traditional ] = "樣式(~S)";
Text[ arabic ] = "";
Text[ greek ] = "";
- Text[ korean ] = "유형(~S)";
+ Text[ korean ] = "스타일(~S)";
Text[ turkish ] = "Biim";
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 ] = "~Transparncia" ;
Text[ chinese_simplified ] = "透明(~T)";
- Text[ russian ] = "";
+ Text[ russian ] = "~";
Text[ polish ] = "Przeroczysto";
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 ular";
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 ] = "Biim";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Est~il";
@@ -524,7 +524,7 @@ TabPage RID_SVXPAGE_LINE
Text[ chinese_simplified ] = "线端同步化(~Z)";
Text[ russian ] = " ";
Text[ polish ] = "Synchronizuj koce";
- 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 ] = "Smbol";
@@ -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 smbol";
@@ -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 ] = "~Sincronizacin" ;
+ 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 ] = "Orantl";
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 ] = "Tanm";
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 lnea" ;
+ 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 biimleri";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Estils de lnia";
@@ -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 ] = "Deitir...";
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 biimlerini tanmla";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Defineix estils de lnia";
@@ -1690,10 +1690,10 @@ TabPage RID_SVXPAGE_LINEEND_DEF
Text [ portuguese ] = "Definir setas" ;
Text [ finnish ] = "Nuolenkrjet" ;
Text [ danish ] = "Definer piltype" ;
- Text [ french ] = "Dfinir extrmits" ;
+ Text [ french ] = "Dfinir les extrmits de lignes" ;
Text [ swedish ] = "Definiera linjeslut" ;
Text [ dutch ] = "Lijnuiteinden definiren" ;
- Text [ spanish ] = "Definir fin de lneas" ;
+ Text [ spanish ] = "Fines de lnea" ;
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 obtm novos estilos de setas" ;
Text [ french ] = "Ajoutez un objet slectionn pour obtenir de nouvelles extrmits de ligne." ;
Text [ dutch ] = "Een nieuw lijnuiteinde krijgt u door het toevoegen van een geselecteerd object." ;
- Text [ spanish ] = "Obtendr nuevos fines de lnea si aade un objeto seleccionado." ;
+ Text [ spanish ] = "Aada un objeto seleccionado para crear nuevos fines de lnea." ;
Text [ danish ] = "Du fr nye pile ved at tilfje et markeret objekt." ;
Text [ swedish ] = "Nya linjeslut fr du genom att lgga till ett markerat objekt." ;
Text [ finnish ] = "Luo uusia nuolityylej lismll valittu objekti." ;
@@ -1751,7 +1751,7 @@ TabPage RID_SVXPAGE_LINEEND_DEF
Text[ chinese_traditional ] = "您能夠透過新增選擇一個物件的方式來新建一個線條箭頭。";
Text[ arabic ] = " ";
Text[ greek ] = " '' , ";
- Text[ korean ] = "선택된 개체를 추가하여 새로운 선 끝을 만듭니다";
+ Text[ korean ] = "새로운 화살표 스타일을 만들려면 선택된 개체를 추가하십시오.";
Text[ turkish ] = "Seilen bir nesneyi ekleyerek yeni izgi ular 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 ] = "Deitir";
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 ularn tanmla";
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 biimleri";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Estils de lnia";
@@ -2129,7 +2129,7 @@ TabDialog RID_SVXDLG_LINE
Text [ french ] = "Extrmits de ligne" ;
Text [ swedish ] = "Linjeslut" ;
Text [ dutch ] = "Lijnuiteinden" ;
- Text [ spanish ] = "Fin de lnea" ;
+ Text [ spanish ] = "Fines de lnea" ;
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 ular";
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 ] = "Posio" ;
Text [ portuguese ] = "Posio" ;
Text [ finnish ] = "Sijainti" ;
- Text [ danish ] = "Placering" ;
+ Text [ danish ] = "~Placering" ;
Text [ french ] = "Position" ;
Text [ swedish ] = "~Position" ;
Text [ dutch ] = "~Positie" ;
Text [ spanish ] = "Posicin" ;
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 ] = "Posicin";
+ 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 ] = "~Vnster" ;
@@ -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 ] = "Hjre" ;
+ Text [ danish ] = "H~jre" ;
Text [ french ] = " droite" ;
Text [ swedish ] = "Hge~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 ] = "Caractres" ;
Text [ swedish ] = "T~ecken" ;
Text [ dutch ] = "T~eken" ;
Text [ spanish ] = "~Carcter" ;
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 ] = "~Carcter";
+ Text[ catalan ] = "~Carcter";
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 ] = "Caractres" ;
Text [ swedish ] = "Tec~ken" ;
Text [ dutch ] = "~Teken" ;
Text [ spanish ] = "C~arcter" ;
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~arcter";
+ Text[ catalan ] = "C~arcter";
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 ] = "Carcter de relleno";
+ Text[ catalan ] = "Carcter 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 ] = "~Tmn 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 ] = "Vnster/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 ] = "Hger/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 ] = "Animacin de texto" ;
+ Text [ spanish ] = "Animacin" ;
Text [ french ] = "Animation de texte" ;
Text [ swedish ] = "Textanimation" ;
Text [ danish ] = "Tekstanimation" ;
Text [ portuguese ] = "Animao de texto" ;
- Text [ portuguese_brazilian ] = "Animao 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 canlandrma";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Animacin 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 animao 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 atravs" ; 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 sisn" ; 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 ] = "Orientacin";
+ Text[ spanish ] = "Direccin";
Text[ finnish ] = "Suunta";
Text[ italian ] = "Direzione";
Text[ danish ] = "Retning";
Text[ swedish ] = "Riktning";
- Text[ polish ] = "Kierunek";
- Text[ portuguese_brazilian ] = "Direo";
+ 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 ] = "Ylreunaan";
+ 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 ] = "Waciwoci";
- 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 visvel ao ~iniciar" ;
- Text [ portuguese_brazilian ] = "Texto visvel ao ~iniciar" ;
+ Text [ portuguese_brazilian ] = "Text sichtbar beim ~Starten" ;
Text[ chinese_simplified ] = "在启动时显示文字(~T)";
Text[ russian ] = " ";
- Text[ polish ] = "~Tekst widoczny przy rozpoczciu";
+ Text[ polish ] = "Tekst widoczny przy rozpoczciu";
Text[ japanese ] = "開始時にテキストが見える(~T)";
Text[ chinese_traditional ] = "在啟動時顯示文字(~T)";
Text[ greek ] = " ~";
@@ -588,8 +604,9 @@ TabPage RID_SVXPAGE_TEXTANIMATION
Text[ arabic ] = " ";
Text[ turkish ] = "Metni, canlandrma balarken ~grntle";
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 visvel ao ~finalizar" ;
- Text [ portuguese_brazilian ] = "Texto vsivel ao ~sair" ;
+ Text [ portuguese_brazilian ] = "Text sichtbar beim ~Beenden" ;
Text[ chinese_simplified ] = "在结束时显示文字";
Text[ russian ] = " ~ ";
- Text[ polish ] = "Tekst widoczny przy koczeniu";
+ Text[ polish ] = "Tekst widoczny przy zakoczeniu";
Text[ japanese ] = "終了時にテキストが見える";
Text[ chinese_traditional ] = "在結束時顯示文字";
Text[ greek ] = " ";
@@ -618,8 +635,9 @@ TabPage RID_SVXPAGE_TEXTANIMATION
Text[ arabic ] = " ";
Text[ turkish ] = "Metni, canlandrma bittiinde g~rntle";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Texto visible al ~finalizar";
+ Text[ catalan ] = "Text visible al ~finaltizar";
Text[ finnish ] = "Teksti nkyviss 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 animao" ;
+ Text [ portuguese_brazilian ] = "Anzahl" ;
Text [ portuguese ] = "Ciclos de animao" ;
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 says";
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 ] = "Endels" ;
Text [ portuguese ] = "~Contnuo" ;
- Text [ portuguese_brazilian ] = "~Contnuo" ;
+ Text [ portuguese_brazilian ] = "~Endlos" ;
Text[ chinese_simplified ] = "不间断(~C)";
Text[ russian ] = "";
- Text[ polish ] = "~Cigy";
+ Text[ polish ] = "Bez koca";
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 ] = "Steglngd" ;
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 ] = "Adm";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Importncia";
+ Text[ catalan ] = "Increment";
Text[ finnish ] = "Lisys";
+ 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 ] = "Frdrjning" ;
Text [ danish ] = "Trinforsinkelse" ;
- Text [ portuguese_brazilian ] = "Atraso" ;
+ Text [ portuguese_brazilian ] = "Verzgerung" ;
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 ] = "~Automtico" ;
+ 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 ] = "~Automtic";
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 ] = "~Genilii metne gre 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 hj~d till text" ;
- Text [ danish ] = "Tilpas hjde til tekst" ;
+ Text [ danish ] = "Tilpas hj~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 ] = "~Ykseklii metne gre ayarla";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "~Ajustar altura al texto";
+ Text[ catalan ] = "~Ajusta a l'alada 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 ~ereveye 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 ] = "~Sd 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 ] = "Avstnd till ram" ;
- Text [ danish ] = "Afstand fra rammen" ;
+ Text [ danish ] = "Afstand fra ramme" ;
Text [ portuguese_brazilian ] = "Abstand vom Rahmen" ;
Text [ portuguese ] = "Espao at moldura" ;
- Text[ chinese_simplified ] = "߿ľ";
- Text[ russian ] = " ";
+ Text[ chinese_simplified ] = "至边框的距离";
+ Text[ russian ] = " ";
Text[ polish ] = "Odlego 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 ] = "ereveye uzaklk";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Distancia al marco";
- Text[ finnish ] = "Spacing to borders";
+ Text[ catalan ] = "Distncia al marc";
+ Text[ finnish ] = "Vli 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 ] = "~Vnster" ;
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 ] = "~Hger" ;
+ Text [ swedish ] = "Hg~er" ;
Text [ danish ] = "Hjre" ;
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 ] = "Vk(~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 grze";
- Text[ japanese ] = "(~T)";
- Text[ chinese_traditional ] = "VW(~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 ] = "~Ylosa";
+ Text[ catalan ] = "Part ~superior";
+ Text[ finnish ] = "~Ylreuna";
+ 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 ] = "VU(~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 ] = "rw";
+ 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 ] = "Caa 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 geniliine gre ayarla";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Todo el a~ncho";
+ Text[ catalan ] = "Toda l'a~mplada";
Text[ finnish ] = "~Tysi 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 ] = "dM(~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 ] = "Jzyk...";
- 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 ] = "Sowo";
- 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 ] = "~Szck";
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 ] = "tq(~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~nnimo" ;
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 ] = "Pq(~N)";
+ Text[ japanese ] = "類義語(~N)";
+ Text[ chinese_traditional ] = "同義詞(~N)";
Text[ arabic ] = "";
Text[ greek ] = "~";
- Text[ korean ] = "Ǿ(~N)";
+ Text[ korean ] = "동의어(~N)";
Text[ turkish ] = "~Eanlaml";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Si~nnimo";
+ Text[ catalan ] = "Si~nnim";
+ 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 ] = "~Erstt" ;
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 ] = "~Deitir";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "~Reemplazar";
+ Text[ catalan ] = "~Reemplaa";
+ 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 ] = "tr";
+ 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 sinnimos" ;
+ Text [ spanish ] = "La palabra no figura en el diccionario de sinnimos." ;
Text [ english_us ] = "Word not found in thesaurus" ;
- Text[ chinese_simplified ] = "ִû¼ڴʵ";
- Text[ russian ] = " ";
+ Text[ chinese_simplified ] = "字词没有收录在同义词词典内";
+ Text[ russian ] = " ";
Text[ polish ] = "Sowa nie ma w Tezaurusie";
- Text[ japanese ] = "ދ`ꎫTɂȂPł";
- Text[ chinese_traditional ] = "rSb夺";
+ Text[ japanese ] = "類義語辞典にない単語です";
+ Text[ chinese_traditional ] = "字詞沒有收錄在同義詞詞典內";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = "Ǿ ܾ";
+ Text[ korean ] = "동의어 사전에 없는 단어임";
Text[ turkish ] = "Szck, szlkte bulunamad";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Palabra no figura en el dic. de sinnimos";
+ 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 ] = "Eanlamllar szl";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Diccionario de sinnimos";
+ 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 ] = "Seleco" ;
- Text[ chinese_simplified ] = "ѡ";
+ Text[ chinese_simplified ] = "选择";
Text[ russian ] = "";
Text[ polish ] = "Wybr";
- Text[ japanese ] = "I";
- Text[ chinese_traditional ] = "";
+ Text[ japanese ] = "選択";
+ Text[ chinese_traditional ] = "選取";
Text[ arabic ] = "";
Text[ greek ] = "";
- Text[ korean ] = "";
+ Text[ korean ] = "선택";
Text[ turkish ] = "Seim";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Seleccin";
+ 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 jzyk";
- Text[ japanese ] = "̑I";
- Text[ chinese_traditional ] = "ܻy";
+ Text[ japanese ] = "言語の選択";
+ Text[ chinese_traditional ] = "選擇語言";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = " ";
+ Text[ korean ] = "언어 선택";
Text[ turkish ] = "Dil seimi";
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 ] = "Posicin";
+ 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 ] = "Posicin ~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 ] = "Posicin ~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 ] = "Tamao";
- 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 ] = "~Genilik";
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 ] = "~Eitle";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "~Igualar";
+ Text[ catalan ] = "~Iguala";
Text[ finnish ] = "~Silyt 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 ] = "Genilii, metne gre 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 ] = "Ykseklii, metne gre 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 ] = "Frankring" ;
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 prrafo" ; > ;
- < "Como carcter" ; > ;
+ < "Al par??graf" ; > ;
+ < "Com a car??cter" ; > ;
< "A la pgina" ; > ;
- < "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" ; > ;
- < "Carcter arriba" ; > ;
- < "Carcter centrado" ; > ;
- < "Carcter abajo" ; > ;
- < "Lnea superior" ; > ;
- < "Lnea centrada" ; > ;
- < "Lnea 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 rotao" ;
- 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 rotacin" ;
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 rotacin";
+ 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 ] = "Posicin ~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 ] = "Posicin ~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 ] = "Predefinies";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ greek ] = "Presets";
Text[ dutch ] = "Standaardinstellingen";
Text[ french ] = "Dfinitions";
- Text[ spanish ] = "Predeterminaciones";
- Text[ finnish ] = "Esiasetukset";
+ Text[ spanish ] = "Configuracin predeterminada";
+ Text[ finnish ] = "Oletusasetukset";
Text[ italian ] = "Preimpostazioni";
- Text[ danish ] = "Presets";
+ Text[ danish ] = "Forudindstillinger";
Text[ swedish ] = "Frinstllningar";
Text[ polish ] = "Ustawienia domylne";
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 rotacin";
+ QuickHelpText[ catalan ] = "Punt de rotaci";
QuickHelpText[ finnish ] = "Kiertopiste";
QuickHelpText[ thai ] = "Rotation point";
};
@@ -1488,7 +1488,7 @@ TabPage RID_SVXPAGE_ANGLE
Text [ spanish ] = "ngulo de rotacin" ;
Text [ english_us ] = "Rotation angle" ;
Text[ chinese_simplified ] = "旋转角度";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ polish ] = "Kt obrotowy";
Text[ japanese ] = "回転度";
Text[ chinese_traditional ] = "旋轉角度";
@@ -1497,7 +1497,7 @@ TabPage RID_SVXPAGE_ANGLE
Text[ korean ] = "회전각";
Text[ turkish ] = "Dn as";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "ngulo de rotacin";
+ 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 ] = "Predefinies";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ greek ] = "Presets";
Text[ dutch ] = "Standaardinstellingen";
Text[ french ] = "Dfinitions";
- Text[ spanish ] = "Predeterminaciones";
- Text[ finnish ] = "Esiasetukset";
+ Text[ spanish ] = "Configuracin predeterminada";
+ Text[ finnish ] = "Oletusasetukset";
Text[ italian ] = "Preimpostazioni";
- Text[ danish ] = "Presets";
+ Text[ danish ] = "Forudindstillinger";
Text[ swedish ] = "Frinstllningar";
Text[ polish ] = "Ustawienia domylne";
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 ] = "Inclinacin/Radio de ngulo" ;
Text [ french ] = "Inclinaison / rayon d'angle" ;
- Text [ dutch ] = "Schuintrekken / hoekafronding" ;
+ Text [ dutch ] = "Schuintrekken / hoekradius" ;
Text [ swedish ] = "Snedstll/hrnradie" ;
Text [ danish ] = "Hldning / hjrneradius" ;
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 ] = "Ke ap";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Radio de ngulo";
+ Text[ catalan ] = "Radi d'angle";
Text[ finnish ] = "Kulmasde";
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 ] = "~Sde";
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 eimi";
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 naronika";
Text[ japanese ] = "傾斜角度/角の半径";
Text[ chinese_traditional ] = "傾斜/角度";
@@ -1840,7 +1840,7 @@ TabPage RID_SVXPAGE_SLANT
Text[ korean ] = "기울기 / 모서리 각도";
Text[ turkish ] = "Duru eimi / Ke ap";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Inclinacin/Radio de ngulo";
+ Text[ catalan ] = "Inclinaci/Radi d'angle";
Text[ finnish ] = "Kallistus- ja kulmasde";
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 ] = "Posicin y tamao";
- Text[ thai ] = "Position and Size";
+ Text[ thai ] = "ตำแหน่งและขนาด";
};
PageItem
{
@@ -1928,7 +1928,7 @@ TabDialog RID_SVXDLG_TRANSFORM
Text[ korean ] = "회전";
Text[ turkish ] = "Dn";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Rotacin";
+ Text[ catalan ] = "Gir";
Text[ thai ] = "หมุน";
};
PageItem
@@ -1941,13 +1941,13 @@ TabDialog RID_SVXDLG_TRANSFORM
Text [ italian ] = "Inclina / raggio d'angolo" ;
Text [ spanish ] = "Inclinacin/Radio de ngulo" ;
Text [ french ] = "Inclinaison / rayon d'angle" ;
- Text [ dutch ] = "Schuintrekken/hoekafronding" ;
+ Text [ dutch ] = "Schuintrekken/hoekradius" ;
Text [ swedish ] = "Snedstll/hrnradie" ;
Text [ danish ] = "Hldning / hjrneradius" ;
Text [ portuguese_brazilian ] = "Schr?gstellen / Eckenradius" ;
Text [ portuguese ] = "Inclinar / Raio do ngulo" ;
Text[ chinese_simplified ] = "倾斜和角半径";
- Text[ russian ] = " / ";
+ Text[ russian ] = " ";
Text[ polish ] = "Pochyl / Promie naronika";
Text[ japanese ] = "傾斜角度/角の半径";
Text[ chinese_traditional ] = "傾斜/角度";
@@ -1956,23 +1956,23 @@ TabDialog RID_SVXDLG_TRANSFORM
Text[ korean ] = "기울기 / 모서리 각도";
Text[ turkish ] = "Duru eimi / Ke ap";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Inclinacin/Radio de ngulo";
+ Text[ catalan ] = "Inclinaci/Radi d'angle";
Text[ finnish ] = "Kallistus- ja kulmasde";
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 ] = "Posicin y tamao";
+ 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 ; > ;
-// < "Hebrisch (ISO-8859-8)" ; RTL_TEXTENCODING_ISO_8859_8 ; > ;
+ < "Hebrisch (ISO-8859-8)" ; RTL_TEXTENCODING_ISO_8859_8 ; > ;
< "Trkisch (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 ; > ;
< "Trkisch (DOS/OS2-857)" ; RTL_TEXTENCODING_IBM_857 ; > ;
-// < "Hebrisch (DOS/OS2-862)" ; RTL_TEXTENCODING_IBM_862 ; > ;
-// < "Arabisch (DOS/OS2-864)" ; RTL_TEXTENCODING_IBM_864 ; > ;
+ < "Hebrisch (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 ; > ;
< "Trkisch (Windows-1254)" ; RTL_TEXTENCODING_MS_1254 ; > ;
-// < "Hebrisch (Windows-1255)" ; RTL_TEXTENCODING_MS_1255 ; > ;
-// < "Arabisch (Windows-1256)" ; RTL_TEXTENCODING_MS_1256 ; > ;
+ < "Hebrisch (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 ; > ;
+ < "Cirlico (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 ] =
{
- < "Lnsieurooppalainen (Windows-1252/WinLatin 1)" ; RTL_TEXTENCODING_MS_1252 ; > ;
- < "Lnsieurooppalainen (Apple Macintosh)" ; RTL_TEXTENCODING_APPLE_ROMAN ; > ;
- < "Lnsieurooppalainen (DOS/OS2-850/kansainvlinen)" ; RTL_TEXTENCODING_IBM_850 ; > ;
- < "Lnsieurooppalainen (DOS/OS2-437/US)" ; RTL_TEXTENCODING_IBM_437 ; > ;
- < "Lnsieurooppalainen (DOS/OS2-860/portugali)" ; RTL_TEXTENCODING_IBM_860 ; > ;
- < "Lnsieurooppalainen (DOS/OS2-861/islanti)" ; RTL_TEXTENCODING_IBM_861 ; > ;
- < "Lnsieurooppalainen (DOS/OS2-863/ranska (Kanada))" ; RTL_TEXTENCODING_IBM_863 ; > ;
- < "Lnsieurooppalainen (DOS/OS2-865/pohjoismaat)" ; RTL_TEXTENCODING_IBM_865 ; > ;
- < "Lnsieurooppalainen (ASCII/US)" ; RTL_TEXTENCODING_ASCII_US ; > ;
- < "Lnsieurooppalainen (ISO-8859-1)" ; RTL_TEXTENCODING_ISO_8859_1 ; > ;
- < "Iteurooppalainen (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 ; > ;
+ < "Lnsi-Eurooppa (Windows-1252/WinLatin 1)" ; RTL_TEXTENCODING_MS_1252 ; > ;
+ < "Lnsi-Eurooppa (Apple Macintosh)" ; RTL_TEXTENCODING_APPLE_ROMAN ; > ;
+ < "Lnsi-Eurooppa (DOS/OS2-850/kansainvlinen)" ; RTL_TEXTENCODING_IBM_850 ; > ;
+ < "Lnsi-Eurooppa (DOS/OS2-437/US)" ; RTL_TEXTENCODING_IBM_437 ; > ;
+ < "Lnsi-Eurooppa (DOS/OS2-860/portugali)" ; RTL_TEXTENCODING_IBM_860 ; > ;
+ < "Lnsi-Eurooppa (DOS/OS2-861/islanti)" ; RTL_TEXTENCODING_IBM_861 ; > ;
+ < "Lnsi-Eurooppa (DOS/OS2-863/ranska (Kanada))" ; RTL_TEXTENCODING_IBM_863 ; > ;
+ < "Lnsi-Eurooppa (DOS/OS2-865/pohjoismainen)" ; RTL_TEXTENCODING_IBM_865 ; > ;
+ < "Lnsi-Eurooppa (ASCII/US)" ; RTL_TEXTENCODING_ASCII_US ; > ;
+ < "Lnsi-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 ; > ;
- < "Lnsieurooppalainen (ISO-8859-14)" ; RTL_TEXTENCODING_ISO_8859_14 ; > ;
- < "Lnsieurooppalainen (ISO-8859-15/EURO)" ; RTL_TEXTENCODING_ISO_8859_15 ; > ;
+ < "Lnsi-Eurooppa (ISO-8859-14)" ; RTL_TEXTENCODING_ISO_8859_14 ; > ;
+ < "Lnsi-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 ; > ;
- < "Iteurooppalainen (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/venjlinen)" ; RTL_TEXTENCODING_IBM_866 ; > ;
- < "Kreikkalainen (DOS/OS2-869/moderni)" ; RTL_TEXTENCODING_IBM_869 ; > ;
- < "Iteurooppalainen (Windows-1250/WinLatin 2)" ; RTL_TEXTENCODING_MS_1250 ; > ;
- < "Kyrilinen (Windows-1251)" ; RTL_TEXTENCODING_MS_1251 ; > ;
+ < "Kyrillinen (DOS/OS2-866/venj)" ; 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 ; > ;
- < "Iteurooppalainen (Apple Macintosh)" ; RTL_TEXTENCODING_APPLE_CENTEURO ; > ;
- < "Iteurooppalainen (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 ; > ;
- < "Lnsieurooppalainen (Apple Macintosh/islantilainen)" ; RTL_TEXTENCODING_APPLE_ICELAND ; > ;
- < "Iteurooppalainen (Apple Macintosh/romanialainen)" ; RTL_TEXTENCODING_APPLE_ROMANIAN ; > ;
+ < "Lnsieurooppa (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 ; > ;
- < "Iteurooppalainen (ISO-8859-10)" ; RTL_TEXTENCODING_ISO_2022_JP ; > ;
- < "Iteurooppalainen (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 ; > ;
- < "Iteurooppalainen (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/Islndisch)" ; RTL_TEXTENCODING_IBM_861 ; > ;
- < "Westeuropa (DOS/OS2-863/Franzsisch (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 ; > ;
- < "Trkisch (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 ; > ;
- < "Trkisch (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 ; > ;
- < "Trkisch (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/Islndisch)" ; RTL_TEXTENCODING_APPLE_ICELAND ; > ;
- < "Osteuropa (Apple Macintosh/Rumnisch)" ; RTL_TEXTENCODING_APPLE_ROMANIAN ; > ;
- < "Trkisch (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 ; > ;
+ < "Grsk (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 ; > ;
+ < "Grsk (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 ; > ;
+ < "Grsk (DOS/OS2-869/Moderne)" ; RTL_TEXTENCODING_IBM_869 ; > ;
+ < "steuropa (Windows-1250/WinLatin 2)" ; RTL_TEXTENCODING_MS_1250 ; > ;
+ < "Kyrillisk (Windows-1251)" ; RTL_TEXTENCODING_MS_1251 ; > ;
+ < "Grsk (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 ; > ;
+ < "Grsk (Apple Macintosh)" ; RTL_TEXTENCODING_APPLE_GREEK ; > ;
+ < "Vesteuropa (Apple Macintosh/Islandsk)" ; RTL_TEXTENCODING_APPLE_ICELAND ; > ;
+ < "steuropa (Apple Macintosh/Rumnsk)" ; 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/Portugus)" ; RTL_TEXTENCODING_IBM_860 ; > ;
- < "Europa occidental (DOS/OS2-861/Islands)" ; RTL_TEXTENCODING_IBM_861 ; > ;
- < "Europa occidental (DOS/OS2-863/Francs(Cand.))" ; RTL_TEXTENCODING_IBM_863 ; > ;
- < "Europa occidental (DOS/OS2-865/Nrdico)" ; 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 ; > ;
- < "Latn 3 (ISO-8859-3)" ; RTL_TEXTENCODING_ISO_8859_3 ; > ;
- < "Bltico (ISO-8859-4)" ; RTL_TEXTENCODING_ISO_8859_4 ; > ;
- < "Cirlico (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 ; > ;
+ < "Bltic (ISO-8859-4)" ; RTL_TEXTENCODING_ISO_8859_4 ; > ;
+ < "Cirl.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 ; > ;
- < "Bltico (DOS/OS2-775)" ; RTL_TEXTENCODING_IBM_775 ; > ;
+ < "Grec (DOS/OS2-737)" ; RTL_TEXTENCODING_IBM_737 ; > ;
+ < "Bltic (DOS/OS2-775)" ; RTL_TEXTENCODING_IBM_775 ; > ;
< "Europa oriental (DOS/OS2-852)" ; RTL_TEXTENCODING_IBM_852 ; > ;
- < "Cirlico (DOS/OS2-855)" ; RTL_TEXTENCODING_IBM_855 ; > ;
- < "Turco (DOS/OS2-857)" ; RTL_TEXTENCODING_IBM_857 ; > ;
- < "Cirlico (DOS/OS2-866/Ruso)" ; RTL_TEXTENCODING_IBM_866 ; > ;
- < "Griego (DOS/OS2-869/Moderno)" ; RTL_TEXTENCODING_IBM_869 ; > ;
+ < "Cirl.lic (DOS/OS2-855)" ; RTL_TEXTENCODING_IBM_855 ; > ;
+ < "Turc (DOS/OS2-857)" ; RTL_TEXTENCODING_IBM_857 ; > ;
+ < "Cirl.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 ; > ;
- < "Cirlico (Windows-1251)" ; RTL_TEXTENCODING_MS_1251 ; > ;
- < "Griego (Windows-1253)" ; RTL_TEXTENCODING_MS_1253 ; > ;
- < "Turco (Windows-1254)" ; RTL_TEXTENCODING_MS_1254 ; > ;
- < "Bltico (Windows-1257)" ; RTL_TEXTENCODING_MS_1257 ; > ;
+ < "Cirl.lic (Windows-1251)" ; RTL_TEXTENCODING_MS_1251 ; > ;
+ < "Grec (Windows-1253)" ; RTL_TEXTENCODING_MS_1253 ; > ;
+ < "Turc (Windows-1254)" ; RTL_TEXTENCODING_MS_1254 ; > ;
+ < "Bltic (Windows-1257)" ; RTL_TEXTENCODING_MS_1257 ; > ;
< "Europa oriental (Apple Macintosh)" ; RTL_TEXTENCODING_APPLE_CENTEURO ; > ;
- < "Europa oriental (Apple Macintosh/Croata)" ; RTL_TEXTENCODING_APPLE_CROATIAN ; > ;
- < "Cirlico (Apple Macintosh)" ; RTL_TEXTENCODING_APPLE_CYRILLIC ; > ;
- < "Griego (Apple Macintosh)" ; RTL_TEXTENCODING_APPLE_GREEK ; > ;
- < "Europa occidental (Apple Macintosh/Islands)" ; RTL_TEXTENCODING_APPLE_ICELAND ; > ;
- < "Europa oriental (Apple Macintosh/Rumano)" ; RTL_TEXTENCODING_APPLE_ROMANIAN ; > ;
- < "Turco (Apple Macintosh)" ; RTL_TEXTENCODING_APPLE_TURKISH ; > ;
- < "Cirlico (Apple Macintosh/Ucraniano)" ; RTL_TEXTENCODING_APPLE_UKRAINIAN ; > ;
- < "Chino simplificado (Apple Macintosh)" ; RTL_TEXTENCODING_APPLE_CHINSIMP ; > ;
- < "Chino tradicional (Apple Macintosh)" ; RTL_TEXTENCODING_APPLE_CHINTRAD ; > ;
- < "Japons (Apple Macintosh)" ; RTL_TEXTENCODING_APPLE_JAPANESE ; > ;
- < "Coreano (Apple Macintosh)" ; RTL_TEXTENCODING_APPLE_KOREAN ; > ;
- < "Japons (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 ; > ;
- < "Japons (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 ; > ;
- < "Japons (EUC-JP)" ; RTL_TEXTENCODING_BIG5 ; > ;
- < "Chino simplificado (EUC-CN)" ; RTL_TEXTENCODING_BIG5_HKSCS ; > ;
- < "Cirlico (KOI8-R)" ; RTL_TEXTENCODING_EUC_JP ; > ;
+ < "Europa oriental (Apple Macintosh/Kroatian)" ; RTL_TEXTENCODING_APPLE_CROATIAN ; > ;
+ < "Cirl.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 ; > ;
+ < "Cirl.lic (Apple Macintosh/Ucraniano)" ; RTL_TEXTENCODING_APPLE_UKRAINIAN ; > ;
+ < "Xins simplificat (Apple Macintosh)" ; RTL_TEXTENCODING_APPLE_CHINSIMP ; > ;
+ < "Xins tradicional (Apple Macintosh)" ; RTL_TEXTENCODING_APPLE_CHINTRAD ; > ;
+ < "Japons (Apple Macintosh)" ; RTL_TEXTENCODING_APPLE_JAPANESE ; > ;
+ < "Core (Apple Macintosh)" ; RTL_TEXTENCODING_APPLE_KOREAN ; > ;
+ < "Japons (Windows-932)" ; RTL_TEXTENCODING_MS_932 ; > ;
+ < "Xins simplificat (Windows-936)" ; RTL_TEXTENCODING_MS_936 ; > ;
+ < "Core (Windows-949)" ; RTL_TEXTENCODING_MS_949 ; > ;
+ < "Xins tradicional (Windows-950)" ; RTL_TEXTENCODING_MS_950 ; > ;
+ < "Japons (Shift-JIS)" ; RTL_TEXTENCODING_SHIFT_JIS ; > ;
+ < "Xins simplificat (GB-2312)" ; RTL_TEXTENCODING_GB_2312 ; > ;
+ < "Xins tradicional (GBT-12345)" ; RTL_TEXTENCODING_GB_18030 ; > ;
+ < "Xins simplificat (GBK/GB-2312-80)" ; RTL_TEXTENCODING_GBT_12345 ; > ;
+ < "Xins tradicional (BIG5)" ; RTL_TEXTENCODING_GBK ; > ;
+ < "Japons (EUC-JP)" ; RTL_TEXTENCODING_BIG5 ; > ;
+ < "Xins simplificat (EUC-CN)" ; RTL_TEXTENCODING_BIG5_HKSCS ; > ;
+ < "Cirl.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 ] = "~Pgina inteira" ;
Text [ finnish ] = "~Koko sivu" ;
Text [ danish ] = "Hele siden" ;
- Text [ french ] = "~Page entire" ;
+ Text [ french ] = "Page entire" ;
Text [ swedish ] = "Hela sidan" ;
- Text [ dutch ] = "~Hele pagina" ;
+ Text [ dutch ] = "H~ele pagina" ;
Text [ spanish ] = "~Toda la pgina" ;
Text [ english_us ] = "~Entire Page" ;
- Text[ chinese_simplified ] = "ȫҳ(~E)";
+ Text[ chinese_simplified ] = "整页(~E)";
Text[ russian ] = " ";
Text[ polish ] = "Caa 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 pgina";
+ Text[ catalan ] = "~Tota la pgina";
+ Text[ thai ] = "~ทั้งหน้า";
};
RadioButton BTN_PAGE_WIDTH
{
@@ -118,17 +119,18 @@ ModalDialog RID_SVXDLG_ZOOM
Text [ dutch ] = "~Paginabreedte" ;
Text [ spanish ] = "~Ancho de pgina" ;
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 genilii";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "~Ancho de pgina";
+ Text[ catalan ] = "~Ample de pgina";
+ 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 ] = "̦XA(~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 ] = "~Varivel" ;
- Text [ finnish ] = "~Muuttuja" ;
+ Text [ finnish ] = "~Vaihtuva" ;
Text [ danish ] = "Variabel" ;
Text [ french ] = "~Autre" ;
Text [ swedish ] = "~Stegls" ;
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 ] = "LY(~V)";
+ Text[ japanese ] = "任意(~V)";
+ Text[ chinese_traditional ] = "無級縮放(~V)";
Text[ arabic ] = "";
Text[ greek ] = " ~";
- Text[ korean ] = "ܰ(~V)";
+ Text[ korean ] = "임의(~V)";
Text[ turkish ] = "~Deiken";
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 powikszenia";
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 ] = "lek";
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 ] = "Mlestok";
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 mae 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~fa...";
+ Text[ french ] = "~Vrification orthographique...";
+ Text[ spanish ] = "~Revisin ortogrfica...";
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 ] = "~Yazm klavuzu";
@@ -441,7 +441,7 @@ Menu RID_MENU_SPELL
Text [ swedish ] = "Auto~Korrigering" ;
Text [ danish ] = "Auto~Korrektur" ;
Text [ italian ] = "~Correzione automatica" ;
- Text [ spanish ] = "Auto~Correccin" ;
+ Text [ spanish ] = "~Correccin automtica" ;
Text [ french ] = "AutoCo~rrection" ;
Text [ dutch ] = "~AutoCorrectie" ;
Text [ portuguese ] = "Auto~Correco" ;
@@ -454,7 +454,7 @@ Menu RID_MENU_SPELL
Text[ dutch ] = "~AutoCorrectie";
Text[ chinese_simplified ] = "自动更正";
Text[ greek ] = "~";
- Text[ korean ] = "자동 고침";
+ Text[ korean ] = "자동 수정";
Text[ turkish ] = "Otomatik dzeltme";
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
#include
+#include
#include
#include
@@ -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
#include
#include
-#include
#ifndef _SV_VIRDEV_HXX //autogen
#include
@@ -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
#include
#include
-
+#include
+#include
#include
#include
@@ -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::ORefGetGlobalData()->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
#include
+#include
#include
@@ -126,7 +127,6 @@
#include
#endif
-
#include
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(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 noms atributs 3D";
QuickHelpText[ finnish ] = "Vain kolmiulotteiset mritteet";
@@ -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 leklendirmesi";
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 ] = " degrs";
@@ -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 ] = "Especfic 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 ] = " degrs";
@@ -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 ] = "Glge";
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 vri";
@@ -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 ] = "Especfic 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 ] = "Especfic 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 vri";
@@ -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 ] = "Vri";
@@ -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";
@@ -3842,6 +3842,11 @@ 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
#endif
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include
+#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 rotao 3D" ;
Text[ chinese_simplified ] = "建立3维旋转体";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ polish ] = "Utwrz 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 dner nesne olutur";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Crear objeto de rotacin 3D";
- Text[ finnish ] = "Luo 3D-kierto-objekti";
+ Text[ catalan ] = "Crea un objecte de gir 3D";
+ Text[ finnish ] = "Luo 3D-pyrhdyskappale";
+ 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 ] = "Indst objekt(er)" ;
Text [ french ] = "Insrer 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 ] = "Para says";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Nmero de segmentos";
- Text[ finnish ] = "Osioiden m??r?";
+ Text[ catalan ] = "Nombre de segments";
+ Text[ finnish ] = "Osioiden mr";
+ 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 ] = "Gbia obiektu";
- Text[ japanese ] = "オブジェクトの奥行き";
+ Text[ japanese ] = "オブジェクトの奥行き";
Text[ chinese_traditional ] = "物件深度";
Text[ arabic ] = " ";
Text[ greek ] = " ";
Text[ korean ] = "개체 깊이";
Text[ turkish ] = "Nesne derinlii";
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 ] = "Distncia 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 ] = "Polttovli";
+ Text[ thai ] = "ความยาวจุดรวม";
};
String RID_SVX_3D_UNDO_CAMPOS
{
@@ -210,24 +215,25 @@ String RID_SVX_3D_UNDO_CAMPOS
Text [ portuguese ] = "Posio da cmara" ;
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 ] = "Posicin de la cmara";
+ Text[ catalan ] = "Posici de la cmara";
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 dndr";
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 extrusin" ;
Text [ french ] = "Crer un objet d'extrusion" ;
@@ -264,15 +271,16 @@ String RID_SVX_3D_UNDO_EXTRUDE
Text[ chinese_simplified ] = "生成模压式对象";
Text[ russian ] = " ";
Text[ polish ] = "Utwrz obiekt wytaczany";
- Text[ japanese ] = "浮き出しオブジェクトの作成";
+ Text[ japanese ] = "浮き出しオブジェクトの作成";
Text[ chinese_traditional ] = "產生模壓式物件";
Text[ arabic ] = " ";
Text[ greek ] = " ";
Text[ korean ] = "입체면 개체 작성";
Text[ turkish ] = "Kalp nesne olutur";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Crear un objeto de extrusin";
- 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 rotao" ;
Text [ portuguese_brazilian ] = "Rotationsk?per erstellen" ;
Text[ chinese_simplified ] = "制作旋转体";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ polish ] = "Utwrz obiekt obrotowy";
- Text[ japanese ] = "回転オブkジェクトの作成";
+ Text[ japanese ] = "回転オブkジェクトの作成";
Text[ chinese_traditional ] = "製作旋轉體";
Text[ arabic ] = " ";
Text[ greek ] = " ";
Text[ korean ] = "회전개체 만들기";
Text[ turkish ] = "Dner nesne olutur";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Crear cuerpo de rotacin";
- Text[ finnish ] = "Luo kierto-objekti";
+ Text[ catalan ] = "Crea un objecte de gir";
+ Text[ finnish ] = "Luo pyrhdyskappale";
+ 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 ayr";
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-mritteet";
+ 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
@@ -294,6 +294,131 @@ Svx3DShadeModeItem::Svx3DShadeModeItem(sal_uInt16 nVal)
: SfxUInt16Item(SDRATTR_3DSCENE_SHADE_MODE, 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
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(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(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
@@ -140,15 +143,9 @@
#ifndef _COMPHELPER_NUMBERS_HXX_
#include
#endif
-#ifndef _DBHELPER_DBCONVERSION_HXX_
-#include
-#endif
#ifndef _COMPHELPER_PROPERTY_HXX_
#include
#endif
-#ifndef _CONNECTIVITY_DBTOOLS_HXX_
-#include
-#endif
#ifndef _COMPHELPER_DATETIME_HXX_
#include
#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(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 aPosSeq = ::findValue(m_aValueList, _xVariant->getString(), sal_True);
+ Sequence aPosSeq = ::comphelper::findValue(m_aValueList, _xVariant->getString(), sal_True);
if (aPosSeq.getLength())
aText = static_cast(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 aPosSeq = ::findValue(m_aValueList, m_aText, sal_True);
+ Sequence aPosSeq = ::comphelper::findValue(m_aValueList, m_aText, sal_True);
if (aPosSeq.getLength())
static_cast(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("